diff --git a/.github/workflows/alpine/Dockerfile.ci b/.github/workflows/alpine/Dockerfile.ci
index 7adca61bd2fc..05d1c09c09d7 100644
--- a/.github/workflows/alpine/Dockerfile.ci
+++ b/.github/workflows/alpine/Dockerfile.ci
@@ -22,6 +22,7 @@ RUN apk add \
     kealib-dev \
     libaec-dev \
     libarchive-dev \
+    libavif-dev \
     libdeflate-dev \
     libgeotiff-dev \
     libheif-dev \
@@ -62,7 +63,6 @@ RUN apk add \
     sfcgal-dev \
     snappy-dev \
     sqlite-dev \
-    swig \
     tiledb-dev \
     tiff-dev \
     unixodbc-dev \
@@ -73,3 +73,11 @@ RUN apk add \
 
 COPY requirements.txt /tmp/
 RUN python3 -m pip install --break-system-packages -U -r /tmp/requirements.txt
+
+RUN apk add git autoconf automake libtool bison && \
+    git clone --branch "${SWIG_GIT_TAG:-master}" --depth 1 https://github.com/swig/swig.git swig-git && \
+    cd swig-git && \
+    ./autogen.sh && \
+    ./configure --prefix=/usr && \
+    make -j$(nproc) && \
+    make install
diff --git a/.github/workflows/alpine_32bit/Dockerfile.ci b/.github/workflows/alpine_32bit/Dockerfile.ci
index bd85ef1320cb..7080b05992bb 100644
--- a/.github/workflows/alpine_32bit/Dockerfile.ci
+++ b/.github/workflows/alpine_32bit/Dockerfile.ci
@@ -24,6 +24,7 @@ RUN apk add \
     kealib-dev \
     libaec-dev \
     libarchive-dev \
+    libavif-dev \
     libdeflate-dev \
     libgeotiff-dev \
     libheif-dev \
diff --git a/.github/workflows/alpine_numpy2/Dockerfile.ci b/.github/workflows/alpine_numpy2/Dockerfile.ci
index c12ff7c49c76..6c468269e093 100644
--- a/.github/workflows/alpine_numpy2/Dockerfile.ci
+++ b/.github/workflows/alpine_numpy2/Dockerfile.ci
@@ -67,7 +67,7 @@ RUN apk add \
     zlib-dev \
     zstd-dev
 
-# Commenting out those packages to be sure to test numpy 2.0.0rc1
+# Commenting out those packages to be sure to test numpy 2.0.0
 #    py3-numpy \
 #    py3-numpy-dev \
 #    py3-pyarrow \
@@ -77,6 +77,6 @@ RUN apk add \
 RUN mv /usr/lib/python3.12/site-packages/pyarrow /usr/lib/python3.12/site-packages/pyarrow.disabled
 
 COPY requirements.txt /tmp/
-RUN python3 -m pip install --break-system-packages numpy==2.0.0rc1
+RUN python3 -m pip install --break-system-packages numpy==2.0.0
 RUN python3 -m pip install --break-system-packages -U -r /tmp/requirements.txt
 
diff --git a/.github/workflows/android_cmake.yml b/.github/workflows/android_cmake.yml
index eaccf59776d0..108e0cadc2a8 100644
--- a/.github/workflows/android_cmake.yml
+++ b/.github/workflows/android_cmake.yml
@@ -4,12 +4,14 @@ on:
     push:
         paths-ignore:
             - 'doc/**'
+            - 'docker/**'
         branches-ignore:
             - 'backport**'
             - 'dependabot**'
     pull_request:
         paths-ignore:
             - 'doc/**'
+            - 'docker/**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
@@ -24,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - name: Cache
         uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
index c482fb8973b0..5ee7e6b14209 100644
--- a/.github/workflows/cifuzz.yml
+++ b/.github/workflows/cifuzz.yml
@@ -4,6 +4,7 @@ on:
     pull_request:
         paths-ignore:
             - 'doc/**'
+            - 'docker/**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
@@ -31,7 +32,7 @@ jobs:
         fuzz-seconds: 600
         dry-run: false
     - name: Upload Crash
-      uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+      uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
       if: failure() && steps.build.outcome == 'success'
       with:
         name: artifacts
diff --git a/.github/workflows/clang_static_analyzer.yml b/.github/workflows/clang_static_analyzer.yml
index 7a18e1912dbe..41c86a7237a5 100644
--- a/.github/workflows/clang_static_analyzer.yml
+++ b/.github/workflows/clang_static_analyzer.yml
@@ -4,12 +4,14 @@ on:
     push:
         paths-ignore:
             - 'doc/**'
+            - 'docker/**'
         branches-ignore:
             - 'backport**'
             - 'dependabot**'
     pull_request:
         paths-ignore:
             - 'doc/**'
+            - 'docker/**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
@@ -24,7 +26,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - name: Run
         run: docker run --rm -v $PWD:$PWD ubuntu:22.04 sh -c "cd $PWD && apt update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends sudo software-properties-common && DEBIAN_FRONTEND=noninteractive sh ./ci/travis/csa_common/before_install.sh && sh ./ci/travis/csa_common/install.sh && sh ./ci/travis/csa_common/script.sh"
diff --git a/.github/workflows/cmake_builds.yml b/.github/workflows/cmake_builds.yml
index 6d6aaf1606e4..d4e8f04587fd 100644
--- a/.github/workflows/cmake_builds.yml
+++ b/.github/workflows/cmake_builds.yml
@@ -6,12 +6,15 @@ on:
     push:
         paths-ignore:
             - 'doc/**'
+            - 'docker/**'
+
         branches-ignore:
             - 'backport**'
             - 'dependabot**'
     pull_request:
         paths-ignore:
             - 'doc/**'
+            - 'docker/**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
@@ -32,7 +35,7 @@ jobs:
       cache-name: cmake-ubuntu-focal
     steps:
     - name: Checkout GDAL
-      uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
     - name: Setup cache
       uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
       id: cache
@@ -94,7 +97,7 @@ jobs:
         # Workaround bug in ogdi packaging
         sudo ln -s /usr/lib/ogdi/libvrf.so /usr/lib
         #
-        python3 -m pip install -U pip wheel setuptools numpy
+        python3 -m pip install -U pip wheel setuptools numpy importlib_metadata
         python3 -m pip install -r $GITHUB_WORKSPACE/autotest/requirements.txt
 
     - name: Build libjxl
@@ -142,12 +145,12 @@ jobs:
 
     - name: Install pdfium
       run: |
-        wget -q https://github.com/rouault/pdfium_build_gdal_3_9/releases/download/pdfium_6309_v1/install-ubuntu2004-rev6309.tar.gz \
-          && tar -xzf install-ubuntu2004-rev6309.tar.gz \
+        wget -q https://github.com/rouault/pdfium_build_gdal_3_10/releases/download/pdfium_6677_v1/install-ubuntu2004-rev6677.tar.gz \
+          && tar -xzf install-ubuntu2004-rev6677.tar.gz \
           && sudo chown -R root:root install \
           && sudo mv install/lib/* /usr/lib/ \
           && sudo mv install/include/* /usr/include/ \
-          && sudo rm -rf install-ubuntu2004-rev6309.tar.gz install \
+          && sudo rm -rf install-ubuntu2004-rev6677.tar.gz install \
           && sudo apt-get update -y \
           && sudo apt-get install -y --fix-missing --no-install-recommends liblcms2-dev
     - name: Configure ccache
@@ -214,15 +217,15 @@ jobs:
         test -f $GITHUB_WORKSPACE/install-gdal/share/man/man1/gdaladdo.1
         export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/install-gdal/lib
         $GITHUB_WORKSPACE/install-gdal/bin/gdalinfo --version
-        PYTHONPATH=$GITHUB_WORKSPACE/install-gdal/lib/python3/dist-packages python3 -c "from osgeo import gdal;print(gdal.VersionInfo(None))"
-        PYTHONPATH=$GITHUB_WORKSPACE/install-gdal/lib/python3/dist-packages python3 $GITHUB_WORKSPACE/scripts/check_doc.py
+        PYTHONPATH=$GITHUB_WORKSPACE/install-gdal/lib/python3.8/site-packages python3 -c "from osgeo import gdal;print(gdal.VersionInfo(None))"
+        PYTHONPATH=$GITHUB_WORKSPACE/install-gdal/lib/python3.8/site-packages python3 $GITHUB_WORKSPACE/scripts/check_doc.py
     - name: CMake with rpath
       run: |
         export PATH=$CMAKE_DIR:/usr/local/bin:/usr/bin:/bin # Avoid CMake config from brew etc.
         (cd $GITHUB_WORKSPACE/superbuild/build; cmake .. "-DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/install-gdal-with-rpath" "-DCMAKE_INSTALL_RPATH=$GITHUB_WORKSPACE/install-gdal-with-rpath/lib")
         cmake --build $GITHUB_WORKSPACE/superbuild/build --target install -- -j$(nproc)
         # For some reason, during the install phase of above invocation, the Python bindings are rebuilt after the build phase, and without the rpath... Can't reproduce that locally
-        # PYTHONPATH=$GITHUB_WORKSPACE/install-gdal-with-rpath/lib/python3/dist-packages python -c "from osgeo import gdal;print(gdal.VersionInfo(None))"
+        # PYTHONPATH=$GITHUB_WORKSPACE/install-gdal-with-rpath/lib/python3.8/site-packages python -c "from osgeo import gdal;print(gdal.VersionInfo(None))"
     - name: Rerun using Mono
       run: |
         export PATH=$CMAKE_DIR:/usr/local/bin:/usr/bin:/bin # Avoid CMake config from brew etc.
@@ -312,9 +315,9 @@ jobs:
         run: |
           git config --global core.autocrlf false
       - name: Checkout GDAL
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       - name: Install development packages
-        uses: msys2/setup-msys2@cc11e9188b693c2b100158c3322424c4cc1dadea # v2.22.0
+        uses: msys2/setup-msys2@ddf331adaebd714795f1042345e6ca57bd66cea8 # v2.24.1
         with:
           msystem: MINGW64
           update: true
@@ -325,7 +328,7 @@ jobs:
             mingw-w64-x86_64-geos mingw-w64-x86_64-libspatialite mingw-w64-x86_64-proj
             mingw-w64-x86_64-cgal mingw-w64-x86_64-libfreexl mingw-w64-x86_64-hdf5 mingw-w64-x86_64-netcdf mingw-w64-x86_64-poppler  mingw-w64-x86_64-podofo mingw-w64-x86_64-postgresql
             mingw-w64-x86_64-libgeotiff mingw-w64-x86_64-libpng mingw-w64-x86_64-libtiff mingw-w64-x86_64-openjpeg2
-            mingw-w64-x86_64-python-pip mingw-w64-x86_64-python-numpy mingw-w64-x86_64-python-pytest mingw-w64-x86_64-python-setuptools mingw-w64-x86_64-python-lxml mingw-w64-x86_64-swig mingw-w64-x86_64-python-psutil mingw-w64-x86_64-blosc
+            mingw-w64-x86_64-python-pip mingw-w64-x86_64-python-numpy mingw-w64-x86_64-python-pytest mingw-w64-x86_64-python-setuptools mingw-w64-x86_64-python-lxml mingw-w64-x86_64-swig mingw-w64-x86_64-python-psutil mingw-w64-x86_64-blosc mingw-w64-x86_64-libavif
       - name: Setup cache
         uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
         id: cache
@@ -405,7 +408,7 @@ jobs:
       run: |
         git config --global core.autocrlf false
     - name: Checkout GDAL
-      uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
     - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
     - name: populate JAVA_HOME
       shell: pwsh
@@ -422,14 +425,14 @@ jobs:
     - name: Install dependency
       shell: bash -l {0}
       run: |
-        conda install --yes --quiet curl libiconv icu python=3.10 swig numpy pytest pytest-env pytest-benchmark filelock zlib lxml jsonschema
+        conda install --yes --quiet curl libiconv icu python=3.10 swig numpy pytest pytest-env pytest-benchmark filelock zlib lxml jsonschema setuptools
         # FIXME: remove libnetcdf=4.9.2=nompi_h5902ca5_107 pinning as soon as https://github.com/conda-forge/libnetcdf-feedstock/issues/182 is resolved
         conda install --yes --quiet proj geos hdf4 hdf5 kealib \
             libnetcdf=4.9.2=nompi_h5902ca5_107 openjpeg poppler libtiff libpng xerces-c expat libxml2 kealib json-c \
             cfitsio freexl geotiff libjpeg-turbo libpq libspatialite libwebp-base pcre pcre2 postgresql \
             sqlite tiledb zstd cryptopp cgal doxygen librttopo libkml openssl xz \
             openjdk ant qhull armadillo blas blas-devel libblas libcblas liblapack liblapacke blosc libarchive \
-            arrow-cpp pyarrow libaec cmake
+            arrow-cpp pyarrow libaec libheif libavif cmake
     - name: Check CMake version
       shell: bash -l {0}
       run: |
@@ -437,8 +440,8 @@ jobs:
     - name: Install pdfium
       shell: bash -l {0}
       run: |
-        curl -LOs https://github.com/rouault/pdfium_build_gdal_3_9/releases/download/pdfium_6309_v1/install-win10-vs2019-x64-rev6309.zip
-        unzip install-win10-vs2019-x64-rev6309.zip
+        curl -LOs https://github.com/rouault/pdfium_build_gdal_3_10/releases/download/pdfium_6677_v1/install-win10-vs2019-x64-rev6677.zip
+        unzip install-win10-vs2019-x64-rev6677.zip
         mv install install-pdfium
 
     - name: Remove conflicting libraries
@@ -456,7 +459,7 @@ jobs:
       # Build PDF driver as plugin due to the PDFium build including libopenjp2 symbols which would conflict with external libopenjp2
       run: |
         mkdir -p $GITHUB_WORKSPACE/build
-        cmake -G "${generator}" -Werror=dev "-DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/install-gdal" "-DUSE_CCACHE=ON" "-DCMAKE_PREFIX_PATH=${CONDA}/envs/gdalenv" -DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD} -S "$GITHUB_WORKSPACE" -B "$GITHUB_WORKSPACE/build" -DGDAL_ENABLE_PLUGINS:BOOL=ON -DGDAL_ENABLE_PLUGINS_NO_DEPS:BOOL=ON -DGDAL_USE_PUBLICDECOMPWT:BOOL=ON -DPUBLICDECOMPWT_URL=https://github.com/rouault/PublicDecompWT -DBUILD_JAVA_BINDINGS=OFF -DBUILD_CSHARP_BINDINGS=ON -DGDAL_USE_MYSQL:BOOL=OFF -DCMAKE_C_FLAGS=" /WX" -DCMAKE_CXX_FLAGS=" /WX" -DWERROR_DEV_FLAG="-Werror=dev" -DCMAKE_BUILD_TYPE=Release -DPDFIUM_ROOT=$GITHUB_WORKSPACE/install-pdfium -DGDAL_ENABLE_DRIVER_PDF_PLUGIN:BOOL=ON -DCMAKE_UNITY_BUILD=ON
+        cmake -G "${generator}" -Werror=dev "-DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/install-gdal" "-DUSE_CCACHE=ON" "-DCMAKE_PREFIX_PATH=${CONDA}/envs/gdalenv" -DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD} -S "$GITHUB_WORKSPACE" -B "$GITHUB_WORKSPACE/build" -DGDAL_ENABLE_PLUGINS:BOOL=ON -DGDAL_ENABLE_PLUGINS_NO_DEPS:BOOL=ON -DGDAL_USE_PUBLICDECOMPWT:BOOL=ON -DPUBLICDECOMPWT_URL=https://github.com/rouault/PublicDecompWT -DBUILD_JAVA_BINDINGS=OFF -DBUILD_CSHARP_BINDINGS=ON -DGDAL_USE_MYSQL:BOOL=OFF -DCMAKE_C_FLAGS=" /WX" -DCMAKE_CXX_FLAGS=" /WX" -DWERROR_DEV_FLAG="-Werror=dev" -DCMAKE_BUILD_TYPE=Release -DPDFIUM_ROOT=$GITHUB_WORKSPACE/install-pdfium -DGDAL_ENABLE_DRIVER_PDF_PLUGIN:BOOL=ON -DCMAKE_UNITY_BUILD=ON -DOGR_ENABLE_DRIVER_TAB_PLUGIN=OFF -DOGR_ENABLE_DRIVER_GEOJSON_PLUGIN=OFF
     - name: Build
       shell: bash -l {0}
       run: cmake --build $GITHUB_WORKSPACE/build --config Release -j 2
@@ -485,6 +488,17 @@ jobs:
         PYTHONPATH=$GITHUB_WORKSPACE/install-gdal/lib/site-packages python -c "from osgeo import gdal;print(gdal.VersionInfo(None))"
         export PATH=$GITHUB_WORKSPACE/install-gdal/Scripts:$PATH
         PYTHONPATH=$GITHUB_WORKSPACE/install-gdal/lib/site-packages gdal_edit --version
+    - name: Check the build includes the expected drivers
+      shell: bash -l {0}
+      run: |
+        export PATH=$GITHUB_WORKSPACE/install-gdal/bin:$PATH
+        gdalinfo --formats > found_formats.txt
+        ogrinfo --formats >> found_formats.txt
+        cat found_formats.txt
+        cat $GITHUB_WORKSPACE/.github/workflows/windows_conda_expected_gdalinfo_formats.txt $GITHUB_WORKSPACE/.github/workflows/windows_conda_expected_ogrinfo_formats.txt > expected_formats.txt
+        dos2unix expected_formats.txt
+        dos2unix found_formats.txt
+        diff -u expected_formats.txt found_formats.txt
     - name: Show gdal.pc
       shell: bash -l {0}
       run: cat $GITHUB_WORKSPACE/build/gdal.pc
@@ -507,7 +521,7 @@ jobs:
       run: |
         git config --global core.autocrlf false
     - name: Checkout GDAL
-      uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
     - uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
       with:
         activate-environment: gdalenv
@@ -519,7 +533,7 @@ jobs:
     - name: Install dependency
       shell: bash -l {0}
       run: |
-        conda install --yes --quiet proj pytest pytest-env pytest-benchmark filelock lxml cmake
+        conda install --yes --quiet proj pytest pytest-env pytest-benchmark filelock lxml cmake setuptools
     - name: Check CMake version
       shell: bash -l {0}
       run: |
@@ -541,13 +555,31 @@ jobs:
       shell: bash -l {0}
       run: |
         rm -f build/CMakeCache.txt
-        cmake -A ${architecture} -G "${generator}" "-DCMAKE_PREFIX_PATH=${CONDA}/envs/gdalenv" -Werror=dev "-DCMAKE_CXX_COMPILER_LAUNCHER=clcache" -DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD} -S "$GITHUB_WORKSPACE" -B "$GITHUB_WORKSPACE/build" -DCMAKE_C_FLAGS=" /WX" -DCMAKE_CXX_FLAGS=" /WX" -DGDAL_USE_EXTERNAL_LIBS:BOOL=OFF -DGDAL_USE_PNG_INTERNAL=OFF -DGDAL_USE_JPEG_INTERNAL=OFF -DGDAL_USE_JPEG12_INTERNAL=OFF -DGDAL_USE_GIF_INTERNAL=OFF -DGDAL_USE_LERC_INTERNAL=OFF -DGDAL_USE_LERCV1_INTERNAL=OFF -DGDAL_USE_QHULL_INTERNAL=OFF -DGDAL_USE_OPENCAD_INTERNAL=OFF -DGDAL_BUILD_OPTIONAL_DRIVERS=OFF -DOGR_BUILD_OPTIONAL_DRIVERS=OFF -DWERROR_DEV_FLAG="-Werror=dev"
+        cmake -A ${architecture} -G "${generator}" "-DCMAKE_PREFIX_PATH=${CONDA}/envs/gdalenv" -Werror=dev "-DCMAKE_CXX_COMPILER_LAUNCHER=clcache" -DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD} -S "$GITHUB_WORKSPACE" -B "$GITHUB_WORKSPACE/build" -DCMAKE_C_FLAGS=" /WX" -DCMAKE_CXX_FLAGS=" /WX" -DGDAL_USE_EXTERNAL_LIBS:BOOL=OFF -DGDAL_USE_PNG_INTERNAL=OFF -DGDAL_USE_JPEG_INTERNAL=OFF -DGDAL_USE_JPEG12_INTERNAL=OFF -DGDAL_USE_GIF_INTERNAL=OFF -DGDAL_USE_LERC_INTERNAL=OFF -DGDAL_USE_LERCV1_INTERNAL=OFF -DGDAL_USE_QHULL_INTERNAL=OFF -DGDAL_USE_OPENCAD_INTERNAL=OFF -DGDAL_BUILD_OPTIONAL_DRIVERS=OFF -DOGR_BUILD_OPTIONAL_DRIVERS=OFF -DGDAL_ENABLE_DRIVER_DERIVED=ON -DWERROR_DEV_FLAG="-Werror=dev"
     - name: Build
       shell: bash -l {0}
       run: cmake --build $GITHUB_WORKSPACE/build --config RelWithDebInfo -j 2
+
+    - name: Re-enable shapefile driver (otherwise lots of python tests would fail)
+      shell: bash -l {0}
+      run: |
+        cmake -S "$GITHUB_WORKSPACE" -B "$GITHUB_WORKSPACE/build" -DOGR_ENABLE_DRIVER_SHAPE=ON -DOGR_ENABLE_DRIVER_SHAPE_PLUGIN=ON
+    - name: Build
+      shell: bash -l {0}
+      run: cmake --build $GITHUB_WORKSPACE/build --config RelWithDebInfo -j 2
+
+    # Works around https://github.com/actions/runner-images/issues/10055
+    - name: Remove conflicting libraries
+      shell: bash -l {0}
+      run: |
+          find "C:/hostedtoolcache/windows/Java_Temurin-Hotspot_jdk" -name "msvcp140.dll" -exec rm {} \;
+
     - name: test (with ctest)
       shell: bash -l {0}
       run: |
+        # gnm_test has suddenly started failing around June 16th 2024
+        # Related to image windows-latest 20240603.1.0 / actions/runner-images#10004
+        echo "def test_dummy(): pass" > $GITHUB_WORKSPACE/autotest/gnm/gnm_test.py
         ctest --test-dir $GITHUB_WORKSPACE/build -C RelWithDebInfo -V -j 3
       env:
         SKIP_GDAL_HTTP_SSL_VERIFYSTATUS: YES
@@ -574,7 +606,7 @@ jobs:
       with:
         xcode-version: 14.3
     - name: Checkout GDAL
-      uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
     - name: Setup cache
       uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
       id: cache
@@ -591,7 +623,6 @@ jobs:
         rm -rf /opt/homebrew/lib/node_modules # conflicts with node@18 from brew
         brew update
         brew outdated
-        brew unlink python
         brew install --overwrite python@3.11 python@3.12
         brew install postgresql || brew link postgresql
         brew install pkg-config freexl libxml2 libspatialite geos proj libgeotiff openjpeg giflib libaec postgis poppler doxygen unixodbc jpeg-turbo aom jpeg-xl libheif libarchive libkml boost
@@ -599,6 +630,8 @@ jobs:
         brew link --force sqlite
         # gdal is automatically installed as a dependency for postgis
         brew uninstall --ignore-dependencies gdal
+        # Workaround for https://github.com/Homebrew/homebrew-core/pull/170959#issuecomment-2379606442
+        sed -i .bak 's/hdf5_hl;hdf5;/hdf5_hl-shared;hdf5-shared;/g' "$(brew --prefix netcdf)/lib/cmake/netCDF/netCDFTargets.cmake"
     - name: Configure ccache
       run: |
           echo CCACHE_BASEDIR=$PWD >> ${GITHUB_ENV}
@@ -654,7 +687,7 @@ jobs:
       run: |
         git config --global core.autocrlf false
     - name: Checkout GDAL
-      uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
     - uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
       with:
         activate-environment: gdalenv
diff --git a/.github/workflows/code_checks.yml b/.github/workflows/code_checks.yml
index 674bae403803..29b0129814a7 100644
--- a/.github/workflows/code_checks.yml
+++ b/.github/workflows/code_checks.yml
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - name: Install Requirements
         run: |
@@ -47,7 +47,7 @@ jobs:
     container: ubuntu:24.04
     steps:
       - name: Checkout
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - name: Install Requirements
         run: |
@@ -69,7 +69,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - name: Detect tabulations
         run: ./scripts/detect_tabulations.sh
@@ -101,11 +101,25 @@ jobs:
         # SC2129: (style): Consider using { cmd1; cmd2; } >> file instead of individual redirects
         run: shellcheck -e SC2086,SC2046,SC2164,SC2054,SC2129 $(find . -name '*.sh' -a -not -name ltmain.sh -a -not -wholename "./autotest/*" -a -not -wholename "./.github/*")
 
+  binary_files:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Install Requirements
+        run: |
+            sudo apt-get install -y python3 coreutils
+
+      - name: Checkout
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+
+      - name: Detect binary files
+        run: python3 ./scripts/check_binaries.py
+
   linting:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
-      - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
       - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
 
   doxygen:
@@ -113,7 +127,7 @@ jobs:
     container: ghcr.io/osgeo/proj-docs
     steps:
       - name: Checkout
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - name: Run doxygen
         run: |
@@ -124,7 +138,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - name: Install Requirements
         run: |
@@ -143,9 +157,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
     - name: Set up Python
-      uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
+      uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
       with:
         python-version: 3.8
     - name: Install lint tool
@@ -159,7 +173,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - name: Install requirements
         run: |
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index f40914536e7b..cbdf13b7bed7 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -4,12 +4,14 @@ on:
     push:
         paths-ignore:
             - 'doc/**'
+            - 'docker/**'
         branches-ignore:
           - 'backport**'
           - 'dependabot**'
     pull_request:
         paths-ignore:
             - 'doc/**'
+            - 'docker/**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
@@ -44,7 +46,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
     - name: Install dependencies
       run: |
@@ -107,7 +109,7 @@ jobs:
     # We do that after running CMake to avoid CodeQL to trigger during CMake time,
     # in particular during HDF5 detection which is terribly slow (https://github.com/OSGeo/gdal/issues/9549)
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
+      uses: github/codeql-action/init@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -127,6 +129,6 @@ jobs:
         cmake --build build -j$(nproc)
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
+      uses: github/codeql-action/analyze@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
index aa2dd18bcc31..47bbd31b54cf 100644
--- a/.github/workflows/conda.yml
+++ b/.github/workflows/conda.yml
@@ -4,6 +4,7 @@ on:
     push:
         paths-ignore:
             - 'doc/**'
+            - 'docker/**'
         branches-ignore:
             - 'backport**'
             - 'dependabot**'
@@ -37,7 +38,7 @@ jobs:
       CACHE_NUMBER: 0
 
     steps:
-    - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
     - name: Support longpaths
       run: git config --system core.longpaths true
@@ -74,7 +75,7 @@ jobs:
           source ../ci/travis/conda/compile.sh
       working-directory: ./gdal-feedstock
 
-    - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+    - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
       with:
         name: ${{ matrix.platform }}-conda-package
         path: ./gdal-feedstock/packages/
diff --git a/.github/workflows/coverity_scan.yml b/.github/workflows/coverity_scan.yml
index b1980c77bcfa..961177d2e54b 100644
--- a/.github/workflows/coverity_scan.yml
+++ b/.github/workflows/coverity_scan.yml
@@ -43,7 +43,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - name: Login to GHCR
         if: env.CONTAINER_REGISTRY == 'ghcr.io'
diff --git a/.github/workflows/delete_untagged_containers.yml b/.github/workflows/delete_untagged_containers.yml
index 6e0fdc998e41..e37a0012c1c4 100644
--- a/.github/workflows/delete_untagged_containers.yml
+++ b/.github/workflows/delete_untagged_containers.yml
@@ -4,6 +4,7 @@ on:
     push:
         paths-ignore:
             - 'doc/**'
+            - 'docker/**'
         branches-ignore:
             - 'backport**'
             - 'dependabot**'
@@ -18,7 +19,7 @@ jobs:
     if: github.repository == 'OSGeo/gdal'
     steps:
     - name: Delete all containers from gdal-deps without tags
-      uses: Chizkiyahu/delete-untagged-ghcr-action@e8c780ca2d589797e657691fc16bffe066714890 # v4.0.0
+      uses: Chizkiyahu/delete-untagged-ghcr-action@b302990b6c629f3b272a31f3c3a268e1f7d0ffae # v4.0.1
       with:
         token: ${{ secrets.PAT_TOKEN_DELETE_UNTAGGED_CONTAINERS }}
         repository_owner: ${{ github.repository_owner }}
diff --git a/.github/workflows/doc_build.yml b/.github/workflows/doc_checks.yml
similarity index 53%
rename from .github/workflows/doc_build.yml
rename to .github/workflows/doc_checks.yml
index 0d7259f45767..26502afd0062 100644
--- a/.github/workflows/doc_build.yml
+++ b/.github/workflows/doc_checks.yml
@@ -16,7 +16,7 @@ permissions:
 
 jobs:
   docs:
-    name: Docs
+    name: Documentation checks
 
     runs-on: ubuntu-latest
     strategy:
@@ -24,7 +24,7 @@ jobs:
     container: ghcr.io/osgeo/proj-docs
 
     steps:
-    - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
     - name: Setup environment
       shell: bash -l {0}
       run: |
@@ -40,6 +40,7 @@ jobs:
             -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_INSTALL_PREFIX=/usr \
             -DBUILD_APPS=OFF \
+            -DBUILD_TESTING=OFF \
             -DGDAL_BUILD_OPTIONAL_DRIVERS=OFF \
             -DOGR_BUILD_OPTIONAL_DRIVERS=OFF
           cmake --build . -j$(nproc)
@@ -55,6 +56,11 @@ jobs:
           ldconfig
           popd
 
+    - name: Update components
+      shell: bash -l {0}
+      run: |
+          pip install -U "sphinx-rtd-theme>=3.0.0" "sphinxcontrib-spelling>=8.0.0"
+
     - name: Print versions
       shell: bash -l {0}
       run: |
@@ -75,68 +81,14 @@ jobs:
       run: |
         mkdir -p doc/build
         doxygen Doxyfile
-    - name: HTML
+    - name: Generated RST files
       shell: bash -l {0}
       run: |
-        make html O="-D enable_redirects=1"
+        make generated_rst_files
       working-directory: ./doc
-    - name: PDF
+    - name: Spelling
       shell: bash -l {0}
       run: |
-        make latexpdf
+        sed -i '/html_extra_path/d' source/conf.py # avoid WARNING: html_extra_path entry '../build/html_extra' is placed inside outdir
+        make spelling
       working-directory: ./doc
-    #- name: Spelling
-    #  shell: bash -l {0}
-    #  run: |
-    #    make spelling
-    #  working-directory: ./doc
-    - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
-      with:
-        name: PDF
-        path: doc/build/latex/gdal.pdf
-    - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
-      with:
-        name: HTML
-        path: doc/build/html/*
-    #- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
-    #  with:
-    #    name: Misspelled
-    #    path: doc/build/spelling/output.txt
-    - name: Deploy ssh key
-      if: ${{ github.ref_name == 'master' && github.repository == 'OSGeo/gdal' }}
-      shell: bash -l {0}
-      run: |
-        mkdir -p /root/.ssh && echo "${{ secrets.SSH_KEY_DOCS }}" > /root/.ssh/id_rsa
-        chmod 700 /root/.ssh && chmod 600 /root/.ssh/id_rsa
-        ssh-keyscan -t rsa github.com >> /root/.ssh/known_hosts
-        eval `ssh-agent -s`
-        ssh-add /root/.ssh/id_rsa
-    - name: Deploy to gdal.org
-      if: ${{ github.ref_name == 'master' && github.repository == 'OSGeo/gdal' }}
-      shell: bash -l {0}
-      run: |
-        set -x
-        set -e
-        cd /__w/gdal
-        mv gdal/doc/build/html gdal-docs
-        rm gdal-docs/gdal.pdf
-        cp gdal/doc/build/latex/gdal.pdf gdal-docs
-        cp gdal/data/gdalicon.png gdal-docs # For GDAL autotest...
-        cp -r gdal/resources gdal-docs # Do not change this without changing swig/python/gdal-utils/osgeo_utils/gdal2tiles.py
-        #
-        git clone https://github.com/OSGeo/libgeotiff
-        cp -r libgeotiff/geotiff/html/proj_list gdal-docs/
-        #
-        cd gdal-docs
-        wget http://download.osgeo.org/gdal/for_doc/javadoc.zip -O /tmp/javadoc.zip
-        unzip -q /tmp/javadoc.zip
-        git init
-        git config user.email "proj4bot@proj4.bot"
-        git config user.name "GDAL Bot"
-        git remote add origin git@github.com:OSGeo/gdal-docs.git
-        git remote -v
-        echo "gdal.org" > CNAME
-        touch .nojekyll
-        git add -A
-        git commit -m "Update with OSGeo/gdal commit $GITHUB_SHA"
-        git push -f origin master
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
new file mode 100644
index 000000000000..7b34b00db0f2
--- /dev/null
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,58 @@
+name: Docker
+
+on:
+    pull_request:
+        paths:
+            - 'docker/**'
+            - '.github/workflows/docker.yml'
+
+    # Allows you to run this workflow manually from the Actions tab
+    workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+
+  docker_builds:
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: alpine-small
+            arch: linux/amd64
+
+          - name: alpine-normal
+            arch: linux/amd64
+
+          - name: ubuntu-small
+            arch: linux/amd64
+
+          - name: ubuntu-small
+            arch: linux/arm64
+
+          - name: ubuntu-full
+            arch: linux/amd64
+
+          - name: ubuntu-full
+            arch: linux/arm64
+
+    name: ${{ matrix.name }}-${{ matrix.arch }}
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+
+      - name: Build
+        shell: bash -l {0}
+        run: |
+          docker run --rm --privileged linuxkit/binfmt:v0.8
+          cd docker/${{ matrix.name }}
+          ./build.sh --platform ${{ matrix.arch }}
diff --git a/.github/workflows/fedora_rawhide/Dockerfile.ci b/.github/workflows/fedora_rawhide/Dockerfile.ci
index 584c58369f73..ca6bb876267b 100644
--- a/.github/workflows/fedora_rawhide/Dockerfile.ci
+++ b/.github/workflows/fedora_rawhide/Dockerfile.ci
@@ -1,6 +1,9 @@
 FROM fedora:rawhide
 
-RUN dnf upgrade -y
+# FIXME: Exclude update of dnf&rpm themselves as this results in a no longer working dnf
+# cf https://github.com/OSGeo/gdal/actions/runs/9448190401/job/26021669415?pr=10173
+# Likely a transient issue with Fedora 41 dev cycle
+RUN dnf upgrade -y -x dnf -x rpm
 RUN dnf install -y --setopt=install_weak_deps=False proj-devel
 RUN dnf install -y clang make diffutils ccache cmake \
       libxml2-devel libxslt-devel expat-devel xerces-c-devel \
@@ -17,6 +20,7 @@ RUN dnf install -y clang make diffutils ccache cmake \
       armadillo-devel qhull-devel \
       hdf-devel hdf5-devel netcdf-devel \
       libpq-devel \
+      libavif-devel \
       python3-setuptools python3-pip python3-devel python3-lxml swig \
       glibc-gconv-extra
 
diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml
index ea2ee24b305d..19db499f741f 100644
--- a/.github/workflows/linux_build.yml
+++ b/.github/workflows/linux_build.yml
@@ -4,12 +4,14 @@ on:
     push:
         paths-ignore:
             - 'doc/**'
+            - 'docker/**'
         branches-ignore:
             - 'backport**'
             - 'dependabot**'
     pull_request:
         paths-ignore:
             - 'doc/**'
+            - 'docker/**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
@@ -81,7 +83,7 @@ jobs:
 
           - name: Fedora Rawhide, clang++
             id: fedora_rawhide
-            travis_branch: sanitize
+            travis_branch: fedora_rawhide
             container: fedora_rawhide
             build_script: build.sh
             os: ubuntu-22.04
@@ -174,11 +176,11 @@ jobs:
           sudo sysctl vm.mmap_rnd_bits=28
 
       - name: Checkout
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - name: Login to Docker Hub
         if: env.CONTAINER_REGISTRY == 'docker.io'
-        uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
+        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -304,6 +306,7 @@ jobs:
         env:
           TRAVIS: yes
           TRAVIS_BRANCH: ${{ matrix.travis_branch }}
+          BUILD_NAME: ${{ matrix.travis_branch }}
         run: |
           if test -f ".github/workflows/${{ matrix.id }}/${{ matrix.test_script }}"; then
             TEST_CMD="$(pwd)/.github/workflows/${{ matrix.id }}/${{ matrix.test_script }}"
@@ -326,6 +329,7 @@ jobs:
             -e GITHUB_WORKFLOW \
             -e TRAVIS \
             -e TRAVIS_BRANCH \
+            -e BUILD_NAME \
             -e "GDAL_SOURCE_DIR=$(pwd)" \
             -u $(id -u ${USER}):$(id -g ${USER}) \
             --security-opt seccomp=unconfined \
@@ -353,14 +357,14 @@ jobs:
           docker push ${CONTAINER_NAME_FULL}
 
       - name: Upload coverage artifacts
-        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
         if: ${{ matrix.id == 'coverage' }}
         with:
           name: coverage_index.html
           path: build-${{ matrix.id }}/coverage_html/index.html
 
       - name: Upload coverage artifacts
-        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
         if: ${{ matrix.id == 'coverage' }}
         with:
           name: HTML
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index dc446c51ce00..31f680caaa15 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -4,12 +4,14 @@ on:
     push:
         paths-ignore:
             - 'doc/**'
+            - 'docker/**'
         branches-ignore:
             - 'backport**'
             - 'dependabot**'
     pull_request:
         paths-ignore:
             - 'doc/**'
+            - 'docker/**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
@@ -25,7 +27,7 @@ jobs:
     runs-on: macos-14
     steps:
 
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
         with:
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 53caa8f567a3..00a2de677699 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -36,12 +36,12 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
+        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
         with:
           results_file: results.sarif
           results_format: sarif
@@ -63,7 +63,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
         with:
           name: SARIF file
           path: results.sarif
@@ -71,6 +71,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
+        uses: github/codeql-action/upload-sarif@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/slow_tests.yml b/.github/workflows/slow_tests.yml
index 40713a1f0bd0..68251670fd4e 100644
--- a/.github/workflows/slow_tests.yml
+++ b/.github/workflows/slow_tests.yml
@@ -47,7 +47,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - name: Login to GHCR
         if: env.CONTAINER_REGISTRY == 'ghcr.io'
diff --git a/.github/workflows/ubuntu_20.04/Dockerfile.ci b/.github/workflows/ubuntu_20.04/Dockerfile.ci
index 571bdd4495db..ebeab9487961 100644
--- a/.github/workflows/ubuntu_20.04/Dockerfile.ci
+++ b/.github/workflows/ubuntu_20.04/Dockerfile.ci
@@ -37,6 +37,7 @@ RUN apt-get update -y \
     libfreexl-dev \
     libfyba-dev \
     libgeos-dev \
+    libgeotiff-dev \
     libgif-dev \
     libhdf4-alt-dev \
     libhdf5-serial-dev \
@@ -75,7 +76,7 @@ RUN apt-get update -y \
     numactl \
     ocl-icd-opencl-dev \
     opencl-c-headers \
-    openjdk-8-jdk \
+    openjdk-8-jdk-headless \
     pkg-config \
     python3-dev \
     python3-numpy \
@@ -182,12 +183,12 @@ RUN mkdir geos \
     && rm -rf geos
 
 # Install pdfium
-RUN wget -q https://github.com/rouault/pdfium_build_gdal_3_9/releases/download/pdfium_6309_v1/install-ubuntu2004-rev6309.tar.gz \
-  && tar -xzf install-ubuntu2004-rev6309.tar.gz \
+RUN wget -q https://github.com/rouault/pdfium_build_gdal_3_10/releases/download/pdfium_6677_v1/install-ubuntu2004-rev6677.tar.gz \
+  && tar -xzf install-ubuntu2004-rev6677.tar.gz \
   && chown -R root:root install \
   && mv install/lib/* /usr/lib/ \
   && mv install/include/* /usr/include/ \
-  && rm -rf install-ubuntu2004-rev6309.tar.gz install
+  && rm -rf install-ubuntu2004-rev6677.tar.gz install
 
 # HANA: client side
 # Install hdbsql tool
@@ -258,8 +259,22 @@ RUN mkdir sqlite \
     && cd .. \
     && rm -rf sqlite
 
+# Build libOpenDRIVE
+ARG OPENDRIVE_VERSION=0.6.0-gdal
+RUN if test "${OPENDRIVE_VERSION}" != ""; then ( \
+    wget -q https://github.com/DLR-TS/libOpenDRIVE/archive/refs/tags/${OPENDRIVE_VERSION}.tar.gz \
+    && tar xzf ${OPENDRIVE_VERSION}.tar.gz \
+    && rm -f ${OPENDRIVE_VERSION}.tar.gz \
+    && cd libOpenDRIVE-${OPENDRIVE_VERSION} \
+    && cmake . -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr/ \
+    && make -j$(nproc) \
+    && make install \
+    && cd .. \
+    && rm -rf libOpenDRIVE-${OPENDRIVE_VERSION} \
+    ); fi
+
 RUN ldconfig
 
 COPY requirements.txt /tmp/
 RUN python3 -m pip install -U -r /tmp/requirements.txt
-RUN python3 -m pip install cfchecker
diff --git a/.github/workflows/ubuntu_20.04/build.sh b/.github/workflows/ubuntu_20.04/build.sh
index 510a463b79cf..54fe24572fba 100755
--- a/.github/workflows/ubuntu_20.04/build.sh
+++ b/.github/workflows/ubuntu_20.04/build.sh
@@ -5,12 +5,12 @@ set -eu
 export CXXFLAGS="-march=native -O2 -Wodr -flto-odr-type-merging -Werror"
 export CFLAGS="-O2 -march=native -Werror"
 
-cmake ${GDAL_SOURCE_DIR:=..} \
+cmake "${GDAL_SOURCE_DIR:=..}" \
     -DUSE_CCACHE=ON \
     -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DGDAL_USE_TIFF_INTERNAL=ON \
-    -DGDAL_USE_GEOTIFF_INTERNAL=ON \
+    -DCMAKE_INSTALL_PREFIX=/tmp/install-gdal \
+    -DGDAL_USE_TIFF_INTERNAL=OFF \
+    -DGDAL_USE_GEOTIFF_INTERNAL=OFF \
     -DECW_ROOT=/opt/libecwj2-3.3 \
     -DMRSID_ROOT=/usr/local \
     -DFileGDB_ROOT=/usr/local/FileGDB_API \
@@ -20,5 +20,75 @@ cmake ${GDAL_SOURCE_DIR:=..} \
 unset CXXFLAGS
 unset CFLAGS
 
-make -j$(nproc)
-make -j$(nproc) install DESTDIR=/tmp/install-gdal
+make "-j$(nproc)"
+make "-j$(nproc)" install
+
+# Download Oracle SDK
+wget https://download.oracle.com/otn_software/linux/instantclient/1923000/instantclient-basic-linux.x64-19.23.0.0.0dbru.zip
+wget https://download.oracle.com/otn_software/linux/instantclient/1923000/instantclient-sdk-linux.x64-19.23.0.0.0dbru.zip
+unzip -o instantclient-basic-linux.x64-19.23.0.0.0dbru.zip
+unzip -o instantclient-sdk-linux.x64-19.23.0.0.0dbru.zip
+
+# Test building MrSID driver in standalone mode
+mkdir build_mrsid
+cd build_mrsid
+cmake -S ${GDAL_SOURCE_DIR:=..}/frmts/mrsid -DMRSID_ROOT=/usr/local -DCMAKE_PREFIX_PATH=/tmp/install-gdal
+cmake --build . "-j$(nproc)"
+test -f gdal_MrSID.so
+cd ..
+
+# Test building OCI driver in standalone mode
+mkdir build_oci
+cd build_oci
+cmake -S "${GDAL_SOURCE_DIR:=..}/ogr/ogrsf_frmts/oci" "-DOracle_ROOT=$PWD/../instantclient_19_23" -DCMAKE_PREFIX_PATH=/tmp/install-gdal
+cmake --build . "-j$(nproc)"
+test -f ogr_OCI.so
+cd ..
+
+# Test building GeoRaster driver in standalone mode
+mkdir build_georaster
+cd build_georaster
+cmake -S "${GDAL_SOURCE_DIR:=..}/frmts/georaster" -DCMAKE_PREFIX_PATH=/tmp/install-gdal "-DOracle_ROOT=$PWD/../instantclient_19_23"
+cmake --build . "-j$(nproc)"
+test -f gdal_GEOR.so
+cd ..
+
+# Test building Parquet driver in standalone mode
+mkdir build_parquet
+cd build_parquet
+cmake -S "${GDAL_SOURCE_DIR:=..}/ogr/ogrsf_frmts/parquet" -DCMAKE_PREFIX_PATH=/tmp/install-gdal
+cmake --build . "-j$(nproc)"
+test -f ogr_Parquet.so
+cd ..
+
+# Test building Arrow driver in standalone mode
+mkdir build_arrow
+cd build_arrow
+cmake -S "${GDAL_SOURCE_DIR:=..}/ogr/ogrsf_frmts/arrow" -DCMAKE_PREFIX_PATH=/tmp/install-gdal
+cmake --build . "-j$(nproc)"
+test -f ogr_Arrow.so
+cd ..
+
+# Test building OpenJPEG driver in standalone mode
+mkdir build_openjpeg
+cd build_openjpeg
+cmake -S "${GDAL_SOURCE_DIR:=..}/frmts/openjpeg" -DCMAKE_PREFIX_PATH=/tmp/install-gdal
+cmake --build . "-j$(nproc)"
+test -f gdal_JP2OpenJPEG.so
+cd ..
+
+# Test building TileDB driver in standalone mode
+mkdir build_tiledb
+cd build_tiledb
+cmake -S "${GDAL_SOURCE_DIR:=..}/frmts/tiledb" -DCMAKE_PREFIX_PATH=/tmp/install-gdal
+cmake --build . "-j$(nproc)"
+test -f gdal_TileDB.so
+cd ..
+
+# Test building ECW driver in standalone mode
+mkdir build_ecw
+cd build_ecw
+cmake -S "${GDAL_SOURCE_DIR:=..}/frmts/ecw" -DCMAKE_PREFIX_PATH=/tmp/install-gdal -DECW_ROOT=/opt/libecwj2-3.3
+cmake --build . "-j$(nproc)"
+test -f gdal_ECW_JP2ECW.so
+cd ..
diff --git a/.github/workflows/ubuntu_22.04/Dockerfile.ci b/.github/workflows/ubuntu_22.04/Dockerfile.ci
index 394f7448c20c..db60a6e92941 100644
--- a/.github/workflows/ubuntu_22.04/Dockerfile.ci
+++ b/.github/workflows/ubuntu_22.04/Dockerfile.ci
@@ -16,6 +16,7 @@ RUN apt-get update && \
     g++ \
     git \
     gpsbabel \
+    libavif-dev \
     libblosc-dev \
     libboost-dev \
     libcairo2-dev \
@@ -58,7 +59,7 @@ RUN apt-get update && \
     locales \
     mysql-client-core-8.0 \
     netcdf-bin \
-    openjdk-8-jdk \
+    openjdk-8-jdk-headless \
     poppler-utils \
     postgis \
     postgresql-client \
@@ -105,6 +106,21 @@ RUN mkdir mongocxx \
     && cd ../.. \
     && rm -rf mongocxx
 
+# Build libOpenDRIVE
+ARG OPENDRIVE_VERSION=0.6.0-gdal
+RUN if test "${OPENDRIVE_VERSION}" != ""; then ( \
+    wget -q https://github.com/DLR-TS/libOpenDRIVE/archive/refs/tags/${OPENDRIVE_VERSION}.tar.gz \
+    && tar xzf ${OPENDRIVE_VERSION}.tar.gz \
+    && rm -f ${OPENDRIVE_VERSION}.tar.gz \
+    && cd libOpenDRIVE-${OPENDRIVE_VERSION} \
+    && cmake . -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr/ \
+    && make -j$(nproc) \
+    && make install \
+    && cd .. \
+    && rm -rf libOpenDRIVE-${OPENDRIVE_VERSION} \
+    ); fi
+
 # ESRI File Geodatabase API
 RUN curl -L -O https://github.com/Esri/file-geodatabase-api/raw/master/FileGDB_API_1.5/FileGDB_API_1_5_64gcc51.tar.gz \
 	&& tar xzf FileGDB_API_1_5_64gcc51.tar.gz \
diff --git a/.github/workflows/ubuntu_22.04/services.sh b/.github/workflows/ubuntu_22.04/services.sh
index d4d9c002aa2c..19fe9c62404a 100755
--- a/.github/workflows/ubuntu_22.04/services.sh
+++ b/.github/workflows/ubuntu_22.04/services.sh
@@ -7,9 +7,9 @@ set -ex
 ##################
 
 # MSSQL: server side
-docker rm -f gdal-sql1
-docker pull mcr.microsoft.com/mssql/server:2017-latest
-docker run  -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=DummyPassw0rd'  -p 1433:1433 --name gdal-sql1 -d mcr.microsoft.com/mssql/server:2017-latest
+#docker rm -f gdal-sql1
+#docker pull mcr.microsoft.com/mssql/server:2017-latest
+#docker run  -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=DummyPassw0rd'  -p 1433:1433 --name gdal-sql1 -d mcr.microsoft.com/mssql/server:2017-latest
 
 # MySQL 8
 docker rm -f gdal-mysql1
@@ -38,7 +38,7 @@ docker run --name gdal-mongo -p 27018:27017 -d mongo:4.4
 sleep 10
 
 # MSSQL
-docker exec -t gdal-sql1 /opt/mssql-tools/bin/sqlcmd -l 30 -S localhost -U SA -P DummyPassw0rd -Q "CREATE DATABASE TestDB"
+#docker exec -t gdal-sql1 /opt/mssql-tools/bin/sqlcmd -l 30 -S localhost -U SA -P DummyPassw0rd -Q "CREATE DATABASE TestDB"
 
 # MySQL
 docker exec gdal-mysql1 sh -c "echo 'CREATE DATABASE test; SELECT Version()' | mysql -uroot -ppasswd"
diff --git a/.github/workflows/ubuntu_22.04/test.sh b/.github/workflows/ubuntu_22.04/test.sh
index 9af1dd53f7b7..8bcc8b27ba80 100755
--- a/.github/workflows/ubuntu_22.04/test.sh
+++ b/.github/workflows/ubuntu_22.04/test.sh
@@ -31,6 +31,6 @@ AZURE_STORAGE_CONNECTION_STRING=${AZURITE_STORAGE_CONNECTION_STRING} python3 -c
 # MongoDB v3
 (cd autotest && MONGODBV3_TEST_PORT=27018 MONGODBV3_TEST_HOST=$IP $PYTEST ogr/ogr_mongodbv3.py)
 
-(cd autotest && OGR_MSSQL_CONNECTION_STRING="MSSQL:server=$IP;database=TestDB;driver=ODBC Driver 17 for SQL Server;UID=SA;PWD=DummyPassw0rd" $PYTEST ogr/ogr_mssqlspatial.py)
+#(cd autotest && OGR_MSSQL_CONNECTION_STRING="MSSQL:server=$IP;database=TestDB;driver=ODBC Driver 17 for SQL Server;UID=SA;PWD=DummyPassw0rd" $PYTEST ogr/ogr_mssqlspatial.py)
 
 (cd autotest && $PYTEST)
diff --git a/.github/workflows/ubuntu_24.04/Dockerfile.ci b/.github/workflows/ubuntu_24.04/Dockerfile.ci
index ca7d79c92bb1..9d4f4137480d 100644
--- a/.github/workflows/ubuntu_24.04/Dockerfile.ci
+++ b/.github/workflows/ubuntu_24.04/Dockerfile.ci
@@ -16,6 +16,7 @@ RUN apt-get update && \
     g++ \
     git \
     gpsbabel \
+    libavif-dev \
     libblosc-dev \
     libboost-dev \
     libcairo2-dev \
@@ -31,6 +32,7 @@ RUN apt-get update && \
     libgif-dev \
     libhdf4-alt-dev \
     libhdf5-serial-dev \
+    libheif-dev \
     libjpeg-dev \
     libjxl-dev \
     libkml-dev \
@@ -59,7 +61,7 @@ RUN apt-get update && \
     locales \
     mysql-client-core-8.0 \
     netcdf-bin \
-    openjdk-8-jdk \
+    openjdk-8-jdk-headless \
     poppler-utils \
     postgis \
     postgresql-client \
@@ -106,6 +108,21 @@ RUN mkdir mongocxx \
     && cd ../.. \
     && rm -rf mongocxx
 
+# Build libOpenDRIVE
+ARG OPENDRIVE_VERSION=0.6.0-gdal
+RUN if test "${OPENDRIVE_VERSION}" != ""; then ( \
+    wget -q https://github.com/DLR-TS/libOpenDRIVE/archive/refs/tags/${OPENDRIVE_VERSION}.tar.gz \
+    && tar xzf ${OPENDRIVE_VERSION}.tar.gz \
+    && rm -f ${OPENDRIVE_VERSION}.tar.gz \
+    && cd libOpenDRIVE-${OPENDRIVE_VERSION} \
+    && cmake . -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr/ \
+    && make -j$(nproc) \
+    && make install \
+    && cd .. \
+    && rm -rf libOpenDRIVE-${OPENDRIVE_VERSION} \
+    ); fi
+
 # ESRI File Geodatabase API
 RUN curl -L -O https://github.com/Esri/file-geodatabase-api/raw/master/FileGDB_API_1.5/FileGDB_API_1_5_64gcc51.tar.gz \
 	&& tar xzf FileGDB_API_1_5_64gcc51.tar.gz \
@@ -129,3 +146,6 @@ RUN ln -s /usr/lib/x86_64-linux-gnu/ogdi/4.1/libvrf.so /usr/lib/x86_64-linux-gnu
 COPY requirements.txt /tmp/
 RUN python3 -m pip install -U --break-system-packages -r /tmp/requirements.txt
 
+# cfchecker requires udunits2
+RUN apt-get install -y --allow-unauthenticated libudunits2-0 libudunits2-data
+RUN python3 -m pip install --break-system-packages cfchecker
diff --git a/.github/workflows/ubuntu_24.04/expected_gdalinfo_formats.txt b/.github/workflows/ubuntu_24.04/expected_gdalinfo_formats.txt
new file mode 100644
index 000000000000..3940ca1d8b77
--- /dev/null
+++ b/.github/workflows/ubuntu_24.04/expected_gdalinfo_formats.txt
@@ -0,0 +1,157 @@
+Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subdatasets)
+  VRT -raster,multidimensional raster- (rw+v): Virtual Raster (*.vrt)
+  DERIVED -raster- (ro): Derived datasets using VRT pixel functions
+  GTI -raster- (rov): GDAL Raster Tile Index (*.gti.gpkg, *.gti.fgb, *.gti)
+  SNAP_TIFF -raster- (rov): Sentinel Application Processing GeoTIFF (*.tif, *.tiff)
+  GTiff -raster- (rw+vs): GeoTIFF (*.tif, *.tiff)
+  COG -raster- (wv): Cloud optimized GeoTIFF generator (*.tif, *.tiff)
+  NITF -raster- (rw+vs): National Imagery Transmission Format (*.ntf)
+  RPFTOC -raster- (rovs): Raster Product Format TOC format (*.toc)
+  ECRGTOC -raster- (rovs): ECRG TOC format (*.xml)
+  HFA -raster- (rw+v): Erdas Imagine Images (.img) (*.img)
+  SAR_CEOS -raster- (rov): CEOS SAR Image
+  CEOS -raster- (rov): CEOS Image
+  JAXAPALSAR -raster- (rov): JAXA PALSAR Product Reader (Level 1.1/1.5)
+  GFF -raster- (rov): Ground-based SAR Applications Testbed File Format (.gff) (*.gff)
+  ELAS -raster- (rw+v): ELAS
+  ESRIC -raster- (rov): Esri Compact Cache (*.json, *.tpkx)
+  AIG -raster- (rov): Arc/Info Binary Grid
+  AAIGrid -raster- (rwv): Arc/Info ASCII Grid (*.asc)
+  GRASSASCIIGrid -raster- (rov): GRASS ASCII Grid
+  ISG -raster- (rov): International Service for the Geoid (*.isg)
+  SDTS -raster- (rov): SDTS Raster (*.ddf)
+  DTED -raster- (rwv): DTED Elevation Raster (*.dt0, *.dt1, *.dt2)
+  PNG -raster- (rwv): Portable Network Graphics (*.png)
+  JPEG -raster- (rwv): JPEG JFIF (*.jpg, *.jpeg)
+  MEM -raster,multidimensional raster- (rw+): In Memory Raster
+  JDEM -raster- (rov): Japanese DEM (.mem) (*.mem)
+  GIF -raster- (rwv): Graphics Interchange Format (.gif) (*.gif)
+  BIGGIF -raster- (rov): Graphics Interchange Format (.gif) (*.gif)
+  ESAT -raster- (rov): Envisat Image Format (*.n1)
+  FITS -raster,vector- (rw+): Flexible Image Transport System (*.fits)
+  BSB -raster- (rov): Maptech BSB Nautical Charts (*.kap)
+  XPM -raster- (rwv): X11 PixMap Format (*.xpm)
+  BMP -raster- (rw+v): MS Windows Device Independent Bitmap (*.bmp)
+  DIMAP -raster- (rovs): SPOT DIMAP
+  AirSAR -raster- (rov): AirSAR Polarimetric Image
+  RS2 -raster- (rovs): RadarSat 2 XML Product
+  SAFE -raster- (rov): Sentinel-1 SAR SAFE Product
+  PCIDSK -raster,vector- (rw+v): PCIDSK Database File (*.pix)
+  PCRaster -raster- (rw+): PCRaster Raster File (*.map)
+  ILWIS -raster- (rw+v): ILWIS Raster Map (*.mpr, *.mpl)
+  SGI -raster- (rw+v): SGI Image File Format 1.0 (*.rgb)
+  SRTMHGT -raster- (rwv): SRTMHGT File Format (*.hgt)
+  Leveller -raster- (rw+v): Leveller heightfield (*.ter)
+  Terragen -raster- (rw+v): Terragen heightfield (*.ter)
+  netCDF -raster,multidimensional raster,vector- (rw+vs): Network Common Data Format (*.nc)
+  HDF4 -raster,multidimensional raster- (ros): Hierarchical Data Format Release 4 (*.hdf)
+  HDF4Image -raster- (rw+): HDF4 Dataset
+  ISIS3 -raster- (rw+v): USGS Astrogeology ISIS cube (Version 3) (*.lbl, *.cub)
+  ISIS2 -raster- (rw+v): USGS Astrogeology ISIS cube (Version 2)
+  PDS -raster- (rov): NASA Planetary Data System
+  PDS4 -raster,vector- (rw+vs): NASA Planetary Data System 4 (*.xml)
+  VICAR -raster,vector- (rw+v): MIPL VICAR file
+  TIL -raster- (rov): EarthWatch .TIL
+  ERS -raster- (rw+v): ERMapper .ers Labelled (*.ers)
+  JP2OpenJPEG -raster,vector- (rwv): JPEG-2000 driver based on JP2OpenJPEG library (*.jp2, *.j2k)
+  L1B -raster- (rovs): NOAA Polar Orbiter Level 1b Data Set
+  FIT -raster- (rwv): FIT Image
+  GRIB -raster,multidimensional raster- (rwv): GRIdded Binary (.grb, .grb2) (*.grb, *.grb2, *.grib2)
+  RMF -raster- (rw+v): Raster Matrix Format (*.rsw)
+  WCS -raster- (rovs): OGC Web Coverage Service
+  WMS -raster- (rwvs): OGC Web Map Service
+  MSGN -raster- (rov): EUMETSAT Archive native (.nat) (*.nat)
+  RST -raster- (rw+v): Idrisi Raster A.1 (*.rst)
+  GSAG -raster- (rwv): Golden Software ASCII Grid (.grd) (*.grd)
+  GSBG -raster- (rw+v): Golden Software Binary Grid (.grd) (*.grd)
+  GS7BG -raster- (rw+v): Golden Software 7 Binary Grid (.grd) (*.grd)
+  COSAR -raster- (rov): COSAR Annotated Binary Matrix (TerraSAR-X)
+  TSX -raster- (rov): TerraSAR-X Product
+  COASP -raster- (ro): DRDC COASP SAR Processor Raster (*.hdr)
+  R -raster- (rwv): R Object Data Store (*.rda)
+  MAP -raster- (rov): OziExplorer .MAP
+  KMLSUPEROVERLAY -raster- (rwv): Kml Super Overlay (*.kml, *.kmz)
+  WEBP -raster- (rwv): WEBP (*.webp)
+  PDF -raster,vector- (rw+vs): Geospatial PDF (*.pdf)
+  Rasterlite -raster- (rwvs): Rasterlite (*.sqlite)
+  MBTiles -raster,vector- (rw+v): MBTiles (*.mbtiles)
+  PLMOSAIC -raster- (ro): Planet Labs Mosaics API
+  CALS -raster- (rwv): CALS (Type 1) (*.cal, *.ct1)
+  WMTS -raster- (rwv): OGC Web Map Tile Service
+  SENTINEL2 -raster- (rovs): Sentinel 2
+  MRF -raster- (rw+v): Meta Raster Format (*.mrf)
+  PNM -raster- (rw+v): Portable Pixmap Format (netpbm) (*.pgm, *.ppm, *.pnm)
+  DOQ1 -raster- (rov): USGS DOQ (Old Style)
+  DOQ2 -raster- (rov): USGS DOQ (New Style)
+  PAux -raster- (rw+v): PCI .aux Labelled
+  MFF -raster- (rw+v): Vexcel MFF Raster (*.hdr)
+  MFF2 -raster- (rw+): Vexcel MFF2 (HKV) Raster
+  GSC -raster- (rov): GSC Geogrid
+  FAST -raster- (rov): EOSAT FAST Format
+  BT -raster- (rw+v): VTP .bt (Binary Terrain) 1.3 Format (*.bt)
+  LAN -raster- (rw+v): Erdas .LAN/.GIS
+  CPG -raster- (rov): Convair PolGASP
+  NDF -raster- (rov): NLAPS Data Format
+  EIR -raster- (rov): Erdas Imagine Raw
+  DIPEx -raster- (rov): DIPEx
+  LCP -raster- (rwv): FARSITE v.4 Landscape File (.lcp) (*.lcp)
+  GTX -raster- (rw+v): NOAA Vertical Datum .GTX (*.gtx)
+  LOSLAS -raster- (rov): NADCON .los/.las Datum Grid Shift
+  NTv2 -raster- (rw+vs): NTv2 Datum Grid Shift (*.gsb, *.gvb)
+  CTable2 -raster- (rw+v): CTable2 Datum Grid Shift
+  ACE2 -raster- (rov): ACE2 (*.ACE2)
+  SNODAS -raster- (rov): Snow Data Assimilation System (*.hdr)
+  KRO -raster- (rw+v): KOLOR Raw (*.kro)
+  ROI_PAC -raster- (rw+v): ROI_PAC raster
+  RRASTER -raster- (rw+v): R Raster (*.grd)
+  BYN -raster- (rw+v): Natural Resources Canada's Geoid (*.byn, *.err)
+  NOAA_B -raster- (rov): NOAA GEOCON/NADCON5 .b format (*.b)
+  NSIDCbin -raster- (rov): NSIDC Sea Ice Concentrations binary (.bin) (*.bin)
+  RIK -raster- (rov): Swedish Grid RIK (.rik) (*.rik)
+  USGSDEM -raster- (rwv): USGS Optional ASCII DEM (and CDED) (*.dem)
+  GXF -raster- (rov): GeoSoft Grid Exchange Format (*.gxf)
+  BAG -raster,multidimensional raster,vector- (rw+v): Bathymetry Attributed Grid (*.bag)
+  S102 -raster,multidimensional raster- (rovs): S-102 Bathymetric Surface Product (*.h5)
+  S104 -raster,multidimensional raster- (rov): S-104 Water Level Information for Surface Navigation Product (*.h5)
+  S111 -raster,multidimensional raster- (rov): Surface Currents Product (*.h5)
+  HDF5 -raster,multidimensional raster- (rovs): Hierarchical Data Format Release 5 (*.h5, *.hdf5)
+  HDF5Image -raster- (rov): HDF5 Dataset
+  NWT_GRD -raster- (rw+v): Northwood Numeric Grid Format .grd/.tab (*.grd)
+  NWT_GRC -raster- (rov): Northwood Classified Grid Format .grc/.tab (*.grc)
+  ADRG -raster- (rw+vs): ARC Digitized Raster Graphics (*.gen)
+  SRP -raster- (rovs): Standard Raster Product (ASRP/USRP) (*.img)
+  BLX -raster- (rwv): Magellan topo (.blx) (*.blx)
+  GeoRaster -raster- (rw+s): Oracle Spatial GeoRaster
+  PostGISRaster -raster- (rws): PostGIS Raster driver
+  SAGA -raster- (rw+v): SAGA GIS Binary Grid (.sdat, .sg-grd-z) (*.sdat, *.sg-grd-z)
+  XYZ -raster- (rwv): ASCII Gridded XYZ (*.xyz)
+  HF2 -raster- (rwv): HF2/HFZ heightfield raster (*.hf2)
+  OZI -raster- (rov): OziExplorer Image File
+  CTG -raster- (rov): USGS LULC Composite Theme Grid
+  ZMap -raster- (rwv): ZMap Plus Grid (*.dat)
+  NGSGEOID -raster- (rov): NOAA NGS Geoid Height Grids (*.bin)
+  IRIS -raster- (rov): IRIS data (.PPI, .CAPPi etc) (*.ppi)
+  PRF -raster- (rov): Racurs PHOTOMOD PRF (*.prf)
+  EEDAI -raster- (ros): Earth Engine Data API Image
+  DAAS -raster- (ro): Airbus DS Intelligence Data As A Service driver
+  SIGDEM -raster- (rwv): Scaled Integer Gridded DEM .sigdem (*.sigdem)
+  EXR -raster- (rw+vs): Extended Dynamic Range Image File Format (*.exr)
+  AVIF -raster- (rwvs): AV1 Image File Format (*.avif)
+  HEIF -raster- (rov): ISO/IEC 23008-12:2017 High Efficiency Image File Format (*.heic)
+  TGA -raster- (rov): TGA/TARGA Image File Format (*.tga)
+  OGCAPI -raster,vector- (rov): OGCAPI
+  STACTA -raster- (rovs): Spatio-Temporal Asset Catalog Tiled Assets (*.json)
+  STACIT -raster- (rovs): Spatio-Temporal Asset Catalog Items
+  JPEGXL -raster- (rwv): JPEG-XL (*.jxl)
+  GPKG -raster,vector- (rw+vs): GeoPackage (*.gpkg, *.gpkg.zip)
+  SQLite -raster,vector- (rw+v): SQLite / Spatialite / RasterLite2 (*.sqlite, *.db)
+  OpenFileGDB -raster,vector- (rw+v): ESRI FileGDB (*.gdb)
+  CAD -raster,vector- (rovs): AutoCAD Driver (*.dwg)
+  PLSCENES -raster,vector- (ro): Planet Labs Scenes API
+  NGW -raster,vector- (rw+s): NextGIS Web
+  GenBin -raster- (rov): Generic Binary (.hdr Labelled)
+  ENVI -raster- (rw+v): ENVI .hdr Labelled
+  EHdr -raster- (rw+v): ESRI .hdr Labelled (*.bil)
+  ISCE -raster- (rw+v): ISCE raster
+  Zarr -raster,multidimensional raster- (rw+vs): Zarr
+  HTTP -raster,vector- (ro): HTTP Fetching Wrapper
diff --git a/.github/workflows/ubuntu_24.04/expected_ogrinfo_formats.txt b/.github/workflows/ubuntu_24.04/expected_ogrinfo_formats.txt
new file mode 100644
index 000000000000..b365a54281a2
--- /dev/null
+++ b/.github/workflows/ubuntu_24.04/expected_ogrinfo_formats.txt
@@ -0,0 +1,88 @@
+Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subdatasets)
+  FITS -raster,vector- (rw+): Flexible Image Transport System (*.fits)
+  PCIDSK -raster,vector- (rw+v): PCIDSK Database File (*.pix)
+  netCDF -raster,multidimensional raster,vector- (rw+vs): Network Common Data Format (*.nc)
+  PDS4 -raster,vector- (rw+vs): NASA Planetary Data System 4 (*.xml)
+  VICAR -raster,vector- (rw+v): MIPL VICAR file
+  JP2OpenJPEG -raster,vector- (rwv): JPEG-2000 driver based on JP2OpenJPEG library (*.jp2, *.j2k)
+  PDF -raster,vector- (rw+vs): Geospatial PDF (*.pdf)
+  MBTiles -raster,vector- (rw+v): MBTiles (*.mbtiles)
+  BAG -raster,multidimensional raster,vector- (rw+v): Bathymetry Attributed Grid (*.bag)
+  EEDA -vector- (ro): Earth Engine Data API
+  OGCAPI -raster,vector- (rov): OGCAPI
+  ESRI Shapefile -vector- (rw+v): ESRI Shapefile (*.shp, *.dbf, *.shz, *.shp.zip)
+  MapInfo File -vector- (rw+v): MapInfo File (*.tab, *.mif, *.mid)
+  UK .NTF -vector- (rov): UK .NTF
+  LVBAG -vector- (rov): Kadaster LV BAG Extract 2.0 (*.xml)
+  OGR_SDTS -vector- (rov): SDTS
+  S57 -vector- (rw+v): IHO S-57 (ENC) (*.000)
+  DGN -vector- (rw+v): Microstation DGN (*.dgn)
+  OGR_VRT -vector- (rov): VRT - Virtual Datasource (*.vrt)
+  Memory -vector- (rw+): Memory
+  CSV -vector- (rw+v): Comma Separated Value (.csv) (*.csv, *.tsv, *.psv)
+  NAS -vector- (rov): NAS - ALKIS (*.xml)
+  GML -vector- (rw+v): Geography Markup Language (GML) (*.gml, *.xml)
+  GPX -vector- (rw+v): GPX (*.gpx)
+  LIBKML -vector- (rw+v): Keyhole Markup Language (LIBKML) (*.kml, *.kmz)
+  KML -vector- (rw+v): Keyhole Markup Language (KML) (*.kml)
+  GeoJSON -vector- (rw+v): GeoJSON (*.json, *.geojson)
+  GeoJSONSeq -vector- (rw+v): GeoJSON Sequence (*.geojsonl, *.geojsons)
+  ESRIJSON -vector- (rov): ESRIJSON (*.json)
+  TopoJSON -vector- (rov): TopoJSON (*.json, *.topojson)
+  Interlis 1 -vector- (rw+v): Interlis 1 (*.itf, *.ili)
+  Interlis 2 -vector- (rw+v): Interlis 2 (*.xtf, *.xml, *.ili)
+  OGR_GMT -vector- (rw+v): GMT ASCII Vectors (.gmt) (*.gmt)
+  GPKG -raster,vector- (rw+vs): GeoPackage (*.gpkg, *.gpkg.zip)
+  SQLite -raster,vector- (rw+v): SQLite / Spatialite / RasterLite2 (*.sqlite, *.db)
+  ODBC -vector- (ro): Open Database Connectivity (ODBC) (*.mdb, *.accdb)
+  WAsP -vector- (rw+v): WAsP .map format (*.map)
+  PGeo -vector- (ro): ESRI Personal GeoDatabase (*.mdb)
+  MSSQLSpatial -vector- (rw+): Microsoft SQL Server Spatial Database (BCP)
+  OGR_OGDI -vector- (ro): OGDI Vectors (VPF, VMAP, DCW)
+  PostgreSQL -vector- (rw+): PostgreSQL/PostGIS
+  MySQL -vector- (rw+): MySQL
+  OCI -vector- (rw+): Oracle Spatial
+  OpenFileGDB -raster,vector- (rw+v): ESRI FileGDB (*.gdb)
+  FileGDB -vector- (rw+): ESRI FileGDB (*.gdb)
+  DXF -vector- (rw+v): AutoCAD DXF (*.dxf)
+  CAD -raster,vector- (rovs): AutoCAD Driver (*.dwg)
+  FlatGeobuf -vector- (rw+v): FlatGeobuf (*.fgb)
+  Geoconcept -vector- (rw+v): Geoconcept (*.gxt, *.txt)
+  GeoRSS -vector- (rw+v): GeoRSS
+  VFK -vector- (ro): Czech Cadastral Exchange Data Format (*.vfk)
+  PGDUMP -vector- (w+v): PostgreSQL SQL dump (*.sql)
+  OSM -vector- (rov): OpenStreetMap XML and PBF (*.osm, *.pbf)
+  GPSBabel -vector- (rw+): GPSBabel (*.mps, *.gdb, *.osm, *.tcx, *.igc)
+  OGR_PDS -vector- (rov): Planetary Data Systems TABLE
+  WFS -vector- (rov): OGC WFS (Web Feature Service)
+  OAPIF -vector- (ro): OGC API - Features
+  SOSI -vector- (ro): Norwegian SOSI Standard
+  EDIGEO -vector- (rov): French EDIGEO exchange format (*.thf)
+  SVG -vector- (rov): Scalable Vector Graphics (*.svg)
+  Idrisi -vector- (rov): Idrisi Vector (.vct) (*.vct)
+  XLS -vector- (ro): MS Excel format (*.xls)
+  ODS -vector- (rw+v): Open Document/ LibreOffice / OpenOffice Spreadsheet (*.ods)
+  XLSX -vector- (rw+v): MS Office Open XML spreadsheet (*.xlsx, *.xlsm)
+  Elasticsearch -vector- (rw+): Elastic Search
+  Carto -vector- (rw+): Carto
+  AmigoCloud -vector- (rw+): AmigoCloud
+  SXF -vector- (rov): Storage and eXchange Format (*.sxf)
+  Selafin -vector- (rw+v): Selafin
+  JML -vector- (rw+v): OpenJUMP JML (*.jml)
+  PLSCENES -raster,vector- (ro): Planet Labs Scenes API
+  CSW -vector- (ro): OGC CSW (Catalog  Service for the Web)
+  MongoDBv3 -vector- (ro): MongoDB (using libmongocxx v3 client)
+  VDV -vector- (rw+v): VDV-451/VDV-452/INTREST Data Format (*.txt, *.x10)
+  GMLAS -vector- (rwv): Geography Markup Language (GML) driven by application schemas (*.gml, *.xml)
+  MVT -vector- (rw+v): Mapbox Vector Tiles (*.mvt, *.mvt.gz, *.pbf)
+  NGW -raster,vector- (rw+s): NextGIS Web
+  MapML -vector- (rw+v): MapML
+  GTFS -vector- (rov): General Transit Feed Specification (*.zip)
+  PMTiles -vector- (rw+v): ProtoMap Tiles (*.pmtiles)
+  JSONFG -vector- (rw+v): OGC Features and Geometries JSON (*.json)
+  MiraMonVector -vector- (rw+v): MiraMon Vectors (.pol, .arc, .pnt) (*.pol, *.arc, *.pnt)
+  XODR -vector- (ro): OpenDRIVE - Open Dynamic Road Information for Vehicle Environment (*.xodr)
+  TIGER -vector- (rov): U.S. Census TIGER/Line
+  AVCBin -vector- (rov): Arc/Info Binary Coverage
+  AVCE00 -vector- (rov): Arc/Info E00 (ASCII) Coverage (*.e00)
+  HTTP -raster,vector- (ro): HTTP Fetching Wrapper
diff --git a/.github/workflows/ubuntu_24.04/services.sh b/.github/workflows/ubuntu_24.04/services.sh
index d4d9c002aa2c..19fe9c62404a 100755
--- a/.github/workflows/ubuntu_24.04/services.sh
+++ b/.github/workflows/ubuntu_24.04/services.sh
@@ -7,9 +7,9 @@ set -ex
 ##################
 
 # MSSQL: server side
-docker rm -f gdal-sql1
-docker pull mcr.microsoft.com/mssql/server:2017-latest
-docker run  -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=DummyPassw0rd'  -p 1433:1433 --name gdal-sql1 -d mcr.microsoft.com/mssql/server:2017-latest
+#docker rm -f gdal-sql1
+#docker pull mcr.microsoft.com/mssql/server:2017-latest
+#docker run  -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=DummyPassw0rd'  -p 1433:1433 --name gdal-sql1 -d mcr.microsoft.com/mssql/server:2017-latest
 
 # MySQL 8
 docker rm -f gdal-mysql1
@@ -38,7 +38,7 @@ docker run --name gdal-mongo -p 27018:27017 -d mongo:4.4
 sleep 10
 
 # MSSQL
-docker exec -t gdal-sql1 /opt/mssql-tools/bin/sqlcmd -l 30 -S localhost -U SA -P DummyPassw0rd -Q "CREATE DATABASE TestDB"
+#docker exec -t gdal-sql1 /opt/mssql-tools/bin/sqlcmd -l 30 -S localhost -U SA -P DummyPassw0rd -Q "CREATE DATABASE TestDB"
 
 # MySQL
 docker exec gdal-mysql1 sh -c "echo 'CREATE DATABASE test; SELECT Version()' | mysql -uroot -ppasswd"
diff --git a/.github/workflows/ubuntu_24.04/test.sh b/.github/workflows/ubuntu_24.04/test.sh
index 9af1dd53f7b7..9276321ef0c0 100755
--- a/.github/workflows/ubuntu_24.04/test.sh
+++ b/.github/workflows/ubuntu_24.04/test.sh
@@ -7,6 +7,16 @@ set -e
 LD_LIBRARY_PATH="/opt/instantclient_19_9:/opt/instantclient_19_9/lib:${LD_LIBRARY_PATH}"
 export LD_LIBRARY_PATH
 
+# Check the build includes the expected drivers
+gdalinfo --formats > found_formats.txt
+ogrinfo --formats >> found_formats.txt
+cat found_formats.txt
+cat ../.github/workflows/ubuntu_24.04/expected_gdalinfo_formats.txt ../.github/workflows/ubuntu_24.04/expected_ogrinfo_formats.txt > expected_formats.txt
+diff -u expected_formats.txt found_formats.txt
+
+# Test development launcher script
+gdal_edit --version
+
 export PYTEST="python3 -m pytest -vv -p no:sugar --color=no"
 
 # Run C++ tests
@@ -31,6 +41,6 @@ AZURE_STORAGE_CONNECTION_STRING=${AZURITE_STORAGE_CONNECTION_STRING} python3 -c
 # MongoDB v3
 (cd autotest && MONGODBV3_TEST_PORT=27018 MONGODBV3_TEST_HOST=$IP $PYTEST ogr/ogr_mongodbv3.py)
 
-(cd autotest && OGR_MSSQL_CONNECTION_STRING="MSSQL:server=$IP;database=TestDB;driver=ODBC Driver 17 for SQL Server;UID=SA;PWD=DummyPassw0rd" $PYTEST ogr/ogr_mssqlspatial.py)
+# (cd autotest && OGR_MSSQL_CONNECTION_STRING="MSSQL:server=$IP;database=TestDB;driver=ODBC Driver 17 for SQL Server;UID=SA;PWD=DummyPassw0rd" $PYTEST ogr/ogr_mssqlspatial.py)
 
 (cd autotest && $PYTEST)
diff --git a/.github/workflows/windows_build.yml b/.github/workflows/windows_build.yml
index b80dd1cdad58..91146477d8be 100644
--- a/.github/workflows/windows_build.yml
+++ b/.github/workflows/windows_build.yml
@@ -4,12 +4,14 @@ on:
     push:
         paths-ignore:
             - 'doc/**'
+            - 'docker/**'
         branches-ignore:
             - 'backport**'
             - 'dependabot**'
     pull_request:
         paths-ignore:
             - 'doc/**'
+            - 'docker/**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
@@ -56,7 +58,7 @@ jobs:
           git config --global core.autocrlf false
 
       - name: Checkout
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - name: Set environment
         shell: pwsh
@@ -157,7 +159,7 @@ jobs:
             $env:PATH="$env:GITHUB_WORKSPACE;$env:PATH"
             $env:PROJ_INSTALL_DIR="$env:GITHUB_WORKSPACE"+"\install-proj"
             $env:CMAKE_INSTALL_PREFIX="-DCMAKE_INSTALL_PREFIX=" + $env:PROJ_INSTALL_DIR
-            cmake -G $env:VS_VERSION -A $env:CMAKE_ARCHITECTURE .. $env:CMAKE_INSTALL_PREFIX -DPROJ_TESTS=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_LIBPROJ_SHARED=ON -DCMAKE_TOOLCHAIN_FILE=c:/vcpkg/scripts/buildsystems/vcpkg.cmake -DBUILD_SHARED_LIBS=ON -DENABLE_CURL=OFF -DENABLE_TIFF=OFF -DBUILD_PROJSYNC=OFF
+            cmake -G $env:VS_VERSION -A $env:CMAKE_ARCHITECTURE .. $env:CMAKE_INSTALL_PREFIX -DBUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_LIBPROJ_SHARED=ON -DCMAKE_TOOLCHAIN_FILE=c:/vcpkg/scripts/buildsystems/vcpkg.cmake -DBUILD_SHARED_LIBS=ON -DENABLE_CURL=OFF -DENABLE_TIFF=OFF -DBUILD_PROJSYNC=OFF
             exec { cmake --build . --config Release --target install }
             #
             cd $env:GITHUB_WORKSPACE
diff --git a/.github/workflows/windows_conda_expected_gdalinfo_formats.txt b/.github/workflows/windows_conda_expected_gdalinfo_formats.txt
new file mode 100644
index 000000000000..4c384b47ac5a
--- /dev/null
+++ b/.github/workflows/windows_conda_expected_gdalinfo_formats.txt
@@ -0,0 +1,156 @@
+Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subdatasets)
+  VRT -raster,multidimensional raster- (rw+v): Virtual Raster (*.vrt)
+  DERIVED -raster- (ro): Derived datasets using VRT pixel functions
+  GTI -raster- (rov): GDAL Raster Tile Index (*.gti.gpkg, *.gti.fgb, *.gti)
+  SNAP_TIFF -raster- (rov): Sentinel Application Processing GeoTIFF (*.tif, *.tiff)
+  GTiff -raster- (rw+vs): GeoTIFF (*.tif, *.tiff)
+  COG -raster- (wv): Cloud optimized GeoTIFF generator (*.tif, *.tiff)
+  NITF -raster- (rw+vs): National Imagery Transmission Format (*.ntf)
+  RPFTOC -raster- (rovs): Raster Product Format TOC format (*.toc)
+  ECRGTOC -raster- (rovs): ECRG TOC format (*.xml)
+  HFA -raster- (rw+v): Erdas Imagine Images (.img) (*.img)
+  SAR_CEOS -raster- (rov): CEOS SAR Image
+  CEOS -raster- (rov): CEOS Image
+  JAXAPALSAR -raster- (rov): JAXA PALSAR Product Reader (Level 1.1/1.5)
+  GFF -raster- (rov): Ground-based SAR Applications Testbed File Format (.gff) (*.gff)
+  ELAS -raster- (rw+v): ELAS
+  ESRIC -raster- (rov): Esri Compact Cache (*.json, *.tpkx)
+  AIG -raster- (rov): Arc/Info Binary Grid
+  AAIGrid -raster- (rwv): Arc/Info ASCII Grid (*.asc)
+  GRASSASCIIGrid -raster- (rov): GRASS ASCII Grid
+  ISG -raster- (rov): International Service for the Geoid (*.isg)
+  SDTS -raster- (rov): SDTS Raster (*.ddf)
+  DTED -raster- (rwv): DTED Elevation Raster (*.dt0, *.dt1, *.dt2)
+  PNG -raster- (rwv): Portable Network Graphics (*.png)
+  JPEG -raster- (rwv): JPEG JFIF (*.jpg, *.jpeg)
+  MEM -raster,multidimensional raster- (rw+): In Memory Raster
+  JDEM -raster- (rov): Japanese DEM (.mem) (*.mem)
+  GIF -raster- (rwv): Graphics Interchange Format (.gif) (*.gif)
+  BIGGIF -raster- (rov): Graphics Interchange Format (.gif) (*.gif)
+  ESAT -raster- (rov): Envisat Image Format (*.n1)
+  FITS -raster,vector- (rw+): Flexible Image Transport System (*.fits)
+  BSB -raster- (rov): Maptech BSB Nautical Charts (*.kap)
+  XPM -raster- (rwv): X11 PixMap Format (*.xpm)
+  BMP -raster- (rw+v): MS Windows Device Independent Bitmap (*.bmp)
+  DIMAP -raster- (rovs): SPOT DIMAP
+  AirSAR -raster- (rov): AirSAR Polarimetric Image
+  RS2 -raster- (rovs): RadarSat 2 XML Product
+  SAFE -raster- (rov): Sentinel-1 SAR SAFE Product
+  PCIDSK -raster,vector- (rw+v): PCIDSK Database File (*.pix)
+  PCRaster -raster- (rw+): PCRaster Raster File (*.map)
+  ILWIS -raster- (rw+v): ILWIS Raster Map (*.mpr, *.mpl)
+  SGI -raster- (rw+v): SGI Image File Format 1.0 (*.rgb)
+  SRTMHGT -raster- (rwv): SRTMHGT File Format (*.hgt)
+  Leveller -raster- (rw+v): Leveller heightfield (*.ter)
+  Terragen -raster- (rw+v): Terragen heightfield (*.ter)
+  netCDF -raster,multidimensional raster,vector- (rw+s): Network Common Data Format (*.nc)
+  HDF4 -raster,multidimensional raster- (ros): Hierarchical Data Format Release 4 (*.hdf)
+  HDF4Image -raster- (rw+): HDF4 Dataset
+  ISIS3 -raster- (rw+v): USGS Astrogeology ISIS cube (Version 3) (*.lbl, *.cub)
+  ISIS2 -raster- (rw+v): USGS Astrogeology ISIS cube (Version 2)
+  PDS -raster- (rov): NASA Planetary Data System
+  PDS4 -raster,vector- (rw+vs): NASA Planetary Data System 4 (*.xml)
+  VICAR -raster,vector- (rw+v): MIPL VICAR file
+  TIL -raster- (rov): EarthWatch .TIL
+  ERS -raster- (rw+v): ERMapper .ers Labelled (*.ers)
+  JP2OpenJPEG -raster,vector- (rwv): JPEG-2000 driver based on JP2OpenJPEG library (*.jp2, *.j2k)
+  L1B -raster- (rovs): NOAA Polar Orbiter Level 1b Data Set
+  FIT -raster- (rwv): FIT Image
+  GRIB -raster,multidimensional raster- (rwv): GRIdded Binary (.grb, .grb2) (*.grb, *.grb2, *.grib2)
+  RMF -raster- (rw+v): Raster Matrix Format (*.rsw)
+  WCS -raster- (rovs): OGC Web Coverage Service
+  WMS -raster- (rwvs): OGC Web Map Service
+  MSGN -raster- (rov): EUMETSAT Archive native (.nat) (*.nat)
+  MSG -raster- (ro): MSG HRIT Data
+  RST -raster- (rw+v): Idrisi Raster A.1 (*.rst)
+  GSAG -raster- (rwv): Golden Software ASCII Grid (.grd) (*.grd)
+  GSBG -raster- (rw+v): Golden Software Binary Grid (.grd) (*.grd)
+  GS7BG -raster- (rw+v): Golden Software 7 Binary Grid (.grd) (*.grd)
+  COSAR -raster- (rov): COSAR Annotated Binary Matrix (TerraSAR-X)
+  TSX -raster- (rov): TerraSAR-X Product
+  COASP -raster- (ro): DRDC COASP SAR Processor Raster (*.hdr)
+  R -raster- (rwv): R Object Data Store (*.rda)
+  MAP -raster- (rov): OziExplorer .MAP
+  KMLSUPEROVERLAY -raster- (rwv): Kml Super Overlay (*.kml, *.kmz)
+  WEBP -raster- (rwv): WEBP (*.webp)
+  PDF -raster,vector- (rw+vs): Geospatial PDF (*.pdf)
+  Rasterlite -raster- (rwvs): Rasterlite (*.sqlite)
+  MBTiles -raster,vector- (rw+v): MBTiles (*.mbtiles)
+  PLMOSAIC -raster- (ro): Planet Labs Mosaics API
+  CALS -raster- (rwv): CALS (Type 1) (*.cal, *.ct1)
+  WMTS -raster- (rwv): OGC Web Map Tile Service
+  SENTINEL2 -raster- (rovs): Sentinel 2
+  MRF -raster- (rw+v): Meta Raster Format (*.mrf)
+  TileDB -raster,multidimensional raster,vector- (rw+vs): TileDB
+  PNM -raster- (rw+v): Portable Pixmap Format (netpbm) (*.pgm, *.ppm, *.pnm)
+  DOQ1 -raster- (rov): USGS DOQ (Old Style)
+  DOQ2 -raster- (rov): USGS DOQ (New Style)
+  PAux -raster- (rw+v): PCI .aux Labelled
+  MFF -raster- (rw+v): Vexcel MFF Raster (*.hdr)
+  MFF2 -raster- (rw+): Vexcel MFF2 (HKV) Raster
+  GSC -raster- (rov): GSC Geogrid
+  FAST -raster- (rov): EOSAT FAST Format
+  BT -raster- (rw+v): VTP .bt (Binary Terrain) 1.3 Format (*.bt)
+  LAN -raster- (rw+v): Erdas .LAN/.GIS
+  CPG -raster- (rov): Convair PolGASP
+  NDF -raster- (rov): NLAPS Data Format
+  EIR -raster- (rov): Erdas Imagine Raw
+  DIPEx -raster- (rov): DIPEx
+  LCP -raster- (rwv): FARSITE v.4 Landscape File (.lcp) (*.lcp)
+  GTX -raster- (rw+v): NOAA Vertical Datum .GTX (*.gtx)
+  LOSLAS -raster- (rov): NADCON .los/.las Datum Grid Shift
+  NTv2 -raster- (rw+vs): NTv2 Datum Grid Shift (*.gsb, *.gvb)
+  CTable2 -raster- (rw+v): CTable2 Datum Grid Shift
+  ACE2 -raster- (rov): ACE2 (*.ACE2)
+  SNODAS -raster- (rov): Snow Data Assimilation System (*.hdr)
+  KRO -raster- (rw+v): KOLOR Raw (*.kro)
+  ROI_PAC -raster- (rw+v): ROI_PAC raster
+  RRASTER -raster- (rw+v): R Raster (*.grd)
+  BYN -raster- (rw+v): Natural Resources Canada's Geoid (*.byn, *.err)
+  NOAA_B -raster- (rov): NOAA GEOCON/NADCON5 .b format (*.b)
+  RIK -raster- (rov): Swedish Grid RIK (.rik) (*.rik)
+  USGSDEM -raster- (rwv): USGS Optional ASCII DEM (and CDED) (*.dem)
+  GXF -raster- (rov): GeoSoft Grid Exchange Format (*.gxf)
+  KEA -raster- (rw+v): KEA Image Format (.kea) (*.kea)
+  BAG -raster,multidimensional raster,vector- (rw+v): Bathymetry Attributed Grid (*.bag)
+  S102 -raster,multidimensional raster- (rovs): S-102 Bathymetric Surface Product (*.h5)
+  S104 -raster,multidimensional raster- (rov): S-104 Water Level Information for Surface Navigation Product (*.h5)
+  S111 -raster,multidimensional raster- (rov): Surface Currents Product (*.h5)
+  HDF5 -raster,multidimensional raster- (rovs): Hierarchical Data Format Release 5 (*.h5, *.hdf5)
+  HDF5Image -raster- (rov): HDF5 Dataset
+  NWT_GRD -raster- (rw+v): Northwood Numeric Grid Format .grd/.tab (*.grd)
+  NWT_GRC -raster- (rov): Northwood Classified Grid Format .grc/.tab (*.grc)
+  ADRG -raster- (rw+vs): ARC Digitized Raster Graphics (*.gen)
+  SRP -raster- (rovs): Standard Raster Product (ASRP/USRP) (*.img)
+  BLX -raster- (rwv): Magellan topo (.blx) (*.blx)
+  PostGISRaster -raster- (rws): PostGIS Raster driver
+  SAGA -raster- (rw+v): SAGA GIS Binary Grid (.sdat, .sg-grd-z) (*.sdat, *.sg-grd-z)
+  XYZ -raster- (rwv): ASCII Gridded XYZ (*.xyz)
+  HF2 -raster- (rwv): HF2/HFZ heightfield raster (*.hf2)
+  OZI -raster- (rov): OziExplorer Image File
+  CTG -raster- (rov): USGS LULC Composite Theme Grid
+  ZMap -raster- (rwv): ZMap Plus Grid (*.dat)
+  NGSGEOID -raster- (rov): NOAA NGS Geoid Height Grids (*.bin)
+  IRIS -raster- (rov): IRIS data (.PPI, .CAPPi etc) (*.ppi)
+  PRF -raster- (rov): Racurs PHOTOMOD PRF (*.prf)
+  EEDAI -raster- (ros): Earth Engine Data API Image
+  DAAS -raster- (ro): Airbus DS Intelligence Data As A Service driver
+  SIGDEM -raster- (rwv): Scaled Integer Gridded DEM .sigdem (*.sigdem)
+  AVIF -raster- (rwvs): AV1 Image File Format (*.avif)
+  HEIF -raster- (rov): ISO/IEC 23008-12:2017 High Efficiency Image File Format (*.heic)
+  TGA -raster- (rov): TGA/TARGA Image File Format (*.tga)
+  OGCAPI -raster,vector- (rov): OGCAPI
+  STACTA -raster- (rovs): Spatio-Temporal Asset Catalog Tiled Assets (*.json)
+  STACIT -raster- (rovs): Spatio-Temporal Asset Catalog Items
+  NSIDCbin -raster- (rov): NSIDC Sea Ice Concentrations binary (.bin) (*.bin)
+  GPKG -raster,vector- (rw+vs): GeoPackage (*.gpkg, *.gpkg.zip)
+  OpenFileGDB -raster,vector- (rw+v): ESRI FileGDB (*.gdb)
+  CAD -raster,vector- (rovs): AutoCAD Driver (*.dwg)
+  PLSCENES -raster,vector- (ro): Planet Labs Scenes API
+  NGW -raster,vector- (rw+s): NextGIS Web
+  GenBin -raster- (rov): Generic Binary (.hdr Labelled)
+  ENVI -raster- (rw+v): ENVI .hdr Labelled
+  EHdr -raster- (rw+v): ESRI .hdr Labelled (*.bil)
+  ISCE -raster- (rw+v): ISCE raster
+  Zarr -raster,multidimensional raster- (rw+vs): Zarr
+  HTTP -raster,vector- (ro): HTTP Fetching Wrapper
diff --git a/.github/workflows/windows_conda_expected_ogrinfo_formats.txt b/.github/workflows/windows_conda_expected_ogrinfo_formats.txt
new file mode 100644
index 000000000000..e9de701fc9d7
--- /dev/null
+++ b/.github/workflows/windows_conda_expected_ogrinfo_formats.txt
@@ -0,0 +1,83 @@
+Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subdatasets)
+  FITS -raster,vector- (rw+): Flexible Image Transport System (*.fits)
+  PCIDSK -raster,vector- (rw+v): PCIDSK Database File (*.pix)
+  netCDF -raster,multidimensional raster,vector- (rw+s): Network Common Data Format (*.nc)
+  PDS4 -raster,vector- (rw+vs): NASA Planetary Data System 4 (*.xml)
+  VICAR -raster,vector- (rw+v): MIPL VICAR file
+  JP2OpenJPEG -raster,vector- (rwv): JPEG-2000 driver based on JP2OpenJPEG library (*.jp2, *.j2k)
+  PDF -raster,vector- (rw+vs): Geospatial PDF (*.pdf)
+  MBTiles -raster,vector- (rw+v): MBTiles (*.mbtiles)
+  TileDB -raster,multidimensional raster,vector- (rw+vs): TileDB
+  BAG -raster,multidimensional raster,vector- (rw+v): Bathymetry Attributed Grid (*.bag)
+  EEDA -vector- (ro): Earth Engine Data API
+  OGCAPI -raster,vector- (rov): OGCAPI
+  ESRI Shapefile -vector- (rw+v): ESRI Shapefile (*.shp, *.dbf, *.shz, *.shp.zip)
+  MapInfo File -vector- (rw+v): MapInfo File (*.tab, *.mif, *.mid)
+  UK .NTF -vector- (rov): UK .NTF
+  LVBAG -vector- (rov): Kadaster LV BAG Extract 2.0 (*.xml)
+  OGR_SDTS -vector- (rov): SDTS
+  S57 -vector- (rw+v): IHO S-57 (ENC) (*.000)
+  DGN -vector- (rw+v): Microstation DGN (*.dgn)
+  OGR_VRT -vector- (rov): VRT - Virtual Datasource (*.vrt)
+  Memory -vector- (rw+): Memory
+  CSV -vector- (rw+v): Comma Separated Value (.csv) (*.csv, *.tsv, *.psv)
+  NAS -vector- (rov): NAS - ALKIS (*.xml)
+  GML -vector- (rw+v): Geography Markup Language (GML) (*.gml, *.xml)
+  GPX -vector- (rw+v): GPX (*.gpx)
+  KML -vector- (rw+v): Keyhole Markup Language (KML) (*.kml)
+  GeoJSON -vector- (rw+v): GeoJSON (*.json, *.geojson)
+  GeoJSONSeq -vector- (rw+v): GeoJSON Sequence (*.geojsonl, *.geojsons)
+  ESRIJSON -vector- (rov): ESRIJSON (*.json)
+  TopoJSON -vector- (rov): TopoJSON (*.json, *.topojson)
+  Interlis 1 -vector- (rw+v): Interlis 1 (*.itf, *.ili)
+  Interlis 2 -vector- (rw+v): Interlis 2 (*.xtf, *.xml, *.ili)
+  OGR_GMT -vector- (rw+v): GMT ASCII Vectors (.gmt) (*.gmt)
+  GPKG -raster,vector- (rw+vs): GeoPackage (*.gpkg, *.gpkg.zip)
+  SQLite -vector- (rw+v): SQLite / Spatialite (*.sqlite, *.db)
+  ODBC -vector- (ro): Open Database Connectivity (ODBC) (*.mdb, *.accdb)
+  WAsP -vector- (rw+v): WAsP .map format (*.map)
+  PGeo -vector- (ro): ESRI Personal GeoDatabase (*.mdb)
+  MSSQLSpatial -vector- (rw+): Microsoft SQL Server Spatial Database (BCP)
+  PostgreSQL -vector- (rw+): PostgreSQL/PostGIS
+  OpenFileGDB -raster,vector- (rw+v): ESRI FileGDB (*.gdb)
+  DXF -vector- (rw+v): AutoCAD DXF (*.dxf)
+  CAD -raster,vector- (rovs): AutoCAD Driver (*.dwg)
+  FlatGeobuf -vector- (rw+v): FlatGeobuf (*.fgb)
+  Geoconcept -vector- (rw+v): Geoconcept (*.gxt, *.txt)
+  GeoRSS -vector- (rw+v): GeoRSS
+  VFK -vector- (ro): Czech Cadastral Exchange Data Format (*.vfk)
+  PGDUMP -vector- (w+v): PostgreSQL SQL dump (*.sql)
+  OSM -vector- (rov): OpenStreetMap XML and PBF (*.osm, *.pbf)
+  GPSBabel -vector- (rw+): GPSBabel (*.mps, *.gdb, *.osm, *.tcx, *.igc)
+  OGR_PDS -vector- (rov): Planetary Data Systems TABLE
+  WFS -vector- (rov): OGC WFS (Web Feature Service)
+  OAPIF -vector- (ro): OGC API - Features
+  EDIGEO -vector- (rov): French EDIGEO exchange format (*.thf)
+  SVG -vector- (rov): Scalable Vector Graphics (*.svg)
+  Idrisi -vector- (rov): Idrisi Vector (.vct) (*.vct)
+  XLS -vector- (ro): MS Excel format (*.xls)
+  ODS -vector- (rw+v): Open Document/ LibreOffice / OpenOffice Spreadsheet (*.ods)
+  XLSX -vector- (rw+v): MS Office Open XML spreadsheet (*.xlsx, *.xlsm)
+  Elasticsearch -vector- (rw+): Elastic Search
+  Carto -vector- (rw+): Carto
+  AmigoCloud -vector- (rw+): AmigoCloud
+  SXF -vector- (rov): Storage and eXchange Format (*.sxf)
+  Selafin -vector- (rw+v): Selafin
+  JML -vector- (rw+v): OpenJUMP JML (*.jml)
+  PLSCENES -raster,vector- (ro): Planet Labs Scenes API
+  CSW -vector- (ro): OGC CSW (Catalog  Service for the Web)
+  VDV -vector- (rw+v): VDV-451/VDV-452/INTREST Data Format (*.txt, *.x10)
+  GMLAS -vector- (rwv): Geography Markup Language (GML) driven by application schemas (*.gml, *.xml)
+  MVT -vector- (rw+v): Mapbox Vector Tiles (*.mvt, *.mvt.gz, *.pbf)
+  NGW -raster,vector- (rw+s): NextGIS Web
+  MapML -vector- (rw+v): MapML
+  Parquet -vector- (rw+v): (Geo)Parquet (*.parquet)
+  Arrow -vector- (rw+v): (Geo)Arrow IPC File Format / Stream (*.arrow, *.feather, *.arrows, *.ipc)
+  GTFS -vector- (rov): General Transit Feed Specification (*.zip)
+  PMTiles -vector- (rw+v): ProtoMap Tiles (*.pmtiles)
+  JSONFG -vector- (rw+v): OGC Features and Geometries JSON (*.json)
+  MiraMonVector -vector- (rw+v): MiraMon Vectors (.pol, .arc, .pnt) (*.pol, *.arc, *.pnt)
+  TIGER -vector- (rov): U.S. Census TIGER/Line
+  AVCBin -vector- (rov): Arc/Info Binary Coverage
+  AVCE00 -vector- (rov): Arc/Info E00 (ASCII) Coverage (*.e00)
+  HTTP -raster,vector- (ro): HTTP Fetching Wrapper
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index df38d94bc0bd..a0215f92638f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -18,7 +18,7 @@ repos:
                 autotest/ogr/data/
               )
     -   repo: https://github.com/pycqa/flake8
-        rev: 3.9.2
+        rev: 7.0.0
         hooks:
         -   id: flake8
             exclude: >
@@ -36,7 +36,8 @@ repos:
                 autotest/cpp/data/|
                 autotest/gdrivers/data/|
                 swig/|
-                third_party/|
+                third_party/fast_float/|
+                third_party/LercLib/|
                 autotest/ogr/data/|
                 alg/internal_libqhull/|
                 apps/argparse/|
@@ -57,5 +58,8 @@ repos:
                 ogr/ogrsf_frmts/geojson/libjson/|
                 ogr/ogrsf_frmts/flatgeobuf/flatbuffers/|
                 ogr/ogrsf_frmts/pmtiles/pmtiles/|
-                ogr/ogrsf_frmts/sqlite/sqlite_rtree_bulk_load
+                ogr/ogrsf_frmts/ods/ods_formula_parser.cpp|
+                ogr/ogrsf_frmts/sqlite/sqlite_rtree_bulk_load|
+                ogr/swq_parser.cpp|
+                ogr/swq_parser.hpp
               )
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
new file mode 100644
index 000000000000..58b2285412a8
--- /dev/null
+++ b/.readthedocs.yaml
@@ -0,0 +1,42 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+build:
+  os: "ubuntu-24.04"
+  tools:
+    python: "3.12"
+
+  jobs:
+    post_checkout:
+      - (git --no-pager log --pretty="tformat:%s -- %b" -1 | paste -s -d " " | grep -viqP "skip ci|ci skip") || exit 183
+    pre_build:
+      - ./doc/rtd/pre_build.sh
+      - cd doc && make doxygen generated_rst_files
+
+  apt_packages:
+    - ant
+    - cmake
+    - doxygen
+    - g++
+    - libproj-dev
+    - make
+    - openjdk-11-jdk-headless
+    - patchelf
+    - swig
+    - unzip
+
+formats:
+  - htmlzip
+  - pdf
+
+python:
+  install:
+      - requirements: doc/requirements.txt
+
+sphinx:
+  configuration: doc/source/conf.py
+  fail_on_warning: true
diff --git a/.travis.yml b/.travis.yml
index 930210c396ff..90b53ba93772 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,13 @@
 # This is the config file for building GDAL and running its autotest suite
 # with Travis-ci.org
 
+# FIXME: Travis-CI builds are disabled
 branches:
-  except:
-  - /^(cherry-pick-)?backport-\d+-to-/
+  only:
+    - disabled_disabled
+#branches:
+#  except:
+#  - /^(cherry-pick-)?backport-\d+-to-/
 
 matrix:
   fast_finish: true
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6f81c1c929d..367cda089dca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,6 @@
 # CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt.
-cmake_minimum_required(VERSION 3.16...3.28)
+include(cmake/helpers/GdalCMakeMinimumRequired.cmake)
+cmake_minimum_required(VERSION ${GDAL_CMAKE_VERSION_MIN}...${GDAL_CMAKE_VERSION_MAX})
 
 project(gdal LANGUAGES C CXX)
 include(CTest)
@@ -35,24 +36,8 @@ define_property(
   PROPERTY PLUGIN_OUTPUT_DIR
   BRIEF_DOCS "Plugin modules build directories"
   FULL_DOCS "Plugin modules build directories")
-#
-# check compiler and set preferences.
-if (NOT CMAKE_CXX_STANDARD)
-    set(CMAKE_CXX_STANDARD 17)
-    set(CMAKE_CXX_STANDARD_REQUIRED ON)
-endif()
-
-if (NOT CMAKE_C_STANDARD)
-    set(CMAKE_C_STANDARD 99)
-    set(CMAKE_C_STANDARD_REQUIRED ON)
-endif()
 
-#
-if (MSVC)
-  add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
-  add_definitions(-DNOMINMAX)
-endif ()
-#
+include(GdalCAndCXXStandards)
 include(CheckCompilerMachineOption)
 include(CheckCompilerSIMDFeature)
 include(Ccache)
diff --git a/Doxyfile b/Doxyfile
index 87534d9a9456..b22e38ec20c7 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -382,13 +382,12 @@ INPUT                  = port \
                          gcore \
                          frmts/gdalallregister.cpp \
                          alg \
+                         alg/viewshed \
                          frmts/vrt \
                          apps \
                          ogr \
                          ogr/ogrsf_frmts \
                          ogr/ogrsf_frmts/generic \
-                         ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp \
-                         ogr/ogrsf_frmts/kml/ogr2kmlgeometry.cpp \
                          swig/python/gdal-utils/scripts \
                          gnm \
                          doxygen_index.md
@@ -944,7 +943,8 @@ PREDEFINED             = HAVE_DLFCN_H \
                          CPLSTRING_METHOD_DLL= \
                          CPL_NO_RETURN= \
                          EXPERIMENTAL_CPL_WARN_UNUSED_RESULT= \
-                         CPL_MULTIPROC_PTHREAD
+                         CPL_MULTIPROC_PTHREAD \
+                         CPL_NON_FINAL=
 
 # 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.
diff --git a/HOWTO-RELEASE b/HOWTO-RELEASE
index 9a743f4402f0..afb1e184452f 100644
--- a/HOWTO-RELEASE
+++ b/HOWTO-RELEASE
@@ -60,6 +60,8 @@ Process :
 
   - commit new version to NEWS.md file.
 
+  - for bugfixes releases, forward port additions of NEWS.md to master
+
 6) If this is a feature release (e.g 3.1), prepare a branch.
 
    git checkout master
diff --git a/MIGRATION_GUIDE.TXT b/MIGRATION_GUIDE.TXT
index c7d011677e4c..a9df79f4e342 100644
--- a/MIGRATION_GUIDE.TXT
+++ b/MIGRATION_GUIDE.TXT
@@ -1,6 +1,14 @@
 MIGRATION GUIDE FROM GDAL 3.9 to GDAL 3.10
 ------------------------------------------
 
+- The Erdas Imagine (HFA) and Derived drivers are now optional drivers. Users
+  building with GDAL_BUILD_OPTIONAL_DRIVERS=OFF may need to explicitly enable
+  them with GDAL_ENABLE_DRIVER_HFA=ON and GDAL_ENABLE_DRIVER_DERIVED=ON.
+  The MapInfo, OGR_VRT and KML drivers are now an optional driver. Users
+  building with OGR_BUILD_OPTIONAL_DRIVERS=OFF may need to explicitly enable
+  them with OGR_ENABLE_DRIVER_TAB=ON, OGR_ENABLE_DRIVER_VRT=ON and
+  OGR_ENABLE_DRIVER_KML=ON.
+
 - User code using VSIFEofL() to potentially to end read loops should also test
   the return code of the new VSIFError() function. Some virtual file systems
   that used to report errors through VSIFEofL() now do through VSIFError().
@@ -15,6 +23,12 @@ MIGRATION GUIDE FROM GDAL 3.9 to GDAL 3.10
   corresponding optional (but recommended to be implemented to reliably detect
   reading errors) callbacks "error" and "clear_err".
 
+- Python bindings: Band.GetStatistics() and Band.ComputeStatistics() now
+  return a None value in case of error (when exceptions are not enabled)
+
+- New color interpretation (GCI_xxxx) items have been added to the GDALColorInterp
+  enumeration. Code testing color interpretation may need to be adapted.
+
 MIGRATION GUIDE FROM GDAL 3.8 to GDAL 3.9
 -----------------------------------------
 
diff --git a/NEWS-1.x.md b/NEWS-1.x.md
new file mode 100644
index 000000000000..f551f6b1fc81
--- /dev/null
+++ b/NEWS-1.x.md
@@ -0,0 +1,6564 @@
+## GDAL/OGR 1.11.0 - General Changes
+
+Build(Unix):
+ * add Unix configure support for SOSI
+ * remove pointers to old ver of ingres library files
+ * add --with-libjson-c configure option to build against external libjson-c (>= 0.11) (#4676)
+ * compilation fixes for iOS (#5197, #5198)
+ * update to autoconf 2.69
+ * add pkg-config gdal.pc (#3470)
+ * configure for FileGDB: add explicit linking to libfgdbunixrtl (requires FileGDB SDK >= 1.2) (#5215); also try .dylib extension (#5221)
+ * fix so that Java installs are found on the MAC to enable the MDB driver (#5267)
+ * fix compilation with recent MySQL versions (5.6 for example) (#5284)
+ * support --with-jp2mrsid with standalone Kakadu with MRSID v8 or later
+ * Fix parallel build in Python bindings (#5346)
+ * PCIDSK: don't link against libjpeg if configured --without-jpeg
+ * Update configure script to pick up ECW JP2 SDK 5.1 (#5390)
+ * add a 'make install' target for the Java bindings  (#5424)
+ * add Vagrant configuration
+
+Build(Windows):
+ * add option to generate VC project for x64 on makegdal_gen.bat
+ * nmake.opt: add WITH_PDB=1 option to optionally generate .pdb file on Release builds (#5420)
+ * add support for building the OGR SOSI driver as a plugin (#3638)
+ * add support for building the HDF4 driver as plugin (#5294)
+ * add support for MrSID v9
+ * Remove makegdalXX.bat generated files
+
+## GDAL 1.11.0 - Overview of Changes
+
+Port:
+ * vsisubfile: fix Eof() behavior to be POSIX compliant, so that the shapefile reader can read the last feature when using /vsitar (#5093)
+ * vsicache: fix for 32bit binaries when file size is over 2GB (#5170)
+ * vsicache: add optional nChunkSize and nCacheSize parameters to VSICreateCachedFile()
+ * vsicurl: add CPL_VSIL_CURL_USE_HEAD config option to disable use of CURL HEAD for other services like mapbox (likely lame python http implementations)
+ * vsitar: avoid infinite loop in case of invalid .tar structure
+ * vsizip: fix path separator in CPLFormFilename
+ * vsizip: allow additional extensions listed in CPL_VSIL_ZIP_ALLOWED_EXTENSIONS config option.
+ * vsizip: improve UTF-8 support of filenames inside ZIP file (#5361)
+ * vsizip: fix ZIP64 support
+ * vsigzip: reset EOF flag when doing a Seek() to be POSIX compliant
+ * curl: add .netrc support
+ * Windows CPLGetSymbol(): avoid dialog boxes to pop up when a DLL or one of its dependencies does not exist (#5211)
+ * Add CPLOPrintf() and CPLOvPrintf() functions for easy CPLString formatting
+ * CPLBase64DecodeInPlace() : fix to be robust to malformed base64 strings
+ * CPLQuadTree: add CPLQuadTreeInsertWithBounds() where the pfnGetBounds is not needed.
+ * CPLQuadTree: fix potential infinite recursion when inserting several points with identical coordinates in the mode with limited bucket size
+ * Protect concurrent calls to setlocale() by a mutex (#5366)
+
+Core:
+ * RFC 45: GDAL datasets and raster bands as virtual memory mapping
+ * GDALRasterBand::GetHistogram(): ignore nodata values (#4750, #5289)
+ * allow auto loading of drivers to be disabled via config option
+ * PAM .aux.xml and VRT: serialize Z component of a GCP as 'Z' attribute,
+   for consistency, instead of GCPZ that could not be read back previously.
+   In reading code, try reading 'Z' and if not found try 'GCPZ' (#5326)
+ * JPEG2000: Add GDALGeorefPamDataset and GDALJP2AbstractDataset classes and use
+             them in JP2KAK, JP2ECW, JP2OpenJPEG, JPEG2000 and MrSID drivers so that PAM
+             georeferencing consistently overrides internal georeferencing
+ * GDALDataset::IRasterIO(): don't use BlockBasedRasterIO() when INTERLEAVE=PIXEL if the request band count is just 1
+ * CopyWholeRaster(): make default GDAL_SWATH_SIZE to 1/4 of GDAL_CACHEMAX instead of hard-coded value of 10 MB
+ * don't report empty RAT on GDALGetDefaultRAT() (#5232)
+ * modify GDALGCPsToGeotransform() to do the regression in normalized coordinates to make the math more stable.
+ * expose new GDALComposeGeoTransforms() function.
+ * GDALDefaultOverviews::HaveMaskFile(): avoid fetching .ovr file
+ * JPEG2000: Fix reading georeferencing from some JPEG2000 files with duplicated GeoTIFF JP2Box (#5249)
+ * Cleanup raster block mutex (#5296)
+ * Driver registration: move JPEG2000 (Jasper based) after MrSID JPEG2000 support
+
+Algorithms:
+ * warper: fix regression with lanczos resampling when yradius > xradius (#5058)
+ * warper: Make GDALCreateGenImgProjTransformer2() and GDALCreateGenImgProjTransformer3() fail when the creation of the reprojection transformer fails
+ * warper: Fix warping when input pixel size is too close to 0 (#5190)
+ * warper: revise formula of cubic resampling kernel, and a few optimizations (#5209)
+ * warper: added DST_METHOD and support for GCP and TPS dest
+ * warper: add support for DST_METHOD=RPC
+ * warper: fix mode and near resampling corner computation (#5311)
+ * warper: GDALGenImgProjTransform(): don't set panSuccess[i] to 1 in the middle of the function, if an intermediate transform before has set the flag to 0
+ * warper: fix cutline blending (#5343)
+ * warper: Average/mode kernels: make them less sensitive to numerical precision issues (#5350)
+ * warper: Average/mode kernels: avoid 'holes' when the source coordinates are in a reversed order from the target coordinates (#5433)
+ * warper: provide prototypes and work around strict compiler requirements on some opencl platforms (#5400)
+ * RPC: fix for computation of adfGTFromLL (#5395)
+ * TPS: optimization for GCC x86_64 that make computation about twice faster with huge number of GCPs
+ * TPS: when using Armadillo to solve the coefficients, use solve(A,B) instead of inv(A)xB to faster resolution
+ * TPS: compute direct and inverse transformations in parallel when warping option NUM_THREADS or GDAL_NUM_THREADS config. options are set to > 1
+ * Geoloc: fix wrong bilinear interpolation in GDALGeoLocTransform() (#5305)
+ * Geoloc: fail transformation of coordinates that is located on a nodata place of the geoloc array
+ * rasterize: preliminary support for MERGE_ALG=ADD for heatmaps
+ * gdal_grid: Add AVX optimized version of GDALGridInverseDistanceToAPower2NoSmoothingNoSearch
+ * fill_nodata: GDALFillNodata(): Fix use of uninitialized memory and integer overflows (#4010, #5203)
+ * rpc: Fix out-of-bounds read in RPC dem cubic interpolation
+
+Utilities:
+ * gdalinfo: add -listmdd and -mdd all options (#5275)
+ * gdal_translate: add a -exponent option to be used with -scale
+ * gdal_translate: fix output file naming scheme in gdal_translate -sds (#5119)
+ * gdal_translate: fix logic in detection non-gray color table level (#5245)
+ * gdal_translate: add a -norat option
+ * gdal_translate: don't add 0.1 when -scale is used with a dstmin equal to dstmax (useful to generate a raster with uniform color, i.e. scaleRatio = 0)
+ * gdal_translate: use floor() to compute image coordinates from world coordinates when specifying -projwin (useful when extracting from left or top of upper-left corner, which generate negative image coordinates) (#5367)
+ * gdaltindex: remove annoying warning 'Warning 1: Field location of width 255 truncated to 254' (#5121)
+ * gdaltindex: add -src_srs_name and -src_srs_format to go with MapServer RFC100; add also a -f and -lyr_name options to be able to create a non-shapefile tileindex
+ * gdalwarp: Fix segfault where metadata values were not being nullchecked properly during conflict resolution (#5069)
+ * gdalwarp: honor -s_srs when using cutline (#5081)
+ * gdalwarp: copy nodata values from source to dest if -dstnodata is not given ; add option to not set dest nodata with -dstnodata None (#5087)
+ * gdalwarp: do not return a non-zero exit status for warnings
+ * gdalwarp: prevent from copying statistics metadata (#5319)
+ * gdal_rasterize: set the progress bar to 100% even when there's nothing to do
+ * gdal_grid: add support for different types of geometries (#5341)
+ * gdal_grid: add  -z_increase and -z_multiply options
+ * gdaldem: check that value of -z, -s, -az and -alt is numeric
+ * gdalbuildvrt: validate values of -srcnodata and -vrtnodata arguments
+ * gdal2tiles.py: Corrected OpenLayers code to reflect fix to geodetic resolution factor
+ * gdal2tiles.py: add --tmscompatible flag so as to produce 2 tiles at zoom level 0 in geodetic profile
+ * rgb2pct.py: Use python tempfile logic to avoid permissions issues with cwd (#5079)
+ * gdal_edit.py: add a -ro option for drivers refusing to use the dataset in update-mode.
+ * gdal_calc.py: add --allBands options (#5388)
+ * Add vsipreload.cpp that can be compiled as a shared library that can be LD_PRELOAD'ed as an overload of libc to enable VSI Virtual FILE API to be used with binaries using regular libc for I/O
+ * Add the wcs_virtds_params.py sample utility to be able to set the MapServer WCS virtual dataset parameters from a tileindex with rasters of mixed SRS (linked to MapServer RFC100)
+ * gdalcompare.py: move to scripts
+ * gdalcompare.py: ensure image dimensions match
+ * gdal_ls.py: Fix issue with UTF-8 characters
+
+Multi driver changes:
+ * JPEG2000 drivers: take into account PixelIsPoint in GeoJP2 boxes, and expose AREA_OR_POINT=Point (#5437)
+ * JP2KAK, JP2ECW, JP2OpenJPEG, JPEG2000 CreateCopy(): take into account AREA_OR_POINT=Point if present to write GeoJP2 box (#5437)
+
+AAIGRID:
+ * revert DECIMAL_PRECISION and add SIGNIFICANT_DIGITS to CreateCopy() (#3732)
+
+AIGRID:
+ * Turn off errors that can be triggered if the info has no VAT table related with this coverage (#3031)
+
+BAG driver:
+ * Recognise falseNorthing=10000000 as UTM South (#5152)
+
+DIMAP driver:
+ * fix memleak in error-code path
+
+DTED driver:
+ * Speed optimization to be more friendly with CPU cache in GDAL_DTED_SINGLE_BLOCK=YES mode
+
+ECW driver:
+ * fix crash in GDALDeregister_ECW() with ECW SDK 5 called from GDALDestroy() (#5214)
+ * fix issue with ECW_CLEVER optimization when nPixelSpace != sizeof eBufDataType (#5262)
+
+Envisat driver:
+ * implement more reliable way of extracting GCPs from Meris tie-points (#5423)
+ * add DEM corrections of TP-ADS products when present (#5423)
+ * workaround dateline discontinuity in GCPs so they can be used with GDAL warping transformers (#5423)
+
+ERS driver:
+ * fix wrong interpretation of RegistrationCellX/RegistrationCellY (#2612, #3056, #5075)
+
+GeoRaster driver:
+ * fix RPC support (#4038)
+ * fix read error when reading from pyramids (#5076)
+ * make regular table and secure file a default for RDT (#5127)
+ * fix error when reading NBIT pyramid levels (#5199)
+ * show the VAT as RAT (#5200)
+ * fix reading and writing of statistics metadata (#5237)
+ * add generate pyramid create options (#5288)
+ * fix incorrect geotransform interpretation when there is no SRS (#5323)
+
+GRASS driver:
+ * fix compilation issues for GRASS 7
+
+GRIB driver:
+ * display temperature unit as deg Celsius in metadata (#3606)
+
+GTiff driver:
+ * when compiling against internal libtiff, in read-only mode, optimization to
+   avoid fetching the whole Strip/TileCounts and Strip/TileOffsets arrays
+ * add validation of source overview characteristics with COPY_SRC_OVERVIEWS (#5059)
+ * convert invalid TIFFTAG_RESOLUTIONUNIT=0 to 1(Unknown) (#5069)
+ * fix potential issues in gt_citation.cpp / CheckUTM()
+ * upgrade internal libtiff to latest CVS
+ * implement reading and writing of ICC profiles (#5246)
+ * make SetColorInterpretation() round-trip with GetColorInterpretation();
+   read color interpretation from PAM if it exists (overrides internal tiff color interpretation);
+   set TIFFTAG_PHOTOMETRIC=PHOTOMETRIC_RGB if calling SetColorInterpretation() with R,G,B and no explicit PHOTOMETRIC creation option defined
+ * gt_wkt_srs.cpp: fix compilation with external libgeotiff. The file is dependent of quite a few CPL stuff, don't try to pretend otherwise
+ * implement GetVirtualMemAuto() for some formulations of TIFF files (RFC 45)
+ * fix reading a single-strip TIFF file where the single strip is bigger than 2GB (32bit builds only) (#5403)
+ * look for .tab file before .wld/.tfw
+
+GTX driver:
+ * Add nodata support (#4660)
+
+HDF4 driver:
+ * Skip "SceneLineNumber" table if present in the list of geolocation fields of
+   ASTER L1A dataset.
+
+HDF5 driver:
+ * add support for ODIM H5 georeferencing method (#5032)
+ * set SRS GEOGCS in all cases (reverts r25801 and closes #4160)
+ * support HDF5 NATIVE_SCHAR type, subdatsets without PAM (#5088)
+ * release all opened handles so the file is closed at dataset closing (#5103)
+ * better deal with dimensions of CSK-L1A HDF5 subdatasets (#4227)
+ * avoid segmentation fault when H5Sget_simple_extent_ndims() returns negative value (#5291)
+
+HFA driver:
+ * add minimally tested support for u2 and u4 data in basedata
+ * use direct binning for thematic layers and real instead of integer for values (#5066)
+ * add a HFA_COMPRESS_OVR config option to select whether to create compressed overviews (#4866)
+ * fix rewriting of statistics in existing HFA file where base data value is 8-bit (#5175)
+ * implement re-writing existing histogram in HFA file, after raster editing (#5176)
+ * avoid segfaults when creating a Imagine dataset with an invalid WKT (#5258)
+ * expose color columns in RAT as Integer with values in range [0-255] instead of Real with values [0-1] (#5362)
+ * report histogram column as GFU_PixelCount instead of GFU_Generic (#5359)
+ * ensure histogram column written as float for HFA when using RAT API (#5382)
+
+Idrisi driver:
+ * Improve coordinate system handling and min/max statistics (#4980)
+
+IRIS driver:
+ * add height information on bands; rename dataset metadata item CAPPI_HEIGHT --> CAPPI_BOTTOM_HEIGHT (#5104)
+ * IRIS: add support for two bytes data (#5431)
+
+JP2ECW driver:
+ * fix problem with JP2 write with SDK v5
+ * fix issue with ECW_CLEVER optimization when nPixelSpace != sizeof eBufDataType (#5262)
+ * avoid writing dummy GeoJP2 box when source dataset has no georeferencing (#5306)
+
+JP2KAK driver:
+ * preliminary support for Kakadu V7.x
+ * fix creation of unsigned int16 with reversible compression (#4050)
+ * on Windows, use VSI cache for I/O by default, instead Kakadu own I/O layer
+ * remove extension from 12bit to 16bit (#5328)
+
+JP2OpenJPEG driver:
+ * avoid 'Empty SOT marker detected: Psot=12.' warning to be repeated several times
+ * add support for encoding GCPs in a GeoJP2 box (#5279)
+ * avoid writing dummy GeoJP2 box when source dataset has no georeferencing (#5306)
+
+JPEG driver:
+ * add autodetection of bitmasks that are msb ordered (#5102)
+ * avoid memory leak when GDALOpen'ing() a JPEG through a http:// URL, and make it possible to access its overviews
+ * return YCbCrK raw data for YCbCrK JPEG in GDAL_JPEG_TO_RGB = NO mode (instead of CMYK as before) (#5097)
+ * implement reading and writing of ICC profiles (#5246)
+ * internal libjpeg: apply patch for CVE-2013-6629
+ * allow fallback to PAM to read GCPs
+ * give priority to PAM GeoTransform if it exists and other source of geotransform (.wld, .tab) also exists (#5352)
+
+KMLSuperOverlay driver:
+ * recognize an alternate structure for raster KMZ file made of a single doc.kml
+    and tiles whose name pattern is kml_image_L{level}_{j}_{i}.{png|jpg}
+ * fix horrible speed performance in Open() (#5094)
+ * fix crash at dataset closing and inability to read some big PNG tiles (#5154)
+ * fix to generate files validating against OGC KML 2.2 schema
+ * put Style into conformity with ATC 7
+ * remove Region in root KML (ATC 41)
+ * add NAME and DESCRIPTION creation options; read them back as metadata
+ * add ALTITUDE and ALTITUDEMODE creation options
+ * directly write into .kmz file (instead of in temporary location)
+ * correctly write directories entry in .kmz file
+ * add progress callback
+
+L1B driver:
+ * report correct values for GCP (#2403)
+ * report more GCPS than before
+ * implement geolocation array
+ * add fetching of record metadata in .csv file
+ * add subdatasets with solar zenith angles, cloud coverage
+ * recognize NOAA-9/14 datasets whose dataset name in TBM header is encoded in EBCDIC and not in ASCII (#2848)
+ * support opening a few NOAA <= 9 datasets that have no dataset name in the TBM header
+
+LCP driver:
+ * better handling of projections (#3255)
+ * add CreateCopy() (#5172)
+
+MBTiles driver:
+ * add write support
+ * avoid failure when there's no tile at the center of the maximum zoom level (#5278)
+ * add capability to open /vsicurl/https:// signed AWS S3 URLs
+
+MEM driver:
+ * Create(): use calloc() instead of malloc()+memset() for faster creation of huge in-memory datasets
+
+NetCDF driver:
+ * fix to read netcdf-4 files with UBYTE data (#5053)
+ * fix reading large netcdf-4 files with chunking and DEFLATE compression
+ * fix netcdf chunking when creating file with > 2 dims ; add CHUNKING creation option (#5082 )
+ * fix duplicate nodata metadata when using CreateCopy() (#5084)
+ * fix copying large metadata in netcdf driver (#5113)
+ * fix netcdf geotransform detection (#5114)
+ * fix netcdf driver irregular grids management (#5118 and #4513)
+ * only call nc_close on a valid netcdf id when closing dataset
+ * try and identify .grd (and .nc3) files in netcdf-4 format (#5291), so they are identified before the hdf5 driver
+
+NITF driver:
+ * fix to support reading horizontal and/or vertical mono-block uncompressed images, even when the number of columns is <= 8192 (#3263)
+ * update NITF Series list with new entries from MIL-STD-2411_1_CHG-3.pdf (#5353)
+ * allow JP2KAK to be used as the JPEG2000 compression engine in the CreateCopy() case (#5386)
+
+PDF driver:
+ * Avoid reporting a Poppler error as a GDAL error on some newer USGS GeoPDF files (#5201)
+ * PDF writing: automatically adjust DPI in case the page dimension exceeds the 14400 maximum value (in user units) allowed by Acrobat (#5412)
+
+PDS driver:
+ * Parse correctly MISSING_CONSTANT = 16#FF7FFFFB# as a IEEE754 single precision float expressed in hexadecimal; add support for ENCODING_TYPE = ZIP (data file compressed in a ZIP); recognize IMAGE_MAP_PROJECTION as an object included in UNCOMPRESSED_FILE object (#3939)
+
+PNG driver:
+ * Implement reading and writing of ICC profiles (#5246)
+
+PostgisRaster driver:
+ * Speed-up dataset opening (#5046).
+ * Multi-tile multi-band caching added.
+ * Smarter use of the information advertized in raster_columns view.
+ * Avoid full table scan in situations without PKID/GIST indices.
+ * Use of quadtree.
+
+Rasdaman driver:
+ * caching of tiles for datasets with more than one band (#5298)
+ * connections are now kept for a whole session (#5298)
+ * fixing connection-string regex (#5298)
+ * fixing possible memory leaks (#5298)
+
+Rasterlite driver:
+ * fix resolution check typo in rasterlite driver
+
+Raw drivers:
+ * implement GetVirtualMemAuto() (RFC 45)
+ * IRasterIO(): add special behavior to avoid going to block based IO when the dataset has INTERLEAVE=PIXEL and is eligible to direct I/O access pattern
+ * allow direct I/O access even if a small proportion of scanlines are loaded (improve QGIS use case where the overview display will load sparse scanlines, which would prevent direct I/O at full resolution afterwards)
+ * fix optimized RasterIO() when doing sub-sampling with non standard buffer pixel offset (#5438)
+
+RMF driver:
+ * fix decompression of 24-bit RMF DEM (#5268)
+
+RPFTOC driver:
+ * fix potential crash on some datasets when selecting the color palette (#5345)
+
+SAGA driver:
+ * add read/write support for .prj files (#5316)
+
+SRP driver:
+ * read TRANSH01.THF file to establish subdatasets (#5297)
+
+VRT driver:
+ * Implement non-linear scaling with a power function (addition of Exponent, SrcMin, SrcMax, DstMin, DstMax sub-elements in <ComplexSource>)
+ * Preserve 64bit integer image offsets (#5086)
+ * Make sure that VRTSourcedRasterBand::AddMaskBandSource() takes into account specified window (#5120)
+ * Make GDALAutoCreateWarpedVRT() return NULL when GDALSuggestedWarpOutput() fails
+ * VRTDataset::IRasterIO(): use source DatasetRasterIO even if band count is 1
+ * VRTWarped: avoid setting up relative paths for things that aren't file-like
+ * make relativeToVRT=1 work with NITF_IM:, NETCDF:, HDF5:, RASTERLITE:
+
+WCS driver:
+ * ensure C locale is enforced before parsing floating point values
+
+WMS driver:
+ * accept 'WMS:http://server/?SRS=EPSG:XXXX' syntax to select the preferred SRS in which to fetch layers
+ * CPLHTTPFetchMulti(): avoid doing a timeout-only select when there are no file descriptor to wait on (can happen when doing a file:// URL)
+ * allow cache location to be specified with GDAL_DEFAULT_WMS_CACHE_PATH configuration option if not provided in the XML (#4540)
+ * Update to be able to understand slight changes in formatting of JSon output of ArcGIS mapserver protocol
+
+XYZ driver:
+ * accept datasets that have missing values at beginning and/or end of lines, such as MNT250_L93_FRANCE.XYZ
+ * fix detection when there are only integral values with comma field separator
+ * reopen with 'rb' flags for Windows happyness
+
+## OGR 1.11.0 - Overview of Changes
+
+Core:
+ * GEOS support: require GEOS >= 3.1.0 and use the _r API of GEOS to avoid issues with the global GEOS error handlers
+ * exportToWkb(): ISO WKB generation with wkbVariant option (#5330)
+ * geocoding: when getting several answers from server for a query, report geometries on second, third, etc.. feature, and not only first one (#5057)
+ * allow auto loading of drivers to be disabled via config option
+ * remove obsolete OGRGeometryFactory::getGEOSGeometryFactory()
+ * OGRGeometryFactory::organizePolygons() in DEFAULT method: fix a case with 2 outer rings that are touching by the first point of the smallest one
+ * OGRGeometryFactory::organizePolygons(): optimization in ONLY_CCW case
+ * OGRGeometryFactory::organizePolygons(): Add an experimental mode : CCW_INNER_JUST_AFTER_CW_OUTER
+ * OGRLineString::segmentize() : do not set 0 as z for interpolated points, but the z from the previous point
+ * OGRLineString::setNumPoints(): add an optional argument to avoid zeroing the arrays
+ * Add OGRLineString::setZ()
+ * Add OGRLineString::Project() and OGRLineString::getSubline()
+ * OGRPolygon: add stealExteriorRing() and stealInteriorRing(int iRing)
+ * OGRLinearRing::isClockwise(): optimizations and make it work in a degenerated case when a vertex is used several times in the vertex list (#5342)
+ * OGRLinearRing::isPointOnRingBoundary() : optimizations and take into account bTestEnvelope
+ * Add OGR_G_SetPointCount and OGR_G_SetPoints functions to API C (#5357)
+ * OGREnvelope3D::Contains(): fix incorrect test
+ * Layer algebra: fix handling of method field mapping to output fields when output fields are precreated (#5089)
+ * Layer algebra: when an error condition is skipped, call CPLErrorReset() (#5269)
+ * OGRLayer::GetFeature(): make sure that the behavior is not influenced by
+   attribute or spatial filters in the generic implementation;
+   upgrade OGDI, PG, MySQL, MSSQLSpatial, OCI, SDE, PGeo, ODBC, WALK, IDB, SQLite and Ingres driver  (#5309)
+ * introduce OGRLayer::FindFieldIndex() / OGR_L_FindFieldIndex() to lookup potentially laundered field names (RFC 42)
+ * OGR SQL: upgrade to support RFC 41 (multiple geometry fields)
+ * OGR SQL: more stricter checks
+ * OGR SQL: make parsing error report a useful hint where the syntax error occurred
+ * OGR SQL: fix thread-safety of swq_op_registrar::GetOperator() (#5196)
+ * OGR SQL: support not explicitly specifying AS keyword for aliasing a column spec
+ * OGR SQL: don't call CONCAT(a_column ...) or SUBSTR(a_column ...) as a_column
+ * OGR SQL: validate that arguments of MAX, MIN, AVG, SUM, COUNT are columns and not any expression since this is not supported
+ * OGR SQL: make AVG field definition a OFTReal
+ * OGR SQL: implement MIN(), MAX() and AVG() on a date (#5333)
+ * OGR SQL: fix SELECT * on a layer with a field that has a dot character (#5379)
+ * SQL SQLITE dialect: Make it available to all OGR drivers that have a specialized ExecuteSQL() implementation
+
+OGRSpatialReference:
+ * Upgrade to EPSG 8.2 database
+ * identify LCC_2SP instead of LCC_1SP if lat_0==lat_1 and lat_2 is present (#5191)
+ * add a variety of linear units to proj4 parsing (#5370)
+ * Fix crash in CleanupESRIDatumMappingTable() if it is called twice (#5090)
+ * fix order of AXIS and UNIT nodes in a VERT_CS node (#5105)
+ * ecw_cs.wkt: add missing TOWGS84[-168,-60,320,0,0,0,0] to NTF datum (#5145)
+ * fix OGRSpatialReference::importFromProj4() to work with non-C locale (#5147)
+ * morph central_latitude to latitude_of_origin in morphFromESRI() (#3191)
+ * OGRProj4CT: avoid using proj when the 2 projections are actually identical (#5188)
+ * add sanity checks in OGR_SRSNode::importFromWkt() (#5193)
+ * VERT_CS: when importing from proj.4 put AXIS node after UNIT; COMPD_CS: when importing from EPSG:x+y, set a more meaningful name for the COMPD_CS node
+ * OGRSpatialReference::Validate() : in addition to hand-validation, use WKT grammar from OGC 01-009 CT
+ * preserve authority when importing +init=auth_name:auth_code (e.g. +init=IGNF:LAMB93)
+
+Utilities:
+ * ogrlineref: new utility to deal with linear geometries.
+ * ogrinfo: upgrade to support RFC 41 (multiple geometry fields)
+ * ogr2ogr: upgrade to support RFC 41 (multiple geometry fields)
+ * ogr2ogr: bump default value for -gt from 200 to 20000 (#5391)
+ * ogr2ogr: add -addfields option to add new fields found in a source layer into an existing layer ; add -unsetFieldWidth option to unset field with and precision; add -dim layer_dim option to force the coordinate dimension of geometries to match the one of the layer geometry type
+ * ogr2ogr: Check that -t_srs is also specified when -s_srs is specified
+ * ogr2ogr: add an explicit error message to report FID of feature that couldn't be inserted when CreateFeature() fails
+ * ogr2ogr: make relaxed lookup optional and add a switch -relaxedFieldNameMatch to allow it (RFC 42)
+ * ogr2ogr: make sure that the progress bar reaches 100% when converting OSM
+ * ogr2ogr: make sure that target dataset is properly closed when a CreateFeature() fails (so that truncated shapefiles have their header file properly updated)
+ * ogr_dispatch.py: Sample Python script to dispatch features into layers according to the value of some fields or the geometry type
+ * ogrinfo.py: sync with ogrinfo (RFC 41)
+ * ogr2ogr.py: port -nlt PROMOTE_TO_MULTI option from ogr2ogr.cpp (#5139)
+
+CSV driver:
+ * avoid erroneously reset of file content when opening in update mode a file without header (#5161)
+ * upgrade to support RFC 41 in read/write (multiple geometry fields)
+ * allow backslash doublequote to load (#5318)
+
+DGN driver:
+ * DGN writing: added polygon inner ring (holes) writing and MSLink writing (#5381)
+
+DXF driver:
+ * fix writing of 25D linestring where z is not constant (#5210)
+ * fix writing of POLYLINE objects (#5217, #5210)
+ * accept reading files starting with a TABLES section (#5307)
+ * support reading 3DFACE and SOLID (#5380) entities
+ * fix an error when processing clockwise circle arc (#5182)
+ * avoid building an invalid polygon when edges cannot be reassembled: turn it into a multilinestring
+ * use CPLAtof() instead of atof() to avoid issues with locales
+ * fix linear approximation of circular and elliptic arc in HATCH boundaries (#5182)
+
+DWG driver:
+ * add support for reading AcDb3dPolyline (#5260)
+ * fix linear approximation of circular and elliptic arc in HATCH boundaries (#5182)
+
+FileGDB driver:
+ * implement IgnoreFields API to speed-up a bit the conversion of a sub-set of fields when there's a huge amount of them (e.g. Tiger database).
+ * when writing <Length> of an attribute, use size in bytes (#5192)
+ * implement ref counting of the FileGDB SDK API' Geodatabase* object to avoid issues on Linux 64bit with interleaved opening and closing of databases (#4270)
+ * honour update flag to determine which operations are allowed or not
+ * add a driver global mutex to protect all calls as the FileGDB API SDK is not thread-safe at all
+ * add a COLUMN_TYPES layer creation option to override default column types; support reading/writing XML column types
+ * optimize GetFeatureCount() and GetExtent() when there are filters set
+ * set the default width for string fields to 65536.
+   The width can be configured with the FGDB_STRING_WIDTH configuration option
+ * fix creation and writing of Binary fields; enable reading
+ * add a CREATE_MULTIPATCH creation option
+
+FME driver:
+ * fix Linux compilation
+
+GeoJSON driver:
+ * recognize alternate formats such as the ones of https://code.google.com/p/election-maps/
+ * add read support for TopoJSON
+ * upgrade internal libjson-c to json-c 0.11 (#4676)
+ * report integer values that are int64 as strings
+ * add 3d support to esri geojson reader (#5219)
+ * be less strict on looking for esri field type tag (#5219)
+ * fix sometimes incorrect result (significant digit lost...) when using -lco COORDINATE_PRECISION=0
+ * fix handling of huge coordinates when writing (#5377)
+
+GeoRSS driver:
+ * advertise OLCCreateField capability
+
+GFT driver:
+ * switch http to https for the oauth2 link to improve security
+
+GML driver:
+ * add support for multiple geometry columns (RFC 41)
+ * add support for reading Finnish National Land Survey Topographic data (MTK GML)
+ * add support for support Finnish NLS cadastral data and Inspire cadastral data.
+ * add support for Czech RUIAN VFR format
+ * add data/gml_registry.xml file to associate feature types with schemas.
+ * extend .gfs syntax to be able to fetch OGR fields from XML attributes.
+ * extend .gfs syntax to support multiple geometry columns, and define a geometry property name
+ * autodiscover all XML attributes as OGR fields when creating .gfs file if GML_ATTRIBUTES_TO_OGR_FIELDS is set to YES (#5418)
+ * allow the <ElementPath> in .gfs to have several components that give the full XML path
+ * fix writing of .xsd file to avoid fid/gml_id being written as regular fields (#5142)
+ * fix writing of global srsName attribute on the global boundedBy.Envelope when all layers have same SRS (#5143)
+ * support for writing .gml/.xsd with fields of type StringList, RealList, IntegerList and support for parsing such .xsd files
+ * when writing .xsd for a datasource that has fields of type StringList, RealList or IntegerList, advertise SF-1 profile in the .XSD schema
+ * recognize xsd:boolean in XSD parsing and map it to String (#5384)
+ * add STRIP_PREFIX and WRITE_FEATURE_BOUNDED_BY dataset creation option to help minimizing the size of GML files
+ * don't write top <gml:boundedBy> in GML files with multiple layers of different SRS
+ * fix segfault when reading a GML file with huge coordinates (#5148)
+ * avoid opening our own .xsd files as valid datasources (#5149)
+ * make driver thread-safe with Xerces
+ * open successfully GML datasources with 0 layers (#249, #5205)
+ * fix tweaking of DescribeFeatureType requests
+ * support reading WFS 2.0 GetFeature documents with wfs:FeatureCollection as a wfs:member of the top wfs:FeatureCollection
+ * fix for crash on certain xlink:href with GML_SKIP_RESOLVE_ELEMS=NONE (#5417)
+ * GML geometry: fix duplicated points in GML_FACE_HOLE_NEGATIVE=YES mode (TopoSurface) (#5230)
+ * GML geometry: accept CompositeSurface as a child of surfaceMembers (#5369)
+ * GML geometry: join multilinestrings to linestrings in rings
+ * GML geometry: correctly deal with MultiSurface of Surface of PolygonPatch where a PolygonPatch has only interior ring(s) and no exterior ring (#5421)
+ * GML geometry: accept formulations of 'MULTIPOINT EMPTY, MULTILINESTRING EMPTY, MULTIPOLYGON EMPTY and GEOMETRYCOLLECTION EMPTY that are valid GML 3 (and accepted by PostGIS)
+ * GML geometry: make use of cs, ts and decimal attributes of (deprecated) gml:coordinates element
+ * GML geometry: accept XML header and comments
+
+GPX driver:
+ * advertise OLCCreateField capability
+
+ILI driver:
+ * add support for multiple geometry columns (RFC 41)
+ * use IlisMeta model reader/writer instead of IOM
+ * add layers for surface and area geometries
+
+KML driver:
+ * output KML that validates the ogckml22.xsd schema by placing <Schema> elements under the <Document> level (#5068)
+ * in writing mode, avoid defining an extending schema for the name and description fields (related to #5208)
+
+LIBKML driver:
+ * various checks, fixes and improvements related to OGC KML 2.2 Abstract Test Suite
+ * add support for reading <gx:Track> as a LINESTRING (#5095)
+ * add support for writing and reading <snippet>
+ * add support for writing atom:author, atom:link, phonenumber, Region,
+   ScreenOverlay, 3D model, StyleMap
+ * add support for reading and generating Camera object
+ * add layer creation options to generate a LookAt element at layer level
+ * if UPDATE_TARGETHREF dataset creation option is defined, a NetworkLinkControl/Update document will be created
+ * add dataset creation options to generate a NetworkLinkControl element
+ * add dataset and layer creation options LISTSTYLE_ICON_HREF and LISTSTYLE_TYPE
+ * add support for writing a NetworkLink
+ * add support for creating PhotoOverlay objects
+ * add support for creating BalloonStyle elements
+ * offer LIBKML_USE_SIMPLEFIELD configuration option can be set to NO to use Data element instead of SimpleField
+ * add layer creation option FOLDER to optionally write layers as Folder instead of Document
+ * add dataset and layer creation options NAME, VISIBILITY, OPEN, SNIPPET and DESCRIPTION
+ * workaround bugs in pretty serializers
+ * when writing a .kmz file, put layers .kml docs into a layers/ subdirectory
+ * fix mem leaks, and use after free in kml2FeatureDef() (#5240)
+ * create document with default namespace set to http://www.opengis.net/kml/2.2
+ * when writing, consider empty strings as unset (useful when converting from CSV)
+ * don't write empty <Style /> element if OGR_STYLE is empty string
+ * transform multigeometry with one single component into single geometry
+ * create libkml/ subdirectory entry in .kmz
+
+MITAB driver:
+ * support reading MIF file with no associated MID file (when MIF file advertises 'Columns 0') (#5141)
+
+MSSQLSpatial driver:
+ * Fix MSSQL to be aware of removed tables (#5071)
+ * Eliminate the per table server access when identifying the spatial reference (#5072)
+ * Improve detection of geometry column with MSSQL select layer (#4318)
+ * Fix for an issue with multicolumn primary keys (#5155)
+ * Add support for handling non spatial data tables (#5155)
+ * Fix creation of spatial_ref_sys and geometry_columns tables (#5339)
+
+MySQL:
+ * robustness for huge coordinates in spatial filter
+
+NAS driver:
+ * also accept XML files that have NAS-Operationen_optional.xsd in header
+ * make driver thread-safe with Xerces
+ * warn when geometry cannot be saved
+
+OCI driver:
+ * fix make plugin option
+
+ODBC driver:
+
+OSM driver:
+ * support relations with more than 2000 members in a OSM XML file (#5055)
+ * make the driver work with PBF files produced by osmconvert.
+ * osmconf.ini: report the waterway attribute for the lines layer (#5056)
+ * add an option in osmconf.ini to enable creating a 'all_tags' field, combining both fields specifically identified, and other tags
+ * always use quoting of key/values in other_tags field (#5096)
+ * use alternative implementation of FindNode() that is a bit more efficient when process is CPU-bound
+ * fix issue with attribute filtering
+ * avoid GetNextFeature() to be blocked in certain conditions in non-interleaved mode (#5404)
+
+PG driver:
+ * upgrade to support RFC 41 in read/write (multiple geometry fields)
+ * use ST_Estimated_Extent() on table layers if GetExtent() is called with force = 0 (#5427)
+ * add a OGR_TRUNCATE configuration option (#5091)
+ * let postgres name the constraints to avoid long name truncation resulting in conflicts (#5125)
+ * map PG 'numeric' to OFTReal instead of OFTInteger
+ * retrieve SRID from geometry value, if not found in geometry_columns (#5131)
+ * fix ResolveSRID() when the current user has no select rights on geometry_columns table (#5131)
+ * fix retrieval of SRID on a table without SRID constraint, and when the datasource is opened with ' tables=fake' (#5131)
+ * robustness for huge coordinates in spatial filter
+ * fix delete layer bug on PG 2.0 (#5349)
+ * fix to be able to detect version of EntrepriseDB (#5375)
+ * Fix UTF-8 encoded string length
+
+PGDump driver:
+ * upgrade to support RFC 41 (multiple geometry fields)
+ * fix error when inserting a string that has backslash in it with PostgreSQL >= 9.1 (#5160)
+
+REC driver:
+ * fix runtime compatibility for Windows
+
+Shapefile driver:
+ * fix buffer overflow when creating a field of type Integer with a big width (#5135)
+ * delete temporary .cpg file earlier in REPACK
+ * fix leak of file descriptor in error code paths
+ * speed optimizations when reading geometries from .shp (#5272)
+ * add a 2GB_LIMIT=YES layer creation option (and SHAPE_2GB_LIMIT configuration option)
+ * .sbn support: increase allowed max depth from 15 to 24 (#5383)
+
+SOSI driver:
+ * fix memory leaks, and crashes
+ * advertise OLCCreateField capability
+
+S57 driver:
+ * make the driver thread-safe
+ * remove use of MAX_CLASSES in favor of dynamic sizing (#5227)
+ * fix GetFeature() on DSID layer
+
+SQLite/Spatialite driver:
+ * Make SQLite SQL dialect compatible with multiple geometry fields (note: however, multiple geom fields is not yet supported by OGR SQLite table layers)
+ * implement SetAttributeFilter() on SQL result layers, to directly inject it as a WHERE clause when possible
+ * add the OGR_SQLITE_PRAGMA configuration option
+ * Spatialite: correctly set proj4text field of spatial_ref_sys when inserting a new SRS in the spatial_ref_sys table (#5174)
+ * Spatialite: fix insertion in spatial_ref_sys to avoid issues with non-numeric authority codes (auth_srid)
+ * Spatialite: make creation of database much faster with spatialite 4.1 by using InitSpatialMetaData(1) (#5270)
+ * Spatialite: use thread-safe initialization for spatialite >= 4.1.2
+ * avoid Spatialite views to emit (hidden) errors that cause troubles to MapServer OGR input driver (#5060)
+ * attempt to make VirtualOGR (and thus sqlite dialect) work even with a libsqlite3 compiled with SQLITE_OMIT_LOAD_EXTENSION (on Unix only)
+ * add warning when calling CreateField() with a field name that is 'ROWID' since it can cause corrupted spatial index
+ * serialize StringList as non-truncated strings
+ * detection of DateTime/Date/Time column type on the result of a max() / min() function
+ * ensure fields of type DateTime/Date/Time are properly recognized if the table is empty (#5426)
+
+VFK driver:
+ * fix memory leak
+ * change VFK header check (first line starts with '&H')
+ * implement OGR_VFK_DB_DELETE configuration option
+ * read all data blocks by default
+ * fix GetFeatureCount()
+ * don't use existing internal db when it's older then original vfk file
+
+VRT driver:
+ * add support for multiple geometry columns in OGRVRTLayer, OGRVRTUnionLayer and OGRVRTWarpedLayer (RFC 41)
+ * add validation of OGR VRT document against the schema (if libXML2 available);
+   can be disabled by setting GDAL_XML_VALIDATION configuration option to NO
+ * make relativeToVRT=1 work with CSV:filename or GPSBABEL:driver:filename (#5419)
+
+WFS driver:
+ * WFS 2.0: be a good citizen and send TYPENAMES (with a S) for GetFeature request (but still TYPENAME for DescribeFeatureType)
+ * accept TYPENAME(S) in URL with characters escaped by '%' (#5354)
+
+XLS driver:
+ * don't use sheetId attribute from workbook.xml to link a sheet name to its filename. The first sheet is sheet1.xml, etc...
+
+XPlane driver:
+ * accept V1000 APT files
+
+## SWIG Language Bindings
+
+All bindings:
+ * include constraints.i in gdal.i so that NONNULL constraints are really applied
+ * add Feature.SetFieldBinaryFromHexString()
+ * add SpatialReference.EPSGTreatsAsNorthingEasting (#5385)
+ * map OGR_L_GetStyleTable(), OGR_L_SetStyleTable(), OGR_DS_GetStyleTable(), OGR_DS_SetStyleTable()
+ * Add OGR_STBL_AddStyle() and map all OGR_STBL_ C methods to SWIG
+
+CSharp bindings:
+ * Fix handling UTF8 strings in GDAL C# (#4971)
+ * Add C# typemaps for RFC-39 functions (#5264)
+ * Fix typo in OGRLayerAlg.cs (#5264)
+ * Add missing typemaps for C# (#5265)
+
+Java bindings:
+ * run 'make ANDROID=yes' in swig/java to generate SWIG bindings that compile for Android (#5107)
+ * fix linking issue that is encountered in non libtool builds with g++ 4.6
+ * add multireadtest utility
+ * respect JAVA_HOME set via configure
+
+Perl bindings:
+ * ColorTable method of ColorTable class was documented but ColorEntries was
+   implemented. Implemented but deprecated ColorEntries.
+
+Python bindings:
+ * fix ref-counting of callable passed to gdal.PushErrorHandler() that could cause segfaults (#5186)
+ * make gdal_array.NumericTypeCodeToGDALTypeCode accept numpy dtype arguments (#5223)
+ * add default xoff,yoff,xsize,ysize values to ReadRaster calls
+ * make ogr.CreateGeometryFromWkt() and SpatialReference.ImportFromWkt() properly validate their argument (#5302)
+
+# GDAL/OGR 1.10.0 Release Notes (r23656 to r25905)
+
+## In a nutshell...
+
+ * New GDAL drivers:
+   - ARG: read/write support for ARG datasets (#4591)
+   - CTable2: read/write support for CTable2 datum grid shift format
+   - DDS: write-only support for DirectDraw Surface format (#5017)
+   - IRIS: read support for products generated by the IRIS weather radar software (#4854)
+   - MAP:  read OziExplorer .map files (#3380)
+   - MBTiles: read-only support for MBTiles rasters (needs libsqlite3)
+ * New OGR drivers:
+   - ElasticSearch: write-only support to write into ElasticSearch databases (needs libcurl)
+   - ODS : read/write support for OpenOffice .ods (Open Document Spreadsheets) (needs libexpat)
+   - OSM : read-only support for .osm / .pbf OpenStreetMap files
+   - PDF: read/write support for vector/structured PDF files
+   - XLSX: read/write support for MS Excel 2007 and later Open Office XML .xlsx spreadsheets (needs libexpat)
+ * RFC 39: OGR Layer algebra methods : http://trac.osgeo.org/gdal/wiki/rfc39_ogr_layer_algebra
+ * Add a SQL SQLite dialect : http://gdal.org/ogr/ogr_sql_sqlite.html
+ * Make GDAL loadable as a SQLite3 extension (named VirtualOGR) (#4782)
+ * /vsicurl_streaming/: new virtual file system handler designed to read in streaming mode dynamically generated files
+ * GDAL API_PROXY mechanism to run GDAL drivers in a separate process: http://gdal.org/gdal_api_proxy.html
+ * Significantly improved drivers : PDF, SQLite, JP2OpenJPEG
+ * Add a geocoding client : http://gdal.org/ogr/ogr__geocoding_8h.html
+ * Upgrade to EPSG 8.0 database
+
+## New installed files
+
+ * data/ozi_datum.csv
+ * data/ozi_ellips.csv
+ * data/osmconf.ini
+ * include/cpl_progress.h
+ * include/cpl_spawn.h
+ * bin/gdalserver[.exe]
+
+## Backward compatibility issues
+
+Due to the 2-digit number '10' in GDAL 1.10, the GDAL_VERSION_NUM macro has been changed.
+The new advised way of testing the GDAL version number (for GDAL 1.10 or later) at compilation time is :
+
+#ifdef GDAL_COMPUTE_VERSION /* only available in GDAL 1.10 or later */
+#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(1,10,0)
+///
+#endif
+#endif
+
+Testing of previous versions is of course unchanged.
+
+## GDAL/OGR 1.10.0 - General Changes
+
+Build(Unix):
+ * New optional dependencies : libpcre (for regular expressions support in SQLite), libxml2 (validation of GML files)
+ * --with-python: make it work with python3, and also accept path to python binary as argument of --with-python (#4725)
+ * Use nc-config to detect netcdf compilation and linking parameters (#4424)
+ * Add frmts/vrt to CONFIG_CFLAGS for development version of gdal-config (needed for postgis 2.0 compilation)
+ * Fix compilation failure with iconv on FreeBSD (#4525)
+ * Make FileGDBAPI detection work with FileGDBAPI v1.1 and v1.2 (#4570)
+ * Fix build on Gentoo with its custom zlib 1.2.6 with the OF macro removed
+ * Mark man target as phony (#4629)
+ * Add guess for the directory where to find openjdk on Ubuntu 12.04 (#4643)
+ * Look for geotiff headers in /usr/include/libgeotiff too (#4706)
+ * For install target, create gdalplugins subdirectory in $(DESTDIR)$(INST_LIB)/ (Unix, except MacOSX)
+ * Better detection of OpenCL headers and library (#4665)
+ * Changed libdap test to use dap-config to detect version when possible
+
+Build(Windows):
+ * (Preliminary) support to build INGRES
+ * Make CPLGetErrorHandlerUserData() exported
+ * Make OGDI include path overridable (to match OSGeo4W's default location)
+ * Build and install plugins
+
+## GDAL 1.10.0 - Overview of Changes
+
+Port:
+ * CPL Thread API: add condition API, modeled on POSIX pthread_cond_ API
+ * Add CPLGetNumCPUs()
+ * Deserialize various forms of textual representation for positive/negative infinity
+ * Add routine to validate a XML file against its XSD schema (needs libxml2); 'optimize' it for GML files
+ * CPLRecodeStub(): for Windows, provide an implementation of UTF8 <--> CPxxx conversions using Windows API
+ * Make VSIFileManager::Get() thread-safe
+ * Fix thread-safety of CPLOpenShared() (#4848)
+ * Add CPLZLibDeflate() and CPLZLibInflate()
+ * Add API for OAuth2 authentication protocol.
+ * Curl: allows setting the CURLOPT_PROXYAUTH setting through GDAL_PROXY_AUTH=BASIC/NTLM/DIGEST/ANY,
+   allow setting CURLOPT_HTTPAUTH through GDAL_HTTP_AUTH=BASIC/NTLM/GSSNEGOTIATE/ANY (#4998)
+ * /vsicurl/ and /vsicurl_streaming/ : make it possible to cache the files in RAM with VSI_CACHE = TRUE
+ * /vsizip/: fix handling of Eof() that could cause missed last feature(s) of zipped shapefiles (#4748)
+
+Core:
+ * Add a DMD_SUBDATASETS driver metadata, and advertise it in relevant drivers (#4902)
+ * Fix statistics computation when nodata value is +/- infinity (#4506)
+ * GDALNoDataMaskBand: implement IRasterIO() for an optimization in common use case (#4488)
+ * GDALVersionInfo(): add BUILD_INFO version string
+ * GMLJP2: Fix bad interpretation when Lat/Long (#4657)
+ * Set nodata value when creating external overviews so that AVERAGE algorithm works as expected (#4679)
+ * EXIFExtractMetadata() moved to gcore/gdalexif.cpp to make it usable for other drivers
+ * Fix infinite recursion in GDALOpen() (#4835)
+ * GDALRasterBand::IRasterIO() : optimize downsampling/upsampling code path
+ * C API: make GDALSetDefaultRAT() accept a NULL RAT. All drivers are ready for that now.
+ * GDALRasterBand::GetDefaultHistogram(): change how min and max bounds are computed in the non GDT_Byte case
+ * GDALDataset::BlockBasedFlushCache(): fix crash when band has sub-blocking
+
+Algorithms:
+ * GSOC Image Correlator work (preliminary state)
+ * Warp: divide Lanczos resampling time by at least a factor of 4.
+ * Warp: add NUM_THREADS warping option to set the number of threads to use to parallelize the computation part of the warping
+ * Warp: do not stop collecting chunks to operate on just because some subchunks fail (#4795)
+ * Warp: add mode and average resampling methods (#5049)
+ * OpenCL warper: handle errors in set_supported_formats(), fix memory leaks in error code paths, add detection of Intel OpenCL (by the way, Intel OpenCL seems to work properly only with a Float32 working data type)
+ * OpenCL warper: fix segmentation fault related to source/destination validity masks (#4840)
+ * Geoloc: do not trust pabSuccess in geolocation transformer (#4794)
+ * Geoloc: add bilinear interpolation of coordinates from backmap (#4907)
+ * Geoloc: add GDALTransformGeolocations() and SWIG binding
+ * Add nearest neighbor and cubic interpolation of DEM in GDALRPCTransform (#3634).
+   User can set RPC_DEMINTERPOLATION to near, bilinear or cubic to interpolate of input DEM file which set in RPC_DEM. The default interpolation is bilinear.
+ * gdal_rasterize: fix problem identifying some connected-8 polygons (#4647)
+ * gdal_grid: speed-up dramatically nearest neighbour search (with radius1 == radius2) by using a search quad tree
+ * gdal_grid: parallelize processing by specifying the GDAL_NUM_THREADS configuration option (default to ALL_CPUS)
+ * gdal_grid: for 'invdist' algorithm with default parameters, use SSE optimized version if available (at compile and runtime). Can be disabled with GDAL_USE_SSE=NO
+
+Utilities:
+ * General: make usage message more self-explanatory in case of bad option (#4973)
+ * gdalmove.py: New application for "warping" an image by just updating its SRS and geotransform.
+ * gdal_edit.py: promote it as an 'official' tool (#4963)
+ * gdalwarp: add "-r average" and "-r mode" resampling methods (#5049)
+ * gdalwarp: copy metadata and band information from first source dataset and detect for conflicting values, new options -nomd and -cvmd (#3898)
+ * gdalwarp: optimization when (-tr and -te) or (-ts and -te) are specified (#4804)
+ * gdalwarp: assign color interpretation of source bands to target dataset, in the case of target VRT (#4462)
+ * gdalwarp: add -setci option to set the color interpretation of the bands of the target dataset from the source dataset
+ * gdal_translate: accept -srcwin or -projwin values that fall partially or completely outside the source raster extent. Introduce -epo and -eco options to error out in those situations.
+ * gdallocationinfo: add a -overview overview_level option to specify an overview level, instead of the base band
+ * gdalsrsinfo: try to open with GDAL and OGR even if argument is not a file (#4493)
+ * gdaldem: add a -combined option to the hillshade mode to compute combined hillshading (#4753)
+ * gdaldem: fix color-relief output with driver that has only CreateCopy() capability, and when the source block dimensions are not multiple of the raster dimension (#4764)
+ * gdaltindex: add -t_srs option, to transform all input source bounds to same SRS (#4773)
+ * gdalbuildvrt: add -a_srs option
+ * gdalbuildvrt: add -sd option to select subdataset by its number
+ * gdalbuildvrt: add a -b flag (#4992)
+ * gdalgrid: increase working buffer of gdal_grid binary to 16 MB
+ * gdal_retile.py: Don't pass creation options to the MEM driver used for generating temporary datasets (#4532)
+ * gdal_edit.py: make -a_srs option work properly by expanding the user input to WKT; support -a_srs ''
+ * gdal_edit.py: add support for -gcp option
+ * gdal2tiles.py: make KML output conformant with KML 2.2 (#4536)
+ * gdal2tiles.py: OL 2.12 support (#4742)
+ * gdal_polygonize.py: add -8 option to select 8 connectedness (#4655)
+ * gdal_merge.py, gdalident.py: remove using of glob() API
+ * gdal2xyz.py: fix output of -csv mode with multi-band raster
+ * gdal_contour / gdal_rasterize / gdal_translate: accept numeric values in scientific format.
+ * crs2crs2grid.py: New sample Python script
+ * gdalcompare.py: New sample Python scrip to compare GDAL datasets
+ * gdal_calc.py: add --co creation option flag (#4964)
+ * gdaladdo: add a -b flag
+ * pct2rgb.py: deal with color tables with more than 256 entries (#4905)
+
+Multi driver changes:
+ * Add support for reading .j2w, .jp2w and .wld files for JP2ECW, JP2MrSID, JP2OPENJPEG and JPEG2000 drivers (#4651)
+
+AAIGrid:
+ * Change float format string for AAIGrid to prevent pointless padding/decimals (#3732)
+
+ACE2 driver:
+ * Fix typo that prevented dataset to be opened with explicit /vsigzip/ (#4460)
+
+ADRG driver:
+ * Various fixes when opening ill-formed datasets.
+
+BAG driver:
+ * Fix serious problems with tiled images, particularly when not multiples of tile size (#4548)
+ * Added capture of dateTime attribute
+ * Support WKT (with Esri style VERTCS) spatial reference
+ * Allow WGS84 spatial reference
+ * Include compression method in metadata.
+
+BT driver:
+ * Fixes for huge files (>2GB) support (#4765)
+
+CEOS2 driver:
+ * Add various radarsat-1 related metadata fields (#4996)
+
+DIMAP driver:
+ * Check signature in METADATA.DIM, not just file existence
+ * Fixed DIMAP2 driver to get the proper absolute path in a specific case
+
+DTED driver:
+ * Write the updated value of the partial cell indicator to the file (#4687)
+ * Honour 'Longitude count' field of Data Record to deal properly with files with missing columns at the left and/or right of the file (#4711)
+
+ECW driver:
+ * Add support for ECW SDK 5.0
+ * Improve picking performance on large datasets (#4790)
+ * Use ECW SDK to do super-sampling for SDK >= 4.X
+ * Expose 256x256 block dimension instead of scanline
+ * Workaround a ECW SDK 3.3 bug, when doing a RasterIO() with the total number of bands, but not in the 1,2,..n order (#4234)
+ * Add heuristics to detect successive band reading pattern (such as done by QGIS). Beneficial for ECWP
+
+ENVI driver:
+ * Add support for writing RPCs and GCPs
+ * Add ability to access all ENVI header fields to the ENVI reader (#4735)
+ * Write in the ENVI header metadata found in the ENVI metadata domain (#4957)
+ * Fix reading of .sta file on 64bit Linux
+ * Assume BSQ interleaving when 'interleave' keyword missing or unknown
+ * Fix category names writing
+ * Remove 'envi fft result' from the blacklist
+ * Report wavelength and wavelength_units as band metadata (#3682)
+
+ENVISAT driver:
+ * Ported to VSI*L
+
+GeoRaster driver:
+ * Add spatialExtent and extentSRID create-options (#4529)
+ * Fix JPEG quality not updated on metadata (#4552)
+ * Search for RDT as regular table
+ * Add support for RPC (#4038)
+
+GIF driver:
+ * Add support for giflib 4.2.0 (#4675) and giflib 5.0
+
+GMT driver:
+ * Make GMT driver thread-safe by adding a global mutex (since the netcdf library isn't thread-safe)
+
+GTiff driver:
+ * Internal libtiff and libgeotiff refreshed from upstream
+ * Use EXTRASAMPLE_UNASSALPHA by default (behavior change w.r.t. previous GDAL versions) (#4733)
+ * Add support for reading GeoEye *.pvl metadata files (#4465)
+ * Lossless CreateCopy'ing() from a JPEG dataset
+ * Read EXIF metadata in the EXIF metadata domain
+ * Ensure that rowsperstrip is never larger than ysize (#4468)
+ * Fix writing of RGBA pixel-interleaved JPEG-compressed TIFF (#4732)
+ * Set color interpretation to GCI_PaletteIndex after calling SetColorTable() (#4547)
+ * Conversion for 8-bit unpacked CMYK (PHOTOMETRIC_SEPARATED) to RGBA.
+ * Maximize EPSG compatibility where PCS is defined (#4607)
+ * Ensure that unusual units with an authority node are saved nicely (like EPSG:2066)
+ * Add CT_HotineObliqueMercatorAzimuthCenter support
+ * Fix PolarStereographic / 9829 support
+ * Make sure that GetMetadata() initializes the value of GDALMD_AREA_OR_POINT item, if not already done (#4691)
+ * When building overviews, if the image has already an internal mask, then build internal overviews for the mask implicitly
+ * Better handling of SetMetadata(a_string) (#4816)
+ * Use GTIFAllocDefn/GTIFFreeDefn with libgeotiff 1.4.1+
+ * Add support for GEO_NORMALIZE_DISABLE_TOWGS84 (#3309)
+ * Improve handling of description and offset/scale without reverting to .aux.xml
+ * Workaround defects in libtiff 3.X when generating several overview levels at the same time
+ * Special case where the EGM96 Vertical Datum code is misused as a Vertical CS code (#4922)
+ * Support unsetting geotiff tags when calling SetGeoTransform([0,1,0,0,0,1]) and SetProjection('')
+ * Rework how CSV files are searched w.r.t libgeotiff (#4994)
+
+GRIB driver:
+ * Report nodata value (#4433)
+ * Fix fgetc signed/unsigned problem for Grib format VSI*L reader (#4603)
+ * Avoid caching more than 100 MB in case of dataset with many bands (#4682)
+ * uses meshLat as the latitude_of_origin parameter of LCC projection (#4807)
+
+GSAG driver:
+ * Fix hangs when reading truncated dataset (#4889)
+
+GS7BG driver:
+ * Implement Create() and CreateCopy() (#4707)
+
+GTX driver:
+ * Support reading old GTX files where datatype was Float64
+
+GXF driver:
+ * Avoid having big buffer on stack (#4852)
+ * Avoid locale floating point parsing problems (similar to r24367).
+ * Implement continued lines mechanism (#4873)
+ * Fix various vulnerabilities / DoS
+
+HDF4 driver:
+ * Add ability to increase the maximum number of opened HDF4 files
+ * Unix build: avoid issue with system hdfeos library
+ * Ensure we do not try to use the grid tile api for non-tilesized chunks (#4672)
+ * Preserve more Float32 attribute precision
+ * Import HDF USGS GCTP angular parameters as radians
+ * Restore conventional add_offset interpretation (#4891)
+ * Be more careful about missing dimensions (#4900)
+ * Make HDF4 driver thread-safe by adding a global mutex (since the HDF4 library isn't thread-safe)
+ * Search for "coremetadata" attribute name instead of "coremetadata."
+
+HDF5 driver:
+ * Add support for COSMO-SkyMed metadata (#4160)
+
+HFA driver:
+ * Added BASEDATA support for EPT_u1 (#4537)
+ * Fix crash on dataset closing when .ige file header is corrupted (#4596)
+ * .aux overviews: avoid destroying existing overviews when asking twice in a row to build overviews for exactly the same overview levels (#4831)
+ * Fix sizing of RAT string column maxwidth to include null char (#4867)
+ * Fix segfault in HFAAuxBuildOverviews with selected bands (#4976)
+
+INGR driver:
+ * do not reduce tile size to image size (#4856)
+ * Fix value inversion when reading type 9 (bitonal RLE) untiled files (#5030)
+ * fix slowness and incorrect random reading with RLE datasets (#4965)
+ * Enable reading bitonal rle files wider than 22784 (0x5900) pixels (#5030)
+ * Add RESOLUTION metadata/option to read/write DPI (#5030)
+ * Add write support for .rle (bitonal rle files) to test the above (#5030)
+
+ISIS3 driver:
+ * Ensure scaleFactor defaults to 1 (#4499)
+
+JP2ECW driver:
+ * Workaround conflict between ECW SDK deinitialization and GDAL deinitialization, as shown by gdaljp2ecw tests of imageio-ext (#5024)
+ * Promote 1bit alpha band of a RGBA dataset to 8 bits to improve general user experience (can be turned off by setting GDAL_ECW_PROMOTE_1BIT_ALPHA_AS_8BIT to NO)
+
+JP2KAK driver:
+ * Capture Corder in metadata for user convenience
+ * Fix writing of resolution box where the xresolution value was written instead of the yresolution one
+ * Skip bands that have different data type when reading multiple bands in IReadBlock() (#4638)
+ * Default to less than 250000 lines per tile (#5034)
+
+JP2OpenJPEG driver:
+ * Require OpenJPEG 2.0.0 now
+ * Use several decoding threads when processing multi-tiles IRasterIO() requests
+ * Add support for writing georeferencing
+ * Read and write JP2 Res box and translate it from/to TIFFTAG_XRESOLUTION, TIFFTAG_YRESOLUTION and TIFFTAG_RESOLUTIONUNIT metadata items
+ * Promote 1bit alpha band of a RGBA dataset to 8 bits to improve general user experience (can be turned off by setting JP2OPENJPEG_PROMOTE_1BIT_ALPHA_AS_8BIT to NO)
+
+JPEG driver:
+ * When there are no external overviews built, take advantage of the nature of JPEG compression to expose overviews of level 2, 4 and 8
+ * Don't return junk content when requesting xml:XMP but no XMP metadata is present (#4593)
+ * add a INTERNAL_MASK creation option to be able to disable appending the ZLib mask if not needed
+ * add support for creating a JPEG loss-less file starting with the recent IJG libjpeg v9
+   (with -co ARITHMETIC=yes -co BLOCK=1 -co COLOR_TRANSFORM=RGB1)
+
+JPEG2000 driver:
+ * do not accept by default source bands of type different from Byte, Int16 or UInt16 since they seem to cause crashes in libjasper.
+   This can be overridden, at your own risk, by setting JPEG2000_FORCE_CREATION configuration option to YES (#5002)
+
+KMLSuperOverlay driver:
+ * Add read support
+ * Remove bogus code that limited generation to one zoom level (#4527)
+ * Set minLodPixels to 1 for zoom level 0 (#4721)
+ * Fix bad placing of tiles with raster of the extent of a country or more (#4834)
+ * Add FIX_ANTIMERIDIAN creation option (#4528)
+
+L1B driver:
+ * Add support for NOAA19, METOP-B and guess for METOP-C (#2352)
+
+MG4Lidar driver:
+ * Add UTF-8 filename support under Windows (#4612)
+
+NetCDF driver:
+ * Fix for gdal_rasterize (#4432)
+ * Enable PAM for band histogram and statistics (#4244)
+ * Add longitude_of_prime_meridian value to PRIMEM
+ * Fix SetNoDataValue() - do not update when already set to new value (#4484)
+ * Convert longitude values in [180,360] interval to [-180,180] (#4512) - override with config option GDAL_NETCDF_CENTERLONG_180=0
+ * Support 2D GEOLOCATION arrays when a projected variable has coordinates attribute and supporting long/lat arrays (#4513)
+ * Ignore coordinate and bounds variables (CF sections 5.2, 5.6 and 7.1) as raster bands, but expose them as subdatasets - this allows opening files with projected SRS (or dimension bounds) directly, without specifying the variable as a subdataset
+ * Better support for Gaussian grids - store original latitude values in special Y_VALUES geolocation metadata item and use it for netcdf export (#4514)
+ * Write multi-dimensional variables to a single variable (not one for each unrolled band) in CreateCopy() (#2581)
+ * Fix handling of km units in netcdf driver and importFromProj4() (#4769)
+ * Fix detection of 1 and 2 pixel width/height netcdf datasets (#4874)
+ * Fix subdataset data type info (#4932)
+ * Make netCDF driver thread-safe by adding a global mutex (since the netcdf library isn't thread-safe)
+
+NITF driver:
+ * nitf_spec.xml: add definition of ACFTB and AIMIDB TREs
+ * Don't escape DESDATA for sizes >10mb (#4803)
+ * Fix NITF creation when both BLOCKA and TRE are passed in (#4958)
+ * Allow reading JPEG-in-NITF where JPEG stream dimensions are larger than NITF dimensions (#5001)
+ * Support for cases with 2 LUTs
+
+Northwood driver:
+ * Fixes for huge files (>2GB) support (#4565, #4645)
+ * NWT_GRD: don't advertise scale/offset as they are transparently applied in IReadBlock() (#5839).
+
+PDF driver:
+ * Add CreateCopy() support
+ * Add update support for georeferencing and metadata
+ * Add support for selective layer rendering (only with poppler backend)
+ * Add GDAL_PDF_BANDS = 3 or 4 config option to select RGB or RGBA rendering; add GDAL_PDF_RENDERING_OPTIONS config option to enable selective feature rendering by combining VECTOR, BITMAP and TEXT values
+ * Fix parsing of some georeferencing (r24022)
+ * Recognized ISO georeferencing set at the image level (and not at the page level); expose such images as subdatasets (#4695)
+ * Support Poppler 0.20 (and for current Poppler development version 0.23/0.24)
+ * UTF-16 support
+ * Report registration points as GCPs (OGC Best Practice)
+ * Allow building driver with both Poppler and Podofo (testing purposes mostly)
+ * Fix crashes on some PDF files with poppler >= 0.17.0 (#4520)
+ * Improve rounding of raster dimensions (#4775)
+ * With podofo, avoid launching the 'pdftoppm' process in a visible console on Windows (#4864)
+ * Select neatline whose description is 'Map Layers' when it is found, to keep the best neatline for USGS PDF Topo
+   and add GDAL_PDF_NEATLINE config. option to override that default value.
+ * Improve detection of DPI for USGS Topo PDF to get the maximum raster quality (will increase
+   reported dataset height and width)
+ * Extract USGS Topo PDF embedded metadata in the EMBEDDED_METADATA domain
+
+PNG driver:
+ * Internal libpng upgraded to 1.2.50
+
+PostgisRaster driver:
+ * Implement CreateCopy and Delete (#4530)
+ * Supports reading of tiled raster with irregular blocking and irregular pixel size
+ * Cache postgres db connection.
+ * Use PG environment variables as fallback when settings are not provided in the connection string. (#4533).
+ * Do not report nodata value when there is none (#4414)
+ * Removed dependency on the 'rid' column.
+ * Fix to make SQL queries with un-rounded floating point string representations. (#4736)
+ * Fix overview support
+
+Rasterlite driver:
+ * Support all resampling methods for internal overviews (#4740)
+ * Fix overview support with multi-table datasets (#4568, #4737)
+ * Add RASTERLITE_OVR_OPTIONS configuration option to specify options for the tiles of the internal overviews
+
+RMF driver:
+ * Fix incorrect zone number detection for Transverse Mercator (#4766)
+
+RPFTOC driver:
+ * Relax SanityCheckOK() to avoid rejecting valid CIB datasets (#4791)
+ * Avoid selecting a color table that is full black
+ * Add missing NITF series code 'TF' for 'TFC' (and fix typo in some other long descriptions) (#4776)
+
+RS2 driver:
+ * added various metadata fields (#4997)
+
+SDTS driver:
+ * Various fixes when opening ill-formed datasets.
+
+SRP driver:
+ * Various fixes when opening ill-formed datasets.
+
+TIL driver:
+ * Fix TIL driver using overview (#3482)
+ * Add set projection and geotransformation for TILDataset
+
+TSX driver:
+ * Fix crashes in Identify() with certain filenames, and the file is empty or doesn't exist (#4622)
+
+VRT driver:
+ * VRTWarpedDataset: add INIT_DEST=0 if no INIT_DEST specified (#4571)
+ * VRTFilteredSource: fix RasterIO() to take into account source and dest windows (#4616)
+ * avoid crashes due to int overflow when dealing with requests filling a buffer larger than 2 GB (#4815)
+ * VRTSourcedRasterBand: override ComputeRasterMinMax(), ComputeStatistics() and GetHistogram() to make them run on sources, only when there's one VRTSimpleSource covering the whole VRTSourcedRasterBand
+ * solve issue when the VRT is a symlink and that the sources filenames are RelativeToVRT (#4999)
+ * Fix relariveToVRT option in VRTRawRasterBand (#5033)
+
+WCS driver:
+ * Support version 1.1.2
+
+WebP driver:
+ * Allow reading/writing alpha channel (libwebp >= 0.1.4)
+ * Add support for reading XMP metadata in the xml:XMP metadata domain
+
+WMS driver:
+ * Implement GetMetadataItem(Pixel_iCol_iLine, LocationInfo) to retrieve pixel attributes
+ * Retrieve nodata, min and max values, defined per band or per dataset in the config file (#4613)
+ * Add GetColorTable(), used by the TiledWMS mini driver (#4613)
+ * Update TiledWMS mini-driver to support new variable substitution mechanism, min/max/nodata settings, color table support (#4613)
+ * Add a <UserPwd> element in the XML service description file
+
+XYZ driver:
+ * avoid rescanning output file at end of CreateCopy()
+
+## OGR 1.10.0 - Overview of Changes
+
+Core:
+ * Add OGRLayerDecorator class (decorator base class for OGRLayer),
+ * Add OGRWarpedLayer class (on-the-fly reprojection of a base layer)
+ * Add OGRUnionLayer class (on-the-fly concatenation of several base layers)
+ * Add OGRFieldDefn::IsSame() and OGRFeatureDefn::IsSame()
+ * Add OGRAbstractProxiedLayer, OGRProxiedLayer and OGRLayerPool classes
+ * OGRGeometry: set SRS of geometries created via GEOS functions from the source geometry (idem for geometries returned by OGR_G_ForceXXXX() methods) (#4572)
+ * OGRFeature: Add OGR_SETFIELD_NUMERIC_WARNING option to issue a warning when not fully
+               numeric values are assigned to numeric fields. If the field type is Integer,
+               then also warn if the long value doesn't fit on a int.
+ * Add OGR_G_PointOnSurface() and add it to SWIG bindings
+ * Add OGR_G_ForceToLineString / OGRGeometryFactory::forceToLineString to join
+   connected segments in line strings.
+ * Better implementation of getDimension() for OGRMultiPoint, OGRMultiLineString, OGRMultiPolygon and OGRGeometryCollection
+ * Fix incorrect rounding in OGRFormatDouble that affected geometry WKT output (#4614)
+ * OGRSQL: support UNION ALL of several SELECTs
+ * OGRSQL: defer ORDER BY evaluation until necessary, so that a spatial filter can be taken into account after layer creation
+ * OGRSQL: allow using indexes when OR or AND expressions are found in the WHERE clause
+ * OGRSQL: fix incorrect result with more than 2 JOINs and SELECT with expressions with field names (#4521)
+ * OGRSQL: fix 'SELECT MAX(OGR_GEOM_AREA) FROM XXXX' (#4633)
+ * OGRSQL: fix invalid conversion from float to integer (#4634)
+ * OGRSQL: fix behavior of binary operations when one operand is a NULL value
+ * OGRDataSource::CopyLayer(): take into account field renaming by output driver (e.g. Shapefile driver that might truncated field names) (#4667)
+ * OGRLayer::FilterGeometry() : speed-up improvement in some cases and  use GEOSPreparedIntersects() when available (r23953, r25268)
+ * OGRLayer::SetNextByIndex(): return OGRERR_FAILURE if index < 0
+ * OGRLineString::setPoint( int iPoint, OGRPoint * poPoint ) : avoid promoting the line to 25D if the point is only 2D (#4688)
+ * OGRGeometry::Centroid(): make it work properly on POINT EMPTY with latest SVN geos version
+ * Add reversePoints() method on linestring
+
+OGRSpatialReference:
+ * Add support for OGC URLs (#4752)
+ * add dumpReadable() method on OGRSpatialReference
+ * Differentiation between Hotine Oblique Mercator (aka Variant A) and Oblique Mercator (aka Variant B) (#104, #2745)
+ * EPSG: Map methods 1028 and 1029 to normal equidistant cylindrical (#4589)
+ * EPSG: add support for EPSG:5514 (Krovak East North)
+ * EPSG: Add EPSGTreatsAsNorthingEasting() to deal with CRS with non-GIS friendly northing/easting axis order similarly as what was done with lat/long geographic SRS, and automatically do coord swapping in GML/WFS drivers in that case (#4329)
+ * Ozi datum support: support all Ozi datums (#3929), support UTM projection
+ * USGS: support USGS angular parameters in radians
+ * MorphFromESRI() fix WKT : compare SPHEROID and PRIMEM parameters instead of names (#4673)
+ * MorphToESRI(): Add common New Zealand GEOGCS values (#4849)
+ * OSR ESRI: add GCS mapping name for ETRS89
+ * ogr_srs_esri: Make InitDatumMappingTable() thread-safe
+ * ecw_cs.wkt: Add entry for European Terrestrial Reference System 1989.
+ * pci_datum.txt: Add entry for D894
+ * accept "+proj=XXXX [...] +wktext" as a valid PROJ.4 string, even if projection is unhandled by OGR
+ * recognize +proj=etmerc when importing from PROJ.4 string; and output +proj=etmerc when exporting Transverse_Mercator to PROJ.4 string if OSR_USE_ETMERC = YES (#4853)
+
+Utilities:
+ * ogr2ogr: add a -dim option to force the coordinate dimension to 2 or 3
+ * ogr2ogr: accept -nlt PROMOTE_TO_MULTI to ease conversion from shapefiles to PostGIS, by auto-promoting polygons to multipolygons and linestrings to multilinestrings
+ * ogr2ogr: add -gcp, -order n and -tps options to georeference ungeoreferenced vectors (#4604)
+ * ogr2ogr: fix -select with shapefile output when specified field name case doesn't match source field name case (#4502)
+ * ogr2ogr: correctly deal with filenames that begin with 'polygon' or 'multipolygon' as arguments of -clipsrc (#4590)
+ * ogr2ogr: return non-zero exit code if the -sql triggers an error (#4870)
+ * ogr2ogr: make -t_srs work when there's no per layer source SRS, but there's per feature SRS
+ * ogr2ogr: add a -datelineoffset option  to provide users with capability to set different offsets than 170 to -170 (#4098)
+ * ogr2ogr: add a -fieldmap option (#5021)
+ * ogr2ogr: automatically rename duplicated field names of source layer so that the target layer has unique field names
+ * ogrupdate.py: new sample script to update an OGR datasource from another one, by trying to identify matches between the 2 datasources
+ * ogr_layer_algebra.py: new sample script to use OGR layer algebra operations
+
+Multi driver changes:
+ * Fix bad AND priority when spatial and attribute filter are combined in PG, MySQL, SQLite MSSQLSpatial and VRT drivers (#4507)
+
+AVCE00 driver:
+ * Fix GetFeatureCount() when an attribute or spatial filter is set
+
+AVCBin driver:
+ * Fix EOF test (#3031)
+
+CSV driver:
+ * Allow creating /vsimem/foo.csv
+ * Detect and remove UTF-8 BOM marker if found (#4623)
+ * Fix handling of empty column names in header (#4654)
+ * Allow creating a new .csv file in a directory where there are invalid .csv
+   files (#4824)
+ * Use a trick so that the CSV driver creates valid single column files (#4824)
+ * Add WRITE_BOM option to CSV driver to write UTF8 BOM for improved Excel/unicode compatibility (#4844)
+ * Don't turn \r\n into \n in CSV field output, regardless of LINEFORMAT settings (#4452)
+ * Don't left-pad numbers in CSV output when a width is set (#4469)
+ * Add support for opening .tsv files, in particular the specific Eurostat .tsv files
+
+DGN driver:
+ * Add support to read and write font name in the style (#3392)
+
+DXF driver:
+ * Write HATCH (Polygon) compatible with other DXF viewers
+ * Write layer geometry extent in file header (#4618)
+ * Ignore Spline frame control points for VERTEX of POLYLINE (#4683)
+ * Add color to POINT, INSERT and HATCH
+ * Take into account extrusion vector to transform from OCS to WCS for MTEXT, TEXT, POINT, LINE, CIRCLE, ELLIPSE, ARC, SPLINE and HATCH (#4842)
+
+FileGDB driver:
+ * Add the FGDB_BULK_LOAD configuration option (#4420)
+ * Do compulsory field name laundering. (#4458)
+ * Add special SQL commands 'GetLayerDefinition a_layer_name' and 'GetLayerMetadata a_layer_name'
+ * Implement SetFeature(), DeleteFeature() and DeleteField()
+ * Fix inserting features in a layer of geometry type wkbNone
+ * Define CLSID/EXTCLSID to fix Feature Class alias being ignored in ArcMap (#4477)
+ * Use more sensible default values for tolerance and scale parameters (#4455)
+ * Use ESRI SRS DB to find the WKT definition to use when creating a layer (#4838)
+ * Fix the way empty geometries are written
+ * Add read support for fields of type GlobalID or GUID (#4882)
+ * Add XML_DEFINITION layer creation option
+ * Support setting fields of type SmallInteger, Float and GUID
+
+Geoconcept driver:
+ * Partial support of relaxed GXT export syntax and fix when line is incomplete (#4983)
+
+GeoJSON driver:
+ * Fix HTTP HEADERS field send to server (#4546)
+ * GeoJSON: write crs object as a FeatureCollection attribute in generated GeoJSON files (#4995); on read, strip AXIS nodes
+
+Geomedia driver:
+ * Fix loading of 'boundary' geometries when they are 2.5D or contain more than one inner rings (#4734)
+
+GFT driver:
+ * Use OAuth2 authentication (was ClientLogin in previous versions).
+
+GML driver:
+ * Add PREFIX and TARGET_NAMESPACE dataset creation options
+ * Fix typo when writing geometry type name of MultiLineString in GML3 .xsd (#4674)
+ * CreateFeature(): assign spatial ref when it is unset in source feature, even for GML2 case (fixes non-compliance with missing srsName on multi-geometries)
+ * Make filtering of features based on OGR_GEOMETRY work (#4428)
+ * Avoid point duplication concatenating GML curve segments (#4451)
+ * Add special SQL command 'SELECT ValidateSchema()'
+ * Allow reading srsDimension attribute when set on LineString element, and not on posList (#4663)
+ * Partial support for reading GML 3.3 compat encoding profile, limited to <gmlce:SimplePolygon>, <gmlce:SimpleRectangle>, <gmlce:SimpleTriangle>, <gmlce:SimpleMultiPoint> elements
+ * Support WFS GetFeature response document to be piped and opened with /vsistdin/
+ * Support specifying connection string as 'filename.gml,xsd=some_filename.xsd' to explicitly provide a XSD
+ * Improve detection of extent and srs for WFS 2.0
+ * Allow ISO-8859-15 encoded files to be used by Expat parser (#4829)
+ * Handle CompositeCurve like MultiCurve (for NAS)
+ * Remove duplicate points in rings
+ * Add OGR_ARC_MINLENGTH to limit the number of segments in interpolated arcs
+ * When there are several geometries per feature, use geometry inside <XX:geometry> element for Inspire compatibility
+ * Return per-feature SRS if there's no global SRS for a layer
+ * Parse correctly <gml:outerBoundaryIs> when there are attributes in the element (#4934)
+ * Recognize <gml:GeodesicString>
+ * Recognize <gml:Envelope> elements (#4941)
+ * Fix crash when reading CityGML attribute with empty string (#4975)
+
+ILI driver:
+ * Support for format codes (#3972)
+ * ILI1: Use Topic name from model in itf output
+ * ILI1: Recode ISO 8859-1 strings
+ * ILI1: Various fixes related to enumerations
+ * ILI2: Fix reading with models
+
+Ingres driver:
+ * Add effuser and dbpwd connection parameters.
+ * Enhance EPSG search bath on WKT AUTH ids.
+ * Use system defined sequence for fid instead of global (#4567)
+ * Fix a name mixup when creating the table (#4567)
+
+KML driver:
+ * Report empty layers when there is only empty layers; don't error out on empty document (#4511)
+ * Recognize file whose root element is <Document> and not <kml>
+
+Idrisi driver:
+ * Add support for reading attributes from .AVL / .ADC files
+ * Ignore nodata value when computing min/max of CreateCopy()'ed dataset
+ * Avoid setting unset values of mean and stddev to PAM (#4878)
+
+LIBKML driver:
+ * Add stylemap support
+ * Add support for GroundOverlay reading (#4738)
+ * Fix memory leak in OGRLIBKMLDataSource::FindSchema() when a schema is referenced by name and not by id (#4862)
+ * Correct use of temporary variable for schema field names (#4883)
+ * Update the layer class internal feature count when a new feature is added
+
+MITAB driver:
+ * Fix unwanted changes in data types while converting a datasource to MIF (#3853)
+ * Fix incorrect handling of Mollweide projection (#4628)
+ * Fix double free in OGRTABDataSource::Create() when exiting with error (#4730)
+ * Add datum mapping between EPSG/authority codes and the MapInfo definitions. Falls back to old behavior of name/string matching. (#481)
+ * Avoid negative zeros in TOWGS84 read from TAB file (#4931)
+
+MSSQLSpatial driver:
+ * Report DeleteFeature/DeleteLayer capabilities
+ * Fix the parser to swap coordinates with geography data type (#4642)
+ * Fix to read multipoint geometries correctly (#4781)
+ * Fix to read 3D geometries correctly (#4806, #4626)
+ * Use MSSQL catalog if geometry_columns doesn't exist (#4967)
+ * Utilize OGRFieldDefn::IsIgnored() (#4534)
+ * Remove requirement for identity fid column in MSSQL tables (#4438)
+
+MySQL:
+ * Enable auto reconnect to MySQL (#4819)
+ * Reset field width and precision when converting from an unhandled field type to TEXT (#4951)
+
+NAS driver:
+ * Better support for wfsext:Replace (#4555)
+ * Skip elements "zeigtAufExternes" and "objektkoordinaten" (fixes PostNAS #3 and #15)
+ * Issue a warning when geometry is overwritten, invalid geometry is found or featureless geometry appears
+ * Issue a debug message when a existing attribute is overwritten (to catch array)
+ * Use forceToLineString() on line strings (fixes PostNAS #18)
+ * Handle MultiCurve and CompositeCurve
+ * Merge multilinestrings
+ * Accept XML files that have AAA-Fachschema.xsd in header (and remove trailing whitespace)
+ * Add EPSG:25833
+
+NULL driver:
+ * No-op output driver for debugging/benchmarking purpose (Not included in build process)
+
+OCI driver:
+ * Fix for index creation when layers are created (#4497)
+
+ODBC driver:
+ * Allow opening directly *non-spatial* MS Access .MDB databases (on Windows only)
+ * Make SetAttributeFilter(NULL) work (#4821)
+ * Add optimized GetFeatureCount() implementation
+
+NTF driver:
+ * Various fixes when opening ill-formed datasets.
+
+OCI driver:
+ * Fix issue with pre-existing tables with laundered names not being recognized (#4966)
+ * Make sure the FID counter is correctly initialized when data is appended (#4966)
+ * Better quoting of identifiers (#4966)
+
+PGeo driver:
+ * PGeo / Geomedia : remove heuristics that tried to identify if a MDB file belonged to the PGeo or Geomedia driver (#4498)
+
+PG driver:
+ * Add a 'COLUMN_TYPES' layer creation option (#4788)
+ * Fix insertion of features with FID set in COPY mode (#4495)
+ * Honour datasource read-only mode in CreateField(), CreateFeature(), SetFeature() and DeleteFeature() (#4620)
+ * Avoid fatal error when the public schema is absent (#4611)
+ * Differ SRS evaluation on SQL layers (#4644)
+ * Optimize SRID fetching on SQL result layer; compatibility with PostGIS 2.0 by using ST_SRID (#4699, #4700)
+ * Always fetch the SRS to attach it to feature geometry of result SQL layers.
+
+PGDump driver:
+ * Add a 'COLUMN_TYPES' layer creation option (#4788)
+
+REC driver:
+ * Add robustness checks against corrupted files
+
+SDE driver:
+ * Add support for CLOB and NCLOB data type (#4801)
+
+Shapefile driver:
+ * Add support for reading ESRI .sbn spatial index (#4719)
+ * Add deferred layer loading
+ * Implement auto-growing of string and integer columns
+ * Add a special SQL command 'RESIZE table_name' to resize (shrink) fields to their optimum size, also available as a RESIZE=YES layer creation option for convenience
+ * Recode field name from UTF-8 to DBF encoding in CreateField()
+ * In creation, limit fields of type OFTString to a width of 254 characters (#5052)
+ * Spatial index optimization (#4472)
+ * Fix GetFeatureCount() when spatial filter set, especially on big-endian hosts (#4491)
+ * Fixed wrong return value of OLCStringsAsUTF8 in OGRShapeLayer::TestCapability if GDAL was compiled without iconv support (#4650)
+ * Support properly creating layers that include dot character
+ * Avoid assert() if SetFeature() is called on a feature with invalid FID (#4727)
+ * Correctly deal with .cpg files containing 8859xx string (#4743)
+ * Make TestCapability(OLCFastFeatureCount) return TRUE when an attribute filter is set only if attribute indices can be used
+ * Shapelib: Fix memory leaks in error code path of DBFCreateLL() (#4860)
+ * Deal better with shapefile directories with foo.shp and FOO.DBF, particularly for REPACK support, and particularly for Windows OS (on Linux, foo.shp and FOO.DBF will be 2 different layers)
+ * Delete temporary _packed.cpg file generated during REPACK of a layer whose .dbf has an accompanying .cpg file
+ * In DeleteDataSource(), delete .cpg file if existing
+
+S57 driver:
+ * Various fixes when opening ill-formed datasets.
+ * Preliminary support for FFPT/FFPC update records (#5028)
+ * Add RECODE_BY_DSS suboption to OGR_S57_OPTIONS configuration option that can be set to YES so that the attribute values are recoded to UTF-8, from the character encoding specified in the S57 DSSI record (#5048, #3421, adapted from patch by julius6)
+
+SQLite/Spatialite driver:
+ * Add support for tables with multiple geometry columns (#4768)
+ * Add (preliminary) support for SpatiaLite 4.0 database changes (#4784)
+ * Make GDAL loadable as a SQLite3 extension (named VirtualOGR) (#4782)
+ * Add support for OFTDateTime/OFTDate/OFTTime field types
+ * Add a SRID layer creation option
+ * Make REGEXP function available by using libpcre (#4823)
+ * Add a COMPRESS_COLUMNS layer creation option to make string columns ZLib compressed
+ * Implement minimal set of spatial functions if SpatiaLite isn't available
+ * SpatiaLite: make use of spatial filter on result layers when the SQL expression is simple enough (no join, etc...) (#4508)
+ * SpatiaLite: spatial index can be used even when linking against regular SQLite (#4632)
+ * SpatiaLite: to improve performance, defer spatial index creation at layer closing or when a spatial request is done
+ * SpatiaLite: use SpatiaLite 'layer_statistics' and 'spatialite_history' to cache the row count and extent of (spatial) layers
+ * Spatialite: add support for reading Spatialite 4.0 statistics (filling them on the fly still not implemented)
+ * SpatiaLite: for SpatiaLite 4.0, translate INIT_WITH_EPSG=NO into InitSpatialMetaData('NONE') to avoid filling the spatial_ref_sys table
+ * On SQL result layers, report the SRS of the geometry of the first feature as the layer SRS
+ * Deferred layer definition building for table and view layers
+ * Speed-up opening of a result layer that has an ORDER BY
+ * Cache GetExtent() result
+ * Allow inserting empty feature
+ * Return empty layer when SELECT returns 0 rows (#4684)
+ * Add compatibility for newer SQLite versions when using the VFS layer (#4783)
+ * Add missing column name quoting
+
+TIGER driver:
+ * Fix opening TIGER datasource by full file name (#4443)
+ * Updated to use VSI*L
+
+VFK driver:
+ * SQLite is now a compulsory dependency for VFK
+ * Store VFK data in SQLite (in-memory) database
+ * Don't read whole file into buffer, but only on request
+ * id property of data records in VFK file exceed int limit -> use GUIntBig for id values
+ * Fix reading multi-line data records
+ * Recode string feature properties - convert from cp-1250 to utf-8
+ * Skip invalid VFK features
+
+VRT driver:
+ * Add <OGRVRTWarpedLayer> (on-the-fly reprojection of a base layer)
+ * Add <OGRVRTUnionLayer> (on-the-fly concatenation of several base layers)
+ * Add <FeatureCount>, <ExtentXMin>, <ExtentYMin>, <ExtentXMax>, <ExtentYMax> to <OGRVRTLayer>
+ * Add an optional 'dialect' attribute on the <SrcSQL> element
+ * Fix OGR VRT sensitive to whitespace and <?xml> nodes (#4582)
+ * Optimizations to avoid feature translation when possible
+ * Implement GetFIDColumn() (#4637)
+ * Implement StartTransaction(), CommitTransaction() and RollbackTransaction() by forwarding to the source layer
+ * Auto enable bAttrFilterPassThrough when possible
+
+WFS driver:
+ * WFS paging: change default base start index to 0 (was 1 before), as now clarified by OGC (#4504)
+ * Accept several type names if the TYPENAME parameter is specified
+ * Forward SQL ORDER BY clause as a WFS SORTBY for WFS >= 1.1.0
+ * Fix spatial filter with WFS 2.0 GeoServer
+ * Check that left-side of a binary operator in an attribute filter is a property name before submitting it to server-side
+ * Major overhaul of URL-escaping
+ * Fix issues when querying the WFSLayerMetadata and that one of the field contains double-quote characters (#4796)
+ * Remove auto-added ACCEPTVERSIONS=1.0.0,1.1.1 - when none of VERSION or ACCEPTVERSIONS were specified - because it does not work with WFS 2.0 only servers
+ * Automagically convert MAXFEATURES= to COUNT= if people still (wrongly) used it for WFS 2.0
+ * Honour paging when running GetFeatureCount() and that RESULTTYPE=HITS isn't available (e.g. WFS 1.0.0) (#4953)
+ * Optimize WFS 1.0 (or WFS 1.1.0 where RESULTTYPE=HITS isn't available) so that in some circumstances the GML stream
+   downloaded is used to compute GetFeatureCount() and GetExtent() together
+ * Fix segfault on non-GML output when there's SRS axis swapping but the feature has no geometry (#5031)
+
+XLS driver:
+ * Set FID to the row number in the spreadsheet software (first row being 1). In case OGR detects a header line, the first feature will then be assigned a FID of 2 (#4586)
+ * Non-ascii path support for Windows (#4927)
+
+## SWIG Language Bindings
+
+All bindings:
+ * Add VSIReadDirRecursive() (#4658)
+ * Add a osr.CreateCoordinateTransformation(src, dst) method (and for Java, a static method CoordinateTransformation.CreateCoordinateTransformation(src, dst) (#4836)
+ * Add ogr.ForceToLineString()
+ * Clear error before OGR_Dr_Open() (#4955)
+ * Add a SetErrorHandler(handler_name) method
+
+CSharp bindings:
+ * Add C# signature for FileFromMemBuffer that accepts byte array (#4701)
+
+Java bindings:
+ * Fix compilation issue with SWIG 2.0.6 on Java bindings (#4669)
+ * New test application: ogrtindex.java
+ * Fix values of gdalconst.DCAP_* and gdalconst.DMD_* constants (#4828)
+ * Fix check for opaque colors in getIndexColorModel()
+
+Perl bindings:
+ * Specify module files to install
+ * Return values have to be mortal, this was not the case in many instances.
+ * New method Driver::Name aka GetName
+ * doc target in GNUmakefile to call doxygen
+ * Default to first band in GetRasterBand.
+ * New method Geo::OGR::Layer::DataSource
+ * New method Geo::OGR::Layer::HasField
+ * Geometry method accepts geometries in Perl structures
+ * Fixed a bug in FeatureDefn::create which changed the fields.
+ * New experimental methods ForFeatures and ForGeometries.
+ * InsertFeature, Tuple and Row methods use the Tuple and Row methods from Feature.
+ * Do not use pattern my var = value if ...; as it seemingly may cause unexpected things.
+   target_key is optional argument.
+ * Allow setting geometry type with schema argument.
+ * Fix incorrect behavior of Geo::OGR::Geometry method Points in the case of a Point (#4833)
+ * Preserve the coordinate dimension in Move method
+
+Python bindings:
+ * setup.py: Changes to run without setuptools (#4693)
+ * setup.py: Automatically run 2to3 for Python3
+ * Define __nonzero__ on Layer object to avoid GetFeatureCount() being called behind our back when doing 'if a_layer:' (#4758)
+ * Fix performance problem when instantiating Feature, especially with Python 3
+ * Add RasterBand.ReadBlock(), mostly for driver testing
+ * Reject strings when array of strings are expected
+ * make gdal.PushErrorHandler() also accept a Python error handler function as an argument (#4993)
+ * Fix Feature.ExportToJSon() to write the id attribute when it is 0 (the undefined value is NullFID ## -1)
+
+# GDAL/OGR 1.9.0 Release Notes
+
+## In a nutshell...
+
+ * New GDAL drivers: ACE2, CTG, E00GRID, ECRGTOC, GRASSASCIIGrid, GTA, NGSGEOID, SNODAS, WebP, ZMap
+ * New OGR drivers:  ARCGEN, CouchDB, DWG, EDIGEO, FileGDB, Geomedia, GFT, IDRISI, MDB, SEGUKOOA, SEGY, SVG, XLS
+ * Significantly improved drivers: NetCDF
+ * Encoding support for shapefile/dbf (#882)
+ * RFC 35: Delete, reorder and alter field definitions of OGR layers
+ * RFC 37: Add mechanism to provide user data to CPLErrorHandler (#4295)
+ * gdalsrsinfo: new supported utility to report SRS in various form (supersedes testepsg)
+
+## New installed files
+
+ * data/nitf_spec.xml and data/nitf_spec.xsd
+
+## Backward compatibility issues
+
+ * GTiff: ensure false easting/northing in geotiff geokeys are treated as being in geosys units (#3901)
+ * GRIB: Fix grid vs cell-center convention (#2637)
+ * OGR SQL: with DISTINCT, consider null values are such, and not as empty string (#4353)
+
+## GDAL/OGR 1.9.0 - General Changes
+
+Build(Unix):
+ * Add --with-rename-internal-libtiff-symbols and --with-rename-internal-libgeotiff-symbols
+   flags in order to safely link against an external libtiff (3.X) and a GDAL built with
+   internal libtiff (4.0) support (#4144)
+ * Add --with-mdb --with-java,--with-jvm-lib, --with-jvm-lib-add-rpath options
+ * Add --with-podofo, --with-podofo-lib, --with-podofo-extra-lib-for-test options
+ * Add --with-armadillo
+ * Update to libtool 2.4
+ * Fix linking against static libkml (#3909)
+ * Fix Xerces detection by using LIBS instead of LDFLAGS (#4195)
+ * Check for .dylib too, when configuring MrSID SDK paths (#3910)
+ * Fix wrong include order in GNUmakefile of GPX and GeoRSS drivers (#3948)
+ * cpl_strtod.cpp: Enable android support (#3952).
+ * ensure swig-modules depends on lib-target so make -j works with swig bindings
+ * Change how we check for GEOS >= 3.1  (#3990)
+ * Define SDE64 on at least x86_64 platforms (#4051)
+ * Make ./configure --with-rasdaman=yes work (#4349)
+ * MinGW cross compilation: clear GEOS_CFLAGS and XERCES_CFLAGS
+   if headers found in /usr/include, do not use Unix 64 bit IO
+ * MinGW build: define __MSVCRT_VERSION__ to 0x0601 if not already set
+
+Build(Windows):
+ * Move MSVC warning disabling to nmake.opt, add SOFTWARNFLAGS for external code
+ * Use nmake.local (#3959)
+ * cpl_config.h.vc: fix up so it also works with mingw (#3960)
+ * Build testepsg utility by default when OGR is enabled (#2554)
+
+## GDAL 1.9.0 - Overview of Changes
+
+Port:
+ * /vsigzip/ : Avoid reading beyond file size in case of uncompressed/stored files in zip (#3908)
+ * /vsicurl/ : Better support for escaped and UTF-8 characters
+ * /vsicurl/ : speed-up with a per-thread Curl connection cache
+ * /vsicurl/ : read https directory listing
+ * /vsicurl/ : look for GDAL_DISABLE_READDIR_ON_OPEN configuration option in
+   Open() and Stat() to avoid trying fetching the directory file list
+ * /vsicurl/ : fix performance problem when parsing large directory listings (#4164)
+ * /vsicurl/ : recognize listing of Apache 1.3
+ * /vsicurl/ : fix ReadDir() after reading a file on the same server
+ * /vsicurl/ : fetch more info (size, date) when listing FTP or HTTP directories and save it in cache; use those info for ReadDir() and Stat()
+ * /vsicurl/: accept 225 as a valid response code for FTP downloads (#4365)
+ * /vsicurl/ : add CPL_VSIL_CURL_ALLOWED_EXTENSIONS configuration option that can be used to restrict files whose existence is going to be tested.
+ * /vsitar/ : Recognize additional .tar files with slightly header differences
+ * /vsizip/ : wrap the returned file handle in a BufferedReader
+ * /vsizip/ : fix 1900 year offset for year returned by VSIStatL()
+ * /vsizip and /vsitar: remove leading './' pattern at the beginning of filenames contained in the archive
+ * /vsistdout_redirect/ : New virtual file system driver that has the same
+   behavior as /vsistdout/ (write-only FS) except it can redirect the output to
+   any VSIVirtualFile instead of only stdout (useful for debugging purposes)
+ * Implement VSI*L read caching - useful for crappy io environments like Amazon
+ * VSI*L: Add Truncate() virtual method and implement it for unix, win32 and /vsimem file systems
+ * VSI*L: Add ReadMultiRange() virtual method to read several ranges of data in single call; add an optimized implementation for /vsicurl/
+ * VSIFEofL(): make it more POSIX compliant.
+ * Fine tune CPLCorrespondingPaths() for different basenames when paths involved.
+ * VSIWin32FilesystemHandler::Open() : implement append mode.  Needed by ISIS2 driver with attached label (#3944)
+ * CPLString: add case insensitive find operator (ifind)
+ * RFC23: Add the iconv() based implementation of the CPLRecode() function (#3950)
+ * Preliminary support for wchar_t with iconv recode (#4135)
+ * Avoid calling setlocale if we are already in the C locale, or GDAL_DISABLE_CPLLOCALEC is TRUE (#3979)
+ * CPLMiniXML: emit warnings when encountering non-conformant XML that is however accepted by the parser
+ * add CPLBase64Encode(); move cpl_base64.h contents to cpl_string.h
+ * Use CRITICAL_SECTION instead of Mutex on win32
+ * CPLHTTPFetch(): Add a CLOSE_PERSISTENT option to close the persistent sessions
+ * CPLHTTPFetch(): Add support for "NEGOTIATE" http auth mechanism
+ * CPLHTTPFetch(): Add a CUSTOMREQUEST option
+ * VSIBufferedReaderHandle: fix Eof()
+ * Add CPLStringList class
+ * Add CPLEmergencyError() - to call when services are too screwed up for normal error services to work (#4175)
+ * CPLEscapeString(,,CPLES_URL) : don't escape dot character; fix escaping of characters whose code >= 128
+
+Core:
+ * Provide for ABI specific plugin subdirectories on all platforms
+ * Force cleanup of datasets when destroying the dataset manager
+ * Add a GDALDataset::CloseDependentDatasets() that can be used by GDALDriverManager::~GDALDriverManager() to safely close remaining opened datasets (#3954)
+ * Add GDALRasterBand::ReportError() and GDALDataset::ReportError() to prepend dataset name (and band) before error message (#4242)
+ * Fix performance problem when serializing huge color tables, metadata, CategoryNames and GCPs to VRT/PAM (#3961)
+ * Be careful about Nan complex values getting histogram, avoid locale issues with statistics metadata
+ * GDALRasterBand::IRasterIO() default implementation : don't try to use full-res band if I/O failed on the appropriate overview band (for WMS errors)
+ * RasterIO: Return earlier when a write error occurred while flushing dirty block
+ * GDAL_DISABLE_READDIR_ON_OPEN can be set to EMPTY_DIR to avoid reading the dir, but it set an empty dir to avoid looking for auxiliary files
+ * Use sibling file list to look for .aux.xml, .aux, .ovr, world files, tab files
+ * Add GDALFindAssociatedFile() (#4008)
+ * PAM: Make sure GCPs loaded from a .aux.xml override any existing ones from other sources, like an .aux file
+ * PAM: Add cloning of CategoryNames
+ * PAM : PamFindMatchingHistogram() - fix floating-point comparison
+ * GMLJP2: Use http://www.opengis.net/gml as the schemaLocation
+ * GMLJP2: Support for capturing and writing page resolution in a TIFF compatible way (#3847)
+ * GDALJP2Box::SetType() : remove byte-swapping so that SetType()/GetType() correctly round-trips. Do appropriate changes in JP2KAK and ECW drivers. (#4239)
+ * GDALReplicateWord(): fix off-by-one error initialization (#4090)
+
+Algorithms:
+ * polygonize: Added GDALFPolygonize() as an alternative version of GDALPolygonize() using 32b float buffers instead of int32 ones. (#4005)
+ * gdalwarp: take into account memory needed by DstDensity float mask (#4042)
+ * rasterfill: create working file as a bigtiff if at all needed (#4088)
+ * gdalrasterize: use double instead of float to avoid precision issues (#4292)
+
+Utilities:
+ * gdalsrsinfo: new supported utility to report SRS in various form (supersedes testepsg)
+ * gdalinfo: add '-nofl' option to only display the first file of the file list
+ * gdalinfo: add '-sd num' option to report subdataset with the specified number.
+ * gdalinfo: add '-proj4' option to gdalinfo, to report a PROJ.4 string for the CRS
+ * gdal_translate: propagate INTERLEAVE metadata to intermediate VRT dataset
+ * gdal_translate: force quiet mode when writing to /vsistdout/
+ * gdalwarp: Disable CENTER_LONG rewrapping for cutline (#3932)
+ * gdalwarp: add -refine_gcps option to discard outliers GCPs before warping (#4143)
+ * gdalwarp: add warning if user specifies several of -order, -tps, -rpc or -geoloc options
+ * gdalwarp: speed-up when using -tps with large number of GCPs
+ * gdalwarp: add support for optional use of libarmadillo to speed-up matrix inversion in -tps mode
+ * gdalwarp: detect situations where the user will override the source file
+ * gdallocationinfo: do not let one off-db pixel cause all the rest to be suppressed (#4181)
+ * gdal_rasterize: fix half pixel shift when rasterizing points; make gdal_rasterize utility increase the computed raster extent by a half-pixel for point layers (#3774)
+ * gdal_rasterize: when source datasource has a single layer, use it implicitly if none of -l or -sql is specified
+ * nearblack: add -color option (#4085)
+ * nearblack: improve detection of collar
+ * nearblack: remove useless restrictions on number of bands for -setmask and -setalpha options (#4124)
+ * gcps2vec.py: Fix command line parsing; Add SRS definition to created vector layer; Use Point geometry when dumping pixel/line coordinates.
+ * gdal_merge.py: add support for -separate with multiband inputs (#4059)
+ * gdal_merge.py: add a -a_nodata option (#3981)
+ * gdal_proximity.py: -co option existed, but was unused...
+ * gdal_fillnodata.py: add -co option
+ * Add gdal_ls.py and gdal_cp.py as Python samples
+ * Add new sample utility, gdal_edit.py, to edit in place various information of an existing GDAL dataset (projection, geotransform, nodata, metadata) (#4220)
+ * gdalcopyproj.py: make it copy GCPs too
+ * Add warning if a target filename extension isn't consistent with the output driver
+ * Add --pause for convenient debugging, document it and --locale
+
+Multi-driver topics:
+ * Implement reading XMP metadata from GIF, JPEG, PNG, GTiff, PDF and the 5 JPEG2000 drivers. The XMP metadata is stored as raw XML content in the xml:XMP metadata domain (#4153)
+ * Mark BT, DIPEx, ERS, FAST, GenBIN, GSC, GSBG, GSAG, GS7BG, JDEM, JP2ECW, PNM, RMF, TIL, WCS and WMS drivers as compatible with VSI virtual files
+ * Port DOQ1, DOQ2, ELAS, Idrisi, L1B, NDF, NWT_GRD, NWT_GRC, USGSDEM to VSI virtual file API
+ * PAM-enable BT and BLX drivers
+ * Implement Identify() for AAIGrid, ACE2, DTED, NWT_GRD, NWT_GRC, WMS, WCS, JDEM and BSB drivers
+ * Make GIF, JPEG and PNG drivers return a non NULL dataset when writing to /vsistdout/
+ * HFA and GTiff: add explicit error message when trying to add external overviews when there are already internal overviews (#4044)
+ * Initialize overview manager to support external overviews for AAIGRID, DIPX, ELAS, GXF, FIT, FITS, GMT, GRIB, GSAG, GSBG, GS7BG, ILWIS, L1B, LCP, Leveller, NWT_GRD, NWT_GRC, RIK, SDTS and SAGA
+
+AAIGrid:
+ * Make opening from /vsicurl/ work even when the server returns an empty file list
+
+ACE2 driver:
+ * New for GDAL/OGR 1.9.0
+ * Read ACE2 DEM
+
+AIG driver:
+ * Support uncompressed integer files, new in ArcGIS 10 it seems (#4035)
+ * Use color table from PAM if no native one (#4021)
+ * Fallback to PAM mechanism for RAT (#4021)
+
+BSB driver:
+ * Parse the GD keyword in BSB_KNP to recognize European 1950 datum (#4247)
+ * fix compilation issues with -DBSB_CREATE
+
+CEOS2 driver:
+ * avoid potential crash reading past end of string. (#4065)
+
+CTG driver:
+ * New for GDAL/OGR 1.9.0
+ * Read USGS LULC Composite Theme Grid files
+
+DIMAP driver:
+ * Add support for DIMAP2
+ * Check underlying raster for SRS. There are cases where HORIZONTAL_CS_CODE is empty and the underlying raster is georeferenced
+
+E00GRID driver:
+ * New for GDAL/OGR 1.9.0
+ * Read Arc/Info Export E00 GRID
+
+ECRGTOC driver:
+ * New for GDAL/OGR 1.9.0
+ * Read TOC.xml file of ECRG products
+
+ECW driver:
+ * Use a long refresh time for ecwp:// connections to ensure we get full resolution data, make configurable
+ * Re-enable writing non8bit data in jpeg2000
+ * Add implementation of an Async reader (4.x SDK)
+ * Improve to support all /vsi stuff (#2344)
+ * Ensure ECW_ENCODE_ values are applied for direct Create as well as CreateCopy
+ * force adfGeoTransform[5] sign to negative. (#393)
+ * Mark GDAL_DCAP_VIRTUALIO=YES when the driver is configured in read-only mode
+ * Ensure we fallback to native geotransform if no pam override
+ * Try to read projection info embedded in ECW file before reading the worldfile (#4046)
+ * Add support for updating geotransform and projection info of a ECW file (#4220)
+ * Fix ECW_CACHE_MAXMEM that was without effect and ECW_AUTOGEN_J2I that set an unrelated ECW parameter (#4308)
+ * Allow to open a ECW file with invalid EPSG code from SWIG bindings (#4187)
+
+EHdr driver:
+ * Improve floating point detection (#3933)
+ * Recognize MIN_VALUE and MAX_VALUE as found in ETOPO1 header
+ * Try opening the .sch file for GTOPO30 or SRTM30 source file
+ * Ignore bogus .stx file where min == nodata
+
+EIR driver:
+ * Add support for DATA_TYPE keyword
+
+ENVI driver:
+ * Add support for ESRI style coordinate system string (#3312)
+ * Try to guess interleave mode from file extension, if interleave keyword is missing
+ * Refuse to open unsupported types, but attempt to open everything else.
+
+ENVISAT driver:
+ * Correct dfGCPLine values for stripline products (#3160, #3709)
+ * Fix checking of tie points per column for MERIS GCPs (#4086)
+ * Report metadata from the ASAR ADS and GADS in the RECORDS metadata domain (#4105)
+ * Read MERIS metadata (#4105)
+ * Read data from ERS products in ENVISAT format (#4105)
+ * Improved MERIS Level 2 bands detection (#4141 and #4142)
+
+EPSILON driver:
+ * Now require libepsilon 0.9.1 to build (now dual LGPL/GPL) (#4084)
+
+ERS driver:
+ * Use case insensitive find so case does not matter (#3974)
+ * Handle case of 1 m pixel resolution when CellInfo is missing (#4067)
+ * Implement ERSRasterBand::SetNoDataValue() (#4207)
+ * Add support for DATUM, PROJ and UNITS creation option; report the values read from the .ers file in the ERS metadata domain (#4229)
+
+GeoRaster driver:
+ * Set nodata causes invalid XML metadata (#3893)
+ * Fix SetStatistics() failure (#4072)
+ * Fix default interleaving (#4071)
+ * modelCoordinateLocation=CENTER default (#3266)
+ * Cache block/level error in update (#4089)
+ * Fix sequence.nextval not supported (Oracle 10g) (#4132)
+ * change BLOCKING option to OPTIMALPADDING
+ * fix 'cannot specify columns on insert create option' (#4206)
+ * Fix ULTCoordinate Rows/Columns swapping (#3718)
+ * Fix loading of small images, FlushCache issue (#4363)
+
+GIF driver:
+ * Make CreateCopy() more friendly with writing in /vsistdout/
+
+GRIB driver:
+ * Fix grid vs cell-center convention (#2637)
+ * use /vsi for all jpeg2000 files now
+ * Fix to allow GFS data to show up properly (#2550)
+ * Added a ConfigOption in GRIB driver to not normalize units to metric when reading the data
+ * Fixed grib1 & grib2 : pixel size precision introduces error for corner coordinates (#4287)
+
+GTA driver:
+ * New for GDAL/OGR 1.9.0
+ * Read/write support for Generic Tagged Arrays
+
+GTiff driver:
+ * Ensure false easting/northing in geotiff geokeys are treated as being in geosys units.  Add GTIFF_LINEAR_UNITS=BROKEN config option to try and read old broken files, and logic to cover for older libgeotiffs when reading (#3901)
+ * Add support for a special tag to keep track of properly written linear units (#3901)
+ * Implement deferred directory chain scanning to accelerate simple opens
+ * Make GTiff COPY_SRC_OVERVIEWS to deal with unusual source overview sizes (#3905)
+ * Fix bug when using -co COPY_SRC_OVERVIEWS=YES on a multiband source with external overviews (#3938)
+ * Add logic to fill out partial tiles on write in for jpeg images (#4096)
+ * Updated to libtiff 4.0.0 final
+ * Refresh with libgeotiff 1.4.0, to support for GeogTOWGS84GeoKey
+ * Add support for Geocentric SRS
+ * libtiff: Enable DEFER_STRILE_LOAD
+ * Turn warning 'ASCII value for tag xx into more silent CPLDebug message
+ * Overviews: Improve error reporting for >16bit images to JPEG compression
+ * Use CPLAtof() for geotiff and epsg .csv file handling (#3886, #3979)
+ * Lots of Imagine and ESRI PE string citation handling changes from 1.8-esri. Some citation related changes only compiled in if ESRI_SPECIFIC defined.
+ * Give PAM information precedence over metadata from GeoTIFF itself.   Avoid unnecessary (default) writes of scale/offset.  Treat (0,1,0,0,0,-1) as a default geotransform as well as (0,1,0,0,0,1).
+ * Migrate in some ESRI only logic for 1bit color tables, AdjustLinearUnits and default for 1bit data
+ * Add a GTIFF_IGNORE_READ_ERRORS configuration option (#3994)
+ * Lazy loading of RPC/RPB/IMD files (#3996)
+ * Add mutex protection in GTiffOneTimeInit() to avoid occasional segfaults
+ * Stop interpreting 4th band as alpha when not defined
+ * Also list nSubType == FILETYPE_PAGE as subdatasets
+ * CreateCopy(): copies category names from the source bands
+ * Add capability of writing TIFFTAG_MINSAMPLEVALUE and TIFFTAG_MAXSAMPLEVALUE
+ * Don't prevent from loading GTiff driver even if libtiff version mismatch detected (#4101)
+ * Use GTIFF_ESRI_CITATION flag to disable writing special meaning ESRI citations
+ * Optimize GTiffRGBABand implementation (#3476)
+ * Add GTIFF_DIRECT_IO config. option that can be set to YES so that IRasterIO() reads directly bytes from the file using ReadMultiRange().
+ * Use VSI_TIFFOpen() in GTIFFBuildOverviews() to make it work on virtual file systems
+ * Treat _UNASSALPHA as alpha
+
+GRASSASCIIGrid driver:
+ * New for GDAL/OGR 1.9.0
+ * Read GRASS ASCII grids (similar to ArcInfo ASCII grids)
+
+GRIB driver:
+ * Check for memory allocation failures
+
+HDF4 driver:
+ * Use larger object name buffer
+ * Handle SWopen failures
+
+HDF5 driver:
+ * Fix HDF5/BAG handle/memory leaks (#3953)
+ * Better error checking
+ * Do not return NULL from getprojectionref() (#4076)
+ * Identify datasets whose header starts with some XML content (#4196)
+ * Fixed HDF5 variable length string attributes reading (#4228)
+
+HFA driver:
+ * Add support for writing RATs (#999)
+ * Add support for reading 2bit compressed .img files (#3956)
+ * Update EPRJ_ list based on input from Erdas, round trip Krovak and Mercator Variant A (#3958)
+ * Major push to move projections from 1.6-esri into trunk in HFA driver (#3958)
+ * Reinitialize RRDNamesList and ExternalRasterDMS (#3897)
+ * Ensure the whole entry is reinitialized when writing proparams and datum (#3969)
+ * Ensure PEString cleared if we aren't writing it (#3969)
+ * Get nodata from an overview if not present on main band.  Set geotransform[1] and [5] to 1.0 if pixelSize.width/height are 0.0.  Improve error checking if MakeData() fails.
+ * atof() changed to CPLAtofM() to avoid locale issues.
+ * Altered Edsc_BinFunction column "Value" to "BinValues" and changed type.
+ * Equirectangular StdParallel1 changed to LatitudeOfOrigin.
+ * Logic to preserve psMapInfo->proName as the PROJCS name for UTM/StatePlane.
+ * Special state plane zone handling.
+ * Special wisconsin handling for some LCC and TM SRSes.
+ * 1-bit null blocks to default to 1 in ESRI_BUILDs
+ * Add support for GDA94 (#4025)
+
+Idrisi driver:
+ * Fix segfaults when fields are missing in .ref or .rdc files (#4100)
+ * Fix problem with inverse flattening when reading a SRS of a sphere (#3757)
+
+INGR driver:
+ * Set NBITS for 1 bit bands
+
+ISIS2/ISIS3 driver:
+ * Various improvements to PDS related drivers (#3944)
+
+JaxaPalsar driver:
+ * Fixed datatype of ALOS PALSAR products Level 1.5 (#4136)
+ * Fixed detection of unsupported PALSAR Level 1.0 products (#2234)
+
+JPIPKAK driver:
+ * Add try to in GetNextUpdatedRegion() to protect against kakadu exceptions (#3967)
+ * Fixed a serious bug in the computation of fsiz and region. (#3967)
+
+KMLSUPEROVERLAY driver :
+ * Remove spaces between coordinates in coordinate triplets as mandated by KML 2.2 spec, to restore compatibility with Google Earth 6.1.0.5001 (#4347)
+
+LAN driver:
+ * Preliminary support for writing gis/lan files
+
+MEM driver:
+ * Add support for remembered histograms and PIXELTYPE
+
+MG4Lidar driver:
+ * Clamp nOverviewCount, some LiDAR files end up with -1 overviews
+
+MrSID driver:
+ * Initialize overview manager to enable RFC 15 mask band support (#3968)
+ * Mark GDAL_DCAP_VIRTUALIO=YES when the driver is configured in read-only mode
+ * Handle LTI_COLORSPACE_RGBA
+
+NetCDF driver:
+ * Set cylindrical equal area representation to the proper cf-1.x notation (#3425)
+ * Fix precision issue in geotransform (#4200) and metadata
+ * Add support for netcdf filetypes nc2(64-bit) and nc4 to netCDFDataset (#3890, #2379)
+ * Add function Identify and IdentifyFileType() (#3890, #2379)
+ * Temporarily disabling PAM for netcdf driver (#4244)
+ * Make creation of geographic grid CF compliant (#2129)
+ * Fixes for netcdf metadata export: duplication, Band metadata, int/float/double vs. char* and add_offset/scale_factor (#4211, #4204), double precision ( 4200)
+ * Fix netcdf metadata import (float and double precision) (#4211)
+ * Improve import of CF projection
+ * Add netcdf history metadata (#4297)
+ * CF-1.5 compatible export of projected grids (optional long/lat export)
+ * Fix LCC-1SP import and export (#3324)
+ * Fix handling of UNITS import and export (#4402 and #3324)
+ * Fix upside-down export and import of grids without projection and geotransform (#2129, #4284)
+ * Support import of polar stereographic variant without standard parallel (#2893)
+ * New driver options
+ * Add simple progress indicator
+ * Add support for netcdf-4, HDF4 and HDF5 (#4294 and #3166)
+ * Add support for deflate compression
+ * Add format support information and CreateOptionList to driver metadata
+ * Add support for valid_range/valid_min/valid_max
+ * Proper handling of signed/unsigned byte data
+ * Add support for Create() function and significantly refactor code for export (#4221)
+ * Improvements to CF projection support (see wiki:NetCDF_ProjectionTestingStatus)
+
+NGSGEOID driver:
+ * New for GDAL/OGR 1.9.0
+ * Read NOAA NGS Geoid Height Grids
+
+NITF driver:
+ * Add a generic way of decoding TREs from a XML description file located in data/nitf_spec.xml
+ * Add a new metadata domain xml:TRE to report as XML content the decoded TREs
+ * Add NITF_OPEN_UNDERLYING_DS configuration option that can be set to FALSE to avoid opening the underlying image with the J2K/JPEG drivers
+ * Support JP2KAK driver for jpeg2000 output, use /vsisubfile/ in all cases
+ * NITFCreate(): deal with cases where image_height = block_height > 8192 or image_width = block_width > 8192 (#3922)
+ * Add IREPBAND and ISUBCAT creation option (#4343)
+ * Make sure scanline access is used only on single block image (#3926)
+ * Add a NITF_DISABLE_RPF_LOCATION_TABLE_SANITY_TESTS configuration option that can be set to TRUE to blindly trust the RPF location table (#3930)
+ * Correctly assign hemisphere for a ICORDS='U' NITF file with accompanying .nfw and .hdr files (#3931)
+ * Make PAM available at band level for JPEG/JPEG2000 compressed datasets (#3985)
+ * Read IMRFCA TRE for RPC info. Read CSEXRA TRE.
+ * Read CSDIDA and PIAIMC TREs as metadata
+ * Optional support for densifying GCPs and applying RPCs to them
+ * Add GetFileList() that captures associated files with some NITF products.
+ * Added ESRI only ExtractEsriMD() function.  Add raw header capture in NITF_METADATA domain in base64 encoded form.
+ * Fetch NITF_DESDATA in segment data; decode specialized fields of XML_DATA_CONTENT and CSATTA DES
+ * Truncate TRE name to 6 character (#4324)
+ * Take into account the presence of comments when patching COMRAT for JPEG/JPEG2000 NITF (#4371)
+
+NWT_GRD driver:
+  * Fix interpolation of color when the maximum z value is below a threshold of the color scheme (#4395)
+
+OPENJPEG driver:
+ * Optimize decoding of big images made of a single block
+ * Fallback to PAM to get projection and geotransform
+
+PCIDSK driver:
+ * Refresh PCIDSK SDK from upstream
+ * Fix support for band description setting, add BANDDESCn creation option
+ * Implement GetCategoryNames(), and color table from metadata for PCIDSK
+ * Fix exception on files with bitmaps as bands in GetFileList()
+ * Avoid closing and reopening file so we don't fracture the SysBMData with a metadata write
+ * In read-only, if .pix is raster (resp. vector) only, then make sure that OGR (resp. GDAL) cannot open it
+
+PDF driver:
+ * Support linking against podofo library (LGPL) instead of poppler --> however
+   pdftoppm binary from poppler distribution is needed for rasterization
+
+PDS driver:
+ * Add support for MISSING and MISSING_CONSTANT keywords for nodata values (#3939)
+ * Add support for uncompressed images in the UNCOMPRESSED_FILE subdomain (#3943)
+ * Add support for PDS_Sample/LineProjectOffset_Shift/Mult (#3940)
+ * Preliminary qube write support (#3944)
+ * Fix band offset computation in BSQ (#4368)
+
+PNG driver:
+ * Add compatibility with libpng >= 1.5.0 (#3914)
+ * Upgrade internal libpng to 1.2.46
+
+PNM driver:
+ * Make it compatible with VSI virtual files
+
+PostgisRaster driver:
+ * Speed of PostGIS Raster driver improved. (#3228, #3233)
+
+Rasterlite driver:
+ * Robustness against buggy databases
+ * Enable QUALITY creation option for WEBP tiles
+
+RS2 driver:
+ * Setup to properly support subdataset oriented metadata and overviews (#4006)
+ * Allow opening subdatasets by passing in the folder (#4387)
+
+SAGA driver:
+ * Fix reading & writing .sdat files bigger than 2GB (#4104)
+ * Use nodata value from source dataset in CreateCopy() (#4152)
+
+SDE driver:
+ * Break assumption that LONG==long (#4051)
+
+SNODAS driver:
+ * New for GDAL/OGR 1.9.0
+ * Read Snow Data Assimilation System datasets
+
+SRP driver:
+ * Set Azimuthal Equidistant projection/geotransform info for ASRP north/south polar zones (#3946)
+ * ASRP/USRP: fix skipping of padding characters on some datasets (#4254)
+
+SRTMHGT driver:
+ * Fix segfault in CreateCopy() if we cannot create the output file
+
+Terralib driver:
+ * Removed driver: was unfinished and is unmaintained (#3288)
+
+TIL driver:
+ * Implement GetFileList() (#4008)
+
+TSX driver:
+ * Add support for selecting a directory
+ * Make Terrasar-X driver also open TanDEM-X data (#4390)
+ * Fix memleaks
+
+USGSDEM driver:
+ * Ensure blocks read in C locale (#3886)
+
+VRT driver:
+ * Implement VRTDataset::IRasterIO() that can delegate to source Dataset::RasterIO() in particular cases
+ * Implement GetMinimum() and GetMaximum()
+ * GetFileList(): for /vsicurl/ resources, don't actually test their existence as it can be excruciating slow
+ * VRTComplexSource: correctly deal with complex data type (#3977)
+ * Fix 2 segfaults related to using '<VRTDataset', but with invalid XML, as the target filename of VRTDataset::Create()
+ * Fix 'VRTDerivedRasterBand with ComplexSource and nodata value yields potentially uninitialized buffer' (#4045)
+ * VRTDerivedRasterBand: Recognize PixelFunctionType and SourceTransferType options in AddBand() for  (#3925)
+ * Copy GEOLOCATION metadata in CreateCopy().
+ * VRTDerivedRasterBand: register pixel functions in a map for faster access (#3924)
+ * VRT warped dataset: limit block size to dataset dimensions (#4137)
+
+WCS driver:
+ * Add time support (#3449)
+ * Honour dimensionLimit restrictions on WCS request size.
+ * Fetch projection from returned image file chunks if they have them (i.e. GeoTIFF).
+ * Honour Resample option for WCS 1.0.
+ * Include service url in GetFileList if ESRI_BUILD defined
+ * Check validity of 'OverviewCount' parameter
+ * Add support for getting the coverage offering details from the xml:CoverageOffering domain
+ * Try to preserve the servers name for a CRS (WCS 1.0.0) (#3449).
+
+WebP driver:
+ * New for GDAL/OGR 1.9.0
+ * Read/write GDAL driver for WebP image format
+
+WMS driver:
+ * Implementation of the OnEarth Tiled WMS minidriver (#3493)
+ * Implementation of a VirtualEarth minidriver
+ * Improve handling of .aux.xml files, ensure colorinterp support works for tiled wms server
+ * Report subdatasets when being provided WMS:http://server.url (classic WMS), WMS:http://server.url?request=GetTileService or a url to a TMS server; recognize datasets specified as a pseudo GetMap request
+ * Add capability to open the URL of a REST definition for a ArcGIS MapServer, like http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer?f=json
+ * Parse WMS-C TileSet info in VendorSpecificCapabilities of GetCapabilities
+ * Implement CreateCopy() when source is a WMS dataset to serialize to disk the definition of a WMS dataset
+ * WMS dataset : report INTERLEAVE=PIXEL
+ * Make autodetection of TMS work with http://maps.qualitystreetmap.org/tilecache
+ * Add capability to set Referer http header
+ * Add a TMS-specific hack for some servers that require tile numbers to have exactly 3 characters (#3997)
+ * Fix to make file:// URL to work
+ * Add hack for OSGEO:41001
+ * Fix GDALWMSRasterBand::IReadBlock() to avoid the ReadBlocks() optimization to become an anti-optimization in some use cases
+ * Add service=WMS parameter if not already provided in <ServerUrl> (#4080)
+ * Add options, ZeroBlockHttpCodes and ZeroBlockOnServerException, to control which http error codes should be considered as meaning blank tile (#4169)
+
+ZMap driver:
+ * New for GDAL/OGR 1.9.0
+ * Read/write GDAL driver for ZMap Plus Grid format
+
+## OGR 1.9.0 - Overview of Changes
+
+Core:
+ * RFC35: Add OGRLayer::DeleteField(), ReorderField(), ReorderFields() and AlterFieldDefn()
+ * Avoid OGRLineString::addPoint( OGRPoint * poPoint ) to always force the geometry to be 3D (#3907)
+ * Add a OGREnvelope3D object and getEnvelope( OGREnvelope3D * psEnvelope ) / OGR_G_GetEnvelope3D() method
+ * Add OGR_G_SimplifyPreserveTopology() / OGRGeometry::SimplifyPreserveTopology()
+ * OGR SQL: recognize optional ESCAPE escape_char clause
+ * OGR SQL: allow NULL to be used as a value, so that 'SELECT *, NULL FROM foo works'
+ * OGR SQL: Accept doublequoting of column_name in 'SELECT DISTINCT "column_name" FROM table_name' (#3966)
+ * OGR SQL: OGRGenSQLResultsLayer: if the dialect is explicitly set to OGRSQL, don't propagate the WHERE clause of the SELECT to the source layer, but evaluate it instead at the OGRGenSQLResultsLayer level (#4022)
+ * OGR SQL: Avoid error emission on requests such as 'SELECT MIN(EAS_ID), COUNT(*) FROM POLY'
+ * OGR SQL: Avoid setting width/precision for AVG column
+ * OGR SQL: Add a mechanism to delete a layer (DROP TABLE x)
+ * OGR SQL: fix segfault when evaluating a 'IS NULL' on a float column (#4091)
+ * OGR SQL: add support for new special commands : 'ALTER TABLE layername ADD COLUMN columnname columntype', 'ALTER TABLE layername RENAME COLUMN oldname TO new name', 'ALTER TABLE layername ALTER COLUMN columnname TYPE columntype', 'ALTER TABLE layername DROP COLUMN columnname'
+ * OGR SQL: Add implicit conversion from string to numeric (#4259)
+ * OGR SQL: Correctly parse big SQL statements (#4262)
+ * OGR SQL: fix joining a float column with a string column (#4321)
+ * OGR SQL: with DISTINCT, consider null values are such, and not as empty string (#4353)
+ * OGR SQL: fix offset conversion for SUBSTR() (#4348)
+ * Add OGR_G_GetPoints()
+ * Fix parsing of WKT geometries mixing 2D and 3D parts
+ * OGR_Dr_CopyDataSource() and OGRSFDriver::CopyDataSource() : make sure that the driver is attached to the created datasource (#4350)
+ * OGRFeature::SetFrom() supports more conversions between field types.
+
+OGRSpatialReference:
+ * Update to EPSG 7.9 database
+ * Add Geocentric SRS Support
+ * Add support for Interrupted Goode Homolosine projection (#4060)
+ * Add SRS vertical unit support
+ * Add SetVertCS(), OSRSetVertCS(), SetCompound(), IsCompound() and target oriented set/get linear units functions
+ * ESRI : Improve spheroid remapping (#3904)
+ * ESRI: Compare whole names in RemapNameBasedOnKeyName() (#3965).
+ * ESRI: addition of ImportFromESRIStatePlaneWKT and ImportfromESRIWisconsinWKT methods
+ * ESRI: importFromESRI() : support POLYCONIC projection from old style files (#3983)
+ * ESRI: importFromESRI() : support LAMBERT_AZIMUTHAL projection from old style files (#4302)
+ * ESRI: fix EPSG:32161 mapping
+ * ESRI: fix Stereo/Oblique_Stereo/Double_Stereo (bugs #1428 and #4267)
+ * ESRI: fix projection parameter mapping for Orthographic projection (#4249)
+ * ESRI: add optional fixing of TOWGS84, DATUM and GEOGCS with GDAL_FIX_ESRI_WKT config. option (#4345 and #4378)
+ * ESRI: fix add Krassowsky/Krasovsky 1940 spheroid mapping
+ * Add EPSG:102113 in the data/esri_extra.wkt file
+ * Add Germany zone 1-5 in range 31491-31495 in the data/esri_extra.wkt file
+ * fix NAD_1983_Oregon_Statewide_Lambert_Feet_Intl code
+ * added/updated coordinates systems provided by IGNF (#3868)
+ * ERM: add support for EPSG:n based coordinate systems (#3955)
+ * ImportFromEPSG(): Add default support for various degree units without supporting .csv file.
+ * ImportFromEPSG(): Add support for spherical LAEA (#3828)
+ * ImportFromEPSG(): use CoLatConeAxis parameter to build Krovak azimuth parameter (#4223)
+ * importFromURN(): support compound SRS
+ * importFromURN(): accept 'urn:opengis:crs:' syntax found in some TOP10NL GML files
+ * Add CRS: support and for importing two part ESRI PE SRS with VERTCS
+ * SetFromUserInput() : recognize 'IGNF:xxx'
+ * Ensure that the result of importFromEPSGA() always has keyword ordering fixed up (#4178)
+ * exportToERM() : deal with GDA94 datum and its UTM projections (#4208)
+ * Fix ESRI_DATUM_NAME for D_MOLDREF99 and D_Philippine_Reference_System_1992 (#4378)
+
+Utilities:
+ * ogr2ogr: Make 'ogr2ogr someDirThatDoesNotExist.shp dataSourceWithMultipleLayer' create a directory
+ * ogr2ogr: make -overwrite/-append work with non-spatial tables created by GDAL 1.8.0;
+ * ogr2ogr: take into account fields specified in the -where clause in combinations with -select to create the correct list of fields to pass to SetIgnoredFields() (#4015)
+ * ogr2ogr: fix -zfield option so that the modified geometry properly reports coordinate dimension = 3. Also avoids it to be in the list of ignored field names
+ * ogr2ogr: add -simplify option to simplify geometries
+ * ogr2ogr: add a warning if the target filename has an extension or a prefix that isn't consistent with the default output format (i.e. Shapefile), but which matches another driver. Can be made quiet with -q option
+ * ogrinfo/ogr2ogr: exit when SetAttributeFilter() fails, instead of silently going on (#4261)
+
+Multi driver topics:
+ * RFC35 : implementation in Shapefile, Memory and PG drivers (#2671)
+ * DXF, EDIGEO, KML, LIBKML, Shapefile, SDE, SOSI: Mark as supporting UTF-8
+ * BNA, CSV, GPX, KML, GeoRSS, GML, LIBKML, GeoJSON, PGDump : accept both /dev/stdout and /vsistdout/ as filenames; remove 'stdout' as a valid alias that could be used in some of them (#4225, #4226)
+
+ARCGEN driver:
+ * New for GDAL/OGR 1.9.0
+ * Read-only OGR driver for Arc/Info Generate files
+
+CouchDB driver:
+ * New for GDAL/OGR 1.9.0
+ * Read/write OGR driver for CouchDB / GeoCouch
+
+CSV driver:
+ * Add special recognition and handling for USGS GNIS (Geographic Names Information System) files
+ * Directly recognize the structure of the allCountries file from GeoNames.org
+ * Implement GetFeatureCount() to be a little bit faster
+ * Accept /dev/stdout as a filename for CreateDataSource()
+ * Fix handling of non-numeric values in numeric columns (NULL instead of 0)
+ * Fix handling of column names with numbers
+ * Recognize numeric fieldnames inside quotes
+ * Accept real numbers with ',' as decimal separator when ';' is the field separator (CSV export in French locale)
+
+DXF driver:
+ * Add support for DXF_ENCODING config var and DWGCODEPAGE header field (#4008)
+ * Added DXF_MERGE_BLOCK_GEOMETRIES
+ * Treat ATTDEFs the same as TEXT entities
+ * Implement hatch polyline and elliptical arc support, hatch fill, do not polygonize closed smoothed lines
+ * Add handling of hidden/frozen/off layers.
+
+DWG driver:
+ * New for GDAL/OGR 1.9.0
+ * Read DWG files through the use of Open Design Alliance Teigha Libraries
+
+EDIGEO driver:
+ * New for GDAL/OGR 1.9.0
+ * Read files of French EDIGEO exchange format
+
+FileGDB driver:
+ * New for GDAL/OGR 1.9.0
+ * Read/write support based on FileGDB API SDK
+
+GeoJSON driver:
+ * Support writing 3D lines and polygons
+ * Add a bbox attribute with the geometry bounding box if WRITE_BBOX layer creation option is set (#2392)
+ * Write bbox of FeatureCollection before features when file is seekable
+ * Remove unsetting of FID that caused FID not at the last position of properties to be lost
+ * Properly deal with null field values in reading and writing
+ * Handle OFTIntegerList, OFTRealList and OFTStringList fields
+ * Recognize other arrays as OFTString field
+ * Fix assertion on unhandled ESRI json (#4056)
+ * Fix segfault on feature where 'properties' member exists but isn't an object (#4057)
+ * Better detection of OGR type for numeric JSON fields (#4082)
+ * Add COORDINATE_PRECISION layer creation option to specify the maximum number of figures after decimal point in coordinates; set to 15 by default with smart truncation of trailing zeros (like done for WKT)
+ * Add OGR_G_ExportToJsonEx() to accept a list of options
+ * Add ability to detect geojson files without an extension (#4314)
+
+Geomedia driver:
+ * New for GDAL/OGR 1.9.0
+ * Read-only driver to read Geomedia .MDB databases
+
+GeoRSS driver:
+ * Parse RSS documents without <channel> element
+
+GFT driver:
+ * New for GDAL/OGR 1.9.0
+ * Read/write driver for Google Fusion Tables
+
+GML driver:
+ * Major performance improvement when reading large multi-layer GML files. See usage of new GML_READ_MODE configuration option
+ * Support gml:xlink resolving for huge GML files through GML_SKIP_RESOLVE_ELEMS=HUGE (requires SQLite)
+ * Add GML_GFS_TEMPLATE config option to specify a template .gfs file that can be used for several GML files with similar structure (#4380)
+ * Be able to build the driver with support of both Expat and Xerces libraries and add ability of select one at runtime. For UTF-8 documents, we select Expat if it is available, because it is faster than Xerces
+ * Expose fid or gml_id as feature fields if autodetected. This behavior can be altered by the GML_EXPOSE_FID / GML_EXPOSE_GML_ID configuration option.
+ * Improve handling of .gml and .xsd produced by FME (in particular for CanVec GML)
+ * Be able to open .gz file directly (like OS Mastermap ones), and read/write the .gfs file next to the .gz file
+ * Fix segfault when encountering an invalid (or unhandled by OGR) geometry and when the axis order is lat/long (#3935)
+ * GML3: use a new method to interpret Face objects (which requires GEOS support);
+         old method available if GML_FACE_HOLE_NEGATIVE config. option set to YES (#3937)
+ * GML3: support Curve as a valid child for curveProperty inside directEdge parsing (#3934)
+ * GML3: don't force the linestring to be 3D when inverting its orientation during parsing of directedEdge (#3936)
+ * GML3: accept <pointProperty> element in <gml:LineString> or <gml:LineStringSegment>
+ * OGR_G_CreateFromGML(): accept <gml:coordinates> with coordinate tuples separated by comma and coordinate components separated by space
+ * Recognized schemas with <complexType> inside <element>, such as the one returned by http://deegree3-demo.deegree.org:80/deegree-utah-demo/services
+ * Write the Z component of bounding box for 25D geometries
+ * Force layer geometry type to 3D when there's only a .xsd file and we detect a hint that the bounding box is 3D
+ * Handle layers of type wkbNone appropriately (#4154)
+ * Change format of (GML 2.1.1) FID generated from Fxxx to layer_name.xxx (where xxx is the OGR FID) to ensure uniqueness (#4250)
+ * Accept 'GML3Deegree' as a valid value for the dataset creation option FORMAT, to produce a .XSD that should be better handled by Deegree3 (#4252), and 'GML3.2' to produce GML file and schema that validate against GML 3.2.1 schema.
+ * Don't try to parse successfully a feature type in the .xsd if there are elements we don't know how to parse. Better to rely on the .gfs mechanism (#4328)
+ * Fix bug in OGRAtof() that caused wrong parsing of coordinates in GML files written in scientific notation (#4399)
+
+GMT driver:
+ * Fix GetExtent() result that swallowed the first char of the minx bound (#4260)
+
+IDRISI driver:
+ * New for GDAL/OGR 1.9.0
+ * Read Idrisi .VCT vector files
+
+ILI1 driver:
+ * Fix for missing geometry in ILI1
+
+LIBKML driver:
+ * Set the OGRStylePen unit type to pixel when reading <LineStyle>
+ * Avoid ingesting zip files that are not valid kmz (#4003)
+ * Do not use displayname to set the field name
+ * Recognize <Data> elements of <ExtendedData> in case <ExtendedData> doesn't use a <SchemaData>
+ * Fix mapping of the type attribute of <SimpleType> elements inside <Schema> to OGR field type (#4171)
+ * Parse correctly kml docs containing only one placemark
+ * Properly set the feature style string from a placemarks style
+ * Improve OGRStyleLabel <-> KmlLabelStyle mapping
+ * Combine styles from the style table and features styles when LIBKML_RESOLVE_STYLE=YES (#4231)
+ * Check that string values put in fields are valid UTF-8 (#4300)
+
+MDB driver:
+ * New for GDAL/OGR 1.9.0
+ * Read-only driver to read PGeo and Geomedia .MDB databases
+ * Relies on using the Java Jackcess library (LGPL) through JNI.
+
+MITAB driver:
+ * Add support for reading google mercator from mapinfo (#4115)
+ * Fixed problem of the null datetime values (#4150)
+ * Fix problem with tab delimiter used in MIF files (#4257)
+
+MSSQLSpatial driver:
+ * Removing 'Initial Catalog' which is not supported in the ODBC SQL driver connection strings.
+ * Allow to specify 'Driver' in MSSQL connection strings (#4393)
+ * Fix for the IDENTITY INSERT problem with MSSQL Spatial (#3992)
+ * Add more verbose warnings to the geometry validator
+ * Fix for the schema handling problem with MSSQL Spatial (#3951)
+ * Fix for the corrupt geometry report when using the ogr2ogr -sql option (#4149)
+
+MySQL driver:
+ * Recognize columns with types POINT, LINESTRING, etc. as geometry columns
+
+NAS driver:
+ * Add support for treating wfs:Delete as a special Delete feature with typeName and FeatureId properties
+ * Handle empty files gracefully (#3809)
+ * Preliminary support for SRS in NAS files, including 3GKn SRS
+ * Implement special treatment for <lage> to be zero passed and string (NAS #9)
+ * Add special handling of punktkennung (NAS #12)
+ * Add special handling for artDerFlurstuecksgrenze (#4255)
+ * Add support for wfsext:Replace operations (PostNAS #11)
+ * Correct NASHandler::dataHandler() to avoid trimming non-leading white space
+
+NTF driver:
+ * Create and manage height field as floating point since some DTM products have floating point elevations.
+
+OCI driver:
+ * Added TRUNCATE layer creation option (#4000)
+ * Clear errors after speculative dimension calls (#4001)
+ * Fix multithreading related problems (#4039)
+ * Ensure that AllocAndBindForWrite does not mess up if there are no general attributes (#4063)
+ * Implement DeleteLayer(int) method
+ * Ensure extents updated by SyncToDisk(), and that new features are merged into existing extents (#4079)
+
+OGDI driver:
+ * Fix GetFeature() that did not like switching between layers
+
+PG driver:
+ * Write geometries as EWKB by default to avoid precision loss (#4138)
+ * Return the table columns in the order they are in the database (#4194)
+ * Add a NONE_AS_UNKNOWN layer creation option that can be set to TRUE to force layers with geom type = wkbNone to be created as if it was wkbUnknown (PostGIS GEOMETRY type) to be able to revert to behavior prior to GDAL 1.8.0 (#4012)
+ * Add EXTRACT_SCHEMA_FROM_LAYER_NAME layer creation option that can be set to OFF to disable analysis of layer name as schema_name.table_name
+ * Add FID layer creation option to specify the name of the FID column
+ * ogr2ogr: make sure that for a PG datasource, -nln public.XXX can also be used with -append
+ * Fix CreateFeatureViaInsert() to emit 'INSERT INTO xx DEFAULT VALUES'
+ * Fix handling of Nan with fields with non-zero width (#2112)
+ * Use wrapper for PQexec() to use PQexecParams() instead in most cases
+ * Add proper escaping of table and column names
+ * OGR SQL: add proper column name escaping and quoting for PostgreSQL datasources
+ * Launder single quote character in table name
+ * Better reporting of error in case of failed ExecuteSQL()
+ * Create field of type OFTString and width > 0, as VARCHAR(width) (#4202)
+ * Add more compat with Postgis 2.0SVN (geometry_columns- #4217, unknown SRID handling)
+ * Better behavior, in particular in error reporting, of ExecuteSQL() when passed with non-select statements, or with select statements that have side-effects such as AddGeometryColumn()
+
+PGDump driver:
+ * fix handling of Nan with fields with non-zero width (#2112)
+ * Add CREATE_SCHEMA and DROP_TABLE layer creation option (#4033)
+ * Fix crash when inserting a feature with a geometry in a layer with a geom type of wkbNone;
+ * PG and PGDump: fix insertion of features with first field being a 0-character string in a non-spatial table and without FID in COPY mode (#4040)
+ * Add NONE_AS_UNKNOWN, FID, EXTRACT_SCHEMA_FROM_LAYER_NAME layer creation options
+ * Better escaping of column and table names
+ * Create field of type OFTString and width > 0, as VARCHAR(width) (#4202)
+
+PGeo driver:
+ * Move CreateFromShapeBin() method to an upper level
+ * Only try to open .mdb files that have the GDB_GeomColumns string
+ * Decode Z coordinate for a POINTZM shape
+ * Aad support for decoding multipoint/multipointz geometries
+ * Fix setting of the layer geometry type
+ * Add support for zlib compressed streams
+ * Implement MultiPatch decoding
+
+SDE driver:
+ * Add support for decoding NSTRING fields (#4053)
+ * Add support in CreateLayer() to clean up partially registered tables that aren't full spatial layers
+ * Add logic to force envelope for geographic coordsys objects (#4054)
+ * Add USE_STRING layer creation and configuration options information
+ * Set SE_MULTIPART_TYPE_MASK for multipolygon layers (#4061).
+ * Change how offset and precision are set for geographic coordinate systems to more closely match SDE
+
+SEGUKOOA driver:
+ * New for GDAL/OGR 1.9.0
+ * Read files in SEG-P1 and UKOOA P1/90 formats
+
+SEGY driver:
+ * New for GDAL/OGR 1.9.0
+ * Read files in SEG-Y format
+
+Shapefile driver:
+ * Encoding support for shapefile/dbf (#882)
+ * Allow managing datasources with several hundreds of layers (#4306)
+ * Lazy loading of SRS and lazy initialization of attribute index support
+ * Use VSI*L API to access .qix spatial index files
+ * Add special SQL command 'RECOMPUTE EXTENT ON layer_name' to force recomputation of the layer extent (#4027)
+ * Faster implementation of GetFeatureCount() in some circumstances.
+ * Fix crash in CreateField() if there is no DBF file
+ * Fix add field record flushing fix (#4073)
+ * Fix decoding of triangle fan in a multipatch made of several parts (#4081)
+ * Refuse to open a .shp in update mode if the matching .dbf exists but cannot be opened in update mode too (#4095)
+ * Recognize blank values for Date fields as null values (#4265)
+ * Recognize 'NULL' as a valid value for SHPT creation option as documented
+ * Check that we are not trying to add too many fields.
+ * Support reading measure values as Z coordinate.
+
+SQLite/Spatialite driver:
+ * Spatialite: major write support improvements (creation/update of Spatialite DB now limited to GDAL builds with libspatialite linking)
+ * Spatialite: add support for 3D geometries (#4092)
+ * Spatialite: speed-up spatial filter on table layers by using spatial index table (#4212)
+ * Spatialite: add support for reading Spatialite views registered in the views_geometry_columns
+ * Spatialite: better support for building against amalgamated or not
+ * Spatialite: when it exists, use srs_wkt column in spatial_ref_sys when retrieving/inserting SRS
+ * Spatialite: add COMPRESS_GEOM=YES layer creation option to generate Spatialite compressed geometries
+ * Spatialite: add support for VirtualXLS layers.
+ * Spatialite: imported VirtualShape support, in particular it is now possible to open on-the-fly a shapefile as a VirtualShape with 'VirtualShape:shapefile.shp' syntax as a datasource
+ * Implement RFC35 (DeleteField, AlterFieldDefn, ReorderFields)
+ * Implement DeleteDataSource()
+ * Implement DeleteFeature()
+ * Implement SetFeature() by using UPDATE instead of DELETE / INSERT
+ * Add capability to use VSI Virtual File API when needed (if SQLite >= 3.6.0)
+ * Make CreateDataSource(':memory:') work
+ * Enforce opening update/read-only mode to allow/forbid create/delete layers, create/update features (#4215)
+ * Launder single quote character in table name; properly escape table name if no laundering (#1834)
+ * Use ALTER TABLE ADD COLUMN by default to create a new field; older method can still be used by defining the OGR_SQLITE_USE_ADD_COLUMN config option to FALSE in order to provide read-compat by sqlite 3.1.3 or earlier
+ * Fix bug in CreateField() : if there was already one record, the content of the table was not preserved, but filled with the column names, and not their values
+ * Map 'DECIMAL' columns to OGR real type (#4346)
+ * Add OGR_SQLITE_CACHE configuration option for performance enhancements
+ * Try to reuse INSERT statement to speed up bulk loading.
+
+SVG driver:
+ * New for GDAL/OGR 1.9.0
+ * Read only driver for Cloudmade Vector Stream files
+
+S57 driver:
+ * Add support for Dutch inland ENCs (#3881)
+ * Allow up to 65536 attributes, use GUInt16 for iAttr (#3881)
+ * Be cautious of case where end point of a line segment has an invalid RCID
+ * Correct handling of update that need to existing SG2D into an existing feature without it (#4332)
+
+VRT driver:
+ * Do not try to read too big files
+ * Lazy initialization of OGRVRTLayer
+ * Don't set feature field when source feature field is unset
+
+WFS driver:
+ * Add preliminary support for WFS 2.0.0, but for now don't request it by default.
+ * Increase performance of layer definition building by issuing a DescribeFeatureType request for several layers at the same time
+ * Better server error reporting
+ * Use the layer bounding box for EPSG:4326 layers (restricted to GEOSERVER for now) (#4041)
+ * Add capability of opening a on-disk Capabilities document
+ * Add special (hidden) layer 'WFSLayerMetadata' to store layer metadata
+ * Add special (hidden) layer 'WFSGetCapabilities' to get the raw XML result of the GetCapabilities request
+ * CreateFeature()/SetFeature(): use GML3 geometries in WFS 1.1.0 (make TinyOWS happy when it validates against the schema)
+ * Make spatial filtering work with strict Deegree 3 servers
+ * Fix reading when layer names only differ by their prefix
+
+XLS driver:
+ * New for GDAL/OGR 1.9.0
+ * Read only driver for MS XLS files and relies on FreeXL library.
+
+XPlane driver:
+ * Port to VSI*L API
+
+XYZ driver:
+ * Ignore comment lines at the beginning of files
+
+## SWIG Language Bindings
+
+General :
+ * RFC 30: Correct the signature of Datasource.CreateDataSource() and DeleteDataSource(),  gdal.Unlink() to accept UTF-8 filenames (#3766)
+ * Add Band.GetCategoryNames() and Band.SetCategoryNames()
+ * Add Geometry.GetPoints() (only for Python and Java) (#4016)
+ * Add Geometry.GetEnvelope3D()
+ * Add Geometry.SimplifyPreserveTopology()
+ * Extend SWIG Geometry.ExportToJson() to accept a list of options (#4108)
+ * Add (OGR)DataSource.SyncToDisk()
+ * Add SpatialReference.SetVertCS(), IsSameVertCS(), IsVertical(), SetCompound(), IsCompound()
+ * Add SpatialReference.SetIGH() (#4060)
+ * RFC 35: Add OGRLayer.DeleteField(), ReorderField(), ReorderFields(), AlterFieldDefn()
+ * Add gdal.VSIFTruncateL()
+
+CSharp bindings:
+ * Implement the typemap for utf8_path in C# (#3766)
+ * Correcting the signature of OGRDataSource.Open to make the utf8 typemap to work (#3766)
+
+Java bindings:
+ * Turn the gdalJNI, gdalconstJNI and osrJNI into package private classes
+ * Make Layer.GetExtent() return null when OGR_L_GetExtent() fails.
+
+Perl bindings:
+ * The "Points" method of Geometry was not accepting its own output in the case of a single point. It accepted only a point as a list. Now it accepts a point both as a list containing one point (a ref to a point as a list) and a point as a list.
+ * Fixed UTF-8 support in decoding names (datasource, layer, field etc.).
+ * Assume all GDAL strings are UTF-8, handle all changes in typemaps.
+ * Additions to Perl bindings due to new developments etc: Layer capabilities, GeometryType  method for Layer, improved create, new Export and Set methods for SpatialReference.
+ * Detect context in a typemap which returns a array, this now returns a list in list context; the change affects at least GetExtent and GetEnvelope methods, which retain backward compatibility though new and/or changed methods: FeatureDefn::Name, FeatureDefn::GeometryIgnored, FeatureDefn::StyleIgnored, Feature::ReferenceGeometry, Feature::SetFrom, FieldDefn::Ignored, Geometry::AsJSON
+ * Perl typemaps: more correct manipulation of the stack, more cases where a list is returned in a list context, better handling of callback_data @Band::COLORINTERPRETATIONS, Band methods Unit, ScaleAndOffset, GetBandNumber, RasterAttributeTable method LinearBinning
+ * Typemaps for VSIF{Write|Read}L, tests and docs for some VSI* functions.
+ * Perl bindings: better by name / by index logic, some checks for silent failures, return schema as a hash if wanted, support ->{field} syntax for features, return list attributes as lists or listrefs as wished so that ->{field} works for lists too (API change)
+
+Python bindings:
+ * Improvements for ogr.Feature field get/set
+ * Add hack to bring Python 3.2 compatibility
+ * First argument of VSIFWriteL() should accept buffers for Python3 compat
+ * Fix reference leak in 'typemap(in) char **dict'
+ * Add gdal.VSIStatL()
+ * swig/python/setup.py : fix for virtualenv setups (#4285)
+ * Layer.GetExtent() : add optional parameter can_return_null that can be set to allow returning None when OGR_L_GetExtent() fails
+ * Make gdal.VSIFSeekL(), gdal.VSIFTellL() and gdal.VSIFTruncateL() use GIntBig instead of long for compat with 32bit platforms
+ * Add script to build the python extensions with Python 2.7 and a mingw32 cross-compiler under Linux/Unix
+
+Ruby bindings:
+ * Build SWIG Ruby Bindings against modern Ruby versions (1.8.7 and 1.9.2) (#3999)
+
+# GDAL/OGR 1.8.0 release notes
+
+(Note: Most changes/bugfixes between 1.7.0 and 1.8.0 that have already gone
+to the 1.7.X maintenance releases are not mentioned hereafter.)
+
+## In a nutshell...
+
+* New GDAL drivers : GTX, HF2, JPEGLS, JP2OpenJPEG, JPIPKAK, KMLSUPEROVERLAY,
+                     LOS/LAS, MG4Lidar, NTv2, OZI, PDF, RASDAMAN, XYZ
+* New OGR drivers : AeronavFAA, ArcObjects, GPSBabel, HTF, LIBKML, MSSQLSpatial, NAS,
+                    OpenAir, PDS, PGDump, SOSI, SUA, WFS
+* Significantly improved OGR drivers : DXF, GML
+* New implemented RFCs : RFC 7, RFC 24, RFC 28, RFC 29, RFC 30, RFC 33
+* New utility : gdallocationinfo
+
+## Backward compatibility issues
+
+* MITAB driver: use "," for the OGR Feature Style id: parameter delimiter,
+  not "." as per the spec. Known impacted application :
+  MapServer (http://trac.osgeo.org/mapserver/ticket/3556)
+* RFC 33 changes the way PixelIsPoint is handled for GeoTIFF (#3838,#3837)
+* GML driver: write valid <gml:MultiGeometry> element instead of the non-conformant
+  <gml:GeometryCollection>. For backward compatibility, recognize both syntax for
+  the reading part (#3683)
+
+## GDAL/OGR 1.8.0 - General Changes
+
+Build(All):
+ * Make sure that 'import gdal' can work in a --without-ogr build
+
+Build(Unix):
+ * Fix compilation on RHEL/Centos 64bit for expat and sqlite3 (#3411)
+ * Update to autoconf 2.67 and libtool 2.2.6
+ * During the external libtiff autodetection check whether library version is 4.0
+   or newer, fallback to internal code otherwise. It is still possible to link
+   with older libtiff using the explicit configure option (#3695)
+ * Make --with-threads=yes the default
+ * Allow using --with-spatialite=yes
+ * Check /usr/lib64/hdf for RedHat 64bit
+
+Build(Windows):
+ * Change the default MSVC version to VS2008.
+
+## GDAL 1.8.0 - Overview of Changes
+
+Port:
+ * RFC 7 : Use VSILFILE for VSI*L Functions (#3799)
+ * RFC 30 : Unicode support for filenames on Win32
+ * Implement Rename() for /vsimem
+ * New virtual file system handlers :
+    - /vsicurl/ : to read from HTTP or FTP files (partial downloading)
+    - /vsistdin/ : to read from standard input
+    - /vsistdout/ : to write to standard output
+    - /vsisparse/ :mainly to make testing of large file easier
+    - /vsitar/ : to read in .tar or .tgz/.tar.gz files
+ * Add C API to create ZIP files
+ * Add support for writable /vsizip/
+ * Add VSIBufferedReaderHandle class that is useful to improve performance when
+   doing backward seeks by a few bytes on underlying file handles for which
+   backwardseeks are very slow, such as GZip handle
+ * Add service for base64 decoding
+ * CPL ODBC : Add transaction support (#3745)
+ * CPL ODBC: Increase the default connection timeout to 30 sec
+ * Add VSIStatExL() that has a flag to specify which info is really required
+   (potential speed optimization on slow virtual filesystems such as /vsicurl)
+ * Add VSIIsCaseSensitiveFS() to avoid ugly #ifndef WIN32 / #endif in the code of
+   various drivers
+ * Add Recode() convenience method to CPLString
+ * HTTP downloader: add PROXY and PROXYUSERPWD options (and GDAL_HTTP_PROXY and
+   GDAL_HTTP_PROXYUSERPWD configurations option) to allow request to go through a
+   proxy server.
+
+Core:
+ * RFC 24: progressive/async raster reading
+ * On Unix, add capability of opening the target of a symlink through GDALOpen()
+   even if it not a real filename. Useful for opening resources expressed as
+   GDAL virtual filenames in software offering only file explorers (#3902)
+ * Assume anything less than 100000 for GDAL_CACHEMAX is measured in megabytes.
+ * Read cartesian coordinates if applicable in GDALLoadOziMapFile().
+ * Avoid being overly sensitive to numeric imprecision when comparing pixel
+   value and nodata value in GDALRasterBand::ComputeStatistics()/
+   ComputeRasterMinMax(), especially for GeoTIFF format where nodata is
+   stored as text (#3573)
+ * Better handling of NaN (not a number) (#3576)
+ * Add C wrapper GDALSetRasterUnitType() for GDALRasterBand::SetUnitType() (#3587)
+ * Add GDALLoadRPCFile() to read RPCs from GeoEye _rpc.txt files (#3639)
+ * Allow GDALLoadRPB/RPC/IMDFile() to be called directly with the RPB/RPC/IMD
+   filename
+ * In GDAL cache block, use 64-bit variables for cache size
+ * Add GDALSetCacheMax64(), GDALGetCacheMax64() and GDALGetCacheUsed64() (#3689)
+ * Improve formatting of seconds in DecToDMS()
+ * Support negative nPixelOffset values for RawRasterBands
+ * GDALDatasetCopyWholeRaster(): improve performance in certain cases by better
+   fitting to input/output block sizes
+ * Add GDALRasterBandCopyWholeRaster()
+ * Make sure band descriptions are properly captured and cloned (#3780)
+ * GDALDataset/GDALRasterBand::CreateMaskBand(): invalidate pre-existing raster
+   band mask that could be created lazily with GetMaskBand()/GetMaskFlags(),
+   so that a later GetMaskBand() returns the newly created mask band
+ * Overview computation : speed improvements in resampling kernels
+ * Fix dereferencing of open datasets for GetOpenDatasets (#3871)
+ * Add DllMain callback to set-up and tear-down internal GDAL library
+   resources automatically (#3824)
+ * List .aux file if it used in GDALPamDataset::GetFileList()
+ * PAM dataset : try retrieving projection from xml:ESRI metadata domain
+
+Algorithms:
+ * rasterize: Burn the attribute value in ALL the bands during rasterization. (#3396)
+ * geoloc : Allow using XBAND and YBAND with height == 1 in the case of a regular
+   geoloc grid, suc h as for LISOTD_HRAC_V2.2.hdf (#3316)
+ * GDALFillNodata(): improve&fix progress report
+ * warper : Try to determine if we will need a UnifiedSrcDensity buffer
+            when doing memory computations (#3515).
+ * warper : GDALSuggestedWarpOutput2(): use more sample points around the edge
+            of the raster to get more accurate result (#3742)
+ * warper : added (preliminary) support for mask bands that aren't nodata or alpha
+ * warper : integrate Google Summer of Code OpenCL implementation of warper
+ * gdalgrid: Move ParseAlgorithmAndOptions from apps/gdal_grid.cpp to
+             alg/gdalgrid.cpp (#3583)
+ * RPCTransformer: take into account optional DEM file to extract elevation
+   offsets (RPC_HEIGHT_SCALE and RPC_DEM transformation options added) (#3634)
+ * GDALReprojectImage() : correctly assign nSrcAlphaBand and nDstAlphaBand (#3821)
+ * gdalgrid : Properly initialize the first nearest distance in GDALGridNearestNeighbor().
+
+Utilities :
+ * gdallocationinfo : new
+ * nearblack: add -setalpha option to add/set an alpha band + -of, -q, -co
+ * nearblack: add -setmask option to use a mask band to mask the nodata areas
+ * gdalbuildvrt: support stacking ungeoreferenced images when using -separate,
+   provided they have the same size (#3432)
+ * gdalbuildvrt: implement a check to verify that all color tables are identical
+ * gdalbuildvrt: automatically create a VRT mask band as soon one of the sources
+   has a dataset mask band (non-trivial = neither alpha, neither alldata, neither nodata)
+ * gdalbuildvrt: use OSRIsSame() to check if all source raster have same SRS (#3856)
+ * gdal_translate: Transfer GEOLOCATION in the -of VRT case if spatial
+   arrangement of the data is unaltered
+ * gdal_translate : add support for resizing datasets with mask bands
+ * gdal_translate : add -mask option to add a mask band from an input band/mask band.
+   Also extend syntax for the value of the -b option to allow specifying mask band as input band
+ * gdal_translate : support '-a_nodata None' as a way of unsetting the nodata value
+ * gdal_translate : invalidate statistics when using -scale, -unscale, -expand, -srcwin,
+                    -projwin or -outsize and a new -stats option to force their (re)computation (#3889)
+ * gdal_rasterize: Add capability of creating output file (#3505)
+ * gdaldem: add a new option, -compute_edges, that enable gdaldem to compute
+   values at image edges or if a nodata value is found in the 3x3 window,
+   by interpolating missing values
+ * gdaldem : add '-alg ZevenbergenThorne' as an alternative to Horn formula
+   for slope, aspect and hillshade
+ * gdaldem : support GMT .cpt palette files for color-relief (#3785)
+ * gdalwarp: add -crop_to_cutline to crop the extent of the target dataset to
+   the extent of the cutline
+ * gdalwarp: add a -overwrite option (#3759)
+ * gdal_grid : Properly use the spatial filter along with the bounding box.
+ * epsg_tr.py: added -copy format for INGRES COPY command
+ * hsv_merge.py: support RGBA dataset as well as RGB dataset, add -q and -of
+   options, avoid using hillband when it is equal to its nodata value
+ * val_repl.py: copy geotransform and projection from input dataset to output
+   dataset
+ * gdal_retile.py : assign color interpretation (#3821)
+ * gdal_retile.py : add -useDirForEachRow option to create a different output structure (#3879)
+ * Make gdal_translate and gdalwarp return non-zero code when block writing failed
+   for some reason (#3708)
+ * loslas2ntv2.py : new utility : .los/.las to NTv2 converter
+ * gdal_calc.py : new utility
+ * Add -tap option to gdal_rasterize, gdalbuildvrt, gdalwarp and gdal_merge.py
+   to align on a standard grid (#3772)
+
+AAIGRID driver:
+ * Cast nodata value to float to be consistent with precision of pixel data in
+   GDT_Float32 case; small optimization to avoid reading the first 100K when
+   we know that the datatype is already Float32
+ * Allow reading files where decimal separator is comma (#3668)
+ * Detect 1e+XXX as a real value among integer values (#3657)
+ * Add a AAIGRID_DATATYPE configuration option that can be set to Float64
+ * speed-up CreateCopy(), particularly on windows, by buffering the output
+
+AIGrid driver:
+ * Support sparse sets of tile files {w,z}001???.adf (#3541)
+
+BSB driver:
+ * Capture extension lines for headers
+ * Added UNIVERSAL TRANSVERSE MERCATOR, LCC and POLYCONIC handling (#3409)
+ * provide an option (BSB_IGNORE_LINENUMBERS) to ignore line numbers as some
+   generators do them wrong but the image is otherwise readable (#3776)
+ * Avoid turning missing values to index 255 (#3777)
+
+DODS driver:
+ * Compilation fix to support libdap 3.10
+
+DTED driver:
+ * Add origin metadata in original format (#3413)
+ * Report NIMA Designator field as 'DTED_NimaDesignator' metadata (#3684)
+ * Fixes to read some weird DTED3 file
+
+ECW driver:
+ * Support building against 4.1 SDK (compat with older versions maintained) (#3676)
+ * Add alpha support with 4.1 SDK, and various configuration options
+ * Add pseudo powers of two overviews.
+
+EHdr driver:
+ * Improvements to deal with http://www.worldclim.org/futdown.htm datasets
+
+ENVI driver:
+ * Support tabulation character in .hdr files (#3741)
+ * Support reading gzipped image file (#3849)
+
+ERS driver:
+ * Read "Units" child of the "BandId" node and set it as unit type for RasterBand.
+
+FITS driver:
+ * Accept files whose metadata list doesn't end with 'END' (#3822)
+
+GeoRaster driver :
+ * Suppress error when testing SRID code as EPSG (#3326)
+ * Several improvements and fixes (#3424)
+ * Deprecates JPEG-B compression (#3429)
+ * Fix GetColorInterpretation() on RGBA's alpha channel (#3430)
+ * Allows OS authentication (#3185)
+ * Add support for Point Cloud, add transaction control wrapper
+ * use OCI Bind to load VAT (#3277)
+ * Change order of NODATA tag on XML metadata (#3673)
+ * Add support for per band NoData value - Oracle 11g (#3673)
+ * Add support to ULTCoordinate - (#3718)
+ * Fix interleaving cache error (#3723)
+ * Fix compress vs nbits order error (#3763)
+ * Fix writing interleaved jpeg #3805 and reading default blocksize #3806
+ * Add create option blocking=(YES,NO,OPTIMUM) #3807, also fix #3812
+
+GRASS driver:
+ * Update GDAL and OGR GRASS drivers to compile against GRASS 7.0SVN (#2953)
+
+GTiff driver :
+ * RFC 33 : Adjust PixelIsPoint handling (#3838,#3837)
+ * Refresh internal libtiff with upstream
+ * Refresh internal libgeotiff with upstream
+ * Add PREDICTOR_OVERVIEW configuration option to set the predictor value for
+   LZW or DEFLATE compressed external overviews; Also make sure that the
+   predictor value gets well propagated in the case of internal overviews (#3414)
+ * Add a COPY_SRC_OVERVIEWS creation option (for CreateCopy()) that copies
+   existing overviews in the source dataset.
+ * Make GetScale() and GetOffset() retrieve values from PAM if not available in
+   internal metadata
+ * Use GCP info from PAM if available
+ * Support CreateCopy() on datasets with a color indexed channel and an alpha
+   channel (#3547)
+ * Allow reading geotransform when opening with GTIFF_DIR prefix (#3478)
+ * Add a warning when clipping pixel values for odd-bits band
+ * Make sure that 16bit overviews with jpeg compression are handled using 12bit
+   jpeg-in-tiff (#3539)
+ * Add GDAL_TIFF_OVR_BLOCKSIZE configuration option to specify block size used
+   for overviews
+ * Read RPCs from GeoEye _rpc.txt files (#3639)
+ * Implement GetUnitType() and SetUnitType(); make sure to remove
+   TIFFTAG_GDAL_METADATA tag if it existed before and there are no more
+   metadata; fix to make sure we can unset offset & scale stored in PAM
+ * Speed-up writing of blocks in case of multi-band 8 bit images
+ * Support TIFF_USE_OVR config option to force external overviews
+ * Add special ability to for xml:ESRI metadata into PAM
+ * Try to detect build-time vs runtime libtiff version mismatch (*nix only)
+ * Added logic to expand verticalcs using importFromEPSG() when possible
+ * Create internal masks with deflate compression if available
+ * Fix jpeg quality propagation (particularly remove warning when
+   using a deflate compressed internal mask band with jpeg compressed main IFD)
+ * Add support for JPEG_QUALITY_OVERVIEW configuration option for internal
+   overviews when adding them after dataset reopening
+ * auto-promote mask band to full 8 bits by default (unless
+   GDAL_TIFF_INTERNAL_MASK_TO_8BIT is set TO FALSE).
+ * add LZMA compression optional support (requires latest libtiff4 CVS HEAD)
+ * Supporting writing compound coordinate systems.
+
+GTX driver:
+ * New for GDAL/OGR 1.8.0
+ * Read NOAA .gtx vertical datum shift files.
+
+GXF driver:
+ * Cast nodata value to float to be consistent with precision of pixel data in
+   GDT_Float32 case
+ * Introduce a GXF_DATATYPE configuration option that can be set to Float64
+ * Use GDALGetScanline() instead of GDALGetRawScanline() so that #SENS
+   is applied to normally return things in conventional orientation as
+   is assumed by the geotransform.  (#3816).
+
+HDF4 driver:
+ * Prevent reading nonexistent subdatasets
+ * Allow reading 1D subdatasets, in particular for GEOLOC bands
+ * Workaround strange test that swaps xsize, ysize and nbands for the particular
+   case of the dataset of ticket #3316
+ * Speed up access to HDF4_SDS datasets; allow multi-line block dimension for
+   HDF4_EOS datasets (#2208)
+ * HDF4_EOS_GRID : detect tile dimensions and use them as block size; increase
+   HDF4_BLOCK_PIXELS default value to 1,000,000 (#3386)
+ * Support reading of L1G MTL metadata (#3532)
+ * Read as HDF if HDFEOS returned 0 datasets
+ * Improve fetching the geolocation data in case of one-to-one mapping and
+   abcence of dimension maps (#2079)
+ * Properly set the GCP projection for MODIS Aerosol L2 Product.
+ * Fetch scale/offset, unit type and descriptions for some HDF-EOS datasets.
+
+HDF5 driver:
+ * Avoid setting bogus projection if we don't get georeferencing from
+   CreateProjections().  Avoid trying to operate if DeltaLat/Long is zero.
+   Avoid crashing on NULL poH5Object->pszPath in CreateMetadata().  (#3534)
+ * Ensure backslashes are preserved in paths for UNC on win32 (#3851)
+
+HF2 driver:
+ * New for GDAL/OGR 1.8.0
+ * Read and write HF2/HFZ heightfield raster
+
+HFA driver:
+ * Ensure that an .aux file created for overviews has AUX=YES set so a
+   base raster will not be created.
+ * Various robustness improvements (#3428)
+ * Support pulling overviews from an .rrd file even if the .aux does not
+   reference it (#3463)
+ * avoid using empty names for layer, if we have one generate a fake name,
+   use for overviews (#3570)
+ * Add support for New Zealand Map Grid to HFA driver (#3613)
+ * Support EPT_s8 in BASEDATA (#3819)
+ * Substantial improvements for Rename/CopyFiles (#3897)
+
+Idrisi driver:
+ * Allow color items greater than maximum value (#3605)
+
+JPEGLS driver:
+ * New for GDAL/OGR 1.8.0
+ * JPEG-LOSSLESS driver based on CharLS library
+
+JP2KAK driver:
+ * Allow quality as low as 0.01
+ * Major restructuring, all reading now goes through DirectRasterIO (#3295)
+ * Introduce YCC optimization
+ * Ensure we fetch <= 8 bit images with their true precision (#3540)
+ * Make JP2KAK_RESILIENT also turn off persist, and force sequential access (#4336)
+ * Fix reading overviews via direct case (#4340)
+
+JP2OpenJPEG:
+ * New for GDAL/OGR 1.8.0
+ * JPEG2 driver based on OpenJPEG library
+
+JPIPKAK driver:
+ * New for GDAL/OGR 1.8.0
+ * JPIP driver based on Kakadu library
+
+KMLSUPEROVERLAY driver :
+ * New for GDAL/OGR 1.8.0
+ * Added new plug-in GDAL Super-Overlay Driver. The driver allows converts
+   raster (like TIF/GeoTIFF, JPEG2000, JPEG, PNG) into a directory structure
+   of small tiles and KML files which can be displayed in Google Earth.
+
+LOS/LAS driver:
+ * New for GDAL/OGR 1.8.0
+ * Read NADCON .los/.las Datum Grid Shift files
+
+MG4Lidar driver
+ * New for GDAL/OGR 1.8.0
+ * Read MG4 Lidar point cloud data and expose it as a Raster. It depends on
+   the current, freely-available-though-not-open-source MG4 Lidar SDK v1.1
+
+MrSID:
+ * Updated to support MrSID SDK v8.0.0 (compat with older versions maintained) (#3889)
+ * Updated to support writing MG4/Raster (#3889)
+ * Support reading projection from .met files accompanying NASA LandSat SID files
+
+NetCDF driver:
+ * Improve coordinate system support (#3425)
+ * Add support for multiple standard_parallel tags to support LCC single
+   standard parallel (#3324)
+ * Add CF-1 spheroid tag support for netcdf driver
+ * Add support for weather/climate files with pixel size in km
+ * Attempt to fix flip image (#3575)
+ * Add support for Scale and Offset (#3797)
+
+NITF driver:
+ * Ensure that igeolo corners are not messed up if irregular, keep center/edge
+   of pixel location info (#3347)
+ * Add capture of select RPF attribute metadata (#3413)
+ * Carry raw IGEOLO and ICORDS through as metadata (#3419)
+ * Added NITFPossibleIGEOLOReorientation() in an attempt to deal with
+   files written with the IGEOLO corners out of order.
+ * Implement readonly support for RSets (#3457)
+ * Add capability of writing CGM segment as creation option (or from the source
+   CGM metadata domain if no CGM= creation option); for consistency, also add
+   the capability of writing TEXT segment as creation option, in addition to
+   the existing capability of writing it from the source TEXT metadata domain (#3376)
+ * Fix read out of buffer for NBPP < 8 and very small block size; fix decoding
+   of NBPP=4 (#3517)
+ * Add FILE_TRE creation option to write TRE content in XHD field of file header
+ * Add SDE_TRE creation option to write GEOLOB and GEOPSB TREs. This is limited
+   to geographic SRS, and to CreateCopy() for now
+ * Allow using NITF header located in STREAMING_FILE_HEADER DE segment when
+   header at beginning of file is incomplete
+ * Improve NITF to NITF translation
+ * Fetch TREs from DE segment
+ * Support reading CSSHPA DES & extracting embedded shapefile
+ * Support writing image comments (ICOM)
+ * Add description for NITF file & image header fields in creation options XML
+ * Accept A.TOC files with frame entries that have same (row,col) coordinates
+ * Avoid erroring out when file or image user TRE size is just 3
+ * Load subframe mask table if present (typically, for CADRG/CIB images with IC=C4/M4) (#3848)
+ * A few hacks to accept some (recoverable) file inconsistencies (#3848)
+
+NTv2 driver:
+ * New for GDAL/OGR 1.8.0
+ * Read&write NTv2 Datum Grid Shift files
+
+OZI driver:
+ * New for GDAL/OGR 1.8.0
+ * Read OZI OZF2/OZFX3 files
+
+PAUX driver:
+ * Add support for INTERLEAVE option
+
+PCIDSK2 driver:
+ * PCIDSK SDK refreshed from upstream
+ * Remove svn:external for pcidsk sdk; Copy it directly in GDAL tree
+ * Support for reading and writing descriptions added to the PCIDSK SDK.
+ * Add bitmap support
+ * Support for reading/writing complex PCIDSK files through libpcidsk
+ * Support worldfile if lacking internal georef (#3544)
+ * Fix locking state at CPLThreadMutex creation (#3755)
+ * Improved projection support.
+
+PDF driver:
+ * New for GDAL/OGR 1.8.0
+ * Read Geospatial PDF (through poppler library), either encoded according
+   to OGC Best practice or Adobe ISO32000 extensions.
+
+PDS driver:
+ * Support quoted SAMPLE_TYPE. Check for UNSIGNED in SAMPLE_TYPE for UInt16.
+ * Support files where scanlines are broken over several records.
+ * Support newline continuation
+ * Recognize ENCODING_TYPE = "N/A" (N/A surrounded by double-quotes)
+ * Take into account MINIMUM, MAXIMUM, MEAN and STANDARD_DEVIATION when
+   available to set the statistics
+
+PNG driver:
+ * Update internal libpng to 1.2.44
+ * Internal libpng : Make screwy MSPaint "zero chunks" only a warning,
+   not error (#3416).
+ * Added ZLEVEL creation option
+
+PostGIS Raster (formerly WKTRaster driver):
+ * Improved block reading and raster settings reading in WKT Raster driver
+ * Functions SetRasterProperties and GetGeoTransform modified to allow both
+   referenced and not referenced rasters
+ * Connection string parsing simplified. Schema, table name and where clause
+   can be passed with or without quotes
+ * New parameter "mode"
+
+RASDAMAN driver:
+ * New for GDAL/OGR 1.8.0
+ * Read rasters in rasdaman databases
+
+RMF driver:
+ * Significant improvements. Implemented decompression scheme typically
+   used in DEM data.
+
+SRP driver:
+ * Relax strict equality test for TSI size for unusual products (#3862)
+
+TerraSAR driver:
+ * Enhancements related to GCPs handling (#3564).
+
+USGSDEM driver:
+ * Support non-standard DEM file (#3513)
+
+VRT driver:
+ * Preliminary Overview support on VRT bands (#3457)
+ * Support for mask band : VRT may expose a mask band,
+   and mask bands can be used as VRTRasterBand sources
+ * Port to VSIF*L API; advertise GDAL_DCAP_VIRTUALIO=YES
+ * Make format identification less strict (#3793)
+ * Support for LocationInfo metadata item on bands
+
+WCS driver:
+ * Decode base64 encoded multipart data
+
+WMS driver:
+ * Adds a <UserAgent> optional parameter so that the user be able to provide
+   its own useragent string for picky WMS servers (#3464)
+ * Default color interpretation for wms driver (#3420)
+ * Add UnsafeSSL setting (#3882)
+
+XYZ driver:
+ * New for GDAL/OGR 1.8.0
+ * Read ASCII XYZ gridded datasets
+
+## OGR 1.8.0 - Overview of Changes
+
+Core:
+ * RFC 28 : OGR SQL Generalized Expressions
+ * RFC 29 : Support for ignoring fields in OGR
+ * Add OGRLayer::GetName() and OGRLayer::GetGeomType() virtual methods,
+   and their C and SWIG mappings (#3719)
+ * On Unix, add capability of opening the target of a symlink through OGROpen()
+   even if it not a real filename. Useful for opening resources expressed as
+   GDAL virtual filenames in software offering only file explorers (#3902)
+ * Expat based XML readers : add support for reading files with Windows-1252
+   encoding
+ * Use transactions in CopyLayer for better speed. (#3335)
+ * OGRGeometry::importFromWkt() : allow importing SF-SQL 1.2 style WKT while
+   preserving compatibility with previously recognized non conformant WKT (#3431)
+ * Add C functions : OGR_G_ForceToPolygon(), OGR_G_ForceToMultiPolygon(),
+                     OGR_G_ForceToMultiPoint() and OGR_G_ForceToMultiLineString()
+ * Add C functions : OGR_G_Length(), OGR_G_Simplify(), OGR_G_Area(), OGR_G_Boundary()
+                     OGR_G_SymDifference() and OGR_G_UnionCascaded()
+ * Add C function: OGR_F_StealGeometry()
+ * Move Centroid() method from OGRPolygon to OGRGeometry base class to be able
+   to operate on various geometry types, and to be consistent with PostGIS
+   ST_Centroid() capabilities and the underlying GEOS method
+ * Make the GetStyleTable() SetStyleTable() SetStyleTableDirectly() methods on
+   datasources and layers virtual (#2978)
+ * Add OGRSFDriverRegistrar::DeregisterDriver() and OGRDeregisterDriver()
+ * Improve detection of rounding errors when writing coordinates as text with
+   OGRMakeWktCoordinate()
+ * OGR SQL: allow comparing datetime columns in WHERE clause
+ * OGR indexing: re-use .ind file in read-write mode when calling CreateIndex()
+   but the index was opened as read-only (follow up of #1620); ensure that the
+   .ind file is closed before being unlink()'ed
+ * AssemblePolygon: ensure largest area ring is used as exterior ring (#3610)
+ * OGRGeometryFactory::createFromGEOS() : preserve coordinate dimension
+   (with GEOS >= 3.3) (#3625)
+ * Allow calling transformWithOptions() with a NULL poCT
+ * Improve wrapdateline, especially on LINESTRING
+ * Fix getEnvelope() for OGRPolygon and OGRGeometryCollection to avoid taking
+   into empty sub-geometries; Fix OGRLayer::GetExtent() to avoid taking into
+   account empty geometries
+ * Support attribute index scan with the sql 'IN' operator (#3686)
+ * Add attribute index support for the sql queries in mapinfo tab format (#3687)
+ * OGRGometry: add a swapXY() virtual method
+ * Implement special field support for IsFieldSet
+ * OGRLineString::transform() : allow partial reprojection if
+   OGR_ENABLE_PARTIAL_REPROJECTION configuration option is set to YES (#3758)
+ * Add OGR_G_ExportToGMLEx() that can take options to enable writing GML3
+   geometries compliant with GML3 SF-0
+ * OGRFeature::SetField() : support setting integer and real lists from a
+   string in the format (n:value,value,value,...)
+
+OGRSpatialReference:
+ * Big upgrade to EPSG 7.4.1 with improved datum logic
+ * Use PROJ 4.8.0 thread-safe functions if available to avoid global OGR PROJ4
+   mutex when doing OGRProj4CT::TransformEx()
+ * Support for defining VERT_CS and COMPD_CS from EPSG and from/to PROJ.4
+ * Implement OGRSpatialReference:IsVertival() and
+   OGRSpatialReference::IsSameVertCS() methods
+ * add RSO gamma handling (proj #62)
+ * TMSO support
+ * Adjust handling of NAD27 to avoid towgs84 params, use +datum when no towgs84,
+   do not emit +ellipse if +datum used (#3737)
+ * exportToProj4() : add +towgs84= instead of +datum= if both information are
+   available. This behavior can be turned off by setting
+   OVERRIDE_PROJ_DATUM_WITH_TOWGS84=NO (#3450)
+ * Add PROJ4_GRIDS EXTENSION as a way of preserving datum grids
+ * ogr_srs_proj4: add a table for Prime Meridians; improve recognition of prime
+   meridian to export them as names when possible with exportToProj4()
+ * importFromProj4(): recognize +f= option
+ * Correct handling of Mercator2SP from EPSG (#2744)
+ * Make GetAxis() const
+ * Improve axis orientation recognition for stuff like EPSG:3031
+ * Fix Amersfoort (geotiff #22)
+ * Panorama: Added zone number to the list of projection parameters list.
+   Use the zone number when we need to compute Transverse Mercator projection.
+ * Panorama: Use Pulkovo 42 coordinate system instead of WGS84 as a fallback
+   if the CS is not specified.
+ * ESRI: added support for Mercator in an old style file
+ * Add Bonne, Gauss-Schreiber Transverse Mercator, Mercator (2SP), Two Point
+   Equidistant and Krovak to the list of projections description dictionary.
+ * SRS validation : various fixes
+ * Exposure OSRImportFromERM() and OSRExportToERM() functions in C API.
+ * PCI : Fix the transfer of scale for Stereographic Projection (#3840).
+         Add support for Oblique Stereographic (SGDO) (#3841)
+ * Substantially upgrade PCI datum conversions using PCI datum/ellips.txt files
+
+Various drivers:
+ * Improve behavior of DXF, VFK, GPX, SHAPE, PG, LIBKML, KML, VRT, CSV, GML,
+   BNA, GeoRSS, GEOJSON drivers when LC_NUMERIC is not the C locale
+
+Utilities:
+ * ogr2ogr: copy datasources and layers style table
+ * ogr2ogr: use OGRGeometryFactory::forceToMultiLineString() when -nlt
+            MULTILINESTRING is specified
+ * ogr2ogr: allow -wrapdateline if neither input or output srs is specified,
+            but input layer srs is geographic
+ * ogr2ogr: add -splitlistfields and -maxsubfields options to split fields of
+            type IntegerList, RealList or StringList into as many subfields of
+            single type as necessary.
+ * ogr2ogr: accept None or Null as a special value of -a_srs to nullify the output SRS
+ * ogr2ogr: ignore -overwrite options if the output datasource does not yet exist (#3825)
+ * ogr2ogr: special case when output datasource is a existing single-file Shapefile :
+            auto-fill the -nln argument if not specified (#2711)
+ * ogr2ogr: add a -explodecollections option to split multi geometries into several features
+ * ogr2ogr: add a -zfield option to set the Z coordinate of a 3D geometry from the value of
+            a field
+
+AeronavFAA driver:
+ * New for GDAL/OGR 1.8.0
+
+ArcObjects driver:
+ * New for GDAL/OGR 1.8.0
+
+BNA driver:
+ * Ported to use VSIF*L API
+
+CSV driver:
+ * For files structured as CSV, but not ending with .CSV extension, the 'CSV:'
+   prefix can be added before the filename to force loading by the CSV driver
+ * Support reading airport data coming from http://www.faa.gov/airports/airport_safety/airportdata_5010
+ * If a datasource is created with the extension .csv assume this should be
+   the first layer .csv file instead of a directory
+ * Skip empty lines (#3782)
+ * Port to VSI*L API for read&write; support writing to /vsistdout/
+
+DGN driver:
+ * Correct computation of abyLevelsOccurring (#3554).
+
+DODS driver:
+ * Compilation fix to support libdap 3.10
+
+DXF driver:
+ * Smooth polyline entity support added
+ * Read blocks as a distinct layer instead of inlining
+ * Assemble file at end with changes to header template - so far only inserting
+   new layer definitions
+ * Support for writing user defined blocks
+ * Add limited hatch support
+ * Add support for writing linetypes.  Support using complete dxf files as
+   the header or trailer template.
+ * Apply the INSERT entity id to all features inserted in its place (#3817)
+ * various fixes
+ * Implement Win1252/utf8 conversion for dxf text
+ * Fix issues with text angles, text escape and multiline text
+ * add support for \U+xxxx unicode chars in labels
+
+GeoJSON driver:
+ * Add reader to parse JSON output of FeatureService following GeoServices REST
+ * Read and write "id" member at feature object level
+ * Various robustness fixes to avoid crashes
+ * Fix combined spatial and attribute filtering (#3803)
+
+GeoRSS driver:
+ * Ported to use VSIF*L API
+ * Recognize <gml:MultiPoint>, <gml:MultiLineString> and <gml:MultiPolygon>
+ * Support reading GeoRSS inside <rdf:RDF>
+
+GML driver:
+ * Adding support for xlink:href. (#3630)
+ * Add support for Polish TBD GML
+ * Support reading <gml:Curve>, <gml:MultiCurve>, <gml:TopoCurve>,
+   <gml:TopoSurface>, <gml:Ring>, <gml:Surface>, <gml:PolygonPatch>,
+   <gml:pointMembers>, <gml:curveMembers>, <gml:surfaceMembers>
+   <gml:Triangle>, <gml:Rectangle>, <gml:Tin/gml:TriangulatedSurface>,
+   <gml:Arc>, <gml:Circle> elements in GML3 geometries
+ * Recognize <gml:Solid> and <gml:CompositeSurface>, <gml:OrientableSurface> elements
+   (dealt as an approximation as multipolygons, and not as volumes)
+ * Add support for "complex structure flattening" of attributes, and OFTStringList,
+   OFTRealList and OFTIntegerList field types in case of multiple occurrences of
+   a GML element (such as UK Ordnance Survey Mastermap) (#3680)
+ * Add support for CityGML generic attributes <stringAttribute>, <intAttribute> and
+   <doubleAttribute>
+ * Various improvements for better support of AIXM 5.1
+ * Write and retrieve layer geometry type to/from .gfs file (#3680)
+ * Support using the <GeometryElementPath> to retrieve the appropriate geometry in
+   case several ones are available per feature
+ * Use VSIF*L API for read&write
+ * XSD reader : various improvements, in particular to support various types of schema
+   returned by WFS DescribeFeatureType
+ * XSD writer: change the default GeometryPropertyType to a more precise type name
+   according to the layer geometry type
+ * Write valid <gml:MultiGeometry> element instead of the non-conformant
+   <gml:GeometryCollection>. For backward compatibility, recognize both syntax for
+   the reading part (#3683)
+ * Support reading SRS per layer when possible, and deal with urn:ogc:def:crs:EPSG::xxx
+   geographic coordinate systems (as returned by WFS 1.1.0 for example) to restore
+   (longitude, latitude) order (unless GML_INVERT_AXIS_ORDER_IF_LAT_LONG is set to NO)
+   Also add a GML_CONSIDER_EPSG_AS_URN option that can be set to YES when EPSG:XXXX should
+   be considered as urn:ogc:def:crs:EPSG::XXXX
+ * Expose gml:id as a string field when reading <wfs:FeatureCollection>
+ * Add dataset creation option FORMAT=GML3 to write GML3 SF-0 compliant data
+ * Add dataset creation option SPACE_INDENTATION=YES/NO to optionally disable space indentation
+   when writing GML.
+ * Recognize GML answer of MapServer WMS GetFeatureInfo request
+ * Fix datatype detection to fallback to Real when an integer cannot fit into a 32bit int (#3866)
+ * GML/WFS : use SRS defined in global gml:Envelope if no SRS is set for any feature geometry
+
+GMT driver:
+ * Add support for multilinestring reading (#3802)
+
+GPSBabel driver:
+ * New for GDAL/OGR 1.8.0
+ * Read/Write files supported by GPSBabel utility
+
+GPX driver:
+ * Port write side of the driver to VSIF Large API
+ * Add LINEFORMAT dataset creation option
+ * Allow writing track points and route points with their own attributes by
+   writing point features in track_points and route_points layers
+
+HTF driver:
+ * New for GDAL/OGR 1.8.0
+ * Read Hydrographic Transfer Format (HTF)
+
+Ingres driver:
+ * Implement support for spatial reference systems (atrofast, #3159)
+ * Added support for GEOMETRYCOLLECTION as a generic geometry type, and
+   fleshed out the layer creation logic to support all geometry types.
+
+KML driver:
+ * KML vertex output: avoid warning for coordinates just above 90 and 180
+   degrees due to numerical imprecisions
+ * Port to VSI*L API for write
+
+LIBKML driver:
+ * New for GDAL/OGR 1.8.0
+ * Alternate KML driver relying on Google libkml
+
+MITAB driver:
+ * Use "," for the OGR Feature Style id: parameter delimiter, not "." as per
+   the spec.
+ * Synchronized with mitab CVS HEAD
+ * Fixed crash when trying to get the same mitab feature twice
+
+MSSQLSpatial driver:
+ * New for GDAL/OGR 1.8.0
+ * Read/write support for MS SQL Spatial databases
+
+NAS driver:
+ * New for GDAL/OGR 1.8.0
+ * Reads the NAS/ALKIS format used for cadastral data in Germany
+
+OCI driver:
+ * Allows OS authentication (#3185)
+ * Uppercase table_name on SQL queries #1960 - OCI: ogr2ogr with append option
+   is not considering layer creation
+ * Support creation of non-spatial tables (#3690)
+ * Set MULTI_LOAD as default #3656, for new layer and update
+
+OGDI driver:
+ * Add OGR_OGDI_LAUNDER_LAYER_NAMES configuration option to simplify reported layer names
+ * Fix GetFeatureCount() when used with SetAttributeFilter()
+
+OpenAir driver:
+ * New for GDAL/OGR 1.8.0
+ * Read Special Use Airspace in OpenAir format
+
+PCIDSK driver:
+ * Implement creation/update and coordinate system support
+
+PDS driver:
+ * New for GDAL/OGR 1.8.0
+ * Read NASA Planetary Data Systems TABLE objects
+
+PGeo driver:
+ * Add PGEO_DRIVER_TEMPLATE option
+
+PGDump driver:
+ * New for GDAL/OGR 1.8.0
+ * To output PostgreSQL SQL dump (very similar to shp2pgsql utility)
+
+PostgreSQL driver:
+ * Add support for PostgreSQL >= 9.0 new binary data format
+ * Use canonical (HEXEWKB) form to get geometry to speed-up feature retrieval.
+   WKT-based retrieval can still be used if PG_USE_TEXT configuration option
+   is set to YES
+ * If the PG_USE_BASE64 configuration option is set to YES, geometries will be
+   requested as BASE64 encoded EWKB instead of canonical HEX encoded EWKB.
+   (useful when bandwidth is the limiting factor)
+ * Don't instantiate layer defn at layer creation. This can speed up
+   significantly database opening when they are many tables and the user just
+   needs to fetch one with GetLayerByName().
+ * Implement efficient OGRLayer::GetName() and OGRLayer::GetGeomType()
+ * Allow creating layer with eType = wkbNone
+ * Don't require to have found a layer in readonly mode to succeed in opening
+   the datasource.
+ * Add TEMPORARY (ON/OFF) layer creation option to create TEMPORARY tables
+ * CreateLayer() : don't launder schema_name if passed string is schema_name.table_name,
+   and when testing if the layer already exists prepend or remove the
+   schema_name to the table_name when comparing to layer names
+ * Handle Nan and Inf values for float types in INSERT, UPDATE and
+   COPY SQL commands. (#3667)
+ * Retrieve the FID of a newly inserted feature (#3744)
+ * Remove use of deprecated PostGIS functions when running against PostGIS 2.0SVN
+
+S57 driver:
+ * Avoid crashing if there is a missing VRPT field in a vector record.
+
+SOSI driver:
+ * New for GDAL/OGR 1.8.0
+ * Read Norwegian SOSI-standard
+
+Shapefile driver:
+ * Use VSI*L API for .prj file so it works in virtual circumstances (#3536).
+ * CreateLayer(): Check that the layer doesn't already exist
+ * Implement multipatch read support
+ * Remove ESRI style spatial indexes from Shapefile on update via OGR (#2798)
+ * Fix conflict between spatial and attribute indexes (#3722)
+ * Create integer fields with unknown width as 10 characters instead of 11
+   to avoid them getting immediately considered to be real when reopening (#2151)
+ * Make 'ogr2ogr -overwrite dst.shp src.shp -nln dst' work when dst.shp already exists
+
+SQLite driver:
+ * Spatialite : use MBRIntersects operator instead of MBRWithin (#3810)
+ * Spatialite: avoid executing some Spatialite functions several times when
+   issuing SQL queries
+ * Add a INIT_WITH_EPSG dataset creation option to fill the spatial_ref_sys
+   table with content of EPSG CSV files (default to NO); several fixes to be
+   robust to single quote characters in SRS strings
+ * Fix to make CopyLayer() work when src layer is a SQL result layer (#3617)
+ * Add OGR_SQLITE_SYNCHRONOUS configuration option that, when set to OFF,
+   can speed up considerably write operations (e.g. on EXT4 filesystems),
+   at the expense of extra robustness w.r.t system crashes.
+ * Spatialite: when creating a spatialiate DB, add a srs_wkt column in the
+   spatial_ref_sys table, as introduced in libspatialite 2.4.0
+ * Implement the DeleteLayer() interface and report the ODsCDeleteLayer capability
+
+SUA driver:
+ * New for GDAL/OGR 1.8.0
+ * Read Special Use Airspace in Tim Newport-Peace's format
+
+VRT driver :
+ * Fix GetExtent() on non VGS_Direct VRT layers (#3783)
+
+WFS driver:
+ * New for GDAL/OGR 1.8.0
+ * WFS client that brings read & write (WFS-T) support for WFS 1.0.0 and 1.1.0
+
+## SWIG Language Bindings
+
+General :
+ * Add Geometry.Length(), Geometry.Area(), Geometry.Simplify(), Geometry.UnionCascaded(),
+   Geometry.SymDifference, Geometry.Boundary()
+ * Add SpatialReference.GetUTMZone()
+ * Add Geometry.ForceToPolygon(), Geometry.ForceToMultiPolygon(),
+       Geometry.ForceToMultiPoint() and Geometry.ForceToMultiLineString()
+ * Add Band.SetScale() Band.SetOffset(), and Band.SetUnitType()
+ * Add ogr.RegisterDriver() and ogr.DeregisterDriver()
+ * Move ogr.GeometryTypeToName() and ogr.GetFieldTypeName() from Java bindings
+   to all bindings
+ * Initialize return values of GetRasterStatistics() so that we know if they
+   have been updated
+ * Add Feature.SetFromWithMap()
+ * Add gdal.GridCreate() (#3661)
+ * Expose OSR GetSemiMajor(), GetSemiMinor(), GetInvFlattening() and
+   ImportFromERM() functions
+
+CSharp bindings:
+ * Use the .NET Framework 2.0 transparency rules (level 1 transparency) for the
+   VC2010 builds (#3559)
+ * Fix GDAL_DMD_ and GDAL_DCAP_ constants for Csharp (#3601)
+
+Java bindings:
+ * Add GdalGrid.java, GDALContour.java
+ * Add 'make test' target for Unix/Windows
+
+Perl bindings:
+ * Support polygons in TransformPoints.
+ * Test for existence of capability before comparison (avoid unnecessary warning)
+ * Added CAPABILITIES lists to driver, datasource and layer classes;
+   Capabilities and TestCapability methods return and use strings as documented
+   already earlier; added FIELD_TYPES, JUSTIFY_TYPES, GEOMETRY_TYPES and
+   BYTE_ORDER_TYPES lists into appropriate classes
+ * "create" constructor for FeatureDefn
+ * Add aliases Equals and Intersects as mentioned in #3492
+ * Changes to support RFC 30
+ * Add bindings for ReadDir, Stat, FillNodata
+ * Simple support for PostGIS HEX EWKB (remove/add SRID)
+ * The Schema method of FeatureDefn returns a schema, where each field hash contains
+   also key 'Index' and the field index as the value.
+
+Python bindings:
+ * Fix compilation of Python bindings with Python 3.X on 64 bit platform
+ * Optimize Band.ReadRaster() and Dataset.ReadRaster() to avoid extra buffer
+   copy; also add the capability to pass the result buffer such as
+   result_buf = ' '; ReadRaster(0, 0, 1, 1, buf_obj = result_buf) (#3521)
+ * NumPy Band.WriteArray() : use numpy object directly instead of converting to
+   string
+ * Band.ReadAsArray() : instantiate the numpy object before calling RasterIO()
+   instead of creating it from a string
+ * NumPy : add support for signed byte
+ * Make sure that feat.SetField('field_name', double_value) goes through
+   OGR_F_SetFieldDouble() instead of being first converted to string
+ * Add an optional parameter can_return_null to Dataset.GetGeoTransform();
+   when used and set to True, None is returned when GDALGetGeoTransform()
+   returns CE_Failure (instead of the fake (0,1,0,0,0,1)); backward
+   compatibility preserved when the parameter isn't specified
+ * Avoid suppressing warnings and errors when exceptions are used (#3632)
+ * Add gdalinfo.py, ogrinfo.py and ogr2ogr.py as sample scripts, direct ports
+   of corresponding C/C++ utilities
+ * Allow manipulating buffer > 2 GB on 64bit builds for ReadRaster() and WriteRaster()
+ * Map gdal.GetCacheMax(), gdal.SetCacheMax() and gdal.GetCacheUsed() to the
+   corresponding 64bit new API
+ * Reset error status before new GDAL/OGR call when using gdal.UseExceptions() (#3077)
+ * Changes to support RFC 30
+ * Fix Feature.ExportToJson() (#3870)
+
+# GDAL/OGR 1.7.0
+
+(Some of the bug fixes mentioned below might also have gone into 1.6.X maintenance releases.)
+
+## In a nutshell...
+
+* New GDAL drivers : BAG, EPSILON, Northwood/VerticalMapper, R, Rasterlite,
+                     SAGA GIS Binary, SRP (USRP/ASRP), EarthWatch .TIL, WKT Raster
+* GDAL PCIDSK driver using the new PCIDSK SDK by default
+* New OGR drivers : DXF, GeoRSS, GTM, PCIDSK and VFK
+* New utility : gdaldem, gdalbuildvrt now compiled by default
+* Add support for Python 3.X. Compatibility with Python 2.X preserved (#3265)
+* Remove old-generation Python bindings.
+* Significantly improved GDAL drivers: GeoRaster, GeoTIFF, HFA, JPEG2000 Jasper, JPEG2000 Kakadu, NITF
+* Significantly improved OGR drivers: CSV, KML, SQLite (SpatiaLite support), VRT
+* WARNING: incompatibility between MrSID GeoDSDK and libgeotiff 1.3.0 or internal libgeotiff on some platforms (see #3309)
+
+## GDAL/OGR 1.7.0 - General Changes
+
+Build (All) :
+ * Add gdalbuildvrt to the list of utilities built by default (#2747)
+ * Improve Mingw compatibility (#2649)
+ * Add Expat read support for GML driver when Xerces is unavailable (#2999)
+ * Fix GML and ILI reading problems with Xerces 3.x (#3156)
+ * Add 8/12bit JPEG-in-TIFF support
+ * Fix trunk compilation against libdap 3.9.X (#3105)
+
+Build (Windows) :
+ * Check for CURL_LIB instead of CURL_DIR
+ * ensure OGR_ENABLED gets defined if INCLUDE_OGR_FRMTS set (#2784)
+ * Change quoting in VCDIR and SETARGV to avoid likely problems.
+ * added dll and target-lib targets
+ * fix _findfirst handle type for win64 (#3035)
+ * Add support to compile OGR-postgis as a plugin (#3125)
+ * Trap failures in subdirectories and stop build
+
+Build (Unix) :
+ * Use proper object file names when building prerequisites lists (#1878)
+ * Updated man page generation
+ * Add new ./configure test to check that the GCC 4.1 built-in functions for atomic memory access are really available
+ * Handle external libz (#2942)
+ * Add support for 64bit file i/o on BSD systems, through fseeko/ftello
+ * Add support for linking against libspatialite to benefit from spatial functions in SQL queries (#2666)
+ * Fix support for --with-threads configure option on BSDs (tested on DragonFlyBSD 2.2.1)
+ * Add support for autodetection of ogdi 3.2 in ./configure (#3007)
+ * Remove additional dependency to libgdal.so added during linking in gdal/apps (#2970)
+ * Improved ax_oracle_oci.m4 macro to handle libnnzXX for Oracle 10 and 11.
+ * support using the Oracle Instant Client SDK
+ * Make --with-ingres work with newer versions (#3126)
+ * Search for alternative HDF4 flavor in HDF4 testing macro. Alternative HDF4
+   (libmfhdfalt/libdfalt) build is NetCDF-compatible and used in Debian.
+ * Support MacOSX "fat" binary building
+
+Port :
+ * Provide API and implementation for thread and SMP safe atomic increments (#2648)
+ * Add /vsisubfile virtual file driver
+ * Added gzip write implementation
+ * VSI ZIP : Allow natural chaining of VSI drivers without requiring double slash
+ * Add a shortcut when looking for .csv files that are already open
+ * Add CPLSetThreadLocalConfigOption()
+ * Add CPLIsUTF8() and CPLForceToASCII(); Use them in GML, KML, GPX and GeoRSS drivers (#2971)
+ * Add CPLStrlcpy() and CPLStrlcat(), clones of BSD strlcpy() and strlcat() functions
+ * Add CPLStrnlen()
+ * Add CSLLoad2() and CPLReadLine2L() with max number of lines and chars per line allowed
+ * cplkeywordparser.cpp: Support parsing IMD files with values of the form list of lists
+ * odbc: Fixed the null terminators for columns of length (x*511)+1, where x>1. (#2727)
+ * unix VSIF*L : reworked to avoid unnecessary seeks which can be expensive
+ * added HTTPAUTH and USERPWD options for http fetch (#3091)
+
+## GDAL 1.7.0 - Overview of Changes
+
+Algorithms:
+ * cutline : optimize by clipping cutline to region of interest (#2736)
+ * cutline : avoid scanline to scanline blending problems (#2740)
+ * rasterfill : substantially reworked
+ * rasterfill : deprecate bConicSearch option - unused
+ * rasterize : optimized
+ * rasterize : Added GDALRasterizeLayersBuf() function to rasterize geometries directly
+               into the supplied raster array.
+ * rasterize : Add ALL_TOUCHED rasterize option (#2840)
+ * rasterize : Added 3D support for rasterizing points and lines. (#3202)
+ * rasterize : correct case of vertical/horizontal lines on raster right/bottom edge (#3268)
+ * Added GDALCreateGenImgProjTransformer3() function
+ * warp: Reduce destination file size, especially when it has compression (#1688)
+ * warp: Fix crash when reprojecting to irrelevant SRS (#3079)
+ * warp: avoid using the destination nodata value for integer datatypes (#3142)
+ * warp: fix panDstValid generation, and avoid using it improperly (#3222)
+ * warp: Restore support of reprojection of a lat-long image crossing 180E/180W longitude (#3206)
+ * contour: Fix name of GDAL_CG_Create in contour.cpp (#2795)
+ * contour: Generate contours with correct orientation (#3129)
+ * gdalgeoloc: Improve geoloc backmap interpolation (#2501)
+ * overview: added support for cubic convolution overviews
+ * gdal_grid: 3 new metrics: data point count, average distance between data points
+              and a grid node, average distance between data points.
+ * gdal_grid: Properly cast the poOptions parameter in data metrics computation functions. (#3207)
+
+Core :
+ * Added mechanism to clear overviews if zero overviews requested. Implemented by GTiff and HFA drivers (#2915)
+ * Support for overviews in subdatasets
+ * Support for overviews in proxydb directory (#2432)
+ * SetColorTable(NULL) is permitted and means delete (#2421)
+ * Preserve NBITS and SIGNEDBYTE in CreateCopy() for supporting drivers (#2902)
+ * GDALCopyWords() : performance optimizations
+ * Add GDALCheckDatasetDimensions() and GDALCheckBandCount()
+ * Add GDALGetColorInterpretationByName()
+ * Use tiff .ovr for overviews if .aux is just metadata (#2854)
+ * Add missing argument in function declaration for GDALRATTranslateToColorTable()
+ * Do not use colortable for bit2grayscale overviews (#2914)
+ * Support world files with blank lines (ESRI Merge)
+ * Add worldfiles in GetFileList() (ESRI Merge)
+ * Fix rpb/imd loading with a path (#3047)
+ * Add support for using overviews in GDALDataset::BlockBasedRasterIO() (#3124)
+ * Take into account SIGNEDBYTE for GetStatistics() & GetHistogram() (#3151)
+ * Add GDALReadOziMapFile() and GDALLoadOziMapFile() to read projection
+   and georeferencing information from OziExplorer .MAP files.
+ * Added declarations for GDALLoadTabFile() and GDALReadTabFile()
+ * Add missing case for CInt16 and CInt32 in GDALNoDataMaskBand and GDALNoDataValuesMaskBand
+
+Utilities :
+ * gdaldem: new for GDAL/OGR 1.7.0 (#2640)
+ * gdalinfo:
+    - add -norat switch
+    - do not report RPC or GEOLOCATION metadata with -nomd
+    - Use pretty wkt to display GCP projection
+ * gdalwarp:
+    - fix cutline blend distance setting (#2733)
+    - in -te case, adjust the resolution after computing the image dimensions
+    - improved cutline support (#2733, #2847, #2884, #2984)
+    - avoid overwriting an existing destination file that cannot be opened in update mode with a new GTiff file
+    - better heuristics to guess output extent when projection from lat/long world
+      extent to other world global projections (#2305)
+ * gdaltindex:
+    - Avoid unnecessary error message in gdaltindex when creating a new shapefile (#2779)
+    - Rewritten to use OGR API instead of ShapeLib API, so as to produce .prj files more easily (#982)
+ * gdal_contour:
+    - make -3d option work even after -fl option (#2793)
+    - Call GDALGetProjectionRef() on the dataset, not the raster band (#3062)
+ * gdalbuildvrt:
+    - Add -separate, -allow_projection_difference, -te, -tr, -q, -addalpha options
+    - Add -srcnodata and -vrtnodata options (#3254)
+    - Add -hidenodata option (#3327)
+    - Avoid accidental overwriting of a non VRT dataset due to reversed filename order
+    - Fix -resolution lowest/highest (#3198)
+ * gdaladdo: add -clean option (#2915)
+ * gdaladdo: add -q option
+ * gdal_grid: Add support for spatial filtering with -clipsrc option
+ * gdal_translate: support translation of a dataset with subdatasets if the parent has bands
+ * gdal_translate: Add 'gray' as a value of -expand rgb option
+ * gdal_translate: Add -unscale commandline option
+ * gdal_merge.py: Add progress report
+ * gdal_vrtmerge.py: Fix -separate case (#2836)
+ * gdal_vrtmerge.py: Write the <SourceProperties> element (#1985)
+ * gdal_retile.py: add lanczos resampling (#2859)
+ * gdal_fillnodata.py: ensure dstfile support works by copying source (#2866)
+ * GDAL2Tiles: --srcnodata support + fixed KML rendering for -p raster
+ * rgb2pct.py: Added ability to use a preexisting color table from a file (#2958)
+ * pct2rgb.py and rgb2pct.py : Copy the GCPs and their projection to the target dataset.
+ * classify.py: Fix order of args to numpy.ones() and numpy.zeros() (#3089)
+ * hsv_merge.py: New sample script to greyscale as intensity into an RGB image,
+                 for instance to apply hillshading to a dem colour relief.
+ * support filename globbing for various Python scripts (#2783)
+ * --formats will add 'v' in report on drivers that support virtual io
+ * all utilities and scripts : consistently advertise -q as the official quiet
+                               option, but accept both -q and -quiet (#3820)
+
+Changes in various drivers :
+ * Implement support for overviews on subdatasets for HDF4, HDF5, NetCDF, NITF, XPM, TERRAGEN, PCIDSK (#2719)
+ * Add support for 64bit offsets in /vsisubfile, JPEG and JP2ECW drivers
+ * External overviews support added to some drivers (JDEM, ...)
+ * Avoid incorrect GEOGCS AXIS settings (#2713)
+ * Use GDALCheckDatasetDimensions() and GDALCheckBandCount() in various drivers
+ * Many memory leak fixes (HDF5, HKV, Leveler, MFF, NITF, RMF, JPEG2000, WCS ... drivers)
+ * Many fixes to improve robustness against corrupt data in many drivers
+ * Error out when trying to open a read-only dataset in update mode (#3147)
+ * Ensure that the same JPEG2000 driver that has been used with CreateCopy() is used to re-open it (#1596)
+
+ADRG driver:
+ * Support PSP != 100 (#3193)
+
+AIG driver:
+ * Differ opening of the RAT only when GetDefaultRat() is called.
+   Will improve performances and make less likely the error message of #3031
+
+AAIGRID driver:
+ * Fix bad reading of AAIGRID dataset whose last line doesn't have a linebreak character (#3022)
+ * Make the ArcInfo ASCII driver more Mac-compatible. (#3212)
+
+BAG driver :
+ * New for GDAL/OGR 1.7.0
+
+BLX driver:
+ * Implement progress callback in CreateCopy() (#2830)
+
+BMP driver:
+ * Modify GetGeoTransform() to return geotransform based on the resolution
+   information in the BMP header if nothing else is available (ESRI merge).
+ * use pam functions properly for geotransform when not using world file
+
+BSB driver:
+ * Fix several issues with BSB files reading (#2782)
+ * Handle properly more than 256 GCPs (#2777)
+ * Add logic to chip GCPs around to avoid split over dateline problems (#2809)
+ * Add logic to reproject GCPs into Mercator for mercator projected images.
+
+DTED driver:
+ * Re-enable DTED driver to recognize files not starting by a UHL record (#2951)
+
+ECW driver:
+ * Enable the JP2ECW driver to open JP2 files with the VSILAPI
+ * Fix build with MSVC2008  (#2850)
+ * Fix memory overwrite while zooming an ECW image (#2934)
+ * Speed-up de-registration of the driver that can take up to 3 seconds (#3134)
+
+EHDR driver:
+ * Add color table update.  Add limited support for floating point
+   files (.flt) (ESRI Merge)
+ * added support for SIGNEDBYTE pixels (#2717)
+ * Restructure stats handling so pam capture works right when stx write fails
+ * improve a bit .clr reading (#3253)
+
+ENVI driver:
+ * Move RPC info into the RPC domain (#3063)
+ * Converted to using VSI Large File API (#3274)
+ * re-enabled complex support (#3174)
+
+EPSILON driver:
+ * New for GDAL/OGR 1.7.0
+ * Mainly used coupled with Rasterlite
+
+ERS driver:
+ * Added PIXELTYPE support to report/create SIGNEDBYTE (#2902)
+ * Give precedence to PAM SRS, and even check for .aux file.  (ESRI Merge)
+
+FAST driver:
+ * Support 7 bands (#3307)
+
+Fujibas driver:
+ * Fix to work on big-endian hosts
+
+GenBin driver:
+ * Implemented custom class for 1bit (U1) files (#2730)
+ * Fix inverse flattening computation (#2755).
+ * Added U2 and U4 support
+ * Look for LSB, assuming MSB if not found (#2730)
+
+GeoRaster driver:
+ * Fix compression problems
+ * Add MaskBand support
+ * Support UNICODE metadata
+ * Support cross database schema/user access
+ * add COORDLOCATOR create option
+
+GeoTIFF driver :
+ * Add 8/12bit jpeg in tiff support
+ * Add support for creating external BigTIFF overview files,
+   with BIGTIFF_OVERVIEW configuration option. (#2785)
+ * Add support for deleting a color table (#2421)
+ * Add logic for Imagine citation parsing
+ * Add logic for encoding and reading ESRI PE string from citation.
+ * Add support for reading and writing vertical datum info from geotiff
+ * Changes to units handling.  (#2755)
+ * Optimize opening speed by deferring fetching the coordinate system till GetProjectionRef (#2957)
+ * Optimize GTiffRasterBand::IReadBlock() for multi-band interleaved case.
+ * Avoid unnecessary re-writing the TIFF directory (#3021)
+ * Use official value for inverse flattening of the WGS84 ellipsoid (#2787)
+ * Add metadata domain for XML documents (#2786)
+ * Make GTiff driver friendly with files with huge number of bands and pixel interleaving (#2838)
+ * Avoid precaching other bands if block cache size is not big enough to accommodate them (#2838)
+ * Internal libtiff (4.0.0beta5) and libgeotiff (1.3.0beta) upgraded
+ * use the SetCitationToSRS call for the PCSCitationGeoKey in a similar fashion to the GTCitationGeoKey (#2933)
+ * NBITS set for GTiffOddBits.  YCbCr JPEG added as a compression type.
+   generate MINISWHITE IMAGESTRUCTURE metadata item.  Set missing blocks
+   to the nodata value if there is one.  (ESRI Merge)
+ * Support GeoTIFF with only ProjectedCSTypeGeoKey defined (#3019)
+ * External overviews: try to preserve the bit depth of the original image
+ * Allow reading and creation of big all-in-one-strip 8bit TIFF (#3094)
+ * Handle projection methods for Google Mercator special case (#3217)
+
+GFF driver :
+ * Fix support for big endian host (#2832)
+ * Add pam, and overview support.  Switch to VSI*L API to support virtualio (#3014)
+
+GIF driver :
+ * Introduced a BIGGIF driver to handle GIF files without using the
+   slurp into memory approach. (#2542)
+ * CreateCopy() reports now progress
+ * Replace internal libungif by giflib-4.1.6 (#1825)
+ * Read projection and georeferencing from OziExplorer .MAP file if possible.
+
+GRASS driver:
+ * Add support for GRASS 7.0 GDAL and OGR plugins (#2953)
+ * Use GRASS_GISBASE for GDAL GRASS driver instead of hard-coded path (#2721)
+
+GRIB driver:
+ * only scan for PDS templates in GRIB2 files (#2858)
+ * Avoid dumping GribLen debug message if built with -DDEBUG.
+ * Remove verbosity from GRIB driver (#2887)
+ * Make GRIB detection thread safe (#3209)
+ * Check that bands have the same dimensions (#3246)
+
+GS7BG driver:
+  * Recognize version 2 datasets (#3123)
+
+HDF4 driver :
+ * Allow HDF4 subdataset name to include Windows letter drive (#2823)
+
+HDF5 driver :
+ * subdatsets need to be numbered from 1 not 0 (#2462)
+ * Block size recognition. (#2270)
+ * Fix initial value for nGCPCount in HDF5ImageDataset (#2774)
+ * Fixes to type classification, and to avoid listing subdatsets for unsupported pixel data types (#2941)
+ * Mark PAM for not saving .aux.xml files at this level.  Directly open
+   subdatasets in HDF5Dataset::Open() if there is only one subdataset.
+
+HFA driver:
+ * Support reading and evaluating 3rd order xforms (#2716)
+ * Various improvements to SRS support, particularly to preserve PE
+   compatibility.  (#2755)
+ * Added HFAEntry::RemoveAndDestroy() method to remove nodes from tree (#2421)
+ * Added support for deleting color tables (#2421)
+ * Add a scaled progress monitor for HFADataset::IBuildOverviews()
+ * Fix HFA u2 compression/decompression (ESRI merge)
+ * Add support for reading compressed s8 HFA (#3152)
+ * Defer opening overviews till they are first requested (#3155)
+ * Support multiple excluded values (#3252)
+ * added a variety of additional coordinate system based types missing in some files (#3262)
+ * Various fixes (#2421, #2842, #2755, #3082, #2730)
+
+Idrisi driver:
+ * Writing text file in CRLF format (#3199)
+ * forward porting esri changes + other changes
+ * provide default values on Create() (#3243)
+
+INGR driver:
+ * Fix INGR driver that was failing on big endian hosts (#2898)
+ * Fix RLE support (#3106)
+ * Added overview building (#2904)
+
+JPEG driver:
+ * Enable the JPEG driver to read and create 12bit JPEG images when JPEG12_ENABLED=yes
+ * Internal libjpeg: additional changes to ensure operation with IPP enabled apps (#2606,#2845)
+ * JPEG read optimizations : differ extraction of EXIF metadata and internal maskband
+
+JPEG2000 (JasPer) Driver:
+ * Allow proper reading of JP2 images where dimensions are not multiple of 256 (#2399)
+ * Add a virtual I/O interface to able to read from/write to JPEG2000-NITF files
+ * Do not deregister jas_image_clearfmts() to avoid failure when gdal_translat'ing from JP2 streams
+ * Add proper reading of YCbCr images as RGB
+ * fix decoding of bit depth for BPCC and PCLR boxes
+
+JP2KAK (Kakadu) Driver :
+ * Fix band selection from ycbcr to rgb converted images in DirectRasterIO (#2732)
+ * Support jpc vsisubfile streams
+ * add handling of reversibly compressed data with 9 to 16 bits precision (#2964)
+ * Modify transfer_bytes() buf32 case to offset/scale based on precision. (#2964)
+   Fixed _WriteTile() lossless 16bit case to avoid improper 32K offset.
+   Added support for NBITS image structure metadata, and creation option.
+ * Added logic to limit tiles to 64K due to jpeg2000 limitation. (ESRI Merge)
+ * Fix offsetting of 16U buf32 data (#3027)
+ * Support 16u/16s imagery through DirectRasterIO interface (#3049)
+ * Support external overviews as an override to internal overviews
+ * Rework jp2kak support to use natural kakadu builds (Windows build)
+ * ensure external overviews get used if available (#3276)
+ * add preliminary multi-threading read support via DirectRasterIO()
+
+
+LAN driver:
+ * Give preference to PAM coordinate system since built-in info is very
+  limited.  Fallback to PAM geotransform if internal missing. (ESRI Merge)
+
+LCP driver:
+ * Add projection file support (#3255)
+
+MEM driver:
+ * Allow creating bands of more than 2GB each if size_t is large enough.
+ * Added GetInternalHandle() implementation to fetch band memory buffer
+
+MrSID driver:
+ * Implement faster resampling for 1:1 case
+ * Improve stream implementation so it works for jp2 with v7
+ * Make the JP2MrSID driver accept .ntf extension to allow reading jpeg2000
+   datastream in NITF files
+ * Avoid reporting large metadata objects.  Add MG version to metadata.
+
+NetCDF driver:
+ * Fix handling of pixel validity mask (#3112)
+ * correct a problem with 5+ dimensional data access (#2583)
+ * fix y flip detection in common case (#2654)
+ * add support for subdataset names with Windows full path names, like NETCDF:D:\...
+
+NITF driver:
+ * Add support for reading & creating large (>4GB) NITF files.
+ * Add support for NITF/JPEG2000 overviews (JP2KAK)
+ * Add support for reading & creating 12bit JPEG compressed NITF files when JPEG12_ENABLED=yes
+ * Add support for creating a NITF file with many bands and big TRE content
+ * Add support for creating several uncompressed images in a NITF file (#2989)
+ * Add support for creating M3 (masked multi-block JPEG compressed) images
+ * Add support for unpacking a wider variety of pixel depths.
+ * Add support for overriding IGEOLO with GEOLOB TRE precision georef (#3180)
+ * Add support for for CFloat32 reading & writing (#2526)
+ * Add support for reading and writing NITF file with large single block (#3263)
+ * Allow Jasper driver to be used for NITF IC=C8 (JPEG2000) CreateCopy() if JP2ECW is not available
+ * Allow JP2MrSID driver to be used for reading JPEG2000 datastreams in NITF
+ * Avoid issues when reading M3 single block images
+ * Fix CreateCopy() of multi block JPEG-NITF
+ * Various bugfixes (#2940, #2912, #3029, #3088)
+ * Support NITF file with a color table and JPEG2000 data content (#3110)
+
+NWT_GRC / NWG_GRD drivers (Northwood/VerticalMapper) :
+ * New for GDAL/OGR 1.7.0
+
+OGDI driver:
+ * improve finding of PROJ.4 include files for OGDI (#1242)
+
+PCIDSK driver (old driver):
+ * Added worldfile reading. Added PAM fallback for geotransform.
+ * Added support for default overviews (i.e. .ovr or .rrd).  (ESRI Merge)
+ * fail somewhat gracefully on compressed images
+
+PCIDSK driver (new driver):
+ * New for GDAL/OGR 1.7.0, using the PCIDSK SDK
+
+PDS driver:
+ * Transfer various keywords to metadata
+ * Made keyword handler more in complaint with ODL (#2956)
+ * Support detached files with an offset (#3177)
+ * Support .LBL labelled compressed files
+
+PNG driver :
+ * Upgrade internal libpng to 1.2.35
+ * Only write a world file if the source datasource has a geotransform
+ * Allow writing a nodata value of 0 as the transparent color value (#3208)
+
+R driver:
+ * New for GDAL/OGR 1.7.0
+
+Rasterlite driver
+ * New for GDAL/OGR 1.7.0
+
+RIK driver:
+ * Improved error checking
+
+SAGA GIS Binary driver:
+ * New for GDAL/OGR 1.7.0
+
+SDE driver :
+ * Fix exporting ArcSDE raster results in a displaced image (#2063)
+
+SRP driver (ASRP/USRP):
+ * New for GDAL/OGR 1.7.0
+
+SRTM driver :
+ * Set GDALMD_AOP_POINT metadataitem (#1884)
+
+TIL driver (EarthWatch .TIL) driver:
+ * New for GDAL/OGR 1.7.0
+
+VRT driver :
+ * Honour the INIT_DEST warp option (#2724)
+ * Improve performance of LUTs in VRTComplexSource from O(n) to O(log2(n)) (#3003)
+ * Implement (advertized in doc) support for SetMetadataItem( "source_0", szFilterSourceXML, "vrt_sources" ) on a VRTSourcedRasterBand (#3052)
+ * Implement GetFileList() to list the source files
+ * Fix wrong initialization of destination buffer in VRTSourcedRasterBand::IRasterIO() in case of not standard pixel/line spacing. (#2867)
+
+WCS driver:
+ * do not try to parse HTML content, which is returned by some provider when the server doesn't exist
+ * added HttpAuth and UserPwd options for authentication (#3091)
+
+WKT Raster driver:
+ * New for GDAL/OGR 1.7.0
+
+WMS driver:
+ * Support TMS/formatted URLs in WMS minidriver (#2878)
+ * Be tolerant if we have required 3 bands and got 4, or the other way round
+ * Declare a user agent string
+
+## OGR 1.7.0 - Overview of Changes
+
+Utilities:
+ * ogrinfo: Preserve order of source layers specified on ogrinfo command line,
+            and use GetLayerByName() which enables to read some hidden layers
+            like public.<table> layers from a PG database (#2922, #2026)
+ * ogr2ogr:
+    - Add -clipsrc and -clipdst option to clip geometries to the specified extents
+    - Add -fieldTypeToString option to conveniently cast any fields of given type to fields of type string (#2968)
+    - Add -progress option for ogr2ogr to displaying progress (#2998)
+    - Add -wrapdateline option to ogr2ogr to deal with geometries that cross 180 degree longitude (#3158)
+    - Add -dialect flag to specify SQL dialect
+    - Preserve order of source layers specified on command line (#2922)
+    - -overwrite and -append now automatically imply -update (#3048)
+    - Support converting to a format after field name "laundering" (#3247)
+  * ogrtindex:
+    - Skip layers whose schema does not match instead of terminating (#3141)
+    - Add a -accept_different_schemas option for non-MapServer use cases (#3141)
+    - Set SRS to tileindex when one is found in the tiles
+  * ogr2vrt.py : new script that will create a VRT corresponding to a
+    source datasource (sample script for the moment, not promoted officially)
+
+Core :
+ * Improved OGR feature style (#2875, #2808)
+ * Considerable speed-up of ExportToWkt() for very large geometries
+ * Added new OGR_GEOM_AREA special field (#2949)
+ * ensure forceToMultiLineString() works for MultiPolygons (#2735)
+ * Various fixes in OGR SQL engine (r16116, #2996, #2788, #3143, #3144)
+ * Add OGREnvelope::Intersect()
+ * Add OGR_G_ApproximateArcAngles() for ellipses
+ * Fix crash on Ubuntu 8.10 in GetFieldAsString() because of (too) strict guard logic (#2896)
+ * add field type max so we can iterate through all possible values
+ * Avoid making a 2D5 geometry from a 2D only linestring when reprojecting
+
+OGRSpatialReference :
+ * Upgrade EPSG derived files to EPSG 7.1
+ * Added support to operate on COMPD_CS coordinate systems
+ * Added support for importing spatial reference definitions from the OziExplorer .MAP files.
+ * Introduce static methods to destroy OGRSpatialReference and OGRCoordinateTransformation objects
+ * Expose more of the axis orientation API to C
+ * Add missing Eckert 1, 2, 3 and 5 projections
+ * Fix typos in proj4 conversion for Wagner projections
+ * Hack in EXTENSION nodes for Google Mercator (#3136)
+ * Validates PROJCS with AXIS definitions (#2739)
+ * Added support for urn:ogc:def:crs:OGC::CRS:84 (and CRS:83, CRS:27) per WMS spec.
+ * Wide variety of improvements to preserve PE strings through a morphFromESRI()
+   and morphToESRI() process (#2755)
+ * Fix inversion of dictionary filename and GEOGCS/PROJCS name in OGRSpatialReference::exportToERM() (#2819)
+ * Fix SpatialReference::IsSame() for LOCAL_CS case (#2849)
+ * Fix bug in ImportFromXML that prevented from retrieving projection method
+ * Accept both href and xlink:href in OGC XML
+ * improve us foot translation handling (#2901)
+ * OGRSpatialReference::importFromUrl() : add a default 10 second timeout to avoid waiting forever when remote server is stalled
+ * ensure we can translate mercator1sp with non-zero origin to proj4 (#3026)
+ * ensure scalefactor preserved in somerc translation (#3032)
+ * SRS_ESRI: attempt to correct equidistant cylindrical parameter morph (#3036)
+ * SRS_ESRI: improve plate_carree parameter morphing (#3036)
+ * SRS_PCI : Fix PCI projection string handling for UTM
+ * esri_extra.wkt: correct equidistant conic definitions (#3086)
+ * SRS_PANORAMA : Added support for British National Grid and Pulkovo 1995 datums.
+ * Improve recognition of WKT text strings when translating into proj4 hard-coded datum names, in particular nzgd49
+   (also add ggrs87, carthage, hermannskogel, ire65); Fix ellipsoid parameters for modified airy (#3104)
+ * OSRGetEllipsoidInfo() available for various OGR SRS modules
+ * added support for OGC:CRS84 and similar srses from wms/wcs spec in SetFromUserInput (#3090)
+
+BNA driver :
+ * Fix output of BNA driver with polygons with inner ring (#2985)
+ * Proper CRLF output on Windows (#3256)
+
+CSV driver :
+ * Add support for reading and writing CSV files with semicolon or tabulation
+   as the field separator (#2925, #2136)
+ * Add automatic treatment of WKT column as geometry
+ * Add 'CREATE_CSVT' layer creation option
+
+DXF driver :
+ * New for GDAL/OGR 1.7.0
+
+Geoconcept driver:
+ * Fix 'private Class and SubClass headers are inverted' (#2919)
+ * Fix error in writing 2.5D/3D export file (#2921)
+
+GeoJSON driver:
+ * updated JSON-C library to version 0.9
+ * use VSIF*L API
+
+GML driver :
+ * Speed-up considerably parsing of GML coordinates in big geometries, in particular on Windows
+ * Add support for gml3.1.1 srsDimension attribute, to deal with 3D geometries (#2311)
+ * Support multiple <gml:pos> elements in linearrings of polygons (#3244)
+ * Limited support for GML3
+ * Support direct use of FIDs as long as they are all numeric or they have a completely fixed prefix (#1017)
+ * Fix OGRGMLLayer::GetFeatureCount() if there's a .XSD file available (#2969)
+ * Added support for out-of-band attributes on features (for NAS)
+ * Adding the date field type to xsd writer and precision info for OFTReal fields. (#2857)
+
+GPX driver:
+ * Add GPX_SHORT_NAMES configuration option to make the GPX driver report shorter field names
+   and avoid duplicated field names once translated to shapefile (#2966)
+ * Write the <bounds> element (write only)
+ * Avoid escaping XML content when writing <extensions>.
+ * Add appropriate xmlns when detecting Garmin GPX extensions
+
+GRASS driver:
+ * Do not report 3D geometries for 2D GRASS maps (#3009)
+
+GTM (GPSTrackMaker) driver :
+ * New for GDAL/OGR 1.7.0 (#3113)
+
+ILI driver :
+ * Improved curve segmentation algorithm
+ * ILI1: Support for multiple point geomtries
+ * ILI1: Support Real and Integer column types
+
+Ingres driver:
+ * Utilize the new OGC based ingres capabilities (#3159)
+
+KML driver:
+ * Support reading MultiGeometry and layers with mixed geometry type.
+ * Speed-up considerably the reading of huge KML geometries (#3005)
+ * Speed-up considerably with huge number of layers
+ * Moved the location of the Style element to match the OGC Schema (#2858)
+ * Advertise 25D geometry type when relevant (#1803, #1853, #2181)
+ * Relax KML driver about xmlns (#3004)
+
+MySQL driver :
+ * Fix mysql driver compilation with mysql 5.1/g++-4.3.2 (Mandriva 2009.1) (#2972)
+ * Fixed bug MySQL driver truncating decimal places for double field type. (#2852)
+
+OCI driver :
+ * OCI varchar2 columns can be up to 4000 bytes (#2876)
+
+ODBC driver :
+ * make it slightly less likely that the srs_tablename parsing will interfere with complex DSNs.
+ * support for schemas (#1969)
+
+OGDI driver :
+  * fix to avoid applying old spatial filter to unrelated layer
+  * fix to force ResetReading() when changing current layer
+
+PGEO driver :
+ * Recognize more ESRI shape type constants. (#2991, #3100)
+ * implement GetFIDColumn() and GetGeometryColumn() methods (#2694)
+
+PostgreSQL driver:
+ * Add support for tables with 'geography' column type introduced in PostGIS 1.5 (#3216)
+ * Extend support of schemas in PG driver with 2 new options in the connection string:
+   active_schema=foo and schemas=foo[,bar] (#522 and #525)
+ * Implement OGRPGTableLayer::CreateFeature() by using UPDATE instead of DELETE + INSERT (#2557)
+ * Implement SetNextByIndex() for layers of PG datasources (#3117)
+ * Support PG 'real' data type in tables (#3006)
+ * Speed-up PG database opening by avoiding 2 SQL requests per table
+ * Avoid evaluating GetFieldIndex() on each field of each feature,
+   which can be very expensive if the layer has many fields
+ * allow ST_AsBinary with non binary connections
+ * added a configuration option PG_SKIP_VIEWS.
+
+GeoRSS driver :
+ * New for GDAL/OGR 1.7.0 (#2726)
+
+OCI driver:
+ * support blob column binding
+
+PCIDSK driver :
+ * New for GDAL/OGR 1.7.0
+
+Shape driver :
+ * Handle duplicate field names in shapefile driver. (#3247)
+ * Support for opening and handling .DBF files > 2 GB (#3011)
+ * Optimize to use shape bounds for spatial test before organizing poly (#2775)
+ * Support for alternate date format (#2746)
+ * Improve/fix TestCapability() on OGRShapeLayer
+ * Refreshed shapelib from upstream
+
+S57 driver :
+ * Fix incorrect return value of GetFeatureCount() on S57 SOUNDG layer when SPLIT_MULTIPOINT=ON;
+   also avoid warning on that layer when ADD_SOUNDG_DEPTH=OFF (#3163)
+
+SQLite driver:
+ * Add creation and write support in SpatiaLite-compatible databases
+ * Add SPATIAL_INDEX creation option for SpatiaLite tables if linked against
+   libspatialite (default to YES)
+ * Implement OGRSQLiteTableLayer::TestCapability(OLCFastFeatureCount)
+ * Implement OGRSQLiteLayer::GetFIDColumn() and GetGeometryColumn()
+ * Implement TestCapability(OLCRandomRead)
+ * Add a SQLITE_LIST_ALL_TABLES configuration option to list all(non-spatial)
+   tables into a SQLite DB even if there are spatial tables
+ * Avoid reporting the primary key column as a regular column.
+ * Better precision for double values in CreateFeature()
+
+VFK driver:
+  * New for GDAL/OGR 1.7.0
+
+VRT driver:
+ * Allow fast spatial filtering in the VGS_Direct case
+ * Add support for CreateFeature(), SetFeature() and DeleteFeature() operations
+ * Added field definition and style control
+ * Added new vrt/schema creation capability (@dummy@ datasource, ogr2vrt.py script)
+ * Implement 'SrcRegion' element
+ * Add a 'reportSrcColumn' attribute to the 'GeometryField' to avoid reporting
+   the x,y,wkt or wkb source fields in the VRT layer field definition
+ * Forward TestCapability(), GetExtent(), SetNextByIndex() to source layer when possible
+
+XPlane/Flightgear driver:
+ * Improve handling of Bezier curves (#3030)
+ * Support new file names used by XPlane 9.00 & later
+ * Cut into 2 pieces airway segments that cross the antemeridian
+ * Add new layer 'Stopway' that contains the shape of the stopway/blastpad/over-run of a runway
+ * Recognize code 16 and 17 for seaplane bases and heliports and add a new field to APT layer
+
+## SWIG Language Bindings
+
+General:
+ * Recommended SWIG version is 1.3.39
+ * Added API :
+    - GDAL :
+        gdal.FilldoData(), gdal.FileFromMemBuffer(), gdal.Unlink()
+        gdal.ApplyGeoTransform(), gdal.InvGeoTransform()
+        Band.GetUnitType(), Band.GetBand()
+        Band.ComputeStatistics(), Band.HasArbitraryOverviews()
+        RasterAttributeTable.GetLinearBinning()  and SetLinearBinning()
+        extend [Band|Dataset].[ReadRaster|WriteRaster] to accept pixel, line and band spacing parameters
+    - OGR:
+        ogr.GeneralCmdLineProcessor(), Geometry.Segmentize(), FieldDefn.GetTypeName(),
+        Geometry.ApproximateArcAngles()
+    - OSR :
+        osr.ImportFromMICoordSys(), osr.ExportToMICoordSys(), SpatialReference.Clone()
+        osr.EPSGTreatsAsLatLong(), osr.ImportFromEPSGA()
+ * Make resampling an optional parameter for gdal.RegenerateOverview(),
+   to be consistent with gdal.RegenerateOverviews()
+ * NONNULL checks have been added to check various arguments of methods
+ * add missing constants : DCAP_VIRTUALIO, color interpretations, OGR constants
+
+CSharp bindings :
+ * Add support for GetFieldAsStringList, GetFieldAsDoubleList and
+   GetFieldAsIntegerList in the C# wrapper (#2839)
+ * Support MSVC2008 builds with the csharp interface (#2862)
+ * Change the dll mapping rules to support the recent MONO versions
+ * Use GC pinned arrays instead of the double copy in the RasterIO functions (#3073)
+ * Add typemaps to support custom CPLErrorHandler via C# swig bindings
+
+Perl bindings :
+ * in Polygonize make a local copy of the parameters as they are potentially edited
+
+Python bindings :
+ * Add support for Python 3.X. Compatibility with Python 2.X preserved (#3265)
+ * Remove old-generation Python bindings.
+ * Add Python binding's version description capabilities (#3137)
+ * NUMPY : Make Band|Dataset.ReadAsArray() take into account preallocated array (#2658, #3028)
+ * Various memory leaks fixed
+ * Fix gdal.RegenerateOverviews(), Feature.GetFieldAsStringList(),
+   Feature.GetFieldAsIntegerList(), Feature.GetFieldAsDoubleList(),
+   Transform.TransformPoints and CoordinateTransformation.TransformPoints
+ * Extend python TransformPoints typemap to accept any sequence (#3020)
+ * Make Geometry iterable (#1886)
+
+Java bindings (general changes):
+ * Maintained again. A lot of changes to get them into clean state.
+ * RasterIO API : added API for standard Java arrays in addition to DirectByteBuffer
+ * Javadoc available at http://gdal.org/java
+
+# GDAL/OGR 1.6.0
+
+## GDAL/OGR 1.6.0 - General Changes
+
+Build (Unix):
+ * Added basic support for LDFLAGS
+ * Try prefix/lib before prefix/src for proj.4 linking (#1345)
+ * Allow specification of a python binary for --with-python (#2258)
+ * Added NAS driver config support
+ * Fixed Expat detection problem on MinGW (#2050)
+ * Fix INST_DATA setting (/share/gdal instead of /share) (#2382)
+ * Build MSGN driver on Unix-like platforms
+ * Added MSG driver support to configure.in. EUMETSAT Wavelet Transform software is only detected on request, option --with-msg specified.
+ * Improve cross-compilation
+ * Fix linking with HDF4 library when configuring with --with-hdf4 or --with-hdf4=yes (#2602)
+ * Fixes for compilation with GCC 4.3
+
+Build (Windows)
+ * Default to non-debug builds.  Use /GR in pre 1400 builds so that dynamic_cast doesn't just cause an blowout.  Use .pdb file with version embedded.
+ * Make vc++ builds usable from mingw (#2216)
+ * Updated nmake.opt for building with Visual C++ adding /W3 flag for release build and /W4 for debug build.
+ * Add VS Makefile for GDAL and OGR DODS drivers (#2383)
+
+Build (All)
+ * Remove support for "Panorama" GIS SDK (#2669)
+
+Port:
+ * RFC 19: Added VSIMalloc2() and VSIMalloc3() API and use them in GDAL drivers
+ * RFC 23: Added implementation of recode API
+ * Added infrastructure to detect bad arguments to printf-like functions
+ * Added CPLHashSet data structure
+ * Added quad tree implementation derived from shapelib & mapserv
+ * Added support for reading on-the-fly .gz files and .zip files (#1369)
+ * Added CSLFindName()
+ * Added two new flags to CSLTokenizeString2() function: CSLT_STRIPLEADSPACES and CSLT_STRIPENDSPACES to strip leading and ending spaces from the token.
+ * Added CSVGetNextLine() to fetch next record based on just csv filename
+ * Added CPL_ACCUM_ERROR_MSG=ON for CPLQuietErrorHandler
+ * Added CPL_MAX_ERROR_REPORTS config option (#2409).
+ * Added CPL_INLINE macro
+ * Added UNREFERENCED_PARAM macro to cpl_port.h.
+ * Added CPLGenerateTempFilename()
+ * Improve performance of CPLParseXMLString from O(n*n) to O(n) where n is the number of siblings node
+ * Fix bug with url encoding in CPLEscapeString() (#2314)
+ * Various fixes in CPLList implementation (CPLListInsert and CPLListRemove) (#2134)
+ * VSIMEM: added path normalization so everything is converted to forward slashes
+ * VSIMEM: prevent file extension, or write/update to files opened in readonly mode
+ * cpl_path.cpp: Add CPLAssert to check that the string inputs are not the result static buffer
+
+Utilities:
+ * Added a --utility_version that displays the version of GDAL used for compiling the utility and add runtime checks to see if GDAL library is compatible with the utility version
+
+## GDAL 1.6.0 - Overview of Changes
+
+Core :
+ * RFC 22 : Added RPC and IMD support
+ * Added support for computing statistics for datasets with arbitrary overviews in GDALRasterBand::ComputeStatistics()
+ * Added Gaussian resampling in overview building (#2137)
+ * Added Mode resampling in overview building (#2347)
+ * Allow fast NONE overview generation (#2677)
+ * Added in GDALRasterBand::GetRasterSampleOverview() and ComputeRasterMinMax() (#2148)
+ * Preliminary gmljp2 specific changes to address axis orientation (#2131)
+ * Added GDALProxyDataset and GDALProxyRasterBand abstract classes to be able to make proxy datasets and raster bands
+ * Added a proxy dataset class, GDALProxyPoolDataset, that differ at the maximum the opening of the underlying dataset and keep the number of simultaneous opened underlying datasets under a limit (similar to what is done in the RPFTOC driver)
+ * Migrate GDALRegenerateOverviews() to C API
+ * Added GDALDestroyDriver()
+ * Added special case in GDALCopyWholeRaster to be more friendly when writing a tiled compressed GeoTIFF (massive reduction of destination file size)
+ * Added GDALRegenerateOverviewsMultiBand to process all the bands at the same time to optimize the generations of compressed pixel-interleaved overviews (such as JPEG-In-TIFF). Optimization triggered in some cases for external and internal GeoTIFF overviews. PHOTOMETRIC_OVERVIEW and INTERLEAVE_OVERVIEW config options added for external overviews. -ro option added to gdaladdo to generate external overviews for GeoTIFF. Result : divide by 2 to 3 the size of JPEG-In-TIFF overviews on big RGB datasets
+ * Add a new class GDALNoDataValuesMaskBand to create a per-dataset nodata mask band (GMF_PER_DATASET | GMF_NODATA) when the metadata item NODATA_VALUES is found on the dataset (#2149)
+
+ * Fix segfault when building overviews with --config USE_RRD YES (#2145)
+ * PAM: save floating point nodata in IEEE floating point binary format
+ * Fix division by zero in GDALGetRandomRasterSample (#2429)
+ * GDALOpen: Use EOVERFLOW if defined otherwise use hardcoded likely values (#2437)
+ * Replace implementation of arrays for maintaining the list of opened shared datasets by a CPLHashSet to avoid O(n*n) complexity
+ * Fix GDALRasterBand::IRasterIO fails to read data from dataset when block cache is too small (#2457)
+ * Modify GDALFindAssociatedAuxFile() to only select .aux files that have the same raster configuration as the target dataset (PxLxB).  (#2471).
+ * When available use arbitrary overviews for computations in GDALRasterBand::ComputeRasterMinMax() and GDALRasterBand::GetHistogram().
+ * Fix crash in GDALValidateCreationOptions when passed a creation option not in format key=value (#2499)
+ * Fix 'GDALNoDataMaskBand::IReadBlock doesn't behave correctly when eWrkDT != eDataType' (#2504)
+ * Use nodata masks when generating overviews (#2149)
+ * Improve error propagation when GDALRasterBlock::Write() fails (#2524)
+ * gdalnodatamaskband: add case for uint16 and uint32 as uint32 - fixes neg. nodata values for these
+ * Add a special case for dealing with RasterIO expansion on writes (#773)
+ * Add GDALValidateCreationOptions() checks in GDALDriver::Create() and GDALDriver::CreateCopy(). Can be disabled with GDAL_VALIDATE_CREATION_OPTIONS=NO
+ * Optimization of GDALCopyWords for transfer from buffer of packed bytes to buffer of bytes with interleaving (#2536)
+ * Use BlockBasedRasterIO in GDALDataset::IRasterIO for pixel-interleaved datasets when source and destination have the same size (#2536)
+ * PAM: Allow empty category in .aux.xml  (#2562)
+ * GDALDataTypeUnion(): Add missing GDT_CInt16 case that was triggering a CPLAssert(FALSE) (linked to #2564)
+ * PAM: improve the find existing histogram logic to check approx and out of range
+ * Fix validation of values for creation option parameters of type float
+ * Fix memory leak related to PAM histograms
+ * Restrict dataset sharing to a one thread by tracking owning pid (#2229)
+ * rasterio.cpp: Handle >2GB memory arrays on a 64-bit build (#2199)
+
+Algorithms:
+ * Added GDALPolygonize() function
+ * Added sieve filter
+ * Add implementation of raster hole filler
+ * Added proximity algorithm implementation
+ * Added GDALRasterizeLayers() function to rasterize the all the features in the list of layers rather than individual geometries.
+ * Added support for point geometries rasterization
+ * Added line rasterization routine.
+ * Added GDALCreateGenImgProjTransformer2()
+
+ * warper: massive upgrade that fixes number of problems with Cubic Spline and Lanczos resamplers, multiple performance improvements.
+ * Implement overview building for paletted rasterbands with average resampling by selecting the nearest entry after averaging on R,G,B components (#2408)
+ * Fix destination coordinate system setting logic in GDALReprojectImage (#2231)
+ * Modify GDALChecksum to give it a deterministic behavior when given a GDT_[C]Float[32|64] rasterband with NaN and Inf values. The result is backward compatible with previous implementations with finite values
+ * Add options to RPC transformer, use for RPC_HEIGHT offset
+ * TPS : fix uninitialized variables (#2300), fix wrong behavior with negative coordinates  (#2615)
+ * gdalgeoloc.cpp : Fix crash in GDALCreateGeoLocTransformer if X_DATASET, etc... cannot be opened (#2434)
+ * warper: Prevent crashes when srcAlphaBand and dstAlphaBand are wrong
+ * Fix tiling in gdal_grid and output of geotransform when -txe and -tye not specified (#2508)
+ * warper: Wait for the threads to complete before leaving GDALWarpOperation::ChunkAndWarpMulti() (#2518)
+ * warper: When warping an RGBA image whose borders have alpha=0, avoid writing alpha=255 with bilinear, cubic, cubic spline resampling
+ * warper: Properly set a resample window size for Cubic Spline kernel. (#2414)
+ * gdalsimplewarp.cpp: fix pointer array allocation (#2586)
+
+Utilities:
+ * gdal_lut.py: New for 1.6.0. Sample app applying a greyscale lookup table
+ * gdal_polygonize.py : New for 1.6.0
+ * gdal_proximity.py : New for 1.6.0
+ * gdal_sieve.py: New for 1.6.0
+ * densify.py: New for 1.6.0. A generic Translator class for ogr2ogr-like operations that can be easily overridden for special translation operations
+ * gdalflattenmask : New utility to merge regular data bands with the mask bands, for applications not being able to use the mask band concept. (Not compiled by default)
+ * gdal2ogr: New for 1.6.0. to create an OGR datasource from the values of a GDAL dataset; May be useful to test gdal_grid and generate its input OGR file (Not compiled by default)
+
+ * Fix crash in gdalenhance
+ * Add -nln switch for gdal_contour
+ * gdalgrid: Fixed zero search radius handling in nearest neighbor interpolation method.
+ * gdalgrid: Added support for data metrics (minimum, maximum and range) computation.
+ * gdalgrid: Added spatial filter support applied on the OGR data source
+ * gdalgrid: Added ability to read values from the attribute field using the "-zfield" option.
+ * gdalgrid: fix crash on features with NULL geometry or when no point geometry is found on a layer (#2424)
+ * esri2wkt.py: Fix esri2wkt for NG python bindings (#2548)
+ * Build testepsg utility by default when OGR is enabled (Ticket #2554).
+ * gdaltranslate: new -expand rgb|rgba option to make color table expansion
+ * gdaltindex: Use correct index variable name
+ * gdal2tiles.py: Bug fix: switched axes in BoundingBox of tilemapresource.xml.
+ * gdal2tiles.py: Bug fix: wrong Origin in tilemapresource.xml.
+ * gdal2tiles.py: New version of GDAL2Tiles (SoC 2008 - GDAL2Tiles Improvements)
+ * gdal_retile.py: Some minor enhancement optionally storing the  georeferencing data of created tiles in a csv file
+ * gdal_vrtmerge.py: add support for NODATA
+ * gdalinfo: Don't show RAT if -nomdd is used.
+ * gdalinfo: Display checksums on overviews when -checksum is specified
+ * gdalinfo: Display whether the mask band has overviews
+ * ogr2ogr: reset -gt to 1 with -skipfailures, document -gt (#2409)
+ * ogr2ogr: Output error messages on stderr to be consistent; Make error message about failed reprojection more clearer (hopefully); Advertise the use of -skipfailures in error message (#2588)
+ * nearblack: Add support for scanning from top and bottom as well as from the sides.
+ * Prevent crash in gdalwarpsimple utility and in GDALSimpleImageWarp() when source dataset has no raster band
+ * gdal_rasterize: check that coordinates systems match (Ticket #1937)
+ * gdalwarp: Add cutline support
+
+Various drivers:
+ * Reports GDAL_DCAP_VIRTUALIO=YES for drivers supporting it (#2193)
+ * Add warnings in CreateCopy() methods for drivers not supporting color tables (#1939)
+ * Simplify and harmonize how ESRI world file extensions are handled for BMP, GIF, JPEG, PNG and GTiff drivers (fix #1734)
+ * Windows : enable bigtiff by default when using internal libtiff (#2257)
+ * Added plugin building support for ECW, MrSID, HDF5, NetCDF, FITS and SDE drivers.
+ * fix case of capabilities xml elements to match properly (#2322)
+ * Add ALPHA creation option in the list of creation options
+
+AAIGrid Driver:
+ * Re-fix nodata test when determining AAIGrid data type (Ticket #2107).
+ * fix yllcorner computation (#1794)
+ * mark driver as supporting virtualio.
+ * Fix wrong data type used to read the source band AAIGCreateCopy (#2369)
+ * Add DECIMAL_PRECISION creation option for AAIGRID (#2430)
+
+ADRG driver:
+ * Initialize PAM to avoid creating .aux.xml file when gdalinfo an ADRG dataset
+ * Prevent opening in update mode && fix reading of blocks in creation mode
+ * Prevent error message coming from ADRG driver when trying to open in update mode a non-existing dataset
+ * Avoid error reporting and subsequent failure on some DIGEST files where the last record ends in a non-standard way
+
+BLX Magellan Topo driver:
+ * New for 1.6.0 (#2254 and #2570)
+
+BSB driver:
+ * Add support for alternate palettes via config option
+ * Fix Valgrind warning about read of uninitialized memory; Replace a CPLAssert by a test in case of corrupted dataset; Remove static buffer in BSBReadHeaderLine to improve thread-safety
+ * Update BSB write support to use VSIF*L API (still disabled by default); fix palette handling (last color entry was lost); add GCP/Geotransform writing
+
+COSAR driver:
+ * Initialize integral variables to prevent failure of test condition in case file read operation fails; clean signed/unsigned mismatch warning.
+ * Additional tests to protect against corrupted datasets
+
+DIMAP driver:
+ * Fix use of static CPL buffers
+ * Implement GetFileList() and support for opening directory for DIMAP format
+ * Add metadata at the raster band level by reading the Spectral_Band_Info tag
+
+DODS driver:
+ * Add using namespace libdap for version 3.8.2 (#2404)
+
+DTED driver:
+ * Add the GDAL_DTED_SINGLE_BLOCK config option to make a single block of a whole DTED file. This can speed-up a lot scanline oriented algorithms (#1909)
+ * Add support for DTED products strictly following MIL-D-89020 that was buggy
+ * Fix compilation without CPL
+ * Improve thread safety
+
+ECW driver:
+ * Fix memory leaks (#2210)
+ * Be more careful deciding what geotransforms to ignore (#1935)
+ * Rename ecw plugin gdal_ECW_JP2ECW.so/dll (#2320)
+ * Properly set default nPixelSpace and nLineSpace in ECWRasterBand::IRasterIO().
+ * Added pixel data type checking in ECWCreateCopy() (#2593).
+
+EHDR driver:
+ * Port EHDR driver to large file API (by apetkov) (#2580)
+
+EIR (Erdas Imagine Raw format) driver:
+ * New for 1.6.0
+
+ENVI driver:
+ * fix problems with old/new state plane zone codes (#2227)
+
+ERS driver:
+ * add support for HeaderOffset keyword (#2598)
+
+FAST driver:
+ * Order the GCP in TL, TR, BR, BL order to benefit from the GDALGCPsToGeoTransform optimization
+ * Add support for Euromap FAST datasets for IRS-1C/IRS-1D PAN/LISS3/WIFS (#2329)
+ * Fix USGS projection decoding for EOSAT FAST format Rev C (#2381)
+ * Add support for detection of FAST IRS P6 and CARTOSAT-1 band filenames
+
+FITS driver:
+ * Fix crash in FITS when dataset has metadata; Fix 2 minor Valgrind warnings (#2396)
+ * Fix crash on int32 test case in fits.py for 64-bit GDAL build (#2579)
+
+GeoRaster driver:
+ * New for 1.6.0
+
+GFF driver:
+ * Close file pointer in dataset destructor
+
+GIF driver:
+ * Disable opening of large files which hang GDALOpen() (#2542)
+
+GRASS driver:
+ * Fix obvious memory leaks in GRASS driver (#2537)
+ * fix to use G_free() instead of free() (#1983)
+
+GRIB driver:
+ * Moved from spike to trunk: grib now standard, but support --without-grib option
+
+GSAG driver:
+ * Prevent crash on huge number of rows
+ * Prevent Valgrind warnings on bogus short GSAG files
+ * Major update to correct upside problems, removing Create (#2224, #1616, #2191)
+
+GS7BG driver:
+ * Fixed geotransformation matrix calculation (#2132)
+ * Properly read the header on big-endian system.
+ * Fix bigendian support (#2172)
+
+GTiff driver:
+ * Add support for reading and writing embedded nodata masks of a TIFF file (TIFFTAG_SUBFILETYPE=FILETYPE_MASK)
+ * Added SUBDATASETS support
+ * Add the ability to create files with PHOTOMETRIC=PALETTE.
+ * Add the ability to update palette on existing files (#2421)
+ * Enforce PROFILE properly for Create (#1527)
+ * Add support for reading a CMYK TIFF. By default, it will be opened with the RGBA interface (CMKY->RGBA translation done by libtiff. Said to be *very* crude), unless 'GTIFF_RAW:' is specified before the filename. In that later case, the CMYK bands will be presented. Also add support for translating to a CMYK TIFF too : the source dataset must have CMYK bands. No colorspace translation is done
+ * Internal libtiff : refresh from upstream libtiff
+ * Added GTiffSplitBitmapBand to treat one row 1bit files as scanline blocks (#2622)
+ * Don't use GCS if it is less than 1 (#2183).
+ * Modified so that the RGBA interface is not used for YCbCr mode JPEG compressed data.  Set JPEGCOLORMODE to RGB at the point a directory is read to avoid error report if doing it later during writing.  This fixes the GDAL 1.5.0 issues with writing YCbCr JPEG compressed data (#2189).
+ * Fix memory leak in gt_wkt_srs.cpp
+ * Prevent crash in GTiff driver in case we cannot GDALOpen the newly create-copied file
+ * Fix buffer overflow when calling GTIFDirectoryInfo in GTIFGetOGISDefn (#2372)
+ * add special handling for 24bit data which gets byteswapped by libtiff (#2361)
+ * Replace hard-coded 3 byte increment by iPixelByteSkip in int24 gtiff decoding (#2361)
+ * Cleaunup frmt/gtiff directory by removing unused files. Move TIFF_WriteOverview to gt_overview.cpp. Create gt_overview.h to declare TIFF_WriteOverview and GTIFFBuildOverviewMetadata
+ * Add a ENDIANNESS creation option to GTiff driver for debug purpose mostly
+ * Fix writing of blocks on TIFF files in non-native endianness (#2398)
+ * Push extra bands of pixel interleaved data into block cache (#2435)
+ * Improve integration with PAM metadata loading and saving (#2448)
+ * Fix potential buffer overflow in GTIFAngleStringToDD (committed in upstream libgeotiff) - #2228
+ * Fix GTiffOddBitsBand::IWriteBlock with GDT_UInt16/32; Error properly with GDT_Float32; Support creating files with NBITS>8; Handle NBITS=1 IReadBlock/IWriteBlock in GTiffOddBitsBand; Prevent subtle IReadBlock/IWriteBlock round-tripping bug for NBITS<8 (#2360)
+ * Set the TIFFTAG_COMPRESSION compression before asking the default strip size, so that in the case of JPEG compression, the correct strip height is selected (either 8 or 16). Tested with libtiff-3.8.2 and internal libtiff
+ * Prevent crash on tiff_ovr_9 when JPEG-In-TIFF support is not built
+ * In GTiffDataset::Create(), set TIFFTAG_JPEGCOLORMODE=JPEGCOLORMODE_RGB when creating a TIFF with COMPRESS=JPEG and PHOTOMETRIC=YCBCR; In Crystalize(), backup the value of TIFFTAG_JPEGCOLORMODE and set it again after writing the directory (#2645)
+ * Handle more gracefully the case where we open or create a TIFF file with a compression method not built in libtiff (use of TIFFIsCODECConfigured)
+ * Don't fail when TIFFTAG_JPEGCOLORMODE tag cannot be read
+ * IPP libjpeg compatibility changes (#2606)
+ * ensure zip/jpeg quality is preserved in crystalize. (#2642)
+ * support handling nodata via pam/aux mechanisms (#2505)
+ * ensure TIFFFlush() is called in FlushCache() (#2512)
+ * Replace Crystalize() by SetDirectory() in GTiffDataset::IBuildOverviews() so that 2 consecutive ds.BuildOverviews() calls work without needing to close and reopen the dataset in between
+ * Prevent crash when disk is full
+ * Add detection of big-endian bigtiffs when BIGTIFF_SUPPORT is *NOT* defined
+ * Add missing ScaleAtCenter parameter for Hotine Oblique Mercator when writing the geotiff keys
+ * Added logic to pre-clear geotiff tags when updating a file (#2546)
+ * Add ExtraSample tag in overviews too (#2572)
+ * Fix handling of non-degree angular units (#601)
+
+GXF driver:
+ * Add GXFRasterBand::GetNoDataValue (fix #835)
+ * Avoid crash on bogus GXF file
+
+HDF4 driver:
+ * add support for projected NRL products (#2225)
+ * make a block consist of several scanlines for SDS case to speed up (#2208)
+ * Add H4ST prefix to names of HDF4SubdatasetType enumeration values. (#2296).
+ * Remove useless and dangerous redefinition of sincos in HDF-EOS (#2494)
+ * Added compatibility definitions for HDF 4.2 library (#2609)
+ * Read HDF raster images containing in HDF-EOS datasets (#2656)
+
+HDF5 driver:
+ * Fix minor memory leaks and one incorrect memory usage in HDF5
+ * implement support for 1.8+ hdf library versions (#2297)
+
+HFA driver:
+ * Avoid possible uninitialized variable usage in HFAWriteXFormStack()
+ * Fix BASEDATA count value (preceding pointer) at 1 (#2144)
+ * Incorporate generalization of EPT_f32 reduced precision handling (#1000)
+ * Add missing creation options, fix doc to refer to COMPRESSED instead of COMPRESS (#2167)
+ * remove static buffer to improve thread-safety
+ * Read invalid blocks as nodata value if available.  Create new files with all blocks marked invalid.  Support writing to invalid blocks as long as there is already a pointer to valid data.  (#2427)
+ * add support for writing 1, 2 and 4 bit data (#2436)
+ * Attempt to preserve PROJCS name in sMapInfo.proName, and to capture it as the PROJCS name when reading.  This will hopefully preserve symbolic names like NAD_1983_StatePlane_Ohio_South_FIPS_3402_Feet instead of replacing them with something generic like "Lambert_Conformal_Conic" (#2422).
+ * avoid reducing array sizes if writing them in random order (#2427)
+ * Prevent writing out cached information after the file has been closed.  Loosely related to (#2524).
+ * Error out gracefully and early on attempts to write to readonly file (#2524)
+ * Open the dependent file(s) with same permissions as master (#2425)
+ * Fix crash in HFACompress::compressBlock when compressing random data with m_nDataTypeNumBits >= 16 (#2525)
+ * Fix reading of a non-initialized compressed HFA file (#2523)
+ * Add FORCETOPESTRING, and ensure ProjectionX applied to all bands (#2243)
+ * Added support for unique values color tables (#2419)
+
+HTTP driver:
+ * Fix HTTP driver when falling back to /tmp (#2363)
+
+IDRISI driver:
+ * Force min/max calculation on IWriteBlock
+ * remove conditional from CreateColorRamp() call
+ * Fix #2444 (lat/long) and #2442 (uppercase file extension)
+
+ILWIS driver:
+ * Modified to use VSI*L API for reading and writing.  Modify ReadBlock() so that data written on newly created datasets can still be read back.
+ * Fix memory leaks in ILWIS driver
+ * Avoid writing an ILWIS file to disk when it is a src_dataset. Design of responsible class (IniFile) is simplified, to prevent this from happening unintentionally.
+ * Spend extra effort to find the most compact GDAL data-type for storing the ILWIS data; Added missing ILWIS-system domains to the list; Initialized variables before they are used; Added comments to code.
+ * Solved unwanted rounding in the pixel size, that resulted in wrong map size calculation.
+
+INGR driver:
+ * Support splitting bitonal images into scanline blocks too (#1959)
+ * Fix compilation of INGR driver on big-endian target (#2613)
+
+ISIS3 driver:
+ * fix earth model, already in meters, not kilometers! (#2321)
+ * ensure we adjust first tile offset depending on band (#2573)
+
+ISO8211 driver:
+ * corrections to handle double byte attributes better (#1526)
+ * add a -xml option to 8211dump utility; add a 8211createfromxml utility to generate a ISO8211 file from the output of 8211dump -xml
+ * robustness fixes
+
+JP2KAK driver:
+ * Add VSI*L reading and writing (vsil_target) (#2255)
+ * Remove KAKADU4 related ifdefs, we now assume at least KAKADU 4.2.
+ * disable JPIP - not working with modern Kakadu
+
+JPEG driver:
+ * Added support for reading georeferencing from .tab files. Fixes #682.
+ * Add support for reading images in CMYK and YCbCrK color spaces (#2443)
+ * make sure bHasDoneJpegStartDecompress is set in Reset() (#2535)
+ * Added fill/flush support compatible with IPP libjpeg (#2606)
+
+LCP (FARSITE) driver:
+ * New for 1.6.0
+
+L1B driver:
+ * Added support for NOAA-18(N) and METOP-2 datasets; tiny code refactoring.
+ * L1B : add auto guess of data format when it is 2 spaces or empty string
+ * The GAC GCPs are not tied to the center of pixel.
+ * Serious code rewriting in order to read datasets without archive header
+
+MEM driver:
+ * Avoid failure when doing mem_driver->Create('MEM:::')
+
+MrSID driver:
+ * Use VSI Virtual File API in MRSID DSDK I/O routines. MrSID reading now
+works through the VSI calls as any other GDAL driver.
+ * Added support for MrSID DSDK 7.x (#2410)
+ * Use int 32 types instead of long types for LTI_METADATA_DATATYPE_UINT32 and LTI_METADATA_DATATYPE_SINT32 metadata (#2629)
+
+MSG driver:
+ * Fixes and improvements to enable compilation with GCC 4.x (Ticket #2168).
+
+NDF driver:
+ * Support NDF2 files in other than the current directory (#2274)
+ * Added somewhat improved coordinate system support (#2623)
+
+NetCDF driver:
+ * Handle very large attributes properly (#2196)
+ * NETCDF plugin name doesn't correspond to the loader entry name causes an error in AutoLoadDrivers (#2464)
+ * Fix allocation of panBandZLev (#2582)
+ * Fix accidentally too large memory allocation (#2591)
+ * Do not report char variables as subdataset (#2599)
+ * Fix LAEA projection (#2584)
+
+NITF driver:
+ * Add support for RPB and IMD files
+ * Handle NITF JPEG-compressed image with data mask subheader (IC=M3) multi-blocks (#2364)
+ * Implement SetProjection for NITF (#2095)
+ * Added support for decoding 12 bit images (#2532)
+ * Added support for writing TEXT segments in CreateCopy()
+ * Added support for writing arbitrary user defined TREs
+ * Fix #2249 : shift when writing NITF color table with nColors < 256
+ * Prevent crash with LUT entry count > 256
+ * Disable unnecessary VSIFFlush() calls that slowdown writing on some systems
+ * Apply untested RPC00A remapping (#2040)
+ * Fix #2135 by narrowing workaround test made for #1750
+ * Prevent crash on NITF file without image segment (#2362)
+ * Additional fix for handling 1-bit uncompressed NITF images with NITF_IC=NM  (#1854)
+ * Set IREP=RGB implicitly when the first 3 channels of an image are R,G,B (#2343)
+ * Allocate one extra byte for the NULL terminating character when reading TEXT data in NITF file (#2366)
+ * Fix 'adding BLOCKA TRE precludes writing IGEOLO' (#2475)
+ * Add GDAL_DMD_CREATIONOPTIONLIST for NITF
+ * Prevent crash when using a bad value for TRE creation option
+ * Fallback to pam info for nodata (#2596)
+
+PAUX driver:
+ * Check for either generated spelling of AuxiliaryTarget (#2219)
+
+PCRaster driver:
+ * Add overview support
+ * Added support for CSF version 1. Updated nodata values to be equal to gdal's internal ones.
+
+PDS driver:
+ * Add support for # style comments (#2176)
+ * Improve PDS dataset identification & fixes image segment offset (#2397)
+ * Add LSB_SIGNED_INTEGER
+
+PGCHIP driver:
+ * Many memory leak fixes & cleanups, add an extra parameter '%name=my_name' for handling several rasters in the same table, add support for reading&writing geotransform
+
+PNM driver:
+ * Fix potential buffer overflow in case of bad PNM file
+ * Fix logical tests in PNM Identify (bug #2190)
+
+RAW drivers:
+ * manage RawRasterBand NODATA values at PAM level
+ * RawRasterBand : add extra parameter bOwnsFP to enable the RawRasterBand to take ownership of the fpRaw so as to close it properly in its destructor
+ * Fix crash in rawdataset.cpp with pixeloffset=0 (#2576)
+
+RMF driver:
+ * Do not forget to swap block size/offset table on big-endian archs. (#2169)
+ * Added support for reading and writing extended header..
+ * RMF driver can crash / corrupt stack when importing projection from Panorama (#2277)
+ * Fixed error checking code returned by color table read function.
+ * Added support for reading big endian variant of the RSW files.
+ * Report units and dataset statistics (#2670)
+
+RPFTOC driver:
+ * Enable external overview building on RPFTOC subdatasets
+ * Use new proxy API instead of RPFTOCGDALDatasetCache
+ * Initialize PAM for RPFTocDataset
+ * Implement GetFileList() for RPFTOCDataset and RPFTOCSubDataset
+
+RS2 driver:
+ * Added projection reading
+ * Updates to RADARSAT-2 driver to account for tiled GeoTIFF images.
+ * Capture all files for GetFileList().
+ * Support selecting directory as well as product.xml to open the dataset.
+ * Various other enhancements
+
+SDTS driver:
+ * Prevent infinite recursion in SDTSRasterReader::GetBlock when CEL0 file is truncated
+ * SDTS DEM : Read metadata in the IDEN file
+
+SGI driver:
+ * Implemented SGI write support (always RLE)
+ * Fix SGI driver that misidentified SRTMHGT files as SGI files (#2289)
+
+Terragen Driver:
+ * Fix overflow in implicit constant conversion (#2119)
+
+Terralib driver:
+ * New for 1.6.0
+
+TSX driver:
+ * Added support to extract GCPs from XML metadata for TerraSAR-X SSC products.
+ * Provide an error message if the sceneInfo tag cannot be found in the TerraSAR-X image metadata.
+ * Fix lat/long inversion (whoops, #2565); expose additional metadata items
+
+USGSDEM driver:
+ * mark NTS and INTERNALNAME as legal options
+ * make parser more permissive (#2348)
+ * add missing ZRESOLUTION creation option in GDAL_DMD_CREATIONOPTIONLIST
+ * USGSDEM: add precisions to creation options documentation; check that source dataset dimensions are at least 2x2 for CreateCopy()
+ * USGSDEM: fix USGSDEMDecToPackedDMS when input is very close to an integer degree value
+
+VRT driver:
+ * Use VSIF Large API in VRTDataset::Open to fix #1070
+ * recover from failure to create transformer (#2240)
+ * Added LUT based transformation support to the VRTComplexSource
+ * Extend the output of <SimpleSource> in a forward and backward compatible way, and make use of GDALProxyPoolDataset when possible
+ * Add the <ColorTableComponent> element to <ComplexSource> to do color table expansion in the VRT
+ * Fix failure when attempting to read a warped VRT made from a 3-band dataset with -dstalpha option (#2502)
+ * In VRTDerivedRasterBand::IRasterIO() don't call RasterIO() on sources with 0,0 for nPixelSpace and nLineSpace as most sources, except VRTSimpleSource, don't translate them.
+ * Allow empty category in VRT rasterband (#2562)
+ * Use nodata in VRTKernelFilteredSource::FilterData (#1739)
+ * Fix VRT average resampling when resampling factor > 100% (#1725)
+
+WCS driver:
+ * Improvements to identify Band field name
+ * More fiddling with GetCoverage() bounding boxes.  Avoid half pixel bounding box shift south east.  When using GridOffset/GridStep values expand the bounding box out by 1% of a pixel to avoid "on edge" rounding issues.
+ * Strip namespaces off DescribeCoverage response (early), and add a bug
+workaround for GeoServer WCS 1.1 responses.
+ * Correct wcs 1.1 band identification logic
+ * URL encode format and coverage name.  Improve error recognition.
+ * GridOffset should be top left corner of pixel center oriented bounds
+
+WMS driver:
+ * Add ClampRequests setting (#2450)
+ * Fix WMS driver to make it work when ReadBlockFromFile() must deal with blocks already in block-cache but that are not the band to fill (#2647)
+ * Add a <Timeout> option (#2646)
+
+XPM driver:
+ * Prevent crash when opening an XPM file with large file API
+
+
+## OGR 1.6.0 - Overview of Changes
+
+General:
+  * RFC 21: OGR SQL type cast and field name alias (#2171)
+  * Added support for outline color in OGRStyleLabel (#2480)
+  * Added support for symbol outline color in OGR Style Strings (#2509)
+  * Added geometry type merger
+  * Added SetEquirectangular2()
+  * Added SetLinearUnitsAndUpdateParameters() to C API
+  * Add support to translate OGRPolygon to OGRMultiLineString
+  * Add a segmentize() method to OGRGeometry to modify the geometry such it has no segment longer then the given distance; add a -segmentize option to ogr2ogr
+  * Many performance fixes in OGRGeometryFactory::organizePolygons (#1217, #2428, #2589)
+  * Changed OGRFeature::GetStyleString() to return the value of the OGR_STYLE field if no style string have been specified.
+  * Ensure OpenShared sharing is only with same thread (#2229)
+  * ogrfeaturestyle : OGRSTBrushAngle parameter should not be georeferenced.
+  * Strip whitespaces at the start and end of parsed pairs of style elements in OGRStyleTool::Parse(). As per #1413.
+  * Remove empty linestrings from multilinestring objects
+  * Allow 'POINT EMPTY' in WKT (bug #1628)
+  * Fix OGRGeometryCollection::getCoordinateDimension() (#2334)
+  * Make OGRLineString::importFromWkb and OGRPolygon::importFromWkb with EMPTY geometries
+  * Implement IsEmpty() for all geometries without using GEOS (for speed purpose, and also because GEOS 2.2.3 is buggy with multipolygons with empty polygon inside); Make exportToWkt() export a valid WKT when multipoints/linestrings/polygons have an empty geometry inside
+  * Reintroduce OFTWideString and OFTWideStringList but mark them as deprecated (#2359).
+  * Fixed segmentation fault in swq_select_finish_summarize when SQL query issued on layer without any attributes like empty shapefile (Ticket #2358).
+  * Fix crash in OGRDataSource::ExecuteSQL with an empty SQL query (#2386)
+  * Make OGRLayer::FilterGeometry more restrictive in the geometries it selects (#2454)
+  * OGRStyleVector class and related stuff has been removed (#2070).
+
+  * Fixed OGR SQL to properly escape single quotes in string literals (Ticket #2220).
+  * Prevent an OGR driver from being registered several times (#2544)
+
+Utilities:
+ * Start on a dissolve utility based on ogr2ogr
+ * Add --version and --licence options for OGR CLI utilities
+
+OGRSpatialReference:
+ * RFC 20: Axes methods
+ * Upgrade to EPSG 6.17
+ * Added support for "International Map of the World Polyconic" and "Wagner I-VII" projections.
+ * Add EquidistantCylindricalSphere and GaussLabordeReunion (#2134)
+ * Fix exportToProj() translation for OSGB36 (#2160)
+ * ogr_srs_panorama.cpp : Fixed search in ellipsoid list
+ * ogr_srs_pci.cpp : List of ellipsoids updated
+ * Treat spherical mercator 1SP similarly to normal mercator 1sp (proj #9).
+ * Ensure Clear() clears the bNormInfoSet flag and use Clear() from the various import methods to wipe old state (#2533).
+ * add import/export for MITAB CoordSys
+ * Added declarations for OSRImportFromMICoordSys()/OSRExportToMICoordSys(); make OSRImportFromPanorama()/OSRExportToPanorama() externally visible again.
+ * Ensure rectified_grid_angle gets stripped for HOM projections (#2575)
+ * ogr_srs_esri.cpp: Correct test of iRGAChild (#2575).
+ * Recent EPSG releases seem to use PolarLongOrigin instead of ProjCenterLong for the Krovak projection parameters.  Handle either (#2559).
+ * Test that input pointer is not NULL in OGRSpatialReference::importFromWkt().
+
+AVC driver:
+ * Make AVCE00 a distinct driver
+ * Update from AVCE00 master, includes the fixes for #2495 (GCC warnings)
+ * Detect compressed E00 input files and refuse to open them instead of crashing (#2513)
+ * Avoid scanning the whole E00 input file in AVCE00ReadOpenE00() if the file does not start with an EXP line (#1989)
+
+BNA driver:
+ * Fix crash when trying to write features with empty geometries
+ * Add support for Unix End-Of-Line characters on Windows
+
+CSV driver:
+ * Add support for writing the geometry of features through the new GEOMETRY layer creation option
+ * Allow to define field width via .csvt text file (bug #2142)
+ * Handle more gracefully CSV files with an empty column title (#2538)
+
+DGN driver:
+ * add some experimental linkage testing
+
+DODS driver:
+ * add using namespace libdap for version 3.8.2 (#2404)
+
+Geoconcept Export driver:
+ * New for 1.6.0
+
+GeoJSON driver:
+ * Fixed GeoJSON driver crash when writing features with null geometry (#2212)
+ * GeoJSON: enabled read/write of 25D geometry types.
+ * Improved GeoJSON driver to gracefully handle JSON strings that do not encode GeoJSON content.
+ * Support GeoJSON 1.0 Spec CRS 'link' and 'name' members. (#2665)
+
+GPX driver:
+ * XML Datetime can be expressed without explicit timezone mention
+ * <extensions> is valid inside <rtept> and <trkpt> too
+ * Add support for GPX 1.0 reading
+ * Handle degenerate and NULL geometries in creation mode
+ * Remove noisy CPL_DEBUG message when GPX driver built without Expat and when the input file doesn't look like GPX (#2394)
+ * Prevent GPX and KML drivers to read too much of a non GPX/KML file (#2395)
+ * GPX writer: Remove leading spaces for a numeric field (#2638)
+
+GML driver:
+ * Support reading GML 3 posList geometry (#2311)
+ * Add logic to potentially track geometry type (mostly for NAS just now)
+ * Fix #2141 : GML driver recognizes improperly strings as integers
+ * Do geometry element name test (IsGeometryElement) case sensitive to avoid false positives on property names, and such (#2215).
+ * Fix memory bug in OGRGMLLayer::GetNextFeature() when using attribute filter (#2349)
+
+GMT driver :
+ * Remove spaces from numeric field values before writing to avoid unnecessary quoting.
+
+GRASS driver:
+ * Call Vect_close() in the OGR GRASS driver (#2537)
+
+INGRES driver:
+ * New for 1.6.0
+
+Interlis 1 driver:
+ * Support for SURFACE polygons spread over multiple OBJECTs Polygonize on demand. Generation of area layer
+ * Fix a crash (#2201)
+ * Fix memory leaks & apps/test_ogrsf correctness in OGRILI1 (#2203)
+ * Prevent crash in OGRILI1DataSource::Open with an empty string (#2335)
+ * Fixed column order detection for some Interlis 1 models (#2595)
+
+Interlis 2 driver:
+ * Fix memory usage and leaks in OGRILI2 (bug #2203)
+ * Fix logic to detect ILI2 datasets (#2516)
+
+KML driver:
+ * Updated KML write driver to support KML v2.2.
+ * Added support for "SchemaData" - typed KML fields that maintain feature data.
+ * Support of date types, written out as strings (#2264)
+ * Added automatic coordinate system transformation to WGS84 (the only CS that KML recognizes). (#2271)
+ * Report XML parsing error in KML driver in a similar way it's done in the GPX driver
+ * Speedup detection of KML documents
+ * Use VSI Large File API
+ * Corrected case on schemaUrl attribute and added the id attribute to the schema element. (#1897)
+
+MITAB driver:
+ * Upgraded to current dev version of MITAB - includes a number of TAB StyleString improvements
+ * Support font point outline color
+
+MySQL Driver:
+ * Fix memory leaks in MySQL driver
+ * Fix crash with very long WHERE clause in MySQL driver
+ * Use assignSpatialReference for read features
+ * Fix SRS cache in FetchSRS()
+ * MYSQL: Add backquotes around table and column names to enable the use of reserved keywords (#2315)
+ * Fix reporting of capabilities for OGRMySQLResultLayer
+ * return proper results for various writing capabilities (#2184)
+
+NTF driver:
+ * Update for new meridian and strategi products (#2600)
+
+OCI driver:
+ * Fixed memory leaks in OCI driver reported by Linda Thompson (#2120)
+ * Support for OCI + VRT to access non spatial data (#2202)
+ * Prevent from calling CPLError when SDO_GEOMETRY is missing (non spatial) (#2202)
+ * Added support for fields of type DATE and TIMESTAMP [WITH [LOCAL] TIME ZONE] as OFTDate and OFTDateTime.
+ * An extra space is needed for the decimal separator when retrieving the numeric fields (#2350)
+ * Improved OCI driver to query spatial extent of layer using SDO_GEOM_METADATA for better performance (Ticket #543).
+ * OCI: Filter out MDSYS.CS_SRS entries with NULL value of WKTEXT.
+ * add compound and stroked-arc read support
+
+PG (Postgres/PostGIS) Driver:
+ * Add the ability to specify a list of tables to be treated as layers with the 'tables=' connection string option (#1699)
+ * Add SPATIAL_INDEX creation option to create GIST index. Turned ON by default (#959)
+ * Add support for listing and correctly fetching geometry type of inherited spatial tables (#2558)
+ * Add support for Postgis tables with multiple geometry columns (#1476)
+ * Fixes to Postgres binary cursor mode and improvement/fixes to data types handling (#2312)
+ * Implement efficient GetFeatureCount, SetSpatialFilter and GetExtent for OGRPGResultLayer
+ * Apply spatial filter in OGRPGDataSource::ExecuteSQL()
+ * Make binary cursor work with non-PostGIS geometry column
+ * Fix memory leaks
+ * Fix write outside of allocated buffer in OGR PG driver (#2303)
+ * Use assignSpatialReference for read features
+ * Fix geometry filter when there is no PostGIS geometry column
+ * Fix getting the PK of a table with PostgreSQL <= 7.3; Fix CreateFeatureViaCopy when geometry column is not PostGIS geometry
+ * Use the 'auth_srid' to avoid mismatches between OGR and PostGIS WKTs of EPSG codes (#2123)
+ * Fix reporting of capabilities and handling of spatial and attribute filters by OGRPGResultLayer
+ * Add PG_USE_POSTGIS to be able to disable PostGIS for debug purpose
+ * Re-enable PQsetClientEncoding but set it to UNICODE now that the driver advertises OLCStringsAsUTF8
+ * Replace use of risky sprintf by CPLString to avoid potential buffer overflows
+ * In non PostGIS mode, skip tables of schema 'information_schema'
+ * Allow VACUUM through ExecuteSQL() without a transaction (#2619).
+
+PGEO driver:
+ * correct testcapability results (#2601)
+ * treat type 50 geometry as SHPT_ARC (#1484)
+
+SDE driver:
+ * Versioned editing/write support for SDE.
+
+SQLite driver:
+ * Added support for geometry_columns, and WKB support
+ * Added preliminary FGF to geometry support
+ * Added spatial_ref_sys support
+ * Added preliminary support for spatialite geometries
+
+SHAPE driver:
+ * CreateField() now works on populated layers (#2672)
+ * Cleanup to remove unused old classification code for multipolygons (#2174)
+ * Fix error class in VSI_SHP_Error (#2177)
+ * Fix crash with polygon with nParts == 0
+ * Change SHAPE driver to return a NULL geometry instead of an empty OGRMultiPoint, OGRMultiLineString and OGRMultiPolygon (bug #2217)
+ * Fix crashes on corrupted geometries (#2218 and #2610)
+ * Fix crash when dealing with unhandled field types in shape driver, in DEBUG mode (#2309)
+ * Add case for wkbMultiLineString and 25D in OGRShapeLayer::CreateFeature
+ * Make SHPWriteOGRObject write a SHPT_NULL object for empty geometries and handle correctly multigeometries with empty geometries inside
+ * Make sure field type set to OFTDate when OFTDataTime requested (#2474)
+ * Implement OGRShapeDataSource::DeleteLayer() (#2561)
+
+S57 driver:
+ * Ensure SOUNDG in multipoint form is MultiPoint25D not 2D.
+ * Print out contents of OGR_S57_OPTIONS environment variable if set (for debug
+purposes).
+ * Correct control for applying updates, now done in Ingest method.
+
+VRT driver:
+ * carry style string through VRT layer
+ * Pass the envelope of the geometry as the spatial filter in the sub-query (#2214)
+ * Add "shared" attribute on SrcDataSource to control sharing.  Default to OFF for SrcLayer layers, and ON for SrcSQL layers.  This endeavors to avoid conflicts of layer state. (#2229)
+
+XPlane/Flightgear driver:
+ * New for 1.6.0
+
+
+
+## SWIG Language Bindings
+
+SWIG General :
+ * Added GetHistogram
+ * Added SetLinearUnitsAndUpdateParameters
+ * Added GetSubDatasets method on Dataset
+ * Added SetEquirectangular2
+ * Cast returned value to OGRDriverShadow in GetDriver method instead of OGRLayerShadow
+ * Make it possible to skip adding the inline C functions into the wrapper
+ * Fix SWIG ReadRaster_internal and DSReadRaster_internal may crash (#2140)
+ * Modify GeneralCmdLineProcessor() to recognise that a <= 0 return result is special and means NULL should be returned indicating a need to terminate the calling application.
+ * Added SetMetadataItem/GetMetadataItem
+ * Added gdaltransformer wrapper for RFC 22
+ * implement the BuildFromEdges function #2380
+ * Added ComputeProximity
+ * Added GDALRegenerateOverviews
+ * Added GetFileList
+ * Added GRA_Lanczos
+ * Added gdal.Polygonize()
+ * expose GDALDestroyDriverManager() to improve leak detection
+ * Added RasterizeLayer() and SieveFilter()
+ * If we receive an odd array type in BandWriteArray(), cast the array to float64 which we do support (#2285).
+
+SWIG C# related changes:
+ * Implement GDALProgressFunc callback for C# (fix for #2122)
+ * Fixed that passing null as the options parameter of Driver.CreateCopy causes access violation (#2185).
+ * Added GDALCreateCopy sample application
+ * Support for signing the GDAL C# assemblies (#2186)
+ * Added raster specific tests
+ * Reworked the wrapper implementation
+ * Added the bandMap parameter to the C# Dataset.ReadRaster and Dataset.WriteRaster API.
+ * Added a C# sample to demonstrate the GDALDatasetRasterIO operations.
+ * Added Band.GetHistogram to the C# bindings
+ * Sample application for Band.GetHistogram.
+ * Added the GDALAdjustContrast sample to demonstrate the image correction at the C# side.
+ * Added Dataset.GetGCPs, Dataset.SetGCPs and GCPsToGeoTransform in the C# bindings (bugs #2426, #1986 and #1677
+ * Added support for using OGR.Layer in Gdal.Polygonize
+ * Changed the behavior to use OSR.SpatialReference and OSR.CoordinateTransformation instead of defining the same classes in the OGR namespace
+ * Changed the scope from internal to public of the required functions
+
+SWIG Python related changes:
+ * Fix layer __getitem__ bug (#2187)
+ * add some sugar to ogr.DataSource.DeleteLayer to be able to take in either an index or a layer name.  If you give it a name, it *will* loop through all of the layers on the datasource.  This might be expensive depending on the driver.
+ * add date/time fetching support to the generic GetField implementation... note this is not real 'datetime' support yet
+ * a typemap for taking in lists of GDAL objects #2458
+ * don't always return 0 for OGRErrs #2498
+ * Added GetDefaultHistogram() with Python implementation
+ * support for mingw Windows builds
+ * Link with gdal_i.lib instead of gdal.lib when building with MSVC compiler. (#2578)
+
+SWIG Perl
+ * Added a more verbose description to the error message if projection method test fails. Skip testing parameters of International Map of the World projection since it fails (a bug?).
+ * driver's create method's 2nd parameter, if given, is a listref
+ * Support Cygwin by adding -lstdc++ to LIBS if OS is cygwin
+ * Add GetDriver method as an alias to _GetDriver for DataSource. This fixes an unnoticed side-effect of rewrapping GetDriver for root class OGR.
+ * force name to be a string for _GetLayerByName and make default for name 0
+ * fix Layer::Schema
+ * use perl hash also for fields in schema (the new API was not really implemented), add Schema method also for Feature
+ * croak in Geometry::create unless type, wkt, wkb, or gml given
+ * do not call UseExceptions when booting OGR wrappers since it is only done once when booting GDAL (of which OGR is a part), do not include inline functions from cpl_exceptions.i into OGR wrappers
+ * add exception support as for OGR
+ * use geometry factory methods in Geometry::create; accept also only coordinate parameters (i.e. auto-add 0 if needed) in Point method for Point type
+ * Add wrappers for field types datetime and lists. Do not use the overloaded (field name) versions of the get/set functions.
+ * GetField and SetField methods, which check for goodness of the field (name, index) and support dates, times, datetimes, and lists. In Row and Tuple the field value may be a listref.
+ * Support HEXWKB in Geo::OGR::Geometry::create.
+ * As* methods for Geometry as aliases for ExportTo; SpatialReference->create constructor
+ * made needed links from parameters to typemaps to make Get- and SetDefaultHistogram methods work in Perl
+ * support for mingw Windows builds
+
+SWIG Java:
+ * removed colortable from java bindings for now (#2231)
+
+# GDAL/OGR 1.5.0
+
+## GDAL/OGR 1.5.0 - General Changes
+
+Build:
+ * CFG environment variable now ignored.  Instead set CFLAGS and CXXFLAGS
+   environment variables to desired compilation options, or use --enable-debug
+   for a debug build.  Default is "-g -O2" like most other packages.
+ * Added --with-hide-internal-symbols to restrict exported API from .so files
+   to be the GDAL public API (as marked with CPL_DLL).
+
+Other:
+ * OGR and GDAL C APIs now generally check for NULL objects and recover
+   with an error report instead of crashing.
+
+
+## GDAL 1.5.0 - Overview of Changes
+
+Core:
+ * Enable Persistent Auxiliary Metadata (.aux.xml) by default.
+ * Support for "pam proxies" for files in read-only locations.
+ * Create and !CreateCopy pre-Delete output existing dataset.
+ * Added Identify() method on drivers (per RFC 11: Fast Format Identify)
+ * Implement !GetFileList() on datasets (per RFC 12).
+ * Implement Delete(), Rename(), Copy() based on !GetFileList() (per RFC 12).
+ * vrtdataset.h, memdataset.h and rawdataset.h are now considered part of
+   the public GDAL API, and will be installed along with gdal.h, etc.
+ * Support nodata/validity masks per RFC 14: Band Masks.
+ * Plugin drivers test for ABI compatibility at load time.
+ * Creation flags can now be validated (this is used by gdal_translate)
+ * Default block cache size changed to 40MB from 10MB.
+
+Algorithms / Utilities:
+ * gdal_grid: New utility to interpolate point data to a grid.
+ * gdal2tiles.py is new for 1.5.0.
+ * gdaltransform: stdin/stdout point transformer similar to PROJ.4 cs2cs.
+ * gdalwarp: Several fixes related to destination "nodata" handling and
+   nodata mixing in resampling kernels.
+ * gdalwarp: Added Lanczos Windows Sinc resampling.
+ * gdal_rasterize: added -i flag to rasterize all areas outside geometry.
+ * gdalenhance: new utility for applying histogram equalization enhancements.
+ * gdalmanage: Utility for managing datasets (identify, delete, copy, rename)
+ * nearblack: Utility for fixing lossy compressed nodata collars.
+
+Intergraph Raster Driver:
+ * New for 1.5.0.
+
+COSAR (TerraSAR-X) Driver:
+ * New for 1.5.0.
+ * SAR Format.
+
+COASP Driver:
+ * New for 1.5.0
+ * SAR format produced by DRDC CASP SAR Processor.
+
+GFF Driver:
+ * New for 1.5.0
+
+GENBIN (Generic Binary) Driver:
+ * New for 1.5.0.
+
+ISIS3 Driver:
+ * New for 1.5.0.
+ * Also PDS and ISIS2 driver improved substantially and all moved to frmts/pds
+
+WMS Driver:
+ * New for 1.5.0.
+
+SDE Raster Driver:
+ * New for 1.5.0.
+
+SRTMHGT Driver:
+ * New for 1.5.0.
+
+PALSAR Driver:
+ * New for 1.5.0.
+ * SAR format.
+
+ERS Driver:
+ * New for 1.5.0.
+ * ERMapper ASCII Header
+
+HTTP Driver:
+ * New for 1.5.0.
+ * Fetches file by http and then GDALOpen()s.
+
+GSG Driver:
+ * New for 1.5.0.
+ * Golden Software Surfer Grid.
+
+GS7 Driver:
+ * New for 1.5.0.
+ * Golden Software Surfer 7 Binary Grid.
+
+Spot DIMAP Driver:
+ * New for 1.5.0.
+
+RPFTOC Driver:
+ * New for 1.5.0.
+
+ADRG Driver:
+ * New for 1.5.0.
+
+NITF Driver:
+ * Added support for writing JPEG compressed (IC=C3).
+ * Added support for reading text segments and TREs as metadata.
+ * Added support for 1bit images.
+ * Added support for GeoSDE TRE for georeferencing.
+ * Support PAM for subdatasets.
+ * Improved NSIF support.
+ * Support C1 (FAX3) compression.
+ * Improved CADRG support (#913, #1750, #1751, #1754)
+
+ENVI Driver:
+ * Many improvements, particularly to coordinate system handling and metadata.
+
+JP2KAK (Kakadu JPEG2000) Driver:
+ * Now builds with libtool enabled.
+
+GTIFF (GeoTIFF) Driver:
+ * Now supports BigTIFF (read and write) with libtiff4 (internal copy ok).
+ * Upgraded to include libtiff 4.0 (alpha2) as the internal option.
+ * Support AVERAGE_BIT2GRAYSCALE overviews.
+ * Produce pixel interleaved files instead of band interleaved by default.
+ * Support TIFF files with odd numbers of bits (1-8, 11, etc).
+ * Add ZLEVEL creation option to specify level of compression for DEFLATE method
+
+GIF Driver:
+ * Nodata/transparency support added.
+
+JPEG Driver:
+ * Support in-file masks.
+
+AIGrid Driver:
+ * Supports reading associated info table as a Raster Attribute Table.
+
+HFA Driver:
+ * Support MapInformation/xform nodes for read and write.
+ * Support AVERAGE_BIT2GRAYSCALE overviews.
+ * Support Signed Byte pixel type.
+ * Support 1/2/4 bit pixel types.
+ * Support PE_STRING coordinate system definitions.
+ * Support nodata values (#1567)
+
+WCS Driver:
+ * Support WCS 1.1.0
+
+DTED Driver:
+ * Can now perform checksum verification.
+ * Better datum detection.
+
+HDF4 Driver:
+ * Support PAM for subdatasets.
+
+Leveller Driver:
+ * Added write support.
+ * Added v7 (Leveller 2.6) support.
+
+## OGR 1.5.0 - Overview of Changes
+
+General:
+ * Plugin drivers test for ABI compatibility at load time.
+ * SFCOM/OLEDB stuff all removed (moved to /spike in subversion).
+ * Various thread safety improvements made.
+ * Added PointOnSurface implementation for OGRPolygon.
+ * Added C API interface to OGR Feature Style classes (RFC 18).
+
+Utilities:
+ * All moved to gdal/apps.
+
+OGRSpatialReference:
+ * Supports URL SRS type.
+ * Upgraded to EPSG 6.13.
+ * Operating much better in odd numeric locales.
+
+BNA Driver:
+ * New for 1.5.0.
+
+GPX Driver:
+ * New for 1.5.0.
+
+GeoJSON Driver:
+ * New for 1.5.0.
+
+GMT ASCII Driver:
+ * New for 1.5.0.
+
+KML Driver:
+ * Preliminary read support added.
+
+DXF / DWG Driver:
+ * Removed due to licensing issues with some of the source code.  Still
+   available in subversion from under /spike if needed.
+
+PG (Postgres/PostGIS) Driver:
+ * Added support for recognising primary keys other than OGR_FID to use as FID.
+ * Improved schema support.
+ * Performance improvements related to enabling SEQSCAN and large cursor pages
+
+Shapefile Driver:
+ * Do not keep .shx open in read only mode (better file handle management).
+ * Use GEOS to classify rings into polygons with holes and multipolygons if it is available.
+ * Support dbf files larger than 2GB.
+
+MySQL Driver:
+ * Added support for BLOB fields.
+
+MITAB (MapInfo) Driver:
+ * Upgraded to MITAB 1.6.4.
+
+Interlis Drivers:
+ * Support datasources without imported Interlis TID
+ * Remove ili2c.jar (available from http://home.gdal.org/dl/ili2c.jar
+ * Support for inner rings in Surface geometries.
+ * Support spatial and attribute filters.
+
+## SWIG Language Bindings
+
+ * The "Next Generation" Python SWIG bindings are now the default.
+ * Python utility and sample scripts migrated to swig/python/scripts and
+   swig/python/samples.
+ * Added Raster Attribute Tables to swig bindings.
+ * Added Geometry.ExportToKML
+ * Added CreateGeometryFromJson
+ * Added Geometry.ExportToJson
+
+SWIG C# related changes:
+ * Support for the enumerated types of the C# interface
+ * C# namespace names and module names follows the .NET framework naming guidelines
+ * Changed the names of the Windows builds for a better match with the GNU/Linux/OSX builds
+ * The gdalconst assembly is now deprecated
+ * GDAL C# libtool build support
+ * !CreateFromWkb support
+ * Dataset.!ReadRaster, Dataset.!WriteRaster support
+ * Added support for Dataset.!BuildOverviews
+ * More examples added
+
+SWIG Python related changes:
+ * Progress function callback support added.  You can use a Python function, or the standard GDALTermProgress variant
+ * Sugar, sweet, sweet sugar.
+    * ogr.Feature.geometry()
+    * ogr.Feature.items()
+    * ogr.Feature.keys()
+ * doxygen-generated docstrings for ogr.py
+ * geometry pickling
+ * setuptools support
+ * !PyPi http://pypi.python.org/pypi/GDAL/
+ * setup.cfg for configuring major significant items (libs, includes, location of gdal-config0
+ * support building the bindings from *outside* the GDAL source tree
+
+SWIG Java:
+ * SWIG Java bindings are orphaned and believed to be broken at this time.
+
+
+# GDAL/OGR 1.4.0 - General Changes
+
+Perl Bindings:
+ - Added doxygen based documentation.
+
+NG Python Bindings:
+ - Implemented numpy support.
+
+CSharp Bindings:
+ - Now mostly operational.
+
+WinCE Porting:
+ - CPL
+ - base OGR, OSR and mitab and shape drivers.
+ - GDAL, including GeoTIFF, DTED, AAIGrid drivers
+ - Added test suite (gdalautotest/cpp)
+
+Mac OSX Port:
+ - Added framework support (--with-macosx-framework)
+
+## GDAL 1.4.0 - Overview Of Changes
+
+WCS Driver:
+ - New
+
+PDS (Planetary Data Set) Driver:
+ - New
+
+ISIS (Mars Qubes) Driver:
+ - New
+
+HFA (.img) Driver:
+ - Support reading ProjectionX PE strings.
+ - Support producing .aux files with statistics.
+ - Fix serious bugs with u1, u2 and u4 compressed data.
+
+NITF Driver:
+ - Added BLOCKA reading support.
+ - Added ICORDS='D'
+ - Added jpeg compression support (readonly)
+ - Support multiple images as subdatasets.
+ - Support CGM data (as metadata)
+
+AIGrid Driver:
+ - Use VSI*L API (large files, in memory, etc)
+ - Support upper case filenames.
+ - Support .clr file above coverage.
+
+HDF4 Driver:
+ - Added support for access to geolocation arrays (see RFC 4).
+ - External raw raster bands supported.
+
+PCIDSK (.pix) Driver:
+ - Support METER/FEET as LOCAL_CS.
+ - Fix serious byte swapping error on creation.
+
+BMP Driver:
+ - Various fixes, including 16bit combinations, and non-intel byte swapping.
+
+GeoTIFF Driver:
+ - Fixed in place update for LZW and Deflated compressed images.
+
+JP2KAK (JPEG2000) Driver:
+ - Added support for reading and writing gmljp2 headers.
+ - Read xml boxes as metadata.
+ - Accelerate YCbCr handling.
+
+JP2MrSID (JPEG2000) Driver:
+ - Added support for reading gmljp2 headers.
+
+EHDR (ESRI BIL) Driver:
+ - Support 1-7 bit data.
+ - Added statistics support.
+
+## OGR 1.4.0 - Overview of Changes
+
+OGR SQL:
+ - RFC 6: Added support for SQL/attribute filter access to geometry, and
+   style strings.
+
+OGRSpatialReference:
+ - Support for OGC SRS URNs.
+ - Support for +wktext/EXTENSION stuff for preserving PROJ.4 string in WKT.
+ - Added Two Point Equidistant projection.
+ - Added Krovak projection.
+ - Updated support files to EPSG 6.11.
+
+OGRCoordinateTransformation:
+ - Support source and destination longitude wrapping control.
+
+OGRFeatureStyle:
+ - Various extensions and improvements.
+
+INFORMIX Driver:
+ - New
+
+KML Driver:
+ - New (write only)
+
+E00 Driver:
+ - New (read only)
+ - Polygon (PAL) likely not working properly.
+
+Postgres/PostGIS Driver:
+ - Updated to support new EWKB results (PostGIS 1.1?)
+ - Fixed serious bug with writing SRSes.
+ - Added schema support.
+
+GML Driver:
+ - Strip namespaces off field names.
+ - Handle very large geometries gracefully.
+
+ODBC Driver:
+ - Added support for spatial_ref_sys table.
+
+SDE Driver:
+ - Added logic to speed things up while actually detecting layer geometry types
+
+PGeo Driver:
+ - Added support for MDB Tools ODBC driver on linux/unix.
+
+VRT Driver:
+ - Added useSpatialSubquery support.
+
+
+# GDAL/OGR 1.3.2 - General Changes
+
+WinCE Porting:
+ - Support for MS WinCE new for this release.
+
+Java SWIG Bindings:
+ - Preliminary support implemented.
+
+
+## GDAL 1.3.2 - Overview of Changes
+
+Locale:
+ - Force numeric locale to "C" at a few strategic points.
+
+Idrisi Driver:
+ - New for 1.3.2.
+ - Includes reading and writing.
+ - Limited coordinate system support.
+
+DIPEx Driver:
+ - New for GDAL 1.3.2 (related to ELAS format).
+
+Leveller Driver:
+ - New for GDAL 1.3.2.
+
+NetCDF Driver:
+ - Improved autoidentification of x, y dimensions.
+ - Improved CF support.
+
+JPEG2000 (JasPer) Driver:
+ - Use GDALJP2Metadata to support various kinds of georeferencing.
+
+JPEG2000 (JP2KAK) Driver:
+ - Support writing tiles outputs so that very large images can be written.
+
+GeoTIFF Driver:
+ - Report error when attempting to create >4GB uncompressed file.
+ - Updated to latest libtiff, now supports "old jpeg" fairly well.
+ - Improved support for subsampled YCbCr images.
+
+Imagine (HFA) Driver:
+ - Support reading affine polynomial transforms as geotransform.
+ - Support overviews of different type than base band.
+ - Support reading RDO style "nodata" indicator.
+
+PCI Aux Driver:
+ - Support projections requiring parameters.
+
+MrSID Driver;
+ - Fixed problem with writing files other than 1 or 3 bands.
+ - Support ESDK 6.x.
+
+BMP Driver:
+ - Added support for 32bit images with bitfields compression.
+
+DODS Driver:
+ - Upgraded to support libdap 3.6.x.
+ - Upgraded to support [-x][-y] to flip image.
+
+gdal_rasterize Utility:
+ - New for GDAL 1.3.2.
+ - Rasterize OGR polygons into a raster.
+
+## OGR 1.3.2 - Overview of Changes
+
+OGRFeature:
+ - Added support for OFTDate, OFTTime and OFTDateTime field types.
+ - Also applied to a few drivers (shapefile, mysql, postgres)
+
+OGRLayer:
+ - GetFIDColumn() and GetGeometryColumn() added.
+
+Generic OGR SQL:
+ - Proper support for spatial and attribute filters installed on
+   OGR SQL resultsets.
+
+OGRSpatialReference:
+ - Upgraded data files to EPSG 6.9
+
+PostGIS Driver:
+ - Include proj4text in new spatial_ref_sys entries.
+ - Fixed support for very large queries.
+ - Fixed DeleteLayer() implementation.
+ - Added COPY support for accelerated loading.
+
+MySQL Driver:
+ - Added read and write support for Spatial types.
+ - Support spatial_ref_sys and geometry_columns tables.
+ - Various other improvements (dates, smallint, tinyint, etc)
+ - More robust auto-detection of column types for layers
+   created from SQL statements
+
+ArcSDE Driver:
+ - New for 1.3.2.
+ - Read-only support for all geometry types.
+ - Supports coordinate systems.
+ - Requires SDE C API from ESRI.
+
+Shapefile Driver:
+ - Avoid posting errors when .dbf's without .shps are opened.
+ - Added pseudo-SQL REPACK command after deleting features.
+ - Implement DeleteFeature()
+
+S-57 Driver:
+ - Added support for Arcs.
+ - Added special DSID_DSSI feature class to capture header info.
+
+DGN Driver:
+ - Support writing geometry collections.
+
+DWG/DXF Driver:
+ - New for OGR 1.3.2
+ - Only supports writing DWG and DXF.
+ - Depends on DWGdirect library.
+
+
+# GDAL 1.3.1 - Overview of Changes
+
+Next Generation SWIG Wrappers (GDAL and OGR):
+ - Python, Perl and Ruby bindings considered to be ready to use.
+ - C#, Java, PHP are at best initial prototypes.
+ - Added configure options for most NG options.
+
+PCRaster Driver:
+ - libcsf is now included as part of GDAL.
+ - PCRaster enabled by default on win32.
+ - --with-pcraster=internal option now supported on unix (but not yet default)
+
+VSI Virtualization:
+ - The "large file API" (VSI*L) has been re-engineered to allow installing
+   additional file handlers at runtime.
+ - Added "in memory" VSI handler so that now any driver using VSI*L
+   functions for data access can operate on in-memory files.
+ - PNG, JPEG and GeoTIFF drivers upgraded to work with in-memory support.
+
+Raster Attribute Tables:
+ - Implemented new Raster Attribute Tables support.  See the
+   GDALRasterAttributeTable class for more information.
+
+Erdas Imagine Overviews:
+ - Erdas Imagine driver upgraded to support building internal overviews.
+ - Generic overview handler updated to support overviews in Erdas Imagine
+   format for any file format.  Set USE_RRD config option to YES to enable.
+
+gdalwarp:
+ - Added proper support for "unified source nodata", so the -srcnodata
+   switch works well.
+
+RIK Driver:
+ - New Swedish format driver implemented by Daniel Wallner.
+
+JPEG Driver:
+ - Substantial improvements to EXIF support.
+
+MrSID Driver:
+ - Updated with proper JPEG2000 support as JP2MRSID driver, including
+   encoding with ESDK.
+ - Updated to support MrSID Version 5.x SDKs.
+
+PNG Driver:
+ - Fixed serious bugs with 16bit file support.
+ - Added NODATA_VALUES to identify RGB sets that indicate a nodata pixel.
+
+
+## OGR 1.3.1 - Overview of Changes
+
+Reference Counting:
+ - OGRSpatialReference and OGRFeatureDefn now honour reference counting
+   semantics.
+ - Note that, especially for the OGRFeatureDefn, it is now critical that
+   all drivers be careful with reference counting.  Any OGR drivers not in
+   the core distribution will likely crash if not updated.
+
+ESRI Personal Geodatabase Driver:
+ - New driver implemented for ESRI Personal Geodatabase (.mdb) files.
+ - Uses ODBC, enabled by default on win32.
+
+ODBC Driver:
+ - Updated to support binary fields.
+ - Updated to support WKB geometry fields.
+ - Updated to support DSN-less connections.
+
+S57 Driver:
+ - Added support for Inland Waterways, and Additional Military Layers profiles
+
+# GDAL 1.3.0 - Overview of Changes
+
+Multithreading:
+ - Lots of work done to implement support for multiple threads reading
+   from distinct GDALDataset objects at the same time.
+
+GDALRasterBand / Persistent Auxiliary Metadata (PAM):
+ - Support for preserving a variety of metadata in a supporting XML file.
+ - GDALRasterBand now supports "remembering" histograms, and has a concept
+   of the default histogram.
+ - GDALRasterBand now supports remembering image statistics.
+ - Disabled by default (set GDAL_PAM_ENABLED=YES to turn on).
+ - Supported by *most* drivers with some caveats.
+
+GDALCopyWords():
+ - This function is a low level work horse for copying and converting pixel
+   data in GDAL.  It has been substantially optimized by Steve Soule (Vexcel).
+
+Next Generation Bindings:
+ - Kevin Ruland and Howard Butler are working on reworked support for
+   SWIG to generate Python, PHP, Java, C# and other language bindings for GDAL
+   and OGR.
+
+VB6 Bindings:
+ - Now substantially complete, see VB6 directory.
+
+HDF5 Driver:
+ - New HDF5 driver implemented by Denis Nadeau.
+
+RMF Driver:
+ - New driver for Raster Matrix Format by Andrey Kislev.
+
+MSGN (Meteosat Second Generation Native) Driver:
+ - New driver implemented by Frans van der Bergh.
+
+VRT Driver:
+ - Fixed whopper of a memory leak in warped raster case.
+
+NetCDF Driver:
+ - Preliminary CF conventions support by Denis Nadeau.
+
+NITF Driver:
+ - NITF files between 2 and 4 GB in size can now be read and written.
+
+JPEG Driver:
+ - Added support for reading EXIF as metadata by Denis Nadeau.
+
+DODS Driver:
+ - Fixed up libdap 3.5.x compatibility.
+
+JP2ECW (JPEG2000 ECW SDK) Driver:
+ - Implemented support for new GML-in-JPEG2000 specification.
+ - Implemented support for old MSI "worldfile" box.
+
+JP2KAK (JPEG2000 Kakadu) Driver:
+ - Implemented support for new GML-in-JPEG2000 specification.
+ - Implemented support for old MSI "worldfile" box.
+
+PCIDSK Driver:
+ - tiled files now supported for reading.
+ - overviews now supported for reading.
+
+HFA (Imagine) Driver:
+ - Supports creating internal overviews in very large files.
+ - Support reading class names.
+ - Support creating compressed files.
+
+GeoTIFF Driver:
+ - Support reading files with odd bit depths (i.e. 3, 12, etc).
+ - Support 16/24bit floating point TIFFs (per Technote 3) (Andrey).
+ - Support 12bit jpeg compressed imagery using libjpeg "MK1" library.
+
+HDF4 Driver:
+ - Added support for ASTER Level 1A, 1B and 2 products (Andrey).
+
+## OGR 1.3.0 - Overview of Changes
+
+OGRGeometry:
+ - WKT (and GML) encoding now attempts to preserve pretty much full double
+   precision.
+ - geometries are now "coordinate dimension preserving" rather than dynamically
+   figuring out dimension depending on whether Z is set.  So a geometry can
+   now be 3D even if all z values are zero.
+ - Fixed up proper EMPTY geometry support per standard.
+
+GRASS Driver:
+ - New driver for GRASS 6 vector data written by Radim Blazek.
+
+Interlis Driver:
+ - New driver for Swiss Interlis format from Permin Kalberer (SourcePole).
+
+Shape Driver:
+ - Fixed logic for degenerate polygons (Baumann Konstantin).
+
+PostgreSQL/PostGIS Driver:
+ - Implemented fast GetExtent() method (Oleg Semykin).
+ - Implemented layer type from geometry_columns (Oleg Semykin).
+ - Handle PostGIS 1.0 requirements for coordinate dimension exactness.
+ - Handle EWKT type in PostGIS 1.0.
+ - Generally PostGIS 0.x and 1.0 should now be supported fairly gracefully.
+ - Added PostGIS "binary cursor" mode for faster geometry access.
+
+VRT Driver:
+ - Pass through attribute queries to underlying driver.
+ - Pass through spatial queries as attribute filters on the underlying layer.
+
+S57 Driver:
+ - Added concept of supporting different profiles.
+ - Added prototype AML profile support.
+
+MySQL Driver:
+ - Fixed for FID recognition (eg. mediumint).
+
+GML Driver:
+ - Various fixes for generated GML correctness (Tom Kralidis).
+
+TIGER/Line Driver:
+ - Added Tiger 2004 support.
+
+Oracle Driver:
+ - Use VARCHAR2 for fixed size string fields.
+ - Use OCI_FID config variable when creating layers, and reading select results
+
+
+
+# GDAL 1.2.6 - Overview of Changes
+
+gdal_translate:
+ - Added -sds switch to copy all subdatasets.
+
+gdalwarp:
+ - Added Thin Plate Spline support (-tps switch).
+
+GDALRasterBand:
+ - Now uses two level block cache allowing efficient access to files
+   with a very large number of tiles.
+ - Added support for YCbCr color space for raster band color interpretations.
+ - Added AdviseRead() method - currently only used by ECW driver and OGDI
+   drivers.
+
+ILWIS Driver:
+ - New driver for the raster format of the ILWIS software.
+
+ECW Driver:
+ - Updated to use ECW SDK 3.1 (older ECW SDK no longer supported!)
+
+ECWJP2 Driver:
+ - Added JPEG2000 support driver based on ECW/JPEG2000 SDK with a variety
+   of features.
+
+NITF Driver:
+ - Added support for reading *and* writing JPEG2000 compressed NITF files
+   using the ECW/JPEG2000 SDK.
+ - Added ICHIPB support.
+
+HDF Driver:
+ - Add support for georeferencing from some additional metadata formats.
+ - Fixed bug with multi-band HDF-EOS datasets.
+
+MrSID Driver:
+ - Driver can now be built as a plugin on win32.
+ - Split out MrSID 3.x SDK support - not readily buildable now.
+ - Implemented accelerated IO cases for MrSID 4.x SDK.
+ - Support for writing MrSID files added (improved?)
+
+Imagine Driver:
+ - Fixed bug reading some large multiband Imagine files.
+ - Added support for writing compressed files.
+
+Win32 Builds:
+ - Added versioning information to GDAL DLL.
+
+L1B Driver:
+ - Only return a reduced grid of control points.
+
+IDA (WinDisp4) Driver:
+ - New read/write driver for the Image Display and Analysis raster format
+   used by WinDisp 4.
+
+NDF (NLAPS) Driver:
+ - Added NDF/NLAPS read driver for version 1 and 2.
+
+MSG Driver:
+ - Added support for the Metosat Second Generation raw file format.
+
+GTiff Driver:
+ - Added support for offset/scale being saved and loaded (special metadata).
+ - Added Cylindrical Equal Area.
+ - Added PROFILE creation option to limit extra tags.
+
+PNG Driver:
+ - Updated internal code for libpng to libpng 1.2.8.
+
+## OGR 1.2.6 - Overview of Changes
+
+OGRSFDriverRegistrar:
+ - Added support for autoloading plugin drivers from ogr_<driver>.so.
+
+ogr.py:
+ - Geometry, and Feature now take care of their own reference counting and
+   will delete themselves when unreferenced.  Care must still be taken to
+   unreference all features before destroying the corresponding
+   layer/datasource.
+ - ogr.Feature fields can now be fetched and set directly as attributes.
+ - Geometry constructor can now take various formats (wkt, gml, and wkb).
+ - Added docstrings.
+ - Added better __str__ methods on several objects.
+ - Various other improvements.
+
+OGRLayer:
+ - Re-wrote generic spatial search support to be faster in case of rectangular
+   filters.
+ - Intersects() method now really uses GEOS.  This also affects all OGR
+   layer spatial filtering (with non-rectangular filters).
+ - Added SetNextByIndex() method on OGRLayer.
+
+OGRSpatialReference:
+ - Automatically generate +towgs84 from EPSG tables when translating to
+   PROJ.4 if available and TOWGS84 not specified in source WKT.
+ - Updated GML CRS translation to follow OGC 05-011 more closely.  Still
+   incomplete but operational for some projections.
+ - Added support for FIPSZONE State Plane processing for old ESRI .prjs.
+ - Added Goode Homolosine support.
+ - Added GEOS (Geostationary Satellite) support.
+
+OCI (Oracle) Driver:
+ - Added GEOMETRY_NAME creation option to control the name of the field to
+   hold the geometry.
+
+PostGIS Driver:
+ - Fixed some problems with truncation for integer and float list fields.
+
+Shapefile Driver:
+ - Added support for MapServer style spatial index (.qix).
+
+GML Driver:
+ - Improved support for 3L0 (GML 3 - Level 0 profile) reading and writing.
+   On read we can now use the .xsd instead of needing to build a .gfs file.
+
+
+# GDAL 1.2.5 - Overview of Changes
+
+gdalwarp Utility:
+ - Added "proper" source and destination alpha support.
+
+PCRaster Driver:
+ - added write support, now consider ready for regular use.
+
+MrSID Driver:
+ - Initial support for writing to MrSID with encoding SDK.
+
+GeoTIFF Driver:
+ - Updated internal copy of libtiff to fix overview building ... really!
+ - Fixed bug when writing south-up images.
+
+## OGR 1.2.5 - Overview of Changes
+
+OGRSpatialReference:
+ - Added Bonne projection.
+
+Docs:
+ - Added OGR C++ API Tutorial (reading and writing).
+
+PostGIS Driver:
+ - Implemented SetFeature() and DeleteFeature() methods for in-place updates.
+
+Oracle (OCI) Driver:
+ - Fixed support for writing into Oracle 10g.
+ - Fixed serious memory leak of geometries.
+ - Fixed bug with 3D multipolygons.
+ - Added support for selecting tables in the datasource name.
+
+
+# GDAL 1.2.4 - Overview of Changes
+
+gdalwarp:
+  - Fixed some issues with only partially transformable regions.
+  - Added Alpha mask generation support (-dstalpha switch).
+
+HFA/Imagine Driver:
+  - bug fix in histogram handling.
+  - improved support for large colormaps.
+
+Envi Driver:
+  - Capture category names and colormaps when reading.
+
+SAR CEOS Driver:
+  - Added support for PALSAR/ALOS Polarimetric Datasets.
+
+RadarSat 2 Driver:
+  - New.  Reads RadarSat 2 Polarimetric datasets with a "product.xml" and
+    imagery in TIFF files.
+
+OGDI Driver:
+  - Important bug fix for downsampled access.
+
+GeoTIFF Driver:
+  - Lots of libtiff upgrades, including some quite serious bug fixes.
+  - Added better support for 16bit colormaps.
+  - Write projection information even if we don't have a geotransform or GCPs.
+  - Improved alpha support.
+  - Generate graceful error message for BigTIFF files.
+
+DODS Driver:
+  - Almost completely reimplemented.   Uses chunk-by-chunk access.  Supports
+    reading several bands from separate objects.  Some new limitations too.
+
+NetCDF Driver:
+  - Separated out a GMT NetCDF driver and a more generic but partially broken
+    NetCDF driver (Radim).
+
+JP2KAK Driver:
+  - Added alpha support, including greyscale+alpha.
+
+AirSAR Driver:
+  - New, reads AirSAR Polarimetric Radar format.
+
+## OGR 1.2.4 - Overview of Changes
+
+epsg_tr.py:
+  - Added escaping rules when generating PostGIS output.
+
+tigerpoly.py:
+  - Discard dangles and degenerate rings.
+
+VRT Driver:
+  - Fixed serious error in handling cleanup of VRT datasources, was often
+   causing a crash.
+
+SQLLite Driver:
+  - Fixed substantial memory leaks.
+
+MySQL Driver:
+  - New readonly non-spatial MySQL driver implemented.
+
+MITAB Driver:
+  - Updated from upstream, several fixes.
+
+TIGER/Line Driver:
+  - Fixed serious bug with handling "full" records at end of .RT2 file.
+
+OCI/Oracle Driver:
+  - Added OCI_FID environment support to control FID selection.
+
+OGRGeometry:
+  - Added Centroid() implementation (from GEOS?)
+
+# GDAL 1.2.3 - Overview of Changes
+
+GeoTIFF Driver:
+    - Fixed many missing compression codecs when built with the internal
+      libtiff.
+    - Modified driver metadata to only list available compression types.
+
+DODS Driver:
+    - Added support for OPeNDAP version after 3.4.x (use of opendap-config).
+
+GRASS Driver:
+    - Fixed support for building with grass57.
+
+MrSID Driver:
+    - Fixed support for MrSID Encoding SDK.
+
+NITF Driver:
+    - Fixed serious bug with non-square output files.
+
+
+## OGR 1.2.3 - Overview of Changes
+
+OGRSpatialReference:
+    - Corrected memory leaks - OSRCleanup() cleans up temporary tables.
+    - Fixed build problem with ogrct.cpp on Solaris.
+
+TIGER Driver:
+    - Improved generality of support for GDT files.
+
+OGRGeometry:
+    - Added getArea() method for rings, polygons and multipolygons.
+
+
+# GDAL 1.2.2 - Overview of Changes
+
+GRASS Driver:
+    - Add Radim's version of the driver submitted by Radim.  This version
+      uses GRASS 5.7 libraries directly instead of using libgrass.
+
+DODS Driver:
+    - Added support for spatial_ref, FlipX and FlipY .das info.
+
+CPG Driver:
+    - added new driver for Convair Polarimetric format.
+
+HDF Driver:
+    - Significant bugs fixed.
+
+USGS DEM Driver:
+    - Support writing UTM projected files.
+
+PNG Driver:
+    - Upgraded to libpng 1.2.6.
+
+MrSID Driver:
+    - Substantial performance improvements.
+    - Support for DSDK 4.x
+    - Support JPEG2000 files via MrSID SDK.
+
+NITF Driver:
+    - Support JPEG2000 compressed files (with Kakadu support)
+
+ESRI BIL:
+    - Support .clr color files.
+
+VRT Driver:
+    - Added support for describing raw files with VRTRawRasterBand.
+    - Added support for virtual warped files with VRTWarpedRasterBand.
+
+GeoTIFF Driver:
+    - Fix support for 16bit image color tables.
+    - Write ExtraSamples tag for files with more samples than expected
+      in photometric interpretation.
+    - External overviews now built for read-only files.
+
+Erdas Imagine Driver:
+    - Fixed support for compressed floating point layers.
+    - Various other fixes for compatible with newer Imagine versions.
+    - improved metadata handling.
+
+gdal_merge.py:
+    - sets projection on output file.
+
+## OGR 1.2.2 - Overview of Changes
+
+SQLite Driver:
+    - New read/write driver implemented for SQLite databases.
+
+CSV Driver:
+    - New read/write driver implemented for comma separated value files.
+
+S-57 Driver:
+    - Substantial performance improvements.
+
+ODBC Driver:
+    - Arbitrary length field values now supported.
+
+GEOS:
+    - Integration a series of methods utilizing GEOS when available.  Note
+      that Intersect() is still just an envelope comparison.
+
+OGRSpatialReference:
+    - Fixed Swiss Oblique Mercator support.
+
+===========================================================================
+
+# GDAL 1.2.1 - Overview of Changes
+
+gdal_contour:
+    - Now build and installed by default.
+
+HDF4 Driver:
+    - Added some degree of HDF-EOS support.  HDFEOS layer now part of GDAL.
+
+DODS Driver:
+    - Substantial fixes, support for flipped datasets.
+
+HFA (Erdas Imagine) Driver:
+    - Fixed bug with files between 2 and 4GB.
+    - Capture statistics as metadata.
+
+Erdas 7.x LAN/GIS Driver:
+    - Newly implemented.
+
+USGS DEM Driver:
+    - Various fixes to creation support / CDED product.
+
+NITF Driver:
+    - Capture USE001 and STDIDC TREs as metadata.
+    - Capture all sorts of header information as metadata.
+    - Support geocentric corner coordinate specification.
+
+MrSID Driver:
+    - Support added for DSDK 4.0.x.
+
+ECW Driver:
+    - Added preliminary support for using 3.0 SDK for JPEG2000 support.
+    - Fix oversampling assertion problem.
+
+ArcInfo Binary Grids:
+    - Added support for 0x01 and 0x20 block type.
+
+## OGR 1.2.1 - Overview of Changes
+
+OGRSpatialReference:
+    - Various fixes related to prime meridians.
+
+PostgreSQL/PostGIS Driver:
+    - Added layer name laundering.
+    - Launder names on by default.
+    - Clean stale entries in geometry_columns table when creating a layer.
+    - Support treating names views as layers.
+    - Handle long command strings.
+
+S57 Driver:
+    - Fixed serious bugs with support for auto-applying update files.
+    - Improvements to S57 writing support.
+
+# GDAL 1.2.0 - Overview of Changes
+
+Configuration:
+    - Libtool used by default with Unix style builds.  Use --without-libtool
+      to avoid this.
+    - PROJ.4 can now be linked statically using --with-static-proj4.
+    - Added --without-bsb option for those averse to legal risk.
+
+DODS/OPeNDAP Driver:
+    - Preliminary DODS (OPeNDAP) driver implemented (James Gallagher @ URI).
+
+PCIDSK Driver:
+    - PCIDSK read/write raster driver implemented (Andrey).
+
+Erdas Imagine / HFA Driver:
+    - Support recent Imagine versions (data dictionary changes).
+    - Better logic to search for .rrd file locally.
+    - Support creating files in the 2GB to 4GB size range.
+
+GIF Driver:
+    - Updated to libungif 4.1.0.
+    - Various hacks to try and identify transparent colors better.
+
+BMP Driver:
+    - Handle 32bit BMPs properly.
+
+HDF4 Driver:
+    - Added proper support for multi-sample GR datasets.
+    - Various fixes and improvements for specific product types.
+
+GeoTIFF Driver:
+    - Added PHOTOMETRIC option to control photometric interp of new files.
+
+JPEG2000/Kakadu Driver:
+    - Support reading/creating lossless 16bit files.
+    - Updated to support Kakadu 4.1 library.
+
+NITF Driver:
+    - Implement support for IGEOLO="U" (MGRS/UTM) coordinates.
+    - Added overview (as external GeoTIFF file) support.
+
+MrSID Driver:
+    - Support DSDK 4.2.x.
+
+PNG Driver:
+    - Support required byte swapping of 16bit PNG data.
+
+FAST Driver:
+    - lots of fixes, supports more datums and ellipsoids.
+
+NetCDF Driver:
+    - New driver implemented for netCDF support.
+    - Pretty much tied to form of netCDF used in GMT for now.
+
+VTerrain .bt Driver:
+    - New driver for VTerrain .bt elevation format.
+
+ECW Driver:
+    - support supersampled reads efficiently.
+    - special case for dataset level RasterIO() implemented for much better
+      performance in some applications.
+
+ESRI BIL (EHdr) Driver:
+    - Support world files.
+
+VRT Driver:
+    - Implement filtering support.
+
+GIO (Arc/Info Binary Grid via avgridio.dll):
+   - Driver disabled ... to undependable.
+
+
+Python:
+    - Preliminary support for numarray in addition to numpy (Numeric).
+
+Contouring:
+    - New gdal_contour utility program implementing contour generation.
+    - Underlying algorithm in gdal/alg.
+
+Warping:
+    - Improved support in GDALSuggestedWarpOutput() for "world" sized
+      files that are only partially transformable.
+    - Bicubic resampler improved.
+    - What was gdalwarptest is now gdalwarp, and the old gdalwarp is now
+      gdalwarpsimple.  The sophisticated warper is now the default.
+
+Man Pages:
+    - Man pages for GDAL utilities now being maintained and installed (Silke).
+
+## OGR 1.2.0 - Overview of Changes
+
+OGRSpatialReference:
+   - Added methods for converting to/from GCTP representation.
+   - Added HOM 2 points on centerline variant.
+
+DODS (OPeNDAP) Driver:
+   - Preliminary implementation.
+
+TIGER/Line Driver:
+   - Added support for GDT ASCII TIGER-like format.
+   - Support TIGER/Line 2003 format.
+
+S-57 Driver:
+   - Preliminary export support implemented.
+   - Support capture of FFPT (feature to feature) linkages.
+   - Support capture of TOPI from VRPT.
+   - Support capture of primitives as additional layers.
+
+Shapefile Driver:
+   - gdal/frmts/shapelib removed from GDAL source tree, now just a
+     copy of required shapelib files are kept in gdal/ogr/ogrsf_frmts/shape.
+   - Attempt identify polygons that are really multi-polygons and convert them
+     into multi-polygons properly (Radim Blazek).
+   - Create FID attribute in .dbf file if no attribute added by application.
+
+GML Driver:
+   - Lots of fixes and improvements for reading and writing.
+   - Now writes a schema file by default.
+   - Field types are set now when reading based on data found on first pass.
+   - Added support for the various kinds of geometry collections.
+
+DGN Driver:
+   - Now using dgnlib 1.9 - this carries with it various new element types
+     and some important bug fixes.
+
+ODBC Driver:
+   - New ODBC driver implemented.  Build by default on Windows, and buildable
+     on Unix (with unixodbc).
+
+VRT Driver:
+   - New "virtual" OGR Datasource format implemented.
+   - Configuration stored in XML control file.
+
+Oracle (OCI) Driver:
+   - support reading views.
+
+OGR Core:
+   - Added support for WKT EMPTY geometry objects (like "MULTIPOINT(EMPTY)").
+   - Added DeleteFeature() method on OGRLayer class.
+
+NTF Driver:
+   - Support CHG_TYPE attribute for landline plus product.
+
+
+# GDAL 1.1.9 - Overview of Changes
+
+ o MrSID Driver: New for 1.1.9, read-only, includes good coordinate system
+   support, and should be high performance.
+
+ o ECW Driver: Now reads coordinate system information (but doesn't write).
+
+ o HDF Driver: Added support for Hyperion Level 1, Aster Level 1A/1B/2, MODIS
+   Level 1B(earth-view)/2/3, SeaWIFS Level 3.
+
+ o L1B Driver: Now reads GCPs for georeferencing.
+
+ o NITF Driver: Support for reading RPC, variety of bugs fixes for reading and
+   writing.  Also some general RPC infrastructure added to GDAL.
+
+ o JP2KAK Driver: Can be used with Kakadu 4.0.2 now.  Compatibility fixes
+   for internal geotiff to improve compatibility with Mapping Science tools.
+   Added palette support.
+
+ o HFA (Imagine) Driver: Added read/write support for color table opacity.
+   Added write support for large (spill) files.
+
+ o "core" directory renamed to "gcore" to avoid confusing configure script.
+
+ o Added support for GDAL_DATA environment variable to point to GDAL support
+   data files (those in gdal/data directory).
+
+ o Added GDALDataset::RasterIO() for more efficient reading of multiple bands
+   in one request (in some cases anyways).
+
+ o High performance warp api considered to be complete now, and substantially
+   optimized.
+
+ o gdal_merge.py: supported multiple bands, copying PCT.
+
+
+## OGR 1.1.9 - Overview of Changes
+
+ o Oracle Spatial: New generic read/write, and implemented highly optimized
+   loading support.
+
+ o Tiger driver: added support for TIGER/Line 2002 product.
+
+ o GML driver:  now supports Xerces versions from 1.6 up to 2.3.  Lots of
+   bugs fixes and improvements.   GML Geometry now in OGR core.
+
+ o Improved support for translating to and from ESRI WKT, including a complete
+   mapping between EPSG related ESRI datum names and OGR's expected names.
+
+ o Improved support for alternate prime meridians in coordinate system code.
+
+ o Shapefiles: Can write features with NULL geometry,
+
+ o DGN: added 3d write support.
+
+ o Implemented generic attribute indexing support (only used for shapefile
+   at this point).  Use in SQL where clauses and ExecuteSQL().
+
+ o WKT MULTIPOINT in/out formatting fixed.
+
+ o Added SynToDisk() method on OGRDataset and OGRLayer.
+
+ o Implemented "Web Coordinate Transformation Service" (ogr/wcts).
+
+ o Implemented "in memory" format driver.
+
+ o C API documented.
+
+
+# GDAL 1.1.8 - Overview of Changes
+
+ o Implemented HDF 4 read/write support. This includes HDF EOS reading.
+
+ o Implemented Windows BMP read/write support.
+
+ o Implemented NITF read/write support.
+
+ o Implemented NOAA Polar Orbiter L1B format driver.
+
+ o Implemented EOSAT FAST format driver.
+
+ o Implemented a JasPer based JPEG2000 driver (several limitations).
+
+ o Implemented a Kakadu based JPEG2000/GeoJP2(tm) driver (full featured, but
+   Kakadu is not open source).
+
+ o Implemented new 'gdalwarp' application for projection and GCP based image
+   warping.  See gdal/alg for underlying algorithms.  Currently gdalwarp only
+   supports 8 bit images and holds the whole source image in memory.
+
+ o Implemented write support for ESRI ASCII Grids.
+
+ o Lots of improvements to GeoTIFF driver.  Metadata writing, update of
+   georeferencing, and support for writing PCS codes based on AUTHORITY fields
+   in WKT.
+
+ o Implemented support for uncompressed 1bit data in Erdas Imagine files,
+   as well as generic metadata.
+
+ o Fixed 0xFF compression support in the Arc/Info Binary Grid (AIG) driver.
+
+ o Lots of improvements to BSB drive, including preliminary uncompressed
+   output support, support for reading BSB 3.0 and GEO/NOS.
+
+ o Lots of work on VRT format.
+
+ o ECW: Fixed bug with reading a more than full resolution.
+
+ o Envisat driver now supports AATSR TOA and MERIS data.
+
+ o Fixes for nodata support in GRASS driver.
+
+ o Added the --version and --formats options to many utility programs.
+
+ o gdal_translate:
+    - added -projwin flag to copy a window specified in projection coordinates.
+    - added the -a_srs option to assign a user supplied SRS to output file.
+    - translation with subsetting to any format now support (uses VRT inside).
+
+ o Lots of metadata now attached to driver objects describing their
+   capabilities.
+
+ o Implemented GDALDestroyDriverManager() to ensure full memory cleanup of
+   GDAL related resources.
+
+ o Added a 'devinstall' target on Windows to support easy installation of
+   include files and stub libraries on Windows.  Also many other improvements
+   to Windows build.  Most options can be easily turned on and off from the
+   nmake.opt file now.
+
+
+## OGR 1.1.8 - Overview of Changes
+
+ o Implemented support for writing 2D DGN files.   Added support for MSLINK
+   and Text values available as attributes.
+
+ o Implemented FMEObjects based read driver.
+
+ o Implemented ExecuteSQL() method on OGRDataSource.  Generic code supports
+   fairly full featured SELECT statements.
+
+ o Various fixes to 3D shapefile support.
+
+ o Fixes to binary representation for 2.5D geometries.  Fixed MULTIPOINT WKT
+   geometry representation.
+
+ o Upgraded OGRSpatialReference.importFromEPSG() to use the new EPSG 6.2.2
+   tables instead of the old EPSG 4.x tables.
+
+ o Many fixes to PostGIS driver, including special creation options for
+   "laundering" field names to save tokens.
+
+ o Many improvements to standards conformance of OGRSpatialReference WKT
+   representation to the OGC Coordinate Transformations specification.  Still
+   some quirks related to prime meridians and coordinate systems with units
+   other than degrees.
+
+ o Implemented support for Meridian 2 NTF files in NTF driver.  Better
+   support for GENERIC_CPOLY geometries.
+
+ o  Added support for [NOT] IN, [NOT] LIKE and IS [NOT] NULL predicates in
+   WHERE clauses.
+
+ o Implemented a C API for accessing OGR.
+
+ o Implemented support for building OLE DB Provider with Visual Studio.NET
+   (many changes in ATL templates).  Lots of other OLE DB improvements for
+   better MapGuide compatibility.
+
+
+# GDAL 1.1.7 - Overview of Changes
+
+ o Add XPM (X11 Pixmap) format.
+
+ o Added rough ENVI raster format read support.
+
+ o Added --version support (and supporting GDALVersionInfo() function).
+
+ o Special hooks for getting raw record data from sar ceos files and Envisat
+   via the metadata api.
+
+ o Upgraded TIFF/GeoTIFF support to CVS version ... includes new extension
+   API and removes need for private libtiff include files entirely.
+
+ o gdal_translate now has scaling option (-scale).
+
+ o Added utility documentation.
+
+## OGR 1.1.7 - Overview of Changes
+
+ o Added Arc/Info binary coverage format read support.
+
+ o Added ogrtindex for building MapServer compatible OGR tile indexes.
+
+ o Added default implementation of GetFeature(fid) method on OGRLayer.
+
+ o Shape driver now supports reading and creating free standing .dbf files
+   for layers without geometry.
+
+ o Added utility documentation.
+
+ o Fixed major memory/file handle leak in SDTS access.
+
+ o Added ADSK_GEOM_EXTENT support for OLE DB provider.
+
+ o Ensure shapefiles written with correct polygon ring winding direction
+   plus various other shapefile support fixes.
+
+ o GML read/write working reasonable well, including use of .gfs files.
+
+
+# GDAL 1.1.6 - Overview of Changes
+
+ o Add > 2GB file support on Linux 2.4.
+
+ o Implemented USGS DEM reading.
+
+ o Implemented BSB Format (Nautical Chart Format) read support.
+
+ o Preliminary implementation of Virtual Datasets (gdal/frmts/vrt).
+
+ o Support for writing DTED files.
+
+ o Some raw formats (i.e. PAux, HKV) support files larger than 2GB.
+
+ o Add the AddBand() method on GDALDataset.
+
+ o PAux: Added color table read support.
+
+ o Various fixes to OGDI driver.
+
+ o Stripped out the GDALProjDef related capabilities.  Superseded by
+   OGRSpatialReference, and OGRCoordinateTransformation functionality.
+
+ o Improved CEOS support, notable for ESA LANDSAT files, D-PAF ERS-1 and
+   Telaviv ERS data.
+
+ o geotiff: upgraded libtiff support to approximately libtiff 3.5.7.
+
+ o DGN: Added support for complex shapes, shapes assembled from many elements.
+   Various other improvements.
+
+
+## OGR 1.1.6 - Overview of Changes
+
+ o Fixed OGDI driver so that gltp urls with drive letters work properly on
+   windows.
+
+ o Many improvements to OLE DB provider during the process of making it
+   compatible with the MapGuide (SDP) client.  These include implementing
+   restrictions for schema rowsets, treating missing information like WKT
+   coordinate systems as NULL fields, and setting ISLONG on geometry fields.
+   Also made thread safe.
+
+ o DGN: Threat SHAPE elements as polygons.  Set style information for text.
+   Added 3D support for most elements.
+
+ o Fixed bugs in WKT format for some OGR geometry types (i.e. multipoint).
+
+ o Added support for morphing to/from ESRI WKT format for OGRSpatialReference.
+
+ o NTF: Don't try to cache all the records from multiple files at once.
+
+ o Added experimental XML SRS support ... not the final schema.  Added
+   supporting "minixml" support to CPL.
+
+ o PostGIS: Upgraded to PostGIS 0.6.  Added "soft transaction" semantics.
+   Many create feature calls can now be part of one transaction.  Transactions
+   are now a general OGR concept although only implemented for PostGIS.
+
+ o Added transform() and transformTo() methods for reprojecting geometries and
+   added user options for this in ogr2ogr.
+
+ o Very preliminary GML read/write support.  Needs Xerces C++ XML parser for
+   read support.
+
+# GDAL 1.1.5 New Features
+
+o AIGrid:
+- Return nodata value.
+
+o OGDI:
+- Added format user documentation.
+- Added Sub Dataset support.
+- Utilize OGDI 3.1 style capabilities metadata.
+
+o SAR_CEOS:
+- Added support for Alaska SAR Toolbox naming convention.
+- Read map projection record for corner GCPs.
+
+o PNG Driver:
+- read/write support for transparency via colortable and nodata value.
+
+o Erdas Imagine (HFA) Driver:
+- Added support for reading external large image files.
+- Added support for uncompressed, but reduced precision blocks.
+
+o GIF Driver:
+- Added .wld world file support.
+- Added transparency read support.
+- Upgraded to libungif 4.x.
+
+o JPEG Driver:
+- Added .wld world file support.
+
+o PAux Driver:
+- Added limited gcp and projection read support.
+
+o GeoTIFF Driver:
+- Added specialized support for 1 bit files.
+- Upgraded world file reading (added .wld files), use
+GDALReadWorldFile().
+
+o JDEM Driver is new (Japanese DEM format).
+
+o FujiBAS Driver is new.
+
+o ERMapper ECW Driver is new.
+
+o GDAL Bridge: upgraded to include new entry points, like GCP access and
+nodata api.
+
+o gdal_translate: added the -not_strict option.
+
+o GDALGetRandomRasterSample(): Return magnitude for random samples.
+
+o Added use of CPL_CVSID macro in most source files. Running the RCS ident
+command on any GDAL executable or shared library should now give a listing
+of most object file versions from which it was built.
+
+o Various improvements so that static builds will work under Cygwin.
+
+o Various improvements so that builds can be done on MacOS X.
+
+o Overviews: Implement AVERAGE_MAGPHASE option for complex image overviews.
+
+o Added support for sub datasets to gdalinfo, core api and OGDI raster driver.
+
+o The size of the GDAL cache can now be overridden with the GDAL_CACHEMAX
+environment variable (measured in MB).
+
+o Added Driver implementation tutorial to documentation.
+
+o Added apps/gdaltindex.c - application for building tile indexed raster
+datasets suitable for use with UMN MapServer.
+
+
+## GDAL 1.1.5 Significant Bug Fixes
+
+o SAR_CEOS:
+- Don't try to get GCPs from scanlines with no prefix data.
+
+o GeoTIFF:
+- Fixed handling of RGBA band ordering on big endian systems.
+- Fixed bugs in overview generation, especially when updating in place.
+
+o gdal-config should work properly in all situations now.
+
+o JPEG Driver: improved magic number tested to avoid ignoring some jpeg files.
+
+o FITS Driver: lots of fixes and improvements.
+
+
+## OGR 1.1.5 New Features
+
+o Implemented support for attribute query filters (SetAttributeFilter())
+on OGRLayer, provided SWQ based implementation, plugged into all
+drivers and added hooks to ogrinfo.
+
+o MapInfo Driver:
+- Added accelerated spatial query support.
+- Upgraded to current MITAB source as of GDAL release date.
+
+o S-57 Driver:
+- Added support for applying S-57 updates automatically.
+
+o SDTS Driver:
+- Added ENID and SNID to line features.
+- Return coordinate system in WKT instead of PROJ.4 format.
+
+o Shapefile Driver:
+- Auto determine shapefile type from first object written.
+- Added good support for NULL shapes, and NULL attribute fields.
+- Added support for .prj files (read and write).
+
+o PostgreSQL Driver:
+- Added PostGIS support.
+- Pass attribute queries through to PostgreSQL.
+
+o NTF Driver:
+- Added support for GTYPE 5 geometries (a type of arc).
+- Added support for GEOMETRY3D records in indexed (generic) datasets.
+
+o TIGER/Line Driver:
+- Added write support.
+- Improved read support for TIGER 2000.
+
+o OLE DB Provider:
+- Added support for spatial queries via ICommand parameters.
+- Added support for attribute queries by parsing out WHERE clause.
+- In general substantial rework and extensions were made to make it
+work with ESRI and AutoDesk clients.
+
+o Added gdal/data/stateplane.txt - a test file with one line per state plane
+zone for applications wanting to present options to users.
+
+o Install ogrsf_frmts.a on install if building with OGR support enabled.
+
+o Reports layer extents in ogrinfo.
+
+## OGR 1.1.5 Significant Bug Fixes
+
+o OGRSpatialReference:
+- Fix bug with extracting linear units from EPSG derived definitions.
+- Fixed bug translating LCC from EPSG to WKT (importFromEPSG()).
+- Improved IsSame() test for GEOGCS now.
+- Fixed crash if PROJECTION missing from PROJCS definition.
+
+o S-57:
+- Improve recovery from corrupt line geometries.
+- Read objects as generic if the object class is not recognised.
+- Handle LIST attributes as a string, instead of as a single int.
+
+o NTF:
+- Fixed circle conversion to polylines to close the circle properly.
+- Upped MAX_LINK to 5000 to handle much more complex geometries.
+
+o DGN:
+- Don't include elements with the complex bit set in extents
+computations.
+
+o OGRGeometry:
+- Fixed WKT format (import and export) for various container types.
+- WKT import fixed for coordinates, and Z coordinates.
diff --git a/NEWS-2.x.md b/NEWS-2.x.md
new file mode 100644
index 000000000000..26f0adf3d5a9
--- /dev/null
+++ b/NEWS-2.x.md
@@ -0,0 +1,4061 @@
+# GDAL/OGR 2.4.0 Release Notes
+
+## In a nutshell...
+
+ * New GDAL drivers:
+   - BYN: read/write support for Natural Resources Canada's Geoid binary format
+   - EEDAI: read-only driver for Google Earth Engine Data API
+   - IGNFHeightASCIIGrid: read-only driver to read IGN-France height correction ASCII grids
+   - NGW: NextGIS Web read-only driver
+   - NTv1: read-only driver for NTv1 datum shift grids
+ * New OGR drivers:
+   - EEDA: read-only driver for Google Earth Engine Data API
+   - GeoJSONSeq: read/creation support of new-line or record-separator separated GeoJSON features (#378)
+   - NGW: NextGIS Web read-write driver
+ * Improved drivers:
+   - BAG: add read support for variable-resolution grids, and write support for single-resolution grids
+   - GTiff driver: add Lerc and WebP codecs
+   - PostgisRaster: add support for out-db rasters
+   - RMF
+   - MSSQLSpatial
+ * RFC 72: Make GDAL Python autotest suite use pytest framework
+ * Add /vsihdfs/ virtual file system handler for Hadoop File System (via libhdfs)
+ * Add /vsiwebhdfs/ read-write virtual file system for Web Hadoop File System REST API
+ * gdal_contour rewriting: speed optimizations and capability to compute polygon isosurfaces.
+ * Remove PHP and Ruby bindings.
+ * Continued code linting in C++, Python scripts, Shell scripts and autotest
+
+## Backward compatibility issues
+ * The value of COMPRESSION_ZSTD used for ZStd-in-TIFF compression has been changed. ZStd-compressed TIFF files produced by GDAL 2.3.0 will not be readable
+
+## GDAL/OGR 2.4.0 - General Changes
+
+Build(Unix):
+ * configure: error out when --enable-pdf-plugin is used with --with-libtool since frmts/pdf/GNUmakefile isn't ready for that (#556)
+ * Fix compilation in C++17 mode with older ogdi headers
+ * Fix the datadir in gdal.pc.
+ * re-install cpl_vsi_error.h
+ * update GRASS drivers to support GRASS 7.4.0 (#639, #633)
+ * configure: use CXXFLAGS when CXX is used (#693)
+ * GNUmakfile: fix dependency of install target (#707)
+ * configure: fix 12 bit JPEG-in-TIFF support (#716)
+ * configure: Remove additional '$' in front of '${CXX}' to fix ECW5 detection
+ * configure: use ogdi.pc if available
+ * Set minimum pkg-config version to 0.21
+ * fix potential link errors when using internal libgif and internal libpng but headers of those libraries are available in the system in different versions than our internal ones (#938)
+
+Build(Windows):
+ * nmake.opt: allow install into paths with spaces
+ * MBTiles driver: fix issue in Makefile
+ * Fix HDF4 Plugin build for Visual C++ (#624)
+ * NMAKE: copy gdal pdb to $(LIBDIR) in libinstall target
+ * NMAKE: Enable friendlier static library builds to allow an external `DLLBUILD = 0`
+ * nmake.opt: allow DEBUG=0 to be set (#703)
+ * Do not include DllMain() in static library builds
+ * add support for JPEGLS driver
+
+All:
+ * Add support for Poppler 0.64, 0.69, 0.71
+ * avoid compilation error when compiling GMT's gmtdigitize.c that defines _XOPEN_SOURCE to empty (#590)
+ * Fix build against PDFium (#612)
+ * Add support for MySQL 8.0
+
+## GDAL 2.4.0 - Overview of Changes
+
+Port:
+ * Add multi-threaded compression to /vsigzip/ and /vsizip/
+ * /vsizip/: create ZIP64 when needed
+ * /vsizip/: encode filename in Unicode when needed also in local file header
+ * /vsigzip/: allow seeking to beginning of file, despite decompression error
+ * /vsicurl/: extend retry logic to HTTP 500 and HTTP 400 with RequestTimeout, emit a CE_Warning if code != 400 and != 404
+ * /vsicurl/: fix parsing of HTML file listing that got broken in GDAL 2.3.0
+ * /vsicurl/ and derived: implement a LRU cache for file properties (instead of ever growing cache)
+ * /vsicurl/ and derived: implement a LRU cache for directory content listing
+ * /vsicurl/: make GetCurlMultiHandleFor() more thread-safe
+ * HTTP: added curl cookiefile and cookiejar variables (fixes #1000)
+ * /vsioss/: fix support of filenames with spaces
+ * /vsizip/: output explicit error message when encountering a unsupported file compression method
+ * /vsis3/: fix VSIStatL() on a directory (#603)
+ * /vsis3/: take into account AWS_CONTAINER_CREDENTIALS_RELATIVE_URI for ECS instances (#673)
+ * /vsis3/: honour CPL_VSIL_CURL_ALLOWED_EXTENSIONS configuration option (#995)
+ * /vsis3/: ignores files with GLACIER storage class in directory listing, unless CPL_VSIL_CURL_IGNORE_GLACIER_STORAGE=NO
+ * /vsiaz/: support BlobEndpoint element in AZURE_STORAGE_CONNECTION_STRING such as found in Azurite (#957)
+ * Add a VSICurlPartialClearCache(const char* filenameprefix) function to partially clear the /vsicurl/ and related caches; and bind it to SWIG
+ * Add VSISync() to synchronize source and target files/directories
+ * /vsitar/: support headers with fields using star base-256 coding (#675)
+ * Add VSIOpenDir/VSIGetNextDirEntry/VSICloseDir and provide efficient recursive implementation for /vsis3/, /vsigs/, /vsioss/ and /vsiaz/
+ * Detect Amazon EC2 instances that use the newer hypervisor. Deprecates CPL_AWS_CHECK_HYPERVISOR_UUID and replaces with CPL_AWS_AUTODETECT_EC2
+ * CPLString class: rework visibility of exported symbols for Visual Studio (rework of #321) (#636)
+ * CPLGetPhysicalRAM(): take into account cgroup limitation (Docker use case), and rlimit (#640)
+ * CPLGetNumCPUs(): take into account cgroup limitation.
+ * ODBC: Improve Fetch() error handling.
+ * ODBC: get multiple ODBC error messages.
+ * ODBC: Fetch wide-char strings on UNIX (#839)
+ * Fix buffer overflow in GDALDefaultCSVFilename with GDAL_NO_HARDCODED_FIND (#683)
+ * VSIZipFilesystemHandler::Open: Fix leaks of poVirtualHandle (#699)
+ * Fix date-time formatting for /vsigs/, /vsiaz/ and /vsioss/ protocols with non-C locales
+ * CPLQuadTreeGetAdvisedMaxDepth(): avoid int overflow. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9248
+ * CPLJSonStreamingParser: make it error on invalid array constructs (#970)
+ * Add a GDAL_HTTPS_PROXY configuration option to selectively setup proxy for https only connections (#972)
+ * Add template class CPLAutoClose (#952)
+ * Make VSIToCPLError() handle the generic VSIE_AWSError (#1007)
+ * Propagate error handler user data correctly (#1098)
+ * CPLOpenSSLCleanup(): reset callbacks to nullptr to avoid potential segfault
+
+Core:
+ * SetStatistics(): write a STATISTICS_APPROXIMATE=YES metadata item if bApproxOK=true, and take it into account in GetStatistics() (trac #4857, trac #4576)
+ * Add percentage of valid pixels to metadata when computing raster band statistics (#698)
+ * Overview creation: avoid creating too many levels, and fix related heap buffer overflow (#557,#561)
+ * Overview: fix wrong computation of source pixel indices for AVERAGE and pixel-interleave bands
+ * Lanczos rasterio/overview/warp: do not compute target pixel if there are too many missing source pixels, to avoid weird visual effects depending on if valid source pixels match positive or negative kernel weights
+ * Overview / RasterIO resampling: do not use nodata value as a valid output value
+ * RawRasterBand: only accept VSILFILE*
+ * Add alpha mask flag for alpha band in Uint16 One band dataset (#742)
+ * GetMaskBand(): do not use a GDALNoDataMaskBand when nodata value is out of range (#754)
+ * Pleiades metadata reader: Add more strict check (#431)
+ * Statistics/minmax computation: on a float32 raster, be more tolerant when the nodata is slightly larger than +/- FLOAT_MAX
+ * GDALNoDataMaskBand: improve performance in downsampling cases
+ * GDALDestroy(): no longer call it automatically on GCC/CLang (non-MSVC) builds
+ * GDALGetJPEG2000Structure(): avoid excessive memory allocation. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8268
+ * Implement GDALAllValidMaskBand::ComputeStatistics(). Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9309
+ * PAMDataset: avoid illegal down_cast to GDALPamRasterBand. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9358
+ * GDALOpenEx(): improve anti recursion detection. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9391
+ * GDALResampleChunk32R_Convolution: avoid invalid left shift. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9477
+ * Gauss resampling: fix potential read heap buffer overflow in corner cases. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9783
+ * GDALDefaultOverviews::OverviewScan(): avoid potential infinite recursion. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10153
+ * GDALPamRasterBand::CloneInfo(): do not clone empty RAT
+
+Algorithms:
+ * OpenCL wrapper: fix memory leak
+ * Warper: add complex nodata handling in average/min/max modes
+ * TPS solver: improve numerical stability, for non Armadillo builds, for points not centered on (0,0)
+ * GCP polynomial interpolation: fix bug where worst_oultier always assumed polynomial order 2
+ * GCP polynomial interpolation: fix bug where remove_ouliers used the parameters of the reverse transformation
+ * GDALGridLinear(): speed-up search of triangle for points outside of the triangulation
+ * gdal_grid linear: avoid artifacts with degenerate triangles (#638)
+ * GDALPansharpenOperation::Initialize(): validate value of GDAL_NUM_THREADS (CID 1393944)
+ * GDALFillNodata(): add NODATA option
+ * GDALDEMProcessing(): fix null pointer dereference if psOptionsIn == nullptr (#931)
+
+Utilities:
+ * gdal_translate: make -stats option work with -co COPY_SRC_OVERVIEWS=YES (#792)
+ * gdal_translate: fix RPC correction when using -srcwin with negative offsets (#827)
+ * gdalwarp: automatically enable SKIP_NOSOURCE=YES when it is safe to do so
+ * gdalwarp: make -crop_to_cutline stick to source pixel boundaries when no raster reprojection is involved, to avoid unnecessary resampling or resolution change
+ * gdalwarp -r average: better deal with south-up oriented datasets (#778)
+ * gdalwarp: improve robustness of computation of source raster window for a given target raster window (#862)
+ * gdalwarp: allow to create bottom-up grid with -te xmin ymax ymin ymin
+ * gdalwarp: fix crash when warping on an existing dataset with less bands as needed
+ * gdal_contour: speed optimizations and capability to compute polygon isosurfaces.
+ * gdal_contour: add amin and amax parameter for gdal_contour to be used with option -p
+ * gdal_contour: avoid out-of-memory situation (#594)
+ * gdal_contour: fix GDAL 2.3 regression with fixed interval contouring that resulted in discontinuities in contour lines (#889)
+ * gdal_merge.py: deal with NaN values
+ * gdal_retile.py: fix rounding issues when computing source and target regions (#670)
+ * gdal_calc.py: add --optfile switch
+ * gdal2tiles: fix wrong computation of min zoom level in some cases (#730)
+ * gdal2tiles: add -x option for skipping transparent tile generation
+ * gdal2tiles: fix performance issue by caching source dataset; GDALAutoCreateWarpedVRT()
+ * gdal2tiles: fix issue with out-of-range nodata values (#770)
+ * gdal2tiles: restore GDAL < 2.3 behavior when output directory is not explicitly specified (#795)
+ * gdal2tiles: fix --force-kml (#809)
+ * gdal_edit.py: add -setstats to set "fake" statistics (#819)
+ * gdal_edit.py: add -unsetrpc option to gdal_edit.py, and fix GTiff driver to be able to clear RPC
+ * gdal_grid: fix -clipsrc from a vector datasource (broken at least since GDAL 2.1)
+ * gdalenhance: avoid potential nullptr dereference (CID 1394096)
+ * make sure that --config is early evaluated for config options such as CPL_VSIL_CURL_CHUNK_SIZE that are read early
+
+Multi driver changes:
+ * HFA and KEA: better support for writing RATs (trac #4903)
+ * Fix creation of large enough datasets with drivers EHdr, ENVI and ISCE that failed due to inappropriate check on file size whereas the file wasn't filled yet (#705, 2.3.0 regression)
+
+BAG driver:
+ * avoid warnings when reading georeferencing
+ * get datetime
+ * safer retrieval of variable extents
+ * add read support for variable-resolution grids, and write support for single-resolution grids
+
+E00GRID driver:
+ * correctly parse projection sections that have lines with tildes (#894)
+
+EHdr driver:
+ * only write .stx if bApproxOK=false (#514)
+
+ENVI driver:
+ * support reading truncated datasets (#915)
+
+ERS driver:
+ * fix quadratic performance in parsing .ers header. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8404
+ * avoid excessive memory allocation. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8497
+ * avoid potential stack overflow. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8614
+ * prevent infinite recursion. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8744
+ * avoid potential bad cast. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8745
+
+FIT driver:
+ * avoid excessive block size on creation. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8292
+ * error out in CreateCopy() on failed I/O on source dataset. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8338
+
+GeoRaster driver:
+ * Fix the issue by freeing the temporary lobs created by readCLob() and writeCLOB().
+
+GPKG driver:
+ * fix memleak if I/O error occurs on write
+ * retrieve original raster file when using gdal_translate -co APPEND_SUBDATASET=YES with other gdal_translate switches
+ * copy source metadata when using TILING_SCHEME
+ * properly delete gridded coverage raster layers
+
+GRIB driver:
+ * replace DataSource and derived classes with VSILFILE directly for > 4GB file support on Windows
+ * turn printf() warning as CPLDebug() messages
+ * read and write missing data values correctly for complex packing when original data is integer (#1063)
+ * g2clib: avoid int overflow. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8194
+ * g2clib: avoid potential out of bound access (CID 1393528)
+ * degrib: fix floating point division by zero. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9407.
+ * degrib: avoid potential floating point division by zero. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10291
+ * add UNIT[] node to SRS on reading, so that is valid
+
+GTiff driver:
+ * Add TIFF Lerc codec (in GTiff driver itself)
+ * Add TIFF WebP codec (in libtiff)
+ * save XMP on field TIFFTAG_XMLPACKET (#767)
+ * fix retrieving mask band of overview band when the mask is external. Fixes -co COPY_SRC_OVERVIEWS=YES of such datasets (#754)
+ * improve progress report in CreateCopy() when there is a mask (#935)
+ * improve performance reading multi-band 1-bit data. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7840.
+ * internal libtiff: updated to libtiff 4.0.10
+ * internal libgeotiff: resync with upstream.
+ * workaround bug in currently released libgeotiff versions, where when rewriting a ASCII key with a string value longer than the original value (#641)
+ * allow the use of PREDICTOR with ZSTD compression
+ * avoid various memory corruptions in case of some corrupted file. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8488
+ * load PAM if not already done when GetDefaultRAT() is called
+ * fix missing #ifdef causing compilation failure due to missing bTryCopy (#946)
+
+HDF4 driver:
+ * quote swath and field names if needed (if they contain spaces, column, quotes) in HDF4_EOS subdataset names
+
+HDF5 driver:
+ * add VSI functionality (#786)
+ * fix reading variable names with single character (#622)
+ * fix HDF5 object leak (thus preventing file closing) on datasets with variable length attributes (#933)
+
+HFA driver:
+ * fix floating point division by zero. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9201
+ * fix division by zero. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10190
+
+HTTP driver:
+ * do not immediately delete a file used by the JP2OpenJPEG driver
+
+ILWIS driver:
+ * Fix performance issue on creation with big number of bands. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9062
+
+IRIS driver:
+ * add UNIT[] node to SRS on reading, so that is valid
+ * avoid infinite loop. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8256 and 8439
+
+ISCE driver:
+ * do not try to stat() mainfile.xml if mainfile does not exist
+
+ISIS3 driver:
+
+FITS driver:
+ * allow reading/writing beyond 2 billion pixels limit
+
+JP2OpenJPEG driver:
+ * allow YCC for non-Byte datasets; and allow 4-band MCT with openjpeg >= 2.2
+ * add CODEBLOCK_STYLE creation option for OpenJPEG >= 2.3
+ * add support for generating and using external overviews
+
+JPEG driver:
+ * slightly improve performance of whole RGB image loading with pixel-interleaved buffer
+ * Internal libjpeg: Avoid integer overflow on corrupted image in decode_mcu_DC_first() (https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9447)
+
+JPEGLS driver:
+ * Add support for CharLS 2 (#632)
+
+MRF driver:
+ * Add TestBlock(), skip empty areas when building overviews
+ * Fix detection of Lerc2 data
+ * Resync with upstream LercLib and put it in third_party/LercLib
+
+NetCDF driver:
+ * add VSI functionality on Linux (#786)
+ * add support for longitude values wrapping at 180deg of longitude (#1114)
+ * avoid use of uninitialized variable when reading blocks in creation mode
+
+NGSGEOID driver:
+ * report a CRS that conforms to the official publications for GEOID2012 and USGG2012 datasets (#1103)
+
+NITF driver:
+ * avoid excessive processing time on corrupted files. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8972
+ * avoid heap-buffer-overflow for VQ compression. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9467
+
+PCIDSK driver:
+ * add back support for creating external overviews, removed years ago when switching to the new PCIDSK SDK (#887)
+
+PCRaster driver:
+ * libcsf: avoid potential out of bound access (CID 1074445)
+
+PDF driver:
+ * Remove forced use of libstdc++ for macOS when building plugin (#888)
+
+PDS driver:
+ * deal with detached labels whose line spacing is not a multiple of record size (#955)
+ * add support for reading CRISM images
+ * add support for ^QUBE = number for multi-band images
+
+PDS4 driver:
+ * fix georeferencing reading/writing to use pixel corner convention (#735)
+ * add UNIT[] node to SRS on reading, so that is valid
+
+PostgisRaster driver:
+ * add support for out-db rasters (Trac #3234)
+ * use ST_BandFileSize of PostGIS 2.5 when available for outdb_resolution=client_side_if_possible
+ * improve performance of line by line reading; add performance hints section in the doc
+ * fix CreateCopy() when PostGIS is not in public schema
+ * add quoting of identifiers
+
+PRF driver:
+ * Fix Photomod x-dem files georeference
+
+RasterLite2 driver:
+ * fail on Create() that is not supported
+
+RDA driver:
+ * enable support for DG RDA Image Reference string
+
+RMF driver:
+ * Add support JPEG compressed RMF datasets (#691)
+ * Add optional projection import/export from EPSG code (#701)
+ * Create compressed datasets: LZW, DEM, JPEG (#732)
+ * Cache decoded tile to improve performance of interleaved access
+ * Parallelize data compression, add internal tile write-cache, add compressed overviews support (#748)
+ * Fix 4-bit dataset reading
+ * Expose NBITS to metadata
+
+RS2 driver:
+ * avoid potential memleak (CID 1393537, CID 1393534, CID 1074387)
+
+SENTINEL2 driver:
+ * Add support of S2x_MSIL2A files (#1069)
+
+SGI driver:
+ * writer: avoid out-of-bound buffer access. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8889
+
+SIGDEM driver:
+ * be more robust against excessive memory allocation attempt
+ * avoid floating point division by zero. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11220
+
+SDTS driver:
+ * avoid long processing time on corrupted dataset. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11219
+
+SRP driver:
+ * ASRP/USRP: allow opening files padded with 0x5E / ^ character without emitting error (#838)
+
+USGSDEM driver:
+ * fix reading of Benicia.dem and Novato.dem (trac #4901, #583)
+ * optimize I/O access a bit
+ * avoid potential out-of-bounds access (CID 1393532)
+ * avoid int overflow. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9475
+
+VRT driver:
+ * GDALCreateWarpedVRT(): automatically set GCI_AlphaBand on the alpha band
+ * data/gdalvrt.xsd: add GDALRasterAttributeTable (#818)
+ * VRTComplexSource: make sure that min and max values in case of exponential resampling are properly computed
+ * ComputeStatistics(): optimize when nodata is set on a single SimpleSource
+ * Fix issue when opening VRT with large number of bands (#1048)
+ * deal with serialized nodata value that is slightly outside Float32 validity range (#1071)
+ * fix source window computation that caused sub-pixel shift with non-nearest resampling
+ * fix potential int overflow on invalid VRT
+
+WCS driver:
+ * Parse envelopes with time periods. Improve error reporting. Fix one SUBDATASETS metadata thing. More metadata from Capabilities to metadata. Print some URLs in debug mode. Unique subset params in URLs. Add time domain interval to metadata.
+ * GeoServer does not like primary subsets to have postfixes. Fix service dirty issue. Add GeoServer TimeDomain coverage metadata. Do not put service parameter into subdataset name and use generic coverage parameter
+ * deal with GDALPamDataset::GetMetadata returning nullptr. (#648)
+
+WMTS driver:
+ * avoid issue with reprojection of layer extent into TileMatrixSet SRS
+ * fix issue with inappropriate zoom level being selected causing integer overflow in raster dimension computation
+ * fix potential off-by-one pixel when compositing the underlying WMS/TMS source into the final raster
+
+## OGR 2.4.0 - Overview of Changes
+
+Core:
+ * Add JSON field subtype for String fields
+ * OGR SQL: avoid int overflow on -(-9223372036854775808) evaluation. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8717
+ * OGR SQL: evaluation modulo operator on floating point values as a floating point modulo. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8761.
+ * OGR SQL: swq_expr_node::Evaluate(): avoid too deep recursion. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8836
+ * OGRLineString::TransferMembersAndDestroy(): fix crashing issue with M component. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8773.
+ * OGRGeometry::exportToGEOS(): fix potential out-of-bounds write on some GeometryCollection with TIN/PolyhedralSurface (#688)
+ * OGRGeometryFactory::organizePolygons(): improve performance for polygons with many consecutive identical nodes. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9618
+ * Fix IsValid() for a TRIANGLE with GEOS, but without SFCGAL
+ * morphToESRI(): fix a heap user-after-free.
+ * OGRFeature::SetField( int iField, const char * const * papszValues ): avoid potential invalid access to pauFields[iField].StringList.paList
+ * SQLite dialect: fix when ROWID is used in WHERE clause and the source layer has a real FID column name
+ * GML geometry parser: recognize MultiGeometry.geometryMembers syntax (refs https://issues.qgis.org/issues/19571)
+ * OGRGetXMLDateTime(): Interpret TZFlag correctly (#996)
+ * OGRFeatureStyle: Restore font field at OGRStyleSymbol
+
+OGRSpatialReference:
+ * importFromEPSG(): append ' (deprecated)' at end of deprecated GCS and GEOCCS (#646)
+ * ogr_opt.cpp: fix wrong values and add missing values in papszProjectionDefinitions[]
+ * importFromProj4/exportToProj4: fix typo in the PROJ method name of InternalMapOfTheWorldPolyconic which is imw_p
+ * Krovak: explicit that alpha and Pseudo_standard_parallel_1 are hardcoded in PROJ
+ * SetNormProjParm(): avoid division by zero. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10588
+ * FindMatches(): if the input SRS has a EPSG code, check that its definition and the EPSG one actually matches (#990)
+
+Utilities:
+ * ogr2ogr: reject -append, -select options together
+ * ogr2ogr: speed-up in case of big number of field name clashes. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8960
+ * ogr2ogr: make -clipsrc work when output dataset has no geometry field (#943)
+ * ogrlineref: fix tolerance for not geographic spatial reference
+ * ogrmerge.py: avoid exception in error code path of GetOutputDriverFor()
+ * ogrmerge.py: fix issue with non-ASCII characters (fixes #1067)
+
+Multi driver changes:
+ * KML/LIBKML: robustify for out-of-memory conditions (fixes https://issues.qgis.org/issues/19989)
+ * XLSX / ODS: avoid harmless warning in some cases when guessing column data types
+
+AVCE00 driver:
+ * avoid perforance issues on huge lines. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8284
+ * fix performance issue on reading PRJ section. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9061
+
+BNA driver:
+ * refuse to open existing file in update mode, since it causes later crashes when attempting to add new features (https://issues.qgis.org/issues/18563)
+ * avoid long processing. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8754
+ * more efficient building of polygons. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10951
+
+CAD driver:
+ * Fix read objects map. Upgrade version of libopencad to 0.3.4. (#677)
+ * Fix wrong OGRCircularString construction from CADCircle. (#736)
+ * avoid integer overflow. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8385
+ * Fix buffer overflow on skip read. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9107
+
+Carto driver:
+ * Use new /sql/copy-from end point for writing (#715)
+ * fix ICreateFeatureCopy() with unset fields
+
+CSV driver:
+ * in writing, use WKT instead of actual geometry column name if GEOMETRY=AS_WKT mode is used without CREATE_CSVT=YES (fixes #660)
+ * writer: limit to 10000 fields to avoid performance issues. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9336 (8449 as well)
+ * avoid endless loop when iterating and updating features (#919)
+
+DXF driver:
+ * add PaperSpace field (Trac #7121)
+ * allow attributes with spaces in the tag
+ * Correctly handle non-uniformly-weighted spline HATCH boundaries (#1011)
+ * avoid null pointer dereference when DXF_MAX_BSPLINE_CONTROL_POINTS is hit. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8254.
+ * Fix reporting of wrong line numbers in errors (fixes #726)
+ * Don't crash when spline control point limit is reached
+ * fix memory leak in case of attempt to write GeometryCollection of unsupported type
+
+EDIGEO driver:
+ * reading multipolygons (trac #6955, #711)
+
+ElasticSearch driver:
+ * add compatibility with ES v6.0
+ * add a USERPWD open option
+ * add lazy loading of layers
+ * add a LAYER open option
+ * skip xpack indices, and do not emit 503 error when listing unauthorized layers
+ * add a INDEX_DEFINITION layer creation option
+ *allow several geometry fields of type GEO_POINT to be created
+
+ESRIJson driver:
+ * parse documents that lack 'geometryType' member (#914)
+
+GeoJSON driver:
+ * fix type deduction when there is a Feature.id of type string and Feature.properties.id of type int. The later has precedence over the former (arbitrary decision) (#669)
+ * properly flush the file in SyncToDisk() in append situations (https://issues.qgis.org/issues/18596)
+ * parse '{"type": "GeometryCollection", "geometries": []}' as empty geometrycollection
+ * increase max memory allowed to parse a single feature (#807)
+ * remove topojson from extensions recognized by the driver
+ * add partial support for field names differing by case (#1057)
+ * RFC7946 writer: clip and offset geometries outside [-180,180] (#1068)
+ * no longer write NaN/Infinity values by default (#1109)
+
+GeoRSS driver:
+ * avoid excessive processing time. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9263
+
+GML driver:
+ * avoid fetching SRS from http
+ * fix potential memory leak in case of duplicated name of geometry fields in .gfs
+ * improve performance for large number of attributes. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9038.
+
+GPKG driver:
+ * add read/write support for JSON field subtype
+ * speed up GetExtent() on huge tables with rtree. Refs https://issues.qgis.org/issues/18402
+ * take into ROLLBACK TO SAVEPOINT to invalidate cached feature count
+ * make sure to not invalidate POSIX advisory locks
+ * remove useless check that encoding is UTF-8 (#793)
+ * fix typo in gpkg_metadata_reference_column_name_update trigger definition
+ * optimize table renaming by avoiding to drop the spatial index, but just renaming it
+
+IDF driver:
+ * use a temporary SQLite database (when driver available) for files larger than 100 MB
+ * add support for Z coordinate (#964)
+
+LIBKML driver:
+ * add support for reading several schemas for the same layer (#826)
+ * make edition of existing file work (https://issues.qgis.org/issues/18631)
+ * implement OGRLIBKMLLayer::SyncToDisk() to fix https://issues.qgis.org/issues/18631
+ * workaround weird issue with OSGeo4W and newline characters in <coordinate> element (fixes https://issues.qgis.org/issues/19215)
+
+MITAB driver:
+ * fix potential use of uninitialized memory
+ * improve performance of adding many fields in a .tab. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8559
+ * fix geometry corruption when editing some datasets (#817)
+ * fix writing .tab when field name has invalid characters in it (#924)
+ * Expose font family to feature style symbol ID
+
+MSSQLSpatial driver:
+ * Add support for MSODBCSQL (#1136)
+ * Fix layer-schema separation problem (#586)
+ * Fix bulk copy for multiple layers (#619)
+ * Accept datetime values (#841)
+ * Don't truncate string values on Unix (#843)
+ * Create 3D features (#852)
+ * enforce read-only/update mode for CreateFeature/SetFeature/DeleteFeature
+ * fix retrieval of geometry column on Linux for SQL result layers
+ * Use only valid SRIDs; Create features preserving SRID (#860)
+ * Fix geometry parser with M values (#1051)
+ * Assign new ID following an INSERT (#1052)
+ * Adding configuration option MSSQLSPATIAL_ALWAYS_OUTPUT_FID (#1101)
+
+MVT driver:
+ * writer: do not ignore Z/M/ZM geometries
+ * writer: make it possible to output to /vsizip/output.zip out-of-the-box
+ * disable check on 'extent' field in identifiation method, which rejected tiles with extent > 16384
+ * avoid recursion on opening. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10226
+
+MySQL:
+ * add support for MySQL 8.0
+
+NAS driver:
+ * speed-up in case of huge number of attributes. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7977
+
+OCI driver:
+ * Ensure table Dims and GTYPE are retrieved for the correct table (#629)
+
+OGR_GMT driver:
+ * avoid performance issue when opening layer with big number of fields. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8259.
+
+OGR_PDS driver:
+ * avoid int overflow. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9136
+
+OpenFileGDB driver:
+ * Catch a NaN in FileGDBDoubleDateToOGRDate to prevent undefined behavior. (#740)
+ * fix potential crash on corrupted datasets. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11313
+
+OSM driver:
+ * allow parsing files with up to 10 000 nodes per way (#849)
+ * avoid array overflow with ways with many tags. Relates to https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9618
+
+PCIDSK driver:
+ * defer writing of segment header to improve performance when creating huge number of fields. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8191
+ * fix performance issue when inserting in layer with huge number of fields. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8335.
+
+PDF driver:
+ * fix the parser of drawing instructions that had issues with array objects
+
+PG driver:
+ * add SPATIAL_INDEX=SPGIST/BRIN layer creation options (and PGDump as well) (#892)
+ * add read/write support for JSON field subtype
+
+PGDump driver:
+
+PLScenes driver:
+ * fix /vsicurl/ raster download
+ * fix scene activation
+ * add ground_control field in layer definition
+
+Shapefile driver:
+ * avoid being dependent on correctness of file size field in .shp
+ * fix corruption when deleting a field from a .dbf without records (#863)
+ * Add CP1251 codepage name synonym (ANSI 1251) for DBF files.
+
+S57 driver:
+ * add S57_AALL, S57_NALL, S57_COMF, S57_SOMF creation options (#810)
+
+SOSI driver:
+ * fix memory leaks / null pointer dereference
+
+SQLite/Spatialite driver:
+ * avoid SetFeature() to reset the iterator (#964)
+ * Spatialite: read table name in its original case (#1060)
+ * do not run spatial index creation in rollback code
+
+VFK driver:
+ * create index on ID column only for selected (geometry-related) layers (#498)
+ * create db indices after inserting data (#498)
+ * create indices before resolving geometry
+ * new open option - include filename field (#564)
+ * speed up sequential feature access
+ * fix leak of unfinalized statement (#634)
+ * fix file check on Windows with large files (#637)
+ * fix big int overflow, force text attributes (PODIL_CITATEL/PODIL_JMENOVATEL) to avoid int64 overflow (#672)
+ * fix missing geometry for SBPG layer (#710)
+ * missing fields in update mode gfs (#734)
+
+VRT driver:
+ * revise logic for handling the <FID> element (or when it is omitted) (#941)
+
+WFS driver:
+ * avoid potential bad cast. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9800
+
+WFS3 driver:
+ * update to current version (May 2018) of the API draft (#626)
+ * add USERPWD open option
+
+XLSX driver:
+ * avoid stack buffer overflow is creating too many fields. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8198
+ * avoid timeout. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8225
+ * fix null pointer dereference. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8286
+
+## SWIG Language Bindings
+
+All bindings:
+ * use a dedicated VSILFILE class to avoid type mismatch (#601)
+ * reload drivers if GDAL_SKIP/OGR_SKIP is defined with --config in gdal/ogr.GeneralCmdLineProcessor()
+ * Add VSIFFlushL()
+ * Add VSIErrorReset()
+
+CSharp bindings:
+ * GDALCreateCopy.cs sample code: Correct misspelling in info message (#647)
+ * SWIG 2.x and 3.x compatibility (#824)
+
+Java bindings:
+ * update to Java 1.6 requirement to please 'ant maven' target
+ * Fix JNI library bundling.
+
+Perl bindings:
+ * fix make dependencies (#43)
+
+Python bindings:
+ * Python logging improvements: add gdal.ConfigurePythonLogging() function  (#1017)
+ * added support for band / pixel interleave for numpy array
+ * fixed NULL check on python's swig VSIFReadL (#572)
+ * fix dataset[slice] access (#574)
+ * added support for reading vsi data as memorybuffer and writing buffers via VSIFWriteL
+ * setup.py: add more prominent warning when numpy is not available (#822)
+ * for utilities as library functions, when gdal.UseExceptions() is enabled, do not emit Python exceptions when the operation is reported as successful
+ * update import path
+ * avoid crash in ReadRaster() under low memory condition (#1026)
+
+# GDAL/OGR 2.3.0 Release Notes
+
+Note: due to the change of SCM during the development, #XXXX still refers to
+Trac tickets. GitHub tickets are explicitly indicated with github #XXXX
+
+## In a nutshell...
+
+ * New GDAL drivers:
+   - PDS4: read/write
+   - RDA: DigitalGlobe Raster Data Access (read-only)
+ * New OGR drivers:
+   - MVT: add read/write driver for Mapbox Vector Tile standalone files or tilesets
+   - ESRIJson and TopoJSON: read-only, split from existing code of the GeoJSON driver
+   - WFS3: *experimental* read-only driver
+ * RFC 68: Make C++11 a build requirement
+    https://trac.osgeo.org/gdal/wiki/rfc68_cplusplus11
+ * RFC 70: Guess output format from extension of output filename, if no explicit format passed to C++ or Python utilities
+    https://trac.osgeo.org/gdal/wiki/rfc70_output_format_guess
+ * RFC 71: Move to GitHub for source code repository and issue tracker.
+    https://trac.osgeo.org/gdal/wiki/rfc71_github_migration
+ * Significantly improved drivers:
+    - MBTiles (vector tiles support)
+    - DXF
+    - GRIB (GRIB2 write support)
+    - WCS (support WCS 2.0)
+ * Improvements in network-based /vsi handlers: /vsicurl, /vsis3, /vsigs. Add:
+     - /vsiaz for Microsoft Azure Blobs
+     - /vsioss for Alibaba Cloud Object Storage Service
+     - /vsiswift/ for OpenStack Swift object storage
+ * Command line utilities: use Unicode main on Windows to avoid issues with non-ASCII characters (#7065)
+ * Update to EPSG v9.2 (#7125)
+ * Update data/esri_extra.wkt and add data/esri_epsg.wkt, taken from https://github.com/Esri/projection-engine-db-doc (Apache v2 license) (#2163)
+ * Add support for PROJ.5 new API (requires proj 5.0.1 or later). PROJ 4.X is still supported.
+ * More than 1000 fixes for issues/vulnerabilities found by OSS-Fuzz
+ * Remove raster OGDI driver (vector OGDI driver still there) (#7087)
+
+## New installed files
+
+ * data/pds4_template.xml
+ * data/esri_epsg.wkt
+
+## Backward compatibility issues
+
+See MIGRATION_GUIDE.TXT
+
+## GDAL/OGR 2.3.0 - Build changes
+
+Build(Unix):
+ * refresh config.{guess,sub} from latest upstream; upgrade to libtool 2.4.6 files
+ * add a --with-rename-internal-shapelib-symbols option that defaults to yes if --with-hide-internal-symbols is set; and make -with-rename-internal-libtiff/libgeotiff-symbols also defaults to yes when --with-hide-internal-symbols is set
+ * add a --with-charls switch (enabled by default) to compile that JPEGLS driver
+ * make --without-static-proj and --with-fgdb an error when filegdb (>= 1.5) embeds proj.4 symbols
+ * add --with-zstd switch (for GTiff ZStd compressino with internal libtiff)
+ * add support for ECW SDK 5.4, by detecting if we must link against the newabi or oldabi link
+ * fix detection of 64bit file API with clang 5 (#6912)
+ * GNUmakefile: add a static-lib and install-static-lib targets
+ * use .exe extension when building with mingw64* toolchains (#6919)
+ * Pass --silent to libtool in compile (C and C++), link, install and clean modes.
+ * Limit number of installed cpl*.h files installed to a fixed list.
+ * configure / m4/acinclude.m4: replace use of CCFLAGS by plain CFLAGS (github #529)
+ * configure / m4/acinclude.m4: require 'long long' type (github #530)
+
+Build(Windows):
+ * always build the PDF driver, even when none of poppler/podofo/pdfium are available, in which case it is write-only (#6938)
+ * add new targets bindings, bindings_install and bindings_clean that depend on the new BINDINGS option in nmake.opt (#6948)
+ * for Kakadu, add capability to build as a plugin, and make it possibly to link only against the Kakadu .lib/.dll instead of incorporating some of its .obj (#6940)
+ * nmake.opt: Ensure PDB is included in release DLL if WITH_PDB requested (#7055)
+ * nmake.opt: use /MDd for OPTFLAGS for DEBUG=1 builds (#7059)
+ * nmake.opt: avoid some settings to be defined unconditionally (#5286)
+ * nmake.opt: add configuration to enable openssl (which is needed for thread-safe curl use)
+
+Build(All):
+ * fix compilation error with Crypto++ 7.0.0 (github #541)
+
+Developer corner:
+ * Add scripts/setdevenv.sh to setup env variables needed for running GDAL without installing it
+
+## GDAL 2.3.0 - Overview of Changes
+
+Port:
+ * Add CPLJSONDocument/Object/Array - C++ thin wrapper around json-c library. (github #282)
+ * /vsicurl/: fix occasional inappropriate failures in Read() with some combinations of initial offset, file size and read request size (#6901)
+ * /vsicurl/: add a CPL_VSIL_CURL_NON_CACHED configuration option, so as to be able to specify filenames whose content must not be cached after dataset closing
+ * /vsicurl/: honour GDAL_HTTP_MAX_RETRY and GDAL_HTTP_RETRY_DELAY config options. Add extended filename syntax to pass options use_head, max_retry, retry_delay and list_dir.
+ * /vsicurl/: enable redirection optimization on signed URLs of Google Cloud Storage. Helps for the PLScenes driver (fixes #7067)
+ * /vsicurl/ and derived filesystems: redirect ReadDir() to ReadDirEx() (#7045)
+ * /vsicurl/ and related file systems: add compatibility with HTTP/2 (requires recent enough curl, built against nghttp2). Can be controlled with the GDAL_HTTP_VERSION=1.0/1.1/2/2TLS
+ * /vsicurl/: fix 2.2 regression regarding retrieval of file size of FTP file (#7088)
+ * /vsicurl/: when stat'ing a file, fallback from HEAD to GET if the server issues a 405 error
+ * Add a VSICurlClearCache() function (bound to SWIG as gdal.VSICurlClearCache()) to be able to clear /vsicurl/ related caches (#6937)
+ * CPLHTTPSetOptions(): use SearchPathA() for curl-ca-bundle.crt on Windows. See https://github.com/curl/curl/issues/1538
+ * CPLHTTPFetch() / vsicurl: add retry on HTTP 429, and add exponential backoff logic for retry delay
+ * CPLHTTPFetch(): when openssl is enabled, and used by libcurl, use openssl thread safety mechanism to avoid potential crashes in multithreading scenarios
+ * CPLHTTPFetch(): add a SSL_VERIFYSTATUS option / GDAL_HTTP_SSL_VERIFYSTATUS configuration option to check OCSP stapling
+ * CPLHTTPFetch(): add a USE_CAPI_STORE option / GDAL_HTTP_USE_CAPI_STORE configuration option to use certificates from the Windows certificate store
+ * Ignore SIGPIPE that may arose during curl operations (mostly when using OpenSSL for TLS)
+ * Add CPLHTTPMultiFetch() and CPLMultiPerformWait()
+ * /vsis3/: support reading credentials from ~/.aws/credentials, ~/.aws/config or IAM role on EC2 instances
+ * /vsis3/: properly handle cases where a directory contains a file and subdir of same names; implement Mkdir() and Rmdir()
+ * /vsis3/: fix Seek(Tell(), SEEK_SET) fails if current position is not 0 (#7062)
+ * /vsis3/: properly handle 307 TemporaryRedirection (#7116)
+ * /vsis3/: fix support of bucket names with dot in them (#7154)
+ * /vsis3/: make multipart upload work with Minio
+ * /vsigs/: add new authentication methods using OAuth2 refresh token or service account or Google Compute Engine VM authentication, or using ~/.boto file
+ * /vsigs/: add write, Unlink(), Mkdir() and Rmdir() support
+ * /vsigs/: allow authentication to be done with the GOOGLE_APPLICATION_CREDENTIALS configuration option pointing to a JSon file containing OAuth2 service account credentials
+ * /vsis3/ and /vsigs/: take into account user provided x-amz- / x-goog- HTTP headers with GDAL_HTTP_HEADER_FILE
+ * Fix CPLReadDirRecursive() to behave properly on /vsis3/ buckets that have foo (file) and foo/ (sub-directory) entries (#7136)
+ * /vsis3/: add a AWS_NO_SIGN_REQUEST=YES configuration option to disable request signing (#7205)
+ * /vsis3, /vsigs, /vsioss, /vsiaz: fix support of non-ASCII characters in keys (#7143)
+ * Add VSIGetActualURL(), typically to expand /vsis3/ paths to full URLs, and bind it to SWIG as gdal.GetActualURL()
+ * Add VSIGetSignedURL()
+ * Add VSIGetFileSystemsPrefixes() and VSIGetFileSystemOptions()
+ * CPLFormFilename() / CPLProjectRelativeFilename(): add /vsis3 and similar file systems to the list of filesystems requiring unix separator (github #281)
+ ù Make CPLFormFilename() properly work with http[s:]// filenames
+ * Add a CPLGetErrorCounter() function that can be used to test if new errors have been emitted
+ * Add cpl_safemaths.hpp to detect integer overflows (#6229)
+ * /vsigzip/: avoid trying to write a .gz.properties file on a /vsicurl/ file (#7016)
+ * CPLStrtod(): parse string like '-1.#IND0000000' as NaN instead of -1 (seen when looking at refs #7031, but does not fix it)
+ * Fix CPLCopyTree() that doesn't properly on MSVC 2015 (and possibly other platforms) (#7070)
+ * /vsimem/: to improve Posix compliance, do not make Seek() after end of file error out in read-only mode
+ * cpl_config.h.vc: define HAVE_LONG_LONG 1; cpl_port.h remove MSVC specific logic for int64 (github #264)
+ * /vsisparse/: make Read() detect end of file
+ * GDALVersionInfo("BUILD_INFO"): report if GEOS is available
+ * Add VSIMkdirRecursive() and VSIRmdirRecursive()
+ * Add CPLGetHomeDir()
+ * CPLSetErrorHandler(): avoid later crashes when passing a null callback (github #298)
+ * CPLHTTPParseMultipartMime(): make it format the pasMimePart[].papszHeaders in a standard key=value format without EOL
+ * CPLString: avoid std::string symbols to be exported with Visual Studio (#7254)
+ * I/O on Android: add support for 64-bit file operations if API level >= 24 (Android 7.0 or later) (github #339)
+
+Core:
+ * add GDALDataTypeIsFloating, GDALDataTypeIsSigned, GDALDataTypeUnionWithValue, GDALFindDataType, GDALFindDataTypeForValue (github #215). Add GDALDataTypeIsInteger()
+ * Cleanup ARE_REAL_EQUAL() and GDALIsValueInRange() (#6945, #6946)
+ * Various SSE2/AVX2 optimizations for GDALCopyWords()
+ * GDALGCPsToGeoTransform(): add GDAL_GCPS_TO_GEOTRANSFORM_APPROX_OK=YES and GDAL_GCPS_TO_GEOTRANSFORM_APPROX_THRESHOLD=threshold_in_pixel configuration option (#6995)
+ * RawDataset::IRasterIO(): don't assume all bands are RawRasterBand
+ * GDALOpenInfo: make number of bytes read at opening configurable with GDAL_INGESTED_BYTES_AT_OPEN
+ * GDALCopyWholeRasterGetSwathSize(): try to use at least 10 MB for swath size
+ * GDALDatasetCopyWholeRaster(), GDALRasterBandCopyWholeRaster(), GDALCreateCopy(): always call AdviseRead() on the full extent of the source dataset (#7082)
+ * make DefaultCreateCopy() copy RAT
+ * Generate gcore/gdal_version.h from git date and sha for a dev version (Unix builds only)
+ * Add GDALDataset::Open()
+ * Add C++ iterators for layers, bands and features in GDALDataset
+ * External .ovr: make sure that ExtraSamples tag is written
+ * Overview creation: avoid creating too many levels, and fix related heap buffer overflow (github #557)
+ * SetStatistics(): write a STATISTICS_APPROXIMATE=YES metadata item if bApproxOK=true, and take it into account in GetStatistics() (#4857,#4576)
+
+Algorithms:
+ * Contour: make sure no 3D geometry is created unless -3d switch is defined (#336)
+ * Warper: revise/improver how working data type is inferred from other parameters
+ * Warper: when operating on single-band, skip target pixels whose source center pixel is nodata (2.2 regression, #7001)
+ * Warper: avoid blocking when number of rows is 1 and NUM_THREADS > 1 (#7041). Also limit the number of threads so that each one processes at least 65536 pixels
+ * Warper: use AdviseRead() when source chunks are sufficiently compact (#7082)
+ * Warper: fix rounding error in scale factor computation (github #273)
+ * Warper: use panSrcBands[0] in the single band case (regression fix, github #295)
+ * Warper: add very special case to handle situation where input raster edge touches dateline, but proj.4 transformation involves a discontinuity (#7243)
+ * Geoloc transformer: fix systematic pixel shift (github #244)
+ * RPC transformer: set output coordinates to HUGE_VAL when failure occurs, so that a following coordinate transformation can detect the error too (#7090)
+ * RPC transformer: return NULL at instantiation if the specified RPC_DEM file cannot be opened
+ * Export GDALRegisterTransformDeserializer() and GDALUnregisterTransformDeserializer() (#5392)
+ * GDALRasterize(): avoid hang in some cases with all_touched option (#5580)
+ * Optimize GDALResampleConvolutionVertical() and GDALPansharpenOperation::WeightedBroveyPositiveWeightsInternal() for SSE2 / AVX
+ * Overview / resampling: speed-up bicubic upsampling for SSE2
+ * GDALGrid() with linear algorithm: avoid assertions/segmentation fault when GDALTriangulationFindFacetDirected() fails (#7101)
+ * GDALComputeProximity(): fix int32 overflow when computing distances on large input datasets (#7102)
+ * GDALAllRegister(): make sure that all drivers that need to look for sidecar files are put at the end
+
+Utilities:
+ * GDAL and OGR C++ and Python utilities: accept -f or -of to specify output format
+ * --optfile: re-parse inlined content with GDALGeneralCmdLineProcessor(), in particular to support --config key value in option file
+ * gdalsrsinfo: for consistency with other output, do not quote the proj.4 string output
+ * gdal_rasterize: fix segfault when rasterizing onto a raster with RPC (#6922)
+ * gdal_rasterize: add a -to option to specify transformer options
+ * gdal_rasterize / GDALRasterizeGeometries(): optimize rasterization for large number of small geometries (#5716)
+ * gdal_rasterize: fix crash in some situations with ALL_TOUCHED option (#7176)
+ * gdaladdo: support not specifying explicitly overview factors, and add -minsize option
+ * gdal_translate: add -a_scale / -a_offset (#7093)
+ * gdal_translate: add -colorinterp / -colorinterp_X options
+ * DefaultCreateCopy()/gdal_translate: do not destroy target file in case of failed copy wen using -co APPEND_SUBDATASET=YES (#7019)
+ * gdal_translate: make -b mask[,xx] use the appropriate band data type (#7028)
+ * gdal_translate property copy RAT (or not-copy RAT when -norat is specified)
+ * gdalwarp: make -crop_to_cutline works when RPC transform is involved
+ * gdalwarp: for RPC warping add a few extra source pixels by default
+ * gdalwarp: -crop_to_cutline: reduce number of iterations to find the appropriate densification (#7119)
+ * gdalwarp: do not set implicitly nodata on destination dataset when -dstalpha is specified (#7075)
+ * gdalwarp: display errors (such as invalid open options) on successful opening of destination dataset
+ * gdalwarp: fix "-dstnodata inf" (#7097)
+ * gdalwarp: fix when several input datasets with different SRS are specified, and no explicit target SRS is provided (#7170)
+ * gdalwarp: make sure to try to redefine the destination nodata value from the source nodata even if the newly created dataset has already set a default nodata value (#7245)
+ * gdalwarp: improve progress meter when using multiple source files. For GDALWarp() function, make sure that the progress goes monotonically from 0 to 1. (#352)
+ * gdal2tiles.py: fix GDAL 2.2 regression where tilemapresource.xml was no longer generated (#6966)
+ * gdal2tiles: add --processes=intval option to parallelize processing (#4379)
+ * gdalinfo --format / ogrinfo --format: report extra metada items in a 'Other metadata items:' section (#7007)
+ * gdalinfo: make sure to display geodetic coordinates always in degree (and not potentially in another unit such as grad) (#4198)
+ * gdalinfo: report 'Mask Flags: PER_DATASET NODATA' when NODATA_VALUES metadata item is specified
+ * gdal_edit.py: add a -colorinterp_X red|green|blue|alpha|gray|undefined option to change band color interpretation
+ * gdal_contour: return with non-0 code if field creation or contour generation failed  (#7147)
+ * gdal_retile.py: fix failure if the filename contains % (percent) symbol (#7186)
+ * gdalbuildvrt: make warnings about heterogeneous projection/band characteristics more explicit (#6829)
+ * gdalbuildvrt: add support for band scale and offset (#3221)
+ * gdal_fillnodata.py, gdal_pansharpen.py, gdal_polygonize.py, gdal_proximity.py, gdal_sieve.py, rgb2pct.py: avoid potential problem on Windows in verbose mode (github #458)
+
+Sample Python scripts:
+ * Add gdal_mkdir.py, gdal_rm.py and gdal_rmdir.py samples scripts
+ * gdalcopyproj.py: fix use of GCP related API (github #255)
+ * ogr2vrt.py: automatically set relativeToVRT=1 for input and output filenames givn in relative form in the same directory
+
+Multi driver changes:
+ * tag (and do needed changes) CALS, FUJIBAS, PAUX, SGI, RS2, GXF, TERRAGEN, Rasterlite, CPG, MSGN, Leveller as supporting GDAL_DCAP_VIRTUALIO
+
+AIGRID:
+ * fix handling on raw 32-bit AIG blocks (#6886)
+
+BT driver:
+ * make GetNoDataValue()/SetNoDataValue() use PAM
+
+DIMAP driver:
+ * do not report dummy geotransform (see https://lists.osgeo.org/pipermail/gdal-dev/2018-January/048014.html)
+
+DTED driver:
+ * Support VerticalCS for DTED and SRTM drivers when REPORT_COMPD_CS config option is set (github #237)
+
+ECW driver:
+ * fix Windows compilation against old ECW SDK and VS < 2015 (#6943)
+ * make AdviseRead() to store its call parameters, and only do the actual work in RunDeferredAdviseRead() if TryWinRasterIO() determines that the IRasterIO() parameters are compatible of the AdviseRead() ones (#7082)
+ * data/ecw_cs.wkt: fix PRIMEM of MONTROME (#2340)
+
+EHdr driver:
+ * support reading/writing .clr as/from RAT (#3253)
+ * only write .stx if bApproxOK=false (github #514)
+
+ENVI driver:
+ * support 'major frame offsets' keyword (#7114)
+
+ERS driver:
+   add extension metadata (github #320)
+
+GeoPackage driver:
+ * update from 'tiled gridded extension' to now OGC approved 'tiled gridded coverage data extension' (OGC 17-066r1) (#7159)
+ * avoid corruption of gpkg_tile_matrix when building overviews, down to a level where they are smaller than the tile size (#6932)
+ * fix opening subdatasets with absolute filenames on Windows (https://issues.qgis.org/issues/16997)
+ * fix possible assertion / corruption when creating a raster GeoPackage (#7022)
+ * properly handle non-0 nodata value in edge tiles, especially with TILING_SCHEME creation option
+ * do not write empty tiles for Float32 data type
+ * speed-up statistics retrieval on non-Byte datasets (#7096)
+ * make DELLAYER:rastertable / DROP TABLE rastertable delete the table and all references to it (#7013)
+ * create single tiled TIFF tiles if they are not bigger than 512x512 pixels
+ * avoid multi-threading issues when creating TIFF tiles with GDAL_NUM_THREADS defined.
+ * fix overview creation with big overview factors on some datasets
+
+GeoRaster driver:
+ * handle memory allocation failures (#6884)
+ * add support for GCP (#6973)
+
+GTiff driver:
+ * add support for ZSTD compression/decompression (requires internal libtiff, or libtiff HEAD)
+ * when IRasterIO() realizes that several blocks are going to be needed, use MultiRangeRead() interface for /vsicurl/ related file systems to get data in parallel
+ * change default value of BIGTIFF_OVERVIEW to be IF_SAFER (github #231)
+ * make sure that -co PHOTOMETRIC=RGB overrides the color interpretation of the first 3 bands of the source datasets (#7064)
+ * allow modifying color interpretation on existing file opened in update mode
+ * Internal libtiff: resync with upstream HEAD (post 4.0.9)
+ * Internal libgeotiff: resync with upstream HEAD: use ProjScaleAtCenterGeoKey for CT_Mercator if ProjScaleAtNatOriginGeoKey is not set (github #296)
+ * fix compilation without BIGTIFF_SUPPORT (#6890)
+ * fix reading subsampled JPEG-in-TIFF when block height = 8 (#6988)
+ * when reading a COMPD_CS (and GTIFF_REPORT_COMPD_CS=YES), set the name from the GTCitationGeoKey (#7011)
+ * on reading use GeogTOWGS84GeoKey to override the defaults TOWGS84 values coming from EPSG code (#7144)
+ * when writing SRS, do not drop EXTENSION PROJ4 node if the projection is unknown (#7104)
+ * make it accept to write SetGeoTransform([0,1,0,0,0,1]) as a ModelTransformationTag, and remove particular cases with the [0,1,0,0,0,1] geotransform (#1683)
+ * warn when SetNoDataValue() is called on different bands with different values (#2083)
+ * add a GTIFF_HONOUR_NEGATIVE_SCALEY=YES config option that can be set to honour negative ScaleY value in GeoPixelScale tag according to the GeoTIFF specification (#4977)
+ * read/write Z dimension for ModelTiepointTag and ModelPixelScaleTag and translate it into/from band scale and offset, when there's a SRS with a vertical component (#7093)
+ * fix reading PCSCitationGeoKey (#7199)
+ * add support for reading and writing TIFF_RSID and GEO_METADATA GeoTIFF DGIWG tags
+ * use consistently multiplication/division by 257 when converting between GDAL [0,255] range to TIFF [0,65535] range for color map values (#2213)
+ * don't write <GDALMetadata> colorinterp when writing a file with a color table
+ * copy georeferencing info to PAM if the profile is not GeoTIFF
+
+GRIB driver:
+ * add GRIB2 write support
+ * update to degrib 2.14 and g2clib 1.6.0
+ * add support for GRIB2 template 4.32 (github #249)
+ * add support for GRIB2 template '4.32 Simulate (synthetic) Satellite Product'
+ * add support for GRIB2 template 4.40 (Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for atmospheric chemical constituents)
+ * update table 4.2-0-7 current (github #274)
+ * add support for GRIB1 products with non-zero NV (number of vertical coordinate parameters) field in GDS (NV is just ignored) (#7104)
+ * add support for Rotated pole LatLong projections (#7104)
+ * adjust the longitude range to be close to [-180,180] when possible for products whose left origin is close to 180deg. Can be controlled with the GRIB_ADJUST_LONGITUDE_RANGE=YES/NO config option, that defaults to YES  (#7103)
+ * advertise .grb2 and .grib2 extensions in metadata
+ * expose product discipline of GRIB2 products in GRIB_DISCIPLINE (#5108)
+ * add a GRIB_PDS_TEMPLATE_ASSEMBLED_VALUES metadata items which expose a slightly higher view of GRIB_PDS_TEMPLATE_NUMBERS
+ * speed-up GetNoData() implementation of GRIB2 files by avoiding decompressing the data
+ * GRIB2: add support for Transverse Mercator, Albers Equal Area, Lambert Azimuthal projections, fixes in Mercator and Polar Stereographic support, adjustment for GS80 and WGS84 datums
+ * correctly read Mercator as Mercator_2SP when stdparallel1 != 0
+ * GRIB2: add support for Grid point data - IEEE Floating Point Data template 5.4 encoding
+ * GRIB2: report Section 1 / Identification section as GRIB_IDS metadata item
+ * fix decimal_scale_factor != 0 handling with nbits = 0 for simple packing and JP2K compression/decompression, and PNG compression.
+ * GRIB2: don't error out on a unhandled template in Section 4
+ * remove TDLPack support
+
+GSAG driver:
+ * fix reading issue that could cause a spurious 0 value to be read and shift all following values (#6992)
+
+GTX driver:
+ * do not emit error when opening with GDAL_PAM_ENABLED=NO (#6996)
+
+GRC driver:
+ * Fix handling of alpha values in GRC color table (#6905)
+ * Handle case of 0-len GRC class names (#6907)
+
+HDF5 driver:
+ * Added CInt16, CInt32, CFloat32, CFloat64 support (github #359)
+ * HDF5 driver as a plugin: register the BAG driver as well (#5802)
+
+HF2 driver:
+ * creation: copy source information (including nodata) into PAM if needed (#6885)
+ *  fix reading tiles that are 1-pixel wide (2.1 regression, #6949)
+
+HFA driver:
+ * add GDAL_HFA_OVR_BLOCKSIZE configuration option to control HFA overviews block size (github #292)
+
+HTTP driver:
+ * do not open the underlying dataset with GDAL_OF_SHARED, to avoid later assertion
+
+ISIS3 driver:
+ * make sure that -co USE_SRC_HISTORY=NO -co ADD_GDAL_HISTORY=NO results in remove of History section (#6968)
+ * fix logic to initialize underlying GeoTIFF file in IWriteBlock(), and implement Fill() (#7040)
+
+JP2ECW driver:
+ * add NBITS creation option, and automatically select codestream output for .j2k extension
+
+JP2KAK driver:
+ * add support fr Kakadu 7.A (#7048)
+ * fix lossless compression with NBITS != 8 for Byte and NBITS != 16 for UInt16
+ * use tile dimensions as block size up to 2048x2048 (#6941)
+ * make write side honour .j2k extension to generate only codestream
+
+JP2OpenJPEG driver:
+ * add support for OpenJPEG 2.2 (#7002) and 2.3 (#7074). Drop support for openjpeg 2.0
+ * fix performance issues with small images with very small tile size, such as some Sentinel2 quicklooks (#7012)
+ * emit warning if GMLJP2v2 explicitly requested but georeferencing implemented
+ * allow YCC for non-Byte datasets; and allow 4-band MCT with openjpeg >= 2.2
+
+JPEG driver:
+ * Add compatibility with libjpeg-turbo 1.5.2 that honours max_memory_to_use
+ * add capability to write EXIF and GPS tags in a EXIF segment
+ * Internal libjpeg: provide implementation of tmpfile() that works better on Windows (#1795)
+ * avoid mis-identification of some SRTMHGT files as JPEG
+
+JPEG2000 driver:
+ * add NBITS creation option, and automatically select codestream output for .j2k extension
+
+KEA driver:
+ * add some additional metadata items (STATISTICS_HISTOBINVALUES and STATISTICS_HISTONUMBINS) (#6892)
+
+L1B driver:
+ * support reading NOAA18 datasets (#7115)
+
+MBTiles driver:
+ * add read/write support for Mapbox vector tiles
+ * support opening and creating datasets with tiles whose dimension is not 256 (#7233)
+ * default to opening as RGBA (#6119)
+
+MEM driver:
+ * Avoid Create(foo.tif) / CreateCopy(foo.tif) on the MEM or Memory drivers to delete a 'real' foo.tif file
+ * add RAT support
+
+MRF driver:
+ * Add Zen chunk support
+ * Open option to ignore decompression errors and missing data files
+ * delay data file creation when NOCOPY is set
+ * Identify MRF metadata passed as filename
+ * Initialize PAM better on CopyCreate, enable external mask.
+ * Fix for coordinates when opening single overview level
+ * Use input mask if available to filter input data when creating JPEG compressed files.
+ * Add open option to select Z-slice, also Z-slice selection in the metadata file
+
+MrSID driver:
+ * add support for LTI_COLORSPACE_GRAYSCALEA and LTI_COLORSPACE_GRAYSCALEA_PM color
+ spaces
+
+NetCDF driver:
+ * avoid vector vs raster variable confusion that prevents reading Sentinel3 datasets, and avoid invalid geolocation array to be reported (#6974)
+ * fix raster read as nodata with Byte datatype, (valid_range={0,255} or _Unsigned = True) and negative _FillValue (#7069)
+ * be more tolerant on the formatting of standard parallel (space separated instead of {x,y,...} syntax), and accept up to 2/1000 error on spacing to consider a regular grid, to be able to read files provided by the national weather institute of Netherlands (KNMI) (#7086)
+ * on creation, attach grid_mapping attribute to all bands
+ * netCDF: support UTF-8 filenames on Windows (#7065)
+ * add support for reading files in rotated pole projection (#4285)
+ * behave correctly when an extra dimension of a variable has a corresponding 1D variable of different names (#7165)
+ * netCDF: fix bad interaction of SetNoDataValue() and SetGeoTransform()/SetProjection() for NC4/NC4C modes (#7245)
+
+NITF driver:
+ * add support for NITF CCINFA TRE (github #232)
+ * data/nitf_spec.xml: fix location of PIAPRD TRE (github #234)
+ * make sure that BLOCKA_ or TRE=BLOCKA= creation option override source NITF metadata; add a USE_SRC_NITF_METADATA=YES/NO creation option; make sure that gdal_translate doesn't preserve source BLOCKA when georeferencing is modified
+ * fix swapped lines and samples in IMRFCA (github #289)
+ * allow to read single-block JPEG2000 compressed images with one dimension > 8192 pixels (fixes #407)
+
+PCIDSK driver:
+ * sort overviews (#7100)
+
+PCRaster driver:
+ * fix fseek/ftell for large files on Windows (#322)
+
+PDF driver:
+ * add support for Poppler 0.58 (#7033)
+ * round to upper integer when computing a DPI such that page size remains within limits accepted by Acrobat (#7083)
+ * do not emit 'Cannot find GPTS object' on VP.Measure objects whose Subtype != GEO
+
+PDS driver:
+ * map STEREOGRAPHIC with fabs(lat)=90 to Polar_Stereographic (#6893)
+
+PLMosaic driver:
+ * update to use the new Basemaps and Mosaics API
+ * take into account BBOX for XYZ tiles
+
+PNM driver:
+ * add .pgm and .ppm extensions in metadata
+
+RMF driver:
+ * add RMF native overviews support (github #266)
+ * fix raster garbage values while reading sparse RMF files (github #267)
+ * add native overview build (github #275)
+ * fix NoData value update (github #312)
+ * fix elevation units write and update (github #314)
+
+RRASTER driver:
+ * add support for reading creator and created metadata items, band names and color table / RAT
+ * add update and create/createcopy support
+
+SAGA driver:
+ * add support for .sg-grd-z files (github #228)
+
+Sentinel2 driver:
+ * make sure that the True Color Image subdatset really uses the R,G,B bands and not the R,R,R (#7251)
+ * add support for direct opening of .zip files of new safe_compact L1C products (#7085)
+
+SNODAS driver:
+ * accept header lines up to 1024 characters (github #506)
+
+SRTMHGT driver:
+ * set appropriate description when opening a .hgt.zip file
+ * recognizes the .hgt.gz extension (#7016)
+ * add support for reading .SRTMSWBD.raw.zip files (GRASS #3246)
+
+USGSDEM driver:
+ * properly handle southern hemisphere UTM projections (#344)
+
+VICAR driver:
+ * optimize nodata handling, and map STEREOGRAPHIC with fabs(lat)=90 to Polar_Stereographic (#6893)
+
+VRT driver:
+ * add option for separable kernel (github #216)
+ * warn if band attribute of VRTRasterBand is not the one expected
+ * implement FlushCache()
+ * fix use of VRTs that point to the same source in multi-threaded scenarios (#6939)
+ * Warped VRT: correctly take into account cutline for implicit overviews; also avoid serializing a duplicate CUTLINE warping options in warped .vrt (#6954)
+ * Warped VRT: fix implicit overview when output geotransform is not the same as the transformer dst geotransform (#6972)
+ * fix IGetDataCoverageStatus() in the case of non-simple sources, which unbreaks gdalenhance -equalize (#6987)
+ * re-apply shared='0' on sources if existing in original VRT when rewriting it due to invalidation
+ * avoid error being emitted when opening a VRTRawRasterBand in a .zip files (#7056)
+ * implement VRTDataset::AdviseRead() (in the particular case of a single source) (#7082)
+ * allow to incorporate a warped VRT as CDATA in the SourceFileName field of a regular VRT
+ * VRTDerivedRasterBand: fix detection of Python runtime already loaded when more than 100 modules are linked. Fixes QGIS3 use case (#7213)
+ * add RAT support
+ * for consistency, make sure that VRT intermediate datatype demotion is done, e.g that a VRT band of type Byte, with a source of type Float32, requested as Float32 buffer involves Float32 -> Byte -> Float32 conversions
+ * VRTDataset::AddBand(): honour 'PixelFunctionLanguage' option (github #501)
+
+WCS driver:
+ * add support for WCS 2.0
+ * add caching
+ * add various open options
+
+WMS driver:
+ * ArcGIS miniserver: use latestWkid and wkt metadata (#6112)
+ * avoid AdviseRead() to download too many tiles at once (#7082)
+ * recognize /ImageServer?f=json ESRI endpoints
+ * Add support for maximum size and expiration time and unique per dataset name for WMS cache
+
+XYZ driver:
+ * fix 2.2.0 regression where the driver hangs on some dataset with missing samples (#6934)
+ * support non numeric characters when there is an header line (#7261)
+
+## OGR 2.3.0 - Overview of Changes
+
+Core:
+ * OGRLayer::FilterGeom(): make sure a feature with a null or empty geometry never matches a spatial filter (#7123)
+ * OGRSimpleCurve::get_LinearArea(): return 0 on a non-closed linestring (#6894)
+ * OGRFeature::SetField: Improve the setting for OFTInteger fields from a double.
+ * OGR_G_TransformTo(): emit error message when source geometry has no SRS
+ * OGR API SPY: various fixes
+ * OGRCurve::get_isClosed(): do not take into account M component (#7017)
+ * OGRLineString::setPoint() and addPoint() with a OGRPoint* argument. properly takes into account ZM, Z and M dimensions (#7017)
+ * OGRMultiSurface: refuse to add a triangle to it. (github #357)
+ * OGRPolyhedralSurface: importFromWkt(): remove support for invalid constructs, that contrary to comments are not supported by PostGIS
+ * Fix OGR[Curve]Polygon::Intersects(OGRPoint*) to return true when point is on polygon boundary (#7091)
+ * Emit an explicit error message for OGRGeometry::IsValid(), IsSimple(), IsRing() when GEOS is not available
+ * Make OGRGeometry::assignSpatialReference() a virtual method, and make implementation recursively assign the SR to child geometries (#7126)
+ * Expose OGRGeometry::swapXY() as OGR_G_SwapXY() in C API (#7025)
+ * importFromWkt(): fix import of GEOMETRYCOLLECTION ending with POINT EMPTY or LINESTRING EMPTY (#7128, 2.1 regression)
+ * OGRSQL: avoid silent cast so that int64->int overflow is better signaled
+ * OGRSQL: accept using the real FID column name (in addition to the special 'FID' alias) (#7050)
+ * Add GDAL_DCAP_NONSPATIAL capability to ODS, REC, XLS and XLSX drivers
+ * Add GDAL_DCAP_FEATURE_STYLES capability to CAD, DGN, DWG, DXF, EDIGEO, JML, KML, lIBLML, MITAB, OpenAIR and VRT drivers
+ * Add DMD_CREATIONFIELDDATASUBTYPES metadata type (github #278)
+ * OGRParseDate(): only accept seconds up to 60 included for leap seconds (#6525)
+ * Fix OGRPolygon::IsPointOnSurface() broken with polygons with holes
+ * OGRFormatDouble(): add a OGR_WKT_ROUND config option that can be set to FALSE to disable the heuristics that remove trailing 00000x / 99999x patterns (#7188)
+ * Add C++ iterators for feature in layer and field values in features.
+ * Add C++ iterators for "sub-parts" of geometry classes
+ * Const-correctness fixes in signatures of methods of OGRFeatureDefn, OGRFeature, OGRFieldDefn and OGRGeomFieldDefn classes.
+ * Fix constness of OGR_G_CreateFromWkb(), OGR_G_CreateFromFgf(), OGR_G_ImportFromWkb() and related C++ methods
+ * Fix const correctness of OGRGeometry::importFromWkt() and OGRGeometryFactory::createFromWkt(), and add compatibility wrappers
+
+OGRSpatialReference:
+ * Update to EPSG v9.2 (#7125)
+ * Update data/esri_extra.wkt and add data/esri_epsg.wkt, taken from https://github.com/Esri/projection-engine-db-doc (Apache v2 license) (#2163)
+ * Add support for PROJ.5 new API (requires proj 5.0.1 or later)
+ * Add a OSRFindMatches() function to look for equivalent SRS in the EPSG database, map it to SWIG Python. Enhance gdalsrsinfo to use it
+ * Add OGRSpatialReference::convertToOtherProjection() (bound to C as OSRConvertToOtherProjection() and to SWIG) to transform between different equivalent projections (currently Merc_1SP <--> Merc_2SP and LCC_1SP <--> LCC_2SP) (#3292)
+ * Fix OGRSpatialReference::IsSame() to return FALSE when comparing EPSG:3857 (web_mercator) and EPSG:3395 (WGS84 Mercator) (#7029)
+ * importFromProj4(): implement import of Hotine Oblique Mercator Two Points Natural Origin, and fix OGRSpatialReference::Validate() for that formulation (#7042)
+ * morphFromESRI(): fix remapping from DATUM = D_S_JTSK + PRIMEM = Ferro to OGC DATUM System_Jednotne_Trigonometricke_Site_Katastralni_Ferro
+ * Add alternate simpler signature for OGRGeometryFactory::createFromWkt()
+ * Add importFromWkt(const char**)
+
+Utilities:
+ * ogrmerge.py: fix '-single -o out.shp in.shp' case (#6888)
+ * ogrmerge.py: allow using wildchar '*' in source names and use glob.glob to expand it
+ * ogrmerge.py: correctly guess vrt format
+ * ogrmerge.py: error when outputting to a existing vrt if -overwrite_ds is not specified
+ * ogrmerge.py: use ogr.wkbUnknown to fix -nlt GEOMETRY
+ * ogr2ogr: fix crash when using -f PDF -a_srs (#6920)
+ * ogr2ogr: make -f GMT work again (#6993)
+ * ogr2ogr: make it fail if GetNextFeature() returned NULL with an error
+ * ogr2ogr: honour -select when using -addfiels
+ * ogr2ogr: preserve source geometry field name for output drivers that support GEOMETRY_NAME layer creation option (such as GPKG)
+ * ogr2ogr: add support for circularstring, compoundcurve, curvepolygon, multicurve and multisurface in SetZ()
+ * GDALVectorTranslate(): fix converting from Memory to Memory datasources (#7217)
+ * gnmmanage: fix crash on shape files with linestring and multilinestring geometries mixing
+ * ogrtindex: fix crash when using -f SQLITE -t_srs XXXX (#7053)
+ * ogrinfo: always open in read-only mode, unless -sql without -ro is specified
+ * ogrinfo/ogr2ogr with -sql @filename: remove lines starting with '--' (github #459)
+
+Multi driver changes:
+ * port/tag ILI, NAS, DGN, NTF, SDTS, OGR_GMT, Geoconcept, AVCE00, AVCBin to VirtualIO API
+
+Amigocloud driver:
+ * Fixed data field types (github #246)
+ * Output list of datasets if dataset id is not provided.
+ * Implemented waiting for job to complete on the server. This will improve write to AmigoCloud reliability.
+ * Add HTTP user agent (github #263)
+ * add OVERWRITE open option (github #268)
+
+AVCE00 driver:
+ * Make sure AVCE00 opens .e00 files and not AVCBIN one
+
+AVCBin driver:
+ * fix 2.1 regression regarding attributes fetching (#6950)
+
+Carto driver:
+ * fix append mode by retrieving the sequence name for the primary key (#7203)
+ * fix insertion with ogr2ogr -preserve_fid (#7216)
+ * fix missing features when iterating over a SQL result layer with pagination (#6880)
+
+CSV driver:
+ * add a STRING_QUOTING=IF_NEEDED/IF_AMBIGUOUS/ALWAYS layer creation option, that defaults to IF_AMBIGUOUS (quote strings that look like numbers)
+ * temporarily disable spatial and attribute filter when rewriting CSV file (#7123)
+ * fix autodetection of types when a Real value is followed by a Integer64 one (#343)
+
+DGNv8 driver:
+ * add support for building against static library (#7155)
+
+DXF driver:
+ * Support LEADER and MULTILEADER entities (#7111, #7169)
+ * Support HELIX and TRACE entities
+ * Support spline hatch boundaries
+ * Support MLINE entity
+ * Support rows/columns within INSERT
+ * Add support for block attributes (ATTRIB entities) (#7139)
+ * Support text styles (#7151)
+ * Support cylinders (CIRCLE entities with thickness)
+ * set dx and dy to DXF LABEL style string on TEXT and MTEXT objects (github #225)
+ * fix reading of hatches with boundaries that contain elliptical arcs (#6971)
+ * fix reading files where INSERT is the last entity and DXF_MERGE_BLOCK_GEOMETRIES is false (#7006)
+ * fix ordering of vertices in a SOLID entity (#7089)
+ * only apply certain escaping rules to the text of the MTEXT object (#7047)
+ * Handle all known MTEXT escapes; allow user to turn off text unescaping (fixes #7122)
+ * do not apply the OCS transformation for MTEXT (#7049)
+ * do not output dx and dy in MTEXT style strings (#7105)
+ * apply DXF codepage encoding while decoding ExtendedEntity field (#5626)
+ * allow user to set the tolerance used when joining parts of a hatch boundary with a DXF_HATCH_TOLERANCE config option, and default to 1e-7 of the extent of the geometry (#7005)
+ * refactor out block insertion to its own function, and transform insertion point of an INSERT entity into OCS (#7077)
+ * on write side, force 'defpoints' layer to be non-displayed (#7078)
+ * entities on layer 0 within a block should inherit the style of the layer the INSERT is on. Do that for entities with a PEN style string for now. (#7099)
+ * OCS fixes for HATCH and INSERT entities (#7098)
+ * defer inlining of blocks until actually required (#7106)
+ * Read DIMSTYLEs and block record handles
+ * Handle linetype scales (#7129)
+ * Improved support for DIMENSION entities (#7120)
+ * handle ByBlock colors (#7130)
+ * Fix parsing of complex linetypes (#7134)
+ * Correct color for ByBlock text features; respect hidden objects (#5592, #7099, #7121)
+ * Make ACAdjustText also transform text width and offset (#7151)
+ * Honor block base points (#5592)
+ * Use BRUSH style tool instead of PEN when reading polygonal SOLIDs and leader arrowheads; add PEN style string to 3DFACE
+ * Specify ground units for TEXT dx and dy style values; interpret dx and dy in the writer
+ * Fix bug in text style property retrieval; handle text color in DIMENSION fallback renderer
+ * Write text styles and HATCH elevations; fix output of invalid extent values (#7183)
+ * Allow access to unused entity group codes with RawCodeValues field (github #226)
+ * Reduce the size of header.dxf and trailer.dxf (tested with AutoCAD, QCAD Teigha, QCAD dxflib, FME)
+ * Make the writer aware of linetype scaling
+ * Don't force elevation to zero in smooth polylines (#7200)
+ * Always output all edges in polyface mesh, and add styling (#7219)
+ * Remove incorrect OCS transformation from MLINE entities
+ * Introduce 3D extensible mode to allow translation of 3D entities
+
+ESRIJson driver:
+ * "New": extracted from code previously in GeoJSON driver
+ * avoid endless looping on servers that don't support resultOffset (#6895)
+ * use 'latestWkid' in priority over 'wkid' when reading 'spatialReference' (github #218)
+ * recognize documents that lack geometry fields (#7071)
+ * do not attempt paging requests on a non-HTTP resource
+ * recognize documents starting with a very long fieldAliases list (#7107)
+
+FileGDB driver:
+ * remove erroneous ODsCCreateGeomFieldAfterCreateLayer capability declaration (github #247)
+ * add LAYER_ALIAS layer creation option (#7109)
+ * FileGDB / OpenFileGDB: attempt to recover EPSG code using FindMatches()
+ * FileGDB / OpenFileGDB: linearize Bezier curves with a more reasonable number of points
+
+GeoJSON driver:
+ * Add support for json-c v0.13 (github #277)
+ * support loading (true) GeoJSON files of arbitrary size (#6540)
+ * in update mode, support appending features, in some cases, without ingesting features of existing file into memory
+ * writer: accept writing ZM or M geometry by dropping the M component (#6935)
+ * fix 2.2 regression regarding lack of setting the FeatureCollection CRS on feature geometries (fixes https://github.com/r-spatial/sf/issues/449#issuecomment-319369945)
+ * make sure that -lco WRITE_NAME=NO works even if the native data has a 'name' attribute
+ * ignore 'properties' member of features whose value is null or empty array
+ * fix writing of id with RFC7946=YES (#7194)
+ * add ID_FIELD and ID_TYPE layer creation options
+
+GeoPackage driver:
+ * default to version 1.2 (#7244)
+ * speed-up loading of databases with hundreds of layers
+ * make driver robust to difference of cases between table_name in gpkg_contents/gpkg_geometry_columns and name in sqlite_master (#6916)
+ * fix feature count after SetFeature() with sqlite < 3.7.8 (#6953)
+ * do not error out if extent in gpkg_contents is present but invalid (#6976)
+ * avoid GetFeature() to hold a statement, that can cause database locking issues (https://issues.qgis.org/issues/17034)
+ * emit warning when feature geometries are not assignable to layer geometry type
+ * remove UNIQUE keyword for PRIMARY KEY of gpkg_metadata (doesn't hurt, but just to align with the examples of DDL in the GeoPackage spec)
+ * fix logic to detect FID on SQL result layer when several FID fields are selected (#7026)
+ * fix handling of spatial views
+ * do not try to update extent on gpkg_contents after GetExtent() on a empty layer of a datasource opened in read-only mode
+ * when inserting a SRS with a non-EPSG code, then avoid using srs_id that could be later assigned to a EPSG code
+ * when deleting a layer, delete from gpkg_metadata metadata records that are only referenced by the table we are about to drop
+ * fix incorrect rtree_<t>_<c>_update3 trigger statement (https://github.com/opengeospatial/geopackage/issues/414)
+ * fix definition of extensions
+ * only create metadata table if needed, and register it as extension
+ * declare gpkg_crs_wkt extension when using GPKG_ADD_DEFINITION_12_063=YES config option, and do not emit warning when finding it declared
+
+GeoRSS driver:
+ * fix detection of field type (#7108)
+
+GML driver:
+ * CreateGeometryFromGML(): accept gml:Arc with odd number of points > 3, even if they are invalid
+ * decode gml:Solid as PolyhedralSurface (#6978)
+ * JPGIS FGD v4: fix logic so that coordinate order reported is long/lat (github #241)
+ * a GML_FEATURE_COLLECTION=YES/NO dataset creation option
+ * fix FORCE_SRS_DETECTION=YES effect on feature count and SRS reporting on gml files with .gfs (#7046)
+ * do not try to open some kml files (#7061)
+ * do not report gml:name / gml:description of features as layer metadata
+
+GMLAS driver:
+ * get the srsName when set on the srsName of the gml:pos of a gml:Point (#6962)
+ * CityGML related fixes: better take into account .xsd whose namespace prefix is not in the document, fix discovery of substitution elements, handle gYear data type (#6975)
+ * properly interpret SolidPropertyType (#6978)
+ * handle GML geometries in elements that are a substitutionGroup of an element (#6990)
+ * make sure to try namespaces that are indirectly imported (helps in the case of parsing the result of a WFS GetFeature request)
+ * take into account gYearMonth XML data type (https://github.com/BRGM/gml_application_schema_toolbox/issues/46)
+ * implement resolution of internal xlink:href='#....' references (https://github.com/BRGM/gml_application_schema_toolbox/issues/31)
+ * Recognize gml:Envelope as a Polygon geometry (https://github.com/BRGM/gml_application_schema_toolbox/issues/56#issuecomment-381967784)
+
+GMT:
+ * fix creation of several layers
+
+IDB driver:
+ * optimize spatial query using spatial index and st_intersects function (#6984)
+ * close connection at dataset closing (#7024)
+
+ILI driver:
+ * declare OLCCreateField and OLCSequentialWrite capabilities
+
+Ingres driver:
+
+JML driver:
+ * add support for reading and write SRS from gml:Box element (#7215)
+
+KML driver:
+ * KML / LIBKML: read documents with an explicit kml prefix (#6981)
+ * KML/LIBKML: make sure layer names are unique (QGIS github#5415)
+
+LIBKML driver:
+ * fix reading placemarks in toplevel container, when it has subfolders (#7221)
+ * improve open performance on huge number of layers
+
+MDB driver:
+ * fix multi-thread support (https://issues.qgis.org/issues/16039)
+
+MITAB driver:
+ * support for additional datums (#5676)
+ * add support for Reseau_National_Belge_1972 / EPSG:31370 on writing (#6903)
+ * add support for SWEREF99 datum (#7256)
+ * fix EPSG datum code for NTF Paris
+ * support units as code instead of string when reading a coordsys string from a .mif (#3590)
+ * add read/write support between MapInfo text encodings and UTF-8. Add ENCODING layer/dataset creation option (github #227)
+ * do not emit error if the .ind file is missing, just a debug message (#7094)
+ * accept creating files with LCC_1SP SRS (#3292)
+ * support 'CREATE INDEX ON layer_name USING field_name' (if called after field creation and before first feature insertion)
+ * avoid reporting invalid extent on empty .mif
+ * report aspatial .tab as wkbNone geometry type
+ * export BRUSH(fc:#.....) with mapinfo brush pattern 2 (solid fill)
+
+mongoDB driver:
+ * compilation fix on Windows
+
+MSSQLSpatial driver:
+ * Fix issues on x64 (#6930)
+ * Implement EXTRACT_SCHEMA_FROM_LAYER_NAME layer creation option.
+ * properly format DELETE statement with schema (#7039)
+
+MySQL:
+ * fix compilation issue with MariaDB 10.1.23 (#6899) and MariaDB 10.2 (#7079)
+ * make sure geometry column name is properly set (GDAL 2.0 regression, github #397)
+
+NAS driver:
+ * [NAS/GML] try reversing non contiguous curves
+ * Allow usage of a GFS template file for type assignment and mapping of element paths to attributes and remove arbitrary hacks that used to avoid attribute name conflicts:
+ * New option: NAS_GFS_TEMPLATE: specify gfs template
+ * New option: NAS_NO_RELATION_LAYER: skip unused alkis_beziehungen (also makes progress available)
+ * Multiple geometries per layer
+ * NAS_INDICATOR updated to "NAS-Operationen;AAA-Fachschema;aaa.xsd;aaa-suite"
+ * use single geometry column name from input (like GMLAS)
+ * accept unqualified attribute name in wfs:Update
+
+NTF driver:
+ * fix regression introduced by fix for https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2166 causing some valid records to be skipped (#7204)
+
+NULL driver:
+ * Generalize OGR NULL development driver as a GDAL raster+vector one; enable to compile it --with-null
+
+OCI driver:
+ * initialize in multi-threaded compatible mode (https://issues.qgis.org/issues/17311)
+ * support for extended max_string_size (#7168)
+
+ODBC driver:
+ * deal with table names that require double quoting (#7242)
+
+ODS driver:
+ * add read/write support for Boolean sub datatype
+
+OSM driver:
+ * performance improvements
+ * increase string buffer for osm XML files (#6964)
+ * OGR_SQL/OSM: avoid OSM driver warning about attribute filter not being taken into account when issuing a 'select * from X limit Y' request on a OSM datasource
+
+OpenFileGDB driver:
+ * properly read GeneralPolygon with M component whose all values are set to NaN (#7017)
+
+PDF driver:
+ * make OGR_PDF_READ_NON_STRUCTURED=YES configuration option work with documents without layers (#6359)
+ * Improvements to text and dash pattern support in writer (#7185)
+
+PDS driver:
+ * fix reading 8-byte IEEE_REAL fields (github #570)
+
+PG driver:
+ * do not be confused by a 'geometry' table in a non-PostGIS enabled database (#6896)
+ * PG/PGDump: make sure serial sequence is updated at layer closing/end-of-copy if we inserted features with fixed ids (#7032)
+
+PLScenes driver:
+ * remove support for V0 and V1 API. Only Data V1 is kept (#6933)
+ * add SkySatScene
+
+SEGY driver:
+ *report more attributes from Segy Standard Trace Header (github #315)
+
+Shapefile driver:
+ * Fix GetFeatureCount() to properly take into account spatial filter when attribute filter also in effect (#7123)
+ * use VSIStatL() in Create() to properly work with /vsimem/ directories (#6991)
+ * fix regression affecting GDAL 2.1.3 or later, 2.2.0 and 2.2.1, when editing the last shape of a file and growing it, and then appending a new shape, which resulted in corruption of both shapes (#7031)
+ * hide shapelib symbols on Unix
+ * improvements auto-identification of EPSG codes from input SRS, using OSRFindMatches()
+ * Improve guidance on use of SHAPE_RESTORE_SHX in SHPOpenLL() (#7246)
+
+SQLite/Spatialite driver:
+ * SQLite/GPKG: report SQLITE_HAS_COLUMN_METADATA=YES as driver metadata item when it is available (#7007)
+ * escape integer primary key column name on table creation (#7007)
+ * don't invalidate statistics when running a PRAGMA (https://issues.qgis.org/issues/17424)
+ * SQLite dialect: avoid erroring out if source layer has a OGR_STYLE field
+ * SQLite dialect: support SQLite 3.21, and LIKE, <>, IS NOT, IS NOT NULL, IS NULL and IS operators (fixes #7149)
+ * SQLite/GPKG: avoid parsing of OGR_SQLITE_JOURNAL to stop on JOURNAL_MODE keyword
+
+VFK driver:
+ * fix collecting linestrings for sbp layer
+ * collect geometries also for zvb layer
+ * Improve VFK parser logic (github #365)
+ * add option to suppress geometry (github #371)
+
+VRT driver:
+ * increase maximum size limit to 10 MB (instead of 1MB), and add config option to be able to force loading if above that
+
+XLS driver:
+ * workaround opening filenames with incompatible character set on Windows (https://issues.qgis.org/issues/9301)
+
+XLSX driver:
+ * avoid 'ogr2ogr -f XLSX out.xlsx in.shp -preserve_fid' to overwrite the first record. Note however that FID preservation itself doesn't really work with XLSX (#6994)
+ * fix non working detection of Date/Time fields in some documents (#7073)
+ * fix opening of documents with x: namespace in xl/workbook.xml (#7110)
+ * fix misdetection of field type if first cell blank (github #291)
+ * fix updating multi layer document where existing layers where dropped (#7225)
+ * add read/write support for Boolean sub datatype
+ * on writing, use %.16g formatting for floating point numbers (#7230)
+
+## SWIG Language Bindings
+
+All bindings:
+ * Expose gdal.VSIFEofL()
+ * Expose gdal.GRA_Max, GRA_Min, GRA_Med, GRA_Q1 and GRA_Q3 (#7153)
+ * Expose Geometry.SwapXY()
+ * Expose Geometry.RemoveGeometry()
+ * Expose SpatialReference.SetMercator2SP()
+ * Expose Band.AdviseRead() and Dataset.AdviseRead()
+
+CSharp bindings:
+
+Java bindings:
+ * create single JNI shared library (gdalalljni.so/dll) (github #286)
+
+Perl bindings:
+ * Keep parent geometry alive if an object is created from a child geometry. Experimental methods Features and Geometries. Catch an error in storing a geometry into a feature. Prefer GeometryCount over GetGeometryCount and Geometry over GetGeometryRef.
+ * Set INSTALLSITEMAN1DIR and INSTALLSITEMAN3DIR according to what is in GDALmake.opt if INSTALL_BASE is set. (#6142)
+ * ignore no data cells in ClassCounts and Reclassify for real valued rasters.
+ * support for number line (or decision tree) classifiers also for integer bands.
+ * Set error handler separately in all modules (required by Strawberry Perl build).
+
+Python bindings:
+ * add scripts to python module (#342)
+ * make sure that errors in Open() related functions, that do not prevent dataset opening in C/C++, do not either prevent it in Python (#7094)
+ * avoid hang when calling gdal/ogr.UseExceptions()/DontUseExceptions() in wrong order (#6891)
+ * accept callback = 0 since SWIG generates it as the default argument of BandRasterIONumPy(). (github #219)
+ * fix 2.2.0 regression preventing use of callback function in Band.ComputeStatistics() (#6927)
+ * fix reference count issue on gdal.VSIStatL() when it returns None, that can cause Python crashes if None refcount drops to zero
+ * avoid potential cross-heap issue on Windows with numpy (https://trac.osgeo.org/osgeo4w/ticket/466)
+ * fix potential alignment issues when reading double values with ReadRaster() or ReadBlock()
+ * fix issue with PyInstaller (#7044)
+ * add a addAlpha option to gdal.DEMProcessing()
+ * fix for include files when building .cpp files (github #258)
+ * make gdal.Transform() return None in case of an error (instead of an invalid Transformer object)
+ * emit exceptions if VSI_RETVAL methods (such as gdal.Rename()) fail and gdal.UseExceptions() is enabled
+ * add addFields and forceNullable options to gdal.VectorTranslate()
+ * for command line utilities as functions, serialize number of floating-point arguments with higher precision
+ * Fix python 3.x package installation in custom prefixes (#6671)
+ * lots of PEP8-related fixes in scripts and autotest
+ * add NULL checks after PyUnicode_AsUTF8String() in case the unicode cannot be translated to UTF-8 and workaround SWIG bug to avoid crashes with Python 3. (github #356)
+ * make sure gdal.VectorTranslate() and gdal.Grid() open their source dataset with a vector driver (github #449)
+ * make 'for field_val in feature' work (github #451)
+
+# GDAL/OGR 2.2.0 Release Notes
+
+## In a nutshell...
+
+ * New GDAL/raster drivers:
+   - DERIVED driver: read-support. Expose subdatasets in a a new metadata domain, called DERIVED_SUBDATASETS
+   - JP2Lura driver: read/create support for JPEG-2000 images using Luratech JP2 Library
+   - PRF: add read-only support for PHOTOMOD PRF file format driver (github #173)
+   - RRASTER driver: read-support .grd/.gri files handled by the R 'raster' package (#6249)
+ * New OGR/vector drivers:
+    - CAD driver: read support for DWG R2000 files (GSoC 2016 project)
+    - DGNv8 driver: read-write support for DGN 8.0 format (using Teigha ODA libraries)
+    - GMLAS driver: read-write support. XML/GML driver driven by Application Schemas.
+ * New utility script: ogrmerge.py to merge several vector datasets into a single one
+ * New /vsigs/ and /vsigs_streaming/ virtual file systems to read Google Cloud Storage non-public files
+ * Significantly improved drivers:
+  - NWT_GRD: write support (#6533)
+  - FileGDB/OpenFileGDB: add support to read curve geometries (#5890)
+  - VRT derived band: add the capability to define pixel functions in Python
+  - Add read support for RasterLite2 coverages in SQLite driver
+  - GPKG: implement tiled gridded elevation data extension
+  - ISIS3: add write support and improve read support
+ * RFC 63: Add GDALRasterBand::GetDataCoverageStatus() and implement it in GTiff and VRT drivers
+        https://trac.osgeo.org/gdal/wiki/rfc63_sparse_datasets_improvements
+ * RFC 64: Triangle, Polyhedral surface and TIN
+        https://trac.osgeo.org/gdal/wiki/rfc64_triangle_polyhedralsurface_tin
+   ==> this RFC introduces potential backward incompatible behavior.
+        Consult MIGRATION_GUIDE.txt
+ * RFC 66: OGR random layer read/write capabilities
+        https://trac.osgeo.org/gdal/wiki/rfc66_randomlayerreadwrite
+ * RFC 67: add null field state for OGR features, in addition to unset fields
+        https://trac.osgeo.org/gdal/wiki/rfc67_nullfieldvalues
+   ==> this RFC introduces potential backward incompatible behavior.
+        Consult MIGRATION_GUIDE.txt
+ * Upgrade to EPSG database v9.0 (#6772)
+ * Python bindings: Global Interpreter Lock (GIL) released before entering GDAL native code (for all, in GDAL module and a few ones in ogr like ogr.Open())
+ * Continued major efforts on sanitization of code base
+ * Remove bridge and vb6 bindings (#6640)
+ * GNM built by default
+
+## Installed files
+
+ * Removed: data/s57attributes_aml.csv data/s57attributes_iw.csv data/s57objectclasses_aml.csv data/s57objectclasses_iw.csv
+ * Added plscenesconf.json, gmlasconf.xsd
+
+## Backward compatibility issues
+
+See MIGRATION_GUIDE.TXT
+
+## GDAL/OGR 2.2.0 - General Changes
+
+Build(Unix):
+ * improve detection of packaged libfyba (SOSI) --with-sosi, as in Ubuntu 16.04 (#6488)
+ * Sort files in static library to make the build reproducible (#6520)
+ * fix libqhull include path when it is /usr/local/include/libqhull (#6522)
+ * FileGDB: compilation fix on Linux in C++11 mode
+ * configure: make pdfium detection not fail if there are just warnings. And make configure fail if --with-pdfium was required but failed (#6653)
+ * Make ./configure --with-xerces fail if not found
+ * Don't install script documentation in INST_BIN (github #157)
+ * configure: auto-detect webp without requiring explicit --with-webp
+ * configure: use pkg-config for HDF5 detection so that works out of the box on recent Ubuntu
+ * auto-detect JDK 8 on Ubuntu
+ * MDB: allow libjvm.so to be dlopen'd with --with-jvm-lib=dlopen (Unix only, github #177)
+ * configure: delete temporary directories on the mac
+ * configure: make sure --with-macosx-framework is correctly defined
+ * configure: error out if --with-ld-shared is specified (#6769)
+ * configure: remove bashism.
+ * configure: fix --without-mrf (#6811)
+ * configure: take into account CXXFLAGS and LDFLAGS in a few more cases (cryptopp, podofo, libdap)
+ * Vagrant: all lxc and Hyper-V provider support; use vagrant-cachier for package caching
+ * configure: update DWG support to work with Teigha libraries
+ * Internal libgeotiff: hide symbols in --with-hide-internal-symbols mode
+ * Shape: do not export Shapelib symbols for builds --with-hide-internal-symbols (#6860)
+
+Build(Windows):
+ * Try to avoid confusion between libqhull io.h and mingw own io.h (#6590)
+ * update script to generate most recent Visual C++ project files (#6635)
+ * fix broken and missing dependencies in makefile.vc
+ * add a way to use an external zlib (github #171)
+ * Rename makegdal_gen.bat to generate_vcxproj.bat
+ * generate_vcxproj.bat: Set correct value of PlatformToolset property based on specified Visual C++ version. Add NMAKE command line parameters: MSVC_VER based on specified Visual C++ version, DEBUG=1 WITH_PDB=1 to Debug build configuration.
+ * generate_vcxproj.bat: generate project for autotest/cpp (Ticket #6815)
+* Add WIN64=1 to NMAKE command line options.
+ * Add HDF4_INCLUDE option (#6805)
+ * Add MSVC compiler option /MP to build with parallel processes.
+ * Add ZLIB_LIB missing from EXTERNAL_LIBS
+
+Build(all):
+ * make Xerces 3.1 the minimal version
+ * drop support for PostgreSQL client library older than 7.4, or non security maintained releases older than 8.1.4, 8.0.8, 7.4.13, 7.3.15
+
+## GDAL 2.2.0 - Overview of Changes
+
+Port:
+ * Export VSICreateCachedFile() as CPL_DLL so as to enable building JP2KAK as a plugin
+ * Added possibility to find GDAL_DATA path using INST_DATA definition without execution GDALAllRegister if GDAL_DATA placed in version named directory on Linux (#6543)
+ * Unix filesystem: make error message about failed open to report the filename (#6545)
+ * File finder: Remove hardcoded find location (/usr/local/share/gdal) (#6543)
+ * Win32 filesystem handler: make Truncate() turn on sparse files when doing file extension
+ * Add VSIFGetRangeStatusL() and VSISupportsSparseFiles()
+ * GDAL_NO_HARDCODED_FIND compilation option (#6543,#6531) to block file open calls (for sandboxed systems)
+ * Add VSIMallocAligned(), VSIMallocAlignedAuto() and VSIFreeAligned() APIs
+ * /vsizip / /vsitar: support alternate syntax /vsitar/{/path/to/the/archive}/path/inside/the/tar/file so as not to be dependent on file extension and enable chaining
+ * Optimize opening of /vsitar/my.tar.gz/my_single_file
+ * /vsizip/ : support creating non-ASCII filenames inside a ZIP (#6631)
+ * VSI Unix file system: fix behavior in a+ mode that made MRF caching not work on Mac and other BSD systems
+ * Fix deadlock at CPLWorkerThreadPool destruction (#6646)
+ * Windows: honour GDAL_FILENAME_IS_UTF8 setting to call LoadLibraryW() (#6650)
+ * CPLFormFilename(): always use / path separator for /vsimem, even on Windows
+ * /vsimem/: add trick to limit the file size, so as to be able to test how drivers handle write errors
+ * /vsimem/: fix potential crash when closing -different- handles pointing to the same file from different threads (#6683)
+ * CPLHTTPFetch(): add MAX_FILE_SIZE option
+ * CPLHTTPFetch(): add a CAINFO option to set the path to the CA bundle file. As a fallback also honour the CURL_CA_BUNDLE and SSL_CERT_FILE environment variables used by the curl binary, which makes this setting also available for /vsicurl/, /vsicurl_streaming/, /vsis3/ and /vsis3_streaming/ file systems (#6732)
+ * CPLHTTPFetch(): don't disable peer certificate verification when doing https (#6734)
+ * CPLHTTPFetch(): cleanly deal with multiple headers passed with HEADERS and separated with newlines
+ * CPLHTTPFetch(): add a CONNECTTIMEOUT option
+ * CPLHTTPFetch(): add a GDAL_HTTP_HEADER_FILE / HEADER_FILE option.
+ * CPLHTTPSetOptions(): make redirection of POST requests to still be POST requests after redirection (#6849)
+ * /vsicurl/: take CPL_VSIL_CURL_ALLOWED_EXTENSIONS into account even if GDAL_DISABLE_READDIR_ON_OPEN is defined (#6681)
+ * /vsicurl/: get modification time if available from GET or HEAD results
+ * /vsis3/: add a AWS_REQUEST_PAYER=requester configuration option (github #186)
+ * CPLParseXMLString(): do not reset error state
+ * Windows: fix GetFreeDiskSpace()
+ * Fix GetDiskFreeSpace() on 32bit Linux to avoid 32bit overflow when free disk space is above 4 GB (#6750)
+ * Fix CPLPrintUIntBig() to really print a unsigned value and not a signed one
+ * Add CPL_HAS_GINT64, GINT64_MIN/MAX, GUINT64_MAX macros (#6747)
+ * Add CPLGetConfigOptions(), CPLSetConfigOptions(), CPLGetThreadLocalConfigOptions() and CPLSetThreadLocalConfigOptions() to help improving compatibility between osgeo.gdal python bindings and rasterio (related to https://github.com/mapbox/rasterio/pull/969)
+ * MiniXML serializer: fix potential buffer overflow.
+
+Core:
+ * Proxy dataset: add consistency checks in (the unlikely) case the proxy and underlying dataset/bands would not share compatible characteristics
+ * GDALPamDataset::TryLoadXML(): do not reset error context when parsing .aux.xml
+ * PAM/VRT: only take into account <Entry> elements when deserializing a <ColorTable>
+ * GDALCopyWords(): add fast copy path when src data type == dst data type == Int16 or UInt16
+ * GetVirtualMemAuto(): allow USE_DEFAULT_IMPLEMENTATION=NO to prevent the default implementation from being used
+ * Nodata comparison: fix test when nodata is FLT_MIN or DBL_MIN (#6578)
+ * GetHistogram() / ComputeRasterMinMax() / ComputeStatistics(): better deal with precision issues of nodata comparison on Float32 data type
+ * Fast implementation of GDALRasterBand::ComputeStatistics() for GDT_Byte and GDT_UInt16 (including use of SSE2/AVX2)
+ * Driver manage: If INST_DATA is not requested, do not check the GDAL_DATA variable.
+ * Make sure that GDALSetCacheMax() initialize the raster block mutex (#6611)
+ * External overview: fix incorrect overview building when generating from greater overview factors to lower ones, in compressed and single-band case (#6617)
+ * Speed-up SSE2 implementation of GDALCopy4Words from float to byte/uint16/int16
+ * Add SSE2 and SSSE3 implementations of GDALCopyWords from Byte with 2,3 or 4 byte stride to packed byte
+ * GDALCopyWords(): SSE2-accelerated Byte->Int32 and Byte->Float32 packed conversions
+ * Fix GDALRasterBand::IRasterIO() on a VRT dataset that has resampled sources, on requests such as nXSize == nBufXSize but nXSize != dfXSize
+ * GDALRasterBand::IRasterIO(): add small epsilon to floating-point srcX and srcY to avoid some numeric precision issues when rounding.
+ * Add GDALRasterBand::GetActualBlockSize() (#1233)
+ * Fix potential deadlock in multithreaded writing scenarios (#6661)
+ * Fix thread-unsafe behavior when using GetLockedBlock()/MarkDirty()/DropLock() lower level interfaces (#6665)
+ * Fix multi-threading issues in read/write scenarios (#6684)
+ * Resampled RasterIO(): so as to get consistent results, use band datatype as intermediate type if it is different from the buffer type
+ * Add GDALIdentifyDriverEx() function (github #152)
+ * GDALOpenInfo: add a papszAllowedDrivers member and fill it in GDALOpenEx()
+ * GDALDefaultOverviews::BuildOverviews(): improve progress report
+ * Average and mode overview/rasterio resampling: correct source pixel computation due to numerical precision issues when downsampling by an integral factor, and also in oversampling use cases (github #156)
+ * Overview building: add experimental GDAL_OVR_PROPAGATE_NODATA config option that can be set to YES so that a nodata value in source samples will cause the target pixel to be zeroed. Only implemented for AVERAGE resampling right now
+ * GDALValidateOptions(): fix check of min/max values
+ * GMLJP2 v2: update to 2.0.1 corrigendum and add capability to set gml:RectifiedGrid/gmlcov:rangeType content. Set SRSNAME_FORMAT=OGC_URL by default when converting to GML. Add gml:boundedBy in gmljp2:GMLJP2RectifiedGridCoverage
+ * GMLJP2 v2: ensure KML root node id unicity when converting annotations on the fly. When generating GML features, make sure that PREFIX and TARGET_NAMESPACE are unique when specifying several documents.
+
+Algorithms:
+ * RPC transformer: speed-up DEM extraction by requesting and caching a larger buffer, instead of doing many queries of just a few pixels that can be costly with VRT for example
+ * GDALDeserializeRPCTransformer(): for consistency, use the same default value as in GDALCreateRPCTransformer() if <PixErrThreshold> is missing (so use 0.1 instead of 0.25 as before)
+ * TPS solver: when Armadillo fails sometimes, fallback to old method
+ * GDALCreateGenImgProjTransformer2(): add SRC_APPROX_ERROR_IN_SRS_UNIT, SRC_APPROX_ERROR_IN_PIXEL, DST_APPROX_ERROR_IN_SRS_UNIT, DST_APPROX_ERROR_IN_PIXEL, REPROJECTION_APPROX_ERROR_IN_SRC_SRS_UNIT and REPROJECTION_APPROX_ERROR_IN_DST_SRS_UNIT transformer options, so as to be able to have approximate sub-transformers
+ * Fix GDAL_CG_Create() to call GDALContourGenerator::Init() (#6491)
+ * GDALContourGenerate(): handle the case where the nodata value is NaN (#6519)
+ * GDALGridCreate(): fix hang in multi-threaded case when pfnProgress is NULL or GDALDummyProgress (#6552)
+ * GDAL contour: fix incorrect oriented contour lines in some rare cases (#6563)
+ * Warper: multiple performance improvements for cubic interpolation and uint16 data type
+ * Warper: add SRC_ALPHA_MAX and DST_ALPHA_MAX warp options to control the maximum value of the alpha channel. Set now to 65535 for UInt16 (and 32767 for Int16), or to 2^NBITS-1. 255 used for other cases as before
+ * Warper: avoid undefined behavior when doing floating point to int conversion, that may trigger exception with some compilers (LLVM 8) (#6753)
+ * OpenCL warper: update cubicConvolution to use same formula as CPU case (#6664)
+ * OpenCL warper: fix compliance to the spec. Fix issues with NVidia opencl (#6624, #6669)
+ * OpenCL warper: use GPU based over CPU based implementation when possible, use non-Intel OpenCL implementation when possible. Add BLACKLISTED_OPENCL_VENDOR and PREFERRED_OPENCL_VENDOR to customize choice of implementation
+
+Utilities:
+ * gdalinfo -json: fix order of points in wgs84Extent.coordinates (github #166)
+ * gdalwarp: do not densify cutlines by default when CUTLINE_BLEND_DIST is used (#6507)
+ * gdalwarp: when -to RPC_DEM is specified, make -et default to 0 as documented (#6608)
+ * gdalwarp: improve detection of source alpha band and auto-setting of target alpha band. Automatically set PHOTOMETRIC=RGB on target GeoTIFF when input colors are RGB
+ * gdalwarp: add a -nosrcalpha option to wrap the alpha band as a regular band and not as the alpha band
+ * gdalwarp: avoid cutline densification when no transform at all is involved (related to #6648)
+ * gdalwarp: fix failure with cutline on a layer of touching polygons (#6694)
+ * gdalwarp: allow to set UNIFIED_SRC_NODATA=NO to override the default that set it to YES
+ * gdalwarp: fix -to SRC_METHOD=NO_GEOTRANSFORM -to DST_METHOD=NO_GEOTRANSFORM mode (#6721)
+ * gdalwarp: add support for shifting the values of input DEM when source and/or target SRS references a proj.4 vertical datum shift grid
+ * gdalwarp: fix crash when -multi and -to RPC_DEM are used together (#6869)
+ * gdal_translate: when using -projwin with default nearest neighbour resampling, align on integer source pixels (#6610)
+ * gdal_translate & gdalwarp: lower the default value of GDAL_MAX_DATASET_POOL_SIZE to 100 on MacOSX (#6604)
+ * gdal_translate: avoid useless directory scanning on GeoTIFF files
+ * gdal_translate: make "-a_nodata inf -ot Float32" work without warning
+ * gdal_translate: set nodata value on vrtsource on scale / unscale / expand cases (github #199)
+ * GDALTranslate(): make it possible to create a anonymous target VRT from a (anonymous) memory source
+ * gdaldem: speed-up computations for src type = Byte/Int16/UInt16 and particularly for hillshade
+ * gdaldem hillshade: add a -multidirectional option
+ * GDALDEMProcessing() API: fix -alt support (#6847)
+ * gdal_polygonize.py: explicitly set output layer geometry type to be polygon (#6530)
+ * gdal_polygonize.py: add support for -b mask[,band_number] option to polygonize a mask band
+ * gdal_rasterize: make sure -3d, -burn and -a are exclusive
+ * gdal_rasterize: fix segfaults when rasterizing into an ungeoreferenced raster, or when doing 'gdal_rasterize my.shp my.tif' with a non existing my.tif (#6738)
+ * gdal_rasterize: fix crash when rasterizing empty polygon (#6844)
+ * gdal_grid: add a smoothing parameter to invdistnn algorithm (github #196)
+ * gdal_retile.py: add a -overlap switch
+ * gdal2tiles.py: do not crash on empty tiles generation (#6057)
+ * gdal2tiles.py: handle requested tile at too low zoom to get any data (#6795)
+ * gdal2tiles: fix handling of UTF-8 filenames (#6794)
+ * gdal2xyz: use %d formatting for Int32/UInt32 data types (#6644)
+ * gdal_edit.py: add -scale and -offset switches (#6833)
+ * gdaltindex: emit warning in -src_srs_format WKT when WKT is too large
+ * gdalbuildvrt: add a -oo switch to specify dataset open options
+
+Python samples:
+ * add validate_cloud_optimized_geotiff.py
+ * add validate_gpkg.py
+
+Multi-driver:
+ * Add GEOREF_SOURCES open option / GDAL_GEOREF_SOURCES config. option to all JPEG2000 drivers and GTiff to control which sources of georeferencing can be used and their respective priority
+
+AIGRID driver:
+ * fix 2.1.0 regression when reading statistics (.sta) file with only 3 values, and fix <2.1 behavior to read them in LSB order (#6633)
+
+AAIGRID driver:
+ * auto-detect Float64 when the nodata value is not representable in the Float32 range
+
+ADRG driver:
+ * handle north and south polar zones (ZNA 9 and 18) (#6783)
+
+ASRP driver:
+ * fix georeferencing of polar arc zone images (#6560)
+
+BPG driver:
+* declare GDALRegister_BPG as C exported for building as a plugin (#6693)
+
+DIMAP driver:
+ * DIMAP: for DIMAP 2, read RPC from RPC_xxxxx.XML file (#6539)
+ * DIMAP/Pleiades metadata reader: take into tiling to properly shift RPC (#6293)
+ * add support for tiled DIMAP 2 datasets (#6293)
+
+DODS driver:
+ * fix crash on URL that are not DODS servers (#6718)
+
+DTED driver:
+ * correctly create files at latitudes -80, -75, -70 and -50 (#6859)
+
+ECW driver:
+ * Add option ECW_ALWAYS_UPWARD=TRUE/FALSE  to work around issues with "Downward" oriented images (#6516).
+
+ENVI driver:
+ * on closing, pad image file with trailing nul bytes if needed (#6662)
+ * add read/write support for rotated geotransform (#1778)
+
+GeoRaster driver:
+ * fix report of rotation (#6593)
+ * support for JP2-F compression (#6861)
+ * support direct loading of JPEG-F when blocking=no (#6861)
+ * default blocking increased from 256x256 to 512x512 (#6861)
+
+GPKG driver:
+ * implement tiled gridded elevation data extension
+ * add VERSION creation option
+ * check if transaction COMMIT is successful (#6667)
+ * fix crash on overview building on big overview factor (#6668)
+ * fix crash when opening an empty raster with USE_TILE_EXTENT=YES
+ * fix gpkg_zoom_other registration
+
+GTiff driver:
+ * support SPARSE_OK=YES in CreateCopy() mode (and in update mode with the SPARSE_OK=YES open option), by actively detecting blocks filled with 0/nodata about to be written
+ * When writing missing blocks (i.e. non SPARSE case), use the nodata value when defined. Otherwise fallback to 0 as before.
+ * in FillEmptyTiles() (i.e. in the TIFF non-sparse mode), avoid writing zeroes to file so as to speed up file creation when filesystem supports ... sparse files
+ * add write support for half-precision floating point (Float32 with NBITS=16)
+ * handle storing (and reading) band color interpretation in GDAL internal metadata when it doesn't match the capabilities of the TIFF format, such as B,G,R ordering (#6651)
+ * Fix RasterIO() reported when downsampling a RGBA JPEG compressed TIFF file (#6943)
+ * Switch search order in GTIFGetOGISDefn() - Look for gdal_datum.csv before datum.csv (#6531)
+ * optimize IWriteBlock() to avoid reloading tile/strip from disk in multiband contig/pixel-interleave layouts when all blocks are dirty
+ * fix race between empty block filling logic and background compression threads when using Create() interface and NUM_THREADS creation option (#6582)
+ * use VSIFTruncateL() to do file extension
+ * optimize reading and writing of 1-bit rasters
+ * fix detection of blocks larger than 2GB on opening on 32-bit builds
+ * fix saving and loading band description (#6592)
+ * avoid reading external metadata file that could be related to the target filename when using Create() or CreateCopy() (#6594)
+ * do not generate erroneous ExtraSamples tag when translating from a RGB UInt16, without explicit PHOTOMETRIC=RGB (#6647)
+ * do not set a PCSCitationGeoKey = 'LUnits = ...' as the PROJCS citation on reading
+ * fix creating an image with the Create() interface with BLOCKYSIZE > image height (#6743)
+ * fix so that GDAL_DISABLE_READDIR_ON_OPEN = NO / EMPTY_DIR is properly honoured and doesn't cause a useless directory listing
+ * make setting GCPs when geotransform is already set work (with warning about unsetting the geotransform), and vice-versa) (#6751)
+ * correctly detect error return of TIFFReadRGBATile() and TIFFReadRGBAStrip()
+ * in the YCBCR RGBA interface case, only expose RGB bands, as the alpha is always 255
+ * don't check free disk space when outputting to /vsistdout/ (#6768)
+ * make GetUnitType() use VERT_CS unit as a fallback (#6675)
+ * in COPY_SRC_OVERVIEWS=YES mode, set nodata value on overview bands
+ * read GCPs in ESRI <GeodataXform> .aux.xml
+ * explicitly write YCbCrSubsampling tag, so as to avoid (latest version of) libtiff to try reading the first strip to guess it. Helps performance for cloud optimized geotiffs
+ * map D_North_American_1927 datum citation name to OGC North_American_Datum_1927 so that datum is properly recognized (#6863)
+ * Internal libtiff. Resync with CVS (post 4.0.7)
+ * Internal libtiff: fix 1.11 regression that prevents from reading one-strip files that have no StripByteCounts tag (#6490)
+
+GRASS driver:
+ * plugin configure: add support for GRASS 7.2 (#6785)
+ * plugin makefile: do not clone datum tables and drivers (#2953)
+ * use Rast_get_window/Rast_set_window for GRASS 7 (#6853)
+
+GRIB driver:
+ * Add (minimalistic) support for template 4.15 needed to read Wide Area Forecast System (WAFS) products (#5768)
+ * **Partial** resynchronization with degrib-2.0.3, mostly to get updated tables (related to #5768)
+ * adds MRMS grib2 decoder table (http://www.nssl.noaa.gov/projects/mrms/operational/tables.php) (github #160)
+ * enable PNG decoding on Unix (#5661, github #160)
+ * remove explicitly JPEG2000 decompression through Jasper and use generic GDAL code so that other drivers can be triggered
+ * fix a few crashes on malformed files
+
+GTX driver:
+ * add a SHIFT_ORIGIN_IN_MINUS_180_PLUS_180 open option
+
+HDF4 driver:
+ * Fixed erroneous type casting in HDF4Dataset::AnyTypeToDouble() that breaks reading georeferencing and other metadata
+
+HDF5 driver:
+ * correct number of GCPs to avoid dummy trailing (0,0)->(0,0,0) and remove +180 offset applied to GCP longitude. Add instead a heuristics to determine if the product is crossing the antimeridian, and a HDF5_SHIFT_GCPX_BY_180 config option to be able to override the heuristics (#6666)
+
+HFA driver:
+ * fix reading and writing of TOWGS84 parameters (github #132)
+ * export overview type from HFA files to GDAL metadata as OVERVIEWS_ALGORITHM (github #135)
+ * make .ige initialization use VSIFTruncateL() to be faster on Windows
+ * add support for TMSO and HOM Variant A projections (#6615)
+ * Add elevation units read from HFA files metadata (github #169)
+ * set binning type properly according to layerType being thematic or not (#6854)
+
+Idrisi driver:
+ * use geotransform of source dataset even if it doesn't have a SRS (#6727)
+ * make Create() zero-initialize the .rst file (#6873)
+
+ILWIS driver:
+ * avoid IniFile::Load() to set the bChanged flag, so as to avoid a rewrite of files when just opening datasets
+
+ISCE driver:
+ * fix computation of line offset for multi-band BIP files, and warn if detecting a wrong file produced by GDAL 2.1.0 (#6556)
+ * fix misbehaviour on big endian hosts
+ * add support for reading and writing georeferencing (#6630, #6634)
+ * make parsing of properties case insensitive (#6637)
+
+ISIS3 driver:
+ * add write support
+ * add mask band support on read
+ * get label in json:ISIS3 metadata domain
+
+JPEGLS driver:
+
+JP2ECW driver:
+ * fix crash when translating a Float64 raster (at least with SDK 3.3)
+
+JP2KAK driver:
+ * add support for Kakadu v7.9.  v7.8 should not be used.  It has a bug fixed in v7.9
+ * catch exceptions in jp2_out.write_header()
+
+JP2OpenJPEG driver:
+ * add a USE_TILE_AS_BLOCK=YES open option that can help with whole image conversion
+ * prevent endless looping in openjpeg in case of short write
+ * for single-line organized images, such as found in some GRIB2 JPEG2000 images, use a Wx1 block size to avoid huge performance issues (#6719)
+  * ignore warnings related to empty tag-trees.
+
+JPIPKAK driver:
+ * fix random crashes JPIP in multi-tread environment (#6809)
+
+KEA driver:
+ * Add support for Get/SetLinearBinning (#6855)
+
+KMLSuperOverlay driver:
+ * recognize simple document made of GroundOverlay (#6712)
+ * Add FORMAT=AUTO option. Uses PNG for semi-transparent areas, else JPG. (#4745)
+
+LAN driver:
+ * remove wrong byte-swapping for big-endian hosts
+
+MAP driver:
+ * change logic to detect image file when its path is not absolute
+
+MBTiles driver:
+ * on opening if detecting 3 bands, expose 4 bands since there might be transparent border tiles (#6836)
+ * fix setting of minzoom when computing overviews out of order
+ * do not open .mbtiles that contain vector tiles, which are not supported by the driver
+
+MEM driver:
+ * disable R/W mutex for tiny performance increase in resampled RasterIO
+ * add support for overviews
+ * add support for mask bands
+
+MRF driver:
+ * bug fix in PNG and JPEG codecs
+ * Fixing a problem with setting NoData for MRFs generated with Create
+ * fix plugin building (#6498)
+ * rename CS variable so as to avoid build failure on Solaris 11 (#6559)
+ * Allow MRF to write the data file directly to an S3 bucket.
+ * Allow relative paths when MRF is open via the metadata string.
+ * Add support for spacing (unused space) between tiles. Defaults to none.
+ * Read a single LERC block as an MRF file.
+
+MSG driver:
+ * fix incorrect georeference calculation for msg datasets (github #129)
+
+NetCDF driver:
+ * add support for reading SRS from srid attribute when it exists and has content like urn:ogc:def:crs:EPSG::XXXX (#6613)
+ * fix crash on datasets with 1D variable with 0 record (#6645)
+ * fix erroneous detection of a non-longitude X axis as a longitude axis that caused a shift of 360m on the georeferencing (#6759)
+ * read/write US_survey_foot unit for linear units of projection
+ * apply 'add_offset' and 'scale_factor' on x and y variables when present, such as in files produced by NOAA from the new GOES-16 (GOES-R) satellite (github #200)
+ * add a HONOUR_VALID_RANGE=YES/NO open option to control whether pixel values outside of the validity range should be set to the nodata value (#6857)
+ * fix crash on int64/uint64 dimensions and variables, and add support for them (#6870)
+
+NITF driver:
+ * add support for writing JPEG2000 compressed images with JP2OpenJPEG driver
+ * fix writing with JP2KAK driver (emit codestream only instead of JP2 format)
+ * fix setting of NBPR/NBPC/NPPBH/NPPBV fields for JPEG2000 (fixes #4322); in JP2ECW case, make sure that the default PROFILE=NPJE implies 1024 block size at the NITF level
+ * implement creation of RPC00B TRE for RPC metadata in CreateCopy() mode
+ * add support for reading&writing _rpc.txt files
+ * nitf_spec.xml: Add support for MTIRPB TRE in NITF image segment. Also makes minor change to BLOCKA to include default values (github #127)
+ * nitf_spec.xml: add IMASDA and IMRFCA TREs
+ * GetFileList(): Small optimization to avoid useless file probing.
+
+NWT_GRD:
+ * detect short writes
+
+OpenJPEG driver:
+ * support direct extracting of GeoRaster JP2-F BLOB (#6861)
+
+PCIDSK driver:
+ * handle Exceptions returned from destructor and check access rights in setters (github #183)
+
+PDF driver:
+ * implement loading/saving of metadata from/into PAM (#6600)
+ * implement reading from/writing to PAM for geotransform and projection (#6603)
+ * prevent crashes on dataset reopening in case of short write
+
+PLScenes driver:
+ * add a METADATA open option
+
+PostgisRaster driver:
+ * fix potential crash when one tile has a lower number of bands than the max of the table (#6267)
+
+R driver:
+ * fix out-of-memory (oom) with corrupt R file
+
+Raw drivers:
+ * prevent crashes on dataset closing in case of short write
+
+RMF driver:
+ * fix wrong counter decrement that caused compressed RMF to be incorrectly decompressed (github #153)
+ * fix load/store inversion of cm and dm units in MTW files (github #162)
+ * fix reading nodata for non-double data type (github #174)
+
+ROIPAC driver:
+ * add support for reading/writing .flg files (#6504)
+ * fix computation of line offset for multi-band BIP files, and warn if detecting a wrong file produced by GDAL >= 2.0.0 (#6591)
+ * fix for big endian hosts
+
+RS2 driver:
+ * add support for reading RPC from product.xml
+
+SAFE driver:
+ * fix handling of SLC Products by providing access to measurements as subdatasets (#6514)
+
+Sentinel2 driver:
+ * add support for new "Safe Compact" encoding of L1C products (fixes #6745)
+
+SQLite driver:
+ * Add read support for RasterLite2 coverages in SQLite driver
+
+SRTMHGT driver:
+ * open directly .hgt.zip files
+ * accept filenames like NXXEYYY.SRTMGL1.hgt (#6614)
+ * handle files for latitude >= 50 (#6840)
+
+VRT driver:
+ * add default pixel functions: real, imag, complex, mod, phase, conj, etc... for complex data types (github #141)
+ * avoid useless floating point values in SrcRect / DstRect (#6568)
+ * avoid buffer initialization in RasterIO() when possible (replace ancient and likely broken concept of bEqualAreas)
+ * make CheckCompatibleForDatasetIO() return FALSE on VRTDerivedRasterBands (#6599)
+ * VRT warp: fix issue with partial blocks at the right/bottom and dest nodata values that are different per band (#6581)
+ * fix performance issue when nodata set at band level and non-nearest resampling used (#6628)
+ * VRTComplexSource: do temp computations on double to avoid precision issues when band data type is Int32/UInt32/CInt32/Float64/CFloat64 (#6642)
+ * VRT derived band: add the capability to define pixel functions in Python
+ * CreateCopy(): detect short writes
+ * Fix linking error on VRTComplexSource::RasterIOInternal<float>() (#6748)
+ * avoid recursion in xml:VRT metadata (#6767)
+ * prevent 'Destination buffer too small' error when calling GetMetadata('xml:VRT') on a in-memory VRT copied from a VRT
+ * fix 2.1 regression that can cause crash in VRTSimpleSource::GetFileList() (#6802)
+
+WMS driver:
+ * Added support for open options to WMS minidrivers
+ * Refactored the multi-http code to make it possible to do range requests.
+ * Added a minidriver_mrf, which reads from remote MRFs using range requests.
+ * Made the minidriver_arcgis work with an ImageService, not only MapService.
+ * Added static cache of server response.
+ * Allow tiledWMS to work in off-line mode by including the server response in the .wms file itself.
+ * honour GDAL_HTTP_USERAGENT config option when it is set and <UserAgent> is missing (#6825)
+ * WMS/WMTS: better deal with tiles with different band count (grayscale, gray+alpha, palette, rgb, rgba) (github #208)
+ * Make HTTPS options apply to tWMS minidriver init, better HTTP error reporting
+
+WMTS driver:
+ * do not take into account WGS84BoundingBox/BoundingBox that would be the result of the densified reprojection of the bbox of the most precise tile matrix
+ * add TILEMATRIX / ZOOM_LEVEL open options
+ * accept tiles of small dimensions (github #210)
+
+XYZ driver:
+
+## OGR 2.2.0 - Overview of Changes
+
+Core:
+ * Layer algebra: Add KEEP_LOWER_DIMENSION_GEOMETRIES=YES/NO option to Intersection, Union and Identity.
+Default is yes, but it is set to no unless result layer is of geom type unknown.
+If set to no, result features which would have lower dim geoms are skipped
+if operating on two layers with same geom dim.
+ * Fix crash/corrupted values when running importFromWkb() on POLYGON M/POLYGON ZM geometries (#6562)
+ * Add OGR_WKT_PRECISION config option that defaults to 15 to select the number of decimals when outputting to WKT
+ * Make OGRFeature::SetField(string) accept JSon serialized arrays for the String/Integer/Integer64/RealList types; add reciprocal OGRFeature::GetFieldAsSerializedJSon() for those types
+ * OGRGeometryFactory::transformWithOptions(): better deal with reprojection from polar projection to WGS84, and projections crossing the antimeridian to WGS84, by splitting geometries prior to reprojection (#6705)
+ * LinearRing transformTo(): force last point to be identical to first one in case it is not.
+ * GML geometry parsing: avoid 'Cannot add a compound curve inside a compound curve' error (#6777)
+ * OGR SQL: fix IN filtering on MapInfo indexed columns (#6798)
+ * OGR SQL: add support for LIMIT and OFFSET keywords
+ * OGR SQL: add comparisons on date / datetime (#6810)
+ * OGR SQL: increase efficiency of DISTINCT operator
+ * OGREnvelope: change initialization to fix issue when getting MULTIPOINT(0 0,1 1) envelope (#6841)
+ * OGRParse: fix parsing logic to avoid false positive detection of string as datetime (#6867)
+
+OGRSpatialReference:
+ * Upgrade to EPSG database v9.0 (#6772)
+ * OGRCT: upgrade LIBNAME of mingw and cygwin to libproj-9.dll and cygproj-9.dll to be up-to-date with proj 4.9.X (recommended method is using ./configure --with-static-proj4 instead) (#6501)
+ * importFromESRI(): fix import of multi line MERCATOR SRS (#6523)
+ * morphToESRI(): correctly compute standard_parallel_1 of Mercator(2SP) projection from scale factor of Mercator(1SP) (#6456, #4861)
+ * exportToProj4(): recognize explicit OSR_USE_ETMERC=NO to avoid using etmerc with proj >= 4.9.3
+ * importFromProj4(): do not set a AUTHORITY node for strings like '+init=epsg:XXXX +some_param=val'
+ * importFromProj4(): be robust with missing proj.4 epsg dictionary when importing '+init=epsg:xxxx +other_parm=value'
+ * AutoIdentifyEPSG(): add identification of EPSG:3995 (Arctic Polar Stereographic on WGS84) and EPSG:3031 (Antarctic Polar Stereographic on WGS84)
+ * OGRCoordinateTransformation: avoid potential bugs in proj.4 on NaN input
+ * importFromEPSG(): take into account DX,DY,DZ,RX,RY,RZ,DS columns in pcs.csv to add per-PCS TOWGS84 overrides (geotiff #52)
+ * Coordinate transformation: prevent unnecessary coordinate transformations (github #184, #185)
+
+Utilities:
+ * ogr2ogr: do not return error on ogr2ogr --utility_version
+ * ogr2ogr: keep -append and -overwrite when -update follows
+ * ogr2ogr: fix heuristics to detect likely absence of '-f' (#6561)
+ * ogr2ogr: do not emit a warning when updating/overwriting a destination dataset that is not a Shapefile and if -f is not specified (#6561)
+ * ogr2ogr: make overwriting of lots of PG tables less prone to PostgreSQL 'out of shared memory' errors, by committing transactions after each table recreation
+ * ogr2ogr: prevent 'ogr2ogr same.shp same.shp' (#1465)
+ * ogr2ogr: add a -limit option to limit the number of features read per layer
+ * GDALVectorTranslate(): imply update mode if access mode not explicitly specified and hDstDS != NULL (#6612)
+ * ogrlineref: Fix crash if no new layer name provided
+ * ogrtindex: add -src_srs_name, -src_srs_format and -t_srs option to allow indexing files that have different projections
+
+Multidriver:
+ * PGeo/FileGDB/OpenFileGDB: OGRCreateFromShapeBin(): do not error out on empty lines/polygons
+ * GPKG/SQLite/PG/FileGDB/MEM: properly set/reset field subtype with AlterFieldDefn() (#6689)
+ * DXF, GeoJSON, GML, KML, LIBKML, ODS, Shape, XLSX: report operating system error if file creation fails (#2253)
+
+AmigoCloud driver:
+ * add option to receive an AmigoCloud API key in the connection string, fix page size (github #137)
+
+Carto:
+ * renamed from CartoDB
+ * fix CartoDB'fication() by removing manual creation of the_geom_webmercator mercator, and also attach created sequence to table.cartodb_id (#6565)
+
+CSV driver:
+ * add read/write support for String/Integer/Integer64/RealList types as serialized JSon arrays
+
+DGN driver:
+ * avoid crash with -ftrapv on 250K_NF44NE_Area_V7.dgn (relates to #6806)
+ * use coordinate delta encoding from the attribute records array (6806)
+
+DXF driver:
+ * sanitize layer name on export to avoid forbidden characters
+ * reader: convert GeometryCollection to MultiPoint, MultiLineString or MultiPolygon when possible (QGIS #10485)
+ * add font of TEXT and MTEXT to OGR style string (https://github.com/OSGeo/gdal/pull/198)
+
+DWG driver:
+ * compilation fixes with Teigha 4.2.2
+
+ElasticSearch driver:
+ * add support for ElasticSearch 5.0 and fix 2.X support (#6724)
+ * implement translation from SQL to E.S. query language
+
+FileGDB driver:
+ * add support to read curve geometries (#5890)
+ * support opening '.' directory
+
+GeoJSON driver:
+ * writer: add a RFC7946=YES creation option (#6705)
+ * read and write 'name' and 'description' members at FeatureCollection level
+ * fix field type detection when first value of a field is null (#6517)
+ * improve/fix field type promotion
+ * fix wrong behavior when there's a 'id' at Feature level and 'id' or 'ID' field in properties (#6538)
+ * in case top level id is a negative integer, put the value in a 'id' attribute (#6538)
+ * ESRI Json reader: support multilinestring from esriGeometryPolyline
+ * ESRI Json reader: do not set field width of 2147483647 (#6529)
+ * ESRI Json reader: support reading M and ZM geometries
+ * Add CPL_json_object_object_get() and use it, to avoid deprecation warnings on json_object_object_get()
+ * TopoJSON reader: sanitize invalid polygons (such as found in the 'TopoJSON' layer of http://bl.ocks.org/mbostock/raw/4090846/us.json)
+ * writer: fix segfaults on NULL geometry with -lco WRITE_BBOX=YES (#6698)
+ * writer: fix crash if NATIVE_MEDIA_TYPE creation option is specified alone
+ * Add support of TopoJSON without 'transform' element (github #192)
+ * don't set SRS if 'crs' set to null (github #206)
+
+GML driver:
+ * remove hack for CityGML regarding forcing srsDimension to 3 if not specified. Instead add a GML_SRS_DIMENSION_IF_MISSING config option that can be set to 3 if needed (#6597)
+ * consider srsName with URL like 'http://www.opengis.net/def/crs/EPSG/0/' as following EPSG axis order. Add SWAP_COORDINATES=YES/NO/AUTO (and GML_SWAP_COORDINATES configuration option) to override all auto guessing (#6678)
+ * add a SRSNAME_FORMAT=SHORT/OGC_URN/OGC_URL dataset creation option
+ * OGR_G_ExportToGMLEx(): add a COORD_SWAP option
+ * Writer: make ogr:FeatureCollection be a substitutionGroup of AbstractFeature for GML 3.2 output, so as to be compatible of GMLJP2 v2
+ * GML and NAS: improve error reporting (mention feature id and gml_id) when parsing fails because of geometry decoding error
+ * GML and NAS: add GML_SKIP_CORRUPTED_FEATURES and NAS_SKIP_CORRUPTED_FEATURES configuration options to avoid stopping reading a layer because of a corrupted geometry
+ * Add support for Japanese GML FGD v4.1 format (github #204)
+
+GPKG driver:
+ * list all tables/views by default (useful for non spatial tables not registered as aspatial). Add ASPATIAL_VARIANT layer creation option to select the way how to create a non-spatial table as aspatial.
+ * Create non-spatial tables by default conforming to GPKG v1.2 'attributes'
+ * use OGR_CURRENT_DATE config option if defined as the value of the 'last_change' of column of 'gpkg_contents' so as to be able to have binary identical output
+ * update last_change column when content of raster or vector tables has changed
+ * do not emit error when running ExecuteSQL() with a spatial filter on an empty layer (#6639)
+ * update schema to reflect CURRENT_TIMESTAMP -> 'now' changes (github #155)
+ * better table and column quoting.
+ * Robustify layer deletion (make it accessible through DROP TABLE xxx and DELLAYER:xxx syntax) and renaming
+ * implement DeleteField(), AlterFieldDefn(), ReorderFields()
+ * make GetExtent() save extent if not already cached
+ * add special SQL 'RECOMPUTE EXTENT ON layer_name' to force recomputation of extent
+ * check identifier unicity on layer creation
+ * add possibility to disable foreign key check by setting OGR_GPKG_FOREIGN_KEY_CHECK=NO config option
+ * add HasSpatialIndex(tblname,geomcolname) SQL function
+ * don't show Spatialite vgpkg_ virtual tables (#6707)
+ * SQLite/GPKG: add explicit error message when trying to open a read-only WAL-enabled database (#6776)
+ * SQLite/GPKG: make sure when closing a WAL-enabled database opened in read-only mode to reopen it in read-write mode so that the -wal and -shm files are removed (#6776)
+ * make GetFeature() works on non conformant tables that have no integer primary key field (#6799), and be robust to non standard column types
+ * remove triggers related to metadata tables that cause issues and have been removed by latest revisions of the spec.
+ * declare feature id column of features tables and tile pyramid user data tables as NOT NULL (#6807)
+ * add a gpkg_ogr_contents table to store feature count.
+ * speed-up GetFeatureCount() with only a spatial filter set
+ * improve column recognition for SQL result layer
+ * add/override ST_Transform() and SridFromAuthCRS() from Spatialite to make them work with gpkg_spatial_ref_sys
+ * add ImportFromEPSG()
+ * make ST_Min/MaxX/Y(), ST_SRID(), ST_GeometryType() and ST_IsEmpty() work with Spatialite geometries
+ * improve performance of spatial index creation and use on multi-gigabyte databases
+ * better support of spatial views, by adding a special behavior if a column is named OGC_FID
+ * avoid potential denial of services by adding LIMIT clauses
+ * slightly more efficient implementation of GetExtent() if extent in gpkg_contents is empty
+ * create a dummy 'ogr_empty_table' features table in case we have no 'features' or 'tiles' table, so as to be conformant with Req 17 of the GeoPackage specification
+ * add DEFAULT '' to metadata column of gpkg_metadata table
+ * accept opening a .gpkg without vector content and without gpkg_geometry_columns table in vector mode if we also open in update mode; remove capability of opening a .gpkg without vector content but with gpkg_geometry_columns table in vector mode if we only open in read-only mode; fix creation of a vector layer in a database if it initially lacks a gpkg_geometry_columns table
+ * fix appending a raster to a vector database without pre-existing raster support tables
+ * add minimalistic support for definition_12_063 column in gpkg_spatial_ref_sys, so that insertion of new SRS doesn't fail
+ * use GEOMETRYCOLLECTION instead of GEOMCOLLECTION for SQL and gpkg_geometry_columns.geometry_type_name
+ * do not warn if gpkg_metadata extension declared
+
+GPX driver:
+ * ignore wpt/rtept/trkpt with empty content for lat or long
+
+ILI driver:
+ * ILI1: fix crash in JoinSurfaceLayer() when the multicurve of the feature of the poSurfaceLineLayer layer is empty (#6688)
+ * ILI1: make polygon reconstruction in Surface layers robust to curves not in natural order (#6728)
+ * ILI2: assign FID to features (#6839)
+ * ILI2: fix crashing bug in Create() if model file not specified
+
+KML driver:
+ * add a DOCUMENT_ID datasource creation option to set the id of the root <Document> node
+
+LIBKML driver:
+ * fix crash when reading <gx:TimeStamp> or <gx:TimeSpan> elements (#6518)
+ * add a DOCUMENT_ID datasource creation option to set the id of the root <Document> node
+ * emit style related errors as warnings to make datasets openable by SWIG bindings (#6850)
+
+MITAB driver:
+ * limit (width, precision) of numeric fields on creation to (20,16) for compatibility with MapInfo (#6392)
+ * add support for oblique stereographic (#6598)
+ * Adds the authority code for Irish national grid (Ireland_1965) (github #149)
+ * fix spelling for Euref_89 and add EPSG code (#6816)
+
+MSSQLSpatial driver:
+ * Fix bulk insert with table names containing spaces (#6527)
+ * Build optional mssql plugin with SQL Native Client support for MSSQL Bulk Copy
+ * Fix MSSQL select layer to recognize geometry column with sqlncli (#6641)
+
+MySQL driver:
+ * fix spatial filtering on recent mysql by adding a SRID in the rectangle geometry
+ * do not force NOT NULL constraint on geometry field if no spatial index is used
+
+NAS driver:
+ * support multiple 'anlass' in updates
+
+NWT_GRD:
+ * add write support (#6533)
+
+OCI driver:
+ * Add options for faster feature loading (#6606)
+ * add WORKSPACE open option
+ * correctly handle OFTInteger64 case in loader layer (bug found by cppcheck multiCondition)
+ * support for long identifiers (up to 128 long) when running of 12.2 or + (#6866)
+ * OCILOB VSIL driver: new driver to streams in and out of Oracle BLOB as a GDAL large virtual file system (#6861)
+
+ODS driver:
+ * fix FID filtering (#6788)
+
+OGDI driver:
+ * make GetNextRawFeature() report an error when it is not end of layer
+ * better error reporting when the layer list cannot be established
+ * catch non-fatal OGDI errors emitted by OGDI 3.2.0 if OGDI_STOP_ON_ERROR environment variable is set to NO, and emit them as CPLError()s
+ * display OGDI error message if opening fails
+
+OpenFileGDB driver:
+ * do not error out on geometries that have a declared M array but that is missing (#6528)
+ * add support to read curve geometries (#5890)
+ * transcode UTF-16 strings found in column names, alias, etc... to UTF-8 (instead of using only their ASCII byte) (#6544)
+ * do not emit an error on a empty table whose declaration has M settings (#6564)
+ * support opening '.' directory
+ * improve detection of some form of TINs from MULTIPATCH, and for MultiPatch layers, try to select a better geometry type for those layers (#5888)
+ * fix bug when field description offset is beyond 4GB (#6830)
+
+OSM driver:
+ * fix 'too many tags in relation' error when parsing .osm files
+ * allow key=value entries in closed_ways_are_polygons= configuration (#6476)
+ * allow OSM_SQLITE_CACHE config option to be greater than 2047
+
+PG driver:
+ * fix insertion of binary/bytea content in non-copy mode (#6566)
+ * fix errors caused by missing geometry_columns/spatial_ref_sys tables in non PostGIS databases, that prevent reading more than 500 features (QGIS #10904)
+ * avoid errors with field default expressions like 'foo'::text (#6872)
+
+PLScenes driver:
+ * add HTTP retry logic (#6655)
+ * V0 API: workaround limitations on filtering on image_statistics.image_quality (#6657)
+ * add support for Data V1 API
+
+S57 driver:
+ * Fix ogr2ogr -f S57 (#6549)
+ * fix crashes if the s57objectclasses.csv resource file contains invalid lines
+ * remove data/s57attributes_aml.csv data/s57attributes_iw.csv data/s57objectclasses_aml.csv data/s57objectclasses_iw.csv and move their content into main s57attributes.csv and s57objectclasses.csv files (#6673)
+ * Update s57 attributes and object classes according to s-57 reference (github #202)
+ * add POSACC and QUAPOS fields for geometric primitive layers (github #205)
+
+SDE driver:
+ * rename driver to OGR_SDE. Fix build (#6714)
+
+SEGY driver:
+ * Accept SEGY files with ASCII headers that have nul terminated strings (#6674)
+
+Shapefile driver:
+ * auto-repack by default at dataset closing and FlushCache()/SyncToDisk() time. Controlled by AUTO_REPACK open and layer creation options (that default to YES)
+ * generate .dbf end-of-file 0x1A character by default. Add DBF_EOF_CHAR layer creation options / open options to control that behavior
+ * writing: use strerrno() for better error messages (QGIS #13468)
+ * change REPACK implementation on Windows to be robust to remaining file descriptors opened on the .shp/.shx/.dbf (#6672, QGIS #15570)
+ * Fix issue in DBFCloneEmpty() one a one field DBF not yet written to disk
+ * add call to AutoIdentifyEPSG() when reading a .prj
+ * support reading .dbf with substantial padding after last field definition.
+ * when rewriting the geometry of the last record in the .shp, do it at the file offset it previously used (#6787)
+
+SOSI driver:
+ * make registration of driver work again (2.1.0 regression) (#6500)
+ * update to latest version of https://github.com/kartverket/gdal. Make SOSI driver support more geometry types (including curved geometries) plus provides some improvements on attribute-type mapping. Fix some memory errors/leaks. Disable by default non working creation code (#6503)
+
+SQLite/Spatialite driver:
+ * do not emit error when running ExecuteSQL() with a spatial filter on an empty layer (#6639)
+ * add read/write support for String/Integer/Integer64/RealList types as serialized JSon arrays
+ * Spatialite: avoid crash when creating layer with geom_type = wkbCurve (fixes #6660)
+ * Spatialite: do not report some BLOB columns as geometry columns of tables/views (when found before the geometry column(s)) (#6695, #6659)
+ * fix update of features with multiple geometry columns (#6696)
+ * speed-up dataset closing when creating a database with many spatial layers
+ * Spatialite: avoid spatial views to cause layers 'layer_name(geometry_name)' to be publicly listed (#6740)
+ * Spatialite: speed-up creation of database with INIT_WITH_EPSG=NO that is slow without transaction (not sure why as the table is empty...)
+ * use AUTOINCREMENT for feature id column
+ * allow OGR_SQLITE_CACHE to be set to > 2047 (MB) without overflowing
+ * SQLite/GPKG: use SQLITE_OPEN_NOMUTEX flag to open databases.
+ * GPKG/SQLite: fix ExecuteSQL() to work with a statement with 2 SELECT and ORDER BY clause (#6832)
+ * SQLite/GPKG: change default page_size to 4096 bytes.
+ * Update layer statistics for Spatialite 4 DB (#6838)
+ * Remove traces of support of SQLite < 3.6.0
+ * SQLite dialect: properly quote column names when needed (github #214)
+
+VFK driver:
+ * allow reading multiple VFK files into single DB support amendment VFK files
+ * recreate DB in the case that it's outdated (VFK DB created by previous versions of GDAL)
+ * allow reading DB as valid datasource (#6509)
+ * new tables in backend SQLite database (geometry_columns/spatial_ref_sys) to enable reading DB datasource by SQLite driver
+ * new configuration option OGR_VFK_DB_READ to enable reading backend database by VFK driver
+
+VRT driver:
+ * add support for 'm' attribute in PointFromColumns mode (#6505)
+
+WFS driver:
+ * invalidate underlying layer when SetIgnoredFields() is called (QGIS #15112)
+ * don't crash on empty <Keyword/> declaration (#6586)
+ * fix potential nullptr dereference on dataset without layer (github #179)
+
+XLSX driver:
+ * only list worksheets (and no charts) as layers (#6680)
+
+## SWIG Language Bindings
+
+All bindings:
+ * map osr.GetTargetLinearUnits() (#6627)
+ * allow wkbCurve/wkbSurface as valid values for the geom type of GeomFieldDefn object
+ * map GDALIdentifyDriverEx()
+
+Java bindings:
+ * Fix SWIG Java bindings for GNM (#6434)
+ * Fix crash on GetDefaultHistogram() if the C++ method returns an error (#6812)
+
+Perl bindings:
+ * return value always from GetGeomFieldIndex (#6506)
+ * the Warp method requires a list of datasets (#6521)
+ * when 'use bigint' is in effect, int var is a ref.
+ * Separate the module building in the CPAN distribution and in
+the GDAL source tree. The CPAN distribution will be
+developed at https://github.com/ajolma
+ * Fix the Extension method in Driver per RFC 46
+ * The Inv method of GeoTransform did not return a new object.
+Allow a single point in Apply method of GeoTransform.
+ * Test for existence of PDL and require it if available.
+ * allow decimation/replication in Piddle i/o.
+ * support resampling in ReadTile.
+ * Polygonize: Require explicit 8 for Connectedness to set 8-connectedness and allow 8CONNECTED as an option.
+ * use Safefree to free memory allocated in Perl (#6796)
+
+Python bindings:
+ * release the GIL before entering GDAL native code (for all, in GDAL module and a few ones in ogr like ogr.Open())
+ * add outputType option to gdal.Rasterize()
+ * fix build issues when CXX is defined in the environment
+ * gdal.VectorTranslate(): add spatSRS option
+ * when enabling ogr.UseExceptions(), use the GDAL error message in the exception text (if available), when the exception is linked to an error value in the OGRErr return code
+ * gdal.VectorTranslate(): accept a single string as value of the layers option (instead of iterating over each of its characters)
+ * Regenerate Python bindings with SWIG 3.0.8 to avoid issue with Python 3.5. Add backward compatibility in Band.ComputeStatistics() to accept 0/1 as input instead of the expected bool value (#6749)
+ * fix gdal.DEMProcessingOptions(zeroForFlat=True) (#6775)
+ * fix 'import osgeo.gdal_array' with python3 and SWIG 3.0.10 (#6801)
+ * allow gdal.FileFromMemBuffer() to use buffer > 2GB (#6828)
+ * accept unicode strings as field name argument in Feature (like SetField, GetField, etc...) and FeatureDefn methods
+
+# GDAL/OGR 2.1.0 Release Notes
+
+## In a nutshell...
+
+ * New GDAL/raster drivers:
+    - CALS: read/write driver for CALS Type I rasters
+    - DB2 driver: read/write support for DB2 database (Windows only)
+    - ISCE: read/write driver (#5991)
+    - MRF: read/write driver (#6342)
+    - SAFE: read driver for ESA SENTINEL-1 SAR products (#6054)
+    - SENTINEL2: read driver for ESA SENTINEL-2 L1B/LC1/L2A products
+    - WMTS: read driver for OGC WMTS services
+ * New OGR/vector drivers:
+    - AmigoCloud: read/write support for AmigoCloud mapping platform
+    - DB2 driver: read/write support for DB2 database (Windows only)
+    - MongoDB: read/write driver
+    - netCDF: read/write driver
+    - VDV: read/write VDV-451/VDV-452 driver, with specialization for the
+           Austrian official open government street graph format
+ * Significantly improved drivers:
+    - CSV: new options, editing capabilities of existing file
+    - ElasticSearch: read support and support writing any geometry type
+    - GeoJSON: editing capabilities of existing file, "native data" (RFC 60) support
+    - MBTiles: add raster write support. fixes in open support
+    - PDF: add PDFium library as a possible back-end.
+    - PLScenes: add support for V1 API
+    - VRT: on-the-fly pan-sharpening
+    - GTiff: multi-threaded compression for some compression methods
+ * Port library: add /vsis3/, /vsis3_streaming/, /vsicrypt/ virtual file systems
+ * RFC 26: Add hash-set band block cache implementation for very larger rasters (WMS, WMTS, ...)
+        http://trac.osgeo.org/gdal/wiki/rfc26_blockcache
+ * RFC 48: Geographical networks support (GNM)
+        https://trac.osgeo.org/gdal/wiki/rfc48_geographical_networks_support
+ * RFC 58: Add DeleteNoDataValue():
+        https://trac.osgeo.org/gdal/wiki/rfc58_removing_dataset_nodata_value
+ * RFC 59.1: Make GDAL/OGR utilities available as library functions:
+        https://trac.osgeo.org/gdal/wiki/rfc59.1_utilities_as_a_library
+   For gdalinfo, gdal_translate, gdalwarp, ogr2ogr, gdaldem, nearblack, gdalgrid,
+   gdal_rasterize, gdalbuildvrt
+   Available in C, Python, Perl and Java bindings.
+ * RFC 60: Improved round-tripping in OGR
+        https://trac.osgeo.org/gdal/wiki/rfc60_improved_roundtripping_in_ogr
+   Implemented in GeoJSON driver
+ * RFC 61: Support for measured geometries.
+        https://trac.osgeo.org/gdal/wiki/rfc61_support_for_measured_geometries
+   Implemented in Shapefile, PostgreSQL/PostGIS, PGDump, MEM, SQLite, GeoPackage,
+   FileGDB, OpenFileGDB, CSV, VRT
+ * Upgrade to EPSG database v8.8
+ * General sanitization pass to clean-up code, fix a lot of compiler warnings,
+   as well as issues pointed by static code analyzers, such as Coverity Scan
+   (credits to Kurt Schwehr for tackling a large part of them) or CLang Static Analyzer.
+ * Fixes in a number of drivers to be more robust against corrupted files (most found
+   with American Fuzzy Lop): RIK, INGR, Northwood, HF2, CEOS, GTiff, GXF, BMP,
+   NITF, HFA, VRT, FIT, CEOS2, NWT_GRD/NWT_GRC, MITAB, RPFTOC, DBF/Shape, XYZ, VFK, DXF,
+   NAS, GSAG, GS7BG, OpenFileGDB, RMF, AIGRID, OpenAIR, EHDR, ISO8211, FAST,
+   USGSDEM, DGN, SGI, OpenJPEG, PCRaster, BSB, ADRG, SRP, JPEG, Leveller, VICAR, PCIDSK, XPM
+   as well as in portability library (CPL), algorithms and raster core.
+ * Driver removed:
+    - Google Maps Engine (GME)  (#6261)
+
+## New installed files
+ * gdal_pansharpen.py
+ * data/vdv452.xml
+ * data/vdv452.xsd
+ * data/netcdf_config.xsd
+ * /path/where/bash-completion/scripts/are/installed/gdal-bash-completion.sh
+
+## Backward compatibility issues
+
+See MIGRATION_GUIDE.TXT
+
+## GDAL/OGR 2.1.0 - General Changes
+
+Build(Unix):
+ * Allow plugin for HDF4, HDF5, GeoRaster, FileGDB, OCI and PG
+ * Add a --with-gnm option to enable GNM
+ * Add --enable-lto switch to turn on link time optimization (GCC >= 5)
+ * Add --with-spatialite=dlopen --with-spatialite-soname=libspatialite.so[.X] syntax to allow linking against spatialite through dlopen() mechanism (#6386)
+ * Add a lot of warning options when available in the compiler.
+ * Change detection test of podofo to work with podofo 0.9.3
+ * Fix gdalserver compilation with recent GNU libc (such as in Arch Linux) (#6073)
+ * Add pkg-config support for libkml fork (#6077)
+ * Update config.sub and config.guess to their latest upstream versions so as to be able to detect new architectures (android, ppcle64, etc..) (#6101)
+ * Fix python package installation in custom prefixes (#4563)
+ * configure: check that CXX is really a working compiler (#4436)
+ * Build support for Kakadu 7.7
+ * thinplatespline.cpp: avoid using optimized version of VizGeorefSpline2DBase_func4() with ICC versions that fail on it (#6350)
+ * Add bash completion for GDAL/OGR utilities and scripts (#6381)
+ * Add support for ODBC autodetection with mingw64 (#6000)
+ * Remove macos 9 and older support (#6133).
+ * Remove dist_docs, burnpath and pszUpdableINST_DATA in gcore/gdaldrivermanager.cpp as they are have not been used for a while (#6140).
+ * Removed --without-ogr configure flag (#6117).  Always build with OGR.
+
+Build(Windows):
+ * Add support for Visual Studio 2015 (a.k.a MSVC_VER=1900 or VC 14)
+ * Add KAKFLAGS to nmake.opt with KDU_{MAJOR,MINOR,PATCH}_VERSION define-s.
+ * nmake.opt: make it less error prone to define SETARGV when paths include spaces (#6032)
+ * nmake.opt: add CL.EXE compiler option /FC to display full path of source code file in diagnostics
+ * Remove WinCE support (#6133)
+ * nmake.opt: add /I flag to the INSTALL command so that xcopy will be smart enough to create a directory when copying files and avoid prompting for user input (https://github.com/OSGeo/gdal/pull/95)
+ * Enable mssql spatial blugin build, use BCP as the default option for the sqlncli enabled builds
+ * Add support to find MrSID 9.5 dll
+ * Fix Windows build with recent MySQL versions and Visual Studio 2015 (#6457)
+
+Build(all):
+ * Compatibility with C++11 and C++14
+ * Optional crypto++ dependency for /vsicrypt/ support
+ * Optional mongocxx dependency for MongoDB support
+
+Other:
+ * Disable copy constructor and assignment operators in classes OGRFieldDefn, OGRGeomFieldDefn, OGRFeature, GDALMultiDomainMetadata, GDALDefaultOverviews, GDALOpenInfoGDALDataset, GDALRasterBlock, GDALRasterBand and GDALDriver (#6100)
+
+## GDAL 2.1.0 - Overview of Changes
+
+Port:
+ * Add /vsicrypt/ virtual file system for reading/creating/update encrypted files on the fly, with random access capabilities
+ * Add /vsis3/ and /vsis3_streaming/ virtual file systems to read/write objects from AWS S3 buckets
+ * /vsizip/: avoid returning the previous file list of an already opened .zip if it has changed afterwards (#6005)
+ * /vsizip/: use CP437 on Windows when ICONV support is available (#6410)
+ * /vsimem/: implement append mode (#6049)
+ * /vsistdin/: fix caching of first 1MB / VRT driver: read XML content from /vsistdin/ in a streaming compatible way (#6061)
+ * /vsistdout/: flush when closing the handle (#6149)
+ * Add VSIReadDirEx() with a limit on the number of files before giving up and corresponding VSIFilesystemHandler::ReadDirEx() virtual function
+ * cpl_vsil_cache: rework to be able to work on very large files on 32bit systems
+ * Add CPLThreadLocaleC class to use thread-specific locale settings (when available)
+ * VSIWin32Handle::Flush(): add VSI_FLUSH config option that can be set to TRUE to force FlushFileBuffers(). (hack related to #5556)
+ * Fix VSIL append mode in Windows (#6065)
+ * Make CPLCreateMutexEx() support CPL_MUTEX_REGULAR; and fix CPL_MUTEX_ADAPTIVE to avoid continuing in code path for creation of recursive mutex
+ * Add CPLWorkerThreadPool API
+ * Add CPLGetThreadLocalConfigOption()
+ * Fix CPL_LSBINT16PTR() and CPL_LSBINT32PTR() to work with non-byte pointer (#6090)
+ * CPLRecodeStub(): add special case for CP437 -> UTF-8 when input is only printable ASCII
+ * CPLHTTPFetch(): add LOW_SPEED_TIME and LOW_SPEED_LIMIT options
+ * CPLGetValueType(): improve heuristics to avoid detecting some WKB strings as real numbers (#6128)
+ * Add CPL_SHA256* and CPL_HMAC_SHA256 functions
+ * Make CPLVirtualMemFileMapNew() work on all systems having mmap(), and thus GeoTIFF GTIFF_VIRTUAL_MEM_IO optimization too
+ * Add VSI_MALLOC_VERBOSE() and similar macros to output an error message in case of failed alloc
+ * CPLParseXMLString(): limit depth of elements to 10000
+ * Win32 file management: handle files whose total file path length is greater than 255 characters in Open() and Stat()
+ * Make CPLFormFilename(absolute_path, "..", NULL) truncate when possible
+ * Add VSIGetDiskFreeSpace()
+ * Implement CPLIsInf() for Solaris 11
+ * Add a CPL_FINAL macro that expands to C++11 final keyword when C++11 is enabled, and use it in a few places
+ * Avoid CPLEscapeString (CPLES_URL) encoding some characters unnecessarily (#5526)
+ * Add CPLTestBool(), CPLTestBoolean(), CPLFetchBool()
+ * Fix CPLGetValueType() to recognize D1 as a string and not a real number (#6305)
+ * CPLFormFilename(): use '/' directory separator on Windows on /vsicurl_streaming/ files (#6310)
+ * Add hack enabled by -DDEBUG_BOOL to detect implicit int->bool conversions that dislike MSVC (#6325)
+ * Add hack to '#define NULL nullptr' when NULL_AS_NULLPTR is defined. Must be used together with -std=c++11 -Wzero-as-null-pointer-constant with GCC to detect misuses of NULL/nullptr (#6327)
+ * Add VSIError mechanism to store errors related to filesystem calls, and use it for /vsis3/. Add new CPLE_ error numbers. (https://github.com/OSGeo/gdal/pull/98)
+ * Fix CPLsscanf() to be conformant regarding how space/tab/... separators are handled, so as to fix OGR GMT to be able to read coordinates separated by tabulations (#6453)
+
+Core:
+ * Change default value of GDAL_CACHEMAX to 5% of usable physical RAM
+ * Allow open options name to be prefixed by @ to be silently ignored when not existing in driver options (RFC 60)
+ * Honour NBITS metadata item when doing RasterIO() with non-nearest resampling (#6024)
+ * GDALClientServer: pass open options to INSTR_Open call
+ * Improve performance of GDALCopyWords() float->byte/int16/uint16 by using SSE2
+ * Decorate prototypes of RasterIO() related operations with CPL_WARN_UNUSED_RESULT
+ * Avoid deadlock when writing 2 datasets in 2 threads (#6163)
+ * Remove obsolete symbols __pure_virtual(), GDALCreateProjDef(), GDALReprojectToLongLat(), GDALReprojectFromLongLat() and GDALDestroyProjDef()
+ * Remove obsolete non-template-based implementation of GDALCopyWords(). We don't support anymore such compilers
+ * GDALJP2Box::ReadBoxData(): do not abort if memory allocation fails
+ * Add GDALAdjustValueToDataType() in C API, and use it in GDALTranslate() and GDALWarp()
+ * GDALDefaultOverviews::CreateMaskBand(): fix logic error related to writing per-band mask
+ * Block cache: fix excessive memory consumption when dealing with datasets with different block sizes (#6226)
+ * EXIFExtractMetadata(): fix potential 1-byte write buffer stack overflow
+ * MDReader: do no attempt reading side-car files on /vsisubfile/ (#6241)
+ * GDALCheckBandCount(): allow by default a maximum number of bands to 65536
+ * GDALOpenInfo: add StealSiblingFiles() and AreSiblingFilesLoaded() methods
+ * GDALOpenInfo::GetSiblingFiles(): give up after GDAL_READDIR_LIMIT_ON_OPEN (default=1000) files in the directory
+ * GDALDefaultOverviews: add TransferSiblingFiles() method
+ * GDALDriver::DefaultCreateCopy(): fix logic related to propagation of NBITS / PIXELTYPE metadata items as creation options
+ * Reorder driver registration a bit so that formats with efficient identification are probed first
+ * Add GDALIdentifyEnum (GDAL_IDENTIFY_UNKNOWN, GDAL_IDENTIFY_FALSE or GDAL_IDENTIFY_TRUE) for return values of Identify()
+ * GDALLoadRPCFile(): load .rpc files from Ikonos products that have extra end-of-line character (#6341)
+ * Export GDALRegenerateOverviewsMultiBand() symbol, but mostly for plugins (#6342)
+ * Add GDAL_NO_AUTOLOAD to compile out the body of AutoLoadDriver (#6380)
+ * Avoid ComputeStatistics(), GetHistogram() and ComputeRasterMinMax() to use only the first column of blocks in approximation mode for a raster whose shape of blocks is a square (#6378)
+ * Add GDALGetDataTypeSizeBits() and GDALGetDataTypeSizeBytes().
+ * GDALReadOziMapFile(): fix reading Ozi external files from virtual file systems (https://github.com/OSGeo/gdal/pull/114)
+ * Add CPLSetCurrentErrorHandlerCatchDebug() to enable custom error handlers not to intercept debug messages
+
+Algorithms:
+ * RPC transformer: provide SSE2 accelerated transformer
+ * RPC: fix off-by-half pixel computation of (pixel, line), and in bilinear and bicubic RPC DEM interpolation; fix off-by-one pixel registration for Pleiades RPC (#5993)
+ * RPC: make RPCInverseTransformPoint() check convergence has been reached (#6162)
+ * RPC DEM: optimize when DEM is in NAD83 or any other geodetic CS that transform as a no-op to WGS 84
+ * RPC DEM: take into account vertical datum of the DEM when present to convert DEM elevations to ellipsoidal heights (#6084)
+ * RPC DEM: do fallback cubic -> bilinear and bilinear -> near on DEM edges
+ * RPC DEM: improve inverse transformer to validate error threshold and improve convergence (#6162, #6377)
+ * RPC: fix issues with dateline (#6472)
+ * TPS solver: discard duplicated GCP to avoid avoidable error, warning when 2 GCPs have same (pixel,line) but different (X,Y) or the reverse
+ * Warper: rework multithreaded computations to use a thread pool rather than forking threads each time
+ * Warper: avoid really excessive processing time for some warping with target areas completely off the source raster (especially when involving RPC) (#6182)
+ * Warper: CreateKernelMask(): fix potential 32 bit integer overflow when using warp memory value > 2GB (#6448)
+ * gdal_grid: add linear interpolation algorithm
+ * gdal_grid: add invdistnn algorithm, variation on the existing inverse distance weighting algorithm with quadtree to search for points only in the neighborhood (#6038)
+ * gdal_grid: fix crash in optimized mode with GCC 4.4 on 64bit (#5987)
+ * gdal_grid: compile gdalgrid AVX optimization for Windows when supported by compiler
+ * Add GDALTriangulationXXXX() API through libqhull
+ * Sieve filter: fix crash on nodata polygons (#6096)
+ * Sieve filter: improvement to walk through the biggest neighbour chain until we find a polygon larger than the threshold (#6296)
+ * GDALFPolygonize(): factor implementation with integer case
+ * GDALComputeMedianCutPCT(): fix to make it work with rasters with more than 2 billion pixels (#6146)
+ * Overview: Make average and gauss methods aware of transparent color table entries (#6371)
+
+Utilities:
+ * gdalinfo: workaround bug in proj <= 4.9.1 on datasets with a SRS with a vertical shift grid (#6083)
+ * gdal_translate: detect more reliably if specified bands are not in default order
+ * gdal_translate: fix -a_nodata with negative values on rasters that have PIXELTYPE=SIGNEDBYTE; fix preserving PIXELTYPE=SIGNEDBYTE with VRT
+ * gdal_translate: fix random behavior when -scale is used without source bounds (#6455)
+ * gdal_rasterize: do on-the-fly reprojection of input vector onto output raster
+ * gdal_rasterize: rasterize: always create output with 1/2 cell buffer of input geometry envelope (#6058)
+ * gdal_rasterize: add the -dialect option
+ * gdal_rasterize: accept NaN as a valid value for -init / -burn (#6467)
+ * gdalwarp: add -doo option to specify open options of (existing) output dataset
+ * gdalwarp: if RPC_DEM warping option is specified, use exact transformer by default (#5993)
+ * gdalwarp: make it honour nodata value of existing dataset (if -dstNoData isn't explicitly specified)
+ * gdalwarp: do not propagate STATISTICS_ of second or following source datasets
+ * gdalwarp: do not emit warning when using -cutline with a SRS and the source raster has RPC or GEOLOCATION
+ * gdalwarp: check that the cutline is valid after transformation/reprojection
+ * gdalwarp: better deal when dealing with a mix of RGB and RGBA datasets as input
+ * gdalwarp: fix -srcnodata to not put garbage values as target dstnodata (#6315)
+ * gdalwarp: densify cutline to avoid invalid geometry after reprojection to source raster, especially in the RPC case (#6375)
+ * gdalserver: add a -nofork mode (Unix only for now), so that multiple clients can connect to the same dataset. Useful for safe 'concurrent' updates
+ * add gdal_pansharpen.py script
+ * gdal2tiles.py: fix error on a raster with less than 3 bands that resulted in a 'IndexError: list index out of range'
+ * gdal2tiles.py: Change EPSG:3785 / EPSG:900913 into EPSG:3857 (#5622)
+ * gdal2tiles.py: add Leaflet template (https://github.com/OSGeo/gdal/pull/71)
+ * gdal2tiles.py: add -q switch for quiet mode
+ * gdaldem: correctly deal with NaN as nodata value (#6066)
+ * gdaldem color-relief: deal with the case of repeated entries with the same value and the input raster has pixels that match that value exactly (#6422)
+ * gdaladdo: emit error message if passed an invalid dataset name (#6240)
+ * gdaladdo: do not silence warnings when opening in update mode, if the open is successful
+ * gdalbuildvrt: fix potential crash when using -b switch (#6095)
+ * gdalbuildvrt: accept nan as value for -srcnodata and -vrtnodata
+ * gdalbuildvrt: return non zero return code if the flush of the VRT to disk failed
+ * gdal_merge.py: takes again into account -n flag (#6067)
+ * gdalbuildvrt / gdal_translate / VRT: use floating point values for source and destination offsets and sizes (#6127)
+ * gdalmove.py: fix to run with GDAL 2.0 gdal.InvGeoTransform() signature
+ * gdal_calc.py: Add * from gdalnumeric to gdal_calc.py eval namespace again, to fix 2.0 regression that made for example 'log10(A)' to no longer work (https://github.com/OSGeo/gdal/pull/121)
+
+Python samples:
+ * gdalpythonserver.py: update to protocol 3
+
+AAIGRID:
+ * when writing with floating-point values, ensure at least one value has a decimal point to avoid issues with some readers (#6060)
+
+BMP driver:
+ * BMP: avoid too big color table allocation in case of wrong iClrUsed value
+
+BLX driver:
+ * converted to support VirtualIO
+
+ECRG driver:
+ * change subdataset definition to make sure that they only consist of frames of same scale (#6043)
+ * fix base34 decoding and Windows filename handling (#6271)
+
+ECW driver:
+ * use wide char Open API on Windows when GDAL_FILENAME_IS_UTF8=YES (https://github.com/OSGeo/gdal/pull/70)
+ * fix reading of ECW in /vsi file systems (with SDK >= 4) (#6482)
+
+GeoRaster driver:
+ * fix deflate read error depending on endianness (#6252)
+
+GIF driver:
+ * libgif: partial resync with giflib master (but keep ABI of 4.1.6)
+ * fix crash when CreateCopy a source with one color in the color table
+
+GMT driver:
+ * validate raster dimensions on opening, and acquire mutex in dataset destructor
+
+GPKG driver:
+ * write support: fix various issues in update scenarios when interacting with the GDAL block cache that could result in lost/corrupted band data to be written in tiles (#6309)
+ * write support: fix potential use of freed sqlite temporary DB handle when generating overviews with partial tiles (#6335)
+ * write support: fix potential crash in scenarios when block cache is full (#6365)
+ * write support: fix inversion of row/column in one of the SQL request involved in partial tiles management (#6339)
+ * fix generation of files with 1-band paletted input dataset. Also improve the logic to retrieve color palette when forcing BAND_COUNT=1 on opening (#6450)
+
+GTiff driver:
+ * add NUM_THREADS creation and open options to enable multi-threaded compression
+ * fix GTiffDataset::IsBlockAvailable() wrong behavior when compiling against internal libtiff, when a BigTIFF file has a TileByteCounts with LONG/4-byte counts and not LONG8 (#6001)
+ * Correctly take into account overridden linear units for a geotiff with a EPSG PCS code (#6210, #4954)
+ * make VirtualMemIO() work with non native endianness
+ * improve VirtualMemIO() performance in tiled Contig read to single band copy
+ * improve single band tiled VirtualMemIO reading
+ * improve DirectIO() to work on tiled uncompressed geotiff, for non-resampling and nearest resampling cases. Also improve performance of resampling cases on un-tiled files
+ * fix DirectIO() mode with complex types and inverted endianness (#6198)
+ * optimize writing of 12-bit values
+ * implement lazy loading of .aux.xml and .tfw/.wld
+ * Internal libtiff: update to CVS HEAD post libtiff 4.0.6
+ * make SetColorInterpretation(GCI_AlphaBand) work on a 5 band or more GeoTIFF (#6102)
+ * automatically set PHOTOMETRIC=RGB if manually assigning color interpretation Red,Green,Blue to band 1,2,3 before directory crystallization (#6272)
+ * add GEOTIFF_KEYS_FLAVOR=ESRI_PE creation option to write EPSG:3857 in a ESRI compatible way (#5924)
+ * call XTIFFInitialize() in LibgeotiffOneTimeInit() as the former isn't thread-safe, so better call it from the later which is thread-safe (#6163)
+ * fix reading and writing angular units different from degree (namely arc-second, arc-minute, grad, gon and radian) (#6171)
+ * do not use VirtualMemIO optimization on compressed /vsimem/ files (#6195)
+ * correctly set GTRasterTypeGeoKey=RasterPixelIsPoint if AREA_OR_POINT=Point but there is no SRS set (#6225)
+ * improve a bit error detection when writing
+ * check free space before writing (only for big, non sparse, uncompressed)
+ * do not read large 'one row' JBIG compressed files with the scanline API (#6264)
+ * Fix SetMetadata() to properly clear existing PAM metadata (complement to #5807)
+ * prevent potential out of bounds read/write to TIFFTAG_EXTRASAMPLES (#6282)
+ * do not use first directory as potential mask, to avoid assertion in GTiffDataset::SetDirectory() (#6287)
+ * reject files with strips/tiles/scanlines bigger than 2 GB to avoid 32 bit integer overflow.
+   Also in case of files with Contig PlanarConfiguration do not make reading one block for band 2 OK when reading for band 1 issued an error (#6288)
+ * GTIFFWriteDirectory(): avoid memory leak of codec related memory (#2055)
+ * Make ALPHA=NO in CreateCopy() cancel alpha color interpretation even if present in source raster
+ * fix problem with implicit overviews of JPEG-compressed files (#6308)
+ * fix compilation problem with internal libtiff if DEFER_STRILE_LOAD isn't defined (which is not the default configuration) (https://github.com/OSGeo/gdal/pull/90)
+ * use more appropriate error message when 4GB threshold is reached with external overviews, and try to make doc of BIGTIFF=IF_NEEDED/IF_SAFER clearer (#6353)
+
+HDF4 driver:
+ * Skip quotation mark when parsing HDF-EOS metadata.
+
+HDF5 driver:
+ * add Komsat Mission ID to possible value for HDF5 SAR product (https://github.com/OSGeo/gdal/pull/103)
+
+HF2 driver:
+ * fix reading side of the driver to work on architectures where char is unsigned, like PPC or ARM (#6082)
+
+HFA driver:
+ * when reading projection, preserve EPSG code if AutoIdentifyEPSG() identified the SRS, even if a PE string is present (#6079)
+ * keep TOWGS84 even when using ESRI PE string (#6158)
+ * fix crashes on corrupted files (#6208, #6286)
+
+INGR driver:
+ * check that RLE decoding produced the expected number of bytes and error out otherwise; test that 'random' line seeking actually works
+
+JPEGLS driver:
+ * fix build error (#6430)
+
+JP2ECW driver:
+ * honour psExtraArg->eResampleAlg when upsampling (#6022)
+
+JP2KAK driver:
+ * honour psExtraArg->eResampleAlg when upsampling (#6022)
+ * try rounded dimensions to decide if the data is being requested exactly at a sub-resolution
+ * support v7.7 on Unix (additional changes potentially needed on Windows)
+
+JP2OpenJPEG driver:
+ * Safer multi-threaded use
+
+JPEG driver:
+ * add USE_INTERNAL_OVERVIEWS open option (default to TRUE as in recent versions, can be set to FALSE to hide internal overviews
+
+KMLSuperOverlay driver:
+ * fix 2.0 regression with some RasterIO() requests involving resampling (#6311)
+ * recognize datasets that have a intermediate <Folder> that forms a <Document><Folder><Region/><GroundOverlay/> structure (#6343)
+
+LCP driver:
+ * fix wrong use of endianness macros to fix behavior on big-endian hots
+
+Leveller driver:
+ * update to v9 read support (#5632,)
+
+MBTiles driver:
+ * add raster write support
+ * fix so that datasets whose lowest min zoom level is 16 or above are recognized
+ * be robust to invalid 'bounds' at dataset opening (#6458)
+
+MEM driver:
+ * avoid 32 bit overflows
+
+NetCDF driver:
+ * add support for reading NC4 unsigned short attributes and variables (#6337) * read correctly nodata values in [128,255] range for (unsigned) Byte data type (#6175)
+ * implement Get/SetUnitType() using the standard units attribute (https://github.com/OSGeo/gdal/pull/96)
+ * optimize IReadBlock() and CheckData() handling of partial blocks in the x axis by re-using the GDAL block buffer instead of allocating a new temporary buffer for each block (#5950)
+ * full read/write support for new NetCDF4 types NC_UBYTE, NC_USHORT, NC_UINT and NC_STRING for variables (except for NC_STRING) and attributes (https://github.com/OSGeo/gdal/pull/99)
+ * add support for the geostationary projection (#6030)
+ * fix one byte heap write overflow in NCDFTokenizeArray() (#6231)
+ * fix potential buffer overflows with uses of nc_inq_varname(), nc_inq_attname() and nc_get_att_text() (#6227)
+ * validate that gridmapping:GeoTransform has 6 values (#6244)
+ * fix wrong use of deallocator when writing a GEOLOCATION array, and other issues
+ * limit number of bands reported to 32768 by default
+ * validate raster dimensions
+ * validate content of NC_GLOBAL#GDAL variable (#6245)
+
+NGSGEOID driver:
+ * make it work on > 2GB file
+
+NITF driver:
+ * data/nitf_spec.xml: Add CSCCGA, MENSRB, SENSRB, STREOB, ENGRDA, EXPLTB and PATCHB TREs (https://github.com/OSGeo/gdal/pull/81, #6285, https://github.com/OSGeo/gdal/pull/86)
+ * fix parser to properly deal with variable length items not in first nesting level
+
+Northwoord driver:
+ * fix computation of intermediate color table values on non-Intel platforms (#6091)
+
+NTv2 driver:
+ * support reading/writing/appending to files with big-endian order (cf https://github.com/OSGeo/proj.4/issues/345)
+
+OpenJPEG driver:
+ * do not expose block dimensions larger than dataset dimensions to avoid wasting memory (#6233)
+
+PCIDSK driver:
+ * Remove the old driver (#6172)
+
+PDF driver:
+ * add PDFium library as a possible back-end. Initial support contributed by Klokan Technologies GmbH  (http://www.maptiler.com/)
+ * workaround a bug of PoDoFo 0.9.0 by avoiding loading of vector content in raster-only mode (doesn't prevent the crash if reading the vector layers) (#6069)
+ * make OGC BP registration work with media box where bottom_y is negative and top_y = 0 (in non rotated case)
+ * make OGC BP registration work with media box where min_x != 0 (in non-rotated case)
+ * correctly take into account non-meter linear units with OGC BP encoding, and add support for US FOOT (#6292)
+
+PDS driver:
+ * change default values of PDS_SampleProjOffset_Shift and PDS_LineProjOffset_Shift to 0.5 (#5941)
+ * fix nodata value for UInt16 to be 0 (#6064)
+ * accept 'ODL_VERSION_ID = ODL3' in header (#6279)
+
+PGChip driver:
+ * driver removed from sources
+
+PLScenes driver:
+ * PLScenes V0: avoid opening raster to generate dummy .aux.xml
+
+PNG driver:
+ * Support writing 1, 2 or 4 bit single band
+ * Add NBITS creation option
+ * fix XML of creation option list
+ * Update internal libpng to 1.2.56
+
+PostgisRaster driver:
+ * avoid Identify() to recognize OGR PostgreSQL connection strings with schemas option and cause loud 'QuietDelete' (#6034)
+
+Raw drivers:
+ * better support for direct read of more than 2GB in single gulp (untested though)
+
+RIK driver:
+ * fix Identify() method to recognize again non-RIK3 RIK datasets (#6078)
+
+RMF driver:
+ * implement GetNoDataValue()
+ * add read/write access to new RMF format for files larger than 4 Gb (version=0x201) (https://github.com/OSGeo/gdal/pull/11)
+
+ROIPAC driver:
+ * Support offset and scale band (#6189)
+
+VICAR driver:
+ * change PDS_SampleProjOffset_Shift and PDS_LineProjOffset_Shift default values to 0.5 (#5941)
+ * fix loss of precision in scale and offset
+
+VRT driver:
+ * expose implicit 'virtual' overviews for VRT whose bands are made of a single SimpleSource/ComplexSource
+ * gdalvrt.xsd: Add capitalized versions of true and false (#6014)
+ * GetSingleSimpleSource(): check there's a single source (#6025)
+ * honour VRTRasterBand NBITS metadata with SimpleSource and ComplexSource
+ * properly take into account nodata value declared at VRT band level when doing resampling with non-nearest
+ * honour relativeToVRT when using AddBand() to add a VRTRawRasterBand (https://github.com/OSGeo/gdal/pull/67)
+ * VRT warp: fix crash with implicit overviews and destination alpha band (#6081)
+ * make GetDefaultHistogram() on a sourced raster band save the result in the VRT (#6088)
+ * serialize NODATA and NoDataValue items with %.16g, e.g. so as to be able to hold large int32 nodata values (#6151)
+ * VRTSourcedRasterBand: make ComputeRasterMinMax() and ComputeStatistics() forward bApproxOK to overview band (useful for implicit overviews)
+ * make CreateCopy() preserve NBITS metadata item
+ * avoid loading sibling file list if not available
+ * VRT raw: don't truncate last figure of ImageOffset if there are left space padding (#6290)
+ * VRTWarpedDataset::SetMetadataItem(): fix crash when calling with name=SrcOvrLevel and value=NULL (#6397)
+ * Warped VRT: fix deadlock in situation where warped VRT datasets are read in multiple threads and the block cache reaches saturation. Also add a GDAL_ENABLE_READ_WRITE_MUTEX config option that can be set to NO to disable the read/write mutex mechanism in cases where it would deadlock (#6400)
+
+WMS driver:
+ * add a IIP (Internet Imaging Protocol) minidriver
+ * limit number of zoom levels for ArcGIS MapServer JSon (#6186)
+ * determine a resolution that will not result in a number that is larger than the maximum size of an integer.  Any value that exceeds the maximum size of an integer will raise an invalid dataset dimensions error. (https://github.com/OSGeo/gdal/pull/89)
+
+XYZ driver:
+ * be more robust to not exactly equal X and Y spacing (#6461)
+
+## OGR 2.1.0 - Overview of Changes
+
+Core:
+ * Add OGREditableLayer class to add editing capabilities to drivers with none or limited editing capabilities
+ * OGRGeometry: add DelaunayTriangulation() method (GEOS >= 3.4)
+ * OGRGeometry and derived classes: implement copy constructor and assignment operator (#5990)
+ * OGRGeometry: Fix result of Equals on POINT EMPTY with POINT(0 0)
+ * OGRFeature SetField(): more type conversions allowed, particularly with array types
+ * OGRFeature::SetGeometry()/SetGeometryDirectly(): make it work when passed geometry is the currently installed geometry (#6312)
+ * OGR SQL: do not silently skip NULL values in the first records when evaluating a SELECT DISTINCT (#6020)
+ * OGR SQL: correctly sort NULL values in first positions (#6155)
+ * OGR SQL: fix CAST(x AS bigint) to return an evaluated int64 node, and not int32 (#6479)
+ * OGR SQL: handle 'fid' as Integer64 in where clause, and allow CAST(fid AS bigint) in selected columns (#6484)
+ * Add OGRUpdateFieldType()
+ * Decorate a few functions/methods of the OGR layer API with CPL_WARN_UNUSED_RESULT
+ * WKT export: use 15 significant figures, instead of 15 figures after decimal point (#6145)
+ * WKT export: do not append .0 after non-finite values (#6319)
+ * Fix typo in definition of name of OGR_FD_ReorderFieldDefns (final s was missing)
+ * OGRLayer::SetIgnoredFields(): properly reset state of non first geometry fields (#6283)
+ * Make OGRLayer::SetSpatialFilter(GetSpatialFilter()) work with non empty spatial filter (#6284)
+ * OGRLayerDecorator: add missing CreateGeomField()
+ * OGRLayer::Erase(): do not discard input geometries that have no intersection with method layer (#6322)
+ * OGRLayer::Erase(): Speedup = ~70%
+ * Add OGRPreparedGeometryContains()
+ * Use prepared geometry intersects as pretest in layer Intersection, Union, and Identity methods if requested.
+   Use prepared geometry containment as pretest in layer Intersection method if requested.
+ * Bail out from layer algebra methods if GEOS calls fail and not SKIP_FAILURES.
+ * OGR_G_SetPoints(): error out if padfX or padfY == NULL, do not change coordinate dimension to 3D when pabyZ == NULL, fix optimization on linestring to call setPoints() only if the strides are the ones of a double, not 0 as incorrectly done before (#6344)
+ * OGRParseDate(): more strict validation to reject invalid dates (#6452)
+
+OGRSpatialReference:
+ * Upgrade to EPSG database v8.8
+ * Add support for SCH (Spherical Cross-track Height) projection
+ * Optimize reprojection typically between WGS84 based SRS and WebMercator
+ * Correctly transform Mercator_2SP and _1SP to ESRI Mercator, and back from ESRI Mercator to Mercator_2SP (#4861)
+ * No longer enforce C locale if running against latest proj that is locale safe (4.9.2 or later)
+ * EPSGGetPCSInfo(): use pcs.override.csv in priority over pcs.csv to read projection name, UOM, UOMAngle, GeogCS, etc... (#6026)
+ * morphToESRI(): use GCS_WGS_1972 as GCS name for EPSG:4322 (#6027)
+ * morphToESRI(): use Mercator_Auxiliary_Sphere projection for EPSG:3857. morphFromESRI(): map Mercator_Auxiliary_Sphere to EPSG:3857 (#5924)
+ * Align hard-coded WKT of well known GCS definitions of WGS84, WGS72, NAD27 and NAD83 with the WKT of their EPSG def (#6080)
+ * morphFromESRI(): special case with PROJCS name 'WGS_84_Pseudo_Mercator' (#6134)
+ * OSR C API: fix declarations of OSRSetAxes() and OSRSetWagner(), and add missing OSRSetHOMAC(), OSRSetMercator2SP() and OSRSetTPED() (#6183)
+ * Recognize EPSG 9835 method (Lambert Cylindrical Equal Area (Ellipsoidal)), needed for EPSG:6933 PCS for example
+ * importFromProj4/exportToProj4(): rework linear unit conversion between WKT name/values and proj4 unit name, and extend its scope in WKT to proj4 conversions
+ * OSR ESRI .prj: add support for reading custom ellipsoid in Parameters line
+ * on import of +proj=geos, if +sweep=x is used then store it as a proj4 extension node (#6030)
+
+Utilities:
+ * ogrinfo / ogr2ogr: implement @filename syntax for -sql and -where
+ * ogr2ogr: prevent the -gt setting from overriding transaction group size of 1 set by skipfailures earlier (#2409)
+ * ogr2ogr: warn if -zfield field does not exist in source layer
+ * ogr2ogr -skip: rollback dataset transaction in case of failure (#6328)
+ * ogr2ogr: fix -append with a source dataset with a mix of existing and non existing layers in the target datasource (#6345)
+ * ogr2ogr: imply quiet mode if /vsistdout/ is used as destination filename
+ * ogr2ogr: make -dim and -nlt support measure geometry types
+
+CartoDB:
+ * fix GetNextFeature() on a newly create table (#6109)
+ * defer 'CartoDBfycation' at layer closing
+ * optimize feature insertion with multiple rows INSERT
+
+CSV driver:
+ * add editing capabilities of existing files
+ * add X_POSSIBLE_NAMES, Y_POSSIBLE_NAMES, Z_POSSIBLE_NAMES, GEOM_POSSIBLE_NAMES and KEEP_GEOM_COLUMNS open options
+ * add HEADERS open option to force OGR to handle numeric column names. (PR #63)
+ * add EMPTY_STRING_AS_NULL=YES/NO open option
+ * implement compatibility enhancements for GeoCSV specification (#5989)
+ * fix detection of TAB delimiter in allCountries.csv when the first line has a comma (#6086)
+ * fix issues with leading single quote, and missing first line after ResetReading(), when parsing allCountries.txt (#6087)
+ * speed-up GetFeatureCount() on allCountries.txt
+ * on CreateDataSource() with a .csv name, do not try to open other existing .csv files in the directory
+ * make CreateGeomField() returns OGRERR_NONE in case of success instead of OGRERR_FAILURE (#6280)
+ * avoid adding trailing comma in header line when writing 'WKT,a_single_field'
+
+DGN driver:
+ * add partial 3D transformation support for cell headers
+
+DXF driver:
+ * detect files without .dxf extension (#5994)
+ * fix handling of ELLIPSE with Z extrusion axis = -1 (#5705)
+ * take into account full definition of spline entity (degree, control points, weights and knots) when stroking splines (#6436)
+ * better handling of various object coordinate systems found in dxf files for point, line, polyline, spline and ellipse entities. Add anchor position to text styles. Remove polygon/polyface mesh parsing from polyline entity (#6459)
+
+ElasticSearch driver:
+ * use get /_stats instead of /_status for ElasticSearch 2.0 compatibility (#6346)
+
+FileGDB driver:
+ * make CreateFeature() honour user set FID, and implement more fine grained transaction for Linux/Unix
+ * give a hint of using FileGDB SDK 1.4 is FileGDB compression is used
+
+GeoJSON driver:
+ * Add editing capabilities of existing files
+ * Add ARRAY_AS_STRING=YES open option
+ * Use '%.17g' formatting by default for floating-point numbers and add SIGNIFICANT_FIGURES layer creation option (#6291)
+ * add a json_ex_get_object_by_path() function
+ * fix crash on null / non-json object features (#6166)
+ * serialize string values that are valid JSon dictionary or array as it (ie do not quote them)
+ * make sure there's enough space to write the FeatureCollection bbox (#6262). Also avoid duplicating FeatureCollection bbox if source has one (trunk only)
+ * Export POINT EMPTY as having a null geometry, instead as of being POINT(0 0) (#6349)
+ * Do not 'promote' a null field to OFTString type if it had another type before (#6351)
+
+GME driver:
+ * Driver removed.  Maps Engine being shut down at the end of January 2016.
+
+GML driver:
+ * VFR: add new attribute DatumVzniku (v1.6)
+ * VFR: fix ST_UVOH type handling
+ * VFR: fix ZpusobyOchrany attributes (data types and names)
+ * VFR: fix CisloDomovni attributes (Integer->IntegerList)
+ * VFR: fix TEA attributes of StavebniObjekty
+ * add NAMESPACE_DECL=YES option to OGR_G_ExportToGMLEx() to add xmlns:gml=http://www.opengis.net/gml or http://www.opengis.net/gml/3.2 declaration; Also accept GML2 or GML32 as valid valiues for FORMAT option (#6214)
+ * serialize in .gfs file the name of the geometry element when it is 'geometry' since this is a particular case (#6247)
+ * fix logic error in BuildJointClassFromScannedSchema() (#6302)
+
+GPKG driver:
+ * make it accept files with non standard extension if they still have the correct application_id (#6396); also accept the .gpkx extension that may be used for extended geopackages
+ * emit warning when generating a database without .gpkg/.gpkx extension (#6396)
+ * as GPKG 1.1 uses a different application_id, emit a more specific warning if the application id starts with GPxx (but is not GP10). Add GPKG_WARN_UNRECOGNIZED_APPLICATION_ID config option to avoid the warning
+ * correct scope of gpkg_geom_XXXXX extensions to be read-write, and allow reading geometry types CURVE or SURFACE
+ * avoid trying to insert a gpkg_geom_XXXX extension if already done (#6402)
+ * writer: implement strategy to flush partial_tiles temporary database when it becomes too big (#6462)
+ * writer: when writing to GoogleMapsCompatible tiling scheme, better deal with source rasters in EPSG:4326 with latitude = +/-90 (#6463)
+ * fix generation of files with 1-band paletted input dataset. Also improve the logic to retrieve color palette when forcing BAND_COUNT=1 on opening (#6450)
+
+GPX driver:
+ * fix crash when parsing a 'time' extension element at route/track level (2.0 regression, #6237)
+
+ILI driver:
+ * ILI1: Support for Surface polygon rings spread over multiple geometry records
+ * ILI1: add string TID support (https://github.com/OSGeo/gdal/pull/91)
+ * Fix crash with models using types derived from INTERLIS
+ * Fix memory leaks (#6178)
+
+JML driver:
+ * remove arbitrary limitation preventing from reading geometries with <gml:coordinates> larger than 10 MB (#6338)
+
+KML driver:
+ * fix crash on KML files without content but with nested folders (#6486)
+
+LIBKML driver:
+ * for documents without folder, use document name when available as name of layer (#6409)
+
+Memory driver:
+ * add support for sparse feature IDs
+ * add ADVERTIZE_UTF8 layer creation option
+
+MITAB driver:
+ * Add support for block sizes other than 512 bytes in .map files, for MapInfo 15.2 compatibility (#6298)
+ * write correct datum id for EPSG:3857
+ * read MID files with TAB delimiter and empty first field (#5405)
+ * use projection code 29 when exporting non-Polar Lambert Azimuthal Equal Area (#5220)
+ * fix crashes when parsing invalid MIF geometries (#6273)
+
+MSSQLSpatial driver:
+ * Implement MSSQL bulk insert (#4792)
+ * do not treat a primary key that is not of integer type as the FID (#6235)
+
+NTF driver:
+ * fix potential buffer overflows when reading too short lines (#6277)
+
+ODBC driver:
+ * remove limitations to 500 columns
+
+ODS driver:
+ * fix loss of precision in formula computation
+
+OpenFileGDB driver:
+ * do not emit warning if SDC/CDF table detected and that FileGDB driver is present
+ * fix min/max on columns without indices (#6150)
+ * build correct geometry for a multi-part wkbMultiLineStringZ (#6332)
+ * add support for reading SHPT_GENERALPOINT (#6478)
+
+OSM driver:
+ * correct fields ids for the (non frequently used) Node message
+ * do not override 'our' osm_id (the node, way or relation id) with a tag named 'osm_id' (#6347)
+ * properly deal with polygons in other_relations geometrycollection (#6475)
+
+PG driver:
+ * Add PRELUDE_STATEMENTS and CLOSING_STATEMENTS open option to be for example able to specify options, like statement_timeout, with pg_bouncer
+ * Fix 2.0 regression when overwriting several existing PostGIS layers with ogr2ogr (#6018)
+ * Update PG, PGDump and CartoDB drivers to correctly export POINT EMPTY for PostGIS 2.2
+ * avoid resetting error potentially emitted by ExecuteSQL() (#6194)
+ * sanitize management of quoting for FID column at layer creation
+ * fix to get SRID on result layer with PostGIS 2.2
+ * in copy mode (the default on layer creation), do not truncate the concatenated string list to the field width (#6356)
+ * make such that GEOMETRY_NAME layer creation option is honoured in ogr2ogr when the source geometry field has a not-null constraint (#6366)
+ * read and set DESCRIPTION metadata item from/into pg_description system table; add DESCRIPTION layer creation option
+ * support int2[] and numeric[] types, better map float4[] type
+ * remove code that was intended to handled binary cursors as it cannot be triggered
+ * fix append of several layers in PG_USE_COPY mode and within transaction (ogr2ogr -append use case) (#6411)
+
+PGDump driver:
+ * fix issue with case of ogc_fid field in case the FID  layer creation option is not set by user or by ogr2ogr (related to #6232)
+ * in copy mode (the default on layer creation), do not truncate the concatenated string list to the field width (#6356)
+ * make such that GEOMETRY_NAME layer creation option is honoured in ogr2ogr when the source geometry field has a not-null constraint (#6366)
+ * set DESCRIPTION metadata item from/into pg_description system table; add DESCRIPTION layer creation option
+
+Shapefile driver:
+ * accept opening standalone .dbf files whose header length is not a multiple of 32 bytes (#6035)
+ * fix REPACK crash on shapefile without .dbf (#6274)
+ * add capability to restore/build a missing .shx file when defining SHAPE_RESTORE_SHX to TRUE (#5035)
+ * avoid CreateLayer() to error out when passed wkbUnknown | wkb25D (#6473)
+
+SQLite/Spatialite driver:
+ * support file:xxx URI syntax (derived from patch by joker99, #6150)
+ * fix heuristics in OGRSQLiteSelectLayer::GetExtent() to not be used when there's a sub SELECT (#6062)
+ * fix crash on GetLayerByName('non_existing_table(geom_column)') (#6103)
+ * fix OGRSQLiteSelectLayerCommonBehaviour::GetBaseLayer() to no longer 'eat' consecutive characters in layer name (#6107)
+ * Spatialite: turn debug messages warning about update not being supported because of missing or too old spatialite version as errors, and return NULL to the caller (#6199)
+ * fix memleak in OGRSQLiteTableLayer destructor when updating geometry_columns_time
+ * VFS: increase mxPathname to 2048 by default, and provide OGR_SQLITE_VFS_MAXPATHNAME config option to be able to configure that higher if that would be needed. Useful when dealing with very long names like /vsicurl/.... with AWS S3 security tokens
+ * VFS: do not probe -wal files on /vsicurl/
+
+SXF driver:
+ * fix wrong use of endianness macros to fix behavior on big-endian hots
+ * add recoding from CP1251 for TEXT attribute that is now decoded
+ * fix various issues (#6357)
+
+VRT driver:
+ * implement CloseDependentDatasets()
+ * fix editing with 'direct' geometry mode which could cause attribute column to be empty (#6289)
+ * fix crash with a OGRVRTWarpedLayer using a source layer that would have non geometry column (unlikely to happen currently as this would require explicit disabling it, but more likey with following commit that createe VRT non-spatial layer implicitly when the source is non-spatial, linked to #6336)
+ * avoid creating an implicit wkbUnknown geometry field when the source has no geometry column and there's no XML elements related to geometry fields (#6336)
+
+XLSX driver:
+ * fix reading sheets with more than > 26 columns and 'holes' (#6363)
+
+XPlane driver:
+ * extend ICAO identifiers to 5 digits (#6003)
+
+## SWIG Language Bindings
+
+All bindings:
+ * add a options parameter to gdal.ReprojectImage() to pass warp options
+ * Change ReadRaster and WriteRaster to use GIntBig and the *IOEx-methods
+ * prevent NULL file pointer from being passed to VSIF*L functions
+ * make gdal.Rename() accept Unicode strings
+ * add SpatialReference.GetAxisName() and SpatialReference.GetAxisOrientation() (#6441)
+ * add SpatialReference.GetAngularUnitsName() (#6445)
+
+Java bindings:
+ * Fix typemap for input parameter of type GIntBig (fixes GetFeature(long), DeleteFeature(long), etc...) (#6464)
+ * Bump minimal java version to 1.5 in case SWIG generates anotations (#6433, patch by Bas Couwenberg)
+ * GNUmakefile: add -f in rm commands
+ * GNUmakefile: add support for all hardening buildflags
+
+Perl bindings:
+ * Fix #6050: string formatting in croak.
+ * Perl Makefile.PL: add support for all hardening buildflags (#5998)
+ * use strict and warnings in overridden constructors.
+ * add $VERSION to ogr_perl.i (OGR.pm), which is required by pause.perl.org.
+ * Add some basic module info for CPAN.
+ * Bugfix for Geo::OGR::Feature->new().
+ * Add many utility level algorithms as methods to various classes.
+ * New class for XML stuff
+ * New Makefile.PL, which can download and build GDAL. This allows automatic testing of the CPAN module.
+ * Wrap VSIStdoutSetRedirection and allow creating datasets via an object, which can write and close.
+ * Geo::OGR::Driver and Geo::OGR::DataSource are now Perl wrappers for respective GDAL classes.
+ * Add to the error stack also errors from the bindings
+ * Fix sending utf8 from Perl to GDAL. Should also remove some "uninitialized value" warnings.
+ * ReadTile and WriteTile methods for Dataset, ReadTile accepts now tile size and scaling algorithm.
+ * Improved Parent - Child management.
+ * Improved support for 64bit ints.
+ * Measures support in Geometry class.
+ * Many new tests
+
+Python bindings:
+ * make Feature.ExportToJson() output boolean value for a boolean field
+ * support floating point coordinates for the source windows of Band.ReadRaster() and Band.ReadAsArray()
+ * fix build with SWIG 3.0.6 (#6045)
+ * make gdal.OpenEx() throw a Python exception in case of failed open when exceptions are enables with gdal.UseExceptions() (#6075)
+ * Disable opening a NumPy dataset with a filename returned by gdal_array.GetArrayFilename(() unless GDAL_ARRAY_OPEN_BY_FILENAME is set to TRUE
+ * disable the warning about using deprecated wkb25DBit constant as it uses a trick that prevents the bindings from being used by py2exe / pyinstaller (#6364)
+
+# GDAL/OGR 2.0 Release Notes
+
+## In a nutshell...
+
+ * New GDAL drivers:
+    - BPG: read-only driver for Better Portable Graphics format (experimental, no build support)
+    - GPKG: read/write/update capabilities in the unified raster/vector driver
+    - KEA: read/write driver for KEA format
+    - PLMosaic: read-only driver for Planet Labs Mosaics API
+    - ROI_PAC: read/write driver for image formats of JPL's ROI_PAC project (#5776)
+    - VICAR: read-only driver for VICAR format
+ * New OGR drivers:
+    - Cloudant: read/write driver for Cloudant service
+    - CSW: read-only driver for OGC CSW (Catalog Service for the Web) protocol
+    - JML: read/write driver for OpenJUMP .jml format
+    - PLScenes: read-only driver for Planet Labs Scenes API
+    - Selaphin: read/write driver for the Selaphin/Seraphin format (#5442)
+ * Significantly improved drivers: CSV, GPKG, GTiff, JP2OpenJPEG, MapInfo file, PG, SQLite
+ * RFC 31: OGR 64bit Integer Fields and FIDs (trac.osgeo.org/gdal/wiki/rfc31_ogr_64)
+   In OGR core, OGR SQL, Shapefile, PG, PGDump, GeoJSON, CSV, GPKG, SQLite, MySQL,
+   OCI, MEM, VRT, JML, GML, WFS, CartoDB, XLSX, ODS, MSSQLSpatial, OSM, LIBKML, MITAB
+ * RFC 46: GDAL/OGR unification ( http://trac.osgeo.org/gdal/wiki/rfc46_gdal_ogr_unification)
+     - GDAL and OGR PDF drivers are unified into a single one
+     - GDAL and OGR PCIDSK drivers are unified into a single one
+ * RFC 49: Add support for curve geometries (http://trac.osgeo.org/gdal/wiki/rfc49_curve_geometries)
+   In OGR core, and GML, NAS, PostgreSQL, PGDUMP, GPKG, SQLite, VFK, VRT, Interlis drivers
+ * RFC 50: Add support for OGR field subtypes (http://trac.osgeo.org/gdal/wiki/rfc50_ogr_field_subtype)
+   In OGR core, OGR SQL, swig bindings, CSV, FileGDB, GeoJSON, GML, GPKG, OpenFileGDB, PG, PGDump, SQLite, VRT
+ * RFC 51: RasterIO() improvements : resampling and progress callback (http://trac.osgeo.org/gdal/wiki/rfc51_rasterio_resampling_progress)
+ * RFC 52: Stricter SQL quoting (http://trac.osgeo.org/gdal/wiki/rfc52_strict_sql_quoting)
+ * RFC 53: OGR not-null constraints and default values (http://trac.osgeo.org/gdal/wiki/rfc53_ogr_notnull_default)
+   In OGR core, OGR SQL, PG, PGDump, CartoDB, GPKG, SQLite, MySQL, OCI, VRT, GML, WFS, FileGDB, OpenFileGDB and MSSQLSpatial
+ * RFC 54: Dataset transactions (https://trac.osgeo.org/gdal/wiki/rfc54_dataset_transactions)
+   In PG, GPKG, SQLite, FileGDB and MSSQLSpatial
+ * RFC 55: refined SetFeature() and DeleteFeature() semantics.
+   In GPKG, Shape, MySQL, OCI, SQLite, FileGDB, PG, CartoDB, MITAB and MSSQL
+ * RFC 56: OFTTime/OFTDateTime millisecond accuracy ( https://trac.osgeo.org/gdal/wiki/rfc56_millisecond_precision )
+ * RFC 57: 64bit histogram bucket count ( https://trac.osgeo.org/gdal/wiki/rfc57_histogram_64bit_count )
+ * Upgrade to EPSG v8.5 database
+ * Fix locale related issues when formatting or reading floating point numbers (#5731)
+
+## New installed files
+ * data/gdalvrt.xsd: XML schema of the GDAL VRT format
+
+## Backward compatibility issues
+
+See MIGRATION_GUIDE.TXT
+
+## GDAL/OGR 2.0 - General Changes
+
+Build(Unix):
+ * Fix for cpl_recode_iconv.cpp compilation error on freebsd 10 (#5452)
+ * Fix pthread detection for Android
+ * Fix in Armadillo detection test (#5455)
+ * Fix detection of OCI by changing linking order to please modern GCC (#5550)
+ * Fix test to accept MariaDB 10.X as valid MySQL (#5722)
+ * Make sure $(GDAL_INCLUDE) is first to avoid being confused by GDAL headers of a previous version elsewhere in the include path (#5664)
+ * Always use stat rather than stat64 for Mac OSX in AC_UNIX_STDIO_64. (#5780, #5414).
+ * Add support for ECW SDK 5.1 (#5390)
+ * Do not enable Python bindings if PYTHON env variable is set without --with-python being explicitly specified (#5956)
+
+Build(Windows):
+ * PDF: fix compilation issue with Visual Studio 2012 (#5744)
+ * PDF: Add support to compile the pdf driver as plugin (#5813)
+ * Add support for MrSID 9.1 SDK (#5814)
+ * when building netCDF, HDF4, HDF5 as plugins, call registration of 'sub-drivers' GMT, HDF4Image and HDF5Image (#5802)
+
+Build(all):
+ * Ruby bindings: disable autoconf and makefile support (#5880)
+ * Fix compilation errors with json-c 0.12 (#5449)
+ * Fix compilation error in alg/gdalgrid.cpp when AVX is available, but not SSE (#5566)
+
+## GDAL 2.0 - Overview of Changes
+
+Port:
+ * Introduce a more generic lock API (recursive mutex, adaptive mutex, spinlock)
+ * Add types for CPLMutex, CPLCond and CPLJoinableThread (only enforced in -DDEBUG mode)
+ * Add CPLGetPhysicalRAM() and CPLGetUsablePhysicalRAM()
+ * CPLSpawn() on Windows: quote arguments with spaces in them (#5469)
+ * /vsigzip/: avoid infinite loop when reading broken .gml.gz file (#5486)
+ * /vsizip/ : fix bug that caused premature end of file condition with some read patterns (#5530)
+ * /vsizip/ on >4GB zips: accept .zip declare 0 disks (#5615)
+ * /vsitar/: remove useless validation test that prevents from opening valid .tar files (#5864)
+ * /vsistdout/: add VSIStdoutSetRedirection() for compatibility with MapServer FCGI (https://github.com/mapserver/mapserver/pull/4858)
+ * /vsimem/: update st_mtime and return it with Stat()
+ * /vsimem/: in update mode, when seeking after end of file, only extend it if a write is done
+ * /vsimem/: Make Rename() on a directory also rename filenames under that directory (#5934)
+ * /vsicurl/: manage redirection from public URLs to redirected AWS S3 signed urls, with management of the expiration. Enabled by default. Can be disabled if CPL_VSIL_CURL_USE_S3_REDIRECT=NO (#6439)
+ * /vsicurl/: avoid reading after end-of-file and fix failure when reading more than 16MB in a single time (#5786)
+ * /vsicurl/: by default do not use HEAD request when detecting a AWS S3 signed URL
+ * Allow CPL_VSIL_CURL_ALLOWED_EXTENSIONS to be set to special value {noext}
+ * VSIWin32Handle::Flush(): no-op implementation is sufficient to offer same guarantee as POSIX fflush() (#5556)
+ * Unix VSIL: reset eof in all cases in Seek()
+ * Windows plugins: complementary fix to #5211 to avoid error dialog box when there are dependency problems (#5525)
+ * Fix VSIReadDirRecursive() recursing on the parent or current directory (#5535)
+ * cpl_error: obfuscate password
+ * HTTP: set CURLOPT_NOSIGNAL if available (#5568)
+ * Add COOKIE option to CPLHTTPFetch() (#5824)
+ * CPLHTTPFetch(): add retry logic in case of 502, 503 and 504 errors with the GDAL_HTTP_MAX_RETRY (default: 0)and GDAL_HTTP_RETRY_DELAY (default: 30 s) config options (#5920)
+ * Fix stack corruption upon thread termination with CPLSetThreadLocalConfigOption on Windows 32 bit (#5590)
+ * cpl_csv: Stop probing for csv/horiz_cs.csv. (#5698)
+ * vsipreload: implement clearerr() and readdir64() (#5742)
+ * CPLsetlocale(): return a string that is thread-locale storage to avoid potential race in CPLLocaleC::CPLLocaleC() (#5747)
+ * CPLHexToBinary(): faster implementation (#5812)
+ * CPLAcquireMutex(): improve performance on Windows (#5986)
+
+Core:
+ * Add imagery (satellite or aerial) metadata support (Alos, DigitalGlobe, Eros, GeoEye, OrbView, Landsat, Pleiades, Resurs-DK1, Spot/Formosat).
+ * Reduce lock contention on the global cache mutex and make it possible to use spin lock instead with GDAL_RB_LOCK_TYPE=SPIN
+ * Block cache: make block cache manager safe with respect to writing dirty blocks (#5983)
+ * EXIF reader: fix memleak in error code path
+ * EXIF reader: add missing validation for some data types (#3078)
+ * Fix crash in GDALPamRasterBand::SerializeToXML() when saving an empty RAT (#5451)
+ * ComputeStatistics(): use Welford algorithm to avoid numerical precision issues when computing standard deviation (#5483)
+ * Fix crashing issue with TLS finalization on Unix (#5509)
+ * GDALJP2Metadata::CreateGMLJP2(): use EPSGTreatsAsLatLong() and EPSGTreatsAsNorthingEasting() to determine if axis swapping is needed (#2131)
+ * GDALJP2AbstractDataset: implement GetFileList() to report .wld/.j2w if used
+ * GMLJP2: be robust when parsing GMLJP2 content that has nul character instead of \n (#5760)
+ * GMLJP2: add missing rangeParameters element to validate against GMLJP2 schema (#5707)
+ * GMLJP2: write non null bounding box at root of FeatureCollection (#5697)
+ * GMLJP2: SRS export as GML: output XML definition of a SRS as a GML 3.1.1 compliant Dictionary (#5697)
+ * GMLJP2: when setting GDAL_JP2K_ALT_OFFSETVECTOR_ORDER=TRUE write it as a XML comment so that we can interpret the OffsetVector elements correctly on reading
+ * GMLJP2: when parsing a GMLJP2 box, accept srsName found on gml:RectifiedGrid if not found on origin.Point, so as to be compatible with the example of DGIWG_Profile_of_JPEG2000_for_Georeferenced_Imagery.pdf (#5697)
+ * GMLJP2: add compatibility with GMLJP2 v2.0 where SRS is expressed as CRS URL
+ * GMLJP2: on reading, don't do axis inversation if there's an explicit axisName requesting easting, northing order (#5960); also strip axis order in reported SRS
+ * JP2Boxes: add null terminated byte to GDAL XML, XML or XMP boxes
+ * Add GDALGetJPEG2000Structure() (#5697)
+ * GDALMultiDomainMetadata::XMLInit(): when importing XML metadata, erase the existing document to replace it with the new one
+ * Metadata: fix correct sorting of StringList / metadata (#5540, #5557)
+ * Make GetMaskBand() work with GDT_UInt16 alpha bands (#5692)
+ * Fix 32bit overflow in GDALRasterBand::IRasterIO() and  GDALDataset::BlockBasedRasterIO() (#5713)
+ * RasterIO: small optimization in generic RasterIO() implementation to avoid loading partial tiles at right and/or bottom edges of the raster when they are going to be completely written
+ * Fix crash when calling GetTiledVirtualMem() on non-Linux platform (#5728)
+ * Add GDAL_OF_INTERNAL flag to avoid dataset to be registered in the global list of open datasets
+ * GDALDriver::CreateCopy(): accept _INTERNAL_DATASET=YES as creation option, so as to avoid the returned dataset to be registered in the global list of open datasets
+ * Implement GDALColorTable::IsSame()
+ * GDALPamDataset: do not serialize dataset metadata unless it has been set through GDALDataset::SetMetadata() or GDALDataset::SetMetadataItem()
+ * GDALLoadTabFile: add TAB_APPROX_GEOTRANSFORM=YES/NO configuration option to decide if an approximate geotransform is OK (#5809)
+ * Optimize copy efficiency from tiled JPEG2000 images
+ * Avoid fetching remote non-existing resources for sidecar files, when using /vsicurl/ with a URL that takes arguments (#5923)
+ * Use GDALCanFileAcceptSidecarFile() in GDALMDReaderManager::GetReader()
+
+Algorithms:
+ * RPC transformer: fix near interpolation in RPC DEM (#5553)
+ * RPC transformer: take into account nodata in RPC DEM (#5680)
+ * RPC transformer: add RPC_DEM_MISSING_VALUE transformer option to avoid failure when there's no DEM at the transformed point (#5730)
+ * RPC transformer: in DEM mode, implement optimization, in specific conditions (input points at same longitude, DEM in EPSG:4326) to extract several elevations at a time
+ * TPS transformer: fix crash if the forward or backward transform cannot be computed (#5588)
+ * OpenCL warper: remove unused variable in bilinear resampling that can cause compilation error (#5518)
+ * OpenCL wrapper: fix code compilation with NVIDIA OpenCL (#5772)
+ * Overview: Fix and speed-up cubic resampling in overview computation to take into account scaling factor (#5685)
+ * Overview: ignore alpha=0 values when compute an average overview of an alpha band; and also avoid memory errors when calling GetMaskBand()/GetMaskFlags() after overview computation if GetMaskXXX() has been called before (#5640)
+ * Overview: avoid crash when computing overview with a X dimension much smaller than Y dimension (#5794)
+ * GDALRegenerateOverviewsMultiBand(): fix stride calculation error with certain raster dimensions (#5653)
+ * Warper: numerous speed optimizations (SSE2 specific code, more fast code paths, ...)
+ * Warper: fix Cubic and Bilinear resampling to work correctly with downsizing (#3740)
+ * Warper: fix and optimize CubicSpline
+ * Warper: regardless of the warping memory limit, add heuristics to determine if we must split the target window in case the 'fill ratio' of the source dataset is too low (#3120)
+ * Warper: accept warping options METHOD=NO_GEOTRANSFORM and DST_METHOD=NO_GEOTRANSFORM to run gdalwarp on ungeoreferenced images
+ * Warper: fix GDALSuggestedWarpOutput() wrong extent in some circumstances (e.g. dataset of big dimension with world coordinates) (#5693)
+ * Warper: fix integer overflow when reprojecting into an area with (part of) bounds completely outside of the source projection (#5789)
+ * Warper: add min,max,med,q1 and q3 resampling algorithms (#5868)
+ * Warper: add a SRC_COORD_PRECISION warping option to help getting more reproducible output when -wm parameter changes (#5925)
+ * Warper: fix failure in GDALSuggestedWarpOut2() when top-left and bottom-right corners transform to the same point (#5980)
+ * GDALReprojectImage(): takes into account nodata values set on destination dataset
+ * Median cut and dithering: optimizations and enhancements to deal with 8-bit precision (only if using internal interface for now)
+ * rasterfill: add option to specify driver to use for temporary files
+ * Polygonize: speed optimization: do not try to build the polygon for pixels that are masked by the mask band (i.e. alpha, nodata, etc...). Can considerably speed-up processing when the nodata outline forms a very complex polygon
+
+Utilities:
+ * gdalinfo: display extra metadata domains attached to band, and refactor code a bit (#5542)
+ * gdalinfo: add -oo option per RFC 46
+ * gdalinfo: add -json switch (partial implementation of RFC 44)
+ * gdaladdo: add -oo option per RFC 46
+ * gdaladdo: add warning when subsampling factor 1 specified
+ * gdal_translate: add -oo option per RFC 46
+ * gdal_translate: add -r and -tr options per RFC 51
+ * gdal_translate: add a -projwin_srs option to be able to express -projwin coordinates in another SRS than the one of the dataset
+ * gdal_translate: support -'outsize avalue 0' or '-outsize 0 avalue' to preserve aspect ratio
+ * gdal_translate: avoid preserving statistics when changing data type in situations where clamping can occur
+ * gdal_translate: adjust RPC metadata (pixel/line offset/scale) when subsetting/rescaling, instead of just discarding it
+ * gdal_translate: don't recopy band units if rescaling or unscaling is involved (#3085)
+ * gdal_translate: increase GDAL_MAX_DATASET_POOL_SIZE default value to 450. (#5828)
+ * gdal_translate: preserve NBITS image structure metadata when possible
+ * gdalwarp: add -oo option per RFC 46
+ * gdalwarp: add -te_srs option to specify -te in a SRS which isn't the target SRS
+ * gdalwarp: add a -ovr option to select which overview level to use, and default to AUTO. Also add a generic OVERVIEW_LEVEL=level open option, and make it available in standard VRT (#5688)
+ * gdalwarp: initialize destination dataset to no_data value when automatically propagating source nodata (#5675)
+ * gdalwarp: only apply INIT_DEST when processing the first input dataset (#5387)
+ * gdalwarp: increase GDAL_MAX_DATASET_POOL_SIZE default value to 450. (#5828)
+ * gdalwarp: do not preserve NODATA_VALUES metadata item in output dataset if adding an alpha channel with -dstalpha
+ * gdalwarp: fix '-dstnodata none' to avoid read of uninitialized values (#5915)
+ * gdalwarp: make -crop_to_cutline densify cutline in source SRS before reprojecting it to target SRS (#5951)
+ * gdaldem: avoid too large files to be produced when using -co COMPRESS=xxxx -co TILED=YES (#5678)
+ * gdallocationinfo: add -oo option
+ * gdaltransform: add a -output_xy flag to restrict output coordinates to 'x y' only
+ * gdal_grid: use nodata= parameter in the algorithm string to determine the nodata value to set on the band (#5605)
+ * gdal_grid: fix crash in optimized mode with GCC 4.4 on 64bit (#5987)
+ * gdalbuildvrt: add a -r option to specify the resampling algorithm
+ * gdal_edit.py: add -unsetstats option (and fix -a_nodata to run on all bands, ant not just first one)
+ * gdal_edit.py: add -stats and -approx_stats flags (patch by mwtoews, #5805)
+ * gdal_edit.py: change -mo add metadata to existing one; add new option -unsetmd to clean existing metadata
+ * gdal_edit.py: add -oo to specify open options
+ * gdal_retile.py: fix to make it work with input images of different resolutions (#5749)
+ * gdal_retile.py: implement progress bar (#5750)
+ * gdal_merge.py: add timing information in verbose output
+ * gdal_merge.py: take into account alpha band to avoid writing zones of source images that are fully transparent (#3669)
+ * gdal2tiles.py: fix inverted long/lat in BoundingBox and Origin elements of tilemapresource.xml (#5336)
+ * pct2rgb.py: make it work with color tables with less than 256 entries (#5555)
+ * gdal_fillnodata.py: FillNodata: copy no data value to destination band when creating a dataset (if available) (#4625)
+ * gdal_proximity.py: add a -use_input_nodata flag
+ * gdalcompare.py: add options to suppress selected comparisons
+ * gdalcompare.py: takes into account differences in overview bands
+ * gdalcompare.py: compute difference on float to avoid integer underflow
+ * epsg_tr.py: change to make it possible to export GEOCCS and COMPD_CS to proj.4 epsg and PostGIS spatial_ref_sys.sql files
+
+Python samples:
+ * Added swig/python/samples/jpeg_in_tiff_extract.py
+ * Added dump_jp2.py
+ * Added validate_jp2.py
+ * Added build_jp2.py
+ * Added gcps2ogr.py
+ * tolatlong.py: report error when operating on a non-georeferenced dataset
+
+AAIGRID:
+ * Fix formatting string (#5731)
+
+BAG driver:
+ * change nodata value for uncertainty band to 1e6 (#5482)
+
+BMP driver:
+ * back out r17065 change that inferred georeferencing based on the resolution information in the BMP header (#3578)
+
+DIMAP driver:
+ * DIMAP 2: handle the case where the Raster_Data element is in main file (#5018, #4826)
+ * DIMAP 2: fix to extract geodetic SRS (#5018, #4826)
+ * DIMAP 2: fix to extract geotransform from JPEG2000 file if not available in XML (#5018, #4826)
+
+DDS driver:
+ * Add ETC1 compression format support
+ * Header correction for worldwind client
+
+ECW driver:
+ * correctly assign color interpretation to bands if order is unusual
+
+ENVI driver:
+ * avoid generating potentially corrupted .hdr files when opening in update mode; Write 'Arbitrary' instead of 'Unknown' as the projection name for an undefined SRS (#5467)
+ * when writing, consider that LOCAL_CS SRS is like ungeoreferenced (#5467)
+
+ERS driver:
+ * reset RasterInfo.RegistrationCellX/Y if setting a new geotransform on an updated .ers file (#5493)
+ * fix SetProjection() (#5840)
+
+GeoRaster driver:
+ * fix Oracle SRID authority (#5607)
+ * fix user-defined SRID issue (#5881)
+ * new SRID search (#5911)
+
+GIF driver:
+ * add compatibility with giflib 5.1 (#5519)
+ * fix crash on images without color table (#5792)
+ * fix reading of interlaced images with giflib >= 5.0
+ * validate the size of the graphic control extension block (#5793)
+ * implement GetFileList() to report worldfile
+
+GRASS driver:
+ * GRASS 7.0.0 support (#5852)
+
+GRIB driver:
+ * avoid divide by zero while setting geotransform on 1xn or nx1 grib file (#5532)
+ * allow writing PDS template numbers to all bands (#5144)
+
+GTiff driver:
+New capabilities:
+ * for JPEG-in-TIFF, use JPEG capabilities to decompress fast overview levels 2,4 and 8, to generate 'hidden' overviews used by RasterIO()
+ * add DISCARD_LSB creation option (lossy compression) to be best used with PREDICTOR=2 and LZW/DEFLATE compression
+ * when GTIFF_DIRECT_IO=YES is enabled, performance improvements in GTiffRasterBand::DirectIO() with Byte dataset and Byte buffer
+ * implement dataset DirectIO()
+ * add GTIFF_VIRTUAL_MEM_IO=YES/NO/IF_ENOUGH_RAM configuration option so that RasterIO() can rely on memory-mapped file I/O (when possible and supported by the OS)
+ * support reading and created streamable files
+ * for JPEG-compressed TIFF, avoid quantization tables to be emitted in each strip/tile and use optimized Huffman coding by default
+ * avoid SetNoDataValue() to immediately 'crystallize' the IFD
+ * allow unsetting TIFFTAG_SOFTWARE, TIFFTAG_DOCUMENTNAME, etc... by removing them from metadata list or passing None as a value of SetMetadataItem() (#5619)
+ * allow lossless copying of CMYK JPEG into JPEG-in-TIFF
+ * set alpha on target by default when translating from Grey+Alpha
+ * Internal overviews: for near, average, gauss and cubic, and pixel interleaving, make sure to use the same code path for compressed vs uncompressed overviews (#5701)
+ * add RPCTXT=YES creation option to write sidecar _RPC.TXT file
+ * internal libtiff updated to upstream libtiff 4.0.4beta
+ * internal libgeotiff updated to upstream libgeotiff SVN head
+ * speed optimization on write (at least in Vagrant) (#5914)
+ * use importFromEPSG() when ProjectedCSTypeGeoKey is available (#5926)
+ * on reading better deal with a few ESRI formulations of WebMercator (#5924)
+Fixes:
+ * when overriding metadata in update mode, make sure to clear it from PAM file (#5807)
+ * fix handling of Mercator_2SP (#5791)
+ * avoid TIFF directory to be written (at end of file) when creating a JPEG-in-TIFF file
+ * for a paletted TIFF with nodata, set the alpha component of the color entry that matches the nodata value to 0, so as gdal_translate -expand rgba works properly
+ * fix to make band SetMetadata(NULL) clear band metadata (#5628)
+ * fix error message when requesting a non existing directory
+ * check data type with PHOTOMETRIC=PALETTE
+ * be robust to out-of-memory conditions with SplitBand and SplitBitmapBand
+ * avoid using optimized JPEG --> JPEG-in-TIFF path if INTERLEAVE=BAND is specified with a 3-band JPEG
+ * to make Python bindings happy, avoid emitting CE_Failure errors due to libtiff errors when we still manage to open the file (#5616)
+ * avoid crash when reading GeoTIFF keys if the stored key type isn't the one expected
+ * make sure to call libgeotiff gtSetCSVFilenameHook() method when linking against external libgeotiff
+ * avoid/limit DoS with huge number of directories
+ * clean spurious spaces when reading values from _RPC.TXT
+ * serialize RPC in PAM .aux.xml file if using PROFILE != GDALGeoTIFF and RPB = NO
+ * fix clearing of GCPs (#5945)
+ * avoid generated corrupted right-most and bottom-most tiles for 12-bit JPEG-compressed (#5971)
+ * make sure to use scanline write API when writing single-band single-strip 1-bit datasets
+
+GRASS driver:
+ * fix compilation issues against GRASS 7
+
+HDF4 driver:
+ * Add configuration support to be able to open more files simultaneously
+ * Add class suffix to the parameter name when parsing HDF-EOS objects.
+ * Fix AnyTypeToDouble() to use proper type (int instead of long) to work with DFNT_INT32/DFNT_UINT32 on 64-bit Linux (#5965)
+ * MODIS: Set more correct values for PIXEL_/LINE_ OFFSET/STEP by comparing longitude and latitude subdatasets dimensions with main subdataset dimensions
+
+HDF5 driver:
+ * avoid opening BAG files in the case HDF5 and BAG are plugins, and HDF5 is registered before BAG
+
+HFA driver:
+ * fix recognition of Hotine Mercator Azimuth Center in Imagine format (and Swisstopo GeoTIFF) (#5551)
+ * fix various hangs on invalid files
+ * read projection even when it does not contain datum information (#4659)
+
+HTTP driver/wrapper:
+  * make it work with vector files too
+  * fix handling of non VSI*L file on Windows
+
+IRIS driver:
+ * add support for the SHEAR data type (#5549)
+
+JPEG2000 driver:
+ * do expansion of 1-bit alpha channel to 8-bit by default. Can be controlled with the 1BIT_ALPHA_PROMOTION open option (default to YES)
+ * add GMLJP2 creation option
+ * add GMLJP2V2_DEF creation option to create a GMLJP2 v2 box
+ * Add capability of reading GMLJP2 v2 embedded feature collections and annotations
+ * Add read/write support for RPC in GeoJP2 box (#5948)
+
+JP2ECW driver:
+ * add metadata about JPEG2000 codestream and boxes (#5408)
+ * Add 1BIT_ALPHA_PROMOTION open option (default to YES) to control expansion of 1-bit alpha channel to 8-bit
+ * correctly assign color interpretation to bands if order is unusual
+ * add WRITE_METADATA and MAIN_MD_DOMAIN_ONLY creation options to write GDAL metadata, JP2 XML boxes or XMP box
+ * add GMLJP2V2_DEF creation option to create a GMLJP2 v2 box
+ * Add capability of reading GMLJP2 v2 embedded feature collections and annotations
+ * Add read/write support for RPC in GeoJP2 box (#5948)
+
+JP2KAK driver:
+ * Compatibility with Kakadu v7.5 (#4575, #5344)
+ * Handle Kakadu version 7 allocator.finalize (#4575)
+ * fix bug in vsil_target::end_rewrite() that prevented TLM index to be generated (#5585)
+ * Add FLUSH in creation option XML (#5646)
+ * Do expansion of 1-bit alpha channel to 8-bit by default. Can be controlled with the 1BIT_ALPHA_PROMOTION open option (default to YES)
+ * add GMLJP2V2_DEF creation option to create a GMLJP2 v2 box
+ * Add capability of reading GMLJP2 v2 embedded feature collections and annotations
+ * Add read/write support for RPC in GeoJP2 box (#5948)
+
+JP2OpenJPEG driver:
+ * Support writing arbitrary number of bands. (#5697)
+ * Generate cdef box when transparency is needed. Add NBITS, 1BIT_ALPHA and ALPHA creation options (#5697)
+ * add INSPIRE_TG (for conformance with Inspire Technical Guidelines on Orthoimagery), PROFILE, JPX and GEOBOXES_AFTER_JP2C creation option (#5697)
+ * add GMLJP2V2_DEF creation option to create a GMLJP2 v2 box
+ * Add capability of reading GMLJP2 v2 embedded feature collections and annotations
+ * add PRECINCTS creation option (#5697)
+ * allow several quality values to be specified with QUALITY creation option. Add TILEPARTS, CODEBLOCK_WIDTH and CODEBLOCK_HEIGHT options (#5697)
+ * support reading&writing datasets with unusual order of band color interpretation (#5697)
+ * add WRITE_METADATA and MAIN_MD_DOMAIN_ONLY creation options to write GDAL metadata, JP2 XML boxes or XMP box (#5697)
+ * add support for reading/writing/updating IPR box (from/into xml:IPR metadata domain) (#5697)
+ * add YCC creation option to do RGB->YCC MCT, and turn it ON by default (#5634)
+ * add USE_SRC_CODESTREAM=YES experimental creation option, to reuse the codestream of the source dataset unmodified
+ * support reading & writing images with a color table (#5697)
+ * support update mode for editing metadata and georeferencing (#5697)
+ * add compatibility with OpenJPEG 2.1 (#5579)
+ * fix warning when reading a single tile image whose dimensions are not a multiple of 1024 (#5480)
+ * Add 1BIT_ALPHA_PROMOTION open option (default to YES) to control expansion of 1-bit alpha channel to 8-bit
+ * Add read/write support for RPC in GeoJP2 box (#5948)
+ * limit number of file descriptors opened
+
+JPEG driver:
+ * use EXIF overviews if available
+ * add EXIF_THUMBNAIL creation option to generate an EXIF thumbnail
+ * use optimized Huffman coding to reduce file size
+ * add support for reading and writing COMMENT
+ * optimize whole image reading with dataset IRasterIO()
+ * report non-fatal libjpeg errors as CE_Warning (or CE_Failure if GDAL_ERROR_ON_LIBJPEG_WARNING = TRUE) (#5667)
+ * in compressor, increase default val of max_memory_to_use to 500MB
+
+JPIPKAK driver:
+ * avoid symbol collision with kdu_cpl_error_message from JP2KAK driver
+ * reset the bNeedReinitialize flag after a timeout (#3626)
+
+KMLSuperOverlay driver:
+ * fix truncated raster on 32 bit builds (#5683)
+ * make Identify() more restrictive to avoid false positives
+
+L1B driver:
+ * add support for little-endian LRPT datasets (#5645)
+ * expose band mask when there are missing scanlines (#5645)
+ * expose WGS-84 or GRS-80 datum if read from header record (#5645)
+
+MAP driver:
+ * retrieve the image filename in a case insensitive way (#5593)
+
+MBTiles driver:
+ * better detection of 4 bands dataset and take into account alpha component of color table in RasterIO() (#5439)
+ * avoid wrong detection of 3 bands when finding paletted PNG in /vsicurl mode (#5439)
+ * fix dimension computation when opening a single tile dataset
+ * better computation of extent from min/max of tile coordinates, for a single zoom level
+ * use standard EPSG:3857 origin to fix a ~8m shift (#5785)
+
+MEM driver:
+ * implement optimized versions of raster band and dataset IRasterIO()
+
+MSG driver:
+ * fix compilation problem (#5479)
+ * fix memory leaks (#5541)
+
+NetCDF driver:
+ * Force block size to 1 scanline for bottom-up datasets if nBlockYSize != 1 (#5291)
+ * Fix computation of inverse flattening (#5858)
+ * In case the netCDF driver is registered before the GMT driver, avoid opening GMT files
+ * Fix crash on opening a NOAA dataset (#5962)
+
+NGSGEOID driver:
+ * make Identify() more restrictive
+
+NITF driver:
+ * deal correctly with JPEG2000 NITF datasets that have a color table inboth Image Subheader and JP2 boxes, and for drivers that don't do color table expension
+ * HISTOA TRE: put definition of TRE in conformance with STDI-0002 (App L page 14) and STDI-0006 (Page 57) (#5572)
+
+OGDI driver:
+ * Remove OGDIDataset::GetInternalHandle (#5779).
+
+OZI driver:
+ * remove .map header detection from Identify() since this is actually handled by the MAP driver
+
+PCIDSK driver:
+ * close dataset in case of exception in PCIDSK2Dataset::LLOpen() (#5729)
+
+PCRaster driver:
+ * Align libcsf code with PCRaster raster format code (#5843)
+ * Implement Create() (#5844)
+ * Improve handling of no-data value (#5953)
+
+PDF driver:
+ * add compatibility with Poppler 0.31.0
+ * in the OGC Best practice case, switch rotational terms of the geotransform matrix (gt[2] and gt[4])
+ * in the OGC Best practice case, handle rotations of 90 and 270 degrees.
+ * advertise LAYERS metadata domain
+ * deal with OHA- datum (Old Hawaiian)
+ * fix compilation problem with Podofo on Windows (patch by keosak, #5469)
+ * add sanity check on page count
+
+PDS driver:
+ * Added support for SPECTRAL_QUBE objects used e.g. by THEMIS instrument of Mars Odyssey spacecraft.
+
+PNG driver:
+ * add creation options to write metadata in TEXT/iTXt chunks
+ * optimize whole image reading with dataset IRasterIO()
+ * Internal libpng: update to 1.2.52
+
+PostgisRaster driver:
+ * Fix read of metadata for tables with multiple raster cols (#5529)
+
+Rasterlite driver:
+ * accept space in filename
+
+RPFTOC driver:
+ * add tweak for weird relative directory names in the A.TOC file (#5979)
+
+VRT driver:
+ * add handling of a shared='0' attribute on <SourceFilename> to open sources in non-shared mode, and VRT_SHARED_SOURCE config option that can be set to 0 in case the shared attribute isn't there (#5992)
+ * VRT warp: make selection of source overview work (#5688)
+ * VRT warp: expose as many overviews in warped dataset as there are in source dataset, and make warped VRT honour -ovr parameter of gdalwarp (#5688)
+ * make sure nodata value set on VRT raster band is taken into account in statistics computation (#5463)
+ * fix ComputeStatistics() on VRT that are a sub-window of source dataset (#5468)
+ * VRT raw: fix corrupted serialization on Windows (#5531)
+ * implement heuristics to determine if GetMinimum()/GetMaximum() should use the implementation of their sources of not. Can be overridden by setting VRT_MIN_MAX_FROM_SOURCES = YES/NO (#5444)
+ * VRT warp: avoid to warp truncated blocks at right/bottom edges, so that scale computation is correct
+ * fix RasterIO() to be able to fill buffers larger than 2GB (#5700)
+ * fix performance problem when serializing into XML a big number of sources
+ * do not output empty <Metadata> node on VRTDataset and VRTRasterBand elements
+ * fix rounding of output window size on VRTSimpleSource (#5874)
+ * add trick to make relativeToVRT works for a VRT-in-VRT
+ * add more checks to CheckCompatibleForDatasetIO() to avoid issues with overview bands (#5954)
+ * preserves relative links on reserialization of existing VRT (#5985)
+
+USGSDEM driver:
+ * take into account horizontal unit = ft in the UTM case (#5819)
+
+TIL driver:
+ * fix half pixel shift in geo registration (#5961)
+
+WEBP driver:
+ * Lazy uncompressed buffer allocation and optimize band-interleaved IRasterIO() for whole image reading
+
+WMS driver:
+ * Add support for ArcGIS server REST API
+ * fix to make GDAL_DEFAULT_WMS_CACHE_PATH configuration option work as expected (#4540)
+ * move the WMS layer name encoding to be done before the sub datasets URLs are created.
+
+XYZ driver:
+ * fix back line seeking with datasets that have not the same number of values per lines (#5488)
+ * deal with lines that have missing values (but still regularly spaced)
+
+## OGR 2.0 - Overview of Changes
+
+Core:
+ * OGRPolygon::importFromWkt(): fix memleak when importing broken 2.5D polygon
+ * Fix OGRFeature::SetGeometryDirectly() and SetGeomFieldDirectly() to free the passed geometry even if the method fails (#5623)
+ * OGR SQL: Add hstore_get_value(hstore, key) function
+ * OGR SQL: sanitize how we deal with field names expressed as table_name.field_name and "fieldname.with_point_inside". By default, use standard quoting rules, and be tolerant when there's no ambiguity
+ * OGR SQL: support arbitrary boolean expression on ON clause of a JOIN
+ * OGR SQL: accept AS keyword in 'FROM table_name AS alias' clause
+ * OGR SQL: don't consider backslash-doublequote as an escape sequence when inside a single-quoted string literal
+ * Add OGR_API_SPY mechanism (http://www.gdal.org/ograpispy_8h.html)
+ * Make OGRParseDate() recognize ISO 8601 format
+ * ogr_core.h: only ignore -Wfloat-equal for IsInit() and not for the rest of the file and files that include it (#5299)
+ * OGR layer algebra: properly initialize field maps to avoid Valgrind warnings in OGRLayer::Update() (#5778)
+ * Make OGR_F_SetFieldBinary() set OFTString fields, mostly for testing purposes
+ * OGR_G_CreateGeometryFromJson(): attach a WGS84 SRS to the returned geometry if the json object has no 'crs' member (#5922)
+
+OGRSpatialReference:
+ * Upgrade to EPSG v8.5 database
+ * Proj.4 import: for HOM, make sure +no_off/no_uoff is preserved, and change default value of gamma parameter to be the same as alpha (#5511)
+ * Proj.4 export: export Aitoff, Winkel I, Winkel II, Winkel-Tripel, Craster, Loximuthal, Quartic Authalic
+ * Adding support for Mercator_Auxiliary_Sphere without AUTHORITY SECTIONS (#3962)
+ * Add QSC (Quadrilateralized_Spherical_Cube) projection, compatible with PROJ 4.9
+ * Various fixes to put EXTENSION node before AUTHORITY and make it pass Validate() (#5724)
+ * importFromEPSG()/exportToProj4(): avoid precision loss in TOWGS84 parameters, e.g. on Amersfoort / RD EPSG:4289 (https://trac.osgeo.org/proj/ticket/260)
+ * Add OSRCalcInvFlattening() and OSRCalcSemiMinorFromInvFlattening(), and use them in various places (#5858)
+ * Remove deprecated variant of OGRSpatialReference::importFromOzi() (#5932)
+
+Utilities:
+ * ogrinfo: add -oo option per RFC 46
+ * ogrinfo: display dataset and layer metadata. Add -nomdd, -listmdd, -mdd all|domain options, like in gdalinfo. OGR VRT: add dataset and layer metadata support
+ * ogrinfo: add -nocount and -noextent options
+ * ogr2ogr: add -oo and -doo options per RFC 46
+ * ogr2ogr: add -spat_srs option
+ * ogr2ogr: turn string value to one element list if destination field is stringlist
+ * ogr2ogr: fix problem with SRS when copying layers with multiple geometry columns with different SRS (#5546)
+ * ogr2ogr: add special case for -update and GPKG and input=output
+ * ogr2ogr: when copying a layer that has a source integer/integer64 field with same name as target FID column, avoid creating it into target layer and use its content as the FID value (#5845)
+ * ogr2ogr: in non-append mode, if target layer has a FID creation option, reuse source FID name and source FIDs, unless -unsetFid is specified (#5845)
+ * ogr2ogr: copy source dataset and layer metadata, unless disabled by -nomd. Additional dataset metadata can be set with -mo KEY=VALUE
+ * ogr2ogr: add -ds_transaction to force dataset transactions, mainly for FileGDB driver
+ * ogr2ogr: fix crash with -clipdst when a reprojection fails before (#5973)
+ * ogrlineref: fix project if reper lies on first point or last point of line
+ * ogr_layer_algebra.py: for Update, Clip and Erase, only creates attribute of input layer by default (#5976)
+
+Other:
+ * OGR WCTS removed from tree
+
+Cross driver changes:
+ * MSSQLSpatial and GPKG: use standardized 'GEOMETRY_NAME' option name. Add GEOMETRY_NAME to SQLite (#5816)
+ * FileGDB and MySQL: use standardized 'FID' option name. SQLite: add a FID layer creation option (#5816)
+ * SQLite, GPKG, PG, PGDump: in a newly created table, allow to create a integer field with same name of FID column (#5845)
+
+BNA driver:
+ * fix segfault when calling GetNextFeature() on a write-only layer
+
+CartoDB:
+ * add CARTODBFY layer creation option
+ * launder layer and column names by default (#5904)
+ * enable by default batch insertion of features in update mode
+ * on a newly created layer, send new features created by CreateFeature() by chunks of a maximum size of 15 MB (configurable through CARTODB_MAX_CHUNK_SIZE).
+ * implement deferred field creation
+ * support boolean type
+ * register tables with cdb_cartodbfytable()
+ * fix creation of features with Date/DateTime/Time values
+ * fix for multi-user account, and optimization for SQL layers
+ * implement TestCapability() and CreateDataSource() similarly to PostgreSQL, i.e. redirect to Open() in update mode
+ * accept a user column to have the same name of the FID (cartodb_id)
+ * do automatic polygon->multipolygon promotion at creation time
+ * in authenticated mode, retrieve all column information, including spatial info, default value and primary key in one single statement
+ * use integer primary key of tables, when available, to scroll faster among features instead of using OFFSET/LIMIT (#5906)
+
+CSV driver:
+ * add optional field type detection with AUTODETECT_TYPE=YES open option
+ * add QUOTED_FIELDS_AS_STRING open option that default to NO. So by default, if AUTODETECT_TYPE=YES, the content of quoted fields will be tested for real, integer,... data types
+ * fix to avoid truncation of WKT geometries to 8000 characters (#5508)
+ * fix segfault when reading allCountries.txt of geonames.org (#5668)
+ * accept space as separator as input/output, and add MERGE_SEPARATOR=YES/NO open option
+
+DXF driver:
+ * improve TestCapability(ODsCCreateLayer)
+
+FileGDB driver:
+ * add layer creation option to set CONFIGURATION_KEYWORD
+ * avoid error message when failing to import SRS from WKID code (might be an ESRI code for example)
+ * do not reject features with null geometry
+ * use LatestWKID when available (#5638)
+ * avoid emitting error when opening a FileGDB v9, so that OpenFileGDB can be tried to open it, in the case FileGDB is a plugin (#5674)
+ * fix CreateFeature() to work when a esriFieldTypeGlobalID field is not set
+ * report width of string fields (#5806)
+ * add compatibility with FileGDB SDK v1.4
+ * enable bulk load on newly created layers
+
+GeoJSON driver:
+ * implement Date/Time/DateTime field type detection
+ * expose a 'id' object, of type string, directly on Feature object (not in its properties) as a field
+ * add FLATTEN_NESTED_ATTRIBUTES and NESTED_ATTRIBUTE_SEPARATOR open options
+ * TopoJSON: establish layer schema from objects properties (#5870)
+ * implement automatic scrolling through result sets of ArcGIS GeoServices Feature Service (#5943)
+ * accept and skip UTF-8 BOM (#5630)
+ * ESRIJson: parse correctly rings of esriGeometryPolygon objects to build correct Polygon or MultiPolygon (#5538)
+ * avoid truncation of real numbers on reading (#5882)
+ * internal libjson-c: Fix to read floating point numbers in non C locale (#5461)
+ * improve TestCapability(ODsCCreateLayer)
+ * make string comparison for authority name case insensitive so as to recognize lowercase 'epsg' (#4995)
+ * support reading Feature without geometry field
+
+GeoRSS driver:
+ * fix to parse ATOM feed documents with atom: namespace (#5871)
+
+GME driver:
+ * Added fixes discovered while using v.in.ogr and v.out.ogr in GRASS
+
+GML driver:
+ * add XSD=filename open option
+ * add FORCE_SRS_DETECTION, INVERT_AXIS_ORDER_IF_LAT_LONG, CONSIDER_EPSG_AS_URN, READ_MODE, EXPOSE_GML_ID, EXPOSE_FID, DOWNLOAD_SCHEMA and REGISTRY open options
+ * Fix bug that prevented multiple instances of the reader with Xerces backend (#5571)
+ * parse correctly GML geometries whose srsDimension attribute is on top-level geometry element and not on posList (#5606)
+ * add datasource option SRSDIMENSION_LOC=GEOMETRY to be able to write srsDimension attribute on top level geometry element, default on posList unchanged (#5066)
+ * add support for reading layers resulting from a WFS 2.0 join query
+ * read/write top <gml:description> and <gml:name> as DESCRIPTION and NAME metadata items. Also add GML_ID, DESCRIPTION and NAME creation options
+ * support to reader response to CSW GetRecords queries
+ * Fix incorrect geometry cast when reading GML topogeometries (#5715)
+ * VFR: fix ST_Z type (changes) -- list all layers
+ * VFR: include also non-spatial (removed) features (ZaniklePrvky) in type ST_Z (changes)
+ * VFR: use String when 32-bit integer was not wide enough
+ * VFR: add support for UVOH file type
+ * VFR: add missing support for OriginalniHraniceOmpv geometry
+ * VFR: update GFS files to RFC31 (OGR 64bit Integer Fields and FIDs)
+ * update RUIAN GFS files: add missing GMLFeatureClasses to OB type (SpravniObvody, Mop, Momc)
+ * add support for parsing .xsd with a <choice> of polygonProperty and multiPolygonProperty
+ * remove wrong case insensitive comparison related to gml_registry.xml use
+ * various fixes to better deal with ArcByCenterPoint() as found in FAA AIXML files
+ * make Expat parser accept trailing nul characters
+ * correctly record path to attribute in case of attribute located on a nested element when .gfs is created with GML_ATTRIBUTES_TO_OGR_FIELDS=YES
+ * fix GML_ATTRIBUTES_TO_OGR_FIELDS=YES to work correctly with xlink:href too (#5970
+ * make GML_EXPOSE_GML_ID to be honoured on WFS documents
+
+GPKG driver:
+ * add support for non-spatial layers via the gdal_aspatial extension (#5521)
+ * add support for creating spatial index
+ * add layer metadata read/write support
+ * implement ST_GeometryType(), GPKG_IsAsisgnable() and ST_SRID() to be compatible with Geometry Type Triggers and SRS ID Triggers Extensions
+ * on creation, use GEOMCOLLECTION (instead of GEOMETRYCOLLECTION) (#5937)
+ * make SELECT expressions passed to ExecuteSQL() be evaluated by SQLite
+ * make it possible to use spatialite 4.2.0 SQL functions
+ * add a 'INDIRECT_SQLITE' dialect that goes through the VirtualOGR mechanism (e.g. for compat with older Spatialite)
+ * allow table names with dash character (#5472)
+ * emit warning when required extensions are not implemented
+ * disable PRAGRAM integrity_check by default, since it can be expensive on big files
+ * read-only support for tables without integer primary key
+ * fix Date and DateTime support
+ * implement TEXT(maxwidth) type in read and creation
+ * implement deferred table creation
+ * fix reporting of geometry type for 2.5D (previous behavior had the effect to turn to wkbUnknown)
+ * put correct value (1) in gpkg_geometry_columns for 2.5D tables (#5481)
+ * fix component geometry type of 3D MultiGeometries (#5629)
+ * fix GetExtent() crash on layers without extent set in gpkg_contents (#5471)
+ * avoid leak when a table has more than one FID column
+ * accept spatial tables whose geometry field is declared as BLOB
+ * recognize both GeomCollection and GeometryCollection as possible values, until GeoPackage SWG clears what is the official value
+ * escape all column names in SQL (#5520)
+ * accept geometries with Spatialite format, that can be returned with issuing a SQL request using spatialite functions
+ * enable Spatialite 4.3 'amphibious' mode to avoid explicit cast to Spatialite geometries
+
+GPSBabel driver:
+ * automatically open .igc files, implement Identify() and add open options
+ * advertise creation option
+
+GTM driver:
+ * declare OLCCreateField and OLCSequentialWrite capabilities
+
+IDRISI driver:
+ * fix support for multi-ring polygons (#5544)
+
+ILI driver:
+ * Use Ili1TransferElement written by ili2c 4.5.5 and newer
+ * Fix crash in polygon geometry reading
+ * Fix reading SURFACE polygons with multiple rings
+ * Fix reading tables with polygon type
+ * Support curve geometries for ILI1 and ILI2.
+ * Add a MODEL open option
+
+ISIS3 driver:
+ * fix to recognize IsisCube.Mapping.LatitudeType = Planetocentric (#5717)
+
+KML driver:
+ * fix segfault when calling GetNextFeature() on a write-only layer
+
+LIBKML driver:
+ * add support for reading gx:MultiTrack
+ * rework libkml singleton factory management (#5775)
+
+MITAB driver:
+ * add support for append/update/delete operations on .tab files (#5652)
+ * add support for CreateField() on non empty file, AlterFieldDefn() and DeleteField() for .TAB (#5652)
+ * implement SyncToDisk() for TAB layers (#5652)
+ * convert to use of VSI*L FILE API (#5558)
+ * don't write field width for integer fields in .mif, which is incompatible with MapInfo (#3853)
+ * report OLCCreateField for .mif files (#5477)
+ * fix opening .mif file without .mid file (#5570)
+ * swap StdParallel1 and stdParallel2 if necessary on LCC projections (https://github.com/mapgears/mitab/issues/1)
+ * take into account scale/bounds to properly round coordinates (https://github.com/mapgears/mitab/issues/2)
+ * add MITAB_BOUNDS_FILE configuration option to specify a file with projection bounds (https://github.com/mapgears/mitab/issues/3)
+ * add BOUNDS layer creation option (#5642)
+ * refactor import/export of MIF coordsys to use the TAB code; take into account MITAB_BOUNDS_FILE to add Bounds to the CoordSys string
+ * close polygon rings when reading Region from MIF file (#5614)
+ * fix segfault in CreateFeature() if passing an invalid OGR feature style string (#1209)
+
+MSSQLSpatial driver:
+ * Implement SPATIAL_INDEX layer creation option for MSSQL (#5563)
+ * Implement support for WKB geometry upload (#5682)
+ * Fix schema handling in MSSQL driver (#5401)
+ * Fix spatial geometry field handling (#5474)
+ * Bind string fields to unicode string columns in the database (#5239)
+ * Fix recognizing image columns as geometry columns for the select layers. (#5498)
+ * Fix issue when creating non-spatial table (#5696)
+ * Fix to read metadata if the tables are specified in the connection string (#5796)
+ * Fix crash if the tablename is specified in the connection string (#5826)
+ * Include geometry column name in Update statement (#5930)
+ * Implement FID layer creation option (#5816)
+ * Fix issue when removing an MSSQL spatial layer
+
+MySQL:
+ * thread-safe initialization of mysql client library (#5528)
+
+NAS driver:
+ * implement wfs:update (adds new context 'update' and fields "endet" and "anlass" to "delete" layer).
+ * also assign xlink:href attributes as layer attribute (not only in "alkis_beziehungen" layer; #5372)
+ * fix filtering on OGR_GEOMETRY special field
+ * make chevrons configurable by NAS_INDICATOR
+
+OCI driver:
+ * add a ADD_LAYER_GTYPE=YES/NO layer creation option that defaults to YES to enforce a layer geometry type and is used to retrieve the layer geometry type when listing layers (#3754)
+ * Fix FID (multi_load=off, OGRNullFID) - start with 1 (not -1) (#5454)
+ * use VARCHAR2 instead of VARCHAR for unsupported types
+ * Fix "ORA-00972: identifier is too long" error (#5466)
+ * Fix memory leaks (#5599)
+ * Fix creation of date and datetime fields (#5600)
+ * initialize member variable to avoid UpdateLayerExtents() to be called randomly on non spatial tables (#5376)
+ * avoid spatial index to be created each time SyncToDisk() is called
+ * fix memory leak in DeleteLayer(const char*)
+ * fix reading of 2D geometries that were always turned as 3D
+ * in layers returned by ExecuteSQL(), only expose geometry column if there's one
+ * force NLS_NUMERIC_CHARACTERS to ". " (#5709)
+
+ODBC driver:
+ * try alternate DSN template for 64bit ODBC
+ * make ODBC driver honour PGEO_DRIVER_TEMPLATE config. option (and also MDB_DRIVER_TEMPLATE in case PGEO_DRIVER_TEMPLATE isn't defined) (#5594)
+
+ODS driver:
+ * fix export of OFTDate fields that were exported as string
+
+OpenAir driver:
+ * tweak detection logic to read beyond first 10KB bytes when needed (#5975)
+
+OpenFileGDB driver:
+ * add compatibility with .gdbtable files bigger than 4 GB (#5615)
+ * support opening files with ConfigurationKeyword=MAX_FILE_SIZE_4GB or MAX_FILE_SIZE_256TB (#5615)
+ * fix occasional write-after-end-of-buffer (#5464)
+ * avoid error message when failing to import SRS from WKID code (might be an ESRI code for example)
+ * fix spatial filter with GeneralPolygon shapes (#5591)
+ * fix for reading GDB with string fields with a default value length > 127 (#5636)
+ * better handling of certain definitions of raster columns
+ * use LatestWKID when available (#5638)
+ * increase accepted size for field description zone up to 10 MB (#5660)
+ * fix ResetReading() on SQL layer with ORDER BY on indexed column (#5669)
+ * add support for non spatial GDB v9 tables (#5673)
+ * improve error reporting when file exists but cannot be opened due to permission problem (#5838)
+ * report width of string fields (#5806)
+ * try to deal more gracefully with inconsistent nValidRecordCount vs nTotalRecordCount values (#5842)
+ * report 25D layer geometry type on FileGDB v9 tables when relevant
+ * optimize sequential reading of sparse layers
+ * avoid warning when opening a00000004.gdbtable
+ * disable feature count optimization with IS NOT NULL on an index column
+
+OSM driver:
+ * add mechanism to compute fields from other fields/tags with SQL expressions. Apply it for z_order on lines layer
+ * fix random crash, particularly on MacOSX (#5465)
+ * add CONFIG_FILE, USE_CUSTOM_INDEXING, COMPRESS_NODES, MAX_TMPFILE_SIZE and INTERLEAVED_READING open options
+
+PG driver:
+ * use COPY mode by default (unless PG_USE_COPY is set to NO) when inserting features in a newly create table (#5460)
+ * add UNLOGGED=YES/NO layer creation option to create unlogged tables (improved version of patch by Javier Santana, #4708)
+ * implement deferred loading of table list, to optimize ExecuteSQL() (#5450)
+ * implement optimization for spatial table listing for PostGIS 2.x
+ * implement deferred creation of tables to capture all attribute and geometry column creations into a single CREATE TABLE statement (#5547)
+ * change "No field definitions found" from fatal error to debug
+ * when creating a table and filling it, avoid re-reading the table definition from PG system tables (#5495)
+ * better handling of SRS authority name different than EPSG (authority code must still be integral)
+ * fix crash when writing a StringList with 0 element (#5655)
+ * emit errors instead of debug messages when postgres issues an error (#5679)
+ * fix to make ExecuteSQL('CREATE DATABASE foo') work
+ * fix regression that prevented to retrieve more than 500 features from a connection with tables= parameter and on a SQL result layer (#5837)
+ * PG/PGDump: fix truncation of fields to work with multi-byte UTF-8 characters (#5854)
+
+PGDump driver:
+ * switch to DROP_TABLE=IF_EXISTS by default (#5627)
+ * fix crash when writing a StringList with 0 element (#5655)
+
+PGeo driver:
+ * try alternate DSN template for 64bit ODBC
+
+REC driver:
+
+Shapefile driver:
+ * add SPATIAL_INDEX layer creation option (#5562)
+ * support .prj files with UTF-8 BOM
+ * fill 'date of last update' header with current time instead of dummy date, and add a DBF_DATE_LAST_UPDATE layer creation option to override this with a fixed date (#3919)
+ * fix reading of shapefiles whose .shx is non conformant (#5608)
+ * fix writing values up to 2^53 in OFTReal fields with 0 decimal places (#5625)
+ * delete implicit FID field as soon as we CreateField a real one
+ * GetExtent(): don't trust extent in header if it contains Not-A-Number values (#5702)
+ * make REPACK compact .shp if SetFeature() is called and changes one geometry size (#5706)
+ * add check not to cut unicode character while cut the string lengnt for field max length during SetFeature
+ * avoid reading whole .shx at open time for /vsicurl/
+ * add SHAPE_REWIND_ON_WRITE configuration option that can be set to NO to disable correction of ring winding order on write. Useful when dealing with MultiPolygon that are MultiPatch objects in fact (#5888)
+ * Make ENCODING layer creation option proprietary over SHAPE_ENCODING config. option
+
+SOSI driver:
+ * remove error noise (#5710)
+
+S57 driver:
+ * various compliance fixes in ISO8211 and S57 writer (#5798)
+ * make it possible to set LNAM_REFS=OFF as advertized in the doc
+
+SQLite/Spatialite driver:
+ * SQLite/Spatialite: add support for multiple geometry column tables, accordingly with RFC 41 (#5494)
+ * SQLite SQL dialect: Add hstore_get_value(hstore, key) function
+ * remove 'T' suffix when formatting the content of a Date field (#5672)
+ * optimize CreateFeature() when fields can be null or not null from one feature to another one
+ * Spatialite: improve insertion performance by disabling triggers and doing the job ourselves
+ * Fix segmentation fault when executing OGR2SQLITE_Register() when compiling against sqlite 3.8.7 (#5725)
+ * make GetFIDColumn() work when run as first method call (#5781)
+ * emit warning when reading text values in a integer/real field (possible since SQLite has no strong typing)
+ * support reading date/datetime from Julian day floating point representation
+ * SQLite dialect: fix insertion in geometry_columns of table names that are not in upper-case (#6483)
+
+SUA driver:
+ * tweak detection logic to read beyond first 10KB bytes when needed (#5975)
+
+SXF driver:
+ * Fix SXF file version check (#5456)
+ * Fix wrong Miller Cylindrical projection string
+ * Fix encoding issues (#5647)
+ * Fix extract z value to OGRGeometry
+ * Fix case sensitivity of RSC file
+
+VFK driver:
+ * recode also header values
+ * process DKATUZE from header properly
+ * handle also duplicated records
+ * check attribute 'parametry_spojeni'
+ * speed-up GetFeatureCount()
+ * fix reading properties. Escape characters for SQL
+ * change SRS from EPSG 2065 to 5514
+ * fix reading SBP datablock (fix mismatch when reading from file and db)
+
+VRT driver:
+ * do not propagate ignoring of x and y cols of a PointFromColumns to the source layer (#5777)
+ * add an optional 'name' attribute on FID element, so as to be able to force the report of a FID column name even if it is not exposed as a regular field (related to #5845)
+ * handle optional <OpenOptions><OOI key='key'>value</OOI></OpenOptions> to specify open options
+ * do not enable passthrough filtering if redefining <FID> (#6480)
+
+Tiger driver:
+ * Fix potential buffer underflow when providing /vsistdin/ to Tiger driver (#5567)
+
+WAsP driver:
+ * added options and changed output precision to match WAsP Map Editor
+ * improve TestCapability(ODsCCreateLayer)
+
+WFS driver:
+ * automatically enable paging if WFS 2.0 capabilities report paging support
+ * evaluate SELECT with JOIN on server-side for a Join-capable WFS 2.0 server
+ * add a TRUST_CAPABILITIES_BOUNDS open option, that can be set to YES to trust layer bounds declared in GetCapabilities response, for faster GetExtent() runtime (#4041)
+ * add INVERT_AXIS_ORDER_IF_LAT_LONG, CONSIDER_EPSG_AS_URN and EXPOSE_GML_ID open options
+ * add capability to use spatial functions ST_xxxxx() as server-side filters
+ * add dataset and layer metadata
+ * allow SELECT with several ORDER BY columns
+ * report name of geometry column
+ * Add COOKIE option (#5824)
+ * when parsing a layer schema without geometry from the GML .xsd, do not expose a geometry field at the WFS layer level (#5834)
+
+XLSX driver:
+ * fix column numbering when there are more than 26 columns (#5774)
+
+XPlane driver:
+ * add support for Taxi Location 1300 record found in V1000
+
+## SWIG Language Bindings
+
+All bindings:
+ * bind GDALGetBandDataset() as Band.GetDataset()
+ * add Feature.GetFieldAsBinary()
+
+Java bindings:
+ * Pass eRWFlag to allow both reading or writing.  Write was broken in DatasetRasterIO().
+ * updates to generate maven artifacts
+
+Perl bindings:
+ * The breaking changes are described in more detail in swig/perl/Changes-in-the-API-in-2.0.
+ * More comprehensive use of strings as constants (such as capabilities); they are also taken from bindings, which added new ones, and not hard-coded.
+ * New classes (e.g., VSIF, GeoTransform, GeomFieldDefn) and new methods (e.g., constant lists, Dataset::SpatialReference).
+ * Much improved documentation and switch to Doxygen::Filter::Perl.
+ * New test codes.
+ * Errors are confessed with stack trace and often caught earlier with better messages.
+ * Use of attributes is deprecated and methods have been added to replace them.
+ * Multiple geometry fields have necessitated some changes in schema and field related methods.
+ * More support for named parameters (i.e., hashes as arguments).
+ * NoDataValue: set max float if undef is given.
+ * Unit: set '' if undef is given.
+ * Also other changes that will also remove some "use of uninitialized value in subroutine entry" warnings.
+ * Automatic handling of SQL result layers.
+ * Fix issue with index attribute for field meta data (schema) (#5662)
+ * Warn if attempt to create non-integer column for colors.
+ * Remove prefix GCP from GCP swig made attributes.
+
+Python bindings:
+ * add optional buf_xsize, buf_ysize and buf_type parameters to Dataset.ReadAsArray() and Dataset.LoadFile(), and use dataset RasterIO for better efficiency
+ * avoid generating Python exception when PyString_FromStringAndSize() fails and GDAL errors as Python exceptions are disabled
+ * Band.ReadRaster() and Dataset.ReadRaster(): clear the buffer in case there are holes in it due to odd spacings specified by the user
+ * Fix hang of Python in case of repeated call to gdal/ogr.UseExceptions() and CE_Warning emitted (#5704)
+ * for Python 2, accept unicode string as argument of Feature.SetField(idx_or_name, value) (#4608)
+ * for Python 2, accept Unicode strings to be passed as key and/or value of the dictionary passed to SetMetadata() (#5833)
+ * fix processing error of ogr_python.i with SWIG 3 (#5795)
+ * NUMPY driver: avoid returning CE_None in GetGeoTransform() when there's no geotransform set (#5801)
+ * Make GetFieldAsBinary() work with OFTString fields
+ * For Python3 compat, make Feature.GetField() use GetFieldAsBinary() if GetFieldAsString() fails (#5811)
+
+# GDAL/OGR 1.11.0 Release Notes
+
+## In a nutshell...
+
+ * New GDAL drivers:
+    - KRO: read/write support for KRO KOKOR Raw format
+ * New OGR drivers:
+    - CartoDB : read/write support
+    - GME (Google Map Engine) : read/write support
+    - GPKG (GeoPackage): read-write support (vector part of the spec.)
+    - OpenFileGDB: read-only support (no external dependency)
+    - SXF driver: read-only support
+    - WALK : read-only support
+    - WasP : read-write support
+ * Significantly improved drivers: GML, LIBKML
+ * RFC 40: enhanced RAT support (#5129)
+ * RFC 41: multiple geometry fields support
+ * RFC 42: OGR Layer laundered field lookup
+ * RFC 43: add GDALMajorObject::GetMetadataDomainList() (#5275)
+ * RFC 45: GDAL datasets and raster bands as virtual memory mapping
+ * Upgrade to EPSG 8.2 database
+
+## New installed files
+ * bin/ogrlineref
+ * lib/pkgconfig/gdal.pc
+ * gdalcompare.py
+ * data/gml_registry.xml
+ * data/inspire_cp_CadastralParcel.gfs
+ * data/inspire_cp_BasicPropertyUnit.gfs
+ * data/inspire_cp_CadastralBoundary.gfs
+ * data/inspire_cp_CadastralZoning.gfs
+ * data/ruian_vf_ob_v1.gfs
+ * data/ruian_vf_st_v1.gfs
+ * data/ogrvrt.xsd
+
+## Backward compatibility issues
+
+# GDAL 1.x
+
+Consult [NEWS-1.x.md](NEW-1.x.md)
diff --git a/NEWS.md b/NEWS.md
index d8658b89d116..dd957241a787 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,16178 +1,9380 @@
-# GDAL/OGR 3.9.0 Releases Notes
+# GDAL/OGR 3.10.0 Release Notes
 
-GDAL/OGR 3.9.0 is a feature release.
-Those notes include changes since GDAL 3.8.0, but not already included in a
-GDAL 3.8.x bugfix release.
+FIXME: Preliminary notes up to commit d8112b785c1a2bedfc11849779bd148d55b10915
+
+GDAL/OGR 3.10.0 is a feature release.
+Those notes include changes since GDAL 3.9.0, but not already included in a
+GDAL 3.9.x bugfix release.
 
 ## In a nutshell...
 
-* [RFC 96](https://gdal.org/development/rfc/rfc96_deferred_plugin_loading.html):
-  Deferred C++ plugin loading
-* [RFC 97](https://gdal.org/development/rfc/rfc97_feature_and_fielddefn_sealing.html):
-  OGRFeatureDefn, OGRFieldDefn and OGRGeomFieldDefn "sealing"
-* [RFC 98](https://gdal.org/development/rfc/rfc98_build_requirements_gdal_3_9.html):
-  Build requirements for GDAL 3.9
-* [RFC 99](https://gdal.org/development/rfc/rfc99_geometry_coordinate_precision.html):
-  Geometry coordinate precision
-* Add [S104](https://gdal.org/drivers/raster/s104.html) (Water Level Information
-  for Surface Navigation Product) and
-  [S111](https://gdal.org/drivers/raster/s111.html) (Surface Currents Product)
-  raster read-only drivers (required libhdf5)
-* Add raster [GTI](https://gdal.org/drivers/raster/gti.html) (GDAL Raster Tile
-  Index) driver to support catalogs with huge number of sources.
-* Add vector [MiraMonVector](https://gdal.org/drivers/vector/miramon.html)
-  read/creation driver (#9688)
-* Deprecated ARG driver has been removed (#7920)
-* Code linting
+* [RFC 101](https://gdal.org/en/latest/development/rfc/rfc101_raster_dataset_threadsafety.html):
+  Raster dataset read-only thread-safety
+* New read/write [AVIF](https://gdal.org/en/latest/drivers/raster/avif.html)
+  raster driver
+* New read-only [SNAP_TIFF](https://gdal.org/en/latest/drivers/raster/snap_tiff.html)
+  raster driver for Sentinel Application Processing GeoTIFF files
+* New OGR read-only [XODR](https://gdal.org/en/latest/drivers/vector/xodr.html)
+  driver for OpenDRIVE (#9504)
+* Code linting and security fixes
+* Bump of shared lib major version
 
-## Build
+## New optional dependencies
 
-* CMake: add ``[GDAL|OGR]_REGISTER_DRIVER_<driver_name>_FOR_LATER_PLUGIN``
-  variables (RFC 96)
-* CMake: Bump max compatible version to 3.28
-* CMake: add a way of defining an external deferred driver by setting one or
-  several ADD_EXTERNAL_DEFERRED_PLUGIN_XXX CMake variables (RFC 96)
-* CMake: error out if a driver has been asked as a plugin, but conditions are not met
-* CMake: rework PROJ detection
-* CMAKE_UNITY_BUILD=YES builds are possible, but not recommended for production
-* gdal.cmake: set -DDEBUG for CMAKE_BUILD_TYPE=Debug for Windows builds as well
-* CMake: add GDAL_FIND_PACKAGE_OpenJPEG_MODE and GDAL_FIND_PACKAGE_PROJ_MODE
-  variables
-* FindSQLite3.cmake: avoid repeating finding `SQLite3_INCLUDE_DIR`/
- `SQLite3_LIBRARY` if existed.
-* Add compatibility for Intel Compiler 2024.0.2.29
+* [libavif](https://github.com/AOMediaCodec/libavif) for AVIF driver
+* [libopendrive](https://github.com/DLR-TS/libOpenDRIVE) for XODR driver
 
 ## Backward compatibility issues
 
-See [MIGRATION_GUIDE.TXT](https://github.com/OSGeo/gdal/blob/release/3.8/MIGRATION_GUIDE.TXT)
+See [MIGRATION_GUIDE.TXT](https://github.com/OSGeo/gdal/blob/release/3.10/MIGRATION_GUIDE.TXT)
 
-## Changes in installed files
+## Build
 
-* data/MM_m_idofic.csv: new
-* data/gdalvrtti.xsd: new
-* data/pci_datum.txt and data/pci_ellips.txt: updated (#8034)
-* include/cpl_minizip_ioapi.h, cpl_minizip_unzip.h, cpl_minizip_zip.h:
-  removed. They use since 3.5 an header that is not installed, so were unusable
+* add html, man, latexpdf, doxygen, doxygen_check_warnings, clean_doc targets
+  (require doc/ subdirectory to be re-added) (#5484)
+* Java and CSharp bindings: do not build sample/tests programs if
+  BUILD_TESTING=OFF (#9857)
+* Allow following drivers to be built in new -DSTANDALONE=ON mode: MrSID,
+  JP2KAK, OCI, Arrow, Parquet, JP2OPENJPEG, TileDB, ECW, GeoRaster
+* Internal zlib: update to 1.3.1
+* Internal libpng: update to 1.6.43
+* Add scripts/check_binaries.py to detect unknown binaries and run it in CI
 
-## GDAL 3.9.0 - Overview of Changes
+## General changes
 
-### Port
+* Reduce excessive precision %.18g to %.17g
+* Replace MIT license long text with 'SPDX-License-Identifier: MIT' (#10903)
 
-* /vsicurl: add ANYSAFE & BEARER to auth methods (#8683)
-* /vsicurl/: re-emit HTTP error code next times we try opening a resource that
-  failed the first time (#8922)
-* /vsicurl/: add a VSICURL_PC_URL_SIGNING path-specific option to enable
-  Planetary Computer URL signing only on some URLs
-* /vsicurl/: Read(): emit error message when receiving HTTP 416 Range Not
-  Satisfiable error
-* Add VSIVirtualHandle::GetAdviseReadTotalBytesLimit()
-* cpl_http: retry "Connection reset by peer"
-* Add a VSICURLMultiCleanup() that runs with SIGPIPE ignored (#9677)
-* /vsiaz/: fix RmdirRecursive() on an empty directory with just the
-  .gdal_marker_for_dir special marker file
-* /vsis3/: include region to build s3.{region}.amazonaws.com host name (#9449)
-* /vsigs/: fix RmdirRecursive() on an empty directory
-* /vsigs/ UnlinkBatch(): make sure that path config options are checked for the
-  deleted files and not '/vsigs/batch/
-* /vsiaz/ UnlinkBatch(): make sure that path config options are checked for the deleted files
-* Add VSIVirtualHandle::Printf()
-* Add VSIRemovePluginHandler() to enable removal of virtual filesystems (#8772)
-* No longer alias CPLMutex, CPLCond and CPLJoinableThread to void in non-DEBUG
-  builds (ABI change)
-* Win32 extended filenames (starting with "\\?\"): various fixes; add support
-  for network UNC paths
-* Add VSIGetDirectorySeparator() to return the directory separator for the
-  specified path
-* Add CPLXMLNodeGetRAMUsageEstimate()
-* CPLCreateOrAcquireMutexEx(): fix warning about lock-order inversion (#1108)
-* Win32 Stat(VSI_STAT_EXISTS_FLAG): improve performance (#3139)
-* Add CPLDebugProgress() to display a debugging message indicating a progression
-* CSLConstList/CPLStringList: add iterating facilities and better
-  ``std::vector<std::string>`` operability
-* Add CPLStringList::front(), back() and clear()
-* Add CPLStrtodM()
-* CPLStrtod(): set errno=0 when no value has been parsed to conform to POSIX
-* Add CPLUTF8ForceToASCII()
-* VSICACHE: avoid EOF read (#9669)
+## GDAL 3.10.0
 
-### Core
+### Port
 
-* GDALRATValuesIOAsString(): fix wrong type for papszStrList argument
-* Add GDALDataset::DropCache() (#8938)
-* Add GDALDataset::UnMarkSuppressOnClose() and IsMarkSuppressOnClose() (#8980)
-* Add GDALGetOutputDriversForDatasetName()
-* Modify the logic of selection of overviews for non-nearest resampling; add a
-  GDAL_OVERVIEW_OVERSAMPLING_THRESHOLD config option (#9040)
-* GDALMDArray::AsClassicDataset(): make it possible to use overviews
-* GDALOpen(): change error message when a dataset isn't recognized (#9009)
-* GDALDeserializeGCPListFromXML(): validate value of GCP Pixel,Line,X,Y,Z
-  attributes
-* PAM: only unset GPF_DIRTY flag
-* GDALGetCacheMax64(): fix warning about lock-order inversion (#1837)
-* Add gdal::GCP class
-* QuietDeleteForCreateCopy(): forward source dataset open options (#9422)
+* Add VSIMemGenerateHiddenFilename() and use it extensively in whole code base
+* Add VSICopyFileRestartable() to allow restart of upload of large files
+* Add VSIMultipartUploadXXXXX() functions for multi-part upload
+* VSICopyFile(): detect error when reading source file, and delete output file
+  on error
+* VSI CopyFile() implementations: make them actually robust to pszSource==nullptr
+* VSIMallocAligned(): make behavior more predictable when nSize == 0
+* CPLHTTPFetch(): add a RETRY_CODES option (GDAL_HTTP_RETRY_CODES config option)
+  (#9441)
+* /vsicurl/: honor 'Cache-Control: no-cache' header
+* /vsicurl/: no longer forward Authorization header when doing redirection to
+  other hosts.
+* /vsiaz/: add BLOB_TYPE=BLOCK and CHUNK_SIZE options to VSIFOpenEx2L()
+* /vsis3/: avoid emitting a CPLError() when bSetError=false and access=r+b
+* /vsigs/: make sure access token with GOOGLE_APPLICATION_FILE in authorized_user
+  mode is cached
+* /vsimem/: make Read() error for a file not opened with read permissions
+* /vsimem/: more efficient SetLength()
+* /vsicrypt/: if opening in write-only mode, do so on the underlying file as well
+* /vsigzip/: sanitize Eof() detection
+* /vsigzip/: Read(): detect attempts to read more than 4 GB at once
+* Add VSIFErrorL() and VSIFClearErrL(), and implement them in file systems
+* VSIVirtualHandle: add a Interrupt() method and implement in in /vsicurl/ (and
+  related filesystems)
+* VSIWin32Handle: Read(): handle cleanly nSize * nCount > UINT32_MAX
+* Add VSIToCPLErrorWithMsg()
+* CPLHTTPFetch(): Add support for GDAL_HTTP_VERSION=2PRIOR_KNOWLEDGE
+* Add a cpl::contains(container, value) helper
+* CPLFormFilename()/CPLGetDirname()/CPLGetPath(): make it work with
+  'vsicurl/http://example.com?foo' type of filename, to fix Zarr driver
+* Thread pool: Use std::function as pool job and job queue function (#10505, #10628)
+* CPLHTTPGetOptionsFromEnv(): fallback to non-streaming filename with no path
+  specific option has been found on the streaming one
+* CPLSpawn() (unix): correctly return the exit() code of the process
+* CPLRecode(): make ISO-8859-2 and -15 and CP437/CP1250/CP1251/CP1252 to UTF-8
+  always available
 
-### Multidimensional API
+### Core
 
-* Add GDALCreateRasterAttributeTableFromMDArrays() to return a virtual Raster
-  Attribute Table from several GDALMDArray's
-* fix wrong DataAxisToSRSAxisMapping
-* GDALMDArray::AsClassicDataset(): make it possible to use overviews
+* Add new GCI_ constants in particular for infra-red and SAR, and standardize
+  a band-level IMAGERY metadata domain with "CENTRAL_WAVELENGTH_UM" and "FWHM_UM"
+* Add GDALRasterBand::InterpolateAtPoint() and GDALRasterInterpolateAtPoint()
+* GDALRasterBand: add convenience ReadRaster() methods accepting std::vector<>
+* GDALIdentifyDriverEx(): pass nIdentifyFlags to GDALOpenInfo, so that drivers
+  can see which type of dataset is asked for
+* GDALIdentifyDriverEx(): transmit papszAllowedDrivers to Identify()
+* Deprecate GDALDestroyDriverManager() and OGRCleanupAll()
+* GDALNoDataMaskBand::IRasterIO(): speed optimization
+* Fix GDALDataTypeUnion() to check that the provided value fits into eDT
+* Add GDALIsValueExactAs()
+* GDALFindDataTypeForValue(): fix for integer values that can't be represented
+  as UInt64
+* GDALDataset::RasterIO() / GDALDatasetRasterIO[Ex](): accept a const int*
+  panBandList, instead of a int*
+* Make GDALDataset::IRasterIO() implementations ready to switch to use
+  const int* panBandList (enabled only if -DDGDAL_BANDMAP_TYPE_CONST_SAFE)
+* Add GDALOpenInfo::IsSingleAllowedDriver()
+* GDALDriver::QuietDeleteForCreateCopy(): do not set error state when attempting
+  to open datasets
+* Rasterband methods (histogram, statistics): make them compatible of a dataset
+  with more than 2 billion blocks
+* gdal_priv_templates.hpp: implement GDALIsValueInRange<[u]int64_t]>, and add GDALIsValueExactAs<>
+* GDALMDArray::GetResampled(): take into account good_wavelengths array for EMIT
+  dataset orthorectification
+* EXIF reader: strip trailing space/nul character in ASCII tags
+* GDALDatasetCopyWholeRaster(): fix SKIP_HOLES=YES in the interleaved case that
+  failed to detect holes
+* GDALDriver::DefaultCreateCopy(): recognize SKIP_HOLES=YES option and forward
+  it to GDALDatasetCopyWholeRaster()
+* Multidimensional API: add GDALMDArray::GetMeshGrid()
+* Multidim: AsClassicDataset(): make it able to retrieve dataset metadata from PAM
+* JSON TileMatrixSet parser: accept crs.uri and crs.wkt encodings (#10989)
 
 ### Algorithms
 
-* Implement basic Line-of-sight algorithm (#9506, #9050)
-* Warper: fix artifacts when reprojecting from long/lat to ortho (#9056)
-* GDALSuggestedWarpOutput2(): ortho->long/lat: limit extent to
-  [lon_0-90,lon_0+90] even when poles are included
-* Warper: limit artifacts when doing ortho->long/lat (provided that srcNodata is
-  set)
-* GDALSuggestWarpOutput(): make it return original potential non-square pixel
-  shape for a south-up oriented dataset (#9336)
-* Warper: add a EXCLUDED_VALUES warping option to specify pixel values to be
-  ignored as contributing source pixels during average resampling. And
-  similarly, add a NODATA_VALUES_PCT_THRESHOLD warping option for nodata/
-  transparent pixels.
-* GDALFillNodata(): add a INTERPOLATION=NEAREST option
-* GDALChecksumImage(): read by multiple of blocks for floating-point bands to
-  improve performance
+* Polygonize: optimizations to reduce runtime
+* Polygonize: make it catch out of memory situations
+* GDALRasterizeGeometries(): various robustness fixes
+* GDALPansharpenOperation::PansharpenResampleJobThreadFunc(): make it more robust
+* Contour: include minimum raster value as contour line when it exactly matches
+  the first level (#10167)
+* GDALWarpResolveWorkingDataType(): ignore srcNoDataValue if it doesn't fit into
+  the data type of the source band
+* Warper: make sure to check that angular unit is degree for heuristics related
+  to geographic CRS (#10975)
 
 ### Utilities
 
-* Add GDALArgumentParser class to extend p-ranav/argparse framework
-* Use GDALArgumentParser for: gdaladdo, gdalinfo, gdal_translate, gdalwarp,
-  gdal_grid, gdal_viewshed, gdalbuildvrt, nearblack, ogrinfo, ogr2ogr, sozip
-* Add support for ``--config <key>=<value>`` syntax
-* gdaladdo: reuse previous resampling method (from GTiff RESAMPLING metadata
-  item) if not specifying -r and overview levels if not specifying them
-* gdaladdo: make --partial-refresh-from-source-timestamp work on GTI datasets
-* gdal_contour: fix lowest min value in polygonize mode (#9710)
-* gdalbuildvrt: add a -nodata_max_mask_threshold option
-* gdal_create: copy GCPs present in the input file
-* gdal_edit: add -a_coord_epoch option
-* gdal_footprint: fix -split_polys and -convex_hull to not consume the argument
-  specified just after them
-* gdal_footprint: write source dataset path in a 'location' field (#8795)
-* gdal_grid: error out on in invalid layer name, SQL statement or failed where
-  condition (#9406)
-* gdallocationinfo: make it output extra content at end of input line, and
-  add -E echo mode, and -field_sep option (#9411)
-* gdalmdimtranslate: add -arrayoptions
-* gdalinfo: do not call GDALGetFileList() if -nofl is specified (#9243)
-* gdal_translate: add -dmo option, for domain-metadata items (#8935)
-* gdal_translate -expand rgb[a]: automatically select Byte output data type if
-  not specified and color table compatible of it (#9402)
-* gdaltransform: make it output extra content at end of input line, and add
-  -E echo mode, and -field_sep option (#9411)
-* gdalmanage: make --utility_version work
-* gdal_polygonize.py: handle error if creation of destination fails
-* gdal_viewshed: add support for south-up source datasets (#9432)
-* gdalwarp: progress bar tunings
-* gdalwarp: emit error message when transformation isn't inversible (#9149)
-* gdalwarp: fix performance issue when warping to COG (#9416)
-* gdalwarp: make target resolution independent from source extent when -te is
-  specified (#9573)
-* allow passing a WKT geometry as -cutline value, and add -cutline_srs (#7658)
-* sozip: support generic command line options
-* --formats option: append list of extensions (#8958)
-* Make gdaltindex a C callable function: GDALTileIndex()
-* gdaltindex: add -overwrite, -vrtti_filename, -tr, -te, -ot, -bandcount,
-  -nodata, -colorinterp, -mask, -mo, -recursive, -filename_filter,
-  -min_pixel_size, -max_pixel_size, -fetch_md, -lco options
-* gdal2tiles: added support for JPEG output
-* gdal2tiles: Fix case where --exclude still writes fully transparent tiles
-  (#9532)
-* gdal2tiles: add --excluded-values, --excluded-values-pct-threshold and
-  --nodata-values-pct-threshold options
-* gdal2tiles: support an input dataset name not being a file (#9808)
-* gdal2xyz: Change -srcwin parameter type to integer.
-* Python sample scripts: add gdalbuildvrtofvrt.py (#9451)
-* Python utilities: do not display full traceback on OpenDS failures (#9534)
-* gdalinfo: suggest trying ogrinfo if appropriate, and vice-versa
-* gdalinfo and ogrinfo -json: add newline character at end of JSON output
+* gdalinfo: add -nonodata and -nomask options
+* gdalinfo/ogrinfo: make --formats -json work (#10878)
+* gdal_translate: use GDALIsValueExactAs<> to check range of [u]int64 nodata
+* gdal_viewshed: multi-threaded optimization (#9991)
+* gdal_viewshed: support observers to left, right, above and below of input
+  raster (#10264, #10352)
+* gdal_viewshed: address potential issues with line-based interpolation (#10237)
+* gdal_viewshed: add support for cumulative viewshed (#10674)
+* gdal_contour: allow to use -fl with -i and -e (#10172)
+* gdal_contour: add a -gt option to define the transaction flush interval
+ (default it to 100,000) (#10729)
+* gdallocationinfo: add -r resampling switch
+* gdalwarp: allow specifying units of warp memory (#10976)
+* Use GDALArgumentParser for gdal_contour, gdallocationinfo, gdaltindex,
+  ogrtindex, gdal_footprint, gdal_create, gdalmdiminfo, gdalmdimtranslate,
+  gdaldem, gdalmanage, ogrlineref, gdal_rasterize
+* GDALArgumentParser: support sub-parser
+* --formats option: detail abbreviation codes
+* crs2crs2grid.py: Update to work with current data output format from HTDP (#2655)
 
 ### Raster drivers
 
-Updates affecting multiple drivers:
- * All drivers depending on external libraries that can be built as plugins
-   have been updated to implement RFC 96 deferred plugin loading
- * Drivers that can now be built as plugins if using external libraries and
-   not vendored/internal libraries: GIF, JPEG, MRF, NITF, RAW drivers (as a
-   single plugin), PDS related drivers (as a single plugin)
- * do not export GMLJP2 if the SRS isn't compatible (#9223): JP2KAK, JP2ECW,
-   JP2Lura, JP2OPENJPEG
+Multi-driver changes:
+ * BAG, GTI, HDF5, OGCAPI, netCDF, S102/S104/S111, STACTA, STACIT, TileDB,
+   VICAR, WMS, WMTS, XYZ:
+   relax identification checks when papszAllowedDrivers[] contains only the
+   driver name
 
-AAIGRID driver:
- * fix reading file whose first value is nan (#9666)
+Derived driver:
+ * make it optional
 
-BAG driver:
- * make sure to report a subdataset for the bathymetry coverage when we expose
-   one(s) for the georeferenced metadata
+DTED driver:
+ * added metadata items Security Control and Security Handling (#10173)
+
+EEDA/EEDAI drivers:
+ * add a VSI_PATH_FOR_AUTH open option to allow using a /vsigs/ path-specific
+   GOOGLE_APPLICATION_CREDENTIALS option
 
 GeoPackage driver:
- * support maximum level up to 29 or 30; add a ZOOM_LEVEL creation option
+ * Implement ALTER TABLE RENAME for rasters (#10201)
+ * use GDALIsValueInRange<> to avoid potential undefined behavior casts
+ * in CreateCopy() without resampling, use IGetDataCoverageStatus() on the source
+   dataset
+ * detect non-RGBA tiles fully at 0 and do not write them
+ * implement IGetDataCoverageStatus()
+
+GRIB driver:
+ * display hint to speed-up operations when using gdalinfo on a remote GRIB2
+   file with an .idx side car file
+
+GTI driver:
+ * multi-threaded IRasterIO() for non-overlapping tiles
+ * recognize STAC GeoParquet catalogs
+ * implement GetDataCoverageStatus()
+ * emit warning if bounding box from the tile's feature extent in the index does
+   not match actual bounding box of tile
 
 GTiff driver:
+ * fix nMaxBits computation for Float32/Float64
+ * DiscardLsb(): use GDALIsValueExactAs<> to check range of nodata
+ * handle TIFF color map that uses a 256 multiplication factor and add open
+   option COLOR_TABLE_MULTIPLIER
+ * clearer error when attempting to create external JPEG compressed overviews on
+   dataset with color table
+ * honor GDAL_DISABLE_READDIR_ON_OPEN when working on a dataset opened with
+   OVERVIEW_LEVEL open option
+ * better error messages when trying to create too-large untiled JPEG/WEBP
+   compressed files (or with huge tiles)
+ * when reading a unrecognized value of color interpretation in the GDAL_METADATA,
+   expose it in a COLOR_INTERPRETATION metadata item
+ * use main dataset GetSiblingFiles() for overviews
+ * SRS writer: do not use EPSG:4326 if angular unit is not degree
+ * make driver optional (but must be explicitly disabled)
  * Internal libtiff: resync with upstream
- * Use (future) libtiff 4.6.1 TIFFOpenOptionsSetMaxSingleMemAlloc()
- * add JXL_LOSSLESS_OVERVIEW, JXL_EFFORT_OVERVIEW, JXL_DISTANCE_OVERVIEW and
-   JXL_ALPHA_DISTANCE_OVERVIEW configuration options (#8973)
- * overviews: generalize saving resampling method in a RESAMPLING metadata item
- * friendlier error message when attempting to create JXL compressed file with
-   unsupported type/bits_per_sample
- * deal with issues with multi-band PlanarConfig=Contig, LERC and NaN values
-   (#9530)
- * make BuildOverviews() in update mode work when there is an external .msk file
- * no longer condition CreateInternalMaskOverviews() behavior to
-   GDAL_TIFF_INTERNAL_MASK being unset or set to YES
- * change default value of GDAL_TIFF_INTERNAL_MASK config option to YES
- * multi-threaded decoding: fix potential mutex deadlock
- * MultiThreadedRead(): make it take into account AdviseRead() limit to reduce
-   the number of I/O requests (#9682)
 
-HDF5 driver:
- * multidim: fix crash on reading compound data type with fixed-length strings
- * multidim: implement GDALMDArray::GetBlockSize() and GetStructuralInfo()
- * improve performance of band IRasterIO() on hyperspectral products
- * support HDF5EOS metadata where the GROUP=GridStructure has an empty sub
-   GROUP=Dimension (like for AMSR-E/AMSR2 Unified L3 Daily 12.5 km)
- * implement GetOffset() and GetScale() for netCDF metadata items add_offset
-   and scale_factor
+HEIF driver:
+ * correctly initialize PAM for multiple images per file
+ * make simple identification more robust (#10618)
+ * make it possibly accept AVIF files (depends on libheif capabilities)
 
-JP2KAK driver:
- * make result of RasterIO() consistent depending if it is called directly or
-   through VRT, with non-nearest upsampling (#8911)
- * refactor how overviews work
+HFA driver:
+ * SRS reading: strip TOWGS84 when datum name is known, and use FindBestMatch()
+   to try to find known SRS (#10129)
+ * make driver optional and buildable as a plugin
 
-JP2OpenJPEG driver:
- * CreateCopy(): limit number of resolutions taking into account minimum block
-   width/height
+HTTP driver:
+ * make parsing of Content-Disposition header aware of double quotes around
+   filename=
+
+ISIS3 driver:
+ * Create(): open file(s) in wb+ mode if possible
+
+ISG driver:
+ *  Parse dms in ISG format
+
+JP2ECW driver:
+ * report JPEG2000 tile size as GDAL block size for ECW SDK >= 5.1
+   (up to 2048x2048 and dataset dimensions)
+
+JP2KAK driver:
+ * add Cycc=yes/no creation option to set YCbCr/YUV color space and set it to
+   YES by default (#10623)
 
 JPEG driver:
- * ReadXMPMetadata(): only stop looking for XMP marker at Start Of Scan
- * ReadFLIRMetadata(): stop on Start-Of-Scan marker (speeds up opening large
-   remote JPEG files)
- * CreateCopy(): emit warning/error message before progress bar (#9441)
+ * make sure not to expose DNG_UniqueCameraModel/DNG_CameraSerialNumber if the
+   corresponding EXIF tags are set at the same value
+ * add support for reading Pix4DMapper CRS from XMP
+
+KMLSuperOverlay driver:
+ * recognize <GroundOverlay> with <gx:LatLonQuad> forming a rectangle (#10629)
+
+MEM driver:
+ * disable opening a dataset with MEM::: syntax by default (unless
+   GDAL_MEM_ENABLE_OPEN build or config option is set)
 
 MRF driver:
- * BuildOverviews: bail out when no overviews are needed
- * emit warning when attempting to clean internal overviews (#9145)
- * Use ZSTD streaming API for compression: faster and better compression (#9230)
+ * (~twice) faster LERC V1 encoding (#10188)
+ * Add 64bit int support (#10265)
+ * Allow open of MRF-in-TAR as MRF (#10331)
+ * MRF/LERC: check that values are within target type range before casting
+ * enable QB3_FTL mode when available (#10753)
 
 netCDF driver:
- * use the SRS (its geographic part) if found in the file, instead of the
-   hardcoded WGS84 string, for the GEOLOCATION.SRS metadata item (#9526)
- * Add BAND_NAMES creation option
- * fix writing of metadata items whose value has an equal sign ["9702)
+ * multidim: add OpenMDArray() options to set up nc_set_var_chunk_cache()
+ * use GDALIsValueExactAs<> to check range of [u]int64 nodata
+ * do not override GDALPamDataset::TrySaveXML() to allow proper mixing of
+   classic and multidim PAM metadata
+ * make sure CreateMetadataFromOtherVars() doesn't set PAM dirty flag
+ * simplify identification logic by just checking runtime availability of
+   HDF4/HDF5 drivers.
+ * CreateCopy(): fix taking into account NETCDF_DIM_EXTRA when source dataset is
+   not georeferenced
+ * do not emit error when longitude axis unit is degrees_east and latitude axis
+   unit is degrees_north (#11009)
 
 NITF driver:
- * in xml:DES metadata domain field, expand content of XML_DATA_CONTENT DES as
-   XML in a <xml_content> sub-node of >field name=DESDATA> instead as a Base64
-   value
- * fix undefined behavior when using NITFGetField() several times in the same
-   statement
+ * Create()/CreateCopy(): make sure that provided ABPP creation option is zero
+   left-padded
+ * add an alias of existing ABPP creation option as NBITS; propagate NBITS/ABPP
+   creation option to JPEG2000 drivers (#10442)
+ * remove ABPP field as NBITS IMAGE_STRUCTURE metadata item, instead of NBPP
+ * CreateCopy(): support Blue,Green,Red[,other] color interpretation ordering
+   (#10508)
+ * when built as plugin, make sure to register the RPFTOC and ECRGTOC drivers too
 
 OGCAPI driver:
- * OGCAPI Maps: support image formats beyond PNG/JPG as well as enables content
-   negotiation. (#9231, #9420)
+ * combine CURL error message and data payload (when it exists) to form error
+   message
+
+OpenFileGDB driver:
+ * Identify: if nOpenFlags == GDAL_OF_RASTER, and the dataset is local, check
+   file extensions to better identify
+ * use GDALIsValueInRange<> to avoid potential undefined behavior casts
 
 PDF driver:
- * correctly initialize PAM when opening a subdataset (specific page e.g.)
- * PDFium backend: update to support (and require) PDFium/6309
- * deal with the situation where a multipage PDF has layers with same name but
-   specific to some page(s)
- * Fix build with Poppler 24.05
+ * PDFium backend: update to PDFium 6677
+
+PDS4 driver:
+ * Create(): open file(s) in wb+ mode if possible
+ * flip image along horizontal axis when horizontal_display_direction = Right
+   to Left (#10429)
 
 S102 driver:
- * add support for spatial metadata of the QualityOfSurvey group
- * read nodata value from dataset metadata
+ * GDALPamDataset::XMLInit(): preserve DerivedDataset nodes that affect S102
+   PAM saving
+ * add (limited) support for IHO S102 v3.0 specification (#10779)
 
-Sentinel2 driver:
- * include 10m AOT and WVP bands in 10m subdataset (#9066)
+SAFE (Sentinel1):
+ * report a FOOTPRINT metadata item
+ * report failure to opening a band dataset as a warning
+
+STACIT driver:
+ * correctly return the STACIT driver as the dataset's driver, instead of VRT
+ * support top-level Feature in addition to FeatureCollection
+
+SRTMHGT driver:
+ * add support for reading/wrinting 0.5 deg resolution datasets (#10514)
 
 TileDB driver:
- * Remove use of deprecated API, and bump minimum version to 2.15
- * Added tiledb metadata fields to easily tag array type
- * be able to read datasets converted with 'tiledb-cf netcdf-convert'
- * make its identify() method more restrictive by not identifying /vsi file
-   systems it doesn't handle
- * multidim: prevent infinite recursion when opening an array in a group where
-   there are 2 or more 2D+ arrays
- * multidim: OpenMDArray(): fix opening an array, member of a group, which has
-   no explicit name
+ * implement GetNoDataValue()/SetNoDataValue()
+ * implement BuildOverviews() (for dataset created with CREATE_GROUP=YES)
+ * Default to CREATE_GROUP=YES when creating datasets
+ * allow to potentially read/write more than 2GB at once
+ * IRasterIO(): fix checks related to pixel/line/band spacing for optimized code paths
+ * CopySubDatasets(): support very large number of blocks and very large block size
+ * CreateCopy(): return nullptr in error cases
+ * CreateCopy(): do not force returned dataset to be in read-only mode
+ * IRasterIO(): avoid reading out-of-raster with TILEDB_ATTRIBUTE creation option,
+   when the block size is not a multiple of the raster size
+
+VICAR driver:
+ * handle VICAR header being located beyond 2 GB within PDS3 file
 
 VRT driver:
- * add a VRTProcessedDataset new mode to apply chained processing steps that
-   apply to several bands at the same time. Currently available algorithms:
-   LocalScaleOffset (for dehazing), BandAffineCombination, Trimming, LUT
- * vrt:// connection: add a_nodata, sd_name, sd options
- * add a NoDataFromMaskSource source: replaces the value of the source with
-   the value of the NODATA child element when the value of the mask band of
-   the source is less or equal to the MaskValueThreshold child element.
- * VRT serialization: emit a warning if RAM usage of XML serialization reaches
-   80% of RAM (#9212)
- * VRTWarpedDataset: add an optimized IRasterIO() implementation
+ * multi-thread IRasterIO() in 'simple' situations
+ * reduce mutex contention, particularly useful for multithreading of remote
+   sources
+ * GetDataCoverageStatus(): implement special case on a single source covering
+   the whole dataset
+ * GDALAutoCreateWarpedVRT(): ignore src nodata value if it cannot be represented
+   in the source band data type
+ * VRTComplexSource::RasterIO(): speed-up pixel copy in more cases
+ * Warped VRT: instantiate overview bands in a lazy fashion for faster execution
+ * VRTWarpedDataset::IRasterIO(): avoid a memory allocation and pixel copy when
+   possible
+ * VRTWarpedDataset::IRasterIO(): optimize I/O when requesting whole image at a
+   resolution that doesn't match an overview
+ * allow it to be partially disabled if GDAL built with GDAL_ENABLE_VRT_DRIVER=OFF
+ * use GDAL_OF_VERBOSE_ERROR flag in vrt:// and pansharpened modes
 
-WMS driver:
- * change logic to set gdalwmscache directory to honor in particular
-   XDG_CACHE_HOME (#8987)
- * Use GDAL_HTTP_TIMEOUT
+WMTS driver:
+ * when reading a WMTS capabilities file, use in priority Operation.GetCapabilities.DCP.HTTP
+   to retrieve the URL (#10732)
+ * try to be robust to servers using CRS instead of SRS in 1.1.1 mode (#10922)
 
-Zarr driver:
- * Add capability to read CRS from CF1 conventions
+XYZ driver:
+ * add COLUMN_ORDER open option
 
-ZMap driver:
- * support reading variant of format where there is no newline character at
-   end of column
+Zarr driver:
+ * Allow int64 attributes (#10065)
+ * SerializeNumericNoData(): use CPLJSonObject::Add(uint64_t) to avoid potential
+   undefined behavior casts
 
-## OGR 3.9.0 - Overview of Changes
+## OGR 3.10.0
 
 ### Core
 
-* OGRSQL: Support SELECT * EXCLUDE(...)
-* OGRSQL: add UTF-8 support for LIKE/ILIKE (for layers declaring
-  OLCStringsAsUTF8) (#8835)
-* Add OGRLayer::GetExtent3D() (#8806)
-* OGRLayer: Have CreateField/CreateGeomField take const OGRFieldDefn
-  /OGRGeomFieldDefn* argument (#8741)
-* OGRFeatureDefn, OGRFieldDefn, OGRGeomFieldDefn: add Seal() and Unseal()
-  methods
-* Fix swq_select::Unparse()
-* ExecuteSQL(): add a warning if the dialect name isn't recognized (#8843)
-* ExecuteSQL() with OGRSQL and SQLITE dialects: get OLCStringsAsUTF8 from
-  underlying layer (#9648)
-* ExecuteSQL() OGRSQL and SQLITE dialects: error out if SetSpatialFilter() fails
-  (#9623)
-* OGRGeometryFactory::forceTo(): make it honour dimensionality of eTargetType
-  (in particular fix POLYGON -> LINESTRING or POLYGON -> LINESTRINGZ) (#9080)
-* OGRGeometryCollection::importFromWkb(): fix reading corrupted wkb with mixed
-  2D and 3D geoms (#9236)
-* RFC99: Add C++ OGRGeomCoordinatePrecision class and corresponding C / SWIG API
-* Change prototype of GDALDataset::ICreateLayer() to take a
-  ``const OGRGeomCoordinatePrecision*``
-* Add OGRGeometry::SetPrecision() / OGR_G_SetPrecision(), as wrapper of
-  GEOSGeom_setPrecision_r()
-* Add a OGRGeometry::roundCoordinates() method
-* OGRFeature: add SerializeToBinary() / DeserializeFromBinary()
-* OGRFeature::SetField(): add warnings when detecting some lossy conversions (#9792)
-* Add OGR_G_GeodesicArea() / OGRSurface::get_GeodesicArea()
-* SQLite SQL dialect: implement ST_Area(geom, use_ellipsoid)
-* Add OGR_L_GetDataset() and implement GetDataset() in all drivers with creation
-  support
-* Arrow array: fix decoding of ``date32[days]`` values before Epoch
- (Arrow->OGRFeature), and fix rounding when encoding such values
- (OGRFeature->Arrow) (#9636)
-* OGRLayer::WriteArrowBatch(): add tolerance for field type mismatches if int32/int64/real;
-  Also add an option IF_FIELD_NOT_PRESERVED=ERROR to error out when lossy conversion occurs. (#9792)
-* OGRLayer::SetIgnoredFields(): make it take a CSLConstList argument instead of
-  const char*
+* OGRSQL and SQLite dialect: add STDDEV_POP() and STDDEV_SAMP() aggregate functions
+* SQL SQLite dialect: fix translation of "x IN (NULL)" with "recent"
+  (at least > 3.31.1) versions of SQLite3
+* OGRSQL: fix compliance of NOT and IN operators regarding NULL values
+* OGRSQL: add SELECT expression [AS] OGR_STYLE HIDDEN to be able to specify
+  feature style string without generating a visible column (#10259)
+* OGRSQL: use Kahan-Babuska-Neumaier algorithm for accurate SUM()
+* OGRSQL: avoid going through string serialization for MIN(), MAX(), SUM(),
+  AVG() on numeric fields
+* OGRSQL: do not query geometry column(s) when not needed
+* SQLite SQL dialect: add MEDIAN, PERCENTILE, PERCENTILE_CONT and MODE
+  ordered-set aggregate functions
+* SQLite/GPKG: extend gdal_get_pixel_value()/gdal_get_layer_pixel_value()
+  to support an interpolation method
+* SQLite/GPKG: Add ST_Length(geom, use_ellipsoid)
+* GetNextArrowArray() generic implementation: avoid calling
+  VSI_MALLOC_ALIGNED_AUTO_VERBOSE() with a zero size
+* OGRFeature: optimizations while accessing field count
+* OGRFeature: SetXXX() methods: more informative warning messages reporting
+  field name and value for out-of-range values
+* Add OGRGeometry::BufferEx() method
+* Add OGRGeometry::hasEmptyParts()/removeEmptyParts()
+* Add OGRCurve::reversePoints(), and deprecated OGRLinearRing::reverseWindingOrder()
+* Add OGRGeometryCollection::stealGeometry()
+* Add OGR_G_GeodesicLength() and OGRCurve/OGRSurface/OGRGeometryCollection::get_GeodesicLength()
+* make OGR_G_GetLength() work on surfaces, suming the length of their
+  exterior and interior rings.
+* OGR geometry classes: add a bool return type for methods that can fail
+* OGR geometry classes: mark default constructors directly in .h and removed
+  useless overridden destructor for better code generation
+* MakeValid(METHOD=STRUCTURE): make sure to return a MULTIPOLYGON if input is
+  MULTIPOLYGON (#10819)
+* GML geometry reader: add support for gml:OrientableCurve (#10301)
+* GenSQL layer: implement OLCFastGetArrowStream when underlying layer does and
+  for very simple SQL statements
+* WKT geometry importer: accept (non conformant) PointZ/PointZM without space as
+  generated by current QGIS versions
+* OGRLineString::SetPoint(): avoid int overflow if passing iPoint = INT_MAX
+* OGRCurveCollection::addCurveDirectly(): avoid int overflow if adding to a
+  already huge collection
+* OGRGeometryCollection::addGeometryDirectly(): avoid int overflow if adding to
+  a already huge collection
+* OGRGeometryFactory::transformWithOptions(): in WRAPDATELINE=YES mode, return a
+  multi polygon if a input multi polygon has been provided (#10686)
+* OGRGeometryFactory::transformWithOptions(): deal with polar or anti-meridian
+  discontinuities when going from projected to (any) geographic CRS
+* OGRProjCT::TransformWithErrorCodes(): speed-up by avoiding OSRGetProjTLSContext()
+  when possible
+* Add OGRWKBTransform() for in-place coordinate transformation of WKB geometries
+* OGR_GreatCircle_ API: do not hardcode Earth radius
 
 ### OGRSpatialReference
 
-* Add OGRSpatialReference::exportToCF1() and importFromCF1()
-* Add OSRIsDerivedProjected() / OGRSpatialReference::IsDerivedProjected()
-* OGRCoordinateTransformation::Transform(): change nCount parameter to size_t
-  (C++ API only for now) (#9074)
-* OGRProjCT::TransformWithErrorCodes(): Improve performance of axis swapping
-  (#9073)
-* OSR_CT: fix ``SetDataAxisToSRSAxisMapping([-2, 1])``` on target SRS
-* exportToXML(): error out on unsupported projection method (#9223)
-* Add OSRSetFromUserInputEx() and map it to SWIG (#9358)
-* Add std::string OGRSpatialReference::exportToWkt(
-  const char* const* papszOptions = nullptr) const
-* OGR_CT: use PROJJSON internally rather than in WKT:2019 (#9732)
+* OGRSpatialReference::FindMatches(): improve when input SRS doesn't have
+  expected axis order
+* OGRSpatialReference::EPSGTreatsAsLatLong()/EPSGTreatsAsNorthingEasting():
+  remove the check on the EPSG authority
 
 ### Utilities
 
-* ogrinfo: add a -extent3D switch
-* ogrinfo: output coordinate resolution in -json mode
-* ogrinfo: add -limit option (#3413)
-* ogr2ogr: do not copy private layers (would for example break SQLite ->
-  SQLite/GPKG)
-* ogr2ogr: force -preserve_fid when doing GPX to GPKG (#9225)
-* ogr2ogr: propagate input coordinate precision
-* ogr2ogr: add options -xyRes, -zRes, -mRes and -unsetCoordPrecision
-* ogr2ogr: make -select tokenize only on comma (and not on space), and honour
-  double-quoting (#9613)
-* Remove ogr2ogr.py sample utilities (gdal.VectorTranslate() is a more powerful
-  replacement)
+* ogr2ogr: add -skipinvalid to skip features whose geometry is not valid w.r.t
+  Simple Features
+* ogr2ogr: error out if WKT argument of -clipsrc/-clipdst is an invalid geometry
+  (#10289)
+* ogr2ogr: speed-up -clipsrc/-clipdst by avoiding GEOS when possible
+* ogr2ogr: speed-up -t_srs in Arrow code path using multi-threaded coordinate
+  transformation
+* ogr2ogr: optim: call GetArrowStream() only once on source layer when using
+  Arrow interface
+* validate_gpkg.py: make it robust to CURRENT_TIMESTAMP instead of 'now'
 
 ### Vector drivers
 
-Updates affecting multiple drivers:
- * Drivers updated for RFC 97 feature definition sealing: GPKG, Shape,
-   OpenFileGDB, MITAB, MEM, GeoJSON, JSONFG, TopoJSON, ESRIJSON, ODS, XLSX, PG
- * Drivers updated for RFC99 geometry coordinate precision: GML, GeoJSON,
-   GeoJSONSeq, JSONFG, GPKG, CSV, OpenFileGDB, FileGDB, OGR VRT
- * All drivers depending on external libraries that can be built as plugins
-   have been updated to implement RFC 96 deferred plugin loading
- * GetExtent3D() implemented in Shapefile, Arrow, Parquet, PostgreSQL, GeoJSON,
-   GeoPackage drivers
+Multi-driver changes:
+ * Arrow, CSV, ESRIJSON, JSONFG, GeoJSON, GeoJSONSeq, GML, GTFS, LVBAG, NAS,
+   OAPIF, TopoJSON:
+   relax identificationchecks when papszAllowedDrivers[] contains only the
+   driver name
+ * GeoJSON like driver: avoid fetching unrecognized HTTP dataset more than once
 
-OGR SQLite/SQLite/GPKG: add UTF-8 support for case-insensitive LIKE (#8835)
+Arrow ecosystem:
+ * Arrow/Parquet/generic arrow: add write support for arrow.json extension
+ * Add a Arrow VSI file system (for libarrow >= 16.0) allowing to use GDAL
+   VSI file systems as libarrow compatible file systems.
 
-Arrow/Parquet drivers:
- * GetArrowSchema(): potential fix when there are ignored fields and the FID
-   column is not the first one
- * Read/write support for GeoArrow (struct-based) encoding
- * silently ignore column of type null in GetArrowSchema/GetArrowArray
- * fix crash when reading geometries from a geometry column with a
-   pyarrow-registered extension type
- * handle fields with a pyarrow-registered extension type
- * preliminary/in-advance read support for future JSON Canonical Extension
- * OGRCloneArrowArray(): add missing support for 'tss:' Arrow type
+Arrow driver
+ * add read support for StringView and BinaryView (but not in OGR generic Arrow
+   code)
+ * use recommended item names for GeoArrow [multi]line, [multi]polygon, multipoint
 
 CSV driver:
- * parse header with line breaks (#9172)
+ * error out if invalid/inconsistent value for GEOMETRY layer creation option
+   (#10055)
+ * allow inf, -inf and nan as numeric values
+ * emit warning when reading invalid WKT (#10496)
 
-DGN (v7) driver:
- * emit explicit error when attempting to open a DGNv8 file and the DGNv8
-   driver is not available (#9004)
+CSW driver:
+ * make it buildable as plugin
 
-FileGDB/OpenFileGDB drivers:
- * fix co-operation between the 2 drivers to make sure .cdf is opened with
-   FileGDB
+DGN driver:
+ * add ENCODING open option and creation option (#10630)
 
-FileGDB driver:
- * remove warning 'Empty Spatial Reference'
+DXF driver:
+ * add a DXF_CLOSED_LINE_AS_POLYGON=YES/NO configuration option (#10153)
 
-FlatGeobuf driver:
- * add support for reading and writing layer title, description and metadata
- * CreateFeature(): error out if a string context is not valid UTF-8 (#7458)
+ESRIJSON driver:
+ * make it able to parse response of some CadastralSpecialServices APIs (#9996)
+ * use 'alias' field member to set OGR alternative field name
 
-GeoJSON driver:
- * OGRGeoJSONDriverIdentify: return -1 when unsure
- * writer: add FOREIGN_MEMBERS_FEATURE and FOREIGN_MEMBERS_COLLECTION layer
-   creation options
- * reader: accept a {"type": "Polygon","coordinates": []} as a representation
-   of POLYGON EMPTY
+JSONFG driver:
+ * avoid Polyhedron/Prism geometry instantiation during initial scan
 
-GeoPackage driver:
- * fixes to make most operations compatible with PRAGMA foreign_keys=1 (#9135)
- * writer: set Z/M columns of gpkg_geometry_columns when there are Z/M
-   geometries in a 2D declared layer
- * Read relationships defined using foreign key constraints
- * CreateFeature(): allow creating a feature with FID=0 (#9225)
- * Add DISCARD_COORD_LSB layer creation option
- * map Null CRS to a new srs_id=99999, and add a SRID layer creation option
- * add a LAUNDER=YES/NO layer creation option (default: NO)
- * fix random error in threaded RTree creation, particularly on Mac M1 ARM64
+GeoJSON driver:
+ * make it (and companion TopoJSON, ESRIJSON, GeoJSONSeq) optional (but must be
+   explicitly disabled) and buildable as plugin
+ * avoid false-positive identification as TopoJSON
 
-GeoRaster driver:
- * Added GENSTATS options, security fixes, and prevent failing when password is
-   near expiration (#9290)
+GeoJSONSeq driver:
+ * add a WRITE_BBOX layer creation option
 
 GML driver:
- * writer: honour geometry field name and isnullable passed to ICreateLayer()
+ * XSD parser: fix to resolve schema imports using open option USE_SCHEMA_IMPORT
+   (#10500)
+ * make it buildable as plugin if NAS driver is explicitly disabled
 
-GMLAS driver:
- * faster retrieval of GML and ISO schemas by using zip archives
- * use CPLHTTPFetch() instead of /vsicurl_streaming/ to allow alternate HTTP
-   downloader (for QGIS 3.36 enhanced WFS provider)
+HANA driver:
+ * Add support for REAL_VECTOR type (#10499)
+ * Add support for fast extent estimation (#10543)
+
+KML driver:
+ * make it optional and buildable as plugin
+ * writer: generate a Placemark id
 
 LIBKML driver:
- * improve generation of internal ids for layer names starting with digits
-  (#9538)
+ * writer: validate longitude, latitude to be in range (#10483)
+ * writer: set name of NetworkLink from NAME layer creation option (#10507)
+ * writer: dump feature when its geometry cannot be written (#10829)
+ * on reading of directory KML datasets, don't consider the root doc.kml as a layer
 
-netCDF driver:
- * writer: make it more robust to empty geometries
+MapInfo driver:
+ * make it optional and buildable as plugin
+ * implement read/write support for MapInfo logical type to OGR OFSTBoolean
+ * Add UTF-8 encoding
+ * Disable table fields "laundering" for non-neutral charset
+ * Add 'STRICT_FIELDS_NAME_LAUNDERING' creation option
+ * better deal with EPSG:3301 'Estonian Coordinate System of 1997'
+
+Miramon driver:
+ * various memory leak fixes on corrupted datasets
+
+OAPIF driver:
+ * combine CURL error message and data payload (when it exists) to form error
+   message (#10653)
+ * make it buildable as plugin (independently of WFS driver)
+ * add a DATETIME open option (#10909)
+
+ODBC driver:
+ * add GDAL_DMD_LONGNAME
 
 OpenFileGDB driver:
- * add support for Integer64, Date, Time and DateTimeWithOffset data types
-   added in ArcGIS Pro 3.2 (#8862)
- * writer: set xml shape type to "esriGeometryPolyline" for LineString/
-   MultiLineString (#9033)
+ * add partial read-only support for tables with 64-bit ObjectIDs
+ * more informative warning message when opening a dataset with a .cdf file and
+   FileGDB driver isn't there
+ * error out explicitly when attempting to create an index on multiple columns
 
 OSM driver:
- * properly escape special characters with TAGS_FORMAT=JSON open option (#9673)
+ * add a \[general\] section at top of osmconf.ini to make it INI compliant (and
+   Python's configparser friendly)
+ * actually reserve memory for /vsimem/ temp files
 
 Parquet driver:
- * support reading and writing layer metadata
- * Read/write support for covering.bbox struct columns for spatial
-   filtering, add SORT_BY_BBOX=YES/NO layer creation option (GeoParquet 1.1)
- * Read/write support for GeoArrow (struct-based) encoding (GeoParquet 1.1)
- * add more configuration options for Parquet dataset case, and default to using
-   custom I/O layer (#9497)
- * ogr2ogr/Parquet: add hack to avoid super lengthy processing when using -limit
-   with a Parquet dataset source (#9497)
- * make it recognize bbox field from Overture Maps 2024-01-17-alpha.0 and
-   2024-04-16-beta.0 releases
- * fix ResetReading() implementation, when using the ParquetDataset API and
-   when there's a single batch
- * fix opening single file Parquet datasets with the ParquetDataset API when
-   using PARQUET:filename.parquet
-
-PGDUMP driver:
- * add a LAUNDER_ASCII=YES/NO (default NO) layer creation option
-
-PMTiles driver:
- * handle decompressing data with a compression ratio > 16 (#9646)
+ * dataset (multi-file typically) mode: enable use of bounding box columns
+   for spatial filter; optimize spatial filtering
+ * dataset mode: implement SetIgnoredFields() and SetAttributeFilter()
+ * dataset mode: detect bbox geometry column when opening current Overture Maps
+ * dataset mode: make sure all files are closed before closing the GDALDataset
 
 PostgreSQL driver:
- * serialize GDAL multidomain metadata of layer as XML in a
-   ogr_system_tables.metadata table
- * be robust to inexact case for schema when creating a layer
-   'schema_name.layer_name' (#9125)
- * remove support for PostgreSQL < 9 and PostGIS < 2 (#8937)
- * add a LAUNDER_ASCII=YES/NO (default NO) layer creation option
+ * OGR_PG_SKIP_CONFLICTS: optionally insert with ON CONFLICT DO NOTHING (#10156)
+ * avoid error when the original search_path is empty
 
 Shapefile driver:
- * Shapelib: resync with upstream
- * GetNextArrowArray(): add specialized implementation restricted to situations
-   where only retrieving of FID values is asked
- * make it recognize /vsizip/foo.shp.zip directories
- * add read/write support for DBF Logical field type mapped to OGR OFSTBoolean
+ * make it optional (but must be explicitly disabled) and buildable as plugin
+ * Shapelib: resync'ed with upstream
 
-VFK driver:
- * Fix solving circle parcel geometry (#8993)
+SQLite driver:
+ * run deferred table creation before StartTransaction
+ * avoid some potential O(n^2) issues with n=field_count
 
-## SWIG Language Bindings
+TileDB driver:
+ * use GEOM_WKB type when creating geometry columns with TileDB >= 2.21
 
-All bindings:
- * add osr.SpatialReference.ImportFromCF1(), ExportToCF1(), ExportToCF1Units()
- * expose Geometry.UnaryUnion()
- * expose OLCFastWriteArrowBatch
- * add gdal.IsLineOfSightVisible()
+VRT driver:
+ * OGRWarpedVRT: use faster SetFrom() implementation (#10765)
+ * UnionLayer: avoid some potential O(n^2) issues with n=field_count
 
-CSharp bindings:
- * Exposes additional Dataset methods (#918, #9398)
+WFS driver:
+ * make it buildable as plugin
 
-Java bindings:
- * bump minimum version to Java 8
+## SWIG bindings
 
-Python bindings:
- * lots of improvements to documentation
- * add a pyproject.toml with numpy as a build requirement (#8926, #8069)
- * pyproject.toml: use numpy>=2.0.0rc1 for python >=3.9 (#9751)
- * bump setuptools requirement to >= 67.0
- * define entry_points.console_scripts (#8811)
- * add RasterAttributeTable::ReadValuesIOAsString, ReadValuesIOAsInteger,
-   ReadValuesIOAsDouble, RemoveStatistics()
- * implement ``__arrow_c_stream__()`` interface for ogr.Layer
- * add a ogr.Layer.GetArrowArrayStreamInterface() method
- * add a ogr.Layer.WriteArrow() method consuming ``__arrow_c_stream__`` or
-   ``__arrow_c_array__`` interfaces (#9132)
- * Invalidate layer ref when Dataset closes
- * Accept str arg in FeatureDefn.GetFieldDefn
- * Add Band.ReadAsMaskedArray
- * Make gdal/ogr.GeneralCmdLineProcessor accept int, os.PathLike
- * Avoid crash when accessing closed file
+* Python/Java: replace sprintf() with snprintf() to avoid warnings on OSX
 
-# GDAL/OGR 3.8.0 Releases Notes
-
-GDAL/OGR 3.8.0 is a feature release.
-Those notes include changes since GDAL 3.7.0, but not already included in a
-GDAL 3.7.x bugfix release.
-
-## In a nutshell...
+### Python bindings
 
-* Add [JSONFG](https://gdal.org/drivers/vector/jsonfg.html) read/write vector
-  driver for OGC Features and Geometries JSON.
-* Add [PMTiles](https://gdal.org/drivers/vector/pmtiles.html) read/write vector
-  driver for PMTiles v3 datasets containing MVT PBF tiles
-* Add [S102](https://gdal.org/drivers/raster/s102.html) raster read-only driver
-  for S-102 bathymetric products (depends on libhdf5)
-* Add [gdal_footprint](https://gdal.org/programs/gdal_footprint.html) utility:
-  compute the footprint of a raster file, taking into account nodata/mask band,
-  and generating polygons/multipolygons corresponding to areas where pixels are
-  valid (#6264)
-* Python bindings: various enhancements to reduce the number of "gotchas"
-  related to inter-object ownership relationships, and a few syntaxic sugar
-  enhancements
-* Arrow interface: improve spatial and attribute filtering on read side;
-  add write side with OGRLayer::WriteArrowBatch()
-* GeoPackage: much faster spatial index creation (~ 3-4 times faster)
-* ARG driver deprecated: will be removed in 3.9.0
+* generate launcher shell/bat scripts for Python scripts in /swig/python/bin
+* make GetStatistics() and ComputeStatistics() return None in case of error (#10462)
+* Make ogr.DataSource a synonym of gdal.Dataset
+* Remove ogr.Driver
+* do not emit warnings about not having used UseExceptions() if run under
+  gdal.ExceptionMgr()
+* avoid gdal.ExceptionMgr() to re-throw a GDAL exception already caught under it
+* avoid exception emitted and caught under gdal.ExceptionMgr() to cause later issues
+* Python scripts: use local exception manager, instead of global UseExceptions()
+* check validity of GDALAccess flag passed to gdal.Open()
+* make MDArray.Write(array_of_strings) work with a 0-d string variable
+* Avoid linear scan in gdal_array.NumericTypeCodeToGDALTypeCode (#10694)
+* Dataset.Close(): invalidate children before closing dataset
 
-## Backward compatibility issues
+### Java bindings
 
-See [MIGRATION_GUIDE.TXT](https://github.com/OSGeo/gdal/blob/release/3.8/MIGRATION_GUIDE.TXT)
+* Make sure a valid UTF-8 string is passed to NewStringUTF()
+* OGR module: add various xxxxAsByteArray() method that return a byte[] when
+  content is not UTF-8 (#10521, #10630)
 
-## New optional dependencies
+# GDAL/OGR 3.9.3 Release Notes
 
-* libaec to enable CCSDS Adaptive Entropy Coding decompression in the GRIB driver
+GDAL 3.9.3 is a bugfix release.
 
 ## Build
 
-* emit better error message when a raster driver cannot be enabled
-  because of OGR_BUILD_OPTIONAL_DRIVERS=OFF
-* improve static linking for CURL and EXPAT
-* Java bindings: change default installation directory of JNI shared
-  library and control it with GDAL_JAVA_JNI_INSTALL_DIR
-* automatically enable SQLite driver if -DOGR_ENABLE_DRIVER_GPKG=ON
-* Don't use libjpeg if disabled (and libjpeg-turbo >= 3.0 available) (#8336)
-* gdal.pc generation: use CMAKE_INSTALL_INCLUDEDIR/CMAKE_INSTALL_LIBDIR for
-  includedir/libdir (#8012)
-* gdal-config: add a --plugindir switch (#8012)
+* Java bindings: remove unneeded dependency on Java AWT
+* Use the right header for std::endian cpl_conv.cpp (C++20 compilation)
+* Fix build failure with upstream netcdf caused by _FillValue macro renaming
 
-## GDAL 3.8.0 - Overview of Changes
+## GDAL 3.9.3
 
 ### Port
 
-* Add third_party/fast_float header library for fast string->double conversion
-  for CPLStrtodDelim()
-* /vsimem/: make it safe to use in multi-threaded scenarios
-* /vsimem/: implicitly create parent directories when creating file
-* CPLParseXML(): do not call CPLErrorReset()
-* CPLJSon: add setters for uint64_t
-* Add CPLJSONArray::AddNull() and CPLJSONObject constructor with primitive types
-* VSIUnixStdioHandle / VSIWin32Handle: make Close() be callable multiple times
-  to be friendly with VSIVirtualHandleUniquePtr
-* /vsicurl/: avoid the same region to be downloaded at the same time from
-  concurrent threads (#8041)
-* /vsicurl/ / /vsicurl_streaming/: recognize IGNORE_FILENAME_RESTRICTIONS=YES
-  open option to skip any extension based filtering (#8162)
-* /vsicurl/: emit warnings if invalid values of CPL_VSIL_CURL_CHUNK_SIZE and
-  CPL_VSIL_CURL_CACHE_SIZE are used (#8499)
-* /vsicurl_streaming/: implement retry strategy if GDAL_HTTP_MAX_RETRY is set
-* /vsis3_streaming/ and the like: implement ReadDir() by forwarding to
-  non-streaming filesystem (#8191)
-* IVSIS3LikeFSHandler::CopyFile(): retry with non-streaming source for more
-  robustness
-* /vsis3/ and /vsioss/: less error prone management of redirects / region
-  discovery
-* /vsiaz/: do not append trailing slash for directories deduced from
-  .gdal_marker_for_dir special file
-* /vsiaz/: implement server-side copy from /vsis3/, /vsigs/, /vsiadls/,
-  /vsicurl/ to /vsiaz
-* /vsiaz/: fix CopyObject() when source and target are both /vsiaz/ but in
-  different buckets
-* /vsiaz/: update to version 2020-12-06 for GetSignedURL(), limit to https and
-  use blob resource type
-* /vsi network file system: support r+ access under
-  CPL_VSIL_USE_TEMP_FILE_FOR_RANDOM_WRITE=YES by copying initial content of
-  remove file locally
-* VSISync() network to network: implement SyncStrategy::TIMESTAMP
-* Add VSIGetCanonicalFilename()
-* CPLvsnprintf(): deal with '%.*f' formatting
-* VSIFilesystemHandler: remove 'virtual' qualifier from ReadDir(), which now
-  forwards to ReadDirEx(); modify all implementations to implement ReadDirEx()
-* Add /vsicached? virtual file system, as another way of doing the same as
-  VSICreateCachedFile() / VSI_CACHE=YES
-* VSIFilesystemHandler::CopyFile(): detect wrong target file size w.r.t source
-  file size
-* /vsi7z/: Accept ArcGIS Pro Project Packages extension
-* cpl_vsil_win32: check return value of FlushFileBuffers(), and open file with
-  GENERIC_WRITE only if access=w or wb
-* cpl_vsil_win32: implement a WRITE_THROUGH=YEs option to pass to VSIFOpenEx2L()
-
-### Core
-
-* GDALIdentifyDriverEx() and GDALDriver::QuietDelete(): do not call
-  CPLErrorReset()
-* GDALDataset::Open(): take into account open options for OF_SHARED mode (#7824)
-* PAM .aux.xml: read geotransform from Esri GeodataXform.CoeffX/CoeffY elements
- (qgis/qgis#53125)
-* Add a DCAP_FLUSHCACHE_CONSISTENT_STATE capability, and fix GeoJSON, JSONFG,
-  GPKG drivers to implement it
-* Overview/RasterIO resampling: use Float64 as working data type for Float64
-  input data (#8187)
-* Add GDALRegisterPlugins function to register all/only plugins (#8447)
-* GDALDriver::DefaultCreateCopy(): in non-strict mode, turn (ignored) errors as
-  warnings and do not silence them
-* Add a GDALPamDataset::SetDerivedDatasetName() method, and use it to be able to
-  save statistics of datasets returned by GDALMDArray::AsClassicDataset()
-* Add GDALGetSubdatasetInfo() and related functions  (#8155)
-
-### Multidimensional API
-
-* add Rename() methods. Implemented in MEM, netCDF, Zarr drivers
-* add DeleteGroup(), DeleteMDArray(), DeleteAttribute()
-  methods. Implemented in MEM, netCDF (for attributes) and Zarr drivers
-* GDALDatasetFromArray: fix write/update support
-* GDALMDArrayMask: take into account attributes at construction time
-* GetMask(): add a UNMASK_FLAGS option
-* GDALMDArray::ComputeStatistics(): add option to set actual_range in netCDF
-  and Zarr when computing statistics
-* GDALMDArray::AsClassicDataset(): add a LOAD_EXTRA_DIM_METADATA_DELAY option,
-  and expose it in Zarr driver
-* GDALMDArray::AsClassicDataset(): allow to map band indexing arrays as band
-  metadata items with BAND_METADATA option
-* Add GDALGroup::SubsetDimensionFromSelection()
+* /vsitar/: fix support of /vsitar/ of /vsitar/ (#10821)
+* CPLGetValueType(): do not recognize '01' as integer, but as string
+  (Toblerity/Fiona#1454)
 
 ### Algorithms
 
-* Warp average resampling: using Weighted incremental algorithm mean for numeric
-  stability
-* Warper: auto-enable OPTIMIZE_SIZE warping option when reasonable (#7761)
-* Geoloc transformer: warn if the input dataset is larger in width or height
-  compared to the geoloc array (#7751)
-* GDALCreateGenImgProjTransformer2(): deal with discontinuity of GCPs around
-  antimeridian (#8371)
-* TPS transformer: use an iterative method to refine the inverse transformation
-  (#8572)
+* Geoloc array: fix bad usage of path API that resulted in temporary files
+  not being created where expected (#10671)
+* GDALCreateGeoLocTransformer(): fix inverted logic to decide for a debug
+  message
+* GDALCreateGeoLocTransformer(): increase threshold to use GTiff geoloc
+  working datasets to 24 megapixels (#10809)
+* GDALGeoLocDatasetAccessors: use smaller, but more, cached tiles (#10809)
+* Warper: fix too lax heuristics about antimeridian warping for Avg/Sum/Q1/
+  Q3/Mode algorithms (#10892)
 
-### Utilities
+### Core
 
-* gdaladdo: add options to partially refresh existing overviews:
-  ``--partial-refresh-from-source-timestamp,``,
-  ``--partial-refresh-from-projwin <ulx> <uly> <lrx> <lry>``,`
-  ``--partial-refresh-from-source-extent <filename1,...,filenameN>``
-* gdal_translate: emit warning when -a_scale/-a_offset + -unscale is specified
- (#7863)
-* gdal_translate: GTiff, COG, VRT, PNG and JPEG drivers recognize
-  COPY_SRC_MDD=AUTO/YES/NO and SRC_MDD=domain_name creation options
-* gdal_translate: add -a_gt option to assign geotransform (#8248)
-* gdal_translate -scale: change dstMax value from 255.999 to 255
-* gdal_translate: when specifying -srcwin, preserve source block size in the
-  temporary VRT if srcwin top,left is a multiple of the block size
-* gdalwarp: in -tr mode (without -ts / -te), detect blank edge lines/columns
-  before warping and remove them (#7905)
-* gdalwarp: fix cutline processing when warping with a cutline geometry in UTM
-  1/60 crossing the antimeridian, on a raster in long/lat SRS (#8163)
-* gdalwarp: tune usage to allow both -s_coord_epoch and -t_coord_epoch
-* gdalwarp: fix error when using -ct and -cutline (master only), and actually
-  use the -ct when possible if sourceCRS != targetCRS and targetCRS == cutlineCRS
-* gdalwarp: do not enter a specific COG optimized code path when some of its
-  preconditons are not met (#8655)
-* gdalmdiminfo: output details of indexing variables that can be accessed only
-  from the array (typically for TileDB dimension labels)
-* nearblack: add "-alg floodfill" to select a flood fill algorithm, to address
-  concave areas.
-* gdalmdimtranslate: add support for resample=yes array spec option
-* gdalbuildvrt: make -separate option process all bands of input datasets,
-  unless -b is specified (#8584)
-* gdal_polygonize: add a -overwrite switch (#7913)
-* gdal_rasterize_lib: fix error messages
-* gdaltransform: add -s_coord_epoch and -t_coord_epoch
-* gdalcompare.py: multiple enhancements and new command line options
-* gdal_pansharpen.py: avoid error trying to generate relative path
-* Add validate_geoparquet.py sample Python script
-* gdalinfo.py: use math.isnan() (#8196)
-* gdalinfo.py: fix wrong order of long,lat corner coordinates (#8199)
-* make --help and --help-general available in all utilities (#3816)
+* Fix GDALDataTypeUnion() to check that the provided value fits into eDT
+* GDALRegenerateOverviewsMultiBand(): make sure than when computing large
+  reduction factors (like > 1024) on huge rasters does not lead to excessive
+  memory requirements
+* Overview: fix nearest resampling to be exact with all data types (#10758).
+  Also make sure that for other resampling methods, the working data type
+  is large enough (e.g using Float64 for Int32/UInt32/Int64/UInt64).
+
+### Raster utilities
+
+* gdal_translate/GDALOverviewDataset: fix half-pixel shift issue when
+  rescaling RPC (#10600)
+* gdaldem color-relief: fix issues with entry at 0 and -exact_color_entry
+  mode, and other issues
+* gdalwarp: fix crash/infinite loop when using -tr one a 1x1 blank raster
+  (3.8.0 regression)
+* gdalwarp: be more robust to numerical instability when selecting overviews
+  (#10873)
+* gdal_contour: Fix regression when fixed level == raster max (#10854)
 
 ### Raster drivers
 
-AAIGRID driver:
- * writing: remove leading space on each line (#8344)
-
-ARG driver:
- * mark it deprecated, removal planned for GDAL 3.9 (#7920)
-
-BAG driver:
- * increase the efficiency of getting depth&uncertainty values from the
-   refinement grids
- * use low-resolution grid as the last overview level in MODE=RESAMPLED_GRID
- * add a MODE=INTERPOLATED mode using mostly bilinear interpolation of the
-   refinement grid nodes
-
-COG driver:
- * only update mode if the IGNORE_COG_LAYOUT_BREAK=YES open option is specified
-   (#7735)
- * add a STATISTICS=AUTO/YES/NO creation option and forward gdal_translate
-   -stats to it (#8169)
- * Lerc: add a MAX_Z_ERROR_OVERVIEW creation option to separately control the
-   error threshold of overviews w.r.t the one of the full resolution image
-
-ENVI driver:
- * warn if assigning different nodata value to different bands
- * support Int64 and UInt64
+DIMAP driver:
+ * emit verbose error message if not able to open image file (#10928)
 
-ESRIC driver:
- * Implement ESRI Tile Package (.tpkx) support (#7799)
+GeoRaster driver:
+ * Preserve quote in the connection string to the GeoRaster driver so that
+   Oracle Database wallet can be supported (#10869)
 
-GRIB driver:
- * allow opening files with invalid Earth of shape (#7811)
- * implement CCSDS Adaptive Entropy Coding decompression. Requires libaec (#8092)
- * only emit a CPLDebug() instead of a message on stdout when there are trailing
-   bytes (#8574)
- * GRIB2 SRS writing: add support for Rotated LatLong grids (fixes #8536)
+GRIB:
+ * adjust longitude range from \[180, xxx\] to \[-180, xxx\] (#10655)
 
 GTiff driver:
- * Performance improvement: avoid using block cache when writing whole blocks
-   (up to about twice faster in some scenarios)
- * GTiff multi-threaded reader: catch errors emitted in worker threads and
-   re-emit them in main thread
- * Internal libtiff: WebP codec: turn exact mode when creating lossless files
-   to avoid altering R,G,B values in areas where alpha=0 (#8038)
- * Lerc: add a MAX_Z_ERROR_OVERVIEW creation option to separately control the
-   error threshold of overviews w.r.t the one of the full resolution image
- * SRS writer: write Projected 3D built as a pseudo-compound in .aux.xml
- * Internal libtiff and libgeotiff: resynchronization with upstream
-
-HDF5 driver:
- * optimize code-paths for RasterIO() without resampling
- * multidim: speed-up very slow cases of IRead()
-
-ISG driver:
- * make it able to read headers > 1024 bytes
- * take into ISG format 2.0
+ * do not query TIFFTAG_TRANSFERFUNCTION if m_nBitsPerSample > 24 (#10875)
+ * fix to not delete DIMAP XML files when cleaning overviews on a DIMAP2
+   GeoTIFF file with external overviews
 
 JPEG driver:
- * allow QUALITY down to 1
- * redirect JPEG 'output message' to GDAL debug messages
- * only take into account first Exif directory found
+ * Fix inverted handling of GDAL_ERROR_ON_LIBJPEG_WARNING
 
-MBTiles driver:
- * Add WEBP support (#8409)
+JP2KAK driver:
+ * fix data corruption when creating multi-band tiled with the stripe
+   compressor code path (#10598)
 
-MEM driver:
- * allocate a single buffer for band-interleaved data
+KEA driver:
+ * fix overview writing
+
+MrSID driver:
+ * prevent infinite recursion in IRasterIO() in some cases (#10697)
 
 netCDF driver:
- * on reading, set NETCDF_DIM_xxx band metadata items in on-demand way (helps
-   with network accesses)
- * do not set NETCDF_DIM_xxxx_VALUES dataset metadata items for variables of
-   unlimited dimensions on network access for performance reasons
- * better error message when reading from /vsi is not possible (#8398, #8378)
- * renormalize CRS and geotransform to metric, typically for EUMETSAT OSI SAF
-   products. Add a PRESERVE_AXIS_UNIT_IN_CRS=YES/NO open option
- * add support for EMIT band data ordering and geolocation array (
-   using glt_x/glt_y for multidimensional API)
+ * honour BAND_NAMES creation option in CreateCopy() (#10646)
 
 NITF driver:
- * add support for CSCSDB (Common Sensor Covariance Support Data) DES from
-   GLAS/GFM SDEs
+ * properly take into account comma-separated list of values for JPEG2000
+   QUALITY when JPEG2000_DRIVER=JP2OpenJPEG (#10927)
+ * fix parsing of CSCSDB DES
 
 OpenFileGDB raster:
- * add support for FileGDB v9 raster datasets
- * add a RASTER_DATASET metadata item with the name of the RasterDataset (#8427)
+ * do not generate debug 'tmp.jpg' file when reading JPEG tiles
 
 PDF driver:
- * PDFium backend: update to support (and require) PDFium/5952
- * Poppler backend: implement overviews by adjusting the DPI value (#8233)
- * PoDoFo backend: add support for PoDoFo >= 0.10.0 (#8356)
- * increase threshold to detect tile size and band count (#8236, #8240)
- * Various robustness fixes
+ * avoid 'Non closed ring detected' warning when reading neatlines from OGC
+   Best Practice encoding
 
-PRF driver:
- * add associated PRJ file read
+TileDB driver:
+ * make Identify() method return false if passed object is not a directory
 
-Sentinel2 driver:
- * additional metadata (#8379)
+VRT driver:
+ * VRTSourcedRasterBand::IRasterIO(): initialize output buffer to nodata
+   value if VRT band type is Int64 or UInt64
+ * VRTComplexSource::RasterIO(): use double working data type for more
+   source or VRT data types
+ * VRTComplexSource::RasterIO(): speed-up pixel copy in more cases (#10809)
+ * VRTProcessedDataset: fix issue when computing RasterIO window on
+   auxiliary datasets on right-most/bottom-most tiles
 
-TileDB driver:
- * add read/write multidimensional support (requires libtiledb >= 2.15)
- * TileDBRasterBand::IRasterIO(): use correct band indexing
- * read/write Int8, Int64 and UInt64
- * add capability to read arbitrary (i.e. not created by GDAL) 2D/3D dense
-   array (provided it uses uint64 dimension)
- * Add support for TileDB 2.17
+## OGR 3.9.3
 
-VRT driver:
- * add `norm_diff` (#8081), `min` and `max` pixel functions (#8292)
- * ignore <OverviewList> when external .vrt.ovr is present, as documented and
-   intended
- * vrt:// connection string: add `projwin`, `projwin_srs`, `tr`, `r`,
-   `srcwin`, `a_gt`, `oo`, `scale`, `unscale`, `a_coord_epoch`, `nogcp`, `eco`,
-   `epo`
- * VRTComplexSource (scaling typically): make sure to take into account
-   constraints from VRTRasterBand data type in RasterIO() (rather than just
-   taking into account output buffer data type)
- * IRasterIO(): avoid edge effects at sources boundaries when downsampling with
-   non-nearest resampling
- * VRTMDArraySourceFromArray: fix taking into account relativeToVRT=1
- * allow a <ArraySource> element containing a 2D multidimensional array as a
-   VRTRasterBand source and through the use of a <DerivedArray> make it possible
-   to create a 2D array from a 3D or more multidimensional one, by slicing,
-   transposing, resampling, gridding, etc.
- * VRTComplexSource: perf improvement: add specialization when only NODATA for
-   Byte/UInt16/Int16 data types
- * VRTSimpleSource::GetFileList(): do not issue a stat() as it may be slow on
-   network drives
- * VRTSourcedRasterBand::GetMinimum/GetMaximum(): limit to 1 second max when
-   iterating over sources
- * VRTSourcedRasterBand::GetMinimum/GetMaximum(): use STATISTICS_MINIMUM/MAXIMUM
-   metadata first
+### Core
 
-WCS driver:
- * remove non-standard 'FORMAT' parameter from 'DescribeCoverage' requests
-   (#8381)
+* Make OGRSFDriver::TestCapability(ODrCCreateDataSource) work with
+  defered-loaded drivers (#10783)
+* MEM layer: fix UpdateFeature() that didn't mark the layer as updated,
+  which caused GeoJSON files to not be updated (qgis/QGIS#57736)
 
-Zarr driver:
- * allow update support in classic mode
- * Zarr V3: update to current specification (breaks backward compatibility)
- * implement GDALDriver::Rename(), Delete() and CopyFiles()
- * ignore filename restrictions when reading tile data files (#8162)
- * add MULTIBAND=YES/NO, DIM_X and DIM_Y open options (#8237)
- * classic raster API: write multi-band datasets as Zarr 3D arrays (writing
-   them as several 2D arrays as in GDAL 3.7 can be asked with the
-   SINGLE_ARRAY=NO creation option)
- * fix writing partial tiles
+### Vector drivers
 
-## OGR 3.8.0 - Overview of Changes
+FlatGeobuf driver:
+ * Fix reading of conformant single-part MultiLineString (#10774)
 
-### Core
+GeoPackage driver:
+ * OGR_GPKG_FillArrowArray_Step(): more rigorous locking
 
-* exportToGEOS(): do not drop M dimension with GEOS >= 3.12
-* Add OGR_G_IsClockwise() and map it to SWIG
-* core and ogr2ogr: add logic so that ogr2ogr can try a driver specific
-  implementation of GDALVectorTranslate()
-* OGRParseDate(): restrict valid times to HH:MM:SS(.sss) with at least 2 figures
-  (#8150)
-* Add OGR_F_DumpReadableAsString
-* ArrowArray interface: make PostFilterArrowArray() deal with attribute filter,
-  and enable that in Parquet&Arrow drivers
-* OGRLayer::GetArrowStream(): do not issue ResetReading() at beginning of
-  iteration, but at end instead, so SetNextByIndex() can be honoured
-* ArrowStream interface: make TIMEZONE="unknown", "UTC", "(+|:)HH:MM" or any
-  other Arrow supported value as an option of the generic implementation
-* Add OGRLayer::WriteArrowBatch()
-* ArrowArray: implement fast 'FID IN (...)' / 'FID = ...' attribute filter in
-  generic GetNextArrowArray(), and use it for FlatGeoBuf one too (when it has a
-  spatial index) (#8590)
-* GetArrowStream(): support a GEOMETRY_METADATA_ENCODING=GEOARROW option (#8605)
-* GetNextArrowArray() implementations: automatically adjust batch size of list/
-  string/binary arrays do not saturate their capacity (2 billion elements)
-* OGRGeometry classes: add addGeometry()/addRing()/addCurve() methods accepting
-  a std::unique_ptr
-* OGRLineString/Polygon/MultiPolygon/MultiLineString: make it possible to run
-  importFromWkb() on the same object and limiting the number of dynamic memory
-  (re)allocations
-* organizePolygons: Remove handling of nonpolygonal geometries
-* OGRGeometryFactory::transformWithOptions() WRAPDATELINE=YES: remove heuristics
-  about points exactly at +/- 180 (#8645)
-* gml2ogrgeometry: reject empty <gml:Triangle/>
-* OGRGF_DetectArc(): harden tolerance when detecting consecutive arcs to avoid
-  incorrect arc center computation (#8332)
-* OGR SQL: allow MIN() and MAX() on string fields
-* SQLite dialect: when the underlying layer has a FID column name, enable the
-  user to use it as an alias of ROWID
-* SQLite dialect: error out with explicit message on unsupported commands (#8430)
-* Add OGRFieldDefn::GetTZFlag()/SetTZFlag(), and OGR_TZFLAG_ constants
-* GDALDataset::ICreateLayer(): now takes a const OGRSpatialReference* instead of
-  a OGRSpatialReference*. Affects out-of-tree drivers (#8493)
-* OGR Python drivers: support WKB geometries
+GMLAS driver:
+ * make it robust to XML billion laugh attack
 
-### OGRSpatialReference
+JSONFG driver:
+ * accept coordRefSys starting with https://www.opengis.net/def/crs/
 
-* Add OGRCoordinateTransformationOptions::SetOnlyBest() /
-  OCTCoordinateTransformationOptionsSetOnlyBest() (#7753)
-* OGRProjCT::Transform(): do not emit generic error message if a specific one
-  has already been emitted
-* SetFromUserInput(): add support for urn:ogc:def:coordinateMetadata (PROJ >=
-  9.4)
-* SetFromUserInput(): recognize 'EPSG:XXXX@YYYY' (PROJ >= 9.4)
-* Add OSRHasPointMotionOperation() (PROJ >= 9.4)
-* OGR_CT: handle point motion operations (PROJ >= 9.4)
+NAS driver:
+ * make it robust to XML billion laugh attack
 
-### Utilities
+OpenFileGDB driver:
+ * add missing GetIndexCount() in FileGDBTable::CreateIndex
+ * fix writing a Int32 field with value -21121
+ * exclude straight line segments when parsing arcs (#10763)
 
-* ogrinfo: speed-up string concatenation
-* ogrinfo: add support for DateTime field domains
-* ogrinfo: emit distinct error message if the file doesn't exist or can't be
-  opened (#8432)
-* ogrinfo: output timezone flag
-* ogr2ogr: calls FlushCache() (#8033)
-* ogr2ogr: tune usage to allow both -s_coord_epoch and -t_coord_epoch
-* ogr2ogr: better deal when reprojecting curve geometries to a non-curve
-  geometry type (#8332)
-* ogr2ogr: use Arrow interface in reading and writing when possible
-* make -select '' work (or gdal.VectorTranslate(selectFields=[]))
+Parquet driver:
+ * fix crash when using SetIgnoredFields() + SetSpatialFilter() on
+   GEOMETRY_ENCODING=GEOARROW layers with a covering bounding box
+   (qgis/QGIS#58086)
 
-### Vector drivers
+PostgreSQL/PGDump drivers:
+ * properly truncates identifiers exactly of 64 characters (#10907)
 
-Arrow/Parquet driver:
- * emit ARROW:extension:name=ogc.wkb in Feature field metadata, and return it
-   also through GetArrowStream() for Parquet
- * implement faster spatial filtering with ArrowArray interface
- * optimize attribute filter on FID column
- * support/reading nested list/map datatypes as JSON
- * implement full spatial filtering (not just bbox intersection)
- * reading and writing: use field TZFlag
- * implement WriteArrowBatch() specific implementation
- * support LargeString and LargeBinary for geometry columns (read support only)
+PostgreSQL driver:
+ * ensure current user has superuser privilege beore attemption to create
+   event trigger for metadata table (#10925)
 
-CSV driver:
- * reader: change to use separator with the most occurrences (#7831)
- * and add a SEPARATOR=AUTO/COMMA/SEMICOLON/TAB/SPACE/PIPE open option (#7829)
- * implement GetFileList() and return .csvt if used (#8165)
+Shapefile driver:
+ * Add new shapelib API functions to the symbol rename header
 
-DGN driver:
- * CreateFeature(): fix crash on empty geometries (ossfuzz#56771)
+SQLite/GPKG drivers:
+ * fix potential double-free issue when concurrently closing datasets when
+   Spatialite is available
 
-DXF driver:
- * Preserve attributes in nested block insertions
+## Python bindings
 
-ESRIJSON driver:
- * add support for esriFieldTypeSingle and esriFieldTypeDate data types
+* Silence SWIG 'detected a memory leak' message (#4907)
+* fix passing a dict value to the transformerOptions argument of gdal.Warp()
+  (#10919)
 
-FlatGeoBuf driver:
- * GetNextArrowArray(): implement full spatial filtering (not just bbox
-   intersection)
+# GDAL/OGR 3.9.2 Release Notes
 
-GeoJSON driver:
- * add AUTODETECT_JSON_STRINGS layer creation option (#8391)
- * writer: when writing with limited coordinate precision, run MakeValid() to
-   avoid creating invalid geometries
- * reading: set field TZFlag
- * writer: in RFC7946 mode, refine logic to determine if a multipolygon spans
-   over the antimeridian to write correct bbox (qgis/qgis#42827)
- * writer: use faster file write() primitive and detect write() errors
+GDAL 3.9.2 is a bugfix release.
 
-GeoJSONSeq driver:
- * add AUTODETECT_JSON_STRINGS layer creation option (#8391)
- * writer: use faster file write() primitive and detect write() errors
+## Build
 
-GeoPackage driver:
- * use much faster creation of RTree with a in-memory RTree building
- * speed-up HasMetadataTables() on dataset with many layers
- * speed-up unique constraint discovery on dataset with many layers
- * more efficient retrieval of layer extent from RTree content
- * deal with DateTime fields without milliseconds or seconds, as allowed by
-   GeoPackage 1.4 (#8037)
- * add a DATETIME_PRECISION layer creation option (#8037)
- * implement SetNextByIndex() on table layers (by appending
-   'OFFSET -1 LIMIT index')
- * make GetArrowStream() honour SetNextByIndex()
- * add a CRS_WKT_EXTENSION=YES/NO dataset creation option to force addition of
-   definition_12_063 column
- * add a METADATA_TABLES creation option to control creation of system metadata
-   tables
- * GetNextArrowArray(): implement full spatial filtering (not just bbox
-   intersection)
- * GetNextArrowArray(): only do multi-threaded prefetch if more than 1 GB RAM
-   available
- * make invalid attribute filter to cause error in main thread (so Python
-   binding can emit an exception)
- * GPKG / SQLite dialect: improve detection of geometry columns when first row
-   is NULL (#8587)
- * make GetFeatureCount() do full geometry intersection and not just bounding
-   box (#8625)
+* Fix compilation against openssl-libs-3.2.2-3 of fedora:rawhide
+* Fix compilation against libarchive-3.3.3-5 as shipped by RHEL 8 (#10428)
+* Fix -Wnull-dereference warnings of gcc 14.2
 
-GPX driver:
- * add a CREATOR dataset creation option
+## GDAL 3.9.2
 
-HANA driver:
- * Set sessionVariable:APPLICATION in connection string
- * Support connections using a user store key (#7946)
+### Port
 
-Memory driver:
- * add a FID layer creation option to specify the FID column name
+* CPLFormFilename()/CPLGetDirname()/CPLGetPath(): make it work with
+  'vsicurl/http://example.com?foo' type of filename, to fix Zarr driver
 
-MVT/MBTiles driver:
- * take into account tileStats metadata item to decide if a field of type
-   'number' might be Integer or Integer64
- * MVT writer: clamp generated tile x, y coordinates to \[0,(1<<z)-1\]
+### Core
 
-NAS driver:
- * remove unused nas relation layer and remove GML driver's out-of-band
-   attribute handling only used for it
- * support gfs @ notation for attributes to handle attributes for codelists
-   (fixes norBIT/alkis-import#65)
- * Fix (and refactor) update operations for GID7
+* GDALCopyWords(): Fix double->uint64 when input value > UINT64_MAX that was
+  wrongly converted to 0
+
+### Raster utilities
+
+* gdalinfo_output.schema.json: pin stac-extensions/eo to v1.1.0
+* gdal_translate: fix -a_nodata to accept '-inf' as input (3.9.0 regression)
+* gdalwarp: fix -srcnodata/-dstnodata to accept negative value in first position
+  (3.9.0 regression)
+* gdalbuildvrt: -fix -srcnodata/-vrtnodata to accept negative value in first
+  position (3.9.0 regression)
+* gdallocationinfo: avoid extra newline character in -valonly mode if coordinate
+  is outside raster extent (3.9.0 regression)
+* gdal_rasterize: on a int64 band, set nodata value as int64 (#10306)
+* gdal_rasterize: restrict to defaulting to Int64 raster data type only if
+  output driver supports it (and the burned field is Int64)
+* gdal_retile: error out with clear message when trying to retile a file with a
+  geotransform with rotation terms, or several input files with inconsistent SRS
+  (#10333)
+* gdallocationinfo: in -E echo mode, always report input coordinates, not pixel,line
+* gdal2tiles: update links in generate_leaflet(), remove OSM Toner (#10304)
+* gdal2tiles: uUse correct OpenStreetMap tile url (openstreetmap/operations#737)
+* gdal2tiles: fix exception with --nodata-values-pct-threshold but not
+  --excluded-values on a multi-band raster
 
-MySQL driver:
- * fix compliance issues with test_ogrsf
+### Raster drivers
 
-OAPIF driver:
- * bump default limit to 1000 and honor schema from API (#8566)
+COG driver:
+ * properly deal with mask bands w.r.t resampling when generating JPEG output,
+   or when input has a mask band (3.5 regression) (#10536)
 
-ODS driver:
- * add FIELD_TYPES and HEADERS open options (#8028)
+GTI driver:
+ * start looking for OVERVIEW_<idx>_xxxx metadata items at index 0
+ * automatically add overviews of overviews, unless the OVERVIEW_LEVEL=NONE open
+   option is specified
 
-OpenFileGDB driver:
- * add support for DateTime field domains
- * expose layer alias name in ALIAS_NAME layer metadata item
+GTiff driver:
+ * make SetNoDataValue(double) work on a Int64/UInt64 band (#10306)
 
-Parquet driver:
- * emit GeoParquet 1.0.0 version number
- * add a COORDINATE_PRECISION layer creation option
- * add fast implementation of Arrow Array interface when requesting WKT as WKB
- * make Parquet driver recognize a geometry column if it has
-   ARROW:extension:name=ogc.wkb/ogc.wkt field metadata
- * add a GEOM_POSSIBLE_NAMES and CRS open options for wider compatibility with
-   datasets not following GeoParquet dataset-level metadata
- * fix ExecuteSQL() MIN/MAX optimization on a UINT32 field on a Parquet 2 file
- * optimize SELECT MIN(FID), MAX(FID)
- * restrict FID column detection to Int32/Int64 data types
- * use statistics to skip row groups that don't match attribute filter (#8225)
- * use statistics of bbox.minx/miny/max/maxy fields (as found in Ouverture Maps
-   datasets) to implement fast GetExtent()
+KEA driver:
+ * don't derive from PAM classes (#10355)
 
-PDF driver:
- * (minimal) take into account BMC operator to correctly handle BMC/EMC pairs
-   w.r.t BDC/EMC ones (#8372)
- * Read vector unstructured: take into account OCMD constructs as found in
-   recent USGS GeoPDFs (#8372)
- * ignore non-relevant StructTreeRoot in most recent USGS GeoPDFs (#8372)
+JPEG driver:
+ * ReadFLIRMetadata(): avoid potential infinite loop
 
-PGDump driver:
- * use faster file write() primitive
+netCDF driver:
+ * multidim: fix use-after-free on string variables in ReadOneElement()
 
-PostgreSQL driver:
- * do not override search_path when not needed (#8641)
+NITF driver:
+ * 12-bit JPEG writer: fix crash if raster width > block width (#10441)
 
-Shapefile driver:
- * use VSIGetCanonicalFilename() in GetFileList() (#8164)
- * be tolerant with .prj with lon, lat axis order (fixes #8452)
+OGCAPI driver:
+ * do not emit 'Server does not support specified IMAGE_FORMAT: AUTO' when
+   opening a vector layer with MVT tiles only
+ * fix reading encodingInfo/dataType for Coverage API
 
-TileDB driver:
- * GetNextArrowArray(): implement full spatial filtering (not just bbox
-   intersection)
+SRTMHGT driver:
+ * add support for 0.5 deg resolution datasets (#10514)
 
-XLSX driver:
- * add FIELD_TYPES and HEADERS open options (#8028)
+VRT driver:
+ * fix reading from virtual overviews when SrcRect / DstRect elements are missing
 
-WFS driver:
- * Don't issue STARTINDEX if feature count is small (#8146)
- * do not emit twice DescribeFeatureType request on servers with complex
-   features and a single layer
- * ExecuteSQL(): skip leading spaces that could cause the rest of the function
-   to malfunction
- * correctly paginate when number of features is lower than page size (#8653)
- * use numberMatched when present to avoid last empty GetFeature request, and
-   set GetFeatureCount()
+WMTS driver:
+ * make sure not to request tiles outside of tile matrix / tile matrix limits,
+   if the dataset extent goes beyond them
+ * clip layer extent with union of extent of tile matrices (#10348)
 
-## SWIG Language Bindings
+## OGR 3.9.2
 
-All bindings:
- * Map multidimensional API Rename() methods
- * Increment FeatureDefn ref count on ogr.Layer.GetLayerDefn()
- * add ogr.CreateRangeFieldDomainDateTime() and Domain.GetMinAsString()
-   /GetMaxAsString()
- * Expose GetConfigOptions()
- * add gdal.SuggestedWarpOutput()
- * Expose GDALClose
+### Core
 
-Java bindings:
- * add Read/WriteRaster abilities for GDT_UInt64 & GDT_Int64 (#7893)
- * make multidimensional API usable (#8048)
- * implement ogr.CreateCodedFieldDomain() and FieldDomain.GetEnumeration()
-  (#8085)
- * eliminate some deprecations / compiler warnings (#8055)
- * Add FieldDefn::GetFieldType() compatibility method
+* WKT geometry importer: accept (non conformant) PointZ/PointZM without space as
+  generated by current QGIS versions
+* OGR SQL: do not make backslash a special character inside single-quoted
+  strings, to improve compliance with SQL92 (#10416)
+* OGRSQL: return in error when 'Did not find end-of-string character' is emitted
+  (#10515)
 
-Python bindings:
- * Allow passing options as dict
- * Return context manager from Create, CreateDataSource
- * Use ogr.DataSource and gdal.Dataset as context managers
- * make gdal.Group.GetGroupNames() and GetMDArrayNames() return an empty list instead of None
- * detect invalid use of ReleaseResultSet() (#7782)
- * Invalidate band and layer refs when dataset closes
- * Invalidate mask, overview references after dataset close
- * Invalidate refs from CreateLayer on datasource close
- * Invalidate refs from CopyLayer on datasource close
- * Avoid crash when using dataset after Destroy or Release
- *  Avoid crashes when using orphaned Geometry refs
- * GetArrowStreamAsNumPy(): various fixes
- * Fix gdal.config_options to prevent migration of config options in and out of
-   thread-local storage (#8018)
- * accept numpy.int64/float64 arguments for xoff, yoff, win_xsize, win_ysize,
-   buf_xsize, buf_ysize arguments of ReadAsArray() (#8026)
- * make setup.py check that libgdal version >= python bindings version (#8029)
- * fix CoordinateTransform.TransformPoint(sequence of 3 or 4 values)
- * Use DumpReadable for Feature __repr__
- * add a outputGeotransform option to gdal.Translate()
- * Accept os.PathLike arguments where applicable
- * make Feature.SetField(field_idx_or_name, binary_values) work
- * add feature.SetFieldBinary(field_idx_or_name, binary_values)
- * throw exceptions (when enabled) on gdal_array.OpenArray()/OpenNumPyArray()/
-   OpenMultiDimensionalNumPyArray()
- * improve performance of CSLFromPySequence() on large sequences
-   (like > 100,000 strings)
- * Allow ExecuteSQL context manager to work on empty datasources
- * make sure that CPL_DEBUG=ON and gdal.UseExceptions() work fine during
-   gdal.VectorTranslate() (and similar) (#8552)
+### OGRSpatialReference
 
-# GDAL/OGR 3.7.0 Releases Notes
+* EPSGTreatsAsNorthingEasting(): make it work correctly with compound CRS
 
-GDAL/OGR 3.7.0 is a feature release.
-Those notes include changes since GDAL 3.6.0, but not already included in a
-GDAL 3.6.x bugfix release.
+### Vector drivers
 
-## In a nutshell...
+GeoJSON driver:
+ * writer: make sure geometry is reprojected even when it is invalid after
+   coordinate rounding (3.9.0 regression) (qgis/QGIS#58169)
 
-* [RFC 87](https://gdal.org/development/rfc/rfc87_signed_int8.html): Add
-  GDT_Int8 support
-* [RFC 88](https://gdal.org/development/rfc/rfc88_googletest.html): switch
-  to GoogleTest framework for C++ tests (#3525)
-* [RFC 89](https://gdal.org/development/rfc/rfc89_sql_logging_callback.html):
-  SQL query logging callback (#6967)
-* [RFC 90](https://gdal.org/development/rfc/rfc90_read_compressed_data.html):
-  Direct access to compressed raster data
-* [RFC 91](https://gdal.org/development/rfc/rfc91_dataset_close.html):
-  GDALDataset::Close() method
-* [RFC 93](https://gdal.org/development/rfc/rfc93_update_feature.html):
-  OGRLayer::UpdateFeature() method
-* [RFC 94](https://gdal.org/development/rfc/rfc94_field_precision_width_metadata.html):
-  Numeric fields width/precision metadata
-* ogrinfo: make it accessible through a new GDALVectorInfo() C API call, and
-  a -json switch
-* Add read-only raster driver NOAA_B to read NOAA GEOCON/NADCON5 .b grids
-* Add read-only raster driver NSIDCbin for Sea Ice Concentrations (#7263)
-* Add read-only vector GTFS (General Transit Feed Specification) driver
-* TileDB: add read/write vector side
-* Add support for [SOZip](https://sozip.org) (Seek Optimized ZIP) with enhanced
-  /vsizip/ virtual file system and a new sozip utility
-* OpenFileGDB: add read-only support for raster datasets (.gdb v10)
-* PNG: 1.7-2.0x speed-up in whole image decompression with libdeflate on
-  Intel/AMD CPUs. Benefits GPKG, MRF drivers
-* [RFC 69](https://gdal.org/development/rfc/rfc69_cplusplus_formatting.html):
-  C++ code reformatting
-* Code linting and security fixes
-* Remove any traces of Rasdaman driver, now moved to OSGeo/gdal-extra-drivers
-  repository (#4808)
+GML driver:
+ * writer: fix missing SRS in Featurecollection's boundedBy element (3.9.1
+   regression) (#10332)
 
-## Backward compatibility issues
+GMLAS driver:
+ * avoid crash on a OSSFuzz generated xsd (ossfuzz#70511)
 
-See [MIGRATION_GUIDE.TXT](https://github.com/OSGeo/gdal/blob/release/3.7/MIGRATION_GUIDE.TXT)
+GTFS:
+ * fix error when applying an attribute filter on a field whose advertized data
+   type is not string (duckdb/duckdb_spatial#343)
 
-## New installed files
+JSONFG driver:
+ * fix reading non-FeatureCollection documents larger than 6,000 bytes (#10525)
 
-* data/gfs.xsd: XML schema for .gfs files (#6655)
-* data/gml_registry.xsd: new file with XML schema of gml_registry.xml (#6716)
-* data/ogrinfo_output.schema.json: to validate ogrinfo -json output
-* data/gdalinfo_output.schema.json: to validate gdalinfo -json output (fixes #6850)
-* data/grib2_table_4_2_0_21.csv
-* data/grib2_table_4_2_2_6.csv
-* bin/sozip
+LIBKML driver:
+ * fix writing a .kmz to cloud storage (#10313)
+ * fix LIBKML_RESOLVE_STYLE=YES when reading a KML file with dataset-level
+   styles (3.9.1 regression) (qgis/qgis#58208)
+ * fix reading/writing style URL in KMZ files (#10478)
 
-## Build
+MiraMonVector driver:
+ * fix oss-fuzz#70860
 
-* make BUILD_JAVA/CSHARP/PYTHON_BINDINGS default value dependent on the
-  presence of requirements, and error out if those variables are set but
-  requirements are missing
-* Python bindings: remove generated files and require SWIG to be present
-* Fix build with -DOGR_ENABLE_DRIVER_GML=OFF (#6647)
-* make it possible to build on Linux if linux/fs.h is missing by explicitly
-  setting ACCEPT_MISSING_LINUX_FS_HEADER
-* Add support for (future) libjpeg-turbo 2.2 with its 8/12 bit dual mode (#6645)
-* PDF driver with PDFium support must be built against PDFium from
-  https://github.com/rouault/pdfium_build_gdal_3_7
-* No longer alias VSILFILE* to FILE* in non-DEBUG builds (#6790)
-* Add build option for using static Arrow/Parquet build (#7082)
-* Quote variables for INTERFACE_INCLUDE_DIRECTORIES / IMPORTED_LOCATION
-* Enable OpenCL at build-time, but disable it at runtime by default unless
-  the USE_OPENCL warping option or GDAL_USE_OPENCL config option is set (#7224)
-* Fix MSVC x64 builds with /arch:AVX2 (#7625)
+OAPIF driver:
+ * fix resolving of relative links (#10410)
 
-## New optional dependencies
+OpenFileGDB driver:
+ * fix attribute filter when an equality comparison is involved with a field
+   with an index created with a LOWER(field_name) expression (#10345)
 
-* libarchive for new /vsi7z/ and /vsirar/ virtual file systems
+OSM driver:
+ * avoid creating /vsimem/osm_importer directory (#10566)
 
-## GDAL 3.7.0 - Overview of Changes
+PG driver:
+ * fix ogr2ogr scenarios to PostgreSQL when there are several input layer names
+   like schema_name.layer_name (3.9.0 regression)
+ * fix support for geometry/geography OID in range between 2^31 and 2^32 (#10486)
 
-### Port
+PG/PGDump drivers:
+ * make sure spatial index name is unique, even if several tables have a long
+   enough prefix (#10522, #7629)
 
-* /vsizip/: add read support for Deflate64 (#7013)
-* Add read-only /vsi7z/ and /vsirar/ virtual file systems (depends on libarchive)
-* Make it possible to specify all HTTP related configuration options as
-  path-specific options with VSISetPathSpecificOption()
-* VSIGSFSHandler::UnlinkBatch(): avoid potential nullptr deref
-* /vsiaz/: implement UnlinkBatch()
-* /vsis3/: add CPL_VSIS3_CREATE_DIR_OBJECT configuration option
-* /vsigs/ allow GDAL_HTTP_HEADERS config option to be used as authentication method if contains at least a line starting with "Authorization:"
-* /vsihdfs/: fix ReadDir() and EOF flag (#7632)
-* add a robust CPLParseKeyValueJson() function (#6753)
-* HTTP: set default User-Agent header to GDAL/x.y.z and add a
-  CPLHTTPSetDefaultUserAgent() function (#6376)
-* HTTP: CUSTOMREQUEST option overrides POST while send form
-* /vsicurl/ / CPLHTTPFetch(): add a GDAL_HTTP_NETRC_FILE config option
-* /vsicurl/ / CPLHTTPFetch(): add options to support SSL client certificates
-* VSICurlHandle::ReadMultiRange(): avoid potential infinite loop
-* Add VSIVirtualHandle::AdviseRead() virtual method and implement it in /vsicurl
-* Add VSICopyFile()
-* CPLCopyFile(): remap onto VSICopyFile()
-* Implement CopyFile() for VSIZipFilesystemHandler
-* Implement GetFileMetadata() for /vsizip/
-* CPLDefaultFindFile: Warn if file not found and GDAL_DATA not defined
-* Add VSIDuplicateFileSystemHandler() (for remote stores identifcal to popular
-  ones, but with different settings).
-* Make C type VSILFILE an alias of C++ VSIVirtualHandle (and make it a struct
-  for that purpose) (#6643)
-* Add a CPLGetErrorHandler() function
-* Add VSIVirtualHandleUniquePtr type, unique pointer of VSIVirtualHandle that
-  calls the Close() method
+Shapefile driver:
+ * fix recognizing an empty string as a NULL date (#10405)
+ * fix off-by-one write heap buffer overflow when deleting exactly 128, 232,
+   etc. features and repacking (#10451)
 
-### Core
+XLSX driver:
+ * support documents whose XML elements have a prefix (duckdb
+/duckdb_spatial#362)
 
-* ComputeRasterMinMax(), ComputeStatistics(), GetHistogram(): take into account
-  mask band (and not only nodata value)
-* Modify GDALFlushCache() and GDALDataset::FlushCache() to return CPLErr
-  instead of void
-* Add GDALDataset::Close() virtual method, call it from GDALClose() and make
-  GDALClose() return a CPLErr
-* GDALDataset:: add a SetBand() method that takes a GDALRasterBand unique_ptr
-* RawRasterBand: cache GDAL_ONE_BIG_READ value for RasterIO (#6726)
-* RawRasterBand: add IsValid() and Create() methods that return a unique_ptr
-* RawDataset::RasterIO(): add optimization when reading from a BIP dataset to
-  a BIP buffer (#6819)
-* RAW: fix performance issue when reading files with very small width (#1140)
-* Raw drivers: check RawRasterBand validity
-* LoadPythonAPI(): take into account Python 3.12
-* NASAKeywordHandler: add a Parse() method and change Ingest() return type to be bool
-* Add GDALMDArray::GetGridded() / GDALMDArrayGetGridded()
-* Add GDALMDArray::Resize() / GDALMDArrayResize(). Implement it in MEM, netCDF
-  and Zarr drivers
-* Support blocks > 2GB in GDALAllValidMaskBand and GDALNoDataValuesMaskBand
-* GDALVersionInfo("BUILD_INFO"): report CURL_ENABLED=YES and CURL_VERSION=x.y.z
-* Add CPLSubscribeToSetConfigOption() to subscribe to config option settings
-* GoogleMapsCompatible tiling scheme: Increase max zoom level from 24 to 30
-* JP2 structure dump: fix interpretation of METH field in COLR JP2 box
-* Enable SSE2/AVX2 optims on 32bit MSVC builds if /arch:AVX2 is defined (#7625)
+## Python bindings
+
+* fix typos in gdal.Footprint() help message
+* make MDArray.Write(array_of_strings) work with a 0-d string variable
+
+# GDAL/OGR 3.9.1 Release Notes
+
+GDAL 3.9.1 is a bugfix release.
+
+## Build
+
+* PDF: fix build with PoDoFo >= 0.10 with C++20 compilation (#9875)
+* PDF: fix build against PoDoFo with MSYS2 UCRT64 and CLANG64 (#9976)
+* Fix compiler errors in C++20 and C++23 modes
+* Fix compiler warnings with gcc 14
+* CMake: add infrastructure so we can build plugins that can be loaded against
+  a libgdal that has been without any support for them.
+  Note: this is an ABI break for in-tree drivers, with deferred loading capability, when built as plugin. That is such a driver built against
+  GDAL 3.9.0 won't be able to be loaded by GDAL 3.9.1.
+
+## GDAL 3.9.1
+
+### Port
+
+* /vsis3/: include AWS_CONTAINER_CREDENTIALS_TOKEN in container credentials
+ flow (#9881)
+* VSIStatL(): allow trailing slash on mingw64 builds
 
 ### Algorithms
 
-* Polygonizer: switch implementation to Two-Arm Chains EdgeTracing Algorithm,
-  which is much faster in some cases (#7344)
-* Prefix ParseAlgorithmAndOptions() public symbol with GDALGrid for proper
-  namespacing, and add #define alias for API compat (but ABI breakage)
-* Pansharpening: require geotransform on panchromatic and multispectral bands.
-  Remove undocumented and somewhat broken MSShiftX and MSShiftY options
-* Warper: fix issue with insufficiently large source window, visible with RPC
-  DEM warping (#7491)
+* Warper: relax longitude extend check to decide whether we can insert a
+  CENTER_LONG wrapping longitude
+* GCPTransformer: accept only 2 points for order=1 transformer (#10074)
+* GDALContourGenerateEx(): validate LEVEL_INTERVAL option (#10103)
+* GDALTranslate(): use directly generated VRT even if BLOCKXSIZE/BLOCKYSIZE
+  creation options are specified
+* GDALSieveFilter(): avoid assert() when all pixels are masked (3.9.0 regression)
+  (raster/rasterio#3101)
+* Overview generation: fix multi-threaded bug, resulting in locks/crashes with
+  GeoPackage in particular (#10245)
 
-### Utilities
+### Core
 
-* gdalwarp: add -srcband (aliased to -b) and -dstband options
-* gdalwarp: preserve source resolution by default when no reprojection is
-  involved (behavior change), and add '-tr square' to use previous behavior
-* gdalwarp: better error message when not providing enough values after a switch
-  (#7086)
-* gdal_rasterize: support @filename for -sql option (#7232)
-* gdal_rasterize: add -oo switch for open options (#7329)
-* gdal_grid: add -oo switch for open options (#7329)
-* gdal_polygonize.py: use transactions to speed-up writing
-* gdal_polygonize.py: add a -lco option, and fix -o (#7374)
-* gdalbuildvrt: implement numerically stable averaging of resolution (#7502)
-* gdal2tiles: use logging module instead of print() for verbose output (#4894)
-* gdal2tiles: update doctype to html format (#7631)
-* gdal2tiles: uses GDALTermProgress() for progress bar
-* gdal_calc: uses GDALTermProgress() for progress bar (#7549)
-* gdal_fillnodata: fix parsing of -co option
-* validate_gpkg.py: make it work better on examples from ngageoint repositories
-* gdal_cp.py: use gdal.CopyFile()
-* C/C++ command line utilities: take into account GDALClose() error code
+* GDALIdentifyDriverEx(): transmit papszAllowedDrivers to Identify() (#9946)
+* GDALNoDataMaskBand::IRasterIO(): fix crash on memory allocation failure
+  (rasterio/rasterio#3028)
+* Rasterband methods (histogram, statistics): make them compatible of a dataset
+  with more 2 billion blocks
 
-### Raster drivers
+### Raster utilities
 
-ARG driver:
- * add support for int64/uint64
+* Add argument name after 'Too few arguments' error (#10011)
+* gdalwarp: fix help message for -wm (#9960)
+* gdalinfo text output: avoid weird truncation of coordinate epoch when
+  its value is {year}.0
+* Python utilities: avoid UseExceptions() related deprecation warning when
+  launched from launcher shell scripts (#10010)
 
-COG driver:
- * relax a bit the tolerance when computing tile number
- * propagate NUM_THREADS to warping (#7479)
- * add NBITS creation option (#7361)
+### Raster drivers
 
-ERS driver:
- * support GDA2020
+AAIGRID driver:
+ * fix forcing datatype to Float32 when NODATA_value is nan and pixel values
+   look as ints
 
-GeoPackage driver:
- * load/save band statistics in GPKG metadata tables or PAM .aux.xml
+ESRIC driver:
+ * ingest more bytes to be able to identify more datasets (#10006)
+ * properly takes into account minLOD for .tpkx (#10229)
+ * validate tile size
+ * add a EXTENT_SOURCE open option and default to FULL_EXTENT (#10229)
 
 GRIB driver:
- * update tables to wmo-im/GRIB2@v30
- * g2clib: allow negative longitudes in grid templates Lon/Lat, Rotated,
-   Stretched, Stretched & Rotated, LAEA (#7456) and Mercator
- * fix GetNoDataValue() on band > 1 when there's a bitmap section (#7649)
+ * make .idx reading compatible of /vsisubfile/ (#10214)
 
 GTiff driver:
- * add a JXL_ALPHA_DISTANCE creation option, e.g. to have lossless alpha and
-   lossy RGB.
- * call VSIVirtualHandle::AdviseRead() in multithreaded read implementation
- * implement GetCompressionFormats() and ReadCompressedData()
- * add minimum support for reading CRS from ESRI's .xml side car file (#7187)
- * use libtiff >= 4.5 reentrant error handlers (when available) (#6659)
- * make sure that band description in PAM overrides the one coming from
-   GDAL_METADATA tag
- * Internal libtiff: resync with upstream
-
-HFA driver:
- * add a DISABLEPESTRING=YES creation option to disable use of ArcGIS PE String
-   (#1003)
+ * fix reading angular projection parameters in non-degree unit
+   (typically grads), when reading projection from ProjXXXXGeoKeys (#10154)
+ * fix writing angular projection parameters in non-degree unit (typically
+   grads), when writing ProjXXXXGeoKeys
+ * multithreaded reading: avoid emitting tons of warnings when ExtraSamples tag
+   is missing
+ * writer: limit number of GCPs in GeoTIFF tag to 10922 to avoid overflowing
+   uint16_t (#10164)
 
 HDF5 driver:
- * add generic support for HDF-EOS5 grids and swaths (#7117)
+ * add support for libhdf5 >= 1.14.4.2 when built with Float16
+ * make logic to assign per-band attribute more generic
 
-JP2OpenJPEG driver:
- * add workaround for dop10 orthophotos wrong colorspace
+netCDF driver:
+ * netCDFAttribute::IWrite(): fix writing an array of (NC4) strings, from a
+   non-string array
+ * try to better round geotransform values when read from single-precsion
+   lon/lat float arrays
 
-JPEG driver:
- * add a APPLY_ORIENTATION=YES open option to take into account EXIF_Orientation
- * advertise JPEG_QUALITY metadata item in IMAGE_STRUCTURE domain
- * use ReadCompressedData(), implement lossless copy from JPEGXL that has
-   JPEG reconstruction box
- * add a LOSSLESS_COPY creation option
- * add support for reading lossless 8-bit JPEG if using libjpeg-turbo >= 2.2
- * change behavior to return an error and not just a warning with reading a
-   truncated file
- * Internal libjpeg: decompressor: initialize Huffman tables to avoid issues
-   with some FileGDB raster
-
-JPEGXL driver:
- * add a ALPHA_DISTANCE creation option, e.g. to have lossless alpha and
-   lossy RGB.
- * add a APPLY_ORIENTATION=YES open option to take into account EXIF_Orientation
- * advertise COMPRESSION_REVERSIBILITY=LOSSY when there is a JPEG reconstruction
-   box
- * add a LOSSLESS_COPY creation option
- * implement creation from JPEGXL content
- * fix lossless copy of JPEG with zlib compressed mask band
- * implement GetCompressionFormats() and ReadCompressedData()
-
-MEM driver:
- * implement GetCoordinateVariables() from coordinates attribute
- * Adds 'SPATIALREFERENCE' element to the DSN format (#7272)
-
-MRF driver:
- * make it use PNG driver for decompression of 8-bit images
-
-netCDF driver:
- * add a ASSUME_LONGLAT open option (#6195)
- * add heuristics to detect invalid validity range when scale_factor is
-   present (#7167)
- * report geolocation array for NASA L2 ocean colour products (#7605)
-
-NITF driver:
- * nitf_spec.xml: add definition for subheader of CSATTB, CEEPHB and CSSFAB DES
-   of GLAS/GFM
- * add capability of decoding DES data part as XML fields and add descriptors
-   for CSATTB, CEEPHB and CSSFAB DES
- * add VALIDATE and FAIL_IF_VALIDATION_ERROR open options
- * fix bug that prevents adding subsequent TREs after a HEX TRE (#6827)
-
-OGCAPI driver:
- * define raster/vector scope of open options
- * Passed uri to TileMatrixSet::parse
- * Updated uris of well-known tile matrix sets
-
-PCIDSK driver:
- * support Web Mercator projection (#7647)
-
-PDF driver:
- * skip JP2ECW driver if ECW_ENCODE_KEY required but not found
-
-PNG driver:
- * 1.7-2.0x speed-up in whole image decompression with libdeflate on Intel/AMD CPUs
-
-RMF driver:
- * Add scale, name, frame support.
- * Add vert CS write support.
- * Implement GetSuggestedBlockAccessPattern
+STACIT driver:
+ * add a OVERLAP_STRATEGY opening option to determine how to handle sources
+   fully overlapping others, and taking into account nodata values
+ * honour MAX_ITEMS=0 as meaning unlimited as documented
+ * implement paging using POST method
 
 VRT driver:
- * add 'a_offset', 'a_scale', 'a_srs', 'a_ullr', 'expand', 'exponent', 'gcp',
-  'if', 'ot', 'outsize', 'ovr', 'scale' options for vrt:// connection string
- * add BLOCKXSIZE and BLOCKYSIZE creation options
- * Fix excessive RAM usage when reading a VRT made of single-tiled JPEG2000
-   files read with the JP2OpenJPEG driver
- * implement GetCompressionFormats() and ReadCompressedData()
- * derived band: add a <SkipNonContributingSources>true optional element
-   to discard non contributing sources (#7223)
- * VRTPansharpened: avoid issue when querying overviews when PAN and MS bands
-   have significant different spatial extent
- * serialize NODATA/NoDataValue elements with double precision (#7486)
- * fix warning regarding with OpenShared with vrt://http://example.com/test.jp2
-   with the JP2OpenJPEG driver
+ * fix processing of LUT where the first source value is NaN
+ * fix serialization of separatable kernel in VRTKernelFilteredSource (#10253)
 
-WEBP driver:
- * implement GetCompressionFormats() and ReadCompressedData()
+Zarr driver:
+ * SerializeNumericNoData(): use CPLJSonObject::Add(uint64_t) to avoid potential
+   undefined behavior casts
 
-## OGR 3.7.0 - Overview of Changes
+## OGR 3.9.1
 
 ### Core
 
-* Add OGRLayer::UpdateFeature() and OGR_L_UpdateFeature() (RFC 93).
-  Implement it in Memory, GPKG, MongoDBv3, PG
-* OGRFeatureDefn: add GetFields() and GetGeomFields() for easier C++ iteration
-* OGRFieldDefn: add GetComment() / SetComment() methods
-* OGRFeature/OGRGeometry: add a DumpReadable method that outputs to a string
-* Add GDAL_DMD_ILLEGAL_FIELD_NAMES, and feel it for OpenFileGDB, FileGDB,
-  PostgreSQL
-* Add GDAL_DMD_RELATIONSHIP_RELATED_TABLE_TYPES: list of standard related table
-  types recognized by the driver, and feel it for OpenFileGDB, FileGDB and GPKG
-* Add GDAL_DMD_CREATION_FIELD_DEFN_FLAGS metadata
-* Add DCAP_FEATURE_STYLES_READ and DCAP_FEATURE_STYLES_WRITE capabilities
-* Add ALTER_ALTERNATIVE_NAME_FLAG for use changing a field's alternative name
-  when calling OGR_L_AlterFieldDefn
-* Add ALTER_COMMENT_FLAG for altering field comments via OGR_L_AlterFieldDefn
-* Add OGRLayer::GetSupportedSRSList() and SetActiveSRS()
-* OGRToOGCGeomType(): add options to control output
-* GenSQL: fix SetAttributeFilter() when dialect=OGRSQL and not forwarding the
-  initial where clause to the source layer (#7087)
-* OGR SQL: do not emit error message when comparing a NULL datetime
-* OGRFeature::SetField(string argument): for bool, recognize 0/false/off/no as
-  false and 1/true/on/yes as true
-* Add OGRFeature::GetFieldAsISO8601DateTime() (#7555)
-* Geometry WKT import: accept nan as a value, for parity with PostGIS and GEOS
-* GDALDataset::CopyLayer(): copy source layer metadata, unless the COPY_MD=NO
-  option is specified
-* Add OGRGeometry::UnaryUnion() / OGR_G_UnaryUnion()
-* SQL SQLite parser: correctly take into account statements like
-  'SELECT ... FROM json_each(...)' (#7464)
-* Make OGRGeometry::getSpatialReference() return a const OGRSpatialReference*
-* Make OGRGeomFieldDefn::GetSpatialRef() return a const OGRSpatialReference*
+* OGRSQL: validate column name in COUNT(field_name) and error out if it
+  doesn't exist (#9972)
+* OGR SQL: fix crash when the ON expression of a JOIN contains OGR special
+  fields (in particular feature id)
+* OGR layer algebra: honour PROMOTE_TO_MULTI=YES for Points
+* OGRFeature::SetField(int, double): avoid UndefinedBehavior when passing NaN
+* OGRFeature::SetField(int, GIntBig): avoid UndefinedBehavior when passing value
+  close to INT64_MAX
+* OGRLayer::WriteArrowBatch(): avoid UndefinedBehavior when trying to convert
+  NaN to Int64
 
 ### OGRSpatialReference
 
-* importFromWkt(): take into account COORDINATEMETADATA[] (PROJ >= 9.2)
-* update hard-coded definition of OGC:CRS84 to include the ID
-* OSR_Panorama: Add some spatial references (GSK 2011, etc.)
-* OSR_Panorama: Fix TM zone for projections with negative central meridian
-* OSR_Panorama: Fix import from invalid data
-* SetFromUserInput(): skip leading white space (#7170)
-* Make OGRCoordinateTransformation::GetSourceCS() and GetTargetCS() return a
-  const OGRSpatialReference* (#7377)
-* OSRImportFromEPSG(): emit warning message about deprecated CRS substitution
-  (#7524)
-* Allow CPLSetConfigOption('PROJ_DATA', ...) to work by making it call
-  OSRSetPROJSearchPaths()
+* importFromESRI() Arc/Info 7 .prj: fix importing LAMBERT_AZIMUTHAL with a
+  'radius of the sphere of reference'
+* workaround bug of PROJ < 9.5 regarding wrong conversion id for UTM south
+* importFromUSGS(): use plain WGS84 datum with WGS84 ellipsoid, and identify
+  EPSG code
 
-### Utilities
+### Vector utilities
 
-* ogrinfo: make it accessible through a new GDALVectorInfo() C API call
-* ogrinfo: add a -json switch
-* ogrinfo: output CRS supported list
-* ogrinfo: output relationships
-* ogr2ogr: use SetActiveSRS() when possible when -t_srs is used
-* ogr2ogr: make conversion from GML2 to GPKG work without explicit -lco
-  FID=some_name_different_than_fid
-* ogr2ogr: add a -dateTimeTo option to convert datetime between timezones (#5256)
-* ogr2ogr: Improve performance of -clipsrc and -clipdst (#7197)
-* ogr2ogr: LoadGeometry(): use UnaryUnion()
-* ogrmerge.py: add optimization for GPKG -> GPKG non-single layer case (up to
-  10x faster)
+* ogrinfo: fix error message when not specifying a filename
+* ogrinfo text output: avoid weird truncation of coordinate epoch when
+  its value is {year}.0
+* ogr2ogr: do not call CreateLayer() with a geom field defn of type wkbNone
+  (#10071)
+* ogr2ogr: error out if GCP transform creation fails (#10073)
 
 ### Vector drivers
 
-Arrow driver:
- * add support for getting/setting field alternative name and comment in
-   gdal:schema extension
+AVCBin driver:
+ * avoid integer overflow (ossfuzz #68814)
 
-CSV driver:
- * recognize pipe separator and .psv extension for read (#6811)
- * fix GetFeatureCount() to work correctly with spatial and attribute filters
- * allow reading single column file (#7595)
+DXF driver:
+ * avoid slight numeric imprecision with closed lwpolyline and arcs (#10153)
 
-CSW driver:
- * Add 'title' as query-able property
+ESRIJSON driver:
+ * do not set width on DateTime field
+ * fix paging when URL contains f=pjson instead of f=json (#10094)
 
 FileGDB driver:
- * do not set Length/Precision from OGR width/precision for floating-point data
-   types (#7283)
- * correct ObjectID field to have a Length of 4.
+ * be robust to be called with a geometry field definition of type wkbNone
+   (#10071)
 
-FlatGeobuf driver:
- * decrease memory usage when inserting lots of features
- * speed-up writing of DateTime/Date values
- * avoid crash when writing huge geometry
- * Support reading/writing field comments in field description metadata (#7598)
+FlatGeoBuf driver:
+ * more explicit error message in case of feature geometry type != layer
+   geometry type (#9893)
 
-GML driver:
- * Use geometry in boundedBy element if there are no geometry properties
- * use srsDimension on top gml:Envelope as the default one (#6986)
- * GML geometry parsing: don't promote to 3D a 2D <gml:Box>
- * deal with only <gml:null> in boundedBy element
- * fix reading CityGML Lod2 with xlink:href in gml:Solid as found in German
-   datasets (qgis/QGIS#51647)
- * add support for getting/setting field comment
+GeoJSON driver:
+ * do not recognize GeoJSON files with a featureType feature property as JSONFG
+   (#9946)
+ * make it possible with -if/papszAllowedDrivers to force opening a JSONFG file
+   with the GeoJSON driver
+ * implement IUpdateFeature() that was broken up to now
+ * declare missing capabilities DELETE_FIELD, REORDER_FIELDS,
+   ALTER_FIELD_DEFN_FLAGS
 
-GMLAS driver:
- * add BoundingShapeType as a known geometry type
+GML driver:
+ * fix memory leak due do xlink:href substitution in a non-nominal case
+   (ossfuzz #68850)
+ * GML_SKIP_RESOLVE_ELEMS=HUGE: keep gml:id in .resolved.gml file
+ * avoid assertion due to trying to load existing .gfs file after reading
+   .resolved.gml (#10015)
+ * fix issue with nested elements with identical names in
+   GML_SKIP_RESOLVE_ELEMS=HUGE mode (#10015)
+ * make sure SRS is detected when using GML_SKIP_RESOLVE_ELEMS=HUGE on a AIXM
+   file, otherwise GML_SWAP_COORDINATES might not work correctly
+
+JSONFG driver:
+ * dataset identification: recognize more JSON-FG specification version
 
-GPKG driver:
- * Implement relationship creation, deletion and update support
- * add direct read and create support for .gpkg.zip files
- * SQLite/GPKG: move PRELUDE_STATEMENTS evaluation just after database opening
- * add a gdal_get_pixel_value() SQL function.
- * add a SetSRID() SQL function
- * speed-up writing of DateTime/Date values
- * allow opening filenames >= 512 characters
- * do not register non-spatial layers on creation if there are already
-   unregistered non-spatial layers (qgis/qgis#51721)
- * avoid potential int overflows / crash on huge geometries
- * make SQL function ogr_layer_Extent() available (#7443)
- * Map field alternative name with "name" attribute from gpkg_data_columns table
- * Map field comment with "description" attribute from gpkg_data_columns table
- * hide implicit relationships from NGA GeoInt and Spatialite system tables
- * add ST_EnvIntersects() for faster spatial filtering when there is no
-   spatial index
- * minimum (read) support for non-standard multiple geometry columns per table
+LIBKML driver:
+ * fix handling of styleUrl element referencing to an external document (#9975)
+ * fix performance issue when writing large files (#10138)
+
+MiraMonVector driver:
+ * adding which polygon cycles the linestring in the linestring metadata information (#9885)
+ * Adding more matches in the look-up table MM_m_idofic.csv
+ * Fixing error in linestring (from not polygon) metadata file
+ * Robustness fixes (ossfuzz #68809)
+ * fix a case of sensitive comparison
+ * fix MMResetFeatureRecord
+ * fix accepted metadata versions/subversions
+
+MapInfo:
+ * .tab: AlterFieldDefn(): fix data corruption when altering (for example
+   renaming) a Integer/Float32 field of size 4 (or Integer64/Float64 field of
+   size 8
+ * avoid potential double-free (ossfuzz#69332, ossfuzz#69334)
 
-GPX driver:
- * add capability to read & write content of <metadata> element (#7190)
+netCDF driver:
+ * writer: use CF-1.8 with FORMAT=NC4 and GEOMETRY_ENCODING=WKT
 
-LVBAG driver:
- * fix std::find() test
+ODS driver:
+ * implement IUpdateFeature() that was broken up to now
+ * declare missing capabilities DELETE_FIELD, REORDER_FIELDS,
+   ALTER_FIELD_DEFN_FLAGS
+ * fix CreateFeature() implementation when a FID is set
 
-MITAB driver:
- * add support for LargeInt (Integer64) data type (#7162)
+OpenFileGDB driver:
+ * writer: .gdbtable header must be rewritten when updating an existing feature
+   at the end of file (otherwise resulting file might not be readable by
+   Esri software)
+ * detect and try to repair corruption of .gdbtable header related to above item
+ * BuildSRS(): do not use CPLErrorReset()
 
-NAS driver:
- * make it trigger only if NAS_GFS_TEMPLATE config option is set (#7529)
+Parquet driver:
+ * GeoParquet: always write version=1.1.0
 
-MongoDBv3 driver:
- * avoid get_utf8() deprecatation warning with mongocxx 3.7.0
+PDF driver:
+ * fix wrong order of matrix multiplication for 'cm' operator... (#9870)
+ * make ExploreContentsNonStructured() be able to parse OGCs as generated
+   by ArcGIS 12.9 (fixes #9870)
+ * just ignore unknown objects referenced by /Do (#9870)
 
-netCDF driver:
- * add support for getting/setting alternative name and comment
+PMTiles driver:
+ * writer: fix crash in ogr2ogr (or Arrow based workflows) from GeoPackage/
+   GeoParquet to PMTiles (#10199)
 
-OAPIF driver:
- * Add support for OGC API Features - Part 2 CRS extension (ie ability to work
-   with non WGS 84 CRS)
- * Add CRS/PREFERRED_CRS open options to control the active CRS
- * Add a SERVER_FEATURE_AXIS_ORDER open option
- * Implement GetSupportedSRSList() and SetActiveSRS()
+PG driver:
+ * avoid errors related to ogr_system_tables.metadata when user has not enough
+   permissions (#9994)
+ * really honor OGR_PG_ENABLE_METADATA=NO in SerializeMetadata()
 
-OCI driver:
- * improve round-tripping of EPSG CRS (#7551)
+SQLite/GPKG drivers
+ * detect UNIQUE constraints expressed as a ', CONSTRAINT name UNIQUE (column_name)'
+   at the end of CREATE TABLE (qgis/QGIS#57823)
 
-OpenFileGDB driver:
- * Optimise writing of large geometries
- * allow CreateField() with OBJECTID as the column name (#51435)
- * make Delete() method to remove the directory (#7216)
- * remove traces of dealing with field precision (#7283)
- * correct ObjectID field to have a Length of 4.
- * take into account SpatialReference.VCSWKID/LatestVCSWKID for compound CRS
- * relax test to detect broken .spx
+XLSX driver:
+ * implement IUpdateFeature() that was broken up to now
+ * declare missing capabilities DELETE_FIELD, REORDER_FIELDS,
+   ALTER_FIELD_DEFN_FLAGS
+ * fix CreateFeature() implementation when a FID is set
 
-OGR_VRT:
- * add support for reading alternative name and comment from VRT XML
+## Python bindings
 
-OSM driver:
- * add a tags_format=json osmconf.ini setting and TAGS_FORMAT=JSON open option,
-   as an alternative for HSTORE for other_tags/all_tags fields (#7533)
+* do not emit warnings about not having used [Dont]UseExceptions() if run under
+  gdal.ExceptionMgr()
+* avoid gdal.ExceptionMgr() to re-throw a GDAL exception already caught under it
+* avoid exception emitted and caught under gdal.ExceptionMgr() to cause later
+  issues
+* Avoid crash when using orphaned subgeometry (#9920)
+* make them compatible of SWIG 4.3.0dev
 
-Parquet driver:
- * add support for getting/setting field alternative name and comment in
-   gdal:schema extension
 
-PG driver:
- * Add WKBFromEWKB() for a slightly faster OGRGeometryFromEWKB()
- * fix TEMPORARY layer creation option
- * Add SKIP_VIEWS open option to replace PG_SKIP_VIEWS config option
- * Remove PG_USE_TEXT config option
- * use standard_conforming_strings=ON
- * add support for getting/setting/altering field comments (#7587)
- * truncate table names larger than 63 characters (#7628)
+# GDAL/OGR 3.9.0 Releases Notes
 
-PGDump driver:
- * fix TEMPORARY layer creation option
- * add GEOM_COLUMN_POSITION layer creation option and allow empty FID= (#7482)
- * fix escaping of schema and table name (#7497)
- * add support for setting field comments
- * truncate table names larger than 63 characters (#7628)
+GDAL/OGR 3.9.0 is a feature release.
+Those notes include changes since GDAL 3.8.0, but not already included in a
+GDAL 3.8.x bugfix release.
 
-Shapefile driver:
- * writer: do no use SHPRewindObject() for [Multi]Polygon layers, but use the
-   input OGRGeometry structure to deduce the winding order (#5315)
- * writer: prevent potential overflows on 64-bit platforms on huge geometries
- * writer: optimize MultiLineString writing
+## In a nutshell...
 
-SQLite driver:
- * Implement AddRelationship support
- * add a gdal_get_pixel_value() SQL function
- * allow opening filenames >= 512 characters
- * make SQL function ogr_layer_Extent() available (#7443)
- * Spatialite: remove support for libspatialite < 4.1.2
-
-WFS driver:
- * implement GetSupportedSRSList() and SetActiveSRS()
-
-## SWIG Language Bindings
-
-All bindings:
- * add gdal.VectorInfo()
- * fix GDT_TypeCount value (affects C# and Java bindings)
- * add gdal.GetNumCPUs() and gdal.GetUsablePhysicalRAM()
- * add gdal.CopyFile()
- * fix syntax error that fail with SWIG 4.1
-
-CSHARP bindings:
- * add SkiaSharp (#6957)
- * Add missing wrappers for BuildVRT and MultiDimTranslate (#7517)
-
-Python bindings:
- * Emit FutureWarning when exceptions are not explicitly enabled or disabled.
-   Turning on exceptions by default is planned for GDAL 4.0
- * Make UseExceptions() on one of gdal/ogr/osr module affect all of them
- * add gdal/ogr/osr.ExceptionMgr() Context Manager for handling Python exception
-   state (#6637)
- * add gdal.config_option() and gdal.config_options() context manager
- * add gdal.quiet_errors() context manage
- * make ogr.Open() and ogr.OpenShared() work with verbose error when exceptions
-   are enabled
- * gdal.VectorTranslate: add missing extra options (#6486)
- * Adapt various utilities for exceptions enabled: gdal_merge.py,
-   ogr_layer_algebra.py, ogr_merge, gdalinfo.py, ogr2ogr.py
- * __init__.py: more robust handling of PATH (cf rasterio/rasterio#2713)
- * do not make gdal.PushErrorHandler()/PopErrorHandler() sensitive to the GDAL
-   error context
- * Make GetArrowStreamAsNumPy() handle large lists, strings and binaries
- * make Dataset.ExecuteSQL() usable as a context manager to automatically
-   release the layer (#7459)
- * GetArrowStreamAsNumPy(): optimization to save memory on string fields with
-   huge strings compared to the average size
-
-# GDAL/OGR 3.6.0 Release Notes
-
-Those notes include changes since GDAL 3.5.0, but not already included in a GDAL 3.5.x bugfix release.
-
-## In a nutshell...
-
-* CMake is the only build system available in-tree. autoconf and nmake build systems have been removed
-* OpenFileGDB: write and update support (v10.x format only), without requiring any external dependency, with same (and actually larger) functional scope as write side of the FileGDB driver
-* [RFC 86](https://gdal.org/development/rfc/rfc86_column_oriented_api.html): Column-oriented read API for vector layers.
-  Implemented in core, Arrow, Parquet, GPKG and FlatGeoBuf drivers
-* Add read/write raster [JPEGXL driver](https://gdal.org/drivers/raster/jpegxl.html) for standalone JPEG-XL files. Requires libjxl
-* Add KTX2 and BASISU read/write raster drivers for texture formats. Require (forked) basisu library
-* Vector layer API: table relationship discovery & creation, Upsert() operation
-* GeoTIFF: add multi-threaded read capabilities (reqiures NUM_THREADS open option or GDAL_NUM_THREADS configuration option to be set)
-* Multiple performance improvements in GPKG driver
-* ogr_layer_algebra.py: promoted to official script (#1581)
-* Code linting and security fixes
-* Bump of shared lib major version
-
-## New optional dependencies
-
-* libjxl: for JPEGXL driver (it was already a potential dependency in past versions, when using internal libtiff, to get the JXL TIFF codec)
-* libarrow_dataset: for Parquet driver
-* [QB3](https://github.com/lucianpls/QB3): for QB3 codec in MRF driver
-* [basisu](https://github.com/rouault/basis_universal/tree/cmake): required for KTX2 and BASISU drivers
-
-## New installed files
-
-* bin/ogr_layer_algebra.py
-* include/ogr_recordbatch.h
+* [RFC 96](https://gdal.org/development/rfc/rfc96_deferred_plugin_loading.html):
+  Deferred C++ plugin loading
+* [RFC 97](https://gdal.org/development/rfc/rfc97_feature_and_fielddefn_sealing.html):
+  OGRFeatureDefn, OGRFieldDefn and OGRGeomFieldDefn "sealing"
+* [RFC 98](https://gdal.org/development/rfc/rfc98_build_requirements_gdal_3_9.html):
+  Build requirements for GDAL 3.9
+* [RFC 99](https://gdal.org/development/rfc/rfc99_geometry_coordinate_precision.html):
+  Geometry coordinate precision
+* Add [S104](https://gdal.org/drivers/raster/s104.html) (Water Level Information
+  for Surface Navigation Product) and
+  [S111](https://gdal.org/drivers/raster/s111.html) (Surface Currents Product)
+  raster read-only drivers (required libhdf5)
+* Add raster [GTI](https://gdal.org/drivers/raster/gti.html) (GDAL Raster Tile
+  Index) driver to support catalogs with huge number of sources.
+* Add vector [MiraMonVector](https://gdal.org/drivers/vector/miramon.html)
+  read/creation driver (#9688)
+* Deprecated ARG driver has been removed (#7920)
+* Code linting
 
-## Removed installed files
+## Build
 
-None
+* CMake: add ``[GDAL|OGR]_REGISTER_DRIVER_<driver_name>_FOR_LATER_PLUGIN``
+  variables (RFC 96)
+* CMake: Bump max compatible version to 3.28
+* CMake: add a way of defining an external deferred driver by setting one or
+  several ADD_EXTERNAL_DEFERRED_PLUGIN_XXX CMake variables (RFC 96)
+* CMake: error out if a driver has been asked as a plugin, but conditions are not met
+* CMake: rework PROJ detection
+* CMAKE_UNITY_BUILD=YES builds are possible, but not recommended for production
+* gdal.cmake: set -DDEBUG for CMAKE_BUILD_TYPE=Debug for Windows builds as well
+* CMake: add GDAL_FIND_PACKAGE_OpenJPEG_MODE and GDAL_FIND_PACKAGE_PROJ_MODE
+  variables
+* FindSQLite3.cmake: avoid repeating finding `SQLite3_INCLUDE_DIR`/
+ `SQLite3_LIBRARY` if existed.
+* Add compatibility for Intel Compiler 2024.0.2.29
 
 ## Backward compatibility issues
 
-See [MIGRATION_GUIDE.TXT](https://github.com/OSGeo/gdal/blob/release/3.6/MIGRATION_GUIDE.TXT)
+See [MIGRATION_GUIDE.TXT](https://github.com/OSGeo/gdal/blob/release/3.8/MIGRATION_GUIDE.TXT)
 
-## Build changes
+## Changes in installed files
 
-Enhancements:
- * Add version suffix to DLL when compiling for MinGW target
- * Add a -DBUILD_WITHOUT_64BIT_OFFSET advanced option (#5941)
- * Add a USE_ALTERNATE_LINKER option
- * Build iso8211 library conditionally to drivers requiring it
+* data/MM_m_idofic.csv: new
+* data/gdalvrtti.xsd: new
+* data/pci_datum.txt and data/pci_ellips.txt: updated (#8034)
+* include/cpl_minizip_ioapi.h, cpl_minizip_unzip.h, cpl_minizip_zip.h:
+  removed. They use since 3.5 an header that is not installed, so were unusable
 
-Fixes:
- * Fix build without PNG (#5742) and JPEG (#5741)
- * Various changes for CHERI-extended architectures such CHERI-RISC-V or Arm Morello with sizeof(void*) == 16
- * FindMono.cmake: fix setting 'CSHARP_MONO_INTERPRETER_', to avoid having to run CMake twice
- * swig/python/CMakeLists.txt: fix SWIG_REGENERATE_PYTHON mode
- * FindNetCDF.cmake: fix when running on Ubuntu 16.04 regarding erroneous detection of netcdf_mem.h
- * Remove uses of std::regex (#6358)
- * honour CMAKE_INSTALL_RPATH for Python bindings, but only if it is an absolute path. (#6371)
- * Python: fix to allow building in ubuntu 18.04 (#6443)
- * Fixed building position independent static lib
- * Fix issues when building/installing in directories with spaces, at least on Unix.
- * fix LIBKML linking on Windows Conda
- * make sure to register EEDAI driver when built as a plugin
- * fix Win32 csharp build (#6620)
+## GDAL 3.9.0 - Overview of Changes
 
-## Internal libraries
+### Port
 
-* flatbuffers: updated
-* internal libtiff: resynchroinzation with upstream
-* internal libpng: use __UINTPTR_TYPE__ for png_ptruint when available
+* /vsicurl: add ANYSAFE & BEARER to auth methods (#8683)
+* /vsicurl/: re-emit HTTP error code next times we try opening a resource that
+  failed the first time (#8922)
+* /vsicurl/: add a VSICURL_PC_URL_SIGNING path-specific option to enable
+  Planetary Computer URL signing only on some URLs
+* /vsicurl/: Read(): emit error message when receiving HTTP 416 Range Not
+  Satisfiable error
+* Add VSIVirtualHandle::GetAdviseReadTotalBytesLimit()
+* cpl_http: retry "Connection reset by peer"
+* Add a VSICURLMultiCleanup() that runs with SIGPIPE ignored (#9677)
+* /vsiaz/: fix RmdirRecursive() on an empty directory with just the
+  .gdal_marker_for_dir special marker file
+* /vsis3/: include region to build s3.{region}.amazonaws.com host name (#9449)
+* /vsigs/: fix RmdirRecursive() on an empty directory
+* /vsigs/ UnlinkBatch(): make sure that path config options are checked for the
+  deleted files and not '/vsigs/batch/
+* /vsiaz/ UnlinkBatch(): make sure that path config options are checked for the deleted files
+* Add VSIVirtualHandle::Printf()
+* Add VSIRemovePluginHandler() to enable removal of virtual filesystems (#8772)
+* No longer alias CPLMutex, CPLCond and CPLJoinableThread to void in non-DEBUG
+  builds (ABI change)
+* Win32 extended filenames (starting with "\\?\"): various fixes; add support
+  for network UNC paths
+* Add VSIGetDirectorySeparator() to return the directory separator for the
+  specified path
+* Add CPLXMLNodeGetRAMUsageEstimate()
+* CPLCreateOrAcquireMutexEx(): fix warning about lock-order inversion (#1108)
+* Win32 Stat(VSI_STAT_EXISTS_FLAG): improve performance (#3139)
+* Add CPLDebugProgress() to display a debugging message indicating a progression
+* CSLConstList/CPLStringList: add iterating facilities and better
+  ``std::vector<std::string>`` operability
+* Add CPLStringList::front(), back() and clear()
+* Add CPLStrtodM()
+* CPLStrtod(): set errno=0 when no value has been parsed to conform to POSIX
+* Add CPLUTF8ForceToASCII()
+* VSICACHE: avoid EOF read (#9669)
 
-## GDAL 3.6.0 - Overview of Changes
+### Core
 
-### Port
+* GDALRATValuesIOAsString(): fix wrong type for papszStrList argument
+* Add GDALDataset::DropCache() (#8938)
+* Add GDALDataset::UnMarkSuppressOnClose() and IsMarkSuppressOnClose() (#8980)
+* Add GDALGetOutputDriversForDatasetName()
+* Modify the logic of selection of overviews for non-nearest resampling; add a
+  GDAL_OVERVIEW_OVERSAMPLING_THRESHOLD config option (#9040)
+* GDALMDArray::AsClassicDataset(): make it possible to use overviews
+* GDALOpen(): change error message when a dataset isn't recognized (#9009)
+* GDALDeserializeGCPListFromXML(): validate value of GCP Pixel,Line,X,Y,Z
+  attributes
+* PAM: only unset GPF_DIRTY flag
+* GDALGetCacheMax64(): fix warning about lock-order inversion (#1837)
+* Add gdal::GCP class
+* QuietDeleteForCreateCopy(): forward source dataset open options (#9422)
 
-New features:
- * Add CPLIsASCII()
- * /vsis3/: Provide credentials mechanism for web identity token on AWS EKS (#4058)
- * /vsis3/: support source_profile in .aws/config pointing to a profile with a web_identity_token_file (#6320)
- * /vsistdin/: make size of buffered area configurable (#751)
- * add VSIIsLocal(), VSISupportsSequentialWrite() and VSISupportsRandomWrite()
- * Configuration file: add a ignore-env-vars=yes setting (#6326) in a \[general\] leading section
- * Add a cpl::ThreadSafeQueue<> class
+### Multidimensional API
 
-Enhancements:
- * VSIFileFromMemBuffer(): allow anonymous files
- * CPLCheckForFile(): do not request file size
- * /vsicurl/: when CPL_CURL_VERBOSE is enabled, log as CPLDebug() message the error message from the server
- * /vsicurl / CPLHTTPFetch(): add GDAL_HTTP_HEADERS configuration option (#6230)
- * VSIVirtualHandle: add a PRead() method for thread-safe parallel read and implement it in /vsimem/ and Unix virtual file system
- * /vsis3/: make CPL_VSIS3_USE_BASE_RMDIR_RECURSIVE a path-specific configuration option
- * Make GDAL_DISABLE_READDIR_ON_OPEN a path-specific configuration option
- * Add VSISetPathSpecificOption() / VSIGetPathSpecificOption() / VSIClearPathSpecificOptions().
-   Deprecate VSISetCredential() / VSIGetCredential() / VSIClearCredentials()
- * /vsicurl/ and other network file systems: add a DISABLE_READDIR_ON_OPEN=YES/NO VSIFOpenEx2L() option
- * Add a VSIFilesystemHandler::SupportsRead() method
- * Add GDAL_HTTP_TCP_KEEPALIVE/GDAL_HTTP_TCP_KEEPIDLE/GDAL_HTTP_TCP_KEEPINTVL configuration options to control TCP keep-alive functionality
- * Make CPLODBCSession and CPLODBCStatement member variables 'protected' (#6314)
+* Add GDALCreateRasterAttributeTableFromMDArrays() to return a virtual Raster
+  Attribute Table from several GDALMDArray's
+* fix wrong DataAxisToSRSAxisMapping
+* GDALMDArray::AsClassicDataset(): make it possible to use overviews
 
-Bugfixes:
- * cpl_config.h: Don't use __stdcall on MinGW
- * CPL recode: fix issues with iconv library integrated in musl C library
- * CPLWorkerThreadPool::SubmitJob(): avoid potential deadlock when called from worker thread
- * /vsicurl/: fix caching of first bytes of the files
+### Algorithms
 
-### Core
+* Implement basic Line-of-sight algorithm (#9506, #9050)
+* Warper: fix artifacts when reprojecting from long/lat to ortho (#9056)
+* GDALSuggestedWarpOutput2(): ortho->long/lat: limit extent to
+  [lon_0-90,lon_0+90] even when poles are included
+* Warper: limit artifacts when doing ortho->long/lat (provided that srcNodata is
+  set)
+* GDALSuggestWarpOutput(): make it return original potential non-square pixel
+  shape for a south-up oriented dataset (#9336)
+* Warper: add a EXCLUDED_VALUES warping option to specify pixel values to be
+  ignored as contributing source pixels during average resampling. And
+  similarly, add a NODATA_VALUES_PCT_THRESHOLD warping option for nodata/
+  transparent pixels.
+* GDALFillNodata(): add a INTERPOLATION=NEAREST option
+* GDALChecksumImage(): read by multiple of blocks for floating-point bands to
+  improve performance
 
-New features:
- * Add a GDALRasterBand::GetSuggestedBlockAccessPattern() method, implement it in GTiff, JPEG, PNG, PDF drivers and use it in GDALCopyWholeRasterGetSwathSize().
- * GDALJP2Box/GDALJP2Metadata: add support for reading/writing JUMBF box
- * Add a GDALDeinterleave() function, to copy values from a pixel-interleave buffer to multiple per-component,
-  and add SSE2/SSSE3 optimizations for a few common scenarios like Byte/UInt16 3/4 components.
-  Use it in GTiff and MEM drivers.
- * C API change: make GDALComputeRasterMinMax() return CPLErr instead of void (#6300)
- * Add a GDAL_DMD_MULTIDIM_ARRAY_OPENOPTIONLIST constant
+### Utilities
 
-Enhancements:
- * GDALRasterBand::ComputeRasterMinMax(): add optimized implementation for Byte and UInt16 data types (~10 times faster)
- * Multidim API: significantly enhance performance of reading transposed arrays for netCDF/HDF5
- * GDALVersionInfo(): report if it is a debug build in --version output, and report compiler version in BUILD_INFO output
- * /vsicurl/: cache the result of several collections/URL signing requests to Planetary Computer
- * GDALCopyWholeRasterGetSwathSize(): aim for a chunk that is at least tall as the maximum of the source and target block heights
- * GDALGetJPEG2000Structure(): add JP2_BOXES, CODESTREAM_MARKERS, STOP_AT_SOD, ALLOW_GET_FILE_SIZE options
- * GDALDataset::BuildOverviews/IBuildOverviews(): add a CSLConstList papszOptions parameter
- * GDALDataset::CreateLayer(): honor GDAL_VALIDATE_CREATION_OPTIONS (#6487)
-
-Breaking changes:
- * Remove use of compatibility wrappers _GetProjectionRef / _GetGCPProjection / _SetProjection / _SetGCPs (#6186)
-
-Bugfixes:
- * EXIFCreate(): fix writing of EXIF_UserComment
- * GDALPamDataset::TrySaveXML(): do not set error if a subdataset name is set but the .aux.xml doesn't exist (#5790)
- * GDALOpen(): make recursive opening of dataset more reliable when papszAllowedDrivers is passed
- * GetHistogram(): Support 64 bit images (#6059)
- * GetHistogram(): deal with undefined behavior when raster values are at infinity, or with pathological min/max bounds
- * GDALPamRasterBand::SetOffset()/SetScale(): set the bOffsetSet/bScaleSet even if the value provided is the default offset/scale
- * GDALDataset/GDALRasterBand::BuildOverviews/IBuildOverviews(): fix const correctness of panOverviewList and panBandList arguments
- * Overview: tighten GAUSS and MODE to be exactly those names, and not starting with them
- * Overview building: fix MODE resampling on large datasets (#6587)
-
-### Algorithms
-
-Enhancements:
- * Transformer: add SRC_GEOLOC_ARRAY and DST_GEOLOC_ARRAY transformer options
- * GDALChecksumImage(): make it return -1 in case of error
-
-### Utilities
-
-New features:
- * gdalinfo: add a STAC section to `gdalinfo -json` output (#6265)
- * gdal_translate: add a -ovr <level|AUTO|AUTO-n|NONE> flag (#1923)
- * gdal2tiles.py: add WEBP support with --tiledriver option
- * gdalmdiminfo & gdalmdimtranslate: add -if (input format) flag (#6295)
- * gdal_grid: add 'radius' parameter to invdist, nearest, averge and metrics algorithm, to set radius1 and radius2 at the same time
- * gdal_grid: add per-quadrant search capabilities for invdistnn, average, and metrics algorithms
- * ogr_layer_algebra.py: promoted to official script (#1581)
-
-Enhancements:
- * gdal2tiles.py: short circuit overview tile creation for --resume ahead of processing base tiles
- * gdal2tiles.py: refactor transparent file check in overview creation
- * gdalsrsinfo: use wkt2_2019 name instead of wkt2_2018
- * gdal_viewshed: use -cc 1.0 as default for non-Earth CRS (#6278)
- * nearblack: skip erosion when pixel at edge is valid
- * gdal_grid: produce north-up images
- * gdal_grid: add validation of algorithm parameters and warn when a unknown parameter is specified
- * gdal_grid: add a nSizeOfStructure leading structure member in GDALGridXXXXOptions structure, as a way to detect ABI issues when adding new parameters
-
-Bugfixes:
- * gdalwarp: modify 'sum' resampling to preserve total sum
- * gdalwarp: fix issue with wrong resolution when reprojecting between geographic CRS with source extent slightly off [-180,180]
- * gdalwarp: fix artifacts around antimeridian for average/mode/min/max/med/q1/q3/sum/rms resampling (#6478)
- * gdal2tiles.py: remove PIL deprecation warning by replacing ANTIALIAS with LANCZOS
- * gdal2tiles: allow oversampling in -p raster mode (fixes #6207)
- * gdal2xyz.py: fix parsing of -b option (#5984)
- * gdal_rasterize: fix ALL_TOUCHED on polygons whose boundaries coordinates are aligned on pixels (#6414)
-
-### gdal_utils package
-
-* standardized return codes (#5561). Return 2 when utilities called without argumen
-
-### Raster drivers
-
-ADRG driver:
- * add SRP pixel spacing value (SRP_PSP) to the dataset metadata
-
-COG driver:
- * add a OVERVIEW_COUNT creation option to control the number of overview levels (#6566)
- * add DMD_EXTENSIONS metadata item (#6073)
- * properly set lossy WEBP compression when QUALITY_OVERVIEW < 100 but QUALITY = 100 (#6550)
-
-COSAR driver:
- * handle version 2 files that contain half-foat samples (#6289)
-
-ECRGTOC driver:
- * fix error on RasterIO() when GDAL_FORCE_CACHING=YES is set
-
-ECW driver:
- * strip off boring Kakadu and OpenJPEG COM marker comments
-
-ENVI driver:
- * implement 'default bands' to read/write R,G,B and gray color interpretation (#6339)
- * implement Get/Set Scale/Offset from ENVI 'data gain values'/'data offset values' (#6444)
- * use OGRSpatialReference::FindBestMatch() on reading to find a matching known CRS (#6453)
-
-GPKG driver:
- * in CreateCopy() mode for Byte data, save the band count in a IMAGE_STRUCTURE metadata domain to be able to re-open the file with the appropriate number of bands
- * default to PNG storage for single band dataset (qgis/QGIS#40425)
- * writer: write fully set tiles as soon as possible to decrease pressure on block cache
-
-GTiff driver:
- * add multi-threaded read capabilities (reqiures NUM_THREADS open option or GDAL_NUM_THREADS configuration option to be set)
- * JXL codec: support more than 4 bands in INTERLEAVE=PIXEL mode (#5704)
- * JXL codec: preserve Alpha color interpretation when the Alpha band does not immediately follow color bands (e.g. R,G,B,undefined,Alpha), and fix decoding of such files
- * add a WEBP_LOSSLESS_OVERVIEW=YES/NO configuration option (#6439)
- * report a COMPRESSION_REVERSIBILITY=LOSSLESS (possibly)/LOSSY metadata item in IMAGE_STRUCTURE for WEBP and JXL compression
- * read/write JPEGXL and WEBP compression parameters (for main dataset only) in IMAGE_STRUCTURE metadata domain of GDAL_METADATA tag
- * avoid potential crash on creation in a disk full situation
- * fix reading a CompoundCRS of a LocalCS/EngineeringCS, and avoid warnings on writing (#5890)
- * report codec name (or code) when opening a file with a unhandled code
- * WEBP: avoid unnecessary temporary buffer creation and copy (most of changes are in libtiff itself)
- * force INTERLEAVE=PIXEL for internal overviews when using WEBP compression
- * avoid SetMetadata() to cancel effect of SetGeoTransform() (#6015)
- * refuse to open files with SampleFormat=IEEEFP and BitsPerSample != 16, 24, 32 or 64
- * SRS import: better deal when angular unit of the GEOGCS[] of the PROJCS[] doesn't match the one from the database
- * SRS export: avoid error when exporting a Projected 3D CRS (#6362)
- * honour COMPRESS_OVERVIEW and INTERLEAVE_OVERVIEW for internal overviews (#6344)
- * CreateCopy(): fix marking alpha channels that are not the last one (#6395)
-
-HDF5 driver:
- * multidim: fix crash on 'gdalmdiminfo HDF5:autotest/gdrivers/data/netcdf/alldatatypes.nc'
-
-JP2KAK driver:
- * use kdu_multi_analysis class for tile encoding, instead of very low level kdu_analysis
- * use kdu_stripe_compressor whenever the required buffer size is < CACHE_MAX / 4, otherwise fallback to kdu_multi_analysis
- * add (at least build) support for versions down to 7.3
-
-All JPEG2000 drivers:
- * report a COMPRESSION_REVERSIBILITY=LOSSLESS/LOSSLESS (possibly)/LOSSY metadata item in IMAGE_STRUCTURE domain
-
-JP2OpenJPEG driver:
- * for reversible compression, write a hint in the COM marker if the compression is lossy or not, and use it on reading
-
-JPEG-XL driver:
- * NEW!
- * The JPEG-XL format is supported for reading, and batch writing (CreateCopy()), but not update in place.
-  The driver supports reading and writing:
-    - georeferencing: encoded as a GeoJP2 UUID box within a JUMBF box.
-    - XMP in the xml:XMP metadata domain
-    - EXIF in the EXIF metadata domain
-    - color profile in the COLOR_PROFILE metadata domain.
-
-KEA driver:
- * add support for 64 bit nodata functions
-
-MRF driver:
- * Add QB3 compression (#5824)
-
-netCDF driver:
- * handle variables of type NC_SHORT with _Unsigned=true as GDT_UInt16 (#6352)
- * do not report metadata of indexing variables of dimensions not used by the variable of interest (#6367)
- * fix 2 issues with netCDF 4.9.0 of msys2-mingw64 (#5970)
- * multidim: workaround crash with using same file in 2 different threads (each thread with its own dataset object) (#6253)
- * ignore 'missing_value' when it is a non-numeric string
- * multidim: use 'fill_value' attribute as an alternative for nodata, and add a USE_DEFAULT_FILL_AS_NODATA=YES array open option
- * allow NETCDF:"/vsicurl_streaming/http[s]://example.com/foo.nc":variable_name (#6610)
-
-NITF driver:
- * do not put PAM metadata in a Subdataset node of .aux.xml file if there's a single dataset (3.4.0 regression) (#5790)
- * avoid excessive memory allocation on broken files (ossfuzz#52642)
- ù fix crash when reading all metadata from a file without image segment, and allow creating such file
- * add support for writing a TRE_OVERFLOW DES
- * nitf_spec.xml: lower minlength for CSEPHA
-
-PDF driver:
- * avoid PROJ error when reading a CRS with a EPSG code that is actually a ESRI one (#6522)
-
-PNG driver:
- * report cause when unable to create file
-
-RMF driver:
- * backup error state before min-max computation at FlushCache
- * Ext header size checks improved
-
-VRT driver:
- * optimize speed of statistics and minmax computation when the VRT is a mosaics of non-overlapping simple sources
- * ComputeStatistics(): for mosaicing case, enable it to be multi-threaded if GDAL_NUM_THREADS is set
- * take into account open options when sharing sources (#5989)
-
-WEBP driver:
- * report a COMPRESSION_REVERSIBILITY=LOSSLESS/LOSSY metadata item in IMAGE_STRUCTURE
-
-## OGR 3.6.0 - Overview of Changes
-
-### Core
-
-New features:
- * OGRLayer: add Arrow C stream based batch retrieval (RFC 86)
- * Add OGRLayer::Upsert() operation support (#6199). Implement it in MongoDBv3, ElasticSearch MEM, GPKG drivers
- * Add OGR_G_ConcaveHull(), using GEOS >= 3.11 GEOSConcaveHull_r(), and map it to SWIG
- * Add a OGRLayer::AlterGeomFieldDefn() / OGR_L_AlterGeomFieldDefn() to change geometry field definitions. Implement in MEM, Shapefile, GPKG, PG, OpenFileGDB drivers
- * Add GDALRelationship class for describing a relationship between two tables,
-   and related API for retrieving the relationship
-   names and relationships in a dataset.
-   Implement discovery in FileGDB, OpenFileGDB, PGeo and GPKG drivers, SQLite
- * Add API for relationship creation/deletion/update.
-   Implement in OpenFileGDB driver
- * Add OGRLayer::GetGeometryTypes(). This method iterates over features to retrieve their geometry types.
-   This is mostly useful for layers that report a wkbUnknown geometry type.
-   Specialized implementation in GPKG and PG drivers.
- * Add a GDAL_DMD_ALTER_GEOM_FIELD_DEFN_FLAGS driver metadata item
- * Add DCAP_CREATE_LAYER for drivers which have support for layer creation
- * Add DCAP_DELETE_LAYER for drivers which have support for layer deletion
- * Add DCAP_DELETE_FIELD for drivers which have support for field deletion
- * Add DCAP_REORDER_FIELDS for drivers which have support for field reordering
- * Add GDAL_DMD_ALTER_FIELD_DEFN_FLAGS for drivers which describe the flags supported for a driver by the AlterFieldDefn API
- * Add DCAP_CURVE_GEOMETRIES for drivers which support curved geometries
- * Add DCAP_MEASURED_GEOMETRIES for drivers which support measured geometries
- * Add driver capability for DCAP_Z_GEOMETRIES
- * Add OLCZGeometries (equivalent to OLCMeasuredGeometries for Z support)
- * Add ODsCZGeometries datasource capability flag
- * Add driver metadata for DMD_GEOMETRY_FLAGS. Contains a list of (space separated) flags which reflect the geometry handling behavior of a driver.
-   Supported values are currently "EquatesMultiAndSingleLineStringDuringWrite", "EquatesMultiAndSinglePolygonDuringWrite".
- * Add OGRParseDateTimeYYYYMMDDTHHMMSSZ() and OGRParseDateTimeYYYYMMDDTHHMMSSsssZ()
- * Add GDAL_DMD_SUPPORTED_SQL_DIALECTS driver metadata.
-
-Enhancements:
- * Make isClockwise() available at the OGRCurve level
- * Export OSRStripVertical() function in C API
- * OGRSimpleCurve point iterator: make its modification instant on the parent curve (#6215)
-
-Bugfixes:
- * OGRFeature::FillUnsetWithDefault(): do not set driver-specific default values on unset numeric fields
- * OGR_SM_InitStyleString(): make it work with a @style_name argument (#5555)
- * Fix loss of split/merge policy when cloning field domains
- * OGRSQL: fix GetFeature() to return a feature such that GetFeature(fid).GetFID() == fid (#5967)
- * OGRGeometry::UnionCascaded(): avoid crash with GEOS < 3.11 on empty multipolygon input
-
-### OGRSpatialReference
-
-New features:
- * Add a OGRSpatialReference::FindBestMatch() method
-
-Enhancements:
- * Warping/coordinate transformation performance improvements
- * OSRGetProjTLSContext(): make it faster on Linux by saving getpid() system call
- * OGRSpatialReference::SetFromUserInput(): allow using strings like EPSG:3157+4617 where the 'vertical CRS' is actually the geographic CRS, to mean ellipsoidal height, which is supported in recent PROJ versions
- * Improve OGRCoordinateTransformation::TransformBounds error handling (#6081)
- * OGRSpatialReference: evaluate OSR_DEFAULT_AXIS_MAPPING_STRATEGY config option at each object construction (#6084)
-
-Bugfixes:
- * Avoid issues with PROJJSON with id in members of datum ensemble
- * OGRSpatialReference::GetTargetLinearUnits(): fix getting linear units from a CompoundCRS of a LocalCS/EngineeringCS (#5890)
-
-### Utilities
-
-New features:
- * ogr2ogr: add -upsert option
-
-Bugfixes:
- * ogr2ogr: make sure geometry column name is going through laundering when outputting to PG/PGDump (#6261)
- * ogr2ogr: take into account -limit when -progress is used
-
-### Vector drivers
-
-All drivers:
- * Add some missing DCAP_VECTOR capabilities to drivers
-
-Arrow/Parquet drivers:
- * implement faster SetAttributeFilter() for simpler filters.
-   Things like "col =/!=/>/>=/</<= constant", "col IS NULL", "col IS NOT NULL", possibly combined with AND.
-
-CSV driver:
- * make AUTODETECT_SIZE_LIMIT=0 open option to scan the whole file, including beyond 2 GB (for non-streaming input) (#5885)
- * fix width autodetection
-
-DXF driver:
- * Support files between 2 GB and 4 GB in size
- * Prevent buffer from sometimes splitting CRLF newlines in MLEADER entities
-
-FlatGeoBuf driver:
- * make CreateLayer() to fail if output file cannot be
- created
-
-FileGDB driver:
- * handle Shape_Area/Shape_Length fields on reading/writing
- * avoid crash when reading layer with AliasName with XML special characters (issue with embedded libxml2 in SDK), and fallback to OpenFileGDB driver to reliably retrieve it (#5841)
- * Report relationships
-
-GeoJSONSeq driver:
- * add support for appending features to an existing file (#2080)
-
-GML driver:
- * make FORCE_SRS_DETECTION=YES open option work with multiple geometry columns (#6392)
- * read <gml:description>, <gml:identifier>, <gml:name> fields in a feature (qgis/QGIS#42660)
- * OGRMergeGeometryTypesEx(): do not consider different type of MultiGeometries (ie MultiPoint, MultiLineString, MultiPolygon) as being mergeable as GeometryCollections (#6616)
-
-GMLAS driver:
- * be robust to GML schemas being pointed to a location different from http://schemas.ogc.net/
-
-GPKG driver:
- * Do not list layers referenced in gpkg_contents but that have no corresponding table (qgis/qgis#30670)
- * Performance improvement in reading features
- * Performance improvement in reading DateTime fields
- * Performance improvement: do not request ignored fields
- * Micro optimizations to improve CreateFeature() speed
- * Performance improvement: implement background RTree creation in bulk insertion into a new table
- * Implement a fast ST_Area() method
- * optimization to remove bbox filtering when the spatial filter is larger than the layer extent
- * remove code path specific to SQLite < 3.7.8 (PROJ requires SQLite >= 3.11)
- * avoid integer overflow when trying to insert strings larger > 2 GB
- * preliminary non-user-visible support for Related Tables Extension
- * fix issue with ST_MakeValid() when the SQLite driver runs before GPKG on Alpine Linux
- * Report relationships, through FOREIGN KEY constraints, and Related Tables extension.
- * properly update gpkg_ogr_contents on INSERT OR REPLACE statements
- * do not warn about http://ngageoint.github.io/GeoPackage/docs/extensions extensions in read-only mode
- * Rename layer: take into account QGIS layer_styles extension
- * add compatibility with GPKG 1.0 gpkg_data_column_constraints table
-
-GRIB driver:
- * fix crash and invalid metadata when processing index .idx file with sub-messages (#6613)
-
-HANA driver:
- * pending batches are not flushed when layer is destroyed
- * reset prepared statements when creating new field
- * fix transaction support
- * execute pending batches from other operations
- * properly handle special characters in connection string
-
-LIBKML driver:
- * writer: add automatic reprojection to EPSG:4326 (#6495)
-
-MITAB driver:
- * implements writing Text objects for Point geometries with LABEL style string (#6149)
-
-ODS driver:
- * make it possible to open file without .ods extension if prefixed with ODS: (#6375)
-
-OpenFileGDB driver:
- * Add write support
- * handle Shape_Area/Shape_Length fields on reading
- * fix use of indexes on strings when the searched value is longer than the max indexed string, or ending with space
- * Report relationships
-
-Parquet driver:
- * add basic support for reading partitionned datasets
- * add CREATOR option
- * do not write statistics for WKB geometry columns
- * make sure 'geo' metadata is embedded in ARROW:schema so that partitioned reading works fine
- * implement SetNextByIndex()
- * make it honour GDAL_NUM_THREADS, and assume min(4, ALL_CPUS) as default value
-
-PG driver:
- * make GEOM_TYPE layer creation option be taken into account by CreateGeomField() (instead of always assuming geometry)
-
-PGDump driver:
- * avoid extraneous harmless spaces in CREATE TABLE statements
-
-S57 driver:
- * resource files: fix missing punctuation (#6000)
-
-Selafin driver:
- * remove likely broken logic in handing /vsigzip/foo.gz filenames
-
-SQLite driver:
- * Report relationships, through FOREIGN KEY constraints
- * SQLiteVFS: fix semantics of xOpen(SQLITE_OPEN_CREATE) that could cause to wrongly truncate an attached database
-
-VFK driver:
- * add support for UTF-8 (VFK 6.0 switched from ISO-8859-2 to UTF-8)
-
-XLSX driver:
- * make it possible to open file without .xlsx extension if prefixed with XLSX: (#6375)
- * improve detection to recognize even if no XLSX: prefix or .xlsx extension
-
-## SWIG Language Bindings
-
-All bindings:
- * Add SWIG bindings for OGR_L_AlterGeomFieldDefn()
- * fix SpatialReference.GetLinearUnitsName() to use OSRGetLinearUnits() to retrieve the name
- * add SpatialReference.StripVertical()
- * Create alias versions with/without GDAL_ prefix for c#/java constants
- * add inverseCT optional parameter to CoordinateOperation.SetOperation(), and add CoordinateOperation.GetInverse()
- * make Band.ComputeStatistics() kwargs
- * add options argument to Dataset.BuildOverviews()
- * fix GDT_TypeCount value (affects C# and Java bindings)
-
-Python bindings:
- * bindings for Arrow Batch functionality
- * add numpy to extras_require option of setup.py
- * add an optional can_return_none=True parameter to Band.ComputeRasteMinMax() to make it return None in case of error. Otherwise, return (nan, nan) (#6300)
-
-# GDAL/OGR 3.5.0 Release Notes
-
-## In a nutshell...
-
-* [RFC 84](https://gdal.org/development/rfc/rfc84_cmake.html):
-  Addition of a CMake build system, which deprecates the existing
-  autoconf/automake and nmake build systems, that will be removed
-  in GDAL 3.6.0. Users are encouraged to adopt the new CMake build system.
-  Documentation of the CMake build system is at
-  https://gdal.org/build_hints.html.
-* Add GDT_Int64 and GDT_UInt64 data types and handle them in MEM, GTiff, netCDF and Zarr drivers
-* Add read/write OGR Parquet (Apache Parquet) and 'Arrow' (Apache Arrow IPC File/Feather or stream) drivers. Only in CMake builds
-* Add OGR HANA database driver. Only in autoconf & cmake builds
-* Removed drivers: RDA, JPEG2000 (Jasper-based), CharLS, MG4 LIDAR, FujiBAS, IDA, INGR, ARCGEN, ArcObjects, CouchDB, Cloudant, DB2, FME, Geomedia, MDB (Java Jackess based), GTM, Ingres, MongoDB (old one. MongoDBv3 is the one to use now), REC, Walk, GMT raster, DODS raster and vector
-* GDAL and OGR GRASS drivers moved to https://github.com/OSGeo/gdal-grass repository
-* Tiger: remove deprecated write side of the driver (#4216)
-* Remove deprecated SWIG Perl bindings
-* Code linting and security fixes
-* Bump of shared lib major version
-
-## New optional dependencies
-
-* odbc-cpp-wrapper (https://github.com/SAP/odbc-cpp-wrapper): for SAP Hana driver
-* Apache arrow-cpp (https://github.com/apache/arrow/tree/master/cpp) libraries: for Parquet and Arrow drivers
-
-## New installed files
-
-* lib/gdalplugins/drivers.ini: list of (known) drivers in the order they must be registered, for deterministic behavior with plugins
-* shared/gdal/grib2_*.csv: resource files for GRIB driver
-
-## Removed files
-
-* Remove deprecated testepsg utility (#3993)
-
-## Backward compatibility issues
-
-See [MIGRATION_GUIDE.TXT](https://github.com/OSGeo/gdal/blob/release/3.5/MIGRATION_GUIDE.TXT)
-
-## Build changes
-
-Build(all):
- * Drop support for non-reentrant external libqhull
- * support libhdf5 1.13.0 (#5061)
- * Support latest Poppler versions (requires C++17)
- * Support tiledb >= 2.7 (requires C++17)
- * Updates for IJG libjpeg-9e
- * Require using https://github.com/rouault/pdfium_build_gdal_3_5 for PDF PDFium support
- * cpl_config.h: remove lots of unused defines, and severely restrict what we export in non-GDAL compilation mode
-
-Build(autoconf/automake):
- * fix detection of OpenEXR >= 3 (#4766)
- * Add support for PCRE2 (to replace deprecated PCRE) (#4822)
- * Add support for external libqhull_r (#4040)
- * add a --with-qhull-pkgname=qhull_r/qhullstatic_r option to select with qhull package to use
- * generate test_ogrsf by default (but not installed)
- * change default of RENAME_INTERNAL_LIBTIFF/LIBGEOTIFF/SHAPELIB_SYMBOLS to yes
- * when building against internal libjpeg, prefix by default libjpeg symbols with gdal_ (#4948)
- * when building against internal libpng, prefix internal libpng symbols with gdal_ (#5303)
- * m4/acinclude.m4: fix detection of fseeko/ftello on netBSD
- * detect xlocale.h to use LC_NUMERIC_MASK on Mac (#5022)
- * move generated headers to a generated_headers subdirectory to allow in a same git checkout, to continue to do autoconf in-source-tree builds as well as cmake out-of-source-tree build
-
-Build(nmake):
- * nmake.opt: fix wrong variable name in example MSODBCSQL_LIB
- * nmake.opt: add a HAVE_ATLBASE_H variable that can be set to NO
-
-## Internal libraries
-
-* Internal zlib: update to 1.2.12 (#5587)
-* Internal libtiff: resync with upstream
-* Internal libgeotiff: resync with upstream
-* Internal libpng: fix memleak on corrupted file (ossfuzz #44486)
-* Internal libjson: update to 0.15.0
-* Internal libLerc: Prevent LERC out of bounds access (#5598)
-* Internal libqhull: update to qhull_r 2020.2 (8.0.2)
-
-## GDAL 3.5.0 - Overview of Changes
-
-### Port
-
-* CPLRecode(): fix recoding between UTF-8 and CP_ACP/CP_OEMCP on Windows build that have iconv support
-* CPLRecodeIconv(): avoid potential unsigned integer overflow (ossfuzz#41201)
-* Fix out of bounds read in CPLRecodeFromWCharIconV() (#5542)
-* Add VSISetCredential() to set /vsis3, /vsigs, /vsiaz ... credentials for a given file prefix
-* VSICurl: Print response code for failed range requests
-* /vsis3/: allow setting AWS_PROFILE to a profile that uses IAM role assumption
-* IVSIS3LikeFSHandler::CopyFile(): always take into account ret code of CopyObject()
-* VSISync() onto /vsis3/: allow x-amz- headers to be specified for object creation
-* /vsis3/: ignore object class DEEP_ARCHIVE in addition to GLACIER, and add CPL_VSIL_CURL_IGNORE_STORAGE_CLASSES to configure which object classes should be ignored
-* /vsis3/: make sure file properties of /vsis3_streaming/foo are invalidated when /vsis3/foo ones are
-* /vsis3/ with GDAL_DISABLE_READDIR_ON_OPEN: do not hide when accessing non existing file (#1900)
-* VSISync(): fix sync'ing from /vsis3/, /vsigs/, /vsiaz/ to local disk, when the source contains implicit directories
-* /vsiaz/: read credentials from ~/.azure/config as an additional fallback method. Add AZURE_STORAGE_SAS_TOKEN configuration option and deprecate AZURE_SAS
-*  /vsiaz/: allow authorization through an access token specified with the AZURE_STORAGE_ACCESS_TOKEN config option (to be used with AZURE_STORAGE_ACCOUNT)
-* /vsiaz/: fix handling of BlobEndpoint in connection string, and fix signing of requests to handle a directory part in the endpoint
-* /vsiaz/: implement container creation/destruction with VSIMkdir()/VSIRmdir()
-* /vsiaz/: add compatibility with Azurite emulator
-* /vsiadls/: add missing call to InvalidateParentDirectory()
-* /vsigs/: Support type=user JSON file for authentication
-* /vsigs/: fix upload of files > 4 MB in HTTP 1.1 (#5267)
-* /vsigs/, /vsiaz/, /vsiadls/: allow x-goog- / x-ms-/ headers to be specified for object creation
-* ZIP support: avoid warnings on MacOS
-* CPLZLibInflate(): workaround issue with /opt/intel/oneapi/intelpython/latest/lib/libz.so.1 from intel/oneapi-basekit Docker image
-* /vsizip/: fix Eof() detection on stored (ie not compressed) files inside the zip (#5468)
-* /vsitar/: fix reading .tar.gz files when the size of the uncompressed .tar file is a multiple of 65536 bytes (#5225)
-* CPLGetCurrentDir(): use _wgetcwd() on Windows to get a UTF-8 filename
-* CSLTokenizeString2(): make it work with strings > 2 GB
-* CPLLoadConfigOptionsFromFile(): add a \[credentials\] section to load VSI credentials
-* /vsimem/: VSIFTruncateL(): make sure to zeroize beyond the truncated area
-
-### Core
-
-* Embedded Python: fixes to load Conda and mingw64 python on Windows
-* Embedded python: list Python 3.10
-* GDALDriver::QuietDelete(): take into account papszAllowedDrivers argument
-* GDALDataset::MarkSuppressOnClose(): delete auxiliary files (#4791)
-* GDALPamRasterBand::CloneInfo(): deal correctly with NaN nodata to avoid generating useless .aux.xml file (#4847)
-* External overviews: automatically turn PLANARCONFIG_CONTIG for WebP overviews
-* GDALDatasetCopyWholeRaster(): clarify INTERLEAVE option meaning and raises warning if invalid value is specified (#4909)
-* CreateCopy(): propagate INTERLEAVE from source data (#4911)
-* Add GDALPamDataset::DeleteGeoTransform() (#4877)
-* Metadata readers: remove thread-unsafe use of localtime()
-* Pleiades metadata reader: fix to handle RPC for Pleiades Neo (#5090)
-* GeoEye metadata reader: avoid potential write stack-buffer overflow on long basename files (#5506)
-* Overview generation: fix Cubic resampling on boundaries between valid and transparent areas (#5016)
-* make GDALProxyRasterBand::RefUnderlyingRasterBand() / UnrefUnderlyingRasterBand() const. May affect out-of-tree drivers
-* Add GDALRasterBand::IsMaskBand() and GetMaskValueRange() virtual methods
-* Avoid CPLError() on number of drivers when PAM is disabled
-* RawRasterBand::AccessBlock(): do not early return in case of truncated block
-
-### Algorithms
-
-* Geoloc transformer: fix inverse transform to be exact (#5520)
-* Geoloc transformer: make it usable with arbitrary large geolocation arrays, using temporary GTiff storage (#5520)
-* gdal_grid: add facility to search points included in search ellipse for GDALDataMetrics (minimum, maximum, range, count, average_distance, average_distance_pts) in the already implemented quadtree data structure (#5530)
-* Rasterization of polygons: avoid underflow/overflow of output data type
-* Rasterize: use rounding to integers of floating-point value, and handle +/- inf for floating point rasters
-* Rasterize: make it possible to burn a Int64 attribute into a Int64 raster in a lossless way
-* Warp kernel: avoid writing outside allocated buffer if more threads than needed are allocated
-* warper: better guess output bounds when warping from a rotated pole projection that include poles
-* transformer: implement DST_METHOD=GEOLOC_ARRAY
-* avoid using any resampling kernel when doing just a subsetting of the source image (alignment on pixel boundaries) (#5345)
-* GDALBuildVRT(): in -separate mode, add support for sources such as MEM dataset or non-materialized VRT files
-
-### Utilities
-
-* gdalinfo --build: report PROJ version of build and runtime
-* gdaladdo -clean: remove overviews of mask (#1047)
-* gdalwarp -crop_to_cutline: relax epsilon to avoid extremely long loop (#4826)
-* gdalwarp: do not emit "Point outside of projection domain" / "tolerance condition error" (#4934)
-* gdalwarp: avoid useless use of CHECK_WITH_INVERT_PROJ when computed bounds are at the 'edges' of the geographic domain
-* gdal_translate/gdalwarp: do not delete DIM_/RPC_ auxiliary XML files on converting a jp2 file to a tif file (#5633)
-* gdalbuildvrt: change logic to check homogeneous number of bands (#5136)
-* gdalsrsinfo: emit message when replacement of deprecated CRS occurs, with hint to set OSR_USE_NON_DEPRECATED=NO configuration option to avoid that (#5106)
-* gdalsrsinfo: return a non-zero exit code when specified SRS fails to load (#5201)
-* gdalbuildvrt: add a -strict/-non_strict flag, and in strict mode consider non-existing datasets as a failure (#4755)
-* gdal_pansharpen.py: display usage if not enough filenames provided
-* gdal_polygonize.py: remove use of Unicode double quote characters
-* gdal_polygonize.py: make -8 switch work again (#5000)
-* gdal_sieve.py: fix exception when source dataset has no nodata value (3.4.0 regression) (#4899)
-* gdal_calc.py: support wildcard for filenames, and use 3D arrays instead of list for multiple filenames per alpha
-* gdal_calc.py: raise error when overwriting behavior is apparently wished but not specified (#5270)
-* gdal2tiles: make --no-kml option takes effect (#4940)
-* gdal2tiles: XML escape input filename (#5032)
-* gdal2tiles: remove/fix broken links in generated files
-* gdal2tiles: implement parallel generation of overview tiles (#5052)
-* gdal2tiles: lower chunksize value to allow parallel processing when generating ~ 100 tiles
-* gdal2tiles: fix issue with multiprocessing and the gdal2tiles launcher script on Windows and Python >= 3.8 (#4951)
-* gdal2tiles: support mpi4py multi-node parallelism (#5309)
-* gdal2tiles: detect write error when creating tiles, and allow outputting to /vsi filesystems (#3382, #5370)
-* gdal2tiles: do not generate .aux.xml files on overview tiles
-* bash-completion: fixes and update gdal-bash-completion.sh
-
-### gdal_utils package
-
-* Make scripts executable
-* Add entry points for gdal-utils package (#5281)
-
-### Raster drivers
-
-AAIGRID driver:
- * add support for 'null' as can be generated by D12 software (#5095)
-
-BAG driver:
- * fix 'too many refinement grids' error (#3759)
-
-BMP driver:
- * harden identify checks to avoid misidentification of other datasets (#4713)
-
-BYN driver:
- * remove validation of nTideSys and nPtType fields
-
-COG driver:
- * only create RGB JPEG with mask if 4-band is alpha (#4853)
- * fix potential generation failure when main imagery has overview and mask none
- * output exactly square pixels when using -co TILING_SCHEME (#5343)
- * add a ZOOM_LEVEL creation option (#5532)
-
-DIMAP driver:
- * avoid warning when extracting metadata from unsupported band_id
- * register metadata on all 6 PNEO bands
- * validate raster dimensions to avoid further issues (ossfuzz #46762)
-
-ECW driver:
- * fix test failures with ECW 5.5
- * do not try to open UInt32 JPEG2000 if the SDK is buggy (#3860)
- * fix non-nearest upsampling on multi-band datasets (#5288)
- * Added source read by swath to improve encoder performance
-
-ERS driver:
- * Add support for comments in ERS files (#4835)
-
-ESRIC driver:
- * Fix bundle file name
-
-FITS driver:
- * fix non-conformant use of &v[0] that crashes with clang 14 -O2
-
-GeoRaster driver:
- * fix build without JPEG
-
-GRIB driver:
- * GRIB2: mode degrib hard-coded tables to .csv files in resource files
- * GRIB2: merge content from WMO tables at https://github.com/wmo-im/GRIB2 with DEGRIB ones
- * fix writing negative longitude of natural origin for Transverse Mercator, and fix reading it for TMerc, LCC, ACEA and LAEA
- * fix thread-safetey of errSprintf() (#4830)
- * avoid read heap buffer overflow due to inappropriate split-and-swap on dataset with weird georeferencing (#5290, ossfuzz #41260, ossfuzz #41637)
- * consider longitudes that slightly exceed 360° as 360° for Split&Swap mode (#5496)
- * degrib: partial resynchroinzation with degrib 2.25 (degrib-20200921)
- * fix use of uninitialized memory on some datasets (#5290)
- * multidim: fix crash when a .idx file is present (#5569)
-
-GTiff driver:
- * explicitly enable strip choping to avoid issues with cmake libtiff builds
- * JXL codec: use non-deprecated methods and update for compatibility with latest state of libjxl
- * only emit warnings on libgeotiff PROJ errors (#4801)
- * SRS reading: add warning when CRS definition from geokeys is inconsistent with EPSG, and a GTIFF_SRS_SOURCE=EPSG/GEOKEYS configuration option to alter the SRS (#5399)
- * avoid warning with >= 5 bands and JPEG compression
- * LERC overview related improvements (#4848): MAX_Z_ERROR_OVERVIEW, ZLEVEL_OVERVIEW, ZSTD_LEVEL_OVERVIEW configuration options added
- * propagate SPARSE_OK to overviews (#4932), and add SPARSE_OK_OVERVIEW configuration option.
- * fix performance issue when reading transfer functions (#4923)
- * avoid huge memory allocation when generating overviews on large single-band 1-bit tiled files (#4932)
- * make SetGCPs(), SetGeoTransform(), SetSpatialRef(), SetNoDataValue(), SetMetadata(Item)() write to PAM .aux.xml on read only files (#4877)
- * add support for reading/writing color table from/into PAM .aux.xml (#4897)
- * do not warn about buggy Sentinel1 geotiff files use a wrong 4326 code for the ellipsoid
- * fix DISCARD_LSB with nodata value (#5097)
- * GTIFWktFromMemBufEx / GTIFMemBufFromSRS: use OSRSetPROJSearchPaths()  (#5184). Affects GeoJP2 encoding/decoding
- * fix exposing WEBP_LOSSLESS option
- * early checks for PREDICTOR settings, and update internal libtiff to support PREDICTOR=2 for 64-bit samples (rasterio/rasterio#2384)
- * remove limitation to 32,000 bytes when writing the GDAL metadata tag (#4116)
- * Create(): better detection of threshold when to switch to BigTIFF for tiled images (#5479)
- * unset geotransform from non-PAM source if PAM defines GCPs, and PAM is the prioritary source
- * fix crash when building overviews and computing approx stats (#5580)
-
-HDF5 driver:
- * fix issue when netCDF and/or HDF5 drivers built as plugins with multidim datasets
- * detect Matlab .mat HDF5-based, or other files with HDF5 superblock at offset 512
-
-HFA driver:
- * Fix "Pulkovo 1942" datum write to IMG files
-
-JP2KAK driver:
- * add support for reading/writing Int32/UInt32 data types
- * Add support for Creversible & RATE creation option  (#5131)
-
-JP2OpenJPEG driver:
- * add a STRICT=YES/NO open option to allow decoding some broken files (requires OpenJPEG 2.5)
-
-JPEG driver:
- * make sure that max memory usage check is done in all code paths that require it
-
-KEA driver:
- * print error message when opening of kea file fails
-
-MRF driver:
- * Fix padding space logic (#5096)
- * Add LERC2 padding when encoding
- * Adjust PNG limits (#5347)
- * Allow using external libLerc (#5386)
-
-MSG driver:
- * fix/workaround MSVC warnings
-
-netCDF driver:
- * handle 'crs_wkt' attribute
- * always use WKT when found, without comparing with CF params (#4725)
- * limit SetFromUserInput() use to non file input
- * disable filename recoding to ANSI on Windows for netCDF >= 4.8
- * add WRITE_GDAL_VERSION and WRITE_GDAL_HISTORY creation option
- * add a VARIABLES_AS_BANDS=YES/NO open option
- * allow update mode of raster datasets
- * implement SetMetadataItem()/SetMetadata()
- * avoid warnings when CreateCopy() a non-georeferenced dataset, and opening a 1x1 non-georeferenced dataset
- * add a IGNORE_XY_AXIS_NAME_CHECKS=YES open option (qgis/QGIS#47158)
- * recognize x/y axis from GMT generated files as geospatial axis (#5291, qgis/QGIS#47158, qgis/QGIS#45704)
- * read CF attributes giving CRS component names (#5493)
-
-NITF driver:
- * Add ISO-8859-1 decoding for file and image header metadata
- * avoid PROJ error to be emitted in Create() when ICORDS=N/S (#5563)
- * CADRG polar zone! CRS definition aligned with ADRG and SRP (#5656)
- * RPF.toc: skip plausibility check for Overviews and Legends; disable some checks for polar zones (#5654)
-
-PCIDSK driver:
- * fix write heap-buffer-overflow (ossfuzz #41993)
-
-PDS4 driver:
- * write conformant Equirectangular when input raster is a geographic CRS
-
-PDF driver:
- * Named NEATLINE extraction from ISO32000 style Geospatial PDF (#5504)
-
-RRASTER driver:
- * add support for CRS WKT2 (#5473)
-
-SAGA driver:
- * implement SetNoDataValue() (#5147)
-
-SENTINEL2 driver:
- * identify zipped S2 datasets from file content (#5505)
-
-TGA driver:
- * fix reading images with runs crossing scanlines (#5168)
-
-TileDB driver:
- * fix crash when creating array from subdatasets fails
- * fix handling of relative paths on Windows
- * avoid warnings about deprecated functions
-
-USGSDEM driver:
- * fix reading datasets with 1025 byte records ending with linefeed (#5007)
-
-VICAR driver:
- * avoid undefined behavior on empty container (ossfuzz #46650)
-
-VRT driver:
- * Add div, polar, exp pixel functions. Improvements in sum, mul, inv (#5298)
- * pixel function: implements metadata, and replace_nodata and scale builtin functions (#5371)
- * Warped VRT: detect inconsistent block size between dataset and bands (#4714)
- * Warped VRT: do not serialize block size at band level, since already serialized at dataset level (#4714)
- * Warped VRT: advertise INTERLEAVE=PIXEL for faster processing of multiband
- * Warped VRT: fix issue with blocks without sources and alpha band (#4997)
- * VRTWarpedDataset::ProcessBlock(): fix issue in the unlikely situation where a block would be > 4 GB
- * Warped VRT opening: do not open the source dataset with GDAL_OF_SHARED
- * fix serialization of relativeToVRT=1 when mix of relative and absolute paths for source and VRT (#4983)
- * GDALAutoCreateWarpedVRTEx(): avoid potential crash in case of error
- * allow setting VRT description after CreateCopy('', src_ds)
- * fix serialization of relativeToVRT=1 when mix of relative and absolute paths for source and VRT
- * ComputeSourceWindow(): round source coordinates when very close (#5343)
-
-WMTS driver:
- * disable clipping with TileMatrixSetLimits by default when using layer extent and add open options to control that behavior (#4461)
-
-XYZ driver:
- * Fix incorrect failure to open ASCII-file due to floating point comparison
-
-Zarr driver:
- * be robust to duplicated array and group names in NCZarr metadata (ossfuzz #40949)
- * fix nullptr dereference on array with zero-dim and Fortran order (ossfuzz #46717)
-
-## OGR 3.5.0 - Overview of Changes
-
-### Core
-
-New features:
-* Add layer renaming capacity, and implement it in GPKG, PG, FileGDB and Shapefile drivers
-* Add GDALDataset::GetFieldDomainNames method to retrieve all field domain names which are available for a dataset. Implemented in OpenFileGDB, FileGDB, GPKG drivers
-* Add GDALDataset::DeleteFieldDomain for deleting an existing field domain. Implemented in MEM driver
-* Add GDALDataset::UpdateFieldDomain for replaciong the definition of an existing field domain. Implemented in MEM driver
-* Add driver metadata for GDAL_DCAP_FIELD_DOMAINS and GDAL_DMD_CREATION_FIELD_DOMAIN_TYPES
-* Add OGR_F_StealGeometryEx to steal more than the 1st geometry of a feature (#5115)
-* OGRFeature: add fast/unsafe field getters/setters
-* OGREnvelope: add == and != comparison operators
-* OGRFeature: add Reset() method
-
-Bug fixes:
-* OGRSimpleCurve::segmentize(): avoid too many memory reallocation (#4826)
-* OGR SQLite dialect: avoid being confused by an attribute and geometry field of same name
-* OGRFormatFloat(): handle nan and inf
-* OGRFeature::Equal(): fix when a Real or RealList field contains NaN
-* OGRCurvePolygon::checkRing(): make it accept non-closed rings by default (#5488)
-* OGRCreateFromShapeBin(): do not report M if all NaN coordinates
-* OGRGeometryFactory::forceTo(): fix dimensionality with empty geometries
-* Multipoint WKT import: accept MULTIPOINT Z in non-backeted mode, like what PostGIS outputs
-* OGR_F_SetFieldRaw() / OGRFeature::SetField( const char*, const OGRField *): fix const correctness of OGRField argument
-
-### OGRSpatialReference
-
-* OGRSpatialReference::GetName(): workaround a PROJ 8.2.0 bug for BoundCRS
-* add a OGR_CT_PREFER_OFFICIAL_SRS_DEF config option (fixes https://github.com/OSGeo/PROJ/issues/2955)
-* OGRSpatialReference::importFromEPSG(): document OSR_USE_NON_DEPRECATED=NO configuration option (#5106)
-* OGRSpatialReference::SetFromUserInput(): make it work with 'IAU:XXXX' and 'IAU:2015:XXXX' (when using PROJ >= 8.2)
-* OGRSpatialReference::SetFromUserInput(): do not emit error message on unrecognized string when ALLOW_FILE_ACCESS=NO (Toblerity/Fiona#1063)
-* Add a OSR_DEFAULT_AXIS_MAPPING_STRATEGY configuration option
-* OGRProjCT: add missing copying of epoch related fields in copy constructor
-* Add OGRSpatialReference::GetOGCURN()
-
-### Utilities
-
-* ogr2ogr: propagate error in final CommitTransaction() to status code of the utility (#5054)
-* ogr2ogr: make detection of FID layer creation option more robust
-* ogr2ogr: fix cutting of geometries in projected coordinates intersecting antimeridian, in some configurations
-* ogr2ogr: avoid (in-memory) copying of source feature to target feature when possible
-* ogr2ogr: make 'ogr2ogr [-f PostgreSQL] PG:dbname=.... source [srclayer] -lco OVERWRITE=YES' work as if -overwrite was specified (#5640)
-
-### Vector drivers
-
-CAD driver:
- * libopencad: fix crash on corrupted datasets (ossfuzz #45943, ossfuzz #46887, osffuzz #45962)
-
-CSV driver:
- * when the .csvt indicates WKT and in default KEEP_GEOM_COLUMNS=YES mode, prefix the geometry field name with 'geom_'
-
-DXF driver:
- * Do not copy final DXF when MarkSuppressOnClose was called.
- * Fix long line handling in edge case
-
-DWG driver:
- * Add block attributes to entities layer (#5013)
- * support AcDbFace reading (#5034)
- * read block attributes as feature fields (#5055)
- * add DWG_ALL_ATTRIBUTES to get all attributes (#5103)
-
-DWG/DGNv8 driver:
- * avoid potential crash with ODA 2022 on Linux
-
-ElasticSearch driver:
- * do not try to open reserved .geoip_databases to avoid error message with recent Elastic versions
- * add a AGGREGATION open option (#4962)
- * support GetLayerByName() with multiple layers and/or wildcard (#4903)
-
-ESRIJSON driver:
- * fix dimensionality of PolygonZ
-
-FileGDB driver:
- * add support for writing field domains
- * implement database compaction on 'REPACK' SQL command
- * workaround a crash involving binary field and CDF datasets
- * fix crash related to feature of FID 2147483647
-
-FlatGeoBuf driver:
- * If CRS WKT detected to be non UTF-8, force it to ASCII (#5062)
- * catch exception on GetFeature() on corrupted index
- * fix GetFeature() when featuresCount != 0 and indexNodeSize == 0
- * in SPATIAL_INDEX=NO mode, write a meaningful featureCount and extent in the header
-
-GeoJSON driver:
- * reader: expose EPSG:4979 as CRS when none is specified and 3D geoms are found
- * use OGRSpatialReference::GetOGCURN() to handle compound CRS when writing 'crs' member
- * writer: in RFC7946=YES mode, reproject to EPSG:4979 if source CRS is 3D
- * report OFSTJSON subfield type for properties we can't map to a native OGR type, and better handling of mixed content in properties (#3882)
-
-GMLAS driver:
- * be robust to leading spaces in <gml:coordinates> element (#5494)
-
-GMT driver:
- * allow writing to /vsistdout/ (#4993)
-
-GPKG driver:
- * fix nullptr dereference on corrupted databases with sqlite >= 3.35
- * deal explicitly with CPL_VSIL_USE_TEMP_FILE_FOR_RANDOM_WRITE=YES for /vsi network file systems (#5031)
- * when adding a 'epoch' column to gpkg_spatial_ref_sys, one must use the 'gpkg_crs_wkt_1_1' extension instead of 'gpkg_crs_wkt'
- * DeleteField(): use ALTER TABLE ... DROP COLUMN if sqlite >= 3.35.5, and run foreign_key_check only if foreign_keys is ON (fixes qgis/qgis#47012)
- * AlterFieldDefn(): use ALTER TABLE ... RENAME COLUMN when only renaming is to be done and sqlite >= 3.26.0, and do not run integrity_check in that situation (fixes qgis/qgis#47012)
- * intercept 'ALTER TABLE table RENAME COLUMN src_name TO dst_name' and 'ALTER TABLE table DROP COLUMN col_name'
- * add a NOLOCK=YES option to open a file without any lock (for read-only access) (helps fixing qgis/qgis#2399)
- * add ST_MakeValid() SQL function if not linking against Spatialite or if Spatialite lacks ST_MakeValid()
-
-GPSBabel driver:
- * Allow identifying tcx (gtrnctr) files directly
-
-ILI driver:
- * IMDReader: fix various potential crashes on invalid input
-
-MapInfo driver:
- * allow reading MID/MIF files with lines up to 1 million bytes (#3943)
- * fix parsing .mid files with newline character in string field (#4789)
- * .tab writing: correctly detect datum when creating a layer from a WKT2 CRS string (#5217)
- * Add GSK2011 and PZ90.11 to list of ellipsoids (#5541)
- * add WindowsBalticRim / CP1257 charset mapping (#5608)
-
-MSSQL driver:
- * fix build warnings on Linux
- * GetLayerDefn(): fix potential memory leak
- * DeleteLayer(): fix read after free
- * fix issue when inserting strings in bulk copy mode on Linux
- * make GetNextFeature() end bulk copy mode
- * CreateFeature in bulk copy mode: make it use feature geometry SRID when set
- * disable bulk mode when a UUID field is found, as this doesn't work currently
- * do not set field width when reading smallint/int/bigint/float/real columns, and correctly roundtrip smallint/Int16 (#3345)
-
-MVT driver:
- * writing: using MakeValid() when possible on polygon output
-
-ODS driver:
- * avoid huge memory allocations on files abusing repeated cells (ossfuzz #40568)
- * avoid crashing 'floating-point exception' when evaluating -2147483648 % -1 (ossfuzz #41541)
-
-OpenFileGDB driver:
- * correctly parse raster fields of type == 2 which are inlined binary content (#4881)
- * do not report extent with NaN values
- * fix crash related to feature of FID 2147483647
- * fix dimensionality of MULTILINESTRING M geometries
- * add support for reading (non-default) UTF16 encoding for strings
-
-OSM driver:
- * add a railway attributes to lines (#5141)
-
-PGeo driver:
- * Always request numeric column values as numeric types (#4697)
-
-PostgreSQL driver:
- * skip all leading whitespace in SQL statements. (#4787)
- * error out if non UTF-8 content is transmitted in COPY mode, when client_encoding=UTF8 (#4751)
- * propagate errors in deferred EndCopy() call in CommitTransaction() (#5054)
- * make ogr2ogr -lco GEOM_TYPE=geography work when the source layer has a named geometry column, and also reject creating geography columns with a SRS != EPSG:4326 (#5069)
- * support other geographic SRS than EPSG:4326 for geographic type (#5075)
-
-S57 driver:
- * enable recoding to UTF-8 by default (RECODE_BY_DSSI=YES open option) (#4751)
- * handle more than 255 updates to a feature (#5461)
- * only apply an update if update.UPDT == 1 + previous.UPDT, or update.EDTN == 0 (#5461)
-
-Selafin driver:
- * fix time step count when none dataset in the file
-
-Shapefile driver:
- * better deal with ETRS89 based CRS with TOWGS84\[0,0,0,0,0,0,0\]
- * writer: avoid considering rings slightly overlapping as inner-outer rings of others (#5315)
- * fix perf issue when writing multilinestring with lots of parts (#5321)
- * consider rings at non-constant Z as outer rings (#5315)
- * fix unlikely nullptr dereference (#5635)
-
-SOSI driver:
- * avoid segfault on invalid geometries (#5502)
-
-SQLite driver:
- * add a STRICT=YES layer creation option to create tables as SQLite >= 3.37 STRICT tables
- * workaround MacOS system SQLite non-default settings that cause issues with WAL and AlterFieldDefn() when patching CREATE TABLE DDL
- * deal explicitly with CPL_VSIL_USE_TEMP_FILE_FOR_RANDOM_WRITE=YES for /vsi network file systems (#5031)
- * DeleteField(): use ALTER TABLE ... DROP COLUMN if sqlite >= 3.35.5, and run foreign_key_check only if foreign_keys is ON (refs qgis/qgis#47012)
- * AlterFieldDefn(): use ALTER TABLE ... RENAME COLUMN when only renaming is to be done and sqlite >= 3.26.0
- * fix crash when doing select load_extension('libgdal.so') from a statically linked sqlite3 console application
- * add a OGR_SQLITE_LOAD_EXTENSIONS configuration option
- * fix VirtualShape support with spatialite 5.0.1 or older and sqlite 3.38.0
-
-TopoJSON driver:
- * fix duplicate 'id' field, and other potential issues when reading fields (3.4.0 regression)
-
-VFK driver:
- * avoid crash when a SQLite3 statement fails
-
-WFS driver:
- * if COUNT is present in WFS >= 2, use it as the page size
-
-## SWIG Language Bindings
-
-All bindings:
- * add missing CPLES_SQLI constant (#4878)
- * add gdal.DataTypeUnion()
- * Geometry.ExportToWkb()/ExportToIsoWkb(): use Intel order by default to avoid useless byte swapping
- * use OGR_G_CreateFromWkbEx() in ogr.CreateGeometryFromWkb() to be able to handle > 2 GB WKB
-
-C# Bindings:
- * Re-target C# bindings apps to netcoreapp2.2 (#4792)
- * Switch default platform target to AnyCPU #1368
-
-Python bindings:
- * for Windows and Python >= 3.8, automatically add the first path with (lib)gdal*.dll with os.add_dll_directory()
- * Change GetFieldAsBinary to use VSIMalloc. (#4774)
- * add xmp=True/False argument to gdal.Translate()
- * fix/workaround setuptools 60.0 and Debian --install-layout
- * replace unsafe use of tempfile.mktemp() by mkstemp()
- * utilities-as-lib: propagate warnings to custom error handler when UseExceptions is on (#5136)
- * remove all traces of distutils
- * make sure GetUseExceptions() doesn't clear the error state (#5374)
- * make feature.GetField() returns a bool for a (type=OFTInteger, subtype=OFSTBool) field
-
-# GDAL/OGR 3.4.0 Release Notes
-
-## In a nutshell...
-
-* [RFC 81](https://gdal.org/development/rfc/rfc81_coordinate_epoch.html):
-  Support for coordinate epochs in geospatial formats.
-  Implemented in FlatGeoBuf, GeoPackage, MEM, VRT
-* New GDAL drivers:
-  - [Zarr](https://gdal.org/drivers/raster/zarr.html):
-    read/write support for ZarrV2 (and experimental V3), using 2D classic raster
-    API or multidimensional API:
-  - [STACIT](https://gdal.org/drivers/raster/stacit.html):
-    Spatio-Temporal Asset Catalog Items as virtual mosaics
-* Other improvements:
-  - number of enhancements in file system operations of /vsigs/
-  - NITF: additions to comply with NITF Version 2.1 Commercial Dataset
-    Requirements Document (NCDRD)
-  - ODBC and PGeo: multiple fixes and improvements
-  - SAFE (Sentinel1): multiple improvements related to SLC/calibration (change
-    subdataset naming)
-  - multidimensional API: caching, and other improvements
-* Code linting and security fixes
-* Bump of shared lib major version
-* MDB driver (Java based) mark as deprecated. Planned for removal for GDAL 3.5.
-  ODBC driver is the preferred solution (with up-to-date MDBTools library on
-  non-Windows platforms)
-* Writing side of Tiger driver deprecated and will be removed in GDAL 3.5
-* Remainder: DODS, JPEG2000(Jasper), JPEGLS, MG4LIDAR, FUJIBAS, IDA, INGR and
-  vector driver ARCGEN, ArcObjects, CLOUDANT, COUCHDB, DB2, DODS, FME, GEOMEDIA,
-  GTM, INGRES, MONGODB, REC, WALK are planned for removal in GDAL 3.5. As well
-  as Perl bindings
-
-## New optional dependencies
-
-* libjxl (master) when using internal libtiff for JPEG-XL support in TIFF
-* liblz4, libblosc: recommended for Zarr driver (as well as existing libzstd, liblzma)
-* libbrunsli for JPEG-XL support in MRF driver (as well as existing libzstd)
-
-## New installed files
-
- * include/cpl_compressor.h
-
-## Removed installed files
-
- * no longer build testepsg utility by default, which has been superseded by
-   gdalsrsinfo for many years. It will be finally removed in GDAL 3.5
-
-## Backward compatibility issues
-
-See [MIGRATION_GUIDE.TXT](https://github.com/OSGeo/gdal/blob/release/3.4/gdal/MIGRATION_GUIDE.TXT)
-
-## Build changes
-
-Build(General):
- * Changes to build against Xerces-c 4.0dev
-
-Build(Unix):
- * configure file no longer in git. autogen.sh must be run
- * configure: fix explicit disabling of geos/sfcgal (#3782)
- * configure.ac: also check netcdf presence by using static linking
- * fix lack of compilation of nasakeywordhandler.o with some old/non-gnu versions of grep (#3836)
- * configure.ac: Add compatibility with autoconf 2.71. Set 2.69 as minimum version
- * #include local files with quotes, and for Unix build, use -iquote instead of -I (#4091)
- * Use pkg-config for libdap when dap-config is not available.
-
-## GDAL 3.4.0 - Overview of Changes
-
-### Port
- * Add cpl_compressor.h API
- * Add VSIAbortPendingUploads() to abort pending multipart uploads on /vsis3/ and /vsigs/
- * /vsiaz/: avoid appending same chunk several times
- * /vsigs/: switch to using S3-style multipart upload API, which is now supported
- * /vsigs/: enable parallel multipart upload
- * /vsigs/: add support for reading/writing ACLs through GetFileMetadata/SetFileMetadata with the ACL domain
- * /vsigs/: implement UnlinkBatch() (efficient implementation only works with OAuth2 authentication)
- * /vsigs/: implement RmdirRecursive() (efficient implementation only works with OAuth2 authentication)
- * /vsigs/: add support for GS_USER_PROJECT config option to specify the project ID to bill for requester pays access
- * /vsigs/: add support for GS_NO_SIGN_REQUEST=YES
- * /vsigs/: implement SetFileMetadata(filename, metadata, 'HEADERS')
- * /vsiswift/: Fix openstack swift endpoint detection, add application_credential authentication support (#3960)
- * /vsiswift/: properly cache stat() results
- * VSISwiftFSHandler::Stat(): fix potential nullptr dereference (ossfuzz #37906)
- * /vsis3/ , /vsiaz/: properly set mode field into file property cache
- * /vsicurl/: fix to be able to read /vsis3/zarr-demo/store/spam
- * /vsicurl/: make it work without explicit CPL_VSIL_CURL_USE_HEAD=FALSE with .earthdata.nasa.gov/ URLs (#4641)
- * /vsicurl/: fix crash with curl 7.79.0 to get file size when retrieving headers only
- * /vsizip/: fix memory leak in error code path (ossfuzz #29715)
- * /vsitar/: support prefixed filename of ustar .tar archives (#4625)
- * /vsitar/ etc: avoid potential long processing time on invalid filenames in archive (ossfuzz #30312, ossfuzz #39129)
- * IVSIS3LikeFSHandler::Sync(): add missing lock
- * VSIS3FSHandler::GetOptions(): fix non-XML conformity
- * cpl_odbc.cpp: fix segfault in debug message due to nullptr dereference
- * CPLODBCSession::ConnectToMsAccess(): try various DSN template combinations because the combo odbcinst 2.3.7 from Ubuntu 20.04 + self compiled mdbtools-0.9.3 doesn't like double quoting of DBQ
- * MDBTools driver installation: do not error out if /etc/odbcinst.ini contains an entry for Access, and also add /usr/lib64/odbc as a path to please Fedora
- * Add CPLJSONObject::DeleteNoSplitName()
- * CPLJSONDocument::Load(): increase max document size to 100 MB
- * CPLJSONDocument::LoadMemory(): fix parsing 'true' and 'false'
- * Add CPLQuadTreeRemove()
- * VSIGetMemFileBuffer(): delay destroying VSIMemFile on bUnlinkAndSeize (#4158)
- * Fix VSIMemHandle::Read(buffer,nSize=0,nCount=1) to return 0
- * minixml parser: fix performance issue on very large processing instructions. (ossfuzz #37113)
- * VSIOpenDir(): add a PREFIX option to select only filenames starting with the specified prefix
- * Unix file system: implement OpenDir() with a NAME_AND_TYPE_ONLY option
- * VSIReadDirRecursive(): use VSIOpenDir() / VSIGetNextDirEntry()
- * VSIStatExL(): add a VSI_STAT_CACHE_ONLY flag to avoid attempting any network access
- * CPLCreateUserFaultMapping(): better error message when userfaultfd system call fails due to permission issue
- * userfaultfd: make it work with kernel >= 5.11 without special OS settings
- * CPL logging mechanism: fix writing non-ASCII UTF-8 filenames on Windows (#4492)
- * VSI cache: fix crash when a Read() to the underlying file fails (#4559)
-
-### Core
- * Add a GDAL_DCAP_COORDINATE_EPOCH driver capability set by drivers which support storing/retrieving coordinate epoch
- * fixed issue with GDALLoadRPBFile failing when RPB file does not contain errBias or errRand fields
- * CPLKeywordParser / IMD parser: accept .IMD files with non-properly quoted values (#4037)
- * NASAKeywordHandler: fix performance issues (ossfuzz #39092)
- * IMD writer: properly quote values that have spaces (#4037)
- * ComputeStatistics(): tiny speed improvements for SSE2 Byte/UInt16 cases
- * Overview generation: use per band mask with nodatavalue and average (#3913)
- * GMLJP2v2 writing: fix axis order issue for gml:Envelope (#3866)
- * Overview/rasterio: fix RMS on large Float32 values
- * Overview/rasterio: RMS resampling: add AVX2 implementation for Float and UInt16
- * Overview building: fix crash possibility if user interrupting multi-threaded computation
- * GDALDriver::DefaultCreateCopy(): preserve coordinate epoch
- * PAM: support coordinate epoch as a SRS.coordinateEpoch attribute (RFC 81)
- * GDALDataset::BlockBasedRasterIO(): fixed progress calculation
- * GDALDataset::BlockBasedRasterIO(): fix when an overview is selected and non-integer window coordinates are involved (fix issue with GeoRaster driver. #4665)
- * GetIndexColorTranslationTo(): fix non-exact color matching when palettes don't have the same number of entries (#4156)
- * Block cache: fix potential infinite loop in case of high concurrency and multi-threaded writing (#3848)
- * GDALDataset::GetFileList(): avoid cyclic calls on odd/corrupted datasets (ossfuzz #37460)
- * GDALOpenInfo(): fix issue when passing a directory on netBSD and potentially other BSDs
- * DumpJPK2CodeStream(): dump COC, QCD and QCC segments, and add HTJ2K specificities
- * GDALGetJPEG2000Structure(): limit default number of lines in output to avoid excessive memory and processing time (ossfuzz #14547)
- * GDALMDReaderPleiades::LoadRPCXmlFile(): fix nullptr dereference on non-conformant file (ossfuzz #38998)
- * GDALDataset::FlushCache() and GDALRasterBand::FlushCache(): add a bool bAtClosing argument (fixes #4652)
- * Make GDALRasterBand::TryGetLockedBlockRef() public
-
-### Multidimensional API
- * Add GDALMDArray::IsRegularlySpaced() and GDALMDArray::GuessGeoTransform()
- * Add GDALMDArray::GetResampled() to get a resampled / reprojected view
- * Add a GDALMDArray::GetCoordinateVariables() method
- * Add a GDALMDArray::Cache() method to cache an array/view into a .gmac side car file
- * Add GDALMDArray::IsCacheable() so that drivers can disable attempts at opening cache file on main dataset
- * API: add JSON as a possible subtype of (string) extended data type
- * GDALRasterBand::AsMDArray(): fix data axis to SRS Axis mapping in the return of GetSpatialRef()
- * GDALMDArray::AsClassicDataset(): fix RasterIO() when buffer data type is not native data type
- * Add GDALPamMDArray and GDALPamMultiDim classes to be able to serialize/deserialize metadata (SRS for now) from GDALMDArray
- * Add GDALExtendedDataTypeCreateStringEx() and map it to SWIG
-
-### Algorithms
- * Warper: Eliminate thread lock timeouts on Windows (#3631)
- * Warper: prevent potential int overflows for > 2 GB work buffers
- * Warper: force SAMPLE_GRID=YES when target output includes one pole (#4064)
- * Warper: OpenCL: remove extra double quote character in resampling kernel (#4404)
- * Warper: avoid selecting Float64 working data type with a Float32 raster and a nodata value compatible of it (#4469)
- * geolocation transformer: use GDALFillNodata() to fill holes in the backmap
- * GDALSuggestedWarpOutput2(): better guess of bounds when transforming with a geolocation array
- * gdalgeoloc: fix if the backmap would be larger than 2 Giga pixels
- * gdalgeoloc: backmap generation: prevent averaging that would lead to unexpected results
- * gdalgeoloc: improve backmap hole filling
- * Polygonize: fix self intersection polygon when raster image contains complex holes (#1158, #3319)
- * Deprecate GDALOpenVerticalShiftGrid() and GDALApplyVerticalShiftGrid() that are no longer needed. Will be removed in GDAL 4.0
-
-### Utilities
- * gdalinfo: report coordinate epoch (RFC 81)
- * gdalinfo: avoid displaying thousands of filename in /vsizip/ if open fails
- * gdal_translate: add -a_coord_epoch switch (RFC 81)
- * gdalwarp: allow vertical shift when using EPSG codes (#4566)
- * gdalwarp: preserve coordinate epoch in output SRS (RFC 81)
- * gdalwarp: add a -s_coord_epoch/_t_coord_epoch switches (RFC 81)
- * Fix gdalwarp / exporting to WKT when a projection that isn't supported in WKT1 is involved (#4133)
- * gdalwarp: allow reprojecting a rater with geotransform = (0,1,0,0,0,-1) (#4147)
- * gdalwarp: slightly change default behavior of unified src band masking when a pixel is evaluate to the nodata value on all bands (#4253)
- * gdal_contour: fix bad coordinate order when outputting from raster with geographic CRS to KML driver (#3757)
- * gdal_viewshed: fix incorrect calculation if target height is specified (#4381)
- * gdal_viewshed: Fix incorrect progress reporting (#4390)
- * gdal_viewshed: change default value of -cc (curvature coefficient) to 0.85714, standard value for atmospheric refraction (#4415)
- * gdal_polygonize.py: fix output driver guessing
- * gdal_fillnodata.py: copy pixel data after metadata
- * gdal_fillnodata.py: fix -si option (#4192)
- * gdal_fillnodata.py: remove broken -nomask option. It has likely never worked, and was equivalent to the default mode
- * gdal_sieve.py: preserve NoData value when output to a new file
- * gdal2tiles: fix tile grid origin of openlayers with -p geodetic --tmscompatible --xyx as arguments
- * gdal2tiles: avoid potential race when creating directories (#4691)
- * gdal_pansharpen.py: display usage if not enough filenames provided
- * gdalmdiminfo: add dimension_size and block_size in output
- * gdalmdimtranslate: add -oo switch to specify open option of source dataset
-
-### gdal_utils package
- * Various linting and improvements in gdal_utils package
- * Create ogrmerge(), gdalproximity(), gdal_sieve(), rgb2pct(), pct2rgb(), gdal_fillnodata(), gdal_polygonize() functions
- * fix GetOutputDriversFor for ext == 'nc' (#4498)
-
-### Raster drivers
-
-AIGRID driver:
- * avoid integer overflow (ossfuzz #31766)
- * fix crash when accessing twice to a broken tile (#4316)
-
-BAG driver:
- * ignore pixel at nodata value when updating min/max attributes (#4057)
-
-BMP driver:
- * harden identify checks to avoid misidentification of other datasets (#4713)
-
-CEOS2 driver:
- * Add ASF Compatibility (#4026)
-
-COG driver:
- * Default to LZW compression (#4574)
- * Add LZMA to compressions list
- * don't crash if GDALCreateGenImgProjTransformer2() fails
- * Fix error messages when creating JPEG compressed COGs from RGBA
-
-DIMAP driver:
- * expose virtual overviews (#4400)
- * fix integer overflows (ossfuzz #39027, #39795)
- * fix potential performance issue in SetMetadataFromXML() (ossfuzz #39183)
- * avoid excessive memory allocation / almost infinite loop on corrupted dataset (ossfuzz #39324)
-
-ECW driver:
- * Enable reading ECW files from virtual file systems for ECW SDK 3.3
-
-EEDAI driver:
- * Point at highvolume EE API endpoint by default
-
-EIR driver:
- * avoid excessive memory allocation on small files (ossfuzz #9408)
-
-ENVI driver:
- * Open(): use .hdr as an additional extension in priority over a replacement one (#4317)
- * use newer Get/SetSpatialRef API to avoid performance issue (ossfuzz #38295)
-
-ENVISAT driver:
- * avoid potential buffer overflow (CID 1074533)
-
-ERS driver:
- * avoid long open delay on bogus datasets that reference themselves (ossfuzz #36701)
- * Fix off-by-one error when reading ERS header
-
-EXR driver:
- * fix build against OpenEXR 3.0.1 (#3770)
-
-GeoRaster driver:
- * Fix the Oracle DB connection when user and pwd are empty, while Oracle wallet is used. (#3768)
- * Set the SRID value for the extent when flushing the metadata to the database. (#4106)
- * fix issue when user name is not provided in connection string (#4460)
- * Add owner checking in the query (#4565)
-
-GRIB driver:
- * use sidecar .idx file and lazy initialization (#3799)
- * implement transparent [0,360] to [-180,180] translation, in reading and writing (#4524, #3799)
- * add/fill a few GRIB1 ECMWF table to read a ERA5 product (#3874)
- * turn debug messages about unknown GRIB1 table as warnings
- * fix stack read buffer overflow (ossfuzz #38610)
- * fix wrong check related to memory allocation limit (ossfuzz #38894)
- * fix potential crashes on big GRIB1 files on low-memory condition (ossfuzz #38971)
- * multidim: catch potential exception in case of out-of-memory situation
-
-GTiff driver:
- * add support for coordinate epoch with a new CoordinateEpochGeoKey=5120 GeoKey (RFC 81)
- * Enable JPEG-in-TIFF for 12 bit samples (for internal libtiff), whatever libjpeg is used for 8 bit sample support
- * Add support for JPEG-XL codec when using internal libtiff, through libjxl master (#4573)
- * fix overviews with NaN nodata value
- * when reading NoData value of Float32 dataset, cast it to float to avoid overprecision (#3791)
- * Fix SetDefaultRAT() (#3783)
- * signedbyte: do not write 0 values for tiles/strips entirely at a negative nodata value (#3984)
- * Set color interpretation on overview bands (#3939)
- * SRS reading: ignore vertical information when one of the tag has a value in the private user range (#4197)
- * write georeferencing info to PAM .aux.xml when using PROFILE=BASELINE
- * do not try to export a DerivedGeographic CRS to GeoTIFF, but fallback to PAM
- * fix corruption in TIFF directory chaining when altering nodata value after IFD crystallization (#3746)
- * Update internal libtiff to latest upstream
- * limit error message count, mainly with Fax3 decoder, to avoid performance issues (ossfuzz #38317)
-
-HDF5 driver:
- * multidim: fix crash when extracting a field from a compound HDF5 data type
- * fix issue when netCDF and/or HDF5 drivers built as plugins with multidim datasets
-
-HFA driver:
- * enable to read GCPs from PAM .aux.xml (#4591)
-
-Idrisi driver:
- * Add support of Cylindrical Equal Area (#3750)
-
-JP2KAK driver:
- * fix Unix build with Kakadu 8.2 (#4306)
- * accept files with .jhc extension (HTJ2K codestreams)
- * report Corder metadata item in IMAGE_STRUCTURE domain instead of default domain
-
-JP2OpenJPEG driver:
- * add a TLM=YES creation option to write Tile-part Length Marker (requires openjpeg >= 2.5)
-
-JPEG driver:
- * fix wrong detection of bit ordering (msb instead of lsb) of mask band (#4351)
-
-KMLSuperOverlay driver:
- * Allow reading kml documents with a GroundOverlay element directly inside a Document element (#4124)
-
-MEM driver:
- * Open(): add support for the 'GEOTRANSFORM' options
- * multidim: faster copying when data type conversion is involved
- * multidim: add MEMAbstractMDArray::SetWritable, IsModified and SetModified methods
-
-MRF driver:
- * add JPEG-XL (brunsli) support (#3945)
- * add ZStd compression (#4177)
-
-MSG driver:
- * fix race condition in satellite number lookup (#4153)
-
-NetCDF driver:
- * expose Sentinel5 verbose metadata in json:ISO_METADATA/ESA_METADATA/EOP_METADATA/QA_STATISTICS/GRANULE_DESCRIPTION/ALGORITHM_SETTINGS metadata domains
- * use new PROJ method 'rotated pole netCDF CF convention'
- * add write support for rotated pole method
- * be more restrictive on axis to decide if to advertise a geotransform.
- * fix wrong offsetting by -360 of longitude values when huge nodata value found at beginning or end of line
- * fix reading MODIS_ARRAY.nc file that has non CF-compliant way of expressing axis and CRS (#4075)
- * support more possibilities for content of 'crs' attribute in some opendatacube datasets
- * accept degree_north/degree_east (degree singular) as acceptable unit for latitude/longitude axis (#4439)
- * accept "degrees_E"/"degrees_N" as valid axis names (#4581)
- * Accept HDF5 files if HDF5 driver is not available and libnetcdf has support for them
- * properly deal with Polar Stereographic in reading and writing (#4144)
- * parse correctly valid_range/valid_min/valid_max attributes when they are of non-integer type (#4443)
- * no longer do filename recoding with netCDF >= 4.8 on Windows
- * multidim: make opening /vsimem/ file work when netCDF MEM API is available (avoids using userfaultfd)
- * multidim: make /vsi access work with netcdf >= 4.7
- * multidim: avoid crash when getting data type of a char variable with 2 dimensions.
- * multim: GetBlockSize(): fix heap buffer write overflow on 2D char variables (ossfuzz #39258)
- * multidim: fix use of coordinates attribute to find the indexing variable of a dimension
-
-NITF driver:
- * add PROFILE=NPJE_VISUALLY_LOSSLESS/NPJE_NUMERICALLY_LOSSLESS with JP2OpenJPEG driver, to comply with STDI-0006 NITF Version 2.1 Commercial Dataset Requirements Document (NCDRD)
- * fix writing of COMRAT field in JPEG/JPEG2000 mode, when there are FILE TREs
- * expose ISUBCAT for each band (if non-empty) (#4028)
- * add capability to add several images in a file
- * extend nitf_spec.xml to contain DES subheader user-data fields definitions for CSATTA DES, CSSHPA DES, CSSHPB DES and XML_DATA_CONTENT
- * Slightly modify xml:DES output, such that field names no longer have the NITF_ prefix
-
-PCIDSK driver:
- * fix retrieval of RPC metadata (3.3 regression) (#4118)
- * avoid big memory allocation and processing time (ossfuzz #37912)
- * avoid long processing time by limiting the number of bands (ossfuzz #38885)
-
-PDF driver:
- * update PDFium dependency to pdfium/4627. Requires use of https://github.com/rouault/pdfium_build_gdal_3_4 PDFium fork
- * avoid potential nullptr dereference on corrupted datasets (ossfuzz #28635)
- * Poppler backend: limit CPU time when reading extremely corrupted file. (ossfuzz #37384)
-
-PDS4 driver:
- * update template to CART_1G00_1950 version
- * add support for reading PositiveWest longitudes, MapRotation and Oblique Cylindrical
- * add write support for Oblique Cylindrical
- * fix opening of some .xml files with large number of <?xml-model> tags
- * accept optional <Reference_List> element in template.
- * fixes for compatibility with sp:Spectral_Characteristics in template.
- * projection writing: honor LONGITUDE_DIRECTION=Positive West by negating longitudes in projection parameters
-
-PNG driver:
- * disable Neon optimizations for internal libpng as we don't include the needed source file (fix build issue)
-
-PostgisRaster driver:
- * support for libpq services (#3820)
- * do not append generated application_name in subdataset names
-
-RMF driver:
- * Fix delta compression with non-initialized elevation min-max (#4399)
-
-SAFE driver:
- * multiple improvements related to SLC/calibration (change subdataset naming)
-
-SRTMHGT driver:
- * support .hgts files from NASADEM SHHP. Also support auxiliary files with .err, .img, .num, .img.num and .swb extensions from other NASADEM products (#4239)
-
-TileDB driver:
- * fix crash when creating array from subdatasets fails
- * fix handling of relative paths on Windows
-
-TGA driver:
- * fix heap buffer overflow (ossfuzz #35520)
-
-VICAR driver:
- * add read/write support for GeoTIFF encoding of CRS and geotransform
-
-VRT driver:
- * Support named arguments to C++ derived band pixel functions (#4049)
- * Add interpolate_linear pixel function
- * use source floating point coordinates when valid (#4098)
- * make SourceProperties element no longer needed on reading for deferred opening of sources
- * avoid potential very deep call stack if SourceFilename contains empty string (ossfuzz #37530)
- * Add a per-thread mechanism to count call depth and use it in VRT driver to avoid infinite recursive calls on corrupted datasets (ossfuzz #37717)
- * GDALDatasetPool: avoid potential crash during destruction (#4318)
- * VRT pixelfunc: make it work with buffers larger than 2 giga pixels
- * fix issue with sources with nodata and OverviewList resampling='average' that triggers a 'recursion error' message
- * GDALAutoCreateWarpedVRTEx(): do not set padfSrcNoDataReal/padfDstNoDataReal if already set in passed-in options (rasterio/rasterio#2233)
- * avoid recursion issue on ComputeStatistics()/.ComputeRasterMinMax()/GetHistogram() with implicit overviews and approximation enabled (#4661)
-
-WCS driver:
- * fix issue with negative coordinates (#4550)
-
-WebP driver:
- * Support 'exact' option to preserve the RGB values under transparent areas.
-
-WMS driver:
- * Add an option to disable the cache (#4097)
- * use correct default bbox according to the SRS (#4094)
-
-WMTS driver:
- * Add an option to disable the cache (#4097)
- * do not take into account a TileMatrixSetLink that points to a non-existing TileMatrixSet
-
-ZMap driver:
- * undeprecate it since we got feedback it is still useful (#4086)
-
-## OGR 3.4.0 - Overview of Changes
-
-### Core
- * Add support for reporting hiearchical organization of vector layers, and implement it in FileGDB/OpenFileGDB drivers. (Trac #5752)
- * Add GDALGroup::GetVectorLayerNames() and OpenVectorLayer(), and corresponding C and SWIG API
- * Geometry::MakeValid(): add option to select the GEOS 3.10 'structure' method
- * Support multiline geometry WKT input
- * OGRGeometryFactory::createFromGeoJson(): Support importing GeoJSON fragments in non-null terminated strings (#3870)
- * OGR SQL: fix wrong evaluation of attribute filter when a OR with >= 3 clauses is nested inside in another OR (#3919)
- * OGR SQL: Support ISO-8601 literal dates with IN operator (#3978)
- * OGRFeature::GetFieldAsSerializedJSon(): fix nullptr dereference on empty string list (#3831)
- * Add OGRGetGEOSVersion() and map it to SWIG (#4079)
- * Add GDAL_DCAP_MULTIPLE_VECTOR_LAYERS capability (#4135)
- * Add virtual method GDALDataset::IsLayerPrivate
-
-### OGRSpatialReference
- * Improve OGRProjCT::Clone() and export OGRCoordinateTransformation::Clone() to C API (#3809)
- * Export OCTGetSourceCS(), OCTGetTargetCS() and OCTGetInverse() to C API (#3857)
- * Add OGRSpatialReference::IsDynamic() to check if a CRS is a dynamic one
- * Add OGRSpatialReference::SetCoordinateEpoch()/GetCoordinateEpoch()
- * Coordinate transformation: take into account SRS coordinate epoch if the coordinate tuple has no time value
- * Fix crash in AutoIdentifyEPSG/GetEPSGGeogCS() on some WKTs (#3915)
- * Fix wrong quoting for WKT spatial CS type
- * Add DERIVEDPROJCRS to WKT keywords for OGRSpatialReference::SetFromUserInput
- * Support GetLinearUnits for ellipsoidal and spherical coordinate systems that have a height axis (#4030)
- * AutoIdentifyEPSG(): do not add AUTHORITY node if the axis order of the geographic CRS contradicts the one from EPSG (#4038)
- * OGR_CT: fix transformation between CRS that only differ by axis order (related to #4038)
- * OGR_CT: when a WKT def contradicts its AUTHORITY node, use the WKT def (relates to #4038)
- * OGR_CT: deal with bogus NaN coordinates as output of PROJ (#4224)
- * OGR_CT with OGR_CT_OP_SELECTION=BEST_ACCURACY: fix for non-Greenwich prime meridian
- * OGR_CT: take into account PROJ_NETWORK=ON in OGR_CT_OP_SELECTION=BEST_ACCURACY/FIRST_MATCHING modes
- * OGRSpatialRef::SetFromUserInput(): add options to disallow file and network access, and use it various drivers (ossfuzz #35453)
- * importFromCRSURL() / importFromWMSAUTO() / importFromURN(): avoid excessive memory allocation and processing time on invalid input (ossfuzz #37922 and #38134)
- * OGRSpatialReference::GetAxesCount(): fix on CompoundCRS of BoundCRS
- * fix retrieving projection parameters from WKT1 name on a Projected 3D CRS (OSGeo/PROJ#2846)
- * Fix EPSGTreatsAsLatLong with compoundCRS (#4505)
- * OSRProjTLSCache: avoid use of exceptions (#4531)
- * exportToWkt(): use WKT2 for DerivedProjectedCRS (#3927)
- * Add OSRSetPROJEnableNetwork() / OSRGetPROJEnableNetwork(), and expose them to SWIG
- * Adds OCTTransformBounds to the C and SWIG API to transform a bounding box (#4630)
-
-### Utilities
- * ogrinfo: report hiearchical organization of layers
- * ogrinfo: report SRS coordinate epoch (RFC 81)
- * ogrinfo: Report private layers with a "[private]" suffix
- * ogr2ogr: add a -a_coord_epoch/-s_coord_epoch/_t_coord_epoch switches (RFC 81)
- * ogr2ogr: fix quadratic performance if many source field names are identical (ossfuzz #37768)
-
-### Vector drivers
-
-Multiple drivers:
- * geomedia, walk: Check sql tables for required tables before trying to query them when trying to open a .mdb dataset
-
-CSV driver:
- * improve concatenation performance of multi-line records (ossfuzz #37528)
- * OGREditableLayer (affects CSV driver): fix quadratic performance when creating field (ossfuzz #37768)
- * limit to 2000 fields in opening by default. (ossfuzz #39095)
-
-DGN driver:
- * avoid potential buffer overflow (CID 1074498)
- * replace undefined behavior 1 << 31 by 1U << 31. Not sure of the consequences
-
-DXF driver:
- * Improved handling of very long lines of text in DXF file (#3909)
- * Correctly handle hidden (invisible) INSERTs
-
-DWG driver:
- * Make Closed AcDb2dPolyline and AcDb3dPolyline to Closed OGRLineString (#4264)
-
-ESRIJSON driver:
- * make 'ESRIJSON:http://' connection string scroll results
-
-FlatGeoBuf driver:
- * add support for coordinate epoch (RFC 81)
- * fix memory leaks when reading invalid geometries (ossfuzz #37752, #37834, #38166)
- * set minimum alignment to 8 bytes
-
-FileGDB driver:
- * report hiearchical organization of layers
- * Fix reading of field domains when data source is wrapped in OGRDataSourceWithTransaction
- * Ensure tables which are present in the catalog but not listed in GDB_Items can be read by the driver (#4463)
- * faster CreateLayer() w.r.t SRS identification
- * Implement Identify method
-
-GeoJSON driver:
- * writer: emit error msg when geometry type is not supported in GeoJSON (#4006)
- * recognize URL of likely OAPIF items response page (#4601)
-
-GML driver:
- * reading: fix reading compound curves with gml:ArcByCenterPoint and in a projected CRS in northing/easting axis order (#4155)
- * writer: use GML 3.2 as the new default version (instead of GML 2)
- * read/write srsName as a XML comment in .xsd
- * store geometry element name as geometry column name when reading without .gfs/.xsd (#4386)
- * avoid read heap-buffer-overflow (ossfuzz #35363)
- * avoid performance issue on too nested structure (ossfuzz #21737)
- * fix warning when reading .gfs file with a polyhedral surface
- * expose field names in a more consistent orders when some feature lacks some fields (qgis/QGIS#45139)
-
-GMLAS driver:
- * avoid uncaught exception when opening corrupted .xsd
- * use our own network accessor to honour GDAL_HTTP_TIMEOUT (ossfuzz #37356)
- * fix potential crash on XMLString::transcode() failure (ossfuzz #37459)
- * fix potential crash in ProcessSWEDataArray() (ossfuzz #37474)
- * improve performance of field name truncation (ossfuzz #37836)
- * fix likely quadratic performance in LaunderFieldNames() (ossfuzz #39797)
- * error out on huge mem allocation / processing time in Xerces (ossfuzz #38073)
- * fix performance issue (ossfuzz #38707)
-
-GPKG driver:
- * add support for coordinate epoch (RFC 81)
- * accept CreateField with a column with the fid column name and type=real, width=20, precision=0 (qgis/qgis#25795)
- * fix wrong gpkg_metadata_reference_column_name_update trigger (qgis/qgis#42768)
- * fix for compatibility with SQLite 3.36.0 and views (#4015)
- * add error message when prepare fails
- * capitalize cartesian as Cartesian for SRS of id -1 'Undefined Cartesian coordinate reference system' (#4468)
-
-GPX driver:
- * avoid potential integer overflow on writing (ossfuzz #30937)
-
-ILI driver:
- * Fix non contiguous curves for COORD/ARC sequences (#3755)
-
-KML driver:
- * add read support for non-conformant MultiPolygon/MultiLineString/MultiPoint elements (#4031)
-
-LIBKML driver:
- * add read support for non-conformant MultiPolygon/MultiLineString/MultiPoint elements (#4031)
-
-LVBAG driver:
- * add field definition for "gerelateerdewoonplaats" (#4161)
- * add Field verkorteNaam to OpenbareRuimte FT (#4286)
-
-Memory driver:
- * add support for coordinate epoch (RFC 81)
-
-MITAB driver:
- * Fix mapping of mapinfo symbol numbers to corresponding OGR symbol IDs (#3826)
-
-MongoDB3 driver:
- * fix deprecation warnings with mongocxx >= 3.6
-
-MVT driver:
- * use 'number' instead of wrong 'numeric' when generating metadata tilestats (#4160)
- * reader: be tolerant to broken points generated by Mapserver
-
-OCI driver:
- * Don't try to create new layer with TRUNCATE option (#4027)
-
-ODBC driver:
- * Fix incorrect ODBC type mapping for a number of SQL types
- * Optimise testing if mdb is a PGeo/Walk/Geomedia database
- * Add support for LIST_ALL_TABLES open option
- * Update driver metadata
- * Move MDB Tools access driver installation to  CPLODBCDriverInstaller, and ensure driver installation is attempted when trying to open an MDB file using the ODBC driver
- * Add identify support
- * Add GetLayerByName override which can retrieve private layers by name
- * Implement IsLayerPrivate support
-
-ODS driver:
- * limit maximum number of fields to 2000 by default (ossfuzz #7969)
-
-OGR_GMT driver:
- * fix performance issue. (ossfuzz #38158)
-
-OpenFileGDB driver:
- * report hiearchical organization of layers
- * fix reading of raster fields
- * Add a "LIST_ALL_TABLES" open option
- * Support detection of private layers
- * Correctly list non-spatial, non-private tables which are not present in the GDB_Items table (#4463)
-
-PDS4 vector:
- * add a LINE_ENDING=CRLF/LF layer creation option for DELIMITED and CHARACTER tables
- * fix quadratic performance when creating fields (ossfuzz #37768)
- * avoid warning about wrong field subtype when parsing ASCII_Boolean
- * fix issue with layer names with non alphanum characters or leading digit
-
-PG driver:
- * support postgresql:// connection strings (#4570)
-
-PGeo driver:
- * add search path for libmdbodbc on Ubuntu 20.04
- * use SELECT COUNT(*) for GetFeatureCount() with mdbtools only if it appears to be working (#4103)
- * Make identification of system tables case insensitive
- * Add more internal tables to block list
- * Always promote polygon or line layers to multi-type geometries (#4255)
- * Correctly reflect whether layers have m values in the layer types
- * Correctly return failure when getting extent for non-spatial pgeo select layer
- * Correctly set no geometry type for pgeo select queries with no shape column
- * Add support for field domains (#4291)
- * Add support for retrieving layer definition and metadata with special "GetLayerDefinition table_name" and "GetLayerMetadata table_name" SQL queries
- * Add LIST_ALL_TABLES open option
- * Implement IsLayerPrivate()
- * Add GetLayerByName override which can retrieve private layers by name (#4361)
- * Add identify method (#4357)
-
-PGDump driver:
- * fix performance issue on huge number of columns (ossfuzz #38262)
- * set limit to number of created fields to 1600, consistently with PostgreSQL
-
-PLScenes driver:
- * add PSScene and SkySatVideo item types to conf, and update other item types
- * raster side: make it work with Sentinel2L1C and Landsat8L1G
-
-Shapefile driver:
- * fix wrong SRS when reading a WGS 84 SRS with a TOWGS84[0,0,0,0,0,0,0] (#3958)
- * Communicate why the file size cannot be reached when appending features (#4140)
-
-SQLite/Spatialite driver:
- * fix crash when calling GetMetadataItem() with domain==nullptr (qgis/qgis#43224)
- * fix for compatibility with SQLite 3.36.0 and views (#4015)
- * Implement IsLayerPrivate()
- * support reading tables WITHOUT ROWID (#3884)
- * Add missing SQL datatypes
-
-Tiger driver:
- * tag writing side as deprecated and for removal in 3.5 (#4215)
-
-VRT driver:
- * add support for coordinate epoch (RFC 81)
- * Fix spatial filter for geometry column names with space
- * fix performance issue (ossfuzz #38629)
-
-WasP driver:
- * fix likely wrong condition in line merging (spotted by cppcheck)
-
-WFS driver:
-
-XLS driver:
- * Set OLCStringsAsUTF8 capability to TRUE
-
-## SWIG Language Bindings
-
-All bindings:
- * add VSI_STAT_SET_ERROR_FLAG constant
- * Map CPLSetThreadLocalConfigOption() and CPLGetThreadLocalConfigOption()
-
-Python bindings:
- * add MDArray.GetNoDataValueAsString() / SetNoDataValueString()
- * change gdal.EscapeString() to return a bytearray() when input is bytes(), to make it compatible with backslash escaping of non-ASCII content
- * fix GDALPythonObjectFromCStr() to return a bytes() object rather than a corrupted unicode string when invalid UTF-8 sequences are found
- * make GDALAttribute.Write() accept a dictionary for JSON attributes, and make GDALAttribute.Read() return a dictionary for a JSON attribute
- * fix resampleAlg=gdal.GRA_Sum/Med/Min/Max/Q1/Q3 in gdal.Warp()
- * Fix inversion between GRA_ and GRIORA_ enums in gdal.Warp()/Translate()/BuildVRT()
- * fix bilinear, cubic, cubicspline resampling for gdal.BuildVRT()
- * make GetMetadata(None) work
- * fix MDArray.ReadAsArray() with CInt16/CInt32 data type
- * fix memleak in gdal|ogr|osr.DontUseExceptions()
- * fix crash when reading null strings with MDArray.Read()
- * catch potential exception thrown by SWIG_AsCharPtrAndSize()
- * Build windows python wrappers with -threads argument
- * Python >= 3.8 on Windows: automatically add path with [lib]gdal*.dll with os.add_dll_directory()
- * Python >= 3.8 import: fix exception when PATH has nonexistent paths on Windows (#3898)
- * fix behavior of SetMetadata() when a value is of type bytes (#4292)
- * no longer use distutils (deprecated since python 3.10) when setuptools is available (#4334)
- * remove call to __del__() in Geometry.Destroy(), which no longer exists in SWIG 4
-
-# GDAL/OGR 3.3.0 Release Notes
-
-## In a nutshell...
-
-* RFC 77 (https://gdal.org/development/rfc/rfc77_drop_python2_support.html): Drop Python 2 support in favor of Python 3.6 (#3142)
-* RFC 78 (https://gdal.org/development/rfc/rfc78_gdal_utils_package.html): Add a gdal-utils Python package
-* New driver:
-  - STACTA: raster driver to read Spatio-Temporal Asset Catalog Tiled Assets
-* Add /vsiadls/ virtual file system for Azure Data Lake Storage Gen2
-* Improved drivers: DIMAP, NITF
-* Number of improvements in Python bindings
-* Add automatic loading of configuration options from a file
-* Add support for enumerated, constraint and glob field domains in MEM, FileGDB/OpenFileGDB and GeoPackage drivers
-* Deprecation:
-  - Disable by default raster drivers DODS, JPEG2000(Jasper), JPEGLS, MG4LIDAR, FUJIBAS, IDA, INGR, ZMAP and vector driver ARCGEN, ArcObjects, CLOUDANT, COUCHDB, DB2, DODS, FME, GEOMEDIA, GTM, INGRES, MONGODB, REC, WALK at runtime, unless the GDAL_ENABLE_DEPRECATED_DRIVER_{drivername} configuration option is set to YES. Those drivers are planned for removal in GDAL 3.5
-  - Perl bindings are deprecated. Removal planned for GDAL 3.5. Use Geo::GDAL::FFI instead
-* Removal of BNA, AeronavFAA, HTF, OpenAir, SEGUKOOA, SEGY, SUA, XPlane, BPG, E00GRID, EPSILON, IGNFHeightASCIIGrid, NTV1 drivers. Moved to (unsupported) https://github.com/OSGeo/gdal-extra-drivers repository.
-* Continued code linting (cppcheck, CoverityScan, etc.)
-* Bump of shared lib major version
-
-## Backward compatibility issues
-
-See MIGRATION_GUIDE.txt
-
-## GDAL/OGR 3.3.0 - General Changes
-
-General:
- * fix build with recent gcc/clang
-
-Build(Unix):
- * Support CharLS 2.1 on Debian as well. (#3083)
- * disable LERC on big-endian hosts, as it is not big-endian ready
- * gdal-config (non installed): add -I/gnm in CFLAGS
- * fix compilation failure with gcc < 5 in Elasticsearch driver
- * configure: Also save LDFLAGS when checking compatibility.
- * configure: Ensure --with-geos/sfcgal fail if unavailable.
- * configure: check presence of linux/fs.h for Linux builds
- * configure: Fix gdal compilation when using proj-8.0.0 and libtiff with static jpeg support
- * GDALmake.opt.in: in non-libtool LD_SHARED builds, do not link applications against libgdal dependencies, but only against libgdal itself
-
-Build(Windows):
- * add missing makefile.vc for heif
-
-## GDAL 3.3.0 - Overview of Changes
-
-Port:
- * GOA2GetRefreshToken(): avoid nullptr dereference in some cases
- * /vsicurl/: for debug messages, use the debug key of derived filesystem, such as 'S3' instead of 'VSICURL'
- * /vsicurl/: fix issue when trying to read past end of file.
- * /vsicurl/: use less restrictive check for S3-like signed URLs to be usable by OpenIO (#3703)
- * /vsicurl/: fix handling of X-Amz-Expires type of signed URLs (#3703)
- * VSICurlStreamingClearCache(): fix cache clearing for /vsiaz_streaming/
- * /vsimem/, /vsisubfile/: fix memleak if destroying the C++ handle with delete instead of using VSIFCloseL() (ossfuzz #28422 #28446)
- * /vsiaz/: fetch credentials from Azure Active Directory when run from a Azure VM when AZURE_STORAGE_ACCOUNT is set.
- * /vsiaz/: add SAS query string in HTTP Get Range requests.
- * /vsiaz/: implement GetFileMetadata() / SetFileMetadata()
- * /vsiaz/: fix Stat('/vsiaz/container') when shared access signature is enabled
- * /vsis3/, /vsiaz/, /vsigs/: set Content-Type from filename extension for a few select file types
- * /vsis3/ sync: improve upload performance by setting the default number of threads and increase the chunk size
- * VSICachedFile::Read(): avoid division by zero if nSize ## 0 (#3331)
- * Make creation of global hCOAMutex thread-safer on Windows (#3399)
- * Add VSIFOpenEx2L() to be able to specify headers such as Content-Type or Content-Encoding at file creation time
- * CPLHTTP: Allow to set GSSAPI credential delegation type with GSSAPI_DELEGATION option / GDAL_GSSAPI_DELEGATION config. option
- * CPLHTTPGetNewRetryDelay(): match 'Operation timed out' curl error
- * CPLDebug: in CPL_TIMESTAMP mode, display also elapsed time since first trace
- * Use _stricmp / _strnicmp for Windows EQUAL / EQUALN() macros
-
-Core:
- * Add automatic loading of configuration options from a file (located in {sysconfdir}/gdal/gdalrc or $(USERPROFILE)/.gdal/gdalrc)
- * RasterIO: massive speed-up of nearest-neighbour downsampling when the downsampling factor is a integer value
- * RasterIO: speed-up average downsampling when the downsampling factor is 2 and with Byte/UInt16/Float32 data type
- * GDALDataset::BlockBasedRasterIO(): make it take into account floating-point window coordinates, as GDALRasterBand::IRasterIO() generic case does  (#3101)
- * GDALOpenEx(): supports OVERVIEW_LEVEL=NONE to indicate overviews shouldn't be exposed
- * GDALCopyWholeRasterGetSwathSize(): take into account COMPRESSION IMAGE_STRUCTURE metadata item at dataset level (helps for DIMAP)
- * cpl_userfaultfd.cpp: enable to disable it at runtime with CPL_ENABLE_USERFAULTFD=NO
- * Python embedding: fix symbol conflicts with python library (#3215)
- * Python embedding: fix loading in QGIS/Windows (or any process with more than 100 modules)
- * Python embedding: make it work on Ubuntu 20.04 when python-is-python3 package that symlinks python to python3 is installed
- * GDALUnrolledCopy_GByte: improve base SSE2 implementation so that specialized SSSE3 is no longer needer
- * RPC: add parameters ERR_BIAS and ERR_RAND (#3484)
-
-Multidim API:
- * CreateCopy() multidim: allow to provide array-level creation options by prefixing them with "ARRAY:"
- * [Set/Get][Offset/Scale](): extend to get/set storage data type. Add 'Ex' suffixed C API functions for that
- * GDALMDArrayUnscaled: implement Write() to be able to get from unscaled values to raw values
- * GDALMDArrayUnscaled::IWrite(): speed optimization when writing to netCDF 4
- * GDALGroup::CopyFrom(): add ARRAY:AUTOSCALE=YES and ARRAY:AUTOSCALE_DATA_TYPE=Byte/UInt16/Int16/UInt32/Int32 creation options
- * CreateCopy(): allow IF(NAME={name}) to be a full qualified name
- * GDALExtendedDataType::Create(): do not allow creating compound data type with no component
-
-Algorithms:
- * Add RMS (Quadratic Mean) subsampling to RasterIO, overviews and warp kernel (#3210)
- * Warping: improve performance related to PROJ usage for warping of small rasters
- * Warper ComputeSourceWindow(): avoid potential integer overflow with a ill-behaved transformer/inverse projection
- * Warper: fix assertion/crash in debug mode in GWKCheckAndComputeSrcOffsets() in some circumstances
- * Pansharpening: fix wrong band assignment when input multispectral bands not in order 1,2,... and NoData set as PansharpeningOptions and not present in input bands
- * internal_libqhull/poly.c: avoid int overflow on 32bit
- * Fix failure in overview generation for certain raster sizes and overview factor, on raster with color table in particular (#3336)
- * GDALSuggestedWarpOutput2(): avoid potential crash if an approximate transformer is provided
-
-Utilities:
- * gdalinfo: add -approx_stats in synopsis (#3296)
- * gdal_translate -tr: make non-nearest resampling honour the specified resolution to avoid potential sub-pixel misalignment when the spatial extent, resolution and dimensions in pixels don't perfectly match
- * gdal_translate: preserve source block size when not subsetting, and preserve as well COMPRESSION IMAGE_STRUCTURE metadata item
- * gdal_translate / gdalwarp: do not copy CACHE_PATH metadata item from WMS driver
- * gdalwarp: make -of COG work with multiple input sources when BigTIFF temporary output is needed (#3212)
- * gdalwarp: preserve scale/offset settings of source bands to output (#3232)
- * gdalwarp: address (one situation of) geometry invalidity when reprojecting the cutline to the source image
- * gdal_create: add a -if option to specify a prototype input file
- * gdal_rasterize: make -i work again (#3124)
- * gdaldem TRI: add a -alg Riley option to use the Riley 1999 formula, for terrestrial use cases (#3320), and make it the new default
- * gdal2tiles: Allow automatic max zoom when min zoom is specified
- * gdal2tiles: change from cdn.leafletjs.com to unpkg.com for leaflet .css and .js (#3084)
- * gdal2tiles: take into account --xyz in leafleft output (#3359)
- * gdal_calc: multiple improvements (nodata, multiple inputs in the same alpha, checks, extent with union/intersection logic, color table, ...)
- * gdal_edit: Correctly handle the error of parameter '-scale' with no number given
- * gdal_ls.py: display file mode when available
- * gdal2xyz.py: various improvements (nodata, band selection, etc.)
- * pct2rgb.py and rgb2pct.py: added support for an input pct_filename
- * gdalattachpct.py: new utility from attachpct.py sample
- * validate_gpkg.py: various improvements
- * add gdallocationinfo.py sample script
-
-Resource files:
- * tms_MapML_CBMTILE.json: fix it to use correct resolution / scaleDenominator. Unfortunately this makes it non-usable by gdal2tiles, but still by the COG driver
-
-Multi driver changes:
- * gdal2tiles/COG/MBTiles/GeoPackage: adjustments for EPSG:3857 output (due to PROJ 8 changes)
-
-BAG driver:
- * fix inversion of width and height in XML metadata (#3605)
-
-BLX driver:
- * fix potential free of uninitialized variable in case memory allocation would fail
-
-BYN driver:
- * relax checks in header bytes to allow products with some unset/invalid fields we don't use
-
-COG driver:
- * allow customising overview compression type (#3453)
-
-DAAS driver:
- * fix pixel retrieval of dataset with UInt16 data type and one mask band (#3061), and also use pixelType from bands[] instead of deprecated top-level one
-
-DIMAP driver:
- * add support for VHR 2020 Multispectral Full Spectrum products
- * add support for multiple components / subdatasets
- * set source block size to DIMAP VRT band (helps for performance with JP2KAK)
-
-ECW driver:
- * fix build with original ECW SDK 5.4 (#2776)
-
-ENVI, Ehdr, and other "raw" drivers:
- * lower memory requirements for BIP interleave, and improve efficiency (#3213)
-
-FIT driver:
- * reject negative value PAGESIZE creation option (ossfuzz #26596)
-
-FITS driver:
- * apply vertical mirroring on reading/writing
- * add support for creation and update of binary tables
- * display more informative error message when opening raster dataset in vector mode, or vice-verca
- * avoid stack smash overflow with 32 bit Linux builds in GetRawBinaryLayout()
- * set physical filename when opening subdataset
-
-GRIB driver:
- * fix reading subfields reusing the bitmap of a previous one (#3099)
- * degrib: avoid erroneous unit conversion when section 4 has vertical values coordinates (#3158)
- * degrib: add surface type 150 = Generalized Vertical Height Coordinate (#3158)
- * Update MRMS Local Table to v12 (#3328)
- * fix writing of ComplexPacking with nodata values and a single valid value (#3352)
-
-GTiff driver:
- * Internal libtiff resync with libtiff 4.3.0. Includes:
-   - tif_lerc.c: fix encoding of datasets with NaN values (#3055)
-   - TIFFStartStrip(): avoid potential crash in WebP codec when using scanline access on corrupted files (ossfuzz #26650)
- * Export JPEG compression tags to metadata
- * Report PREDICTOR in IMAGE_STRUCTURE dataset metadata domain (when it is set)
- * avoid setting compoundCRS name to 'unknown' when the GTCitationGeoKey is absent
- * better parse VerticalCitationGeoKey that is in the form 'VCS Name = foo|...'
- * rely on libtiff for LERC codec instead of internal libtiff-only codec previously
- * avoid GetSpatialRef() to return non-NULL on dataset with GCPs (#3642)
-
-HDF5 driver:
- * fix reading files whose HDF5 signature is not at offset 0 (#3188)
-
-HFA driver:
- * fix reading SRS with NAD83 favors, like 'NAD83(CORS96)'
-
-JP2KAK driver:
- * JP2KAKCreateCopy(): add validation of BLOCKXSIZE/BLOCKYSIZE to avoid Coverity warning about division by zero (CID 1086659, 1086660)
-
-JPEG driver:
- * add support for reading FLIR (infrared) metadata and thermal image
- * read XMP tag from EXIF and expose its content in xml:XMP metadata domain
- * CreateCopy(): add a warning when writing a non-CMYK 4-band dataset, and improve doc
- * switch internal libjpeg internal memory allocator to default (malloc/free) (#3601)
-
-LercLib (third_party):
- * fix portability issue on non-Intel platforms
-
-MRF driver:
- * Restore raw Lerc1 detection (#3109)
- * Support LERC1 compression improvements with non-finite values (#3335)
-
-netCDF driver:
- * fix reading netCDF4/HDF5 files whose HDF5 signature is not at offset 0 (#3188)
- * accept relative variations in X/longitude and Y/latitude spacing of up to 0.2% for float variables or 0.05% for double. Add a GDAL_NETCDF_IGNORE_EQUALLY_SPACED_XY_CHECK config option to ignore those checks if needed (#3244, #3663)
- * open /vsimem/ files without requiring Linux userfaultfd mechanism
- * Set scope for raster/vector-only options in driver metadata
- * multidim: add a GROUP_BY=SAME_DIMENSION option to GetGroupNames()
- * change the 'No UNIDATA NC_GLOBAL:Conventions attribute' from a warning to a debug message
-
-NITF driver:
- * Add support for SNIP TREs: CSRLSB, CSWRPB, RSMAPB, RSMDCB, RSMECB, SECURA and SNSPSB
- * Add xml:DES metadata domain and DES creation option (#3153)
- * Add support for ISO8859-1 fields in NITF TREs
-
-NWT_GRD driver:
- * fix portability issue on non-Intel platforms
-
-OGCAPI driver:
- * add missing Windows build support
- * fixes to handle links without type, in the coverage code path (Rasdaman use case)
- * fix when coverage uses a compoundCRS with a time component (#3665)
-
-PCIDSK driver:
- * resynchronization of PCIDSK SDK with the internal repository maintained by PCI
- * make GetMetadataItem() returns the same const char* for a given key (while SetMetadata/SetMetadataItem is not called)
-
-PDS4 driver:
- * update value of <parsing_standard_id> for TIFF/BigTIFF to what is expected by PDS4 IM (#3362)
-
-RMF driver:
- * Better support for sparse files. Fill null tiles with NoData value.
- * Fix portability issues on non-Intel platforms
-
-TileDB driver:
- * Add support for array versioning (#3293)
- * do not try to identify /vsis3/ files ending with .tif
- * add /vsigs/ support
-
-VRT driver:
- * add a <UseMaskBand>true</UseMaskBand> element of <ComplexSource> to allow compositing of overlapping sources (#1148)
- * AddBand() support BLOCKXSIZE and BLOCKYSIZE options; serialize/deserialize block size as attributes of VRTRasterBand element
- * VRTPansharpenedDataset: fix crash when the spectral bands have no nodata value, but we have one declared in PansharpeningOptions, and when the VRTPansharpenedDataset exposes overviews (#3189)
- * close sources at dataset closing (#3253)
-
-WCS driver:
- * fix memory leak in error code path (ossfuzz #28345)
-
-WMS driver:
- * tWMS: improves usability with NASA GIBS services (#3463)
- * properly deal with northing,easting ordered CRS in WMS 1.3.0 when using connection string being a GetMap URL request (#3191)
- * add option to specify HTTP Accept header
- * Use noDataValue on empty blocks (#3375)
- * Let pass expected NoDataValue to MRF for reading data (#3388)
- * Update default values for VirtualEarth minidriver
-
-WMTS driver:
- * Map CURLE_FILE_COULDNT_READ_FILE to 404 (#2941)
-
-XYZ driver:
- * support reading datasets organized by columns, such as the ones of https://www.opengeodata.nrw.de/produkte/geobasis/hm/dgm1_xyz/dgm1_xyz
-
-## OGR 3.3.0 - Overview of Changes
-
-Core:
- * Add UUID string field subtype
- * OGRFeature::GetFieldAsString() and GeoJSON output: do not output Float32 with excessive precision
- * IsPolarToWGS84(): make detection of polar projections more specific
- * OGR SQL: fix potential crash or incorrect result on multi column ORDER BY (#3249)
- * Expose prepared geometry API to C and in SWIG bindings
- * OGRGeometry::ExportToJson(): takes into account CRS and axis order to swap
- * OGRShapeCreateCompoundCurve(): fix memory leak in error code path. (ossfuzz #28923)
- * Add OGR_G_Normalize() and bind it to SWIG (#3506)
- * OGRPoint: make it empty when x or y is NaN (refs #3542)
- * Avoid SWIG generating exception on OGRGeometry::IsValid (#3578)
- * OGRGeometry::exportToWkt(): rebustify implementation against out-of-memory, and make it slightly more efficient for some huge geometries
- * OGRSimpleCurve: fix copy constructor / assignment operator of empty Z/M geometries in some cases
- * OGRGeometry: make sure that the return type of clone() for all classes is their own type
- * OGRGeometry: make getGeometryRef() in subclasses return a better type
- * OGRGeometry: Handle WKB > 2 GB. Add OGR_G_WkbSizeEx() and OGR_G_CreateFromWkbEx()
- * Add OGRSimpleCurve::removePoint()
-
-OGRSpatialReference:
- * Fix exportToWkt() after morphToESRI() on Geographic/Projected 3D CRS.
- * GetEPSGGeogCS(): make it use database lookups if needed (and avoid misidentification of 'NAD83(CORS96)' for example
- * exportToWKT(): add a ALLOW_ELLIPSOIDAL_HEIGHT_AS_VERTICAL_CRS=YES option to allow export of Geographic/Projected 3D CRS in WKT1_GDAL as CompoundCRS with a VerticalCRS being an ellipsoidal height (for LAS 1.4)
- * Add OGRCoordinateTransformation::TransformWithErrorCodes() and OCTTransform4DWithErrorCodes() to get PROJ (>= 8) error codes
- * Add OCTCoordinateTransformationOptionsSetDesiredAccuracy() and OCTCoordinateTransformationOptionsSetBallparkAllowed(), and map them to SWIG
- * GetEPSGGeogCS(): fix when projected CRS can't be exported to WKT2
- * SetFromUserInput() allow https:// when loading CRS from opengis.net (#3548)
- * Add Get/Set for PROJ auxiliary database filenames (#3590)
- * Delegate to PROJ (>= 8.1) import from OGC URN and URL (OSGeo/PROJ#2656)
-
-Utilities:
- * ogrinfo: report field domain type and add '-fielddomain name' switch
- * ogr2ogr: add -emptyStrAsNull option
- * ogr2ogr: add propagation of field domains
- * ogr2ogr: add a -resolveDomains switch
-
-AmigoCloud driver:
- * Fix date/datetime field type handling.
- * Fix json encoder to handle nested strings. (#3483)
- * Fix SQL delete (#3512)
-
-CAD driver:
- * fixes for big endian hosts
-
-DGN driver:
- * avoid assert() in case of very low memory condition (ossfuzz #27006)
-
-DGN and DGNv8 driver:
- * Support for reading User Data Linkage data (#3089)
-
-DXF driver:
- * Skip hatch polyline segments with one vertex
-
-Elasticsearch driver:
- * support WKT geo_shape encoding, and make GetExtent() use server-side query for geo_shape if ES >= 7.8 and XPack is installed
- * fix GetFeatureCount() when SetAttributeFilter() is a ElasticSearch JSON filter
- * add open options for timeouts and maximum number of features
-
-FlatGeobuf driver:
- * add editable capabilities
- * fix crash when writing a geometry collection with an empty polygon (ossfuzz #29291)
- * fix crash in GetFileList() on a dataset opened in update mode
- * fix crash when writing features larger than 32 KB
-
-GeoPackage driver:
- * Add support for GeoPackage 1.3 (creation still defaults to 1.2)
- * Fix handling of invalid SRS ID (#3286)
- * always write milliseconds in a DATETIME field for strict compliance with the spec (#3423)
- * no longer create triggers on gpkg_metadata and gpkg_metadata_reference
- * Take into account OGR_CURRENT_DATE config option in gpkg_metadata_reference table (fixes #3537)
- * Remove creation support for data_type='aspatial' legacy tables
- * fix update of gpkg_metadata_reference when renaming or dropping a column, and this table references it
-
-GeoJSON driver:
- * writer: avoid invalid .0 suffix to be added to numeric values like 1eXX (#3172)
- * writer: avoid CPLDebug() messages when writing BBOX in RFC7946 mode
- * reader: accept files starting with {"bbox":...,"features":[... (#1537)
- * reader: fix opening of file containing a Feature object and starting with a large properties (fixes #3280)
-
-GML driver:
- * fix layer extent with wrong axis order in some cases (#3091)
- * recognize AIXM ElevatedSurface to be able to proper axis swapping (#3091)
- * GML geometry parsing: handle km unit for radius of arcs (#3118)
- * fix nullptr dereference on invalid GML (ossfuzz #28040)
-
-LVBAG driver:
- * Update to the new XSD schema (#3324)
- * Minor fixes (#3467, #3462)
- * Convert MultiPolygon to Polygon (#3581)
-
-MapInfo driver:
- * Support for font and custom symbols (#3081)
- * Explicitly set pen cap and join params for pen tools
-
-NAS driver:
- * don't skip prescan, if NAS_GFS_TEMPLATE is given, but still don't     write .gfs
-
-NGW driver:
- * Add extensions support.
- * Add alternative field name support.
-
-OAPIF driver:
- * report url of STAC asset items
-
-ODBC driver:
- * Remove text trimming behavior
-
-PGeo driver:
- * don't silently ignore rows with NULLs for Memo fields
-
-PostGIS driver:
- * on reading, instantiate SRS from EPSG when possible instead of srtext to avoid axis order issues, and strip TOWGS84 on known datum (#3174)
- * when detecting srid from table contents, ignore null geometries.
-
-Shapefile driver:
- * writer: do not write coordinates with non-finite values (#3542)
-
-SQLite driver:
- * recognize col decltype 'INTEGER_OR_TEXT' as a string
- * better detection of view column types
-
-SXF driver:
- * fix reading on big-endian architectures
-
-WFS driver:
- * fix CreateFeature() for WFS 2 (#3323). And for WFS 2, make CreateFeature() and SetFeature() use GML 3
-
-XLSX driver:
- * fix read cells with inline formatting (#3729)
-
-## SWIG Language Bindings
-
-All bindings:
- * avoid nullptr deref if providing some NULL arguments to gdal.Debug() and gdal.GOA2xxxxx() methods
- * fix return type of Dataset.SetSpatialRef()
- * fix expansion of ODsCRandomLayerWrite constant
- * add missing GRA_Sum constant (#3724)
-
-CSharp bindings:
- * Replace ToInt32 calls with ToInt64 to prevent an ArithmeticException when executing against large images in a 64-bit context.
- * Sign csharp assemblies as part of the netcore build process, verify signature during tests (#1368) (#3332)
- * fix 'make' target on Linux/Mac
-
-Java bindings:
- * Add CoordinateTransformation.TransformPointWithErrorCode()
-
-Python bindings:
- * Add Dataset.WriteArray()
- * Make Dataset.ReadRaster() and ReadAsArray() accept floating-point coordinates (#3101)
- * Make methods such as WriteRaster() accept a bytearray object
- * Return bytearray object as return of ReadRaster(), ReadBlock(), VSIFReadL(), MDArray.Read(), ...
- * Add a band_list optional argument to Dataset.ReadAsArray()
- * Make methods such as WriteRaster() accept any memoryview compatible of PyBUF_SIMPLE
- * Make ogr.GetFieldAsBinary(), geom.ExportTo[Iso]Wkb() return a bytearray instead of a bytes object
- * Make ReadRaster() and ReadBlock() accept an existing buf_obj buffer
- * Make ReadAsArray(buf_obj = ar) fail if ar.flags.writable is False
- * Make WriteRaster() accept a numpy array (when used without the buf_ overriders)
- * Allow list or array types as input of MDArray.Write() for 1D arrays
- * Prepare all samples scripts for reuse
- * Add osgeo_utils.auxiliary submodules for auxiliary functions.
- * [epsg_tr|esri2wkt|gcps2vec|gcps2wld|gdal_auth|gdalchksum|gdalident|gdalimport|mkgraticule].py - move undocumented untested utils to the `samples` subfolder where they belong
- * Implement correct behavior for copy.copy() and copy.deepcopy() on a Geometry object (#3278)
- * Add CoordinateTransformation.TransformPointWithErrorCode()
- * Remove deprecated NumPy aliases for standard types.
- * Better validation of Band.ReadAsArray() input shape (#3466)
- * Dictionary typemap: accept key/value not being strings
- * Add batch_creator.py, a Windows batch file creator
- * Fix 'make generate' target on Unix builds (#3696)
-
-# GDAL/OGR 3.2.0 Release Notes
-
-## In a nutshell...
-
- * New GDAL drivers:
-   - ESRIC: ESRI bundle cache read-only driver (#2663)
-   - HEIF: read-only driver for HEIF/HEIC file. Requires libheif
-   - OGCAPI: tiles/maps/coverage raster/vector experimental driver
-   - TGA: read/only driver to read TGA image file format
- * New OGR drivers:
-   - LVBAG: read-only support for Dutch LVBAG/Kadaster 2.0 vector format
- * New utilities:
-   - gdal_create: to create/initialize a new raster file
- * Other improvements:
-   - Multi-threaded overview computation (if GDAL_NUM_THREADS set)
-   - COG driver: TILING_SCHEME creation option
-   - OpenFileGDB driver: add support for using spatial indexes
-   - BAG driver: multiple improvements
-   - FITS driver: multiple improvements (MEF and binary table support)
-   - NITF driver: support for SNIP TREs
-   - OGRFieldDefn: support UNIQUE constraint
-   - OGRFieldDefn: support a AlternativeName (alias) property (#2729)
-   - Python bindings: move implementation of scripts (except gdal2tiles) in osgeo.utils package to be reusable
-   - Faster GTIFF Deflate compression/decompression through libdeflate (if using internal libtiff or libtiff > 4.1.0)
- * Removed functionality:
-   - Python bindings: old-style "import gdal" is no longer available. Use "from osgeo import gdal" instead
-   - API_PROXY mechanism: likely never used for real usage.
-   - Removal of GDAL and OGR ArcSDE drivers
-
-## Backward compatibility issues
-
-See MIGRATION_GUIDE.txt
-
-## New installed files
-
- * data/tms_NZTM2000.json
- * data/tms_LINZAntarticaMapTileGrid.json
- * data/tms_MapML_APSTILE.json
- * data/tms_MapML_CBMTILE.json
- * data/template_tiles.mapml
-
-## GDAL/OGR 3.2.0 - General Changes
-
-General:
- * fix building against Jasper 2.0.19 and 2.0.21
- * Add optional libdeflate dependency for faster Deflate compression/decompression
-
-Build(Unix):
- * GNUmakefile: split long line to avoid 32K character limitation on MSYS2
- * configure: Configure proj dependencies before proj (#2512)
- * configure. add $with_proj_extra_lib_for_test n LIBS when detecting PROJ when no path is specified (#2672)
- * configure: fix CharLS 2.1 detection on case insensitive filesystems (#2710)
- * configure: fix --with-hdf4 and --disable-all-optional-drivers (#2740)
- * GNUmakefile: make 'all' target an alias of the default one to avoid potential double build of OGR objects (fixes #2777)
- * configure: add ODA lib requirements to compile GDAL with ODA 2021 (#2812)
- * configure: fix detection of minor version number of Poppler with the new YY.MM.X numbering scheme (#2823)
- * configure: fix detection of Spatialite 5 build against PROJ >= 6 (#2826)
- * configure: fix detection of libtiff and libjpeg on mingw (fixes #2881)
- * configure: fix linking order for Informix libraries
- * configure: support CharLS 2.1 on Debian as well. (#3083)
- * configure: disable LERC on big-endian hosts, as it is not big-endian ready
- * fix compilation issue of gdallinearsystem.cpp on Slackware 14.2 (#2883)
- * Update scripts/gdal-bash-completion.sh
-
-Build(Windows):
- * nmake.opt: mention shell32.lib in PROJ_LIBRARY
- * nmake.opt: Add a PYEXEC var to specify the python executable when building GDAL/bindings on Windows.
- * nmake.opt: add hint about adding ole32.lib to PROJ_LIBRARY for PROJ 7.1 when static linking (#2743)
- * only expand CPL_DLL to__declspec(dllexport) when building GDAL (shared configuration) (#2664)
- * add missing Windows build support for EXR driver
- * generate_vcxproj.bat: add vs2019 compatibility (#2676)
- * fix build in AVC driver in VSIL_STRICT_ENFORCE mode
-
-## GDAL 3.2.0 - Overview of Changes
-
-Port:
- * cpl_json.h: change the Type and PrettyFormat 'enum' to 'enum class', so that Double doesn't conflict with a C enum from OGDI include files
- * cpl_json.h: add an iterator on array items, and fix const correctness of LoadUrl() method
- * Add logging capabilities for /vsicurl, /vsis3 and the like. Add VSINetworkStatsGetAsSerializedJSON() and VSINetworkStatsReset(), CPL_VSIL_NETWORK_STATS_ENABLED and CPL_VSIL_SHOW_NETWORK_STATS config options
- * /vsis3/ and other cloud file system: allow random-write access (for GTiff creation in particular) through temporary local file when CPL_VSIL_USE_TEMP_FILE_FOR_RANDOM_WRITE config option is set to YES
- * /vsis3/: recognize AWS_PROFILE in addition to obsolete AWS_DEFAULT_PROFILE (#2470)
- * /vsis3/: use IMDSv2 protocol to retrieve IAM role and credentials
- * /vsis3/: add CPL_VSIS3_USE_BASE_RMDIR_RECURSIVE=YES for some S3-like APIs do not support DeleteObjects
- * /vsis3/: additional retry on failures on write operations
- * VSIS3FSHandler::SetFileMetadata(): fix memleak
- * Improved AWS EC2 detection on Windows
- * /vsicurl/: defer reading of CPL_VSIL_CURL_CHUNK_SIZE and CPL_VSIL_CURL_CACHE_SIZE config options until a /vsicurl/ access (or other network filesystem) is done
- * /vsiaz/: do not consider directory absence as an error situation for Rmdir()
- * /vsiaz/: fix OpenDir()/NextDirEntry() that returned S_IFDIR for regular files
- * /vsiaz/: update to latest version of API (2019-12-12)
- * /vsiaz/: add a AZURE_NO_SIGN_REQUEST=YES config option for unsigned public buckets and AZURE_SAS to provided Shared Access Signature. Both to be used with AZURE_STORAGE_ACCOUNT (#2766)
- * /vsiaz/: ReadDir(): fix caching of file properties with space in the name
- * VSISync(): implement chunking of large files for /vsiaz/ upload when CHUNK_SIZE and NUM_THREADS are set
- * VSISync(): split large files on download/upload for /vsis3/ and /vsiaz/ (#2786)
- * VSISync(): add a SYNC_STRATEGY=OVERWRITE to always overwrite target file
- * RmdirRecursive(): use OpenDir() in recursive mode to have more efficient directory deletion on /vsiaz/ for example
- * /vsimem/: fix normalization of slashes in filenames to avoid potential infinite loop in VSIDirGeneric::NextDirEntry()
- * VSI plugin: add caching option (#2901)
- * VSI plugin: add callback to explicitly list sibling files (#2980)
- * CPLWorkerThreadPool: add capability to create several job queues
- * CPLStrtodDelim(): recognize '1.#SNAN' as a NaN value
- * CPLAtoGIntBigEx(): use strtoll() when available since POSIX doesn't guarantee atoll() will return ERANGE (and libmusl for example does not return it)
- * CPLIsFilenameRelative(): treat "scheme://.." filenames as absolute
- * Add GDAL_CURL_CA_BUNDLE environment variable (#3025)
- * CPLHTTPFetch: fix reading FORM_FILE_PATH on Windows (#2971)
- * Add CPLHTTP[Push|Pop]FetchCallback() and CPLHTTPSetFetchCallback() callback mechanisms to replace curl implementation (to be used by QGIS)
- * VSI_CACHE: do not trust unreliable file size from underlying layer as in fixes #3006
- * CPLMultiPerformWait(): use curl_multi_poll() for curl >= 7.66
-
-Core:
- * Overview building: add multi-threading of resampling computations when GDAL_NUM_THREADS config option is set
- * add a TileMatrixSet class to parse OGC Two Dimensional Tile Matrix Set 17-083r2 JSON encoded definitions, and add NZTM2000 and LINZAntarticaMapTileGrid definitions
- * Add GDALAutoCreateWarpedVRTEx function to GDAL API to accept extra options for transformer (#2565)
- * add a global thread pool mechanism
- * GDALDataset::IRasterIO(): Fixes wrong IO of subpixel shifted window (#2057)
- * GDALDriver::QuietDelete(): partially revert 3.1 commit f60392c8
- * gdal_priv.h: export EXIFExtractMetadata() for plugin uses
- * DumpJPK2CodeStream(): fix reported offset of EOC marker when PSOT = 0 (#2724)
- * Overview generation: fix progress percentage when using USE_RRD=YES (#2722)
- * reader_geo_eye.cpp and reader_pleiades.cpp: avoid potential issue with overuse of per-thread CPLPath static buffers
- * GDALDataset::IRasterIO(): make it try overviews when non-nearest resampling is done before doing RasterIOResampled() on full resolution dataset
- * Workaround issue with UTF-8 precomposed vs decomposed encodings on MacOS filesystems that affect sidecar file discovery (#2903)
- * GDALBuildVRT(): add support for sources such as MEM dataset or non-materialized VRT files
- * GDALDataset::BlockBasedRasterIO(): make it take into account floating-point window coordinates, as GDALRasterBand::IRasterIO() generic case does  (#3101)
-
-Multidim API:
- * GetMask(): use underlying parent data type as much as possible, instead of double, to avoid potential performance issues
- * GetMask(): optimize when we know the mask is always at 1, and when output buffer is contiguous Byte
- * Add GDALGroupOpenMDArrayFromFullname() and GDALGroupOpenGroupFromFullname(), and exose them to SWIG (#2790)
- * Add GDALGroup::ResolveMDArray() and map it to C and SWIG
- * Add GDALMDArrayGetStatistics(), GDALMDArrayComputeStatistics() and GDALDatasetClearStatistics()
- * Make sliced and transpose arrays access the attributes of their source array
- * add GDALMDArrayAdviseRead() and implement it in netCDF driver for DAP datasets
-
-Algorithms:
- * Warper/transformer: avoid error about invalid latitude when warping a dataset in Geographic CRS whose north/south lat is > 90deg (#2535)
- * Warper: use gcore global thread pool when doing multithreaded operations
- * Warper: fix average resampling that lead to very wrong results in some circumstances (#2665) (3.1.0 regression)
- * Warper: ComputeSourceWindow(): modify extra source pixel computation in anti-meridian warping situations
- * Warper: fix computation of kernel resampling width when wrapping across the antimeridian
- * Warper: emit error message instead of assertion if cutline is not a (multi)polygon (#3037)
- * RPC transformer: Add RPC_DEM_SRS option to override SRS of RPC_DEM. (#2680)
- * TPS transformer: fix handling of duplicated GCPs (fixes #2917)
- * Polygonize: make sure not to use dummy geotransform
-
-Utilities:
- * gdalinfo, gdal_translate, gdalwarp: add a -if switch to be able to specify input driver(s) (#2641)
- * gdalinfo: json output: report nan/inf values as a string instead of invalid JSON
- * gdalinfo: json output: do not escape forward slash
- * gdal_translate (and GTiff driver): copy XMP metadata unless -noxmp is specified (#3050)
- * gdal_viewshed: adjust computation of observer position (#2599)
- * gdaldem: ignore 'nv' entry in color file if there is no nodata value in input file
- * gdalwarp: fix crash if warping a dataset without source or target CRS when -ct is specified (#2675)
- * gdalwarp: improve logic for selecting input overview when target bounds and resolution are specified
- * gdalwarp: better guess of target resolution when target extent is specified (#2754)
- * gdalbuildvrt: for easier understanding, and replicate gdal_translate -of VRT behavior, clamp xSize/ySize of SrcRect/DstRect if outside raster dimensions. Not a fix per se
- * gdalbuildvrt: add support for automatically declaring virtual overviews in very restricted situations
- * gdalbuildvrt: fix -srcnodata / -vrtnodata handling in -separate mode (#2978)
- * gdal_grid: Addition of -tr option (#2839)
- * gdal_contour: major speed up in polygon mode (#2908)
- * gdal2tiles: make general cmd line switches like --formats work without exception (#2522)
- * gdal2tiles: fix issue in nativezoom computation with --profile=raster on a raster whose size is below the tile size
- * gdal2tiles: fix --xyz with -p raster, fix KML generation with --xyz (#2463) and update OpenLayers export to OpenLayers 6.3.1
- * gdal2tiles: add -w mapml output, and possibilities to use custom tiling scheme / profile
- * gdal2tiles.py: fix generation of tiles at high zoom levels when input is small (#2896)
- * gdal2tiles.py: make sure configuration options specified with --config are passed to worker processes (#2950)
- * gdal2tiles.py: fix --profile=raster on a non-georeferenced image (#2998)
- * gdal2tiles: change from cdn.leafletjs.com to unpkg.com for leaflet .css and .js (#3084)
- * gdal_merge.py: fix rounding of source coordinates, when they are very close to an integer, which would otherwise result in a one-pixel shift
- * gdal_calc: support multiple calc arguments to produce a multiband file (#3003)
- * gdal_calc.py: raise exception in case of I/O error. Fixes QGIS #36867
- * gdal_sieve.py: do not write geotransform to the target if the source doesn't have one (#2830)
- * gdalcompare.py - export def find_diff(golden_file, new_file, check_sds=False) into a function for reuse
- * gdalcompare.py: fix floor division in Python 3
- * validate_cloud_optimized_geotiff.py: update to support SPARSE_OK=YES files
-
-Multi driver changes:
- * Driver metadata: fix XML errors in option declarations and add testing (#2656)
- * JPEG2000 drivers: extent signature for JPEG2000 codestream to avoid false positive detections.
-
-LERC:
- * Fixed a bug in Lerc2 decoder (https://github.com/Esri/lerc/pull/129)
- * Fixed a bug in Lerc1 decoder (https://github.com/Esri/lerc/pull/121)
-
-AAIGrid:
- * mention dataset name in errors (#3051)
-
-BAG driver:
- * add support for reading georeferenced metadata
- * remove support for interpolated resampled raster
- * add support for COUNT VALUE_POPULATION strategy
- * support reading other single resolution layers on the root node
- * add support for Create()/warp operation
- * add support for reading the tracking list (with OGR API)
- * fix reporting of vertical CRS
- * fix missing nodes at right and top edges of supergrids in resampling mode (#2737)
- * allow it to be used in multidimensional mode through the generic HDF5 driver
- * fix for big endian arch
- * avoid crash on non-standard dataset
-
-COG driver:
- * add support for using custom TILING_SCHEME using OGC 17-083r2 JSON encoded definitions
- * add ZOOM_LEVEL_STRATEGY creation option
- * add WARP_RESAMPLING and OVERVIEW_RESAMPLING to override general RESAMPLING option (#2671)
- * write information about tiling scheme in a TILING_SCHEME metadata domain
- * add a SPARSE_OK=YES option to create sparse files
- * TIFF/COG: report content of the header ghost area in metadata
- * skip reprojection when source dataset matches reprojection specifications
- * fix rounding issue when computing overview dimensions
- * fix crash if passing an invalid (warp) resampling
- * fix crash when source dataset is non-Byte/non-UInt16 with a color table (fixes #2946)
-
-DIMAP driver:
- * fix loading when R1C1 tile is not present (#2999)
-
-DTED driver:
- * add support for EGM08 for dted metadata "E08" (#3047)
-
-E00grid driver:
- * avoid recursive call in _GetNextSourceChar(). Fixes ossfuzz#25161
-
-ECW driver:
- * fix related to network files with SDK >= 5.5 (#2652)
-
-ENVI driver:
- * write nodata value in 'data ignore value' header field
- * add support for writing south-up / rotation=180 datasets
-
-FIT driver:
- * reject negative value PAGESIZE creation option (ossfuzz#26596)
-
-FITS driver:
- * add support for reading multiple-extension FITS files through subdatasets
- * add support for reading binary tables
- * initialize default geotransform
- * do not emit error if no georeferencing is found
-
-GPKG driver:
- * perf improvement: when inserting more than 100 features in a transaction in an existing layer, switch to a deferred insertion strategy for spatial index entries
- * on reading of gridded coverage data with PNG tiles, select -FLT_MAX as the nodata value (#2857)
- * add support for using custom TILING_SCHEME using OGC 17-083r2 JSON encoded definitions
- * increase limitation of number of tables to 10000, and make it configurable through OGR_TABLE_LIMIT config option as for vector tables
- * more robust and simple logic to build overviews and compute overview factor (#2858)
- * make ST_Transform() fallback to EPSG code when no SRS with the given srs_id can be found in gpkg_spatial_ref_sys
- * CreateSpatialIndex(): slight optimization by bumping batches to 500K features
- * make SELECT DisableSpatialIndex(...) run faster
- * fix when writing a tile with uniform negative values or values > 65535 (when nodata is set) in PNG tiles (#3044)
- * fix GDAL 3.0 regression regarding some update scenarios (#2325)
-
-GRASS driver:
- * simplified to GRASS GIS 7+ only (#2945)
- * fix reading GRASS groups (#2876)
-
-GRIB driver:
- * correctly report PDS template number for messages with subgrids (#3004)
- * avoid rejecting valid product due to security check
- * fix retrieval of nodata value for GRIB1 products (GDAL 3.1 regression, #2962)
- * fix reading subfields reusing the bitmap of a previous one (GDAL 3.1 regression,  #3099)
- * Degrib g2clib: rename symbols of our internal modified copy (#2775)
-
-GTiff driver:
- * add read support for overviews/masks referenced through TIFFTAG_SUBIFD (#1690)
- * add WEBP_LEVEL_OVERVIEW config option to set WebP compression level on overviews
- * fix wrong direction for half-pixel shift with GCPs and PixelIsPoint convention
- * for Geodetic TIFF grids (GTG), report the 'grid_name' metadata item in the subdataset description
- * fix reading/writing GEO_METADATA TIFF tag on big-endian
- * fix importing WGS_1984_Web_Mercator / ESRI:102113 (#2560)
- * use gcore global thread pool when doing multithreaded operations
- * allow multi-threaded JPEG compression. This can help a bit
- * fix potential crash when generating degenerate 1x1 overviews
- * in CreateCopy() mode, avoid closing and re-opening the file handle
- * add earlier check to bail out when attempting JPEG compression with paletted image
- * LERC codec: do not write TIFFTAG_LERC_PARAMETERS several times as it cause spurious directory rewrites, and breaks for example COG creation
- * LERC codec: fix encoding of datasets with NaN values (#3055)
- * SRS reader: interpret infinite value in GeogInvFlatteningGeoKey as 0 (fixes PROJ #2317)
- * support hidden SHIFT_ORIGIN_IN_MINUS_180_PLUS_180=YES open option used by GDALOpenVerticalShiftGrid()
- * Internal libtiff: updated to latest upstream master version
- * Internal libgeotiff: updated to latest upstream master version
-
-HDF4 driver:
- * do not report SDS when there are EOS_SWATH or EOS_GRID in it. Add LIST_SDS open option
- * multidim: fix issue when reading transposed array, and duplicate attribute names (#2848)
-
-HDF5 driver:
- * add support for new 'CSK 2nd generation' (CSG) (#2930)
- * multidim: fixes for big endian host
- * multidim: fix performance issue when reading from sliced array
-
-HFA driver:
- * do not report TOWGS84 when reading SRS with WGS84, NAD27 or NAD83 datums (unless OSR_STRIP_TOWGS84 config option is set to NO) (fixes QGIS #36837)
-
-ISCE driver:
- * avoid crashing division by zero on corrupted datasets. Fixes ossfuzz#24252
-
-ISIS3 driver:
- * make sure that in-line label size is at least 65536 bytes (#2741)
-
-JP2KAK driver:
- * add ORGtparts creation option
-
-JP2OpenJPEG driver:
- * add support for generating files with PLT marker segments (OpenJPEG > 2.3.1)
- * add support to enable multi-threaded encoded (OpenJPEG > 2.3.1)
- * writer: acquire input data in background thread
- * fix reading overviews on Sentinel2 PVI files (343x343 size, with 8x8 tiles) (#2984)
-
-LCP driver:
- * add extension checking in Identify() (#2641)
-
-MRF driver:
- * add support for interleaved LERC (#2846)
- * LERC V1 support for NaN and other bug fixes (#2891)
- * missing data return on initial caching of nodata tiles (#2913)
- * Fixes for Create() (#2923)
-
-NetCDF driver:
- * GrowDim(): fix issue with non-ASCII filename on Windows
- * fix setting offset and scale in CreateCopy()
- * allow a NETCDF:http://example.com/my.nc DAP dataset to be opened
- * multidim: fix performance issue when reading from sliced array
- * multidim: optimize reading into a data type 'larger' than the native one
- * multidim: identify the indexing variable of a dimension through the 'coordinates' attribute of other variables (#2805)
- * multidim: add CHECKSUM and FILTER creation options. Make SetRawNoDataValue() use nc_def_var_fill()
- * multidim: fix retrieval of missing_attribute, etc... when reading mask
-
-NITF driver:
- * add support for various TREs for Spectral NITF Implementation Profile (SNIP): MATESA, GRDPSB, BANDSB, ACCHZB, ACCVTB, MSTGTA, PIATGB, PIXQLA, PIXMTA, CSEXRB, ILLUMB, CSRLSB, CSWRPB
- * Add nested variable support in xml:TRE
-
-PAux driver:
- * avoid ingesting large binary unrelated files (found when investigating #2722)
-
-PCRaster driver:
- * fix Create() mode by propagating eAccess = GA_Update (#2948)
-
-PDF driver:
- * update to pdfium/4272 with https://github.com/rouault/pdfium_build_gdal_3_2
-
-PDS driver:
- * take into account FIRST_STANDARD_PARALLEL for Mercator projection (#2490)
-
-RMF driver:
- * Better support for sparse files. Fill null tiles with NoData value.
-
-RS2 driver:
- * remove support for CharLS compression since it is removed from upstream librasterlite2
-
-SAFE driver:
- * deal correctly with WV swaths (#2843)
-
-TileDB driver:
- * support for pixel interleave and single formats (#2703)
-
-TSX driver:
- * fix issue with reading dataset in .zip file on Windows (#2814)
-
-VICAR driver:
- * fix for Basic compression and non-Byte type on big endian host
- * avoid potential null-dereference on corrupted dataset. Fixes ossfuzz#24254
-
-VRT driver:
- * Add support for explicit virtual overviews. Can be built with gdaladdo --config VRT_VIRTUAL_OVERVIEW YES (#2955)
- * VRTDataset::IRasterIO(): allow source overviews to be used when non-nearest resampling is used, and the VRT bands don't expose overviews (#2911)
- * fix VRTRasterBand nodata handling when creating implicit overviews (#2920)
- * round src/dst coordinates to integer within 1e-3 margin
- * prevent potential infinite recursion in VRTDataset::IRasterIO()
-
-WMS driver:
- * Add a GDAL_MAX_CONNECTIONS config option
- * WMS cache: add a <CleanTimeout> in <Cache> XML configuration (#2966)
-
-WMTS driver:
- * Add support for DataType tag in service description XML (#2794)
-
-## OGR 3.2.0 - Overview of Changes
-
-Core:
- * Add unique constraints to OGRFieldDefn in core, GML, PG, PGDump, GPKG, SQLite and VRT drivers (#2622)
- * Add support for field AlternativeName to OGRFieldDefn, read alias in openfilegdb driver (#2729)
- * Add GDALDataset::AbortSQL (#2953)
- * OGRFeature::GetFieldAsString(): remove 80 character limitation when formatting string/integer/real lists (#2661)
- * Add OGRLayerUniquePtr and OGRExpatUniquePtr aliases (#2635)
- * OGRSQL: take into account second part of arithmetic expression to correctly infer
- result type.
- * OGRSQL: support constructs 'A AND B AND C ... AND N' with many successive AND ((#2989)
- * OGRSQL: Fixed buffer overflow in BuildParseInfo for SQL query when joining multiple tables that each have implicit FID columns.
- * ogr_geometry.h: export OGRWktOptions class (#2576)
- * ogr_swq.h: type nOperation as swq_op
-
-OGRSpatialReference:
- * Make GetAuthorityCode('PROJCS') work on a WKT1 COMPD_CS with a VERT_DATUM type = 2002 (Ellipsoid height)
- * Make OSRGetPROJSearchPaths() return the value set by OSRSetPROJSearchPaths()
- * exportToProj4(): make it add +geoidgrids= when possible (needs PROJ 7.2)
- * Add OSRDemoteTo2D() and expose it to SWIG
- * fix GetUTMZone() to work on 3D projected CRS
- * exportToWkt(): accept FORMAT=WKT2_2019 (alias of WKT2_2018)
- * fixes to avoid crashes with datum ensemble objects (needs PROJ 7.2)
- * Avoid warnings in GetProjTLSContextHolder() when PROJ resource path is not already set (PROJ #2242)
- * ogr_proj_p.cpp: make sure init() is called in OSRPJContextHolder() constructor to avoid potential use of default NULL PROJ context (#2691)
- * fix issue with PROJ context and OSRCleanup() (#2744)
- * Fix exportToWkt() after morphToESRI() on Geographic/Projected 3D CRS. But only works with PROJ 7.2
-
-Utilities:
- * ogrinfo: report field unique constraint
- * ogrinfo: report field alternative name
- * ogrinfo: report SUBDATASETS domain
- * ogrinfo/ogr2ogr: fix issues with -sql @filename where SQL comments are not at start of line (#2811)
- * ogr2ogr: bump default value of -gt to 100 000
-
-Multi driver changes:
- * Avoid copy&paste implementations of GetNextFeature() relying on GetNextRawFeature() through OGRGetNextFeatureThroughRaw class
- * make sure GetNextFeature() always return nullptr after the first time it did (ie no implicit ResetReading()) in GPKG, SQLite, PCIDSK, MSSQLSpatial and MySQL driver
- * better support for layers with field names differing by case in OGR SQL, SQL SQLite and VRT
-
-CSV driver:
- * do not try to read .csvt if CSV filename has no extension (#3006)
-
-DXF driver:
- * Propagate PaperSpace field from INSERTs to subfeatures
- * Fix wrong transformer composition for ASM entities
- * do not rely on tail recursion and avoid potential big stack calls when eliminated 999 comment lines. Fixes ossfuzz#22668
-
-Elasticsearch driver:
- * make OVERWRITE_INDEX=YES work properly by re-creating the index afterwards
-
-ESRIJSON driver:
- * fix GetFeatureCount() and GetExtent()
-
-FileGDB/OpenFileGDB drivers:
- * qualify DateTime values with UTC timezone when <IsTimeInUTC>true</IsTimeInUTC> is present in layer metadata (#2719)
-
-FileGDB driver:
- * generate layer definition XML with HasSpatialIndex=true to better reflect reality.
- * add support for reading and writing field alternative names
- * simplify spatial filtering, and apply full intersection in GetFeatureCount() instead of BBOX one, so as to be similar to OpenFileGDB
-
-FlatGeoBuf driver:
- * Metadata extensions (#2929)
- * fix illegal use of std::vector (#2773)
- * make GetExtent() work on feature write (#2874)
-
-GeoJSON driver:
- * fix opening of file starting with {"coordinates" (#2720)
- * fix opening of file starting with {"geometry":{"coordinates" (#2787)
- * RFC7946 writer: fix processing of geometry that covers the whole world (#2833)
- * writer: use JSON_C_TO_STRING_NOSLASHESCAPE when available to avoid escaping forward slash, and very partial resync of internal libjson-c to get it
-
-GML driver:
- * add a WRITE_GFS=AUTO/YES/NO open option (#2982)
- * writer: correctly format OFTDate and OFTDateTime fields (#2897)
- * hugefileresolver: add missing xmlns:xlink to make Xerces parser happy
- * fix typo in VFR GFS files BonitovaneDilRizeniId -> BonitovanyDilRizeniId (#2685)
- * when encountering XML issue, defer emission of error message until we return a NULL feature, so as to avoid to confuse ogr2ogr (#2730)
- * XSD parser: recognized unsignedLong data type
- * avoid 'Destination buffer too small' error to be emitted on /vsicurl_streaming/ URLs with filters coming from the WFS driver
- * fix layer extent with wrong axis order in some cases (#3091)
- * recognize AIXM ElevatedSurface to be able to proper axis swapping (#3091)
-
-GMLAS driver:
- * avoid running out of file descriptors in case of big number of layers
- * fix so as to get same unique ids on big-endian arch
-
-GPKG driver:
- * add a PRELUDE_STATEMENTS open option that can be used for example to attach other databases
- * add a DATETIME_FORMAT=WITH_TZ/UTC dataset creation option (defaults to WITH_TZ) to specify how to deal with non-UTC datetime values (#2898)
- * hide view "geometry_columns"
- * fix wrong RTree _update3 trigger on existing files (QGIS #36935)
-
-GRASS driver:
- * simplified to GRASS GIS 7+ only (#2945)
-
-GTM driver:
- * on write, do not consider TZFlag=1 (localtime) as a timezone value (refs #2696)
- * on write, take into correctly timezone value to convert to UTC (refs #2696)
-
-LIBKML driver:
- * do not advertise RandomWrite capability (unless on a update layer, when datasource is created with UPDATE_TARGETHREF creation option) (fixes QGIS 39087)
-
-MDB driver:
- * fix warning when parsing 'false' boolean value
-
-MITAB driver:
- * fix reading and writing of Transverse Mercator projections based on KKJ
- * .tab: fix writing empty/null Time fields (#2612)
- * fix reading and writing of non-metre linear units
- * Support for font and custom symbols in mitab (#3081)
-
-MVT driver:
- * fix 'random' failures in test_ogr_mvt_point_polygon_clip() by sorting sub-directory names, and also revise logic to attribute FID when reading directories (#2566)
- * writing: fix crashes in multi-threading mode (#2764)
-
-NAS driver:
- * add support for new GID7 updates
- * also filter for wfs:member (as in GID7)
- * do not try to write a .gfs file when NAS_GFS_TEMPLATE is specified
-
-netCDF driver:
- * simple geometries: fix for big-endian
-
-OAPIF driver:
- * avoid re-adding user query parameters if they are found in URLs returned by the API (#2873)
- * do not list raster or coverage collections
- * support opening of a collection when its URL is non-standard such as in MOAW workflows
- * fix memory leak when reading schema from .xsd
-
-ODBC driver:
- * Allow mdb files to be opened with the generic ODBC driver on non-windows platforms
- * Fix w.r.t fallback to alternative Access ODBC driver name
- * Fix DSN string construction for Windows Access ODBC driver, template candidate preference order (#2878)
- * Correctly handle datetime fields provided by the mdbtools ODBC driver
- * Read MS Access databases with ACCDB and STYLE extensions (#2880)
-
-OCI driver:
- * fix server 12.2 version detection
+* Add GDALArgumentParser class to extend p-ranav/argparse framework
+* Use GDALArgumentParser for: gdaladdo, gdalinfo, gdal_translate, gdalwarp,
+  gdal_grid, gdal_viewshed, gdalbuildvrt, nearblack, ogrinfo, ogr2ogr, sozip
+* Add support for ``--config <key>=<value>`` syntax
+* gdaladdo: reuse previous resampling method (from GTiff RESAMPLING metadata
+  item) if not specifying -r and overview levels if not specifying them
+* gdaladdo: make --partial-refresh-from-source-timestamp work on GTI datasets
+* gdal_contour: fix lowest min value in polygonize mode (#9710)
+* gdalbuildvrt: add a -nodata_max_mask_threshold option
+* gdal_create: copy GCPs present in the input file
+* gdal_edit: add -a_coord_epoch option
+* gdal_footprint: fix -split_polys and -convex_hull to not consume the argument
+  specified just after them
+* gdal_footprint: write source dataset path in a 'location' field (#8795)
+* gdal_grid: error out on in invalid layer name, SQL statement or failed where
+  condition (#9406)
+* gdallocationinfo: make it output extra content at end of input line, and
+  add -E echo mode, and -field_sep option (#9411)
+* gdalmdimtranslate: add -arrayoptions
+* gdalinfo: do not call GDALGetFileList() if -nofl is specified (#9243)
+* gdal_translate: add -dmo option, for domain-metadata items (#8935)
+* gdal_translate -expand rgb[a]: automatically select Byte output data type if
+  not specified and color table compatible of it (#9402)
+* gdaltransform: make it output extra content at end of input line, and add
+  -E echo mode, and -field_sep option (#9411)
+* gdalmanage: make --utility_version work
+* gdal_polygonize.py: handle error if creation of destination fails
+* gdal_viewshed: add support for south-up source datasets (#9432)
+* gdalwarp: progress bar tunings
+* gdalwarp: emit error message when transformation isn't inversible (#9149)
+* gdalwarp: fix performance issue when warping to COG (#9416)
+* gdalwarp: make target resolution independent from source extent when -te is
+  specified (#9573)
+* allow passing a WKT geometry as -cutline value, and add -cutline_srs (#7658)
+* sozip: support generic command line options
+* --formats option: append list of extensions (#8958)
+* Make gdaltindex a C callable function: GDALTileIndex()
+* gdaltindex: add -overwrite, -vrtti_filename, -tr, -te, -ot, -bandcount,
+  -nodata, -colorinterp, -mask, -mo, -recursive, -filename_filter,
+  -min_pixel_size, -max_pixel_size, -fetch_md, -lco options
+* gdal2tiles: added support for JPEG output
+* gdal2tiles: Fix case where --exclude still writes fully transparent tiles
+  (#9532)
+* gdal2tiles: add --excluded-values, --excluded-values-pct-threshold and
+  --nodata-values-pct-threshold options
+* gdal2tiles: support an input dataset name not being a file (#9808)
+* gdal2xyz: Change -srcwin parameter type to integer.
+* Python sample scripts: add gdalbuildvrtofvrt.py (#9451)
+* Python utilities: do not display full traceback on OpenDS failures (#9534)
+* gdalinfo: suggest trying ogrinfo if appropriate, and vice-versa
+* gdalinfo and ogrinfo -json: add newline character at end of JSON output
 
-ODS driver:
- * do not create files with Zip64 extension, to avoid compatibility issue with LibreOffice Calc
- * avoid potential deep call stack in formula evaluation. Fixes ossfuzz#22237
+### Raster drivers
 
-OpenFileGDB driver:
- * add support for reading .spx spatial index file
- * more reliable .gdbtable header reading
+Updates affecting multiple drivers:
+ * All drivers depending on external libraries that can be built as plugins
+   have been updated to implement RFC 96 deferred plugin loading
+ * Drivers that can now be built as plugins if using external libraries and
+   not vendored/internal libraries: GIF, JPEG, MRF, NITF, RAW drivers (as a
+   single plugin), PDS related drivers (as a single plugin)
+ * do not export GMLJP2 if the SRS isn't compatible (#9223): JP2KAK, JP2ECW,
+   JP2Lura, JP2OPENJPEG
 
-OSM driver:
- * remove limitation to 10000 nodes per way (#849)
- * Replace hard-coded tag filter with variable
- * Optionally disable early tag filtering
- * Don't filter out explicit attributes (#2603)
+AAIGRID driver:
+ * fix reading file whose first value is nan (#9666)
 
-PDF driver:
- * write correctly attribute object dictionary when there is no field to write, and read back correctly broken files we generated before (#2624)
+BAG driver:
+ * make sure to report a subdataset for the bathymetry coverage when we expose
+   one(s) for the georeferenced metadata
 
-PDS4 driver:
- * fix potential double free if RenameFileTo() fails
+GeoPackage driver:
+ * support maximum level up to 29 or 30; add a ZOOM_LEVEL creation option
 
-PGeo driver:
- * Quote DBQ value in PGEO driver template to avoid issues opening MDB paths with spaces
- * Fixes to automatic ODBC driver installation (#2838)
- * Read non-spatial tables (#2889)
+GTiff driver:
+ * Internal libtiff: resync with upstream
+ * Use (future) libtiff 4.6.1 TIFFOpenOptionsSetMaxSingleMemAlloc()
+ * add JXL_LOSSLESS_OVERVIEW, JXL_EFFORT_OVERVIEW, JXL_DISTANCE_OVERVIEW and
+   JXL_ALPHA_DISTANCE_OVERVIEW configuration options (#8973)
+ * overviews: generalize saving resampling method in a RESAMPLING metadata item
+ * friendlier error message when attempting to create JXL compressed file with
+   unsupported type/bits_per_sample
+ * deal with issues with multi-band PlanarConfig=Contig, LERC and NaN values
+   (#9530)
+ * make BuildOverviews() in update mode work when there is an external .msk file
+ * no longer condition CreateInternalMaskOverviews() behavior to
+   GDAL_TIFF_INTERNAL_MASK being unset or set to YES
+ * change default value of GDAL_TIFF_INTERNAL_MASK config option to YES
+ * multi-threaded decoding: fix potential mutex deadlock
+ * MultiThreadedRead(): make it take into account AdviseRead() limit to reduce
+   the number of I/O requests (#9682)
 
-PG driver:
- * Make ogr2ogr -f PostgreSQL work when using PG:service= syntax (actually a workaround in GDALDriver::Create())
- * take into potential generated columns (PostgreSQL >= 12) to avoid issuing INSERT, UPDATE or COPY statements with them
- * PG (and PostgisRaster driver): set the application name in PostgreSQL connections (#2658)
- * apply standard libpq parsing rules for connection parameters for our custom connection parameters (schemas, active_schemas, tables) (#2824)
+HDF5 driver:
+ * multidim: fix crash on reading compound data type with fixed-length strings
+ * multidim: implement GDALMDArray::GetBlockSize() and GetStructuralInfo()
+ * improve performance of band IRasterIO() on hyperspectral products
+ * support HDF5EOS metadata where the GROUP=GridStructure has an empty sub
+   GROUP=Dimension (like for AMSR-E/AMSR2 Unified L3 Daily 12.5 km)
+ * implement GetOffset() and GetScale() for netCDF metadata items add_offset
+   and scale_factor
 
-PGDump driver:
- * change default value of POSTGIS_VERSION layer creation option to 2.2
+JP2KAK driver:
+ * make result of RasterIO() consistent depending if it is called directly or
+   through VRT, with non-nearest upsampling (#8911)
+ * refactor how overviews work
 
-SEGY driver:
- * avoid opening FITS files
+JP2OpenJPEG driver:
+ * CreateCopy(): limit number of resolutions taking into account minimum block
+   width/height
 
-Shapefile driver:
- * do not claim to support DateTime data type
- *  when several candidate SRS are found with confidence >= 90%, take the one from EPSG (contributes to fixes QGIS #32255)
- * SHPRestoreSHX: fix for (64 bit) big endian
+JPEG driver:
+ * ReadXMPMetadata(): only stop looking for XMP marker at Start Of Scan
+ * ReadFLIRMetadata(): stop on Start-Of-Scan marker (speeds up opening large
+   remote JPEG files)
+ * CreateCopy(): emit warning/error message before progress bar (#9441)
 
-S57 driver:
- * apply update to DSID_EDTN field (#2498)
- * report attributes tagged as list in S57 dictionaries as StringList fields. Add a LIST_AS_STRINGLIST open option that can be set to OFF to restore GDAL < 3.2 behavior (#2660)
+MRF driver:
+ * BuildOverviews: bail out when no overviews are needed
+ * emit warning when attempting to clean internal overviews (#9145)
+ * Use ZSTD streaming API for compression: faster and better compression (#9230)
 
-SXF driver:
- * fixes for big-endian
+netCDF driver:
+ * use the SRS (its geographic part) if found in the file, instead of the
+   hardcoded WGS84 string, for the GEOLOCATION.SRS metadata item (#9526)
+ * Add BAND_NAMES creation option
+ * fix writing of metadata items whose value has an equal sign ["9702)
 
-SQLite/Spatialite driver:
- * add a PRELUDE_STATEMENTS open option that can be used for example to attach other databases
+NITF driver:
+ * in xml:DES metadata domain field, expand content of XML_DATA_CONTENT DES as
+   XML in a <xml_content> sub-node of >field name=DESDATA> instead as a Base64
+   value
+ * fix undefined behavior when using NITFGetField() several times in the same
+   statement
 
-WFS driver:
- * avoid /vsicurl_streaming/ URL to be truncated in case of big filter (but the server might reject it)
+OGCAPI driver:
+ * OGCAPI Maps: support image formats beyond PNG/JPG as well as enables content
+   negotiation. (#9231, #9420)
 
-XLSX driver:
- * do not create files with Zip64 extension, to avoid compatibility issue with LibreOffice Calc
- * fix numeric precision issue when reading datetime that could lead to an error of 1 second (#2683)
+PDF driver:
+ * correctly initialize PAM when opening a subdataset (specific page e.g.)
+ * PDFium backend: update to support (and require) PDFium/6309
+ * deal with the situation where a multipage PDF has layers with same name but
+   specific to some page(s)
+ * Fix build with Poppler 24.05
 
-## SWIG Language Bindings
+S102 driver:
+ * add support for spatial metadata of the QualityOfSurvey group
+ * read nodata value from dataset metadata
 
-All bindings:
- * OGRDriver.CopyDataSource(): check that source dataset is not NULL
- * validate range of resample_alg algorithm (#2591)
- *  expose CPLSetCurrentErrorHandlerCatchDebug() as gdal.SetCurrentErrorHandlerCatchDebug()
+Sentinel2 driver:
+ * include 10m AOT and WVP bands in 10m subdataset (#9066)
 
-CSharp bindings:
- * Add build support for .NET core (#1368)
- * SWIG 4.0 compatibility (#2802)
- * Adding typemaps C# for wrapper_GDALWarpDestDS and wrapper_GDALWarpDestName (#2621)
- * Expose Dataset.GetSpatialRef() (#2620)
- * Expose OSR.GetCRSInfoListFromDatabase (#1665)
- * Fixed implementation of Utf8BytesToString (#2649)
+TileDB driver:
+ * Remove use of deprecated API, and bump minimum version to 2.15
+ * Added tiledb metadata fields to easily tag array type
+ * be able to read datasets converted with 'tiledb-cf netcdf-convert'
+ * make its identify() method more restrictive by not identifying /vsi file
+   systems it doesn't handle
+ * multidim: prevent infinite recursion when opening an array in a group where
+   there are 2 or more 2D+ arrays
+ * multidim: OpenMDArray(): fix opening an array, member of a group, which has
+   no explicit name
 
-Java bindings:
- * update minimum source/target Java version to 7 to please JDK 11 (#2594)
- * make 'install' target copy maven artifacts (gdal-X.Y.Z.jar) to /usr/share/java
+VRT driver:
+ * add a VRTProcessedDataset new mode to apply chained processing steps that
+   apply to several bands at the same time. Currently available algorithms:
+   LocalScaleOffset (for dehazing), BandAffineCombination, Trimming, LUT
+ * vrt:// connection: add a_nodata, sd_name, sd options
+ * add a NoDataFromMaskSource source: replaces the value of the source with
+   the value of the NODATA child element when the value of the mask band of
+   the source is less or equal to the MaskValueThreshold child element.
+ * VRT serialization: emit a warning if RAM usage of XML serialization reaches
+   80% of RAM (#9212)
+ * VRTWarpedDataset: add an optimized IRasterIO() implementation
 
-Perl bindings:
+WMS driver:
+ * change logic to set gdalwmscache directory to honor in particular
+   XDG_CACHE_HOME (#8987)
+ * Use GDAL_HTTP_TIMEOUT
 
-Python bindings:
- * Move implementation of scripts in osgeo.utils package to be reusable
- * Fix Python2 install to be synchronous and report all errors (#2515)
- * add a colorSelection='nearest_color_entry'/'exact_color_entry' argument to gdal.DEMProcessing()
- * accept string as value for gdal.Translate() metadataOptions and creationOptions argument when providing single option (#2709)
- * gdal.Info(): make options=['-json'] work properly
- * remove use of deprecated PyObject_AsReadBuffer() function
- * makefile.vc: remove '-modern -new_repr' on python target for SWIG 4 compatibility
- * add GDALMDArray.shape attribute and GDALMDArray.ReadAsMaskedArray() method
- * make Dataset.ReadRaster() and Dataset.ReadAsArray() accept floating-point coordinates (#3101)
+Zarr driver:
+ * Add capability to read CRS from CF1 conventions
 
-# GDAL/OGR 3.1.0 Release Notes
+ZMap driver:
+ * support reading variant of format where there is no newline character at
+   end of column
 
-## In a nutshell...
+## OGR 3.9.0 - Overview of Changes
 
- * Implement RFC 75: support for multidimensional arrays in MEM, VRT, netCDF, HDF4, HDF5 and GRIB drivers. Read/write for MEM and netCDF. Read/only for others. Add gdalmdiminfo and gdalmdimtranslate utilities.
- * Implement RFC76: add capability of writing vector drivers in Python
- * New GDAL drivers:
-   - COG: write-only, for Cloud Optimized GeoTIFF
-   - EXR: read/write driver, relying on OpenEXR library
-   - ISG: read-only, for geoid models of the International Service for the Geoid
-   - RDB: read-only, for RIEGL Database .mpx RDB 2 files (#1538) (needs proprietary SDK)
- * New OGR drivers:
-   - FlatGeoBuf: read-support and creation (#1742)
-   - MapML: read/write driver for experimental web spec
- * Improved drivers:
-  - OAPIF driver (renamed from WFS3): updated to OGC API - Features 1.0 core spec
-  - GTiff: improve performance of internal overview creation
-  - GTiff: GeoTIFF 1.1 support
-  - Shapefile driver: add read/creation/update support for .shz and .shp.zip
-  - netCDF vector: read/write support for CF-1.8 Encoded Geometries (#1287)
-  - VICAR: multiple improvements and write support (#1855)
-  - DDS: add read support
- * Other improvements:
-   - gdalwarp: accept output drivers with only CreateCopy() capabilities
-   - gdal_viewshed: new utility for viewshed algorithm
- * Remove GFT driver now that the online service no longer exists (#2050)
- * New Sphinx-based documentation
- * Multiple security related fixes (ossfuzz)
- * Continued code linting (cppcheck, CoverityScan, etc.)
- * Compatibility with GDAL 3.0:
-    - C and C++ API: backward compatible changes
-    - C ABI: backward compatible changes
-    - C++ ABI: modified
-    - Functional changes: see MIGRATION_GUIDE.TXT
+### Core
 
-## GDAL/OGR 3.1.0 - General Changes
+* OGRSQL: Support SELECT * EXCLUDE(...)
+* OGRSQL: add UTF-8 support for LIKE/ILIKE (for layers declaring
+  OLCStringsAsUTF8) (#8835)
+* Add OGRLayer::GetExtent3D() (#8806)
+* OGRLayer: Have CreateField/CreateGeomField take const OGRFieldDefn
+  /OGRGeomFieldDefn* argument (#8741)
+* OGRFeatureDefn, OGRFieldDefn, OGRGeomFieldDefn: add Seal() and Unseal()
+  methods
+* Fix swq_select::Unparse()
+* ExecuteSQL(): add a warning if the dialect name isn't recognized (#8843)
+* ExecuteSQL() with OGRSQL and SQLITE dialects: get OLCStringsAsUTF8 from
+  underlying layer (#9648)
+* ExecuteSQL() OGRSQL and SQLITE dialects: error out if SetSpatialFilter() fails
+  (#9623)
+* OGRGeometryFactory::forceTo(): make it honour dimensionality of eTargetType
+  (in particular fix POLYGON -> LINESTRING or POLYGON -> LINESTRINGZ) (#9080)
+* OGRGeometryCollection::importFromWkb(): fix reading corrupted wkb with mixed
+  2D and 3D geoms (#9236)
+* RFC99: Add C++ OGRGeomCoordinatePrecision class and corresponding C / SWIG API
+* Change prototype of GDALDataset::ICreateLayer() to take a
+  ``const OGRGeomCoordinatePrecision*``
+* Add OGRGeometry::SetPrecision() / OGR_G_SetPrecision(), as wrapper of
+  GEOSGeom_setPrecision_r()
+* Add a OGRGeometry::roundCoordinates() method
+* OGRFeature: add SerializeToBinary() / DeserializeFromBinary()
+* OGRFeature::SetField(): add warnings when detecting some lossy conversions (#9792)
+* Add OGR_G_GeodesicArea() / OGRSurface::get_GeodesicArea()
+* SQLite SQL dialect: implement ST_Area(geom, use_ellipsoid)
+* Add OGR_L_GetDataset() and implement GetDataset() in all drivers with creation
+  support
+* Arrow array: fix decoding of ``date32[days]`` values before Epoch
+ (Arrow->OGRFeature), and fix rounding when encoding such values
+ (OGRFeature->Arrow) (#9636)
+* OGRLayer::WriteArrowBatch(): add tolerance for field type mismatches if int32/int64/real;
+  Also add an option IF_FIELD_NOT_PRESERVED=ERROR to error out when lossy conversion occurs. (#9792)
+* OGRLayer::SetIgnoredFields(): make it take a CSLConstList argument instead of
+  const char*
+
+### OGRSpatialReference
 
-Build(Unix):
- * use pkg-config for libxml2 detection (#2173)
- * fix detection of libpq in a non-standard place (#1542)
- * do not use absolute path in linking command. Helps Mac OS and cygwin builds (#2075)
- * Enable Bash completions and control installation
- * GDALmake.opt.in: silence datarootdir warning
- * Doc: allow user full control over installation directory
- * fix JVM detection for HDFS support on MacOS (#2313)
- * Remove #define HOST_FILLORDER from cpl_config.h (#2345)
- * Added search for proj library in lib64 directory.
- * configure: strip -L/usr/lib and similar from netCDF, MySQL, GEOS and SFCGAL lib path (#2395)
- * configure: remove useless -lproj from --with-spatialite detection
+* Add OGRSpatialReference::exportToCF1() and importFromCF1()
+* Add OSRIsDerivedProjected() / OGRSpatialReference::IsDerivedProjected()
+* OGRCoordinateTransformation::Transform(): change nCount parameter to size_t
+  (C++ API only for now) (#9074)
+* OGRProjCT::TransformWithErrorCodes(): Improve performance of axis swapping
+  (#9073)
+* OSR_CT: fix ``SetDataAxisToSRSAxisMapping([-2, 1])``` on target SRS
+* exportToXML(): error out on unsupported projection method (#9223)
+* Add OSRSetFromUserInputEx() and map it to SWIG (#9358)
+* Add std::string OGRSpatialReference::exportToWkt(
+  const char* const* papszOptions = nullptr) const
+* OGR_CT: use PROJJSON internally rather than in WKT:2019 (#9732)
 
-Build(Windows):
- * parametrize number of CPUs for parallel builds with CPU_COUNT variable (#1922)
- * add HDF5_H5_IS_DLL variable to switch the scenario when HDF5 is built as a DLL (#1931)
- * add POSTFIX that defaults to _d for GDAL .dll, .lib and .pdb for DEBUG builds (#1901)
- *  Fix issues with thread_local and C++ objects that don't work well with DLL on Windows
+### Utilities
 
-All:
- * Support Poppler 0.82, 0.83, 0.85
+* ogrinfo: add a -extent3D switch
+* ogrinfo: output coordinate resolution in -json mode
+* ogrinfo: add -limit option (#3413)
+* ogr2ogr: do not copy private layers (would for example break SQLite ->
+  SQLite/GPKG)
+* ogr2ogr: force -preserve_fid when doing GPX to GPKG (#9225)
+* ogr2ogr: propagate input coordinate precision
+* ogr2ogr: add options -xyRes, -zRes, -mRes and -unsetCoordPrecision
+* ogr2ogr: make -select tokenize only on comma (and not on space), and honour
+  double-quoting (#9613)
+* Remove ogr2ogr.py sample utilities (gdal.VectorTranslate() is a more powerful
+  replacement)
 
-## GDAL 3.1.0 - Overview of Changes
+### Vector drivers
 
-## Algorithms
+Updates affecting multiple drivers:
+ * Drivers updated for RFC 97 feature definition sealing: GPKG, Shape,
+   OpenFileGDB, MITAB, MEM, GeoJSON, JSONFG, TopoJSON, ESRIJSON, ODS, XLSX, PG
+ * Drivers updated for RFC99 geometry coordinate precision: GML, GeoJSON,
+   GeoJSONSeq, JSONFG, GPKG, CSV, OpenFileGDB, FileGDB, OGR VRT
+ * All drivers depending on external libraries that can be built as plugins
+   have been updated to implement RFC 96 deferred plugin loading
+ * GetExtent3D() implemented in Shapefile, Arrow, Parquet, PostgreSQL, GeoJSON,
+   GeoPackage drivers
 
-* Warper: add sum resampling method (#1437)
-* Average resampling (warp and overview/translate): use weighted average for border source pixels
-* GDALReprojectImage(): properly take into account source/target alpha bands
-* GDALCreateReprojectionTransformerEx(): do not emit error if reverse transformation fails, and fix crash when trying to use null reverse transformation
-* Warper: fix GDAL 2.3 regression in a situation with source nodata value, multiple bands and nearest resampling where the logic to detect which source pixels are nodata was inverted (#1656)
-* GWKAverageOrModeThread(): reject invalid source pixels for average/q1/q3/mode/min/max resampling (#2365)
-* Multithreaded warper: make sure a transformer object is used by the thread which created it (#1989). This workarounds a PROJ bug also fixed per https://github.com/OSGeo/PROJ/pull/1726
-* Contour: fix SegmentMerger list iterator skipping and out of bounds error (#1670)
-* Contour: fix (over) precision issue when comparing pixel value to NoData on Float32 rasters (#1987)
-* Contour: add sanity checks for interval based contouring, in case the dataset contains extreme values regarding the settings, which would lead to a lot of memory allocations / too large computation time
-* TPS warper: enhance precision without armadillo support (#1809)
-* RPC warper: fix issue when source image has a geotransform (#2460)
-* GDALRasterizeGeometries(): fix potential integer overflow / memory allocation failure, depending on GDAL_CACHEMAX and raster dimensions (#2261)
-* Rasterize: speed optimization for geometry collections (#2369)
-* GDALContourGenerate(): propagate raster acquisition error (#2410)
+OGR SQLite/SQLite/GPKG: add UTF-8 support for case-insensitive LIKE (#8835)
 
-## Port
+Arrow/Parquet drivers:
+ * GetArrowSchema(): potential fix when there are ignored fields and the FID
+   column is not the first one
+ * Read/write support for GeoArrow (struct-based) encoding
+ * silently ignore column of type null in GetArrowSchema/GetArrowArray
+ * fix crash when reading geometries from a geometry column with a
+   pyarrow-registered extension type
+ * handle fields with a pyarrow-registered extension type
+ * preliminary/in-advance read support for future JSON Canonical Extension
+ * OGRCloneArrowArray(): add missing support for 'tss:' Arrow type
 
-* /vsitar/: support >100 character file names (#1559)
-* /vsitar/: accept space as end of field terminator
-* /vsigz/: fix seeking within .gz/.tgz files larger than 2 GB (#2315)
-* /vsicurl (and derived filesystems): fix concurrency issue with multithreaded reads (#1244)
-* /vsicurl/: avoid downloading one extra block when the end offset is just at a chunk boundary
-* /vsicurl/: fix CPL_VSIL_CURL_ALLOWED_EXTENSIONS with query string (#1614)
-* /vsicurl/: allow 'Connection timed out' CURL errors as candidate for HTTP retry
-* /vsicurl/: GetFileSize(): when HEAD request does not return Content-Length header, retry with GET
-* /vsis3/: for a long living file handle, refresh credentials coming from EC2/AIM (#1593)
-* /vsis3/: invalidate cached non-existing file is AWS_ config options are changed in the meantime (#2294)
-* /vsis3/ /vsigs/ /vsiaz/: implement Rename() first doing a copy of the original file and then deleting it
-* /vsis3/ and similar: add a NUM_THREADS option to Sync() for parallelized copy
-* AWS: Fix error in loading ~/.aws/config file (#2203)
-* VSISync(): when copying from /vsis3/ to /vsis3/ (or /vsigs/->/vsigs/, /vsiaz/->/vsiaz/), use CopyObject() method to use server side copy
-* VSISync(): make file copying from /vsis3/ actually use /vsis3_streaming/ to reduce number of GET requests
-* VSISync(): add a CHUNK_SIZE option to Sync() to split large objects and get parallelization of their download and upload
-* Add VSIUnlinkBatch() for batch deletion of files, and add optimized /vsis3/ implementation
-* Add efficient VSIRmdirRecursive() implementation for /vsis3/
-* Add VSIGetFileMetadata()/VSISetFileMetadata() and implement them to get/set HTTP headers, and AWS S3 object tagging
-* /vsis3/ and other network filesystems: avoid useless network requests when we already got a directory listing (#2429)
-* /vsiswift/: V3 authentication method, handling auth token expiration
-* /vsimem/: make Rename() error if destination file is not in /vsimem/
-* /vsizip/ writing: in ZIP64 mode, also advertise 45 as the version in the central directory (avoids a warning from 'zip' utility)
-* Add CPLCanRecode function and use it in MITAB, Shape and SXF drivers to decide when to advertise UTF-8 capability
-* CPLConfigOptionSetter: only reset thread-locale value, not global one
-* CPLJSONObject::GetType(): return Long when the value doesn't fit on a int32
-* CPLJSON: distinguish Null type from Unknown/invalid type
-* CPLEscapeString(): escape double-quote for CPLES_URL
-* Add a CPLCondTimedWait()
-* cpl_safemaths.hpp: safe + and * for GUInt64
-* Add CPLJSonStreamingWriter class
-* Add cpl_error_internal.h with logic with error accumulator
-* Add VSIOverwriteFile()
-* Add CPLLaunderForFilename()
-* cpl_error.h: add a CPLDebugOnly() macro that expands to CPLDebug() only for DEBUG builds
-* QuietDelete: support expliciting the drivers to use
+CSV driver:
+ * parse header with line breaks (#9172)
 
-## Core
+DGN (v7) driver:
+ * emit explicit error when attempting to open a DGNv8 file and the DGNv8
+   driver is not available (#9004)
 
-* Block cache: fix corruption on multithreaded write on datasets (#2011)
-* GDALInvGeoTransform(): make it work with scale and rotation/skew coefficients of small absolute value (#1615)
-* GDALCopyWholeRasterGetSwathSize(): fix potential int overflows for big values of GDAL_SWATH_SIZE or GDAL_CACHEMAX
-* PAMRasterBand: add presence flag for Offset and SetScale so that GetOffset()/GetScale() properly reports if they are defined in PAM
-* GDALDefaultOverviews::BuildOverviews(): fix typo in detection of 1x1 overview (#1730)
-* Fix precision loss at GDALResampleChunkC32R with complex data
-* Fix precision loss at GDALComputeBandStats with complex data
-* Proxy pool: Load band block sizes if not provided at creation. Fixes floating point exception on copy overviews from PRF dataset to destination dataset.
-* GTiff and PAM: allow serializing WKT2 for SRS using non-WKT1 compatible projections such as Vertical Perspective (#1856)
-* RasterIO(): fix non-neareset resampling over nodata blocks (#1941)
-* Overview dataset (-oo OVERVIEW_LEVEL): expose mask if the source dataset has a mask with overviews
-* GDALUnrolledCopy<GByte,2,1>: fix SSE2-only implementation (when SSSE3 is not available, on older AMD CPUs)
-* PAM: support reading GCPs from ESRI GeodataXform in .aux.xml files
-* Make it possible to call BuildOverviews() on a dataset returned by GDALBuildVRT()
-* GDALDataset::SetProjection(): re-allow the use of PROJ4 strings (#2034)
+FileGDB/OpenFileGDB drivers:
+ * fix co-operation between the 2 drivers to make sure .cdf is opened with
+   FileGDB
 
-## Utilities
+FileGDB driver:
+ * remove warning 'Empty Spatial Reference'
 
-* GDALInfo(): fix axis order issue in long,lat corner coordinates, in particular when reading from a .aux.xml with a ProjectedCRS (#2195)
-* gdal_translate: Make 'gdal_translate foo.tif foo.tif.ovr -outsize 50% 50% -of GTiff' work
-* gdal_translate: clamp/round source nodata value when not compatible of the target data type. Was already done when using -a_nodata, but not with implicit copy (#2105)
-* gdalwarp: accept output drivers with only CreateCopy() capabilities
-* gdalwarp: adjust nodata values, passed with -srcnodata/-dstnodata, and close to FLT_MAX to exactly it (#1724)
-* gdalwarp: fix wrong axis order when using source/target CRS being a geographic3D CRS such as EPSG:4979, and with vertical shift grid application (#1561, GDAL 3.0 regression)
-* gdal_contour: remove explicit width/precision=12/3 of the elev field (#1487)
-* gdal_contour: turn on quiet mode if output dataset is standard output (refs #2057)
-* gdaldem: avoid potential integer overflow in color-relief mode (#2354)
-* gdal_calc.py: fixed NaN-streaking in output images when the --allBands option is given to tiled images
-* gdal_polygonize.py: fix outputting to geojson without explicit -f switch (#1533)
-* gdalcompare.py: take into account mask bands
-* gdal_retile.py: add resume option (#1703)
-* gdallocationinfo: emit verbose error when dataset cannot be opened (#1684)
-* gdallocationinfo and gdaltransform: print a hint when values are expected from the command line and stdin is an interactive terminal (refs #1684)
-* Python utilities: fix GetOutputDriverFor() when multiple drivers found (#1719)
-* gdal2tiles.py: add remaining resample methods
-* gdal2tiles.py: add option for setting the tile size (#2097)
-* gdal2tiles.py: add --xyz option to generate tiles in the OSM Slippy Map standard (#2098)
-* gdal2tiles.py: show warning when running against non-Byte input (#1956)
-* gdal2tiles.py: update cache calculation (#2020)
-* gdal2tiles.py: check that min zoom <= max zoom (#2161)
-* gdal2tiles.py: ignore nodata values that are not in the range of the band data type
-* gdal2tiles.py: fix hang when --s_srs specified but image lacks georeferencing
-* gdal_translate / gdalwarp / ogrct: allow dealing with non-WKT1 representable SRS (#1856)
-* gdal_edit.py: add a -units switch
-* gdal_edit.py: add -a_ulurll switch
-* gdal_fillnodata.py/GDALFillNodata: fix crash when smooth_iterations is used, and with some progress functions such as the one used by Python (#1184)
-* Python scripts and samples: use python3 for shebang (#2168)
+FlatGeobuf driver:
+ * add support for reading and writing layer title, description and metadata
+ * CreateFeature(): error out if a string context is not valid UTF-8 (#7458)
 
-## Sample scripts
+GeoJSON driver:
+ * OGRGeoJSONDriverIdentify: return -1 when unsure
+ * writer: add FOREIGN_MEMBERS_FEATURE and FOREIGN_MEMBERS_COLLECTION layer
+   creation options
+ * reader: accept a {"type": "Polygon","coordinates": []} as a representation
+   of POLYGON EMPTY
 
-* Add tile_extent_from_raster.py: sample script to generate the extent of each raster tile in a overview as a vector layer
-* Add gdal_remove_towgs84.py script
+GeoPackage driver:
+ * fixes to make most operations compatible with PRAGMA foreign_keys=1 (#9135)
+ * writer: set Z/M columns of gpkg_geometry_columns when there are Z/M
+   geometries in a 2D declared layer
+ * Read relationships defined using foreign key constraints
+ * CreateFeature(): allow creating a feature with FID=0 (#9225)
+ * Add DISCARD_COORD_LSB layer creation option
+ * map Null CRS to a new srs_id=99999, and add a SRID layer creation option
+ * add a LAUNDER=YES/NO layer creation option (default: NO)
+ * fix random error in threaded RTree creation, particularly on Mac M1 ARM64
 
-## GDAL drivers
+GeoRaster driver:
+ * Added GENSTATS options, security fixes, and prevent failing when password is
+   near expiration (#9290)
 
-Multiple drivers:
- * GTiff, GPKG, MBTiles, PostgisRaster drivers: share lock of overview dataset with parent dataset (#1488)
- * HDF5 and netCDF: fix crash when reading attributes of type string of variable length with NULL values
- * CTable2/LOSLAS/NTv1/NTv2: document in metadata that positive longitude shift values are towards west
- * Revise raster drivers GDAL_DMD_HELPTOPIC
- * JP2KAK and JP2OPENJPEG: fix to read images whose origin is not (0,0)
- * Strip TOWGS84 when datum is known, in GTiff, Spatialite and GPKG drivers
+GML driver:
+ * writer: honour geometry field name and isnullable passed to ICreateLayer()
 
-BAG driver:
- * modify way georeferencing is read (particularly pixel sizes and origin) (#1728)
- * Backward compatibility for metadata reading for BAG < 1.5 (#2428)
+GMLAS driver:
+ * faster retrieval of GML and ISO schemas by using zip archives
+ * use CPLHTTPFetch() instead of /vsicurl_streaming/ to allow alternate HTTP
+   downloader (for QGIS 3.36 enhanced WFS provider)
 
-BSB driver:
- * Report PLY coordinates as a WKT POLYGON in a BSB_CUTLINE metadata item
+LIBKML driver:
+ * improve generation of internal ids for layer names starting with digits
+  (#9538)
 
-BYN driver:
- * fix nodata value for Int32 encoded products
+netCDF driver:
+ * writer: make it more robust to empty geometries
 
-DAAS driver:
- * accept 4-band RGBA PNG response even when a single band is requested
+OpenFileGDB driver:
+ * add support for Integer64, Date, Time and DateTimeWithOffset data types
+   added in ArcGIS Pro 3.2 (#8862)
+ * writer: set xml shape type to "esriGeometryPolyline" for LineString/
+   MultiLineString (#9033)
 
-DIMAP driver:
- * don't look inside Dataset_Components if Raster_Data is present
- * avoid reparsing xml if already a product dimap
- * ignore missing strip xml file
+OSM driver:
+ * properly escape special characters with TAGS_FORMAT=JSON open option (#9673)
 
-DDS driver:
- * add read support
+Parquet driver:
+ * support reading and writing layer metadata
+ * Read/write support for covering.bbox struct columns for spatial
+   filtering, add SORT_BY_BBOX=YES/NO layer creation option (GeoParquet 1.1)
+ * Read/write support for GeoArrow (struct-based) encoding (GeoParquet 1.1)
+ * add more configuration options for Parquet dataset case, and default to using
+   custom I/O layer (#9497)
+ * ogr2ogr/Parquet: add hack to avoid super lengthy processing when using -limit
+   with a Parquet dataset source (#9497)
+ * make it recognize bbox field from Overture Maps 2024-01-17-alpha.0 and
+   2024-04-16-beta.0 releases
+ * fix ResetReading() implementation, when using the ParquetDataset API and
+   when there's a single batch
+ * fix opening single file Parquet datasets with the ParquetDataset API when
+   using PARQUET:filename.parquet
 
-DTED driver:
- * Add DTED_APPLY_PIXEL_IS_POINT environment switch  (#2384)
- * emit a CE_Failure instead of a CE_Warning in case of checksum verification failure (#2410)
- * support E96 as well as MSL for COMPD_CS (#2422)
+PGDUMP driver:
+ * add a LAUNDER_ASCII=YES/NO (default NO) layer creation option
 
-EEDA driver:
- * fix startTime / endTime comparisons that were incomplete in #1506
+PMTiles driver:
+ * handle decompressing data with a compression ratio > 16 (#9646)
 
-FITS driver:
- * fix memory leaks
+PostgreSQL driver:
+ * serialize GDAL multidomain metadata of layer as XML in a
+   ogr_system_tables.metadata table
+ * be robust to inexact case for schema when creating a layer
+   'schema_name.layer_name' (#9125)
+ * remove support for PostgreSQL < 9 and PostGIS < 2 (#8937)
+ * add a LAUNDER_ASCII=YES/NO (default NO) layer creation option
 
-ENVI driver:
- * add read support for reading GCPs (#1528), and fix off-by-one offset on line,pixel on reading GCP
- * fix potential use of invalid pointer on some unusual std::string implementations (#1527)
- * preserve 'byte order' on update (#1796)
+Shapefile driver:
+ * Shapelib: resync with upstream
+ * GetNextArrowArray(): add specialized implementation restricted to situations
+   where only retrieving of FID values is asked
+ * make it recognize /vsizip/foo.shp.zip directories
+ * add read/write support for DBF Logical field type mapped to OGR OFSTBoolean
 
-GPKG driver:
- * support opening subdataset of /vsicurl/ files (#2153)
+VFK driver:
+ * Fix solving circle parcel geometry (#8993)
 
-GTiff driver:
- * improve performance of internal overview creation (#1442)
- * in COPY_SRC_OVERVIEWS=YES, interleave mask with imagery, and add leader/trailer to strile
- * optimize read of cloud-optimized geotiffs
- * do not generate a TIFFTAG_GDAL_METADATA with color interpretation information for JPEG YCbCr compression
- * make -co NUM_THREADS produce reproducible output
- * make overview blocksize defaults to same as full-resolution
- * move deferred tile/strip offset/bytecount loading to libtiff
- * make WEBP_LEVEL to be honored in Create() mode (fixes #1594)
- * PushMetadataToPam(): early exit when PAM is disabled, to avoid error messages
- * remove support for libtiff 3.X
- * set a LAYOUT=COG metadata item in the IMAGE_STRUCTURE metadata domain of the dataset when the hidden feature declarations typical of a COG file are found
- * fix memory leak with -co APPEND_SUBDATASET=YES
- * fix error message for NBITS != 16 and Float32
- * add explicit error message when trying to create a too big tiled TIFF file (refs #1786)
- * ensure GDAL PROJ context is used for all libgeotiff functions (requires internal libgeotiff / libgeotiff 1.6)
- * make sure that GetMetadataDomainList() doesn't return EXIF when there's no EXIF metadata
- * GTIFGetOGISDefn: avoid querying UOM length info when it is KvUserDefined to avoid an error to be emitted
- * on CRS reading, avoid unsetting of EPSG code when ProjLinearUnitsGeoKey = Linear_Foot_US_Survey and the CRS also uses that unit (#2290)
- * do not write in GeoTIFF keys non-standard projections
- * do not write TOWGS84 that come from EPSG codes, unless GTIFF_WRITE_TOWGS84=YES is explicitly set
- * GTiff writing: workaround PROJ 6.3.0 bug when writing a EPSG:4937 ETRS89 Geog3D CRS
- * GTiff writing: do not write by default EPSG:3857/WebMercator as a ESRI PE string. Fixes 3.0 regression
- * avoid crash on single-component file with Whitepoint and PrimaryChromaticities tags
- * libtiff: BigTIFF creation: write TileByteCounts/StripByteCounts tag with SHORT or LONG when possible
- * Internal libgeotiff: set UOMLength from GeogLinearUnits (for geocentric CRS) (#1596)
- * Internal libgeotiff: upgrade to libgeotiff 1.6.0dev to support OGC GeoTIFF 1.1
- * Internal libtiff: resync with internal libtiff (post 4.1.0)
+## SWIG Language Bindings
 
-GRIB driver:
- * do not do erroneous K->C unit conversion for derived forecasts whose content is not a temperature, but a derived quantity, such as spread
- * avoid erroneous K->C conversion for Dew point depression
- * update GRIB tables to degrib 2.24
- * add missing entries in MeteoAtmoChem table
- * add more values from Table 4.5 in Surface type table
- * add support for template 4.48 Optical Properties of Aerosol
- * add support for rotated lat-lon grids
- * avoid quadratic performance on GRIB2 datasets using subgrids within a single GRIB message (#2288)
+All bindings:
+ * add osr.SpatialReference.ImportFromCF1(), ExportToCF1(), ExportToCF1Units()
+ * expose Geometry.UnaryUnion()
+ * expose OLCFastWriteArrowBatch
+ * add gdal.IsLineOfSightVisible()
 
-GXF driver:
- * avoid closing the file pointer before being sure this is a GXF driver, otherwise this can prevent the opening of some raw format files (#1521)
+CSharp bindings:
+ * Exposes additional Dataset methods (#918, #9398)
 
-HDF4 driver:
- * fix retrieval of non-string swath and grid attributes
- * fix GR support for non-Byte rasters
- * remove broken attribute reading
- * fixes related to color table
+Java bindings:
+ * bump minimum version to Java 8
 
-HDF5 driver:
- * avoid error report of the HDF5 library when _FillValue attribute is missing
- * Make GH5_FetchAttribute(CPLString) more robust and able to cope with variable-length string
- * type detection: only detect complex data type if the component names start with r/R and i/I (refinement of #359)
- * add a way to open datasets split over several files using the 'family' driver
- * fix reading single dimension dataset (#2180)
+Python bindings:
+ * lots of improvements to documentation
+ * add a pyproject.toml with numpy as a build requirement (#8926, #8069)
+ * pyproject.toml: use numpy>=2.0.0rc1 for python >=3.9 (#9751)
+ * bump setuptools requirement to >= 67.0
+ * define entry_points.console_scripts (#8811)
+ * add RasterAttributeTable::ReadValuesIOAsString, ReadValuesIOAsInteger,
+   ReadValuesIOAsDouble, RemoveStatistics()
+ * implement ``__arrow_c_stream__()`` interface for ogr.Layer
+ * add a ogr.Layer.GetArrowArrayStreamInterface() method
+ * add a ogr.Layer.WriteArrow() method consuming ``__arrow_c_stream__`` or
+   ``__arrow_c_array__`` interfaces (#9132)
+ * Invalidate layer ref when Dataset closes
+ * Accept str arg in FeatureDefn.GetFieldDefn
+ * Add Band.ReadAsMaskedArray
+ * Make gdal/ogr.GeneralCmdLineProcessor accept int, os.PathLike
+ * Avoid crash when accessing closed file
 
-HFA driver:
- * fix writing of compressed file when a RLE run count is in the [0x4000,0x8000[ range or [0x400000, 0x800000[ (#2150)
+# GDAL/OGR 3.8.5 Release Notes
 
-IGNFHeightASCIIGrid driver:
- * fix to read RASPM2018.mnt grid
+GDAL 3.8.5 is a bugfix release.
 
-IRIS driver:
- * make identification more restrictive to avoid false-positive identification of raw binary formats such as ENVI (#1961)
+## Build
 
-ISIS3 driver:
- * extract band name from BandBin group, and wavelength/bandwidth (#1853)
- * preserve label in PAM .aux.xml when copying to other formats (#1854)
- * add support for PointPerspective projection (#1856)
- * add support for Oblique Cylindrical projection (#1856)
+* Disable my_test_sqlite3_ext in static builds
+* Fix false-positive -Wformat-truncation with clang 18 on fedora:rawhide CI
+* cpl_vsil_unix_stdio_64.cpp: avoid compiler warning related to ftello()
+* Fix compiler crash on gcore/overview.cpp with ICC 2024.0.2.29 (#9508)
+* CMake: Fix FindGEOS to remove use of deprecated exec_program()
+* CMake: fix NumPy detection when Intel MKL library is installed
+* CMake: add modern Apple OS (visionOS|tvOS|watchOS) support (#9550)
+* Minimal support for TileDB 2.21 to avoid build & test issues
 
-JP2ECW driver:
- * add support for ECWJP2 SDK 5.5
+## GDAL 3.8.5
 
-JP2OpenJPEG driver:
- * Fix multi-threading race condition (#1847)
- * fix reading overviews, when tiled API is used, and the dimensions of the full resolution image are not a multiple of 2^numresolutions (#1860)
- * fix to return the proper number of bytes read when we read more than 2 GB at once (fixes https://github.com/uclouvain/openjpeg/issues/1151)
+### Port
 
-JP2KAK driver:
- * fix issue with multi-threaded reads
- * NMAKE: Allow users to tweak/append extras to KAKINC (#1584)
+* /vsiaz/: handle properly BlobEndpoint ending with a slash (#9519)
 
-JPEG driver:
- * fix further calls to RasterIO after reading full image at full resolution (#1947)
- * tune sanity check for multiple-scan (QGIS #35957)
- * in case of multiscan image and implicit overviews, limit memory consumption
+### Core
 
-KEA driver:
- * return error when deleting metadata item rather than crashing (#1681)
- * Backport thread safety fixes and nullptr tests from standalone driver (#2372)
+* QuietDeleteForCreateCopy(): forward source dataset open options (#9424)
+* Overview/RasterIO resampling: fix infinite looping when nodata has a big
+  absolute value (#9427)
 
-LOSLAS driver:
- * add support for .geo geoid models
+### Utilities
 
-MEM driver:
- * Set access mode to the one required in Open()
+* gdalinfo_output.schema.json: add comment about size and proj:shape ordering
+* gdalinfo -json/gdal.Info(format='json'): avoid error/exception on engineering
+  CRS (#9396)
+* gdalwarp: cutline zero-width sliver enhancement: avoid producing invalid
+  polygons
+* gdal2tiles.py: fix exception when -v flag is used and overview tiles are
+  generated (3.7.0 regression) (#9272)
+* gdalattachpct.py: fix it when output file is a VRT (#9513)
 
-MRF driver:
- * fix relative file name detection
- * relax TIFF tile format rules on read
- * Accept any known projection encoding
- * use PNG library for swapping
- * fixes caching MRF issue
+### Raster drivers
 
-MrSID driver:
- * add MRSID_PLATFORM to frmts/mrsid/nmake.opt
+DIMAP driver:
+ * add radiometric metadata
 
-netCDF driver:
- * improve performance when reading chunked netCDF 4 bottom-up files (read-only)
- * correctly parse grid_mapping attribute in expanded form
- * allow "radian" value for the X/Y axis units
- * very partial workaround for an issue in libnetcdf 4.6.3 and 4.7.0 with unlimited dimensions (refs https://github.com/Unidata/netcdf-c/pull/1442)
- * NCDFIsUserDefinedType(): make it work for types in subgroups
- * Disregard valid range if min > max (#1811)
- * for byte (signed/unsigned) variables, do not report a nodata value if there's no explicit _FillValue/missing_value as recommended by the netCDF specs. And for other data types use nc_inq_var_fill() to get the default value
- * do not report nodata if NOFILL is set
- * fix bottom-up identification with negative scale_factor for y axis (#1383)
- * fix issue when opening /vsicurl/http[s]://example.com/foo.nc filenames (#2412)
- * Fix support of WKT1_GDAL with netCDF rotated pole formulation
+ERS driver:
+ * avoid 'Attempt at recursively opening ERS dataset' when the .ers file
+   references a .ecw (#9352)
 
-NGW driver:
- * Add support for additional raster types and QGIS styles.
- * Add more server side attribute filters.
+GPKG driver:
+ * avoid invalid use of pointer aliasing that caused ICC 2024.0.2.29 to
+   generate invalid code (#9508)
 
-NITF driver:
- * skip bad UDID data (#1578)
+GRIB driver:
+ * avoid floating-point issues with ICC 2024.0.2.29 (#9508)
 
-NTv2 driver:
- * add support for the Canadian NAD83(CRSR)v7 / NAD83v70VG.gvb velocity grid
+GTiff driver:
+ * fix read error/use-after-free when reading COGs with mask from network
+   storage (#9563)
 
-OZI driver:
- * fix axis order issue with georeferencing (3.0 regression)
+JP2OpenJPEG driver:
+ * CreateCopy(): limit number of resolutions taking into account minimum block
+   width/height (#9236)
 
-PDF driver:
- * update to use newer versions of pdfium
+OGCAPI driver:
+ * fix potential use-after-free on vector tiled layers
 
-PDS3 driver:
- * report the label in a json:PDS metadata domain
- * fix support of Oblique Cylindrical (#1856)
- * ix opening of datasets with BSQ organization (or single band), where one band is larger than 2 GB (2.3 regression)
- * nasakeywordhandler: fixes to be able to read some labels with metadata items whose value is a list on several lines
- * add a GDAL_TRY_PDS3_WITH_VICAR configuration option that can be set to YES so that PDS3 datasets that contain a VICAR label are opened by the VICAR driver
+VRT driver:
+ * VRTDerivedRasterBand: Support Int8, (U)Int64 with Python pixel functions
+ * VRT/gdal_translate -of 200% 200%: make sure that the synthetized virtual
+   overviews match the dimension of the source ones when possible
+ * VRTPansharpenedDataset: allow to specify <OpenOptions> for <PanchroBand> and
+   <SpectralBand>
 
-PDS4 driver:
- * update CART schema to 1D00_1933 and PDS to 1C00 (#1851)
- * fix reading side of Mercator and Orthographic
- * add a CREATE_LABEL_ONLY=YES creation option, and create a <Header> element (#1832)
- * add write support for LAEA projection
+## OGR 3.8.5
 
-PNG driver:
- * Update internal libpng to 1.6.37
+### Core
 
-PNM driver:
- * emit warning if creating file with non-standard extension
+* OGRGeometry::getCurveGeometry(): avoid failures when building some compound
+  curves with inferred circular strings (#9382)
+* OGRLayer::GetArrowSchema(): remove potential unaligned int32_t writes
+* CreateFieldFromArrowSchema(): don't propagate native subtype if we have to
+  use a fallback main type
 
-RasterLite2 driver:
- * fix build against latest librasterlite2, and require it
+### Vector drivers
 
-RMF driver:
- * Add support for PZ-90.11 and GSK-2011 coordinate systems
- * Read vertical datum info
- * Add translation vertical CS ID to dataset's spatial reference
+Arrow/Parquet driver:
+ * fix inverted logic regarding spatial filtering of multipolygon with GeoArrow
+   interleaved encoding
 
-RS2 driver:
- * add half-pixel shift to reported GCP line and column numbers (#1666)
+FlatGeoBuf driver:
+ * Make sure vendored flatbuffers copy has a unique namespace
+ * implement OGRLayer::GetDataset() (#9568)
 
-Sentinel2 driver:
- * Add support for exposing Level-2A AOT, WVP, SCL, CLD, SNW data in SAFE_COMPACT format (#2404)
+GMLAS driver:
+ * fix crash when reading CityGML files (r-spatial/sf#2371)
 
-TileDB driver:
- * add capability to define co-registered attributes per band
- * set row-major reads and removed adviseread (#1479)
- * added support for raster band metadata
- * TILEDB_LIBS added for windows build
- * partial updates to existing arrays
- * support reading tiles in update mode (#2185)
- * use array metadata to store xml (#2103)
- * redirect vsis3 calls to tiledb s3 direct calls
- * Flush cache in block order for global writes (#2391)
+GPKG driver:
+ * Ensure that mapping tables are inserted into gpkg_contents
+ * Ensure that tables present in gpkgext_relations can be read
 
-TSX driver:
- * add PAZ support
+ILI2 driver:
+ * emit an error and not just a warning when creating a dataset without a model
+   file
 
-USGSDEM driver:
- * fix reading FEMA generated Lidar datasets whose header is 918 bytes large
+ODS driver:
+ * declare OLCStringsAsUTF8 on newly created layers
 
-VICAR driver:
- * Support FORMAT=HALF, DOUB and COMP
- * Support big-endian order for integer & floating point values
- * Support VAX floating-point order
- * Support BIP and BIL organizations
- * Ignore binary label records (NBL), and properly skip binary prefixes (NBB)
- * fix reading of EOL labels with non BSQ organizations, and possible confusion with LBLSIZE of EOL overwriting the main one
- * improvements in label reading, and report label in a json:VICAR metadata domain
- * read binary prefixes as OGR layer
- * add read support for BASIC and BASIC2 compression methods
- * add write support
- * remove obsolete END-OF-DATASET_LABEL, CONVERSION_DETAILS and PIXEL-SHIFT-BUG metadata items that dates back to 1.X era
+OpenFileGDB driver:
+ * Correctly use "features" as related table type (instead of "feature")
+ * writer: fix corrupted maximum blob size header field in some SetFeature()
+   scenarios (#9388)
+ * avoid issue with -fno-sanitize-recover=unsigned-integer-overflow with recent
+   clang
 
-VRT driver:
- * add 'vrt://{gdal_dataset}?bands=num1,...,numN' syntax as a convenient way of creating a on-the-fly VRT with a subset of bands
- * VRT warp: do not fail if a block has no corresponding source pixels (#1985)
- * VRT Python: also probe libpython3.Xm.so.1.0 (#1660)
- * VRT Python: add Python 3.8 compatibility
- * avoid erroneous pixel request do be done with KernelFilteredSource
- * VRTRawRasterBand: add GetVirtualMemAuto interface to enable mmap io
- * fix requesting a downsampling version of the mask band of a source that has masks and overviews
- * VRT pansharpening: fix crash when NoData is set and input multispectral bands are separate files (#2328)
- * fix IGetDataCoverageStatus() that can cause issue for the use case of https://lists.osgeo.org/pipermail/gdal-dev/2020-April/051889.html
- * gdalvrt.xsd: add 'dataAxisToSRSAxisMapping' attribute for GCPList element (#2378)
+Parquet driver:
+ * avoid potential assertion/out-of-bounds access when a subset of row groups
+   is selected
 
-WCS driver:
- * pass user-supplied progress function to curl HTTP request when using DirectRasterIO
+PMTiles driver:
+ * fix 'Non increasing tile_id' error when opening some files (#9288)
 
-WMS driver:
- * IReadBlock(): limit number of tiles downloaded at once
- * Use curl_multi_wait instead of socket API (#1789)
- * AGS: Remove unused parameters from url
+Shapefile driver:
+ * Fix bug when reading some .sbn spatial indices
 
-## OGR 3.1.0 - Overview of Changes
+XLSX driver:
+ * declare OLCStringsAsUTF8 on newly created layers
 
-## Core
+## Python bindings
 
-* Support API-level precision/round for geometry WKT (#1797)
-* OGR SQL: make LIKE behave in a case sensitive way from now
-* OGR SQL: support constructs 'A OR B OR C ... OR N' with many successive OR
-* SQL SQLite: do not propagate 'IS / IS NOT value' constructs to OGR SQL
-* SQL SQLite: add support for ST_MakeValid() using OGRGeometry::MakeValid() if not exposed by Spatialite already
-* Rename swq.h->ogr_swq.h and install it, mark SQL query parse API with
-CPL_UNSTABLE_API macro (#1925)
-* SQLite dialect: fix issue when using JOIN on a layer without fast filter count capability
-* OGRSimpleCurve::getPoints() with XYZM: fix wrong stride used for M array
-* OGRSimpleCurve: fix reversePoints() and addSubLineString() to take into account M dimension
-* Add OGR_G_CreateGeometryFromEsriJson() and map it to SWIG
-* OGRLinearRing::isPointOnRingBoundary(): fix incomplete test that could falsely return true if the point was aligned with a segment, but not between the nodes. Impact correct reconstruction of holes in shapefile driver
-* OGRGeometryFactory::ForceTo(): fix crash when forcing a MultiPolygon Z/M/ZM to a CompoundCurve (#2120)
-* OGRGeometryFactory::forceToMultiLineString(): fix for a GeometryCollection of LineStringZ/M/ZM (#1873)
-* OGRGeometryRebuildCurves(): only try to reconstruct curved geometry if one of the input geometries has really a non-linear portion
-* curveFromLineString(): make sure to exactly close the compound curve if the input curve is itself closed
-* GDALDataset::CopyLayer(): fix crash when using DST_SRSWKT option. And also set SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER)
-* Add OGR_G_RemoveLowerDimensionSubGeoms()
+* gdal.Translate()/gdal.Warp()/etc.: make sure not to modify provided options[]
+  array (#9259)
+* Fix gdal.Warp segfault with dst=None
 
-## OGRSpatialReference
+# GDAL/OGR 3.8.4 Release Notes
 
-* Revise how SRS methods deal with TOWGS84. Add OSR_ADD_TOWGS84_ON_IMPORT_FROM_EPSG, OSR_ADD_TOWGS84_ON_EXPORT_TO_PROJ4 and OSR_ADD_TOWGS84_ON_EXPORT_TO_WKT1 configuration options. See https://github.com/OSGeo/gdal/commit/cc02dc4397c7ec43ec4c4b842e5faabe16c54904 for details
-* SetFromUserInput(): add capability to import PROJJSON
-* add ExportToPROJJSON() (PROJ >= 6.2)
-* GetAxis(): make it work with a compound CRS (#1604)
-* Coordinate transformation: fix invalid output with some input coordinates in EPSG:4326 to EPSG:3857 transformation (3.0 regression)
-* Coordinate transformation: Coordinate transformation: add a OGR_CT_OP_SELECTION=PROJ/BEST_ACCURACY/FIRST_MATCHING config option. Defaults to PROJ for PROJ >= 6.3
-* importFromWkt(): emit a CPLError() in case of import failure (#1623)
-* Add OSRGetAxesCount() to C API and SWIG bindings
-* Add OSRPromoteTo3D() and map it to SWIG (PROJ >= 7) (#1852)
-* importFromESRI(): acept COMPD_CS (#1881)
-* add an internal cache for importFromEPSG() and importFromWkt(). Helps performance for MapServer PROJ6 migration
-* Add support for Vertical Perspective projection (#1856)
-* Add a OSRGetPROJSearchPaths() function and a SWIG osr.GetPROJVersionMicro()
-* Fix use-after-free issue when destroying a OGRSpatialReference object in a thread when another thread has created it but has been destroy in-between
-* Coordinate transformation: make it work with hacky WKT1 rotated pole from netCDF driver
-* Add OGR_GeomTransformer_XXXX API that wraps OGRGeometryFactory::transformWithOptions() and expose it to SWIG (fixes #1911)
-* Fix PROJ usage across fork() calls (#2221)
-* OGRCoordinateTransformation: correctly deal when transforming CRS that includes +lon_wrap= or similar qualifiers
-* Add OSRIsDerivedGeographic()
-* EPSGTreatsAsNorthingEasting(): fix it to properly deal with Polar projected CRS with northing,easting order
+GDAL 3.8.4 is a bugfix release.
 
-## Utilities
+## Build
 
-* ogrinfo: add a -nogeomtype switch
-* ogrinfo: fix to output WKT2 SRS by default. Was done correctly for several geometry column, but not single one
-* ogr2ogr: emit better error message when using -f VRT
-* ogr2ogr: improve performance of -explodecollections on collections with big number of parts
-* ogr2ogr: avoid non-relevant warning 'Input datasource uses random layer reading, but output datasource does not support random layer writing' when converting one single layer
-* ogr2ogr: allow to combine -nlt CONVERT_TO_LINEAR and -nlt PROMOTE_TO_MULTI (#2338)
-* ogr2ogr: add a -makevalid switch (requires GEOS 3.8 or later) and expose it in Python as makeValid=True options of gdal.VectorTranslate()
+* FindECW.cmake: make it work for Windows 32-bit builds (#9106)
+* Restore use of gmtime_r and localtime_r; extend to ctime_r; use Windows
+  variants too
+* FindSQLite3.cmake: improve detection of static libsqlite3.a (#9096)
+* bash_completion installation: Allow the project_binary_dir to contain a
+  whitespace
 
-## OGR drivers
+## Docker build recipes
 
-Multiple drivers:
- * GML/WFS: add support for Date, Time and DateTime fields
- * GeoJSONSeq & TopoJSON: avoid false positive detection and errors on unrelated http[s]:// filenames
+* docker/ubuntu-full/Dockerfile: update to Arrow 15.0.0
+* docker/ubuntu-full/Dockerfile: pin libarrow-acero-dev version (#9183)
+* docker/ubuntu-full/Dockerfile: disable AVX2 when building TileDB
 
-AmigoCloud driver:
- * Modify amigocloud URL endpoint.
+## GDAL 3.8.4
 
-AVCE00 driver:
- * fix alternance from sequential to per-FID reading
+### Port
 
-CAD driver:
- * Fix read ellipse and arc (#1886)
+* /vsisparse/: fix Stat() on files larger than 4 GB on 32-bit builds
+* CPLAtof()/CPLStrtod(): recognize again INF and -INF
+* /vsicurl/: fix potential multithreaded crash when downloading the same region
+  in parallel and that the download fails
 
-DXF driver:
- * Re-add some header and trailer elements that caused compatibility issues with recent Autocad versions (#1213)
- * Generate correct HATCH boundary elliptical arc segments for certain start/end angles
- * Skip "Embedded Object" sections in 2018 version DXFs
- * Specify maximum gap between interpolated curve points, configurable with OGR_ARC_MAX_GAP
- * do not error out if trying to create a OGR_STYLE field
- * fix handling of SPLINE whose first knot is at a very very close to zero negative (#1969)
- * do not discard Z value when reading a HATCH (#2349)
- * write (100, AcDbEntity) before (8, layer_name) (#2348)
- * Correct handling of "off" and "frozen" layers in blocks (#1028)
+### Core
 
-DWG driver:
- * add support for ODA 2021.2 (Windows builds)
+* PAM: only unset GPF_DIRTY flag
+* GDALOverviewDataset: avoid setting SetEnableOverviews(false) during lifetime
+  of object. Just do it transiently
 
-ElasticSearch driver:
- * rename driver to Elasticsearch (s lowercase for search)
- * update geometry type name for Points
- * Enable support for Elasticsearch 7 (#1246)
- * Set 'application/json' in RunRequest() with POST (#1628)
- * GeoJSON type field should be mapped as text in ES>=5
- * add FORWARD_HTTP_HEADERS_FROM_ENV open option to pass HTTP headers down to the ES server
- * translate constructs like CAST(field_name AS CHARACTER[(size)]) = 'foo' to ES query language
+### Utilities
 
-ESRIJson driver:
- * attempt identification of SRS from database entries (#2007)
- * do not require a 'geometry' member to be present in a feature
+* gdalinfo: do not emit errors if corner coordinate reprojection fails
+* gdalwarp: do not enable blank line detection when -tap and -te are specified
+ (#9059)
 
-GeoJSON driver:
- * on writing, format OFTDate and OFTDateTime as ISO 8601 strings rather than OGR traditional formatting
- * add a DATE_AS_STRING open option that can be set to YES to disable autodetection of date/time/datetime
- * Advertise UTF-8 encoding of strings (#2151).
- * report 3D layer geometry types (#1495)
- * fix recognizing some documents with members sorted alphabetically (#1537)
- * avoid SetFeature() to repeat first feature when looping over features (#1687)
- * use VSIOverwriteFile() to fix update of file on Windows (fixes https://github.com/qgis/QGIS/issues/28580)
- * Transform MAX_OBJECT_SIZE to runtime environment option - OGR_GEOJSON_MAX_OBJ_SIZE
- * on reading of a file that use crs.name = urn:ogc:def:crs:OGC:1.3:CRS84, report EPSG:4326 as we used to do in GDAL 2 (#2035)
- * in writing mode, implement GetExtent() (#2269)
- * Add ID_GENERATE option for generating missing feature ids (#2406)
+### Raster drivers
 
-GeoJSONSeq driver:
- * make Open() return successfully only if at least one feature is detected
+BMP driver:
+ * fix reading images larger than 4GB (3.4.0 regression)
 
-GML driver:
- * support reading standalone geometry (#2386)
- * fix axis order issue when decoding AIXM ElevationPoint (#2356)
- * fix axis order issue with gml:CircleByCenterPoint and gml:ArcByCenterPoint (# 2356)
- * fix handling of angles with ArcByCenterPoint and urn:ogc:def:crs:EPSG::4326, and compound curves made of a sequence of straight lines and ArcByCenterPoint in a <segments> (#2356)
+EEDA/EEDAI driver:
+ * use 'crsWkt' element
 
-GPKG driver:
- * change default value of OGR_GPKG_FOREIGN_KEY_CHECK to NO, so as to avoid issues in downstream software
- * insert more accurate spatial extent in gpkg_contents
- * on layer creation, check if the SRS is consistent with its advertise AUTHORITY/ID, and if not do not use official EPSG entries (#1857)
- * allow parsing datetime serialized as OGR strings, and emit warnings when unrecognized content is found (#2183)
- * when writing a layer of geometry wkbUnknown, make sure to set gpkg_geometry_columns.z/m to 2 when there are geometries with Z/M values (#2360)
+GRIB driver:
+ * degrib: use gmtime_r() or gmtime_s() when possible
 
-KML driver:
- * set OAMS_TRADITIONAL_GIS_ORDER for SRS returned on returned layers
+netCDF driver:
+ * use VSILocalTime()
 
-LIBKML driver:
- * make it accept /vsigzip/foo.kml.gz files (#1743)
+PCIDSK driver:
+ * PCIDSK SDK: use ctime_r() or ctime_s() when possible
 
-MITAB driver:
- * Add friendly layer name (description) support.
- * Fix creation of long field names in local encoding (#1617)
- * don't left truncate numeric values in the .dat when the field formatting is incompatible, but error out (#1636)
- * Add custom datum/spheroid parameters export
- * Update WindowsLatin2 definition (#1571)
- * identify correctly GDA2020 datum
- * do not set (by default) TOWGS84 when reading a known Datum
- * cleanup management of update flag (#2170)
+PDF driver:
+ * correctly initialize PAM when opening a subdataset (specific page for
+   example)
 
-MSSQLSpatial driver:
- * Fix handling empty geometries (#1674)
- * Fix handling mixed geometries (#1678)
- * avoid GetExtent() to mess with GetNextFeature() statement, so that ogrinfo -al works properly
+VRT driver:
+ * VRTPansharpenedRasterBand::GetOverviewCount(): robustify against potential
+   failure of GDALCreateOverviewDataset()
 
-MVT driver:
- * make CONF option accept a filename as well
- * reduce memory usage when processing big geometries (#1673)
+WMS driver:
+ * fix nullptr dereference on invalid document (ossfuzz #65772)
 
-MySQL driver:
- * Add SRID to geometry when creating layer table (#1015)
- * use INFORMATION_SCHEMA.ST_GEOMETRY_COLUMNS to get SRSId
+## OGR 3.8.4
 
-NAS driver:
- *  disable generation of .gfs file in read-only file systems (or intended to be), similarly to GML driver
+### Core
 
-netCDF driver:
- * add read/write support for CF-1.8 Encoded Geometries
- * add support for vector products Sentinel3 SRAL MWR Level 2
+* ExecuteSQL(dialect=SQLite): support 'SELECT\n' for example (#9093)
+* OGRGeometryFactory::createGeometry(): do not assert on wkbUnknown input
 
-NGW driver:
- * Fix dataset access mode
- * Add support for layers geometry types with Z
+### Utilities
 
-OAPIF driver (previously WFS3):
- * updated to OGC API - Features 1.0 core spec (#1878)
- * correctly handle user query string parameters in connection URL (#1710)
- * add persistent curl session for better performance
- * add capability to use a XML Schema to build the layer field definition and geometry type
- * add capability to use JSON schema
- * add support for rel=queryables and cql-text
- * add a IGNORE_SCHEMA=YES/NO open option
- * implement filter-lang=json-filter-expr
- * avoid issues with double slash when building a /collections URL
+* ogr2ogr: Arrow code path: take into account -limit parameter for
+  MAX_FEATURES_IN_BATCH
 
-OSM driver:
- * make error message hopefully clearer and more complete (#2100)
+### Vector drivers
 
-PDF driver:
- * fix reading polygon with holes and Bezier curves (#1932)
- * add a GDAL_PDF_LAUNDER_LAYER_NAMES configuration option
- * fix reading strings with escape sequences
+GeoRSS, GPX, JML, KML, LVBAG, SVG, XLSX drivers:
+ * harmonize on a 8192 byte large parsing buffer on all platforms
 
-PostgreSQL driver:
- * add support for PostgreSQL 12 (#1692)
- * add support for PG:service=xxx syntax and SERVICE open option (#2373)
- * support PostGIS schema installed in non-public schema (#2400)
- * do not attempt to create VARCHAR(n) columns with n >= 10485760 (#1508)
- * be more restrictive when deducing non-nullability of columns in SQL result layers (#1734)
+Arrow/Parquet driver:
+ * add (minimum) support for libarrow 15.0
+ * MapArrowTypeToOGR(): make the code robust to potentially new entries in the
+   arrow::Type enumeration
 
-Shape driver:
- * add read/creation/update support for .shz and .shp.zip
- * identify a EPSG code if the confidence is >= 90 (https://github.com/OSGeo/PROJ/issues/1799)
- * better deal with empty .shp+.shx and SHAPE_RESTORE_SHX (#1525)
- * launder layer name to get Windows compatible filename
- * try to better deal with polygons with parts touching on an edge (which is illegal simple features) (#1787)
- * fix crash when creating a layer with a wkbNone geometry type but a SRS (3.0 regression)
- * include fseek() optimization of https://github.com/OSGeo/shapelib/pull/3
- * expose .dbf and .cpg source encodings in the SHAPEFILE metadata domain
- * correctly update layer extent when first feature is a point at (0,0) (#2269)
+CAD driver:
+ * Internal libopencad: use localtime_r() or localtime_s() when possible
 
-S57 driver:
- * s57objectclasses.csv: add missing TXTDSC attribute for DRYDOC class (#1723)
- * s57objectclasses.csv: add wtwdis and unlocd for distance marks from IENC (#2123)
- * s57objectclasses.csv: add PICREP attribute to LNDMRK object class
- * Added handling of ISDT when using updates (#895)
- * Added creation of additional field "ATTF" when missing while updating (#2249)
+CSV driver:
+ * do not quote numeric fields even if STRING_QUOTING=ALWAYS (3.8.1 regression)
+   (#55808)
 
-SOSI driver:
- * Append values from duplicate fields when setting new appendFieldsMap open option (#1794)
+GMLAS driver:
+ * recognize GeometricPrimitivePropertyType
 
-SQLITE driver:
- * fix crash in loading sqlite extensions on iOS (#1820)
- * fix conversion of geometry collections (and derived types) in geometry collections as Spatialite geometries, by flattening the structure
- * cleanup management of update flag (#2162)
- * GetSpatialiteGeometryHeader(): fix bug regarding detection of empty geometries
+LIBKML driver:
+ * fix crash on a gx:Track without when subelements (qgis/qgis#55963)
 
-SXF driver:
- * Add open options with RSC file name
- * Use SXF_LAYER_FULLNAME from dataset open options
- * Use SXF_SET_VERTCS from dataset open options
- * Add OGRSXFLayer::CanRecode and check it for OLCStringsAsUTF8 capability
- * Add driver identify function (#1607)
+MSSQLSpatial driver:
+ * Fix BCP performance problem (#9112)
 
-VFK driver:
- * use a faster implementation of VFKDataBlockSQLite::LoadGeometryPolygon()
+MySQL driver:
+ * fix/workaround server-side spatial filtering when SRS is geographic with
+   MySQL >= 8 (qgis/QGIS#55463)
 
-VRT driver:
- * set OAMS_TRADITIONAL_GIS_ORDER for LayerSRS (#1975)
+ODS driver:
+ * fix parsing of large cells on Windows (at least with mingw64) with recent
+   expat 2.6.0 release
 
-WaSP driver:
- * on creation, make sure the layer geometry type set on the feature definition is wkbLineString25D
+PDF driver:
+ * vector stream parser: correctly parse structures like "[3 3.5] 0 d"
 
-WFS driver:
- * Support FlatGeobuf as WFS outputformat (#2135)
- * skip silently GeoServer EPSG:404000 dummy CRS
+PDS driver:
+ * fix compilation with Emscripten version 3.1.7
 
-XLSX driver:
- * add support for .xlsm extension
+SQLite driver:
+ * OGR2SQLITE_Setup(): robustify against potential crashing scenario
 
-## SWIG Language Bindings
+### Python bindings
 
-All:
- * add osr.SetPROJSearchPath(path) that can be used since setting PROJ_LIB from C# does no work (#1647)
+* remove run of 'python -m lib2to3' that is a no-op, given that lib2to3 is
+  removed in python 3.13 (#9173)
 
-Python bindings:
- * add 'add' option to gdal.Rasterize
- * add hint&workaround for ImportError on Windows Python >= 3.8
- * add compatibility with SWIG 4.0 (#1702)
- * build modules in parallel
- * honour gdal.UseExceptions() in numpy related methods (gdalnumeric module) (#1515)
- * update to SWIG 3.0.12 to have better error message (#1677)
- * make the feature iterator on the layer call ResetReading()
- * Removed calls to deprecated imp module (#2264)
- * Add numpy as extras_require dependency (#2158)
- * emit exception is osr.SpatialReference(wkt) fails, even if in non-UseExceptions() mode, to avoid later cryptic exception (#2303)
- * NUMPYDataset::Open() / gdal_array.OpenArray(): honour writable flag of the numpy array to decide update status of GDAL dataset
- * fix invalid check for Dataset.ReadAsArray(buf_obj=some_array, interleave='pixel') scenario
+# GDAL/OGR 3.8.3 Release Notes
 
-# GDAL/OGR 3.0.0 Release Notes
+GDAL 3.8.3 is a bugfix release.
+
+## Build
 
-## In a nutshell...
+* infback9: fix various build issues with clang 17
+* fix build with sqlite 3.36.x (#9021)
+* fix build of optional utility gdal2ogr
 
- * Implement RFC 73: Integration of PROJ6 for WKT2, late binding capabilities, time-support and unified CRS database. PROJ >= 6 is now a build requirement
-    https://trac.osgeo.org/gdal/wiki/rfc73_proj6_wkt2_srsbarn
- * New GDAL drivers:
-  - DAAS: read driver for Airbus DS Intelligence Data As A Service
-  - TileDB: read/write driver for https://www.tiledb.io (#1402)
- * New OGR drivers:
-  - MongoDBv3: read/write driver using libmongocxx v3.4.0 client (for MongoDB >= 4.0)
- * Improved drivers:
-   - FITS: read/write support for scale, offset and CRS
-   - netCDF: read support for groups
-   - PDF: add a COMPOSITION_FILE creation option to generate a complex document
-   - PDS4: subdataset creation support, read/write table/vector support
- * Support for minimal builds on Unix (#1250)
- * Add a docker/ directory with Dockerfile for different configurations
- * Continued code linting
+## GDAL 3.8.3
 
-## New installed files
+### Port
 
- * Resource file: pdfcomposition.xsd
+* AWS S3: add explicit error message when IMDS fails and we know we are on EC2
 
-## Removed installed files
+### Utilities
 
- * Removal of resource files related to EPSG and ESRI CRS databases: compdcs.csv, coordinate_axis.csv, datum_shift.csv, ellipsoid.csv, esri_epsg.wkt, esri_extra.wkt, esri_Wisconsin_extra.wkt, gcs.csv, gcs.override.csv, gdal_datum.csv, geoccs.csv, pcs.csv, pcs.override.csv, prime_meridian.csv, projop_wparm.csv, unit_of_measure.csv, vertcs.csv, vertcs.override.csv
+* gdalbuildvrt: in -separate mode, only use ComplexSource if needed
 
-## Backward compatibility issues
+### Raster drivers
 
-See MIGRATION_GUIDE.txt
+VRT driver:
+* VRTDerivedRasterBand::IRasterIO(): fix potential multiplication overflow
 
-## GDAL/OGR 3.0.0 - General Changes
+## OGR 3.8.3
 
-Build(Unix):
- * Allow internal drivers to be disabled (#1250)
- * Fix build with OpenBSD which doesn't support RLIMIT_AS (#1163)
- * Fix MacOS build failures due to json-c
- * Poppler: require pkg-config
- * PostgreSQL: Switch from pg_config to pkg-config (#1418)
- * fix build --without-lerc (#1224)
- * fix netcdf_mem.h detection in netcdf 4.6.2 (#1328)
- * Fix build --with-curl --without-threads (#1386)
+### OGRSpatialReference
 
-Build(Windows):
- * nmake.opt: remove unicode character at line starting with '# 4275' that apparently cause build issues with some MSVC versions (#1169)
+* CoordinateTransformation::TransformBounds(): fix polar stereographic (
+  including pole) to Web Mercator (#8996)
 
-All:
- * PROJ >= 6.0 is a required external dependency
- * libgeotiff >= 1.5 should be used for builds with external libgeotiff
- * Poppler: drop support for Poppler older than 0.23.0
- * Poppler: add support for 0.72.0, 0.73.0, 0.75.0, 0.76.0
+### Utilities
 
-## GDAL 3.0.0 - Overview of Changes
+* ogr2ogr: do not use ArrowArray interface if -clipsrc, -clipdst, -gcp or
+  -wrapdateline are specified (#9013)
 
-Port:
- * Add capability to define external VSI virtual file systems from C API (#1289)
- * MiniXML: Fix wrong node order when calling CPLAddXMLAttributeAndValue() after CPLCreateXMLElementAndValue()
- * /vsicurl/: ReadMultiRange(): use default implementation if there is a single range (#1206)
- * /vsicurl/: ignore proxy CONNECT response headers (#1211)
- * /vsicurl/: automatically detect signed URLs where host ends with a port number; also detect signed URLs as created with the AWS4-HMAC-SHA256 method (#1456)
- * /vsizip/: Add config option to create zip64 extra fields by default (#1267)
- * /vsis3/, /vsigs/, /vsiaz/: add HTTP retry logic in writing code paths
- * Fix data race in VSIFileManager::Get
- * cpl_zipOpenNewFileInZip3: fix memory leak in error code path. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13103.
- * VSIGZipWriteHandleMT: avoid potential deadlock in case of error
- * Fix assertion in CPLGetValueType when testing non-ASCII chars
- * /vsihdfs/: fix Read() when more than one hdfsRead call is needed (#1349)
- * Fix potential buffer overflow in CPLODBCSession::Failed (#1390)
- * /vsitar/: handle .tar file header with space padding instead of 0 for file size (#1396)
+### Vector drivers
 
-Core:
- * Support blocks larger than 2 billion pixels/bytes
- * Make CPLHaveRuntimeSSSE3() and CPLHaveRuntimeAVX() use GCC constructor functions
- * Move RawDataset base class to gcore/ (#1268)
- * RasterBand/Dataset::RasterIO(): enforce access mode on write
- * PAM: preserve existing metadata when setting new one (#1430)
- * RawDataset: use generic RasterIO() implementation when non-nearest resampling is asked (#1301)
- * DumpJPK2CodeStream(): dump PLT and POC markers
+* OGRArrowArrayHelper::SetBoolOn(): fix wrong bit shift computation.
+  Affects ogr2ogr from GPKG/FlatGeoBuf to something else) (#8998)
 
-Algorithms:
- * RPC transformer: test success code of GDALRPCTransform() in GDALCreateRPCTransformer()
- * RPC transformer: add a RPC_FOOTPRINT transformer option to provide a polygon in long/lat space where the RPC is valid, and also make gdalwarp use GDALSuggestedWarpOutput2() to restrict the bounding box of the output dataset
- * GDALFillNodata(): fix wrong comparison in QUAD_CHECK() macro: nNoDataVal is only assigned to target_y values (#1228)
- * GDALFillNodata(): reinitialize panLastY array to nNoDataVal before bottom to top pass (#1228)
- * GDALFillNodata(): do an extra iteration to reach the maximum search distance in all quadrants (#1228)
- * GDALRasterizeLayersBuf():support any GDAL data type for buffer,and pixel and line spaceing arguments
- * GDALResampleChunk32R_Mode: performance improvement
- * Rasterize with MERGE_ALG=ADD: avoid burning several times intermediate points of linestrings (#1307)
- * rasterize: fix crash when working buffer is larger than 2GB (#1338)
+GPKG driver:
+ * Fix error message that sometimes occurred with multi-threaded ArrowArray
+   interface, and add OGR_GPKG_NUM_THREADS config option. (#9018, 9030)
 
-Utilities:
- * gdal_translate: add "-nogcp" option (#1469)
- * gdal_contour: remove explicit width/precision=12/3 of the elev field (#1487)
- * gdaldem hillshade: add -igor option (#1330)
- * gdalwarp -crop_to_cutline: do not round computed target extent to be aligned on the grid of the source raster if -tr is set (restore partially pre 2.4 behavior) (#1173)
- * gdalwarp: assume -tap when using -crop_to_cutline, -tr and -wo CUTLINE_ALL_TOUCHED=TRUE, so as to avoid issues with polygons smaller than 1x1 pixels (#1360)
- * gdal2tiles: give local tile layer and basemap layers same min/max zoom levels as generated tile cache
- * gdal2tiles: fix breakage of openlayers.html getURL() javascript function, introduced in GDAL 2.3.3 / 2.4.0 (#1127)
- * gdal2tiles: prevent accidental copy of full GeoTIFF into temporary .vrt file
-  gdal2tiles: Refactor and fix multiprocessing completion handling
- * gdal_fillnodata.py: preserve color interpretation and table
- * gdal_fillnodata.py: do not set geotransform if source doesn't have one
- * gdalsrsinfo: do not silence errors when calling SetFromUserInput()
- * gdal_retile: Use nodata value from origin dataset
- * gdal_edit.py: allow setting band-specific scale and offset values (#1444)
- * validate_cloud_optimized_geotiff.py: check if file is only greater than 512px (#1403)
- * validate_cloud_optimized_geotiff.py: report headers size
+GeoJSON driver:
+  * Internal libjson: resync random_seed.c with upstream, and use getrandom()
+    implementation when available (#9024)
 
-Multidriver fixes:
-  * GTiff, GPKG, MBTiles, PostgisRaster drivers: ensure that main dataset and overviews share the same lock, so as to avoid crashing concurrent access (#1488)
+# GDAL/OGR 3.8.2 Release Notes
 
-ADRG driver:
- * modified to ensure that there is no confliction between ADRG and SRP when opening a .gen file (#953)
+GDAL 3.8.2 is a bugfix release.
 
-AIGRID / AVCBin:
- * fix filename case adjustment that failed on /vsi filesystems (#1385)
+## GDAL 3.8.2
 
-BAG driver:
- * fix potential nullptr deref on corrupted file
+### Port
 
-COSAR driver:
- * avoid out-of-bound write on corrupted dataset. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=12360.
+* /vsis3/: takes into account AWS_CONTAINER_CREDENTIALS_FULL_URI environment
+  variable (#8858)
+* cpl_safemaths.hpp: fix compilation with clang targeting Windows (#8898)
+* CPLGetPhysicalRAM(): fix getting right value when running inside Docker on a
+  cgroups v1 system (like Amazon Linux 2) (#8968)
 
-EEDA driver:
- * report 'path' metadata in 'path' field
+### Algorithms
 
-GPKG driver:
- * allow negative srs_id values in gpkg_spatial_ref_sys
- * reduce memory requirements for cached tiles
+* Rasterization: avoid burning pixel that we only touch (with an empty
+  intersection) (#8918)
 
-GTiff diver:
- * supports tiles/strips larger than 2GB
- * add APPEND_SUBDATASET=YES capability to create subdataset / new TIFF page to an existing file
- * only report scale/offset deduced from ModelTiepointTag and ModelPixelScaleTag if the SRS has a vertical component (and thus currently if GTIFF_REPORT_COMPD_CS is set) (https://issues.qgis.org/issues/20493)
- * TIFF Lerc: properly initialize state after Create() so that BuildOverviews() succeed (#1257)
- * emit merged consecutive multi-range reads (#1297)
- * add warnings when using unsupported combination of internal mask+external overview, and fix COPY_SRC_OVERVIEWS=YES so that it does not copy ALL_VALID masks (#1455)
- * do not generate a TIFFTAG_GDAL_METADATA with color interpretation information for JPEG YCbCr compression
- * Internal libtiff and libgeotiff: resync with upstream
+### Utilities
 
-FITS driver:
- * new functions for Scale Offset and FITS World Coordinate System read and write (#1298)
+* gdal_footprint: return an error if the requested output layer doesn't exist
+* gdal_translate: avoid useless extra GDALOpen() call on a target GeoRaster
+* pct2rgb.py: emit explicit exception when source file has no color table (#8793)
 
-GeoRaster driver:
- * Fix memory leaks
+### Raster drivers
 
 HDF5 driver:
- * support reading blocks larger than 2GB
- * fix handling of attributes of type SCHAR, UCHAR, USHORT and UINT (https://github.com/mapbox/rasterio/issues/1663)
- * detect nodata from netCDF _FillValue (#1451)
- * add more strict checks for accepting datasets for GCP, and handle nodata in GCP too (#1451)
+ * classic 2D API: handle char,ushort,uint,int64,uint64 attributes when
+   reading them as double
+ * multidim: better warning when nodata value is out of range
 
-IGNFHeightAsciiGrid driver:
- * add support for RAF18.mnt
+JPEGXL driver:
+ * add compatibility with latest libjxl git HEAD
 
-JPEG driver:
- * fix GDAL 2.3.0 performance regression when decoding JPEG (or GPKG using JPEG) images (#1324)
+NGSGEOID driver:
+ * make dataset identification robust to NaN values (#8879)
 
-KEA driver:
- * add support for /vsi file systems
+OGCAPI driver:
+ * make it robust to missing 'type' on 'self' link (#8912)
 
-KMLSuperOverlay driver:
- * report color table of single overlay datasets, and also handle some variation in the KML structure (https://issues.qgis.org/issues/20173)
+STACTA driver:
+ * use GDAL_DISABLE_READDIR_ON_OPEN=EMPTY_DIR instead of
+   CPL_VSIL_CURL_ALLOWED_EXTENSIONS
+ * use STAC Raster extension to get number of bands, their data type, nodata
+   value, scale/offset, units, and avoid fetching a metatile
+ * add support for upcoming STAC 1.1 which merges eo:bands and raster:bands
+   into bands
 
-MRF driver:
- * sparse index and internal resampling fixes
- * fix integer overflow. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13974
+netCDF, HDF4, HDF5:
+ * SubdatasetInfo API: fix various issues (#8869, #8881)
 
-MrSID driver:
- * fix potential crash when a zoom level cannot be opened
+VRT driver:
+ * VRTComplexSource: fix excessive RAM usage with many sources (#8967, 3.8.0 regression)
 
-netCDF driver:
- * implement support for NetCDF-4 groups on reading (#1180)
- * support complex data types (#1218)
- * fix crash when opening a dataset with an attribute of length 0 (#1303)
- * fix IWriteBlock() to support non-scanline blocks, and use the chunk size
- * better deal with datasets indexed with unusual order for x/y dimensions
- * avoid inappropriate shift by -360 when attribute axis=X is set (#1440)
+### OGR 3.8.2
 
-NGW driver:
- * Add CreateCopy function
+### Core
 
-NITF driver:
- * avoid harmless floating point division by zero. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=12844.
+* OGRGeometryFactory::transformWithOptions(): fix WRAPDATELINE=YES on
+  multipoint geometries (#8889)
+* OGRSpatialReference::importFromUrl(): changes to no longer use a
+  'Accept: application/x-ogcwkt' header
+* OSRPJContextHolder: call pthread_atfork() once for the process, and
+  re-enable it for MacOS
+* OGRWKBIntersectsPessimisticFixture: handle all geometry types
 
-PCIDSK driver:
- * avoid uint overflow and too big memory allocation attempt. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=12893
+### Utilities
 
-PDF driver:
- * Add a COMPOSITION_FILE creation option to generate a complex document
- * And a gdal_create_pdf.py sample script
- * Fix selection of Poppler PDF layers with duplicate names (#1477)
- * avoid division by zero when generating from vector content whose bounding box is almost a horizontal or vertical line. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13408
+* ogrinfo: really honours -if (refs #8590)
+* ogr2ogr: implement -if
 
-PDS3:
- * fix decoding of band interleaved images (such as for CRISM HSP) (#1239)
- * add support for ENCODING_TYPE=DCT_DECOMPRESSED (#1457)
+### Vector drivers
 
-PDS4 driver:
- * add subdataset creation support, and getting/setting the band unit
- * update template and code to PDS v1B00 schema versions
+* PMTiles: Correct extension for temporary mbtiles file
 
-VRT driver:
- * Python pixel functions: add shared object name for python 3.7
- * VRT: in case of no SourceProperties, do not use global shared datasets, but only shared to the owning VRTDataset, to avoid potential reference cycles and annoying related issues. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13476.
+## Python bindings
 
-WCS driver:
- * avoid potential out-of-bound access
+* gdal.Footprint(): add a minRingArea option
+* fix build/install when there's a gdal-config from a pre-installed version in
+  the PATH (#8882)
+* add missing reference increment on Py_None in error case of
+  Geometry.GetPoints() (#8945)
 
-WMS driver:
- * use proper JSon parsing for ESRI MapServer document (#1416)
- * Add url parameters escaping to ArcGIS Server minidriver
- * avoid warning when a wms cache doesn't exist
+# GDAL/OGR 3.8.1 Release Notes
 
-XPM driver:
- * fix read heap buffer overflow on corrupted image. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13455.
+GDAL 3.8.1 is a bugfix release.
 
-XYZ driver:
- * add creation options DECIMAL_PRECISION and SIGNIFICANT_DIGITS like with AAIGrid
- * fix regression regarding header lines that are not X,Y,Z (#1472)
+## Build
 
-## OGR 3.0.0 - Overview of Changes
+* CMake: add gdalinfo bash-completion file to list of installed files
+* Fix build error with libxml2 2.12
+* CMake: make GDAL_USE_LIBKML and GDAL_USE_OPENJPEG honor GDAL_USE_EXTERNAL_LIBS
+* Detect failure in installation of the Python bindings
 
-Core:
- * Add OGR_G_MakeValid() (requires GEOS 3.8)
- * change prototye of OGRFeature::SetField( int iField, int nBytes, GByte *pabyData ) to ( ... , const void* pabyData), and same for OGR_F_SetFieldBinary().
- * Polyhedral surface: fix importFromWKT to properly fix Z/M flag
- * OGRBuildPolygonFromLines: avoid generating effectively duplicate points
- * OGRBuildPolygonFromEdges(): improve performance. https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13798
- * OGRGeometryFactory::transformWithOptions(): if WRAPDATELINE=YES, test that the geometry SRS is geographic
- * OGRGeometryFactory::GetCurveParameters(): fix assertion when coordinates are very near 0
- * Expat XML parsing: add OGR_EXPAT_UNLIMITED_MEM_ALLOC=YES config option to workaround failure for very specific cases
- * OGRLineString::segmentize(): fix issues when segment length is divisible by maxlength (#1341)
- * OGR SQL: limit recursion in swq_expr_node::Check(). Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13540
- * OGRGeometry / SFCGAL: fix dead code, memory leaks and potential nullptr deref.
+## GDAL 3.8.1
 
-OGRSpatialReference:
- * Deep rework due to RFC 73 integration
- * SRS_WKT_WGS84 macro replaced by SRS_WKT_WGS84_LAT_LONG
- * Add OSRSetPROJSearchPaths(), OSRExportToWktEx(), OSRGetName(), OSRIsSameEx(), OSRGetCRSInfoListFromDatabase(), OSRGetAreaOfUse(),OSRGetAxisMappingStrategy(), OSRSetAxisMappingStrategy(), OSRGetDataAxisToSRSAxisMapping()
- * Add OCTNewCoordinateTransformationOptions(), OCTCoordinateTransformationOptionsSetOperation(), OCTCoordinateTransformationOptionsSetAreaOfInterest(), OCTDestroyCoordinateTransformationOptions(), OCTNewCoordinateTransformationEx(), OCTTransform4D()
- * Remove OSRFixupOrdering(), OSRFixup(), OSRStripCTParms(), OCTProj4Normalize(), OCTCleanupProjMutex(), OPTGetProjectionMethods(), OPTGetParameterList(), OPTGetParameterInfo()
+### Port
 
-Utilities:
- * ogrinfo: report TITLE metadata in summary layer listing
- * ogr2ogr: for drivers supporting ODsCCreateGeomFieldAfterCreateLayer, do not create geometry column if -nlt none
- * ogrmerge.py: add shared='1' to speed-up -single mode with many layers
+* CSLLoad2(): remove CPLErrorReset()
 
-CARTO driver:
- * Overwrite tables in single transactions
- * Improve documentation and warnings around CARTODBFY (#1445)
+### Core
 
-CSW driver:
- * fix crash when geometry parsing fails (#1248)
+* RasterIO: fix subpixel shift when reading from overviews with non-nearest
+  resampling
+* GDALOverviewDataset::IRasterIO(): use parent dataset when possible for more
+  efficiency
 
-DODS driver:
- * fixes related to memory leaks and null pointer dereferences
+### Algorithms
 
-DXF driver:
- * support RGB true color values
- * fix the coloring of ByBlock entities inserted via a ByLayer INSERT
- * fix double-free issue in case of writing error. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13516.
+* Inverse TPS transformer: speed improvement in gdalwarp use case (#8672)
 
-FileGDB/OpenFileGDB drivers:
- * be robust when winding order of outer ring is incorrect (#1369)
+### Utilities
 
-Elasticsearch driver:
- * Fixed index comparison bug when a index have at least one mapping
- * Fix _mapping url for Elasticsearch 7 compatibility
+* gdalwarp -of COG: use target SRS from -co TILING_SCHEME when specified (#8684)
+* gdalwarp: add a heuristic to clamp northings when projecting from geographic
+  to Mercator (typically EPSG:3857) (#8730)
+* gdal_rasterize: fix inverse rasterization of polygon nested inside another
+  one. Requires GEOS enabled build (#8689)
+* gdal_footprint: fix -ovr on RGBA datasets (#8792)
+* gdal_footprint: fix wrong taking into account of alpha band (#8834)
+* gdal_footprint: fix taking into account of individual bands that have nodata
+* gdal_sieve.py/gdalattachpct.py/gdalcompare.py/gdalmove.py:
+  make sure --version and --help return 0 error code (#8717)
 
-GeoJSON driver:
- * speed-up random reading with GetFeature() by storing a map FID->(start,size) to retrieve performance similar to GDAL 2.2 or before (https://issues.qgis.org/issues/21085)
- * report 3D layer geometry types (#1495)
+### Raster drivers
 
-GeoJSONSeq driver:
- * be more robust to invalid objects, and fixes performance issue on corrupted files. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13770.
+BSB driver:
+ * fix opening datasets with errant 0x1A character in header (#8765)
 
-GML driver:
- * write SRSName element in .gfs when parsing a GML file with srsName only on top-level boundedBy element (#1210)
- * Add "FeatureType" to list of suffixes recognized by XSD parser (#1313)
- * GML/WFS: add minimum support for 'hexBinary' type (as string) (#1375)
+COG driver:
+ * avoid warnings when converting from world coverage to EPSG:3857
+ * for JPEG compression, convert single band+alpha as single band JPEG +
+   1-bit mask band
+
+KEA driver:
+ * Create(): error out if passing a /vsi file. avoids crashes (#8743)
+
+MRF driver:
+ * Avoid crashes when no overviews can be generated (#8809)
+
+MSGN driver:
+ * fix memleak in error code path
+
+GeoTIFF driver:
+* multithreaded reader/writer: in update scenarios, do not force serialization
+  to disk of dirty blocks that intersect the area of interest to read (#8729)
+* SRS reader: include VertCRS name from EPSG in CompoundCRS name if there's no
+  citation geokey
+
+VRT driver:
+ * VRTSourcedRasterBand: serialize approximate statistics inside .vrt when
+   there are overviews
 
-GMLAS driver:
- * avoid null pointer dereference on some schemas
- * do not use space as separator for schema filename in XSD open option (#1452)
+## OGR 3.8.1
 
-GMT driver:
- * use file extension based detection to accept files without header (#1461)
+### Core
 
-MongoDB driver:
- * fix related to filters in GetFeature()
+* PostFilterArrowArray(): various fixes to pass libarrow full validation checks
+ (#8755)
+* Add OGRCloneArrowArray()
+* WriteArrowArray(): fix wrong taking into account of struct offset
 
-MITAB driver:
- * Add encode/decode feature labels to/from UTF-8 encoding while MIF file read/write (#1151)
- * .tab: fix deleting a feature without geometry (#1232)
- * adapt dynamically default projection bounds to false_easting/false_northing values (#1316)
- * avoid potential assertion or stack buffer overflow on corrupted .ind files. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11999
- * prevent potential infinite recursion on broken indexes. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=12739.
- * TAB_CSLLoad(): fix performance issue. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13588
- * avoid long processing on corrupted .mif files. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13152
+### Utilities
 
-MSSQLSpatial driver:
- * Add support for curve geometries (#1299)
- * Add option to expose the FID column as a feature attribute (#1227)
- * Adding improved extent queries
- * Fix extent calculation for geography type, take care of invalid geometries
+* ogr2ogr: fix GPKG to shapefile with the -preserve_fid flag (#8761,
+  3.8.0 regression)
+* ogr2ogr: fix GPKG -> Shapefile when field names are truncated (#8849,
+  3.8.0 regression)
 
-NGW driver:
- * Fix get children API. Add authorization support to create dataset options
- * Add support for feature extensions in OGRFeature native data
- * Add feature query via chunks, attribute and spatial filter support
- * Add resource type and parent identifier to metadata
- * Fix batch update features
- * Add JSON_DEPTH open option
- * Add check forbidden field names, check duplicate field names.
+### Vector drivers
 
-OCI driver:
- * Add MULTI_LOAD to open options (#1233)
- * Fix memory leaks
+Arrow/Parquet driver:
+ * use OGRCloneArrowArray() for safer filtering
 
-ODS driver:
- * allow opening tables with empty cells with huge values of columns-repeated attribute at end of line (#1243)
- * avoid potential null pointer dereference when writing to corrupted filename. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=12976.
+CSV driver:
+ * CSV writer: do not quote integer fields by default (only if
+   STRING_QUOTING=ALWAYS is specified)
 
-OGDI driver:
- * switch incorrect order for east/west bounds of spatial filter
+GML driver:
+ * SaveClasses(): fix memleak in error code path (ossfuzz#63871)
 
-PDS4 driver:
- * add read/write support for tables (vector support)
+GPKG driver:
+ * fix SetFeature()/UpdateFeature()/DeleteFeature() on views with INSTEAD OF
+   triggers (#8707)
+ * sqlite_rtree_bulk_load.c: fix memleak in error code path
+ * fix adding field comments after alternative name
+ * Add a OGRPARSEDATE_OPTION_LAX option to OGRParseDate() and use it when
+   reading GPKG files (#8759)
+ * fix GetNextArrowArray() when there are more than 125 columns (affects
+   ogr2ogr from such GPKG) (#8757)
 
-PGDump driver:
- * in WRITE_EWKT_GEOM=YES non-default mode, export geometries to ISO WKT so as to be able to export XYZM (#1327)
- * Fix emitted SQL when UNLOGGED=ON
+GPX driver:
+ * make detection of extensions element more robust (#8827)
 
-PLScenes driver:
- * update plscenesconf.json with SkySatCollect and add missing fields for PSOrthoTile
+OAPIF driver:
+ * add INITIAL_REQUEST_PAGE_SIZE open option (#4556)
 
-SDTS driver:
- * error out if too many errors are raised to avoid timeout in oss-fuzz. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13819.
+PMTiles driver:
+ * avoid undefined-shift when zoom level is too big (ossfuzz#64234,
+   ossfuzz#64404)
 
-Selafin driver:
- * avoid null pointer dereference on corrupted files. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=12356.
+S57 driver:
+ * stricter dataset identification to avoid recognize S-101 datasets we don't
+   handle
 
 Shapefile driver:
-* DeleteLayer(): make it delete .cpg, .sbn, .sbx, .qpj and other sidecar files (#1405)
- * speed-up creation of lots of fields with name collisions. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13065
+ * fix spurious warning when reading polygons (#8767)
+ * recognize '      0' as a null date
+ * fix writing an invalid "0000/00/00" date
 
 SQLite driver:
- * set sqlite3_busy_timeout, handle SQLITE_BUSY during tile read (#1370)
- * close database before freeing the spatialite context. Fix crashes on dataset closing, with VirtualShape and recent spatialite versions
- * Spatialite: fix update of geometry_columns_statistics when extent goes to infinity (#1438)
+ * fix SRS retrieval of a SELECT layer from a non-Spatialite DB with a point
+   geometry column (#8677)
 
-S57 driver:
- * avoid long procession on corrupted datasets. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13238
+## Python bindings
 
-SXF driver:
- * Fix wrong EPSG codes range (#1278)
- * Fix memory leaks in SetVertCS()
+* GetArrowStreamAsNumPy(): fix missing offset when reading fixed size list of
+  string
+* Fix installation issue with Python 3.12 on Debian
+* Python bindings: add a combineBands option to gdal.Footprint()
 
-VFK driver:
- * fix curved geometries being ignored (#1351)
+# GDAL/OGR 3.8.0 Releases Notes
 
-WFS3 driver:
- * handle paging with missing type for rel:next, and better deal with user:pwd in URL
- * use 'id' attribute of collection items, if 'name' not available
+GDAL/OGR 3.8.0 is a feature release.
+Those notes include changes since GDAL 3.7.0, but not already included in a
+GDAL 3.7.x bugfix release.
 
-## SWIG Language Bindings
+## In a nutshell...
 
-All bindings:
- * add Geometry::MakeValid()
+* Add [JSONFG](https://gdal.org/drivers/vector/jsonfg.html) read/write vector
+  driver for OGC Features and Geometries JSON.
+* Add [PMTiles](https://gdal.org/drivers/vector/pmtiles.html) read/write vector
+  driver for PMTiles v3 datasets containing MVT PBF tiles
+* Add [S102](https://gdal.org/drivers/raster/s102.html) raster read-only driver
+  for S-102 bathymetric products (depends on libhdf5)
+* Add [gdal_footprint](https://gdal.org/programs/gdal_footprint.html) utility:
+  compute the footprint of a raster file, taking into account nodata/mask band,
+  and generating polygons/multipolygons corresponding to areas where pixels are
+  valid (#6264)
+* Python bindings: various enhancements to reduce the number of "gotchas"
+  related to inter-object ownership relationships, and a few syntaxic sugar
+  enhancements
+* Arrow interface: improve spatial and attribute filtering on read side;
+  add write side with OGRLayer::WriteArrowBatch()
+* GeoPackage: much faster spatial index creation (~ 3-4 times faster)
+* ARG driver deprecated: will be removed in 3.9.0
 
-Python bindings:
- * fix Dataset.ReadAsRaster() on CInt16 data type (#82)
- * adding overviewLevel option to WarpOptions
- * add noGCP options to gdal.Translate()
+## Backward compatibility issues
 
-# GDAL/OGR 2.4.0 Release Notes
+See [MIGRATION_GUIDE.TXT](https://github.com/OSGeo/gdal/blob/release/3.8/MIGRATION_GUIDE.TXT)
 
-## In a nutshell...
+## New optional dependencies
 
- * New GDAL drivers:
-   - BYN: read/write support for Natural Resources Canada's Geoid binary format
-   - EEDAI: read-only driver for Google Earth Engine Data API
-   - IGNFHeightASCIIGrid: read-only driver to read IGN-France height correction ASCII grids
-   - NGW: NextGIS Web read-only driver
-   - NTv1: read-only driver for NTv1 datum shift grids
- * New OGR drivers:
-   - EEDA: read-only driver for Google Earth Engine Data API
-   - GeoJSONSeq: read/creation support of new-line or record-separator separated GeoJSON features (#378)
-   - NGW: NextGIS Web read-write driver
- * Improved drivers:
-   - BAG: add read support for variable-resolution grids, and write support for single-resolution grids
-   - GTiff driver: add Lerc and WebP codecs
-   - PostgisRaster: add support for out-db rasters
-   - RMF
-   - MSSQLSpatial
- * RFC 72: Make GDAL Python autotest suite use pytest framework
- * Add /vsihdfs/ virtual file system handler for Hadoop File System (via libhdfs)
- * Add /vsiwebhdfs/ read-write virtual file system for Web Hadoop File System REST API
- * gdal_contour rewriting: speed optimizations and capability to compute polygon isosurfaces.
- * Remove PHP and Ruby bindings.
- * Continued code linting in C++, Python scripts, Shell scripts and autotest
+* libaec to enable CCSDS Adaptive Entropy Coding decompression in the GRIB driver
 
-## Backward compatibility issues
- * The value of COMPRESSION_ZSTD used for ZStd-in-TIFF compression has been changed. ZStd-compressed TIFF files produced by GDAL 2.3.0 will not be readable
+## Build
 
-## GDAL/OGR 2.4.0 - General Changes
+* emit better error message when a raster driver cannot be enabled
+  because of OGR_BUILD_OPTIONAL_DRIVERS=OFF
+* improve static linking for CURL and EXPAT
+* Java bindings: change default installation directory of JNI shared
+  library and control it with GDAL_JAVA_JNI_INSTALL_DIR
+* automatically enable SQLite driver if -DOGR_ENABLE_DRIVER_GPKG=ON
+* Don't use libjpeg if disabled (and libjpeg-turbo >= 3.0 available) (#8336)
+* gdal.pc generation: use CMAKE_INSTALL_INCLUDEDIR/CMAKE_INSTALL_LIBDIR for
+  includedir/libdir (#8012)
+* gdal-config: add a --plugindir switch (#8012)
 
-Build(Unix):
- * configure: error out when --enable-pdf-plugin is used with --with-libtool since frmts/pdf/GNUmakefile isn't ready for that (#556)
- * Fix compilation in C++17 mode with older ogdi headers
- * Fix the datadir in gdal.pc.
- * re-install cpl_vsi_error.h
- * update GRASS drivers to support GRASS 7.4.0 (#639, #633)
- * configure: use CXXFLAGS when CXX is used (#693)
- * GNUmakfile: fix dependency of install target (#707)
- * configure: fix 12 bit JPEG-in-TIFF support (#716)
- * configure: Remove additional '$' in front of '${CXX}' to fix ECW5 detection
- * configure: use ogdi.pc if available
- * Set minimum pkg-config version to 0.21
- * fix potential link errors when using internal libgif and internal libpng but headers of those libraries are available in the system in different versions than our internal ones (#938)
+## GDAL 3.8.0 - Overview of Changes
 
-Build(Windows):
- * nmake.opt: allow install into paths with spaces
- * MBTiles driver: fix issue in Makefile
- * Fix HDF4 Plugin build for Visual C++ (#624)
- * NMAKE: copy gdal pdb to $(LIBDIR) in libinstall target
- * NMAKE: Enable friendlier static library builds to allow an external `DLLBUILD = 0`
- * nmake.opt: allow DEBUG=0 to be set (#703)
- * Do not include DllMain() in static library builds
- * add support for JPEGLS driver
+### Port
 
-All:
- * Add support for Poppler 0.64, 0.69, 0.71
- * avoid compilation error when compiling GMT's gmtdigitize.c that defines _XOPEN_SOURCE to empty (#590)
- * Fix build against PDFium (#612)
- * Add support for MySQL 8.0
+* Add third_party/fast_float header library for fast string->double conversion
+  for CPLStrtodDelim()
+* /vsimem/: make it safe to use in multi-threaded scenarios
+* /vsimem/: implicitly create parent directories when creating file
+* CPLParseXML(): do not call CPLErrorReset()
+* CPLJSon: add setters for uint64_t
+* Add CPLJSONArray::AddNull() and CPLJSONObject constructor with primitive types
+* VSIUnixStdioHandle / VSIWin32Handle: make Close() be callable multiple times
+  to be friendly with VSIVirtualHandleUniquePtr
+* /vsicurl/: avoid the same region to be downloaded at the same time from
+  concurrent threads (#8041)
+* /vsicurl/ / /vsicurl_streaming/: recognize IGNORE_FILENAME_RESTRICTIONS=YES
+  open option to skip any extension based filtering (#8162)
+* /vsicurl/: emit warnings if invalid values of CPL_VSIL_CURL_CHUNK_SIZE and
+  CPL_VSIL_CURL_CACHE_SIZE are used (#8499)
+* /vsicurl_streaming/: implement retry strategy if GDAL_HTTP_MAX_RETRY is set
+* /vsis3_streaming/ and the like: implement ReadDir() by forwarding to
+  non-streaming filesystem (#8191)
+* IVSIS3LikeFSHandler::CopyFile(): retry with non-streaming source for more
+  robustness
+* /vsis3/ and /vsioss/: less error prone management of redirects / region
+  discovery
+* /vsiaz/: do not append trailing slash for directories deduced from
+  .gdal_marker_for_dir special file
+* /vsiaz/: implement server-side copy from /vsis3/, /vsigs/, /vsiadls/,
+  /vsicurl/ to /vsiaz
+* /vsiaz/: fix CopyObject() when source and target are both /vsiaz/ but in
+  different buckets
+* /vsiaz/: update to version 2020-12-06 for GetSignedURL(), limit to https and
+  use blob resource type
+* /vsi network file system: support r+ access under
+  CPL_VSIL_USE_TEMP_FILE_FOR_RANDOM_WRITE=YES by copying initial content of
+  remove file locally
+* VSISync() network to network: implement SyncStrategy::TIMESTAMP
+* Add VSIGetCanonicalFilename()
+* CPLvsnprintf(): deal with '%.*f' formatting
+* VSIFilesystemHandler: remove 'virtual' qualifier from ReadDir(), which now
+  forwards to ReadDirEx(); modify all implementations to implement ReadDirEx()
+* Add /vsicached? virtual file system, as another way of doing the same as
+  VSICreateCachedFile() / VSI_CACHE=YES
+* VSIFilesystemHandler::CopyFile(): detect wrong target file size w.r.t source
+  file size
+* /vsi7z/: Accept ArcGIS Pro Project Packages extension
+* cpl_vsil_win32: check return value of FlushFileBuffers(), and open file with
+  GENERIC_WRITE only if access=w or wb
+* cpl_vsil_win32: implement a WRITE_THROUGH=YEs option to pass to VSIFOpenEx2L()
 
-## GDAL 2.4.0 - Overview of Changes
+### Core
 
-Port:
- * Add multi-threaded compression to /vsigzip/ and /vsizip/
- * /vsizip/: create ZIP64 when needed
- * /vsizip/: encode filename in Unicode when needed also in local file header
- * /vsigzip/: allow seeking to beginning of file, despite decompression error
- * /vsicurl/: extend retry logic to HTTP 500 and HTTP 400 with RequestTimeout, emit a CE_Warning if code != 400 and != 404
- * /vsicurl/: fix parsing of HTML file listing that got broken in GDAL 2.3.0
- * /vsicurl/ and derived: implement a LRU cache for file properties (instead of ever growing cache)
- * /vsicurl/ and derived: implement a LRU cache for directory content listing
- * /vsicurl/: make GetCurlMultiHandleFor() more thread-safe
- * HTTP: added curl cookiefile and cookiejar variables (fixes #1000)
- * /vsioss/: fix support of filenames with spaces
- * /vsizip/: output explicit error message when encountering a unsupported file compression method
- * /vsis3/: fix VSIStatL() on a directory (#603)
- * /vsis3/: take into account AWS_CONTAINER_CREDENTIALS_RELATIVE_URI for ECS instances (#673)
- * /vsis3/: honour CPL_VSIL_CURL_ALLOWED_EXTENSIONS configuration option (#995)
- * /vsis3/: ignores files with GLACIER storage class in directory listing, unless CPL_VSIL_CURL_IGNORE_GLACIER_STORAGE=NO
- * /vsiaz/: support BlobEndpoint element in AZURE_STORAGE_CONNECTION_STRING such as found in Azurite (#957)
- * Add a VSICurlPartialClearCache(const char* filenameprefix) function to partially clear the /vsicurl/ and related caches; and bind it to SWIG
- * Add VSISync() to synchronize source and target files/directories
- * /vsitar/: support headers with fields using star base-256 coding (#675)
- * Add VSIOpenDir/VSIGetNextDirEntry/VSICloseDir and provide efficient recursive implementation for /vsis3/, /vsigs/, /vsioss/ and /vsiaz/
- * Detect Amazon EC2 instances that use the newer hypervisor. Deprecates CPL_AWS_CHECK_HYPERVISOR_UUID and replaces with CPL_AWS_AUTODETECT_EC2
- * CPLString class: rework visibility of exported symbols for Visual Studio (rework of #321) (#636)
- * CPLGetPhysicalRAM(): take into account cgroup limitation (Docker use case), and rlimit (#640)
- * CPLGetNumCPUs(): take into account cgroup limitation.
- * ODBC: Improve Fetch() error handling.
- * ODBC: get multiple ODBC error messages.
- * ODBC: Fetch wide-char strings on UNIX (#839)
- * Fix buffer overflow in GDALDefaultCSVFilename with GDAL_NO_HARDCODED_FIND (#683)
- * VSIZipFilesystemHandler::Open: Fix leaks of poVirtualHandle (#699)
- * Fix date-time formatting for /vsigs/, /vsiaz/ and /vsioss/ protocols with non-C locales
- * CPLQuadTreeGetAdvisedMaxDepth(): avoid int overflow. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9248
- * CPLJSonStreamingParser: make it error on invalid array constructs (#970)
- * Add a GDAL_HTTPS_PROXY configuration option to selectively setup proxy for https only connections (#972)
- * Add template class CPLAutoClose (#952)
- * Make VSIToCPLError() handle the generic VSIE_AWSError (#1007)
- * Propagate error handler user data correctly (#1098)
- * CPLOpenSSLCleanup(): reset callbacks to nullptr to avoid potential segfault
+* GDALIdentifyDriverEx() and GDALDriver::QuietDelete(): do not call
+  CPLErrorReset()
+* GDALDataset::Open(): take into account open options for OF_SHARED mode (#7824)
+* PAM .aux.xml: read geotransform from Esri GeodataXform.CoeffX/CoeffY elements
+ (qgis/qgis#53125)
+* Add a DCAP_FLUSHCACHE_CONSISTENT_STATE capability, and fix GeoJSON, JSONFG,
+  GPKG drivers to implement it
+* Overview/RasterIO resampling: use Float64 as working data type for Float64
+  input data (#8187)
+* Add GDALRegisterPlugins function to register all/only plugins (#8447)
+* GDALDriver::DefaultCreateCopy(): in non-strict mode, turn (ignored) errors as
+  warnings and do not silence them
+* Add a GDALPamDataset::SetDerivedDatasetName() method, and use it to be able to
+  save statistics of datasets returned by GDALMDArray::AsClassicDataset()
+* Add GDALGetSubdatasetInfo() and related functions  (#8155)
 
-Core:
- * SetStatistics(): write a STATISTICS_APPROXIMATE=YES metadata item if bApproxOK=true, and take it into account in GetStatistics() (trac #4857, trac #4576)
- * Add percentage of valid pixels to metadata when computing raster band statistics (#698)
- * Overview creation: avoid creating too many levels, and fix related heap buffer overflow (#557,#561)
- * Overview: fix wrong computation of source pixel indices for AVERAGE and pixel-interleave bands
- * Lanczos rasterio/overview/warp: do not compute target pixel if there are too many missing source pixels, to avoid weird visual effects depending on if valid source pixels match positive or negative kernel weights
- * Overview / RasterIO resampling: do not use nodata value as a valid output value
- * RawRasterBand: only accept VSILFILE*
- * Add alpha mask flag for alpha band in Uint16 One band dataset (#742)
- * GetMaskBand(): do not use a GDALNoDataMaskBand when nodata value is out of range (#754)
- * Pleiades metadata reader: Add more strict check (#431)
- * Statistics/minmax computation: on a float32 raster, be more tolerant when the nodata is slightly larger than +/- FLOAT_MAX
- * GDALNoDataMaskBand: improve performance in downsampling cases
- * GDALDestroy(): no longer call it automatically on GCC/CLang (non-MSVC) builds
- * GDALGetJPEG2000Structure(): avoid excessive memory allocation. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8268
- * Implement GDALAllValidMaskBand::ComputeStatistics(). Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9309
- * PAMDataset: avoid illegal down_cast to GDALPamRasterBand. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9358
- * GDALOpenEx(): improve anti recursion detection. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9391
- * GDALResampleChunk32R_Convolution: avoid invalid left shift. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9477
- * Gauss resampling: fix potential read heap buffer overflow in corner cases. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9783
- * GDALDefaultOverviews::OverviewScan(): avoid potential infinite recursion. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10153
- * GDALPamRasterBand::CloneInfo(): do not clone empty RAT
+### Multidimensional API
+
+* add Rename() methods. Implemented in MEM, netCDF, Zarr drivers
+* add DeleteGroup(), DeleteMDArray(), DeleteAttribute()
+  methods. Implemented in MEM, netCDF (for attributes) and Zarr drivers
+* GDALDatasetFromArray: fix write/update support
+* GDALMDArrayMask: take into account attributes at construction time
+* GetMask(): add a UNMASK_FLAGS option
+* GDALMDArray::ComputeStatistics(): add option to set actual_range in netCDF
+  and Zarr when computing statistics
+* GDALMDArray::AsClassicDataset(): add a LOAD_EXTRA_DIM_METADATA_DELAY option,
+  and expose it in Zarr driver
+* GDALMDArray::AsClassicDataset(): allow to map band indexing arrays as band
+  metadata items with BAND_METADATA option
+* Add GDALGroup::SubsetDimensionFromSelection()
+
+### Algorithms
+
+* Warp average resampling: using Weighted incremental algorithm mean for numeric
+  stability
+* Warper: auto-enable OPTIMIZE_SIZE warping option when reasonable (#7761)
+* Geoloc transformer: warn if the input dataset is larger in width or height
+  compared to the geoloc array (#7751)
+* GDALCreateGenImgProjTransformer2(): deal with discontinuity of GCPs around
+  antimeridian (#8371)
+* TPS transformer: use an iterative method to refine the inverse transformation
+  (#8572)
+
+### Utilities
+
+* gdaladdo: add options to partially refresh existing overviews:
+  ``--partial-refresh-from-source-timestamp,``,
+  ``--partial-refresh-from-projwin <ulx> <uly> <lrx> <lry>``,`
+  ``--partial-refresh-from-source-extent <filename1,...,filenameN>``
+* gdal_translate: emit warning when -a_scale/-a_offset + -unscale is specified
+ (#7863)
+* gdal_translate: GTiff, COG, VRT, PNG and JPEG drivers recognize
+  COPY_SRC_MDD=AUTO/YES/NO and SRC_MDD=domain_name creation options
+* gdal_translate: add -a_gt option to assign geotransform (#8248)
+* gdal_translate -scale: change dstMax value from 255.999 to 255
+* gdal_translate: when specifying -srcwin, preserve source block size in the
+  temporary VRT if srcwin top,left is a multiple of the block size
+* gdalwarp: in -tr mode (without -ts / -te), detect blank edge lines/columns
+  before warping and remove them (#7905)
+* gdalwarp: fix cutline processing when warping with a cutline geometry in UTM
+  1/60 crossing the antimeridian, on a raster in long/lat SRS (#8163)
+* gdalwarp: tune usage to allow both -s_coord_epoch and -t_coord_epoch
+* gdalwarp: fix error when using -ct and -cutline (master only), and actually
+  use the -ct when possible if sourceCRS != targetCRS and targetCRS == cutlineCRS
+* gdalwarp: do not enter a specific COG optimized code path when some of its
+  preconditons are not met (#8655)
+* gdalmdiminfo: output details of indexing variables that can be accessed only
+  from the array (typically for TileDB dimension labels)
+* nearblack: add "-alg floodfill" to select a flood fill algorithm, to address
+  concave areas.
+* gdalmdimtranslate: add support for resample=yes array spec option
+* gdalbuildvrt: make -separate option process all bands of input datasets,
+  unless -b is specified (#8584)
+* gdal_polygonize: add a -overwrite switch (#7913)
+* gdal_rasterize_lib: fix error messages
+* gdaltransform: add -s_coord_epoch and -t_coord_epoch
+* gdalcompare.py: multiple enhancements and new command line options
+* gdal_pansharpen.py: avoid error trying to generate relative path
+* Add validate_geoparquet.py sample Python script
+* gdalinfo.py: use math.isnan() (#8196)
+* gdalinfo.py: fix wrong order of long,lat corner coordinates (#8199)
+* make --help and --help-general available in all utilities (#3816)
 
-Algorithms:
- * OpenCL wrapper: fix memory leak
- * Warper: add complex nodata handling in average/min/max modes
- * TPS solver: improve numerical stability, for non Armadillo builds, for points not centered on (0,0)
- * GCP polynomial interpolation: fix bug where worst_oultier always assumed polynomial order 2
- * GCP polynomial interpolation: fix bug where remove_ouliers used the parameters of the reverse transformation
- * GDALGridLinear(): speed-up search of triangle for points outside of the triangulation
- * gdal_grid linear: avoid artifacts with degenerate triangles (#638)
- * GDALPansharpenOperation::Initialize(): validate value of GDAL_NUM_THREADS (CID 1393944)
- * GDALFillNodata(): add NODATA option
- * GDALDEMProcessing(): fix null pointer dereference if psOptionsIn == nullptr (#931)
+### Raster drivers
 
-Utilities:
- * gdal_translate: make -stats option work with -co COPY_SRC_OVERVIEWS=YES (#792)
- * gdal_translate: fix RPC correction when using -srcwin with negative offsets (#827)
- * gdalwarp: automatically enable SKIP_NOSOURCE=YES when it is safe to do so
- * gdalwarp: make -crop_to_cutline stick to source pixel boundaries when no raster reprojection is involved, to avoid unnecessary resampling or resolution change
- * gdalwarp -r average: better deal with south-up oriented datasets (#778)
- * gdalwarp: improve robustness of computation of source raster window for a given target raster window (#862)
- * gdalwarp: allow to create bottom-up grid with -te xmin ymax ymin ymin
- * gdalwarp: fix crash when warping on an existing dataset with less bands as needed
- * gdal_contour: speed optimizations and capability to compute polygon isosurfaces.
- * gdal_contour: add amin and amax parameter for gdal_contour to be used with option -p
- * gdal_contour: avoid out-of-memory situation (#594)
- * gdal_contour: fix GDAL 2.3 regression with fixed interval contouring that resulted in discontinuities in contour lines (#889)
- * gdal_merge.py: deal with NaN values
- * gdal_retile.py: fix rounding issues when computing source and target regions (#670)
- * gdal_calc.py: add --optfile switch
- * gdal2tiles: fix wrong computation of min zoom level in some cases (#730)
- * gdal2tiles: add -x option for skipping transparent tile generation
- * gdal2tiles: fix performance issue by caching source dataset; GDALAutoCreateWarpedVRT()
- * gdal2tiles: fix issue with out-of-range nodata values (#770)
- * gdal2tiles: restore GDAL < 2.3 behavior when output directory is not explicitly specified (#795)
- * gdal2tiles: fix --force-kml (#809)
- * gdal_edit.py: add -setstats to set "fake" statistics (#819)
- * gdal_edit.py: add -unsetrpc option to gdal_edit.py, and fix GTiff driver to be able to clear RPC
- * gdal_grid: fix -clipsrc from a vector datasource (broken at least since GDAL 2.1)
- * gdalenhance: avoid potential nullptr dereference (CID 1394096)
- * make sure that --config is early evaluated for config options such as CPL_VSIL_CURL_CHUNK_SIZE that are read early
+AAIGRID driver:
+ * writing: remove leading space on each line (#8344)
 
-Multi driver changes:
- * HFA and KEA: better support for writing RATs (trac #4903)
- * Fix creation of large enough datasets with drivers EHdr, ENVI and ISCE that failed due to inappropriate check on file size whereas the file wasn't filled yet (#705, 2.3.0 regression)
+ARG driver:
+ * mark it deprecated, removal planned for GDAL 3.9 (#7920)
 
 BAG driver:
- * avoid warnings when reading georeferencing
- * get datetime
- * safer retrieval of variable extents
- * add read support for variable-resolution grids, and write support for single-resolution grids
-
-E00GRID driver:
- * correctly parse projection sections that have lines with tildes (#894)
+ * increase the efficiency of getting depth&uncertainty values from the
+   refinement grids
+ * use low-resolution grid as the last overview level in MODE=RESAMPLED_GRID
+ * add a MODE=INTERPOLATED mode using mostly bilinear interpolation of the
+   refinement grid nodes
 
-EHdr driver:
- * only write .stx if bApproxOK=false (#514)
+COG driver:
+ * only update mode if the IGNORE_COG_LAYOUT_BREAK=YES open option is specified
+   (#7735)
+ * add a STATISTICS=AUTO/YES/NO creation option and forward gdal_translate
+   -stats to it (#8169)
+ * Lerc: add a MAX_Z_ERROR_OVERVIEW creation option to separately control the
+   error threshold of overviews w.r.t the one of the full resolution image
 
 ENVI driver:
- * support reading truncated datasets (#915)
-
-ERS driver:
- * fix quadratic performance in parsing .ers header. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8404
- * avoid excessive memory allocation. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8497
- * avoid potential stack overflow. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8614
- * prevent infinite recursion. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8744
- * avoid potential bad cast. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8745
-
-FIT driver:
- * avoid excessive block size on creation. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8292
- * error out in CreateCopy() on failed I/O on source dataset. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8338
-
-GeoRaster driver:
- * Fix the issue by freeing the temporary lobs created by readCLob() and writeCLOB().
+ * warn if assigning different nodata value to different bands
+ * support Int64 and UInt64
 
-GPKG driver:
- * fix memleak if I/O error occurs on write
- * retrieve original raster file when using gdal_translate -co APPEND_SUBDATASET=YES with other gdal_translate switches
- * copy source metadata when using TILING_SCHEME
- * properly delete gridded coverage raster layers
+ESRIC driver:
+ * Implement ESRI Tile Package (.tpkx) support (#7799)
 
 GRIB driver:
- * replace DataSource and derived classes with VSILFILE directly for > 4GB file support on Windows
- * turn printf() warning as CPLDebug() messages
- * read and write missing data values correctly for complex packing when original data is integer (#1063)
- * g2clib: avoid int overflow. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8194
- * g2clib: avoid potential out of bound access (CID 1393528)
- * degrib: fix floating point division by zero. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9407.
- * degrib: avoid potential floating point division by zero. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10291
- * add UNIT[] node to SRS on reading, so that is valid
+ * allow opening files with invalid Earth of shape (#7811)
+ * implement CCSDS Adaptive Entropy Coding decompression. Requires libaec (#8092)
+ * only emit a CPLDebug() instead of a message on stdout when there are trailing
+   bytes (#8574)
+ * GRIB2 SRS writing: add support for Rotated LatLong grids (fixes #8536)
 
 GTiff driver:
- * Add TIFF Lerc codec (in GTiff driver itself)
- * Add TIFF WebP codec (in libtiff)
- * save XMP on field TIFFTAG_XMLPACKET (#767)
- * fix retrieving mask band of overview band when the mask is external. Fixes -co COPY_SRC_OVERVIEWS=YES of such datasets (#754)
- * improve progress report in CreateCopy() when there is a mask (#935)
- * improve performance reading multi-band 1-bit data. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7840.
- * internal libtiff: updated to libtiff 4.0.10
- * internal libgeotiff: resync with upstream.
- * workaround bug in currently released libgeotiff versions, where when rewriting a ASCII key with a string value longer than the original value (#641)
- * allow the use of PREDICTOR with ZSTD compression
- * avoid various memory corruptions in case of some corrupted file. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8488
- * load PAM if not already done when GetDefaultRAT() is called
- * fix missing #ifdef causing compilation failure due to missing bTryCopy (#946)
-
-HDF4 driver:
- * quote swath and field names if needed (if they contain spaces, column, quotes) in HDF4_EOS subdataset names
+ * Performance improvement: avoid using block cache when writing whole blocks
+   (up to about twice faster in some scenarios)
+ * GTiff multi-threaded reader: catch errors emitted in worker threads and
+   re-emit them in main thread
+ * Internal libtiff: WebP codec: turn exact mode when creating lossless files
+   to avoid altering R,G,B values in areas where alpha=0 (#8038)
+ * Lerc: add a MAX_Z_ERROR_OVERVIEW creation option to separately control the
+   error threshold of overviews w.r.t the one of the full resolution image
+ * SRS writer: write Projected 3D built as a pseudo-compound in .aux.xml
+ * Internal libtiff and libgeotiff: resynchronization with upstream
 
 HDF5 driver:
- * add VSI functionality (#786)
- * fix reading variable names with single character (#622)
- * fix HDF5 object leak (thus preventing file closing) on datasets with variable length attributes (#933)
-
-HFA driver:
- * fix floating point division by zero. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9201
- * fix division by zero. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10190
-
-HTTP driver:
- * do not immediately delete a file used by the JP2OpenJPEG driver
-
-ILWIS driver:
- * Fix performance issue on creation with big number of bands. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9062
-
-IRIS driver:
- * add UNIT[] node to SRS on reading, so that is valid
- * avoid infinite loop. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8256 and 8439
-
-ISCE driver:
- * do not try to stat() mainfile.xml if mainfile does not exist
-
-ISIS3 driver:
-
-FITS driver:
- * allow reading/writing beyond 2 billion pixels limit
+ * optimize code-paths for RasterIO() without resampling
+ * multidim: speed-up very slow cases of IRead()
 
-JP2OpenJPEG driver:
- * allow YCC for non-Byte datasets; and allow 4-band MCT with openjpeg >= 2.2
- * add CODEBLOCK_STYLE creation option for OpenJPEG >= 2.3
- * add support for generating and using external overviews
+ISG driver:
+ * make it able to read headers > 1024 bytes
+ * take into ISG format 2.0
 
 JPEG driver:
- * slightly improve performance of whole RGB image loading with pixel-interleaved buffer
- * Internal libjpeg: Avoid integer overflow on corrupted image in decode_mcu_DC_first() (https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9447)
-
-JPEGLS driver:
- * Add support for CharLS 2 (#632)
+ * allow QUALITY down to 1
+ * redirect JPEG 'output message' to GDAL debug messages
+ * only take into account first Exif directory found
 
-MRF driver:
- * Add TestBlock(), skip empty areas when building overviews
- * Fix detection of Lerc2 data
- * Resync with upstream LercLib and put it in third_party/LercLib
+MBTiles driver:
+ * Add WEBP support (#8409)
 
-NetCDF driver:
- * add VSI functionality on Linux (#786)
- * add support for longitude values wrapping at 180deg of longitude (#1114)
- * avoid use of uninitialized variable when reading blocks in creation mode
+MEM driver:
+ * allocate a single buffer for band-interleaved data
 
-NGSGEOID driver:
- * report a CRS that conforms to the official publications for GEOID2012 and USGG2012 datasets (#1103)
+netCDF driver:
+ * on reading, set NETCDF_DIM_xxx band metadata items in on-demand way (helps
+   with network accesses)
+ * do not set NETCDF_DIM_xxxx_VALUES dataset metadata items for variables of
+   unlimited dimensions on network access for performance reasons
+ * better error message when reading from /vsi is not possible (#8398, #8378)
+ * renormalize CRS and geotransform to metric, typically for EUMETSAT OSI SAF
+   products. Add a PRESERVE_AXIS_UNIT_IN_CRS=YES/NO open option
+ * add support for EMIT band data ordering and geolocation array (
+   using glt_x/glt_y for multidimensional API)
 
 NITF driver:
- * avoid excessive processing time on corrupted files. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8972
- * avoid heap-buffer-overflow for VQ compression. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9467
-
-PCIDSK driver:
- * add back support for creating external overviews, removed years ago when switching to the new PCIDSK SDK (#887)
+ * add support for CSCSDB (Common Sensor Covariance Support Data) DES from
+   GLAS/GFM SDEs
 
-PCRaster driver:
- * libcsf: avoid potential out of bound access (CID 1074445)
+OpenFileGDB raster:
+ * add support for FileGDB v9 raster datasets
+ * add a RASTER_DATASET metadata item with the name of the RasterDataset (#8427)
 
 PDF driver:
- * Remove forced use of libstdc++ for macOS when building plugin (#888)
-
-PDS driver:
- * deal with detached labels whose line spacing is not a multiple of record size (#955)
- * add support for reading CRISM images
- * add support for ^QUBE = number for multi-band images
-
-PDS4 driver:
- * fix georeferencing reading/writing to use pixel corner convention (#735)
- * add UNIT[] node to SRS on reading, so that is valid
-
-PostgisRaster driver:
- * add support for out-db rasters (Trac #3234)
- * use ST_BandFileSize of PostGIS 2.5 when available for outdb_resolution=client_side_if_possible
- * improve performance of line by line reading; add performance hints section in the doc
- * fix CreateCopy() when PostGIS is not in public schema
- * add quoting of identifiers
+ * PDFium backend: update to support (and require) PDFium/5952
+ * Poppler backend: implement overviews by adjusting the DPI value (#8233)
+ * PoDoFo backend: add support for PoDoFo >= 0.10.0 (#8356)
+ * increase threshold to detect tile size and band count (#8236, #8240)
+ * Various robustness fixes
 
 PRF driver:
- * Fix Photomod x-dem files georeference
-
-RasterLite2 driver:
- * fail on Create() that is not supported
-
-RDA driver:
- * enable support for DG RDA Image Reference string
-
-RMF driver:
- * Add support JPEG compressed RMF datasets (#691)
- * Add optional projection import/export from EPSG code (#701)
- * Create compressed datasets: LZW, DEM, JPEG (#732)
- * Cache decoded tile to improve performance of interleaved access
- * Parallelize data compression, add internal tile write-cache, add compressed overviews support (#748)
- * Fix 4-bit dataset reading
- * Expose NBITS to metadata
-
-RS2 driver:
- * avoid potential memleak (CID 1393537, CID 1393534, CID 1074387)
-
-SENTINEL2 driver:
- * Add support of S2x_MSIL2A files (#1069)
-
-SGI driver:
- * writer: avoid out-of-bound buffer access. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8889
-
-SIGDEM driver:
- * be more robust against excessive memory allocation attempt
- * avoid floating point division by zero. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11220
-
-SDTS driver:
- * avoid long processing time on corrupted dataset. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11219
+ * add associated PRJ file read
 
-SRP driver:
- * ASRP/USRP: allow opening files padded with 0x5E / ^ character without emitting error (#838)
+Sentinel2 driver:
+ * additional metadata (#8379)
 
-USGSDEM driver:
- * fix reading of Benicia.dem and Novato.dem (trac #4901, #583)
- * optimize I/O access a bit
- * avoid potential out-of-bounds access (CID 1393532)
- * avoid int overflow. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9475
+TileDB driver:
+ * add read/write multidimensional support (requires libtiledb >= 2.15)
+ * TileDBRasterBand::IRasterIO(): use correct band indexing
+ * read/write Int8, Int64 and UInt64
+ * add capability to read arbitrary (i.e. not created by GDAL) 2D/3D dense
+   array (provided it uses uint64 dimension)
+ * Add support for TileDB 2.17
 
 VRT driver:
- * GDALCreateWarpedVRT(): automatically set GCI_AlphaBand on the alpha band
- * data/gdalvrt.xsd: add GDALRasterAttributeTable (#818)
- * VRTComplexSource: make sure that min and max values in case of exponential resampling are properly computed
- * ComputeStatistics(): optimize when nodata is set on a single SimpleSource
- * Fix issue when opening VRT with large number of bands (#1048)
- * deal with serialized nodata value that is slightly outside Float32 validity range (#1071)
- * fix source window computation that caused sub-pixel shift with non-nearest resampling
- * fix potential int overflow on invalid VRT
+ * add `norm_diff` (#8081), `min` and `max` pixel functions (#8292)
+ * ignore <OverviewList> when external .vrt.ovr is present, as documented and
+   intended
+ * vrt:// connection string: add `projwin`, `projwin_srs`, `tr`, `r`,
+   `srcwin`, `a_gt`, `oo`, `scale`, `unscale`, `a_coord_epoch`, `nogcp`, `eco`,
+   `epo`
+ * VRTComplexSource (scaling typically): make sure to take into account
+   constraints from VRTRasterBand data type in RasterIO() (rather than just
+   taking into account output buffer data type)
+ * IRasterIO(): avoid edge effects at sources boundaries when downsampling with
+   non-nearest resampling
+ * VRTMDArraySourceFromArray: fix taking into account relativeToVRT=1
+ * allow a <ArraySource> element containing a 2D multidimensional array as a
+   VRTRasterBand source and through the use of a <DerivedArray> make it possible
+   to create a 2D array from a 3D or more multidimensional one, by slicing,
+   transposing, resampling, gridding, etc.
+ * VRTComplexSource: perf improvement: add specialization when only NODATA for
+   Byte/UInt16/Int16 data types
+ * VRTSimpleSource::GetFileList(): do not issue a stat() as it may be slow on
+   network drives
+ * VRTSourcedRasterBand::GetMinimum/GetMaximum(): limit to 1 second max when
+   iterating over sources
+ * VRTSourcedRasterBand::GetMinimum/GetMaximum(): use STATISTICS_MINIMUM/MAXIMUM
+   metadata first
 
 WCS driver:
- * Parse envelopes with time periods. Improve error reporting. Fix one SUBDATASETS metadata thing. More metadata from Capabilities to metadata. Print some URLs in debug mode. Unique subset params in URLs. Add time domain interval to metadata.
- * GeoServer does not like primary subsets to have postfixes. Fix service dirty issue. Add GeoServer TimeDomain coverage metadata. Do not put service parameter into subdataset name and use generic coverage parameter
- * deal with GDALPamDataset::GetMetadata returning nullptr. (#648)
+ * remove non-standard 'FORMAT' parameter from 'DescribeCoverage' requests
+   (#8381)
 
-WMTS driver:
- * avoid issue with reprojection of layer extent into TileMatrixSet SRS
- * fix issue with inappropriate zoom level being selected causing integer overflow in raster dimension computation
- * fix potential off-by-one pixel when compositing the underlying WMS/TMS source into the final raster
+Zarr driver:
+ * allow update support in classic mode
+ * Zarr V3: update to current specification (breaks backward compatibility)
+ * implement GDALDriver::Rename(), Delete() and CopyFiles()
+ * ignore filename restrictions when reading tile data files (#8162)
+ * add MULTIBAND=YES/NO, DIM_X and DIM_Y open options (#8237)
+ * classic raster API: write multi-band datasets as Zarr 3D arrays (writing
+   them as several 2D arrays as in GDAL 3.7 can be asked with the
+   SINGLE_ARRAY=NO creation option)
+ * fix writing partial tiles
 
-## OGR 2.4.0 - Overview of Changes
+## OGR 3.8.0 - Overview of Changes
 
-Core:
- * Add JSON field subtype for String fields
- * OGR SQL: avoid int overflow on -(-9223372036854775808) evaluation. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8717
- * OGR SQL: evaluation modulo operator on floating point values as a floating point modulo. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8761.
- * OGR SQL: swq_expr_node::Evaluate(): avoid too deep recursion. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8836
- * OGRLineString::TransferMembersAndDestroy(): fix crashing issue with M component. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8773.
- * OGRGeometry::exportToGEOS(): fix potential out-of-bounds write on some GeometryCollection with TIN/PolyhedralSurface (#688)
- * OGRGeometryFactory::organizePolygons(): improve performance for polygons with many consecutive identical nodes. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9618
- * Fix IsValid() for a TRIANGLE with GEOS, but without SFCGAL
- * morphToESRI(): fix a heap user-after-free.
- * OGRFeature::SetField( int iField, const char * const * papszValues ): avoid potential invalid access to pauFields[iField].StringList.paList
- * SQLite dialect: fix when ROWID is used in WHERE clause and the source layer has a real FID column name
- * GML geometry parser: recognize MultiGeometry.geometryMembers syntax (refs https://issues.qgis.org/issues/19571)
- * OGRGetXMLDateTime(): Interpret TZFlag correctly (#996)
- * OGRFeatureStyle: Restore font field at OGRStyleSymbol
+### Core
 
-OGRSpatialReference:
- * importFromEPSG(): append ' (deprecated)' at end of deprecated GCS and GEOCCS (#646)
- * ogr_opt.cpp: fix wrong values and add missing values in papszProjectionDefinitions[]
- * importFromProj4/exportToProj4: fix typo in the PROJ method name of InternalMapOfTheWorldPolyconic which is imw_p
- * Krovak: explicit that alpha and Pseudo_standard_parallel_1 are hardcoded in PROJ
- * SetNormProjParm(): avoid division by zero. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10588
- * FindMatches(): if the input SRS has a EPSG code, check that its definition and the EPSG one actually matches (#990)
+* exportToGEOS(): do not drop M dimension with GEOS >= 3.12
+* Add OGR_G_IsClockwise() and map it to SWIG
+* core and ogr2ogr: add logic so that ogr2ogr can try a driver specific
+  implementation of GDALVectorTranslate()
+* OGRParseDate(): restrict valid times to HH:MM:SS(.sss) with at least 2 figures
+  (#8150)
+* Add OGR_F_DumpReadableAsString
+* ArrowArray interface: make PostFilterArrowArray() deal with attribute filter,
+  and enable that in Parquet&Arrow drivers
+* OGRLayer::GetArrowStream(): do not issue ResetReading() at beginning of
+  iteration, but at end instead, so SetNextByIndex() can be honoured
+* ArrowStream interface: make TIMEZONE="unknown", "UTC", "(+|:)HH:MM" or any
+  other Arrow supported value as an option of the generic implementation
+* Add OGRLayer::WriteArrowBatch()
+* ArrowArray: implement fast 'FID IN (...)' / 'FID = ...' attribute filter in
+  generic GetNextArrowArray(), and use it for FlatGeoBuf one too (when it has a
+  spatial index) (#8590)
+* GetArrowStream(): support a GEOMETRY_METADATA_ENCODING=GEOARROW option (#8605)
+* GetNextArrowArray() implementations: automatically adjust batch size of list/
+  string/binary arrays do not saturate their capacity (2 billion elements)
+* OGRGeometry classes: add addGeometry()/addRing()/addCurve() methods accepting
+  a std::unique_ptr
+* OGRLineString/Polygon/MultiPolygon/MultiLineString: make it possible to run
+  importFromWkb() on the same object and limiting the number of dynamic memory
+  (re)allocations
+* organizePolygons: Remove handling of nonpolygonal geometries
+* OGRGeometryFactory::transformWithOptions() WRAPDATELINE=YES: remove heuristics
+  about points exactly at +/- 180 (#8645)
+* gml2ogrgeometry: reject empty <gml:Triangle/>
+* OGRGF_DetectArc(): harden tolerance when detecting consecutive arcs to avoid
+  incorrect arc center computation (#8332)
+* OGR SQL: allow MIN() and MAX() on string fields
+* SQLite dialect: when the underlying layer has a FID column name, enable the
+  user to use it as an alias of ROWID
+* SQLite dialect: error out with explicit message on unsupported commands (#8430)
+* Add OGRFieldDefn::GetTZFlag()/SetTZFlag(), and OGR_TZFLAG_ constants
+* GDALDataset::ICreateLayer(): now takes a const OGRSpatialReference* instead of
+  a OGRSpatialReference*. Affects out-of-tree drivers (#8493)
+* OGR Python drivers: support WKB geometries
 
-Utilities:
- * ogr2ogr: reject -append, -select options together
- * ogr2ogr: speed-up in case of big number of field name clashes. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8960
- * ogr2ogr: make -clipsrc work when output dataset has no geometry field (#943)
- * ogrlineref: fix tolerance for not geographic spatial reference
- * ogrmerge.py: avoid exception in error code path of GetOutputDriverFor()
- * ogrmerge.py: fix issue with non-ASCII characters (fixes #1067)
+### OGRSpatialReference
 
-Multi driver changes:
- * KML/LIBKML: robustify for out-of-memory conditions (fixes https://issues.qgis.org/issues/19989)
- * XLSX / ODS: avoid harmless warning in some cases when guessing column data types
+* Add OGRCoordinateTransformationOptions::SetOnlyBest() /
+  OCTCoordinateTransformationOptionsSetOnlyBest() (#7753)
+* OGRProjCT::Transform(): do not emit generic error message if a specific one
+  has already been emitted
+* SetFromUserInput(): add support for urn:ogc:def:coordinateMetadata (PROJ >=
+  9.4)
+* SetFromUserInput(): recognize 'EPSG:XXXX@YYYY' (PROJ >= 9.4)
+* Add OSRHasPointMotionOperation() (PROJ >= 9.4)
+* OGR_CT: handle point motion operations (PROJ >= 9.4)
 
-AVCE00 driver:
- * avoid perforance issues on huge lines. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8284
- * fix performance issue on reading PRJ section. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9061
+### Utilities
 
-BNA driver:
- * refuse to open existing file in update mode, since it causes later crashes when attempting to add new features (https://issues.qgis.org/issues/18563)
- * avoid long processing. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8754
- * more efficient building of polygons. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10951
+* ogrinfo: speed-up string concatenation
+* ogrinfo: add support for DateTime field domains
+* ogrinfo: emit distinct error message if the file doesn't exist or can't be
+  opened (#8432)
+* ogrinfo: output timezone flag
+* ogr2ogr: calls FlushCache() (#8033)
+* ogr2ogr: tune usage to allow both -s_coord_epoch and -t_coord_epoch
+* ogr2ogr: better deal when reprojecting curve geometries to a non-curve
+  geometry type (#8332)
+* ogr2ogr: use Arrow interface in reading and writing when possible
+* make -select '' work (or gdal.VectorTranslate(selectFields=[]))
 
-CAD driver:
- * Fix read objects map. Upgrade version of libopencad to 0.3.4. (#677)
- * Fix wrong OGRCircularString construction from CADCircle. (#736)
- * avoid integer overflow. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8385
- * Fix buffer overflow on skip read. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9107
+### Vector drivers
 
-Carto driver:
- * Use new /sql/copy-from end point for writing (#715)
- * fix ICreateFeatureCopy() with unset fields
+Arrow/Parquet driver:
+ * emit ARROW:extension:name=ogc.wkb in Feature field metadata, and return it
+   also through GetArrowStream() for Parquet
+ * implement faster spatial filtering with ArrowArray interface
+ * optimize attribute filter on FID column
+ * support/reading nested list/map datatypes as JSON
+ * implement full spatial filtering (not just bbox intersection)
+ * reading and writing: use field TZFlag
+ * implement WriteArrowBatch() specific implementation
+ * support LargeString and LargeBinary for geometry columns (read support only)
 
 CSV driver:
- * in writing, use WKT instead of actual geometry column name if GEOMETRY=AS_WKT mode is used without CREATE_CSVT=YES (fixes #660)
- * writer: limit to 10000 fields to avoid performance issues. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9336 (8449 as well)
- * avoid endless loop when iterating and updating features (#919)
+ * reader: change to use separator with the most occurrences (#7831)
+ * and add a SEPARATOR=AUTO/COMMA/SEMICOLON/TAB/SPACE/PIPE open option (#7829)
+ * implement GetFileList() and return .csvt if used (#8165)
+
+DGN driver:
+ * CreateFeature(): fix crash on empty geometries (ossfuzz#56771)
 
 DXF driver:
- * add PaperSpace field (Trac #7121)
- * allow attributes with spaces in the tag
- * Correctly handle non-uniformly-weighted spline HATCH boundaries (#1011)
- * avoid null pointer dereference when DXF_MAX_BSPLINE_CONTROL_POINTS is hit. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8254.
- * Fix reporting of wrong line numbers in errors (fixes #726)
- * Don't crash when spline control point limit is reached
- * fix memory leak in case of attempt to write GeometryCollection of unsupported type
-
-EDIGEO driver:
- * reading multipolygons (trac #6955, #711)
+ * Preserve attributes in nested block insertions
 
-ElasticSearch driver:
- * add compatibility with ES v6.0
- * add a USERPWD open option
- * add lazy loading of layers
- * add a LAYER open option
- * skip xpack indices, and do not emit 503 error when listing unauthorized layers
- * add a INDEX_DEFINITION layer creation option
- *allow several geometry fields of type GEO_POINT to be created
+ESRIJSON driver:
+ * add support for esriFieldTypeSingle and esriFieldTypeDate data types
 
-ESRIJson driver:
- * parse documents that lack 'geometryType' member (#914)
+FlatGeoBuf driver:
+ * GetNextArrowArray(): implement full spatial filtering (not just bbox
+   intersection)
 
 GeoJSON driver:
- * fix type deduction when there is a Feature.id of type string and Feature.properties.id of type int. The later has precedence over the former (arbitrary decision) (#669)
- * properly flush the file in SyncToDisk() in append situations (https://issues.qgis.org/issues/18596)
- * parse '{"type": "GeometryCollection", "geometries": []}' as empty geometrycollection
- * increase max memory allowed to parse a single feature (#807)
- * remove topojson from extensions recognized by the driver
- * add partial support for field names differing by case (#1057)
- * RFC7946 writer: clip and offset geometries outside [-180,180] (#1068)
- * no longer write NaN/Infinity values by default (#1109)
-
-GeoRSS driver:
- * avoid excessive processing time. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9263
-
-GML driver:
- * avoid fetching SRS from http
- * fix potential memory leak in case of duplicated name of geometry fields in .gfs
- * improve performance for large number of attributes. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9038.
+ * add AUTODETECT_JSON_STRINGS layer creation option (#8391)
+ * writer: when writing with limited coordinate precision, run MakeValid() to
+   avoid creating invalid geometries
+ * reading: set field TZFlag
+ * writer: in RFC7946 mode, refine logic to determine if a multipolygon spans
+   over the antimeridian to write correct bbox (qgis/qgis#42827)
+ * writer: use faster file write() primitive and detect write() errors
 
-GPKG driver:
- * add read/write support for JSON field subtype
- * speed up GetExtent() on huge tables with rtree. Refs https://issues.qgis.org/issues/18402
- * take into ROLLBACK TO SAVEPOINT to invalidate cached feature count
- * make sure to not invalidate POSIX advisory locks
- * remove useless check that encoding is UTF-8 (#793)
- * fix typo in gpkg_metadata_reference_column_name_update trigger definition
- * optimize table renaming by avoiding to drop the spatial index, but just renaming it
-
-IDF driver:
- * use a temporary SQLite database (when driver available) for files larger than 100 MB
- * add support for Z coordinate (#964)
+GeoJSONSeq driver:
+ * add AUTODETECT_JSON_STRINGS layer creation option (#8391)
+ * writer: use faster file write() primitive and detect write() errors
 
-LIBKML driver:
- * add support for reading several schemas for the same layer (#826)
- * make edition of existing file work (https://issues.qgis.org/issues/18631)
- * implement OGRLIBKMLLayer::SyncToDisk() to fix https://issues.qgis.org/issues/18631
- * workaround weird issue with OSGeo4W and newline characters in <coordinate> element (fixes https://issues.qgis.org/issues/19215)
+GeoPackage driver:
+ * use much faster creation of RTree with a in-memory RTree building
+ * speed-up HasMetadataTables() on dataset with many layers
+ * speed-up unique constraint discovery on dataset with many layers
+ * more efficient retrieval of layer extent from RTree content
+ * deal with DateTime fields without milliseconds or seconds, as allowed by
+   GeoPackage 1.4 (#8037)
+ * add a DATETIME_PRECISION layer creation option (#8037)
+ * implement SetNextByIndex() on table layers (by appending
+   'OFFSET -1 LIMIT index')
+ * make GetArrowStream() honour SetNextByIndex()
+ * add a CRS_WKT_EXTENSION=YES/NO dataset creation option to force addition of
+   definition_12_063 column
+ * add a METADATA_TABLES creation option to control creation of system metadata
+   tables
+ * GetNextArrowArray(): implement full spatial filtering (not just bbox
+   intersection)
+ * GetNextArrowArray(): only do multi-threaded prefetch if more than 1 GB RAM
+   available
+ * make invalid attribute filter to cause error in main thread (so Python
+   binding can emit an exception)
+ * GPKG / SQLite dialect: improve detection of geometry columns when first row
+   is NULL (#8587)
+ * make GetFeatureCount() do full geometry intersection and not just bounding
+   box (#8625)
 
-MITAB driver:
- * fix potential use of uninitialized memory
- * improve performance of adding many fields in a .tab. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8559
- * fix geometry corruption when editing some datasets (#817)
- * fix writing .tab when field name has invalid characters in it (#924)
- * Expose font family to feature style symbol ID
+GPX driver:
+ * add a CREATOR dataset creation option
 
-MSSQLSpatial driver:
- * Add support for MSODBCSQL (#1136)
- * Fix layer-schema separation problem (#586)
- * Fix bulk copy for multiple layers (#619)
- * Accept datetime values (#841)
- * Don't truncate string values on Unix (#843)
- * Create 3D features (#852)
- * enforce read-only/update mode for CreateFeature/SetFeature/DeleteFeature
- * fix retrieval of geometry column on Linux for SQL result layers
- * Use only valid SRIDs; Create features preserving SRID (#860)
- * Fix geometry parser with M values (#1051)
- * Assign new ID following an INSERT (#1052)
- * Adding configuration option MSSQLSPATIAL_ALWAYS_OUTPUT_FID (#1101)
+HANA driver:
+ * Set sessionVariable:APPLICATION in connection string
+ * Support connections using a user store key (#7946)
 
-MVT driver:
- * writer: do not ignore Z/M/ZM geometries
- * writer: make it possible to output to /vsizip/output.zip out-of-the-box
- * disable check on 'extent' field in identifiation method, which rejected tiles with extent > 16384
- * avoid recursion on opening. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10226
+Memory driver:
+ * add a FID layer creation option to specify the FID column name
 
-MySQL:
- * add support for MySQL 8.0
+MVT/MBTiles driver:
+ * take into account tileStats metadata item to decide if a field of type
+   'number' might be Integer or Integer64
+ * MVT writer: clamp generated tile x, y coordinates to \[0,(1<<z)-1\]
 
 NAS driver:
- * speed-up in case of huge number of attributes. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7977
+ * remove unused nas relation layer and remove GML driver's out-of-band
+   attribute handling only used for it
+ * support gfs @ notation for attributes to handle attributes for codelists
+   (fixes norBIT/alkis-import#65)
+ * Fix (and refactor) update operations for GID7
 
-OCI driver:
- * Ensure table Dims and GTYPE are retrieved for the correct table (#629)
+MySQL driver:
+ * fix compliance issues with test_ogrsf
 
-OGR_GMT driver:
- * avoid performance issue when opening layer with big number of fields. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8259.
+OAPIF driver:
+ * bump default limit to 1000 and honor schema from API (#8566)
 
-OGR_PDS driver:
- * avoid int overflow. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9136
+ODS driver:
+ * add FIELD_TYPES and HEADERS open options (#8028)
 
 OpenFileGDB driver:
- * Catch a NaN in FileGDBDoubleDateToOGRDate to prevent undefined behavior. (#740)
- * fix potential crash on corrupted datasets. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11313
-
-OSM driver:
- * allow parsing files with up to 10 000 nodes per way (#849)
- * avoid array overflow with ways with many tags. Relates to https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9618
+ * add support for DateTime field domains
+ * expose layer alias name in ALIAS_NAME layer metadata item
 
-PCIDSK driver:
- * defer writing of segment header to improve performance when creating huge number of fields. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8191
- * fix performance issue when inserting in layer with huge number of fields. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8335.
+Parquet driver:
+ * emit GeoParquet 1.0.0 version number
+ * add a COORDINATE_PRECISION layer creation option
+ * add fast implementation of Arrow Array interface when requesting WKT as WKB
+ * make Parquet driver recognize a geometry column if it has
+   ARROW:extension:name=ogc.wkb/ogc.wkt field metadata
+ * add a GEOM_POSSIBLE_NAMES and CRS open options for wider compatibility with
+   datasets not following GeoParquet dataset-level metadata
+ * fix ExecuteSQL() MIN/MAX optimization on a UINT32 field on a Parquet 2 file
+ * optimize SELECT MIN(FID), MAX(FID)
+ * restrict FID column detection to Int32/Int64 data types
+ * use statistics to skip row groups that don't match attribute filter (#8225)
+ * use statistics of bbox.minx/miny/max/maxy fields (as found in Ouverture Maps
+   datasets) to implement fast GetExtent()
 
 PDF driver:
- * fix the parser of drawing instructions that had issues with array objects
-
-PG driver:
- * add SPATIAL_INDEX=SPGIST/BRIN layer creation options (and PGDump as well) (#892)
- * add read/write support for JSON field subtype
+ * (minimal) take into account BMC operator to correctly handle BMC/EMC pairs
+   w.r.t BDC/EMC ones (#8372)
+ * Read vector unstructured: take into account OCMD constructs as found in
+   recent USGS GeoPDFs (#8372)
+ * ignore non-relevant StructTreeRoot in most recent USGS GeoPDFs (#8372)
 
 PGDump driver:
+ * use faster file write() primitive
 
-PLScenes driver:
- * fix /vsicurl/ raster download
- * fix scene activation
- * add ground_control field in layer definition
+PostgreSQL driver:
+ * do not override search_path when not needed (#8641)
 
 Shapefile driver:
- * avoid being dependent on correctness of file size field in .shp
- * fix corruption when deleting a field from a .dbf without records (#863)
- * Add CP1251 codepage name synonym (ANSI 1251) for DBF files.
-
-S57 driver:
- * add S57_AALL, S57_NALL, S57_COMF, S57_SOMF creation options (#810)
-
-SOSI driver:
- * fix memory leaks / null pointer dereference
-
-SQLite/Spatialite driver:
- * avoid SetFeature() to reset the iterator (#964)
- * Spatialite: read table name in its original case (#1060)
- * do not run spatial index creation in rollback code
+ * use VSIGetCanonicalFilename() in GetFileList() (#8164)
+ * be tolerant with .prj with lon, lat axis order (fixes #8452)
 
-VFK driver:
- * create index on ID column only for selected (geometry-related) layers (#498)
- * create db indices after inserting data (#498)
- * create indices before resolving geometry
- * new open option - include filename field (#564)
- * speed up sequential feature access
- * fix leak of unfinalized statement (#634)
- * fix file check on Windows with large files (#637)
- * fix big int overflow, force text attributes (PODIL_CITATEL/PODIL_JMENOVATEL) to avoid int64 overflow (#672)
- * fix missing geometry for SBPG layer (#710)
- * missing fields in update mode gfs (#734)
+TileDB driver:
+ * GetNextArrowArray(): implement full spatial filtering (not just bbox
+   intersection)
 
-VRT driver:
- * revise logic for handling the <FID> element (or when it is omitted) (#941)
+XLSX driver:
+ * add FIELD_TYPES and HEADERS open options (#8028)
 
 WFS driver:
- * avoid potential bad cast. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=9800
-
-WFS3 driver:
- * update to current version (May 2018) of the API draft (#626)
- * add USERPWD open option
-
-XLSX driver:
- * avoid stack buffer overflow is creating too many fields. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8198
- * avoid timeout. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8225
- * fix null pointer dereference. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8286
+ * Don't issue STARTINDEX if feature count is small (#8146)
+ * do not emit twice DescribeFeatureType request on servers with complex
+   features and a single layer
+ * ExecuteSQL(): skip leading spaces that could cause the rest of the function
+   to malfunction
+ * correctly paginate when number of features is lower than page size (#8653)
+ * use numberMatched when present to avoid last empty GetFeature request, and
+   set GetFeatureCount()
 
 ## SWIG Language Bindings
 
 All bindings:
- * use a dedicated VSILFILE class to avoid type mismatch (#601)
- * reload drivers if GDAL_SKIP/OGR_SKIP is defined with --config in gdal/ogr.GeneralCmdLineProcessor()
- * Add VSIFFlushL()
- * Add VSIErrorReset()
-
-CSharp bindings:
- * GDALCreateCopy.cs sample code: Correct misspelling in info message (#647)
- * SWIG 2.x and 3.x compatibility (#824)
+ * Map multidimensional API Rename() methods
+ * Increment FeatureDefn ref count on ogr.Layer.GetLayerDefn()
+ * add ogr.CreateRangeFieldDomainDateTime() and Domain.GetMinAsString()
+   /GetMaxAsString()
+ * Expose GetConfigOptions()
+ * add gdal.SuggestedWarpOutput()
+ * Expose GDALClose
 
 Java bindings:
- * update to Java 1.6 requirement to please 'ant maven' target
- * Fix JNI library bundling.
-
-Perl bindings:
- * fix make dependencies (#43)
+ * add Read/WriteRaster abilities for GDT_UInt64 & GDT_Int64 (#7893)
+ * make multidimensional API usable (#8048)
+ * implement ogr.CreateCodedFieldDomain() and FieldDomain.GetEnumeration()
+  (#8085)
+ * eliminate some deprecations / compiler warnings (#8055)
+ * Add FieldDefn::GetFieldType() compatibility method
 
 Python bindings:
- * Python logging improvements: add gdal.ConfigurePythonLogging() function  (#1017)
- * added support for band / pixel interleave for numpy array
- * fixed NULL check on python's swig VSIFReadL (#572)
- * fix dataset[slice] access (#574)
- * added support for reading vsi data as memorybuffer and writing buffers via VSIFWriteL
- * setup.py: add more prominent warning when numpy is not available (#822)
- * for utilities as library functions, when gdal.UseExceptions() is enabled, do not emit Python exceptions when the operation is reported as successful
- * update import path
- * avoid crash in ReadRaster() under low memory condition (#1026)
+ * Allow passing options as dict
+ * Return context manager from Create, CreateDataSource
+ * Use ogr.DataSource and gdal.Dataset as context managers
+ * make gdal.Group.GetGroupNames() and GetMDArrayNames() return an empty list instead of None
+ * detect invalid use of ReleaseResultSet() (#7782)
+ * Invalidate band and layer refs when dataset closes
+ * Invalidate mask, overview references after dataset close
+ * Invalidate refs from CreateLayer on datasource close
+ * Invalidate refs from CopyLayer on datasource close
+ * Avoid crash when using dataset after Destroy or Release
+ *  Avoid crashes when using orphaned Geometry refs
+ * GetArrowStreamAsNumPy(): various fixes
+ * Fix gdal.config_options to prevent migration of config options in and out of
+   thread-local storage (#8018)
+ * accept numpy.int64/float64 arguments for xoff, yoff, win_xsize, win_ysize,
+   buf_xsize, buf_ysize arguments of ReadAsArray() (#8026)
+ * make setup.py check that libgdal version >= python bindings version (#8029)
+ * fix CoordinateTransform.TransformPoint(sequence of 3 or 4 values)
+ * Use DumpReadable for Feature __repr__
+ * add a outputGeotransform option to gdal.Translate()
+ * Accept os.PathLike arguments where applicable
+ * make Feature.SetField(field_idx_or_name, binary_values) work
+ * add feature.SetFieldBinary(field_idx_or_name, binary_values)
+ * throw exceptions (when enabled) on gdal_array.OpenArray()/OpenNumPyArray()/
+   OpenMultiDimensionalNumPyArray()
+ * improve performance of CSLFromPySequence() on large sequences
+   (like > 100,000 strings)
+ * Allow ExecuteSQL context manager to work on empty datasources
+ * make sure that CPL_DEBUG=ON and gdal.UseExceptions() work fine during
+   gdal.VectorTranslate() (and similar) (#8552)
 
-# GDAL/OGR 2.3.0 Release Notes
+# GDAL/OGR 3.7.3 Release Notes
 
-Note: due to the change of SCM during the development, #XXXX still refers to
-Trac tickets. GitHub tickets are explicitly indicated with github #XXXX
+GDAL 3.7.3 is a bugfix release.
 
-## In a nutshell...
+## Build
 
- * New GDAL drivers:
-   - PDS4: read/write
-   - RDA: DigitalGlobe Raster Data Access (read-only)
- * New OGR drivers:
-   - MVT: add read/write driver for Mapbox Vector Tile standalone files or tilesets
-   - ESRIJson and TopoJSON: read-only, split from existing code of the GeoJSON driver
-   - WFS3: *experimental* read-only driver
- * RFC 68: Make C++11 a build requirement
-    https://trac.osgeo.org/gdal/wiki/rfc68_cplusplus11
- * RFC 70: Guess output format from extension of output filename, if no explicit format passed to C++ or Python utilities
-    https://trac.osgeo.org/gdal/wiki/rfc70_output_format_guess
- * RFC 71: Move to GitHub for source code repository and issue tracker.
-    https://trac.osgeo.org/gdal/wiki/rfc71_github_migration
- * Significantly improved drivers:
-    - MBTiles (vector tiles support)
-    - DXF
-    - GRIB (GRIB2 write support)
-    - WCS (support WCS 2.0)
- * Improvements in network-based /vsi handlers: /vsicurl, /vsis3, /vsigs. Add:
-     - /vsiaz for Microsoft Azure Blobs
-     - /vsioss for Alibaba Cloud Object Storage Service
-     - /vsiswift/ for OpenStack Swift object storage
- * Command line utilities: use Unicode main on Windows to avoid issues with non-ASCII characters (#7065)
- * Update to EPSG v9.2 (#7125)
- * Update data/esri_extra.wkt and add data/esri_epsg.wkt, taken from https://github.com/Esri/projection-engine-db-doc (Apache v2 license) (#2163)
- * Add support for PROJ.5 new API (requires proj 5.0.1 or later). PROJ 4.X is still supported.
- * More than 1000 fixes for issues/vulnerabilities found by OSS-Fuzz
- * Remove raster OGDI driver (vector OGDI driver still there) (#7087)
+* CheckDependentLibraries.cmake: don't use libjpeg if disabled
+* frmts/mrf/CMakeLists.txt: ignore HAVE_JPEGTURBO_DUAL_MODE_8_12 if
+  GDAL_USE_JPEG is OFF (tune #8336)
+* FindPostgreSQL.cmake: Update the list of released PgSQL versions
+* Add support for PoDoFo >= 0.10.0 (#8356)
+* Add support for TileDB 2.17
+* Fix build with -DRENAME_INTERNAL_SHAPELIB_SYMBOLS=OFF (#8532)
 
-## New installed files
+## GDAL 3.7.3
 
- * data/pds4_template.xml
- * data/esri_epsg.wkt
+### Algorithms
 
-## Backward compatibility issues
+* Rasterize: avoid burning the same pixel twice in MERGE_ALG=ADD mode within
+  a same geometry (#8437)
+* OpenCL warp: scan multiple devices for each platform (#8540)
+* GDALSerializeReprojectionTransformer(): fallback to WKT2 for SourceCRS/
+  TargetCRS if WKT1 cannot be used
 
-See MIGRATION_GUIDE.TXT
+### Port
 
-## GDAL/OGR 2.3.0 - Build changes
+* VSIReadDirRecursive(): make it work properly with a trailing slash
+  (especially on /vsizip/) (#8474)
+* /vsi7z/: accept ArcGIS Pro Project Packages
 
-Build(Unix):
- * refresh config.{guess,sub} from latest upstream; upgrade to libtool 2.4.6 files
- * add a --with-rename-internal-shapelib-symbols option that defaults to yes if --with-hide-internal-symbols is set; and make -with-rename-internal-libtiff/libgeotiff-symbols also defaults to yes when --with-hide-internal-symbols is set
- * add a --with-charls switch (enabled by default) to compile that JPEGLS driver
- * make --without-static-proj and --with-fgdb an error when filegdb (>= 1.5) embeds proj.4 symbols
- * add --with-zstd switch (for GTiff ZStd compressino with internal libtiff)
- * add support for ECW SDK 5.4, by detecting if we must link against the newabi or oldabi link
- * fix detection of 64bit file API with clang 5 (#6912)
- * GNUmakefile: add a static-lib and install-static-lib targets
- * use .exe extension when building with mingw64* toolchains (#6919)
- * Pass --silent to libtool in compile (C and C++), link, install and clean modes.
- * Limit number of installed cpl*.h files installed to a fixed list.
- * configure / m4/acinclude.m4: replace use of CCFLAGS by plain CFLAGS (github #529)
- * configure / m4/acinclude.m4: require 'long long' type (github #530)
+### Utilities
 
-Build(Windows):
- * always build the PDF driver, even when none of poppler/podofo/pdfium are available, in which case it is write-only (#6938)
- * add new targets bindings, bindings_install and bindings_clean that depend on the new BINDINGS option in nmake.opt (#6948)
- * for Kakadu, add capability to build as a plugin, and make it possibly to link only against the Kakadu .lib/.dll instead of incorporating some of its .obj (#6940)
- * nmake.opt: Ensure PDB is included in release DLL if WITH_PDB requested (#7055)
- * nmake.opt: use /MDd for OPTFLAGS for DEBUG=1 builds (#7059)
- * nmake.opt: avoid some settings to be defined unconditionally (#5286)
- * nmake.opt: add configuration to enable openssl (which is needed for thread-safe curl use)
+* gdal_translate -ovr: properly rescale RPC (#8386)
+* gdal_translate: when specifying -srcwin, preserve source block size in the
+  temporary VRT if srcwin top,left is a multiple of the block size
+* gdal2tiles: raise explicit exception if bad value for --s_srs (#8331)
 
-Build(All):
- * fix compilation error with Crypto++ 7.0.0 (github #541)
+### Raster drivers
 
-Developer corner:
- * Add scripts/setdevenv.sh to setup env variables needed for running GDAL without installing it
+ENVI driver:
+ * skip leading spaces at front of metadata keys
 
-## GDAL 2.3.0 - Overview of Changes
+GIF driver:
+ * Internal giflib: fix memleak on animations (#8380)
+ * Internal giflib: fix memleak on truncate files (#8383)
 
-Port:
- * Add CPLJSONDocument/Object/Array - C++ thin wrapper around json-c library. (github #282)
- * /vsicurl/: fix occasional inappropriate failures in Read() with some combinations of initial offset, file size and read request size (#6901)
- * /vsicurl/: add a CPL_VSIL_CURL_NON_CACHED configuration option, so as to be able to specify filenames whose content must not be cached after dataset closing
- * /vsicurl/: honour GDAL_HTTP_MAX_RETRY and GDAL_HTTP_RETRY_DELAY config options. Add extended filename syntax to pass options use_head, max_retry, retry_delay and list_dir.
- * /vsicurl/: enable redirection optimization on signed URLs of Google Cloud Storage. Helps for the PLScenes driver (fixes #7067)
- * /vsicurl/ and derived filesystems: redirect ReadDir() to ReadDirEx() (#7045)
- * /vsicurl/ and related file systems: add compatibility with HTTP/2 (requires recent enough curl, built against nghttp2). Can be controlled with the GDAL_HTTP_VERSION=1.0/1.1/2/2TLS
- * /vsicurl/: fix 2.2 regression regarding retrieval of file size of FTP file (#7088)
- * /vsicurl/: when stat'ing a file, fallback from HEAD to GET if the server issues a 405 error
- * Add a VSICurlClearCache() function (bound to SWIG as gdal.VSICurlClearCache()) to be able to clear /vsicurl/ related caches (#6937)
- * CPLHTTPSetOptions(): use SearchPathA() for curl-ca-bundle.crt on Windows. See https://github.com/curl/curl/issues/1538
- * CPLHTTPFetch() / vsicurl: add retry on HTTP 429, and add exponential backoff logic for retry delay
- * CPLHTTPFetch(): when openssl is enabled, and used by libcurl, use openssl thread safety mechanism to avoid potential crashes in multithreading scenarios
- * CPLHTTPFetch(): add a SSL_VERIFYSTATUS option / GDAL_HTTP_SSL_VERIFYSTATUS configuration option to check OCSP stapling
- * CPLHTTPFetch(): add a USE_CAPI_STORE option / GDAL_HTTP_USE_CAPI_STORE configuration option to use certificates from the Windows certificate store
- * Ignore SIGPIPE that may arose during curl operations (mostly when using OpenSSL for TLS)
- * Add CPLHTTPMultiFetch() and CPLMultiPerformWait()
- * /vsis3/: support reading credentials from ~/.aws/credentials, ~/.aws/config or IAM role on EC2 instances
- * /vsis3/: properly handle cases where a directory contains a file and subdir of same names; implement Mkdir() and Rmdir()
- * /vsis3/: fix Seek(Tell(), SEEK_SET) fails if current position is not 0 (#7062)
- * /vsis3/: properly handle 307 TemporaryRedirection (#7116)
- * /vsis3/: fix support of bucket names with dot in them (#7154)
- * /vsis3/: make multipart upload work with Minio
- * /vsigs/: add new authentication methods using OAuth2 refresh token or service account or Google Compute Engine VM authentication, or using ~/.boto file
- * /vsigs/: add write, Unlink(), Mkdir() and Rmdir() support
- * /vsigs/: allow authentication to be done with the GOOGLE_APPLICATION_CREDENTIALS configuration option pointing to a JSon file containing OAuth2 service account credentials
- * /vsis3/ and /vsigs/: take into account user provided x-amz- / x-goog- HTTP headers with GDAL_HTTP_HEADER_FILE
- * Fix CPLReadDirRecursive() to behave properly on /vsis3/ buckets that have foo (file) and foo/ (sub-directory) entries (#7136)
- * /vsis3/: add a AWS_NO_SIGN_REQUEST=YES configuration option to disable request signing (#7205)
- * /vsis3, /vsigs, /vsioss, /vsiaz: fix support of non-ASCII characters in keys (#7143)
- * Add VSIGetActualURL(), typically to expand /vsis3/ paths to full URLs, and bind it to SWIG as gdal.GetActualURL()
- * Add VSIGetSignedURL()
- * Add VSIGetFileSystemsPrefixes() and VSIGetFileSystemOptions()
- * CPLFormFilename() / CPLProjectRelativeFilename(): add /vsis3 and similar file systems to the list of filesystems requiring unix separator (github #281)
- ù Make CPLFormFilename() properly work with http[s:]// filenames
- * Add a CPLGetErrorCounter() function that can be used to test if new errors have been emitted
- * Add cpl_safemaths.hpp to detect integer overflows (#6229)
- * /vsigzip/: avoid trying to write a .gz.properties file on a /vsicurl/ file (#7016)
- * CPLStrtod(): parse string like '-1.#IND0000000' as NaN instead of -1 (seen when looking at refs #7031, but does not fix it)
- * Fix CPLCopyTree() that doesn't properly on MSVC 2015 (and possibly other platforms) (#7070)
- * /vsimem/: to improve Posix compliance, do not make Seek() after end of file error out in read-only mode
- * cpl_config.h.vc: define HAVE_LONG_LONG 1; cpl_port.h remove MSVC specific logic for int64 (github #264)
- * /vsisparse/: make Read() detect end of file
- * GDALVersionInfo("BUILD_INFO"): report if GEOS is available
- * Add VSIMkdirRecursive() and VSIRmdirRecursive()
- * Add CPLGetHomeDir()
- * CPLSetErrorHandler(): avoid later crashes when passing a null callback (github #298)
- * CPLHTTPParseMultipartMime(): make it format the pasMimePart[].papszHeaders in a standard key=value format without EOL
- * CPLString: avoid std::string symbols to be exported with Visual Studio (#7254)
- * I/O on Android: add support for 64-bit file operations if API level >= 24 (Android 7.0 or later) (github #339)
+GTiff driver:
+ * multithreaded reading/writing: fix a deadlock and/or data corruption
+   situation (#8470)
+ * DirectIO(): fix integer overflow when requesting more than 2 GB at once
+ * Support writing a CRS of known code but unknown GeoTIFF projection method
+   (#8611). Support also a CRS of unknown code but that can be encoded as
+    ESRI_WKT if GEOTIFF_KEYS_FLAVOR=ESRI_PE creation option is used
+ * JXL codec: fix wrong use of memcpy() in decoding, and add memcpy()
+   optimizations
 
-Core:
- * add GDALDataTypeIsFloating, GDALDataTypeIsSigned, GDALDataTypeUnionWithValue, GDALFindDataType, GDALFindDataTypeForValue (github #215). Add GDALDataTypeIsInteger()
- * Cleanup ARE_REAL_EQUAL() and GDALIsValueInRange() (#6945, #6946)
- * Various SSE2/AVX2 optimizations for GDALCopyWords()
- * GDALGCPsToGeoTransform(): add GDAL_GCPS_TO_GEOTRANSFORM_APPROX_OK=YES and GDAL_GCPS_TO_GEOTRANSFORM_APPROX_THRESHOLD=threshold_in_pixel configuration option (#6995)
- * RawDataset::IRasterIO(): don't assume all bands are RawRasterBand
- * GDALOpenInfo: make number of bytes read at opening configurable with GDAL_INGESTED_BYTES_AT_OPEN
- * GDALCopyWholeRasterGetSwathSize(): try to use at least 10 MB for swath size
- * GDALDatasetCopyWholeRaster(), GDALRasterBandCopyWholeRaster(), GDALCreateCopy(): always call AdviseRead() on the full extent of the source dataset (#7082)
- * make DefaultCreateCopy() copy RAT
- * Generate gcore/gdal_version.h from git date and sha for a dev version (Unix builds only)
- * Add GDALDataset::Open()
- * Add C++ iterators for layers, bands and features in GDALDataset
- * External .ovr: make sure that ExtraSamples tag is written
- * Overview creation: avoid creating too many levels, and fix related heap buffer overflow (github #557)
- * SetStatistics(): write a STATISTICS_APPROXIMATE=YES metadata item if bApproxOK=true, and take it into account in GetStatistics() (#4857,#4576)
+MBTiles driver:
+ * BuildOverviews(): correctly set minzoom metadata (#8565)
 
-Algorithms:
- * Contour: make sure no 3D geometry is created unless -3d switch is defined (#336)
- * Warper: revise/improver how working data type is inferred from other parameters
- * Warper: when operating on single-band, skip target pixels whose source center pixel is nodata (2.2 regression, #7001)
- * Warper: avoid blocking when number of rows is 1 and NUM_THREADS > 1 (#7041). Also limit the number of threads so that each one processes at least 65536 pixels
- * Warper: use AdviseRead() when source chunks are sufficiently compact (#7082)
- * Warper: fix rounding error in scale factor computation (github #273)
- * Warper: use panSrcBands[0] in the single band case (regression fix, github #295)
- * Warper: add very special case to handle situation where input raster edge touches dateline, but proj.4 transformation involves a discontinuity (#7243)
- * Geoloc transformer: fix systematic pixel shift (github #244)
- * RPC transformer: set output coordinates to HUGE_VAL when failure occurs, so that a following coordinate transformation can detect the error too (#7090)
- * RPC transformer: return NULL at instantiation if the specified RPC_DEM file cannot be opened
- * Export GDALRegisterTransformDeserializer() and GDALUnregisterTransformDeserializer() (#5392)
- * GDALRasterize(): avoid hang in some cases with all_touched option (#5580)
- * Optimize GDALResampleConvolutionVertical() and GDALPansharpenOperation::WeightedBroveyPositiveWeightsInternal() for SSE2 / AVX
- * Overview / resampling: speed-up bicubic upsampling for SSE2
- * GDALGrid() with linear algorithm: avoid assertions/segmentation fault when GDALTriangulationFindFacetDirected() fails (#7101)
- * GDALComputeProximity(): fix int32 overflow when computing distances on large input datasets (#7102)
- * GDALAllRegister(): make sure that all drivers that need to look for sidecar files are put at the end
+netCDF driver:
+ * multidim: add write support for Int8 data type (#8421)
 
-Utilities:
- * GDAL and OGR C++ and Python utilities: accept -f or -of to specify output format
- * --optfile: re-parse inlined content with GDALGeneralCmdLineProcessor(), in particular to support --config key value in option file
- * gdalsrsinfo: for consistency with other output, do not quote the proj.4 string output
- * gdal_rasterize: fix segfault when rasterizing onto a raster with RPC (#6922)
- * gdal_rasterize: add a -to option to specify transformer options
- * gdal_rasterize / GDALRasterizeGeometries(): optimize rasterization for large number of small geometries (#5716)
- * gdal_rasterize: fix crash in some situations with ALL_TOUCHED option (#7176)
- * gdaladdo: support not specifying explicitly overview factors, and add -minsize option
- * gdal_translate: add -a_scale / -a_offset (#7093)
- * gdal_translate: add -colorinterp / -colorinterp_X options
- * DefaultCreateCopy()/gdal_translate: do not destroy target file in case of failed copy wen using -co APPEND_SUBDATASET=YES (#7019)
- * gdal_translate: make -b mask[,xx] use the appropriate band data type (#7028)
- * gdal_translate property copy RAT (or not-copy RAT when -norat is specified)
- * gdalwarp: make -crop_to_cutline works when RPC transform is involved
- * gdalwarp: for RPC warping add a few extra source pixels by default
- * gdalwarp: -crop_to_cutline: reduce number of iterations to find the appropriate densification (#7119)
- * gdalwarp: do not set implicitly nodata on destination dataset when -dstalpha is specified (#7075)
- * gdalwarp: display errors (such as invalid open options) on successful opening of destination dataset
- * gdalwarp: fix "-dstnodata inf" (#7097)
- * gdalwarp: fix when several input datasets with different SRS are specified, and no explicit target SRS is provided (#7170)
- * gdalwarp: make sure to try to redefine the destination nodata value from the source nodata even if the newly created dataset has already set a default nodata value (#7245)
- * gdalwarp: improve progress meter when using multiple source files. For GDALWarp() function, make sure that the progress goes monotonically from 0 to 1. (#352)
- * gdal2tiles.py: fix GDAL 2.2 regression where tilemapresource.xml was no longer generated (#6966)
- * gdal2tiles: add --processes=intval option to parallelize processing (#4379)
- * gdalinfo --format / ogrinfo --format: report extra metada items in a 'Other metadata items:' section (#7007)
- * gdalinfo: make sure to display geodetic coordinates always in degree (and not potentially in another unit such as grad) (#4198)
- * gdalinfo: report 'Mask Flags: PER_DATASET NODATA' when NODATA_VALUES metadata item is specified
- * gdal_edit.py: add a -colorinterp_X red|green|blue|alpha|gray|undefined option to change band color interpretation
- * gdal_contour: return with non-0 code if field creation or contour generation failed  (#7147)
- * gdal_retile.py: fix failure if the filename contains % (percent) symbol (#7186)
- * gdalbuildvrt: make warnings about heterogeneous projection/band characteristics more explicit (#6829)
- * gdalbuildvrt: add support for band scale and offset (#3221)
- * gdal_fillnodata.py, gdal_pansharpen.py, gdal_polygonize.py, gdal_proximity.py, gdal_sieve.py, rgb2pct.py: avoid potential problem on Windows in verbose mode (github #458)
-
-Sample Python scripts:
- * Add gdal_mkdir.py, gdal_rm.py and gdal_rmdir.py samples scripts
- * gdalcopyproj.py: fix use of GCP related API (github #255)
- * ogr2vrt.py: automatically set relativeToVRT=1 for input and output filenames givn in relative form in the same directory
+VRT driver:
+ * IRasterIO(): avoid edge effects at sources boundaries when downsampling
+   with non-nearest resampling
 
-Multi driver changes:
- * tag (and do needed changes) CALS, FUJIBAS, PAUX, SGI, RS2, GXF, TERRAGEN, Rasterlite, CPG, MSGN, Leveller as supporting GDAL_DCAP_VIRTUALIO
+WCS driver:
+ * remove 'FORMAT' parameter from 'DescribeCoverage' requests
+
+## OGR 3.7.3
 
-AIGRID:
- * fix handling on raw 32-bit AIG blocks (#6886)
+### Core
 
-BT driver:
- * make GetNoDataValue()/SetNoDataValue() use PAM
+* OGRSQL: fix incorrect interaction of LIMIT clause and SetNextByIndex()(#8585)
+* OGRWKBGetBoundingBox(): properly initialize envelope
 
-DIMAP driver:
- * do not report dummy geotransform (see https://lists.osgeo.org/pipermail/gdal-dev/2018-January/048014.html)
+### OGRSpatialReference
 
-DTED driver:
- * Support VerticalCS for DTED and SRTM drivers when REPORT_COMPD_CS config option is set (github #237)
+* TransformBounds(): do not emit errors when trying to reproject
+  points at poles
+* ogr_proj_p.cpp: disable pthread_atfork() optimization on MacOS (#8497)
 
-ECW driver:
- * fix Windows compilation against old ECW SDK and VS < 2015 (#6943)
- * make AdviseRead() to store its call parameters, and only do the actual work in RunDeferredAdviseRead() if TryWinRasterIO() determines that the IRasterIO() parameters are compatible of the AdviseRead() ones (#7082)
- * data/ecw_cs.wkt: fix PRIMEM of MONTROME (#2340)
+### Utilities
 
-EHdr driver:
- * support reading/writing .clr as/from RAT (#3253)
- * only write .stx if bApproxOK=false (github #514)
+* ogr2ogr: fix -gt 0 to disable transactions
+* ogr2ogr: make -select '' work (or gdal.VectorTranslate(selectFields=[]))
+* ogr2ogr: fix preserve_fid and explodecollections incompatible options (#8523)
 
-ENVI driver:
- * support 'major frame offsets' keyword (#7114)
+### Vector drivers
 
-ERS driver:
-   add extension metadata (github #320)
+Arrow/Parquet drivers:
+ * fix crash on ArrowArray interface when there is a fid column
+
+CSV driver:
+ * avoid extra comma at end of header line with GEOMETRY=AS_XYZ and a single
+   attribute (#8410)
+
+FlatGeoBuf driver:
+ * ArrowStream: return a released array when there are no rows (#8509)
 
 GeoPackage driver:
- * update from 'tiled gridded extension' to now OGC approved 'tiled gridded coverage data extension' (OGC 17-066r1) (#7159)
- * avoid corruption of gpkg_tile_matrix when building overviews, down to a level where they are smaller than the tile size (#6932)
- * fix opening subdatasets with absolute filenames on Windows (https://issues.qgis.org/issues/16997)
- * fix possible assertion / corruption when creating a raster GeoPackage (#7022)
- * properly handle non-0 nodata value in edge tiles, especially with TILING_SCHEME creation option
- * do not write empty tiles for Float32 data type
- * speed-up statistics retrieval on non-Byte datasets (#7096)
- * make DELLAYER:rastertable / DROP TABLE rastertable delete the table and all references to it (#7013)
- * create single tiled TIFF tiles if they are not bigger than 512x512 pixels
- * avoid multi-threading issues when creating TIFF tiles with GDAL_NUM_THREADS defined.
- * fix overview creation with big overview factors on some datasets
+ * GPKG SQL layer GetNextArrowArray(): fix wrong array size when spatial
+   filtering occurs
+ * ArrowStream: immediately return a release array when there are no rows
+   (#8509)
+ * declare OGR_GPKG_GeometryTypeAggregate_INTERNAL only when needed
+
+GPKG/SQLITE drivers:
+ * declare relevant SQL functions as SQLITE_INNOCUOUS (#8514)
+ * turn PRAGMA trusted_schema = 1 when loading Spatialite (#8514)
+ * turn PRAGMA trusted_schema = 1 if RTree+update mode or if views use
+   Spatialite functions (#8514)
 
-GeoRaster driver:
- * handle memory allocation failures (#6884)
- * add support for GCP (#6973)
+OAPIF driver:
+ * make comparison of rel case insensitive to account for describedBy ->
+   describedby change
 
-GTiff driver:
- * add support for ZSTD compression/decompression (requires internal libtiff, or libtiff HEAD)
- * when IRasterIO() realizes that several blocks are going to be needed, use MultiRangeRead() interface for /vsicurl/ related file systems to get data in parallel
- * change default value of BIGTIFF_OVERVIEW to be IF_SAFER (github #231)
- * make sure that -co PHOTOMETRIC=RGB overrides the color interpretation of the first 3 bands of the source datasets (#7064)
- * allow modifying color interpretation on existing file opened in update mode
- * Internal libtiff: resync with upstream HEAD (post 4.0.9)
- * Internal libgeotiff: resync with upstream HEAD: use ProjScaleAtCenterGeoKey for CT_Mercator if ProjScaleAtNatOriginGeoKey is not set (github #296)
- * fix compilation without BIGTIFF_SUPPORT (#6890)
- * fix reading subsampled JPEG-in-TIFF when block height = 8 (#6988)
- * when reading a COMPD_CS (and GTIFF_REPORT_COMPD_CS=YES), set the name from the GTCitationGeoKey (#7011)
- * on reading use GeogTOWGS84GeoKey to override the defaults TOWGS84 values coming from EPSG code (#7144)
- * when writing SRS, do not drop EXTENSION PROJ4 node if the projection is unknown (#7104)
- * make it accept to write SetGeoTransform([0,1,0,0,0,1]) as a ModelTransformationTag, and remove particular cases with the [0,1,0,0,0,1] geotransform (#1683)
- * warn when SetNoDataValue() is called on different bands with different values (#2083)
- * add a GTIFF_HONOUR_NEGATIVE_SCALEY=YES config option that can be set to honour negative ScaleY value in GeoPixelScale tag according to the GeoTIFF specification (#4977)
- * read/write Z dimension for ModelTiepointTag and ModelPixelScaleTag and translate it into/from band scale and offset, when there's a SRS with a vertical component (#7093)
- * fix reading PCSCitationGeoKey (#7199)
- * add support for reading and writing TIFF_RSID and GEO_METADATA GeoTIFF DGIWG tags
- * use consistently multiplication/division by 257 when converting between GDAL [0,255] range to TIFF [0,65535] range for color map values (#2213)
- * don't write <GDALMetadata> colorinterp when writing a file with a color table
- * copy georeferencing info to PAM if the profile is not GeoTIFF
+OpenFileGDB driver:
+ * fix opening of .gdb directories whose last component starts with 'a' and
+   is 18 character long... (#8357)
 
-GRIB driver:
- * add GRIB2 write support
- * update to degrib 2.14 and g2clib 1.6.0
- * add support for GRIB2 template 4.32 (github #249)
- * add support for GRIB2 template '4.32 Simulate (synthetic) Satellite Product'
- * add support for GRIB2 template 4.40 (Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for atmospheric chemical constituents)
- * update table 4.2-0-7 current (github #274)
- * add support for GRIB1 products with non-zero NV (number of vertical coordinate parameters) field in GDS (NV is just ignored) (#7104)
- * add support for Rotated pole LatLong projections (#7104)
- * adjust the longitude range to be close to [-180,180] when possible for products whose left origin is close to 180deg. Can be controlled with the GRIB_ADJUST_LONGITUDE_RANGE=YES/NO config option, that defaults to YES  (#7103)
- * advertise .grb2 and .grib2 extensions in metadata
- * expose product discipline of GRIB2 products in GRIB_DISCIPLINE (#5108)
- * add a GRIB_PDS_TEMPLATE_ASSEMBLED_VALUES metadata items which expose a slightly higher view of GRIB_PDS_TEMPLATE_NUMBERS
- * speed-up GetNoData() implementation of GRIB2 files by avoiding decompressing the data
- * GRIB2: add support for Transverse Mercator, Albers Equal Area, Lambert Azimuthal projections, fixes in Mercator and Polar Stereographic support, adjustment for GS80 and WGS84 datums
- * correctly read Mercator as Mercator_2SP when stdparallel1 != 0
- * GRIB2: add support for Grid point data - IEEE Floating Point Data template 5.4 encoding
- * GRIB2: report Section 1 / Identification section as GRIB_IDS metadata item
- * fix decimal_scale_factor != 0 handling with nbits = 0 for simple packing and JP2K compression/decompression, and PNG compression.
- * GRIB2: don't error out on a unhandled template in Section 4
- * remove TDLPack support
-
-GSAG driver:
- * fix reading issue that could cause a spurious 0 value to be read and shift all following values (#6992)
+NTF driver:
+ * fix assertion on corrupted dataset (ossfuzz#63531)
 
-GTX driver:
- * do not emit error when opening with GDAL_PAM_ENABLED=NO (#6996)
+Shapefile driver:
+ * Reader: correct bad (multi)polygons as written by QGIS < 3.28.11 with
+   GDAL >= 3.7 (qgis/qgis#54537)
 
-GRC driver:
- * Fix handling of alpha values in GRC color table (#6905)
- * Handle case of 0-len GRC class names (#6907)
+SQLite driver:
+ * ignore 'SRID=' layer creation option (qgis/QGIS#54560)
 
-HDF5 driver:
- * Added CInt16, CInt32, CFloat32, CFloat64 support (github #359)
- * HDF5 driver as a plugin: register the BAG driver as well (#5802)
+XLSX driver:
+ * do not write empty 'cols' element on empty layers, and change heuristics to
+   detect 'default' empty layers from intended empty ones (qgis/qgis#42945)
 
-HF2 driver:
- * creation: copy source information (including nodata) into PAM if needed (#6885)
- *  fix reading tiles that are 1-pixel wide (2.1 regression, #6949)
+## Python bindings
 
-HFA driver:
- * add GDAL_HFA_OVR_BLOCKSIZE configuration option to control HFA overviews block size (github #292)
+* GetArrowStreamAsNumPy(): fix reading fixed size list arrays that were
+  ignoring the parent offset (affects Parquet)
+* GetArrowStreamAsNumPy(): fix reading fixed width binary that were misusing
+  the offset (affects Parquet)
 
-HTTP driver:
- * do not open the underlying dataset with GDAL_OF_SHARED, to avoid later assertion
+# GDAL/OGR 3.7.2 Release Notes
 
-ISIS3 driver:
- * make sure that -co USE_SRC_HISTORY=NO -co ADD_GDAL_HISTORY=NO results in remove of History section (#6968)
- * fix logic to initialize underlying GeoTIFF file in IWriteBlock(), and implement Fill() (#7040)
+GDAL 3.7.2 is a bugfix release.
 
-JP2ECW driver:
- * add NBITS creation option, and automatically select codestream output for .j2k extension
+## Build
 
-JP2KAK driver:
- * add support fr Kakadu 7.A (#7048)
- * fix lossless compression with NBITS != 8 for Byte and NBITS != 16 for UInt16
- * use tile dimensions as block size up to 2048x2048 (#6941)
- * make write side honour .j2k extension to generate only codestream
+* Ccache.cmake: fix warning
+* XLS: avoid compiler warning when building against freexl 2.0
+* FindSPATIALITE.cmake: updated for SpatiaLite 5.1.0
+* CMakeLists.txt: update maximum range to 3.27
+* fix building test_ofgdb_write (#8321)
 
-JP2OpenJPEG driver:
- * add support for OpenJPEG 2.2 (#7002) and 2.3 (#7074). Drop support for openjpeg 2.0
- * fix performance issues with small images with very small tile size, such as some Sentinel2 quicklooks (#7012)
- * emit warning if GMLJP2v2 explicitly requested but georeferencing implemented
- * allow YCC for non-Byte datasets; and allow 4-band MCT with openjpeg >= 2.2
+## GDAL 3.7.2
 
-JPEG driver:
- * Add compatibility with libjpeg-turbo 1.5.2 that honours max_memory_to_use
- * add capability to write EXIF and GPS tags in a EXIF segment
- * Internal libjpeg: provide implementation of tmpfile() that works better on Windows (#1795)
- * avoid mis-identification of some SRTMHGT files as JPEG
+### Port
 
-JPEG2000 driver:
- * add NBITS creation option, and automatically select codestream output for .j2k extension
+* /vsiaz/: fix cached URL names when listing /vsiaz/
+* /vsiaz/: add options to pass object_id/client_id/msi_res_id in IMDS
+  authentication requests (AZURE_IMDS_OBJECT_ID, AZURE_IMDS_CLIENT_ID,
+  AZURE_IMDS_MSI_RES_ID)
+* /vsiaz/: implement Azure Active Directory Workload Identity authentication,
+  typically for Azure Kubernetes
 
-KEA driver:
- * add some additional metadata items (STATISTICS_HISTOBINVALUES and STATISTICS_HISTONUMBINS) (#6892)
+### Core
 
-L1B driver:
- * support reading NOAA18 datasets (#7115)
+* TileMatrixSet::parse(): add support for OGC 2D Tile Matrix Set v2 (#6882)
 
-MBTiles driver:
- * add read/write support for Mapbox vector tiles
- * support opening and creating datasets with tiles whose dimension is not 256 (#7233)
- * default to opening as RGBA (#6119)
+### Algorithms
 
-MEM driver:
- * Avoid Create(foo.tif) / CreateCopy(foo.tif) on the MEM or Memory drivers to delete a 'real' foo.tif file
- * add RAT support
+* Warper: do not modify bounds when doing geographic->geographic on a dataset
+  with world extent but not in [-180,180] (#8194)
+* RMS resampling: avoid potential integer overflow with UInt16 values
+* GDALChecksumImage(): fix 3.6.0 regression regarding integer overflow on
+  images with more than 2 billion pixels (#8254)
 
-MRF driver:
- * Add Zen chunk support
- * Open option to ignore decompression errors and missing data files
- * delay data file creation when NOCOPY is set
- * Identify MRF metadata passed as filename
- * Initialize PAM better on CopyCreate, enable external mask.
- * Fix for coordinates when opening single overview level
- * Use input mask if available to filter input data when creating JPEG compressed files.
- * Add open option to select Z-slice, also Z-slice selection in the metadata file
+### Utilities
 
-MrSID driver:
- * add support for LTI_COLORSPACE_GRAYSCALEA and LTI_COLORSPACE_GRAYSCALEA_PM color
- spaces
+* gdalinfo -json output: emit a stac['proj:epsg'] = null object when emitting
+  proj:wkt2 or proj:projjson (#8137)
+* gdalmdimtranslate: fix wrong output dimension size when using syntax like
+  '-array name=XXX,view=[::factor_gt_1]'
+* gdal2tiles: fix exception with dataset in EPSG:4326 with longitudes > 180 in
+  WebMercator profile (#8100)
+* gdal_retile.py: allow gaps in input files larger than grid size (#8260)
+
+### Raster drivers
+
+GeoPackage driver:
+ * GDALGeoPackageRasterBand::GetMetadata(): fix use after free
+ * fix missing GRID_CELL_ENCODING metadata item when there is other metadata
+ * remove .aux.xml file in Delete()
+
+GTiff driver:
+ * fix reading .tif + .tif.aux.xml file with xml:ESRI SourceGCPs without
+   TIFFTAG_RESOLUTIONUNIT (#8083)
 
-NetCDF driver:
- * avoid vector vs raster variable confusion that prevents reading Sentinel3 datasets, and avoid invalid geolocation array to be reported (#6974)
- * fix raster read as nodata with Byte datatype, (valid_range={0,255} or _Unsigned = True) and negative _FillValue (#7069)
- * be more tolerant on the formatting of standard parallel (space separated instead of {x,y,...} syntax), and accept up to 2/1000 error on spacing to consider a regular grid, to be able to read files provided by the national weather institute of Netherlands (KNMI) (#7086)
- * on creation, attach grid_mapping attribute to all bands
- * netCDF: support UTF-8 filenames on Windows (#7065)
- * add support for reading files in rotated pole projection (#4285)
- * behave correctly when an extra dimension of a variable has a corresponding 1D variable of different names (#7165)
- * netCDF: fix bad interaction of SetNoDataValue() and SetGeoTransform()/SetProjection() for NC4/NC4C modes (#7245)
+HDF5 driver:
+ * more efficient metadata collection (no functional change)
+ * deal with int64/uint64 attributes
+ * remove trailing space in multi-valued metadata items
+ * remove dataset name prefix in band level metadata
+ * address Planet's datacube band-specific metadata
 
 NITF driver:
- * add support for NITF CCINFA TRE (github #232)
- * data/nitf_spec.xml: fix location of PIAPRD TRE (github #234)
- * make sure that BLOCKA_ or TRE=BLOCKA= creation option override source NITF metadata; add a USE_SRC_NITF_METADATA=YES/NO creation option; make sure that gdal_translate doesn't preserve source BLOCKA when georeferencing is modified
- * fix swapped lines and samples in IMRFCA (github #289)
- * allow to read single-block JPEG2000 compressed images with one dimension > 8192 pixels (fixes #407)
+ * fix MIN/MAX_LONG/LAT when reading RPC00B
+ * add support for CSCSDB (Common Sensor Covariance Support Data) DES from
+   GLAS/GFM SDEs
+ * nitf_spec.xml: corrections to CSEXRB TRE
 
-PCIDSK driver:
- * sort overviews (#7100)
+OGCAPI driver:
+ * make it work when the media type of links (expected to be application/json)
+   is missing, using Accept content negotiation (#7970)
+ * do not try to use the 'uri' member of a tilematrixset definition document
+ * reproject bounding box from CRS84 to tile matrix set CRS
+ * skip too small overview levels
+ * remove erroneous taking into account of tilematrixset limits
+
+STACIT driver:
+ * correctly process asset 'href' starting with 'file://' (#8135)
+ * make it tolerant to missing proj:epsg if proj:wkt2 or proj:projjson are
+   provided (#8137)
+ * apply vsis3 protocol to s3:// items
 
-PCRaster driver:
- * fix fseek/ftell for large files on Windows (#322)
+WEBP driver:
+ * fix build against libwebp < 0.4.0 (#8111)
 
-PDF driver:
- * add support for Poppler 0.58 (#7033)
- * round to upper integer when computing a DPI such that page size remains within limits accepted by Acrobat (#7083)
- * do not emit 'Cannot find GPTS object' on VP.Measure objects whose Subtype != GEO
+Zarr driver:
+ * Zarr V2: fix duplicate array listing when both a 'foo' file and 'foo/'
+   directory exist on the object storage (#8192)
 
-PDS driver:
- * map STEREOGRAPHIC with fabs(lat)=90 to Polar_Stereographic (#6893)
+## OGR 3.7.2
 
-PLMosaic driver:
- * update to use the new Basemaps and Mosaics API
- * take into account BBOX for XYZ tiles
+### Core
 
-PNM driver:
- * add .pgm and .ppm extensions in metadata
+* Fix ExecuteSQL(dialect='SQLITE', spatialFilter=...) on a Memory datasource
+* OGRCurve::isClockwise(): fix wrong result when lowest rightmost vertex is the
+  first one (#8296)
 
-RMF driver:
- * add RMF native overviews support (github #266)
- * fix raster garbage values while reading sparse RMF files (github #267)
- * add native overview build (github #275)
- * fix NoData value update (github #312)
- * fix elevation units write and update (github #314)
+### Utilities
 
-RRASTER driver:
- * add support for reading creator and created metadata items, band names and color table / RAT
- * add update and create/createcopy support
+* ogrinfo: return non-zero ret code if -sql failed (#8215)
+* ogrinfo_output.schema.json: reflect actual output of ogrinfo (#8300)
+* ogr2ogr: support -nlt GEOMETRY -nlt CONVERT_TO_LINEAR (#8101)
 
-SAGA driver:
- * add support for .sg-grd-z files (github #228)
+### Vector drivers
 
-Sentinel2 driver:
- * make sure that the True Color Image subdatset really uses the R,G,B bands and not the R,R,R (#7251)
- * add support for direct opening of .zip files of new safe_compact L1C products (#7085)
+HANA driver:
+ * Fix incorrect detection of table name for view columns
+ * Don't process layers that are not in TABLES list
 
-SNODAS driver:
- * accept header lines up to 1024 characters (github #506)
+OGCAPI driver:
+ * vector tiles: avoid potential infinite time to establish layer definition
 
-SRTMHGT driver:
- * set appropriate description when opening a .hgt.zip file
- * recognizes the .hgt.gz extension (#7016)
- * add support for reading .SRTMSWBD.raw.zip files (GRASS #3246)
+OpenFileGDB driver:
+ * make Open() to fail if requested to open in update mode and that files are
+   in read-only (qgis/QGIS#53715)
 
-USGSDEM driver:
- * properly handle southern hemisphere UTM projections (#344)
+Shapefile driver:
+ * make CreateLayer() + GetFileList() list the .prj file when it exists (#8167)
 
-VICAR driver:
- * optimize nodata handling, and map STEREOGRAPHIC with fabs(lat)=90 to Polar_Stereographic (#6893)
+WFS driver:
+ * do not surround selected fields names in PROPERTYNAME with open and close
+   parenthesis (#8089)
 
-VRT driver:
- * add option for separable kernel (github #216)
- * warn if band attribute of VRTRasterBand is not the one expected
- * implement FlushCache()
- * fix use of VRTs that point to the same source in multi-threaded scenarios (#6939)
- * Warped VRT: correctly take into account cutline for implicit overviews; also avoid serializing a duplicate CUTLINE warping options in warped .vrt (#6954)
- * Warped VRT: fix implicit overview when output geotransform is not the same as the transformer dst geotransform (#6972)
- * fix IGetDataCoverageStatus() in the case of non-simple sources, which unbreaks gdalenhance -equalize (#6987)
- * re-apply shared='0' on sources if existing in original VRT when rewriting it due to invalidation
- * avoid error being emitted when opening a VRTRawRasterBand in a .zip files (#7056)
- * implement VRTDataset::AdviseRead() (in the particular case of a single source) (#7082)
- * allow to incorporate a warped VRT as CDATA in the SourceFileName field of a regular VRT
- * VRTDerivedRasterBand: fix detection of Python runtime already loaded when more than 100 modules are linked. Fixes QGIS3 use case (#7213)
- * add RAT support
- * for consistency, make sure that VRT intermediate datatype demotion is done, e.g that a VRT band of type Byte, with a source of type Float32, requested as Float32 buffer involves Float32 -> Byte -> Float32 conversions
- * VRTDataset::AddBand(): honour 'PixelFunctionLanguage' option (github #501)
+## Python bindings
 
-WCS driver:
- * add support for WCS 2.0
- * add caching
- * add various open options
+* fix typo on slopeFormat parameter (#8154)
+* osgeo_utils: align base.get_extension() and util.DoesDriverHandleExtension()
+  on C++ versions (#8277)
 
-WMS driver:
- * ArcGIS miniserver: use latestWkid and wkt metadata (#6112)
- * avoid AdviseRead() to download too many tiles at once (#7082)
- * recognize /ImageServer?f=json ESRI endpoints
- * Add support for maximum size and expiration time and unique per dataset name for WMS cache
+# GDAL/OGR 3.7.1 Release Notes
 
-XYZ driver:
- * fix 2.2.0 regression where the driver hangs on some dataset with missing samples (#6934)
- * support non numeric characters when there is an header line (#7261)
+GDAL 3.7.1 is a bugfix release.
 
-## OGR 2.3.0 - Overview of Changes
+## New installed files
 
-Core:
- * OGRLayer::FilterGeom(): make sure a feature with a null or empty geometry never matches a spatial filter (#7123)
- * OGRSimpleCurve::get_LinearArea(): return 0 on a non-closed linestring (#6894)
- * OGRFeature::SetField: Improve the setting for OFTInteger fields from a double.
- * OGR_G_TransformTo(): emit error message when source geometry has no SRS
- * OGR API SPY: various fixes
- * OGRCurve::get_isClosed(): do not take into account M component (#7017)
- * OGRLineString::setPoint() and addPoint() with a OGRPoint* argument. properly takes into account ZM, Z and M dimensions (#7017)
- * OGRMultiSurface: refuse to add a triangle to it. (github #357)
- * OGRPolyhedralSurface: importFromWkt(): remove support for invalid constructs, that contrary to comments are not supported by PostGIS
- * Fix OGR[Curve]Polygon::Intersects(OGRPoint*) to return true when point is on polygon boundary (#7091)
- * Emit an explicit error message for OGRGeometry::IsValid(), IsSimple(), IsRing() when GEOS is not available
- * Make OGRGeometry::assignSpatialReference() a virtual method, and make implementation recursively assign the SR to child geometries (#7126)
- * Expose OGRGeometry::swapXY() as OGR_G_SwapXY() in C API (#7025)
- * importFromWkt(): fix import of GEOMETRYCOLLECTION ending with POINT EMPTY or LINESTRING EMPTY (#7128, 2.1 regression)
- * OGRSQL: avoid silent cast so that int64->int overflow is better signaled
- * OGRSQL: accept using the real FID column name (in addition to the special 'FID' alias) (#7050)
- * Add GDAL_DCAP_NONSPATIAL capability to ODS, REC, XLS and XLSX drivers
- * Add GDAL_DCAP_FEATURE_STYLES capability to CAD, DGN, DWG, DXF, EDIGEO, JML, KML, lIBLML, MITAB, OpenAIR and VRT drivers
- * Add DMD_CREATIONFIELDDATASUBTYPES metadata type (github #278)
- * OGRParseDate(): only accept seconds up to 60 included for leap seconds (#6525)
- * Fix OGRPolygon::IsPointOnSurface() broken with polygons with holes
- * OGRFormatDouble(): add a OGR_WKT_ROUND config option that can be set to FALSE to disable the heuristics that remove trailing 00000x / 99999x patterns (#7188)
- * Add C++ iterators for feature in layer and field values in features.
- * Add C++ iterators for "sub-parts" of geometry classes
- * Const-correctness fixes in signatures of methods of OGRFeatureDefn, OGRFeature, OGRFieldDefn and OGRGeomFieldDefn classes.
- * Fix constness of OGR_G_CreateFromWkb(), OGR_G_CreateFromFgf(), OGR_G_ImportFromWkb() and related C++ methods
- * Fix const correctness of OGRGeometry::importFromWkt() and OGRGeometryFactory::createFromWkt(), and add compatibility wrappers
+* data/gfs.xsd and data/gml_registry.xsd
 
-OGRSpatialReference:
- * Update to EPSG v9.2 (#7125)
- * Update data/esri_extra.wkt and add data/esri_epsg.wkt, taken from https://github.com/Esri/projection-engine-db-doc (Apache v2 license) (#2163)
- * Add support for PROJ.5 new API (requires proj 5.0.1 or later)
- * Add a OSRFindMatches() function to look for equivalent SRS in the EPSG database, map it to SWIG Python. Enhance gdalsrsinfo to use it
- * Add OGRSpatialReference::convertToOtherProjection() (bound to C as OSRConvertToOtherProjection() and to SWIG) to transform between different equivalent projections (currently Merc_1SP <--> Merc_2SP and LCC_1SP <--> LCC_2SP) (#3292)
- * Fix OGRSpatialReference::IsSame() to return FALSE when comparing EPSG:3857 (web_mercator) and EPSG:3395 (WGS84 Mercator) (#7029)
- * importFromProj4(): implement import of Hotine Oblique Mercator Two Points Natural Origin, and fix OGRSpatialReference::Validate() for that formulation (#7042)
- * morphFromESRI(): fix remapping from DATUM = D_S_JTSK + PRIMEM = Ferro to OGC DATUM System_Jednotne_Trigonometricke_Site_Katastralni_Ferro
- * Add alternate simpler signature for OGRGeometryFactory::createFromWkt()
- * Add importFromWkt(const char**)
+## Build
 
-Utilities:
- * ogrmerge.py: fix '-single -o out.shp in.shp' case (#6888)
- * ogrmerge.py: allow using wildchar '*' in source names and use glob.glob to expand it
- * ogrmerge.py: correctly guess vrt format
- * ogrmerge.py: error when outputting to a existing vrt if -overwrite_ds is not specified
- * ogrmerge.py: use ogr.wkbUnknown to fix -nlt GEOMETRY
- * ogr2ogr: fix crash when using -f PDF -a_srs (#6920)
- * ogr2ogr: make -f GMT work again (#6993)
- * ogr2ogr: make it fail if GetNextFeature() returned NULL with an error
- * ogr2ogr: honour -select when using -addfiels
- * ogr2ogr: preserve source geometry field name for output drivers that support GEOMETRY_NAME layer creation option (such as GPKG)
- * ogr2ogr: add support for circularstring, compoundcurve, curvepolygon, multicurve and multisurface in SetZ()
- * GDALVectorTranslate(): fix converting from Memory to Memory datasources (#7217)
- * gnmmanage: fix crash on shape files with linestring and multilinestring geometries mixing
- * ogrtindex: fix crash when using -f SQLITE -t_srs XXXX (#7053)
- * ogrinfo: always open in read-only mode, unless -sql without -ro is specified
- * ogrinfo/ogr2ogr with -sql @filename: remove lines starting with '--' (github #459)
+* CMake: only try to detect HDF5 CXX component if KEA is detected
+* CMake: capture dependency of MBTiles driver to MVT
+* CMake: add a EXPAT_USE_STATIC_LIBS hint (#7955)
+* CMake: add a CURL_USE_STATIC_LIBS hint (#7955)
+* minified_zutil.h: fix build error on Gentoo and derivatives (#7739)
+* Fix build error with MSYS64 UCRT64 with gcc 13 (#7909)
+* FlatGeobuf: fix build error when new Abseil headers are present (#7894)
+* Fix build against latest libjxl master
 
-Multi driver changes:
- * port/tag ILI, NAS, DGN, NTF, SDTS, OGR_GMT, Geoconcept, AVCE00, AVCBin to VirtualIO API
+## GDAL 3.7.1
 
-Amigocloud driver:
- * Fixed data field types (github #246)
- * Output list of datasets if dataset id is not provided.
- * Implemented waiting for job to complete on the server. This will improve write to AmigoCloud reliability.
- * Add HTTP user agent (github #263)
- * add OVERWRITE open option (github #268)
+### Port
 
-AVCE00 driver:
- * Make sure AVCE00 opens .e00 files and not AVCBIN one
+* CPLBloscDecompressor(): fix logic error when providing an output buffer
+  larger than needed
+* Fix issues on big endian hosts: recode from UTF-16
+* RequiresUnixPathSeparator(): takes into account /vsihdfs/ and /vsiwebhdfs/
+  (#7801)
+* /vsiadls/: make it take into account Azure SAS token
+* /vsiaz/: fix truncated Authorization header with very large SAS tokens
 
-AVCBin driver:
- * fix 2.1 regression regarding attributes fetching (#6950)
+### Core
 
-Carto driver:
- * fix append mode by retrieving the sequence name for the primary key (#7203)
- * fix insertion with ogr2ogr -preserve_fid (#7216)
- * fix missing features when iterating over a SQL result layer with pagination (#6880)
+* Multidim GDALGroup::CopyFrom(): modify logic to copy first indexing variables.
+  Fixes issue with gdalmdimtranslate from Zarr to netCDF
+* RawRasterBand::IRasterIO(): avoid harmless unsigned integer overflow
+  (ossfuzz #57371)
+* GDALDatasetPool: Make VRT pool size clamping more lenient (#7977)
+* PAM rasterband: on .aux.xml reading do not systematically set (offset,scale)
+  to (0,1) and similarly for unit type (#7997)
 
-CSV driver:
- * add a STRING_QUOTING=IF_NEEDED/IF_AMBIGUOUS/ALWAYS layer creation option, that defaults to IF_AMBIGUOUS (quote strings that look like numbers)
- * temporarily disable spatial and attribute filter when rewriting CSV file (#7123)
- * fix autodetection of types when a Real value is followed by a Integer64 one (#343)
+### Algorithms
 
-DGNv8 driver:
- * add support for building against static library (#7155)
+* Warp (average,mode,min,max,med,Q1,Q3): fix issue on edge of target valid area
+  when oversampling (#7733)
+* Warp average resampling: using Weighted incremental algorithm mean for numeric
+  stability
+* GDALWarpResolveWorkingDataType(): take into account data type of both source
+  and target dataset
 
-DXF driver:
- * Support LEADER and MULTILEADER entities (#7111, #7169)
- * Support HELIX and TRACE entities
- * Support spline hatch boundaries
- * Support MLINE entity
- * Support rows/columns within INSERT
- * Add support for block attributes (ATTRIB entities) (#7139)
- * Support text styles (#7151)
- * Support cylinders (CIRCLE entities with thickness)
- * set dx and dy to DXF LABEL style string on TEXT and MTEXT objects (github #225)
- * fix reading of hatches with boundaries that contain elliptical arcs (#6971)
- * fix reading files where INSERT is the last entity and DXF_MERGE_BLOCK_GEOMETRIES is false (#7006)
- * fix ordering of vertices in a SOLID entity (#7089)
- * only apply certain escaping rules to the text of the MTEXT object (#7047)
- * Handle all known MTEXT escapes; allow user to turn off text unescaping (fixes #7122)
- * do not apply the OCS transformation for MTEXT (#7049)
- * do not output dx and dy in MTEXT style strings (#7105)
- * apply DXF codepage encoding while decoding ExtendedEntity field (#5626)
- * allow user to set the tolerance used when joining parts of a hatch boundary with a DXF_HATCH_TOLERANCE config option, and default to 1e-7 of the extent of the geometry (#7005)
- * refactor out block insertion to its own function, and transform insertion point of an INSERT entity into OCS (#7077)
- * on write side, force 'defpoints' layer to be non-displayed (#7078)
- * entities on layer 0 within a block should inherit the style of the layer the INSERT is on. Do that for entities with a PEN style string for now. (#7099)
- * OCS fixes for HATCH and INSERT entities (#7098)
- * defer inlining of blocks until actually required (#7106)
- * Read DIMSTYLEs and block record handles
- * Handle linetype scales (#7129)
- * Improved support for DIMENSION entities (#7120)
- * handle ByBlock colors (#7130)
- * Fix parsing of complex linetypes (#7134)
- * Correct color for ByBlock text features; respect hidden objects (#5592, #7099, #7121)
- * Make ACAdjustText also transform text width and offset (#7151)
- * Honor block base points (#5592)
- * Use BRUSH style tool instead of PEN when reading polygonal SOLIDs and leader arrowheads; add PEN style string to 3DFACE
- * Specify ground units for TEXT dx and dy style values; interpret dx and dy in the writer
- * Fix bug in text style property retrieval; handle text color in DIMENSION fallback renderer
- * Write text styles and HATCH elevations; fix output of invalid extent values (#7183)
- * Allow access to unused entity group codes with RawCodeValues field (github #226)
- * Reduce the size of header.dxf and trailer.dxf (tested with AutoCAD, QCAD Teigha, QCAD dxflib, FME)
- * Make the writer aware of linetype scaling
- * Don't force elevation to zero in smooth polylines (#7200)
- * Always output all edges in polyface mesh, and add styling (#7219)
- * Remove incorrect OCS transformation from MLINE entities
- * Introduce 3D extensible mode to allow translation of 3D entities
+### Utilities
 
-ESRIJson driver:
- * "New": extracted from code previously in GeoJSON driver
- * avoid endless looping on servers that don't support resultOffset (#6895)
- * use 'latestWkid' in priority over 'wkid' when reading 'spatialReference' (github #218)
- * recognize documents that lack geometry fields (#7071)
- * do not attempt paging requests on a non-HTTP resource
- * recognize documents starting with a very long fieldAliases list (#7107)
+* gdallocationinfo: set exit code to 1 as soon as one coordinate is off the file
+  (#7759)
+* gdal_rasterize: issue explicit error message when specifying invalid layer
+  name, and catch absence of bounds (#7763)
+* gdalsrsinfo: when -e flag is passed, report properly non EPSG authorities
+  (#7833)
+* gdalwarp: make -cutline to work again with PostGIS datasources
+  (fixes 3.7.0 regression, #8023)
+* gdal_calc.py: allow "none" or a float for --NoDataValue (#7796)
+* gdal_calc.py: make --hideNoData imply --NoDataValue=none as documented (#8009)
 
-FileGDB driver:
- * remove erroneous ODsCCreateGeomFieldAfterCreateLayer capability declaration (github #247)
- * add LAYER_ALIAS layer creation option (#7109)
- * FileGDB / OpenFileGDB: attempt to recover EPSG code using FindMatches()
- * FileGDB / OpenFileGDB: linearize Bezier curves with a more reasonable number of points
+### Raster drivers
 
-GeoJSON driver:
- * Add support for json-c v0.13 (github #277)
- * support loading (true) GeoJSON files of arbitrary size (#6540)
- * in update mode, support appending features, in some cases, without ingesting features of existing file into memory
- * writer: accept writing ZM or M geometry by dropping the M component (#6935)
- * fix 2.2 regression regarding lack of setting the FeatureCollection CRS on feature geometries (fixes https://github.com/r-spatial/sf/issues/449#issuecomment-319369945)
- * make sure that -lco WRITE_NAME=NO works even if the native data has a 'name' attribute
- * ignore 'properties' member of features whose value is null or empty array
- * fix writing of id with RFC7946=YES (#7194)
- * add ID_FIELD and ID_TYPE layer creation options
+DIMAP driver:
+ * correctly set RPC origin for SPOT, PHR and PNEO (#7726)
 
-GeoPackage driver:
- * default to version 1.2 (#7244)
- * speed-up loading of databases with hundreds of layers
- * make driver robust to difference of cases between table_name in gpkg_contents/gpkg_geometry_columns and name in sqlite_master (#6916)
- * fix feature count after SetFeature() with sqlite < 3.7.8 (#6953)
- * do not error out if extent in gpkg_contents is present but invalid (#6976)
- * avoid GetFeature() to hold a statement, that can cause database locking issues (https://issues.qgis.org/issues/17034)
- * emit warning when feature geometries are not assignable to layer geometry type
- * remove UNIQUE keyword for PRIMARY KEY of gpkg_metadata (doesn't hurt, but just to align with the examples of DDL in the GeoPackage spec)
- * fix logic to detect FID on SQL result layer when several FID fields are selected (#7026)
- * fix handling of spatial views
- * do not try to update extent on gpkg_contents after GetExtent() on a empty layer of a datasource opened in read-only mode
- * when inserting a SRS with a non-EPSG code, then avoid using srs_id that could be later assigned to a EPSG code
- * when deleting a layer, delete from gpkg_metadata metadata records that are only referenced by the table we are about to drop
- * fix incorrect rtree_<t>_<c>_update3 trigger statement (https://github.com/opengeospatial/geopackage/issues/414)
- * fix definition of extensions
- * only create metadata table if needed, and register it as extension
- * declare gpkg_crs_wkt extension when using GPKG_ADD_DEFINITION_12_063=YES config option, and do not emit warning when finding it declared
-
-GeoRSS driver:
- * fix detection of field type (#7108)
+DIPEx driver:
+ * fix memleak in error code path (ossfuzz 57478)
 
-GML driver:
- * CreateGeometryFromGML(): accept gml:Arc with odd number of points > 3, even if they are invalid
- * decode gml:Solid as PolyhedralSurface (#6978)
- * JPGIS FGD v4: fix logic so that coordinate order reported is long/lat (github #241)
- * a GML_FEATURE_COLLECTION=YES/NO dataset creation option
- * fix FORCE_SRS_DETECTION=YES effect on feature count and SRS reporting on gml files with .gfs (#7046)
- * do not try to open some kml files (#7061)
- * do not report gml:name / gml:description of features as layer metadata
+ERS driver:
+ * avoid integer overflow (ossfuzz 57472)
 
-GMLAS driver:
- * get the srsName when set on the srsName of the gml:pos of a gml:Point (#6962)
- * CityGML related fixes: better take into account .xsd whose namespace prefix is not in the document, fix discovery of substitution elements, handle gYear data type (#6975)
- * properly interpret SolidPropertyType (#6978)
- * handle GML geometries in elements that are a substitutionGroup of an element (#6990)
- * make sure to try namespaces that are indirectly imported (helps in the case of parsing the result of a WFS GetFeature request)
- * take into account gYearMonth XML data type (https://github.com/BRGM/gml_application_schema_toolbox/issues/46)
- * implement resolution of internal xlink:href='#....' references (https://github.com/BRGM/gml_application_schema_toolbox/issues/31)
- * Recognize gml:Envelope as a Polygon geometry (https://github.com/BRGM/gml_application_schema_toolbox/issues/56#issuecomment-381967784)
-
-GMT:
- * fix creation of several layers
-
-IDB driver:
- * optimize spatial query using spatial index and st_intersects function (#6984)
- * close connection at dataset closing (#7024)
+GTiff driver:
+ * multi-threaded reader: avoid error when reading PlanarConfiguration=Separate
+   and ExtraSamples > 0 (fixes #7921)
+ * Multi-threaded reader: fix crash/read errors when reading a
+   PlanarConfiguration=Separate file band per band (rasterio/rasterio#2847)
+ * SRS writer: make sure to write EPSG codes only in VerticalDatumGeoKey and
+   VerticalUnitsGeoKey, and write VerticalCSTypeGeoKey = KvUserDefined,
+   VerticalDatumGeoKey = KvUserDefined and VerticalCitationGeoKey=CRS name when
+   the vertical CRS code is unknown (#7833)
+ * SRS reader: try to recover the vertical datum from the name of the vertical
+   CRS if we only know it (#7833)
+ * SRS reader: try to retrieve the EPSG code of a CompoundCRS if the one of its
+   horizontal and vertical part is known (#7982)
+ * SPARSE_OK=YES: recognize negative floating point 0 as 0 (#8025)
+ * do not emit 'WEBP_LEVEL is specified, but WEBP_LOSSLESS=YES' warning when
+   only WEBP_LOSSLESS=YES is specified
 
-ILI driver:
- * declare OLCCreateField and OLCSequentialWrite capabilities
+HDF5 driver:
+ * multidim: deal with _FillValue attribute of different type as variable
+   (e.g. for NASA GEDI L2B products)
 
-Ingres driver:
+ISG driver:
+ * relax tolerance check to accept GEOIDEAR16_20160419.isg
 
-JML driver:
- * add support for reading and write SRS from gml:Box element (#7215)
+JP2OpenJPEG driver:
+ * avoid hard crash in multi-threaded writing mode when opj_write_tile()
+   fails (#7713)
 
-KML driver:
- * KML / LIBKML: read documents with an explicit kml prefix (#6981)
- * KML/LIBKML: make sure layer names are unique (QGIS github#5415)
+netCDF driver:
+ * multidim: fix issues with data vs definition mode
+ * multidim: deal with _FillValue attribute of different type as variable
+   (e.g. for NASA GEDI L2B products)
+ * parse coordinates attribute from Sentinel-3 Synergy product which uses
+   comma instead of space
 
-LIBKML driver:
- * fix reading placemarks in toplevel container, when it has subfolders (#7221)
- * improve open performance on huge number of layers
+OGCAPI driver:
+ * Fix TILES raster API not working
+ * make sure OGR_ENABLE_DRIVER_GML is set when the driver is built
 
-MDB driver:
- * fix multi-thread support (https://issues.qgis.org/issues/16039)
+OpenFileGDB driver:
+ * correctly deal with rasters whose block_origin_x/y != (eminx, emaxy) (#7794)
+ * do not emit error if SRS is unknown (#7794)
+ * reduce debug traces on raster datasets
 
-MITAB driver:
- * support for additional datums (#5676)
- * add support for Reseau_National_Belge_1972 / EPSG:31370 on writing (#6903)
- * add support for SWEREF99 datum (#7256)
- * fix EPSG datum code for NTF Paris
- * support units as code instead of string when reading a coordsys string from a .mif (#3590)
- * add read/write support between MapInfo text encodings and UTF-8. Add ENCODING layer/dataset creation option (github #227)
- * do not emit error if the .ind file is missing, just a debug message (#7094)
- * accept creating files with LCC_1SP SRS (#3292)
- * support 'CREATE INDEX ON layer_name USING field_name' (if called after field creation and before first feature insertion)
- * avoid reporting invalid extent on empty .mif
- * report aspatial .tab as wkbNone geometry type
- * export BRUSH(fc:#.....) with mapinfo brush pattern 2 (solid fill)
-
-mongoDB driver:
- * compilation fix on Windows
+SAFE driver:
+ * fix non-contiguous number in subdataset names (#7939)
 
-MSSQLSpatial driver:
- * Fix issues on x64 (#6930)
- * Implement EXTRACT_SCHEMA_FROM_LAYER_NAME layer creation option.
- * properly format DELETE statement with schema (#7039)
+Zarr driver:
+ * avoid GetMDArrayNames() to report duplicates
+ * fix SRS DataAxisToSRSAxisMapping
 
-MySQL:
- * fix compilation issue with MariaDB 10.1.23 (#6899) and MariaDB 10.2 (#7079)
- * make sure geometry column name is properly set (GDAL 2.0 regression, github #397)
+WMTS driver:
+ * workaround buggy TileMatrix.TopLeftCorner of one server (#5729)
 
-NAS driver:
- * [NAS/GML] try reversing non contiguous curves
- * Allow usage of a GFS template file for type assignment and mapping of element paths to attributes and remove arbitrary hacks that used to avoid attribute name conflicts:
- * New option: NAS_GFS_TEMPLATE: specify gfs template
- * New option: NAS_NO_RELATION_LAYER: skip unused alkis_beziehungen (also makes progress available)
- * Multiple geometries per layer
- * NAS_INDICATOR updated to "NAS-Operationen;AAA-Fachschema;aaa.xsd;aaa-suite"
- * use single geometry column name from input (like GMLAS)
- * accept unqualified attribute name in wfs:Update
+## OGR 3.7.1
 
-NTF driver:
- * fix regression introduced by fix for https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2166 causing some valid records to be skipped (#7204)
+### Core
 
-NULL driver:
- * Generalize OGR NULL development driver as a GDAL raster+vector one; enable to compile it --with-null
+* OGRGeometryFactory::createGeometry(): take into account Z/M flags
+* SQL SQLite: fix error on field of type String with GetWidth() > 0 and a
+  field domain
 
-OCI driver:
- * initialize in multi-threaded compatible mode (https://issues.qgis.org/issues/17311)
- * support for extended max_string_size (#7168)
+### Vector drivers
 
-ODBC driver:
- * deal with table names that require double quoting (#7242)
+CSV driver:
+ * do not allow CREATE_CSVT=YES with /vsistdout/ (#7699), and make it possible
+   to use GEOMETRY_NAME with /vsistdout/ (#7700)
 
-ODS driver:
- * add read/write support for Boolean sub datatype
+DGN driver:
+ * CreateFeature(): fix crash on empty geometries (ossfuzz 56771)
 
-OSM driver:
- * performance improvements
- * increase string buffer for osm XML files (#6964)
- * OGR_SQL/OSM: avoid OSM driver warning about attribute filter not being taken into account when issuing a 'select * from X limit Y' request on a OSM datasource
+DXF driver:
+ * show constant ATTDEFs as text
 
-OpenFileGDB driver:
- * properly read GeneralPolygon with M component whose all values are set to NaN (#7017)
+FileGDB driver:
+ * OGRCreateFromShapeBin(): accept empty polygon (#7986)
 
-PDF driver:
- * make OGR_PDF_READ_NON_STRUCTURED=YES configuration option work with documents without layers (#6359)
- * Improvements to text and dash pattern support in writer (#7185)
+GeoJSON driver:
+ * Internal libjson: use locale insensitive CPLStrtod() to parse floating point
+   numbers (qgis/qgis#52731)
 
-PDS driver:
- * fix reading 8-byte IEEE_REAL fields (github #570)
+GeoPackage driver:
+ * ArrowArray interface: make it tolerant to Spatialite geometries
+ * fix handling of geometry column from a view, when it is the result of
+   computing, and not just simple selection from a table
+ * define a 'gdal_spatialite_computed_geom_column' extension when a view has
+   its geometry column being the result of Spatialite SQL function
+ * implement GeoPackage 1.4 RTree triggers, and add a VERSION=1.4 dsco (#7823)
 
-PG driver:
- * do not be confused by a 'geometry' table in a non-PostGIS enabled database (#6896)
- * PG/PGDump: make sure serial sequence is updated at layer closing/end-of-copy if we inserted features with fixed ids (#7032)
+GML driver:
+ * fix 3.7.0 regression when reading files with several layers, whose features
+   have gml:boundedBy elements and the geometry element name is different
+   between the different layers (#7925)
+ * add a USE_BBOX=YES open option to allow using gml:boundedBy as feature
+   geometry (#7947) to revert back to < 3.7.0 behavior by default
 
-PLScenes driver:
- * remove support for V0 and V1 API. Only Data V1 is kept (#6933)
- * add SkySatScene
+GTFS driver:
+ * Fix date parsing
 
-SEGY driver:
- *report more attributes from Segy Standard Trace Header (github #315)
+MITAB driver:
+ * fix reading CRS with LCC_2SP and non-metre unit (#7715)
 
-Shapefile driver:
- * Fix GetFeatureCount() to properly take into account spatial filter when attribute filter also in effect (#7123)
- * use VSIStatL() in Create() to properly work with /vsimem/ directories (#6991)
- * fix regression affecting GDAL 2.1.3 or later, 2.2.0 and 2.2.1, when editing the last shape of a file and growing it, and then appending a new shape, which resulted in corruption of both shapes (#7031)
- * hide shapelib symbols on Unix
- * improvements auto-identification of EPSG codes from input SRS, using OSRFindMatches()
- * Improve guidance on use of SHAPE_RESTORE_SHX in SHPOpenLL() (#7246)
+MSSQL driver:
+ * fix crash in ogr2ogr when BCP is enabled (#7787)
+ * fix GEOGRAPHY clockwise vertex order (#1128)
+ * fix cannot write binary field in BCP mode (#3040)
 
-SQLite/Spatialite driver:
- * SQLite/GPKG: report SQLITE_HAS_COLUMN_METADATA=YES as driver metadata item when it is available (#7007)
- * escape integer primary key column name on table creation (#7007)
- * don't invalidate statistics when running a PRAGMA (https://issues.qgis.org/issues/17424)
- * SQLite dialect: avoid erroring out if source layer has a OGR_STYLE field
- * SQLite dialect: support SQLite 3.21, and LIKE, <>, IS NOT, IS NOT NULL, IS NULL and IS operators (fixes #7149)
- * SQLite/GPKG: avoid parsing of OGR_SQLITE_JOURNAL to stop on JOURNAL_MODE keyword
+MVT driver:
+ * writing: improve dealing with polygon inner rings (#7890)
+ * writing: fix wrong winding order for polygons after MakeValid()
 
-VFK driver:
- * fix collecting linestrings for sbp layer
- * collect geometries also for zvb layer
- * Improve VFK parser logic (github #365)
- * add option to suppress geometry (github #371)
+MySQL driver:
+ * add support for inserting new SRS in MySQL >= 8
+   INFORMATION_SCHEMA.ST_SPATIAL_REFERENCE_SYSTEMS table (#7781)
 
-VRT driver:
- * increase maximum size limit to 10 MB (instead of 1MB), and add config option to be able to force loading if above that
+netCDF driver:
+ * fix crash on invalid layer (ossfuzz 58469)
 
-XLS driver:
- * workaround opening filenames with incompatible character set on Windows (https://issues.qgis.org/issues/9301)
+OpenFileGDB driver:
+ * allows to modify a record with a GlobalID field without regenerating it
+ * correctly read POINT EMPTY (#7986)
 
-XLSX driver:
- * avoid 'ogr2ogr -f XLSX out.xlsx in.shp -preserve_fid' to overwrite the first record. Note however that FID preservation itself doesn't really work with XLSX (#6994)
- * fix non working detection of Date/Time fields in some documents (#7073)
- * fix opening of documents with x: namespace in xl/workbook.xml (#7110)
- * fix misdetection of field type if first cell blank (github #291)
- * fix updating multi layer document where existing layers where dropped (#7225)
- * add read/write support for Boolean sub datatype
- * on writing, use %.16g formatting for floating point numbers (#7230)
+Parquet driver:
+ * fix crash when calling SetIgnoredFields() after SetAttributeFilter()
+   (qgis/QGIS#53301)
+ * do not hang on empty RecordBatch (#8042)
 
-## SWIG Language Bindings
+SDTS driver:
+ * fix reading of polygon geometries (#7680)
 
-All bindings:
- * Expose gdal.VSIFEofL()
- * Expose gdal.GRA_Max, GRA_Min, GRA_Med, GRA_Q1 and GRA_Q3 (#7153)
- * Expose Geometry.SwapXY()
- * Expose Geometry.RemoveGeometry()
- * Expose SpatialReference.SetMercator2SP()
- * Expose Band.AdviseRead() and Dataset.AdviseRead()
+Shapefile driver:
+ * in creation, uses w+b file opening mode instead of wb followed by r+b, to
+   support network file systems having sequential write only and when using
+   CPL_VSIL_USE_TEMP_FILE_FOR_RANDOM_WRITE=YES (#7801)
+ * SHPRestoreSHX: update SHX content length even if error occurred
+ * Internal Shapelib: update list of symbols to rename to avoid conflicts with
+   external shapelib (microsoft/vcpkg#32070)
 
-CSharp bindings:
+TileDB driver:
+ * add TILE_Z_EXTENT layer creation option (#7683)
+ * fully apply spatial filter when using ArrowArray interface
+ * FillPrimitiveListArray(): fix data corruption with spatial filter
 
-Java bindings:
- * create single JNI shared library (gdalalljni.so/dll) (github #286)
+## Python bindings
 
-Perl bindings:
- * Keep parent geometry alive if an object is created from a child geometry. Experimental methods Features and Geometries. Catch an error in storing a geometry into a feature. Prefer GeometryCount over GetGeometryCount and Geometry over GetGeometryRef.
- * Set INSTALLSITEMAN1DIR and INSTALLSITEMAN3DIR according to what is in GDALmake.opt if INSTALL_BASE is set. (#6142)
- * ignore no data cells in ClassCounts and Reclassify for real valued rasters.
- * support for number line (or decision tree) classifiers also for integer bands.
- * Set error handler separately in all modules (required by Strawberry Perl build).
+* take into account Int64/UInt64 in gdal.Array.Write(array(...))
+* do not pass deprecated -py3 SWIG switch for SWIG >= 4.1
+* GetArrowStreamAsNumPy(): fix wrong retrieval of content when
+  ArrowArray::offset != 0 on a field of primitive type (integer, float)
+* works around issue with SWIG 4.1 related to module unloading (#4907)
 
-Python bindings:
- * add scripts to python module (#342)
- * make sure that errors in Open() related functions, that do not prevent dataset opening in C/C++, do not either prevent it in Python (#7094)
- * avoid hang when calling gdal/ogr.UseExceptions()/DontUseExceptions() in wrong order (#6891)
- * accept callback = 0 since SWIG generates it as the default argument of BandRasterIONumPy(). (github #219)
- * fix 2.2.0 regression preventing use of callback function in Band.ComputeStatistics() (#6927)
- * fix reference count issue on gdal.VSIStatL() when it returns None, that can cause Python crashes if None refcount drops to zero
- * avoid potential cross-heap issue on Windows with numpy (https://trac.osgeo.org/osgeo4w/ticket/466)
- * fix potential alignment issues when reading double values with ReadRaster() or ReadBlock()
- * fix issue with PyInstaller (#7044)
- * add a addAlpha option to gdal.DEMProcessing()
- * fix for include files when building .cpp files (github #258)
- * make gdal.Transform() return None in case of an error (instead of an invalid Transformer object)
- * emit exceptions if VSI_RETVAL methods (such as gdal.Rename()) fail and gdal.UseExceptions() is enabled
- * add addFields and forceNullable options to gdal.VectorTranslate()
- * for command line utilities as functions, serialize number of floating-point arguments with higher precision
- * Fix python 3.x package installation in custom prefixes (#6671)
- * lots of PEP8-related fixes in scripts and autotest
- * add NULL checks after PyUnicode_AsUTF8String() in case the unicode cannot be translated to UTF-8 and workaround SWIG bug to avoid crashes with Python 3. (github #356)
- * make sure gdal.VectorTranslate() and gdal.Grid() open their source dataset with a vector driver (github #449)
- * make 'for field_val in feature' work (github #451)
-
-# GDAL/OGR 2.2.0 Release Notes
+# GDAL/OGR 3.7.0 Releases Notes
+
+GDAL/OGR 3.7.0 is a feature release.
+Those notes include changes since GDAL 3.6.0, but not already included in a
+GDAL 3.6.x bugfix release.
 
 ## In a nutshell...
 
- * New GDAL/raster drivers:
-   - DERIVED driver: read-support. Expose subdatasets in a a new metadata domain, called DERIVED_SUBDATASETS
-   - JP2Lura driver: read/create support for JPEG-2000 images using Luratech JP2 Library
-   - PRF: add read-only support for PHOTOMOD PRF file format driver (github #173)
-   - RRASTER driver: read-support .grd/.gri files handled by the R 'raster' package (#6249)
- * New OGR/vector drivers:
-    - CAD driver: read support for DWG R2000 files (GSoC 2016 project)
-    - DGNv8 driver: read-write support for DGN 8.0 format (using Teigha ODA libraries)
-    - GMLAS driver: read-write support. XML/GML driver driven by Application Schemas.
- * New utility script: ogrmerge.py to merge several vector datasets into a single one
- * New /vsigs/ and /vsigs_streaming/ virtual file systems to read Google Cloud Storage non-public files
- * Significantly improved drivers:
-  - NWT_GRD: write support (#6533)
-  - FileGDB/OpenFileGDB: add support to read curve geometries (#5890)
-  - VRT derived band: add the capability to define pixel functions in Python
-  - Add read support for RasterLite2 coverages in SQLite driver
-  - GPKG: implement tiled gridded elevation data extension
-  - ISIS3: add write support and improve read support
- * RFC 63: Add GDALRasterBand::GetDataCoverageStatus() and implement it in GTiff and VRT drivers
-        https://trac.osgeo.org/gdal/wiki/rfc63_sparse_datasets_improvements
- * RFC 64: Triangle, Polyhedral surface and TIN
-        https://trac.osgeo.org/gdal/wiki/rfc64_triangle_polyhedralsurface_tin
-   ==> this RFC introduces potential backward incompatible behavior.
-        Consult MIGRATION_GUIDE.txt
- * RFC 66: OGR random layer read/write capabilities
-        https://trac.osgeo.org/gdal/wiki/rfc66_randomlayerreadwrite
- * RFC 67: add null field state for OGR features, in addition to unset fields
-        https://trac.osgeo.org/gdal/wiki/rfc67_nullfieldvalues
-   ==> this RFC introduces potential backward incompatible behavior.
-        Consult MIGRATION_GUIDE.txt
- * Upgrade to EPSG database v9.0 (#6772)
- * Python bindings: Global Interpreter Lock (GIL) released before entering GDAL native code (for all, in GDAL module and a few ones in ogr like ogr.Open())
- * Continued major efforts on sanitization of code base
- * Remove bridge and vb6 bindings (#6640)
- * GNM built by default
-
-## Installed files
-
- * Removed: data/s57attributes_aml.csv data/s57attributes_iw.csv data/s57objectclasses_aml.csv data/s57objectclasses_iw.csv
- * Added plscenesconf.json, gmlasconf.xsd
+* [RFC 87](https://gdal.org/development/rfc/rfc87_signed_int8.html): Add
+  GDT_Int8 support
+* [RFC 88](https://gdal.org/development/rfc/rfc88_googletest.html): switch
+  to GoogleTest framework for C++ tests (#3525)
+* [RFC 89](https://gdal.org/development/rfc/rfc89_sql_logging_callback.html):
+  SQL query logging callback (#6967)
+* [RFC 90](https://gdal.org/development/rfc/rfc90_read_compressed_data.html):
+  Direct access to compressed raster data
+* [RFC 91](https://gdal.org/development/rfc/rfc91_dataset_close.html):
+  GDALDataset::Close() method
+* [RFC 93](https://gdal.org/development/rfc/rfc93_update_feature.html):
+  OGRLayer::UpdateFeature() method
+* [RFC 94](https://gdal.org/development/rfc/rfc94_field_precision_width_metadata.html):
+  Numeric fields width/precision metadata
+* ogrinfo: make it accessible through a new GDALVectorInfo() C API call, and
+  a -json switch
+* Add read-only raster driver NOAA_B to read NOAA GEOCON/NADCON5 .b grids
+* Add read-only raster driver NSIDCbin for Sea Ice Concentrations (#7263)
+* Add read-only vector GTFS (General Transit Feed Specification) driver
+* TileDB: add read/write vector side
+* Add support for [SOZip](https://sozip.org) (Seek Optimized ZIP) with enhanced
+  /vsizip/ virtual file system and a new sozip utility
+* OpenFileGDB: add read-only support for raster datasets (.gdb v10)
+* PNG: 1.7-2.0x speed-up in whole image decompression with libdeflate on
+  Intel/AMD CPUs. Benefits GPKG, MRF drivers
+* [RFC 69](https://gdal.org/development/rfc/rfc69_cplusplus_formatting.html):
+  C++ code reformatting
+* Code linting and security fixes
+* Remove any traces of Rasdaman driver, now moved to OSGeo/gdal-extra-drivers
+  repository (#4808)
 
 ## Backward compatibility issues
 
-See MIGRATION_GUIDE.TXT
-
-## GDAL/OGR 2.2.0 - General Changes
-
-Build(Unix):
- * improve detection of packaged libfyba (SOSI) --with-sosi, as in Ubuntu 16.04 (#6488)
- * Sort files in static library to make the build reproducible (#6520)
- * fix libqhull include path when it is /usr/local/include/libqhull (#6522)
- * FileGDB: compilation fix on Linux in C++11 mode
- * configure: make pdfium detection not fail if there are just warnings. And make configure fail if --with-pdfium was required but failed (#6653)
- * Make ./configure --with-xerces fail if not found
- * Don't install script documentation in INST_BIN (github #157)
- * configure: auto-detect webp without requiring explicit --with-webp
- * configure: use pkg-config for HDF5 detection so that works out of the box on recent Ubuntu
- * auto-detect JDK 8 on Ubuntu
- * MDB: allow libjvm.so to be dlopen'd with --with-jvm-lib=dlopen (Unix only, github #177)
- * configure: delete temporary directories on the mac
- * configure: make sure --with-macosx-framework is correctly defined
- * configure: error out if --with-ld-shared is specified (#6769)
- * configure: remove bashism.
- * configure: fix --without-mrf (#6811)
- * configure: take into account CXXFLAGS and LDFLAGS in a few more cases (cryptopp, podofo, libdap)
- * Vagrant: all lxc and Hyper-V provider support; use vagrant-cachier for package caching
- * configure: update DWG support to work with Teigha libraries
- * Internal libgeotiff: hide symbols in --with-hide-internal-symbols mode
- * Shape: do not export Shapelib symbols for builds --with-hide-internal-symbols (#6860)
-
-Build(Windows):
- * Try to avoid confusion between libqhull io.h and mingw own io.h (#6590)
- * update script to generate most recent Visual C++ project files (#6635)
- * fix broken and missing dependencies in makefile.vc
- * add a way to use an external zlib (github #171)
- * Rename makegdal_gen.bat to generate_vcxproj.bat
- * generate_vcxproj.bat: Set correct value of PlatformToolset property based on specified Visual C++ version. Add NMAKE command line parameters: MSVC_VER based on specified Visual C++ version, DEBUG=1 WITH_PDB=1 to Debug build configuration.
- * generate_vcxproj.bat: generate project for autotest/cpp (Ticket #6815)
-* Add WIN64=1 to NMAKE command line options.
- * Add HDF4_INCLUDE option (#6805)
- * Add MSVC compiler option /MP to build with parallel processes.
- * Add ZLIB_LIB missing from EXTERNAL_LIBS
+See [MIGRATION_GUIDE.TXT](https://github.com/OSGeo/gdal/blob/release/3.7/MIGRATION_GUIDE.TXT)
 
-Build(all):
- * make Xerces 3.1 the minimal version
- * drop support for PostgreSQL client library older than 7.4, or non security maintained releases older than 8.1.4, 8.0.8, 7.4.13, 7.3.15
+## New installed files
 
-## GDAL 2.2.0 - Overview of Changes
+* data/gfs.xsd: XML schema for .gfs files (#6655)
+* data/gml_registry.xsd: new file with XML schema of gml_registry.xml (#6716)
+* data/ogrinfo_output.schema.json: to validate ogrinfo -json output
+* data/gdalinfo_output.schema.json: to validate gdalinfo -json output (fixes #6850)
+* data/grib2_table_4_2_0_21.csv
+* data/grib2_table_4_2_2_6.csv
+* bin/sozip
 
-Port:
- * Export VSICreateCachedFile() as CPL_DLL so as to enable building JP2KAK as a plugin
- * Added possibility to find GDAL_DATA path using INST_DATA definition without execution GDALAllRegister if GDAL_DATA placed in version named directory on Linux (#6543)
- * Unix filesystem: make error message about failed open to report the filename (#6545)
- * File finder: Remove hardcoded find location (/usr/local/share/gdal) (#6543)
- * Win32 filesystem handler: make Truncate() turn on sparse files when doing file extension
- * Add VSIFGetRangeStatusL() and VSISupportsSparseFiles()
- * GDAL_NO_HARDCODED_FIND compilation option (#6543,#6531) to block file open calls (for sandboxed systems)
- * Add VSIMallocAligned(), VSIMallocAlignedAuto() and VSIFreeAligned() APIs
- * /vsizip / /vsitar: support alternate syntax /vsitar/{/path/to/the/archive}/path/inside/the/tar/file so as not to be dependent on file extension and enable chaining
- * Optimize opening of /vsitar/my.tar.gz/my_single_file
- * /vsizip/ : support creating non-ASCII filenames inside a ZIP (#6631)
- * VSI Unix file system: fix behavior in a+ mode that made MRF caching not work on Mac and other BSD systems
- * Fix deadlock at CPLWorkerThreadPool destruction (#6646)
- * Windows: honour GDAL_FILENAME_IS_UTF8 setting to call LoadLibraryW() (#6650)
- * CPLFormFilename(): always use / path separator for /vsimem, even on Windows
- * /vsimem/: add trick to limit the file size, so as to be able to test how drivers handle write errors
- * /vsimem/: fix potential crash when closing -different- handles pointing to the same file from different threads (#6683)
- * CPLHTTPFetch(): add MAX_FILE_SIZE option
- * CPLHTTPFetch(): add a CAINFO option to set the path to the CA bundle file. As a fallback also honour the CURL_CA_BUNDLE and SSL_CERT_FILE environment variables used by the curl binary, which makes this setting also available for /vsicurl/, /vsicurl_streaming/, /vsis3/ and /vsis3_streaming/ file systems (#6732)
- * CPLHTTPFetch(): don't disable peer certificate verification when doing https (#6734)
- * CPLHTTPFetch(): cleanly deal with multiple headers passed with HEADERS and separated with newlines
- * CPLHTTPFetch(): add a CONNECTTIMEOUT option
- * CPLHTTPFetch(): add a GDAL_HTTP_HEADER_FILE / HEADER_FILE option.
- * CPLHTTPSetOptions(): make redirection of POST requests to still be POST requests after redirection (#6849)
- * /vsicurl/: take CPL_VSIL_CURL_ALLOWED_EXTENSIONS into account even if GDAL_DISABLE_READDIR_ON_OPEN is defined (#6681)
- * /vsicurl/: get modification time if available from GET or HEAD results
- * /vsis3/: add a AWS_REQUEST_PAYER=requester configuration option (github #186)
- * CPLParseXMLString(): do not reset error state
- * Windows: fix GetFreeDiskSpace()
- * Fix GetDiskFreeSpace() on 32bit Linux to avoid 32bit overflow when free disk space is above 4 GB (#6750)
- * Fix CPLPrintUIntBig() to really print a unsigned value and not a signed one
- * Add CPL_HAS_GINT64, GINT64_MIN/MAX, GUINT64_MAX macros (#6747)
- * Add CPLGetConfigOptions(), CPLSetConfigOptions(), CPLGetThreadLocalConfigOptions() and CPLSetThreadLocalConfigOptions() to help improving compatibility between osgeo.gdal python bindings and rasterio (related to https://github.com/mapbox/rasterio/pull/969)
- * MiniXML serializer: fix potential buffer overflow.
+## Build
 
-Core:
- * Proxy dataset: add consistency checks in (the unlikely) case the proxy and underlying dataset/bands would not share compatible characteristics
- * GDALPamDataset::TryLoadXML(): do not reset error context when parsing .aux.xml
- * PAM/VRT: only take into account <Entry> elements when deserializing a <ColorTable>
- * GDALCopyWords(): add fast copy path when src data type == dst data type == Int16 or UInt16
- * GetVirtualMemAuto(): allow USE_DEFAULT_IMPLEMENTATION=NO to prevent the default implementation from being used
- * Nodata comparison: fix test when nodata is FLT_MIN or DBL_MIN (#6578)
- * GetHistogram() / ComputeRasterMinMax() / ComputeStatistics(): better deal with precision issues of nodata comparison on Float32 data type
- * Fast implementation of GDALRasterBand::ComputeStatistics() for GDT_Byte and GDT_UInt16 (including use of SSE2/AVX2)
- * Driver manage: If INST_DATA is not requested, do not check the GDAL_DATA variable.
- * Make sure that GDALSetCacheMax() initialize the raster block mutex (#6611)
- * External overview: fix incorrect overview building when generating from greater overview factors to lower ones, in compressed and single-band case (#6617)
- * Speed-up SSE2 implementation of GDALCopy4Words from float to byte/uint16/int16
- * Add SSE2 and SSSE3 implementations of GDALCopyWords from Byte with 2,3 or 4 byte stride to packed byte
- * GDALCopyWords(): SSE2-accelerated Byte->Int32 and Byte->Float32 packed conversions
- * Fix GDALRasterBand::IRasterIO() on a VRT dataset that has resampled sources, on requests such as nXSize == nBufXSize but nXSize != dfXSize
- * GDALRasterBand::IRasterIO(): add small epsilon to floating-point srcX and srcY to avoid some numeric precision issues when rounding.
- * Add GDALRasterBand::GetActualBlockSize() (#1233)
- * Fix potential deadlock in multithreaded writing scenarios (#6661)
- * Fix thread-unsafe behavior when using GetLockedBlock()/MarkDirty()/DropLock() lower level interfaces (#6665)
- * Fix multi-threading issues in read/write scenarios (#6684)
- * Resampled RasterIO(): so as to get consistent results, use band datatype as intermediate type if it is different from the buffer type
- * Add GDALIdentifyDriverEx() function (github #152)
- * GDALOpenInfo: add a papszAllowedDrivers member and fill it in GDALOpenEx()
- * GDALDefaultOverviews::BuildOverviews(): improve progress report
- * Average and mode overview/rasterio resampling: correct source pixel computation due to numerical precision issues when downsampling by an integral factor, and also in oversampling use cases (github #156)
- * Overview building: add experimental GDAL_OVR_PROPAGATE_NODATA config option that can be set to YES so that a nodata value in source samples will cause the target pixel to be zeroed. Only implemented for AVERAGE resampling right now
- * GDALValidateOptions(): fix check of min/max values
- * GMLJP2 v2: update to 2.0.1 corrigendum and add capability to set gml:RectifiedGrid/gmlcov:rangeType content. Set SRSNAME_FORMAT=OGC_URL by default when converting to GML. Add gml:boundedBy in gmljp2:GMLJP2RectifiedGridCoverage
- * GMLJP2 v2: ensure KML root node id unicity when converting annotations on the fly. When generating GML features, make sure that PREFIX and TARGET_NAMESPACE are unique when specifying several documents.
+* make BUILD_JAVA/CSHARP/PYTHON_BINDINGS default value dependent on the
+  presence of requirements, and error out if those variables are set but
+  requirements are missing
+* Python bindings: remove generated files and require SWIG to be present
+* Fix build with -DOGR_ENABLE_DRIVER_GML=OFF (#6647)
+* make it possible to build on Linux if linux/fs.h is missing by explicitly
+  setting ACCEPT_MISSING_LINUX_FS_HEADER
+* Add support for (future) libjpeg-turbo 2.2 with its 8/12 bit dual mode (#6645)
+* PDF driver with PDFium support must be built against PDFium from
+  https://github.com/rouault/pdfium_build_gdal_3_7
+* No longer alias VSILFILE* to FILE* in non-DEBUG builds (#6790)
+* Add build option for using static Arrow/Parquet build (#7082)
+* Quote variables for INTERFACE_INCLUDE_DIRECTORIES / IMPORTED_LOCATION
+* Enable OpenCL at build-time, but disable it at runtime by default unless
+  the USE_OPENCL warping option or GDAL_USE_OPENCL config option is set (#7224)
+* Fix MSVC x64 builds with /arch:AVX2 (#7625)
 
-Algorithms:
- * RPC transformer: speed-up DEM extraction by requesting and caching a larger buffer, instead of doing many queries of just a few pixels that can be costly with VRT for example
- * GDALDeserializeRPCTransformer(): for consistency, use the same default value as in GDALCreateRPCTransformer() if <PixErrThreshold> is missing (so use 0.1 instead of 0.25 as before)
- * TPS solver: when Armadillo fails sometimes, fallback to old method
- * GDALCreateGenImgProjTransformer2(): add SRC_APPROX_ERROR_IN_SRS_UNIT, SRC_APPROX_ERROR_IN_PIXEL, DST_APPROX_ERROR_IN_SRS_UNIT, DST_APPROX_ERROR_IN_PIXEL, REPROJECTION_APPROX_ERROR_IN_SRC_SRS_UNIT and REPROJECTION_APPROX_ERROR_IN_DST_SRS_UNIT transformer options, so as to be able to have approximate sub-transformers
- * Fix GDAL_CG_Create() to call GDALContourGenerator::Init() (#6491)
- * GDALContourGenerate(): handle the case where the nodata value is NaN (#6519)
- * GDALGridCreate(): fix hang in multi-threaded case when pfnProgress is NULL or GDALDummyProgress (#6552)
- * GDAL contour: fix incorrect oriented contour lines in some rare cases (#6563)
- * Warper: multiple performance improvements for cubic interpolation and uint16 data type
- * Warper: add SRC_ALPHA_MAX and DST_ALPHA_MAX warp options to control the maximum value of the alpha channel. Set now to 65535 for UInt16 (and 32767 for Int16), or to 2^NBITS-1. 255 used for other cases as before
- * Warper: avoid undefined behavior when doing floating point to int conversion, that may trigger exception with some compilers (LLVM 8) (#6753)
- * OpenCL warper: update cubicConvolution to use same formula as CPU case (#6664)
- * OpenCL warper: fix compliance to the spec. Fix issues with NVidia opencl (#6624, #6669)
- * OpenCL warper: use GPU based over CPU based implementation when possible, use non-Intel OpenCL implementation when possible. Add BLACKLISTED_OPENCL_VENDOR and PREFERRED_OPENCL_VENDOR to customize choice of implementation
+## New optional dependencies
 
-Utilities:
- * gdalinfo -json: fix order of points in wgs84Extent.coordinates (github #166)
- * gdalwarp: do not densify cutlines by default when CUTLINE_BLEND_DIST is used (#6507)
- * gdalwarp: when -to RPC_DEM is specified, make -et default to 0 as documented (#6608)
- * gdalwarp: improve detection of source alpha band and auto-setting of target alpha band. Automatically set PHOTOMETRIC=RGB on target GeoTIFF when input colors are RGB
- * gdalwarp: add a -nosrcalpha option to wrap the alpha band as a regular band and not as the alpha band
- * gdalwarp: avoid cutline densification when no transform at all is involved (related to #6648)
- * gdalwarp: fix failure with cutline on a layer of touching polygons (#6694)
- * gdalwarp: allow to set UNIFIED_SRC_NODATA=NO to override the default that set it to YES
- * gdalwarp: fix -to SRC_METHOD=NO_GEOTRANSFORM -to DST_METHOD=NO_GEOTRANSFORM mode (#6721)
- * gdalwarp: add support for shifting the values of input DEM when source and/or target SRS references a proj.4 vertical datum shift grid
- * gdalwarp: fix crash when -multi and -to RPC_DEM are used together (#6869)
- * gdal_translate: when using -projwin with default nearest neighbour resampling, align on integer source pixels (#6610)
- * gdal_translate & gdalwarp: lower the default value of GDAL_MAX_DATASET_POOL_SIZE to 100 on MacOSX (#6604)
- * gdal_translate: avoid useless directory scanning on GeoTIFF files
- * gdal_translate: make "-a_nodata inf -ot Float32" work without warning
- * gdal_translate: set nodata value on vrtsource on scale / unscale / expand cases (github #199)
- * GDALTranslate(): make it possible to create a anonymous target VRT from a (anonymous) memory source
- * gdaldem: speed-up computations for src type = Byte/Int16/UInt16 and particularly for hillshade
- * gdaldem hillshade: add a -multidirectional option
- * GDALDEMProcessing() API: fix -alt support (#6847)
- * gdal_polygonize.py: explicitly set output layer geometry type to be polygon (#6530)
- * gdal_polygonize.py: add support for -b mask[,band_number] option to polygonize a mask band
- * gdal_rasterize: make sure -3d, -burn and -a are exclusive
- * gdal_rasterize: fix segfaults when rasterizing into an ungeoreferenced raster, or when doing 'gdal_rasterize my.shp my.tif' with a non existing my.tif (#6738)
- * gdal_rasterize: fix crash when rasterizing empty polygon (#6844)
- * gdal_grid: add a smoothing parameter to invdistnn algorithm (github #196)
- * gdal_retile.py: add a -overlap switch
- * gdal2tiles.py: do not crash on empty tiles generation (#6057)
- * gdal2tiles.py: handle requested tile at too low zoom to get any data (#6795)
- * gdal2tiles: fix handling of UTF-8 filenames (#6794)
- * gdal2xyz: use %d formatting for Int32/UInt32 data types (#6644)
- * gdal_edit.py: add -scale and -offset switches (#6833)
- * gdaltindex: emit warning in -src_srs_format WKT when WKT is too large
- * gdalbuildvrt: add a -oo switch to specify dataset open options
-
-Python samples:
- * add validate_cloud_optimized_geotiff.py
- * add validate_gpkg.py
-
-Multi-driver:
- * Add GEOREF_SOURCES open option / GDAL_GEOREF_SOURCES config. option to all JPEG2000 drivers and GTiff to control which sources of georeferencing can be used and their respective priority
+* libarchive for new /vsi7z/ and /vsirar/ virtual file systems
 
-AIGRID driver:
- * fix 2.1.0 regression when reading statistics (.sta) file with only 3 values, and fix <2.1 behavior to read them in LSB order (#6633)
+## GDAL 3.7.0 - Overview of Changes
 
-AAIGRID driver:
- * auto-detect Float64 when the nodata value is not representable in the Float32 range
+### Port
 
-ADRG driver:
- * handle north and south polar zones (ZNA 9 and 18) (#6783)
+* /vsizip/: add read support for Deflate64 (#7013)
+* Add read-only /vsi7z/ and /vsirar/ virtual file systems (depends on libarchive)
+* Make it possible to specify all HTTP related configuration options as
+  path-specific options with VSISetPathSpecificOption()
+* VSIGSFSHandler::UnlinkBatch(): avoid potential nullptr deref
+* /vsiaz/: implement UnlinkBatch()
+* /vsis3/: add CPL_VSIS3_CREATE_DIR_OBJECT configuration option
+* /vsigs/ allow GDAL_HTTP_HEADERS config option to be used as authentication method if contains at least a line starting with "Authorization:"
+* /vsihdfs/: fix ReadDir() and EOF flag (#7632)
+* add a robust CPLParseKeyValueJson() function (#6753)
+* HTTP: set default User-Agent header to GDAL/x.y.z and add a
+  CPLHTTPSetDefaultUserAgent() function (#6376)
+* HTTP: CUSTOMREQUEST option overrides POST while send form
+* /vsicurl/ / CPLHTTPFetch(): add a GDAL_HTTP_NETRC_FILE config option
+* /vsicurl/ / CPLHTTPFetch(): add options to support SSL client certificates
+* VSICurlHandle::ReadMultiRange(): avoid potential infinite loop
+* Add VSIVirtualHandle::AdviseRead() virtual method and implement it in /vsicurl
+* Add VSICopyFile()
+* CPLCopyFile(): remap onto VSICopyFile()
+* Implement CopyFile() for VSIZipFilesystemHandler
+* Implement GetFileMetadata() for /vsizip/
+* CPLDefaultFindFile: Warn if file not found and GDAL_DATA not defined
+* Add VSIDuplicateFileSystemHandler() (for remote stores identifcal to popular
+  ones, but with different settings).
+* Make C type VSILFILE an alias of C++ VSIVirtualHandle (and make it a struct
+  for that purpose) (#6643)
+* Add a CPLGetErrorHandler() function
+* Add VSIVirtualHandleUniquePtr type, unique pointer of VSIVirtualHandle that
+  calls the Close() method
 
-ASRP driver:
- * fix georeferencing of polar arc zone images (#6560)
+### Core
 
-BPG driver:
-* declare GDALRegister_BPG as C exported for building as a plugin (#6693)
+* ComputeRasterMinMax(), ComputeStatistics(), GetHistogram(): take into account
+  mask band (and not only nodata value)
+* Modify GDALFlushCache() and GDALDataset::FlushCache() to return CPLErr
+  instead of void
+* Add GDALDataset::Close() virtual method, call it from GDALClose() and make
+  GDALClose() return a CPLErr
+* GDALDataset:: add a SetBand() method that takes a GDALRasterBand unique_ptr
+* RawRasterBand: cache GDAL_ONE_BIG_READ value for RasterIO (#6726)
+* RawRasterBand: add IsValid() and Create() methods that return a unique_ptr
+* RawDataset::RasterIO(): add optimization when reading from a BIP dataset to
+  a BIP buffer (#6819)
+* RAW: fix performance issue when reading files with very small width (#1140)
+* Raw drivers: check RawRasterBand validity
+* LoadPythonAPI(): take into account Python 3.12
+* NASAKeywordHandler: add a Parse() method and change Ingest() return type to be bool
+* Add GDALMDArray::GetGridded() / GDALMDArrayGetGridded()
+* Add GDALMDArray::Resize() / GDALMDArrayResize(). Implement it in MEM, netCDF
+  and Zarr drivers
+* Support blocks > 2GB in GDALAllValidMaskBand and GDALNoDataValuesMaskBand
+* GDALVersionInfo("BUILD_INFO"): report CURL_ENABLED=YES and CURL_VERSION=x.y.z
+* Add CPLSubscribeToSetConfigOption() to subscribe to config option settings
+* GoogleMapsCompatible tiling scheme: Increase max zoom level from 24 to 30
+* JP2 structure dump: fix interpretation of METH field in COLR JP2 box
+* Enable SSE2/AVX2 optims on 32bit MSVC builds if /arch:AVX2 is defined (#7625)
 
-DIMAP driver:
- * DIMAP: for DIMAP 2, read RPC from RPC_xxxxx.XML file (#6539)
- * DIMAP/Pleiades metadata reader: take into tiling to properly shift RPC (#6293)
- * add support for tiled DIMAP 2 datasets (#6293)
+### Algorithms
 
-DODS driver:
- * fix crash on URL that are not DODS servers (#6718)
+* Polygonizer: switch implementation to Two-Arm Chains EdgeTracing Algorithm,
+  which is much faster in some cases (#7344)
+* Prefix ParseAlgorithmAndOptions() public symbol with GDALGrid for proper
+  namespacing, and add #define alias for API compat (but ABI breakage)
+* Pansharpening: require geotransform on panchromatic and multispectral bands.
+  Remove undocumented and somewhat broken MSShiftX and MSShiftY options
+* Warper: fix issue with insufficiently large source window, visible with RPC
+  DEM warping (#7491)
 
-DTED driver:
- * correctly create files at latitudes -80, -75, -70 and -50 (#6859)
+### Utilities
 
-ECW driver:
- * Add option ECW_ALWAYS_UPWARD=TRUE/FALSE  to work around issues with "Downward" oriented images (#6516).
+* gdalwarp: add -srcband (aliased to -b) and -dstband options
+* gdalwarp: preserve source resolution by default when no reprojection is
+  involved (behavior change), and add '-tr square' to use previous behavior
+* gdalwarp: better error message when not providing enough values after a switch
+  (#7086)
+* gdal_rasterize: support @filename for -sql option (#7232)
+* gdal_rasterize: add -oo switch for open options (#7329)
+* gdal_grid: add -oo switch for open options (#7329)
+* gdal_polygonize.py: use transactions to speed-up writing
+* gdal_polygonize.py: add a -lco option, and fix -o (#7374)
+* gdalbuildvrt: implement numerically stable averaging of resolution (#7502)
+* gdal2tiles: use logging module instead of print() for verbose output (#4894)
+* gdal2tiles: update doctype to html format (#7631)
+* gdal2tiles: uses GDALTermProgress() for progress bar
+* gdal_calc: uses GDALTermProgress() for progress bar (#7549)
+* gdal_fillnodata: fix parsing of -co option
+* validate_gpkg.py: make it work better on examples from ngageoint repositories
+* gdal_cp.py: use gdal.CopyFile()
+* C/C++ command line utilities: take into account GDALClose() error code
 
-ENVI driver:
- * on closing, pad image file with trailing nul bytes if needed (#6662)
- * add read/write support for rotated geotransform (#1778)
+### Raster drivers
 
-GeoRaster driver:
- * fix report of rotation (#6593)
- * support for JP2-F compression (#6861)
- * support direct loading of JPEG-F when blocking=no (#6861)
- * default blocking increased from 256x256 to 512x512 (#6861)
+ARG driver:
+ * add support for int64/uint64
 
-GPKG driver:
- * implement tiled gridded elevation data extension
- * add VERSION creation option
- * check if transaction COMMIT is successful (#6667)
- * fix crash on overview building on big overview factor (#6668)
- * fix crash when opening an empty raster with USE_TILE_EXTENT=YES
- * fix gpkg_zoom_other registration
+COG driver:
+ * relax a bit the tolerance when computing tile number
+ * propagate NUM_THREADS to warping (#7479)
+ * add NBITS creation option (#7361)
 
-GTiff driver:
- * support SPARSE_OK=YES in CreateCopy() mode (and in update mode with the SPARSE_OK=YES open option), by actively detecting blocks filled with 0/nodata about to be written
- * When writing missing blocks (i.e. non SPARSE case), use the nodata value when defined. Otherwise fallback to 0 as before.
- * in FillEmptyTiles() (i.e. in the TIFF non-sparse mode), avoid writing zeroes to file so as to speed up file creation when filesystem supports ... sparse files
- * add write support for half-precision floating point (Float32 with NBITS=16)
- * handle storing (and reading) band color interpretation in GDAL internal metadata when it doesn't match the capabilities of the TIFF format, such as B,G,R ordering (#6651)
- * Fix RasterIO() reported when downsampling a RGBA JPEG compressed TIFF file (#6943)
- * Switch search order in GTIFGetOGISDefn() - Look for gdal_datum.csv before datum.csv (#6531)
- * optimize IWriteBlock() to avoid reloading tile/strip from disk in multiband contig/pixel-interleave layouts when all blocks are dirty
- * fix race between empty block filling logic and background compression threads when using Create() interface and NUM_THREADS creation option (#6582)
- * use VSIFTruncateL() to do file extension
- * optimize reading and writing of 1-bit rasters
- * fix detection of blocks larger than 2GB on opening on 32-bit builds
- * fix saving and loading band description (#6592)
- * avoid reading external metadata file that could be related to the target filename when using Create() or CreateCopy() (#6594)
- * do not generate erroneous ExtraSamples tag when translating from a RGB UInt16, without explicit PHOTOMETRIC=RGB (#6647)
- * do not set a PCSCitationGeoKey = 'LUnits = ...' as the PROJCS citation on reading
- * fix creating an image with the Create() interface with BLOCKYSIZE > image height (#6743)
- * fix so that GDAL_DISABLE_READDIR_ON_OPEN = NO / EMPTY_DIR is properly honoured and doesn't cause a useless directory listing
- * make setting GCPs when geotransform is already set work (with warning about unsetting the geotransform), and vice-versa) (#6751)
- * correctly detect error return of TIFFReadRGBATile() and TIFFReadRGBAStrip()
- * in the YCBCR RGBA interface case, only expose RGB bands, as the alpha is always 255
- * don't check free disk space when outputting to /vsistdout/ (#6768)
- * make GetUnitType() use VERT_CS unit as a fallback (#6675)
- * in COPY_SRC_OVERVIEWS=YES mode, set nodata value on overview bands
- * read GCPs in ESRI <GeodataXform> .aux.xml
- * explicitly write YCbCrSubsampling tag, so as to avoid (latest version of) libtiff to try reading the first strip to guess it. Helps performance for cloud optimized geotiffs
- * map D_North_American_1927 datum citation name to OGC North_American_Datum_1927 so that datum is properly recognized (#6863)
- * Internal libtiff. Resync with CVS (post 4.0.7)
- * Internal libtiff: fix 1.11 regression that prevents from reading one-strip files that have no StripByteCounts tag (#6490)
+ERS driver:
+ * support GDA2020
 
-GRASS driver:
- * plugin configure: add support for GRASS 7.2 (#6785)
- * plugin makefile: do not clone datum tables and drivers (#2953)
- * use Rast_get_window/Rast_set_window for GRASS 7 (#6853)
+GeoPackage driver:
+ * load/save band statistics in GPKG metadata tables or PAM .aux.xml
 
 GRIB driver:
- * Add (minimalistic) support for template 4.15 needed to read Wide Area Forecast System (WAFS) products (#5768)
- * **Partial** resynchronization with degrib-2.0.3, mostly to get updated tables (related to #5768)
- * adds MRMS grib2 decoder table (http://www.nssl.noaa.gov/projects/mrms/operational/tables.php) (github #160)
- * enable PNG decoding on Unix (#5661, github #160)
- * remove explicitly JPEG2000 decompression through Jasper and use generic GDAL code so that other drivers can be triggered
- * fix a few crashes on malformed files
-
-GTX driver:
- * add a SHIFT_ORIGIN_IN_MINUS_180_PLUS_180 open option
-
-HDF4 driver:
- * Fixed erroneous type casting in HDF4Dataset::AnyTypeToDouble() that breaks reading georeferencing and other metadata
+ * update tables to wmo-im/GRIB2@v30
+ * g2clib: allow negative longitudes in grid templates Lon/Lat, Rotated,
+   Stretched, Stretched & Rotated, LAEA (#7456) and Mercator
+ * fix GetNoDataValue() on band > 1 when there's a bitmap section (#7649)
 
-HDF5 driver:
- * correct number of GCPs to avoid dummy trailing (0,0)->(0,0,0) and remove +180 offset applied to GCP longitude. Add instead a heuristics to determine if the product is crossing the antimeridian, and a HDF5_SHIFT_GCPX_BY_180 config option to be able to override the heuristics (#6666)
+GTiff driver:
+ * add a JXL_ALPHA_DISTANCE creation option, e.g. to have lossless alpha and
+   lossy RGB.
+ * call VSIVirtualHandle::AdviseRead() in multithreaded read implementation
+ * implement GetCompressionFormats() and ReadCompressedData()
+ * add minimum support for reading CRS from ESRI's .xml side car file (#7187)
+ * use libtiff >= 4.5 reentrant error handlers (when available) (#6659)
+ * make sure that band description in PAM overrides the one coming from
+   GDAL_METADATA tag
+ * Internal libtiff: resync with upstream
 
 HFA driver:
- * fix reading and writing of TOWGS84 parameters (github #132)
- * export overview type from HFA files to GDAL metadata as OVERVIEWS_ALGORITHM (github #135)
- * make .ige initialization use VSIFTruncateL() to be faster on Windows
- * add support for TMSO and HOM Variant A projections (#6615)
- * Add elevation units read from HFA files metadata (github #169)
- * set binning type properly according to layerType being thematic or not (#6854)
-
-Idrisi driver:
- * use geotransform of source dataset even if it doesn't have a SRS (#6727)
- * make Create() zero-initialize the .rst file (#6873)
+ * add a DISABLEPESTRING=YES creation option to disable use of ArcGIS PE String
+   (#1003)
 
-ILWIS driver:
- * avoid IniFile::Load() to set the bChanged flag, so as to avoid a rewrite of files when just opening datasets
+HDF5 driver:
+ * add generic support for HDF-EOS5 grids and swaths (#7117)
 
-ISCE driver:
- * fix computation of line offset for multi-band BIP files, and warn if detecting a wrong file produced by GDAL 2.1.0 (#6556)
- * fix misbehaviour on big endian hosts
- * add support for reading and writing georeferencing (#6630, #6634)
- * make parsing of properties case insensitive (#6637)
+JP2OpenJPEG driver:
+ * add workaround for dop10 orthophotos wrong colorspace
 
-ISIS3 driver:
- * add write support
- * add mask band support on read
- * get label in json:ISIS3 metadata domain
+JPEG driver:
+ * add a APPLY_ORIENTATION=YES open option to take into account EXIF_Orientation
+ * advertise JPEG_QUALITY metadata item in IMAGE_STRUCTURE domain
+ * use ReadCompressedData(), implement lossless copy from JPEGXL that has
+   JPEG reconstruction box
+ * add a LOSSLESS_COPY creation option
+ * add support for reading lossless 8-bit JPEG if using libjpeg-turbo >= 2.2
+ * change behavior to return an error and not just a warning with reading a
+   truncated file
+ * Internal libjpeg: decompressor: initialize Huffman tables to avoid issues
+   with some FileGDB raster
 
-JPEGLS driver:
+JPEGXL driver:
+ * add a ALPHA_DISTANCE creation option, e.g. to have lossless alpha and
+   lossy RGB.
+ * add a APPLY_ORIENTATION=YES open option to take into account EXIF_Orientation
+ * advertise COMPRESSION_REVERSIBILITY=LOSSY when there is a JPEG reconstruction
+   box
+ * add a LOSSLESS_COPY creation option
+ * implement creation from JPEGXL content
+ * fix lossless copy of JPEG with zlib compressed mask band
+ * implement GetCompressionFormats() and ReadCompressedData()
 
-JP2ECW driver:
- * fix crash when translating a Float64 raster (at least with SDK 3.3)
+MEM driver:
+ * implement GetCoordinateVariables() from coordinates attribute
+ * Adds 'SPATIALREFERENCE' element to the DSN format (#7272)
 
-JP2KAK driver:
- * add support for Kakadu v7.9.  v7.8 should not be used.  It has a bug fixed in v7.9
- * catch exceptions in jp2_out.write_header()
+MRF driver:
+ * make it use PNG driver for decompression of 8-bit images
 
-JP2OpenJPEG driver:
- * add a USE_TILE_AS_BLOCK=YES open option that can help with whole image conversion
- * prevent endless looping in openjpeg in case of short write
- * for single-line organized images, such as found in some GRIB2 JPEG2000 images, use a Wx1 block size to avoid huge performance issues (#6719)
-  * ignore warnings related to empty tag-trees.
+netCDF driver:
+ * add a ASSUME_LONGLAT open option (#6195)
+ * add heuristics to detect invalid validity range when scale_factor is
+   present (#7167)
+ * report geolocation array for NASA L2 ocean colour products (#7605)
 
-JPIPKAK driver:
- * fix random crashes JPIP in multi-tread environment (#6809)
+NITF driver:
+ * nitf_spec.xml: add definition for subheader of CSATTB, CEEPHB and CSSFAB DES
+   of GLAS/GFM
+ * add capability of decoding DES data part as XML fields and add descriptors
+   for CSATTB, CEEPHB and CSSFAB DES
+ * add VALIDATE and FAIL_IF_VALIDATION_ERROR open options
+ * fix bug that prevents adding subsequent TREs after a HEX TRE (#6827)
 
-KEA driver:
- * Add support for Get/SetLinearBinning (#6855)
+OGCAPI driver:
+ * define raster/vector scope of open options
+ * Passed uri to TileMatrixSet::parse
+ * Updated uris of well-known tile matrix sets
 
-KMLSuperOverlay driver:
- * recognize simple document made of GroundOverlay (#6712)
- * Add FORMAT=AUTO option. Uses PNG for semi-transparent areas, else JPG. (#4745)
+PCIDSK driver:
+ * support Web Mercator projection (#7647)
 
-LAN driver:
- * remove wrong byte-swapping for big-endian hosts
+PDF driver:
+ * skip JP2ECW driver if ECW_ENCODE_KEY required but not found
 
-MAP driver:
- * change logic to detect image file when its path is not absolute
+PNG driver:
+ * 1.7-2.0x speed-up in whole image decompression with libdeflate on Intel/AMD CPUs
 
-MBTiles driver:
- * on opening if detecting 3 bands, expose 4 bands since there might be transparent border tiles (#6836)
- * fix setting of minzoom when computing overviews out of order
- * do not open .mbtiles that contain vector tiles, which are not supported by the driver
+RMF driver:
+ * Add scale, name, frame support.
+ * Add vert CS write support.
+ * Implement GetSuggestedBlockAccessPattern
 
-MEM driver:
- * disable R/W mutex for tiny performance increase in resampled RasterIO
- * add support for overviews
- * add support for mask bands
+VRT driver:
+ * add 'a_offset', 'a_scale', 'a_srs', 'a_ullr', 'expand', 'exponent', 'gcp',
+  'if', 'ot', 'outsize', 'ovr', 'scale' options for vrt:// connection string
+ * add BLOCKXSIZE and BLOCKYSIZE creation options
+ * Fix excessive RAM usage when reading a VRT made of single-tiled JPEG2000
+   files read with the JP2OpenJPEG driver
+ * implement GetCompressionFormats() and ReadCompressedData()
+ * derived band: add a <SkipNonContributingSources>true optional element
+   to discard non contributing sources (#7223)
+ * VRTPansharpened: avoid issue when querying overviews when PAN and MS bands
+   have significant different spatial extent
+ * serialize NODATA/NoDataValue elements with double precision (#7486)
+ * fix warning regarding with OpenShared with vrt://http://example.com/test.jp2
+   with the JP2OpenJPEG driver
 
-MRF driver:
- * bug fix in PNG and JPEG codecs
- * Fixing a problem with setting NoData for MRFs generated with Create
- * fix plugin building (#6498)
- * rename CS variable so as to avoid build failure on Solaris 11 (#6559)
- * Allow MRF to write the data file directly to an S3 bucket.
- * Allow relative paths when MRF is open via the metadata string.
- * Add support for spacing (unused space) between tiles. Defaults to none.
- * Read a single LERC block as an MRF file.
+WEBP driver:
+ * implement GetCompressionFormats() and ReadCompressedData()
 
-MSG driver:
- * fix incorrect georeference calculation for msg datasets (github #129)
+## OGR 3.7.0 - Overview of Changes
 
-NetCDF driver:
- * add support for reading SRS from srid attribute when it exists and has content like urn:ogc:def:crs:EPSG::XXXX (#6613)
- * fix crash on datasets with 1D variable with 0 record (#6645)
- * fix erroneous detection of a non-longitude X axis as a longitude axis that caused a shift of 360m on the georeferencing (#6759)
- * read/write US_survey_foot unit for linear units of projection
- * apply 'add_offset' and 'scale_factor' on x and y variables when present, such as in files produced by NOAA from the new GOES-16 (GOES-R) satellite (github #200)
- * add a HONOUR_VALID_RANGE=YES/NO open option to control whether pixel values outside of the validity range should be set to the nodata value (#6857)
- * fix crash on int64/uint64 dimensions and variables, and add support for them (#6870)
+### Core
 
-NITF driver:
- * add support for writing JPEG2000 compressed images with JP2OpenJPEG driver
- * fix writing with JP2KAK driver (emit codestream only instead of JP2 format)
- * fix setting of NBPR/NBPC/NPPBH/NPPBV fields for JPEG2000 (fixes #4322); in JP2ECW case, make sure that the default PROFILE=NPJE implies 1024 block size at the NITF level
- * implement creation of RPC00B TRE for RPC metadata in CreateCopy() mode
- * add support for reading&writing _rpc.txt files
- * nitf_spec.xml: Add support for MTIRPB TRE in NITF image segment. Also makes minor change to BLOCKA to include default values (github #127)
- * nitf_spec.xml: add IMASDA and IMRFCA TREs
- * GetFileList(): Small optimization to avoid useless file probing.
+* Add OGRLayer::UpdateFeature() and OGR_L_UpdateFeature() (RFC 93).
+  Implement it in Memory, GPKG, MongoDBv3, PG
+* OGRFeatureDefn: add GetFields() and GetGeomFields() for easier C++ iteration
+* OGRFieldDefn: add GetComment() / SetComment() methods
+* OGRFeature/OGRGeometry: add a DumpReadable method that outputs to a string
+* Add GDAL_DMD_ILLEGAL_FIELD_NAMES, and feel it for OpenFileGDB, FileGDB,
+  PostgreSQL
+* Add GDAL_DMD_RELATIONSHIP_RELATED_TABLE_TYPES: list of standard related table
+  types recognized by the driver, and feel it for OpenFileGDB, FileGDB and GPKG
+* Add GDAL_DMD_CREATION_FIELD_DEFN_FLAGS metadata
+* Add DCAP_FEATURE_STYLES_READ and DCAP_FEATURE_STYLES_WRITE capabilities
+* Add ALTER_ALTERNATIVE_NAME_FLAG for use changing a field's alternative name
+  when calling OGR_L_AlterFieldDefn
+* Add ALTER_COMMENT_FLAG for altering field comments via OGR_L_AlterFieldDefn
+* Add OGRLayer::GetSupportedSRSList() and SetActiveSRS()
+* OGRToOGCGeomType(): add options to control output
+* GenSQL: fix SetAttributeFilter() when dialect=OGRSQL and not forwarding the
+  initial where clause to the source layer (#7087)
+* OGR SQL: do not emit error message when comparing a NULL datetime
+* OGRFeature::SetField(string argument): for bool, recognize 0/false/off/no as
+  false and 1/true/on/yes as true
+* Add OGRFeature::GetFieldAsISO8601DateTime() (#7555)
+* Geometry WKT import: accept nan as a value, for parity with PostGIS and GEOS
+* GDALDataset::CopyLayer(): copy source layer metadata, unless the COPY_MD=NO
+  option is specified
+* Add OGRGeometry::UnaryUnion() / OGR_G_UnaryUnion()
+* SQL SQLite parser: correctly take into account statements like
+  'SELECT ... FROM json_each(...)' (#7464)
+* Make OGRGeometry::getSpatialReference() return a const OGRSpatialReference*
+* Make OGRGeomFieldDefn::GetSpatialRef() return a const OGRSpatialReference*
 
-NWT_GRD:
- * detect short writes
+### OGRSpatialReference
 
-OpenJPEG driver:
- * support direct extracting of GeoRaster JP2-F BLOB (#6861)
+* importFromWkt(): take into account COORDINATEMETADATA[] (PROJ >= 9.2)
+* update hard-coded definition of OGC:CRS84 to include the ID
+* OSR_Panorama: Add some spatial references (GSK 2011, etc.)
+* OSR_Panorama: Fix TM zone for projections with negative central meridian
+* OSR_Panorama: Fix import from invalid data
+* SetFromUserInput(): skip leading white space (#7170)
+* Make OGRCoordinateTransformation::GetSourceCS() and GetTargetCS() return a
+  const OGRSpatialReference* (#7377)
+* OSRImportFromEPSG(): emit warning message about deprecated CRS substitution
+  (#7524)
+* Allow CPLSetConfigOption('PROJ_DATA', ...) to work by making it call
+  OSRSetPROJSearchPaths()
 
-PCIDSK driver:
- * handle Exceptions returned from destructor and check access rights in setters (github #183)
+### Utilities
 
-PDF driver:
- * implement loading/saving of metadata from/into PAM (#6600)
- * implement reading from/writing to PAM for geotransform and projection (#6603)
- * prevent crashes on dataset reopening in case of short write
+* ogrinfo: make it accessible through a new GDALVectorInfo() C API call
+* ogrinfo: add a -json switch
+* ogrinfo: output CRS supported list
+* ogrinfo: output relationships
+* ogr2ogr: use SetActiveSRS() when possible when -t_srs is used
+* ogr2ogr: make conversion from GML2 to GPKG work without explicit -lco
+  FID=some_name_different_than_fid
+* ogr2ogr: add a -dateTimeTo option to convert datetime between timezones (#5256)
+* ogr2ogr: Improve performance of -clipsrc and -clipdst (#7197)
+* ogr2ogr: LoadGeometry(): use UnaryUnion()
+* ogrmerge.py: add optimization for GPKG -> GPKG non-single layer case (up to
+  10x faster)
 
-PLScenes driver:
- * add a METADATA open option
+### Vector drivers
 
-PostgisRaster driver:
- * fix potential crash when one tile has a lower number of bands than the max of the table (#6267)
+Arrow driver:
+ * add support for getting/setting field alternative name and comment in
+   gdal:schema extension
 
-R driver:
- * fix out-of-memory (oom) with corrupt R file
+CSV driver:
+ * recognize pipe separator and .psv extension for read (#6811)
+ * fix GetFeatureCount() to work correctly with spatial and attribute filters
+ * allow reading single column file (#7595)
 
-Raw drivers:
- * prevent crashes on dataset closing in case of short write
+CSW driver:
+ * Add 'title' as query-able property
 
-RMF driver:
- * fix wrong counter decrement that caused compressed RMF to be incorrectly decompressed (github #153)
- * fix load/store inversion of cm and dm units in MTW files (github #162)
- * fix reading nodata for non-double data type (github #174)
+FileGDB driver:
+ * do not set Length/Precision from OGR width/precision for floating-point data
+   types (#7283)
+ * correct ObjectID field to have a Length of 4.
 
-ROIPAC driver:
- * add support for reading/writing .flg files (#6504)
- * fix computation of line offset for multi-band BIP files, and warn if detecting a wrong file produced by GDAL >= 2.0.0 (#6591)
- * fix for big endian hosts
+FlatGeobuf driver:
+ * decrease memory usage when inserting lots of features
+ * speed-up writing of DateTime/Date values
+ * avoid crash when writing huge geometry
+ * Support reading/writing field comments in field description metadata (#7598)
 
-RS2 driver:
- * add support for reading RPC from product.xml
+GML driver:
+ * Use geometry in boundedBy element if there are no geometry properties
+ * use srsDimension on top gml:Envelope as the default one (#6986)
+ * GML geometry parsing: don't promote to 3D a 2D <gml:Box>
+ * deal with only <gml:null> in boundedBy element
+ * fix reading CityGML Lod2 with xlink:href in gml:Solid as found in German
+   datasets (qgis/QGIS#51647)
+ * add support for getting/setting field comment
 
-SAFE driver:
- * fix handling of SLC Products by providing access to measurements as subdatasets (#6514)
+GMLAS driver:
+ * add BoundingShapeType as a known geometry type
 
-Sentinel2 driver:
- * add support for new "Safe Compact" encoding of L1C products (fixes #6745)
+GPKG driver:
+ * Implement relationship creation, deletion and update support
+ * add direct read and create support for .gpkg.zip files
+ * SQLite/GPKG: move PRELUDE_STATEMENTS evaluation just after database opening
+ * add a gdal_get_pixel_value() SQL function.
+ * add a SetSRID() SQL function
+ * speed-up writing of DateTime/Date values
+ * allow opening filenames >= 512 characters
+ * do not register non-spatial layers on creation if there are already
+   unregistered non-spatial layers (qgis/qgis#51721)
+ * avoid potential int overflows / crash on huge geometries
+ * make SQL function ogr_layer_Extent() available (#7443)
+ * Map field alternative name with "name" attribute from gpkg_data_columns table
+ * Map field comment with "description" attribute from gpkg_data_columns table
+ * hide implicit relationships from NGA GeoInt and Spatialite system tables
+ * add ST_EnvIntersects() for faster spatial filtering when there is no
+   spatial index
+ * minimum (read) support for non-standard multiple geometry columns per table
 
-SQLite driver:
- * Add read support for RasterLite2 coverages in SQLite driver
+GPX driver:
+ * add capability to read & write content of <metadata> element (#7190)
 
-SRTMHGT driver:
- * open directly .hgt.zip files
- * accept filenames like NXXEYYY.SRTMGL1.hgt (#6614)
- * handle files for latitude >= 50 (#6840)
+LVBAG driver:
+ * fix std::find() test
 
-VRT driver:
- * add default pixel functions: real, imag, complex, mod, phase, conj, etc... for complex data types (github #141)
- * avoid useless floating point values in SrcRect / DstRect (#6568)
- * avoid buffer initialization in RasterIO() when possible (replace ancient and likely broken concept of bEqualAreas)
- * make CheckCompatibleForDatasetIO() return FALSE on VRTDerivedRasterBands (#6599)
- * VRT warp: fix issue with partial blocks at the right/bottom and dest nodata values that are different per band (#6581)
- * fix performance issue when nodata set at band level and non-nearest resampling used (#6628)
- * VRTComplexSource: do temp computations on double to avoid precision issues when band data type is Int32/UInt32/CInt32/Float64/CFloat64 (#6642)
- * VRT derived band: add the capability to define pixel functions in Python
- * CreateCopy(): detect short writes
- * Fix linking error on VRTComplexSource::RasterIOInternal<float>() (#6748)
- * avoid recursion in xml:VRT metadata (#6767)
- * prevent 'Destination buffer too small' error when calling GetMetadata('xml:VRT') on a in-memory VRT copied from a VRT
- * fix 2.1 regression that can cause crash in VRTSimpleSource::GetFileList() (#6802)
+MITAB driver:
+ * add support for LargeInt (Integer64) data type (#7162)
 
-WMS driver:
- * Added support for open options to WMS minidrivers
- * Refactored the multi-http code to make it possible to do range requests.
- * Added a minidriver_mrf, which reads from remote MRFs using range requests.
- * Made the minidriver_arcgis work with an ImageService, not only MapService.
- * Added static cache of server response.
- * Allow tiledWMS to work in off-line mode by including the server response in the .wms file itself.
- * honour GDAL_HTTP_USERAGENT config option when it is set and <UserAgent> is missing (#6825)
- * WMS/WMTS: better deal with tiles with different band count (grayscale, gray+alpha, palette, rgb, rgba) (github #208)
- * Make HTTPS options apply to tWMS minidriver init, better HTTP error reporting
+NAS driver:
+ * make it trigger only if NAS_GFS_TEMPLATE config option is set (#7529)
 
-WMTS driver:
- * do not take into account WGS84BoundingBox/BoundingBox that would be the result of the densified reprojection of the bbox of the most precise tile matrix
- * add TILEMATRIX / ZOOM_LEVEL open options
- * accept tiles of small dimensions (github #210)
+MongoDBv3 driver:
+ * avoid get_utf8() deprecatation warning with mongocxx 3.7.0
 
-XYZ driver:
+netCDF driver:
+ * add support for getting/setting alternative name and comment
 
-## OGR 2.2.0 - Overview of Changes
+OAPIF driver:
+ * Add support for OGC API Features - Part 2 CRS extension (ie ability to work
+   with non WGS 84 CRS)
+ * Add CRS/PREFERRED_CRS open options to control the active CRS
+ * Add a SERVER_FEATURE_AXIS_ORDER open option
+ * Implement GetSupportedSRSList() and SetActiveSRS()
 
-Core:
- * Layer algebra: Add KEEP_LOWER_DIMENSION_GEOMETRIES=YES/NO option to Intersection, Union and Identity.
-Default is yes, but it is set to no unless result layer is of geom type unknown.
-If set to no, result features which would have lower dim geoms are skipped
-if operating on two layers with same geom dim.
- * Fix crash/corrupted values when running importFromWkb() on POLYGON M/POLYGON ZM geometries (#6562)
- * Add OGR_WKT_PRECISION config option that defaults to 15 to select the number of decimals when outputting to WKT
- * Make OGRFeature::SetField(string) accept JSon serialized arrays for the String/Integer/Integer64/RealList types; add reciprocal OGRFeature::GetFieldAsSerializedJSon() for those types
- * OGRGeometryFactory::transformWithOptions(): better deal with reprojection from polar projection to WGS84, and projections crossing the antimeridian to WGS84, by splitting geometries prior to reprojection (#6705)
- * LinearRing transformTo(): force last point to be identical to first one in case it is not.
- * GML geometry parsing: avoid 'Cannot add a compound curve inside a compound curve' error (#6777)
- * OGR SQL: fix IN filtering on MapInfo indexed columns (#6798)
- * OGR SQL: add support for LIMIT and OFFSET keywords
- * OGR SQL: add comparisons on date / datetime (#6810)
- * OGR SQL: increase efficiency of DISTINCT operator
- * OGREnvelope: change initialization to fix issue when getting MULTIPOINT(0 0,1 1) envelope (#6841)
- * OGRParse: fix parsing logic to avoid false positive detection of string as datetime (#6867)
+OCI driver:
+ * improve round-tripping of EPSG CRS (#7551)
 
-OGRSpatialReference:
- * Upgrade to EPSG database v9.0 (#6772)
- * OGRCT: upgrade LIBNAME of mingw and cygwin to libproj-9.dll and cygproj-9.dll to be up-to-date with proj 4.9.X (recommended method is using ./configure --with-static-proj4 instead) (#6501)
- * importFromESRI(): fix import of multi line MERCATOR SRS (#6523)
- * morphToESRI(): correctly compute standard_parallel_1 of Mercator(2SP) projection from scale factor of Mercator(1SP) (#6456, #4861)
- * exportToProj4(): recognize explicit OSR_USE_ETMERC=NO to avoid using etmerc with proj >= 4.9.3
- * importFromProj4(): do not set a AUTHORITY node for strings like '+init=epsg:XXXX +some_param=val'
- * importFromProj4(): be robust with missing proj.4 epsg dictionary when importing '+init=epsg:xxxx +other_parm=value'
- * AutoIdentifyEPSG(): add identification of EPSG:3995 (Arctic Polar Stereographic on WGS84) and EPSG:3031 (Antarctic Polar Stereographic on WGS84)
- * OGRCoordinateTransformation: avoid potential bugs in proj.4 on NaN input
- * importFromEPSG(): take into account DX,DY,DZ,RX,RY,RZ,DS columns in pcs.csv to add per-PCS TOWGS84 overrides (geotiff #52)
- * Coordinate transformation: prevent unnecessary coordinate transformations (github #184, #185)
+OpenFileGDB driver:
+ * Optimise writing of large geometries
+ * allow CreateField() with OBJECTID as the column name (#51435)
+ * make Delete() method to remove the directory (#7216)
+ * remove traces of dealing with field precision (#7283)
+ * correct ObjectID field to have a Length of 4.
+ * take into account SpatialReference.VCSWKID/LatestVCSWKID for compound CRS
+ * relax test to detect broken .spx
 
-Utilities:
- * ogr2ogr: do not return error on ogr2ogr --utility_version
- * ogr2ogr: keep -append and -overwrite when -update follows
- * ogr2ogr: fix heuristics to detect likely absence of '-f' (#6561)
- * ogr2ogr: do not emit a warning when updating/overwriting a destination dataset that is not a Shapefile and if -f is not specified (#6561)
- * ogr2ogr: make overwriting of lots of PG tables less prone to PostgreSQL 'out of shared memory' errors, by committing transactions after each table recreation
- * ogr2ogr: prevent 'ogr2ogr same.shp same.shp' (#1465)
- * ogr2ogr: add a -limit option to limit the number of features read per layer
- * GDALVectorTranslate(): imply update mode if access mode not explicitly specified and hDstDS != NULL (#6612)
- * ogrlineref: Fix crash if no new layer name provided
- * ogrtindex: add -src_srs_name, -src_srs_format and -t_srs option to allow indexing files that have different projections
-
-Multidriver:
- * PGeo/FileGDB/OpenFileGDB: OGRCreateFromShapeBin(): do not error out on empty lines/polygons
- * GPKG/SQLite/PG/FileGDB/MEM: properly set/reset field subtype with AlterFieldDefn() (#6689)
- * DXF, GeoJSON, GML, KML, LIBKML, ODS, Shape, XLSX: report operating system error if file creation fails (#2253)
+OGR_VRT:
+ * add support for reading alternative name and comment from VRT XML
 
-AmigoCloud driver:
- * add option to receive an AmigoCloud API key in the connection string, fix page size (github #137)
+OSM driver:
+ * add a tags_format=json osmconf.ini setting and TAGS_FORMAT=JSON open option,
+   as an alternative for HSTORE for other_tags/all_tags fields (#7533)
 
-Carto:
- * renamed from CartoDB
- * fix CartoDB'fication() by removing manual creation of the_geom_webmercator mercator, and also attach created sequence to table.cartodb_id (#6565)
+Parquet driver:
+ * add support for getting/setting field alternative name and comment in
+   gdal:schema extension
 
-CSV driver:
- * add read/write support for String/Integer/Integer64/RealList types as serialized JSon arrays
+PG driver:
+ * Add WKBFromEWKB() for a slightly faster OGRGeometryFromEWKB()
+ * fix TEMPORARY layer creation option
+ * Add SKIP_VIEWS open option to replace PG_SKIP_VIEWS config option
+ * Remove PG_USE_TEXT config option
+ * use standard_conforming_strings=ON
+ * add support for getting/setting/altering field comments (#7587)
+ * truncate table names larger than 63 characters (#7628)
 
-DGN driver:
- * avoid crash with -ftrapv on 250K_NF44NE_Area_V7.dgn (relates to #6806)
- * use coordinate delta encoding from the attribute records array (6806)
+PGDump driver:
+ * fix TEMPORARY layer creation option
+ * add GEOM_COLUMN_POSITION layer creation option and allow empty FID= (#7482)
+ * fix escaping of schema and table name (#7497)
+ * add support for setting field comments
+ * truncate table names larger than 63 characters (#7628)
 
-DXF driver:
- * sanitize layer name on export to avoid forbidden characters
- * reader: convert GeometryCollection to MultiPoint, MultiLineString or MultiPolygon when possible (QGIS #10485)
- * add font of TEXT and MTEXT to OGR style string (https://github.com/OSGeo/gdal/pull/198)
+Shapefile driver:
+ * writer: do no use SHPRewindObject() for [Multi]Polygon layers, but use the
+   input OGRGeometry structure to deduce the winding order (#5315)
+ * writer: prevent potential overflows on 64-bit platforms on huge geometries
+ * writer: optimize MultiLineString writing
 
-DWG driver:
- * compilation fixes with Teigha 4.2.2
+SQLite driver:
+ * Implement AddRelationship support
+ * add a gdal_get_pixel_value() SQL function
+ * allow opening filenames >= 512 characters
+ * make SQL function ogr_layer_Extent() available (#7443)
+ * Spatialite: remove support for libspatialite < 4.1.2
 
-ElasticSearch driver:
- * add support for ElasticSearch 5.0 and fix 2.X support (#6724)
- * implement translation from SQL to E.S. query language
+WFS driver:
+ * implement GetSupportedSRSList() and SetActiveSRS()
 
-FileGDB driver:
- * add support to read curve geometries (#5890)
- * support opening '.' directory
+## SWIG Language Bindings
 
-GeoJSON driver:
- * writer: add a RFC7946=YES creation option (#6705)
- * read and write 'name' and 'description' members at FeatureCollection level
- * fix field type detection when first value of a field is null (#6517)
- * improve/fix field type promotion
- * fix wrong behavior when there's a 'id' at Feature level and 'id' or 'ID' field in properties (#6538)
- * in case top level id is a negative integer, put the value in a 'id' attribute (#6538)
- * ESRI Json reader: support multilinestring from esriGeometryPolyline
- * ESRI Json reader: do not set field width of 2147483647 (#6529)
- * ESRI Json reader: support reading M and ZM geometries
- * Add CPL_json_object_object_get() and use it, to avoid deprecation warnings on json_object_object_get()
- * TopoJSON reader: sanitize invalid polygons (such as found in the 'TopoJSON' layer of http://bl.ocks.org/mbostock/raw/4090846/us.json)
- * writer: fix segfaults on NULL geometry with -lco WRITE_BBOX=YES (#6698)
- * writer: fix crash if NATIVE_MEDIA_TYPE creation option is specified alone
- * Add support of TopoJSON without 'transform' element (github #192)
- * don't set SRS if 'crs' set to null (github #206)
+All bindings:
+ * add gdal.VectorInfo()
+ * fix GDT_TypeCount value (affects C# and Java bindings)
+ * add gdal.GetNumCPUs() and gdal.GetUsablePhysicalRAM()
+ * add gdal.CopyFile()
+ * fix syntax error that fail with SWIG 4.1
 
-GML driver:
- * remove hack for CityGML regarding forcing srsDimension to 3 if not specified. Instead add a GML_SRS_DIMENSION_IF_MISSING config option that can be set to 3 if needed (#6597)
- * consider srsName with URL like 'http://www.opengis.net/def/crs/EPSG/0/' as following EPSG axis order. Add SWAP_COORDINATES=YES/NO/AUTO (and GML_SWAP_COORDINATES configuration option) to override all auto guessing (#6678)
- * add a SRSNAME_FORMAT=SHORT/OGC_URN/OGC_URL dataset creation option
- * OGR_G_ExportToGMLEx(): add a COORD_SWAP option
- * Writer: make ogr:FeatureCollection be a substitutionGroup of AbstractFeature for GML 3.2 output, so as to be compatible of GMLJP2 v2
- * GML and NAS: improve error reporting (mention feature id and gml_id) when parsing fails because of geometry decoding error
- * GML and NAS: add GML_SKIP_CORRUPTED_FEATURES and NAS_SKIP_CORRUPTED_FEATURES configuration options to avoid stopping reading a layer because of a corrupted geometry
- * Add support for Japanese GML FGD v4.1 format (github #204)
+CSHARP bindings:
+ * add SkiaSharp (#6957)
+ * Add missing wrappers for BuildVRT and MultiDimTranslate (#7517)
 
-GPKG driver:
- * list all tables/views by default (useful for non spatial tables not registered as aspatial). Add ASPATIAL_VARIANT layer creation option to select the way how to create a non-spatial table as aspatial.
- * Create non-spatial tables by default conforming to GPKG v1.2 'attributes'
- * use OGR_CURRENT_DATE config option if defined as the value of the 'last_change' of column of 'gpkg_contents' so as to be able to have binary identical output
- * update last_change column when content of raster or vector tables has changed
- * do not emit error when running ExecuteSQL() with a spatial filter on an empty layer (#6639)
- * update schema to reflect CURRENT_TIMESTAMP -> 'now' changes (github #155)
- * better table and column quoting.
- * Robustify layer deletion (make it accessible through DROP TABLE xxx and DELLAYER:xxx syntax) and renaming
- * implement DeleteField(), AlterFieldDefn(), ReorderFields()
- * make GetExtent() save extent if not already cached
- * add special SQL 'RECOMPUTE EXTENT ON layer_name' to force recomputation of extent
- * check identifier unicity on layer creation
- * add possibility to disable foreign key check by setting OGR_GPKG_FOREIGN_KEY_CHECK=NO config option
- * add HasSpatialIndex(tblname,geomcolname) SQL function
- * don't show Spatialite vgpkg_ virtual tables (#6707)
- * SQLite/GPKG: add explicit error message when trying to open a read-only WAL-enabled database (#6776)
- * SQLite/GPKG: make sure when closing a WAL-enabled database opened in read-only mode to reopen it in read-write mode so that the -wal and -shm files are removed (#6776)
- * make GetFeature() works on non conformant tables that have no integer primary key field (#6799), and be robust to non standard column types
- * remove triggers related to metadata tables that cause issues and have been removed by latest revisions of the spec.
- * declare feature id column of features tables and tile pyramid user data tables as NOT NULL (#6807)
- * add a gpkg_ogr_contents table to store feature count.
- * speed-up GetFeatureCount() with only a spatial filter set
- * improve column recognition for SQL result layer
- * add/override ST_Transform() and SridFromAuthCRS() from Spatialite to make them work with gpkg_spatial_ref_sys
- * add ImportFromEPSG()
- * make ST_Min/MaxX/Y(), ST_SRID(), ST_GeometryType() and ST_IsEmpty() work with Spatialite geometries
- * improve performance of spatial index creation and use on multi-gigabyte databases
- * better support of spatial views, by adding a special behavior if a column is named OGC_FID
- * avoid potential denial of services by adding LIMIT clauses
- * slightly more efficient implementation of GetExtent() if extent in gpkg_contents is empty
- * create a dummy 'ogr_empty_table' features table in case we have no 'features' or 'tiles' table, so as to be conformant with Req 17 of the GeoPackage specification
- * add DEFAULT '' to metadata column of gpkg_metadata table
- * accept opening a .gpkg without vector content and without gpkg_geometry_columns table in vector mode if we also open in update mode; remove capability of opening a .gpkg without vector content but with gpkg_geometry_columns table in vector mode if we only open in read-only mode; fix creation of a vector layer in a database if it initially lacks a gpkg_geometry_columns table
- * fix appending a raster to a vector database without pre-existing raster support tables
- * add minimalistic support for definition_12_063 column in gpkg_spatial_ref_sys, so that insertion of new SRS doesn't fail
- * use GEOMETRYCOLLECTION instead of GEOMCOLLECTION for SQL and gpkg_geometry_columns.geometry_type_name
- * do not warn if gpkg_metadata extension declared
+Python bindings:
+ * Emit FutureWarning when exceptions are not explicitly enabled or disabled.
+   Turning on exceptions by default is planned for GDAL 4.0
+ * Make UseExceptions() on one of gdal/ogr/osr module affect all of them
+ * add gdal/ogr/osr.ExceptionMgr() Context Manager for handling Python exception
+   state (#6637)
+ * add gdal.config_option() and gdal.config_options() context manager
+ * add gdal.quiet_errors() context manage
+ * make ogr.Open() and ogr.OpenShared() work with verbose error when exceptions
+   are enabled
+ * gdal.VectorTranslate: add missing extra options (#6486)
+ * Adapt various utilities for exceptions enabled: gdal_merge.py,
+   ogr_layer_algebra.py, ogr_merge, gdalinfo.py, ogr2ogr.py
+ * __init__.py: more robust handling of PATH (cf rasterio/rasterio#2713)
+ * do not make gdal.PushErrorHandler()/PopErrorHandler() sensitive to the GDAL
+   error context
+ * Make GetArrowStreamAsNumPy() handle large lists, strings and binaries
+ * make Dataset.ExecuteSQL() usable as a context manager to automatically
+   release the layer (#7459)
+ * GetArrowStreamAsNumPy(): optimization to save memory on string fields with
+   huge strings compared to the average size
 
-GPX driver:
- * ignore wpt/rtept/trkpt with empty content for lat or long
+# GDAL/OGR 3.6.4 Release Notes
 
-ILI driver:
- * ILI1: fix crash in JoinSurfaceLayer() when the multicurve of the feature of the poSurfaceLineLayer layer is empty (#6688)
- * ILI1: make polygon reconstruction in Surface layers robust to curves not in natural order (#6728)
- * ILI2: assign FID to features (#6839)
- * ILI2: fix crashing bug in Create() if model file not specified
+GDAL 3.6.4 is a bugfix release.
 
-KML driver:
- * add a DOCUMENT_ID datasource creation option to set the id of the root <Document> node
+## GDAL 3.6.4
 
-LIBKML driver:
- * fix crash when reading <gx:TimeStamp> or <gx:TimeSpan> elements (#6518)
- * add a DOCUMENT_ID datasource creation option to set the id of the root <Document> node
- * emit style related errors as warnings to make datasets openable by SWIG bindings (#6850)
+### Port
 
-MITAB driver:
- * limit (width, precision) of numeric fields on creation to (20,16) for compatibility with MapInfo (#6392)
- * add support for oblique stereographic (#6598)
- * Adds the authority code for Irish national grid (Ireland_1965) (github #149)
- * fix spelling for Euref_89 and add EPSG code (#6816)
+* userfaultfd: avoid it to stall on 32bit and test real working of syscall in
+  CPLIsUserFaultMappingSupported()
 
-MSSQLSpatial driver:
- * Fix bulk insert with table names containing spaces (#6527)
- * Build optional mssql plugin with SQL Native Client support for MSSQL Bulk Copy
- * Fix MSSQL select layer to recognize geometry column with sqlncli (#6641)
+### Core
 
-MySQL driver:
- * fix spatial filtering on recent mysql by adding a SRID in the rectangle geometry
- * do not force NOT NULL constraint on geometry field if no spatial index is used
+* RawRasterBand::FlushCache(): avoid crash in some situations
+* RawRasterBand::IRasterIO(): fix wrong byte swapping in Direct IO multiline
+  writing code path
+* RawRasterBand::IRasterIO(): fix optimized code path that wrongly triggered
+  on BIL layout
+* RawRasterBand::IRasterIO(): avoid reading and writing too many bytes
+* RawRasterBand::IRasterIO(): fix floating-point issues with ICC that could
+  result in wrong lines/cols being read/written
 
-NAS driver:
- * support multiple 'anlass' in updates
+### Algorithms
 
-NWT_GRD:
- * add write support (#6533)
+* Rasterize all touched: tighten(decrease) the tolerance to consider that edge
+  of geometries match pixel obundaries (#7523)
 
-OCI driver:
- * Add options for faster feature loading (#6606)
- * add WORKSPACE open option
- * correctly handle OFTInteger64 case in loader layer (bug found by cppcheck multiCondition)
- * support for long identifiers (up to 128 long) when running of 12.2 or + (#6866)
- * OCILOB VSIL driver: new driver to streams in and out of Oracle BLOB as a GDAL large virtual file system (#6861)
+### Utilities
 
-ODS driver:
- * fix FID filtering (#6788)
+* gdal_translate: fix crash when specifying -ovr on a dataset that has no
+  overviews (#7376)
+* gdalcompare.py: correctly take into account NaN nodata value (#7394)
+* gdal2xyz.py: fix -srcnodata and -dstnodata options (#7410)
+* gdal2tiles: update 'ol-layerswitcher' widget to v4.1.1 (#7544)
 
-OGDI driver:
- * make GetNextRawFeature() report an error when it is not end of layer
- * better error reporting when the layer list cannot be established
- * catch non-fatal OGDI errors emitted by OGDI 3.2.0 if OGDI_STOP_ON_ERROR environment variable is set to NO, and emit them as CPLError()s
- * display OGDI error message if opening fails
+### Raster drivers
 
-OpenFileGDB driver:
- * do not error out on geometries that have a declared M array but that is missing (#6528)
- * add support to read curve geometries (#5890)
- * transcode UTF-16 strings found in column names, alias, etc... to UTF-8 (instead of using only their ASCII byte) (#6544)
- * do not emit an error on a empty table whose declaration has M settings (#6564)
- * support opening '.' directory
- * improve detection of some form of TINs from MULTIPATCH, and for MultiPatch layers, try to select a better geometry type for those layers (#5888)
- * fix bug when field description offset is beyond 4GB (#6830)
+GTiff driver:
+ * correctly read GCPs from ArcGIS 9 .aux.xml when TIFFTAG_RESOLUTIONUNIT=3
+  (pixels/cm) (#7484)
 
-OSM driver:
- * fix 'too many tags in relation' error when parsing .osm files
- * allow key=value entries in closed_ways_are_polygons= configuration (#6476)
- * allow OSM_SQLITE_CACHE config option to be greater than 2047
+HDF5 driver:
+ * fix detecting if HDF5 library is thread-safe (refs #7340)
 
-PG driver:
- * fix insertion of binary/bytea content in non-copy mode (#6566)
- * fix errors caused by missing geometry_columns/spatial_ref_sys tables in non PostGIS databases, that prevent reading more than 500 features (QGIS #10904)
- * avoid errors with field default expressions like 'foo'::text (#6872)
+LCP driver:
+ * CreateCopy(): fix crash on negative pixel values (#7561)
 
-PLScenes driver:
- * add HTTP retry logic (#6655)
- * V0 API: workaround limitations on filtering on image_statistics.image_quality (#6657)
- * add support for Data V1 API
+MRF driver:
+ * restore SetSpatialRef() that was wrongly deleted in 3.6.0
 
-S57 driver:
- * Fix ogr2ogr -f S57 (#6549)
- * fix crashes if the s57objectclasses.csv resource file contains invalid lines
- * remove data/s57attributes_aml.csv data/s57attributes_iw.csv data/s57objectclasses_aml.csv data/s57objectclasses_iw.csv and move their content into main s57attributes.csv and s57objectclasses.csv files (#6673)
- * Update s57 attributes and object classes according to s-57 reference (github #202)
- * add POSACC and QUAPOS fields for geometric primitive layers (github #205)
+netCDF driver:
+ * restore capability of reading CF-1.6-featureType vector layers even if the
+   conventions >= CF 1.8, and improve featureType=trajectory by adding the
+   time attribute (fixes #7550)
 
-SDE driver:
- * rename driver to OGR_SDE. Fix build (#6714)
+## OGR 3.6.4
 
-SEGY driver:
- * Accept SEGY files with ASCII headers that have nul terminated strings (#6674)
+### Core
 
-Shapefile driver:
- * auto-repack by default at dataset closing and FlushCache()/SyncToDisk() time. Controlled by AUTO_REPACK open and layer creation options (that default to YES)
- * generate .dbf end-of-file 0x1A character by default. Add DBF_EOF_CHAR layer creation options / open options to control that behavior
- * writing: use strerrno() for better error messages (QGIS #13468)
- * change REPACK implementation on Windows to be robust to remaining file descriptors opened on the .shp/.shx/.dbf (#6672, QGIS #15570)
- * Fix issue in DBFCloneEmpty() one a one field DBF not yet written to disk
- * add call to AutoIdentifyEPSG() when reading a .prj
- * support reading .dbf with substantial padding after last field definition.
- * when rewriting the geometry of the last record in the .shp, do it at the file offset it previously used (#6787)
+* OGRSQL: fix 'SELECT ... WHERE ... AND ... AND ... AND ... UNION ALL ...'
+  (#3395)
+* OGRUnionLayer::GetExtent(): do not emit error on no-geometry layer
+* OGREditableLayer::IUpsertFeature(): fix memleak
 
-SOSI driver:
- * make registration of driver work again (2.1.0 regression) (#6500)
- * update to latest version of https://github.com/kartverket/gdal. Make SOSI driver support more geometry types (including curved geometries) plus provides some improvements on attribute-type mapping. Fix some memory errors/leaks. Disable by default non working creation code (#6503)
+### OGRSpatialReference
 
-SQLite/Spatialite driver:
- * do not emit error when running ExecuteSQL() with a spatial filter on an empty layer (#6639)
- * add read/write support for String/Integer/Integer64/RealList types as serialized JSon arrays
- * Spatialite: avoid crash when creating layer with geom_type = wkbCurve (fixes #6660)
- * Spatialite: do not report some BLOB columns as geometry columns of tables/views (when found before the geometry column(s)) (#6695, #6659)
- * fix update of features with multiple geometry columns (#6696)
- * speed-up dataset closing when creating a database with many spatial layers
- * Spatialite: avoid spatial views to cause layers 'layer_name(geometry_name)' to be publicly listed (#6740)
- * Spatialite: speed-up creation of database with INIT_WITH_EPSG=NO that is slow without transaction (not sure why as the table is empty...)
- * use AUTOINCREMENT for feature id column
- * allow OGR_SQLITE_CACHE to be set to > 2047 (MB) without overflowing
- * SQLite/GPKG: use SQLITE_OPEN_NOMUTEX flag to open databases.
- * GPKG/SQLite: fix ExecuteSQL() to work with a statement with 2 SELECT and ORDER BY clause (#6832)
- * SQLite/GPKG: change default page_size to 4096 bytes.
- * Update layer statistics for Spatialite 4 DB (#6838)
- * Remove traces of support of SQLite < 3.6.0
- * SQLite dialect: properly quote column names when needed (github #214)
+* Fix OGRSpatialReference::SetProjCS() on an existing BoundCRS;
+  affects GeoTIFF SRS reader (fixes gdal-dev/2023-March/057011.html)
 
-VFK driver:
- * allow reading multiple VFK files into single DB support amendment VFK files
- * recreate DB in the case that it's outdated (VFK DB created by previous versions of GDAL)
- * allow reading DB as valid datasource (#6509)
- * new tables in backend SQLite database (geometry_columns/spatial_ref_sys) to enable reading DB datasource by SQLite driver
- * new configuration option OGR_VFK_DB_READ to enable reading backend database by VFK driver
+### Utilities
 
-VRT driver:
- * add support for 'm' attribute in PointFromColumns mode (#6505)
+* ogr2ogr: fix and automate conversion from list types to String(JSON) when the
+  output driver doesn't support list types but String(JSON) (#7397)
 
-WFS driver:
- * invalidate underlying layer when SetIgnoredFields() is called (QGIS #15112)
- * don't crash on empty <Keyword/> declaration (#6586)
- * fix potential nullptr dereference on dataset without layer (github #179)
+### Vector drivers
 
-XLSX driver:
- * only list worksheets (and no charts) as layers (#6680)
+CSV driver:
+ * CSVSplitLine(): do not treat in a special way double quotes that appear in
+   the middle of a field
 
-## SWIG Language Bindings
+FlatGeobuf driver:
+ * improve handling of null geoms (#7483)
 
-All bindings:
- * map osr.GetTargetLinearUnits() (#6627)
- * allow wkbCurve/wkbSurface as valid values for the geom type of GeomFieldDefn object
- * map GDALIdentifyDriverEx()
+GeoPackage driver:
+ * Update definition of gpkg_data_columns to remove unique constraint on "name"
 
-Java bindings:
- * Fix SWIG Java bindings for GNM (#6434)
- * Fix crash on GetDefaultHistogram() if the C++ method returns an error (#6812)
+OpenFileGDB driver:
+ * fix write corruption when re-using freespace slots in some editing scenarios
+   (#7504)
+ * relax test to detect broken .spx
+ * CreateField(): in approxOK mode, do not error out if default value of a
+   DateTime field is CURRENT_TIMESTAMP, just ignore it with a warning (#7589)
 
-Perl bindings:
- * return value always from GetGeomFieldIndex (#6506)
- * the Warp method requires a list of datasets (#6521)
- * when 'use bigint' is in effect, int var is a ref.
- * Separate the module building in the CPAN distribution and in
-the GDAL source tree. The CPAN distribution will be
-developed at https://github.com/ajolma
- * Fix the Extension method in Driver per RFC 46
- * The Inv method of GeoTransform did not return a new object.
-Allow a single point in Apply method of GeoTransform.
- * Test for existence of PDL and require it if available.
- * allow decimation/replication in Piddle i/o.
- * support resampling in ReadTile.
- * Polygonize: Require explicit 8 for Connectedness to set 8-connectedness and allow 8CONNECTED as an option.
- * use Safefree to free memory allocated in Perl (#6796)
+OSM driver:
+ * Fix handling of closed_ways_are_polygons setting in osmconf.ini (#7488)
 
-Python bindings:
- * release the GIL before entering GDAL native code (for all, in GDAL module and a few ones in ogr like ogr.Open())
- * add outputType option to gdal.Rasterize()
- * fix build issues when CXX is defined in the environment
- * gdal.VectorTranslate(): add spatSRS option
- * when enabling ogr.UseExceptions(), use the GDAL error message in the exception text (if available), when the exception is linked to an error value in the OGRErr return code
- * gdal.VectorTranslate(): accept a single string as value of the layers option (instead of iterating over each of its characters)
- * Regenerate Python bindings with SWIG 3.0.8 to avoid issue with Python 3.5. Add backward compatibility in Band.ComputeStatistics() to accept 0/1 as input instead of the expected bool value (#6749)
- * fix gdal.DEMProcessingOptions(zeroForFlat=True) (#6775)
- * fix 'import osgeo.gdal_array' with python3 and SWIG 3.0.10 (#6801)
- * allow gdal.FileFromMemBuffer() to use buffer > 2GB (#6828)
- * accept unicode strings as field name argument in Feature (like SetField, GetField, etc...) and FeatureDefn methods
-
-# GDAL/OGR 2.1.0 Release Notes
+S57 driver:
+ * s57objectclasses.csv: apply S-57 Edition 3.1 Supplement No. 2
 
-## In a nutshell...
+SQLite driver:
+ * GDAL as a SQLite3 loadable extension: avoid crash on Linux
 
- * New GDAL/raster drivers:
-    - CALS: read/write driver for CALS Type I rasters
-    - DB2 driver: read/write support for DB2 database (Windows only)
-    - ISCE: read/write driver (#5991)
-    - MRF: read/write driver (#6342)
-    - SAFE: read driver for ESA SENTINEL-1 SAR products (#6054)
-    - SENTINEL2: read driver for ESA SENTINEL-2 L1B/LC1/L2A products
-    - WMTS: read driver for OGC WMTS services
- * New OGR/vector drivers:
-    - AmigoCloud: read/write support for AmigoCloud mapping platform
-    - DB2 driver: read/write support for DB2 database (Windows only)
-    - MongoDB: read/write driver
-    - netCDF: read/write driver
-    - VDV: read/write VDV-451/VDV-452 driver, with specialization for the
-           Austrian official open government street graph format
- * Significantly improved drivers:
-    - CSV: new options, editing capabilities of existing file
-    - ElasticSearch: read support and support writing any geometry type
-    - GeoJSON: editing capabilities of existing file, "native data" (RFC 60) support
-    - MBTiles: add raster write support. fixes in open support
-    - PDF: add PDFium library as a possible back-end.
-    - PLScenes: add support for V1 API
-    - VRT: on-the-fly pan-sharpening
-    - GTiff: multi-threaded compression for some compression methods
- * Port library: add /vsis3/, /vsis3_streaming/, /vsicrypt/ virtual file systems
- * RFC 26: Add hash-set band block cache implementation for very larger rasters (WMS, WMTS, ...)
-        http://trac.osgeo.org/gdal/wiki/rfc26_blockcache
- * RFC 48: Geographical networks support (GNM)
-        https://trac.osgeo.org/gdal/wiki/rfc48_geographical_networks_support
- * RFC 58: Add DeleteNoDataValue():
-        https://trac.osgeo.org/gdal/wiki/rfc58_removing_dataset_nodata_value
- * RFC 59.1: Make GDAL/OGR utilities available as library functions:
-        https://trac.osgeo.org/gdal/wiki/rfc59.1_utilities_as_a_library
-   For gdalinfo, gdal_translate, gdalwarp, ogr2ogr, gdaldem, nearblack, gdalgrid,
-   gdal_rasterize, gdalbuildvrt
-   Available in C, Python, Perl and Java bindings.
- * RFC 60: Improved round-tripping in OGR
-        https://trac.osgeo.org/gdal/wiki/rfc60_improved_roundtripping_in_ogr
-   Implemented in GeoJSON driver
- * RFC 61: Support for measured geometries.
-        https://trac.osgeo.org/gdal/wiki/rfc61_support_for_measured_geometries
-   Implemented in Shapefile, PostgreSQL/PostGIS, PGDump, MEM, SQLite, GeoPackage,
-   FileGDB, OpenFileGDB, CSV, VRT
- * Upgrade to EPSG database v8.8
- * General sanitization pass to clean-up code, fix a lot of compiler warnings,
-   as well as issues pointed by static code analyzers, such as Coverity Scan
-   (credits to Kurt Schwehr for tackling a large part of them) or CLang Static Analyzer.
- * Fixes in a number of drivers to be more robust against corrupted files (most found
-   with American Fuzzy Lop): RIK, INGR, Northwood, HF2, CEOS, GTiff, GXF, BMP,
-   NITF, HFA, VRT, FIT, CEOS2, NWT_GRD/NWT_GRC, MITAB, RPFTOC, DBF/Shape, XYZ, VFK, DXF,
-   NAS, GSAG, GS7BG, OpenFileGDB, RMF, AIGRID, OpenAIR, EHDR, ISO8211, FAST,
-   USGSDEM, DGN, SGI, OpenJPEG, PCRaster, BSB, ADRG, SRP, JPEG, Leveller, VICAR, PCIDSK, XPM
-   as well as in portability library (CPL), algorithms and raster core.
- * Driver removed:
-    - Google Maps Engine (GME)  (#6261)
+# GDAL/OGR 3.6.3 Release Notes
 
-## New installed files
- * gdal_pansharpen.py
- * data/vdv452.xml
- * data/vdv452.xsd
- * data/netcdf_config.xsd
- * /path/where/bash-completion/scripts/are/installed/gdal-bash-completion.sh
+GDAL 3.6.3 is a bugfix release.
 
-## Backward compatibility issues
+## Build
 
-See MIGRATION_GUIDE.TXT
+* CMake: Fix integration of find_package2()
+* CMake: avoid HDF4 CMake error with Windows paths with spaces
+* CMake: quote variables for INTERFACE_INCLUDE_DIRECTORIES / IMPORTED_LOCATION
+* CMake: fix wrong test when GDAL_SET_INSTALL_RELATIVE_RPATH is set
+* CMake: issue an error when the user explicitly asks for a condition-dependent
+  driver and the condition is not met
+* CMake: add include to FindSQLite3.cmake
+* fix uclibc build without NPTL
+* zlib: Add ZLIB_IS_STATIC build option
+* FindCryptoPP.cmake: properly take into account _LIBRARY_RELEASE/_DEBUG (#7338)
+* FindPoppler.cmake: check that Poppler private headers are available (#7352)
 
-## GDAL/OGR 2.1.0 - General Changes
+## GDAL 3.6.3
 
-Build(Unix):
- * Allow plugin for HDF4, HDF5, GeoRaster, FileGDB, OCI and PG
- * Add a --with-gnm option to enable GNM
- * Add --enable-lto switch to turn on link time optimization (GCC >= 5)
- * Add --with-spatialite=dlopen --with-spatialite-soname=libspatialite.so[.X] syntax to allow linking against spatialite through dlopen() mechanism (#6386)
- * Add a lot of warning options when available in the compiler.
- * Change detection test of podofo to work with podofo 0.9.3
- * Fix gdalserver compilation with recent GNU libc (such as in Arch Linux) (#6073)
- * Add pkg-config support for libkml fork (#6077)
- * Update config.sub and config.guess to their latest upstream versions so as to be able to detect new architectures (android, ppcle64, etc..) (#6101)
- * Fix python package installation in custom prefixes (#4563)
- * configure: check that CXX is really a working compiler (#4436)
- * Build support for Kakadu 7.7
- * thinplatespline.cpp: avoid using optimized version of VizGeorefSpline2DBase_func4() with ICC versions that fail on it (#6350)
- * Add bash completion for GDAL/OGR utilities and scripts (#6381)
- * Add support for ODBC autodetection with mingw64 (#6000)
- * Remove macos 9 and older support (#6133).
- * Remove dist_docs, burnpath and pszUpdableINST_DATA in gcore/gdaldrivermanager.cpp as they are have not been used for a while (#6140).
- * Removed --without-ogr configure flag (#6117).  Always build with OGR.
+### Port
 
-Build(Windows):
- * Add support for Visual Studio 2015 (a.k.a MSVC_VER=1900 or VC 14)
- * Add KAKFLAGS to nmake.opt with KDU_{MAJOR,MINOR,PATCH}_VERSION define-s.
- * nmake.opt: make it less error prone to define SETARGV when paths include spaces (#6032)
- * nmake.opt: add CL.EXE compiler option /FC to display full path of source code file in diagnostics
- * Remove WinCE support (#6133)
- * nmake.opt: add /I flag to the INSTALL command so that xcopy will be smart enough to create a directory when copying files and avoid prompting for user input (https://github.com/OSGeo/gdal/pull/95)
- * Enable mssql spatial blugin build, use BCP as the default option for the sqlncli enabled builds
- * Add support to find MrSID 9.5 dll
- * Fix Windows build with recent MySQL versions and Visual Studio 2015 (#6457)
+* CPLGetPhysicalRAM(): take into account current cgroup (v1 and v2)
+* CPLGetPhysicalRAM(): take into account MemTotal limit from /proc/meminfo
+* /vsicurl/: fix CPL_VSIL_CURL_USE_HEAD=NO mode (#7150)
+* Avoid use of deprecated ZSTD_getDecompressedSize() function with libzstd 1.3+
+* cpl_vsil_crypt.cpp: fix build isse on Windows (#7304)
 
-Build(all):
- * Compatibility with C++11 and C++14
- * Optional crypto++ dependency for /vsicrypt/ support
- * Optional mongocxx dependency for MongoDB support
+### Algorithms
 
-Other:
- * Disable copy constructor and assignment operators in classes OGRFieldDefn, OGRGeomFieldDefn, OGRFeature, GDALMultiDomainMetadata, GDALDefaultOverviews, GDALOpenInfoGDALDataset, GDALRasterBlock, GDALRasterBand and GDALDriver (#6100)
+* GDALPolygonizeT(): add sanity check
+* GDALRasterPolygonEnumeratorT::NewPolygon(): check memory allocation to avoid
+  crash (#7027)
+* Warper: do not use OpenCL code path when pafUnifiedSrcDensity is not null
+  (#7192)
+* Warper: optimize a bit when warping a chunk fully within the cutline
+* Geoloc inverse transformer: fix numeric instability when quadrilaterals are
+  degenerate to triangles (#7302)
 
-## GDAL 2.1.0 - Overview of Changes
+### Core
 
-Port:
- * Add /vsicrypt/ virtual file system for reading/creating/update encrypted files on the fly, with random access capabilities
- * Add /vsis3/ and /vsis3_streaming/ virtual file systems to read/write objects from AWS S3 buckets
- * /vsizip/: avoid returning the previous file list of an already opened .zip if it has changed afterwards (#6005)
- * /vsizip/: use CP437 on Windows when ICONV support is available (#6410)
- * /vsimem/: implement append mode (#6049)
- * /vsistdin/: fix caching of first 1MB / VRT driver: read XML content from /vsistdin/ in a streaming compatible way (#6061)
- * /vsistdout/: flush when closing the handle (#6149)
- * Add VSIReadDirEx() with a limit on the number of files before giving up and corresponding VSIFilesystemHandler::ReadDirEx() virtual function
- * cpl_vsil_cache: rework to be able to work on very large files on 32bit systems
- * Add CPLThreadLocaleC class to use thread-specific locale settings (when available)
- * VSIWin32Handle::Flush(): add VSI_FLUSH config option that can be set to TRUE to force FlushFileBuffers(). (hack related to #5556)
- * Fix VSIL append mode in Windows (#6065)
- * Make CPLCreateMutexEx() support CPL_MUTEX_REGULAR; and fix CPL_MUTEX_ADAPTIVE to avoid continuing in code path for creation of recursive mutex
- * Add CPLWorkerThreadPool API
- * Add CPLGetThreadLocalConfigOption()
- * Fix CPL_LSBINT16PTR() and CPL_LSBINT32PTR() to work with non-byte pointer (#6090)
- * CPLRecodeStub(): add special case for CP437 -> UTF-8 when input is only printable ASCII
- * CPLHTTPFetch(): add LOW_SPEED_TIME and LOW_SPEED_LIMIT options
- * CPLGetValueType(): improve heuristics to avoid detecting some WKB strings as real numbers (#6128)
- * Add CPL_SHA256* and CPL_HMAC_SHA256 functions
- * Make CPLVirtualMemFileMapNew() work on all systems having mmap(), and thus GeoTIFF GTIFF_VIRTUAL_MEM_IO optimization too
- * Add VSI_MALLOC_VERBOSE() and similar macros to output an error message in case of failed alloc
- * CPLParseXMLString(): limit depth of elements to 10000
- * Win32 file management: handle files whose total file path length is greater than 255 characters in Open() and Stat()
- * Make CPLFormFilename(absolute_path, "..", NULL) truncate when possible
- * Add VSIGetDiskFreeSpace()
- * Implement CPLIsInf() for Solaris 11
- * Add a CPL_FINAL macro that expands to C++11 final keyword when C++11 is enabled, and use it in a few places
- * Avoid CPLEscapeString (CPLES_URL) encoding some characters unnecessarily (#5526)
- * Add CPLTestBool(), CPLTestBoolean(), CPLFetchBool()
- * Fix CPLGetValueType() to recognize D1 as a string and not a real number (#6305)
- * CPLFormFilename(): use '/' directory separator on Windows on /vsicurl_streaming/ files (#6310)
- * Add hack enabled by -DDEBUG_BOOL to detect implicit int->bool conversions that dislike MSVC (#6325)
- * Add hack to '#define NULL nullptr' when NULL_AS_NULLPTR is defined. Must be used together with -std=c++11 -Wzero-as-null-pointer-constant with GCC to detect misuses of NULL/nullptr (#6327)
- * Add VSIError mechanism to store errors related to filesystem calls, and use it for /vsis3/. Add new CPLE_ error numbers. (https://github.com/OSGeo/gdal/pull/98)
- * Fix CPLsscanf() to be conformant regarding how space/tab/... separators are handled, so as to fix OGR GMT to be able to read coordinates separated by tabulations (#6453)
+* GDALProxyPoolRasterBand::FlushCache(): fix for ref counting when calling
+  FlushCache() on GDALProxyPoolMaskBand or GDALProxyPoolOverviewRasterBand
+* VirtualMem: Fix mremap() detection with clang 15, and disable
+  HAVE_VIRTUAL_MEM_VMA if HAVE_5ARGS_MREMAP not found
 
-Core:
- * Change default value of GDAL_CACHEMAX to 5% of usable physical RAM
- * Allow open options name to be prefixed by @ to be silently ignored when not existing in driver options (RFC 60)
- * Honour NBITS metadata item when doing RasterIO() with non-nearest resampling (#6024)
- * GDALClientServer: pass open options to INSTR_Open call
- * Improve performance of GDALCopyWords() float->byte/int16/uint16 by using SSE2
- * Decorate prototypes of RasterIO() related operations with CPL_WARN_UNUSED_RESULT
- * Avoid deadlock when writing 2 datasets in 2 threads (#6163)
- * Remove obsolete symbols __pure_virtual(), GDALCreateProjDef(), GDALReprojectToLongLat(), GDALReprojectFromLongLat() and GDALDestroyProjDef()
- * Remove obsolete non-template-based implementation of GDALCopyWords(). We don't support anymore such compilers
- * GDALJP2Box::ReadBoxData(): do not abort if memory allocation fails
- * Add GDALAdjustValueToDataType() in C API, and use it in GDALTranslate() and GDALWarp()
- * GDALDefaultOverviews::CreateMaskBand(): fix logic error related to writing per-band mask
- * Block cache: fix excessive memory consumption when dealing with datasets with different block sizes (#6226)
- * EXIFExtractMetadata(): fix potential 1-byte write buffer stack overflow
- * MDReader: do no attempt reading side-car files on /vsisubfile/ (#6241)
- * GDALCheckBandCount(): allow by default a maximum number of bands to 65536
- * GDALOpenInfo: add StealSiblingFiles() and AreSiblingFilesLoaded() methods
- * GDALOpenInfo::GetSiblingFiles(): give up after GDAL_READDIR_LIMIT_ON_OPEN (default=1000) files in the directory
- * GDALDefaultOverviews: add TransferSiblingFiles() method
- * GDALDriver::DefaultCreateCopy(): fix logic related to propagation of NBITS / PIXELTYPE metadata items as creation options
- * Reorder driver registration a bit so that formats with efficient identification are probed first
- * Add GDALIdentifyEnum (GDAL_IDENTIFY_UNKNOWN, GDAL_IDENTIFY_FALSE or GDAL_IDENTIFY_TRUE) for return values of Identify()
- * GDALLoadRPCFile(): load .rpc files from Ikonos products that have extra end-of-line character (#6341)
- * Export GDALRegenerateOverviewsMultiBand() symbol, but mostly for plugins (#6342)
- * Add GDAL_NO_AUTOLOAD to compile out the body of AutoLoadDriver (#6380)
- * Avoid ComputeStatistics(), GetHistogram() and ComputeRasterMinMax() to use only the first column of blocks in approximation mode for a raster whose shape of blocks is a square (#6378)
- * Add GDALGetDataTypeSizeBits() and GDALGetDataTypeSizeBytes().
- * GDALReadOziMapFile(): fix reading Ozi external files from virtual file systems (https://github.com/OSGeo/gdal/pull/114)
- * Add CPLSetCurrentErrorHandlerCatchDebug() to enable custom error handlers not to intercept debug messages
+### Utilities
 
-Algorithms:
- * RPC transformer: provide SSE2 accelerated transformer
- * RPC: fix off-by-half pixel computation of (pixel, line), and in bilinear and bicubic RPC DEM interpolation; fix off-by-one pixel registration for Pleiades RPC (#5993)
- * RPC: make RPCInverseTransformPoint() check convergence has been reached (#6162)
- * RPC DEM: optimize when DEM is in NAD83 or any other geodetic CS that transform as a no-op to WGS 84
- * RPC DEM: take into account vertical datum of the DEM when present to convert DEM elevations to ellipsoidal heights (#6084)
- * RPC DEM: do fallback cubic -> bilinear and bilinear -> near on DEM edges
- * RPC DEM: improve inverse transformer to validate error threshold and improve convergence (#6162, #6377)
- * RPC: fix issues with dateline (#6472)
- * TPS solver: discard duplicated GCP to avoid avoidable error, warning when 2 GCPs have same (pixel,line) but different (X,Y) or the reverse
- * Warper: rework multithreaded computations to use a thread pool rather than forking threads each time
- * Warper: avoid really excessive processing time for some warping with target areas completely off the source raster (especially when involving RPC) (#6182)
- * Warper: CreateKernelMask(): fix potential 32 bit integer overflow when using warp memory value > 2GB (#6448)
- * gdal_grid: add linear interpolation algorithm
- * gdal_grid: add invdistnn algorithm, variation on the existing inverse distance weighting algorithm with quadtree to search for points only in the neighborhood (#6038)
- * gdal_grid: fix crash in optimized mode with GCC 4.4 on 64bit (#5987)
- * gdal_grid: compile gdalgrid AVX optimization for Windows when supported by compiler
- * Add GDALTriangulationXXXX() API through libqhull
- * Sieve filter: fix crash on nodata polygons (#6096)
- * Sieve filter: improvement to walk through the biggest neighbour chain until we find a polygon larger than the threshold (#6296)
- * GDALFPolygonize(): factor implementation with integer case
- * GDALComputeMedianCutPCT(): fix to make it work with rasters with more than 2 billion pixels (#6146)
- * Overview: Make average and gauss methods aware of transparent color table entries (#6371)
+* gdal_translate: make -colorinterp work on a source band that is a mask band
+* gdalmdimtranslate: do not require VRT driver to be registered (#7021)
+* gdalmdimtranslate: fix subsetting in the situation of dataset of #7199
+* gdalwarp: fix vshift mode when vertical unit of dstSrs is non-metric
+* gdalwarp: overview choice: fix longitude wrap problem (#7019)
+* gdalwarp: allow up to inaccuracy in cropline coordinates up to 0.1% of a
+  pixel size for rounding (#7226)
+* gdalsrsinfo: fix crash on 'gdalsrsinfo IAU:2015:49902 -o xml'
+* gdal_retile.py: fix wrong basename for .aux.xml files (#7120)
+* gdallocationinfo: fix issue with VRTComplexSource and nodata (#7183)
+* gdal_rasterize: ignore features whose Z attribute is null/unset (#7241)
 
-Utilities:
- * gdalinfo: workaround bug in proj <= 4.9.1 on datasets with a SRS with a vertical shift grid (#6083)
- * gdal_translate: detect more reliably if specified bands are not in default order
- * gdal_translate: fix -a_nodata with negative values on rasters that have PIXELTYPE=SIGNEDBYTE; fix preserving PIXELTYPE=SIGNEDBYTE with VRT
- * gdal_translate: fix random behavior when -scale is used without source bounds (#6455)
- * gdal_rasterize: do on-the-fly reprojection of input vector onto output raster
- * gdal_rasterize: rasterize: always create output with 1/2 cell buffer of input geometry envelope (#6058)
- * gdal_rasterize: add the -dialect option
- * gdal_rasterize: accept NaN as a valid value for -init / -burn (#6467)
- * gdalwarp: add -doo option to specify open options of (existing) output dataset
- * gdalwarp: if RPC_DEM warping option is specified, use exact transformer by default (#5993)
- * gdalwarp: make it honour nodata value of existing dataset (if -dstNoData isn't explicitly specified)
- * gdalwarp: do not propagate STATISTICS_ of second or following source datasets
- * gdalwarp: do not emit warning when using -cutline with a SRS and the source raster has RPC or GEOLOCATION
- * gdalwarp: check that the cutline is valid after transformation/reprojection
- * gdalwarp: better deal when dealing with a mix of RGB and RGBA datasets as input
- * gdalwarp: fix -srcnodata to not put garbage values as target dstnodata (#6315)
- * gdalwarp: densify cutline to avoid invalid geometry after reprojection to source raster, especially in the RPC case (#6375)
- * gdalserver: add a -nofork mode (Unix only for now), so that multiple clients can connect to the same dataset. Useful for safe 'concurrent' updates
- * add gdal_pansharpen.py script
- * gdal2tiles.py: fix error on a raster with less than 3 bands that resulted in a 'IndexError: list index out of range'
- * gdal2tiles.py: Change EPSG:3785 / EPSG:900913 into EPSG:3857 (#5622)
- * gdal2tiles.py: add Leaflet template (https://github.com/OSGeo/gdal/pull/71)
- * gdal2tiles.py: add -q switch for quiet mode
- * gdaldem: correctly deal with NaN as nodata value (#6066)
- * gdaldem color-relief: deal with the case of repeated entries with the same value and the input raster has pixels that match that value exactly (#6422)
- * gdaladdo: emit error message if passed an invalid dataset name (#6240)
- * gdaladdo: do not silence warnings when opening in update mode, if the open is successful
- * gdalbuildvrt: fix potential crash when using -b switch (#6095)
- * gdalbuildvrt: accept nan as value for -srcnodata and -vrtnodata
- * gdalbuildvrt: return non zero return code if the flush of the VRT to disk failed
- * gdal_merge.py: takes again into account -n flag (#6067)
- * gdalbuildvrt / gdal_translate / VRT: use floating point values for source and destination offsets and sizes (#6127)
- * gdalmove.py: fix to run with GDAL 2.0 gdal.InvGeoTransform() signature
- * gdal_calc.py: Add * from gdalnumeric to gdal_calc.py eval namespace again, to fix 2.0 regression that made for example 'log10(A)' to no longer work (https://github.com/OSGeo/gdal/pull/121)
-
-Python samples:
- * gdalpythonserver.py: update to protocol 3
-
-AAIGRID:
- * when writing with floating-point values, ensure at least one value has a decimal point to avoid issues with some readers (#6060)
+### Raster drivers
 
 BMP driver:
- * BMP: avoid too big color table allocation in case of wrong iClrUsed value
+ * Make sure file is created at proper size if only calling Create() without
+   writing pixels (#7025)
+ * Create(): add checks and warnings for maximum dimensions
 
-BLX driver:
- * converted to support VirtualIO
+COG driver:
+ * avoid warning message when using -co COMPRESS=WEBP -co QUALITY=100 (#7153)
 
-ECRG driver:
- * change subdataset definition to make sure that they only consist of frames of same scale (#6043)
- * fix base34 decoding and Windows filename handling (#6271)
+DIMAP driver:
+ * optimize performance of dataset RasterIO()
 
-ECW driver:
- * use wide char Open API on Windows when GDAL_FILENAME_IS_UTF8=YES (https://github.com/OSGeo/gdal/pull/70)
- * fix reading of ECW in /vsi file systems (with SDK >= 4) (#6482)
+GRIB driver:
+ * fix reading South Polar Stereographic from GRIB1 datasets (#7298)
+ * degrib: replace use of sprintf() with snprintf()
 
-GeoRaster driver:
- * fix deflate read error depending on endianness (#6252)
+GTiff driver:
+ * GTiffJPEGOverviewBand::IReadBlock(): remove hack that causes read errors in
+   some circumstances
+ * do not use implicit JPEG overviews with non-nearest resampling
+ * fix generation of external overviews on 1xsmall_height rasters (#7194)
 
-GIF driver:
- * libgif: partial resync with giflib master (but keep ABI of 4.1.6)
- * fix crash when CreateCopy a source with one color in the color table
+GTX driver:
+ * fix (likely harmless in practice) integer overflow (ossfuzz#55718)
 
-GMT driver:
- * validate raster dimensions on opening, and acquire mutex in dataset destructor
+HDF5 driver:
+ * add a GDAL_ENABLE_HDF5_GLOBAL_LOCK build option to add a global lock when
+   the HDF5 library is not built with thread-safety enabled (#7340)
 
-GPKG driver:
- * write support: fix various issues in update scenarios when interacting with the GDAL block cache that could result in lost/corrupted band data to be written in tiles (#6309)
- * write support: fix potential use of freed sqlite temporary DB handle when generating overviews with partial tiles (#6335)
- * write support: fix potential crash in scenarios when block cache is full (#6365)
- * write support: fix inversion of row/column in one of the SQL request involved in partial tiles management (#6339)
- * fix generation of files with 1-band paletted input dataset. Also improve the logic to retrieve color palette when forcing BAND_COUNT=1 on opening (#6450)
+HFA driver:
+ * ERDAS Imagine SRS support: various fixes: Vertical Perspective projection,
+   LCC_1SP, Mercator_2SP, Eqirectanglar, Hotine Obliqe Mercator Azimuth Center
 
-GTiff driver:
- * add NUM_THREADS creation and open options to enable multi-threaded compression
- * fix GTiffDataset::IsBlockAvailable() wrong behavior when compiling against internal libtiff, when a BigTIFF file has a TileByteCounts with LONG/4-byte counts and not LONG8 (#6001)
- * Correctly take into account overridden linear units for a geotiff with a EPSG PCS code (#6210, #4954)
- * make VirtualMemIO() work with non native endianness
- * improve VirtualMemIO() performance in tiled Contig read to single band copy
- * improve single band tiled VirtualMemIO reading
- * improve DirectIO() to work on tiled uncompressed geotiff, for non-resampling and nearest resampling cases. Also improve performance of resampling cases on un-tiled files
- * fix DirectIO() mode with complex types and inverted endianness (#6198)
- * optimize writing of 12-bit values
- * implement lazy loading of .aux.xml and .tfw/.wld
- * Internal libtiff: update to CVS HEAD post libtiff 4.0.6
- * make SetColorInterpretation(GCI_AlphaBand) work on a 5 band or more GeoTIFF (#6102)
- * automatically set PHOTOMETRIC=RGB if manually assigning color interpretation Red,Green,Blue to band 1,2,3 before directory crystallization (#6272)
- * add GEOTIFF_KEYS_FLAVOR=ESRI_PE creation option to write EPSG:3857 in a ESRI compatible way (#5924)
- * call XTIFFInitialize() in LibgeotiffOneTimeInit() as the former isn't thread-safe, so better call it from the later which is thread-safe (#6163)
- * fix reading and writing angular units different from degree (namely arc-second, arc-minute, grad, gon and radian) (#6171)
- * do not use VirtualMemIO optimization on compressed /vsimem/ files (#6195)
- * correctly set GTRasterTypeGeoKey=RasterPixelIsPoint if AREA_OR_POINT=Point but there is no SRS set (#6225)
- * improve a bit error detection when writing
- * check free space before writing (only for big, non sparse, uncompressed)
- * do not read large 'one row' JBIG compressed files with the scanline API (#6264)
- * Fix SetMetadata() to properly clear existing PAM metadata (complement to #5807)
- * prevent potential out of bounds read/write to TIFFTAG_EXTRASAMPLES (#6282)
- * do not use first directory as potential mask, to avoid assertion in GTiffDataset::SetDirectory() (#6287)
- * reject files with strips/tiles/scanlines bigger than 2 GB to avoid 32 bit integer overflow.
-   Also in case of files with Contig PlanarConfiguration do not make reading one block for band 2 OK when reading for band 1 issued an error (#6288)
- * GTIFFWriteDirectory(): avoid memory leak of codec related memory (#2055)
- * Make ALPHA=NO in CreateCopy() cancel alpha color interpretation even if present in source raster
- * fix problem with implicit overviews of JPEG-compressed files (#6308)
- * fix compilation problem with internal libtiff if DEFER_STRILE_LOAD isn't defined (which is not the default configuration) (https://github.com/OSGeo/gdal/pull/90)
- * use more appropriate error message when 4GB threshold is reached with external overviews, and try to make doc of BIGTIFF=IF_NEEDED/IF_SAFER clearer (#6353)
+JPEG driver:
+ * Correctly read GCPS when an .aux.xml sidecar has GeodataXform present in the
+   ESRI metadata element instead of root element
 
-HDF4 driver:
- * Skip quotation mark when parsing HDF-EOS metadata.
+JPEGXL driver:
+ * CreateCopy(): fix memory leak when writing georeferencing
 
-HDF5 driver:
- * add Komsat Mission ID to possible value for HDF5 SAR product (https://github.com/OSGeo/gdal/pull/103)
+MBTiles driver:
+ * fix nullptr deref when calling GetMetadata() on a dataset returned by
+   Create() (#7067)
 
-HF2 driver:
- * fix reading side of the driver to work on architectures where char is unsigned, like PPC or ARM (#6082)
+netCDF driver:
+ * quote variable name in subdataset list if it contains a column character
+   (#7061)
+ * report GEOLOCATION metadata for a lon/lat indexed variable where lon and/or
+   lat has irregular spacing
+ * netCDFDimension::GetIndexingVariable(): be more restrictive
+ * resolve variable names beyond the parent group (#7325)
 
-HFA driver:
- * when reading projection, preserve EPSG code if AutoIdentifyEPSG() identified the SRS, even if a PE string is present (#6079)
- * keep TOWGS84 even when using ESRI PE string (#6158)
- * fix crashes on corrupted files (#6208, #6286)
+NITF driver:
+ * update CLEVEL to appropriate values when using compression / multiple image
+   segments
+ * fix bug that prevents adding subsequent TREs after a HEX TRE (#6827)
 
-INGR driver:
- * check that RLE decoding produced the expected number of bytes and error out otherwise; test that 'random' line seeking actually works
+PDF driver:
+ * skip JP2ECW driver if ECW_ENCODE_KEY required but not found
 
-JPEGLS driver:
- * fix build error (#6430)
+TileDB driver:
+ * fix compatibility with tiledb 2.14
 
-JP2ECW driver:
- * honour psExtraArg->eResampleAlg when upsampling (#6022)
+VRT:
+ * warp: fix issue when warping a Float32 raster with nodata = +/- FLOAT_MAX
 
-JP2KAK driver:
- * honour psExtraArg->eResampleAlg when upsampling (#6022)
- * try rounded dimensions to decide if the data is being requested exactly at a sub-resolution
- * support v7.7 on Unix (additional changes potentially needed on Windows)
+ZMap creation:
+ * fix potential truncation of nodata value (#7203)
 
-JP2OpenJPEG driver:
- * Safer multi-threaded use
+## OGR 3.6.3
 
-JPEG driver:
- * add USE_INTERNAL_OVERVIEWS open option (default to TRUE as in recent versions, can be set to FALSE to hide internal overviews
+### Core
 
-KMLSuperOverlay driver:
- * fix 2.0 regression with some RasterIO() requests involving resampling (#6311)
- * recognize datasets that have a intermediate <Folder> that forms a <Document><Folder><Region/><GroundOverlay/> structure (#6343)
+* OGRSQL: fix crash when comparing integer array fields (#6714)
+* OGRSQL: fix SetAttributeFilter() when dialect=OGRSQL and not forwarding the
+  initial where clause to the source layer (#7087)
 
-LCP driver:
- * fix wrong use of endianness macros to fix behavior on big-endian hots
+### Utilities
 
-Leveller driver:
- * update to v9 read support (#5632,)
+* ogr2ogr: fix -clipsrc/-clipdst when clip dataset has SRS != features's
+  geometry (#7126)
 
-MBTiles driver:
- * add raster write support
- * fix so that datasets whose lowest min zoom level is 16 or above are recognized
- * be robust to invalid 'bounds' at dataset opening (#6458)
+### Vector drivers
 
-MEM driver:
- * avoid 32 bit overflows
+GeoJSON driver:
+ * avoid duplication of FID in streaming parser (#7258)
+ * declare GDAL_DCAP_MEASURED_GEOMETRIES and ODsCMeasuredGeometries
+ * fix mixed type field not flagged as JSON if first is a string (#7313)
+ * writer: take into account COORDINATE_PRECISION for top bbox (#7319)
+ * writer: fix json mixed types roundtrip (#7368)
 
-NetCDF driver:
- * add support for reading NC4 unsigned short attributes and variables (#6337) * read correctly nodata values in [128,255] range for (unsigned) Byte data type (#6175)
- * implement Get/SetUnitType() using the standard units attribute (https://github.com/OSGeo/gdal/pull/96)
- * optimize IReadBlock() and CheckData() handling of partial blocks in the x axis by re-using the GDAL block buffer instead of allocating a new temporary buffer for each block (#5950)
- * full read/write support for new NetCDF4 types NC_UBYTE, NC_USHORT, NC_UINT and NC_STRING for variables (except for NC_STRING) and attributes (https://github.com/OSGeo/gdal/pull/99)
- * add support for the geostationary projection (#6030)
- * fix one byte heap write overflow in NCDFTokenizeArray() (#6231)
- * fix potential buffer overflows with uses of nc_inq_varname(), nc_inq_attname() and nc_get_att_text() (#6227)
- * validate that gridmapping:GeoTransform has 6 values (#6244)
- * fix wrong use of deallocator when writing a GEOLOCATION array, and other issues
- * limit number of bands reported to 32768 by default
- * validate raster dimensions
- * validate content of NC_GLOBAL#GDAL variable (#6245)
+GeoJSONSeq driver:
+ * fix writing to /vsigzip/ (#7130)
 
-NGSGEOID driver:
- * make it work on > 2GB file
+GeoPackage driver:
+ * avoid issue with duplicated column names in some cases (#6976)
+ * GetNextArrowArray(): fix retrieving only the geometry (geopandas/pyogrio#212)
+ * restore async RTree building for 1st layer (broken by GDAL 3.6.2)
 
-NITF driver:
- * data/nitf_spec.xml: Add CSCCGA, MENSRB, SENSRB, STREOB, ENGRDA, EXPLTB and PATCHB TREs (https://github.com/OSGeo/gdal/pull/81, #6285, https://github.com/OSGeo/gdal/pull/86)
- * fix parser to properly deal with variable length items not in first nesting level
+GML driver:
+ * fix CurvePolygon export of CompoundCurve and CircularString child elements
+   (#7294)
 
-Northwoord driver:
- * fix computation of intermediate color table values on non-Intel platforms (#6091)
+HANA driver:
+ * fix DSN open option
 
-NTv2 driver:
- * support reading/writing/appending to files with big-endian order (cf https://github.com/OSGeo/proj.4/issues/345)
+MITAB driver:
+ * handle projection methods 34 (extended transverse mercator) and 35 (Hotine
+   Oblique Mercator) (#7161)
+ * Fix possible crash on NULL feature text (#7341)
+ * Fix a typo at MITABGetCustomDatum
 
-OpenJPEG driver:
- * do not expose block dimensions larger than dataset dimensions to avoid wasting memory (#6233)
+NAS driver:
+ * fix file descriptor leak in error code path
 
-PCIDSK driver:
- * Remove the old driver (#6172)
+OpenFileGDB driver:
+ * fix performance issue when identifying a CRS
+ * detect broken .spx file with wrong index depth (qgis/qgis#32534)
+ * index reading: avoid integer overflow on index larger than 2 GB
+ * allow CreateField() with OBJECTID as the column name (qgis/qgis#51435)
+ * make Delete() method to remove the directory (fixes #7216)
 
-PDF driver:
- * add PDFium library as a possible back-end. Initial support contributed by Klokan Technologies GmbH  (http://www.maptiler.com/)
- * workaround a bug of PoDoFo 0.9.0 by avoiding loading of vector content in raster-only mode (doesn't prevent the crash if reading the vector layers) (#6069)
- * make OGC BP registration work with media box where bottom_y is negative and top_y = 0 (in non rotated case)
- * make OGC BP registration work with media box where min_x != 0 (in non-rotated case)
- * correctly take into account non-meter linear units with OGC BP encoding, and add support for US FOOT (#6292)
+Shapefile driver:
+ * fix adding features in a .dbf without columns (qgis/qgis#51247)
+ * make sure eAccess = GA_Update is set on creation (#7311)
 
-PDS driver:
- * change default values of PDS_SampleProjOffset_Shift and PDS_LineProjOffset_Shift to 0.5 (#5941)
- * fix nodata value for UInt16 to be 0 (#6064)
- * accept 'ODL_VERSION_ID = ODL3' in header (#6279)
+## SWIG bindings
 
-PGChip driver:
- * driver removed from sources
+* add missing OLCUpsertFeature constant
 
-PLScenes driver:
- * PLScenes V0: avoid opening raster to generate dummy .aux.xml
+## Python bindings
 
-PNG driver:
- * Support writing 1, 2 or 4 bit single band
- * Add NBITS creation option
- * fix XML of creation option list
- * Update internal libpng to 1.2.56
+* fix setup.py dir-list issue on macOS
 
-PostgisRaster driver:
- * avoid Identify() to recognize OGR PostgreSQL connection strings with schemas option and cause loud 'QuietDelete' (#6034)
+# GDAL/OGR 3.6.2 Release Notes
 
-Raw drivers:
- * better support for direct read of more than 2GB in single gulp (untested though)
+GDAL 3.6.2 is a bugfix release.
 
-RIK driver:
- * fix Identify() method to recognize again non-RIK3 RIK datasets (#6078)
+## General
 
-RMF driver:
- * implement GetNoDataValue()
- * add read/write access to new RMF format for files larger than 4 Gb (version=0x201) (https://github.com/OSGeo/gdal/pull/11)
+[RFC69](https://gdal.org/development/rfc/rfc69_cplusplus_formatting.html):
+Whole code base C/C++ reformatting
 
-ROIPAC driver:
- * Support offset and scale band (#6189)
+## Build
 
-VICAR driver:
- * change PDS_SampleProjOffset_Shift and PDS_LineProjOffset_Shift default values to 0.5 (#5941)
- * fix loss of precision in scale and offset
+* Avoid warning with curl >= 7.55 about CURLINFO_CONTENT_LENGTH_DOWNLOAD being
+  deprecated
+* Avoid warning with curl >= 7.87 about CURLOPT_PROGRESSFUNCTION being
+  deprecated
+* fix nitfdump build against external libtiff (#6968)
+* fix compilation with gcc 4.8.5 of Centos 7.9 (#6991)
 
-VRT driver:
- * expose implicit 'virtual' overviews for VRT whose bands are made of a single SimpleSource/ComplexSource
- * gdalvrt.xsd: Add capitalized versions of true and false (#6014)
- * GetSingleSimpleSource(): check there's a single source (#6025)
- * honour VRTRasterBand NBITS metadata with SimpleSource and ComplexSource
- * properly take into account nodata value declared at VRT band level when doing resampling with non-nearest
- * honour relativeToVRT when using AddBand() to add a VRTRawRasterBand (https://github.com/OSGeo/gdal/pull/67)
- * VRT warp: fix crash with implicit overviews and destination alpha band (#6081)
- * make GetDefaultHistogram() on a sourced raster band save the result in the VRT (#6088)
- * serialize NODATA and NoDataValue items with %.16g, e.g. so as to be able to hold large int32 nodata values (#6151)
- * VRTSourcedRasterBand: make ComputeRasterMinMax() and ComputeStatistics() forward bApproxOK to overview band (useful for implicit overviews)
- * make CreateCopy() preserve NBITS metadata item
- * avoid loading sibling file list if not available
- * VRT raw: don't truncate last figure of ImageOffset if there are left space padding (#6290)
- * VRTWarpedDataset::SetMetadataItem(): fix crash when calling with name=SrcOvrLevel and value=NULL (#6397)
- * Warped VRT: fix deadlock in situation where warped VRT datasets are read in multiple threads and the block cache reaches saturation. Also add a GDAL_ENABLE_READ_WRITE_MUTEX config option that can be set to NO to disable the read/write mutex mechanism in cases where it would deadlock (#6400)
+## Data files
 
-WMS driver:
- * add a IIP (Internet Imaging Protocol) minidriver
- * limit number of zoom levels for ArcGIS MapServer JSon (#6186)
- * determine a resolution that will not result in a number that is larger than the maximum size of an integer.  Any value that exceeds the maximum size of an integer will raise an invalid dataset dimensions error. (https://github.com/OSGeo/gdal/pull/89)
+* tms_MapML_CBMTILE.json: fix wrong matrixWidth value (#6922)
 
-XYZ driver:
- * be more robust to not exactly equal X and Y spacing (#6461)
+## GDAL 3.6.2
 
-## OGR 2.1.0 - Overview of Changes
+### Port
 
-Core:
- * Add OGREditableLayer class to add editing capabilities to drivers with none or limited editing capabilities
- * OGRGeometry: add DelaunayTriangulation() method (GEOS >= 3.4)
- * OGRGeometry and derived classes: implement copy constructor and assignment operator (#5990)
- * OGRGeometry: Fix result of Equals on POINT EMPTY with POINT(0 0)
- * OGRFeature SetField(): more type conversions allowed, particularly with array types
- * OGRFeature::SetGeometry()/SetGeometryDirectly(): make it work when passed geometry is the currently installed geometry (#6312)
- * OGR SQL: do not silently skip NULL values in the first records when evaluating a SELECT DISTINCT (#6020)
- * OGR SQL: correctly sort NULL values in first positions (#6155)
- * OGR SQL: fix CAST(x AS bigint) to return an evaluated int64 node, and not int32 (#6479)
- * OGR SQL: handle 'fid' as Integer64 in where clause, and allow CAST(fid AS bigint) in selected columns (#6484)
- * Add OGRUpdateFieldType()
- * Decorate a few functions/methods of the OGR layer API with CPL_WARN_UNUSED_RESULT
- * WKT export: use 15 significant figures, instead of 15 figures after decimal point (#6145)
- * WKT export: do not append .0 after non-finite values (#6319)
- * Fix typo in definition of name of OGR_FD_ReorderFieldDefns (final s was missing)
- * OGRLayer::SetIgnoredFields(): properly reset state of non first geometry fields (#6283)
- * Make OGRLayer::SetSpatialFilter(GetSpatialFilter()) work with non empty spatial filter (#6284)
- * OGRLayerDecorator: add missing CreateGeomField()
- * OGRLayer::Erase(): do not discard input geometries that have no intersection with method layer (#6322)
- * OGRLayer::Erase(): Speedup = ~70%
- * Add OGRPreparedGeometryContains()
- * Use prepared geometry intersects as pretest in layer Intersection, Union, and Identity methods if requested.
-   Use prepared geometry containment as pretest in layer Intersection method if requested.
- * Bail out from layer algebra methods if GEOS calls fail and not SKIP_FAILURES.
- * OGR_G_SetPoints(): error out if padfX or padfY == NULL, do not change coordinate dimension to 3D when pabyZ == NULL, fix optimization on linestring to call setPoints() only if the strides are the ones of a double, not 0 as incorrectly done before (#6344)
- * OGRParseDate(): more strict validation to reject invalid dates (#6452)
+* CPLGetUsablePhysicalRAM(): take into account RSS limit (ulimit -m) (#6669)
+* CPLGetNumCPUs(): take into sched_getaffinity() (#6669)
 
-OGRSpatialReference:
- * Upgrade to EPSG database v8.8
- * Add support for SCH (Spherical Cross-track Height) projection
- * Optimize reprojection typically between WGS84 based SRS and WebMercator
- * Correctly transform Mercator_2SP and _1SP to ESRI Mercator, and back from ESRI Mercator to Mercator_2SP (#4861)
- * No longer enforce C locale if running against latest proj that is locale safe (4.9.2 or later)
- * EPSGGetPCSInfo(): use pcs.override.csv in priority over pcs.csv to read projection name, UOM, UOMAngle, GeogCS, etc... (#6026)
- * morphToESRI(): use GCS_WGS_1972 as GCS name for EPSG:4322 (#6027)
- * morphToESRI(): use Mercator_Auxiliary_Sphere projection for EPSG:3857. morphFromESRI(): map Mercator_Auxiliary_Sphere to EPSG:3857 (#5924)
- * Align hard-coded WKT of well known GCS definitions of WGS84, WGS72, NAD27 and NAD83 with the WKT of their EPSG def (#6080)
- * morphFromESRI(): special case with PROJCS name 'WGS_84_Pseudo_Mercator' (#6134)
- * OSR C API: fix declarations of OSRSetAxes() and OSRSetWagner(), and add missing OSRSetHOMAC(), OSRSetMercator2SP() and OSRSetTPED() (#6183)
- * Recognize EPSG 9835 method (Lambert Cylindrical Equal Area (Ellipsoidal)), needed for EPSG:6933 PCS for example
- * importFromProj4/exportToProj4(): rework linear unit conversion between WKT name/values and proj4 unit name, and extend its scope in WKT to proj4 conversions
- * OSR ESRI .prj: add support for reading custom ellipsoid in Parameters line
- * on import of +proj=geos, if +sweep=x is used then store it as a proj4 extension node (#6030)
+### Algorithms
 
-Utilities:
- * ogrinfo / ogr2ogr: implement @filename syntax for -sql and -where
- * ogr2ogr: prevent the -gt setting from overriding transaction group size of 1 set by skipfailures earlier (#2409)
- * ogr2ogr: warn if -zfield field does not exist in source layer
- * ogr2ogr -skip: rollback dataset transaction in case of failure (#6328)
- * ogr2ogr: fix -append with a source dataset with a mix of existing and non existing layers in the target datasource (#6345)
- * ogr2ogr: imply quiet mode if /vsistdout/ is used as destination filename
- * ogr2ogr: make -dim and -nlt support measure geometry types
-
-CartoDB:
- * fix GetNextFeature() on a newly create table (#6109)
- * defer 'CartoDBfycation' at layer closing
- * optimize feature insertion with multiple rows INSERT
+* Warp: fix crash in multi-threaded mode when doing several warping runs with
+  the same WarpOperation
+* RasterizeLayer: prevent out-of-bounds index/crash on some input data (#6981)
 
-CSV driver:
- * add editing capabilities of existing files
- * add X_POSSIBLE_NAMES, Y_POSSIBLE_NAMES, Z_POSSIBLE_NAMES, GEOM_POSSIBLE_NAMES and KEEP_GEOM_COLUMNS open options
- * add HEADERS open option to force OGR to handle numeric column names. (PR #63)
- * add EMPTY_STRING_AS_NULL=YES/NO open option
- * implement compatibility enhancements for GeoCSV specification (#5989)
- * fix detection of TAB delimiter in allCountries.csv when the first line has a comma (#6086)
- * fix issues with leading single quote, and missing first line after ResetReading(), when parsing allCountries.txt (#6087)
- * speed-up GetFeatureCount() on allCountries.txt
- * on CreateDataSource() with a .csv name, do not try to open other existing .csv files in the directory
- * make CreateGeomField() returns OGRERR_NONE in case of success instead of OGRERR_FAILURE (#6280)
- * avoid adding trailing comma in header line when writing 'WKT,a_single_field'
+### Core
 
-DGN driver:
- * add partial 3D transformation support for cell headers
+* gdal_pam.h: workaround for code including it after windows.h
 
-DXF driver:
- * detect files without .dxf extension (#5994)
- * fix handling of ELLIPSE with Z extrusion axis = -1 (#5705)
- * take into account full definition of spline entity (degree, control points, weights and knots) when stroking splines (#6436)
- * better handling of various object coordinate systems found in dxf files for point, line, polyline, spline and ellipse entities. Add anchor position to text styles. Remove polygon/polyface mesh parsing from polyline entity (#6459)
+### Raster drivers
 
-ElasticSearch driver:
- * use get /_stats instead of /_status for ElasticSearch 2.0 compatibility (#6346)
+AAIGRID driver:
+ * fix CreateCopy() of source raster with south-up orientation (#6946)
 
-FileGDB driver:
- * make CreateFeature() honour user set FID, and implement more fine grained transaction for Linux/Unix
- * give a hint of using FileGDB SDK 1.4 is FileGDB compression is used
+BAG driver:
+ * conform to the final BAG georeferenced metadata layer specification (#6933)
 
-GeoJSON driver:
- * Add editing capabilities of existing files
- * Add ARRAY_AS_STRING=YES open option
- * Use '%.17g' formatting by default for floating-point numbers and add SIGNIFICANT_FIGURES layer creation option (#6291)
- * add a json_ex_get_object_by_path() function
- * fix crash on null / non-json object features (#6166)
- * serialize string values that are valid JSon dictionary or array as it (ie do not quote them)
- * make sure there's enough space to write the FeatureCollection bbox (#6262). Also avoid duplicating FeatureCollection bbox if source has one (trunk only)
- * Export POINT EMPTY as having a null geometry, instead as of being POINT(0 0) (#6349)
- * Do not 'promote' a null field to OFTString type if it had another type before (#6351)
-
-GME driver:
- * Driver removed.  Maps Engine being shut down at the end of January 2016.
+ESRIC driver:
+ * Fix DCAP_VECTOR metadata
 
-GML driver:
- * VFR: add new attribute DatumVzniku (v1.6)
- * VFR: fix ST_UVOH type handling
- * VFR: fix ZpusobyOchrany attributes (data types and names)
- * VFR: fix CisloDomovni attributes (Integer->IntegerList)
- * VFR: fix TEA attributes of StavebniObjekty
- * add NAMESPACE_DECL=YES option to OGR_G_ExportToGMLEx() to add xmlns:gml=http://www.opengis.net/gml or http://www.opengis.net/gml/3.2 declaration; Also accept GML2 or GML32 as valid valiues for FORMAT option (#6214)
- * serialize in .gfs file the name of the geometry element when it is 'geometry' since this is a particular case (#6247)
- * fix logic error in BuildJointClassFromScannedSchema() (#6302)
+JPEGXL driver:
+ * advertise COMPRESSION_REVERSIBILITY=LOSSY when there is a JPEG
+   reconstruction box
 
-GPKG driver:
- * make it accept files with non standard extension if they still have the correct application_id (#6396); also accept the .gpkx extension that may be used for extended geopackages
- * emit warning when generating a database without .gpkg/.gpkx extension (#6396)
- * as GPKG 1.1 uses a different application_id, emit a more specific warning if the application id starts with GPxx (but is not GP10). Add GPKG_WARN_UNRECOGNIZED_APPLICATION_ID config option to avoid the warning
- * correct scope of gpkg_geom_XXXXX extensions to be read-write, and allow reading geometry types CURVE or SURFACE
- * avoid trying to insert a gpkg_geom_XXXX extension if already done (#6402)
- * writer: implement strategy to flush partial_tiles temporary database when it becomes too big (#6462)
- * writer: when writing to GoogleMapsCompatible tiling scheme, better deal with source rasters in EPSG:4326 with latitude = +/-90 (#6463)
- * fix generation of files with 1-band paletted input dataset. Also improve the logic to retrieve color palette when forcing BAND_COUNT=1 on opening (#6450)
+netCDF driver:
+ * deal with files with decreasing latitudes/north-up orientation and presence
+   of actual_range attribute (#6909)
 
-GPX driver:
- * fix crash when parsing a 'time' extension element at route/track level (2.0 regression, #6237)
+VRT driver:
+ * VRTSourcedRasterBand: replace potentially unsafe cpl::down_cast<> by
+   dynamic_cast<>
 
-ILI driver:
- * ILI1: Support for Surface polygon rings spread over multiple geometry records
- * ILI1: add string TID support (https://github.com/OSGeo/gdal/pull/91)
- * Fix crash with models using types derived from INTERLIS
- * Fix memory leaks (#6178)
+## OGR 3.6.2
 
-JML driver:
- * remove arbitrary limitation preventing from reading geometries with <gml:coordinates> larger than 10 MB (#6338)
+### Core
 
-KML driver:
- * fix crash on KML files without content but with nested folders (#6486)
+* OGRGenSQLResultsLayer::GetFeatureCount(): fix it to return -1 when base layer
+  also returns -1 (#6925)
+* OGRXercesInstrumentedMemoryManager::deallocate(): avoid (likely harmless)
+  unsigned integer overflow in error code path.
+* GPKG/SQLite dialect: fix issues when SQL statement provided to ExecuteSQL()
+  starts with space/tabulation/newline (#6976)
+* ArrowArray generic: FillBoolArray(): avoid out-of-bounds write access
 
-LIBKML driver:
- * for documents without folder, use document name when available as name of layer (#6409)
+### Utilities
 
-Memory driver:
- * add support for sparse feature IDs
- * add ADVERTIZE_UTF8 layer creation option
+* ogr2ogr: make -nln flag with GeoJSON output even if a name exists in input
+  GeoJSON (#6920)
+* ogr2ogr: silent reprojection errors related to IsPolarToWGS84() in
+  OGRGeometryFactory::transformWithOptions()
 
-MITAB driver:
- * Add support for block sizes other than 512 bytes in .map files, for MapInfo 15.2 compatibility (#6298)
- * write correct datum id for EPSG:3857
- * read MID files with TAB delimiter and empty first field (#5405)
- * use projection code 29 when exporting non-Polar Lambert Azimuthal Equal Area (#5220)
- * fix crashes when parsing invalid MIF geometries (#6273)
+### Drivers
 
-MSSQLSpatial driver:
- * Implement MSSQL bulk insert (#4792)
- * do not treat a primary key that is not of integer type as the FID (#6235)
+GML driver:
+ * fix recognizing WFS GetFeature response with a very long initial XML element
+   (#6940)
+ * default srsDimension to 3 for CityGML files (#6989)
+ * fix incorrect behavior when using GFS_TEMPLATE open option with a .gfs that
+   refers to FeatureProperty/FeaturePropertyList fields (#6932)
 
-NTF driver:
- * fix potential buffer overflows when reading too short lines (#6277)
+GeoPackage driver:
+ * fix threaded RTree building when creating several layers (3.6.0 regression),
+   by disabling async RTree building
+ * avoid SQLite3 locking in CreateLayer() due to RemoveOGREmptyTable()
 
-ODBC driver:
- * remove limitations to 500 columns
+NGW driver:
+ * remove DCAP_ items set to NO (#6994)
 
-ODS driver:
- * fix loss of precision in formula computation
+Parquet driver:
+ * update to read and write GeoParquet 1.0.0-beta.1 specification (#6646)
 
-OpenFileGDB driver:
- * do not emit warning if SDC/CDF table detected and that FileGDB driver is present
- * fix min/max on columns without indices (#6150)
- * build correct geometry for a multi-part wkbMultiLineStringZ (#6332)
- * add support for reading SHPT_GENERALPOINT (#6478)
+Selafin driver:
+ * Fix DCAP_VECTOR metadata
 
-OSM driver:
- * correct fields ids for the (non frequently used) Node message
- * do not override 'our' osm_id (the node, way or relation id) with a tag named 'osm_id' (#6347)
- * properly deal with polygons in other_relations geometrycollection (#6475)
+# GDAL/OGR 3.6.1 Release Notes
 
-PG driver:
- * Add PRELUDE_STATEMENTS and CLOSING_STATEMENTS open option to be for example able to specify options, like statement_timeout, with pg_bouncer
- * Fix 2.0 regression when overwriting several existing PostGIS layers with ogr2ogr (#6018)
- * Update PG, PGDump and CartoDB drivers to correctly export POINT EMPTY for PostGIS 2.2
- * avoid resetting error potentially emitted by ExecuteSQL() (#6194)
- * sanitize management of quoting for FID column at layer creation
- * fix to get SRID on result layer with PostGIS 2.2
- * in copy mode (the default on layer creation), do not truncate the concatenated string list to the field width (#6356)
- * make such that GEOMETRY_NAME layer creation option is honoured in ogr2ogr when the source geometry field has a not-null constraint (#6366)
- * read and set DESCRIPTION metadata item from/into pg_description system table; add DESCRIPTION layer creation option
- * support int2[] and numeric[] types, better map float4[] type
- * remove code that was intended to handled binary cursors as it cannot be triggered
- * fix append of several layers in PG_USE_COPY mode and within transaction (ogr2ogr -append use case) (#6411)
+GDAL 3.6.1 is a bugfix release. It officially retracts GDAL 3.6.0 which
+could cause corruption of the spatial index of GeoPackage files it created
+(in tables with 100 000 features or more):
+cf https://github.com/qgis/QGIS/issues/51188 and
+https://github.com/OSGeo/gdal/pull/6911. GDAL 3.6.1 fixes that issue. Setting
+OGR_GPKG_ALLOW_THREADED_RTREE=NO environment variable (at generation time)
+also works around the issue with GDAL 3.6.0. Users who have generated corrupted
+GeoPackage files with 3.6.0 can regnerate them with 3.6.1 with, for example,
+"ogr2ogr out_ok.gpkg in_corrupted.gpkg" (assuming a GeoPackage file with vector
+content only)
 
-PGDump driver:
- * fix issue with case of ogc_fid field in case the FID  layer creation option is not set by user or by ogr2ogr (related to #6232)
- * in copy mode (the default on layer creation), do not truncate the concatenated string list to the field width (#6356)
- * make such that GEOMETRY_NAME layer creation option is honoured in ogr2ogr when the source geometry field has a not-null constraint (#6366)
- * set DESCRIPTION metadata item from/into pg_description system table; add DESCRIPTION layer creation option
+## Build
 
-Shapefile driver:
- * accept opening standalone .dbf files whose header length is not a multiple of 32 bytes (#6035)
- * fix REPACK crash on shapefile without .dbf (#6274)
- * add capability to restore/build a missing .shx file when defining SHAPE_RESTORE_SHX to TRUE (#5035)
- * avoid CreateLayer() to error out when passed wkbUnknown | wkb25D (#6473)
+* Fix build with -DOGR_ENABLE_DRIVER_GML=OFF (#6647)
+* Add build support for libhdf5 1.13.2 and 1.13.3 (#6657)
+* remove RECOMMENDED flag to BRUNSLI and QB3. Add it for CURL (cf
+  https://github.com/spack/spack/pull/33856#issue-1446090634)
+* configure.cmake: fix wrong detection of pread64 for iOS
+* FindSQLite3.cmake: add logic to invalidate SQLite3_HAS_ variables if
+  the library changes
+* detect if sqlite3 is missing mutex support
+* Fix build when sqlite3_progress_handler() is missing
+* do not use Armadillo if it lacks LAPACK support (such as on Alpine)
+* make it a FATAL_ERROR if the user used -DGDAL_USE_ARMADILLO=ON and it
+  can't be used
+* Fix static HDF4 libraries not found on Windows
+* Internal libjpeg: rename extra symbol for iOS compatibility (#6725)
+* gdaldataset: fix false-positive gcc 12.2.1 -O2 warning about truncation
+  of buffer
+* Add minimal support for reading 12-bit JPEG images with libjpeg-turbo
+  2.2dev and internal libjpeg12
+* Fix detection of blosc version number
+* Add missing includes to fix build with upcoming gcc 13
+
+## GDAL 3.6.1
 
-SQLite/Spatialite driver:
- * support file:xxx URI syntax (derived from patch by joker99, #6150)
- * fix heuristics in OGRSQLiteSelectLayer::GetExtent() to not be used when there's a sub SELECT (#6062)
- * fix crash on GetLayerByName('non_existing_table(geom_column)') (#6103)
- * fix OGRSQLiteSelectLayerCommonBehaviour::GetBaseLayer() to no longer 'eat' consecutive characters in layer name (#6107)
- * Spatialite: turn debug messages warning about update not being supported because of missing or too old spatialite version as errors, and return NULL to the caller (#6199)
- * fix memleak in OGRSQLiteTableLayer destructor when updating geometry_columns_time
- * VFS: increase mxPathname to 2048 by default, and provide OGR_SQLITE_VFS_MAXPATHNAME config option to be able to configure that higher if that would be needed. Useful when dealing with very long names like /vsicurl/.... with AWS S3 security tokens
- * VFS: do not probe -wal files on /vsicurl/
+### Port
 
-SXF driver:
- * fix wrong use of endianness macros to fix behavior on big-endian hots
- * add recoding from CP1251 for TEXT attribute that is now decoded
- * fix various issues (#6357)
+* CPLGetExecPath(): add MacOSX and FreeBSD implementations; prevent
+  potential one-byte overflow on Linux&Windows
+* /vsiaz/: make AppendBlob operation compatible of Azurite (#6759)
+* /vsiaz/: accept Azure connection string with only BlobEndpoint and
+  SharedAccessSignature (#6870)
+* S3: fix issue with EC2 IDMSv2 request failing inside Docker container
+  with default networking
 
-VRT driver:
- * implement CloseDependentDatasets()
- * fix editing with 'direct' geometry mode which could cause attribute column to be empty (#6289)
- * fix crash with a OGRVRTWarpedLayer using a source layer that would have non geometry column (unlikely to happen currently as this would require explicit disabling it, but more likey with following commit that createe VRT non-spatial layer implicitly when the source is non-spatial, linked to #6336)
- * avoid creating an implicit wkbUnknown geometry field when the source has no geometry column and there's no XML elements related to geometry fields (#6336)
+### Algorithms
 
-XLSX driver:
- * fix reading sheets with more than > 26 columns and 'holes' (#6363)
+* warp: Also log number of chunks in warp operation progress debug logs (#6709)
+* Warper: use exact coordinate transformer on source raster edges to avoid
+  missing pixels (#6777)
 
-XPlane driver:
- * extend ICAO identifiers to 5 digits (#6003)
+### Utilities
 
-## SWIG Language Bindings
+* gdalbuildvrt: make -addalpha working when there's a mix of bands with or
+  without alpha (#6794)
+* gdalwarp: fix issue with vertical shift, in particular when CRS has US
+  survey foot as vertical unit (#6839)
+* gdalwarp: speed-up warping with cutline when the source dataset or
+  processing chunks are fully contained within the cutline (#6905)
+* validate_gpkg.py: make it work with SRID=-1 in geometry blobs
 
-All bindings:
- * add a options parameter to gdal.ReprojectImage() to pass warp options
- * Change ReadRaster and WriteRaster to use GIntBig and the *IOEx-methods
- * prevent NULL file pointer from being passed to VSIF*L functions
- * make gdal.Rename() accept Unicode strings
- * add SpatialReference.GetAxisName() and SpatialReference.GetAxisOrientation() (#6441)
- * add SpatialReference.GetAngularUnitsName() (#6445)
+### Core
 
-Java bindings:
- * Fix typemap for input parameter of type GIntBig (fixes GetFeature(long), DeleteFeature(long), etc...) (#6464)
- * Bump minimal java version to 1.5 in case SWIG generates anotations (#6433, patch by Bas Couwenberg)
- * GNUmakefile: add -f in rm commands
- * GNUmakefile: add support for all hardening buildflags
+* GDALMDReader: avoid possible stack overflow on hostile XML metadata
+  (ossfuzz #53988)
 
-Perl bindings:
- * Fix #6050: string formatting in croak.
- * Perl Makefile.PL: add support for all hardening buildflags (#5998)
- * use strict and warnings in overridden constructors.
- * add $VERSION to ogr_perl.i (OGR.pm), which is required by pause.perl.org.
- * Add some basic module info for CPAN.
- * Bugfix for Geo::OGR::Feature->new().
- * Add many utility level algorithms as methods to various classes.
- * New class for XML stuff
- * New Makefile.PL, which can download and build GDAL. This allows automatic testing of the CPAN module.
- * Wrap VSIStdoutSetRedirection and allow creating datasets via an object, which can write and close.
- * Geo::OGR::Driver and Geo::OGR::DataSource are now Perl wrappers for respective GDAL classes.
- * Add to the error stack also errors from the bindings
- * Fix sending utf8 from Perl to GDAL. Should also remove some "uninitialized value" warnings.
- * ReadTile and WriteTile methods for Dataset, ReadTile accepts now tile size and scaling algorithm.
- * Improved Parent - Child management.
- * Improved support for 64bit ints.
- * Measures support in Geometry class.
- * Many new tests
+### Raster drivers
 
-Python bindings:
- * make Feature.ExportToJson() output boolean value for a boolean field
- * support floating point coordinates for the source windows of Band.ReadRaster() and Band.ReadAsArray()
- * fix build with SWIG 3.0.6 (#6045)
- * make gdal.OpenEx() throw a Python exception in case of failed open when exceptions are enables with gdal.UseExceptions() (#6075)
- * Disable opening a NumPy dataset with a filename returned by gdal_array.GetArrayFilename(() unless GDAL_ARRAY_OPEN_BY_FILENAME is set to TRUE
- * disable the warning about using deprecated wkb25DBit constant as it uses a trick that prevents the bindings from being used by py2exe / pyinstaller (#6364)
+GeoRaster driver:
+ * add internal OCI connection support to vsilocilob which is used only
+    by the GeoRaster driver. (#6654)
 
-# GDAL/OGR 2.0 Release Notes
+GPKG driver:
+ * implement setting the nodata value for Byte dataset (#1569)
 
-## In a nutshell...
+GTiff driver:
+ * DISCARD_LSB: reduce range of validity to 0-7 range for Byte to avoid
+   unsigned integer overflow if 8. (ossfuzz #53570)
+ * if CRS is DerivedProjected, write it to PAM .aux.xml file (#6758)
+ * SRS reader: do not emit warning when reading a projected CRS with GeoTIFF
+   keys override and northing, easting axis order (related to #6905)
 
- * New GDAL drivers:
-    - BPG: read-only driver for Better Portable Graphics format (experimental, no build support)
-    - GPKG: read/write/update capabilities in the unified raster/vector driver
-    - KEA: read/write driver for KEA format
-    - PLMosaic: read-only driver for Planet Labs Mosaics API
-    - ROI_PAC: read/write driver for image formats of JPL's ROI_PAC project (#5776)
-    - VICAR: read-only driver for VICAR format
- * New OGR drivers:
-    - Cloudant: read/write driver for Cloudant service
-    - CSW: read-only driver for OGC CSW (Catalog Service for the Web) protocol
-    - JML: read/write driver for OpenJUMP .jml format
-    - PLScenes: read-only driver for Planet Labs Scenes API
-    - Selaphin: read/write driver for the Selaphin/Seraphin format (#5442)
- * Significantly improved drivers: CSV, GPKG, GTiff, JP2OpenJPEG, MapInfo file, PG, SQLite
- * RFC 31: OGR 64bit Integer Fields and FIDs (trac.osgeo.org/gdal/wiki/rfc31_ogr_64)
-   In OGR core, OGR SQL, Shapefile, PG, PGDump, GeoJSON, CSV, GPKG, SQLite, MySQL,
-   OCI, MEM, VRT, JML, GML, WFS, CartoDB, XLSX, ODS, MSSQLSpatial, OSM, LIBKML, MITAB
- * RFC 46: GDAL/OGR unification ( http://trac.osgeo.org/gdal/wiki/rfc46_gdal_ogr_unification)
-     - GDAL and OGR PDF drivers are unified into a single one
-     - GDAL and OGR PCIDSK drivers are unified into a single one
- * RFC 49: Add support for curve geometries (http://trac.osgeo.org/gdal/wiki/rfc49_curve_geometries)
-   In OGR core, and GML, NAS, PostgreSQL, PGDUMP, GPKG, SQLite, VFK, VRT, Interlis drivers
- * RFC 50: Add support for OGR field subtypes (http://trac.osgeo.org/gdal/wiki/rfc50_ogr_field_subtype)
-   In OGR core, OGR SQL, swig bindings, CSV, FileGDB, GeoJSON, GML, GPKG, OpenFileGDB, PG, PGDump, SQLite, VRT
- * RFC 51: RasterIO() improvements : resampling and progress callback (http://trac.osgeo.org/gdal/wiki/rfc51_rasterio_resampling_progress)
- * RFC 52: Stricter SQL quoting (http://trac.osgeo.org/gdal/wiki/rfc52_strict_sql_quoting)
- * RFC 53: OGR not-null constraints and default values (http://trac.osgeo.org/gdal/wiki/rfc53_ogr_notnull_default)
-   In OGR core, OGR SQL, PG, PGDump, CartoDB, GPKG, SQLite, MySQL, OCI, VRT, GML, WFS, FileGDB, OpenFileGDB and MSSQLSpatial
- * RFC 54: Dataset transactions (https://trac.osgeo.org/gdal/wiki/rfc54_dataset_transactions)
-   In PG, GPKG, SQLite, FileGDB and MSSQLSpatial
- * RFC 55: refined SetFeature() and DeleteFeature() semantics.
-   In GPKG, Shape, MySQL, OCI, SQLite, FileGDB, PG, CartoDB, MITAB and MSSQL
- * RFC 56: OFTTime/OFTDateTime millisecond accuracy ( https://trac.osgeo.org/gdal/wiki/rfc56_millisecond_precision )
- * RFC 57: 64bit histogram bucket count ( https://trac.osgeo.org/gdal/wiki/rfc57_histogram_64bit_count )
- * Upgrade to EPSG v8.5 database
- * Fix locale related issues when formatting or reading floating point numbers (#5731)
+netCDF driver:
+ * fix exposing geotransform when there's x,y and lat,lon coordinates and
+   the CRS is retrieved from crs_wkt attribute (#6656)
 
-## New installed files
- * data/gdalvrt.xsd: XML schema of the GDAL VRT format
+HDF4 driver:
+ * fix regression of CMake builds, related to opening more than 32 simultaneous
+   HDF4_EOS files (#6665)
 
-## Backward compatibility issues
+OGCAPI driver:
+ * update for map api; also for tiles but not working properly due to
+   churn in tilematrixset spec (#6832)
 
-See MIGRATION_GUIDE.TXT
+RMF driver:
+ * Implement GetSuggestedBlockAccessPattern
 
-## GDAL/OGR 2.0 - General Changes
+SAR_CEOS driver:
+ * fix small memleak
 
-Build(Unix):
- * Fix for cpl_recode_iconv.cpp compilation error on freebsd 10 (#5452)
- * Fix pthread detection for Android
- * Fix in Armadillo detection test (#5455)
- * Fix detection of OCI by changing linking order to please modern GCC (#5550)
- * Fix test to accept MariaDB 10.X as valid MySQL (#5722)
- * Make sure $(GDAL_INCLUDE) is first to avoid being confused by GDAL headers of a previous version elsewhere in the include path (#5664)
- * Always use stat rather than stat64 for Mac OSX in AC_UNIX_STDIO_64. (#5780, #5414).
- * Add support for ECW SDK 5.1 (#5390)
- * Do not enable Python bindings if PYTHON env variable is set without --with-python being explicitly specified (#5956)
+XYZ driver:
+ * support more datasets with rather sparse content in first lines (#6736)
 
-Build(Windows):
- * PDF: fix compilation issue with Visual Studio 2012 (#5744)
- * PDF: Add support to compile the pdf driver as plugin (#5813)
- * Add support for MrSID 9.1 SDK (#5814)
- * when building netCDF, HDF4, HDF5 as plugins, call registration of 'sub-drivers' GMT, HDF4Image and HDF5Image (#5802)
+## OGR 3.6.1
 
-Build(all):
- * Ruby bindings: disable autoconf and makefile support (#5880)
- * Fix compilation errors with json-c 0.12 (#5449)
- * Fix compilation error in alg/gdalgrid.cpp when AVX is available, but not SSE (#5566)
+### Core
 
-## GDAL 2.0 - Overview of Changes
+* OGRArrowArrayHelper::SetDate(): simplify implementation
+* OGRSpatialReference::importFromWkt(): fix compatibility with PROJ master
+  9.2.0dev for DerivedProjectedCRS
+* OGR layer algebra: make sure result layer has no duplicated field names
+  (#6851)
 
-Port:
- * Introduce a more generic lock API (recursive mutex, adaptive mutex, spinlock)
- * Add types for CPLMutex, CPLCond and CPLJoinableThread (only enforced in -DDEBUG mode)
- * Add CPLGetPhysicalRAM() and CPLGetUsablePhysicalRAM()
- * CPLSpawn() on Windows: quote arguments with spaces in them (#5469)
- * /vsigzip/: avoid infinite loop when reading broken .gml.gz file (#5486)
- * /vsizip/ : fix bug that caused premature end of file condition with some read patterns (#5530)
- * /vsizip/ on >4GB zips: accept .zip declare 0 disks (#5615)
- * /vsitar/: remove useless validation test that prevents from opening valid .tar files (#5864)
- * /vsistdout/: add VSIStdoutSetRedirection() for compatibility with MapServer FCGI (https://github.com/mapserver/mapserver/pull/4858)
- * /vsimem/: update st_mtime and return it with Stat()
- * /vsimem/: in update mode, when seeking after end of file, only extend it if a write is done
- * /vsimem/: Make Rename() on a directory also rename filenames under that directory (#5934)
- * /vsicurl/: manage redirection from public URLs to redirected AWS S3 signed urls, with management of the expiration. Enabled by default. Can be disabled if CPL_VSIL_CURL_USE_S3_REDIRECT=NO (#6439)
- * /vsicurl/: avoid reading after end-of-file and fix failure when reading more than 16MB in a single time (#5786)
- * /vsicurl/: by default do not use HEAD request when detecting a AWS S3 signed URL
- * Allow CPL_VSIL_CURL_ALLOWED_EXTENSIONS to be set to special value {noext}
- * VSIWin32Handle::Flush(): no-op implementation is sufficient to offer same guarantee as POSIX fflush() (#5556)
- * Unix VSIL: reset eof in all cases in Seek()
- * Windows plugins: complementary fix to #5211 to avoid error dialog box when there are dependency problems (#5525)
- * Fix VSIReadDirRecursive() recursing on the parent or current directory (#5535)
- * cpl_error: obfuscate password
- * HTTP: set CURLOPT_NOSIGNAL if available (#5568)
- * Add COOKIE option to CPLHTTPFetch() (#5824)
- * CPLHTTPFetch(): add retry logic in case of 502, 503 and 504 errors with the GDAL_HTTP_MAX_RETRY (default: 0)and GDAL_HTTP_RETRY_DELAY (default: 30 s) config options (#5920)
- * Fix stack corruption upon thread termination with CPLSetThreadLocalConfigOption on Windows 32 bit (#5590)
- * cpl_csv: Stop probing for csv/horiz_cs.csv. (#5698)
- * vsipreload: implement clearerr() and readdir64() (#5742)
- * CPLsetlocale(): return a string that is thread-locale storage to avoid potential race in CPLLocaleC::CPLLocaleC() (#5747)
- * CPLHexToBinary(): faster implementation (#5812)
- * CPLAcquireMutex(): improve performance on Windows (#5986)
+### Utilities
 
-Core:
- * Add imagery (satellite or aerial) metadata support (Alos, DigitalGlobe, Eros, GeoEye, OrbView, Landsat, Pleiades, Resurs-DK1, Spot/Formosat).
- * Reduce lock contention on the global cache mutex and make it possible to use spin lock instead with GDAL_RB_LOCK_TYPE=SPIN
- * Block cache: make block cache manager safe with respect to writing dirty blocks (#5983)
- * EXIF reader: fix memleak in error code path
- * EXIF reader: add missing validation for some data types (#3078)
- * Fix crash in GDALPamRasterBand::SerializeToXML() when saving an empty RAT (#5451)
- * ComputeStatistics(): use Welford algorithm to avoid numerical precision issues when computing standard deviation (#5483)
- * Fix crashing issue with TLS finalization on Unix (#5509)
- * GDALJP2Metadata::CreateGMLJP2(): use EPSGTreatsAsLatLong() and EPSGTreatsAsNorthingEasting() to determine if axis swapping is needed (#2131)
- * GDALJP2AbstractDataset: implement GetFileList() to report .wld/.j2w if used
- * GMLJP2: be robust when parsing GMLJP2 content that has nul character instead of \n (#5760)
- * GMLJP2: add missing rangeParameters element to validate against GMLJP2 schema (#5707)
- * GMLJP2: write non null bounding box at root of FeatureCollection (#5697)
- * GMLJP2: SRS export as GML: output XML definition of a SRS as a GML 3.1.1 compliant Dictionary (#5697)
- * GMLJP2: when setting GDAL_JP2K_ALT_OFFSETVECTOR_ORDER=TRUE write it as a XML comment so that we can interpret the OffsetVector elements correctly on reading
- * GMLJP2: when parsing a GMLJP2 box, accept srsName found on gml:RectifiedGrid if not found on origin.Point, so as to be compatible with the example of DGIWG_Profile_of_JPEG2000_for_Georeferenced_Imagery.pdf (#5697)
- * GMLJP2: add compatibility with GMLJP2 v2.0 where SRS is expressed as CRS URL
- * GMLJP2: on reading, don't do axis inversation if there's an explicit axisName requesting easting, northing order (#5960); also strip axis order in reported SRS
- * JP2Boxes: add null terminated byte to GDAL XML, XML or XMP boxes
- * Add GDALGetJPEG2000Structure() (#5697)
- * GDALMultiDomainMetadata::XMLInit(): when importing XML metadata, erase the existing document to replace it with the new one
- * Metadata: fix correct sorting of StringList / metadata (#5540, #5557)
- * Make GetMaskBand() work with GDT_UInt16 alpha bands (#5692)
- * Fix 32bit overflow in GDALRasterBand::IRasterIO() and  GDALDataset::BlockBasedRasterIO() (#5713)
- * RasterIO: small optimization in generic RasterIO() implementation to avoid loading partial tiles at right and/or bottom edges of the raster when they are going to be completely written
- * Fix crash when calling GetTiledVirtualMem() on non-Linux platform (#5728)
- * Add GDAL_OF_INTERNAL flag to avoid dataset to be registered in the global list of open datasets
- * GDALDriver::CreateCopy(): accept _INTERNAL_DATASET=YES as creation option, so as to avoid the returned dataset to be registered in the global list of open datasets
- * Implement GDALColorTable::IsSame()
- * GDALPamDataset: do not serialize dataset metadata unless it has been set through GDALDataset::SetMetadata() or GDALDataset::SetMetadataItem()
- * GDALLoadTabFile: add TAB_APPROX_GEOTRANSFORM=YES/NO configuration option to decide if an approximate geotransform is OK (#5809)
- * Optimize copy efficiency from tiled JPEG2000 images
- * Avoid fetching remote non-existing resources for sidecar files, when using /vsicurl/ with a URL that takes arguments (#5923)
- * Use GDALCanFileAcceptSidecarFile() in GDALMDReaderManager::GetReader()
+* ogr2ogr: densify points of spatial filter specified with -spat_srs to
+  avoid reprojection artifacts
+* ogr2ogr: discard features whose intersection with -clipsrc/-clipdst
+  result in a lower dimensionality geometry than the target layer geometry
+  type (#6836)
+* ogr2ogr: add warning when -t_srs is ignored by drivers that
+  automatically reproject to WGS 84 (#6859)
+* ogr2ogr: make sure an error in GDALClose() of the output dataset result
+  in a non-zero return code (https://github.com/Toblerity/Fiona/issues/1169)
 
-Algorithms:
- * RPC transformer: fix near interpolation in RPC DEM (#5553)
- * RPC transformer: take into account nodata in RPC DEM (#5680)
- * RPC transformer: add RPC_DEM_MISSING_VALUE transformer option to avoid failure when there's no DEM at the transformed point (#5730)
- * RPC transformer: in DEM mode, implement optimization, in specific conditions (input points at same longitude, DEM in EPSG:4326) to extract several elevations at a time
- * TPS transformer: fix crash if the forward or backward transform cannot be computed (#5588)
- * OpenCL warper: remove unused variable in bilinear resampling that can cause compilation error (#5518)
- * OpenCL wrapper: fix code compilation with NVIDIA OpenCL (#5772)
- * Overview: Fix and speed-up cubic resampling in overview computation to take into account scaling factor (#5685)
- * Overview: ignore alpha=0 values when compute an average overview of an alpha band; and also avoid memory errors when calling GetMaskBand()/GetMaskFlags() after overview computation if GetMaskXXX() has been called before (#5640)
- * Overview: avoid crash when computing overview with a X dimension much smaller than Y dimension (#5794)
- * GDALRegenerateOverviewsMultiBand(): fix stride calculation error with certain raster dimensions (#5653)
- * Warper: numerous speed optimizations (SSE2 specific code, more fast code paths, ...)
- * Warper: fix Cubic and Bilinear resampling to work correctly with downsizing (#3740)
- * Warper: fix and optimize CubicSpline
- * Warper: regardless of the warping memory limit, add heuristics to determine if we must split the target window in case the 'fill ratio' of the source dataset is too low (#3120)
- * Warper: accept warping options METHOD=NO_GEOTRANSFORM and DST_METHOD=NO_GEOTRANSFORM to run gdalwarp on ungeoreferenced images
- * Warper: fix GDALSuggestedWarpOutput() wrong extent in some circumstances (e.g. dataset of big dimension with world coordinates) (#5693)
- * Warper: fix integer overflow when reprojecting into an area with (part of) bounds completely outside of the source projection (#5789)
- * Warper: add min,max,med,q1 and q3 resampling algorithms (#5868)
- * Warper: add a SRC_COORD_PRECISION warping option to help getting more reproducible output when -wm parameter changes (#5925)
- * Warper: fix failure in GDALSuggestedWarpOut2() when top-left and bottom-right corners transform to the same point (#5980)
- * GDALReprojectImage(): takes into account nodata values set on destination dataset
- * Median cut and dithering: optimizations and enhancements to deal with 8-bit precision (only if using internal interface for now)
- * rasterfill: add option to specify driver to use for temporary files
- * Polygonize: speed optimization: do not try to build the polygon for pixels that are masked by the mask band (i.e. alpha, nodata, etc...). Can considerably speed-up processing when the nodata outline forms a very complex polygon
+### Vector drivers
 
-Utilities:
- * gdalinfo: display extra metadata domains attached to band, and refactor code a bit (#5542)
- * gdalinfo: add -oo option per RFC 46
- * gdalinfo: add -json switch (partial implementation of RFC 44)
- * gdaladdo: add -oo option per RFC 46
- * gdaladdo: add warning when subsampling factor 1 specified
- * gdal_translate: add -oo option per RFC 46
- * gdal_translate: add -r and -tr options per RFC 51
- * gdal_translate: add a -projwin_srs option to be able to express -projwin coordinates in another SRS than the one of the dataset
- * gdal_translate: support -'outsize avalue 0' or '-outsize 0 avalue' to preserve aspect ratio
- * gdal_translate: avoid preserving statistics when changing data type in situations where clamping can occur
- * gdal_translate: adjust RPC metadata (pixel/line offset/scale) when subsetting/rescaling, instead of just discarding it
- * gdal_translate: don't recopy band units if rescaling or unscaling is involved (#3085)
- * gdal_translate: increase GDAL_MAX_DATASET_POOL_SIZE default value to 450. (#5828)
- * gdal_translate: preserve NBITS image structure metadata when possible
- * gdalwarp: add -oo option per RFC 46
- * gdalwarp: add -te_srs option to specify -te in a SRS which isn't the target SRS
- * gdalwarp: add a -ovr option to select which overview level to use, and default to AUTO. Also add a generic OVERVIEW_LEVEL=level open option, and make it available in standard VRT (#5688)
- * gdalwarp: initialize destination dataset to no_data value when automatically propagating source nodata (#5675)
- * gdalwarp: only apply INIT_DEST when processing the first input dataset (#5387)
- * gdalwarp: increase GDAL_MAX_DATASET_POOL_SIZE default value to 450. (#5828)
- * gdalwarp: do not preserve NODATA_VALUES metadata item in output dataset if adding an alpha channel with -dstalpha
- * gdalwarp: fix '-dstnodata none' to avoid read of uninitialized values (#5915)
- * gdalwarp: make -crop_to_cutline densify cutline in source SRS before reprojecting it to target SRS (#5951)
- * gdaldem: avoid too large files to be produced when using -co COMPRESS=xxxx -co TILED=YES (#5678)
- * gdallocationinfo: add -oo option
- * gdaltransform: add a -output_xy flag to restrict output coordinates to 'x y' only
- * gdal_grid: use nodata= parameter in the algorithm string to determine the nodata value to set on the band (#5605)
- * gdal_grid: fix crash in optimized mode with GCC 4.4 on 64bit (#5987)
- * gdalbuildvrt: add a -r option to specify the resampling algorithm
- * gdal_edit.py: add -unsetstats option (and fix -a_nodata to run on all bands, ant not just first one)
- * gdal_edit.py: add -stats and -approx_stats flags (patch by mwtoews, #5805)
- * gdal_edit.py: change -mo add metadata to existing one; add new option -unsetmd to clean existing metadata
- * gdal_edit.py: add -oo to specify open options
- * gdal_retile.py: fix to make it work with input images of different resolutions (#5749)
- * gdal_retile.py: implement progress bar (#5750)
- * gdal_merge.py: add timing information in verbose output
- * gdal_merge.py: take into account alpha band to avoid writing zones of source images that are fully transparent (#3669)
- * gdal2tiles.py: fix inverted long/lat in BoundingBox and Origin elements of tilemapresource.xml (#5336)
- * pct2rgb.py: make it work with color tables with less than 256 entries (#5555)
- * gdal_fillnodata.py: FillNodata: copy no data value to destination band when creating a dataset (if available) (#4625)
- * gdal_proximity.py: add a -use_input_nodata flag
- * gdalcompare.py: add options to suppress selected comparisons
- * gdalcompare.py: takes into account differences in overview bands
- * gdalcompare.py: compute difference on float to avoid integer underflow
- * epsg_tr.py: change to make it possible to export GEOCCS and COMPD_CS to proj.4 epsg and PostGIS spatial_ref_sys.sql files
-
-Python samples:
- * Added swig/python/samples/jpeg_in_tiff_extract.py
- * Added dump_jp2.py
- * Added validate_jp2.py
- * Added build_jp2.py
- * Added gcps2ogr.py
- * tolatlong.py: report error when operating on a non-georeferenced dataset
-
-AAIGRID:
- * Fix formatting string (#5731)
+CSV driver:
+ * accept comma as decimal separator in X_POSSIBLE_NAMES, Y_POSSIBLE_NAMES
+   and Z_POSSIBLE_NAMES fields
 
-BAG driver:
- * change nodata value for uncertainty band to 1e6 (#5482)
+FileGDB driver:
+ * avoid crash in the SDK if passing incompatible geometry type (#6836)
 
-BMP driver:
- * back out r17065 change that inferred georeferencing based on the resolution information in the BMP header (#3578)
+FlatGeoBuf driver:
+ * speed-up writing of DateTime/Date values
 
-DIMAP driver:
- * DIMAP 2: handle the case where the Raster_Data element is in main file (#5018, #4826)
- * DIMAP 2: fix to extract geodetic SRS (#5018, #4826)
- * DIMAP 2: fix to extract geotransform from JPEG2000 file if not available in XML (#5018, #4826)
+GPKG driver:
+ * fix corruption of spatial index on layers with >= 100 000 features,
+   with the default background RTree building mechanism introduced in
+   3.6.0 (https://github.com/qgis/QGIS/issues/51188, #6911) when flushing
+   transactions while adding features (triggered by ogr2ogr). See announcement
+   at top of release notes of this version.
+ * avoid nullptr dereference on corrupted databases
+ * add support for reading tables with generated columns (#6638)
+ * fix bad performance of ST_Transform() by caching the
+   OGRCoordinateTransformation object
+ * improve multi-threaded implementation of GetNextArrowArray() on tables
+   with FID without holes and when no filters are applied (full bulk
+   loading)
+ * FixupWrongRTreeTrigger(): make it work with table names that need to be
+   quoted (https://github.com/georust/gdal/issues/235)
+ * Fix opening /vsizip//path/to/my.zip/my.gpkg with NOLOCK=YES open option
+ * speed-up writing of DateTime/Date values, and fix writing DateTime with
+   milliseconds with a locale where the decimal point is not dot, and when
+   spatialite is not loaded
 
-DDS driver:
- * Add ETC1 compression format support
- * Header correction for worldwind client
+MITAB driver:
+ * add support for 'Philippine Reference System 1992' datum
 
-ECW driver:
- * correctly assign color interpretation to bands if order is unusual
+MSSQLSPATIAL driver:
+ * Get UID and PWD from configuration options (#6818)
 
-ENVI driver:
- * avoid generating potentially corrupted .hdr files when opening in update mode; Write 'Arbitrary' instead of 'Unknown' as the projection name for an undefined SRS (#5467)
- * when writing, consider that LOCAL_CS SRS is like ungeoreferenced (#5467)
+OpenFileGDB driver:
+ * do not use buggy .spx spatial index found in some datasets
+   (geopandas/geopandas#2253)
 
-ERS driver:
- * reset RasterInfo.RegistrationCellX/Y if setting a new geotransform on an updated .ers file (#5493)
- * fix SetProjection() (#5840)
+Parquet driver:
+ * make sure that ArrowLayer destructor is available (for plugin building)
 
-GeoRaster driver:
- * fix Oracle SRID authority (#5607)
- * fix user-defined SRID issue (#5881)
- * new SRID search (#5911)
+PCIDSK driver:
+ * advertise missing capabilities
 
-GIF driver:
- * add compatibility with giflib 5.1 (#5519)
- * fix crash on images without color table (#5792)
- * fix reading of interlaced images with giflib >= 5.0
- * validate the size of the graphic control extension block (#5793)
- * implement GetFileList() to report worldfile
+PGDump driver:
+ * Fix support for the TEMPORARY layer creation option
 
-GRASS driver:
- * GRASS 7.0.0 support (#5852)
+PostgreSQL driver:
+ * avoid error when inserting single feature of FID 0 (#6728)
+ * Fix support for the TEMPORARY layer creation option
 
-GRIB driver:
- * avoid divide by zero while setting geotransform on 1xn or nx1 grib file (#5532)
- * allow writing PDS template numbers to all bands (#5144)
+SOSI driver:
+ * do not advertise GDAL_DCAP_CREATE_FIELD as it is not implemented
 
-GTiff driver:
-New capabilities:
- * for JPEG-in-TIFF, use JPEG capabilities to decompress fast overview levels 2,4 and 8, to generate 'hidden' overviews used by RasterIO()
- * add DISCARD_LSB creation option (lossy compression) to be best used with PREDICTOR=2 and LZW/DEFLATE compression
- * when GTIFF_DIRECT_IO=YES is enabled, performance improvements in GTiffRasterBand::DirectIO() with Byte dataset and Byte buffer
- * implement dataset DirectIO()
- * add GTIFF_VIRTUAL_MEM_IO=YES/NO/IF_ENOUGH_RAM configuration option so that RasterIO() can rely on memory-mapped file I/O (when possible and supported by the OS)
- * support reading and created streamable files
- * for JPEG-compressed TIFF, avoid quantization tables to be emitted in each strip/tile and use optimized Huffman coding by default
- * avoid SetNoDataValue() to immediately 'crystallize' the IFD
- * allow unsetting TIFFTAG_SOFTWARE, TIFFTAG_DOCUMENTNAME, etc... by removing them from metadata list or passing None as a value of SetMetadataItem() (#5619)
- * allow lossless copying of CMYK JPEG into JPEG-in-TIFF
- * set alpha on target by default when translating from Grey+Alpha
- * Internal overviews: for near, average, gauss and cubic, and pixel interleaving, make sure to use the same code path for compressed vs uncompressed overviews (#5701)
- * add RPCTXT=YES creation option to write sidecar _RPC.TXT file
- * internal libtiff updated to upstream libtiff 4.0.4beta
- * internal libgeotiff updated to upstream libgeotiff SVN head
- * speed optimization on write (at least in Vagrant) (#5914)
- * use importFromEPSG() when ProjectedCSTypeGeoKey is available (#5926)
- * on reading better deal with a few ESRI formulations of WebMercator (#5924)
-Fixes:
- * when overriding metadata in update mode, make sure to clear it from PAM file (#5807)
- * fix handling of Mercator_2SP (#5791)
- * avoid TIFF directory to be written (at end of file) when creating a JPEG-in-TIFF file
- * for a paletted TIFF with nodata, set the alpha component of the color entry that matches the nodata value to 0, so as gdal_translate -expand rgba works properly
- * fix to make band SetMetadata(NULL) clear band metadata (#5628)
- * fix error message when requesting a non existing directory
- * check data type with PHOTOMETRIC=PALETTE
- * be robust to out-of-memory conditions with SplitBand and SplitBitmapBand
- * avoid using optimized JPEG --> JPEG-in-TIFF path if INTERLEAVE=BAND is specified with a 3-band JPEG
- * to make Python bindings happy, avoid emitting CE_Failure errors due to libtiff errors when we still manage to open the file (#5616)
- * avoid crash when reading GeoTIFF keys if the stored key type isn't the one expected
- * make sure to call libgeotiff gtSetCSVFilenameHook() method when linking against external libgeotiff
- * avoid/limit DoS with huge number of directories
- * clean spurious spaces when reading values from _RPC.TXT
- * serialize RPC in PAM .aux.xml file if using PROFILE != GDALGeoTIFF and RPB = NO
- * fix clearing of GCPs (#5945)
- * avoid generated corrupted right-most and bottom-most tiles for 12-bit JPEG-compressed (#5971)
- * make sure to use scanline write API when writing single-band single-strip 1-bit datasets
+SQLite driver:
+ * Fix relationships determined through foreign keys have tables reversed
+ * Use 'features' as related table type instead of 'feature' to match
+   gpkg/filegdb
 
-GRASS driver:
- * fix compilation issues against GRASS 7
+VDV driver:
+ * make creation of temporary .gpkg files more robust on some platforms
 
-HDF4 driver:
- * Add configuration support to be able to open more files simultaneously
- * Add class suffix to the parameter name when parsing HDF-EOS objects.
- * Fix AnyTypeToDouble() to use proper type (int instead of long) to work with DFNT_INT32/DFNT_UINT32 on 64-bit Linux (#5965)
- * MODIS: Set more correct values for PIXEL_/LINE_ OFFSET/STEP by comparing longitude and latitude subdatasets dimensions with main subdataset dimensions
+WFS driver:
+ * do not remove single or double quote character in a LIKE filter (also
+   applies to CSW driver)
 
-HDF5 driver:
- * avoid opening BAG files in the case HDF5 and BAG are plugins, and HDF5 is registered before BAG
+## SWIG bindings:
+ * add gdal.GetNumCPUs() and gdal.GetUsablePhysicalRAM()
 
-HFA driver:
- * fix recognition of Hotine Mercator Azimuth Center in Imagine format (and Swisstopo GeoTIFF) (#5551)
- * fix various hangs on invalid files
- * read projection even when it does not contain datum information (#4659)
+## CSharp bindings
 
-HTTP driver/wrapper:
-  * make it work with vector files too
-  * fix handling of non VSI*L file on Windows
+* Default to dotnet 6 (#6843)
 
-IRIS driver:
- * add support for the SHEAR data type (#5549)
+## Python bindings
 
-JPEG2000 driver:
- * do expansion of 1-bit alpha channel to 8-bit by default. Can be controlled with the 1BIT_ALPHA_PROMOTION open option (default to YES)
- * add GMLJP2 creation option
- * add GMLJP2V2_DEF creation option to create a GMLJP2 v2 box
- * Add capability of reading GMLJP2 v2 embedded feature collections and annotations
- * Add read/write support for RPC in GeoJP2 box (#5948)
+* make Geometry.__str__() use ExportToIsoWkt() (#6842)
+* setup.py: improve numpy fixing (#6700)
+* add a 'python_generated_files' target that facilitate generation of bindings without building the lib
 
-JP2ECW driver:
- * add metadata about JPEG2000 codestream and boxes (#5408)
- * Add 1BIT_ALPHA_PROMOTION open option (default to YES) to control expansion of 1-bit alpha channel to 8-bit
- * correctly assign color interpretation to bands if order is unusual
- * add WRITE_METADATA and MAIN_MD_DOMAIN_ONLY creation options to write GDAL metadata, JP2 XML boxes or XMP box
- * add GMLJP2V2_DEF creation option to create a GMLJP2 v2 box
- * Add capability of reading GMLJP2 v2 embedded feature collections and annotations
- * Add read/write support for RPC in GeoJP2 box (#5948)
+# GDAL/OGR 3.6.0 Release Notes
 
-JP2KAK driver:
- * Compatibility with Kakadu v7.5 (#4575, #5344)
- * Handle Kakadu version 7 allocator.finalize (#4575)
- * fix bug in vsil_target::end_rewrite() that prevented TLM index to be generated (#5585)
- * Add FLUSH in creation option XML (#5646)
- * Do expansion of 1-bit alpha channel to 8-bit by default. Can be controlled with the 1BIT_ALPHA_PROMOTION open option (default to YES)
- * add GMLJP2V2_DEF creation option to create a GMLJP2 v2 box
- * Add capability of reading GMLJP2 v2 embedded feature collections and annotations
- * Add read/write support for RPC in GeoJP2 box (#5948)
+Those notes include changes since GDAL 3.5.0, but not already included in a GDAL 3.5.x bugfix release.
 
-JP2OpenJPEG driver:
- * Support writing arbitrary number of bands. (#5697)
- * Generate cdef box when transparency is needed. Add NBITS, 1BIT_ALPHA and ALPHA creation options (#5697)
- * add INSPIRE_TG (for conformance with Inspire Technical Guidelines on Orthoimagery), PROFILE, JPX and GEOBOXES_AFTER_JP2C creation option (#5697)
- * add GMLJP2V2_DEF creation option to create a GMLJP2 v2 box
- * Add capability of reading GMLJP2 v2 embedded feature collections and annotations
- * add PRECINCTS creation option (#5697)
- * allow several quality values to be specified with QUALITY creation option. Add TILEPARTS, CODEBLOCK_WIDTH and CODEBLOCK_HEIGHT options (#5697)
- * support reading&writing datasets with unusual order of band color interpretation (#5697)
- * add WRITE_METADATA and MAIN_MD_DOMAIN_ONLY creation options to write GDAL metadata, JP2 XML boxes or XMP box (#5697)
- * add support for reading/writing/updating IPR box (from/into xml:IPR metadata domain) (#5697)
- * add YCC creation option to do RGB->YCC MCT, and turn it ON by default (#5634)
- * add USE_SRC_CODESTREAM=YES experimental creation option, to reuse the codestream of the source dataset unmodified
- * support reading & writing images with a color table (#5697)
- * support update mode for editing metadata and georeferencing (#5697)
- * add compatibility with OpenJPEG 2.1 (#5579)
- * fix warning when reading a single tile image whose dimensions are not a multiple of 1024 (#5480)
- * Add 1BIT_ALPHA_PROMOTION open option (default to YES) to control expansion of 1-bit alpha channel to 8-bit
- * Add read/write support for RPC in GeoJP2 box (#5948)
- * limit number of file descriptors opened
+## In a nutshell...
 
-JPEG driver:
- * use EXIF overviews if available
- * add EXIF_THUMBNAIL creation option to generate an EXIF thumbnail
- * use optimized Huffman coding to reduce file size
- * add support for reading and writing COMMENT
- * optimize whole image reading with dataset IRasterIO()
- * report non-fatal libjpeg errors as CE_Warning (or CE_Failure if GDAL_ERROR_ON_LIBJPEG_WARNING = TRUE) (#5667)
- * in compressor, increase default val of max_memory_to_use to 500MB
-
-JPIPKAK driver:
- * avoid symbol collision with kdu_cpl_error_message from JP2KAK driver
- * reset the bNeedReinitialize flag after a timeout (#3626)
+* CMake is the only build system available in-tree. autoconf and nmake build systems have been removed
+* OpenFileGDB: write and update support (v10.x format only), without requiring any external dependency, with same (and actually larger) functional scope as write side of the FileGDB driver
+* [RFC 86](https://gdal.org/development/rfc/rfc86_column_oriented_api.html): Column-oriented read API for vector layers.
+  Implemented in core, Arrow, Parquet, GPKG and FlatGeoBuf drivers
+* Add read/write raster [JPEGXL driver](https://gdal.org/drivers/raster/jpegxl.html) for standalone JPEG-XL files. Requires libjxl
+* Add KTX2 and BASISU read/write raster drivers for texture formats. Require (forked) basisu library
+* Vector layer API: table relationship discovery & creation, Upsert() operation
+* GeoTIFF: add multi-threaded read capabilities (reqiures NUM_THREADS open option or GDAL_NUM_THREADS configuration option to be set)
+* Multiple performance improvements in GPKG driver
+* ogr_layer_algebra.py: promoted to official script (#1581)
+* Code linting and security fixes
+* Bump of shared lib major version
 
-KMLSuperOverlay driver:
- * fix truncated raster on 32 bit builds (#5683)
- * make Identify() more restrictive to avoid false positives
+## New optional dependencies
 
-L1B driver:
- * add support for little-endian LRPT datasets (#5645)
- * expose band mask when there are missing scanlines (#5645)
- * expose WGS-84 or GRS-80 datum if read from header record (#5645)
+* libjxl: for JPEGXL driver (it was already a potential dependency in past versions, when using internal libtiff, to get the JXL TIFF codec)
+* libarrow_dataset: for Parquet driver
+* [QB3](https://github.com/lucianpls/QB3): for QB3 codec in MRF driver
+* [basisu](https://github.com/rouault/basis_universal/tree/cmake): required for KTX2 and BASISU drivers
 
-MAP driver:
- * retrieve the image filename in a case insensitive way (#5593)
+## New installed files
 
-MBTiles driver:
- * better detection of 4 bands dataset and take into account alpha component of color table in RasterIO() (#5439)
- * avoid wrong detection of 3 bands when finding paletted PNG in /vsicurl mode (#5439)
- * fix dimension computation when opening a single tile dataset
- * better computation of extent from min/max of tile coordinates, for a single zoom level
- * use standard EPSG:3857 origin to fix a ~8m shift (#5785)
+* bin/ogr_layer_algebra.py
+* include/ogr_recordbatch.h
 
-MEM driver:
- * implement optimized versions of raster band and dataset IRasterIO()
+## Removed installed files
 
-MSG driver:
- * fix compilation problem (#5479)
- * fix memory leaks (#5541)
+None
 
-NetCDF driver:
- * Force block size to 1 scanline for bottom-up datasets if nBlockYSize != 1 (#5291)
- * Fix computation of inverse flattening (#5858)
- * In case the netCDF driver is registered before the GMT driver, avoid opening GMT files
- * Fix crash on opening a NOAA dataset (#5962)
+## Backward compatibility issues
 
-NGSGEOID driver:
- * make Identify() more restrictive
+See [MIGRATION_GUIDE.TXT](https://github.com/OSGeo/gdal/blob/release/3.6/MIGRATION_GUIDE.TXT)
 
-NITF driver:
- * deal correctly with JPEG2000 NITF datasets that have a color table inboth Image Subheader and JP2 boxes, and for drivers that don't do color table expension
- * HISTOA TRE: put definition of TRE in conformance with STDI-0002 (App L page 14) and STDI-0006 (Page 57) (#5572)
+## Build changes
 
-OGDI driver:
- * Remove OGDIDataset::GetInternalHandle (#5779).
+Enhancements:
+ * Add version suffix to DLL when compiling for MinGW target
+ * Add a -DBUILD_WITHOUT_64BIT_OFFSET advanced option (#5941)
+ * Add a USE_ALTERNATE_LINKER option
+ * Build iso8211 library conditionally to drivers requiring it
 
-OZI driver:
- * remove .map header detection from Identify() since this is actually handled by the MAP driver
+Fixes:
+ * Fix build without PNG (#5742) and JPEG (#5741)
+ * Various changes for CHERI-extended architectures such CHERI-RISC-V or Arm Morello with sizeof(void*) == 16
+ * FindMono.cmake: fix setting 'CSHARP_MONO_INTERPRETER_', to avoid having to run CMake twice
+ * swig/python/CMakeLists.txt: fix SWIG_REGENERATE_PYTHON mode
+ * FindNetCDF.cmake: fix when running on Ubuntu 16.04 regarding erroneous detection of netcdf_mem.h
+ * Remove uses of std::regex (#6358)
+ * honour CMAKE_INSTALL_RPATH for Python bindings, but only if it is an absolute path. (#6371)
+ * Python: fix to allow building in ubuntu 18.04 (#6443)
+ * Fixed building position independent static lib
+ * Fix issues when building/installing in directories with spaces, at least on Unix.
+ * fix LIBKML linking on Windows Conda
+ * make sure to register EEDAI driver when built as a plugin
+ * fix Win32 csharp build (#6620)
 
-PCIDSK driver:
- * close dataset in case of exception in PCIDSK2Dataset::LLOpen() (#5729)
+## Internal libraries
 
-PCRaster driver:
- * Align libcsf code with PCRaster raster format code (#5843)
- * Implement Create() (#5844)
- * Improve handling of no-data value (#5953)
+* flatbuffers: updated
+* internal libtiff: resynchroinzation with upstream
+* internal libpng: use __UINTPTR_TYPE__ for png_ptruint when available
 
-PDF driver:
- * add compatibility with Poppler 0.31.0
- * in the OGC Best practice case, switch rotational terms of the geotransform matrix (gt[2] and gt[4])
- * in the OGC Best practice case, handle rotations of 90 and 270 degrees.
- * advertise LAYERS metadata domain
- * deal with OHA- datum (Old Hawaiian)
- * fix compilation problem with Podofo on Windows (patch by keosak, #5469)
- * add sanity check on page count
+## GDAL 3.6.0 - Overview of Changes
 
-PDS driver:
- * Added support for SPECTRAL_QUBE objects used e.g. by THEMIS instrument of Mars Odyssey spacecraft.
+### Port
 
-PNG driver:
- * add creation options to write metadata in TEXT/iTXt chunks
- * optimize whole image reading with dataset IRasterIO()
- * Internal libpng: update to 1.2.52
+New features:
+ * Add CPLIsASCII()
+ * /vsis3/: Provide credentials mechanism for web identity token on AWS EKS (#4058)
+ * /vsis3/: support source_profile in .aws/config pointing to a profile with a web_identity_token_file (#6320)
+ * /vsistdin/: make size of buffered area configurable (#751)
+ * add VSIIsLocal(), VSISupportsSequentialWrite() and VSISupportsRandomWrite()
+ * Configuration file: add a ignore-env-vars=yes setting (#6326) in a \[general\] leading section
+ * Add a cpl::ThreadSafeQueue<> class
 
-PostgisRaster driver:
- * Fix read of metadata for tables with multiple raster cols (#5529)
+Enhancements:
+ * VSIFileFromMemBuffer(): allow anonymous files
+ * CPLCheckForFile(): do not request file size
+ * /vsicurl/: when CPL_CURL_VERBOSE is enabled, log as CPLDebug() message the error message from the server
+ * /vsicurl / CPLHTTPFetch(): add GDAL_HTTP_HEADERS configuration option (#6230)
+ * VSIVirtualHandle: add a PRead() method for thread-safe parallel read and implement it in /vsimem/ and Unix virtual file system
+ * /vsis3/: make CPL_VSIS3_USE_BASE_RMDIR_RECURSIVE a path-specific configuration option
+ * Make GDAL_DISABLE_READDIR_ON_OPEN a path-specific configuration option
+ * Add VSISetPathSpecificOption() / VSIGetPathSpecificOption() / VSIClearPathSpecificOptions().
+   Deprecate VSISetCredential() / VSIGetCredential() / VSIClearCredentials()
+ * /vsicurl/ and other network file systems: add a DISABLE_READDIR_ON_OPEN=YES/NO VSIFOpenEx2L() option
+ * Add a VSIFilesystemHandler::SupportsRead() method
+ * Add GDAL_HTTP_TCP_KEEPALIVE/GDAL_HTTP_TCP_KEEPIDLE/GDAL_HTTP_TCP_KEEPINTVL configuration options to control TCP keep-alive functionality
+ * Make CPLODBCSession and CPLODBCStatement member variables 'protected' (#6314)
 
-Rasterlite driver:
- * accept space in filename
+Bugfixes:
+ * cpl_config.h: Don't use __stdcall on MinGW
+ * CPL recode: fix issues with iconv library integrated in musl C library
+ * CPLWorkerThreadPool::SubmitJob(): avoid potential deadlock when called from worker thread
+ * /vsicurl/: fix caching of first bytes of the files
 
-RPFTOC driver:
- * add tweak for weird relative directory names in the A.TOC file (#5979)
+### Core
 
-VRT driver:
- * add handling of a shared='0' attribute on <SourceFilename> to open sources in non-shared mode, and VRT_SHARED_SOURCE config option that can be set to 0 in case the shared attribute isn't there (#5992)
- * VRT warp: make selection of source overview work (#5688)
- * VRT warp: expose as many overviews in warped dataset as there are in source dataset, and make warped VRT honour -ovr parameter of gdalwarp (#5688)
- * make sure nodata value set on VRT raster band is taken into account in statistics computation (#5463)
- * fix ComputeStatistics() on VRT that are a sub-window of source dataset (#5468)
- * VRT raw: fix corrupted serialization on Windows (#5531)
- * implement heuristics to determine if GetMinimum()/GetMaximum() should use the implementation of their sources of not. Can be overridden by setting VRT_MIN_MAX_FROM_SOURCES = YES/NO (#5444)
- * VRT warp: avoid to warp truncated blocks at right/bottom edges, so that scale computation is correct
- * fix RasterIO() to be able to fill buffers larger than 2GB (#5700)
- * fix performance problem when serializing into XML a big number of sources
- * do not output empty <Metadata> node on VRTDataset and VRTRasterBand elements
- * fix rounding of output window size on VRTSimpleSource (#5874)
- * add trick to make relativeToVRT works for a VRT-in-VRT
- * add more checks to CheckCompatibleForDatasetIO() to avoid issues with overview bands (#5954)
- * preserves relative links on reserialization of existing VRT (#5985)
+New features:
+ * Add a GDALRasterBand::GetSuggestedBlockAccessPattern() method, implement it in GTiff, JPEG, PNG, PDF drivers and use it in GDALCopyWholeRasterGetSwathSize().
+ * GDALJP2Box/GDALJP2Metadata: add support for reading/writing JUMBF box
+ * Add a GDALDeinterleave() function, to copy values from a pixel-interleave buffer to multiple per-component,
+  and add SSE2/SSSE3 optimizations for a few common scenarios like Byte/UInt16 3/4 components.
+  Use it in GTiff and MEM drivers.
+ * C API change: make GDALComputeRasterMinMax() return CPLErr instead of void (#6300)
+ * Add a GDAL_DMD_MULTIDIM_ARRAY_OPENOPTIONLIST constant
 
-USGSDEM driver:
- * take into account horizontal unit = ft in the UTM case (#5819)
+Enhancements:
+ * GDALRasterBand::ComputeRasterMinMax(): add optimized implementation for Byte and UInt16 data types (~10 times faster)
+ * Multidim API: significantly enhance performance of reading transposed arrays for netCDF/HDF5
+ * GDALVersionInfo(): report if it is a debug build in --version output, and report compiler version in BUILD_INFO output
+ * /vsicurl/: cache the result of several collections/URL signing requests to Planetary Computer
+ * GDALCopyWholeRasterGetSwathSize(): aim for a chunk that is at least tall as the maximum of the source and target block heights
+ * GDALGetJPEG2000Structure(): add JP2_BOXES, CODESTREAM_MARKERS, STOP_AT_SOD, ALLOW_GET_FILE_SIZE options
+ * GDALDataset::BuildOverviews/IBuildOverviews(): add a CSLConstList papszOptions parameter
+ * GDALDataset::CreateLayer(): honor GDAL_VALIDATE_CREATION_OPTIONS (#6487)
 
-TIL driver:
- * fix half pixel shift in geo registration (#5961)
+Breaking changes:
+ * Remove use of compatibility wrappers _GetProjectionRef / _GetGCPProjection / _SetProjection / _SetGCPs (#6186)
 
-WEBP driver:
- * Lazy uncompressed buffer allocation and optimize band-interleaved IRasterIO() for whole image reading
+Bugfixes:
+ * EXIFCreate(): fix writing of EXIF_UserComment
+ * GDALPamDataset::TrySaveXML(): do not set error if a subdataset name is set but the .aux.xml doesn't exist (#5790)
+ * GDALOpen(): make recursive opening of dataset more reliable when papszAllowedDrivers is passed
+ * GetHistogram(): Support 64 bit images (#6059)
+ * GetHistogram(): deal with undefined behavior when raster values are at infinity, or with pathological min/max bounds
+ * GDALPamRasterBand::SetOffset()/SetScale(): set the bOffsetSet/bScaleSet even if the value provided is the default offset/scale
+ * GDALDataset/GDALRasterBand::BuildOverviews/IBuildOverviews(): fix const correctness of panOverviewList and panBandList arguments
+ * Overview: tighten GAUSS and MODE to be exactly those names, and not starting with them
+ * Overview building: fix MODE resampling on large datasets (#6587)
 
-WMS driver:
- * Add support for ArcGIS server REST API
- * fix to make GDAL_DEFAULT_WMS_CACHE_PATH configuration option work as expected (#4540)
- * move the WMS layer name encoding to be done before the sub datasets URLs are created.
+### Algorithms
 
-XYZ driver:
- * fix back line seeking with datasets that have not the same number of values per lines (#5488)
- * deal with lines that have missing values (but still regularly spaced)
+Enhancements:
+ * Transformer: add SRC_GEOLOC_ARRAY and DST_GEOLOC_ARRAY transformer options
+ * GDALChecksumImage(): make it return -1 in case of error
 
-## OGR 2.0 - Overview of Changes
+### Utilities
 
-Core:
- * OGRPolygon::importFromWkt(): fix memleak when importing broken 2.5D polygon
- * Fix OGRFeature::SetGeometryDirectly() and SetGeomFieldDirectly() to free the passed geometry even if the method fails (#5623)
- * OGR SQL: Add hstore_get_value(hstore, key) function
- * OGR SQL: sanitize how we deal with field names expressed as table_name.field_name and "fieldname.with_point_inside". By default, use standard quoting rules, and be tolerant when there's no ambiguity
- * OGR SQL: support arbitrary boolean expression on ON clause of a JOIN
- * OGR SQL: accept AS keyword in 'FROM table_name AS alias' clause
- * OGR SQL: don't consider backslash-doublequote as an escape sequence when inside a single-quoted string literal
- * Add OGR_API_SPY mechanism (http://www.gdal.org/ograpispy_8h.html)
- * Make OGRParseDate() recognize ISO 8601 format
- * ogr_core.h: only ignore -Wfloat-equal for IsInit() and not for the rest of the file and files that include it (#5299)
- * OGR layer algebra: properly initialize field maps to avoid Valgrind warnings in OGRLayer::Update() (#5778)
- * Make OGR_F_SetFieldBinary() set OFTString fields, mostly for testing purposes
- * OGR_G_CreateGeometryFromJson(): attach a WGS84 SRS to the returned geometry if the json object has no 'crs' member (#5922)
+New features:
+ * gdalinfo: add a STAC section to `gdalinfo -json` output (#6265)
+ * gdal_translate: add a -ovr <level|AUTO|AUTO-n|NONE> flag (#1923)
+ * gdal2tiles.py: add WEBP support with --tiledriver option
+ * gdalmdiminfo & gdalmdimtranslate: add -if (input format) flag (#6295)
+ * gdal_grid: add 'radius' parameter to invdist, nearest, averge and metrics algorithm, to set radius1 and radius2 at the same time
+ * gdal_grid: add per-quadrant search capabilities for invdistnn, average, and metrics algorithms
+ * ogr_layer_algebra.py: promoted to official script (#1581)
 
-OGRSpatialReference:
- * Upgrade to EPSG v8.5 database
- * Proj.4 import: for HOM, make sure +no_off/no_uoff is preserved, and change default value of gamma parameter to be the same as alpha (#5511)
- * Proj.4 export: export Aitoff, Winkel I, Winkel II, Winkel-Tripel, Craster, Loximuthal, Quartic Authalic
- * Adding support for Mercator_Auxiliary_Sphere without AUTHORITY SECTIONS (#3962)
- * Add QSC (Quadrilateralized_Spherical_Cube) projection, compatible with PROJ 4.9
- * Various fixes to put EXTENSION node before AUTHORITY and make it pass Validate() (#5724)
- * importFromEPSG()/exportToProj4(): avoid precision loss in TOWGS84 parameters, e.g. on Amersfoort / RD EPSG:4289 (https://trac.osgeo.org/proj/ticket/260)
- * Add OSRCalcInvFlattening() and OSRCalcSemiMinorFromInvFlattening(), and use them in various places (#5858)
- * Remove deprecated variant of OGRSpatialReference::importFromOzi() (#5932)
+Enhancements:
+ * gdal2tiles.py: short circuit overview tile creation for --resume ahead of processing base tiles
+ * gdal2tiles.py: refactor transparent file check in overview creation
+ * gdalsrsinfo: use wkt2_2019 name instead of wkt2_2018
+ * gdal_viewshed: use -cc 1.0 as default for non-Earth CRS (#6278)
+ * nearblack: skip erosion when pixel at edge is valid
+ * gdal_grid: produce north-up images
+ * gdal_grid: add validation of algorithm parameters and warn when a unknown parameter is specified
+ * gdal_grid: add a nSizeOfStructure leading structure member in GDALGridXXXXOptions structure, as a way to detect ABI issues when adding new parameters
 
-Utilities:
- * ogrinfo: add -oo option per RFC 46
- * ogrinfo: display dataset and layer metadata. Add -nomdd, -listmdd, -mdd all|domain options, like in gdalinfo. OGR VRT: add dataset and layer metadata support
- * ogrinfo: add -nocount and -noextent options
- * ogr2ogr: add -oo and -doo options per RFC 46
- * ogr2ogr: add -spat_srs option
- * ogr2ogr: turn string value to one element list if destination field is stringlist
- * ogr2ogr: fix problem with SRS when copying layers with multiple geometry columns with different SRS (#5546)
- * ogr2ogr: add special case for -update and GPKG and input=output
- * ogr2ogr: when copying a layer that has a source integer/integer64 field with same name as target FID column, avoid creating it into target layer and use its content as the FID value (#5845)
- * ogr2ogr: in non-append mode, if target layer has a FID creation option, reuse source FID name and source FIDs, unless -unsetFid is specified (#5845)
- * ogr2ogr: copy source dataset and layer metadata, unless disabled by -nomd. Additional dataset metadata can be set with -mo KEY=VALUE
- * ogr2ogr: add -ds_transaction to force dataset transactions, mainly for FileGDB driver
- * ogr2ogr: fix crash with -clipdst when a reprojection fails before (#5973)
- * ogrlineref: fix project if reper lies on first point or last point of line
- * ogr_layer_algebra.py: for Update, Clip and Erase, only creates attribute of input layer by default (#5976)
-
-Other:
- * OGR WCTS removed from tree
-
-Cross driver changes:
- * MSSQLSpatial and GPKG: use standardized 'GEOMETRY_NAME' option name. Add GEOMETRY_NAME to SQLite (#5816)
- * FileGDB and MySQL: use standardized 'FID' option name. SQLite: add a FID layer creation option (#5816)
- * SQLite, GPKG, PG, PGDump: in a newly created table, allow to create a integer field with same name of FID column (#5845)
-
-BNA driver:
- * fix segfault when calling GetNextFeature() on a write-only layer
-
-CartoDB:
- * add CARTODBFY layer creation option
- * launder layer and column names by default (#5904)
- * enable by default batch insertion of features in update mode
- * on a newly created layer, send new features created by CreateFeature() by chunks of a maximum size of 15 MB (configurable through CARTODB_MAX_CHUNK_SIZE).
- * implement deferred field creation
- * support boolean type
- * register tables with cdb_cartodbfytable()
- * fix creation of features with Date/DateTime/Time values
- * fix for multi-user account, and optimization for SQL layers
- * implement TestCapability() and CreateDataSource() similarly to PostgreSQL, i.e. redirect to Open() in update mode
- * accept a user column to have the same name of the FID (cartodb_id)
- * do automatic polygon->multipolygon promotion at creation time
- * in authenticated mode, retrieve all column information, including spatial info, default value and primary key in one single statement
- * use integer primary key of tables, when available, to scroll faster among features instead of using OFFSET/LIMIT (#5906)
+Bugfixes:
+ * gdalwarp: modify 'sum' resampling to preserve total sum
+ * gdalwarp: fix issue with wrong resolution when reprojecting between geographic CRS with source extent slightly off [-180,180]
+ * gdalwarp: fix artifacts around antimeridian for average/mode/min/max/med/q1/q3/sum/rms resampling (#6478)
+ * gdal2tiles.py: remove PIL deprecation warning by replacing ANTIALIAS with LANCZOS
+ * gdal2tiles: allow oversampling in -p raster mode (fixes #6207)
+ * gdal2xyz.py: fix parsing of -b option (#5984)
+ * gdal_rasterize: fix ALL_TOUCHED on polygons whose boundaries coordinates are aligned on pixels (#6414)
 
-CSV driver:
- * add optional field type detection with AUTODETECT_TYPE=YES open option
- * add QUOTED_FIELDS_AS_STRING open option that default to NO. So by default, if AUTODETECT_TYPE=YES, the content of quoted fields will be tested for real, integer,... data types
- * fix to avoid truncation of WKT geometries to 8000 characters (#5508)
- * fix segfault when reading allCountries.txt of geonames.org (#5668)
- * accept space as separator as input/output, and add MERGE_SEPARATOR=YES/NO open option
+### gdal_utils package
 
-DXF driver:
- * improve TestCapability(ODsCCreateLayer)
+* standardized return codes (#5561). Return 2 when utilities called without argumen
 
-FileGDB driver:
- * add layer creation option to set CONFIGURATION_KEYWORD
- * avoid error message when failing to import SRS from WKID code (might be an ESRI code for example)
- * do not reject features with null geometry
- * use LatestWKID when available (#5638)
- * avoid emitting error when opening a FileGDB v9, so that OpenFileGDB can be tried to open it, in the case FileGDB is a plugin (#5674)
- * fix CreateFeature() to work when a esriFieldTypeGlobalID field is not set
- * report width of string fields (#5806)
- * add compatibility with FileGDB SDK v1.4
- * enable bulk load on newly created layers
+### Raster drivers
 
-GeoJSON driver:
- * implement Date/Time/DateTime field type detection
- * expose a 'id' object, of type string, directly on Feature object (not in its properties) as a field
- * add FLATTEN_NESTED_ATTRIBUTES and NESTED_ATTRIBUTE_SEPARATOR open options
- * TopoJSON: establish layer schema from objects properties (#5870)
- * implement automatic scrolling through result sets of ArcGIS GeoServices Feature Service (#5943)
- * accept and skip UTF-8 BOM (#5630)
- * ESRIJson: parse correctly rings of esriGeometryPolygon objects to build correct Polygon or MultiPolygon (#5538)
- * avoid truncation of real numbers on reading (#5882)
- * internal libjson-c: Fix to read floating point numbers in non C locale (#5461)
- * improve TestCapability(ODsCCreateLayer)
- * make string comparison for authority name case insensitive so as to recognize lowercase 'epsg' (#4995)
- * support reading Feature without geometry field
-
-GeoRSS driver:
- * fix to parse ATOM feed documents with atom: namespace (#5871)
-
-GME driver:
- * Added fixes discovered while using v.in.ogr and v.out.ogr in GRASS
+ADRG driver:
+ * add SRP pixel spacing value (SRP_PSP) to the dataset metadata
 
-GML driver:
- * add XSD=filename open option
- * add FORCE_SRS_DETECTION, INVERT_AXIS_ORDER_IF_LAT_LONG, CONSIDER_EPSG_AS_URN, READ_MODE, EXPOSE_GML_ID, EXPOSE_FID, DOWNLOAD_SCHEMA and REGISTRY open options
- * Fix bug that prevented multiple instances of the reader with Xerces backend (#5571)
- * parse correctly GML geometries whose srsDimension attribute is on top-level geometry element and not on posList (#5606)
- * add datasource option SRSDIMENSION_LOC=GEOMETRY to be able to write srsDimension attribute on top level geometry element, default on posList unchanged (#5066)
- * add support for reading layers resulting from a WFS 2.0 join query
- * read/write top <gml:description> and <gml:name> as DESCRIPTION and NAME metadata items. Also add GML_ID, DESCRIPTION and NAME creation options
- * support to reader response to CSW GetRecords queries
- * Fix incorrect geometry cast when reading GML topogeometries (#5715)
- * VFR: fix ST_Z type (changes) -- list all layers
- * VFR: include also non-spatial (removed) features (ZaniklePrvky) in type ST_Z (changes)
- * VFR: use String when 32-bit integer was not wide enough
- * VFR: add support for UVOH file type
- * VFR: add missing support for OriginalniHraniceOmpv geometry
- * VFR: update GFS files to RFC31 (OGR 64bit Integer Fields and FIDs)
- * update RUIAN GFS files: add missing GMLFeatureClasses to OB type (SpravniObvody, Mop, Momc)
- * add support for parsing .xsd with a <choice> of polygonProperty and multiPolygonProperty
- * remove wrong case insensitive comparison related to gml_registry.xml use
- * various fixes to better deal with ArcByCenterPoint() as found in FAA AIXML files
- * make Expat parser accept trailing nul characters
- * correctly record path to attribute in case of attribute located on a nested element when .gfs is created with GML_ATTRIBUTES_TO_OGR_FIELDS=YES
- * fix GML_ATTRIBUTES_TO_OGR_FIELDS=YES to work correctly with xlink:href too (#5970
- * make GML_EXPOSE_GML_ID to be honoured on WFS documents
+COG driver:
+ * add a OVERVIEW_COUNT creation option to control the number of overview levels (#6566)
+ * add DMD_EXTENSIONS metadata item (#6073)
+ * properly set lossy WEBP compression when QUALITY_OVERVIEW < 100 but QUALITY = 100 (#6550)
 
-GPKG driver:
- * add support for non-spatial layers via the gdal_aspatial extension (#5521)
- * add support for creating spatial index
- * add layer metadata read/write support
- * implement ST_GeometryType(), GPKG_IsAsisgnable() and ST_SRID() to be compatible with Geometry Type Triggers and SRS ID Triggers Extensions
- * on creation, use GEOMCOLLECTION (instead of GEOMETRYCOLLECTION) (#5937)
- * make SELECT expressions passed to ExecuteSQL() be evaluated by SQLite
- * make it possible to use spatialite 4.2.0 SQL functions
- * add a 'INDIRECT_SQLITE' dialect that goes through the VirtualOGR mechanism (e.g. for compat with older Spatialite)
- * allow table names with dash character (#5472)
- * emit warning when required extensions are not implemented
- * disable PRAGRAM integrity_check by default, since it can be expensive on big files
- * read-only support for tables without integer primary key
- * fix Date and DateTime support
- * implement TEXT(maxwidth) type in read and creation
- * implement deferred table creation
- * fix reporting of geometry type for 2.5D (previous behavior had the effect to turn to wkbUnknown)
- * put correct value (1) in gpkg_geometry_columns for 2.5D tables (#5481)
- * fix component geometry type of 3D MultiGeometries (#5629)
- * fix GetExtent() crash on layers without extent set in gpkg_contents (#5471)
- * avoid leak when a table has more than one FID column
- * accept spatial tables whose geometry field is declared as BLOB
- * recognize both GeomCollection and GeometryCollection as possible values, until GeoPackage SWG clears what is the official value
- * escape all column names in SQL (#5520)
- * accept geometries with Spatialite format, that can be returned with issuing a SQL request using spatialite functions
- * enable Spatialite 4.3 'amphibious' mode to avoid explicit cast to Spatialite geometries
+COSAR driver:
+ * handle version 2 files that contain half-foat samples (#6289)
 
-GPSBabel driver:
- * automatically open .igc files, implement Identify() and add open options
- * advertise creation option
+ECRGTOC driver:
+ * fix error on RasterIO() when GDAL_FORCE_CACHING=YES is set
 
-GTM driver:
- * declare OLCCreateField and OLCSequentialWrite capabilities
+ECW driver:
+ * strip off boring Kakadu and OpenJPEG COM marker comments
 
-IDRISI driver:
- * fix support for multi-ring polygons (#5544)
+ENVI driver:
+ * implement 'default bands' to read/write R,G,B and gray color interpretation (#6339)
+ * implement Get/Set Scale/Offset from ENVI 'data gain values'/'data offset values' (#6444)
+ * use OGRSpatialReference::FindBestMatch() on reading to find a matching known CRS (#6453)
 
-ILI driver:
- * Use Ili1TransferElement written by ili2c 4.5.5 and newer
- * Fix crash in polygon geometry reading
- * Fix reading SURFACE polygons with multiple rings
- * Fix reading tables with polygon type
- * Support curve geometries for ILI1 and ILI2.
- * Add a MODEL open option
+GPKG driver:
+ * in CreateCopy() mode for Byte data, save the band count in a IMAGE_STRUCTURE metadata domain to be able to re-open the file with the appropriate number of bands
+ * default to PNG storage for single band dataset (qgis/QGIS#40425)
+ * writer: write fully set tiles as soon as possible to decrease pressure on block cache
 
-ISIS3 driver:
- * fix to recognize IsisCube.Mapping.LatitudeType = Planetocentric (#5717)
+GTiff driver:
+ * add multi-threaded read capabilities (reqiures NUM_THREADS open option or GDAL_NUM_THREADS configuration option to be set)
+ * JXL codec: support more than 4 bands in INTERLEAVE=PIXEL mode (#5704)
+ * JXL codec: preserve Alpha color interpretation when the Alpha band does not immediately follow color bands (e.g. R,G,B,undefined,Alpha), and fix decoding of such files
+ * add a WEBP_LOSSLESS_OVERVIEW=YES/NO configuration option (#6439)
+ * report a COMPRESSION_REVERSIBILITY=LOSSLESS (possibly)/LOSSY metadata item in IMAGE_STRUCTURE for WEBP and JXL compression
+ * read/write JPEGXL and WEBP compression parameters (for main dataset only) in IMAGE_STRUCTURE metadata domain of GDAL_METADATA tag
+ * avoid potential crash on creation in a disk full situation
+ * fix reading a CompoundCRS of a LocalCS/EngineeringCS, and avoid warnings on writing (#5890)
+ * report codec name (or code) when opening a file with a unhandled code
+ * WEBP: avoid unnecessary temporary buffer creation and copy (most of changes are in libtiff itself)
+ * force INTERLEAVE=PIXEL for internal overviews when using WEBP compression
+ * avoid SetMetadata() to cancel effect of SetGeoTransform() (#6015)
+ * refuse to open files with SampleFormat=IEEEFP and BitsPerSample != 16, 24, 32 or 64
+ * SRS import: better deal when angular unit of the GEOGCS[] of the PROJCS[] doesn't match the one from the database
+ * SRS export: avoid error when exporting a Projected 3D CRS (#6362)
+ * honour COMPRESS_OVERVIEW and INTERLEAVE_OVERVIEW for internal overviews (#6344)
+ * CreateCopy(): fix marking alpha channels that are not the last one (#6395)
 
-KML driver:
- * fix segfault when calling GetNextFeature() on a write-only layer
+HDF5 driver:
+ * multidim: fix crash on 'gdalmdiminfo HDF5:autotest/gdrivers/data/netcdf/alldatatypes.nc'
 
-LIBKML driver:
- * add support for reading gx:MultiTrack
- * rework libkml singleton factory management (#5775)
+JP2KAK driver:
+ * use kdu_multi_analysis class for tile encoding, instead of very low level kdu_analysis
+ * use kdu_stripe_compressor whenever the required buffer size is < CACHE_MAX / 4, otherwise fallback to kdu_multi_analysis
+ * add (at least build) support for versions down to 7.3
 
-MITAB driver:
- * add support for append/update/delete operations on .tab files (#5652)
- * add support for CreateField() on non empty file, AlterFieldDefn() and DeleteField() for .TAB (#5652)
- * implement SyncToDisk() for TAB layers (#5652)
- * convert to use of VSI*L FILE API (#5558)
- * don't write field width for integer fields in .mif, which is incompatible with MapInfo (#3853)
- * report OLCCreateField for .mif files (#5477)
- * fix opening .mif file without .mid file (#5570)
- * swap StdParallel1 and stdParallel2 if necessary on LCC projections (https://github.com/mapgears/mitab/issues/1)
- * take into account scale/bounds to properly round coordinates (https://github.com/mapgears/mitab/issues/2)
- * add MITAB_BOUNDS_FILE configuration option to specify a file with projection bounds (https://github.com/mapgears/mitab/issues/3)
- * add BOUNDS layer creation option (#5642)
- * refactor import/export of MIF coordsys to use the TAB code; take into account MITAB_BOUNDS_FILE to add Bounds to the CoordSys string
- * close polygon rings when reading Region from MIF file (#5614)
- * fix segfault in CreateFeature() if passing an invalid OGR feature style string (#1209)
+All JPEG2000 drivers:
+ * report a COMPRESSION_REVERSIBILITY=LOSSLESS/LOSSLESS (possibly)/LOSSY metadata item in IMAGE_STRUCTURE domain
 
-MSSQLSpatial driver:
- * Implement SPATIAL_INDEX layer creation option for MSSQL (#5563)
- * Implement support for WKB geometry upload (#5682)
- * Fix schema handling in MSSQL driver (#5401)
- * Fix spatial geometry field handling (#5474)
- * Bind string fields to unicode string columns in the database (#5239)
- * Fix recognizing image columns as geometry columns for the select layers. (#5498)
- * Fix issue when creating non-spatial table (#5696)
- * Fix to read metadata if the tables are specified in the connection string (#5796)
- * Fix crash if the tablename is specified in the connection string (#5826)
- * Include geometry column name in Update statement (#5930)
- * Implement FID layer creation option (#5816)
- * Fix issue when removing an MSSQL spatial layer
-
-MySQL:
- * thread-safe initialization of mysql client library (#5528)
+JP2OpenJPEG driver:
+ * for reversible compression, write a hint in the COM marker if the compression is lossy or not, and use it on reading
 
-NAS driver:
- * implement wfs:update (adds new context 'update' and fields "endet" and "anlass" to "delete" layer).
- * also assign xlink:href attributes as layer attribute (not only in "alkis_beziehungen" layer; #5372)
- * fix filtering on OGR_GEOMETRY special field
- * make chevrons configurable by NAS_INDICATOR
+JPEG-XL driver:
+ * NEW!
+ * The JPEG-XL format is supported for reading, and batch writing (CreateCopy()), but not update in place.
+  The driver supports reading and writing:
+    - georeferencing: encoded as a GeoJP2 UUID box within a JUMBF box.
+    - XMP in the xml:XMP metadata domain
+    - EXIF in the EXIF metadata domain
+    - color profile in the COLOR_PROFILE metadata domain.
 
-OCI driver:
- * add a ADD_LAYER_GTYPE=YES/NO layer creation option that defaults to YES to enforce a layer geometry type and is used to retrieve the layer geometry type when listing layers (#3754)
- * Fix FID (multi_load=off, OGRNullFID) - start with 1 (not -1) (#5454)
- * use VARCHAR2 instead of VARCHAR for unsupported types
- * Fix "ORA-00972: identifier is too long" error (#5466)
- * Fix memory leaks (#5599)
- * Fix creation of date and datetime fields (#5600)
- * initialize member variable to avoid UpdateLayerExtents() to be called randomly on non spatial tables (#5376)
- * avoid spatial index to be created each time SyncToDisk() is called
- * fix memory leak in DeleteLayer(const char*)
- * fix reading of 2D geometries that were always turned as 3D
- * in layers returned by ExecuteSQL(), only expose geometry column if there's one
- * force NLS_NUMERIC_CHARACTERS to ". " (#5709)
+KEA driver:
+ * add support for 64 bit nodata functions
 
-ODBC driver:
- * try alternate DSN template for 64bit ODBC
- * make ODBC driver honour PGEO_DRIVER_TEMPLATE config. option (and also MDB_DRIVER_TEMPLATE in case PGEO_DRIVER_TEMPLATE isn't defined) (#5594)
+MRF driver:
+ * Add QB3 compression (#5824)
 
-ODS driver:
- * fix export of OFTDate fields that were exported as string
+netCDF driver:
+ * handle variables of type NC_SHORT with _Unsigned=true as GDT_UInt16 (#6352)
+ * do not report metadata of indexing variables of dimensions not used by the variable of interest (#6367)
+ * fix 2 issues with netCDF 4.9.0 of msys2-mingw64 (#5970)
+ * multidim: workaround crash with using same file in 2 different threads (each thread with its own dataset object) (#6253)
+ * ignore 'missing_value' when it is a non-numeric string
+ * multidim: use 'fill_value' attribute as an alternative for nodata, and add a USE_DEFAULT_FILL_AS_NODATA=YES array open option
+ * allow NETCDF:"/vsicurl_streaming/http[s]://example.com/foo.nc":variable_name (#6610)
 
-OpenAir driver:
- * tweak detection logic to read beyond first 10KB bytes when needed (#5975)
+NITF driver:
+ * do not put PAM metadata in a Subdataset node of .aux.xml file if there's a single dataset (3.4.0 regression) (#5790)
+ * avoid excessive memory allocation on broken files (ossfuzz#52642)
+ ù fix crash when reading all metadata from a file without image segment, and allow creating such file
+ * add support for writing a TRE_OVERFLOW DES
+ * nitf_spec.xml: lower minlength for CSEPHA
 
-OpenFileGDB driver:
- * add compatibility with .gdbtable files bigger than 4 GB (#5615)
- * support opening files with ConfigurationKeyword=MAX_FILE_SIZE_4GB or MAX_FILE_SIZE_256TB (#5615)
- * fix occasional write-after-end-of-buffer (#5464)
- * avoid error message when failing to import SRS from WKID code (might be an ESRI code for example)
- * fix spatial filter with GeneralPolygon shapes (#5591)
- * fix for reading GDB with string fields with a default value length > 127 (#5636)
- * better handling of certain definitions of raster columns
- * use LatestWKID when available (#5638)
- * increase accepted size for field description zone up to 10 MB (#5660)
- * fix ResetReading() on SQL layer with ORDER BY on indexed column (#5669)
- * add support for non spatial GDB v9 tables (#5673)
- * improve error reporting when file exists but cannot be opened due to permission problem (#5838)
- * report width of string fields (#5806)
- * try to deal more gracefully with inconsistent nValidRecordCount vs nTotalRecordCount values (#5842)
- * report 25D layer geometry type on FileGDB v9 tables when relevant
- * optimize sequential reading of sparse layers
- * avoid warning when opening a00000004.gdbtable
- * disable feature count optimization with IS NOT NULL on an index column
+PDF driver:
+ * avoid PROJ error when reading a CRS with a EPSG code that is actually a ESRI one (#6522)
 
-OSM driver:
- * add mechanism to compute fields from other fields/tags with SQL expressions. Apply it for z_order on lines layer
- * fix random crash, particularly on MacOSX (#5465)
- * add CONFIG_FILE, USE_CUSTOM_INDEXING, COMPRESS_NODES, MAX_TMPFILE_SIZE and INTERLEAVED_READING open options
+PNG driver:
+ * report cause when unable to create file
 
-PG driver:
- * use COPY mode by default (unless PG_USE_COPY is set to NO) when inserting features in a newly create table (#5460)
- * add UNLOGGED=YES/NO layer creation option to create unlogged tables (improved version of patch by Javier Santana, #4708)
- * implement deferred loading of table list, to optimize ExecuteSQL() (#5450)
- * implement optimization for spatial table listing for PostGIS 2.x
- * implement deferred creation of tables to capture all attribute and geometry column creations into a single CREATE TABLE statement (#5547)
- * change "No field definitions found" from fatal error to debug
- * when creating a table and filling it, avoid re-reading the table definition from PG system tables (#5495)
- * better handling of SRS authority name different than EPSG (authority code must still be integral)
- * fix crash when writing a StringList with 0 element (#5655)
- * emit errors instead of debug messages when postgres issues an error (#5679)
- * fix to make ExecuteSQL('CREATE DATABASE foo') work
- * fix regression that prevented to retrieve more than 500 features from a connection with tables= parameter and on a SQL result layer (#5837)
- * PG/PGDump: fix truncation of fields to work with multi-byte UTF-8 characters (#5854)
+RMF driver:
+ * backup error state before min-max computation at FlushCache
+ * Ext header size checks improved
 
-PGDump driver:
- * switch to DROP_TABLE=IF_EXISTS by default (#5627)
- * fix crash when writing a StringList with 0 element (#5655)
+VRT driver:
+ * optimize speed of statistics and minmax computation when the VRT is a mosaics of non-overlapping simple sources
+ * ComputeStatistics(): for mosaicing case, enable it to be multi-threaded if GDAL_NUM_THREADS is set
+ * take into account open options when sharing sources (#5989)
 
-PGeo driver:
- * try alternate DSN template for 64bit ODBC
+WEBP driver:
+ * report a COMPRESSION_REVERSIBILITY=LOSSLESS/LOSSY metadata item in IMAGE_STRUCTURE
 
-REC driver:
+## OGR 3.6.0 - Overview of Changes
 
-Shapefile driver:
- * add SPATIAL_INDEX layer creation option (#5562)
- * support .prj files with UTF-8 BOM
- * fill 'date of last update' header with current time instead of dummy date, and add a DBF_DATE_LAST_UPDATE layer creation option to override this with a fixed date (#3919)
- * fix reading of shapefiles whose .shx is non conformant (#5608)
- * fix writing values up to 2^53 in OFTReal fields with 0 decimal places (#5625)
- * delete implicit FID field as soon as we CreateField a real one
- * GetExtent(): don't trust extent in header if it contains Not-A-Number values (#5702)
- * make REPACK compact .shp if SetFeature() is called and changes one geometry size (#5706)
- * add check not to cut unicode character while cut the string lengnt for field max length during SetFeature
- * avoid reading whole .shx at open time for /vsicurl/
- * add SHAPE_REWIND_ON_WRITE configuration option that can be set to NO to disable correction of ring winding order on write. Useful when dealing with MultiPolygon that are MultiPatch objects in fact (#5888)
- * Make ENCODING layer creation option proprietary over SHAPE_ENCODING config. option
+### Core
 
-SOSI driver:
- * remove error noise (#5710)
+New features:
+ * OGRLayer: add Arrow C stream based batch retrieval (RFC 86)
+ * Add OGRLayer::Upsert() operation support (#6199). Implement it in MongoDBv3, ElasticSearch MEM, GPKG drivers
+ * Add OGR_G_ConcaveHull(), using GEOS >= 3.11 GEOSConcaveHull_r(), and map it to SWIG
+ * Add a OGRLayer::AlterGeomFieldDefn() / OGR_L_AlterGeomFieldDefn() to change geometry field definitions. Implement in MEM, Shapefile, GPKG, PG, OpenFileGDB drivers
+ * Add GDALRelationship class for describing a relationship between two tables,
+   and related API for retrieving the relationship
+   names and relationships in a dataset.
+   Implement discovery in FileGDB, OpenFileGDB, PGeo and GPKG drivers, SQLite
+ * Add API for relationship creation/deletion/update.
+   Implement in OpenFileGDB driver
+ * Add OGRLayer::GetGeometryTypes(). This method iterates over features to retrieve their geometry types.
+   This is mostly useful for layers that report a wkbUnknown geometry type.
+   Specialized implementation in GPKG and PG drivers.
+ * Add a GDAL_DMD_ALTER_GEOM_FIELD_DEFN_FLAGS driver metadata item
+ * Add DCAP_CREATE_LAYER for drivers which have support for layer creation
+ * Add DCAP_DELETE_LAYER for drivers which have support for layer deletion
+ * Add DCAP_DELETE_FIELD for drivers which have support for field deletion
+ * Add DCAP_REORDER_FIELDS for drivers which have support for field reordering
+ * Add GDAL_DMD_ALTER_FIELD_DEFN_FLAGS for drivers which describe the flags supported for a driver by the AlterFieldDefn API
+ * Add DCAP_CURVE_GEOMETRIES for drivers which support curved geometries
+ * Add DCAP_MEASURED_GEOMETRIES for drivers which support measured geometries
+ * Add driver capability for DCAP_Z_GEOMETRIES
+ * Add OLCZGeometries (equivalent to OLCMeasuredGeometries for Z support)
+ * Add ODsCZGeometries datasource capability flag
+ * Add driver metadata for DMD_GEOMETRY_FLAGS. Contains a list of (space separated) flags which reflect the geometry handling behavior of a driver.
+   Supported values are currently "EquatesMultiAndSingleLineStringDuringWrite", "EquatesMultiAndSinglePolygonDuringWrite".
+ * Add OGRParseDateTimeYYYYMMDDTHHMMSSZ() and OGRParseDateTimeYYYYMMDDTHHMMSSsssZ()
+ * Add GDAL_DMD_SUPPORTED_SQL_DIALECTS driver metadata.
 
-S57 driver:
- * various compliance fixes in ISO8211 and S57 writer (#5798)
- * make it possible to set LNAM_REFS=OFF as advertized in the doc
+Enhancements:
+ * Make isClockwise() available at the OGRCurve level
+ * Export OSRStripVertical() function in C API
+ * OGRSimpleCurve point iterator: make its modification instant on the parent curve (#6215)
 
-SQLite/Spatialite driver:
- * SQLite/Spatialite: add support for multiple geometry column tables, accordingly with RFC 41 (#5494)
- * SQLite SQL dialect: Add hstore_get_value(hstore, key) function
- * remove 'T' suffix when formatting the content of a Date field (#5672)
- * optimize CreateFeature() when fields can be null or not null from one feature to another one
- * Spatialite: improve insertion performance by disabling triggers and doing the job ourselves
- * Fix segmentation fault when executing OGR2SQLITE_Register() when compiling against sqlite 3.8.7 (#5725)
- * make GetFIDColumn() work when run as first method call (#5781)
- * emit warning when reading text values in a integer/real field (possible since SQLite has no strong typing)
- * support reading date/datetime from Julian day floating point representation
- * SQLite dialect: fix insertion in geometry_columns of table names that are not in upper-case (#6483)
-
-SUA driver:
- * tweak detection logic to read beyond first 10KB bytes when needed (#5975)
+Bugfixes:
+ * OGRFeature::FillUnsetWithDefault(): do not set driver-specific default values on unset numeric fields
+ * OGR_SM_InitStyleString(): make it work with a @style_name argument (#5555)
+ * Fix loss of split/merge policy when cloning field domains
+ * OGRSQL: fix GetFeature() to return a feature such that GetFeature(fid).GetFID() == fid (#5967)
+ * OGRGeometry::UnionCascaded(): avoid crash with GEOS < 3.11 on empty multipolygon input
 
-SXF driver:
- * Fix SXF file version check (#5456)
- * Fix wrong Miller Cylindrical projection string
- * Fix encoding issues (#5647)
- * Fix extract z value to OGRGeometry
- * Fix case sensitivity of RSC file
+### OGRSpatialReference
 
-VFK driver:
- * recode also header values
- * process DKATUZE from header properly
- * handle also duplicated records
- * check attribute 'parametry_spojeni'
- * speed-up GetFeatureCount()
- * fix reading properties. Escape characters for SQL
- * change SRS from EPSG 2065 to 5514
- * fix reading SBP datablock (fix mismatch when reading from file and db)
+New features:
+ * Add a OGRSpatialReference::FindBestMatch() method
 
-VRT driver:
- * do not propagate ignoring of x and y cols of a PointFromColumns to the source layer (#5777)
- * add an optional 'name' attribute on FID element, so as to be able to force the report of a FID column name even if it is not exposed as a regular field (related to #5845)
- * handle optional <OpenOptions><OOI key='key'>value</OOI></OpenOptions> to specify open options
- * do not enable passthrough filtering if redefining <FID> (#6480)
+Enhancements:
+ * Warping/coordinate transformation performance improvements
+ * OSRGetProjTLSContext(): make it faster on Linux by saving getpid() system call
+ * OGRSpatialReference::SetFromUserInput(): allow using strings like EPSG:3157+4617 where the 'vertical CRS' is actually the geographic CRS, to mean ellipsoidal height, which is supported in recent PROJ versions
+ * Improve OGRCoordinateTransformation::TransformBounds error handling (#6081)
+ * OGRSpatialReference: evaluate OSR_DEFAULT_AXIS_MAPPING_STRATEGY config option at each object construction (#6084)
 
-Tiger driver:
- * Fix potential buffer underflow when providing /vsistdin/ to Tiger driver (#5567)
+Bugfixes:
+ * Avoid issues with PROJJSON with id in members of datum ensemble
+ * OGRSpatialReference::GetTargetLinearUnits(): fix getting linear units from a CompoundCRS of a LocalCS/EngineeringCS (#5890)
 
-WAsP driver:
- * added options and changed output precision to match WAsP Map Editor
- * improve TestCapability(ODsCCreateLayer)
+### Utilities
 
-WFS driver:
- * automatically enable paging if WFS 2.0 capabilities report paging support
- * evaluate SELECT with JOIN on server-side for a Join-capable WFS 2.0 server
- * add a TRUST_CAPABILITIES_BOUNDS open option, that can be set to YES to trust layer bounds declared in GetCapabilities response, for faster GetExtent() runtime (#4041)
- * add INVERT_AXIS_ORDER_IF_LAT_LONG, CONSIDER_EPSG_AS_URN and EXPOSE_GML_ID open options
- * add capability to use spatial functions ST_xxxxx() as server-side filters
- * add dataset and layer metadata
- * allow SELECT with several ORDER BY columns
- * report name of geometry column
- * Add COOKIE option (#5824)
- * when parsing a layer schema without geometry from the GML .xsd, do not expose a geometry field at the WFS layer level (#5834)
+New features:
+ * ogr2ogr: add -upsert option
 
-XLSX driver:
- * fix column numbering when there are more than 26 columns (#5774)
+Bugfixes:
+ * ogr2ogr: make sure geometry column name is going through laundering when outputting to PG/PGDump (#6261)
+ * ogr2ogr: take into account -limit when -progress is used
 
-XPlane driver:
- * add support for Taxi Location 1300 record found in V1000
+### Vector drivers
 
-## SWIG Language Bindings
+All drivers:
+ * Add some missing DCAP_VECTOR capabilities to drivers
 
-All bindings:
- * bind GDALGetBandDataset() as Band.GetDataset()
- * add Feature.GetFieldAsBinary()
+Arrow/Parquet drivers:
+ * implement faster SetAttributeFilter() for simpler filters.
+   Things like "col =/!=/>/>=/</<= constant", "col IS NULL", "col IS NOT NULL", possibly combined with AND.
 
-Java bindings:
- * Pass eRWFlag to allow both reading or writing.  Write was broken in DatasetRasterIO().
- * updates to generate maven artifacts
+CSV driver:
+ * make AUTODETECT_SIZE_LIMIT=0 open option to scan the whole file, including beyond 2 GB (for non-streaming input) (#5885)
+ * fix width autodetection
 
-Perl bindings:
- * The breaking changes are described in more detail in swig/perl/Changes-in-the-API-in-2.0.
- * More comprehensive use of strings as constants (such as capabilities); they are also taken from bindings, which added new ones, and not hard-coded.
- * New classes (e.g., VSIF, GeoTransform, GeomFieldDefn) and new methods (e.g., constant lists, Dataset::SpatialReference).
- * Much improved documentation and switch to Doxygen::Filter::Perl.
- * New test codes.
- * Errors are confessed with stack trace and often caught earlier with better messages.
- * Use of attributes is deprecated and methods have been added to replace them.
- * Multiple geometry fields have necessitated some changes in schema and field related methods.
- * More support for named parameters (i.e., hashes as arguments).
- * NoDataValue: set max float if undef is given.
- * Unit: set '' if undef is given.
- * Also other changes that will also remove some "use of uninitialized value in subroutine entry" warnings.
- * Automatic handling of SQL result layers.
- * Fix issue with index attribute for field meta data (schema) (#5662)
- * Warn if attempt to create non-integer column for colors.
- * Remove prefix GCP from GCP swig made attributes.
+DXF driver:
+ * Support files between 2 GB and 4 GB in size
+ * Prevent buffer from sometimes splitting CRLF newlines in MLEADER entities
 
-Python bindings:
- * add optional buf_xsize, buf_ysize and buf_type parameters to Dataset.ReadAsArray() and Dataset.LoadFile(), and use dataset RasterIO for better efficiency
- * avoid generating Python exception when PyString_FromStringAndSize() fails and GDAL errors as Python exceptions are disabled
- * Band.ReadRaster() and Dataset.ReadRaster(): clear the buffer in case there are holes in it due to odd spacings specified by the user
- * Fix hang of Python in case of repeated call to gdal/ogr.UseExceptions() and CE_Warning emitted (#5704)
- * for Python 2, accept unicode string as argument of Feature.SetField(idx_or_name, value) (#4608)
- * for Python 2, accept Unicode strings to be passed as key and/or value of the dictionary passed to SetMetadata() (#5833)
- * fix processing error of ogr_python.i with SWIG 3 (#5795)
- * NUMPY driver: avoid returning CE_None in GetGeoTransform() when there's no geotransform set (#5801)
- * Make GetFieldAsBinary() work with OFTString fields
- * For Python3 compat, make Feature.GetField() use GetFieldAsBinary() if GetFieldAsString() fails (#5811)
-
-# GDAL/OGR 1.11.0 Release Notes
+FlatGeoBuf driver:
+ * make CreateLayer() to fail if output file cannot be
+ created
 
-## In a nutshell...
+FileGDB driver:
+ * handle Shape_Area/Shape_Length fields on reading/writing
+ * avoid crash when reading layer with AliasName with XML special characters (issue with embedded libxml2 in SDK), and fallback to OpenFileGDB driver to reliably retrieve it (#5841)
+ * Report relationships
 
- * New GDAL drivers:
-    - KRO: read/write support for KRO KOKOR Raw format
- * New OGR drivers:
-    - CartoDB : read/write support
-    - GME (Google Map Engine) : read/write support
-    - GPKG (GeoPackage): read-write support (vector part of the spec.)
-    - OpenFileGDB: read-only support (no external dependency)
-    - SXF driver: read-only support
-    - WALK : read-only support
-    - WasP : read-write support
- * Significantly improved drivers: GML, LIBKML
- * RFC 40: enhanced RAT support (#5129)
- * RFC 41: multiple geometry fields support
- * RFC 42: OGR Layer laundered field lookup
- * RFC 43: add GDALMajorObject::GetMetadataDomainList() (#5275)
- * RFC 45: GDAL datasets and raster bands as virtual memory mapping
- * Upgrade to EPSG 8.2 database
+GeoJSONSeq driver:
+ * add support for appending features to an existing file (#2080)
 
-## New installed files
- * bin/ogrlineref
- * lib/pkgconfig/gdal.pc
- * gdalcompare.py
- * data/gml_registry.xml
- * data/inspire_cp_CadastralParcel.gfs
- * data/inspire_cp_BasicPropertyUnit.gfs
- * data/inspire_cp_CadastralBoundary.gfs
- * data/inspire_cp_CadastralZoning.gfs
- * data/ruian_vf_ob_v1.gfs
- * data/ruian_vf_st_v1.gfs
- * data/ogrvrt.xsd
+GML driver:
+ * make FORCE_SRS_DETECTION=YES open option work with multiple geometry columns (#6392)
+ * read <gml:description>, <gml:identifier>, <gml:name> fields in a feature (qgis/QGIS#42660)
+ * OGRMergeGeometryTypesEx(): do not consider different type of MultiGeometries (ie MultiPoint, MultiLineString, MultiPolygon) as being mergeable as GeometryCollections (#6616)
 
-## Backward compatibility issues
+GMLAS driver:
+ * be robust to GML schemas being pointed to a location different from http://schemas.ogc.net/
 
-## GDAL/OGR 1.11.0 - General Changes
+GPKG driver:
+ * Do not list layers referenced in gpkg_contents but that have no corresponding table (qgis/qgis#30670)
+ * Performance improvement in reading features
+ * Performance improvement in reading DateTime fields
+ * Performance improvement: do not request ignored fields
+ * Micro optimizations to improve CreateFeature() speed
+ * Performance improvement: implement background RTree creation in bulk insertion into a new table
+ * Implement a fast ST_Area() method
+ * optimization to remove bbox filtering when the spatial filter is larger than the layer extent
+ * remove code path specific to SQLite < 3.7.8 (PROJ requires SQLite >= 3.11)
+ * avoid integer overflow when trying to insert strings larger > 2 GB
+ * preliminary non-user-visible support for Related Tables Extension
+ * fix issue with ST_MakeValid() when the SQLite driver runs before GPKG on Alpine Linux
+ * Report relationships, through FOREIGN KEY constraints, and Related Tables extension.
+ * properly update gpkg_ogr_contents on INSERT OR REPLACE statements
+ * do not warn about http://ngageoint.github.io/GeoPackage/docs/extensions extensions in read-only mode
+ * Rename layer: take into account QGIS layer_styles extension
+ * add compatibility with GPKG 1.0 gpkg_data_column_constraints table
 
-Build(Unix):
- * add Unix configure support for SOSI
- * remove pointers to old ver of ingres library files
- * add --with-libjson-c configure option to build against external libjson-c (>= 0.11) (#4676)
- * compilation fixes for iOS (#5197, #5198)
- * update to autoconf 2.69
- * add pkg-config gdal.pc (#3470)
- * configure for FileGDB: add explicit linking to libfgdbunixrtl (requires FileGDB SDK >= 1.2) (#5215); also try .dylib extension (#5221)
- * fix so that Java installs are found on the MAC to enable the MDB driver (#5267)
- * fix compilation with recent MySQL versions (5.6 for example) (#5284)
- * support --with-jp2mrsid with standalone Kakadu with MRSID v8 or later
- * Fix parallel build in Python bindings (#5346)
- * PCIDSK: don't link against libjpeg if configured --without-jpeg
- * Update configure script to pick up ECW JP2 SDK 5.1 (#5390)
- * add a 'make install' target for the Java bindings  (#5424)
- * add Vagrant configuration
+GRIB driver:
+ * fix crash and invalid metadata when processing index .idx file with sub-messages (#6613)
 
-Build(Windows):
- * add option to generate VC project for x64 on makegdal_gen.bat
- * nmake.opt: add WITH_PDB=1 option to optionally generate .pdb file on Release builds (#5420)
- * add support for building the OGR SOSI driver as a plugin (#3638)
- * add support for building the HDF4 driver as plugin (#5294)
- * add support for MrSID v9
- * Remove makegdalXX.bat generated files
+HANA driver:
+ * pending batches are not flushed when layer is destroyed
+ * reset prepared statements when creating new field
+ * fix transaction support
+ * execute pending batches from other operations
+ * properly handle special characters in connection string
 
-## GDAL 1.11.0 - Overview of Changes
+LIBKML driver:
+ * writer: add automatic reprojection to EPSG:4326 (#6495)
 
-Port:
- * vsisubfile: fix Eof() behavior to be POSIX compliant, so that the shapefile reader can read the last feature when using /vsitar (#5093)
- * vsicache: fix for 32bit binaries when file size is over 2GB (#5170)
- * vsicache: add optional nChunkSize and nCacheSize parameters to VSICreateCachedFile()
- * vsicurl: add CPL_VSIL_CURL_USE_HEAD config option to disable use of CURL HEAD for other services like mapbox (likely lame python http implementations)
- * vsitar: avoid infinite loop in case of invalid .tar structure
- * vsizip: fix path separator in CPLFormFilename
- * vsizip: allow additional extensions listed in CPL_VSIL_ZIP_ALLOWED_EXTENSIONS config option.
- * vsizip: improve UTF-8 support of filenames inside ZIP file (#5361)
- * vsizip: fix ZIP64 support
- * vsigzip: reset EOF flag when doing a Seek() to be POSIX compliant
- * curl: add .netrc support
- * Windows CPLGetSymbol(): avoid dialog boxes to pop up when a DLL or one of its dependencies does not exist (#5211)
- * Add CPLOPrintf() and CPLOvPrintf() functions for easy CPLString formatting
- * CPLBase64DecodeInPlace() : fix to be robust to malformed base64 strings
- * CPLQuadTree: add CPLQuadTreeInsertWithBounds() where the pfnGetBounds is not needed.
- * CPLQuadTree: fix potential infinite recursion when inserting several points with identical coordinates in the mode with limited bucket size
- * Protect concurrent calls to setlocale() by a mutex (#5366)
+MITAB driver:
+ * implements writing Text objects for Point geometries with LABEL style string (#6149)
 
-Core:
- * RFC 45: GDAL datasets and raster bands as virtual memory mapping
- * GDALRasterBand::GetHistogram(): ignore nodata values (#4750, #5289)
- * allow auto loading of drivers to be disabled via config option
- * PAM .aux.xml and VRT: serialize Z component of a GCP as 'Z' attribute,
-   for consistency, instead of GCPZ that could not be read back previously.
-   In reading code, try reading 'Z' and if not found try 'GCPZ' (#5326)
- * JPEG2000: Add GDALGeorefPamDataset and GDALJP2AbstractDataset classes and use
-             them in JP2KAK, JP2ECW, JP2OpenJPEG, JPEG2000 and MrSID drivers so that PAM
-             georeferencing consistently overrides internal georeferencing
- * GDALDataset::IRasterIO(): don't use BlockBasedRasterIO() when INTERLEAVE=PIXEL if the request band count is just 1
- * CopyWholeRaster(): make default GDAL_SWATH_SIZE to 1/4 of GDAL_CACHEMAX instead of hard-coded value of 10 MB
- * don't report empty RAT on GDALGetDefaultRAT() (#5232)
- * modify GDALGCPsToGeotransform() to do the regression in normalized coordinates to make the math more stable.
- * expose new GDALComposeGeoTransforms() function.
- * GDALDefaultOverviews::HaveMaskFile(): avoid fetching .ovr file
- * JPEG2000: Fix reading georeferencing from some JPEG2000 files with duplicated GeoTIFF JP2Box (#5249)
- * Cleanup raster block mutex (#5296)
- * Driver registration: move JPEG2000 (Jasper based) after MrSID JPEG2000 support
+ODS driver:
+ * make it possible to open file without .ods extension if prefixed with ODS: (#6375)
 
-Algorithms:
- * warper: fix regression with lanczos resampling when yradius > xradius (#5058)
- * warper: Make GDALCreateGenImgProjTransformer2() and GDALCreateGenImgProjTransformer3() fail when the creation of the reprojection transformer fails
- * warper: Fix warping when input pixel size is too close to 0 (#5190)
- * warper: revise formula of cubic resampling kernel, and a few optimizations (#5209)
- * warper: added DST_METHOD and support for GCP and TPS dest
- * warper: add support for DST_METHOD=RPC
- * warper: fix mode and near resampling corner computation (#5311)
- * warper: GDALGenImgProjTransform(): don't set panSuccess[i] to 1 in the middle of the function, if an intermediate transform before has set the flag to 0
- * warper: fix cutline blending (#5343)
- * warper: Average/mode kernels: make them less sensitive to numerical precision issues (#5350)
- * warper: Average/mode kernels: avoid 'holes' when the source coordinates are in a reversed order from the target coordinates (#5433)
- * warper: provide prototypes and work around strict compiler requirements on some opencl platforms (#5400)
- * RPC: fix for computation of adfGTFromLL (#5395)
- * TPS: optimization for GCC x86_64 that make computation about twice faster with huge number of GCPs
- * TPS: when using Armadillo to solve the coefficients, use solve(A,B) instead of inv(A)xB to faster resolution
- * TPS: compute direct and inverse transformations in parallel when warping option NUM_THREADS or GDAL_NUM_THREADS config. options are set to > 1
- * Geoloc: fix wrong bilinear interpolation in GDALGeoLocTransform() (#5305)
- * Geoloc: fail transformation of coordinates that is located on a nodata place of the geoloc array
- * rasterize: preliminary support for MERGE_ALG=ADD for heatmaps
- * gdal_grid: Add AVX optimized version of GDALGridInverseDistanceToAPower2NoSmoothingNoSearch
- * fill_nodata: GDALFillNodata(): Fix use of uninitialized memory and integer overflows (#4010, #5203)
- * rpc: Fix out-of-bounds read in RPC dem cubic interpolation
+OpenFileGDB driver:
+ * Add write support
+ * handle Shape_Area/Shape_Length fields on reading
+ * fix use of indexes on strings when the searched value is longer than the max indexed string, or ending with space
+ * Report relationships
 
-Utilities:
- * gdalinfo: add -listmdd and -mdd all options (#5275)
- * gdal_translate: add a -exponent option to be used with -scale
- * gdal_translate: fix output file naming scheme in gdal_translate -sds (#5119)
- * gdal_translate: fix logic in detection non-gray color table level (#5245)
- * gdal_translate: add a -norat option
- * gdal_translate: don't add 0.1 when -scale is used with a dstmin equal to dstmax (useful to generate a raster with uniform color, i.e. scaleRatio = 0)
- * gdal_translate: use floor() to compute image coordinates from world coordinates when specifying -projwin (useful when extracting from left or top of upper-left corner, which generate negative image coordinates) (#5367)
- * gdaltindex: remove annoying warning 'Warning 1: Field location of width 255 truncated to 254' (#5121)
- * gdaltindex: add -src_srs_name and -src_srs_format to go with MapServer RFC100; add also a -f and -lyr_name options to be able to create a non-shapefile tileindex
- * gdalwarp: Fix segfault where metadata values were not being nullchecked properly during conflict resolution (#5069)
- * gdalwarp: honor -s_srs when using cutline (#5081)
- * gdalwarp: copy nodata values from source to dest if -dstnodata is not given ; add option to not set dest nodata with -dstnodata None (#5087)
- * gdalwarp: do not return a non-zero exit status for warnings
- * gdalwarp: prevent from copying statistics metadata (#5319)
- * gdal_rasterize: set the progress bar to 100% even when there's nothing to do
- * gdal_grid: add support for different types of geometries (#5341)
- * gdal_grid: add  -z_increase and -z_multiply options
- * gdaldem: check that value of -z, -s, -az and -alt is numeric
- * gdalbuildvrt: validate values of -srcnodata and -vrtnodata arguments
- * gdal2tiles.py: Corrected OpenLayers code to reflect fix to geodetic resolution factor
- * gdal2tiles.py: add --tmscompatible flag so as to produce 2 tiles at zoom level 0 in geodetic profile
- * rgb2pct.py: Use python tempfile logic to avoid permissions issues with cwd (#5079)
- * gdal_edit.py: add a -ro option for drivers refusing to use the dataset in update-mode.
- * gdal_calc.py: add --allBands options (#5388)
- * Add vsipreload.cpp that can be compiled as a shared library that can be LD_PRELOAD'ed as an overload of libc to enable VSI Virtual FILE API to be used with binaries using regular libc for I/O
- * Add the wcs_virtds_params.py sample utility to be able to set the MapServer WCS virtual dataset parameters from a tileindex with rasters of mixed SRS (linked to MapServer RFC100)
- * gdalcompare.py: move to scripts
- * gdalcompare.py: ensure image dimensions match
- * gdal_ls.py: Fix issue with UTF-8 characters
+Parquet driver:
+ * add basic support for reading partitionned datasets
+ * add CREATOR option
+ * do not write statistics for WKB geometry columns
+ * make sure 'geo' metadata is embedded in ARROW:schema so that partitioned reading works fine
+ * implement SetNextByIndex()
+ * make it honour GDAL_NUM_THREADS, and assume min(4, ALL_CPUS) as default value
 
-Multi driver changes:
- * JPEG2000 drivers: take into account PixelIsPoint in GeoJP2 boxes, and expose AREA_OR_POINT=Point (#5437)
- * JP2KAK, JP2ECW, JP2OpenJPEG, JPEG2000 CreateCopy(): take into account AREA_OR_POINT=Point if present to write GeoJP2 box (#5437)
+PG driver:
+ * make GEOM_TYPE layer creation option be taken into account by CreateGeomField() (instead of always assuming geometry)
 
-AAIGRID:
- * revert DECIMAL_PRECISION and add SIGNIFICANT_DIGITS to CreateCopy() (#3732)
+PGDump driver:
+ * avoid extraneous harmless spaces in CREATE TABLE statements
 
-AIGRID:
- * Turn off errors that can be triggered if the info has no VAT table related with this coverage (#3031)
+S57 driver:
+ * resource files: fix missing punctuation (#6000)
 
-BAG driver:
- * Recognise falseNorthing=10000000 as UTM South (#5152)
+Selafin driver:
+ * remove likely broken logic in handing /vsigzip/foo.gz filenames
 
-DIMAP driver:
- * fix memleak in error-code path
+SQLite driver:
+ * Report relationships, through FOREIGN KEY constraints
+ * SQLiteVFS: fix semantics of xOpen(SQLITE_OPEN_CREATE) that could cause to wrongly truncate an attached database
 
-DTED driver:
- * Speed optimization to be more friendly with CPU cache in GDAL_DTED_SINGLE_BLOCK=YES mode
+VFK driver:
+ * add support for UTF-8 (VFK 6.0 switched from ISO-8859-2 to UTF-8)
 
-ECW driver:
- * fix crash in GDALDeregister_ECW() with ECW SDK 5 called from GDALDestroy() (#5214)
- * fix issue with ECW_CLEVER optimization when nPixelSpace != sizeof eBufDataType (#5262)
+XLSX driver:
+ * make it possible to open file without .xlsx extension if prefixed with XLSX: (#6375)
+ * improve detection to recognize even if no XLSX: prefix or .xlsx extension
 
-Envisat driver:
- * implement more reliable way of extracting GCPs from Meris tie-points (#5423)
- * add DEM corrections of TP-ADS products when present (#5423)
- * workaround dateline discontinuity in GCPs so they can be used with GDAL warping transformers (#5423)
+## SWIG Language Bindings
 
-ERS driver:
- * fix wrong interpretation of RegistrationCellX/RegistrationCellY (#2612, #3056, #5075)
+All bindings:
+ * Add SWIG bindings for OGR_L_AlterGeomFieldDefn()
+ * fix SpatialReference.GetLinearUnitsName() to use OSRGetLinearUnits() to retrieve the name
+ * add SpatialReference.StripVertical()
+ * Create alias versions with/without GDAL_ prefix for c#/java constants
+ * add inverseCT optional parameter to CoordinateOperation.SetOperation(), and add CoordinateOperation.GetInverse()
+ * make Band.ComputeStatistics() kwargs
+ * add options argument to Dataset.BuildOverviews()
+ * fix GDT_TypeCount value (affects C# and Java bindings)
 
-GeoRaster driver:
- * fix RPC support (#4038)
- * fix read error when reading from pyramids (#5076)
- * make regular table and secure file a default for RDT (#5127)
- * fix error when reading NBIT pyramid levels (#5199)
- * show the VAT as RAT (#5200)
- * fix reading and writing of statistics metadata (#5237)
- * add generate pyramid create options (#5288)
- * fix incorrect geotransform interpretation when there is no SRS (#5323)
+Python bindings:
+ * bindings for Arrow Batch functionality
+ * add numpy to extras_require option of setup.py
+ * add an optional can_return_none=True parameter to Band.ComputeRasteMinMax() to make it return None in case of error. Otherwise, return (nan, nan) (#6300)
 
-GRASS driver:
- * fix compilation issues for GRASS 7
+# GDAL/OGR 3.6.4 Release Notes
 
-GRIB driver:
- * display temperature unit as deg Celsius in metadata (#3606)
+GDAL 3.6.4 is a bugfix release.
 
-GTiff driver:
- * when compiling against internal libtiff, in read-only mode, optimization to
-   avoid fetching the whole Strip/TileCounts and Strip/TileOffsets arrays
- * add validation of source overview characteristics with COPY_SRC_OVERVIEWS (#5059)
- * convert invalid TIFFTAG_RESOLUTIONUNIT=0 to 1(Unknown) (#5069)
- * fix potential issues in gt_citation.cpp / CheckUTM()
- * upgrade internal libtiff to latest CVS
- * implement reading and writing of ICC profiles (#5246)
- * make SetColorInterpretation() round-trip with GetColorInterpretation();
-   read color interpretation from PAM if it exists (overrides internal tiff color interpretation);
-   set TIFFTAG_PHOTOMETRIC=PHOTOMETRIC_RGB if calling SetColorInterpretation() with R,G,B and no explicit PHOTOMETRIC creation option defined
- * gt_wkt_srs.cpp: fix compilation with external libgeotiff. The file is dependent of quite a few CPL stuff, don't try to pretend otherwise
- * implement GetVirtualMemAuto() for some formulations of TIFF files (RFC 45)
- * fix reading a single-strip TIFF file where the single strip is bigger than 2GB (32bit builds only) (#5403)
- * look for .tab file before .wld/.tfw
+## GDAL 3.6.4
 
-GTX driver:
- * Add nodata support (#4660)
+### Port
 
-HDF4 driver:
- * Skip "SceneLineNumber" table if present in the list of geolocation fields of
-   ASTER L1A dataset.
+* userfaultfd: avoid it to stall on 32bit and test real working of syscall in
+  CPLIsUserFaultMappingSupported()
 
-HDF5 driver:
- * add support for ODIM H5 georeferencing method (#5032)
- * set SRS GEOGCS in all cases (reverts r25801 and closes #4160)
- * support HDF5 NATIVE_SCHAR type, subdatsets without PAM (#5088)
- * release all opened handles so the file is closed at dataset closing (#5103)
- * better deal with dimensions of CSK-L1A HDF5 subdatasets (#4227)
- * avoid segmentation fault when H5Sget_simple_extent_ndims() returns negative value (#5291)
+### Core
 
-HFA driver:
- * add minimally tested support for u2 and u4 data in basedata
- * use direct binning for thematic layers and real instead of integer for values (#5066)
- * add a HFA_COMPRESS_OVR config option to select whether to create compressed overviews (#4866)
- * fix rewriting of statistics in existing HFA file where base data value is 8-bit (#5175)
- * implement re-writing existing histogram in HFA file, after raster editing (#5176)
- * avoid segfaults when creating a Imagine dataset with an invalid WKT (#5258)
- * expose color columns in RAT as Integer with values in range [0-255] instead of Real with values [0-1] (#5362)
- * report histogram column as GFU_PixelCount instead of GFU_Generic (#5359)
- * ensure histogram column written as float for HFA when using RAT API (#5382)
+* RawRasterBand::FlushCache(): avoid crash in some situations
+* RawRasterBand::IRasterIO(): fix wrong byte swapping in Direct IO multiline
+  writing code path
+* RawRasterBand::IRasterIO(): fix optimized code path that wrongly triggered
+  on BIL layout
+* RawRasterBand::IRasterIO(): avoid reading and writing too many bytes
+* RawRasterBand::IRasterIO(): fix floating-point issues with ICC that could
+  result in wrong lines/cols being read/written
 
-Idrisi driver:
- * Improve coordinate system handling and min/max statistics (#4980)
+### Algorithms
 
-IRIS driver:
- * add height information on bands; rename dataset metadata item CAPPI_HEIGHT --> CAPPI_BOTTOM_HEIGHT (#5104)
- * IRIS: add support for two bytes data (#5431)
+* Rasterize all touched: tighten(decrease) the tolerance to consider that edge
+  of geometries match pixel obundaries (#7523)
 
-JP2ECW driver:
- * fix problem with JP2 write with SDK v5
- * fix issue with ECW_CLEVER optimization when nPixelSpace != sizeof eBufDataType (#5262)
- * avoid writing dummy GeoJP2 box when source dataset has no georeferencing (#5306)
+### Utilities
 
-JP2KAK driver:
- * preliminary support for Kakadu V7.x
- * fix creation of unsigned int16 with reversible compression (#4050)
- * on Windows, use VSI cache for I/O by default, instead Kakadu own I/O layer
- * remove extension from 12bit to 16bit (#5328)
+* gdal_translate: fix crash when specifying -ovr on a dataset that has no
+  overviews (#7376)
+* gdalcompare.py: correctly take into account NaN nodata value (#7394)
+* gdal2xyz.py: fix -srcnodata and -dstnodata options (#7410)
+* gdal2tiles: update 'ol-layerswitcher' widget to v4.1.1 (#7544)
 
-JP2OpenJPEG driver:
- * avoid 'Empty SOT marker detected: Psot=12.' warning to be repeated several times
- * add support for encoding GCPs in a GeoJP2 box (#5279)
- * avoid writing dummy GeoJP2 box when source dataset has no georeferencing (#5306)
+### Raster drivers
 
-JPEG driver:
- * add autodetection of bitmasks that are msb ordered (#5102)
- * avoid memory leak when GDALOpen'ing() a JPEG through a http:// URL, and make it possible to access its overviews
- * return YCbCrK raw data for YCbCrK JPEG in GDAL_JPEG_TO_RGB = NO mode (instead of CMYK as before) (#5097)
- * implement reading and writing of ICC profiles (#5246)
- * internal libjpeg: apply patch for CVE-2013-6629
- * allow fallback to PAM to read GCPs
- * give priority to PAM GeoTransform if it exists and other source of geotransform (.wld, .tab) also exists (#5352)
+GTiff driver:
+ * correctly read GCPs from ArcGIS 9 .aux.xml when TIFFTAG_RESOLUTIONUNIT=3
+  (pixels/cm) (#7484)
 
-KMLSuperOverlay driver:
- * recognize an alternate structure for raster KMZ file made of a single doc.kml
-    and tiles whose name pattern is kml_image_L{level}_{j}_{i}.{png|jpg}
- * fix horrible speed performance in Open() (#5094)
- * fix crash at dataset closing and inability to read some big PNG tiles (#5154)
- * fix to generate files validating against OGC KML 2.2 schema
- * put Style into conformity with ATC 7
- * remove Region in root KML (ATC 41)
- * add NAME and DESCRIPTION creation options; read them back as metadata
- * add ALTITUDE and ALTITUDEMODE creation options
- * directly write into .kmz file (instead of in temporary location)
- * correctly write directories entry in .kmz file
- * add progress callback
-
-L1B driver:
- * report correct values for GCP (#2403)
- * report more GCPS than before
- * implement geolocation array
- * add fetching of record metadata in .csv file
- * add subdatasets with solar zenith angles, cloud coverage
- * recognize NOAA-9/14 datasets whose dataset name in TBM header is encoded in EBCDIC and not in ASCII (#2848)
- * support opening a few NOAA <= 9 datasets that have no dataset name in the TBM header
+HDF5 driver:
+ * fix detecting if HDF5 library is thread-safe (refs #7340)
 
 LCP driver:
- * better handling of projections (#3255)
- * add CreateCopy() (#5172)
-
-MBTiles driver:
- * add write support
- * avoid failure when there's no tile at the center of the maximum zoom level (#5278)
- * add capability to open /vsicurl/https:// signed AWS S3 URLs
-
-MEM driver:
- * Create(): use calloc() instead of malloc()+memset() for faster creation of huge in-memory datasets
+ * CreateCopy(): fix crash on negative pixel values (#7561)
 
-NetCDF driver:
- * fix to read netcdf-4 files with UBYTE data (#5053)
- * fix reading large netcdf-4 files with chunking and DEFLATE compression
- * fix netcdf chunking when creating file with > 2 dims ; add CHUNKING creation option (#5082 )
- * fix duplicate nodata metadata when using CreateCopy() (#5084)
- * fix copying large metadata in netcdf driver (#5113)
- * fix netcdf geotransform detection (#5114)
- * fix netcdf driver irregular grids management (#5118 and #4513)
- * only call nc_close on a valid netcdf id when closing dataset
- * try and identify .grd (and .nc3) files in netcdf-4 format (#5291), so they are identified before the hdf5 driver
-
-NITF driver:
- * fix to support reading horizontal and/or vertical mono-block uncompressed images, even when the number of columns is <= 8192 (#3263)
- * update NITF Series list with new entries from MIL-STD-2411_1_CHG-3.pdf (#5353)
- * allow JP2KAK to be used as the JPEG2000 compression engine in the CreateCopy() case (#5386)
-
-PDF driver:
- * Avoid reporting a Poppler error as a GDAL error on some newer USGS GeoPDF files (#5201)
- * PDF writing: automatically adjust DPI in case the page dimension exceeds the 14400 maximum value (in user units) allowed by Acrobat (#5412)
+MRF driver:
+ * restore SetSpatialRef() that was wrongly deleted in 3.6.0
 
-PDS driver:
- * Parse correctly MISSING_CONSTANT = 16#FF7FFFFB# as a IEEE754 single precision float expressed in hexadecimal; add support for ENCODING_TYPE = ZIP (data file compressed in a ZIP); recognize IMAGE_MAP_PROJECTION as an object included in UNCOMPRESSED_FILE object (#3939)
+netCDF driver:
+ * restore capability of reading CF-1.6-featureType vector layers even if the
+   conventions >= CF 1.8, and improve featureType=trajectory by adding the
+   time attribute (fixes #7550)
 
-PNG driver:
- * Implement reading and writing of ICC profiles (#5246)
+## OGR 3.6.4
 
-PostgisRaster driver:
- * Speed-up dataset opening (#5046).
- * Multi-tile multi-band caching added.
- * Smarter use of the information advertized in raster_columns view.
- * Avoid full table scan in situations without PKID/GIST indices.
- * Use of quadtree.
-
-Rasdaman driver:
- * caching of tiles for datasets with more than one band (#5298)
- * connections are now kept for a whole session (#5298)
- * fixing connection-string regex (#5298)
- * fixing possible memory leaks (#5298)
-
-Rasterlite driver:
- * fix resolution check typo in rasterlite driver
-
-Raw drivers:
- * implement GetVirtualMemAuto() (RFC 45)
- * IRasterIO(): add special behavior to avoid going to block based IO when the dataset has INTERLEAVE=PIXEL and is eligible to direct I/O access pattern
- * allow direct I/O access even if a small proportion of scanlines are loaded (improve QGIS use case where the overview display will load sparse scanlines, which would prevent direct I/O at full resolution afterwards)
- * fix optimized RasterIO() when doing sub-sampling with non standard buffer pixel offset (#5438)
+### Core
 
-RMF driver:
- * fix decompression of 24-bit RMF DEM (#5268)
+* OGRSQL: fix 'SELECT ... WHERE ... AND ... AND ... AND ... UNION ALL ...'
+  (#3395)
+* OGRUnionLayer::GetExtent(): do not emit error on no-geometry layer
+* OGREditableLayer::IUpsertFeature(): fix memleak
 
-RPFTOC driver:
- * fix potential crash on some datasets when selecting the color palette (#5345)
+### OGRSpatialReference
 
-SAGA driver:
- * add read/write support for .prj files (#5316)
+* Fix OGRSpatialReference::SetProjCS() on an existing BoundCRS;
+  affects GeoTIFF SRS reader (fixes gdal-dev/2023-March/057011.html)
 
-SRP driver:
- * read TRANSH01.THF file to establish subdatasets (#5297)
+### Utilities
 
-VRT driver:
- * Implement non-linear scaling with a power function (addition of Exponent, SrcMin, SrcMax, DstMin, DstMax sub-elements in <ComplexSource>)
- * Preserve 64bit integer image offsets (#5086)
- * Make sure that VRTSourcedRasterBand::AddMaskBandSource() takes into account specified window (#5120)
- * Make GDALAutoCreateWarpedVRT() return NULL when GDALSuggestedWarpOutput() fails
- * VRTDataset::IRasterIO(): use source DatasetRasterIO even if band count is 1
- * VRTWarped: avoid setting up relative paths for things that aren't file-like
- * make relativeToVRT=1 work with NITF_IM:, NETCDF:, HDF5:, RASTERLITE:
+* ogr2ogr: fix and automate conversion from list types to String(JSON) when the
+  output driver doesn't support list types but String(JSON) (#7397)
 
-WCS driver:
- * ensure C locale is enforced before parsing floating point values
+### Vector drivers
 
-WMS driver:
- * accept 'WMS:http://server/?SRS=EPSG:XXXX' syntax to select the preferred SRS in which to fetch layers
- * CPLHTTPFetchMulti(): avoid doing a timeout-only select when there are no file descriptor to wait on (can happen when doing a file:// URL)
- * allow cache location to be specified with GDAL_DEFAULT_WMS_CACHE_PATH configuration option if not provided in the XML (#4540)
- * Update to be able to understand slight changes in formatting of JSon output of ArcGIS mapserver protocol
+CSV driver:
+ * CSVSplitLine(): do not treat in a special way double quotes that appear in
+   the middle of a field
 
-XYZ driver:
- * accept datasets that have missing values at beginning and/or end of lines, such as MNT250_L93_FRANCE.XYZ
- * fix detection when there are only integral values with comma field separator
- * reopen with 'rb' flags for Windows happyness
+FlatGeobuf driver:
+ * improve handling of null geoms (#7483)
 
-## OGR 1.11.0 - Overview of Changes
+GeoPackage driver:
+ * Update definition of gpkg_data_columns to remove unique constraint on "name"
 
-Core:
- * GEOS support: require GEOS >= 3.1.0 and use the _r API of GEOS to avoid issues with the global GEOS error handlers
- * exportToWkb(): ISO WKB generation with wkbVariant option (#5330)
- * geocoding: when getting several answers from server for a query, report geometries on second, third, etc.. feature, and not only first one (#5057)
- * allow auto loading of drivers to be disabled via config option
- * remove obsolete OGRGeometryFactory::getGEOSGeometryFactory()
- * OGRGeometryFactory::organizePolygons() in DEFAULT method: fix a case with 2 outer rings that are touching by the first point of the smallest one
- * OGRGeometryFactory::organizePolygons(): optimization in ONLY_CCW case
- * OGRGeometryFactory::organizePolygons(): Add an experimental mode : CCW_INNER_JUST_AFTER_CW_OUTER
- * OGRLineString::segmentize() : do not set 0 as z for interpolated points, but the z from the previous point
- * OGRLineString::setNumPoints(): add an optional argument to avoid zeroing the arrays
- * Add OGRLineString::setZ()
- * Add OGRLineString::Project() and OGRLineString::getSubline()
- * OGRPolygon: add stealExteriorRing() and stealInteriorRing(int iRing)
- * OGRLinearRing::isClockwise(): optimizations and make it work in a degenerated case when a vertex is used several times in the vertex list (#5342)
- * OGRLinearRing::isPointOnRingBoundary() : optimizations and take into account bTestEnvelope
- * Add OGR_G_SetPointCount and OGR_G_SetPoints functions to API C (#5357)
- * OGREnvelope3D::Contains(): fix incorrect test
- * Layer algebra: fix handling of method field mapping to output fields when output fields are precreated (#5089)
- * Layer algebra: when an error condition is skipped, call CPLErrorReset() (#5269)
- * OGRLayer::GetFeature(): make sure that the behavior is not influenced by
-   attribute or spatial filters in the generic implementation;
-   upgrade OGDI, PG, MySQL, MSSQLSpatial, OCI, SDE, PGeo, ODBC, WALK, IDB, SQLite and Ingres driver  (#5309)
- * introduce OGRLayer::FindFieldIndex() / OGR_L_FindFieldIndex() to lookup potentially laundered field names (RFC 42)
- * OGR SQL: upgrade to support RFC 41 (multiple geometry fields)
- * OGR SQL: more stricter checks
- * OGR SQL: make parsing error report a useful hint where the syntax error occurred
- * OGR SQL: fix thread-safety of swq_op_registrar::GetOperator() (#5196)
- * OGR SQL: support not explicitly specifying AS keyword for aliasing a column spec
- * OGR SQL: don't call CONCAT(a_column ...) or SUBSTR(a_column ...) as a_column
- * OGR SQL: validate that arguments of MAX, MIN, AVG, SUM, COUNT are columns and not any expression since this is not supported
- * OGR SQL: make AVG field definition a OFTReal
- * OGR SQL: implement MIN(), MAX() and AVG() on a date (#5333)
- * OGR SQL: fix SELECT * on a layer with a field that has a dot character (#5379)
- * SQL SQLITE dialect: Make it available to all OGR drivers that have a specialized ExecuteSQL() implementation
+OpenFileGDB driver:
+ * fix write corruption when re-using freespace slots in some editing scenarios
+   (#7504)
+ * relax test to detect broken .spx
+ * CreateField(): in approxOK mode, do not error out if default value of a
+   DateTime field is CURRENT_TIMESTAMP, just ignore it with a warning (#7589)
 
-OGRSpatialReference:
- * Upgrade to EPSG 8.2 database
- * identify LCC_2SP instead of LCC_1SP if lat_0==lat_1 and lat_2 is present (#5191)
- * add a variety of linear units to proj4 parsing (#5370)
- * Fix crash in CleanupESRIDatumMappingTable() if it is called twice (#5090)
- * fix order of AXIS and UNIT nodes in a VERT_CS node (#5105)
- * ecw_cs.wkt: add missing TOWGS84[-168,-60,320,0,0,0,0] to NTF datum (#5145)
- * fix OGRSpatialReference::importFromProj4() to work with non-C locale (#5147)
- * morph central_latitude to latitude_of_origin in morphFromESRI() (#3191)
- * OGRProj4CT: avoid using proj when the 2 projections are actually identical (#5188)
- * add sanity checks in OGR_SRSNode::importFromWkt() (#5193)
- * VERT_CS: when importing from proj.4 put AXIS node after UNIT; COMPD_CS: when importing from EPSG:x+y, set a more meaningful name for the COMPD_CS node
- * OGRSpatialReference::Validate() : in addition to hand-validation, use WKT grammar from OGC 01-009 CT
- * preserve authority when importing +init=auth_name:auth_code (e.g. +init=IGNF:LAMB93)
+OSM driver:
+ * Fix handling of closed_ways_are_polygons setting in osmconf.ini (#7488)
 
-Utilities:
- * ogrlineref: new utility to deal with linear geometries.
- * ogrinfo: upgrade to support RFC 41 (multiple geometry fields)
- * ogr2ogr: upgrade to support RFC 41 (multiple geometry fields)
- * ogr2ogr: bump default value for -gt from 200 to 20000 (#5391)
- * ogr2ogr: add -addfields option to add new fields found in a source layer into an existing layer ; add -unsetFieldWidth option to unset field with and precision; add -dim layer_dim option to force the coordinate dimension of geometries to match the one of the layer geometry type
- * ogr2ogr: Check that -t_srs is also specified when -s_srs is specified
- * ogr2ogr: add an explicit error message to report FID of feature that couldn't be inserted when CreateFeature() fails
- * ogr2ogr: make relaxed lookup optional and add a switch -relaxedFieldNameMatch to allow it (RFC 42)
- * ogr2ogr: make sure that the progress bar reaches 100% when converting OSM
- * ogr2ogr: make sure that target dataset is properly closed when a CreateFeature() fails (so that truncated shapefiles have their header file properly updated)
- * ogr_dispatch.py: Sample Python script to dispatch features into layers according to the value of some fields or the geometry type
- * ogrinfo.py: sync with ogrinfo (RFC 41)
- * ogr2ogr.py: port -nlt PROMOTE_TO_MULTI option from ogr2ogr.cpp (#5139)
+S57 driver:
+ * s57objectclasses.csv: apply S-57 Edition 3.1 Supplement No. 2
 
-CSV driver:
- * avoid erroneously reset of file content when opening in update mode a file without header (#5161)
- * upgrade to support RFC 41 in read/write (multiple geometry fields)
- * allow backslash doublequote to load (#5318)
+SQLite driver:
+ * GDAL as a SQLite3 loadable extension: avoid crash on Linux
 
-DGN driver:
- * DGN writing: added polygon inner ring (holes) writing and MSLink writing (#5381)
+# GDAL/OGR 3.6.3 Release Notes
 
-DXF driver:
- * fix writing of 25D linestring where z is not constant (#5210)
- * fix writing of POLYLINE objects (#5217, #5210)
- * accept reading files starting with a TABLES section (#5307)
- * support reading 3DFACE and SOLID (#5380) entities
- * fix an error when processing clockwise circle arc (#5182)
- * avoid building an invalid polygon when edges cannot be reassembled: turn it into a multilinestring
- * use CPLAtof() instead of atof() to avoid issues with locales
- * fix linear approximation of circular and elliptic arc in HATCH boundaries (#5182)
+GDAL 3.6.3 is a bugfix release.
 
-DWG driver:
- * add support for reading AcDb3dPolyline (#5260)
- * fix linear approximation of circular and elliptic arc in HATCH boundaries (#5182)
+## Build
 
-FileGDB driver:
- * implement IgnoreFields API to speed-up a bit the conversion of a sub-set of fields when there's a huge amount of them (e.g. Tiger database).
- * when writing <Length> of an attribute, use size in bytes (#5192)
- * implement ref counting of the FileGDB SDK API' Geodatabase* object to avoid issues on Linux 64bit with interleaved opening and closing of databases (#4270)
- * honour update flag to determine which operations are allowed or not
- * add a driver global mutex to protect all calls as the FileGDB API SDK is not thread-safe at all
- * add a COLUMN_TYPES layer creation option to override default column types; support reading/writing XML column types
- * optimize GetFeatureCount() and GetExtent() when there are filters set
- * set the default width for string fields to 65536.
-   The width can be configured with the FGDB_STRING_WIDTH configuration option
- * fix creation and writing of Binary fields; enable reading
- * add a CREATE_MULTIPATCH creation option
-
-FME driver:
- * fix Linux compilation
+* CMake: Fix integration of find_package2()
+* CMake: avoid HDF4 CMake error with Windows paths with spaces
+* CMake: quote variables for INTERFACE_INCLUDE_DIRECTORIES / IMPORTED_LOCATION
+* CMake: fix wrong test when GDAL_SET_INSTALL_RELATIVE_RPATH is set
+* CMake: issue an error when the user explicitly asks for a condition-dependent
+  driver and the condition is not met
+* CMake: add include to FindSQLite3.cmake
+* fix uclibc build without NPTL
+* zlib: Add ZLIB_IS_STATIC build option
+* FindCryptoPP.cmake: properly take into account _LIBRARY_RELEASE/_DEBUG (#7338)
+* FindPoppler.cmake: check that Poppler private headers are available (#7352)
 
-GeoJSON driver:
- * recognize alternate formats such as the ones of https://code.google.com/p/election-maps/
- * add read support for TopoJSON
- * upgrade internal libjson-c to json-c 0.11 (#4676)
- * report integer values that are int64 as strings
- * add 3d support to esri geojson reader (#5219)
- * be less strict on looking for esri field type tag (#5219)
- * fix sometimes incorrect result (significant digit lost...) when using -lco COORDINATE_PRECISION=0
- * fix handling of huge coordinates when writing (#5377)
+## GDAL 3.6.3
 
-GeoRSS driver:
- * advertise OLCCreateField capability
+### Port
 
-GFT driver:
- * switch http to https for the oauth2 link to improve security
+* CPLGetPhysicalRAM(): take into account current cgroup (v1 and v2)
+* CPLGetPhysicalRAM(): take into account MemTotal limit from /proc/meminfo
+* /vsicurl/: fix CPL_VSIL_CURL_USE_HEAD=NO mode (#7150)
+* Avoid use of deprecated ZSTD_getDecompressedSize() function with libzstd 1.3+
+* cpl_vsil_crypt.cpp: fix build isse on Windows (#7304)
 
-GML driver:
- * add support for multiple geometry columns (RFC 41)
- * add support for reading Finnish National Land Survey Topographic data (MTK GML)
- * add support for support Finnish NLS cadastral data and Inspire cadastral data.
- * add support for Czech RUIAN VFR format
- * add data/gml_registry.xml file to associate feature types with schemas.
- * extend .gfs syntax to be able to fetch OGR fields from XML attributes.
- * extend .gfs syntax to support multiple geometry columns, and define a geometry property name
- * autodiscover all XML attributes as OGR fields when creating .gfs file if GML_ATTRIBUTES_TO_OGR_FIELDS is set to YES (#5418)
- * allow the <ElementPath> in .gfs to have several components that give the full XML path
- * fix writing of .xsd file to avoid fid/gml_id being written as regular fields (#5142)
- * fix writing of global srsName attribute on the global boundedBy.Envelope when all layers have same SRS (#5143)
- * support for writing .gml/.xsd with fields of type StringList, RealList, IntegerList and support for parsing such .xsd files
- * when writing .xsd for a datasource that has fields of type StringList, RealList or IntegerList, advertise SF-1 profile in the .XSD schema
- * recognize xsd:boolean in XSD parsing and map it to String (#5384)
- * add STRIP_PREFIX and WRITE_FEATURE_BOUNDED_BY dataset creation option to help minimizing the size of GML files
- * don't write top <gml:boundedBy> in GML files with multiple layers of different SRS
- * fix segfault when reading a GML file with huge coordinates (#5148)
- * avoid opening our own .xsd files as valid datasources (#5149)
- * make driver thread-safe with Xerces
- * open successfully GML datasources with 0 layers (#249, #5205)
- * fix tweaking of DescribeFeatureType requests
- * support reading WFS 2.0 GetFeature documents with wfs:FeatureCollection as a wfs:member of the top wfs:FeatureCollection
- * fix for crash on certain xlink:href with GML_SKIP_RESOLVE_ELEMS=NONE (#5417)
- * GML geometry: fix duplicated points in GML_FACE_HOLE_NEGATIVE=YES mode (TopoSurface) (#5230)
- * GML geometry: accept CompositeSurface as a child of surfaceMembers (#5369)
- * GML geometry: join multilinestrings to linestrings in rings
- * GML geometry: correctly deal with MultiSurface of Surface of PolygonPatch where a PolygonPatch has only interior ring(s) and no exterior ring (#5421)
- * GML geometry: accept formulations of 'MULTIPOINT EMPTY, MULTILINESTRING EMPTY, MULTIPOLYGON EMPTY and GEOMETRYCOLLECTION EMPTY that are valid GML 3 (and accepted by PostGIS)
- * GML geometry: make use of cs, ts and decimal attributes of (deprecated) gml:coordinates element
- * GML geometry: accept XML header and comments
+### Algorithms
 
-GPX driver:
- * advertise OLCCreateField capability
+* GDALPolygonizeT(): add sanity check
+* GDALRasterPolygonEnumeratorT::NewPolygon(): check memory allocation to avoid
+  crash (#7027)
+* Warper: do not use OpenCL code path when pafUnifiedSrcDensity is not null
+  (#7192)
+* Warper: optimize a bit when warping a chunk fully within the cutline
+* Geoloc inverse transformer: fix numeric instability when quadrilaterals are
+  degenerate to triangles (#7302)
 
-ILI driver:
- * add support for multiple geometry columns (RFC 41)
- * use IlisMeta model reader/writer instead of IOM
- * add layers for surface and area geometries
+### Core
 
-KML driver:
- * output KML that validates the ogckml22.xsd schema by placing <Schema> elements under the <Document> level (#5068)
- * in writing mode, avoid defining an extending schema for the name and description fields (related to #5208)
+* GDALProxyPoolRasterBand::FlushCache(): fix for ref counting when calling
+  FlushCache() on GDALProxyPoolMaskBand or GDALProxyPoolOverviewRasterBand
+* VirtualMem: Fix mremap() detection with clang 15, and disable
+  HAVE_VIRTUAL_MEM_VMA if HAVE_5ARGS_MREMAP not found
 
-LIBKML driver:
- * various checks, fixes and improvements related to OGC KML 2.2 Abstract Test Suite
- * add support for reading <gx:Track> as a LINESTRING (#5095)
- * add support for writing and reading <snippet>
- * add support for writing atom:author, atom:link, phonenumber, Region,
-   ScreenOverlay, 3D model, StyleMap
- * add support for reading and generating Camera object
- * add layer creation options to generate a LookAt element at layer level
- * if UPDATE_TARGETHREF dataset creation option is defined, a NetworkLinkControl/Update document will be created
- * add dataset creation options to generate a NetworkLinkControl element
- * add dataset and layer creation options LISTSTYLE_ICON_HREF and LISTSTYLE_TYPE
- * add support for writing a NetworkLink
- * add support for creating PhotoOverlay objects
- * add support for creating BalloonStyle elements
- * offer LIBKML_USE_SIMPLEFIELD configuration option can be set to NO to use Data element instead of SimpleField
- * add layer creation option FOLDER to optionally write layers as Folder instead of Document
- * add dataset and layer creation options NAME, VISIBILITY, OPEN, SNIPPET and DESCRIPTION
- * workaround bugs in pretty serializers
- * when writing a .kmz file, put layers .kml docs into a layers/ subdirectory
- * fix mem leaks, and use after free in kml2FeatureDef() (#5240)
- * create document with default namespace set to http://www.opengis.net/kml/2.2
- * when writing, consider empty strings as unset (useful when converting from CSV)
- * don't write empty <Style /> element if OGR_STYLE is empty string
- * transform multigeometry with one single component into single geometry
- * create libkml/ subdirectory entry in .kmz
+### Utilities
 
-MITAB driver:
- * support reading MIF file with no associated MID file (when MIF file advertises 'Columns 0') (#5141)
+* gdal_translate: make -colorinterp work on a source band that is a mask band
+* gdalmdimtranslate: do not require VRT driver to be registered (#7021)
+* gdalmdimtranslate: fix subsetting in the situation of dataset of #7199
+* gdalwarp: fix vshift mode when vertical unit of dstSrs is non-metric
+* gdalwarp: overview choice: fix longitude wrap problem (#7019)
+* gdalwarp: allow up to inaccuracy in cropline coordinates up to 0.1% of a
+  pixel size for rounding (#7226)
+* gdalsrsinfo: fix crash on 'gdalsrsinfo IAU:2015:49902 -o xml'
+* gdal_retile.py: fix wrong basename for .aux.xml files (#7120)
+* gdallocationinfo: fix issue with VRTComplexSource and nodata (#7183)
+* gdal_rasterize: ignore features whose Z attribute is null/unset (#7241)
 
-MSSQLSpatial driver:
- * Fix MSSQL to be aware of removed tables (#5071)
- * Eliminate the per table server access when identifying the spatial reference (#5072)
- * Improve detection of geometry column with MSSQL select layer (#4318)
- * Fix for an issue with multicolumn primary keys (#5155)
- * Add support for handling non spatial data tables (#5155)
- * Fix creation of spatial_ref_sys and geometry_columns tables (#5339)
+### Raster drivers
 
-MySQL:
- * robustness for huge coordinates in spatial filter
+BMP driver:
+ * Make sure file is created at proper size if only calling Create() without
+   writing pixels (#7025)
+ * Create(): add checks and warnings for maximum dimensions
 
-NAS driver:
- * also accept XML files that have NAS-Operationen_optional.xsd in header
- * make driver thread-safe with Xerces
- * warn when geometry cannot be saved
+COG driver:
+ * avoid warning message when using -co COMPRESS=WEBP -co QUALITY=100 (#7153)
 
-OCI driver:
- * fix make plugin option
+DIMAP driver:
+ * optimize performance of dataset RasterIO()
 
-ODBC driver:
+GRIB driver:
+ * fix reading South Polar Stereographic from GRIB1 datasets (#7298)
+ * degrib: replace use of sprintf() with snprintf()
 
-OSM driver:
- * support relations with more than 2000 members in a OSM XML file (#5055)
- * make the driver work with PBF files produced by osmconvert.
- * osmconf.ini: report the waterway attribute for the lines layer (#5056)
- * add an option in osmconf.ini to enable creating a 'all_tags' field, combining both fields specifically identified, and other tags
- * always use quoting of key/values in other_tags field (#5096)
- * use alternative implementation of FindNode() that is a bit more efficient when process is CPU-bound
- * fix issue with attribute filtering
- * avoid GetNextFeature() to be blocked in certain conditions in non-interleaved mode (#5404)
+GTiff driver:
+ * GTiffJPEGOverviewBand::IReadBlock(): remove hack that causes read errors in
+   some circumstances
+ * do not use implicit JPEG overviews with non-nearest resampling
+ * fix generation of external overviews on 1xsmall_height rasters (#7194)
 
-PG driver:
- * upgrade to support RFC 41 in read/write (multiple geometry fields)
- * use ST_Estimated_Extent() on table layers if GetExtent() is called with force = 0 (#5427)
- * add a OGR_TRUNCATE configuration option (#5091)
- * let postgres name the constraints to avoid long name truncation resulting in conflicts (#5125)
- * map PG 'numeric' to OFTReal instead of OFTInteger
- * retrieve SRID from geometry value, if not found in geometry_columns (#5131)
- * fix ResolveSRID() when the current user has no select rights on geometry_columns table (#5131)
- * fix retrieval of SRID on a table without SRID constraint, and when the datasource is opened with ' tables=fake' (#5131)
- * robustness for huge coordinates in spatial filter
- * fix delete layer bug on PG 2.0 (#5349)
- * fix to be able to detect version of EntrepriseDB (#5375)
- * Fix UTF-8 encoded string length
+GTX driver:
+ * fix (likely harmless in practice) integer overflow (ossfuzz#55718)
 
-PGDump driver:
- * upgrade to support RFC 41 (multiple geometry fields)
- * fix error when inserting a string that has backslash in it with PostgreSQL >= 9.1 (#5160)
+HDF5 driver:
+ * add a GDAL_ENABLE_HDF5_GLOBAL_LOCK build option to add a global lock when
+   the HDF5 library is not built with thread-safety enabled (#7340)
 
-REC driver:
- * fix runtime compatibility for Windows
+HFA driver:
+ * ERDAS Imagine SRS support: various fixes: Vertical Perspective projection,
+   LCC_1SP, Mercator_2SP, Eqirectanglar, Hotine Obliqe Mercator Azimuth Center
 
-Shapefile driver:
- * fix buffer overflow when creating a field of type Integer with a big width (#5135)
- * delete temporary .cpg file earlier in REPACK
- * fix leak of file descriptor in error code paths
- * speed optimizations when reading geometries from .shp (#5272)
- * add a 2GB_LIMIT=YES layer creation option (and SHAPE_2GB_LIMIT configuration option)
- * .sbn support: increase allowed max depth from 15 to 24 (#5383)
+JPEG driver:
+ * Correctly read GCPS when an .aux.xml sidecar has GeodataXform present in the
+   ESRI metadata element instead of root element
 
-SOSI driver:
- * fix memory leaks, and crashes
- * advertise OLCCreateField capability
+JPEGXL driver:
+ * CreateCopy(): fix memory leak when writing georeferencing
 
-S57 driver:
- * make the driver thread-safe
- * remove use of MAX_CLASSES in favor of dynamic sizing (#5227)
- * fix GetFeature() on DSID layer
+MBTiles driver:
+ * fix nullptr deref when calling GetMetadata() on a dataset returned by
+   Create() (#7067)
 
-SQLite/Spatialite driver:
- * Make SQLite SQL dialect compatible with multiple geometry fields (note: however, multiple geom fields is not yet supported by OGR SQLite table layers)
- * implement SetAttributeFilter() on SQL result layers, to directly inject it as a WHERE clause when possible
- * add the OGR_SQLITE_PRAGMA configuration option
- * Spatialite: correctly set proj4text field of spatial_ref_sys when inserting a new SRS in the spatial_ref_sys table (#5174)
- * Spatialite: fix insertion in spatial_ref_sys to avoid issues with non-numeric authority codes (auth_srid)
- * Spatialite: make creation of database much faster with spatialite 4.1 by using InitSpatialMetaData(1) (#5270)
- * Spatialite: use thread-safe initialization for spatialite >= 4.1.2
- * avoid Spatialite views to emit (hidden) errors that cause troubles to MapServer OGR input driver (#5060)
- * attempt to make VirtualOGR (and thus sqlite dialect) work even with a libsqlite3 compiled with SQLITE_OMIT_LOAD_EXTENSION (on Unix only)
- * add warning when calling CreateField() with a field name that is 'ROWID' since it can cause corrupted spatial index
- * serialize StringList as non-truncated strings
- * detection of DateTime/Date/Time column type on the result of a max() / min() function
- * ensure fields of type DateTime/Date/Time are properly recognized if the table is empty (#5426)
+netCDF driver:
+ * quote variable name in subdataset list if it contains a column character
+   (#7061)
+ * report GEOLOCATION metadata for a lon/lat indexed variable where lon and/or
+   lat has irregular spacing
+ * netCDFDimension::GetIndexingVariable(): be more restrictive
+ * resolve variable names beyond the parent group (#7325)
 
-VFK driver:
- * fix memory leak
- * change VFK header check (first line starts with '&H')
- * implement OGR_VFK_DB_DELETE configuration option
- * read all data blocks by default
- * fix GetFeatureCount()
- * don't use existing internal db when it's older then original vfk file
+NITF driver:
+ * update CLEVEL to appropriate values when using compression / multiple image
+   segments
+ * fix bug that prevents adding subsequent TREs after a HEX TRE (#6827)
 
-VRT driver:
- * add support for multiple geometry columns in OGRVRTLayer, OGRVRTUnionLayer and OGRVRTWarpedLayer (RFC 41)
- * add validation of OGR VRT document against the schema (if libXML2 available);
-   can be disabled by setting GDAL_XML_VALIDATION configuration option to NO
- * make relativeToVRT=1 work with CSV:filename or GPSBABEL:driver:filename (#5419)
+PDF driver:
+ * skip JP2ECW driver if ECW_ENCODE_KEY required but not found
 
-WFS driver:
- * WFS 2.0: be a good citizen and send TYPENAMES (with a S) for GetFeature request (but still TYPENAME for DescribeFeatureType)
- * accept TYPENAME(S) in URL with characters escaped by '%' (#5354)
+TileDB driver:
+ * fix compatibility with tiledb 2.14
 
-XLS driver:
- * don't use sheetId attribute from workbook.xml to link a sheet name to its filename. The first sheet is sheet1.xml, etc...
+VRT:
+ * warp: fix issue when warping a Float32 raster with nodata = +/- FLOAT_MAX
 
-XPlane driver:
- * accept V1000 APT files
+ZMap creation:
+ * fix potential truncation of nodata value (#7203)
 
-## SWIG Language Bindings
+## OGR 3.6.3
 
-All bindings:
- * include constraints.i in gdal.i so that NONNULL constraints are really applied
- * add Feature.SetFieldBinaryFromHexString()
- * add SpatialReference.EPSGTreatsAsNorthingEasting (#5385)
- * map OGR_L_GetStyleTable(), OGR_L_SetStyleTable(), OGR_DS_GetStyleTable(), OGR_DS_SetStyleTable()
- * Add OGR_STBL_AddStyle() and map all OGR_STBL_ C methods to SWIG
+### Core
 
-CSharp bindings:
- * Fix handling UTF8 strings in GDAL C# (#4971)
- * Add C# typemaps for RFC-39 functions (#5264)
- * Fix typo in OGRLayerAlg.cs (#5264)
- * Add missing typemaps for C# (#5265)
+* OGRSQL: fix crash when comparing integer array fields (#6714)
+* OGRSQL: fix SetAttributeFilter() when dialect=OGRSQL and not forwarding the
+  initial where clause to the source layer (#7087)
 
-Java bindings:
- * run 'make ANDROID=yes' in swig/java to generate SWIG bindings that compile for Android (#5107)
- * fix linking issue that is encountered in non libtool builds with g++ 4.6
- * add multireadtest utility
- * respect JAVA_HOME set via configure
+### Utilities
 
-Perl bindings:
- * ColorTable method of ColorTable class was documented but ColorEntries was
-   implemented. Implemented but deprecated ColorEntries.
+* ogr2ogr: fix -clipsrc/-clipdst when clip dataset has SRS != features's
+  geometry (#7126)
 
-Python bindings:
- * fix ref-counting of callable passed to gdal.PushErrorHandler() that could cause segfaults (#5186)
- * make gdal_array.NumericTypeCodeToGDALTypeCode accept numpy dtype arguments (#5223)
- * add default xoff,yoff,xsize,ysize values to ReadRaster calls
- * make ogr.CreateGeometryFromWkt() and SpatialReference.ImportFromWkt() properly validate their argument (#5302)
+### Vector drivers
 
-# GDAL/OGR 1.10.0 Release Notes (r23656 to r25905)
+GeoJSON driver:
+ * avoid duplication of FID in streaming parser (#7258)
+ * declare GDAL_DCAP_MEASURED_GEOMETRIES and ODsCMeasuredGeometries
+ * fix mixed type field not flagged as JSON if first is a string (#7313)
+ * writer: take into account COORDINATE_PRECISION for top bbox (#7319)
+ * writer: fix json mixed types roundtrip (#7368)
 
-## In a nutshell...
+GeoJSONSeq driver:
+ * fix writing to /vsigzip/ (#7130)
 
- * New GDAL drivers:
-   - ARG: read/write support for ARG datasets (#4591)
-   - CTable2: read/write support for CTable2 datum grid shift format
-   - DDS: write-only support for DirectDraw Surface format (#5017)
-   - IRIS: read support for products generated by the IRIS weather radar software (#4854)
-   - MAP:  read OziExplorer .map files (#3380)
-   - MBTiles: read-only support for MBTiles rasters (needs libsqlite3)
- * New OGR drivers:
-   - ElasticSearch: write-only support to write into ElasticSearch databases (needs libcurl)
-   - ODS : read/write support for OpenOffice .ods (Open Document Spreadsheets) (needs libexpat)
-   - OSM : read-only support for .osm / .pbf OpenStreetMap files
-   - PDF: read/write support for vector/structured PDF files
-   - XLSX: read/write support for MS Excel 2007 and later Open Office XML .xlsx spreadsheets (needs libexpat)
- * RFC 39: OGR Layer algebra methods : http://trac.osgeo.org/gdal/wiki/rfc39_ogr_layer_algebra
- * Add a SQL SQLite dialect : http://gdal.org/ogr/ogr_sql_sqlite.html
- * Make GDAL loadable as a SQLite3 extension (named VirtualOGR) (#4782)
- * /vsicurl_streaming/: new virtual file system handler designed to read in streaming mode dynamically generated files
- * GDAL API_PROXY mechanism to run GDAL drivers in a separate process: http://gdal.org/gdal_api_proxy.html
- * Significantly improved drivers : PDF, SQLite, JP2OpenJPEG
- * Add a geocoding client : http://gdal.org/ogr/ogr__geocoding_8h.html
- * Upgrade to EPSG 8.0 database
+GeoPackage driver:
+ * avoid issue with duplicated column names in some cases (#6976)
+ * GetNextArrowArray(): fix retrieving only the geometry (geopandas/pyogrio#212)
+ * restore async RTree building for 1st layer (broken by GDAL 3.6.2)
 
-## New installed files
+GML driver:
+ * fix CurvePolygon export of CompoundCurve and CircularString child elements
+   (#7294)
 
- * data/ozi_datum.csv
- * data/ozi_ellips.csv
- * data/osmconf.ini
- * include/cpl_progress.h
- * include/cpl_spawn.h
- * bin/gdalserver[.exe]
+HANA driver:
+ * fix DSN open option
 
-## Backward compatibility issues
+MITAB driver:
+ * handle projection methods 34 (extended transverse mercator) and 35 (Hotine
+   Oblique Mercator) (#7161)
+ * Fix possible crash on NULL feature text (#7341)
+ * Fix a typo at MITABGetCustomDatum
 
-Due to the 2-digit number '10' in GDAL 1.10, the GDAL_VERSION_NUM macro has been changed.
-The new advised way of testing the GDAL version number (for GDAL 1.10 or later) at compilation time is :
+NAS driver:
+ * fix file descriptor leak in error code path
 
-#ifdef GDAL_COMPUTE_VERSION /* only available in GDAL 1.10 or later */
-#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(1,10,0)
-///
-#endif
-#endif
+OpenFileGDB driver:
+ * fix performance issue when identifying a CRS
+ * detect broken .spx file with wrong index depth (qgis/qgis#32534)
+ * index reading: avoid integer overflow on index larger than 2 GB
+ * allow CreateField() with OBJECTID as the column name (qgis/qgis#51435)
+ * make Delete() method to remove the directory (fixes #7216)
 
-Testing of previous versions is of course unchanged.
+Shapefile driver:
+ * fix adding features in a .dbf without columns (qgis/qgis#51247)
+ * make sure eAccess = GA_Update is set on creation (#7311)
 
-## GDAL/OGR 1.10.0 - General Changes
+## SWIG bindings
 
-Build(Unix):
- * New optional dependencies : libpcre (for regular expressions support in SQLite), libxml2 (validation of GML files)
- * --with-python: make it work with python3, and also accept path to python binary as argument of --with-python (#4725)
- * Use nc-config to detect netcdf compilation and linking parameters (#4424)
- * Add frmts/vrt to CONFIG_CFLAGS for development version of gdal-config (needed for postgis 2.0 compilation)
- * Fix compilation failure with iconv on FreeBSD (#4525)
- * Make FileGDBAPI detection work with FileGDBAPI v1.1 and v1.2 (#4570)
- * Fix build on Gentoo with its custom zlib 1.2.6 with the OF macro removed
- * Mark man target as phony (#4629)
- * Add guess for the directory where to find openjdk on Ubuntu 12.04 (#4643)
- * Look for geotiff headers in /usr/include/libgeotiff too (#4706)
- * For install target, create gdalplugins subdirectory in $(DESTDIR)$(INST_LIB)/ (Unix, except MacOSX)
- * Better detection of OpenCL headers and library (#4665)
- * Changed libdap test to use dap-config to detect version when possible
+* add missing OLCUpsertFeature constant
 
-Build(Windows):
- * (Preliminary) support to build INGRES
- * Make CPLGetErrorHandlerUserData() exported
- * Make OGDI include path overridable (to match OSGeo4W's default location)
- * Build and install plugins
+## Python bindings
 
-## GDAL 1.10.0 - Overview of Changes
+* fix setup.py dir-list issue on macOS
 
-Port:
- * CPL Thread API: add condition API, modeled on POSIX pthread_cond_ API
- * Add CPLGetNumCPUs()
- * Deserialize various forms of textual representation for positive/negative infinity
- * Add routine to validate a XML file against its XSD schema (needs libxml2); 'optimize' it for GML files
- * CPLRecodeStub(): for Windows, provide an implementation of UTF8 <--> CPxxx conversions using Windows API
- * Make VSIFileManager::Get() thread-safe
- * Fix thread-safety of CPLOpenShared() (#4848)
- * Add CPLZLibDeflate() and CPLZLibInflate()
- * Add API for OAuth2 authentication protocol.
- * Curl: allows setting the CURLOPT_PROXYAUTH setting through GDAL_PROXY_AUTH=BASIC/NTLM/DIGEST/ANY,
-   allow setting CURLOPT_HTTPAUTH through GDAL_HTTP_AUTH=BASIC/NTLM/GSSNEGOTIATE/ANY (#4998)
- * /vsicurl/ and /vsicurl_streaming/ : make it possible to cache the files in RAM with VSI_CACHE = TRUE
- * /vsizip/: fix handling of Eof() that could cause missed last feature(s) of zipped shapefiles (#4748)
+# GDAL/OGR 3.6.2 Release Notes
 
-Core:
- * Add a DMD_SUBDATASETS driver metadata, and advertise it in relevant drivers (#4902)
- * Fix statistics computation when nodata value is +/- infinity (#4506)
- * GDALNoDataMaskBand: implement IRasterIO() for an optimization in common use case (#4488)
- * GDALVersionInfo(): add BUILD_INFO version string
- * GMLJP2: Fix bad interpretation when Lat/Long (#4657)
- * Set nodata value when creating external overviews so that AVERAGE algorithm works as expected (#4679)
- * EXIFExtractMetadata() moved to gcore/gdalexif.cpp to make it usable for other drivers
- * Fix infinite recursion in GDALOpen() (#4835)
- * GDALRasterBand::IRasterIO() : optimize downsampling/upsampling code path
- * C API: make GDALSetDefaultRAT() accept a NULL RAT. All drivers are ready for that now.
- * GDALRasterBand::GetDefaultHistogram(): change how min and max bounds are computed in the non GDT_Byte case
- * GDALDataset::BlockBasedFlushCache(): fix crash when band has sub-blocking
+GDAL 3.6.2 is a bugfix release.
 
-Algorithms:
- * GSOC Image Correlator work (preliminary state)
- * Warp: divide Lanczos resampling time by at least a factor of 4.
- * Warp: add NUM_THREADS warping option to set the number of threads to use to parallelize the computation part of the warping
- * Warp: do not stop collecting chunks to operate on just because some subchunks fail (#4795)
- * Warp: add mode and average resampling methods (#5049)
- * OpenCL warper: handle errors in set_supported_formats(), fix memory leaks in error code paths, add detection of Intel OpenCL (by the way, Intel OpenCL seems to work properly only with a Float32 working data type)
- * OpenCL warper: fix segmentation fault related to source/destination validity masks (#4840)
- * Geoloc: do not trust pabSuccess in geolocation transformer (#4794)
- * Geoloc: add bilinear interpolation of coordinates from backmap (#4907)
- * Geoloc: add GDALTransformGeolocations() and SWIG binding
- * Add nearest neighbor and cubic interpolation of DEM in GDALRPCTransform (#3634).
-   User can set RPC_DEMINTERPOLATION to near, bilinear or cubic to interpolate of input DEM file which set in RPC_DEM. The default interpolation is bilinear.
- * gdal_rasterize: fix problem identifying some connected-8 polygons (#4647)
- * gdal_grid: speed-up dramatically nearest neighbour search (with radius1 == radius2) by using a search quad tree
- * gdal_grid: parallelize processing by specifying the GDAL_NUM_THREADS configuration option (default to ALL_CPUS)
- * gdal_grid: for 'invdist' algorithm with default parameters, use SSE optimized version if available (at compile and runtime). Can be disabled with GDAL_USE_SSE=NO
+## General
 
-Utilities:
- * General: make usage message more self-explanatory in case of bad option (#4973)
- * gdalmove.py: New application for "warping" an image by just updating its SRS and geotransform.
- * gdal_edit.py: promote it as an 'official' tool (#4963)
- * gdalwarp: add "-r average" and "-r mode" resampling methods (#5049)
- * gdalwarp: copy metadata and band information from first source dataset and detect for conflicting values, new options -nomd and -cvmd (#3898)
- * gdalwarp: optimization when (-tr and -te) or (-ts and -te) are specified (#4804)
- * gdalwarp: assign color interpretation of source bands to target dataset, in the case of target VRT (#4462)
- * gdalwarp: add -setci option to set the color interpretation of the bands of the target dataset from the source dataset
- * gdal_translate: accept -srcwin or -projwin values that fall partially or completely outside the source raster extent. Introduce -epo and -eco options to error out in those situations.
- * gdallocationinfo: add a -overview overview_level option to specify an overview level, instead of the base band
- * gdalsrsinfo: try to open with GDAL and OGR even if argument is not a file (#4493)
- * gdaldem: add a -combined option to the hillshade mode to compute combined hillshading (#4753)
- * gdaldem: fix color-relief output with driver that has only CreateCopy() capability, and when the source block dimensions are not multiple of the raster dimension (#4764)
- * gdaltindex: add -t_srs option, to transform all input source bounds to same SRS (#4773)
- * gdalbuildvrt: add -a_srs option
- * gdalbuildvrt: add -sd option to select subdataset by its number
- * gdalbuildvrt: add a -b flag (#4992)
- * gdalgrid: increase working buffer of gdal_grid binary to 16 MB
- * gdal_retile.py: Don't pass creation options to the MEM driver used for generating temporary datasets (#4532)
- * gdal_edit.py: make -a_srs option work properly by expanding the user input to WKT; support -a_srs ''
- * gdal_edit.py: add support for -gcp option
- * gdal2tiles.py: make KML output conformant with KML 2.2 (#4536)
- * gdal2tiles.py: OL 2.12 support (#4742)
- * gdal_polygonize.py: add -8 option to select 8 connectedness (#4655)
- * gdal_merge.py, gdalident.py: remove using of glob() API
- * gdal2xyz.py: fix output of -csv mode with multi-band raster
- * gdal_contour / gdal_rasterize / gdal_translate: accept numeric values in scientific format.
- * crs2crs2grid.py: New sample Python script
- * gdalcompare.py: New sample Python scrip to compare GDAL datasets
- * gdal_calc.py: add --co creation option flag (#4964)
- * gdaladdo: add a -b flag
- * pct2rgb.py: deal with color tables with more than 256 entries (#4905)
+[RFC69](https://gdal.org/development/rfc/rfc69_cplusplus_formatting.html):
+Whole code base C/C++ reformatting
 
-Multi driver changes:
- * Add support for reading .j2w, .jp2w and .wld files for JP2ECW, JP2MrSID, JP2OPENJPEG and JPEG2000 drivers (#4651)
+## Build
 
-AAIGrid:
- * Change float format string for AAIGrid to prevent pointless padding/decimals (#3732)
+* Avoid warning with curl >= 7.55 about CURLINFO_CONTENT_LENGTH_DOWNLOAD being
+  deprecated
+* Avoid warning with curl >= 7.87 about CURLOPT_PROGRESSFUNCTION being
+  deprecated
+* fix nitfdump build against external libtiff (#6968)
+* fix compilation with gcc 4.8.5 of Centos 7.9 (#6991)
 
-ACE2 driver:
- * Fix typo that prevented dataset to be opened with explicit /vsigzip/ (#4460)
+## Data files
 
-ADRG driver:
- * Various fixes when opening ill-formed datasets.
+* tms_MapML_CBMTILE.json: fix wrong matrixWidth value (#6922)
 
-BAG driver:
- * Fix serious problems with tiled images, particularly when not multiples of tile size (#4548)
- * Added capture of dateTime attribute
- * Support WKT (with Esri style VERTCS) spatial reference
- * Allow WGS84 spatial reference
- * Include compression method in metadata.
+## GDAL 3.6.2
 
-BT driver:
- * Fixes for huge files (>2GB) support (#4765)
+### Port
 
-CEOS2 driver:
- * Add various radarsat-1 related metadata fields (#4996)
+* CPLGetUsablePhysicalRAM(): take into account RSS limit (ulimit -m) (#6669)
+* CPLGetNumCPUs(): take into sched_getaffinity() (#6669)
 
-DIMAP driver:
- * Check signature in METADATA.DIM, not just file existence
- * Fixed DIMAP2 driver to get the proper absolute path in a specific case
+### Algorithms
 
-DTED driver:
- * Write the updated value of the partial cell indicator to the file (#4687)
- * Honour 'Longitude count' field of Data Record to deal properly with files with missing columns at the left and/or right of the file (#4711)
+* Warp: fix crash in multi-threaded mode when doing several warping runs with
+  the same WarpOperation
+* RasterizeLayer: prevent out-of-bounds index/crash on some input data (#6981)
 
-ECW driver:
- * Add support for ECW SDK 5.0
- * Improve picking performance on large datasets (#4790)
- * Use ECW SDK to do super-sampling for SDK >= 4.X
- * Expose 256x256 block dimension instead of scanline
- * Workaround a ECW SDK 3.3 bug, when doing a RasterIO() with the total number of bands, but not in the 1,2,..n order (#4234)
- * Add heuristics to detect successive band reading pattern (such as done by QGIS). Beneficial for ECWP
+### Core
 
-ENVI driver:
- * Add support for writing RPCs and GCPs
- * Add ability to access all ENVI header fields to the ENVI reader (#4735)
- * Write in the ENVI header metadata found in the ENVI metadata domain (#4957)
- * Fix reading of .sta file on 64bit Linux
- * Assume BSQ interleaving when 'interleave' keyword missing or unknown
- * Fix category names writing
- * Remove 'envi fft result' from the blacklist
- * Report wavelength and wavelength_units as band metadata (#3682)
+* gdal_pam.h: workaround for code including it after windows.h
 
-ENVISAT driver:
- * Ported to VSI*L
+### Raster drivers
 
-GeoRaster driver:
- * Add spatialExtent and extentSRID create-options (#4529)
- * Fix JPEG quality not updated on metadata (#4552)
- * Search for RDT as regular table
- * Add support for RPC (#4038)
+AAIGRID driver:
+ * fix CreateCopy() of source raster with south-up orientation (#6946)
 
-GIF driver:
- * Add support for giflib 4.2.0 (#4675) and giflib 5.0
+BAG driver:
+ * conform to the final BAG georeferenced metadata layer specification (#6933)
 
-GMT driver:
- * Make GMT driver thread-safe by adding a global mutex (since the netcdf library isn't thread-safe)
+ESRIC driver:
+ * Fix DCAP_VECTOR metadata
 
-GTiff driver:
- * Internal libtiff and libgeotiff refreshed from upstream
- * Use EXTRASAMPLE_UNASSALPHA by default (behavior change w.r.t. previous GDAL versions) (#4733)
- * Add support for reading GeoEye *.pvl metadata files (#4465)
- * Lossless CreateCopy'ing() from a JPEG dataset
- * Read EXIF metadata in the EXIF metadata domain
- * Ensure that rowsperstrip is never larger than ysize (#4468)
- * Fix writing of RGBA pixel-interleaved JPEG-compressed TIFF (#4732)
- * Set color interpretation to GCI_PaletteIndex after calling SetColorTable() (#4547)
- * Conversion for 8-bit unpacked CMYK (PHOTOMETRIC_SEPARATED) to RGBA.
- * Maximize EPSG compatibility where PCS is defined (#4607)
- * Ensure that unusual units with an authority node are saved nicely (like EPSG:2066)
- * Add CT_HotineObliqueMercatorAzimuthCenter support
- * Fix PolarStereographic / 9829 support
- * Make sure that GetMetadata() initializes the value of GDALMD_AREA_OR_POINT item, if not already done (#4691)
- * When building overviews, if the image has already an internal mask, then build internal overviews for the mask implicitly
- * Better handling of SetMetadata(a_string) (#4816)
- * Use GTIFAllocDefn/GTIFFreeDefn with libgeotiff 1.4.1+
- * Add support for GEO_NORMALIZE_DISABLE_TOWGS84 (#3309)
- * Improve handling of description and offset/scale without reverting to .aux.xml
- * Workaround defects in libtiff 3.X when generating several overview levels at the same time
- * Special case where the EGM96 Vertical Datum code is misused as a Vertical CS code (#4922)
- * Support unsetting geotiff tags when calling SetGeoTransform([0,1,0,0,0,1]) and SetProjection('')
- * Rework how CSV files are searched w.r.t libgeotiff (#4994)
+JPEGXL driver:
+ * advertise COMPRESSION_REVERSIBILITY=LOSSY when there is a JPEG
+   reconstruction box
 
-GRIB driver:
- * Report nodata value (#4433)
- * Fix fgetc signed/unsigned problem for Grib format VSI*L reader (#4603)
- * Avoid caching more than 100 MB in case of dataset with many bands (#4682)
- * uses meshLat as the latitude_of_origin parameter of LCC projection (#4807)
+netCDF driver:
+ * deal with files with decreasing latitudes/north-up orientation and presence
+   of actual_range attribute (#6909)
 
-GSAG driver:
- * Fix hangs when reading truncated dataset (#4889)
+VRT driver:
+ * VRTSourcedRasterBand: replace potentially unsafe cpl::down_cast<> by
+   dynamic_cast<>
 
-GS7BG driver:
- * Implement Create() and CreateCopy() (#4707)
+## OGR 3.6.2
 
-GTX driver:
- * Support reading old GTX files where datatype was Float64
+### Core
 
-GXF driver:
- * Avoid having big buffer on stack (#4852)
- * Avoid locale floating point parsing problems (similar to r24367).
- * Implement continued lines mechanism (#4873)
- * Fix various vulnerabilities / DoS
+* OGRGenSQLResultsLayer::GetFeatureCount(): fix it to return -1 when base layer
+  also returns -1 (#6925)
+* OGRXercesInstrumentedMemoryManager::deallocate(): avoid (likely harmless)
+  unsigned integer overflow in error code path.
+* GPKG/SQLite dialect: fix issues when SQL statement provided to ExecuteSQL()
+  starts with space/tabulation/newline (#6976)
+* ArrowArray generic: FillBoolArray(): avoid out-of-bounds write access
 
-HDF4 driver:
- * Add ability to increase the maximum number of opened HDF4 files
- * Unix build: avoid issue with system hdfeos library
- * Ensure we do not try to use the grid tile api for non-tilesized chunks (#4672)
- * Preserve more Float32 attribute precision
- * Import HDF USGS GCTP angular parameters as radians
- * Restore conventional add_offset interpretation (#4891)
- * Be more careful about missing dimensions (#4900)
- * Make HDF4 driver thread-safe by adding a global mutex (since the HDF4 library isn't thread-safe)
- * Search for "coremetadata" attribute name instead of "coremetadata."
+### Utilities
 
-HDF5 driver:
- * Add support for COSMO-SkyMed metadata (#4160)
+* ogr2ogr: make -nln flag with GeoJSON output even if a name exists in input
+  GeoJSON (#6920)
+* ogr2ogr: silent reprojection errors related to IsPolarToWGS84() in
+  OGRGeometryFactory::transformWithOptions()
 
-HFA driver:
- * Added BASEDATA support for EPT_u1 (#4537)
- * Fix crash on dataset closing when .ige file header is corrupted (#4596)
- * .aux overviews: avoid destroying existing overviews when asking twice in a row to build overviews for exactly the same overview levels (#4831)
- * Fix sizing of RAT string column maxwidth to include null char (#4867)
- * Fix segfault in HFAAuxBuildOverviews with selected bands (#4976)
-
-INGR driver:
- * do not reduce tile size to image size (#4856)
- * Fix value inversion when reading type 9 (bitonal RLE) untiled files (#5030)
- * fix slowness and incorrect random reading with RLE datasets (#4965)
- * Enable reading bitonal rle files wider than 22784 (0x5900) pixels (#5030)
- * Add RESOLUTION metadata/option to read/write DPI (#5030)
- * Add write support for .rle (bitonal rle files) to test the above (#5030)
+### Drivers
 
-ISIS3 driver:
- * Ensure scaleFactor defaults to 1 (#4499)
+GML driver:
+ * fix recognizing WFS GetFeature response with a very long initial XML element
+   (#6940)
+ * default srsDimension to 3 for CityGML files (#6989)
+ * fix incorrect behavior when using GFS_TEMPLATE open option with a .gfs that
+   refers to FeatureProperty/FeaturePropertyList fields (#6932)
 
-JP2ECW driver:
- * Workaround conflict between ECW SDK deinitialization and GDAL deinitialization, as shown by gdaljp2ecw tests of imageio-ext (#5024)
- * Promote 1bit alpha band of a RGBA dataset to 8 bits to improve general user experience (can be turned off by setting GDAL_ECW_PROMOTE_1BIT_ALPHA_AS_8BIT to NO)
+GeoPackage driver:
+ * fix threaded RTree building when creating several layers (3.6.0 regression),
+   by disabling async RTree building
+ * avoid SQLite3 locking in CreateLayer() due to RemoveOGREmptyTable()
 
-JP2KAK driver:
- * Capture Corder in metadata for user convenience
- * Fix writing of resolution box where the xresolution value was written instead of the yresolution one
- * Skip bands that have different data type when reading multiple bands in IReadBlock() (#4638)
- * Default to less than 250000 lines per tile (#5034)
+NGW driver:
+ * remove DCAP_ items set to NO (#6994)
 
-JP2OpenJPEG driver:
- * Require OpenJPEG 2.0.0 now
- * Use several decoding threads when processing multi-tiles IRasterIO() requests
- * Add support for writing georeferencing
- * Read and write JP2 Res box and translate it from/to TIFFTAG_XRESOLUTION, TIFFTAG_YRESOLUTION and TIFFTAG_RESOLUTIONUNIT metadata items
- * Promote 1bit alpha band of a RGBA dataset to 8 bits to improve general user experience (can be turned off by setting JP2OPENJPEG_PROMOTE_1BIT_ALPHA_AS_8BIT to NO)
+Parquet driver:
+ * update to read and write GeoParquet 1.0.0-beta.1 specification (#6646)
 
-JPEG driver:
- * When there are no external overviews built, take advantage of the nature of JPEG compression to expose overviews of level 2, 4 and 8
- * Don't return junk content when requesting xml:XMP but no XMP metadata is present (#4593)
- * add a INTERNAL_MASK creation option to be able to disable appending the ZLib mask if not needed
- * add support for creating a JPEG loss-less file starting with the recent IJG libjpeg v9
-   (with -co ARITHMETIC=yes -co BLOCK=1 -co COLOR_TRANSFORM=RGB1)
+Selafin driver:
+ * Fix DCAP_VECTOR metadata
 
-JPEG2000 driver:
- * do not accept by default source bands of type different from Byte, Int16 or UInt16 since they seem to cause crashes in libjasper.
-   This can be overridden, at your own risk, by setting JPEG2000_FORCE_CREATION configuration option to YES (#5002)
+# GDAL/OGR 3.6.1 Release Notes
 
-KMLSuperOverlay driver:
- * Add read support
- * Remove bogus code that limited generation to one zoom level (#4527)
- * Set minLodPixels to 1 for zoom level 0 (#4721)
- * Fix bad placing of tiles with raster of the extent of a country or more (#4834)
- * Add FIX_ANTIMERIDIAN creation option (#4528)
+GDAL 3.6.1 is a bugfix release. It officially retracts GDAL 3.6.0 which
+could cause corruption of the spatial index of GeoPackage files it created
+(in tables with 100 000 features or more):
+cf https://github.com/qgis/QGIS/issues/51188 and
+https://github.com/OSGeo/gdal/pull/6911. GDAL 3.6.1 fixes that issue. Setting
+OGR_GPKG_ALLOW_THREADED_RTREE=NO environment variable (at generation time)
+also works around the issue with GDAL 3.6.0. Users who have generated corrupted
+GeoPackage files with 3.6.0 can regnerate them with 3.6.1 with, for example,
+"ogr2ogr out_ok.gpkg in_corrupted.gpkg" (assuming a GeoPackage file with vector
+content only)
 
-L1B driver:
- * Add support for NOAA19, METOP-B and guess for METOP-C (#2352)
+## Build
 
-MG4Lidar driver:
- * Add UTF-8 filename support under Windows (#4612)
+* Fix build with -DOGR_ENABLE_DRIVER_GML=OFF (#6647)
+* Add build support for libhdf5 1.13.2 and 1.13.3 (#6657)
+* remove RECOMMENDED flag to BRUNSLI and QB3. Add it for CURL (cf
+  https://github.com/spack/spack/pull/33856#issue-1446090634)
+* configure.cmake: fix wrong detection of pread64 for iOS
+* FindSQLite3.cmake: add logic to invalidate SQLite3_HAS_ variables if
+  the library changes
+* detect if sqlite3 is missing mutex support
+* Fix build when sqlite3_progress_handler() is missing
+* do not use Armadillo if it lacks LAPACK support (such as on Alpine)
+* make it a FATAL_ERROR if the user used -DGDAL_USE_ARMADILLO=ON and it
+  can't be used
+* Fix static HDF4 libraries not found on Windows
+* Internal libjpeg: rename extra symbol for iOS compatibility (#6725)
+* gdaldataset: fix false-positive gcc 12.2.1 -O2 warning about truncation
+  of buffer
+* Add minimal support for reading 12-bit JPEG images with libjpeg-turbo
+  2.2dev and internal libjpeg12
+* Fix detection of blosc version number
+* Add missing includes to fix build with upcoming gcc 13
+
+## GDAL 3.6.1
 
-NetCDF driver:
- * Fix for gdal_rasterize (#4432)
- * Enable PAM for band histogram and statistics (#4244)
- * Add longitude_of_prime_meridian value to PRIMEM
- * Fix SetNoDataValue() - do not update when already set to new value (#4484)
- * Convert longitude values in [180,360] interval to [-180,180] (#4512) - override with config option GDAL_NETCDF_CENTERLONG_180=0
- * Support 2D GEOLOCATION arrays when a projected variable has coordinates attribute and supporting long/lat arrays (#4513)
- * Ignore coordinate and bounds variables (CF sections 5.2, 5.6 and 7.1) as raster bands, but expose them as subdatasets - this allows opening files with projected SRS (or dimension bounds) directly, without specifying the variable as a subdataset
- * Better support for Gaussian grids - store original latitude values in special Y_VALUES geolocation metadata item and use it for netcdf export (#4514)
- * Write multi-dimensional variables to a single variable (not one for each unrolled band) in CreateCopy() (#2581)
- * Fix handling of km units in netcdf driver and importFromProj4() (#4769)
- * Fix detection of 1 and 2 pixel width/height netcdf datasets (#4874)
- * Fix subdataset data type info (#4932)
- * Make netCDF driver thread-safe by adding a global mutex (since the netcdf library isn't thread-safe)
+### Port
 
-NITF driver:
- * nitf_spec.xml: add definition of ACFTB and AIMIDB TREs
- * Don't escape DESDATA for sizes >10mb (#4803)
- * Fix NITF creation when both BLOCKA and TRE are passed in (#4958)
- * Allow reading JPEG-in-NITF where JPEG stream dimensions are larger than NITF dimensions (#5001)
- * Support for cases with 2 LUTs
+* CPLGetExecPath(): add MacOSX and FreeBSD implementations; prevent
+  potential one-byte overflow on Linux&Windows
+* /vsiaz/: make AppendBlob operation compatible of Azurite (#6759)
+* /vsiaz/: accept Azure connection string with only BlobEndpoint and
+  SharedAccessSignature (#6870)
+* S3: fix issue with EC2 IDMSv2 request failing inside Docker container
+  with default networking
 
-Northwood driver:
- * Fixes for huge files (>2GB) support (#4565, #4645)
- * NWT_GRD: don't advertise scale/offset as they are transparently applied in IReadBlock() (#5839).
+### Algorithms
 
-PDF driver:
- * Add CreateCopy() support
- * Add update support for georeferencing and metadata
- * Add support for selective layer rendering (only with poppler backend)
- * Add GDAL_PDF_BANDS = 3 or 4 config option to select RGB or RGBA rendering; add GDAL_PDF_RENDERING_OPTIONS config option to enable selective feature rendering by combining VECTOR, BITMAP and TEXT values
- * Fix parsing of some georeferencing (r24022)
- * Recognized ISO georeferencing set at the image level (and not at the page level); expose such images as subdatasets (#4695)
- * Support Poppler 0.20 (and for current Poppler development version 0.23/0.24)
- * UTF-16 support
- * Report registration points as GCPs (OGC Best Practice)
- * Allow building driver with both Poppler and Podofo (testing purposes mostly)
- * Fix crashes on some PDF files with poppler >= 0.17.0 (#4520)
- * Improve rounding of raster dimensions (#4775)
- * With podofo, avoid launching the 'pdftoppm' process in a visible console on Windows (#4864)
- * Select neatline whose description is 'Map Layers' when it is found, to keep the best neatline for USGS PDF Topo
-   and add GDAL_PDF_NEATLINE config. option to override that default value.
- * Improve detection of DPI for USGS Topo PDF to get the maximum raster quality (will increase
-   reported dataset height and width)
- * Extract USGS Topo PDF embedded metadata in the EMBEDDED_METADATA domain
+* warp: Also log number of chunks in warp operation progress debug logs (#6709)
+* Warper: use exact coordinate transformer on source raster edges to avoid
+  missing pixels (#6777)
 
-PNG driver:
- * Internal libpng upgraded to 1.2.50
+### Utilities
 
-PostgisRaster driver:
- * Implement CreateCopy and Delete (#4530)
- * Supports reading of tiled raster with irregular blocking and irregular pixel size
- * Cache postgres db connection.
- * Use PG environment variables as fallback when settings are not provided in the connection string. (#4533).
- * Do not report nodata value when there is none (#4414)
- * Removed dependency on the 'rid' column.
- * Fix to make SQL queries with un-rounded floating point string representations. (#4736)
- * Fix overview support
-
-Rasterlite driver:
- * Support all resampling methods for internal overviews (#4740)
- * Fix overview support with multi-table datasets (#4568, #4737)
- * Add RASTERLITE_OVR_OPTIONS configuration option to specify options for the tiles of the internal overviews
+* gdalbuildvrt: make -addalpha working when there's a mix of bands with or
+  without alpha (#6794)
+* gdalwarp: fix issue with vertical shift, in particular when CRS has US
+  survey foot as vertical unit (#6839)
+* gdalwarp: speed-up warping with cutline when the source dataset or
+  processing chunks are fully contained within the cutline (#6905)
+* validate_gpkg.py: make it work with SRID=-1 in geometry blobs
 
-RMF driver:
- * Fix incorrect zone number detection for Transverse Mercator (#4766)
+### Core
 
-RPFTOC driver:
- * Relax SanityCheckOK() to avoid rejecting valid CIB datasets (#4791)
- * Avoid selecting a color table that is full black
- * Add missing NITF series code 'TF' for 'TFC' (and fix typo in some other long descriptions) (#4776)
+* GDALMDReader: avoid possible stack overflow on hostile XML metadata
+  (ossfuzz #53988)
 
-RS2 driver:
- * added various metadata fields (#4997)
+### Raster drivers
 
-SDTS driver:
- * Various fixes when opening ill-formed datasets.
+GeoRaster driver:
+ * add internal OCI connection support to vsilocilob which is used only
+    by the GeoRaster driver. (#6654)
 
-SRP driver:
- * Various fixes when opening ill-formed datasets.
+GPKG driver:
+ * implement setting the nodata value for Byte dataset (#1569)
 
-TIL driver:
- * Fix TIL driver using overview (#3482)
- * Add set projection and geotransformation for TILDataset
+GTiff driver:
+ * DISCARD_LSB: reduce range of validity to 0-7 range for Byte to avoid
+   unsigned integer overflow if 8. (ossfuzz #53570)
+ * if CRS is DerivedProjected, write it to PAM .aux.xml file (#6758)
+ * SRS reader: do not emit warning when reading a projected CRS with GeoTIFF
+   keys override and northing, easting axis order (related to #6905)
 
-TSX driver:
- * Fix crashes in Identify() with certain filenames, and the file is empty or doesn't exist (#4622)
+netCDF driver:
+ * fix exposing geotransform when there's x,y and lat,lon coordinates and
+   the CRS is retrieved from crs_wkt attribute (#6656)
 
-VRT driver:
- * VRTWarpedDataset: add INIT_DEST=0 if no INIT_DEST specified (#4571)
- * VRTFilteredSource: fix RasterIO() to take into account source and dest windows (#4616)
- * avoid crashes due to int overflow when dealing with requests filling a buffer larger than 2 GB (#4815)
- * VRTSourcedRasterBand: override ComputeRasterMinMax(), ComputeStatistics() and GetHistogram() to make them run on sources, only when there's one VRTSimpleSource covering the whole VRTSourcedRasterBand
- * solve issue when the VRT is a symlink and that the sources filenames are RelativeToVRT (#4999)
- * Fix relariveToVRT option in VRTRawRasterBand (#5033)
+HDF4 driver:
+ * fix regression of CMake builds, related to opening more than 32 simultaneous
+   HDF4_EOS files (#6665)
 
-WCS driver:
- * Support version 1.1.2
+OGCAPI driver:
+ * update for map api; also for tiles but not working properly due to
+   churn in tilematrixset spec (#6832)
 
-WebP driver:
- * Allow reading/writing alpha channel (libwebp >= 0.1.4)
- * Add support for reading XMP metadata in the xml:XMP metadata domain
+RMF driver:
+ * Implement GetSuggestedBlockAccessPattern
 
-WMS driver:
- * Implement GetMetadataItem(Pixel_iCol_iLine, LocationInfo) to retrieve pixel attributes
- * Retrieve nodata, min and max values, defined per band or per dataset in the config file (#4613)
- * Add GetColorTable(), used by the TiledWMS mini driver (#4613)
- * Update TiledWMS mini-driver to support new variable substitution mechanism, min/max/nodata settings, color table support (#4613)
- * Add a <UserPwd> element in the XML service description file
+SAR_CEOS driver:
+ * fix small memleak
 
 XYZ driver:
- * avoid rescanning output file at end of CreateCopy()
-
-## OGR 1.10.0 - Overview of Changes
+ * support more datasets with rather sparse content in first lines (#6736)
 
-Core:
- * Add OGRLayerDecorator class (decorator base class for OGRLayer),
- * Add OGRWarpedLayer class (on-the-fly reprojection of a base layer)
- * Add OGRUnionLayer class (on-the-fly concatenation of several base layers)
- * Add OGRFieldDefn::IsSame() and OGRFeatureDefn::IsSame()
- * Add OGRAbstractProxiedLayer, OGRProxiedLayer and OGRLayerPool classes
- * OGRGeometry: set SRS of geometries created via GEOS functions from the source geometry (idem for geometries returned by OGR_G_ForceXXXX() methods) (#4572)
- * OGRFeature: Add OGR_SETFIELD_NUMERIC_WARNING option to issue a warning when not fully
-               numeric values are assigned to numeric fields. If the field type is Integer,
-               then also warn if the long value doesn't fit on a int.
- * Add OGR_G_PointOnSurface() and add it to SWIG bindings
- * Add OGR_G_ForceToLineString / OGRGeometryFactory::forceToLineString to join
-   connected segments in line strings.
- * Better implementation of getDimension() for OGRMultiPoint, OGRMultiLineString, OGRMultiPolygon and OGRGeometryCollection
- * Fix incorrect rounding in OGRFormatDouble that affected geometry WKT output (#4614)
- * OGRSQL: support UNION ALL of several SELECTs
- * OGRSQL: defer ORDER BY evaluation until necessary, so that a spatial filter can be taken into account after layer creation
- * OGRSQL: allow using indexes when OR or AND expressions are found in the WHERE clause
- * OGRSQL: fix incorrect result with more than 2 JOINs and SELECT with expressions with field names (#4521)
- * OGRSQL: fix 'SELECT MAX(OGR_GEOM_AREA) FROM XXXX' (#4633)
- * OGRSQL: fix invalid conversion from float to integer (#4634)
- * OGRSQL: fix behavior of binary operations when one operand is a NULL value
- * OGRDataSource::CopyLayer(): take into account field renaming by output driver (e.g. Shapefile driver that might truncated field names) (#4667)
- * OGRLayer::FilterGeometry() : speed-up improvement in some cases and  use GEOSPreparedIntersects() when available (r23953, r25268)
- * OGRLayer::SetNextByIndex(): return OGRERR_FAILURE if index < 0
- * OGRLineString::setPoint( int iPoint, OGRPoint * poPoint ) : avoid promoting the line to 25D if the point is only 2D (#4688)
- * OGRGeometry::Centroid(): make it work properly on POINT EMPTY with latest SVN geos version
- * Add reversePoints() method on linestring
+## OGR 3.6.1
 
-OGRSpatialReference:
- * Add support for OGC URLs (#4752)
- * add dumpReadable() method on OGRSpatialReference
- * Differentiation between Hotine Oblique Mercator (aka Variant A) and Oblique Mercator (aka Variant B) (#104, #2745)
- * EPSG: Map methods 1028 and 1029 to normal equidistant cylindrical (#4589)
- * EPSG: add support for EPSG:5514 (Krovak East North)
- * EPSG: Add EPSGTreatsAsNorthingEasting() to deal with CRS with non-GIS friendly northing/easting axis order similarly as what was done with lat/long geographic SRS, and automatically do coord swapping in GML/WFS drivers in that case (#4329)
- * Ozi datum support: support all Ozi datums (#3929), support UTM projection
- * USGS: support USGS angular parameters in radians
- * MorphFromESRI() fix WKT : compare SPHEROID and PRIMEM parameters instead of names (#4673)
- * MorphToESRI(): Add common New Zealand GEOGCS values (#4849)
- * OSR ESRI: add GCS mapping name for ETRS89
- * ogr_srs_esri: Make InitDatumMappingTable() thread-safe
- * ecw_cs.wkt: Add entry for European Terrestrial Reference System 1989.
- * pci_datum.txt: Add entry for D894
- * accept "+proj=XXXX [...] +wktext" as a valid PROJ.4 string, even if projection is unhandled by OGR
- * recognize +proj=etmerc when importing from PROJ.4 string; and output +proj=etmerc when exporting Transverse_Mercator to PROJ.4 string if OSR_USE_ETMERC = YES (#4853)
+### Core
 
-Utilities:
- * ogr2ogr: add a -dim option to force the coordinate dimension to 2 or 3
- * ogr2ogr: accept -nlt PROMOTE_TO_MULTI to ease conversion from shapefiles to PostGIS, by auto-promoting polygons to multipolygons and linestrings to multilinestrings
- * ogr2ogr: add -gcp, -order n and -tps options to georeference ungeoreferenced vectors (#4604)
- * ogr2ogr: fix -select with shapefile output when specified field name case doesn't match source field name case (#4502)
- * ogr2ogr: correctly deal with filenames that begin with 'polygon' or 'multipolygon' as arguments of -clipsrc (#4590)
- * ogr2ogr: return non-zero exit code if the -sql triggers an error (#4870)
- * ogr2ogr: make -t_srs work when there's no per layer source SRS, but there's per feature SRS
- * ogr2ogr: add a -datelineoffset option  to provide users with capability to set different offsets than 170 to -170 (#4098)
- * ogr2ogr: add a -fieldmap option (#5021)
- * ogr2ogr: automatically rename duplicated field names of source layer so that the target layer has unique field names
- * ogrupdate.py: new sample script to update an OGR datasource from another one, by trying to identify matches between the 2 datasources
- * ogr_layer_algebra.py: new sample script to use OGR layer algebra operations
+* OGRArrowArrayHelper::SetDate(): simplify implementation
+* OGRSpatialReference::importFromWkt(): fix compatibility with PROJ master
+  9.2.0dev for DerivedProjectedCRS
+* OGR layer algebra: make sure result layer has no duplicated field names
+  (#6851)
 
-Multi driver changes:
- * Fix bad AND priority when spatial and attribute filter are combined in PG, MySQL, SQLite MSSQLSpatial and VRT drivers (#4507)
+### Utilities
 
-AVCE00 driver:
- * Fix GetFeatureCount() when an attribute or spatial filter is set
+* ogr2ogr: densify points of spatial filter specified with -spat_srs to
+  avoid reprojection artifacts
+* ogr2ogr: discard features whose intersection with -clipsrc/-clipdst
+  result in a lower dimensionality geometry than the target layer geometry
+  type (#6836)
+* ogr2ogr: add warning when -t_srs is ignored by drivers that
+  automatically reproject to WGS 84 (#6859)
+* ogr2ogr: make sure an error in GDALClose() of the output dataset result
+  in a non-zero return code (https://github.com/Toblerity/Fiona/issues/1169)
 
-AVCBin driver:
- * Fix EOF test (#3031)
+### Vector drivers
 
 CSV driver:
- * Allow creating /vsimem/foo.csv
- * Detect and remove UTF-8 BOM marker if found (#4623)
- * Fix handling of empty column names in header (#4654)
- * Allow creating a new .csv file in a directory where there are invalid .csv
-   files (#4824)
- * Use a trick so that the CSV driver creates valid single column files (#4824)
- * Add WRITE_BOM option to CSV driver to write UTF8 BOM for improved Excel/unicode compatibility (#4844)
- * Don't turn \r\n into \n in CSV field output, regardless of LINEFORMAT settings (#4452)
- * Don't left-pad numbers in CSV output when a width is set (#4469)
- * Add support for opening .tsv files, in particular the specific Eurostat .tsv files
-
-DGN driver:
- * Add support to read and write font name in the style (#3392)
-
-DXF driver:
- * Write HATCH (Polygon) compatible with other DXF viewers
- * Write layer geometry extent in file header (#4618)
- * Ignore Spline frame control points for VERTEX of POLYLINE (#4683)
- * Add color to POINT, INSERT and HATCH
- * Take into account extrusion vector to transform from OCS to WCS for MTEXT, TEXT, POINT, LINE, CIRCLE, ELLIPSE, ARC, SPLINE and HATCH (#4842)
+ * accept comma as decimal separator in X_POSSIBLE_NAMES, Y_POSSIBLE_NAMES
+   and Z_POSSIBLE_NAMES fields
 
 FileGDB driver:
- * Add the FGDB_BULK_LOAD configuration option (#4420)
- * Do compulsory field name laundering. (#4458)
- * Add special SQL commands 'GetLayerDefinition a_layer_name' and 'GetLayerMetadata a_layer_name'
- * Implement SetFeature(), DeleteFeature() and DeleteField()
- * Fix inserting features in a layer of geometry type wkbNone
- * Define CLSID/EXTCLSID to fix Feature Class alias being ignored in ArcMap (#4477)
- * Use more sensible default values for tolerance and scale parameters (#4455)
- * Use ESRI SRS DB to find the WKT definition to use when creating a layer (#4838)
- * Fix the way empty geometries are written
- * Add read support for fields of type GlobalID or GUID (#4882)
- * Add XML_DEFINITION layer creation option
- * Support setting fields of type SmallInteger, Float and GUID
-
-Geoconcept driver:
- * Partial support of relaxed GXT export syntax and fix when line is incomplete (#4983)
-
-GeoJSON driver:
- * Fix HTTP HEADERS field send to server (#4546)
- * GeoJSON: write crs object as a FeatureCollection attribute in generated GeoJSON files (#4995); on read, strip AXIS nodes
-
-Geomedia driver:
- * Fix loading of 'boundary' geometries when they are 2.5D or contain more than one inner rings (#4734)
+ * avoid crash in the SDK if passing incompatible geometry type (#6836)
 
-GFT driver:
- * Use OAuth2 authentication (was ClientLogin in previous versions).
+FlatGeoBuf driver:
+ * speed-up writing of DateTime/Date values
 
-GML driver:
- * Add PREFIX and TARGET_NAMESPACE dataset creation options
- * Fix typo when writing geometry type name of MultiLineString in GML3 .xsd (#4674)
- * CreateFeature(): assign spatial ref when it is unset in source feature, even for GML2 case (fixes non-compliance with missing srsName on multi-geometries)
- * Make filtering of features based on OGR_GEOMETRY work (#4428)
- * Avoid point duplication concatenating GML curve segments (#4451)
- * Add special SQL command 'SELECT ValidateSchema()'
- * Allow reading srsDimension attribute when set on LineString element, and not on posList (#4663)
- * Partial support for reading GML 3.3 compat encoding profile, limited to <gmlce:SimplePolygon>, <gmlce:SimpleRectangle>, <gmlce:SimpleTriangle>, <gmlce:SimpleMultiPoint> elements
- * Support WFS GetFeature response document to be piped and opened with /vsistdin/
- * Support specifying connection string as 'filename.gml,xsd=some_filename.xsd' to explicitly provide a XSD
- * Improve detection of extent and srs for WFS 2.0
- * Allow ISO-8859-15 encoded files to be used by Expat parser (#4829)
- * Handle CompositeCurve like MultiCurve (for NAS)
- * Remove duplicate points in rings
- * Add OGR_ARC_MINLENGTH to limit the number of segments in interpolated arcs
- * When there are several geometries per feature, use geometry inside <XX:geometry> element for Inspire compatibility
- * Return per-feature SRS if there's no global SRS for a layer
- * Parse correctly <gml:outerBoundaryIs> when there are attributes in the element (#4934)
- * Recognize <gml:GeodesicString>
- * Recognize <gml:Envelope> elements (#4941)
- * Fix crash when reading CityGML attribute with empty string (#4975)
+GPKG driver:
+ * fix corruption of spatial index on layers with >= 100 000 features,
+   with the default background RTree building mechanism introduced in
+   3.6.0 (https://github.com/qgis/QGIS/issues/51188, #6911) when flushing
+   transactions while adding features (triggered by ogr2ogr). See announcement
+   at top of release notes of this version.
+ * avoid nullptr dereference on corrupted databases
+ * add support for reading tables with generated columns (#6638)
+ * fix bad performance of ST_Transform() by caching the
+   OGRCoordinateTransformation object
+ * improve multi-threaded implementation of GetNextArrowArray() on tables
+   with FID without holes and when no filters are applied (full bulk
+   loading)
+ * FixupWrongRTreeTrigger(): make it work with table names that need to be
+   quoted (https://github.com/georust/gdal/issues/235)
+ * Fix opening /vsizip//path/to/my.zip/my.gpkg with NOLOCK=YES open option
+ * speed-up writing of DateTime/Date values, and fix writing DateTime with
+   milliseconds with a locale where the decimal point is not dot, and when
+   spatialite is not loaded
 
-ILI driver:
- * Support for format codes (#3972)
- * ILI1: Use Topic name from model in itf output
- * ILI1: Recode ISO 8859-1 strings
- * ILI1: Various fixes related to enumerations
- * ILI2: Fix reading with models
-
-Ingres driver:
- * Add effuser and dbpwd connection parameters.
- * Enhance EPSG search bath on WKT AUTH ids.
- * Use system defined sequence for fid instead of global (#4567)
- * Fix a name mixup when creating the table (#4567)
+MITAB driver:
+ * add support for 'Philippine Reference System 1992' datum
 
-KML driver:
- * Report empty layers when there is only empty layers; don't error out on empty document (#4511)
- * Recognize file whose root element is <Document> and not <kml>
+MSSQLSPATIAL driver:
+ * Get UID and PWD from configuration options (#6818)
 
-Idrisi driver:
- * Add support for reading attributes from .AVL / .ADC files
- * Ignore nodata value when computing min/max of CreateCopy()'ed dataset
- * Avoid setting unset values of mean and stddev to PAM (#4878)
+OpenFileGDB driver:
+ * do not use buggy .spx spatial index found in some datasets
+   (geopandas/geopandas#2253)
 
-LIBKML driver:
- * Add stylemap support
- * Add support for GroundOverlay reading (#4738)
- * Fix memory leak in OGRLIBKMLDataSource::FindSchema() when a schema is referenced by name and not by id (#4862)
- * Correct use of temporary variable for schema field names (#4883)
- * Update the layer class internal feature count when a new feature is added
+Parquet driver:
+ * make sure that ArrowLayer destructor is available (for plugin building)
 
-MITAB driver:
- * Fix unwanted changes in data types while converting a datasource to MIF (#3853)
- * Fix incorrect handling of Mollweide projection (#4628)
- * Fix double free in OGRTABDataSource::Create() when exiting with error (#4730)
- * Add datum mapping between EPSG/authority codes and the MapInfo definitions. Falls back to old behavior of name/string matching. (#481)
- * Avoid negative zeros in TOWGS84 read from TAB file (#4931)
+PCIDSK driver:
+ * advertise missing capabilities
 
-MSSQLSpatial driver:
- * Report DeleteFeature/DeleteLayer capabilities
- * Fix the parser to swap coordinates with geography data type (#4642)
- * Fix to read multipoint geometries correctly (#4781)
- * Fix to read 3D geometries correctly (#4806, #4626)
- * Use MSSQL catalog if geometry_columns doesn't exist (#4967)
- * Utilize OGRFieldDefn::IsIgnored() (#4534)
- * Remove requirement for identity fid column in MSSQL tables (#4438)
-
-MySQL:
- * Enable auto reconnect to MySQL (#4819)
- * Reset field width and precision when converting from an unhandled field type to TEXT (#4951)
+PGDump driver:
+ * Fix support for the TEMPORARY layer creation option
 
-NAS driver:
- * Better support for wfsext:Replace (#4555)
- * Skip elements "zeigtAufExternes" and "objektkoordinaten" (fixes PostNAS #3 and #15)
- * Issue a warning when geometry is overwritten, invalid geometry is found or featureless geometry appears
- * Issue a debug message when a existing attribute is overwritten (to catch array)
- * Use forceToLineString() on line strings (fixes PostNAS #18)
- * Handle MultiCurve and CompositeCurve
- * Merge multilinestrings
- * Accept XML files that have AAA-Fachschema.xsd in header (and remove trailing whitespace)
- * Add EPSG:25833
-
-NULL driver:
- * No-op output driver for debugging/benchmarking purpose (Not included in build process)
+PostgreSQL driver:
+ * avoid error when inserting single feature of FID 0 (#6728)
+ * Fix support for the TEMPORARY layer creation option
 
-OCI driver:
- * Fix for index creation when layers are created (#4497)
+SOSI driver:
+ * do not advertise GDAL_DCAP_CREATE_FIELD as it is not implemented
 
-ODBC driver:
- * Allow opening directly *non-spatial* MS Access .MDB databases (on Windows only)
- * Make SetAttributeFilter(NULL) work (#4821)
- * Add optimized GetFeatureCount() implementation
+SQLite driver:
+ * Fix relationships determined through foreign keys have tables reversed
+ * Use 'features' as related table type instead of 'feature' to match
+   gpkg/filegdb
 
-NTF driver:
- * Various fixes when opening ill-formed datasets.
+VDV driver:
+ * make creation of temporary .gpkg files more robust on some platforms
 
-OCI driver:
- * Fix issue with pre-existing tables with laundered names not being recognized (#4966)
- * Make sure the FID counter is correctly initialized when data is appended (#4966)
- * Better quoting of identifiers (#4966)
+WFS driver:
+ * do not remove single or double quote character in a LIKE filter (also
+   applies to CSW driver)
 
-PGeo driver:
- * PGeo / Geomedia : remove heuristics that tried to identify if a MDB file belonged to the PGeo or Geomedia driver (#4498)
+## SWIG bindings:
+ * add gdal.GetNumCPUs() and gdal.GetUsablePhysicalRAM()
 
-PG driver:
- * Add a 'COLUMN_TYPES' layer creation option (#4788)
- * Fix insertion of features with FID set in COPY mode (#4495)
- * Honour datasource read-only mode in CreateField(), CreateFeature(), SetFeature() and DeleteFeature() (#4620)
- * Avoid fatal error when the public schema is absent (#4611)
- * Differ SRS evaluation on SQL layers (#4644)
- * Optimize SRID fetching on SQL result layer; compatibility with PostGIS 2.0 by using ST_SRID (#4699, #4700)
- * Always fetch the SRS to attach it to feature geometry of result SQL layers.
+## CSharp bindings
 
-PGDump driver:
- * Add a 'COLUMN_TYPES' layer creation option (#4788)
+* Default to dotnet 6 (#6843)
 
-REC driver:
- * Add robustness checks against corrupted files
+## Python bindings
 
-SDE driver:
- * Add support for CLOB and NCLOB data type (#4801)
+* make Geometry.__str__() use ExportToIsoWkt() (#6842)
+* setup.py: improve numpy fixing (#6700)
+* add a 'python_generated_files' target that facilitate generation of bindings without building the lib
 
-Shapefile driver:
- * Add support for reading ESRI .sbn spatial index (#4719)
- * Add deferred layer loading
- * Implement auto-growing of string and integer columns
- * Add a special SQL command 'RESIZE table_name' to resize (shrink) fields to their optimum size, also available as a RESIZE=YES layer creation option for convenience
- * Recode field name from UTF-8 to DBF encoding in CreateField()
- * In creation, limit fields of type OFTString to a width of 254 characters (#5052)
- * Spatial index optimization (#4472)
- * Fix GetFeatureCount() when spatial filter set, especially on big-endian hosts (#4491)
- * Fixed wrong return value of OLCStringsAsUTF8 in OGRShapeLayer::TestCapability if GDAL was compiled without iconv support (#4650)
- * Support properly creating layers that include dot character
- * Avoid assert() if SetFeature() is called on a feature with invalid FID (#4727)
- * Correctly deal with .cpg files containing 8859xx string (#4743)
- * Make TestCapability(OLCFastFeatureCount) return TRUE when an attribute filter is set only if attribute indices can be used
- * Shapelib: Fix memory leaks in error code path of DBFCreateLL() (#4860)
- * Deal better with shapefile directories with foo.shp and FOO.DBF, particularly for REPACK support, and particularly for Windows OS (on Linux, foo.shp and FOO.DBF will be 2 different layers)
- * Delete temporary _packed.cpg file generated during REPACK of a layer whose .dbf has an accompanying .cpg file
- * In DeleteDataSource(), delete .cpg file if existing
+# GDAL/OGR 3.5.0 Release Notes
 
-S57 driver:
- * Various fixes when opening ill-formed datasets.
- * Preliminary support for FFPT/FFPC update records (#5028)
- * Add RECODE_BY_DSS suboption to OGR_S57_OPTIONS configuration option that can be set to YES so that the attribute values are recoded to UTF-8, from the character encoding specified in the S57 DSSI record (#5048, #3421, adapted from patch by julius6)
+## In a nutshell...
 
-SQLite/Spatialite driver:
- * Add support for tables with multiple geometry columns (#4768)
- * Add (preliminary) support for SpatiaLite 4.0 database changes (#4784)
- * Make GDAL loadable as a SQLite3 extension (named VirtualOGR) (#4782)
- * Add support for OFTDateTime/OFTDate/OFTTime field types
- * Add a SRID layer creation option
- * Make REGEXP function available by using libpcre (#4823)
- * Add a COMPRESS_COLUMNS layer creation option to make string columns ZLib compressed
- * Implement minimal set of spatial functions if SpatiaLite isn't available
- * SpatiaLite: make use of spatial filter on result layers when the SQL expression is simple enough (no join, etc...) (#4508)
- * SpatiaLite: spatial index can be used even when linking against regular SQLite (#4632)
- * SpatiaLite: to improve performance, defer spatial index creation at layer closing or when a spatial request is done
- * SpatiaLite: use SpatiaLite 'layer_statistics' and 'spatialite_history' to cache the row count and extent of (spatial) layers
- * Spatialite: add support for reading Spatialite 4.0 statistics (filling them on the fly still not implemented)
- * SpatiaLite: for SpatiaLite 4.0, translate INIT_WITH_EPSG=NO into InitSpatialMetaData('NONE') to avoid filling the spatial_ref_sys table
- * On SQL result layers, report the SRS of the geometry of the first feature as the layer SRS
- * Deferred layer definition building for table and view layers
- * Speed-up opening of a result layer that has an ORDER BY
- * Cache GetExtent() result
- * Allow inserting empty feature
- * Return empty layer when SELECT returns 0 rows (#4684)
- * Add compatibility for newer SQLite versions when using the VFS layer (#4783)
- * Add missing column name quoting
-
-TIGER driver:
- * Fix opening TIGER datasource by full file name (#4443)
- * Updated to use VSI*L
+* [RFC 84](https://gdal.org/development/rfc/rfc84_cmake.html):
+  Addition of a CMake build system, which deprecates the existing
+  autoconf/automake and nmake build systems, that will be removed
+  in GDAL 3.6.0. Users are encouraged to adopt the new CMake build system.
+  Documentation of the CMake build system is at
+  https://gdal.org/build_hints.html.
+* Add GDT_Int64 and GDT_UInt64 data types and handle them in MEM, GTiff, netCDF and Zarr drivers
+* Add read/write OGR Parquet (Apache Parquet) and 'Arrow' (Apache Arrow IPC File/Feather or stream) drivers. Only in CMake builds
+* Add OGR HANA database driver. Only in autoconf & cmake builds
+* Removed drivers: RDA, JPEG2000 (Jasper-based), CharLS, MG4 LIDAR, FujiBAS, IDA, INGR, ARCGEN, ArcObjects, CouchDB, Cloudant, DB2, FME, Geomedia, MDB (Java Jackess based), GTM, Ingres, MongoDB (old one. MongoDBv3 is the one to use now), REC, Walk, GMT raster, DODS raster and vector
+* GDAL and OGR GRASS drivers moved to https://github.com/OSGeo/gdal-grass repository
+* Tiger: remove deprecated write side of the driver (#4216)
+* Remove deprecated SWIG Perl bindings
+* Code linting and security fixes
+* Bump of shared lib major version
 
-VFK driver:
- * SQLite is now a compulsory dependency for VFK
- * Store VFK data in SQLite (in-memory) database
- * Don't read whole file into buffer, but only on request
- * id property of data records in VFK file exceed int limit -> use GUIntBig for id values
- * Fix reading multi-line data records
- * Recode string feature properties - convert from cp-1250 to utf-8
- * Skip invalid VFK features
+## New optional dependencies
 
-VRT driver:
- * Add <OGRVRTWarpedLayer> (on-the-fly reprojection of a base layer)
- * Add <OGRVRTUnionLayer> (on-the-fly concatenation of several base layers)
- * Add <FeatureCount>, <ExtentXMin>, <ExtentYMin>, <ExtentXMax>, <ExtentYMax> to <OGRVRTLayer>
- * Add an optional 'dialect' attribute on the <SrcSQL> element
- * Fix OGR VRT sensitive to whitespace and <?xml> nodes (#4582)
- * Optimizations to avoid feature translation when possible
- * Implement GetFIDColumn() (#4637)
- * Implement StartTransaction(), CommitTransaction() and RollbackTransaction() by forwarding to the source layer
- * Auto enable bAttrFilterPassThrough when possible
+* odbc-cpp-wrapper (https://github.com/SAP/odbc-cpp-wrapper): for SAP Hana driver
+* Apache arrow-cpp (https://github.com/apache/arrow/tree/master/cpp) libraries: for Parquet and Arrow drivers
 
-WFS driver:
- * WFS paging: change default base start index to 0 (was 1 before), as now clarified by OGC (#4504)
- * Accept several type names if the TYPENAME parameter is specified
- * Forward SQL ORDER BY clause as a WFS SORTBY for WFS >= 1.1.0
- * Fix spatial filter with WFS 2.0 GeoServer
- * Check that left-side of a binary operator in an attribute filter is a property name before submitting it to server-side
- * Major overhaul of URL-escaping
- * Fix issues when querying the WFSLayerMetadata and that one of the field contains double-quote characters (#4796)
- * Remove auto-added ACCEPTVERSIONS=1.0.0,1.1.1 - when none of VERSION or ACCEPTVERSIONS were specified - because it does not work with WFS 2.0 only servers
- * Automagically convert MAXFEATURES= to COUNT= if people still (wrongly) used it for WFS 2.0
- * Honour paging when running GetFeatureCount() and that RESULTTYPE=HITS isn't available (e.g. WFS 1.0.0) (#4953)
- * Optimize WFS 1.0 (or WFS 1.1.0 where RESULTTYPE=HITS isn't available) so that in some circumstances the GML stream
-   downloaded is used to compute GetFeatureCount() and GetExtent() together
- * Fix segfault on non-GML output when there's SRS axis swapping but the feature has no geometry (#5031)
+## New installed files
 
-XLS driver:
- * Set FID to the row number in the spreadsheet software (first row being 1). In case OGR detects a header line, the first feature will then be assigned a FID of 2 (#4586)
- * Non-ascii path support for Windows (#4927)
+* lib/gdalplugins/drivers.ini: list of (known) drivers in the order they must be registered, for deterministic behavior with plugins
+* shared/gdal/grib2_*.csv: resource files for GRIB driver
 
-## SWIG Language Bindings
+## Removed files
 
-All bindings:
- * Add VSIReadDirRecursive() (#4658)
- * Add a osr.CreateCoordinateTransformation(src, dst) method (and for Java, a static method CoordinateTransformation.CreateCoordinateTransformation(src, dst) (#4836)
- * Add ogr.ForceToLineString()
- * Clear error before OGR_Dr_Open() (#4955)
- * Add a SetErrorHandler(handler_name) method
+* Remove deprecated testepsg utility (#3993)
 
-CSharp bindings:
- * Add C# signature for FileFromMemBuffer that accepts byte array (#4701)
+## Backward compatibility issues
 
-Java bindings:
- * Fix compilation issue with SWIG 2.0.6 on Java bindings (#4669)
- * New test application: ogrtindex.java
- * Fix values of gdalconst.DCAP_* and gdalconst.DMD_* constants (#4828)
- * Fix check for opaque colors in getIndexColorModel()
+See [MIGRATION_GUIDE.TXT](https://github.com/OSGeo/gdal/blob/release/3.5/MIGRATION_GUIDE.TXT)
 
-Perl bindings:
- * Specify module files to install
- * Return values have to be mortal, this was not the case in many instances.
- * New method Driver::Name aka GetName
- * doc target in GNUmakefile to call doxygen
- * Default to first band in GetRasterBand.
- * New method Geo::OGR::Layer::DataSource
- * New method Geo::OGR::Layer::HasField
- * Geometry method accepts geometries in Perl structures
- * Fixed a bug in FeatureDefn::create which changed the fields.
- * New experimental methods ForFeatures and ForGeometries.
- * InsertFeature, Tuple and Row methods use the Tuple and Row methods from Feature.
- * Do not use pattern my var = value if ...; as it seemingly may cause unexpected things.
-   target_key is optional argument.
- * Allow setting geometry type with schema argument.
- * Fix incorrect behavior of Geo::OGR::Geometry method Points in the case of a Point (#4833)
- * Preserve the coordinate dimension in Move method
+## Build changes
 
-Python bindings:
- * setup.py: Changes to run without setuptools (#4693)
- * setup.py: Automatically run 2to3 for Python3
- * Define __nonzero__ on Layer object to avoid GetFeatureCount() being called behind our back when doing 'if a_layer:' (#4758)
- * Fix performance problem when instantiating Feature, especially with Python 3
- * Add RasterBand.ReadBlock(), mostly for driver testing
- * Reject strings when array of strings are expected
- * make gdal.PushErrorHandler() also accept a Python error handler function as an argument (#4993)
- * Fix Feature.ExportToJSon() to write the id attribute when it is 0 (the undefined value is NullFID ## -1)
+Build(all):
+ * Drop support for non-reentrant external libqhull
+ * support libhdf5 1.13.0 (#5061)
+ * Support latest Poppler versions (requires C++17)
+ * Support tiledb >= 2.7 (requires C++17)
+ * Updates for IJG libjpeg-9e
+ * Require using https://github.com/rouault/pdfium_build_gdal_3_5 for PDF PDFium support
+ * cpl_config.h: remove lots of unused defines, and severely restrict what we export in non-GDAL compilation mode
 
-# GDAL/OGR 1.9.0 Release Notes
+Build(autoconf/automake):
+ * fix detection of OpenEXR >= 3 (#4766)
+ * Add support for PCRE2 (to replace deprecated PCRE) (#4822)
+ * Add support for external libqhull_r (#4040)
+ * add a --with-qhull-pkgname=qhull_r/qhullstatic_r option to select with qhull package to use
+ * generate test_ogrsf by default (but not installed)
+ * change default of RENAME_INTERNAL_LIBTIFF/LIBGEOTIFF/SHAPELIB_SYMBOLS to yes
+ * when building against internal libjpeg, prefix by default libjpeg symbols with gdal_ (#4948)
+ * when building against internal libpng, prefix internal libpng symbols with gdal_ (#5303)
+ * m4/acinclude.m4: fix detection of fseeko/ftello on netBSD
+ * detect xlocale.h to use LC_NUMERIC_MASK on Mac (#5022)
+ * move generated headers to a generated_headers subdirectory to allow in a same git checkout, to continue to do autoconf in-source-tree builds as well as cmake out-of-source-tree build
 
-## In a nutshell...
+Build(nmake):
+ * nmake.opt: fix wrong variable name in example MSODBCSQL_LIB
+ * nmake.opt: add a HAVE_ATLBASE_H variable that can be set to NO
 
- * New GDAL drivers: ACE2, CTG, E00GRID, ECRGTOC, GRASSASCIIGrid, GTA, NGSGEOID, SNODAS, WebP, ZMap
- * New OGR drivers:  ARCGEN, CouchDB, DWG, EDIGEO, FileGDB, Geomedia, GFT, IDRISI, MDB, SEGUKOOA, SEGY, SVG, XLS
- * Significantly improved drivers: NetCDF
- * Encoding support for shapefile/dbf (#882)
- * RFC 35: Delete, reorder and alter field definitions of OGR layers
- * RFC 37: Add mechanism to provide user data to CPLErrorHandler (#4295)
- * gdalsrsinfo: new supported utility to report SRS in various form (supersedes testepsg)
+## Internal libraries
 
-## New installed files
+* Internal zlib: update to 1.2.12 (#5587)
+* Internal libtiff: resync with upstream
+* Internal libgeotiff: resync with upstream
+* Internal libpng: fix memleak on corrupted file (ossfuzz #44486)
+* Internal libjson: update to 0.15.0
+* Internal libLerc: Prevent LERC out of bounds access (#5598)
+* Internal libqhull: update to qhull_r 2020.2 (8.0.2)
 
- * data/nitf_spec.xml and data/nitf_spec.xsd
+## GDAL 3.5.0 - Overview of Changes
 
-## Backward compatibility issues
+### Port
 
- * GTiff: ensure false easting/northing in geotiff geokeys are treated as being in geosys units (#3901)
- * GRIB: Fix grid vs cell-center convention (#2637)
- * OGR SQL: with DISTINCT, consider null values are such, and not as empty string (#4353)
+* CPLRecode(): fix recoding between UTF-8 and CP_ACP/CP_OEMCP on Windows build that have iconv support
+* CPLRecodeIconv(): avoid potential unsigned integer overflow (ossfuzz#41201)
+* Fix out of bounds read in CPLRecodeFromWCharIconV() (#5542)
+* Add VSISetCredential() to set /vsis3, /vsigs, /vsiaz ... credentials for a given file prefix
+* VSICurl: Print response code for failed range requests
+* /vsis3/: allow setting AWS_PROFILE to a profile that uses IAM role assumption
+* IVSIS3LikeFSHandler::CopyFile(): always take into account ret code of CopyObject()
+* VSISync() onto /vsis3/: allow x-amz- headers to be specified for object creation
+* /vsis3/: ignore object class DEEP_ARCHIVE in addition to GLACIER, and add CPL_VSIL_CURL_IGNORE_STORAGE_CLASSES to configure which object classes should be ignored
+* /vsis3/: make sure file properties of /vsis3_streaming/foo are invalidated when /vsis3/foo ones are
+* /vsis3/ with GDAL_DISABLE_READDIR_ON_OPEN: do not hide when accessing non existing file (#1900)
+* VSISync(): fix sync'ing from /vsis3/, /vsigs/, /vsiaz/ to local disk, when the source contains implicit directories
+* /vsiaz/: read credentials from ~/.azure/config as an additional fallback method. Add AZURE_STORAGE_SAS_TOKEN configuration option and deprecate AZURE_SAS
+*  /vsiaz/: allow authorization through an access token specified with the AZURE_STORAGE_ACCESS_TOKEN config option (to be used with AZURE_STORAGE_ACCOUNT)
+* /vsiaz/: fix handling of BlobEndpoint in connection string, and fix signing of requests to handle a directory part in the endpoint
+* /vsiaz/: implement container creation/destruction with VSIMkdir()/VSIRmdir()
+* /vsiaz/: add compatibility with Azurite emulator
+* /vsiadls/: add missing call to InvalidateParentDirectory()
+* /vsigs/: Support type=user JSON file for authentication
+* /vsigs/: fix upload of files > 4 MB in HTTP 1.1 (#5267)
+* /vsigs/, /vsiaz/, /vsiadls/: allow x-goog- / x-ms-/ headers to be specified for object creation
+* ZIP support: avoid warnings on MacOS
+* CPLZLibInflate(): workaround issue with /opt/intel/oneapi/intelpython/latest/lib/libz.so.1 from intel/oneapi-basekit Docker image
+* /vsizip/: fix Eof() detection on stored (ie not compressed) files inside the zip (#5468)
+* /vsitar/: fix reading .tar.gz files when the size of the uncompressed .tar file is a multiple of 65536 bytes (#5225)
+* CPLGetCurrentDir(): use _wgetcwd() on Windows to get a UTF-8 filename
+* CSLTokenizeString2(): make it work with strings > 2 GB
+* CPLLoadConfigOptionsFromFile(): add a \[credentials\] section to load VSI credentials
+* /vsimem/: VSIFTruncateL(): make sure to zeroize beyond the truncated area
 
-## GDAL/OGR 1.9.0 - General Changes
+### Core
 
-Build(Unix):
- * Add --with-rename-internal-libtiff-symbols and --with-rename-internal-libgeotiff-symbols
-   flags in order to safely link against an external libtiff (3.X) and a GDAL built with
-   internal libtiff (4.0) support (#4144)
- * Add --with-mdb --with-java,--with-jvm-lib, --with-jvm-lib-add-rpath options
- * Add --with-podofo, --with-podofo-lib, --with-podofo-extra-lib-for-test options
- * Add --with-armadillo
- * Update to libtool 2.4
- * Fix linking against static libkml (#3909)
- * Fix Xerces detection by using LIBS instead of LDFLAGS (#4195)
- * Check for .dylib too, when configuring MrSID SDK paths (#3910)
- * Fix wrong include order in GNUmakefile of GPX and GeoRSS drivers (#3948)
- * cpl_strtod.cpp: Enable android support (#3952).
- * ensure swig-modules depends on lib-target so make -j works with swig bindings
- * Change how we check for GEOS >= 3.1  (#3990)
- * Define SDE64 on at least x86_64 platforms (#4051)
- * Make ./configure --with-rasdaman=yes work (#4349)
- * MinGW cross compilation: clear GEOS_CFLAGS and XERCES_CFLAGS
-   if headers found in /usr/include, do not use Unix 64 bit IO
- * MinGW build: define __MSVCRT_VERSION__ to 0x0601 if not already set
+* Embedded Python: fixes to load Conda and mingw64 python on Windows
+* Embedded python: list Python 3.10
+* GDALDriver::QuietDelete(): take into account papszAllowedDrivers argument
+* GDALDataset::MarkSuppressOnClose(): delete auxiliary files (#4791)
+* GDALPamRasterBand::CloneInfo(): deal correctly with NaN nodata to avoid generating useless .aux.xml file (#4847)
+* External overviews: automatically turn PLANARCONFIG_CONTIG for WebP overviews
+* GDALDatasetCopyWholeRaster(): clarify INTERLEAVE option meaning and raises warning if invalid value is specified (#4909)
+* CreateCopy(): propagate INTERLEAVE from source data (#4911)
+* Add GDALPamDataset::DeleteGeoTransform() (#4877)
+* Metadata readers: remove thread-unsafe use of localtime()
+* Pleiades metadata reader: fix to handle RPC for Pleiades Neo (#5090)
+* GeoEye metadata reader: avoid potential write stack-buffer overflow on long basename files (#5506)
+* Overview generation: fix Cubic resampling on boundaries between valid and transparent areas (#5016)
+* make GDALProxyRasterBand::RefUnderlyingRasterBand() / UnrefUnderlyingRasterBand() const. May affect out-of-tree drivers
+* Add GDALRasterBand::IsMaskBand() and GetMaskValueRange() virtual methods
+* Avoid CPLError() on number of drivers when PAM is disabled
+* RawRasterBand::AccessBlock(): do not early return in case of truncated block
 
-Build(Windows):
- * Move MSVC warning disabling to nmake.opt, add SOFTWARNFLAGS for external code
- * Use nmake.local (#3959)
- * cpl_config.h.vc: fix up so it also works with mingw (#3960)
- * Build testepsg utility by default when OGR is enabled (#2554)
+### Algorithms
 
-## GDAL 1.9.0 - Overview of Changes
+* Geoloc transformer: fix inverse transform to be exact (#5520)
+* Geoloc transformer: make it usable with arbitrary large geolocation arrays, using temporary GTiff storage (#5520)
+* gdal_grid: add facility to search points included in search ellipse for GDALDataMetrics (minimum, maximum, range, count, average_distance, average_distance_pts) in the already implemented quadtree data structure (#5530)
+* Rasterization of polygons: avoid underflow/overflow of output data type
+* Rasterize: use rounding to integers of floating-point value, and handle +/- inf for floating point rasters
+* Rasterize: make it possible to burn a Int64 attribute into a Int64 raster in a lossless way
+* Warp kernel: avoid writing outside allocated buffer if more threads than needed are allocated
+* warper: better guess output bounds when warping from a rotated pole projection that include poles
+* transformer: implement DST_METHOD=GEOLOC_ARRAY
+* avoid using any resampling kernel when doing just a subsetting of the source image (alignment on pixel boundaries) (#5345)
+* GDALBuildVRT(): in -separate mode, add support for sources such as MEM dataset or non-materialized VRT files
 
-Port:
- * /vsigzip/ : Avoid reading beyond file size in case of uncompressed/stored files in zip (#3908)
- * /vsicurl/ : Better support for escaped and UTF-8 characters
- * /vsicurl/ : speed-up with a per-thread Curl connection cache
- * /vsicurl/ : read https directory listing
- * /vsicurl/ : look for GDAL_DISABLE_READDIR_ON_OPEN configuration option in
-   Open() and Stat() to avoid trying fetching the directory file list
- * /vsicurl/ : fix performance problem when parsing large directory listings (#4164)
- * /vsicurl/ : recognize listing of Apache 1.3
- * /vsicurl/ : fix ReadDir() after reading a file on the same server
- * /vsicurl/ : fetch more info (size, date) when listing FTP or HTTP directories and save it in cache; use those info for ReadDir() and Stat()
- * /vsicurl/: accept 225 as a valid response code for FTP downloads (#4365)
- * /vsicurl/ : add CPL_VSIL_CURL_ALLOWED_EXTENSIONS configuration option that can be used to restrict files whose existence is going to be tested.
- * /vsitar/ : Recognize additional .tar files with slightly header differences
- * /vsizip/ : wrap the returned file handle in a BufferedReader
- * /vsizip/ : fix 1900 year offset for year returned by VSIStatL()
- * /vsizip and /vsitar: remove leading './' pattern at the beginning of filenames contained in the archive
- * /vsistdout_redirect/ : New virtual file system driver that has the same
-   behavior as /vsistdout/ (write-only FS) except it can redirect the output to
-   any VSIVirtualFile instead of only stdout (useful for debugging purposes)
- * Implement VSI*L read caching - useful for crappy io environments like Amazon
- * VSI*L: Add Truncate() virtual method and implement it for unix, win32 and /vsimem file systems
- * VSI*L: Add ReadMultiRange() virtual method to read several ranges of data in single call; add an optimized implementation for /vsicurl/
- * VSIFEofL(): make it more POSIX compliant.
- * Fine tune CPLCorrespondingPaths() for different basenames when paths involved.
- * VSIWin32FilesystemHandler::Open() : implement append mode.  Needed by ISIS2 driver with attached label (#3944)
- * CPLString: add case insensitive find operator (ifind)
- * RFC23: Add the iconv() based implementation of the CPLRecode() function (#3950)
- * Preliminary support for wchar_t with iconv recode (#4135)
- * Avoid calling setlocale if we are already in the C locale, or GDAL_DISABLE_CPLLOCALEC is TRUE (#3979)
- * CPLMiniXML: emit warnings when encountering non-conformant XML that is however accepted by the parser
- * add CPLBase64Encode(); move cpl_base64.h contents to cpl_string.h
- * Use CRITICAL_SECTION instead of Mutex on win32
- * CPLHTTPFetch(): Add a CLOSE_PERSISTENT option to close the persistent sessions
- * CPLHTTPFetch(): Add support for "NEGOTIATE" http auth mechanism
- * CPLHTTPFetch(): Add a CUSTOMREQUEST option
- * VSIBufferedReaderHandle: fix Eof()
- * Add CPLStringList class
- * Add CPLEmergencyError() - to call when services are too screwed up for normal error services to work (#4175)
- * CPLEscapeString(,,CPLES_URL) : don't escape dot character; fix escaping of characters whose code >= 128
+### Utilities
 
-Core:
- * Provide for ABI specific plugin subdirectories on all platforms
- * Force cleanup of datasets when destroying the dataset manager
- * Add a GDALDataset::CloseDependentDatasets() that can be used by GDALDriverManager::~GDALDriverManager() to safely close remaining opened datasets (#3954)
- * Add GDALRasterBand::ReportError() and GDALDataset::ReportError() to prepend dataset name (and band) before error message (#4242)
- * Fix performance problem when serializing huge color tables, metadata, CategoryNames and GCPs to VRT/PAM (#3961)
- * Be careful about Nan complex values getting histogram, avoid locale issues with statistics metadata
- * GDALRasterBand::IRasterIO() default implementation : don't try to use full-res band if I/O failed on the appropriate overview band (for WMS errors)
- * RasterIO: Return earlier when a write error occurred while flushing dirty block
- * GDAL_DISABLE_READDIR_ON_OPEN can be set to EMPTY_DIR to avoid reading the dir, but it set an empty dir to avoid looking for auxiliary files
- * Use sibling file list to look for .aux.xml, .aux, .ovr, world files, tab files
- * Add GDALFindAssociatedFile() (#4008)
- * PAM: Make sure GCPs loaded from a .aux.xml override any existing ones from other sources, like an .aux file
- * PAM: Add cloning of CategoryNames
- * PAM : PamFindMatchingHistogram() - fix floating-point comparison
- * GMLJP2: Use http://www.opengis.net/gml as the schemaLocation
- * GMLJP2: Support for capturing and writing page resolution in a TIFF compatible way (#3847)
- * GDALJP2Box::SetType() : remove byte-swapping so that SetType()/GetType() correctly round-trips. Do appropriate changes in JP2KAK and ECW drivers. (#4239)
- * GDALReplicateWord(): fix off-by-one error initialization (#4090)
+* gdalinfo --build: report PROJ version of build and runtime
+* gdaladdo -clean: remove overviews of mask (#1047)
+* gdalwarp -crop_to_cutline: relax epsilon to avoid extremely long loop (#4826)
+* gdalwarp: do not emit "Point outside of projection domain" / "tolerance condition error" (#4934)
+* gdalwarp: avoid useless use of CHECK_WITH_INVERT_PROJ when computed bounds are at the 'edges' of the geographic domain
+* gdal_translate/gdalwarp: do not delete DIM_/RPC_ auxiliary XML files on converting a jp2 file to a tif file (#5633)
+* gdalbuildvrt: change logic to check homogeneous number of bands (#5136)
+* gdalsrsinfo: emit message when replacement of deprecated CRS occurs, with hint to set OSR_USE_NON_DEPRECATED=NO configuration option to avoid that (#5106)
+* gdalsrsinfo: return a non-zero exit code when specified SRS fails to load (#5201)
+* gdalbuildvrt: add a -strict/-non_strict flag, and in strict mode consider non-existing datasets as a failure (#4755)
+* gdal_pansharpen.py: display usage if not enough filenames provided
+* gdal_polygonize.py: remove use of Unicode double quote characters
+* gdal_polygonize.py: make -8 switch work again (#5000)
+* gdal_sieve.py: fix exception when source dataset has no nodata value (3.4.0 regression) (#4899)
+* gdal_calc.py: support wildcard for filenames, and use 3D arrays instead of list for multiple filenames per alpha
+* gdal_calc.py: raise error when overwriting behavior is apparently wished but not specified (#5270)
+* gdal2tiles: make --no-kml option takes effect (#4940)
+* gdal2tiles: XML escape input filename (#5032)
+* gdal2tiles: remove/fix broken links in generated files
+* gdal2tiles: implement parallel generation of overview tiles (#5052)
+* gdal2tiles: lower chunksize value to allow parallel processing when generating ~ 100 tiles
+* gdal2tiles: fix issue with multiprocessing and the gdal2tiles launcher script on Windows and Python >= 3.8 (#4951)
+* gdal2tiles: support mpi4py multi-node parallelism (#5309)
+* gdal2tiles: detect write error when creating tiles, and allow outputting to /vsi filesystems (#3382, #5370)
+* gdal2tiles: do not generate .aux.xml files on overview tiles
+* bash-completion: fixes and update gdal-bash-completion.sh
 
-Algorithms:
- * polygonize: Added GDALFPolygonize() as an alternative version of GDALPolygonize() using 32b float buffers instead of int32 ones. (#4005)
- * gdalwarp: take into account memory needed by DstDensity float mask (#4042)
- * rasterfill: create working file as a bigtiff if at all needed (#4088)
- * gdalrasterize: use double instead of float to avoid precision issues (#4292)
+### gdal_utils package
 
-Utilities:
- * gdalsrsinfo: new supported utility to report SRS in various form (supersedes testepsg)
- * gdalinfo: add '-nofl' option to only display the first file of the file list
- * gdalinfo: add '-sd num' option to report subdataset with the specified number.
- * gdalinfo: add '-proj4' option to gdalinfo, to report a PROJ.4 string for the CRS
- * gdal_translate: propagate INTERLEAVE metadata to intermediate VRT dataset
- * gdal_translate: force quiet mode when writing to /vsistdout/
- * gdalwarp: Disable CENTER_LONG rewrapping for cutline (#3932)
- * gdalwarp: add -refine_gcps option to discard outliers GCPs before warping (#4143)
- * gdalwarp: add warning if user specifies several of -order, -tps, -rpc or -geoloc options
- * gdalwarp: speed-up when using -tps with large number of GCPs
- * gdalwarp: add support for optional use of libarmadillo to speed-up matrix inversion in -tps mode
- * gdalwarp: detect situations where the user will override the source file
- * gdallocationinfo: do not let one off-db pixel cause all the rest to be suppressed (#4181)
- * gdal_rasterize: fix half pixel shift when rasterizing points; make gdal_rasterize utility increase the computed raster extent by a half-pixel for point layers (#3774)
- * gdal_rasterize: when source datasource has a single layer, use it implicitly if none of -l or -sql is specified
- * nearblack: add -color option (#4085)
- * nearblack: improve detection of collar
- * nearblack: remove useless restrictions on number of bands for -setmask and -setalpha options (#4124)
- * gcps2vec.py: Fix command line parsing; Add SRS definition to created vector layer; Use Point geometry when dumping pixel/line coordinates.
- * gdal_merge.py: add support for -separate with multiband inputs (#4059)
- * gdal_merge.py: add a -a_nodata option (#3981)
- * gdal_proximity.py: -co option existed, but was unused...
- * gdal_fillnodata.py: add -co option
- * Add gdal_ls.py and gdal_cp.py as Python samples
- * Add new sample utility, gdal_edit.py, to edit in place various information of an existing GDAL dataset (projection, geotransform, nodata, metadata) (#4220)
- * gdalcopyproj.py: make it copy GCPs too
- * Add warning if a target filename extension isn't consistent with the output driver
- * Add --pause for convenient debugging, document it and --locale
-
-Multi-driver topics:
- * Implement reading XMP metadata from GIF, JPEG, PNG, GTiff, PDF and the 5 JPEG2000 drivers. The XMP metadata is stored as raw XML content in the xml:XMP metadata domain (#4153)
- * Mark BT, DIPEx, ERS, FAST, GenBIN, GSC, GSBG, GSAG, GS7BG, JDEM, JP2ECW, PNM, RMF, TIL, WCS and WMS drivers as compatible with VSI virtual files
- * Port DOQ1, DOQ2, ELAS, Idrisi, L1B, NDF, NWT_GRD, NWT_GRC, USGSDEM to VSI virtual file API
- * PAM-enable BT and BLX drivers
- * Implement Identify() for AAIGrid, ACE2, DTED, NWT_GRD, NWT_GRC, WMS, WCS, JDEM and BSB drivers
- * Make GIF, JPEG and PNG drivers return a non NULL dataset when writing to /vsistdout/
- * HFA and GTiff: add explicit error message when trying to add external overviews when there are already internal overviews (#4044)
- * Initialize overview manager to support external overviews for AAIGRID, DIPX, ELAS, GXF, FIT, FITS, GMT, GRIB, GSAG, GSBG, GS7BG, ILWIS, L1B, LCP, Leveller, NWT_GRD, NWT_GRC, RIK, SDTS and SAGA
+* Make scripts executable
+* Add entry points for gdal-utils package (#5281)
 
-AAIGrid:
- * Make opening from /vsicurl/ work even when the server returns an empty file list
+### Raster drivers
 
-ACE2 driver:
- * New for GDAL/OGR 1.9.0
- * Read ACE2 DEM
+AAIGRID driver:
+ * add support for 'null' as can be generated by D12 software (#5095)
 
-AIG driver:
- * Support uncompressed integer files, new in ArcGIS 10 it seems (#4035)
- * Use color table from PAM if no native one (#4021)
- * Fallback to PAM mechanism for RAT (#4021)
+BAG driver:
+ * fix 'too many refinement grids' error (#3759)
 
-BSB driver:
- * Parse the GD keyword in BSB_KNP to recognize European 1950 datum (#4247)
- * fix compilation issues with -DBSB_CREATE
+BMP driver:
+ * harden identify checks to avoid misidentification of other datasets (#4713)
 
-CEOS2 driver:
- * avoid potential crash reading past end of string. (#4065)
+BYN driver:
+ * remove validation of nTideSys and nPtType fields
 
-CTG driver:
- * New for GDAL/OGR 1.9.0
- * Read USGS LULC Composite Theme Grid files
+COG driver:
+ * only create RGB JPEG with mask if 4-band is alpha (#4853)
+ * fix potential generation failure when main imagery has overview and mask none
+ * output exactly square pixels when using -co TILING_SCHEME (#5343)
+ * add a ZOOM_LEVEL creation option (#5532)
 
 DIMAP driver:
- * Add support for DIMAP2
- * Check underlying raster for SRS. There are cases where HORIZONTAL_CS_CODE is empty and the underlying raster is georeferenced
-
-E00GRID driver:
- * New for GDAL/OGR 1.9.0
- * Read Arc/Info Export E00 GRID
-
-ECRGTOC driver:
- * New for GDAL/OGR 1.9.0
- * Read TOC.xml file of ECRG products
+ * avoid warning when extracting metadata from unsupported band_id
+ * register metadata on all 6 PNEO bands
+ * validate raster dimensions to avoid further issues (ossfuzz #46762)
 
 ECW driver:
- * Use a long refresh time for ecwp:// connections to ensure we get full resolution data, make configurable
- * Re-enable writing non8bit data in jpeg2000
- * Add implementation of an Async reader (4.x SDK)
- * Improve to support all /vsi stuff (#2344)
- * Ensure ECW_ENCODE_ values are applied for direct Create as well as CreateCopy
- * force adfGeoTransform[5] sign to negative. (#393)
- * Mark GDAL_DCAP_VIRTUALIO=YES when the driver is configured in read-only mode
- * Ensure we fallback to native geotransform if no pam override
- * Try to read projection info embedded in ECW file before reading the worldfile (#4046)
- * Add support for updating geotransform and projection info of a ECW file (#4220)
- * Fix ECW_CACHE_MAXMEM that was without effect and ECW_AUTOGEN_J2I that set an unrelated ECW parameter (#4308)
- * Allow to open a ECW file with invalid EPSG code from SWIG bindings (#4187)
-
-EHdr driver:
- * Improve floating point detection (#3933)
- * Recognize MIN_VALUE and MAX_VALUE as found in ETOPO1 header
- * Try opening the .sch file for GTOPO30 or SRTM30 source file
- * Ignore bogus .stx file where min == nodata
-
-EIR driver:
- * Add support for DATA_TYPE keyword
-
-ENVI driver:
- * Add support for ESRI style coordinate system string (#3312)
- * Try to guess interleave mode from file extension, if interleave keyword is missing
- * Refuse to open unsupported types, but attempt to open everything else.
+ * fix test failures with ECW 5.5
+ * do not try to open UInt32 JPEG2000 if the SDK is buggy (#3860)
+ * fix non-nearest upsampling on multi-band datasets (#5288)
+ * Added source read by swath to improve encoder performance
 
-ENVISAT driver:
- * Correct dfGCPLine values for stripline products (#3160, #3709)
- * Fix checking of tie points per column for MERIS GCPs (#4086)
- * Report metadata from the ASAR ADS and GADS in the RECORDS metadata domain (#4105)
- * Read MERIS metadata (#4105)
- * Read data from ERS products in ENVISAT format (#4105)
- * Improved MERIS Level 2 bands detection (#4141 and #4142)
+ERS driver:
+ * Add support for comments in ERS files (#4835)
 
-EPSILON driver:
- * Now require libepsilon 0.9.1 to build (now dual LGPL/GPL) (#4084)
+ESRIC driver:
+ * Fix bundle file name
 
-ERS driver:
- * Use case insensitive find so case does not matter (#3974)
- * Handle case of 1 m pixel resolution when CellInfo is missing (#4067)
- * Implement ERSRasterBand::SetNoDataValue() (#4207)
- * Add support for DATUM, PROJ and UNITS creation option; report the values read from the .ers file in the ERS metadata domain (#4229)
+FITS driver:
+ * fix non-conformant use of &v[0] that crashes with clang 14 -O2
 
 GeoRaster driver:
- * Set nodata causes invalid XML metadata (#3893)
- * Fix SetStatistics() failure (#4072)
- * Fix default interleaving (#4071)
- * modelCoordinateLocation=CENTER default (#3266)
- * Cache block/level error in update (#4089)
- * Fix sequence.nextval not supported (Oracle 10g) (#4132)
- * change BLOCKING option to OPTIMALPADDING
- * fix 'cannot specify columns on insert create option' (#4206)
- * Fix ULTCoordinate Rows/Columns swapping (#3718)
- * Fix loading of small images, FlushCache issue (#4363)
-
-GIF driver:
- * Make CreateCopy() more friendly with writing in /vsistdout/
+ * fix build without JPEG
 
 GRIB driver:
- * Fix grid vs cell-center convention (#2637)
- * use /vsi for all jpeg2000 files now
- * Fix to allow GFS data to show up properly (#2550)
- * Added a ConfigOption in GRIB driver to not normalize units to metric when reading the data
- * Fixed grib1 & grib2 : pixel size precision introduces error for corner coordinates (#4287)
-
-GTA driver:
- * New for GDAL/OGR 1.9.0
- * Read/write support for Generic Tagged Arrays
+ * GRIB2: mode degrib hard-coded tables to .csv files in resource files
+ * GRIB2: merge content from WMO tables at https://github.com/wmo-im/GRIB2 with DEGRIB ones
+ * fix writing negative longitude of natural origin for Transverse Mercator, and fix reading it for TMerc, LCC, ACEA and LAEA
+ * fix thread-safetey of errSprintf() (#4830)
+ * avoid read heap buffer overflow due to inappropriate split-and-swap on dataset with weird georeferencing (#5290, ossfuzz #41260, ossfuzz #41637)
+ * consider longitudes that slightly exceed 360° as 360° for Split&Swap mode (#5496)
+ * degrib: partial resynchroinzation with degrib 2.25 (degrib-20200921)
+ * fix use of uninitialized memory on some datasets (#5290)
+ * multidim: fix crash when a .idx file is present (#5569)
 
 GTiff driver:
- * Ensure false easting/northing in geotiff geokeys are treated as being in geosys units.  Add GTIFF_LINEAR_UNITS=BROKEN config option to try and read old broken files, and logic to cover for older libgeotiffs when reading (#3901)
- * Add support for a special tag to keep track of properly written linear units (#3901)
- * Implement deferred directory chain scanning to accelerate simple opens
- * Make GTiff COPY_SRC_OVERVIEWS to deal with unusual source overview sizes (#3905)
- * Fix bug when using -co COPY_SRC_OVERVIEWS=YES on a multiband source with external overviews (#3938)
- * Add logic to fill out partial tiles on write in for jpeg images (#4096)
- * Updated to libtiff 4.0.0 final
- * Refresh with libgeotiff 1.4.0, to support for GeogTOWGS84GeoKey
- * Add support for Geocentric SRS
- * libtiff: Enable DEFER_STRILE_LOAD
- * Turn warning 'ASCII value for tag xx into more silent CPLDebug message
- * Overviews: Improve error reporting for >16bit images to JPEG compression
- * Use CPLAtof() for geotiff and epsg .csv file handling (#3886, #3979)
- * Lots of Imagine and ESRI PE string citation handling changes from 1.8-esri. Some citation related changes only compiled in if ESRI_SPECIFIC defined.
- * Give PAM information precedence over metadata from GeoTIFF itself.   Avoid unnecessary (default) writes of scale/offset.  Treat (0,1,0,0,0,-1) as a default geotransform as well as (0,1,0,0,0,1).
- * Migrate in some ESRI only logic for 1bit color tables, AdjustLinearUnits and default for 1bit data
- * Add a GTIFF_IGNORE_READ_ERRORS configuration option (#3994)
- * Lazy loading of RPC/RPB/IMD files (#3996)
- * Add mutex protection in GTiffOneTimeInit() to avoid occasional segfaults
- * Stop interpreting 4th band as alpha when not defined
- * Also list nSubType == FILETYPE_PAGE as subdatasets
- * CreateCopy(): copies category names from the source bands
- * Add capability of writing TIFFTAG_MINSAMPLEVALUE and TIFFTAG_MAXSAMPLEVALUE
- * Don't prevent from loading GTiff driver even if libtiff version mismatch detected (#4101)
- * Use GTIFF_ESRI_CITATION flag to disable writing special meaning ESRI citations
- * Optimize GTiffRGBABand implementation (#3476)
- * Add GTIFF_DIRECT_IO config. option that can be set to YES so that IRasterIO() reads directly bytes from the file using ReadMultiRange().
- * Use VSI_TIFFOpen() in GTIFFBuildOverviews() to make it work on virtual file systems
- * Treat _UNASSALPHA as alpha
-
-GRASSASCIIGrid driver:
- * New for GDAL/OGR 1.9.0
- * Read GRASS ASCII grids (similar to ArcInfo ASCII grids)
-
-GRIB driver:
- * Check for memory allocation failures
-
-HDF4 driver:
- * Use larger object name buffer
- * Handle SWopen failures
+ * explicitly enable strip choping to avoid issues with cmake libtiff builds
+ * JXL codec: use non-deprecated methods and update for compatibility with latest state of libjxl
+ * only emit warnings on libgeotiff PROJ errors (#4801)
+ * SRS reading: add warning when CRS definition from geokeys is inconsistent with EPSG, and a GTIFF_SRS_SOURCE=EPSG/GEOKEYS configuration option to alter the SRS (#5399)
+ * avoid warning with >= 5 bands and JPEG compression
+ * LERC overview related improvements (#4848): MAX_Z_ERROR_OVERVIEW, ZLEVEL_OVERVIEW, ZSTD_LEVEL_OVERVIEW configuration options added
+ * propagate SPARSE_OK to overviews (#4932), and add SPARSE_OK_OVERVIEW configuration option.
+ * fix performance issue when reading transfer functions (#4923)
+ * avoid huge memory allocation when generating overviews on large single-band 1-bit tiled files (#4932)
+ * make SetGCPs(), SetGeoTransform(), SetSpatialRef(), SetNoDataValue(), SetMetadata(Item)() write to PAM .aux.xml on read only files (#4877)
+ * add support for reading/writing color table from/into PAM .aux.xml (#4897)
+ * do not warn about buggy Sentinel1 geotiff files use a wrong 4326 code for the ellipsoid
+ * fix DISCARD_LSB with nodata value (#5097)
+ * GTIFWktFromMemBufEx / GTIFMemBufFromSRS: use OSRSetPROJSearchPaths()  (#5184). Affects GeoJP2 encoding/decoding
+ * fix exposing WEBP_LOSSLESS option
+ * early checks for PREDICTOR settings, and update internal libtiff to support PREDICTOR=2 for 64-bit samples (rasterio/rasterio#2384)
+ * remove limitation to 32,000 bytes when writing the GDAL metadata tag (#4116)
+ * Create(): better detection of threshold when to switch to BigTIFF for tiled images (#5479)
+ * unset geotransform from non-PAM source if PAM defines GCPs, and PAM is the prioritary source
+ * fix crash when building overviews and computing approx stats (#5580)
 
 HDF5 driver:
- * Fix HDF5/BAG handle/memory leaks (#3953)
- * Better error checking
- * Do not return NULL from getprojectionref() (#4076)
- * Identify datasets whose header starts with some XML content (#4196)
- * Fixed HDF5 variable length string attributes reading (#4228)
+ * fix issue when netCDF and/or HDF5 drivers built as plugins with multidim datasets
+ * detect Matlab .mat HDF5-based, or other files with HDF5 superblock at offset 512
 
 HFA driver:
- * Add support for writing RATs (#999)
- * Add support for reading 2bit compressed .img files (#3956)
- * Update EPRJ_ list based on input from Erdas, round trip Krovak and Mercator Variant A (#3958)
- * Major push to move projections from 1.6-esri into trunk in HFA driver (#3958)
- * Reinitialize RRDNamesList and ExternalRasterDMS (#3897)
- * Ensure the whole entry is reinitialized when writing proparams and datum (#3969)
- * Ensure PEString cleared if we aren't writing it (#3969)
- * Get nodata from an overview if not present on main band.  Set geotransform[1] and [5] to 1.0 if pixelSize.width/height are 0.0.  Improve error checking if MakeData() fails.
- * atof() changed to CPLAtofM() to avoid locale issues.
- * Altered Edsc_BinFunction column "Value" to "BinValues" and changed type.
- * Equirectangular StdParallel1 changed to LatitudeOfOrigin.
- * Logic to preserve psMapInfo->proName as the PROJCS name for UTM/StatePlane.
- * Special state plane zone handling.
- * Special wisconsin handling for some LCC and TM SRSes.
- * 1-bit null blocks to default to 1 in ESRI_BUILDs
- * Add support for GDA94 (#4025)
-
-Idrisi driver:
- * Fix segfaults when fields are missing in .ref or .rdc files (#4100)
- * Fix problem with inverse flattening when reading a SRS of a sphere (#3757)
-
-INGR driver:
- * Set NBITS for 1 bit bands
-
-ISIS2/ISIS3 driver:
- * Various improvements to PDS related drivers (#3944)
-
-JaxaPalsar driver:
- * Fixed datatype of ALOS PALSAR products Level 1.5 (#4136)
- * Fixed detection of unsupported PALSAR Level 1.0 products (#2234)
-
-JPIPKAK driver:
- * Add try to in GetNextUpdatedRegion() to protect against kakadu exceptions (#3967)
- * Fixed a serious bug in the computation of fsiz and region. (#3967)
+ * Fix "Pulkovo 1942" datum write to IMG files
 
-KMLSUPEROVERLAY driver :
- * Remove spaces between coordinates in coordinate triplets as mandated by KML 2.2 spec, to restore compatibility with Google Earth 6.1.0.5001 (#4347)
+JP2KAK driver:
+ * add support for reading/writing Int32/UInt32 data types
+ * Add support for Creversible & RATE creation option  (#5131)
 
-LAN driver:
- * Preliminary support for writing gis/lan files
+JP2OpenJPEG driver:
+ * add a STRICT=YES/NO open option to allow decoding some broken files (requires OpenJPEG 2.5)
 
-MEM driver:
- * Add support for remembered histograms and PIXELTYPE
+JPEG driver:
+ * make sure that max memory usage check is done in all code paths that require it
 
-MG4Lidar driver:
- * Clamp nOverviewCount, some LiDAR files end up with -1 overviews
+KEA driver:
+ * print error message when opening of kea file fails
 
-MrSID driver:
- * Initialize overview manager to enable RFC 15 mask band support (#3968)
- * Mark GDAL_DCAP_VIRTUALIO=YES when the driver is configured in read-only mode
- * Handle LTI_COLORSPACE_RGBA
+MRF driver:
+ * Fix padding space logic (#5096)
+ * Add LERC2 padding when encoding
+ * Adjust PNG limits (#5347)
+ * Allow using external libLerc (#5386)
 
-NetCDF driver:
- * Set cylindrical equal area representation to the proper cf-1.x notation (#3425)
- * Fix precision issue in geotransform (#4200) and metadata
- * Add support for netcdf filetypes nc2(64-bit) and nc4 to netCDFDataset (#3890, #2379)
- * Add function Identify and IdentifyFileType() (#3890, #2379)
- * Temporarily disabling PAM for netcdf driver (#4244)
- * Make creation of geographic grid CF compliant (#2129)
- * Fixes for netcdf metadata export: duplication, Band metadata, int/float/double vs. char* and add_offset/scale_factor (#4211, #4204), double precision ( 4200)
- * Fix netcdf metadata import (float and double precision) (#4211)
- * Improve import of CF projection
- * Add netcdf history metadata (#4297)
- * CF-1.5 compatible export of projected grids (optional long/lat export)
- * Fix LCC-1SP import and export (#3324)
- * Fix handling of UNITS import and export (#4402 and #3324)
- * Fix upside-down export and import of grids without projection and geotransform (#2129, #4284)
- * Support import of polar stereographic variant without standard parallel (#2893)
- * New driver options
- * Add simple progress indicator
- * Add support for netcdf-4, HDF4 and HDF5 (#4294 and #3166)
- * Add support for deflate compression
- * Add format support information and CreateOptionList to driver metadata
- * Add support for valid_range/valid_min/valid_max
- * Proper handling of signed/unsigned byte data
- * Add support for Create() function and significantly refactor code for export (#4221)
- * Improvements to CF projection support (see wiki:NetCDF_ProjectionTestingStatus)
+MSG driver:
+ * fix/workaround MSVC warnings
 
-NGSGEOID driver:
- * New for GDAL/OGR 1.9.0
- * Read NOAA NGS Geoid Height Grids
+netCDF driver:
+ * handle 'crs_wkt' attribute
+ * always use WKT when found, without comparing with CF params (#4725)
+ * limit SetFromUserInput() use to non file input
+ * disable filename recoding to ANSI on Windows for netCDF >= 4.8
+ * add WRITE_GDAL_VERSION and WRITE_GDAL_HISTORY creation option
+ * add a VARIABLES_AS_BANDS=YES/NO open option
+ * allow update mode of raster datasets
+ * implement SetMetadataItem()/SetMetadata()
+ * avoid warnings when CreateCopy() a non-georeferenced dataset, and opening a 1x1 non-georeferenced dataset
+ * add a IGNORE_XY_AXIS_NAME_CHECKS=YES open option (qgis/QGIS#47158)
+ * recognize x/y axis from GMT generated files as geospatial axis (#5291, qgis/QGIS#47158, qgis/QGIS#45704)
+ * read CF attributes giving CRS component names (#5493)
 
 NITF driver:
- * Add a generic way of decoding TREs from a XML description file located in data/nitf_spec.xml
- * Add a new metadata domain xml:TRE to report as XML content the decoded TREs
- * Add NITF_OPEN_UNDERLYING_DS configuration option that can be set to FALSE to avoid opening the underlying image with the J2K/JPEG drivers
- * Support JP2KAK driver for jpeg2000 output, use /vsisubfile/ in all cases
- * NITFCreate(): deal with cases where image_height = block_height > 8192 or image_width = block_width > 8192 (#3922)
- * Add IREPBAND and ISUBCAT creation option (#4343)
- * Make sure scanline access is used only on single block image (#3926)
- * Add a NITF_DISABLE_RPF_LOCATION_TABLE_SANITY_TESTS configuration option that can be set to TRUE to blindly trust the RPF location table (#3930)
- * Correctly assign hemisphere for a ICORDS='U' NITF file with accompanying .nfw and .hdr files (#3931)
- * Make PAM available at band level for JPEG/JPEG2000 compressed datasets (#3985)
- * Read IMRFCA TRE for RPC info. Read CSEXRA TRE.
- * Read CSDIDA and PIAIMC TREs as metadata
- * Optional support for densifying GCPs and applying RPCs to them
- * Add GetFileList() that captures associated files with some NITF products.
- * Added ESRI only ExtractEsriMD() function.  Add raw header capture in NITF_METADATA domain in base64 encoded form.
- * Fetch NITF_DESDATA in segment data; decode specialized fields of XML_DATA_CONTENT and CSATTA DES
- * Truncate TRE name to 6 character (#4324)
- * Take into account the presence of comments when patching COMRAT for JPEG/JPEG2000 NITF (#4371)
-
-NWT_GRD driver:
-  * Fix interpolation of color when the maximum z value is below a threshold of the color scheme (#4395)
-
-OPENJPEG driver:
- * Optimize decoding of big images made of a single block
- * Fallback to PAM to get projection and geotransform
+ * Add ISO-8859-1 decoding for file and image header metadata
+ * avoid PROJ error to be emitted in Create() when ICORDS=N/S (#5563)
+ * CADRG polar zone! CRS definition aligned with ADRG and SRP (#5656)
+ * RPF.toc: skip plausibility check for Overviews and Legends; disable some checks for polar zones (#5654)
 
 PCIDSK driver:
- * Refresh PCIDSK SDK from upstream
- * Fix support for band description setting, add BANDDESCn creation option
- * Implement GetCategoryNames(), and color table from metadata for PCIDSK
- * Fix exception on files with bitmaps as bands in GetFileList()
- * Avoid closing and reopening file so we don't fracture the SysBMData with a metadata write
- * In read-only, if .pix is raster (resp. vector) only, then make sure that OGR (resp. GDAL) cannot open it
-
-PDF driver:
- * Support linking against podofo library (LGPL) instead of poppler --> however
-   pdftoppm binary from poppler distribution is needed for rasterization
-
-PDS driver:
- * Add support for MISSING and MISSING_CONSTANT keywords for nodata values (#3939)
- * Add support for uncompressed images in the UNCOMPRESSED_FILE subdomain (#3943)
- * Add support for PDS_Sample/LineProjectOffset_Shift/Mult (#3940)
- * Preliminary qube write support (#3944)
- * Fix band offset computation in BSQ (#4368)
-
-PNG driver:
- * Add compatibility with libpng >= 1.5.0 (#3914)
- * Upgrade internal libpng to 1.2.46
-
-PNM driver:
- * Make it compatible with VSI virtual files
+ * fix write heap-buffer-overflow (ossfuzz #41993)
 
-PostgisRaster driver:
- * Speed of PostGIS Raster driver improved. (#3228, #3233)
+PDS4 driver:
+ * write conformant Equirectangular when input raster is a geographic CRS
 
-Rasterlite driver:
- * Robustness against buggy databases
- * Enable QUALITY creation option for WEBP tiles
+PDF driver:
+ * Named NEATLINE extraction from ISO32000 style Geospatial PDF (#5504)
 
-RS2 driver:
- * Setup to properly support subdataset oriented metadata and overviews (#4006)
- * Allow opening subdatasets by passing in the folder (#4387)
+RRASTER driver:
+ * add support for CRS WKT2 (#5473)
 
 SAGA driver:
- * Fix reading & writing .sdat files bigger than 2GB (#4104)
- * Use nodata value from source dataset in CreateCopy() (#4152)
-
-SDE driver:
- * Break assumption that LONG==long (#4051)
-
-SNODAS driver:
- * New for GDAL/OGR 1.9.0
- * Read Snow Data Assimilation System datasets
-
-SRP driver:
- * Set Azimuthal Equidistant projection/geotransform info for ASRP north/south polar zones (#3946)
- * ASRP/USRP: fix skipping of padding characters on some datasets (#4254)
-
-SRTMHGT driver:
- * Fix segfault in CreateCopy() if we cannot create the output file
+ * implement SetNoDataValue() (#5147)
 
-Terralib driver:
- * Removed driver: was unfinished and is unmaintained (#3288)
+SENTINEL2 driver:
+ * identify zipped S2 datasets from file content (#5505)
 
-TIL driver:
- * Implement GetFileList() (#4008)
+TGA driver:
+ * fix reading images with runs crossing scanlines (#5168)
 
-TSX driver:
- * Add support for selecting a directory
- * Make Terrasar-X driver also open TanDEM-X data (#4390)
- * Fix memleaks
+TileDB driver:
+ * fix crash when creating array from subdatasets fails
+ * fix handling of relative paths on Windows
+ * avoid warnings about deprecated functions
 
 USGSDEM driver:
- * Ensure blocks read in C locale (#3886)
-
-VRT driver:
- * Implement VRTDataset::IRasterIO() that can delegate to source Dataset::RasterIO() in particular cases
- * Implement GetMinimum() and GetMaximum()
- * GetFileList(): for /vsicurl/ resources, don't actually test their existence as it can be excruciating slow
- * VRTComplexSource: correctly deal with complex data type (#3977)
- * Fix 2 segfaults related to using '<VRTDataset', but with invalid XML, as the target filename of VRTDataset::Create()
- * Fix 'VRTDerivedRasterBand with ComplexSource and nodata value yields potentially uninitialized buffer' (#4045)
- * VRTDerivedRasterBand: Recognize PixelFunctionType and SourceTransferType options in AddBand() for  (#3925)
- * Copy GEOLOCATION metadata in CreateCopy().
- * VRTDerivedRasterBand: register pixel functions in a map for faster access (#3924)
- * VRT warped dataset: limit block size to dataset dimensions (#4137)
-
-WCS driver:
- * Add time support (#3449)
- * Honour dimensionLimit restrictions on WCS request size.
- * Fetch projection from returned image file chunks if they have them (i.e. GeoTIFF).
- * Honour Resample option for WCS 1.0.
- * Include service url in GetFileList if ESRI_BUILD defined
- * Check validity of 'OverviewCount' parameter
- * Add support for getting the coverage offering details from the xml:CoverageOffering domain
- * Try to preserve the servers name for a CRS (WCS 1.0.0) (#3449).
-
-WebP driver:
- * New for GDAL/OGR 1.9.0
- * Read/write GDAL driver for WebP image format
-
-WMS driver:
- * Implementation of the OnEarth Tiled WMS minidriver (#3493)
- * Implementation of a VirtualEarth minidriver
- * Improve handling of .aux.xml files, ensure colorinterp support works for tiled wms server
- * Report subdatasets when being provided WMS:http://server.url (classic WMS), WMS:http://server.url?request=GetTileService or a url to a TMS server; recognize datasets specified as a pseudo GetMap request
- * Add capability to open the URL of a REST definition for a ArcGIS MapServer, like http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer?f=json
- * Parse WMS-C TileSet info in VendorSpecificCapabilities of GetCapabilities
- * Implement CreateCopy() when source is a WMS dataset to serialize to disk the definition of a WMS dataset
- * WMS dataset : report INTERLEAVE=PIXEL
- * Make autodetection of TMS work with http://maps.qualitystreetmap.org/tilecache
- * Add capability to set Referer http header
- * Add a TMS-specific hack for some servers that require tile numbers to have exactly 3 characters (#3997)
- * Fix to make file:// URL to work
- * Add hack for OSGEO:41001
- * Fix GDALWMSRasterBand::IReadBlock() to avoid the ReadBlocks() optimization to become an anti-optimization in some use cases
- * Add service=WMS parameter if not already provided in <ServerUrl> (#4080)
- * Add options, ZeroBlockHttpCodes and ZeroBlockOnServerException, to control which http error codes should be considered as meaning blank tile (#4169)
-
-ZMap driver:
- * New for GDAL/OGR 1.9.0
- * Read/write GDAL driver for ZMap Plus Grid format
-
-## OGR 1.9.0 - Overview of Changes
-
-Core:
- * RFC35: Add OGRLayer::DeleteField(), ReorderField(), ReorderFields() and AlterFieldDefn()
- * Avoid OGRLineString::addPoint( OGRPoint * poPoint ) to always force the geometry to be 3D (#3907)
- * Add a OGREnvelope3D object and getEnvelope( OGREnvelope3D * psEnvelope ) / OGR_G_GetEnvelope3D() method
- * Add OGR_G_SimplifyPreserveTopology() / OGRGeometry::SimplifyPreserveTopology()
- * OGR SQL: recognize optional ESCAPE escape_char clause
- * OGR SQL: allow NULL to be used as a value, so that 'SELECT *, NULL FROM foo works'
- * OGR SQL: Accept doublequoting of column_name in 'SELECT DISTINCT "column_name" FROM table_name' (#3966)
- * OGR SQL: OGRGenSQLResultsLayer: if the dialect is explicitly set to OGRSQL, don't propagate the WHERE clause of the SELECT to the source layer, but evaluate it instead at the OGRGenSQLResultsLayer level (#4022)
- * OGR SQL: Avoid error emission on requests such as 'SELECT MIN(EAS_ID), COUNT(*) FROM POLY'
- * OGR SQL: Avoid setting width/precision for AVG column
- * OGR SQL: Add a mechanism to delete a layer (DROP TABLE x)
- * OGR SQL: fix segfault when evaluating a 'IS NULL' on a float column (#4091)
- * OGR SQL: add support for new special commands : 'ALTER TABLE layername ADD COLUMN columnname columntype', 'ALTER TABLE layername RENAME COLUMN oldname TO new name', 'ALTER TABLE layername ALTER COLUMN columnname TYPE columntype', 'ALTER TABLE layername DROP COLUMN columnname'
- * OGR SQL: Add implicit conversion from string to numeric (#4259)
- * OGR SQL: Correctly parse big SQL statements (#4262)
- * OGR SQL: fix joining a float column with a string column (#4321)
- * OGR SQL: with DISTINCT, consider null values are such, and not as empty string (#4353)
- * OGR SQL: fix offset conversion for SUBSTR() (#4348)
- * Add OGR_G_GetPoints()
- * Fix parsing of WKT geometries mixing 2D and 3D parts
- * OGR_Dr_CopyDataSource() and OGRSFDriver::CopyDataSource() : make sure that the driver is attached to the created datasource (#4350)
- * OGRFeature::SetFrom() supports more conversions between field types.
-
-OGRSpatialReference:
- * Update to EPSG 7.9 database
- * Add Geocentric SRS Support
- * Add support for Interrupted Goode Homolosine projection (#4060)
- * Add SRS vertical unit support
- * Add SetVertCS(), OSRSetVertCS(), SetCompound(), IsCompound() and target oriented set/get linear units functions
- * ESRI : Improve spheroid remapping (#3904)
- * ESRI: Compare whole names in RemapNameBasedOnKeyName() (#3965).
- * ESRI: addition of ImportFromESRIStatePlaneWKT and ImportfromESRIWisconsinWKT methods
- * ESRI: importFromESRI() : support POLYCONIC projection from old style files (#3983)
- * ESRI: importFromESRI() : support LAMBERT_AZIMUTHAL projection from old style files (#4302)
- * ESRI: fix EPSG:32161 mapping
- * ESRI: fix Stereo/Oblique_Stereo/Double_Stereo (bugs #1428 and #4267)
- * ESRI: fix projection parameter mapping for Orthographic projection (#4249)
- * ESRI: add optional fixing of TOWGS84, DATUM and GEOGCS with GDAL_FIX_ESRI_WKT config. option (#4345 and #4378)
- * ESRI: fix add Krassowsky/Krasovsky 1940 spheroid mapping
- * Add EPSG:102113 in the data/esri_extra.wkt file
- * Add Germany zone 1-5 in range 31491-31495 in the data/esri_extra.wkt file
- * fix NAD_1983_Oregon_Statewide_Lambert_Feet_Intl code
- * added/updated coordinates systems provided by IGNF (#3868)
- * ERM: add support for EPSG:n based coordinate systems (#3955)
- * ImportFromEPSG(): Add default support for various degree units without supporting .csv file.
- * ImportFromEPSG(): Add support for spherical LAEA (#3828)
- * ImportFromEPSG(): use CoLatConeAxis parameter to build Krovak azimuth parameter (#4223)
- * importFromURN(): support compound SRS
- * importFromURN(): accept 'urn:opengis:crs:' syntax found in some TOP10NL GML files
- * Add CRS: support and for importing two part ESRI PE SRS with VERTCS
- * SetFromUserInput() : recognize 'IGNF:xxx'
- * Ensure that the result of importFromEPSGA() always has keyword ordering fixed up (#4178)
- * exportToERM() : deal with GDA94 datum and its UTM projections (#4208)
- * Fix ESRI_DATUM_NAME for D_MOLDREF99 and D_Philippine_Reference_System_1992 (#4378)
-
-Utilities:
- * ogr2ogr: Make 'ogr2ogr someDirThatDoesNotExist.shp dataSourceWithMultipleLayer' create a directory
- * ogr2ogr: make -overwrite/-append work with non-spatial tables created by GDAL 1.8.0;
- * ogr2ogr: take into account fields specified in the -where clause in combinations with -select to create the correct list of fields to pass to SetIgnoredFields() (#4015)
- * ogr2ogr: fix -zfield option so that the modified geometry properly reports coordinate dimension = 3. Also avoids it to be in the list of ignored field names
- * ogr2ogr: add -simplify option to simplify geometries
- * ogr2ogr: add a warning if the target filename has an extension or a prefix that isn't consistent with the default output format (i.e. Shapefile), but which matches another driver. Can be made quiet with -q option
- * ogrinfo/ogr2ogr: exit when SetAttributeFilter() fails, instead of silently going on (#4261)
-
-Multi driver topics:
- * RFC35 : implementation in Shapefile, Memory and PG drivers (#2671)
- * DXF, EDIGEO, KML, LIBKML, Shapefile, SDE, SOSI: Mark as supporting UTF-8
- * BNA, CSV, GPX, KML, GeoRSS, GML, LIBKML, GeoJSON, PGDump : accept both /dev/stdout and /vsistdout/ as filenames; remove 'stdout' as a valid alias that could be used in some of them (#4225, #4226)
-
-ARCGEN driver:
- * New for GDAL/OGR 1.9.0
- * Read-only OGR driver for Arc/Info Generate files
-
-CouchDB driver:
- * New for GDAL/OGR 1.9.0
- * Read/write OGR driver for CouchDB / GeoCouch
-
-CSV driver:
- * Add special recognition and handling for USGS GNIS (Geographic Names Information System) files
- * Directly recognize the structure of the allCountries file from GeoNames.org
- * Implement GetFeatureCount() to be a little bit faster
- * Accept /dev/stdout as a filename for CreateDataSource()
- * Fix handling of non-numeric values in numeric columns (NULL instead of 0)
- * Fix handling of column names with numbers
- * Recognize numeric fieldnames inside quotes
- * Accept real numbers with ',' as decimal separator when ';' is the field separator (CSV export in French locale)
-
-DXF driver:
- * Add support for DXF_ENCODING config var and DWGCODEPAGE header field (#4008)
- * Added DXF_MERGE_BLOCK_GEOMETRIES
- * Treat ATTDEFs the same as TEXT entities
- * Implement hatch polyline and elliptical arc support, hatch fill, do not polygonize closed smoothed lines
- * Add handling of hidden/frozen/off layers.
-
-DWG driver:
- * New for GDAL/OGR 1.9.0
- * Read DWG files through the use of Open Design Alliance Teigha Libraries
-
-EDIGEO driver:
- * New for GDAL/OGR 1.9.0
- * Read files of French EDIGEO exchange format
-
-FileGDB driver:
- * New for GDAL/OGR 1.9.0
- * Read/write support based on FileGDB API SDK
-
-GeoJSON driver:
- * Support writing 3D lines and polygons
- * Add a bbox attribute with the geometry bounding box if WRITE_BBOX layer creation option is set (#2392)
- * Write bbox of FeatureCollection before features when file is seekable
- * Remove unsetting of FID that caused FID not at the last position of properties to be lost
- * Properly deal with null field values in reading and writing
- * Handle OFTIntegerList, OFTRealList and OFTStringList fields
- * Recognize other arrays as OFTString field
- * Fix assertion on unhandled ESRI json (#4056)
- * Fix segfault on feature where 'properties' member exists but isn't an object (#4057)
- * Better detection of OGR type for numeric JSON fields (#4082)
- * Add COORDINATE_PRECISION layer creation option to specify the maximum number of figures after decimal point in coordinates; set to 15 by default with smart truncation of trailing zeros (like done for WKT)
- * Add OGR_G_ExportToJsonEx() to accept a list of options
- * Add ability to detect geojson files without an extension (#4314)
-
-Geomedia driver:
- * New for GDAL/OGR 1.9.0
- * Read-only driver to read Geomedia .MDB databases
-
-GeoRSS driver:
- * Parse RSS documents without <channel> element
-
-GFT driver:
- * New for GDAL/OGR 1.9.0
- * Read/write driver for Google Fusion Tables
-
-GML driver:
- * Major performance improvement when reading large multi-layer GML files. See usage of new GML_READ_MODE configuration option
- * Support gml:xlink resolving for huge GML files through GML_SKIP_RESOLVE_ELEMS=HUGE (requires SQLite)
- * Add GML_GFS_TEMPLATE config option to specify a template .gfs file that can be used for several GML files with similar structure (#4380)
- * Be able to build the driver with support of both Expat and Xerces libraries and add ability of select one at runtime. For UTF-8 documents, we select Expat if it is available, because it is faster than Xerces
- * Expose fid or gml_id as feature fields if autodetected. This behavior can be altered by the GML_EXPOSE_FID / GML_EXPOSE_GML_ID configuration option.
- * Improve handling of .gml and .xsd produced by FME (in particular for CanVec GML)
- * Be able to open .gz file directly (like OS Mastermap ones), and read/write the .gfs file next to the .gz file
- * Fix segfault when encountering an invalid (or unhandled by OGR) geometry and when the axis order is lat/long (#3935)
- * GML3: use a new method to interpret Face objects (which requires GEOS support);
-         old method available if GML_FACE_HOLE_NEGATIVE config. option set to YES (#3937)
- * GML3: support Curve as a valid child for curveProperty inside directEdge parsing (#3934)
- * GML3: don't force the linestring to be 3D when inverting its orientation during parsing of directedEdge (#3936)
- * GML3: accept <pointProperty> element in <gml:LineString> or <gml:LineStringSegment>
- * OGR_G_CreateFromGML(): accept <gml:coordinates> with coordinate tuples separated by comma and coordinate components separated by space
- * Recognized schemas with <complexType> inside <element>, such as the one returned by http://deegree3-demo.deegree.org:80/deegree-utah-demo/services
- * Write the Z component of bounding box for 25D geometries
- * Force layer geometry type to 3D when there's only a .xsd file and we detect a hint that the bounding box is 3D
- * Handle layers of type wkbNone appropriately (#4154)
- * Change format of (GML 2.1.1) FID generated from Fxxx to layer_name.xxx (where xxx is the OGR FID) to ensure uniqueness (#4250)
- * Accept 'GML3Deegree' as a valid value for the dataset creation option FORMAT, to produce a .XSD that should be better handled by Deegree3 (#4252), and 'GML3.2' to produce GML file and schema that validate against GML 3.2.1 schema.
- * Don't try to parse successfully a feature type in the .xsd if there are elements we don't know how to parse. Better to rely on the .gfs mechanism (#4328)
- * Fix bug in OGRAtof() that caused wrong parsing of coordinates in GML files written in scientific notation (#4399)
-
-GMT driver:
- * Fix GetExtent() result that swallowed the first char of the minx bound (#4260)
-
-IDRISI driver:
- * New for GDAL/OGR 1.9.0
- * Read Idrisi .VCT vector files
-
-ILI1 driver:
- * Fix for missing geometry in ILI1
-
-LIBKML driver:
- * Set the OGRStylePen unit type to pixel when reading <LineStyle>
- * Avoid ingesting zip files that are not valid kmz (#4003)
- * Do not use displayname to set the field name
- * Recognize <Data> elements of <ExtendedData> in case <ExtendedData> doesn't use a <SchemaData>
- * Fix mapping of the type attribute of <SimpleType> elements inside <Schema> to OGR field type (#4171)
- * Parse correctly kml docs containing only one placemark
- * Properly set the feature style string from a placemarks style
- * Improve OGRStyleLabel <-> KmlLabelStyle mapping
- * Combine styles from the style table and features styles when LIBKML_RESOLVE_STYLE=YES (#4231)
- * Check that string values put in fields are valid UTF-8 (#4300)
+ * fix reading datasets with 1025 byte records ending with linefeed (#5007)
 
-MDB driver:
- * New for GDAL/OGR 1.9.0
- * Read-only driver to read PGeo and Geomedia .MDB databases
- * Relies on using the Java Jackcess library (LGPL) through JNI.
+VICAR driver:
+ * avoid undefined behavior on empty container (ossfuzz #46650)
 
-MITAB driver:
- * Add support for reading google mercator from mapinfo (#4115)
- * Fixed problem of the null datetime values (#4150)
- * Fix problem with tab delimiter used in MIF files (#4257)
+VRT driver:
+ * Add div, polar, exp pixel functions. Improvements in sum, mul, inv (#5298)
+ * pixel function: implements metadata, and replace_nodata and scale builtin functions (#5371)
+ * Warped VRT: detect inconsistent block size between dataset and bands (#4714)
+ * Warped VRT: do not serialize block size at band level, since already serialized at dataset level (#4714)
+ * Warped VRT: advertise INTERLEAVE=PIXEL for faster processing of multiband
+ * Warped VRT: fix issue with blocks without sources and alpha band (#4997)
+ * VRTWarpedDataset::ProcessBlock(): fix issue in the unlikely situation where a block would be > 4 GB
+ * Warped VRT opening: do not open the source dataset with GDAL_OF_SHARED
+ * fix serialization of relativeToVRT=1 when mix of relative and absolute paths for source and VRT (#4983)
+ * GDALAutoCreateWarpedVRTEx(): avoid potential crash in case of error
+ * allow setting VRT description after CreateCopy('', src_ds)
+ * fix serialization of relativeToVRT=1 when mix of relative and absolute paths for source and VRT
+ * ComputeSourceWindow(): round source coordinates when very close (#5343)
 
-MSSQLSpatial driver:
- * Removing 'Initial Catalog' which is not supported in the ODBC SQL driver connection strings.
- * Allow to specify 'Driver' in MSSQL connection strings (#4393)
- * Fix for the IDENTITY INSERT problem with MSSQL Spatial (#3992)
- * Add more verbose warnings to the geometry validator
- * Fix for the schema handling problem with MSSQL Spatial (#3951)
- * Fix for the corrupt geometry report when using the ogr2ogr -sql option (#4149)
+WMTS driver:
+ * disable clipping with TileMatrixSetLimits by default when using layer extent and add open options to control that behavior (#4461)
 
-MySQL driver:
- * Recognize columns with types POINT, LINESTRING, etc. as geometry columns
+XYZ driver:
+ * Fix incorrect failure to open ASCII-file due to floating point comparison
 
-NAS driver:
- * Add support for treating wfs:Delete as a special Delete feature with typeName and FeatureId properties
- * Handle empty files gracefully (#3809)
- * Preliminary support for SRS in NAS files, including 3GKn SRS
- * Implement special treatment for <lage> to be zero passed and string (NAS #9)
- * Add special handling of punktkennung (NAS #12)
- * Add special handling for artDerFlurstuecksgrenze (#4255)
- * Add support for wfsext:Replace operations (PostNAS #11)
- * Correct NASHandler::dataHandler() to avoid trimming non-leading white space
+Zarr driver:
+ * be robust to duplicated array and group names in NCZarr metadata (ossfuzz #40949)
+ * fix nullptr dereference on array with zero-dim and Fortran order (ossfuzz #46717)
 
-NTF driver:
- * Create and manage height field as floating point since some DTM products have floating point elevations.
+## OGR 3.5.0 - Overview of Changes
 
-OCI driver:
- * Added TRUNCATE layer creation option (#4000)
- * Clear errors after speculative dimension calls (#4001)
- * Fix multithreading related problems (#4039)
- * Ensure that AllocAndBindForWrite does not mess up if there are no general attributes (#4063)
- * Implement DeleteLayer(int) method
- * Ensure extents updated by SyncToDisk(), and that new features are merged into existing extents (#4079)
+### Core
 
-OGDI driver:
- * Fix GetFeature() that did not like switching between layers
+New features:
+* Add layer renaming capacity, and implement it in GPKG, PG, FileGDB and Shapefile drivers
+* Add GDALDataset::GetFieldDomainNames method to retrieve all field domain names which are available for a dataset. Implemented in OpenFileGDB, FileGDB, GPKG drivers
+* Add GDALDataset::DeleteFieldDomain for deleting an existing field domain. Implemented in MEM driver
+* Add GDALDataset::UpdateFieldDomain for replaciong the definition of an existing field domain. Implemented in MEM driver
+* Add driver metadata for GDAL_DCAP_FIELD_DOMAINS and GDAL_DMD_CREATION_FIELD_DOMAIN_TYPES
+* Add OGR_F_StealGeometryEx to steal more than the 1st geometry of a feature (#5115)
+* OGRFeature: add fast/unsafe field getters/setters
+* OGREnvelope: add == and != comparison operators
+* OGRFeature: add Reset() method
 
-PG driver:
- * Write geometries as EWKB by default to avoid precision loss (#4138)
- * Return the table columns in the order they are in the database (#4194)
- * Add a NONE_AS_UNKNOWN layer creation option that can be set to TRUE to force layers with geom type = wkbNone to be created as if it was wkbUnknown (PostGIS GEOMETRY type) to be able to revert to behavior prior to GDAL 1.8.0 (#4012)
- * Add EXTRACT_SCHEMA_FROM_LAYER_NAME layer creation option that can be set to OFF to disable analysis of layer name as schema_name.table_name
- * Add FID layer creation option to specify the name of the FID column
- * ogr2ogr: make sure that for a PG datasource, -nln public.XXX can also be used with -append
- * Fix CreateFeatureViaInsert() to emit 'INSERT INTO xx DEFAULT VALUES'
- * Fix handling of Nan with fields with non-zero width (#2112)
- * Use wrapper for PQexec() to use PQexecParams() instead in most cases
- * Add proper escaping of table and column names
- * OGR SQL: add proper column name escaping and quoting for PostgreSQL datasources
- * Launder single quote character in table name
- * Better reporting of error in case of failed ExecuteSQL()
- * Create field of type OFTString and width > 0, as VARCHAR(width) (#4202)
- * Add more compat with Postgis 2.0SVN (geometry_columns- #4217, unknown SRID handling)
- * Better behavior, in particular in error reporting, of ExecuteSQL() when passed with non-select statements, or with select statements that have side-effects such as AddGeometryColumn()
+Bug fixes:
+* OGRSimpleCurve::segmentize(): avoid too many memory reallocation (#4826)
+* OGR SQLite dialect: avoid being confused by an attribute and geometry field of same name
+* OGRFormatFloat(): handle nan and inf
+* OGRFeature::Equal(): fix when a Real or RealList field contains NaN
+* OGRCurvePolygon::checkRing(): make it accept non-closed rings by default (#5488)
+* OGRCreateFromShapeBin(): do not report M if all NaN coordinates
+* OGRGeometryFactory::forceTo(): fix dimensionality with empty geometries
+* Multipoint WKT import: accept MULTIPOINT Z in non-backeted mode, like what PostGIS outputs
+* OGR_F_SetFieldRaw() / OGRFeature::SetField( const char*, const OGRField *): fix const correctness of OGRField argument
 
-PGDump driver:
- * fix handling of Nan with fields with non-zero width (#2112)
- * Add CREATE_SCHEMA and DROP_TABLE layer creation option (#4033)
- * Fix crash when inserting a feature with a geometry in a layer with a geom type of wkbNone;
- * PG and PGDump: fix insertion of features with first field being a 0-character string in a non-spatial table and without FID in COPY mode (#4040)
- * Add NONE_AS_UNKNOWN, FID, EXTRACT_SCHEMA_FROM_LAYER_NAME layer creation options
- * Better escaping of column and table names
- * Create field of type OFTString and width > 0, as VARCHAR(width) (#4202)
+### OGRSpatialReference
 
-PGeo driver:
- * Move CreateFromShapeBin() method to an upper level
- * Only try to open .mdb files that have the GDB_GeomColumns string
- * Decode Z coordinate for a POINTZM shape
- * Aad support for decoding multipoint/multipointz geometries
- * Fix setting of the layer geometry type
- * Add support for zlib compressed streams
- * Implement MultiPatch decoding
-
-SDE driver:
- * Add support for decoding NSTRING fields (#4053)
- * Add support in CreateLayer() to clean up partially registered tables that aren't full spatial layers
- * Add logic to force envelope for geographic coordsys objects (#4054)
- * Add USE_STRING layer creation and configuration options information
- * Set SE_MULTIPART_TYPE_MASK for multipolygon layers (#4061).
- * Change how offset and precision are set for geographic coordinate systems to more closely match SDE
-
-SEGUKOOA driver:
- * New for GDAL/OGR 1.9.0
- * Read files in SEG-P1 and UKOOA P1/90 formats
+* OGRSpatialReference::GetName(): workaround a PROJ 8.2.0 bug for BoundCRS
+* add a OGR_CT_PREFER_OFFICIAL_SRS_DEF config option (fixes https://github.com/OSGeo/PROJ/issues/2955)
+* OGRSpatialReference::importFromEPSG(): document OSR_USE_NON_DEPRECATED=NO configuration option (#5106)
+* OGRSpatialReference::SetFromUserInput(): make it work with 'IAU:XXXX' and 'IAU:2015:XXXX' (when using PROJ >= 8.2)
+* OGRSpatialReference::SetFromUserInput(): do not emit error message on unrecognized string when ALLOW_FILE_ACCESS=NO (Toblerity/Fiona#1063)
+* Add a OSR_DEFAULT_AXIS_MAPPING_STRATEGY configuration option
+* OGRProjCT: add missing copying of epoch related fields in copy constructor
+* Add OGRSpatialReference::GetOGCURN()
 
-SEGY driver:
- * New for GDAL/OGR 1.9.0
- * Read files in SEG-Y format
+### Utilities
 
-Shapefile driver:
- * Encoding support for shapefile/dbf (#882)
- * Allow managing datasources with several hundreds of layers (#4306)
- * Lazy loading of SRS and lazy initialization of attribute index support
- * Use VSI*L API to access .qix spatial index files
- * Add special SQL command 'RECOMPUTE EXTENT ON layer_name' to force recomputation of the layer extent (#4027)
- * Faster implementation of GetFeatureCount() in some circumstances.
- * Fix crash in CreateField() if there is no DBF file
- * Fix add field record flushing fix (#4073)
- * Fix decoding of triangle fan in a multipatch made of several parts (#4081)
- * Refuse to open a .shp in update mode if the matching .dbf exists but cannot be opened in update mode too (#4095)
- * Recognize blank values for Date fields as null values (#4265)
- * Recognize 'NULL' as a valid value for SHPT creation option as documented
- * Check that we are not trying to add too many fields.
- * Support reading measure values as Z coordinate.
+* ogr2ogr: propagate error in final CommitTransaction() to status code of the utility (#5054)
+* ogr2ogr: make detection of FID layer creation option more robust
+* ogr2ogr: fix cutting of geometries in projected coordinates intersecting antimeridian, in some configurations
+* ogr2ogr: avoid (in-memory) copying of source feature to target feature when possible
+* ogr2ogr: make 'ogr2ogr [-f PostgreSQL] PG:dbname=.... source [srclayer] -lco OVERWRITE=YES' work as if -overwrite was specified (#5640)
 
-SQLite/Spatialite driver:
- * Spatialite: major write support improvements (creation/update of Spatialite DB now limited to GDAL builds with libspatialite linking)
- * Spatialite: add support for 3D geometries (#4092)
- * Spatialite: speed-up spatial filter on table layers by using spatial index table (#4212)
- * Spatialite: add support for reading Spatialite views registered in the views_geometry_columns
- * Spatialite: better support for building against amalgamated or not
- * Spatialite: when it exists, use srs_wkt column in spatial_ref_sys when retrieving/inserting SRS
- * Spatialite: add COMPRESS_GEOM=YES layer creation option to generate Spatialite compressed geometries
- * Spatialite: add support for VirtualXLS layers.
- * Spatialite: imported VirtualShape support, in particular it is now possible to open on-the-fly a shapefile as a VirtualShape with 'VirtualShape:shapefile.shp' syntax as a datasource
- * Implement RFC35 (DeleteField, AlterFieldDefn, ReorderFields)
- * Implement DeleteDataSource()
- * Implement DeleteFeature()
- * Implement SetFeature() by using UPDATE instead of DELETE / INSERT
- * Add capability to use VSI Virtual File API when needed (if SQLite >= 3.6.0)
- * Make CreateDataSource(':memory:') work
- * Enforce opening update/read-only mode to allow/forbid create/delete layers, create/update features (#4215)
- * Launder single quote character in table name; properly escape table name if no laundering (#1834)
- * Use ALTER TABLE ADD COLUMN by default to create a new field; older method can still be used by defining the OGR_SQLITE_USE_ADD_COLUMN config option to FALSE in order to provide read-compat by sqlite 3.1.3 or earlier
- * Fix bug in CreateField() : if there was already one record, the content of the table was not preserved, but filled with the column names, and not their values
- * Map 'DECIMAL' columns to OGR real type (#4346)
- * Add OGR_SQLITE_CACHE configuration option for performance enhancements
- * Try to reuse INSERT statement to speed up bulk loading.
-
-SVG driver:
- * New for GDAL/OGR 1.9.0
- * Read only driver for Cloudmade Vector Stream files
+### Vector drivers
 
-S57 driver:
- * Add support for Dutch inland ENCs (#3881)
- * Allow up to 65536 attributes, use GUInt16 for iAttr (#3881)
- * Be cautious of case where end point of a line segment has an invalid RCID
- * Correct handling of update that need to existing SG2D into an existing feature without it (#4332)
+CAD driver:
+ * libopencad: fix crash on corrupted datasets (ossfuzz #45943, ossfuzz #46887, osffuzz #45962)
 
-VRT driver:
- * Do not try to read too big files
- * Lazy initialization of OGRVRTLayer
- * Don't set feature field when source feature field is unset
+CSV driver:
+ * when the .csvt indicates WKT and in default KEEP_GEOM_COLUMNS=YES mode, prefix the geometry field name with 'geom_'
 
-WFS driver:
- * Add preliminary support for WFS 2.0.0, but for now don't request it by default.
- * Increase performance of layer definition building by issuing a DescribeFeatureType request for several layers at the same time
- * Better server error reporting
- * Use the layer bounding box for EPSG:4326 layers (restricted to GEOSERVER for now) (#4041)
- * Add capability of opening a on-disk Capabilities document
- * Add special (hidden) layer 'WFSLayerMetadata' to store layer metadata
- * Add special (hidden) layer 'WFSGetCapabilities' to get the raw XML result of the GetCapabilities request
- * CreateFeature()/SetFeature(): use GML3 geometries in WFS 1.1.0 (make TinyOWS happy when it validates against the schema)
- * Make spatial filtering work with strict Deegree 3 servers
- * Fix reading when layer names only differ by their prefix
+DXF driver:
+ * Do not copy final DXF when MarkSuppressOnClose was called.
+ * Fix long line handling in edge case
 
-XLS driver:
- * New for GDAL/OGR 1.9.0
- * Read only driver for MS XLS files and relies on FreeXL library.
+DWG driver:
+ * Add block attributes to entities layer (#5013)
+ * support AcDbFace reading (#5034)
+ * read block attributes as feature fields (#5055)
+ * add DWG_ALL_ATTRIBUTES to get all attributes (#5103)
 
-XPlane driver:
- * Port to VSI*L API
+DWG/DGNv8 driver:
+ * avoid potential crash with ODA 2022 on Linux
 
-XYZ driver:
- * Ignore comment lines at the beginning of files
+ElasticSearch driver:
+ * do not try to open reserved .geoip_databases to avoid error message with recent Elastic versions
+ * add a AGGREGATION open option (#4962)
+ * support GetLayerByName() with multiple layers and/or wildcard (#4903)
 
-## SWIG Language Bindings
+ESRIJSON driver:
+ * fix dimensionality of PolygonZ
 
-General :
- * RFC 30: Correct the signature of Datasource.CreateDataSource() and DeleteDataSource(),  gdal.Unlink() to accept UTF-8 filenames (#3766)
- * Add Band.GetCategoryNames() and Band.SetCategoryNames()
- * Add Geometry.GetPoints() (only for Python and Java) (#4016)
- * Add Geometry.GetEnvelope3D()
- * Add Geometry.SimplifyPreserveTopology()
- * Extend SWIG Geometry.ExportToJson() to accept a list of options (#4108)
- * Add (OGR)DataSource.SyncToDisk()
- * Add SpatialReference.SetVertCS(), IsSameVertCS(), IsVertical(), SetCompound(), IsCompound()
- * Add SpatialReference.SetIGH() (#4060)
- * RFC 35: Add OGRLayer.DeleteField(), ReorderField(), ReorderFields(), AlterFieldDefn()
- * Add gdal.VSIFTruncateL()
+FileGDB driver:
+ * add support for writing field domains
+ * implement database compaction on 'REPACK' SQL command
+ * workaround a crash involving binary field and CDF datasets
+ * fix crash related to feature of FID 2147483647
 
-CSharp bindings:
- * Implement the typemap for utf8_path in C# (#3766)
- * Correcting the signature of OGRDataSource.Open to make the utf8 typemap to work (#3766)
+FlatGeoBuf driver:
+ * If CRS WKT detected to be non UTF-8, force it to ASCII (#5062)
+ * catch exception on GetFeature() on corrupted index
+ * fix GetFeature() when featuresCount != 0 and indexNodeSize == 0
+ * in SPATIAL_INDEX=NO mode, write a meaningful featureCount and extent in the header
 
-Java bindings:
- * Turn the gdalJNI, gdalconstJNI and osrJNI into package private classes
- * Make Layer.GetExtent() return null when OGR_L_GetExtent() fails.
+GeoJSON driver:
+ * reader: expose EPSG:4979 as CRS when none is specified and 3D geoms are found
+ * use OGRSpatialReference::GetOGCURN() to handle compound CRS when writing 'crs' member
+ * writer: in RFC7946=YES mode, reproject to EPSG:4979 if source CRS is 3D
+ * report OFSTJSON subfield type for properties we can't map to a native OGR type, and better handling of mixed content in properties (#3882)
 
-Perl bindings:
- * The "Points" method of Geometry was not accepting its own output in the case of a single point. It accepted only a point as a list. Now it accepts a point both as a list containing one point (a ref to a point as a list) and a point as a list.
- * Fixed UTF-8 support in decoding names (datasource, layer, field etc.).
- * Assume all GDAL strings are UTF-8, handle all changes in typemaps.
- * Additions to Perl bindings due to new developments etc: Layer capabilities, GeometryType  method for Layer, improved create, new Export and Set methods for SpatialReference.
- * Detect context in a typemap which returns a array, this now returns a list in list context; the change affects at least GetExtent and GetEnvelope methods, which retain backward compatibility though new and/or changed methods: FeatureDefn::Name, FeatureDefn::GeometryIgnored, FeatureDefn::StyleIgnored, Feature::ReferenceGeometry, Feature::SetFrom, FieldDefn::Ignored, Geometry::AsJSON
- * Perl typemaps: more correct manipulation of the stack, more cases where a list is returned in a list context, better handling of callback_data @Band::COLORINTERPRETATIONS, Band methods Unit, ScaleAndOffset, GetBandNumber, RasterAttributeTable method LinearBinning
- * Typemaps for VSIF{Write|Read}L, tests and docs for some VSI* functions.
- * Perl bindings: better by name / by index logic, some checks for silent failures, return schema as a hash if wanted, support ->{field} syntax for features, return list attributes as lists or listrefs as wished so that ->{field} works for lists too (API change)
+GMLAS driver:
+ * be robust to leading spaces in <gml:coordinates> element (#5494)
 
-Python bindings:
- * Improvements for ogr.Feature field get/set
- * Add hack to bring Python 3.2 compatibility
- * First argument of VSIFWriteL() should accept buffers for Python3 compat
- * Fix reference leak in 'typemap(in) char **dict'
- * Add gdal.VSIStatL()
- * swig/python/setup.py : fix for virtualenv setups (#4285)
- * Layer.GetExtent() : add optional parameter can_return_null that can be set to allow returning None when OGR_L_GetExtent() fails
- * Make gdal.VSIFSeekL(), gdal.VSIFTellL() and gdal.VSIFTruncateL() use GIntBig instead of long for compat with 32bit platforms
- * Add script to build the python extensions with Python 2.7 and a mingw32 cross-compiler under Linux/Unix
+GMT driver:
+ * allow writing to /vsistdout/ (#4993)
 
-Ruby bindings:
- * Build SWIG Ruby Bindings against modern Ruby versions (1.8.7 and 1.9.2) (#3999)
+GPKG driver:
+ * fix nullptr dereference on corrupted databases with sqlite >= 3.35
+ * deal explicitly with CPL_VSIL_USE_TEMP_FILE_FOR_RANDOM_WRITE=YES for /vsi network file systems (#5031)
+ * when adding a 'epoch' column to gpkg_spatial_ref_sys, one must use the 'gpkg_crs_wkt_1_1' extension instead of 'gpkg_crs_wkt'
+ * DeleteField(): use ALTER TABLE ... DROP COLUMN if sqlite >= 3.35.5, and run foreign_key_check only if foreign_keys is ON (fixes qgis/qgis#47012)
+ * AlterFieldDefn(): use ALTER TABLE ... RENAME COLUMN when only renaming is to be done and sqlite >= 3.26.0, and do not run integrity_check in that situation (fixes qgis/qgis#47012)
+ * intercept 'ALTER TABLE table RENAME COLUMN src_name TO dst_name' and 'ALTER TABLE table DROP COLUMN col_name'
+ * add a NOLOCK=YES option to open a file without any lock (for read-only access) (helps fixing qgis/qgis#2399)
+ * add ST_MakeValid() SQL function if not linking against Spatialite or if Spatialite lacks ST_MakeValid()
 
-# GDAL/OGR 1.8.0 release notes
+GPSBabel driver:
+ * Allow identifying tcx (gtrnctr) files directly
 
-(Note: Most changes/bugfixes between 1.7.0 and 1.8.0 that have already gone
-to the 1.7.X maintenance releases are not mentioned hereafter.)
+ILI driver:
+ * IMDReader: fix various potential crashes on invalid input
 
-## In a nutshell...
+MapInfo driver:
+ * allow reading MID/MIF files with lines up to 1 million bytes (#3943)
+ * fix parsing .mid files with newline character in string field (#4789)
+ * .tab writing: correctly detect datum when creating a layer from a WKT2 CRS string (#5217)
+ * Add GSK2011 and PZ90.11 to list of ellipsoids (#5541)
+ * add WindowsBalticRim / CP1257 charset mapping (#5608)
 
-* New GDAL drivers : GTX, HF2, JPEGLS, JP2OpenJPEG, JPIPKAK, KMLSUPEROVERLAY,
-                     LOS/LAS, MG4Lidar, NTv2, OZI, PDF, RASDAMAN, XYZ
-* New OGR drivers : AeronavFAA, ArcObjects, GPSBabel, HTF, LIBKML, MSSQLSpatial, NAS,
-                    OpenAir, PDS, PGDump, SOSI, SUA, WFS
-* Significantly improved OGR drivers : DXF, GML
-* New implemented RFCs : RFC 7, RFC 24, RFC 28, RFC 29, RFC 30, RFC 33
-* New utility : gdallocationinfo
+MSSQL driver:
+ * fix build warnings on Linux
+ * GetLayerDefn(): fix potential memory leak
+ * DeleteLayer(): fix read after free
+ * fix issue when inserting strings in bulk copy mode on Linux
+ * make GetNextFeature() end bulk copy mode
+ * CreateFeature in bulk copy mode: make it use feature geometry SRID when set
+ * disable bulk mode when a UUID field is found, as this doesn't work currently
+ * do not set field width when reading smallint/int/bigint/float/real columns, and correctly roundtrip smallint/Int16 (#3345)
 
-## Backward compatibility issues
+MVT driver:
+ * writing: using MakeValid() when possible on polygon output
 
-* MITAB driver: use "," for the OGR Feature Style id: parameter delimiter,
-  not "." as per the spec. Known impacted application :
-  MapServer (http://trac.osgeo.org/mapserver/ticket/3556)
-* RFC 33 changes the way PixelIsPoint is handled for GeoTIFF (#3838,#3837)
-* GML driver: write valid <gml:MultiGeometry> element instead of the non-conformant
-  <gml:GeometryCollection>. For backward compatibility, recognize both syntax for
-  the reading part (#3683)
+ODS driver:
+ * avoid huge memory allocations on files abusing repeated cells (ossfuzz #40568)
+ * avoid crashing 'floating-point exception' when evaluating -2147483648 % -1 (ossfuzz #41541)
 
-## GDAL/OGR 1.8.0 - General Changes
+OpenFileGDB driver:
+ * correctly parse raster fields of type == 2 which are inlined binary content (#4881)
+ * do not report extent with NaN values
+ * fix crash related to feature of FID 2147483647
+ * fix dimensionality of MULTILINESTRING M geometries
+ * add support for reading (non-default) UTF16 encoding for strings
 
-Build(All):
- * Make sure that 'import gdal' can work in a --without-ogr build
+OSM driver:
+ * add a railway attributes to lines (#5141)
 
-Build(Unix):
- * Fix compilation on RHEL/Centos 64bit for expat and sqlite3 (#3411)
- * Update to autoconf 2.67 and libtool 2.2.6
- * During the external libtiff autodetection check whether library version is 4.0
-   or newer, fallback to internal code otherwise. It is still possible to link
-   with older libtiff using the explicit configure option (#3695)
- * Make --with-threads=yes the default
- * Allow using --with-spatialite=yes
- * Check /usr/lib64/hdf for RedHat 64bit
+PGeo driver:
+ * Always request numeric column values as numeric types (#4697)
 
-Build(Windows):
- * Change the default MSVC version to VS2008.
+PostgreSQL driver:
+ * skip all leading whitespace in SQL statements. (#4787)
+ * error out if non UTF-8 content is transmitted in COPY mode, when client_encoding=UTF8 (#4751)
+ * propagate errors in deferred EndCopy() call in CommitTransaction() (#5054)
+ * make ogr2ogr -lco GEOM_TYPE=geography work when the source layer has a named geometry column, and also reject creating geography columns with a SRS != EPSG:4326 (#5069)
+ * support other geographic SRS than EPSG:4326 for geographic type (#5075)
 
-## GDAL 1.8.0 - Overview of Changes
+S57 driver:
+ * enable recoding to UTF-8 by default (RECODE_BY_DSSI=YES open option) (#4751)
+ * handle more than 255 updates to a feature (#5461)
+ * only apply an update if update.UPDT == 1 + previous.UPDT, or update.EDTN == 0 (#5461)
 
-Port:
- * RFC 7 : Use VSILFILE for VSI*L Functions (#3799)
- * RFC 30 : Unicode support for filenames on Win32
- * Implement Rename() for /vsimem
- * New virtual file system handlers :
-    - /vsicurl/ : to read from HTTP or FTP files (partial downloading)
-    - /vsistdin/ : to read from standard input
-    - /vsistdout/ : to write to standard output
-    - /vsisparse/ :mainly to make testing of large file easier
-    - /vsitar/ : to read in .tar or .tgz/.tar.gz files
- * Add C API to create ZIP files
- * Add support for writable /vsizip/
- * Add VSIBufferedReaderHandle class that is useful to improve performance when
-   doing backward seeks by a few bytes on underlying file handles for which
-   backwardseeks are very slow, such as GZip handle
- * Add service for base64 decoding
- * CPL ODBC : Add transaction support (#3745)
- * CPL ODBC: Increase the default connection timeout to 30 sec
- * Add VSIStatExL() that has a flag to specify which info is really required
-   (potential speed optimization on slow virtual filesystems such as /vsicurl)
- * Add VSIIsCaseSensitiveFS() to avoid ugly #ifndef WIN32 / #endif in the code of
-   various drivers
- * Add Recode() convenience method to CPLString
- * HTTP downloader: add PROXY and PROXYUSERPWD options (and GDAL_HTTP_PROXY and
-   GDAL_HTTP_PROXYUSERPWD configurations option) to allow request to go through a
-   proxy server.
+Selafin driver:
+ * fix time step count when none dataset in the file
 
-Core:
- * RFC 24: progressive/async raster reading
- * On Unix, add capability of opening the target of a symlink through GDALOpen()
-   even if it not a real filename. Useful for opening resources expressed as
-   GDAL virtual filenames in software offering only file explorers (#3902)
- * Assume anything less than 100000 for GDAL_CACHEMAX is measured in megabytes.
- * Read cartesian coordinates if applicable in GDALLoadOziMapFile().
- * Avoid being overly sensitive to numeric imprecision when comparing pixel
-   value and nodata value in GDALRasterBand::ComputeStatistics()/
-   ComputeRasterMinMax(), especially for GeoTIFF format where nodata is
-   stored as text (#3573)
- * Better handling of NaN (not a number) (#3576)
- * Add C wrapper GDALSetRasterUnitType() for GDALRasterBand::SetUnitType() (#3587)
- * Add GDALLoadRPCFile() to read RPCs from GeoEye _rpc.txt files (#3639)
- * Allow GDALLoadRPB/RPC/IMDFile() to be called directly with the RPB/RPC/IMD
-   filename
- * In GDAL cache block, use 64-bit variables for cache size
- * Add GDALSetCacheMax64(), GDALGetCacheMax64() and GDALGetCacheUsed64() (#3689)
- * Improve formatting of seconds in DecToDMS()
- * Support negative nPixelOffset values for RawRasterBands
- * GDALDatasetCopyWholeRaster(): improve performance in certain cases by better
-   fitting to input/output block sizes
- * Add GDALRasterBandCopyWholeRaster()
- * Make sure band descriptions are properly captured and cloned (#3780)
- * GDALDataset/GDALRasterBand::CreateMaskBand(): invalidate pre-existing raster
-   band mask that could be created lazily with GetMaskBand()/GetMaskFlags(),
-   so that a later GetMaskBand() returns the newly created mask band
- * Overview computation : speed improvements in resampling kernels
- * Fix dereferencing of open datasets for GetOpenDatasets (#3871)
- * Add DllMain callback to set-up and tear-down internal GDAL library
-   resources automatically (#3824)
- * List .aux file if it used in GDALPamDataset::GetFileList()
- * PAM dataset : try retrieving projection from xml:ESRI metadata domain
+Shapefile driver:
+ * better deal with ETRS89 based CRS with TOWGS84\[0,0,0,0,0,0,0\]
+ * writer: avoid considering rings slightly overlapping as inner-outer rings of others (#5315)
+ * fix perf issue when writing multilinestring with lots of parts (#5321)
+ * consider rings at non-constant Z as outer rings (#5315)
+ * fix unlikely nullptr dereference (#5635)
 
-Algorithms:
- * rasterize: Burn the attribute value in ALL the bands during rasterization. (#3396)
- * geoloc : Allow using XBAND and YBAND with height == 1 in the case of a regular
-   geoloc grid, suc h as for LISOTD_HRAC_V2.2.hdf (#3316)
- * GDALFillNodata(): improve&fix progress report
- * warper : Try to determine if we will need a UnifiedSrcDensity buffer
-            when doing memory computations (#3515).
- * warper : GDALSuggestedWarpOutput2(): use more sample points around the edge
-            of the raster to get more accurate result (#3742)
- * warper : added (preliminary) support for mask bands that aren't nodata or alpha
- * warper : integrate Google Summer of Code OpenCL implementation of warper
- * gdalgrid: Move ParseAlgorithmAndOptions from apps/gdal_grid.cpp to
-             alg/gdalgrid.cpp (#3583)
- * RPCTransformer: take into account optional DEM file to extract elevation
-   offsets (RPC_HEIGHT_SCALE and RPC_DEM transformation options added) (#3634)
- * GDALReprojectImage() : correctly assign nSrcAlphaBand and nDstAlphaBand (#3821)
- * gdalgrid : Properly initialize the first nearest distance in GDALGridNearestNeighbor().
-
-Utilities :
- * gdallocationinfo : new
- * nearblack: add -setalpha option to add/set an alpha band + -of, -q, -co
- * nearblack: add -setmask option to use a mask band to mask the nodata areas
- * gdalbuildvrt: support stacking ungeoreferenced images when using -separate,
-   provided they have the same size (#3432)
- * gdalbuildvrt: implement a check to verify that all color tables are identical
- * gdalbuildvrt: automatically create a VRT mask band as soon one of the sources
-   has a dataset mask band (non-trivial = neither alpha, neither alldata, neither nodata)
- * gdalbuildvrt: use OSRIsSame() to check if all source raster have same SRS (#3856)
- * gdal_translate: Transfer GEOLOCATION in the -of VRT case if spatial
-   arrangement of the data is unaltered
- * gdal_translate : add support for resizing datasets with mask bands
- * gdal_translate : add -mask option to add a mask band from an input band/mask band.
-   Also extend syntax for the value of the -b option to allow specifying mask band as input band
- * gdal_translate : support '-a_nodata None' as a way of unsetting the nodata value
- * gdal_translate : invalidate statistics when using -scale, -unscale, -expand, -srcwin,
-                    -projwin or -outsize and a new -stats option to force their (re)computation (#3889)
- * gdal_rasterize: Add capability of creating output file (#3505)
- * gdaldem: add a new option, -compute_edges, that enable gdaldem to compute
-   values at image edges or if a nodata value is found in the 3x3 window,
-   by interpolating missing values
- * gdaldem : add '-alg ZevenbergenThorne' as an alternative to Horn formula
-   for slope, aspect and hillshade
- * gdaldem : support GMT .cpt palette files for color-relief (#3785)
- * gdalwarp: add -crop_to_cutline to crop the extent of the target dataset to
-   the extent of the cutline
- * gdalwarp: add a -overwrite option (#3759)
- * gdal_grid : Properly use the spatial filter along with the bounding box.
- * epsg_tr.py: added -copy format for INGRES COPY command
- * hsv_merge.py: support RGBA dataset as well as RGB dataset, add -q and -of
-   options, avoid using hillband when it is equal to its nodata value
- * val_repl.py: copy geotransform and projection from input dataset to output
-   dataset
- * gdal_retile.py : assign color interpretation (#3821)
- * gdal_retile.py : add -useDirForEachRow option to create a different output structure (#3879)
- * Make gdal_translate and gdalwarp return non-zero code when block writing failed
-   for some reason (#3708)
- * loslas2ntv2.py : new utility : .los/.las to NTv2 converter
- * gdal_calc.py : new utility
- * Add -tap option to gdal_rasterize, gdalbuildvrt, gdalwarp and gdal_merge.py
-   to align on a standard grid (#3772)
+SOSI driver:
+ * avoid segfault on invalid geometries (#5502)
 
-AAIGRID driver:
- * Cast nodata value to float to be consistent with precision of pixel data in
-   GDT_Float32 case; small optimization to avoid reading the first 100K when
-   we know that the datatype is already Float32
- * Allow reading files where decimal separator is comma (#3668)
- * Detect 1e+XXX as a real value among integer values (#3657)
- * Add a AAIGRID_DATATYPE configuration option that can be set to Float64
- * speed-up CreateCopy(), particularly on windows, by buffering the output
+SQLite driver:
+ * add a STRICT=YES layer creation option to create tables as SQLite >= 3.37 STRICT tables
+ * workaround MacOS system SQLite non-default settings that cause issues with WAL and AlterFieldDefn() when patching CREATE TABLE DDL
+ * deal explicitly with CPL_VSIL_USE_TEMP_FILE_FOR_RANDOM_WRITE=YES for /vsi network file systems (#5031)
+ * DeleteField(): use ALTER TABLE ... DROP COLUMN if sqlite >= 3.35.5, and run foreign_key_check only if foreign_keys is ON (refs qgis/qgis#47012)
+ * AlterFieldDefn(): use ALTER TABLE ... RENAME COLUMN when only renaming is to be done and sqlite >= 3.26.0
+ * fix crash when doing select load_extension('libgdal.so') from a statically linked sqlite3 console application
+ * add a OGR_SQLITE_LOAD_EXTENSIONS configuration option
+ * fix VirtualShape support with spatialite 5.0.1 or older and sqlite 3.38.0
 
-AIGrid driver:
- * Support sparse sets of tile files {w,z}001???.adf (#3541)
+TopoJSON driver:
+ * fix duplicate 'id' field, and other potential issues when reading fields (3.4.0 regression)
 
-BSB driver:
- * Capture extension lines for headers
- * Added UNIVERSAL TRANSVERSE MERCATOR, LCC and POLYCONIC handling (#3409)
- * provide an option (BSB_IGNORE_LINENUMBERS) to ignore line numbers as some
-   generators do them wrong but the image is otherwise readable (#3776)
- * Avoid turning missing values to index 255 (#3777)
+VFK driver:
+ * avoid crash when a SQLite3 statement fails
 
-DODS driver:
- * Compilation fix to support libdap 3.10
+WFS driver:
+ * if COUNT is present in WFS >= 2, use it as the page size
 
-DTED driver:
- * Add origin metadata in original format (#3413)
- * Report NIMA Designator field as 'DTED_NimaDesignator' metadata (#3684)
- * Fixes to read some weird DTED3 file
+## SWIG Language Bindings
 
-ECW driver:
- * Support building against 4.1 SDK (compat with older versions maintained) (#3676)
- * Add alpha support with 4.1 SDK, and various configuration options
- * Add pseudo powers of two overviews.
+All bindings:
+ * add missing CPLES_SQLI constant (#4878)
+ * add gdal.DataTypeUnion()
+ * Geometry.ExportToWkb()/ExportToIsoWkb(): use Intel order by default to avoid useless byte swapping
+ * use OGR_G_CreateFromWkbEx() in ogr.CreateGeometryFromWkb() to be able to handle > 2 GB WKB
 
-EHdr driver:
- * Improvements to deal with http://www.worldclim.org/futdown.htm datasets
+C# Bindings:
+ * Re-target C# bindings apps to netcoreapp2.2 (#4792)
+ * Switch default platform target to AnyCPU #1368
 
-ENVI driver:
- * Support tabulation character in .hdr files (#3741)
- * Support reading gzipped image file (#3849)
+Python bindings:
+ * for Windows and Python >= 3.8, automatically add the first path with (lib)gdal*.dll with os.add_dll_directory()
+ * Change GetFieldAsBinary to use VSIMalloc. (#4774)
+ * add xmp=True/False argument to gdal.Translate()
+ * fix/workaround setuptools 60.0 and Debian --install-layout
+ * replace unsafe use of tempfile.mktemp() by mkstemp()
+ * utilities-as-lib: propagate warnings to custom error handler when UseExceptions is on (#5136)
+ * remove all traces of distutils
+ * make sure GetUseExceptions() doesn't clear the error state (#5374)
+ * make feature.GetField() returns a bool for a (type=OFTInteger, subtype=OFSTBool) field
 
-ERS driver:
- * Read "Units" child of the "BandId" node and set it as unit type for RasterBand.
+# GDAL/OGR 3.4.3 Release Notes
 
-FITS driver:
- * Accept files whose metadata list doesn't end with 'END' (#3822)
-
-GeoRaster driver :
- * Suppress error when testing SRID code as EPSG (#3326)
- * Several improvements and fixes (#3424)
- * Deprecates JPEG-B compression (#3429)
- * Fix GetColorInterpretation() on RGBA's alpha channel (#3430)
- * Allows OS authentication (#3185)
- * Add support for Point Cloud, add transaction control wrapper
- * use OCI Bind to load VAT (#3277)
- * Change order of NODATA tag on XML metadata (#3673)
- * Add support for per band NoData value - Oracle 11g (#3673)
- * Add support to ULTCoordinate - (#3718)
- * Fix interleaving cache error (#3723)
- * Fix compress vs nbits order error (#3763)
- * Fix writing interleaved jpeg #3805 and reading default blocksize #3806
- * Add create option blocking=(YES,NO,OPTIMUM) #3807, also fix #3812
+## GDAL 3.4.3 - Overview of Changes
 
-GRASS driver:
- * Update GDAL and OGR GRASS drivers to compile against GRASS 7.0SVN (#2953)
-
-GTiff driver :
- * RFC 33 : Adjust PixelIsPoint handling (#3838,#3837)
- * Refresh internal libtiff with upstream
- * Refresh internal libgeotiff with upstream
- * Add PREDICTOR_OVERVIEW configuration option to set the predictor value for
-   LZW or DEFLATE compressed external overviews; Also make sure that the
-   predictor value gets well propagated in the case of internal overviews (#3414)
- * Add a COPY_SRC_OVERVIEWS creation option (for CreateCopy()) that copies
-   existing overviews in the source dataset.
- * Make GetScale() and GetOffset() retrieve values from PAM if not available in
-   internal metadata
- * Use GCP info from PAM if available
- * Support CreateCopy() on datasets with a color indexed channel and an alpha
-   channel (#3547)
- * Allow reading geotransform when opening with GTIFF_DIR prefix (#3478)
- * Add a warning when clipping pixel values for odd-bits band
- * Make sure that 16bit overviews with jpeg compression are handled using 12bit
-   jpeg-in-tiff (#3539)
- * Add GDAL_TIFF_OVR_BLOCKSIZE configuration option to specify block size used
-   for overviews
- * Read RPCs from GeoEye _rpc.txt files (#3639)
- * Implement GetUnitType() and SetUnitType(); make sure to remove
-   TIFFTAG_GDAL_METADATA tag if it existed before and there are no more
-   metadata; fix to make sure we can unset offset & scale stored in PAM
- * Speed-up writing of blocks in case of multi-band 8 bit images
- * Support TIFF_USE_OVR config option to force external overviews
- * Add special ability to for xml:ESRI metadata into PAM
- * Try to detect build-time vs runtime libtiff version mismatch (*nix only)
- * Added logic to expand verticalcs using importFromEPSG() when possible
- * Create internal masks with deflate compression if available
- * Fix jpeg quality propagation (particularly remove warning when
-   using a deflate compressed internal mask band with jpeg compressed main IFD)
- * Add support for JPEG_QUALITY_OVERVIEW configuration option for internal
-   overviews when adding them after dataset reopening
- * auto-promote mask band to full 8 bits by default (unless
-   GDAL_TIFF_INTERNAL_MASK_TO_8BIT is set TO FALSE).
- * add LZMA compression optional support (requires latest libtiff4 CVS HEAD)
- * Supporting writing compound coordinate systems.
+### Port
 
-GTX driver:
- * New for GDAL/OGR 1.8.0
- * Read NOAA .gtx vertical datum shift files.
+* /vsizip/: fix Eof() detection on stored (ie not compressed) files inside the zip (#5468)
+* /vsiaz/: do not sign request in AZURE_NO_SIGN_REQUEST mode even when we have credentials
+* /vsimem/: VSIFTruncateL(): make sure to zeroize beyond the truncated area
+* Fix memory leak in VSICurlClearCache() (#5457)
+* Fix out of bounds read in CPLRecodeFromWCharIconV() (#5542)
 
-GXF driver:
- * Cast nodata value to float to be consistent with precision of pixel data in
-   GDT_Float32 case
- * Introduce a GXF_DATATYPE configuration option that can be set to Float64
- * Use GDALGetScanline() instead of GDALGetRawScanline() so that #SENS
-   is applied to normally return things in conventional orientation as
-   is assumed by the geotransform.  (#3816).
+### Core
 
-HDF4 driver:
- * Prevent reading nonexistent subdatasets
- * Allow reading 1D subdatasets, in particular for GEOLOC bands
- * Workaround strange test that swaps xsize, ysize and nbands for the particular
-   case of the dataset of ticket #3316
- * Speed up access to HDF4_SDS datasets; allow multi-line block dimension for
-   HDF4_EOS datasets (#2208)
- * HDF4_EOS_GRID : detect tile dimensions and use them as block size; increase
-   HDF4_BLOCK_PIXELS default value to 1,000,000 (#3386)
- * Support reading of L1G MTL metadata (#3532)
- * Read as HDF if HDFEOS returned 0 datasets
- * Improve fetching the geolocation data in case of one-to-one mapping and
-   abcence of dimension maps (#2079)
- * Properly set the GCP projection for MODIS Aerosol L2 Product.
- * Fetch scale/offset, unit type and descriptions for some HDF-EOS datasets.
+* GeoEye metadata reader: avoid potential write stack-buffer overflow on long basename files (#5506)
 
-HDF5 driver:
- * Avoid setting bogus projection if we don't get georeferencing from
-   CreateProjections().  Avoid trying to operate if DeltaLat/Long is zero.
-   Avoid crashing on NULL poH5Object->pszPath in CreateMetadata().  (#3534)
- * Ensure backslashes are preserved in paths for UNC on win32 (#3851)
+### Utilities
 
-HF2 driver:
- * New for GDAL/OGR 1.8.0
- * Read and write HF2/HFZ heightfield raster
+* gdalbuildvrt: fix potential out-of-bounds access when using -b option
+* gdalwarp: fix issue with vertical shift mode when only one of the CRS is 3D, with PROJ 9.1
 
-HFA driver:
- * Ensure that an .aux file created for overviews has AUX=YES set so a
-   base raster will not be created.
- * Various robustness improvements (#3428)
- * Support pulling overviews from an .rrd file even if the .aux does not
-   reference it (#3463)
- * avoid using empty names for layer, if we have one generate a fake name,
-   use for overviews (#3570)
- * Add support for New Zealand Map Grid to HFA driver (#3613)
- * Support EPT_s8 in BASEDATA (#3819)
- * Substantial improvements for Rename/CopyFiles (#3897)
+### Raster drivers
 
-Idrisi driver:
- * Allow color items greater than maximum value (#3605)
+FITS driver:
+ * fix crash at runtime with clang 14 -O2
 
-JPEGLS driver:
- * New for GDAL/OGR 1.8.0
- * JPEG-LOSSLESS driver based on CharLS library
+GRIB driver:
+ * consider longitudes that slightly exceed 360° as 360° for Split&Swap mode (#5499)
+ * multidim: fix crash when a .idx file is present (#5569)
 
-JP2KAK driver:
- * Allow quality as low as 0.01
- * Major restructuring, all reading now goes through DirectRasterIO (#3295)
- * Introduce YCC optimization
- * Ensure we fetch <= 8 bit images with their true precision (#3540)
- * Make JP2KAK_RESILIENT also turn off persist, and force sequential access (#4336)
- * Fix reading overviews via direct case (#4340)
-
-JP2OpenJPEG:
- * New for GDAL/OGR 1.8.0
- * JPEG2 driver based on OpenJPEG library
-
-JPIPKAK driver:
- * New for GDAL/OGR 1.8.0
- * JPIP driver based on Kakadu library
-
-KMLSUPEROVERLAY driver :
- * New for GDAL/OGR 1.8.0
- * Added new plug-in GDAL Super-Overlay Driver. The driver allows converts
-   raster (like TIF/GeoTIFF, JPEG2000, JPEG, PNG) into a directory structure
-   of small tiles and KML files which can be displayed in Google Earth.
-
-LOS/LAS driver:
- * New for GDAL/OGR 1.8.0
- * Read NADCON .los/.las Datum Grid Shift files
-
-MG4Lidar driver
- * New for GDAL/OGR 1.8.0
- * Read MG4 Lidar point cloud data and expose it as a Raster. It depends on
-   the current, freely-available-though-not-open-source MG4 Lidar SDK v1.1
-
-MrSID:
- * Updated to support MrSID SDK v8.0.0 (compat with older versions maintained) (#3889)
- * Updated to support writing MG4/Raster (#3889)
- * Support reading projection from .met files accompanying NASA LandSat SID files
+GTiff driver:
+ * SRS reading: add warning when CRS definition from geokeys is inconsistent with EPSG, and a GTIFF_SRS_SOURCE=EPSG/GEOKEYS configuration option to alter the SRS (#5399)
+ * avoid hang when trying to create a larger than 4GB classic TIFF, and switch to BigTIFF before that happens
+ * fix crash when building overviews and computing approx stats (#5580)
 
-NetCDF driver:
- * Improve coordinate system support (#3425)
- * Add support for multiple standard_parallel tags to support LCC single
-   standard parallel (#3324)
- * Add CF-1 spheroid tag support for netcdf driver
- * Add support for weather/climate files with pixel size in km
- * Attempt to fix flip image (#3575)
- * Add support for Scale and Offset (#3797)
+MRF driver:
+ * Prevent LERC out of bounds access (#5598)
 
 NITF driver:
- * Ensure that igeolo corners are not messed up if irregular, keep center/edge
-   of pixel location info (#3347)
- * Add capture of select RPF attribute metadata (#3413)
- * Carry raw IGEOLO and ICORDS through as metadata (#3419)
- * Added NITFPossibleIGEOLOReorientation() in an attempt to deal with
-   files written with the IGEOLO corners out of order.
- * Implement readonly support for RSets (#3457)
- * Add capability of writing CGM segment as creation option (or from the source
-   CGM metadata domain if no CGM= creation option); for consistency, also add
-   the capability of writing TEXT segment as creation option, in addition to
-   the existing capability of writing it from the source TEXT metadata domain (#3376)
- * Fix read out of buffer for NBPP < 8 and very small block size; fix decoding
-   of NBPP=4 (#3517)
- * Add FILE_TRE creation option to write TRE content in XHD field of file header
- * Add SDE_TRE creation option to write GEOLOB and GEOPSB TREs. This is limited
-   to geographic SRS, and to CreateCopy() for now
- * Allow using NITF header located in STREAMING_FILE_HEADER DE segment when
-   header at beginning of file is incomplete
- * Improve NITF to NITF translation
- * Fetch TREs from DE segment
- * Support reading CSSHPA DES & extracting embedded shapefile
- * Support writing image comments (ICOM)
- * Add description for NITF file & image header fields in creation options XML
- * Accept A.TOC files with frame entries that have same (row,col) coordinates
- * Avoid erroring out when file or image user TRE size is just 3
- * Load subframe mask table if present (typically, for CADRG/CIB images with IC=C4/M4) (#3848)
- * A few hacks to accept some (recoverable) file inconsistencies (#3848)
+ * avoid PROJ error to be emitted in Create() when ICORDS=N/S (#5563)
 
-NTv2 driver:
- * New for GDAL/OGR 1.8.0
- * Read&write NTv2 Datum Grid Shift files
+VICAR driver:
+ * avoid undefined behavior on empty container (ossfuzz #46650)
 
-OZI driver:
- * New for GDAL/OGR 1.8.0
- * Read OZI OZF2/OZFX3 files
-
-PAUX driver:
- * Add support for INTERLEAVE option
-
-PCIDSK2 driver:
- * PCIDSK SDK refreshed from upstream
- * Remove svn:external for pcidsk sdk; Copy it directly in GDAL tree
- * Support for reading and writing descriptions added to the PCIDSK SDK.
- * Add bitmap support
- * Support for reading/writing complex PCIDSK files through libpcidsk
- * Support worldfile if lacking internal georef (#3544)
- * Fix locking state at CPLThreadMutex creation (#3755)
- * Improved projection support.
+## OGR 3.4.3 - Overview of Changes
 
-PDF driver:
- * New for GDAL/OGR 1.8.0
- * Read Geospatial PDF (through poppler library), either encoded according
-   to OGC Best practice or Adobe ISO32000 extensions.
+### Core
 
-PDS driver:
- * Support quoted SAMPLE_TYPE. Check for UNSIGNED in SAMPLE_TYPE for UInt16.
- * Support files where scanlines are broken over several records.
- * Support newline continuation
- * Recognize ENCODING_TYPE = "N/A" (N/A surrounded by double-quotes)
- * Take into account MINIMUM, MAXIMUM, MEAN and STANDARD_DEVIATION when
-   available to set the statistics
+* OGREnvelope: ignore fp warnings for operator== like IsInit()
+* GML geometry importer / GMLAS: be robust to leading spaces in <gml:coordinates> element (#5494)
+* Multipoint WKT import: accept MULTIPOINT Z in non-backeted mode, like what PostGIS outputs
 
-PNG driver:
- * Update internal libpng to 1.2.44
- * Internal libpng : Make screwy MSPaint "zero chunks" only a warning,
-   not error (#3416).
- * Added ZLEVEL creation option
-
-PostGIS Raster (formerly WKTRaster driver):
- * Improved block reading and raster settings reading in WKT Raster driver
- * Functions SetRasterProperties and GetGeoTransform modified to allow both
-   referenced and not referenced rasters
- * Connection string parsing simplified. Schema, table name and where clause
-   can be passed with or without quotes
- * New parameter "mode"
-
-RASDAMAN driver:
- * New for GDAL/OGR 1.8.0
- * Read rasters in rasdaman databases
+### Utilities
 
-RMF driver:
- * Significant improvements. Implemented decompression scheme typically
-   used in DEM data.
+* ogr2ogr: fix cutting of geometries in projected coordinates intersecting antimeridian, in some configurations
 
-SRP driver:
- * Relax strict equality test for TSI size for unusual products (#3862)
+### Vector drivers
 
-TerraSAR driver:
- * Enhancements related to GCPs handling (#3564).
+ESRIJSON driver:
+ * fix dimensionality of PolygonZ
 
-USGSDEM driver:
- * Support non-standard DEM file (#3513)
+FlatGeoBuf driver:
+ * catch exception on GetFeature() on corrupted index
+ * fix GetFeature() when featuresCount != 0 and indexNodeSize == 0
 
-VRT driver:
- * Preliminary Overview support on VRT bands (#3457)
- * Support for mask band : VRT may expose a mask band,
-   and mask bands can be used as VRTRasterBand sources
- * Port to VSIF*L API; advertise GDAL_DCAP_VIRTUALIO=YES
- * Make format identification less strict (#3793)
- * Support for LocationInfo metadata item on bands
+GPKG driver:
+ * fix opening files in NOLOCK=YES mode that contains '?' or '#' (fixes qgis/QGIS#48024)
 
-WCS driver:
- * Decode base64 encoded multipart data
+MITAB driver:
+ * add WindowsBalticRim / CP1257 charset mapping (#5608)
 
-WMS driver:
- * Adds a <UserAgent> optional parameter so that the user be able to provide
-   its own useragent string for picky WMS servers (#3464)
- * Default color interpretation for wms driver (#3420)
- * Add UnsafeSSL setting (#3882)
+OpenFileGDB:
+ * fix dimensionality of MULTILINESTRING M geometries
 
-XYZ driver:
- * New for GDAL/OGR 1.8.0
- * Read ASCII XYZ gridded datasets
+S57 driver:
+ * fixes related to update files (#5461)
 
-## OGR 1.8.0 - Overview of Changes
+SOSI driver:
+ * avoid segfault on invalid geometries (#5502)
 
-Core:
- * RFC 28 : OGR SQL Generalized Expressions
- * RFC 29 : Support for ignoring fields in OGR
- * Add OGRLayer::GetName() and OGRLayer::GetGeomType() virtual methods,
-   and their C and SWIG mappings (#3719)
- * On Unix, add capability of opening the target of a symlink through OGROpen()
-   even if it not a real filename. Useful for opening resources expressed as
-   GDAL virtual filenames in software offering only file explorers (#3902)
- * Expat based XML readers : add support for reading files with Windows-1252
-   encoding
- * Use transactions in CopyLayer for better speed. (#3335)
- * OGRGeometry::importFromWkt() : allow importing SF-SQL 1.2 style WKT while
-   preserving compatibility with previously recognized non conformant WKT (#3431)
- * Add C functions : OGR_G_ForceToPolygon(), OGR_G_ForceToMultiPolygon(),
-                     OGR_G_ForceToMultiPoint() and OGR_G_ForceToMultiLineString()
- * Add C functions : OGR_G_Length(), OGR_G_Simplify(), OGR_G_Area(), OGR_G_Boundary()
-                     OGR_G_SymDifference() and OGR_G_UnionCascaded()
- * Add C function: OGR_F_StealGeometry()
- * Move Centroid() method from OGRPolygon to OGRGeometry base class to be able
-   to operate on various geometry types, and to be consistent with PostGIS
-   ST_Centroid() capabilities and the underlying GEOS method
- * Make the GetStyleTable() SetStyleTable() SetStyleTableDirectly() methods on
-   datasources and layers virtual (#2978)
- * Add OGRSFDriverRegistrar::DeregisterDriver() and OGRDeregisterDriver()
- * Improve detection of rounding errors when writing coordinates as text with
-   OGRMakeWktCoordinate()
- * OGR SQL: allow comparing datetime columns in WHERE clause
- * OGR indexing: re-use .ind file in read-write mode when calling CreateIndex()
-   but the index was opened as read-only (follow up of #1620); ensure that the
-   .ind file is closed before being unlink()'ed
- * AssemblePolygon: ensure largest area ring is used as exterior ring (#3610)
- * OGRGeometryFactory::createFromGEOS() : preserve coordinate dimension
-   (with GEOS >= 3.3) (#3625)
- * Allow calling transformWithOptions() with a NULL poCT
- * Improve wrapdateline, especially on LINESTRING
- * Fix getEnvelope() for OGRPolygon and OGRGeometryCollection to avoid taking
-   into empty sub-geometries; Fix OGRLayer::GetExtent() to avoid taking into
-   account empty geometries
- * Support attribute index scan with the sql 'IN' operator (#3686)
- * Add attribute index support for the sql queries in mapinfo tab format (#3687)
- * OGRGometry: add a swapXY() virtual method
- * Implement special field support for IsFieldSet
- * OGRLineString::transform() : allow partial reprojection if
-   OGR_ENABLE_PARTIAL_REPROJECTION configuration option is set to YES (#3758)
- * Add OGR_G_ExportToGMLEx() that can take options to enable writing GML3
-   geometries compliant with GML3 SF-0
- * OGRFeature::SetField() : support setting integer and real lists from a
-   string in the format (n:value,value,value,...)
+# GDAL/OGR 3.4.2 Release Notes
 
-OGRSpatialReference:
- * Big upgrade to EPSG 7.4.1 with improved datum logic
- * Use PROJ 4.8.0 thread-safe functions if available to avoid global OGR PROJ4
-   mutex when doing OGRProj4CT::TransformEx()
- * Support for defining VERT_CS and COMPD_CS from EPSG and from/to PROJ.4
- * Implement OGRSpatialReference:IsVertival() and
-   OGRSpatialReference::IsSameVertCS() methods
- * add RSO gamma handling (proj #62)
- * TMSO support
- * Adjust handling of NAD27 to avoid towgs84 params, use +datum when no towgs84,
-   do not emit +ellipse if +datum used (#3737)
- * exportToProj4() : add +towgs84= instead of +datum= if both information are
-   available. This behavior can be turned off by setting
-   OVERRIDE_PROJ_DATUM_WITH_TOWGS84=NO (#3450)
- * Add PROJ4_GRIDS EXTENSION as a way of preserving datum grids
- * ogr_srs_proj4: add a table for Prime Meridians; improve recognition of prime
-   meridian to export them as names when possible with exportToProj4()
- * importFromProj4(): recognize +f= option
- * Correct handling of Mercator2SP from EPSG (#2744)
- * Make GetAxis() const
- * Improve axis orientation recognition for stuff like EPSG:3031
- * Fix Amersfoort (geotiff #22)
- * Panorama: Added zone number to the list of projection parameters list.
-   Use the zone number when we need to compute Transverse Mercator projection.
- * Panorama: Use Pulkovo 42 coordinate system instead of WGS84 as a fallback
-   if the CS is not specified.
- * ESRI: added support for Mercator in an old style file
- * Add Bonne, Gauss-Schreiber Transverse Mercator, Mercator (2SP), Two Point
-   Equidistant and Krovak to the list of projections description dictionary.
- * SRS validation : various fixes
- * Exposure OSRImportFromERM() and OSRExportToERM() functions in C API.
- * PCI : Fix the transfer of scale for Stereographic Projection (#3840).
-         Add support for Oblique Stereographic (SGDO) (#3841)
- * Substantially upgrade PCI datum conversions using PCI datum/ellips.txt files
-
-Various drivers:
- * Improve behavior of DXF, VFK, GPX, SHAPE, PG, LIBKML, KML, VRT, CSV, GML,
-   BNA, GeoRSS, GEOJSON drivers when LC_NUMERIC is not the C locale
+## Build
 
-Utilities:
- * ogr2ogr: copy datasources and layers style table
- * ogr2ogr: use OGRGeometryFactory::forceToMultiLineString() when -nlt
-            MULTILINESTRING is specified
- * ogr2ogr: allow -wrapdateline if neither input or output srs is specified,
-            but input layer srs is geographic
- * ogr2ogr: add -splitlistfields and -maxsubfields options to split fields of
-            type IntegerList, RealList or StringList into as many subfields of
-            single type as necessary.
- * ogr2ogr: accept None or Null as a special value of -a_srs to nullify the output SRS
- * ogr2ogr: ignore -overwrite options if the output datasource does not yet exist (#3825)
- * ogr2ogr: special case when output datasource is a existing single-file Shapefile :
-            auto-fill the -nln argument if not specified (#2711)
- * ogr2ogr: add a -explodecollections option to split multi geometries into several features
- * ogr2ogr: add a -zfield option to set the Z coordinate of a 3D geometry from the value of
-            a field
-
-AeronavFAA driver:
- * New for GDAL/OGR 1.8.0
-
-ArcObjects driver:
- * New for GDAL/OGR 1.8.0
-
-BNA driver:
- * Ported to use VSIF*L API
+* Fix build against Poppler > 21 (#5071)
+* Fix build against libhdf5 1.13.0 (#5061)
+* Fix build with tiledb >= 2.7 (#5409)
 
-CSV driver:
- * For files structured as CSV, but not ending with .CSV extension, the 'CSV:'
-   prefix can be added before the filename to force loading by the CSV driver
- * Support reading airport data coming from http://www.faa.gov/airports/airport_safety/airportdata_5010
- * If a datasource is created with the extension .csv assume this should be
-   the first layer .csv file instead of a directory
- * Skip empty lines (#3782)
- * Port to VSI*L API for read&write; support writing to /vsistdout/
+## GDAL 3.4.2 - Overview of Changes
 
-DGN driver:
- * Correct computation of abyLevelsOccurring (#3554).
+### Port
 
-DODS driver:
- * Compilation fix to support libdap 3.10
+* Google cloud - Support type=authorized_user JSON file for authentication
+* /vsigs/: fix upload of files > 4 MB in HTTP 1.1 (#5267)
+* /vsitar/: fix reading .tar.gz files when the size of the uncompressed  .tar file is a multiple of 65536 bytes (#5225)
+* VSICurl: Print response code for failed range requests
 
-DXF driver:
- * Smooth polyline entity support added
- * Read blocks as a distinct layer instead of inlining
- * Assemble file at end with changes to header template - so far only inserting
-   new layer definitions
- * Support for writing user defined blocks
- * Add limited hatch support
- * Add support for writing linetypes.  Support using complete dxf files as
-   the header or trailer template.
- * Apply the INSERT entity id to all features inserted in its place (#3817)
- * various fixes
- * Implement Win1252/utf8 conversion for dxf text
- * Fix issues with text angles, text escape and multiline text
- * add support for \U+xxxx unicode chars in labels
+### Core
 
-GeoJSON driver:
- * Add reader to parse JSON output of FeatureService following GeoServices REST
- * Read and write "id" member at feature object level
- * Various robustness fixes to avoid crashes
- * Fix combined spatial and attribute filtering (#3803)
+* Pleiades metadata reader: fix to handle RPC for Pleiades Neo (#5090)
+* Driver manager: make sure oMapNameToDrivers.size() == nDrivers when querying a non existing driver
+* Overview generation: fix Cubic resampling on boundaries between valid and nodata areas.
 
-GeoRSS driver:
- * Ported to use VSIF*L API
- * Recognize <gml:MultiPoint>, <gml:MultiLineString> and <gml:MultiPolygon>
- * Support reading GeoRSS inside <rdf:RDF>
+### Algorithms
 
-GML driver:
- * Adding support for xlink:href. (#3630)
- * Add support for Polish TBD GML
- * Support reading <gml:Curve>, <gml:MultiCurve>, <gml:TopoCurve>,
-   <gml:TopoSurface>, <gml:Ring>, <gml:Surface>, <gml:PolygonPatch>,
-   <gml:pointMembers>, <gml:curveMembers>, <gml:surfaceMembers>
-   <gml:Triangle>, <gml:Rectangle>, <gml:Tin/gml:TriangulatedSurface>,
-   <gml:Arc>, <gml:Circle> elements in GML3 geometries
- * Recognize <gml:Solid> and <gml:CompositeSurface>, <gml:OrientableSurface> elements
-   (dealt as an approximation as multipolygons, and not as volumes)
- * Add support for "complex structure flattening" of attributes, and OFTStringList,
-   OFTRealList and OFTIntegerList field types in case of multiple occurrences of
-   a GML element (such as UK Ordnance Survey Mastermap) (#3680)
- * Add support for CityGML generic attributes <stringAttribute>, <intAttribute> and
-   <doubleAttribute>
- * Various improvements for better support of AIXM 5.1
- * Write and retrieve layer geometry type to/from .gfs file (#3680)
- * Support using the <GeometryElementPath> to retrieve the appropriate geometry in
-   case several ones are available per feature
- * Use VSIF*L API for read&write
- * XSD reader : various improvements, in particular to support various types of schema
-   returned by WFS DescribeFeatureType
- * XSD writer: change the default GeometryPropertyType to a more precise type name
-   according to the layer geometry type
- * Write valid <gml:MultiGeometry> element instead of the non-conformant
-   <gml:GeometryCollection>. For backward compatibility, recognize both syntax for
-   the reading part (#3683)
- * Support reading SRS per layer when possible, and deal with urn:ogc:def:crs:EPSG::xxx
-   geographic coordinate systems (as returned by WFS 1.1.0 for example) to restore
-   (longitude, latitude) order (unless GML_INVERT_AXIS_ORDER_IF_LAT_LONG is set to NO)
-   Also add a GML_CONSIDER_EPSG_AS_URN option that can be set to YES when EPSG:XXXX should
-   be considered as urn:ogc:def:crs:EPSG::XXXX
- * Expose gml:id as a string field when reading <wfs:FeatureCollection>
- * Add dataset creation option FORMAT=GML3 to write GML3 SF-0 compliant data
- * Add dataset creation option SPACE_INDENTATION=YES/NO to optionally disable space indentation
-   when writing GML.
- * Recognize GML answer of MapServer WMS GetFeatureInfo request
- * Fix datatype detection to fallback to Real when an integer cannot fit into a 32bit int (#3866)
- * GML/WFS : use SRS defined in global gml:Envelope if no SRS is set for any feature geometry
+* Rasterization of polygons: avoid underflow/overflow of output data type
+* warper: better guess output bounds when warping from a rotated pole projection that include poles
 
-GMT driver:
- * Add support for multilinestring reading (#3802)
+### Utilities
 
-GPSBabel driver:
- * New for GDAL/OGR 1.8.0
- * Read/Write files supported by GPSBabel utility
+* gdal_calc.py: raise error when overwriting behavior is apparently wished but not specified (#5270)
+* gdalbuildvrt: change logic to check homogeneous number of bands (#5136)
+  - if no explicit band list is specified, all source datasets must have
+    the same number of bands (previously we checked that the second,
+    third, etc. datasets had at least a number of bands greater or equal
+    than the first one, which made things order dependent).
+  - if an explicit band list is specified, we tolerate a different number of bands, provided that datasets have at least all requested bands.
+* gdalbuildvrt: add a -strict/-non_strict flag, and in strict mode consider non-existing datasets as a failure (#4755)
+* gdalsrsinfo: emit message when replacement of deprecated CRS occurs
+* gdalsrsinfo: return a non-zero exit code when specified SRS fails to load (#5201)
+* gdal2tiles: remove/fix broken links in generated HTML files
+* gdal2tiles: fix issue with multiprocessing and the gdal2tiles launcher script on Windows and Python >= 3.8 (#4951)
+* gdal2tiles: detect write error when creating tiles, and allow outputting to /vsi filesystems (#3382, #5370)
 
-GPX driver:
- * Port write side of the driver to VSIF Large API
- * Add LINEFORMAT dataset creation option
- * Allow writing track points and route points with their own attributes by
-   writing point features in track_points and route_points layers
+### Raster drivers
 
-HTF driver:
- * New for GDAL/OGR 1.8.0
- * Read Hydrographic Transfer Format (HTF)
+BAG driver:
+ * fix 'too many refinement grids' error (#3759)
 
-Ingres driver:
- * Implement support for spatial reference systems (atrofast, #3159)
- * Added support for GEOMETRYCOLLECTION as a generic geometry type, and
-   fleshed out the layer creation logic to support all geometry types.
+BSB driver:
+ * Add missing kap file extension in driver metadata
 
-KML driver:
- * KML vertex output: avoid warning for coordinates just above 90 and 180
-   degrees due to numerical imprecisions
- * Port to VSI*L API for write
+BYN driver:
+ * remove validation of nTideSys and nPtType fields
 
-LIBKML driver:
- * New for GDAL/OGR 1.8.0
- * Alternate KML driver relying on Google libkml
+COG driver:
+ * output exactly square pixels when using -co TILING_SCHEME (#5343)
+ * and emit warning messages when using RES or EXTENT options in that mode.
 
-MITAB driver:
- * Use "," for the OGR Feature Style id: parameter delimiter, not "." as per
-   the spec.
- * Synchronized with mitab CVS HEAD
- * Fixed crash when trying to get the same mitab feature twice
+DIMAP driver:
+ * register metadata on all 6 PNEO bands (#5420)
 
-MSSQLSpatial driver:
- * New for GDAL/OGR 1.8.0
- * Read/write support for MS SQL Spatial databases
+ECW driver:
+ * fix non-nearest upsampling on multi-band datasets (#5288)
 
-NAS driver:
- * New for GDAL/OGR 1.8.0
- * Reads the NAS/ALKIS format used for cadastral data in Germany
+ESRIC driver:
+ * Fix bundle file name
 
-OCI driver:
- * Allows OS authentication (#3185)
- * Uppercase table_name on SQL queries #1960 - OCI: ogr2ogr with append option
-   is not considering layer creation
- * Support creation of non-spatial tables (#3690)
- * Set MULTI_LOAD as default #3656, for new layer and update
+FileGDB driver:
+ * workaround a crash involving binary field and CDF datasets
 
-OGDI driver:
- * Add OGR_OGDI_LAUNDER_LAYER_NAMES configuration option to simplify reported layer names
- * Fix GetFeatureCount() when used with SetAttributeFilter()
+GTiff driver:
+ * fix DISCARD_LSB with nodata value (#5097)
+ * Updates for IJG libjpeg-9e
+ * GTIFWktFromMemBufEx / GTIFMemBufFromSRS: use OSRSetPROJSearchPaths() (#5187). Affects GeoJP2 encoding/decoding
+ * fix exposing WEBP_LOSSLESS option
+ * remove limitation to 32,000 bytes when writing the GDAL metadata tag (#4116)
 
-OpenAir driver:
- * New for GDAL/OGR 1.8.0
- * Read Special Use Airspace in OpenAir format
+GRIB driver:
+ * fix write heap-buffer-overflow when using 'split and swap column' mode when the split column is not equal to width / 2 (#5290)
 
-PCIDSK driver:
- * Implement creation/update and coordinate system support
+HFA driver:
+ * Fix "Pulkovo 1942" datum write to IMG files
 
-PDS driver:
- * New for GDAL/OGR 1.8.0
- * Read NASA Planetary Data Systems TABLE objects
+MRF driver:
+ * Fix padding space logic (#5096)
+ * Adjust PNG limits (#5347)
 
-PGeo driver:
- * Add PGEO_DRIVER_TEMPLATE option
+netCDF driver:
+ * add a IGNORE_XY_AXIS_NAME_CHECKS=YES open option (refs qgis/QGIS#47158)
+ * recognize x/y axis from GMT generated files as geospatial axis (#5291, qgis/QGIS#47158, qgis/QGIS#45704)
 
-PGDump driver:
- * New for GDAL/OGR 1.8.0
- * To output PostgreSQL SQL dump (very similar to shp2pgsql utility)
+PNG driver:
+ * Internal libpng: fix memleak on corrupted file.
 
-PostgreSQL driver:
- * Add support for PostgreSQL >= 9.0 new binary data format
- * Use canonical (HEXEWKB) form to get geometry to speed-up feature retrieval.
-   WKT-based retrieval can still be used if PG_USE_TEXT configuration option
-   is set to YES
- * If the PG_USE_BASE64 configuration option is set to YES, geometries will be
-   requested as BASE64 encoded EWKB instead of canonical HEX encoded EWKB.
-   (useful when bandwidth is the limiting factor)
- * Don't instantiate layer defn at layer creation. This can speed up
-   significantly database opening when they are many tables and the user just
-   needs to fetch one with GetLayerByName().
- * Implement efficient OGRLayer::GetName() and OGRLayer::GetGeomType()
- * Allow creating layer with eType = wkbNone
- * Don't require to have found a layer in readonly mode to succeed in opening
-   the datasource.
- * Add TEMPORARY (ON/OFF) layer creation option to create TEMPORARY tables
- * CreateLayer() : don't launder schema_name if passed string is schema_name.table_name,
-   and when testing if the layer already exists prepend or remove the
-   schema_name to the table_name when comparing to layer names
- * Handle Nan and Inf values for float types in INSERT, UPDATE and
-   COPY SQL commands. (#3667)
- * Retrieve the FID of a newly inserted feature (#3744)
- * Remove use of deprecated PostGIS functions when running against PostGIS 2.0SVN
+TGA driver:
+ * fix reading images with runs crossing scanlines (#5168)
 
-S57 driver:
- * Avoid crashing if there is a missing VRPT field in a vector record.
+WMTS driver:
+ * disable clipping with TileMatrixSetLimits by default
 
-SOSI driver:
- * New for GDAL/OGR 1.8.0
- * Read Norwegian SOSI-standard
+## OGR 3.4.2 - Overview of Changes
 
-Shapefile driver:
- * Use VSI*L API for .prj file so it works in virtual circumstances (#3536).
- * CreateLayer(): Check that the layer doesn't already exist
- * Implement multipatch read support
- * Remove ESRI style spatial indexes from Shapefile on update via OGR (#2798)
- * Fix conflict between spatial and attribute indexes (#3722)
- * Create integer fields with unknown width as 10 characters instead of 11
-   to avoid them getting immediately considered to be real when reopening (#2151)
- * Make 'ogr2ogr -overwrite dst.shp src.shp -nln dst' work when dst.shp already exists
+### OGRSpatialReference
 
-SQLite driver:
- * Spatialite : use MBRIntersects operator instead of MBRWithin (#3810)
- * Spatialite: avoid executing some Spatialite functions several times when
-   issuing SQL queries
- * Add a INIT_WITH_EPSG dataset creation option to fill the spatial_ref_sys
-   table with content of EPSG CSV files (default to NO); several fixes to be
-   robust to single quote characters in SRS strings
- * Fix to make CopyLayer() work when src layer is a SQL result layer (#3617)
- * Add OGR_SQLITE_SYNCHRONOUS configuration option that, when set to OFF,
-   can speed up considerably write operations (e.g. on EXT4 filesystems),
-   at the expense of extra robustness w.r.t system crashes.
- * Spatialite: when creating a spatialiate DB, add a srs_wkt column in the
-   spatial_ref_sys table, as introduced in libspatialite 2.4.0
- * Implement the DeleteLayer() interface and report the ODsCDeleteLayer capability
-
-SUA driver:
- * New for GDAL/OGR 1.8.0
- * Read Special Use Airspace in Tim Newport-Peace's format
-
-VRT driver :
- * Fix GetExtent() on non VGS_Direct VRT layers (#3783)
+* OGRSpatialReference::SetFromUserInput(): make it work with 'IAU:XXXX'
 
-WFS driver:
- * New for GDAL/OGR 1.8.0
- * WFS client that brings read & write (WFS-T) support for WFS 1.0.0 and 1.1.0
+### Vector drivers
 
-## SWIG Language Bindings
+CSV driver:
+ * Fix issues with attribute and geometry fields of same name
 
-General :
- * Add Geometry.Length(), Geometry.Area(), Geometry.Simplify(), Geometry.UnionCascaded(),
-   Geometry.SymDifference, Geometry.Boundary()
- * Add SpatialReference.GetUTMZone()
- * Add Geometry.ForceToPolygon(), Geometry.ForceToMultiPolygon(),
-       Geometry.ForceToMultiPoint() and Geometry.ForceToMultiLineString()
- * Add Band.SetScale() Band.SetOffset(), and Band.SetUnitType()
- * Add ogr.RegisterDriver() and ogr.DeregisterDriver()
- * Move ogr.GeometryTypeToName() and ogr.GetFieldTypeName() from Java bindings
-   to all bindings
- * Initialize return values of GetRasterStatistics() so that we know if they
-   have been updated
- * Add Feature.SetFromWithMap()
- * Add gdal.GridCreate() (#3661)
- * Expose OSR GetSemiMajor(), GetSemiMinor(), GetInvFlattening() and
-   ImportFromERM() functions
+FlatGeobuf driver:
+ * If CRS WKT detected to be non UTF-8, force it to ASCII (#5062)
 
-CSharp bindings:
- * Use the .NET Framework 2.0 transparency rules (level 1 transparency) for the
-   VC2010 builds (#3559)
- * Fix GDAL_DMD_ and GDAL_DCAP_ constants for Csharp (#3601)
+GPKG:
+ * deal explicitly with CPL_VSIL_USE_TEMP_FILE_FOR_RANDOM_WRITE=YES for /vsi network file systems (#5031)
+ * use ALTER TABLE ... RENAME/DROP COLUMN when possible
+ * when adding a 'epoch' column to gpkg_spatial_ref_sys, one must use the 'gpkg_crs_wkt_1_1' extension instead of 'gpkg_crs_wkt'
+ * add a NOLOCK=YES option to open a file without any lock (for read-only access) (helps fixing qgis/qgis#23991, but requires QGIS changes as well)
 
-Java bindings:
- * Add GdalGrid.java, GDALContour.java
- * Add 'make test' target for Unix/Windows
+MapInfo driver:
+ * .tab writing: correctly detect datum when creating a layer from a WKT2 CRS string (#5217)
 
-Perl bindings:
- * Support polygons in TransformPoints.
- * Test for existence of capability before comparison (avoid unnecessary warning)
- * Added CAPABILITIES lists to driver, datasource and layer classes;
-   Capabilities and TestCapability methods return and use strings as documented
-   already earlier; added FIELD_TYPES, JUSTIFY_TYPES, GEOMETRY_TYPES and
-   BYTE_ORDER_TYPES lists into appropriate classes
- * "create" constructor for FeatureDefn
- * Add aliases Equals and Intersects as mentioned in #3492
- * Changes to support RFC 30
- * Add bindings for ReadDir, Stat, FillNodata
- * Simple support for PostGIS HEX EWKB (remove/add SRID)
- * The Schema method of FeatureDefn returns a schema, where each field hash contains
-   also key 'Index' and the field index as the value.
+PG driver:
+ * ogr2ogr/PG: propagate errors in CommitTransaction() (#5054)
+ * support other geographic SRS than EPSG:4326 for geographic type (#5075)
 
-Python bindings:
- * Fix compilation of Python bindings with Python 3.X on 64 bit platform
- * Optimize Band.ReadRaster() and Dataset.ReadRaster() to avoid extra buffer
-   copy; also add the capability to pass the result buffer such as
-   result_buf = ' '; ReadRaster(0, 0, 1, 1, buf_obj = result_buf) (#3521)
- * NumPy Band.WriteArray() : use numpy object directly instead of converting to
-   string
- * Band.ReadAsArray() : instantiate the numpy object before calling RasterIO()
-   instead of creating it from a string
- * NumPy : add support for signed byte
- * Make sure that feat.SetField('field_name', double_value) goes through
-   OGR_F_SetFieldDouble() instead of being first converted to string
- * Add an optional parameter can_return_null to Dataset.GetGeoTransform();
-   when used and set to True, None is returned when GDALGetGeoTransform()
-   returns CE_Failure (instead of the fake (0,1,0,0,0,1)); backward
-   compatibility preserved when the parameter isn't specified
- * Avoid suppressing warnings and errors when exceptions are used (#3632)
- * Add gdalinfo.py, ogrinfo.py and ogr2ogr.py as sample scripts, direct ports
-   of corresponding C/C++ utilities
- * Allow manipulating buffer > 2 GB on 64bit builds for ReadRaster() and WriteRaster()
- * Map gdal.GetCacheMax(), gdal.SetCacheMax() and gdal.GetCacheUsed() to the
-   corresponding 64bit new API
- * Reset error status before new GDAL/OGR call when using gdal.UseExceptions() (#3077)
- * Changes to support RFC 30
- * Fix Feature.ExportToJson() (#3870)
-
-# GDAL/OGR 1.7.0
-
-(Some of the bug fixes mentioned below might also have gone into 1.6.X maintenance releases.)
+Shapefile driver:
+ * writer: fix speed issue when writing multilinestring with lots of parts (#5321)
+ * writer: fixes for slightly overlapping parts in a multipolygon, and non-horizontal multipolygon Z (#5315)
 
-## In a nutshell...
+SQLite:
+ * deal explicitly with CPL_VSIL_USE_TEMP_FILE_FOR_RANDOM_WRITE=YES for /vsi network file systems (#5031)
+ * use ALTER TABLE ... RENAME/DROP COLUMN when possible
+ * SQLite SQL dialect: Fix issues with attribute and geometry fields of same name
+ * fix crash when doing select load_extension('libgdal.so') from a statically linked sqlite3 console application
+ * fix VirtualShape support with spatialite 5.0.1 or older and sqlite 3.38.0
 
-* New GDAL drivers : BAG, EPSILON, Northwood/VerticalMapper, R, Rasterlite,
-                     SAGA GIS Binary, SRP (USRP/ASRP), EarthWatch .TIL, WKT Raster
-* GDAL PCIDSK driver using the new PCIDSK SDK by default
-* New OGR drivers : DXF, GeoRSS, GTM, PCIDSK and VFK
-* New utility : gdaldem, gdalbuildvrt now compiled by default
-* Add support for Python 3.X. Compatibility with Python 2.X preserved (#3265)
-* Remove old-generation Python bindings.
-* Significantly improved GDAL drivers: GeoRaster, GeoTIFF, HFA, JPEG2000 Jasper, JPEG2000 Kakadu, NITF
-* Significantly improved OGR drivers: CSV, KML, SQLite (SpatiaLite support), VRT
-* WARNING: incompatibility between MrSID GeoDSDK and libgeotiff 1.3.0 or internal libgeotiff on some platforms (see #3309)
-
-## GDAL/OGR 1.7.0 - General Changes
-
-Build (All) :
- * Add gdalbuildvrt to the list of utilities built by default (#2747)
- * Improve Mingw compatibility (#2649)
- * Add Expat read support for GML driver when Xerces is unavailable (#2999)
- * Fix GML and ILI reading problems with Xerces 3.x (#3156)
- * Add 8/12bit JPEG-in-TIFF support
- * Fix trunk compilation against libdap 3.9.X (#3105)
-
-Build (Windows) :
- * Check for CURL_LIB instead of CURL_DIR
- * ensure OGR_ENABLED gets defined if INCLUDE_OGR_FRMTS set (#2784)
- * Change quoting in VCDIR and SETARGV to avoid likely problems.
- * added dll and target-lib targets
- * fix _findfirst handle type for win64 (#3035)
- * Add support to compile OGR-postgis as a plugin (#3125)
- * Trap failures in subdirectories and stop build
-
-Build (Unix) :
- * Use proper object file names when building prerequisites lists (#1878)
- * Updated man page generation
- * Add new ./configure test to check that the GCC 4.1 built-in functions for atomic memory access are really available
- * Handle external libz (#2942)
- * Add support for 64bit file i/o on BSD systems, through fseeko/ftello
- * Add support for linking against libspatialite to benefit from spatial functions in SQL queries (#2666)
- * Fix support for --with-threads configure option on BSDs (tested on DragonFlyBSD 2.2.1)
- * Add support for autodetection of ogdi 3.2 in ./configure (#3007)
- * Remove additional dependency to libgdal.so added during linking in gdal/apps (#2970)
- * Improved ax_oracle_oci.m4 macro to handle libnnzXX for Oracle 10 and 11.
- * support using the Oracle Instant Client SDK
- * Make --with-ingres work with newer versions (#3126)
- * Search for alternative HDF4 flavor in HDF4 testing macro. Alternative HDF4
-   (libmfhdfalt/libdfalt) build is NetCDF-compatible and used in Debian.
- * Support MacOSX "fat" binary building
-
-Port :
- * Provide API and implementation for thread and SMP safe atomic increments (#2648)
- * Add /vsisubfile virtual file driver
- * Added gzip write implementation
- * VSI ZIP : Allow natural chaining of VSI drivers without requiring double slash
- * Add a shortcut when looking for .csv files that are already open
- * Add CPLSetThreadLocalConfigOption()
- * Add CPLIsUTF8() and CPLForceToASCII(); Use them in GML, KML, GPX and GeoRSS drivers (#2971)
- * Add CPLStrlcpy() and CPLStrlcat(), clones of BSD strlcpy() and strlcat() functions
- * Add CPLStrnlen()
- * Add CSLLoad2() and CPLReadLine2L() with max number of lines and chars per line allowed
- * cplkeywordparser.cpp: Support parsing IMD files with values of the form list of lists
- * odbc: Fixed the null terminators for columns of length (x*511)+1, where x>1. (#2727)
- * unix VSIF*L : reworked to avoid unnecessary seeks which can be expensive
- * added HTTPAUTH and USERPWD options for http fetch (#3091)
-
-## GDAL 1.7.0 - Overview of Changes
+## SWIG bindings
 
-Algorithms:
- * cutline : optimize by clipping cutline to region of interest (#2736)
- * cutline : avoid scanline to scanline blending problems (#2740)
- * rasterfill : substantially reworked
- * rasterfill : deprecate bConicSearch option - unused
- * rasterize : optimized
- * rasterize : Added GDALRasterizeLayersBuf() function to rasterize geometries directly
-               into the supplied raster array.
- * rasterize : Add ALL_TOUCHED rasterize option (#2840)
- * rasterize : Added 3D support for rasterizing points and lines. (#3202)
- * rasterize : correct case of vertical/horizontal lines on raster right/bottom edge (#3268)
- * Added GDALCreateGenImgProjTransformer3() function
- * warp: Reduce destination file size, especially when it has compression (#1688)
- * warp: Fix crash when reprojecting to irrelevant SRS (#3079)
- * warp: avoid using the destination nodata value for integer datatypes (#3142)
- * warp: fix panDstValid generation, and avoid using it improperly (#3222)
- * warp: Restore support of reprojection of a lat-long image crossing 180E/180W longitude (#3206)
- * contour: Fix name of GDAL_CG_Create in contour.cpp (#2795)
- * contour: Generate contours with correct orientation (#3129)
- * gdalgeoloc: Improve geoloc backmap interpolation (#2501)
- * overview: added support for cubic convolution overviews
- * gdal_grid: 3 new metrics: data point count, average distance between data points
-              and a grid node, average distance between data points.
- * gdal_grid: Properly cast the poOptions parameter in data metrics computation functions. (#3207)
-
-Core :
- * Added mechanism to clear overviews if zero overviews requested. Implemented by GTiff and HFA drivers (#2915)
- * Support for overviews in subdatasets
- * Support for overviews in proxydb directory (#2432)
- * SetColorTable(NULL) is permitted and means delete (#2421)
- * Preserve NBITS and SIGNEDBYTE in CreateCopy() for supporting drivers (#2902)
- * GDALCopyWords() : performance optimizations
- * Add GDALCheckDatasetDimensions() and GDALCheckBandCount()
- * Add GDALGetColorInterpretationByName()
- * Use tiff .ovr for overviews if .aux is just metadata (#2854)
- * Add missing argument in function declaration for GDALRATTranslateToColorTable()
- * Do not use colortable for bit2grayscale overviews (#2914)
- * Support world files with blank lines (ESRI Merge)
- * Add worldfiles in GetFileList() (ESRI Merge)
- * Fix rpb/imd loading with a path (#3047)
- * Add support for using overviews in GDALDataset::BlockBasedRasterIO() (#3124)
- * Take into account SIGNEDBYTE for GetStatistics() & GetHistogram() (#3151)
- * Add GDALReadOziMapFile() and GDALLoadOziMapFile() to read projection
-   and georeferencing information from OziExplorer .MAP files.
- * Added declarations for GDALLoadTabFile() and GDALReadTabFile()
- * Add missing case for CInt16 and CInt32 in GDALNoDataMaskBand and GDALNoDataValuesMaskBand
-
-Utilities :
- * gdaldem: new for GDAL/OGR 1.7.0 (#2640)
- * gdalinfo:
-    - add -norat switch
-    - do not report RPC or GEOLOCATION metadata with -nomd
-    - Use pretty wkt to display GCP projection
- * gdalwarp:
-    - fix cutline blend distance setting (#2733)
-    - in -te case, adjust the resolution after computing the image dimensions
-    - improved cutline support (#2733, #2847, #2884, #2984)
-    - avoid overwriting an existing destination file that cannot be opened in update mode with a new GTiff file
-    - better heuristics to guess output extent when projection from lat/long world
-      extent to other world global projections (#2305)
- * gdaltindex:
-    - Avoid unnecessary error message in gdaltindex when creating a new shapefile (#2779)
-    - Rewritten to use OGR API instead of ShapeLib API, so as to produce .prj files more easily (#982)
- * gdal_contour:
-    - make -3d option work even after -fl option (#2793)
-    - Call GDALGetProjectionRef() on the dataset, not the raster band (#3062)
- * gdalbuildvrt:
-    - Add -separate, -allow_projection_difference, -te, -tr, -q, -addalpha options
-    - Add -srcnodata and -vrtnodata options (#3254)
-    - Add -hidenodata option (#3327)
-    - Avoid accidental overwriting of a non VRT dataset due to reversed filename order
-    - Fix -resolution lowest/highest (#3198)
- * gdaladdo: add -clean option (#2915)
- * gdaladdo: add -q option
- * gdal_grid: Add support for spatial filtering with -clipsrc option
- * gdal_translate: support translation of a dataset with subdatasets if the parent has bands
- * gdal_translate: Add 'gray' as a value of -expand rgb option
- * gdal_translate: Add -unscale commandline option
- * gdal_merge.py: Add progress report
- * gdal_vrtmerge.py: Fix -separate case (#2836)
- * gdal_vrtmerge.py: Write the <SourceProperties> element (#1985)
- * gdal_retile.py: add lanczos resampling (#2859)
- * gdal_fillnodata.py: ensure dstfile support works by copying source (#2866)
- * GDAL2Tiles: --srcnodata support + fixed KML rendering for -p raster
- * rgb2pct.py: Added ability to use a preexisting color table from a file (#2958)
- * pct2rgb.py and rgb2pct.py : Copy the GCPs and their projection to the target dataset.
- * classify.py: Fix order of args to numpy.ones() and numpy.zeros() (#3089)
- * hsv_merge.py: New sample script to greyscale as intensity into an RGB image,
-                 for instance to apply hillshading to a dem colour relief.
- * support filename globbing for various Python scripts (#2783)
- * --formats will add 'v' in report on drivers that support virtual io
- * all utilities and scripts : consistently advertise -q as the official quiet
-                               option, but accept both -q and -quiet (#3820)
-
-Changes in various drivers :
- * Implement support for overviews on subdatasets for HDF4, HDF5, NetCDF, NITF, XPM, TERRAGEN, PCIDSK (#2719)
- * Add support for 64bit offsets in /vsisubfile, JPEG and JP2ECW drivers
- * External overviews support added to some drivers (JDEM, ...)
- * Avoid incorrect GEOGCS AXIS settings (#2713)
- * Use GDALCheckDatasetDimensions() and GDALCheckBandCount() in various drivers
- * Many memory leak fixes (HDF5, HKV, Leveler, MFF, NITF, RMF, JPEG2000, WCS ... drivers)
- * Many fixes to improve robustness against corrupt data in many drivers
- * Error out when trying to open a read-only dataset in update mode (#3147)
- * Ensure that the same JPEG2000 driver that has been used with CreateCopy() is used to re-open it (#1596)
+CSharp bindings:
+ * Switch default platform target to AnyCPU (#1368)
 
-ADRG driver:
- * Support PSP != 100 (#3193)
+Python bindings:
+ * utilities-as-lib: propagate warnings to custom error handler when UseExceptions is on (#5136)
+ * make sure GetUseExceptions() doesn't clear the error state (#5374)
 
-AIG driver:
- * Differ opening of the RAT only when GetDefaultRat() is called.
-   Will improve performances and make less likely the error message of #3031
+# GDAL/OGR 3.4.1 Release Notes
 
-AAIGRID driver:
- * Fix bad reading of AAIGRID dataset whose last line doesn't have a linebreak character (#3022)
- * Make the ArcInfo ASCII driver more Mac-compatible. (#3212)
+## Build
 
-BAG driver :
- * New for GDAL/OGR 1.7.0
+* configure.ac: fix detection of OpenEXR >= 3 (#4766)
+* Add support for PCRE2 (to replace deprecated PCRE) (#4822)
+* nmake.opt: fix wrong variable name in example MSODBCSQL_LIB
+* Add support for external libqhull_r (#4040)
 
-BLX driver:
- * Implement progress callback in CreateCopy() (#2830)
+## GDAL 3.4.1 - Overview of Changes
 
-BMP driver:
- * Modify GetGeoTransform() to return geotransform based on the resolution
-   information in the BMP header if nothing else is available (ESRI merge).
- * use pam functions properly for geotransform when not using world file
+### Algorithms
 
-BSB driver:
- * Fix several issues with BSB files reading (#2782)
- * Handle properly more than 256 GCPs (#2777)
- * Add logic to chip GCPs around to avoid split over dateline problems (#2809)
- * Add logic to reproject GCPs into Mercator for mercator projected images.
+* viewshed.cpp: remove hidden bidirectional unicode character in code comment
 
-DTED driver:
- * Re-enable DTED driver to recognize files not starting by a UHL record (#2951)
+### Port
 
-ECW driver:
- * Enable the JP2ECW driver to open JP2 files with the VSILAPI
- * Fix build with MSVC2008  (#2850)
- * Fix memory overwrite while zooming an ECW image (#2934)
- * Speed-up de-registration of the driver that can take up to 3 seconds (#3134)
-
-EHDR driver:
- * Add color table update.  Add limited support for floating point
-   files (.flt) (ESRI Merge)
- * added support for SIGNEDBYTE pixels (#2717)
- * Restructure stats handling so pam capture works right when stx write fails
- * improve a bit .clr reading (#3253)
+* CPLRecodeIconv(): avoid potential unsigned integer overflow (ossfuzz #41201)
+* CPLRecode(): ZIP support: avoid warnings on MacOS
+* IVSIS3LikeFSHandler::CopyFile(): always take into account ret code of CopyObject()
+* CPLZLibInflate(): workaround issue with /opt/intel/oneapi/intelpython/latest/lib/libz.so.1 from intel/oneapi-basekit Docker image
 
-ENVI driver:
- * Move RPC info into the RPC domain (#3063)
- * Converted to using VSI Large File API (#3274)
- * re-enabled complex support (#3174)
+### Core
 
-EPSILON driver:
- * New for GDAL/OGR 1.7.0
- * Mainly used coupled with Rasterlite
+* GDALDataset::MarkSuppressOnClose(): delete auxiliary files (#4791)
+* GDALPamRasterBand::CloneInfo(): deal correctly with NaN nodata to avoid generating useless .aux.xml file (#4847)
+* External overviews: automatically turn PLANARCONFIG_CONTIG for WebP overviews
 
-ERS driver:
- * Added PIXELTYPE support to report/create SIGNEDBYTE (#2902)
- * Give precedence to PAM SRS, and even check for .aux file.  (ESRI Merge)
+### Utilities
 
-FAST driver:
- * Support 7 bands (#3307)
+* gdaladdo -clean: remove overviews of mask (#1047)
+* gdalwarp -crop_to_cutline: fix extremely long loop (#4826)
+* gdalwarp: do not emit "Point outside of projection domain" / "tolerance condition error" (#4934)
+* gdal_polygonize.py: remove use of Unicode double quote characters
+* gdal_polygonize.py: make -8 switch work again (#5000)
+* gdal_sieve.py: fix exception when source dataset has no nodata value (3.4.0 regression) (#4899)
+* gdal2tiles: making --no-kml option takes effect (#4936)
+* gdal2tiles: XML escape input filename (#5032)
 
-Fujibas driver:
- * Fix to work on big-endian hosts
+### Raster drivers
 
-GenBin driver:
- * Implemented custom class for 1bit (U1) files (#2730)
- * Fix inverse flattening computation (#2755).
- * Added U2 and U4 support
- * Look for LSB, assuming MSB if not found (#2730)
+COG driver:
+ * only create RGB JPEG with mask if 4-band is alpha (#4853)
+ * fix potential generation failure when main imagery has overview and mask none
 
-GeoRaster driver:
- * Fix compression problems
- * Add MaskBand support
- * Support UNICODE metadata
- * Support cross database schema/user access
- * add COORDLOCATOR create option
-
-GeoTIFF driver :
- * Add 8/12bit jpeg in tiff support
- * Add support for creating external BigTIFF overview files,
-   with BIGTIFF_OVERVIEW configuration option. (#2785)
- * Add support for deleting a color table (#2421)
- * Add logic for Imagine citation parsing
- * Add logic for encoding and reading ESRI PE string from citation.
- * Add support for reading and writing vertical datum info from geotiff
- * Changes to units handling.  (#2755)
- * Optimize opening speed by deferring fetching the coordinate system till GetProjectionRef (#2957)
- * Optimize GTiffRasterBand::IReadBlock() for multi-band interleaved case.
- * Avoid unnecessary re-writing the TIFF directory (#3021)
- * Use official value for inverse flattening of the WGS84 ellipsoid (#2787)
- * Add metadata domain for XML documents (#2786)
- * Make GTiff driver friendly with files with huge number of bands and pixel interleaving (#2838)
- * Avoid precaching other bands if block cache size is not big enough to accommodate them (#2838)
- * Internal libtiff (4.0.0beta5) and libgeotiff (1.3.0beta) upgraded
- * use the SetCitationToSRS call for the PCSCitationGeoKey in a similar fashion to the GTCitationGeoKey (#2933)
- * NBITS set for GTiffOddBits.  YCbCr JPEG added as a compression type.
-   generate MINISWHITE IMAGESTRUCTURE metadata item.  Set missing blocks
-   to the nodata value if there is one.  (ESRI Merge)
- * Support GeoTIFF with only ProjectedCSTypeGeoKey defined (#3019)
- * External overviews: try to preserve the bit depth of the original image
- * Allow reading and creation of big all-in-one-strip 8bit TIFF (#3094)
- * Handle projection methods for Google Mercator special case (#3217)
-
-GFF driver :
- * Fix support for big endian host (#2832)
- * Add pam, and overview support.  Switch to VSI*L API to support virtualio (#3014)
-
-GIF driver :
- * Introduced a BIGGIF driver to handle GIF files without using the
-   slurp into memory approach. (#2542)
- * CreateCopy() reports now progress
- * Replace internal libungif by giflib-4.1.6 (#1825)
- * Read projection and georeferencing from OziExplorer .MAP file if possible.
+ECW driver:
+ * do not try to open UInt32 JPEG2000 if the SDK is buggy (#3860)
 
-GRASS driver:
- * Add support for GRASS 7.0 GDAL and OGR plugins (#2953)
- * Use GRASS_GISBASE for GDAL GRASS driver instead of hard-coded path (#2721)
+ERS driver:
+ * Add support for comments in ERS files (#4835)
 
 GRIB driver:
- * only scan for PDS templates in GRIB2 files (#2858)
- * Avoid dumping GribLen debug message if built with -DDEBUG.
- * Remove verbosity from GRIB driver (#2887)
- * Make GRIB detection thread safe (#3209)
- * Check that bands have the same dimensions (#3246)
-
-GS7BG driver:
-  * Recognize version 2 datasets (#3123)
-
-HDF4 driver :
- * Allow HDF4 subdataset name to include Windows letter drive (#2823)
-
-HDF5 driver :
- * subdatsets need to be numbered from 1 not 0 (#2462)
- * Block size recognition. (#2270)
- * Fix initial value for nGCPCount in HDF5ImageDataset (#2774)
- * Fixes to type classification, and to avoid listing subdatsets for unsupported pixel data types (#2941)
- * Mark PAM for not saving .aux.xml files at this level.  Directly open
-   subdatasets in HDF5Dataset::Open() if there is only one subdataset.
+ * fix thread-safetey of errSprintf()
+ * avoid read heap buffer overflow due to inappropriate split-and-swap on dataset with weird georeferencing (ossfuzz #41260, #41637)
+ * fix writing negative longitude of natural origin for Transverse Mercator
 
-HFA driver:
- * Support reading and evaluating 3rd order xforms (#2716)
- * Various improvements to SRS support, particularly to preserve PE
-   compatibility.  (#2755)
- * Added HFAEntry::RemoveAndDestroy() method to remove nodes from tree (#2421)
- * Added support for deleting color tables (#2421)
- * Add a scaled progress monitor for HFADataset::IBuildOverviews()
- * Fix HFA u2 compression/decompression (ESRI merge)
- * Add support for reading compressed s8 HFA (#3152)
- * Defer opening overviews till they are first requested (#3155)
- * Support multiple excluded values (#3252)
- * added a variety of additional coordinate system based types missing in some files (#3262)
- * Various fixes (#2421, #2842, #2755, #3082, #2730)
+GTiff driver:
+ * only emit warnings on libgeotiff PROJ errors (#4801)
+ * Initialize jxl structures with zeros.
+ * LERC overview related improvements (#4848):
+   + COMPRESS_OVERVIEW configuration option now honours LERC_DEFLATE and LERC_ZSTD for external overviews
+   + MAX_Z_ERROR_OVERVIEW configuration option is added for LERC compressed internal and external overviews.
+   + ZLEVEL_OVERVIEW configuration option is added for DEFLATE/LERC_DEFLATE compressed internal and external overviews.
+   + ZSTD_LEVEL_OVERVIEW configuration option is added for ZSTD/LERC_ZSTD compressed internal and external overviews.
+ * fix performance issue when reading transfer functions (#4923)
+ * propagate SPARSE_OK to overviews (#4932)
+ * avoid huge memory allocation when generating overviews on large single-band 1-bit tiled files (#4932)
+ * make SetGCPs(), SetGeoTransform(), SetSpatialRef(), SetNoDataValue(), SetMetadata[Item]() write to PAM .aux.xml on read only files (#4877)
+ * add support for reading/writing color table from/into PAM .aux.xml (#4897)
+ * do not warn about buggy Sentinel1 geotiff files use a wrong 4326 code for the ellipsoid
+ * Internal libtiff: fix issue with rewrite-in-place logic of libtiff #309
 
-Idrisi driver:
- * Writing text file in CRLF format (#3199)
- * forward porting esri changes + other changes
- * provide default values on Create() (#3243)
+KEA driver:
+ * print error message when opening of kea file fails
 
-INGR driver:
- * Fix INGR driver that was failing on big endian hosts (#2898)
- * Fix RLE support (#3106)
- * Added overview building (#2904)
+NITF driver:
+ * Add ISO-8859-1 decoding for file and image header metadata
 
-JPEG driver:
- * Enable the JPEG driver to read and create 12bit JPEG images when JPEG12_ENABLED=yes
- * Internal libjpeg: additional changes to ensure operation with IPP enabled apps (#2606,#2845)
- * JPEG read optimizations : differ extraction of EXIF metadata and internal maskband
-
-JPEG2000 (JasPer) Driver:
- * Allow proper reading of JP2 images where dimensions are not multiple of 256 (#2399)
- * Add a virtual I/O interface to able to read from/write to JPEG2000-NITF files
- * Do not deregister jas_image_clearfmts() to avoid failure when gdal_translat'ing from JP2 streams
- * Add proper reading of YCbCr images as RGB
- * fix decoding of bit depth for BPCC and PCLR boxes
-
-JP2KAK (Kakadu) Driver :
- * Fix band selection from ycbcr to rgb converted images in DirectRasterIO (#2732)
- * Support jpc vsisubfile streams
- * add handling of reversibly compressed data with 9 to 16 bits precision (#2964)
- * Modify transfer_bytes() buf32 case to offset/scale based on precision. (#2964)
-   Fixed _WriteTile() lossless 16bit case to avoid improper 32K offset.
-   Added support for NBITS image structure metadata, and creation option.
- * Added logic to limit tiles to 64K due to jpeg2000 limitation. (ESRI Merge)
- * Fix offsetting of 16U buf32 data (#3027)
- * Support 16u/16s imagery through DirectRasterIO interface (#3049)
- * Support external overviews as an override to internal overviews
- * Rework jp2kak support to use natural kakadu builds (Windows build)
- * ensure external overviews get used if available (#3276)
- * add preliminary multi-threading read support via DirectRasterIO()
-
-
-LAN driver:
- * Give preference to PAM coordinate system since built-in info is very
-  limited.  Fallback to PAM geotransform if internal missing. (ESRI Merge)
+PCIDSK driver:
+ * fix write heap-buffer-overflow (ossfuzz #41993)
 
-LCP driver:
- * Add projection file support (#3255)
+PDS4 driver:
+ * write conformant Equirectangular when input raster is a geographic CRS
 
-MEM driver:
- * Allow creating bands of more than 2GB each if size_t is large enough.
- * Added GetInternalHandle() implementation to fetch band memory buffer
+USGSDEM driver:
+ * fix reading datasets with 1025 byte records ending with line feed (#5007)
 
-MrSID driver:
- * Implement faster resampling for 1:1 case
- * Improve stream implementation so it works for jp2 with v7
- * Make the JP2MrSID driver accept .ntf extension to allow reading jpeg2000
-   datastream in NITF files
- * Avoid reporting large metadata objects.  Add MG version to metadata.
+VRT driver:
+ * Warped VRT: fix issue with blocks without sources and alpha band (#4997)
 
-NetCDF driver:
- * Fix handling of pixel validity mask (#3112)
- * correct a problem with 5+ dimensional data access (#2583)
- * fix y flip detection in common case (#2654)
- * add support for subdataset names with Windows full path names, like NETCDF:D:\...
+XYZ driver:
+ * Fix incorrect failure to open ASCII-file due to floating point comparison
 
-NITF driver:
- * Add support for reading & creating large (>4GB) NITF files.
- * Add support for NITF/JPEG2000 overviews (JP2KAK)
- * Add support for reading & creating 12bit JPEG compressed NITF files when JPEG12_ENABLED=yes
- * Add support for creating a NITF file with many bands and big TRE content
- * Add support for creating several uncompressed images in a NITF file (#2989)
- * Add support for creating M3 (masked multi-block JPEG compressed) images
- * Add support for unpacking a wider variety of pixel depths.
- * Add support for overriding IGEOLO with GEOLOB TRE precision georef (#3180)
- * Add support for for CFloat32 reading & writing (#2526)
- * Add support for reading and writing NITF file with large single block (#3263)
- * Allow Jasper driver to be used for NITF IC=C8 (JPEG2000) CreateCopy() if JP2ECW is not available
- * Allow JP2MrSID driver to be used for reading JPEG2000 datastreams in NITF
- * Avoid issues when reading M3 single block images
- * Fix CreateCopy() of multi block JPEG-NITF
- * Various bugfixes (#2940, #2912, #3029, #3088)
- * Support NITF file with a color table and JPEG2000 data content (#3110)
-
-NWT_GRC / NWG_GRD drivers (Northwood/VerticalMapper) :
- * New for GDAL/OGR 1.7.0
+Zarr driver:
+ * be robust to duplicated array and group names in NCZarr metadata, which could lead to performance issues
+ * fixes 'runtime error: reference binding to null pointer of type 'unsigned char' (ossfuzz #41517)
 
-OGDI driver:
- * improve finding of PROJ.4 include files for OGDI (#1242)
+## OGR 3.4.1 - Overview of Changes
 
-PCIDSK driver (old driver):
- * Added worldfile reading. Added PAM fallback for geotransform.
- * Added support for default overviews (i.e. .ovr or .rrd).  (ESRI Merge)
- * fail somewhat gracefully on compressed images
+### OGRSpatialReference
 
-PCIDSK driver (new driver):
- * New for GDAL/OGR 1.7.0, using the PCIDSK SDK
+* OGR_CT: add a OGR_CT_PREFER_OFFICIAL_SRS_DEF config option
 
-PDS driver:
- * Transfer various keywords to metadata
- * Made keyword handler more in complaint with ODL (#2956)
- * Support detached files with an offset (#3177)
- * Support .LBL labelled compressed files
+### Vector drivers
 
-PNG driver :
- * Upgrade internal libpng to 1.2.35
- * Only write a world file if the source datasource has a geotransform
- * Allow writing a nodata value of 0 as the transparent color value (#3208)
+DXF driver:
+ * Do not copy final DXF when MarkSuppressOnClose was called
 
-R driver:
- * New for GDAL/OGR 1.7.0
+DWG/DGNv8 drivers:
+ * avoid potential crash with ODA 2022 on Linux when driver unloading doesn't occur properly
+ * DWG: Add block attributes to entities layer (#5013)
 
-Rasterlite driver
- * New for GDAL/OGR 1.7.0
+ElasticSearch driver:
+ * do not try to open reserved .geoip_databases to avoid error message with recent Elastic versions
 
-RIK driver:
- * Improved error checking
+GPKG driver:
+ * fix nullptr dereference on corrupted databases with sqlite >= 3.35
 
-SAGA GIS Binary driver:
- * New for GDAL/OGR 1.7.0
+MSSQL driver:
+ * fix compilation warnings on Linux
+ * avoid GetLayerDefn() to return null, and call it in GetExtent()
+ * DeleteLayer(): remove suspicious test 'strlen(pszTableName) == 0' that causes a read after free
+ * fix issue when inserting strings in bulk copy mode on Linux
+ * make GetNextFeature() end bulk copy mode
+ * CreateFeature in bulk copy mode: make it use feature geometry SRID when set
+ * disable bulk mode when a UUID field is found, as this doesn't work currently
+ * do not set field width when reading smallint/int/bigint/float/real columns, and correctly roundtrip smallint/Int16 (#3345)
 
-SDE driver :
- * Fix exporting ArcSDE raster results in a displaced image (#2063)
+ODS driver:
+ * avoid crashing 'floating-point exception' when evaluating -2147483648 % -1 (ossfuzz #41541)
 
-SRP driver (ASRP/USRP):
- * New for GDAL/OGR 1.7.0
+OpenFileGDB driver:
+ * correctly parse raster fields of type == 2 which are inlined binary content (#4881)
 
-SRTM driver :
- * Set GDALMD_AOP_POINT metadataitem (#1884)
+PG driver:
+ * skip all leading whitespace in SQL statements. (#4787)
 
-TIL driver (EarthWatch .TIL) driver:
- * New for GDAL/OGR 1.7.0
+Selafin driver:
+ * fix time step count when none dataset in the file
 
-VRT driver :
- * Honour the INIT_DEST warp option (#2724)
- * Improve performance of LUTs in VRTComplexSource from O(n) to O(log2(n)) (#3003)
- * Implement (advertized in doc) support for SetMetadataItem( "source_0", szFilterSourceXML, "vrt_sources" ) on a VRTSourcedRasterBand (#3052)
- * Implement GetFileList() to list the source files
- * Fix wrong initialization of destination buffer in VRTSourcedRasterBand::IRasterIO() in case of not standard pixel/line spacing. (#2867)
+Shape driver:
+ * better deal with ETRS89 based CRS with TOWGS84[0,0,0,0,0,0,0]
 
-WCS driver:
- * do not try to parse HTML content, which is returned by some provider when the server doesn't exist
- * added HttpAuth and UserPwd options for authentication (#3091)
+SQLite driver:
+ * Various fixes for MacOS system SQLite
 
-WKT Raster driver:
- * New for GDAL/OGR 1.7.0
+S57 driver:
+ * enable recoding to UTF-8 by default (RECODE_BY_DSSI=YES open option) (#4751)
 
-WMS driver:
- * Support TMS/formatted URLs in WMS minidriver (#2878)
- * Be tolerant if we have required 3 bands and got 4, or the other way round
- * Declare a user agent string
+TopoJSON driver:
+ * fix duplicate 'id' field, and other potential issues when reading fields
 
-## OGR 1.7.0 - Overview of Changes
+WFS driver:
+ * if COUNT is present in WFS >= 2, use it as the page size. Also clarify doc
 
-Utilities:
- * ogrinfo: Preserve order of source layers specified on ogrinfo command line,
-            and use GetLayerByName() which enables to read some hidden layers
-            like public.<table> layers from a PG database (#2922, #2026)
- * ogr2ogr:
-    - Add -clipsrc and -clipdst option to clip geometries to the specified extents
-    - Add -fieldTypeToString option to conveniently cast any fields of given type to fields of type string (#2968)
-    - Add -progress option for ogr2ogr to displaying progress (#2998)
-    - Add -wrapdateline option to ogr2ogr to deal with geometries that cross 180 degree longitude (#3158)
-    - Add -dialect flag to specify SQL dialect
-    - Preserve order of source layers specified on command line (#2922)
-    - -overwrite and -append now automatically imply -update (#3048)
-    - Support converting to a format after field name "laundering" (#3247)
-  * ogrtindex:
-    - Skip layers whose schema does not match instead of terminating (#3141)
-    - Add a -accept_different_schemas option for non-MapServer use cases (#3141)
-    - Set SRS to tileindex when one is found in the tiles
-  * ogr2vrt.py : new script that will create a VRT corresponding to a
-    source datasource (sample script for the moment, not promoted officially)
-
-Core :
- * Improved OGR feature style (#2875, #2808)
- * Considerable speed-up of ExportToWkt() for very large geometries
- * Added new OGR_GEOM_AREA special field (#2949)
- * ensure forceToMultiLineString() works for MultiPolygons (#2735)
- * Various fixes in OGR SQL engine (r16116, #2996, #2788, #3143, #3144)
- * Add OGREnvelope::Intersect()
- * Add OGR_G_ApproximateArcAngles() for ellipses
- * Fix crash on Ubuntu 8.10 in GetFieldAsString() because of (too) strict guard logic (#2896)
- * add field type max so we can iterate through all possible values
- * Avoid making a 2D5 geometry from a 2D only linestring when reprojecting
-
-OGRSpatialReference :
- * Upgrade EPSG derived files to EPSG 7.1
- * Added support to operate on COMPD_CS coordinate systems
- * Added support for importing spatial reference definitions from the OziExplorer .MAP files.
- * Introduce static methods to destroy OGRSpatialReference and OGRCoordinateTransformation objects
- * Expose more of the axis orientation API to C
- * Add missing Eckert 1, 2, 3 and 5 projections
- * Fix typos in proj4 conversion for Wagner projections
- * Hack in EXTENSION nodes for Google Mercator (#3136)
- * Validates PROJCS with AXIS definitions (#2739)
- * Added support for urn:ogc:def:crs:OGC::CRS:84 (and CRS:83, CRS:27) per WMS spec.
- * Wide variety of improvements to preserve PE strings through a morphFromESRI()
-   and morphToESRI() process (#2755)
- * Fix inversion of dictionary filename and GEOGCS/PROJCS name in OGRSpatialReference::exportToERM() (#2819)
- * Fix SpatialReference::IsSame() for LOCAL_CS case (#2849)
- * Fix bug in ImportFromXML that prevented from retrieving projection method
- * Accept both href and xlink:href in OGC XML
- * improve us foot translation handling (#2901)
- * OGRSpatialReference::importFromUrl() : add a default 10 second timeout to avoid waiting forever when remote server is stalled
- * ensure we can translate mercator1sp with non-zero origin to proj4 (#3026)
- * ensure scalefactor preserved in somerc translation (#3032)
- * SRS_ESRI: attempt to correct equidistant cylindrical parameter morph (#3036)
- * SRS_ESRI: improve plate_carree parameter morphing (#3036)
- * SRS_PCI : Fix PCI projection string handling for UTM
- * esri_extra.wkt: correct equidistant conic definitions (#3086)
- * SRS_PANORAMA : Added support for British National Grid and Pulkovo 1995 datums.
- * Improve recognition of WKT text strings when translating into proj4 hard-coded datum names, in particular nzgd49
-   (also add ggrs87, carthage, hermannskogel, ire65); Fix ellipsoid parameters for modified airy (#3104)
- * OSRGetEllipsoidInfo() available for various OGR SRS modules
- * added support for OGC:CRS84 and similar srses from wms/wcs spec in SetFromUserInput (#3090)
-
-BNA driver :
- * Fix output of BNA driver with polygons with inner ring (#2985)
- * Proper CRLF output on Windows (#3256)
-
-CSV driver :
- * Add support for reading and writing CSV files with semicolon or tabulation
-   as the field separator (#2925, #2136)
- * Add automatic treatment of WKT column as geometry
- * Add 'CREATE_CSVT' layer creation option
-
-DXF driver :
- * New for GDAL/OGR 1.7.0
-
-Geoconcept driver:
- * Fix 'private Class and SubClass headers are inverted' (#2919)
- * Fix error in writing 2.5D/3D export file (#2921)
+## SWIG Language Bindings
 
-GeoJSON driver:
- * updated JSON-C library to version 0.9
- * use VSIF*L API
-
-GML driver :
- * Speed-up considerably parsing of GML coordinates in big geometries, in particular on Windows
- * Add support for gml3.1.1 srsDimension attribute, to deal with 3D geometries (#2311)
- * Support multiple <gml:pos> elements in linearrings of polygons (#3244)
- * Limited support for GML3
- * Support direct use of FIDs as long as they are all numeric or they have a completely fixed prefix (#1017)
- * Fix OGRGMLLayer::GetFeatureCount() if there's a .XSD file available (#2969)
- * Added support for out-of-band attributes on features (for NAS)
- * Adding the date field type to xsd writer and precision info for OFTReal fields. (#2857)
+All bindings:
+ * add missing CPLES_SQLI constant (#4878)
 
-GPX driver:
- * Add GPX_SHORT_NAMES configuration option to make the GPX driver report shorter field names
-   and avoid duplicated field names once translated to shapefile (#2966)
- * Write the <bounds> element (write only)
- * Avoid escaping XML content when writing <extensions>.
- * Add appropriate xmlns when detecting Garmin GPX extensions
+CSharp bindings:
+ * Re-target apps to netcoreapp2.2, fix broken build (#4792)
 
-GRASS driver:
- * Do not report 3D geometries for 2D GRASS maps (#3009)
+Java bindings:
+ * add_javadoc.c: robustness fixes and fix crash on MacOS
 
-GTM (GPSTrackMaker) driver :
- * New for GDAL/OGR 1.7.0 (#3113)
+Python bindings:
+ * Change GetFieldAsBinary to use VSIMalloc. (#4774)
+ * install target: fix/workaround for setuptools 60.0 and Debian --install-layout
 
-ILI driver :
- * Improved curve segmentation algorithm
- * ILI1: Support for multiple point geomtries
- * ILI1: Support Real and Integer column types
+# GDAL/OGR 3.4.0 Release Notes
 
-Ingres driver:
- * Utilize the new OGC based ingres capabilities (#3159)
+## In a nutshell...
 
-KML driver:
- * Support reading MultiGeometry and layers with mixed geometry type.
- * Speed-up considerably the reading of huge KML geometries (#3005)
- * Speed-up considerably with huge number of layers
- * Moved the location of the Style element to match the OGC Schema (#2858)
- * Advertise 25D geometry type when relevant (#1803, #1853, #2181)
- * Relax KML driver about xmlns (#3004)
+* [RFC 81](https://gdal.org/development/rfc/rfc81_coordinate_epoch.html):
+  Support for coordinate epochs in geospatial formats.
+  Implemented in FlatGeoBuf, GeoPackage, MEM, VRT
+* New GDAL drivers:
+  - [Zarr](https://gdal.org/drivers/raster/zarr.html):
+    read/write support for ZarrV2 (and experimental V3), using 2D classic raster
+    API or multidimensional API:
+  - [STACIT](https://gdal.org/drivers/raster/stacit.html):
+    Spatio-Temporal Asset Catalog Items as virtual mosaics
+* Other improvements:
+  - number of enhancements in file system operations of /vsigs/
+  - NITF: additions to comply with NITF Version 2.1 Commercial Dataset
+    Requirements Document (NCDRD)
+  - ODBC and PGeo: multiple fixes and improvements
+  - SAFE (Sentinel1): multiple improvements related to SLC/calibration (change
+    subdataset naming)
+  - multidimensional API: caching, and other improvements
+* Code linting and security fixes
+* Bump of shared lib major version
+* MDB driver (Java based) mark as deprecated. Planned for removal for GDAL 3.5.
+  ODBC driver is the preferred solution (with up-to-date MDBTools library on
+  non-Windows platforms)
+* Writing side of Tiger driver deprecated and will be removed in GDAL 3.5
+* Remainder: DODS, JPEG2000(Jasper), JPEGLS, MG4LIDAR, FUJIBAS, IDA, INGR and
+  vector driver ARCGEN, ArcObjects, CLOUDANT, COUCHDB, DB2, DODS, FME, GEOMEDIA,
+  GTM, INGRES, MONGODB, REC, WALK are planned for removal in GDAL 3.5. As well
+  as Perl bindings
 
-MySQL driver :
- * Fix mysql driver compilation with mysql 5.1/g++-4.3.2 (Mandriva 2009.1) (#2972)
- * Fixed bug MySQL driver truncating decimal places for double field type. (#2852)
+## New optional dependencies
 
-OCI driver :
- * OCI varchar2 columns can be up to 4000 bytes (#2876)
+* libjxl (master) when using internal libtiff for JPEG-XL support in TIFF
+* liblz4, libblosc: recommended for Zarr driver (as well as existing libzstd, liblzma)
+* libbrunsli for JPEG-XL support in MRF driver (as well as existing libzstd)
 
-ODBC driver :
- * make it slightly less likely that the srs_tablename parsing will interfere with complex DSNs.
- * support for schemas (#1969)
+## New installed files
 
-OGDI driver :
-  * fix to avoid applying old spatial filter to unrelated layer
-  * fix to force ResetReading() when changing current layer
+ * include/cpl_compressor.h
 
-PGEO driver :
- * Recognize more ESRI shape type constants. (#2991, #3100)
- * implement GetFIDColumn() and GetGeometryColumn() methods (#2694)
+## Removed installed files
 
-PostgreSQL driver:
- * Add support for tables with 'geography' column type introduced in PostGIS 1.5 (#3216)
- * Extend support of schemas in PG driver with 2 new options in the connection string:
-   active_schema=foo and schemas=foo[,bar] (#522 and #525)
- * Implement OGRPGTableLayer::CreateFeature() by using UPDATE instead of DELETE + INSERT (#2557)
- * Implement SetNextByIndex() for layers of PG datasources (#3117)
- * Support PG 'real' data type in tables (#3006)
- * Speed-up PG database opening by avoiding 2 SQL requests per table
- * Avoid evaluating GetFieldIndex() on each field of each feature,
-   which can be very expensive if the layer has many fields
- * allow ST_AsBinary with non binary connections
- * added a configuration option PG_SKIP_VIEWS.
-
-GeoRSS driver :
- * New for GDAL/OGR 1.7.0 (#2726)
+ * no longer build testepsg utility by default, which has been superseded by
+   gdalsrsinfo for many years. It will be finally removed in GDAL 3.5
 
-OCI driver:
- * support blob column binding
+## Backward compatibility issues
 
-PCIDSK driver :
- * New for GDAL/OGR 1.7.0
+See [MIGRATION_GUIDE.TXT](https://github.com/OSGeo/gdal/blob/release/3.4/gdal/MIGRATION_GUIDE.TXT)
 
-Shape driver :
- * Handle duplicate field names in shapefile driver. (#3247)
- * Support for opening and handling .DBF files > 2 GB (#3011)
- * Optimize to use shape bounds for spatial test before organizing poly (#2775)
- * Support for alternate date format (#2746)
- * Improve/fix TestCapability() on OGRShapeLayer
- * Refreshed shapelib from upstream
+## Build changes
 
-S57 driver :
- * Fix incorrect return value of GetFeatureCount() on S57 SOUNDG layer when SPLIT_MULTIPOINT=ON;
-   also avoid warning on that layer when ADD_SOUNDG_DEPTH=OFF (#3163)
+Build(General):
+ * Changes to build against Xerces-c 4.0dev
 
-SQLite driver:
- * Add creation and write support in SpatiaLite-compatible databases
- * Add SPATIAL_INDEX creation option for SpatiaLite tables if linked against
-   libspatialite (default to YES)
- * Implement OGRSQLiteTableLayer::TestCapability(OLCFastFeatureCount)
- * Implement OGRSQLiteLayer::GetFIDColumn() and GetGeometryColumn()
- * Implement TestCapability(OLCRandomRead)
- * Add a SQLITE_LIST_ALL_TABLES configuration option to list all(non-spatial)
-   tables into a SQLite DB even if there are spatial tables
- * Avoid reporting the primary key column as a regular column.
- * Better precision for double values in CreateFeature()
+Build(Unix):
+ * configure file no longer in git. autogen.sh must be run
+ * configure: fix explicit disabling of geos/sfcgal (#3782)
+ * configure.ac: also check netcdf presence by using static linking
+ * fix lack of compilation of nasakeywordhandler.o with some old/non-gnu versions of grep (#3836)
+ * configure.ac: Add compatibility with autoconf 2.71. Set 2.69 as minimum version
+ * #include local files with quotes, and for Unix build, use -iquote instead of -I (#4091)
+ * Use pkg-config for libdap when dap-config is not available.
 
-VFK driver:
-  * New for GDAL/OGR 1.7.0
+## GDAL 3.4.0 - Overview of Changes
+
+### Port
+ * Add cpl_compressor.h API
+ * Add VSIAbortPendingUploads() to abort pending multipart uploads on /vsis3/ and /vsigs/
+ * /vsiaz/: avoid appending same chunk several times
+ * /vsigs/: switch to using S3-style multipart upload API, which is now supported
+ * /vsigs/: enable parallel multipart upload
+ * /vsigs/: add support for reading/writing ACLs through GetFileMetadata/SetFileMetadata with the ACL domain
+ * /vsigs/: implement UnlinkBatch() (efficient implementation only works with OAuth2 authentication)
+ * /vsigs/: implement RmdirRecursive() (efficient implementation only works with OAuth2 authentication)
+ * /vsigs/: add support for GS_USER_PROJECT config option to specify the project ID to bill for requester pays access
+ * /vsigs/: add support for GS_NO_SIGN_REQUEST=YES
+ * /vsigs/: implement SetFileMetadata(filename, metadata, 'HEADERS')
+ * /vsiswift/: Fix openstack swift endpoint detection, add application_credential authentication support (#3960)
+ * /vsiswift/: properly cache stat() results
+ * VSISwiftFSHandler::Stat(): fix potential nullptr dereference (ossfuzz #37906)
+ * /vsis3/ , /vsiaz/: properly set mode field into file property cache
+ * /vsicurl/: fix to be able to read /vsis3/zarr-demo/store/spam
+ * /vsicurl/: make it work without explicit CPL_VSIL_CURL_USE_HEAD=FALSE with .earthdata.nasa.gov/ URLs (#4641)
+ * /vsicurl/: fix crash with curl 7.79.0 to get file size when retrieving headers only
+ * /vsizip/: fix memory leak in error code path (ossfuzz #29715)
+ * /vsitar/: support prefixed filename of ustar .tar archives (#4625)
+ * /vsitar/ etc: avoid potential long processing time on invalid filenames in archive (ossfuzz #30312, ossfuzz #39129)
+ * IVSIS3LikeFSHandler::Sync(): add missing lock
+ * VSIS3FSHandler::GetOptions(): fix non-XML conformity
+ * cpl_odbc.cpp: fix segfault in debug message due to nullptr dereference
+ * CPLODBCSession::ConnectToMsAccess(): try various DSN template combinations because the combo odbcinst 2.3.7 from Ubuntu 20.04 + self compiled mdbtools-0.9.3 doesn't like double quoting of DBQ
+ * MDBTools driver installation: do not error out if /etc/odbcinst.ini contains an entry for Access, and also add /usr/lib64/odbc as a path to please Fedora
+ * Add CPLJSONObject::DeleteNoSplitName()
+ * CPLJSONDocument::Load(): increase max document size to 100 MB
+ * CPLJSONDocument::LoadMemory(): fix parsing 'true' and 'false'
+ * Add CPLQuadTreeRemove()
+ * VSIGetMemFileBuffer(): delay destroying VSIMemFile on bUnlinkAndSeize (#4158)
+ * Fix VSIMemHandle::Read(buffer,nSize=0,nCount=1) to return 0
+ * minixml parser: fix performance issue on very large processing instructions. (ossfuzz #37113)
+ * VSIOpenDir(): add a PREFIX option to select only filenames starting with the specified prefix
+ * Unix file system: implement OpenDir() with a NAME_AND_TYPE_ONLY option
+ * VSIReadDirRecursive(): use VSIOpenDir() / VSIGetNextDirEntry()
+ * VSIStatExL(): add a VSI_STAT_CACHE_ONLY flag to avoid attempting any network access
+ * CPLCreateUserFaultMapping(): better error message when userfaultfd system call fails due to permission issue
+ * userfaultfd: make it work with kernel >= 5.11 without special OS settings
+ * CPL logging mechanism: fix writing non-ASCII UTF-8 filenames on Windows (#4492)
+ * VSI cache: fix crash when a Read() to the underlying file fails (#4559)
 
-VRT driver:
- * Allow fast spatial filtering in the VGS_Direct case
- * Add support for CreateFeature(), SetFeature() and DeleteFeature() operations
- * Added field definition and style control
- * Added new vrt/schema creation capability (@dummy@ datasource, ogr2vrt.py script)
- * Implement 'SrcRegion' element
- * Add a 'reportSrcColumn' attribute to the 'GeometryField' to avoid reporting
-   the x,y,wkt or wkb source fields in the VRT layer field definition
- * Forward TestCapability(), GetExtent(), SetNextByIndex() to source layer when possible
-
-XPlane/Flightgear driver:
- * Improve handling of Bezier curves (#3030)
- * Support new file names used by XPlane 9.00 & later
- * Cut into 2 pieces airway segments that cross the antemeridian
- * Add new layer 'Stopway' that contains the shape of the stopway/blastpad/over-run of a runway
- * Recognize code 16 and 17 for seaplane bases and heliports and add a new field to APT layer
+### Core
+ * Add a GDAL_DCAP_COORDINATE_EPOCH driver capability set by drivers which support storing/retrieving coordinate epoch
+ * fixed issue with GDALLoadRPBFile failing when RPB file does not contain errBias or errRand fields
+ * CPLKeywordParser / IMD parser: accept .IMD files with non-properly quoted values (#4037)
+ * NASAKeywordHandler: fix performance issues (ossfuzz #39092)
+ * IMD writer: properly quote values that have spaces (#4037)
+ * ComputeStatistics(): tiny speed improvements for SSE2 Byte/UInt16 cases
+ * Overview generation: use per band mask with nodatavalue and average (#3913)
+ * GMLJP2v2 writing: fix axis order issue for gml:Envelope (#3866)
+ * Overview/rasterio: fix RMS on large Float32 values
+ * Overview/rasterio: RMS resampling: add AVX2 implementation for Float and UInt16
+ * Overview building: fix crash possibility if user interrupting multi-threaded computation
+ * GDALDriver::DefaultCreateCopy(): preserve coordinate epoch
+ * PAM: support coordinate epoch as a SRS.coordinateEpoch attribute (RFC 81)
+ * GDALDataset::BlockBasedRasterIO(): fixed progress calculation
+ * GDALDataset::BlockBasedRasterIO(): fix when an overview is selected and non-integer window coordinates are involved (fix issue with GeoRaster driver. #4665)
+ * GetIndexColorTranslationTo(): fix non-exact color matching when palettes don't have the same number of entries (#4156)
+ * Block cache: fix potential infinite loop in case of high concurrency and multi-threaded writing (#3848)
+ * GDALDataset::GetFileList(): avoid cyclic calls on odd/corrupted datasets (ossfuzz #37460)
+ * GDALOpenInfo(): fix issue when passing a directory on netBSD and potentially other BSDs
+ * DumpJPK2CodeStream(): dump COC, QCD and QCC segments, and add HTJ2K specificities
+ * GDALGetJPEG2000Structure(): limit default number of lines in output to avoid excessive memory and processing time (ossfuzz #14547)
+ * GDALMDReaderPleiades::LoadRPCXmlFile(): fix nullptr dereference on non-conformant file (ossfuzz #38998)
+ * GDALDataset::FlushCache() and GDALRasterBand::FlushCache(): add a bool bAtClosing argument (fixes #4652)
+ * Make GDALRasterBand::TryGetLockedBlockRef() public
 
-## SWIG Language Bindings
+### Multidimensional API
+ * Add GDALMDArray::IsRegularlySpaced() and GDALMDArray::GuessGeoTransform()
+ * Add GDALMDArray::GetResampled() to get a resampled / reprojected view
+ * Add a GDALMDArray::GetCoordinateVariables() method
+ * Add a GDALMDArray::Cache() method to cache an array/view into a .gmac side car file
+ * Add GDALMDArray::IsCacheable() so that drivers can disable attempts at opening cache file on main dataset
+ * API: add JSON as a possible subtype of (string) extended data type
+ * GDALRasterBand::AsMDArray(): fix data axis to SRS Axis mapping in the return of GetSpatialRef()
+ * GDALMDArray::AsClassicDataset(): fix RasterIO() when buffer data type is not native data type
+ * Add GDALPamMDArray and GDALPamMultiDim classes to be able to serialize/deserialize metadata (SRS for now) from GDALMDArray
+ * Add GDALExtendedDataTypeCreateStringEx() and map it to SWIG
 
-General:
- * Recommended SWIG version is 1.3.39
- * Added API :
-    - GDAL :
-        gdal.FilldoData(), gdal.FileFromMemBuffer(), gdal.Unlink()
-        gdal.ApplyGeoTransform(), gdal.InvGeoTransform()
-        Band.GetUnitType(), Band.GetBand()
-        Band.ComputeStatistics(), Band.HasArbitraryOverviews()
-        RasterAttributeTable.GetLinearBinning()  and SetLinearBinning()
-        extend [Band|Dataset].[ReadRaster|WriteRaster] to accept pixel, line and band spacing parameters
-    - OGR:
-        ogr.GeneralCmdLineProcessor(), Geometry.Segmentize(), FieldDefn.GetTypeName(),
-        Geometry.ApproximateArcAngles()
-    - OSR :
-        osr.ImportFromMICoordSys(), osr.ExportToMICoordSys(), SpatialReference.Clone()
-        osr.EPSGTreatsAsLatLong(), osr.ImportFromEPSGA()
- * Make resampling an optional parameter for gdal.RegenerateOverview(),
-   to be consistent with gdal.RegenerateOverviews()
- * NONNULL checks have been added to check various arguments of methods
- * add missing constants : DCAP_VIRTUALIO, color interpretations, OGR constants
-
-CSharp bindings :
- * Add support for GetFieldAsStringList, GetFieldAsDoubleList and
-   GetFieldAsIntegerList in the C# wrapper (#2839)
- * Support MSVC2008 builds with the csharp interface (#2862)
- * Change the dll mapping rules to support the recent MONO versions
- * Use GC pinned arrays instead of the double copy in the RasterIO functions (#3073)
- * Add typemaps to support custom CPLErrorHandler via C# swig bindings
-
-Perl bindings :
- * in Polygonize make a local copy of the parameters as they are potentially edited
-
-Python bindings :
- * Add support for Python 3.X. Compatibility with Python 2.X preserved (#3265)
- * Remove old-generation Python bindings.
- * Add Python binding's version description capabilities (#3137)
- * NUMPY : Make Band|Dataset.ReadAsArray() take into account preallocated array (#2658, #3028)
- * Various memory leaks fixed
- * Fix gdal.RegenerateOverviews(), Feature.GetFieldAsStringList(),
-   Feature.GetFieldAsIntegerList(), Feature.GetFieldAsDoubleList(),
-   Transform.TransformPoints and CoordinateTransformation.TransformPoints
- * Extend python TransformPoints typemap to accept any sequence (#3020)
- * Make Geometry iterable (#1886)
-
-Java bindings (general changes):
- * Maintained again. A lot of changes to get them into clean state.
- * RasterIO API : added API for standard Java arrays in addition to DirectByteBuffer
- * Javadoc available at http://gdal.org/java
-
-# GDAL/OGR 1.6.0
-
-## GDAL/OGR 1.6.0 - General Changes
-
-Build (Unix):
- * Added basic support for LDFLAGS
- * Try prefix/lib before prefix/src for proj.4 linking (#1345)
- * Allow specification of a python binary for --with-python (#2258)
- * Added NAS driver config support
- * Fixed Expat detection problem on MinGW (#2050)
- * Fix INST_DATA setting (/share/gdal instead of /share) (#2382)
- * Build MSGN driver on Unix-like platforms
- * Added MSG driver support to configure.in. EUMETSAT Wavelet Transform software is only detected on request, option --with-msg specified.
- * Improve cross-compilation
- * Fix linking with HDF4 library when configuring with --with-hdf4 or --with-hdf4=yes (#2602)
- * Fixes for compilation with GCC 4.3
-
-Build (Windows)
- * Default to non-debug builds.  Use /GR in pre 1400 builds so that dynamic_cast doesn't just cause an blowout.  Use .pdb file with version embedded.
- * Make vc++ builds usable from mingw (#2216)
- * Updated nmake.opt for building with Visual C++ adding /W3 flag for release build and /W4 for debug build.
- * Add VS Makefile for GDAL and OGR DODS drivers (#2383)
-
-Build (All)
- * Remove support for "Panorama" GIS SDK (#2669)
+### Algorithms
+ * Warper: Eliminate thread lock timeouts on Windows (#3631)
+ * Warper: prevent potential int overflows for > 2 GB work buffers
+ * Warper: force SAMPLE_GRID=YES when target output includes one pole (#4064)
+ * Warper: OpenCL: remove extra double quote character in resampling kernel (#4404)
+ * Warper: avoid selecting Float64 working data type with a Float32 raster and a nodata value compatible of it (#4469)
+ * geolocation transformer: use GDALFillNodata() to fill holes in the backmap
+ * GDALSuggestedWarpOutput2(): better guess of bounds when transforming with a geolocation array
+ * gdalgeoloc: fix if the backmap would be larger than 2 Giga pixels
+ * gdalgeoloc: backmap generation: prevent averaging that would lead to unexpected results
+ * gdalgeoloc: improve backmap hole filling
+ * Polygonize: fix self intersection polygon when raster image contains complex holes (#1158, #3319)
+ * Deprecate GDALOpenVerticalShiftGrid() and GDALApplyVerticalShiftGrid() that are no longer needed. Will be removed in GDAL 4.0
 
-Port:
- * RFC 19: Added VSIMalloc2() and VSIMalloc3() API and use them in GDAL drivers
- * RFC 23: Added implementation of recode API
- * Added infrastructure to detect bad arguments to printf-like functions
- * Added CPLHashSet data structure
- * Added quad tree implementation derived from shapelib & mapserv
- * Added support for reading on-the-fly .gz files and .zip files (#1369)
- * Added CSLFindName()
- * Added two new flags to CSLTokenizeString2() function: CSLT_STRIPLEADSPACES and CSLT_STRIPENDSPACES to strip leading and ending spaces from the token.
- * Added CSVGetNextLine() to fetch next record based on just csv filename
- * Added CPL_ACCUM_ERROR_MSG=ON for CPLQuietErrorHandler
- * Added CPL_MAX_ERROR_REPORTS config option (#2409).
- * Added CPL_INLINE macro
- * Added UNREFERENCED_PARAM macro to cpl_port.h.
- * Added CPLGenerateTempFilename()
- * Improve performance of CPLParseXMLString from O(n*n) to O(n) where n is the number of siblings node
- * Fix bug with url encoding in CPLEscapeString() (#2314)
- * Various fixes in CPLList implementation (CPLListInsert and CPLListRemove) (#2134)
- * VSIMEM: added path normalization so everything is converted to forward slashes
- * VSIMEM: prevent file extension, or write/update to files opened in readonly mode
- * cpl_path.cpp: Add CPLAssert to check that the string inputs are not the result static buffer
+### Utilities
+ * gdalinfo: report coordinate epoch (RFC 81)
+ * gdalinfo: avoid displaying thousands of filename in /vsizip/ if open fails
+ * gdal_translate: add -a_coord_epoch switch (RFC 81)
+ * gdalwarp: allow vertical shift when using EPSG codes (#4566)
+ * gdalwarp: preserve coordinate epoch in output SRS (RFC 81)
+ * gdalwarp: add a -s_coord_epoch/_t_coord_epoch switches (RFC 81)
+ * Fix gdalwarp / exporting to WKT when a projection that isn't supported in WKT1 is involved (#4133)
+ * gdalwarp: allow reprojecting a rater with geotransform = (0,1,0,0,0,-1) (#4147)
+ * gdalwarp: slightly change default behavior of unified src band masking when a pixel is evaluate to the nodata value on all bands (#4253)
+ * gdal_contour: fix bad coordinate order when outputting from raster with geographic CRS to KML driver (#3757)
+ * gdal_viewshed: fix incorrect calculation if target height is specified (#4381)
+ * gdal_viewshed: Fix incorrect progress reporting (#4390)
+ * gdal_viewshed: change default value of -cc (curvature coefficient) to 0.85714, standard value for atmospheric refraction (#4415)
+ * gdal_polygonize.py: fix output driver guessing
+ * gdal_fillnodata.py: copy pixel data after metadata
+ * gdal_fillnodata.py: fix -si option (#4192)
+ * gdal_fillnodata.py: remove broken -nomask option. It has likely never worked, and was equivalent to the default mode
+ * gdal_sieve.py: preserve NoData value when output to a new file
+ * gdal2tiles: fix tile grid origin of openlayers with -p geodetic --tmscompatible --xyx as arguments
+ * gdal2tiles: avoid potential race when creating directories (#4691)
+ * gdal_pansharpen.py: display usage if not enough filenames provided
+ * gdalmdiminfo: add dimension_size and block_size in output
+ * gdalmdimtranslate: add -oo switch to specify open option of source dataset
 
-Utilities:
- * Added a --utility_version that displays the version of GDAL used for compiling the utility and add runtime checks to see if GDAL library is compatible with the utility version
-
-## GDAL 1.6.0 - Overview of Changes
-
-Core :
- * RFC 22 : Added RPC and IMD support
- * Added support for computing statistics for datasets with arbitrary overviews in GDALRasterBand::ComputeStatistics()
- * Added Gaussian resampling in overview building (#2137)
- * Added Mode resampling in overview building (#2347)
- * Allow fast NONE overview generation (#2677)
- * Added in GDALRasterBand::GetRasterSampleOverview() and ComputeRasterMinMax() (#2148)
- * Preliminary gmljp2 specific changes to address axis orientation (#2131)
- * Added GDALProxyDataset and GDALProxyRasterBand abstract classes to be able to make proxy datasets and raster bands
- * Added a proxy dataset class, GDALProxyPoolDataset, that differ at the maximum the opening of the underlying dataset and keep the number of simultaneous opened underlying datasets under a limit (similar to what is done in the RPFTOC driver)
- * Migrate GDALRegenerateOverviews() to C API
- * Added GDALDestroyDriver()
- * Added special case in GDALCopyWholeRaster to be more friendly when writing a tiled compressed GeoTIFF (massive reduction of destination file size)
- * Added GDALRegenerateOverviewsMultiBand to process all the bands at the same time to optimize the generations of compressed pixel-interleaved overviews (such as JPEG-In-TIFF). Optimization triggered in some cases for external and internal GeoTIFF overviews. PHOTOMETRIC_OVERVIEW and INTERLEAVE_OVERVIEW config options added for external overviews. -ro option added to gdaladdo to generate external overviews for GeoTIFF. Result : divide by 2 to 3 the size of JPEG-In-TIFF overviews on big RGB datasets
- * Add a new class GDALNoDataValuesMaskBand to create a per-dataset nodata mask band (GMF_PER_DATASET | GMF_NODATA) when the metadata item NODATA_VALUES is found on the dataset (#2149)
-
- * Fix segfault when building overviews with --config USE_RRD YES (#2145)
- * PAM: save floating point nodata in IEEE floating point binary format
- * Fix division by zero in GDALGetRandomRasterSample (#2429)
- * GDALOpen: Use EOVERFLOW if defined otherwise use hardcoded likely values (#2437)
- * Replace implementation of arrays for maintaining the list of opened shared datasets by a CPLHashSet to avoid O(n*n) complexity
- * Fix GDALRasterBand::IRasterIO fails to read data from dataset when block cache is too small (#2457)
- * Modify GDALFindAssociatedAuxFile() to only select .aux files that have the same raster configuration as the target dataset (PxLxB).  (#2471).
- * When available use arbitrary overviews for computations in GDALRasterBand::ComputeRasterMinMax() and GDALRasterBand::GetHistogram().
- * Fix crash in GDALValidateCreationOptions when passed a creation option not in format key=value (#2499)
- * Fix 'GDALNoDataMaskBand::IReadBlock doesn't behave correctly when eWrkDT != eDataType' (#2504)
- * Use nodata masks when generating overviews (#2149)
- * Improve error propagation when GDALRasterBlock::Write() fails (#2524)
- * gdalnodatamaskband: add case for uint16 and uint32 as uint32 - fixes neg. nodata values for these
- * Add a special case for dealing with RasterIO expansion on writes (#773)
- * Add GDALValidateCreationOptions() checks in GDALDriver::Create() and GDALDriver::CreateCopy(). Can be disabled with GDAL_VALIDATE_CREATION_OPTIONS=NO
- * Optimization of GDALCopyWords for transfer from buffer of packed bytes to buffer of bytes with interleaving (#2536)
- * Use BlockBasedRasterIO in GDALDataset::IRasterIO for pixel-interleaved datasets when source and destination have the same size (#2536)
- * PAM: Allow empty category in .aux.xml  (#2562)
- * GDALDataTypeUnion(): Add missing GDT_CInt16 case that was triggering a CPLAssert(FALSE) (linked to #2564)
- * PAM: improve the find existing histogram logic to check approx and out of range
- * Fix validation of values for creation option parameters of type float
- * Fix memory leak related to PAM histograms
- * Restrict dataset sharing to a one thread by tracking owning pid (#2229)
- * rasterio.cpp: Handle >2GB memory arrays on a 64-bit build (#2199)
+### gdal_utils package
+ * Various linting and improvements in gdal_utils package
+ * Create ogrmerge(), gdalproximity(), gdal_sieve(), rgb2pct(), pct2rgb(), gdal_fillnodata(), gdal_polygonize() functions
+ * fix GetOutputDriversFor for ext == 'nc' (#4498)
 
-Algorithms:
- * Added GDALPolygonize() function
- * Added sieve filter
- * Add implementation of raster hole filler
- * Added proximity algorithm implementation
- * Added GDALRasterizeLayers() function to rasterize the all the features in the list of layers rather than individual geometries.
- * Added support for point geometries rasterization
- * Added line rasterization routine.
- * Added GDALCreateGenImgProjTransformer2()
-
- * warper: massive upgrade that fixes number of problems with Cubic Spline and Lanczos resamplers, multiple performance improvements.
- * Implement overview building for paletted rasterbands with average resampling by selecting the nearest entry after averaging on R,G,B components (#2408)
- * Fix destination coordinate system setting logic in GDALReprojectImage (#2231)
- * Modify GDALChecksum to give it a deterministic behavior when given a GDT_[C]Float[32|64] rasterband with NaN and Inf values. The result is backward compatible with previous implementations with finite values
- * Add options to RPC transformer, use for RPC_HEIGHT offset
- * TPS : fix uninitialized variables (#2300), fix wrong behavior with negative coordinates  (#2615)
- * gdalgeoloc.cpp : Fix crash in GDALCreateGeoLocTransformer if X_DATASET, etc... cannot be opened (#2434)
- * warper: Prevent crashes when srcAlphaBand and dstAlphaBand are wrong
- * Fix tiling in gdal_grid and output of geotransform when -txe and -tye not specified (#2508)
- * warper: Wait for the threads to complete before leaving GDALWarpOperation::ChunkAndWarpMulti() (#2518)
- * warper: When warping an RGBA image whose borders have alpha=0, avoid writing alpha=255 with bilinear, cubic, cubic spline resampling
- * warper: Properly set a resample window size for Cubic Spline kernel. (#2414)
- * gdalsimplewarp.cpp: fix pointer array allocation (#2586)
+### Raster drivers
 
-Utilities:
- * gdal_lut.py: New for 1.6.0. Sample app applying a greyscale lookup table
- * gdal_polygonize.py : New for 1.6.0
- * gdal_proximity.py : New for 1.6.0
- * gdal_sieve.py: New for 1.6.0
- * densify.py: New for 1.6.0. A generic Translator class for ogr2ogr-like operations that can be easily overridden for special translation operations
- * gdalflattenmask : New utility to merge regular data bands with the mask bands, for applications not being able to use the mask band concept. (Not compiled by default)
- * gdal2ogr: New for 1.6.0. to create an OGR datasource from the values of a GDAL dataset; May be useful to test gdal_grid and generate its input OGR file (Not compiled by default)
-
- * Fix crash in gdalenhance
- * Add -nln switch for gdal_contour
- * gdalgrid: Fixed zero search radius handling in nearest neighbor interpolation method.
- * gdalgrid: Added support for data metrics (minimum, maximum and range) computation.
- * gdalgrid: Added spatial filter support applied on the OGR data source
- * gdalgrid: Added ability to read values from the attribute field using the "-zfield" option.
- * gdalgrid: fix crash on features with NULL geometry or when no point geometry is found on a layer (#2424)
- * esri2wkt.py: Fix esri2wkt for NG python bindings (#2548)
- * Build testepsg utility by default when OGR is enabled (Ticket #2554).
- * gdaltranslate: new -expand rgb|rgba option to make color table expansion
- * gdaltindex: Use correct index variable name
- * gdal2tiles.py: Bug fix: switched axes in BoundingBox of tilemapresource.xml.
- * gdal2tiles.py: Bug fix: wrong Origin in tilemapresource.xml.
- * gdal2tiles.py: New version of GDAL2Tiles (SoC 2008 - GDAL2Tiles Improvements)
- * gdal_retile.py: Some minor enhancement optionally storing the  georeferencing data of created tiles in a csv file
- * gdal_vrtmerge.py: add support for NODATA
- * gdalinfo: Don't show RAT if -nomdd is used.
- * gdalinfo: Display checksums on overviews when -checksum is specified
- * gdalinfo: Display whether the mask band has overviews
- * ogr2ogr: reset -gt to 1 with -skipfailures, document -gt (#2409)
- * ogr2ogr: Output error messages on stderr to be consistent; Make error message about failed reprojection more clearer (hopefully); Advertise the use of -skipfailures in error message (#2588)
- * nearblack: Add support for scanning from top and bottom as well as from the sides.
- * Prevent crash in gdalwarpsimple utility and in GDALSimpleImageWarp() when source dataset has no raster band
- * gdal_rasterize: check that coordinates systems match (Ticket #1937)
- * gdalwarp: Add cutline support
-
-Various drivers:
- * Reports GDAL_DCAP_VIRTUALIO=YES for drivers supporting it (#2193)
- * Add warnings in CreateCopy() methods for drivers not supporting color tables (#1939)
- * Simplify and harmonize how ESRI world file extensions are handled for BMP, GIF, JPEG, PNG and GTiff drivers (fix #1734)
- * Windows : enable bigtiff by default when using internal libtiff (#2257)
- * Added plugin building support for ECW, MrSID, HDF5, NetCDF, FITS and SDE drivers.
- * fix case of capabilities xml elements to match properly (#2322)
- * Add ALPHA creation option in the list of creation options
-
-AAIGrid Driver:
- * Re-fix nodata test when determining AAIGrid data type (Ticket #2107).
- * fix yllcorner computation (#1794)
- * mark driver as supporting virtualio.
- * Fix wrong data type used to read the source band AAIGCreateCopy (#2369)
- * Add DECIMAL_PRECISION creation option for AAIGRID (#2430)
+AIGRID driver:
+ * avoid integer overflow (ossfuzz #31766)
+ * fix crash when accessing twice to a broken tile (#4316)
 
-ADRG driver:
- * Initialize PAM to avoid creating .aux.xml file when gdalinfo an ADRG dataset
- * Prevent opening in update mode && fix reading of blocks in creation mode
- * Prevent error message coming from ADRG driver when trying to open in update mode a non-existing dataset
- * Avoid error reporting and subsequent failure on some DIGEST files where the last record ends in a non-standard way
+BAG driver:
+ * ignore pixel at nodata value when updating min/max attributes (#4057)
 
-BLX Magellan Topo driver:
- * New for 1.6.0 (#2254 and #2570)
+BMP driver:
+ * harden identify checks to avoid misidentification of other datasets (#4713)
 
-BSB driver:
- * Add support for alternate palettes via config option
- * Fix Valgrind warning about read of uninitialized memory; Replace a CPLAssert by a test in case of corrupted dataset; Remove static buffer in BSBReadHeaderLine to improve thread-safety
- * Update BSB write support to use VSIF*L API (still disabled by default); fix palette handling (last color entry was lost); add GCP/Geotransform writing
+CEOS2 driver:
+ * Add ASF Compatibility (#4026)
 
-COSAR driver:
- * Initialize integral variables to prevent failure of test condition in case file read operation fails; clean signed/unsigned mismatch warning.
- * Additional tests to protect against corrupted datasets
+COG driver:
+ * Default to LZW compression (#4574)
+ * Add LZMA to compressions list
+ * don't crash if GDALCreateGenImgProjTransformer2() fails
+ * Fix error messages when creating JPEG compressed COGs from RGBA
 
 DIMAP driver:
- * Fix use of static CPL buffers
- * Implement GetFileList() and support for opening directory for DIMAP format
- * Add metadata at the raster band level by reading the Spectral_Band_Info tag
-
-DODS driver:
- * Add using namespace libdap for version 3.8.2 (#2404)
-
-DTED driver:
- * Add the GDAL_DTED_SINGLE_BLOCK config option to make a single block of a whole DTED file. This can speed-up a lot scanline oriented algorithms (#1909)
- * Add support for DTED products strictly following MIL-D-89020 that was buggy
- * Fix compilation without CPL
- * Improve thread safety
+ * expose virtual overviews (#4400)
+ * fix integer overflows (ossfuzz #39027, #39795)
+ * fix potential performance issue in SetMetadataFromXML() (ossfuzz #39183)
+ * avoid excessive memory allocation / almost infinite loop on corrupted dataset (ossfuzz #39324)
 
 ECW driver:
- * Fix memory leaks (#2210)
- * Be more careful deciding what geotransforms to ignore (#1935)
- * Rename ecw plugin gdal_ECW_JP2ECW.so/dll (#2320)
- * Properly set default nPixelSpace and nLineSpace in ECWRasterBand::IRasterIO().
- * Added pixel data type checking in ECWCreateCopy() (#2593).
+ * Enable reading ECW files from virtual file systems for ECW SDK 3.3
 
-EHDR driver:
- * Port EHDR driver to large file API (by apetkov) (#2580)
+EEDAI driver:
+ * Point at highvolume EE API endpoint by default
 
-EIR (Erdas Imagine Raw format) driver:
- * New for 1.6.0
+EIR driver:
+ * avoid excessive memory allocation on small files (ossfuzz #9408)
 
 ENVI driver:
- * fix problems with old/new state plane zone codes (#2227)
+ * Open(): use .hdr as an additional extension in priority over a replacement one (#4317)
+ * use newer Get/SetSpatialRef API to avoid performance issue (ossfuzz #38295)
 
-ERS driver:
- * add support for HeaderOffset keyword (#2598)
+ENVISAT driver:
+ * avoid potential buffer overflow (CID 1074533)
 
-FAST driver:
- * Order the GCP in TL, TR, BR, BL order to benefit from the GDALGCPsToGeoTransform optimization
- * Add support for Euromap FAST datasets for IRS-1C/IRS-1D PAN/LISS3/WIFS (#2329)
- * Fix USGS projection decoding for EOSAT FAST format Rev C (#2381)
- * Add support for detection of FAST IRS P6 and CARTOSAT-1 band filenames
+ERS driver:
+ * avoid long open delay on bogus datasets that reference themselves (ossfuzz #36701)
+ * Fix off-by-one error when reading ERS header
 
-FITS driver:
- * Fix crash in FITS when dataset has metadata; Fix 2 minor Valgrind warnings (#2396)
- * Fix crash on int32 test case in fits.py for 64-bit GDAL build (#2579)
+EXR driver:
+ * fix build against OpenEXR 3.0.1 (#3770)
 
 GeoRaster driver:
- * New for 1.6.0
-
-GFF driver:
- * Close file pointer in dataset destructor
-
-GIF driver:
- * Disable opening of large files which hang GDALOpen() (#2542)
-
-GRASS driver:
- * Fix obvious memory leaks in GRASS driver (#2537)
- * fix to use G_free() instead of free() (#1983)
+ * Fix the Oracle DB connection when user and pwd are empty, while Oracle wallet is used. (#3768)
+ * Set the SRID value for the extent when flushing the metadata to the database. (#4106)
+ * fix issue when user name is not provided in connection string (#4460)
+ * Add owner checking in the query (#4565)
 
 GRIB driver:
- * Moved from spike to trunk: grib now standard, but support --without-grib option
-
-GSAG driver:
- * Prevent crash on huge number of rows
- * Prevent Valgrind warnings on bogus short GSAG files
- * Major update to correct upside problems, removing Create (#2224, #1616, #2191)
-
-GS7BG driver:
- * Fixed geotransformation matrix calculation (#2132)
- * Properly read the header on big-endian system.
- * Fix bigendian support (#2172)
+ * use sidecar .idx file and lazy initialization (#3799)
+ * implement transparent [0,360] to [-180,180] translation, in reading and writing (#4524, #3799)
+ * add/fill a few GRIB1 ECMWF table to read a ERA5 product (#3874)
+ * turn debug messages about unknown GRIB1 table as warnings
+ * fix stack read buffer overflow (ossfuzz #38610)
+ * fix wrong check related to memory allocation limit (ossfuzz #38894)
+ * fix potential crashes on big GRIB1 files on low-memory condition (ossfuzz #38971)
+ * multidim: catch potential exception in case of out-of-memory situation
 
 GTiff driver:
- * Add support for reading and writing embedded nodata masks of a TIFF file (TIFFTAG_SUBFILETYPE=FILETYPE_MASK)
- * Added SUBDATASETS support
- * Add the ability to create files with PHOTOMETRIC=PALETTE.
- * Add the ability to update palette on existing files (#2421)
- * Enforce PROFILE properly for Create (#1527)
- * Add support for reading a CMYK TIFF. By default, it will be opened with the RGBA interface (CMKY->RGBA translation done by libtiff. Said to be *very* crude), unless 'GTIFF_RAW:' is specified before the filename. In that later case, the CMYK bands will be presented. Also add support for translating to a CMYK TIFF too : the source dataset must have CMYK bands. No colorspace translation is done
- * Internal libtiff : refresh from upstream libtiff
- * Added GTiffSplitBitmapBand to treat one row 1bit files as scanline blocks (#2622)
- * Don't use GCS if it is less than 1 (#2183).
- * Modified so that the RGBA interface is not used for YCbCr mode JPEG compressed data.  Set JPEGCOLORMODE to RGB at the point a directory is read to avoid error report if doing it later during writing.  This fixes the GDAL 1.5.0 issues with writing YCbCr JPEG compressed data (#2189).
- * Fix memory leak in gt_wkt_srs.cpp
- * Prevent crash in GTiff driver in case we cannot GDALOpen the newly create-copied file
- * Fix buffer overflow when calling GTIFDirectoryInfo in GTIFGetOGISDefn (#2372)
- * add special handling for 24bit data which gets byteswapped by libtiff (#2361)
- * Replace hard-coded 3 byte increment by iPixelByteSkip in int24 gtiff decoding (#2361)
- * Cleaunup frmt/gtiff directory by removing unused files. Move TIFF_WriteOverview to gt_overview.cpp. Create gt_overview.h to declare TIFF_WriteOverview and GTIFFBuildOverviewMetadata
- * Add a ENDIANNESS creation option to GTiff driver for debug purpose mostly
- * Fix writing of blocks on TIFF files in non-native endianness (#2398)
- * Push extra bands of pixel interleaved data into block cache (#2435)
- * Improve integration with PAM metadata loading and saving (#2448)
- * Fix potential buffer overflow in GTIFAngleStringToDD (committed in upstream libgeotiff) - #2228
- * Fix GTiffOddBitsBand::IWriteBlock with GDT_UInt16/32; Error properly with GDT_Float32; Support creating files with NBITS>8; Handle NBITS=1 IReadBlock/IWriteBlock in GTiffOddBitsBand; Prevent subtle IReadBlock/IWriteBlock round-tripping bug for NBITS<8 (#2360)
- * Set the TIFFTAG_COMPRESSION compression before asking the default strip size, so that in the case of JPEG compression, the correct strip height is selected (either 8 or 16). Tested with libtiff-3.8.2 and internal libtiff
- * Prevent crash on tiff_ovr_9 when JPEG-In-TIFF support is not built
- * In GTiffDataset::Create(), set TIFFTAG_JPEGCOLORMODE=JPEGCOLORMODE_RGB when creating a TIFF with COMPRESS=JPEG and PHOTOMETRIC=YCBCR; In Crystalize(), backup the value of TIFFTAG_JPEGCOLORMODE and set it again after writing the directory (#2645)
- * Handle more gracefully the case where we open or create a TIFF file with a compression method not built in libtiff (use of TIFFIsCODECConfigured)
- * Don't fail when TIFFTAG_JPEGCOLORMODE tag cannot be read
- * IPP libjpeg compatibility changes (#2606)
- * ensure zip/jpeg quality is preserved in crystalize. (#2642)
- * support handling nodata via pam/aux mechanisms (#2505)
- * ensure TIFFFlush() is called in FlushCache() (#2512)
- * Replace Crystalize() by SetDirectory() in GTiffDataset::IBuildOverviews() so that 2 consecutive ds.BuildOverviews() calls work without needing to close and reopen the dataset in between
- * Prevent crash when disk is full
- * Add detection of big-endian bigtiffs when BIGTIFF_SUPPORT is *NOT* defined
- * Add missing ScaleAtCenter parameter for Hotine Oblique Mercator when writing the geotiff keys
- * Added logic to pre-clear geotiff tags when updating a file (#2546)
- * Add ExtraSample tag in overviews too (#2572)
- * Fix handling of non-degree angular units (#601)
-
-GXF driver:
- * Add GXFRasterBand::GetNoDataValue (fix #835)
- * Avoid crash on bogus GXF file
-
-HDF4 driver:
- * add support for projected NRL products (#2225)
- * make a block consist of several scanlines for SDS case to speed up (#2208)
- * Add H4ST prefix to names of HDF4SubdatasetType enumeration values. (#2296).
- * Remove useless and dangerous redefinition of sincos in HDF-EOS (#2494)
- * Added compatibility definitions for HDF 4.2 library (#2609)
- * Read HDF raster images containing in HDF-EOS datasets (#2656)
+ * add support for coordinate epoch with a new CoordinateEpochGeoKey=5120 GeoKey (RFC 81)
+ * Enable JPEG-in-TIFF for 12 bit samples (for internal libtiff), whatever libjpeg is used for 8 bit sample support
+ * Add support for JPEG-XL codec when using internal libtiff, through libjxl master (#4573)
+ * fix overviews with NaN nodata value
+ * when reading NoData value of Float32 dataset, cast it to float to avoid overprecision (#3791)
+ * Fix SetDefaultRAT() (#3783)
+ * signedbyte: do not write 0 values for tiles/strips entirely at a negative nodata value (#3984)
+ * Set color interpretation on overview bands (#3939)
+ * SRS reading: ignore vertical information when one of the tag has a value in the private user range (#4197)
+ * write georeferencing info to PAM .aux.xml when using PROFILE=BASELINE
+ * do not try to export a DerivedGeographic CRS to GeoTIFF, but fallback to PAM
+ * fix corruption in TIFF directory chaining when altering nodata value after IFD crystallization (#3746)
+ * Update internal libtiff to latest upstream
+ * limit error message count, mainly with Fax3 decoder, to avoid performance issues (ossfuzz #38317)
 
 HDF5 driver:
- * Fix minor memory leaks and one incorrect memory usage in HDF5
- * implement support for 1.8+ hdf library versions (#2297)
+ * multidim: fix crash when extracting a field from a compound HDF5 data type
+ * fix issue when netCDF and/or HDF5 drivers built as plugins with multidim datasets
 
 HFA driver:
- * Avoid possible uninitialized variable usage in HFAWriteXFormStack()
- * Fix BASEDATA count value (preceding pointer) at 1 (#2144)
- * Incorporate generalization of EPT_f32 reduced precision handling (#1000)
- * Add missing creation options, fix doc to refer to COMPRESSED instead of COMPRESS (#2167)
- * remove static buffer to improve thread-safety
- * Read invalid blocks as nodata value if available.  Create new files with all blocks marked invalid.  Support writing to invalid blocks as long as there is already a pointer to valid data.  (#2427)
- * add support for writing 1, 2 and 4 bit data (#2436)
- * Attempt to preserve PROJCS name in sMapInfo.proName, and to capture it as the PROJCS name when reading.  This will hopefully preserve symbolic names like NAD_1983_StatePlane_Ohio_South_FIPS_3402_Feet instead of replacing them with something generic like "Lambert_Conformal_Conic" (#2422).
- * avoid reducing array sizes if writing them in random order (#2427)
- * Prevent writing out cached information after the file has been closed.  Loosely related to (#2524).
- * Error out gracefully and early on attempts to write to readonly file (#2524)
- * Open the dependent file(s) with same permissions as master (#2425)
- * Fix crash in HFACompress::compressBlock when compressing random data with m_nDataTypeNumBits >= 16 (#2525)
- * Fix reading of a non-initialized compressed HFA file (#2523)
- * Add FORCETOPESTRING, and ensure ProjectionX applied to all bands (#2243)
- * Added support for unique values color tables (#2419)
-
-HTTP driver:
- * Fix HTTP driver when falling back to /tmp (#2363)
-
-IDRISI driver:
- * Force min/max calculation on IWriteBlock
- * remove conditional from CreateColorRamp() call
- * Fix #2444 (lat/long) and #2442 (uppercase file extension)
-
-ILWIS driver:
- * Modified to use VSI*L API for reading and writing.  Modify ReadBlock() so that data written on newly created datasets can still be read back.
- * Fix memory leaks in ILWIS driver
- * Avoid writing an ILWIS file to disk when it is a src_dataset. Design of responsible class (IniFile) is simplified, to prevent this from happening unintentionally.
- * Spend extra effort to find the most compact GDAL data-type for storing the ILWIS data; Added missing ILWIS-system domains to the list; Initialized variables before they are used; Added comments to code.
- * Solved unwanted rounding in the pixel size, that resulted in wrong map size calculation.
-
-INGR driver:
- * Support splitting bitonal images into scanline blocks too (#1959)
- * Fix compilation of INGR driver on big-endian target (#2613)
-
-ISIS3 driver:
- * fix earth model, already in meters, not kilometers! (#2321)
- * ensure we adjust first tile offset depending on band (#2573)
+ * enable to read GCPs from PAM .aux.xml (#4591)
 
-ISO8211 driver:
- * corrections to handle double byte attributes better (#1526)
- * add a -xml option to 8211dump utility; add a 8211createfromxml utility to generate a ISO8211 file from the output of 8211dump -xml
- * robustness fixes
+Idrisi driver:
+ * Add support of Cylindrical Equal Area (#3750)
 
 JP2KAK driver:
- * Add VSI*L reading and writing (vsil_target) (#2255)
- * Remove KAKADU4 related ifdefs, we now assume at least KAKADU 4.2.
- * disable JPIP - not working with modern Kakadu
+ * fix Unix build with Kakadu 8.2 (#4306)
+ * accept files with .jhc extension (HTJ2K codestreams)
+ * report Corder metadata item in IMAGE_STRUCTURE domain instead of default domain
 
-JPEG driver:
- * Added support for reading georeferencing from .tab files. Fixes #682.
- * Add support for reading images in CMYK and YCbCrK color spaces (#2443)
- * make sure bHasDoneJpegStartDecompress is set in Reset() (#2535)
- * Added fill/flush support compatible with IPP libjpeg (#2606)
+JP2OpenJPEG driver:
+ * add a TLM=YES creation option to write Tile-part Length Marker (requires openjpeg >= 2.5)
 
-LCP (FARSITE) driver:
- * New for 1.6.0
+JPEG driver:
+ * fix wrong detection of bit ordering (msb instead of lsb) of mask band (#4351)
 
-L1B driver:
- * Added support for NOAA-18(N) and METOP-2 datasets; tiny code refactoring.
- * L1B : add auto guess of data format when it is 2 spaces or empty string
- * The GAC GCPs are not tied to the center of pixel.
- * Serious code rewriting in order to read datasets without archive header
+KMLSuperOverlay driver:
+ * Allow reading kml documents with a GroundOverlay element directly inside a Document element (#4124)
 
 MEM driver:
- * Avoid failure when doing mem_driver->Create('MEM:::')
+ * Open(): add support for the 'GEOTRANSFORM' options
+ * multidim: faster copying when data type conversion is involved
+ * multidim: add MEMAbstractMDArray::SetWritable, IsModified and SetModified methods
 
-MrSID driver:
- * Use VSI Virtual File API in MRSID DSDK I/O routines. MrSID reading now
-works through the VSI calls as any other GDAL driver.
- * Added support for MrSID DSDK 7.x (#2410)
- * Use int 32 types instead of long types for LTI_METADATA_DATATYPE_UINT32 and LTI_METADATA_DATATYPE_SINT32 metadata (#2629)
+MRF driver:
+ * add JPEG-XL (brunsli) support (#3945)
+ * add ZStd compression (#4177)
 
 MSG driver:
- * Fixes and improvements to enable compilation with GCC 4.x (Ticket #2168).
-
-NDF driver:
- * Support NDF2 files in other than the current directory (#2274)
- * Added somewhat improved coordinate system support (#2623)
+ * fix race condition in satellite number lookup (#4153)
 
 NetCDF driver:
- * Handle very large attributes properly (#2196)
- * NETCDF plugin name doesn't correspond to the loader entry name causes an error in AutoLoadDrivers (#2464)
- * Fix allocation of panBandZLev (#2582)
- * Fix accidentally too large memory allocation (#2591)
- * Do not report char variables as subdataset (#2599)
- * Fix LAEA projection (#2584)
-
-NITF driver:
- * Add support for RPB and IMD files
- * Handle NITF JPEG-compressed image with data mask subheader (IC=M3) multi-blocks (#2364)
- * Implement SetProjection for NITF (#2095)
- * Added support for decoding 12 bit images (#2532)
- * Added support for writing TEXT segments in CreateCopy()
- * Added support for writing arbitrary user defined TREs
- * Fix #2249 : shift when writing NITF color table with nColors < 256
- * Prevent crash with LUT entry count > 256
- * Disable unnecessary VSIFFlush() calls that slowdown writing on some systems
- * Apply untested RPC00A remapping (#2040)
- * Fix #2135 by narrowing workaround test made for #1750
- * Prevent crash on NITF file without image segment (#2362)
- * Additional fix for handling 1-bit uncompressed NITF images with NITF_IC=NM  (#1854)
- * Set IREP=RGB implicitly when the first 3 channels of an image are R,G,B (#2343)
- * Allocate one extra byte for the NULL terminating character when reading TEXT data in NITF file (#2366)
- * Fix 'adding BLOCKA TRE precludes writing IGEOLO' (#2475)
- * Add GDAL_DMD_CREATIONOPTIONLIST for NITF
- * Prevent crash when using a bad value for TRE creation option
- * Fallback to pam info for nodata (#2596)
-
-PAUX driver:
- * Check for either generated spelling of AuxiliaryTarget (#2219)
-
-PCRaster driver:
- * Add overview support
- * Added support for CSF version 1. Updated nodata values to be equal to gdal's internal ones.
-
-PDS driver:
- * Add support for # style comments (#2176)
- * Improve PDS dataset identification & fixes image segment offset (#2397)
- * Add LSB_SIGNED_INTEGER
-
-PGCHIP driver:
- * Many memory leak fixes & cleanups, add an extra parameter '%name=my_name' for handling several rasters in the same table, add support for reading&writing geotransform
-
-PNM driver:
- * Fix potential buffer overflow in case of bad PNM file
- * Fix logical tests in PNM Identify (bug #2190)
-
-RAW drivers:
- * manage RawRasterBand NODATA values at PAM level
- * RawRasterBand : add extra parameter bOwnsFP to enable the RawRasterBand to take ownership of the fpRaw so as to close it properly in its destructor
- * Fix crash in rawdataset.cpp with pixeloffset=0 (#2576)
-
-RMF driver:
- * Do not forget to swap block size/offset table on big-endian archs. (#2169)
- * Added support for reading and writing extended header..
- * RMF driver can crash / corrupt stack when importing projection from Panorama (#2277)
- * Fixed error checking code returned by color table read function.
- * Added support for reading big endian variant of the RSW files.
- * Report units and dataset statistics (#2670)
-
-RPFTOC driver:
- * Enable external overview building on RPFTOC subdatasets
- * Use new proxy API instead of RPFTOCGDALDatasetCache
- * Initialize PAM for RPFTocDataset
- * Implement GetFileList() for RPFTOCDataset and RPFTOCSubDataset
-
-RS2 driver:
- * Added projection reading
- * Updates to RADARSAT-2 driver to account for tiled GeoTIFF images.
- * Capture all files for GetFileList().
- * Support selecting directory as well as product.xml to open the dataset.
- * Various other enhancements
-
-SDTS driver:
- * Prevent infinite recursion in SDTSRasterReader::GetBlock when CEL0 file is truncated
- * SDTS DEM : Read metadata in the IDEN file
-
-SGI driver:
- * Implemented SGI write support (always RLE)
- * Fix SGI driver that misidentified SRTMHGT files as SGI files (#2289)
-
-Terragen Driver:
- * Fix overflow in implicit constant conversion (#2119)
-
-Terralib driver:
- * New for 1.6.0
-
-TSX driver:
- * Added support to extract GCPs from XML metadata for TerraSAR-X SSC products.
- * Provide an error message if the sceneInfo tag cannot be found in the TerraSAR-X image metadata.
- * Fix lat/long inversion (whoops, #2565); expose additional metadata items
-
-USGSDEM driver:
- * mark NTS and INTERNALNAME as legal options
- * make parser more permissive (#2348)
- * add missing ZRESOLUTION creation option in GDAL_DMD_CREATIONOPTIONLIST
- * USGSDEM: add precisions to creation options documentation; check that source dataset dimensions are at least 2x2 for CreateCopy()
- * USGSDEM: fix USGSDEMDecToPackedDMS when input is very close to an integer degree value
-
-VRT driver:
- * Use VSIF Large API in VRTDataset::Open to fix #1070
- * recover from failure to create transformer (#2240)
- * Added LUT based transformation support to the VRTComplexSource
- * Extend the output of <SimpleSource> in a forward and backward compatible way, and make use of GDALProxyPoolDataset when possible
- * Add the <ColorTableComponent> element to <ComplexSource> to do color table expansion in the VRT
- * Fix failure when attempting to read a warped VRT made from a 3-band dataset with -dstalpha option (#2502)
- * In VRTDerivedRasterBand::IRasterIO() don't call RasterIO() on sources with 0,0 for nPixelSpace and nLineSpace as most sources, except VRTSimpleSource, don't translate them.
- * Allow empty category in VRT rasterband (#2562)
- * Use nodata in VRTKernelFilteredSource::FilterData (#1739)
- * Fix VRT average resampling when resampling factor > 100% (#1725)
-
-WCS driver:
- * Improvements to identify Band field name
- * More fiddling with GetCoverage() bounding boxes.  Avoid half pixel bounding box shift south east.  When using GridOffset/GridStep values expand the bounding box out by 1% of a pixel to avoid "on edge" rounding issues.
- * Strip namespaces off DescribeCoverage response (early), and add a bug
-workaround for GeoServer WCS 1.1 responses.
- * Correct wcs 1.1 band identification logic
- * URL encode format and coverage name.  Improve error recognition.
- * GridOffset should be top left corner of pixel center oriented bounds
-
-WMS driver:
- * Add ClampRequests setting (#2450)
- * Fix WMS driver to make it work when ReadBlockFromFile() must deal with blocks already in block-cache but that are not the band to fill (#2647)
- * Add a <Timeout> option (#2646)
-
-XPM driver:
- * Prevent crash when opening an XPM file with large file API
-
-
-## OGR 1.6.0 - Overview of Changes
-
-General:
-  * RFC 21: OGR SQL type cast and field name alias (#2171)
-  * Added support for outline color in OGRStyleLabel (#2480)
-  * Added support for symbol outline color in OGR Style Strings (#2509)
-  * Added geometry type merger
-  * Added SetEquirectangular2()
-  * Added SetLinearUnitsAndUpdateParameters() to C API
-  * Add support to translate OGRPolygon to OGRMultiLineString
-  * Add a segmentize() method to OGRGeometry to modify the geometry such it has no segment longer then the given distance; add a -segmentize option to ogr2ogr
-  * Many performance fixes in OGRGeometryFactory::organizePolygons (#1217, #2428, #2589)
-  * Changed OGRFeature::GetStyleString() to return the value of the OGR_STYLE field if no style string have been specified.
-  * Ensure OpenShared sharing is only with same thread (#2229)
-  * ogrfeaturestyle : OGRSTBrushAngle parameter should not be georeferenced.
-  * Strip whitespaces at the start and end of parsed pairs of style elements in OGRStyleTool::Parse(). As per #1413.
-  * Remove empty linestrings from multilinestring objects
-  * Allow 'POINT EMPTY' in WKT (bug #1628)
-  * Fix OGRGeometryCollection::getCoordinateDimension() (#2334)
-  * Make OGRLineString::importFromWkb and OGRPolygon::importFromWkb with EMPTY geometries
-  * Implement IsEmpty() for all geometries without using GEOS (for speed purpose, and also because GEOS 2.2.3 is buggy with multipolygons with empty polygon inside); Make exportToWkt() export a valid WKT when multipoints/linestrings/polygons have an empty geometry inside
-  * Reintroduce OFTWideString and OFTWideStringList but mark them as deprecated (#2359).
-  * Fixed segmentation fault in swq_select_finish_summarize when SQL query issued on layer without any attributes like empty shapefile (Ticket #2358).
-  * Fix crash in OGRDataSource::ExecuteSQL with an empty SQL query (#2386)
-  * Make OGRLayer::FilterGeometry more restrictive in the geometries it selects (#2454)
-  * OGRStyleVector class and related stuff has been removed (#2070).
-
-  * Fixed OGR SQL to properly escape single quotes in string literals (Ticket #2220).
-  * Prevent an OGR driver from being registered several times (#2544)
-
-Utilities:
- * Start on a dissolve utility based on ogr2ogr
- * Add --version and --licence options for OGR CLI utilities
-
-OGRSpatialReference:
- * RFC 20: Axes methods
- * Upgrade to EPSG 6.17
- * Added support for "International Map of the World Polyconic" and "Wagner I-VII" projections.
- * Add EquidistantCylindricalSphere and GaussLabordeReunion (#2134)
- * Fix exportToProj() translation for OSGB36 (#2160)
- * ogr_srs_panorama.cpp : Fixed search in ellipsoid list
- * ogr_srs_pci.cpp : List of ellipsoids updated
- * Treat spherical mercator 1SP similarly to normal mercator 1sp (proj #9).
- * Ensure Clear() clears the bNormInfoSet flag and use Clear() from the various import methods to wipe old state (#2533).
- * add import/export for MITAB CoordSys
- * Added declarations for OSRImportFromMICoordSys()/OSRExportToMICoordSys(); make OSRImportFromPanorama()/OSRExportToPanorama() externally visible again.
- * Ensure rectified_grid_angle gets stripped for HOM projections (#2575)
- * ogr_srs_esri.cpp: Correct test of iRGAChild (#2575).
- * Recent EPSG releases seem to use PolarLongOrigin instead of ProjCenterLong for the Krovak projection parameters.  Handle either (#2559).
- * Test that input pointer is not NULL in OGRSpatialReference::importFromWkt().
-
-AVC driver:
- * Make AVCE00 a distinct driver
- * Update from AVCE00 master, includes the fixes for #2495 (GCC warnings)
- * Detect compressed E00 input files and refuse to open them instead of crashing (#2513)
- * Avoid scanning the whole E00 input file in AVCE00ReadOpenE00() if the file does not start with an EXP line (#1989)
-
-BNA driver:
- * Fix crash when trying to write features with empty geometries
- * Add support for Unix End-Of-Line characters on Windows
+ * expose Sentinel5 verbose metadata in json:ISO_METADATA/ESA_METADATA/EOP_METADATA/QA_STATISTICS/GRANULE_DESCRIPTION/ALGORITHM_SETTINGS metadata domains
+ * use new PROJ method 'rotated pole netCDF CF convention'
+ * add write support for rotated pole method
+ * be more restrictive on axis to decide if to advertise a geotransform.
+ * fix wrong offsetting by -360 of longitude values when huge nodata value found at beginning or end of line
+ * fix reading MODIS_ARRAY.nc file that has non CF-compliant way of expressing axis and CRS (#4075)
+ * support more possibilities for content of 'crs' attribute in some opendatacube datasets
+ * accept degree_north/degree_east (degree singular) as acceptable unit for latitude/longitude axis (#4439)
+ * accept "degrees_E"/"degrees_N" as valid axis names (#4581)
+ * Accept HDF5 files if HDF5 driver is not available and libnetcdf has support for them
+ * properly deal with Polar Stereographic in reading and writing (#4144)
+ * parse correctly valid_range/valid_min/valid_max attributes when they are of non-integer type (#4443)
+ * no longer do filename recoding with netCDF >= 4.8 on Windows
+ * multidim: make opening /vsimem/ file work when netCDF MEM API is available (avoids using userfaultfd)
+ * multidim: make /vsi access work with netcdf >= 4.7
+ * multidim: avoid crash when getting data type of a char variable with 2 dimensions.
+ * multim: GetBlockSize(): fix heap buffer write overflow on 2D char variables (ossfuzz #39258)
+ * multidim: fix use of coordinates attribute to find the indexing variable of a dimension
 
-CSV driver:
- * Add support for writing the geometry of features through the new GEOMETRY layer creation option
- * Allow to define field width via .csvt text file (bug #2142)
- * Handle more gracefully CSV files with an empty column title (#2538)
+NITF driver:
+ * add PROFILE=NPJE_VISUALLY_LOSSLESS/NPJE_NUMERICALLY_LOSSLESS with JP2OpenJPEG driver, to comply with STDI-0006 NITF Version 2.1 Commercial Dataset Requirements Document (NCDRD)
+ * fix writing of COMRAT field in JPEG/JPEG2000 mode, when there are FILE TREs
+ * expose ISUBCAT for each band (if non-empty) (#4028)
+ * add capability to add several images in a file
+ * extend nitf_spec.xml to contain DES subheader user-data fields definitions for CSATTA DES, CSSHPA DES, CSSHPB DES and XML_DATA_CONTENT
+ * Slightly modify xml:DES output, such that field names no longer have the NITF_ prefix
 
-DGN driver:
- * add some experimental linkage testing
+PCIDSK driver:
+ * fix retrieval of RPC metadata (3.3 regression) (#4118)
+ * avoid big memory allocation and processing time (ossfuzz #37912)
+ * avoid long processing time by limiting the number of bands (ossfuzz #38885)
 
-DODS driver:
- * add using namespace libdap for version 3.8.2 (#2404)
+PDF driver:
+ * update PDFium dependency to pdfium/4627. Requires use of https://github.com/rouault/pdfium_build_gdal_3_4 PDFium fork
+ * avoid potential nullptr dereference on corrupted datasets (ossfuzz #28635)
+ * Poppler backend: limit CPU time when reading extremely corrupted file. (ossfuzz #37384)
 
-Geoconcept Export driver:
- * New for 1.6.0
+PDS4 driver:
+ * update template to CART_1G00_1950 version
+ * add support for reading PositiveWest longitudes, MapRotation and Oblique Cylindrical
+ * add write support for Oblique Cylindrical
+ * fix opening of some .xml files with large number of <?xml-model> tags
+ * accept optional <Reference_List> element in template.
+ * fixes for compatibility with sp:Spectral_Characteristics in template.
+ * projection writing: honor LONGITUDE_DIRECTION=Positive West by negating longitudes in projection parameters
 
-GeoJSON driver:
- * Fixed GeoJSON driver crash when writing features with null geometry (#2212)
- * GeoJSON: enabled read/write of 25D geometry types.
- * Improved GeoJSON driver to gracefully handle JSON strings that do not encode GeoJSON content.
- * Support GeoJSON 1.0 Spec CRS 'link' and 'name' members. (#2665)
+PNG driver:
+ * disable Neon optimizations for internal libpng as we don't include the needed source file (fix build issue)
 
-GPX driver:
- * XML Datetime can be expressed without explicit timezone mention
- * <extensions> is valid inside <rtept> and <trkpt> too
- * Add support for GPX 1.0 reading
- * Handle degenerate and NULL geometries in creation mode
- * Remove noisy CPL_DEBUG message when GPX driver built without Expat and when the input file doesn't look like GPX (#2394)
- * Prevent GPX and KML drivers to read too much of a non GPX/KML file (#2395)
- * GPX writer: Remove leading spaces for a numeric field (#2638)
+PostgisRaster driver:
+ * support for libpq services (#3820)
+ * do not append generated application_name in subdataset names
 
-GML driver:
- * Support reading GML 3 posList geometry (#2311)
- * Add logic to potentially track geometry type (mostly for NAS just now)
- * Fix #2141 : GML driver recognizes improperly strings as integers
- * Do geometry element name test (IsGeometryElement) case sensitive to avoid false positives on property names, and such (#2215).
- * Fix memory bug in OGRGMLLayer::GetNextFeature() when using attribute filter (#2349)
+RMF driver:
+ * Fix delta compression with non-initialized elevation min-max (#4399)
 
-GMT driver :
- * Remove spaces from numeric field values before writing to avoid unnecessary quoting.
+SAFE driver:
+ * multiple improvements related to SLC/calibration (change subdataset naming)
 
-GRASS driver:
- * Call Vect_close() in the OGR GRASS driver (#2537)
+SRTMHGT driver:
+ * support .hgts files from NASADEM SHHP. Also support auxiliary files with .err, .img, .num, .img.num and .swb extensions from other NASADEM products (#4239)
 
-INGRES driver:
- * New for 1.6.0
+TileDB driver:
+ * fix crash when creating array from subdatasets fails
+ * fix handling of relative paths on Windows
 
-Interlis 1 driver:
- * Support for SURFACE polygons spread over multiple OBJECTs Polygonize on demand. Generation of area layer
- * Fix a crash (#2201)
- * Fix memory leaks & apps/test_ogrsf correctness in OGRILI1 (#2203)
- * Prevent crash in OGRILI1DataSource::Open with an empty string (#2335)
- * Fixed column order detection for some Interlis 1 models (#2595)
+TGA driver:
+ * fix heap buffer overflow (ossfuzz #35520)
 
-Interlis 2 driver:
- * Fix memory usage and leaks in OGRILI2 (bug #2203)
- * Fix logic to detect ILI2 datasets (#2516)
+VICAR driver:
+ * add read/write support for GeoTIFF encoding of CRS and geotransform
 
-KML driver:
- * Updated KML write driver to support KML v2.2.
- * Added support for "SchemaData" - typed KML fields that maintain feature data.
- * Support of date types, written out as strings (#2264)
- * Added automatic coordinate system transformation to WGS84 (the only CS that KML recognizes). (#2271)
- * Report XML parsing error in KML driver in a similar way it's done in the GPX driver
- * Speedup detection of KML documents
- * Use VSI Large File API
- * Corrected case on schemaUrl attribute and added the id attribute to the schema element. (#1897)
+VRT driver:
+ * Support named arguments to C++ derived band pixel functions (#4049)
+ * Add interpolate_linear pixel function
+ * use source floating point coordinates when valid (#4098)
+ * make SourceProperties element no longer needed on reading for deferred opening of sources
+ * avoid potential very deep call stack if SourceFilename contains empty string (ossfuzz #37530)
+ * Add a per-thread mechanism to count call depth and use it in VRT driver to avoid infinite recursive calls on corrupted datasets (ossfuzz #37717)
+ * GDALDatasetPool: avoid potential crash during destruction (#4318)
+ * VRT pixelfunc: make it work with buffers larger than 2 giga pixels
+ * fix issue with sources with nodata and OverviewList resampling='average' that triggers a 'recursion error' message
+ * GDALAutoCreateWarpedVRTEx(): do not set padfSrcNoDataReal/padfDstNoDataReal if already set in passed-in options (rasterio/rasterio#2233)
+ * avoid recursion issue on ComputeStatistics()/.ComputeRasterMinMax()/GetHistogram() with implicit overviews and approximation enabled (#4661)
 
-MITAB driver:
- * Upgraded to current dev version of MITAB - includes a number of TAB StyleString improvements
- * Support font point outline color
-
-MySQL Driver:
- * Fix memory leaks in MySQL driver
- * Fix crash with very long WHERE clause in MySQL driver
- * Use assignSpatialReference for read features
- * Fix SRS cache in FetchSRS()
- * MYSQL: Add backquotes around table and column names to enable the use of reserved keywords (#2315)
- * Fix reporting of capabilities for OGRMySQLResultLayer
- * return proper results for various writing capabilities (#2184)
+WCS driver:
+ * fix issue with negative coordinates (#4550)
 
-NTF driver:
- * Update for new meridian and strategi products (#2600)
+WebP driver:
+ * Support 'exact' option to preserve the RGB values under transparent areas.
 
-OCI driver:
- * Fixed memory leaks in OCI driver reported by Linda Thompson (#2120)
- * Support for OCI + VRT to access non spatial data (#2202)
- * Prevent from calling CPLError when SDO_GEOMETRY is missing (non spatial) (#2202)
- * Added support for fields of type DATE and TIMESTAMP [WITH [LOCAL] TIME ZONE] as OFTDate and OFTDateTime.
- * An extra space is needed for the decimal separator when retrieving the numeric fields (#2350)
- * Improved OCI driver to query spatial extent of layer using SDO_GEOM_METADATA for better performance (Ticket #543).
- * OCI: Filter out MDSYS.CS_SRS entries with NULL value of WKTEXT.
- * add compound and stroked-arc read support
-
-PG (Postgres/PostGIS) Driver:
- * Add the ability to specify a list of tables to be treated as layers with the 'tables=' connection string option (#1699)
- * Add SPATIAL_INDEX creation option to create GIST index. Turned ON by default (#959)
- * Add support for listing and correctly fetching geometry type of inherited spatial tables (#2558)
- * Add support for Postgis tables with multiple geometry columns (#1476)
- * Fixes to Postgres binary cursor mode and improvement/fixes to data types handling (#2312)
- * Implement efficient GetFeatureCount, SetSpatialFilter and GetExtent for OGRPGResultLayer
- * Apply spatial filter in OGRPGDataSource::ExecuteSQL()
- * Make binary cursor work with non-PostGIS geometry column
- * Fix memory leaks
- * Fix write outside of allocated buffer in OGR PG driver (#2303)
- * Use assignSpatialReference for read features
- * Fix geometry filter when there is no PostGIS geometry column
- * Fix getting the PK of a table with PostgreSQL <= 7.3; Fix CreateFeatureViaCopy when geometry column is not PostGIS geometry
- * Use the 'auth_srid' to avoid mismatches between OGR and PostGIS WKTs of EPSG codes (#2123)
- * Fix reporting of capabilities and handling of spatial and attribute filters by OGRPGResultLayer
- * Add PG_USE_POSTGIS to be able to disable PostGIS for debug purpose
- * Re-enable PQsetClientEncoding but set it to UNICODE now that the driver advertises OLCStringsAsUTF8
- * Replace use of risky sprintf by CPLString to avoid potential buffer overflows
- * In non PostGIS mode, skip tables of schema 'information_schema'
- * Allow VACUUM through ExecuteSQL() without a transaction (#2619).
-
-PGEO driver:
- * correct testcapability results (#2601)
- * treat type 50 geometry as SHPT_ARC (#1484)
-
-SDE driver:
- * Versioned editing/write support for SDE.
+WMS driver:
+ * Add an option to disable the cache (#4097)
+ * use correct default bbox according to the SRS (#4094)
 
-SQLite driver:
- * Added support for geometry_columns, and WKB support
- * Added preliminary FGF to geometry support
- * Added spatial_ref_sys support
- * Added preliminary support for spatialite geometries
-
-SHAPE driver:
- * CreateField() now works on populated layers (#2672)
- * Cleanup to remove unused old classification code for multipolygons (#2174)
- * Fix error class in VSI_SHP_Error (#2177)
- * Fix crash with polygon with nParts == 0
- * Change SHAPE driver to return a NULL geometry instead of an empty OGRMultiPoint, OGRMultiLineString and OGRMultiPolygon (bug #2217)
- * Fix crashes on corrupted geometries (#2218 and #2610)
- * Fix crash when dealing with unhandled field types in shape driver, in DEBUG mode (#2309)
- * Add case for wkbMultiLineString and 25D in OGRShapeLayer::CreateFeature
- * Make SHPWriteOGRObject write a SHPT_NULL object for empty geometries and handle correctly multigeometries with empty geometries inside
- * Make sure field type set to OFTDate when OFTDataTime requested (#2474)
- * Implement OGRShapeDataSource::DeleteLayer() (#2561)
+WMTS driver:
+ * Add an option to disable the cache (#4097)
+ * do not take into account a TileMatrixSetLink that points to a non-existing TileMatrixSet
 
-S57 driver:
- * Ensure SOUNDG in multipoint form is MultiPoint25D not 2D.
- * Print out contents of OGR_S57_OPTIONS environment variable if set (for debug
-purposes).
- * Correct control for applying updates, now done in Ingest method.
+ZMap driver:
+ * undeprecate it since we got feedback it is still useful (#4086)
 
-VRT driver:
- * carry style string through VRT layer
- * Pass the envelope of the geometry as the spatial filter in the sub-query (#2214)
- * Add "shared" attribute on SrcDataSource to control sharing.  Default to OFF for SrcLayer layers, and ON for SrcSQL layers.  This endeavors to avoid conflicts of layer state. (#2229)
+## OGR 3.4.0 - Overview of Changes
 
-XPlane/Flightgear driver:
- * New for 1.6.0
+### Core
+ * Add support for reporting hiearchical organization of vector layers, and implement it in FileGDB/OpenFileGDB drivers. (Trac #5752)
+ * Add GDALGroup::GetVectorLayerNames() and OpenVectorLayer(), and corresponding C and SWIG API
+ * Geometry::MakeValid(): add option to select the GEOS 3.10 'structure' method
+ * Support multiline geometry WKT input
+ * OGRGeometryFactory::createFromGeoJson(): Support importing GeoJSON fragments in non-null terminated strings (#3870)
+ * OGR SQL: fix wrong evaluation of attribute filter when a OR with >= 3 clauses is nested inside in another OR (#3919)
+ * OGR SQL: Support ISO-8601 literal dates with IN operator (#3978)
+ * OGRFeature::GetFieldAsSerializedJSon(): fix nullptr dereference on empty string list (#3831)
+ * Add OGRGetGEOSVersion() and map it to SWIG (#4079)
+ * Add GDAL_DCAP_MULTIPLE_VECTOR_LAYERS capability (#4135)
+ * Add virtual method GDALDataset::IsLayerPrivate
 
+### OGRSpatialReference
+ * Improve OGRProjCT::Clone() and export OGRCoordinateTransformation::Clone() to C API (#3809)
+ * Export OCTGetSourceCS(), OCTGetTargetCS() and OCTGetInverse() to C API (#3857)
+ * Add OGRSpatialReference::IsDynamic() to check if a CRS is a dynamic one
+ * Add OGRSpatialReference::SetCoordinateEpoch()/GetCoordinateEpoch()
+ * Coordinate transformation: take into account SRS coordinate epoch if the coordinate tuple has no time value
+ * Fix crash in AutoIdentifyEPSG/GetEPSGGeogCS() on some WKTs (#3915)
+ * Fix wrong quoting for WKT spatial CS type
+ * Add DERIVEDPROJCRS to WKT keywords for OGRSpatialReference::SetFromUserInput
+ * Support GetLinearUnits for ellipsoidal and spherical coordinate systems that have a height axis (#4030)
+ * AutoIdentifyEPSG(): do not add AUTHORITY node if the axis order of the geographic CRS contradicts the one from EPSG (#4038)
+ * OGR_CT: fix transformation between CRS that only differ by axis order (related to #4038)
+ * OGR_CT: when a WKT def contradicts its AUTHORITY node, use the WKT def (relates to #4038)
+ * OGR_CT: deal with bogus NaN coordinates as output of PROJ (#4224)
+ * OGR_CT with OGR_CT_OP_SELECTION=BEST_ACCURACY: fix for non-Greenwich prime meridian
+ * OGR_CT: take into account PROJ_NETWORK=ON in OGR_CT_OP_SELECTION=BEST_ACCURACY/FIRST_MATCHING modes
+ * OGRSpatialRef::SetFromUserInput(): add options to disallow file and network access, and use it various drivers (ossfuzz #35453)
+ * importFromCRSURL() / importFromWMSAUTO() / importFromURN(): avoid excessive memory allocation and processing time on invalid input (ossfuzz #37922 and #38134)
+ * OGRSpatialReference::GetAxesCount(): fix on CompoundCRS of BoundCRS
+ * fix retrieving projection parameters from WKT1 name on a Projected 3D CRS (OSGeo/PROJ#2846)
+ * Fix EPSGTreatsAsLatLong with compoundCRS (#4505)
+ * OSRProjTLSCache: avoid use of exceptions (#4531)
+ * exportToWkt(): use WKT2 for DerivedProjectedCRS (#3927)
+ * Add OSRSetPROJEnableNetwork() / OSRGetPROJEnableNetwork(), and expose them to SWIG
+ * Adds OCTTransformBounds to the C and SWIG API to transform a bounding box (#4630)
 
+### Utilities
+ * ogrinfo: report hiearchical organization of layers
+ * ogrinfo: report SRS coordinate epoch (RFC 81)
+ * ogrinfo: Report private layers with a "[private]" suffix
+ * ogr2ogr: add a -a_coord_epoch/-s_coord_epoch/_t_coord_epoch switches (RFC 81)
+ * ogr2ogr: fix quadratic performance if many source field names are identical (ossfuzz #37768)
 
-## SWIG Language Bindings
+### Vector drivers
 
-SWIG General :
- * Added GetHistogram
- * Added SetLinearUnitsAndUpdateParameters
- * Added GetSubDatasets method on Dataset
- * Added SetEquirectangular2
- * Cast returned value to OGRDriverShadow in GetDriver method instead of OGRLayerShadow
- * Make it possible to skip adding the inline C functions into the wrapper
- * Fix SWIG ReadRaster_internal and DSReadRaster_internal may crash (#2140)
- * Modify GeneralCmdLineProcessor() to recognise that a <= 0 return result is special and means NULL should be returned indicating a need to terminate the calling application.
- * Added SetMetadataItem/GetMetadataItem
- * Added gdaltransformer wrapper for RFC 22
- * implement the BuildFromEdges function #2380
- * Added ComputeProximity
- * Added GDALRegenerateOverviews
- * Added GetFileList
- * Added GRA_Lanczos
- * Added gdal.Polygonize()
- * expose GDALDestroyDriverManager() to improve leak detection
- * Added RasterizeLayer() and SieveFilter()
- * If we receive an odd array type in BandWriteArray(), cast the array to float64 which we do support (#2285).
-
-SWIG C# related changes:
- * Implement GDALProgressFunc callback for C# (fix for #2122)
- * Fixed that passing null as the options parameter of Driver.CreateCopy causes access violation (#2185).
- * Added GDALCreateCopy sample application
- * Support for signing the GDAL C# assemblies (#2186)
- * Added raster specific tests
- * Reworked the wrapper implementation
- * Added the bandMap parameter to the C# Dataset.ReadRaster and Dataset.WriteRaster API.
- * Added a C# sample to demonstrate the GDALDatasetRasterIO operations.
- * Added Band.GetHistogram to the C# bindings
- * Sample application for Band.GetHistogram.
- * Added the GDALAdjustContrast sample to demonstrate the image correction at the C# side.
- * Added Dataset.GetGCPs, Dataset.SetGCPs and GCPsToGeoTransform in the C# bindings (bugs #2426, #1986 and #1677
- * Added support for using OGR.Layer in Gdal.Polygonize
- * Changed the behavior to use OSR.SpatialReference and OSR.CoordinateTransformation instead of defining the same classes in the OGR namespace
- * Changed the scope from internal to public of the required functions
-
-SWIG Python related changes:
- * Fix layer __getitem__ bug (#2187)
- * add some sugar to ogr.DataSource.DeleteLayer to be able to take in either an index or a layer name.  If you give it a name, it *will* loop through all of the layers on the datasource.  This might be expensive depending on the driver.
- * add date/time fetching support to the generic GetField implementation... note this is not real 'datetime' support yet
- * a typemap for taking in lists of GDAL objects #2458
- * don't always return 0 for OGRErrs #2498
- * Added GetDefaultHistogram() with Python implementation
- * support for mingw Windows builds
- * Link with gdal_i.lib instead of gdal.lib when building with MSVC compiler. (#2578)
-
-SWIG Perl
- * Added a more verbose description to the error message if projection method test fails. Skip testing parameters of International Map of the World projection since it fails (a bug?).
- * driver's create method's 2nd parameter, if given, is a listref
- * Support Cygwin by adding -lstdc++ to LIBS if OS is cygwin
- * Add GetDriver method as an alias to _GetDriver for DataSource. This fixes an unnoticed side-effect of rewrapping GetDriver for root class OGR.
- * force name to be a string for _GetLayerByName and make default for name 0
- * fix Layer::Schema
- * use perl hash also for fields in schema (the new API was not really implemented), add Schema method also for Feature
- * croak in Geometry::create unless type, wkt, wkb, or gml given
- * do not call UseExceptions when booting OGR wrappers since it is only done once when booting GDAL (of which OGR is a part), do not include inline functions from cpl_exceptions.i into OGR wrappers
- * add exception support as for OGR
- * use geometry factory methods in Geometry::create; accept also only coordinate parameters (i.e. auto-add 0 if needed) in Point method for Point type
- * Add wrappers for field types datetime and lists. Do not use the overloaded (field name) versions of the get/set functions.
- * GetField and SetField methods, which check for goodness of the field (name, index) and support dates, times, datetimes, and lists. In Row and Tuple the field value may be a listref.
- * Support HEXWKB in Geo::OGR::Geometry::create.
- * As* methods for Geometry as aliases for ExportTo; SpatialReference->create constructor
- * made needed links from parameters to typemaps to make Get- and SetDefaultHistogram methods work in Perl
- * support for mingw Windows builds
-
-SWIG Java:
- * removed colortable from java bindings for now (#2231)
-
-# GDAL/OGR 1.5.0
-
-## GDAL/OGR 1.5.0 - General Changes
-
-Build:
- * CFG environment variable now ignored.  Instead set CFLAGS and CXXFLAGS
-   environment variables to desired compilation options, or use --enable-debug
-   for a debug build.  Default is "-g -O2" like most other packages.
- * Added --with-hide-internal-symbols to restrict exported API from .so files
-   to be the GDAL public API (as marked with CPL_DLL).
-
-Other:
- * OGR and GDAL C APIs now generally check for NULL objects and recover
-   with an error report instead of crashing.
-
-
-## GDAL 1.5.0 - Overview of Changes
+Multiple drivers:
+ * geomedia, walk: Check sql tables for required tables before trying to query them when trying to open a .mdb dataset
 
-Core:
- * Enable Persistent Auxiliary Metadata (.aux.xml) by default.
- * Support for "pam proxies" for files in read-only locations.
- * Create and !CreateCopy pre-Delete output existing dataset.
- * Added Identify() method on drivers (per RFC 11: Fast Format Identify)
- * Implement !GetFileList() on datasets (per RFC 12).
- * Implement Delete(), Rename(), Copy() based on !GetFileList() (per RFC 12).
- * vrtdataset.h, memdataset.h and rawdataset.h are now considered part of
-   the public GDAL API, and will be installed along with gdal.h, etc.
- * Support nodata/validity masks per RFC 14: Band Masks.
- * Plugin drivers test for ABI compatibility at load time.
- * Creation flags can now be validated (this is used by gdal_translate)
- * Default block cache size changed to 40MB from 10MB.
-
-Algorithms / Utilities:
- * gdal_grid: New utility to interpolate point data to a grid.
- * gdal2tiles.py is new for 1.5.0.
- * gdaltransform: stdin/stdout point transformer similar to PROJ.4 cs2cs.
- * gdalwarp: Several fixes related to destination "nodata" handling and
-   nodata mixing in resampling kernels.
- * gdalwarp: Added Lanczos Windows Sinc resampling.
- * gdal_rasterize: added -i flag to rasterize all areas outside geometry.
- * gdalenhance: new utility for applying histogram equalization enhancements.
- * gdalmanage: Utility for managing datasets (identify, delete, copy, rename)
- * nearblack: Utility for fixing lossy compressed nodata collars.
-
-Intergraph Raster Driver:
- * New for 1.5.0.
-
-COSAR (TerraSAR-X) Driver:
- * New for 1.5.0.
- * SAR Format.
-
-COASP Driver:
- * New for 1.5.0
- * SAR format produced by DRDC CASP SAR Processor.
-
-GFF Driver:
- * New for 1.5.0
-
-GENBIN (Generic Binary) Driver:
- * New for 1.5.0.
-
-ISIS3 Driver:
- * New for 1.5.0.
- * Also PDS and ISIS2 driver improved substantially and all moved to frmts/pds
-
-WMS Driver:
- * New for 1.5.0.
-
-SDE Raster Driver:
- * New for 1.5.0.
-
-SRTMHGT Driver:
- * New for 1.5.0.
-
-PALSAR Driver:
- * New for 1.5.0.
- * SAR format.
-
-ERS Driver:
- * New for 1.5.0.
- * ERMapper ASCII Header
-
-HTTP Driver:
- * New for 1.5.0.
- * Fetches file by http and then GDALOpen()s.
-
-GSG Driver:
- * New for 1.5.0.
- * Golden Software Surfer Grid.
-
-GS7 Driver:
- * New for 1.5.0.
- * Golden Software Surfer 7 Binary Grid.
-
-Spot DIMAP Driver:
- * New for 1.5.0.
-
-RPFTOC Driver:
- * New for 1.5.0.
-
-ADRG Driver:
- * New for 1.5.0.
-
-NITF Driver:
- * Added support for writing JPEG compressed (IC=C3).
- * Added support for reading text segments and TREs as metadata.
- * Added support for 1bit images.
- * Added support for GeoSDE TRE for georeferencing.
- * Support PAM for subdatasets.
- * Improved NSIF support.
- * Support C1 (FAX3) compression.
- * Improved CADRG support (#913, #1750, #1751, #1754)
-
-ENVI Driver:
- * Many improvements, particularly to coordinate system handling and metadata.
-
-JP2KAK (Kakadu JPEG2000) Driver:
- * Now builds with libtool enabled.
-
-GTIFF (GeoTIFF) Driver:
- * Now supports BigTIFF (read and write) with libtiff4 (internal copy ok).
- * Upgraded to include libtiff 4.0 (alpha2) as the internal option.
- * Support AVERAGE_BIT2GRAYSCALE overviews.
- * Produce pixel interleaved files instead of band interleaved by default.
- * Support TIFF files with odd numbers of bits (1-8, 11, etc).
- * Add ZLEVEL creation option to specify level of compression for DEFLATE method
-
-GIF Driver:
- * Nodata/transparency support added.
+CSV driver:
+ * improve concatenation performance of multi-line records (ossfuzz #37528)
+ * OGREditableLayer (affects CSV driver): fix quadratic performance when creating field (ossfuzz #37768)
+ * limit to 2000 fields in opening by default. (ossfuzz #39095)
 
-JPEG Driver:
- * Support in-file masks.
-
-AIGrid Driver:
- * Supports reading associated info table as a Raster Attribute Table.
+DGN driver:
+ * avoid potential buffer overflow (CID 1074498)
+ * replace undefined behavior 1 << 31 by 1U << 31. Not sure of the consequences
 
-HFA Driver:
- * Support MapInformation/xform nodes for read and write.
- * Support AVERAGE_BIT2GRAYSCALE overviews.
- * Support Signed Byte pixel type.
- * Support 1/2/4 bit pixel types.
- * Support PE_STRING coordinate system definitions.
- * Support nodata values (#1567)
+DXF driver:
+ * Improved handling of very long lines of text in DXF file (#3909)
+ * Correctly handle hidden (invisible) INSERTs
 
-WCS Driver:
- * Support WCS 1.1.0
+DWG driver:
+ * Make Closed AcDb2dPolyline and AcDb3dPolyline to Closed OGRLineString (#4264)
 
-DTED Driver:
- * Can now perform checksum verification.
- * Better datum detection.
+ESRIJSON driver:
+ * make 'ESRIJSON:http://' connection string scroll results
 
-HDF4 Driver:
- * Support PAM for subdatasets.
+FlatGeoBuf driver:
+ * add support for coordinate epoch (RFC 81)
+ * fix memory leaks when reading invalid geometries (ossfuzz #37752, #37834, #38166)
+ * set minimum alignment to 8 bytes
 
-Leveller Driver:
- * Added write support.
- * Added v7 (Leveller 2.6) support.
+FileGDB driver:
+ * report hiearchical organization of layers
+ * Fix reading of field domains when data source is wrapped in OGRDataSourceWithTransaction
+ * Ensure tables which are present in the catalog but not listed in GDB_Items can be read by the driver (#4463)
+ * faster CreateLayer() w.r.t SRS identification
+ * Implement Identify method
 
-## OGR 1.5.0 - Overview of Changes
+GeoJSON driver:
+ * writer: emit error msg when geometry type is not supported in GeoJSON (#4006)
+ * recognize URL of likely OAPIF items response page (#4601)
 
-General:
- * Plugin drivers test for ABI compatibility at load time.
- * SFCOM/OLEDB stuff all removed (moved to /spike in subversion).
- * Various thread safety improvements made.
- * Added PointOnSurface implementation for OGRPolygon.
- * Added C API interface to OGR Feature Style classes (RFC 18).
+GML driver:
+ * reading: fix reading compound curves with gml:ArcByCenterPoint and in a projected CRS in northing/easting axis order (#4155)
+ * writer: use GML 3.2 as the new default version (instead of GML 2)
+ * read/write srsName as a XML comment in .xsd
+ * store geometry element name as geometry column name when reading without .gfs/.xsd (#4386)
+ * avoid read heap-buffer-overflow (ossfuzz #35363)
+ * avoid performance issue on too nested structure (ossfuzz #21737)
+ * fix warning when reading .gfs file with a polyhedral surface
+ * expose field names in a more consistent orders when some feature lacks some fields (qgis/QGIS#45139)
 
-Utilities:
- * All moved to gdal/apps.
+GMLAS driver:
+ * avoid uncaught exception when opening corrupted .xsd
+ * use our own network accessor to honour GDAL_HTTP_TIMEOUT (ossfuzz #37356)
+ * fix potential crash on XMLString::transcode() failure (ossfuzz #37459)
+ * fix potential crash in ProcessSWEDataArray() (ossfuzz #37474)
+ * improve performance of field name truncation (ossfuzz #37836)
+ * fix likely quadratic performance in LaunderFieldNames() (ossfuzz #39797)
+ * error out on huge mem allocation / processing time in Xerces (ossfuzz #38073)
+ * fix performance issue (ossfuzz #38707)
 
-OGRSpatialReference:
- * Supports URL SRS type.
- * Upgraded to EPSG 6.13.
- * Operating much better in odd numeric locales.
+GPKG driver:
+ * add support for coordinate epoch (RFC 81)
+ * accept CreateField with a column with the fid column name and type=real, width=20, precision=0 (qgis/qgis#25795)
+ * fix wrong gpkg_metadata_reference_column_name_update trigger (qgis/qgis#42768)
+ * fix for compatibility with SQLite 3.36.0 and views (#4015)
+ * add error message when prepare fails
+ * capitalize cartesian as Cartesian for SRS of id -1 'Undefined Cartesian coordinate reference system' (#4468)
 
-BNA Driver:
- * New for 1.5.0.
+GPX driver:
+ * avoid potential integer overflow on writing (ossfuzz #30937)
 
-GPX Driver:
- * New for 1.5.0.
+ILI driver:
+ * Fix non contiguous curves for COORD/ARC sequences (#3755)
 
-GeoJSON Driver:
- * New for 1.5.0.
+KML driver:
+ * add read support for non-conformant MultiPolygon/MultiLineString/MultiPoint elements (#4031)
 
-GMT ASCII Driver:
- * New for 1.5.0.
+LIBKML driver:
+ * add read support for non-conformant MultiPolygon/MultiLineString/MultiPoint elements (#4031)
 
-KML Driver:
- * Preliminary read support added.
+LVBAG driver:
+ * add field definition for "gerelateerdewoonplaats" (#4161)
+ * add Field verkorteNaam to OpenbareRuimte FT (#4286)
 
-DXF / DWG Driver:
- * Removed due to licensing issues with some of the source code.  Still
-   available in subversion from under /spike if needed.
+Memory driver:
+ * add support for coordinate epoch (RFC 81)
 
-PG (Postgres/PostGIS) Driver:
- * Added support for recognising primary keys other than OGR_FID to use as FID.
- * Improved schema support.
- * Performance improvements related to enabling SEQSCAN and large cursor pages
+MITAB driver:
+ * Fix mapping of mapinfo symbol numbers to corresponding OGR symbol IDs (#3826)
 
-Shapefile Driver:
- * Do not keep .shx open in read only mode (better file handle management).
- * Use GEOS to classify rings into polygons with holes and multipolygons if it is available.
- * Support dbf files larger than 2GB.
+MongoDB3 driver:
+ * fix deprecation warnings with mongocxx >= 3.6
 
-MySQL Driver:
- * Added support for BLOB fields.
+MVT driver:
+ * use 'number' instead of wrong 'numeric' when generating metadata tilestats (#4160)
+ * reader: be tolerant to broken points generated by Mapserver
 
-MITAB (MapInfo) Driver:
- * Upgraded to MITAB 1.6.4.
+OCI driver:
+ * Don't try to create new layer with TRUNCATE option (#4027)
 
-Interlis Drivers:
- * Support datasources without imported Interlis TID
- * Remove ili2c.jar (available from http://home.gdal.org/dl/ili2c.jar
- * Support for inner rings in Surface geometries.
- * Support spatial and attribute filters.
+ODBC driver:
+ * Fix incorrect ODBC type mapping for a number of SQL types
+ * Optimise testing if mdb is a PGeo/Walk/Geomedia database
+ * Add support for LIST_ALL_TABLES open option
+ * Update driver metadata
+ * Move MDB Tools access driver installation to  CPLODBCDriverInstaller, and ensure driver installation is attempted when trying to open an MDB file using the ODBC driver
+ * Add identify support
+ * Add GetLayerByName override which can retrieve private layers by name
+ * Implement IsLayerPrivate support
 
-## SWIG Language Bindings
+ODS driver:
+ * limit maximum number of fields to 2000 by default (ossfuzz #7969)
 
- * The "Next Generation" Python SWIG bindings are now the default.
- * Python utility and sample scripts migrated to swig/python/scripts and
-   swig/python/samples.
- * Added Raster Attribute Tables to swig bindings.
- * Added Geometry.ExportToKML
- * Added CreateGeometryFromJson
- * Added Geometry.ExportToJson
-
-SWIG C# related changes:
- * Support for the enumerated types of the C# interface
- * C# namespace names and module names follows the .NET framework naming guidelines
- * Changed the names of the Windows builds for a better match with the GNU/Linux/OSX builds
- * The gdalconst assembly is now deprecated
- * GDAL C# libtool build support
- * !CreateFromWkb support
- * Dataset.!ReadRaster, Dataset.!WriteRaster support
- * Added support for Dataset.!BuildOverviews
- * More examples added
-
-SWIG Python related changes:
- * Progress function callback support added.  You can use a Python function, or the standard GDALTermProgress variant
- * Sugar, sweet, sweet sugar.
-    * ogr.Feature.geometry()
-    * ogr.Feature.items()
-    * ogr.Feature.keys()
- * doxygen-generated docstrings for ogr.py
- * geometry pickling
- * setuptools support
- * !PyPi http://pypi.python.org/pypi/GDAL/
- * setup.cfg for configuring major significant items (libs, includes, location of gdal-config0
- * support building the bindings from *outside* the GDAL source tree
-
-SWIG Java:
- * SWIG Java bindings are orphaned and believed to be broken at this time.
-
-
-# GDAL/OGR 1.4.0 - General Changes
-
-Perl Bindings:
- - Added doxygen based documentation.
-
-NG Python Bindings:
- - Implemented numpy support.
-
-CSharp Bindings:
- - Now mostly operational.
-
-WinCE Porting:
- - CPL
- - base OGR, OSR and mitab and shape drivers.
- - GDAL, including GeoTIFF, DTED, AAIGrid drivers
- - Added test suite (gdalautotest/cpp)
-
-Mac OSX Port:
- - Added framework support (--with-macosx-framework)
-
-## GDAL 1.4.0 - Overview Of Changes
-
-WCS Driver:
- - New
-
-PDS (Planetary Data Set) Driver:
- - New
-
-ISIS (Mars Qubes) Driver:
- - New
-
-HFA (.img) Driver:
- - Support reading ProjectionX PE strings.
- - Support producing .aux files with statistics.
- - Fix serious bugs with u1, u2 and u4 compressed data.
-
-NITF Driver:
- - Added BLOCKA reading support.
- - Added ICORDS='D'
- - Added jpeg compression support (readonly)
- - Support multiple images as subdatasets.
- - Support CGM data (as metadata)
-
-AIGrid Driver:
- - Use VSI*L API (large files, in memory, etc)
- - Support upper case filenames.
- - Support .clr file above coverage.
-
-HDF4 Driver:
- - Added support for access to geolocation arrays (see RFC 4).
- - External raw raster bands supported.
-
-PCIDSK (.pix) Driver:
- - Support METER/FEET as LOCAL_CS.
- - Fix serious byte swapping error on creation.
-
-BMP Driver:
- - Various fixes, including 16bit combinations, and non-intel byte swapping.
-
-GeoTIFF Driver:
- - Fixed in place update for LZW and Deflated compressed images.
-
-JP2KAK (JPEG2000) Driver:
- - Added support for reading and writing gmljp2 headers.
- - Read xml boxes as metadata.
- - Accelerate YCbCr handling.
-
-JP2MrSID (JPEG2000) Driver:
- - Added support for reading gmljp2 headers.
+OGR_GMT driver:
+ * fix performance issue. (ossfuzz #38158)
 
-EHDR (ESRI BIL) Driver:
- - Support 1-7 bit data.
- - Added statistics support.
+OpenFileGDB driver:
+ * report hiearchical organization of layers
+ * fix reading of raster fields
+ * Add a "LIST_ALL_TABLES" open option
+ * Support detection of private layers
+ * Correctly list non-spatial, non-private tables which are not present in the GDB_Items table (#4463)
 
-## OGR 1.4.0 - Overview of Changes
+PDS4 vector:
+ * add a LINE_ENDING=CRLF/LF layer creation option for DELIMITED and CHARACTER tables
+ * fix quadratic performance when creating fields (ossfuzz #37768)
+ * avoid warning about wrong field subtype when parsing ASCII_Boolean
+ * fix issue with layer names with non alphanum characters or leading digit
 
-OGR SQL:
- - RFC 6: Added support for SQL/attribute filter access to geometry, and
-   style strings.
+PG driver:
+ * support postgresql:// connection strings (#4570)
 
-OGRSpatialReference:
- - Support for OGC SRS URNs.
- - Support for +wktext/EXTENSION stuff for preserving PROJ.4 string in WKT.
- - Added Two Point Equidistant projection.
- - Added Krovak projection.
- - Updated support files to EPSG 6.11.
+PGeo driver:
+ * add search path for libmdbodbc on Ubuntu 20.04
+ * use SELECT COUNT(*) for GetFeatureCount() with mdbtools only if it appears to be working (#4103)
+ * Make identification of system tables case insensitive
+ * Add more internal tables to block list
+ * Always promote polygon or line layers to multi-type geometries (#4255)
+ * Correctly reflect whether layers have m values in the layer types
+ * Correctly return failure when getting extent for non-spatial pgeo select layer
+ * Correctly set no geometry type for pgeo select queries with no shape column
+ * Add support for field domains (#4291)
+ * Add support for retrieving layer definition and metadata with special "GetLayerDefinition table_name" and "GetLayerMetadata table_name" SQL queries
+ * Add LIST_ALL_TABLES open option
+ * Implement IsLayerPrivate()
+ * Add GetLayerByName override which can retrieve private layers by name (#4361)
+ * Add identify method (#4357)
 
-OGRCoordinateTransformation:
- - Support source and destination longitude wrapping control.
+PGDump driver:
+ * fix performance issue on huge number of columns (ossfuzz #38262)
+ * set limit to number of created fields to 1600, consistently with PostgreSQL
 
-OGRFeatureStyle:
- - Various extensions and improvements.
+PLScenes driver:
+ * add PSScene and SkySatVideo item types to conf, and update other item types
+ * raster side: make it work with Sentinel2L1C and Landsat8L1G
 
-INFORMIX Driver:
- - New
+Shapefile driver:
+ * fix wrong SRS when reading a WGS 84 SRS with a TOWGS84[0,0,0,0,0,0,0] (#3958)
+ * Communicate why the file size cannot be reached when appending features (#4140)
 
-KML Driver:
- - New (write only)
+SQLite/Spatialite driver:
+ * fix crash when calling GetMetadataItem() with domain==nullptr (qgis/qgis#43224)
+ * fix for compatibility with SQLite 3.36.0 and views (#4015)
+ * Implement IsLayerPrivate()
+ * support reading tables WITHOUT ROWID (#3884)
+ * Add missing SQL datatypes
 
-E00 Driver:
- - New (read only)
- - Polygon (PAL) likely not working properly.
+Tiger driver:
+ * tag writing side as deprecated and for removal in 3.5 (#4215)
 
-Postgres/PostGIS Driver:
- - Updated to support new EWKB results (PostGIS 1.1?)
- - Fixed serious bug with writing SRSes.
- - Added schema support.
+VRT driver:
+ * add support for coordinate epoch (RFC 81)
+ * Fix spatial filter for geometry column names with space
+ * fix performance issue (ossfuzz #38629)
 
-GML Driver:
- - Strip namespaces off field names.
- - Handle very large geometries gracefully.
+WasP driver:
+ * fix likely wrong condition in line merging (spotted by cppcheck)
 
-ODBC Driver:
- - Added support for spatial_ref_sys table.
+WFS driver:
 
-SDE Driver:
- - Added logic to speed things up while actually detecting layer geometry types
+XLS driver:
+ * Set OLCStringsAsUTF8 capability to TRUE
 
-PGeo Driver:
- - Added support for MDB Tools ODBC driver on linux/unix.
+## SWIG Language Bindings
 
-VRT Driver:
- - Added useSpatialSubquery support.
+All bindings:
+ * add VSI_STAT_SET_ERROR_FLAG constant
+ * Map CPLSetThreadLocalConfigOption() and CPLGetThreadLocalConfigOption()
 
+Python bindings:
+ * add MDArray.GetNoDataValueAsString() / SetNoDataValueString()
+ * change gdal.EscapeString() to return a bytearray() when input is bytes(), to make it compatible with backslash escaping of non-ASCII content
+ * fix GDALPythonObjectFromCStr() to return a bytes() object rather than a corrupted unicode string when invalid UTF-8 sequences are found
+ * make GDALAttribute.Write() accept a dictionary for JSON attributes, and make GDALAttribute.Read() return a dictionary for a JSON attribute
+ * fix resampleAlg=gdal.GRA_Sum/Med/Min/Max/Q1/Q3 in gdal.Warp()
+ * Fix inversion between GRA_ and GRIORA_ enums in gdal.Warp()/Translate()/BuildVRT()
+ * fix bilinear, cubic, cubicspline resampling for gdal.BuildVRT()
+ * make GetMetadata(None) work
+ * fix MDArray.ReadAsArray() with CInt16/CInt32 data type
+ * fix memleak in gdal|ogr|osr.DontUseExceptions()
+ * fix crash when reading null strings with MDArray.Read()
+ * catch potential exception thrown by SWIG_AsCharPtrAndSize()
+ * Build windows python wrappers with -threads argument
+ * Python >= 3.8 on Windows: automatically add path with [lib]gdal*.dll with os.add_dll_directory()
+ * Python >= 3.8 import: fix exception when PATH has nonexistent paths on Windows (#3898)
+ * fix behavior of SetMetadata() when a value is of type bytes (#4292)
+ * no longer use distutils (deprecated since python 3.10) when setuptools is available (#4334)
+ * remove call to __del__() in Geometry.Destroy(), which no longer exists in SWIG 4
 
-# GDAL/OGR 1.3.2 - General Changes
+# GDAL/OGR 3.3.0 Release Notes
 
-WinCE Porting:
- - Support for MS WinCE new for this release.
+## In a nutshell...
 
-Java SWIG Bindings:
- - Preliminary support implemented.
+* RFC 77 (https://gdal.org/development/rfc/rfc77_drop_python2_support.html): Drop Python 2 support in favor of Python 3.6 (#3142)
+* RFC 78 (https://gdal.org/development/rfc/rfc78_gdal_utils_package.html): Add a gdal-utils Python package
+* New driver:
+  - STACTA: raster driver to read Spatio-Temporal Asset Catalog Tiled Assets
+* Add /vsiadls/ virtual file system for Azure Data Lake Storage Gen2
+* Improved drivers: DIMAP, NITF
+* Number of improvements in Python bindings
+* Add automatic loading of configuration options from a file
+* Add support for enumerated, constraint and glob field domains in MEM, FileGDB/OpenFileGDB and GeoPackage drivers
+* Deprecation:
+  - Disable by default raster drivers DODS, JPEG2000(Jasper), JPEGLS, MG4LIDAR, FUJIBAS, IDA, INGR, ZMAP and vector driver ARCGEN, ArcObjects, CLOUDANT, COUCHDB, DB2, DODS, FME, GEOMEDIA, GTM, INGRES, MONGODB, REC, WALK at runtime, unless the GDAL_ENABLE_DEPRECATED_DRIVER_{drivername} configuration option is set to YES. Those drivers are planned for removal in GDAL 3.5
+  - Perl bindings are deprecated. Removal planned for GDAL 3.5. Use Geo::GDAL::FFI instead
+* Removal of BNA, AeronavFAA, HTF, OpenAir, SEGUKOOA, SEGY, SUA, XPlane, BPG, E00GRID, EPSILON, IGNFHeightASCIIGrid, NTV1 drivers. Moved to (unsupported) https://github.com/OSGeo/gdal-extra-drivers repository.
+* Continued code linting (cppcheck, CoverityScan, etc.)
+* Bump of shared lib major version
 
+## Backward compatibility issues
 
-## GDAL 1.3.2 - Overview of Changes
+See MIGRATION_GUIDE.txt
 
-Locale:
- - Force numeric locale to "C" at a few strategic points.
+## GDAL/OGR 3.3.0 - General Changes
 
-Idrisi Driver:
- - New for 1.3.2.
- - Includes reading and writing.
- - Limited coordinate system support.
+General:
+ * fix build with recent gcc/clang
 
-DIPEx Driver:
- - New for GDAL 1.3.2 (related to ELAS format).
+Build(Unix):
+ * Support CharLS 2.1 on Debian as well. (#3083)
+ * disable LERC on big-endian hosts, as it is not big-endian ready
+ * gdal-config (non installed): add -I/gnm in CFLAGS
+ * fix compilation failure with gcc < 5 in Elasticsearch driver
+ * configure: Also save LDFLAGS when checking compatibility.
+ * configure: Ensure --with-geos/sfcgal fail if unavailable.
+ * configure: check presence of linux/fs.h for Linux builds
+ * configure: Fix gdal compilation when using proj-8.0.0 and libtiff with static jpeg support
+ * GDALmake.opt.in: in non-libtool LD_SHARED builds, do not link applications against libgdal dependencies, but only against libgdal itself
 
-Leveller Driver:
- - New for GDAL 1.3.2.
+Build(Windows):
+ * add missing makefile.vc for heif
 
-NetCDF Driver:
- - Improved autoidentification of x, y dimensions.
- - Improved CF support.
+## GDAL 3.3.0 - Overview of Changes
 
-JPEG2000 (JasPer) Driver:
- - Use GDALJP2Metadata to support various kinds of georeferencing.
+Port:
+ * GOA2GetRefreshToken(): avoid nullptr dereference in some cases
+ * /vsicurl/: for debug messages, use the debug key of derived filesystem, such as 'S3' instead of 'VSICURL'
+ * /vsicurl/: fix issue when trying to read past end of file.
+ * /vsicurl/: use less restrictive check for S3-like signed URLs to be usable by OpenIO (#3703)
+ * /vsicurl/: fix handling of X-Amz-Expires type of signed URLs (#3703)
+ * VSICurlStreamingClearCache(): fix cache clearing for /vsiaz_streaming/
+ * /vsimem/, /vsisubfile/: fix memleak if destroying the C++ handle with delete instead of using VSIFCloseL() (ossfuzz #28422 #28446)
+ * /vsiaz/: fetch credentials from Azure Active Directory when run from a Azure VM when AZURE_STORAGE_ACCOUNT is set.
+ * /vsiaz/: add SAS query string in HTTP Get Range requests.
+ * /vsiaz/: implement GetFileMetadata() / SetFileMetadata()
+ * /vsiaz/: fix Stat('/vsiaz/container') when shared access signature is enabled
+ * /vsis3/, /vsiaz/, /vsigs/: set Content-Type from filename extension for a few select file types
+ * /vsis3/ sync: improve upload performance by setting the default number of threads and increase the chunk size
+ * VSICachedFile::Read(): avoid division by zero if nSize ## 0 (#3331)
+ * Make creation of global hCOAMutex thread-safer on Windows (#3399)
+ * Add VSIFOpenEx2L() to be able to specify headers such as Content-Type or Content-Encoding at file creation time
+ * CPLHTTP: Allow to set GSSAPI credential delegation type with GSSAPI_DELEGATION option / GDAL_GSSAPI_DELEGATION config. option
+ * CPLHTTPGetNewRetryDelay(): match 'Operation timed out' curl error
+ * CPLDebug: in CPL_TIMESTAMP mode, display also elapsed time since first trace
+ * Use _stricmp / _strnicmp for Windows EQUAL / EQUALN() macros
 
-JPEG2000 (JP2KAK) Driver:
- - Support writing tiles outputs so that very large images can be written.
+Core:
+ * Add automatic loading of configuration options from a file (located in {sysconfdir}/gdal/gdalrc or $(USERPROFILE)/.gdal/gdalrc)
+ * RasterIO: massive speed-up of nearest-neighbour downsampling when the downsampling factor is a integer value
+ * RasterIO: speed-up average downsampling when the downsampling factor is 2 and with Byte/UInt16/Float32 data type
+ * GDALDataset::BlockBasedRasterIO(): make it take into account floating-point window coordinates, as GDALRasterBand::IRasterIO() generic case does  (#3101)
+ * GDALOpenEx(): supports OVERVIEW_LEVEL=NONE to indicate overviews shouldn't be exposed
+ * GDALCopyWholeRasterGetSwathSize(): take into account COMPRESSION IMAGE_STRUCTURE metadata item at dataset level (helps for DIMAP)
+ * cpl_userfaultfd.cpp: enable to disable it at runtime with CPL_ENABLE_USERFAULTFD=NO
+ * Python embedding: fix symbol conflicts with python library (#3215)
+ * Python embedding: fix loading in QGIS/Windows (or any process with more than 100 modules)
+ * Python embedding: make it work on Ubuntu 20.04 when python-is-python3 package that symlinks python to python3 is installed
+ * GDALUnrolledCopy_GByte: improve base SSE2 implementation so that specialized SSSE3 is no longer needer
+ * RPC: add parameters ERR_BIAS and ERR_RAND (#3484)
 
-GeoTIFF Driver:
- - Report error when attempting to create >4GB uncompressed file.
- - Updated to latest libtiff, now supports "old jpeg" fairly well.
- - Improved support for subsampled YCbCr images.
+Multidim API:
+ * CreateCopy() multidim: allow to provide array-level creation options by prefixing them with "ARRAY:"
+ * [Set/Get][Offset/Scale](): extend to get/set storage data type. Add 'Ex' suffixed C API functions for that
+ * GDALMDArrayUnscaled: implement Write() to be able to get from unscaled values to raw values
+ * GDALMDArrayUnscaled::IWrite(): speed optimization when writing to netCDF 4
+ * GDALGroup::CopyFrom(): add ARRAY:AUTOSCALE=YES and ARRAY:AUTOSCALE_DATA_TYPE=Byte/UInt16/Int16/UInt32/Int32 creation options
+ * CreateCopy(): allow IF(NAME={name}) to be a full qualified name
+ * GDALExtendedDataType::Create(): do not allow creating compound data type with no component
 
-Imagine (HFA) Driver:
- - Support reading affine polynomial transforms as geotransform.
- - Support overviews of different type than base band.
- - Support reading RDO style "nodata" indicator.
+Algorithms:
+ * Add RMS (Quadratic Mean) subsampling to RasterIO, overviews and warp kernel (#3210)
+ * Warping: improve performance related to PROJ usage for warping of small rasters
+ * Warper ComputeSourceWindow(): avoid potential integer overflow with a ill-behaved transformer/inverse projection
+ * Warper: fix assertion/crash in debug mode in GWKCheckAndComputeSrcOffsets() in some circumstances
+ * Pansharpening: fix wrong band assignment when input multispectral bands not in order 1,2,... and NoData set as PansharpeningOptions and not present in input bands
+ * internal_libqhull/poly.c: avoid int overflow on 32bit
+ * Fix failure in overview generation for certain raster sizes and overview factor, on raster with color table in particular (#3336)
+ * GDALSuggestedWarpOutput2(): avoid potential crash if an approximate transformer is provided
 
-PCI Aux Driver:
- - Support projections requiring parameters.
+Utilities:
+ * gdalinfo: add -approx_stats in synopsis (#3296)
+ * gdal_translate -tr: make non-nearest resampling honour the specified resolution to avoid potential sub-pixel misalignment when the spatial extent, resolution and dimensions in pixels don't perfectly match
+ * gdal_translate: preserve source block size when not subsetting, and preserve as well COMPRESSION IMAGE_STRUCTURE metadata item
+ * gdal_translate / gdalwarp: do not copy CACHE_PATH metadata item from WMS driver
+ * gdalwarp: make -of COG work with multiple input sources when BigTIFF temporary output is needed (#3212)
+ * gdalwarp: preserve scale/offset settings of source bands to output (#3232)
+ * gdalwarp: address (one situation of) geometry invalidity when reprojecting the cutline to the source image
+ * gdal_create: add a -if option to specify a prototype input file
+ * gdal_rasterize: make -i work again (#3124)
+ * gdaldem TRI: add a -alg Riley option to use the Riley 1999 formula, for terrestrial use cases (#3320), and make it the new default
+ * gdal2tiles: Allow automatic max zoom when min zoom is specified
+ * gdal2tiles: change from cdn.leafletjs.com to unpkg.com for leaflet .css and .js (#3084)
+ * gdal2tiles: take into account --xyz in leafleft output (#3359)
+ * gdal_calc: multiple improvements (nodata, multiple inputs in the same alpha, checks, extent with union/intersection logic, color table, ...)
+ * gdal_edit: Correctly handle the error of parameter '-scale' with no number given
+ * gdal_ls.py: display file mode when available
+ * gdal2xyz.py: various improvements (nodata, band selection, etc.)
+ * pct2rgb.py and rgb2pct.py: added support for an input pct_filename
+ * gdalattachpct.py: new utility from attachpct.py sample
+ * validate_gpkg.py: various improvements
+ * add gdallocationinfo.py sample script
 
-MrSID Driver;
- - Fixed problem with writing files other than 1 or 3 bands.
- - Support ESDK 6.x.
+Resource files:
+ * tms_MapML_CBMTILE.json: fix it to use correct resolution / scaleDenominator. Unfortunately this makes it non-usable by gdal2tiles, but still by the COG driver
 
-BMP Driver:
- - Added support for 32bit images with bitfields compression.
+Multi driver changes:
+ * gdal2tiles/COG/MBTiles/GeoPackage: adjustments for EPSG:3857 output (due to PROJ 8 changes)
 
-DODS Driver:
- - Upgraded to support libdap 3.6.x.
- - Upgraded to support [-x][-y] to flip image.
+BAG driver:
+ * fix inversion of width and height in XML metadata (#3605)
 
-gdal_rasterize Utility:
- - New for GDAL 1.3.2.
- - Rasterize OGR polygons into a raster.
+BLX driver:
+ * fix potential free of uninitialized variable in case memory allocation would fail
 
-## OGR 1.3.2 - Overview of Changes
+BYN driver:
+ * relax checks in header bytes to allow products with some unset/invalid fields we don't use
 
-OGRFeature:
- - Added support for OFTDate, OFTTime and OFTDateTime field types.
- - Also applied to a few drivers (shapefile, mysql, postgres)
+COG driver:
+ * allow customising overview compression type (#3453)
 
-OGRLayer:
- - GetFIDColumn() and GetGeometryColumn() added.
+DAAS driver:
+ * fix pixel retrieval of dataset with UInt16 data type and one mask band (#3061), and also use pixelType from bands[] instead of deprecated top-level one
 
-Generic OGR SQL:
- - Proper support for spatial and attribute filters installed on
-   OGR SQL resultsets.
+DIMAP driver:
+ * add support for VHR 2020 Multispectral Full Spectrum products
+ * add support for multiple components / subdatasets
+ * set source block size to DIMAP VRT band (helps for performance with JP2KAK)
 
-OGRSpatialReference:
- - Upgraded data files to EPSG 6.9
-
-PostGIS Driver:
- - Include proj4text in new spatial_ref_sys entries.
- - Fixed support for very large queries.
- - Fixed DeleteLayer() implementation.
- - Added COPY support for accelerated loading.
-
-MySQL Driver:
- - Added read and write support for Spatial types.
- - Support spatial_ref_sys and geometry_columns tables.
- - Various other improvements (dates, smallint, tinyint, etc)
- - More robust auto-detection of column types for layers
-   created from SQL statements
+ECW driver:
+ * fix build with original ECW SDK 5.4 (#2776)
 
-ArcSDE Driver:
- - New for 1.3.2.
- - Read-only support for all geometry types.
- - Supports coordinate systems.
- - Requires SDE C API from ESRI.
-
-Shapefile Driver:
- - Avoid posting errors when .dbf's without .shps are opened.
- - Added pseudo-SQL REPACK command after deleting features.
- - Implement DeleteFeature()
-
-S-57 Driver:
- - Added support for Arcs.
- - Added special DSID_DSSI feature class to capture header info.
-
-DGN Driver:
- - Support writing geometry collections.
-
-DWG/DXF Driver:
- - New for OGR 1.3.2
- - Only supports writing DWG and DXF.
- - Depends on DWGdirect library.
-
-
-# GDAL 1.3.1 - Overview of Changes
-
-Next Generation SWIG Wrappers (GDAL and OGR):
- - Python, Perl and Ruby bindings considered to be ready to use.
- - C#, Java, PHP are at best initial prototypes.
- - Added configure options for most NG options.
+ENVI, Ehdr, and other "raw" drivers:
+ * lower memory requirements for BIP interleave, and improve efficiency (#3213)
 
-PCRaster Driver:
- - libcsf is now included as part of GDAL.
- - PCRaster enabled by default on win32.
- - --with-pcraster=internal option now supported on unix (but not yet default)
+FIT driver:
+ * reject negative value PAGESIZE creation option (ossfuzz #26596)
 
-VSI Virtualization:
- - The "large file API" (VSI*L) has been re-engineered to allow installing
-   additional file handlers at runtime.
- - Added "in memory" VSI handler so that now any driver using VSI*L
-   functions for data access can operate on in-memory files.
- - PNG, JPEG and GeoTIFF drivers upgraded to work with in-memory support.
+FITS driver:
+ * apply vertical mirroring on reading/writing
+ * add support for creation and update of binary tables
+ * display more informative error message when opening raster dataset in vector mode, or vice-verca
+ * avoid stack smash overflow with 32 bit Linux builds in GetRawBinaryLayout()
+ * set physical filename when opening subdataset
 
-Raster Attribute Tables:
- - Implemented new Raster Attribute Tables support.  See the
-   GDALRasterAttributeTable class for more information.
+GRIB driver:
+ * fix reading subfields reusing the bitmap of a previous one (#3099)
+ * degrib: avoid erroneous unit conversion when section 4 has vertical values coordinates (#3158)
+ * degrib: add surface type 150 = Generalized Vertical Height Coordinate (#3158)
+ * Update MRMS Local Table to v12 (#3328)
+ * fix writing of ComplexPacking with nodata values and a single valid value (#3352)
 
-Erdas Imagine Overviews:
- - Erdas Imagine driver upgraded to support building internal overviews.
- - Generic overview handler updated to support overviews in Erdas Imagine
-   format for any file format.  Set USE_RRD config option to YES to enable.
+GTiff driver:
+ * Internal libtiff resync with libtiff 4.3.0. Includes:
+   - tif_lerc.c: fix encoding of datasets with NaN values (#3055)
+   - TIFFStartStrip(): avoid potential crash in WebP codec when using scanline access on corrupted files (ossfuzz #26650)
+ * Export JPEG compression tags to metadata
+ * Report PREDICTOR in IMAGE_STRUCTURE dataset metadata domain (when it is set)
+ * avoid setting compoundCRS name to 'unknown' when the GTCitationGeoKey is absent
+ * better parse VerticalCitationGeoKey that is in the form 'VCS Name = foo|...'
+ * rely on libtiff for LERC codec instead of internal libtiff-only codec previously
+ * avoid GetSpatialRef() to return non-NULL on dataset with GCPs (#3642)
 
-gdalwarp:
- - Added proper support for "unified source nodata", so the -srcnodata
-   switch works well.
+HDF5 driver:
+ * fix reading files whose HDF5 signature is not at offset 0 (#3188)
 
-RIK Driver:
- - New Swedish format driver implemented by Daniel Wallner.
+HFA driver:
+ * fix reading SRS with NAD83 favors, like 'NAD83(CORS96)'
 
-JPEG Driver:
- - Substantial improvements to EXIF support.
+JP2KAK driver:
+ * JP2KAKCreateCopy(): add validation of BLOCKXSIZE/BLOCKYSIZE to avoid Coverity warning about division by zero (CID 1086659, 1086660)
 
-MrSID Driver:
- - Updated with proper JPEG2000 support as JP2MRSID driver, including
-   encoding with ESDK.
- - Updated to support MrSID Version 5.x SDKs.
+JPEG driver:
+ * add support for reading FLIR (infrared) metadata and thermal image
+ * read XMP tag from EXIF and expose its content in xml:XMP metadata domain
+ * CreateCopy(): add a warning when writing a non-CMYK 4-band dataset, and improve doc
+ * switch internal libjpeg internal memory allocator to default (malloc/free) (#3601)
 
-PNG Driver:
- - Fixed serious bugs with 16bit file support.
- - Added NODATA_VALUES to identify RGB sets that indicate a nodata pixel.
+LercLib (third_party):
+ * fix portability issue on non-Intel platforms
 
+MRF driver:
+ * Restore raw Lerc1 detection (#3109)
+ * Support LERC1 compression improvements with non-finite values (#3335)
 
-## OGR 1.3.1 - Overview of Changes
+netCDF driver:
+ * fix reading netCDF4/HDF5 files whose HDF5 signature is not at offset 0 (#3188)
+ * accept relative variations in X/longitude and Y/latitude spacing of up to 0.2% for float variables or 0.05% for double. Add a GDAL_NETCDF_IGNORE_EQUALLY_SPACED_XY_CHECK config option to ignore those checks if needed (#3244, #3663)
+ * open /vsimem/ files without requiring Linux userfaultfd mechanism
+ * Set scope for raster/vector-only options in driver metadata
+ * multidim: add a GROUP_BY=SAME_DIMENSION option to GetGroupNames()
+ * change the 'No UNIDATA NC_GLOBAL:Conventions attribute' from a warning to a debug message
 
-Reference Counting:
- - OGRSpatialReference and OGRFeatureDefn now honour reference counting
-   semantics.
- - Note that, especially for the OGRFeatureDefn, it is now critical that
-   all drivers be careful with reference counting.  Any OGR drivers not in
-   the core distribution will likely crash if not updated.
+NITF driver:
+ * Add support for SNIP TREs: CSRLSB, CSWRPB, RSMAPB, RSMDCB, RSMECB, SECURA and SNSPSB
+ * Add xml:DES metadata domain and DES creation option (#3153)
+ * Add support for ISO8859-1 fields in NITF TREs
 
-ESRI Personal Geodatabase Driver:
- - New driver implemented for ESRI Personal Geodatabase (.mdb) files.
- - Uses ODBC, enabled by default on win32.
+NWT_GRD driver:
+ * fix portability issue on non-Intel platforms
 
-ODBC Driver:
- - Updated to support binary fields.
- - Updated to support WKB geometry fields.
- - Updated to support DSN-less connections.
+OGCAPI driver:
+ * add missing Windows build support
+ * fixes to handle links without type, in the coverage code path (Rasdaman use case)
+ * fix when coverage uses a compoundCRS with a time component (#3665)
 
-S57 Driver:
- - Added support for Inland Waterways, and Additional Military Layers profiles
+PCIDSK driver:
+ * resynchronization of PCIDSK SDK with the internal repository maintained by PCI
+ * make GetMetadataItem() returns the same const char* for a given key (while SetMetadata/SetMetadataItem is not called)
 
-# GDAL 1.3.0 - Overview of Changes
+PDS4 driver:
+ * update value of <parsing_standard_id> for TIFF/BigTIFF to what is expected by PDS4 IM (#3362)
 
-Multithreading:
- - Lots of work done to implement support for multiple threads reading
-   from distinct GDALDataset objects at the same time.
+RMF driver:
+ * Better support for sparse files. Fill null tiles with NoData value.
+ * Fix portability issues on non-Intel platforms
 
-GDALRasterBand / Persistent Auxiliary Metadata (PAM):
- - Support for preserving a variety of metadata in a supporting XML file.
- - GDALRasterBand now supports "remembering" histograms, and has a concept
-   of the default histogram.
- - GDALRasterBand now supports remembering image statistics.
- - Disabled by default (set GDAL_PAM_ENABLED=YES to turn on).
- - Supported by *most* drivers with some caveats.
+TileDB driver:
+ * Add support for array versioning (#3293)
+ * do not try to identify /vsis3/ files ending with .tif
+ * add /vsigs/ support
 
-GDALCopyWords():
- - This function is a low level work horse for copying and converting pixel
-   data in GDAL.  It has been substantially optimized by Steve Soule (Vexcel).
+VRT driver:
+ * add a <UseMaskBand>true</UseMaskBand> element of <ComplexSource> to allow compositing of overlapping sources (#1148)
+ * AddBand() support BLOCKXSIZE and BLOCKYSIZE options; serialize/deserialize block size as attributes of VRTRasterBand element
+ * VRTPansharpenedDataset: fix crash when the spectral bands have no nodata value, but we have one declared in PansharpeningOptions, and when the VRTPansharpenedDataset exposes overviews (#3189)
+ * close sources at dataset closing (#3253)
 
-Next Generation Bindings:
- - Kevin Ruland and Howard Butler are working on reworked support for
-   SWIG to generate Python, PHP, Java, C# and other language bindings for GDAL
-   and OGR.
+WCS driver:
+ * fix memory leak in error code path (ossfuzz #28345)
 
-VB6 Bindings:
- - Now substantially complete, see VB6 directory.
+WMS driver:
+ * tWMS: improves usability with NASA GIBS services (#3463)
+ * properly deal with northing,easting ordered CRS in WMS 1.3.0 when using connection string being a GetMap URL request (#3191)
+ * add option to specify HTTP Accept header
+ * Use noDataValue on empty blocks (#3375)
+ * Let pass expected NoDataValue to MRF for reading data (#3388)
+ * Update default values for VirtualEarth minidriver
 
-HDF5 Driver:
- - New HDF5 driver implemented by Denis Nadeau.
+WMTS driver:
+ * Map CURLE_FILE_COULDNT_READ_FILE to 404 (#2941)
 
-RMF Driver:
- - New driver for Raster Matrix Format by Andrey Kislev.
+XYZ driver:
+ * support reading datasets organized by columns, such as the ones of https://www.opengeodata.nrw.de/produkte/geobasis/hm/dgm1_xyz/dgm1_xyz
 
-MSGN (Meteosat Second Generation Native) Driver:
- - New driver implemented by Frans van der Bergh.
+## OGR 3.3.0 - Overview of Changes
 
-VRT Driver:
- - Fixed whopper of a memory leak in warped raster case.
+Core:
+ * Add UUID string field subtype
+ * OGRFeature::GetFieldAsString() and GeoJSON output: do not output Float32 with excessive precision
+ * IsPolarToWGS84(): make detection of polar projections more specific
+ * OGR SQL: fix potential crash or incorrect result on multi column ORDER BY (#3249)
+ * Expose prepared geometry API to C and in SWIG bindings
+ * OGRGeometry::ExportToJson(): takes into account CRS and axis order to swap
+ * OGRShapeCreateCompoundCurve(): fix memory leak in error code path. (ossfuzz #28923)
+ * Add OGR_G_Normalize() and bind it to SWIG (#3506)
+ * OGRPoint: make it empty when x or y is NaN (refs #3542)
+ * Avoid SWIG generating exception on OGRGeometry::IsValid (#3578)
+ * OGRGeometry::exportToWkt(): rebustify implementation against out-of-memory, and make it slightly more efficient for some huge geometries
+ * OGRSimpleCurve: fix copy constructor / assignment operator of empty Z/M geometries in some cases
+ * OGRGeometry: make sure that the return type of clone() for all classes is their own type
+ * OGRGeometry: make getGeometryRef() in subclasses return a better type
+ * OGRGeometry: Handle WKB > 2 GB. Add OGR_G_WkbSizeEx() and OGR_G_CreateFromWkbEx()
+ * Add OGRSimpleCurve::removePoint()
 
-NetCDF Driver:
- - Preliminary CF conventions support by Denis Nadeau.
+OGRSpatialReference:
+ * Fix exportToWkt() after morphToESRI() on Geographic/Projected 3D CRS.
+ * GetEPSGGeogCS(): make it use database lookups if needed (and avoid misidentification of 'NAD83(CORS96)' for example
+ * exportToWKT(): add a ALLOW_ELLIPSOIDAL_HEIGHT_AS_VERTICAL_CRS=YES option to allow export of Geographic/Projected 3D CRS in WKT1_GDAL as CompoundCRS with a VerticalCRS being an ellipsoidal height (for LAS 1.4)
+ * Add OGRCoordinateTransformation::TransformWithErrorCodes() and OCTTransform4DWithErrorCodes() to get PROJ (>= 8) error codes
+ * Add OCTCoordinateTransformationOptionsSetDesiredAccuracy() and OCTCoordinateTransformationOptionsSetBallparkAllowed(), and map them to SWIG
+ * GetEPSGGeogCS(): fix when projected CRS can't be exported to WKT2
+ * SetFromUserInput() allow https:// when loading CRS from opengis.net (#3548)
+ * Add Get/Set for PROJ auxiliary database filenames (#3590)
+ * Delegate to PROJ (>= 8.1) import from OGC URN and URL (OSGeo/PROJ#2656)
 
-NITF Driver:
- - NITF files between 2 and 4 GB in size can now be read and written.
+Utilities:
+ * ogrinfo: report field domain type and add '-fielddomain name' switch
+ * ogr2ogr: add -emptyStrAsNull option
+ * ogr2ogr: add propagation of field domains
+ * ogr2ogr: add a -resolveDomains switch
 
-JPEG Driver:
- - Added support for reading EXIF as metadata by Denis Nadeau.
+AmigoCloud driver:
+ * Fix date/datetime field type handling.
+ * Fix json encoder to handle nested strings. (#3483)
+ * Fix SQL delete (#3512)
 
-DODS Driver:
- - Fixed up libdap 3.5.x compatibility.
+CAD driver:
+ * fixes for big endian hosts
 
-JP2ECW (JPEG2000 ECW SDK) Driver:
- - Implemented support for new GML-in-JPEG2000 specification.
- - Implemented support for old MSI "worldfile" box.
+DGN driver:
+ * avoid assert() in case of very low memory condition (ossfuzz #27006)
 
-JP2KAK (JPEG2000 Kakadu) Driver:
- - Implemented support for new GML-in-JPEG2000 specification.
- - Implemented support for old MSI "worldfile" box.
+DGN and DGNv8 driver:
+ * Support for reading User Data Linkage data (#3089)
 
-PCIDSK Driver:
- - tiled files now supported for reading.
- - overviews now supported for reading.
+DXF driver:
+ * Skip hatch polyline segments with one vertex
 
-HFA (Imagine) Driver:
- - Supports creating internal overviews in very large files.
- - Support reading class names.
- - Support creating compressed files.
+Elasticsearch driver:
+ * support WKT geo_shape encoding, and make GetExtent() use server-side query for geo_shape if ES >= 7.8 and XPack is installed
+ * fix GetFeatureCount() when SetAttributeFilter() is a ElasticSearch JSON filter
+ * add open options for timeouts and maximum number of features
 
-GeoTIFF Driver:
- - Support reading files with odd bit depths (i.e. 3, 12, etc).
- - Support 16/24bit floating point TIFFs (per Technote 3) (Andrey).
- - Support 12bit jpeg compressed imagery using libjpeg "MK1" library.
+FlatGeobuf driver:
+ * add editable capabilities
+ * fix crash when writing a geometry collection with an empty polygon (ossfuzz #29291)
+ * fix crash in GetFileList() on a dataset opened in update mode
+ * fix crash when writing features larger than 32 KB
 
-HDF4 Driver:
- - Added support for ASTER Level 1A, 1B and 2 products (Andrey).
+GeoPackage driver:
+ * Add support for GeoPackage 1.3 (creation still defaults to 1.2)
+ * Fix handling of invalid SRS ID (#3286)
+ * always write milliseconds in a DATETIME field for strict compliance with the spec (#3423)
+ * no longer create triggers on gpkg_metadata and gpkg_metadata_reference
+ * Take into account OGR_CURRENT_DATE config option in gpkg_metadata_reference table (fixes #3537)
+ * Remove creation support for data_type='aspatial' legacy tables
+ * fix update of gpkg_metadata_reference when renaming or dropping a column, and this table references it
 
-## OGR 1.3.0 - Overview of Changes
+GeoJSON driver:
+ * writer: avoid invalid .0 suffix to be added to numeric values like 1eXX (#3172)
+ * writer: avoid CPLDebug() messages when writing BBOX in RFC7946 mode
+ * reader: accept files starting with {"bbox":...,"features":[... (#1537)
+ * reader: fix opening of file containing a Feature object and starting with a large properties (fixes #3280)
 
-OGRGeometry:
- - WKT (and GML) encoding now attempts to preserve pretty much full double
-   precision.
- - geometries are now "coordinate dimension preserving" rather than dynamically
-   figuring out dimension depending on whether Z is set.  So a geometry can
-   now be 3D even if all z values are zero.
- - Fixed up proper EMPTY geometry support per standard.
+GML driver:
+ * fix layer extent with wrong axis order in some cases (#3091)
+ * recognize AIXM ElevatedSurface to be able to proper axis swapping (#3091)
+ * GML geometry parsing: handle km unit for radius of arcs (#3118)
+ * fix nullptr dereference on invalid GML (ossfuzz #28040)
 
-GRASS Driver:
- - New driver for GRASS 6 vector data written by Radim Blazek.
+LVBAG driver:
+ * Update to the new XSD schema (#3324)
+ * Minor fixes (#3467, #3462)
+ * Convert MultiPolygon to Polygon (#3581)
 
-Interlis Driver:
- - New driver for Swiss Interlis format from Permin Kalberer (SourcePole).
+MapInfo driver:
+ * Support for font and custom symbols (#3081)
+ * Explicitly set pen cap and join params for pen tools
 
-Shape Driver:
- - Fixed logic for degenerate polygons (Baumann Konstantin).
+NAS driver:
+ * don't skip prescan, if NAS_GFS_TEMPLATE is given, but still don't     write .gfs
 
-PostgreSQL/PostGIS Driver:
- - Implemented fast GetExtent() method (Oleg Semykin).
- - Implemented layer type from geometry_columns (Oleg Semykin).
- - Handle PostGIS 1.0 requirements for coordinate dimension exactness.
- - Handle EWKT type in PostGIS 1.0.
- - Generally PostGIS 0.x and 1.0 should now be supported fairly gracefully.
- - Added PostGIS "binary cursor" mode for faster geometry access.
+NGW driver:
+ * Add extensions support.
+ * Add alternative field name support.
 
-VRT Driver:
- - Pass through attribute queries to underlying driver.
- - Pass through spatial queries as attribute filters on the underlying layer.
+OAPIF driver:
+ * report url of STAC asset items
 
-S57 Driver:
- - Added concept of supporting different profiles.
- - Added prototype AML profile support.
+ODBC driver:
+ * Remove text trimming behavior
 
-MySQL Driver:
- - Fixed for FID recognition (eg. mediumint).
+PGeo driver:
+ * don't silently ignore rows with NULLs for Memo fields
 
-GML Driver:
- - Various fixes for generated GML correctness (Tom Kralidis).
+PostGIS driver:
+ * on reading, instantiate SRS from EPSG when possible instead of srtext to avoid axis order issues, and strip TOWGS84 on known datum (#3174)
+ * when detecting srid from table contents, ignore null geometries.
 
-TIGER/Line Driver:
- - Added Tiger 2004 support.
+Shapefile driver:
+ * writer: do not write coordinates with non-finite values (#3542)
 
-Oracle Driver:
- - Use VARCHAR2 for fixed size string fields.
- - Use OCI_FID config variable when creating layers, and reading select results
+SQLite driver:
+ * recognize col decltype 'INTEGER_OR_TEXT' as a string
+ * better detection of view column types
 
+SXF driver:
+ * fix reading on big-endian architectures
 
+WFS driver:
+ * fix CreateFeature() for WFS 2 (#3323). And for WFS 2, make CreateFeature() and SetFeature() use GML 3
 
-# GDAL 1.2.6 - Overview of Changes
+XLSX driver:
+ * fix read cells with inline formatting (#3729)
 
-gdal_translate:
- - Added -sds switch to copy all subdatasets.
+## SWIG Language Bindings
 
-gdalwarp:
- - Added Thin Plate Spline support (-tps switch).
+All bindings:
+ * avoid nullptr deref if providing some NULL arguments to gdal.Debug() and gdal.GOA2xxxxx() methods
+ * fix return type of Dataset.SetSpatialRef()
+ * fix expansion of ODsCRandomLayerWrite constant
+ * add missing GRA_Sum constant (#3724)
 
-GDALRasterBand:
- - Now uses two level block cache allowing efficient access to files
-   with a very large number of tiles.
- - Added support for YCbCr color space for raster band color interpretations.
- - Added AdviseRead() method - currently only used by ECW driver and OGDI
-   drivers.
+CSharp bindings:
+ * Replace ToInt32 calls with ToInt64 to prevent an ArithmeticException when executing against large images in a 64-bit context.
+ * Sign csharp assemblies as part of the netcore build process, verify signature during tests (#1368) (#3332)
+ * fix 'make' target on Linux/Mac
 
-ILWIS Driver:
- - New driver for the raster format of the ILWIS software.
+Java bindings:
+ * Add CoordinateTransformation.TransformPointWithErrorCode()
 
-ECW Driver:
- - Updated to use ECW SDK 3.1 (older ECW SDK no longer supported!)
+Python bindings:
+ * Add Dataset.WriteArray()
+ * Make Dataset.ReadRaster() and ReadAsArray() accept floating-point coordinates (#3101)
+ * Make methods such as WriteRaster() accept a bytearray object
+ * Return bytearray object as return of ReadRaster(), ReadBlock(), VSIFReadL(), MDArray.Read(), ...
+ * Add a band_list optional argument to Dataset.ReadAsArray()
+ * Make methods such as WriteRaster() accept any memoryview compatible of PyBUF_SIMPLE
+ * Make ogr.GetFieldAsBinary(), geom.ExportTo[Iso]Wkb() return a bytearray instead of a bytes object
+ * Make ReadRaster() and ReadBlock() accept an existing buf_obj buffer
+ * Make ReadAsArray(buf_obj = ar) fail if ar.flags.writable is False
+ * Make WriteRaster() accept a numpy array (when used without the buf_ overriders)
+ * Allow list or array types as input of MDArray.Write() for 1D arrays
+ * Prepare all samples scripts for reuse
+ * Add osgeo_utils.auxiliary submodules for auxiliary functions.
+ * [epsg_tr|esri2wkt|gcps2vec|gcps2wld|gdal_auth|gdalchksum|gdalident|gdalimport|mkgraticule].py - move undocumented untested utils to the `samples` subfolder where they belong
+ * Implement correct behavior for copy.copy() and copy.deepcopy() on a Geometry object (#3278)
+ * Add CoordinateTransformation.TransformPointWithErrorCode()
+ * Remove deprecated NumPy aliases for standard types.
+ * Better validation of Band.ReadAsArray() input shape (#3466)
+ * Dictionary typemap: accept key/value not being strings
+ * Add batch_creator.py, a Windows batch file creator
+ * Fix 'make generate' target on Unix builds (#3696)
 
-ECWJP2 Driver:
- - Added JPEG2000 support driver based on ECW/JPEG2000 SDK with a variety
-   of features.
+# GDAL/OGR 3.2.0 Release Notes
 
-NITF Driver:
- - Added support for reading *and* writing JPEG2000 compressed NITF files
-   using the ECW/JPEG2000 SDK.
- - Added ICHIPB support.
+## In a nutshell...
 
-HDF Driver:
- - Add support for georeferencing from some additional metadata formats.
- - Fixed bug with multi-band HDF-EOS datasets.
+ * New GDAL drivers:
+   - ESRIC: ESRI bundle cache read-only driver (#2663)
+   - HEIF: read-only driver for HEIF/HEIC file. Requires libheif
+   - OGCAPI: tiles/maps/coverage raster/vector experimental driver
+   - TGA: read/only driver to read TGA image file format
+ * New OGR drivers:
+   - LVBAG: read-only support for Dutch LVBAG/Kadaster 2.0 vector format
+ * New utilities:
+   - gdal_create: to create/initialize a new raster file
+ * Other improvements:
+   - Multi-threaded overview computation (if GDAL_NUM_THREADS set)
+   - COG driver: TILING_SCHEME creation option
+   - OpenFileGDB driver: add support for using spatial indexes
+   - BAG driver: multiple improvements
+   - FITS driver: multiple improvements (MEF and binary table support)
+   - NITF driver: support for SNIP TREs
+   - OGRFieldDefn: support UNIQUE constraint
+   - OGRFieldDefn: support a AlternativeName (alias) property (#2729)
+   - Python bindings: move implementation of scripts (except gdal2tiles) in osgeo.utils package to be reusable
+   - Faster GTIFF Deflate compression/decompression through libdeflate (if using internal libtiff or libtiff > 4.1.0)
+ * Removed functionality:
+   - Python bindings: old-style "import gdal" is no longer available. Use "from osgeo import gdal" instead
+   - API_PROXY mechanism: likely never used for real usage.
+   - Removal of GDAL and OGR ArcSDE drivers
 
-MrSID Driver:
- - Driver can now be built as a plugin on win32.
- - Split out MrSID 3.x SDK support - not readily buildable now.
- - Implemented accelerated IO cases for MrSID 4.x SDK.
- - Support for writing MrSID files added (improved?)
+## Backward compatibility issues
 
-Imagine Driver:
- - Fixed bug reading some large multiband Imagine files.
- - Added support for writing compressed files.
+See MIGRATION_GUIDE.txt
 
-Win32 Builds:
- - Added versioning information to GDAL DLL.
+## New installed files
 
-L1B Driver:
- - Only return a reduced grid of control points.
+ * data/tms_NZTM2000.json
+ * data/tms_LINZAntarticaMapTileGrid.json
+ * data/tms_MapML_APSTILE.json
+ * data/tms_MapML_CBMTILE.json
+ * data/template_tiles.mapml
 
-IDA (WinDisp4) Driver:
- - New read/write driver for the Image Display and Analysis raster format
-   used by WinDisp 4.
+## GDAL/OGR 3.2.0 - General Changes
 
-NDF (NLAPS) Driver:
- - Added NDF/NLAPS read driver for version 1 and 2.
+General:
+ * fix building against Jasper 2.0.19 and 2.0.21
+ * Add optional libdeflate dependency for faster Deflate compression/decompression
 
-MSG Driver:
- - Added support for the Metosat Second Generation raw file format.
+Build(Unix):
+ * GNUmakefile: split long line to avoid 32K character limitation on MSYS2
+ * configure: Configure proj dependencies before proj (#2512)
+ * configure. add $with_proj_extra_lib_for_test n LIBS when detecting PROJ when no path is specified (#2672)
+ * configure: fix CharLS 2.1 detection on case insensitive filesystems (#2710)
+ * configure: fix --with-hdf4 and --disable-all-optional-drivers (#2740)
+ * GNUmakefile: make 'all' target an alias of the default one to avoid potential double build of OGR objects (fixes #2777)
+ * configure: add ODA lib requirements to compile GDAL with ODA 2021 (#2812)
+ * configure: fix detection of minor version number of Poppler with the new YY.MM.X numbering scheme (#2823)
+ * configure: fix detection of Spatialite 5 build against PROJ >= 6 (#2826)
+ * configure: fix detection of libtiff and libjpeg on mingw (fixes #2881)
+ * configure: fix linking order for Informix libraries
+ * configure: support CharLS 2.1 on Debian as well. (#3083)
+ * configure: disable LERC on big-endian hosts, as it is not big-endian ready
+ * fix compilation issue of gdallinearsystem.cpp on Slackware 14.2 (#2883)
+ * Update scripts/gdal-bash-completion.sh
 
-GTiff Driver:
- - Added support for offset/scale being saved and loaded (special metadata).
- - Added Cylindrical Equal Area.
- - Added PROFILE creation option to limit extra tags.
+Build(Windows):
+ * nmake.opt: mention shell32.lib in PROJ_LIBRARY
+ * nmake.opt: Add a PYEXEC var to specify the python executable when building GDAL/bindings on Windows.
+ * nmake.opt: add hint about adding ole32.lib to PROJ_LIBRARY for PROJ 7.1 when static linking (#2743)
+ * only expand CPL_DLL to__declspec(dllexport) when building GDAL (shared configuration) (#2664)
+ * add missing Windows build support for EXR driver
+ * generate_vcxproj.bat: add vs2019 compatibility (#2676)
+ * fix build in AVC driver in VSIL_STRICT_ENFORCE mode
 
-PNG Driver:
- - Updated internal code for libpng to libpng 1.2.8.
+## GDAL 3.2.0 - Overview of Changes
 
-## OGR 1.2.6 - Overview of Changes
+Port:
+ * cpl_json.h: change the Type and PrettyFormat 'enum' to 'enum class', so that Double doesn't conflict with a C enum from OGDI include files
+ * cpl_json.h: add an iterator on array items, and fix const correctness of LoadUrl() method
+ * Add logging capabilities for /vsicurl, /vsis3 and the like. Add VSINetworkStatsGetAsSerializedJSON() and VSINetworkStatsReset(), CPL_VSIL_NETWORK_STATS_ENABLED and CPL_VSIL_SHOW_NETWORK_STATS config options
+ * /vsis3/ and other cloud file system: allow random-write access (for GTiff creation in particular) through temporary local file when CPL_VSIL_USE_TEMP_FILE_FOR_RANDOM_WRITE config option is set to YES
+ * /vsis3/: recognize AWS_PROFILE in addition to obsolete AWS_DEFAULT_PROFILE (#2470)
+ * /vsis3/: use IMDSv2 protocol to retrieve IAM role and credentials
+ * /vsis3/: add CPL_VSIS3_USE_BASE_RMDIR_RECURSIVE=YES for some S3-like APIs do not support DeleteObjects
+ * /vsis3/: additional retry on failures on write operations
+ * VSIS3FSHandler::SetFileMetadata(): fix memleak
+ * Improved AWS EC2 detection on Windows
+ * /vsicurl/: defer reading of CPL_VSIL_CURL_CHUNK_SIZE and CPL_VSIL_CURL_CACHE_SIZE config options until a /vsicurl/ access (or other network filesystem) is done
+ * /vsiaz/: do not consider directory absence as an error situation for Rmdir()
+ * /vsiaz/: fix OpenDir()/NextDirEntry() that returned S_IFDIR for regular files
+ * /vsiaz/: update to latest version of API (2019-12-12)
+ * /vsiaz/: add a AZURE_NO_SIGN_REQUEST=YES config option for unsigned public buckets and AZURE_SAS to provided Shared Access Signature. Both to be used with AZURE_STORAGE_ACCOUNT (#2766)
+ * /vsiaz/: ReadDir(): fix caching of file properties with space in the name
+ * VSISync(): implement chunking of large files for /vsiaz/ upload when CHUNK_SIZE and NUM_THREADS are set
+ * VSISync(): split large files on download/upload for /vsis3/ and /vsiaz/ (#2786)
+ * VSISync(): add a SYNC_STRATEGY=OVERWRITE to always overwrite target file
+ * RmdirRecursive(): use OpenDir() in recursive mode to have more efficient directory deletion on /vsiaz/ for example
+ * /vsimem/: fix normalization of slashes in filenames to avoid potential infinite loop in VSIDirGeneric::NextDirEntry()
+ * VSI plugin: add caching option (#2901)
+ * VSI plugin: add callback to explicitly list sibling files (#2980)
+ * CPLWorkerThreadPool: add capability to create several job queues
+ * CPLStrtodDelim(): recognize '1.#SNAN' as a NaN value
+ * CPLAtoGIntBigEx(): use strtoll() when available since POSIX doesn't guarantee atoll() will return ERANGE (and libmusl for example does not return it)
+ * CPLIsFilenameRelative(): treat "scheme://.." filenames as absolute
+ * Add GDAL_CURL_CA_BUNDLE environment variable (#3025)
+ * CPLHTTPFetch: fix reading FORM_FILE_PATH on Windows (#2971)
+ * Add CPLHTTP[Push|Pop]FetchCallback() and CPLHTTPSetFetchCallback() callback mechanisms to replace curl implementation (to be used by QGIS)
+ * VSI_CACHE: do not trust unreliable file size from underlying layer as in fixes #3006
+ * CPLMultiPerformWait(): use curl_multi_poll() for curl >= 7.66
 
-OGRSFDriverRegistrar:
- - Added support for autoloading plugin drivers from ogr_<driver>.so.
+Core:
+ * Overview building: add multi-threading of resampling computations when GDAL_NUM_THREADS config option is set
+ * add a TileMatrixSet class to parse OGC Two Dimensional Tile Matrix Set 17-083r2 JSON encoded definitions, and add NZTM2000 and LINZAntarticaMapTileGrid definitions
+ * Add GDALAutoCreateWarpedVRTEx function to GDAL API to accept extra options for transformer (#2565)
+ * add a global thread pool mechanism
+ * GDALDataset::IRasterIO(): Fixes wrong IO of subpixel shifted window (#2057)
+ * GDALDriver::QuietDelete(): partially revert 3.1 commit f60392c8
+ * gdal_priv.h: export EXIFExtractMetadata() for plugin uses
+ * DumpJPK2CodeStream(): fix reported offset of EOC marker when PSOT = 0 (#2724)
+ * Overview generation: fix progress percentage when using USE_RRD=YES (#2722)
+ * reader_geo_eye.cpp and reader_pleiades.cpp: avoid potential issue with overuse of per-thread CPLPath static buffers
+ * GDALDataset::IRasterIO(): make it try overviews when non-nearest resampling is done before doing RasterIOResampled() on full resolution dataset
+ * Workaround issue with UTF-8 precomposed vs decomposed encodings on MacOS filesystems that affect sidecar file discovery (#2903)
+ * GDALBuildVRT(): add support for sources such as MEM dataset or non-materialized VRT files
+ * GDALDataset::BlockBasedRasterIO(): make it take into account floating-point window coordinates, as GDALRasterBand::IRasterIO() generic case does  (#3101)
 
-ogr.py:
- - Geometry, and Feature now take care of their own reference counting and
-   will delete themselves when unreferenced.  Care must still be taken to
-   unreference all features before destroying the corresponding
-   layer/datasource.
- - ogr.Feature fields can now be fetched and set directly as attributes.
- - Geometry constructor can now take various formats (wkt, gml, and wkb).
- - Added docstrings.
- - Added better __str__ methods on several objects.
- - Various other improvements.
+Multidim API:
+ * GetMask(): use underlying parent data type as much as possible, instead of double, to avoid potential performance issues
+ * GetMask(): optimize when we know the mask is always at 1, and when output buffer is contiguous Byte
+ * Add GDALGroupOpenMDArrayFromFullname() and GDALGroupOpenGroupFromFullname(), and exose them to SWIG (#2790)
+ * Add GDALGroup::ResolveMDArray() and map it to C and SWIG
+ * Add GDALMDArrayGetStatistics(), GDALMDArrayComputeStatistics() and GDALDatasetClearStatistics()
+ * Make sliced and transpose arrays access the attributes of their source array
+ * add GDALMDArrayAdviseRead() and implement it in netCDF driver for DAP datasets
 
-OGRLayer:
- - Re-wrote generic spatial search support to be faster in case of rectangular
-   filters.
- - Intersects() method now really uses GEOS.  This also affects all OGR
-   layer spatial filtering (with non-rectangular filters).
- - Added SetNextByIndex() method on OGRLayer.
+Algorithms:
+ * Warper/transformer: avoid error about invalid latitude when warping a dataset in Geographic CRS whose north/south lat is > 90deg (#2535)
+ * Warper: use gcore global thread pool when doing multithreaded operations
+ * Warper: fix average resampling that lead to very wrong results in some circumstances (#2665) (3.1.0 regression)
+ * Warper: ComputeSourceWindow(): modify extra source pixel computation in anti-meridian warping situations
+ * Warper: fix computation of kernel resampling width when wrapping across the antimeridian
+ * Warper: emit error message instead of assertion if cutline is not a (multi)polygon (#3037)
+ * RPC transformer: Add RPC_DEM_SRS option to override SRS of RPC_DEM. (#2680)
+ * TPS transformer: fix handling of duplicated GCPs (fixes #2917)
+ * Polygonize: make sure not to use dummy geotransform
 
-OGRSpatialReference:
- - Automatically generate +towgs84 from EPSG tables when translating to
-   PROJ.4 if available and TOWGS84 not specified in source WKT.
- - Updated GML CRS translation to follow OGC 05-011 more closely.  Still
-   incomplete but operational for some projections.
- - Added support for FIPSZONE State Plane processing for old ESRI .prjs.
- - Added Goode Homolosine support.
- - Added GEOS (Geostationary Satellite) support.
+Utilities:
+ * gdalinfo, gdal_translate, gdalwarp: add a -if switch to be able to specify input driver(s) (#2641)
+ * gdalinfo: json output: report nan/inf values as a string instead of invalid JSON
+ * gdalinfo: json output: do not escape forward slash
+ * gdal_translate (and GTiff driver): copy XMP metadata unless -noxmp is specified (#3050)
+ * gdal_viewshed: adjust computation of observer position (#2599)
+ * gdaldem: ignore 'nv' entry in color file if there is no nodata value in input file
+ * gdalwarp: fix crash if warping a dataset without source or target CRS when -ct is specified (#2675)
+ * gdalwarp: improve logic for selecting input overview when target bounds and resolution are specified
+ * gdalwarp: better guess of target resolution when target extent is specified (#2754)
+ * gdalbuildvrt: for easier understanding, and replicate gdal_translate -of VRT behavior, clamp xSize/ySize of SrcRect/DstRect if outside raster dimensions. Not a fix per se
+ * gdalbuildvrt: add support for automatically declaring virtual overviews in very restricted situations
+ * gdalbuildvrt: fix -srcnodata / -vrtnodata handling in -separate mode (#2978)
+ * gdal_grid: Addition of -tr option (#2839)
+ * gdal_contour: major speed up in polygon mode (#2908)
+ * gdal2tiles: make general cmd line switches like --formats work without exception (#2522)
+ * gdal2tiles: fix issue in nativezoom computation with --profile=raster on a raster whose size is below the tile size
+ * gdal2tiles: fix --xyz with -p raster, fix KML generation with --xyz (#2463) and update OpenLayers export to OpenLayers 6.3.1
+ * gdal2tiles: add -w mapml output, and possibilities to use custom tiling scheme / profile
+ * gdal2tiles.py: fix generation of tiles at high zoom levels when input is small (#2896)
+ * gdal2tiles.py: make sure configuration options specified with --config are passed to worker processes (#2950)
+ * gdal2tiles.py: fix --profile=raster on a non-georeferenced image (#2998)
+ * gdal2tiles: change from cdn.leafletjs.com to unpkg.com for leaflet .css and .js (#3084)
+ * gdal_merge.py: fix rounding of source coordinates, when they are very close to an integer, which would otherwise result in a one-pixel shift
+ * gdal_calc: support multiple calc arguments to produce a multiband file (#3003)
+ * gdal_calc.py: raise exception in case of I/O error. Fixes QGIS #36867
+ * gdal_sieve.py: do not write geotransform to the target if the source doesn't have one (#2830)
+ * gdalcompare.py - export def find_diff(golden_file, new_file, check_sds=False) into a function for reuse
+ * gdalcompare.py: fix floor division in Python 3
+ * validate_cloud_optimized_geotiff.py: update to support SPARSE_OK=YES files
 
-OCI (Oracle) Driver:
- - Added GEOMETRY_NAME creation option to control the name of the field to
-   hold the geometry.
+Multi driver changes:
+ * Driver metadata: fix XML errors in option declarations and add testing (#2656)
+ * JPEG2000 drivers: extent signature for JPEG2000 codestream to avoid false positive detections.
 
-PostGIS Driver:
- - Fixed some problems with truncation for integer and float list fields.
+LERC:
+ * Fixed a bug in Lerc2 decoder (https://github.com/Esri/lerc/pull/129)
+ * Fixed a bug in Lerc1 decoder (https://github.com/Esri/lerc/pull/121)
 
-Shapefile Driver:
- - Added support for MapServer style spatial index (.qix).
+AAIGrid:
+ * mention dataset name in errors (#3051)
 
-GML Driver:
- - Improved support for 3L0 (GML 3 - Level 0 profile) reading and writing.
-   On read we can now use the .xsd instead of needing to build a .gfs file.
+BAG driver:
+ * add support for reading georeferenced metadata
+ * remove support for interpolated resampled raster
+ * add support for COUNT VALUE_POPULATION strategy
+ * support reading other single resolution layers on the root node
+ * add support for Create()/warp operation
+ * add support for reading the tracking list (with OGR API)
+ * fix reporting of vertical CRS
+ * fix missing nodes at right and top edges of supergrids in resampling mode (#2737)
+ * allow it to be used in multidimensional mode through the generic HDF5 driver
+ * fix for big endian arch
+ * avoid crash on non-standard dataset
 
+COG driver:
+ * add support for using custom TILING_SCHEME using OGC 17-083r2 JSON encoded definitions
+ * add ZOOM_LEVEL_STRATEGY creation option
+ * add WARP_RESAMPLING and OVERVIEW_RESAMPLING to override general RESAMPLING option (#2671)
+ * write information about tiling scheme in a TILING_SCHEME metadata domain
+ * add a SPARSE_OK=YES option to create sparse files
+ * TIFF/COG: report content of the header ghost area in metadata
+ * skip reprojection when source dataset matches reprojection specifications
+ * fix rounding issue when computing overview dimensions
+ * fix crash if passing an invalid (warp) resampling
+ * fix crash when source dataset is non-Byte/non-UInt16 with a color table (fixes #2946)
 
-# GDAL 1.2.5 - Overview of Changes
+DIMAP driver:
+ * fix loading when R1C1 tile is not present (#2999)
 
-gdalwarp Utility:
- - Added "proper" source and destination alpha support.
+DTED driver:
+ * add support for EGM08 for dted metadata "E08" (#3047)
 
-PCRaster Driver:
- - added write support, now consider ready for regular use.
+E00grid driver:
+ * avoid recursive call in _GetNextSourceChar(). Fixes ossfuzz#25161
 
-MrSID Driver:
- - Initial support for writing to MrSID with encoding SDK.
+ECW driver:
+ * fix related to network files with SDK >= 5.5 (#2652)
 
-GeoTIFF Driver:
- - Updated internal copy of libtiff to fix overview building ... really!
- - Fixed bug when writing south-up images.
+ENVI driver:
+ * write nodata value in 'data ignore value' header field
+ * add support for writing south-up / rotation=180 datasets
 
-## OGR 1.2.5 - Overview of Changes
+FIT driver:
+ * reject negative value PAGESIZE creation option (ossfuzz#26596)
 
-OGRSpatialReference:
- - Added Bonne projection.
+FITS driver:
+ * add support for reading multiple-extension FITS files through subdatasets
+ * add support for reading binary tables
+ * initialize default geotransform
+ * do not emit error if no georeferencing is found
 
-Docs:
- - Added OGR C++ API Tutorial (reading and writing).
+GPKG driver:
+ * perf improvement: when inserting more than 100 features in a transaction in an existing layer, switch to a deferred insertion strategy for spatial index entries
+ * on reading of gridded coverage data with PNG tiles, select -FLT_MAX as the nodata value (#2857)
+ * add support for using custom TILING_SCHEME using OGC 17-083r2 JSON encoded definitions
+ * increase limitation of number of tables to 10000, and make it configurable through OGR_TABLE_LIMIT config option as for vector tables
+ * more robust and simple logic to build overviews and compute overview factor (#2858)
+ * make ST_Transform() fallback to EPSG code when no SRS with the given srs_id can be found in gpkg_spatial_ref_sys
+ * CreateSpatialIndex(): slight optimization by bumping batches to 500K features
+ * make SELECT DisableSpatialIndex(...) run faster
+ * fix when writing a tile with uniform negative values or values > 65535 (when nodata is set) in PNG tiles (#3044)
+ * fix GDAL 3.0 regression regarding some update scenarios (#2325)
 
-PostGIS Driver:
- - Implemented SetFeature() and DeleteFeature() methods for in-place updates.
+GRASS driver:
+ * simplified to GRASS GIS 7+ only (#2945)
+ * fix reading GRASS groups (#2876)
 
-Oracle (OCI) Driver:
- - Fixed support for writing into Oracle 10g.
- - Fixed serious memory leak of geometries.
- - Fixed bug with 3D multipolygons.
- - Added support for selecting tables in the datasource name.
+GRIB driver:
+ * correctly report PDS template number for messages with subgrids (#3004)
+ * avoid rejecting valid product due to security check
+ * fix retrieval of nodata value for GRIB1 products (GDAL 3.1 regression, #2962)
+ * fix reading subfields reusing the bitmap of a previous one (GDAL 3.1 regression,  #3099)
+ * Degrib g2clib: rename symbols of our internal modified copy (#2775)
 
+GTiff driver:
+ * add read support for overviews/masks referenced through TIFFTAG_SUBIFD (#1690)
+ * add WEBP_LEVEL_OVERVIEW config option to set WebP compression level on overviews
+ * fix wrong direction for half-pixel shift with GCPs and PixelIsPoint convention
+ * for Geodetic TIFF grids (GTG), report the 'grid_name' metadata item in the subdataset description
+ * fix reading/writing GEO_METADATA TIFF tag on big-endian
+ * fix importing WGS_1984_Web_Mercator / ESRI:102113 (#2560)
+ * use gcore global thread pool when doing multithreaded operations
+ * allow multi-threaded JPEG compression. This can help a bit
+ * fix potential crash when generating degenerate 1x1 overviews
+ * in CreateCopy() mode, avoid closing and re-opening the file handle
+ * add earlier check to bail out when attempting JPEG compression with paletted image
+ * LERC codec: do not write TIFFTAG_LERC_PARAMETERS several times as it cause spurious directory rewrites, and breaks for example COG creation
+ * LERC codec: fix encoding of datasets with NaN values (#3055)
+ * SRS reader: interpret infinite value in GeogInvFlatteningGeoKey as 0 (fixes PROJ #2317)
+ * support hidden SHIFT_ORIGIN_IN_MINUS_180_PLUS_180=YES open option used by GDALOpenVerticalShiftGrid()
+ * Internal libtiff: updated to latest upstream master version
+ * Internal libgeotiff: updated to latest upstream master version
 
-# GDAL 1.2.4 - Overview of Changes
+HDF4 driver:
+ * do not report SDS when there are EOS_SWATH or EOS_GRID in it. Add LIST_SDS open option
+ * multidim: fix issue when reading transposed array, and duplicate attribute names (#2848)
 
-gdalwarp:
-  - Fixed some issues with only partially transformable regions.
-  - Added Alpha mask generation support (-dstalpha switch).
+HDF5 driver:
+ * add support for new 'CSK 2nd generation' (CSG) (#2930)
+ * multidim: fixes for big endian host
+ * multidim: fix performance issue when reading from sliced array
 
-HFA/Imagine Driver:
-  - bug fix in histogram handling.
-  - improved support for large colormaps.
+HFA driver:
+ * do not report TOWGS84 when reading SRS with WGS84, NAD27 or NAD83 datums (unless OSR_STRIP_TOWGS84 config option is set to NO) (fixes QGIS #36837)
 
-Envi Driver:
-  - Capture category names and colormaps when reading.
+ISCE driver:
+ * avoid crashing division by zero on corrupted datasets. Fixes ossfuzz#24252
 
-SAR CEOS Driver:
-  - Added support for PALSAR/ALOS Polarimetric Datasets.
+ISIS3 driver:
+ * make sure that in-line label size is at least 65536 bytes (#2741)
 
-RadarSat 2 Driver:
-  - New.  Reads RadarSat 2 Polarimetric datasets with a "product.xml" and
-    imagery in TIFF files.
+JP2KAK driver:
+ * add ORGtparts creation option
 
-OGDI Driver:
-  - Important bug fix for downsampled access.
+JP2OpenJPEG driver:
+ * add support for generating files with PLT marker segments (OpenJPEG > 2.3.1)
+ * add support to enable multi-threaded encoded (OpenJPEG > 2.3.1)
+ * writer: acquire input data in background thread
+ * fix reading overviews on Sentinel2 PVI files (343x343 size, with 8x8 tiles) (#2984)
 
-GeoTIFF Driver:
-  - Lots of libtiff upgrades, including some quite serious bug fixes.
-  - Added better support for 16bit colormaps.
-  - Write projection information even if we don't have a geotransform or GCPs.
-  - Improved alpha support.
-  - Generate graceful error message for BigTIFF files.
+LCP driver:
+ * add extension checking in Identify() (#2641)
 
-DODS Driver:
-  - Almost completely reimplemented.   Uses chunk-by-chunk access.  Supports
-    reading several bands from separate objects.  Some new limitations too.
+MRF driver:
+ * add support for interleaved LERC (#2846)
+ * LERC V1 support for NaN and other bug fixes (#2891)
+ * missing data return on initial caching of nodata tiles (#2913)
+ * Fixes for Create() (#2923)
 
-NetCDF Driver:
-  - Separated out a GMT NetCDF driver and a more generic but partially broken
-    NetCDF driver (Radim).
+NetCDF driver:
+ * GrowDim(): fix issue with non-ASCII filename on Windows
+ * fix setting offset and scale in CreateCopy()
+ * allow a NETCDF:http://example.com/my.nc DAP dataset to be opened
+ * multidim: fix performance issue when reading from sliced array
+ * multidim: optimize reading into a data type 'larger' than the native one
+ * multidim: identify the indexing variable of a dimension through the 'coordinates' attribute of other variables (#2805)
+ * multidim: add CHECKSUM and FILTER creation options. Make SetRawNoDataValue() use nc_def_var_fill()
+ * multidim: fix retrieval of missing_attribute, etc... when reading mask
 
-JP2KAK Driver:
-  - Added alpha support, including greyscale+alpha.
+NITF driver:
+ * add support for various TREs for Spectral NITF Implementation Profile (SNIP): MATESA, GRDPSB, BANDSB, ACCHZB, ACCVTB, MSTGTA, PIATGB, PIXQLA, PIXMTA, CSEXRB, ILLUMB, CSRLSB, CSWRPB
+ * Add nested variable support in xml:TRE
 
-AirSAR Driver:
-  - New, reads AirSAR Polarimetric Radar format.
+PAux driver:
+ * avoid ingesting large binary unrelated files (found when investigating #2722)
 
-## OGR 1.2.4 - Overview of Changes
+PCRaster driver:
+ * fix Create() mode by propagating eAccess = GA_Update (#2948)
 
-epsg_tr.py:
-  - Added escaping rules when generating PostGIS output.
+PDF driver:
+ * update to pdfium/4272 with https://github.com/rouault/pdfium_build_gdal_3_2
 
-tigerpoly.py:
-  - Discard dangles and degenerate rings.
+PDS driver:
+ * take into account FIRST_STANDARD_PARALLEL for Mercator projection (#2490)
 
-VRT Driver:
-  - Fixed serious error in handling cleanup of VRT datasources, was often
-   causing a crash.
+RMF driver:
+ * Better support for sparse files. Fill null tiles with NoData value.
 
-SQLLite Driver:
-  - Fixed substantial memory leaks.
+RS2 driver:
+ * remove support for CharLS compression since it is removed from upstream librasterlite2
 
-MySQL Driver:
-  - New readonly non-spatial MySQL driver implemented.
+SAFE driver:
+ * deal correctly with WV swaths (#2843)
 
-MITAB Driver:
-  - Updated from upstream, several fixes.
+TileDB driver:
+ * support for pixel interleave and single formats (#2703)
 
-TIGER/Line Driver:
-  - Fixed serious bug with handling "full" records at end of .RT2 file.
+TSX driver:
+ * fix issue with reading dataset in .zip file on Windows (#2814)
 
-OCI/Oracle Driver:
-  - Added OCI_FID environment support to control FID selection.
+VICAR driver:
+ * fix for Basic compression and non-Byte type on big endian host
+ * avoid potential null-dereference on corrupted dataset. Fixes ossfuzz#24254
 
-OGRGeometry:
-  - Added Centroid() implementation (from GEOS?)
+VRT driver:
+ * Add support for explicit virtual overviews. Can be built with gdaladdo --config VRT_VIRTUAL_OVERVIEW YES (#2955)
+ * VRTDataset::IRasterIO(): allow source overviews to be used when non-nearest resampling is used, and the VRT bands don't expose overviews (#2911)
+ * fix VRTRasterBand nodata handling when creating implicit overviews (#2920)
+ * round src/dst coordinates to integer within 1e-3 margin
+ * prevent potential infinite recursion in VRTDataset::IRasterIO()
 
-# GDAL 1.2.3 - Overview of Changes
+WMS driver:
+ * Add a GDAL_MAX_CONNECTIONS config option
+ * WMS cache: add a <CleanTimeout> in <Cache> XML configuration (#2966)
 
-GeoTIFF Driver:
-    - Fixed many missing compression codecs when built with the internal
-      libtiff.
-    - Modified driver metadata to only list available compression types.
+WMTS driver:
+ * Add support for DataType tag in service description XML (#2794)
 
-DODS Driver:
-    - Added support for OPeNDAP version after 3.4.x (use of opendap-config).
+## OGR 3.2.0 - Overview of Changes
 
-GRASS Driver:
-    - Fixed support for building with grass57.
+Core:
+ * Add unique constraints to OGRFieldDefn in core, GML, PG, PGDump, GPKG, SQLite and VRT drivers (#2622)
+ * Add support for field AlternativeName to OGRFieldDefn, read alias in openfilegdb driver (#2729)
+ * Add GDALDataset::AbortSQL (#2953)
+ * OGRFeature::GetFieldAsString(): remove 80 character limitation when formatting string/integer/real lists (#2661)
+ * Add OGRLayerUniquePtr and OGRExpatUniquePtr aliases (#2635)
+ * OGRSQL: take into account second part of arithmetic expression to correctly infer
+ result type.
+ * OGRSQL: support constructs 'A AND B AND C ... AND N' with many successive AND ((#2989)
+ * OGRSQL: Fixed buffer overflow in BuildParseInfo for SQL query when joining multiple tables that each have implicit FID columns.
+ * ogr_geometry.h: export OGRWktOptions class (#2576)
+ * ogr_swq.h: type nOperation as swq_op
 
-MrSID Driver:
-    - Fixed support for MrSID Encoding SDK.
+OGRSpatialReference:
+ * Make GetAuthorityCode('PROJCS') work on a WKT1 COMPD_CS with a VERT_DATUM type = 2002 (Ellipsoid height)
+ * Make OSRGetPROJSearchPaths() return the value set by OSRSetPROJSearchPaths()
+ * exportToProj4(): make it add +geoidgrids= when possible (needs PROJ 7.2)
+ * Add OSRDemoteTo2D() and expose it to SWIG
+ * fix GetUTMZone() to work on 3D projected CRS
+ * exportToWkt(): accept FORMAT=WKT2_2019 (alias of WKT2_2018)
+ * fixes to avoid crashes with datum ensemble objects (needs PROJ 7.2)
+ * Avoid warnings in GetProjTLSContextHolder() when PROJ resource path is not already set (PROJ #2242)
+ * ogr_proj_p.cpp: make sure init() is called in OSRPJContextHolder() constructor to avoid potential use of default NULL PROJ context (#2691)
+ * fix issue with PROJ context and OSRCleanup() (#2744)
+ * Fix exportToWkt() after morphToESRI() on Geographic/Projected 3D CRS. But only works with PROJ 7.2
 
-NITF Driver:
-    - Fixed serious bug with non-square output files.
+Utilities:
+ * ogrinfo: report field unique constraint
+ * ogrinfo: report field alternative name
+ * ogrinfo: report SUBDATASETS domain
+ * ogrinfo/ogr2ogr: fix issues with -sql @filename where SQL comments are not at start of line (#2811)
+ * ogr2ogr: bump default value of -gt to 100 000
 
+Multi driver changes:
+ * Avoid copy&paste implementations of GetNextFeature() relying on GetNextRawFeature() through OGRGetNextFeatureThroughRaw class
+ * make sure GetNextFeature() always return nullptr after the first time it did (ie no implicit ResetReading()) in GPKG, SQLite, PCIDSK, MSSQLSpatial and MySQL driver
+ * better support for layers with field names differing by case in OGR SQL, SQL SQLite and VRT
 
-## OGR 1.2.3 - Overview of Changes
+CSV driver:
+ * do not try to read .csvt if CSV filename has no extension (#3006)
 
-OGRSpatialReference:
-    - Corrected memory leaks - OSRCleanup() cleans up temporary tables.
-    - Fixed build problem with ogrct.cpp on Solaris.
+DXF driver:
+ * Propagate PaperSpace field from INSERTs to subfeatures
+ * Fix wrong transformer composition for ASM entities
+ * do not rely on tail recursion and avoid potential big stack calls when eliminated 999 comment lines. Fixes ossfuzz#22668
 
-TIGER Driver:
-    - Improved generality of support for GDT files.
+Elasticsearch driver:
+ * make OVERWRITE_INDEX=YES work properly by re-creating the index afterwards
 
-OGRGeometry:
-    - Added getArea() method for rings, polygons and multipolygons.
+ESRIJSON driver:
+ * fix GetFeatureCount() and GetExtent()
 
+FileGDB/OpenFileGDB drivers:
+ * qualify DateTime values with UTC timezone when <IsTimeInUTC>true</IsTimeInUTC> is present in layer metadata (#2719)
 
-# GDAL 1.2.2 - Overview of Changes
+FileGDB driver:
+ * generate layer definition XML with HasSpatialIndex=true to better reflect reality.
+ * add support for reading and writing field alternative names
+ * simplify spatial filtering, and apply full intersection in GetFeatureCount() instead of BBOX one, so as to be similar to OpenFileGDB
 
-GRASS Driver:
-    - Add Radim's version of the driver submitted by Radim.  This version
-      uses GRASS 5.7 libraries directly instead of using libgrass.
+FlatGeoBuf driver:
+ * Metadata extensions (#2929)
+ * fix illegal use of std::vector (#2773)
+ * make GetExtent() work on feature write (#2874)
 
-DODS Driver:
-    - Added support for spatial_ref, FlipX and FlipY .das info.
+GeoJSON driver:
+ * fix opening of file starting with {"coordinates" (#2720)
+ * fix opening of file starting with {"geometry":{"coordinates" (#2787)
+ * RFC7946 writer: fix processing of geometry that covers the whole world (#2833)
+ * writer: use JSON_C_TO_STRING_NOSLASHESCAPE when available to avoid escaping forward slash, and very partial resync of internal libjson-c to get it
 
-CPG Driver:
-    - added new driver for Convair Polarimetric format.
+GML driver:
+ * add a WRITE_GFS=AUTO/YES/NO open option (#2982)
+ * writer: correctly format OFTDate and OFTDateTime fields (#2897)
+ * hugefileresolver: add missing xmlns:xlink to make Xerces parser happy
+ * fix typo in VFR GFS files BonitovaneDilRizeniId -> BonitovanyDilRizeniId (#2685)
+ * when encountering XML issue, defer emission of error message until we return a NULL feature, so as to avoid to confuse ogr2ogr (#2730)
+ * XSD parser: recognized unsignedLong data type
+ * avoid 'Destination buffer too small' error to be emitted on /vsicurl_streaming/ URLs with filters coming from the WFS driver
+ * fix layer extent with wrong axis order in some cases (#3091)
+ * recognize AIXM ElevatedSurface to be able to proper axis swapping (#3091)
 
-HDF Driver:
-    - Significant bugs fixed.
+GMLAS driver:
+ * avoid running out of file descriptors in case of big number of layers
+ * fix so as to get same unique ids on big-endian arch
 
-USGS DEM Driver:
-    - Support writing UTM projected files.
+GPKG driver:
+ * add a PRELUDE_STATEMENTS open option that can be used for example to attach other databases
+ * add a DATETIME_FORMAT=WITH_TZ/UTC dataset creation option (defaults to WITH_TZ) to specify how to deal with non-UTC datetime values (#2898)
+ * hide view "geometry_columns"
+ * fix wrong RTree _update3 trigger on existing files (QGIS #36935)
 
-PNG Driver:
-    - Upgraded to libpng 1.2.6.
+GRASS driver:
+ * simplified to GRASS GIS 7+ only (#2945)
 
-MrSID Driver:
-    - Substantial performance improvements.
-    - Support for DSDK 4.x
-    - Support JPEG2000 files via MrSID SDK.
+GTM driver:
+ * on write, do not consider TZFlag=1 (localtime) as a timezone value (refs #2696)
+ * on write, take into correctly timezone value to convert to UTC (refs #2696)
 
-NITF Driver:
-    - Support JPEG2000 compressed files (with Kakadu support)
+LIBKML driver:
+ * do not advertise RandomWrite capability (unless on a update layer, when datasource is created with UPDATE_TARGETHREF creation option) (fixes QGIS 39087)
 
-ESRI BIL:
-    - Support .clr color files.
+MDB driver:
+ * fix warning when parsing 'false' boolean value
 
-VRT Driver:
-    - Added support for describing raw files with VRTRawRasterBand.
-    - Added support for virtual warped files with VRTWarpedRasterBand.
+MITAB driver:
+ * fix reading and writing of Transverse Mercator projections based on KKJ
+ * .tab: fix writing empty/null Time fields (#2612)
+ * fix reading and writing of non-metre linear units
+ * Support for font and custom symbols in mitab (#3081)
 
-GeoTIFF Driver:
-    - Fix support for 16bit image color tables.
-    - Write ExtraSamples tag for files with more samples than expected
-      in photometric interpretation.
-    - External overviews now built for read-only files.
+MVT driver:
+ * fix 'random' failures in test_ogr_mvt_point_polygon_clip() by sorting sub-directory names, and also revise logic to attribute FID when reading directories (#2566)
+ * writing: fix crashes in multi-threading mode (#2764)
 
-Erdas Imagine Driver:
-    - Fixed support for compressed floating point layers.
-    - Various other fixes for compatible with newer Imagine versions.
-    - improved metadata handling.
+NAS driver:
+ * add support for new GID7 updates
+ * also filter for wfs:member (as in GID7)
+ * do not try to write a .gfs file when NAS_GFS_TEMPLATE is specified
 
-gdal_merge.py:
-    - sets projection on output file.
+netCDF driver:
+ * simple geometries: fix for big-endian
 
-## OGR 1.2.2 - Overview of Changes
+OAPIF driver:
+ * avoid re-adding user query parameters if they are found in URLs returned by the API (#2873)
+ * do not list raster or coverage collections
+ * support opening of a collection when its URL is non-standard such as in MOAW workflows
+ * fix memory leak when reading schema from .xsd
 
-SQLite Driver:
-    - New read/write driver implemented for SQLite databases.
+ODBC driver:
+ * Allow mdb files to be opened with the generic ODBC driver on non-windows platforms
+ * Fix w.r.t fallback to alternative Access ODBC driver name
+ * Fix DSN string construction for Windows Access ODBC driver, template candidate preference order (#2878)
+ * Correctly handle datetime fields provided by the mdbtools ODBC driver
+ * Read MS Access databases with ACCDB and STYLE extensions (#2880)
 
-CSV Driver:
-    - New read/write driver implemented for comma separated value files.
+OCI driver:
+ * fix server 12.2 version detection
 
-S-57 Driver:
-    - Substantial performance improvements.
+ODS driver:
+ * do not create files with Zip64 extension, to avoid compatibility issue with LibreOffice Calc
+ * avoid potential deep call stack in formula evaluation. Fixes ossfuzz#22237
 
-ODBC Driver:
-    - Arbitrary length field values now supported.
+OpenFileGDB driver:
+ * add support for reading .spx spatial index file
+ * more reliable .gdbtable header reading
 
-GEOS:
-    - Integration a series of methods utilizing GEOS when available.  Note
-      that Intersect() is still just an envelope comparison.
+OSM driver:
+ * remove limitation to 10000 nodes per way (#849)
+ * Replace hard-coded tag filter with variable
+ * Optionally disable early tag filtering
+ * Don't filter out explicit attributes (#2603)
 
-OGRSpatialReference:
-    - Fixed Swiss Oblique Mercator support.
+PDF driver:
+ * write correctly attribute object dictionary when there is no field to write, and read back correctly broken files we generated before (#2624)
 
-===========================================================================
+PDS4 driver:
+ * fix potential double free if RenameFileTo() fails
 
-# GDAL 1.2.1 - Overview of Changes
+PGeo driver:
+ * Quote DBQ value in PGEO driver template to avoid issues opening MDB paths with spaces
+ * Fixes to automatic ODBC driver installation (#2838)
+ * Read non-spatial tables (#2889)
 
-gdal_contour:
-    - Now build and installed by default.
+PG driver:
+ * Make ogr2ogr -f PostgreSQL work when using PG:service= syntax (actually a workaround in GDALDriver::Create())
+ * take into potential generated columns (PostgreSQL >= 12) to avoid issuing INSERT, UPDATE or COPY statements with them
+ * PG (and PostgisRaster driver): set the application name in PostgreSQL connections (#2658)
+ * apply standard libpq parsing rules for connection parameters for our custom connection parameters (schemas, active_schemas, tables) (#2824)
 
-HDF4 Driver:
-    - Added some degree of HDF-EOS support.  HDFEOS layer now part of GDAL.
+PGDump driver:
+ * change default value of POSTGIS_VERSION layer creation option to 2.2
 
-DODS Driver:
-    - Substantial fixes, support for flipped datasets.
+SEGY driver:
+ * avoid opening FITS files
 
-HFA (Erdas Imagine) Driver:
-    - Fixed bug with files between 2 and 4GB.
-    - Capture statistics as metadata.
+Shapefile driver:
+ * do not claim to support DateTime data type
+ *  when several candidate SRS are found with confidence >= 90%, take the one from EPSG (contributes to fixes QGIS #32255)
+ * SHPRestoreSHX: fix for (64 bit) big endian
 
-Erdas 7.x LAN/GIS Driver:
-    - Newly implemented.
+S57 driver:
+ * apply update to DSID_EDTN field (#2498)
+ * report attributes tagged as list in S57 dictionaries as StringList fields. Add a LIST_AS_STRINGLIST open option that can be set to OFF to restore GDAL < 3.2 behavior (#2660)
 
-USGS DEM Driver:
-    - Various fixes to creation support / CDED product.
+SXF driver:
+ * fixes for big-endian
 
-NITF Driver:
-    - Capture USE001 and STDIDC TREs as metadata.
-    - Capture all sorts of header information as metadata.
-    - Support geocentric corner coordinate specification.
+SQLite/Spatialite driver:
+ * add a PRELUDE_STATEMENTS open option that can be used for example to attach other databases
 
-MrSID Driver:
-    - Support added for DSDK 4.0.x.
+WFS driver:
+ * avoid /vsicurl_streaming/ URL to be truncated in case of big filter (but the server might reject it)
 
-ECW Driver:
-    - Added preliminary support for using 3.0 SDK for JPEG2000 support.
-    - Fix oversampling assertion problem.
+XLSX driver:
+ * do not create files with Zip64 extension, to avoid compatibility issue with LibreOffice Calc
+ * fix numeric precision issue when reading datetime that could lead to an error of 1 second (#2683)
 
-ArcInfo Binary Grids:
-    - Added support for 0x01 and 0x20 block type.
+## SWIG Language Bindings
 
-## OGR 1.2.1 - Overview of Changes
+All bindings:
+ * OGRDriver.CopyDataSource(): check that source dataset is not NULL
+ * validate range of resample_alg algorithm (#2591)
+ *  expose CPLSetCurrentErrorHandlerCatchDebug() as gdal.SetCurrentErrorHandlerCatchDebug()
 
-OGRSpatialReference:
-    - Various fixes related to prime meridians.
+CSharp bindings:
+ * Add build support for .NET core (#1368)
+ * SWIG 4.0 compatibility (#2802)
+ * Adding typemaps C# for wrapper_GDALWarpDestDS and wrapper_GDALWarpDestName (#2621)
+ * Expose Dataset.GetSpatialRef() (#2620)
+ * Expose OSR.GetCRSInfoListFromDatabase (#1665)
+ * Fixed implementation of Utf8BytesToString (#2649)
 
-PostgreSQL/PostGIS Driver:
-    - Added layer name laundering.
-    - Launder names on by default.
-    - Clean stale entries in geometry_columns table when creating a layer.
-    - Support treating names views as layers.
-    - Handle long command strings.
+Java bindings:
+ * update minimum source/target Java version to 7 to please JDK 11 (#2594)
+ * make 'install' target copy maven artifacts (gdal-X.Y.Z.jar) to /usr/share/java
 
-S57 Driver:
-    - Fixed serious bugs with support for auto-applying update files.
-    - Improvements to S57 writing support.
+Perl bindings:
 
-# GDAL 1.2.0 - Overview of Changes
+Python bindings:
+ * Move implementation of scripts in osgeo.utils package to be reusable
+ * Fix Python2 install to be synchronous and report all errors (#2515)
+ * add a colorSelection='nearest_color_entry'/'exact_color_entry' argument to gdal.DEMProcessing()
+ * accept string as value for gdal.Translate() metadataOptions and creationOptions argument when providing single option (#2709)
+ * gdal.Info(): make options=['-json'] work properly
+ * remove use of deprecated PyObject_AsReadBuffer() function
+ * makefile.vc: remove '-modern -new_repr' on python target for SWIG 4 compatibility
+ * add GDALMDArray.shape attribute and GDALMDArray.ReadAsMaskedArray() method
+ * make Dataset.ReadRaster() and Dataset.ReadAsArray() accept floating-point coordinates (#3101)
 
-Configuration:
-    - Libtool used by default with Unix style builds.  Use --without-libtool
-      to avoid this.
-    - PROJ.4 can now be linked statically using --with-static-proj4.
-    - Added --without-bsb option for those averse to legal risk.
+# GDAL/OGR 3.1.0 Release Notes
 
-DODS/OPeNDAP Driver:
-    - Preliminary DODS (OPeNDAP) driver implemented (James Gallagher @ URI).
+## In a nutshell...
 
-PCIDSK Driver:
-    - PCIDSK read/write raster driver implemented (Andrey).
+ * Implement RFC 75: support for multidimensional arrays in MEM, VRT, netCDF, HDF4, HDF5 and GRIB drivers. Read/write for MEM and netCDF. Read/only for others. Add gdalmdiminfo and gdalmdimtranslate utilities.
+ * Implement RFC76: add capability of writing vector drivers in Python
+ * New GDAL drivers:
+   - COG: write-only, for Cloud Optimized GeoTIFF
+   - EXR: read/write driver, relying on OpenEXR library
+   - ISG: read-only, for geoid models of the International Service for the Geoid
+   - RDB: read-only, for RIEGL Database .mpx RDB 2 files (#1538) (needs proprietary SDK)
+ * New OGR drivers:
+   - FlatGeoBuf: read-support and creation (#1742)
+   - MapML: read/write driver for experimental web spec
+ * Improved drivers:
+  - OAPIF driver (renamed from WFS3): updated to OGC API - Features 1.0 core spec
+  - GTiff: improve performance of internal overview creation
+  - GTiff: GeoTIFF 1.1 support
+  - Shapefile driver: add read/creation/update support for .shz and .shp.zip
+  - netCDF vector: read/write support for CF-1.8 Encoded Geometries (#1287)
+  - VICAR: multiple improvements and write support (#1855)
+  - DDS: add read support
+ * Other improvements:
+   - gdalwarp: accept output drivers with only CreateCopy() capabilities
+   - gdal_viewshed: new utility for viewshed algorithm
+ * Remove GFT driver now that the online service no longer exists (#2050)
+ * New Sphinx-based documentation
+ * Multiple security related fixes (ossfuzz)
+ * Continued code linting (cppcheck, CoverityScan, etc.)
+ * Compatibility with GDAL 3.0:
+    - C and C++ API: backward compatible changes
+    - C ABI: backward compatible changes
+    - C++ ABI: modified
+    - Functional changes: see MIGRATION_GUIDE.TXT
 
-Erdas Imagine / HFA Driver:
-    - Support recent Imagine versions (data dictionary changes).
-    - Better logic to search for .rrd file locally.
-    - Support creating files in the 2GB to 4GB size range.
+## GDAL/OGR 3.1.0 - General Changes
 
-GIF Driver:
-    - Updated to libungif 4.1.0.
-    - Various hacks to try and identify transparent colors better.
+Build(Unix):
+ * use pkg-config for libxml2 detection (#2173)
+ * fix detection of libpq in a non-standard place (#1542)
+ * do not use absolute path in linking command. Helps Mac OS and cygwin builds (#2075)
+ * Enable Bash completions and control installation
+ * GDALmake.opt.in: silence datarootdir warning
+ * Doc: allow user full control over installation directory
+ * fix JVM detection for HDFS support on MacOS (#2313)
+ * Remove #define HOST_FILLORDER from cpl_config.h (#2345)
+ * Added search for proj library in lib64 directory.
+ * configure: strip -L/usr/lib and similar from netCDF, MySQL, GEOS and SFCGAL lib path (#2395)
+ * configure: remove useless -lproj from --with-spatialite detection
 
-BMP Driver:
-    - Handle 32bit BMPs properly.
+Build(Windows):
+ * parametrize number of CPUs for parallel builds with CPU_COUNT variable (#1922)
+ * add HDF5_H5_IS_DLL variable to switch the scenario when HDF5 is built as a DLL (#1931)
+ * add POSTFIX that defaults to _d for GDAL .dll, .lib and .pdb for DEBUG builds (#1901)
+ *  Fix issues with thread_local and C++ objects that don't work well with DLL on Windows
 
-HDF4 Driver:
-    - Added proper support for multi-sample GR datasets.
-    - Various fixes and improvements for specific product types.
+All:
+ * Support Poppler 0.82, 0.83, 0.85
 
-GeoTIFF Driver:
-    - Added PHOTOMETRIC option to control photometric interp of new files.
+## GDAL 3.1.0 - Overview of Changes
 
-JPEG2000/Kakadu Driver:
-    - Support reading/creating lossless 16bit files.
-    - Updated to support Kakadu 4.1 library.
+## Algorithms
 
-NITF Driver:
-    - Implement support for IGEOLO="U" (MGRS/UTM) coordinates.
-    - Added overview (as external GeoTIFF file) support.
+* Warper: add sum resampling method (#1437)
+* Average resampling (warp and overview/translate): use weighted average for border source pixels
+* GDALReprojectImage(): properly take into account source/target alpha bands
+* GDALCreateReprojectionTransformerEx(): do not emit error if reverse transformation fails, and fix crash when trying to use null reverse transformation
+* Warper: fix GDAL 2.3 regression in a situation with source nodata value, multiple bands and nearest resampling where the logic to detect which source pixels are nodata was inverted (#1656)
+* GWKAverageOrModeThread(): reject invalid source pixels for average/q1/q3/mode/min/max resampling (#2365)
+* Multithreaded warper: make sure a transformer object is used by the thread which created it (#1989). This workarounds a PROJ bug also fixed per https://github.com/OSGeo/PROJ/pull/1726
+* Contour: fix SegmentMerger list iterator skipping and out of bounds error (#1670)
+* Contour: fix (over) precision issue when comparing pixel value to NoData on Float32 rasters (#1987)
+* Contour: add sanity checks for interval based contouring, in case the dataset contains extreme values regarding the settings, which would lead to a lot of memory allocations / too large computation time
+* TPS warper: enhance precision without armadillo support (#1809)
+* RPC warper: fix issue when source image has a geotransform (#2460)
+* GDALRasterizeGeometries(): fix potential integer overflow / memory allocation failure, depending on GDAL_CACHEMAX and raster dimensions (#2261)
+* Rasterize: speed optimization for geometry collections (#2369)
+* GDALContourGenerate(): propagate raster acquisition error (#2410)
 
-MrSID Driver:
-    - Support DSDK 4.2.x.
+## Port
 
-PNG Driver:
-    - Support required byte swapping of 16bit PNG data.
+* /vsitar/: support >100 character file names (#1559)
+* /vsitar/: accept space as end of field terminator
+* /vsigz/: fix seeking within .gz/.tgz files larger than 2 GB (#2315)
+* /vsicurl (and derived filesystems): fix concurrency issue with multithreaded reads (#1244)
+* /vsicurl/: avoid downloading one extra block when the end offset is just at a chunk boundary
+* /vsicurl/: fix CPL_VSIL_CURL_ALLOWED_EXTENSIONS with query string (#1614)
+* /vsicurl/: allow 'Connection timed out' CURL errors as candidate for HTTP retry
+* /vsicurl/: GetFileSize(): when HEAD request does not return Content-Length header, retry with GET
+* /vsis3/: for a long living file handle, refresh credentials coming from EC2/AIM (#1593)
+* /vsis3/: invalidate cached non-existing file is AWS_ config options are changed in the meantime (#2294)
+* /vsis3/ /vsigs/ /vsiaz/: implement Rename() first doing a copy of the original file and then deleting it
+* /vsis3/ and similar: add a NUM_THREADS option to Sync() for parallelized copy
+* AWS: Fix error in loading ~/.aws/config file (#2203)
+* VSISync(): when copying from /vsis3/ to /vsis3/ (or /vsigs/->/vsigs/, /vsiaz/->/vsiaz/), use CopyObject() method to use server side copy
+* VSISync(): make file copying from /vsis3/ actually use /vsis3_streaming/ to reduce number of GET requests
+* VSISync(): add a CHUNK_SIZE option to Sync() to split large objects and get parallelization of their download and upload
+* Add VSIUnlinkBatch() for batch deletion of files, and add optimized /vsis3/ implementation
+* Add efficient VSIRmdirRecursive() implementation for /vsis3/
+* Add VSIGetFileMetadata()/VSISetFileMetadata() and implement them to get/set HTTP headers, and AWS S3 object tagging
+* /vsis3/ and other network filesystems: avoid useless network requests when we already got a directory listing (#2429)
+* /vsiswift/: V3 authentication method, handling auth token expiration
+* /vsimem/: make Rename() error if destination file is not in /vsimem/
+* /vsizip/ writing: in ZIP64 mode, also advertise 45 as the version in the central directory (avoids a warning from 'zip' utility)
+* Add CPLCanRecode function and use it in MITAB, Shape and SXF drivers to decide when to advertise UTF-8 capability
+* CPLConfigOptionSetter: only reset thread-locale value, not global one
+* CPLJSONObject::GetType(): return Long when the value doesn't fit on a int32
+* CPLJSON: distinguish Null type from Unknown/invalid type
+* CPLEscapeString(): escape double-quote for CPLES_URL
+* Add a CPLCondTimedWait()
+* cpl_safemaths.hpp: safe + and * for GUInt64
+* Add CPLJSonStreamingWriter class
+* Add cpl_error_internal.h with logic with error accumulator
+* Add VSIOverwriteFile()
+* Add CPLLaunderForFilename()
+* cpl_error.h: add a CPLDebugOnly() macro that expands to CPLDebug() only for DEBUG builds
+* QuietDelete: support expliciting the drivers to use
 
-FAST Driver:
-    - lots of fixes, supports more datums and ellipsoids.
+## Core
 
-NetCDF Driver:
-    - New driver implemented for netCDF support.
-    - Pretty much tied to form of netCDF used in GMT for now.
+* Block cache: fix corruption on multithreaded write on datasets (#2011)
+* GDALInvGeoTransform(): make it work with scale and rotation/skew coefficients of small absolute value (#1615)
+* GDALCopyWholeRasterGetSwathSize(): fix potential int overflows for big values of GDAL_SWATH_SIZE or GDAL_CACHEMAX
+* PAMRasterBand: add presence flag for Offset and SetScale so that GetOffset()/GetScale() properly reports if they are defined in PAM
+* GDALDefaultOverviews::BuildOverviews(): fix typo in detection of 1x1 overview (#1730)
+* Fix precision loss at GDALResampleChunkC32R with complex data
+* Fix precision loss at GDALComputeBandStats with complex data
+* Proxy pool: Load band block sizes if not provided at creation. Fixes floating point exception on copy overviews from PRF dataset to destination dataset.
+* GTiff and PAM: allow serializing WKT2 for SRS using non-WKT1 compatible projections such as Vertical Perspective (#1856)
+* RasterIO(): fix non-neareset resampling over nodata blocks (#1941)
+* Overview dataset (-oo OVERVIEW_LEVEL): expose mask if the source dataset has a mask with overviews
+* GDALUnrolledCopy<GByte,2,1>: fix SSE2-only implementation (when SSSE3 is not available, on older AMD CPUs)
+* PAM: support reading GCPs from ESRI GeodataXform in .aux.xml files
+* Make it possible to call BuildOverviews() on a dataset returned by GDALBuildVRT()
+* GDALDataset::SetProjection(): re-allow the use of PROJ4 strings (#2034)
 
-VTerrain .bt Driver:
-    - New driver for VTerrain .bt elevation format.
+## Utilities
 
-ECW Driver:
-    - support supersampled reads efficiently.
-    - special case for dataset level RasterIO() implemented for much better
-      performance in some applications.
+* GDALInfo(): fix axis order issue in long,lat corner coordinates, in particular when reading from a .aux.xml with a ProjectedCRS (#2195)
+* gdal_translate: Make 'gdal_translate foo.tif foo.tif.ovr -outsize 50% 50% -of GTiff' work
+* gdal_translate: clamp/round source nodata value when not compatible of the target data type. Was already done when using -a_nodata, but not with implicit copy (#2105)
+* gdalwarp: accept output drivers with only CreateCopy() capabilities
+* gdalwarp: adjust nodata values, passed with -srcnodata/-dstnodata, and close to FLT_MAX to exactly it (#1724)
+* gdalwarp: fix wrong axis order when using source/target CRS being a geographic3D CRS such as EPSG:4979, and with vertical shift grid application (#1561, GDAL 3.0 regression)
+* gdal_contour: remove explicit width/precision=12/3 of the elev field (#1487)
+* gdal_contour: turn on quiet mode if output dataset is standard output (refs #2057)
+* gdaldem: avoid potential integer overflow in color-relief mode (#2354)
+* gdal_calc.py: fixed NaN-streaking in output images when the --allBands option is given to tiled images
+* gdal_polygonize.py: fix outputting to geojson without explicit -f switch (#1533)
+* gdalcompare.py: take into account mask bands
+* gdal_retile.py: add resume option (#1703)
+* gdallocationinfo: emit verbose error when dataset cannot be opened (#1684)
+* gdallocationinfo and gdaltransform: print a hint when values are expected from the command line and stdin is an interactive terminal (refs #1684)
+* Python utilities: fix GetOutputDriverFor() when multiple drivers found (#1719)
+* gdal2tiles.py: add remaining resample methods
+* gdal2tiles.py: add option for setting the tile size (#2097)
+* gdal2tiles.py: add --xyz option to generate tiles in the OSM Slippy Map standard (#2098)
+* gdal2tiles.py: show warning when running against non-Byte input (#1956)
+* gdal2tiles.py: update cache calculation (#2020)
+* gdal2tiles.py: check that min zoom <= max zoom (#2161)
+* gdal2tiles.py: ignore nodata values that are not in the range of the band data type
+* gdal2tiles.py: fix hang when --s_srs specified but image lacks georeferencing
+* gdal_translate / gdalwarp / ogrct: allow dealing with non-WKT1 representable SRS (#1856)
+* gdal_edit.py: add a -units switch
+* gdal_edit.py: add -a_ulurll switch
+* gdal_fillnodata.py/GDALFillNodata: fix crash when smooth_iterations is used, and with some progress functions such as the one used by Python (#1184)
+* Python scripts and samples: use python3 for shebang (#2168)
 
-ESRI BIL (EHdr) Driver:
-    - Support world files.
+## Sample scripts
 
-VRT Driver:
-    - Implement filtering support.
+* Add tile_extent_from_raster.py: sample script to generate the extent of each raster tile in a overview as a vector layer
+* Add gdal_remove_towgs84.py script
 
-GIO (Arc/Info Binary Grid via avgridio.dll):
-   - Driver disabled ... to undependable.
+## GDAL drivers
 
+Multiple drivers:
+ * GTiff, GPKG, MBTiles, PostgisRaster drivers: share lock of overview dataset with parent dataset (#1488)
+ * HDF5 and netCDF: fix crash when reading attributes of type string of variable length with NULL values
+ * CTable2/LOSLAS/NTv1/NTv2: document in metadata that positive longitude shift values are towards west
+ * Revise raster drivers GDAL_DMD_HELPTOPIC
+ * JP2KAK and JP2OPENJPEG: fix to read images whose origin is not (0,0)
+ * Strip TOWGS84 when datum is known, in GTiff, Spatialite and GPKG drivers
 
-Python:
-    - Preliminary support for numarray in addition to numpy (Numeric).
+BAG driver:
+ * modify way georeferencing is read (particularly pixel sizes and origin) (#1728)
+ * Backward compatibility for metadata reading for BAG < 1.5 (#2428)
 
-Contouring:
-    - New gdal_contour utility program implementing contour generation.
-    - Underlying algorithm in gdal/alg.
+BSB driver:
+ * Report PLY coordinates as a WKT POLYGON in a BSB_CUTLINE metadata item
 
-Warping:
-    - Improved support in GDALSuggestedWarpOutput() for "world" sized
-      files that are only partially transformable.
-    - Bicubic resampler improved.
-    - What was gdalwarptest is now gdalwarp, and the old gdalwarp is now
-      gdalwarpsimple.  The sophisticated warper is now the default.
+BYN driver:
+ * fix nodata value for Int32 encoded products
 
-Man Pages:
-    - Man pages for GDAL utilities now being maintained and installed (Silke).
+DAAS driver:
+ * accept 4-band RGBA PNG response even when a single band is requested
 
-## OGR 1.2.0 - Overview of Changes
+DIMAP driver:
+ * don't look inside Dataset_Components if Raster_Data is present
+ * avoid reparsing xml if already a product dimap
+ * ignore missing strip xml file
 
-OGRSpatialReference:
-   - Added methods for converting to/from GCTP representation.
-   - Added HOM 2 points on centerline variant.
+DDS driver:
+ * add read support
 
-DODS (OPeNDAP) Driver:
-   - Preliminary implementation.
+DTED driver:
+ * Add DTED_APPLY_PIXEL_IS_POINT environment switch  (#2384)
+ * emit a CE_Failure instead of a CE_Warning in case of checksum verification failure (#2410)
+ * support E96 as well as MSL for COMPD_CS (#2422)
 
-TIGER/Line Driver:
-   - Added support for GDT ASCII TIGER-like format.
-   - Support TIGER/Line 2003 format.
+EEDA driver:
+ * fix startTime / endTime comparisons that were incomplete in #1506
 
-S-57 Driver:
-   - Preliminary export support implemented.
-   - Support capture of FFPT (feature to feature) linkages.
-   - Support capture of TOPI from VRPT.
-   - Support capture of primitives as additional layers.
+FITS driver:
+ * fix memory leaks
 
-Shapefile Driver:
-   - gdal/frmts/shapelib removed from GDAL source tree, now just a
-     copy of required shapelib files are kept in gdal/ogr/ogrsf_frmts/shape.
-   - Attempt identify polygons that are really multi-polygons and convert them
-     into multi-polygons properly (Radim Blazek).
-   - Create FID attribute in .dbf file if no attribute added by application.
+ENVI driver:
+ * add read support for reading GCPs (#1528), and fix off-by-one offset on line,pixel on reading GCP
+ * fix potential use of invalid pointer on some unusual std::string implementations (#1527)
+ * preserve 'byte order' on update (#1796)
 
-GML Driver:
-   - Lots of fixes and improvements for reading and writing.
-   - Now writes a schema file by default.
-   - Field types are set now when reading based on data found on first pass.
-   - Added support for the various kinds of geometry collections.
+GPKG driver:
+ * support opening subdataset of /vsicurl/ files (#2153)
 
-DGN Driver:
-   - Now using dgnlib 1.9 - this carries with it various new element types
-     and some important bug fixes.
+GTiff driver:
+ * improve performance of internal overview creation (#1442)
+ * in COPY_SRC_OVERVIEWS=YES, interleave mask with imagery, and add leader/trailer to strile
+ * optimize read of cloud-optimized geotiffs
+ * do not generate a TIFFTAG_GDAL_METADATA with color interpretation information for JPEG YCbCr compression
+ * make -co NUM_THREADS produce reproducible output
+ * make overview blocksize defaults to same as full-resolution
+ * move deferred tile/strip offset/bytecount loading to libtiff
+ * make WEBP_LEVEL to be honored in Create() mode (fixes #1594)
+ * PushMetadataToPam(): early exit when PAM is disabled, to avoid error messages
+ * remove support for libtiff 3.X
+ * set a LAYOUT=COG metadata item in the IMAGE_STRUCTURE metadata domain of the dataset when the hidden feature declarations typical of a COG file are found
+ * fix memory leak with -co APPEND_SUBDATASET=YES
+ * fix error message for NBITS != 16 and Float32
+ * add explicit error message when trying to create a too big tiled TIFF file (refs #1786)
+ * ensure GDAL PROJ context is used for all libgeotiff functions (requires internal libgeotiff / libgeotiff 1.6)
+ * make sure that GetMetadataDomainList() doesn't return EXIF when there's no EXIF metadata
+ * GTIFGetOGISDefn: avoid querying UOM length info when it is KvUserDefined to avoid an error to be emitted
+ * on CRS reading, avoid unsetting of EPSG code when ProjLinearUnitsGeoKey = Linear_Foot_US_Survey and the CRS also uses that unit (#2290)
+ * do not write in GeoTIFF keys non-standard projections
+ * do not write TOWGS84 that come from EPSG codes, unless GTIFF_WRITE_TOWGS84=YES is explicitly set
+ * GTiff writing: workaround PROJ 6.3.0 bug when writing a EPSG:4937 ETRS89 Geog3D CRS
+ * GTiff writing: do not write by default EPSG:3857/WebMercator as a ESRI PE string. Fixes 3.0 regression
+ * avoid crash on single-component file with Whitepoint and PrimaryChromaticities tags
+ * libtiff: BigTIFF creation: write TileByteCounts/StripByteCounts tag with SHORT or LONG when possible
+ * Internal libgeotiff: set UOMLength from GeogLinearUnits (for geocentric CRS) (#1596)
+ * Internal libgeotiff: upgrade to libgeotiff 1.6.0dev to support OGC GeoTIFF 1.1
+ * Internal libtiff: resync with internal libtiff (post 4.1.0)
 
-ODBC Driver:
-   - New ODBC driver implemented.  Build by default on Windows, and buildable
-     on Unix (with unixodbc).
+GRIB driver:
+ * do not do erroneous K->C unit conversion for derived forecasts whose content is not a temperature, but a derived quantity, such as spread
+ * avoid erroneous K->C conversion for Dew point depression
+ * update GRIB tables to degrib 2.24
+ * add missing entries in MeteoAtmoChem table
+ * add more values from Table 4.5 in Surface type table
+ * add support for template 4.48 Optical Properties of Aerosol
+ * add support for rotated lat-lon grids
+ * avoid quadratic performance on GRIB2 datasets using subgrids within a single GRIB message (#2288)
 
-VRT Driver:
-   - New "virtual" OGR Datasource format implemented.
-   - Configuration stored in XML control file.
+GXF driver:
+ * avoid closing the file pointer before being sure this is a GXF driver, otherwise this can prevent the opening of some raw format files (#1521)
 
-Oracle (OCI) Driver:
-   - support reading views.
+HDF4 driver:
+ * fix retrieval of non-string swath and grid attributes
+ * fix GR support for non-Byte rasters
+ * remove broken attribute reading
+ * fixes related to color table
 
-OGR Core:
-   - Added support for WKT EMPTY geometry objects (like "MULTIPOINT(EMPTY)").
-   - Added DeleteFeature() method on OGRLayer class.
+HDF5 driver:
+ * avoid error report of the HDF5 library when _FillValue attribute is missing
+ * Make GH5_FetchAttribute(CPLString) more robust and able to cope with variable-length string
+ * type detection: only detect complex data type if the component names start with r/R and i/I (refinement of #359)
+ * add a way to open datasets split over several files using the 'family' driver
+ * fix reading single dimension dataset (#2180)
 
-NTF Driver:
-   - Support CHG_TYPE attribute for landline plus product.
+HFA driver:
+ * fix writing of compressed file when a RLE run count is in the [0x4000,0x8000[ range or [0x400000, 0x800000[ (#2150)
 
+IGNFHeightASCIIGrid driver:
+ * fix to read RASPM2018.mnt grid
 
-# GDAL 1.1.9 - Overview of Changes
+IRIS driver:
+ * make identification more restrictive to avoid false-positive identification of raw binary formats such as ENVI (#1961)
 
- o MrSID Driver: New for 1.1.9, read-only, includes good coordinate system
-   support, and should be high performance.
+ISIS3 driver:
+ * extract band name from BandBin group, and wavelength/bandwidth (#1853)
+ * preserve label in PAM .aux.xml when copying to other formats (#1854)
+ * add support for PointPerspective projection (#1856)
+ * add support for Oblique Cylindrical projection (#1856)
 
- o ECW Driver: Now reads coordinate system information (but doesn't write).
+JP2ECW driver:
+ * add support for ECWJP2 SDK 5.5
 
- o HDF Driver: Added support for Hyperion Level 1, Aster Level 1A/1B/2, MODIS
-   Level 1B(earth-view)/2/3, SeaWIFS Level 3.
+JP2OpenJPEG driver:
+ * Fix multi-threading race condition (#1847)
+ * fix reading overviews, when tiled API is used, and the dimensions of the full resolution image are not a multiple of 2^numresolutions (#1860)
+ * fix to return the proper number of bytes read when we read more than 2 GB at once (fixes https://github.com/uclouvain/openjpeg/issues/1151)
 
- o L1B Driver: Now reads GCPs for georeferencing.
+JP2KAK driver:
+ * fix issue with multi-threaded reads
+ * NMAKE: Allow users to tweak/append extras to KAKINC (#1584)
 
- o NITF Driver: Support for reading RPC, variety of bugs fixes for reading and
-   writing.  Also some general RPC infrastructure added to GDAL.
+JPEG driver:
+ * fix further calls to RasterIO after reading full image at full resolution (#1947)
+ * tune sanity check for multiple-scan (QGIS #35957)
+ * in case of multiscan image and implicit overviews, limit memory consumption
 
- o JP2KAK Driver: Can be used with Kakadu 4.0.2 now.  Compatibility fixes
-   for internal geotiff to improve compatibility with Mapping Science tools.
-   Added palette support.
+KEA driver:
+ * return error when deleting metadata item rather than crashing (#1681)
+ * Backport thread safety fixes and nullptr tests from standalone driver (#2372)
 
- o HFA (Imagine) Driver: Added read/write support for color table opacity.
-   Added write support for large (spill) files.
+LOSLAS driver:
+ * add support for .geo geoid models
 
- o "core" directory renamed to "gcore" to avoid confusing configure script.
+MEM driver:
+ * Set access mode to the one required in Open()
 
- o Added support for GDAL_DATA environment variable to point to GDAL support
-   data files (those in gdal/data directory).
+MRF driver:
+ * fix relative file name detection
+ * relax TIFF tile format rules on read
+ * Accept any known projection encoding
+ * use PNG library for swapping
+ * fixes caching MRF issue
 
- o Added GDALDataset::RasterIO() for more efficient reading of multiple bands
-   in one request (in some cases anyways).
+MrSID driver:
+ * add MRSID_PLATFORM to frmts/mrsid/nmake.opt
 
- o High performance warp api considered to be complete now, and substantially
-   optimized.
+netCDF driver:
+ * improve performance when reading chunked netCDF 4 bottom-up files (read-only)
+ * correctly parse grid_mapping attribute in expanded form
+ * allow "radian" value for the X/Y axis units
+ * very partial workaround for an issue in libnetcdf 4.6.3 and 4.7.0 with unlimited dimensions (refs https://github.com/Unidata/netcdf-c/pull/1442)
+ * NCDFIsUserDefinedType(): make it work for types in subgroups
+ * Disregard valid range if min > max (#1811)
+ * for byte (signed/unsigned) variables, do not report a nodata value if there's no explicit _FillValue/missing_value as recommended by the netCDF specs. And for other data types use nc_inq_var_fill() to get the default value
+ * do not report nodata if NOFILL is set
+ * fix bottom-up identification with negative scale_factor for y axis (#1383)
+ * fix issue when opening /vsicurl/http[s]://example.com/foo.nc filenames (#2412)
+ * Fix support of WKT1_GDAL with netCDF rotated pole formulation
 
- o gdal_merge.py: supported multiple bands, copying PCT.
+NGW driver:
+ * Add support for additional raster types and QGIS styles.
+ * Add more server side attribute filters.
 
+NITF driver:
+ * skip bad UDID data (#1578)
 
-## OGR 1.1.9 - Overview of Changes
+NTv2 driver:
+ * add support for the Canadian NAD83(CRSR)v7 / NAD83v70VG.gvb velocity grid
 
- o Oracle Spatial: New generic read/write, and implemented highly optimized
-   loading support.
+OZI driver:
+ * fix axis order issue with georeferencing (3.0 regression)
 
- o Tiger driver: added support for TIGER/Line 2002 product.
+PDF driver:
+ * update to use newer versions of pdfium
 
- o GML driver:  now supports Xerces versions from 1.6 up to 2.3.  Lots of
-   bugs fixes and improvements.   GML Geometry now in OGR core.
+PDS3 driver:
+ * report the label in a json:PDS metadata domain
+ * fix support of Oblique Cylindrical (#1856)
+ * ix opening of datasets with BSQ organization (or single band), where one band is larger than 2 GB (2.3 regression)
+ * nasakeywordhandler: fixes to be able to read some labels with metadata items whose value is a list on several lines
+ * add a GDAL_TRY_PDS3_WITH_VICAR configuration option that can be set to YES so that PDS3 datasets that contain a VICAR label are opened by the VICAR driver
 
- o Improved support for translating to and from ESRI WKT, including a complete
-   mapping between EPSG related ESRI datum names and OGR's expected names.
+PDS4 driver:
+ * update CART schema to 1D00_1933 and PDS to 1C00 (#1851)
+ * fix reading side of Mercator and Orthographic
+ * add a CREATE_LABEL_ONLY=YES creation option, and create a <Header> element (#1832)
+ * add write support for LAEA projection
 
- o Improved support for alternate prime meridians in coordinate system code.
+PNG driver:
+ * Update internal libpng to 1.6.37
 
- o Shapefiles: Can write features with NULL geometry,
+PNM driver:
+ * emit warning if creating file with non-standard extension
 
- o DGN: added 3d write support.
+RasterLite2 driver:
+ * fix build against latest librasterlite2, and require it
 
- o Implemented generic attribute indexing support (only used for shapefile
-   at this point).  Use in SQL where clauses and ExecuteSQL().
+RMF driver:
+ * Add support for PZ-90.11 and GSK-2011 coordinate systems
+ * Read vertical datum info
+ * Add translation vertical CS ID to dataset's spatial reference
 
- o WKT MULTIPOINT in/out formatting fixed.
+RS2 driver:
+ * add half-pixel shift to reported GCP line and column numbers (#1666)
 
- o Added SynToDisk() method on OGRDataset and OGRLayer.
+Sentinel2 driver:
+ * Add support for exposing Level-2A AOT, WVP, SCL, CLD, SNW data in SAFE_COMPACT format (#2404)
 
- o Implemented "Web Coordinate Transformation Service" (ogr/wcts).
+TileDB driver:
+ * add capability to define co-registered attributes per band
+ * set row-major reads and removed adviseread (#1479)
+ * added support for raster band metadata
+ * TILEDB_LIBS added for windows build
+ * partial updates to existing arrays
+ * support reading tiles in update mode (#2185)
+ * use array metadata to store xml (#2103)
+ * redirect vsis3 calls to tiledb s3 direct calls
+ * Flush cache in block order for global writes (#2391)
 
- o Implemented "in memory" format driver.
+TSX driver:
+ * add PAZ support
 
- o C API documented.
+USGSDEM driver:
+ * fix reading FEMA generated Lidar datasets whose header is 918 bytes large
 
+VICAR driver:
+ * Support FORMAT=HALF, DOUB and COMP
+ * Support big-endian order for integer & floating point values
+ * Support VAX floating-point order
+ * Support BIP and BIL organizations
+ * Ignore binary label records (NBL), and properly skip binary prefixes (NBB)
+ * fix reading of EOL labels with non BSQ organizations, and possible confusion with LBLSIZE of EOL overwriting the main one
+ * improvements in label reading, and report label in a json:VICAR metadata domain
+ * read binary prefixes as OGR layer
+ * add read support for BASIC and BASIC2 compression methods
+ * add write support
+ * remove obsolete END-OF-DATASET_LABEL, CONVERSION_DETAILS and PIXEL-SHIFT-BUG metadata items that dates back to 1.X era
 
-# GDAL 1.1.8 - Overview of Changes
+VRT driver:
+ * add 'vrt://{gdal_dataset}?bands=num1,...,numN' syntax as a convenient way of creating a on-the-fly VRT with a subset of bands
+ * VRT warp: do not fail if a block has no corresponding source pixels (#1985)
+ * VRT Python: also probe libpython3.Xm.so.1.0 (#1660)
+ * VRT Python: add Python 3.8 compatibility
+ * avoid erroneous pixel request do be done with KernelFilteredSource
+ * VRTRawRasterBand: add GetVirtualMemAuto interface to enable mmap io
+ * fix requesting a downsampling version of the mask band of a source that has masks and overviews
+ * VRT pansharpening: fix crash when NoData is set and input multispectral bands are separate files (#2328)
+ * fix IGetDataCoverageStatus() that can cause issue for the use case of https://lists.osgeo.org/pipermail/gdal-dev/2020-April/051889.html
+ * gdalvrt.xsd: add 'dataAxisToSRSAxisMapping' attribute for GCPList element (#2378)
 
- o Implemented HDF 4 read/write support. This includes HDF EOS reading.
+WCS driver:
+ * pass user-supplied progress function to curl HTTP request when using DirectRasterIO
 
- o Implemented Windows BMP read/write support.
+WMS driver:
+ * IReadBlock(): limit number of tiles downloaded at once
+ * Use curl_multi_wait instead of socket API (#1789)
+ * AGS: Remove unused parameters from url
 
- o Implemented NITF read/write support.
+## OGR 3.1.0 - Overview of Changes
 
- o Implemented NOAA Polar Orbiter L1B format driver.
+## Core
 
- o Implemented EOSAT FAST format driver.
+* Support API-level precision/round for geometry WKT (#1797)
+* OGR SQL: make LIKE behave in a case sensitive way from now
+* OGR SQL: support constructs 'A OR B OR C ... OR N' with many successive OR
+* SQL SQLite: do not propagate 'IS / IS NOT value' constructs to OGR SQL
+* SQL SQLite: add support for ST_MakeValid() using OGRGeometry::MakeValid() if not exposed by Spatialite already
+* Rename swq.h->ogr_swq.h and install it, mark SQL query parse API with
+CPL_UNSTABLE_API macro (#1925)
+* SQLite dialect: fix issue when using JOIN on a layer without fast filter count capability
+* OGRSimpleCurve::getPoints() with XYZM: fix wrong stride used for M array
+* OGRSimpleCurve: fix reversePoints() and addSubLineString() to take into account M dimension
+* Add OGR_G_CreateGeometryFromEsriJson() and map it to SWIG
+* OGRLinearRing::isPointOnRingBoundary(): fix incomplete test that could falsely return true if the point was aligned with a segment, but not between the nodes. Impact correct reconstruction of holes in shapefile driver
+* OGRGeometryFactory::ForceTo(): fix crash when forcing a MultiPolygon Z/M/ZM to a CompoundCurve (#2120)
+* OGRGeometryFactory::forceToMultiLineString(): fix for a GeometryCollection of LineStringZ/M/ZM (#1873)
+* OGRGeometryRebuildCurves(): only try to reconstruct curved geometry if one of the input geometries has really a non-linear portion
+* curveFromLineString(): make sure to exactly close the compound curve if the input curve is itself closed
+* GDALDataset::CopyLayer(): fix crash when using DST_SRSWKT option. And also set SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER)
+* Add OGR_G_RemoveLowerDimensionSubGeoms()
 
- o Implemented a JasPer based JPEG2000 driver (several limitations).
+## OGRSpatialReference
 
- o Implemented a Kakadu based JPEG2000/GeoJP2(tm) driver (full featured, but
-   Kakadu is not open source).
+* Revise how SRS methods deal with TOWGS84. Add OSR_ADD_TOWGS84_ON_IMPORT_FROM_EPSG, OSR_ADD_TOWGS84_ON_EXPORT_TO_PROJ4 and OSR_ADD_TOWGS84_ON_EXPORT_TO_WKT1 configuration options. See https://github.com/OSGeo/gdal/commit/cc02dc4397c7ec43ec4c4b842e5faabe16c54904 for details
+* SetFromUserInput(): add capability to import PROJJSON
+* add ExportToPROJJSON() (PROJ >= 6.2)
+* GetAxis(): make it work with a compound CRS (#1604)
+* Coordinate transformation: fix invalid output with some input coordinates in EPSG:4326 to EPSG:3857 transformation (3.0 regression)
+* Coordinate transformation: Coordinate transformation: add a OGR_CT_OP_SELECTION=PROJ/BEST_ACCURACY/FIRST_MATCHING config option. Defaults to PROJ for PROJ >= 6.3
+* importFromWkt(): emit a CPLError() in case of import failure (#1623)
+* Add OSRGetAxesCount() to C API and SWIG bindings
+* Add OSRPromoteTo3D() and map it to SWIG (PROJ >= 7) (#1852)
+* importFromESRI(): acept COMPD_CS (#1881)
+* add an internal cache for importFromEPSG() and importFromWkt(). Helps performance for MapServer PROJ6 migration
+* Add support for Vertical Perspective projection (#1856)
+* Add a OSRGetPROJSearchPaths() function and a SWIG osr.GetPROJVersionMicro()
+* Fix use-after-free issue when destroying a OGRSpatialReference object in a thread when another thread has created it but has been destroy in-between
+* Coordinate transformation: make it work with hacky WKT1 rotated pole from netCDF driver
+* Add OGR_GeomTransformer_XXXX API that wraps OGRGeometryFactory::transformWithOptions() and expose it to SWIG (fixes #1911)
+* Fix PROJ usage across fork() calls (#2221)
+* OGRCoordinateTransformation: correctly deal when transforming CRS that includes +lon_wrap= or similar qualifiers
+* Add OSRIsDerivedGeographic()
+* EPSGTreatsAsNorthingEasting(): fix it to properly deal with Polar projected CRS with northing,easting order
 
- o Implemented new 'gdalwarp' application for projection and GCP based image
-   warping.  See gdal/alg for underlying algorithms.  Currently gdalwarp only
-   supports 8 bit images and holds the whole source image in memory.
+## Utilities
 
- o Implemented write support for ESRI ASCII Grids.
+* ogrinfo: add a -nogeomtype switch
+* ogrinfo: fix to output WKT2 SRS by default. Was done correctly for several geometry column, but not single one
+* ogr2ogr: emit better error message when using -f VRT
+* ogr2ogr: improve performance of -explodecollections on collections with big number of parts
+* ogr2ogr: avoid non-relevant warning 'Input datasource uses random layer reading, but output datasource does not support random layer writing' when converting one single layer
+* ogr2ogr: allow to combine -nlt CONVERT_TO_LINEAR and -nlt PROMOTE_TO_MULTI (#2338)
+* ogr2ogr: add a -makevalid switch (requires GEOS 3.8 or later) and expose it in Python as makeValid=True options of gdal.VectorTranslate()
 
- o Lots of improvements to GeoTIFF driver.  Metadata writing, update of
-   georeferencing, and support for writing PCS codes based on AUTHORITY fields
-   in WKT.
+## OGR drivers
 
- o Implemented support for uncompressed 1bit data in Erdas Imagine files,
-   as well as generic metadata.
+Multiple drivers:
+ * GML/WFS: add support for Date, Time and DateTime fields
+ * GeoJSONSeq & TopoJSON: avoid false positive detection and errors on unrelated http[s]:// filenames
 
- o Fixed 0xFF compression support in the Arc/Info Binary Grid (AIG) driver.
+AmigoCloud driver:
+ * Modify amigocloud URL endpoint.
 
- o Lots of improvements to BSB drive, including preliminary uncompressed
-   output support, support for reading BSB 3.0 and GEO/NOS.
+AVCE00 driver:
+ * fix alternance from sequential to per-FID reading
 
- o Lots of work on VRT format.
+CAD driver:
+ * Fix read ellipse and arc (#1886)
 
- o ECW: Fixed bug with reading a more than full resolution.
+DXF driver:
+ * Re-add some header and trailer elements that caused compatibility issues with recent Autocad versions (#1213)
+ * Generate correct HATCH boundary elliptical arc segments for certain start/end angles
+ * Skip "Embedded Object" sections in 2018 version DXFs
+ * Specify maximum gap between interpolated curve points, configurable with OGR_ARC_MAX_GAP
+ * do not error out if trying to create a OGR_STYLE field
+ * fix handling of SPLINE whose first knot is at a very very close to zero negative (#1969)
+ * do not discard Z value when reading a HATCH (#2349)
+ * write (100, AcDbEntity) before (8, layer_name) (#2348)
+ * Correct handling of "off" and "frozen" layers in blocks (#1028)
 
- o Envisat driver now supports AATSR TOA and MERIS data.
+DWG driver:
+ * add support for ODA 2021.2 (Windows builds)
 
- o Fixes for nodata support in GRASS driver.
+ElasticSearch driver:
+ * rename driver to Elasticsearch (s lowercase for search)
+ * update geometry type name for Points
+ * Enable support for Elasticsearch 7 (#1246)
+ * Set 'application/json' in RunRequest() with POST (#1628)
+ * GeoJSON type field should be mapped as text in ES>=5
+ * add FORWARD_HTTP_HEADERS_FROM_ENV open option to pass HTTP headers down to the ES server
+ * translate constructs like CAST(field_name AS CHARACTER[(size)]) = 'foo' to ES query language
 
- o Added the --version and --formats options to many utility programs.
+ESRIJson driver:
+ * attempt identification of SRS from database entries (#2007)
+ * do not require a 'geometry' member to be present in a feature
 
- o gdal_translate:
-    - added -projwin flag to copy a window specified in projection coordinates.
-    - added the -a_srs option to assign a user supplied SRS to output file.
-    - translation with subsetting to any format now support (uses VRT inside).
+GeoJSON driver:
+ * on writing, format OFTDate and OFTDateTime as ISO 8601 strings rather than OGR traditional formatting
+ * add a DATE_AS_STRING open option that can be set to YES to disable autodetection of date/time/datetime
+ * Advertise UTF-8 encoding of strings (#2151).
+ * report 3D layer geometry types (#1495)
+ * fix recognizing some documents with members sorted alphabetically (#1537)
+ * avoid SetFeature() to repeat first feature when looping over features (#1687)
+ * use VSIOverwriteFile() to fix update of file on Windows (fixes https://github.com/qgis/QGIS/issues/28580)
+ * Transform MAX_OBJECT_SIZE to runtime environment option - OGR_GEOJSON_MAX_OBJ_SIZE
+ * on reading of a file that use crs.name = urn:ogc:def:crs:OGC:1.3:CRS84, report EPSG:4326 as we used to do in GDAL 2 (#2035)
+ * in writing mode, implement GetExtent() (#2269)
+ * Add ID_GENERATE option for generating missing feature ids (#2406)
 
- o Lots of metadata now attached to driver objects describing their
-   capabilities.
+GeoJSONSeq driver:
+ * make Open() return successfully only if at least one feature is detected
 
- o Implemented GDALDestroyDriverManager() to ensure full memory cleanup of
-   GDAL related resources.
+GML driver:
+ * support reading standalone geometry (#2386)
+ * fix axis order issue when decoding AIXM ElevationPoint (#2356)
+ * fix axis order issue with gml:CircleByCenterPoint and gml:ArcByCenterPoint (# 2356)
+ * fix handling of angles with ArcByCenterPoint and urn:ogc:def:crs:EPSG::4326, and compound curves made of a sequence of straight lines and ArcByCenterPoint in a <segments> (#2356)
 
- o Added a 'devinstall' target on Windows to support easy installation of
-   include files and stub libraries on Windows.  Also many other improvements
-   to Windows build.  Most options can be easily turned on and off from the
-   nmake.opt file now.
+GPKG driver:
+ * change default value of OGR_GPKG_FOREIGN_KEY_CHECK to NO, so as to avoid issues in downstream software
+ * insert more accurate spatial extent in gpkg_contents
+ * on layer creation, check if the SRS is consistent with its advertise AUTHORITY/ID, and if not do not use official EPSG entries (#1857)
+ * allow parsing datetime serialized as OGR strings, and emit warnings when unrecognized content is found (#2183)
+ * when writing a layer of geometry wkbUnknown, make sure to set gpkg_geometry_columns.z/m to 2 when there are geometries with Z/M values (#2360)
 
+KML driver:
+ * set OAMS_TRADITIONAL_GIS_ORDER for SRS returned on returned layers
 
-## OGR 1.1.8 - Overview of Changes
+LIBKML driver:
+ * make it accept /vsigzip/foo.kml.gz files (#1743)
 
- o Implemented support for writing 2D DGN files.   Added support for MSLINK
-   and Text values available as attributes.
+MITAB driver:
+ * Add friendly layer name (description) support.
+ * Fix creation of long field names in local encoding (#1617)
+ * don't left truncate numeric values in the .dat when the field formatting is incompatible, but error out (#1636)
+ * Add custom datum/spheroid parameters export
+ * Update WindowsLatin2 definition (#1571)
+ * identify correctly GDA2020 datum
+ * do not set (by default) TOWGS84 when reading a known Datum
+ * cleanup management of update flag (#2170)
 
- o Implemented FMEObjects based read driver.
+MSSQLSpatial driver:
+ * Fix handling empty geometries (#1674)
+ * Fix handling mixed geometries (#1678)
+ * avoid GetExtent() to mess with GetNextFeature() statement, so that ogrinfo -al works properly
 
- o Implemented ExecuteSQL() method on OGRDataSource.  Generic code supports
-   fairly full featured SELECT statements.
+MVT driver:
+ * make CONF option accept a filename as well
+ * reduce memory usage when processing big geometries (#1673)
 
- o Various fixes to 3D shapefile support.
+MySQL driver:
+ * Add SRID to geometry when creating layer table (#1015)
+ * use INFORMATION_SCHEMA.ST_GEOMETRY_COLUMNS to get SRSId
 
- o Fixes to binary representation for 2.5D geometries.  Fixed MULTIPOINT WKT
-   geometry representation.
+NAS driver:
+ *  disable generation of .gfs file in read-only file systems (or intended to be), similarly to GML driver
 
- o Upgraded OGRSpatialReference.importFromEPSG() to use the new EPSG 6.2.2
-   tables instead of the old EPSG 4.x tables.
+netCDF driver:
+ * add read/write support for CF-1.8 Encoded Geometries
+ * add support for vector products Sentinel3 SRAL MWR Level 2
 
- o Many fixes to PostGIS driver, including special creation options for
-   "laundering" field names to save tokens.
+NGW driver:
+ * Fix dataset access mode
+ * Add support for layers geometry types with Z
 
- o Many improvements to standards conformance of OGRSpatialReference WKT
-   representation to the OGC Coordinate Transformations specification.  Still
-   some quirks related to prime meridians and coordinate systems with units
-   other than degrees.
+OAPIF driver (previously WFS3):
+ * updated to OGC API - Features 1.0 core spec (#1878)
+ * correctly handle user query string parameters in connection URL (#1710)
+ * add persistent curl session for better performance
+ * add capability to use a XML Schema to build the layer field definition and geometry type
+ * add capability to use JSON schema
+ * add support for rel=queryables and cql-text
+ * add a IGNORE_SCHEMA=YES/NO open option
+ * implement filter-lang=json-filter-expr
+ * avoid issues with double slash when building a /collections URL
 
- o Implemented support for Meridian 2 NTF files in NTF driver.  Better
-   support for GENERIC_CPOLY geometries.
+OSM driver:
+ * make error message hopefully clearer and more complete (#2100)
 
- o  Added support for [NOT] IN, [NOT] LIKE and IS [NOT] NULL predicates in
-   WHERE clauses.
+PDF driver:
+ * fix reading polygon with holes and Bezier curves (#1932)
+ * add a GDAL_PDF_LAUNDER_LAYER_NAMES configuration option
+ * fix reading strings with escape sequences
 
- o Implemented a C API for accessing OGR.
+PostgreSQL driver:
+ * add support for PostgreSQL 12 (#1692)
+ * add support for PG:service=xxx syntax and SERVICE open option (#2373)
+ * support PostGIS schema installed in non-public schema (#2400)
+ * do not attempt to create VARCHAR(n) columns with n >= 10485760 (#1508)
+ * be more restrictive when deducing non-nullability of columns in SQL result layers (#1734)
 
- o Implemented support for building OLE DB Provider with Visual Studio.NET
-   (many changes in ATL templates).  Lots of other OLE DB improvements for
-   better MapGuide compatibility.
+Shape driver:
+ * add read/creation/update support for .shz and .shp.zip
+ * identify a EPSG code if the confidence is >= 90 (https://github.com/OSGeo/PROJ/issues/1799)
+ * better deal with empty .shp+.shx and SHAPE_RESTORE_SHX (#1525)
+ * launder layer name to get Windows compatible filename
+ * try to better deal with polygons with parts touching on an edge (which is illegal simple features) (#1787)
+ * fix crash when creating a layer with a wkbNone geometry type but a SRS (3.0 regression)
+ * include fseek() optimization of https://github.com/OSGeo/shapelib/pull/3
+ * expose .dbf and .cpg source encodings in the SHAPEFILE metadata domain
+ * correctly update layer extent when first feature is a point at (0,0) (#2269)
 
+S57 driver:
+ * s57objectclasses.csv: add missing TXTDSC attribute for DRYDOC class (#1723)
+ * s57objectclasses.csv: add wtwdis and unlocd for distance marks from IENC (#2123)
+ * s57objectclasses.csv: add PICREP attribute to LNDMRK object class
+ * Added handling of ISDT when using updates (#895)
+ * Added creation of additional field "ATTF" when missing while updating (#2249)
 
-# GDAL 1.1.7 - Overview of Changes
+SOSI driver:
+ * Append values from duplicate fields when setting new appendFieldsMap open option (#1794)
 
- o Add XPM (X11 Pixmap) format.
+SQLITE driver:
+ * fix crash in loading sqlite extensions on iOS (#1820)
+ * fix conversion of geometry collections (and derived types) in geometry collections as Spatialite geometries, by flattening the structure
+ * cleanup management of update flag (#2162)
+ * GetSpatialiteGeometryHeader(): fix bug regarding detection of empty geometries
 
- o Added rough ENVI raster format read support.
+SXF driver:
+ * Add open options with RSC file name
+ * Use SXF_LAYER_FULLNAME from dataset open options
+ * Use SXF_SET_VERTCS from dataset open options
+ * Add OGRSXFLayer::CanRecode and check it for OLCStringsAsUTF8 capability
+ * Add driver identify function (#1607)
 
- o Added --version support (and supporting GDALVersionInfo() function).
+VFK driver:
+ * use a faster implementation of VFKDataBlockSQLite::LoadGeometryPolygon()
 
- o Special hooks for getting raw record data from sar ceos files and Envisat
-   via the metadata api.
+VRT driver:
+ * set OAMS_TRADITIONAL_GIS_ORDER for LayerSRS (#1975)
 
- o Upgraded TIFF/GeoTIFF support to CVS version ... includes new extension
-   API and removes need for private libtiff include files entirely.
+WaSP driver:
+ * on creation, make sure the layer geometry type set on the feature definition is wkbLineString25D
 
- o gdal_translate now has scaling option (-scale).
+WFS driver:
+ * Support FlatGeobuf as WFS outputformat (#2135)
+ * skip silently GeoServer EPSG:404000 dummy CRS
 
- o Added utility documentation.
+XLSX driver:
+ * add support for .xlsm extension
 
-## OGR 1.1.7 - Overview of Changes
+## SWIG Language Bindings
 
- o Added Arc/Info binary coverage format read support.
+All:
+ * add osr.SetPROJSearchPath(path) that can be used since setting PROJ_LIB from C# does no work (#1647)
 
- o Added ogrtindex for building MapServer compatible OGR tile indexes.
+Python bindings:
+ * add 'add' option to gdal.Rasterize
+ * add hint&workaround for ImportError on Windows Python >= 3.8
+ * add compatibility with SWIG 4.0 (#1702)
+ * build modules in parallel
+ * honour gdal.UseExceptions() in numpy related methods (gdalnumeric module) (#1515)
+ * update to SWIG 3.0.12 to have better error message (#1677)
+ * make the feature iterator on the layer call ResetReading()
+ * Removed calls to deprecated imp module (#2264)
+ * Add numpy as extras_require dependency (#2158)
+ * emit exception is osr.SpatialReference(wkt) fails, even if in non-UseExceptions() mode, to avoid later cryptic exception (#2303)
+ * NUMPYDataset::Open() / gdal_array.OpenArray(): honour writable flag of the numpy array to decide update status of GDAL dataset
+ * fix invalid check for Dataset.ReadAsArray(buf_obj=some_array, interleave='pixel') scenario
 
- o Added default implementation of GetFeature(fid) method on OGRLayer.
+# GDAL/OGR 3.0.0 Release Notes
 
- o Shape driver now supports reading and creating free standing .dbf files
-   for layers without geometry.
+## In a nutshell...
 
- o Added utility documentation.
+ * Implement RFC 73: Integration of PROJ6 for WKT2, late binding capabilities, time-support and unified CRS database. PROJ >= 6 is now a build requirement
+    https://trac.osgeo.org/gdal/wiki/rfc73_proj6_wkt2_srsbarn
+ * New GDAL drivers:
+  - DAAS: read driver for Airbus DS Intelligence Data As A Service
+  - TileDB: read/write driver for https://www.tiledb.io (#1402)
+ * New OGR drivers:
+  - MongoDBv3: read/write driver using libmongocxx v3.4.0 client (for MongoDB >= 4.0)
+ * Improved drivers:
+   - FITS: read/write support for scale, offset and CRS
+   - netCDF: read support for groups
+   - PDF: add a COMPOSITION_FILE creation option to generate a complex document
+   - PDS4: subdataset creation support, read/write table/vector support
+ * Support for minimal builds on Unix (#1250)
+ * Add a docker/ directory with Dockerfile for different configurations
+ * Continued code linting
 
- o Fixed major memory/file handle leak in SDTS access.
+## New installed files
 
- o Added ADSK_GEOM_EXTENT support for OLE DB provider.
+ * Resource file: pdfcomposition.xsd
 
- o Ensure shapefiles written with correct polygon ring winding direction
-   plus various other shapefile support fixes.
+## Removed installed files
 
- o GML read/write working reasonable well, including use of .gfs files.
+ * Removal of resource files related to EPSG and ESRI CRS databases: compdcs.csv, coordinate_axis.csv, datum_shift.csv, ellipsoid.csv, esri_epsg.wkt, esri_extra.wkt, esri_Wisconsin_extra.wkt, gcs.csv, gcs.override.csv, gdal_datum.csv, geoccs.csv, pcs.csv, pcs.override.csv, prime_meridian.csv, projop_wparm.csv, unit_of_measure.csv, vertcs.csv, vertcs.override.csv
 
+## Backward compatibility issues
 
-# GDAL 1.1.6 - Overview of Changes
+See MIGRATION_GUIDE.txt
 
- o Add > 2GB file support on Linux 2.4.
+## GDAL/OGR 3.0.0 - General Changes
 
- o Implemented USGS DEM reading.
+Build(Unix):
+ * Allow internal drivers to be disabled (#1250)
+ * Fix build with OpenBSD which doesn't support RLIMIT_AS (#1163)
+ * Fix MacOS build failures due to json-c
+ * Poppler: require pkg-config
+ * PostgreSQL: Switch from pg_config to pkg-config (#1418)
+ * fix build --without-lerc (#1224)
+ * fix netcdf_mem.h detection in netcdf 4.6.2 (#1328)
+ * Fix build --with-curl --without-threads (#1386)
 
- o Implemented BSB Format (Nautical Chart Format) read support.
+Build(Windows):
+ * nmake.opt: remove unicode character at line starting with '# 4275' that apparently cause build issues with some MSVC versions (#1169)
 
- o Preliminary implementation of Virtual Datasets (gdal/frmts/vrt).
+All:
+ * PROJ >= 6.0 is a required external dependency
+ * libgeotiff >= 1.5 should be used for builds with external libgeotiff
+ * Poppler: drop support for Poppler older than 0.23.0
+ * Poppler: add support for 0.72.0, 0.73.0, 0.75.0, 0.76.0
 
- o Support for writing DTED files.
+## GDAL 3.0.0 - Overview of Changes
 
- o Some raw formats (i.e. PAux, HKV) support files larger than 2GB.
+Port:
+ * Add capability to define external VSI virtual file systems from C API (#1289)
+ * MiniXML: Fix wrong node order when calling CPLAddXMLAttributeAndValue() after CPLCreateXMLElementAndValue()
+ * /vsicurl/: ReadMultiRange(): use default implementation if there is a single range (#1206)
+ * /vsicurl/: ignore proxy CONNECT response headers (#1211)
+ * /vsicurl/: automatically detect signed URLs where host ends with a port number; also detect signed URLs as created with the AWS4-HMAC-SHA256 method (#1456)
+ * /vsizip/: Add config option to create zip64 extra fields by default (#1267)
+ * /vsis3/, /vsigs/, /vsiaz/: add HTTP retry logic in writing code paths
+ * Fix data race in VSIFileManager::Get
+ * cpl_zipOpenNewFileInZip3: fix memory leak in error code path. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13103.
+ * VSIGZipWriteHandleMT: avoid potential deadlock in case of error
+ * Fix assertion in CPLGetValueType when testing non-ASCII chars
+ * /vsihdfs/: fix Read() when more than one hdfsRead call is needed (#1349)
+ * Fix potential buffer overflow in CPLODBCSession::Failed (#1390)
+ * /vsitar/: handle .tar file header with space padding instead of 0 for file size (#1396)
 
- o Add the AddBand() method on GDALDataset.
+Core:
+ * Support blocks larger than 2 billion pixels/bytes
+ * Make CPLHaveRuntimeSSSE3() and CPLHaveRuntimeAVX() use GCC constructor functions
+ * Move RawDataset base class to gcore/ (#1268)
+ * RasterBand/Dataset::RasterIO(): enforce access mode on write
+ * PAM: preserve existing metadata when setting new one (#1430)
+ * RawDataset: use generic RasterIO() implementation when non-nearest resampling is asked (#1301)
+ * DumpJPK2CodeStream(): dump PLT and POC markers
 
- o PAux: Added color table read support.
+Algorithms:
+ * RPC transformer: test success code of GDALRPCTransform() in GDALCreateRPCTransformer()
+ * RPC transformer: add a RPC_FOOTPRINT transformer option to provide a polygon in long/lat space where the RPC is valid, and also make gdalwarp use GDALSuggestedWarpOutput2() to restrict the bounding box of the output dataset
+ * GDALFillNodata(): fix wrong comparison in QUAD_CHECK() macro: nNoDataVal is only assigned to target_y values (#1228)
+ * GDALFillNodata(): reinitialize panLastY array to nNoDataVal before bottom to top pass (#1228)
+ * GDALFillNodata(): do an extra iteration to reach the maximum search distance in all quadrants (#1228)
+ * GDALRasterizeLayersBuf():support any GDAL data type for buffer,and pixel and line spaceing arguments
+ * GDALResampleChunk32R_Mode: performance improvement
+ * Rasterize with MERGE_ALG=ADD: avoid burning several times intermediate points of linestrings (#1307)
+ * rasterize: fix crash when working buffer is larger than 2GB (#1338)
 
- o Various fixes to OGDI driver.
+Utilities:
+ * gdal_translate: add "-nogcp" option (#1469)
+ * gdal_contour: remove explicit width/precision=12/3 of the elev field (#1487)
+ * gdaldem hillshade: add -igor option (#1330)
+ * gdalwarp -crop_to_cutline: do not round computed target extent to be aligned on the grid of the source raster if -tr is set (restore partially pre 2.4 behavior) (#1173)
+ * gdalwarp: assume -tap when using -crop_to_cutline, -tr and -wo CUTLINE_ALL_TOUCHED=TRUE, so as to avoid issues with polygons smaller than 1x1 pixels (#1360)
+ * gdal2tiles: give local tile layer and basemap layers same min/max zoom levels as generated tile cache
+ * gdal2tiles: fix breakage of openlayers.html getURL() javascript function, introduced in GDAL 2.3.3 / 2.4.0 (#1127)
+ * gdal2tiles: prevent accidental copy of full GeoTIFF into temporary .vrt file
+  gdal2tiles: Refactor and fix multiprocessing completion handling
+ * gdal_fillnodata.py: preserve color interpretation and table
+ * gdal_fillnodata.py: do not set geotransform if source doesn't have one
+ * gdalsrsinfo: do not silence errors when calling SetFromUserInput()
+ * gdal_retile: Use nodata value from origin dataset
+ * gdal_edit.py: allow setting band-specific scale and offset values (#1444)
+ * validate_cloud_optimized_geotiff.py: check if file is only greater than 512px (#1403)
+ * validate_cloud_optimized_geotiff.py: report headers size
 
- o Stripped out the GDALProjDef related capabilities.  Superseded by
-   OGRSpatialReference, and OGRCoordinateTransformation functionality.
+Multidriver fixes:
+  * GTiff, GPKG, MBTiles, PostgisRaster drivers: ensure that main dataset and overviews share the same lock, so as to avoid crashing concurrent access (#1488)
 
- o Improved CEOS support, notable for ESA LANDSAT files, D-PAF ERS-1 and
-   Telaviv ERS data.
+ADRG driver:
+ * modified to ensure that there is no confliction between ADRG and SRP when opening a .gen file (#953)
 
- o geotiff: upgraded libtiff support to approximately libtiff 3.5.7.
+AIGRID / AVCBin:
+ * fix filename case adjustment that failed on /vsi filesystems (#1385)
 
- o DGN: Added support for complex shapes, shapes assembled from many elements.
-   Various other improvements.
+BAG driver:
+ * fix potential nullptr deref on corrupted file
 
+COSAR driver:
+ * avoid out-of-bound write on corrupted dataset. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=12360.
 
-## OGR 1.1.6 - Overview of Changes
+EEDA driver:
+ * report 'path' metadata in 'path' field
 
- o Fixed OGDI driver so that gltp urls with drive letters work properly on
-   windows.
+GPKG driver:
+ * allow negative srs_id values in gpkg_spatial_ref_sys
+ * reduce memory requirements for cached tiles
 
- o Many improvements to OLE DB provider during the process of making it
-   compatible with the MapGuide (SDP) client.  These include implementing
-   restrictions for schema rowsets, treating missing information like WKT
-   coordinate systems as NULL fields, and setting ISLONG on geometry fields.
-   Also made thread safe.
+GTiff diver:
+ * supports tiles/strips larger than 2GB
+ * add APPEND_SUBDATASET=YES capability to create subdataset / new TIFF page to an existing file
+ * only report scale/offset deduced from ModelTiepointTag and ModelPixelScaleTag if the SRS has a vertical component (and thus currently if GTIFF_REPORT_COMPD_CS is set) (https://issues.qgis.org/issues/20493)
+ * TIFF Lerc: properly initialize state after Create() so that BuildOverviews() succeed (#1257)
+ * emit merged consecutive multi-range reads (#1297)
+ * add warnings when using unsupported combination of internal mask+external overview, and fix COPY_SRC_OVERVIEWS=YES so that it does not copy ALL_VALID masks (#1455)
+ * do not generate a TIFFTAG_GDAL_METADATA with color interpretation information for JPEG YCbCr compression
+ * Internal libtiff and libgeotiff: resync with upstream
 
- o DGN: Threat SHAPE elements as polygons.  Set style information for text.
-   Added 3D support for most elements.
+FITS driver:
+ * new functions for Scale Offset and FITS World Coordinate System read and write (#1298)
 
- o Fixed bugs in WKT format for some OGR geometry types (i.e. multipoint).
+GeoRaster driver:
+ * Fix memory leaks
 
- o Added support for morphing to/from ESRI WKT format for OGRSpatialReference.
+HDF5 driver:
+ * support reading blocks larger than 2GB
+ * fix handling of attributes of type SCHAR, UCHAR, USHORT and UINT (https://github.com/mapbox/rasterio/issues/1663)
+ * detect nodata from netCDF _FillValue (#1451)
+ * add more strict checks for accepting datasets for GCP, and handle nodata in GCP too (#1451)
 
- o NTF: Don't try to cache all the records from multiple files at once.
+IGNFHeightAsciiGrid driver:
+ * add support for RAF18.mnt
 
- o Added experimental XML SRS support ... not the final schema.  Added
-   supporting "minixml" support to CPL.
+JPEG driver:
+ * fix GDAL 2.3.0 performance regression when decoding JPEG (or GPKG using JPEG) images (#1324)
 
- o PostGIS: Upgraded to PostGIS 0.6.  Added "soft transaction" semantics.
-   Many create feature calls can now be part of one transaction.  Transactions
-   are now a general OGR concept although only implemented for PostGIS.
+KEA driver:
+ * add support for /vsi file systems
 
- o Added transform() and transformTo() methods for reprojecting geometries and
-   added user options for this in ogr2ogr.
+KMLSuperOverlay driver:
+ * report color table of single overlay datasets, and also handle some variation in the KML structure (https://issues.qgis.org/issues/20173)
 
- o Very preliminary GML read/write support.  Needs Xerces C++ XML parser for
-   read support.
+MRF driver:
+ * sparse index and internal resampling fixes
+ * fix integer overflow. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13974
 
-# GDAL 1.1.5 New Features
+MrSID driver:
+ * fix potential crash when a zoom level cannot be opened
 
-o AIGrid:
-- Return nodata value.
+netCDF driver:
+ * implement support for NetCDF-4 groups on reading (#1180)
+ * support complex data types (#1218)
+ * fix crash when opening a dataset with an attribute of length 0 (#1303)
+ * fix IWriteBlock() to support non-scanline blocks, and use the chunk size
+ * better deal with datasets indexed with unusual order for x/y dimensions
+ * avoid inappropriate shift by -360 when attribute axis=X is set (#1440)
 
-o OGDI:
-- Added format user documentation.
-- Added Sub Dataset support.
-- Utilize OGDI 3.1 style capabilities metadata.
+NGW driver:
+ * Add CreateCopy function
 
-o SAR_CEOS:
-- Added support for Alaska SAR Toolbox naming convention.
-- Read map projection record for corner GCPs.
+NITF driver:
+ * avoid harmless floating point division by zero. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=12844.
 
-o PNG Driver:
-- read/write support for transparency via colortable and nodata value.
+PCIDSK driver:
+ * avoid uint overflow and too big memory allocation attempt. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=12893
 
-o Erdas Imagine (HFA) Driver:
-- Added support for reading external large image files.
-- Added support for uncompressed, but reduced precision blocks.
+PDF driver:
+ * Add a COMPOSITION_FILE creation option to generate a complex document
+ * And a gdal_create_pdf.py sample script
+ * Fix selection of Poppler PDF layers with duplicate names (#1477)
+ * avoid division by zero when generating from vector content whose bounding box is almost a horizontal or vertical line. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13408
 
-o GIF Driver:
-- Added .wld world file support.
-- Added transparency read support.
-- Upgraded to libungif 4.x.
+PDS3:
+ * fix decoding of band interleaved images (such as for CRISM HSP) (#1239)
+ * add support for ENCODING_TYPE=DCT_DECOMPRESSED (#1457)
 
-o JPEG Driver:
-- Added .wld world file support.
+PDS4 driver:
+ * add subdataset creation support, and getting/setting the band unit
+ * update template and code to PDS v1B00 schema versions
 
-o PAux Driver:
-- Added limited gcp and projection read support.
+VRT driver:
+ * Python pixel functions: add shared object name for python 3.7
+ * VRT: in case of no SourceProperties, do not use global shared datasets, but only shared to the owning VRTDataset, to avoid potential reference cycles and annoying related issues. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13476.
 
-o GeoTIFF Driver:
-- Added specialized support for 1 bit files.
-- Upgraded world file reading (added .wld files), use
-GDALReadWorldFile().
+WCS driver:
+ * avoid potential out-of-bound access
 
-o JDEM Driver is new (Japanese DEM format).
+WMS driver:
+ * use proper JSon parsing for ESRI MapServer document (#1416)
+ * Add url parameters escaping to ArcGIS Server minidriver
+ * avoid warning when a wms cache doesn't exist
 
-o FujiBAS Driver is new.
+XPM driver:
+ * fix read heap buffer overflow on corrupted image. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13455.
 
-o ERMapper ECW Driver is new.
+XYZ driver:
+ * add creation options DECIMAL_PRECISION and SIGNIFICANT_DIGITS like with AAIGrid
+ * fix regression regarding header lines that are not X,Y,Z (#1472)
 
-o GDAL Bridge: upgraded to include new entry points, like GCP access and
-nodata api.
+## OGR 3.0.0 - Overview of Changes
 
-o gdal_translate: added the -not_strict option.
+Core:
+ * Add OGR_G_MakeValid() (requires GEOS 3.8)
+ * change prototye of OGRFeature::SetField( int iField, int nBytes, GByte *pabyData ) to ( ... , const void* pabyData), and same for OGR_F_SetFieldBinary().
+ * Polyhedral surface: fix importFromWKT to properly fix Z/M flag
+ * OGRBuildPolygonFromLines: avoid generating effectively duplicate points
+ * OGRBuildPolygonFromEdges(): improve performance. https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13798
+ * OGRGeometryFactory::transformWithOptions(): if WRAPDATELINE=YES, test that the geometry SRS is geographic
+ * OGRGeometryFactory::GetCurveParameters(): fix assertion when coordinates are very near 0
+ * Expat XML parsing: add OGR_EXPAT_UNLIMITED_MEM_ALLOC=YES config option to workaround failure for very specific cases
+ * OGRLineString::segmentize(): fix issues when segment length is divisible by maxlength (#1341)
+ * OGR SQL: limit recursion in swq_expr_node::Check(). Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13540
+ * OGRGeometry / SFCGAL: fix dead code, memory leaks and potential nullptr deref.
 
-o GDALGetRandomRasterSample(): Return magnitude for random samples.
+OGRSpatialReference:
+ * Deep rework due to RFC 73 integration
+ * SRS_WKT_WGS84 macro replaced by SRS_WKT_WGS84_LAT_LONG
+ * Add OSRSetPROJSearchPaths(), OSRExportToWktEx(), OSRGetName(), OSRIsSameEx(), OSRGetCRSInfoListFromDatabase(), OSRGetAreaOfUse(),OSRGetAxisMappingStrategy(), OSRSetAxisMappingStrategy(), OSRGetDataAxisToSRSAxisMapping()
+ * Add OCTNewCoordinateTransformationOptions(), OCTCoordinateTransformationOptionsSetOperation(), OCTCoordinateTransformationOptionsSetAreaOfInterest(), OCTDestroyCoordinateTransformationOptions(), OCTNewCoordinateTransformationEx(), OCTTransform4D()
+ * Remove OSRFixupOrdering(), OSRFixup(), OSRStripCTParms(), OCTProj4Normalize(), OCTCleanupProjMutex(), OPTGetProjectionMethods(), OPTGetParameterList(), OPTGetParameterInfo()
 
-o Added use of CPL_CVSID macro in most source files. Running the RCS ident
-command on any GDAL executable or shared library should now give a listing
-of most object file versions from which it was built.
+Utilities:
+ * ogrinfo: report TITLE metadata in summary layer listing
+ * ogr2ogr: for drivers supporting ODsCCreateGeomFieldAfterCreateLayer, do not create geometry column if -nlt none
+ * ogrmerge.py: add shared='1' to speed-up -single mode with many layers
 
-o Various improvements so that static builds will work under Cygwin.
+CARTO driver:
+ * Overwrite tables in single transactions
+ * Improve documentation and warnings around CARTODBFY (#1445)
 
-o Various improvements so that builds can be done on MacOS X.
+CSW driver:
+ * fix crash when geometry parsing fails (#1248)
 
-o Overviews: Implement AVERAGE_MAGPHASE option for complex image overviews.
+DODS driver:
+ * fixes related to memory leaks and null pointer dereferences
 
-o Added support for sub datasets to gdalinfo, core api and OGDI raster driver.
+DXF driver:
+ * support RGB true color values
+ * fix the coloring of ByBlock entities inserted via a ByLayer INSERT
+ * fix double-free issue in case of writing error. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13516.
 
-o The size of the GDAL cache can now be overridden with the GDAL_CACHEMAX
-environment variable (measured in MB).
+FileGDB/OpenFileGDB drivers:
+ * be robust when winding order of outer ring is incorrect (#1369)
 
-o Added Driver implementation tutorial to documentation.
+Elasticsearch driver:
+ * Fixed index comparison bug when a index have at least one mapping
+ * Fix _mapping url for Elasticsearch 7 compatibility
 
-o Added apps/gdaltindex.c - application for building tile indexed raster
-datasets suitable for use with UMN MapServer.
+GeoJSON driver:
+ * speed-up random reading with GetFeature() by storing a map FID->(start,size) to retrieve performance similar to GDAL 2.2 or before (https://issues.qgis.org/issues/21085)
+ * report 3D layer geometry types (#1495)
 
+GeoJSONSeq driver:
+ * be more robust to invalid objects, and fixes performance issue on corrupted files. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13770.
 
-## GDAL 1.1.5 Significant Bug Fixes
+GML driver:
+ * write SRSName element in .gfs when parsing a GML file with srsName only on top-level boundedBy element (#1210)
+ * Add "FeatureType" to list of suffixes recognized by XSD parser (#1313)
+ * GML/WFS: add minimum support for 'hexBinary' type (as string) (#1375)
 
-o SAR_CEOS:
-- Don't try to get GCPs from scanlines with no prefix data.
+GMLAS driver:
+ * avoid null pointer dereference on some schemas
+ * do not use space as separator for schema filename in XSD open option (#1452)
 
-o GeoTIFF:
-- Fixed handling of RGBA band ordering on big endian systems.
-- Fixed bugs in overview generation, especially when updating in place.
+GMT driver:
+ * use file extension based detection to accept files without header (#1461)
 
-o gdal-config should work properly in all situations now.
+MongoDB driver:
+ * fix related to filters in GetFeature()
 
-o JPEG Driver: improved magic number tested to avoid ignoring some jpeg files.
+MITAB driver:
+ * Add encode/decode feature labels to/from UTF-8 encoding while MIF file read/write (#1151)
+ * .tab: fix deleting a feature without geometry (#1232)
+ * adapt dynamically default projection bounds to false_easting/false_northing values (#1316)
+ * avoid potential assertion or stack buffer overflow on corrupted .ind files. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11999
+ * prevent potential infinite recursion on broken indexes. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=12739.
+ * TAB_CSLLoad(): fix performance issue. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13588
+ * avoid long processing on corrupted .mif files. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13152
 
-o FITS Driver: lots of fixes and improvements.
+MSSQLSpatial driver:
+ * Add support for curve geometries (#1299)
+ * Add option to expose the FID column as a feature attribute (#1227)
+ * Adding improved extent queries
+ * Fix extent calculation for geography type, take care of invalid geometries
 
+NGW driver:
+ * Fix get children API. Add authorization support to create dataset options
+ * Add support for feature extensions in OGRFeature native data
+ * Add feature query via chunks, attribute and spatial filter support
+ * Add resource type and parent identifier to metadata
+ * Fix batch update features
+ * Add JSON_DEPTH open option
+ * Add check forbidden field names, check duplicate field names.
 
-## OGR 1.1.5 New Features
+OCI driver:
+ * Add MULTI_LOAD to open options (#1233)
+ * Fix memory leaks
 
-o Implemented support for attribute query filters (SetAttributeFilter())
-on OGRLayer, provided SWQ based implementation, plugged into all
-drivers and added hooks to ogrinfo.
+ODS driver:
+ * allow opening tables with empty cells with huge values of columns-repeated attribute at end of line (#1243)
+ * avoid potential null pointer dereference when writing to corrupted filename. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=12976.
 
-o MapInfo Driver:
-- Added accelerated spatial query support.
-- Upgraded to current MITAB source as of GDAL release date.
+OGDI driver:
+ * switch incorrect order for east/west bounds of spatial filter
 
-o S-57 Driver:
-- Added support for applying S-57 updates automatically.
+PDS4 driver:
+ * add read/write support for tables (vector support)
 
-o SDTS Driver:
-- Added ENID and SNID to line features.
-- Return coordinate system in WKT instead of PROJ.4 format.
+PGDump driver:
+ * in WRITE_EWKT_GEOM=YES non-default mode, export geometries to ISO WKT so as to be able to export XYZM (#1327)
+ * Fix emitted SQL when UNLOGGED=ON
 
-o Shapefile Driver:
-- Auto determine shapefile type from first object written.
-- Added good support for NULL shapes, and NULL attribute fields.
-- Added support for .prj files (read and write).
+PLScenes driver:
+ * update plscenesconf.json with SkySatCollect and add missing fields for PSOrthoTile
 
-o PostgreSQL Driver:
-- Added PostGIS support.
-- Pass attribute queries through to PostgreSQL.
+SDTS driver:
+ * error out if too many errors are raised to avoid timeout in oss-fuzz. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13819.
 
-o NTF Driver:
-- Added support for GTYPE 5 geometries (a type of arc).
-- Added support for GEOMETRY3D records in indexed (generic) datasets.
+Selafin driver:
+ * avoid null pointer dereference on corrupted files. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=12356.
 
-o TIGER/Line Driver:
-- Added write support.
-- Improved read support for TIGER 2000.
+Shapefile driver:
+* DeleteLayer(): make it delete .cpg, .sbn, .sbx, .qpj and other sidecar files (#1405)
+ * speed-up creation of lots of fields with name collisions. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13065
 
-o OLE DB Provider:
-- Added support for spatial queries via ICommand parameters.
-- Added support for attribute queries by parsing out WHERE clause.
-- In general substantial rework and extensions were made to make it
-work with ESRI and AutoDesk clients.
+SQLite driver:
+ * set sqlite3_busy_timeout, handle SQLITE_BUSY during tile read (#1370)
+ * close database before freeing the spatialite context. Fix crashes on dataset closing, with VirtualShape and recent spatialite versions
+ * Spatialite: fix update of geometry_columns_statistics when extent goes to infinity (#1438)
 
-o Added gdal/data/stateplane.txt - a test file with one line per state plane
-zone for applications wanting to present options to users.
+S57 driver:
+ * avoid long procession on corrupted datasets. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13238
 
-o Install ogrsf_frmts.a on install if building with OGR support enabled.
+SXF driver:
+ * Fix wrong EPSG codes range (#1278)
+ * Fix memory leaks in SetVertCS()
 
-o Reports layer extents in ogrinfo.
+VFK driver:
+ * fix curved geometries being ignored (#1351)
 
-## OGR 1.1.5 Significant Bug Fixes
+WFS3 driver:
+ * handle paging with missing type for rel:next, and better deal with user:pwd in URL
+ * use 'id' attribute of collection items, if 'name' not available
 
-o OGRSpatialReference:
-- Fix bug with extracting linear units from EPSG derived definitions.
-- Fixed bug translating LCC from EPSG to WKT (importFromEPSG()).
-- Improved IsSame() test for GEOGCS now.
-- Fixed crash if PROJECTION missing from PROJCS definition.
+## SWIG Language Bindings
 
-o S-57:
-- Improve recovery from corrupt line geometries.
-- Read objects as generic if the object class is not recognised.
-- Handle LIST attributes as a string, instead of as a single int.
+All bindings:
+ * add Geometry::MakeValid()
 
-o NTF:
-- Fixed circle conversion to polylines to close the circle properly.
-- Upped MAX_LINK to 5000 to handle much more complex geometries.
+Python bindings:
+ * fix Dataset.ReadAsRaster() on CInt16 data type (#82)
+ * adding overviewLevel option to WarpOptions
+ * add noGCP options to gdal.Translate()
 
-o DGN:
-- Don't include elements with the complex bit set in extents
-computations.
+# GDAL 2.x and older
 
-o OGRGeometry:
-- Fixed WKT format (import and export) for various container types.
-- WKT import fixed for coordinates, and Z coordinates.
+Consult [NEWS-2.x.md](NEW-2.x.md)
diff --git a/README.md b/README.md
index 4d458ac82db1..40abb5b270ac 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,6 @@ GDAL - Geospatial Data Abstraction Library
 [![Build Status](https://github.com/OSGeo/gdal/actions/workflows/clang_static_analyzer.yml/badge.svg)](https://github.com/osgeo/gdal/actions?query=workflow%3A%22CLang+Static+Analyzer%22+branch%3Amaster)
 [![Build Status](https://github.com/OSGeo/gdal/actions/workflows/code_checks.yml/badge.svg)](https://github.com/osgeo/gdal/actions?query=workflow%3A%22Code+Checks%22+branch%3Amaster)
 [![Build Status](https://github.com/OSGeo/gdal/actions/workflows/conda.yml/badge.svg)](https://github.com/osgeo/gdal/actions?query=workflow%3A%22Conda%22+branch%3Amaster)
-[![Build Status](https://app.travis-ci.com/OSGeo/gdal.svg?branch=master)](https://app.travis-ci.com/OSGeo/gdal)
 [![Build Status](https://scan.coverity.com/projects/749/badge.svg?flat=1)](https://scan.coverity.com/projects/gdal)
 [![Documentation build Status](https://github.com/OSGeo/gdal/workflows/Docs/badge.svg)](https://github.com/osgeo/gdal/actions?query=workflow%3A%22Docs%22+branch%3Amaster)
 [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/gdal.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:gdal)
diff --git a/VERSION b/VERSION
index 30291cba2230..afad818663d0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.10.0
+3.11.0
diff --git a/alg/CMakeLists.txt b/alg/CMakeLists.txt
index fe008aa60681..98a86899f765 100644
--- a/alg/CMakeLists.txt
+++ b/alg/CMakeLists.txt
@@ -36,8 +36,14 @@ add_library(
   rasterfill.cpp
   thinplatespline.cpp
   gdal_simplesurf.cpp
-  viewshed.cpp
+  viewshed/combiner.cpp
+  viewshed/cumulative.cpp
+  viewshed/progress.cpp
+  viewshed/util.cpp
+  viewshed/viewshed.cpp
+  viewshed/viewshed_executor.cpp
   gdalgenericinverse.cpp
+  gdal_interpolateatpoint.cpp
 )
 
 add_dependencies(alg generate_gdal_version_h)
@@ -51,11 +57,15 @@ target_compile_options(alg PRIVATE $<$<COMPILE_LANGUAGE:CXX>:${GDAL_CXX_WARNING_
 target_compile_options(alg PRIVATE $<$<COMPILE_LANGUAGE:C>:${GDAL_C_WARNING_FLAGS}>)
 
 target_include_directories(
-  alg PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/marching_squares> $<TARGET_PROPERTY:gdal_GTIFF,SOURCE_DIR>
+  alg PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/marching_squares>
               $<TARGET_PROPERTY:gdal_vrt,SOURCE_DIR> $<TARGET_PROPERTY:gdal_MEM,SOURCE_DIR>)
 set_property(TARGET alg PROPERTY POSITION_INDEPENDENT_CODE ${GDAL_OBJECT_LIBRARIES_POSITION_INDEPENDENT_CODE})
 target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:alg>)
 
+if (GDAL_ENABLE_DRIVER_GTIFF)
+  target_include_directories(alg PRIVATE $<TARGET_PROPERTY:gdal_GTIFF,SOURCE_DIR>)
+endif()
+
 if (GDAL_USE_GEOS)
   target_compile_definitions(alg PRIVATE -DHAVE_GEOS=1)
   gdal_target_link_libraries(alg PRIVATE ${GEOS_TARGET})
diff --git a/alg/armadillo_headers.h b/alg/armadillo_headers.h
index 6d4fb780103a..d3210e1c4a76 100644
--- a/alg/armadillo_headers.h
+++ b/alg/armadillo_headers.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2019, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef ARMADILLO_HEADERS_H
diff --git a/alg/contour.cpp b/alg/contour.cpp
index 34f29761b4f3..9c74574b1a95 100644
--- a/alg/contour.cpp
+++ b/alg/contour.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.com>
  * Copyright (c) 2018, Oslandia <infos at oslandia dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "level_generator.h"
@@ -34,6 +18,7 @@
 #include "utility.h"
 #include "contour_generator.h"
 #include "segment_merger.h"
+#include <algorithm>
 
 #include "gdal.h"
 #include "gdal_alg.h"
@@ -43,6 +28,9 @@
 #include "ogr_srs_api.h"
 #include "ogr_geometry.h"
 
+#include <climits>
+#include <limits>
+
 static CPLErr OGRPolygonContourWriter(double dfLevelMin, double dfLevelMax,
                                       const OGRMultiPolygon &multipoly,
                                       void *pInfo)
@@ -106,10 +94,27 @@ static CPLErr OGRPolygonContourWriter(double dfLevelMin, double dfLevelMax,
 
     OGR_F_SetGeometryDirectly(hFeat, hGeom);
 
-    const OGRErr eErr =
+    OGRErr eErr =
         OGR_L_CreateFeature(static_cast<OGRLayerH>(poInfo->hLayer), hFeat);
     OGR_F_Destroy(hFeat);
 
+    if (eErr == OGRERR_NONE && poInfo->nTransactionCommitInterval > 0)
+    {
+        if (++poInfo->nWrittenFeatureCountSinceLastCommit ==
+            poInfo->nTransactionCommitInterval)
+        {
+            poInfo->nWrittenFeatureCountSinceLastCommit = 0;
+            // CPLDebug("CONTOUR", "Flush transaction");
+            eErr =
+                OGR_L_CommitTransaction(static_cast<OGRLayerH>(poInfo->hLayer));
+            if (eErr == OGRERR_NONE)
+            {
+                eErr = OGR_L_StartTransaction(
+                    static_cast<OGRLayerH>(poInfo->hLayer));
+            }
+        }
+    }
+
     return eErr == OGRERR_NONE ? CE_None : CE_Failure;
 }
 
@@ -175,7 +180,7 @@ struct PolygonContourWriter
     std::unique_ptr<OGRMultiPolygon> currentGeometry_ = {};
     OGRPolygon *currentPart_ = nullptr;
     OGRContourWriterInfo *poInfo_ = nullptr;
-    double currentLevel_;
+    double currentLevel_ = 0;
     double previousLevel_ = 0;
 };
 
@@ -546,6 +551,13 @@ mode.
  * If YES, contour polygons will be created, rather than polygon lines.
  *
  *
+ *   COMMIT_INTERVAL=num
+ *
+ * (GDAL >= 3.10) Interval in number of features at which transactions must be
+ * flushed. The default value of 0 means that no transactions are opened.
+ * A negative value means a single transaction. The function takes care of
+ * issuing the starting transaction and committing the final one.
+ *
  * @return CE_None on success or CE_Failure if an error occurs.
  */
 CPLErr GDALContourGenerateEx(GDALRasterBandH hBand, void *hLayer,
@@ -562,6 +574,14 @@ CPLErr GDALContourGenerateEx(GDALRasterBandH hBand, void *hLayer,
     if (opt)
     {
         contourInterval = CPLAtof(opt);
+        // Written this way to catch NaN as well.
+        if (!(contourInterval > 0))
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                     "Invalid value for LEVEL_INTERVAL. Should be strictly "
+                     "positive.");
+            return CE_Failure;
+        }
     }
 
     double contourBase = 0.0;
@@ -661,25 +681,42 @@ CPLErr GDALContourGenerateEx(GDALRasterBandH hBand, void *hLayer,
     if (hSrcDS != nullptr)
         GDALGetGeoTransform(hSrcDS, oCWI.adfGeoTransform);
     oCWI.nNextID = 0;
+    oCWI.nWrittenFeatureCountSinceLastCommit = 0;
+    oCWI.nTransactionCommitInterval =
+        CPLAtoGIntBig(CSLFetchNameValueDef(options, "COMMIT_INTERVAL", "0"));
+
+    if (oCWI.nTransactionCommitInterval < 0)
+        oCWI.nTransactionCommitInterval = std::numeric_limits<GIntBig>::max();
+    if (oCWI.nTransactionCommitInterval > 0)
+    {
+        if (OGR_L_StartTransaction(static_cast<OGRLayerH>(hLayer)) !=
+            OGRERR_NONE)
+        {
+            oCWI.nTransactionCommitInterval = 0;
+        }
+    }
+
+    int bSuccessMin = FALSE;
+    double dfMinimum = GDALGetRasterMinimum(hBand, &bSuccessMin);
+    int bSuccessMax = FALSE;
+    double dfMaximum = GDALGetRasterMaximum(hBand, &bSuccessMax);
+    if ((!bSuccessMin || !bSuccessMax))
+    {
+        double adfMinMax[2];
+        if (GDALComputeRasterMinMax(hBand, false, adfMinMax) == CE_None)
+        {
+            dfMinimum = adfMinMax[0];
+            dfMaximum = adfMinMax[1];
+        }
+    }
 
     bool ok = false;
+
     try
     {
         if (polygonize)
         {
-            int bSuccessMin = FALSE;
-            double dfMinimum = GDALGetRasterMinimum(hBand, &bSuccessMin);
-            int bSuccessMax = FALSE;
-            double dfMaximum = GDALGetRasterMaximum(hBand, &bSuccessMax);
-            if ((!bSuccessMin || !bSuccessMax) && !fixedLevels.empty())
-            {
-                double adfMinMax[2];
-                if (GDALComputeRasterMinMax(hBand, false, adfMinMax) == CE_None)
-                {
-                    dfMinimum = adfMinMax[0];
-                    dfMaximum = adfMinMax[1];
-                }
-            }
+
             if (!fixedLevels.empty())
             {
                 // If the minimum raster value is larger than the first requested
@@ -696,39 +733,89 @@ CPLErr GDALContourGenerateEx(GDALRasterBandH hBand, void *hLayer,
                         }
                     }
                 }
+
+                // Largest requested level (levels are sorted)
+                const double maxLevel{fixedLevels.back()};
+
+                // If the maximum raster value is smaller than the last requested
+                // level, select the requested level that is just above the
+                // maximum raster value
+                if (maxLevel > dfMaximum)
+                {
+                    for (size_t i = fixedLevels.size() - 1; i > 0; --i)
+                    {
+                        if (fixedLevels[i] <= dfMaximum)
+                        {
+                            dfMaximum = fixedLevels[i + 1];
+                            break;
+                        }
+                    }
+                }
+
+                // If the maximum raster value is equal to the last requested
+                // level, add a small value to the maximum to avoid skipping the
+                // last level polygons
+                if (maxLevel == dfMaximum)
+                {
+                    dfMaximum = std::nextafter(
+                        dfMaximum, std::numeric_limits<double>::infinity());
+                }
             }
 
             PolygonContourWriter w(&oCWI, dfMinimum);
             typedef PolygonRingAppender<PolygonContourWriter> RingAppender;
             RingAppender appender(w);
-            if (!fixedLevels.empty())
+
+            if (expBase > 0.0)
             {
-                FixedLevelRangeIterator levels(&fixedLevels[0],
-                                               fixedLevels.size(), dfMaximum);
-                SegmentMerger<RingAppender, FixedLevelRangeIterator> writer(
-                    appender, levels, /* polygonize */ true);
-                ContourGeneratorFromRaster<decltype(writer),
-                                           FixedLevelRangeIterator>
-                    cg(hBand, useNoData, noDataValue, writer, levels);
-                ok = cg.process(pfnProgress, pProgressArg);
+                // Do not provide the actual minimum value to level iterator
+                // in polygonal case, otherwise it can result in a polygon
+                // with a degenerate min=max range.
+                ExponentialLevelRangeIterator generator(
+                    expBase, -std::numeric_limits<double>::infinity());
+                auto levelIt{generator.range(dfMinimum, dfMaximum)};
+                for (auto i = levelIt.begin(); i != levelIt.end(); ++i)
+                {
+                    const double level = (*i).second;
+                    fixedLevels.push_back(level);
+                }
+                // Append minimum value to fixed levels
+                fixedLevels.push_back(dfMinimum);
             }
-            else if (expBase > 0.0)
+            else if (contourInterval != 0)
             {
-                ExponentialLevelRangeIterator levels(expBase);
-                SegmentMerger<RingAppender, ExponentialLevelRangeIterator>
-                    writer(appender, levels, /* polygonize */ true);
-                ContourGeneratorFromRaster<decltype(writer),
-                                           ExponentialLevelRangeIterator>
-                    cg(hBand, useNoData, noDataValue, writer, levels);
-                ok = cg.process(pfnProgress, pProgressArg);
+                // Do not provide the actual minimum value to level iterator
+                // in polygonal case, otherwise it can result in a polygon
+                // with a degenerate min=max range.
+                IntervalLevelRangeIterator generator(
+                    contourBase, contourInterval,
+                    -std::numeric_limits<double>::infinity());
+                auto levelIt{generator.range(dfMinimum, dfMaximum)};
+                for (auto i = levelIt.begin(); i != levelIt.end(); ++i)
+                {
+                    const double level = (*i).second;
+                    fixedLevels.push_back(level);
+                }
+                // Append minimum value to fixed levels
+                fixedLevels.push_back(dfMinimum);
             }
-            else
+
+            if (!fixedLevels.empty())
             {
-                IntervalLevelRangeIterator levels(contourBase, contourInterval);
-                SegmentMerger<RingAppender, IntervalLevelRangeIterator> writer(
+                std::sort(fixedLevels.begin(), fixedLevels.end());
+                auto uniqueIt =
+                    std::unique(fixedLevels.begin(), fixedLevels.end());
+                fixedLevels.erase(uniqueIt, fixedLevels.end());
+                // Do not provide the actual minimum value to level iterator
+                // in polygonal case, otherwise it can result in a polygon
+                // with a degenerate min=max range.
+                FixedLevelRangeIterator levels(
+                    &fixedLevels[0], fixedLevels.size(),
+                    -std::numeric_limits<double>::infinity(), dfMaximum);
+                SegmentMerger<RingAppender, FixedLevelRangeIterator> writer(
                     appender, levels, /* polygonize */ true);
                 ContourGeneratorFromRaster<decltype(writer),
-                                           IntervalLevelRangeIterator>
+                                           FixedLevelRangeIterator>
                     cg(hBand, useNoData, noDataValue, writer, levels);
                 ok = cg.process(pfnProgress, pProgressArg);
             }
@@ -736,34 +823,42 @@ CPLErr GDALContourGenerateEx(GDALRasterBandH hBand, void *hLayer,
         else
         {
             GDALRingAppender appender(OGRContourWriter, &oCWI);
-            if (!fixedLevels.empty())
+
+            // Append all exp levels to fixed levels
+            if (expBase > 0.0)
             {
-                FixedLevelRangeIterator levels(&fixedLevels[0],
-                                               fixedLevels.size());
-                SegmentMerger<GDALRingAppender, FixedLevelRangeIterator> writer(
-                    appender, levels, /* polygonize */ false);
-                ContourGeneratorFromRaster<decltype(writer),
-                                           FixedLevelRangeIterator>
-                    cg(hBand, useNoData, noDataValue, writer, levels);
-                ok = cg.process(pfnProgress, pProgressArg);
+                ExponentialLevelRangeIterator generator(expBase, dfMinimum);
+                auto levelIt{generator.range(dfMinimum, dfMaximum)};
+                for (auto i = levelIt.begin(); i != levelIt.end(); ++i)
+                {
+                    const double level = (*i).second;
+                    fixedLevels.push_back(level);
+                }
             }
-            else if (expBase > 0.0)
+            else if (contourInterval != 0)
             {
-                ExponentialLevelRangeIterator levels(expBase);
-                SegmentMerger<GDALRingAppender, ExponentialLevelRangeIterator>
-                    writer(appender, levels, /* polygonize */ false);
-                ContourGeneratorFromRaster<decltype(writer),
-                                           ExponentialLevelRangeIterator>
-                    cg(hBand, useNoData, noDataValue, writer, levels);
-                ok = cg.process(pfnProgress, pProgressArg);
+                IntervalLevelRangeIterator levels(contourBase, contourInterval,
+                                                  dfMinimum);
+                auto levelIt{levels.range(dfMinimum, dfMaximum)};
+                for (auto i = levelIt.begin(); i != levelIt.end(); ++i)
+                {
+                    const double level = (*i).second;
+                    fixedLevels.push_back(level);
+                }
             }
-            else
+
+            if (!fixedLevels.empty())
             {
-                IntervalLevelRangeIterator levels(contourBase, contourInterval);
-                SegmentMerger<GDALRingAppender, IntervalLevelRangeIterator>
-                    writer(appender, levels, /* polygonize */ false);
+                std::sort(fixedLevels.begin(), fixedLevels.end());
+                auto uniqueIt =
+                    std::unique(fixedLevels.begin(), fixedLevels.end());
+                fixedLevels.erase(uniqueIt, fixedLevels.end());
+                FixedLevelRangeIterator levels(
+                    &fixedLevels[0], fixedLevels.size(), dfMinimum, dfMaximum);
+                SegmentMerger<GDALRingAppender, FixedLevelRangeIterator> writer(
+                    appender, levels, /* polygonize */ false);
                 ContourGeneratorFromRaster<decltype(writer),
-                                           IntervalLevelRangeIterator>
+                                           FixedLevelRangeIterator>
                     cg(hBand, useNoData, noDataValue, writer, levels);
                 ok = cg.process(pfnProgress, pProgressArg);
             }
@@ -774,6 +869,17 @@ CPLErr GDALContourGenerateEx(GDALRasterBandH hBand, void *hLayer,
         CPLError(CE_Failure, CPLE_AppDefined, "%s", e.what());
         return CE_Failure;
     }
+
+    if (oCWI.nTransactionCommitInterval > 0)
+    {
+        // CPLDebug("CONTOUR", "Flush transaction");
+        if (OGR_L_CommitTransaction(static_cast<OGRLayerH>(hLayer)) !=
+            OGRERR_NONE)
+        {
+            ok = false;
+        }
+    }
+
     return ok ? CE_None : CE_Failure;
 }
 
@@ -796,7 +902,9 @@ struct ContourGeneratorOpaque
                            double dfNoDataValue, double dfContourInterval,
                            double dfContourBase, GDALContourWriter pfnWriter,
                            void *pCBData)
-        : levels(dfContourBase, dfContourInterval), writer(pfnWriter, pCBData),
+        : levels(dfContourBase, dfContourInterval,
+                 -std::numeric_limits<double>::infinity()),
+          writer(pfnWriter, pCBData),
           merger(writer, levels, /* polygonize */ false),
           contourGenerator(nWidth, nHeight, bNoDataSet != 0, dfNoDataValue,
                            merger, levels)
diff --git a/alg/delaunay.c b/alg/delaunay.c
index 526f93a6631a..cb7f9484d7d8 100644
--- a/alg/delaunay.c
+++ b/alg/delaunay.c
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #if defined(__MINGW32__) || defined(__MINGW64__)
diff --git a/alg/gdal_alg.h b/alg/gdal_alg.h
index 9b1daf10c683..e92cd6625313 100644
--- a/alg/gdal_alg.h
+++ b/alg/gdal_alg.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2001, Frank Warmerdam
  * Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_ALG_H_INCLUDED
@@ -310,6 +294,9 @@ typedef struct
     int nElevFieldMax;
     int nIDField;
     int nNextID;
+
+    GIntBig nWrittenFeatureCountSinceLastCommit;
+    GIntBig nTransactionCommitInterval;
 } OGRContourWriterInfo;
 
 CPLErr CPL_DLL OGRContourWriter(double, int, double *, double *, void *pInfo);
diff --git a/alg/gdal_alg_priv.h b/alg/gdal_alg_priv.h
index b7b3a3a35ff2..cb0645eb676a 100644
--- a/alg/gdal_alg_priv.h
+++ b/alg/gdal_alg_priv.h
@@ -10,23 +10,7 @@
  * Copyright (c) 2008, Andrey Kiselev <dron@ak4719.spb.edu>
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_ALG_PRIV_H_INCLUDED
@@ -173,6 +157,7 @@ constexpr const char *GDAL_APPROX_TRANSFORMER_CLASS_NAME =
     "GDALApproxTransformer";
 constexpr const char *GDAL_GEN_IMG_TRANSFORMER_CLASS_NAME =
     "GDALGenImgProjTransformer";
+constexpr const char *GDAL_RPC_TRANSFORMER_CLASS_NAME = "GDALRPCTransformer";
 
 bool GDALIsTransformer(void *hTransformerArg, const char *pszClassName);
 
@@ -206,6 +191,8 @@ bool GDALTransformIsTranslationOnPixelBoundaries(
 bool GDALTransformIsAffineNoRotation(GDALTransformerFunc pfnTransformer,
                                      void *pTransformerArg);
 
+bool GDALTransformHasFastClone(void *pTransformerArg);
+
 typedef struct _CPLQuadTree CPLQuadTree;
 
 typedef struct
diff --git a/alg/gdal_crs.cpp b/alg/gdal_crs.cpp
index 74ea4ceff9a9..9c134f0b69f5 100644
--- a/alg/gdal_crs.cpp
+++ b/alg/gdal_crs.cpp
@@ -220,6 +220,22 @@ static void *GDALCreateGCPTransformerEx(int nGCPCount,
     psInfo->nRefCount = 1;
 
     psInfo->asGCPs = gdal::GCP::fromC(pasGCPList, nGCPCount);
+    if (nGCPCount == 2 && nReqOrder == 1 &&
+        psInfo->asGCPs[0].X() != psInfo->asGCPs[1].X() &&
+        psInfo->asGCPs[0].Y() != psInfo->asGCPs[1].Y())
+    {
+        // Assumes that the 2 GCPs form opposite corners of a rectangle,
+        // and synthetize a 3rd corner
+        gdal::GCP newGCP;
+        newGCP.X() = psInfo->asGCPs[1].X();
+        newGCP.Y() = psInfo->asGCPs[0].Y();
+        newGCP.Pixel() = psInfo->asGCPs[1].Pixel();
+        newGCP.Line() = psInfo->asGCPs[0].Line();
+        psInfo->asGCPs.emplace_back(std::move(newGCP));
+
+        nGCPCount = 3;
+        pasGCPList = gdal::GCP::c_ptr(psInfo->asGCPs);
+    }
 
     memcpy(psInfo->sTI.abySignature, GDAL_GTI2_SIGNATURE,
            strlen(GDAL_GTI2_SIGNATURE));
diff --git a/alg/gdal_interpolateatpoint.cpp b/alg/gdal_interpolateatpoint.cpp
new file mode 100644
index 000000000000..26e506e8d7dd
--- /dev/null
+++ b/alg/gdal_interpolateatpoint.cpp
@@ -0,0 +1,413 @@
+/******************************************************************************
+ * $Id$
+ *
+ * Project:  GDAL DEM Interpolation
+ * Purpose:  Interpolation algorithms with cache
+ * Author:   Frank Warmerdam, warmerdam@pobox.com
+ *
+ ******************************************************************************
+ * Copyright (c) 2001, Frank Warmerdam
+ * Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.com>
+ * Copyright (c) 2024, Javier Jimenez Shaw
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#include "gdal_interpolateatpoint.h"
+
+#include "gdalresamplingkernels.h"
+
+#include <algorithm>
+#include <complex>
+
+template <typename T> bool areEqualReal(double dfNoDataValue, T dfOut);
+
+template <> bool areEqualReal(double dfNoDataValue, double dfOut)
+{
+    return ARE_REAL_EQUAL(dfNoDataValue, dfOut);
+}
+
+template <> bool areEqualReal(double dfNoDataValue, std::complex<double> dfOut)
+{
+    return ARE_REAL_EQUAL(dfNoDataValue, dfOut.real());
+}
+
+// Only valid for T = double or std::complex<double>
+template <typename T>
+bool GDALInterpExtractValuesWindow(GDALRasterBand *pBand,
+                                   std::unique_ptr<DoublePointsCache> &cache,
+                                   int nX, int nY, int nWidth, int nHeight,
+                                   T *padfOut)
+{
+    constexpr int BLOCK_SIZE = 64;
+
+    // Request the DEM by blocks of BLOCK_SIZE * BLOCK_SIZE and put them
+    // in cache
+    if (!cache)
+        cache.reset(new DoublePointsCache{});
+
+    const int nXIters = (nX + nWidth - 1) / BLOCK_SIZE - nX / BLOCK_SIZE + 1;
+    const int nYIters = (nY + nHeight - 1) / BLOCK_SIZE - nY / BLOCK_SIZE + 1;
+    const int nRasterXSize = pBand->GetXSize();
+    const int nRasterYSize = pBand->GetYSize();
+    const bool bIsComplex =
+        CPL_TO_BOOL(GDALDataTypeIsComplex(pBand->GetRasterDataType()));
+
+    for (int iY = 0; iY < nYIters; iY++)
+    {
+        const int nBlockY = nY / BLOCK_SIZE + iY;
+        const int nReqYSize =
+            std::min(nRasterYSize - nBlockY * BLOCK_SIZE, BLOCK_SIZE);
+        const int nFirstLineInCachedBlock = (iY == 0) ? nY % BLOCK_SIZE : 0;
+        const int nFirstLineInOutput =
+            (iY == 0) ? 0
+                      : BLOCK_SIZE - (nY % BLOCK_SIZE) + (iY - 1) * BLOCK_SIZE;
+        const int nLinesToCopy = (nYIters == 1) ? nHeight
+                                 : (iY == 0)    ? BLOCK_SIZE - (nY % BLOCK_SIZE)
+                                 : (iY == nYIters - 1)
+                                     ? 1 + (nY + nHeight - 1) % BLOCK_SIZE
+                                     : BLOCK_SIZE;
+        for (int iX = 0; iX < nXIters; iX++)
+        {
+            const int nBlockX = nX / BLOCK_SIZE + iX;
+            const int nReqXSize =
+                std::min(nRasterXSize - nBlockX * BLOCK_SIZE, BLOCK_SIZE);
+            const uint64_t nKey =
+                (static_cast<uint64_t>(nBlockY) << 32) | nBlockX;
+            const int nFirstColInCachedBlock = (iX == 0) ? nX % BLOCK_SIZE : 0;
+            const int nFirstColInOutput =
+                (iX == 0)
+                    ? 0
+                    : BLOCK_SIZE - (nX % BLOCK_SIZE) + (iX - 1) * BLOCK_SIZE;
+            const int nColsToCopy = (nXIters == 1) ? nWidth
+                                    : (iX == 0) ? BLOCK_SIZE - (nX % BLOCK_SIZE)
+                                    : (iX == nXIters - 1)
+                                        ? 1 + (nX + nWidth - 1) % BLOCK_SIZE
+                                        : BLOCK_SIZE;
+
+#if 0
+            CPLDebug("RPC", "nY=%d nX=%d nBlockY=%d nBlockX=%d "
+                     "nFirstLineInCachedBlock=%d nFirstLineInOutput=%d nLinesToCopy=%d "
+                     "nFirstColInCachedBlock=%d nFirstColInOutput=%d nColsToCopy=%d",
+                     nY, nX, nBlockY, nBlockX, nFirstLineInCachedBlock, nFirstLineInOutput, nLinesToCopy,
+                     nFirstColInCachedBlock, nFirstColInOutput, nColsToCopy);
+#endif
+
+            constexpr int nTypeFactor = sizeof(T) / sizeof(double);
+            std::shared_ptr<std::vector<double>> poValue;
+            if (!cache->tryGet(nKey, poValue))
+            {
+                const GDALDataType eDataType =
+                    bIsComplex ? GDT_CFloat64 : GDT_Float64;
+                const size_t nVectorSize =
+                    size_t(nReqXSize) * nReqYSize * nTypeFactor;
+                poValue = std::make_shared<std::vector<double>>(nVectorSize);
+                CPLErr eErr = pBand->RasterIO(
+                    GF_Read, nBlockX * BLOCK_SIZE, nBlockY * BLOCK_SIZE,
+                    nReqXSize, nReqYSize, poValue->data(), nReqXSize, nReqYSize,
+                    eDataType, 0, 0, nullptr);
+                if (eErr != CE_None)
+                {
+                    return false;
+                }
+                cache->insert(nKey, poValue);
+            }
+
+            double *padfAsDouble = reinterpret_cast<double *>(padfOut);
+            // Compose the cached block to the final buffer
+            for (int j = 0; j < nLinesToCopy; j++)
+            {
+                memcpy(padfAsDouble + ((nFirstLineInOutput + j) * nWidth +
+                                       nFirstColInOutput) *
+                                          nTypeFactor,
+                       poValue->data() +
+                           ((nFirstLineInCachedBlock + j) * nReqXSize +
+                            nFirstColInCachedBlock) *
+                               nTypeFactor,
+                       nColsToCopy * sizeof(T));
+            }
+        }
+    }
+
+#if 0
+    CPLDebug("RPC_DEM", "DEM for %d,%d,%d,%d", nX, nY, nWidth, nHeight);
+    for(int j = 0; j < nHeight; j++)
+    {
+        std::string osLine;
+        for(int i = 0; i < nWidth; ++i )
+        {
+            if( !osLine.empty() )
+                osLine += ", ";
+            osLine += std::to_string(padfOut[j * nWidth + i]);
+        }
+        CPLDebug("RPC_DEM", "%s", osLine.c_str());
+    }
+#endif
+
+    return true;
+}
+
+template <typename T>
+bool GDALInterpolateAtPointImpl(GDALRasterBand *pBand,
+                                GDALRIOResampleAlg eResampleAlg,
+                                std::unique_ptr<DoublePointsCache> &cache,
+                                const double dfXIn, const double dfYIn, T &out)
+{
+    const int nRasterXSize = pBand->GetXSize();
+    const int nRasterYSize = pBand->GetYSize();
+    int bGotNoDataValue = FALSE;
+    const double dfNoDataValue = pBand->GetNoDataValue(&bGotNoDataValue);
+
+    if (dfXIn < 0 || dfXIn > nRasterXSize || dfYIn < 0 || dfYIn > nRasterYSize)
+    {
+        return FALSE;
+    }
+
+    // Downgrade the interpolation algorithm if the image is too small
+    if ((nRasterXSize < 4 || nRasterYSize < 4) &&
+        (eResampleAlg == GRIORA_CubicSpline || eResampleAlg == GRIORA_Cubic))
+    {
+        eResampleAlg = GRIORA_Bilinear;
+    }
+    if ((nRasterXSize < 2 || nRasterYSize < 2) &&
+        eResampleAlg == GRIORA_Bilinear)
+    {
+        eResampleAlg = GRIORA_NearestNeighbour;
+    }
+
+    auto outOfBorderCorrection = [](int dNew, int nRasterSize, int nKernelsize)
+    {
+        int dOutOfBorder = 0;
+        if (dNew < 0)
+        {
+            dOutOfBorder = dNew;
+        }
+        if (dNew + nKernelsize >= nRasterSize)
+        {
+            dOutOfBorder = dNew + nKernelsize - nRasterSize;
+        }
+        return dOutOfBorder;
+    };
+
+    auto dragReadDataInBorder =
+        [](T *adfElevData, int dOutOfBorder, int nKernelSize, bool bIsX)
+    {
+        while (dOutOfBorder < 0)
+        {
+            for (int j = 0; j < nKernelSize; j++)
+                for (int ii = 0; ii < nKernelSize - 1; ii++)
+                {
+                    const int i = nKernelSize - ii - 2;  // iterate in reverse
+                    const int row_src = bIsX ? j : i;
+                    const int row_dst = bIsX ? j : i + 1;
+                    const int col_src = bIsX ? i : j;
+                    const int col_dst = bIsX ? i + 1 : j;
+                    adfElevData[nKernelSize * row_dst + col_dst] =
+                        adfElevData[nKernelSize * row_src + col_src];
+                }
+            dOutOfBorder++;
+        }
+        while (dOutOfBorder > 0)
+        {
+            for (int j = 0; j < nKernelSize; j++)
+                for (int i = 0; i < nKernelSize - 1; i++)
+                {
+                    const int row_src = bIsX ? j : i + 1;
+                    const int row_dst = bIsX ? j : i;
+                    const int col_src = bIsX ? i + 1 : j;
+                    const int col_dst = bIsX ? i : j;
+                    adfElevData[nKernelSize * row_dst + col_dst] =
+                        adfElevData[nKernelSize * row_src + col_src];
+                }
+            dOutOfBorder--;
+        }
+    };
+
+    auto applyBilinearKernel = [&](double dfDeltaX, double dfDeltaY,
+                                   T *adfValues, T &pdfRes) -> bool
+    {
+        if (bGotNoDataValue)
+        {
+            // TODO: We could perhaps use a valid sample if there's one.
+            bool bFoundNoDataElev = false;
+            for (int k_i = 0; k_i < 4; k_i++)
+            {
+                if (areEqualReal(dfNoDataValue, adfValues[k_i]))
+                    bFoundNoDataElev = true;
+            }
+            if (bFoundNoDataElev)
+            {
+                return FALSE;
+            }
+        }
+        const double dfDeltaX1 = 1.0 - dfDeltaX;
+        const double dfDeltaY1 = 1.0 - dfDeltaY;
+
+        const T dfXZ1 = adfValues[0] * dfDeltaX1 + adfValues[1] * dfDeltaX;
+        const T dfXZ2 = adfValues[2] * dfDeltaX1 + adfValues[3] * dfDeltaX;
+        const T dfYZ = dfXZ1 * dfDeltaY1 + dfXZ2 * dfDeltaY;
+
+        pdfRes = dfYZ;
+        return TRUE;
+    };
+
+    auto apply4x4Kernel = [&](double dfDeltaX, double dfDeltaY, T *adfValues,
+                              T &pdfRes) -> bool
+    {
+        T dfSumH = 0.0;
+        T dfSumWeight = 0.0;
+        for (int k_i = 0; k_i < 4; k_i++)
+        {
+            // Loop across the X axis.
+            for (int k_j = 0; k_j < 4; k_j++)
+            {
+                // Calculate the weight for the specified pixel according
+                // to the bicubic b-spline kernel we're using for
+                // interpolation.
+                const int dKernIndX = k_j - 1;
+                const int dKernIndY = k_i - 1;
+                const double dfPixelWeight =
+                    eResampleAlg == GDALRIOResampleAlg::GRIORA_CubicSpline
+                        ? CubicSplineKernel(dKernIndX - dfDeltaX) *
+                              CubicSplineKernel(dKernIndY - dfDeltaY)
+                        : CubicKernel(dKernIndX - dfDeltaX) *
+                              CubicKernel(dKernIndY - dfDeltaY);
+
+                // Create a sum of all values
+                // adjusted for the pixel's calculated weight.
+                const T dfElev = adfValues[k_j + k_i * 4];
+                if (bGotNoDataValue && areEqualReal(dfNoDataValue, dfElev))
+                    continue;
+
+                dfSumH += dfElev * dfPixelWeight;
+                dfSumWeight += dfPixelWeight;
+            }
+        }
+        if (dfSumWeight == 0.0)
+        {
+            return FALSE;
+        }
+
+        pdfRes = dfSumH / dfSumWeight;
+
+        return TRUE;
+    };
+
+    if (eResampleAlg == GDALRIOResampleAlg::GRIORA_CubicSpline ||
+        eResampleAlg == GDALRIOResampleAlg::GRIORA_Cubic)
+    {
+        // Convert from upper left corner of pixel coordinates to center of
+        // pixel coordinates:
+        const double dfX = dfXIn - 0.5;
+        const double dfY = dfYIn - 0.5;
+        const int dX = static_cast<int>(std::floor(dfX));
+        const int dY = static_cast<int>(std::floor(dfY));
+        const double dfDeltaX = dfX - dX;
+        const double dfDeltaY = dfY - dY;
+
+        const int dXNew = dX - 1;
+        const int dYNew = dY - 1;
+        const int nKernelSize = 4;
+        const int dXOutOfBorder =
+            outOfBorderCorrection(dXNew, nRasterXSize, nKernelSize);
+        const int dYOutOfBorder =
+            outOfBorderCorrection(dYNew, nRasterYSize, nKernelSize);
+
+        // CubicSpline interpolation.
+        T adfReadData[16] = {0.0};
+        if (!GDALInterpExtractValuesWindow(pBand, cache, dXNew - dXOutOfBorder,
+                                           dYNew - dYOutOfBorder, nKernelSize,
+                                           nKernelSize, adfReadData))
+        {
+            return FALSE;
+        }
+        dragReadDataInBorder(adfReadData, dXOutOfBorder, nKernelSize, true);
+        dragReadDataInBorder(adfReadData, dYOutOfBorder, nKernelSize, false);
+        if (!apply4x4Kernel(dfDeltaX, dfDeltaY, adfReadData, out))
+            return FALSE;
+
+        return TRUE;
+    }
+    else if (eResampleAlg == GDALRIOResampleAlg::GRIORA_Bilinear)
+    {
+        // Convert from upper left corner of pixel coordinates to center of
+        // pixel coordinates:
+        const double dfX = dfXIn - 0.5;
+        const double dfY = dfYIn - 0.5;
+        const int dX = static_cast<int>(std::floor(dfX));
+        const int dY = static_cast<int>(std::floor(dfY));
+        const double dfDeltaX = dfX - dX;
+        const double dfDeltaY = dfY - dY;
+
+        const int nKernelSize = 2;
+        const int dXOutOfBorder =
+            outOfBorderCorrection(dX, nRasterXSize, nKernelSize);
+        const int dYOutOfBorder =
+            outOfBorderCorrection(dY, nRasterYSize, nKernelSize);
+
+        // Bilinear interpolation.
+        T adfReadData[4] = {0.0};
+        if (!GDALInterpExtractValuesWindow(pBand, cache, dX - dXOutOfBorder,
+                                           dY - dYOutOfBorder, nKernelSize,
+                                           nKernelSize, adfReadData))
+        {
+            return FALSE;
+        }
+        dragReadDataInBorder(adfReadData, dXOutOfBorder, nKernelSize, true);
+        dragReadDataInBorder(adfReadData, dYOutOfBorder, nKernelSize, false);
+        if (!applyBilinearKernel(dfDeltaX, dfDeltaY, adfReadData, out))
+            return FALSE;
+
+        return TRUE;
+    }
+    else
+    {
+        const int dX = static_cast<int>(dfXIn);
+        const int dY = static_cast<int>(dfYIn);
+        T dfOut{};
+        if (!GDALInterpExtractValuesWindow(pBand, cache, dX, dY, 1, 1,
+                                           &dfOut) ||
+            (bGotNoDataValue && areEqualReal(dfNoDataValue, dfOut)))
+        {
+            return FALSE;
+        }
+
+        out = dfOut;
+
+        return TRUE;
+    }
+}
+
+/************************************************************************/
+/*                        GDALInterpolateAtPoint()                      */
+/************************************************************************/
+
+bool GDALInterpolateAtPoint(GDALRasterBand *pBand,
+                            GDALRIOResampleAlg eResampleAlg,
+                            std::unique_ptr<DoublePointsCache> &cache,
+                            const double dfXIn, const double dfYIn,
+                            double *pdfOutputReal, double *pdfOutputImag)
+{
+    const bool bIsComplex =
+        CPL_TO_BOOL(GDALDataTypeIsComplex(pBand->GetRasterDataType()));
+    bool res = TRUE;
+    if (bIsComplex)
+    {
+        std::complex<double> out{};
+        res = GDALInterpolateAtPointImpl(pBand, eResampleAlg, cache, dfXIn,
+                                         dfYIn, out);
+        *pdfOutputReal = out.real();
+        if (pdfOutputImag)
+            *pdfOutputImag = out.imag();
+    }
+    else
+    {
+        double out{};
+        res = GDALInterpolateAtPointImpl(pBand, eResampleAlg, cache, dfXIn,
+                                         dfYIn, out);
+        *pdfOutputReal = out;
+        if (pdfOutputImag)
+            *pdfOutputImag = 0;
+    }
+    return res;
+}
diff --git a/alg/gdal_interpolateatpoint.h b/alg/gdal_interpolateatpoint.h
new file mode 100644
index 000000000000..e92deaf7683e
--- /dev/null
+++ b/alg/gdal_interpolateatpoint.h
@@ -0,0 +1,45 @@
+/******************************************************************************
+ * $Id$
+ *
+ * Project:  GDAL Raster Interpolation
+ * Purpose:  Interpolation algorithms with cache
+ * Author:   Frank Warmerdam, warmerdam@pobox.com
+ *
+ ******************************************************************************
+ * Copyright (c) 2001, Frank Warmerdam
+ * Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.com>
+ * Copyright (c) 2024, Javier Jimenez Shaw
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#ifndef GDAL_INTERPOLATEATPOINT_H_INCLUDED
+#define GDAL_INTERPOLATEATPOINT_H_INCLUDED
+
+/*! @cond Doxygen_Suppress */
+
+#include "gdal.h"
+
+#include "cpl_mem_cache.h"
+#include "gdal_priv.h"
+
+#include <memory>
+
+using DoublePointsCache =
+    lru11::Cache<uint64_t, std::shared_ptr<std::vector<double>>>;
+
+class GDALDoublePointsCache
+{
+  public:
+    std::unique_ptr<DoublePointsCache> cache{};
+};
+
+bool GDALInterpolateAtPoint(GDALRasterBand *pBand,
+                            GDALRIOResampleAlg eResampleAlg,
+                            std::unique_ptr<DoublePointsCache> &cache,
+                            const double dfXIn, const double dfYIn,
+                            double *pdfOutputReal, double *pdfOutputImag);
+
+/*! @endcond */
+
+#endif /* ndef GDAL_INTERPOLATEATPOINT_H_INCLUDED */
diff --git a/alg/gdal_octave.cpp b/alg/gdal_octave.cpp
index 63d17dbcd7c0..ff636718f305 100644
--- a/alg/gdal_octave.cpp
+++ b/alg/gdal_octave.cpp
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2012, Andrew Migal
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_simplesurf.h"
diff --git a/alg/gdal_rpc.cpp b/alg/gdal_rpc.cpp
index 018840a91d7a..fb7e415f225f 100644
--- a/alg/gdal_rpc.cpp
+++ b/alg/gdal_rpc.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -46,7 +30,9 @@
 #include "cpl_string.h"
 #include "cpl_vsi.h"
 #include "gdal.h"
+#include "gdal_interpolateatpoint.h"
 #include "gdal_mdreader.h"
+#include "gdal_alg_priv.h"
 #include "gdal_priv.h"
 #if defined(__x86_64) || defined(_M_X64)
 #define USE_SSE2_OPTIM
@@ -56,6 +42,7 @@
 #include "ogr_geometry.h"
 #include "ogr_spatialref.h"
 #include "ogr_srs_api.h"
+#include "gdalresamplingkernels.h"
 
 // #define DEBUG_VERBOSE_EXTRACT_DEM
 
@@ -233,7 +220,7 @@ typedef enum
     /*! Nearest neighbour (select on one input pixel) */ DRA_NearestNeighbour =
         0,
     /*! Bilinear (2x2 kernel) */ DRA_Bilinear = 1,
-    /*! Cubic Convolution Approximation (4x4 kernel) */ DRA_Cubic = 2
+    /*! Cubic Convolution Approximation (4x4 kernel) */ DRA_CubicSpline = 2
 } DEMResampleAlg;
 
 typedef struct
@@ -480,7 +467,7 @@ static const char *GDALSerializeRPCDEMResample(DEMResampleAlg eResampleAlg)
     {
         case DRA_NearestNeighbour:
             return "near";
-        case DRA_Cubic:
+        case DRA_CubicSpline:
             return "cubic";
         default:
         case DRA_Bilinear:
@@ -514,9 +501,9 @@ static void *GDALCreateSimilarRPCTransformer(void *hTransformArg,
 
     char **papszOptions = nullptr;
     papszOptions = CSLSetNameValue(papszOptions, "RPC_HEIGHT",
-                                   CPLSPrintf("%.18g", psInfo->dfHeightOffset));
+                                   CPLSPrintf("%.17g", psInfo->dfHeightOffset));
     papszOptions = CSLSetNameValue(papszOptions, "RPC_HEIGHT_SCALE",
-                                   CPLSPrintf("%.18g", psInfo->dfHeightScale));
+                                   CPLSPrintf("%.17g", psInfo->dfHeightScale));
     if (psInfo->pszDEMPath != nullptr)
     {
         papszOptions =
@@ -527,7 +514,7 @@ static void *GDALCreateSimilarRPCTransformer(void *hTransformArg,
         if (psInfo->bHasDEMMissingValue)
             papszOptions =
                 CSLSetNameValue(papszOptions, "RPC_DEM_MISSING_VALUE",
-                                CPLSPrintf("%.18g", psInfo->dfDEMMissingValue));
+                                CPLSPrintf("%.17g", psInfo->dfDEMMissingValue));
         papszOptions =
             CSLSetNameValue(papszOptions, "RPC_DEM_APPLY_VDATUM_SHIFT",
                             (psInfo->bApplyDEMVDatumShift) ? "TRUE" : "FALSE");
@@ -835,7 +822,7 @@ void *GDALCreateRPCTransformerV2(const GDALRPCInfoV2 *psRPCInfo, int bReversed,
 
     memcpy(psTransform->sTI.abySignature, GDAL_GTI2_SIGNATURE,
            strlen(GDAL_GTI2_SIGNATURE));
-    psTransform->sTI.pszClassName = "GDALRPCTransformer";
+    psTransform->sTI.pszClassName = GDAL_RPC_TRANSFORMER_CLASS_NAME;
     psTransform->sTI.pfnTransform = GDALRPCTransform;
     psTransform->sTI.pfnCleanup = GDALDestroyRPCTransformer;
     psTransform->sTI.pfnSerialize = GDALSerializeRPCTransformer;
@@ -897,7 +884,7 @@ void *GDALCreateRPCTransformerV2(const GDALRPCInfoV2 *psRPCInfo, int bReversed,
     }
     else if (EQUAL(pszDEMInterpolation, "cubic"))
     {
-        psTransform->eResampleAlg = DRA_Cubic;
+        psTransform->eResampleAlg = DRA_CubicSpline;
     }
     else
     {
@@ -1091,7 +1078,7 @@ void *GDALCreateRPCTransformerV2(const GDALRPCInfoV2 *psRPCInfo, int bReversed,
 /*                 GDALDestroyReprojectionTransformer()                 */
 /************************************************************************/
 
-/** Destroy RPC tranformer */
+/** Destroy RPC transformer */
 void GDALDestroyRPCTransformer(void *pTransformAlg)
 
 {
@@ -1367,130 +1354,6 @@ static bool RPCInverseTransformPoint(GDALRPCTransformInfo *psTransform,
     return true;
 }
 
-static double BiCubicKernel(double dfVal)
-{
-    if (dfVal > 2.0)
-        return 0.0;
-
-    const double xm1 = dfVal - 1.0;
-    const double xp1 = dfVal + 1.0;
-    const double xp2 = dfVal + 2.0;
-
-    const double a = xp2 <= 0.0 ? 0.0 : xp2 * xp2 * xp2;
-    const double b = xp1 <= 0.0 ? 0.0 : xp1 * xp1 * xp1;
-    const double c = dfVal <= 0.0 ? 0.0 : dfVal * dfVal * dfVal;
-    const double d = xm1 <= 0.0 ? 0.0 : xm1 * xm1 * xm1;
-
-    return 0.16666666666666666667 * (a - (4.0 * b) + (6.0 * c) - (4.0 * d));
-}
-
-/************************************************************************/
-/*                        GDALRPCExtractDEMWindow()                     */
-/************************************************************************/
-
-static bool GDALRPCExtractDEMWindow(GDALRPCTransformInfo *psTransform, int nX,
-                                    int nY, int nWidth, int nHeight,
-                                    double *padfOut)
-{
-    constexpr int BLOCK_SIZE = 64;
-
-    // Request the DEM by blocks of BLOCK_SIZE * BLOCK_SIZE and put them
-    // in poCacheDEM
-    if (psTransform->poCacheDEM == nullptr)
-        psTransform->poCacheDEM =
-            new lru11::Cache<uint64_t, std::shared_ptr<std::vector<double>>>();
-
-    const int nXIters = (nX + nWidth - 1) / BLOCK_SIZE - nX / BLOCK_SIZE + 1;
-    const int nYIters = (nY + nHeight - 1) / BLOCK_SIZE - nY / BLOCK_SIZE + 1;
-    const int nRasterXSize = psTransform->poDS->GetRasterXSize();
-    const int nRasterYSize = psTransform->poDS->GetRasterYSize();
-    for (int iY = 0; iY < nYIters; iY++)
-    {
-        const int nBlockY = nY / BLOCK_SIZE + iY;
-        const int nReqYSize =
-            std::min(nRasterYSize - nBlockY * BLOCK_SIZE, BLOCK_SIZE);
-        const int nFirstLineInCachedBlock = (iY == 0) ? nY % BLOCK_SIZE : 0;
-        const int nFirstLineInOutput =
-            (iY == 0) ? 0
-                      : BLOCK_SIZE - (nY % BLOCK_SIZE) + (iY - 1) * BLOCK_SIZE;
-        const int nLinesToCopy = (nYIters == 1) ? nHeight
-                                 : (iY == 0)    ? BLOCK_SIZE - (nY % BLOCK_SIZE)
-                                 : (iY == nYIters - 1)
-                                     ? 1 + (nY + nHeight - 1) % BLOCK_SIZE
-                                     : BLOCK_SIZE;
-        for (int iX = 0; iX < nXIters; iX++)
-        {
-            const int nBlockX = nX / BLOCK_SIZE + iX;
-            const int nReqXSize =
-                std::min(nRasterXSize - nBlockX * BLOCK_SIZE, BLOCK_SIZE);
-            const uint64_t nKey =
-                (static_cast<uint64_t>(nBlockY) << 32) | nBlockX;
-            const int nFirstColInCachedBlock = (iX == 0) ? nX % BLOCK_SIZE : 0;
-            const int nFirstColInOutput =
-                (iX == 0)
-                    ? 0
-                    : BLOCK_SIZE - (nX % BLOCK_SIZE) + (iX - 1) * BLOCK_SIZE;
-            const int nColsToCopy = (nXIters == 1) ? nWidth
-                                    : (iX == 0) ? BLOCK_SIZE - (nX % BLOCK_SIZE)
-                                    : (iX == nXIters - 1)
-                                        ? 1 + (nX + nWidth - 1) % BLOCK_SIZE
-                                        : BLOCK_SIZE;
-
-#if 0
-            CPLDebug("RPC", "nY=%d nX=%d nBlockY=%d nBlockX=%d "
-                     "nFirstLineInCachedBlock=%d nFirstLineInOutput=%d nLinesToCopy=%d "
-                     "nFirstColInCachedBlock=%d nFirstColInOutput=%d nColsToCopy=%d",
-                     nY, nX, nBlockY, nBlockX, nFirstLineInCachedBlock, nFirstLineInOutput, nLinesToCopy,
-                     nFirstColInCachedBlock, nFirstColInOutput, nColsToCopy);
-#endif
-
-            std::shared_ptr<std::vector<double>> poValue;
-            if (!psTransform->poCacheDEM->tryGet(nKey, poValue))
-            {
-                poValue = std::make_shared<std::vector<double>>(nReqXSize *
-                                                                nReqYSize);
-                CPLErr eErr = psTransform->poDS->GetRasterBand(1)->RasterIO(
-                    GF_Read, nBlockX * BLOCK_SIZE, nBlockY * BLOCK_SIZE,
-                    nReqXSize, nReqYSize, poValue->data(), nReqXSize, nReqYSize,
-                    GDT_Float64, 0, 0, nullptr);
-                if (eErr != CE_None)
-                {
-                    return false;
-                }
-                psTransform->poCacheDEM->insert(nKey, poValue);
-            }
-
-            // Compose the cached block to the final buffer
-            for (int j = 0; j < nLinesToCopy; j++)
-            {
-                memcpy(padfOut + (nFirstLineInOutput + j) * nWidth +
-                           nFirstColInOutput,
-                       poValue->data() +
-                           (nFirstLineInCachedBlock + j) * nReqXSize +
-                           nFirstColInCachedBlock,
-                       nColsToCopy * sizeof(double));
-            }
-        }
-    }
-
-#if 0
-    CPLDebug("RPC_DEM", "DEM for %d,%d,%d,%d", nX, nY, nWidth, nHeight);
-    for(int j = 0; j < nHeight; j++)
-    {
-        std::string osLine;
-        for(int i = 0; i < nWidth; ++i )
-        {
-            if( !osLine.empty() )
-                osLine += ", ";
-            osLine += std::to_string(padfOut[j * nWidth + i]);
-        }
-        CPLDebug("RPC_DEM", "%s", osLine.c_str());
-    }
-#endif
-
-    return true;
-}
-
 /************************************************************************/
 /*                        GDALRPCGetDEMHeight()                         */
 /************************************************************************/
@@ -1499,145 +1362,26 @@ static int GDALRPCGetDEMHeight(GDALRPCTransformInfo *psTransform,
                                const double dfXIn, const double dfYIn,
                                double *pdfDEMH)
 {
-    const int nRasterXSize = psTransform->poDS->GetRasterXSize();
-    const int nRasterYSize = psTransform->poDS->GetRasterYSize();
-    int bGotNoDataValue = FALSE;
-    const double dfNoDataValue =
-        psTransform->poDS->GetRasterBand(1)->GetNoDataValue(&bGotNoDataValue);
-
-    if (psTransform->eResampleAlg == DRA_Cubic)
+    GDALRIOResampleAlg eResample = GDALRIOResampleAlg::GRIORA_NearestNeighbour;
+    switch (psTransform->eResampleAlg)
     {
-        // Convert from upper left corner of pixel coordinates to center of
-        // pixel coordinates:
-        const double dfX = dfXIn - 0.5;
-        const double dfY = dfYIn - 0.5;
-        const int dX = int(dfX);
-        const int dY = int(dfY);
-        const double dfDeltaX = dfX - dX;
-        const double dfDeltaY = dfY - dY;
-
-        const int dXNew = dX - 1;
-        const int dYNew = dY - 1;
-        if (!(dXNew >= 0 && dYNew >= 0 && dXNew + 4 <= nRasterXSize &&
-              dYNew + 4 <= nRasterYSize))
-        {
-            goto bilinear_fallback;
-        }
-        // Cubic interpolation.
-        double adfElevData[16] = {0.0};
-        if (!GDALRPCExtractDEMWindow(psTransform, dXNew, dYNew, 4, 4,
-                                     adfElevData))
-        {
-            return FALSE;
-        }
-
-        double dfSumH = 0.0;
-        double dfSumWeight = 0.0;
-        for (int k_i = 0; k_i < 4; k_i++)
-        {
-            // Loop across the X axis.
-            for (int k_j = 0; k_j < 4; k_j++)
-            {
-                // Calculate the weight for the specified pixel according
-                // to the bicubic b-spline kernel we're using for
-                // interpolation.
-                const int dKernIndX = k_j - 1;
-                const int dKernIndY = k_i - 1;
-                const double dfPixelWeight =
-                    BiCubicKernel(dKernIndX - dfDeltaX) *
-                    BiCubicKernel(dKernIndY - dfDeltaY);
-
-                // Create a sum of all values
-                // adjusted for the pixel's calculated weight.
-                const double dfElev = adfElevData[k_j + k_i * 4];
-                if (bGotNoDataValue && ARE_REAL_EQUAL(dfNoDataValue, dfElev))
-                    continue;
-
-                dfSumH += dfElev * dfPixelWeight;
-                dfSumWeight += dfPixelWeight;
-            }
-        }
-        if (dfSumWeight == 0.0)
-        {
-            return FALSE;
-        }
-
-        *pdfDEMH = dfSumH / dfSumWeight;
-
-        return TRUE;
-    }
-    else if (psTransform->eResampleAlg == DRA_Bilinear)
-    {
-    bilinear_fallback:
-        // Convert from upper left corner of pixel coordinates to center of
-        // pixel coordinates:
-        const double dfX = dfXIn - 0.5;
-        const double dfY = dfYIn - 0.5;
-        const int dX = static_cast<int>(dfX);
-        const int dY = static_cast<int>(dfY);
-        const double dfDeltaX = dfX - dX;
-        const double dfDeltaY = dfY - dY;
-
-        if (!(dX >= 0 && dY >= 0 && dX + 2 <= nRasterXSize &&
-              dY + 2 <= nRasterYSize))
-        {
-            goto near_fallback;
-        }
-
-        // Bilinear interpolation.
-        double adfElevData[4] = {0.0, 0.0, 0.0, 0.0};
-        if (!GDALRPCExtractDEMWindow(psTransform, dX, dY, 2, 2, adfElevData))
-        {
-            return FALSE;
-        }
-
-        if (bGotNoDataValue)
-        {
-            // TODO: We could perhaps use a valid sample if there's one.
-            bool bFoundNoDataElev = false;
-            for (int k_i = 0; k_i < 4; k_i++)
-            {
-                if (ARE_REAL_EQUAL(dfNoDataValue, adfElevData[k_i]))
-                    bFoundNoDataElev = true;
-            }
-            if (bFoundNoDataElev)
-            {
-                return FALSE;
-            }
-        }
-        const double dfDeltaX1 = 1.0 - dfDeltaX;
-        const double dfDeltaY1 = 1.0 - dfDeltaY;
-
-        const double dfXZ1 =
-            adfElevData[0] * dfDeltaX1 + adfElevData[1] * dfDeltaX;
-        const double dfXZ2 =
-            adfElevData[2] * dfDeltaX1 + adfElevData[3] * dfDeltaX;
-        const double dfYZ = dfXZ1 * dfDeltaY1 + dfXZ2 * dfDeltaY;
-
-        *pdfDEMH = dfYZ;
-
-        return TRUE;
+        case DEMResampleAlg::DRA_NearestNeighbour:
+            eResample = GDALRIOResampleAlg::GRIORA_NearestNeighbour;
+            break;
+        case DEMResampleAlg::DRA_Bilinear:
+            eResample = GDALRIOResampleAlg::GRIORA_Bilinear;
+            break;
+        case DEMResampleAlg::DRA_CubicSpline:
+            eResample = GDALRIOResampleAlg::GRIORA_CubicSpline;
+            break;
     }
-    else
-    {
-    near_fallback:
-        const int dX = static_cast<int>(dfXIn);
-        const int dY = static_cast<int>(dfYIn);
-        if (!(dX >= 0 && dY >= 0 && dX < nRasterXSize && dY < nRasterYSize))
-        {
-            return FALSE;
-        }
-        double dfDEMH = 0.0;
-        if (!GDALRPCExtractDEMWindow(psTransform, dX, dY, 1, 1, &dfDEMH) ||
-            (bGotNoDataValue && ARE_REAL_EQUAL(dfNoDataValue, dfDEMH)))
-        {
-            return FALSE;
-        }
-
-        *pdfDEMH = dfDEMH;
 
-        return TRUE;
-    }
+    std::unique_ptr<DoublePointsCache> cacheDEM{psTransform->poCacheDEM};
+    int res =
+        GDALInterpolateAtPoint(psTransform->poDS->GetRasterBand(1), eResample,
+                               cacheDEM, dfXIn, dfYIn, pdfDEMH, nullptr);
+    psTransform->poCacheDEM = cacheDEM.release();
+    return res;
 }
 
 /************************************************************************/
@@ -1703,7 +1447,7 @@ GDALRPCTransformWholeLineWithDEM(const GDALRPCTransformInfo *psTransform,
         double dfDEMH = 0.0;
         const double dfZ_i = padfZ ? padfZ[i] : 0.0;
 
-        if (psTransform->eResampleAlg == DRA_Cubic)
+        if (psTransform->eResampleAlg == DRA_CubicSpline)
         {
             // dfX in pixel center convention.
             const double dfX =
@@ -1727,8 +1471,8 @@ GDALRPCTransformWholeLineWithDEM(const GDALRPCTransformInfo *psTransform,
                     const int dKernIndX = k_j - 1;
                     const int dKernIndY = k_i - 1;
                     const double dfPixelWeight =
-                        BiCubicKernel(dKernIndX - dfDeltaX) *
-                        BiCubicKernel(dKernIndY - dfDeltaY);
+                        CubicSplineKernel(dKernIndX - dfDeltaX) *
+                        CubicSplineKernel(dKernIndY - dfDeltaY);
 
                     // Create a sum of all values
                     // adjusted for the pixel's calculated weight.
@@ -2111,7 +1855,7 @@ int GDALRPCTransform(void *pTransformArg, int bDstToSrc, int nPointCount,
                 int nXWidth = nXRight - nXLeft + 1;
                 int nYTop = static_cast<int>(floor(dfY1));
                 int nYHeight;
-                if (psTransform->eResampleAlg == DRA_Cubic)
+                if (psTransform->eResampleAlg == DRA_CubicSpline)
                 {
                     nXLeft--;
                     nXWidth += 3;
@@ -2273,7 +2017,7 @@ CPLXMLNode *GDALSerializeRPCTransformer(void *pTransformArg)
         {
             CPLCreateXMLElementAndValue(
                 psTree, "DEMMissingValue",
-                CPLSPrintf("%.18g", psInfo->dfDEMMissingValue));
+                CPLSPrintf("%.17g", psInfo->dfDEMMissingValue));
         }
 
         CPLCreateXMLElementAndValue(psTree, "DEMApplyVDatumShift",
diff --git a/alg/gdal_simplesurf.cpp b/alg/gdal_simplesurf.cpp
index 4a76243b64b8..7af8ba0332db 100644
--- a/alg/gdal_simplesurf.cpp
+++ b/alg/gdal_simplesurf.cpp
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2012, Andrew Migal
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_simplesurf.h"
diff --git a/alg/gdal_simplesurf.h b/alg/gdal_simplesurf.h
index 872644f9ca12..d6d1b1e4b7fd 100644
--- a/alg/gdal_simplesurf.h
+++ b/alg/gdal_simplesurf.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2012, Andrew Migal
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 /**
diff --git a/alg/gdal_tps.cpp b/alg/gdal_tps.cpp
index be7159bc50aa..cb259c95e38f 100644
--- a/alg/gdal_tps.cpp
+++ b/alg/gdal_tps.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/alg/gdalapplyverticalshiftgrid.cpp b/alg/gdalapplyverticalshiftgrid.cpp
index 8b46fd3818b7..a7d044cb2abd 100644
--- a/alg/gdalapplyverticalshiftgrid.cpp
+++ b/alg/gdalapplyverticalshiftgrid.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2017, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
@@ -38,6 +22,7 @@
 
 #include "proj.h"
 
+#include <cmath>
 #include <limits>
 
 /************************************************************************/
@@ -255,7 +240,7 @@ CPLErr GDALApplyVSGRasterBand::IReadBlock(int nBlockXOff, int nBlockYOff,
                 if (bHasNoData && fSrcVal == fNoDataValue)
                 {
                 }
-                else if (CPLIsInf(fGridVal))
+                else if (std::isinf(fGridVal))
                 {
                     CPLError(CE_Failure, CPLE_AppDefined,
                              "Missing vertical grid value at source (%d,%d)",
diff --git a/alg/gdalchecksum.cpp b/alg/gdalchecksum.cpp
index e0f0dcafacf8..39ee2ba21314 100644
--- a/alg/gdalchecksum.cpp
+++ b/alg/gdalchecksum.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2003, Frank Warmerdam
  * Copyright (c) 2007-2008, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -80,12 +64,9 @@ int CPL_STDCALL GDALChecksumImage(GDALRasterBandH hBand, int nXOff, int nYOff,
     const auto IntFromDouble = [](double dfVal)
     {
         int nVal;
-        if (CPLIsNan(dfVal) || CPLIsInf(dfVal))
+        if (!std::isfinite(dfVal))
         {
-            // Most compilers seem to cast NaN or Inf to 0x80000000.
-            // but VC7 is an exception. So we force the result
-            // of such a cast.
-            nVal = 0x80000000;
+            nVal = INT_MIN;
         }
         else
         {
@@ -371,5 +352,6 @@ int CPL_STDCALL GDALChecksumImage(GDALRasterBandH hBand, int nXOff, int nYOff,
         CPLFree(panLineData);
     }
 
+    // coverity[return_overflow]
     return nChecksum;
 }
diff --git a/alg/gdalcutline.cpp b/alg/gdalcutline.cpp
index f06ca95d2a6f..fee9a684d582 100644
--- a/alg/gdalcutline.cpp
+++ b/alg/gdalcutline.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2008, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/alg/gdaldither.cpp b/alg/gdaldither.cpp
index 7365168f1a46..46353ab6ec8e 100644
--- a/alg/gdaldither.cpp
+++ b/alg/gdaldither.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2001, Frank Warmerdam
  * Copyright (c) 2007, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************
  *
  * Notes:
diff --git a/alg/gdalgenericinverse.cpp b/alg/gdalgenericinverse.cpp
index cccc90ba22a9..f271efef5c49 100644
--- a/alg/gdalgenericinverse.cpp
+++ b/alg/gdalgenericinverse.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <algorithm>
diff --git a/alg/gdalgenericinverse.h b/alg/gdalgenericinverse.h
index 67005a1e15d4..2907500da9d0 100644
--- a/alg/gdalgenericinverse.h
+++ b/alg/gdalgenericinverse.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDALGENERICINVERSE_H
diff --git a/alg/gdalgeoloc.cpp b/alg/gdalgeoloc.cpp
index d17d2788098b..74ba0a74fadb 100644
--- a/alg/gdalgeoloc.cpp
+++ b/alg/gdalgeoloc.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2021, CLS
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -1591,9 +1575,9 @@ static void GDALGeoLocRescale(char **&papszMD, const char *pszItem,
 {
     const double dfVal =
         dfRatio * CPLAtofM(CSLFetchNameValueDef(
-                      papszMD, pszItem, CPLSPrintf("%.18g", dfDefaultVal)));
+                      papszMD, pszItem, CPLSPrintf("%.17g", dfDefaultVal)));
 
-    papszMD = CSLSetNameValue(papszMD, pszItem, CPLSPrintf("%.18g", dfVal));
+    papszMD = CSLSetNameValue(papszMD, pszItem, CPLSPrintf("%.17g", dfVal));
 }
 
 /************************************************************************/
@@ -1718,7 +1702,7 @@ CPLStringList GDALCreateGeolocationMetadata(GDALDatasetH hBaseDS,
     if (aosMD.FetchNameValue("PIXEL_STEP") == nullptr)
     {
         aosMD.SetNameValue(
-            "PIXEL_STEP", CPLSPrintf("%.18g", static_cast<double>(
+            "PIXEL_STEP", CPLSPrintf("%.17g", static_cast<double>(
                                                   GDALGetRasterXSize(hBaseDS)) /
                                                   nGeoLocXSize));
     }
@@ -1726,7 +1710,7 @@ CPLStringList GDALCreateGeolocationMetadata(GDALDatasetH hBaseDS,
     if (aosMD.FetchNameValue("LINE_STEP") == nullptr)
     {
         aosMD.SetNameValue(
-            "LINE_STEP", CPLSPrintf("%.18g", static_cast<double>(
+            "LINE_STEP", CPLSPrintf("%.17g", static_cast<double>(
                                                  GDALGetRasterYSize(hBaseDS)) /
                                                  nGeoLocYSize));
     }
@@ -2006,14 +1990,20 @@ void *GDALCreateGeoLocTransformerEx(GDALDatasetH hBaseDS,
         psTransform->bUseArray = !CPLTestBool(pszUseTempDatasets);
     else
     {
-        psTransform->bUseArray = nXSize < 16 * 1000 * 1000 / nYSize;
-        if (psTransform->bUseArray)
+        constexpr int MEGAPIXEL_LIMIT = 24;
+        psTransform->bUseArray =
+            nXSize < MEGAPIXEL_LIMIT * 1000 * 1000 / nYSize;
+        if (!psTransform->bUseArray)
         {
             CPLDebug("GEOLOC",
                      "Using temporary GTiff backing to store backmap, because "
-                     "geoloc arrays exceed 16 megapixels. You can set the "
+                     "geoloc arrays require %d megapixels, exceeding the %d "
+                     "megapixels limit. You can set the "
                      "GDAL_GEOLOC_USE_TEMP_DATASETS configuration option to "
-                     "NO to force RAM storage of backmap");
+                     "NO to force RAM storage of backmap",
+                     static_cast<int>(static_cast<int64_t>(nXSize) * nYSize /
+                                      (1000 * 1000)),
+                     MEGAPIXEL_LIMIT);
         }
     }
 
diff --git a/alg/gdalgeoloc.h b/alg/gdalgeoloc.h
index 460bbc55aa0d..9ec7a657c970 100644
--- a/alg/gdalgeoloc.h
+++ b/alg/gdalgeoloc.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDALGEOLOC_H
diff --git a/alg/gdalgeoloc_carray_accessor.h b/alg/gdalgeoloc_carray_accessor.h
index f5da60deff82..53cdd3889554 100644
--- a/alg/gdalgeoloc_carray_accessor.h
+++ b/alg/gdalgeoloc_carray_accessor.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 /*! @cond Doxygen_Suppress */
diff --git a/alg/gdalgeoloc_dataset_accessor.h b/alg/gdalgeoloc_dataset_accessor.h
index c0a5960a6e97..56113574c766 100644
--- a/alg/gdalgeoloc_dataset_accessor.h
+++ b/alg/gdalgeoloc_dataset_accessor.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdalcachedpixelaccessor.h"
@@ -53,13 +37,14 @@ class GDALGeoLocDatasetAccessors
     bool LoadGeoloc(bool bIsRegularGrid);
 
   public:
-    static constexpr int TILE_SIZE = 1024;
+    static constexpr int TILE_SIZE = 256;
+    static constexpr int TILE_COUNT = 64;
 
-    GDALCachedPixelAccessor<double, TILE_SIZE> geolocXAccessor;
-    GDALCachedPixelAccessor<double, TILE_SIZE> geolocYAccessor;
-    GDALCachedPixelAccessor<float, TILE_SIZE> backMapXAccessor;
-    GDALCachedPixelAccessor<float, TILE_SIZE> backMapYAccessor;
-    GDALCachedPixelAccessor<float, TILE_SIZE> backMapWeightAccessor;
+    GDALCachedPixelAccessor<double, TILE_SIZE, TILE_COUNT> geolocXAccessor;
+    GDALCachedPixelAccessor<double, TILE_SIZE, TILE_COUNT> geolocYAccessor;
+    GDALCachedPixelAccessor<float, TILE_SIZE, TILE_COUNT> backMapXAccessor;
+    GDALCachedPixelAccessor<float, TILE_SIZE, TILE_COUNT> backMapYAccessor;
+    GDALCachedPixelAccessor<float, TILE_SIZE, TILE_COUNT> backMapWeightAccessor;
 
     explicit GDALGeoLocDatasetAccessors(GDALGeoLocTransformInfo *psTransform)
         : m_psTransform(psTransform), geolocXAccessor(nullptr),
@@ -117,10 +102,14 @@ bool GDALGeoLocDatasetAccessors::AllocateBackMap()
     if (poDriver == nullptr)
         return false;
 
+    // CPLResetExtension / CPLGenerateTempFilename generate short-lived strings,
+    // so store them in a long-lived std::string
+    const std::string osBackmapTmpFilename =
+        CPLResetExtension(CPLGenerateTempFilename(nullptr), "tif");
     m_poBackmapTmpDataset = poDriver->Create(
-        CPLResetExtension(CPLGenerateTempFilename(nullptr), "tif"),
-        m_psTransform->nBackMapWidth, m_psTransform->nBackMapHeight, 2,
-        GDT_Float32, m_aosGTiffCreationOptions.List());
+        osBackmapTmpFilename.c_str(), m_psTransform->nBackMapWidth,
+        m_psTransform->nBackMapHeight, 2, GDT_Float32,
+        m_aosGTiffCreationOptions.List());
     if (m_poBackmapTmpDataset == nullptr)
     {
         return false;
@@ -133,10 +122,14 @@ bool GDALGeoLocDatasetAccessors::AllocateBackMap()
     backMapXAccessor.SetBand(poBandX);
     backMapYAccessor.SetBand(poBandY);
 
+    // CPLResetExtension / CPLGenerateTempFilename generate short-lived strings,
+    // so store them in a long-lived std::string
+    const std::string osBackmapWeightsTmpFilename =
+        CPLResetExtension(CPLGenerateTempFilename(nullptr), "tif");
     m_poBackmapWeightsTmpDataset = poDriver->Create(
-        CPLResetExtension(CPLGenerateTempFilename(nullptr), "tif"),
-        m_psTransform->nBackMapWidth, m_psTransform->nBackMapHeight, 1,
-        GDT_Float32, m_aosGTiffCreationOptions.List());
+        osBackmapWeightsTmpFilename.c_str(), m_psTransform->nBackMapWidth,
+        m_psTransform->nBackMapHeight, 1, GDT_Float32,
+        m_aosGTiffCreationOptions.List());
     if (m_poBackmapWeightsTmpDataset == nullptr)
     {
         return false;
@@ -214,9 +207,13 @@ bool GDALGeoLocDatasetAccessors::LoadGeoloc(bool bIsRegularGrid)
         if (poDriver == nullptr)
             return false;
 
-        m_poGeolocTmpDataset = poDriver->Create(
-            CPLResetExtension(CPLGenerateTempFilename(nullptr), "tif"), nXSize,
-            nYSize, 2, GDT_Float64, m_aosGTiffCreationOptions.List());
+        // CPLResetExtension / CPLGenerateTempFilename generate short-lived
+        // strings, so store them in a long-lived std::string
+        const std::string osGeolocTmpFilename =
+            CPLResetExtension(CPLGenerateTempFilename(nullptr), "tif");
+        m_poGeolocTmpDataset =
+            poDriver->Create(osGeolocTmpFilename.c_str(), nXSize, nYSize, 2,
+                             GDT_Float64, m_aosGTiffCreationOptions.List());
         if (m_poGeolocTmpDataset == nullptr)
         {
             return false;
diff --git a/alg/gdalgeolocquadtree.cpp b/alg/gdalgeolocquadtree.cpp
index 0276e933f296..8144e8c986e3 100644
--- a/alg/gdalgeolocquadtree.cpp
+++ b/alg/gdalgeolocquadtree.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdalgeoloc.h"
diff --git a/alg/gdalgeolocquadtree.h b/alg/gdalgeolocquadtree.h
index 756d0706100a..73fa99301256 100644
--- a/alg/gdalgeolocquadtree.h
+++ b/alg/gdalgeolocquadtree.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDALGEOLOCQUADTREE_H
diff --git a/alg/gdalgrid.cpp b/alg/gdalgrid.cpp
index 9e46953da70e..044a217e9588 100644
--- a/alg/gdalgrid.cpp
+++ b/alg/gdalgrid.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2007, Andrey Kiselev <dron@ak4719.spb.edu>
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/alg/gdalgrid.h b/alg/gdalgrid.h
index 8dab0e8d397d..6176508c3e42 100644
--- a/alg/gdalgrid.h
+++ b/alg/gdalgrid.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2007, Andrey Kiselev <dron@ak4719.spb.edu>
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDALGRID_H_INCLUDED
diff --git a/alg/gdalgrid_priv.h b/alg/gdalgrid_priv.h
index 3d1a7fc35af6..3c3da523c344 100644
--- a/alg/gdalgrid_priv.h
+++ b/alg/gdalgrid_priv.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDALGRID_PRIV_H
diff --git a/alg/gdalgridavx.cpp b/alg/gdalgridavx.cpp
index f198ecb5141e..55c49227f22b 100644
--- a/alg/gdalgridavx.cpp
+++ b/alg/gdalgridavx.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdalgrid.h"
diff --git a/alg/gdalgridsse.cpp b/alg/gdalgridsse.cpp
index 958a5c1033bd..0d5f71f84ce1 100644
--- a/alg/gdalgridsse.cpp
+++ b/alg/gdalgridsse.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdalgrid.h"
diff --git a/alg/gdallinearsystem.cpp b/alg/gdallinearsystem.cpp
index 607e46debccb..c2b8d5241b9f 100644
--- a/alg/gdallinearsystem.cpp
+++ b/alg/gdallinearsystem.cpp
@@ -12,23 +12,7 @@
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.com>
  * Copyright (c) 2019, Martin Franzke <martin dot franzke at telekom dot de>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 /*! @cond Doxygen_Suppress */
diff --git a/alg/gdallinearsystem.h b/alg/gdallinearsystem.h
index 23ce47fd7ffe..76e303f6ca77 100644
--- a/alg/gdallinearsystem.h
+++ b/alg/gdallinearsystem.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2017 Alan Thomas <alant@outlook.com.au>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 /*! @cond Doxygen_Suppress */
diff --git a/alg/gdalmatching.cpp b/alg/gdalmatching.cpp
index 7a78d8beb520..f761bb2c7579 100644
--- a/alg/gdalmatching.cpp
+++ b/alg/gdalmatching.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2012, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_alg.h"
diff --git a/alg/gdalmediancut.cpp b/alg/gdalmediancut.cpp
index 9794c3f153eb..4ffa7931cfb7 100644
--- a/alg/gdalmediancut.cpp
+++ b/alg/gdalmediancut.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2001, Frank Warmerdam
  * Copyright (c) 2007-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************
  *
  * This code was based on the tiffmedian.c code from libtiff (www.libtiff.org)
diff --git a/alg/gdalpansharpen.cpp b/alg/gdalpansharpen.cpp
index a72179071e46..53f11b7d6cf0 100644
--- a/alg/gdalpansharpen.cpp
+++ b/alg/gdalpansharpen.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2015, Even Rouault <even.rouault at spatialys.com>
  * Copyright (c) 2015, Airbus DS Geo SA (weighted Brovey algorithm)
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/alg/gdalpansharpen.h b/alg/gdalpansharpen.h
index d9f7582adf3a..d4f1f3102887 100644
--- a/alg/gdalpansharpen.h
+++ b/alg/gdalpansharpen.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDALPANSHARPEN_H_INCLUDED
diff --git a/alg/gdalproximity.cpp b/alg/gdalproximity.cpp
index 8b4109605137..aaa9bda10ef8 100644
--- a/alg/gdalproximity.cpp
+++ b/alg/gdalproximity.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2008, Frank Warmerdam
  * Copyright (c) 2009-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -103,7 +87,7 @@ the proximity output.
 
   FIXED_BUF_VAL=n
 
-If this option is set, all pixels within the MAXDIST threadhold are
+If this option is set, all pixels within the MAXDIST threshold are
 set to this fixed value instead of to a proximity distance.
 */
 
diff --git a/alg/gdalrasterize.cpp b/alg/gdalrasterize.cpp
index 16be0bac7c55..458a8217bf02 100644
--- a/alg/gdalrasterize.cpp
+++ b/alg/gdalrasterize.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -1559,11 +1543,8 @@ CPLErr GDALRasterizeLayers(GDALDatasetH hDS, int nBandCount, int *panBandList,
     if (!(pszYChunkSize && ((nYChunkSize = atoi(pszYChunkSize))) != 0))
     {
         const GIntBig nYChunkSize64 = GDALGetCacheMax64() / nScanlineBytes;
-        const int knIntMax = std::numeric_limits<int>::max();
-        if (nYChunkSize64 > knIntMax)
-            nYChunkSize = knIntMax;
-        else
-            nYChunkSize = static_cast<int>(nYChunkSize64);
+        nYChunkSize = static_cast<int>(
+            std::min<GIntBig>(nYChunkSize64, std::numeric_limits<int>::max()));
     }
 
     if (nYChunkSize < 1)
diff --git a/alg/gdalrasterpolygonenumerator.cpp b/alg/gdalrasterpolygonenumerator.cpp
index dc9358c41b79..13f7fde8e7fd 100644
--- a/alg/gdalrasterpolygonenumerator.cpp
+++ b/alg/gdalrasterpolygonenumerator.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2008, Frank Warmerdam
  * Copyright (c) 2015, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/alg/gdalresamplingkernels.h b/alg/gdalresamplingkernels.h
new file mode 100644
index 000000000000..9e338834c086
--- /dev/null
+++ b/alg/gdalresamplingkernels.h
@@ -0,0 +1,64 @@
+/******************************************************************************
+ * $Id$
+ *
+ * Project:  GDAL Raster Interpolation
+ * Purpose:  Interpolation algorithms with cache
+ * Author:   Frank Warmerdam, warmerdam@pobox.com
+ *
+ ******************************************************************************
+ * Copyright (c) 2001, Frank Warmerdam
+ * Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.com>
+ * Copyright (c) 2024, Javier Jimenez Shaw
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#ifndef GDALRESAMPLINGKERNELS_H_INCLUDED
+#define GDALRESAMPLINGKERNELS_H_INCLUDED
+
+#include <cmath>
+
+/*! @cond Doxygen_Suppress */
+
+static inline double CubicKernel(double dfX)
+{
+    // http://en.wikipedia.org/wiki/Bicubic_interpolation#Bicubic_convolution_algorithm
+    // W(x) formula with a = -0.5 (cubic hermite spline )
+    // or
+    // https://www.cs.utexas.edu/~fussell/courses/cs384g-fall2013/lectures/mitchell/Mitchell.pdf
+    // k(x) (formula 8) with (B,C)=(0,0.5) the Catmull-Rom spline
+    double dfAbsX = fabs(dfX);
+    if (dfAbsX <= 1.0)
+    {
+        double dfX2 = dfX * dfX;
+        return dfX2 * (1.5 * dfAbsX - 2.5) + 1;
+    }
+    else if (dfAbsX <= 2.0)
+    {
+        double dfX2 = dfX * dfX;
+        return dfX2 * (-0.5 * dfAbsX + 2.5) - 4 * dfAbsX + 2;
+    }
+    else
+        return 0.0;
+}
+
+static inline double CubicSplineKernel(double dfVal)
+{
+    if (dfVal > 2.0)
+        return 0.0;
+
+    const double xm1 = dfVal - 1.0;
+    const double xp1 = dfVal + 1.0;
+    const double xp2 = dfVal + 2.0;
+
+    const double a = xp2 <= 0.0 ? 0.0 : xp2 * xp2 * xp2;
+    const double b = xp1 <= 0.0 ? 0.0 : xp1 * xp1 * xp1;
+    const double c = dfVal <= 0.0 ? 0.0 : dfVal * dfVal * dfVal;
+    const double d = xm1 <= 0.0 ? 0.0 : xm1 * xm1 * xm1;
+
+    return 0.16666666666666666667 * (a - (4.0 * b) + (6.0 * c) - (4.0 * d));
+}
+
+/*! @endcond */
+
+#endif /* ndef GDALRESAMPLINGKERNELS_H_INCLUDED */
diff --git a/alg/gdalsievefilter.cpp b/alg/gdalsievefilter.cpp
index a3c60a0cdb6a..ac9ea1b9e847 100644
--- a/alg/gdalsievefilter.cpp
+++ b/alg/gdalsievefilter.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2008, Frank Warmerdam
  * Copyright (c) 2009-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -33,7 +17,6 @@
 #include <cstring>
 
 #include <algorithm>
-#include <cassert>
 #include <set>
 #include <vector>
 #include <utility>
@@ -211,30 +194,36 @@ CPLErr CPL_STDCALL GDALSieveFilter(GDALRasterBandH hSrcBand,
     /* -------------------------------------------------------------------- */
     int nXSize = GDALGetRasterBandXSize(hSrcBand);
     int nYSize = GDALGetRasterBandYSize(hSrcBand);
-    auto *panLastLineVal = static_cast<std::int64_t *>(
-        VSI_MALLOC2_VERBOSE(sizeof(std::int64_t), nXSize));
-    auto *panThisLineVal = static_cast<std::int64_t *>(
-        VSI_MALLOC2_VERBOSE(sizeof(std::int64_t), nXSize));
-    auto *panLastLineId =
-        static_cast<GInt32 *>(VSI_MALLOC2_VERBOSE(sizeof(GInt32), nXSize));
-    auto *panThisLineId =
-        static_cast<GInt32 *>(VSI_MALLOC2_VERBOSE(sizeof(GInt32), nXSize));
-    auto *panThisLineWriteVal = static_cast<std::int64_t *>(
-        VSI_MALLOC2_VERBOSE(sizeof(std::int64_t), nXSize));
-    GByte *pabyMaskLine = hMaskBand != nullptr
-                              ? static_cast<GByte *>(VSI_MALLOC_VERBOSE(nXSize))
-                              : nullptr;
+    auto panLastLineValKeeper = std::unique_ptr<std::int64_t, VSIFreeReleaser>(
+        static_cast<std::int64_t *>(
+            VSI_MALLOC2_VERBOSE(sizeof(std::int64_t), nXSize)));
+    auto panThisLineValKeeper = std::unique_ptr<std::int64_t, VSIFreeReleaser>(
+        static_cast<std::int64_t *>(
+            VSI_MALLOC2_VERBOSE(sizeof(std::int64_t), nXSize)));
+    auto panLastLineIdKeeper = std::unique_ptr<GInt32, VSIFreeReleaser>(
+        static_cast<GInt32 *>(VSI_MALLOC2_VERBOSE(sizeof(GInt32), nXSize)));
+    auto panThisLineIdKeeper = std::unique_ptr<GInt32, VSIFreeReleaser>(
+        static_cast<GInt32 *>(VSI_MALLOC2_VERBOSE(sizeof(GInt32), nXSize)));
+    auto panThisLineWriteValKeeper =
+        std::unique_ptr<std::int64_t, VSIFreeReleaser>(
+            static_cast<std::int64_t *>(
+                VSI_MALLOC2_VERBOSE(sizeof(std::int64_t), nXSize)));
+    auto pabyMaskLineKeeper = std::unique_ptr<GByte, VSIFreeReleaser>(
+        hMaskBand != nullptr ? static_cast<GByte *>(VSI_MALLOC_VERBOSE(nXSize))
+                             : nullptr);
+
+    auto panLastLineVal = panLastLineValKeeper.get();
+    auto panThisLineVal = panThisLineValKeeper.get();
+    auto panLastLineId = panLastLineIdKeeper.get();
+    auto panThisLineId = panThisLineIdKeeper.get();
+    auto panThisLineWriteVal = panThisLineWriteValKeeper.get();
+    auto pabyMaskLine = pabyMaskLineKeeper.get();
+
     if (panLastLineVal == nullptr || panThisLineVal == nullptr ||
         panLastLineId == nullptr || panThisLineId == nullptr ||
         panThisLineWriteVal == nullptr ||
         (hMaskBand != nullptr && pabyMaskLine == nullptr))
     {
-        CPLFree(panThisLineId);
-        CPLFree(panLastLineId);
-        CPLFree(panThisLineVal);
-        CPLFree(panLastLineVal);
-        CPLFree(panThisLineWriteVal);
-        CPLFree(pabyMaskLine);
         return CE_Failure;
     }
 
@@ -316,12 +305,28 @@ CPLErr CPL_STDCALL GDALSieveFilter(GDALRasterBandH hSrcBand,
     if (eErr == CE_None)
         oFirstEnum.CompleteMerges();
 
+    /* -------------------------------------------------------------------- */
+    /*      Check if there are polygons                                     */
+    /* -------------------------------------------------------------------- */
+    if (!oFirstEnum.panPolyIdMap || !oFirstEnum.panPolyValue)
+    {
+        // Can happen if all pixels are masked
+        if (hSrcBand == hDstBand)
+        {
+            pfnProgress(1.0, "", pProgressArg);
+            return CE_None;
+        }
+        else
+        {
+            return GDALRasterBandCopyWholeRaster(hSrcBand, hDstBand, nullptr,
+                                                 pfnProgress, pProgressArg);
+        }
+    }
+
     /* -------------------------------------------------------------------- */
     /*      Push the sizes of merged polygon fragments into the             */
     /*      merged polygon id's count.                                      */
     /* -------------------------------------------------------------------- */
-    assert(oFirstEnum.panPolyIdMap != nullptr);  // for Coverity
-    assert(oFirstEnum.panPolyValue != nullptr);  // for Coverity
     for (int iPoly = 0; iPoly < oFirstEnum.nNextPolygonId; iPoly++)
     {
         if (oFirstEnum.panPolyIdMap[iPoly] != iPoly)
@@ -346,10 +351,16 @@ CPLErr CPL_STDCALL GDALSieveFilter(GDALRasterBandH hSrcBand,
     GDALRasterPolygonEnumerator oSecondEnum(nConnectedness);
 
     std::vector<int> anBigNeighbour;
-    anBigNeighbour.resize(anPolySizes.size());
-
-    for (int iPoly = 0; iPoly < static_cast<int>(anPolySizes.size()); iPoly++)
-        anBigNeighbour[iPoly] = -1;
+    try
+    {
+        anBigNeighbour.resize(anPolySizes.size(), -1);
+    }
+    catch (const std::exception &)
+    {
+        CPLError(CE_Failure, CPLE_OutOfMemory, "%s: Out of memory",
+                 __FUNCTION__);
+        return CE_Failure;
+    }
 
     /* ==================================================================== */
     /*      Second pass ... identify the largest neighbour for each         */
@@ -540,9 +551,7 @@ CPLErr CPL_STDCALL GDALSieveFilter(GDALRasterBandH hSrcBand,
     /* ==================================================================== */
     oSecondEnum.Clear();
 
-    for (int iY = 0; oFirstEnum.panPolyIdMap != nullptr &&  // for Coverity
-                     eErr == CE_None && iY < nYSize;
-         iY++)
+    for (int iY = 0; eErr == CE_None && iY < nYSize; iY++)
     {
         /* --------------------------------------------------------------------
          */
@@ -627,15 +636,5 @@ CPLErr CPL_STDCALL GDALSieveFilter(GDALRasterBandH hSrcBand,
         }
     }
 
-    /* -------------------------------------------------------------------- */
-    /*      Cleanup                                                         */
-    /* -------------------------------------------------------------------- */
-    CPLFree(panThisLineId);
-    CPLFree(panLastLineId);
-    CPLFree(panThisLineVal);
-    CPLFree(panLastLineVal);
-    CPLFree(panThisLineWriteVal);
-    CPLFree(pabyMaskLine);
-
     return eErr;
 }
diff --git a/alg/gdalsimplewarp.cpp b/alg/gdalsimplewarp.cpp
index 0346068fd6b8..8f4f9a11a9a8 100644
--- a/alg/gdalsimplewarp.cpp
+++ b/alg/gdalsimplewarp.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2002, i3 - information integration and imaging, Fort Collin, CO
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/alg/gdaltransformer.cpp b/alg/gdaltransformer.cpp
index bff7c93cc3bc..ba2adc3dc73e 100644
--- a/alg/gdaltransformer.cpp
+++ b/alg/gdaltransformer.cpp
@@ -11,23 +11,7 @@
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.com>
  * Copyright (c) 2021, CLS
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -885,7 +869,7 @@ CPLErr CPL_STDCALL GDALSuggestedWarpOutput2(GDALDatasetH hSrcDS,
                  "transform.",
                  nFailedCount, nSamplePoints);
 
-    bool bIsGeographicCoords = false;
+    bool bIsGeographicCoordsDeg = false;
     if (bIsGDALGenImgProjTransform)
     {
         const GDALGenImgProjTransformInfo *pGIPTI =
@@ -915,15 +899,17 @@ CPLErr CPL_STDCALL GDALSuggestedWarpOutput2(GDALDatasetH hSrcDS,
                     CSLFetchNameValue(pGLTI->papszGeolocationInfo, "SRS");
                 if (pszGLSRS == nullptr)
                 {
-                    bIsGeographicCoords = true;
+                    bIsGeographicCoordsDeg = true;
                 }
                 else
                 {
                     OGRSpatialReference oSRS;
                     if (oSRS.SetFromUserInput(pszGLSRS) == OGRERR_NONE &&
-                        oSRS.IsGeographic())
+                        oSRS.IsGeographic() &&
+                        std::fabs(oSRS.GetAngularUnits() -
+                                  CPLAtof(SRS_UA_DEGREE_CONV)) < 1e-9)
                     {
-                        bIsGeographicCoords = true;
+                        bIsGeographicCoordsDeg = true;
                     }
                 }
             }
@@ -983,7 +969,7 @@ CPLErr CPL_STDCALL GDALSuggestedWarpOutput2(GDALDatasetH hSrcDS,
                      CPLAtof(SRS_UA_DEGREE_CONV)) < 1e-9 &&
                 (!poSourceCRS || !poSourceCRS->IsGeographic()))
             {
-                bIsGeographicCoords = true;
+                bIsGeographicCoordsDeg = true;
 
                 std::unique_ptr<CPLConfigOptionSetter> poSetter;
                 if (pGIPTI->bCheckWithInvertPROJ)
@@ -1210,7 +1196,7 @@ CPLErr CPL_STDCALL GDALSuggestedWarpOutput2(GDALDatasetH hSrcDS,
     /*      Recompute some bounds so that all return values are consistent  */
     /* -------------------------------------------------------------------- */
     double dfMaxXOutNew = dfMinXOut + (*pnPixels) * dfPixelSizeX;
-    if (bIsGeographicCoords &&
+    if (bIsGeographicCoordsDeg &&
         ((dfMaxXOut <= 180 && dfMaxXOutNew > 180) || dfMaxXOut == 180))
     {
         dfMaxXOut = 180;
@@ -1222,7 +1208,7 @@ CPLErr CPL_STDCALL GDALSuggestedWarpOutput2(GDALDatasetH hSrcDS,
     }
 
     double dfMinYOutNew = dfMaxYOut - (*pnLines) * dfPixelSizeY;
-    if (bIsGeographicCoords && dfMinYOut >= -90 && dfMinYOutNew < -90)
+    if (bIsGeographicCoordsDeg && dfMinYOut >= -90 && dfMinYOutNew < -90)
     {
         dfMinYOut = -90;
         dfPixelSizeY = (dfMaxYOut - dfMinYOut) / *pnLines;
@@ -1442,8 +1428,11 @@ static void InsertCenterLong(GDALDatasetH hDS, OGRSpatialReference *poSRS,
                              CPLStringList &aosOptions)
 
 {
-    if (!poSRS->IsGeographic())
+    if (!poSRS->IsGeographic() || std::fabs(poSRS->GetAngularUnits() -
+                                            CPLAtof(SRS_UA_DEGREE_CONV)) > 1e-9)
+    {
         return;
+    }
 
     if (poSRS->GetExtension(nullptr, "CENTER_LONG"))
         return;
@@ -1482,7 +1471,12 @@ static void InsertCenterLong(GDALDatasetH hDS, OGRSpatialReference *poSRS,
                           adfGeoTransform[0] + nXSize * adfGeoTransform[1] +
                               nYSize * adfGeoTransform[2]));
 
-    if (dfMaxLong - dfMinLong > 360.0)
+    const double dfEpsilon =
+        std::max(std::fabs(adfGeoTransform[1]), std::fabs(adfGeoTransform[2]));
+    // If the raster covers more than 360 degree (allow an extra pixel),
+    // give up
+    constexpr double RELATIVE_EPSILON = 0.05;  // for numeric precision issues
+    if (dfMaxLong - dfMinLong > 360.0 + dfEpsilon * (1 + RELATIVE_EPSILON))
         return;
 
     /* -------------------------------------------------------------------- */
@@ -1760,13 +1754,13 @@ static void GDALGCPAntimeridianUnwrap(int nGCPCount, GDAL_GCP *pasGCPList,
  * a PROJ or WKT string, used as an override over the normally computed
  * pipeline. The pipeline must take into account the axis order of the source
  * and target SRS. <li> COORDINATE_EPOCH: (GDAL &gt;= 3.0) Coordinate epoch,
- * expressed as a decimal year. Useful for time-dependant coordinate operations.
+ * expressed as a decimal year. Useful for time-dependent coordinate operations.
  * </li>
  * <li> SRC_COORDINATE_EPOCH: (GDAL &gt;= 3.4) Coordinate epoch of source CRS,
- * expressed as a decimal year. Useful for time-dependant coordinate operations.
+ * expressed as a decimal year. Useful for time-dependent coordinate operations.
  * </li>
  * <li> DST_COORDINATE_EPOCH: (GDAL &gt;= 3.4) Coordinate epoch of target CRS,
- * expressed as a decimal year. Useful for time-dependant coordinate operations.
+ * expressed as a decimal year. Useful for time-dependent coordinate operations.
  * </li>
  * <li> GCPS_OK: If false, GCPs will not be used, default is TRUE.
  * </li>
@@ -2978,7 +2972,9 @@ int GDALTransformLonLatToDestGenImgProjTransformer(void *hTransformArg,
     double z = 0;
     int success = true;
     auto poSourceCRS = psReprojInfo->poForwardTransform->GetSourceCS();
-    if (poSourceCRS->IsGeographic())
+    if (poSourceCRS->IsGeographic() &&
+        std::fabs(poSourceCRS->GetAngularUnits() -
+                  CPLAtof(SRS_UA_DEGREE_CONV)) < 1e-9)
     {
         // Optimization to avoid creating a OGRCoordinateTransformation
         OGRAxisOrientation eSourceFirstAxisOrient = OAO_Other;
@@ -3086,14 +3082,14 @@ static CPLXMLNode *GDALSerializeGenImgProjTransformer(void *pTransformArg)
     else
     {
         CPLsnprintf(
-            szWork, sizeof(szWork), "%.18g,%.18g,%.18g,%.18g,%.18g,%.18g",
+            szWork, sizeof(szWork), "%.17g,%.17g,%.17g,%.17g,%.17g,%.17g",
             psInfo->adfSrcGeoTransform[0], psInfo->adfSrcGeoTransform[1],
             psInfo->adfSrcGeoTransform[2], psInfo->adfSrcGeoTransform[3],
             psInfo->adfSrcGeoTransform[4], psInfo->adfSrcGeoTransform[5]);
         CPLCreateXMLElementAndValue(psTree, "SrcGeoTransform", szWork);
 
         CPLsnprintf(
-            szWork, sizeof(szWork), "%.18g,%.18g,%.18g,%.18g,%.18g,%.18g",
+            szWork, sizeof(szWork), "%.17g,%.17g,%.17g,%.17g,%.17g,%.17g",
             psInfo->adfSrcInvGeoTransform[0], psInfo->adfSrcInvGeoTransform[1],
             psInfo->adfSrcInvGeoTransform[2], psInfo->adfSrcInvGeoTransform[3],
             psInfo->adfSrcInvGeoTransform[4], psInfo->adfSrcInvGeoTransform[5]);
@@ -3123,14 +3119,14 @@ static CPLXMLNode *GDALSerializeGenImgProjTransformer(void *pTransformArg)
     else
     {
         CPLsnprintf(
-            szWork, sizeof(szWork), "%.18g,%.18g,%.18g,%.18g,%.18g,%.18g",
+            szWork, sizeof(szWork), "%.17g,%.17g,%.17g,%.17g,%.17g,%.17g",
             psInfo->adfDstGeoTransform[0], psInfo->adfDstGeoTransform[1],
             psInfo->adfDstGeoTransform[2], psInfo->adfDstGeoTransform[3],
             psInfo->adfDstGeoTransform[4], psInfo->adfDstGeoTransform[5]);
         CPLCreateXMLElementAndValue(psTree, "DstGeoTransform", szWork);
 
         CPLsnprintf(
-            szWork, sizeof(szWork), "%.18g,%.18g,%.18g,%.18g,%.18g,%.18g",
+            szWork, sizeof(szWork), "%.17g,%.17g,%.17g,%.17g,%.17g,%.17g",
             psInfo->adfDstInvGeoTransform[0], psInfo->adfDstInvGeoTransform[1],
             psInfo->adfDstInvGeoTransform[2], psInfo->adfDstInvGeoTransform[3],
             psInfo->adfDstInvGeoTransform[4], psInfo->adfDstInvGeoTransform[5]);
@@ -3361,11 +3357,11 @@ void *GDALCreateReprojectionTransformer(const char *pszSrcWKT,
  * <li>COORDINATE_OPERATION=string: PROJ or WKT string representing a
  * coordinate operation, overriding the default computed transformation.</li>
  * <li>COORDINATE_EPOCH=decimal_year: Coordinate epoch, expressed as a
- * decimal year. Useful for time-dependant coordinate operations.</li>
+ * decimal year. Useful for time-dependent coordinate operations.</li>
  * <li> SRC_COORDINATE_EPOCH: (GDAL &gt;= 3.4) Coordinate epoch of source CRS,
- * expressed as a decimal year. Useful for time-dependant coordinate
+ * expressed as a decimal year. Useful for time-dependent coordinate
  *operations.</li> <li> DST_COORDINATE_EPOCH: (GDAL &gt;= 3.4) Coordinate epoch
- *of target CRS, expressed as a decimal year. Useful for time-dependant
+ *of target CRS, expressed as a decimal year. Useful for time-dependent
  *coordinate operations.</li>
  * </ul>
  *
@@ -3823,7 +3819,8 @@ static CPLXMLNode *GDALSerializeApproxTransformer(void *pTransformArg)
  * @param pBaseTransformArg the callback argument for the high precision
  * transformer.
  * @param dfMaxError the maximum cartesian error in the "output" space that
- * is to be accepted in the linear approximation.
+ * is to be accepted in the linear approximation, evaluated as a Manhattan
+ * distance.
  *
  * @return callback pointer suitable for use with GDALApproxTransform().  It
  * should be deallocated with GDALDestroyApproxTransformer().
@@ -4913,3 +4910,42 @@ bool GDALTransformIsAffineNoRotation(GDALTransformerFunc, void *pTransformerArg)
     }
     return false;
 }
+
+/************************************************************************/
+/*                        GDALTransformHasFastClone()                   */
+/************************************************************************/
+
+/** Returns whether GDALCloneTransformer() on this transformer is
+ * "fast"
+ * Counter-examples are GCPs or TPSs transformers.
+ */
+bool GDALTransformHasFastClone(void *pTransformerArg)
+{
+    if (GDALIsTransformer(pTransformerArg, GDAL_APPROX_TRANSFORMER_CLASS_NAME))
+    {
+        const auto *pApproxInfo =
+            static_cast<const ApproxTransformInfo *>(pTransformerArg);
+        pTransformerArg = pApproxInfo->pBaseCBData;
+        // Fallback to next lines
+    }
+
+    if (GDALIsTransformer(pTransformerArg, GDAL_GEN_IMG_TRANSFORMER_CLASS_NAME))
+    {
+        const auto *pGenImgpProjInfo =
+            static_cast<GDALGenImgProjTransformInfo *>(pTransformerArg);
+        return (pGenImgpProjInfo->pSrcTransformArg == nullptr ||
+                GDALTransformHasFastClone(
+                    pGenImgpProjInfo->pSrcTransformArg)) &&
+               (pGenImgpProjInfo->pDstTransformArg == nullptr ||
+                GDALTransformHasFastClone(pGenImgpProjInfo->pDstTransformArg));
+    }
+    else if (GDALIsTransformer(pTransformerArg,
+                               GDAL_RPC_TRANSFORMER_CLASS_NAME))
+    {
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
diff --git a/alg/gdaltransformgeolocs.cpp b/alg/gdaltransformgeolocs.cpp
index 7d53d01b6503..e7283f5c90db 100644
--- a/alg/gdaltransformgeolocs.cpp
+++ b/alg/gdaltransformgeolocs.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2012, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/alg/gdalwarper.cpp b/alg/gdalwarper.cpp
index a695d1d6ac2a..b07664bf1eec 100644
--- a/alg/gdalwarper.cpp
+++ b/alg/gdalwarper.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -34,6 +18,7 @@
 #include <string.h>
 
 #include <algorithm>
+#include <cmath>
 #include <limits>
 
 #include "cpl_conv.h"
@@ -397,7 +382,7 @@ CPLErr GDALWarpNoDataMasker(void *pMaskFuncArg, int nBandCount,
         {
             const float fNoData = static_cast<float>(padfNoData[0]);
             const float *pafData = reinterpret_cast<float *>(*ppImageData);
-            const bool bIsNoDataNan = CPL_TO_BOOL(CPLIsNan(fNoData));
+            const bool bIsNoDataNan = CPL_TO_BOOL(std::isnan(fNoData));
 
             // Nothing to do if value is out of range.
             if (padfNoData[1] != 0.0)
@@ -410,7 +395,7 @@ CPLErr GDALWarpNoDataMasker(void *pMaskFuncArg, int nBandCount,
             for (size_t iOffset = 0; iOffset < nPixels; ++iOffset)
             {
                 float fVal = pafData[iOffset];
-                if ((bIsNoDataNan && CPLIsNan(fVal)) ||
+                if ((bIsNoDataNan && std::isnan(fVal)) ||
                     (!bIsNoDataNan && ARE_REAL_EQUAL(fVal, fNoData)))
                 {
                     bAllValid = FALSE;
@@ -425,7 +410,7 @@ CPLErr GDALWarpNoDataMasker(void *pMaskFuncArg, int nBandCount,
         {
             const double dfNoData = padfNoData[0];
             const double *padfData = reinterpret_cast<double *>(*ppImageData);
-            const bool bIsNoDataNan = CPL_TO_BOOL(CPLIsNan(dfNoData));
+            const bool bIsNoDataNan = CPL_TO_BOOL(std::isnan(dfNoData));
 
             // Nothing to do if value is out of range.
             if (padfNoData[1] != 0.0)
@@ -438,7 +423,7 @@ CPLErr GDALWarpNoDataMasker(void *pMaskFuncArg, int nBandCount,
             for (size_t iOffset = 0; iOffset < nPixels; ++iOffset)
             {
                 double dfVal = padfData[iOffset];
-                if ((bIsNoDataNan && CPLIsNan(dfVal)) ||
+                if ((bIsNoDataNan && std::isnan(dfVal)) ||
                     (!bIsNoDataNan && ARE_REAL_EQUAL(dfVal, dfNoData)))
                 {
                     bAllValid = FALSE;
@@ -453,7 +438,8 @@ CPLErr GDALWarpNoDataMasker(void *pMaskFuncArg, int nBandCount,
         {
             const int nWordSize = GDALGetDataTypeSizeBytes(eType);
 
-            const bool bIsNoDataRealNan = CPL_TO_BOOL(CPLIsNan(padfNoData[0]));
+            const bool bIsNoDataRealNan =
+                CPL_TO_BOOL(std::isnan(padfNoData[0]));
 
             double *padfWrk =
                 static_cast<double *>(CPLMalloc(nXSize * sizeof(double) * 2));
@@ -466,7 +452,8 @@ CPLErr GDALWarpNoDataMasker(void *pMaskFuncArg, int nBandCount,
 
                 for (int iPixel = 0; iPixel < nXSize; ++iPixel)
                 {
-                    if (((bIsNoDataRealNan && CPLIsNan(padfWrk[iPixel * 2])) ||
+                    if (((bIsNoDataRealNan &&
+                          std::isnan(padfWrk[iPixel * 2])) ||
                          (!bIsNoDataRealNan &&
                           ARE_REAL_EQUAL(padfWrk[iPixel * 2], padfNoData[0]))))
                     {
@@ -1164,6 +1151,20 @@ CPLErr GDALWarpDstAlphaMasker(void *pMaskFuncArg, int nBandCount,
  * will be selected, not just those whose center point falls within the
  * polygon.</li>
  *
+ * <li>XSCALE: Ratio expressing the resampling factor (number of destination
+ * pixels per source pixel) along the target horizontal axis.
+ * The scale is used to determine the number of source pixels along the x-axis
+ * that are considered by the resampling algorithm.
+ * Equals to one for no resampling, below one for downsampling
+ * and above one for upsampling. This is automatically computed, for each
+ * processing chunk, and may thus vary among them, depending on the
+ * shape of output regions vs input regions. Such variations can be undesired
+ * in some situations. If the resampling factor can be considered as constant
+ * over the warped area, setting a constant value can lead to more reproducible
+ * pixel output.</li>
+ *
+ * <li>YSCALE: Same as XSCALE, but along the horizontal axis.</li>
+ *
  * <li>OPTIMIZE_SIZE: This defaults to FALSE, but may be set to TRUE
  * typically when writing to a compressed dataset (GeoTIFF with
  * COMPRESS creation option set for example) for achieving a smaller
@@ -1173,7 +1174,11 @@ CPLErr GDALWarpDstAlphaMasker(void *pMaskFuncArg, int nBandCount,
  * of the file. However sticking to target block size may cause major
  * processing slowdown for some particular reprojections. Starting
  * with GDAL 3.8, OPTIMIZE_SIZE mode is automatically enabled when it is safe
- * to do so.</li>
+ * to do so.
+ * As this parameter influences the shape of warping chunk, and by default the
+ * XSCALE and YSCALE parameters are computed per warping chunk, this parameter may
+ * influence the pixel output.
+ * </li>
  *
  * <li>NUM_THREADS: (GDAL >= 1.10) Can be set to a numeric value or ALL_CPUS to
  * set the number of threads to use to parallelize the computation part of the
@@ -1221,7 +1226,7 @@ CPLErr GDALWarpDstAlphaMasker(void *pMaskFuncArg, int nBandCount,
  * is sufficient.  Depending on the transformation in effect, the source
  * window may be a bit too small, or even missing large areas.  Problem
  * situations are those where the transformation is very non-linear or
- * "inside out".  Examples are transforming from WGS84 to Polar Steregraphic
+ * "inside out".  Examples are transforming from WGS84 to Polar Stereographic
  * for areas around the pole, or transformations where some of the image is
  * untransformable.  The following options provide some additional control
  * to deal with errors in computing the source window:
@@ -1533,6 +1538,32 @@ void CPL_STDCALL GDALWarpResolveWorkingDataType(GDALWarpOptions *psOptions)
 
     psOptions->eWorkingDataType = GDT_Byte;
 
+    // If none of the provided input nodata values can be represented in the
+    // data type of the corresponding source band, ignore them.
+    if (psOptions->hSrcDS && psOptions->padfSrcNoDataReal)
+    {
+        int nCountInvalidSrcNoDataReal = 0;
+        for (int iBand = 0; iBand < psOptions->nBandCount; iBand++)
+        {
+            GDALRasterBandH hSrcBand = GDALGetRasterBand(
+                psOptions->hSrcDS, psOptions->panSrcBands[iBand]);
+
+            if (hSrcBand &&
+                !GDALIsValueExactAs(psOptions->padfSrcNoDataReal[iBand],
+                                    GDALGetRasterDataType(hSrcBand)))
+            {
+                nCountInvalidSrcNoDataReal++;
+            }
+        }
+        if (nCountInvalidSrcNoDataReal == psOptions->nBandCount)
+        {
+            CPLFree(psOptions->padfSrcNoDataReal);
+            psOptions->padfSrcNoDataReal = nullptr;
+            CPLFree(psOptions->padfSrcNoDataImag);
+            psOptions->padfSrcNoDataImag = nullptr;
+        }
+    }
+
     for (int iBand = 0; iBand < psOptions->nBandCount; iBand++)
     {
         if (psOptions->hDstDS != nullptr)
@@ -1741,8 +1772,8 @@ CPLXMLNode *CPL_STDCALL GDALSerializeWarpOptions(const GDALWarpOptions *psWO)
         CPLCreateXMLElementAndValue(psTree, "SourceDataset",
                                     GDALGetDescription(psWO->hSrcDS));
 
-        char **papszOpenOptions =
-            (static_cast<GDALDataset *>(psWO->hSrcDS))->GetOpenOptions();
+        CSLConstList papszOpenOptions =
+            GDALDataset::FromHandle(psWO->hSrcDS)->GetOpenOptions();
         GDALSerializeOpenOptionsToXML(psTree, papszOpenOptions);
     }
 
@@ -1801,7 +1832,7 @@ CPLXMLNode *CPL_STDCALL GDALSerializeWarpOptions(const GDALWarpOptions *psWO)
 
         if (psWO->padfSrcNoDataImag != nullptr)
         {
-            if (CPLIsNan(psWO->padfSrcNoDataImag[i]))
+            if (std::isnan(psWO->padfSrcNoDataImag[i]))
                 CPLCreateXMLElementAndValue(psBand, "SrcNoDataImag", "nan");
             else
                 CPLCreateXMLElementAndValue(
@@ -1826,7 +1857,7 @@ CPLXMLNode *CPL_STDCALL GDALSerializeWarpOptions(const GDALWarpOptions *psWO)
 
         if (psWO->padfDstNoDataImag != nullptr)
         {
-            if (CPLIsNan(psWO->padfDstNoDataImag[i]))
+            if (std::isnan(psWO->padfDstNoDataImag[i]))
                 CPLCreateXMLElementAndValue(psBand, "DstNoDataImag", "nan");
             else
                 CPLCreateXMLElementAndValue(
diff --git a/alg/gdalwarper.h b/alg/gdalwarper.h
index 90ca632a091b..010fec7afb5f 100644
--- a/alg/gdalwarper.h
+++ b/alg/gdalwarper.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2003, Frank Warmerdam
  * Copyright (c) 2009-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDALWARPER_H_INCLUDED
@@ -557,6 +541,9 @@ class CPL_DLL GDALWarpOperation
     CPLErr Initialize(const GDALWarpOptions *psNewOptions);
     void *CreateDestinationBuffer(int nDstXSize, int nDstYSize,
                                   int *pbWasInitialized = nullptr);
+    void InitializeDestinationBuffer(void *pDstBuffer, int nDstXSize,
+                                     int nDstYSize,
+                                     int *pbWasInitialized = nullptr);
     static void DestroyDestinationBuffer(void *pDstBuffer);
 
     const GDALWarpOptions *GetOptions();
diff --git a/alg/gdalwarpkernel.cpp b/alg/gdalwarpkernel.cpp
index 98b1555c4a1b..565a6657a189 100644
--- a/alg/gdalwarpkernel.cpp
+++ b/alg/gdalwarpkernel.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -59,6 +43,7 @@
 #include "gdal_alg.h"
 #include "gdal_alg_priv.h"
 #include "gdal_thread_pool.h"
+#include "gdalresamplingkernels.h"
 #include "gdalwarpkernel_opencl.h"
 
 // #define CHECK_SUM_WITH_GEOS
@@ -513,6 +498,7 @@ static CPLErr GWKRun(GDALWarpKernel *poWK, const char *pszFuncName,
         job.pfnFunc = pfnFunc;
     }
 
+    bool bStopFlag;
     {
         std::unique_lock<std::mutex> lock(psThreadData->mutex);
 
@@ -550,6 +536,8 @@ static CPLErr GWKRun(GDALWarpKernel *poWK, const char *pszFuncName,
                 }
             }
         }
+
+        bStopFlag = psThreadData->stopFlag;
     }
 
     /* -------------------------------------------------------------------- */
@@ -557,7 +545,7 @@ static CPLErr GWKRun(GDALWarpKernel *poWK, const char *pszFuncName,
     /* -------------------------------------------------------------------- */
     psThreadData->poJobQueue->WaitCompletion();
 
-    return psThreadData->stopFlag ? CE_Failure : CE_None;
+    return bStopFlag ? CE_Failure : CE_None;
 }
 
 /************************************************************************/
@@ -3387,24 +3375,7 @@ static double GWKBilinear4Values(double *padfValues)
 
 static double GWKCubic(double dfX)
 {
-    // http://en.wikipedia.org/wiki/Bicubic_interpolation#Bicubic_convolution_algorithm
-    // W(x) formula with a = -0.5 (cubic hermite spline )
-    // or
-    // https://www.cs.utexas.edu/~fussell/courses/cs384g-fall2013/lectures/mitchell/Mitchell.pdf
-    // k(x) (formula 8) with (B,C)=(0,0.5) the Catmull-Rom spline
-    double dfAbsX = fabs(dfX);
-    if (dfAbsX <= 1.0)
-    {
-        double dfX2 = dfX * dfX;
-        return dfX2 * (1.5 * dfAbsX - 2.5) + 1;
-    }
-    else if (dfAbsX <= 2.0)
-    {
-        double dfX2 = dfX * dfX;
-        return dfX2 * (-0.5 * dfAbsX + 2.5) - 4 * dfAbsX + 2;
-    }
-    else
-        return 0.0;
+    return CubicKernel(dfX);
 }
 
 static double GWKCubic4Values(double *padfValues)
@@ -5012,7 +4983,7 @@ GWKCheckAndComputeSrcOffsets(GWKJobStruct *psJob, int *_pabSuccess, int _iDstX,
             return false;
 
         // If this happens this is likely the symptom of a bug somewhere.
-        if (CPLIsNan(_padfX[_iDstX]) || CPLIsNan(_padfY[_iDstX]))
+        if (std::isnan(_padfX[_iDstX]) || std::isnan(_padfY[_iDstX]))
         {
             static bool bNanCoordFound = false;
             if (!bNanCoordFound)
@@ -6698,9 +6669,26 @@ static void GWKAverageOrModeThread(void *pData)
                 (nSrcXSize - padfX2[iDstX]) * poWK->dfXScale <
                     nThresholdWrapOverX)
             {
-                bWrapOverX = true;
-                std::swap(padfX[iDstX], padfX2[iDstX]);
-                padfX2[iDstX] += nSrcXSize;
+                // Check there is a discontinuity by checking at mid-pixel.
+                // NOTE: all this remains fragile. To confidently
+                // detect antimeridian warping we should probably try to access
+                // georeferenced coordinates, and not rely only on tests on
+                // image space coordinates. But accessing georeferenced
+                // coordinates from here is not trivial, and we would for example
+                // have to handle both geographic, Mercator, etc.
+                // Let's hope this heuristics is good enough for now.
+                double x = iDstX + 0.5 + poWK->nDstXOff;
+                double y = iDstY + poWK->nDstYOff;
+                double z = 0;
+                int bSuccess = FALSE;
+                poWK->pfnTransformer(psJob->pTransformerArg, TRUE, 1, &x, &y,
+                                     &z, &bSuccess);
+                if (bSuccess && x < padfX[iDstX])
+                {
+                    bWrapOverX = true;
+                    std::swap(padfX[iDstX], padfX2[iDstX]);
+                    padfX2[iDstX] += nSrcXSize;
+                }
             }
 
             const double dfXMin = padfX[iDstX] - poWK->nSrcXOff;
diff --git a/alg/gdalwarpkernel_opencl.cpp b/alg/gdalwarpkernel_opencl.cpp
index 8d46fa2cbc6e..355ea93df6c8 100644
--- a/alg/gdalwarpkernel_opencl.cpp
+++ b/alg/gdalwarpkernel_opencl.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2010, Seth Price <seth@pricepages.org>
  * Copyright (c) 2010-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <algorithm>
diff --git a/alg/gdalwarpkernel_opencl.h b/alg/gdalwarpkernel_opencl.h
index bd61ccf4141c..39659f01e1b6 100644
--- a/alg/gdalwarpkernel_opencl.h
+++ b/alg/gdalwarpkernel_opencl.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Seth Price <seth@pricepages.org>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #if defined(HAVE_OPENCL)
diff --git a/alg/gdalwarpoperation.cpp b/alg/gdalwarpoperation.cpp
index bd26ba86a78d..35a71726faf9 100644
--- a/alg/gdalwarpoperation.cpp
+++ b/alg/gdalwarpoperation.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -694,10 +678,40 @@ void *GDALWarpOperation::CreateDestinationBuffer(int nDstXSize, int nDstYSize,
     void *pDstBuffer = VSI_MALLOC3_VERBOSE(
         cpl::fits_on<int>(nWordSize * psOptions->nBandCount), nDstXSize,
         nDstYSize);
-    if (pDstBuffer == nullptr)
+    if (pDstBuffer)
     {
-        return nullptr;
+        InitializeDestinationBuffer(pDstBuffer, nDstXSize, nDstYSize,
+                                    pbInitialized);
     }
+    return pDstBuffer;
+}
+
+/**
+ * This method initializes a destination buffer for use with WarpRegionToBuffer.
+ *
+ * It is initialized based on the INIT_DEST settings.
+ *
+ * This method is called by CreateDestinationBuffer().
+ * It is meant at being used by callers that have already allocated the
+ * destination buffer without using CreateDestinationBuffer().
+ *
+ * @param pDstBuffer Buffer of size
+ *                   GDALGetDataTypeSizeBytes(psOptions->eWorkingDataType) *
+ *                   nDstXSize * nDstYSize * psOptions->nBandCount bytes.
+ * @param nDstXSize Width of output window on destination buffer to be produced.
+ * @param nDstYSize Height of output window on destination buffer to be
+ *                  produced.
+ * @param pbInitialized Filled with boolean indicating if the buffer was
+ *                      initialized.
+ * @since 3.10
+ */
+void GDALWarpOperation::InitializeDestinationBuffer(void *pDstBuffer,
+                                                    int nDstXSize,
+                                                    int nDstYSize,
+                                                    int *pbInitialized)
+{
+    const int nWordSize = GDALGetDataTypeSizeBytes(psOptions->eWorkingDataType);
+
     const GPtrDiff_t nBandSize =
         static_cast<GPtrDiff_t>(nWordSize) * nDstXSize * nDstYSize;
 
@@ -713,8 +727,7 @@ void *GDALWarpOperation::CreateDestinationBuffer(int nDstXSize, int nDstYSize,
         {
             *pbInitialized = FALSE;
         }
-
-        return pDstBuffer;
+        return;
     }
 
     if (pbInitialized != nullptr)
@@ -756,12 +769,12 @@ void *GDALWarpOperation::CreateDestinationBuffer(int nDstXSize, int nDstYSize,
                        0, std::min(255, static_cast<int>(adfInitRealImag[0]))),
                    nBandSize);
         }
-        else if (!CPLIsNan(adfInitRealImag[0]) && adfInitRealImag[0] == 0.0 &&
-                 !CPLIsNan(adfInitRealImag[1]) && adfInitRealImag[1] == 0.0)
+        else if (!std::isnan(adfInitRealImag[0]) && adfInitRealImag[0] == 0.0 &&
+                 !std::isnan(adfInitRealImag[1]) && adfInitRealImag[1] == 0.0)
         {
             memset(pBandData, 0, nBandSize);
         }
-        else if (!CPLIsNan(adfInitRealImag[1]) && adfInitRealImag[1] == 0.0)
+        else if (!std::isnan(adfInitRealImag[1]) && adfInitRealImag[1] == 0.0)
         {
             GDALCopyWords64(&adfInitRealImag, GDT_Float64, 0, pBandData,
                             psOptions->eWorkingDataType, nWordSize,
@@ -776,8 +789,6 @@ void *GDALWarpOperation::CreateDestinationBuffer(int nDstXSize, int nDstYSize,
     }
 
     CSLDestroy(papszInitValues);
-
-    return pDstBuffer;
 }
 
 /**
@@ -832,22 +843,6 @@ void GDALDestroyWarpOperation(GDALWarpOperationH hOperation)
 /*                          CollectChunkList()                          */
 /************************************************************************/
 
-static int OrderWarpChunk(const void *_a, const void *_b)
-{
-    const GDALWarpChunk *a = static_cast<const GDALWarpChunk *>(_a);
-    const GDALWarpChunk *b = static_cast<const GDALWarpChunk *>(_b);
-    if (a->dy < b->dy)
-        return -1;
-    else if (a->dy > b->dy)
-        return 1;
-    else if (a->dx < b->dx)
-        return -1;
-    else if (a->dx > b->dx)
-        return 1;
-    else
-        return 0;
-}
-
 void GDALWarpOperation::CollectChunkList(int nDstXOff, int nDstYOff,
                                          int nDstXSize, int nDstYSize)
 
@@ -859,10 +854,18 @@ void GDALWarpOperation::CollectChunkList(int nDstXOff, int nDstYOff,
     CollectChunkListInternal(nDstXOff, nDstYOff, nDstXSize, nDstYSize);
 
     // Sort chunks from top to bottom, and for equal y, from left to right.
-    // TODO(schwehr): Use std::sort.
-    if (pasChunkList)
-        qsort(pasChunkList, nChunkListCount, sizeof(GDALWarpChunk),
-              OrderWarpChunk);
+    if (nChunkListCount > 1)
+    {
+        std::sort(pasChunkList, pasChunkList + nChunkListCount,
+                  [](const GDALWarpChunk &a, const GDALWarpChunk &b)
+                  {
+                      if (a.dy < b.dy)
+                          return true;
+                      if (a.dy > b.dy)
+                          return false;
+                      return a.dx < b.dx;
+                  });
+    }
 
     /* -------------------------------------------------------------------- */
     /*      Find the global source window.                                  */
@@ -1264,7 +1267,7 @@ void GDALWarpOperation::WipeChunkList()
 /*                       GetWorkingMemoryForWindow()                    */
 /************************************************************************/
 
-/** Retrurns the amount of working memory, in bytes, required to process
+/** Returns the amount of working memory, in bytes, required to process
  * a warped window of source dimensions nSrcXSize x nSrcYSize and target
  * dimensions nDstXSize x nDstYSize.
  */
@@ -1381,7 +1384,7 @@ CPLErr GDALWarpOperation::CollectChunkListInternal(int nDstXOff, int nDstYOff,
     // in case the heuristics would cause issues.
 #if DEBUG_VERBOSE
     CPLDebug("WARP",
-             "dst=(%d,%d,%d,%d) src=(%d,%d,%d,%d) srcfillratio=%.18g, "
+             "dst=(%d,%d,%d,%d) src=(%d,%d,%d,%d) srcfillratio=%.17g, "
              "dfTotalMemoryUse=%.1f MB",
              nDstXOff, nDstYOff, nDstXSize, nDstYSize, nSrcXOff, nSrcYOff,
              nSrcXSize, nSrcYSize, dfSrcFillRatio,
@@ -2830,7 +2833,7 @@ bool GDALWarpOperation::ComputeSourceWindowTransformPoints(
         }
 
         // If this happens this is likely the symptom of a bug somewhere.
-        if (CPLIsNan(padfX[i]) || CPLIsNan(padfY[i]))
+        if (std::isnan(padfX[i]) || std::isnan(padfY[i]))
         {
             static bool bNanCoordFound = false;
             if (!bNanCoordFound)
@@ -3165,7 +3168,7 @@ CPLErr GDALWarpOperation::ComputeSourceWindow(
 #if DEBUG_VERBOSE
     CPLDebug("WARP",
              "dst=(%d,%d,%d,%d) raw "
-             "src=(minx=%.18g,miny=%.18g,maxx=%.18g,maxy=%.18g)",
+             "src=(minx=%.17g,miny=%.17g,maxx=%.17g,maxy=%.17g)",
              nDstXOff, nDstYOff, nDstXSize, nDstYSize, dfMinXOut, dfMinYOut,
              dfMaxXOut, dfMaxYOut);
 #endif
diff --git a/alg/internal_libqhull/poly_r.c b/alg/internal_libqhull/poly_r.c
index c68596a12bf9..b7e09b54fc8d 100644
--- a/alg/internal_libqhull/poly_r.c
+++ b/alg/internal_libqhull/poly_r.c
@@ -1137,10 +1137,13 @@ ridgeT *qh_newridge(qhT *qh) {
   qh_memalloc_(qh, (int)sizeof(ridgeT), freelistp, ridge, ridgeT);
   memset((char *)ridge, (size_t)0, sizeof(ridgeT));
   zinc_(Ztotridges);
+  ridge->id= qh->ridge_id;
   if (qh->ridge_id == UINT_MAX) {
     qh_fprintf(qh, qh->ferr, 7074, "qhull warning: more than 2^32 ridges.  Qhull results are OK.  Since the ridge ID wraps around to 0, two ridges may have the same identifier.\n");
+    qh->ridge_id = 0;
+  } else {
+    qh->ridge_id++;
   }
-  ridge->id= qh->ridge_id++;
   trace4((qh, qh->ferr, 4056, "qh_newridge: created ridge r%d\n", ridge->id));
   return(ridge);
 } /* newridge */
@@ -1176,10 +1179,14 @@ int qh_pointid(qhT *qh, pointT *point) {
     offset= (ptr_intT)(point - qh->first_point);
     /* coverity[divide_arg] */
     id= offset / qh->hull_dim;
-  }else if ((id= qh_setindex(qh->other_points, point)) != -1)
-    id += qh->num_points;
-  else
-    return qh_IDunknown;
+  } else {
+    id = qh_setindex(qh->other_points, point);
+    if (id >= 0) {
+      id += qh->num_points;
+    } else {
+      return qh_IDunknown;
+    }
+  }
   return (int)id;
 } /* pointid */
 
diff --git a/alg/internal_qhull_headers.h b/alg/internal_qhull_headers.h
index e33e539eb882..18d66e8f162c 100644
--- a/alg/internal_qhull_headers.h
+++ b/alg/internal_qhull_headers.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef INTERNAL_QHULL_HEADERS_H
diff --git a/alg/llrasterize.cpp b/alg/llrasterize.cpp
index 5034ff3816d6..8b0d1e93baf7 100644
--- a/alg/llrasterize.cpp
+++ b/alg/llrasterize.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2000, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/alg/los.cpp b/alg/los.cpp
index fda7019cf469..0cf271120043 100644
--- a/alg/los.cpp
+++ b/alg/los.cpp
@@ -6,23 +6,7 @@
  *
  ******************************************************************************
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <functional>
diff --git a/alg/marching_squares/contour_generator.h b/alg/marching_squares/contour_generator.h
index f0c5af1c1f9b..b9f349284d66 100644
--- a/alg/marching_squares/contour_generator.h
+++ b/alg/marching_squares/contour_generator.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018, Oslandia <infos at oslandia dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef MARCHING_SQUARES_CONTOUR_GENERATOR_H
diff --git a/alg/marching_squares/level_generator.h b/alg/marching_squares/level_generator.h
index 3209233c89af..39310e02d5ba 100644
--- a/alg/marching_squares/level_generator.h
+++ b/alg/marching_squares/level_generator.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018, Oslandia <infos at oslandia dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef MARCHING_SQUARE_LEVEL_GENERATOR_H
 #define MARCHING_SQUARE_LEVEL_GENERATOR_H
@@ -96,9 +80,10 @@ class FixedLevelRangeIterator
   public:
     typedef RangeIterator<FixedLevelRangeIterator> Iterator;
 
-    FixedLevelRangeIterator(const double *levels, size_t count,
-                            double maxLevel = Inf)
-        : levels_(levels), count_(count), maxLevel_(maxLevel)
+    FixedLevelRangeIterator(const double *levels, size_t count, double minLevel,
+                            double maxLevel)
+        : levels_(levels), count_(count), minLevel_(minLevel),
+          maxLevel_(maxLevel)
     {
     }
 
@@ -107,13 +92,15 @@ class FixedLevelRangeIterator
         if (min > max)
             std::swap(min, max);
         size_t b = 0;
-        for (; b != count_ && levels_[b] < fudge(levels_[b], min); b++)
+        for (; b != count_ && levels_[b] < fudge(min, minLevel_, levels_[b]);
+             b++)
             ;
         if (min == max)
             return Range<Iterator>(Iterator(*this, int(b)),
                                    Iterator(*this, int(b)));
         size_t e = b;
-        for (; e != count_ && levels_[e] <= fudge(levels_[e], max); e++)
+        for (; e != count_ && levels_[e] <= fudge(max, minLevel_, levels_[e]);
+             e++)
             ;
         return Range<Iterator>(Iterator(*this, int(b)),
                                Iterator(*this, int(e)));
@@ -126,10 +113,16 @@ class FixedLevelRangeIterator
         return levels_[size_t(idx)];
     }
 
+    double minLevel() const
+    {
+        return minLevel_;
+    }
+
   private:
     const double *levels_;
     size_t count_;
-    double maxLevel_;
+    const double minLevel_;
+    const double maxLevel_;
 };
 
 struct TooManyLevelsException : public std::exception
@@ -150,8 +143,8 @@ struct IntervalLevelRangeIterator
     typedef RangeIterator<IntervalLevelRangeIterator> Iterator;
 
     // Construction by a offset and an interval
-    IntervalLevelRangeIterator(double offset, double interval)
-        : offset_(offset), interval_(interval)
+    IntervalLevelRangeIterator(double offset, double interval, double minLevel)
+        : offset_(offset), interval_(interval), minLevel_(minLevel)
     {
     }
 
@@ -165,7 +158,7 @@ struct IntervalLevelRangeIterator
         if (!(df_i1 >= INT_MIN && df_i1 < INT_MAX))
             throw TooManyLevelsException();
         int i1 = static_cast<int>(df_i1);
-        double l1 = fudge(level(i1), min);
+        double l1 = fudge(min, minLevel_, level(i1));
         if (l1 > min)
         {
             df_i1 = ceil((l1 - offset_) / interval_);
@@ -183,7 +176,7 @@ struct IntervalLevelRangeIterator
         if (!(df_i2 >= INT_MIN && df_i2 < INT_MAX))
             throw TooManyLevelsException();
         int i2 = static_cast<int>(df_i2);
-        double l2 = fudge(level(i2), max);
+        double l2 = fudge(max, minLevel_, level(i2));
         if (l2 > max)
         {
             df_i2 = floor((l2 - offset_) / interval_) + 1;
@@ -206,9 +199,15 @@ struct IntervalLevelRangeIterator
         return idx * interval_ + offset_;
     }
 
+    double minLevel() const
+    {
+        return minLevel_;
+    }
+
   private:
     const double offset_;
     const double interval_;
+    const double minLevel_;
 };
 
 class ExponentialLevelRangeIterator
@@ -216,8 +215,8 @@ class ExponentialLevelRangeIterator
   public:
     typedef RangeIterator<ExponentialLevelRangeIterator> Iterator;
 
-    ExponentialLevelRangeIterator(double base)
-        : base_(base), base_ln_(std::log(base_))
+    ExponentialLevelRangeIterator(double base, double minLevel)
+        : base_(base), base_ln_(std::log(base_)), minLevel_(minLevel)
     {
     }
 
@@ -234,7 +233,7 @@ class ExponentialLevelRangeIterator
             std::swap(min, max);
 
         int i1 = index1(min);
-        double l1 = fudge(level(i1), min);
+        double l1 = fudge(min, minLevel_, level(i1));
         if (l1 > min)
             i1 = index1(l1);
         Iterator b(*this, i1);
@@ -243,7 +242,7 @@ class ExponentialLevelRangeIterator
             return Range<Iterator>(b, b);
 
         int i2 = index2(max);
-        double l2 = fudge(level(i2), max);
+        double l2 = fudge(max, minLevel_, level(i2));
         if (l2 > max)
             i2 = index2(l2);
         Iterator e(*this, i2);
@@ -256,6 +255,11 @@ class ExponentialLevelRangeIterator
         return Range<Iterator>(b, e);
     }
 
+    double minLevel() const
+    {
+        return minLevel_;
+    }
+
   private:
     int index1(double plevel) const
     {
@@ -280,6 +284,7 @@ class ExponentialLevelRangeIterator
     // exponentiation base
     const double base_;
     const double base_ln_;
+    const double minLevel_;
 };
 
 }  // namespace marching_squares
diff --git a/alg/marching_squares/point.h b/alg/marching_squares/point.h
index 66176d9d7f8e..aaef2d2dcc62 100644
--- a/alg/marching_squares/point.h
+++ b/alg/marching_squares/point.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018, Oslandia <infos at oslandia dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef MARCHING_SQUARE_POINT_H
diff --git a/alg/marching_squares/polygon_ring_appender.h b/alg/marching_squares/polygon_ring_appender.h
index 360a76370b6d..186140638841 100644
--- a/alg/marching_squares/polygon_ring_appender.h
+++ b/alg/marching_squares/polygon_ring_appender.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018, Oslandia <infos at oslandia dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef MARCHING_SQUARE_POLYGON_RING_APPENDER_H
 #define MARCHING_SQUARE_POLYGON_RING_APPENDER_H
diff --git a/alg/marching_squares/segment_merger.h b/alg/marching_squares/segment_merger.h
index a7d095f1c023..f3557f3f4e45 100644
--- a/alg/marching_squares/segment_merger.h
+++ b/alg/marching_squares/segment_merger.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018, Oslandia <infos at oslandia dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef MARCHING_SQUARES_SEGMENT_MERGER_H
 #define MARCHING_SQUARES_SEGMENT_MERGER_H
@@ -81,12 +65,12 @@ template <typename LineWriter, typename LevelGenerator> struct SegmentMerger
         }
     }
 
-    void addBorderSegment(int levelIdx, const Point &start, const Point &end)
+    void addSegment(int levelIdx, const Point &start, const Point &end)
     {
         addSegment_(levelIdx, start, end);
     }
 
-    void addSegment(int levelIdx, const Point &start, const Point &end)
+    void addBorderSegment(int levelIdx, const Point &start, const Point &end)
     {
         addSegment_(levelIdx, start, end);
     }
diff --git a/alg/marching_squares/square.h b/alg/marching_squares/square.h
index 23316ec8b40d..3b6d0a9d2bc1 100644
--- a/alg/marching_squares/square.h
+++ b/alg/marching_squares/square.h
@@ -7,29 +7,14 @@
  ******************************************************************************
  * Copyright (c) 2018, Oslandia <infos at oslandia dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef MARCHING_SQUARE_SQUARE_H
 #define MARCHING_SQUARE_SQUARE_H
 
 #include <algorithm>
 #include <cassert>
+#include <cmath>
 #include <cstdint>
 #include <math.h>
 #include "utility.h"
@@ -203,9 +188,9 @@ struct Square
     //
     //     ^
     //  -  |  +
-    Segments segments(double level) const
+    Segments segments(double level, double minLevel) const
     {
-        switch (marchingCase(level))
+        switch (marchingCase(level, minLevel))
         {
             case (ALL_LOW):
                 // debug("ALL_LOW");
@@ -215,52 +200,64 @@ struct Square
                 return Segments();
             case (UPPER_LEFT):
                 // debug("UPPER_LEFT");
-                return Segments(Segment(interpolate(UPPER_BORDER, level),
-                                        interpolate(LEFT_BORDER, level)));
+                return Segments(
+                    Segment(interpolate(UPPER_BORDER, level, minLevel),
+                            interpolate(LEFT_BORDER, level, minLevel)));
             case (LOWER_LEFT):
                 // debug("LOWER_LEFT");
-                return Segments(Segment(interpolate(LEFT_BORDER, level),
-                                        interpolate(LOWER_BORDER, level)));
+                return Segments(
+                    Segment(interpolate(LEFT_BORDER, level, minLevel),
+                            interpolate(LOWER_BORDER, level, minLevel)));
             case (LOWER_RIGHT):
                 // debug("LOWER_RIGHT");
-                return Segments(Segment(interpolate(LOWER_BORDER, level),
-                                        interpolate(RIGHT_BORDER, level)));
+                return Segments(
+                    Segment(interpolate(LOWER_BORDER, level, minLevel),
+                            interpolate(RIGHT_BORDER, level, minLevel)));
             case (UPPER_RIGHT):
                 // debug("UPPER_RIGHT");
-                return Segments(Segment(interpolate(RIGHT_BORDER, level),
-                                        interpolate(UPPER_BORDER, level)));
+                return Segments(
+                    Segment(interpolate(RIGHT_BORDER, level, minLevel),
+                            interpolate(UPPER_BORDER, level, minLevel)));
             case (UPPER_LEFT | LOWER_LEFT):
                 // debug("UPPER_LEFT | LOWER_LEFT");
-                return Segments(Segment(interpolate(UPPER_BORDER, level),
-                                        interpolate(LOWER_BORDER, level)));
+                return Segments(
+                    Segment(interpolate(UPPER_BORDER, level, minLevel),
+                            interpolate(LOWER_BORDER, level, minLevel)));
             case (LOWER_LEFT | LOWER_RIGHT):
                 // debug("LOWER_LEFT | LOWER_RIGHT");
-                return Segments(Segment(interpolate(LEFT_BORDER, level),
-                                        interpolate(RIGHT_BORDER, level)));
+                return Segments(
+                    Segment(interpolate(LEFT_BORDER, level, minLevel),
+                            interpolate(RIGHT_BORDER, level, minLevel)));
             case (LOWER_RIGHT | UPPER_RIGHT):
                 // debug("LOWER_RIGHT | UPPER_RIGHT");
-                return Segments(Segment(interpolate(LOWER_BORDER, level),
-                                        interpolate(UPPER_BORDER, level)));
+                return Segments(
+                    Segment(interpolate(LOWER_BORDER, level, minLevel),
+                            interpolate(UPPER_BORDER, level, minLevel)));
             case (UPPER_RIGHT | UPPER_LEFT):
                 // debug("UPPER_RIGHT | UPPER_LEFT");
-                return Segments(Segment(interpolate(RIGHT_BORDER, level),
-                                        interpolate(LEFT_BORDER, level)));
+                return Segments(
+                    Segment(interpolate(RIGHT_BORDER, level, minLevel),
+                            interpolate(LEFT_BORDER, level, minLevel)));
             case (ALL_HIGH & ~UPPER_LEFT):
                 // debug("ALL_HIGH & ~UPPER_LEFT");
-                return Segments(Segment(interpolate(LEFT_BORDER, level),
-                                        interpolate(UPPER_BORDER, level)));
+                return Segments(
+                    Segment(interpolate(LEFT_BORDER, level, minLevel),
+                            interpolate(UPPER_BORDER, level, minLevel)));
             case (ALL_HIGH & ~LOWER_LEFT):
                 // debug("ALL_HIGH & ~LOWER_LEFT");
-                return Segments(Segment(interpolate(LOWER_BORDER, level),
-                                        interpolate(LEFT_BORDER, level)));
+                return Segments(
+                    Segment(interpolate(LOWER_BORDER, level, minLevel),
+                            interpolate(LEFT_BORDER, level, minLevel)));
             case (ALL_HIGH & ~LOWER_RIGHT):
                 // debug("ALL_HIGH & ~LOWER_RIGHT");
-                return Segments(Segment(interpolate(RIGHT_BORDER, level),
-                                        interpolate(LOWER_BORDER, level)));
+                return Segments(
+                    Segment(interpolate(RIGHT_BORDER, level, minLevel),
+                            interpolate(LOWER_BORDER, level, minLevel)));
             case (ALL_HIGH & ~UPPER_RIGHT):
                 // debug("ALL_HIGH & ~UPPER_RIGHT");
-                return Segments(Segment(interpolate(UPPER_BORDER, level),
-                                        interpolate(RIGHT_BORDER, level)));
+                return Segments(
+                    Segment(interpolate(UPPER_BORDER, level, minLevel),
+                            interpolate(RIGHT_BORDER, level, minLevel)));
             case (SADDLE_NE):
             case (SADDLE_NW):
                 // From the two possible saddle configurations, we always return
@@ -275,10 +272,11 @@ struct Square
                 // Arbitrarily choosing one of the two possible configurations
                 // is not really that worse than deciding based on the center
                 // point.
-                return Segments(Segment(interpolate(LEFT_BORDER, level),
-                                        interpolate(LOWER_BORDER, level)),
-                                Segment(interpolate(RIGHT_BORDER, level),
-                                        interpolate(UPPER_BORDER, level)));
+                return Segments(
+                    Segment(interpolate(LEFT_BORDER, level, minLevel),
+                            interpolate(LOWER_BORDER, level, minLevel)),
+                    Segment(interpolate(RIGHT_BORDER, level, minLevel),
+                            interpolate(UPPER_BORDER, level, minLevel)));
         }
         assert(false);
         return Segments();
@@ -335,7 +333,8 @@ struct Square
                     const int levelIdx = (*it).first;
                     const double level = (*it).second;
 
-                    const Point nextPoint(interpolate(border, level));
+                    const Point nextPoint(
+                        interpolate(border, level, levelGenerator.minLevel()));
                     if (reverse)
                         writer.addBorderSegment(levelIdx, nextPoint, lastPoint);
                     else
@@ -361,7 +360,8 @@ struct Square
             const int levelIdx = (*it).first;
             const double level = (*it).second;
 
-            const Segments segments_ = segments(level);
+            const Segments segments_ =
+                segments(level, levelGenerator.minLevel());
 
             for (std::size_t i = 0; i < segments_.size(); i++)
             {
@@ -447,17 +447,20 @@ struct Square
                        : .5 * (upperLeft.value + upperRight.value)));
     }
 
-    uint8_t marchingCase(double level) const
+    uint8_t marchingCase(double level, double minLevel) const
     {
-        return (level < fudge(level, upperLeft.value) ? UPPER_LEFT : ALL_LOW) |
-               (level < fudge(level, lowerLeft.value) ? LOWER_LEFT : ALL_LOW) |
-               (level < fudge(level, lowerRight.value) ? LOWER_RIGHT
-                                                       : ALL_LOW) |
-               (level < fudge(level, upperRight.value) ? UPPER_RIGHT : ALL_LOW);
+        return (level < fudge(upperLeft.value, minLevel, level) ? UPPER_LEFT
+                                                                : ALL_LOW) |
+               (level < fudge(lowerLeft.value, minLevel, level) ? LOWER_LEFT
+                                                                : ALL_LOW) |
+               (level < fudge(lowerRight.value, minLevel, level) ? LOWER_RIGHT
+                                                                 : ALL_LOW) |
+               (level < fudge(upperRight.value, minLevel, level) ? UPPER_RIGHT
+                                                                 : ALL_LOW);
     }
 
     static double interpolate_(double level, double x1, double x2, double y1,
-                               double y2, bool need_split)
+                               double y2, bool need_split, double minLevel)
     {
         if (need_split)
         {
@@ -471,8 +474,8 @@ struct Square
             // the end
             const double xm = .5 * (x1 + x2);
             const double ym = .5 * (y1 + y2);
-            const double fy1 = fudge(level, y1);
-            const double fym = fudge(level, ym);
+            const double fy1 = fudge(y1, minLevel, level);
+            const double fym = fudge(ym, minLevel, level);
             if ((fy1 < level && level < fym) || (fy1 > level && level > fym))
             {
                 x2 = xm;
@@ -484,12 +487,12 @@ struct Square
                 y1 = ym;
             }
         }
-        const double fy1 = fudge(level, y1);
-        const double ratio = (level - fy1) / (fudge(level, y2) - fy1);
+        const double fy1 = fudge(y1, minLevel, level);
+        const double ratio = (level - fy1) / (fudge(y2, minLevel, level) - fy1);
         return x1 * (1. - ratio) + x2 * ratio;
     }
 
-    Point interpolate(uint8_t border, double level) const
+    Point interpolate(uint8_t border, double level, double minLevel) const
     {
         switch (border)
         {
@@ -497,21 +500,21 @@ struct Square
                 return Point(upperLeft.x,
                              interpolate_(level, lowerLeft.y, upperLeft.y,
                                           lowerLeft.value, upperLeft.value,
-                                          !split));
+                                          !split, minLevel));
             case LOWER_BORDER:
                 return Point(interpolate_(level, lowerLeft.x, lowerRight.x,
                                           lowerLeft.value, lowerRight.value,
-                                          !split),
+                                          !split, minLevel),
                              lowerLeft.y);
             case RIGHT_BORDER:
                 return Point(upperRight.x,
                              interpolate_(level, lowerRight.y, upperRight.y,
                                           lowerRight.value, upperRight.value,
-                                          !split));
+                                          !split, minLevel));
             case UPPER_BORDER:
                 return Point(interpolate_(level, upperLeft.x, upperRight.x,
                                           upperLeft.value, upperRight.value,
-                                          !split),
+                                          !split, minLevel),
                              upperLeft.y);
         }
         assert(false);
diff --git a/alg/marching_squares/utility.h b/alg/marching_squares/utility.h
index 1e3513361c1c..551b8d89b2b2 100644
--- a/alg/marching_squares/utility.h
+++ b/alg/marching_squares/utility.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018, Oslandia <infos at oslandia dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef MARCHING_SQUARE_UTILITY_H
 #define MARCHING_SQUARE_UTILITY_H
@@ -36,14 +20,14 @@ namespace marching_squares
 
 // This is used to determine the maximum level value for polygons,
 // the one that spans all the remaining plane
-const double Inf = std::numeric_limits<double>::max();
+constexpr double Inf = std::numeric_limits<double>::infinity();
 
-const double NaN = std::numeric_limits<double>::quiet_NaN();
+constexpr double NaN = std::numeric_limits<double>::quiet_NaN();
 
 #define debug(format, ...) CPLDebug("MarchingSquare", format, ##__VA_ARGS__)
 
 // Perturb a value if it is too close to a level value
-inline double fudge(double level, double value)
+inline double fudge(double value, double minLevel, double level)
 {
     // FIXME
     // This is too "hard coded". The perturbation to apply really depend on
@@ -55,6 +39,11 @@ inline double fudge(double level, double value)
     // are within a user-provided minimum distance.
 
     const double absTol = 1e-6;
+    // Do not fudge the level that would correspond to the absolute minimum
+    // level of the raster, so it gets included.
+    // Cf scenario of https://github.com/OSGeo/gdal/issues/10167
+    if (level == minLevel)
+        return value;
     return std::abs(level - value) < absTol ? value + absTol : value;
 }
 
diff --git a/alg/polygonize.cpp b/alg/polygonize.cpp
index f9fb2b548e7a..7b7f5f014bdd 100644
--- a/alg/polygonize.cpp
+++ b/alg/polygonize.cpp
@@ -7,23 +7,7 @@
  * Copyright (c) 2008, Frank Warmerdam
  * Copyright (c) 2009-2020, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -336,17 +320,29 @@ static CPLErr GDALPolygonizeT(GDALRasterBandH hSrcBand,
                         : oFirstEnum.panPolyIdMap[panThisLineId[iX]];
             }
 
-            oPolygonizer.processLine(panLastLineId, panLastLineVal,
-                                     paoThisLineArm, paoLastLineArm, iY,
-                                     nXSize);
-            eErr = oPolygonWriter.getErr();
+            if (!oPolygonizer.processLine(panLastLineId, panLastLineVal,
+                                          paoThisLineArm, paoLastLineArm, iY,
+                                          nXSize))
+            {
+                eErr = CE_Failure;
+            }
+            else
+            {
+                eErr = oPolygonWriter.getErr();
+            }
         }
         else
         {
-            oPolygonizer.processLine(panThisLineId, panLastLineVal,
-                                     paoThisLineArm, paoLastLineArm, iY,
-                                     nXSize);
-            eErr = oPolygonWriter.getErr();
+            if (!oPolygonizer.processLine(panThisLineId, panLastLineVal,
+                                          paoThisLineArm, paoLastLineArm, iY,
+                                          nXSize))
+            {
+                eErr = CE_Failure;
+            }
+            else
+            {
+                eErr = oPolygonWriter.getErr();
+            }
         }
 
         if (eErr != CE_None)
diff --git a/alg/polygonize_polygonizer.cpp b/alg/polygonize_polygonizer.cpp
index aac78ae41fbe..80f2437301a2 100644
--- a/alg/polygonize_polygonizer.cpp
+++ b/alg/polygonize_polygonizer.cpp
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2023, kikitte.lee <kikitte.lee@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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 /*! @cond Doxygen_Suppress */
@@ -35,29 +19,18 @@ namespace gdal
 {
 namespace polygonizer
 {
-
-RPolygon::~RPolygon()
-{
-    for (auto &arc : oArcs)
-    {
-        delete arc;
-    }
-}
-
 IndexedArc RPolygon::newArc(bool bFollowRighthand)
 {
-    Arc *poArc = new Arc();
-    std::size_t iArcIndex = oArcs.size();
-    oArcs.push_back(poArc);
-    oArcRighthandFollow.push_back(bFollowRighthand);
-    oArcConnections.push_back(iArcIndex);
-    return IndexedArc{poArc, iArcIndex};
+    const std::size_t iArcIndex = oArcs.size();
+    const auto &oNewArc =
+        oArcs.emplace_back(static_cast<unsigned>(iArcIndex), bFollowRighthand);
+    return IndexedArc{oNewArc.poArc.get(), iArcIndex};
 }
 
 void RPolygon::setArcConnection(const IndexedArc &oArc,
                                 const IndexedArc &oNextArc)
 {
-    oArcConnections[oArc.iIndex] = oNextArc.iIndex;
+    oArcs[oArc.iIndex].nConnection = static_cast<unsigned>(oNextArc.iIndex);
 }
 
 void RPolygon::updateBottomRightPos(IndexType iRow, IndexType iCol)
@@ -361,13 +334,14 @@ Polygonizer<PolyIdType, DataType>::~Polygonizer()
 template <typename PolyIdType, typename DataType>
 RPolygon *Polygonizer<PolyIdType, DataType>::getPolygon(PolyIdType nPolygonId)
 {
-    if (oPolygonMap_.count(nPolygonId) == 0)
+    const auto oIter = oPolygonMap_.find(nPolygonId);
+    if (oIter == oPolygonMap_.end())
     {
         return createPolygon(nPolygonId);
     }
     else
     {
-        return oPolygonMap_[nPolygonId];
+        return oIter->second;
     }
 }
 
@@ -383,75 +357,87 @@ Polygonizer<PolyIdType, DataType>::createPolygon(PolyIdType nPolygonId)
 template <typename PolyIdType, typename DataType>
 void Polygonizer<PolyIdType, DataType>::destroyPolygon(PolyIdType nPolygonId)
 {
-    delete oPolygonMap_[nPolygonId];
-    oPolygonMap_.erase(nPolygonId);
+    const auto oIter = oPolygonMap_.find(nPolygonId);
+    CPLAssert(oIter != oPolygonMap_.end());
+    delete oIter->second;
+    oPolygonMap_.erase(oIter);
 }
 
 template <typename PolyIdType, typename DataType>
-void Polygonizer<PolyIdType, DataType>::processLine(
+bool Polygonizer<PolyIdType, DataType>::processLine(
     const PolyIdType *panThisLineId, const DataType *panLastLineVal,
     TwoArm *poThisLineArm, TwoArm *poLastLineArm, const IndexType nCurrentRow,
     const IndexType nCols)
 {
     TwoArm *poCurrent, *poAbove, *poLeft;
 
-    poCurrent = poThisLineArm + 1;
-    poCurrent->iRow = nCurrentRow;
-    poCurrent->iCol = 0;
-    poCurrent->poPolyInside = getPolygon(panThisLineId[0]);
-    poAbove = poLastLineArm + 1;
-    poLeft = poThisLineArm;
-    poLeft->poPolyInside = poTheOuterPolygon_;
-    ProcessArmConnections(poCurrent, poAbove, poLeft);
-    for (IndexType col = 1; col < nCols; ++col)
+    try
     {
-        IndexType iArmIndex = col + 1;
-        poCurrent = poThisLineArm + iArmIndex;
+        poCurrent = poThisLineArm + 1;
         poCurrent->iRow = nCurrentRow;
-        poCurrent->iCol = col;
-        poCurrent->poPolyInside = getPolygon(panThisLineId[col]);
-        poAbove = poLastLineArm + iArmIndex;
-        poLeft = poThisLineArm + iArmIndex - 1;
+        poCurrent->iCol = 0;
+        poCurrent->poPolyInside = getPolygon(panThisLineId[0]);
+        poAbove = poLastLineArm + 1;
+        poLeft = poThisLineArm;
+        poLeft->poPolyInside = poTheOuterPolygon_;
         ProcessArmConnections(poCurrent, poAbove, poLeft);
-    }
-    poCurrent = poThisLineArm + nCols + 1;
-    poCurrent->iRow = nCurrentRow;
-    poCurrent->iCol = nCols;
-    poCurrent->poPolyInside = poTheOuterPolygon_;
-    poAbove = poLastLineArm + nCols + 1;
-    poAbove->poPolyInside = poTheOuterPolygon_;
-    poLeft = poThisLineArm + nCols;
-    ProcessArmConnections(poCurrent, poAbove, poLeft);
-
-    /**
-     *
-     * Find those polygons haven't been processed on this line as we can be sure they are completed
-     *
-     */
-    std::vector<PolygonMapEntry> oCompletedPolygons;
-    for (auto &entry : oPolygonMap_)
-    {
-        RPolygon *poPolygon = entry.second;
-
-        if (poPolygon->iBottomRightRow + 1 == nCurrentRow)
+        for (IndexType col = 1; col < nCols; ++col)
         {
-            oCompletedPolygons.push_back(entry);
+            IndexType iArmIndex = col + 1;
+            poCurrent = poThisLineArm + iArmIndex;
+            poCurrent->iRow = nCurrentRow;
+            poCurrent->iCol = col;
+            poCurrent->poPolyInside = getPolygon(panThisLineId[col]);
+            poAbove = poLastLineArm + iArmIndex;
+            poLeft = poThisLineArm + iArmIndex - 1;
+            ProcessArmConnections(poCurrent, poAbove, poLeft);
         }
-    }
-    // cppcheck-suppress constVariableReference
-    for (auto &entry : oCompletedPolygons)
-    {
-        PolyIdType nPolyId = entry.first;
-        RPolygon *poPolygon = entry.second;
+        poCurrent = poThisLineArm + nCols + 1;
+        poCurrent->iRow = nCurrentRow;
+        poCurrent->iCol = nCols;
+        poCurrent->poPolyInside = poTheOuterPolygon_;
+        poAbove = poLastLineArm + nCols + 1;
+        poAbove->poPolyInside = poTheOuterPolygon_;
+        poLeft = poThisLineArm + nCols;
+        ProcessArmConnections(poCurrent, poAbove, poLeft);
 
-        // emit valid polygon only
-        if (nPolyId != nInvalidPolyId_)
+        /**
+         *
+         * Find those polygons haven't been processed on this line as we can be sure they are completed
+         *
+         */
+        std::vector<PolygonMapEntry> oCompletedPolygons;
+        for (auto &entry : oPolygonMap_)
         {
-            poPolygonReceiver_->receive(
-                poPolygon, panLastLineVal[poPolygon->iBottomRightCol]);
+            RPolygon *poPolygon = entry.second;
+
+            if (poPolygon->iBottomRightRow + 1 == nCurrentRow)
+            {
+                oCompletedPolygons.push_back(entry);
+            }
         }
+        // cppcheck-suppress constVariableReference
+        for (auto &entry : oCompletedPolygons)
+        {
+            PolyIdType nPolyId = entry.first;
+            RPolygon *poPolygon = entry.second;
+
+            // emit valid polygon only
+            if (nPolyId != nInvalidPolyId_)
+            {
+                poPolygonReceiver_->receive(
+                    poPolygon, panLastLineVal[poPolygon->iBottomRightCol]);
+            }
 
-        destroyPolygon(nPolyId);
+            destroyPolygon(nPolyId);
+        }
+        return true;
+    }
+    catch (const std::bad_alloc &)
+    {
+        CPLError(CE_Failure, CPLE_OutOfMemory,
+                 "Out of memory in Polygonizer::processLine");
+        return false;
     }
 }
 
@@ -459,35 +445,62 @@ template <typename DataType>
 OGRPolygonWriter<DataType>::OGRPolygonWriter(OGRLayerH hOutLayer,
                                              int iPixValField,
                                              double *padfGeoTransform)
-    : PolygonReceiver<DataType>(), hOutLayer_(hOutLayer),
+    : PolygonReceiver<DataType>(), poOutLayer_(OGRLayer::FromHandle(hOutLayer)),
       iPixValField_(iPixValField), padfGeoTransform_(padfGeoTransform)
 {
+    poFeature_ = std::make_unique<OGRFeature>(poOutLayer_->GetLayerDefn());
+    poPolygon_ = new OGRPolygon();
+    poFeature_->SetGeometryDirectly(poPolygon_);
 }
 
 template <typename DataType>
 void OGRPolygonWriter<DataType>::receive(RPolygon *poPolygon,
                                          DataType nPolygonCellValue)
 {
-    std::vector<bool> oAccessedArc(poPolygon->oArcConnections.size(), false);
+    std::vector<bool> oAccessedArc(poPolygon->oArcs.size(), false);
     double *padfGeoTransform = padfGeoTransform_;
 
-    OGRGeometryH hPolygon = OGR_G_CreateGeometry(wkbPolygon);
+    OGRLinearRing *poFirstRing = poPolygon_->getExteriorRing();
+    if (poFirstRing && poPolygon_->getNumInteriorRings() == 0)
+    {
+        poFirstRing->empty();
+    }
+    else
+    {
+        poFirstRing = nullptr;
+        poPolygon_->empty();
+    }
 
-    auto AddRingToPolygon = [&poPolygon, &oAccessedArc, &hPolygon,
-                             padfGeoTransform](std::size_t iFirstArcIndex)
+    auto AddRingToPolygon =
+        [this, &poPolygon, &oAccessedArc,
+         padfGeoTransform](std::size_t iFirstArcIndex, OGRLinearRing *poRing)
     {
-        OGRGeometryH hRing = OGR_G_CreateGeometry(wkbLinearRing);
+        std::unique_ptr<OGRLinearRing> poNewRing;
+        if (!poRing)
+        {
+            poNewRing = std::make_unique<OGRLinearRing>();
+            poRing = poNewRing.get();
+        }
 
         auto AddArcToRing =
-            [&poPolygon, &hRing, padfGeoTransform](std::size_t iArcIndex)
+            [&poPolygon, poRing, padfGeoTransform](std::size_t iArcIndex)
         {
-            auto oArc = poPolygon->oArcs[iArcIndex];
-            bool bArcFollowRighthand =
-                poPolygon->oArcRighthandFollow[iArcIndex];
-            for (std::size_t i = 0; i < oArc->size(); ++i)
+            const auto &oArc = poPolygon->oArcs[iArcIndex];
+            const bool bArcFollowRighthand = oArc.bFollowRighthand;
+            const int nArcPointCount = static_cast<int>(oArc.poArc->size());
+            int nDstPointIdx = poRing->getNumPoints();
+            poRing->setNumPoints(nDstPointIdx + nArcPointCount,
+                                 /* bZeroizeNewContent = */ false);
+            if (poRing->getNumPoints() < nDstPointIdx + nArcPointCount)
+            {
+                return false;
+            }
+            for (int i = 0; i < nArcPointCount; ++i)
             {
                 const Point &oPixel =
-                    (*oArc)[bArcFollowRighthand ? i : (oArc->size() - i - 1)];
+                    (*oArc.poArc)[bArcFollowRighthand
+                                      ? i
+                                      : (nArcPointCount - i - 1)];
 
                 const double dfX = padfGeoTransform[0] +
                                    oPixel[1] * padfGeoTransform[1] +
@@ -496,51 +509,68 @@ void OGRPolygonWriter<DataType>::receive(RPolygon *poPolygon,
                                    oPixel[1] * padfGeoTransform[4] +
                                    oPixel[0] * padfGeoTransform[5];
 
-                OGR_G_AddPoint_2D(hRing, dfX, dfY);
+                poRing->setPoint(nDstPointIdx, dfX, dfY);
+                ++nDstPointIdx;
             }
+            return true;
         };
 
-        AddArcToRing(iFirstArcIndex);
+        if (!AddArcToRing(iFirstArcIndex))
+        {
+            return false;
+        }
 
         std::size_t iArcIndex = iFirstArcIndex;
-        std::size_t iNextArcIndex = poPolygon->oArcConnections[iArcIndex];
+        std::size_t iNextArcIndex = poPolygon->oArcs[iArcIndex].nConnection;
         oAccessedArc[iArcIndex] = true;
         while (iNextArcIndex != iFirstArcIndex)
         {
-            AddArcToRing(iNextArcIndex);
+            if (!AddArcToRing(iNextArcIndex))
+            {
+                return false;
+            }
             iArcIndex = iNextArcIndex;
-            iNextArcIndex = poPolygon->oArcConnections[iArcIndex];
+            iNextArcIndex = poPolygon->oArcs[iArcIndex].nConnection;
             oAccessedArc[iArcIndex] = true;
         }
 
         // close ring manually
-        OGR_G_AddPoint_2D(hRing, OGR_G_GetX(hRing, 0), OGR_G_GetY(hRing, 0));
+        poRing->closeRings();
 
-        OGR_G_AddGeometryDirectly(hPolygon, hRing);
+        if (poNewRing)
+            poPolygon_->addRingDirectly(poNewRing.release());
+        return true;
     };
 
-    std::vector<bool>::iterator ite;
-    while ((ite = std::find_if_not(oAccessedArc.begin(), oAccessedArc.end(),
-                                   [](bool accessed) { return accessed; })) !=
-           oAccessedArc.end())
+    for (size_t i = 0; i < oAccessedArc.size(); ++i)
     {
-        AddRingToPolygon(ite - oAccessedArc.begin());
+        if (!oAccessedArc[i])
+        {
+            if (!AddRingToPolygon(i, poFirstRing))
+            {
+                eErr_ = CE_Failure;
+                return;
+            }
+            poFirstRing = nullptr;
+        }
     }
 
     // Create the feature object
-    OGRFeatureH hFeat = OGR_F_Create(OGR_L_GetLayerDefn(hOutLayer_));
-
-    OGR_F_SetGeometryDirectly(hFeat, hPolygon);
-
+    poFeature_->SetFID(OGRNullFID);
     if (iPixValField_ >= 0)
-        OGR_F_SetFieldDouble(hFeat, iPixValField_,
+        poFeature_->SetField(iPixValField_,
                              static_cast<double>(nPolygonCellValue));
 
     // Write the to the layer.
-    if (OGR_L_CreateFeature(hOutLayer_, hFeat) != OGRERR_NONE)
+    if (poOutLayer_->CreateFeature(poFeature_.get()) != OGRERR_NONE)
         eErr_ = CE_Failure;
 
-    OGR_F_Destroy(hFeat);
+    // Shouldn't happen for well behaved drivers, but better check...
+    else if (poFeature_->GetGeometryRef() != poPolygon_)
+    {
+        poPolygon_ = new OGRPolygon();
+        poFeature_->SetGeometryDirectly(poPolygon_);
+    }
 }
 
 }  // namespace polygonizer
diff --git a/alg/polygonize_polygonizer.h b/alg/polygonize_polygonizer.h
index f09593418c32..349b7862d766 100644
--- a/alg/polygonize_polygonizer.h
+++ b/alg/polygonize_polygonizer.h
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2023, kikitte.lee <kikitte.lee@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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef POLYGONIZE_POLYGONIZER_H_INCLUDED
@@ -41,6 +25,8 @@
 
 #include "cpl_error.h"
 #include "ogr_api.h"
+#include "ogr_geometry.h"
+#include "ogrsf_frmts.h"
 
 namespace gdal
 {
@@ -67,12 +53,24 @@ struct RPolygon
 {
     IndexType iBottomRightRow{0};
     IndexType iBottomRightCol{0};
+
+    struct ArcStruct
+    {
+        std::unique_ptr<Arc> poArc{};
+        // each element is the next arc index of the current arc
+        unsigned nConnection = 0;
+        // does arc follows the right-hand rule with
+        bool bFollowRighthand = false;
+
+        ArcStruct(unsigned nConnectionIn, bool bFollowRighthandIn)
+            : poArc(std::make_unique<Arc>()), nConnection(nConnectionIn),
+              bFollowRighthand(bFollowRighthandIn)
+        {
+        }
+    };
+
     // arc object list
-    std::vector<Arc *> oArcs{};
-    // does arc follows the right-hand rule with
-    std::vector<bool> oArcRighthandFollow{};
-    // each element is the next arc index of the current arc
-    std::vector<std::size_t> oArcConnections{};
+    std::vector<ArcStruct> oArcs{};
 
     RPolygon() = default;
 
@@ -80,8 +78,6 @@ struct RPolygon
 
     RPolygon &operator=(const RPolygon &) = delete;
 
-    ~RPolygon();
-
     /**
      * create a new arc object
      */
@@ -175,7 +171,7 @@ template <typename PolyIdType, typename DataType> class Polygonizer
         return poTheOuterPolygon_;
     }
 
-    void processLine(const PolyIdType *panThisLineId,
+    bool processLine(const PolyIdType *panThisLineId,
                      const DataType *panLastLineVal, TwoArm *poThisLineArm,
                      TwoArm *poLastLineArm, IndexType nCurrentRow,
                      IndexType nCols);
@@ -187,9 +183,12 @@ template <typename PolyIdType, typename DataType> class Polygonizer
 template <typename DataType>
 class OGRPolygonWriter : public PolygonReceiver<DataType>
 {
-    OGRLayerH hOutLayer_;
+    OGRLayer *poOutLayer_ = nullptr;
     int iPixValField_;
     double *padfGeoTransform_;
+    std::unique_ptr<OGRFeature> poFeature_{};
+    OGRPolygon *poPolygon_ =
+        nullptr;  // = poFeature_->GetGeometryRef(), owned by poFeature
 
     CPLErr eErr_{CE_None};
 
diff --git a/alg/rasterfill.cpp b/alg/rasterfill.cpp
index 45ce9aec657b..3be8db9d3f8d 100644
--- a/alg/rasterfill.cpp
+++ b/alg/rasterfill.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.com>
  * Copyright (c) 2015, Sean Gillies <sean@mapbox.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.
+ * SPDX-License-Identifier: MIT
  ***************************************************************************/
 
 #include "cpl_port.h"
diff --git a/alg/thinplatespline.cpp b/alg/thinplatespline.cpp
index 5590653c7787..651ef229f975 100644
--- a/alg/thinplatespline.cpp
+++ b/alg/thinplatespline.cpp
@@ -11,23 +11,7 @@
  * Copyright (c) 2004, VIZRT Inc.
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 /*! @cond Doxygen_Suppress */
diff --git a/alg/thinplatespline.h b/alg/thinplatespline.h
index c3f75a985776..6e08c4716f35 100644
--- a/alg/thinplatespline.h
+++ b/alg/thinplatespline.h
@@ -11,23 +11,7 @@
  ******************************************************************************
  * Copyright (c) 2004, VIZRT Inc.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef THINPLATESPLINE_H_INCLUDED
diff --git a/alg/viewshed.cpp b/alg/viewshed.cpp
deleted file mode 100644
index e5f81db19815..000000000000
--- a/alg/viewshed.cpp
+++ /dev/null
@@ -1,926 +0,0 @@
-/******************************************************************************
- *
- * Project:  Viewshed Generation
- * Purpose:  Core algorithm implementation for viewshed generation.
- * Author:   Tamas Szekeres, szekerest@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.
- ****************************************************************************/
-
-#include <algorithm>
-#include <array>
-#include <limits>
-
-#include "gdal_alg.h"
-#include "gdal_priv.h"
-#include "gdal_priv_templates.hpp"
-
-#include "viewshed.h"
-
-/************************************************************************/
-/*                        GDALViewshedGenerate()                        */
-/************************************************************************/
-
-/**
- * Create viewshed from raster DEM.
- *
- * This algorithm will generate a viewshed raster from an input DEM raster
- * by using a modified algorithm of "Generating Viewsheds without Using
- * Sightlines" published at
- * https://www.asprs.org/wp-content/uploads/pers/2000journal/january/2000_jan_87-90.pdf
- * This appoach provides a relatively fast calculation, since the output raster
- * is generated in a single scan. The gdal/apps/gdal_viewshed.cpp mainline can
- * be used as an example of how to use this function. The output raster will be
- * of type Byte or Float64.
- *
- * \note The algorithm as implemented currently will only output meaningful
- * results if the georeferencing is in a projected coordinate reference system.
- *
- * @param hBand The band to read the DEM data from. Only the part of the raster
- * within the specified maxdistance around the observer point is processed.
- *
- * @param pszDriverName Driver name (GTiff if set to NULL)
- *
- * @param pszTargetRasterName The name of the target raster to be generated.
- * Must not be NULL
- *
- * @param papszCreationOptions creation options.
- *
- * @param dfObserverX observer X value (in SRS units)
- *
- * @param dfObserverY observer Y value (in SRS units)
- *
- * @param dfObserverHeight The height of the observer above the DEM surface.
- *
- * @param dfTargetHeight The height of the target above the DEM surface.
- * (default 0)
- *
- * @param dfVisibleVal pixel value for visibility (default 255)
- *
- * @param dfInvisibleVal pixel value for invisibility (default 0)
- *
- * @param dfOutOfRangeVal The value to be set for the cells that fall outside of
- * the range specified by dfMaxDistance.
- *
- * @param dfNoDataVal The value to be set for the cells that have no data.
- *                    If set to a negative value, nodata is not set.
- *                    Note: currently, no special processing of input cells at a
- * nodata value is done (which may result in erroneous results).
- *
- * @param dfCurvCoeff Coefficient to consider the effect of the curvature and
- * refraction. The height of the DEM is corrected according to the following
- * formula: [Height] -= dfCurvCoeff * [Target Distance]^2 / [Earth Diameter] For
- * the effect of the atmospheric refraction we can use 0.85714.
- *
- * @param eMode The mode of the viewshed calculation.
- * Possible values GVM_Diagonal = 1, GVM_Edge = 2 (default), GVM_Max = 3,
- * GVM_Min = 4.
- *
- * @param dfMaxDistance maximum distance range to compute viewshed.
- *                      It is also used to clamp the extent of the output
- * raster. If set to 0, then unlimited range is assumed, that is to say the
- *                      computation is performed on the extent of the whole
- * raster.
- *
- * @param pfnProgress A GDALProgressFunc that may be used to report progress
- * to the user, or to interrupt the algorithm.  May be NULL if not required.
- *
- * @param pProgressArg The callback data for the pfnProgress function.
- *
- * @param heightMode Type of information contained in output raster. Possible
- * values GVOT_NORMAL = 1 (default), GVOT_MIN_TARGET_HEIGHT_FROM_DEM = 2,
- *                   GVOT_MIN_TARGET_HEIGHT_FROM_GROUND = 3
- *
- *                   GVOT_NORMAL returns a raster of type Byte containing
- * visible locations.
- *
- *                   GVOT_MIN_TARGET_HEIGHT_FROM_DEM and
- * GVOT_MIN_TARGET_HEIGHT_FROM_GROUND will return a raster of type Float64
- * containing the minimum target height for target to be visible from the DEM
- * surface or ground level respectively. Parameters dfTargetHeight, dfVisibleVal
- * and dfInvisibleVal will be ignored.
- *
- *
- * @param papszExtraOptions Future extra options. Must be set to NULL currently.
- *
- * @return not NULL output dataset on success (to be closed with GDALClose()) or
- * NULL if an error occurs.
- *
- * @since GDAL 3.1
- */
-GDALDatasetH GDALViewshedGenerate(
-    GDALRasterBandH hBand, const char *pszDriverName,
-    const char *pszTargetRasterName, CSLConstList papszCreationOptions,
-    double dfObserverX, double dfObserverY, double dfObserverHeight,
-    double dfTargetHeight, double dfVisibleVal, double dfInvisibleVal,
-    double dfOutOfRangeVal, double dfNoDataVal, double dfCurvCoeff,
-    GDALViewshedMode eMode, double dfMaxDistance, GDALProgressFunc pfnProgress,
-    void *pProgressArg, GDALViewshedOutputType heightMode,
-    [[maybe_unused]] CSLConstList papszExtraOptions)
-{
-    using namespace gdal;
-
-    Viewshed::Options oOpts;
-    oOpts.outputFormat = pszDriverName;
-    oOpts.outputFilename = pszTargetRasterName;
-    oOpts.creationOpts = papszCreationOptions;
-    oOpts.observer.x = dfObserverX;
-    oOpts.observer.y = dfObserverY;
-    oOpts.observer.z = dfObserverHeight;
-    oOpts.targetHeight = dfTargetHeight;
-    oOpts.curveCoeff = dfCurvCoeff;
-    oOpts.maxDistance = dfMaxDistance;
-    oOpts.nodataVal = dfNoDataVal;
-
-    switch (eMode)
-    {
-        case GVM_Edge:
-            oOpts.cellMode = Viewshed::CellMode::Edge;
-            break;
-        case GVM_Diagonal:
-            oOpts.cellMode = Viewshed::CellMode::Diagonal;
-            break;
-        case GVM_Min:
-            oOpts.cellMode = Viewshed::CellMode::Min;
-            break;
-        case GVM_Max:
-            oOpts.cellMode = Viewshed::CellMode::Max;
-            break;
-    }
-
-    switch (heightMode)
-    {
-        case GVOT_MIN_TARGET_HEIGHT_FROM_DEM:
-            oOpts.outputMode = Viewshed::OutputMode::DEM;
-            break;
-        case GVOT_MIN_TARGET_HEIGHT_FROM_GROUND:
-            oOpts.outputMode = Viewshed::OutputMode::Ground;
-            break;
-        case GVOT_NORMAL:
-            oOpts.outputMode = Viewshed::OutputMode::Normal;
-            break;
-    }
-
-    if (!GDALIsValueInRange<uint8_t>(dfVisibleVal))
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "dfVisibleVal out of range. Must be [0, 255].");
-        return nullptr;
-    }
-    if (!GDALIsValueInRange<uint8_t>(dfInvisibleVal))
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "dfInvisibleVal out of range. Must be [0, 255].");
-        return nullptr;
-    }
-    if (!GDALIsValueInRange<uint8_t>(dfOutOfRangeVal))
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "dfOutOfRangeVal out of range. Must be [0, 255].");
-        return nullptr;
-    }
-    oOpts.visibleVal = static_cast<uint8_t>(dfVisibleVal);
-    oOpts.invisibleVal = static_cast<uint8_t>(dfInvisibleVal);
-    oOpts.outOfRangeVal = static_cast<uint8_t>(dfOutOfRangeVal);
-
-    gdal::Viewshed v(oOpts);
-
-    //ABELL - Make a function for progress that captures the progress argument.
-    v.run(hBand, pfnProgress, pProgressArg);
-
-    return GDALDataset::FromHandle(v.output().release());
-}
-
-namespace gdal
-{
-
-namespace
-{
-
-bool AdjustHeightInRange(const double *adfGeoTransform, int iPixel, int iLine,
-                         double &dfHeight, double dfDistance2,
-                         double dfCurvCoeff, double dfSphereDiameter)
-{
-    if (dfDistance2 <= 0 && dfCurvCoeff == 0)
-        return true;
-
-    double dfX = adfGeoTransform[1] * iPixel + adfGeoTransform[2] * iLine;
-    double dfY = adfGeoTransform[4] * iPixel + adfGeoTransform[5] * iLine;
-    double dfR2 = dfX * dfX + dfY * dfY;
-
-    /* calc adjustment */
-    if (dfCurvCoeff != 0 &&
-        dfSphereDiameter != std::numeric_limits<double>::infinity())
-        dfHeight -= dfCurvCoeff * dfR2 / dfSphereDiameter;
-
-    if (dfDistance2 > 0 && dfR2 > dfDistance2)
-        return false;
-
-    return true;
-}
-
-double CalcHeightLine(int i, double Za, double Zo)
-{
-    if (i == 1)
-        return Za;
-    else
-        return (Za - Zo) / (i - 1) + Za;
-}
-
-double CalcHeightDiagonal(int i, int j, double Za, double Zb, double Zo)
-{
-    return ((Za - Zo) * i + (Zb - Zo) * j) / (i + j - 1) + Zo;
-}
-
-double CalcHeightEdge(int i, int j, double Za, double Zb, double Zo)
-{
-    if (i == j)
-        return CalcHeightLine(i, Za, Zo);
-    else
-        return ((Za - Zo) * i + (Zb - Zo) * (j - i)) / (j - 1) + Zo;
-}
-
-}  // unnamed namespace
-
-void Viewshed::setVisibility(int iPixel, double dfZ, double *padfZVal,
-                             std::vector<GByte> &vResult)
-{
-    if (padfZVal[iPixel] + oOpts.targetHeight < dfZ)
-        vResult[iPixel] = oOpts.invisibleVal;
-    else
-        vResult[iPixel] = oOpts.visibleVal;
-
-    if (padfZVal[iPixel] < dfZ)
-        padfZVal[iPixel] = dfZ;
-}
-
-double Viewshed::calcHeight(double dfDiagZ, double dfEdgeZ)
-{
-    double dfHeight = dfEdgeZ;
-
-    switch (oOpts.cellMode)
-    {
-        case Viewshed::CellMode::Max:
-            dfHeight = std::max(dfDiagZ, dfEdgeZ);
-            break;
-        case Viewshed::CellMode::Min:
-            dfHeight = std::min(dfDiagZ, dfEdgeZ);
-            break;
-        case Viewshed::CellMode::Diagonal:
-            dfHeight = dfDiagZ;
-            break;
-        default:  // Edge case set in initialization.
-            break;
-    }
-    return dfHeight;
-}
-
-bool Viewshed::run(GDALRasterBandH hBand, GDALProgressFunc pfnProgress,
-                   void *pProgressArg)
-{
-    if (!pfnProgress)
-        pfnProgress = GDALDummyProgress;
-
-    if (!pfnProgress(0.0, "", pProgressArg))
-    {
-        CPLError(CE_Failure, CPLE_UserInterrupt, "User terminated");
-        return false;
-    }
-
-    /* set up geotransformation */
-    std::array<double, 6> adfGeoTransform{{0.0, 1.0, 0.0, 0.0, 0.0, 1.0}};
-    GDALDatasetH hSrcDS = GDALGetBandDataset(hBand);
-    if (hSrcDS != nullptr)
-        GDALGetGeoTransform(hSrcDS, adfGeoTransform.data());
-
-    double adfInvGeoTransform[6];
-    if (!GDALInvGeoTransform(adfGeoTransform.data(), adfInvGeoTransform))
-    {
-        CPLError(CE_Failure, CPLE_AppDefined, "Cannot invert geotransform");
-        return false;
-    }
-
-    /* calculate observer position */
-    double dfX, dfY;
-    GDALApplyGeoTransform(adfInvGeoTransform, oOpts.observer.x,
-                          oOpts.observer.y, &dfX, &dfY);
-    int nX = static_cast<int>(dfX);
-    int nY = static_cast<int>(dfY);
-
-    int nXSize = GDALGetRasterBandXSize(hBand);
-    int nYSize = GDALGetRasterBandYSize(hBand);
-
-    if (nX < 0 || nX > nXSize || nY < 0 || nY > nYSize)
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "The observer location falls outside of the DEM area");
-        return false;
-    }
-
-    /* calculate the area of interest */
-    constexpr double EPSILON = 1e-8;
-
-    int nXStart = 0;
-    int nYStart = 0;
-    int nXStop = nXSize;
-    int nYStop = nYSize;
-    if (oOpts.maxDistance > 0)
-    {
-        nXStart = static_cast<int>(std::floor(
-            nX - adfInvGeoTransform[1] * oOpts.maxDistance + EPSILON));
-        nXStop = static_cast<int>(
-            std::ceil(nX + adfInvGeoTransform[1] * oOpts.maxDistance -
-                      EPSILON) +
-            1);
-        nYStart =
-            static_cast<int>(std::floor(
-                nY - std::fabs(adfInvGeoTransform[5]) * oOpts.maxDistance +
-                EPSILON)) -
-            (adfInvGeoTransform[5] > 0 ? 1 : 0);
-        nYStop = static_cast<int>(
-            std::ceil(nY +
-                      std::fabs(adfInvGeoTransform[5]) * oOpts.maxDistance -
-                      EPSILON) +
-            (adfInvGeoTransform[5] < 0 ? 1 : 0));
-    }
-    nXStart = std::max(nXStart, 0);
-    nYStart = std::max(nYStart, 0);
-    nXStop = std::min(nXStop, nXSize);
-    nYStop = std::min(nYStop, nYSize);
-
-    /* normalize horizontal index (0 - nXSize) */
-    nXSize = nXStop - nXStart;
-    nX -= nXStart;
-
-    nYSize = nYStop - nYStart;
-
-    if (nXSize == 0 || nYSize == 0)
-    {
-        CPLError(CE_Failure, CPLE_AppDefined, "Invalid target raster size");
-        return false;
-    }
-
-    std::vector<double> vFirstLineVal;
-    std::vector<double> vLastLineVal;
-    std::vector<double> vThisLineVal;
-    std::vector<GByte> vResult;
-    std::vector<double> vHeightResult;
-
-    try
-    {
-        vFirstLineVal.resize(nXSize);
-        vLastLineVal.resize(nXSize);
-        vThisLineVal.resize(nXSize);
-        vResult.resize(nXSize);
-
-        if (oOpts.outputMode != OutputMode::Normal)
-            vHeightResult.resize(nXSize);
-    }
-    catch (...)
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "Cannot allocate vectors for viewshed");
-        return false;
-    }
-
-    double *padfFirstLineVal = vFirstLineVal.data();
-    double *padfLastLineVal = vLastLineVal.data();
-    double *padfThisLineVal = vThisLineVal.data();
-    GByte *pabyResult = vResult.data();
-    double *dfHeightResult = vHeightResult.data();
-
-    GDALDriverManager *hMgr = GetGDALDriverManager();
-    GDALDriver *hDriver = hMgr->GetDriverByName(oOpts.outputFormat.c_str());
-    if (!hDriver)
-    {
-        CPLError(CE_Failure, CPLE_AppDefined, "Cannot get driver");
-        return false;
-    }
-
-    /* create output raster */
-    poDstDS.reset(hDriver->Create(
-        oOpts.outputFilename.c_str(), nXSize, nYSize, 1,
-        oOpts.outputMode == OutputMode::Normal ? GDT_Byte : GDT_Float64,
-        const_cast<char **>(oOpts.creationOpts.List())));
-    if (!poDstDS)
-    {
-        CPLError(CE_Failure, CPLE_AppDefined, "Cannot create dataset for %s",
-                 oOpts.outputFilename.c_str());
-        return false;
-    }
-    /* copy srs */
-    if (hSrcDS)
-        poDstDS->SetSpatialRef(
-            GDALDataset::FromHandle(hSrcDS)->GetSpatialRef());
-
-    std::array<double, 6> adfDstGeoTransform;
-    adfDstGeoTransform[0] = adfGeoTransform[0] + adfGeoTransform[1] * nXStart +
-                            adfGeoTransform[2] * nYStart;
-    adfDstGeoTransform[1] = adfGeoTransform[1];
-    adfDstGeoTransform[2] = adfGeoTransform[2];
-    adfDstGeoTransform[3] = adfGeoTransform[3] + adfGeoTransform[4] * nXStart +
-                            adfGeoTransform[5] * nYStart;
-    adfDstGeoTransform[4] = adfGeoTransform[4];
-    adfDstGeoTransform[5] = adfGeoTransform[5];
-    poDstDS->SetGeoTransform(adfDstGeoTransform.data());
-
-    auto hTargetBand = poDstDS->GetRasterBand(1);
-    if (hTargetBand == nullptr)
-    {
-        CPLError(CE_Failure, CPLE_AppDefined, "Cannot get band for %s",
-                 oOpts.outputFilename.c_str());
-        return false;
-    }
-
-    if (oOpts.nodataVal >= 0)
-        GDALSetRasterNoDataValue(hTargetBand, oOpts.nodataVal);
-
-    /* process first line */
-    if (GDALRasterIO(hBand, GF_Read, nXStart, nY, nXSize, 1, padfFirstLineVal,
-                     nXSize, 1, GDT_Float64, 0, 0))
-    {
-        CPLError(
-            CE_Failure, CPLE_AppDefined,
-            "RasterIO error when reading DEM at position(%d, %d), size(%d, %d)",
-            nXStart, nY, nXSize, 1);
-        return false;
-    }
-
-    const double dfZObserver = oOpts.observer.z + padfFirstLineVal[nX];
-    const double dfDistance2 = oOpts.maxDistance * oOpts.maxDistance;
-
-    /* If we can't get a SemiMajor axis from the SRS, it will be
-     * SRS_WGS84_SEMIMAJOR
-     */
-    double dfSphereDiameter(std::numeric_limits<double>::infinity());
-    const OGRSpatialReference *poDstSRS = poDstDS->GetSpatialRef();
-    if (poDstSRS)
-    {
-        OGRErr eSRSerr;
-        double dfSemiMajor = poDstSRS->GetSemiMajor(&eSRSerr);
-
-        /* If we fetched the axis from the SRS, use it */
-        if (eSRSerr != OGRERR_FAILURE)
-            dfSphereDiameter = dfSemiMajor * 2.0;
-        else
-            CPLDebug("GDALViewshedGenerate",
-                     "Unable to fetch SemiMajor axis from spatial reference");
-    }
-
-    /* mark the observer point as visible */
-    double dfGroundLevel = 0;
-    if (oOpts.outputMode == OutputMode::DEM)
-        dfGroundLevel = padfFirstLineVal[nX];
-
-    pabyResult[nX] = oOpts.visibleVal;
-
-    //ABELL - Do we care about this conditional?
-    if (oOpts.outputMode != OutputMode::Normal)
-        dfHeightResult[nX] = dfGroundLevel;
-
-    dfGroundLevel = 0;
-    if (nX > 0)
-    {
-        if (oOpts.outputMode == OutputMode::DEM)
-            dfGroundLevel = padfFirstLineVal[nX - 1];
-        CPL_IGNORE_RET_VAL(AdjustHeightInRange(
-            adfGeoTransform.data(), 1, 0, padfFirstLineVal[nX - 1], dfDistance2,
-            oOpts.curveCoeff, dfSphereDiameter));
-        pabyResult[nX - 1] = oOpts.visibleVal;
-        if (oOpts.outputMode != OutputMode::Normal)
-            dfHeightResult[nX - 1] = dfGroundLevel;
-    }
-    if (nX < nXSize - 1)
-    {
-        if (oOpts.outputMode == OutputMode::DEM)
-            dfGroundLevel = padfFirstLineVal[nX + 1];
-        CPL_IGNORE_RET_VAL(AdjustHeightInRange(
-            adfGeoTransform.data(), 1, 0, padfFirstLineVal[nX + 1], dfDistance2,
-            oOpts.curveCoeff, dfSphereDiameter));
-        pabyResult[nX + 1] = oOpts.visibleVal;
-        if (oOpts.outputMode != OutputMode::Normal)
-            dfHeightResult[nX + 1] = dfGroundLevel;
-    }
-
-    /* process left direction */
-    for (int iPixel = nX - 2; iPixel >= 0; iPixel--)
-    {
-        dfGroundLevel = 0;
-        if (oOpts.outputMode == OutputMode::DEM)
-            dfGroundLevel = padfFirstLineVal[iPixel];
-
-        if (AdjustHeightInRange(adfGeoTransform.data(), nX - iPixel, 0,
-                                padfFirstLineVal[iPixel], dfDistance2,
-                                oOpts.curveCoeff, dfSphereDiameter))
-        {
-            double dfZ = CalcHeightLine(
-                nX - iPixel, padfFirstLineVal[iPixel + 1], dfZObserver);
-
-            if (oOpts.outputMode != OutputMode::Normal)
-                dfHeightResult[iPixel] = std::max(
-                    0.0, (dfZ - padfFirstLineVal[iPixel] + dfGroundLevel));
-
-            setVisibility(iPixel, dfZ, padfFirstLineVal, vResult);
-        }
-        else
-        {
-            for (; iPixel >= 0; iPixel--)
-            {
-                pabyResult[iPixel] = oOpts.outOfRangeVal;
-                if (oOpts.outputMode != OutputMode::Normal)
-                    dfHeightResult[iPixel] = oOpts.outOfRangeVal;
-            }
-        }
-    }
-    /* process right direction */
-    for (int iPixel = nX + 2; iPixel < nXSize; iPixel++)
-    {
-        dfGroundLevel = 0;
-        if (oOpts.outputMode == OutputMode::DEM)
-            dfGroundLevel = padfFirstLineVal[iPixel];
-        if (AdjustHeightInRange(adfGeoTransform.data(), iPixel - nX, 0,
-                                padfFirstLineVal[iPixel], dfDistance2,
-                                oOpts.curveCoeff, dfSphereDiameter))
-        {
-            double dfZ = CalcHeightLine(
-                iPixel - nX, padfFirstLineVal[iPixel - 1], dfZObserver);
-
-            if (oOpts.outputMode != OutputMode::Normal)
-                dfHeightResult[iPixel] = std::max(
-                    0.0, (dfZ - padfFirstLineVal[iPixel] + dfGroundLevel));
-
-            setVisibility(iPixel, dfZ, padfFirstLineVal, vResult);
-        }
-        else
-        {
-            for (; iPixel < nXSize; iPixel++)
-            {
-                pabyResult[iPixel] = oOpts.outOfRangeVal;
-                if (oOpts.outputMode != OutputMode::Normal)
-                    dfHeightResult[iPixel] = oOpts.outOfRangeVal;
-            }
-        }
-    }
-    /* write result line */
-
-    void *data;
-    GDALDataType dataType;
-    if (oOpts.outputMode == OutputMode::Normal)
-    {
-        data = static_cast<void *>(pabyResult);
-        dataType = GDT_Byte;
-    }
-    else
-    {
-        data = static_cast<void *>(dfHeightResult);
-        dataType = GDT_Float64;
-    }
-    if (GDALRasterIO(hTargetBand, GF_Write, 0, nY - nYStart, nXSize, 1, data,
-                     nXSize, 1, dataType, 0, 0))
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "RasterIO error when writing target raster at position "
-                 "(%d,%d), size (%d,%d)",
-                 0, nY - nYStart, nXSize, 1);
-        return false;
-    }
-
-    /* scan upwards */
-    std::copy(vFirstLineVal.begin(), vFirstLineVal.end(), vLastLineVal.begin());
-    for (int iLine = nY - 1; iLine >= nYStart; iLine--)
-    {
-        if (GDALRasterIO(hBand, GF_Read, nXStart, iLine, nXSize, 1,
-                         padfThisLineVal, nXSize, 1, GDT_Float64, 0, 0))
-        {
-            CPLError(CE_Failure, CPLE_AppDefined,
-                     "RasterIO error when reading DEM at position (%d,%d), "
-                     "size (%d,%d)",
-                     nXStart, iLine, nXSize, 1);
-            return false;
-        }
-
-        /* set up initial point on the scanline */
-        dfGroundLevel = 0;
-        if (oOpts.outputMode == OutputMode::DEM)
-            dfGroundLevel = padfThisLineVal[nX];
-        if (AdjustHeightInRange(adfGeoTransform.data(), 0, nY - iLine,
-                                padfThisLineVal[nX], dfDistance2,
-                                oOpts.curveCoeff, dfSphereDiameter))
-        {
-            double dfZ =
-                CalcHeightLine(nY - iLine, padfLastLineVal[nX], dfZObserver);
-
-            if (oOpts.outputMode != OutputMode::Normal)
-                dfHeightResult[nX] =
-                    std::max(0.0, (dfZ - padfThisLineVal[nX] + dfGroundLevel));
-
-            setVisibility(nX, dfZ, padfThisLineVal, vResult);
-        }
-        else
-        {
-            pabyResult[nX] = oOpts.outOfRangeVal;
-            if (oOpts.outputMode != OutputMode::Normal)
-                dfHeightResult[nX] = oOpts.outOfRangeVal;
-        }
-
-        /* process left direction */
-        for (int iPixel = nX - 1; iPixel >= 0; iPixel--)
-        {
-            dfGroundLevel = 0;
-            if (oOpts.outputMode == OutputMode::DEM)
-                dfGroundLevel = padfThisLineVal[iPixel];
-            if (AdjustHeightInRange(adfGeoTransform.data(), nX - iPixel,
-                                    nY - iLine, padfThisLineVal[iPixel],
-                                    dfDistance2, oOpts.curveCoeff,
-                                    dfSphereDiameter))
-            {
-                double dfDiagZ = 0;
-                double dfEdgeZ = 0;
-                if (oOpts.cellMode != CellMode::Edge)
-                    dfDiagZ = CalcHeightDiagonal(
-                        nX - iPixel, nY - iLine, padfThisLineVal[iPixel + 1],
-                        padfLastLineVal[iPixel], dfZObserver);
-
-                if (oOpts.cellMode != CellMode::Diagonal)
-                    dfEdgeZ = nX - iPixel >= nY - iLine
-                                  ? CalcHeightEdge(nY - iLine, nX - iPixel,
-                                                   padfLastLineVal[iPixel + 1],
-                                                   padfThisLineVal[iPixel + 1],
-                                                   dfZObserver)
-                                  : CalcHeightEdge(nX - iPixel, nY - iLine,
-                                                   padfLastLineVal[iPixel + 1],
-                                                   padfLastLineVal[iPixel],
-                                                   dfZObserver);
-
-                double dfZ = calcHeight(dfDiagZ, dfEdgeZ);
-
-                if (oOpts.outputMode != OutputMode::Normal)
-                    dfHeightResult[iPixel] = std::max(
-                        0.0, (dfZ - padfThisLineVal[iPixel] + dfGroundLevel));
-
-                setVisibility(iPixel, dfZ, padfThisLineVal, vResult);
-            }
-            else
-            {
-                for (; iPixel >= 0; iPixel--)
-                {
-                    pabyResult[iPixel] = oOpts.outOfRangeVal;
-                    if (oOpts.outputMode != OutputMode::Normal)
-                        dfHeightResult[iPixel] = oOpts.outOfRangeVal;
-                }
-            }
-        }
-        /* process right direction */
-        for (int iPixel = nX + 1; iPixel < nXSize; iPixel++)
-        {
-            dfGroundLevel = 0;
-            if (oOpts.outputMode == OutputMode::DEM)
-                dfGroundLevel = padfThisLineVal[iPixel];
-
-            if (AdjustHeightInRange(adfGeoTransform.data(), iPixel - nX,
-                                    nY - iLine, padfThisLineVal[iPixel],
-                                    dfDistance2, oOpts.curveCoeff,
-                                    dfSphereDiameter))
-            {
-                double dfDiagZ = 0;
-                double dfEdgeZ = 0;
-                if (oOpts.cellMode != CellMode::Edge)
-                    dfDiagZ = CalcHeightDiagonal(
-                        iPixel - nX, nY - iLine, padfThisLineVal[iPixel - 1],
-                        padfLastLineVal[iPixel], dfZObserver);
-                if (oOpts.cellMode != CellMode::Diagonal)
-                    dfEdgeZ = iPixel - nX >= nY - iLine
-                                  ? CalcHeightEdge(nY - iLine, iPixel - nX,
-                                                   padfLastLineVal[iPixel - 1],
-                                                   padfThisLineVal[iPixel - 1],
-                                                   dfZObserver)
-                                  : CalcHeightEdge(iPixel - nX, nY - iLine,
-                                                   padfLastLineVal[iPixel - 1],
-                                                   padfLastLineVal[iPixel],
-                                                   dfZObserver);
-
-                double dfZ = calcHeight(dfDiagZ, dfEdgeZ);
-
-                if (oOpts.outputMode != OutputMode::Normal)
-                    dfHeightResult[iPixel] = std::max(
-                        0.0, (dfZ - padfThisLineVal[iPixel] + dfGroundLevel));
-
-                setVisibility(iPixel, dfZ, padfThisLineVal, vResult);
-            }
-            else
-            {
-                for (; iPixel < nXSize; iPixel++)
-                {
-                    pabyResult[iPixel] = oOpts.outOfRangeVal;
-                    if (oOpts.outputMode != OutputMode::Normal)
-                        dfHeightResult[iPixel] = oOpts.outOfRangeVal;
-                }
-            }
-        }
-
-        /* write result line */
-        if (GDALRasterIO(hTargetBand, GF_Write, 0, iLine - nYStart, nXSize, 1,
-                         data, nXSize, 1, dataType, 0, 0))
-        {
-            CPLError(CE_Failure, CPLE_AppDefined,
-                     "RasterIO error when writing target raster at position "
-                     "(%d,%d), size (%d,%d)",
-                     0, iLine - nYStart, nXSize, 1);
-            return false;
-        }
-
-        std::swap(padfLastLineVal, padfThisLineVal);
-
-        if (!pfnProgress((nY - iLine) / static_cast<double>(nYSize), "",
-                         pProgressArg))
-        {
-            CPLError(CE_Failure, CPLE_UserInterrupt, "User terminated");
-            return false;
-        }
-    }
-
-    /* scan downwards */
-    memcpy(padfLastLineVal, padfFirstLineVal, nXSize * sizeof(double));
-    for (int iLine = nY + 1; iLine < nYStop; iLine++)
-    {
-        if (GDALRasterIO(hBand, GF_Read, nXStart, iLine, nXSize, 1,
-                         padfThisLineVal, nXSize, 1, GDT_Float64, 0, 0))
-        {
-            CPLError(CE_Failure, CPLE_AppDefined,
-                     "RasterIO error when reading DEM at position (%d,%d), "
-                     "size (%d,%d)",
-                     nXStart, iLine, nXStop - nXStart, 1);
-            return false;
-        }
-
-        /* set up initial point on the scanline */
-        dfGroundLevel = 0;
-        if (oOpts.outputMode == OutputMode::DEM)
-            dfGroundLevel = padfThisLineVal[nX];
-
-        if (AdjustHeightInRange(adfGeoTransform.data(), 0, iLine - nY,
-                                padfThisLineVal[nX], dfDistance2,
-                                oOpts.curveCoeff, dfSphereDiameter))
-        {
-            double dfZ =
-                CalcHeightLine(iLine - nY, padfLastLineVal[nX], dfZObserver);
-
-            if (oOpts.outputMode != OutputMode::Normal)
-                dfHeightResult[nX] =
-                    std::max(0.0, (dfZ - padfThisLineVal[nX] + dfGroundLevel));
-
-            setVisibility(nX, dfZ, padfThisLineVal, vResult);
-        }
-        else
-        {
-            pabyResult[nX] = oOpts.outOfRangeVal;
-            if (oOpts.outputMode != OutputMode::Normal)
-                dfHeightResult[nX] = oOpts.outOfRangeVal;
-        }
-
-        /* process left direction */
-        for (int iPixel = nX - 1; iPixel >= 0; iPixel--)
-        {
-            dfGroundLevel = 0;
-            if (oOpts.outputMode == OutputMode::DEM)
-                dfGroundLevel = padfThisLineVal[iPixel];
-
-            if (AdjustHeightInRange(adfGeoTransform.data(), nX - iPixel,
-                                    iLine - nY, padfThisLineVal[iPixel],
-                                    dfDistance2, oOpts.curveCoeff,
-                                    dfSphereDiameter))
-            {
-                double dfDiagZ = 0;
-                double dfEdgeZ = 0;
-                if (oOpts.cellMode != CellMode::Edge)
-                    dfDiagZ = CalcHeightDiagonal(
-                        nX - iPixel, iLine - nY, padfThisLineVal[iPixel + 1],
-                        padfLastLineVal[iPixel], dfZObserver);
-
-                if (oOpts.cellMode != CellMode::Diagonal)
-                    dfEdgeZ = nX - iPixel >= iLine - nY
-                                  ? CalcHeightEdge(iLine - nY, nX - iPixel,
-                                                   padfLastLineVal[iPixel + 1],
-                                                   padfThisLineVal[iPixel + 1],
-                                                   dfZObserver)
-                                  : CalcHeightEdge(nX - iPixel, iLine - nY,
-                                                   padfLastLineVal[iPixel + 1],
-                                                   padfLastLineVal[iPixel],
-                                                   dfZObserver);
-
-                double dfZ = calcHeight(dfDiagZ, dfEdgeZ);
-
-                if (oOpts.outputMode != OutputMode::Normal)
-                    dfHeightResult[iPixel] = std::max(
-                        0.0, (dfZ - padfThisLineVal[iPixel] + dfGroundLevel));
-
-                setVisibility(iPixel, dfZ, padfThisLineVal, vResult);
-            }
-            else
-            {
-                for (; iPixel >= 0; iPixel--)
-                {
-                    pabyResult[iPixel] = oOpts.outOfRangeVal;
-                    if (oOpts.outputMode != OutputMode::Normal)
-                        dfHeightResult[iPixel] = oOpts.outOfRangeVal;
-                }
-            }
-        }
-        /* process right direction */
-        for (int iPixel = nX + 1; iPixel < nXSize; iPixel++)
-        {
-            dfGroundLevel = 0;
-            if (oOpts.outputMode == OutputMode::DEM)
-                dfGroundLevel = padfThisLineVal[iPixel];
-
-            if (AdjustHeightInRange(adfGeoTransform.data(), iPixel - nX,
-                                    iLine - nY, padfThisLineVal[iPixel],
-                                    dfDistance2, oOpts.curveCoeff,
-                                    dfSphereDiameter))
-            {
-                double dfDiagZ = 0;
-                double dfEdgeZ = 0;
-                if (oOpts.cellMode != CellMode::Edge)
-                    dfDiagZ = CalcHeightDiagonal(
-                        iPixel - nX, iLine - nY, padfThisLineVal[iPixel - 1],
-                        padfLastLineVal[iPixel], dfZObserver);
-
-                if (oOpts.cellMode != CellMode::Diagonal)
-                    dfEdgeZ = iPixel - nX >= iLine - nY
-                                  ? CalcHeightEdge(iLine - nY, iPixel - nX,
-                                                   padfLastLineVal[iPixel - 1],
-                                                   padfThisLineVal[iPixel - 1],
-                                                   dfZObserver)
-                                  : CalcHeightEdge(iPixel - nX, iLine - nY,
-                                                   padfLastLineVal[iPixel - 1],
-                                                   padfLastLineVal[iPixel],
-                                                   dfZObserver);
-
-                double dfZ = calcHeight(dfDiagZ, dfEdgeZ);
-
-                if (oOpts.outputMode != OutputMode::Normal)
-                    dfHeightResult[iPixel] = std::max(
-                        0.0, (dfZ - padfThisLineVal[iPixel] + dfGroundLevel));
-
-                setVisibility(iPixel, dfZ, padfThisLineVal, vResult);
-            }
-            else
-            {
-                for (; iPixel < nXSize; iPixel++)
-                {
-                    pabyResult[iPixel] = oOpts.outOfRangeVal;
-                    if (oOpts.outputMode != OutputMode::Normal)
-                        dfHeightResult[iPixel] = oOpts.outOfRangeVal;
-                }
-            }
-        }
-
-        /* write result line */
-        if (GDALRasterIO(hTargetBand, GF_Write, 0, iLine - nYStart, nXSize, 1,
-                         data, nXSize, 1, dataType, 0, 0))
-        {
-            CPLError(CE_Failure, CPLE_AppDefined,
-                     "RasterIO error when writing target raster at position "
-                     "(%d,%d), size (%d,%d)",
-                     0, iLine - nYStart, nXSize, 1);
-            return false;
-        }
-
-        std::swap(padfLastLineVal, padfThisLineVal);
-
-        if (!pfnProgress((iLine - nYStart) / static_cast<double>(nYSize), "",
-                         pProgressArg))
-        {
-            CPLError(CE_Failure, CPLE_UserInterrupt, "User terminated");
-            return false;
-        }
-    }
-
-    if (!pfnProgress(1.0, "", pProgressArg))
-    {
-        CPLError(CE_Failure, CPLE_UserInterrupt, "User terminated");
-        return false;
-    }
-
-    return true;
-}
-
-}  // namespace gdal
diff --git a/alg/viewshed.h b/alg/viewshed.h
deleted file mode 100644
index 1dc1120806e5..000000000000
--- a/alg/viewshed.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/******************************************************************************
- *
- * Project:  Viewshed Generation
- * Purpose:  Core algorithm implementation for viewshed generation.
- * Author:   Tamas Szekeres, szekerest@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.
- ****************************************************************************/
-
-#include <cstdint>
-#include <memory>
-#include <string>
-
-#include "cpl_progress.h"
-#include "gdal_priv.h"
-
-namespace gdal
-{
-
-/**
- * Class to support viewshed raster generation.
- */
-class Viewshed
-{
-  public:
-    /**
-     * Raster output mode.
-     */
-    enum class OutputMode
-    {
-        Normal,  //!< Normal output mode (visibility only)
-        DEM,     //!< Output height from DEM
-        Ground   //!< Output height from ground
-    };
-
-    /**
-     * Cell height calculation mode.
-     */
-    enum class CellMode
-    {
-        Diagonal,  //!< Diagonal Mode
-        Edge,      //!< Edge Mode
-        Max,       //!< Maximum value produced by Diagonal and Edge mode
-        Min        //!< Minimum value produced by Diagonal and Edge mode
-    };
-
-    /**
-     * A point.
-     */
-    struct Point
-    {
-        double x;  //!< X value
-        double y;  //!< Y value
-        double z;  //!< Z value
-    };
-
-    /**
-     * Options for viewshed generation.
-     */
-    struct Options
-    {
-        Point observer{0, 0, 0};  //!< x, y, and z of the observer
-        uint8_t visibleVal{255};  //!< raster output value for visible pixels.
-        uint8_t invisibleVal{
-            0};  //!< raster output value for non-visible pixels.
-        uint8_t outOfRangeVal{
-            0};  //!< raster output value for pixels outside of max distance.
-        double nodataVal{-1};  //!< raster output value for pixels with no data
-        double targetHeight{0.0};  //!< target height above the DEM surface
-        double maxDistance{
-            0.0};  //!< maximum distance from observer to compute value
-        double curveCoeff{.85714};  //!< coefficient for atmospheric refraction
-        OutputMode outputMode{OutputMode::Normal};  //!< Output information.
-            //!< Normal, Height from DEM or Height from ground
-        std::string outputFormat{};    //!< output raster format
-        std::string outputFilename{};  //!< output raster filename
-        CPLStringList creationOpts{};  //!< options for output raster creation
-        CellMode cellMode{
-            CellMode::Edge};  //!< Mode of cell height calculation.
-    };
-
-    /**
-     * Constructor.
-     *
-     * @param opts Options to use when calculating viewshed.
-    */
-    CPL_DLL explicit Viewshed(const Options &opts) : oOpts{opts}, poDstDS{}
-    {
-    }
-
-    /**
-     * Create the viewshed for the provided raster band.
-     *
-     * @param hBand  Handle to the raster band.
-     * @param pfnProgress  Progress reporting callback function.
-     * @param pProgressArg  Argument to pass to the progress callback.
-    */
-    CPL_DLL bool run(GDALRasterBandH hBand, GDALProgressFunc pfnProgress,
-                     void *pProgressArg = nullptr);
-
-    /**
-     * Fetch a pointer to the created raster band.
-     *
-     * @return  Unique pointer to the viewshed dataset.
-    */
-    CPL_DLL std::unique_ptr<GDALDataset> output()
-    {
-        return std::move(poDstDS);
-    }
-
-  private:
-    Options oOpts;
-    std::unique_ptr<GDALDataset> poDstDS;
-
-    void setVisibility(int iPixel, double dfZ, double *padfZVal,
-                       std::vector<GByte> &vResult);
-    double calcHeight(double dfZ, double dfZ2);
-};
-
-}  // namespace gdal
diff --git a/alg/viewshed/combiner.cpp b/alg/viewshed/combiner.cpp
new file mode 100644
index 000000000000..019b2c41fc4f
--- /dev/null
+++ b/alg/viewshed/combiner.cpp
@@ -0,0 +1,62 @@
+/******************************************************************************
+ * (c) 2024 info@hobu.co
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#include "combiner.h"
+#include "util.h"
+
+namespace gdal
+{
+namespace viewshed
+{
+
+/// Read viewshed executor output and sum it up in our owned memory raster.
+void Combiner::run()
+{
+    DatasetPtr pTempDataset;
+
+    while (m_inputQueue.pop(pTempDataset))
+    {
+        if (!m_dataset)
+            m_dataset = std::move(pTempDataset);
+        else
+            sum(std::move(pTempDataset));
+    }
+    // Queue remaining summed rasters.
+    queueOutputBuffer();
+}
+
+/// Add the values of the source dataset to those of the owned dataset.
+/// @param src  Source dataset.
+void Combiner::sum(DatasetPtr src)
+{
+    if (!m_dataset)
+    {
+        m_dataset = std::move(src);
+        return;
+    }
+    size_t size = bandSize(*m_dataset->GetRasterBand(1));
+
+    uint8_t *dstP =
+        static_cast<uint8_t *>(m_dataset->GetInternalHandle("MEMORY1"));
+    uint8_t *srcP = static_cast<uint8_t *>(src->GetInternalHandle("MEMORY1"));
+    for (size_t i = 0; i < size; ++i)
+        *dstP++ += *srcP++;
+    // If we've seen 255 inputs, queue our raster for output and rollup since we might overflow
+    // otherwise.
+    if (++m_count == 255)
+        queueOutputBuffer();
+}
+
+/// Queue the owned buffer as for output.
+void Combiner::queueOutputBuffer()
+{
+    if (m_dataset)
+        m_outputQueue.push(std::move(m_dataset));
+    m_count = 0;
+}
+
+}  // namespace viewshed
+}  // namespace gdal
diff --git a/alg/viewshed/combiner.h b/alg/viewshed/combiner.h
new file mode 100644
index 000000000000..06f8772618d9
--- /dev/null
+++ b/alg/viewshed/combiner.h
@@ -0,0 +1,56 @@
+/******************************************************************************
+ * (c) 2024 info@hobu.co
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#ifndef VIEWSHED_COMBINER_H_INCLUDED
+#define VIEWSHED_COMBINER_H_INCLUDED
+
+#include "cumulative.h"
+#include "viewshed_types.h"
+
+namespace gdal
+{
+namespace viewshed
+{
+
+/// Reads completed viewshed rasters and sums them together. When the
+/// summed values may exceed the 8-bit limit, push it on the output
+/// queue.
+class Combiner
+{
+  public:
+    /// Constructor
+    /// @param inputQueue  Reference to input queue of datasets
+    /// @param outputQueue  Reference to output queue of datasets
+    Combiner(Cumulative::DatasetQueue &inputQueue,
+             Cumulative::DatasetQueue &outputQueue)
+        : m_inputQueue(inputQueue), m_outputQueue(outputQueue)
+    {
+    }
+
+    /// Copy ctor. Allows initialization in a vector of Combiners.
+    /// @param src  Source Combiner.
+    // cppcheck-suppress missingMemberCopy
+    Combiner(const Combiner &src)
+        : m_inputQueue(src.m_inputQueue), m_outputQueue(src.m_outputQueue)
+    {
+    }
+
+    void queueOutputBuffer();
+    void run();
+
+  private:
+    Cumulative::DatasetQueue &m_inputQueue;
+    Cumulative::DatasetQueue &m_outputQueue;
+    DatasetPtr m_dataset{};
+    size_t m_count{0};
+
+    void sum(DatasetPtr srcDs);
+};
+
+}  // namespace viewshed
+}  // namespace gdal
+
+#endif
diff --git a/alg/viewshed/cumulative.cpp b/alg/viewshed/cumulative.cpp
new file mode 100644
index 000000000000..0111492a5b45
--- /dev/null
+++ b/alg/viewshed/cumulative.cpp
@@ -0,0 +1,217 @@
+/******************************************************************************
+ * (c) 2024 info@hobu.co
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#include <algorithm>
+#include <limits>
+#include <thread>
+
+#include "cpl_worker_thread_pool.h"
+
+#include "combiner.h"
+#include "cumulative.h"
+#include "notifyqueue.h"
+#include "util.h"
+#include "viewshed_executor.h"
+
+namespace gdal
+{
+namespace viewshed
+{
+
+/// Constructor
+///
+/// @param opts  Options for viewshed generation.
+Cumulative::Cumulative(const Options &opts) : m_opts(opts)
+{
+}
+
+/// Destructor
+///
+Cumulative::~Cumulative() = default;
+
+/// Compute the cumulative viewshed of a raster band.
+///
+/// @param srcFilename  Source filename.
+/// @param pfnProgress  Pointer to the progress function. Can be null.
+/// @param pProgressArg  Argument passed to the progress function
+/// @return  True on success, false otherwise.
+bool Cumulative::run(const std::string &srcFilename,
+                     GDALProgressFunc pfnProgress, void *pProgressArg)
+{
+    // In cumulative mode, we run the executors in normal mode and want "1" where things
+    // are visible.
+    m_opts.outputMode = OutputMode::Normal;
+    m_opts.visibleVal = 1;
+
+    DatasetPtr srcDS(
+        GDALDataset::FromHandle(GDALOpen(srcFilename.c_str(), GA_ReadOnly)));
+    if (!srcDS)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Unable open source file.");
+        return false;
+    }
+
+    GDALRasterBand *pSrcBand = srcDS->GetRasterBand(1);
+
+    // In cumulative mode, the output extent is always the entire source raster.
+    m_extent.xStop = GDALGetRasterBandXSize(pSrcBand);
+    m_extent.yStop = GDALGetRasterBandYSize(pSrcBand);
+
+    // Make a bunch of observer locations based on the spacing and stick them on a queue
+    // to be handled by viewshed executors.
+    for (int x = 0; x < m_extent.xStop; x += m_opts.observerSpacing)
+        for (int y = 0; y < m_extent.yStop; y += m_opts.observerSpacing)
+            m_observerQueue.push({x, y});
+    m_observerQueue.done();
+
+    // Run executors.
+    const int numThreads = m_opts.numJobs;
+    std::atomic<bool> err = false;
+    std::atomic<int> running = numThreads;
+    Progress progress(pfnProgress, pProgressArg,
+                      m_observerQueue.size() * m_extent.ySize());
+    CPLWorkerThreadPool executorPool(numThreads);
+    for (int i = 0; i < numThreads; ++i)
+        executorPool.SubmitJob(
+            [this, &srcFilename, &progress, &err, &running]
+            { runExecutor(srcFilename, progress, err, running); });
+
+    // Run combiners that create 8-bit sums of executor jobs.
+    CPLWorkerThreadPool combinerPool(numThreads);
+    std::vector<Combiner> combiners(numThreads,
+                                    Combiner(m_datasetQueue, m_rollupQueue));
+    for (Combiner &c : combiners)
+        combinerPool.SubmitJob([&c] { c.run(); });
+
+    // Run 32-bit rollup job that combines the 8-bit results from the combiners.
+    std::thread sum([this] { rollupRasters(); });
+
+    // When the combiner jobs are done, all the data is in the rollup queue.
+    combinerPool.WaitCompletion();
+    if (m_datasetQueue.isStopped())
+        return false;
+    m_rollupQueue.done();
+
+    // Wait for finalBuf to be fully filled.
+    sum.join();
+    // The executors should exit naturally, but we wait here so that we don't outrun their
+    // completion and exit with outstanding threads.
+    executorPool.WaitCompletion();
+
+    // Scale the data so that we can write an 8-bit raster output.
+    scaleOutput();
+    if (!writeOutput(createOutputDataset(*pSrcBand, m_opts, m_extent)))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Unable to write to output file.");
+        return false;
+    }
+    progress.emit(1);
+
+    return true;
+}
+
+/// Run an executor (single viewshed)
+/// @param srcFilename  Source filename
+/// @param progress  Progress supporting support.
+/// @param err  Shared error flag.
+/// @param running  Shared count of number of executors running.
+void Cumulative::runExecutor(const std::string &srcFilename, Progress &progress,
+                             std::atomic<bool> &err, std::atomic<int> &running)
+{
+    DatasetPtr srcDs(GDALDataset::Open(srcFilename.c_str(), GA_ReadOnly));
+    if (!srcDs)
+    {
+        err = true;
+    }
+    else
+    {
+        Location loc;
+        while (!err && m_observerQueue.pop(loc))
+        {
+            GDALDriver *memDriver =
+                GetGDALDriverManager()->GetDriverByName("MEM");
+            DatasetPtr dstDs(memDriver ? memDriver->Create("", m_extent.xSize(),
+                                                           m_extent.ySize(), 1,
+                                                           GDT_Byte, nullptr)
+                                       : nullptr);
+            if (!dstDs)
+            {
+                err = true;
+            }
+            else
+            {
+                ViewshedExecutor executor(
+                    *srcDs->GetRasterBand(1), *dstDs->GetRasterBand(1), loc.x,
+                    loc.y, m_extent, m_extent, m_opts, progress);
+                err = !executor.run();
+                if (!err)
+                    m_datasetQueue.push(std::move(dstDs));
+            }
+        }
+    }
+
+    // Job done. Set the output queue state.  If all the executor jobs have completed,
+    // set the dataset output queue done.
+    if (err)
+        m_datasetQueue.stop();
+    else
+    {
+        running--;
+        if (!running)
+            m_datasetQueue.done();
+    }
+}
+
+// Add 8-bit rasters into the 32-bit raster buffer.
+void Cumulative::rollupRasters()
+{
+    DatasetPtr pDS;
+
+    m_finalBuf.resize(m_extent.size());
+    while (m_rollupQueue.pop(pDS))
+    {
+        uint8_t *srcP =
+            static_cast<uint8_t *>(pDS->GetInternalHandle("MEMORY1"));
+        for (size_t i = 0; i < m_extent.size(); ++i)
+            m_finalBuf[i] += srcP[i];
+    }
+}
+
+/// Scale the output so that it's fully spread in 8 bits. Perhaps this shouldn't happen if
+/// the max is less than 255?
+void Cumulative::scaleOutput()
+{
+    uint32_t m = 0;  // This gathers all the bits set.
+    for (uint32_t &val : m_finalBuf)
+        m = std::max(val, m);
+
+    if (m == 0)
+        return;
+
+    double factor =
+        std::numeric_limits<uint8_t>::max() / static_cast<double>(m);
+    for (uint32_t &val : m_finalBuf)
+        val = static_cast<uint32_t>(std::floor(factor * val));
+}
+
+/// Write the output dataset.
+/// @param pDstDS  Pointer to the destination dataset.
+/// @return True if the write was successful, false otherwise.
+bool Cumulative::writeOutput(DatasetPtr pDstDS)
+{
+    if (!pDstDS)
+        return false;
+
+    GDALRasterBand *pDstBand = pDstDS->GetRasterBand(1);
+    return (pDstBand->RasterIO(GF_Write, 0, 0, m_extent.xSize(),
+                               m_extent.ySize(), m_finalBuf.data(),
+                               m_extent.xSize(), m_extent.ySize(), GDT_UInt32,
+                               0, 0, nullptr) == 0);
+}
+
+}  // namespace viewshed
+}  // namespace gdal
diff --git a/alg/viewshed/cumulative.h b/alg/viewshed/cumulative.h
new file mode 100644
index 000000000000..1b80e9205617
--- /dev/null
+++ b/alg/viewshed/cumulative.h
@@ -0,0 +1,71 @@
+/******************************************************************************
+ * (c) 2024 info@hobu.co
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#ifndef VIEWSHED_CUMULATIVE_H_INCLUDED
+#define VIEWSHED_CUMULATIVE_H_INCLUDED
+
+#include <atomic>
+#include <vector>
+
+#include "notifyqueue.h"
+#include "progress.h"
+#include "viewshed_types.h"
+
+namespace gdal
+{
+namespace viewshed
+{
+
+class Progress;
+
+/// Generates a cumulative viewshed from a matrix of observers.
+class Cumulative
+{
+  public:
+    CPL_DLL explicit Cumulative(const Options &opts);
+    // We define an explicit destructor, whose implementation is in libgdal,
+    // otherwise with gcc 9.4 of Ubuntu 20.04 in debug mode, this would need to
+    // redefinition of the NotifyQueue class in both libgdal and gdal_viewshed,
+    // leading to weird things related to mutex.
+    CPL_DLL ~Cumulative();
+    CPL_DLL bool run(const std::string &srcFilename,
+                     GDALProgressFunc pfnProgress = GDALDummyProgress,
+                     void *pProgressArg = nullptr);
+
+  private:
+    friend class Combiner;  // Provides access to the queue types.
+
+    struct Location
+    {
+        int x;
+        int y;
+    };
+
+    using Buf32 = std::vector<uint32_t>;
+    using ObserverQueue = NotifyQueue<Location>;
+    using DatasetQueue = NotifyQueue<DatasetPtr>;
+
+    Window m_extent{};
+    Options m_opts;
+    ObserverQueue m_observerQueue{};
+    DatasetQueue m_datasetQueue{};
+    DatasetQueue m_rollupQueue{};
+    Buf32 m_finalBuf{};
+
+    void runExecutor(const std::string &srcFilename, Progress &progress,
+                     std::atomic<bool> &err, std::atomic<int> &running);
+    void rollupRasters();
+    void scaleOutput();
+    bool writeOutput(DatasetPtr pDstDS);
+
+    Cumulative(const Cumulative &) = delete;
+    Cumulative &operator=(const Cumulative &) = delete;
+};
+
+}  // namespace viewshed
+}  // namespace gdal
+
+#endif
diff --git a/alg/viewshed/notifyqueue.h b/alg/viewshed/notifyqueue.h
new file mode 100644
index 000000000000..af4cb75c1d71
--- /dev/null
+++ b/alg/viewshed/notifyqueue.h
@@ -0,0 +1,126 @@
+/******************************************************************************
+ * (c) 2024 info@hobu.co
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#ifndef VIEWSHED_NOTIFYQUEUE_H_INCLUDED
+#define VIEWSHED_NOTIFYQUEUE_H_INCLUDED
+
+#include "cpl_port.h"
+
+#include <condition_variable>
+#include <mutex>
+#include <queue>
+
+namespace gdal
+{
+namespace viewshed
+{
+
+/// This is a thread-safe queue. Things placed in the queue must be move-constructible.
+/// Readers will wait until there is something in the queue or the queue is empty or stopped.
+/// If the queue is stopped (error), it will never be in the done state. If in the
+/// done state (all writers have finished), it will never be in the error state.
+template <class T> class NotifyQueue
+{
+  public:
+    /// Destructor
+    ~NotifyQueue()
+    {
+        done();
+    }
+
+    /// Push an object on the queue and notify readers.
+    /// \param t  Object to be moved onto the queue.
+    void push(T &&t)
+    {
+        {
+            std::lock_guard<std::mutex> lock(m_mutex);
+            m_queue.push(std::move(t));
+        }
+        m_cv.notify_all();
+    }
+
+    /// Get an item from the queue.
+    /// \param t  Reference to an item to to which a queued item will be moved.
+    /// \return True if an item was popped. False otherwise.  Use isStopped() or isDone()
+    ///    to determine the state if you care when false is returned.
+    bool pop(T &t)
+    {
+        std::unique_lock<std::mutex> lock(m_mutex);
+        m_cv.wait(lock,
+                  [this] { return !m_queue.empty() || m_done || m_stop; });
+
+        if (m_stop)
+            return false;
+
+        if (m_queue.size())
+        {
+            t = std::move(m_queue.front());
+            m_queue.pop();
+            return true;
+        }
+
+        // m_done must be true and the queue is empty.
+        return false;
+    }
+
+    /// When we're done putting things in the queue, set the end condition.
+    void done()
+    {
+        {
+            std::lock_guard<std::mutex> lock(m_mutex);
+            m_done = !m_stop;  // If we're already stopped, we can't be done.
+        }
+        m_cv.notify_all();
+    }
+
+    /// Unblock all readers regardless of queue state.
+    void stop()
+    {
+        {
+            std::lock_guard<std::mutex> lock(m_mutex);
+            m_stop = !m_done;  // If we're already done, we can't be stopped.
+        }
+        m_cv.notify_all();
+    }
+
+    /// Determine if the queue was emptied completely. Call after pop() returns false
+    /// to check queue state.
+    /// \return  Whether the queue was emptied completely.
+    bool isDone()
+    {
+        std::lock_guard<std::mutex> lock(m_mutex);
+        return m_done;
+    }
+
+    /// Determine if the queue was stopped. Call after pop() returns false
+    /// to check queue state.
+    /// \return  Whether the queue was stopped.
+    bool isStopped()
+    {
+        std::lock_guard<std::mutex> lock(m_mutex);
+        return m_stop;
+    }
+
+    /// Get the current size of the queue.
+    /// \return Current queue size.
+    size_t size() const
+    {
+        std::lock_guard<std::mutex> lock(m_mutex);
+        return m_queue.size();
+    }
+
+  private:
+    std::queue<T> m_queue{};
+    mutable std::mutex m_mutex{};
+    std::condition_variable m_cv{};
+    bool m_done{false};
+    bool m_stop{false};
+};
+
+}  // namespace viewshed
+}  // namespace gdal
+
+#endif
diff --git a/alg/viewshed/progress.cpp b/alg/viewshed/progress.cpp
new file mode 100644
index 000000000000..d2bb5b803116
--- /dev/null
+++ b/alg/viewshed/progress.cpp
@@ -0,0 +1,65 @@
+/******************************************************************************
+ * (c) 2024 info@hobu.co
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#include <algorithm>
+
+#include "progress.h"
+
+#include "cpl_error.h"
+
+namespace gdal
+{
+namespace viewshed
+{
+
+/// Constructor
+/// @param pfnProgress  Pointer to progress function.
+/// @param pProgressArg  Pointer to progress function data.
+/// @param expectedLines  Number of lines expected to be processed.
+Progress::Progress(GDALProgressFunc pfnProgress, void *pProgressArg,
+                   size_t expectedLines)
+    : m_expectedLines(std::max(expectedLines, static_cast<size_t>(1)))
+{
+    using namespace std::placeholders;
+
+    // cppcheck-suppress useInitializationList
+    m_cb = std::bind(pfnProgress, _1, _2, pProgressArg);
+}
+
+/// Emit progress information saying that a line has been written to output.
+///
+/// @return  True on success, false otherwise.
+bool Progress::lineComplete()
+{
+    double fraction;
+    {
+        std::lock_guard<std::mutex> lock(m_mutex);
+
+        if (m_lines < m_expectedLines)
+            m_lines++;
+        fraction = m_lines / static_cast<double>(m_expectedLines);
+    }
+    return emit(fraction);
+}
+
+/// Emit progress information saying that a fraction of work has been completed.
+///
+/// @return  True on success, false otherwise.
+bool Progress::emit(double fraction)
+{
+    std::lock_guard<std::mutex> lock(m_mutex);
+
+    // Call the progress function.
+    if (!m_cb(fraction, ""))
+    {
+        CPLError(CE_Failure, CPLE_UserInterrupt, "User terminated");
+        return false;
+    }
+    return true;
+}
+
+}  // namespace viewshed
+}  // namespace gdal
diff --git a/alg/viewshed/progress.h b/alg/viewshed/progress.h
new file mode 100644
index 000000000000..b93bbb1de93d
--- /dev/null
+++ b/alg/viewshed/progress.h
@@ -0,0 +1,43 @@
+/******************************************************************************
+ * (c) 2024 info@hobu.co
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#ifndef VIEWSHED_PROGRESS_H_INCLUDED
+#define VIEWSHED_PROGRESS_H_INCLUDED
+
+#include <functional>
+#include <mutex>
+
+#include "cpl_progress.h"
+
+namespace gdal
+{
+namespace viewshed
+{
+
+/// Support for progress reporting in viewshed construction. Determines the faction of
+/// progress made based on the number of raster lines completed.
+class Progress
+{
+  public:
+    Progress(GDALProgressFunc pfnProgress, void *pProgressArg,
+             size_t expectedLines);
+
+    bool lineComplete();
+    bool emit(double fraction);
+
+  private:
+    using ProgressFunc = std::function<bool(double frac, const char *msg)>;
+
+    size_t m_lines{0};       ///< Number of lines completed.
+    size_t m_expectedLines;  ///< Number of lines expected.
+    std::mutex m_mutex{};    ///< Progress function might not be thread-safe.
+    ProgressFunc m_cb{};     ///< Progress callback function.
+};
+
+}  // namespace viewshed
+}  // namespace gdal
+
+#endif
diff --git a/alg/viewshed/util.cpp b/alg/viewshed/util.cpp
new file mode 100644
index 000000000000..1b98496f8de1
--- /dev/null
+++ b/alg/viewshed/util.cpp
@@ -0,0 +1,88 @@
+/******************************************************************************
+ * (c) 2024 info@hobu.co
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#include <array>
+
+#include "gdal_priv.h"
+#include "util.h"
+#include "viewshed_types.h"
+
+namespace gdal
+{
+namespace viewshed
+{
+
+/// Get the band size
+///
+/// @param  band Raster band
+/// @return  The raster band size.
+size_t bandSize(GDALRasterBand &band)
+{
+    return static_cast<size_t>(band.GetXSize()) * band.GetYSize();
+}
+
+/// Create the output dataset.
+///
+/// @param  srcBand  Source raster band.
+/// @param  opts  Options.
+/// @param  extent  Output dataset extent.
+/// @return  The output dataset to be filled with data.
+DatasetPtr createOutputDataset(GDALRasterBand &srcBand, const Options &opts,
+                               const Window &extent)
+{
+    GDALDriverManager *hMgr = GetGDALDriverManager();
+    GDALDriver *hDriver = hMgr->GetDriverByName(opts.outputFormat.c_str());
+    if (!hDriver)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Cannot get driver");
+        return nullptr;
+    }
+
+    /* create output raster */
+    DatasetPtr dataset(hDriver->Create(
+        opts.outputFilename.c_str(), extent.xSize(), extent.ySize(), 1,
+        opts.outputMode == OutputMode::Normal ? GDT_Byte : GDT_Float64,
+        const_cast<char **>(opts.creationOpts.List())));
+    if (!dataset)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Cannot create dataset for %s",
+                 opts.outputFilename.c_str());
+        return nullptr;
+    }
+
+    /* copy srs */
+    dataset->SetSpatialRef(srcBand.GetDataset()->GetSpatialRef());
+
+    std::array<double, 6> adfSrcTransform;
+    std::array<double, 6> adfDstTransform;
+    srcBand.GetDataset()->GetGeoTransform(adfSrcTransform.data());
+    adfDstTransform[0] = adfSrcTransform[0] +
+                         adfSrcTransform[1] * extent.xStart +
+                         adfSrcTransform[2] * extent.yStart;
+    adfDstTransform[1] = adfSrcTransform[1];
+    adfDstTransform[2] = adfSrcTransform[2];
+    adfDstTransform[3] = adfSrcTransform[3] +
+                         adfSrcTransform[4] * extent.xStart +
+                         adfSrcTransform[5] * extent.yStart;
+    adfDstTransform[4] = adfSrcTransform[4];
+    adfDstTransform[5] = adfSrcTransform[5];
+    dataset->SetGeoTransform(adfDstTransform.data());
+
+    GDALRasterBand *pBand = dataset->GetRasterBand(1);
+    if (!pBand)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Cannot get band for %s",
+                 opts.outputFilename.c_str());
+        return nullptr;
+    }
+
+    if (opts.nodataVal >= 0)
+        GDALSetRasterNoDataValue(pBand, opts.nodataVal);
+    return dataset;
+}
+
+}  // namespace viewshed
+}  // namespace gdal
diff --git a/alg/viewshed/util.h b/alg/viewshed/util.h
new file mode 100644
index 000000000000..7c92d9f8e938
--- /dev/null
+++ b/alg/viewshed/util.h
@@ -0,0 +1,25 @@
+/******************************************************************************
+ * (c) 2024 info@hobu.co
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#ifndef VIEWSHED_UTIL_H_INCLUDED
+#define VIEWSHED_UTIL_H_INCLUDED
+
+#include "viewshed_types.h"
+
+namespace gdal
+{
+namespace viewshed
+{
+
+size_t bandSize(GDALRasterBand &band);
+
+DatasetPtr createOutputDataset(GDALRasterBand &srcBand, const Options &opts,
+                               const Window &extent);
+
+}  // namespace viewshed
+}  // namespace gdal
+
+#endif
diff --git a/alg/viewshed/viewshed.cpp b/alg/viewshed/viewshed.cpp
new file mode 100644
index 000000000000..d9f0fc046234
--- /dev/null
+++ b/alg/viewshed/viewshed.cpp
@@ -0,0 +1,349 @@
+/******************************************************************************
+ *
+ * Project:  Viewshed Generation
+ * Purpose:  Core algorithm implementation for viewshed generation.
+ * Author:   Tamas Szekeres, szekerest@gmail.com
+ *
+ * (c) 2024 info@hobu.co
+ *
+ ******************************************************************************
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#include <algorithm>
+
+#include "gdal_alg.h"
+#include "gdal_priv_templates.hpp"
+
+#include "progress.h"
+#include "util.h"
+#include "viewshed.h"
+#include "viewshed_executor.h"
+
+/************************************************************************/
+/*                        GDALViewshedGenerate()                        */
+/************************************************************************/
+
+/**
+ * Create viewshed from raster DEM.
+ *
+ * This algorithm will generate a viewshed raster from an input DEM raster
+ * by using a modified algorithm of "Generating Viewsheds without Using
+ * Sightlines" published at
+ * https://www.asprs.org/wp-content/uploads/pers/2000journal/january/2000_jan_87-90.pdf
+ * This approach provides a relatively fast calculation, since the output raster
+ * is generated in a single scan. The gdal/apps/gdal_viewshed.cpp mainline can
+ * be used as an example of how to use this function. The output raster will be
+ * of type Byte or Float64.
+ *
+ * \note The algorithm as implemented currently will only output meaningful
+ * results if the georeferencing is in a projected coordinate reference system.
+ *
+ * @param hBand The band to read the DEM data from. Only the part of the raster
+ * within the specified maxdistance around the observer point is processed.
+ *
+ * @param pszDriverName Driver name (GTiff if set to NULL)
+ *
+ * @param pszTargetRasterName The name of the target raster to be generated.
+ * Must not be NULL
+ *
+ * @param papszCreationOptions creation options.
+ *
+ * @param dfObserverX observer X value (in SRS units)
+ *
+ * @param dfObserverY observer Y value (in SRS units)
+ *
+ * @param dfObserverHeight The height of the observer above the DEM surface.
+ *
+ * @param dfTargetHeight The height of the target above the DEM surface.
+ * (default 0)
+ *
+ * @param dfVisibleVal pixel value for visibility (default 255)
+ *
+ * @param dfInvisibleVal pixel value for invisibility (default 0)
+ *
+ * @param dfOutOfRangeVal The value to be set for the cells that fall outside of
+ * the range specified by dfMaxDistance.
+ *
+ * @param dfNoDataVal The value to be set for the cells that have no data.
+ *                    If set to a negative value, nodata is not set.
+ *                    Note: currently, no special processing of input cells at a
+ * nodata value is done (which may result in erroneous results).
+ *
+ * @param dfCurvCoeff Coefficient to consider the effect of the curvature and
+ * refraction. The height of the DEM is corrected according to the following
+ * formula: [Height] -= dfCurvCoeff * [Target Distance]^2 / [Earth Diameter] For
+ * the effect of the atmospheric refraction we can use 0.85714.
+ *
+ * @param eMode The mode of the viewshed calculation.
+ * Possible values GVM_Diagonal = 1, GVM_Edge = 2 (default), GVM_Max = 3,
+ * GVM_Min = 4.
+ *
+ * @param dfMaxDistance maximum distance range to compute viewshed.
+ *                      It is also used to clamp the extent of the output
+ * raster. If set to 0, then unlimited range is assumed, that is to say the
+ *                      computation is performed on the extent of the whole
+ * raster.
+ *
+ * @param pfnProgress A GDALProgressFunc that may be used to report progress
+ * to the user, or to interrupt the algorithm.  May be NULL if not required.
+ *
+ * @param pProgressArg The callback data for the pfnProgress function.
+ *
+ * @param heightMode Type of information contained in output raster. Possible
+ * values GVOT_NORMAL = 1 (default), GVOT_MIN_TARGET_HEIGHT_FROM_DEM = 2,
+ *                   GVOT_MIN_TARGET_HEIGHT_FROM_GROUND = 3
+ *
+ *                   GVOT_NORMAL returns a raster of type Byte containing
+ * visible locations.
+ *
+ *                   GVOT_MIN_TARGET_HEIGHT_FROM_DEM and
+ * GVOT_MIN_TARGET_HEIGHT_FROM_GROUND will return a raster of type Float64
+ * containing the minimum target height for target to be visible from the DEM
+ * surface or ground level respectively. Parameters dfTargetHeight, dfVisibleVal
+ * and dfInvisibleVal will be ignored.
+ *
+ *
+ * @param papszExtraOptions Future extra options. Must be set to NULL currently.
+ *
+ * @return not NULL output dataset on success (to be closed with GDALClose()) or
+ * NULL if an error occurs.
+ *
+ * @since GDAL 3.1
+ */
+GDALDatasetH GDALViewshedGenerate(
+    GDALRasterBandH hBand, const char *pszDriverName,
+    const char *pszTargetRasterName, CSLConstList papszCreationOptions,
+    double dfObserverX, double dfObserverY, double dfObserverHeight,
+    double dfTargetHeight, double dfVisibleVal, double dfInvisibleVal,
+    double dfOutOfRangeVal, double dfNoDataVal, double dfCurvCoeff,
+    GDALViewshedMode eMode, double dfMaxDistance, GDALProgressFunc pfnProgress,
+    void *pProgressArg, GDALViewshedOutputType heightMode,
+    [[maybe_unused]] CSLConstList papszExtraOptions)
+{
+    using namespace gdal;
+
+    viewshed::Options oOpts;
+    oOpts.outputFormat = pszDriverName;
+    oOpts.outputFilename = pszTargetRasterName;
+    oOpts.creationOpts = papszCreationOptions;
+    oOpts.observer.x = dfObserverX;
+    oOpts.observer.y = dfObserverY;
+    oOpts.observer.z = dfObserverHeight;
+    oOpts.targetHeight = dfTargetHeight;
+    oOpts.curveCoeff = dfCurvCoeff;
+    oOpts.maxDistance = dfMaxDistance;
+    oOpts.nodataVal = dfNoDataVal;
+
+    switch (eMode)
+    {
+        case GVM_Edge:
+            oOpts.cellMode = viewshed::CellMode::Edge;
+            break;
+        case GVM_Diagonal:
+            oOpts.cellMode = viewshed::CellMode::Diagonal;
+            break;
+        case GVM_Min:
+            oOpts.cellMode = viewshed::CellMode::Min;
+            break;
+        case GVM_Max:
+            oOpts.cellMode = viewshed::CellMode::Max;
+            break;
+    }
+
+    switch (heightMode)
+    {
+        case GVOT_MIN_TARGET_HEIGHT_FROM_DEM:
+            oOpts.outputMode = viewshed::OutputMode::DEM;
+            break;
+        case GVOT_MIN_TARGET_HEIGHT_FROM_GROUND:
+            oOpts.outputMode = viewshed::OutputMode::Ground;
+            break;
+        case GVOT_NORMAL:
+            oOpts.outputMode = viewshed::OutputMode::Normal;
+            break;
+    }
+
+    if (!GDALIsValueInRange<uint8_t>(dfVisibleVal))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "dfVisibleVal out of range. Must be [0, 255].");
+        return nullptr;
+    }
+    if (!GDALIsValueInRange<uint8_t>(dfInvisibleVal))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "dfInvisibleVal out of range. Must be [0, 255].");
+        return nullptr;
+    }
+    if (!GDALIsValueInRange<uint8_t>(dfOutOfRangeVal))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "dfOutOfRangeVal out of range. Must be [0, 255].");
+        return nullptr;
+    }
+    oOpts.visibleVal = dfVisibleVal;
+    oOpts.invisibleVal = dfInvisibleVal;
+    oOpts.outOfRangeVal = dfOutOfRangeVal;
+
+    gdal::viewshed::Viewshed v(oOpts);
+
+    if (!pfnProgress)
+        pfnProgress = GDALDummyProgress;
+    v.run(hBand, pfnProgress, pProgressArg);
+
+    return GDALDataset::FromHandle(v.output().release());
+}
+
+namespace gdal
+{
+namespace viewshed
+{
+
+namespace
+{
+
+bool getTransforms(GDALRasterBand &band, double *pFwdTransform,
+                   double *pRevTransform)
+{
+    band.GetDataset()->GetGeoTransform(pFwdTransform);
+    if (!GDALInvGeoTransform(pFwdTransform, pRevTransform))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Cannot invert geotransform");
+        return false;
+    }
+    return true;
+}
+
+}  // unnamed namespace
+
+Viewshed::Viewshed(const Options &opts) : oOpts{opts}
+{
+}
+
+Viewshed::~Viewshed() = default;
+
+/// Calculate the extent of the output raster in terms of the input raster and
+/// save the input raster extent.
+///
+/// @return  false on error, true otherwise
+bool Viewshed::calcExtents(int nX, int nY,
+                           const std::array<double, 6> &adfInvTransform)
+{
+    // We start with the assumption that the output size matches the input.
+    oOutExtent.xStop = GDALGetRasterBandXSize(pSrcBand);
+    oOutExtent.yStop = GDALGetRasterBandYSize(pSrcBand);
+
+    if (!oOutExtent.contains(nX, nY))
+        CPLError(CE_Warning, CPLE_AppDefined,
+                 "NOTE: The observer location falls outside of the DEM area");
+
+    constexpr double EPSILON = 1e-8;
+    if (oOpts.maxDistance > 0)
+    {
+        //ABELL - This assumes that the transformation is only a scaling. Should be fixed.
+        //  Find the distance in the direction of the transformed unit vector in the X and Y
+        //  directions and use those factors to determine the limiting values in the raster space.
+        int nXStart = static_cast<int>(
+            std::floor(nX - adfInvTransform[1] * oOpts.maxDistance + EPSILON));
+        int nXStop = static_cast<int>(
+            std::ceil(nX + adfInvTransform[1] * oOpts.maxDistance - EPSILON) +
+            1);
+        int nYStart =
+            static_cast<int>(std::floor(
+                nY - std::fabs(adfInvTransform[5]) * oOpts.maxDistance +
+                EPSILON)) -
+            (adfInvTransform[5] > 0 ? 1 : 0);
+        int nYStop = static_cast<int>(
+            std::ceil(nY + std::fabs(adfInvTransform[5]) * oOpts.maxDistance -
+                      EPSILON) +
+            (adfInvTransform[5] < 0 ? 1 : 0));
+
+        // If the limits are invalid, set the window size to zero to trigger the error below.
+        if (nXStart >= oOutExtent.xStop || nXStop < 0 ||
+            nYStart >= oOutExtent.yStop || nYStop < 0)
+        {
+            oOutExtent = Window();
+        }
+        else
+        {
+            oOutExtent.xStart = std::max(nXStart, 0);
+            oOutExtent.xStop = std::min(nXStop, oOutExtent.xStop);
+
+            oOutExtent.yStart = std::max(nYStart, 0);
+            oOutExtent.yStop = std::min(nYStop, oOutExtent.yStop);
+        }
+    }
+
+    if (oOutExtent.xSize() == 0 || oOutExtent.ySize() == 0)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Invalid target raster size due to transform "
+                 "and/or distance limitation.");
+        return false;
+    }
+
+    // normalize horizontal index to [ 0, oOutExtent.xSize() )
+    oCurExtent = oOutExtent;
+    oCurExtent.shiftX(-oOutExtent.xStart);
+
+    return true;
+}
+
+/// Compute the viewshed of a raster band.
+///
+/// @param band  Pointer to the raster band to be processed.
+/// @param pfnProgress  Pointer to the progress function. Can be null.
+/// @param pProgressArg  Argument passed to the progress function
+/// @return  True on success, false otherwise.
+bool Viewshed::run(GDALRasterBandH band, GDALProgressFunc pfnProgress,
+                   void *pProgressArg)
+{
+    pSrcBand = static_cast<GDALRasterBand *>(band);
+
+    std::array<double, 6> adfFwdTransform;
+    std::array<double, 6> adfInvTransform;
+    if (!getTransforms(*pSrcBand, adfFwdTransform.data(),
+                       adfInvTransform.data()))
+        return false;
+
+    // calculate observer position
+    double dfX, dfY;
+    GDALApplyGeoTransform(adfInvTransform.data(), oOpts.observer.x,
+                          oOpts.observer.y, &dfX, &dfY);
+    if (!GDALIsValueInRange<int>(dfX))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Observer X value out of range");
+        return false;
+    }
+    if (!GDALIsValueInRange<int>(dfY))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Observer Y value out of range");
+        return false;
+    }
+    int nX = static_cast<int>(dfX);
+    int nY = static_cast<int>(dfY);
+
+    // Must calculate extents in order to make the output dataset.
+    if (!calcExtents(nX, nY, adfInvTransform))
+        return false;
+
+    poDstDS = createOutputDataset(*pSrcBand, oOpts, oOutExtent);
+    if (!poDstDS)
+        return false;
+
+    // Create the progress reporter.
+    Progress oProgress(pfnProgress, pProgressArg, oOutExtent.ySize());
+
+    // Execute the viewshed algorithm.
+    GDALRasterBand *pDstBand = poDstDS->GetRasterBand(1);
+    ViewshedExecutor executor(*pSrcBand, *pDstBand, nX, nY, oOutExtent,
+                              oCurExtent, oOpts, oProgress);
+    executor.run();
+    oProgress.emit(1);
+    return static_cast<bool>(poDstDS);
+}
+
+}  // namespace viewshed
+}  // namespace gdal
diff --git a/alg/viewshed/viewshed.h b/alg/viewshed/viewshed.h
new file mode 100644
index 000000000000..648e939323f1
--- /dev/null
+++ b/alg/viewshed/viewshed.h
@@ -0,0 +1,89 @@
+/******************************************************************************
+ *
+ * Project:  Viewshed Generation
+ * Purpose:  Core algorithm implementation for viewshed generation.
+ * Author:   Tamas Szekeres, szekerest@gmail.com
+ *
+ * (c) 2024 info@hobu.co
+ *
+ ******************************************************************************
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#ifndef VIEWSHED_H_INCLUDED
+#define VIEWSHED_H_INCLUDED
+
+#include <algorithm>
+#include <array>
+#include <cstdint>
+#include <functional>
+#include <limits>
+#include <memory>
+#include <mutex>
+#include <queue>
+#include <string>
+
+#include "cpl_progress.h"
+#include "gdal_priv.h"
+#include "viewshed_types.h"
+
+namespace gdal
+{
+namespace viewshed
+{
+
+/**
+ * Class to support viewshed raster generation.
+ */
+class Viewshed
+{
+  public:
+    /**
+     * Constructor.
+     *
+     * @param opts Options to use when calculating viewshed.
+    */
+    CPL_DLL explicit Viewshed(const Options &opts);
+
+    /** Destructor */
+    CPL_DLL ~Viewshed();
+
+    CPL_DLL bool run(GDALRasterBandH hBand,
+                     GDALProgressFunc pfnProgress = GDALDummyProgress,
+                     void *pProgressArg = nullptr);
+
+    /**
+     * Fetch a pointer to the created raster band.
+     *
+     * @return  Unique pointer to the viewshed dataset.
+    */
+    CPL_DLL DatasetPtr output()
+    {
+        return std::move(poDstDS);
+    }
+
+  private:
+    Options oOpts;
+    Window oOutExtent{};
+    Window oCurExtent{};
+    DatasetPtr poDstDS{};
+    GDALRasterBand *pSrcBand = nullptr;
+
+    DatasetPtr execute(int nX, int nY, const std::string &outFilename);
+    void setOutput(double &dfResult, double &dfCellVal, double dfZ);
+    double calcHeight(double dfZ, double dfZ2);
+    bool readLine(int nLine, double *data);
+    std::pair<int, int> adjustHeight(int iLine, int nX,
+                                     std::vector<double> &thisLineVal);
+    bool calcExtents(int nX, int nY,
+                     const std::array<double, 6> &adfInvTransform);
+
+    Viewshed(const Viewshed &) = delete;
+    Viewshed &operator=(const Viewshed &) = delete;
+};
+
+}  // namespace viewshed
+}  // namespace gdal
+
+#endif
diff --git a/alg/viewshed/viewshed_executor.cpp b/alg/viewshed/viewshed_executor.cpp
new file mode 100644
index 000000000000..3f54937553ca
--- /dev/null
+++ b/alg/viewshed/viewshed_executor.cpp
@@ -0,0 +1,671 @@
+/******************************************************************************
+ *
+ * Project:  Viewshed Generation
+ * Purpose:  Core algorithm implementation for viewshed generation.
+ * Author:   Tamas Szekeres, szekerest@gmail.com
+ *
+ * (c) 2024 info@hobu.co
+ *
+ ******************************************************************************
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#include <algorithm>
+#include <atomic>
+#include <cassert>
+#include <limits>
+
+#include "viewshed_executor.h"
+#include "progress.h"
+
+namespace gdal
+{
+namespace viewshed
+{
+
+namespace
+{
+
+/// Calculate the height at nDistance units along a line through the origin given the height
+/// at nDistance - 1 units along the line.
+/// \param nDistance  Distance along the line for the target point.
+/// \param Za  Height at the line one unit previous to the target point.
+double CalcHeightLine(int nDistance, double Za)
+{
+    nDistance = std::abs(nDistance);
+    assert(nDistance != 1);
+    return Za * nDistance / (nDistance - 1);
+}
+
+// Calculate the height Zc of a point (i, j, Zc) given a line through the origin (0, 0, 0)
+// and passing through the line connecting (i - 1, j, Za) and (i, j - 1, Zb).
+// In other words, the origin and the two points form a plane and we're calculating Zc
+// of the point (i, j, Zc), also on the plane.
+double CalcHeightDiagonal(int i, int j, double Za, double Zb)
+{
+    return (Za * i + Zb * j) / (i + j - 1);
+}
+
+// Calculate the height Zc of a point (i, j, Zc) given a line through the origin (0, 0, 0)
+// and through the line connecting (i -1, j - 1, Za) and (i - 1, j, Zb). In other words,
+// the origin and the other two points form a plane and we're calculating Zc of the
+// point (i, j, Zc), also on the plane.
+double CalcHeightEdge(int i, int j, double Za, double Zb)
+{
+    assert(i != j);
+    return (Za * i + Zb * (j - i)) / (j - 1);
+}
+
+double doDiagonal(int nXOffset, [[maybe_unused]] int nYOffset,
+                  double dfThisPrev, double dfLast,
+                  [[maybe_unused]] double dfLastPrev)
+{
+    return CalcHeightDiagonal(nXOffset, nYOffset, dfThisPrev, dfLast);
+}
+
+double doEdge(int nXOffset, int nYOffset, double dfThisPrev, double dfLast,
+              double dfLastPrev)
+{
+    if (nXOffset >= nYOffset)
+        return CalcHeightEdge(nYOffset, nXOffset, dfLastPrev, dfThisPrev);
+    else
+        return CalcHeightEdge(nXOffset, nYOffset, dfLastPrev, dfLast);
+}
+
+double doMin(int nXOffset, int nYOffset, double dfThisPrev, double dfLast,
+             double dfLastPrev)
+{
+    double dfEdge = doEdge(nXOffset, nYOffset, dfThisPrev, dfLast, dfLastPrev);
+    double dfDiagonal =
+        doDiagonal(nXOffset, nYOffset, dfThisPrev, dfLast, dfLastPrev);
+    return std::min(dfEdge, dfDiagonal);
+}
+
+double doMax(int nXOffset, int nYOffset, double dfThisPrev, double dfLast,
+             double dfLastPrev)
+{
+    double dfEdge = doEdge(nXOffset, nYOffset, dfThisPrev, dfLast, dfLastPrev);
+    double dfDiagonal =
+        doDiagonal(nXOffset, nYOffset, dfThisPrev, dfLast, dfLastPrev);
+    return std::max(dfEdge, dfDiagonal);
+}
+
+}  // unnamed namespace
+
+/// Constructor -- the viewshed algorithm executor
+/// @param srcBand  Source raster band
+/// @param dstBand  Destination raster band
+/// @param nX  X position of observer
+/// @param nY  Y position of observer
+/// @param outExtent  Extent of output raster (relative to input)
+/// @param curExtent  Extent of active raster.
+/// @param opts  Configuration options.
+/// @param progress  Reference to the progress tracker.
+ViewshedExecutor::ViewshedExecutor(GDALRasterBand &srcBand,
+                                   GDALRasterBand &dstBand, int nX, int nY,
+                                   const Window &outExtent,
+                                   const Window &curExtent, const Options &opts,
+                                   Progress &progress)
+    : m_pool(4), m_srcBand(srcBand), m_dstBand(dstBand), oOutExtent(outExtent),
+      oCurExtent(curExtent), m_nX(nX - oOutExtent.xStart), m_nY(nY),
+      oOpts(opts), oProgress(progress),
+      m_dfMaxDistance2(opts.maxDistance * opts.maxDistance)
+{
+    if (m_dfMaxDistance2 == 0)
+        m_dfMaxDistance2 = std::numeric_limits<double>::max();
+    m_srcBand.GetDataset()->GetGeoTransform(m_adfTransform.data());
+}
+
+// calculate the height adjustment factor.
+double ViewshedExecutor::calcHeightAdjFactor()
+{
+    std::lock_guard g(oMutex);
+
+    const OGRSpatialReference *poDstSRS =
+        m_dstBand.GetDataset()->GetSpatialRef();
+
+    if (poDstSRS)
+    {
+        OGRErr eSRSerr;
+
+        // If we can't get a SemiMajor axis from the SRS, it will be SRS_WGS84_SEMIMAJOR
+        double dfSemiMajor = poDstSRS->GetSemiMajor(&eSRSerr);
+
+        /* If we fetched the axis from the SRS, use it */
+        if (eSRSerr != OGRERR_FAILURE)
+            return oOpts.curveCoeff / (dfSemiMajor * 2.0);
+
+        CPLDebug("GDALViewshedGenerate",
+                 "Unable to fetch SemiMajor axis from spatial reference");
+    }
+    return 0;
+}
+
+/// Set the output Z value depending on the observable height and computation mode.
+///
+/// dfResult  Reference to the result cell
+/// dfCellVal  Reference to the current cell height. Replace with observable height.
+/// dfZ  Minimum observable height at cell.
+void ViewshedExecutor::setOutput(double &dfResult, double &dfCellVal,
+                                 double dfZ)
+{
+    if (oOpts.outputMode != OutputMode::Normal)
+    {
+        dfResult += (dfZ - dfCellVal);
+        dfResult = std::max(0.0, dfResult);
+    }
+    else
+        dfResult = (dfCellVal + oOpts.targetHeight < dfZ) ? oOpts.invisibleVal
+                                                          : oOpts.visibleVal;
+    dfCellVal = std::max(dfCellVal, dfZ);
+}
+
+/// Read a line of raster data.
+///
+/// @param  nLine  Line number to read.
+/// @param  data  Pointer to location in which to store data.
+/// @return  Success or failure.
+bool ViewshedExecutor::readLine(int nLine, double *data)
+{
+    std::lock_guard g(iMutex);
+
+    if (GDALRasterIO(&m_srcBand, GF_Read, oOutExtent.xStart, nLine,
+                     oOutExtent.xSize(), 1, data, oOutExtent.xSize(), 1,
+                     GDT_Float64, 0, 0))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "RasterIO error when reading DEM at position (%d,%d), "
+                 "size (%d,%d)",
+                 oOutExtent.xStart, nLine, oOutExtent.xSize(), 1);
+        return false;
+    }
+    return true;
+}
+
+/// Write an output line of either visibility or height data.
+///
+/// @param  nLine  Line number being written.
+/// @param vResult  Result line to write.
+/// @return  True on success, false otherwise.
+bool ViewshedExecutor::writeLine(int nLine, std::vector<double> &vResult)
+{
+    // GDALRasterIO isn't thread-safe.
+    std::lock_guard g(oMutex);
+
+    if (GDALRasterIO(&m_dstBand, GF_Write, 0, nLine - oOutExtent.yStart,
+                     oOutExtent.xSize(), 1, vResult.data(), oOutExtent.xSize(),
+                     1, GDT_Float64, 0, 0))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "RasterIO error when writing target raster at position "
+                 "(%d,%d), size (%d,%d)",
+                 0, nLine - oOutExtent.yStart, oOutExtent.xSize(), 1);
+        return false;
+    }
+    return true;
+}
+
+/// Adjust the height of the line of data by the observer height and the curvature of the
+/// earth.
+///
+/// @param  nYOffset  Y offset of the line being adjusted.
+/// @param  vThisLineVal  Line height data.
+/// @return [left, right)  Leftmost and one past the rightmost cell in the line within
+///    the max distance. Indices are limited to the raster extent (right may be just
+///    outside the raster).
+std::pair<int, int>
+ViewshedExecutor::adjustHeight(int nYOffset, std::vector<double> &vThisLineVal)
+{
+    int nLeft = 0;
+    int nRight = oCurExtent.xSize();
+
+    // Find the starting point in the raster (m_nX may be outside)
+    int nXStart = oCurExtent.clampX(m_nX);
+
+    // If there is a height adjustment factor other than zero or a max distance,
+    // calculate the adjusted height of the cell, stopping if we've exceeded the max
+    // distance.
+    if (static_cast<bool>(m_dfHeightAdjFactor) || m_dfMaxDistance2 > 0)
+    {
+        // Hoist invariants from the loops.
+        const double dfLineX = m_adfTransform[2] * nYOffset;
+        const double dfLineY = m_adfTransform[5] * nYOffset;
+
+        // Go left
+        double *pdfHeight = vThisLineVal.data() + nXStart;
+        for (int nXOffset = nXStart - m_nX; nXOffset >= -m_nX;
+             nXOffset--, pdfHeight--)
+        {
+            double dfX = m_adfTransform[1] * nXOffset + dfLineX;
+            double dfY = m_adfTransform[4] * nXOffset + dfLineY;
+            double dfR2 = dfX * dfX + dfY * dfY;
+            if (dfR2 > m_dfMaxDistance2)
+            {
+                nLeft = nXOffset + m_nX + 1;
+                break;
+            }
+            *pdfHeight -= m_dfHeightAdjFactor * dfR2 + m_dfZObserver;
+        }
+
+        // Go right.
+        pdfHeight = vThisLineVal.data() + nXStart + 1;
+        for (int nXOffset = nXStart - m_nX + 1;
+             nXOffset < oCurExtent.xSize() - m_nX; nXOffset++, pdfHeight++)
+        {
+            double dfX = m_adfTransform[1] * nXOffset + dfLineX;
+            double dfY = m_adfTransform[4] * nXOffset + dfLineY;
+            double dfR2 = dfX * dfX + dfY * dfY;
+            if (dfR2 > m_dfMaxDistance2)
+            {
+                nRight = nXOffset + m_nX;
+                break;
+            }
+            *pdfHeight -= m_dfHeightAdjFactor * dfR2 + m_dfZObserver;
+        }
+    }
+    else
+    {
+        // No curvature adjustment. Just normalize for the observer height.
+        double *pdfHeight = vThisLineVal.data();
+        for (int i = 0; i < oCurExtent.xSize(); ++i)
+        {
+            *pdfHeight -= m_dfZObserver;
+            pdfHeight++;
+        }
+    }
+    return {nLeft, nRight};
+}
+
+/// Process the first line (the one with the Y coordinate the same as the observer).
+///
+/// @param vLastLineVal  Vector in which to store the read line. Becomes the last line
+///    in further processing.
+/// @return True on success, false otherwise.
+bool ViewshedExecutor::processFirstLine(std::vector<double> &vLastLineVal)
+{
+    int nLine = oOutExtent.clampY(m_nY);
+    int nYOffset = nLine - m_nY;
+
+    std::vector<double> vResult(oOutExtent.xSize());
+    std::vector<double> vThisLineVal(oOutExtent.xSize());
+
+    if (!readLine(nLine, vThisLineVal.data()))
+        return false;
+
+    // If the observer is outside of the raster, take the specified value as the Z height,
+    // otherwise, take it as an offset from the raster height at that location.
+    m_dfZObserver = oOpts.observer.z;
+    if (oCurExtent.containsX(m_nX))
+    {
+        m_dfZObserver += vThisLineVal[m_nX];
+        if (oOpts.outputMode == OutputMode::Normal)
+            vResult[m_nX] = oOpts.visibleVal;
+    }
+    m_dfHeightAdjFactor = calcHeightAdjFactor();
+
+    // In DEM mode the base is the pre-adjustment value.  In ground mode the base is zero.
+    if (oOpts.outputMode == OutputMode::DEM)
+        vResult = vThisLineVal;
+
+    // iLeft and iRight are the processing limits for the line.
+    const auto [iLeft, iRight] = adjustHeight(nYOffset, vThisLineVal);
+
+    if (!oCurExtent.containsY(m_nY))
+        processFirstLineTopOrBottom(iLeft, iRight, vResult, vThisLineVal);
+    else
+    {
+        CPLJobQueuePtr pQueue = m_pool.CreateJobQueue();
+        pQueue->SubmitJob(
+            [&, left = iLeft]() {
+                processFirstLineLeft(m_nX - 1, left - 1, vResult, vThisLineVal);
+            });
+
+        pQueue->SubmitJob(
+            [&, right = iRight]()
+            { processFirstLineRight(m_nX + 1, right, vResult, vThisLineVal); });
+        pQueue->WaitCompletion();
+    }
+
+    // Make the current line the last line.
+    vLastLineVal = std::move(vThisLineVal);
+
+    // Create the output writer.
+    if (!writeLine(nLine, vResult))
+        return false;
+
+    return oProgress.lineComplete();
+}
+
+// If the observer is above or below the raster, set all cells in the first line near the
+// observer as observable provided they're in range. Mark cells out of range as such.
+/// @param  iLeft  Leftmost observable raster position in range of the target line.
+/// @param  iRight One past the rightmost observable raster position of the target line.
+/// @param  vResult  Result line.
+/// @param  vThisLineVal  Heights of the cells in the target line
+void ViewshedExecutor::processFirstLineTopOrBottom(
+    int iLeft, int iRight, std::vector<double> &vResult,
+    std::vector<double> &vThisLineVal)
+{
+    double *pResult = vResult.data() + iLeft;
+    double *pThis = vThisLineVal.data() + iLeft;
+    for (int iPixel = iLeft; iPixel < iRight; ++iPixel, ++pResult, pThis++)
+    {
+        if (oOpts.outputMode == OutputMode::Normal)
+            *pResult = oOpts.visibleVal;
+        else
+            setOutput(*pResult, *pThis, *pThis);
+    }
+    std::fill(vResult.begin(), vResult.begin() + iLeft, oOpts.outOfRangeVal);
+    std::fill(vResult.begin() + iRight, vResult.begin() + oCurExtent.xStop,
+              oOpts.outOfRangeVal);
+}
+
+/// Process the part of the first line to the left of the observer.
+///
+/// @param iStart  X coordinate of the first cell to the left of the observer to be procssed.
+/// @param iEnd  X coordinate one past the last cell to be processed.
+/// @param vResult  Vector in which to store the visibility/height results.
+/// @param vThisLineVal  Height of each cell in the line being processed.
+void ViewshedExecutor::processFirstLineLeft(int iStart, int iEnd,
+                                            std::vector<double> &vResult,
+                                            std::vector<double> &vThisLineVal)
+{
+    // If end is to the right of start, everything is taken care of by right processing.
+    if (iEnd >= iStart)
+        return;
+
+    iStart = oCurExtent.clampX(iStart);
+
+    double *pThis = vThisLineVal.data() + iStart;
+
+    // If the start cell is next to the observer, just mark it visible.
+    if (iStart + 1 == m_nX || iStart + 1 == oCurExtent.xStop)
+    {
+        if (oOpts.outputMode == OutputMode::Normal)
+            vResult[iStart] = oOpts.visibleVal;
+        else
+            setOutput(vResult[iStart], *pThis, *pThis);
+        iStart--;
+        pThis--;
+    }
+
+    // Go from the observer to the left, calculating Z as we go.
+    for (int iPixel = iStart; iPixel > iEnd; iPixel--, pThis--)
+    {
+        int nXOffset = std::abs(iPixel - m_nX);
+        double dfZ = CalcHeightLine(nXOffset, *(pThis + 1));
+        setOutput(vResult[iPixel], *pThis, dfZ);
+    }
+    // For cells outside of the [start, end) range, set the outOfRange value.
+    std::fill(vResult.begin(), vResult.begin() + iEnd + 1, oOpts.outOfRangeVal);
+}
+
+/// Process the part of the first line to the right of the observer.
+///
+/// @param iStart  X coordinate of the first cell to the right of the observer to be processed.
+/// @param iEnd  X coordinate one past the last cell to be processed.
+/// @param vResult  Vector in which to store the visibility/height results.
+/// @param vThisLineVal  Height of each cell in the line being processed.
+void ViewshedExecutor::processFirstLineRight(int iStart, int iEnd,
+                                             std::vector<double> &vResult,
+                                             std::vector<double> &vThisLineVal)
+{
+    // If start is to the right of end, everything is taken care of by left processing.
+    if (iStart >= iEnd)
+        return;
+
+    iStart = oCurExtent.clampX(iStart);
+
+    double *pThis = vThisLineVal.data() + iStart;
+
+    // If the start cell is next to the observer, just mark it visible.
+    if (iStart - 1 == m_nX || iStart == oCurExtent.xStart)
+    {
+        if (oOpts.outputMode == OutputMode::Normal)
+            vResult[iStart] = oOpts.visibleVal;
+        else
+            setOutput(vResult[iStart], *pThis, *pThis);
+        iStart++;
+        pThis++;
+    }
+
+    // Go from the observer to the right, calculating Z as we go.
+    for (int iPixel = iStart; iPixel < iEnd; iPixel++, pThis++)
+    {
+        int nXOffset = std::abs(iPixel - m_nX);
+        double dfZ = CalcHeightLine(nXOffset, *(pThis - 1));
+        setOutput(vResult[iPixel], *pThis, dfZ);
+    }
+    // For cells outside of the [start, end) range, set the outOfRange value.
+    std::fill(vResult.begin() + iEnd, vResult.end(), oOpts.outOfRangeVal);
+}
+
+/// Process a line to the left of the observer.
+///
+/// @param nYOffset  Offset of the line being processed from the observer
+/// @param iStart  X coordinate of the first cell to the left of the observer to be processed.
+/// @param iEnd  X coordinate one past the last cell to be processed.
+/// @param vResult  Vector in which to store the visibility/height results.
+/// @param vThisLineVal  Height of each cell in the line being processed.
+/// @param vLastLineVal  Observable height of each cell in the previous line processed.
+void ViewshedExecutor::processLineLeft(int nYOffset, int iStart, int iEnd,
+                                       std::vector<double> &vResult,
+                                       std::vector<double> &vThisLineVal,
+                                       std::vector<double> &vLastLineVal)
+{
+    // If start to the left of end, everything is taken care of by processing right.
+    if (iStart <= iEnd)
+        return;
+    iStart = oCurExtent.clampX(iStart);
+
+    nYOffset = std::abs(nYOffset);
+    double *pThis = vThisLineVal.data() + iStart;
+    double *pLast = vLastLineVal.data() + iStart;
+
+    // If the observer is to the right of the raster, mark the first cell to the left as
+    // visible. This may mark an out-of-range cell with a value, but this will be fixed
+    // with the out of range assignment at the end.
+    if (iStart == oCurExtent.xStop - 1)
+    {
+        if (oOpts.outputMode == OutputMode::Normal)
+            vResult[iStart] = oOpts.visibleVal;
+        else
+            setOutput(vResult[iStart], *pThis, *pThis);
+        iStart--;
+        pThis--;
+        pLast--;
+    }
+
+    // Go from the observer to the left, calculating Z as we go.
+    for (int iPixel = iStart; iPixel > iEnd; iPixel--, pThis--, pLast--)
+    {
+        int nXOffset = std::abs(iPixel - m_nX);
+        double dfZ;
+        if (nXOffset == nYOffset)
+        {
+            if (nXOffset == 1)
+                dfZ = *pThis;
+            else
+                dfZ = CalcHeightLine(nXOffset, *(pLast + 1));
+        }
+        else
+            dfZ =
+                oZcalc(nXOffset, nYOffset, *(pThis + 1), *pLast, *(pLast + 1));
+        setOutput(vResult[iPixel], *pThis, dfZ);
+    }
+
+    // For cells outside of the [start, end) range, set the outOfRange value.
+    std::fill(vResult.begin(), vResult.begin() + iEnd + 1, oOpts.outOfRangeVal);
+}
+
+/// Process a line to the right of the observer.
+///
+/// @param nYOffset  Offset of the line being processed from the observer
+/// @param iStart  X coordinate of the first cell to the right of the observer to be processed.
+/// @param iEnd  X coordinate one past the last cell to be processed.
+/// @param vResult  Vector in which to store the visibility/height results.
+/// @param vThisLineVal  Height of each cell in the line being processed.
+/// @param vLastLineVal  Observable height of each cell in the previous line processed.
+void ViewshedExecutor::processLineRight(int nYOffset, int iStart, int iEnd,
+                                        std::vector<double> &vResult,
+                                        std::vector<double> &vThisLineVal,
+                                        std::vector<double> &vLastLineVal)
+{
+    // If start is to the right of end, everything is taken care of by processing left.
+    if (iStart >= iEnd)
+        return;
+    iStart = oCurExtent.clampX(iStart);
+
+    nYOffset = std::abs(nYOffset);
+    double *pThis = vThisLineVal.data() + iStart;
+    double *pLast = vLastLineVal.data() + iStart;
+
+    // If the observer is to the left of the raster, mark the first cell to the right as
+    // visible. This may mark an out-of-range cell with a value, but this will be fixed
+    // with the out of range assignment at the end.
+    if (iStart == 0)
+    {
+        if (oOpts.outputMode == OutputMode::Normal)
+            vResult[iStart] = oOpts.visibleVal;
+        else
+            setOutput(vResult[0], *pThis, *pThis);
+        iStart++;
+        pThis++;
+        pLast++;
+    }
+
+    // Go from the observer to the right, calculating Z as we go.
+    for (int iPixel = iStart; iPixel < iEnd; iPixel++, pThis++, pLast++)
+    {
+        int nXOffset = std::abs(iPixel - m_nX);
+        double dfZ;
+        if (nXOffset == nYOffset)
+        {
+            if (nXOffset == 1)
+                dfZ = *pThis;
+            else
+                dfZ = CalcHeightLine(nXOffset, *(pLast - 1));
+        }
+        else
+            dfZ =
+                oZcalc(nXOffset, nYOffset, *(pThis - 1), *pLast, *(pLast - 1));
+        setOutput(vResult[iPixel], *pThis, dfZ);
+    }
+
+    // For cells outside of the [start, end) range, set the outOfRange value.
+    std::fill(vResult.begin() + iEnd, vResult.end(), oOpts.outOfRangeVal);
+}
+
+/// Process a line above or below the observer.
+///
+/// @param nLine  Line number being processed.
+/// @param vLastLineVal  Vector in which to store the read line. Becomes the last line
+///    in further processing.
+/// @return True on success, false otherwise.
+bool ViewshedExecutor::processLine(int nLine, std::vector<double> &vLastLineVal)
+{
+    int nYOffset = nLine - m_nY;
+    std::vector<double> vResult(oOutExtent.xSize());
+    std::vector<double> vThisLineVal(oOutExtent.xSize());
+
+    if (!readLine(nLine, vThisLineVal.data()))
+        return false;
+
+    // In DEM mode the base is the input DEM value.
+    // In ground mode the base is zero.
+    if (oOpts.outputMode == OutputMode::DEM)
+        vResult = vThisLineVal;
+
+    // Adjust height of the read line.
+    const auto [iLeft, iRight] = adjustHeight(nYOffset, vThisLineVal);
+
+    // Handle the initial position on the line.
+    if (oCurExtent.containsX(m_nX))
+    {
+        if (iLeft < iRight)
+        {
+            double dfZ;
+            if (std::abs(nYOffset) == 1)
+                dfZ = vThisLineVal[m_nX];
+            else
+                dfZ = CalcHeightLine(nYOffset, vLastLineVal[m_nX]);
+            setOutput(vResult[m_nX], vThisLineVal[m_nX], dfZ);
+        }
+        else
+            vResult[m_nX] = oOpts.outOfRangeVal;
+    }
+
+    // process left half then right half of line
+    CPLJobQueuePtr pQueue = m_pool.CreateJobQueue();
+    pQueue->SubmitJob(
+        [&, left = iLeft]()
+        {
+            processLineLeft(nYOffset, m_nX - 1, left - 1, vResult, vThisLineVal,
+                            vLastLineVal);
+        });
+    pQueue->SubmitJob(
+        [&, right = iRight]()
+        {
+            processLineRight(nYOffset, m_nX + 1, right, vResult, vThisLineVal,
+                             vLastLineVal);
+        });
+    pQueue->WaitCompletion();
+
+    // Make the current line the last line.
+    vLastLineVal = std::move(vThisLineVal);
+
+    if (!writeLine(nLine, vResult))
+        return false;
+
+    return oProgress.lineComplete();
+}
+
+/// Run the viewshed computation
+/// @return  Success as true or false.
+bool ViewshedExecutor::run()
+{
+    std::vector<double> vFirstLineVal(oCurExtent.xSize());
+    if (!processFirstLine(vFirstLineVal))
+        return false;
+
+    if (oOpts.cellMode == CellMode::Edge)
+        oZcalc = doEdge;
+    else if (oOpts.cellMode == CellMode::Diagonal)
+        oZcalc = doDiagonal;
+    else if (oOpts.cellMode == CellMode::Min)
+        oZcalc = doMin;
+    else if (oOpts.cellMode == CellMode::Max)
+        oZcalc = doMax;
+
+    // scan upwards
+    int yStart = oCurExtent.clampY(m_nY);
+    std::atomic<bool> err(false);
+    CPLJobQueuePtr pQueue = m_pool.CreateJobQueue();
+    pQueue->SubmitJob(
+        [&]()
+        {
+            std::vector<double> vLastLineVal = vFirstLineVal;
+
+            for (int nLine = yStart - 1; nLine >= oCurExtent.yStart && !err;
+                 nLine--)
+                if (!processLine(nLine, vLastLineVal))
+                    err = true;
+        });
+
+    // scan downwards
+    pQueue->SubmitJob(
+        [&]()
+        {
+            std::vector<double> vLastLineVal = vFirstLineVal;
+
+            for (int nLine = yStart + 1; nLine < oCurExtent.yStop && !err;
+                 nLine++)
+                if (!processLine(nLine, vLastLineVal))
+                    err = true;
+        });
+    return true;
+}
+
+}  // namespace viewshed
+}  // namespace gdal
diff --git a/alg/viewshed/viewshed_executor.h b/alg/viewshed/viewshed_executor.h
new file mode 100644
index 000000000000..6224242c496d
--- /dev/null
+++ b/alg/viewshed/viewshed_executor.h
@@ -0,0 +1,87 @@
+/******************************************************************************
+ *
+ * Project:  Viewshed Generation
+ * Purpose:  Core algorithm implementation for viewshed generation.
+ * Author:   Tamas Szekeres, szekerest@gmail.com
+ *
+ * (c) 2024 info@hobu.co
+ *
+ ******************************************************************************
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#pragma once
+
+#include <array>
+#include <mutex>
+
+#include "gdal_priv.h"
+#include "cpl_worker_thread_pool.h"
+
+#include "viewshed_types.h"
+
+namespace gdal
+{
+namespace viewshed
+{
+
+class Progress;
+
+/// Executes a viewshed computation on a source band, placing the result
+/// in the destination band.
+class ViewshedExecutor
+{
+  public:
+    ViewshedExecutor(GDALRasterBand &srcBand, GDALRasterBand &dstBand, int nX,
+                     int nY, const Window &oOutExtent, const Window &oCurExtent,
+                     const Options &opts, Progress &oProgress);
+    bool run();
+
+  private:
+    CPLWorkerThreadPool m_pool;
+    GDALRasterBand &m_srcBand;
+    GDALRasterBand &m_dstBand;
+    const Window oOutExtent;
+    const Window oCurExtent;
+    const int m_nX;
+    const int m_nY;
+    const Options oOpts;
+    Progress &oProgress;
+    double m_dfHeightAdjFactor{0};
+    double m_dfMaxDistance2;
+    double m_dfZObserver{0};
+    std::mutex iMutex{};
+    std::mutex oMutex{};
+    std::array<double, 6> m_adfTransform{0, 1, 0, 0, 0, 1};
+    double (*oZcalc)(int, int, double, double, double){};
+
+    double calcHeightAdjFactor();
+    void setOutput(double &dfResult, double &dfCellVal, double dfZ);
+    bool readLine(int nLine, double *data);
+    bool writeLine(int nLine, std::vector<double> &vResult);
+    bool processLine(int nLine, std::vector<double> &vLastLineVal);
+    bool processFirstLine(std::vector<double> &vLastLineVal);
+    void processFirstLineLeft(int iStart, int iEnd,
+                              std::vector<double> &vResult,
+                              std::vector<double> &vThisLineVal);
+    void processFirstLineRight(int iStart, int iEnd,
+                               std::vector<double> &vResult,
+                               std::vector<double> &vThisLineVal);
+    void processFirstLineTopOrBottom(int iLeft, int iRight,
+                                     std::vector<double> &vResult,
+                                     std::vector<double> &vThisLineVal);
+    void processLineLeft(int nYOffset, int iStart, int iEnd,
+                         std::vector<double> &vResult,
+                         std::vector<double> &vThisLineVal,
+                         std::vector<double> &vLastLineVal);
+    void processLineRight(int nYOffset, int iStart, int iEnd,
+                          std::vector<double> &vResult,
+                          std::vector<double> &vThisLineVal,
+                          std::vector<double> &vLastLineVal);
+    std::pair<int, int> adjustHeight(int iLine,
+                                     std::vector<double> &thisLineVal);
+};
+
+}  // namespace viewshed
+}  // namespace gdal
diff --git a/alg/viewshed/viewshed_types.h b/alg/viewshed/viewshed_types.h
new file mode 100644
index 000000000000..3b4e9cc38625
--- /dev/null
+++ b/alg/viewshed/viewshed_types.h
@@ -0,0 +1,160 @@
+/****************************************************************************
+ * (c) 2024 info@hobu.co
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+#ifndef VIEWSHED_TYPES_H_INCLUDED
+#define VIEWSHED_TYPES_H_INCLUDED
+
+#include <algorithm>
+#include <string>
+
+#include "gdal_priv.h"
+
+namespace gdal
+{
+namespace viewshed
+{
+
+/// Unique pointer to GDAL dataset.
+using DatasetPtr = std::unique_ptr<GDALDataset>;
+
+/**
+ * Raster output mode.
+ */
+enum class OutputMode
+{
+    Normal,     //!< Normal output mode (visibility only)
+    DEM,        //!< Output height from DEM
+    Ground,     //!< Output height from ground
+    Cumulative  //!< Output observability heat map
+};
+
+/**
+ * Cell height calculation mode.
+ */
+enum class CellMode
+{
+    Diagonal,  //!< Diagonal Mode
+    Edge,      //!< Edge Mode
+    Max,       //!< Maximum value produced by Diagonal and Edge mode
+    Min        //!< Minimum value produced by Diagonal and Edge mode
+};
+
+/**
+ * A point.
+ */
+struct Point
+{
+    double x;  //!< X value
+    double y;  //!< Y value
+    double z;  //!< Z value
+};
+
+/**
+ * Options for viewshed generation.
+ */
+struct Options
+{
+    Point observer{0, 0, 0};  //!< x, y, and z of the observer
+    double visibleVal{255};   //!< raster output value for visible pixels.
+    double invisibleVal{0};   //!< raster output value for non-visible pixels.
+    double outOfRangeVal{
+        0};  //!< raster output value for pixels outside of max distance.
+    double nodataVal{-1};      //!< raster output value for pixels with no data
+    double targetHeight{0.0};  //!< target height above the DEM surface
+    double maxDistance{
+        0.0};  //!< maximum distance from observer to compute value
+    double curveCoeff{.85714};  //!< coefficient for atmospheric refraction
+    OutputMode outputMode{OutputMode::Normal};  //!< Output information.
+        //!< Normal, Height from DEM or Height from ground
+    std::string outputFormat{};         //!< output raster format
+    std::string outputFilename{};       //!< output raster filename
+    CPLStringList creationOpts{};       //!< options for output raster creation
+    CellMode cellMode{CellMode::Edge};  //!< Mode of cell height calculation.
+    int observerSpacing{10};  //!< Observer spacing in cumulative mode.
+    uint8_t numJobs{3};       //!< Relative number of jobs in cumulative mode.
+};
+
+/**
+ * A window in a raster including pixels in [xStart, xStop) and [yStart, yStop).
+ */
+struct Window
+{
+    int xStart{};  //!< X start position
+    int xStop{};   //!< X end position
+    int yStart{};  //!< Y start position
+    int yStop{};   //!< Y end position
+
+    /// \brief  Window size in the X direction.
+    int xSize() const
+    {
+        return xStop - xStart;
+    }
+
+    /// \brief  Window size in the Y direction.
+    int ySize() const
+    {
+        return yStop - yStart;
+    }
+
+    /// \brief  Number of cells.
+    size_t size() const
+    {
+        return static_cast<size_t>(xSize()) * ySize();
+    }
+
+    /// \brief  Determine if the X window contains the index.
+    /// \param  nX  Index to check
+    /// \return  True if the index is contained, false otherwise.
+    bool containsX(int nX) const
+    {
+        return nX >= xStart && nX < xStop;
+    }
+
+    /// \brief  Determine if the Y window contains the index.
+    /// \param  nY  Index to check
+    /// \return  True if the index is contained, false otherwise.
+    bool containsY(int nY) const
+    {
+        return nY >= xStart && nY < yStop;
+    }
+
+    /// \brief  Determine if the window contains the index.
+    /// \param  nX  X coordinate of the index to check
+    /// \param  nY  Y coordinate of the index to check
+    /// \return  True if the index is contained, false otherwise.
+    bool contains(int nX, int nY) const
+    {
+        return containsX(nX) && containsY(nY);
+    }
+
+    /// \brief  Clamp the argument to be in the window in the X dimension.
+    /// \param  nX  Value to clamp.
+    /// \return  Clamped value.
+    int clampX(int nX) const
+    {
+        return xSize() ? std::clamp(nX, xStart, xStop - 1) : xStart;
+    }
+
+    /// \brief  Clamp the argument to be in the window in the Y dimension.
+    /// \param  nY  Value to clamp.
+    /// \return  Clamped value.
+    int clampY(int nY) const
+    {
+        return ySize() ? std::clamp(nY, yStart, yStop - 1) : yStart;
+    }
+
+    /// \brief  Shift the X dimension by nShift.
+    /// \param  nShift  Amount to shift
+    void shiftX(int nShift)
+    {
+        xStart += nShift;
+        xStop += nShift;
+    }
+};
+
+}  // namespace viewshed
+}  // namespace gdal
+
+#endif
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
index 554ca13f1955..90634aaf4d6c 100644
--- a/apps/CMakeLists.txt
+++ b/apps/CMakeLists.txt
@@ -25,15 +25,19 @@ add_library(
 add_dependencies(appslib generate_gdal_version_h)
 target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:appslib>)
 gdal_standard_includes(appslib)
-target_compile_options(appslib PRIVATE ${GDAL_CXX_WARNING_FLAGS} ${WFLAG_OLD_STYLE_CAST})
+target_compile_options(appslib PRIVATE ${GDAL_CXX_WARNING_FLAGS} ${WFLAG_OLD_STYLE_CAST} ${WFLAG_EFFCXX})
 target_include_directories(
   appslib PRIVATE $<TARGET_PROPERTY:gdal_vrt,SOURCE_DIR> $<TARGET_PROPERTY:ogrsf_generic,SOURCE_DIR>
-                  $<TARGET_PROPERTY:ogr_geojson,SOURCE_DIR> $<TARGET_PROPERTY:ogr_MEM,SOURCE_DIR>)
+                  $<TARGET_PROPERTY:ogr_MEM,SOURCE_DIR>)
 
 gdal_target_link_libraries(appslib PRIVATE PROJ::proj)
 
 set_property(TARGET appslib PROPERTY POSITION_INDEPENDENT_CODE ${GDAL_OBJECT_LIBRARIES_POSITION_INDEPENDENT_CODE})
 
+if (GDAL_ENABLE_DRIVER_GTIFF)
+  target_compile_definitions(appslib PRIVATE -DHAVE_TIFF)
+endif()
+
 if (GDAL_USE_JSONC_INTERNAL)
   gdal_add_vendored_lib(appslib libjson)
 else ()
@@ -132,7 +136,7 @@ if (BUILD_APPS)
     add_dependencies(${UTILCMD} generate_gdal_version_h)
     target_include_directories(
       ${UTILCMD} PRIVATE $<TARGET_PROPERTY:gdal_vrt,SOURCE_DIR> $<TARGET_PROPERTY:ogrsf_generic,SOURCE_DIR>
-                         $<TARGET_PROPERTY:ogr_geojson,SOURCE_DIR> $<TARGET_PROPERTY:ogr_MEM,SOURCE_DIR>)
+                         $<TARGET_PROPERTY:ogr_MEM,SOURCE_DIR>)
     if (MSVC)
       set_target_properties(${UTILCMD} PROPERTIES LINK_FLAGS "wsetargv.obj")
     endif ()
@@ -147,6 +151,11 @@ if (BUILD_APPS)
       target_compile_definitions(${UTILCMD} PRIVATE -DSUPPORTS_WMAIN)
     endif ()
     target_link_libraries(${UTILCMD} PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> utils_common)
+
+    if (NOT GDAL_ENABLE_DRIVER_GTI OR GDAL_ENABLE_DRIVER_GTI_PLUGIN)
+        target_compile_definitions(${UTILCMD} PRIVATE -DGTI_DRIVER_DISABLED_OR_PLUGIN)
+    endif()
+
   endforeach ()
   install(TARGETS ${APPS_TARGETS} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
@@ -158,6 +167,9 @@ if (BUILD_APPS)
   add_executable(gdalasyncread EXCLUDE_FROM_ALL gdalasyncread.cpp)
   add_executable(gdalwarpsimple EXCLUDE_FROM_ALL gdalwarpsimple.c)
   add_executable(multireadtest EXCLUDE_FROM_ALL multireadtest.cpp)
+  if(NOT MSVC AND CMAKE_THREAD_LIBS_INIT)
+    target_link_libraries(multireadtest PRIVATE ${CMAKE_THREAD_LIBS_INIT})
+  endif()
   add_executable(test_ogrsf test_ogrsf.cpp)
   add_executable(testreprojmulti EXCLUDE_FROM_ALL testreprojmulti.cpp)
 
@@ -197,7 +209,7 @@ if (BUILD_APPS)
     endif ()
     target_include_directories(
       ${UTILCMD} PRIVATE $<TARGET_PROPERTY:gdal_vrt,SOURCE_DIR> $<TARGET_PROPERTY:ogrsf_generic,SOURCE_DIR>
-                         $<TARGET_PROPERTY:ogr_geojson,SOURCE_DIR> $<TARGET_PROPERTY:ogr_MEM,SOURCE_DIR>)
+                         $<TARGET_PROPERTY:ogr_MEM,SOURCE_DIR>)
     target_link_libraries(${UTILCMD} PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}>)
   endforeach ()
 endif ()
diff --git a/apps/argparse/README.TXT b/apps/argparse/README.TXT
index 395f64ad669b..5febab7c4667 100644
--- a/apps/argparse/README.TXT
+++ b/apps/argparse/README.TXT
@@ -1,3 +1,6 @@
 Provenance: https://github.com/p-ranav/argparse
 
-Retrieved from https://github.com/p-ranav/argparse/blob/b85a0a414d415fccdf6d77072421b1d3887c8f79/include/argparse/argparse.hpp
+Retrieved: https://github.com/p-ranav/argparse/blob/8dead89026466b3818e9c6b6b1d938600db39d8f/include/argparse/argparse.hpp
++ patch of https://github.com/p-ranav/argparse/pull/356 (FEATURE: multiple actions)
++ patch of https://github.com/p-ranav/argparse/pull/363 (Accept integer literals in store_into)
+
diff --git a/apps/argparse/argparse.hpp b/apps/argparse/argparse.hpp
index d472ba933023..a52142848192 100644
--- a/apps/argparse/argparse.hpp
+++ b/apps/argparse/argparse.hpp
@@ -678,9 +678,9 @@ class Argument {
         std::is_void_v<std::invoke_result_t<F, Args..., std::string const>>,
         void_action, valued_action>;
     if constexpr (sizeof...(Args) == 0) {
-      m_action.emplace<action_type>(std::forward<F>(callable));
+      m_actions.emplace_back<action_type>(std::forward<F>(callable));
     } else {
-      m_action.emplace<action_type>(
+      m_actions.emplace_back<action_type>(
           [f = std::forward<F>(callable),
            tup = std::make_tuple(std::forward<Args>(bound_args)...)](
               std::string const &opt) mutable {
@@ -994,7 +994,12 @@ class Argument {
     if (num_args_max == 0) {
       if (!dry_run) {
         m_values.emplace_back(m_implicit_value);
-        std::visit([](const auto &f) { f({}); }, m_action);
+        for(auto &action: m_actions) {
+          std::visit([&](const auto &f) { f({}); }, action);
+        }
+        if(m_actions.empty()){
+          std::visit([&](const auto &f) { f({}); }, m_default_action);
+        }
         m_is_used = true;
       }
       return start;
@@ -1035,7 +1040,12 @@ class Argument {
         Argument &self;
       };
       if (!dry_run) {
-        std::visit(ActionApply{start, end, *this}, m_action);
+        for(auto &action: m_actions) {
+          std::visit(ActionApply{start, end, *this}, action);
+        }
+        if(m_actions.empty()){
+          std::visit(ActionApply{start, end, *this}, m_default_action);
+        }
         m_is_used = true;
       }
       return end;
@@ -1401,6 +1411,10 @@ class Argument {
    *    '+' '-'
    */
   static bool is_decimal_literal(std::string_view s) {
+    if (s == "inf") {
+      return true;
+    }
+
     auto is_digit = [](auto c) constexpr {
       switch (c) {
       case '0':
@@ -1585,9 +1599,10 @@ class Argument {
   std::optional<std::vector<std::string>> m_choices{std::nullopt};
   using valued_action = std::function<std::any(const std::string &)>;
   using void_action = std::function<void(const std::string &)>;
-  std::variant<valued_action, void_action> m_action{
-      std::in_place_type<valued_action>,
-      [](const std::string &value) { return value; }};
+  std::vector<std::variant<valued_action, void_action>> m_actions;
+  std::variant<valued_action, void_action> m_default_action{
+    std::in_place_type<valued_action>,
+    [](const std::string &value) { return value; }};
   std::vector<std::any> m_values;
   NArgsRange m_num_args_range{1, 1};
   // Bit field of bool values. Set default value in ctor.
@@ -2030,8 +2045,10 @@ class ArgumentParser {
         }
 
         stream << std::setw(2) << " ";
-        stream << std::setw(static_cast<int>(longest_arg_length - 2))
-               << command;
+        if (longest_arg_length >= 2) {
+          stream << std::setw(static_cast<int>(longest_arg_length - 2))
+                 << command;
+        }
         stream << " " << subparser->get().m_description << "\n";
       }
     }
diff --git a/apps/commonutils.cpp b/apps/commonutils.cpp
index 8e0d215f22d3..3c5e3b29c7a8 100644
--- a/apps/commonutils.cpp
+++ b/apps/commonutils.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "commonutils.h"
diff --git a/apps/commonutils.h b/apps/commonutils.h
index 6205408ce77a..4365877b6d79 100644
--- a/apps/commonutils.h
+++ b/apps/commonutils.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2011-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef COMMONUTILS_H_INCLUDED
diff --git a/apps/data/gdalinfo_output.schema.json b/apps/data/gdalinfo_output.schema.json
index 166a490d9e26..a4c50c780e66 100644
--- a/apps/data/gdalinfo_output.schema.json
+++ b/apps/data/gdalinfo_output.schema.json
@@ -277,7 +277,7 @@
     },
 
     "stac": {
-      "$comment": "Derived from https://raw.githubusercontent.com/stac-extensions/projection/main/json-schema/schema.json#/definitions/fields, https://raw.githubusercontent.com/stac-extensions/eo/main/json-schema/schema.json#/definitions/bands and https://raw.githubusercontent.com/stac-extensions/eo/main/json-schema/schema.json#/definitions/bands",
+      "$comment": "Derived from https://raw.githubusercontent.com/stac-extensions/projection/main/json-schema/schema.json#/definitions/fields, https://raw.githubusercontent.com/stac-extensions/eo/v1.1.0/json-schema/schema.json#/definitions/bands and https://raw.githubusercontent.com/stac-extensions/eo/v1.1.0/json-schema/schema.json#/definitions/bands",
       "type": "object",
       "properties": {
         "proj:epsg": {
@@ -334,10 +334,10 @@
           }
         },
         "eo:bands": {
-          "$ref": "https://raw.githubusercontent.com/stac-extensions/eo/main/json-schema/schema.json#/definitions/bands"
+          "$ref": "https://raw.githubusercontent.com/stac-extensions/eo/v1.1.0/json-schema/schema.json#/definitions/bands"
         },
         "raster:bands": {
-          "$ref": "https://raw.githubusercontent.com/stac-extensions/eo/main/json-schema/schema.json#/definitions/bands"
+          "$ref": "https://raw.githubusercontent.com/stac-extensions/eo/v1.1.0/json-schema/schema.json#/definitions/bands"
         }
       },
       "additionalProperties": false
diff --git a/apps/dumpoverviews.cpp b/apps/dumpoverviews.cpp
index 457febbcd7fb..76f81c20a521 100644
--- a/apps/dumpoverviews.cpp
+++ b/apps/dumpoverviews.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2005, Frank Warmerdam
  * Copyright (c) 2009-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/apps/gdal2ogr.c b/apps/gdal2ogr.c
index f38378e2cdcf..75e9968a0487 100644
--- a/apps/gdal2ogr.c
+++ b/apps/gdal2ogr.c
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2008, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal.h"
diff --git a/apps/gdal_contour.cpp b/apps/gdal_contour.cpp
index 8b57c62dd0df..222c810435a3 100644
--- a/apps/gdal_contour.cpp
+++ b/apps/gdal_contour.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.com>
  * Copyright (c) 2018, Oslandia <infos at oslandia dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
@@ -64,6 +48,7 @@ struct GDALContourOptions
     bool bQuiet = false;
     std::string aosDestFilename;
     std::string aosSrcFilename;
+    GIntBig nGroupTransactions = 100 * 1000;
 };
 
 /************************************************************************/
@@ -81,6 +66,9 @@ GDALContourAppOptionsGetParser(GDALContourOptions *psOptions)
         "For more details, consult the full documentation for the gdal_contour "
         "utility: http://gdal.org/gdal_contour.html"));
 
+    argParser->add_extra_usage_hint(
+        _("One of -i, -fl or -e must be specified."));
+
     argParser->add_argument("-b")
         .metavar("<name>")
         .default_value(1)
@@ -144,14 +132,6 @@ GDALContourAppOptionsGetParser(GDALContourOptions *psOptions)
         .store_into(psOptions->dfInterval)
         .help(_("Elevation interval between contours."));
 
-    group.add_argument("-fl")
-        .metavar("<level>")
-        .nargs(argparse::nargs_pattern::at_least_one)
-        .scan<'g', double>()
-        .action([psOptions](const std::string &s)
-                { psOptions->adfFixedLevels.push_back(CPLAtof(s.c_str())); })
-        .help(_("Name one or more \"fixed levels\" to extract."));
-
     group.add_argument("-e")
         .metavar("<base>")
         .scan<'g', double>()
@@ -159,6 +139,10 @@ GDALContourAppOptionsGetParser(GDALContourOptions *psOptions)
         .help(_("Generate levels on an exponential scale: base ^ k, for k an "
                 "integer."));
 
+    // Dealt manually as argparse::nargs_pattern::at_least_one is problematic
+    argParser->add_argument("-fl").scan<'g', double>().metavar("<level>").help(
+        _("Name one or more \"fixed levels\" to extract."));
+
     argParser->add_argument("-off")
         .metavar("<offset>")
         .scan<'g', double>()
@@ -176,6 +160,18 @@ GDALContourAppOptionsGetParser(GDALContourOptions *psOptions)
         .store_into(psOptions->bPolygonize)
         .help(_("Generate contour polygons instead of lines."));
 
+    argParser->add_argument("-gt")
+        .metavar("<n>|unlimited")
+        .action(
+            [psOptions](const std::string &s)
+            {
+                if (EQUAL(s.c_str(), "unlimited"))
+                    psOptions->nGroupTransactions = -1;
+                else
+                    psOptions->nGroupTransactions = atoi(s.c_str());
+            })
+        .help(_("Group <n> features per transaction."));
+
     argParser->add_quiet_argument(&psOptions->bQuiet);
 
     argParser->add_argument("src_filename")
@@ -230,6 +226,7 @@ MAIN_START(argc, argv)
 
     if (argc < 2)
     {
+
         try
         {
             GDALContourOptions sOptions;
@@ -245,11 +242,61 @@ MAIN_START(argc, argv)
     }
 
     GDALContourOptions sOptions;
+    CPLStringList aosArgv;
 
     try
     {
+        /* -------------------------------------------------------------------- */
+        /*      Pre-processing for custom syntax that ArgumentParser does not   */
+        /*      support.                                                        */
+        /* -------------------------------------------------------------------- */
+        for (int i = 1; i < argc && argv != nullptr && argv[i] != nullptr; i++)
+        {
+            // argparser is confused by arguments that have at_least_one
+            // cardinality, if they immediately precede positional arguments.
+            if (EQUAL(argv[i], "-fl") && argv[i + 1])
+            {
+                if (strchr(argv[i + 1], ' '))
+                {
+                    const CPLStringList aosTokens(
+                        CSLTokenizeString(argv[i + 1]));
+                    for (const char *pszToken : aosTokens)
+                    {
+                        sOptions.adfFixedLevels.push_back(CPLAtof(pszToken));
+                    }
+                    i += 1;
+                }
+                else
+                {
+                    auto isNumeric = [](const char *pszArg) -> bool
+                    {
+                        char *pszEnd = nullptr;
+                        CPLStrtod(pszArg, &pszEnd);
+                        return pszEnd != nullptr && pszEnd[0] == '\0';
+                    };
+
+                    while (i < argc - 1 && isNumeric(argv[i + 1]))
+                    {
+                        sOptions.adfFixedLevels.push_back(CPLAtof(argv[i + 1]));
+                        i += 1;
+                    }
+                }
+            }
+            else
+            {
+                aosArgv.AddString(argv[i]);
+            }
+        }
+
         auto argParser = GDALContourAppOptionsGetParser(&sOptions);
-        argParser->parse_args_without_binary_name(argv + 1);
+        argParser->parse_args_without_binary_name(aosArgv.List());
+
+        if (sOptions.dfInterval == 0.0 && sOptions.adfFixedLevels.empty() &&
+            sOptions.dfExpBase == 0.0)
+        {
+            fprintf(stderr, "%s\n", argParser->usage().c_str());
+            exit(1);
+        }
     }
     catch (const std::exception &error)
     {
@@ -348,6 +395,11 @@ MAIN_START(argc, argv)
     if (hLayer == nullptr)
         exit(1);
 
+    if (!OGR_L_TestCapability(hLayer, OLCTransactions))
+    {
+        sOptions.nGroupTransactions = 0;
+    }
+
     OGRFieldDefnH hFld = OGR_Fld_Create("ID", OFTInteger);
     OGR_Fld_SetWidth(hFld, 8);
     OGR_L_CreateField(hLayer, hFld, FALSE);
@@ -434,7 +486,8 @@ MAIN_START(argc, argv)
         }
         options = CSLAddString(options, values.c_str());
     }
-    else if (sOptions.dfExpBase != 0.0)
+
+    if (sOptions.dfExpBase != 0.0)
     {
         options =
             CSLAppendPrintf(options, "LEVEL_EXP_BASE=%f", sOptions.dfExpBase);
@@ -474,6 +527,11 @@ MAIN_START(argc, argv)
     {
         options = CSLAppendPrintf(options, "POLYGONIZE=YES");
     }
+    if (sOptions.nGroupTransactions)
+    {
+        options = CSLAppendPrintf(options, "COMMIT_INTERVAL=" CPL_FRMT_GIB,
+                                  sOptions.nGroupTransactions);
+    }
 
     CPLErr eErr =
         GDALContourGenerateEx(hBand, hLayer, options, pfnProgress, nullptr);
diff --git a/apps/gdal_create.cpp b/apps/gdal_create.cpp
index d7c43b77f323..45dcca410130 100644
--- a/apps/gdal_create.cpp
+++ b/apps/gdal_create.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2020, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
@@ -123,31 +107,9 @@ GDALCreateAppOptionsGetParser(GDALCreateOptions *psOptions)
         .store_into(psOptions->nBandCount)
         .help(_("Set the number of bands in the output file."));
 
-    argParser->add_argument("-burn")
-        .metavar("<value>")
-        .nargs(nargs_pattern::at_least_one)
-        .append()
-        .scan<'g', double>()
-        .action(
-            [psOptions](const std::string &s)
-            {
-                if (s.find(' ') != std::string::npos)
-                {
-                    const CPLStringList aosTokens(CSLTokenizeString(s.c_str()));
-                    for (int i = 0; i < aosTokens.size(); i++)
-                    {
-                        psOptions->adfBurnValues.push_back(
-                            CPLAtof(aosTokens[i]));
-                    }
-                }
-                else
-                {
-                    psOptions->adfBurnValues.push_back(CPLAtof(s.c_str()));
-                }
-            })
-        .help(
-            _("A fixed value to burn into a band for all objects. A list of "
-              "-burn options can be supplied, one per band being written to."));
+    argParser->add_argument("-burn").metavar("<value>").append().help(
+        _("A fixed value to burn into a band. A list of "
+          "-burn options can be supplied, one per band being written to."));
 
     argParser->add_argument("-a_srs")
         .metavar("<srs_def>")
@@ -254,16 +216,69 @@ MAIN_START(argc, argv)
 
     GDALCreateOptions sOptions;
 
+    CPLStringList aosArgv;
+    for (int iArg = 1; iArg < argc; iArg++)
+    {
+        if (iArg + 1 < argc && EQUAL(argv[iArg], "-burn"))
+        {
+            ++iArg;
+            while (true)
+            {
+                if (strchr(argv[iArg], ' '))
+                {
+                    const CPLStringList aosTokens(
+                        CSLTokenizeString(argv[iArg]));
+                    for (int i = 0; i < aosTokens.size(); i++)
+                    {
+                        char *endptr = nullptr;
+                        sOptions.adfBurnValues.push_back(
+                            CPLStrtodM(aosTokens[i], &endptr));
+                        if (endptr != aosTokens[i] + strlen(aosTokens[i]))
+                        {
+                            fprintf(stderr, "Invalid value for -burn\n");
+                            CSLDestroy(argv);
+                            GDALExit(1);
+                        }
+                    }
+                }
+                else
+                {
+                    char *endptr = nullptr;
+                    sOptions.adfBurnValues.push_back(
+                        CPLStrtodM(argv[iArg], &endptr));
+                    if (endptr != argv[iArg] + strlen(argv[iArg]))
+                    {
+                        fprintf(stderr, "Invalid value for -burn\n");
+                        CSLDestroy(argv);
+                        GDALExit(1);
+                    }
+                }
+                if (iArg + 1 < argc &&
+                    CPLGetValueType(argv[iArg + 1]) != CPL_VALUE_STRING)
+                {
+                    ++iArg;
+                }
+                else
+                {
+                    break;
+                }
+            }
+        }
+        else
+        {
+            aosArgv.AddString(argv[iArg]);
+        }
+    }
+    CSLDestroy(argv);
+
     try
     {
 
         auto argParser = GDALCreateAppOptionsGetParser(&sOptions);
-        argParser->parse_args_without_binary_name(argv + 1);
-        CSLDestroy(argv);
+        argParser->parse_args_without_binary_name(aosArgv.List());
     }
     catch (const std::exception &error)
     {
-        CSLDestroy(argv);
         CPLError(CE_Failure, CPLE_AppDefined, "%s", error.what());
         GDALExit(1);
     }
diff --git a/apps/gdal_footprint_bin.cpp b/apps/gdal_footprint_bin.cpp
index 2e6596a7f2ca..d2e830359833 100644
--- a/apps/gdal_footprint_bin.cpp
+++ b/apps/gdal_footprint_bin.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/apps/gdal_footprint_lib.cpp b/apps/gdal_footprint_lib.cpp
index bbf5ae51b98b..978c67d6ec81 100644
--- a/apps/gdal_footprint_lib.cpp
+++ b/apps/gdal_footprint_lib.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -123,7 +107,7 @@ struct GDALFootprintOptions
     /*! Whether to force writing absolute paths in location field. */
     bool bAbsolutePath = false;
 
-    std::string osSrcNoData;
+    std::string osSrcNoData{};
 };
 
 static std::unique_ptr<GDALArgumentParser> GDALFootprintAppOptionsGetParser(
@@ -295,6 +279,8 @@ class GDALFootprintMaskBand final : public GDALRasterBand
 {
     GDALRasterBand *m_poSrcBand = nullptr;
 
+    CPL_DISALLOW_COPY_ASSIGN(GDALFootprintMaskBand)
+
   public:
     explicit GDALFootprintMaskBand(GDALRasterBand *poSrcBand)
         : m_poSrcBand(poSrcBand)
diff --git a/apps/gdal_grid_bin.cpp b/apps/gdal_grid_bin.cpp
index d46a0c1756d4..8ba51a73db6a 100644
--- a/apps/gdal_grid_bin.cpp
+++ b/apps/gdal_grid_bin.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/apps/gdal_grid_lib.cpp b/apps/gdal_grid_lib.cpp
index 1531f6d1ebca..74be9104af63 100644
--- a/apps/gdal_grid_lib.cpp
+++ b/apps/gdal_grid_lib.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2007, Andrey Kiselev <dron@ak4719.spb.edu>
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -116,6 +100,8 @@ struct GDALGridOptions
                                          &l_pOptions);
         pOptions.reset(l_pOptions);
     }
+
+    CPL_DISALLOW_COPY_ASSIGN(GDALGridOptions)
 };
 
 /************************************************************************/
diff --git a/apps/gdal_rasterize_bin.cpp b/apps/gdal_rasterize_bin.cpp
index 772a5cc9d766..7dacd32669b0 100644
--- a/apps/gdal_rasterize_bin.cpp
+++ b/apps/gdal_rasterize_bin.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
@@ -36,33 +20,11 @@
 /*                               Usage()                                */
 /************************************************************************/
 
-static void Usage(bool bIsError, const char *pszErrorMsg = nullptr)
+static void Usage()
 
 {
-    fprintf(
-        bIsError ? stderr : stdout,
-        "Usage: gdal_rasterize [--help] [--help-general]\n"
-        "       [-b <band>]... [-i] [-at]\n"
-        "       [-oo <NAME>=<VALUE>]...\n"
-        "       {[-burn <value>]... | [-a <attribute_name>] | [-3d]} [-add]\n"
-        "       [-l <layername>]... [-where <expression>] "
-        "[-sql <select_statement>|@<filename>]\n"
-        "       [-dialect <dialect>] [-of <format>] [-a_srs <srs_def>] [-to "
-        "<NAME>=<VALUE>]...\n"
-        "       [-co <NAME>=<VALUE>]... [-a_nodata <value>] [-init "
-        "<value>]...\n"
-        "       [-te <xmin> <ymin> <xmax> <ymax>] [-tr <xres> <yres>] [-tap] "
-        "[-ts <width> "
-        "<height>]\n"
-        "       [-ot "
-        "{Byte/Int8/Int16/UInt16/UInt32/Int32/UInt64/Int64/Float32/Float64/\n"
-        "             CInt16/CInt32/CFloat32/CFloat64}] [-optim "
-        "{AUTO|VECTOR|RASTER}] [-q]\n"
-        "       <src_datasource> <dst_filename>\n");
-
-    if (pszErrorMsg != nullptr)
-        fprintf(stderr, "\nFAILURE: %s\n", pszErrorMsg);
-    exit(bIsError ? 1 : 0);
+    fprintf(stderr, "%s\n", GDALRasterizeAppGetParserUsage().c_str());
+    exit(1);
 }
 
 /************************************************************************/
@@ -71,6 +33,7 @@ static void Usage(bool bIsError, const char *pszErrorMsg = nullptr)
 
 MAIN_START(argc, argv)
 {
+
     /* Check strict compilation and runtime library version as we use C++ API */
     if (!GDAL_CHECK_VERSION(argv[0]))
         exit(1);
@@ -78,51 +41,36 @@ MAIN_START(argc, argv)
     EarlySetConfigOptions(argc, argv);
 
     /* -------------------------------------------------------------------- */
-    /*      Generic arg processing.                                         */
+    /*      Register standard GDAL drivers, and process generic GDAL        */
+    /*      command options.                                                */
     /* -------------------------------------------------------------------- */
     GDALAllRegister();
     argc = GDALGeneralCmdLineProcessor(argc, &argv, 0);
     if (argc < 1)
         exit(-argc);
 
-    for (int i = 0; i < argc; i++)
-    {
-        if (EQUAL(argv[i], "--utility_version"))
-        {
-            printf("%s was compiled against GDAL %s and "
-                   "is running against GDAL %s\n",
-                   argv[0], GDAL_RELEASE_NAME, GDALVersionInfo("RELEASE_NAME"));
-            CSLDestroy(argv);
-            return 0;
-        }
-        else if (EQUAL(argv[i], "--help"))
-        {
-            Usage(false);
-        }
-    }
+    /* -------------------------------------------------------------------- */
+    /*      Generic arg processing.                                         */
+    /* -------------------------------------------------------------------- */
 
     GDALRasterizeOptionsForBinary sOptionsForBinary;
-    // coverity[tainted_data]
-    GDALRasterizeOptions *psOptions =
-        GDALRasterizeOptionsNew(argv + 1, &sOptionsForBinary);
+    std::unique_ptr<GDALRasterizeOptions, decltype(&GDALRasterizeOptionsFree)>
+        psOptions{GDALRasterizeOptionsNew(argv + 1, &sOptionsForBinary),
+                  GDALRasterizeOptionsFree};
+
     CSLDestroy(argv);
 
-    if (psOptions == nullptr)
+    if (!psOptions)
     {
-        Usage(true);
+        Usage();
     }
 
     if (!(sOptionsForBinary.bQuiet))
     {
-        GDALRasterizeOptionsSetProgress(psOptions, GDALTermProgress, nullptr);
+        GDALRasterizeOptionsSetProgress(psOptions.get(), GDALTermProgress,
+                                        nullptr);
     }
 
-    if (sOptionsForBinary.osSource.empty())
-        Usage(true, "No input file specified.");
-
-    if (!sOptionsForBinary.bDestSpecified)
-        Usage(true, "No output file specified.");
-
     /* -------------------------------------------------------------------- */
     /*      Open input file.                                                */
     /* -------------------------------------------------------------------- */
@@ -186,16 +134,19 @@ MAIN_START(argc, argv)
     }
 
     int bUsageError = FALSE;
-    GDALDatasetH hRetDS = GDALRasterize(sOptionsForBinary.osDest.c_str(),
-                                        hDstDS, hInDS, psOptions, &bUsageError);
+    GDALDatasetH hRetDS =
+        GDALRasterize(sOptionsForBinary.osDest.c_str(), hDstDS, hInDS,
+                      psOptions.get(), &bUsageError);
+
     if (bUsageError == TRUE)
-        Usage(true);
+        Usage();
+
     int nRetCode = hRetDS ? 0 : 1;
 
     GDALClose(hInDS);
+
     if (GDALClose(hRetDS) != CE_None)
         nRetCode = 1;
-    GDALRasterizeOptionsFree(psOptions);
 
     GDALDestroyDriverManager();
 
diff --git a/apps/gdal_rasterize_lib.cpp b/apps/gdal_rasterize_lib.cpp
index 39913ad306cb..6b6981438133 100644
--- a/apps/gdal_rasterize_lib.cpp
+++ b/apps/gdal_rasterize_lib.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -50,17 +34,317 @@
 #include "ogr_api.h"
 #include "ogr_core.h"
 #include "ogr_srs_api.h"
+#include "gdalargumentparser.h"
 
 /************************************************************************/
-/*                       ArgIsNumericRasterize()                        */
+/*                          GDALRasterizeOptions()                      */
 /************************************************************************/
 
-static bool ArgIsNumericRasterize(const char *pszArg)
+struct GDALRasterizeOptions
+{
+    std::vector<int> anBandList{};
+    std::vector<double> adfBurnValues{};
+    bool bInverse = false;
+    std::string osFormat{};
+    bool b3D = false;
+    GDALProgressFunc pfnProgress = GDALDummyProgress;
+    void *pProgressData = nullptr;
+    std::vector<std::string> aosLayers{};
+    std::string osSQL{};
+    std::string osDialect{};
+    std::string osBurnAttribute{};
+    std::string osWHERE{};
+    CPLStringList aosRasterizeOptions{};
+    CPLStringList aosTO{};
+    double dfXRes = 0;
+    double dfYRes = 0;
+    CPLStringList aosCreationOptions{};
+    GDALDataType eOutputType = GDT_Unknown;
+    std::vector<double> adfInitVals{};
+    std::string osNoData{};
+    OGREnvelope sEnvelop{};
+    int nXSize = 0;
+    int nYSize = 0;
+    OGRSpatialReference oOutputSRS{};
+
+    bool bTargetAlignedPixels = false;
+    bool bCreateOutput = false;
+};
 
+/************************************************************************/
+/*                     GDALRasterizeOptionsGetParser()                  */
+/************************************************************************/
+
+static std::unique_ptr<GDALArgumentParser>
+GDALRasterizeOptionsGetParser(GDALRasterizeOptions *psOptions,
+                              GDALRasterizeOptionsForBinary *psOptionsForBinary)
 {
-    char *pszEnd = nullptr;
-    CPLStrtod(pszArg, &pszEnd);
-    return pszEnd != nullptr && pszEnd[0] == '\0';
+    auto argParser = std::make_unique<GDALArgumentParser>(
+        "gdal_rasterize", /* bForBinary=*/psOptionsForBinary != nullptr);
+
+    argParser->add_description(_("Burns vector geometries into a raster."));
+
+    argParser->add_epilog(
+        _("This program burns vector geometries (points, lines, and polygons) "
+          "into the raster band(s) of a raster image."));
+
+    // Dealt manually as argparse::nargs_pattern::at_least_one is problematic
+    argParser->add_argument("-b")
+        .metavar("<band>")
+        .append()
+        .scan<'i', int>()
+        //.nargs(argparse::nargs_pattern::at_least_one)
+        .help(_("The band(s) to burn values into."));
+
+    argParser->add_argument("-i")
+        .flag()
+        .store_into(psOptions->bInverse)
+        .help(_("Invert rasterization."));
+
+    argParser->add_argument("-at")
+        .flag()
+        .action(
+            [psOptions](const std::string &) {
+                psOptions->aosRasterizeOptions.SetNameValue("ALL_TOUCHED",
+                                                            "TRUE");
+            })
+        .help(_("Enables the ALL_TOUCHED rasterization option."));
+
+    // Mutually exclusive options: -burn, -3d, -a
+    {
+        // Required if options for binary
+        auto &group = argParser->add_mutually_exclusive_group(
+            psOptionsForBinary != nullptr);
+
+        // Dealt manually as argparse::nargs_pattern::at_least_one is problematic
+        group.add_argument("-burn")
+            .metavar("<value>")
+            .scan<'g', double>()
+            .append()
+            //.nargs(argparse::nargs_pattern::at_least_one)
+            .help(_("A fixed value to burn into the raster band(s)."));
+
+        group.add_argument("-a")
+            .metavar("<attribute_name>")
+            .store_into(psOptions->osBurnAttribute)
+            .help(_("Name of the field in the input layer to get the burn "
+                    "values from."));
+
+        group.add_argument("-3d")
+            .flag()
+            .store_into(psOptions->b3D)
+            .action(
+                [psOptions](const std::string &) {
+                    psOptions->aosRasterizeOptions.SetNameValue(
+                        "BURN_VALUE_FROM", "Z");
+                })
+            .help(_("Indicates that a burn value should be extracted from the "
+                    "\"Z\" values of the feature."));
+    }
+
+    argParser->add_argument("-add")
+        .flag()
+        .action(
+            [psOptions](const std::string &) {
+                psOptions->aosRasterizeOptions.SetNameValue("MERGE_ALG", "ADD");
+            })
+        .help(_("Instead of burning a new value, this adds the new value to "
+                "the existing raster."));
+
+    // Undocumented
+    argParser->add_argument("-chunkysize")
+        .flag()
+        .hidden()
+        .action(
+            [psOptions](const std::string &s) {
+                psOptions->aosRasterizeOptions.SetNameValue("CHUNKYSIZE",
+                                                            s.c_str());
+            });
+
+    // Mutually exclusive -l, -sql
+    {
+        auto &group = argParser->add_mutually_exclusive_group(false);
+
+        group.add_argument("-l")
+            .metavar("<layer_name>")
+            .append()
+            .store_into(psOptions->aosLayers)
+            .help(_("Name of the layer(s) to process."));
+
+        group.add_argument("-sql")
+            .metavar("<sql_statement>")
+            .store_into(psOptions->osSQL)
+            .action(
+                [psOptions](const std::string &sql)
+                {
+                    GByte *pabyRet = nullptr;
+                    if (!sql.empty() && sql.at(0) == '@' &&
+                        VSIIngestFile(nullptr, sql.substr(1).c_str(), &pabyRet,
+                                      nullptr, 1024 * 1024))
+                    {
+                        GDALRemoveBOM(pabyRet);
+                        char *pszSQLStatement =
+                            reinterpret_cast<char *>(pabyRet);
+                        psOptions->osSQL = CPLStrdup(
+                            GDALRemoveSQLComments(pszSQLStatement).c_str());
+                        VSIFree(pszSQLStatement);
+                    }
+                })
+            .help(
+                _("An SQL statement to be evaluated against the datasource to "
+                  "produce a virtual layer of features to be burned in."));
+    }
+
+    argParser->add_argument("-where")
+        .metavar("<expression>")
+        .store_into(psOptions->osWHERE)
+        .help(_("An optional SQL WHERE style query expression to be applied to "
+                "select features "
+                "to burn in from the input layer(s)."));
+
+    argParser->add_argument("-dialect")
+        .metavar("<sql_dialect>")
+        .store_into(psOptions->osDialect)
+        .help(_("The SQL dialect to use for the SQL expression."));
+
+    // Store later
+    argParser->add_argument("-a_nodata")
+        .metavar("<value>")
+        .help(_("Assign a specified nodata value to output bands."));
+
+    // Dealt manually as argparse::nargs_pattern::at_least_one is problematic
+    argParser->add_argument("-init")
+        .metavar("<value>")
+        .append()
+        //.nargs(argparse::nargs_pattern::at_least_one)
+        .scan<'g', double>()
+        .help(_("Initialize the output bands to the specified value."));
+
+    argParser->add_argument("-a_srs")
+        .metavar("<srs_def>")
+        .action(
+            [psOptions](const std::string &osOutputSRSDef)
+            {
+                if (psOptions->oOutputSRS.SetFromUserInput(
+                        osOutputSRSDef.c_str()) != OGRERR_NONE)
+                {
+                    throw std::invalid_argument(
+                        std::string("Failed to process SRS definition: ")
+                            .append(osOutputSRSDef));
+                }
+                psOptions->bCreateOutput = true;
+            })
+        .help(_("The spatial reference system to use for the output raster."));
+
+    argParser->add_argument("-to")
+        .metavar("<NAME>=<VALUE>")
+        .append()
+        .action([psOptions](const std::string &s)
+                { psOptions->aosTO.AddString(s.c_str()); })
+        .help(_("Set a transformer option."));
+
+    // Store later
+    argParser->add_argument("-te")
+        .metavar("<xmin> <ymin> <xmax> <ymax>")
+        .nargs(4)
+        .scan<'g', double>()
+        .help(_("Set georeferenced extents of output file to be created."));
+
+    // Mutex with tr
+    {
+        auto &group = argParser->add_mutually_exclusive_group(false);
+
+        // Store later
+        group.add_argument("-tr")
+            .metavar("<xres> <yres>")
+            .nargs(2)
+            .scan<'g', double>()
+            .help(
+                _("Set output file resolution in target georeferenced units."));
+
+        // Store later
+        auto &arg = group.add_argument("-ts")
+                        .metavar("<width> <height>")
+                        .nargs(2)
+                        .scan<'i', int>()
+                        .help(_("Set output file size in pixels and lines."));
+
+        argParser->add_hidden_alias_for(arg, "-outsize");
+    }
+
+    argParser->add_argument("-tap")
+        .flag()
+        .store_into(psOptions->bTargetAlignedPixels)
+        .action([psOptions](const std::string &)
+                { psOptions->bCreateOutput = true; })
+        .help(_("Align the coordinates of the extent to the values of the "
+                "output raster."));
+
+    argParser->add_argument("-optim")
+        .metavar("AUTO|VECTOR|RASTER")
+        .action(
+            [psOptions](const std::string &s) {
+                psOptions->aosRasterizeOptions.SetNameValue("OPTIM", s.c_str());
+            })
+        .help(_("Force the algorithm used."));
+
+    argParser->add_creation_options_argument(psOptions->aosCreationOptions)
+        .action([psOptions](const std::string &)
+                { psOptions->bCreateOutput = true; });
+
+    argParser->add_output_type_argument(psOptions->eOutputType)
+        .action([psOptions](const std::string &)
+                { psOptions->bCreateOutput = true; });
+
+    argParser->add_output_format_argument(psOptions->osFormat)
+        .action([psOptions](const std::string &)
+                { psOptions->bCreateOutput = true; });
+
+    // Written that way so that in library mode, users can still use the -q
+    // switch, even if it has no effect
+    argParser->add_quiet_argument(
+        psOptionsForBinary ? &(psOptionsForBinary->bQuiet) : nullptr);
+
+    if (psOptionsForBinary)
+    {
+
+        argParser->add_open_options_argument(
+            psOptionsForBinary->aosOpenOptions);
+
+        argParser->add_argument("src_datasource")
+            .metavar("<src_datasource>")
+            .store_into(psOptionsForBinary->osSource)
+            .help(_("Any vector supported readable datasource."));
+
+        argParser->add_argument("dst_filename")
+            .metavar("<dst_filename>")
+            .store_into(psOptionsForBinary->osDest)
+            .help(_("The GDAL raster supported output file."));
+    }
+
+    return argParser;
+}
+
+/************************************************************************/
+/*                          GDALRasterizeAppGetParserUsage()            */
+/************************************************************************/
+
+std::string GDALRasterizeAppGetParserUsage()
+{
+    try
+    {
+        GDALRasterizeOptions sOptions;
+        GDALRasterizeOptionsForBinary sOptionsForBinary;
+        auto argParser =
+            GDALRasterizeOptionsGetParser(&sOptions, &sOptionsForBinary);
+        return argParser->usage();
+    }
+    catch (const std::exception &err)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Unexpected exception: %s",
+                 err.what());
+        return std::string();
+    }
 }
 
 /************************************************************************/
@@ -221,9 +505,10 @@ static CPLErr ProcessLayer(OGRLayerH hSrcLayer, bool bSRSIsSet,
                            GDALDatasetH hDstDS,
                            const std::vector<int> &anBandList,
                            const std::vector<double> &adfBurnValues, bool b3D,
-                           bool bInverse, const char *pszBurnAttribute,
-                           CSLConstList papszRasterizeOptions, char **papszTO,
-                           GDALProgressFunc pfnProgress, void *pProgressData)
+                           bool bInverse, const std::string &osBurnAttribute,
+                           CSLConstList papszRasterizeOptions,
+                           CSLConstList papszTO, GDALProgressFunc pfnProgress,
+                           void *pProgressData)
 
 {
     /* -------------------------------------------------------------------- */
@@ -289,14 +574,15 @@ static CPLErr ProcessLayer(OGRLayerH hSrcLayer, bool bSRSIsSet,
     /* -------------------------------------------------------------------- */
     int iBurnField = -1;
     bool bUseInt64 = false;
-    if (pszBurnAttribute)
+    if (!osBurnAttribute.empty())
     {
         OGRFeatureDefnH hLayerDefn = OGR_L_GetLayerDefn(hSrcLayer);
-        iBurnField = OGR_FD_GetFieldIndex(hLayerDefn, pszBurnAttribute);
+        iBurnField = OGR_FD_GetFieldIndex(hLayerDefn, osBurnAttribute.c_str());
         if (iBurnField == -1)
         {
             CPLError(CE_Failure, CPLE_AppDefined,
-                     "Failed to find field %s on layer %s.", pszBurnAttribute,
+                     "Failed to find field %s on layer %s.",
+                     osBurnAttribute.c_str(),
                      OGR_FD_GetName(OGR_L_GetLayerDefn(hSrcLayer)));
             if (hCT != nullptr)
                 OCTDestroyCoordinateTransformation(hCT);
@@ -350,7 +636,7 @@ static CPLErr ProcessLayer(OGRLayerH hSrcLayer, bool bSRSIsSet,
                 adfFullBurnValues.push_back(adfBurnValues[std::min(
                     iBand,
                     static_cast<unsigned int>(adfBurnValues.size()) - 1)]);
-            else if (pszBurnAttribute)
+            else if (!osBurnAttribute.empty())
             {
                 if (bUseInt64)
                     anFullBurnValues.push_back(
@@ -481,8 +767,8 @@ static GDALDatasetH CreateOutputDataset(
     const std::vector<OGRLayerH> &ahLayers, OGRSpatialReferenceH hSRS,
     OGREnvelope sEnvelop, GDALDriverH hDriver, const char *pszDest, int nXSize,
     int nYSize, double dfXRes, double dfYRes, bool bTargetAlignedPixels,
-    int nBandCount, GDALDataType eOutputType, char **papszCreationOptions,
-    const std::vector<double> &adfInitVals, int bNoDataSet, double dfNoData)
+    int nBandCount, GDALDataType eOutputType, CSLConstList papszCreationOptions,
+    const std::vector<double> &adfInitVals, const char *pszNoData)
 {
     bool bFirstLayer = true;
     char *pszWKT = nullptr;
@@ -598,12 +884,16 @@ static GDALDatasetH CreateOutputDataset(
         }
     }*/
 
-    if (bNoDataSet)
+    if (pszNoData)
     {
         for (int iBand = 0; iBand < nBandCount; iBand++)
         {
             GDALRasterBandH hBand = GDALGetRasterBand(hDstDS, iBand + 1);
-            GDALSetRasterNoDataValue(hBand, dfNoData);
+            if (GDALGetRasterDataType(hBand) == GDT_Int64)
+                GDALSetRasterNoDataValueAsInt64(hBand,
+                                                CPLAtoGIntBig(pszNoData));
+            else
+                GDALSetRasterNoDataValue(hBand, CPLAtof(pszNoData));
         }
     }
 
@@ -621,42 +911,6 @@ static GDALDatasetH CreateOutputDataset(
     return hDstDS;
 }
 
-struct GDALRasterizeOptions
-{
-    /*! output format. Use the short format name. */
-    char *pszFormat;
-
-    /*! the progress function to use */
-    GDALProgressFunc pfnProgress;
-
-    /*! pointer to the progress data variable */
-    void *pProgressData;
-
-    bool bCreateOutput;
-    bool b3D;
-    bool bInverse;
-    char **papszLayers;
-    char *pszSQL;
-    char *pszDialect;
-    char *pszBurnAttribute;
-    char *pszWHERE;
-    std::vector<int> anBandList;
-    std::vector<double> adfBurnValues;
-    char **papszRasterizeOptions;
-    char **papszTO;
-    double dfXRes;
-    double dfYRes;
-    char **papszCreationOptions;
-    GDALDataType eOutputType;
-    std::vector<double> adfInitVals;
-    int bNoDataSet;
-    double dfNoData;
-    OGREnvelope sEnvelop;
-    int nXSize, nYSize;
-    OGRSpatialReferenceH hSRS;
-    bool bTargetAlignedPixels;
-};
-
 /************************************************************************/
 /*                             GDALRasterize()                          */
 /************************************************************************/
@@ -731,7 +985,7 @@ GDALDatasetH GDALRasterize(const char *pszDest, GDALDatasetH hDstDS,
     if (pszDest == nullptr)
         pszDest = GDALGetDescription(hDstDS);
 
-    if (psOptions->pszSQL == nullptr && psOptions->papszLayers == nullptr &&
+    if (psOptions->osSQL.empty() && psOptions->aosLayers.empty() &&
         GDALDatasetGetLayerCount(hSrcDataset) != 1)
     {
         CPLError(CE_Failure, CPLE_NotSupported,
@@ -753,7 +1007,7 @@ GDALDatasetH GDALRasterize(const char *pszDest, GDALDatasetH hDstDS,
     if (bCreateOutput)
     {
         CPLString osFormat;
-        if (psOptions->pszFormat == nullptr)
+        if (psOptions->osFormat.empty())
         {
             osFormat = GetOutputDriverForRaster(pszDest);
             if (osFormat.empty())
@@ -764,7 +1018,7 @@ GDALDatasetH GDALRasterize(const char *pszDest, GDALDatasetH hDstDS,
         }
         else
         {
-            osFormat = psOptions->pszFormat;
+            osFormat = psOptions->osFormat;
         }
 
         /* --------------------------------------------------------------------
@@ -790,15 +1044,52 @@ GDALDatasetH GDALRasterize(const char *pszDest, GDALDatasetH hDstDS,
         }
     }
 
+    const auto GetOutputDataType = [&](OGRLayerH hLayer)
+    {
+        CPLAssert(bCreateOutput);
+        CPLAssert(hDriver);
+        GDALDataType eOutputType = psOptions->eOutputType;
+        if (eOutputType == GDT_Unknown && !psOptions->osBurnAttribute.empty())
+        {
+            OGRFeatureDefnH hLayerDefn = OGR_L_GetLayerDefn(hLayer);
+            const int iBurnField = OGR_FD_GetFieldIndex(
+                hLayerDefn, psOptions->osBurnAttribute.c_str());
+            if (iBurnField >= 0 && OGR_Fld_GetType(OGR_FD_GetFieldDefn(
+                                       hLayerDefn, iBurnField)) == OFTInteger64)
+            {
+                const char *pszMD = GDALGetMetadataItem(
+                    hDriver, GDAL_DMD_CREATIONDATATYPES, nullptr);
+                if (pszMD && CPLStringList(CSLTokenizeString2(pszMD, " ", 0))
+                                     .FindString("Int64") >= 0)
+                {
+                    eOutputType = GDT_Int64;
+                }
+            }
+        }
+        if (eOutputType == GDT_Unknown)
+        {
+            eOutputType = GDT_Float64;
+        }
+        return eOutputType;
+    };
+
+    // Store SRS handle
+    OGRSpatialReferenceH hSRS =
+        psOptions->oOutputSRS.IsEmpty()
+            ? nullptr
+            : OGRSpatialReference::ToHandle(
+                  const_cast<OGRSpatialReference *>(&psOptions->oOutputSRS));
+
     /* -------------------------------------------------------------------- */
     /*      Process SQL request.                                            */
     /* -------------------------------------------------------------------- */
     CPLErr eErr = CE_Failure;
 
-    if (psOptions->pszSQL != nullptr)
+    if (!psOptions->osSQL.empty())
     {
-        OGRLayerH hLayer = GDALDatasetExecuteSQL(
-            hSrcDataset, psOptions->pszSQL, nullptr, psOptions->pszDialect);
+        OGRLayerH hLayer =
+            GDALDatasetExecuteSQL(hSrcDataset, psOptions->osSQL.c_str(),
+                                  nullptr, psOptions->osDialect.c_str());
         if (hLayer != nullptr)
         {
             if (bCreateOutput)
@@ -806,33 +1097,14 @@ GDALDatasetH GDALRasterize(const char *pszDest, GDALDatasetH hDstDS,
                 std::vector<OGRLayerH> ahLayers;
                 ahLayers.push_back(hLayer);
 
-                GDALDataType eOutputType = psOptions->eOutputType;
-                if (eOutputType == GDT_Unknown &&
-                    psOptions->pszBurnAttribute != nullptr)
-                {
-                    OGRFeatureDefnH hLayerDefn = OGR_L_GetLayerDefn(hLayer);
-                    int iBurnField = OGR_FD_GetFieldIndex(
-                        hLayerDefn, psOptions->pszBurnAttribute);
-                    if (iBurnField >= 0 &&
-                        OGR_Fld_GetType(OGR_FD_GetFieldDefn(
-                            hLayerDefn, iBurnField)) == OFTInteger64)
-                    {
-                        eOutputType = GDT_Int64;
-                    }
-                }
-                if (eOutputType == GDT_Unknown)
-                {
-                    eOutputType = GDT_Float64;
-                }
-
+                const GDALDataType eOutputType = GetOutputDataType(hLayer);
                 hDstDS = CreateOutputDataset(
-                    ahLayers, psOptions->hSRS, psOptions->sEnvelop, hDriver,
-                    pszDest, psOptions->nXSize, psOptions->nYSize,
-                    psOptions->dfXRes, psOptions->dfYRes,
-                    psOptions->bTargetAlignedPixels,
+                    ahLayers, hSRS, psOptions->sEnvelop, hDriver, pszDest,
+                    psOptions->nXSize, psOptions->nYSize, psOptions->dfXRes,
+                    psOptions->dfYRes, psOptions->bTargetAlignedPixels,
                     static_cast<int>(psOptions->anBandList.size()), eOutputType,
-                    psOptions->papszCreationOptions, psOptions->adfInitVals,
-                    psOptions->bNoDataSet, psOptions->dfNoData);
+                    psOptions->aosCreationOptions, psOptions->adfInitVals,
+                    psOptions->osNoData.c_str());
                 if (hDstDS == nullptr)
                 {
                     GDALDatasetReleaseResultSet(hSrcDataset, hLayer);
@@ -842,10 +1114,10 @@ GDALDatasetH GDALRasterize(const char *pszDest, GDALDatasetH hDstDS,
             }
 
             eErr = ProcessLayer(
-                hLayer, psOptions->hSRS != nullptr, hDstDS,
-                psOptions->anBandList, psOptions->adfBurnValues, psOptions->b3D,
-                psOptions->bInverse, psOptions->pszBurnAttribute,
-                psOptions->papszRasterizeOptions, psOptions->papszTO,
+                hLayer, hSRS != nullptr, hDstDS, psOptions->anBandList,
+                psOptions->adfBurnValues, psOptions->b3D, psOptions->bInverse,
+                psOptions->osBurnAttribute.c_str(),
+                psOptions->aosRasterizeOptions, psOptions->aosTO,
                 psOptions->pfnProgress, psOptions->pProgressData);
 
             GDALDatasetReleaseResultSet(hSrcDataset, hLayer);
@@ -856,9 +1128,9 @@ GDALDatasetH GDALRasterize(const char *pszDest, GDALDatasetH hDstDS,
     /*      Create output file if necessary.                                */
     /* -------------------------------------------------------------------- */
     const int nLayerCount =
-        (psOptions->pszSQL == nullptr && psOptions->papszLayers == nullptr)
+        (psOptions->osSQL.empty() && psOptions->aosLayers.empty())
             ? 1
-            : CSLCount(psOptions->papszLayers);
+            : static_cast<int>(psOptions->aosLayers.size());
 
     if (bCreateOutput && hDstDS == nullptr)
     {
@@ -869,31 +1141,25 @@ GDALDatasetH GDALRasterize(const char *pszDest, GDALDatasetH hDstDS,
         for (int i = 0; i < nLayerCount; i++)
         {
             OGRLayerH hLayer;
-            if (psOptions->papszLayers)
-                hLayer = GDALDatasetGetLayerByName(hSrcDataset,
-                                                   psOptions->papszLayers[i]);
+            if (psOptions->aosLayers.size() > static_cast<size_t>(i))
+                hLayer = GDALDatasetGetLayerByName(
+                    hSrcDataset, psOptions->aosLayers[i].c_str());
             else
                 hLayer = GDALDatasetGetLayer(hSrcDataset, 0);
             if (hLayer == nullptr)
             {
-                CPLError(
-                    CE_Failure, CPLE_AppDefined, "Unable to find layer \"%s\".",
-                    psOptions->papszLayers ? psOptions->papszLayers[i] : "0");
+                CPLError(CE_Failure, CPLE_AppDefined,
+                         "Unable to find layer \"%s\".",
+                         psOptions->aosLayers.size() > static_cast<size_t>(i)
+                             ? psOptions->aosLayers[i].c_str()
+                             : "0");
                 GDALRasterizeOptionsFree(psOptionsToFree);
                 return nullptr;
             }
-            if (eOutputType == GDT_Unknown &&
-                psOptions->pszBurnAttribute != nullptr)
+            if (eOutputType == GDT_Unknown)
             {
-                OGRFeatureDefnH hLayerDefn = OGR_L_GetLayerDefn(hLayer);
-                int iBurnField = OGR_FD_GetFieldIndex(
-                    hLayerDefn, psOptions->pszBurnAttribute);
-                if (iBurnField >= 0 &&
-                    OGR_Fld_GetType(OGR_FD_GetFieldDefn(
-                        hLayerDefn, iBurnField)) == OFTInteger64)
-                {
+                if (GetOutputDataType(hLayer) == GDT_Int64)
                     eOutputType = GDT_Int64;
-                }
             }
 
             ahLayers.push_back(hLayer);
@@ -905,12 +1171,12 @@ GDALDatasetH GDALRasterize(const char *pszDest, GDALDatasetH hDstDS,
         }
 
         hDstDS = CreateOutputDataset(
-            ahLayers, psOptions->hSRS, psOptions->sEnvelop, hDriver, pszDest,
+            ahLayers, hSRS, psOptions->sEnvelop, hDriver, pszDest,
             psOptions->nXSize, psOptions->nYSize, psOptions->dfXRes,
             psOptions->dfYRes, psOptions->bTargetAlignedPixels,
             static_cast<int>(psOptions->anBandList.size()), eOutputType,
-            psOptions->papszCreationOptions, psOptions->adfInitVals,
-            psOptions->bNoDataSet, psOptions->dfNoData);
+            psOptions->aosCreationOptions, psOptions->adfInitVals,
+            psOptions->osNoData.c_str());
         if (hDstDS == nullptr)
         {
             GDALRasterizeOptionsFree(psOptionsToFree);
@@ -925,23 +1191,25 @@ GDALDatasetH GDALRasterize(const char *pszDest, GDALDatasetH hDstDS,
     for (int i = 0; i < nLayerCount; i++)
     {
         OGRLayerH hLayer;
-        if (psOptions->papszLayers)
+        if (psOptions->aosLayers.size() > static_cast<size_t>(i))
             hLayer = GDALDatasetGetLayerByName(hSrcDataset,
-                                               psOptions->papszLayers[i]);
+                                               psOptions->aosLayers[i].c_str());
         else
             hLayer = GDALDatasetGetLayer(hSrcDataset, 0);
         if (hLayer == nullptr)
         {
             CPLError(CE_Failure, CPLE_AppDefined,
                      "Unable to find layer \"%s\".",
-                     psOptions->papszLayers ? psOptions->papszLayers[i] : "0");
+                     psOptions->aosLayers.size() > static_cast<size_t>(i)
+                         ? psOptions->aosLayers[i].c_str()
+                         : "0");
             eErr = CE_Failure;
             break;
         }
 
-        if (psOptions->pszWHERE)
+        if (!psOptions->osWHERE.empty())
         {
-            if (OGR_L_SetAttributeFilter(hLayer, psOptions->pszWHERE) !=
+            if (OGR_L_SetAttributeFilter(hLayer, psOptions->osWHERE.c_str()) !=
                 OGRERR_NONE)
             {
                 eErr = CE_Failure;
@@ -953,11 +1221,12 @@ GDALDatasetH GDALRasterize(const char *pszDest, GDALDatasetH hDstDS,
             0.0, 1.0 * (i + 1) / nLayerCount, psOptions->pfnProgress,
             psOptions->pProgressData);
 
-        eErr = ProcessLayer(
-            hLayer, psOptions->hSRS != nullptr, hDstDS, psOptions->anBandList,
-            psOptions->adfBurnValues, psOptions->b3D, psOptions->bInverse,
-            psOptions->pszBurnAttribute, psOptions->papszRasterizeOptions,
-            psOptions->papszTO, GDALScaledProgress, pScaledProgress);
+        eErr = ProcessLayer(hLayer, !psOptions->oOutputSRS.IsEmpty(), hDstDS,
+                            psOptions->anBandList, psOptions->adfBurnValues,
+                            psOptions->b3D, psOptions->bInverse,
+                            psOptions->osBurnAttribute.c_str(),
+                            psOptions->aosRasterizeOptions, psOptions->aosTO,
+                            GDALScaledProgress, pScaledProgress);
 
         GDALDestroyScaledProgress(pScaledProgress);
         if (eErr != CE_None)
@@ -976,6 +1245,18 @@ GDALDatasetH GDALRasterize(const char *pszDest, GDALDatasetH hDstDS,
     return hDstDS;
 }
 
+/************************************************************************/
+/*                       ArgIsNumericRasterize()                        */
+/************************************************************************/
+
+static bool ArgIsNumericRasterize(const char *pszArg)
+
+{
+    char *pszEnd = nullptr;
+    CPLStrtod(pszArg, &pszEnd);
+    return pszEnd != nullptr && pszEnd[0] == '\0';
+}
+
 /************************************************************************/
 /*                           GDALRasterizeOptionsNew()                  */
 /************************************************************************/
@@ -1000,70 +1281,36 @@ GDALRasterizeOptions *
 GDALRasterizeOptionsNew(char **papszArgv,
                         GDALRasterizeOptionsForBinary *psOptionsForBinary)
 {
-    GDALRasterizeOptions *psOptions = new GDALRasterizeOptions;
-
-    psOptions->pszFormat = nullptr;
-    psOptions->pfnProgress = GDALDummyProgress;
-    psOptions->pProgressData = nullptr;
-    psOptions->bCreateOutput = false;
-    psOptions->b3D = false;
-    psOptions->bInverse = false;
-    // sEnvelop implicitly initialized
-    psOptions->papszCreationOptions = nullptr;
-    psOptions->papszLayers = nullptr;
-    psOptions->pszSQL = nullptr;
-    psOptions->pszDialect = nullptr;
-    psOptions->pszBurnAttribute = nullptr;
-    psOptions->pszWHERE = nullptr;
-    psOptions->papszRasterizeOptions = nullptr;
-    psOptions->papszTO = nullptr;
-    psOptions->dfXRes = 0;
-    psOptions->dfYRes = 0;
-    psOptions->eOutputType = GDT_Unknown;
-    psOptions->bNoDataSet = FALSE;
-    psOptions->dfNoData = 0;
-    psOptions->nXSize = 0;
-    psOptions->nYSize = 0;
-    psOptions->hSRS = nullptr;
-    psOptions->bTargetAlignedPixels = false;
-
-    bool bGotSourceFilename = false;
-    bool bGotDestFilename = false;
+
+    auto psOptions = std::make_unique<GDALRasterizeOptions>();
+
+    /*-------------------------------------------------------------------- */
+    /*      Parse arguments.                                               */
+    /*-------------------------------------------------------------------- */
+
+    CPLStringList aosArgv;
+
     /* -------------------------------------------------------------------- */
-    /*      Handle command line arguments.                                  */
+    /*      Pre-processing for custom syntax that ArgumentParser does not   */
+    /*      support.                                                        */
     /* -------------------------------------------------------------------- */
     const int argc = CSLCount(papszArgv);
-    for (int i = 0; papszArgv != nullptr && i < argc; i++)
+    for (int i = 0; i < argc && papszArgv != nullptr && papszArgv[i] != nullptr;
+         i++)
     {
-        if (i < argc - 1 &&
-            (EQUAL(papszArgv[i], "-of") || EQUAL(papszArgv[i], "-f")))
+        // argparser will be confused if the value of a string argument
+        // starts with a negative sign.
+        if (EQUAL(papszArgv[i], "-a_nodata") && papszArgv[i + 1])
         {
             ++i;
-            CPLFree(psOptions->pszFormat);
-            psOptions->pszFormat = CPLStrdup(papszArgv[i]);
+            const std::string s = papszArgv[i];
+            psOptions->osNoData = s;
             psOptions->bCreateOutput = true;
         }
 
-        else if (EQUAL(papszArgv[i], "-q") || EQUAL(papszArgv[i], "-quiet"))
-        {
-            if (psOptionsForBinary)
-            {
-                psOptionsForBinary->bQuiet = true;
-            }
-            else
-            {
-                CPLError(CE_Failure, CPLE_NotSupported,
-                         "%s switch only supported from gdal_rasterize binary.",
-                         papszArgv[i]);
-            }
-        }
-
-        else if (i < argc - 1 && EQUAL(papszArgv[i], "-a"))
-        {
-            CPLFree(psOptions->pszBurnAttribute);
-            psOptions->pszBurnAttribute = CPLStrdup(papszArgv[++i]);
-        }
-        else if (i < argc - 1 && EQUAL(papszArgv[i], "-b"))
+        // argparser is confused by arguments that have at_least_one
+        // cardinality, if they immediately precede positional arguments.
+        else if (EQUAL(papszArgv[i], "-burn") && papszArgv[i + 1])
         {
             if (strchr(papszArgv[i + 1], ' '))
             {
@@ -1071,7 +1318,7 @@ GDALRasterizeOptionsNew(char **papszArgv,
                     CSLTokenizeString(papszArgv[i + 1]));
                 for (const char *pszToken : aosTokens)
                 {
-                    psOptions->anBandList.push_back(atoi(pszToken));
+                    psOptions->adfBurnValues.push_back(CPLAtof(pszToken));
                 }
                 i += 1;
             }
@@ -1079,42 +1326,18 @@ GDALRasterizeOptionsNew(char **papszArgv,
             {
                 while (i < argc - 1 && ArgIsNumericRasterize(papszArgv[i + 1]))
                 {
-                    psOptions->anBandList.push_back(atoi(papszArgv[i + 1]));
+                    psOptions->adfBurnValues.push_back(
+                        CPLAtof(papszArgv[i + 1]));
                     i += 1;
                 }
             }
+
+            // Dummy value to make argparse happy, as at least one of
+            // -burn, -a or -3d is required
+            aosArgv.AddString("-burn");
+            aosArgv.AddString("0");
         }
-        else if (EQUAL(papszArgv[i], "-3d"))
-        {
-            psOptions->b3D = true;
-            psOptions->papszRasterizeOptions = CSLSetNameValue(
-                psOptions->papszRasterizeOptions, "BURN_VALUE_FROM", "Z");
-        }
-        else if (EQUAL(papszArgv[i], "-add"))
-        {
-            psOptions->papszRasterizeOptions = CSLSetNameValue(
-                psOptions->papszRasterizeOptions, "MERGE_ALG", "ADD");
-        }
-        else if (i < argc - 1 && EQUAL(papszArgv[i], "-chunkysize"))
-        {
-            psOptions->papszRasterizeOptions = CSLSetNameValue(
-                psOptions->papszRasterizeOptions, "CHUNKYSIZE", papszArgv[++i]);
-        }
-        else if (EQUAL(papszArgv[i], "-i"))
-        {
-            psOptions->bInverse = true;
-        }
-        else if (EQUAL(papszArgv[i], "-at"))
-        {
-            psOptions->papszRasterizeOptions = CSLSetNameValue(
-                psOptions->papszRasterizeOptions, "ALL_TOUCHED", "TRUE");
-        }
-        else if (i < argc - 1 && EQUAL(papszArgv[i], "-optim"))
-        {
-            psOptions->papszRasterizeOptions = CSLSetNameValue(
-                psOptions->papszRasterizeOptions, "OPTIM", papszArgv[++i]);
-        }
-        else if (i < argc - 1 && EQUAL(papszArgv[i], "-burn"))
+        else if (EQUAL(papszArgv[i], "-init") && papszArgv[i + 1])
         {
             if (strchr(papszArgv[i + 1], ' '))
             {
@@ -1122,7 +1345,7 @@ GDALRasterizeOptionsNew(char **papszArgv,
                     CSLTokenizeString(papszArgv[i + 1]));
                 for (const char *pszToken : aosTokens)
                 {
-                    psOptions->adfBurnValues.push_back(CPLAtof(pszToken));
+                    psOptions->adfInitVals.push_back(CPLAtof(pszToken));
                 }
                 i += 1;
             }
@@ -1130,48 +1353,13 @@ GDALRasterizeOptionsNew(char **papszArgv,
             {
                 while (i < argc - 1 && ArgIsNumericRasterize(papszArgv[i + 1]))
                 {
-                    psOptions->adfBurnValues.push_back(
-                        CPLAtof(papszArgv[i + 1]));
+                    psOptions->adfInitVals.push_back(CPLAtof(papszArgv[i + 1]));
                     i += 1;
                 }
             }
+            psOptions->bCreateOutput = true;
         }
-        else if (i < argc - 1 && EQUAL(papszArgv[i], "-where"))
-        {
-            CPLFree(psOptions->pszWHERE);
-            psOptions->pszWHERE = CPLStrdup(papszArgv[++i]);
-        }
-        else if (i < argc - 1 && EQUAL(papszArgv[i], "-l"))
-        {
-            psOptions->papszLayers =
-                CSLAddString(psOptions->papszLayers, papszArgv[++i]);
-        }
-        else if (i < argc - 1 && EQUAL(papszArgv[i], "-sql"))
-        {
-            ++i;
-            CPLFree(psOptions->pszSQL);
-            GByte *pabyRet = nullptr;
-            if (papszArgv[i][0] == '@' &&
-                VSIIngestFile(nullptr, papszArgv[i] + 1, &pabyRet, nullptr,
-                              1024 * 1024))
-            {
-                GDALRemoveBOM(pabyRet);
-                char *pszSQLStatement = reinterpret_cast<char *>(pabyRet);
-                psOptions->pszSQL =
-                    CPLStrdup(GDALRemoveSQLComments(pszSQLStatement).c_str());
-                VSIFree(pszSQLStatement);
-            }
-            else
-            {
-                psOptions->pszSQL = CPLStrdup(papszArgv[i]);
-            }
-        }
-        else if (i < argc - 1 && EQUAL(papszArgv[i], "-dialect"))
-        {
-            CPLFree(psOptions->pszDialect);
-            psOptions->pszDialect = CPLStrdup(papszArgv[++i]);
-        }
-        else if (i < argc - 1 && EQUAL(papszArgv[i], "-init"))
+        else if (EQUAL(papszArgv[i], "-b") && papszArgv[i + 1])
         {
             if (strchr(papszArgv[i + 1], ' '))
             {
@@ -1179,7 +1367,7 @@ GDALRasterizeOptionsNew(char **papszArgv,
                     CSLTokenizeString(papszArgv[i + 1]));
                 for (const char *pszToken : aosTokens)
                 {
-                    psOptions->adfInitVals.push_back(CPLAtof(pszToken));
+                    psOptions->anBandList.push_back(atoi(pszToken));
                 }
                 i += 1;
             }
@@ -1187,263 +1375,138 @@ GDALRasterizeOptionsNew(char **papszArgv,
             {
                 while (i < argc - 1 && ArgIsNumericRasterize(papszArgv[i + 1]))
                 {
-                    psOptions->adfInitVals.push_back(CPLAtof(papszArgv[i + 1]));
+                    psOptions->anBandList.push_back(atoi(papszArgv[i + 1]));
                     i += 1;
                 }
             }
-            psOptions->bCreateOutput = true;
         }
-        else if (i < argc - 1 && EQUAL(papszArgv[i], "-a_nodata"))
+        else
         {
-            psOptions->dfNoData = CPLAtof(papszArgv[i + 1]);
-            psOptions->bNoDataSet = TRUE;
-            i += 1;
-            psOptions->bCreateOutput = true;
+            aosArgv.AddString(papszArgv[i]);
         }
-        else if (i < argc - 1 && EQUAL(papszArgv[i], "-a_srs"))
-        {
-            OSRDestroySpatialReference(psOptions->hSRS);
-            psOptions->hSRS = OSRNewSpatialReference(nullptr);
-
-            if (OSRSetFromUserInput(psOptions->hSRS, papszArgv[i + 1]) !=
-                OGRERR_NONE)
-            {
-                CPLError(CE_Failure, CPLE_AppDefined,
-                         "Failed to process SRS definition: %s",
-                         papszArgv[i + 1]);
-                GDALRasterizeOptionsFree(psOptions);
-                return nullptr;
-            }
+    }
 
-            i++;
-            psOptions->bCreateOutput = true;
-        }
+    try
+    {
+        auto argParser =
+            GDALRasterizeOptionsGetParser(psOptions.get(), psOptionsForBinary);
+        argParser->parse_args_without_binary_name(aosArgv.List());
 
-        else if (i < argc - 4 && EQUAL(papszArgv[i], "-te"))
-        {
-            psOptions->sEnvelop.MinX = CPLAtof(papszArgv[++i]);
-            psOptions->sEnvelop.MinY = CPLAtof(papszArgv[++i]);
-            psOptions->sEnvelop.MaxX = CPLAtof(papszArgv[++i]);
-            psOptions->sEnvelop.MaxY = CPLAtof(papszArgv[++i]);
-            psOptions->bCreateOutput = true;
-        }
-        else if (i < argc - 4 && EQUAL(papszArgv[i], "-a_ullr"))
-        {
-            psOptions->sEnvelop.MinX = CPLAtof(papszArgv[++i]);
-            psOptions->sEnvelop.MaxY = CPLAtof(papszArgv[++i]);
-            psOptions->sEnvelop.MaxX = CPLAtof(papszArgv[++i]);
-            psOptions->sEnvelop.MinY = CPLAtof(papszArgv[++i]);
-            psOptions->bCreateOutput = true;
-        }
-        else if (i < argc - 1 && EQUAL(papszArgv[i], "-co"))
+        // Check all no store_into args
+        if (auto oTe = argParser->present<std::vector<double>>("-te"))
         {
-            psOptions->papszCreationOptions =
-                CSLAddString(psOptions->papszCreationOptions, papszArgv[++i]);
+            psOptions->sEnvelop.MinX = oTe.value()[0];
+            psOptions->sEnvelop.MinY = oTe.value()[1];
+            psOptions->sEnvelop.MaxX = oTe.value()[2];
+            psOptions->sEnvelop.MaxY = oTe.value()[3];
             psOptions->bCreateOutput = true;
         }
-        else if (i < argc - 1 && EQUAL(papszArgv[i], "-ot"))
+
+        if (auto oTr = argParser->present<std::vector<double>>("-tr"))
         {
-            for (int iType = 1; iType < GDT_TypeCount; iType++)
-            {
-                const GDALDataType eType = static_cast<GDALDataType>(iType);
-                if (GDALGetDataTypeName(eType) != nullptr &&
-                    EQUAL(GDALGetDataTypeName(eType), papszArgv[i + 1]))
-                {
-                    psOptions->eOutputType = eType;
-                }
-            }
+            psOptions->dfXRes = oTr.value()[0];
+            psOptions->dfYRes = oTr.value()[1];
 
-            if (psOptions->eOutputType == GDT_Unknown)
+            if (psOptions->dfXRes <= 0 || psOptions->dfYRes <= 0)
             {
                 CPLError(CE_Failure, CPLE_AppDefined,
-                         "Unknown output pixel type: %s", papszArgv[i + 1]);
-                GDALRasterizeOptionsFree(psOptions);
+                         "Wrong value for -tr parameter.");
                 return nullptr;
             }
-            i++;
+
             psOptions->bCreateOutput = true;
         }
-        else if (i < argc - 2 && (EQUAL(papszArgv[i], "-ts") ||
-                                  EQUAL(papszArgv[i], "-outsize")))
+
+        if (auto oTs = argParser->present<std::vector<int>>("-ts"))
         {
-            psOptions->nXSize = atoi(papszArgv[++i]);
-            psOptions->nYSize = atoi(papszArgv[++i]);
+            psOptions->nXSize = oTs.value()[0];
+            psOptions->nYSize = oTs.value()[1];
+
             if (psOptions->nXSize <= 0 || psOptions->nYSize <= 0)
             {
                 CPLError(CE_Failure, CPLE_AppDefined,
                          "Wrong value for -ts parameter.");
-                GDALRasterizeOptionsFree(psOptions);
                 return nullptr;
             }
+
             psOptions->bCreateOutput = true;
         }
-        else if (i < argc - 2 && EQUAL(papszArgv[i], "-tr"))
+
+        if (psOptions->bCreateOutput)
         {
-            psOptions->dfXRes = CPLAtof(papszArgv[++i]);
-            psOptions->dfYRes = fabs(CPLAtof(papszArgv[++i]));
-            if (psOptions->dfXRes == 0 || psOptions->dfYRes == 0)
+            if (psOptions->dfXRes == 0 && psOptions->dfYRes == 0 &&
+                psOptions->nXSize == 0 && psOptions->nYSize == 0)
             {
-                CPLError(CE_Failure, CPLE_AppDefined,
-                         "Wrong value for -tr parameter.");
-                GDALRasterizeOptionsFree(psOptions);
+                CPLError(CE_Failure, CPLE_NotSupported,
+                         "'-tr xres yres' or '-ts xsize ysize' is required.");
                 return nullptr;
             }
-            psOptions->bCreateOutput = true;
-        }
-        else if (EQUAL(papszArgv[i], "-tap"))
-        {
-            psOptions->bTargetAlignedPixels = true;
-            psOptions->bCreateOutput = true;
-        }
-        else if (i < argc - 1 && EQUAL(papszArgv[i], "-to"))
-        {
-            psOptions->papszTO =
-                CSLAddString(psOptions->papszTO, papszArgv[++i]);
-        }
-        else if (i < argc - 1 && EQUAL(papszArgv[i], "-oo"))
-        {
-            i++;
-            if (psOptionsForBinary)
+
+            if (psOptions->bTargetAlignedPixels && psOptions->dfXRes == 0 &&
+                psOptions->dfYRes == 0)
             {
-                psOptionsForBinary->aosOpenOptions.AddString(papszArgv[i]);
+                CPLError(CE_Failure, CPLE_NotSupported,
+                         "-tap option cannot be used without using -tr.");
+                return nullptr;
             }
-            else
+
+            if (!psOptions->anBandList.empty())
             {
                 CPLError(
                     CE_Failure, CPLE_NotSupported,
-                    "-oo switch only supported from gdal_rasterize binary.");
-            }
-        }
-        else if (papszArgv[i][0] == '-')
-        {
-            CPLError(CE_Failure, CPLE_NotSupported, "Unknown option name '%s'",
-                     papszArgv[i]);
-            GDALRasterizeOptionsFree(psOptions);
-            return nullptr;
-        }
-        else if (!bGotSourceFilename)
-        {
-            bGotSourceFilename = true;
-            if (psOptionsForBinary)
-            {
-                psOptionsForBinary->osSource = papszArgv[i];
-            }
-            else
-            {
-                CPLError(CE_Failure, CPLE_NotSupported,
-                         "{source_filename} only supported from gdal_rasterize "
-                         "binary.");
-            }
-        }
-        else if (!bGotDestFilename)
-        {
-            bGotDestFilename = true;
-            if (psOptionsForBinary)
-            {
-                psOptionsForBinary->bDestSpecified = true;
-                psOptionsForBinary->osDest = papszArgv[i];
+                    "-b option cannot be used when creating a GDAL dataset.");
+                return nullptr;
             }
-            else
+
+            int nBandCount = 1;
+
+            if (!psOptions->adfBurnValues.empty())
+                nBandCount = static_cast<int>(psOptions->adfBurnValues.size());
+
+            if (static_cast<int>(psOptions->adfInitVals.size()) > nBandCount)
+                nBandCount = static_cast<int>(psOptions->adfInitVals.size());
+
+            if (psOptions->adfInitVals.size() == 1)
             {
-                CPLError(CE_Failure, CPLE_NotSupported,
-                         "{dest_filename} only supported from gdal_rasterize "
-                         "binary.");
+                for (int i = 1; i <= nBandCount - 1; i++)
+                    psOptions->adfInitVals.push_back(psOptions->adfInitVals[0]);
             }
-        }
-        else
-        {
-            CPLError(CE_Failure, CPLE_NotSupported,
-                     "Too many command options '%s'", papszArgv[i]);
-            GDALRasterizeOptionsFree(psOptions);
-            return nullptr;
-        }
-    }
 
-    int nExclusiveOptionsCount = 0;
-    nExclusiveOptionsCount += !psOptions->adfBurnValues.empty() ? 1 : 0;
-    nExclusiveOptionsCount += psOptions->pszBurnAttribute != nullptr ? 1 : 0;
-    nExclusiveOptionsCount += psOptions->b3D ? 1 : 0;
-    if (nExclusiveOptionsCount != 1)
-    {
-        if (nExclusiveOptionsCount == 0 && psOptionsForBinary == nullptr)
-        {
-            psOptions->adfBurnValues.push_back(255);
+            for (int i = 1; i <= nBandCount; i++)
+                psOptions->anBandList.push_back(i);
         }
         else
         {
-            CPLError(CE_Failure, CPLE_NotSupported,
-                     "One and only one of -3d, -burn or -a is required.");
-            GDALRasterizeOptionsFree(psOptions);
-            return nullptr;
-        }
-    }
-
-    if (psOptions->bCreateOutput)
-    {
-        if (psOptions->dfXRes == 0 && psOptions->dfYRes == 0 &&
-            psOptions->nXSize == 0 && psOptions->nYSize == 0)
-        {
-            CPLError(CE_Failure, CPLE_NotSupported,
-                     "'-tr xres yres' or '-ts xsize ysize' is required.");
-            GDALRasterizeOptionsFree(psOptions);
-            return nullptr;
+            if (psOptions->anBandList.empty())
+                psOptions->anBandList.push_back(1);
         }
 
-        if (psOptions->bTargetAlignedPixels && psOptions->dfXRes == 0 &&
-            psOptions->dfYRes == 0)
+        if (!psOptions->osDialect.empty() && !psOptions->osWHERE.empty() &&
+            !psOptions->osSQL.empty())
         {
-            CPLError(CE_Failure, CPLE_NotSupported,
-                     "-tap option cannot be used without using -tr.");
-            GDALRasterizeOptionsFree(psOptions);
-            return nullptr;
+            CPLError(CE_Warning, CPLE_AppDefined,
+                     "-dialect is ignored with -where. Use -sql instead");
         }
 
-        if (!psOptions->anBandList.empty())
+        if (psOptionsForBinary)
         {
-            CPLError(CE_Failure, CPLE_NotSupported,
-                     "-b option cannot be used when creating a GDAL dataset.");
-            GDALRasterizeOptionsFree(psOptions);
-            return nullptr;
+            psOptionsForBinary->bCreateOutput = psOptions->bCreateOutput;
+            if (!psOptions->osFormat.empty())
+                psOptionsForBinary->osFormat = psOptions->osFormat;
         }
-
-        int nBandCount = 1;
-
-        if (!psOptions->adfBurnValues.empty())
-            nBandCount = static_cast<int>(psOptions->adfBurnValues.size());
-
-        if (static_cast<int>(psOptions->adfInitVals.size()) > nBandCount)
-            nBandCount = static_cast<int>(psOptions->adfInitVals.size());
-
-        if (psOptions->adfInitVals.size() == 1)
+        else if (psOptions->adfBurnValues.empty() &&
+                 psOptions->osBurnAttribute.empty() && !psOptions->b3D)
         {
-            for (int i = 1; i <= nBandCount - 1; i++)
-                psOptions->adfInitVals.push_back(psOptions->adfInitVals[0]);
+            psOptions->adfBurnValues.push_back(255);
         }
-
-        for (int i = 1; i <= nBandCount; i++)
-            psOptions->anBandList.push_back(i);
-    }
-    else
-    {
-        if (psOptions->anBandList.empty())
-            psOptions->anBandList.push_back(1);
-    }
-
-    if (psOptions->pszDialect != nullptr && psOptions->pszWHERE != nullptr &&
-        psOptions->pszSQL == nullptr)
-    {
-        CPLError(CE_Warning, CPLE_AppDefined,
-                 "-dialect is ignored with -where. Use -sql instead");
     }
-
-    if (psOptionsForBinary)
+    catch (const std::exception &e)
     {
-        psOptionsForBinary->bCreateOutput = psOptions->bCreateOutput;
-        if (psOptions->pszFormat)
-            psOptionsForBinary->osFormat = psOptions->pszFormat;
+        CPLError(CE_Failure, CPLE_AppDefined, "%s", e.what());
+        return nullptr;
     }
 
-    return psOptions;
+    return psOptions.release();
 }
 
 /************************************************************************/
@@ -1460,20 +1523,6 @@ GDALRasterizeOptionsNew(char **papszArgv,
 
 void GDALRasterizeOptionsFree(GDALRasterizeOptions *psOptions)
 {
-    if (psOptions == nullptr)
-        return;
-
-    CPLFree(psOptions->pszFormat);
-    CSLDestroy(psOptions->papszCreationOptions);
-    CSLDestroy(psOptions->papszLayers);
-    CSLDestroy(psOptions->papszRasterizeOptions);
-    CSLDestroy(psOptions->papszTO);
-    CPLFree(psOptions->pszSQL);
-    CPLFree(psOptions->pszDialect);
-    CPLFree(psOptions->pszBurnAttribute);
-    CPLFree(psOptions->pszWHERE);
-    OSRDestroySpatialReference(psOptions->hSRS);
-
     delete psOptions;
 }
 
diff --git a/apps/gdal_translate_bin.cpp b/apps/gdal_translate_bin.cpp
index 71468806ba89..4332fb24653c 100644
--- a/apps/gdal_translate_bin.cpp
+++ b/apps/gdal_translate_bin.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, 2002, Frank Warmerdam
  * Copyright (c) 2007-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/apps/gdal_translate_lib.cpp b/apps/gdal_translate_lib.cpp
index c8a5f2612a1e..eabc0905355e 100644
--- a/apps/gdal_translate_lib.cpp
+++ b/apps/gdal_translate_lib.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2007-2015, Even Rouault <even dot rouault at spatialys.com>
  * Copyright (c) 2015, Faza Mahamood
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -1826,10 +1810,24 @@ GDALDatasetH GDALTranslate(const char *pszDest, GDALDatasetH hSrcDataset,
 
             const double df2 = adfSrcWinOri[2];
             const double df3 = adfSrcWinOri[3];
-            dfSAMP_OFF *= nOXSize / df2;
-            dfLINE_OFF *= nOYSize / df3;
-            dfSAMP_SCALE *= nOXSize / df2;
-            dfLINE_SCALE *= nOYSize / df3;
+            const double dfXRatio = nOXSize / df2;
+            const double dfYRatio = nOYSize / df3;
+
+            // For line offset and pixel offset, we need to convert from RPC
+            // pixel center registration convention to GDAL pixel top-left corner
+            // registration convention by adding an initial 0.5 shift, and un-apply
+            // it after scaling.
+
+            dfSAMP_OFF += 0.5;
+            dfSAMP_OFF *= dfXRatio;
+            dfSAMP_OFF -= 0.5;
+
+            dfLINE_OFF += 0.5;
+            dfLINE_OFF *= dfYRatio;
+            dfLINE_OFF -= 0.5;
+
+            dfSAMP_SCALE *= dfXRatio;
+            dfLINE_SCALE *= dfYRatio;
 
             CPLString osField;
             osField.Printf("%.15g", dfLINE_OFF);
@@ -2385,12 +2383,7 @@ GDALDatasetH GDALTranslate(const char *pszDest, GDALDatasetH hSrcDataset,
                 {
                     const double dfNoData =
                         CPLAtof(psOptions->osNoData.c_str());
-                    if (dfNoData >= static_cast<double>(
-                                        std::numeric_limits<int64_t>::min()) &&
-                        dfNoData <= static_cast<double>(
-                                        std::numeric_limits<int64_t>::max()) &&
-                        dfNoData ==
-                            static_cast<double>(static_cast<int64_t>(dfNoData)))
+                    if (GDALIsValueExactAs<int64_t>(dfNoData))
                     {
                         poVRTBand->SetNoDataValueAsInt64(
                             static_cast<int64_t>(dfNoData));
@@ -2428,12 +2421,7 @@ GDALDatasetH GDALTranslate(const char *pszDest, GDALDatasetH hSrcDataset,
                 {
                     const double dfNoData =
                         CPLAtof(psOptions->osNoData.c_str());
-                    if (dfNoData >= static_cast<double>(
-                                        std::numeric_limits<uint64_t>::min()) &&
-                        dfNoData <= static_cast<double>(
-                                        std::numeric_limits<uint64_t>::max()) &&
-                        dfNoData == static_cast<double>(
-                                        static_cast<uint64_t>(dfNoData)))
+                    if (GDALIsValueExactAs<uint64_t>(dfNoData))
                     {
                         poVRTBand->SetNoDataValueAsUInt64(
                             static_cast<uint64_t>(dfNoData));
@@ -2554,7 +2542,10 @@ GDALDatasetH GDALTranslate(const char *pszDest, GDALDatasetH hSrcDataset,
     /*      Write to the output file using CopyCreate().                    */
     /* -------------------------------------------------------------------- */
     if (EQUAL(psOptions->osFormat.c_str(), "VRT") &&
-        psOptions->aosCreateOptions.empty())
+        (psOptions->aosCreateOptions.empty() ||
+         (psOptions->aosCreateOptions.size() == 2 &&
+          psOptions->aosCreateOptions.FetchNameValue("BLOCKXSIZE") &&
+          psOptions->aosCreateOptions.FetchNameValue("BLOCKYSIZE"))))
     {
         poVDS->SetDescription(pszDest);
         hOutDS = GDALDataset::ToHandle(poVDS);
@@ -2730,18 +2721,11 @@ static void CopyBandInfo(GDALRasterBand *poSrcBand, GDALRasterBand *poDstBand,
 
 static int GetColorInterp(const char *pszStr)
 {
-    if (EQUAL(pszStr, "red"))
-        return GCI_RedBand;
-    if (EQUAL(pszStr, "green"))
-        return GCI_GreenBand;
-    if (EQUAL(pszStr, "blue"))
-        return GCI_BlueBand;
-    if (EQUAL(pszStr, "alpha"))
-        return GCI_AlphaBand;
-    if (EQUAL(pszStr, "gray") || EQUAL(pszStr, "grey"))
-        return GCI_GrayIndex;
     if (EQUAL(pszStr, "undefined"))
         return GCI_Undefined;
+    const int eInterp = GDALGetColorInterpretationByName(pszStr);
+    if (eInterp != GCI_Undefined)
+        return eInterp;
     CPLError(CE_Warning, CPLE_NotSupported,
              "Unsupported color interpretation: %s", pszStr);
     return -1;
@@ -3039,19 +3023,6 @@ GDALTranslateOptionsGetParser(GDALTranslateOptions *psOptions,
 
     argParser->add_argument("-a_nodata")
         .metavar("<value>|none")
-        .action(
-            [psOptions](const std::string &s)
-            {
-                if (EQUAL(s.c_str(), "none"))
-                {
-                    psOptions->bUnsetNoData = true;
-                }
-                else
-                {
-                    psOptions->bSetNoData = true;
-                    psOptions->osNoData = s;
-                }
-            })
         .help(_("Assign a specified nodata value to output bands."));
 
     argParser->add_argument("-a_gt")
@@ -3084,7 +3055,8 @@ GDALTranslateOptionsGetParser(GDALTranslateOptions *psOptions,
             _("Add the indicated ground control point to the output dataset."));
 
     argParser->add_argument("-colorinterp")
-        .metavar("{red|green|blue|alpha|gray|undefined},...")
+        .metavar("{red|green|blue|alpha|gray|undefined|pan|coastal|rededge|nir|"
+                 "swir|mwir|lwir|...},...")
         .action(
             [psOptions](const std::string &s)
             {
@@ -3099,7 +3071,8 @@ GDALTranslateOptionsGetParser(GDALTranslateOptions *psOptions,
 
     argParser->add_argument("-colorinterp_X")
         .append()
-        .metavar("{red|green|blue|alpha|gray|undefined}")
+        .metavar("{red|green|blue|alpha|gray|undefined|pan|coastal|rededge|nir|"
+                 "swir|mwir|lwir|...}")
         .help(_("Override the color interpretation of band X."));
 
     {
@@ -3390,6 +3363,23 @@ GDALTranslateOptionsNew(char **papszArgv,
             psOptions->anColorInterp[nIndex] = GetColorInterp(papszArgv[i]);
         }
 
+        // argparser will be confused if the value of a string argument
+        // starts with a negative sign.
+        else if (EQUAL(papszArgv[i], "-a_nodata") && papszArgv[i + 1])
+        {
+            ++i;
+            const std::string s = papszArgv[i];
+            if (EQUAL(s.c_str(), "none"))
+            {
+                psOptions->bUnsetNoData = true;
+            }
+            else
+            {
+                psOptions->bSetNoData = true;
+                psOptions->osNoData = s;
+            }
+        }
+
         else
         {
             aosArgv.AddString(papszArgv[i]);
diff --git a/apps/gdal_utils.h b/apps/gdal_utils.h
index a7a5b6846c77..063534a3db96 100644
--- a/apps/gdal_utils.h
+++ b/apps/gdal_utils.h
@@ -10,23 +10,7 @@
  * Copyright (c) 2007-2015, Even Rouault <even.rouault at spatialys.com>
  * Copyright (c) 2015, Faza Mahamood
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_UTILS_H_INCLUDED
diff --git a/apps/gdal_utils_priv.h b/apps/gdal_utils_priv.h
index 5f148e118e57..460656b62f8d 100644
--- a/apps/gdal_utils_priv.h
+++ b/apps/gdal_utils_priv.h
@@ -8,23 +8,7 @@
  * ****************************************************************************
  * Copyright (c) 2015, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_UTILS_PRIV_H_INCLUDED
@@ -58,10 +42,10 @@ struct GDALInfoOptionsForBinary
 
 struct GDALDEMProcessingOptionsForBinary
 {
-    std::string osProcessing;
-    std::string osSrcFilename;
-    std::string osColorFilename;
-    std::string osDstFilename;
+    std::string osProcessing{};
+    std::string osSrcFilename{};
+    std::string osColorFilename{};
+    std::string osDstFilename{};
     bool bQuiet = false;
 };
 
@@ -83,8 +67,9 @@ struct GDALVectorTranslateOptionsForBinary
     std::string osDestDataSource{};
     bool bQuiet = false;
     CPLStringList aosOpenOptions{};
-    std::string osFormat;
+    std::string osFormat{};
     GDALVectorTranslateAccessMode eAccessMode = ACCESS_CREATION;
+    bool bShowUsageIfError = false;
 
     /* Allowed input drivers. */
     CPLStringList aosAllowInputDrivers{};
@@ -251,6 +236,8 @@ std::string CPL_DLL GDALTileIndexAppGetParserUsage();
 
 std::string CPL_DLL GDALFootprintAppGetParserUsage();
 
+std::string CPL_DLL GDALRasterizeAppGetParserUsage();
+
 /**
  * Returns the gdaldem usage help string
  * @param osProcessingMode          Processing mode (subparser name)
diff --git a/apps/gdal_viewshed.cpp b/apps/gdal_viewshed.cpp
index fa529dc24432..e825eb95a1cf 100644
--- a/apps/gdal_viewshed.cpp
+++ b/apps/gdal_viewshed.cpp
@@ -6,23 +6,7 @@
  *
  ******************************************************************************
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <limits>
@@ -31,46 +15,42 @@
 #include "gdal.h"
 #include "gdalargumentparser.h"
 
-#include "viewshed.h"
+#include "viewshed/cumulative.h"
+#include "viewshed/viewshed.h"
 
-/************************************************************************/
-/*                                main()                                */
-/************************************************************************/
-
-MAIN_START(argc, argv)
+namespace gdal
 {
-    using namespace gdal;
-
-    EarlySetConfigOptions(argc, argv);
 
-    GDALAllRegister();
-
-    argc = GDALGeneralCmdLineProcessor(argc, &argv, 0);
-    CPLStringList aosArgv;
-    aosArgv.Assign(argv, /* bTakeOwnership= */ true);
-    if (argc < 1)
-        std::exit(-argc);
-
-    GDALArgumentParser argParser(aosArgv[0], /* bForBinary=*/true);
-
-    argParser.add_description(
-        _("Calculates a viewshed raster from an input raster DEM."));
+namespace
+{
 
-    argParser.add_epilog(_("For more details, consult "
-                           "https://gdal.org/programs/gdal_viewshed.html"));
+struct Options
+{
+    viewshed::Options opts;
+    std::string osSrcFilename;
+    int nBandIn{1};
+    bool bQuiet;
+};
+
+/// Parse arguments into options structure.
+///
+/// \param argParser  Argument parser
+/// \param aosArgv  Command line options as a string list
+/// \return  Command line parsed as options
+Options parseArgs(GDALArgumentParser &argParser, const CPLStringList &aosArgv)
+{
+    Options localOpts;
 
-    Viewshed::Options opts;
+    viewshed::Options &opts = localOpts.opts;
 
     argParser.add_output_format_argument(opts.outputFormat);
     argParser.add_argument("-ox")
         .store_into(opts.observer.x)
-        .required()
         .metavar("<value>")
         .help(_("The X position of the observer (in SRS units)."));
 
     argParser.add_argument("-oy")
         .store_into(opts.observer.y)
-        .required()
         .metavar("<value>")
         .help(_("The Y position of the observer (in SRS units)."));
 
@@ -130,6 +110,14 @@ MAIN_START(argc, argv)
         .nargs(1)
         .help(_("Maximum distance from observer to compute visibility."));
 
+    argParser.add_argument("-j")
+        .default_value(3)
+        .store_into(opts.numJobs)
+        .metavar("<value>")
+        .nargs(1)
+        .help(_(
+            "Number of relative simultaneous jobs to run in cumulative mode"));
+
     // Value for standard atmospheric refraction. See
     // doc/source/programs/gdal_viewshed.rst
     argParser.add_argument("-cc")
@@ -140,36 +128,42 @@ MAIN_START(argc, argv)
         .help(_("Coefficient to consider the effect of the curvature and "
                 "refraction."));
 
-    int nBandIn = 1;
     argParser.add_argument("-b")
-        .default_value(nBandIn)
-        .store_into(nBandIn)
+        .default_value(localOpts.nBandIn)
+        .store_into(localOpts.nBandIn)
         .metavar("<value>")
         .nargs(1)
         .help(_("Select an input band band containing the DEM data."));
 
     argParser.add_argument("-om")
-        .choices("NORMAL", "DEM", "GROUND")
-        .metavar("NORMAL|DEM|GROUND")
+        .choices("NORMAL", "DEM", "GROUND", "ACCUM")
+        .metavar("NORMAL|DEM|GROUND|ACCUM")
         .action(
             [&into = opts.outputMode](const std::string &value)
             {
                 if (EQUAL(value.c_str(), "DEM"))
-                    into = Viewshed::OutputMode::DEM;
+                    into = viewshed::OutputMode::DEM;
                 else if (EQUAL(value.c_str(), "GROUND"))
-                    into = Viewshed::OutputMode::Ground;
+                    into = viewshed::OutputMode::Ground;
+                else if (EQUAL(value.c_str(), "ACCUM"))
+                    into = viewshed::OutputMode::Cumulative;
                 else
-                    into = Viewshed::OutputMode::Normal;
+                    into = viewshed::OutputMode::Normal;
             })
         .nargs(1)
         .help(_("Sets what information the output contains."));
 
-    bool bQuiet = false;
-    argParser.add_quiet_argument(&bQuiet);
+    argParser.add_argument("-os")
+        .default_value(10)
+        .store_into(opts.observerSpacing)
+        .metavar("<value>")
+        .nargs(1)
+        .help(_("Spacing between observer cells when using cumulative mode."));
+
+    argParser.add_quiet_argument(&localOpts.bQuiet);
 
-    std::string osSrcFilename;
     argParser.add_argument("src_filename")
-        .store_into(osSrcFilename)
+        .store_into(localOpts.osSrcFilename)
         .metavar("<src_filename>");
 
     argParser.add_argument("dst_filename")
@@ -185,6 +179,16 @@ MAIN_START(argc, argv)
         argParser.display_error_and_usage(err);
         std::exit(1);
     }
+    return localOpts;
+}
+
+/// Validate specified options.
+///
+/// \param localOpts  Options to validate
+/// \param argParser  Argument parser
+void validateArgs(Options &localOpts, const GDALArgumentParser &argParser)
+{
+    viewshed::Options &opts = localOpts.opts;
 
     if (opts.maxDistance < 0)
     {
@@ -203,59 +207,149 @@ MAIN_START(argc, argv)
         }
     }
 
+    if (opts.outputMode != viewshed::OutputMode::Cumulative)
+    {
+        for (const char *opt : {"-os", "-j"})
+            if (argParser.is_used(opt))
+            {
+                std::string err = "Option " + std::string(opt) +
+                                  " can only be used in cumulative mode.";
+                CPLError(CE_Failure, CPLE_AppDefined, "%s", err.c_str());
+                exit(2);
+            }
+    }
+
+    if (opts.outputMode == viewshed::OutputMode::Cumulative)
+    {
+        for (const char *opt : {"-ox", "-oy", "-vv", "-iv", "-md"})
+            if (argParser.is_used(opt))
+            {
+                std::string err = "Option " + std::string(opt) +
+                                  " can't be used in cumulative mode.";
+                CPLError(CE_Failure, CPLE_AppDefined, "%s", err.c_str());
+                exit(2);
+            }
+    }
+    else
+    {
+        for (const char *opt : {"-ox", "-oy"})
+            if (!argParser.is_used(opt))
+            {
+                std::string err =
+                    "Option " + std::string(opt) + " is required.";
+                CPLError(CE_Failure, CPLE_AppDefined, "%s", err.c_str());
+                exit(2);
+            }
+    }
+
     // For double values that are out of range for byte raster output,
     // set to zero.  Values less than zero are sentinel as NULL nodata.
-    if (opts.outputMode == Viewshed::OutputMode::Normal &&
+    if (opts.outputMode == viewshed::OutputMode::Normal &&
         opts.nodataVal > std::numeric_limits<uint8_t>::max())
         opts.nodataVal = 0;
+}
+
+// Adjust the coefficient of curvature for non-earth SRS.
+/// \param curveCoeff  Current curve coefficient
+/// \param hSrcDS  Source dataset
+/// \return  Adjusted curve coefficient.
+double adjustCurveCoeff(double curveCoeff, GDALDatasetH hSrcDS)
+{
+    const OGRSpatialReference *poSRS =
+        GDALDataset::FromHandle(hSrcDS)->GetSpatialRef();
+    if (poSRS)
+    {
+        OGRErr eSRSerr;
+        const double dfSemiMajor = poSRS->GetSemiMajor(&eSRSerr);
+        if (eSRSerr != OGRERR_FAILURE &&
+            fabs(dfSemiMajor - SRS_WGS84_SEMIMAJOR) >
+                0.05 * SRS_WGS84_SEMIMAJOR)
+        {
+            curveCoeff = 1.0;
+            CPLDebug("gdal_viewshed",
+                     "Using -cc=1.0 as a non-Earth CRS has been detected");
+        }
+    }
+    return curveCoeff;
+}
+
+}  // unnamed namespace
+}  // namespace gdal
+
+/************************************************************************/
+/*                                main()                                */
+/************************************************************************/
+
+MAIN_START(argc, argv)
+{
+    using namespace gdal;
+
+    EarlySetConfigOptions(argc, argv);
+
+    GDALAllRegister();
+
+    argc = GDALGeneralCmdLineProcessor(argc, &argv, 0);
+    CPLStringList aosArgv;
+    aosArgv.Assign(argv, /* bTakeOwnership= */ true);
+    if (argc < 1)
+        std::exit(-argc);
+
+    GDALArgumentParser argParser(aosArgv[0], /* bForBinary=*/true);
+
+    argParser.add_description(
+        _("Calculates a viewshed raster from an input raster DEM."));
+
+    argParser.add_epilog(_("For more details, consult "
+                           "https://gdal.org/programs/gdal_viewshed.html"));
+
+    Options localOpts = parseArgs(argParser, aosArgv);
+    viewshed::Options &opts = localOpts.opts;
+
+    validateArgs(localOpts, argParser);
 
     /* -------------------------------------------------------------------- */
     /*      Open source raster file.                                        */
     /* -------------------------------------------------------------------- */
-    GDALDatasetH hSrcDS = GDALOpen(osSrcFilename.c_str(), GA_ReadOnly);
+    GDALDatasetH hSrcDS =
+        GDALOpen(localOpts.osSrcFilename.c_str(), GA_ReadOnly);
     if (hSrcDS == nullptr)
         exit(2);
 
-    GDALRasterBandH hBand = GDALGetRasterBand(hSrcDS, nBandIn);
+    GDALRasterBandH hBand = GDALGetRasterBand(hSrcDS, localOpts.nBandIn);
     if (hBand == nullptr)
     {
         CPLError(CE_Failure, CPLE_AppDefined,
-                 "Band %d does not exist on dataset.", nBandIn);
+                 "Band %d does not exist on dataset.", localOpts.nBandIn);
         exit(2);
     }
 
     if (!argParser.is_used("-cc"))
-    {
-        const OGRSpatialReference *poSRS =
-            GDALDataset::FromHandle(hSrcDS)->GetSpatialRef();
-        if (poSRS)
-        {
-            OGRErr eSRSerr;
-            const double dfSemiMajor = poSRS->GetSemiMajor(&eSRSerr);
-            if (eSRSerr != OGRERR_FAILURE &&
-                fabs(dfSemiMajor - SRS_WGS84_SEMIMAJOR) >
-                    0.05 * SRS_WGS84_SEMIMAJOR)
-            {
-                opts.curveCoeff = 1.0;
-                CPLDebug("gdal_viewshed",
-                         "Using -cc=1.0 as a non-Earth CRS has been detected");
-            }
-        }
-    }
+        opts.curveCoeff = adjustCurveCoeff(opts.curveCoeff, hSrcDS);
 
     /* -------------------------------------------------------------------- */
     /*      Invoke.                                                         */
     /* -------------------------------------------------------------------- */
-    Viewshed oViewshed(opts);
-
-    bool bSuccess =
-        oViewshed.run(hBand, bQuiet ? GDALDummyProgress : GDALTermProgress);
 
-    GDALDatasetH hDstDS = GDALDataset::FromHandle(oViewshed.output().release());
+    GDALDatasetH hDstDS;
 
-    GDALClose(hSrcDS);
-    if (GDALClose(hDstDS) != CE_None)
-        bSuccess = false;
+    bool bSuccess;
+    if (opts.outputMode == viewshed::OutputMode::Cumulative)
+    {
+        viewshed::Cumulative oViewshed(opts);
+        bSuccess = oViewshed.run(localOpts.osSrcFilename,
+                                 localOpts.bQuiet ? GDALDummyProgress
+                                                  : GDALTermProgress);
+    }
+    else
+    {
+        viewshed::Viewshed oViewshed(opts);
+        bSuccess = oViewshed.run(hBand, localOpts.bQuiet ? GDALDummyProgress
+                                                         : GDALTermProgress);
+        hDstDS = GDALDataset::FromHandle(oViewshed.output().release());
+        GDALClose(hSrcDS);
+        if (GDALClose(hDstDS) != CE_None)
+            bSuccess = false;
+    }
 
     GDALDestroyDriverManager();
     OGRCleanupAll();
diff --git a/apps/gdaladdo.cpp b/apps/gdaladdo.cpp
index c5fd6b399de6..f163772f8746 100644
--- a/apps/gdaladdo.cpp
+++ b/apps/gdaladdo.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2000, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
@@ -311,6 +295,17 @@ static bool PartialRefreshFromSourceTimestamp(
             }
         }
     }
+#ifdef GTI_DRIVER_DISABLED_OR_PLUGIN
+    else if (poDS->GetDriver() &&
+             EQUAL(poDS->GetDriver()->GetDescription(), "GTI"))
+    {
+        CPLError(CE_Failure, CPLE_NotSupported,
+                 "--partial-refresh-from-source-timestamp only works on a GTI "
+                 "dataset if the GTI driver is not built as a plugin, "
+                 "but in core library");
+        return false;
+    }
+#else
     else if (auto poGTIDS = GDALDatasetCastToGTIDataset(poDS))
     {
         regions = GTIGetSourcesMoreRecentThan(poGTIDS, sStatVRTOvr.st_mtime);
@@ -320,6 +315,7 @@ static bool PartialRefreshFromSourceTimestamp(
                 static_cast<double>(region.nDstXSize) * region.nDstYSize;
         }
     }
+#endif
     else
     {
         CPLError(CE_Failure, CPLE_AppDefined,
@@ -597,8 +593,8 @@ MAIN_START(nArgc, papszArgv)
     std::string osResampling;
     argParser.add_argument("-r")
         .store_into(osResampling)
-        .metavar("nearest|average|rms|gauss|cubic|cubicspline|lanczos|average_"
-                 "magphase|mode")
+        .metavar("nearest|average|rms|gauss|bilinear|cubic|cubicspline|lanczos|"
+                 "average_magphase|mode")
         .help(_("Select a resampling algorithm."));
 
     bool bReadOnly = false;
diff --git a/apps/gdalargumentparser.cpp b/apps/gdalargumentparser.cpp
index 1d70e28ea28c..724dcd91957b 100644
--- a/apps/gdalargumentparser.cpp
+++ b/apps/gdalargumentparser.cpp
@@ -6,23 +6,7 @@
  * ****************************************************************************
  * Copyright (c) 2024, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_version_full/gdal_version.h"
@@ -50,10 +34,10 @@ GDALArgumentParser::GDALArgumentParser(const std::string &program_name,
         add_argument("-h", "--help")
             .flag()
             .action(
-                [this, program_name](const auto &)
+                [this](const auto &)
                 {
                     std::cout << usage() << std::endl << std::endl;
-                    std::cout << _("Note: ") << program_name
+                    std::cout << _("Note: ") << m_program_name
                               << _(" --long-usage for full help.") << std::endl;
                     std::exit(0);
                 })
@@ -77,11 +61,11 @@ GDALArgumentParser::GDALArgumentParser(const std::string &program_name,
             .flag()
             .hidden()
             .action(
-                [program_name](const auto &)
+                [this](const auto &)
                 {
                     printf("%s was compiled against GDAL %s and "
                            "is running against GDAL %s\n",
-                           program_name.c_str(), GDAL_RELEASE_NAME,
+                           m_program_name.c_str(), GDAL_RELEASE_NAME,
                            GDALVersionInfo("RELEASE_NAME"));
                     std::exit(0);
                 })
@@ -103,6 +87,32 @@ void GDALArgumentParser::display_error_and_usage(const std::exception &err)
               << _(" --long-usage for full help.") << std::endl;
 }
 
+/************************************************************************/
+/*                                usage()                               */
+/************************************************************************/
+
+std::string GDALArgumentParser::usage() const
+{
+    std::string ret(ArgumentParser::usage());
+    if (!m_osExtraUsageHint.empty())
+    {
+        ret += '\n';
+        ret += '\n';
+        ret += m_osExtraUsageHint;
+    }
+    return ret;
+}
+
+/************************************************************************/
+/*                          add_extra_usage_hint()                      */
+/************************************************************************/
+
+void GDALArgumentParser::add_extra_usage_hint(
+    const std::string &osExtraUsageHint)
+{
+    m_osExtraUsageHint = osExtraUsageHint;
+}
+
 /************************************************************************/
 /*                         add_quiet_argument()                         */
 /************************************************************************/
diff --git a/apps/gdalargumentparser.h b/apps/gdalargumentparser.h
index 5a6f162109d8..e6f64add7e10 100644
--- a/apps/gdalargumentparser.h
+++ b/apps/gdalargumentparser.h
@@ -6,23 +6,7 @@
  * ****************************************************************************
  * Copyright (c) 2024, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDALARGUMENTPARSER_H
@@ -39,8 +23,27 @@
 // Use our locale-unaware strtod()
 #define ARGPARSE_CUSTOM_STRTOD CPLStrtodM
 
+#ifdef _MSC_VER
+#pragma warning(push)
+// unreachable code
+#pragma warning(disable : 4702)
+#endif
+
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Weffc++"
+#endif
+
 #include "argparse/argparse.hpp"
 
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 using namespace argparse;
 
 // Place-holder macro using gettext() convention to indicate (future) translatable strings
@@ -61,6 +64,12 @@ class GDALArgumentParser : public ArgumentParser
     explicit GDALArgumentParser(const std::string &program_name,
                                 bool bForBinary);
 
+    //! Return usage message
+    std::string usage() const;
+
+    //! Adds an extra usage hint.
+    void add_extra_usage_hint(const std::string &osExtraUsageHint);
+
     //! Format an exception as an error message and display the program usage
     void display_error_and_usage(const std::exception &err);
 
@@ -140,7 +149,8 @@ class GDALArgumentParser : public ArgumentParser
   private:
     std::map<std::string, ArgumentParser::argument_it>::iterator
     find_argument(const std::string &name);
-    std::vector<std::unique_ptr<GDALArgumentParser>> aoSubparsers;
+    std::vector<std::unique_ptr<GDALArgumentParser>> aoSubparsers{};
+    std::string m_osExtraUsageHint{};
 };
 
 #endif /* GDALARGUMENTPARSER_H */
diff --git a/apps/gdalasyncread.cpp b/apps/gdalasyncread.cpp
index 68c451931fb7..29cf12c35e78 100644
--- a/apps/gdalasyncread.cpp
+++ b/apps/gdalasyncread.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_vsi.h"
diff --git a/apps/gdalbuildvrt_bin.cpp b/apps/gdalbuildvrt_bin.cpp
index d11ddf0cdec5..d517fbe943cc 100644
--- a/apps/gdalbuildvrt_bin.cpp
+++ b/apps/gdalbuildvrt_bin.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2007-2016, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/apps/gdalbuildvrt_lib.cpp b/apps/gdalbuildvrt_lib.cpp
index ae642786f383..2d64f222394d 100644
--- a/apps/gdalbuildvrt_lib.cpp
+++ b/apps/gdalbuildvrt_lib.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2007-2016, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_api.h"
@@ -279,6 +263,8 @@ class VRTBuilder
     void CreateVRTSeparate(VRTDatasetH hVRTDS);
     void CreateVRTNonSeparate(VRTDatasetH hVRTDS);
 
+    CPL_DISALLOW_COPY_ASSIGN(VRTBuilder)
+
   public:
     VRTBuilder(bool bStrictIn, const char *pszOutputFilename, int nInputFiles,
                const char *const *ppszInputFilenames, GDALDatasetH *pahSrcDSIn,
@@ -2268,6 +2254,21 @@ GDALBuildVRTOptionsNew(char **papszArgv,
             psOptionsForBinary->osDstFilename = papszArgv[i + 1];
             ++i;
         }
+        // argparser will be confused if the value of a string argument
+        // starts with a negative sign.
+        else if (EQUAL(papszArgv[i], "-srcnodata") && i + 1 < nArgc)
+        {
+            ++i;
+            psOptions->osSrcNoData = papszArgv[i];
+        }
+        // argparser will be confused if the value of a string argument
+        // starts with a negative sign.
+        else if (EQUAL(papszArgv[i], "-vrtnodata") && i + 1 < nArgc)
+        {
+            ++i;
+            psOptions->osVRTNoData = papszArgv[i];
+        }
+
         else
         {
             aosArgv.AddString(papszArgv[i]);
diff --git a/apps/gdaldem_bin.cpp b/apps/gdaldem_bin.cpp
index daaa51f91863..34e5cc8bf4db 100644
--- a/apps/gdaldem_bin.cpp
+++ b/apps/gdaldem_bin.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_vsi.h"
diff --git a/apps/gdaldem_lib.cpp b/apps/gdaldem_lib.cpp
index ff613b1113f9..7136f84b58af 100644
--- a/apps/gdaldem_lib.cpp
+++ b/apps/gdaldem_lib.cpp
@@ -14,23 +14,7 @@
  * http://trac.osgeo.org/gdal/ticket/2975 for more information regarding
  * history of this code
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************
  *
  * Slope and aspect calculations based on original method for GRASS GIS 4.1
@@ -100,6 +84,7 @@
 #include "commonutils.h"
 #include "gdalargumentparser.h"
 
+#include <cassert>
 #include <cfloat>
 #include <cmath>
 #include <cstdio>
@@ -110,12 +95,14 @@
 #endif
 
 #include <algorithm>
+#include <cmath>
 #include <limits>
 
 #include "cpl_error.h"
 #include "cpl_progress.h"
 #include "cpl_string.h"
 #include "cpl_vsi.h"
+#include "cpl_vsi_virtual.h"
 #include "gdal.h"
 #include "gdal_priv.h"
 
@@ -155,7 +142,7 @@ using namespace gdal::GDALDEM;
 struct GDALDEMProcessingOptions
 {
     /*! output format. Use the short format name. */
-    std::string osFormat;
+    std::string osFormat{};
 
     /*! the progress function to use */
     GDALProgressFunc pfnProgress = nullptr;
@@ -181,7 +168,7 @@ struct GDALDEMProcessingOptions
     bool bCombined = false;
     bool bIgor = false;
     bool bMultiDirectional = false;
-    CPLStringList aosCreationOptions;
+    CPLStringList aosCreationOptions{};
     int nBand = 1;
 };
 
@@ -216,7 +203,7 @@ float ComputeVal(bool bSrcHasNoData, float fSrcNoDataValue,
 {
     if (bSrcHasNoData &&
         ((!bIsSrcNoDataNan && ARE_REAL_EQUAL(afWin[4], fSrcNoDataValue)) ||
-         (bIsSrcNoDataNan && CPLIsNan(afWin[4]))))
+         (bIsSrcNoDataNan && std::isnan(afWin[4]))))
     {
         return fDstNoDataValue;
     }
@@ -226,7 +213,7 @@ float ComputeVal(bool bSrcHasNoData, float fSrcNoDataValue,
         {
             if ((!bIsSrcNoDataNan &&
                  ARE_REAL_EQUAL(afWin[k], fSrcNoDataValue)) ||
-                (bIsSrcNoDataNan && CPLIsNan(afWin[k])))
+                (bIsSrcNoDataNan && std::isnan(afWin[k])))
             {
                 if (bComputeAtEdges)
                     afWin[k] = afWin[4];
@@ -372,7 +359,7 @@ static CPLErr GDALGeneric3x3Processing(
     {
         eReadDT = GDT_Float32;
         fSrcNoDataValue = static_cast<T>(dfNoDataValue);
-        bIsSrcNoDataNan = bSrcHasNoData && CPLIsNan(dfNoDataValue);
+        bIsSrcNoDataNan = bSrcHasNoData && std::isnan(dfNoDataValue);
     }
 
     int bDstHasNoData = FALSE;
@@ -1431,70 +1418,54 @@ static int GDALColorReliefSortColors(const ColorAssociation &pA,
                                      const ColorAssociation &pB)
 {
     /* Sort NaN in first position */
-    return (CPLIsNan(pA.dfVal) && !CPLIsNan(pB.dfVal)) || pA.dfVal < pB.dfVal;
+    return (std::isnan(pA.dfVal) && !std::isnan(pB.dfVal)) ||
+           pA.dfVal < pB.dfVal;
 }
 
 static void
-GDALColorReliefProcessColors(ColorAssociation **ppasColorAssociation,
-                             int *pnColorAssociation, int bSrcHasNoData,
-                             double dfSrcNoDataValue)
+GDALColorReliefProcessColors(std::vector<ColorAssociation> &asColorAssociation,
+                             int bSrcHasNoData, double dfSrcNoDataValue,
+                             ColorSelectionMode eColorSelectionMode)
 {
-    ColorAssociation *pasColorAssociation = *ppasColorAssociation;
-    int nColorAssociation = *pnColorAssociation;
-
-    std::stable_sort(pasColorAssociation,
-                     pasColorAssociation + nColorAssociation,
+    std::stable_sort(asColorAssociation.begin(), asColorAssociation.end(),
                      GDALColorReliefSortColors);
 
-    ColorAssociation *pPrevious =
-        (nColorAssociation > 0) ? &pasColorAssociation[0] : nullptr;
-    int nAdded = 0;
-    int nRepeatedEntryIndex = 0;
-    for (int i = 1; i < nColorAssociation; ++i)
+    size_t nRepeatedEntryIndex = 0;
+    const size_t nInitialSize = asColorAssociation.size();
+    for (size_t i = 1; i < nInitialSize; ++i)
     {
-        ColorAssociation *pCurrent = &pasColorAssociation[i];
+        const ColorAssociation *pPrevious = &asColorAssociation[i - 1];
+        const ColorAssociation *pCurrent = &asColorAssociation[i];
 
         // NaN comparison is always false, so it handles itself
-        if (bSrcHasNoData && pCurrent->dfVal == dfSrcNoDataValue)
+        if (eColorSelectionMode != COLOR_SELECTION_EXACT_ENTRY &&
+            bSrcHasNoData && pCurrent->dfVal == dfSrcNoDataValue)
         {
             // Check if there is enough distance between the nodata value and
             // its predecessor.
-            const double dfNewValue =
-                pCurrent->dfVal - std::abs(pCurrent->dfVal) * DBL_EPSILON;
+            const double dfNewValue = std::nextafter(
+                pCurrent->dfVal, -std::numeric_limits<double>::infinity());
             if (dfNewValue > pPrevious->dfVal)
             {
                 // add one just below the nodata value
-                ++nAdded;
-                ColorAssociation sPrevious = *pPrevious;
-                pasColorAssociation =
-                    static_cast<ColorAssociation *>(CPLRealloc(
-                        pasColorAssociation, (nColorAssociation + nAdded) *
-                                                 sizeof(ColorAssociation)));
-                pCurrent = &pasColorAssociation[i];
-                pasColorAssociation[nColorAssociation + nAdded - 1] = sPrevious;
-                pasColorAssociation[nColorAssociation + nAdded - 1].dfVal =
-                    dfNewValue;
+                ColorAssociation sNew = *pPrevious;
+                sNew.dfVal = dfNewValue;
+                asColorAssociation.push_back(std::move(sNew));
             }
         }
-        else if (bSrcHasNoData && pPrevious->dfVal == dfSrcNoDataValue)
+        else if (eColorSelectionMode != COLOR_SELECTION_EXACT_ENTRY &&
+                 bSrcHasNoData && pPrevious->dfVal == dfSrcNoDataValue)
         {
             // Check if there is enough distance between the nodata value and
             // its successor.
-            const double dfNewValue =
-                pPrevious->dfVal + std::abs(pPrevious->dfVal) * DBL_EPSILON;
+            const double dfNewValue = std::nextafter(
+                pPrevious->dfVal, std::numeric_limits<double>::infinity());
             if (dfNewValue < pCurrent->dfVal)
             {
                 // add one just above the nodata value
-                ++nAdded;
-                ColorAssociation sCurrent = *pCurrent;
-                pasColorAssociation =
-                    static_cast<ColorAssociation *>(CPLRealloc(
-                        pasColorAssociation, (nColorAssociation + nAdded) *
-                                                 sizeof(ColorAssociation)));
-                pCurrent = &pasColorAssociation[i];
-                pasColorAssociation[nColorAssociation + nAdded - 1] = sCurrent;
-                pasColorAssociation[nColorAssociation + nAdded - 1].dfVal =
-                    dfNewValue;
+                ColorAssociation sNew = *pCurrent;
+                sNew.dfVal = dfNewValue;
+                asColorAssociation.push_back(std::move(sNew));
             }
         }
         else if (nRepeatedEntryIndex == 0 &&
@@ -1512,8 +1483,8 @@ GDALColorReliefProcessColors(ColorAssociation **ppasColorAssociation,
             double dfLeftDist = 0.0;
             if (nRepeatedEntryIndex >= 2)
             {
-                ColorAssociation *pLower =
-                    &pasColorAssociation[nRepeatedEntryIndex - 2];
+                const ColorAssociation *pLower =
+                    &asColorAssociation[nRepeatedEntryIndex - 2];
                 dfTotalDist = pCurrent->dfVal - pLower->dfVal;
                 dfLeftDist = pPrevious->dfVal - pLower->dfVal;
             }
@@ -1523,16 +1494,16 @@ GDALColorReliefProcessColors(ColorAssociation **ppasColorAssociation,
             }
 
             // check if this distance is enough
-            const int nEquivalentCount = i - nRepeatedEntryIndex + 1;
+            const size_t nEquivalentCount = i - nRepeatedEntryIndex + 1;
             if (dfTotalDist >
                 std::abs(pPrevious->dfVal) * nEquivalentCount * DBL_EPSILON)
             {
                 // balance the alterations
                 double dfMultiplier =
-                    0.5 - nEquivalentCount * dfLeftDist / dfTotalDist;
-                for (int j = nRepeatedEntryIndex - 1; j < i; ++j)
+                    0.5 - double(nEquivalentCount) * dfLeftDist / dfTotalDist;
+                for (auto j = nRepeatedEntryIndex - 1; j < i; ++j)
                 {
-                    pasColorAssociation[j].dfVal +=
+                    asColorAssociation[j].dfVal +=
                         (std::abs(pPrevious->dfVal) * dfMultiplier) *
                         DBL_EPSILON;
                     dfMultiplier += 1.0;
@@ -1546,35 +1517,33 @@ GDALColorReliefProcessColors(ColorAssociation **ppasColorAssociation,
 
             nRepeatedEntryIndex = 0;
         }
-        pPrevious = pCurrent;
     }
 
-    if (nAdded)
+    if (nInitialSize != asColorAssociation.size())
     {
-        std::stable_sort(pasColorAssociation,
-                         pasColorAssociation + nColorAssociation + nAdded,
+        std::stable_sort(asColorAssociation.begin(), asColorAssociation.end(),
                          GDALColorReliefSortColors);
-        *ppasColorAssociation = pasColorAssociation;
-        *pnColorAssociation = nColorAssociation + nAdded;
     }
 }
 
-static bool GDALColorReliefGetRGBA(ColorAssociation *pasColorAssociation,
-                                   int nColorAssociation, double dfVal,
-                                   ColorSelectionMode eColorSelectionMode,
-                                   int *pnR, int *pnG, int *pnB, int *pnA)
+static bool
+GDALColorReliefGetRGBA(const std::vector<ColorAssociation> &asColorAssociation,
+                       double dfVal, ColorSelectionMode eColorSelectionMode,
+                       int *pnR, int *pnG, int *pnB, int *pnA)
 {
-    int lower = 0;
+    CPLAssert(!asColorAssociation.empty());
+
+    size_t lower = 0;
 
     // Special case for NaN
-    if (CPLIsNan(pasColorAssociation[0].dfVal))
+    if (std::isnan(asColorAssociation[0].dfVal))
     {
-        if (CPLIsNan(dfVal))
+        if (std::isnan(dfVal))
         {
-            *pnR = pasColorAssociation[0].nR;
-            *pnG = pasColorAssociation[0].nG;
-            *pnB = pasColorAssociation[0].nB;
-            *pnA = pasColorAssociation[0].nA;
+            *pnR = asColorAssociation[0].nR;
+            *pnG = asColorAssociation[0].nG;
+            *pnB = asColorAssociation[0].nB;
+            *pnA = asColorAssociation[0].nA;
             return true;
         }
         else
@@ -1585,22 +1554,22 @@ static bool GDALColorReliefGetRGBA(ColorAssociation *pasColorAssociation,
 
     // Find the index of the first element in the LUT input array that
     // is not smaller than the dfVal value.
-    int i = 0;
-    int upper = nColorAssociation - 1;
+    size_t i = 0;
+    size_t upper = asColorAssociation.size() - 1;
     while (true)
     {
-        const int mid = (lower + upper) / 2;
+        const size_t mid = (lower + upper) / 2;
         if (upper - lower <= 1)
         {
-            if (dfVal <= pasColorAssociation[lower].dfVal)
+            if (dfVal <= asColorAssociation[lower].dfVal)
                 i = lower;
-            else if (dfVal <= pasColorAssociation[upper].dfVal)
+            else if (dfVal <= asColorAssociation[upper].dfVal)
                 i = upper;
             else
                 i = upper + 1;
             break;
         }
-        else if (pasColorAssociation[mid].dfVal >= dfVal)
+        else if (asColorAssociation[mid].dfVal >= dfVal)
         {
             upper = mid;
         }
@@ -1613,7 +1582,7 @@ static bool GDALColorReliefGetRGBA(ColorAssociation *pasColorAssociation,
     if (i == 0)
     {
         if (eColorSelectionMode == COLOR_SELECTION_EXACT_ENTRY &&
-            pasColorAssociation[0].dfVal != dfVal)
+            asColorAssociation[0].dfVal != dfVal)
         {
             *pnR = 0;
             *pnG = 0;
@@ -1623,17 +1592,17 @@ static bool GDALColorReliefGetRGBA(ColorAssociation *pasColorAssociation,
         }
         else
         {
-            *pnR = pasColorAssociation[0].nR;
-            *pnG = pasColorAssociation[0].nG;
-            *pnB = pasColorAssociation[0].nB;
-            *pnA = pasColorAssociation[0].nA;
+            *pnR = asColorAssociation[0].nR;
+            *pnG = asColorAssociation[0].nG;
+            *pnB = asColorAssociation[0].nB;
+            *pnA = asColorAssociation[0].nA;
             return true;
         }
     }
-    else if (i == nColorAssociation)
+    else if (i == asColorAssociation.size())
     {
         if (eColorSelectionMode == COLOR_SELECTION_EXACT_ENTRY &&
-            pasColorAssociation[i - 1].dfVal != dfVal)
+            asColorAssociation[i - 1].dfVal != dfVal)
         {
             *pnR = 0;
             *pnG = 0;
@@ -1643,17 +1612,34 @@ static bool GDALColorReliefGetRGBA(ColorAssociation *pasColorAssociation,
         }
         else
         {
-            *pnR = pasColorAssociation[i - 1].nR;
-            *pnG = pasColorAssociation[i - 1].nG;
-            *pnB = pasColorAssociation[i - 1].nB;
-            *pnA = pasColorAssociation[i - 1].nA;
+            *pnR = asColorAssociation[i - 1].nR;
+            *pnG = asColorAssociation[i - 1].nG;
+            *pnB = asColorAssociation[i - 1].nB;
+            *pnA = asColorAssociation[i - 1].nA;
             return true;
         }
     }
     else
     {
-        if (eColorSelectionMode == COLOR_SELECTION_EXACT_ENTRY &&
-            pasColorAssociation[i - 1].dfVal != dfVal)
+        if (asColorAssociation[i - 1].dfVal == dfVal)
+        {
+            *pnR = asColorAssociation[i - 1].nR;
+            *pnG = asColorAssociation[i - 1].nG;
+            *pnB = asColorAssociation[i - 1].nB;
+            *pnA = asColorAssociation[i - 1].nA;
+            return true;
+        }
+
+        if (asColorAssociation[i].dfVal == dfVal)
+        {
+            *pnR = asColorAssociation[i].nR;
+            *pnG = asColorAssociation[i].nG;
+            *pnB = asColorAssociation[i].nB;
+            *pnA = asColorAssociation[i].nA;
+            return true;
+        }
+
+        if (eColorSelectionMode == COLOR_SELECTION_EXACT_ENTRY)
         {
             *pnR = 0;
             *pnG = 0;
@@ -1663,71 +1649,46 @@ static bool GDALColorReliefGetRGBA(ColorAssociation *pasColorAssociation,
         }
 
         if (eColorSelectionMode == COLOR_SELECTION_NEAREST_ENTRY &&
-            pasColorAssociation[i - 1].dfVal != dfVal)
-        {
-            int index = i;
-            if (dfVal - pasColorAssociation[i - 1].dfVal <
-                pasColorAssociation[i].dfVal - dfVal)
-            {
-                --index;
-            }
-
-            *pnR = pasColorAssociation[index].nR;
-            *pnG = pasColorAssociation[index].nG;
-            *pnB = pasColorAssociation[index].nB;
-            *pnA = pasColorAssociation[index].nA;
-            return true;
-        }
-
-        if (pasColorAssociation[i - 1].dfVal == dfVal)
+            asColorAssociation[i - 1].dfVal != dfVal)
         {
-            *pnR = pasColorAssociation[i - 1].nR;
-            *pnG = pasColorAssociation[i - 1].nG;
-            *pnB = pasColorAssociation[i - 1].nB;
-            *pnA = pasColorAssociation[i - 1].nA;
+            const size_t index = (dfVal - asColorAssociation[i - 1].dfVal <
+                                  asColorAssociation[i].dfVal - dfVal)
+                                     ? i - 1
+                                     : i;
+            *pnR = asColorAssociation[index].nR;
+            *pnG = asColorAssociation[index].nG;
+            *pnB = asColorAssociation[index].nB;
+            *pnA = asColorAssociation[index].nA;
             return true;
         }
 
-        if (CPLIsNan(pasColorAssociation[i - 1].dfVal))
+        if (std::isnan(asColorAssociation[i - 1].dfVal))
         {
-            *pnR = pasColorAssociation[i].nR;
-            *pnG = pasColorAssociation[i].nG;
-            *pnB = pasColorAssociation[i].nB;
-            *pnA = pasColorAssociation[i].nA;
+            *pnR = asColorAssociation[i].nR;
+            *pnG = asColorAssociation[i].nG;
+            *pnB = asColorAssociation[i].nB;
+            *pnA = asColorAssociation[i].nA;
             return true;
         }
 
         const double dfRatio =
-            (dfVal - pasColorAssociation[i - 1].dfVal) /
-            (pasColorAssociation[i].dfVal - pasColorAssociation[i - 1].dfVal);
-        *pnR = static_cast<int>(0.45 + pasColorAssociation[i - 1].nR +
-                                dfRatio * (pasColorAssociation[i].nR -
-                                           pasColorAssociation[i - 1].nR));
-        if (*pnR < 0)
-            *pnR = 0;
-        else if (*pnR > 255)
-            *pnR = 255;
-        *pnG = static_cast<int>(0.45 + pasColorAssociation[i - 1].nG +
-                                dfRatio * (pasColorAssociation[i].nG -
-                                           pasColorAssociation[i - 1].nG));
-        if (*pnG < 0)
-            *pnG = 0;
-        else if (*pnG > 255)
-            *pnG = 255;
-        *pnB = static_cast<int>(0.45 + pasColorAssociation[i - 1].nB +
-                                dfRatio * (pasColorAssociation[i].nB -
-                                           pasColorAssociation[i - 1].nB));
-        if (*pnB < 0)
-            *pnB = 0;
-        else if (*pnB > 255)
-            *pnB = 255;
-        *pnA = static_cast<int>(0.45 + pasColorAssociation[i - 1].nA +
-                                dfRatio * (pasColorAssociation[i].nA -
-                                           pasColorAssociation[i - 1].nA));
-        if (*pnA < 0)
-            *pnA = 0;
-        else if (*pnA > 255)
-            *pnA = 255;
+            (dfVal - asColorAssociation[i - 1].dfVal) /
+            (asColorAssociation[i].dfVal - asColorAssociation[i - 1].dfVal);
+        const auto LinearInterpolation = [dfRatio](int nValBefore, int nVal)
+        {
+            return std::clamp(static_cast<int>(0.45 + nValBefore +
+                                               dfRatio * (nVal - nValBefore)),
+                              0, 255);
+        };
+
+        *pnR = LinearInterpolation(asColorAssociation[i - 1].nR,
+                                   asColorAssociation[i].nR);
+        *pnG = LinearInterpolation(asColorAssociation[i - 1].nG,
+                                   asColorAssociation[i].nG);
+        *pnB = LinearInterpolation(asColorAssociation[i - 1].nB,
+                                   asColorAssociation[i].nB);
+        *pnA = LinearInterpolation(asColorAssociation[i - 1].nA,
+                                   asColorAssociation[i].nA);
 
         return true;
     }
@@ -1775,35 +1736,34 @@ static bool GDALColorReliefFindNamedColor(const char *pszColorName, int *pnR,
     *pnR = 0;
     *pnG = 0;
     *pnB = 0;
-    for (unsigned int i = 0; i < sizeof(namedColors) / sizeof(namedColors[0]);
-         i++)
+    for (const auto &namedColor : namedColors)
     {
-        if (EQUAL(pszColorName, namedColors[i].name))
+        if (EQUAL(pszColorName, namedColor.name))
         {
-            *pnR = static_cast<int>(255.0 * namedColors[i].r);
-            *pnG = static_cast<int>(255.0 * namedColors[i].g);
-            *pnB = static_cast<int>(255.0 * namedColors[i].b);
+            *pnR = static_cast<int>(255.0 * namedColor.r);
+            *pnG = static_cast<int>(255.0 * namedColor.g);
+            *pnB = static_cast<int>(255.0 * namedColor.b);
             return true;
         }
     }
     return false;
 }
 
-static ColorAssociation *
+static std::vector<ColorAssociation>
 GDALColorReliefParseColorFile(GDALRasterBandH hSrcBand,
-                              const char *pszColorFilename, int *pnColors)
+                              const char *pszColorFilename,
+                              ColorSelectionMode eColorSelectionMode)
 {
-    VSILFILE *fpColorFile = VSIFOpenL(pszColorFilename, "rt");
+    auto fpColorFile =
+        VSIVirtualHandleUniquePtr(VSIFOpenL(pszColorFilename, "rt"));
     if (fpColorFile == nullptr)
     {
         CPLError(CE_Failure, CPLE_AppDefined, "Cannot find %s",
                  pszColorFilename);
-        *pnColors = 0;
-        return nullptr;
+        return {};
     }
 
-    ColorAssociation *pasColorAssociation = nullptr;
-    int nColorAssociation = 0;
+    std::vector<ColorAssociation> asColorAssociation;
 
     int bSrcHasNoData = FALSE;
     double dfSrcNoDataValue =
@@ -1811,7 +1771,8 @@ GDALColorReliefParseColorFile(GDALRasterBandH hSrcBand,
 
     const char *pszLine = nullptr;
     bool bIsGMT_CPT = false;
-    while ((pszLine = CPLReadLineL(fpColorFile)) != nullptr)
+    ColorAssociation sColor;
+    while ((pszLine = CPLReadLineL(fpColorFile.get())) != nullptr)
     {
         if (pszLine[0] == '#' && strstr(pszLine, "COLOR_MODEL"))
         {
@@ -1819,170 +1780,127 @@ GDALColorReliefParseColorFile(GDALRasterBandH hSrcBand,
             {
                 CPLError(CE_Failure, CPLE_AppDefined,
                          "Only COLOR_MODEL = RGB is supported");
-                CPLFree(pasColorAssociation);
-                *pnColors = 0;
-                return nullptr;
+                return {};
             }
             bIsGMT_CPT = true;
         }
 
-        char **papszFields =
-            CSLTokenizeStringComplex(pszLine, " ,\t:", FALSE, FALSE);
+        const CPLStringList aosFields(
+            CSLTokenizeStringComplex(pszLine, " ,\t:", FALSE, FALSE));
         /* Skip comment lines */
-        const int nTokens = CSLCount(papszFields);
-        if (nTokens >= 1 &&
-            (papszFields[0][0] == '#' || papszFields[0][0] == '/'))
+        const int nTokens = aosFields.size();
+        if (nTokens >= 1 && (aosFields[0][0] == '#' || aosFields[0][0] == '/'))
         {
-            CSLDestroy(papszFields);
             continue;
         }
 
         if (bIsGMT_CPT && nTokens == 8)
         {
-            pasColorAssociation = static_cast<ColorAssociation *>(
-                CPLRealloc(pasColorAssociation,
-                           (nColorAssociation + 2) * sizeof(ColorAssociation)));
-
-            pasColorAssociation[nColorAssociation].dfVal =
-                CPLAtof(papszFields[0]);
-            pasColorAssociation[nColorAssociation].nR = atoi(papszFields[1]);
-            pasColorAssociation[nColorAssociation].nG = atoi(papszFields[2]);
-            pasColorAssociation[nColorAssociation].nB = atoi(papszFields[3]);
-            pasColorAssociation[nColorAssociation].nA = 255;
-            nColorAssociation++;
-
-            pasColorAssociation[nColorAssociation].dfVal =
-                CPLAtof(papszFields[4]);
-            pasColorAssociation[nColorAssociation].nR = atoi(papszFields[5]);
-            pasColorAssociation[nColorAssociation].nG = atoi(papszFields[6]);
-            pasColorAssociation[nColorAssociation].nB = atoi(papszFields[7]);
-            pasColorAssociation[nColorAssociation].nA = 255;
-            nColorAssociation++;
+            sColor.dfVal = CPLAtof(aosFields[0]);
+            sColor.nR = atoi(aosFields[1]);
+            sColor.nG = atoi(aosFields[2]);
+            sColor.nB = atoi(aosFields[3]);
+            sColor.nA = 255;
+            asColorAssociation.push_back(sColor);
+
+            sColor.dfVal = CPLAtof(aosFields[4]);
+            sColor.nR = atoi(aosFields[5]);
+            sColor.nG = atoi(aosFields[6]);
+            sColor.nB = atoi(aosFields[7]);
+            sColor.nA = 255;
+            asColorAssociation.push_back(sColor);
         }
         else if (bIsGMT_CPT && nTokens == 4)
         {
             // The first token might be B (background), F (foreground) or N
             // (nodata) Just interested in N.
-            if (EQUAL(papszFields[0], "N") && bSrcHasNoData)
+            if (EQUAL(aosFields[0], "N") && bSrcHasNoData)
             {
-                pasColorAssociation =
-                    static_cast<ColorAssociation *>(CPLRealloc(
-                        pasColorAssociation,
-                        (nColorAssociation + 1) * sizeof(ColorAssociation)));
-
-                pasColorAssociation[nColorAssociation].dfVal = dfSrcNoDataValue;
-                pasColorAssociation[nColorAssociation].nR =
-                    atoi(papszFields[1]);
-                pasColorAssociation[nColorAssociation].nG =
-                    atoi(papszFields[2]);
-                pasColorAssociation[nColorAssociation].nB =
-                    atoi(papszFields[3]);
-                pasColorAssociation[nColorAssociation].nA = 255;
-                nColorAssociation++;
+                sColor.dfVal = dfSrcNoDataValue;
+                sColor.nR = atoi(aosFields[1]);
+                sColor.nG = atoi(aosFields[2]);
+                sColor.nB = atoi(aosFields[3]);
+                sColor.nA = 255;
+                asColorAssociation.push_back(sColor);
             }
         }
         else if (!bIsGMT_CPT && nTokens >= 2)
         {
-            pasColorAssociation = static_cast<ColorAssociation *>(
-                CPLRealloc(pasColorAssociation,
-                           (nColorAssociation + 1) * sizeof(ColorAssociation)));
-            if (EQUAL(papszFields[0], "nv"))
+            if (EQUAL(aosFields[0], "nv"))
             {
                 if (!bSrcHasNoData)
                 {
                     CPLError(CE_Warning, CPLE_AppDefined,
                              "Input dataset has no nodata value. "
                              "Ignoring 'nv' entry in color palette");
-                    CSLDestroy(papszFields);
                     continue;
                 }
-                pasColorAssociation[nColorAssociation].dfVal = dfSrcNoDataValue;
+                sColor.dfVal = dfSrcNoDataValue;
             }
-            else if (strlen(papszFields[0]) > 1 &&
-                     papszFields[0][strlen(papszFields[0]) - 1] == '%')
+            else if (strlen(aosFields[0]) > 1 &&
+                     aosFields[0][strlen(aosFields[0]) - 1] == '%')
             {
-                const double dfPct = CPLAtof(papszFields[0]) / 100.0;
+                const double dfPct = CPLAtof(aosFields[0]) / 100.0;
                 if (dfPct < 0.0 || dfPct > 1.0)
                 {
                     CPLError(CE_Failure, CPLE_AppDefined,
-                             "Wrong value for a percentage : %s",
-                             papszFields[0]);
-                    CSLDestroy(papszFields);
-                    VSIFCloseL(fpColorFile);
-                    CPLFree(pasColorAssociation);
-                    *pnColors = 0;
-                    return nullptr;
+                             "Wrong value for a percentage : %s", aosFields[0]);
+                    return {};
                 }
-                pasColorAssociation[nColorAssociation].dfVal =
+                sColor.dfVal =
                     GDALColorReliefGetAbsoluteValFromPct(hSrcBand, dfPct);
             }
             else
             {
-                pasColorAssociation[nColorAssociation].dfVal =
-                    CPLAtof(papszFields[0]);
+                sColor.dfVal = CPLAtof(aosFields[0]);
             }
 
             if (nTokens >= 4)
             {
-                pasColorAssociation[nColorAssociation].nR =
-                    atoi(papszFields[1]);
-                pasColorAssociation[nColorAssociation].nG =
-                    atoi(papszFields[2]);
-                pasColorAssociation[nColorAssociation].nB =
-                    atoi(papszFields[3]);
-                pasColorAssociation[nColorAssociation].nA =
-                    (CSLCount(papszFields) >= 5) ? atoi(papszFields[4]) : 255;
+                sColor.nR = atoi(aosFields[1]);
+                sColor.nG = atoi(aosFields[2]);
+                sColor.nB = atoi(aosFields[3]);
+                sColor.nA =
+                    (CSLCount(aosFields) >= 5) ? atoi(aosFields[4]) : 255;
             }
             else
             {
                 int nR = 0;
                 int nG = 0;
                 int nB = 0;
-                if (!GDALColorReliefFindNamedColor(papszFields[1], &nR, &nG,
-                                                   &nB))
+                if (!GDALColorReliefFindNamedColor(aosFields[1], &nR, &nG, &nB))
                 {
                     CPLError(CE_Failure, CPLE_AppDefined, "Unknown color : %s",
-                             papszFields[1]);
-                    CSLDestroy(papszFields);
-                    VSIFCloseL(fpColorFile);
-                    CPLFree(pasColorAssociation);
-                    *pnColors = 0;
-                    return nullptr;
+                             aosFields[1]);
+                    return {};
                 }
-                pasColorAssociation[nColorAssociation].nR = nR;
-                pasColorAssociation[nColorAssociation].nG = nG;
-                pasColorAssociation[nColorAssociation].nB = nB;
-                pasColorAssociation[nColorAssociation].nA =
-                    (CSLCount(papszFields) >= 3) ? atoi(papszFields[2]) : 255;
+                sColor.nR = nR;
+                sColor.nG = nG;
+                sColor.nB = nB;
+                sColor.nA =
+                    (CSLCount(aosFields) >= 3) ? atoi(aosFields[2]) : 255;
             }
-
-            nColorAssociation++;
+            asColorAssociation.push_back(sColor);
         }
-        CSLDestroy(papszFields);
     }
-    VSIFCloseL(fpColorFile);
 
-    if (nColorAssociation == 0)
+    if (asColorAssociation.empty())
     {
         CPLError(CE_Failure, CPLE_AppDefined,
                  "No color association found in %s", pszColorFilename);
-        CPLFree(pasColorAssociation);
-        *pnColors = 0;
-        return nullptr;
+        return {};
     }
 
-    GDALColorReliefProcessColors(&pasColorAssociation, &nColorAssociation,
-                                 bSrcHasNoData, dfSrcNoDataValue);
+    GDALColorReliefProcessColors(asColorAssociation, bSrcHasNoData,
+                                 dfSrcNoDataValue, eColorSelectionMode);
 
-    *pnColors = nColorAssociation;
-    return pasColorAssociation;
+    return asColorAssociation;
 }
 
-static GByte *GDALColorReliefPrecompute(GDALRasterBandH hSrcBand,
-                                        ColorAssociation *pasColorAssociation,
-                                        int nColorAssociation,
-                                        ColorSelectionMode eColorSelectionMode,
-                                        int *pnIndexOffset)
+static GByte *GDALColorReliefPrecompute(
+    GDALRasterBandH hSrcBand,
+    const std::vector<ColorAssociation> &asColorAssociation,
+    ColorSelectionMode eColorSelectionMode, int *pnIndexOffset)
 {
     const GDALDataType eDT = GDALGetRasterDataType(hSrcBand);
     GByte *pabyPrecomputed = nullptr;
@@ -2003,9 +1921,8 @@ static GByte *GDALColorReliefPrecompute(GDALRasterBandH hSrcBand,
                 int nG = 0;
                 int nB = 0;
                 int nA = 0;
-                GDALColorReliefGetRGBA(pasColorAssociation, nColorAssociation,
-                                       i - nIndexOffset, eColorSelectionMode,
-                                       &nR, &nG, &nB, &nA);
+                GDALColorReliefGetRGBA(asColorAssociation, i - nIndexOffset,
+                                       eColorSelectionMode, &nR, &nG, &nB, &nA);
                 pabyPrecomputed[4 * i] = static_cast<GByte>(nR);
                 pabyPrecomputed[4 * i + 1] = static_cast<GByte>(nG);
                 pabyPrecomputed[4 * i + 2] = static_cast<GByte>(nB);
@@ -2030,8 +1947,7 @@ class GDALColorReliefDataset : public GDALDataset
 
     GDALDatasetH hSrcDS;
     GDALRasterBandH hSrcBand;
-    int nColorAssociation;
-    ColorAssociation *pasColorAssociation;
+    std::vector<ColorAssociation> asColorAssociation{};
     ColorSelectionMode eColorSelectionMode;
     GByte *pabyPrecomputed;
     int nIndexOffset;
@@ -2040,6 +1956,8 @@ class GDALColorReliefDataset : public GDALDataset
     int nCurBlockXOff;
     int nCurBlockYOff;
 
+    CPL_DISALLOW_COPY_ASSIGN(GDALColorReliefDataset)
+
   public:
     GDALColorReliefDataset(GDALDatasetH hSrcDS, GDALRasterBandH hSrcBand,
                            const char *pszColorFilename,
@@ -2076,13 +1994,13 @@ GDALColorReliefDataset::GDALColorReliefDataset(
     GDALDatasetH hSrcDSIn, GDALRasterBandH hSrcBandIn,
     const char *pszColorFilename, ColorSelectionMode eColorSelectionModeIn,
     int bAlpha)
-    : hSrcDS(hSrcDSIn), hSrcBand(hSrcBandIn), nColorAssociation(0),
-      pasColorAssociation(nullptr), eColorSelectionMode(eColorSelectionModeIn),
-      pabyPrecomputed(nullptr), nIndexOffset(0), pafSourceBuf(nullptr),
-      panSourceBuf(nullptr), nCurBlockXOff(-1), nCurBlockYOff(-1)
+    : hSrcDS(hSrcDSIn), hSrcBand(hSrcBandIn),
+      eColorSelectionMode(eColorSelectionModeIn), pabyPrecomputed(nullptr),
+      nIndexOffset(0), pafSourceBuf(nullptr), panSourceBuf(nullptr),
+      nCurBlockXOff(-1), nCurBlockYOff(-1)
 {
-    pasColorAssociation = GDALColorReliefParseColorFile(
-        hSrcBand, pszColorFilename, &nColorAssociation);
+    asColorAssociation = GDALColorReliefParseColorFile(
+        hSrcBand, pszColorFilename, eColorSelectionMode);
 
     nRasterXSize = GDALGetRasterXSize(hSrcDS);
     nRasterYSize = GDALGetRasterYSize(hSrcDS);
@@ -2092,8 +2010,7 @@ GDALColorReliefDataset::GDALColorReliefDataset(
     GDALGetBlockSize(hSrcBand, &nBlockXSize, &nBlockYSize);
 
     pabyPrecomputed = GDALColorReliefPrecompute(
-        hSrcBand, pasColorAssociation, nColorAssociation, eColorSelectionMode,
-        &nIndexOffset);
+        hSrcBand, asColorAssociation, eColorSelectionMode, &nIndexOffset);
 
     for (int i = 0; i < ((bAlpha) ? 4 : 3); i++)
     {
@@ -2110,7 +2027,6 @@ GDALColorReliefDataset::GDALColorReliefDataset(
 
 GDALColorReliefDataset::~GDALColorReliefDataset()
 {
-    CPLFree(pasColorAssociation);
     CPLFree(pabyPrecomputed);
     CPLFree(panSourceBuf);
     CPLFree(pafSourceBuf);
@@ -2190,10 +2106,9 @@ CPLErr GDALColorReliefRasterBand::IReadBlock(int nBlockXOff, int nBlockYOff,
             for (int x = 0; x < nReqXSize; x++)
             {
                 GDALColorReliefGetRGBA(
-                    poGDS->pasColorAssociation, poGDS->nColorAssociation,
-                    poGDS->pafSourceBuf[j], poGDS->eColorSelectionMode,
-                    &anComponents[0], &anComponents[1], &anComponents[2],
-                    &anComponents[3]);
+                    poGDS->asColorAssociation, poGDS->pafSourceBuf[j],
+                    poGDS->eColorSelectionMode, &anComponents[0],
+                    &anComponents[1], &anComponents[2], &anComponents[3]);
                 static_cast<GByte *>(pImage)[y * nBlockXSize + x] =
                     static_cast<GByte>(anComponents[nBand - 1]);
                 j++;
@@ -2220,10 +2135,9 @@ GDALColorRelief(GDALRasterBandH hSrcBand, GDALRasterBandH hDstBand1,
         hDstBand3 == nullptr)
         return CE_Failure;
 
-    int nColorAssociation = 0;
-    ColorAssociation *pasColorAssociation = GDALColorReliefParseColorFile(
-        hSrcBand, pszColorFilename, &nColorAssociation);
-    if (pasColorAssociation == nullptr)
+    const auto asColorAssociation = GDALColorReliefParseColorFile(
+        hSrcBand, pszColorFilename, eColorSelectionMode);
+    if (asColorAssociation.empty())
         return CE_Failure;
 
     if (pfnProgress == nullptr)
@@ -2234,9 +2148,9 @@ GDALColorRelief(GDALRasterBandH hSrcBand, GDALRasterBandH hDstBand1,
     /*      for GDT_Byte, GDT_Int16 or GDT_UInt16                           */
     /* -------------------------------------------------------------------- */
     int nIndexOffset = 0;
-    GByte *pabyPrecomputed = GDALColorReliefPrecompute(
-        hSrcBand, pasColorAssociation, nColorAssociation, eColorSelectionMode,
-        &nIndexOffset);
+    std::unique_ptr<GByte, VSIFreeReleaser> pabyPrecomputed(
+        GDALColorReliefPrecompute(hSrcBand, asColorAssociation,
+                                  eColorSelectionMode, &nIndexOffset));
 
     /* -------------------------------------------------------------------- */
     /*      Initialize progress counter.                                    */
@@ -2245,15 +2159,17 @@ GDALColorRelief(GDALRasterBandH hSrcBand, GDALRasterBandH hDstBand1,
     const int nXSize = GDALGetRasterBandXSize(hSrcBand);
     const int nYSize = GDALGetRasterBandYSize(hSrcBand);
 
-    float *pafSourceBuf = nullptr;
-    int *panSourceBuf = nullptr;
+    std::unique_ptr<float, VSIFreeReleaser> pafSourceBuf;
+    std::unique_ptr<int, VSIFreeReleaser> panSourceBuf;
     if (pabyPrecomputed)
-        panSourceBuf =
-            static_cast<int *>(VSI_MALLOC2_VERBOSE(sizeof(int), nXSize));
+        panSourceBuf.reset(
+            static_cast<int *>(VSI_MALLOC2_VERBOSE(sizeof(int), nXSize)));
     else
-        pafSourceBuf =
-            static_cast<float *>(VSI_MALLOC2_VERBOSE(sizeof(float), nXSize));
-    GByte *pabyDestBuf1 = static_cast<GByte *>(VSI_MALLOC2_VERBOSE(4, nXSize));
+        pafSourceBuf.reset(
+            static_cast<float *>(VSI_MALLOC2_VERBOSE(sizeof(float), nXSize)));
+    std::unique_ptr<GByte, VSIFreeReleaser> pabyDestBuf(
+        static_cast<GByte *>(VSI_MALLOC2_VERBOSE(4, nXSize)));
+    GByte *pabyDestBuf1 = pabyDestBuf.get();
     GByte *pabyDestBuf2 = pabyDestBuf1 ? pabyDestBuf1 + nXSize : nullptr;
     GByte *pabyDestBuf3 = pabyDestBuf2 ? pabyDestBuf2 + nXSize : nullptr;
     GByte *pabyDestBuf4 = pabyDestBuf3 ? pabyDestBuf3 + nXSize : nullptr;
@@ -2262,24 +2178,12 @@ GDALColorRelief(GDALRasterBandH hSrcBand, GDALRasterBandH hDstBand1,
         (pabyPrecomputed == nullptr && pafSourceBuf == nullptr) ||
         pabyDestBuf1 == nullptr)
     {
-        VSIFree(pabyPrecomputed);
-        CPLFree(pafSourceBuf);
-        CPLFree(panSourceBuf);
-        CPLFree(pabyDestBuf1);
-        CPLFree(pasColorAssociation);
-
         return CE_Failure;
     }
 
     if (!pfnProgress(0.0, nullptr, pProgressData))
     {
         CPLError(CE_Failure, CPLE_UserInterrupt, "User terminated");
-        VSIFree(pabyPrecomputed);
-        CPLFree(pafSourceBuf);
-        CPLFree(panSourceBuf);
-        CPLFree(pabyDestBuf1);
-        CPLFree(pasColorAssociation);
-
         return CE_Failure;
     }
 
@@ -2293,37 +2197,34 @@ GDALColorRelief(GDALRasterBandH hSrcBand, GDALRasterBandH hDstBand1,
         /* Read source buffer */
         CPLErr eErr = GDALRasterIO(
             hSrcBand, GF_Read, 0, i, nXSize, 1,
-            panSourceBuf ? static_cast<void *>(panSourceBuf)
-                         : static_cast<void *>(pafSourceBuf),
+            panSourceBuf ? static_cast<void *>(panSourceBuf.get())
+                         : static_cast<void *>(pafSourceBuf.get()),
             nXSize, 1, panSourceBuf ? GDT_Int32 : GDT_Float32, 0, 0);
         if (eErr != CE_None)
         {
-            VSIFree(pabyPrecomputed);
-            CPLFree(pafSourceBuf);
-            CPLFree(panSourceBuf);
-            CPLFree(pabyDestBuf1);
-            CPLFree(pasColorAssociation);
             return eErr;
         }
 
         if (pabyPrecomputed)
         {
+            const auto pabyPrecomputedRaw = pabyPrecomputed.get();
+            const auto panSourceBufRaw = panSourceBuf.get();
             for (int j = 0; j < nXSize; j++)
             {
-                int nIndex = panSourceBuf[j] + nIndexOffset;
-                pabyDestBuf1[j] = pabyPrecomputed[4 * nIndex];
-                pabyDestBuf2[j] = pabyPrecomputed[4 * nIndex + 1];
-                pabyDestBuf3[j] = pabyPrecomputed[4 * nIndex + 2];
-                pabyDestBuf4[j] = pabyPrecomputed[4 * nIndex + 3];
+                int nIndex = panSourceBufRaw[j] + nIndexOffset;
+                pabyDestBuf1[j] = pabyPrecomputedRaw[4 * nIndex];
+                pabyDestBuf2[j] = pabyPrecomputedRaw[4 * nIndex + 1];
+                pabyDestBuf3[j] = pabyPrecomputedRaw[4 * nIndex + 2];
+                pabyDestBuf4[j] = pabyPrecomputedRaw[4 * nIndex + 3];
             }
         }
         else
         {
+            const auto pafSourceBufRaw = pafSourceBuf.get();
             for (int j = 0; j < nXSize; j++)
             {
-                GDALColorReliefGetRGBA(pasColorAssociation, nColorAssociation,
-                                       pafSourceBuf[j], eColorSelectionMode,
-                                       &nR, &nG, &nB, &nA);
+                GDALColorReliefGetRGBA(asColorAssociation, pafSourceBufRaw[j],
+                                       eColorSelectionMode, &nR, &nG, &nB, &nA);
                 pabyDestBuf1[j] = static_cast<GByte>(nR);
                 pabyDestBuf2[j] = static_cast<GByte>(nG);
                 pabyDestBuf3[j] = static_cast<GByte>(nB);
@@ -2336,81 +2237,36 @@ GDALColorRelief(GDALRasterBandH hSrcBand, GDALRasterBandH hDstBand1,
          */
         eErr = GDALRasterIO(hDstBand1, GF_Write, 0, i, nXSize, 1, pabyDestBuf1,
                             nXSize, 1, GDT_Byte, 0, 0);
-        if (eErr != CE_None)
-        {
-            VSIFree(pabyPrecomputed);
-            CPLFree(pafSourceBuf);
-            CPLFree(panSourceBuf);
-            CPLFree(pabyDestBuf1);
-            CPLFree(pasColorAssociation);
-
-            return eErr;
-        }
-
-        eErr = GDALRasterIO(hDstBand2, GF_Write, 0, i, nXSize, 1, pabyDestBuf2,
-                            nXSize, 1, GDT_Byte, 0, 0);
-        if (eErr != CE_None)
+        if (eErr == CE_None)
         {
-            VSIFree(pabyPrecomputed);
-            CPLFree(pafSourceBuf);
-            CPLFree(panSourceBuf);
-            CPLFree(pabyDestBuf1);
-            CPLFree(pasColorAssociation);
-
-            return eErr;
+            eErr = GDALRasterIO(hDstBand2, GF_Write, 0, i, nXSize, 1,
+                                pabyDestBuf2, nXSize, 1, GDT_Byte, 0, 0);
         }
-
-        eErr = GDALRasterIO(hDstBand3, GF_Write, 0, i, nXSize, 1, pabyDestBuf3,
-                            nXSize, 1, GDT_Byte, 0, 0);
-        if (eErr != CE_None)
+        if (eErr == CE_None)
         {
-            VSIFree(pabyPrecomputed);
-            CPLFree(pafSourceBuf);
-            CPLFree(panSourceBuf);
-            CPLFree(pabyDestBuf1);
-            CPLFree(pasColorAssociation);
-
-            return eErr;
+            eErr = GDALRasterIO(hDstBand3, GF_Write, 0, i, nXSize, 1,
+                                pabyDestBuf3, nXSize, 1, GDT_Byte, 0, 0);
         }
-
-        if (hDstBand4)
+        if (eErr == CE_None && hDstBand4)
         {
             eErr = GDALRasterIO(hDstBand4, GF_Write, 0, i, nXSize, 1,
                                 pabyDestBuf4, nXSize, 1, GDT_Byte, 0, 0);
-            if (eErr != CE_None)
-            {
-                VSIFree(pabyPrecomputed);
-                CPLFree(pafSourceBuf);
-                CPLFree(panSourceBuf);
-                CPLFree(pabyDestBuf1);
-                CPLFree(pasColorAssociation);
-
-                return eErr;
-            }
         }
 
-        if (!pfnProgress(1.0 * (i + 1) / nYSize, nullptr, pProgressData))
+        if (eErr == CE_None &&
+            !pfnProgress(1.0 * (i + 1) / nYSize, nullptr, pProgressData))
         {
             CPLError(CE_Failure, CPLE_UserInterrupt, "User terminated");
-
-            VSIFree(pabyPrecomputed);
-            CPLFree(pafSourceBuf);
-            CPLFree(panSourceBuf);
-            CPLFree(pabyDestBuf1);
-            CPLFree(pasColorAssociation);
-
-            return CE_Failure;
+            eErr = CE_Failure;
+        }
+        if (eErr != CE_None)
+        {
+            return eErr;
         }
     }
 
     pfnProgress(1.0, nullptr, pProgressData);
 
-    VSIFree(pabyPrecomputed);
-    CPLFree(pafSourceBuf);
-    CPLFree(panSourceBuf);
-    CPLFree(pabyDestBuf1);
-    CPLFree(pasColorAssociation);
-
     return CE_None;
 }
 
@@ -2425,16 +2281,14 @@ static CPLErr GDALGenerateVRTColorRelief(const char *pszDstFilename,
                                          ColorSelectionMode eColorSelectionMode,
                                          bool bAddAlpha)
 {
-    int nColorAssociation = 0;
-    ColorAssociation *pasColorAssociation = GDALColorReliefParseColorFile(
-        hSrcBand, pszColorFilename, &nColorAssociation);
-    if (pasColorAssociation == nullptr)
+    const auto asColorAssociation = GDALColorReliefParseColorFile(
+        hSrcBand, pszColorFilename, eColorSelectionMode);
+    if (asColorAssociation.empty())
         return CE_Failure;
 
     VSILFILE *fp = VSIFOpenL(pszDstFilename, "wt");
     if (fp == nullptr)
     {
-        CPLFree(pasColorAssociation);
         return CE_Failure;
     }
 
@@ -2511,62 +2365,66 @@ static CPLErr GDALGenerateVRTColorRelief(const char *pszDstFilename,
 
         bOK &= VSIFPrintfL(fp, "      <LUT>") > 0;
 
-        for (int iColor = 0; iColor < nColorAssociation; iColor++)
+        for (size_t iColor = 0; iColor < asColorAssociation.size(); iColor++)
         {
-            if (eColorSelectionMode == COLOR_SELECTION_NEAREST_ENTRY)
-            {
-                if (iColor > 1)
-                    bOK &= VSIFPrintfL(fp, ",") > 0;
-            }
-            else if (iColor > 0)
+            const double dfVal = asColorAssociation[iColor].dfVal;
+            if (iColor > 0)
                 bOK &= VSIFPrintfL(fp, ",") > 0;
 
-            const double dfVal = pasColorAssociation[iColor].dfVal;
-
-            if (eColorSelectionMode == COLOR_SELECTION_EXACT_ENTRY)
-            {
-                bOK &= VSIFPrintfL(fp, "%.18g:0,",
-                                   dfVal - fabs(dfVal) * DBL_EPSILON) > 0;
-            }
-            else if (iColor > 0 &&
-                     eColorSelectionMode == COLOR_SELECTION_NEAREST_ENTRY)
+            if (iColor > 0 &&
+                eColorSelectionMode == COLOR_SELECTION_NEAREST_ENTRY &&
+                dfVal !=
+                    std::nextafter(asColorAssociation[iColor - 1].dfVal,
+                                   std::numeric_limits<double>::infinity()))
             {
                 const double dfMidVal =
-                    (dfVal + pasColorAssociation[iColor - 1].dfVal) / 2.0;
+                    (dfVal + asColorAssociation[iColor - 1].dfVal) / 2.0;
                 bOK &=
                     VSIFPrintfL(
-                        fp, "%.18g:%d", dfMidVal - fabs(dfMidVal) * DBL_EPSILON,
-                        (iBand == 0)   ? pasColorAssociation[iColor - 1].nR
-                        : (iBand == 1) ? pasColorAssociation[iColor - 1].nG
-                        : (iBand == 2)
-                            ? pasColorAssociation[iColor - 1].nB
-                            : pasColorAssociation[iColor - 1].nA) > 0;
+                        fp, "%.18g:%d",
+                        std::nextafter(
+                            dfMidVal, -std::numeric_limits<double>::infinity()),
+                        (iBand == 0)   ? asColorAssociation[iColor - 1].nR
+                        : (iBand == 1) ? asColorAssociation[iColor - 1].nG
+                        : (iBand == 2) ? asColorAssociation[iColor - 1].nB
+                                       : asColorAssociation[iColor - 1].nA) > 0;
                 bOK &= VSIFPrintfL(
                            fp, ",%.18g:%d", dfMidVal,
-                           (iBand == 0)   ? pasColorAssociation[iColor].nR
-                           : (iBand == 1) ? pasColorAssociation[iColor].nG
-                           : (iBand == 2) ? pasColorAssociation[iColor].nB
-                                          : pasColorAssociation[iColor].nA) > 0;
+                           (iBand == 0)   ? asColorAssociation[iColor].nR
+                           : (iBand == 1) ? asColorAssociation[iColor].nG
+                           : (iBand == 2) ? asColorAssociation[iColor].nB
+                                          : asColorAssociation[iColor].nA) > 0;
             }
-
-            if (eColorSelectionMode != COLOR_SELECTION_NEAREST_ENTRY)
+            else
             {
+                if (eColorSelectionMode == COLOR_SELECTION_EXACT_ENTRY)
+                {
+                    bOK &=
+                        VSIFPrintfL(
+                            fp, "%.18g:0,",
+                            std::nextafter(
+                                dfVal,
+                                -std::numeric_limits<double>::infinity())) > 0;
+                }
                 if (dfVal != static_cast<double>(static_cast<int>(dfVal)))
                     bOK &= VSIFPrintfL(fp, "%.18g", dfVal) > 0;
                 else
                     bOK &= VSIFPrintfL(fp, "%d", static_cast<int>(dfVal)) > 0;
                 bOK &= VSIFPrintfL(
                            fp, ":%d",
-                           (iBand == 0)   ? pasColorAssociation[iColor].nR
-                           : (iBand == 1) ? pasColorAssociation[iColor].nG
-                           : (iBand == 2) ? pasColorAssociation[iColor].nB
-                                          : pasColorAssociation[iColor].nA) > 0;
+                           (iBand == 0)   ? asColorAssociation[iColor].nR
+                           : (iBand == 1) ? asColorAssociation[iColor].nG
+                           : (iBand == 2) ? asColorAssociation[iColor].nB
+                                          : asColorAssociation[iColor].nA) > 0;
             }
 
             if (eColorSelectionMode == COLOR_SELECTION_EXACT_ENTRY)
             {
-                bOK &= VSIFPrintfL(fp, ",%.18g:0",
-                                   dfVal + fabs(dfVal) * DBL_EPSILON) > 0;
+                bOK &= VSIFPrintfL(
+                           fp, ",%.18g:0",
+                           std::nextafter(
+                               dfVal,
+                               std::numeric_limits<double>::infinity())) > 0;
             }
         }
         bOK &= VSIFPrintfL(fp, "</LUT>\n") > 0;
@@ -2581,8 +2439,6 @@ static CPLErr GDALGenerateVRTColorRelief(const char *pszDstFilename,
 
     VSIFCloseL(fp);
 
-    CPLFree(pasColorAssociation);
-
     return (bOK) ? CE_None : CE_Failure;
 }
 
@@ -2654,24 +2510,23 @@ template <class T>
 static float GDALRoughnessAlg(const T *afWin, float /*fDstNoDataValue*/,
                               void * /*pData*/)
 {
-    // Roughness is the largest difference
-    //  between any two cells
+    // Roughness is the largest difference between any two cells
 
-    T pafRoughnessMin = afWin[0];
-    T pafRoughnessMax = afWin[0];
+    T fRoughnessMin = afWin[0];
+    T fRoughnessMax = afWin[0];
 
     for (int k = 1; k < 9; k++)
     {
-        if (afWin[k] > pafRoughnessMax)
+        if (afWin[k] > fRoughnessMax)
         {
-            pafRoughnessMax = afWin[k];
+            fRoughnessMax = afWin[k];
         }
-        if (afWin[k] < pafRoughnessMin)
+        if (afWin[k] < fRoughnessMin)
         {
-            pafRoughnessMin = afWin[k];
+            fRoughnessMin = afWin[k];
         }
     }
-    return static_cast<float>(pafRoughnessMax - pafRoughnessMin);
+    return static_cast<float>(fRoughnessMax - fRoughnessMin);
 }
 
 /************************************************************************/
@@ -2696,6 +2551,8 @@ template <class T> class GDALGeneric3x3Dataset : public GDALDataset
     int nCurLine;
     bool bComputeAtEdges;
 
+    CPL_DISALLOW_COPY_ASSIGN(GDALGeneric3x3Dataset)
+
   public:
     GDALGeneric3x3Dataset(GDALDatasetH hSrcDS, GDALRasterBandH hSrcBand,
                           GDALDataType eDstDataType, int bDstHasNoData,
@@ -2827,7 +2684,7 @@ GDALGeneric3x3RasterBand<T>::GDALGeneric3x3RasterBand(
     {
         eReadDT = GDT_Float32;
         fSrcNoDataValue = static_cast<T>(dfNoDataValue);
-        bIsSrcNoDataNan = bSrcHasNoData && CPLIsNan(dfNoDataValue);
+        bIsSrcNoDataNan = bSrcHasNoData && std::isnan(dfNoDataValue);
     }
 }
 
diff --git a/apps/gdalenhance.cpp b/apps/gdalenhance.cpp
index 39553a13b7e7..95a4d3bf0d1f 100644
--- a/apps/gdalenhance.cpp
+++ b/apps/gdalenhance.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
@@ -598,6 +582,8 @@ static int ComputeEqualizationLUTs(GDALDatasetH hDataset, int nLUTBins,
             panLUT[iLUT] = std::max(0, std::min(nLUTBins - 1, nValue));
         }
 
+        CPLFree(panCumHist);
+
         (*ppapanLUTs)[iBand] = panLUT;
     }
 
diff --git a/apps/gdalflattenmask.c b/apps/gdalflattenmask.c
index 37a52f27cc5a..ef0ff92e15fc 100644
--- a/apps/gdalflattenmask.c
+++ b/apps/gdalflattenmask.c
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2008-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal.h"
diff --git a/apps/gdalinfo_bin.cpp b/apps/gdalinfo_bin.cpp
index 0a72c73a35d4..3bbd4f512e1a 100644
--- a/apps/gdalinfo_bin.cpp
+++ b/apps/gdalinfo_bin.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, Frank Warmerdam
  * Copyright (c) 2007-2015, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_version.h"
diff --git a/apps/gdalinfo_lib.cpp b/apps/gdalinfo_lib.cpp
index 8aa00d02b6a7..502a748a7281 100644
--- a/apps/gdalinfo_lib.cpp
+++ b/apps/gdalinfo_lib.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2007-2015, Even Rouault <even.rouault at spatialys.com>
  * Copyright (c) 2015, Faza Mahamood
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -58,7 +42,8 @@
 #include "ogr_api.h"
 #include "ogr_srs_api.h"
 #include "ogr_spatialref.h"
-#include "ogrgeojsonreader.h"
+#include "ogrlibjsonutils.h"
+#include "ogrgeojsongeometry.h"
 #include "ogrgeojsonwriter.h"
 
 using std::vector;
@@ -105,6 +90,12 @@ struct GDALInfoOptions
     /*! force computation of the checksum for each band in the dataset */
     bool bComputeChecksum = false;
 
+    /*! allow or suppress printing of nodata value */
+    bool bShowNodata = true;
+
+    /*! allow or suppress printing of mask information */
+    bool bShowMask = true;
+
     /*! allow or suppress ground control points list printing. It may be useful
         for datasets with huge amount of GCPs, such as L1B AVHRR or HDF4 MODIS
         which contain thousands of them. */
@@ -129,7 +120,7 @@ struct GDALInfoOptions
     /*! report metadata for the specified domains. "all" can be used to report
         metadata in all domains.
         */
-    CPLStringList aosExtraMDDomains;
+    CPLStringList aosExtraMDDomains{};
 
     /*! WKT format used for SRS */
     std::string osWKTFormat = "WKT2";
@@ -261,6 +252,8 @@ GDALInfoAppOptionsGetParser(GDALInfoOptions *psOptions,
         .store_into(psOptions->bReportHistograms)
         .help(_("Report histogram information for all bands."));
 
+    argParser->add_usage_newline();
+
     argParser->add_inverted_logic_flag(
         "-nogcp", &psOptions->bShowGCPs,
         _("Suppress ground control points list printing."));
@@ -278,6 +271,15 @@ GDALInfoAppOptionsGetParser(GDALInfoOptions *psOptions,
     argParser->add_inverted_logic_flag("-nofl", &psOptions->bShowFileList,
                                        _("Suppress display of the file list."));
 
+    argParser->add_inverted_logic_flag(
+        "-nonodata", &psOptions->bShowNodata,
+        _("Suppress nodata printing (implies -nomask)."));
+
+    argParser->add_inverted_logic_flag("-nomask", &psOptions->bShowMask,
+                                       _("Suppress mask printing."));
+
+    argParser->add_usage_newline();
+
     argParser->add_argument("-checksum")
         .flag()
         .store_into(psOptions->bComputeChecksum)
@@ -639,10 +641,12 @@ char *GDALInfo(GDALDatasetH hDataset, const GDALInfoOptions *psOptions)
             {
                 std::string osCoordinateEpoch =
                     CPLSPrintf("%f", dfCoordinateEpoch);
-                if (osCoordinateEpoch.find('.') != std::string::npos)
+                const size_t nDotPos = osCoordinateEpoch.find('.');
+                if (nDotPos != std::string::npos)
                 {
-                    while (osCoordinateEpoch.back() == '0')
-                        osCoordinateEpoch.resize(osCoordinateEpoch.size() - 1);
+                    while (osCoordinateEpoch.size() > nDotPos + 2 &&
+                           osCoordinateEpoch.back() == '0')
+                        osCoordinateEpoch.pop_back();
                 }
                 Concat(osStr, psOptions->bStdoutOutput,
                        "Coordinate epoch: %s\n", osCoordinateEpoch.c_str());
@@ -1109,25 +1113,21 @@ char *GDALInfo(GDALDatasetH hDataset, const GDALInfoOptions *psOptions)
             json_object_object_add(poStacEOBand, "name", poBandName);
         }
 
-        if (GDALGetDescription(hBand) != nullptr &&
-            strlen(GDALGetDescription(hBand)) > 0)
+        const char *pszBandDesc = GDALGetDescription(hBand);
+        if (pszBandDesc != nullptr && strlen(pszBandDesc) > 0)
         {
             if (bJson)
             {
-                json_object *poBandDescription =
-                    json_object_new_string(GDALGetDescription(hBand));
                 json_object_object_add(poBand, "description",
-                                       poBandDescription);
+                                       json_object_new_string(pszBandDesc));
 
-                json_object *poStacBandDescription =
-                    json_object_new_string(GDALGetDescription(hBand));
                 json_object_object_add(poStacEOBand, "description",
-                                       poStacBandDescription);
+                                       json_object_new_string(pszBandDesc));
             }
             else
             {
                 Concat(osStr, psOptions->bStdoutOutput, "  Description = %s\n",
-                       GDALGetDescription(hBand));
+                       pszBandDesc);
             }
         }
         else
@@ -1142,6 +1142,17 @@ char *GDALInfo(GDALDatasetH hDataset, const GDALInfoOptions *psOptions)
             }
         }
 
+        if (bJson)
+        {
+            const char *pszCommonName = GDALGetSTACCommonNameFromColorInterp(
+                GDALGetRasterColorInterpretation(hBand));
+            if (pszCommonName)
+            {
+                json_object_object_add(poStacEOBand, "common_name",
+                                       json_object_new_string(pszCommonName));
+            }
+        }
+
         {
             int bGotMin = FALSE;
             int bGotMax = FALSE;
@@ -1358,7 +1369,11 @@ char *GDALInfo(GDALDatasetH hDataset, const GDALInfoOptions *psOptions)
         }
 
         int bGotNodata = FALSE;
-        if (eDT == GDT_Int64)
+        if (!psOptions->bShowNodata)
+        {
+            // nothing to do
+        }
+        else if (eDT == GDT_Int64)
         {
             const auto nNoData =
                 GDALGetRasterNoDataValueAsInt64(hBand, &bGotNodata);
@@ -1474,7 +1489,7 @@ char *GDALInfo(GDALDatasetH hDataset, const GDALInfoOptions *psOptions)
                     json_object_object_add(poBand, "noDataValue",
                                            poNoDataValue);
                 }
-                else if (CPLIsNan(dfNoData))
+                else if (std::isnan(dfNoData))
                 {
                     Concat(osStr, psOptions->bStdoutOutput,
                            "  NoData Value=nan\n");
@@ -1594,7 +1609,8 @@ char *GDALInfo(GDALDatasetH hDataset, const GDALInfoOptions *psOptions)
             Concat(osStr, psOptions->bStdoutOutput, "  Overviews: arbitrary\n");
         }
 
-        const int nMaskFlags = GDALGetMaskFlags(hBand);
+        const int nMaskFlags =
+            psOptions->bShowMask ? GDALGetMaskFlags(hBand) : GMF_ALL_VALID;
         if ((nMaskFlags & (GMF_NODATA | GMF_ALL_VALID)) == 0 ||
             nMaskFlags == (GMF_NODATA | GMF_PER_DATASET))
         {
@@ -2245,6 +2261,9 @@ static void GDALInfoReportMetadata(const GDALInfoOptions *psOptions,
         GDALInfoPrintMetadata(psOptions, hObject, "RPC", "RPC Metadata",
                               pszIndent, bJson, poMetadata, osStr);
     }
+
+    GDALInfoPrintMetadata(psOptions, hObject, "IMAGERY", "Imagery", pszIndent,
+                          bJson, poMetadata, osStr);
 }
 
 /************************************************************************/
@@ -2305,6 +2324,9 @@ GDALInfoOptionsNew(char **papszArgv,
         return nullptr;
     }
 
+    if (!psOptions->bShowNodata)
+        psOptions->bShowMask = false;
+
     return psOptions.release();
 }
 
diff --git a/apps/gdallocationinfo.cpp b/apps/gdallocationinfo.cpp
index d317e2599b5c..b5c3c42117da 100644
--- a/apps/gdallocationinfo.cpp
+++ b/apps/gdallocationinfo.cpp
@@ -8,33 +8,19 @@
  * Copyright (c) 2010, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
 #include "cpl_minixml.h"
 #include "gdal_version.h"
 #include "gdal.h"
+#include "gdal_priv.h"
 #include "commonutils.h"
 #include "ogr_spatialref.h"
 #include "gdalargumentparser.h"
 
+#include <cmath>
 #include <limits>
 #include <vector>
 
@@ -137,6 +123,12 @@ MAIN_START(argc, argv)
         .help(_("Query the (overview_level)th overview (overview_level=1 is "
                 "the 1st overview)."));
 
+    std::string osResampling;
+    argParser.add_argument("-r")
+        .store_into(osResampling)
+        .metavar("nearest|bilinear|cubic|cubicspline")
+        .help(_("Select an interpolation algorithm."));
+
     {
         auto &group = argParser.add_mutually_exclusive_group();
 
@@ -245,6 +237,18 @@ MAIN_START(argc, argv)
         exit(1);
     }
 
+    const GDALRIOResampleAlg eInterpolation =
+        osResampling.empty() ? GRIORA_NearestNeighbour
+                             : GDALRasterIOGetResampleAlg(osResampling.c_str());
+    if (eInterpolation != GRIORA_NearestNeighbour &&
+        eInterpolation != GRIORA_Bilinear && eInterpolation != GRIORA_Cubic &&
+        eInterpolation != GRIORA_CubicSpline)
+    {
+        fprintf(stderr, "-r can only be used with values nearest, bilinear, "
+                        "cubic and cubicspline\n");
+        exit(1);
+    }
+
     /* -------------------------------------------------------------------- */
     /*      Open source file.                                               */
     /* -------------------------------------------------------------------- */
@@ -261,8 +265,10 @@ MAIN_START(argc, argv)
     OGRCoordinateTransformationH hCT = nullptr;
     if (!osSourceSRS.empty() && !EQUAL(osSourceSRS.c_str(), "-geoloc"))
     {
-
-        hSrcSRS = OSRNewSpatialReference(osSourceSRS.c_str());
+        hSrcSRS = OSRNewSpatialReference(nullptr);
+        OGRErr err = OSRSetFromUserInput(hSrcSRS, osSourceSRS.c_str());
+        if (err != OGRERR_NONE)
+            exit(1);
         OSRSetAxisMappingStrategy(hSrcSRS, OAMS_TRADITIONAL_GIS_ORDER);
         auto hTrgSRS = GDALGetSpatialRef(hSrcDS);
         if (!hTrgSRS)
@@ -298,9 +304,8 @@ MAIN_START(argc, argv)
         {
             if (!osSourceSRS.empty())
             {
-                fprintf(
-                    stderr,
-                    "Enter X Y values separated by space, and press Return.\n");
+                fprintf(stderr, "Enter X Y values separated by space, and "
+                                "press Return.\n");
             }
             else
             {
@@ -350,6 +355,9 @@ MAIN_START(argc, argv)
     while (inputAvailable)
     {
         int iPixel, iLine;
+        double dfPixel{0}, dfLine{0};
+        const double dfXIn = dfGeoX;
+        const double dfYIn = dfGeoY;
 
         if (hCT)
         {
@@ -375,30 +383,31 @@ MAIN_START(argc, argv)
                 exit(1);
             }
 
-            iPixel = static_cast<int>(floor(adfInvGeoTransform[0] +
-                                            adfInvGeoTransform[1] * dfGeoX +
-                                            adfInvGeoTransform[2] * dfGeoY));
-            iLine = static_cast<int>(floor(adfInvGeoTransform[3] +
-                                           adfInvGeoTransform[4] * dfGeoX +
-                                           adfInvGeoTransform[5] * dfGeoY));
+            dfPixel = adfInvGeoTransform[0] + adfInvGeoTransform[1] * dfGeoX +
+                      adfInvGeoTransform[2] * dfGeoY;
+            dfLine = adfInvGeoTransform[3] + adfInvGeoTransform[4] * dfGeoX +
+                     adfInvGeoTransform[5] * dfGeoY;
         }
         else
         {
-            iPixel = static_cast<int>(floor(dfGeoX));
-            iLine = static_cast<int>(floor(dfGeoY));
+            dfPixel = dfGeoX;
+            dfLine = dfGeoY;
         }
+        iPixel = static_cast<int>(floor(dfPixel));
+        iLine = static_cast<int>(floor(dfLine));
 
         /* --------------------------------------------------------------------
          */
         /*      Prepare report. */
         /* --------------------------------------------------------------------
          */
-        CPLString osLine;
+        CPLString osXmlLine;
 
         if (bAsXML)
         {
-            osLine.Printf("<Report pixel=\"%d\" line=\"%d\">", iPixel, iLine);
-            osXML += osLine;
+            osXmlLine.Printf("<Report pixel=\"%d\" line=\"%d\">", iPixel,
+                             iLine);
+            osXML += osXmlLine;
             if (!osExtraContent.empty())
             {
                 char *pszEscaped =
@@ -411,7 +420,18 @@ MAIN_START(argc, argv)
         else if (!bQuiet)
         {
             printf("Report:\n");
-            printf("  Location: (%dP,%dL)\n", iPixel, iLine);
+            CPLString osPixel, osLine;
+            if (eInterpolation == GRIORA_NearestNeighbour)
+            {
+                osPixel.Printf("%d", iPixel);
+                osLine.Printf("%d", iLine);
+            }
+            else
+            {
+                osPixel.Printf("%.15g", dfPixel);
+                osLine.Printf("%.15g", dfLine);
+            }
+            printf("  Location: (%sP,%sL)\n", osPixel.c_str(), osLine.c_str());
             if (!osExtraContent.empty())
             {
                 printf("  Extra input: %s\n", osExtraContent.c_str());
@@ -419,7 +439,7 @@ MAIN_START(argc, argv)
         }
         else if (bEcho)
         {
-            printf("%d%s%d%s", iPixel, osFieldSep.c_str(), iLine,
+            printf("%.15g%s%.15g%s", dfXIn, osFieldSep.c_str(), dfYIn,
                    osFieldSep.c_str());
         }
 
@@ -432,7 +452,12 @@ MAIN_START(argc, argv)
                 osXML += "<Alert>Location is off this file! No further details "
                          "to report.</Alert>";
             else if (bValOnly)
-                printf("\n");
+            {
+                for (int i = 1; i < static_cast<int>(anBandList.size()); i++)
+                {
+                    printf("%s", osFieldSep.c_str());
+                }
+            }
             else if (!bQuiet)
                 printf("\nLocation is off this file! No further details to "
                        "report.\n");
@@ -453,6 +478,9 @@ MAIN_START(argc, argv)
             int iPixelToQuery = iPixel;
             int iLineToQuery = iLine;
 
+            double dfPixelToQuery = dfPixel;
+            double dfLineToQuery = dfLine;
+
             if (nOverview >= 0 && hBand != nullptr)
             {
                 GDALRasterBandH hOvrBand = GDALGetOverview(hBand, nOverview);
@@ -470,6 +498,10 @@ MAIN_START(argc, argv)
                         iPixelToQuery = nOvrXSize - 1;
                     if (iLineToQuery >= nOvrYSize)
                         iLineToQuery = nOvrYSize - 1;
+                    dfPixelToQuery =
+                        dfPixel / GDALGetRasterXSize(hSrcDS) * nOvrXSize;
+                    dfLineToQuery =
+                        dfLine / GDALGetRasterYSize(hSrcDS) * nOvrYSize;
                 }
                 else
                 {
@@ -485,8 +517,8 @@ MAIN_START(argc, argv)
 
             if (bAsXML)
             {
-                osLine.Printf("<BandReport band=\"%d\">", anBandList[i]);
-                osXML += osLine;
+                osXmlLine.Printf("<BandReport band=\"%d\">", anBandList[i]);
+                osXML += osXmlLine;
             }
             else if (!bQuiet)
             {
@@ -550,10 +582,12 @@ MAIN_START(argc, argv)
             const bool bIsComplex = CPL_TO_BOOL(
                 GDALDataTypeIsComplex(GDALGetRasterDataType(hBand)));
 
-            if (GDALRasterIO(hBand, GF_Read, iPixelToQuery, iLineToQuery, 1, 1,
-                             adfPixel, 1, 1,
-                             bIsComplex ? GDT_CFloat64 : GDT_Float64, 0,
-                             0) == CE_None)
+            CPLErr err;
+            err = GDALRasterInterpolateAtPoint(hBand, dfPixelToQuery,
+                                               dfLineToQuery, eInterpolation,
+                                               &adfPixel[0], &adfPixel[1]);
+
+            if (err == CE_None)
             {
                 CPLString osValue;
 
diff --git a/apps/gdalmanage.cpp b/apps/gdalmanage.cpp
index 1860cf9ab349..80710813bc09 100644
--- a/apps/gdalmanage.cpp
+++ b/apps/gdalmanage.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2007, Frank Warmerdam
  * Copyright (c) 2008-2009, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
@@ -33,22 +17,22 @@
 #include "gdal_version.h"
 #include "gdal.h"
 #include "commonutils.h"
+#include "gdalargumentparser.h"
 
 /************************************************************************/
-/*                               Usage()                                */
+/*                     GDALManageOptions()                              */
 /************************************************************************/
 
-static void Usage(bool bIsError)
-
+struct GDALManageOptions
 {
-    fprintf(bIsError ? stderr : stdout,
-            "Usage: gdalmanage [--help] [--help-general]\n"
-            "    or gdalmanage identify [-r|-fr] [-u] <files>*\n"
-            "    or gdalmanage copy [-f <driver>] <oldname> <newname>\n"
-            "    or gdalmanage rename [-f <driver>] <oldname> <newname>\n"
-            "    or gdalmanage delete [-f <driver>] <datasetname>\n");
-    exit(bIsError ? 1 : 0);
-}
+    bool bRecursive = false;
+    bool bForceRecurse = false;
+    bool bReportFailures = false;
+    std::string osNewName;
+    std::string osDatasetName;
+    std::vector<std::string> aosDatasetNames;
+    std::string osDriverName;
+};
 
 /************************************************************************/
 /*                       ProcessIdentifyTarget()                        */
@@ -92,73 +76,111 @@ static void ProcessIdentifyTarget(const char *pszTarget,
 }
 
 /************************************************************************/
-/*                              Identify()                              */
+/*                     GDALManageAppOptionsGetParser()                 */
 /************************************************************************/
 
-static void Identify(int nArgc, char **papszArgv)
-
+static std::unique_ptr<GDALArgumentParser>
+GDALManageAppOptionsGetParser(GDALManageOptions *psOptions)
 {
-    /* -------------------------------------------------------------------- */
-    /*      Scan for command line switches                                   */
-    /* -------------------------------------------------------------------- */
-    bool bRecursive = false;
-    bool bForceRecurse = false;
-    bool bReportFailures = false;
+    auto argParser = std::make_unique<GDALArgumentParser>(
+        "gdalmanage", /* bForBinary */ true);
 
-    int i = 0;
-    for (; i < nArgc && papszArgv[i][0] == '-'; ++i)
-    {
-        if (EQUAL(papszArgv[i], "-r"))
-            bRecursive = true;
-        else if (EQUAL(papszArgv[i], "-fr"))
-        {
-            bForceRecurse = true;
-            bRecursive = true;
-        }
-        else if (EQUAL(papszArgv[i], "-u"))
-            bReportFailures = true;
-        else
-            Usage(true);
-    }
+    argParser->add_description(
+        _("Identify, delete, rename and copy raster data files."));
+    argParser->add_epilog(_("For more details, consult the full documentation "
+                            "for the gdalmanage utility "
+                            "https://gdal.org/programs/gdalmanage.html"));
 
-    /* -------------------------------------------------------------------- */
-    /*      Process given files.                                            */
-    /* -------------------------------------------------------------------- */
-    for (; i < nArgc; ++i)
+    auto addCommonOptions = [psOptions](GDALArgumentParser *subParser)
     {
-        ProcessIdentifyTarget(papszArgv[i], nullptr, bRecursive,
-                              bReportFailures, bForceRecurse);
-    }
-}
-
-/************************************************************************/
-/*                               Delete()                               */
-/************************************************************************/
-
-static void Delete(GDALDriverH hDriver, int nArgc, char **papszArgv)
-
-{
-    if (nArgc != 1)
-        Usage(true);
-
-    GDALDeleteDataset(hDriver, papszArgv[0]);
-}
-
-/************************************************************************/
-/*                                Copy()                                */
-/************************************************************************/
-
-static void Copy(GDALDriverH hDriver, int nArgc, char **papszArgv,
-                 const char *pszOperation)
-
-{
-    if (nArgc != 2)
-        Usage(true);
-
-    if (EQUAL(pszOperation, "copy"))
-        GDALCopyDatasetFiles(hDriver, papszArgv[1], papszArgv[0]);
-    else
-        GDALRenameDataset(hDriver, papszArgv[1], papszArgv[0]);
+        subParser->add_argument("-f")
+            .metavar("<format>")
+            .store_into(psOptions->osDriverName)
+            .help(_("Specify format of raster file if unknown by the "
+                    "application."));
+
+        subParser->add_argument("newdatasetname")
+            .metavar("<newdatasetname>")
+            .store_into(psOptions->osNewName)
+            .help(_("Name of the new file."));
+    };
+
+    // Identify
+
+    auto identifyParser =
+        argParser->add_subparser("identify", /* bForBinary */ true);
+    identifyParser->add_description(_("List data format of file(s)."));
+
+    identifyParser->add_argument("-r")
+        .flag()
+        .store_into(psOptions->bRecursive)
+        .help(_("Recursively scan files/folders for raster files."));
+
+    identifyParser->add_argument("-fr")
+        .flag()
+        .store_into(psOptions->bRecursive)
+        .store_into(psOptions->bForceRecurse)
+        .help(_("Recursively scan folders for raster files, forcing "
+                "recursion in folders recognized as valid formats."));
+
+    identifyParser->add_argument("-u")
+        .flag()
+        .store_into(psOptions->bReportFailures)
+        .help(_("Report failures if file type is unidentified."));
+
+    // Note: this accepts multiple files
+    identifyParser->add_argument("datasetname")
+        .metavar("<datasetname>")
+        .store_into(psOptions->aosDatasetNames)
+        .remaining()
+        .help(_("Name(s) of the file(s) to identify."));
+
+    // Copy
+
+    auto copyParser = argParser->add_subparser("copy", /* bForBinary */ true);
+    copyParser->add_description(
+        _("Create a copy of the raster file with a new name."));
+
+    addCommonOptions(copyParser);
+
+    copyParser->add_argument("datasetname")
+        .metavar("<datasetname>")
+        .store_into(psOptions->osDatasetName)
+        .help(_("Name of the file to copy."));
+
+    // Rename
+
+    auto renameParser =
+        argParser->add_subparser("rename", /* bForBinary */ true);
+    renameParser->add_description(_("Change the name of the raster file."));
+
+    addCommonOptions(renameParser);
+
+    renameParser->add_argument("datasetname")
+        .metavar("<datasetname>")
+        .store_into(psOptions->osDatasetName)
+        .help(_("Name of the file to rename."));
+
+    // Delete
+
+    auto deleteParser =
+        argParser->add_subparser("delete", /* bForBinary */ true);
+    deleteParser->add_description(_("Delete the raster file(s)."));
+
+    // Note: this accepts multiple files
+    deleteParser->add_argument("datasetname")
+        .metavar("<datasetname>")
+        .store_into(psOptions->aosDatasetNames)
+        .remaining()
+        .help(_("Name(s) of the file(s) to delete."));
+
+    deleteParser->add_argument("-f")
+        .metavar("<format>")
+        .store_into(psOptions->osDriverName)
+        .help(
+            _("Specify format of raster file if unknown by the application."));
+
+    return argParser;
 }
 
 /************************************************************************/
@@ -168,64 +190,70 @@ static void Copy(GDALDriverH hDriver, int nArgc, char **papszArgv,
 MAIN_START(argc, argv)
 
 {
-    char *pszDriver = nullptr;
-    GDALDriverH hDriver = nullptr;
 
-    /* Check that we are running against at least GDAL 1.5 */
-    /* Note to developers : if we use newer API, please change the requirement
-     */
-    if (atoi(GDALVersionInfo("VERSION_NUM")) < 1500)
-    {
-        fprintf(stderr,
-                "At least, GDAL >= 1.5.0 is required for this version of %s, "
-                "which was compiled against GDAL %s\n",
-                argv[0], GDAL_RELEASE_NAME);
-        exit(1);
-    }
-
-    GDALAllRegister();
+    EarlySetConfigOptions(argc, argv);
 
     argc = GDALGeneralCmdLineProcessor(argc, &argv, 0);
     if (argc < 1)
         exit(-argc);
 
-    for (int i = 0; i < argc; i++)
+    /* -------------------------------------------------------------------- */
+    /*      Parse arguments.                                                */
+    /* -------------------------------------------------------------------- */
+
+    if (argc < 2)
     {
-        if (EQUAL(argv[i], "--utility_version"))
+        try
         {
-            printf("%s was compiled against GDAL %s and is running against "
-                   "GDAL %s\n",
-                   argv[0], GDAL_RELEASE_NAME, GDALVersionInfo("RELEASE_NAME"));
-            return 0;
+            GDALManageOptions sOptions;
+            auto argParser = GDALManageAppOptionsGetParser(&sOptions);
+            fprintf(stderr, "%s\n", argParser->usage().c_str());
         }
-        else if (EQUAL(argv[i], "--help"))
+        catch (const std::exception &err)
         {
-            Usage(false);
+            CPLError(CE_Failure, CPLE_AppDefined, "Unexpected exception: %s",
+                     err.what());
         }
+        CSLDestroy(argv);
+        exit(1);
     }
 
-    if (argc < 3)
-        Usage(true);
+    GDALAllRegister();
 
-    /* -------------------------------------------------------------------- */
-    /*      Do we have a driver specifier?                                  */
-    /* -------------------------------------------------------------------- */
-    char **papszRemainingArgv = argv + 2;
-    int nRemainingArgc = argc - 2;
+    GDALManageOptions psOptions;
+    auto argParser = GDALManageAppOptionsGetParser(&psOptions);
+
+    try
+    {
+        argParser->parse_args_without_binary_name(argv + 1);
+        CSLDestroy(argv);
+    }
+    catch (const std::exception &error)
+    {
+        argParser->display_error_and_usage(error);
+        CSLDestroy(argv);
+        exit(1);
+    }
 
-    if (EQUAL(papszRemainingArgv[0], "-f") && nRemainingArgc > 1)
+    // For some obscure reason datasetname is parsed as mandatory
+    // if used with remaining() in a subparser
+    if (psOptions.aosDatasetNames.empty() && psOptions.osDatasetName.empty())
     {
-        pszDriver = papszRemainingArgv[1];
-        papszRemainingArgv += 2;
-        nRemainingArgc -= 2;
+        std::invalid_argument error(
+            _("No dataset name provided. At least one dataset "
+              "name is required."));
+        argParser->display_error_and_usage(error);
+        exit(1);
     }
 
-    if (pszDriver != nullptr)
+    GDALDriverH hDriver = nullptr;
+    if (!psOptions.osDriverName.empty())
     {
-        hDriver = GDALGetDriverByName(pszDriver);
+        hDriver = GDALGetDriverByName(psOptions.osDriverName.c_str());
         if (hDriver == nullptr)
         {
-            fprintf(stderr, "Unable to find driver named '%s'.\n", pszDriver);
+            CPLError(CE_Failure, CPLE_AppDefined, "Failed to find driver '%s'.",
+                     psOptions.osDriverName.c_str());
             exit(1);
         }
     }
@@ -233,26 +261,40 @@ MAIN_START(argc, argv)
     /* -------------------------------------------------------------------- */
     /*      Split out based on operation.                                   */
     /* -------------------------------------------------------------------- */
-    if (STARTS_WITH_CI(argv[1], "ident" /* identify" */))
-        Identify(nRemainingArgc, papszRemainingArgv);
-
-    else if (EQUAL(argv[1], "copy"))
-        Copy(hDriver, nRemainingArgc, papszRemainingArgv, "copy");
-
-    else if (EQUAL(argv[1], "rename"))
-        Copy(hDriver, nRemainingArgc, papszRemainingArgv, "rename");
 
-    else if (EQUAL(argv[1], "delete"))
-        Delete(hDriver, nRemainingArgc, papszRemainingArgv);
-
-    else
-        Usage(true);
+    if (argParser->is_subcommand_used("identify"))
+    {
+        // Process all files in aosDatasetName
+        for (const auto &datasetName : psOptions.aosDatasetNames)
+        {
+            ProcessIdentifyTarget(
+                datasetName.c_str(), nullptr, psOptions.bRecursive,
+                psOptions.bReportFailures, psOptions.bForceRecurse);
+        }
+    }
+    else if (argParser->is_subcommand_used("copy"))
+    {
+        GDALCopyDatasetFiles(hDriver, psOptions.osDatasetName.c_str(),
+                             psOptions.osNewName.c_str());
+    }
+    else if (argParser->is_subcommand_used("rename"))
+    {
+        GDALRenameDataset(hDriver, psOptions.osDatasetName.c_str(),
+                          psOptions.osNewName.c_str());
+    }
+    else if (argParser->is_subcommand_used("delete"))
+    {
+        // Process all files in aosDatasetName
+        for (const auto &datasetName : psOptions.aosDatasetNames)
+        {
+            GDALDeleteDataset(hDriver, datasetName.c_str());
+        }
+    }
 
     /* -------------------------------------------------------------------- */
     /*      Cleanup                                                         */
     /* -------------------------------------------------------------------- */
-    CSLDestroy(argv);
-    GDALDestroyDriverManager();
+    GDALDestroy();
 
     exit(0);
 }
diff --git a/apps/gdalmdiminfo_bin.cpp b/apps/gdalmdiminfo_bin.cpp
index 216eeb97bef0..a79fcfa3d46d 100644
--- a/apps/gdalmdiminfo_bin.cpp
+++ b/apps/gdalmdiminfo_bin.cpp
@@ -7,23 +7,7 @@
  * ****************************************************************************
  * Copyright (c) 2019, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_version.h"
diff --git a/apps/gdalmdiminfo_lib.cpp b/apps/gdalmdiminfo_lib.cpp
index c6d1372164ca..cf59e16d4dd4 100644
--- a/apps/gdalmdiminfo_lib.cpp
+++ b/apps/gdalmdiminfo_lib.cpp
@@ -7,23 +7,7 @@
  * ****************************************************************************
  * Copyright (c) 2019, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -1222,7 +1206,7 @@ char *GDALMultiDimInfo(GDALDatasetH hDataset,
                 }
                 curGroup = std::move(curGroupNew);
             }
-            const char *pszArrayName = aosTokens[aosTokens.size() - 1];
+            const char *pszArrayName = aosTokens.back();
             auto array(curGroup->OpenMDArray(pszArrayName));
             if (!array)
             {
diff --git a/apps/gdalmdimtranslate_bin.cpp b/apps/gdalmdimtranslate_bin.cpp
index 65843abea938..ee2ea18986e4 100644
--- a/apps/gdalmdimtranslate_bin.cpp
+++ b/apps/gdalmdimtranslate_bin.cpp
@@ -7,23 +7,7 @@
  * ****************************************************************************
  * Copyright (c) 2019, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/apps/gdalmdimtranslate_lib.cpp b/apps/gdalmdimtranslate_lib.cpp
index 7895b5a39076..02d189c277eb 100644
--- a/apps/gdalmdimtranslate_lib.cpp
+++ b/apps/gdalmdimtranslate_lib.cpp
@@ -7,23 +7,7 @@
  * ****************************************************************************
  * Copyright (c) 2019, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/apps/gdalsrsinfo.cpp b/apps/gdalsrsinfo.cpp
index 05882a7ab205..4b9afdc4d89a 100644
--- a/apps/gdalsrsinfo.cpp
+++ b/apps/gdalsrsinfo.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 1998, Frank Warmerdam
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/apps/gdaltindex_bin.cpp b/apps/gdaltindex_bin.cpp
index 3d14d61e3ac2..9c57b20d9640 100644
--- a/apps/gdaltindex_bin.cpp
+++ b/apps/gdaltindex_bin.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2001, Frank Warmerdam, DM Solutions Group Inc
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/apps/gdaltindex_lib.cpp b/apps/gdaltindex_lib.cpp
index 7101a7d6ba0b..9b429ec7fe97 100644
--- a/apps/gdaltindex_lib.cpp
+++ b/apps/gdaltindex_lib.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2001, Frank Warmerdam, DM Solutions Group Inc
  * Copyright (c) 2007-2023, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -387,6 +371,8 @@ struct GDALTileIndexTileIterator
     int iCurSrc = 0;
     VSIDIR *psDir = nullptr;
 
+    CPL_DISALLOW_COPY_ASSIGN(GDALTileIndexTileIterator)
+
     GDALTileIndexTileIterator(const GDALTileIndexOptions *psOptionsIn,
                               int nSrcCountIn,
                               const char *const *papszSrcDSNamesIn)
diff --git a/apps/gdaltorture.cpp b/apps/gdaltorture.cpp
index 38109719310e..fa7fbb6aee2e 100644
--- a/apps/gdaltorture.cpp
+++ b/apps/gdaltorture.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2008-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal.h"
diff --git a/apps/gdaltransform.cpp b/apps/gdaltransform.cpp
index 7dea9f3bbb48..6455a060c5d5 100644
--- a/apps/gdaltransform.cpp
+++ b/apps/gdaltransform.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -40,7 +24,6 @@
 #include "gdal_alg.h"
 #include "gdalwarper.h"
 #include "gdal.h"
-#include "gdal_version.h"
 #include "ogr_api.h"
 #include "ogr_core.h"
 #include "ogr_spatialref.h"
@@ -402,6 +385,11 @@ MAIN_START(argc, argv)
             if (fgets(szLine, sizeof(szLine) - 1, stdin) == nullptr)
                 break;
 
+            size_t nLen = strlen(szLine);
+            if (nLen && szLine[nLen - 1] == '\n')
+                szLine[--nLen] = 0;
+            if (nLen && szLine[nLen - 1] == '\r')
+                szLine[--nLen] = 0;
             const CPLStringList aosTokens(CSLTokenizeString(szLine));
             const int nCount = aosTokens.size();
 
diff --git a/apps/gdalwarp_bin.cpp b/apps/gdalwarp_bin.cpp
index a674e6de360a..29c168a352c2 100644
--- a/apps/gdalwarp_bin.cpp
+++ b/apps/gdalwarp_bin.cpp
@@ -9,23 +9,7 @@
  *                          Fort Collin, CO
  * Copyright (c) 2007-2015, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/apps/gdalwarp_lib.cpp b/apps/gdalwarp_lib.cpp
index 9ca7146e5622..466bda679e9c 100644
--- a/apps/gdalwarp_lib.cpp
+++ b/apps/gdalwarp_lib.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2007-2015, Even Rouault <even dot rouault at spatialys.com>
  * Copyright (c) 2015, Faza Mahamood
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -1120,6 +1104,8 @@ static bool CanUseBuildVRT(int nSrcCount, GDALDatasetH *pahSrcDS)
     return bCanUseBuildVRT;
 }
 
+#ifdef HAVE_TIFF
+
 /************************************************************************/
 /*                      DealWithCOGOptions()                            */
 /************************************************************************/
@@ -1175,8 +1161,8 @@ static bool DealWithCOGOptions(CPLStringList &aosCreateOptions, int nSrcCount,
 
     GDALWarpAppOptions oClonedOptions(*psOptions);
     oClonedOptions.bQuiet = true;
-    CPLString osTmpFilename;
-    osTmpFilename.Printf("/vsimem/gdalwarp/%p.tif", &oClonedOptions);
+    const CPLString osTmpFilename(
+        VSIMemGenerateHiddenFilename("gdalwarp_tmp.tif"));
     CPLStringList aosTmpGTiffCreateOptions;
     aosTmpGTiffCreateOptions.SetNameValue("SPARSE_OK", "YES");
     aosTmpGTiffCreateOptions.SetNameValue("TILED", "YES");
@@ -1224,6 +1210,8 @@ static bool DealWithCOGOptions(CPLStringList &aosCreateOptions, int nSrcCount,
     return bRet;
 }
 
+#endif
+
 /************************************************************************/
 /*                      GDALWarpIndirect()                              */
 /************************************************************************/
@@ -1289,11 +1277,14 @@ static GDALDatasetH GDALWarpIndirect(const char *pszDest, GDALDriverH hDriver,
         if ((nBands == 1 ||
              (nBands > 1 && GDALGetRasterColorInterpretation(GDALGetRasterBand(
                                 pahSrcDS[0], nBands)) != GCI_AlphaBand)) &&
-            (psOptions->bEnableDstAlpha ||
-             (EQUAL(psOptions->osFormat.c_str(), "COG") &&
-              COGHasWarpingOptions(aosCreateOptions.List()) &&
-              CPLTestBool(
-                  aosCreateOptions.FetchNameValueDef("ADD_ALPHA", "YES")))))
+            (psOptions->bEnableDstAlpha
+#ifdef HAVE_TIFF
+             || (EQUAL(psOptions->osFormat.c_str(), "COG") &&
+                 COGHasWarpingOptions(aosCreateOptions.List()) &&
+                 CPLTestBool(
+                     aosCreateOptions.FetchNameValueDef("ADD_ALPHA", "YES")))
+#endif
+                 ))
         {
             aosArgv.AddString("-addalpha");
         }
@@ -1309,6 +1300,7 @@ static GDALDatasetH GDALWarpIndirect(const char *pszDest, GDALDriverH hDriver,
     double dfStartPctCreateCopy = 0.0;
     if (hTmpDS == nullptr)
     {
+#ifdef HAVE_TIFF
         // Special processing for COG output. As some of its options do
         // on-the-fly reprojection, take them into account now, and remove them
         // from the COG creation stage.
@@ -1318,6 +1310,7 @@ static GDALDatasetH GDALWarpIndirect(const char *pszDest, GDALDriverH hDriver,
         {
             return nullptr;
         }
+#endif
 
         // Materialize a temporary GeoTIFF with the result of the warp
         psOptions->osFormat = "GTiff";
@@ -1987,7 +1980,7 @@ static void SetupNoData(const char *pszDest, int iSrc, GDALDatasetH hSrcDS,
         {
             if (!psOptions->bQuiet)
             {
-                if (CPLIsNan(dfReal))
+                if (std::isnan(dfReal))
                     printf("Using internal nodata values (e.g. nan) for image "
                            "%s.\n",
                            GDALGetDescription(hSrcDS));
@@ -2817,8 +2810,17 @@ static GDALDatasetH GDALWarpDirect(const char *pszDest, GDALDatasetH hDstDS,
 
             if (dfTargetRatio > 1.0)
             {
-                int iOvr = -1;
-                for (; iOvr < nOvCount - 1; iOvr++)
+                // Note: keep this logic for overview selection in sync between
+                // gdalwarp_lib.cpp and rasterio.cpp
+                const char *pszOversampligThreshold = CPLGetConfigOption(
+                    "GDALWARP_OVERSAMPLING_THRESHOLD", nullptr);
+                const double dfOversamplingThreshold =
+                    pszOversampligThreshold ? CPLAtof(pszOversampligThreshold)
+                                            : 1.0;
+
+                int iBestOvr = -1;
+                double dfBestRatio = 0;
+                for (int iOvr = -1; iOvr < nOvCount; iOvr++)
                 {
                     const double dfOvrRatio =
                         iOvr < 0
@@ -2827,18 +2829,27 @@ static GDALDatasetH GDALWarpDirect(const char *pszDest, GDALDatasetH hDstDS,
                                   poSrcDS->GetRasterBand(1)
                                       ->GetOverview(iOvr)
                                       ->GetXSize();
-                    const double dfNextOvrRatio =
-                        static_cast<double>(poSrcDS->GetRasterXSize()) /
-                        poSrcDS->GetRasterBand(1)
-                            ->GetOverview(iOvr + 1)
-                            ->GetXSize();
-                    if (dfOvrRatio < dfTargetRatio &&
-                        dfNextOvrRatio > dfTargetRatio)
-                        break;
-                    if (fabs(dfOvrRatio - dfTargetRatio) < 1e-1)
+
+                    // Is it nearly the requested factor and better (lower) than
+                    // the current best factor?
+                    // Use an epsilon because of numerical instability.
+                    constexpr double EPSILON = 1e-1;
+                    if (dfOvrRatio >=
+                            dfTargetRatio * dfOversamplingThreshold + EPSILON ||
+                        dfOvrRatio <= dfBestRatio)
+                    {
+                        continue;
+                    }
+
+                    iBestOvr = iOvr;
+                    dfBestRatio = dfOvrRatio;
+                    if (std::abs(dfTargetRatio - dfOvrRatio) < EPSILON)
+                    {
                         break;
+                    }
                 }
-                iOvr += (psOptions->nOvLevel - OVR_LEVEL_AUTO);
+                const int iOvr =
+                    iBestOvr + (psOptions->nOvLevel - OVR_LEVEL_AUTO);
                 if (iOvr >= 0)
                 {
                     CPLDebug("WARP", "Selecting overview level %d for %s", iOvr,
@@ -3680,6 +3691,18 @@ static GDALDatasetH GDALWarpCreateOutput(
             return nullptr;
         }
 
+        // Examine desired overview level and retrieve the corresponding dataset
+        // if it exists.
+        std::unique_ptr<GDALDataset> oDstDSOverview;
+        if (psOptions->nOvLevel >= 0)
+        {
+            oDstDSOverview.reset(GDALCreateOverviewDataset(
+                GDALDataset::FromHandle(hSrcDS), psOptions->nOvLevel,
+                /* bThisLevelOnly = */ true));
+            if (oDstDSOverview)
+                hSrcDS = oDstDSOverview.get();
+        }
+
         /* --------------------------------------------------------------------
          */
         /*      Check if the source dataset shares some files with the dest
@@ -4110,6 +4133,7 @@ static GDALDatasetH GDALWarpCreateOutput(
             {
                 nOptions |= GDAL_SWO_FORCE_SQUARE_PIXEL;
             }
+
             if (GDALSuggestedWarpOutput2(hSrcDS, psInfo->pfnTransform,
                                          hTransformArg, adfThisGeoTransform,
                                          &nThisPixels, &nThisLines, adfExtent,
@@ -4415,10 +4439,14 @@ static GDALDatasetH GDALWarpCreateOutput(
             nPixels = static_cast<int>((psOptions->dfMaxX - psOptions->dfMinX +
                                         (psOptions->dfXRes / 2.0)) /
                                        psOptions->dfXRes);
+            if (nPixels == 0)
+                nPixels = 1;
             nLines = static_cast<int>(
                 (std::fabs(psOptions->dfMaxY - psOptions->dfMinY) +
                  (psOptions->dfYRes / 2.0)) /
                 psOptions->dfYRes);
+            if (nLines == 0)
+                nLines = 1;
             adfDstGeoTransform[0] = psOptions->dfMinX;
             adfDstGeoTransform[3] = psOptions->dfMaxY;
             adfDstGeoTransform[1] = psOptions->dfXRes;
@@ -4432,7 +4460,7 @@ static GDALDatasetH GDALWarpCreateOutput(
         {
             // Try to detect if the edge of the raster would be blank
             // Cf https://github.com/OSGeo/gdal/issues/7905
-            while (true)
+            while (nPixels > 1 || nLines > 1)
             {
                 UpdateGeoTransformandAndPixelLines();
 
@@ -4534,18 +4562,30 @@ static GDALDatasetH GDALWarpCreateOutput(
 
                 if (bTopBlankLine)
                 {
+                    if (psOptions->dfMaxY - psOptions->dfMinY <=
+                        2 * psOptions->dfYRes)
+                        break;
                     psOptions->dfMaxY -= psOptions->dfYRes;
                 }
                 if (bBottomBlankLine)
                 {
+                    if (psOptions->dfMaxY - psOptions->dfMinY <=
+                        2 * psOptions->dfYRes)
+                        break;
                     psOptions->dfMinY += psOptions->dfYRes;
                 }
                 if (bLeftBlankCol)
                 {
+                    if (psOptions->dfMaxX - psOptions->dfMinX <=
+                        2 * psOptions->dfXRes)
+                        break;
                     psOptions->dfMinX += psOptions->dfXRes;
                 }
                 if (bRightBlankCol)
                 {
+                    if (psOptions->dfMaxX - psOptions->dfMinX <=
+                        2 * psOptions->dfXRes)
+                        break;
                     psOptions->dfMaxX -= psOptions->dfXRes;
                 }
             }
@@ -4839,6 +4879,8 @@ static GDALDatasetH GDALWarpCreateOutput(
 
 class CutlineTransformer : public OGRCoordinateTransformation
 {
+    CPL_DISALLOW_COPY_ASSIGN(CutlineTransformer)
+
   public:
     void *hSrcImageTransformer = nullptr;
 
@@ -5725,21 +5767,31 @@ GDALWarpAppOptionsGetParser(GDALWarpAppOptions *psOptions,
         .action(
             [psOptions](const std::string &s)
             {
-                if (CPLAtofM(s.c_str()) < 10000)
-                    psOptions->dfWarpMemoryLimit =
-                        CPLAtofM(s.c_str()) * 1024 * 1024;
+                bool bUnitSpecified = false;
+                GIntBig nBytes;
+                if (CPLParseMemorySize(s.c_str(), &nBytes, &bUnitSpecified) ==
+                    CE_None)
+                {
+                    if (!bUnitSpecified && nBytes < 10000)
+                    {
+                        nBytes *= (1024 * 1024);
+                    }
+                    psOptions->dfWarpMemoryLimit = static_cast<double>(nBytes);
+                }
                 else
-                    psOptions->dfWarpMemoryLimit = CPLAtofM(s.c_str());
+                {
+                    throw std::invalid_argument("Failed to parse value of -wm");
+                }
             })
         .help(_("Set max warp memory."));
 
     argParser->add_argument("-srcnodata")
-        .metavar("<value>[ <value>...]")
+        .metavar("\"<value>[ <value>]...\"")
         .store_into(psOptions->osSrcNodata)
         .help(_("Nodata masking values for input bands."));
 
     argParser->add_argument("-dstnodata")
-        .metavar("<value>[ <value>...]")
+        .metavar("\"<value>[ <value>]...\"")
         .store_into(psOptions->osDstNodata)
         .help(_("Nodata masking values for output bands."));
 
@@ -6113,6 +6165,20 @@ GDALWarpAppOptionsNew(char **papszArgv,
             }
             psOptions->bCreateOutput = true;
         }
+        // argparser will be confused if the value of a string argument
+        // starts with a negative sign.
+        else if (EQUAL(papszArgv[i], "-srcnodata") && i + 1 < nArgc)
+        {
+            ++i;
+            psOptions->osSrcNodata = papszArgv[i];
+        }
+        // argparser will be confused if the value of a string argument
+        // starts with a negative sign.
+        else if (EQUAL(papszArgv[i], "-dstnodata") && i + 1 < nArgc)
+        {
+            ++i;
+            psOptions->osDstNodata = papszArgv[i];
+        }
         else
         {
             aosArgv.AddString(papszArgv[i]);
diff --git a/apps/gdalwarpsimple.c b/apps/gdalwarpsimple.c
index 136caec00009..781b9a03bbfd 100644
--- a/apps/gdalwarpsimple.c
+++ b/apps/gdalwarpsimple.c
@@ -9,23 +9,7 @@
  * Copyright (c) 2002, i3 - information integration and imaging
  *                          Fort Collin, CO
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_alg.h"
diff --git a/apps/gnmanalyse.cpp b/apps/gnmanalyse.cpp
index 029294ee8bc1..a318dde69e21 100644
--- a/apps/gnmanalyse.cpp
+++ b/apps/gnmanalyse.cpp
@@ -8,23 +8,7 @@
  * Copyright (C) 2014 Mikhail Gusev
  * Copyright (c) 2014-2015, NextGIS <info@nextgis.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "commonutils.h"
diff --git a/apps/gnmmanage.cpp b/apps/gnmmanage.cpp
index 77f6dcdccde2..ef21df7f9c01 100644
--- a/apps/gnmmanage.cpp
+++ b/apps/gnmmanage.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2014, Mikhail Gusev
  * Copyright (c) 2014-2015, NextGIS <info@nextgis.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "commonutils.h"
diff --git a/apps/multireadtest.cpp b/apps/multireadtest.cpp
index d8a4e1cc24b8..522e533a3a3b 100644
--- a/apps/multireadtest.cpp
+++ b/apps/multireadtest.cpp
@@ -7,50 +7,39 @@
  ******************************************************************************
  * Copyright (c) 2005, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal.h"
 #include "gdal_alg.h"
 #include "cpl_multiproc.h"
 #include "cpl_string.h"
+
+#include <condition_variable>
+#include <mutex>
+#include <thread>
 #include <vector>
 
 static int nIterations = 1;
 static bool bLockOnOpen = false;
 static int nOpenIterations = 1;
 static volatile int nPendingThreads = 0;
+static bool bThreadCanFinish = false;
+static std::mutex oMutex;
+static std::condition_variable oCond;
 static const char *pszFilename = nullptr;
 static int nChecksum = 0;
 static int nWidth = 0;
 static int nHeight = 0;
 
-static CPLMutex *pGlobalMutex = nullptr;
-
 /************************************************************************/
 /*                               Usage()                                */
 /************************************************************************/
 
 static void Usage()
 {
-    printf("multireadtest [-lock_on_open] [-open_in_main] [-t <thread#>]\n"
-           "              [-i <iterations>] [-oi <iterations>]\n"
+    printf("multireadtest [[-thread_safe] | [[-lock_on_open] [-open_in_main]]\n"
+           "              [-t <thread#>] [-i <iterations>] [-oi <iterations>]\n"
            "              [-width <val>] [-height <val>]\n"
            "              filename\n");
     exit(1);
@@ -74,12 +63,12 @@ static void WorkerFunc(void *arg)
         else
         {
             if (bLockOnOpen)
-                CPLAcquireMutex(pGlobalMutex, 100.0);
+                oMutex.lock();
 
             hDS = GDALOpen(pszFilename, GA_ReadOnly);
 
             if (bLockOnOpen)
-                CPLReleaseMutex(pGlobalMutex);
+                oMutex.unlock();
         }
 
         for (int iIter = 0; iIter < nIterations && hDS != nullptr; iIter++)
@@ -99,10 +88,10 @@ static void WorkerFunc(void *arg)
         if (hDS && hDSIn == nullptr)
         {
             if (bLockOnOpen)
-                CPLAcquireMutex(pGlobalMutex, 100.0);
+                oMutex.lock();
             GDALClose(hDS);
             if (bLockOnOpen)
-                CPLReleaseMutex(pGlobalMutex);
+                oMutex.unlock();
         }
         else if (hDSIn != nullptr)
         {
@@ -110,9 +99,13 @@ static void WorkerFunc(void *arg)
         }
     }
 
-    CPLAcquireMutex(pGlobalMutex, 100.0);
-    nPendingThreads--;
-    CPLReleaseMutex(pGlobalMutex);
+    {
+        std::unique_lock oLock(oMutex);
+        nPendingThreads--;
+        oCond.notify_all();
+        while (!bThreadCanFinish)
+            oCond.wait(oLock);
+    }
 }
 
 /************************************************************************/
@@ -131,6 +124,10 @@ int main(int argc, char **argv)
 
     int nThreadCount = 4;
     bool bOpenInThreads = true;
+    bool bThreadSafe = false;
+    bool bJoinAfterClosing = false;
+    bool bDetach = false;
+    bool bClose = true;
 
     for (int iArg = 1; iArg < argc; iArg++)
     {
@@ -154,6 +151,10 @@ int main(int argc, char **argv)
         {
             nHeight = atoi(argv[++iArg]);
         }
+        else if (EQUAL(argv[iArg], "-thread_safe"))
+        {
+            bThreadSafe = true;
+        }
         else if (EQUAL(argv[iArg], "-lock_on_open"))
         {
             bLockOnOpen = true;
@@ -162,6 +163,18 @@ int main(int argc, char **argv)
         {
             bOpenInThreads = false;
         }
+        else if (EQUAL(argv[iArg], "-join_after_closing"))
+        {
+            bJoinAfterClosing = true;
+        }
+        else if (EQUAL(argv[iArg], "-detach"))
+        {
+            bDetach = true;
+        }
+        else if (EQUAL(argv[iArg], "-do_not_close"))
+        {
+            bClose = false;
+        }
         else if (pszFilename == nullptr)
         {
             pszFilename = argv[iArg];
@@ -186,12 +199,10 @@ int main(int argc, char **argv)
     /* -------------------------------------------------------------------- */
     /*      Get the checksum of band1.                                      */
     /* -------------------------------------------------------------------- */
-    GDALDatasetH hDS = nullptr;
-
     GDALAllRegister();
     for (int i = 0; i < 2; i++)
     {
-        hDS = GDALOpen(pszFilename, GA_ReadOnly);
+        GDALDatasetH hDS = GDALOpen(pszFilename, GA_ReadOnly);
         if (hDS == nullptr)
             exit(1);
 
@@ -210,39 +221,83 @@ int main(int argc, char **argv)
     /* -------------------------------------------------------------------- */
     /*      Fire off worker threads.                                        */
     /* -------------------------------------------------------------------- */
-    pGlobalMutex = CPLCreateMutex();
-    CPLReleaseMutex(pGlobalMutex);
 
     nPendingThreads = nThreadCount;
 
+    GDALDatasetH hThreadSafeDS = nullptr;
+    if (bThreadSafe)
+    {
+        hThreadSafeDS =
+            GDALOpenEx(pszFilename, GDAL_OF_RASTER | GDAL_OF_THREAD_SAFE,
+                       nullptr, nullptr, nullptr);
+        if (!hThreadSafeDS)
+            exit(1);
+    }
+    std::vector<std::thread> aoThreads;
     std::vector<GDALDatasetH> aoDS;
     for (int iThread = 0; iThread < nThreadCount; iThread++)
     {
-        hDS = nullptr;
-        if (!bOpenInThreads)
+        GDALDatasetH hDS = nullptr;
+        if (bThreadSafe)
         {
-            hDS = GDALOpen(pszFilename, GA_ReadOnly);
-            if (!hDS)
+            hDS = hThreadSafeDS;
+        }
+        else
+        {
+            if (!bOpenInThreads)
             {
-                printf("GDALOpen() failed.\n");
-                exit(1);
+                hDS = GDALOpen(pszFilename, GA_ReadOnly);
+                if (!hDS)
+                {
+                    printf("GDALOpen() failed.\n");
+                    exit(1);
+                }
+                aoDS.push_back(hDS);
             }
-            aoDS.push_back(hDS);
         }
-        if (CPLCreateThread(WorkerFunc, hDS) == -1)
+        aoThreads.push_back(std::thread([hDS]() { WorkerFunc(hDS); }));
+    }
+
+    {
+        std::unique_lock oLock(oMutex);
+        while (nPendingThreads > 0)
         {
-            printf("CPLCreateThread() failed.\n");
-            exit(1);
+            // printf("nPendingThreads = %d\n", nPendingThreads);
+            oCond.wait(oLock);
         }
     }
 
-    while (nPendingThreads > 0)
-        CPLSleep(0.5);
-
-    CPLDestroyMutex(pGlobalMutex);
+    if (!bJoinAfterClosing && !bDetach)
+    {
+        {
+            std::lock_guard oLock(oMutex);
+            bThreadCanFinish = true;
+            oCond.notify_all();
+        }
+        for (auto &oThread : aoThreads)
+            oThread.join();
+    }
 
     for (size_t i = 0; i < aoDS.size(); ++i)
         GDALClose(aoDS[i]);
+    if (bClose)
+        GDALClose(hThreadSafeDS);
+
+    if (bDetach)
+    {
+        for (auto &oThread : aoThreads)
+            oThread.detach();
+    }
+    else if (bJoinAfterClosing)
+    {
+        {
+            std::lock_guard oLock(oMutex);
+            bThreadCanFinish = true;
+            oCond.notify_all();
+        }
+        for (auto &oThread : aoThreads)
+            oThread.join();
+    }
 
     printf("All threads complete.\n");
 
@@ -250,5 +305,13 @@ int main(int argc, char **argv)
 
     GDALDestroyDriverManager();
 
+    {
+        std::lock_guard oLock(oMutex);
+        bThreadCanFinish = true;
+        oCond.notify_all();
+    }
+
+    printf("End of main.\n");
+
     return 0;
 }
diff --git a/apps/nearblack_bin.cpp b/apps/nearblack_bin.cpp
index 244bc00743f4..cd870959b628 100644
--- a/apps/nearblack_bin.cpp
+++ b/apps/nearblack_bin.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/apps/nearblack_lib.cpp b/apps/nearblack_lib.cpp
index ff801ace9a99..44ea36923bda 100644
--- a/apps/nearblack_lib.cpp
+++ b/apps/nearblack_lib.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2006, MapShots Inc (www.mapshots.com)
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/apps/nearblack_lib.h b/apps/nearblack_lib.h
index e90b12cd768a..68f85f4ac001 100644
--- a/apps/nearblack_lib.h
+++ b/apps/nearblack_lib.h
@@ -8,23 +8,7 @@
  * Copyright (c) 2006, MapShots Inc (www.mapshots.com)
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef NEARBLACK_LIB_H
diff --git a/apps/nearblack_lib_floodfill.cpp b/apps/nearblack_lib_floodfill.cpp
index da29fb236f32..541a3ddd7b4e 100644
--- a/apps/nearblack_lib_floodfill.cpp
+++ b/apps/nearblack_lib_floodfill.cpp
@@ -8,23 +8,7 @@
  * ****************************************************************************
  * Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_priv.h"
diff --git a/apps/ogr2ogr_bin.cpp b/apps/ogr2ogr_bin.cpp
index 9e12a64c647c..92a8647a2267 100644
--- a/apps/ogr2ogr_bin.cpp
+++ b/apps/ogr2ogr_bin.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2008-2015, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -47,7 +31,6 @@
 #include "gdal_priv.h"
 #include "gdal_utils.h"
 #include "gdal_utils_priv.h"
-#include "gdal_version.h"
 #include "ogr_api.h"
 #include "ogr_core.h"
 #include "ogr_p.h"
@@ -104,7 +87,8 @@ MAIN_START(nArgc, papszArgv)
 
     if (psOptions == nullptr)
     {
-        Usage();
+        if (sOptionsForBinary.bShowUsageIfError)
+            Usage();
         goto exit;
     }
 
diff --git a/apps/ogr2ogr_lib.cpp b/apps/ogr2ogr_lib.cpp
index c2f4305a9d10..e5ef6bf92628 100644
--- a/apps/ogr2ogr_lib.cpp
+++ b/apps/ogr2ogr_lib.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2008-2015, Even Rouault <even dot rouault at spatialys.com>
  * Copyright (c) 2015, Faza Mahamood
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -40,9 +24,12 @@
 #include <cstring>
 
 #include <algorithm>
+#include <atomic>
+#include <future>
 #include <limits>
 #include <map>
 #include <memory>
+#include <mutex>
 #include <set>
 #include <unordered_set>
 #include <string>
@@ -68,8 +55,10 @@
 #include "ogr_p.h"
 #include "ogr_recordbatch.h"
 #include "ogr_spatialref.h"
+#include "ogrlayerarrow.h"
 #include "ogrlayerdecorator.h"
 #include "ogrsf_frmts.h"
+#include "ogr_wkb.h"
 
 typedef enum
 {
@@ -128,6 +117,8 @@ struct CopyableGCPs
             CPLFree(pasGCPs);
         }
     }
+
+    CopyableGCPs &operator=(const CopyableGCPs &) = delete;
 };
 }  // namespace gdal::ogr2ogr_lib
 
@@ -270,6 +261,9 @@ struct GDALVectorTranslateOptions
     /*! Whether to run MakeValid */
     bool bMakeValid = false;
 
+    /*! Whether to run OGRGeometry::IsValid */
+    bool bSkipInvalidGeom = false;
+
     /*! list of field types to convert to a field of type string in the
        destination layer. Valid types are: Integer, Integer64, Real, String,
        Date, Time, DateTime, Binary, IntegerList, Integer64List, RealList,
@@ -425,7 +419,7 @@ struct GDALVectorTranslateOptions
        whose geometry intersects the extents will be selected. The geometries
        will not be clipped unless GDALVectorTranslateOptions::bClipSrc is true.
      */
-    std::shared_ptr<OGRGeometry> poSpatialFilter;
+    std::shared_ptr<OGRGeometry> poSpatialFilter{};
 
     /*! the progress function to use */
     GDALProgressFunc pfnProgress = nullptr;
@@ -500,6 +494,7 @@ struct TargetLayerInfo
     const char *m_pszGeomField = nullptr;
     std::vector<int> m_anDateTimeFieldIdx{};
     bool m_bSupportCurves = false;
+    OGRArrowArrayStream m_sArrowArrayStream{};
 };
 
 struct AssociatedLayers
@@ -513,41 +508,43 @@ class SetupTargetLayer
     bool CanUseWriteArrowBatch(OGRLayer *poSrcLayer, OGRLayer *poDstLayer,
                                bool bJustCreatedLayer,
                                const GDALVectorTranslateOptions *psOptions,
-                               bool &bError);
+                               bool bPreserveFID, bool &bError,
+                               OGRArrowArrayStream &streamSrc);
 
   public:
-    GDALDataset *m_poSrcDS;
-    GDALDataset *m_poDstDS;
-    char **m_papszLCO;
-    OGRSpatialReference *m_poOutputSRS;
+    GDALDataset *m_poSrcDS = nullptr;
+    GDALDataset *m_poDstDS = nullptr;
+    CSLConstList m_papszLCO = nullptr;
+    const OGRSpatialReference *m_poUserSourceSRS = nullptr;
+    const OGRSpatialReference *m_poOutputSRS = nullptr;
     bool m_bTransform = false;
-    bool m_bNullifyOutputSRS;
+    bool m_bNullifyOutputSRS = false;
     bool m_bSelFieldsSet = false;
-    char **m_papszSelFields;
-    bool m_bAppend;
-    bool m_bAddMissingFields;
-    int m_eGType;
-    GeomTypeConversion m_eGeomTypeConversion;
-    int m_nCoordDim;
-    bool m_bOverwrite;
-    char **m_papszFieldTypesToString;
-    char **m_papszMapFieldType;
-    bool m_bUnsetFieldWidth;
-    bool m_bExplodeCollections;
-    const char *m_pszZField;
-    char **m_papszFieldMap;
-    const char *m_pszWHERE;
-    bool m_bExactFieldNameMatch;
-    bool m_bQuiet;
-    bool m_bForceNullable;
-    bool m_bResolveDomains;
-    bool m_bUnsetDefault;
-    bool m_bUnsetFid;
-    bool m_bPreserveFID;
-    bool m_bCopyMD;
-    bool m_bNativeData;
-    bool m_bNewDataSource;
-    const char *m_pszCTPipeline;
+    CSLConstList m_papszSelFields = nullptr;
+    bool m_bAppend = false;
+    bool m_bAddMissingFields = false;
+    int m_eGType = 0;
+    GeomTypeConversion m_eGeomTypeConversion = GTC_DEFAULT;
+    int m_nCoordDim = 0;
+    bool m_bOverwrite = false;
+    CSLConstList m_papszFieldTypesToString = nullptr;
+    CSLConstList m_papszMapFieldType = nullptr;
+    bool m_bUnsetFieldWidth = false;
+    bool m_bExplodeCollections = false;
+    const char *m_pszZField = nullptr;
+    CSLConstList m_papszFieldMap = nullptr;
+    const char *m_pszWHERE = nullptr;
+    bool m_bExactFieldNameMatch = false;
+    bool m_bQuiet = false;
+    bool m_bForceNullable = false;
+    bool m_bResolveDomains = false;
+    bool m_bUnsetDefault = false;
+    bool m_bUnsetFid = false;
+    bool m_bPreserveFID = false;
+    bool m_bCopyMD = false;
+    bool m_bNativeData = false;
+    bool m_bNewDataSource = false;
+    const char *m_pszCTPipeline = nullptr;
 
     std::unique_ptr<TargetLayerInfo>
     Setup(OGRLayer *poSrcLayer, const char *pszNewLayerName,
@@ -556,11 +553,10 @@ class SetupTargetLayer
 
 class LayerTranslator
 {
-    static bool TranslateArrow(const TargetLayerInfo *psInfo,
-                               GIntBig nCountLayerFeatures,
-                               GIntBig *pnReadFeatureCount,
-                               GDALProgressFunc pfnProgress, void *pProgressArg,
-                               const GDALVectorTranslateOptions *psOptions);
+    bool TranslateArrow(TargetLayerInfo *psInfo, GIntBig nCountLayerFeatures,
+                        GIntBig *pnReadFeatureCount,
+                        GDALProgressFunc pfnProgress, void *pProgressArg,
+                        const GDALVectorTranslateOptions *psOptions);
 
   public:
     GDALDataset *m_poSrcDS = nullptr;
@@ -568,28 +564,34 @@ class LayerTranslator
     bool m_bTransform = false;
     bool m_bWrapDateline = false;
     CPLString m_osDateLineOffset{};
-    OGRSpatialReference *m_poOutputSRS = nullptr;
+    const OGRSpatialReference *m_poOutputSRS = nullptr;
     bool m_bNullifyOutputSRS = false;
-    OGRSpatialReference *m_poUserSourceSRS = nullptr;
+    const OGRSpatialReference *m_poUserSourceSRS = nullptr;
     OGRCoordinateTransformation *m_poGCPCoordTrans = nullptr;
     int m_eGType = -1;
     GeomTypeConversion m_eGeomTypeConversion = GTC_DEFAULT;
     bool m_bMakeValid = false;
+    bool m_bSkipInvalidGeom = false;
     int m_nCoordDim = 0;
     GeomOperation m_eGeomOp = GEOMOP_NONE;
     double m_dfGeomOpParam = 0;
+
     OGRGeometry *m_poClipSrcOri = nullptr;
     bool m_bWarnedClipSrcSRS = false;
-    std::unique_ptr<OGRGeometry> m_poClipSrcReprojectedToSrcSRS;
+    std::unique_ptr<OGRGeometry> m_poClipSrcReprojectedToSrcSRS{};
     const OGRSpatialReference *m_poClipSrcReprojectedToSrcSRS_SRS = nullptr;
+    OGREnvelope m_oClipSrcEnv{};
+
     OGRGeometry *m_poClipDstOri = nullptr;
     bool m_bWarnedClipDstSRS = false;
-    std::unique_ptr<OGRGeometry> m_poClipDstReprojectedToDstSRS;
+    std::unique_ptr<OGRGeometry> m_poClipDstReprojectedToDstSRS{};
     const OGRSpatialReference *m_poClipDstReprojectedToDstSRS_SRS = nullptr;
+    OGREnvelope m_oClipDstEnv{};
+
     bool m_bExplodeCollections = false;
     bool m_bNativeData = false;
     GIntBig m_nLimit = -1;
-    OGRGeometryFactory::TransformWithOptionsCache m_transformWithOptionsCache;
+    OGRGeometryFactory::TransformWithOptionsCache m_transformWithOptionsCache{};
 
     bool Translate(OGRFeature *poFeatureIn, TargetLayerInfo *psInfo,
                    GIntBig nCountLayerFeatures, GIntBig *pnReadFeatureCount,
@@ -598,8 +600,10 @@ class LayerTranslator
                    const GDALVectorTranslateOptions *psOptions);
 
   private:
-    const OGRGeometry *GetDstClipGeom(const OGRSpatialReference *poGeomSRS);
-    const OGRGeometry *GetSrcClipGeom(const OGRSpatialReference *poGeomSRS);
+    std::pair<const OGRGeometry *, const OGREnvelope *>
+    GetDstClipGeom(const OGRSpatialReference *poGeomSRS);
+    std::pair<const OGRGeometry *, const OGREnvelope *>
+    GetSrcClipGeom(const OGRSpatialReference *poGeomSRS);
 };
 
 static OGRLayer *GetLayerAndOverwriteIfNecessary(GDALDataset *poDstDS,
@@ -616,7 +620,8 @@ static OGRLayer *GetLayerAndOverwriteIfNecessary(GDALDataset *poDstDS,
 static std::unique_ptr<OGRGeometry> LoadGeometry(const std::string &osDS,
                                                  const std::string &osSQL,
                                                  const std::string &osLyr,
-                                                 const std::string &osWhere)
+                                                 const std::string &osWhere,
+                                                 bool bMakeValid)
 {
     auto poDS = std::unique_ptr<GDALDataset>(
         GDALDataset::Open(osDS.c_str(), GDAL_OF_VECTOR));
@@ -661,16 +666,39 @@ static std::unique_ptr<OGRGeometry> LoadGeometry(const std::string &osDS,
             {
                 if (!poSrcGeom->IsValid())
                 {
-                    CPLError(CE_Warning, CPLE_AppDefined,
-                             "Geometry of feature " CPL_FRMT_GIB " of %s "
-                             "is invalid. Trying to make it valid",
-                             poFeat->GetFID(), osDS.c_str());
+                    if (!bMakeValid)
+                    {
+                        CPLError(CE_Failure, CPLE_AppDefined,
+                                 "Geometry of feature " CPL_FRMT_GIB " of %s "
+                                 "is invalid. You can try to make it valid by "
+                                 "specifying -makevalid, but the results of "
+                                 "the operation should be manually inspected.",
+                                 poFeat->GetFID(), osDS.c_str());
+                        oGC.empty();
+                        break;
+                    }
                     auto poValid =
                         std::unique_ptr<OGRGeometry>(poSrcGeom->MakeValid());
                     if (poValid)
                     {
+                        CPLError(CE_Warning, CPLE_AppDefined,
+                                 "Geometry of feature " CPL_FRMT_GIB " of %s "
+                                 "was invalid and has been made valid, "
+                                 "but the results of the operation "
+                                 "should be manually inspected.",
+                                 poFeat->GetFID(), osDS.c_str());
+
                         oGC.addGeometryDirectly(poValid.release());
                     }
+                    else
+                    {
+                        CPLError(CE_Failure, CPLE_AppDefined,
+                                 "Geometry of feature " CPL_FRMT_GIB " of %s "
+                                 "is invalid, and could not been made valid.",
+                                 poFeat->GetFID(), osDS.c_str());
+                        oGC.empty();
+                        break;
+                    }
                 }
                 else
                 {
@@ -703,13 +731,16 @@ typedef struct
 
 class OGRSplitListFieldLayer : public OGRLayer
 {
-    OGRLayer *poSrcLayer;
-    OGRFeatureDefn *poFeatureDefn;
-    ListFieldDesc *pasListFields;
-    int nListFieldCount;
-    int nMaxSplitListSubFields;
+    OGRLayer *poSrcLayer = nullptr;
+    OGRFeatureDefn *poFeatureDefn = nullptr;
+    ListFieldDesc *pasListFields = nullptr;
+    int nListFieldCount = 0;
+    const int nMaxSplitListSubFields;
+
+    std::unique_ptr<OGRFeature>
+    TranslateFeature(std::unique_ptr<OGRFeature> poSrcFeature);
 
-    OGRFeature *TranslateFeature(OGRFeature *poSrcFeature);
+    CPL_DISALLOW_COPY_ASSIGN(OGRSplitListFieldLayer)
 
   public:
     OGRSplitListFieldLayer(OGRLayer *poSrcLayer, int nMaxSplitListSubFields);
@@ -785,8 +816,7 @@ class OGRSplitListFieldLayer : public OGRLayer
 
 OGRSplitListFieldLayer::OGRSplitListFieldLayer(OGRLayer *poSrcLayerIn,
                                                int nMaxSplitListSubFieldsIn)
-    : poSrcLayer(poSrcLayerIn), poFeatureDefn(nullptr), pasListFields(nullptr),
-      nListFieldCount(0),
+    : poSrcLayer(poSrcLayerIn),
       nMaxSplitListSubFields(
           nMaxSplitListSubFieldsIn < 0 ? INT_MAX : nMaxSplitListSubFieldsIn)
 {
@@ -964,14 +994,15 @@ bool OGRSplitListFieldLayer::BuildLayerDefn(GDALProgressFunc pfnProgress,
 /*                       TranslateFeature()                             */
 /************************************************************************/
 
-OGRFeature *OGRSplitListFieldLayer::TranslateFeature(OGRFeature *poSrcFeature)
+std::unique_ptr<OGRFeature> OGRSplitListFieldLayer::TranslateFeature(
+    std::unique_ptr<OGRFeature> poSrcFeature)
 {
     if (poSrcFeature == nullptr)
         return nullptr;
     if (poFeatureDefn == nullptr)
         return poSrcFeature;
 
-    OGRFeature *poFeature = OGRFeature::CreateFeature(poFeatureDefn);
+    auto poFeature = std::make_unique<OGRFeature>(poFeatureDefn);
     poFeature->SetFID(poSrcFeature->GetFID());
     for (int i = 0; i < poFeature->GetGeomFieldCount(); i++)
     {
@@ -1044,8 +1075,6 @@ OGRFeature *OGRSplitListFieldLayer::TranslateFeature(OGRFeature *poSrcFeature)
         }
     }
 
-    OGRFeature::DestroyFeature(poSrcFeature);
-
     return poFeature;
 }
 
@@ -1055,7 +1084,9 @@ OGRFeature *OGRSplitListFieldLayer::TranslateFeature(OGRFeature *poSrcFeature)
 
 OGRFeature *OGRSplitListFieldLayer::GetNextFeature()
 {
-    return TranslateFeature(poSrcLayer->GetNextFeature());
+    return TranslateFeature(
+               std::unique_ptr<OGRFeature>(poSrcLayer->GetNextFeature()))
+        .release();
 }
 
 /************************************************************************/
@@ -1064,7 +1095,9 @@ OGRFeature *OGRSplitListFieldLayer::GetNextFeature()
 
 OGRFeature *OGRSplitListFieldLayer::GetFeature(GIntBig nFID)
 {
-    return TranslateFeature(poSrcLayer->GetFeature(nFID));
+    return TranslateFeature(
+               std::unique_ptr<OGRFeature>(poSrcLayer->GetFeature(nFID)))
+        .release();
 }
 
 /************************************************************************/
@@ -1166,6 +1199,14 @@ class GCPCoordTransformation : public OGRCoordinateTransformation
 
     virtual OGRCoordinateTransformation *GetInverse() const override
     {
+        static std::once_flag flag;
+        std::call_once(flag,
+                       []()
+                       {
+                           CPLDebug("OGR2OGR",
+                                    "GCPCoordTransformation::GetInverse() "
+                                    "called, but not implemented");
+                       });
         return nullptr;
     }
 };
@@ -1176,20 +1217,24 @@ class GCPCoordTransformation : public OGRCoordinateTransformation
 
 class CompositeCT : public OGRCoordinateTransformation
 {
+    OGRCoordinateTransformation *const poCT1;
+    const bool bOwnCT1;
+    OGRCoordinateTransformation *const poCT2;
+    const bool bOwnCT2;
+
+    // Working buffer
+    std::vector<int> m_anErrorCode{};
+
     CompositeCT(const CompositeCT &other)
         : poCT1(other.poCT1 ? other.poCT1->Clone() : nullptr), bOwnCT1(true),
-          poCT2(other.poCT2 ? other.poCT2->Clone() : nullptr), bOwnCT2(true)
+          poCT2(other.poCT2 ? other.poCT2->Clone() : nullptr), bOwnCT2(true),
+          m_anErrorCode({})
     {
     }
 
     CompositeCT &operator=(const CompositeCT &) = delete;
 
   public:
-    OGRCoordinateTransformation *poCT1;
-    bool bOwnCT1;
-    OGRCoordinateTransformation *poCT2;
-    bool bOwnCT2;
-
     CompositeCT(OGRCoordinateTransformation *poCT1In, bool bOwnCT1In,
                 OGRCoordinateTransformation *poCT2In, bool bOwnCT2In)
         : poCT1(poCT1In), bOwnCT1(bOwnCT1In), poCT2(poCT2In), bOwnCT2(bOwnCT2In)
@@ -1251,9 +1296,52 @@ class CompositeCT : public OGRCoordinateTransformation
         return nResult;
     }
 
+    virtual int TransformWithErrorCodes(size_t nCount, double *x, double *y,
+                                        double *z, double *t,
+                                        int *panErrorCodes) override
+    {
+        if (poCT1 && poCT2 && panErrorCodes)
+        {
+            m_anErrorCode.resize(nCount);
+            int nResult = poCT1->TransformWithErrorCodes(nCount, x, y, z, t,
+                                                         m_anErrorCode.data());
+            if (nResult)
+                nResult = poCT2->TransformWithErrorCodes(nCount, x, y, z, t,
+                                                         panErrorCodes);
+            for (size_t i = 0; i < nCount; ++i)
+            {
+                if (m_anErrorCode[i])
+                    panErrorCodes[i] = m_anErrorCode[i];
+            }
+            return nResult;
+        }
+        int nResult = TRUE;
+        if (poCT1)
+            nResult = poCT1->TransformWithErrorCodes(nCount, x, y, z, t,
+                                                     panErrorCodes);
+        if (nResult && poCT2)
+            nResult = poCT2->TransformWithErrorCodes(nCount, x, y, z, t,
+                                                     panErrorCodes);
+        return nResult;
+    }
+
     virtual OGRCoordinateTransformation *GetInverse() const override
     {
-        return nullptr;
+        if (!poCT1 && !poCT2)
+            return nullptr;
+        if (!poCT2)
+            return poCT1->GetInverse();
+        if (!poCT1)
+            return poCT2->GetInverse();
+        auto poInvCT1 =
+            std::unique_ptr<OGRCoordinateTransformation>(poCT1->GetInverse());
+        auto poInvCT2 =
+            std::unique_ptr<OGRCoordinateTransformation>(poCT2->GetInverse());
+        if (!poInvCT1 || !poInvCT2)
+            return nullptr;
+        return std::make_unique<CompositeCT>(poInvCT2.release(), true,
+                                             poInvCT1.release(), true)
+            .release();
     }
 };
 
@@ -1263,9 +1351,14 @@ class CompositeCT : public OGRCoordinateTransformation
 
 class AxisMappingCoordinateTransformation : public OGRCoordinateTransformation
 {
-  public:
     bool bSwapXY = false;
 
+    explicit AxisMappingCoordinateTransformation(bool bSwapXYIn)
+        : bSwapXY(bSwapXYIn)
+    {
+    }
+
+  public:
     AxisMappingCoordinateTransformation(const std::vector<int> &mappingIn,
                                         const std::vector<int> &mappingOut)
     {
@@ -1319,9 +1412,23 @@ class AxisMappingCoordinateTransformation : public OGRCoordinateTransformation
         return true;
     }
 
+    virtual int TransformWithErrorCodes(size_t nCount, double *x, double *y,
+                                        double * /*z*/, double * /*t*/,
+                                        int *panErrorCodes) override
+    {
+        for (size_t i = 0; i < nCount; i++)
+        {
+            if (panErrorCodes)
+                panErrorCodes[i] = 0;
+            if (bSwapXY)
+                std::swap(x[i], y[i]);
+        }
+        return true;
+    }
+
     virtual OGRCoordinateTransformation *GetInverse() const override
     {
-        return nullptr;
+        return new AxisMappingCoordinateTransformation(bSwapXY);
     }
 };
 
@@ -1416,7 +1523,7 @@ static int GetFieldType(const char *pszArg, int *pnSubFieldType)
                 *pnSubFieldType = -1;
                 CPLString osArgSubType = pszOpenParenthesis + 1;
                 if (!osArgSubType.empty() && osArgSubType.back() == ')')
-                    osArgSubType.resize(osArgSubType.size() - 1);
+                    osArgSubType.pop_back();
                 for (int iSubType = 0;
                      iSubType <= static_cast<int>(OFSTMaxSubType); iSubType++)
                 {
@@ -1448,20 +1555,21 @@ static bool IsFieldType(const char *pszArg)
 
 class GDALVectorTranslateWrappedDataset : public GDALDataset
 {
-    GDALDataset *m_poBase;
-    OGRSpatialReference *m_poOutputSRS;
-    bool m_bTransform;
+    std::unique_ptr<GDALDriver> m_poDriverToFree{};
+    GDALDataset *m_poBase = nullptr;
+    OGRSpatialReference *m_poOutputSRS = nullptr;
+    const bool m_bTransform = false;
 
-    std::vector<OGRLayer *> m_apoLayers;
-    std::vector<OGRLayer *> m_apoHiddenLayers;
+    std::vector<std::unique_ptr<OGRLayer>> m_apoLayers{};
+    std::vector<std::unique_ptr<OGRLayer>> m_apoHiddenLayers{};
 
     GDALVectorTranslateWrappedDataset(GDALDataset *poBase,
                                       OGRSpatialReference *poOutputSRS,
                                       bool bTransform);
 
-  public:
-    virtual ~GDALVectorTranslateWrappedDataset();
+    CPL_DISALLOW_COPY_ASSIGN(GDALVectorTranslateWrappedDataset)
 
+  public:
     virtual int GetLayerCount() override
     {
         return static_cast<int>(m_apoLayers.size());
@@ -1475,17 +1583,20 @@ class GDALVectorTranslateWrappedDataset : public GDALDataset
                                  const char *pszDialect) override;
     virtual void ReleaseResultSet(OGRLayer *poResultsSet) override;
 
-    static GDALVectorTranslateWrappedDataset *
+    static std::unique_ptr<GDALVectorTranslateWrappedDataset>
     New(GDALDataset *poBase, OGRSpatialReference *poOutputSRS, bool bTransform);
 };
 
 class GDALVectorTranslateWrappedLayer : public OGRLayerDecorator
 {
-    std::vector<OGRCoordinateTransformation *> m_apoCT;
-    OGRFeatureDefn *m_poFDefn;
+    std::vector<std::unique_ptr<OGRCoordinateTransformation>> m_apoCT{};
+    OGRFeatureDefn *m_poFDefn = nullptr;
 
     GDALVectorTranslateWrappedLayer(OGRLayer *poBaseLayer, bool bOwnBaseLayer);
-    OGRFeature *TranslateFeature(OGRFeature *poSrcFeat);
+    std::unique_ptr<OGRFeature>
+    TranslateFeature(std::unique_ptr<OGRFeature> poSrcFeat);
+
+    CPL_DISALLOW_COPY_ASSIGN(GDALVectorTranslateWrappedLayer)
 
   public:
     virtual ~GDALVectorTranslateWrappedLayer();
@@ -1498,7 +1609,7 @@ class GDALVectorTranslateWrappedLayer : public OGRLayerDecorator
     virtual OGRFeature *GetNextFeature() override;
     virtual OGRFeature *GetFeature(GIntBig nFID) override;
 
-    static GDALVectorTranslateWrappedLayer *
+    static std::unique_ptr<GDALVectorTranslateWrappedLayer>
     New(OGRLayer *poBaseLayer, bool bOwnBaseLayer,
         OGRSpatialReference *poOutputSRS, bool bTransform);
 };
@@ -1506,19 +1617,17 @@ class GDALVectorTranslateWrappedLayer : public OGRLayerDecorator
 GDALVectorTranslateWrappedLayer::GDALVectorTranslateWrappedLayer(
     OGRLayer *poBaseLayer, bool bOwnBaseLayer)
     : OGRLayerDecorator(poBaseLayer, bOwnBaseLayer),
-      m_apoCT(poBaseLayer->GetLayerDefn()->GetGeomFieldCount(),
-              static_cast<OGRCoordinateTransformation *>(nullptr)),
-      m_poFDefn(nullptr)
+      m_apoCT(poBaseLayer->GetLayerDefn()->GetGeomFieldCount())
 {
 }
 
-GDALVectorTranslateWrappedLayer *
+std::unique_ptr<GDALVectorTranslateWrappedLayer>
 GDALVectorTranslateWrappedLayer::New(OGRLayer *poBaseLayer, bool bOwnBaseLayer,
                                      OGRSpatialReference *poOutputSRS,
                                      bool bTransform)
 {
-    GDALVectorTranslateWrappedLayer *poNew =
-        new GDALVectorTranslateWrappedLayer(poBaseLayer, bOwnBaseLayer);
+    auto poNew = std::unique_ptr<GDALVectorTranslateWrappedLayer>(
+        new GDALVectorTranslateWrappedLayer(poBaseLayer, bOwnBaseLayer));
     poNew->m_poFDefn = poBaseLayer->GetLayerDefn()->Clone();
     poNew->m_poFDefn->Reference();
     if (!poOutputSRS)
@@ -1539,13 +1648,14 @@ GDALVectorTranslateWrappedLayer::New(OGRLayer *poBaseLayer, bool bOwnBaseLayer,
                          poBaseLayer->GetLayerDefn()
                              ->GetGeomFieldDefn(i)
                              ->GetNameRef());
-                delete poNew;
                 return nullptr;
             }
             else
             {
                 poNew->m_apoCT[i] =
-                    OGRCreateCoordinateTransformation(poSourceSRS, poOutputSRS);
+                    std::unique_ptr<OGRCoordinateTransformation>(
+                        OGRCreateCoordinateTransformation(poSourceSRS,
+                                                          poOutputSRS));
                 if (poNew->m_apoCT[i] == nullptr)
                 {
                     CPLError(CE_Failure, CPLE_AppDefined,
@@ -1566,7 +1676,6 @@ GDALVectorTranslateWrappedLayer::New(OGRLayer *poBaseLayer, bool bOwnBaseLayer,
                              pszWKT);
                     CPLFree(pszWKT);
 
-                    delete poNew;
                     return nullptr;
                 }
             }
@@ -1581,27 +1690,29 @@ GDALVectorTranslateWrappedLayer::~GDALVectorTranslateWrappedLayer()
 {
     if (m_poFDefn)
         m_poFDefn->Release();
-    for (size_t i = 0; i < m_apoCT.size(); ++i)
-        delete m_apoCT[i];
 }
 
 OGRFeature *GDALVectorTranslateWrappedLayer::GetNextFeature()
 {
-    return TranslateFeature(OGRLayerDecorator::GetNextFeature());
+    return TranslateFeature(
+               std::unique_ptr<OGRFeature>(OGRLayerDecorator::GetNextFeature()))
+        .release();
 }
 
 OGRFeature *GDALVectorTranslateWrappedLayer::GetFeature(GIntBig nFID)
 {
-    return TranslateFeature(OGRLayerDecorator::GetFeature(nFID));
+    return TranslateFeature(
+               std::unique_ptr<OGRFeature>(OGRLayerDecorator::GetFeature(nFID)))
+        .release();
 }
 
-OGRFeature *
-GDALVectorTranslateWrappedLayer::TranslateFeature(OGRFeature *poSrcFeat)
+std::unique_ptr<OGRFeature> GDALVectorTranslateWrappedLayer::TranslateFeature(
+    std::unique_ptr<OGRFeature> poSrcFeat)
 {
     if (poSrcFeat == nullptr)
         return nullptr;
-    OGRFeature *poNewFeat = new OGRFeature(m_poFDefn);
-    poNewFeat->SetFrom(poSrcFeat);
+    auto poNewFeat = std::make_unique<OGRFeature>(m_poFDefn);
+    poNewFeat->SetFrom(poSrcFeat.get());
     poNewFeat->SetFID(poSrcFeat->GetFID());
     for (int i = 0; i < poNewFeat->GetGeomFieldCount(); i++)
     {
@@ -1609,12 +1720,11 @@ GDALVectorTranslateWrappedLayer::TranslateFeature(OGRFeature *poSrcFeat)
         if (poGeom)
         {
             if (m_apoCT[i])
-                poGeom->transform(m_apoCT[i]);
+                poGeom->transform(m_apoCT[i].get());
             poGeom->assignSpatialReference(
                 m_poFDefn->GetGeomFieldDefn(i)->GetSpatialRef());
         }
     }
-    delete poSrcFeat;
     return poNewFeat;
 }
 
@@ -1627,77 +1737,68 @@ GDALVectorTranslateWrappedDataset::GDALVectorTranslateWrappedDataset(
     {
         poDriver = new GDALDriver();
         poDriver->SetDescription(poBase->GetDriver()->GetDescription());
+        m_poDriverToFree.reset(poDriver);
     }
 }
 
-GDALVectorTranslateWrappedDataset *GDALVectorTranslateWrappedDataset::New(
-    GDALDataset *poBase, OGRSpatialReference *poOutputSRS, bool bTransform)
+std::unique_ptr<GDALVectorTranslateWrappedDataset>
+GDALVectorTranslateWrappedDataset::New(GDALDataset *poBase,
+                                       OGRSpatialReference *poOutputSRS,
+                                       bool bTransform)
 {
-    GDALVectorTranslateWrappedDataset *poNew =
-        new GDALVectorTranslateWrappedDataset(poBase, poOutputSRS, bTransform);
+    auto poNew = std::unique_ptr<GDALVectorTranslateWrappedDataset>(
+        new GDALVectorTranslateWrappedDataset(poBase, poOutputSRS, bTransform));
     for (int i = 0; i < poBase->GetLayerCount(); i++)
     {
-        OGRLayer *poLayer = GDALVectorTranslateWrappedLayer::New(
-            poBase->GetLayer(i), false, poOutputSRS, bTransform);
+        auto poLayer = GDALVectorTranslateWrappedLayer::New(
+            poBase->GetLayer(i), /* bOwnBaseLayer = */ false, poOutputSRS,
+            bTransform);
         if (poLayer == nullptr)
         {
-            delete poNew;
             return nullptr;
         }
-        poNew->m_apoLayers.push_back(poLayer);
+        poNew->m_apoLayers.push_back(std::move(poLayer));
     }
     return poNew;
 }
 
-GDALVectorTranslateWrappedDataset::~GDALVectorTranslateWrappedDataset()
-{
-    delete poDriver;
-    for (size_t i = 0; i < m_apoLayers.size(); i++)
-    {
-        delete m_apoLayers[i];
-    }
-    for (size_t i = 0; i < m_apoHiddenLayers.size(); i++)
-    {
-        delete m_apoHiddenLayers[i];
-    }
-}
-
 OGRLayer *GDALVectorTranslateWrappedDataset::GetLayer(int i)
 {
     if (i < 0 || i >= static_cast<int>(m_apoLayers.size()))
         return nullptr;
-    return m_apoLayers[i];
+    return m_apoLayers[i].get();
 }
 
 OGRLayer *GDALVectorTranslateWrappedDataset::GetLayerByName(const char *pszName)
 {
-    for (size_t i = 0; i < m_apoLayers.size(); i++)
+    for (const auto &poLayer : m_apoLayers)
     {
-        if (strcmp(m_apoLayers[i]->GetName(), pszName) == 0)
-            return m_apoLayers[i];
+        if (strcmp(poLayer->GetName(), pszName) == 0)
+            return poLayer.get();
     }
-    for (size_t i = 0; i < m_apoHiddenLayers.size(); i++)
+    for (const auto &poLayer : m_apoHiddenLayers)
     {
-        if (strcmp(m_apoHiddenLayers[i]->GetName(), pszName) == 0)
-            return m_apoHiddenLayers[i];
+        if (strcmp(poLayer->GetName(), pszName) == 0)
+            return poLayer.get();
     }
-    for (size_t i = 0; i < m_apoLayers.size(); i++)
+    for (const auto &poLayer : m_apoLayers)
     {
-        if (EQUAL(m_apoLayers[i]->GetName(), pszName))
-            return m_apoLayers[i];
+        if (EQUAL(poLayer->GetName(), pszName))
+            return poLayer.get();
     }
-    for (size_t i = 0; i < m_apoHiddenLayers.size(); i++)
+    for (const auto &poLayer : m_apoHiddenLayers)
     {
-        if (EQUAL(m_apoHiddenLayers[i]->GetName(), pszName))
-            return m_apoHiddenLayers[i];
+        if (EQUAL(poLayer->GetName(), pszName))
+            return poLayer.get();
     }
 
     OGRLayer *poLayer = m_poBase->GetLayerByName(pszName);
     if (poLayer == nullptr)
         return nullptr;
-    poLayer = GDALVectorTranslateWrappedLayer::New(poLayer, false,
-                                                   m_poOutputSRS, m_bTransform);
-    if (poLayer == nullptr)
+
+    auto poNewLayer = GDALVectorTranslateWrappedLayer::New(
+        poLayer, /* bOwnBaseLayer = */ false, m_poOutputSRS, m_bTransform);
+    if (poNewLayer == nullptr)
         return nullptr;
 
     // Replicate source dataset behavior: if the fact of calling
@@ -1708,12 +1809,12 @@ OGRLayer *GDALVectorTranslateWrappedDataset::GetLayerByName(const char *pszName)
     {
         if (m_poBase->GetLayer(i) == poLayer)
         {
-            m_apoLayers.push_back(poLayer);
-            return poLayer;
+            m_apoLayers.push_back(std::move(poNewLayer));
+            return m_apoLayers.back().get();
         }
     }
-    m_apoHiddenLayers.push_back(poLayer);
-    return poLayer;
+    m_apoHiddenLayers.push_back(std::move(poNewLayer));
+    return m_apoHiddenLayers.back().get();
 }
 
 OGRLayer *
@@ -1725,8 +1826,9 @@ GDALVectorTranslateWrappedDataset::ExecuteSQL(const char *pszStatement,
         m_poBase->ExecuteSQL(pszStatement, poSpatialFilter, pszDialect);
     if (poLayer == nullptr)
         return nullptr;
-    return GDALVectorTranslateWrappedLayer::New(poLayer, true, m_poOutputSRS,
-                                                m_bTransform);
+    return GDALVectorTranslateWrappedLayer::New(
+               poLayer, /* bOwnBaseLayer = */ true, m_poOutputSRS, m_bTransform)
+        .release();
 }
 
 void GDALVectorTranslateWrappedDataset::ReleaseResultSet(OGRLayer *poResultsSet)
@@ -1740,12 +1842,12 @@ void GDALVectorTranslateWrappedDataset::ReleaseResultSet(OGRLayer *poResultsSet)
 
 class OGR2OGRSpatialReferenceHolder
 {
-    OGRSpatialReference *m_poSRS;
+    OGRSpatialReference *m_poSRS = nullptr;
+
+    CPL_DISALLOW_COPY_ASSIGN(OGR2OGRSpatialReferenceHolder)
 
   public:
-    OGR2OGRSpatialReferenceHolder() : m_poSRS(nullptr)
-    {
-    }
+    OGR2OGRSpatialReferenceHolder() = default;
 
     ~OGR2OGRSpatialReferenceHolder()
     {
@@ -1978,6 +2080,7 @@ GDALVectorTranslateCreateCopy(GDALDriver *poDriver, const char *pszDest,
     }
 
     GDALDataset *poWrkSrcDS = poDS;
+    std::unique_ptr<GDALDataset> poWrkSrcDSToFree;
     OGR2OGRSpatialReferenceHolder oOutputSRSHolder;
 
     if (!psOptions->osOutputSRSDef.empty())
@@ -1996,10 +2099,11 @@ GDALVectorTranslateCreateCopy(GDALDriver *poDriver, const char *pszDest,
         oOutputSRSHolder.get()->SetCoordinateEpoch(
             psOptions->dfOutputCoordinateEpoch);
 
-        poWrkSrcDS = GDALVectorTranslateWrappedDataset::New(
+        poWrkSrcDSToFree = GDALVectorTranslateWrappedDataset::New(
             poDS, oOutputSRSHolder.get(), psOptions->bTransform);
-        if (poWrkSrcDS == nullptr)
+        if (poWrkSrcDSToFree == nullptr)
             return nullptr;
+        poWrkSrcDS = poWrkSrcDSToFree.get();
     }
 
     if (!psOptions->osWHERE.empty())
@@ -2012,8 +2116,6 @@ GDALVectorTranslateCreateCopy(GDALDriver *poDriver, const char *pszDest,
                 CPLError(CE_Failure, CPLE_NotSupported,
                          "-where not supported by this output driver "
                          "without explicit layer name(s)");
-                if (poWrkSrcDS != poDS)
-                    delete poWrkSrcDS;
                 return nullptr;
             }
             else
@@ -2032,8 +2134,6 @@ GDALVectorTranslateCreateCopy(GDALDriver *poDriver, const char *pszDest,
         else
         {
             CPLError(CE_Failure, CPLE_NotSupported, szErrorMsg, "-where");
-            if (poWrkSrcDS != poDS)
-                delete poWrkSrcDS;
             return nullptr;
         }
     }
@@ -2091,8 +2191,6 @@ GDALVectorTranslateCreateCopy(GDALDriver *poDriver, const char *pszDest,
         {
             CPLError(CE_Failure, CPLE_NotSupported, szErrorMsg,
                      "Specifying layers");
-            if (poWrkSrcDS != poDS)
-                delete poWrkSrcDS;
             return nullptr;
         }
     }
@@ -2116,9 +2214,6 @@ GDALVectorTranslateCreateCopy(GDALDriver *poDriver, const char *pszDest,
         poDriver->CreateCopy(pszDest, poWrkSrcDS, FALSE, aosDSCO.List(),
                              psOptions->pfnProgress, psOptions->pProgressData);
 
-    if (poWrkSrcDS != poDS)
-        delete poWrkSrcDS;
-
     return poOut;
 }
 
@@ -2302,7 +2397,8 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
     {
         psOptions->poClipSrc =
             LoadGeometry(psOptions->osClipSrcDS, psOptions->osClipSrcSQL,
-                         psOptions->osClipSrcLayer, psOptions->osClipSrcWhere);
+                         psOptions->osClipSrcLayer, psOptions->osClipSrcWhere,
+                         psOptions->bMakeValid);
         if (psOptions->poClipSrc == nullptr)
         {
             CPLError(CE_Failure, CPLE_IllegalArg,
@@ -2328,12 +2424,37 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
             *pbUsageError = TRUE;
         return nullptr;
     }
+    if (psOptions->poClipSrc && !psOptions->poClipSrc->IsValid())
+    {
+        if (!psOptions->bMakeValid)
+        {
+            CPLError(CE_Failure, CPLE_IllegalArg,
+                     "-clipsrc geometry is invalid. You can try to make it "
+                     "valid with -makevalid, but the results of the operation "
+                     "should be manually inspected.");
+            return nullptr;
+        }
+        auto poValid =
+            std::unique_ptr<OGRGeometry>(psOptions->poClipSrc->MakeValid());
+        if (!poValid)
+        {
+            CPLError(CE_Failure, CPLE_IllegalArg,
+                     "-clipsrc geometry is invalid and cannot be made valid.");
+            return nullptr;
+        }
+        CPLError(CE_Warning, CPLE_AppDefined,
+                 "-clipsrc geometry was invalid and has been made valid, "
+                 "but the results of the operation "
+                 "should be manually inspected.");
+        psOptions->poClipSrc = std::move(poValid);
+    }
 
     if (!psOptions->osClipDstDS.empty())
     {
         psOptions->poClipDst =
             LoadGeometry(psOptions->osClipDstDS, psOptions->osClipDstSQL,
-                         psOptions->osClipDstLayer, psOptions->osClipDstWhere);
+                         psOptions->osClipDstLayer, psOptions->osClipDstWhere,
+                         psOptions->bMakeValid);
         if (psOptions->poClipDst == nullptr)
         {
             CPLError(CE_Failure, CPLE_IllegalArg,
@@ -2341,6 +2462,30 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
             return nullptr;
         }
     }
+    if (psOptions->poClipDst && !psOptions->poClipDst->IsValid())
+    {
+        if (!psOptions->bMakeValid)
+        {
+            CPLError(CE_Failure, CPLE_IllegalArg,
+                     "-clipdst geometry is invalid. You can try to make it "
+                     "valid with -makevalid, but the results of the operation "
+                     "should be manually inspected.");
+            return nullptr;
+        }
+        auto poValid =
+            std::unique_ptr<OGRGeometry>(psOptions->poClipDst->MakeValid());
+        if (!poValid)
+        {
+            CPLError(CE_Failure, CPLE_IllegalArg,
+                     "-clipdst geometry is invalid and cannot be made valid.");
+            return nullptr;
+        }
+        CPLError(CE_Warning, CPLE_AppDefined,
+                 "-clipdst geometry was invalid and has been made valid, "
+                 "but the results of the operation "
+                 "should be manually inspected.");
+        psOptions->poClipDst = std::move(poValid);
+    }
 
     GDALDataset *poDS = GDALDataset::FromHandle(hSrcDS);
     GDALDataset *poODS = nullptr;
@@ -2641,6 +2786,10 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
         }
     }
 
+    // Automatically close poODS on error, if it has been created by this
+    // method.
+    GDALDatasetUniquePtr poODSUniquePtr(hDstDS == nullptr ? poODS : nullptr);
+
     // Some syntaxic sugar to make "ogr2ogr [-f PostgreSQL] PG:dbname=....
     // source [srclayer] -lco OVERWRITE=YES" work like "ogr2ogr -overwrite
     // PG:dbname=.... source [srclayer]" The former syntax used to work at
@@ -2658,8 +2807,6 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
         {
             CPLError(CE_Failure, CPLE_AppDefined,
                      "-append and -lco OVERWRITE=YES are mutually exclusive");
-            if (hDstDS == nullptr)
-                GDALClose(poODS);
             return nullptr;
         }
         bOverwrite = true;
@@ -2707,8 +2854,6 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
             CPLError(CE_Failure, CPLE_AppDefined,
                      "Failed to process SRS definition: %s",
                      psOptions->osOutputSRSDef.c_str());
-            if (hDstDS == nullptr)
-                GDALClose(poODS);
             return nullptr;
         }
         oOutputSRSHolder.get()->SetCoordinateEpoch(
@@ -2729,8 +2874,6 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
             CPLError(CE_Failure, CPLE_AppDefined,
                      "Failed to process SRS definition: %s",
                      psOptions->osSourceSRSDef.c_str());
-            if (hDstDS == nullptr)
-                GDALClose(poODS);
             return nullptr;
         }
         oSourceSRS.SetCoordinateEpoch(psOptions->dfSourceCoordinateEpoch);
@@ -2741,17 +2884,16 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
     /*      Create a transformation object from the source to               */
     /*      destination coordinate system.                                  */
     /* -------------------------------------------------------------------- */
-    GCPCoordTransformation *poGCPCoordTrans = nullptr;
+    std::unique_ptr<GCPCoordTransformation> poGCPCoordTrans;
     if (psOptions->oGCPs.nGCPCount > 0)
     {
-        poGCPCoordTrans = new GCPCoordTransformation(
+        poGCPCoordTrans = std::make_unique<GCPCoordTransformation>(
             psOptions->oGCPs.nGCPCount, psOptions->oGCPs.pasGCPs,
             psOptions->nTransformOrder,
             poSourceSRS ? poSourceSRS : oOutputSRSHolder.get());
         if (!(poGCPCoordTrans->IsValid()))
         {
-            delete poGCPCoordTrans;
-            poGCPCoordTrans = nullptr;
+            return nullptr;
         }
     }
 
@@ -2765,6 +2907,7 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
     oSetup.m_poOutputSRS = oOutputSRSHolder.get();
     oSetup.m_bTransform = psOptions->bTransform;
     oSetup.m_bNullifyOutputSRS = psOptions->bNullifyOutputSRS;
+    oSetup.m_poUserSourceSRS = poSourceSRS;
     oSetup.m_bSelFieldsSet = psOptions->bSelFieldsSet;
     oSetup.m_papszSelFields = psOptions->aosSelFields.List();
     oSetup.m_bAppend = bAppend;
@@ -2805,10 +2948,11 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
     oTranslator.m_poOutputSRS = oOutputSRSHolder.get();
     oTranslator.m_bNullifyOutputSRS = psOptions->bNullifyOutputSRS;
     oTranslator.m_poUserSourceSRS = poSourceSRS;
-    oTranslator.m_poGCPCoordTrans = poGCPCoordTrans;
+    oTranslator.m_poGCPCoordTrans = poGCPCoordTrans.get();
     oTranslator.m_eGType = psOptions->eGType;
     oTranslator.m_eGeomTypeConversion = psOptions->eGeomTypeConversion;
     oTranslator.m_bMakeValid = psOptions->bMakeValid;
+    oTranslator.m_bSkipInvalidGeom = psOptions->bSkipInvalidGeom;
     oTranslator.m_nCoordDim = psOptions->nCoordDim;
     oTranslator.m_eGeomOp = psOptions->eGeomOp;
     oTranslator.m_dfGeomOpParam = psOptions->dfGeomOpParam;
@@ -2977,9 +3121,6 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
         {
             CPLError(CE_Failure, CPLE_AppDefined,
                      "-splitlistfields not supported in this mode");
-            if (hDstDS == nullptr)
-                GDALClose(poODS);
-            delete poGCPCoordTrans;
             return nullptr;
         }
 
@@ -2992,9 +3133,6 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
             {
                 CPLError(CE_Failure, CPLE_AppDefined,
                          "Couldn't fetch requested layer %s!", pszLayer);
-                if (hDstDS == nullptr)
-                    GDALClose(poODS);
-                delete poGCPCoordTrans;
                 return nullptr;
             }
         }
@@ -3044,9 +3182,6 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
                 {
                     CPLError(CE_Failure, CPLE_AppDefined,
                              "Couldn't fetch advertised layer %d!", iLayer);
-                    if (hDstDS == nullptr)
-                        GDALClose(poODS);
-                    delete poGCPCoordTrans;
                     return nullptr;
                 }
 
@@ -3085,9 +3220,6 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
             {
                 CPLError(CE_Failure, CPLE_AppDefined,
                          "Couldn't fetch advertised layer %d!", iLayer);
-                if (hDstDS == nullptr)
-                    GDALClose(poODS);
-                delete poGCPCoordTrans;
                 return nullptr;
             }
 
@@ -3106,9 +3238,6 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
                                  poLayer->GetName());
                         if (!psOptions->bSkipFailures)
                         {
-                            if (hDstDS == nullptr)
-                                GDALClose(poODS);
-                            delete poGCPCoordTrans;
                             return nullptr;
                         }
                     }
@@ -3133,8 +3262,8 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
         while (true)
         {
             OGRLayer *poFeatureLayer = nullptr;
-            OGRFeature *poFeature = poDS->GetNextFeature(
-                &poFeatureLayer, nullptr, pfnProgress, pProgressArg);
+            auto poFeature = std::unique_ptr<OGRFeature>(poDS->GetNextFeature(
+                &poFeatureLayer, nullptr, pfnProgress, pProgressArg));
             if (poFeature == nullptr)
                 break;
             std::map<OGRLayer *, int>::const_iterator oIter =
@@ -3142,7 +3271,7 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
             if (oIter == oMapLayerToIdx.end())
             {
                 // Feature in a layer that is not a layer of interest.
-                OGRFeature::DestroyFeature(poFeature);
+                // nothing to do
             }
             else
             {
@@ -3170,10 +3299,6 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
 
                         if (psInfo == nullptr && !psOptions->bSkipFailures)
                         {
-                            if (hDstDS == nullptr)
-                                GDALClose(poODS);
-                            delete poGCPCoordTrans;
-                            OGRFeature::DestroyFeature(poFeature);
                             return nullptr;
                         }
 
@@ -3186,9 +3311,9 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
                 int iLayer = oIter->second;
                 TargetLayerInfo *psInfo = pasAssocLayers[iLayer].psInfo.get();
                 if ((psInfo == nullptr ||
-                     !oTranslator.Translate(poFeature, psInfo, 0, nullptr,
-                                            nTotalEventsDone, nullptr, nullptr,
-                                            psOptions.get())) &&
+                     !oTranslator.Translate(poFeature.release(), psInfo, 0,
+                                            nullptr, nTotalEventsDone, nullptr,
+                                            nullptr, psOptions.get())) &&
                     !psOptions->bSkipFailures)
                 {
                     CPLError(
@@ -3201,8 +3326,6 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
                     nRetCode = 1;
                     break;
                 }
-                if (psInfo == nullptr)
-                    OGRFeature::DestroyFeature(poFeature);
             }
         }  // while true
 
@@ -3230,9 +3353,6 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
 
                 if (psInfo == nullptr && !psOptions->bSkipFailures)
                 {
-                    if (hDstDS == nullptr)
-                        GDALClose(poODS);
-                    delete poGCPCoordTrans;
                     return nullptr;
                 }
 
@@ -3262,9 +3382,6 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
                 {
                     CPLError(CE_Failure, CPLE_AppDefined,
                              "Couldn't fetch advertised layer %d!", iLayer);
-                    if (hDstDS == nullptr)
-                        GDALClose(poODS);
-                    delete poGCPCoordTrans;
                     return nullptr;
                 }
                 if (!poDS->IsLayerPrivate(iLayer))
@@ -3294,9 +3411,6 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
                              psOptions->aosLayers[iLayer]);
                     if (!psOptions->bSkipFailures)
                     {
-                        if (hDstDS == nullptr)
-                            GDALClose(poODS);
-                        delete poGCPCoordTrans;
                         return nullptr;
                     }
                 }
@@ -3346,9 +3460,6 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
                              psOptions->osWHERE.c_str(), poLayer->GetName());
                     if (!psOptions->bSkipFailures)
                     {
-                        if (hDstDS == nullptr)
-                            GDALClose(poODS);
-                        delete poGCPCoordTrans;
                         return nullptr;
                     }
                 }
@@ -3502,8 +3613,6 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
         }
     }
 
-    delete poGCPCoordTrans;
-
     // Note: this guarantees that the file can be opened in a consistent state,
     // without requiring to close poODS, only if the driver declares
     // DCAP_FLUSHCACHE_CONSISTENT_STATE
@@ -3511,10 +3620,13 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
         nRetCode = 1;
 
     if (nRetCode == 0)
-        return GDALDataset::ToHandle(poODS);
+    {
+        if (hDstDS)
+            return hDstDS;
+        else
+            return GDALDataset::ToHandle(poODSUniquePtr.release());
+    }
 
-    if (hDstDS == nullptr)
-        GDALClose(poODS);
     return nullptr;
 }
 
@@ -3693,8 +3805,8 @@ static OGRwkbGeometryType ConvertType(GeomTypeConversion eGeomTypeConversion,
 
 static void DoFieldTypeConversion(GDALDataset *poDstDS,
                                   OGRFieldDefn &oFieldDefn,
-                                  char **papszFieldTypesToString,
-                                  char **papszMapFieldType,
+                                  CSLConstList papszFieldTypesToString,
+                                  CSLConstList papszMapFieldType,
                                   bool bUnsetFieldWidth, bool bQuiet,
                                   bool bForceNullable, bool bUnsetDefault)
 {
@@ -3839,13 +3951,87 @@ static void DoFieldTypeConversion(GDALDataset *poDstDS,
     }
 }
 
+/************************************************************************/
+/*                        GetArrowGeomFieldIndex()                      */
+/************************************************************************/
+
+static int GetArrowGeomFieldIndex(const struct ArrowSchema *psLayerSchema,
+                                  const char *pszFieldName)
+{
+    if (strcmp(psLayerSchema->format, "+s") == 0)  // struct
+    {
+        for (int i = 0; i < psLayerSchema->n_children; ++i)
+        {
+            const auto psSchema = psLayerSchema->children[i];
+            if (strcmp(psSchema->format, "z") == 0)  // binary
+            {
+                if (strcmp(psSchema->name, pszFieldName) == 0)
+                {
+                    return i;
+                }
+                else
+                {
+                    // Check if ARROW:extension:name = ogc.wkb or geoarrow.wkb
+                    const char *pabyMetadata = psSchema->metadata;
+                    if (pabyMetadata)
+                    {
+                        const auto oMetadata =
+                            OGRParseArrowMetadata(pabyMetadata);
+                        auto oIter = oMetadata.find(ARROW_EXTENSION_NAME_KEY);
+                        if (oIter != oMetadata.end() &&
+                            (oIter->second == EXTENSION_NAME_OGC_WKB ||
+                             oIter->second == EXTENSION_NAME_GEOARROW_WKB))
+                        {
+                            return i;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return -1;
+}
+
+/************************************************************************/
+/*                        BuildGetArrowStreamOptions()                  */
+/************************************************************************/
+
+static CPLStringList
+BuildGetArrowStreamOptions(const GDALVectorTranslateOptions *psOptions,
+                           bool bPreserveFID)
+{
+    CPLStringList aosOptionsGetArrowStream;
+    aosOptionsGetArrowStream.SetNameValue("SILENCE_GET_SCHEMA_ERROR", "YES");
+    aosOptionsGetArrowStream.SetNameValue("GEOMETRY_ENCODING", "WKB");
+    if (!bPreserveFID)
+        aosOptionsGetArrowStream.SetNameValue("INCLUDE_FID", "NO");
+    if (psOptions->nLimit >= 0)
+    {
+        aosOptionsGetArrowStream.SetNameValue(
+            "MAX_FEATURES_IN_BATCH",
+            CPLSPrintf(CPL_FRMT_GIB,
+                       std::min<GIntBig>(psOptions->nLimit,
+                                         (psOptions->nGroupTransactions > 0
+                                              ? psOptions->nGroupTransactions
+                                              : 65536))));
+    }
+    else if (psOptions->nGroupTransactions > 0)
+    {
+        aosOptionsGetArrowStream.SetNameValue(
+            "MAX_FEATURES_IN_BATCH",
+            CPLSPrintf("%d", psOptions->nGroupTransactions));
+    }
+    return aosOptionsGetArrowStream;
+}
+
 /************************************************************************/
 /*                 SetupTargetLayer::CanUseWriteArrowBatch()            */
 /************************************************************************/
 
 bool SetupTargetLayer::CanUseWriteArrowBatch(
     OGRLayer *poSrcLayer, OGRLayer *poDstLayer, bool bJustCreatedLayer,
-    const GDALVectorTranslateOptions *psOptions, bool &bError)
+    const GDALVectorTranslateOptions *psOptions, bool bPreserveFID,
+    bool &bError, OGRArrowArrayStream &streamSrc)
 {
     bError = false;
 
@@ -3866,27 +4052,56 @@ bool SetupTargetLayer::CanUseWriteArrowBatch(
           !psOptions->aosLCO.FetchNameValue("BATCH_SIZE") &&
           CPLTestBool(CPLGetConfigOption("OGR2OGR_USE_ARROW_API", "YES"))) ||
          CPLTestBool(CPLGetConfigOption("OGR2OGR_USE_ARROW_API", "NO"))) &&
-        !psOptions->bSkipFailures && !psOptions->bTransform &&
-        !psOptions->poClipSrc && !psOptions->poClipDst &&
-        psOptions->oGCPs.nGCPCount == 0 && !psOptions->bWrapDateline &&
-        !m_papszSelFields && !m_bAddMissingFields &&
-        m_eGType == GEOMTYPE_UNCHANGED && psOptions->eGeomOp == GEOMOP_NONE &&
+        !psOptions->bSkipFailures && !psOptions->poClipSrc &&
+        !psOptions->poClipDst && psOptions->oGCPs.nGCPCount == 0 &&
+        !psOptions->bWrapDateline && !m_papszSelFields &&
+        !m_bAddMissingFields && m_eGType == GEOMTYPE_UNCHANGED &&
+        psOptions->eGeomOp == GEOMOP_NONE &&
         m_eGeomTypeConversion == GTC_DEFAULT && m_nCoordDim < 0 &&
         !m_papszFieldTypesToString && !m_papszMapFieldType &&
         !m_bUnsetFieldWidth && !m_bExplodeCollections && !m_pszZField &&
         m_bExactFieldNameMatch && !m_bForceNullable && !m_bResolveDomains &&
         !m_bUnsetDefault && psOptions->nFIDToFetch == OGRNullFID &&
         psOptions->dfXYRes == OGRGeomCoordinatePrecision::UNKNOWN &&
-        !psOptions->bMakeValid)
+        !psOptions->bMakeValid && !psOptions->bSkipInvalidGeom)
     {
-        struct ArrowArrayStream streamSrc;
-        const char *const apszOptions[] = {"SILENCE_GET_SCHEMA_ERROR=YES",
-                                           nullptr};
-        if (poSrcLayer->GetArrowStream(&streamSrc, apszOptions))
+        if (psOptions->bTransform)
+        {
+            // To simplify implementation for now
+            if (poSrcLayer->GetLayerDefn()->GetGeomFieldCount() != 1 ||
+                poDstLayer->GetLayerDefn()->GetGeomFieldCount() != 1)
+            {
+                return false;
+            }
+            auto poSrcSRS = m_poUserSourceSRS ? m_poUserSourceSRS
+                                              : poSrcLayer->GetLayerDefn()
+                                                    ->GetGeomFieldDefn(0)
+                                                    ->GetSpatialRef();
+            if (!poSrcSRS ||
+                !OGRGeometryFactory::isTransformWithOptionsRegularTransform(
+                    poSrcSRS, m_poOutputSRS, nullptr))
+            {
+                return false;
+            }
+        }
+
+        const CPLStringList aosGetArrowStreamOptions(
+            BuildGetArrowStreamOptions(psOptions, bPreserveFID));
+        if (poSrcLayer->GetArrowStream(streamSrc.get(),
+                                       aosGetArrowStreamOptions.List()))
         {
             struct ArrowSchema schemaSrc;
-            if (streamSrc.get_schema(&streamSrc, &schemaSrc) == 0)
+            if (streamSrc.get_schema(&schemaSrc) == 0)
             {
+                if (psOptions->bTransform &&
+                    GetArrowGeomFieldIndex(&schemaSrc,
+                                           poSrcLayer->GetGeometryColumn()) < 0)
+                {
+                    schemaSrc.release(&schemaSrc);
+                    streamSrc.clear();
+                    return false;
+                }
+
                 std::string osErrorMsg;
                 if (poDstLayer->IsArrowSchemaSupported(&schemaSrc, nullptr,
                                                        osErrorMsg))
@@ -3965,7 +4180,7 @@ bool SetupTargetLayer::CanUseWriteArrowBatch(
                                          "Cannot create field %s",
                                          pszFieldName);
                                 schemaSrc.release(&schemaSrc);
-                                streamSrc.release(&streamSrc);
+                                streamSrc.clear();
                                 return false;
                             }
                         }
@@ -3977,7 +4192,8 @@ bool SetupTargetLayer::CanUseWriteArrowBatch(
                         // check that it looks to be the same as the source
                         // one
                         struct ArrowArrayStream streamDst;
-                        if (poDstLayer->GetArrowStream(&streamDst, nullptr))
+                        if (poDstLayer->GetArrowStream(
+                                &streamDst, aosGetArrowStreamOptions.List()))
                         {
                             struct ArrowSchema schemaDst;
                             if (streamDst.get_schema(&streamDst, &schemaDst) ==
@@ -4008,7 +4224,8 @@ bool SetupTargetLayer::CanUseWriteArrowBatch(
                 }
                 schemaSrc.release(&schemaSrc);
             }
-            streamSrc.release(&streamSrc);
+            if (!bUseWriteArrowBatch)
+                streamSrc.clear();
         }
     }
     return bUseWriteArrowBatch;
@@ -4550,8 +4767,10 @@ SetupTargetLayer::Setup(OGRLayer *poSrcLayer, const char *pszNewLayerName,
         oGeomFieldDefn.SetSpatialRef(poOutputSRS);
         oGeomFieldDefn.SetCoordinatePrecision(oCoordPrec);
         oGeomFieldDefn.SetNullable(bGeomFieldNullable);
-        poDstLayer = m_poDstDS->CreateLayer(pszNewLayerName, &oGeomFieldDefn,
-                                            papszLCOTemp);
+        poDstLayer = m_poDstDS->CreateLayer(
+            pszNewLayerName,
+            eGCreateLayerType == wkbNone ? nullptr : &oGeomFieldDefn,
+            papszLCOTemp);
         CSLDestroy(papszLCOTemp);
 
         if (poDstLayer == nullptr)
@@ -4733,8 +4952,10 @@ SetupTargetLayer::Setup(OGRLayer *poSrcLayer, const char *pszNewLayerName,
     }
 
     bool bError = false;
-    const bool bUseWriteArrowBatch = CanUseWriteArrowBatch(
-        poSrcLayer, poDstLayer, bJustCreatedLayer, psOptions, bError);
+    OGRArrowArrayStream streamSrc;
+    const bool bUseWriteArrowBatch =
+        CanUseWriteArrowBatch(poSrcLayer, poDstLayer, bJustCreatedLayer,
+                              psOptions, bPreserveFID, bError, streamSrc);
     if (bError)
         return nullptr;
 
@@ -5196,7 +5417,7 @@ SetupTargetLayer::Setup(OGRLayer *poSrcLayer, const char *pszNewLayerName,
         nTotalEventsDone = 0;
     }
 
-    std::unique_ptr<TargetLayerInfo> psInfo(new TargetLayerInfo);
+    auto psInfo = std::make_unique<TargetLayerInfo>();
     psInfo->m_bUseWriteArrowBatch = bUseWriteArrowBatch;
     psInfo->m_nFeaturesRead = 0;
     psInfo->m_bPerFeatureCT = false;
@@ -5293,6 +5514,8 @@ SetupTargetLayer::Setup(OGRLayer *poSrcLayer, const char *pszNewLayerName,
     psInfo->m_bSupportCurves =
         CPL_TO_BOOL(poDstLayer->TestCapability(OLCCurveGeometries));
 
+    psInfo->m_sArrowArrayStream = std::move(streamSrc);
+
     return psInfo;
 }
 
@@ -5583,65 +5806,77 @@ SetupCT(TargetLayerInfo *psInfo, OGRLayer *poSrcLayer, bool bTransform,
 /************************************************************************/
 
 bool LayerTranslator::TranslateArrow(
-    const TargetLayerInfo *psInfo, GIntBig nCountLayerFeatures,
+    TargetLayerInfo *psInfo, GIntBig nCountLayerFeatures,
     GIntBig *pnReadFeatureCount, GDALProgressFunc pfnProgress,
     void *pProgressArg, const GDALVectorTranslateOptions *psOptions)
 {
-    struct ArrowArrayStream stream;
     struct ArrowSchema schema;
-    CPLStringList aosOptionsGetArrowStream;
     CPLStringList aosOptionsWriteArrowBatch;
-    aosOptionsGetArrowStream.SetNameValue("GEOMETRY_ENCODING", "WKB");
-    if (!psInfo->m_bPreserveFID)
-        aosOptionsGetArrowStream.SetNameValue("INCLUDE_FID", "NO");
-    else
+    if (psInfo->m_bPreserveFID)
     {
         aosOptionsWriteArrowBatch.SetNameValue(
             "FID", psInfo->m_poSrcLayer->GetFIDColumn());
         aosOptionsWriteArrowBatch.SetNameValue("IF_FID_NOT_PRESERVED",
                                                "WARNING");
     }
-    if (psOptions->nLimit >= 0)
-    {
-        aosOptionsGetArrowStream.SetNameValue(
-            "MAX_FEATURES_IN_BATCH",
-            CPLSPrintf(CPL_FRMT_GIB,
-                       std::min<GIntBig>(psOptions->nLimit,
-                                         (psOptions->nGroupTransactions > 0
-                                              ? psOptions->nGroupTransactions
-                                              : 65536))));
-    }
-    else if (psOptions->nGroupTransactions > 0)
+
+    if (psInfo->m_sArrowArrayStream.get_schema(&schema) != 0)
     {
-        aosOptionsGetArrowStream.SetNameValue(
-            "MAX_FEATURES_IN_BATCH",
-            CPLSPrintf("%d", psOptions->nGroupTransactions));
+        CPLError(CE_Failure, CPLE_AppDefined, "stream.get_schema() failed");
+        return false;
     }
-    if (psInfo->m_poSrcLayer->GetArrowStream(&stream,
-                                             aosOptionsGetArrowStream.List()))
+
+    int iArrowGeomFieldIndex = -1;
+    if (m_bTransform)
     {
-        if (stream.get_schema(&stream, &schema) != 0)
+        iArrowGeomFieldIndex = GetArrowGeomFieldIndex(
+            &schema, psInfo->m_poSrcLayer->GetGeometryColumn());
+        if (!SetupCT(psInfo, psInfo->m_poSrcLayer, m_bTransform,
+                     m_bWrapDateline, m_osDateLineOffset, m_poUserSourceSRS,
+                     nullptr, m_poOutputSRS, m_poGCPCoordTrans, false))
         {
-            CPLError(CE_Failure, CPLE_AppDefined, "stream.get_schema() failed");
-            stream.release(&stream);
             return false;
         }
     }
-    else
-    {
-        CPLError(CE_Failure, CPLE_AppDefined, "GetArrowStream() failed");
-        return false;
-    }
 
     bool bRet = true;
 
     GIntBig nCount = 0;
     bool bGoOn = true;
+    std::vector<GByte> abyModifiedWKB;
+    const int nNumReprojectionThreads = []()
+    {
+        const int nNumCPUs = CPLGetNumCPUs();
+        if (nNumCPUs <= 1)
+        {
+            return 1;
+        }
+        else
+        {
+            const char *pszNumThreads =
+                CPLGetConfigOption("GDAL_NUM_THREADS", nullptr);
+            if (pszNumThreads)
+            {
+                if (EQUAL(pszNumThreads, "ALL_CPUS"))
+                    return CPLGetNumCPUs();
+                return std::min(atoi(pszNumThreads), 1024);
+            }
+            else
+            {
+                return std::max(2, nNumCPUs / 2);
+            }
+        }
+    }();
+
+    // Somewhat arbitrary threshold (config option only/mostly for autotest purposes)
+    const int MIN_FEATURES_FOR_THREADED_REPROJ = atoi(CPLGetConfigOption(
+        "OGR2OGR_MIN_FEATURES_FOR_THREADED_REPROJ", "10000"));
+
     while (bGoOn)
     {
         struct ArrowArray array;
         // Acquire source batch
-        if (stream.get_next(&stream, &array) != 0)
+        if (psInfo->m_sArrowArrayStream.get_next(&array) != 0)
         {
             CPLError(CE_Failure, CPLE_AppDefined, "stream.get_next() failed");
             bRet = false;
@@ -5673,9 +5908,122 @@ bool LayerTranslator::TranslateArrow(
             nCount += array.length;
         }
 
+        const auto nArrayLength = array.length;
+
+        // Coordinate reprojection
+        const void *backupGeomArrayBuffers2 = nullptr;
+        if (m_bTransform)
+        {
+            auto *psGeomArray = array.children[iArrowGeomFieldIndex];
+            GByte *pabyWKB = static_cast<GByte *>(
+                const_cast<void *>(psGeomArray->buffers[2]));
+            const uint32_t *panOffsets =
+                static_cast<const uint32_t *>(psGeomArray->buffers[1]);
+            auto poCT = psInfo->m_aoReprojectionInfo[0].m_poCT.get();
+
+            try
+            {
+                abyModifiedWKB.resize(panOffsets[nArrayLength]);
+            }
+            catch (const std::exception &)
+            {
+                CPLError(CE_Failure, CPLE_OutOfMemory, "Out of memory");
+                bRet = false;
+                if (array.release)
+                    array.release(&array);
+                break;
+            }
+            memcpy(abyModifiedWKB.data(), pabyWKB, panOffsets[nArrayLength]);
+            backupGeomArrayBuffers2 = psGeomArray->buffers[2];
+            psGeomArray->buffers[2] = abyModifiedWKB.data();
+
+            std::atomic<bool> atomicRet{true};
+            const auto oReprojectionLambda =
+                [psGeomArray, nArrayLength, panOffsets, &atomicRet,
+                 &abyModifiedWKB, &poCT](int iThread, int nThreads)
+            {
+                OGRWKBTransformCache oCache;
+                OGREnvelope3D sEnv3D;
+                auto poThisCT =
+                    std::unique_ptr<OGRCoordinateTransformation>(poCT->Clone());
+                if (!poThisCT)
+                {
+                    CPLError(CE_Failure, CPLE_AppDefined,
+                             "Cannot clone OGRCoordinateTransformation");
+                    atomicRet = false;
+                    return;
+                }
+
+                const GByte *pabyValidity =
+                    static_cast<const GByte *>(psGeomArray->buffers[0]);
+                const size_t iStart =
+                    static_cast<size_t>(iThread * nArrayLength / nThreads);
+                const size_t iMax = static_cast<size_t>(
+                    (iThread + 1) * nArrayLength / nThreads);
+                for (size_t i = iStart; i < iMax; ++i)
+                {
+                    const size_t iShifted =
+                        static_cast<size_t>(i + psGeomArray->offset);
+                    if (!pabyValidity || (pabyValidity[iShifted >> 8] &
+                                          (1 << (iShifted % 8))) != 0)
+                    {
+                        const auto nWKBSize =
+                            panOffsets[iShifted + 1] - panOffsets[iShifted];
+                        if (!OGRWKBTransform(
+                                abyModifiedWKB.data() + panOffsets[iShifted],
+                                nWKBSize, poThisCT.get(), oCache, sEnv3D))
+                        {
+                            CPLError(CE_Failure, CPLE_AppDefined,
+                                     "Reprojection failed");
+                            atomicRet = false;
+                            break;
+                        }
+                    }
+                }
+            };
+
+            if (nArrayLength >= MIN_FEATURES_FOR_THREADED_REPROJ &&
+                nNumReprojectionThreads >= 2)
+            {
+                std::vector<std::future<void>> oTasks;
+                for (int iThread = 0; iThread < nNumReprojectionThreads;
+                     ++iThread)
+                {
+                    oTasks.emplace_back(std::async(std::launch::async,
+                                                   oReprojectionLambda, iThread,
+                                                   nNumReprojectionThreads));
+                }
+                for (auto &oTask : oTasks)
+                {
+                    oTask.get();
+                }
+            }
+            else
+            {
+                oReprojectionLambda(0, 1);
+            }
+
+            bRet = atomicRet;
+            if (!bRet)
+            {
+                psGeomArray->buffers[2] = backupGeomArrayBuffers2;
+                if (array.release)
+                    array.release(&array);
+                break;
+            }
+        }
+
         // Write batch to target layer
-        if (!psInfo->m_poDstLayer->WriteArrowBatch(
-                &schema, &array, aosOptionsWriteArrowBatch.List()))
+        const bool bWriteOK = psInfo->m_poDstLayer->WriteArrowBatch(
+            &schema, &array, aosOptionsWriteArrowBatch.List());
+
+        if (backupGeomArrayBuffers2)
+        {
+            auto *psGeomArray = array.children[iArrowGeomFieldIndex];
+            psGeomArray->buffers[2] = backupGeomArrayBuffers2;
+        }
+
+        if (!bWriteOK)
         {
             CPLError(CE_Failure, CPLE_AppDefined, "WriteArrowBatch() failed");
             if (array.release)
@@ -5706,47 +6054,6 @@ bool LayerTranslator::TranslateArrow(
 
     schema.release(&schema);
 
-    // Ugly hack to work around https://github.com/OSGeo/gdal/issues/9497
-    // Deleting a RecordBatchReader obtained from arrow::dataset::Scanner.ToRecordBatchReader()
-    // is a lengthy operation since all batches are read in its destructors.
-    // Here we ask to our custom I/O layer to return in error to short circuit
-    // that lengthy operation.
-    if (auto poDS = psInfo->m_poSrcLayer->GetDataset())
-    {
-        if (poDS->GetLayerCount() == 1 && poDS->GetDriver() &&
-            EQUAL(poDS->GetDriver()->GetDescription(), "PARQUET"))
-        {
-            bool bStopIO = false;
-            const char *pszArrowStopIO =
-                CPLGetConfigOption("OGR_ARROW_STOP_IO", nullptr);
-            if (pszArrowStopIO && CPLTestBool(pszArrowStopIO))
-            {
-                bStopIO = true;
-            }
-            else if (!pszArrowStopIO)
-            {
-                std::string osExePath;
-                osExePath.resize(1024);
-                if (CPLGetExecPath(osExePath.data(),
-                                   static_cast<int>(osExePath.size())))
-                {
-                    osExePath.resize(strlen(osExePath.data()));
-                    if (strcmp(CPLGetBasename(osExePath.data()), "ogr2ogr") ==
-                        0)
-                    {
-                        bStopIO = true;
-                    }
-                }
-            }
-            if (bStopIO)
-            {
-                CPLSetConfigOption("OGR_ARROW_STOP_IO", "YES");
-                CPLDebug("OGR2OGR", "Forcing interruption of Parquet I/O");
-            }
-        }
-    }
-
-    stream.release(&stream);
     return bRet;
 }
 
@@ -5961,13 +6268,22 @@ bool LayerTranslator::Translate(
                 if (nDstGeomFieldCount == 0 && poStolenGeometry &&
                     m_poClipSrcOri)
                 {
-                    const OGRGeometry *poClipGeom =
+                    if (poStolenGeometry->IsEmpty())
+                        goto end_loop;
+
+                    const auto [poClipGeom, poClipGeomEnvelope] =
                         GetSrcClipGeom(poStolenGeometry->getSpatialReference());
 
-                    if (poClipGeom != nullptr &&
-                        !poClipGeom->Intersects(poStolenGeometry.get()))
+                    if (poClipGeom && poClipGeomEnvelope)
                     {
-                        goto end_loop;
+                        OGREnvelope oEnv;
+                        poStolenGeometry->getEnvelope(&oEnv);
+                        if (!poClipGeomEnvelope->Contains(oEnv) &&
+                            !(poClipGeomEnvelope->Intersects(oEnv) &&
+                              poClipGeom->Intersects(poStolenGeometry.get())))
+                        {
+                            goto end_loop;
+                        }
                     }
                 }
 
@@ -6166,49 +6482,51 @@ bool LayerTranslator::Translate(
 
                 if (m_poClipSrcOri)
                 {
+                    if (poDstGeometry->IsEmpty())
+                        goto end_loop;
 
-                    const OGRGeometry *poClipGeom =
+                    const auto [poClipGeom, poClipGeomEnvelope] =
                         GetSrcClipGeom(poDstGeometry->getSpatialReference());
 
-                    std::unique_ptr<OGRGeometry> poClipped;
-                    if (poClipGeom != nullptr)
-                    {
-                        OGREnvelope oClipEnv;
-                        OGREnvelope oDstEnv;
+                    if (!(poClipGeom && poClipGeomEnvelope))
+                        goto end_loop;
 
-                        poClipGeom->getEnvelope(&oClipEnv);
-                        poDstGeometry->getEnvelope(&oDstEnv);
+                    OGREnvelope oDstEnv;
+                    poDstGeometry->getEnvelope(&oDstEnv);
 
-                        if (oClipEnv.Intersects(oDstEnv))
+                    if (!poClipGeomEnvelope->Contains(oDstEnv))
+                    {
+                        std::unique_ptr<OGRGeometry> poClipped;
+                        if (poClipGeomEnvelope->Intersects(oDstEnv))
                         {
                             poClipped.reset(
                                 poClipGeom->Intersection(poDstGeometry.get()));
                         }
-                    }
+                        if (poClipped == nullptr || poClipped->IsEmpty())
+                        {
+                            goto end_loop;
+                        }
 
-                    if (poClipped == nullptr || poClipped->IsEmpty())
-                    {
-                        goto end_loop;
-                    }
+                        const int nDim = poDstGeometry->getDimension();
+                        if (poClipped->getDimension() < nDim &&
+                            wkbFlatten(poDstFDefn->GetGeomFieldDefn(iGeom)
+                                           ->GetType()) != wkbUnknown)
+                        {
+                            CPLDebug(
+                                "OGR2OGR",
+                                "Discarding feature " CPL_FRMT_GIB
+                                " of layer %s, "
+                                "as its intersection with -clipsrc is a %s "
+                                "whereas the input is a %s",
+                                nSrcFID, poSrcLayer->GetName(),
+                                OGRToOGCGeomType(poClipped->getGeometryType()),
+                                OGRToOGCGeomType(
+                                    poDstGeometry->getGeometryType()));
+                            goto end_loop;
+                        }
 
-                    const int nDim = poDstGeometry->getDimension();
-                    if (poClipped->getDimension() < nDim &&
-                        wkbFlatten(
-                            poDstFDefn->GetGeomFieldDefn(iGeom)->GetType()) !=
-                            wkbUnknown)
-                    {
-                        CPLDebug(
-                            "OGR2OGR",
-                            "Discarding feature " CPL_FRMT_GIB " of layer %s, "
-                            "as its intersection with -clipsrc is a %s "
-                            "whereas the input is a %s",
-                            nSrcFID, poSrcLayer->GetName(),
-                            OGRToOGCGeomType(poClipped->getGeometryType()),
-                            OGRToOGCGeomType(poDstGeometry->getGeometryType()));
-                        goto end_loop;
+                        poDstGeometry = std::move(poClipped);
                     }
-
-                    poDstGeometry = std::move(poClipped);
                 }
 
                 OGRCoordinateTransformation *const poCT =
@@ -6346,51 +6664,54 @@ bool LayerTranslator::Translate(
                 {
                     if (m_poClipDstOri)
                     {
-                        const OGRGeometry *poClipGeom = GetDstClipGeom(
+                        if (poDstGeometry->IsEmpty())
+                            goto end_loop;
+
+                        auto [poClipGeom, poClipGeomEnvelope] = GetDstClipGeom(
                             poDstGeometry->getSpatialReference());
-                        if (poClipGeom == nullptr)
+                        if (!poClipGeom || !poClipGeomEnvelope)
                         {
                             goto end_loop;
                         }
 
-                        std::unique_ptr<OGRGeometry> poClipped;
-
-                        OGREnvelope oClipEnv;
                         OGREnvelope oDstEnv;
-
-                        poClipGeom->getEnvelope(&oClipEnv);
                         poDstGeometry->getEnvelope(&oDstEnv);
 
-                        if (oClipEnv.Intersects(oDstEnv))
+                        if (!poClipGeomEnvelope->Contains(oDstEnv))
                         {
-                            poClipped.reset(
-                                poClipGeom->Intersection(poDstGeometry.get()));
-                        }
+                            std::unique_ptr<OGRGeometry> poClipped;
+                            if (poClipGeomEnvelope->Intersects(oDstEnv))
+                            {
+                                poClipped.reset(poClipGeom->Intersection(
+                                    poDstGeometry.get()));
+                            }
 
-                        if (poClipped == nullptr || poClipped->IsEmpty())
-                        {
-                            goto end_loop;
-                        }
+                            if (poClipped == nullptr || poClipped->IsEmpty())
+                            {
+                                goto end_loop;
+                            }
 
-                        const int nDim = poDstGeometry->getDimension();
-                        if (poClipped->getDimension() < nDim &&
-                            wkbFlatten(poDstFDefn->GetGeomFieldDefn(iGeom)
-                                           ->GetType()) != wkbUnknown)
-                        {
-                            CPLDebug(
-                                "OGR2OGR",
-                                "Discarding feature " CPL_FRMT_GIB
-                                " of layer %s, "
-                                "as its intersection with -clipdst is a %s "
-                                "whereas the input is a %s",
-                                nSrcFID, poSrcLayer->GetName(),
-                                OGRToOGCGeomType(poClipped->getGeometryType()),
-                                OGRToOGCGeomType(
-                                    poDstGeometry->getGeometryType()));
-                            goto end_loop;
-                        }
+                            const int nDim = poDstGeometry->getDimension();
+                            if (poClipped->getDimension() < nDim &&
+                                wkbFlatten(poDstFDefn->GetGeomFieldDefn(iGeom)
+                                               ->GetType()) != wkbUnknown)
+                            {
+                                CPLDebug(
+                                    "OGR2OGR",
+                                    "Discarding feature " CPL_FRMT_GIB
+                                    " of layer %s, "
+                                    "as its intersection with -clipdst is a %s "
+                                    "whereas the input is a %s",
+                                    nSrcFID, poSrcLayer->GetName(),
+                                    OGRToOGCGeomType(
+                                        poClipped->getGeometryType()),
+                                    OGRToOGCGeomType(
+                                        poDstGeometry->getGeometryType()));
+                                goto end_loop;
+                            }
 
-                        poDstGeometry = std::move(poClipped);
+                            poDstGeometry = std::move(poClipped);
+                        }
                     }
 
                     if (psOptions->dfXYRes !=
@@ -6439,6 +6760,9 @@ bool LayerTranslator::Translate(
                         }
                     }
 
+                    if (m_bSkipInvalidGeom && !poDstGeometry->IsValid())
+                        goto end_loop;
+
                     if (m_eGeomTypeConversion != GTC_DEFAULT)
                     {
                         OGRwkbGeometryType eTargetType =
@@ -6562,7 +6886,13 @@ bool LayerTranslator::Translate(
 /*                LayerTranslator::GetDstClipGeom()                     */
 /************************************************************************/
 
-const OGRGeometry *
+/** Returns the destination clip geometry and its envelope
+ *
+ * @param poGeomSRS The SRS into which the destination clip geometry should be
+ *                  expressed.
+ * @return the destination clip geometry and its envelope, or (nullptr, nullptr)
+ */
+std::pair<const OGRGeometry *, const OGREnvelope *>
 LayerTranslator::GetDstClipGeom(const OGRSpatialReference *poGeomSRS)
 {
     if (m_poClipDstReprojectedToDstSRS_SRS != poGeomSRS)
@@ -6575,7 +6905,7 @@ LayerTranslator::GetDstClipGeom(const OGRSpatialReference *poGeomSRS)
             if (m_poClipDstReprojectedToDstSRS->transformTo(poGeomSRS) !=
                 OGRERR_NONE)
             {
-                return nullptr;
+                return std::make_pair(nullptr, nullptr);
             }
             m_poClipDstReprojectedToDstSRS_SRS = poGeomSRS;
         }
@@ -6592,17 +6922,30 @@ LayerTranslator::GetDstClipGeom(const OGRSpatialReference *poGeomSRS)
                          "same as the feature's geometry");
             }
         }
+        m_oClipDstEnv = OGREnvelope();
     }
 
-    return m_poClipDstReprojectedToDstSRS ? m_poClipDstReprojectedToDstSRS.get()
-                                          : m_poClipDstOri;
+    const auto poGeom = m_poClipDstReprojectedToDstSRS
+                            ? m_poClipDstReprojectedToDstSRS.get()
+                            : m_poClipDstOri;
+    if (poGeom && !m_oClipDstEnv.IsInit())
+    {
+        poGeom->getEnvelope(&m_oClipDstEnv);
+    }
+    return std::make_pair(poGeom, poGeom ? &m_oClipDstEnv : nullptr);
 }
 
 /************************************************************************/
 /*                LayerTranslator::GetSrcClipGeom()                     */
 /************************************************************************/
 
-const OGRGeometry *
+/** Returns the source clip geometry and its envelope
+ *
+ * @param poGeomSRS The SRS into which the source clip geometry should be
+ *                  expressed.
+ * @return the source clip geometry and its envelope, or (nullptr, nullptr)
+ */
+std::pair<const OGRGeometry *, const OGREnvelope *>
 LayerTranslator::GetSrcClipGeom(const OGRSpatialReference *poGeomSRS)
 {
     if (m_poClipSrcReprojectedToSrcSRS_SRS != poGeomSRS)
@@ -6615,7 +6958,7 @@ LayerTranslator::GetSrcClipGeom(const OGRSpatialReference *poGeomSRS)
             if (m_poClipSrcReprojectedToSrcSRS->transformTo(poGeomSRS) !=
                 OGRERR_NONE)
             {
-                return nullptr;
+                return std::make_pair(nullptr, nullptr);
             }
             m_poClipSrcReprojectedToSrcSRS_SRS = poGeomSRS;
         }
@@ -6631,10 +6974,17 @@ LayerTranslator::GetSrcClipGeom(const OGRSpatialReference *poGeomSRS)
                          "same as the feature's geometry");
             }
         }
+        m_oClipSrcEnv = OGREnvelope();
     }
 
-    return m_poClipSrcReprojectedToSrcSRS ? m_poClipSrcReprojectedToSrcSRS.get()
-                                          : m_poClipSrcOri;
+    const auto poGeom = m_poClipSrcReprojectedToSrcSRS
+                            ? m_poClipSrcReprojectedToSrcSRS.get()
+                            : m_poClipSrcOri;
+    if (poGeom && !m_oClipSrcEnv.IsInit())
+    {
+        poGeom->getEnvelope(&m_oClipSrcEnv);
+    }
+    return std::make_pair(poGeom, poGeom ? &m_oClipSrcEnv : nullptr);
 }
 
 /************************************************************************/
@@ -6796,7 +7146,7 @@ static std::unique_ptr<GDALArgumentParser> GDALVectorTranslateOptionsGetParser(
                              osGeomName.c_str() + osGeomName.size() - 1, "Z"))
                 {
                     bIs3D = true;
-                    osGeomName.resize(osGeomName.size() - 1);
+                    osGeomName.pop_back();
                 }
                 if (EQUAL(osGeomName.c_str(), "NONE"))
                 {
@@ -7205,6 +7555,21 @@ static std::unique_ptr<GDALArgumentParser> GDALVectorTranslateOptionsGetParser(
         .help(_("Fix geometries to be valid regarding the rules of the Simple "
                 "Features specification."));
 
+    argParser->add_argument("-skipinvalid")
+        .flag()
+        .action(
+            [psOptions](const std::string &)
+            {
+                if (!OGRGeometryFactory::haveGEOS())
+                {
+                    throw std::invalid_argument(
+                        "-skipinvalid only supported for builds against GEOS");
+                }
+                psOptions->bSkipInvalidGeom = true;
+            })
+        .help(_("Whether to skip features with invalid geometries regarding the"
+                "rules of the Simple Features specification."));
+
     argParser->add_argument("-wrapdateline")
         .store_into(psOptions->bWrapDateline)
         .help(_("Split geometries crossing the dateline meridian."));
@@ -7741,9 +8106,10 @@ GDALVectorTranslateOptions *GDALVectorTranslateOptionsNew(
                 psOptions->poClipSrc.reset(poGeom);
                 if (psOptions->poClipSrc == nullptr)
                 {
-                    CPLError(CE_Failure, CPLE_IllegalArg,
-                             "Invalid geometry. Must be a valid POLYGON or "
-                             "MULTIPOLYGON WKT");
+                    CPLError(
+                        CE_Failure, CPLE_IllegalArg,
+                        "Invalid -clipsrc geometry. Must be a valid POLYGON or "
+                        "MULTIPOLYGON WKT");
                     return nullptr;
                 }
             }
@@ -7795,9 +8161,10 @@ GDALVectorTranslateOptions *GDALVectorTranslateOptionsNew(
                 psOptions->poClipDst.reset(poGeom);
                 if (psOptions->poClipDst == nullptr)
                 {
-                    CPLError(CE_Failure, CPLE_IllegalArg,
-                             "Invalid geometry. Must be a valid POLYGON or "
-                             "MULTIPOLYGON WKT");
+                    CPLError(
+                        CE_Failure, CPLE_IllegalArg,
+                        "Invalid -clipdst geometry. Must be a valid POLYGON or "
+                        "MULTIPOLYGON WKT");
                     return nullptr;
                 }
             }
@@ -7845,6 +8212,8 @@ GDALVectorTranslateOptions *GDALVectorTranslateOptionsNew(
     catch (const std::exception &err)
     {
         CPLError(CE_Failure, CPLE_AppDefined, "%s", err.what());
+        if (psOptionsForBinary)
+            psOptionsForBinary->bShowUsageIfError = true;
         return nullptr;
     }
 }
diff --git a/apps/ogrdissolve.cpp b/apps/ogrdissolve.cpp
index f92ced90fae5..233c884920cc 100644
--- a/apps/ogrdissolve.cpp
+++ b/apps/ogrdissolve.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Howard Butler
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
@@ -163,7 +147,7 @@ MAIN_START(nArgc, papszArgv)
                                     "Z"))
             {
                 bIs3D = TRUE;
-                osGeomName.resize(osGeomName.size() - 1);
+                osGeomName.pop_back();
             }
             if (EQUAL(osGeomName, "NONE"))
                 eGType = wkbNone;
diff --git a/apps/ogrinfo_bin.cpp b/apps/ogrinfo_bin.cpp
index 4bc4f08e8085..8cef461966ca 100644
--- a/apps/ogrinfo_bin.cpp
+++ b/apps/ogrinfo_bin.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/apps/ogrinfo_lib.cpp b/apps/ogrinfo_lib.cpp
index 9612d6570d7b..d23c998792d5 100644
--- a/apps/ogrinfo_lib.cpp
+++ b/apps/ogrinfo_lib.cpp
@@ -8,28 +8,12 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
 #include "cpl_json.h"
-#include "ogrgeojsonreader.h"
+#include "ogrlibjsonutils.h"
 #include "cpl_string.h"
 #include "gdal_utils.h"
 #include "gdal_utils_priv.h"
@@ -40,6 +24,7 @@
 #include "commonutils.h"
 #include "gdalargumentparser.h"
 
+#include <cmath>
 #include <set>
 
 /*! output format */
@@ -54,7 +39,7 @@ struct GDALVectorInfoOptions
     GDALVectorInfoFormat eFormat = FORMAT_TEXT;
     std::string osWHERE{};
     CPLStringList aosLayers{};
-    std::unique_ptr<OGRGeometry> poSpatialFilter;
+    std::unique_ptr<OGRGeometry> poSpatialFilter{};
     bool bAllLayers = false;
     std::string osSQLStatement{};
     std::string osDialect{};
@@ -1191,10 +1176,12 @@ static void ReportOnLayer(CPLString &osRet, CPLJSONObject &oLayer,
             {
                 std::string osCoordinateEpoch =
                     CPLSPrintf("%f", dfCoordinateEpoch);
-                if (osCoordinateEpoch.find('.') != std::string::npos)
+                const size_t nDotPos = osCoordinateEpoch.find('.');
+                if (nDotPos != std::string::npos)
                 {
-                    while (osCoordinateEpoch.back() == '0')
-                        osCoordinateEpoch.resize(osCoordinateEpoch.size() - 1);
+                    while (osCoordinateEpoch.size() > nDotPos + 2 &&
+                           osCoordinateEpoch.back() == '0')
+                        osCoordinateEpoch.pop_back();
                 }
                 Concat(osRet, psOptions->bStdoutOutput,
                        "Coordinate epoch: %s\n", osCoordinateEpoch.c_str());
diff --git a/apps/ogrlineref.cpp b/apps/ogrlineref.cpp
index a150cc82d16e..206d3796d8d4 100644
--- a/apps/ogrlineref.cpp
+++ b/apps/ogrlineref.cpp
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (C) 2014 NextGIS
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -37,6 +21,7 @@
 #include "ogr_api.h"
 #include "ogr_p.h"
 #include "ogrsf_frmts.h"
+#include "gdalargumentparser.h"
 
 #include <limits>
 #include <map>
@@ -72,86 +57,6 @@ typedef struct _curve_data
     }
 } CURVE_DATA;
 
-/************************************************************************/
-/*                               Usage()                                */
-/************************************************************************/
-static void Usage(bool bIsError, const char *pszAdditionalMsg = nullptr,
-                  bool bShort = true) CPL_NO_RETURN;
-
-static void Usage(bool bIsError, const char *pszAdditionalMsg, bool bShort)
-{
-    OGRSFDriverRegistrar *poR = OGRSFDriverRegistrar::GetRegistrar();
-
-    fprintf(
-        bIsError ? stderr : stdout,
-        "Usage: ogrlineref [--help] [--help-general] [-progress] [-quiet]\n"
-        "               [-f <format_name>] [-dsco <NAME>=<VALUE>]... [-lco "
-        "<NAME>=<VALUE>]...\n"
-        "               [-create]\n"
-        "               [-l <src_line_datasource_name>] [-ln <layer_name>] "
-        "[-lf "
-        "<field_name>]\n"
-        "               [-p <src_repers_datasource_name>] [-pn <layer_name>] "
-        "[-pm <pos_field_name>] [-pf <field_name>]\n"
-        "               [-r <src_parts_datasource_name>] [-rn <layer_name>]\n"
-        "               [-o <dst_datasource_name>] [-on <layer_name>] [-of "
-        "<field_name>] [-s <step>]\n"
-        "               [-get_pos] [-x <long>] [-y <lat>]\n"
-        "               [-get_coord] [-m <position>] \n"
-        "               [-get_subline] [-mb <position>] [-me <position>]\n");
-
-    if (bShort)
-    {
-        fprintf(bIsError ? stderr : stdout,
-                "\nNote: ogrlineref --long-usage for full help.\n");
-        if (pszAdditionalMsg)
-            fprintf(stderr, "\nFAILURE: %s\n", pszAdditionalMsg);
-        exit(1);
-    }
-
-    fprintf(
-        bIsError ? stderr : stdout,
-        "\n -f format_name: output file format name, possible values are:\n");
-
-    for (int iDriver = 0; iDriver < poR->GetDriverCount(); iDriver++)
-    {
-        GDALDriver *poDriver = poR->GetDriver(iDriver);
-
-        if (CPLTestBool(CSLFetchNameValueDef(poDriver->GetMetadata(),
-                                             GDAL_DCAP_CREATE, "FALSE")))
-            fprintf(bIsError ? stderr : stdout, "     -f \"%s\"\n",
-                    poDriver->GetDescription());
-    }
-
-    fprintf(bIsError ? stderr : stdout,
-            " -progress: Display progress on terminal. Only works if input "
-            "layers have the \n"
-            "                                          \"fast feature count\" "
-            "capability\n"
-            " -dsco NAME=VALUE: Dataset creation option (format specific)\n"
-            " -lco  NAME=VALUE: Layer creation option (format specific)\n"
-            " -l src_line_datasource_name: Datasource of line path name\n"
-            " -ln layer_name: Layer name in datasource (optional)\n"
-            " -lf field_name: Field name for unique paths in layer (optional)\n"
-            " -p src_repers_datasource_name: Datasource of repers name\n"
-            " -pn layer_name: Layer name in datasource (optional)\n"
-            " -pm pos_field_name: Line position field name\n"
-            " -pf field_name: Field name for correspondence repers of separate "
-            "paths in layer (optional)\n"
-            " -r src_parts_datasource_name: Parts datasource name\n"
-            " -rn layer_name: Layer name in datasource (optional)\n"
-            " -o dst_datasource_name: Parts datasource name\n"
-            " -on layer_name: Layer name in datasource (optional)\n"
-            " -of field_name: Field name for correspondence parts of separate "
-            "paths in layer (optional)\n"
-            " -s step: part size in m\n");
-
-    if (pszAdditionalMsg)
-        fprintf(stderr, "\nFAILURE: %s\n", pszAdditionalMsg);
-
-    exit(bIsError ? 1 : 0);
-}
-
 /************************************************************************/
 /*                         SetupTargetLayer()                           */
 /************************************************************************/
@@ -212,8 +117,8 @@ static OGRLayer *SetupTargetLayer(OGRLayer *poSrcLayer, GDALDataset *poDstDS,
         if (!poDstDS->TestCapability(ODsCCreateLayer))
         {
             fprintf(stderr,
-                    "Layer %s not found, and "
-                    "CreateLayer not supported by driver.\n",
+                    _("Layer %s not found, and "
+                      "CreateLayer not supported by driver.\n"),
                     szLayerName.c_str());
             return nullptr;
         }
@@ -249,7 +154,7 @@ static OGRLayer *SetupTargetLayer(OGRLayer *poSrcLayer, GDALDataset *poDstDS,
     /* -------------------------------------------------------------------- */
     else
     {
-        fprintf(stderr, "FAILED: Layer %s already exists.\n",
+        fprintf(stderr, _("FAILED: Layer %s already exists.\n"),
                 szLayerName.c_str());
         return nullptr;
     }
@@ -355,10 +260,10 @@ static void CheckDestDataSourceNameConsistency(const char *pszDestFilename,
             !EQUAL(pszDriverName, apszExtensions[i][1]))
         {
             fprintf(stderr,
-                    "Warning: The target file has a '%s' extension, "
-                    "which is normally used by the %s driver,\n"
-                    "but the requested output driver is %s. "
-                    "Is it really what you want ?\n",
+                    _("Warning: The target file has a '%s' extension, "
+                      "which is normally used by the %s driver,\n"
+                      "but the requested output driver is %s. "
+                      "Is it really what you want ?\n"),
                     pszDestExtension, apszExtensions[i][1], pszDriverName);
             break;
         }
@@ -371,10 +276,10 @@ static void CheckDestDataSourceNameConsistency(const char *pszDestFilename,
             !EQUAL(pszDriverName, apszBeginName[i][1]))
         {
             fprintf(stderr,
-                    "Warning: The target file has a name which is normally "
-                    "recognized by the %s driver,\n"
-                    "but the requested output driver is %s. "
-                    "Is it really what you want ?\n",
+                    _("Warning: The target file has a name which is normally "
+                      "recognized by the %s driver,\n"
+                      "but the requested output driver is %s. "
+                      "Is it really what you want ?\n"),
                     apszBeginName[i][1], pszDriverName);
             break;
         }
@@ -439,7 +344,7 @@ static OGRErr CreateSubline(OGRLayer *const poPkLayer, double dfPosBeg,
     }
     else
     {
-        fprintf(stderr, "Get step for positions %f - %f failed\n", dfPosBeg,
+        fprintf(stderr, _("Get step for positions %f - %f failed\n"), dfPosBeg,
                 dfPosEnd);
         return OGRERR_FAILURE;
     }
@@ -455,7 +360,7 @@ static OGRErr CreateSubline(OGRLayer *const poPkLayer, double dfPosBeg,
     }
     else
     {
-        fprintf(stderr, "Get step for positions %f - %f failed\n", dfPosBeg,
+        fprintf(stderr, _("Get step for positions %f - %f failed\n"), dfPosBeg,
                 dfPosEnd);
         return OGRERR_FAILURE;
     }
@@ -482,7 +387,7 @@ static OGRErr CreateSubline(OGRLayer *const poPkLayer, double dfPosBeg,
 
     if (moParts.empty())
     {
-        fprintf(stderr, "Get parts for positions %f - %f failed\n", dfPosBeg,
+        fprintf(stderr, _("Get parts for positions %f - %f failed\n"), dfPosBeg,
                 dfPosEnd);
         return OGRERR_FAILURE;
     }
@@ -593,7 +498,7 @@ static OGRErr CreatePartsFromLineString(
     OGRwkbGeometryType eGeomType = poPkLayer->GetGeomType();
     if (wkbFlatten(eGeomType) != wkbPoint)
     {
-        fprintf(stderr, "Unsupported geometry type %s for path\n",
+        fprintf(stderr, _("Unsupported geometry type %s for path\n"),
                 OGRGeometryTypeToName(eGeomType));
         return OGRERR_FAILURE;
     }
@@ -655,14 +560,14 @@ static OGRErr CreatePartsFromLineString(
 
     if (moRepers.size() < 2)
     {
-        fprintf(stderr, "Not enough repers to proceed\n");
+        fprintf(stderr, _("Not enough repers to proceed.\n"));
         return OGRERR_FAILURE;
     }
 
     // Check direction.
     if (!bQuiet)
     {
-        fprintf(stdout, "Check path direction\n");
+        fprintf(stdout, "Check path direction.\n");
     }
 
     // Get distance along path from pt1 and pt2.
@@ -683,8 +588,8 @@ static OGRErr CreatePartsFromLineString(
         if (!bQuiet)
         {
             fprintf(stderr,
-                    "Warning: The path is opposite the repers direction. "
-                    "Let's reverse path\n");
+                    _("Warning: The path is opposite the repers direction. "
+                      "Let's reverse path.\n"));
         }
         pPathGeom->reversePoints();
 
@@ -891,7 +796,7 @@ static OGRErr CreatePartsFromLineString(
     // Create pickets
     if (!bQuiet)
     {
-        fprintf(stdout, "\nCreate pickets\n");
+        fprintf(stdout, "\nCreate pickets.\n");
     }
 
     const double dfRoundBeg = pPtBeg != nullptr
@@ -947,7 +852,7 @@ static OGRErr CreatePartsFromLineString(
 
     if (!bQuiet)
     {
-        fprintf(stdout, "\nCreate sublines\n");
+        fprintf(stdout, "\nCreate sublines.\n");
     }
 
     IT = moRepers.begin();
@@ -1021,7 +926,7 @@ static OGRErr CreateParts(OGRLayer *const poLnLayer, OGRLayer *const poPkLayer,
     if (wkbFlatten(eGeomType) != wkbLineString &&
         wkbFlatten(eGeomType) != wkbMultiLineString)
     {
-        fprintf(stderr, "Unsupported geometry type %s for path\n",
+        fprintf(stderr, _("Unsupported geometry type %s for path.\n"),
                 OGRGeometryTypeToName(eGeomType));
         return eRetCode;
     }
@@ -1040,8 +945,8 @@ static OGRErr CreateParts(OGRLayer *const poLnLayer, OGRLayer *const poPkLayer,
             if (!bQuiet)
             {
                 fprintf(stdout,
-                        "\nThe geometry " CPL_FRMT_GIB
-                        " is wkbMultiLineString type\n",
+                        _("\nThe geometry " CPL_FRMT_GIB
+                          " is wkbMultiLineString type.\n"),
                         pPathFeature->GetFID());
             }
 
@@ -1098,7 +1003,8 @@ static OGRErr CreatePartsMultiple(
     const int nLineSepFieldInd = pDefn->GetFieldIndex(pszLineSepFieldName);
     if (nLineSepFieldInd == -1)
     {
-        fprintf(stderr, "The field %s not found\n", pszLineSepFieldName);
+        fprintf(stderr, _("The field was %s not found.\n"),
+                pszLineSepFieldName);
         return OGRERR_FAILURE;
     }
 
@@ -1180,7 +1086,7 @@ static OGRErr GetPosition(OGRLayer *const poPkLayer, double dfX, double dfY,
 
     if (nullptr == pCloserPart)
     {
-        fprintf(stderr, "Filed to find closest part\n");
+        fprintf(stderr, _("Failed to find closest part.\n"));
         return OGRERR_FAILURE;
     }
     // Now we have closest part
@@ -1195,10 +1101,10 @@ static OGRErr GetPosition(OGRLayer *const poPkLayer, double dfX, double dfY,
     }
     else
     {
-        fprintf(
-            stdout, "%s",
-            CPLSPrintf("The position for coordinates lat:%f, long:%f is %f\n",
-                       dfY, dfX, dfRefDist));
+        fprintf(stdout, "%s",
+                CPLSPrintf(
+                    _("The position for coordinates lat:%f, long:%f is %f\n"),
+                    dfY, dfX, dfRefDist));
     }
 
     return OGRERR_NONE;
@@ -1240,8 +1146,8 @@ static OGRErr GetCoordinates(OGRLayer *const poPkLayer, double dfPos,
         else
         {
             fprintf(stdout, "%s",
-                    CPLSPrintf("The position for distance %f is lat:%f, "
-                               "long:%f, height:%f\n",
+                    CPLSPrintf(_("The position for distance %f is lat:%f, "
+                                 "long:%f, height:%f\n"),
                                dfPos, pt.getY(), pt.getX(), pt.getZ()));
         }
     }
@@ -1252,716 +1158,810 @@ static OGRErr GetCoordinates(OGRLayer *const poPkLayer, double dfPos,
     }
     else
     {
-        fprintf(stderr, "Get coordinates for position %f failed\n", dfPos);
+        fprintf(stderr, _("Get coordinates for position %f failed.\n"), dfPos);
         return OGRERR_FAILURE;
     }
 }
 
 /************************************************************************/
-/*                                main()                                */
+/*                           OGRLineRefOptions                          */
 /************************************************************************/
 
-#define CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(nExtraArg)                            \
-    do                                                                         \
-    {                                                                          \
-        if (iArg + nExtraArg >= nArgc)                                         \
-            Usage(true, CPLSPrintf("%s option requires %d argument(s)",        \
-                                   papszArgv[iArg], nExtraArg));               \
-    } while (false)
-
-MAIN_START(nArgc, papszArgv)
-
+struct OGRLineRefOptions
 {
-    OGRErr eErr = OGRERR_NONE;
     bool bQuiet = false;
-    const char *pszFormat = "ESRI Shapefile";
-
-    const char *pszOutputDataSource = nullptr;
-    const char *pszLineDataSource = nullptr;
-    const char *pszPicketsDataSource = nullptr;
-    const char *pszPartsDataSource = nullptr;
-    char *pszOutputLayerName = nullptr;
-    const char *pszLineLayerName = nullptr;
+    bool bDisplayProgress = false;
+    std::string osFormat = "ESRI Shapefile";
+
+    std::string osSrcLineDataSourceName;
+    std::string osSrcLineLayerName;
 #ifdef HAVE_GEOS
-    const char *pszPicketsLayerName = nullptr;
-    const char *pszPicketsMField = nullptr;
+    std::string osSrcLineSepFieldName;
 #endif
-    const char *pszPartsLayerName = nullptr;
 
+    std::string osSrcPicketsDataSourceName;
 #ifdef HAVE_GEOS
-    const char *pszLineSepFieldName = nullptr;
-    const char *pszPicketsSepFieldName = nullptr;
-    const char *pszOutputSepFieldName = "uniq_uid";
+    std::string osSrcPicketsLayerName;
+    std::string osSrcPicketsSepFieldName;
+    std::string osSrcPicketsMFieldName;
 #endif
 
-    char **papszDSCO = nullptr;
-    char **papszLCO = nullptr;
+    std::string osSrcPartsDataSourceName;
+    std::string osSrcPartsLayerName;
 
-    operation stOper = op_unknown;
 #ifdef HAVE_GEOS
-    double dfX = -100000000.0;
-    double dfY = -100000000.0;
+    std::string osOutputSepFieldName = "uniq_uid";
 #endif
-    double dfPos = -100000000.0;
+    std::string osOutputDataSourceName;
+    std::string osOutputLayerName;
+
+    CPLStringList aosDSCO;
+    CPLStringList aosLCO;
 
-    int bDisplayProgress = FALSE;
+    // Operations
+    bool bCreate = false;
+    bool bGetPos = false;
+    bool bGetSubLine = false;
+    bool bGetCoord = false;
 
-    double dfPosBeg = -100000000.0;
-    double dfPosEnd = -100000000.0;
 #ifdef HAVE_GEOS
-    double dfStep = -100000000.0;
+    double dfXPos = std::numeric_limits<double>::quiet_NaN();
+    double dfYPos = std::numeric_limits<double>::quiet_NaN();
+    double dfStep = std::numeric_limits<double>::quiet_NaN();
 #endif
+    double dfPosBeg = std::numeric_limits<double>::quiet_NaN();
+    double dfPosEnd = std::numeric_limits<double>::quiet_NaN();
+    double dfPos = std::numeric_limits<double>::quiet_NaN();
+};
 
-    // Check strict compilation and runtime library version as we use C++ API.
-    if (!GDAL_CHECK_VERSION(papszArgv[0]))
-        exit(1);
+/************************************************************************/
+/*                           OGRLineRefGetParser                        */
+/************************************************************************/
 
-    EarlySetConfigOptions(nArgc, papszArgv);
+static std::unique_ptr<GDALArgumentParser>
+OGRLineRefAppOptionsGetParser(OGRLineRefOptions *psOptions)
+{
+    auto argParser = std::make_unique<GDALArgumentParser>(
+        "ogrlineref", /* bForBinary */ true);
 
-    OGRRegisterAll();
+    argParser->add_description(
+        _("Create linear reference and provide some calculations using it."));
 
-    /* -------------------------------------------------------------------- */
-    /*      Processing command line arguments.                              */
-    /* -------------------------------------------------------------------- */
-    nArgc = OGRGeneralCmdLineProcessor(nArgc, &papszArgv, 0);
+    argParser->add_epilog(_("For more details, consult the full documentation "
+                            "for the ogrlineref utility "
+                            "https://gdal.org/programs/ogrlineref.html"));
 
-    if (nArgc < 1)
-        exit(-nArgc);
+    auto &quietArg{argParser->add_quiet_argument(&psOptions->bQuiet)};
+    argParser->add_hidden_alias_for(quietArg, "-quiet");
 
-    for (int iArg = 1; iArg < nArgc; iArg++)
-    {
-        if (EQUAL(papszArgv[iArg], "--utility_version"))
-        {
-            printf("%s was compiled against GDAL %s and "
-                   "is running against GDAL %s\n",
-                   papszArgv[0], GDAL_RELEASE_NAME,
-                   GDALVersionInfo("RELEASE_NAME"));
-            CSLDestroy(papszArgv);
-            return 0;
-        }
-        else if (EQUAL(papszArgv[iArg], "--help"))
-        {
-            Usage(false);
-        }
-        else if (EQUAL(papszArgv[iArg], "--long-usage"))
-        {
-            Usage(false, nullptr, false);
-        }
+    argParser->add_argument("-progress")
+        .flag()
+        .store_into(psOptions->bDisplayProgress)
+        .help(_("Display progress."));
+
+    argParser->add_output_format_argument(psOptions->osFormat);
+
+    argParser->add_dataset_creation_options_argument(psOptions->aosDSCO);
+
+    argParser->add_layer_creation_options_argument(psOptions->aosLCO);
 
-        else if (EQUAL(papszArgv[iArg], "-q") ||
-                 EQUAL(papszArgv[iArg], "-quiet"))
-        {
-            bQuiet = true;
-        }
-        else if ((EQUAL(papszArgv[iArg], "-f") ||
-                  EQUAL(papszArgv[iArg], "-of")))
-        {
-            CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
-            // bFormatExplicitlySet = TRUE;
-            // coverity[tainted_data]
-            pszFormat = papszArgv[++iArg];
-        }
-        else if (EQUAL(papszArgv[iArg], "-dsco"))
-        {
-            CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
-            // coverity[tainted_data]
-            papszDSCO = CSLAddString(papszDSCO, papszArgv[++iArg]);
-        }
-        else if (EQUAL(papszArgv[iArg], "-lco"))
-        {
-            CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
-            // coverity[tainted_data]
-            papszLCO = CSLAddString(papszLCO, papszArgv[++iArg]);
-        }
-        else if (EQUAL(papszArgv[iArg], "-create"))
-        {
-            stOper = op_create;
-        }
-        else if (EQUAL(papszArgv[iArg], "-get_pos"))
-        {
-            stOper = op_get_pos;
-        }
-        else if (EQUAL(papszArgv[iArg], "-get_coord"))
-        {
-            stOper = op_get_coord;
-        }
-        else if (EQUAL(papszArgv[iArg], "-get_subline"))
-        {
-            stOper = op_get_subline;
-        }
-        else if (EQUAL(papszArgv[iArg], "-l"))
-        {
-            CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
-            // coverity[tainted_data]
-            pszLineDataSource = papszArgv[++iArg];
-        }
-        else if (EQUAL(papszArgv[iArg], "-ln"))
-        {
-            CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
-            // coverity[tainted_data]
-            pszLineLayerName = papszArgv[++iArg];
-        }
-        else if (EQUAL(papszArgv[iArg], "-lf"))
-        {
-            CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
 #ifdef HAVE_GEOS
-            // coverity[tainted_data]
-            pszLineSepFieldName = papszArgv[++iArg];
-#else
-            fprintf(stderr,
-                    "GEOS support not enabled or incompatible version.\n");
-            exit(1);
+    argParser->add_argument("-create")
+        .flag()
+        .store_into(psOptions->bCreate)
+        .help(_("Create the linear reference file (linestring of parts)."));
 #endif
-        }
-        else if (EQUAL(papszArgv[iArg], "-p"))
-        {
-            CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
-            // coverity[tainted_data]
-            pszPicketsDataSource = papszArgv[++iArg];
-        }
-        else if (EQUAL(papszArgv[iArg], "-pn"))
-        {
-            CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
+
+    argParser->add_argument("-l")
+        .metavar("<src_line_datasource_name>")
+        .store_into(psOptions->osSrcLineDataSourceName)
+        .help(_("Name of the line path datasource."));
+
+    argParser->add_argument("-ln")
+        .metavar("<layer_name>")
+        .store_into(psOptions->osSrcLineLayerName)
+        .help(_("Layer name in the line path datasource."));
+
 #ifdef HAVE_GEOS
-            // coverity[tainted_data]
-            pszPicketsLayerName = papszArgv[++iArg];
-#else
-            fprintf(stderr,
-                    "GEOS support not enabled or incompatible version.\n");
-            exit(1);
+
+    argParser->add_argument("-lf")
+        .metavar("<field_name>")
+        .store_into(psOptions->osSrcLineSepFieldName)
+        .help(_("Field name for unique paths in layer."));
 #endif
-        }
-        else if (EQUAL(papszArgv[iArg], "-pm"))
-        {
-            CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
+
+    argParser->add_argument("-p")
+        .metavar("<src_repers_datasource_name>")
+        .store_into(psOptions->osSrcPicketsDataSourceName)
+        .help(_("Datasource of repers name."));
+
 #ifdef HAVE_GEOS
-            // coverity[tainted_data]
-            pszPicketsMField = papszArgv[++iArg];
-#else
-            fprintf(stderr,
-                    "GEOS support not enabled or incompatible version.\n");
-            exit(1);
+    argParser->add_argument("-pn")
+        .metavar("<layer_name>")
+        .store_into(psOptions->osSrcPicketsLayerName)
+        .help(_("Layer name in repers datasource."));
+
+    argParser->add_argument("-pm")
+        .metavar("<pos_field_name>")
+        .store_into(psOptions->osSrcPicketsMFieldName)
+        .help(_("Line position field name."));
+
+    argParser->add_argument("-pf")
+        .metavar("<field_name>")
+        .store_into(psOptions->osSrcPicketsSepFieldName)
+        .help(_("Field name of unique values to map input reference points "
+                "to lines."));
 #endif
-        }
-        else if (EQUAL(papszArgv[iArg], "-pf"))
-        {
-            CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
+
+    argParser->add_argument("-r")
+        .metavar("<src_parts_datasource_name>")
+        .store_into(psOptions->osSrcPartsDataSourceName)
+        .help(_("Path to linear reference file."));
+
+    argParser->add_argument("-rn")
+        .metavar("<layer_name>")
+        .store_into(psOptions->osSrcPartsLayerName)
+        .help(_("Name of the layer in the input linear reference datasource."));
+
+    argParser->add_argument("-o")
+        .metavar("<dst_datasource_name>")
+        .store_into(psOptions->osOutputDataSourceName)
+        .help(_("Path to output linear reference file (linestring "
+                "datasource)."));
+
+    argParser->add_argument("-on")
+        .metavar("<layer_name>")
+        .store_into(psOptions->osOutputLayerName)
+        .help(_("Name of the layer in the output linear reference "
+                "datasource."));
+
 #ifdef HAVE_GEOS
-            // coverity[tainted_data]
-            pszPicketsSepFieldName = papszArgv[++iArg];
-#else
-            fprintf(stderr,
-                    "GEOS support not enabled or incompatible version.\n");
-            exit(1);
+    argParser->add_argument("-of")
+        .metavar("<field_name>")
+        .store_into(psOptions->osOutputSepFieldName)
+        .help(_(
+            "Name of the field for storing the unique values of input lines."));
+
+    argParser->add_argument("-s")
+        .metavar("<step>")
+        .scan<'g', double>()
+        .store_into(psOptions->dfStep)
+        .help(_("Part size in linear units."));
+
+    argParser->add_argument("-get_pos")
+        .flag()
+        .store_into(psOptions->bGetPos)
+        .help(_("Get the position for the given coordinates."));
+
+    argParser->add_argument("-x")
+        .metavar("<x>")
+        .scan<'g', double>()
+        .store_into(psOptions->dfXPos)
+        .help(_("X coordinate."));
+
+    argParser->add_argument("-y")
+        .metavar("<y>")
+        .scan<'g', double>()
+        .store_into(psOptions->dfYPos)
+        .help(_("Y coordinate."));
 #endif
-        }
-        else if (EQUAL(papszArgv[iArg], "-r"))
-        {
-            CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
-            // coverity[tainted_data]
-            pszPartsDataSource = papszArgv[++iArg];
-        }
-        else if (EQUAL(papszArgv[iArg], "-rn"))
-        {
-            CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
-            // coverity[tainted_data]
-            pszPartsLayerName = papszArgv[++iArg];
-        }
-        else if (EQUAL(papszArgv[iArg], "-o"))
+
+    argParser->add_argument("-get_coord")
+        .flag()
+        .store_into(psOptions->bGetCoord)
+        .help(_("Return point on path for input linear distance."));
+
+    argParser->add_argument("-m")
+        .metavar("<position>")
+        .scan<'g', double>()
+        .store_into(psOptions->dfPos)
+        .help(_("Input linear distance."));
+
+    argParser->add_argument("-get_subline")
+        .flag()
+        .store_into(psOptions->bGetSubLine)
+        .help(_("Return the portion of the input path from and to input linear "
+                "positions."));
+
+    argParser->add_argument("-mb")
+        .metavar("<position>")
+        .scan<'g', double>()
+        .store_into(psOptions->dfPosBeg)
+        .help(_("Input linear distance begin."));
+
+    argParser->add_argument("-me")
+        .metavar("<position>")
+        .scan<'g', double>()
+        .store_into(psOptions->dfPosEnd)
+        .help(_("Input linear distance end."));
+
+    return argParser;
+}
+
+/************************************************************************/
+/*                                main()                                */
+/************************************************************************/
+
+MAIN_START(argc, argv)
+
+{
+    OGRErr eErr = OGRERR_NONE;
+
+    operation stOper = op_unknown;
+
+    EarlySetConfigOptions(argc, argv);
+
+    argc = GDALGeneralCmdLineProcessor(argc, &argv, 0);
+
+    if (argc < 2)
+    {
+        try
         {
-            CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
-            // coverity[tainted_data]
-            pszOutputDataSource = papszArgv[++iArg];
+            OGRLineRefOptions sOptions;
+            auto argParser = OGRLineRefAppOptionsGetParser(&sOptions);
+            fprintf(stderr, "%s\n", argParser->usage().c_str());
         }
-        else if (EQUAL(papszArgv[iArg], "-on"))
+        catch (const std::exception &err)
         {
-            CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
-            // coverity[tainted_data]
-            pszOutputLayerName = CPLStrdup(papszArgv[++iArg]);
+            CPLError(CE_Failure, CPLE_AppDefined, "Unexpected exception: %s",
+                     err.what());
         }
-        else if (EQUAL(papszArgv[iArg], "-of"))
+        CSLDestroy(argv);
+        exit(1);
+    }
+
+    OGRRegisterAll();
+
+    OGRLineRefOptions psOptions;
+    auto argParser = OGRLineRefAppOptionsGetParser(&psOptions);
+
+    try
+    {
+        argParser->parse_args_without_binary_name(argv + 1);
+        CSLDestroy(argv);
+    }
+    catch (const std::exception &error)
+    {
+        argParser->display_error_and_usage(error);
+        CSLDestroy(argv);
+        exit(1);
+    }
+
+    // Select operation mode
+    if (psOptions.bCreate)
+        stOper = op_create;
+
+    if (psOptions.bGetPos)
+    {
+        if (stOper != op_unknown)
         {
-            CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
-#ifdef HAVE_GEOS
-            // coverity[tainted_data]
-            pszOutputSepFieldName = papszArgv[++iArg];
-#else
-            fprintf(stderr,
-                    "GEOS support not enabled or incompatible version.\n");
+            fprintf(stderr, _("Only one operation can be specified\n"));
+            argParser->usage();
             exit(1);
-#endif
         }
-        else if (EQUAL(papszArgv[iArg], "-x"))
+        stOper = op_get_pos;
+    }
+
+    if (psOptions.bGetCoord)
+    {
+        if (stOper != op_unknown)
         {
-            CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
-#ifdef HAVE_GEOS
-            // coverity[tainted_data]
-            dfX = CPLAtofM(papszArgv[++iArg]);
-#else
-            fprintf(stderr,
-                    "GEOS support not enabled or incompatible version.\n");
+            fprintf(stderr, _("Only one operation can be specified\n"));
+            argParser->usage();
             exit(1);
-#endif
         }
-        else if (EQUAL(papszArgv[iArg], "-y"))
-        {
-            CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
-#ifdef HAVE_GEOS
-            // coverity[tainted_data]
-            dfY = CPLAtofM(papszArgv[++iArg]);
-#else
-            fprintf(stderr,
-                    "GEOS support not enabled or incompatible version.\n");
-            exit(1);
-#endif
-        }
-        else if (EQUAL(papszArgv[iArg], "-m"))
-        {
-            CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
-            // coverity[tainted_data]
-            dfPos = CPLAtofM(papszArgv[++iArg]);
-        }
-        else if (EQUAL(papszArgv[iArg], "-mb"))
-        {
-            CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
-            // coverity[tainted_data]
-            dfPosBeg = CPLAtofM(papszArgv[++iArg]);
-        }
-        else if (EQUAL(papszArgv[iArg], "-me"))
-        {
-            CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
-            // coverity[tainted_data]
-            dfPosEnd = CPLAtofM(papszArgv[++iArg]);
-        }
-        else if (EQUAL(papszArgv[iArg], "-s"))
+        stOper = op_get_coord;
+    }
+
+    if (psOptions.bGetSubLine)
+    {
+        if (stOper != op_unknown)
         {
-            CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
-#ifdef HAVE_GEOS
-            // coverity[tainted_data]
-            dfStep = CPLAtofM(papszArgv[++iArg]);
-#else
-            fprintf(stderr,
-                    "GEOS support not enabled or incompatible version.\n");
+            fprintf(stderr, _("Only one operation can be specified\n"));
+            argParser->usage();
             exit(1);
-#endif
-        }
-        else if (EQUAL(papszArgv[iArg], "-progress"))
-        {
-            bDisplayProgress = TRUE;
-        }
-        else if (papszArgv[iArg][0] == '-')
-        {
-            Usage(true,
-                  CPLSPrintf("Unknown option name '%s'", papszArgv[iArg]));
         }
+        stOper = op_get_subline;
     }
 
-    if (stOper == op_create)
+    if (stOper == op_unknown)
     {
-#ifdef HAVE_GEOS
-        if (pszOutputDataSource == nullptr)
-            Usage(true, "no output datasource provided");
-        else if (pszLineDataSource == nullptr)
-            Usage(true, "no path datasource provided");
-        else if (pszPicketsDataSource == nullptr)
-            Usage(true, "no repers datasource provided");
-        else if (pszPicketsMField == nullptr)
-            Usage(true, "no position field provided");
-        else if (dfStep == -100000000.0)
-            Usage(true, "no step provided");
-
-        /* --------------------------------------------------------------------
-         */
-        /*      Open data source. */
-        /* --------------------------------------------------------------------
-         */
-
-        GDALDataset *poLnDS =
-            GDALDataset::FromHandle(OGROpen(pszLineDataSource, FALSE, nullptr));
-
-        /* --------------------------------------------------------------------
-         */
-        /*      Report failure */
-        /* --------------------------------------------------------------------
-         */
-        if (poLnDS == nullptr)
+        fprintf(stderr, _("No operation specified\n"));
+        argParser->usage();
+        exit(1);
+    }
+
+    /* -------------------------------------------------------------------- */
+    /*                     Create linear reference                          */
+    /* -------------------------------------------------------------------- */
+
+    switch (stOper)
+    {
+        case op_create:
         {
-            OGRSFDriverRegistrar *poR = OGRSFDriverRegistrar::GetRegistrar();
+#ifdef HAVE_GEOS
+            if (psOptions.osOutputDataSourceName.empty())
+            {
+                fprintf(stderr, _("No output datasource provided.\n"));
+                argParser->usage();
+                exit(1);
+            }
+            if (psOptions.osSrcLineDataSourceName.empty())
+            {
+                fprintf(stderr, _("No path datasource provided.\n"));
+                argParser->usage();
+                exit(1);
+            }
+            if (psOptions.osSrcPicketsMFieldName.empty())
+            {
+                fprintf(stderr, _("No repers position field provided.\n"));
+                argParser->usage();
+                exit(1);
+            }
+            if (psOptions.osSrcPicketsDataSourceName.empty())
+            {
+                fprintf(stderr, _("No repers datasource provided.\n"));
+                argParser->usage();
+                exit(1);
+            }
+            if (psOptions.dfStep == std::numeric_limits<double>::quiet_NaN())
+            {
+                fprintf(stderr, _("No step provided.\n"));
+                argParser->usage();
+                exit(1);
+            }
 
-            fprintf(stderr,
-                    "FAILURE:\n"
-                    "Unable to open path datasource `%s' with "
-                    "the following drivers.\n",
-                    pszLineDataSource);
+            /* ------------------------------------------------------------- */
+            /*      Open data source.                                        */
+            /* ------------------------------------------------------------- */
+
+            GDALDataset *poLnDS = GDALDataset::FromHandle(OGROpen(
+                psOptions.osSrcLineDataSourceName.c_str(), FALSE, nullptr));
+
+            /* ------------------------------------------------------------- */
+            /*      Report failure                                           */
+            /* ------------------------------------------------------------- */
+            if (poLnDS == nullptr)
+            {
+                OGRSFDriverRegistrar *poR =
+                    OGRSFDriverRegistrar::GetRegistrar();
+
+                fprintf(stderr,
+                        _("FAILURE:\n"
+                          "Unable to open path datasource `%s' with "
+                          "the following drivers.\n"),
+                        psOptions.osSrcLineDataSourceName.c_str());
 
-            for (int iDriver = 0; iDriver < poR->GetDriverCount(); iDriver++)
+                for (int iDriver = 0; iDriver < poR->GetDriverCount();
+                     iDriver++)
+                {
+                    fprintf(stderr, "  -> %s\n",
+                            poR->GetDriver(iDriver)->GetDescription());
+                }
+
+                exit(1);
+            }
+
+            GDALDataset *poPkDS = GDALDataset::FromHandle(OGROpen(
+                psOptions.osSrcPicketsDataSourceName.c_str(), FALSE, nullptr));
+
+            /* --------------------------------------------------------------- */
+            /*      Report failure                                             */
+            /* --------------------------------------------------------------- */
+
+            if (poPkDS == nullptr)
             {
-                fprintf(stderr, "  -> %s\n",
-                        poR->GetDriver(iDriver)->GetDescription());
+                OGRSFDriverRegistrar *poR =
+                    OGRSFDriverRegistrar::GetRegistrar();
+
+                fprintf(stderr,
+                        _("FAILURE:\n"
+                          "Unable to open repers datasource `%s' "
+                          "with the following drivers.\n"),
+                        psOptions.osSrcPicketsDataSourceName.c_str());
+
+                for (int iDriver = 0; iDriver < poR->GetDriverCount();
+                     iDriver++)
+                {
+                    fprintf(stderr, "  -> %s\n",
+                            poR->GetDriver(iDriver)->GetDescription());
+                }
+
+                exit(1);
             }
 
-            exit(1);
-        }
+            /* ----------------------------------------------------------------- */
+            /*      Find the output driver.                                      */
+            /* ----------------------------------------------------------------- */
 
-        GDALDataset *poPkDS = GDALDataset::FromHandle(
-            OGROpen(pszPicketsDataSource, FALSE, nullptr));
-        /* --------------------------------------------------------------------
-         */
-        /*      Report failure */
-        /* --------------------------------------------------------------------
-         */
-        if (poPkDS == nullptr)
-        {
-            OGRSFDriverRegistrar *poR = OGRSFDriverRegistrar::GetRegistrar();
+            if (!psOptions.bQuiet)
+                CheckDestDataSourceNameConsistency(
+                    psOptions.osOutputDataSourceName.c_str(),
+                    psOptions.osFormat.c_str());
 
-            fprintf(stderr,
-                    "FAILURE:\n"
-                    "Unable to open repers datasource `%s' "
-                    "with the following drivers.\n",
-                    pszPicketsDataSource);
+            OGRSFDriverRegistrar *poR = OGRSFDriverRegistrar::GetRegistrar();
 
-            for (int iDriver = 0; iDriver < poR->GetDriverCount(); iDriver++)
+            GDALDriver *poDriver =
+                poR->GetDriverByName(psOptions.osFormat.c_str());
+            if (poDriver == nullptr)
             {
-                fprintf(stderr, "  -> %s\n",
-                        poR->GetDriver(iDriver)->GetDescription());
+                fprintf(stderr, _("Unable to find driver `%s'.\n"),
+                        psOptions.osFormat.c_str());
+                fprintf(stderr, _("The following drivers are available:\n"));
+
+                for (int iDriver = 0; iDriver < poR->GetDriverCount();
+                     iDriver++)
+                {
+                    fprintf(stderr, "  -> `%s'\n",
+                            poR->GetDriver(iDriver)->GetDescription());
+                }
+                exit(1);
             }
 
-            exit(1);
-        }
+            if (!CPLTestBool(CSLFetchNameValueDef(poDriver->GetMetadata(),
+                                                  GDAL_DCAP_CREATE, "FALSE")))
+            {
+                fprintf(stderr,
+                        _("%s driver does not support data source creation.\n"),
+                        psOptions.osSrcPicketsDataSourceName.c_str());
+                exit(1);
+            }
 
-        /* --------------------------------------------------------------------
-         */
-        /*      Find the output driver. */
-        /* --------------------------------------------------------------------
-         */
+            /* ---------------------------------------------------------------- */
+            /*      Create the output data source.                              */
+            /* ---------------------------------------------------------------- */
+            GDALDataset *poODS =
+                poDriver->Create(psOptions.osOutputDataSourceName.c_str(), 0, 0,
+                                 0, GDT_Unknown, psOptions.aosDSCO);
+            if (poODS == nullptr)
+            {
+                fprintf(stderr, _("%s driver failed to create %s.\n"),
+                        psOptions.osFormat.c_str(),
+                        psOptions.osOutputDataSourceName.c_str());
+                exit(1);
+            }
 
-        if (!bQuiet)
-            CheckDestDataSourceNameConsistency(pszOutputDataSource, pszFormat);
+            OGRLayer *poLnLayer =
+                psOptions.osSrcLineLayerName.empty()
+                    ? poLnDS->GetLayer(0)
+                    : poLnDS->GetLayerByName(
+                          psOptions.osSrcLineLayerName.c_str());
 
-        OGRSFDriverRegistrar *poR = OGRSFDriverRegistrar::GetRegistrar();
+            if (poLnLayer == nullptr)
+            {
+                fprintf(stderr, _("Get path layer failed.\n"));
+                exit(1);
+            }
 
-        GDALDriver *poDriver = poR->GetDriverByName(pszFormat);
-        if (poDriver == nullptr)
-        {
-            fprintf(stderr, "Unable to find driver `%s'.\n", pszFormat);
-            fprintf(stderr, "The following drivers are available:\n");
+            OGRLayer *poPkLayer =
+                psOptions.osSrcPicketsLayerName.empty()
+                    ? poPkDS->GetLayer(0)
+                    : poPkDS->GetLayerByName(
+                          psOptions.osSrcPicketsLayerName.c_str());
 
-            for (int iDriver = 0; iDriver < poR->GetDriverCount(); iDriver++)
+            if (poPkLayer == nullptr)
             {
-                fprintf(stderr, "  -> `%s'\n",
-                        poR->GetDriver(iDriver)->GetDescription());
+                fprintf(stderr, _("Get repers layer failed.\n"));
+                exit(1);
             }
-            exit(1);
-        }
 
-        if (!CPLTestBool(CSLFetchNameValueDef(poDriver->GetMetadata(),
-                                              GDAL_DCAP_CREATE, "FALSE")))
-        {
-            fprintf(stderr,
-                    "%s driver does not support data source creation.\n",
-                    pszFormat);
-            exit(1);
-        }
+            OGRFeatureDefn *poPkFDefn = poPkLayer->GetLayerDefn();
+            int nMValField = poPkFDefn->GetFieldIndex(
+                psOptions.osSrcPicketsMFieldName.c_str());
 
-        /* --------------------------------------------------------------------
-         */
-        /*      Create the output data source. */
-        /* --------------------------------------------------------------------
-         */
-        GDALDataset *poODS = poDriver->Create(pszOutputDataSource, 0, 0, 0,
-                                              GDT_Unknown, papszDSCO);
-        if (poODS == nullptr)
-        {
-            fprintf(stderr, "%s driver failed to create %s\n", pszFormat,
-                    pszOutputDataSource);
-            exit(1);
-        }
+            OGRLayer *poOutLayer = nullptr;
+            if (!psOptions.osSrcLineSepFieldName.empty() &&
+                !psOptions.osSrcPicketsSepFieldName.empty())
+            {
+                poOutLayer =
+                    SetupTargetLayer(poLnLayer, poODS, psOptions.aosLCO,
+                                     psOptions.osOutputLayerName.c_str(),
+                                     psOptions.osOutputSepFieldName.c_str());
+                if (poOutLayer == nullptr)
+                {
+                    fprintf(stderr, _("Create output layer failed.\n"));
+                    exit(1);
+                }
 
-        OGRLayer *poLnLayer = pszLineLayerName == nullptr
-                                  ? poLnDS->GetLayer(0)
-                                  : poLnDS->GetLayerByName(pszLineLayerName);
+                // Do the work
+                eErr = CreatePartsMultiple(
+                    poLnLayer, psOptions.osSrcLineSepFieldName.c_str(),
+                    poPkLayer, psOptions.osSrcPicketsSepFieldName.c_str(),
+                    nMValField, psOptions.dfStep, poOutLayer,
+                    psOptions.osOutputSepFieldName.c_str(),
+                    psOptions.bDisplayProgress, psOptions.bQuiet);
+            }
+            else
+            {
+                poOutLayer =
+                    SetupTargetLayer(poLnLayer, poODS, psOptions.aosLCO,
+                                     psOptions.osOutputLayerName.c_str());
+                if (poOutLayer == nullptr)
+                {
+                    fprintf(stderr, _("Create output layer failed.\n"));
+                    exit(1);
+                }
 
-        if (poLnLayer == nullptr)
-        {
-            fprintf(stderr, "Get path layer failed.\n");
-            exit(1);
-        }
+                // Do the work
+                eErr = CreateParts(
+                    poLnLayer, poPkLayer, nMValField, psOptions.dfStep,
+                    poOutLayer, psOptions.bDisplayProgress, psOptions.bQuiet);
+            }
 
-        OGRLayer *poPkLayer = pszPicketsLayerName == nullptr
-                                  ? poPkDS->GetLayer(0)
-                                  : poPkDS->GetLayerByName(pszPicketsLayerName);
+            GDALClose(poLnDS);
+            GDALClose(poPkDS);
+            if (GDALClose(poODS) != CE_None)
+                eErr = CE_Failure;
 
-        if (poPkLayer == nullptr)
-        {
-            fprintf(stderr, "Get repers layer failed.\n");
+#else   // HAVE_GEOS
+            fprintf(stderr,
+                    _("GEOS support not enabled or incompatible version.\n"));
             exit(1);
+#endif  // HAVE_GEOS
+            break;
         }
+        case op_get_pos:
+        {
+#ifdef HAVE_GEOS
 
-        OGRFeatureDefn *poPkFDefn = poPkLayer->GetLayerDefn();
-        int nMValField = poPkFDefn->GetFieldIndex(pszPicketsMField);
+            if (psOptions.dfXPos == std::numeric_limits<double>::quiet_NaN() ||
+                psOptions.dfYPos == std::numeric_limits<double>::quiet_NaN())
+            {
+                fprintf(stderr, _("no coordinates provided\n"));
+                argParser->usage();
+                exit(1);
+            }
+            if (psOptions.osSrcPartsDataSourceName.empty())
+            {
+                fprintf(stderr, _("no parts datasource provided\n"));
+                argParser->usage();
+                exit(1);
+            }
 
-        OGRLayer *poOutLayer = nullptr;
-        if (pszLineSepFieldName != nullptr && pszPicketsSepFieldName != nullptr)
-        {
-            poOutLayer =
-                SetupTargetLayer(poLnLayer, poODS, papszLCO, pszOutputLayerName,
-                                 pszOutputSepFieldName);
-            if (poOutLayer == nullptr)
+            GDALDataset *poPartsDS = GDALDataset::FromHandle(OGROpen(
+                psOptions.osSrcPartsDataSourceName.c_str(), FALSE, nullptr));
+            /* ------------------------------------------------------------------ */
+            /*      Report failure                                                */
+            /* ------------------------------------------------------------------ */
+            if (poPartsDS == nullptr)
             {
-                fprintf(stderr, "Create output layer failed.\n");
+                OGRSFDriverRegistrar *poR =
+                    OGRSFDriverRegistrar::GetRegistrar();
+
+                fprintf(stderr,
+                        _("FAILURE:\n"
+                          "Unable to open parts datasource `%s' with "
+                          "the following drivers.\n"),
+                        psOptions.osSrcPicketsDataSourceName.c_str());
+
+                for (int iDriver = 0; iDriver < poR->GetDriverCount();
+                     iDriver++)
+                {
+                    fprintf(stderr, "  -> %s\n",
+                            poR->GetDriver(iDriver)->GetDescription());
+                }
+
                 exit(1);
             }
 
-            // Do the work
-            eErr = CreatePartsMultiple(
-                poLnLayer, pszLineSepFieldName, poPkLayer,
-                pszPicketsSepFieldName, nMValField, dfStep, poOutLayer,
-                pszOutputSepFieldName, bDisplayProgress, bQuiet);
-        }
-        else
-        {
-            poOutLayer = SetupTargetLayer(poLnLayer, poODS, papszLCO,
-                                          pszOutputLayerName);
-            if (poOutLayer == nullptr)
+            OGRLayer *poPartsLayer =
+                psOptions.osSrcPartsLayerName.empty()
+                    ? poPartsDS->GetLayer(0)
+                    : poPartsDS->GetLayerByName(
+                          psOptions.osSrcPartsLayerName.c_str());
+
+            if (poPartsLayer == nullptr)
             {
-                fprintf(stderr, "Create output layer failed.\n");
+                fprintf(stderr, _("Get parts layer failed.\n"));
                 exit(1);
             }
 
             // Do the work
-            eErr = CreateParts(poLnLayer, poPkLayer, nMValField, dfStep,
-                               poOutLayer, bDisplayProgress, bQuiet);
-        }
+            eErr = GetPosition(poPartsLayer, psOptions.dfXPos, psOptions.dfYPos,
+                               psOptions.bDisplayProgress, psOptions.bQuiet);
 
-        GDALClose(poLnDS);
-        GDALClose(poPkDS);
-        if (GDALClose(poODS) != CE_None)
-            eErr = CE_Failure;
+            GDALClose(poPartsDS);
 
-        if (nullptr != pszOutputLayerName)
-            CPLFree(pszOutputLayerName);
 #else   // HAVE_GEOS
-        fprintf(stderr, "GEOS support not enabled or incompatible version.\n");
-        exit(1);
+            fprintf(stderr,
+                    "GEOS support not enabled or incompatible version.\n");
+            exit(1);
 #endif  // HAVE_GEOS
-    }
-    else if (stOper == op_get_pos)
-    {
-#ifdef HAVE_GEOS
-        if (pszPartsDataSource == nullptr)
-            Usage(true, "no parts datasource provided");
-        else if (dfX == -100000000.0 || dfY == -100000000.0)
-            Usage(true, "no coordinates provided");
-
-        GDALDataset *poPartsDS = GDALDataset::FromHandle(
-            OGROpen(pszPartsDataSource, FALSE, nullptr));
-        /* --------------------------------------------------------------------
-         */
-        /*      Report failure */
-        /* --------------------------------------------------------------------
-         */
-        if (poPartsDS == nullptr)
+            break;
+        }
+        case op_get_coord:
         {
-            OGRSFDriverRegistrar *poR = OGRSFDriverRegistrar::GetRegistrar();
-
-            fprintf(stderr,
-                    "FAILURE:\n"
-                    "Unable to open parts datasource `%s' with "
-                    "the following drivers.\n",
-                    pszPicketsDataSource);
-
-            for (int iDriver = 0; iDriver < poR->GetDriverCount(); iDriver++)
+            if (psOptions.osSrcPartsDataSourceName.empty())
             {
-                fprintf(stderr, "  -> %s\n",
-                        poR->GetDriver(iDriver)->GetDescription());
+                fprintf(stderr, _("No parts datasource provided.\n"));
+                argParser->usage();
+                exit(1);
+            }
+            if (psOptions.dfPos == std::numeric_limits<double>::quiet_NaN())
+            {
+                fprintf(stderr, _("No position provided.\n"));
+                argParser->usage();
+                exit(1);
             }
 
-            exit(1);
-        }
+            GDALDataset *poPartsDS = GDALDataset::FromHandle(OGROpen(
+                psOptions.osSrcPartsDataSourceName.c_str(), FALSE, nullptr));
+            /* ----------------------------------------------------------------- */
+            /*      Report failure                                               */
+            /* ----------------------------------------------------------------- */
+            if (poPartsDS == nullptr)
+            {
+                OGRSFDriverRegistrar *poR =
+                    OGRSFDriverRegistrar::GetRegistrar();
 
-        OGRLayer *poPartsLayer =
-            pszPartsLayerName == nullptr
-                ? poPartsDS->GetLayer(0)
-                : poPartsDS->GetLayerByName(pszPartsLayerName);
+                fprintf(stderr,
+                        _("FAILURE:\n"
+                          "Unable to open parts datasource `%s' with "
+                          "the following drivers.\n"),
+                        psOptions.osSrcPicketsDataSourceName.c_str());
 
-        if (poPartsLayer == nullptr)
-        {
-            fprintf(stderr, "Get parts layer failed.\n");
-            exit(1);
-        }
+                for (int iDriver = 0; iDriver < poR->GetDriverCount();
+                     iDriver++)
+                {
+                    fprintf(stderr, "  -> %s\n",
+                            poR->GetDriver(iDriver)->GetDescription());
+                }
 
-        // Do the work
-        eErr = GetPosition(poPartsLayer, dfX, dfY, bDisplayProgress, bQuiet);
+                exit(1);
+            }
 
-        GDALClose(poPartsDS);
+            OGRLayer *poPartsLayer =
+                psOptions.osSrcPartsLayerName.empty()
+                    ? poPartsDS->GetLayer(0)
+                    : poPartsDS->GetLayerByName(
+                          psOptions.osSrcPartsLayerName.c_str());
 
-#else   // HAVE_GEOS
-        fprintf(stderr, "GEOS support not enabled or incompatible version.\n");
-        exit(1);
-#endif  // HAVE_GEOS
-    }
-    else if (stOper == op_get_coord)
-    {
-        if (pszPartsDataSource == nullptr)
-            Usage(true, "no parts datasource provided");
-        else if (dfPos == -100000000.0)
-            Usage(true, "no position provided");
-
-        GDALDataset *poPartsDS = GDALDataset::FromHandle(
-            OGROpen(pszPartsDataSource, FALSE, nullptr));
-        /* --------------------------------------------------------------------
-         */
-        /*      Report failure */
-        /* --------------------------------------------------------------------
-         */
-        if (poPartsDS == nullptr)
-        {
-            OGRSFDriverRegistrar *poR = OGRSFDriverRegistrar::GetRegistrar();
+            if (poPartsLayer == nullptr)
+            {
+                fprintf(stderr, _("Get parts layer failed.\n"));
+                exit(1);
+            }
+            // Do the work
+            eErr = GetCoordinates(poPartsLayer, psOptions.dfPos,
+                                  psOptions.bDisplayProgress, psOptions.bQuiet);
 
-            fprintf(stderr,
-                    "FAILURE:\n"
-                    "Unable to open parts datasource `%s' with "
-                    "the following drivers.\n",
-                    pszPicketsDataSource);
+            GDALClose(poPartsDS);
 
-            for (int iDriver = 0; iDriver < poR->GetDriverCount(); iDriver++)
+            break;
+        }
+        case op_get_subline:
+        {
+            if (psOptions.dfPosBeg == std::numeric_limits<double>::quiet_NaN())
+            {
+                fprintf(stderr, _("No begin position provided.\n"));
+                argParser->usage();
+                exit(1);
+            }
+            if (psOptions.dfPosEnd == std::numeric_limits<double>::quiet_NaN())
+            {
+                fprintf(stderr, _("No end position provided.\n"));
+                argParser->usage();
+                exit(1);
+            }
+            if (psOptions.osSrcPartsDataSourceName.empty())
             {
-                fprintf(stderr, "  -> %s\n",
-                        poR->GetDriver(iDriver)->GetDescription());
+                fprintf(stderr, _("No parts datasource provided.\n"));
+                argParser->usage();
+                exit(1);
             }
 
-            exit(1);
-        }
+            GDALDataset *poPartsDS = GDALDataset::FromHandle(OGROpen(
+                psOptions.osSrcPartsDataSourceName.c_str(), FALSE, nullptr));
 
-        OGRLayer *poPartsLayer =
-            pszPartsLayerName == nullptr
-                ? poPartsDS->GetLayer(0)
-                : poPartsDS->GetLayerByName(pszPartsLayerName);
+            // Report failure.
+            if (poPartsDS == nullptr)
+            {
+                OGRSFDriverRegistrar *poR =
+                    OGRSFDriverRegistrar::GetRegistrar();
 
-        if (poPartsLayer == nullptr)
-        {
-            fprintf(stderr, "Get parts layer failed.\n");
-            exit(1);
-        }
-        // Do the work
-        eErr = GetCoordinates(poPartsLayer, dfPos, bDisplayProgress, bQuiet);
+                fprintf(stderr,
+                        _("FAILURE:\n"
+                          "Unable to open parts datasource `%s' with "
+                          "the following drivers.\n"),
+                        psOptions.osSrcPicketsDataSourceName.c_str());
+
+                for (int iDriver = 0; iDriver < poR->GetDriverCount();
+                     iDriver++)
+                {
+                    fprintf(stderr, "  -> %s\n",
+                            poR->GetDriver(iDriver)->GetDescription());
+                }
+
+                exit(1);
+            }
+
+            // Find the output driver.
+            if (!psOptions.bQuiet)
+                CheckDestDataSourceNameConsistency(
+                    psOptions.osOutputDataSourceName.c_str(),
+                    psOptions.osFormat.c_str());
 
-        GDALClose(poPartsDS);
-    }
-    else if (stOper == op_get_subline)
-    {
-        if (pszOutputDataSource == nullptr)
-            Usage(true, "no output datasource provided");
-        else if (pszPartsDataSource == nullptr)
-            Usage(true, "no parts datasource provided");
-        else if (dfPosBeg == -100000000.0)
-            Usage(true, "no begin position provided");
-        else if (dfPosEnd == -100000000.0)
-            Usage(true, "no end position provided");
-
-        // Open data source.
-        GDALDataset *poPartsDS = GDALDataset::FromHandle(
-            OGROpen(pszPartsDataSource, FALSE, nullptr));
-
-        // Report failure.
-        if (poPartsDS == nullptr)
-        {
             OGRSFDriverRegistrar *poR = OGRSFDriverRegistrar::GetRegistrar();
 
-            fprintf(stderr,
-                    "FAILURE:\n"
-                    "Unable to open parts datasource `%s' with "
-                    "the following drivers.\n",
-                    pszLineDataSource);
+            GDALDriver *poDriver =
+                poR->GetDriverByName(psOptions.osFormat.c_str());
+            if (poDriver == nullptr)
+            {
+                fprintf(stderr, _("Unable to find driver `%s'.\n"),
+                        psOptions.osFormat.c_str());
+                fprintf(stderr, _("The following drivers are available:\n"));
+
+                for (int iDriver = 0; iDriver < poR->GetDriverCount();
+                     iDriver++)
+                {
+                    fprintf(stderr, "  -> `%s'\n",
+                            poR->GetDriver(iDriver)->GetDescription());
+                }
+                exit(1);
+            }
 
-            for (int iDriver = 0; iDriver < poR->GetDriverCount(); iDriver++)
+            if (!CPLTestBool(CSLFetchNameValueDef(poDriver->GetMetadata(),
+                                                  GDAL_DCAP_CREATE, "FALSE")))
             {
-                fprintf(stderr, "  -> %s\n",
-                        poR->GetDriver(iDriver)->GetDescription());
+                fprintf(stderr,
+                        _("%s driver does not support data source creation.\n"),
+                        psOptions.osFormat.c_str());
+                exit(1);
             }
 
-            exit(1);
-        }
+            // Create the output data source.
 
-        // Find the output driver.
+            GDALDataset *poODS =
+                poDriver->Create(psOptions.osOutputDataSourceName.c_str(), 0, 0,
+                                 0, GDT_Unknown, psOptions.aosDSCO);
+            if (poODS == nullptr)
+            {
+                fprintf(stderr, _("%s driver failed to create %s\n"),
+                        psOptions.osFormat.c_str(),
+                        psOptions.osOutputDataSourceName.c_str());
+                exit(1);
+            }
 
-        if (!bQuiet)
-            CheckDestDataSourceNameConsistency(pszOutputDataSource, pszFormat);
+            OGRLayer *poPartsLayer =
+                psOptions.osSrcLineLayerName.empty()
+                    ? poPartsDS->GetLayer(0)
+                    : poPartsDS->GetLayerByName(
+                          psOptions.osSrcLineLayerName.c_str());
 
-        OGRSFDriverRegistrar *poR = OGRSFDriverRegistrar::GetRegistrar();
+            if (poPartsLayer == nullptr)
+            {
+                fprintf(stderr, _("Get parts layer failed.\n"));
+                exit(1);
+            }
 
-        GDALDriver *poDriver = poR->GetDriverByName(pszFormat);
-        if (poDriver == nullptr)
-        {
-            fprintf(stderr, "Unable to find driver `%s'.\n", pszFormat);
-            fprintf(stderr, "The following drivers are available:\n");
+            OGRLayer *poOutLayer =
+                SetupTargetLayer(poPartsLayer, poODS, psOptions.aosLCO,
+                                 psOptions.osOutputLayerName.c_str());
 
-            for (int iDriver = 0; iDriver < poR->GetDriverCount(); iDriver++)
+            if (poOutLayer == nullptr)
             {
-                fprintf(stderr, "  -> `%s'\n",
-                        poR->GetDriver(iDriver)->GetDescription());
+                fprintf(stderr, _("Create output layer failed.\n"));
+                exit(1);
             }
-            exit(1);
-        }
 
-        if (!CPLTestBool(CSLFetchNameValueDef(poDriver->GetMetadata(),
-                                              GDAL_DCAP_CREATE, "FALSE")))
-        {
-            fprintf(stderr,
-                    "%s driver does not support data source creation.\n",
-                    pszFormat);
-            exit(1);
-        }
+            // Do the work
 
-        // Create the output data source.
-        GDALDataset *poODS = poDriver->Create(pszOutputDataSource, 0, 0, 0,
-                                              GDT_Unknown, papszDSCO);
-        if (poODS == nullptr)
-        {
-            fprintf(stderr, "%s driver failed to create %s\n", pszFormat,
-                    pszOutputDataSource);
-            exit(1);
-        }
+            eErr = CreateSubline(poPartsLayer, psOptions.dfPosBeg,
+                                 psOptions.dfPosEnd, poOutLayer,
+                                 psOptions.bDisplayProgress, psOptions.bQuiet);
 
-        OGRLayer *poPartsLayer =
-            pszLineLayerName == nullptr
-                ? poPartsDS->GetLayer(0)
-                : poPartsDS->GetLayerByName(pszLineLayerName);
+            GDALClose(poPartsDS);
+            if (GDALClose(poODS) != CE_None)
+                eErr = CE_Failure;
 
-        if (poPartsLayer == nullptr)
-        {
-            fprintf(stderr, "Get parts layer failed.\n");
-            exit(1);
+            break;
         }
-
-        OGRLayer *poOutLayer =
-            SetupTargetLayer(poPartsLayer, poODS, papszLCO, pszOutputLayerName);
-        if (poOutLayer == nullptr)
-        {
-            fprintf(stderr, "Create output layer failed.\n");
+        default:
+            fprintf(stderr, _("Unknown operation.\n"));
+            argParser->usage();
             exit(1);
-        }
-
-        // Do the work.
-        eErr = CreateSubline(poPartsLayer, dfPosBeg, dfPosEnd, poOutLayer,
-                             bDisplayProgress, bQuiet);
-
-        GDALClose(poPartsDS);
-        if (GDALClose(poODS) != CE_None)
-            eErr = CE_Failure;
-
-        if (nullptr != pszOutputLayerName)
-            CPLFree(pszOutputLayerName);
-    }
-    else
-    {
-        Usage(true, "no operation provided");
     }
 
-    CSLDestroy(papszArgv);
-    CSLDestroy(papszDSCO);
-    CSLDestroy(papszLCO);
-
     OGRCleanupAll();
 
 #ifdef DBMALLOC
diff --git a/apps/ogrtindex.cpp b/apps/ogrtindex.cpp
index 6a24f1e8a5e6..960fef541a68 100644
--- a/apps/ogrtindex.cpp
+++ b/apps/ogrtindex.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2002, Frank Warmerdam
  * Copyright (c) 2007-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/apps/sozip.cpp b/apps/sozip.cpp
index 1381e158ba1d..79bf539972bd 100644
--- a/apps/sozip.cpp
+++ b/apps/sozip.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/apps/test_ogrsf.cpp b/apps/test_ogrsf.cpp
index 9b2edcaf3ec2..4ead11298eb2 100644
--- a/apps/test_ogrsf.cpp
+++ b/apps/test_ogrsf.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2009-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
@@ -1499,20 +1483,30 @@ static int TestLayerErrorConditions(OGRLayer *poLyr)
 static const char *GetLayerNameForSQL(GDALDataset *poDS,
                                       const char *pszLayerName)
 {
-    char ch;
-    for (int i = 0; (ch = pszLayerName[i]) != 0; i++)
-    {
-        if (ch >= '0' && ch <= '9')
-        {
-            if (i == 0)
+    /* Only quote if needed. Quoting conventions depend on the driver... */
+    if (!EQUAL(pszLayerName, "SELECT") && !EQUAL(pszLayerName, "AS") &&
+        !EQUAL(pszLayerName, "CAST") && !EQUAL(pszLayerName, "FROM") &&
+        !EQUAL(pszLayerName, "JOIN") && !EQUAL(pszLayerName, "WHERE") &&
+        !EQUAL(pszLayerName, "ON") && !EQUAL(pszLayerName, "USING") &&
+        !EQUAL(pszLayerName, "ORDER") && !EQUAL(pszLayerName, "BY") &&
+        !EQUAL(pszLayerName, "ASC") && !EQUAL(pszLayerName, "DESC") &&
+        !EQUAL(pszLayerName, "GROUP") && !EQUAL(pszLayerName, "LIMIT") &&
+        !EQUAL(pszLayerName, "OFFSET"))
+    {
+        char ch;
+        for (int i = 0; (ch = pszLayerName[i]) != 0; i++)
+        {
+            if (ch >= '0' && ch <= '9')
+            {
+                if (i == 0)
+                    break;
+            }
+            else if (!((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')))
                 break;
         }
-        else if (!((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')))
-            break;
+        if (ch == 0)
+            return pszLayerName;
     }
-    /* Only quote if needed. Quoting conventions depend on the driver... */
-    if (ch == 0)
-        return pszLayerName;
 
     if (EQUAL(poDS->GetDriverName(), "MYSQL"))
         return CPLSPrintf("`%s`", pszLayerName);
@@ -2001,7 +1995,7 @@ static int TestOGRLayerRandomWrite(OGRLayer *poLayer)
 
 {
     int bRet = TRUE;
-    OGRFeature *papoFeatures[5], *poFeature;
+    OGRFeature *papoFeatures[5];
 
     memset(papoFeatures, 0, sizeof(papoFeatures));
 
@@ -2031,7 +2025,8 @@ static int TestOGRLayerRandomWrite(OGRLayer *poLayer)
     CPLString os_Id2;
     CPLString os_Id5;
 
-    const bool bHas_Id = poLayer->GetLayerDefn()->GetFieldIndex("_id") == 0;
+    const bool bHas_Id = poLayer->GetLayerDefn()->GetFieldIndex("_id") == 0 ||
+                         poLayer->GetLayerDefn()->GetFieldIndex("id") == 0;
 
     /* -------------------------------------------------------------------- */
     /*      Fetch five features.                                            */
@@ -2086,25 +2081,27 @@ static int TestOGRLayerRandomWrite(OGRLayer *poLayer)
     /* -------------------------------------------------------------------- */
     /*      Now re-read feature 2 to verify the effect stuck.               */
     /* -------------------------------------------------------------------- */
-    poFeature = LOG_ACTION(poLayer->GetFeature(nFID5));
-    if (poFeature == nullptr)
-    {
-        bRet = FALSE;
-        printf("ERROR: Attempt to GetFeature( nFID5 ) failed.\n");
-        goto end;
-    }
-    if (!poFeature->Equal(papoFeatures[1]))
     {
-        bRet = FALSE;
-        poFeature->DumpReadable(stderr);
-        papoFeatures[1]->DumpReadable(stderr);
-        printf("ERROR: Written feature didn't seem to retain value.\n");
-    }
-    else if (bVerbose)
-    {
-        printf("INFO: Random write test passed.\n");
+        auto poFeature =
+            std::unique_ptr<OGRFeature>(LOG_ACTION(poLayer->GetFeature(nFID5)));
+        if (poFeature == nullptr)
+        {
+            bRet = FALSE;
+            printf("ERROR: Attempt to GetFeature( nFID5 ) failed.\n");
+            goto end;
+        }
+        if (!poFeature->Equal(papoFeatures[1]))
+        {
+            bRet = FALSE;
+            poFeature->DumpReadable(stderr);
+            papoFeatures[1]->DumpReadable(stderr);
+            printf("ERROR: Written feature didn't seem to retain value.\n");
+        }
+        else if (bVerbose)
+        {
+            printf("INFO: Random write test passed.\n");
+        }
     }
-    DestroyFeatureAndNullify(poFeature);
 
     /* -------------------------------------------------------------------- */
     /*      Re-invert the features to restore to original state             */
@@ -2130,6 +2127,156 @@ static int TestOGRLayerRandomWrite(OGRLayer *poLayer)
         printf("ERROR: Attempt to restore SetFeature(4) failed.\n");
     }
 
+    /* -------------------------------------------------------------------- */
+    /*      Test UpdateFeature()                                            */
+    /* -------------------------------------------------------------------- */
+
+    if (bRet)
+    {
+        int nOldVal = 0;
+        std::string osOldVal;
+        int iUpdatedFeature = -1;
+        int iUpdatedField = -1;
+        std::unique_ptr<OGRFeature> poUpdatedFeature;
+
+        for (int iFeature = 0; iUpdatedFeature < 0 && iFeature < 5; iFeature++)
+        {
+            for (int iField = 0;
+                 iField < poLayer->GetLayerDefn()->GetFieldCount(); ++iField)
+            {
+                if (papoFeatures[iFeature]->IsFieldSetAndNotNull(iField))
+                {
+                    if (poLayer->GetLayerDefn()
+                            ->GetFieldDefn(iField)
+                            ->GetType() == OFTInteger)
+                    {
+                        iUpdatedFeature = iFeature;
+                        iUpdatedField = iField;
+                        nOldVal =
+                            papoFeatures[iFeature]->GetFieldAsInteger(iField);
+                        poUpdatedFeature.reset(papoFeatures[iFeature]->Clone());
+                        poUpdatedFeature->SetField(iField, 0xBEEF);
+                        break;
+                    }
+                    else if (poLayer->GetLayerDefn()
+                                 ->GetFieldDefn(iField)
+                                 ->GetType() == OFTString)
+                    {
+                        iUpdatedFeature = iFeature;
+                        iUpdatedField = iField;
+                        osOldVal =
+                            papoFeatures[iFeature]->GetFieldAsString(iField);
+                        poUpdatedFeature.reset(papoFeatures[iFeature]->Clone());
+                        poUpdatedFeature->SetField(iField, "0xBEEF");
+                        break;
+                    }
+                }
+            }
+        }
+
+        if (poUpdatedFeature)
+        {
+            if (LOG_ACTION(poLayer->UpdateFeature(poUpdatedFeature.get(), 1,
+                                                  &iUpdatedField, 0, nullptr,
+                                                  false)) != OGRERR_NONE)
+            {
+                bRet = FALSE;
+                printf("ERROR: UpdateFeature() failed.\n");
+            }
+            if (bRet)
+            {
+                LOG_ACTION(poLayer->ResetReading());
+                for (int iFeature = 0; iFeature < 5; iFeature++)
+                {
+                    auto poFeature = std::unique_ptr<OGRFeature>(LOG_ACTION(
+                        poLayer->GetFeature(papoFeatures[iFeature]->GetFID())));
+                    if (iFeature != iUpdatedFeature)
+                    {
+                        if (!poFeature ||
+                            !poFeature->Equal(papoFeatures[iFeature]))
+                        {
+                            bRet = false;
+                            printf("ERROR: UpdateFeature() test: "
+                                   "!poFeature->Equals(papoFeatures[iFeature]) "
+                                   "unexpected.\n");
+                            if (poFeature)
+                                poFeature->DumpReadable(stdout);
+                            papoFeatures[iFeature]->DumpReadable(stdout);
+                        }
+                    }
+                }
+
+                auto poFeature =
+                    std::unique_ptr<OGRFeature>(LOG_ACTION(poLayer->GetFeature(
+                        papoFeatures[iUpdatedFeature]->GetFID())));
+                if (!poFeature)
+                {
+                    bRet = FALSE;
+                    printf("ERROR: at line %d", __LINE__);
+                    goto end;
+                }
+                if (poLayer->GetLayerDefn()
+                        ->GetFieldDefn(iUpdatedField)
+                        ->GetType() == OFTInteger)
+                {
+                    if (poFeature->GetFieldAsInteger(iUpdatedField) != 0xBEEF)
+                    {
+                        bRet = FALSE;
+                        printf("ERROR: Did not get expected field value after "
+                               "UpdateFeature().\n");
+                    }
+                    poFeature->SetField(iUpdatedField, nOldVal);
+                }
+                else if (poLayer->GetLayerDefn()
+                             ->GetFieldDefn(iUpdatedField)
+                             ->GetType() == OFTString)
+                {
+                    if (!EQUAL(poFeature->GetFieldAsString(iUpdatedField),
+                               "0xBEEF"))
+                    {
+                        bRet = FALSE;
+                        printf("ERROR: Did not get expected field value after "
+                               "UpdateFeature().\n");
+                    }
+                    poFeature->SetField(iUpdatedField, osOldVal.c_str());
+                }
+                else
+                {
+                    CPLAssert(false);
+                }
+
+                if (LOG_ACTION(poLayer->UpdateFeature(
+                        poFeature.get(), 1, &iUpdatedField, 0, nullptr,
+                        false)) != OGRERR_NONE)
+                {
+                    bRet = FALSE;
+                    printf("ERROR: UpdateFeature() failed.\n");
+                }
+
+                poFeature.reset(LOG_ACTION(poLayer->GetFeature(
+                    papoFeatures[iUpdatedFeature]->GetFID())));
+                if (!poFeature)
+                {
+                    bRet = FALSE;
+                    printf("ERROR: at line %d", __LINE__);
+                    goto end;
+                }
+                if (!poFeature->Equal(papoFeatures[iUpdatedFeature]))
+                {
+                    bRet = false;
+                    printf("ERROR: UpdateFeature() test: "
+                           "!poFeature->Equals(papoFeatures[iUpdatedFeature]) "
+                           "unexpected.\n");
+                }
+            }
+        }
+        else
+        {
+            if (bVerbose)
+                printf("INFO: Could not test UpdateFeature().\n");
+        }
+    }
+
 end:
     /* -------------------------------------------------------------------- */
     /*      Cleanup.                                                        */
@@ -2315,7 +2462,7 @@ static int TestSpatialFilter(OGRLayer *poLayer, int iGeomField)
     if (poUniquePtrFeature != nullptr)
     {
         bRet = FALSE;
-        printf("ERROR: Spatial filter (%d) failed to eliminate"
+        printf("ERROR: Spatial filter (%d) failed to eliminate "
                "a feature unexpectedly!\n",
                iGeomField);
     }
diff --git a/apps/testreprojmulti.cpp b/apps/testreprojmulti.cpp
index f90c80d35ad7..db1e67ec4e17 100644
--- a/apps/testreprojmulti.cpp
+++ b/apps/testreprojmulti.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <assert.h>
diff --git a/autotest/alg/applyverticalshiftgrid.py b/autotest/alg/applyverticalshiftgrid.py
index 8a1d36803afa..2d9cae11cc3d 100755
--- a/autotest/alg/applyverticalshiftgrid.py
+++ b/autotest/alg/applyverticalshiftgrid.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2017, Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/alg/checksum.py b/autotest/alg/checksum.py
index 8fc880ffba12..852f1519fda3 100644
--- a/autotest/alg/checksum.py
+++ b/autotest/alg/checksum.py
@@ -7,23 +7,7 @@
 ###############################################################################
 # Copyright (c) 2024, Even Rouault <even.rouault @ spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import pytest
diff --git a/autotest/alg/contour.py b/autotest/alg/contour.py
index a57a0d7875c6..ef0493f67284 100755
--- a/autotest/alg/contour.py
+++ b/autotest/alg/contour.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import struct
@@ -239,7 +223,7 @@ def test_contour_real_world_case():
         ("1,10,20,25,30", [1, 10, 20, 25], [10, 20, 25, 30]),
         ("10,20,25,30", [1, 10, 20, 25], [10, 20, 25, 30]),
         ("10,20,24", [1, 10, 20, 24], [10, 20, 24, 25]),
-        ("10,20,25", [1, 10, 20], [10, 20, 25]),
+        ("10,20,25", [1, 10, 20, 25], [10, 20, 25, 25]),
         ("0,10,20", [0, 10, 20], [10, 20, 25]),
     ],
 )
@@ -290,8 +274,12 @@ def test_contour_3(input_tif, tmp_path, fixed_levels, expected_min, expected_max
 
         i = 0
         for feat in lyr:
-            assert feat.GetField("elevMin") == expected_min[i], i
-            assert feat.GetField("elevMax") == expected_max[i], i
+            assert feat.GetField("elevMin") == pytest.approx(
+                expected_min[i], abs=precision / 2 * 1.001
+            ), i
+            assert feat.GetField("elevMax") == pytest.approx(
+                expected_max[i], abs=precision / 2 * 1.001
+            ), i
 
             envelope = feat.GetGeometryRef().GetEnvelope()
             for j in range(4):
@@ -401,3 +389,60 @@ def test_contour_raster_acquisition_error():
         gdal.ContourGenerateEx(
             ds.GetRasterBand(1), ogr_lyr, options=["LEVEL_INTERVAL=1", "ID_FIELD=0"]
         )
+
+
+###############################################################################
+
+
+def test_contour_invalid_LEVEL_INTERVAL():
+
+    ogr_ds = ogr.GetDriverByName("Memory").CreateDataSource("")
+    ogr_lyr = ogr_ds.CreateLayer("contour", geom_type=ogr.wkbLineString)
+    ds = gdal.Open("../gcore/data/byte.tif")
+
+    with pytest.raises(Exception, match="Invalid value for LEVEL_INTERVAL"):
+        gdal.ContourGenerateEx(
+            ds.GetRasterBand(1), ogr_lyr, options=["LEVEL_INTERVAL=-1"]
+        )
+
+
+###############################################################################
+# Test scenario of https://github.com/OSGeo/gdal/issues/10167
+
+
+@pytest.mark.require_driver("AAIGRID")
+def test_contour_min_value_is_multiple_of_interval(tmp_vsimem):
+
+    ogr_ds = ogr.GetDriverByName("Memory").CreateDataSource("")
+    lyr = ogr_ds.CreateLayer("contour", geom_type=ogr.wkbLineString)
+    lyr.CreateField(ogr.FieldDefn("ID", ogr.OFTInteger))
+    lyr.CreateField(ogr.FieldDefn("ELEV", ogr.OFTReal))
+
+    content = """ncols        2
+nrows        2
+xllcorner    0
+yllcorner    0
+cellsize     1
+1 3
+1 3"""
+
+    srcfilename = str(tmp_vsimem / "test.asc")
+    with gdaltest.tempfile(srcfilename, content):
+        ds = gdal.Open(srcfilename)
+        gdal.ContourGenerateEx(
+            ds.GetRasterBand(1),
+            lyr,
+            options=["LEVEL_INTERVAL=1", "ID_FIELD=0", "ELEV_FIELD=1"],
+        )
+
+    f = lyr.GetNextFeature()
+    assert f["ELEV"] == 1
+    ogrtest.check_feature_geometry(f, "LINESTRING (0.5 0.0,0.5 0.5,0.5 1.5,0.5 2.0)")
+
+    f = lyr.GetNextFeature()
+    assert f["ELEV"] == 2
+    ogrtest.check_feature_geometry(f, "LINESTRING (1.0 0.0,1.0 0.5,1.0 1.5,1.0 2.0)")
+
+    f = lyr.GetNextFeature()
+    assert f["ELEV"] == 3
+    ogrtest.check_feature_geometry(f, "LINESTRING (1.5 0.0,1.5 0.5,1.5 1.5,1.5 2.0)")
diff --git a/autotest/alg/cutline.py b/autotest/alg/cutline.py
index de27180d5e20..7187b8964803 100755
--- a/autotest/alg/cutline.py
+++ b/autotest/alg/cutline.py
@@ -11,23 +11,7 @@
 ###############################################################################
 # Copyright (c) 2008, Andrey Kiselev <dron16@ak4719.spb.edu>
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
@@ -36,6 +20,11 @@
 
 from osgeo import gdal
 
+pytestmark = pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
+
 ###############################################################################
 
 
diff --git a/autotest/alg/dither.py b/autotest/alg/dither.py
index 6be1a702bcd0..14c960e78cf9 100755
--- a/autotest/alg/dither.py
+++ b/autotest/alg/dither.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2008, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2008-2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/alg/fillnodata.py b/autotest/alg/fillnodata.py
index e6830d36dec9..801469114a8f 100755
--- a/autotest/alg/fillnodata.py
+++ b/autotest/alg/fillnodata.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2019, Even Rouault <even.rouault @ spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import array
diff --git a/autotest/alg/los.py b/autotest/alg/los.py
index 679b02b08cef..b4ae6ae66d08 100644
--- a/autotest/alg/los.py
+++ b/autotest/alg/los.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2024, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import pytest
diff --git a/autotest/alg/polygonize.py b/autotest/alg/polygonize.py
index cd2bafdeab9d..e0bee334af59 100755
--- a/autotest/alg/polygonize.py
+++ b/autotest/alg/polygonize.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2008, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
@@ -82,8 +66,6 @@ def test_polygonize_1(is_int_polygonize):
         "POLYGON ((440720 3751200,440720 3751020,440900 3751020,440900 3751200,440720 3751200),(440780 3751140,440840 3751140,440840 3751080,440780 3751080,440780 3751140))",
     )
 
-    feat_read.Destroy()
-
 
 ###############################################################################
 # Test a simple case without masking.
@@ -173,8 +155,6 @@ def test_polygonize_3():
         "POLYGON ((6 -3,6 -40,19 -40,19 -39,25 -39,25 -38,27 -38,27 -37,28 -37,28 -36,29 -36,29 -35,30 -35,30 -34,31 -34,31 -25,30 -25,30 -24,29 -24,29 -23,28 -23,28 -22,27 -22,27 -21,24 -21,24 -20,23 -20,23 -19,26 -19,26 -18,27 -18,27 -17,28 -17,28 -16,29 -16,29 -8,28 -8,28 -7,27 -7,27 -6,26 -6,26 -5,24 -5,24 -4,18 -4,18 -3,6 -3),(11 -7,23 -7,23 -8,24 -8,24 -9,25 -9,25 -16,24 -16,24 -17,23 -17,23 -18,11 -18,11 -7),(11 -22,24 -22,24 -23,26 -23,26 -25,27 -25,27 -33,26 -33,26 -35,24 -35,24 -36,11 -36,11 -22))",
     )
 
-    feat_read.Destroy()
-
 
 ###############################################################################
 # Test a simple case without masking but with 8-connectedness.
diff --git a/autotest/alg/proximity.py b/autotest/alg/proximity.py
index cfb6595ec0db..a26c94e45e06 100755
--- a/autotest/alg/proximity.py
+++ b/autotest/alg/proximity.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2008, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/alg/rasterize.py b/autotest/alg/rasterize.py
index 9fe6370de860..6d5a7c624cca 100755
--- a/autotest/alg/rasterize.py
+++ b/autotest/alg/rasterize.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2008, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import struct
@@ -853,6 +837,9 @@ def test_rasterize_merge_alg_add_polygon(wkt):
 
 
 ###############################################################################
+
+
+@pytest.mark.require_driver("GeoJSON")
 def test_rasterize_bugfix_gh6981():
 
     bad_geometry = {
diff --git a/autotest/alg/reproject.py b/autotest/alg/reproject.py
index 5df6b2e1b868..98527a04280d 100755
--- a/autotest/alg/reproject.py
+++ b/autotest/alg/reproject.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/alg/sieve.py b/autotest/alg/sieve.py
index 6407f8a3d605..069158047b28 100755
--- a/autotest/alg/sieve.py
+++ b/autotest/alg/sieve.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2008, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2009-2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
@@ -328,3 +312,31 @@ def test_sieve_8():
     if cs != cs_expected:
         print("Got: ", cs)
         pytest.fail("got wrong checksum")
+
+
+###############################################################################
+# Test source bands with all masked pixels
+
+
+def test_sieve_all_masked():
+
+    drv = gdal.GetDriverByName("MEM")
+    src_ds = drv.Create("", 10, 10, gdal.GDT_Byte)
+    src_band = src_ds.GetRasterBand(1)
+    src_band.Fill(1)
+
+    mask_ds = drv.Create("", 10, 10, gdal.GDT_Byte)
+    mask_band = mask_ds.GetRasterBand(1)
+
+    dst_ds = drv.Create("", 10, 10, gdal.GDT_Byte)
+    dst_band = dst_ds.GetRasterBand(1)
+
+    expected_cs = src_band.Checksum()
+
+    gdal.SieveFilter(src_band, mask_band, dst_band, 4, 4)
+
+    assert dst_band.Checksum() == expected_cs
+
+    gdal.SieveFilter(src_band, mask_band, src_band, 4, 4)
+
+    assert src_band.Checksum() == expected_cs
diff --git a/autotest/alg/transformgeoloc.py b/autotest/alg/transformgeoloc.py
index d4fcef36c84b..c8035ddfe16b 100755
--- a/autotest/alg/transformgeoloc.py
+++ b/autotest/alg/transformgeoloc.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2012, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/alg/warp.py b/autotest/alg/warp.py
index dddb53dba544..9ba6992a0d4d 100755
--- a/autotest/alg/warp.py
+++ b/autotest/alg/warp.py
@@ -13,23 +13,7 @@
 # Copyright (c) 2008, Andrey Kiselev <dron16@ak4719.spb.edu>
 # Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import math
@@ -40,6 +24,11 @@
 import gdaltest
 import pytest
 
+pytestmark = pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
+
 from osgeo import gdal, osr
 
 ###############################################################################
@@ -1409,7 +1398,7 @@ def test_warp_52():
     assert end - start <= 10, "processing time was way too long"
 
     cs = out_ds.GetRasterBand(4).Checksum()
-    assert cs == 3188
+    assert cs == 3177
 
 
 ###############################################################################
diff --git a/autotest/benchmark/conftest.py b/autotest/benchmark/conftest.py
index 31300d39a57c..9a95f2d2ebfb 100755
--- a/autotest/benchmark/conftest.py
+++ b/autotest/benchmark/conftest.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/benchmark/test_gdalwarp.py b/autotest/benchmark/test_gdalwarp.py
index ba412e6c40fd..4b86fed8b1c2 100755
--- a/autotest/benchmark/test_gdalwarp.py
+++ b/autotest/benchmark/test_gdalwarp.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/benchmark/test_gtiff.py b/autotest/benchmark/test_gtiff.py
index 920ee658bfad..7eeb1ad96d0f 100755
--- a/autotest/benchmark/test_gtiff.py
+++ b/autotest/benchmark/test_gtiff.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import array
diff --git a/autotest/benchmark/test_ogr2ogr.py b/autotest/benchmark/test_ogr2ogr.py
index f7f3e2af4c5e..c221855c73ca 100755
--- a/autotest/benchmark/test_ogr2ogr.py
+++ b/autotest/benchmark/test_ogr2ogr.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import pytest
diff --git a/autotest/benchmark/test_ogr_gpkg.py b/autotest/benchmark/test_ogr_gpkg.py
index fa51060b8137..8e347e245dcb 100755
--- a/autotest/benchmark/test_ogr_gpkg.py
+++ b/autotest/benchmark/test_ogr_gpkg.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import pytest
diff --git a/autotest/cpp/CMakeLists.txt b/autotest/cpp/CMakeLists.txt
index ffffc1b3d3f7..74f10ca99290 100644
--- a/autotest/cpp/CMakeLists.txt
+++ b/autotest/cpp/CMakeLists.txt
@@ -95,14 +95,14 @@ add_executable(
   test_marching_squares_contour.cpp
   test_marching_squares_polygon.cpp
   test_marching_squares_square.cpp
-  test_marching_squares_tile.cpp)
+  test_marching_squares_tile.cpp
+  test_viewshed.cpp)
 
 target_link_libraries(gdal_unit_test PRIVATE gtest_for_gdal)
 target_link_libraries(gdal_unit_test PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}>)
 if(NOT MSVC AND CMAKE_THREAD_LIBS_INIT)
     target_link_libraries(gdal_unit_test PRIVATE ${CMAKE_THREAD_LIBS_INIT})
 endif()
-add_dependencies(gdal_unit_test ${GDAL_LIB_TARGET_NAME} gdal_plugins)
 gdal_standard_includes(gdal_unit_test)
 target_compile_options(gdal_unit_test PRIVATE ${GDAL_CXX_WARNING_FLAGS})
 target_compile_definitions(gdal_unit_test PRIVATE -DGDAL_TEST_ROOT_DIR="${GDAL_ROOT_TEST_DIR}")
@@ -170,6 +170,9 @@ macro (register_test _test_name _binary_name)
 endmacro ()
 
 register_test(test-unit gdal_unit_test)
+if (NOT CMAKE_CROSSCOMPILING OR CMAKE_CROSSCOMPILING_EMULATOR)
+    add_dependencies(test-unit ${GDAL_LIB_TARGET_NAME} gdal_plugins)
+endif()
 
 include(GdalTestTarget)
 
diff --git a/autotest/cpp/bug1488.cpp b/autotest/cpp/bug1488.cpp
index ad809d23f034..704e5025dfac 100644
--- a/autotest/cpp/bug1488.cpp
+++ b/autotest/cpp/bug1488.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2019, Even Rouault <even dot rouault at spatialys dot com>
  * Copyright (c) 2019, Thomas Bonfort <thomas.bonfort at 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal.h"
diff --git a/autotest/cpp/gdal_unit_test.cpp b/autotest/cpp/gdal_unit_test.cpp
index d5d4ebe04d5f..08294cc0b3dd 100644
--- a/autotest/cpp/gdal_unit_test.cpp
+++ b/autotest/cpp/gdal_unit_test.cpp
@@ -7,23 +7,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright (c) 2006, Mateusz Loskot <mateusz@loskot.net>
 /*
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifdef _MSC_VER
@@ -106,25 +90,35 @@ CheckEqualGeometries(OGRGeometryH lhs, OGRGeometryH rhs, double tolerance)
     {
         std::unique_ptr<OGRGeometry> lhs_normalized_cpp;
         std::unique_ptr<OGRGeometry> rhs_normalized_cpp;
-        if (EQUAL(OGR_G_GetGeometryName(lhs), "LINEARRING"))
+        OGRGeometryH lhs_normalized;
+        OGRGeometryH rhs_normalized;
+        if (OGRGeometryFactory::haveGEOS())
         {
-            // Normalize() doesn't work with LinearRing
-            OGRLineString lhs_as_ls(
-                *OGRGeometry::FromHandle(lhs)->toLineString());
-            lhs_normalized_cpp.reset(lhs_as_ls.Normalize());
-            OGRLineString rhs_as_ls(
-                *OGRGeometry::FromHandle(rhs)->toLineString());
-            rhs_normalized_cpp.reset(rhs_as_ls.Normalize());
+            if (EQUAL(OGR_G_GetGeometryName(lhs), "LINEARRING"))
+            {
+                // Normalize() doesn't work with LinearRing
+                OGRLineString lhs_as_ls(
+                    *OGRGeometry::FromHandle(lhs)->toLineString());
+                lhs_normalized_cpp.reset(lhs_as_ls.Normalize());
+                OGRLineString rhs_as_ls(
+                    *OGRGeometry::FromHandle(rhs)->toLineString());
+                rhs_normalized_cpp.reset(rhs_as_ls.Normalize());
+            }
+            else
+            {
+                lhs_normalized_cpp.reset(
+                    OGRGeometry::FromHandle(OGR_G_Normalize(lhs)));
+                rhs_normalized_cpp.reset(
+                    OGRGeometry::FromHandle(OGR_G_Normalize(rhs)));
+            }
+            lhs_normalized = OGRGeometry::ToHandle(lhs_normalized_cpp.get());
+            rhs_normalized = OGRGeometry::ToHandle(rhs_normalized_cpp.get());
         }
         else
         {
-            lhs_normalized_cpp.reset(
-                OGRGeometry::FromHandle(OGR_G_Normalize(lhs)));
-            rhs_normalized_cpp.reset(
-                OGRGeometry::FromHandle(OGR_G_Normalize(rhs)));
+            lhs_normalized = lhs;
+            rhs_normalized = rhs;
         }
-        auto lhs_normalized = OGRGeometry::ToHandle(lhs_normalized_cpp.get());
-        auto rhs_normalized = OGRGeometry::ToHandle(rhs_normalized_cpp.get());
 
         // Test geometry points
         const std::size_t csize = 3;
diff --git a/autotest/cpp/gdal_unit_test.h b/autotest/cpp/gdal_unit_test.h
index 5cb5eb590bf2..614249d08ca1 100644
--- a/autotest/cpp/gdal_unit_test.h
+++ b/autotest/cpp/gdal_unit_test.h
@@ -7,23 +7,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright (c) 2006, Mateusz Loskot <mateusz@loskot.net>
 /*
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_COMMON_H_INCLUDED
diff --git a/autotest/cpp/gdallimits.c b/autotest/cpp/gdallimits.c
index 7d0aefbd0938..914ea2a8aa3e 100644
--- a/autotest/cpp/gdallimits.c
+++ b/autotest/cpp/gdallimits.c
@@ -7,23 +7,7 @@
  **********************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_multiproc.h"
diff --git a/autotest/cpp/gtest_include.h b/autotest/cpp/gtest_include.h
index d3088feb05f2..2ba176edbdbe 100644
--- a/autotest/cpp/gtest_include.h
+++ b/autotest/cpp/gtest_include.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 // Disable all warnings for gtest.h, so as to be able to still use them for
diff --git a/autotest/cpp/main_gtest.cpp b/autotest/cpp/main_gtest.cpp
index 24d712e24faf..2948b1d0b049 100644
--- a/autotest/cpp/main_gtest.cpp
+++ b/autotest/cpp/main_gtest.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 222, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <locale>
diff --git a/autotest/cpp/test_alg.cpp b/autotest/cpp/test_alg.cpp
index d8c5d64a4b44..b3fa1706d580 100644
--- a/autotest/cpp/test_alg.cpp
+++ b/autotest/cpp/test_alg.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <array>
@@ -151,6 +135,37 @@ TEST_F(test_alg, GDALWarpResolveWorkingDataType_padfSrcNoDataReal)
     GDALDestroyWarpOptions(psOptions);
 }
 
+// GDALWarpResolveWorkingDataType: effect of padfSrcNoDataReal
+TEST_F(test_alg, GDALWarpResolveWorkingDataType_padfSrcNoDataReal_with_band)
+{
+    GDALDatasetUniquePtr poDS(GDALDriver::FromHandle(GDALGetDriverByName("MEM"))
+                                  ->Create("", 1, 1, 1, GDT_Byte, nullptr));
+    GDALWarpOptions *psOptions = GDALCreateWarpOptions();
+    // False-positive: hSrcDS is no longer used after GDALDestroyWarpOptions()
+    // coverity[escape]
+    psOptions->hSrcDS = GDALDataset::ToHandle(poDS.get());
+    psOptions->nBandCount = 1;
+    psOptions->panSrcBands =
+        static_cast<int *>(CPLMalloc(psOptions->nBandCount * sizeof(int)));
+    psOptions->panSrcBands[0] = 1;
+    psOptions->padfSrcNoDataReal =
+        static_cast<double *>(CPLMalloc(sizeof(double)));
+    psOptions->padfSrcNoDataReal[0] = 0.0;
+    GDALWarpResolveWorkingDataType(psOptions);
+    EXPECT_EQ(psOptions->eWorkingDataType, GDT_Byte);
+
+    psOptions->padfSrcNoDataReal[0] = -1.0;
+    GDALWarpResolveWorkingDataType(psOptions);
+    EXPECT_EQ(psOptions->eWorkingDataType, GDT_Byte);
+
+    psOptions->eWorkingDataType = GDT_Unknown;
+    psOptions->padfSrcNoDataReal[0] = 2.0;
+    GDALWarpResolveWorkingDataType(psOptions);
+    EXPECT_EQ(psOptions->eWorkingDataType, GDT_Byte);
+
+    GDALDestroyWarpOptions(psOptions);
+}
+
 // GDALWarpResolveWorkingDataType: effect of padfSrcNoDataImag
 TEST_F(test_alg, GDALWarpResolveWorkingDataType_padfSrcNoDataImag)
 {
diff --git a/autotest/cpp/test_c_include_from_cpp_file.cpp b/autotest/cpp/test_c_include_from_cpp_file.cpp
index 9aac400ad298..30ddf7fe408f 100644
--- a/autotest/cpp/test_c_include_from_cpp_file.cpp
+++ b/autotest/cpp/test_c_include_from_cpp_file.cpp
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2017, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 extern "C"
diff --git a/autotest/cpp/test_cpl.cpp b/autotest/cpp/test_cpl.cpp
index 98117591073a..90e2c33445ad 100644
--- a/autotest/cpp/test_cpl.cpp
+++ b/autotest/cpp/test_cpl.cpp
@@ -10,23 +10,7 @@
 // Copyright (c) 2017, Dmitry Baryshnikov <polimax@mail.ru>
 // Copyright (c) 2017, NextGIS <info@nextgis.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_COMPILATION
@@ -52,6 +36,7 @@
 #include "cpl_auto_close.h"
 #include "cpl_minixml.h"
 #include "cpl_quad_tree.h"
+#include "cpl_spawn.h"
 #include "cpl_worker_thread_pool.h"
 #include "cpl_vsi_virtual.h"
 #include "cpl_threadsafe_queue.hpp"
@@ -163,7 +148,7 @@ typedef struct
 // Test CPLGetValueType
 TEST_F(test_cpl, CPLGetValueType)
 {
-    TestStringStruct apszTestStrings[] = {
+    TestStringStruct asTestStrings[] = {
         {"+25.e+3", CPL_VALUE_REAL},   {"-25.e-3", CPL_VALUE_REAL},
         {"25.e3", CPL_VALUE_REAL},     {"25e3", CPL_VALUE_REAL},
         {" 25e3 ", CPL_VALUE_REAL},    {".1e3", CPL_VALUE_REAL},
@@ -176,15 +161,16 @@ TEST_F(test_cpl, CPLGetValueType)
         {"25.25.3", CPL_VALUE_STRING}, {"25e25e3", CPL_VALUE_STRING},
         {"25e2500", CPL_VALUE_STRING}, /* #6128 */
 
-        {"d1", CPL_VALUE_STRING} /* #6305 */
+        {"d1", CPL_VALUE_STRING}, /* #6305 */
+
+        {"01", CPL_VALUE_STRING},      {"0.1", CPL_VALUE_REAL},
+        {"0", CPL_VALUE_INTEGER},
     };
 
-    size_t i;
-    for (i = 0; i < sizeof(apszTestStrings) / sizeof(apszTestStrings[0]); i++)
+    for (const auto &sText : asTestStrings)
     {
-        EXPECT_EQ(CPLGetValueType(apszTestStrings[i].testString),
-                  apszTestStrings[i].expectedResult)
-            << apszTestStrings[i].testString;
+        EXPECT_EQ(CPLGetValueType(sText.testString), sText.expectedResult)
+            << sText.testString;
     }
 }
 
@@ -1062,6 +1048,25 @@ TEST_F(test_cpl, CPLFormFilename)
     EXPECT_TRUE(
         EQUAL(CPLFormFilename("\\\\$\\c:", "..", nullptr), "\\\\$\\c:/..") ||
         EQUAL(CPLFormFilename("\\\\$\\c:", "..", nullptr), "\\\\$\\c:\\.."));
+    EXPECT_STREQ(
+        CPLFormFilename("/vsicurl/http://example.com?foo", "bar", nullptr),
+        "/vsicurl/http://example.com/bar?foo");
+}
+
+TEST_F(test_cpl, CPLGetPath)
+{
+    EXPECT_STREQ(CPLGetPath("/foo/bar/"), "/foo/bar");
+    EXPECT_STREQ(CPLGetPath("/foo/bar"), "/foo");
+    EXPECT_STREQ(CPLGetPath("/vsicurl/http://example.com/foo/bar?suffix"),
+                 "/vsicurl/http://example.com/foo?suffix");
+}
+
+TEST_F(test_cpl, CPLGetDirname)
+{
+    EXPECT_STREQ(CPLGetDirname("/foo/bar/"), "/foo/bar");
+    EXPECT_STREQ(CPLGetDirname("/foo/bar"), "/foo");
+    EXPECT_STREQ(CPLGetDirname("/vsicurl/http://example.com/foo/bar?suffix"),
+                 "/vsicurl/http://example.com/foo?suffix");
 }
 
 TEST_F(test_cpl, VSIGetDiskFreeSpace)
@@ -1740,6 +1745,68 @@ TEST_F(test_cpl, CPLParseRFC822DateTime)
                                         &weekday));
 }
 
+// Test CPLParseMemorySize()
+TEST_F(test_cpl, CPLParseMemorySize)
+{
+    GIntBig nValue;
+    bool bUnitSpecified;
+    CPLErr result;
+
+    result = CPLParseMemorySize("327mb", &nValue, &bUnitSpecified);
+    EXPECT_EQ(result, CE_None);
+    EXPECT_EQ(nValue, 327 * 1024 * 1024);
+    EXPECT_TRUE(bUnitSpecified);
+
+    result = CPLParseMemorySize("327MB", &nValue, &bUnitSpecified);
+    EXPECT_EQ(result, CE_None);
+    EXPECT_EQ(nValue, 327 * 1024 * 1024);
+    EXPECT_TRUE(bUnitSpecified);
+
+    result = CPLParseMemorySize("102.9K", &nValue, &bUnitSpecified);
+    EXPECT_EQ(result, CE_None);
+    EXPECT_EQ(nValue, static_cast<GIntBig>(102.9 * 1024));
+    EXPECT_TRUE(bUnitSpecified);
+
+    result = CPLParseMemorySize("102.9 kB", &nValue, &bUnitSpecified);
+    EXPECT_EQ(result, CE_None);
+    EXPECT_EQ(nValue, static_cast<GIntBig>(102.9 * 1024));
+    EXPECT_TRUE(bUnitSpecified);
+
+    result = CPLParseMemorySize("100%", &nValue, &bUnitSpecified);
+    EXPECT_EQ(result, CE_None);
+    EXPECT_GT(nValue, 100 * 1024 * 1024);
+    EXPECT_TRUE(bUnitSpecified);
+
+    result = CPLParseMemorySize("  802  ", &nValue, &bUnitSpecified);
+    EXPECT_EQ(result, CE_None);
+    EXPECT_EQ(nValue, 802);
+    EXPECT_FALSE(bUnitSpecified);
+
+    result = CPLParseMemorySize("110%", &nValue, &bUnitSpecified);
+    EXPECT_EQ(result, CE_Failure);
+
+    result = CPLParseMemorySize("8kbit", &nValue, &bUnitSpecified);
+    EXPECT_EQ(result, CE_Failure);
+
+    result = CPLParseMemorySize("8ZB", &nValue, &bUnitSpecified);
+    EXPECT_EQ(result, CE_Failure);
+
+    result = CPLParseMemorySize("8Z", &nValue, &bUnitSpecified);
+    EXPECT_EQ(result, CE_Failure);
+
+    result = CPLParseMemorySize("", &nValue, &bUnitSpecified);
+    EXPECT_EQ(result, CE_Failure);
+
+    result = CPLParseMemorySize("  ", &nValue, &bUnitSpecified);
+    EXPECT_EQ(result, CE_Failure);
+
+    result = CPLParseMemorySize("-100MB", &nValue, &bUnitSpecified);
+    EXPECT_EQ(result, CE_Failure);
+
+    result = CPLParseMemorySize("nan", &nValue, &bUnitSpecified);
+    EXPECT_EQ(result, CE_Failure);
+}
+
 // Test CPLCopyTree()
 TEST_F(test_cpl, CPLCopyTree)
 {
@@ -2826,22 +2893,23 @@ TEST_F(test_cpl, CPLJSONDocument)
 }
 
 // Test CPLRecodeIconv() with re-allocation
+// (this test also passed on Windows using its native recoding API)
 TEST_F(test_cpl, CPLRecodeIconv)
 {
-#ifdef CPL_RECODE_ICONV
+#if defined(CPL_RECODE_ICONV) || defined(_WIN32)
     int N = 32800;
     char *pszIn = static_cast<char *>(CPLMalloc(N + 1));
     for (int i = 0; i < N; i++)
-        pszIn[i] = '\xE9';
+        pszIn[i] = '\xA1';
     pszIn[N] = 0;
     char *pszExpected = static_cast<char *>(CPLMalloc(N * 2 + 1));
     for (int i = 0; i < N; i++)
     {
-        pszExpected[2 * i] = '\xC3';
-        pszExpected[2 * i + 1] = '\xA9';
+        pszExpected[2 * i] = '\xD0';
+        pszExpected[2 * i + 1] = '\x81';
     }
     pszExpected[N * 2] = 0;
-    char *pszRet = CPLRecode(pszIn, "ISO-8859-2", CPL_ENC_UTF8);
+    char *pszRet = CPLRecode(pszIn, "ISO-8859-5", CPL_ENC_UTF8);
     EXPECT_EQ(memcmp(pszExpected, pszRet, N * 2 + 1), 0);
     CPLFree(pszIn);
     CPLFree(pszRet);
@@ -2851,6 +2919,50 @@ TEST_F(test_cpl, CPLRecodeIconv)
 #endif
 }
 
+// Test CP1252 to UTF-8
+TEST_F(test_cpl, CPLRecodeStubCP1252_to_UTF8_strict_alloc)
+{
+    CPLClearRecodeWarningFlags();
+    CPLErrorReset();
+    CPLPushErrorHandler(CPLQuietErrorHandler);
+    // Euro character expands to 3-bytes
+    char *pszRet = CPLRecode("\x80", "CP1252", CPL_ENC_UTF8);
+    CPLPopErrorHandler();
+    EXPECT_STREQ(CPLGetLastErrorMsg(), "");
+    EXPECT_EQ(memcmp(pszRet, "\xE2\x82\xAC\x00", 4), 0);
+    CPLFree(pszRet);
+}
+
+// Test CP1252 to UTF-8
+TEST_F(test_cpl, CPLRecodeStubCP1252_to_UTF8_with_ascii)
+{
+    CPLClearRecodeWarningFlags();
+    CPLErrorReset();
+    CPLPushErrorHandler(CPLQuietErrorHandler);
+    char *pszRet = CPLRecode("x\x80y", "CP1252", CPL_ENC_UTF8);
+    CPLPopErrorHandler();
+    EXPECT_STREQ(CPLGetLastErrorMsg(), "");
+    EXPECT_EQ(memcmp(pszRet, "x\xE2\x82\xACy\x00", 6), 0);
+    CPLFree(pszRet);
+}
+
+// Test CP1252 to UTF-8
+TEST_F(test_cpl, CPLRecodeStubCP1252_to_UTF8_with_warning)
+{
+    CPLClearRecodeWarningFlags();
+    CPLErrorReset();
+    CPLPushErrorHandler(CPLQuietErrorHandler);
+    // \x90 is an invalid CP1252 character. Will be skipped
+    char *pszRet = CPLRecode("\x90\x80", "CP1252", CPL_ENC_UTF8);
+    CPLPopErrorHandler();
+    EXPECT_STREQ(
+        CPLGetLastErrorMsg(),
+        "One or several characters couldn't be converted correctly from CP1252 "
+        "to UTF-8. This warning will not be emitted anymore");
+    EXPECT_EQ(memcmp(pszRet, "\xE2\x82\xAC\x00", 4), 0);
+    CPLFree(pszRet);
+}
+
 // Test CPLHTTPParseMultipartMime()
 TEST_F(test_cpl, CPLHTTPParseMultipartMime)
 {
@@ -5242,4 +5354,218 @@ TEST_F(test_cpl, CPLUTF8ForceToASCII)
     }
 }
 
+#ifndef _WIN32
+TEST_F(test_cpl, CPLSpawn)
+{
+    VSIStatBufL sStatBuf;
+    if (VSIStatL("/bin/true", &sStatBuf) == 0)
+    {
+        const char *const apszArgs[] = {"/bin/true", nullptr};
+        EXPECT_EQ(CPLSpawn(apszArgs, nullptr, nullptr, false), 0);
+    }
+    if (VSIStatL("/bin/false", &sStatBuf) == 0)
+    {
+        const char *const apszArgs[] = {"/bin/false", nullptr};
+        EXPECT_EQ(CPLSpawn(apszArgs, nullptr, nullptr, false), 1);
+    }
+
+    {
+        const char *const apszArgs[] = {"/i_do/not/exist", nullptr};
+        CPLPushErrorHandler(CPLQuietErrorHandler);
+        EXPECT_EQ(CPLSpawn(apszArgs, nullptr, nullptr, false), -1);
+        CPLPopErrorHandler();
+    }
+}
+#endif
+
+static bool ENDS_WITH(const char *pszStr, const char *pszEnd)
+{
+    return strlen(pszStr) >= strlen(pszEnd) &&
+           strcmp(pszStr + strlen(pszStr) - strlen(pszEnd), pszEnd) == 0;
+}
+
+TEST_F(test_cpl, VSIMemGenerateHiddenFilename)
+{
+    {
+        // Initial cleanup
+        VSIRmdirRecursive("/vsimem/");
+        VSIRmdirRecursive("/vsimem/.#!HIDDEN!#.");
+
+        // Generate unlisted filename
+        const std::string osFilename1 = VSIMemGenerateHiddenFilename(nullptr);
+        const char *pszFilename1 = osFilename1.c_str();
+        EXPECT_TRUE(STARTS_WITH(pszFilename1, "/vsimem/.#!HIDDEN!#./"));
+        EXPECT_TRUE(ENDS_WITH(pszFilename1, "/unnamed"));
+
+        {
+            // Check the file doesn't exist yet
+            VSIStatBufL sStat;
+            EXPECT_EQ(VSIStatL(pszFilename1, &sStat), -1);
+        }
+
+        // Create the file with some content
+        GByte abyDummyData[1] = {0};
+        VSIFCloseL(VSIFileFromMemBuffer(pszFilename1, abyDummyData,
+                                        sizeof(abyDummyData), false));
+
+        {
+            // Check the file exists now
+            VSIStatBufL sStat;
+            EXPECT_EQ(VSIStatL(pszFilename1, &sStat), 0);
+        }
+
+        // Gets back content
+        EXPECT_EQ(VSIGetMemFileBuffer(pszFilename1, nullptr, false),
+                  abyDummyData);
+
+        {
+            // Check the hidden file doesn't popup
+            const CPLStringList aosFiles(VSIReadDir("/vsimem/"));
+            EXPECT_EQ(aosFiles.size(), 0);
+        }
+
+        {
+            // Check that we can list the below directory if we know it exists
+            // and there's just one subdir
+            const CPLStringList aosFiles(VSIReadDir("/vsimem/.#!HIDDEN!#."));
+            EXPECT_EQ(aosFiles.size(), 1);
+        }
+
+        {
+            // but that it is not an explicit directory
+            VSIStatBufL sStat;
+            EXPECT_EQ(VSIStatL("/vsimem/.#!HIDDEN!#.", &sStat), -1);
+        }
+
+        // Creates second file
+        const std::string osFilename2 = VSIMemGenerateHiddenFilename(nullptr);
+        const char *pszFilename2 = osFilename2.c_str();
+        EXPECT_TRUE(strcmp(pszFilename1, pszFilename2) != 0);
+
+        // Create it
+        VSIFCloseL(VSIFileFromMemBuffer(pszFilename2, abyDummyData,
+                                        sizeof(abyDummyData), false));
+
+        {
+            // Check that we can list the root hidden dir if we know it exists
+            const CPLStringList aosFiles(VSIReadDir("/vsimem/.#!HIDDEN!#."));
+            EXPECT_EQ(aosFiles.size(), 2);
+        }
+
+        {
+            // Create an explicit subdirectory in a hidden directory
+            const std::string osBaseName =
+                VSIMemGenerateHiddenFilename(nullptr);
+            const std::string osSubDir =
+                CPLFormFilename(osBaseName.c_str(), "mysubdir", nullptr);
+            EXPECT_EQ(VSIMkdir(osSubDir.c_str(), 0), 0);
+
+            // Check the subdirectory exists
+            {
+                VSIStatBufL sStat;
+                EXPECT_EQ(VSIStatL(osSubDir.c_str(), &sStat), 0);
+            }
+
+            // but not its hidden parent
+            {
+                VSIStatBufL sStat;
+                EXPECT_EQ(VSIStatL(osBaseName.c_str(), &sStat), -1);
+            }
+
+            // Create file within the subdirectory
+            VSIFCloseL(VSIFileFromMemBuffer(
+                CPLFormFilename(osSubDir.c_str(), "my.bin", nullptr),
+                abyDummyData, sizeof(abyDummyData), false));
+
+            {
+                // Check that we can list the subdirectory
+                const CPLStringList aosFiles(VSIReadDir(osSubDir.c_str()));
+                EXPECT_EQ(aosFiles.size(), 1);
+            }
+
+            {
+                // Check that we can list the root hidden dir if we know it exists
+                const CPLStringList aosFiles(
+                    VSIReadDir("/vsimem/.#!HIDDEN!#."));
+                EXPECT_EQ(aosFiles.size(), 3);
+            }
+        }
+
+        // Directly create a directory with the return of VSIMemGenerateHiddenFilename()
+        {
+            const std::string osDirname = VSIMemGenerateHiddenFilename(nullptr);
+            EXPECT_EQ(VSIMkdir(osDirname.c_str(), 0), 0);
+
+            // Check the subdirectory exists
+            {
+                VSIStatBufL sStat;
+                EXPECT_EQ(VSIStatL(osDirname.c_str(), &sStat), 0);
+            }
+
+            // Create file within the subdirectory
+            VSIFCloseL(VSIFileFromMemBuffer(
+                CPLFormFilename(osDirname.c_str(), "my.bin", nullptr),
+                abyDummyData, sizeof(abyDummyData), false));
+
+            {
+                // Check there's a file in this subdirectory
+                const CPLStringList aosFiles(VSIReadDir(osDirname.c_str()));
+                EXPECT_EQ(aosFiles.size(), 1);
+            }
+
+            EXPECT_EQ(VSIRmdirRecursive(osDirname.c_str()), 0);
+
+            {
+                // Check there's no longer any file in this subdirectory
+                const CPLStringList aosFiles(VSIReadDir(osDirname.c_str()));
+                EXPECT_EQ(aosFiles.size(), 0);
+            }
+
+            {
+                // Check that it no longer exists
+                VSIStatBufL sStat;
+                EXPECT_EQ(VSIStatL(osDirname.c_str(), &sStat), -1);
+            }
+        }
+
+        // Check that operations on "/vsimem/" do not interfere with hidden files
+        {
+            // Create regular file
+            VSIFCloseL(VSIFileFromMemBuffer("/vsimem/regular_file",
+                                            abyDummyData, sizeof(abyDummyData),
+                                            false));
+
+            // Check it is visible
+            EXPECT_EQ(CPLStringList(VSIReadDir("/vsimem/")).size(), 1);
+
+            // Clean root /vsimem/
+            VSIRmdirRecursive("/vsimem/");
+
+            // No more user files
+            EXPECT_TRUE(CPLStringList(VSIReadDir("/vsimem/")).empty());
+
+            // But still hidden files
+            EXPECT_TRUE(
+                !CPLStringList(VSIReadDir("/vsimem/.#!HIDDEN!#.")).empty());
+        }
+
+        // Clean-up hidden files
+        EXPECT_EQ(VSIRmdirRecursive("/vsimem/.#!HIDDEN!#."), 0);
+
+        {
+            // Check the root hidden dir is empty
+            const CPLStringList aosFiles(VSIReadDir("/vsimem/.#!HIDDEN!#."));
+            EXPECT_TRUE(aosFiles.empty());
+        }
+
+        EXPECT_EQ(VSIRmdirRecursive("/vsimem/.#!HIDDEN!#."), 0);
+    }
+
+    {
+        const std::string osFilename = VSIMemGenerateHiddenFilename("foo.bar");
+        const char *pszFilename = osFilename.c_str();
+        EXPECT_TRUE(STARTS_WITH(pszFilename, "/vsimem/.#!HIDDEN!#./"));
+        EXPECT_TRUE(ENDS_WITH(pszFilename, "/foo.bar"));
+    }
+}
 }  // namespace
diff --git a/autotest/cpp/test_data.h b/autotest/cpp/test_data.h
index 679b3553f26d..8ef6fa2cc64b 100644
--- a/autotest/cpp/test_data.h
+++ b/autotest/cpp/test_data.h
@@ -7,23 +7,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright (c) 2017, Hiroshi Miura
 /*
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_TEST_DATA_H
diff --git a/autotest/cpp/test_deferred_plugin.cpp b/autotest/cpp/test_deferred_plugin.cpp
index 70c0a457ce36..d9f83f0be95a 100644
--- a/autotest/cpp/test_deferred_plugin.cpp
+++ b/autotest/cpp/test_deferred_plugin.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_priv.h"
diff --git a/autotest/cpp/test_gdal.cpp b/autotest/cpp/test_gdal.cpp
index 30d217d8e7f5..45ebfb4ab870 100644
--- a/autotest/cpp/test_gdal.cpp
+++ b/autotest/cpp/test_gdal.cpp
@@ -7,23 +7,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright (c) 2006, Mateusz Loskot <mateusz@loskot.net>
 /*
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_unit_test.h"
@@ -260,12 +244,74 @@ TEST_F(test_gdal, GDALDataTypeUnion_special_cases)
                                false /* complex */),
               GDT_Int64);
 
-    EXPECT_EQ(GDALDataTypeUnionWithValue(GDT_Byte, -128, 0), GDT_Int16);
-    EXPECT_EQ(GDALDataTypeUnionWithValue(GDT_Byte, -32768, 0), GDT_Int16);
-    EXPECT_EQ(GDALDataTypeUnionWithValue(GDT_Byte, -32769, 0), GDT_Int32);
-    EXPECT_EQ(GDALDataTypeUnionWithValue(GDT_Float32, -99999, 0), GDT_Float32);
-    EXPECT_EQ(GDALDataTypeUnionWithValue(GDT_Float32, -99999.9876, 0),
+    EXPECT_EQ(GDALDataTypeUnionWithValue(GDT_Byte, -128, false), GDT_Int16);
+    EXPECT_EQ(GDALDataTypeUnionWithValue(GDT_Byte, -32768, false), GDT_Int16);
+    EXPECT_EQ(GDALDataTypeUnionWithValue(GDT_Byte, -32769, false), GDT_Int32);
+
+    EXPECT_EQ(GDALDataTypeUnionWithValue(GDT_Int8, 127, false), GDT_Int8);
+    EXPECT_EQ(GDALDataTypeUnionWithValue(GDT_Int8, 128, false), GDT_Int16);
+
+    EXPECT_EQ(GDALDataTypeUnionWithValue(GDT_Int16, 32767, false), GDT_Int16);
+    EXPECT_EQ(GDALDataTypeUnionWithValue(GDT_Int16, 32768, false), GDT_Int32);
+
+    EXPECT_EQ(GDALDataTypeUnionWithValue(GDT_UInt16, 65535, false), GDT_UInt16);
+    EXPECT_EQ(GDALDataTypeUnionWithValue(GDT_UInt16, 65536, false), GDT_UInt32);
+
+    EXPECT_EQ(GDALDataTypeUnionWithValue(GDT_Int32, INT32_MAX, false),
+              GDT_Int32);
+    EXPECT_EQ(GDALDataTypeUnionWithValue(GDT_Int32, INT32_MAX + 1.0, false),
+              GDT_Int64);
+
+    EXPECT_EQ(GDALDataTypeUnionWithValue(GDT_UInt32, UINT32_MAX, false),
+              GDT_UInt32);
+    EXPECT_EQ(GDALDataTypeUnionWithValue(GDT_UInt32, UINT32_MAX + 1.0, false),
+              GDT_UInt64);
+
+    // (1 << 63) - 1024
+    EXPECT_EQ(
+        GDALDataTypeUnionWithValue(GDT_Int64, 9223372036854774784.0, false),
+        GDT_Int64);
+    // (1 << 63) - 512
+    EXPECT_EQ(
+        GDALDataTypeUnionWithValue(GDT_Int64, 9223372036854775296.0, false),
+        GDT_Float64);
+
+    // (1 << 64) - 2048
+    EXPECT_EQ(
+        GDALDataTypeUnionWithValue(GDT_UInt64, 18446744073709549568.0, false),
+        GDT_UInt64);
+    // (1 << 64) + 4096
+    EXPECT_EQ(
+        GDALDataTypeUnionWithValue(GDT_UInt64, 18446744073709555712.0, false),
+        GDT_Float64);
+
+    EXPECT_EQ(GDALDataTypeUnionWithValue(GDT_Float32, -99999, false),
+              GDT_Float32);
+    EXPECT_EQ(GDALDataTypeUnionWithValue(GDT_Float32, -99999.9876, false),
+              GDT_Float64);
+    EXPECT_EQ(GDALDataTypeUnionWithValue(
+                  GDT_Float32, std::numeric_limits<double>::quiet_NaN(), false),
+              GDT_Float32);
+    EXPECT_EQ(GDALDataTypeUnionWithValue(
+                  GDT_Float32, -std::numeric_limits<double>::infinity(), false),
+              GDT_Float32);
+    EXPECT_EQ(GDALDataTypeUnionWithValue(
+                  GDT_Float32, -std::numeric_limits<double>::infinity(), false),
+              GDT_Float32);
+
+    EXPECT_EQ(GDALDataTypeUnionWithValue(GDT_Float64, -99999.9876, false),
+              GDT_Float64);
+    EXPECT_EQ(GDALDataTypeUnionWithValue(
+                  GDT_Float64, std::numeric_limits<double>::quiet_NaN(), false),
+              GDT_Float64);
+    EXPECT_EQ(GDALDataTypeUnionWithValue(
+                  GDT_Float64, -std::numeric_limits<double>::infinity(), false),
+              GDT_Float64);
+    EXPECT_EQ(GDALDataTypeUnionWithValue(
+                  GDT_Float64, -std::numeric_limits<double>::infinity(), false),
               GDT_Float64);
+
+    EXPECT_EQ(GDALDataTypeUnionWithValue(GDT_Unknown, 0, false), GDT_Byte);
 }
 
 // Test GDALAdjustValueToDataType()
@@ -568,6 +614,11 @@ TEST_F(test_gdal, GDALWarp_error_flush_cache)
 // source dataset when we want.
 TEST_F(test_gdal, GDALWarp_VRT)
 {
+    auto hDrv = GDALGetDriverByName("GTiff");
+    if (!hDrv)
+    {
+        GTEST_SKIP() << "GTiff driver missing";
+    }
     const char *args[] = {"-of", "VRT", nullptr};
     GDALWarpAppOptions *psOptions =
         GDALWarpAppOptionsNew((char **)args, nullptr);
@@ -584,6 +635,11 @@ TEST_F(test_gdal, GDALWarp_VRT)
 // source dataset when we want.
 TEST_F(test_gdal, GDALTranslate_VRT)
 {
+    auto hDrv = GDALGetDriverByName("GTiff");
+    if (!hDrv)
+    {
+        GTEST_SKIP() << "GTiff driver missing";
+    }
     const char *args[] = {"-of", "VRT", nullptr};
     GDALTranslateOptions *psOptions =
         GDALTranslateOptionsNew((char **)args, nullptr);
@@ -600,6 +656,11 @@ TEST_F(test_gdal, GDALTranslate_VRT)
 // source dataset when we want.
 TEST_F(test_gdal, GDALBuildVRT)
 {
+    auto hDrv = GDALGetDriverByName("GTiff");
+    if (!hDrv)
+    {
+        GTEST_SKIP() << "GTiff driver missing";
+    }
     GDALDatasetH hSrcDS = GDALOpen(GCORE_DATA_DIR "byte.tif", GA_ReadOnly);
     GDALDatasetH hOutDS =
         GDALBuildVRT("", 1, &hSrcDS, nullptr, nullptr, nullptr);
@@ -702,21 +763,215 @@ TEST_F(test_gdal, GDALIsValueInRange)
     EXPECT_TRUE(GDALIsValueInRange<GByte>(255));
     EXPECT_TRUE(!GDALIsValueInRange<GByte>(-1));
     EXPECT_TRUE(!GDALIsValueInRange<GByte>(256));
+    EXPECT_TRUE(
+        !GDALIsValueInRange<GByte>(std::numeric_limits<double>::quiet_NaN()));
+
     EXPECT_TRUE(GDALIsValueInRange<GInt8>(-128));
     EXPECT_TRUE(GDALIsValueInRange<GInt8>(127));
     EXPECT_TRUE(!GDALIsValueInRange<GInt8>(-129));
     EXPECT_TRUE(!GDALIsValueInRange<GInt8>(128));
+
+    // -(1 << 63)
+    EXPECT_TRUE(GDALIsValueInRange<int64_t>(-9223372036854775808.0));
+    // (1 << 63) - 1024
+    EXPECT_TRUE(GDALIsValueInRange<int64_t>(9223372036854774784.0));
+    EXPECT_TRUE(GDALIsValueInRange<int64_t>(0.5));
+    // (1 << 63) - 512
+    EXPECT_TRUE(!GDALIsValueInRange<int64_t>(9223372036854775296.0));
+
+    EXPECT_TRUE(GDALIsValueInRange<uint64_t>(0.0));
+    EXPECT_TRUE(GDALIsValueInRange<uint64_t>(0.5));
+    // (1 << 64) - 2048
+    EXPECT_TRUE(GDALIsValueInRange<uint64_t>(18446744073709549568.0));
+    // (1 << 64)
+    EXPECT_TRUE(!GDALIsValueInRange<uint64_t>(18446744073709551616.0));
+    EXPECT_TRUE(!GDALIsValueInRange<uint64_t>(-0.5));
+
+    EXPECT_TRUE(GDALIsValueInRange<float>(-std::numeric_limits<float>::max()));
     EXPECT_TRUE(GDALIsValueInRange<float>(std::numeric_limits<float>::max()));
+    EXPECT_TRUE(
+        GDALIsValueInRange<float>(-std::numeric_limits<float>::infinity()));
     EXPECT_TRUE(
         GDALIsValueInRange<float>(std::numeric_limits<float>::infinity()));
+    EXPECT_TRUE(
+        !GDALIsValueInRange<float>(std::numeric_limits<double>::quiet_NaN()));
+    EXPECT_TRUE(
+        !GDALIsValueInRange<float>(-std::numeric_limits<double>::max()));
     EXPECT_TRUE(!GDALIsValueInRange<float>(std::numeric_limits<double>::max()));
+
+    EXPECT_TRUE(
+        GDALIsValueInRange<double>(-std::numeric_limits<double>::infinity()));
     EXPECT_TRUE(
         GDALIsValueInRange<double>(std::numeric_limits<double>::infinity()));
-    EXPECT_TRUE(!GDALIsValueInRange<double>(CPLAtof("nan")));
-    EXPECT_TRUE(!GDALIsValueInRange<float>(CPLAtof("nan")));
-    EXPECT_TRUE(!GDALIsValueInRange<GByte>(CPLAtof("nan")));
+    EXPECT_TRUE(
+        GDALIsValueInRange<double>(-std::numeric_limits<double>::max()));
+    EXPECT_TRUE(GDALIsValueInRange<double>(std::numeric_limits<double>::max()));
+    EXPECT_TRUE(
+        !GDALIsValueInRange<double>(std::numeric_limits<double>::quiet_NaN()));
+}
+
+#ifdef _MSC_VER
+#pragma warning(push)
+// overflow in constant arithmetic
+#pragma warning(disable : 4756)
+#endif
+
+// Test GDALIsValueExactAs()
+TEST_F(test_gdal, GDALIsValueExactAs)
+{
+    EXPECT_TRUE(GDALIsValueExactAs<GByte>(0));
+    EXPECT_TRUE(GDALIsValueExactAs<GByte>(255));
+    EXPECT_TRUE(!GDALIsValueExactAs<GByte>(0.5));
+    EXPECT_TRUE(!GDALIsValueExactAs<GByte>(-1));
+    EXPECT_TRUE(!GDALIsValueExactAs<GByte>(-0.5));
+    EXPECT_TRUE(!GDALIsValueExactAs<GByte>(255.5));
+    EXPECT_TRUE(!GDALIsValueExactAs<GByte>(256));
+    EXPECT_TRUE(
+        !GDALIsValueExactAs<GByte>(std::numeric_limits<double>::quiet_NaN()));
+
+    // -(1 << 63)
+    EXPECT_TRUE(GDALIsValueExactAs<int64_t>(-9223372036854775808.0));
+    // (1 << 63) - 1024
+    EXPECT_TRUE(GDALIsValueExactAs<int64_t>(9223372036854774784.0));
+    EXPECT_TRUE(!GDALIsValueExactAs<int64_t>(0.5));
+    // (1 << 63) - 512
+    EXPECT_TRUE(!GDALIsValueExactAs<int64_t>(9223372036854775296.0));
+
+    EXPECT_TRUE(GDALIsValueExactAs<uint64_t>(0.0));
+    EXPECT_TRUE(!GDALIsValueExactAs<uint64_t>(0.5));
+    // (1 << 64) - 2048
+    EXPECT_TRUE(GDALIsValueExactAs<uint64_t>(18446744073709549568.0));
+    // (1 << 64)
+    EXPECT_TRUE(!GDALIsValueExactAs<uint64_t>(18446744073709551616.0));
+    EXPECT_TRUE(!GDALIsValueExactAs<uint64_t>(-0.5));
+
+    EXPECT_TRUE(GDALIsValueExactAs<float>(-std::numeric_limits<float>::max()));
+    EXPECT_TRUE(GDALIsValueExactAs<float>(std::numeric_limits<float>::max()));
+    EXPECT_TRUE(
+        GDALIsValueExactAs<float>(-std::numeric_limits<float>::infinity()));
+    EXPECT_TRUE(
+        GDALIsValueExactAs<float>(std::numeric_limits<float>::infinity()));
+    EXPECT_TRUE(
+        GDALIsValueExactAs<float>(std::numeric_limits<double>::quiet_NaN()));
+    EXPECT_TRUE(
+        !GDALIsValueExactAs<float>(-std::numeric_limits<double>::max()));
+    EXPECT_TRUE(!GDALIsValueExactAs<float>(std::numeric_limits<double>::max()));
+
+    EXPECT_TRUE(
+        GDALIsValueExactAs<double>(-std::numeric_limits<double>::infinity()));
+    EXPECT_TRUE(
+        GDALIsValueExactAs<double>(std::numeric_limits<double>::infinity()));
+    EXPECT_TRUE(
+        GDALIsValueExactAs<double>(-std::numeric_limits<double>::max()));
+    EXPECT_TRUE(GDALIsValueExactAs<double>(std::numeric_limits<double>::max()));
+    EXPECT_TRUE(
+        GDALIsValueExactAs<double>(std::numeric_limits<double>::quiet_NaN()));
 }
 
+// Test GDALIsValueExactAs()
+TEST_F(test_gdal, GDALIsValueExactAs_C_func)
+{
+    EXPECT_TRUE(GDALIsValueExactAs(0, GDT_Byte));
+    EXPECT_TRUE(GDALIsValueExactAs(255, GDT_Byte));
+    EXPECT_FALSE(GDALIsValueExactAs(-1, GDT_Byte));
+    EXPECT_FALSE(GDALIsValueExactAs(256, GDT_Byte));
+    EXPECT_FALSE(GDALIsValueExactAs(0.5, GDT_Byte));
+
+    EXPECT_TRUE(GDALIsValueExactAs(-128, GDT_Int8));
+    EXPECT_TRUE(GDALIsValueExactAs(127, GDT_Int8));
+    EXPECT_FALSE(GDALIsValueExactAs(-129, GDT_Int8));
+    EXPECT_FALSE(GDALIsValueExactAs(128, GDT_Int8));
+    EXPECT_FALSE(GDALIsValueExactAs(0.5, GDT_Int8));
+
+    EXPECT_TRUE(GDALIsValueExactAs(0, GDT_UInt16));
+    EXPECT_TRUE(GDALIsValueExactAs(65535, GDT_UInt16));
+    EXPECT_FALSE(GDALIsValueExactAs(-1, GDT_UInt16));
+    EXPECT_FALSE(GDALIsValueExactAs(65536, GDT_UInt16));
+    EXPECT_FALSE(GDALIsValueExactAs(0.5, GDT_UInt16));
+
+    EXPECT_TRUE(GDALIsValueExactAs(-32768, GDT_Int16));
+    EXPECT_TRUE(GDALIsValueExactAs(32767, GDT_Int16));
+    EXPECT_FALSE(GDALIsValueExactAs(-32769, GDT_Int16));
+    EXPECT_FALSE(GDALIsValueExactAs(32768, GDT_Int16));
+    EXPECT_FALSE(GDALIsValueExactAs(0.5, GDT_Int16));
+
+    EXPECT_TRUE(GDALIsValueExactAs(std::numeric_limits<uint32_t>::lowest(),
+                                   GDT_UInt32));
+    EXPECT_TRUE(
+        GDALIsValueExactAs(std::numeric_limits<uint32_t>::max(), GDT_UInt32));
+    EXPECT_FALSE(GDALIsValueExactAs(
+        std::numeric_limits<uint32_t>::lowest() - 1.0, GDT_UInt32));
+    EXPECT_FALSE(GDALIsValueExactAs(std::numeric_limits<uint32_t>::max() + 1.0,
+                                    GDT_UInt32));
+    EXPECT_FALSE(GDALIsValueExactAs(0.5, GDT_UInt32));
+
+    EXPECT_TRUE(
+        GDALIsValueExactAs(std::numeric_limits<int32_t>::lowest(), GDT_Int32));
+    EXPECT_TRUE(
+        GDALIsValueExactAs(std::numeric_limits<int32_t>::max(), GDT_Int32));
+    EXPECT_FALSE(GDALIsValueExactAs(
+        std::numeric_limits<int32_t>::lowest() - 1.0, GDT_Int32));
+    EXPECT_FALSE(GDALIsValueExactAs(std::numeric_limits<int32_t>::max() + 1.0,
+                                    GDT_Int32));
+    EXPECT_FALSE(GDALIsValueExactAs(0.5, GDT_Int32));
+
+    EXPECT_TRUE(GDALIsValueExactAs(
+        static_cast<double>(std::numeric_limits<uint64_t>::lowest()),
+        GDT_UInt64));
+    // (1 << 64) - 2048
+    EXPECT_TRUE(GDALIsValueExactAs(18446744073709549568.0, GDT_UInt64));
+    EXPECT_FALSE(GDALIsValueExactAs(
+        static_cast<double>(std::numeric_limits<uint64_t>::lowest()) - 1.0,
+        GDT_UInt64));
+    // (1 << 64)
+    EXPECT_FALSE(GDALIsValueExactAs(18446744073709551616.0, GDT_UInt64));
+    EXPECT_FALSE(GDALIsValueExactAs(0.5, GDT_UInt64));
+
+    EXPECT_TRUE(GDALIsValueExactAs(
+        static_cast<double>(std::numeric_limits<int64_t>::lowest()),
+        GDT_Int64));
+    // (1 << 63) - 1024
+    EXPECT_TRUE(GDALIsValueExactAs(9223372036854774784.0, GDT_Int64));
+    EXPECT_FALSE(GDALIsValueExactAs(
+        static_cast<double>(std::numeric_limits<int64_t>::lowest()) - 2048.0,
+        GDT_Int64));
+    // (1 << 63) - 512
+    EXPECT_FALSE(GDALIsValueExactAs(9223372036854775296.0, GDT_Int64));
+    EXPECT_FALSE(GDALIsValueExactAs(0.5, GDT_Int64));
+
+    EXPECT_TRUE(
+        GDALIsValueExactAs(-std::numeric_limits<float>::max(), GDT_Float32));
+    EXPECT_TRUE(
+        GDALIsValueExactAs(std::numeric_limits<float>::max(), GDT_Float32));
+    EXPECT_TRUE(GDALIsValueExactAs(-std::numeric_limits<float>::infinity(),
+                                   GDT_Float32));
+    EXPECT_TRUE(GDALIsValueExactAs(std::numeric_limits<float>::infinity(),
+                                   GDT_Float32));
+    EXPECT_TRUE(GDALIsValueExactAs(std::numeric_limits<double>::quiet_NaN(),
+                                   GDT_Float32));
+    EXPECT_TRUE(
+        !GDALIsValueExactAs(-std::numeric_limits<double>::max(), GDT_Float32));
+    EXPECT_TRUE(
+        !GDALIsValueExactAs(std::numeric_limits<double>::max(), GDT_Float32));
+
+    EXPECT_TRUE(GDALIsValueExactAs(-std::numeric_limits<double>::infinity(),
+                                   GDT_Float64));
+    EXPECT_TRUE(GDALIsValueExactAs(std::numeric_limits<double>::infinity(),
+                                   GDT_Float64));
+    EXPECT_TRUE(
+        GDALIsValueExactAs(-std::numeric_limits<double>::max(), GDT_Float64));
+    EXPECT_TRUE(
+        GDALIsValueExactAs(std::numeric_limits<double>::max(), GDT_Float64));
+    EXPECT_TRUE(GDALIsValueExactAs(std::numeric_limits<double>::quiet_NaN(),
+                                   GDT_Float64));
+
+    EXPECT_TRUE(GDALIsValueExactAs(0, GDT_CInt16));
+}
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 // Test GDALDataTypeIsInteger()
 TEST_F(test_gdal, GDALDataTypeIsInteger)
 {
@@ -2293,6 +2548,249 @@ TEST_F(test_gdal, TileMatrixSet)
             }
         }
     }
+
+    // TMS v2 with crs.uri
+    {
+        auto poTMS = gdal::TileMatrixSet::parse(
+            "{"
+            "   \"id\" : \"test\","
+            "   \"title\" : \"test\","
+            "   \"uri\" : "
+            "\"http://www.opengis.net/def/tilematrixset/OGC/1.0/test\","
+            "   \"crs\" : {\"uri\": "
+            "\"http://www.opengis.net/def/crs/EPSG/0/4326\"},"
+            "   \"orderedAxes\" : ["
+            "      \"Lat\","
+            "      \"Lon\""
+            "   ],"
+            "   \"wellKnownScaleSet\" : "
+            "\"http://www.opengis.net/def/wkss/OGC/1.0/GoogleCRS84Quad\","
+            "   \"tileMatrices\" : ["
+            "      {"
+            "         \"id\" : \"0\","
+            "         \"scaleDenominator\" : 139770566.0071794390678,"
+            "         \"cellSize\" : 0.3515625,"
+            "         \"cornerOfOrigin\" : \"topLeft\","
+            "         \"pointOfOrigin\" : [ 90, -180 ],"
+            "         \"matrixWidth\" : 4,"
+            "         \"matrixHeight\" : 2,"
+            "         \"tileWidth\" : 256,"
+            "         \"tileHeight\" : 256"
+            "      }"
+            "   ]"
+            "}");
+        EXPECT_TRUE(poTMS != nullptr);
+        if (poTMS)
+        {
+            EXPECT_EQ(poTMS->crs(),
+                      "http://www.opengis.net/def/crs/EPSG/0/4326");
+        }
+    }
+
+    // TMS v2 with crs.wkt
+    {
+        auto poTMS = gdal::TileMatrixSet::parse(
+            "{"
+            "   \"id\" : \"test\","
+            "   \"title\" : \"test\","
+            "   \"uri\" : "
+            "\"http://www.opengis.net/def/tilematrixset/OGC/1.0/test\","
+            "   \"crs\" : {\"wkt\": \"GEOGCRS[\\\"WGS 84\\\","
+            "ENSEMBLE[\\\"World Geodetic System 1984 ensemble\\\","
+            "MEMBER[\\\"World Geodetic System 1984 (Transit)\\\"],"
+            "MEMBER[\\\"World Geodetic System 1984 (G730)\\\"],"
+            "MEMBER[\\\"World Geodetic System 1984 (G873)\\\"],"
+            "MEMBER[\\\"World Geodetic System 1984 (G1150)\\\"],"
+            "MEMBER[\\\"World Geodetic System 1984 (G1674)\\\"],"
+            "MEMBER[\\\"World Geodetic System 1984 (G1762)\\\"],"
+            "MEMBER[\\\"World Geodetic System 1984 (G2139)\\\"],"
+            "MEMBER[\\\"World Geodetic System 1984 (G2296)\\\"],"
+            "ELLIPSOID[\\\"WGS 84\\\",6378137,298.257223563,"
+            "LENGTHUNIT[\\\"metre\\\",1]],"
+            "ENSEMBLEACCURACY[2.0]],"
+            "PRIMEM[\\\"Greenwich\\\",0,"
+            "ANGLEUNIT[\\\"degree\\\",0.0174532925199433]],"
+            "CS[ellipsoidal,2],"
+            "AXIS[\\\"geodetic latitude (Lat)\\\",north,"
+            "ORDER[1],"
+            "ANGLEUNIT[\\\"degree\\\",0.0174532925199433]],"
+            "AXIS[\\\"geodetic longitude (Lon)\\\",east,"
+            "ORDER[2],"
+            "ANGLEUNIT[\\\"degree\\\",0.0174532925199433]],"
+            "USAGE["
+            "SCOPE[\\\"Horizontal component of 3D system.\\\"],"
+            "AREA[\\\"World.\\\"],"
+            "BBOX[-90,-180,90,180]],"
+            "ID[\\\"EPSG\\\",4326]]\" },"
+            "   \"orderedAxes\" : ["
+            "      \"Lat\","
+            "      \"Lon\""
+            "   ],"
+            "   \"wellKnownScaleSet\" : "
+            "\"http://www.opengis.net/def/wkss/OGC/1.0/GoogleCRS84Quad\","
+            "   \"tileMatrices\" : ["
+            "      {"
+            "         \"id\" : \"0\","
+            "         \"scaleDenominator\" : 139770566.0071794390678,"
+            "         \"cellSize\" : 0.3515625,"
+            "         \"cornerOfOrigin\" : \"topLeft\","
+            "         \"pointOfOrigin\" : [ 90, -180 ],"
+            "         \"matrixWidth\" : 4,"
+            "         \"matrixHeight\" : 2,"
+            "         \"tileWidth\" : 256,"
+            "         \"tileHeight\" : 256"
+            "      }"
+            "   ]"
+            "}");
+        EXPECT_TRUE(poTMS != nullptr);
+        if (poTMS)
+        {
+            EXPECT_TRUE(
+                STARTS_WITH(poTMS->crs().c_str(), "GEOGCRS[\"WGS 84\""));
+        }
+    }
+
+    // TMS v2 with crs.wkt with JSON content
+    {
+        auto poTMS = gdal::TileMatrixSet::parse(
+            "{"
+            "   \"id\" : \"test\","
+            "   \"title\" : \"test\","
+            "   \"uri\" : "
+            "\"http://www.opengis.net/def/tilematrixset/OGC/1.0/test\","
+            "   \"crs\" : {\"wkt\": "
+            "{"
+            "  \"type\": \"GeographicCRS\","
+            "  \"name\": \"WGS 84\","
+            "  \"datum_ensemble\": {"
+            "    \"name\": \"World Geodetic System 1984 ensemble\","
+            "    \"members\": ["
+            "      {"
+            "        \"name\": \"World Geodetic System 1984 (Transit)\","
+            "        \"id\": {"
+            "          \"authority\": \"EPSG\","
+            "          \"code\": 1166"
+            "        }"
+            "      },"
+            "      {"
+            "        \"name\": \"World Geodetic System 1984 (G730)\","
+            "        \"id\": {"
+            "          \"authority\": \"EPSG\","
+            "          \"code\": 1152"
+            "        }"
+            "      },"
+            "      {"
+            "        \"name\": \"World Geodetic System 1984 (G873)\","
+            "        \"id\": {"
+            "          \"authority\": \"EPSG\","
+            "          \"code\": 1153"
+            "        }"
+            "      },"
+            "      {"
+            "        \"name\": \"World Geodetic System 1984 (G1150)\","
+            "        \"id\": {"
+            "          \"authority\": \"EPSG\","
+            "          \"code\": 1154"
+            "        }"
+            "      },"
+            "      {"
+            "        \"name\": \"World Geodetic System 1984 (G1674)\","
+            "        \"id\": {"
+            "          \"authority\": \"EPSG\","
+            "          \"code\": 1155"
+            "        }"
+            "      },"
+            "      {"
+            "        \"name\": \"World Geodetic System 1984 (G1762)\","
+            "        \"id\": {"
+            "          \"authority\": \"EPSG\","
+            "          \"code\": 1156"
+            "        }"
+            "      },"
+            "      {"
+            "        \"name\": \"World Geodetic System 1984 (G2139)\","
+            "        \"id\": {"
+            "          \"authority\": \"EPSG\","
+            "          \"code\": 1309"
+            "        }"
+            "      },"
+            "      {"
+            "        \"name\": \"World Geodetic System 1984 (G2296)\","
+            "        \"id\": {"
+            "          \"authority\": \"EPSG\","
+            "          \"code\": 1383"
+            "        }"
+            "      }"
+            "    ],"
+            "    \"ellipsoid\": {"
+            "      \"name\": \"WGS 84\","
+            "      \"semi_major_axis\": 6378137,"
+            "      \"inverse_flattening\": 298.257223563"
+            "    },"
+            "    \"accuracy\": \"2.0\","
+            "    \"id\": {"
+            "      \"authority\": \"EPSG\","
+            "      \"code\": 6326"
+            "    }"
+            "  },"
+            "  \"coordinate_system\": {"
+            "    \"subtype\": \"ellipsoidal\","
+            "    \"axis\": ["
+            "      {"
+            "        \"name\": \"Geodetic latitude\","
+            "        \"abbreviation\": \"Lat\","
+            "        \"direction\": \"north\","
+            "        \"unit\": \"degree\""
+            "      },"
+            "      {"
+            "        \"name\": \"Geodetic longitude\","
+            "        \"abbreviation\": \"Lon\","
+            "        \"direction\": \"east\","
+            "        \"unit\": \"degree\""
+            "      }"
+            "    ]"
+            "  },"
+            "  \"scope\": \"Horizontal component of 3D system.\","
+            "  \"area\": \"World.\","
+            "  \"bbox\": {"
+            "    \"south_latitude\": -90,"
+            "    \"west_longitude\": -180,"
+            "    \"north_latitude\": 90,"
+            "    \"east_longitude\": 180"
+            "  },"
+            "  \"id\": {"
+            "    \"authority\": \"EPSG\","
+            "    \"code\": 4326"
+            "  }"
+            "}"
+            "},"
+            "   \"orderedAxes\" : ["
+            "      \"Lat\","
+            "      \"Lon\""
+            "   ],"
+            "   \"wellKnownScaleSet\" : "
+            "\"http://www.opengis.net/def/wkss/OGC/1.0/GoogleCRS84Quad\","
+            "   \"tileMatrices\" : ["
+            "      {"
+            "         \"id\" : \"0\","
+            "         \"scaleDenominator\" : 139770566.0071794390678,"
+            "         \"cellSize\" : 0.3515625,"
+            "         \"cornerOfOrigin\" : \"topLeft\","
+            "         \"pointOfOrigin\" : [ 90, -180 ],"
+            "         \"matrixWidth\" : 4,"
+            "         \"matrixHeight\" : 2,"
+            "         \"tileWidth\" : 256,"
+            "         \"tileHeight\" : 256"
+            "      }"
+            "   ]"
+            "}");
+        EXPECT_TRUE(poTMS != nullptr);
+        if (poTMS)
+        {
+            EXPECT_TRUE(STARTS_WITH(poTMS->crs().c_str(),
+                                    "{ \"type\": \"GeographicCRS\""));
+        }
+    }
 }
 
 // Test that PCIDSK GetMetadataItem() return is stable
@@ -2748,10 +3246,15 @@ TEST_F(test_gdal, MarkSuppressOnClose)
 {
     const char *pszFilename = "/vsimem/out.tif";
     const char *const apszOptions[] = {"PROFILE=BASELINE", nullptr};
+    auto hDrv = GDALGetDriverByName("GTiff");
+    if (!hDrv)
+    {
+        GTEST_SKIP() << "GTiff driver missing";
+    }
+    else
     {
-        GDALDatasetUniquePtr poDstDS(
-            GDALDriver::FromHandle(GDALGetDriverByName("GTiff"))
-                ->Create(pszFilename, 1, 1, 1, GDT_Byte, apszOptions));
+        GDALDatasetUniquePtr poDstDS(GDALDriver::FromHandle(hDrv)->Create(
+            pszFilename, 1, 1, 1, GDT_Byte, apszOptions));
         poDstDS->SetMetadataItem("FOO", "BAR");
         poDstDS->MarkSuppressOnClose();
         poDstDS->GetRasterBand(1)->Fill(255);
@@ -2775,10 +3278,15 @@ TEST_F(test_gdal, UnMarkSuppressOnClose)
 {
     const char *pszFilename = "/vsimem/out.tif";
     const char *const apszOptions[] = {"PROFILE=BASELINE", nullptr};
+    auto hDrv = GDALGetDriverByName("GTiff");
+    if (!hDrv)
+    {
+        GTEST_SKIP() << "GTiff driver missing";
+    }
+    else
     {
-        GDALDatasetUniquePtr poDstDS(
-            GDALDriver::FromHandle(GDALGetDriverByName("GTiff"))
-                ->Create(pszFilename, 1, 1, 1, GDT_Byte, apszOptions));
+        GDALDatasetUniquePtr poDstDS(GDALDriver::FromHandle(hDrv)->Create(
+            pszFilename, 1, 1, 1, GDT_Byte, apszOptions));
         poDstDS->MarkSuppressOnClose();
         poDstDS->GetRasterBand(1)->Fill(255);
         if (poDstDS->IsMarkedSuppressOnClose())
@@ -2858,6 +3366,12 @@ TEST_F(test_gdal, GDALCachedPixelAccessor)
 // (https://github.com/OSGeo/gdal/issues/5989)
 TEST_F(test_gdal, VRTCachingOpenOptions)
 {
+    if (GDALGetMetadataItem(GDALGetDriverByName("VRT"), GDAL_DMD_OPENOPTIONLIST,
+                            nullptr) == nullptr)
+    {
+        GTEST_SKIP() << "VRT driver Open() missing";
+    }
+
     class TestRasterBand : public GDALRasterBand
     {
       protected:
@@ -3184,6 +3698,10 @@ TEST_F(test_gdal, GDALDatasetReportError)
 // Test GDALDataset::GetCompressionFormats() and ReadCompressedData()
 TEST_F(test_gdal, gtiff_ReadCompressedData)
 {
+    if (!GDALGetDriverByName("GTiff"))
+    {
+        GTEST_SKIP() << "GTiff driver missing";
+    }
     if (GDALGetDriverByName("JPEG") == nullptr)
     {
         GTEST_SKIP() << "JPEG support missing";
@@ -3319,7 +3837,7 @@ TEST_F(test_gdal, gtiff_ReadCompressedData)
                   CE_None);
         EXPECT_EQ(nGotSize, nNeededSize);
         EXPECT_NE(pBuffer, nullptr);
-        if (pBuffer != nullptr && nGotSize == nNeededSize)
+        if (pBuffer != nullptr && nGotSize == nNeededSize && nNeededSize >= 2)
         {
             const GByte *pabyBuffer = static_cast<GByte *>(pBuffer);
             EXPECT_EQ(pabyBuffer[0], 0xFF);
@@ -3345,6 +3863,10 @@ TEST_F(test_gdal, gtiff_ReadCompressedData)
 // Test GDALDataset::GetCompressionFormats() and ReadCompressedData()
 TEST_F(test_gdal, gtiff_ReadCompressedData_jpeg_rgba)
 {
+    if (!GDALGetDriverByName("GTiff"))
+    {
+        GTEST_SKIP() << "GTiff driver missing";
+    }
     if (GDALGetDriverByName("JPEG") == nullptr)
     {
         GTEST_SKIP() << "JPEG support missing";
@@ -3685,6 +4207,11 @@ TEST_F(test_gdal, jpegxl_jpeg_compatible_ReadCompressedData)
 // Test GDAL_OF_SHARED flag and open options
 TEST_F(test_gdal, open_shared_open_options)
 {
+    if (!GDALGetDriverByName("GTiff"))
+    {
+        GTEST_SKIP() << "GTiff driver missing";
+    }
+
     CPLErrorReset();
     const char *const apszOpenOptions[] = {"OVERVIEW_LEVEL=NONE", nullptr};
     {
@@ -3927,4 +4454,327 @@ TEST_F(test_gdal, gdal_gcp_class)
     }
 }
 
+// Test GDALRasterBand::ReadRaster
+TEST_F(test_gdal, ReadRaster)
+{
+    GDALDatasetUniquePtr poDS(GDALDriver::FromHandle(GDALGetDriverByName("MEM"))
+                                  ->Create("", 2, 3, 1, GDT_Float64, nullptr));
+    std::array<double, 6> buffer = {
+        -1e300, -1,     //////////////////////////////////////////////
+        1,      128,    //////////////////////////////////////////////
+        32768,  1e300,  //////////////////////////////////////////////
+    };
+    GDALRasterIOExtraArg sExtraArg;
+    INIT_RASTERIO_EXTRA_ARG(sExtraArg);
+    EXPECT_EQ(poDS->GetRasterBand(1)->RasterIO(
+                  GF_Write, 0, 0, 2, 3, buffer.data(), 2, 3, GDT_Float64,
+                  sizeof(double), 2 * sizeof(double), &sExtraArg),
+              CE_None);
+
+    {
+        std::vector<uint8_t> res;
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res), CE_None);
+        const auto expected_res = std::vector<uint8_t>{0, 0, 1, 128, 255, 255};
+        EXPECT_EQ(res, expected_res);
+
+        std::fill(res.begin(), res.end(), 0);
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res, 0, 0, 2, 3, 2, 3),
+                  CE_None);
+        EXPECT_EQ(res, expected_res);
+
+        std::fill(res.begin(), res.end(), 0);
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res, 0, 0, 2, 3), CE_None);
+        EXPECT_EQ(res, expected_res);
+
+#if __cplusplus >= 202002L
+        std::fill(res.begin(), res.end(), 0);
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(std::span<uint8_t>(res)),
+                  CE_None);
+        EXPECT_EQ(res, expected_res);
+#endif
+
+        std::fill(res.begin(), res.end(), 0);
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res.data()), CE_None);
+        EXPECT_EQ(res, expected_res);
+
+        std::fill(res.begin(), res.end(), 0);
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res.data(), res.size()),
+                  CE_None);
+        EXPECT_EQ(res, expected_res);
+
+        CPLPushErrorHandler(CPLQuietErrorHandler);
+        // Too small buffer size
+        EXPECT_EQ(
+            poDS->GetRasterBand(1)->ReadRaster(res.data(), res.size() - 1),
+            CE_Failure);
+        CPLPopErrorHandler();
+
+        std::fill(res.begin(), res.end(), 0);
+        EXPECT_EQ(
+            poDS->GetRasterBand(1)->ReadRaster(res.data(), 0, 0, 0, 2, 3, 2, 3),
+            CE_None);
+        EXPECT_EQ(res, expected_res);
+
+        std::fill(res.begin(), res.end(), 0);
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res.data(), 0, 0, 0, 2, 3),
+                  CE_None);
+        EXPECT_EQ(res, expected_res);
+    }
+
+    {
+        std::vector<double> res;
+        CPLPushErrorHandler(CPLQuietErrorHandler);
+        // Too large nBufXSize
+        EXPECT_EQ(
+            poDS->GetRasterBand(1)->ReadRaster(res, 0, 0, 1, 1, UINT32_MAX, 1),
+            CE_Failure);
+
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res.data(), UINT32_MAX, 0,
+                                                     0, 1, 1, UINT32_MAX, 1),
+                  CE_Failure);
+
+        // Too large nBufYSize
+        EXPECT_EQ(
+            poDS->GetRasterBand(1)->ReadRaster(res, 0, 0, 1, 1, 1, UINT32_MAX),
+            CE_Failure);
+
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res.data(), UINT32_MAX, 0,
+                                                     0, 1, 1, 1, UINT32_MAX),
+                  CE_Failure);
+
+        CPLPopErrorHandler();
+    }
+
+    {
+        std::vector<double> res;
+        CPLPushErrorHandler(CPLQuietErrorHandler);
+        // Huge nBufXSize x nBufYSize
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res, 0, 0, 1, 1, INT32_MAX,
+                                                     INT32_MAX),
+                  CE_Failure);
+        CPLPopErrorHandler();
+    }
+
+    {
+        std::vector<double> res;
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res, 1, 2, 1, 1), CE_None);
+        const auto expected_res = std::vector<double>{1e300};
+        EXPECT_EQ(res, expected_res);
+    }
+
+    {
+        std::vector<double> res;
+        CPLPushErrorHandler(CPLQuietErrorHandler);
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res, 1.1, 2.1, 0.9, 0.9),
+                  CE_Failure);
+        CPLPopErrorHandler();
+
+        EXPECT_EQ(
+            poDS->GetRasterBand(1)->ReadRaster(res, 1.1, 2.1, 0.9, 0.9, 1, 1),
+            CE_None);
+        const auto expected_res = std::vector<double>{1e300};
+        EXPECT_EQ(res, expected_res);
+    }
+
+    {
+        std::vector<double> res;
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res, 0.4, 0.5, 1.4, 1.5, 1,
+                                                     1, GRIORA_Bilinear),
+                  CE_None);
+        ASSERT_EQ(res.size(), 1U);
+        const double expected_res = -8.64198e+298;
+        EXPECT_NEAR(res[0], expected_res, std::fabs(expected_res) * 1e-6);
+    }
+
+    // Test int8_t
+    {
+        std::vector<int8_t> res;
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res), CE_None);
+        const auto expected_res =
+            std::vector<int8_t>{-128, -1, 1, 127, 127, 127};
+        EXPECT_EQ(res, expected_res);
+
+        std::fill(res.begin(), res.end(), 0);
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res.data()), CE_None);
+        EXPECT_EQ(res, expected_res);
+    }
+
+    // Test uint16_t
+    {
+        std::vector<uint16_t> res;
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res), CE_None);
+        const auto expected_res =
+            std::vector<uint16_t>{0, 0, 1, 128, 32768, 65535};
+        EXPECT_EQ(res, expected_res);
+
+        std::fill(res.begin(), res.end(), 0);
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res.data()), CE_None);
+        EXPECT_EQ(res, expected_res);
+
+        std::fill(res.begin(), res.end(), 0);
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res.data(), res.size()),
+                  CE_None);
+        EXPECT_EQ(res, expected_res);
+    }
+
+    // Test int16_t
+    {
+        std::vector<int16_t> res;
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res), CE_None);
+        const auto expected_res =
+            std::vector<int16_t>{-32768, -1, 1, 128, 32767, 32767};
+        EXPECT_EQ(res, expected_res);
+
+        std::fill(res.begin(), res.end(), 0);
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res.data()), CE_None);
+        EXPECT_EQ(res, expected_res);
+    }
+
+#if 0
+    // Not allowed by C++ standard
+    // Test complex<int16_t>
+    {
+        std::vector<std::complex<int16_t>> res;
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res), CE_None);
+        const auto expected_res = std::vector<std::complex<int16_t>>{
+            -32768, -1, 1, 128, 32767, 32767};
+        EXPECT_EQ(res, expected_res);
+
+        std::fill(res.begin(), res.end(), 0);
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res.data()), CE_None);
+        EXPECT_EQ(res, expected_res);
+    }
+#endif
+
+    // Test uint32_t
+    {
+        std::vector<uint32_t> res;
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res), CE_None);
+        const auto expected_res =
+            std::vector<uint32_t>{0, 0, 1, 128, 32768, UINT32_MAX};
+        EXPECT_EQ(res, expected_res);
+
+        std::fill(res.begin(), res.end(), 0);
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res.data()), CE_None);
+        EXPECT_EQ(res, expected_res);
+    }
+
+    // Test int32_t
+    {
+        std::vector<int32_t> res;
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res), CE_None);
+        const auto expected_res =
+            std::vector<int32_t>{INT32_MIN, -1, 1, 128, 32768, INT32_MAX};
+        EXPECT_EQ(res, expected_res);
+
+        std::fill(res.begin(), res.end(), 0);
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res.data()), CE_None);
+        EXPECT_EQ(res, expected_res);
+    }
+
+#if 0
+    // Not allowed by C++ standard
+    // Test complex<int32_t>
+    {
+        std::vector<std::complex<int32_t>> res;
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res), CE_None);
+        const auto expected_res = std::vector<std::complex<int32_t>>{
+            INT32_MIN, -1, 1, 128, 32768, INT32_MAX};
+        EXPECT_EQ(res, expected_res);
+
+        std::fill(res.begin(), res.end(), 0);
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res.data()), CE_None);
+        EXPECT_EQ(res, expected_res);
+    }
+#endif
+
+    // Test uint64_t
+    {
+        std::vector<uint64_t> res;
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res), CE_None);
+        const auto expected_res =
+            std::vector<uint64_t>{0, 0, 1, 128, 32768, UINT64_MAX};
+        EXPECT_EQ(res, expected_res);
+
+        std::fill(res.begin(), res.end(), 0);
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res.data()), CE_None);
+        EXPECT_EQ(res, expected_res);
+    }
+
+    // Test int64_t
+    {
+        std::vector<int64_t> res;
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res), CE_None);
+        const auto expected_res =
+            std::vector<int64_t>{INT64_MIN, -1, 1, 128, 32768, INT64_MAX};
+        EXPECT_EQ(res, expected_res);
+
+        std::fill(res.begin(), res.end(), 0);
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res.data()), CE_None);
+        EXPECT_EQ(res, expected_res);
+    }
+
+    // Test float
+    {
+        std::vector<float> res;
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res), CE_None);
+        const auto expected_res =
+            std::vector<float>{-std::numeric_limits<float>::infinity(),
+                               -1.0f,
+                               1.0f,
+                               128.0f,
+                               32768.0f,
+                               std::numeric_limits<float>::infinity()};
+        EXPECT_EQ(res, expected_res);
+
+        std::fill(res.begin(), res.end(), 0.0f);
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res.data()), CE_None);
+        EXPECT_EQ(res, expected_res);
+    }
+
+    // Test complex<float>
+    {
+        std::vector<std::complex<float>> res;
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res), CE_None);
+        const auto expected_res = std::vector<std::complex<float>>{
+            -std::numeric_limits<float>::infinity(),
+            -1.0f,
+            1.0f,
+            128.0f,
+            32768.0f,
+            std::numeric_limits<float>::infinity()};
+        EXPECT_EQ(res, expected_res);
+
+        std::fill(res.begin(), res.end(), 0.0f);
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res.data()), CE_None);
+        EXPECT_EQ(res, expected_res);
+    }
+
+    // Test double
+    {
+        std::vector<double> res;
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res), CE_None);
+        const auto expected_res =
+            std::vector<double>{-1e300, -1, 1, 128, 32768, 1e300};
+        EXPECT_EQ(res, expected_res);
+
+        std::fill(res.begin(), res.end(), 0);
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res.data()), CE_None);
+        EXPECT_EQ(res, expected_res);
+    }
+
+    // Test complex<double>
+    {
+        std::vector<std::complex<double>> res;
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res), CE_None);
+        const auto expected_res =
+            std::vector<std::complex<double>>{-1e300, -1, 1, 128, 32768, 1e300};
+        EXPECT_EQ(res, expected_res);
+
+        std::fill(res.begin(), res.end(), 0);
+        EXPECT_EQ(poDS->GetRasterBand(1)->ReadRaster(res.data()), CE_None);
+        EXPECT_EQ(res, expected_res);
+    }
+}
+
 }  // namespace
diff --git a/autotest/cpp/test_gdal_aaigrid.cpp b/autotest/cpp/test_gdal_aaigrid.cpp
index 55833bd929c1..72903bea1e2e 100644
--- a/autotest/cpp/test_gdal_aaigrid.cpp
+++ b/autotest/cpp/test_gdal_aaigrid.cpp
@@ -8,23 +8,7 @@
 // Copyright (c) 2006, Mateusz Loskot <mateusz@loskot.net>
 // Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_unit_test.h"
@@ -219,6 +203,11 @@ TEST_F(test_gdal_aaigrid, nodata)
 // Create simple copy and check
 TEST_F(test_gdal_aaigrid, copy)
 {
+    if (!GDALGetDriverByName("GTiff"))
+    {
+        GTEST_SKIP() << "GTiff driver missing";
+    }
+
     // Index of test file being tested
     const std::size_t fileIdx = 0;
 
diff --git a/autotest/cpp/test_gdal_dted.cpp b/autotest/cpp/test_gdal_dted.cpp
index 7af3b3032fc2..7622aca2e921 100644
--- a/autotest/cpp/test_gdal_dted.cpp
+++ b/autotest/cpp/test_gdal_dted.cpp
@@ -8,23 +8,7 @@
 // Copyright (c) 2006, Mateusz Loskot <mateusz@loskot.net>
 // Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_unit_test.h"
diff --git a/autotest/cpp/test_gdal_gtiff.cpp b/autotest/cpp/test_gdal_gtiff.cpp
index 1ea518295fb6..daeb847622b1 100644
--- a/autotest/cpp/test_gdal_gtiff.cpp
+++ b/autotest/cpp/test_gdal_gtiff.cpp
@@ -8,23 +8,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright (c) 2006, Mateusz Loskot <mateusz@loskot.net>
 /*
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_unit_test.h"
@@ -240,4 +224,32 @@ TEST_F(test_gdal_gtiff, raster_min_max)
     GDALClose(ds);
 }
 
+// Test setting a nodata value with SetNoDataValue(double) on a int64 dataset
+TEST_F(test_gdal_gtiff, set_nodata_value_on_int64)
+{
+    std::string osTmpFile = "/vsimem/temp.tif";
+    auto poDS =
+        std::unique_ptr<GDALDataset>(GDALDriver::FromHandle(drv_)->Create(
+            osTmpFile.c_str(), 1, 1, 1, GDT_Int64, nullptr));
+    EXPECT_EQ(poDS->GetRasterBand(1)->SetNoDataValue(1), CE_None);
+    {
+        int bGotNoData = false;
+        EXPECT_EQ(poDS->GetRasterBand(1)->GetNoDataValue(&bGotNoData), 1.0);
+        EXPECT_TRUE(bGotNoData);
+    }
+    {
+        int bGotNoData = false;
+        EXPECT_EQ(poDS->GetRasterBand(1)->GetNoDataValueAsInt64(&bGotNoData),
+                  1.0);
+        EXPECT_TRUE(bGotNoData);
+    }
+    int64_t nVal = 0;
+    EXPECT_EQ(poDS->GetRasterBand(1)->RasterIO(GF_Read, 0, 0, 1, 1, &nVal, 1, 1,
+                                               GDT_Int64, 0, 0, nullptr),
+              CE_None);
+    EXPECT_EQ(nVal, 1);
+    poDS.reset();
+    VSIUnlink(osTmpFile.c_str());
+}
+
 }  // namespace
diff --git a/autotest/cpp/test_gdal_pixelfn.cpp b/autotest/cpp/test_gdal_pixelfn.cpp
index 6adfbc567636..ae3a6707193d 100644
--- a/autotest/cpp/test_gdal_pixelfn.cpp
+++ b/autotest/cpp/test_gdal_pixelfn.cpp
@@ -7,23 +7,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright (c) 2022, Momtchil Momtchev <momtchil@momtchev.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_unit_test.h"
@@ -170,11 +154,25 @@ struct test_gdal_pixelfn : public ::testing::Test
         src_ += SEP;
         src_ += "pixelfn.vrt";
     }
+
+    void SetUp() override
+    {
+        if (GDALGetMetadataItem(GDALGetDriverByName("VRT"),
+                                GDAL_DMD_OPENOPTIONLIST, nullptr) == nullptr)
+        {
+            GTEST_SKIP() << "VRT driver Open() missing";
+        }
+    }
 };
 
 // Test constant parameters in a custom pixel function
 TEST_F(test_gdal_pixelfn, custom_pixel_fn_constant_parameters)
 {
+    if (!GDALGetDriverByName("GTiff"))
+    {
+        GTEST_SKIP() << "GTiff driver missing";
+    }
+
     GDALAddDerivedBandPixelFuncWithArgs("custom", CustomPixelFuncWithMetadata,
                                         pszFuncMetadata);
     GDALDatasetH ds = GDALOpen(src_.c_str(), GA_ReadOnly);
@@ -195,6 +193,11 @@ TEST_F(test_gdal_pixelfn, custom_pixel_fn_constant_parameters)
 // Test registering of a custom pixel function without metadata
 TEST_F(test_gdal_pixelfn, custom_pixel_fn_without_metadata)
 {
+    if (!GDALGetDriverByName("GTiff"))
+    {
+        GTEST_SKIP() << "GTiff driver missing";
+    }
+
     GDALAddDerivedBandPixelFuncWithArgs("custom2", CustomPixelFunc, nullptr);
     GDALDatasetH ds = GDALOpen(src_.c_str(), GA_ReadOnly);
     ASSERT_TRUE(nullptr != ds);
@@ -218,6 +221,11 @@ TEST_F(test_gdal_pixelfn, custom_pixel_fn_without_metadata)
 // Test the registering of a custom pixel function without args
 TEST_F(test_gdal_pixelfn, custom_pixel_fn_without_args)
 {
+    if (!GDALGetDriverByName("GTiff"))
+    {
+        GTEST_SKIP() << "GTiff driver missing";
+    }
+
     GDALAddDerivedBandPixelFunc("custom3", CustomPixelFuncNoArgs);
     GDALDatasetH ds = GDALOpen(src_.c_str(), GA_ReadOnly);
     ASSERT_TRUE(nullptr != ds);
diff --git a/autotest/cpp/test_include_from_c_file.c b/autotest/cpp/test_include_from_c_file.c
index 869a2b506a8c..60ae47479a37 100644
--- a/autotest/cpp/test_include_from_c_file.c
+++ b/autotest/cpp/test_include_from_c_file.c
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2017, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 // PLEASE DO NOT RENAME THIS FILE AS .cpp !!!!!
diff --git a/autotest/cpp/test_marching_squares_contour.cpp b/autotest/cpp/test_marching_squares_contour.cpp
index 2048fcfd46c1..47718ed67787 100644
--- a/autotest/cpp/test_marching_squares_contour.cpp
+++ b/autotest/cpp/test_marching_squares_contour.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2018, Hugo Mercier, <hugo dot mercier at oslandia dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_unit_test.h"
@@ -35,6 +19,8 @@
 #include "marching_squares/segment_merger.h"
 #include "marching_squares/contour_generator.h"
 
+#include <limits>
+
 #include "gtest_include.h"
 
 namespace marching_squares
@@ -179,7 +165,8 @@ TEST_F(test_ms_contour, dummy)
     std::vector<double> data = {2.0};
     TestRingAppender w;
     {
-        IntervalLevelRangeIterator levels(0.0, 10.0);
+        IntervalLevelRangeIterator levels(
+            0.0, 10.0, -std::numeric_limits<double>::infinity());
         SegmentMerger<TestRingAppender, IntervalLevelRangeIterator> writer(
             w, levels, /* polygonize */ true);
         ContourGenerator<decltype(writer), IntervalLevelRangeIterator> cg(
@@ -207,7 +194,8 @@ TEST_F(test_ms_contour, two_pixels)
     TestRingAppender w;
 
     {
-        IntervalLevelRangeIterator levels(8.0, 10.0);
+        IntervalLevelRangeIterator levels(
+            8.0, 10.0, -std::numeric_limits<double>::infinity());
         SegmentMerger<TestRingAppender, IntervalLevelRangeIterator> writer(
             w, levels, /* polygonize */ true);
         ContourGenerator<decltype(writer), IntervalLevelRangeIterator> cg(
@@ -319,7 +307,8 @@ TEST_F(test_ms_contour, four_pixels)
     TestRingAppender w;
 
     {
-        IntervalLevelRangeIterator levels(8.0, 10.0);
+        IntervalLevelRangeIterator levels(
+            8.0, 10.0, -std::numeric_limits<double>::infinity());
         SegmentMerger<TestRingAppender, IntervalLevelRangeIterator> writer(
             w, levels, /* polygonize */ true);
         ContourGenerator<decltype(writer), IntervalLevelRangeIterator> cg(
@@ -440,7 +429,8 @@ TEST_F(test_ms_contour, saddle_point)
     TestRingAppender w;
 
     {
-        IntervalLevelRangeIterator levels(8.0, 10.0);
+        IntervalLevelRangeIterator levels(
+            8.0, 10.0, -std::numeric_limits<double>::infinity());
         SegmentMerger<TestRingAppender, IntervalLevelRangeIterator> writer(
             w, levels, /* polygonize */ true);
         ContourGenerator<decltype(writer), IntervalLevelRangeIterator> cg(
diff --git a/autotest/cpp/test_marching_squares_polygon.cpp b/autotest/cpp/test_marching_squares_polygon.cpp
index 4712eb9cfb68..3b1edf6d36cf 100644
--- a/autotest/cpp/test_marching_squares_polygon.cpp
+++ b/autotest/cpp/test_marching_squares_polygon.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2018, Hugo Mercier, <hugo dot mercier at oslandia dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_unit_test.h"
@@ -40,6 +24,8 @@
 #include <fstream>
 #endif
 
+#include <limits>
+
 #include "gtest_include.h"
 
 namespace marching_squares
@@ -171,7 +157,8 @@ TEST_F(test_ms_polygon, dummy)
     TestPolygonWriter w;
     {
         PolygonRingAppender<TestPolygonWriter> appender(w);
-        IntervalLevelRangeIterator levels(0.0, 10.0);
+        IntervalLevelRangeIterator levels(
+            0.0, 10.0, -std::numeric_limits<double>::infinity());
         SegmentMerger<PolygonRingAppender<TestPolygonWriter>,
                       IntervalLevelRangeIterator>
             writer(appender, levels, /* polygonize */ true);
@@ -234,7 +221,8 @@ TEST_F(test_ms_polygon, four_pixels)
     TestPolygonWriter w;
     {
         PolygonRingAppender<TestPolygonWriter> appender(w);
-        IntervalLevelRangeIterator levels(0.0, 10.0);
+        IntervalLevelRangeIterator levels(
+            0.0, 10.0, -std::numeric_limits<double>::infinity());
         SegmentMerger<PolygonRingAppender<TestPolygonWriter>,
                       IntervalLevelRangeIterator>
             writer(appender, levels, /* polygonize */ true);
@@ -304,7 +292,9 @@ TEST_F(test_ms_polygon, four_pixels_2)
     {
         PolygonRingAppender<TestPolygonWriter> appender(w);
         const double levels[] = {155.0};
-        FixedLevelRangeIterator levelGenerator(levels, 1);
+        FixedLevelRangeIterator levelGenerator(
+            levels, 1, -std::numeric_limits<double>::infinity(),
+            std::numeric_limits<double>::infinity());
         SegmentMerger<PolygonRingAppender<TestPolygonWriter>,
                       FixedLevelRangeIterator>
             writer(appender, levelGenerator, /* polygonize */ true);
@@ -400,7 +390,8 @@ TEST_F(test_ms_polygon, nine_pixels)
     TestPolygonWriter w;
     {
         PolygonRingAppender<TestPolygonWriter> appender(w);
-        IntervalLevelRangeIterator levels(1.0, 10.0);
+        IntervalLevelRangeIterator levels(
+            1.0, 10.0, -std::numeric_limits<double>::infinity());
         SegmentMerger<PolygonRingAppender<TestPolygonWriter>,
                       IntervalLevelRangeIterator>
             writer(appender, levels, /* polygonize */ true);
@@ -452,7 +443,8 @@ TEST_F(test_ms_polygon, three_nested_rings)
     TestPolygonWriter w;
     {
         PolygonRingAppender<TestPolygonWriter> appender(w);
-        IntervalLevelRangeIterator levels(1.0, 2.0);
+        IntervalLevelRangeIterator levels(
+            1.0, 2.0, -std::numeric_limits<double>::infinity());
         SegmentMerger<PolygonRingAppender<TestPolygonWriter>,
                       IntervalLevelRangeIterator>
             writer(appender, levels, /* polygonize */ true);
diff --git a/autotest/cpp/test_marching_squares_square.cpp b/autotest/cpp/test_marching_squares_square.cpp
index 8418dd8a8bd7..c1ffec9eef72 100644
--- a/autotest/cpp/test_marching_squares_square.cpp
+++ b/autotest/cpp/test_marching_squares_square.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2018, Hugo Mercier, <hugo dot mercier at oslandia dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_unit_test.h"
@@ -34,6 +18,7 @@
 #include "marching_squares/square.h"
 #include "marching_squares/level_generator.h"
 #include <vector>
+#include <limits>
 #include <map>
 #include <fstream>
 
@@ -72,7 +57,9 @@ TEST_F(test_ms_square, dummy)
 {
     {
         const double levels[] = {0, 4};
-        FixedLevelRangeIterator levelGenerator(levels, 2);
+        FixedLevelRangeIterator levelGenerator(
+            levels, 2, -std::numeric_limits<double>::infinity(),
+            std::numeric_limits<double>::infinity());
         auto r = levelGenerator.range(0, 5.0);
         auto b = r.begin();
         EXPECT_EQ((*b).first, 1);
@@ -82,7 +69,8 @@ TEST_F(test_ms_square, dummy)
         EXPECT_EQ((*e).second, Inf);
     }
     {
-        IntervalLevelRangeIterator levelGenerator(0, 4);
+        IntervalLevelRangeIterator levelGenerator(
+            0, 4, -std::numeric_limits<double>::infinity());
         auto r = levelGenerator.range(0, 5.0);
         auto b = r.begin();
         EXPECT_EQ((*b).first, 1);
@@ -92,7 +80,8 @@ TEST_F(test_ms_square, dummy)
         EXPECT_EQ((*e).second, 8.0);
     }
     {
-        IntervalLevelRangeIterator levelGenerator(0, 10);
+        IntervalLevelRangeIterator levelGenerator(
+            0, 10, -std::numeric_limits<double>::infinity());
         auto r = levelGenerator.range(-18, 5.0);
         auto b = r.begin();
         EXPECT_EQ((*b).first, -1);
@@ -102,7 +91,8 @@ TEST_F(test_ms_square, dummy)
         EXPECT_EQ((*e).second, 10.0);
     }
     {
-        ExponentialLevelRangeIterator levelGenerator(2);
+        ExponentialLevelRangeIterator levelGenerator(
+            2, -std::numeric_limits<double>::infinity());
         auto r = levelGenerator.range(0, 5.0);
         auto b = r.begin();
         EXPECT_EQ((*b).first, 1);
@@ -124,7 +114,8 @@ TEST_F(test_ms_square, only_zero)
     // Square with only 0, level = 0.1
     Square square(ValuedPoint(0, 1, 0), ValuedPoint(1, 1, 0),
                   ValuedPoint(0, 0, 0), ValuedPoint(1, 0, 0));
-    Square::Segments segments(square.segments(.1));
+    Square::Segments segments(
+        square.segments(.1, -std::numeric_limits<double>::infinity()));
     //
     //   0                    0
     //    +------------------+
@@ -157,7 +148,8 @@ TEST_F(test_ms_square, only_one)
     //    |                  |
     //    +------------------+
     //   1                    1
-    Square::Segments segments(square.segments(.1));
+    Square::Segments segments(
+        square.segments(.1, -std::numeric_limits<double>::infinity()));
     EXPECT_EQ(segments.size(), size_t(0));
 }
 
@@ -178,7 +170,8 @@ TEST_F(test_ms_square, only_zero_level_1)
     //    |                  |
     //    +------------------+
     //   1                    1
-    Square::Segments segments(square.segments(1.0));
+    Square::Segments segments(
+        square.segments(1.0, -std::numeric_limits<double>::infinity()));
     EXPECT_EQ(segments.size(), size_t(0));
 }
 
@@ -199,7 +192,8 @@ TEST_F(test_ms_square, one_segment)
     //    | \                |
     //    +---o--------------+
     //   1                    0
-    Square::Segments segments(square.segments(.1));
+    Square::Segments segments(
+        square.segments(.1, -std::numeric_limits<double>::infinity()));
     EXPECT_EQ(segments.size(), size_t(1));
     EXPECT_TRUE(segments[0].first == Point(.9, 1));
     EXPECT_TRUE(segments[0].second == Point(0, .1));
@@ -224,11 +218,13 @@ TEST_F(test_ms_square, fudge_test_1)
     //   1                    1
     //  (0,0)
     {
-        Square::Segments segments(square.segments(0.0));
+        Square::Segments segments(
+            square.segments(0.0, -std::numeric_limits<double>::infinity()));
         EXPECT_EQ(segments.size(), size_t(0));
     }
     {
-        Square::Segments segments(square.segments(1.0));
+        Square::Segments segments(
+            square.segments(1.0, -std::numeric_limits<double>::infinity()));
         EXPECT_EQ(segments.size(), size_t(1));
         EXPECT_NEAR(segments[0].first.x, 0.0, 0.001);
         EXPECT_NEAR(segments[0].first.y, 0.0, 0.001);
@@ -256,7 +252,8 @@ TEST_F(test_ms_square, fudge_test_2)
     //   0                    0
     // (0,0)
     {
-        Square::Segments segments(square.segments(1.0));
+        Square::Segments segments(
+            square.segments(1.0, -std::numeric_limits<double>::infinity()));
         EXPECT_EQ(segments.size(), 1);
         EXPECT_NEAR(segments[0].first.x, 0.0, 0.001);
         EXPECT_NEAR(segments[0].first.y, 1.0, 0.001);
@@ -264,7 +261,8 @@ TEST_F(test_ms_square, fudge_test_2)
         EXPECT_NEAR(segments[0].second.y, 1.0, 0.001);
     }
     {
-        Square::Segments segments(square.segments(0.0));
+        Square::Segments segments(
+            square.segments(0.0, -std::numeric_limits<double>::infinity()));
         EXPECT_EQ(segments.size(), 0);
     }
 }
@@ -320,8 +318,10 @@ TEST_F(test_ms_square, nan)
     EXPECT_EQ(ul.lowerRight.y, ll.upperRight.y);
     EXPECT_EQ(ul.lowerRight.value, ll.upperRight.value);
 
-    const Square::Segments segments_up(ul.segments(225));
-    const Square::Segments segments_down(ll.segments(225));
+    const Square::Segments segments_up(
+        ul.segments(225, -std::numeric_limits<double>::infinity()));
+    const Square::Segments segments_down(
+        ll.segments(225, -std::numeric_limits<double>::infinity()));
 
     // segments on 225
     //
@@ -378,8 +378,10 @@ TEST_F(test_ms_square, border_test_1)
     //    +--------+---------+
     // 272.87   272.90000 272.93
 
-    Square::Segments segments_l(ll.segments(272.9));
-    Square::Segments segments_r(lr.segments(272.9));
+    Square::Segments segments_l(
+        ll.segments(272.9, -std::numeric_limits<double>::infinity()));
+    Square::Segments segments_r(
+        lr.segments(272.9, -std::numeric_limits<double>::infinity()));
 
     // the level falls exactly on corners
     // thanks to the fudge, each corner should be shifted away a bit
@@ -443,7 +445,8 @@ TEST_F(test_ms_square, multiple_levels)
 
     Writer writer;
     // levels starting at min and increasing by 0.1
-    IntervalLevelRangeIterator levelGenerator(0, .1);
+    IntervalLevelRangeIterator levelGenerator(
+        0, .1, -std::numeric_limits<double>::infinity());
 
     ul.process(levelGenerator, writer);
 
@@ -505,7 +508,8 @@ TEST_F(test_ms_square, border_test_3)
     {
         // ... with a level interval
         Writer writer;
-        IntervalLevelRangeIterator levelGenerator(7, 5);
+        IntervalLevelRangeIterator levelGenerator(
+            7, 5, -std::numeric_limits<double>::infinity());
         ul.process(levelGenerator, writer);
 
         // we have one contour at 7 and 12
@@ -546,7 +550,9 @@ TEST_F(test_ms_square, border_test_3)
     {
         Writer writer;
         std::vector<double> levels = {7.0};
-        FixedLevelRangeIterator levelGenerator(&levels[0], 1);
+        FixedLevelRangeIterator levelGenerator(
+            &levels[0], 1, -std::numeric_limits<double>::infinity(),
+            std::numeric_limits<double>::infinity());
         ul.process(levelGenerator, writer);
 
         // we have one contour at 7 and 12
@@ -604,7 +610,9 @@ TEST_F(test_ms_square, level_value_below_square_values)
     {
         Writer writer;
         std::vector<double> levels = {2.0};
-        FixedLevelRangeIterator levelGenerator(&levels[0], 1);
+        FixedLevelRangeIterator levelGenerator(
+            &levels[0], 1, -std::numeric_limits<double>::infinity(),
+            std::numeric_limits<double>::infinity());
         square.process(levelGenerator, writer);
         EXPECT_TRUE((writer.borders.size() == 0));
         EXPECT_TRUE((writer.contours.size() == 0));
@@ -630,7 +638,8 @@ TEST_F(test_ms_square, full_border_test_1)
     //   NaN                 5
     {
         Writer writer;
-        IntervalLevelRangeIterator levelGenerator(0, 10.0);
+        IntervalLevelRangeIterator levelGenerator(
+            0, 10.0, -std::numeric_limits<double>::infinity());
         square.process(levelGenerator, writer);
         EXPECT_TRUE((writer.borders.size() == 1));
         EXPECT_TRUE((writer.borders[1].size() == 2));
@@ -672,7 +681,8 @@ TEST_F(test_ms_square, full_border_test_2)
     //   NaN                 5
     {
         Writer writer;
-        IntervalLevelRangeIterator levelGenerator(5.0, 5.0);
+        IntervalLevelRangeIterator levelGenerator(
+            5.0, 5.0, -std::numeric_limits<double>::infinity());
         square.process(levelGenerator, writer);
         EXPECT_TRUE((writer.borders.size() == 1));
         EXPECT_TRUE((writer.borders[1].size() == 2));
@@ -696,7 +706,9 @@ TEST_F(test_ms_square, full_border_test_2)
     {
         Writer writer;
         std::vector<double> levels = {5.0};
-        FixedLevelRangeIterator levelGenerator(&levels[0], 1);
+        FixedLevelRangeIterator levelGenerator(
+            &levels[0], 1, -std::numeric_limits<double>::infinity(),
+            std::numeric_limits<double>::infinity());
         square.process(levelGenerator, writer);
         EXPECT_TRUE((writer.borders.size() == 1));
         EXPECT_TRUE((writer.borders[1].size() == 2));
diff --git a/autotest/cpp/test_marching_squares_tile.cpp b/autotest/cpp/test_marching_squares_tile.cpp
index cc69b7698920..3151593e20c7 100644
--- a/autotest/cpp/test_marching_squares_tile.cpp
+++ b/autotest/cpp/test_marching_squares_tile.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2018, Hugo Mercier, <hugo dot mercier at oslandia dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_unit_test.h"
@@ -34,6 +18,7 @@
 #include "marching_squares/point.h"
 #include "marching_squares/level_generator.h"
 #include "marching_squares/contour_generator.h"
+#include <limits>
 #include <map>
 #include <fstream>
 
@@ -139,7 +124,8 @@ TEST_F(test_ms_tile, dummy)
     // only one pixel of value 2.0
     // levels = 0, 10
     std::vector<double> data = {2.0};
-    IntervalLevelRangeIterator levels(0.0, 10.0);
+    IntervalLevelRangeIterator levels(0.0, 10.0,
+                                      -std::numeric_limits<double>::infinity());
     Writer writer;
 
     ContourGenerator<Writer, IntervalLevelRangeIterator> cg(
@@ -173,7 +159,9 @@ TEST_F(test_ms_tile, tile_one_pixel)
     // levels = 0, 10
     std::vector<double> data = {2.0};
     const double levels[] = {0.0};
-    FixedLevelRangeIterator levelGenerator(levels, 1);
+    FixedLevelRangeIterator levelGenerator(
+        levels, 1, -std::numeric_limits<double>::infinity(),
+        std::numeric_limits<double>::infinity());
     Writer writer;
 
     ContourGenerator<Writer, FixedLevelRangeIterator> cg(
@@ -207,7 +195,8 @@ TEST_F(test_ms_tile, tile_one_pixel_two)
     // only one pixel of value 2.0
     // levels = 2, 10
     std::vector<double> data = {2.0};
-    IntervalLevelRangeIterator levels(2.0, 10.0);
+    IntervalLevelRangeIterator levels(2.0, 10.0,
+                                      -std::numeric_limits<double>::infinity());
     Writer writer;
 
     ContourGenerator<Writer, IntervalLevelRangeIterator> cg(
@@ -299,7 +288,8 @@ TEST_F(test_ms_tile, tile_two_pixels)
 
     std::vector<double> data = {10.0, 7.0};
     {
-        IntervalLevelRangeIterator levels(8.0, 10.0);
+        IntervalLevelRangeIterator levels(
+            8.0, 10.0, -std::numeric_limits<double>::infinity());
         Writer writer;
         ContourGenerator<Writer, IntervalLevelRangeIterator> cg(
             2, 1, /* hasNoData */ false, NaN, writer, levels);
@@ -421,7 +411,8 @@ TEST_F(test_ms_tile, tile_four_pixels)
     //  NaN                 NaN                NaN                NaN
     std::vector<double> data = {10.0, 7.0, 4.0, 5.0};
     {
-        IntervalLevelRangeIterator levels(8.0, 10.0);
+        IntervalLevelRangeIterator levels(
+            8.0, 10.0, -std::numeric_limits<double>::infinity());
         Writer writer;
         ContourGenerator<Writer, IntervalLevelRangeIterator> cg(
             2, 2, /* hasNoData */ false, NaN, writer, levels);
@@ -494,7 +485,9 @@ TEST_F(test_ms_tile, tile_four_pixels_2)
     std::vector<double> data = {155.0, 155.01, 154.99, 155.0};
     {
         const double levels[] = {155.0};
-        FixedLevelRangeIterator levelGenerator(levels, 1);
+        FixedLevelRangeIterator levelGenerator(
+            levels, 1, -std::numeric_limits<double>::infinity(),
+            std::numeric_limits<double>::infinity());
         Writer writer;
         ContourGenerator<Writer, FixedLevelRangeIterator> cg(
             2, 2, /* hasNoData */ false, NaN, writer, levelGenerator);
diff --git a/autotest/cpp/test_ogr.cpp b/autotest/cpp/test_ogr.cpp
index a1d6e77b4f44..5ae28fcd95f7 100644
--- a/autotest/cpp/test_ogr.cpp
+++ b/autotest/cpp/test_ogr.cpp
@@ -7,23 +7,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright (c) 2006, Mateusz Loskot <mateusz@loskot.net>
 /*
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_unit_test.h"
@@ -35,6 +19,7 @@
 
 #include <string>
 #include <algorithm>
+#include <cmath>
 #include <fstream>
 #include <limits>
 
@@ -50,7 +35,6 @@ namespace
 // Common fixture with test data
 struct test_ogr : public ::testing::Test
 {
-    std::string drv_shape_{"ESRI Shapefile"};
     std::string data_{tut::common::data_basedir};
     std::string data_tmp_{tut::common::tmp_basedir};
 };
@@ -61,14 +45,6 @@ TEST_F(test_ogr, GetGDALDriverManager)
     ASSERT_TRUE(nullptr != GetGDALDriverManager());
 }
 
-// Test if Shapefile driver is registered
-TEST_F(test_ogr, Shapefile_driver)
-{
-    GDALDriver *drv =
-        GetGDALDriverManager()->GetDriverByName(drv_shape_.c_str());
-    ASSERT_TRUE(nullptr != drv);
-}
-
 template <class T>
 void testSpatialReferenceLeakOnCopy(OGRSpatialReference *poSRS)
 {
@@ -286,7 +262,7 @@ template <> OGRPolyhedralSurface *make()
 
 template <class T> void testCopyEquals()
 {
-    T *poOrigin = make<T>();
+    auto poOrigin = std::unique_ptr<T>(make<T>());
     ASSERT_TRUE(nullptr != poOrigin);
 
     T value2(*poOrigin);
@@ -312,7 +288,8 @@ template <class T> void testCopyEquals()
         << poOrigin->getGeometryName()
         << ": assignment operator changed a value";
 
-    OGRGeometryFactory::destroyGeometry(poOrigin);
+    value3 = T();
+    ASSERT_TRUE(value3.IsEmpty());
 }
 
 // Test if copy constructor and assignment operators succeeds on copying the
@@ -337,6 +314,60 @@ TEST_F(test_ogr, SpatialReference_leak_copy_constructor)
     testCopyEquals<OGRTriangulatedSurface>();
 }
 
+// Test crazy usage of OGRGeometryCollection copy constructor
+TEST_F(test_ogr, OGRGeometryCollection_copy_constructor_illegal_use)
+{
+    OGRGeometryCollection gc;
+    gc.addGeometryDirectly(new OGRPoint(1, 2));
+
+    OGRMultiPolygon mp;
+    mp.addGeometryDirectly(new OGRPolygon());
+
+    OGRGeometryCollection *mp_as_gc = &mp;
+    CPLErrorReset();
+    {
+        CPLErrorHandlerPusher oPusher(CPLQuietErrorHandler);
+        *mp_as_gc = gc;
+    }
+    EXPECT_STREQ(CPLGetLastErrorMsg(),
+                 "Illegal use of OGRGeometryCollection::operator=(): trying to "
+                 "assign an incompatible sub-geometry");
+    EXPECT_TRUE(mp.IsEmpty());
+}
+
+// Test crazy usage of OGRCurvePolygon copy constructor
+TEST_F(test_ogr, OGRCurvePolygon_copy_constructor_illegal_use)
+{
+    OGRCurvePolygon cp;
+    auto poCC = new OGRCircularString();
+    poCC->addPoint(0, 0);
+    poCC->addPoint(1, 1);
+    poCC->addPoint(2, 0);
+    poCC->addPoint(1, -1);
+    poCC->addPoint(0, 0);
+    cp.addRingDirectly(poCC);
+
+    OGRPolygon poly;
+    auto poLR = new OGRLinearRing();
+    poLR->addPoint(0, 0);
+    poLR->addPoint(1, 1);
+    poLR->addPoint(2, 0);
+    poLR->addPoint(1, -1);
+    poLR->addPoint(0, 0);
+    poly.addRingDirectly(poLR);
+
+    OGRCurvePolygon *poly_as_cp = &poly;
+    CPLErrorReset();
+    {
+        CPLErrorHandlerPusher oPusher(CPLQuietErrorHandler);
+        *poly_as_cp = cp;
+    }
+    EXPECT_STREQ(CPLGetLastErrorMsg(),
+                 "Illegal use of OGRCurvePolygon::operator=(): trying to "
+                 "assign an incompatible sub-geometry");
+    EXPECT_TRUE(poly.IsEmpty());
+}
+
 TEST_F(test_ogr, geometry_get_point)
 {
     {
@@ -1332,6 +1363,12 @@ TEST_F(test_ogr, OGRToOGCGeomType)
 // Test layer, dataset-feature and layer-feature iterators
 TEST_F(test_ogr, DatasetFeature_and_LayerFeature_iterators)
 {
+    if (!GDALGetDriverByName("ESRI Shapefile"))
+    {
+        GTEST_SKIP() << "ESRI Shapefile driver missing";
+        return;
+    }
+
     std::string file(data_ + SEP + "poly.shp");
     GDALDatasetUniquePtr poDS(GDALDataset::Open(file.c_str(), GDAL_OF_VECTOR));
     ASSERT_TRUE(poDS != nullptr);
@@ -4047,4 +4084,314 @@ TEST_F(test_ogr, OGRGeometry_IsRectangle)
     }
 }
 
+// Test OGRGeometry::removeEmptyParts()
+TEST_F(test_ogr, OGRGeometry_removeEmptyParts)
+{
+    {
+        OGRGeometry *poGeom = nullptr;
+        OGRGeometryFactory::createFromWkt("POINT EMPTY", nullptr, &poGeom);
+        ASSERT_NE(poGeom, nullptr);
+        EXPECT_FALSE(poGeom->hasEmptyParts());
+        poGeom->removeEmptyParts();
+        EXPECT_TRUE(poGeom->IsEmpty());
+        delete poGeom;
+    }
+    {
+        OGRGeometry *poGeom = nullptr;
+        OGRGeometryFactory::createFromWkt("POLYGON ((0 0,0 1,1 0,0 0))",
+                                          nullptr, &poGeom);
+        ASSERT_NE(poGeom, nullptr);
+        EXPECT_FALSE(poGeom->hasEmptyParts());
+        poGeom->removeEmptyParts();
+        EXPECT_NE(poGeom->toPolygon()->getExteriorRing(), nullptr);
+        delete poGeom;
+    }
+    {
+        OGRGeometry *poGeom = nullptr;
+        OGRGeometryFactory::createFromWkt("POLYGON ((0 0,0 1,1 0,0 0))",
+                                          nullptr, &poGeom);
+        ASSERT_NE(poGeom, nullptr);
+        poGeom->toPolygon()->addRingDirectly(new OGRLinearRing());
+        EXPECT_EQ(poGeom->toPolygon()->getNumInteriorRings(), 1);
+        EXPECT_TRUE(poGeom->hasEmptyParts());
+        poGeom->removeEmptyParts();
+        EXPECT_NE(poGeom->toPolygon()->getExteriorRing(), nullptr);
+        EXPECT_EQ(poGeom->toPolygon()->getNumInteriorRings(), 0);
+        EXPECT_FALSE(poGeom->hasEmptyParts());
+        delete poGeom;
+    }
+    {
+        OGRGeometry *poGeom = nullptr;
+        OGRGeometryFactory::createFromWkt("COMPOUNDCURVE ((0 0,1 1))", nullptr,
+                                          &poGeom);
+        ASSERT_NE(poGeom, nullptr);
+        EXPECT_FALSE(poGeom->hasEmptyParts());
+        poGeom->removeEmptyParts();
+        EXPECT_EQ(poGeom->toCompoundCurve()->getNumCurves(), 1);
+        delete poGeom;
+    }
+    {
+        OGRGeometry *poGeom = nullptr;
+        OGRGeometryFactory::createFromWkt("COMPOUNDCURVE ((0 0,1 1),(1 1,2 2))",
+                                          nullptr, &poGeom);
+        ASSERT_NE(poGeom, nullptr);
+        poGeom->toCompoundCurve()->getCurve(1)->empty();
+        EXPECT_EQ(poGeom->toCompoundCurve()->getNumCurves(), 2);
+        EXPECT_TRUE(poGeom->hasEmptyParts());
+        poGeom->removeEmptyParts();
+        EXPECT_FALSE(poGeom->hasEmptyParts());
+        EXPECT_EQ(poGeom->toCompoundCurve()->getNumCurves(), 1);
+        delete poGeom;
+    }
+    {
+        OGRGeometry *poGeom = nullptr;
+        OGRGeometryFactory::createFromWkt("GEOMETRYCOLLECTION (POINT(0 0))",
+                                          nullptr, &poGeom);
+        ASSERT_NE(poGeom, nullptr);
+        EXPECT_FALSE(poGeom->hasEmptyParts());
+        poGeom->removeEmptyParts();
+        EXPECT_EQ(poGeom->toGeometryCollection()->getNumGeometries(), 1);
+        delete poGeom;
+    }
+    {
+        OGRGeometry *poGeom = nullptr;
+        OGRGeometryFactory::createFromWkt(
+            "GEOMETRYCOLLECTION (POINT EMPTY,POINT(0 0),POINT EMPTY)", nullptr,
+            &poGeom);
+        ASSERT_NE(poGeom, nullptr);
+        EXPECT_EQ(poGeom->toGeometryCollection()->getNumGeometries(), 3);
+        EXPECT_TRUE(poGeom->hasEmptyParts());
+        poGeom->removeEmptyParts();
+        EXPECT_FALSE(poGeom->hasEmptyParts());
+        EXPECT_EQ(poGeom->toGeometryCollection()->getNumGeometries(), 1);
+        delete poGeom;
+    }
+    {
+        OGRGeometry *poGeom = nullptr;
+        OGRGeometryFactory::createFromWkt("GEOMETRYCOLLECTION EMPTY", nullptr,
+                                          &poGeom);
+        ASSERT_NE(poGeom, nullptr);
+        OGRGeometry *poPoly = nullptr;
+        OGRGeometryFactory::createFromWkt("POLYGON ((0 0,0 1,1 0,0 0))",
+                                          nullptr, &poPoly);
+        EXPECT_NE(poPoly, nullptr);
+        if (poPoly)
+        {
+            poPoly->toPolygon()->addRingDirectly(new OGRLinearRing());
+            poGeom->toGeometryCollection()->addGeometryDirectly(poPoly);
+            EXPECT_EQ(poGeom->toGeometryCollection()->getNumGeometries(), 1);
+            EXPECT_TRUE(poGeom->hasEmptyParts());
+            poGeom->removeEmptyParts();
+            EXPECT_FALSE(poGeom->hasEmptyParts());
+            EXPECT_EQ(poGeom->toGeometryCollection()->getNumGeometries(), 1);
+        }
+        delete poGeom;
+    }
+    {
+        OGRGeometry *poGeom = nullptr;
+        OGRGeometryFactory::createFromWkt(
+            "POLYHEDRALSURFACE (((0 0,0 1,1 1,0 0)))", nullptr, &poGeom);
+        ASSERT_NE(poGeom, nullptr);
+        EXPECT_FALSE(poGeom->hasEmptyParts());
+        poGeom->removeEmptyParts();
+        EXPECT_EQ(poGeom->toPolyhedralSurface()->getNumGeometries(), 1);
+        delete poGeom;
+    }
+    {
+        OGRGeometry *poGeom = nullptr;
+        OGRGeometryFactory::createFromWkt(
+            "POLYHEDRALSURFACE (((0 0,0 1,1 1,0 0)))", nullptr, &poGeom);
+        ASSERT_NE(poGeom, nullptr);
+        poGeom->toPolyhedralSurface()->addGeometryDirectly(new OGRPolygon());
+        EXPECT_EQ(poGeom->toPolyhedralSurface()->getNumGeometries(), 2);
+        EXPECT_TRUE(poGeom->hasEmptyParts());
+        poGeom->removeEmptyParts();
+        EXPECT_FALSE(poGeom->hasEmptyParts());
+        EXPECT_EQ(poGeom->toPolyhedralSurface()->getNumGeometries(), 1);
+        delete poGeom;
+    }
+}
+
+// Test OGRCurve::reversePoints()
+TEST_F(test_ogr, OGRCurve_reversePoints)
+{
+    {
+        OGRGeometry *poGeom = nullptr;
+        OGRGeometryFactory::createFromWkt(
+            "COMPOUNDCURVE ZM (CIRCULARSTRING ZM (0 0 10 20,1 1 11 21,2 0 12 "
+            "22),(2 0 12 22,3 0 13 2))",
+            nullptr, &poGeom);
+        ASSERT_NE(poGeom, nullptr);
+        poGeom->toCurve()->reversePoints();
+        char *pszWKT = nullptr;
+        poGeom->exportToWkt(&pszWKT, wkbVariantIso);
+        EXPECT_TRUE(pszWKT != nullptr);
+        if (pszWKT)
+        {
+            EXPECT_STREQ(
+                pszWKT, "COMPOUNDCURVE ZM ((3 0 13 2,2 0 12 22),CIRCULARSTRING "
+                        "ZM (2 0 12 22,1 1 11 21,0 0 10 20))");
+        }
+        CPLFree(pszWKT);
+        delete poGeom;
+    }
+}
+
+// Test OGRGeometryFactory::transformWithOptions()
+TEST_F(test_ogr, transformWithOptions)
+{
+    // Projected CRS to national geographic CRS (not including poles or antimeridian)
+    OGRGeometry *poGeom = nullptr;
+    OGRGeometryFactory::createFromWkt(
+        "LINESTRING(700000 6600000, 700001 6600001)", nullptr, &poGeom);
+    ASSERT_NE(poGeom, nullptr);
+
+    OGRSpatialReference oEPSG_2154;
+    oEPSG_2154.importFromEPSG(2154);  // "RGF93 v1 / Lambert-93"
+    OGRSpatialReference oEPSG_4171;
+    oEPSG_4171.importFromEPSG(4171);  // "RGF93 v1"
+    oEPSG_4171.SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+    auto poCT = std::unique_ptr<OGRCoordinateTransformation>(
+        OGRCreateCoordinateTransformation(&oEPSG_2154, &oEPSG_4171));
+    OGRGeometryFactory::TransformWithOptionsCache oCache;
+    poGeom = OGRGeometryFactory::transformWithOptions(poGeom, poCT.get(),
+                                                      nullptr, oCache);
+    EXPECT_NEAR(poGeom->toLineString()->getX(0), 3, 1e-8);
+    EXPECT_NEAR(poGeom->toLineString()->getY(0), 46.5, 1e-8);
+
+    delete poGeom;
+}
+
+#ifdef HAVE_GEOS
+
+// Test OGRGeometryFactory::transformWithOptions()
+TEST_F(test_ogr, transformWithOptions_GEOS)
+{
+    // Projected CRS to national geographic CRS including antimeridian
+    OGRGeometry *poGeom = nullptr;
+    OGRGeometryFactory::createFromWkt(
+        "LINESTRING(657630.64 4984896.17,815261.43 4990738.26)", nullptr,
+        &poGeom);
+    ASSERT_NE(poGeom, nullptr);
+
+    OGRSpatialReference oEPSG_6329;
+    oEPSG_6329.importFromEPSG(6329);  // "NAD83(2011) / UTM zone 60N"
+    OGRSpatialReference oEPSG_6318;
+    oEPSG_6318.importFromEPSG(6318);  // "NAD83(2011)"
+    oEPSG_6318.SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+    auto poCT = std::unique_ptr<OGRCoordinateTransformation>(
+        OGRCreateCoordinateTransformation(&oEPSG_6329, &oEPSG_6318));
+    OGRGeometryFactory::TransformWithOptionsCache oCache;
+    poGeom = OGRGeometryFactory::transformWithOptions(poGeom, poCT.get(),
+                                                      nullptr, oCache);
+    EXPECT_EQ(poGeom->getGeometryType(), wkbMultiLineString);
+    if (poGeom->getGeometryType() == wkbMultiLineString)
+    {
+        const auto poMLS = poGeom->toMultiLineString();
+        EXPECT_EQ(poMLS->getNumGeometries(), 2);
+        if (poMLS->getNumGeometries() == 2)
+        {
+            const auto poLS = poMLS->getGeometryRef(0);
+            EXPECT_EQ(poLS->getNumPoints(), 2);
+            if (poLS->getNumPoints() == 2)
+            {
+                EXPECT_NEAR(poLS->getX(0), 179, 1e-6);
+                EXPECT_NEAR(poLS->getY(0), 45, 1e-6);
+                EXPECT_NEAR(poLS->getX(1), 180, 1e-6);
+                EXPECT_NEAR(poLS->getY(1), 45.004384301691303, 1e-6);
+            }
+        }
+    }
+
+    delete poGeom;
+}
+#endif
+
+// Test OGRCurvePolygon::addRingDirectly
+TEST_F(test_ogr, OGRCurvePolygon_addRingDirectly)
+{
+    OGRCurvePolygon cp;
+    OGRGeometry *ring;
+
+    // closed CircularString
+    OGRGeometryFactory::createFromWkt(
+        "CIRCULARSTRING (0 0, 1 1, 2 0, 1 -1, 0 0)", nullptr, &ring);
+    ASSERT_TRUE(ring);
+    EXPECT_EQ(cp.addRingDirectly(ring->toCurve()), OGRERR_NONE);
+
+    // open CircularString
+    OGRGeometryFactory::createFromWkt("CIRCULARSTRING (0 0, 1 1, 2 0)", nullptr,
+                                      &ring);
+    ASSERT_TRUE(ring);
+    {
+        CPLConfigOptionSetter oSetter("OGR_GEOMETRY_ACCEPT_UNCLOSED_RING", "NO",
+                                      false);
+        ASSERT_EQ(cp.addRingDirectly(ring->toCurve()),
+                  OGRERR_UNSUPPORTED_GEOMETRY_TYPE);
+    }
+    EXPECT_EQ(cp.addRingDirectly(ring->toCurve()), OGRERR_NONE);
+
+    // closed CompoundCurve
+    OGRGeometryFactory::createFromWkt(
+        "COMPOUNDCURVE( CIRCULARSTRING (0 0, 1 1, 2 0), (2 0, 0 0))", nullptr,
+        &ring);
+    ASSERT_TRUE(ring);
+    EXPECT_EQ(cp.addRingDirectly(ring->toCurve()), OGRERR_NONE);
+
+    // closed LineString
+    OGRGeometryFactory::createFromWkt("LINESTRING (0 0, 1 0, 1 1, 0 1, 0 0)",
+                                      nullptr, &ring);
+    ASSERT_TRUE(ring);
+    EXPECT_EQ(cp.addRingDirectly(ring->toCurve()), OGRERR_NONE);
+
+    // LinearRing
+    auto lr = std::make_unique<OGRLinearRing>();
+    lr->addPoint(0, 0);
+    lr->addPoint(1, 0);
+    lr->addPoint(1, 1);
+    lr->addPoint(0, 1);
+    lr->addPoint(0, 0);
+    ASSERT_TRUE(ring);
+    ASSERT_EQ(cp.addRingDirectly(lr.get()), OGRERR_UNSUPPORTED_GEOMETRY_TYPE);
+}
+
+// Test OGRPolygon::addRingDirectly
+TEST_F(test_ogr, OGRPolygon_addRingDirectly)
+{
+    OGRPolygon p;
+    OGRGeometry *ring;
+
+    // closed CircularString
+    OGRGeometryFactory::createFromWkt(
+        "CIRCULARSTRING (0 0, 1 1, 2 0, 1 -1, 0 0)", nullptr, &ring);
+    ASSERT_TRUE(ring);
+    EXPECT_EQ(p.addRingDirectly(ring->toCurve()),
+              OGRERR_UNSUPPORTED_GEOMETRY_TYPE);
+    delete ring;
+
+    // closed LineString
+    OGRGeometryFactory::createFromWkt("LINESTRING (0 0, 1 0, 1 1, 0 1, 0 0)",
+                                      nullptr, &ring);
+    ASSERT_TRUE(ring);
+    EXPECT_EQ(p.addRingDirectly(ring->toCurve()),
+              OGRERR_UNSUPPORTED_GEOMETRY_TYPE);
+    delete ring;
+
+    // open LineString
+    OGRGeometryFactory::createFromWkt("LINESTRING (0 0, 1 0)", nullptr, &ring);
+    ASSERT_TRUE(ring);
+    EXPECT_EQ(p.addRingDirectly(ring->toCurve()),
+              OGRERR_UNSUPPORTED_GEOMETRY_TYPE);
+    delete ring;
+
+    // LinearRing
+    auto lr = std::make_unique<OGRLinearRing>();
+    lr->addPoint(0, 0);
+    lr->addPoint(1, 0);
+    lr->addPoint(1, 1);
+    lr->addPoint(0, 1);
+    lr->addPoint(0, 0);
+    ASSERT_EQ(p.addRingDirectly(lr.release()), OGRERR_NONE);
+}
+
 }  // namespace
diff --git a/autotest/cpp/test_ogr_geometry_stealing.cpp b/autotest/cpp/test_ogr_geometry_stealing.cpp
index 0c0e861fed88..5edd98542617 100644
--- a/autotest/cpp/test_ogr_geometry_stealing.cpp
+++ b/autotest/cpp/test_ogr_geometry_stealing.cpp
@@ -7,24 +7,7 @@
  ******************************************************************************
  * Copyright (C) 2022 mathieu17g
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************/
 
 #include "gdal_unit_test.h"
diff --git a/autotest/cpp/test_ogr_geos.cpp b/autotest/cpp/test_ogr_geos.cpp
index 1d2c5afcf474..461947f200b5 100644
--- a/autotest/cpp/test_ogr_geos.cpp
+++ b/autotest/cpp/test_ogr_geos.cpp
@@ -8,23 +8,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright (c) 2006, Mateusz Loskot <mateusz@loskot.net>
 /*
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_unit_test.h"
diff --git a/autotest/cpp/test_ogr_organize_polygons.cpp b/autotest/cpp/test_ogr_organize_polygons.cpp
index e4b1ccb51042..64780361dc8c 100644
--- a/autotest/cpp/test_ogr_organize_polygons.cpp
+++ b/autotest/cpp/test_ogr_organize_polygons.cpp
@@ -7,23 +7,7 @@
  **********************************************************************
  * Copyright (c) 2023, ISciences LLC
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_unit_test.h"
diff --git a/autotest/cpp/test_ogr_shape.cpp b/autotest/cpp/test_ogr_shape.cpp
index f70c05c0cf64..9cdf2e165294 100644
--- a/autotest/cpp/test_ogr_shape.cpp
+++ b/autotest/cpp/test_ogr_shape.cpp
@@ -8,23 +8,7 @@
 // Copyright (c) 2006, Mateusz Loskot <mateusz@loskot.net>
 // Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_unit_test.h"
@@ -63,6 +47,8 @@ struct test_ogr_shape : public ::testing::Test
 
     void TearDown() override
     {
+        if (!drv_)
+            return;
         OGRDataSourceH ds =
             OGR_Dr_CreateDataSource(drv_, data_tmp_.c_str(), nullptr);
         if (ds == nullptr)
@@ -545,7 +531,7 @@ TEST_F(test_ogr_shape, spatial_filtering)
     OGR_DS_Destroy(ds);
 }
 
-TEST(test_ogr_shape_gdal, create)
+TEST_F(test_ogr_shape, create_gdal)
 {
     GDALDriver *shpDriver =
         GetGDALDriverManager()->GetDriverByName("ESRI Shapefile");
diff --git a/autotest/cpp/test_ogr_swq.cpp b/autotest/cpp/test_ogr_swq.cpp
index 520a5846ba86..d10ca8c929d8 100644
--- a/autotest/cpp/test_ogr_swq.cpp
+++ b/autotest/cpp/test_ogr_swq.cpp
@@ -7,23 +7,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright (c) 2023, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_unit_test.h"
@@ -216,7 +200,8 @@ TEST_F(test_ogr_swq, select_unparse)
         swq_select select;
         const char *pszSQL =
             "SELECT DISTINCT a, \"a b\" AS renamed, AVG(x.a) AS avg, MIN(a), "
-            "MAX(\"a b\"), SUM(a), AVG(a), COUNT(a), COUNT(DISTINCT a) "
+            "MAX(\"a b\"), SUM(a), AVG(a), COUNT(a), COUNT(DISTINCT a), "
+            "STDDEV_POP(a), STDDEV_SAMP(a) "
             "FROM 'foo'.\"FOO BAR\" AS x "
             "JOIN 'bar'.BAR AS y ON FOO.x = BAR.y "
             "WHERE 1 ORDER BY a, \"a b\" DESC "
diff --git a/autotest/cpp/test_ogr_wkb.cpp b/autotest/cpp/test_ogr_wkb.cpp
index ed86e66fd6a6..bff0f2df08a0 100644
--- a/autotest/cpp/test_ogr_wkb.cpp
+++ b/autotest/cpp/test_ogr_wkb.cpp
@@ -7,23 +7,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright (c) 2023, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_unit_test.h"
@@ -524,4 +508,354 @@ INSTANTIATE_TEST_SUITE_P(
         OGRWKBIntersectsPessimisticFixture::ParamType> &l_info)
     { return std::get<6>(l_info.param); });
 
+class OGRWKBTransformFixture
+    : public test_ogr_wkb,
+      public ::testing::WithParamInterface<
+          std::tuple<const char *, OGRwkbByteOrder, const char *, const char *>>
+{
+  public:
+    static std::vector<
+        std::tuple<const char *, OGRwkbByteOrder, const char *, const char *>>
+    GetTupleValues()
+    {
+        return {
+            std::make_tuple("POINT EMPTY", wkbNDR, "POINT EMPTY",
+                            "POINT_EMPTY_NDR"),
+            std::make_tuple("POINT EMPTY", wkbXDR, "POINT EMPTY",
+                            "POINT_EMPTY_XDR"),
+            std::make_tuple("POINT (1 2)", wkbNDR, "POINT (2 4)", "POINT_NDR"),
+            std::make_tuple("POINT (1 2)", wkbXDR, "POINT (2 4)", "POINT_XDR"),
+            std::make_tuple("POINT Z EMPTY", wkbNDR, "POINT Z EMPTY",
+                            "POINT_Z_EMPTY_NDR"),
+            std::make_tuple("POINT Z EMPTY", wkbXDR, "POINT Z EMPTY",
+                            "POINT_Z_EMPTY_XDR"),
+            std::make_tuple("POINT Z (1 2 3)", wkbNDR, "POINT Z (2 4 6)",
+                            "POINT_Z_NDR"),
+            std::make_tuple("POINT Z (1 2 3)", wkbXDR, "POINT Z (2 4 6)",
+                            "POINT_Z_XDR"),
+            std::make_tuple("POINT M EMPTY", wkbNDR, "POINT M EMPTY",
+                            "POINT_M_EMPTY_NDR"),
+            std::make_tuple("POINT M EMPTY", wkbXDR, "POINT M EMPTY",
+                            "POINT_M_EMPTY_XDR"),
+            std::make_tuple("POINT M (1 2 -10)", wkbNDR, "POINT M (2 4 -10)",
+                            "POINT_M_NDR"),
+            std::make_tuple("POINT M (1 2 -10)", wkbXDR, "POINT M (2 4 -10)",
+                            "POINT_M_XDR"),
+            std::make_tuple("POINT ZM EMPTY", wkbNDR, "POINT ZM EMPTY",
+                            "POINT_ZM_EMPTY_NDR"),
+            std::make_tuple("POINT ZM EMPTY", wkbXDR, "POINT ZM EMPTY",
+                            "POINT_ZM_EMPTY_XDR"),
+            std::make_tuple("POINT ZM (1 2 3 10)", wkbNDR,
+                            "POINT ZM (2 4 6 10)", "POINT_ZM_NDR"),
+            std::make_tuple("POINT ZM (1 2 3 10)", wkbXDR,
+                            "POINT ZM (2 4 6 10)", "POINT_ZM_XDR"),
+
+            std::make_tuple("LINESTRING EMPTY", wkbNDR, "LINESTRING EMPTY",
+                            "LINESTRING_EMPTY"),
+            std::make_tuple("LINESTRING (1 2,11 12)", wkbNDR,
+                            "LINESTRING (2 4,12 14)", "LINESTRING_NDR"),
+            std::make_tuple("LINESTRING (1 2,11 12)", wkbXDR,
+                            "LINESTRING (2 4,12 14)", "LINESTRING_XDR"),
+            std::make_tuple("LINESTRING Z EMPTY", wkbNDR, "LINESTRING Z EMPTY",
+                            "LINESTRING_Z_EMPTY"),
+            std::make_tuple("LINESTRING Z (1 2 3,11 12 13)", wkbNDR,
+                            "LINESTRING Z (2 4 6,12 14 16)",
+                            "LINESTRING_Z_NDR"),
+            std::make_tuple("LINESTRING Z (1 2 3,11 12 13)", wkbXDR,
+                            "LINESTRING Z (2 4 6,12 14 16)",
+                            "LINESTRING_Z_XDR"),
+            std::make_tuple("LINESTRING M EMPTY", wkbNDR, "LINESTRING M EMPTY",
+                            "LINESTRING_M_EMPTY"),
+            std::make_tuple("LINESTRING M (1 2 -10,11 12 -20)", wkbNDR,
+                            "LINESTRING M (2 4 -10,12 14 -20)",
+                            "LINESTRING_M_NDR"),
+            std::make_tuple("LINESTRING M (1 2 -10,11 12 -20)", wkbXDR,
+                            "LINESTRING M (2 4 -10,12 14 -20)",
+                            "LINESTRING_M_XDR"),
+            std::make_tuple("LINESTRING ZM EMPTY", wkbNDR,
+                            "LINESTRING ZM EMPTY", "LINESTRING_ZM_EMPTY"),
+            std::make_tuple("LINESTRING ZM (1 2 3 -10,11 12 13 -20)", wkbNDR,
+                            "LINESTRING ZM (2 4 6 -10,12 14 16 -20)",
+                            "LINESTRING_ZM_NDR"),
+            std::make_tuple("LINESTRING ZM (1 2 3 -10,11 12 13 -20)", wkbXDR,
+                            "LINESTRING ZM (2 4 6 -10,12 14 16 -20)",
+                            "LINESTRING_ZM_XDR"),
+
+            // I know the polygon is invalid, but this is enough for our purposes
+            std::make_tuple("POLYGON EMPTY", wkbNDR, "POLYGON EMPTY",
+                            "POLYGON_EMPTY"),
+            std::make_tuple("POLYGON ((1 2,11 12))", wkbNDR,
+                            "POLYGON ((2 4,12 14))", "POLYGON_NDR"),
+            std::make_tuple("POLYGON ((1 2,11 12))", wkbXDR,
+                            "POLYGON ((2 4,12 14))", "POLYGON_XDR"),
+            std::make_tuple("POLYGON ((1 2,11 12),(21 22,31 32))", wkbNDR,
+                            "POLYGON ((2 4,12 14),(22 24,32 34))",
+                            "POLYGON_TWO_RINGS"),
+            std::make_tuple("POLYGON Z EMPTY", wkbNDR, "POLYGON Z EMPTY",
+                            "POLYGON_Z_EMPTY"),
+            std::make_tuple("POLYGON Z ((1 2 3,11 12 13))", wkbNDR,
+                            "POLYGON Z ((2 4 6,12 14 16))", "POLYGON_Z_NDR"),
+            std::make_tuple("POLYGON Z ((1 2 3,11 12 13))", wkbXDR,
+                            "POLYGON Z ((2 4 6,12 14 16))", "POLYGON_Z_XDR"),
+            std::make_tuple("POLYGON M EMPTY", wkbNDR, "POLYGON M EMPTY",
+                            "POLYGON_M_EMPTY"),
+            std::make_tuple("POLYGON M ((1 2 -10,11 12 -20))", wkbNDR,
+                            "POLYGON M ((2 4 -10,12 14 -20))", "POLYGON_M_NDR"),
+            std::make_tuple("POLYGON M ((1 2 -10,11 12 -20))", wkbXDR,
+                            "POLYGON M ((2 4 -10,12 14 -20))", "POLYGON_M_XDR"),
+            std::make_tuple("POLYGON ZM EMPTY", wkbNDR, "POLYGON ZM EMPTY",
+                            "POLYGON_ZM_EMPTY"),
+            std::make_tuple("POLYGON ZM ((1 2 3 -10,11 12 13 -20))", wkbNDR,
+                            "POLYGON ZM ((2 4 6 -10,12 14 16 -20))",
+                            "POLYGON_ZM_NDR"),
+            std::make_tuple("POLYGON ZM ((1 2 3 -10,11 12 13 -20))", wkbXDR,
+                            "POLYGON ZM ((2 4 6 -10,12 14 16 -20))",
+                            "POLYGON_ZM_XDR"),
+
+            std::make_tuple("MULTIPOINT EMPTY", wkbNDR, "MULTIPOINT EMPTY",
+                            "MULTIPOINT_EMPTY_NDR"),
+            std::make_tuple("MULTIPOINT ((1 2),(11 12))", wkbNDR,
+                            "MULTIPOINT ((2 4),(12 14))", "MULTIPOINT_NDR"),
+            std::make_tuple("MULTIPOINT Z ((1 2 3),(11 12 13))", wkbXDR,
+                            "MULTIPOINT Z ((2 4 6),(12 14 16))",
+                            "MULTIPOINT_Z_XDR"),
+
+            std::make_tuple("MULTILINESTRING ((1 2,11 12))", wkbNDR,
+                            "MULTILINESTRING ((2 4,12 14))",
+                            "MULTILINESTRING_NDR"),
+
+            std::make_tuple("MULTIPOLYGON (((1 2,11 12)))", wkbNDR,
+                            "MULTIPOLYGON (((2 4,12 14)))", "MULTIPOLYGON_NDR"),
+
+            std::make_tuple("GEOMETRYCOLLECTION (POLYGON ((1 2,11 12)))",
+                            wkbNDR,
+                            "GEOMETRYCOLLECTION (POLYGON ((2 4,12 14)))",
+                            "GEOMETRYCOLLECTION_NDR"),
+
+            std::make_tuple("CIRCULARSTRING (1 2,11 12,21 22)", wkbNDR,
+                            "CIRCULARSTRING (2 4,12 14,22 24)",
+                            "CIRCULARSTRING_NDR"),
+
+            std::make_tuple("COMPOUNDCURVE ((1 2,11 12))", wkbNDR,
+                            "COMPOUNDCURVE ((2 4,12 14))", "COMPOUNDCURVE_NDR"),
+
+            std::make_tuple("CURVEPOLYGON ((1 2,11 12,21 22,1 2))", wkbNDR,
+                            "CURVEPOLYGON ((2 4,12 14,22 24,2 4))",
+                            "CURVEPOLYGON_NDR"),
+
+            std::make_tuple("MULTICURVE ((1 2,11 12))", wkbNDR,
+                            "MULTICURVE ((2 4,12 14))", "MULTICURVE_NDR"),
+
+            std::make_tuple("MULTISURFACE (((1 2,11 12)))", wkbNDR,
+                            "MULTISURFACE (((2 4,12 14)))", "MULTISURFACE_NDR"),
+
+            std::make_tuple("TRIANGLE ((1 2,11 12,21 22,1 2))", wkbNDR,
+                            "TRIANGLE ((2 4,12 14,22 24,2 4))", "TRIANGLE_NDR"),
+
+            std::make_tuple("POLYHEDRALSURFACE (((1 2,11 12,21 22,1 2)))",
+                            wkbNDR,
+                            "POLYHEDRALSURFACE (((2 4,12 14,22 24,2 4)))",
+                            "POLYHEDRALSURFACE_NDR"),
+
+            std::make_tuple("TIN (((1 2,11 12,21 22,1 2)))", wkbNDR,
+                            "TIN (((2 4,12 14,22 24,2 4)))", "TIN_NDR"),
+        };
+    }
+};
+
+struct MyCT final : public OGRCoordinateTransformation
+{
+    const bool m_bSuccess;
+
+    explicit MyCT(bool bSuccess = true) : m_bSuccess(bSuccess)
+    {
+    }
+
+    const OGRSpatialReference *GetSourceCS() const override
+    {
+        return nullptr;
+    }
+
+    const OGRSpatialReference *GetTargetCS() const override
+    {
+        return nullptr;
+    }
+
+    int Transform(size_t nCount, double *x, double *y, double *z, double *,
+                  int *pabSuccess) override
+    {
+        for (size_t i = 0; i < nCount; ++i)
+        {
+            x[i] += 1;
+            y[i] += 2;
+            if (z)
+                z[i] += 3;
+            if (pabSuccess)
+                pabSuccess[i] = m_bSuccess;
+        }
+        return true;
+    }
+
+    OGRCoordinateTransformation *Clone() const override
+    {
+        return new MyCT();
+    }
+
+    OGRCoordinateTransformation *GetInverse() const override
+    {
+        return nullptr;
+    }  // unused
+};
+
+TEST_P(OGRWKBTransformFixture, test)
+{
+    const char *pszInput = std::get<0>(GetParam());
+    OGRwkbByteOrder eByteOrder = std::get<1>(GetParam());
+    const char *pszOutput = std::get<2>(GetParam());
+
+    MyCT oCT;
+    oCT.GetSourceCS();        // just for code coverage purpose
+    oCT.GetTargetCS();        // just for code coverage purpose
+    delete oCT.Clone();       // just for code coverage purpose
+    delete oCT.GetInverse();  // just for code coverage purpose
+
+    OGRGeometry *poGeom = nullptr;
+    EXPECT_EQ(OGRGeometryFactory::createFromWkt(pszInput, nullptr, &poGeom),
+              OGRERR_NONE);
+    ASSERT_TRUE(poGeom != nullptr);
+    std::vector<GByte> abyWkb(poGeom->WkbSize());
+    poGeom->exportToWkb(eByteOrder, abyWkb.data(), wkbVariantIso);
+    delete poGeom;
+
+    OGRWKBTransformCache oCache;
+    OGREnvelope3D sEnv;
+    EXPECT_TRUE(
+        OGRWKBTransform(abyWkb.data(), abyWkb.size(), &oCT, oCache, sEnv));
+    const auto abyWkbOri = abyWkb;
+
+    poGeom = nullptr;
+    OGRGeometryFactory::createFromWkb(abyWkb.data(), nullptr, &poGeom,
+                                      abyWkb.size());
+    ASSERT_TRUE(poGeom != nullptr);
+    char *pszWKT = nullptr;
+    poGeom->exportToWkt(&pszWKT, wkbVariantIso);
+    delete poGeom;
+    EXPECT_STREQ(pszWKT, pszOutput);
+    CPLFree(pszWKT);
+
+    {
+        CPLErrorHandlerPusher oErrorHandler(CPLQuietErrorHandler);
+
+        // Truncated geometry
+        for (size_t i = 0; i < abyWkb.size(); ++i)
+        {
+            abyWkb = abyWkbOri;
+            EXPECT_FALSE(OGRWKBTransform(abyWkb.data(), i, &oCT, oCache, sEnv));
+        }
+
+        // Check altering all bytes
+        for (size_t i = 0; i < abyWkb.size(); ++i)
+        {
+            abyWkb = abyWkbOri;
+            abyWkb[i] = 0xff;
+            CPL_IGNORE_RET_VAL(OGRWKBTransform(abyWkb.data(), abyWkb.size(),
+                                               &oCT, oCache, sEnv));
+        }
+
+        if (abyWkb.size() > 9)
+        {
+            abyWkb = abyWkbOri;
+            if (!STARTS_WITH(pszInput, "POINT"))
+            {
+                // Corrupt number of sub-geometries
+                abyWkb[5] = 0xff;
+                abyWkb[6] = 0xff;
+                abyWkb[7] = 0xff;
+                abyWkb[8] = 0xff;
+                EXPECT_FALSE(OGRWKBTransform(abyWkb.data(), abyWkb.size(), &oCT,
+                                             oCache, sEnv));
+            }
+        }
+    }
+}
+
+INSTANTIATE_TEST_SUITE_P(
+    test_ogr_wkb, OGRWKBTransformFixture,
+    ::testing::ValuesIn(OGRWKBTransformFixture::GetTupleValues()),
+    [](const ::testing::TestParamInfo<OGRWKBTransformFixture::ParamType>
+           &l_info) { return std::get<3>(l_info.param); });
+
+TEST_F(test_ogr_wkb, OGRWKBTransformFixture_rec_collection)
+{
+    std::vector<GByte> abyWkb;
+    constexpr int BEYOND_ALLOWED_RECURSION_LEVEL = 128;
+    for (int i = 0; i < BEYOND_ALLOWED_RECURSION_LEVEL; ++i)
+    {
+        abyWkb.push_back(wkbNDR);
+        abyWkb.push_back(wkbGeometryCollection);
+        abyWkb.push_back(0);
+        abyWkb.push_back(0);
+        abyWkb.push_back(0);
+        abyWkb.push_back(1);
+        abyWkb.push_back(0);
+        abyWkb.push_back(0);
+        abyWkb.push_back(0);
+    }
+    {
+        abyWkb.push_back(wkbNDR);
+        abyWkb.push_back(wkbGeometryCollection);
+        abyWkb.push_back(0);
+        abyWkb.push_back(0);
+        abyWkb.push_back(0);
+        abyWkb.push_back(0);
+        abyWkb.push_back(0);
+        abyWkb.push_back(0);
+        abyWkb.push_back(0);
+    }
+
+    MyCT oCT;
+    OGRWKBTransformCache oCache;
+    OGREnvelope3D sEnv;
+    EXPECT_FALSE(
+        OGRWKBTransform(abyWkb.data(), abyWkb.size(), &oCT, oCache, sEnv));
+}
+
+TEST_F(test_ogr_wkb, OGRWKBTransformFixture_ct_failure)
+{
+    MyCT oCT(/* bSuccess = */ false);
+    OGRWKBTransformCache oCache;
+    OGREnvelope3D sEnv;
+    {
+        OGRPoint p(1, 2);
+        std::vector<GByte> abyWkb(p.WkbSize());
+        static_cast<OGRGeometry &>(p).exportToWkb(wkbNDR, abyWkb.data(),
+                                                  wkbVariantIso);
+
+        EXPECT_FALSE(
+            OGRWKBTransform(abyWkb.data(), abyWkb.size(), &oCT, oCache, sEnv));
+    }
+    {
+        OGRLineString ls;
+        ls.addPoint(1, 2);
+        std::vector<GByte> abyWkb(ls.WkbSize());
+        static_cast<OGRGeometry &>(ls).exportToWkb(wkbNDR, abyWkb.data(),
+                                                   wkbVariantIso);
+
+        EXPECT_FALSE(
+            OGRWKBTransform(abyWkb.data(), abyWkb.size(), &oCT, oCache, sEnv));
+    }
+    {
+        OGRPolygon p;
+        auto poLR = std::make_unique<OGRLinearRing>();
+        poLR->addPoint(1, 2);
+        p.addRing(std::move(poLR));
+        std::vector<GByte> abyWkb(p.WkbSize());
+        static_cast<OGRGeometry &>(p).exportToWkb(wkbNDR, abyWkb.data(),
+                                                  wkbVariantIso);
+
+        EXPECT_FALSE(
+            OGRWKBTransform(abyWkb.data(), abyWkb.size(), &oCT, oCache, sEnv));
+    }
+}
+
 }  // namespace
diff --git a/autotest/cpp/test_osr.cpp b/autotest/cpp/test_osr.cpp
index 23aed5a65307..0a03b2619ac9 100644
--- a/autotest/cpp/test_osr.cpp
+++ b/autotest/cpp/test_osr.cpp
@@ -7,23 +7,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright (c) 2006, Mateusz Loskot <mateusz@loskot.net>
 /*
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_unit_test.h"
diff --git a/autotest/cpp/test_osr_ct.cpp b/autotest/cpp/test_osr_ct.cpp
index ee8a4066e757..e112250f18fb 100644
--- a/autotest/cpp/test_osr_ct.cpp
+++ b/autotest/cpp/test_osr_ct.cpp
@@ -7,23 +7,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright (c) 2006, Mateusz Loskot <mateusz@loskot.net>
 /*
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_unit_test.h"
diff --git a/autotest/cpp/test_osr_pci.cpp b/autotest/cpp/test_osr_pci.cpp
index b75e47e08974..b2c5f8b0fba1 100644
--- a/autotest/cpp/test_osr_pci.cpp
+++ b/autotest/cpp/test_osr_pci.cpp
@@ -8,23 +8,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright (c) 2006, Mateusz Loskot <mateusz@loskot.net>
 /*
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_unit_test.h"
diff --git a/autotest/cpp/test_osr_proj4.cpp b/autotest/cpp/test_osr_proj4.cpp
index 18ddf15ece45..0fff5fd1771a 100644
--- a/autotest/cpp/test_osr_proj4.cpp
+++ b/autotest/cpp/test_osr_proj4.cpp
@@ -8,23 +8,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright (c) 2006, Mateusz Loskot <mateusz@loskot.net>
 /*
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_unit_test.h"
diff --git a/autotest/cpp/test_osr_set_proj_search_paths.cpp b/autotest/cpp/test_osr_set_proj_search_paths.cpp
index d3c0b0538775..7a41c072130d 100644
--- a/autotest/cpp/test_osr_set_proj_search_paths.cpp
+++ b/autotest/cpp/test_osr_set_proj_search_paths.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2019, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <stdlib.h>
diff --git a/autotest/cpp/test_triangulation.cpp b/autotest/cpp/test_triangulation.cpp
index 9460140ac962..0241c2df11b6 100644
--- a/autotest/cpp/test_triangulation.cpp
+++ b/autotest/cpp/test_triangulation.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/autotest/cpp/test_utilities.cpp b/autotest/cpp/test_utilities.cpp
index 52849efcb387..b3dedd60b623 100644
--- a/autotest/cpp/test_utilities.cpp
+++ b/autotest/cpp/test_utilities.cpp
@@ -7,23 +7,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright (c) 2023, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_unit_test.h"
diff --git a/autotest/cpp/test_viewshed.cpp b/autotest/cpp/test_viewshed.cpp
new file mode 100644
index 000000000000..484ad9c4746b
--- /dev/null
+++ b/autotest/cpp/test_viewshed.cpp
@@ -0,0 +1,483 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+// Project:  C++ Test Suite for GDAL/OGR
+// Purpose:  Test viewshed algorithm
+// Author:   Andrew Bell
+//
+///////////////////////////////////////////////////////////////////////////////
+/*
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#include <algorithm>
+#include <array>
+#include <utility>
+
+#include "gdal_unit_test.h"
+
+#include "gtest_include.h"
+
+#include "viewshed/viewshed.h"
+
+namespace gdal
+{
+namespace viewshed
+{
+
+namespace
+{
+using Coord = std::pair<int, int>;
+using DatasetPtr = std::unique_ptr<GDALDataset>;
+using Transform = std::array<double, 6>;
+Transform identity{0, 1, 0, 0, 0, 1};
+
+Options stdOptions(int x, int y)
+{
+    Options opts;
+    opts.observer.x = x;
+    opts.observer.y = y;
+    opts.outputFilename = "none";
+    opts.outputFormat = "mem";
+    opts.curveCoeff = 0;
+
+    return opts;
+}
+
+Options stdOptions(const Coord &observer)
+{
+    return stdOptions(observer.first, observer.second);
+}
+
+DatasetPtr runViewshed(const int8_t *in, int xlen, int ylen,
+                       const Options &opts)
+{
+    Viewshed v(opts);
+
+    GDALDriver *driver = (GDALDriver *)GDALGetDriverByName("MEM");
+    GDALDataset *dataset = driver->Create("", xlen, ylen, 1, GDT_Int8, nullptr);
+    EXPECT_TRUE(dataset);
+    dataset->SetGeoTransform(identity.data());
+    GDALRasterBand *band = dataset->GetRasterBand(1);
+    EXPECT_TRUE(band);
+    CPLErr err = band->RasterIO(GF_Write, 0, 0, xlen, ylen, (int8_t *)in, xlen,
+                                ylen, GDT_Int8, 0, 0, nullptr);
+    EXPECT_EQ(err, CE_None);
+
+    EXPECT_TRUE(v.run(band));
+    return v.output();
+}
+
+}  // namespace
+
+TEST(Viewshed, all_visible)
+{
+    // clang-format off
+    const int xlen = 3;
+    const int ylen = 3;
+    std::array<int8_t, xlen * ylen> in
+    {
+        1, 2, 3,
+        4, 5, 6,
+        3, 2, 1
+    };
+    // clang-format on
+
+    SCOPED_TRACE("all_visible");
+    DatasetPtr output = runViewshed(in.data(), xlen, ylen, stdOptions(1, 1));
+
+    std::array<uint8_t, xlen * ylen> out;
+    GDALRasterBand *band = output->GetRasterBand(1);
+    CPLErr err = band->RasterIO(GF_Read, 0, 0, xlen, ylen, out.data(), xlen,
+                                ylen, GDT_Int8, 0, 0, nullptr);
+    EXPECT_EQ(err, CE_None);
+
+    for (uint8_t o : out)
+        EXPECT_EQ(o, 127);
+}
+
+TEST(Viewshed, simple_height)
+{
+    // clang-format off
+    const int xlen = 5;
+    const int ylen = 5;
+    std::array<int8_t, xlen * ylen> in
+    {
+        -1, 0, 1, 0, -1,
+        -1, 2, 0, 4, -1,
+        -1, 1, 0, -1, -1,
+         0, 3, 0, 2, 0,
+        -1, 0, 0, 3, -1
+    };
+
+    std::array<double, xlen * ylen> observable
+    {
+        4, 2, 0, 4, 8,
+        3, 2, 0, 4, 3,
+        2, 1, 0, -1, -2,
+        4, 3, 0, 2, 1,
+        6, 3, 0, 2, 4
+    };
+    // clang-format on
+
+    {
+        SCOPED_TRACE("simple_height:normal");
+
+        DatasetPtr output =
+            runViewshed(in.data(), xlen, ylen, stdOptions(2, 2));
+
+        std::array<int8_t, xlen * ylen> out;
+        GDALRasterBand *band = output->GetRasterBand(1);
+        CPLErr err = band->RasterIO(GF_Read, 0, 0, xlen, ylen, out.data(), xlen,
+                                    ylen, GDT_Int8, 0, 0, nullptr);
+        EXPECT_EQ(err, CE_None);
+
+        // We expect the cell to be observable when the input is higher than the observable
+        // height.
+        std::array<int8_t, xlen * ylen> expected;
+        for (size_t i = 0; i < in.size(); ++i)
+            expected[i] = (in[i] >= observable[i] ? 127 : 0);
+
+        EXPECT_EQ(expected, out);
+    }
+
+    {
+        std::array<double, xlen * ylen> dem;
+        SCOPED_TRACE("simple_height:dem");
+        Options opts = stdOptions(2, 2);
+        opts.outputMode = OutputMode::DEM;
+
+        DatasetPtr output = runViewshed(in.data(), xlen, ylen, opts);
+
+        GDALRasterBand *band = output->GetRasterBand(1);
+        CPLErr err = band->RasterIO(GF_Read, 0, 0, xlen, ylen, dem.data(), xlen,
+                                    ylen, GDT_Float64, 0, 0, nullptr);
+        EXPECT_EQ(err, CE_None);
+
+        // DEM values are observable values clamped at 0. Not sure why.
+        std::array<double, xlen *ylen> expected = observable;
+        for (double &d : expected)
+            d = std::max(0.0, d);
+
+        // Double equality is fine here as all the values are small integers.
+        EXPECT_EQ(dem, expected);
+    }
+
+    {
+        std::array<double, xlen * ylen> ground;
+        SCOPED_TRACE("simple_height:ground");
+        Options opts = stdOptions(2, 2);
+        opts.outputMode = OutputMode::Ground;
+        DatasetPtr output = runViewshed(in.data(), xlen, ylen, opts);
+
+        GDALRasterBand *band = output->GetRasterBand(1);
+        CPLErr err = band->RasterIO(GF_Read, 0, 0, xlen, ylen, ground.data(),
+                                    xlen, ylen, GDT_Float64, 0, 0, nullptr);
+        EXPECT_EQ(err, CE_None);
+
+        std::array<double, xlen * ylen> expected;
+        for (size_t i = 0; i < expected.size(); ++i)
+            expected[i] = std::max(0.0, observable[i] - in[i]);
+
+        // Double equality is fine here as all the values are small integers.
+        EXPECT_EQ(expected, ground);
+    }
+}
+
+// Addresses cases in #9501
+TEST(Viewshed, dem_vs_ground)
+{
+    // Run gdal_viewshed on the input 8 x 1 array in both ground and dem mode and
+    // verify the results are what are expected.
+    auto run = [](const std::array<int8_t, 8> &in, Coord observer,
+                  const std::array<double, 8> &ground,
+                  const std::array<double, 8> &dem)
+    {
+        const int xlen = 8;
+        const int ylen = 1;
+
+        std::array<double, xlen * ylen> out;
+        Options opts = stdOptions(observer);
+        opts.outputMode = OutputMode::Ground;
+
+        // Verify ground mode.
+        DatasetPtr ds = runViewshed(in.data(), xlen, ylen, opts);
+        GDALRasterBand *band = ds->GetRasterBand(1);
+        CPLErr err = band->RasterIO(GF_Read, 0, 0, xlen, ylen, out.data(), xlen,
+                                    ylen, GDT_Float64, 0, 0, nullptr);
+        EXPECT_EQ(err, CE_None);
+        for (size_t i = 0; i < ground.size(); ++i)
+            EXPECT_DOUBLE_EQ(out[i], ground[i]);
+
+        // Verify DEM mode.
+        opts.outputMode = OutputMode::DEM;
+        ds = runViewshed(in.data(), xlen, ylen, opts);
+        band = ds->GetRasterBand(1);
+        err = band->RasterIO(GF_Read, 0, 0, xlen, ylen, out.data(), xlen, ylen,
+                             GDT_Float64, 0, 0, nullptr);
+        EXPECT_EQ(err, CE_None);
+        for (size_t i = 0; i < dem.size(); ++i)
+            EXPECT_DOUBLE_EQ(out[i], dem[i]);
+    };
+
+    // Input / Observer / Minimum expected above ground / Minimum expected above zero
+    run({0, 0, 0, 1, 0, 0, 0, 0}, {2, 0}, {0, 0, 0, 0, 2, 3, 4, 5},
+        {0, 0, 0, 1, 2, 3, 4, 5});
+    run({1, 1, 0, 1, 0, 1, 2, 2}, {3, 0}, {0, 0, 0, 0, 0, 0, 0, 1 / 3.0},
+        {1, 0, 0, 1, 0, 0, 1, 7 / 3.0});
+    run({0, 0, 0, 1, 1, 0, 0, 0}, {0, 0},
+        {0, 0, 0, 0, 1 / 3.0, 5 / 3.0, 6 / 3.0, 7 / 3.0},
+        {0, 0, 0, 0, 4 / 3.0, 5 / 3.0, 6 / 3.0, 7 / 3.0});
+    run({0, 0, 1, 2, 3, 4, 5, 6}, {0, 0}, {0, 0, 0, 0, 0, 0, 0, 0},
+        {0, 0, 0, 3 / 2.0, 8 / 3.0, 15 / 4.0, 24 / 5.0, 35 / 6.0});
+    run({0, 0, 1, 1, 3, 4, 5, 4}, {0, 0}, {0, 0, 0, .5, 0, 0, 0, 11 / 6.0},
+        {0, 0, 0, 3 / 2.0, 2, 15 / 4.0, 24 / 5.0, 35 / 6.0});
+}
+
+// Test an observer to the right of the raster.
+TEST(Viewshed, oor_right)
+{
+    // clang-format off
+    const int xlen = 5;
+    const int ylen = 3;
+    std::array<int8_t, xlen * ylen> in
+    {
+        1, 2, 0, 4, 1,
+        0, 0, 2, 1, 0,
+        1, 0, 0, 3, 3
+    };
+    // clang-format on
+
+    {
+        Options opts = stdOptions(6, 1);
+        opts.outputMode = OutputMode::DEM;
+        DatasetPtr ds = runViewshed(in.data(), xlen, ylen, opts);
+        GDALRasterBand *band = ds->GetRasterBand(1);
+        std::array<double, xlen * ylen> out;
+        CPLErr err = band->RasterIO(GF_Read, 0, 0, xlen, ylen, out.data(), xlen,
+                                    ylen, GDT_Float64, 0, 0, nullptr);
+        EXPECT_EQ(err, CE_None);
+
+        // clang-format off
+        std::array<double, xlen * ylen> expected
+        {
+            16 / 3.0, 29 / 6.0, 13 / 3.0, 1, 1,
+            3,        2.5,      4 / 3.0,  0, 0,
+            13 / 3.0, 23 / 6.0, 10 / 3.0, 3, 3
+        };
+        // clang-format on
+
+        for (size_t i = 0; i < out.size(); ++i)
+            EXPECT_DOUBLE_EQ(out[i], expected[i]);
+    }
+
+    {
+        Options opts = stdOptions(6, 2);
+        opts.outputMode = OutputMode::DEM;
+        DatasetPtr ds = runViewshed(in.data(), xlen, ylen, opts);
+        GDALRasterBand *band = ds->GetRasterBand(1);
+        std::array<double, xlen * ylen> out;
+        CPLErr err = band->RasterIO(GF_Read, 0, 0, xlen, ylen, out.data(), xlen,
+                                    ylen, GDT_Float64, 0, 0, nullptr);
+        EXPECT_EQ(err, CE_None);
+
+        // clang-format off
+        std::array<double, xlen * ylen> expected
+        {
+            26 / 5.0, 17 / 4.0, 11 / 3.0, .5,  1,
+            6,        4.5,      3,        1.5, 0,
+            9,        7.5,      6,        4.5, 3
+        };
+        // clang-format on
+
+        for (size_t i = 0; i < out.size(); ++i)
+            EXPECT_DOUBLE_EQ(out[i], expected[i]);
+    }
+}
+
+// Test an observer to the left of the raster.
+TEST(Viewshed, oor_left)
+{
+    // clang-format off
+    const int xlen = 5;
+    const int ylen = 3;
+    std::array<int8_t, xlen * ylen> in
+    {
+        1, 2, 0, 4, 1,
+        0, 0, 2, 1, 0,
+        1, 0, 0, 3, 3
+    };
+    // clang-format on
+
+    {
+        Options opts = stdOptions(-2, 1);
+        opts.outputMode = OutputMode::DEM;
+        DatasetPtr ds = runViewshed(in.data(), xlen, ylen, opts);
+        GDALRasterBand *band = ds->GetRasterBand(1);
+        std::array<double, xlen * ylen> out;
+        CPLErr err = band->RasterIO(GF_Read, 0, 0, xlen, ylen, out.data(), xlen,
+                                    ylen, GDT_Float64, 0, 0, nullptr);
+        EXPECT_EQ(err, CE_None);
+
+        // clang-format off
+        std::array<double, xlen * ylen> expected
+        {
+            1, 1, 2, 2.5, 4.5,
+            0, 0, 0, 2.5, 3,
+            1, 1, 1, 1.5, 3.5
+        };
+        // clang-format on
+
+        for (size_t i = 0; i < out.size(); ++i)
+            EXPECT_DOUBLE_EQ(out[i], expected[i]);
+    }
+
+    {
+        Options opts = stdOptions(-2, 2);
+        opts.outputMode = OutputMode::DEM;
+        DatasetPtr ds = runViewshed(in.data(), xlen, ylen, opts);
+        GDALRasterBand *band = ds->GetRasterBand(1);
+        std::array<double, xlen * ylen> out;
+        CPLErr err = band->RasterIO(GF_Read, 0, 0, xlen, ylen, out.data(), xlen,
+                                    ylen, GDT_Float64, 0, 0, nullptr);
+        EXPECT_EQ(err, CE_None);
+
+        // clang-format off
+        std::array<double, xlen * ylen> expected
+        {
+            1, .5,  5 / 3.0, 2.25, 4.2,
+            0, .5,  1,       2.5,  3.1,
+            1, 1.5, 2,       2.5,  3.6
+        };
+        // clang-format on
+
+        for (size_t i = 0; i < out.size(); ++i)
+            EXPECT_DOUBLE_EQ(out[i], expected[i]);
+    }
+}
+
+// Test an observer above the raster
+TEST(Viewshed, oor_above)
+{
+    // clang-format off
+    const int xlen = 5;
+    const int ylen = 3;
+    std::array<int8_t, xlen * ylen> in
+    {
+        1, 2, 0, 4, 1,
+        0, 0, 2, 1, 0,
+        1, 0, 0, 3, 3
+    };
+    // clang-format on
+
+    {
+        Options opts = stdOptions(2, -2);
+        opts.outputMode = OutputMode::DEM;
+        DatasetPtr ds = runViewshed(in.data(), xlen, ylen, opts);
+        GDALRasterBand *band = ds->GetRasterBand(1);
+        std::array<double, xlen * ylen> out;
+        CPLErr err = band->RasterIO(GF_Read, 0, 0, xlen, ylen, out.data(), xlen,
+                                    ylen, GDT_Float64, 0, 0, nullptr);
+
+        EXPECT_EQ(err, CE_None);
+
+        // clang-format off
+        std::array<double, xlen * ylen> expected
+        {
+            1,   2,       0,       4,        1,
+            2.5, 2,       0,       4,        4.5,
+            3,   8 / 3.0, 8 / 3.0, 14 / 3.0, 17 / 3.0
+        };
+        // clang-format on
+
+        for (size_t i = 0; i < out.size(); ++i)
+            EXPECT_DOUBLE_EQ(out[i], expected[i]);
+    }
+
+    {
+        Options opts = stdOptions(-2, -2);
+        opts.outputMode = OutputMode::DEM;
+        DatasetPtr ds = runViewshed(in.data(), xlen, ylen, opts);
+        GDALRasterBand *band = ds->GetRasterBand(1);
+        std::array<double, xlen * ylen> out;
+        CPLErr err = band->RasterIO(GF_Read, 0, 0, xlen, ylen, out.data(), xlen,
+                                    ylen, GDT_Float64, 0, 0, nullptr);
+        EXPECT_EQ(err, CE_None);
+
+        // clang-format off
+        std::array<double, xlen * ylen> expected
+        {
+            1, 2,   0,   4,    1,
+            0, 1.5, 2.5, 1.25, 3.15,
+            1, 0.5, 2,   3,    2.2
+        };
+        // clang-format on
+
+        for (size_t i = 0; i < out.size(); ++i)
+            EXPECT_DOUBLE_EQ(out[i], expected[i]);
+    }
+}
+
+// Test an observer below the raster
+TEST(Viewshed, oor_below)
+{
+    // clang-format off
+    const int xlen = 5;
+    const int ylen = 3;
+    std::array<int8_t, xlen * ylen> in
+    {
+        1, 2, 0, 4, 1,
+        0, 0, 2, 1, 0,
+        1, 0, 0, 3, 3
+    };
+    // clang-format on
+
+    {
+        Options opts = stdOptions(2, 4);
+        opts.outputMode = OutputMode::DEM;
+        DatasetPtr ds = runViewshed(in.data(), xlen, ylen, opts);
+        GDALRasterBand *band = ds->GetRasterBand(1);
+        std::array<double, xlen * ylen> out;
+        CPLErr err = band->RasterIO(GF_Read, 0, 0, xlen, ylen, out.data(), xlen,
+                                    ylen, GDT_Float64, 0, 0, nullptr);
+
+        EXPECT_EQ(err, CE_None);
+
+        // clang-format off
+        std::array<double, xlen * ylen> expected
+        {
+            1 / 3.0, 2 / 3.0, 8 / 3.0, 11 / 3.0, 5,
+            0.5,     0,       0,       3,        4.5,
+            1,       0,       0,       3,        3
+        };
+        // clang-format on
+
+        for (size_t i = 0; i < out.size(); ++i)
+            EXPECT_DOUBLE_EQ(out[i], expected[i]);
+    }
+
+    {
+        Options opts = stdOptions(6, 4);
+        opts.outputMode = OutputMode::DEM;
+        DatasetPtr ds = runViewshed(in.data(), xlen, ylen, opts);
+        GDALRasterBand *band = ds->GetRasterBand(1);
+        std::array<double, xlen * ylen> out;
+        CPLErr err = band->RasterIO(GF_Read, 0, 0, xlen, ylen, out.data(), xlen,
+                                    ylen, GDT_Float64, 0, 0, nullptr);
+        EXPECT_EQ(err, CE_None);
+
+        // clang-format off
+        std::array<double, xlen * ylen> expected
+        {
+            4.2,  6,    6,   1.5, 1,
+            1.35, 2.25, 4.5, 4.5, 0,
+            1,    0,    0,   3,   3
+        };
+        // clang-format on
+
+        for (size_t i = 0; i < out.size(); ++i)
+            EXPECT_DOUBLE_EQ(out[i], expected[i]);
+    }
+}
+
+}  // namespace viewshed
+}  // namespace gdal
diff --git a/autotest/cpp/testblockcache.cpp b/autotest/cpp/testblockcache.cpp
index 36607159fc0e..2f0459375294 100644
--- a/autotest/cpp/testblockcache.cpp
+++ b/autotest/cpp/testblockcache.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef DEBUG
diff --git a/autotest/cpp/testblockcachelimits.cpp b/autotest/cpp/testblockcachelimits.cpp
index 4d188fde56a7..6531c2cd6a1b 100644
--- a/autotest/cpp/testblockcachelimits.cpp
+++ b/autotest/cpp/testblockcachelimits.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/autotest/cpp/testblockcachewrite.cpp b/autotest/cpp/testblockcachewrite.cpp
index 238c8ddc03a7..e6141ca9dc3b 100644
--- a/autotest/cpp/testblockcachewrite.cpp
+++ b/autotest/cpp/testblockcachewrite.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/autotest/cpp/testclosedondestroydm.cpp b/autotest/cpp/testclosedondestroydm.cpp
index 3f001d1c9902..efc7e056456c 100644
--- a/autotest/cpp/testclosedondestroydm.cpp
+++ b/autotest/cpp/testclosedondestroydm.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/autotest/cpp/testcopywords.cpp b/autotest/cpp/testcopywords.cpp
index 7e00bf98946d..f69947ba942c 100644
--- a/autotest/cpp/testcopywords.cpp
+++ b/autotest/cpp/testcopywords.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2009-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
@@ -32,6 +16,7 @@
 
 #include <cstdint>
 #include <iostream>
+#include <limits>
 
 #include "gtest_include.h"
 
@@ -594,6 +579,150 @@ TEST_F(TestCopyWords, GDT_Float32and64)
         FROM_R(intype, CST_5000000000, GDT_CFloat64, CST_5000000000);
         FROM_R(intype, -CST_5000000000, GDT_CFloat64, -CST_5000000000);
     }
+
+    // Float32 to Int64
+    {
+        float in_value = std::numeric_limits<float>::quiet_NaN();
+        int64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float32, 0, &out_value, GDT_Int64, 0, 1);
+        EXPECT_EQ(out_value, 0);
+    }
+
+    {
+        float in_value = -std::numeric_limits<float>::infinity();
+        int64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float32, 0, &out_value, GDT_Int64, 0, 1);
+        EXPECT_EQ(out_value, INT64_MIN);
+    }
+
+    {
+        float in_value = -std::numeric_limits<float>::max();
+        int64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float32, 0, &out_value, GDT_Int64, 0, 1);
+        EXPECT_EQ(out_value, INT64_MIN);
+    }
+
+    {
+        float in_value = std::numeric_limits<float>::max();
+        int64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float32, 0, &out_value, GDT_Int64, 0, 1);
+        EXPECT_EQ(out_value, INT64_MAX);
+    }
+
+    {
+        float in_value = std::numeric_limits<float>::infinity();
+        int64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float32, 0, &out_value, GDT_Int64, 0, 1);
+        EXPECT_EQ(out_value, INT64_MAX);
+    }
+
+    // Float64 to Int64
+    {
+        double in_value = std::numeric_limits<double>::quiet_NaN();
+        int64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float64, 0, &out_value, GDT_Int64, 0, 1);
+        EXPECT_EQ(out_value, 0);
+    }
+
+    {
+        double in_value = -std::numeric_limits<double>::infinity();
+        int64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float64, 0, &out_value, GDT_Int64, 0, 1);
+        EXPECT_EQ(out_value, INT64_MIN);
+    }
+
+    {
+        double in_value = -std::numeric_limits<double>::max();
+        int64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float64, 0, &out_value, GDT_Int64, 0, 1);
+        EXPECT_EQ(out_value, INT64_MIN);
+    }
+
+    {
+        double in_value = std::numeric_limits<double>::max();
+        int64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float64, 0, &out_value, GDT_Int64, 0, 1);
+        EXPECT_EQ(out_value, INT64_MAX);
+    }
+
+    {
+        double in_value = std::numeric_limits<double>::infinity();
+        int64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float64, 0, &out_value, GDT_Int64, 0, 1);
+        EXPECT_EQ(out_value, INT64_MAX);
+    }
+
+    // Float32 to UInt64
+    {
+        float in_value = std::numeric_limits<float>::quiet_NaN();
+        uint64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float32, 0, &out_value, GDT_UInt64, 0, 1);
+        EXPECT_EQ(out_value, 0);
+    }
+
+    {
+        float in_value = -std::numeric_limits<float>::infinity();
+        uint64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float32, 0, &out_value, GDT_UInt64, 0, 1);
+        EXPECT_EQ(out_value, 0);
+    }
+
+    {
+        float in_value = -std::numeric_limits<float>::max();
+        uint64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float32, 0, &out_value, GDT_UInt64, 0, 1);
+        EXPECT_EQ(out_value, 0);
+    }
+
+    {
+        float in_value = std::numeric_limits<float>::max();
+        uint64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float32, 0, &out_value, GDT_UInt64, 0, 1);
+        EXPECT_EQ(out_value, UINT64_MAX);
+    }
+
+    {
+        float in_value = std::numeric_limits<float>::infinity();
+        uint64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float32, 0, &out_value, GDT_UInt64, 0, 1);
+        EXPECT_EQ(out_value, UINT64_MAX);
+    }
+
+    // Float64 to UInt64
+    {
+        double in_value = -std::numeric_limits<double>::quiet_NaN();
+        uint64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float64, 0, &out_value, GDT_UInt64, 0, 1);
+        EXPECT_EQ(out_value, 0);
+    }
+
+    {
+        double in_value = -std::numeric_limits<double>::infinity();
+        uint64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float64, 0, &out_value, GDT_UInt64, 0, 1);
+        EXPECT_EQ(out_value, 0);
+    }
+
+    {
+        double in_value = -std::numeric_limits<double>::max();
+        uint64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float64, 0, &out_value, GDT_UInt64, 0, 1);
+        EXPECT_EQ(out_value, 0);
+    }
+
+    {
+        double in_value = std::numeric_limits<double>::max();
+        uint64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float64, 0, &out_value, GDT_UInt64, 0, 1);
+        EXPECT_EQ(out_value, UINT64_MAX);
+    }
+
+    {
+        double in_value = std::numeric_limits<double>::infinity();
+        uint64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float64, 0, &out_value, GDT_UInt64, 0, 1);
+        EXPECT_EQ(out_value, UINT64_MAX);
+    }
 }
 
 TEST_F(TestCopyWords, GDT_CInt16)
diff --git a/autotest/cpp/testdestroy.cpp b/autotest/cpp/testdestroy.cpp
index bc97d765baa7..823413681538 100644
--- a/autotest/cpp/testdestroy.cpp
+++ b/autotest/cpp/testdestroy.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal.h"
diff --git a/autotest/cpp/testlog.cpp b/autotest/cpp/testlog.cpp
index 27936524a12a..0f03b458f432 100644
--- a/autotest/cpp/testlog.cpp
+++ b/autotest/cpp/testlog.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2021, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/autotest/cpp/testmultithreadedwriting.cpp b/autotest/cpp/testmultithreadedwriting.cpp
index 175fa51211cc..cd633afa19ec 100644
--- a/autotest/cpp/testmultithreadedwriting.cpp
+++ b/autotest/cpp/testmultithreadedwriting.cpp
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_multiproc.h"
diff --git a/autotest/cpp/testthreadcond.cpp b/autotest/cpp/testthreadcond.cpp
index a4005d819b81..557b404510d9 100644
--- a/autotest/cpp/testthreadcond.cpp
+++ b/autotest/cpp/testthreadcond.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef DEBUG
diff --git a/autotest/cpp/testvirtualmem.cpp b/autotest/cpp/testvirtualmem.cpp
index 5f72fdba29f9..e9f30dc55b5b 100644
--- a/autotest/cpp/testvirtualmem.cpp
+++ b/autotest/cpp/testvirtualmem.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_multiproc.h"
diff --git a/autotest/gcore/asyncreader.py b/autotest/gcore/asyncreader.py
index 2ea1f098a9a7..f8e42235490f 100755
--- a/autotest/gcore/asyncreader.py
+++ b/autotest/gcore/asyncreader.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gcore/basic_test.py b/autotest/gcore/basic_test.py
index 2d2e2a91eb61..cb389656c94d 100755
--- a/autotest/gcore/basic_test.py
+++ b/autotest/gcore/basic_test.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -68,6 +52,15 @@ def test_basic_test_1():
     pytest.fail("did not get expected error message, got %s" % gdal.GetLastErrorMsg())
 
 
+def test_basic_test_invalid_open_flag():
+    with pytest.raises(Exception, match="invalid value for GDALAccess"):
+        gdal.Open("data/byte.tif", "invalid")
+
+    assert gdal.OF_RASTER not in (gdal.GA_ReadOnly, gdal.GA_Update)
+    with pytest.raises(Exception, match="invalid value for GDALAccess"):
+        gdal.Open("data/byte.tif", gdal.OF_RASTER)
+
+
 @pytest.mark.skipif(sys.platform != "linux", reason="Incorrect platform")
 def test_basic_test_strace_non_existing_file():
 
@@ -981,3 +974,13 @@ def test_band_getitem():
 
     with pytest.raises(IndexError):
         ds[5]
+
+
+def test_colorinterp():
+
+    d = {}
+    for c in range(gdal.GCI_Max + 1):
+        name = gdal.GetColorInterpretationName(c)
+        assert name not in d
+        d[name] = c
+        assert gdal.GetColorInterpretationByName(name) == c
diff --git a/autotest/gcore/basic_test_subprocess.py b/autotest/gcore/basic_test_subprocess.py
index 34e2a8cd23a4..254a29e4c354 100755
--- a/autotest/gcore/basic_test_subprocess.py
+++ b/autotest/gcore/basic_test_subprocess.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 from osgeo import gdal
diff --git a/autotest/gcore/cog.py b/autotest/gcore/cog.py
index dc76fa994306..3ef850bb019c 100755
--- a/autotest/gcore/cog.py
+++ b/autotest/gcore/cog.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2019, Even Rouault <even.rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import struct
@@ -634,8 +618,8 @@ def test_cog_byte_to_web_mercator_manual():
         options=[
             "BLOCKSIZE=256",
             "TARGET_SRS=EPSG:3857",
-            "RES=%.18g" % res,
-            "EXTENT=%.18g,%.18g,%.18g,%.18g" % (minx, miny, maxx, maxy),
+            "RES=%.17g" % res,
+            "EXTENT=%.17g,%.17g,%.17g,%.17g" % (minx, miny, maxx, maxy),
         ],
     )
     assert ds
@@ -674,7 +658,7 @@ def test_cog_byte_to_web_mercator_manual():
     gdal.Translate(
         filename2,
         filename,
-        options="-of COG -co TILING_SCHEME=GoogleMapsCompatible -a_ullr %.18g %.18g %.18g %.18g"
+        options="-of COG -co TILING_SCHEME=GoogleMapsCompatible -a_ullr %.17g %.17g %.17g %.17g"
         % (minx - eps, maxy + eps, maxx + eps, miny - eps),
     )
     ds = gdal.Open(filename2)
@@ -1922,3 +1906,32 @@ def test_cog_stats(tmp_vsimem, nbands, co, src_has_stats, expected_val):
     if expected_val and ds.RasterCount == 2:
         assert ds.GetRasterBand(2).GetMetadataItem("STATISTICS_MINIMUM") == "255"
     ds = None
+
+
+###############################################################################
+
+
+def test_cog_mask_band_overviews(tmp_vsimem):
+
+    """Test bugfix for https://github.com/OSGeo/gdal/issues/10536"""
+
+    filename = str(tmp_vsimem / "out.tif")
+    with gdal.config_option("COG_DELETE_TEMP_FILES", "NO"):
+        gdal.Translate(
+            filename,
+            "data/stefan_full_rgba.tif",
+            options="-co RESAMPLING=LANCZOS -co OVERVIEW_COUNT=3 -of COG -outsize 1024 0 -b 1 -b 2 -b 3 -mask 4",
+        )
+
+    ds = gdal.Open(filename)
+    assert [ds.GetRasterBand(i + 1).GetOverview(2).Checksum() for i in range(3)] == [
+        51556,
+        39258,
+        23928,
+    ]
+
+    ds = gdal.Open(filename + ".msk.ovr.tmp")
+    assert ds.GetMetadataItem("INTERNAL_MASK_FLAGS_1") == "2"
+    assert ds.GetRasterBand(1).IsMaskBand()
+    assert ds.GetRasterBand(1).GetOverview(0).IsMaskBand()
+    assert ds.GetRasterBand(1).GetOverview(1).IsMaskBand()
diff --git a/autotest/gcore/colortable.py b/autotest/gcore/colortable.py
index 0607814e0c9b..6390d38260bf 100755
--- a/autotest/gcore/colortable.py
+++ b/autotest/gcore/colortable.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gcore/data/complex_float32.tif b/autotest/gcore/data/complex_float32.tif
new file mode 100644
index 000000000000..78bb2af8f96f
Binary files /dev/null and b/autotest/gcore/data/complex_float32.tif differ
diff --git a/autotest/gcore/data/complex_int32.tif b/autotest/gcore/data/complex_int32.tif
new file mode 100644
index 000000000000..d51efe7e6d51
Binary files /dev/null and b/autotest/gcore/data/complex_int32.tif differ
diff --git a/autotest/gcore/data/gtiff/epsg_27563_allgeokeys.tif b/autotest/gcore/data/gtiff/epsg_27563_allgeokeys.tif
new file mode 100644
index 000000000000..da79734dd378
Binary files /dev/null and b/autotest/gcore/data/gtiff/epsg_27563_allgeokeys.tif differ
diff --git a/autotest/gcore/data/gtiff/missing_extrasamples.tif b/autotest/gcore/data/gtiff/missing_extrasamples.tif
new file mode 100644
index 000000000000..c993258b667e
Binary files /dev/null and b/autotest/gcore/data/gtiff/missing_extrasamples.tif differ
diff --git a/autotest/gcore/data/gtiff/unknown_colorinterp.tif b/autotest/gcore/data/gtiff/unknown_colorinterp.tif
new file mode 100644
index 000000000000..02466ea4db36
Binary files /dev/null and b/autotest/gcore/data/gtiff/unknown_colorinterp.tif differ
diff --git a/autotest/gcore/data/tar_of_tar_gzip.tar b/autotest/gcore/data/tar_of_tar_gzip.tar
new file mode 100644
index 000000000000..ed18401a2bc5
Binary files /dev/null and b/autotest/gcore/data/tar_of_tar_gzip.tar differ
diff --git a/autotest/gcore/gcps2geotransform.py b/autotest/gcore/gcps2geotransform.py
index 3ef4567210c0..917c42df8d5e 100755
--- a/autotest/gcore/gcps2geotransform.py
+++ b/autotest/gcore/gcps2geotransform.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2013 Frank Warmerdam
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gcore/gdal_stats.py b/autotest/gcore/gdal_stats.py
index 523c6459621f..369eac85dab6 100755
--- a/autotest/gcore/gdal_stats.py
+++ b/autotest/gcore/gdal_stats.py
@@ -99,7 +99,7 @@ def test_stats_dont_force():
         gdal.Unlink("data/byte.tif.aux.xml")
     ds = gdal.Open("data/byte.tif")
     stats = ds.GetRasterBand(1).GetStatistics(0, 0)
-    assert stats == [0, 0, 0, -1], "did not get expected stats"
+    assert stats is None
 
 
 ###############################################################################
@@ -130,7 +130,7 @@ def test_stats_approx_nodata():
     os.remove("tmp/minfloat.tif")
 
     if nodata != -3.4028234663852886e38:
-        print("%.18g" % nodata)
+        print("%.17g" % nodata)
         pytest.fail("did not get expected nodata")
 
     assert stats == [-3.0, 5.0, 1.0, 4.0], "did not get expected stats"
@@ -180,6 +180,10 @@ def test_stats_nan_3():
 # and complex source nodata (#3576)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_stats_nan_4():
 
     ds = gdal.Open("data/nan32_nodata.vrt")
@@ -197,6 +201,10 @@ def test_stats_nan_4():
 # and complex source nodata (nan must be translated to 0 then) (#3576)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_stats_nan_5():
 
     ds = gdal.Open("data/nan32_nodata_nan_to_zero.vrt")
@@ -213,6 +221,10 @@ def test_stats_nan_5():
 # Test reading a warped VRT with nan as src nodata and dest nodata (#3576)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_stats_nan_6():
 
     ds = gdal.Open("data/nan32_nodata_warp.vrt")
@@ -229,6 +241,10 @@ def test_stats_nan_6():
 # Test reading a warped VRT with nan as src nodata and 0 as dest nodata (#3576)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_stats_nan_7():
 
     ds = gdal.Open("data/nan32_nodata_warp_nan_to_zero.vrt")
@@ -245,6 +261,10 @@ def test_stats_nan_7():
 # Test reading a warped VRT with zero as src nodata and nan as dest nodata (#3576)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_stats_nan_8():
 
     ds = gdal.Open("data/nan32_nodata_warp_zero_to_nan.vrt")
@@ -266,6 +286,7 @@ def stats_nodata_inf_progress_cbk(value, string, extra):
     extra[0] = value
 
 
+@pytest.mark.require_driver("HFA")
 def test_stats_nodata_inf():
 
     ds = gdal.GetDriverByName("HFA").Create(
@@ -411,7 +432,7 @@ def test_stats_flt_min():
     os.remove("tmp/flt_min.tif")
 
     if nodata != 1.17549435082228751e-38:
-        print("%.18g" % nodata)
+        print("%.17g" % nodata)
         pytest.fail("did not get expected nodata")
 
     assert stats == [0.0, 1.0, 0.33333333333333337, 0.47140452079103168] or stats == [
@@ -450,7 +471,7 @@ def test_stats_dbl_min():
     os.remove("tmp/dbl_min.tif")
 
     if nodata != 2.22507385850720138e-308:
-        print("%.18g" % nodata)
+        print("%.17g" % nodata)
         pytest.fail("did not get expected nodata")
 
     assert stats == [0.0, 1.0, 0.33333333333333337, 0.47140452079103168] or stats == [
@@ -762,7 +783,7 @@ def test_stats_approx_stats_flag(dt=gdal.GDT_Byte, struct_frmt="B"):
     approx_ok = 0
     force = 0
     stats = ds.GetRasterBand(1).GetStatistics(approx_ok, force)
-    assert stats == [0.0, 0.0, 0.0, -1.0], "did not get expected stats"
+    assert stats is None
 
     approx_ok = 0
     force = 1
@@ -824,15 +845,15 @@ def test_stats_clear():
     filename = "/vsimem/out.tif"
     gdal.Translate(filename, "data/byte.tif")
     ds = gdal.Open(filename)
-    assert ds.GetRasterBand(1).GetStatistics(False, False) == [0, 0, 0, -1]
-    assert ds.GetRasterBand(1).ComputeStatistics(False) != [0, 0, 0, -1]
+    assert ds.GetRasterBand(1).GetStatistics(False, False) is None
+    assert ds.GetRasterBand(1).ComputeStatistics(False) is not None
 
     ds = gdal.Open(filename)
-    assert ds.GetRasterBand(1).GetStatistics(False, False) != [0, 0, 0, -1]
+    assert ds.GetRasterBand(1).GetStatistics(False, False) is not None
     ds.ClearStatistics()
 
     ds = gdal.Open(filename)
-    assert ds.GetRasterBand(1).GetStatistics(False, False) == [0, 0, 0, -1]
+    assert ds.GetRasterBand(1).GetStatistics(False, False) is None
 
     gdal.GetDriverByName("GTiff").Delete(filename)
 
diff --git a/autotest/gcore/geoloc.py b/autotest/gcore/geoloc.py
index d27be4319703..8bdd0cde4d6e 100755
--- a/autotest/gcore/geoloc.py
+++ b/autotest/gcore/geoloc.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import array
@@ -41,6 +25,10 @@
 # Verify warped result.
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_geoloc_1():
 
     tst = gdaltest.GDALTest("VRT", "warpsst.vrt", 1, 63034)
diff --git a/autotest/gcore/hdf4multidim.py b/autotest/gcore/hdf4multidim.py
index 71070df1eb62..c8185b49432d 100644
--- a/autotest/gcore/hdf4multidim.py
+++ b/autotest/gcore/hdf4multidim.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2019, Even Rouault <even.rouault@spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import struct
diff --git a/autotest/gcore/hfa_read.py b/autotest/gcore/hfa_read.py
index a2b559dd95b0..46b5c6a4d29b 100755
--- a/autotest/gcore/hfa_read.py
+++ b/autotest/gcore/hfa_read.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gcore/hfa_rfc40.py b/autotest/gcore/hfa_rfc40.py
index 64ed11197c19..452fba977b2a 100755
--- a/autotest/gcore/hfa_rfc40.py
+++ b/autotest/gcore/hfa_rfc40.py
@@ -11,30 +11,17 @@
 ###############################################################################
 # Copyright (c) 2013,  Sam Gillingham <gillingham.sam@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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import pytest
 
 from osgeo import gdal
 
-pytestmark = pytest.mark.random_order(disabled=True)
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.require_driver("HFA"),
+]
 
 # All tests will be skipped if numpy is unavailable.
 np = pytest.importorskip("numpy")
diff --git a/autotest/gcore/hfa_srs.py b/autotest/gcore/hfa_srs.py
index a921095c8e2d..64b00d85ff2b 100755
--- a/autotest/gcore/hfa_srs.py
+++ b/autotest/gcore/hfa_srs.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
@@ -33,6 +17,8 @@
 
 from osgeo import gdal, osr
 
+pytestmark = pytest.mark.require_driver("HFA")
+
 ###############################################################################
 # Write a HFA/Imagine and read it back to check its SRS
 crs_list = [
@@ -250,7 +236,8 @@ def test_hfa_srs_NAD83_CORS96_UTM():
 
     ds = gdal.Open("/vsimem/TestHFASRS.img")
     srs_got = ds.GetSpatialRef()
-    assert srs_got.GetAuthorityName(None) is None
+    assert srs_got.GetAuthorityName(None) == "ESRI"
+    assert srs_got.GetAuthorityCode(None) == "102411"
     assert srs_got.IsSame(sr), srs_got.ExportToWkt()
     ds = None
 
@@ -286,3 +273,25 @@ def test_hfa_srs_DISABLEPESTRING():
     ds = None
 
     gdal.Unlink(filename)
+
+
+# Not sure about the minimum PROJ version, but 6.3 doesn't work
+@pytest.mark.require_proj(8, 0)
+def test_hfa_srs_EPSG_2193(tmp_vsimem):
+
+    filename = str(tmp_vsimem / "test.img")
+    sr = osr.SpatialReference()
+    sr.ImportFromEPSG(2193)
+    sr.SetAxisMappingStrategy(osr.OAMS_TRADITIONAL_GIS_ORDER)
+
+    ds = gdal.GetDriverByName("HFA").Create(filename, 1, 1)
+    ds.SetSpatialRef(sr)
+    ds = None
+
+    ds = gdal.Open(filename)
+    srs_got = ds.GetSpatialRef()
+    assert srs_got.GetAuthorityName(None) == "EPSG"
+    assert srs_got.GetAuthorityCode(None) == "2193"
+    assert srs_got.GetDataAxisToSRSAxisMapping() == [2, 1]
+    assert srs_got.IsSame(sr)
+    ds = None
diff --git a/autotest/gcore/hfa_write.py b/autotest/gcore/hfa_write.py
index da0ea139c08a..5ab4cc6ee4db 100755
--- a/autotest/gcore/hfa_write.py
+++ b/autotest/gcore/hfa_write.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -39,6 +23,8 @@
 
 from osgeo import gdal, osr
 
+pytestmark = pytest.mark.require_driver("HFA")
+
 ###############################################################################
 # test that we can write a small file with a custom layer name.
 
@@ -298,23 +284,30 @@ def test_hfa_use_rrd():
 
 
 @pytest.mark.require_driver("BMP")
-def test_hfa_update_existing_aux_overviews():
+def test_hfa_update_existing_aux_overviews(tmp_path):
+
+    tmp_filename = str(tmp_path / "hfa_update_existing_aux_overviews.bmp")
 
     with gdal.config_option("USE_RRD", "YES"):
 
-        ds = gdal.GetDriverByName("BMP").Create(
-            "tmp/hfa_update_existing_aux_overviews.bmp", 100, 100, 1
-        )
+        ds = gdal.GetDriverByName("BMP").Create(tmp_filename, 100, 100, 1)
         ds.GetRasterBand(1).Fill(255)
         ds = None
 
         # Create overviews
-        ds = gdal.Open("tmp/hfa_update_existing_aux_overviews.bmp")
-        ds.BuildOverviews("NEAR", overviewlist=[2, 4])
+        ds = gdal.Open(tmp_filename)
+        with gdaltest.disable_exceptions():
+            ret = ds.BuildOverviews("NEAR", overviewlist=[2, 4])
+        if (
+            gdal.GetLastErrorMsg()
+            == "This build does not support creating .aux overviews"
+        ):
+            pytest.skip(gdal.GetLastErrorMsg())
+        assert ret == 0
         ds = None
 
         # Save overviews checksum
-        ds = gdal.Open("tmp/hfa_update_existing_aux_overviews.bmp")
+        ds = gdal.Open(tmp_filename)
         cs_ovr0 = ds.GetRasterBand(1).GetOverview(0).Checksum()
         cs_ovr1 = ds.GetRasterBand(1).GetOverview(1).Checksum()
 
@@ -322,7 +315,7 @@ def test_hfa_update_existing_aux_overviews():
         ds.BuildOverviews("NEAR", overviewlist=[2, 4])
         ds = None
 
-        ds = gdal.Open("tmp/hfa_update_existing_aux_overviews.bmp")
+        ds = gdal.Open(tmp_filename)
         # Check overviews checksum
         new_cs_ovr0 = ds.GetRasterBand(1).GetOverview(0).Checksum()
         new_cs_ovr1 = ds.GetRasterBand(1).GetOverview(1).Checksum()
@@ -336,7 +329,7 @@ def test_hfa_update_existing_aux_overviews():
         ds.BuildOverviews("NEAR", overviewlist=[2, 4])
         ds = None
 
-        ds = gdal.Open("tmp/hfa_update_existing_aux_overviews.bmp")
+        ds = gdal.Open(tmp_filename)
         # Check overviews checksum
         new_cs_ovr0 = ds.GetRasterBand(1).GetOverview(0).Checksum()
         new_cs_ovr1 = ds.GetRasterBand(1).GetOverview(1).Checksum()
@@ -349,7 +342,7 @@ def test_hfa_update_existing_aux_overviews():
         ds.BuildOverviews("NEAR", overviewlist=[8])
         ds = None
 
-        ds = gdal.Open("tmp/hfa_update_existing_aux_overviews.bmp")
+        ds = gdal.Open(tmp_filename)
         # Check overviews checksum
         new_cs_ovr0 = ds.GetRasterBand(1).GetOverview(0).Checksum()
         new_cs_ovr1 = ds.GetRasterBand(1).GetOverview(1).Checksum()
@@ -359,7 +352,7 @@ def test_hfa_update_existing_aux_overviews():
             pytest.fail()
         ds = None
 
-        gdal.GetDriverByName("BMP").Delete("tmp/hfa_update_existing_aux_overviews.bmp")
+        gdal.GetDriverByName("BMP").Delete(tmp_filename)
 
 
 ###############################################################################
diff --git a/autotest/gcore/histogram.py b/autotest/gcore/histogram.py
index 0d9a0be16074..6ec38dec0456 100755
--- a/autotest/gcore/histogram.py
+++ b/autotest/gcore/histogram.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2008, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import math
diff --git a/autotest/gcore/identify.py b/autotest/gcore/identify.py
index 7c12ca1db8b1..f6b6d555c205 100755
--- a/autotest/gcore/identify.py
+++ b/autotest/gcore/identify.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gcore/interpolateatpoint.py b/autotest/gcore/interpolateatpoint.py
new file mode 100755
index 000000000000..767a144e54dd
--- /dev/null
+++ b/autotest/gcore/interpolateatpoint.py
@@ -0,0 +1,356 @@
+#!/usr/bin/env pytest
+# -*- coding: utf-8 -*-
+###############################################################################
+# $Id$
+#
+# Project:  GDAL/OGR Test Suite
+# Purpose:  Test InterpolateAtPoint functionality
+# Author:   Javier Jimenez Shaw <j1@jimenezshaw.com>
+#
+###############################################################################
+# Copyright (c) 2024, Javier Jimenez Shaw <j1@jimenezshaw.com>
+#
+# SPDX-License-Identifier: MIT
+###############################################################################
+
+import gdaltest
+import pytest
+
+from osgeo import gdal
+
+###############################################################################
+# Test some cases of InterpolateAtPoint
+
+
+def test_interpolateatpoint_1():
+
+    ds = gdal.Open("data/byte.tif")
+
+    got_nearest = ds.GetRasterBand(1).InterpolateAtPoint(
+        10, 12, gdal.GRIORA_NearestNeighbour
+    )
+    assert got_nearest == pytest.approx(173, 1e-6)
+    got_bilinear = ds.GetRasterBand(1).InterpolateAtPoint(10, 12, gdal.GRIORA_Bilinear)
+    assert got_bilinear == pytest.approx(139.75, 1e-6)
+    got_cubic = ds.GetRasterBand(1).InterpolateAtPoint(10, 12, gdal.GRIORA_CubicSpline)
+    assert got_cubic == pytest.approx(138.02, 1e-2)
+    got_cubic = ds.GetRasterBand(1).InterpolateAtPoint(10, 12, gdal.GRIORA_Cubic)
+    assert got_cubic == pytest.approx(145.57, 1e-2)
+
+
+def test_interpolateatpoint_outofrange():
+
+    ds = gdal.Open("data/byte.tif")
+    res = ds.GetRasterBand(1).InterpolateAtPoint(1000, 12, gdal.GRIORA_Bilinear)
+    assert res is None
+    res = ds.GetRasterBand(1).InterpolateAtPoint(10, 1200, gdal.GRIORA_Bilinear)
+    assert res is None
+
+
+@gdaltest.disable_exceptions()
+def test_interpolateatpoint_error():
+
+    ds = gdal.Open("data/byte.tif")
+    with gdal.quiet_errors():
+        res = ds.GetRasterBand(1).InterpolateAtPoint(10, 12, gdal.GRIORA_Mode)
+    assert res is None
+
+
+@gdaltest.enable_exceptions()
+def test_interpolateatpoint_throw():
+
+    ds = gdal.Open("data/byte.tif")
+    with pytest.raises(
+        Exception,
+        match="Only nearest, bilinear, cubic and cubicspline interpolation methods allowed",
+    ):
+        ds.GetRasterBand(1).InterpolateAtPoint(10, 12, gdal.GRIORA_Mode)
+
+
+def test_interpolateatpoint_2_bands():
+
+    mem_ds = gdal.GetDriverByName("MEM").Create(
+        "", xsize=2, ysize=2, bands=2, eType=gdal.GDT_Float32
+    )
+    np = pytest.importorskip("numpy")
+    # First band with values values
+    raster_array_1 = np.array(([10.5, 1.3], [2.4, 3.8]))
+    mem_ds.GetRasterBand(1).WriteArray(raster_array_1)
+    # Second band with float values, also negative
+    raster_array_2 = np.array(([10.5, 1.3], [-2.4, 3.8]))
+    mem_ds.GetRasterBand(2).WriteArray(raster_array_2)
+
+    got_bilinear = mem_ds.GetRasterBand(1).InterpolateAtPoint(
+        1, 1, gdal.GRIORA_Bilinear
+    )
+    expected = np.sum(raster_array_1) / 4.0
+    assert got_bilinear == pytest.approx(expected, 1e-6)
+
+    got_bilinear = mem_ds.GetRasterBand(2).InterpolateAtPoint(
+        1, 1, gdal.GRIORA_Bilinear
+    )
+    expected = np.sum(raster_array_2) / 4.0
+    assert got_bilinear == pytest.approx(expected, 1e-6)
+
+
+def test_interpolateatpoint_bilinear_several_points():
+
+    mem_ds = gdal.GetDriverByName("MEM").Create(
+        "", xsize=3, ysize=2, bands=1, eType=gdal.GDT_Float32
+    )
+    np = pytest.importorskip("numpy")
+    raster_array_1 = np.array(([10.5, 1.3, 0.5], [2.4, 3.8, -1.0]))
+    mem_ds.GetRasterBand(1).WriteArray(raster_array_1)
+
+    got_bilinear = mem_ds.GetRasterBand(1).InterpolateAtPoint(
+        0.5, 0.5, gdal.GRIORA_Bilinear
+    )
+    assert got_bilinear == pytest.approx(10.5, 1e-6)
+
+    got_bilinear = mem_ds.GetRasterBand(1).InterpolateAtPoint(
+        1.5, 1.5, gdal.GRIORA_Bilinear
+    )
+    assert got_bilinear == pytest.approx(3.8, 1e-6)
+
+    got_bilinear = mem_ds.GetRasterBand(1).InterpolateAtPoint(
+        1.5, 1.5, gdal.GRIORA_Bilinear
+    )
+    assert got_bilinear == pytest.approx(3.8, 1e-6)
+
+    got_bilinear = mem_ds.GetRasterBand(1).InterpolateAtPoint(
+        2, 1, gdal.GRIORA_Bilinear
+    )
+    assert got_bilinear == pytest.approx((1.3 + 0.5 + 3.8 - 1) / 4, 1e-6)
+
+    # compute the linear intepolation manually
+    got_bilinear = mem_ds.GetRasterBand(1).InterpolateAtPoint(
+        2.1, 1.2, gdal.GRIORA_Bilinear
+    )
+    expected = 1.3 * 0.4 * 0.3 + 0.5 * 0.6 * 0.3 + 3.8 * 0.4 * 0.7 - 1 * 0.6 * 0.7
+    assert got_bilinear == pytest.approx(expected, 1e-6)
+
+
+def test_interpolateatpoint_cubicspline_several_points():
+
+    mem_ds = gdal.GetDriverByName("MEM").Create(
+        "", xsize=4, ysize=4, bands=1, eType=gdal.GDT_Float32
+    )
+    np = pytest.importorskip("numpy")
+    raster_array_1 = np.array(
+        (
+            [1.0, 2.0, 1.5, -0.3],
+            [1.0, 2.0, 1.5, -0.3],
+            [1.0, 2.0, 1.5, -0.3],
+            [1.0, 2.0, 1.5, -0.3],
+        )
+    )
+    mem_ds.GetRasterBand(1).WriteArray(raster_array_1)
+
+    # see that cubicspline is not the same as cubic
+    # the curve does not have to pass over the sampling points.
+    got_cubic = mem_ds.GetRasterBand(1).InterpolateAtPoint(
+        1.5, 1.5, gdal.GRIORA_CubicSpline
+    )
+    assert got_cubic == pytest.approx(1.75, 1e-6)
+
+    got_cubic = mem_ds.GetRasterBand(1).InterpolateAtPoint(
+        2.0, 2.0, gdal.GRIORA_CubicSpline
+    )
+    assert got_cubic == pytest.approx(1.6916666, 1e-6)
+
+
+def test_interpolateatpoint_cubic_several_points():
+
+    mem_ds = gdal.GetDriverByName("MEM").Create(
+        "", xsize=4, ysize=4, bands=1, eType=gdal.GDT_Float32
+    )
+    np = pytest.importorskip("numpy")
+    raster_array_1 = np.array(
+        (
+            [1.0, 2.0, 1.5, -0.3],
+            [1.0, 2.0, 1.5, -0.3],
+            [1.0, 2.0, 1.5, -0.3],
+            [1.0, 2.0, 1.5, -0.3],
+        )
+    )
+    mem_ds.GetRasterBand(1).WriteArray(raster_array_1)
+
+    got_cubic = mem_ds.GetRasterBand(1).InterpolateAtPoint(0.5, 1.5, gdal.GRIORA_Cubic)
+    assert got_cubic == pytest.approx(1.0, 1e-6)
+
+    got_cubic = mem_ds.GetRasterBand(1).InterpolateAtPoint(1.5, 1.5, gdal.GRIORA_Cubic)
+    assert got_cubic == pytest.approx(2.0, 1e-6)
+
+    got_cubic = mem_ds.GetRasterBand(1).InterpolateAtPoint(2.5, 1.5, gdal.GRIORA_Cubic)
+    assert got_cubic == pytest.approx(1.5, 1e-6)
+
+    got_cubic = mem_ds.GetRasterBand(1).InterpolateAtPoint(3.5, 1.5, gdal.GRIORA_Cubic)
+    assert got_cubic == pytest.approx(-0.3, 1e-6)
+
+    got_cubic = mem_ds.GetRasterBand(1).InterpolateAtPoint(2.0, 2.0, gdal.GRIORA_Cubic)
+    assert got_cubic == pytest.approx(1.925, 1e-6)
+
+    # cubic may exceed the highest value
+    got_cubic = mem_ds.GetRasterBand(1).InterpolateAtPoint(1.6, 1.5, gdal.GRIORA_Cubic)
+    assert got_cubic == pytest.approx(2.0166, 1e-6)
+
+
+def test_interpolateatpoint_at_borders():
+
+    mem_ds = gdal.GetDriverByName("MEM").Create(
+        "", xsize=6, ysize=5, bands=1, eType=gdal.GDT_Float32
+    )
+    np = pytest.importorskip("numpy")
+    raster_array_1 = np.array(
+        (
+            [1, 2, 4, 4, 5, 6],
+            [9, 8, 7, 6, 3, 4],
+            [4, 7, 6, 2, 1, 3],
+            [7, 8, 9, 6, 2, 1],
+            [2, 5, 2, 1, 7, 8],
+        )
+    )
+    mem_ds.GetRasterBand(1).WriteArray(raster_array_1)
+
+    # out of borders
+    res = mem_ds.GetRasterBand(1).InterpolateAtPoint(-0.01, 0.0, gdal.GRIORA_Bilinear)
+    assert res == None
+
+    res = mem_ds.GetRasterBand(1).InterpolateAtPoint(6.01, 0.0, gdal.GRIORA_Bilinear)
+    assert res == None
+
+    res = mem_ds.GetRasterBand(1).InterpolateAtPoint(0.01, -0.01, gdal.GRIORA_Bilinear)
+    assert res == None
+
+    res = mem_ds.GetRasterBand(1).InterpolateAtPoint(0.01, 5.01, gdal.GRIORA_Bilinear)
+    assert res == None
+
+    # near borders bilinear
+    res = mem_ds.GetRasterBand(1).InterpolateAtPoint(0.0, 0.0, gdal.GRIORA_Bilinear)
+    assert res == pytest.approx(1.0, 1e-6)
+
+    res = mem_ds.GetRasterBand(1).InterpolateAtPoint(1.0, 0.0, gdal.GRIORA_Bilinear)
+    assert res == pytest.approx(1.5, 1e-6)
+
+    res = mem_ds.GetRasterBand(1).InterpolateAtPoint(0.0, 1.0, gdal.GRIORA_Bilinear)
+    assert res == pytest.approx(5.0, 1e-6)
+
+    res = mem_ds.GetRasterBand(1).InterpolateAtPoint(0.0, 2.0, gdal.GRIORA_Bilinear)
+    assert res == pytest.approx(6.5, 1e-6)
+
+    res = mem_ds.GetRasterBand(1).InterpolateAtPoint(6.0, 0.0, gdal.GRIORA_Bilinear)
+    assert res == pytest.approx(6.0, 1e-6)
+
+    res = mem_ds.GetRasterBand(1).InterpolateAtPoint(3.0, 5.0, gdal.GRIORA_Bilinear)
+    assert res == pytest.approx(1.5, 1e-6)
+
+    res = mem_ds.GetRasterBand(1).InterpolateAtPoint(3.0, 4.6, gdal.GRIORA_Bilinear)
+    assert res == pytest.approx(1.5, 1e-6)
+
+    # near borders cubic
+    res = mem_ds.GetRasterBand(1).InterpolateAtPoint(0.0, 0.0, gdal.GRIORA_Cubic)
+    assert res == pytest.approx(0.4296875, 1e-6)
+
+    res = mem_ds.GetRasterBand(1).InterpolateAtPoint(1.0, 0.0, gdal.GRIORA_Cubic)
+    assert res == pytest.approx(0.92578125, 1e-6)
+
+    res = mem_ds.GetRasterBand(1).InterpolateAtPoint(0.0, 1.0, gdal.GRIORA_Cubic)
+    assert res == pytest.approx(5.328125, 1e-6)
+
+    res = mem_ds.GetRasterBand(1).InterpolateAtPoint(0.0, 2.0, gdal.GRIORA_Cubic)
+    assert res == pytest.approx(6.75, 1e-6)
+
+    res = mem_ds.GetRasterBand(1).InterpolateAtPoint(6.0, 0.0, gdal.GRIORA_Cubic)
+    assert res == pytest.approx(6.1875, 1e-6)
+
+    res = mem_ds.GetRasterBand(1).InterpolateAtPoint(3.0, 5.0, gdal.GRIORA_Cubic)
+    assert res == pytest.approx(0.5078125, 1e-6)
+
+    res = mem_ds.GetRasterBand(1).InterpolateAtPoint(3.0, 4.6, gdal.GRIORA_Cubic)
+    assert res == pytest.approx(0.6590625, 1e-6)
+
+
+def test_interpolateatpoint_complex_int():
+
+    ds = gdal.Open("data/complex_int32.tif")
+
+    res = ds.GetRasterBand(1).InterpolateAtPoint(0.0, 0.0, gdal.GRIORA_NearestNeighbour)
+    assert res == (-1 + 2j)
+    res = ds.GetRasterBand(1).InterpolateAtPoint(5.1, 7.2, gdal.GRIORA_NearestNeighbour)
+    assert res == (32 - 32j)
+    res = ds.GetRasterBand(1).InterpolateAtPoint(5.5, 7.5, gdal.GRIORA_Bilinear)
+    assert res == (32 - 32j)
+    res = ds.GetRasterBand(1).InterpolateAtPoint(5.5, 7.5, gdal.GRIORA_Cubic)
+    assert res == (32 - 32j)
+    res = ds.GetRasterBand(1).InterpolateAtPoint(5.5, 7.5, gdal.GRIORA_CubicSpline)
+    assert res == pytest.approx((34.361111 - 37.055555j), 1e-6)
+
+
+def test_interpolateatpoint_complex_float():
+
+    ds = gdal.Open("data/complex_float32.tif")
+
+    res = ds.GetRasterBand(1).InterpolateAtPoint(0.0, 0.0, gdal.GRIORA_NearestNeighbour)
+    assert res == pytest.approx((-1.2027 + 1.60096j), 1e-4)
+    res = ds.GetRasterBand(1).InterpolateAtPoint(5.1, 7.2, gdal.GRIORA_NearestNeighbour)
+    assert res == pytest.approx((32.031867 - 31.546283j), 1e-4)
+    res = ds.GetRasterBand(1).InterpolateAtPoint(5.5, 7.5, gdal.GRIORA_Bilinear)
+    assert res == pytest.approx((32.031867 - 31.546283j), 1e-4)
+    res = ds.GetRasterBand(1).InterpolateAtPoint(5.5, 7.5, gdal.GRIORA_Cubic)
+    assert res == pytest.approx((32.031867 - 31.546283j), 1e-4)
+    res = ds.GetRasterBand(1).InterpolateAtPoint(5.5, 7.5, gdal.GRIORA_CubicSpline)
+    assert res == pytest.approx((34.433130 - 36.741504j), 1e-4)
+
+
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
+def test_interpolateatpoint_big_complex():
+    # The purpose of this test is to check that the algorithm implementation
+    # works for bigger values above the first block of 64x64 pixels.
+    # To do that we are creating a virtual complex band from an existing RGB image.
+
+    ds = gdal.Open(
+        """<VRTDataset rasterXSize="512" rasterYSize="384">
+  <VRTRasterBand dataType="CFloat64" band="1" subClass="VRTDerivedRasterBand">
+    <Description>Complex</Description>
+    <PixelFunctionType>complex</PixelFunctionType>
+    <SimpleSource>
+      <SourceFilename relativeToVRT="0">data/quad-lzw-old-style.tif</SourceFilename>
+      <SourceBand>3</SourceBand>
+    </SimpleSource>
+    <SimpleSource>
+      <SourceFilename relativeToVRT="0">data/quad-lzw-old-style.tif</SourceFilename>
+      <SourceBand>1</SourceBand>
+    </SimpleSource>
+  </VRTRasterBand>
+</VRTDataset>"""
+    )
+    res = ds.GetRasterBand(1).InterpolateAtPoint(256, 64, gdal.GRIORA_NearestNeighbour)
+    assert res == (179.0 + 127.0j)
+    res = ds.GetRasterBand(1).InterpolateAtPoint(256, 63, gdal.GRIORA_NearestNeighbour)
+    assert res == (182.0 + 127.0j)
+    res = ds.GetRasterBand(1).InterpolateAtPoint(255, 64, gdal.GRIORA_NearestNeighbour)
+    assert res == (179.0 + 123.0j)
+    res = ds.GetRasterBand(1).InterpolateAtPoint(255, 63, gdal.GRIORA_NearestNeighbour)
+    assert res == (182.0 + 122.0j)
+
+    res = ds.GetRasterBand(1).InterpolateAtPoint(256, 64, gdal.GRIORA_Bilinear)
+    assert (
+        res
+        == ((179.0 + 127.0j) + (182.0 + 127.0j) + (179.0 + 123.0j) + (182.0 + 122.0j))
+        / 4
+    )
+
+    res = ds.GetRasterBand(1).InterpolateAtPoint(256.2, 64.3, gdal.GRIORA_Bilinear)
+    assert res == pytest.approx((179.6 + 125.74j), 1e-6)
+    res = ds.GetRasterBand(1).InterpolateAtPoint(256.2, 64.3, gdal.GRIORA_Cubic)
+    assert res == pytest.approx((179.088 + 125.90542j), 1e-6)
+    res = ds.GetRasterBand(1).InterpolateAtPoint(256.2, 64.3, gdal.GRIORA_CubicSpline)
+    assert res == pytest.approx((179.482666 + 125.512282j), 1e-6)
+
+    res = ds.GetRasterBand(1).InterpolateAtPoint(255.5, 63.5, gdal.GRIORA_Bilinear)
+    assert res == pytest.approx((182 + 122j), 1e-6)
+    res = ds.GetRasterBand(1).InterpolateAtPoint(255.5, 63.5, gdal.GRIORA_Cubic)
+    assert res == pytest.approx((182 + 122j), 1e-6)
diff --git a/autotest/gcore/mask.py b/autotest/gcore/mask.py
index 180521e11b65..9e53178fedc9 100755
--- a/autotest/gcore/mask.py
+++ b/autotest/gcore/mask.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -72,6 +56,10 @@ def test_mask_1():
 # Verify the checksum and flags for "nodata" case.
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_mask_2():
 
     ds = gdal.Open("data/byte.vrt")
diff --git a/autotest/gcore/minixml.py b/autotest/gcore/minixml.py
index d61dc4b03a00..449506553d8b 100755
--- a/autotest/gcore/minixml.py
+++ b/autotest/gcore/minixml.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2009-2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gcore/misc.py b/autotest/gcore/misc.py
index 77f6d6670075..80c8c33613f2 100755
--- a/autotest/gcore/misc.py
+++ b/autotest/gcore/misc.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gcore/multidim.py b/autotest/gcore/multidim.py
index 0382144a4a4e..3c038588aa33 100644
--- a/autotest/gcore/multidim.py
+++ b/autotest/gcore/multidim.py
@@ -9,26 +9,11 @@
 ###############################################################################
 # Copyright (c) 2021, Even Rouault <even.rouault@spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import array
+import itertools
 import json
 import math
 
@@ -1140,3 +1125,195 @@ def test_multidim_CreateRasterAttributeTableFromMDArrays():
     assert rat.GetUsageOfCol(1) == gdal.GFU_PixelCount
     assert rat.GetColOfUsage(gdal.GFU_PixelCount) == 1
     assert rat.GetColOfUsage(gdal.GFU_Min) == -1
+
+
+@gdaltest.enable_exceptions()
+def test_multidim_GetMeshGrid():
+
+    drv = gdal.GetDriverByName("MEM")
+    mem_ds = drv.CreateMultiDimensional("myds")
+    rg = mem_ds.GetRootGroup()
+    dim2 = rg.CreateDimension("dim2", None, None, 2)
+    dim3 = rg.CreateDimension("dim3", None, None, 3)
+    ar2 = rg.CreateMDArray(
+        "ar2", [dim2], gdal.ExtendedDataType.Create(gdal.GDT_Float64)
+    )
+    ar2_vals = [1, 2]
+    ar2.SetNoDataValueDouble(0)
+    ar2.SetUnit("m")
+    ar2.SetOffset(1)
+    ar2.SetScale(10)
+    ar2.CreateAttribute("attr", [], gdal.ExtendedDataType.Create(gdal.GDT_Float64))
+    ar2.Write(ar2_vals)
+    ar3 = rg.CreateMDArray(
+        "ar3", [dim3], gdal.ExtendedDataType.Create(gdal.GDT_Float32)
+    )
+    ar3_vals = [3, 4, 5]
+    ar3.Write(ar3_vals)
+
+    with pytest.raises(Exception, match="Only 1-D input arrays are accepted"):
+        gdal.MDArray.GetMeshGrid(
+            [
+                rg.CreateMDArray(
+                    "2d_array",
+                    [dim2, dim3],
+                    gdal.ExtendedDataType.Create(gdal.GDT_Float64),
+                )
+            ]
+        )
+
+    with pytest.raises(Exception, match="Only INDEXING=xy or ij is accepted"):
+        gdal.MDArray.GetMeshGrid([ar2, ar3], ["INDEXING=unsupported"])
+
+    ret = gdal.MDArray.GetMeshGrid([])
+    assert len(ret) == 0
+
+    ret = gdal.MDArray.GetMeshGrid([ar2, ar3], ["INDEXING=IJ"])
+    assert len(ret) == 2
+
+    assert ret[0].GetDataType().GetNumericDataType() == gdal.GDT_Float64
+    assert ret[0].GetDimensionCount() == 2
+    assert ret[0].GetDimensions()[0].GetSize() == dim2.GetSize()
+    assert ret[0].GetDimensions()[1].GetSize() == dim3.GetSize()
+    assert ret[0].GetNoDataValueAsDouble() == 0
+    assert ret[0].GetUnit() == "m"
+    assert ret[0].GetOffset() == 1
+    assert ret[0].GetScale() == 10
+    assert len(ret[0].GetAttributes()) == 1
+    assert ret[0].GetAttribute("attr")
+    with pytest.raises(Exception, match="Cannot cache an array with an empty filename"):
+        ret[0].Cache()  # Test GetFilename()
+    with pytest.raises(
+        Exception,
+        match="Write operation not permitted on dataset opened in read-only mode",
+    ):
+        ret[0].AsClassicDataset(0, 1).WriteRaster(
+            0, 0, 2, 3, array.array("d", [0] * 6)
+        )  # Test IsWritable()
+
+    assert ret[1].GetDataType().GetNumericDataType() == gdal.GDT_Float32
+    assert ret[1].GetDimensionCount() == 2
+    assert ret[1].GetDimensions()[0].GetSize() == dim2.GetSize()
+    assert ret[1].GetDimensions()[1].GetSize() == dim3.GetSize()
+
+    assert ret[0].Read() == array.array(
+        "d",
+        list(itertools.chain.from_iterable([[v] * dim3.GetSize() for v in ar2_vals])),
+    )
+    assert ret[1].Read() == array.array("f", ar3_vals * dim2.GetSize())
+
+    # Check interoperability with numpy.meshgrid()
+    try:
+        import numpy as np
+
+        from osgeo import gdal_array  # NOQA
+
+        has_numpy = True
+    except ImportError:
+        has_numpy = False
+
+    if has_numpy:
+        xv, yv = np.meshgrid(ar2.ReadAsArray(), ar3.ReadAsArray(), indexing="ij")
+        assert np.all(xv == ret[0].ReadAsArray())
+        assert np.all(yv == ret[1].ReadAsArray())
+
+    ret = gdal.MDArray.GetMeshGrid([ar2, ar3], ["INDEXING=XY"])
+    assert len(ret) == 2
+    assert ret[0].GetDataType().GetNumericDataType() == gdal.GDT_Float64
+    assert ret[0].GetDimensionCount() == 2
+    assert ret[0].GetDimensions()[0].GetSize() == dim3.GetSize()
+    assert ret[0].GetDimensions()[1].GetSize() == dim2.GetSize()
+    assert ret[1].GetDataType().GetNumericDataType() == gdal.GDT_Float32
+    assert ret[1].GetDimensionCount() == 2
+    assert ret[1].GetDimensions()[0].GetSize() == dim3.GetSize()
+    assert ret[1].GetDimensions()[1].GetSize() == dim2.GetSize()
+
+    assert ret[0].Read() == array.array("d", ar2_vals * dim3.GetSize())
+    assert ret[1].Read() == array.array(
+        "f",
+        list(itertools.chain.from_iterable([[v] * dim2.GetSize() for v in ar3_vals])),
+    )
+
+    # Check interoperability with numpy.meshgrid()
+    if has_numpy:
+        xv, yv = np.meshgrid(ar2.ReadAsArray(), ar3.ReadAsArray(), indexing="xy")
+        assert np.all(xv == ret[0].ReadAsArray())
+        assert np.all(yv == ret[1].ReadAsArray())
+
+    # Test 3D
+
+    dim4 = rg.CreateDimension("dim4", None, None, 4)
+    ar4 = rg.CreateMDArray("ar4", [dim4], gdal.ExtendedDataType.CreateString())
+    ar4_vals = ["a", "bc", "def", "ghij"]
+    ar4.Write(ar4_vals)
+
+    ret = gdal.MDArray.GetMeshGrid([ar2, ar3, ar4], ["INDEXING=IJ"])
+    assert len(ret) == 3
+    assert ret[0].GetDimensionCount() == 3
+    assert ret[0].GetDimensions()[0].GetSize() == dim2.GetSize()
+    assert ret[0].GetDimensions()[1].GetSize() == dim3.GetSize()
+    assert ret[0].GetDimensions()[2].GetSize() == dim4.GetSize()
+
+    # print(ret[0].ReadAsArray())
+    # print(ret[1].ReadAsArray())
+    # print(ret[2].Read())
+
+    assert ret[0].Read() == array.array(
+        "d",
+        list(
+            itertools.chain.from_iterable(
+                [[v] * (dim3.GetSize() * dim4.GetSize()) for v in ar2_vals]
+            )
+        ),
+    )
+    assert ret[1].Read() == array.array(
+        "f",
+        list(itertools.chain.from_iterable([[v] * dim4.GetSize() for v in ar3_vals]))
+        * dim2.GetSize(),
+    )
+    assert ret[2].Read() == ar4_vals * (dim2.GetSize() * dim3.GetSize())
+
+    # Check interoperability with numpy.meshgrid()
+    if has_numpy:
+        xv, yv, zv = np.meshgrid(
+            ar2.ReadAsArray(), ar3.ReadAsArray(), ar4_vals, indexing="ij"
+        )
+        assert np.all(xv == ret[0].ReadAsArray())
+        assert np.all(yv == ret[1].ReadAsArray())
+        assert np.all(zv == np.array(ret[2].Read()).reshape(zv.shape))
+
+    ret = gdal.MDArray.GetMeshGrid([ar2, ar3, ar4], ["INDEXING=XY"])
+    assert len(ret) == 3
+    assert ret[0].GetDimensionCount() == 3
+    assert ret[0].GetDimensions()[0].GetSize() == dim3.GetSize()
+    assert ret[0].GetDimensions()[1].GetSize() == dim2.GetSize()
+    assert ret[0].GetDimensions()[2].GetSize() == dim4.GetSize()
+
+    # print(ret[0].ReadAsArray())
+    # print(ret[1].ReadAsArray())
+    # print(ret[2].Read())
+
+    assert ret[0].Read() == array.array(
+        "d",
+        list(itertools.chain.from_iterable([[v] * dim4.GetSize() for v in ar2_vals]))
+        * dim3.GetSize(),
+    )
+    assert ret[1].Read() == array.array(
+        "f",
+        list(
+            itertools.chain.from_iterable(
+                [[v] * (dim2.GetSize() * dim4.GetSize()) for v in ar3_vals]
+            )
+        ),
+    )
+    assert ret[2].Read() == ar4_vals * (dim2.GetSize() * dim3.GetSize())
+
+    # Check interoperability with numpy.meshgrid()
+
+    if has_numpy:
+        xv, yv, zv = np.meshgrid(
+            ar2.ReadAsArray(), ar3.ReadAsArray(), ar4_vals, indexing="xy"
+        )
+        assert np.all(xv == ret[0].ReadAsArray())
+        assert np.all(yv == ret[1].ReadAsArray())
+        assert np.all(zv == np.array(ret[2].Read()).reshape(zv.shape))
diff --git a/autotest/gcore/nodatamaskband.py b/autotest/gcore/nodatamaskband.py
index 2a9e253ef00f..3bf93f101f9d 100755
--- a/autotest/gcore/nodatamaskband.py
+++ b/autotest/gcore/nodatamaskband.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2018, Even Rouault <even.rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import struct
diff --git a/autotest/gcore/numpy_rw.py b/autotest/gcore/numpy_rw.py
index f7d82aaa7db4..ac3d388478d9 100755
--- a/autotest/gcore/numpy_rw.py
+++ b/autotest/gcore/numpy_rw.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2009-2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
@@ -732,6 +716,10 @@ def test_numpy_rw_18():
 # The VRT references a non existing TIF file, but using the proxy pool dataset API (#2837)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_numpy_rw_failure_in_readasarray():
 
     ds = gdal.Open("data/idontexist2.vrt")
@@ -964,6 +952,10 @@ def test_numpy_rw_band_read_as_array_error_cases():
 # Test that we can get an error (#5374)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_numpy_rw_band_read_as_array_getlasterrormsg():
 
     ds = gdal.Open(
@@ -1015,3 +1007,29 @@ def test_numpy_rw_masked_array_2():
     assert numpy.all(masked_arr.mask[mask != 255])
 
     assert masked_arr.sum() == arr[mask == 255].sum()
+
+
+###############################################################################
+# Test type code mapping
+
+
+def test_gdal_type_code_to_numeric_type_code():
+
+    assert gdal_array.GDALTypeCodeToNumericTypeCode(gdal.GDT_Float32) == numpy.float32
+
+    # invalid type code
+    assert gdal_array.GDALTypeCodeToNumericTypeCode(802) is None
+
+
+def test_numeric_type_code_to_gdal_type_code():
+
+    assert gdal_array.NumericTypeCodeToGDALTypeCode(numpy.float32) == gdal.GDT_Float32
+    assert (
+        gdal_array.NumericTypeCodeToGDALTypeCode(numpy.dtype("int16")) == gdal.GDT_Int16
+    )
+
+
+def test_flip_code():
+
+    assert gdal_array.flip_code(numpy.float32) == gdal.GDT_Float32
+    assert gdal_array.flip_code(gdal.GDT_Int16) == numpy.int16
diff --git a/autotest/gcore/numpy_rw_multidim.py b/autotest/gcore/numpy_rw_multidim.py
index 9e9214448dd6..5b2d558a9467 100755
--- a/autotest/gcore/numpy_rw_multidim.py
+++ b/autotest/gcore/numpy_rw_multidim.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2019, Even Rouault <even.rouault@spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gcore/overviewds.py b/autotest/gcore/overviewds.py
index 788f2254b0fe..acb19f34ba01 100755
--- a/autotest/gcore/overviewds.py
+++ b/autotest/gcore/overviewds.py
@@ -10,28 +10,13 @@
 ###############################################################################
 # Copyright (c) 2014 Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import shutil
 import struct
 
+import gdaltest
 import pytest
 
 from osgeo import gdal
@@ -225,13 +210,12 @@ def test_overviewds_4(tmp_path):
 
     for key in rpc_md:
         assert ds.GetMetadataItem(key, "RPC") == got_md[key]
-        if (
-            key == "LINE_SCALE"
-            or key == "SAMP_SCALE"
-            or key == "LINE_OFF"
-            or key == "SAMP_OFF"
-        ):
-            assert float(got_md[key]) == myfloat(rpc_md[key]) / 2
+        if key == "LINE_SCALE" or key == "SAMP_SCALE":
+            assert float(got_md[key]) == pytest.approx(myfloat(rpc_md[key]) / 2)
+        elif key == "LINE_OFF" or key == "SAMP_OFF":
+            assert float(got_md[key]) == pytest.approx(
+                (myfloat(rpc_md[key]) + 0.5) / 2 - 0.5
+            )
         elif got_md[key] != rpc_md[key]:
             print(got_md[key])
             print(rpc_md[key])
@@ -251,6 +235,10 @@ def test_overviewds_4(tmp_path):
 # Test GEOLOCATION
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_overviewds_5(tmp_path):
 
     shutil.copy("data/sstgeo.tif", tmp_path)
@@ -297,6 +285,10 @@ def test_overviewds_5(tmp_path):
 # Test VRT
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_overviewds_6(tmp_path):
 
     shutil.copy("data/byte.tif", tmp_path)
diff --git a/autotest/gcore/pam.py b/autotest/gcore/pam.py
index 2b4403123f04..110daffaef3f 100755
--- a/autotest/gcore/pam.py
+++ b/autotest/gcore/pam.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -175,6 +159,7 @@ def test_pam_5():
 #
 
 
+@pytest.mark.require_driver("HFA")
 def test_pam_6():
 
     ds = gdal.Open("data/f2r23.tif")
@@ -382,7 +367,7 @@ def test_pam_11():
     # Check that we actually have no saved statistics
     ds = gdal.Open("tmpdirreadonly/byte.tif")
     stats = ds.GetRasterBand(1).GetStatistics(False, False)
-    assert stats[3] == -1, "did not expected to have stats at that point"
+    assert stats is None
     ds = None
 
     # This must be run as an external process so we can override GDAL_PAM_PROXY_DIR
diff --git a/autotest/gcore/pamproxydb.py b/autotest/gcore/pamproxydb.py
index 0612484cda86..6a791b592882 100755
--- a/autotest/gcore/pamproxydb.py
+++ b/autotest/gcore/pamproxydb.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gcore/pixfun.py b/autotest/gcore/pixfun.py
index 57fcf99f3fb3..dfb528788134 100755
--- a/autotest/gcore/pixfun.py
+++ b/autotest/gcore/pixfun.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2010-2014, Antonio Valentino <antonio.valentino@tiscali.it>
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import math
@@ -35,6 +19,11 @@
 
 from osgeo import gdal
 
+pytestmark = pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
+
 # All tests will be skipped if numpy is unavailable.
 numpy = pytest.importorskip("numpy")
 
diff --git a/autotest/gcore/pnm_read.py b/autotest/gcore/pnm_read.py
index fdbddaaff4f4..c2e0570ba4a4 100755
--- a/autotest/gcore/pnm_read.py
+++ b/autotest/gcore/pnm_read.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gcore/rasterio.py b/autotest/gcore/rasterio.py
index cee967b15724..54848bd48d72 100755
--- a/autotest/gcore/rasterio.py
+++ b/autotest/gcore/rasterio.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import math
@@ -884,29 +868,153 @@ def test_rasterio_12():
 # Test cubic resampling with masking
 
 
-def test_rasterio_13():
+@pytest.mark.parametrize(
+    "dt",
+    [
+        "Byte",
+        "Int8",
+        "Int16",
+        "UInt16",
+        "Int32",
+        "UInt32",
+        "Int64",
+        "UInt64",
+        "Float32",
+        "Float64",
+    ],
+)
+def test_rasterio_13(dt):
     numpy = pytest.importorskip("numpy")
 
-    for dt in [gdal.GDT_Byte, gdal.GDT_UInt16, gdal.GDT_UInt32]:
+    dt = gdal.GetDataTypeByName(dt)
+    mem_ds = gdal.GetDriverByName("MEM").Create("", 4, 3, 1, dt)
+    mem_ds.GetRasterBand(1).SetNoDataValue(0)
+    if dt == gdal.GDT_Int8:
+        x = (1 << 7) - 1
+    elif dt == gdal.GDT_Byte:
+        x = (1 << 8) - 1
+    elif dt == gdal.GDT_Int16:
+        x = (1 << 15) - 1
+    elif dt == gdal.GDT_UInt16:
+        x = (1 << 16) - 1
+    elif dt == gdal.GDT_Int32:
+        x = (1 << 31) - 1
+    elif dt == gdal.GDT_UInt32:
+        x = (1 << 32) - 1
+    elif dt == gdal.GDT_Int64:
+        x = (1 << 63) - 1
+    elif dt == gdal.GDT_UInt64:
+        x = (1 << 64) - 2048
+    elif dt == gdal.GDT_Float32:
+        x = 1.5
+    else:
+        x = 1.23456
+    mem_ds.GetRasterBand(1).WriteArray(
+        numpy.array([[0, 0, 0, 0], [0, x, 0, 0], [0, 0, 0, 0]])
+    )
 
-        mem_ds = gdal.GetDriverByName("MEM").Create("", 4, 3, 1, dt)
-        mem_ds.GetRasterBand(1).SetNoDataValue(0)
-        mem_ds.GetRasterBand(1).WriteArray(
-            numpy.array([[0, 0, 0, 0], [0, 255, 0, 0], [0, 0, 0, 0]])
-        )
+    ar_ds = mem_ds.ReadAsArray(
+        0, 0, 4, 3, buf_xsize=8, buf_ysize=3, resample_alg=gdal.GRIORA_Cubic
+    )
 
-        ar_ds = mem_ds.ReadAsArray(
-            0, 0, 4, 3, buf_xsize=8, buf_ysize=3, resample_alg=gdal.GRIORA_Cubic
-        )
+    expected_ar = numpy.array(
+        [
+            [0, 0, 0, 0, 0, 0, 0, 0],
+            [0, x, x, 0, 0, 0, 0, 0],
+            [0, 0, 0, 0, 0, 0, 0, 0],
+        ]
+    )
+    assert numpy.array_equal(ar_ds, expected_ar)
 
-        expected_ar = numpy.array(
-            [
-                [0, 0, 0, 0, 0, 0, 0, 0],
-                [0, 255, 255, 0, 0, 0, 0, 0],
-                [0, 0, 0, 0, 0, 0, 0, 0],
-            ]
-        )
-        assert numpy.array_equal(ar_ds, expected_ar), (ar_ds, dt)
+
+###############################################################################
+# Test nearest and mode resampling
+
+
+@pytest.mark.parametrize(
+    "dt",
+    [
+        "Byte",
+        "Int8",
+        "Int16",
+        "UInt16",
+        "Int32",
+        "UInt32",
+        "Int64",
+        "UInt64",
+        "Float32",
+        "Float64",
+        "CInt16",
+        "CInt32",
+        "CFloat32",
+        "CFloat64",
+    ],
+)
+@pytest.mark.parametrize(
+    "resample_alg", [gdal.GRIORA_NearestNeighbour, gdal.GRIORA_Mode]
+)
+@pytest.mark.parametrize("use_nan", [True, False])
+def test_rasterio_nearest_or_mode(dt, resample_alg, use_nan):
+    numpy = pytest.importorskip("numpy")
+    gdal_array = pytest.importorskip("osgeo.gdal_array")
+
+    dt = gdal.GetDataTypeByName(dt)
+    mem_ds = gdal.GetDriverByName("MEM").Create("", 4, 4, 1, dt)
+    if dt == gdal.GDT_Int8:
+        x = (1 << 7) - 1
+    elif dt == gdal.GDT_Byte:
+        x = (1 << 8) - 1
+    elif dt == gdal.GDT_Int16 or dt == gdal.GDT_CInt16:
+        x = (1 << 15) - 1
+    elif dt == gdal.GDT_UInt16:
+        x = (1 << 16) - 1
+    elif dt == gdal.GDT_Int32 or dt == gdal.GDT_CInt32:
+        x = (1 << 31) - 1
+    elif dt == gdal.GDT_UInt32:
+        x = (1 << 32) - 1
+    elif dt == gdal.GDT_Int64:
+        x = (1 << 63) - 1
+    elif dt == gdal.GDT_UInt64:
+        x = (1 << 64) - 1
+    elif dt == gdal.GDT_Float32 or dt == gdal.GDT_CFloat32:
+        x = float("nan") if use_nan else 1.5
+    else:
+        x = float("nan") if use_nan else 1.234567890123
+
+    if gdal.DataTypeIsComplex(dt):
+        val = complex(x, x)
+    else:
+        val = x
+
+    dtype = gdal_array.flip_code(dt)
+    mem_ds.GetRasterBand(1).WriteArray(numpy.full((4, 4), val, dtype=dtype))
+
+    ar_ds = mem_ds.ReadAsArray(
+        0, 0, 4, 4, buf_xsize=1, buf_ysize=1, resample_alg=resample_alg
+    )
+
+    expected_ar = numpy.array([[val]]).astype(dtype)
+    if math.isnan(x):
+        if gdal.DataTypeIsComplex(dt):
+            assert math.isnan(ar_ds[0][0].real) and math.isnan(ar_ds[0][0].imag)
+        else:
+            assert math.isnan(ar_ds[0][0])
+    else:
+        assert numpy.array_equal(ar_ds, expected_ar)
+
+    resample_alg_mapping = {
+        gdal.GRIORA_NearestNeighbour: "NEAR",
+        gdal.GRIORA_Mode: "MODE",
+    }
+    mem_ds.BuildOverviews(resample_alg_mapping[resample_alg], [4])
+    ar_ds = mem_ds.GetRasterBand(1).GetOverview(0).ReadAsArray()
+    if math.isnan(x):
+        if gdal.DataTypeIsComplex(dt):
+            assert math.isnan(ar_ds[0][0].real) and math.isnan(ar_ds[0][0].imag)
+        else:
+            assert math.isnan(ar_ds[0][0])
+    else:
+        assert numpy.array_equal(ar_ds, expected_ar)
 
 
 ###############################################################################
@@ -3194,11 +3302,11 @@ def test_rasterio_overview_selection():
     assert ds.GetRasterBand(1).ReadRaster(0, 0, 100, 100, 101, 101)[0] == 1
     assert ds.GetRasterBand(1).ReadRaster(0, 0, 100, 100, 100, 100)[0] == 1
     assert ds.GetRasterBand(1).ReadRaster(0, 0, 100, 100, 99, 99)[0] == 1
-    assert ds.GetRasterBand(1).ReadRaster(0, 0, 100, 100, 60, 60)[0] == 1
+    assert ds.GetRasterBand(1).ReadRaster(0, 0, 100, 100, 60, 60)[0] == 2
     assert ds.GetRasterBand(1).ReadRaster(0, 0, 100, 100, 59, 59)[0] == 2
     assert ds.GetRasterBand(1).ReadRaster(0, 0, 100, 100, 50, 50)[0] == 2
     assert ds.GetRasterBand(1).ReadRaster(0, 0, 100, 100, 49, 49)[0] == 2
-    assert ds.GetRasterBand(1).ReadRaster(0, 0, 100, 100, 30, 30)[0] == 2
+    assert ds.GetRasterBand(1).ReadRaster(0, 0, 100, 100, 30, 30)[0] == 3
     assert ds.GetRasterBand(1).ReadRaster(0, 0, 100, 100, 29, 29)[0] == 3
     assert ds.GetRasterBand(1).ReadRaster(0, 0, 100, 100, 25, 25)[0] == 3
     assert ds.GetRasterBand(1).ReadRaster(0, 0, 100, 100, 24, 24)[0] == 3
diff --git a/autotest/gcore/rat.py b/autotest/gcore/rat.py
index 3128fc4fbedd..d6ec55609915 100755
--- a/autotest/gcore/rat.py
+++ b/autotest/gcore/rat.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2009, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gcore/relationship.py b/autotest/gcore/relationship.py
index 60d32f24085e..15906ad4dd0e 100755
--- a/autotest/gcore/relationship.py
+++ b/autotest/gcore/relationship.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2022, Nyall Dawson <nyall dot dawson at gmail dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import pytest
@@ -35,7 +19,7 @@
 
 def test_gdal_relationship():
 
-    with pytest.raises(ValueError):
+    with pytest.raises(Exception):
         gdal.Relationship(None, None, None, gdal.GRC_ONE_TO_ONE)
 
     relationship = gdal.Relationship(
diff --git a/autotest/gcore/rfc30.py b/autotest/gcore/rfc30.py
index bbafb243a1d3..12c9324930f7 100755
--- a/autotest/gcore/rfc30.py
+++ b/autotest/gcore/rfc30.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2010 Frank Warmerdam
 # Copyright (c) 2010-2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import urllib.parse
diff --git a/autotest/gcore/test_driver_metadata.py b/autotest/gcore/test_driver_metadata.py
index 81ba941c84da..7f1bee6eb8a1 100644
--- a/autotest/gcore/test_driver_metadata.py
+++ b/autotest/gcore/test_driver_metadata.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2020, Rene Buffat <buffat at gmail dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
@@ -392,6 +376,13 @@
 )
 
 
+@pytest.mark.parametrize("driver_name", all_driver_names)
+def test_metadata_has_long_name(driver_name):
+
+    driver = gdal.GetDriverByName(driver_name)
+    assert driver.GetMetadataItem(gdal.DMD_LONGNAME) is not None
+
+
 @pytest.mark.parametrize("driver_name", all_driver_names)
 def test_metadata_dcap_yes(driver_name):
     """Test that the only value of DCAP_ elements is YES"""
diff --git a/autotest/gcore/testnonboundtoswig.py b/autotest/gcore/testnonboundtoswig.py
index 8979d26f4512..53f7c0c53953 100755
--- a/autotest/gcore/testnonboundtoswig.py
+++ b/autotest/gcore/testnonboundtoswig.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2011-2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import ctypes
@@ -291,6 +275,10 @@ def my_pyDerivedPixelFunc(
     return 0
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_testnonboundtoswig_VRTDerivedBands():
 
     DerivedPixelFuncType = ctypes.CFUNCTYPE(
diff --git a/autotest/gcore/thread_test.py b/autotest/gcore/thread_test.py
index 9fe563757aae..fb2f32c3a776 100755
--- a/autotest/gcore/thread_test.py
+++ b/autotest/gcore/thread_test.py
@@ -10,25 +10,10 @@
 ###############################################################################
 # Copyright (c) 2016, Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
+import shutil
 import threading
 
 import gdaltest
@@ -75,3 +60,540 @@ def test_thread_test_1():
             ret = False
 
     assert ret
+
+
+def launch_threads(get_band, expected_cs, on_mask_band=False):
+    res = [True]
+
+    def verify_checksum():
+        for i in range(1000):
+            got_cs = get_band().Checksum()
+            if got_cs != expected_cs:
+                res[0] = False
+                assert False, (got_cs, expected_cs)
+
+    threads = [threading.Thread(target=verify_checksum) for i in range(2)]
+    for t in threads:
+        t.start()
+    for t in threads:
+        t.join()
+    assert res[0]
+
+
+def test_thread_safe_open():
+
+    ds = gdal.OpenEx("data/byte.tif", gdal.OF_RASTER | gdal.OF_THREAD_SAFE)
+    assert ds.IsThreadSafe(gdal.OF_RASTER)
+    assert not ds.IsThreadSafe(gdal.OF_RASTER | gdal.OF_UPDATE)
+
+    def get_band():
+        return ds.GetRasterBand(1)
+
+    launch_threads(get_band, 4672)
+
+    # Check that GetThreadSafeDataset() on an already thread-safe dataset
+    # return itself.
+    ref_count_before = ds.GetRefCount()
+    thread_safe_ds = ds.GetThreadSafeDataset(gdal.OF_RASTER)
+    assert ds.GetRefCount() == ref_count_before + 1
+    assert thread_safe_ds.GetRefCount() == ref_count_before + 1
+    del thread_safe_ds
+    assert ds.GetRefCount() == ref_count_before
+
+
+def test_thread_safe_create():
+
+    ds = gdal.OpenEx("data/byte.tif", gdal.OF_RASTER)
+    assert not ds.IsThreadSafe(gdal.OF_RASTER)
+    assert ds.GetRefCount() == 1
+    thread_safe_ds = ds.GetThreadSafeDataset(gdal.OF_RASTER)
+    assert thread_safe_ds.IsThreadSafe(gdal.OF_RASTER)
+    assert ds.GetRefCount() == 2
+    del ds
+
+    def get_band():
+        return thread_safe_ds.GetRasterBand(1)
+
+    launch_threads(get_band, 4672)
+
+
+def test_thread_safe_create_close_src_ds():
+
+    ds = gdal.OpenEx("data/byte.tif", gdal.OF_RASTER)
+    thread_safe_ds = ds.GetThreadSafeDataset(gdal.OF_RASTER)
+    ds.Close()
+    with pytest.raises(Exception):
+        thread_safe_ds.RasterCount
+
+
+def test_thread_safe_src_cannot_be_reopened(tmp_vsimem):
+
+    tmpfilename = str(tmp_vsimem / "byte.tif")
+    gdal.Translate(tmpfilename, "data/byte.tif")
+
+    with gdal.OpenEx(tmpfilename, gdal.OF_RASTER | gdal.OF_THREAD_SAFE) as ds:
+        gdal.Unlink(tmpfilename)
+        with pytest.raises(Exception):
+            ds.GetRasterBand(1).Checksum()
+
+
+@pytest.mark.parametrize(
+    "flag", [gdal.OF_UPDATE, gdal.OF_VECTOR, gdal.OF_MULTIDIM_RASTER, gdal.OF_GNM]
+)
+def test_thread_safe_incompatible_open_flags(flag):
+    with pytest.raises(Exception, match="mutually exclusive"):
+        gdal.OpenEx("data/byte.tif", gdal.OF_THREAD_SAFE | flag)
+
+
+def test_thread_safe_src_alter_after_opening(tmp_vsimem):
+
+    tmpfilename = str(tmp_vsimem / "byte.tif")
+
+    gdal.Translate(tmpfilename, "data/byte.tif")
+    with gdal.OpenEx(tmpfilename, gdal.OF_RASTER | gdal.OF_THREAD_SAFE) as ds:
+        gdal.GetDriverByName("GTiff").Create(
+            tmpfilename, ds.RasterXSize + 1, ds.RasterYSize, ds.RasterCount
+        )
+        with pytest.raises(Exception):
+            ds.GetRasterBand(1).Checksum()
+
+    gdal.Translate(tmpfilename, "data/byte.tif")
+    with gdal.OpenEx(tmpfilename, gdal.OF_RASTER | gdal.OF_THREAD_SAFE) as ds:
+        gdal.GetDriverByName("GTiff").Create(
+            tmpfilename, ds.RasterXSize, ds.RasterYSize + 1, ds.RasterCount
+        )
+        with pytest.raises(Exception):
+            ds.GetRasterBand(1).Checksum()
+
+    gdal.Translate(tmpfilename, "data/byte.tif")
+    with gdal.OpenEx(tmpfilename, gdal.OF_RASTER | gdal.OF_THREAD_SAFE) as ds:
+        gdal.GetDriverByName("GTiff").Create(
+            tmpfilename, ds.RasterXSize, ds.RasterYSize, ds.RasterCount + 1
+        )
+        with pytest.raises(Exception):
+            ds.GetRasterBand(1).Checksum()
+
+    gdal.Translate(tmpfilename, "data/byte.tif")
+    with gdal.OpenEx(tmpfilename, gdal.OF_RASTER | gdal.OF_THREAD_SAFE) as ds:
+        gdal.GetDriverByName("GTiff").Create(
+            tmpfilename, ds.RasterXSize, ds.RasterYSize, ds.RasterCount, gdal.GDT_Int16
+        )
+        with pytest.raises(Exception):
+            ds.GetRasterBand(1).Checksum()
+
+    gdal.Translate(tmpfilename, "data/byte.tif")
+    with gdal.OpenEx(tmpfilename, gdal.OF_RASTER | gdal.OF_THREAD_SAFE) as ds:
+        gdal.GetDriverByName("GTiff").Create(
+            tmpfilename,
+            ds.RasterXSize,
+            ds.RasterYSize,
+            ds.RasterCount,
+            options=["TILED=YES"],
+        )
+        with pytest.raises(Exception):
+            ds.GetRasterBand(1).Checksum()
+
+    with gdal.Translate(tmpfilename, "data/byte.tif") as ds:
+        ds.BuildOverviews("NEAR", [2])
+    with gdal.OpenEx(tmpfilename, gdal.OF_RASTER | gdal.OF_THREAD_SAFE) as ds:
+        ds.GetRasterBand(1).GetOverviewCount()
+        gdal.GetDriverByName("GTiff").Create(
+            tmpfilename, ds.RasterXSize, ds.RasterYSize, ds.RasterCount
+        )
+        with pytest.raises(Exception):
+            ds.GetRasterBand(1).GetOverview(0).Checksum()
+
+
+def test_thread_safe_mask_band():
+
+    with gdal.Open("data/stefan_full_rgba.tif") as src_ds:
+        expected_cs = src_ds.GetRasterBand(1).GetMaskBand().Checksum()
+
+    with gdal.OpenEx(
+        "data/stefan_full_rgba.tif", gdal.OF_RASTER | gdal.OF_THREAD_SAFE
+    ) as ds:
+
+        def get_band():
+            return ds.GetRasterBand(1).GetMaskBand()
+
+        launch_threads(get_band, expected_cs)
+
+    with gdal.OpenEx(
+        "data/stefan_full_rgba.tif", gdal.OF_RASTER | gdal.OF_THREAD_SAFE
+    ) as ds:
+        band = ds.GetRasterBand(1).GetMaskBand()
+
+        def get_band():
+            return band
+
+        launch_threads(get_band, expected_cs)
+
+
+def test_thread_safe_mask_of_mask_band():
+
+    with gdal.Open("data/stefan_full_rgba.tif") as src_ds:
+        expected_cs = src_ds.GetRasterBand(1).GetMaskBand().GetMaskBand().Checksum()
+
+    with gdal.OpenEx(
+        "data/stefan_full_rgba.tif", gdal.OF_RASTER | gdal.OF_THREAD_SAFE
+    ) as ds:
+
+        def get_band():
+            return ds.GetRasterBand(1).GetMaskBand().GetMaskBand()
+
+        launch_threads(get_band, expected_cs)
+
+
+def test_thread_safe_mask_band_implicit_mem_ds():
+
+    with gdal.Open("data/stefan_full_rgba.tif") as src_ds:
+        ds = gdal.GetDriverByName("MEM").CreateCopy("", src_ds)
+        expected_cs = src_ds.GetRasterBand(1).GetMaskBand().Checksum()
+        assert ds.GetRasterBand(1).GetMaskBand().Checksum() == expected_cs
+
+    ds = ds.GetThreadSafeDataset(gdal.OF_RASTER)
+
+    def get_band():
+        return ds.GetRasterBand(1).GetMaskBand()
+
+    launch_threads(get_band, expected_cs)
+
+
+def test_thread_safe_mask_band_explicit_mem_ds():
+
+    with gdal.Open("data/stefan_full_rgba.tif") as src_ds:
+        ds = gdal.GetDriverByName("MEM").Create(
+            "", src_ds.RasterXSize, src_ds.RasterYSize, 1
+        )
+        ds.GetRasterBand(1).CreateMaskBand(gdal.GMF_PER_DATASET)
+        ds.GetRasterBand(1).GetMaskBand().WriteRaster(
+            0,
+            0,
+            src_ds.RasterXSize,
+            src_ds.RasterYSize,
+            src_ds.GetRasterBand(1).GetMaskBand().ReadRaster(),
+        )
+
+        expected_cs = src_ds.GetRasterBand(1).GetMaskBand().Checksum()
+        assert ds.GetRasterBand(1).GetMaskBand().Checksum() == expected_cs
+
+    ds = ds.GetThreadSafeDataset(gdal.OF_RASTER)
+
+    def get_band():
+        return ds.GetRasterBand(1).GetMaskBand()
+
+    launch_threads(get_band, expected_cs)
+
+
+def test_thread_safe_overview(tmp_path):
+
+    tmpfilename = str(tmp_path / "byte.tif")
+    shutil.copy("data/byte.tif", tmpfilename)
+    with gdal.Open(tmpfilename, gdal.GA_Update) as ds:
+        ds.BuildOverviews("NEAR", [2])
+        expected_cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
+
+    with gdal.OpenEx(tmpfilename, gdal.OF_RASTER | gdal.OF_THREAD_SAFE) as ds:
+        assert ds.GetRasterBand(1).GetOverviewCount() == 1
+        assert ds.GetRasterBand(1).GetOverview(-1) is None
+        assert ds.GetRasterBand(1).GetOverview(1) is None
+
+        def get_band():
+            return ds.GetRasterBand(1).GetOverview(0)
+
+        launch_threads(get_band, expected_cs)
+
+    with gdal.OpenEx(tmpfilename, gdal.OF_RASTER | gdal.OF_THREAD_SAFE) as ds:
+        band = ds.GetRasterBand(1).GetOverview(0)
+
+        def get_band():
+            return band
+
+        launch_threads(get_band, expected_cs)
+
+
+def test_thread_safe_overview_mem_ds():
+
+    with gdal.Open("data/byte.tif") as src_ds:
+        ds = gdal.GetDriverByName("MEM").CreateCopy("", src_ds)
+        ds.BuildOverviews("NEAR", [2])
+        expected_cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
+
+    ds = ds.GetThreadSafeDataset(gdal.OF_RASTER)
+
+    assert ds.GetRasterBand(1).GetOverviewCount() == 1
+
+    def get_band():
+        return ds.GetRasterBand(1).GetOverview(0)
+
+    launch_threads(get_band, expected_cs)
+
+    def get_band():
+        return ds.GetRasterBand(1).GetSampleOverview(1)
+
+    launch_threads(get_band, expected_cs)
+
+    band = ds.GetRasterBand(1).GetOverview(0)
+
+    def get_band():
+        return band
+
+    launch_threads(get_band, expected_cs)
+
+
+def test_thread_safe_open_options(tmp_path):
+
+    tmpfilename = str(tmp_path / "byte.tif")
+    shutil.copy("data/byte.tif", tmpfilename)
+    with gdal.Open(tmpfilename, gdal.GA_Update) as ds:
+        ds.BuildOverviews("NEAR", [2])
+        expected_cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
+
+    with gdal.OpenEx(
+        tmpfilename,
+        gdal.OF_RASTER | gdal.OF_THREAD_SAFE,
+        open_options=["OVERVIEW_LEVEL=0"],
+    ) as ds:
+
+        def get_band():
+            return ds.GetRasterBand(1)
+
+        launch_threads(get_band, expected_cs)
+
+
+@pytest.mark.require_driver("HDF5")
+@pytest.mark.require_driver("netCDF")
+def test_thread_safe_reuse_same_driver_as_prototype():
+    """Checks that thread-safe mode honours the opening driver"""
+
+    with gdal.OpenEx(
+        "../gdrivers/data/netcdf/byte_hdf5_starting_at_offset_1024.nc",
+        gdal.OF_RASTER | gdal.OF_THREAD_SAFE,
+        allowed_drivers=["HDF5"],
+    ) as ds:
+
+        ret = [False]
+
+        def thread_func():
+            assert ds.GetMetadataItem("_NCProperties") is not None
+            ret[0] = True
+
+        t = threading.Thread(target=thread_func)
+        t.start()
+        t.join()
+        assert ret[0]
+
+
+def test_thread_safe_no_rat():
+
+    ds = gdal.GetDriverByName("MEM").Create("", 1, 1)
+    ds = ds.GetThreadSafeDataset(gdal.OF_RASTER)
+    assert ds.GetRasterBand(1).GetDefaultRAT() is None
+
+
+def test_thread_safe_rat():
+
+    ds = gdal.GetDriverByName("MEM").Create("", 1, 1)
+    ds.GetRasterBand(1).SetDefaultRAT(gdal.RasterAttributeTable())
+    ds = ds.GetThreadSafeDataset(gdal.OF_RASTER)
+    assert ds.GetRasterBand(1).GetDefaultRAT() is not None
+
+
+@pytest.mark.require_driver("HFA")
+def test_thread_safe_unsupported_rat():
+
+    with gdal.OpenEx(
+        "../gdrivers/data/hfa/87test.img", gdal.OF_RASTER | gdal.OF_THREAD_SAFE
+    ) as ds:
+        with pytest.raises(
+            Exception,
+            match="not supporting a non-GDALDefaultRasterAttributeTable implementation",
+        ):
+            ds.GetRasterBand(1).GetDefaultRAT()
+
+
+def test_thread_safe_many_datasets():
+
+    tab_ds = [
+        gdal.OpenEx(
+            "data/byte.tif" if (i % 3) < 2 else "data/utmsmall.tif",
+            gdal.OF_RASTER | gdal.OF_THREAD_SAFE,
+        )
+        for i in range(100)
+    ]
+
+    res = [True]
+
+    def check():
+        for _ in range(10):
+            for i, ds in enumerate(tab_ds):
+                if ds.GetRasterBand(1).Checksum() != (4672 if (i % 3) < 2 else 50054):
+                    res[0] = False
+
+    threads = [threading.Thread(target=check) for i in range(2)]
+    for t in threads:
+        t.start()
+    for t in threads:
+        t.join()
+    assert res[0]
+
+
+def test_thread_safe_BeginAsyncReader():
+
+    with gdal.OpenEx("data/byte.tif", gdal.OF_RASTER | gdal.OF_THREAD_SAFE) as ds:
+        with pytest.raises(Exception, match="not supported"):
+            ds.BeginAsyncReader(0, 0, ds.RasterXSize, ds.RasterYSize)
+
+
+def test_thread_safe_GetVirtualMem():
+
+    pytest.importorskip("numpy")
+    pytest.importorskip("osgeo.gdal_array")
+
+    with gdal.OpenEx("data/byte.tif", gdal.OF_RASTER | gdal.OF_THREAD_SAFE) as ds:
+        with pytest.raises(Exception, match="not supported"):
+            ds.GetRasterBand(1).GetVirtualMemAutoArray(gdal.GF_Read)
+
+
+def test_thread_safe_GetMetadadata(tmp_vsimem):
+
+    filename = str(tmp_vsimem / "test.tif")
+    with gdal.GetDriverByName("GTiff").Create(filename, 1, 1) as ds:
+        ds.SetMetadataItem("foo", "bar")
+        ds.GetRasterBand(1).SetMetadataItem("bar", "baz")
+
+    with gdal.OpenEx(filename, gdal.OF_RASTER | gdal.OF_THREAD_SAFE) as ds:
+        assert ds.GetMetadataItem("foo") == "bar"
+        assert ds.GetMetadataItem("not existing") is None
+        assert ds.GetMetadata() == {"foo": "bar"}
+        assert ds.GetMetadata("not existing") == {}
+        assert ds.GetRasterBand(1).GetMetadataItem("bar") == "baz"
+        assert ds.GetRasterBand(1).GetMetadataItem("not existing") is None
+        assert ds.GetRasterBand(1).GetMetadata() == {"bar": "baz"}
+        assert ds.GetRasterBand(1).GetMetadata("not existing") == {}
+
+
+def test_thread_safe_GetUnitType(tmp_vsimem):
+
+    filename = str(tmp_vsimem / "test.tif")
+    with gdal.GetDriverByName("GTiff").Create(filename, 1, 1) as ds:
+        ds.GetRasterBand(1).SetUnitType("foo")
+
+    with gdal.OpenEx(filename, gdal.OF_RASTER | gdal.OF_THREAD_SAFE) as ds:
+        assert ds.GetRasterBand(1).GetUnitType() == "foo"
+
+
+def test_thread_safe_GetColorTable(tmp_vsimem):
+
+    filename = str(tmp_vsimem / "test.tif")
+    with gdal.GetDriverByName("GTiff").Create(filename, 1, 1) as ds:
+        ct = gdal.ColorTable()
+        ct.SetColorEntry(0, (1, 2, 3, 255))
+        ds.GetRasterBand(1).SetColorTable(ct)
+
+    with gdal.OpenEx(filename, gdal.OF_RASTER | gdal.OF_THREAD_SAFE) as ds:
+        res = [None]
+
+        def thread_job():
+            res[0] = ds.GetRasterBand(1).GetColorTable()
+
+        t = threading.Thread(target=thread_job)
+        t.start()
+        t.join()
+        assert res[0]
+        assert res[0].GetColorEntry(0) == (1, 2, 3, 255)
+        ct = ds.GetRasterBand(1).GetColorTable()
+        assert ct.GetColorEntry(0) == (1, 2, 3, 255)
+
+
+def test_thread_safe_GetSpatialRef():
+
+    with gdal.OpenEx("data/byte.tif", gdal.OF_RASTER | gdal.OF_THREAD_SAFE) as ds:
+
+        res = [True]
+
+        def check():
+            for i in range(100):
+
+                if len(ds.GetGCPs()) != 0:
+                    res[0] = False
+                    assert False
+
+                if ds.GetGCPSpatialRef():
+                    res[0] = False
+                    assert False
+
+                if ds.GetGCPProjection():
+                    res[0] = False
+                    assert False
+
+                srs = ds.GetSpatialRef()
+                if not srs:
+                    res[0] = False
+                    assert False
+                if not srs.IsProjected():
+                    res[0] = False
+                    assert False
+                if "NAD27 / UTM zone 11N" not in srs.ExportToWkt():
+                    res[0] = False
+                    assert False
+
+                if "NAD27 / UTM zone 11N" not in ds.GetProjectionRef():
+                    res[0] = False
+                    assert False
+
+        threads = [threading.Thread(target=check) for i in range(2)]
+        for t in threads:
+            t.start()
+        for t in threads:
+            t.join()
+        assert res[0]
+
+
+def test_thread_safe_GetGCPs():
+
+    with gdal.OpenEx(
+        "data/byte_gcp_pixelispoint.tif", gdal.OF_RASTER | gdal.OF_THREAD_SAFE
+    ) as ds:
+
+        res = [True]
+
+        def check():
+            for i in range(100):
+
+                if len(ds.GetGCPs()) != 4:
+                    res[0] = False
+                    assert False
+
+                gcp_srs = ds.GetGCPSpatialRef()
+                if gcp_srs is None:
+                    res[0] = False
+                    assert False
+                if not gcp_srs.IsGeographic():
+                    res[0] = False
+                    assert False
+                if "unretrievable - using WGS84" not in gcp_srs.ExportToWkt():
+                    res[0] = False
+                    assert False
+
+                gcp_wkt = ds.GetGCPProjection()
+                if not gcp_wkt:
+                    res[0] = False
+                    assert False
+                if "unretrievable - using WGS84" not in gcp_wkt:
+                    res[0] = False
+                    assert False
+
+                if ds.GetSpatialRef():
+                    res[0] = False
+                    assert False
+                if ds.GetProjectionRef() != "":
+                    res[0] = False
+                    assert False
+
+        threads = [threading.Thread(target=check) for i in range(2)]
+        for t in threads:
+            t.start()
+        for t in threads:
+            t.join()
+        assert res[0]
diff --git a/autotest/gcore/tiff_ovr.py b/autotest/gcore/tiff_ovr.py
index 43577d218158..990b3d84aa5d 100755
--- a/autotest/gcore/tiff_ovr.py
+++ b/autotest/gcore/tiff_ovr.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import array
@@ -122,6 +106,10 @@ def mfloat32_tif(tmp_path):
     yield dst_fname
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_tiff_ovr_1(mfloat32_tif, both_endian):
 
     ds = gdal.Open(mfloat32_tif)
@@ -151,6 +139,10 @@ def test_tiff_ovr_1(mfloat32_tif, both_endian):
 # Open target file in update mode, and create internal overviews.
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_tiff_ovr_3(mfloat32_tif, both_endian):
 
     src_ds = gdal.Open(mfloat32_tif, gdal.GA_Update)
@@ -279,6 +271,8 @@ def cbk(pct, _, user_data):
         callback_data=tab,
         options=["USE_RRD=YES"],
     )
+    if gdal.GetLastErrorMsg() == "This build does not support creating .aux overviews":
+        pytest.skip(gdal.GetLastErrorMsg())
     assert tab[0] == 1.0
 
     try:
@@ -531,6 +525,10 @@ def test_tiff_ovr_12(tmp_path, both_endian):
 # Test gaussian resampling
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_tiff_ovr_13(mfloat32_tif, both_endian):
 
     ds = gdal.Open(mfloat32_tif)
@@ -608,6 +606,10 @@ def test_tiff_ovr_15(tmp_path, both_endian):
 # Test mode resampling on non-byte dataset
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_tiff_ovr_16(tmp_path, both_endian):
 
     tif_fname = str(tmp_path / "ovr16.tif")
@@ -1602,6 +1604,34 @@ def test_tiff_ovr_42(tmp_path, both_endian):
     ds = None
 
 
+###############################################################################
+# Test (failed) attempt at creating JPEG external overviews on dataset with color table
+
+
+@pytest.mark.require_creation_option("GTiff", "JPEG")
+@gdaltest.enable_exceptions()
+def test_tiff_ovr_jpeg_on_color_table(tmp_path):
+
+    tif_fname = str(tmp_path / "test_tiff_ovr_jpeg_on_color_table.tif")
+
+    ct_data = [(255, 0, 0), (0, 255, 0), (0, 0, 255), (255, 255, 255)]
+
+    ct = gdal.ColorTable()
+    for i, data in enumerate(ct_data):
+        ct.SetColorEntry(i, data)
+
+    ds = gdal.GetDriverByName("GTiff").Create(tif_fname, 1, 1)
+    ds.GetRasterBand(1).SetRasterColorTable(ct)
+    ds = None
+
+    with gdal.Open(tif_fname) as ds:
+        with pytest.raises(
+            Exception,
+            match="Cannot create JPEG compressed overviews on a raster with a color table",
+        ):
+            ds.BuildOverviews("NEAREST", overviewlist=[2], options=["COMPRESS=JPEG"])
+
+
 ###############################################################################
 # Make sure that 16bit overviews with JPEG compression are handled using 12-bit
 # jpeg-in-tiff (#3539)
@@ -2614,7 +2644,9 @@ def test_tiff_ovr_fallback_to_multiband_overview_generate():
         "data/byte.tif",
         options="-b 1 -b 1 -b 1 -co INTERLEAVE=BAND -co TILED=YES -outsize 1024 1024",
     )
-    with gdaltest.config_option("GDAL_OVR_CHUNK_MAX_SIZE", "1000"):
+    with gdaltest.config_options(
+        {"GDAL_OVR_CHUNK_MAX_SIZE": "1000", "GDAL_OVR_TEMP_DRIVER": "MEM"}
+    ):
         ds.BuildOverviews("NEAR", overviewlist=[2, 4, 8])
     ds = None
 
diff --git a/autotest/gcore/tiff_read.py b/autotest/gcore/tiff_read.py
index 3975bf948e64..250e067b9202 100755
--- a/autotest/gcore/tiff_read.py
+++ b/autotest/gcore/tiff_read.py
@@ -40,6 +40,8 @@
 
 from osgeo import gdal, osr
 
+pytestmark = pytest.mark.require_driver("HFA")
+
 init_list = [
     ("byte.tif", 1, 4672),
     ("uint16_sgilog.tif", 1, 4672),
@@ -774,6 +776,7 @@ def test_tiff_read_stats_from_pam(tmp_path):
 # Test extracting georeferencing from a .TAB file
 
 
+@pytest.mark.require_driver("MapInfo File")
 def test_tiff_read_from_tab(tmp_path):
 
     ds = gdal.GetDriverByName("GTiff").Create(tmp_path / "tiff_read_from_tab.tif", 1, 1)
@@ -2822,6 +2825,7 @@ def test_tiff_read_one_strip_no_bytecount():
 # Test GDAL_GEOREF_SOURCES
 
 
+@pytest.mark.require_driver("MapInfo File")
 @pytest.mark.parametrize(
     "config_option_value,copy_pam,copy_worldfile,copy_tabfile,expected_srs,expected_gt",
     [
@@ -3027,6 +3031,7 @@ def test_tiff_read_nogeoref(
 # Test GDAL_GEOREF_SOURCES
 
 
+@pytest.mark.require_driver("MapInfo File")
 @pytest.mark.parametrize(
     "config_option_value,copy_pam,copy_worldfile,copy_tabfile,expected_srs,expected_gt",
     [
@@ -5189,6 +5194,10 @@ def test_tiff_read_webp_lossless_rgba_alpha_fully_opaque():
 # Test complex scenario of https://github.com/OSGeo/gdal/issues/9563
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 @pytest.mark.require_creation_option("GTiff", "JPEG")
 def test_tiff_read_jpeg_cached_multi_range_issue_9563(tmp_vsimem):
 
@@ -5220,3 +5229,132 @@ def test_tiff_read_jpeg_cached_multi_range_issue_9563(tmp_vsimem):
     out = str(tmp_vsimem / "out.tif")
     with gdal.config_option("GTIFF_HAS_OPTIMIZED_READ_MULTI_RANGE", "YES"):
         gdal.Translate(out, vrt, options="-tr 0.000071806 0.000071806 -f COG")
+
+
+###############################################################################
+# Test reading a raster with missing ExtraSamples tag in a multithreaded way
+
+
+def test_tiff_read_missing_extrasamples_multi_threaded():
+
+    with gdal.quiet_errors():
+        ds = gdal.Open("data/gtiff/missing_extrasamples.tif")
+    gdal.ErrorReset()
+    with gdal.config_option("GDAL_NUM_THREADS", "2"):
+        ds.ReadRaster()
+    assert gdal.GetLastErrorMsg() == ""
+
+
+###############################################################################
+# Test that we honor GDAL_DISABLE_READDIR_ON_OPEN when working on a dataset opened with OVERVIEW_LEVEL open option
+
+
+@pytest.mark.require_curl()
+def test_tiff_read_overview_level_open_option_honor_GDAL_DISABLE_READDIR_ON_OPEN_EMPTY_DIR(
+    tmp_path,
+):
+
+    webserver_process = None
+    webserver_port = 0
+
+    (webserver_process, webserver_port) = webserver.launch(
+        handler=webserver.DispatcherHttpHandler
+    )
+    if webserver_port == 0:
+        pytest.skip()
+
+    gdal.VSICurlClearCache()
+
+    try:
+        tmp_filename = str(tmp_path / "test.tif")
+        ds = gdal.Translate(tmp_filename, "data/byte.tif")
+        ds.BuildOverviews("NEAR", [2])
+        ds.Close()
+
+        filesize = gdal.VSIStatL(tmp_filename).size
+        handler = webserver.SequentialHandler()
+        handler.add("HEAD", "/test.tif", 200, {"Content-Length": "%d" % filesize})
+
+        def method(request):
+            # sys.stderr.write('%s\n' % str(request.headers))
+
+            if request.headers["Range"].startswith("bytes="):
+                rng = request.headers["Range"][len("bytes=") :]
+                assert len(rng.split("-")) == 2
+                start = int(rng.split("-")[0])
+                end = int(rng.split("-")[1])
+
+                request.protocol_version = "HTTP/1.1"
+                request.send_response(206)
+                request.send_header("Content-type", "application/octet-stream")
+                request.send_header(
+                    "Content-Range", "bytes %d-%d/%d" % (start, end, filesize)
+                )
+                request.send_header("Content-Length", end - start + 1)
+                request.send_header("Connection", "close")
+                request.end_headers()
+                with open(tmp_filename, "rb") as f:
+                    f.seek(start, 0)
+                    request.wfile.write(f.read(end - start + 1))
+
+        for i in range(2):
+            handler.add("GET", "/test.tif", custom_method=method)
+
+        with gdaltest.config_options(
+            {
+                "GDAL_DISABLE_READDIR_ON_OPEN": "EMPTY_DIR",
+            }
+        ):
+            with webserver.install_http_handler(handler):
+                ds = gdal.OpenEx(
+                    "/vsicurl/http://127.0.0.1:%d/test.tif" % webserver_port,
+                    open_options=["OVERVIEW_LEVEL=0"],
+                )
+
+                msgs = []
+
+                def error_handler(type, code, msg):
+                    msgs.append(msg)
+
+                with gdaltest.error_handler(error_handler):
+                    gdal.Translate("", ds, format="MEM")
+                assert len(msgs) == 0
+
+    finally:
+        webserver.server_stop(webserver_process, webserver_port)
+
+        gdal.VSICurlClearCache()
+
+
+###############################################################################
+# Test reading a unrecognized value in the special COLORINTERP item in
+# GDAL_METADATA
+
+
+def test_tiff_read_unrecognized_color_interpretation():
+
+    ds = gdal.Open("data/gtiff/unknown_colorinterp.tif")
+    assert ds.GetRasterBand(1).GetColorInterpretation() == gdal.GCI_Undefined
+    assert ds.GetRasterBand(1).GetMetadataItem("COLOR_INTERPRETATION") == "XXXX"
+
+
+###############################################################################
+# Check that cleaning overviews on a DIMAP2 GeoTIFF file with external overviews
+# does not cause the DIMAP XML file to be cleaned
+
+
+def test_tiff_read_ovr_dimap_pleiades(tmp_path):
+
+    shutil.copytree("../gdrivers/data/dimap2/bundle", tmp_path / "bundle")
+    filename = str(tmp_path / "bundle" / "IMG_foo_R1C1.TIF")
+    ds = gdal.Open(filename)
+    ds.BuildOverviews("NEAR", [2])
+    ds = None
+    ds = gdal.Open(filename + ".ovr")
+    assert ds.GetFileList() == [filename + ".ovr"]
+    ds = None
+    ds = gdal.Open(filename)
+    ds.BuildOverviews("", [])
+    ds = None
+    # Check that cleaning overviews did not suppress the DIMAP XML file
+    assert os.path.exists(tmp_path / "bundle" / "DIM_foo.XML")
diff --git a/autotest/gcore/tiff_read_subifds.py b/autotest/gcore/tiff_read_subifds.py
index 922d83c36e3e..8aec882e5177 100755
--- a/autotest/gcore/tiff_read_subifds.py
+++ b/autotest/gcore/tiff_read_subifds.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2019,  Thomas Bonfort <thomas.bonfort@airbus.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import struct
diff --git a/autotest/gcore/tiff_srs.py b/autotest/gcore/tiff_srs.py
index 1596a5427842..f4069357001d 100755
--- a/autotest/gcore/tiff_srs.py
+++ b/autotest/gcore/tiff_srs.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2011-2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
@@ -621,7 +605,7 @@ def test_tiff_srs_proj4(proj4):
 
 def _create_geotiff1_1_from_copy_and_compare(srcfilename, options=[]):
     if int(gdal.GetDriverByName("GTiff").GetMetadataItem("LIBGEOTIFF")) < 1600:
-        pytest.skip()
+        pytest.skip("libgeotiff >= 1.6.0 required")
 
     src_ds = gdal.Open(srcfilename)
     tmpfile = "/vsimem/tmp.tif"
@@ -1250,9 +1234,11 @@ def test_tiff_srs_projected_GTCitationGeoKey_with_underscore_and_GeogTOWGS84GeoK
 
 
 def test_tiff_srs_write_compound_with_non_epsg_vert_crs():
-
     """Test bugfix for https://github.com/OSGeo/gdal/issues/7833"""
 
+    if int(gdal.GetDriverByName("GTiff").GetMetadataItem("LIBGEOTIFF")) < 1600:
+        pytest.skip("libgeotiff >= 1.6.0 required")
+
     filename = "/vsimem/test_tiff_srs_write_compound_with_non_epsg_vert_crs.tif"
     srs = osr.SpatialReference()
     srs.SetFromUserInput(
@@ -1349,6 +1335,9 @@ def test_tiff_srs_read_compound_without_EPSG_code():
     """Test case where identification of code for CompoundCRS (added for
     bugfix of https://github.com/OSGeo/gdal/issues/7982) doesn't trigger"""
 
+    if int(gdal.GetDriverByName("GTiff").GetMetadataItem("LIBGEOTIFF")) < 1600:
+        pytest.skip("libgeotiff >= 1.6.0 required")
+
     filename = "/vsimem/test_tiff_srs_read_compound_without_EPSG_code.tif"
     srs = osr.SpatialReference()
     # WGS 84 + NAP height, unlikely to have a EPSG code ever
@@ -1424,3 +1413,106 @@ def test_tiff_srs_build_compd_crs_name_without_citation():
 
     ds = gdal.Open("data/gtiff/compdcrs_no_citation.tif")
     assert ds.GetSpatialRef().GetName() == "WGS 84 / UTM zone 17N + EGM2008 height"
+
+
+def test_tiff_srs_read_epsg_27563_allgeokeys():
+
+    ds = gdal.Open("data/gtiff/epsg_27563_allgeokeys.tif")
+    srs = ds.GetSpatialRef()
+    wkt = srs.ExportToWkt(["FORMAT=WKT2_2019"])
+    # deal with differences of precision according to PROJ version
+    wkt = wkt.replace("49.0000000000001", "49")
+    wkt = wkt.replace("49.0000000000002", "49")
+    assert 'PARAMETER["Latitude of natural origin",49,ANGLEUNIT["grad"' in wkt
+    assert (
+        srs.ExportToProj4()
+        == "+proj=lcc +lat_1=44.1 +lat_0=44.1 +lon_0=0 +k_0=0.999877499 +x_0=600000 +y_0=200000 +ellps=clrk80ign +pm=paris +towgs84=-168,-60,320,0,0,0,0 +units=m +no_defs"
+    )
+
+
+def test_tiff_srs_write_read_epsg_27563_only_code(tmp_vsimem):
+
+    filename = str(tmp_vsimem / "test.tif")
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(27563)
+    ds = gdal.GetDriverByName("GTiff").Create(filename, 1, 1)
+    ds.SetSpatialRef(srs)
+    ds = None
+
+    ds = gdal.Open(filename)
+    srs = ds.GetSpatialRef()
+    assert (
+        'PARAMETER["Latitude of natural origin",49,ANGLEUNIT["grad"'
+        in srs.ExportToWkt(["FORMAT=WKT2_2019"])
+    )
+    assert (
+        srs.ExportToProj4()
+        == "+proj=lcc +lat_1=44.1 +lat_0=44.1 +lon_0=0 +k_0=0.999877499 +x_0=600000 +y_0=200000 +ellps=clrk80ign +pm=paris +towgs84=-168,-60,320,0,0,0,0 +units=m +no_defs"
+    )
+
+
+@pytest.mark.parametrize(
+    "config_options",
+    [
+        {},
+        {
+            "GTIFF_WRITE_ANGULAR_PARAMS_IN_DEGREE": "YES",
+            "GTIFF_READ_ANGULAR_PARAMS_IN_DEGREE": "YES",
+        },
+    ],
+)
+def test_tiff_srs_write_read_epsg_27563_full_def(tmp_vsimem, config_options):
+
+    with gdal.config_options(config_options):
+        filename = str(tmp_vsimem / "test.tif")
+        srs = osr.SpatialReference()
+        srs.SetFromUserInput(
+            """PROJCRS["NTF (Paris) / Lambert Sud France",
+        BASEGEOGCRS["NTF (Paris)",
+            DATUM["Nouvelle Triangulation Francaise (Paris)",
+                ELLIPSOID["Clarke 1880 (IGN)",6378249.2,293.466021293627,
+                    LENGTHUNIT["metre",1]]],
+            PRIMEM["Paris",2.5969213,
+                ANGLEUNIT["grad",0.0157079632679489]],
+            ID["EPSG",4807]],
+        CONVERSION["Lambert Sud France",
+            METHOD["Lambert Conic Conformal (1SP)",
+                ID["EPSG",9801]],
+            PARAMETER["Latitude of natural origin",49,
+                ANGLEUNIT["grad",0.0157079632679489],
+                ID["EPSG",8801]],
+            PARAMETER["Longitude of natural origin",0,
+                ANGLEUNIT["grad",0.0157079632679489],
+                ID["EPSG",8802]],
+            PARAMETER["Scale factor at natural origin",0.999877499,
+                SCALEUNIT["unity",1],
+                ID["EPSG",8805]],
+            PARAMETER["False easting",600000,
+                LENGTHUNIT["metre",1],
+                ID["EPSG",8806]],
+            PARAMETER["False northing",200000,
+                LENGTHUNIT["metre",1],
+                ID["EPSG",8807]]],
+        CS[Cartesian,2],
+            AXIS["easting (X)",east,
+                ORDER[1],
+                LENGTHUNIT["metre",1]],
+            AXIS["northing (Y)",north,
+                ORDER[2],
+                LENGTHUNIT["metre",1]]]"""
+        )
+        ds = gdal.GetDriverByName("GTiff").Create(filename, 1, 1)
+        ds.SetSpatialRef(srs)
+        ds = None
+
+        ds = gdal.Open(filename)
+        srs = ds.GetSpatialRef()
+        wkt = srs.ExportToWkt(["FORMAT=WKT2_2019"])
+        # deal with differences of precision according to PROJ version
+        wkt = wkt.replace("49.0000000000001", "49")
+        wkt = wkt.replace("49.0000000000002", "49")
+        assert 'PARAMETER["Latitude of natural origin",49,ANGLEUNIT["grad"' in wkt
+        assert (
+            srs.ExportToProj4()
+            == "+proj=lcc +lat_1=44.1 +lat_0=44.1 +lon_0=0 +k_0=0.999877499 +x_0=600000 +y_0=200000 +ellps=clrk80ign +pm=paris +units=m +no_defs"
+        )
diff --git a/autotest/gcore/tiff_write.py b/autotest/gcore/tiff_write.py
index a3cd2d6cd0c3..88f3caac637f 100755
--- a/autotest/gcore/tiff_write.py
+++ b/autotest/gcore/tiff_write.py
@@ -212,6 +212,10 @@ def test_tiff_write_4():
 # Write a file with GCPs.
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_tiff_write_5():
 
     src_ds = gdal.Open("data/gcps.vrt")
@@ -434,6 +438,10 @@ def test_tiff_write_14():
 # file using the PROFILE creation option with CreateCopy()
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_tiff_write_15():
 
     ds_in = gdal.Open("data/byte.vrt")
@@ -484,6 +492,10 @@ def test_tiff_write_15():
 # file using the PROFILE creation option with Create()
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_tiff_write_16():
 
     ds_in = gdal.Open("data/byte.vrt")
@@ -548,6 +560,10 @@ def test_tiff_write_16():
 # Test writing a TIFF with an RPC tag.
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_tiff_write_17():
 
     # Translate RPC controlled data to GeoTIFF.
@@ -608,6 +624,10 @@ def test_tiff_write_17():
 # case (#3996)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_tiff_write_17_disable_readdir():
     with gdal.config_option("GDAL_DISABLE_READDIR_ON_OPEN", "TRUE"):
         test_tiff_write_17()
@@ -617,6 +637,10 @@ def test_tiff_write_17_disable_readdir():
 # Test writing a TIFF with an RPB file and IMD file.
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_tiff_write_18():
 
     # Translate RPC controlled data to GeoTIFF.
@@ -713,6 +737,10 @@ def test_tiff_write_imd_with_space_in_values():
 # case (#3996)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_tiff_write_18_disable_readdir():
     with gdal.config_option("GDAL_DISABLE_READDIR_ON_OPEN", "TRUE"):
         test_tiff_write_18()
@@ -722,6 +750,10 @@ def test_tiff_write_18_disable_readdir():
 # Test writing a TIFF with an _RPC.TXT
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_tiff_write_rpc_txt():
 
     # Translate RPC controlled data to GeoTIFF.
@@ -774,6 +806,10 @@ def test_tiff_write_rpc_txt():
 # Test writing a TIFF with an RPC in .aux.xml
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_tiff_write_rpc_in_pam():
 
     ds_in = gdal.Open("data/rpc.vrt")
@@ -1068,6 +1104,7 @@ def test_tiff_write_26():
     ct.SetColorEntry(1, (255, 255, 0, 255))
     ct.SetColorEntry(2, (255, 0, 255, 255))
     ct.SetColorEntry(3, (0, 255, 255, 255))
+    ct.SetColorEntry(3, (0, 255, 255, 255))
 
     ds.GetRasterBand(1).SetRasterColorTable(ct)
 
@@ -1088,8 +1125,6 @@ def test_tiff_write_26():
     ct = None
     ds = None
 
-    gdaltest.tiff_drv.Delete("tmp/ct8.tif")
-
 
 ###############################################################################
 # Test color table in a 16 bit image
@@ -1270,6 +1305,10 @@ def test_tiff_write_31():
 # Create a rotated image
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_tiff_write_32():
 
     ds_in = gdal.Open("data/byte.vrt")
@@ -1310,6 +1349,10 @@ def test_tiff_write_32():
 # (BASELINE is tested by tiff_write_15)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_tiff_write_33():
 
     ds_in = gdal.Open("data/byte.vrt")
@@ -1465,6 +1508,10 @@ def tiff_write_big_odd_bits(vrtfilename, tmpfilename, nbits, interleaving):
 # Test copy with NBITS=9, INTERLEAVE=PIXEL
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_tiff_write_36():
     return tiff_write_big_odd_bits("data/uint16_3band.vrt", "tmp/tw_36.tif", 9, "PIXEL")
 
@@ -1473,6 +1520,10 @@ def test_tiff_write_36():
 # Test copy with NBITS=9, INTERLEAVE=BAND
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_tiff_write_37():
     return tiff_write_big_odd_bits("data/uint16_3band.vrt", "tmp/tw_37.tif", 9, "BAND")
 
@@ -1481,6 +1532,10 @@ def test_tiff_write_37():
 # Test copy with NBITS=12, INTERLEAVE=PIXEL
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_tiff_write_38():
     return tiff_write_big_odd_bits(
         "data/uint16_3band.vrt", "tmp/tw_38.tif", 12, "PIXEL"
@@ -1491,6 +1546,10 @@ def test_tiff_write_38():
 # Test copy with NBITS=12, INTERLEAVE=BAND
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_tiff_write_39():
     return tiff_write_big_odd_bits("data/uint16_3band.vrt", "tmp/tw_39.tif", 12, "BAND")
 
@@ -1499,6 +1558,10 @@ def test_tiff_write_39():
 # Test copy with NBITS=17, INTERLEAVE=PIXEL
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_tiff_write_40():
     return tiff_write_big_odd_bits("data/uint32_3band.vrt", "tmp/tw_40tif", 17, "PIXEL")
 
@@ -1507,6 +1570,10 @@ def test_tiff_write_40():
 # Test copy with NBITS=17, INTERLEAVE=BAND
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_tiff_write_41():
     return tiff_write_big_odd_bits("data/uint32_3band.vrt", "tmp/tw_41.tif", 17, "BAND")
 
@@ -1515,6 +1582,10 @@ def test_tiff_write_41():
 # Test copy with NBITS=24, INTERLEAVE=PIXEL
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_tiff_write_42():
     return tiff_write_big_odd_bits(
         "data/uint32_3band.vrt", "tmp/tw_42.tif", 24, "PIXEL"
@@ -1525,6 +1596,10 @@ def test_tiff_write_42():
 # Test copy with NBITS=24, INTERLEAVE=BAND
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_tiff_write_43():
     return tiff_write_big_odd_bits("data/uint32_3band.vrt", "tmp/tw_43.tif", 24, "BAND")
 
@@ -4320,6 +4395,7 @@ def test_tiff_write_100():
 
 
 @pytest.mark.slow()
+@pytest.mark.require_driver("ENVI")
 def test_tiff_write_101():
 
     md = gdaltest.tiff_drv.GetMetadata()
@@ -4892,6 +4968,10 @@ def test_tiff_write_120():
 # Test error cases of COPY_SRC_OVERVIEWS creation option
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_tiff_write_121():
 
     # Test when the overview band is NULL
@@ -5326,6 +5406,10 @@ def test_tiff_write_125():
 # Test implicit JPEG-in-TIFF overviews
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 @pytest.mark.require_creation_option("GTiff", "JPEG")
 @pytest.mark.require_driver("JPEG")
 def test_tiff_write_126():
@@ -6444,6 +6528,10 @@ def test_tiff_write_134():
 # Test clearing GCPs (#5945)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_tiff_write_135():
 
     # Simple clear
@@ -7876,6 +7964,10 @@ def test_tiff_write_160():
 # Test setting GCPs on an image with already a geotransform and vice-versa (#6751)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_tiff_write_161():
 
     ds = gdaltest.tiff_drv.Create("/vsimem/tiff_write_161.tif", 1, 1)
@@ -7910,6 +8002,10 @@ def test_tiff_write_161():
 # Test creating a JPEG compressed file with big tiles (#6757)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 @pytest.mark.require_creation_option("GTiff", "JPEG")
 def test_tiff_write_162():
 
@@ -9252,6 +9348,10 @@ def test_tiff_write_compression_create_and_createcopy():
 # Attempt at creating a file with more tile arrays larger than 2 GB
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_tiff_write_too_many_tiles():
 
     src_ds = gdal.Open(
@@ -11523,3 +11623,213 @@ def test_tiff_write_copy_mdd():
     ds = None
 
     gdal.Unlink(filename)
+
+
+###############################################################################
+# Test writing more GCPs than supported
+
+
+@pytest.mark.parametrize("with_initial_gcps", [False, True])
+def test_tiff_write_too_many_gcps(tmp_vsimem, with_initial_gcps):
+
+    filename = str(tmp_vsimem / "test.tif")
+    ds = gdal.GetDriverByName("GTiff").Create(filename, 1, 1)
+    if with_initial_gcps:
+        assert ds.SetGCPs([gdal.GCP(0, 1, 2, 3, 4)] * 10, None) == gdal.CE_None
+        ds.Close()
+        ds = gdal.Open(filename, gdal.GA_Update)
+    gcp_count = int(math.ceil(65535 / 6))
+    gcps = [gdal.GCP(0, 1, 2, 3, 4)] * gcp_count
+    with gdal.quiet_errors():
+        assert ds.SetGCPs(gcps, None) == gdal.CE_None
+    assert (
+        f"Trying to write {gcp_count} GCPs, whereas the maximum supported in GeoTIFF tag is 10922. Falling back to writing them to PAM"
+        in gdal.GetLastErrorMsg()
+    )
+    ds = None
+
+    assert gdal.VSIStatL(filename + ".aux.xml")
+
+    ds = gdal.Open(filename)
+    assert ds.GetGCPCount() == gcp_count
+    ds = None
+
+    gdal.Unlink(filename + ".aux.xml")
+
+    ds = gdal.Open(filename)
+    assert ds.GetGCPCount() == 0
+    ds = None
+
+
+###############################################################################
+# Test writing/reading a TIFF color map using 256 as the multiplication factor
+# https://github.com/OSGeo/gdal/issues/10310
+
+
+def test_tiff_write_colormap_256_mult_factor(tmp_vsimem):
+
+    filename = str(tmp_vsimem / "test.tif")
+    ds = gdal.GetDriverByName("GTiff").Create(
+        filename, 1, 1, 1, gdal.GDT_Byte, ["COLOR_TABLE_MULTIPLIER=256"]
+    )
+    ds.GetRasterBand(1).SetRasterColorInterpretation(gdal.GCI_PaletteIndex)
+    ct = gdal.ColorTable()
+    ct.SetColorEntry(0, (0, 0, 0, 255))
+    ct.SetColorEntry(1, (1, 2, 3, 255))
+    ct.SetColorEntry(2, (255, 255, 255, 255))
+    ds.GetRasterBand(1).SetRasterColorTable(ct)
+    ds = None
+
+    # Check we auto-guess correctly the 256 multiplication factor
+    ds = gdal.Open(filename)
+    ct = ds.GetRasterBand(1).GetRasterColorTable()
+    assert (
+        ct.GetColorEntry(0) == (0, 0, 0, 255)
+        and ct.GetColorEntry(1) == (1, 2, 3, 255)
+        and ct.GetColorEntry(2) == (255, 255, 255, 255)
+    ), "Wrong color table entry."
+
+    # Check we get wrong values when not specifying the appropriate multiplier
+    ds = gdal.OpenEx(filename, open_options=["COLOR_TABLE_MULTIPLIER=257"])
+    ct = ds.GetRasterBand(1).GetRasterColorTable()
+    assert (
+        ct.GetColorEntry(0) == (0, 0, 0, 255)
+        and ct.GetColorEntry(1) == (0, 1, 2, 255)
+        and ct.GetColorEntry(2) == (254, 254, 254, 255)
+    ), "Wrong color table entry."
+
+
+###############################################################################
+@pytest.mark.require_creation_option("GTiff", "JPEG")
+@pytest.mark.parametrize(
+    "xsize,ysize,options,expected_error_msg",
+    [
+        (
+            65501,
+            1,
+            ["COMPRESS=JPEG"],
+            "COMPRESS=JPEG is only compatible of un-tiled images whose width is lesser or equal to 65500 pixels",
+        ),
+        (
+            1,
+            65501,
+            ["COMPRESS=JPEG", "BLOCKYSIZE=65501"],
+            "COMPRESS=JPEG is only compatible of images whose BLOCKYSIZE is lesser or equal to 65500 pixels",
+        ),
+        (
+            1,
+            1,
+            ["COMPRESS=JPEG", "TILED=YES", "BLOCKXSIZE=65536"],
+            "COMPRESS=JPEG is only compatible of tiled images whose BLOCKXSIZE is lesser or equal to 65500 pixels",
+        ),
+        (
+            1,
+            1,
+            ["COMPRESS=JPEG", "TILED=YES", "BLOCKYSIZE=65536"],
+            "COMPRESS=JPEG is only compatible of images whose BLOCKYSIZE is lesser or equal to 65500 pixels",
+        ),
+    ],
+)
+@gdaltest.enable_exceptions()
+def test_tiff_write_too_large_jpeg(
+    tmp_vsimem, xsize, ysize, options, expected_error_msg
+):
+
+    filename = str(tmp_vsimem / "test.tif")
+    with pytest.raises(Exception, match=expected_error_msg):
+        gdal.GetDriverByName("GTiff").Create(filename, xsize, ysize, options=options)
+
+
+###############################################################################
+@pytest.mark.require_creation_option("GTiff", "WEBP")
+@pytest.mark.parametrize(
+    "xsize,ysize,options,expected_error_msg",
+    [
+        (
+            16384,
+            1,
+            ["COMPRESS=WEBP"],
+            "COMPRESS=WEBP is only compatible of un-tiled images whose width is lesser or equal to 16383 pixels",
+        ),
+        (
+            1,
+            16384,
+            ["COMPRESS=WEBP", "BLOCKYSIZE=16384"],
+            "COMPRESS=WEBP is only compatible of images whose BLOCKYSIZE is lesser or equal to 16383 pixels",
+        ),
+        (
+            1,
+            1,
+            ["COMPRESS=WEBP", "TILED=YES", "BLOCKXSIZE=16384"],
+            "COMPRESS=WEBP is only compatible of tiled images whose BLOCKXSIZE is lesser or equal to 16383 pixels",
+        ),
+        (
+            1,
+            1,
+            ["COMPRESS=WEBP", "TILED=YES", "BLOCKYSIZE=16384"],
+            "COMPRESS=WEBP is only compatible of images whose BLOCKYSIZE is lesser or equal to 16383 pixels",
+        ),
+    ],
+)
+@gdaltest.enable_exceptions()
+def test_tiff_write_too_large_webp(
+    tmp_vsimem, xsize, ysize, options, expected_error_msg
+):
+
+    filename = str(tmp_vsimem / "test.tif")
+    with pytest.raises(Exception, match=expected_error_msg):
+        gdal.GetDriverByName("GTiff").Create(filename, xsize, ysize, options=options)
+
+
+###############################################################################
+# Test writing/reading band IMAGERY metadata
+
+
+def test_tiff_write_band_IMAGERY(tmp_vsimem):
+
+    filename = str(tmp_vsimem / "test.tif")
+    with gdal.GetDriverByName("GTiff").Create(filename, 1, 1) as ds:
+        ds.GetRasterBand(1).SetMetadataItem("foo", "bar", "IMAGERY")
+    with gdal.Open(filename) as ds:
+        assert ds.GetRasterBand(1).GetMetadataDomainList() == ["IMAGERY"]
+    with gdal.Open(filename) as ds:
+        assert ds.GetRasterBand(1).GetMetadataItem("foo", "IMAGERY") == "bar"
+    with gdal.Open(filename) as ds:
+        assert ds.GetRasterBand(1).GetMetadata_Dict("IMAGERY") == {"foo": "bar"}
+
+    filename2 = str(tmp_vsimem / "test2.tif")
+
+    with gdal.Open(filename) as ds:
+        gdal.GetDriverByName("GTiff").CreateCopy(filename2, ds)
+    with gdal.Open(filename2) as ds:
+        assert ds.GetRasterBand(1).GetMetadata_Dict("IMAGERY") == {"foo": "bar"}
+
+    with gdal.Open(filename) as ds:
+        gdal.GetDriverByName("GTiff").CreateCopy(
+            filename2, ds, options=["COPY_SRC_MDD=YES"]
+        )
+    with gdal.Open(filename2) as ds:
+        assert ds.GetRasterBand(1).GetMetadata_Dict("IMAGERY") == {"foo": "bar"}
+
+    with gdal.Open(filename) as ds:
+        gdal.GetDriverByName("GTiff").CreateCopy(
+            filename2, ds, options=["COPY_SRC_MDD=NO"]
+        )
+    with gdal.Open(filename2) as ds:
+        assert ds.GetRasterBand(1).GetMetadataDomainList() is None
+        assert ds.GetRasterBand(1).GetMetadata_Dict("IMAGERY") == {}
+
+    with gdal.Open(filename) as ds:
+        gdal.GetDriverByName("GTiff").CreateCopy(
+            filename2, ds, options=["SRC_MDD=not_existing"]
+        )
+    with gdal.Open(filename2) as ds:
+        assert ds.GetRasterBand(1).GetMetadataDomainList() is None
+        assert ds.GetRasterBand(1).GetMetadata_Dict("IMAGERY") == {}
+
+    with gdal.Open(filename) as ds:
+        gdal.GetDriverByName("GTiff").CreateCopy(
+            filename2, ds, options=["SRC_MDD=not_existing", "SRC_MDD=IMAGERY"]
+        )
+    with gdal.Open(filename2) as ds:
+        assert ds.GetRasterBand(1).GetMetadata_Dict("IMAGERY") == {"foo": "bar"}
diff --git a/autotest/gcore/transformer.py b/autotest/gcore/transformer.py
index b993c627bd90..28d4b9acaac2 100644
--- a/autotest/gcore/transformer.py
+++ b/autotest/gcore/transformer.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2008, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
@@ -70,6 +54,10 @@ def test_transformer_1():
 # Test GCP based transformer with polynomials.
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_transformer_2():
 
     ds = gdal.Open("data/gcps.vrt")
@@ -98,6 +86,10 @@ def test_transformer_2():
 # Test GCP based transformer with thin plate splines.
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_transformer_3():
 
     ds = gdal.Open("data/gcps.vrt")
@@ -126,6 +118,10 @@ def test_transformer_3():
 # Test geolocation based transformer.
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_transformer_4():
 
     ds = gdal.Open("data/sstgeo.vrt")
@@ -154,6 +150,10 @@ def test_transformer_4():
 # Test RPC based transformer.
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_transformer_5():
 
     ds = gdal.Open("data/rpc.vrt")
@@ -364,6 +364,10 @@ def test_transformer_5():
 # Test RPC convergence bug (bug # 5395)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_transformer_6():
 
     ds = gdal.Open("data/rpc_5395.vrt")
@@ -402,6 +406,10 @@ def test_transformer_7():
 # Test handling of nodata in RPC DEM (#5680)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_transformer_8():
 
     ds = gdal.Open("data/rpc.vrt")
@@ -448,6 +456,10 @@ def test_transformer_8():
 # Test RPC DEM line optimization
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_transformer_9():
 
     ds = gdal.Open("data/rpc.vrt")
@@ -504,6 +516,10 @@ def test_transformer_9():
 # Test RPC DEM transform from geoid height to ellipsoidal height
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 @pytest.mark.require_driver("GTX")
 def test_transformer_10():
 
@@ -637,6 +653,10 @@ def test_transformer_11():
 # Test degenerate cases of TPS transformer
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_transformer_12():
 
     ds = gdal.Open(
@@ -761,8 +781,8 @@ def test_transformer_13():
     (success, pnt) = tr.TransformPoint(0, 6600, 24)
     assert (
         success
-        and pnt[0] == pytest.approx(-108.00066000065341, abs=1e-7)
-        and pnt[1] == pytest.approx(39.157694013439489, abs=1e-7)
+        and pnt[0] == pytest.approx(-108.00069819119149, abs=1e-7)
+        and pnt[1] == pytest.approx(39.15771125604824, abs=1e-7)
     )
 
 
@@ -800,11 +820,14 @@ def test_transformer_14():
         tr = gdal.Transformer(
             ds, None, ["METHOD=RPC", "RPC_DEM=data/transformer_14_dem.tif"]
         )
-    (success, pnt) = tr.TransformPoint(0, 0, 0)
+    (success, pnt) = tr.TransformPoint(0, 45, 73)
+    # on debug it should say this two messages
+    # Oscillation detected...
+    # Converged!
     assert (
         success
-        and pnt[0] == pytest.approx(1.9391846640653961e-05, abs=1e-7)
-        and pnt[1] == pytest.approx(-0.0038824752244123275, abs=1e-7)
+        and pnt[0] == pytest.approx(0.000801360096912016, abs=1e-7)
+        and pnt[1] == pytest.approx(-4.1346931131054286e-05, abs=1e-7)
     )
 
     f = gdal.VSIFOpenL("/vsimem/transformer_14.csvt", "rb")
@@ -831,6 +854,10 @@ def test_transformer_14():
 # beyond
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_transformer_15():
 
     ds = gdal.GetDriverByName("MEM").Create("", 6600, 4400)
@@ -930,6 +957,10 @@ def test_transformer_15():
 # (we mostly test that the parameters are well recognized and serialized)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_transformer_16():
 
     gdal.Translate(
@@ -963,6 +994,10 @@ def test_transformer_16():
 # Test RPC DEM with unexisting RPC DEM file
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_transformer_17():
 
     ds = gdal.Open("data/rpc.vrt")
@@ -1015,6 +1050,10 @@ def test_transformer_no_reverse_method():
 # Test precision of GCP based transformer with thin plate splines and lots of GCPs (2115).
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_transformer_tps_precision():
 
     ds = gdal.Open("data/gcps_2115.vrt")
@@ -1096,6 +1135,10 @@ def test_transformer_image_no_srs():
 # Test RPC_DEM_SRS by adding vertical component egm 96 geoid
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_transformer_dem_overrride_srs():
     ds = gdal.Open("data/rpc.vrt")
     ds_dem = gdal.GetDriverByName("GTiff").Create("/vsimem/dem.tif", 100, 100, 1)
@@ -1188,6 +1231,10 @@ def test_transformer_SuggestedWarpOutput_from_options():
 # Test GCP antimerdian unwrap (https://github.com/OSGeo/gdal/issues/8371)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_transformer_gcp_antimeridian_unwrap():
 
     ds = gdal.Open("data/test_gcp_antimeridian_unwrap.vrt")
diff --git a/autotest/gcore/virtualmem.py b/autotest/gcore/virtualmem.py
index ccedac52682d..3de02dd1e3aa 100755
--- a/autotest/gcore/virtualmem.py
+++ b/autotest/gcore/virtualmem.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
diff --git a/autotest/gcore/vrt_read.py b/autotest/gcore/vrt_read.py
index dbb74ac90b46..d114064b5109 100755
--- a/autotest/gcore/vrt_read.py
+++ b/autotest/gcore/vrt_read.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import array
@@ -42,6 +26,10 @@
 
 from osgeo import gdal
 
+pytestmark = pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 
 ###############################################################################
 @pytest.fixture(autouse=True, scope="module")
@@ -851,6 +839,36 @@ def test_vrt_read_21():
     gdal.Unlink("/vsimem/byte.tif")
 
 
+###############################################################################
+# Test implicit virtual overviews
+
+
+def test_vrt_read_virtual_overview_no_srcrect_dstrect(tmp_vsimem):
+
+    ds = gdal.Open("data/byte.tif")
+    data = ds.ReadRaster(0, 0, 20, 20, 400, 400)
+    ds = None
+    tmp_tif = str(tmp_vsimem / "tmp.tif")
+    ds = gdal.GetDriverByName("GTiff").Create(tmp_tif, 400, 400)
+    ds.WriteRaster(0, 0, 400, 400, data)
+    ds.BuildOverviews("NEAR", [2])
+    ref_cs = ds.GetRasterBand(1).GetOverview(0).Checksum()
+    ds = None
+
+    ds = gdal.Open(
+        f"""<VRTDataset rasterXSize="400" rasterYSize="400">
+  <VRTRasterBand dataType="Byte" band="1">
+    <SimpleSource>
+      <SourceFilename>{tmp_tif}</SourceFilename>
+      <SourceBand>1</SourceBand>
+    </SimpleSource>
+  </VRTRasterBand>
+</VRTDataset>"""
+    )
+    assert ds.GetRasterBand(1).GetOverviewCount() == 1
+    assert ds.GetRasterBand(1).GetOverview(0).Checksum() == ref_cs
+
+
 ###############################################################################
 # Test that we honour NBITS with SimpleSource and ComplexSource
 
@@ -1071,6 +1089,48 @@ def test_vrt_read_25():
     )
 
 
+###############################################################################
+# Test GetDataCoverageStatus() on a single source covering the whole dataset
+
+
+def test_vrt_read_get_data_coverage_status_single_source(tmp_vsimem):
+
+    tmp_gtiff = str(tmp_vsimem / "tmp.tif")
+    ds = gdal.GetDriverByName("GTiff").Create(
+        tmp_gtiff,
+        512,
+        512,
+        1,
+        options=["TILED=YES", "BLOCKXSIZE=256", "BLOCKYSIZE=256", "SPARSE_OK=YES"],
+    )
+    ds.WriteRaster(256, 256, 256, 256, b"\x01" * (256 * 256))
+    ds = None
+
+    tmp_vrt = str(tmp_vsimem / "tmp.vrt")
+    gdal.Translate(tmp_vrt, tmp_gtiff, format="VRT")
+    ds = gdal.Open(tmp_vrt)
+
+    (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(0, 0, 512, 512)
+    assert (
+        flags
+        == (gdal.GDAL_DATA_COVERAGE_STATUS_DATA | gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY)
+        and pct == 25.0
+    )
+
+    (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(0, 0, 256, 256)
+    assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY and pct == 0.0
+
+    (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(256, 256, 256, 256)
+    assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_DATA and pct == 100.0
+
+    (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(0, 256, 512, 256)
+    assert (
+        flags
+        == (gdal.GDAL_DATA_COVERAGE_STATUS_DATA | gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY)
+        and pct == 50.0
+    )
+
+
 ###############################################################################
 # Test consistency of RasterIO() with resampling, that is extracting different
 # sub-windows give consistent results
@@ -1280,7 +1340,7 @@ def test_vrt_float32_with_nodata_slightly_below_float_min():
     ), "did not get expected nodata in rewritten VRT"
 
     if nodata != -3.4028234663852886e38:
-        print("%.18g" % nodata)
+        print("%.17g" % nodata)
         pytest.fail("did not get expected nodata")
 
     assert stats == [-3.0, 5.0, 1.0, 4.0], "did not get expected stats"
@@ -2204,7 +2264,7 @@ def test_vrt_read_compute_statistics_mosaic_optimization(
     src_ds2 = gdal.Translate("", src_ds, options="-of MEM -srcwin 8 0 12 20")
     vrt_ds = gdal.BuildVRT("", [src_ds1, src_ds2])
 
-    with gdaltest.config_options({"GDAL_NUM_THREADS": "2"} if use_threads else {}):
+    with gdaltest.config_options({"VRT_NUM_THREADS": "2" if use_threads else "0"}):
         assert vrt_ds.GetRasterBand(1).ComputeRasterMinMax(
             approx_ok
         ) == src_ds.GetRasterBand(1).ComputeRasterMinMax(approx_ok)
@@ -2341,7 +2401,7 @@ def test_vrt_read_compute_statistics_mosaic_optimization_src_with_nodata_all():
 
     with gdal.quiet_errors():
         vrt_stats = vrt_ds.GetRasterBand(1).ComputeStatistics(False)
-        assert vrt_stats == [0, 0, 0, 0]
+        assert vrt_stats is None
         assert vrt_ds.GetRasterBand(1).GetMetadataItem("STATISTICS_MINIMUM") is None
 
 
@@ -2421,30 +2481,68 @@ def test_vrt_read_top_and_bottom_strips_average():
 
 
 @pytest.mark.parametrize(
-    "input_datatype", [gdal.GDT_Byte, gdal.GDT_UInt16, gdal.GDT_Int16]
-)
-@pytest.mark.parametrize("vrt_type", ["Byte", "UInt16", "Int16"])
-@pytest.mark.parametrize("nodata", [0, 254])
-@pytest.mark.parametrize(
-    "request_type", [gdal.GDT_Byte, gdal.GDT_UInt16, gdal.GDT_Int16]
+    "input_datatype,vrt_type,nodata,vrt_nodata,request_type",
+    [
+        (gdal.GDT_Byte, "Byte", 0, 255, gdal.GDT_Byte),
+        (gdal.GDT_Byte, "Byte", 254, 255, gdal.GDT_Byte),
+        (gdal.GDT_Byte, "Int8", 254, 255, gdal.GDT_Byte),
+        (gdal.GDT_Byte, "Byte", 254, 127, gdal.GDT_Int8),
+        (gdal.GDT_Byte, "UInt16", 254, 255, gdal.GDT_Byte),
+        (gdal.GDT_Byte, "Byte", 254, 255, gdal.GDT_UInt16),
+        (gdal.GDT_Int8, "Int8", 0, 127, gdal.GDT_Int8),
+        (gdal.GDT_Int8, "Int16", 0, 127, gdal.GDT_Int8),
+        (gdal.GDT_UInt16, "UInt16", 0, 65535, gdal.GDT_UInt16),
+        (gdal.GDT_Int16, "Int16", 0, 32767, gdal.GDT_Int16),
+        (gdal.GDT_UInt32, "UInt32", 0, (1 << 31) - 1, gdal.GDT_UInt32),
+        (gdal.GDT_Int32, "Int32", 0, (1 << 30) - 1, gdal.GDT_Int32),
+        (gdal.GDT_Int32, "Float32", 0, (1 << 30) - 1, gdal.GDT_Float64),
+        (gdal.GDT_UInt64, "UInt64", 0, (1 << 63) - 1, gdal.GDT_UInt64),
+        (gdal.GDT_Int64, "Int64", 0, (1 << 62) - 1, gdal.GDT_Int64),
+        (gdal.GDT_Int64, "Float32", 0, (1 << 62), gdal.GDT_Int64),
+        (gdal.GDT_Float32, "Float32", 0, 1.5, gdal.GDT_Float32),
+        (gdal.GDT_Float32, "Float32", 0, 1.5, gdal.GDT_Float64),
+        (gdal.GDT_Float32, "Float64", 0, 1.5, gdal.GDT_Float32),
+        (gdal.GDT_Float32, "Float64", 0, 1.5, gdal.GDT_Float64),
+        (gdal.GDT_Float64, "Float64", 0, 1.5, gdal.GDT_Float64),
+        (gdal.GDT_Float64, "Float32", 0, 1.5, gdal.GDT_Float64),
+    ],
 )
 def test_vrt_read_complex_source_nodata(
-    tmp_vsimem, input_datatype, vrt_type, nodata, request_type
+    tmp_vsimem, input_datatype, vrt_type, nodata, vrt_nodata, request_type
 ):
-
-    if input_datatype == gdal.GDT_Byte:
-        array_type = "B"
-    elif input_datatype == gdal.GDT_UInt16:
-        array_type = "H"
-    elif input_datatype == gdal.GDT_Int16:
-        array_type = "h"
+    def get_array_type(dt):
+        m = {
+            gdal.GDT_Byte: "B",
+            gdal.GDT_Int8: "b",
+            gdal.GDT_UInt16: "H",
+            gdal.GDT_Int16: "h",
+            gdal.GDT_UInt32: "I",
+            gdal.GDT_Int32: "i",
+            gdal.GDT_UInt64: "Q",
+            gdal.GDT_Int64: "q",
+            gdal.GDT_Float32: "f",
+            gdal.GDT_Float64: "d",
+        }
+        return m[dt]
+
+    if input_datatype in (gdal.GDT_Float32, gdal.GDT_Float64):
+        input_val = 1.75
+        if vrt_type in ("Float32", "Float64") and request_type in (
+            gdal.GDT_Float32,
+            gdal.GDT_Float64,
+        ):
+            expected_val = input_val
+        else:
+            expected_val = math.round(input_val)
     else:
-        assert False
+        input_val = 1
+        expected_val = input_val
+
     input_data = array.array(
-        array_type,
+        get_array_type(input_datatype),
         [
             nodata,
-            1,
+            input_val,
             2,
             3,
             nodata,  # EOL
@@ -2481,7 +2579,7 @@ def test_vrt_read_complex_source_nodata(
     ds.Close()
     complex_xml = f"""<VRTDataset rasterXSize="5" rasterYSize="6">
   <VRTRasterBand dataType="{vrt_type}" band="1">
-    <NoDataValue>255</NoDataValue>
+    <NoDataValue>{vrt_nodata}</NoDataValue>
     <ComplexSource>
       <SourceFilename relativeToVRT="0">{input_filename}</SourceFilename>
       <SourceBand>1</SourceBand>
@@ -2491,24 +2589,16 @@ def test_vrt_read_complex_source_nodata(
 </VRTDataset>
 """
     vrt_ds = gdal.Open(complex_xml)
-    if request_type == gdal.GDT_Byte:
-        array_request_type = "B"
-    elif request_type == gdal.GDT_UInt16:
-        array_request_type = "H"
-    elif request_type == gdal.GDT_Int16:
-        array_request_type = "h"
-    else:
-        assert False
     got_data = vrt_ds.ReadRaster(buf_type=request_type)
-    got_data = struct.unpack(array_request_type * (5 * 6), got_data)
+    got_data = struct.unpack(get_array_type(request_type) * (5 * 6), got_data)
     assert got_data == (
-        255,
-        1,
+        vrt_nodata,
+        expected_val,
         2,
         3,
-        255,  # EOL
+        vrt_nodata,  # EOL
         4,
-        255,
+        vrt_nodata,
         5,
         6,
         7,  # EOL
@@ -2519,18 +2609,18 @@ def test_vrt_read_complex_source_nodata(
         20,  # EOL
         8,
         9,
-        255,
+        vrt_nodata,
         10,
         11,  # EOL
-        255,
-        255,
-        255,
-        255,
-        255,  # EOL
+        vrt_nodata,
+        vrt_nodata,
+        vrt_nodata,
+        vrt_nodata,
+        vrt_nodata,  # EOL
         12,
         13,
         14,
-        255,
+        vrt_nodata,
         15,  # EOL
     )
 
@@ -2639,3 +2729,76 @@ def test_vrt_read_virtual_overviews_match_src_overviews(tmp_vsimem):
     assert vrt_band.GetOverview(1).YSize == 1024
     assert vrt_band.GetOverview(2).XSize == 1024
     assert vrt_band.GetOverview(2).YSize == 512
+
+
+###############################################################################
+# Test multi-threaded reading
+
+
+@pytest.mark.parametrize("dataset_level", [True, False])
+@pytest.mark.parametrize("use_threads", [True, False])
+@pytest.mark.parametrize("num_tiles", [2, 128])
+def test_vrt_read_multi_threaded(tmp_vsimem, dataset_level, use_threads, num_tiles):
+
+    width = 2048
+    src_ds = gdal.Translate(
+        "", "../gdrivers/data/small_world.tif", width=width, format="MEM"
+    )
+    assert width % num_tiles == 0
+    tile_width = width // num_tiles
+    tile_filenames = []
+    for i in range(num_tiles):
+        tile_filename = str(tmp_vsimem / ("%d.tif" % i))
+        gdal.Translate(
+            tile_filename, src_ds, srcWin=[i * tile_width, 0, tile_width, 1024]
+        )
+        tile_filenames.append(tile_filename)
+    vrt_filename = str(tmp_vsimem / "test.vrt")
+    gdal.BuildVRT(vrt_filename, tile_filenames)
+    vrt_ds = gdal.Open(vrt_filename)
+
+    obj = vrt_ds if dataset_level else vrt_ds.GetRasterBand(1)
+    obj_ref = src_ds if dataset_level else src_ds.GetRasterBand(1)
+
+    pcts = []
+
+    def cbk(pct, msg, user_data):
+        if pcts:
+            assert pct >= pcts[-1]
+        pcts.append(pct)
+        return 1
+
+    with gdal.config_options({} if use_threads else {"VRT_NUM_THREADS": "0"}):
+        assert obj.ReadRaster(1, 2, 1030, 1020, callback=cbk) == obj_ref.ReadRaster(
+            1, 2, 1030, 1020
+        )
+    assert pcts[-1] == 1.0
+
+    assert vrt_ds.GetMetadataItem("MULTI_THREADED_RASTERIO_LAST_USED", "__DEBUG__") == (
+        "1" if gdal.GetNumCPUs() >= 2 and use_threads else "0"
+    )
+
+
+###############################################################################
+# Test multi-threaded reading
+
+
+def test_vrt_read_multi_threaded_disabled_since_overlapping_sources():
+
+    src_ds = gdal.Translate(
+        "", "../gdrivers/data/small_world.tif", width=2048, format="MEM"
+    )
+    OVERLAP = 1
+    left_ds = gdal.Translate(
+        "left", src_ds, format="MEM", srcWin=[0, 0, 1024 + OVERLAP, 1024]
+    )
+    right_ds = gdal.Translate(
+        "right", src_ds, format="MEM", srcWin=[1024, 0, 1024, 1024]
+    )
+    vrt_ds = gdal.BuildVRT("", [left_ds, right_ds])
+
+    assert vrt_ds.ReadRaster(1, 2, 1030, 1020) == src_ds.ReadRaster(1, 2, 1030, 1020)
+
+    assert (
+        vrt_ds.GetMetadataItem("MULTI_THREADED_RASTERIO_LAST_USED", "__DEBUG__") == "0"
+    )
diff --git a/autotest/gcore/vrtmisc.py b/autotest/gcore/vrtmisc.py
index e7c5a4519fc8..60c9a40a7ff8 100755
--- a/autotest/gcore/vrtmisc.py
+++ b/autotest/gcore/vrtmisc.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -36,10 +20,16 @@
 import tempfile
 from pathlib import Path
 
+import gdaltest
 import pytest
 
 from osgeo import gdal, osr
 
+pytestmark = pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
+
 ###############################################################################
 # Test linear scaling
 
@@ -965,7 +955,7 @@ def test_vrtmisc_nodata_float32():
 
     # Check that this is still the case after above serialization to .vrt
     # and re-opening. That is check that we serialize the rounded value with
-    # full double precision (%.18g)
+    # full double precision (%.17g)
     ds = gdal.Open(vrt_filename)
     nodata_vrt = ds.GetRasterBand(1).GetNoDataValue()
     assert nodata_vrt == struct.unpack("f", struct.pack("f", nodata))[0]
diff --git a/autotest/gcore/vsi7z.py b/autotest/gcore/vsi7z.py
index d1bfcd47a240..105332cbbbf9 100755
--- a/autotest/gcore/vsi7z.py
+++ b/autotest/gcore/vsi7z.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gcore/vsiadls.py b/autotest/gcore/vsiadls.py
index ee6995d08a7b..cc61c8f38c6d 100755
--- a/autotest/gcore/vsiadls.py
+++ b/autotest/gcore/vsiadls.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2020 Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
@@ -1161,3 +1145,56 @@ def test_vsiadls_fake_metadata():
         assert not gdal.SetFileMetadata(
             "/vsiadls/test/foo.bin", {"x-ms-properties": "foo=bar"}, "PROPERTIES"
         )
+
+
+###############################################################################
+# Test VSIMultipartUploadXXXX()
+
+
+def test_vsiadls_MultipartUpload():
+
+    if gdaltest.webserver_port == 0:
+        pytest.skip()
+
+    # Test MultipartUploadGetCapabilities()
+    info = gdal.MultipartUploadGetCapabilities("/vsiadls/")
+    assert info.non_sequential_upload_supported
+    assert info.parallel_upload_supported
+    assert not info.abort_supported
+    assert info.min_part_size == 0
+    assert info.max_part_size >= 1024
+    assert info.max_part_count > 0
+
+    # Test MultipartUploadAddPart()
+    handler = webserver.SequentialHandler()
+    handler.add(
+        "PATCH",
+        "/azure/blob/myaccount/test_multipartupload/test.bin?action=append&position=123456",
+        202,
+        expected_body=b"foo",
+    )
+    with webserver.install_http_handler(handler):
+        part_id = gdal.MultipartUploadAddPart(
+            "/vsiadls/test_multipartupload/test.bin", "my_upload_id", 1, 123456, b"foo"
+        )
+    assert part_id == "dummy"
+
+    # Test MultipartUploadEnd()
+    handler = webserver.SequentialHandler()
+    handler.add(
+        "PATCH",
+        "/azure/blob/myaccount/test_multipartupload/test.bin?action=flush&close=true&position=3",
+        200,
+    )
+    with webserver.install_http_handler(handler):
+        assert gdal.MultipartUploadEnd(
+            "/vsiadls/test_multipartupload/test.bin", "my_upload_id", ["dummy"], 3
+        )
+
+    # Test unsupported MultipartUploadAbort()
+    with gdal.ExceptionMgr(useExceptions=True):
+        with pytest.raises(
+            Exception,
+            match=r"MultipartUploadAbort\(\) not supported by this file system",
+        ):
+            gdal.MultipartUploadAbort("/vsiadls/foo/bar", "upload_id")
diff --git a/autotest/gcore/vsiadls_real_instance.py b/autotest/gcore/vsiadls_real_instance.py
index b377f23d26be..d61996a3edfc 100755
--- a/autotest/gcore/vsiadls_real_instance.py
+++ b/autotest/gcore/vsiadls_real_instance.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2020 Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import base64
diff --git a/autotest/gcore/vsiaz.py b/autotest/gcore/vsiaz.py
index bcd16dbe327b..348f794b44dd 100755
--- a/autotest/gcore/vsiaz.py
+++ b/autotest/gcore/vsiaz.py
@@ -9,26 +9,11 @@
 ###############################################################################
 # Copyright (c) 2017 Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import copy
+import os
 import sys
 
 import gdaltest
@@ -452,6 +437,10 @@ def test_vsiaz_sas_fake():
 # Test write
 
 
+@pytest.mark.skipif(
+    "CI" in os.environ,
+    reason="Flaky",
+)
 def test_vsiaz_fake_write():
 
     if gdaltest.webserver_port == 0:
@@ -835,6 +824,12 @@ def test_vsiaz_write_appendblob_retry():
 # Test writing a block blob
 
 
+# Often fails at the gdal.VSIFWriteL(b"x" * (1024 * 1024 - 1), 1024 * 1024 - 1, 1, f)
+# which returns 0
+@pytest.mark.skipif(
+    "CI" in os.environ,
+    reason="Flaky",
+)
 def test_vsiaz_write_blockblob_chunk_size_1():
 
     if gdaltest.webserver_port == 0:
@@ -3059,3 +3054,30 @@ def method(request):
             )
             == 0
         )
+
+
+###############################################################################
+# Test VSIMultipartUploadXXXX()
+
+
+def test_vsiaz_MultipartUpload():
+
+    if gdaltest.webserver_port == 0:
+        pytest.skip()
+
+    # Test MultipartUploadGetCapabilities()
+    info = gdal.MultipartUploadGetCapabilities("/vsiaz/")
+    assert info.non_sequential_upload_supported
+    assert info.parallel_upload_supported
+    assert not info.abort_supported
+    assert info.min_part_size == 0
+    assert info.max_part_size >= 1024
+    assert info.max_part_count == 50000
+
+    # Test unsupported MultipartUploadAbort()
+    with gdal.ExceptionMgr(useExceptions=True):
+        with pytest.raises(
+            Exception,
+            match=r"MultipartUploadAbort\(\) not supported by this file system",
+        ):
+            gdal.MultipartUploadAbort("/vsiaz/foo/bar", "upload_id")
diff --git a/autotest/gcore/vsiaz_real_instance_auto.py b/autotest/gcore/vsiaz_real_instance_auto.py
index 10575652f58f..43d88e4f5067 100644
--- a/autotest/gcore/vsiaz_real_instance_auto.py
+++ b/autotest/gcore/vsiaz_real_instance_auto.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2017 Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gcore/vsiaz_real_instance_manual.py b/autotest/gcore/vsiaz_real_instance_manual.py
index 26e2738bebb7..b29fb576db60 100644
--- a/autotest/gcore/vsiaz_real_instance_manual.py
+++ b/autotest/gcore/vsiaz_real_instance_manual.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2017 Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import stat
diff --git a/autotest/gcore/vsicached.py b/autotest/gcore/vsicached.py
index 4fd41b389e7f..b526493c5506 100755
--- a/autotest/gcore/vsicached.py
+++ b/autotest/gcore/vsicached.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gcore/vsicrypt.py b/autotest/gcore/vsicrypt.py
index 391b8b5d69db..6ac558599173 100755
--- a/autotest/gcore/vsicrypt.py
+++ b/autotest/gcore/vsicrypt.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import ctypes
diff --git a/autotest/gcore/vsicurl.py b/autotest/gcore/vsicurl.py
index 2480571cede6..305641d1d1ca 100755
--- a/autotest/gcore/vsicurl.py
+++ b/autotest/gcore/vsicurl.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
@@ -37,6 +21,17 @@
 
 from osgeo import gdal, ogr
 
+
+def curl_version():
+    actual_version = [0, 0, 0]
+    for build_info_item in gdal.VersionInfo("BUILD_INFO").strip().split("\n"):
+        if build_info_item.startswith("CURL_VERSION="):
+            actual_version = [
+                int(x) for x in build_info_item[len("CURL_VERSION=") :].split(".")
+            ]
+    return actual_version
+
+
 pytestmark = pytest.mark.require_curl()
 
 ###############################################################################
@@ -222,11 +217,204 @@ def server():
     webserver.server_stop(process, port)
 
 
+###############################################################################
+# Test regular redirection
+
+
+@pytest.mark.parametrize(
+    "authorization_header_allowed", [None, "YES", "NO", "IF_SAME_HOST"]
+)
+def test_vsicurl_test_redirect(server, authorization_header_allowed):
+
+    gdal.VSICurlClearCache()
+
+    expected_headers = None
+    unexpected_headers = []
+    if authorization_header_allowed != "NO":
+        expected_headers = {"Authorization": "Bearer xxx"}
+    else:
+        unexpected_headers = ["Authorization"]
+
+    handler = webserver.SequentialHandler()
+    handler.add("GET", "/test_redirect/", 404)
+    handler.add(
+        "HEAD",
+        "/test_redirect/test.bin",
+        301,
+        {"Location": "http://localhost:%d/redirected/test.bin" % server.port},
+        expected_headers={"Authorization": "Bearer xxx"},
+    )
+
+    # Curl always forward Authorization if same server when handling itself
+    # the redirect, so this means that CPL_VSIL_CURL_AUTHORIZATION_HEADER_ALLOWED_IF_REDIRECT=NO
+    # is not honored for that particular request. To honour it, we would have
+    # to disable CURLOPT_FOLLOWLOCATION and implement it at hand
+    handler.add(
+        "HEAD",
+        "/redirected/test.bin",
+        200,
+        {"Content-Length": "3"},
+        expected_headers={"Authorization": "Bearer xxx"},
+    )
+
+    handler.add(
+        "GET",
+        "/redirected/test.bin",
+        200,
+        {"Content-Length": "3"},
+        b"xyz",
+        expected_headers=expected_headers,
+        unexpected_headers=unexpected_headers,
+    )
+
+    options = {"GDAL_HTTP_HEADERS": "Authorization: Bearer xxx"}
+    if authorization_header_allowed:
+        options[
+            "CPL_VSIL_CURL_AUTHORIZATION_HEADER_ALLOWED_IF_REDIRECT"
+        ] = authorization_header_allowed
+    with webserver.install_http_handler(handler), gdal.config_options(options):
+        f = gdal.VSIFOpenL(
+            "/vsicurl/http://localhost:%d/test_redirect/test.bin" % server.port,
+            "rb",
+        )
+        assert f is not None
+        try:
+            assert gdal.VSIFReadL(1, 3, f) == b"xyz"
+        finally:
+            gdal.VSIFCloseL(f)
+
+
+###############################################################################
+# Test regular redirection
+
+
+@pytest.mark.parametrize(
+    "authorization_header_allowed", [None, "YES", "NO", "IF_SAME_HOST"]
+)
+def test_vsicurl_test_redirect_different_server(server, authorization_header_allowed):
+
+    gdal.VSICurlClearCache()
+
+    expected_headers = None
+    unexpected_headers = []
+    if authorization_header_allowed == "YES":
+        expected_headers = {"Authorization": "Bearer xxx"}
+    else:
+        unexpected_headers = ["Authorization"]
+
+    handler = webserver.SequentialHandler()
+    handler.add("GET", "/test_redirect/", 404)
+    handler.add(
+        "HEAD",
+        "/test_redirect/test.bin",
+        301,
+        {"Location": "http://127.0.0.1:%d/redirected/test.bin" % server.port},
+        expected_headers={"Authorization": "Bearer xxx"},
+    )
+    handler.add(
+        "HEAD",
+        "/redirected/test.bin",
+        200,
+        {"Content-Length": "3"},
+        expected_headers=expected_headers,
+        unexpected_headers=unexpected_headers,
+    )
+    handler.add(
+        "GET",
+        "/redirected/test.bin",
+        200,
+        {"Content-Length": "3"},
+        b"xyz",
+        expected_headers=expected_headers,
+        unexpected_headers=unexpected_headers,
+    )
+
+    options = {"GDAL_HTTP_HEADERS": "Authorization: Bearer xxx"}
+    if authorization_header_allowed:
+        options[
+            "CPL_VSIL_CURL_AUTHORIZATION_HEADER_ALLOWED_IF_REDIRECT"
+        ] = authorization_header_allowed
+    with webserver.install_http_handler(handler), gdal.config_options(options):
+        f = gdal.VSIFOpenL(
+            "/vsicurl/http://localhost:%d/test_redirect/test.bin" % server.port,
+            "rb",
+        )
+        try:
+            assert gdal.VSIFReadL(1, 3, f) == b"xyz"
+        finally:
+            gdal.VSIFCloseL(f)
+
+
+###############################################################################
+# Test regular redirection
+
+
+@gdaltest.enable_exceptions()
+@pytest.mark.require_curl(7, 61, 0)
+@pytest.mark.parametrize(
+    "authorization_header_allowed", [None, "YES", "NO", "IF_SAME_HOST"]
+)
+def test_vsicurl_test_redirect_different_server_with_bearer(
+    server, authorization_header_allowed
+):
+
+    gdal.VSICurlClearCache()
+
+    expected_headers = None
+    unexpected_headers = []
+    if authorization_header_allowed == "YES":
+        expected_headers = {"Authorization": "Bearer xxx"}
+    else:
+        unexpected_headers = ["Authorization"]
+
+    handler = webserver.SequentialHandler()
+    handler.add("GET", "/test_redirect/", 404)
+    handler.add(
+        "HEAD",
+        "/test_redirect/test.bin",
+        301,
+        {"Location": "http://127.0.0.1:%d/redirected/test.bin" % server.port},
+        expected_headers={"Authorization": "Bearer xxx"},
+    )
+    handler.add(
+        "HEAD",
+        "/redirected/test.bin",
+        200,
+        {"Content-Length": "3"},
+        expected_headers=expected_headers,
+        unexpected_headers=unexpected_headers,
+    )
+    handler.add(
+        "GET",
+        "/redirected/test.bin",
+        200,
+        {"Content-Length": "3"},
+        b"xyz",
+        expected_headers=expected_headers,
+        unexpected_headers=unexpected_headers,
+    )
+
+    options = {"GDAL_HTTP_AUTH": "BEARER", "GDAL_HTTP_BEARER": "xxx"}
+    if authorization_header_allowed:
+        options[
+            "CPL_VSIL_CURL_AUTHORIZATION_HEADER_ALLOWED_IF_REDIRECT"
+        ] = authorization_header_allowed
+    with webserver.install_http_handler(handler), gdal.config_options(options):
+        f = gdal.VSIFOpenL(
+            "/vsicurl/http://localhost:%d/test_redirect/test.bin" % server.port,
+            "rb",
+        )
+        try:
+            assert gdal.VSIFReadL(1, 3, f) == b"xyz"
+        finally:
+            gdal.VSIFCloseL(f)
+
+
 ###############################################################################
 # Test redirection with Expires= type of signed URLs
 
 
-def test_vsicurl_test_redirect(server):
+def test_vsicurl_test_redirect_with_expires(server):
 
     gdal.VSICurlClearCache()
 
@@ -1128,21 +1316,49 @@ def test_vsicurl_GDAL_HTTP_HEADERS(server):
     filename = (
         "/vsicurl/http://localhost:%d/test_vsicurl_GDAL_HTTP_HEADERS.bin" % server.port
     )
-    gdal.SetPathSpecificOption(
-        filename,
-        "GDAL_HTTP_HEADERS",
-        r'Foo: Bar,"Baz: escaped backslash \\, escaped double-quote \", end of value",Another: Header',
-    )
-    with webserver.install_http_handler(handler):
-        statres = gdal.VSIStatL(filename)
-    gdal.SetPathSpecificOption(filename, "GDAL_HTTP_HEADERS", None)
-    assert statres.size == 3
+    try:
+        gdal.SetPathSpecificOption(
+            filename,
+            "GDAL_HTTP_HEADERS",
+            r'Foo: Bar,"Baz: escaped backslash \\, escaped double-quote \", end of value",Another: Header',
+        )
+        with webserver.install_http_handler(handler):
+            statres = gdal.VSIStatL(filename)
+        assert statres.size == 3
+
+        gdal.VSICurlClearCache()
+        handler = webserver.SequentialHandler()
+        handler.add(
+            "HEAD",
+            "/test_vsicurl_GDAL_HTTP_HEADERS.bin",
+            200,
+            {"Content-Length": "3"},
+            expected_headers={
+                "Foo": "Bar",
+                "Baz": r'escaped backslash \, escaped double-quote ", end of value',
+                "Another": "Header",
+            },
+        )
+        with webserver.install_http_handler(handler):
+            statres = gdal.VSIStatL(
+                "/vsicurl_streaming/http://localhost:%d/test_vsicurl_GDAL_HTTP_HEADERS.bin"
+                % server.port
+            )
+        assert statres.size == 3
+
+    finally:
+        gdal.SetPathSpecificOption(filename, "GDAL_HTTP_HEADERS", None)
 
 
 ###############################################################################
 # Test CPL_VSIL_CURL_USE_HEAD=NO
 
 
+# Cf fix of https://github.com/curl/curl/pull/14390
+@pytest.mark.skipif(
+    curl_version() == [8, 9, 1],
+    reason="fail with SIGPIPE with curl 8.9.1",
+)
 def test_vsicurl_test_CPL_VSIL_CURL_USE_HEAD_NO(server):
 
     gdal.VSICurlClearCache()
@@ -1272,3 +1488,89 @@ def test_vsicurl_404_repeated_same_resource(server):
 
     with pytest.raises(Exception, match="404"):
         gdal.Open("/vsicurl/http://localhost:%d/does/not/exist.bin" % server.port)
+
+
+###############################################################################
+
+
+@gdaltest.enable_exceptions()
+def test_vsicurl_cache_control_not_set(server):
+
+    gdal.VSICurlClearCache()
+
+    handler = webserver.SequentialHandler()
+    handler.add("GET", "/", 404)
+    handler.add("HEAD", "/test.txt", 200, {"Content-Length": "3"})
+    handler.add("GET", "/test.txt", 200, {}, "foo")
+    with webserver.install_http_handler(handler):
+        f = gdal.VSIFOpenL(
+            "/vsicurl/http://localhost:%d/test.txt" % server.port,
+            "rb",
+        )
+        assert f is not None
+        data = gdal.VSIFReadL(1, 3, f).decode("ascii")
+        gdal.VSIFCloseL(f)
+        assert data == "foo"
+
+    with webserver.install_http_handler(webserver.SequentialHandler()):
+        f = gdal.VSIFOpenL(
+            "/vsicurl/http://localhost:%d/test.txt" % server.port,
+            "rb",
+        )
+        assert f is not None
+        data = gdal.VSIFReadL(1, 3, f).decode("ascii")
+        gdal.VSIFCloseL(f)
+        assert data == "foo"
+
+
+###############################################################################
+
+
+@gdaltest.enable_exceptions()
+def test_vsicurl_cache_control_no_cache(server):
+
+    gdal.VSICurlClearCache()
+
+    handler = webserver.SequentialHandler()
+    handler.add("GET", "/", 404)
+    handler.add(
+        "HEAD", "/test.txt", 200, {"Content-Length": "3", "Cache-Control": "no-cache"}
+    )
+    handler.add(
+        "GET",
+        "/test.txt",
+        200,
+        {"Content-Length": "3", "Cache-Control": "no-cache"},
+        "foo",
+    )
+    with webserver.install_http_handler(handler):
+        f = gdal.VSIFOpenL(
+            "/vsicurl/http://localhost:%d/test.txt" % server.port,
+            "rb",
+        )
+        assert f is not None
+        data = gdal.VSIFReadL(1, 3, f).decode("ascii")
+        gdal.VSIFCloseL(f)
+        assert data == "foo"
+
+    handler = webserver.SequentialHandler()
+    handler.add("GET", "/", 404)
+    handler.add(
+        "HEAD", "/test.txt", 200, {"Content-Length": "6", "Cache-Control": "no-cache"}
+    )
+    handler.add(
+        "GET",
+        "/test.txt",
+        200,
+        {"Content-Length": "6", "Cache-Control": "no-cache"},
+        "barbaz",
+    )
+    with webserver.install_http_handler(handler):
+        f = gdal.VSIFOpenL(
+            "/vsicurl/http://localhost:%d/test.txt" % server.port,
+            "rb",
+        )
+        assert f is not None
+        data = gdal.VSIFReadL(1, 6, f).decode("ascii")
+        gdal.VSIFCloseL(f)
+        assert data == "barbaz"
diff --git a/autotest/gcore/vsicurl_streaming.py b/autotest/gcore/vsicurl_streaming.py
index cf44eed9548e..d3ded6ed2d3a 100755
--- a/autotest/gcore/vsicurl_streaming.py
+++ b/autotest/gcore/vsicurl_streaming.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2012-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import threading
diff --git a/autotest/gcore/vsifile.py b/autotest/gcore/vsifile.py
index 3dfdfcf377ee..25d610133971 100755
--- a/autotest/gcore/vsifile.py
+++ b/autotest/gcore/vsifile.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -148,6 +132,28 @@ def vsifile_generic(filename, options=[]):
         if fp:
             gdal.VSIFCloseL(fp)
 
+    gdal.Unlink(filename)
+
+    if not filename.startswith("/vsicrypt/"):
+        assert gdal.RmdirRecursive(filename + "/i_dont_exist") == -1
+
+        subdir = filename + "/subdir"
+        assert gdal.MkdirRecursive(subdir + "/subsubdir", 0o755) == 0
+
+        assert gdal.VSIStatL(subdir) is not None
+        assert gdal.VSIStatL(subdir + "/subsubdir") is not None
+
+        if not filename.startswith("/vsimem/"):
+            assert gdal.Rmdir(subdir) == -1
+            assert gdal.VSIStatL(subdir) is not None
+
+        # Safety belt...
+        assert filename.startswith("tmp/") or filename.startswith("/vsimem/")
+        assert gdal.RmdirRecursive(filename) == 0
+
+        assert gdal.VSIStatL(subdir) is None
+        assert gdal.VSIStatL(subdir + "/subsubdir") is None
+
 
 ###############################################################################
 # Test /vsimem
@@ -679,6 +685,15 @@ def test_vsifile_14():
         )
 
 
+###############################################################################
+# Test bugfix for https://github.com/OSGeo/gdal/issues/10821
+
+
+def test_vsifile_vsitar_of_vsitar():
+
+    gdal.Open("/vsitar/{/vsitar/data/tar_of_tar_gzip.tar}/byte_tif.tar.gz/byte.tif")
+
+
 ###############################################################################
 # Test issue with Error() not detecting end of corrupted gzip stream (#6944)
 
@@ -774,12 +789,8 @@ def test_vsifile_19():
 
 def test_vsifile_20():
 
-    try:
+    with pytest.raises(Exception):
         gdal.VSIFReadL(1, 1, None)
-    except ValueError:
-        return
-
-    pytest.fail()
 
 
 ###############################################################################
@@ -1689,3 +1700,72 @@ def test_vsifile_class_append(tmp_vsimem):
         f.write("def")
     with gdaltest.vsi_open(fname) as f:
         assert f.read() == "abcdef"
+
+
+def test_vsifile_stat_directory_trailing_slash():
+
+    res = gdal.VSIStatL("data/")
+    assert res
+    assert res.IsDirectory()
+
+
+###############################################################################
+# Test VSIMultipartUploadXXXX(), unsupported on regular file systems
+
+
+def test_vsifile_MultipartUpload():
+
+    with gdal.ExceptionMgr(useExceptions=False):
+        with gdal.quiet_errors():
+            assert gdal.MultipartUploadGetCapabilities("foo") is None
+    with gdal.ExceptionMgr(useExceptions=True):
+        with pytest.raises(Exception):
+            gdal.MultipartUploadGetCapabilities(None)
+
+        with pytest.raises(
+            Exception,
+            match=r"MultipartUploadGetCapabilities\(\) not supported by this file system",
+        ):
+            gdal.MultipartUploadGetCapabilities("foo")
+
+        with pytest.raises(Exception):
+            gdal.MultipartUploadStart(None)
+
+        with pytest.raises(
+            Exception,
+            match=r"MultipartUploadStart\(\) not supported by this file system",
+        ):
+            gdal.MultipartUploadStart("foo")
+
+        with pytest.raises(Exception):
+            gdal.MultipartUploadAddPart(None, "", 1, 0, b"")
+        with pytest.raises(Exception):
+            gdal.MultipartUploadAddPart("", None, 1, 0, b"")
+
+        with pytest.raises(
+            Exception,
+            match=r"MultipartUploadAddPart\(\) not supported by this file system",
+        ):
+            gdal.MultipartUploadAddPart("", "", 1, 0, b"")
+
+        with pytest.raises(Exception):
+            gdal.MultipartUploadEnd(None, "", [], 0)
+        with pytest.raises(Exception):
+            gdal.MultipartUploadEnd("", None, [], 0)
+
+        with pytest.raises(
+            Exception,
+            match=r"MultipartUploadEnd\(\) not supported by this file system",
+        ):
+            gdal.MultipartUploadEnd("", "", [], 0)
+
+        with pytest.raises(Exception):
+            gdal.MultipartUploadAbort(None, "")
+        with pytest.raises(Exception):
+            gdal.MultipartUploadAbort("", None)
+
+        with pytest.raises(
+            Exception,
+            match=r"MultipartUploadAbort\(\) not supported by this file system",
+        ):
+            gdal.MultipartUploadAbort("", "")
diff --git a/autotest/gcore/vsigs.py b/autotest/gcore/vsigs.py
index 56b61088417a..ebf31b07dbdf 100755
--- a/autotest/gcore/vsigs.py
+++ b/autotest/gcore/vsigs.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2017 Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import stat
@@ -1188,6 +1172,15 @@ def method(request):
 
         assert data == "foo"
 
+        handler = webserver.SequentialHandler()
+        handler.add("GET", "/gs_fake_bucket/resource2", custom_method=method)
+        with webserver.install_http_handler(handler):
+            f = open_for_read("/vsigs/gs_fake_bucket/resource2")
+            assert f is not None
+            data = gdal.VSIFReadL(1, 4, f).decode("ascii")
+            gdal.VSIFCloseL(f)
+        assert data == "foo"
+
         gdal.Unlink("/vsimem/service_account.json")
 
 
@@ -1614,6 +1607,22 @@ def my_error_handler(errclass, errno, errmsg):
     assert not error[0]
 
 
+###############################################################################
+# Test VSIMultipartUploadXXXX()
+
+
+def test_vsigs_MultipartUpload(gs_test_config, webserver_port):
+
+    # Test MultipartUploadGetCapabilities()
+    info = gdal.MultipartUploadGetCapabilities("/vsigs/")
+    assert info.non_sequential_upload_supported
+    assert info.parallel_upload_supported
+    assert info.abort_supported
+    assert info.min_part_size == 5
+    assert info.max_part_size >= 1024
+    assert info.max_part_count == 10000
+
+
 ###############################################################################
 # Nominal cases (require valid credentials)
 
diff --git a/autotest/gcore/vsihdfs.py b/autotest/gcore/vsihdfs.py
index c44c31326798..755477082728 100755
--- a/autotest/gcore/vsihdfs.py
+++ b/autotest/gcore/vsihdfs.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.com>
 # Copyright (c) 2018, Azavea
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gcore/vsioss.py b/autotest/gcore/vsioss.py
index a98f3661aa78..7dda14517f16 100755
--- a/autotest/gcore/vsioss.py
+++ b/autotest/gcore/vsioss.py
@@ -9,25 +9,10 @@
 ###############################################################################
 # Copyright (c) 2017, Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
+import os
 import stat
 import sys
 
@@ -841,7 +826,8 @@ def test_vsioss_5(server):
 
 
 @pytest.mark.skipif(
-    gdaltest.is_travis_branch("macos_build"), reason="randomly fails on macos"
+    "CI" in os.environ,
+    reason="Flaky",
 )
 @gdaltest.disable_exceptions()
 def test_vsioss_6(server):
@@ -1118,6 +1104,22 @@ def method(request):
             assert gdal.GetLastErrorMsg() != "", filename
 
 
+###############################################################################
+# Test VSIMultipartUploadXXXX()
+
+
+def test_vsioss_MultipartUpload(server):
+
+    # Test MultipartUploadGetCapabilities()
+    info = gdal.MultipartUploadGetCapabilities("/vsioss/")
+    assert info.non_sequential_upload_supported
+    assert info.parallel_upload_supported
+    assert info.abort_supported
+    assert info.min_part_size == 5
+    assert info.max_part_size >= 1024
+    assert info.max_part_count == 10000
+
+
 ###############################################################################
 # Test Mkdir() / Rmdir()
 
@@ -1228,31 +1230,6 @@ def test_vsioss_8(server):
         assert stat.S_ISDIR(gdal.VSIStatL("/vsioss/vsioss_8/test/").mode)
 
 
-###############################################################################
-# Test gdal.CopyFileRestartable() with fallback to regular copy
-
-
-def test_vsioss_CopyFileRestartable_fallback_to_regular_copy(tmp_vsimem, server):
-
-    gdal.VSICurlClearCache()
-
-    srcfilename = str(tmp_vsimem / "foo")
-    gdal.FileFromMemBuffer(srcfilename, "foo\n")
-
-    dstfilename = "/vsioss/test_bucket/foo"
-
-    handler = webserver.SequentialHandler()
-    handler.add("PUT", "/test_bucket/foo", 200, expected_body=b"foo\n")
-
-    with webserver.install_http_handler(handler):
-        ret_code, restart_payload = gdal.CopyFileRestartable(
-            srcfilename,
-            dstfilename,
-            None,  # input payload
-        )
-    assert ret_code == 0
-
-
 ###############################################################################
 # Nominal cases (require valid credentials)
 
diff --git a/autotest/gcore/vsipathspecificoption.py b/autotest/gcore/vsipathspecificoption.py
index 75b45568ae47..9b1182bdf529 100755
--- a/autotest/gcore/vsipathspecificoption.py
+++ b/autotest/gcore/vsipathspecificoption.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2022 Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import pytest
diff --git a/autotest/gcore/vsirar.py b/autotest/gcore/vsirar.py
index efe775f2fa08..6710b95848df 100755
--- a/autotest/gcore/vsirar.py
+++ b/autotest/gcore/vsirar.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gcore/vsis3.py b/autotest/gcore/vsis3.py
index ad0710057809..6402ba38c40c 100755
--- a/autotest/gcore/vsis3.py
+++ b/autotest/gcore/vsis3.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import json
@@ -2199,6 +2183,112 @@ def method(request):
     assert gdal.GetLastErrorMsg() == ""
 
 
+###############################################################################
+# Test that PUT invalidates cached data
+
+
+def test_vsis3_put_invalidate(aws_test_config, webserver_port):
+
+    gdal.VSICurlClearCache()
+
+    handler = webserver.SequentialHandler()
+    handler.add("GET", "/s3_fake_bucket3/?delimiter=%2F", 200)
+    handler.add("GET", "/s3_fake_bucket3/test_put_invalidate.bin", 200, {}, b"foo")
+    handler.add("GET", "/s3_fake_bucket3/test_put_invalidate.bin", 200, {}, b"foo")
+
+    with webserver.install_http_handler(handler):
+        f = gdal.VSIFOpenL("/vsis3/s3_fake_bucket3/test_put_invalidate.bin", "rb")
+        assert f is not None
+        try:
+            assert gdal.VSIFReadL(3, 1, f) == b"foo"
+        finally:
+            gdal.VSIFCloseL(f)
+
+    handler = webserver.SequentialHandler()
+    with webserver.install_http_handler(handler):
+        f = gdal.VSIFOpenL("/vsis3/s3_fake_bucket3/test_put_invalidate.bin", "rb")
+        assert f is not None
+        try:
+            assert gdal.VSIFReadL(3, 1, f) == b"foo"
+        finally:
+            gdal.VSIFCloseL(f)
+
+    handler = webserver.SequentialHandler()
+    handler.add("PUT", "/s3_fake_bucket3/test_put_invalidate.bin", 200)
+    with webserver.install_http_handler(handler):
+        f = gdal.VSIFOpenL("/vsis3/s3_fake_bucket3/test_put_invalidate.bin", "wb")
+        assert f is not None
+        try:
+            assert gdal.VSIFWriteL("barbaw", 1, 6, f) == 6
+        finally:
+            gdal.VSIFCloseL(f)
+
+    handler = webserver.SequentialHandler()
+    handler.add("GET", "/s3_fake_bucket3/?delimiter=%2F", 200)
+    handler.add("GET", "/s3_fake_bucket3/test_put_invalidate.bin", 200, {}, b"barbaw")
+    handler.add("GET", "/s3_fake_bucket3/test_put_invalidate.bin", 200, {}, b"barbaw")
+
+    with webserver.install_http_handler(handler):
+        f = gdal.VSIFOpenL("/vsis3/s3_fake_bucket3/test_put_invalidate.bin", "rb")
+        assert f is not None
+        try:
+            assert gdal.VSIFReadL(6, 1, f) == b"barbaw"
+        finally:
+            gdal.VSIFCloseL(f)
+
+
+###############################################################################
+# Test that CopyFile invalidates cached data
+
+
+def test_vsis3_copy_invalidate(aws_test_config, webserver_port, tmp_vsimem):
+
+    gdal.VSICurlClearCache()
+
+    handler = webserver.SequentialHandler()
+    handler.add("GET", "/s3_fake_bucket3/?delimiter=%2F", 200)
+    handler.add("GET", "/s3_fake_bucket3/test_put_invalidate.bin", 200, {}, b"foo")
+    handler.add("GET", "/s3_fake_bucket3/test_put_invalidate.bin", 200, {}, b"foo")
+
+    with webserver.install_http_handler(handler):
+        f = gdal.VSIFOpenL("/vsis3/s3_fake_bucket3/test_put_invalidate.bin", "rb")
+        assert f is not None
+        try:
+            assert gdal.VSIFReadL(3, 1, f) == b"foo"
+        finally:
+            gdal.VSIFCloseL(f)
+
+    handler = webserver.SequentialHandler()
+    with webserver.install_http_handler(handler):
+        f = gdal.VSIFOpenL("/vsis3/s3_fake_bucket3/test_put_invalidate.bin", "rb")
+        assert f is not None
+        try:
+            assert gdal.VSIFReadL(3, 1, f) == b"foo"
+        finally:
+            gdal.VSIFCloseL(f)
+
+    handler = webserver.SequentialHandler()
+    handler.add("PUT", "/s3_fake_bucket3/test_put_invalidate.bin", 200)
+    memfilename = str(tmp_vsimem / "tmp.bin")
+    with webserver.install_http_handler(handler), gdaltest.tempfile(
+        memfilename, b"barbaw"
+    ):
+        gdal.CopyFile(memfilename, "/vsis3/s3_fake_bucket3/test_put_invalidate.bin")
+
+    handler = webserver.SequentialHandler()
+    handler.add("GET", "/s3_fake_bucket3/?delimiter=%2F", 200)
+    handler.add("GET", "/s3_fake_bucket3/test_put_invalidate.bin", 200, {}, b"barbaw")
+    handler.add("GET", "/s3_fake_bucket3/test_put_invalidate.bin", 200, {}, b"barbaw")
+
+    with webserver.install_http_handler(handler):
+        f = gdal.VSIFOpenL("/vsis3/s3_fake_bucket3/test_put_invalidate.bin", "rb")
+        assert f is not None
+        try:
+            assert gdal.VSIFReadL(6, 1, f) == b"barbaw"
+        finally:
+            gdal.VSIFCloseL(f)
+
+
 ###############################################################################
 # Test simple PUT support with retry logic
 
@@ -3471,13 +3561,9 @@ def test_vsis3_sync_timestamp(tmp_vsimem, aws_test_config, webserver_port):
 
 
 @gdaltest.enable_exceptions()
-@pytest.mark.skipif(
-    gdaltest.is_ci(),
-    reason="test skipped on CI due to it not being reliable (also fails randomly when run locally)",
-)
 def test_vsis3_sync_failed(tmp_vsimem, aws_test_config, webserver_port):
 
-    gdal.FileFromMemBuffer(tmp_vsimem / "testsync.txt", "foo")
+    gdal.FileFromMemBuffer(tmp_vsimem / "testsync.txt", "x" * 30000)
 
     # S3 to local: S3 file is older -> download
     gdal.VSICurlClearCache()
@@ -3487,18 +3573,11 @@ def test_vsis3_sync_failed(tmp_vsimem, aws_test_config, webserver_port):
         "/out/testsync.txt",
         206,
         {
-            "Content-Length": "3",
-            "Content-Range": "bytes 0-2/3",
+            "Content-Length": "16384",
+            "Content-Range": "bytes 0-16383/30000",
             "Last-Modified": "Mon, 01 Jan 1970 00:00:01 GMT",
         },
-        "xyz",
-    )
-    handler.add(
-        "GET",
-        "/out/testsync.txt",
-        200,
-        {"Content-Length": "3", "Last-Modified": "Mon, 01 Jan 1970 00:00:01 GMT"},
-        "xy",  # only returns 2 bytes instead of 30, {}
+        "x" * 16384,
     )
     handler.add(
         "GET",
@@ -3511,15 +3590,21 @@ def test_vsis3_sync_failed(tmp_vsimem, aws_test_config, webserver_port):
             <Contents>
                 <Key>testsync.txt</Key>
                 <LastModified>1970-01-01T00:00:01.000Z</LastModified>
-                <Size>3</Size>
+                <Size>30000</Size>
             </Contents>
         </ListBucketResult>
         """,
     )
-    with webserver.install_http_handler(handler):
+    handler.add("GET", "/out/testsync.txt", 400)
+    # Do not use /vsicurl_streaming/ as source, otherwise errors may be
+    # emitted in worker thread, which isn't properly handled (should ideally
+    # be fixed)
+    with gdal.config_option(
+        "VSIS3_COPYFILE_USE_STREAMING_SOURCE", "NO"
+    ), webserver.install_http_handler(handler):
         with pytest.raises(
             Exception,
-            match=f"Copying of /vsis3/out/testsync.txt to {tmp_vsimem}/testsync.txt failed: 2 bytes were copied whereas 3 were expected",
+            match=f"Copying of /vsis3/out/testsync.txt to {tmp_vsimem}/testsync.txt failed: 0 bytes were copied whereas 30000 were expected",
         ):
             gdal.Sync("/vsis3/out/testsync.txt", tmp_vsimem)
 
@@ -6060,6 +6145,139 @@ def test_vsis3_DISABLE_READDIR_ON_OPEN_option(aws_test_config, webserver_port):
         gdal.VSIFCloseL(f)
 
 
+###############################################################################
+# Test VSIMultipartUploadXXXX()
+
+
+def test_vsis3_MultipartUpload(aws_test_config, webserver_port):
+
+    # Test MultipartUploadGetCapabilities()
+    info = gdal.MultipartUploadGetCapabilities("/vsis3/")
+    assert info.non_sequential_upload_supported
+    assert info.parallel_upload_supported
+    assert info.abort_supported
+    assert info.min_part_size == 5
+    assert info.max_part_size >= 1024
+    assert info.max_part_count == 10000
+
+    # Test MultipartUploadStart()
+    handler = webserver.SequentialHandler()
+    handler.add("POST", "/test_multipartupload/test.bin?uploads", 400)
+    with webserver.install_http_handler(handler), gdal.quiet_errors():
+        upload_id = gdal.MultipartUploadStart("/vsis3/test_multipartupload/test.bin")
+    assert upload_id is None
+
+    handler = webserver.SequentialHandler()
+    handler.add(
+        "POST",
+        "/test_multipartupload/test.bin?uploads",
+        200,
+        {},
+        """xml version="1.0" encoding="UTF-8"?>
+        <InitiateMultipartUploadResult>
+        <UploadId>my_upload_id</UploadId>
+        </InitiateMultipartUploadResult>""",
+    )
+    with webserver.install_http_handler(handler):
+        upload_id = gdal.MultipartUploadStart("/vsis3/test_multipartupload/test.bin")
+    assert upload_id == "my_upload_id"
+
+    # Test MultipartUploadAddPart()
+    handler = webserver.SequentialHandler()
+    handler.add(
+        "PUT",
+        "/test_multipartupload/test.bin?partNumber=1&uploadId=my_upload_id",
+        400,
+    )
+    with webserver.install_http_handler(handler), gdal.quiet_errors():
+        part_id = gdal.MultipartUploadAddPart(
+            "/vsis3/test_multipartupload/test.bin", "my_upload_id", 1, 0, b"foo"
+        )
+    assert part_id is None
+
+    handler = webserver.SequentialHandler()
+    handler.add(
+        "PUT",
+        "/test_multipartupload/test.bin?partNumber=1&uploadId=my_upload_id",
+        200,
+        {"ETag": '"my_part_id"', "Content-Length": "0"},
+        b"",
+        expected_body=b"foo",
+    )
+    with webserver.install_http_handler(handler):
+        part_id = gdal.MultipartUploadAddPart(
+            "/vsis3/test_multipartupload/test.bin", "my_upload_id", 1, 0, b"foo"
+        )
+    assert part_id == '"my_part_id"'
+
+    # Test MultipartUploadEnd()
+
+    handler = webserver.SequentialHandler()
+    handler.add("POST", "/test_multipartupload/test.bin?uploadId=my_upload_id", 400)
+    with webserver.install_http_handler(handler), gdal.quiet_errors():
+        assert not gdal.MultipartUploadEnd(
+            "/vsis3/test_multipartupload/test.bin", "my_upload_id", ['"my_part_id"'], 3
+        )
+
+    handler = webserver.SequentialHandler()
+    handler.add(
+        "POST",
+        "/test_multipartupload/test.bin?uploadId=my_upload_id",
+        200,
+        expected_body=b"""<CompleteMultipartUpload>
+<Part>
+<PartNumber>1</PartNumber><ETag>"my_part_id"</ETag></Part>
+</CompleteMultipartUpload>
+""",
+    )
+    with webserver.install_http_handler(handler):
+        assert gdal.MultipartUploadEnd(
+            "/vsis3/test_multipartupload/test.bin", "my_upload_id", ['"my_part_id"'], 3
+        )
+
+    # Test MultipartUploadAbort()
+
+    handler = webserver.SequentialHandler()
+    handler.add("DELETE", "/test_multipartupload/test.bin?uploadId=my_upload_id", 400)
+    with webserver.install_http_handler(handler), gdal.quiet_errors():
+        assert not gdal.MultipartUploadAbort(
+            "/vsis3/test_multipartupload/test.bin", "my_upload_id"
+        )
+
+    handler = webserver.SequentialHandler()
+    handler.add("DELETE", "/test_multipartupload/test.bin?uploadId=my_upload_id", 204)
+    with webserver.install_http_handler(handler):
+        assert gdal.MultipartUploadAbort(
+            "/vsis3/test_multipartupload/test.bin", "my_upload_id"
+        )
+
+
+###############################################################################
+# Test VSIMultipartUploadXXXX() when authentication fails
+
+
+def test_vsis3_MultipartUpload_unauthenticated():
+
+    options = {
+        "AWS_SECRET_ACCESS_KEY": "",
+        "AWS_ACCESS_KEY_ID": "",
+    }
+    with gdaltest.config_options(options, thread_local=False), gdal.quiet_errors():
+        assert gdal.MultipartUploadStart("/vsis3/test_multipartupload/test.bin") is None
+        assert (
+            gdal.MultipartUploadAddPart(
+                "/vsis3/test_multipartupload/test.bin", "my_upload_id", 1, 0, b"foo"
+            )
+            is None
+        )
+        assert not gdal.MultipartUploadEnd(
+            "/vsis3/test_multipartupload/test.bin", "my_upload_id", ['"my_part_id"'], 3
+        )
+        assert not gdal.MultipartUploadAbort(
+            "/vsis3/test_multipartupload/test.bin", "my_upload_id"
+        )
+
+
 ###############################################################################
 # Nominal cases (require valid credentials)
 
diff --git a/autotest/gcore/vsistdin.py b/autotest/gcore/vsistdin.py
index 1e68741873f3..d7c0b6780d1f 100755
--- a/autotest/gcore/vsistdin.py
+++ b/autotest/gcore/vsistdin.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -108,6 +92,10 @@ def test_vsistdin_3():
 # Test fix for #6061
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_vsistdin_4():
     if test_cli_utilities.get_gdal_translate_path() is None:
         pytest.skip()
diff --git a/autotest/gcore/vsiswift.py b/autotest/gcore/vsiswift.py
index 4944bbc4d385..8b239cc1fddd 100755
--- a/autotest/gcore/vsiswift.py
+++ b/autotest/gcore/vsiswift.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2018 Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import json
@@ -799,6 +783,56 @@ def method(request):
             gdal.VSIFCloseL(f)
 
 
+###############################################################################
+# Test write
+
+
+def test_vsiswift_fake_write_zero_file(server):
+
+    gdal.VSICurlClearCache()
+
+    with gdal.config_options(
+        {
+            "SWIFT_AUTH_TOKEN": "my_auth_token",
+            "SWIFT_AUTH_V1_URL": "",
+            "SWIFT_KEY": "",
+            "SWIFT_STORAGE_URL": f"http://127.0.0.1:{server.port}/v1/AUTH_something",
+            "SWIFT_USER": "",
+        }
+    ):
+
+        # Test creation of BlockBob
+        f = gdal.VSIFOpenL("/vsiswift/test_copy/file.bin", "wb")
+        assert f is not None
+
+        handler = webserver.SequentialHandler()
+
+        def method(request):
+            h = request.headers
+            if (
+                "x-auth-token" not in h
+                or h["x-auth-token"] != "my_auth_token"
+                or "Content-Length" not in h
+                or h["Content-Length"] != "0"
+            ):
+                sys.stderr.write("Bad headers: %s\n" % str(h))
+                request.send_response(403)
+                return
+
+            request.protocol_version = "HTTP/1.1"
+            request.wfile.write("HTTP/1.1 100 Continue\r\n\r\n".encode("ascii"))
+
+            request.send_response(200)
+            request.send_header("Content-Length", 0)
+            request.end_headers()
+
+        handler.add(
+            "PUT", "/v1/AUTH_something/test_copy/file.bin", custom_method=method
+        )
+        with webserver.install_http_handler(handler):
+            assert gdal.VSIFCloseL(f) == 0
+
+
 ###############################################################################
 # Test Unlink()
 
diff --git a/autotest/gcore/vsiwebhdfs.py b/autotest/gcore/vsiwebhdfs.py
index 0f99d075f42d..28403e113e3a 100755
--- a/autotest/gcore/vsiwebhdfs.py
+++ b/autotest/gcore/vsiwebhdfs.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2018 Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import stat
diff --git a/autotest/gcore/vsizip.py b/autotest/gcore/vsizip.py
index d28765150af6..8942fc4f42ff 100755
--- a/autotest/gcore/vsizip.py
+++ b/autotest/gcore/vsizip.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2010-2014, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import random
diff --git a/autotest/gdrivers/aaigrid.py b/autotest/gdrivers/aaigrid.py
index a719e4618f01..77fbf5e935a8 100755
--- a/autotest/gdrivers/aaigrid.py
+++ b/autotest/gdrivers/aaigrid.py
@@ -12,25 +12,10 @@
 # Copyright (c) 2008-2010, Even Rouault <even dot rouault at spatialys.com>
 # Copyright (c) 2014, Kyle Shannon <kyle at pobox dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
+import math
 import os
 import struct
 
@@ -235,6 +220,10 @@ def test_aaigrid_6bis():
 # Verify writing files with non-square pixels.
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_aaigrid_7():
 
     tst = gdaltest.GDALTest("AAIGRID", "aaigrid/nonsquare.vrt", 1, 12481)
@@ -523,3 +512,14 @@ def test_aaigrid_starting_with_nan():
     ds = gdal.Open("data/aaigrid/starting_with_nan.asc")
     assert ds.GetRasterBand(1).DataType == gdal.GDT_Float32
     assert ds.GetRasterBand(1).Checksum() == 65300
+
+
+###############################################################################
+# Test reading a file starting with nan as nodata value
+
+
+def test_aaigrid_nodata_nan():
+
+    ds = gdal.Open("data/aaigrid/nodata_nan.asc")
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_Float32
+    assert math.isnan(ds.GetRasterBand(1).GetNoDataValue())
diff --git a/autotest/gdrivers/ace2.py b/autotest/gdrivers/ace2.py
index 9d34783c84bd..ad3a194ff6d2 100755
--- a/autotest/gdrivers/ace2.py
+++ b/autotest/gdrivers/ace2.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/adrg.py b/autotest/gdrivers/adrg.py
index 9ec5299d9852..3fe1ead3e2b4 100755
--- a/autotest/gdrivers/adrg.py
+++ b/autotest/gdrivers/adrg.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2007-2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/aigrid.py b/autotest/gdrivers/aigrid.py
index a6d757a0b88f..c68ef8545abd 100755
--- a/autotest/gdrivers/aigrid.py
+++ b/autotest/gdrivers/aigrid.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2006, Swapnil Hajare <dreamil@gmail.com>
 # Copyright (c) 2009-2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/avif.py b/autotest/gdrivers/avif.py
new file mode 100644
index 000000000000..140ce6d43a50
--- /dev/null
+++ b/autotest/gdrivers/avif.py
@@ -0,0 +1,257 @@
+#!/usr/bin/env pytest
+# -*- coding: utf-8 -*-
+###############################################################################
+#
+# Project:  GDAL/OGR Test Suite
+# Purpose:  Test AVIF driver
+# Author:   Even Rouault, <even dot rouault at spatialys.com>
+#
+###############################################################################
+# Copyright (c) 2024, Even Rouault <even dot rouault at spatialys.com>
+#
+# SPDX-License-Identifier: MIT
+###############################################################################
+
+import base64
+import shutil
+
+import gdaltest
+import pytest
+
+from osgeo import gdal
+
+pytestmark = pytest.mark.require_driver("AVIF")
+
+
+def has_avif_encoder():
+    drv = gdal.GetDriverByName("AVIF")
+    return drv is not None and drv.GetMetadataItem("DMD_CREATIONOPTIONLIST") is not None
+
+
+def test_avif_subdatasets(tmp_path):
+
+    filename = str(tmp_path / "out.avif")
+    shutil.copy("data/avif/colors-animated-8bpc-alpha-exif-xmp.avif", filename)
+
+    ds = gdal.Open(filename)
+    assert ds
+    assert len(ds.GetSubDatasets()) == 5
+    subds1_name = ds.GetSubDatasets()[0][0]
+    subds2_name = ds.GetSubDatasets()[1][0]
+
+    ds = gdal.Open(subds1_name)
+    assert ds
+    assert ds.RasterXSize == 150
+    assert ds.GetRasterBand(1).GetMetadataItem("STATISTICS_MINIMUM") is None
+    assert ds.GetRasterBand(1).ComputeStatistics(False)
+    assert ds.GetRasterBand(1).GetMetadataItem("STATISTICS_MINIMUM") is not None
+    ds.Close()
+
+    ds = gdal.Open(subds1_name)
+    assert ds.GetRasterBand(1).GetMetadataItem("STATISTICS_MINIMUM") is not None
+
+    ds = gdal.Open(subds2_name)
+    assert ds
+    assert ds.RasterXSize == 150
+    assert ds.GetRasterBand(1).GetMetadataItem("STATISTICS_MINIMUM") is None
+
+    with pytest.raises(Exception):
+        gdal.Open(f"AVIF:0:{filename}")
+    with pytest.raises(Exception):
+        gdal.Open(f"AVIF:6:{filename}")
+    with pytest.raises(Exception):
+        gdal.Open("AVIF:1:non_existing.heic")
+    with pytest.raises(Exception):
+        gdal.Open("AVIF:")
+    with pytest.raises(Exception):
+        gdal.Open("AVIF:1")
+    with pytest.raises(Exception):
+        gdal.Open("AVIF:1:")
+
+
+@pytest.mark.skipif(not has_avif_encoder(), reason="libavif encoder missing")
+def test_avif_single_band():
+    tst = gdaltest.GDALTest(
+        "AVIF",
+        "byte.tif",
+        1,
+        4672,
+    )
+    tst.testCreateCopy(vsimem=1, check_checksum_not_null=True, check_minmax=False)
+
+
+@pytest.mark.skipif(not has_avif_encoder(), reason="libavif encoder missing")
+@pytest.mark.require_driver("PNG")
+def test_avif_gray_alpha():
+    tst = gdaltest.GDALTest(
+        "AVIF",
+        "wms/gray+alpha.png",
+        1,
+        39910,
+    )
+    tst.testCreateCopy(vsimem=1, check_checksum_not_null=True, check_minmax=False)
+
+
+@pytest.mark.skipif(not has_avif_encoder(), reason="libavif encoder missing")
+def test_avif_rgb():
+    tst = gdaltest.GDALTest(
+        "AVIF",
+        "rgbsmall.tif",
+        1,
+        21212,
+        options=["QUALITY=100", "NUM_THREADS=1"],
+    )
+    tst.testCreateCopy(vsimem=1)
+
+
+@pytest.mark.skipif(not has_avif_encoder(), reason="libavif encoder missing")
+def test_avif_rgba():
+    tst = gdaltest.GDALTest(
+        "AVIF",
+        "../../gcore/data/stefan_full_rgba.tif",
+        1,
+        12603,
+        options=["QUALITY=100"],
+    )
+    tst.testCreateCopy(vsimem=1)
+
+
+@pytest.mark.skipif(not has_avif_encoder(), reason="libavif encoder missing")
+def test_avif_uint16():
+    tst = gdaltest.GDALTest(
+        "AVIF", "../../gcore/data/uint16.tif", 1, 4672, options=["NBITS=10"]
+    )
+    tst.testCreateCopy(vsimem=1, check_checksum_not_null=True, check_minmax=False)
+
+
+@pytest.mark.skipif(not has_avif_encoder(), reason="libavif encoder missing")
+@pytest.mark.parametrize("yuv_subsampling", ["444", "422", "420"])
+def test_avif_yuv_subsampling(tmp_vsimem, yuv_subsampling):
+
+    src_ds = gdal.Open("data/rgbsmall.tif")
+    out_filename = str(tmp_vsimem / "out.avif")
+    gdal.GetDriverByName("AVIF").CreateCopy(
+        out_filename, src_ds, options=["YUV_SUBSAMPLING=" + yuv_subsampling]
+    )
+    ds = gdal.Open(out_filename)
+    assert ds.GetMetadataItem("YUV_SUBSAMPLING", "IMAGE_STRUCTURE") == yuv_subsampling
+
+
+@pytest.mark.skipif(not has_avif_encoder(), reason="libavif encoder missing")
+def test_avif_nbits_from_src_ds(tmp_vsimem):
+
+    src_ds = gdal.GetDriverByName("MEM").Create("", 1, 1, 1, gdal.GDT_UInt16)
+    src_ds.GetRasterBand(1).SetMetadataItem("NBITS", "12", "IMAGE_STRUCTURE")
+    out_filename = str(tmp_vsimem / "out.avif")
+    gdal.GetDriverByName("AVIF").CreateCopy(out_filename, src_ds)
+    ds = gdal.Open(out_filename)
+    assert ds.GetRasterBand(1).GetMetadataItem("NBITS", "IMAGE_STRUCTURE") == "12"
+
+
+@pytest.mark.skipif(not has_avif_encoder(), reason="libavif encoder missing")
+def test_avif_exif_xmp(tmp_vsimem):
+
+    src_ds = gdal.Open("data/avif/colors-animated-8bpc-alpha-exif-xmp.avif")
+    out_filename = str(tmp_vsimem / "out.avif")
+    gdal.GetDriverByName("AVIF").CreateCopy(out_filename, src_ds)
+    if gdal.VSIStatL(out_filename + ".aux.xml"):
+        gdal.Unlink(out_filename + ".aux.xml")
+    ds = gdal.Open(out_filename)
+    exif_mdd = ds.GetMetadata("EXIF")
+    assert exif_mdd
+    assert exif_mdd["EXIF_LensMake"] == "Google"
+    xmp = ds.GetMetadata("xml:XMP")
+    assert xmp
+    assert xmp[0].startswith("<?xpacket")
+
+
+@pytest.mark.skipif(not has_avif_encoder(), reason="libavif encoder missing")
+def test_avif_icc_profile(tmp_vsimem):
+
+    if "SOURCE_ICC_PROFILE" not in gdal.GetDriverByName("AVIF").GetMetadataItem(
+        "DMD_CREATIONOPTIONLIST"
+    ):
+        pytest.skip("ICC profile setting requires libavif >= 1.0")
+
+    f = open("data/sRGB.icc", "rb")
+    data = f.read()
+    icc = base64.b64encode(data).decode("ascii")
+    f.close()
+
+    src_ds = gdal.GetDriverByName("MEM").Create("", 1, 1, 3)
+    src_ds.GetRasterBand(1).SetColorInterpretation(gdal.GCI_RedBand)
+    src_ds.GetRasterBand(2).SetColorInterpretation(gdal.GCI_GreenBand)
+    src_ds.GetRasterBand(3).SetColorInterpretation(gdal.GCI_BlueBand)
+    src_ds.SetMetadataItem("SOURCE_ICC_PROFILE", icc, "COLOR_PROFILE")
+
+    out_filename = str(tmp_vsimem / "out.avif")
+    gdal.GetDriverByName("AVIF").CreateCopy(out_filename, src_ds)
+    ds = gdal.Open(out_filename)
+    assert ds.GetMetadataItem("SOURCE_ICC_PROFILE", "COLOR_PROFILE") == icc
+
+
+@pytest.mark.skipif(not has_avif_encoder(), reason="libavif encoder missing")
+def test_avif_creation_errors(tmp_vsimem):
+
+    out_filename = str(tmp_vsimem / "out.avif")
+
+    src_ds = gdal.GetDriverByName("MEM").Create("", 65537, 1)
+    with pytest.raises(
+        Exception,
+        match="Too big source dataset. Maximum AVIF image dimension is 65,536 x 65,536 pixels",
+    ):
+        gdal.GetDriverByName("AVIF").CreateCopy(out_filename, src_ds)
+
+    src_ds = gdal.GetDriverByName("MEM").Create("", 1, 65537)
+    with pytest.raises(
+        Exception,
+        match="Too big source dataset. Maximum AVIF image dimension is 65,536 x 65,536 pixels",
+    ):
+        gdal.GetDriverByName("AVIF").CreateCopy(out_filename, src_ds)
+
+    src_ds = gdal.GetDriverByName("MEM").Create("", 1, 1, 5)
+    with pytest.raises(Exception, match="Unsupported number of bands"):
+        gdal.GetDriverByName("AVIF").CreateCopy(out_filename, src_ds)
+
+    src_ds = gdal.GetDriverByName("MEM").Create("", 1, 1, 1, gdal.GDT_Float32)
+    with pytest.raises(
+        Exception,
+        match="Unsupported data type: only Byte or UInt16 bands are supported",
+    ):
+        gdal.GetDriverByName("AVIF").CreateCopy(out_filename, src_ds)
+
+    src_ds = gdal.GetDriverByName("MEM").Create("", 1, 1)
+    with pytest.raises(
+        Exception, match="Invalid/inconsistent bit depth w.r.t data type"
+    ):
+        gdal.GetDriverByName("AVIF").CreateCopy(
+            out_filename, src_ds, options=["NBITS=10"]
+        )
+
+    src_ds = gdal.GetDriverByName("MEM").Create("", 1, 1, 1, gdal.GDT_UInt16)
+    with pytest.raises(
+        Exception, match="Invalid/inconsistent bit depth w.r.t data type"
+    ):
+        gdal.GetDriverByName("AVIF").CreateCopy(
+            out_filename, src_ds, options=["NBITS=8"]
+        )
+
+    src_ds = gdal.GetDriverByName("MEM").Create("", 1, 1)
+    src_ds.GetRasterBand(1).SetColorTable(gdal.ColorTable())
+    with pytest.raises(
+        Exception,
+        match="Source dataset with color table unsupported. Use gdal_translate -expand rgb|rgba first",
+    ):
+        gdal.GetDriverByName("AVIF").CreateCopy(out_filename, src_ds)
+
+    src_ds = gdal.GetDriverByName("MEM").Create("", 1, 1, 3)
+    with pytest.raises(
+        Exception, match="Only YUV_SUBSAMPLING=444 is supported for lossless encoding"
+    ):
+        gdal.GetDriverByName("AVIF").CreateCopy(
+            out_filename, src_ds, options=["QUALITY=100", "YUV_SUBSAMPLING=422"]
+        )
+
+    src_ds = gdal.GetDriverByName("MEM").Create("", 1, 1)
+    with pytest.raises(Exception, match="Cannot create file /i_do/not/exist.avif"):
+        gdal.GetDriverByName("AVIF").CreateCopy("/i_do/not/exist.avif", src_ds)
diff --git a/autotest/gdrivers/avif_heif.py b/autotest/gdrivers/avif_heif.py
new file mode 100755
index 000000000000..42af055418ea
--- /dev/null
+++ b/autotest/gdrivers/avif_heif.py
@@ -0,0 +1,47 @@
+#!/usr/bin/env pytest
+# -*- coding: utf-8 -*-
+###############################################################################
+# Project:  GDAL/OGR Test Suite
+# Purpose:  Test read functionality for AVIF_HEIF driver.
+# Author:   Even Rouault <even dot rouault at spatialys.com>
+#
+###############################################################################
+# Copyright (c) 2024, Even Rouault <even dot rouault at spatialys.com>
+#
+# SPDX-License-Identifier: MIT
+###############################################################################
+
+import os
+import subprocess
+import sys
+
+import pytest
+
+
+def test_avif_heif():
+
+    from osgeo import gdal
+
+    drv = gdal.GetDriverByName("HEIF")
+    if drv is None:
+        pytest.skip("HEIF driver must be available")
+    if drv.GetMetadataItem("SUPPORTS_AVIF", "HEIF") is None:
+        pytest.skip("libheif has no AVIF support")
+
+    subprocess.check_call(
+        [
+            sys.executable,
+            "avif_heif.py",
+            "subprocess",
+        ]
+    )
+
+
+if __name__ == "__main__":
+
+    os.environ["GDAL_SKIP"] = "AVIF"
+    from osgeo import gdal
+
+    gdal.UseExceptions()
+    ds = gdal.Open("data/avif/byte.avif")
+    assert ds.GetRasterBand(1).Checksum() == 4672
diff --git a/autotest/gdrivers/bag.py b/autotest/gdrivers/bag.py
index a1580be1a2c7..4a4adfdf3cfc 100755
--- a/autotest/gdrivers/bag.py
+++ b/autotest/gdrivers/bag.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.com>
 #                     Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
@@ -1193,3 +1177,23 @@ def test_bag_write_values_at_nodata():
     ds = None
 
     gdal.Unlink(tmpfilename)
+
+
+###############################################################################
+# Test force opening
+
+
+def test_bag_force_opening():
+
+    drv = gdal.IdentifyDriverEx("data/netcdf/trmm-nc4.nc", allowed_drivers=["BAG"])
+    assert drv.GetDescription() == "BAG"
+
+
+###############################################################################
+# Test force opening, but provided file is still not recognized (for good reasons)
+
+
+def test_bag_force_opening_no_match():
+
+    drv = gdal.IdentifyDriverEx("data/byte.tif", allowed_drivers=["BAG"])
+    assert drv is None
diff --git a/autotest/gdrivers/basisu.py b/autotest/gdrivers/basisu.py
index a24f06cd2d20..2d5c28d5b125 100755
--- a/autotest/gdrivers/basisu.py
+++ b/autotest/gdrivers/basisu.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2022, Even Rouault <even.rouault@spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/blx.py b/autotest/gdrivers/blx.py
index c8b20d6b239a..f84c4caffb06 100755
--- a/autotest/gdrivers/blx.py
+++ b/autotest/gdrivers/blx.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2008, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/bsb.py b/autotest/gdrivers/bsb.py
index 49efd4fc3b08..b62d129311d6 100755
--- a/autotest/gdrivers/bsb.py
+++ b/autotest/gdrivers/bsb.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2008-2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/bt.py b/autotest/gdrivers/bt.py
index f058908c9789..8a7233a4bf27 100755
--- a/autotest/gdrivers/bt.py
+++ b/autotest/gdrivers/bt.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2008-2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/byn.py b/autotest/gdrivers/byn.py
index 51378c7c8970..39edc2e85463 100755
--- a/autotest/gdrivers/byn.py
+++ b/autotest/gdrivers/byn.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2018, Ivan Lucena
 # Copyright (c) 2018, Even Rouault
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/cals.py b/autotest/gdrivers/cals.py
index d6e7693c420b..b562d23b3d00 100755
--- a/autotest/gdrivers/cals.py
+++ b/autotest/gdrivers/cals.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2015, Even Rouault, <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/ceos.py b/autotest/gdrivers/ceos.py
index 44a77a330914..57446e45b8d6 100755
--- a/autotest/gdrivers/ceos.py
+++ b/autotest/gdrivers/ceos.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/cpg.py b/autotest/gdrivers/cpg.py
index 174b37a0d0ba..2efca291d71c 100755
--- a/autotest/gdrivers/cpg.py
+++ b/autotest/gdrivers/cpg.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/ctg.py b/autotest/gdrivers/ctg.py
index aef69343965c..611b232d2361 100755
--- a/autotest/gdrivers/ctg.py
+++ b/autotest/gdrivers/ctg.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/daas.py b/autotest/gdrivers/daas.py
index f1251de83447..c2abeb58d32c 100755
--- a/autotest/gdrivers/daas.py
+++ b/autotest/gdrivers/daas.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2018-2019, Airbus DS Intelligence
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import copy
diff --git a/autotest/gdrivers/daas_real_instance.py b/autotest/gdrivers/daas_real_instance.py
index dc51de11bd90..ffa99a86f464 100755
--- a/autotest/gdrivers/daas_real_instance.py
+++ b/autotest/gdrivers/daas_real_instance.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2021, Airbus DS Intelligence
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import pytest
diff --git a/autotest/gdrivers/data/aaigrid/nodata_nan.asc b/autotest/gdrivers/data/aaigrid/nodata_nan.asc
new file mode 100644
index 000000000000..b5f75e3a3eba
--- /dev/null
+++ b/autotest/gdrivers/data/aaigrid/nodata_nan.asc
@@ -0,0 +1,8 @@
+ncols        3
+nrows        2
+xllcorner    0
+yllcorner    0
+cellsize     1
+NODATA_value nan
+nan -1 0
+1 2 3
diff --git a/autotest/gdrivers/data/avif/byte.avif b/autotest/gdrivers/data/avif/byte.avif
new file mode 100644
index 000000000000..499891bcf0bd
Binary files /dev/null and b/autotest/gdrivers/data/avif/byte.avif differ
diff --git a/autotest/gdrivers/data/avif/colors-animated-8bpc-alpha-exif-xmp.avif b/autotest/gdrivers/data/avif/colors-animated-8bpc-alpha-exif-xmp.avif
new file mode 100644
index 000000000000..afe6a2a60658
Binary files /dev/null and b/autotest/gdrivers/data/avif/colors-animated-8bpc-alpha-exif-xmp.avif differ
diff --git a/autotest/gdrivers/data/bag/generate_test_georef_metadata.py b/autotest/gdrivers/data/bag/generate_test_georef_metadata.py
index a03e77f697a4..03ac88cf9bed 100755
--- a/autotest/gdrivers/data/bag/generate_test_georef_metadata.py
+++ b/autotest/gdrivers/data/bag/generate_test_georef_metadata.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2020, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/data/bag/generate_test_interpolated.py b/autotest/gdrivers/data/bag/generate_test_interpolated.py
index ebc8257db026..09af6bb9e4e8 100755
--- a/autotest/gdrivers/data/bag/generate_test_interpolated.py
+++ b/autotest/gdrivers/data/bag/generate_test_interpolated.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/data/esric/Usa_lod5.tpkx b/autotest/gdrivers/data/esric/Usa_lod5.tpkx
new file mode 100644
index 000000000000..b51041605c02
Binary files /dev/null and b/autotest/gdrivers/data/esric/Usa_lod5.tpkx differ
diff --git a/autotest/gdrivers/data/grib/minx_180.grib2 b/autotest/gdrivers/data/grib/minx_180.grib2
new file mode 100644
index 000000000000..dd785ceb34fd
Binary files /dev/null and b/autotest/gdrivers/data/grib/minx_180.grib2 differ
diff --git a/autotest/gdrivers/data/hdf5/fwhm.h5 b/autotest/gdrivers/data/hdf5/fwhm.h5
index d8112dfc5f3f..a38ee931a8c7 100644
Binary files a/autotest/gdrivers/data/hdf5/fwhm.h5 and b/autotest/gdrivers/data/hdf5/fwhm.h5 differ
diff --git a/autotest/gdrivers/data/isg/header_dms.isg b/autotest/gdrivers/data/isg/header_dms.isg
new file mode 100644
index 000000000000..37f4300d7a7a
--- /dev/null
+++ b/autotest/gdrivers/data/isg/header_dms.isg
@@ -0,0 +1,28 @@
+begin_of_head ================================================
+model name     : GSIGEO2024bata
+model year     : 2024
+model type     : gravimetric
+data type      : geoid
+data units     : meters
+data format    : grid
+data ordering  : N-to-S, W-to-E
+ref ellipsoid  : GRS80
+ref frame      : ---
+height datum   : ---
+tide system    : ---
+coord type     : geodetic
+coord units    : dms
+map projection : ---
+EPSG code      : 6668
+lat min        =  15°00'00"
+lat max        =  50°00'00"
+lon min        = 120°00'00"
+lon max        = 160°00'00"
+delta lat      =   0°01'00"
+delta lon      =   0°01'30"
+nrows          =        2101
+ncols          =        1601
+nodata         =  -9999.0000
+creation date  =  27/03/2024
+ISG format     =         2.0
+end_of_head ==================================================
diff --git a/autotest/gdrivers/data/jpeg/DNG_CameraSerialNumber_and_DNG_UniqueCameraModel.jpg b/autotest/gdrivers/data/jpeg/DNG_CameraSerialNumber_and_DNG_UniqueCameraModel.jpg
new file mode 100644
index 000000000000..b940f4846fe6
Binary files /dev/null and b/autotest/gdrivers/data/jpeg/DNG_CameraSerialNumber_and_DNG_UniqueCameraModel.jpg differ
diff --git a/autotest/gdrivers/data/jpeg/DNG_and_EXIF_same_values.jpg b/autotest/gdrivers/data/jpeg/DNG_and_EXIF_same_values.jpg
new file mode 100644
index 000000000000..b071205a358d
Binary files /dev/null and b/autotest/gdrivers/data/jpeg/DNG_and_EXIF_same_values.jpg differ
diff --git a/autotest/gdrivers/data/jpeg/byte_corrupted3.jpg b/autotest/gdrivers/data/jpeg/byte_corrupted3.jpg
new file mode 100644
index 000000000000..d6962b48f04d
Binary files /dev/null and b/autotest/gdrivers/data/jpeg/byte_corrupted3.jpg differ
diff --git a/autotest/gdrivers/data/jpeg/pix4d_xmp_crs_vertcs_ellipsoidal.jpg b/autotest/gdrivers/data/jpeg/pix4d_xmp_crs_vertcs_ellipsoidal.jpg
new file mode 100644
index 000000000000..29f8577a3926
Binary files /dev/null and b/autotest/gdrivers/data/jpeg/pix4d_xmp_crs_vertcs_ellipsoidal.jpg differ
diff --git a/autotest/gdrivers/data/jpeg/pix4d_xmp_crs_vertcs_orthometric.jpg b/autotest/gdrivers/data/jpeg/pix4d_xmp_crs_vertcs_orthometric.jpg
new file mode 100644
index 000000000000..daabb8e3b6c2
Binary files /dev/null and b/autotest/gdrivers/data/jpeg/pix4d_xmp_crs_vertcs_orthometric.jpg differ
diff --git a/autotest/gdrivers/data/kml/small_world_latlonquad.kml b/autotest/gdrivers/data/kml/small_world_latlonquad.kml
new file mode 100644
index 000000000000..ff89dfa40180
--- /dev/null
+++ b/autotest/gdrivers/data/kml/small_world_latlonquad.kml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<kml xmlns="http://www.opengis.net/kml/2.2" xmlns:kml="http://www.opengis.net/kml/2.2" xmlns:atom="http://www.w3.org/2005/Atom">
+<GroundOverlay>
+<name>small_world</name>
+<color>ffffffff</color>
+<Icon>
+<href>../small_world.tif</href>
+<viewBoundScale>1</viewBoundScale>
+</Icon>
+<gx:LatLonQuad>
+<coordinates>
+-180,-90,0 180,-90,0 180,90,0 -180,90,0
+</coordinates>
+</gx:LatLonQuad>
+</GroundOverlay>
+</kml>
diff --git a/autotest/gdrivers/data/netcdf/fake_EMIT_L2A_with_good_wavelengths.nc b/autotest/gdrivers/data/netcdf/fake_EMIT_L2A_with_good_wavelengths.nc
new file mode 100644
index 000000000000..bddcb696313b
Binary files /dev/null and b/autotest/gdrivers/data/netcdf/fake_EMIT_L2A_with_good_wavelengths.nc differ
diff --git a/autotest/gdrivers/data/ogcapi/expected_COVERAGE.tif b/autotest/gdrivers/data/ogcapi/expected_COVERAGE.tif
new file mode 100644
index 000000000000..caa0445bdd39
Binary files /dev/null and b/autotest/gdrivers/data/ogcapi/expected_COVERAGE.tif differ
diff --git a/autotest/gdrivers/data/ogcapi/expected_MAP.tif b/autotest/gdrivers/data/ogcapi/expected_MAP.tif
new file mode 100644
index 000000000000..7938841c7a94
Binary files /dev/null and b/autotest/gdrivers/data/ogcapi/expected_MAP.tif differ
diff --git a/autotest/gdrivers/data/ogcapi/expected_TILES.tif b/autotest/gdrivers/data/ogcapi/expected_TILES.tif
new file mode 100644
index 000000000000..eb0feb6cdc16
Binary files /dev/null and b/autotest/gdrivers/data/ogcapi/expected_TILES.tif differ
diff --git a/autotest/gdrivers/data/ogcapi/expected_map_lough_corrib_COVERAGE.png b/autotest/gdrivers/data/ogcapi/expected_map_lough_corrib_COVERAGE.png
deleted file mode 100644
index 209a22bb6440..000000000000
Binary files a/autotest/gdrivers/data/ogcapi/expected_map_lough_corrib_COVERAGE.png and /dev/null differ
diff --git a/autotest/gdrivers/data/ogcapi/expected_map_lough_corrib_MAP.png b/autotest/gdrivers/data/ogcapi/expected_map_lough_corrib_MAP.png
deleted file mode 100644
index 12cf50b3e84f..000000000000
Binary files a/autotest/gdrivers/data/ogcapi/expected_map_lough_corrib_MAP.png and /dev/null differ
diff --git a/autotest/gdrivers/data/ogcapi/expected_map_lough_corrib_TILES.png b/autotest/gdrivers/data/ogcapi/expected_map_lough_corrib_TILES.png
deleted file mode 100644
index 9d2e18c1e63d..000000000000
Binary files a/autotest/gdrivers/data/ogcapi/expected_map_lough_corrib_TILES.png and /dev/null differ
diff --git a/autotest/gdrivers/data/ogcapi/request_api_f_json.http_data b/autotest/gdrivers/data/ogcapi/request_api_f_json.http_data
new file mode 100644
index 000000000000..79b57af00089
--- /dev/null
+++ b/autotest/gdrivers/data/ogcapi/request_api_f_json.http_data
@@ -0,0 +1,6077 @@
+HTTP/1.1 200 OK
+Date: Fri, 12 Jul 2024 14:16:47 GMT
+Server: Apache/2.4.52 (Ubuntu)
+Expires: Sat, 12 Jul 2025 13:56:54 GMT
+Access-Control-Allow-Origin: *
+Vary: Accept,Accept-Encoding,Prefer
+Content-Length: 204806
+Access-Control-Allow-Headers: x-requested-with, Content-Type, origin, authorization, acc$
+Age: 1192
+Keep-Alive: timeout=5, max=100
+Connection: Keep-Alive
+Content-Type: application/json
+
+{
+  "openapi" : "3.0.0",
+  "info" : {
+    "version" : "1.0",
+    "title" : "GNOSIS Map Server OGC API",
+    "description" : "GNOSIS Map Server",
+    "contact" : {
+      "name" : "Ecere Corporation",
+      "email" : "info@ecere.ca"
+    },
+    "license" : {
+      "name" : "OGC License",
+      "url" : "http://www.opengeospatial.org/legal/"
+    }
+  },
+  "paths" : {
+    "/" : {
+      "get" : {
+        "tags" : [ "Landing Page" ],
+        "summary" : "Retrieve the OGC API landing page for this service.",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "$ref" : "#/components/responses/LandingPage"
+          },
+          "406" : {
+            "$ref" : "#/components/responses/NotAcceptable"
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/conformance" : {
+      "get" : {
+        "tags" : [ "Conformance" ],
+        "summary" : "Retrieve the set of OGC API conformance classes that are supported by this service.",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "$ref" : "#/components/responses/ConformanceDeclaration"
+          }
+        }
+      }
+    },
+    "/collections" : {
+      "get" : {
+        "tags" : [ "Data Collections" ],
+        "summary" : "Retrieve the list of geospatial data collections available from this service.",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/datetime"
+        }, {
+          "$ref" : "#/components/parameters/limit-collections"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "$ref" : "#/components/responses/collectionsList"
+          }
+        }
+      }
+    },
+    "/collections/{collectionId}" : {
+      "get" : {
+        "tags" : [ "Data Collections" ],
+        "summary" : "Retrieve the description of a collection available from this service.",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/collectionId-all"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "$ref" : "#/components/responses/Collection"
+          }
+        }
+      }
+    },
+    "/processes" : {
+      "get" : {
+        "summary" : "Retrieve the list of available processes",
+        "description" : "A list of all available processes.",
+        "operationId" : "listProcesses",
+        "tags" : [ "Processes" ],
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Information about the available processes",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/processList"
+                }
+              }
+            }
+          },
+          "default" : {
+            "description" : "An error occured.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/processes/{processId}" : {
+      "get" : {
+        "summary" : "Retrieve a process description",
+        "operationId" : "describeProcess",
+        "tags" : [ "Processes" ],
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/processId"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "A process description.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/process"
+                },
+                "example" : {
+                  "id" : "RenderMap",
+                  "title" : "Maps rendering process",
+                  "description" : "RenderMap process",
+                  "keywords" : [ "process", "maps" ],
+                  "inputs" : [ {
+                    "id" : "layers",
+                    "title" : "layers",
+                    "description" : "The layers to render on the map",
+                    "literalDataDomain" : {
+                      "dataType" : {
+                        "name" : "array"
+                      }
+                    }
+                  }, {
+                    "id" : "bgColor",
+                    "title" : "bgColor",
+                    "description" : "The background color of the map",
+                    "literalDataDomain" : {
+                      "dataType" : {
+                        "name" : "string"
+                      },
+                      "valueDefinition" : {
+                        "defaultValue" : "000000"
+                      }
+                    }
+                  }, {
+                    "id" : "transparent",
+                    "title" : "transparent",
+                    "description" : "Whether the map's background is transparent.",
+                    "literalDataDomain" : {
+                      "dataType" : {
+                        "name" : "bool"
+                      },
+                      "valueDefinition" : {
+                        "defaultValue" : true
+                      }
+                    }
+                  } ],
+                  "outputs" : [ {
+                    "id" : "result",
+                    "title" : "result",
+                    "description" : "The rendered map"
+                  } ],
+                  "version" : 1.1,
+                  "jobControlOptions" : [ "modular-sync", "modular-deferred" ],
+                  "links" : [ {
+                    "rel" : "canonical",
+                    "href" : "https://maps.ecere.comhttp://127.0.0.1:8080/fakeogcapi/processes/RenderMap",
+                    "type" : "application/json",
+                    "title" : "Modular execution endpoint"
+                  } ]
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The process {id} does not exist.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "default" : {
+            "description" : "An error occured.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          }
+        }
+      },
+      "post" : {
+        "summary" : "Submit a processing workflow for execution",
+        "description" : "Post a workflow to set up deferred execution of it, obtaining a temporary virtual geospatial data resource (collection) with links to resources supporting GET methods for all supported execution/output retrieval mechanisms (equivalent to the modular synchronous execution end-points supported)",
+        "operationId" : "execDeferred",
+        "tags" : [ "Processes" ],
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/processId"
+        } ],
+        "requestBody" : {
+          "description" : "Mandatory execute request JSON",
+          "required" : true,
+          "content" : {
+            "application/json" : {
+              "schema" : {
+                "$ref" : "#/components/schemas/execute"
+              },
+              "examples" : {
+                "elevationContours" : {
+                  "$ref" : "#/components/examples/elevationContours"
+                },
+                "renderMap" : {
+                  "$ref" : "#/components/examples/renderMap"
+                },
+                "osmere" : {
+                  "$ref" : "#/components/examples/osmere"
+                },
+                "nestedWorkflow" : {
+                  "$ref" : "#/components/examples/nestedWorkflow"
+                },
+                "evis2" : {
+                  "$ref" : "#/components/examples/EVISentinel2"
+                },
+                "evis2-wcps" : {
+                  "$ref" : "#/components/examples/EVISentinel2-WCPS"
+                }
+              }
+            }
+          }
+        },
+        "responses" : {
+          "303" : {
+            "description" : "Successful, see other for GET-accessible resource",
+            "headers" : {
+              "Location" : {
+                "schema" : {
+                  "type" : "string"
+                },
+                "description" : "GET-accessible path for same result, which can also be used as a replacement to the /processes/{id} portion of the synchronous execution paths using GET, without having to re-submit (POST) the workflow."
+              }
+            },
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/collection"
+                }
+              },
+              "text/html" : {
+                "schema" : {
+                  "type" : "string",
+                  "format" : "binary"
+                }
+              }
+            }
+          },
+          "400" : {
+            "description" : "Invalid request",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The process {id} does not exist.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "410" : {
+            "description" : "Resource has expired",
+            "headers" : {
+              "Cache-Control" : {
+                "description" : "410 is cachable by default, but deferred execution may come back online.",
+                "schema" : {
+                  "type" : "string",
+                  "enum" : [ "no-cache" ]
+                }
+              }
+            },
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "default" : {
+            "description" : "An error occured.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/processes/{processId}/execution" : {
+      "post" : {
+        "summary" : "Submit a processing workflow for execution",
+        "description" : "Post an execution request to execute it synchronously (asynchronous support not yet implemented)",
+        "operationId" : "execSync",
+        "tags" : [ "Processes" ],
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/processId"
+        } ],
+        "requestBody" : {
+          "description" : "Mandatory execute request JSON",
+          "required" : true,
+          "content" : {
+            "application/json" : {
+              "schema" : {
+                "$ref" : "#/components/schemas/execute"
+              },
+              "examples" : {
+                "elevationContours" : {
+                  "$ref" : "#/components/examples/elevationContoursSync"
+                },
+                "renderMap" : {
+                  "$ref" : "#/components/examples/renderMapSync"
+                },
+                "osmere" : {
+                  "$ref" : "#/components/examples/osmere"
+                },
+                "nestedProcess" : {
+                  "$ref" : "#/components/examples/nestedSync"
+                }
+              }
+            }
+          }
+        },
+        "responses" : {
+          "200" : {
+            "$ref" : "#/components/responses/content-process-results"
+          },
+          "400" : {
+            "description" : "Invalid request",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The process {id} does not exist.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "default" : {
+            "description" : "An error occured.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/tileMatrixSets" : {
+      "get" : {
+        "tags" : [ "Tiling Schemes" ],
+        "summary" : "Retrieve the list of available tiling schemes (tile matrix sets)",
+        "operationId" : "listTileMatrixSets",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "List of tile matrix sets (tiling schemes).",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "type" : "object",
+                  "properties" : {
+                    "tileMatrixSets" : {
+                      "type" : "array",
+                      "items" : {
+                        "$ref" : "#/components/schemas/tileMatrixSet"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/tileMatrixSets/{tileMatrixSetId}" : {
+      "get" : {
+        "tags" : [ "Tiling Schemes" ],
+        "summary" : "Retrieve the definition of the specified tiling scheme (tile matrix set)",
+        "operationId" : "describeTileMatrixSet",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/tileMatrixSetId"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "tile matrix sets (tiling schemes).",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/tileMatrixSet"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The requested tile matrix set id was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/collections/{collectionId}/items" : {
+      "get" : {
+        "summary" : "Retrieve vector features from the specified collection.",
+        "operationId" : "getFeatures",
+        "tags" : [ "Vector Features" ],
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/collectionId-features"
+        }, {
+          "$ref" : "#/components/parameters/bbox"
+        }, {
+          "$ref" : "#/components/parameters/subset"
+        }, {
+          "$ref" : "#/components/parameters/datetime"
+        }, {
+          "$ref" : "#/components/parameters/limit-items"
+        }, {
+          "$ref" : "#/components/parameters/resultType"
+        }, {
+          "$ref" : "#/components/parameters/propertyName"
+        }, {
+           "$ref" : "#/components/parameters/filter"
+        }, {
+           "$ref" : "#/components/parameters/filter-lang"
+        }, {
+           "$ref" : "#/components/parameters/filter-crs"
+        }, {
+          "$ref" : "#/components/parameters/f-vector"
+        } ],
+        "responses" : {
+          "200" : {
+             "$ref" : "#/components/responses/content-vector"
+          },
+          "406" : {
+            "$ref" : "#/components/responses/NotAcceptable"
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/collections/{collectionId}/items/{featureId}" : {
+      "get" : {
+        "summary" : "Retrieve the specified vector feature from the specified collection.",
+        "operationId" : "getSingleFeature",
+        "tags" : [ "Vector Features" ],
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/collectionId-features"
+        }, {
+          "$ref" : "#/components/parameters/featureId"
+        }, {
+          "$ref" : "#/components/parameters/resultType"
+        }, {
+          "$ref" : "#/components/parameters/propertyName"
+        }, {
+          "$ref" : "#/components/parameters/f-vector"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "OK response",
+            "content" : {
+              "application/geo+json" : {
+                "schema" : {
+                  "type" : "object"
+                }
+              },
+              "text/html" : {
+                "schema" : {
+                  "type" : "string"
+                }
+              }
+            }
+          },
+          "406" : {
+            "$ref" : "#/components/responses/NotAcceptable"
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/processes/{processId}/items" : {
+      "post" : {
+        "summary" : "Submit a workflow for execution and retrieve the results as vector features",
+        "description" : "Post a workflow to synchronously retrieve items using MOAW extension",
+        "operationId" : "execSyncFeatures",
+        "tags" : [ "Vector Features" ],
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/processId"
+        }, {
+          "$ref" : "#/components/parameters/bbox"
+        }, {
+          "$ref" : "#/components/parameters/subset"
+        }, {
+          "$ref" : "#/components/parameters/datetime"
+        }, {
+          "$ref" : "#/components/parameters/limit-items"
+        }, {
+          "$ref" : "#/components/parameters/resultType"
+        }, {
+          "$ref" : "#/components/parameters/propertyName"
+        }, {
+           "$ref" : "#/components/parameters/filter"
+        }, {
+           "$ref" : "#/components/parameters/filter-lang"
+        }, {
+           "$ref" : "#/components/parameters/filter-crs"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "requestBody" : {
+          "description" : "Mandatory execute request JSON",
+          "required" : true,
+          "content" : {
+            "application/json" : {
+              "schema" : {
+                "$ref" : "#/components/schemas/execute"
+              },
+              "examples" : {
+                "osmere" : {
+                  "$ref" : "#/components/examples/osmere"
+                },
+                "elevationContours" : {
+                  "$ref" : "#/components/examples/elevationContours"
+                }
+              }
+            }
+          }
+        },
+        "responses" : {
+          "200" : {
+            "description" : "Successfully executed workflow and retrieved map",
+            "content" : {
+              "application/geo+json" : {
+                "schema" : {
+                  "type" : "string",
+                  "format" : "binary"
+                }
+              }
+            }
+          },
+          "400" : {
+            "description" : "Invalid request",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The process {id} does not exist.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "default" : {
+            "description" : "An error occured.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/processes/{processId}/items/{featureId}" : {
+      "post" : {
+        "summary" : "Submit a workflow for execution and retrieve a single vector feature from the results",
+        "description" : "Post a workflow to synchronously retrieve a single item using MOAW extension",
+        "operationId" : "execSyncSingleFeature",
+        "tags" : [ "Vector Features" ],
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/processId"
+        }, {
+          "$ref" : "#/components/parameters/featureId"
+        }, {
+          "$ref" : "#/components/parameters/f-vector"
+        } ],
+        "requestBody" : {
+          "description" : "Mandatory execute request JSON",
+          "required" : true,
+          "content" : {
+            "application/json" : {
+              "schema" : {
+                "$ref" : "#/components/schemas/execute"
+              },
+              "examples" : {
+                "osmere" : {
+                  "$ref" : "#/components/examples/osmere"
+                },
+                "elevationContours" : {
+                  "$ref" : "#/components/examples/elevationContours"
+                }
+              }
+            }
+          }
+        },
+        "responses" : {
+          "200" : {
+             "$ref" : "#/components/responses/content-vector"
+          },
+          "400" : {
+            "description" : "Invalid request",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The process {id} does not exist.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "default" : {
+            "description" : "An error occured.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/tiles" : {
+      "get" : {
+        "tags" : [ "Vector Tiles" ],
+        "summary" : "Retrieve a list of available vector tilesets for the dataset",
+        "operationId" : "listVectorTileSets",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "List of available tilesets.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/tilesetsList"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/tiles/{tileMatrixSetId}" : {
+      "get" : {
+        "tags" : [ "Vector Tiles" ],
+        "summary" : "Retrieve the vector tileset metadata for the whole dataset and the specified tiling scheme (tile matrix set)",
+        "operationId" : "describeVectorTileSet",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/tileMatrixSetId"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Description of the tileset.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/tileSet"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/tiles/{tileMatrixSetId}/{tileMatrix}/{tileRow}/{tileCol}" : {
+      "get" : {
+        "tags" : [ "Vector Tiles" ],
+        "summary" : "Retrieve a vector tile including one or more collections from the dataset.",
+        "operationId" : "getVectorTile",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/tileMatrixSetId"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrix"
+        }, {
+          "$ref" : "#/components/parameters/tileRow"
+        }, {
+          "$ref" : "#/components/parameters/tileCol"
+        }, {
+          "$ref" : "#/components/parameters/datetime"
+        }, {
+          "$ref" : "#/components/parameters/collections"
+        }, {
+          "$ref" : "#/components/parameters/f-vectorTile"
+        } ],
+        "responses" : {
+          "200" : {
+            "$ref" : "#/components/responses/content-vectorTile"
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/styles/{styleId}/tiles" : {
+      "get" : {
+        "tags" : [ "Vector Tiles" ],
+        "summary" : "Retrieve the list of vector tilesets intended for use with a specified style for the whole dataset ",
+        "operationId" : "listStyledVectorTilesets",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/styleId"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "List of available tilesets.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/tilesetsList"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/styles/{styleId}/tiles/{tileMatrixSetId}" : {
+      "get" : {
+        "tags" : [ "Vector Tiles" ],
+        "summary" : "Retrieve a vector tileset intended for use with a specified style of the whole dataset for the specified tiling scheme (tile matrix set)",
+        "operationId" : "describeStyledVectorTileset",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/styleId"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrixSetId"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Description of the tileset.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/tileSet"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/styles/{styleId}/tiles/{tileMatrixSetId}/{tileMatrix}/{tileRow}/{tileCol}" : {
+      "get" : {
+        "tags" : [ "Vector Tiles" ],
+        "summary" : "Retrieve vector tiles intended for use with a specified style",
+        "operationId" : "getStyledVectorTile",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/styleId"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrixSetId"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrix"
+        }, {
+          "$ref" : "#/components/parameters/tileRow"
+        }, {
+          "$ref" : "#/components/parameters/tileCol"
+        }, {
+          "$ref" : "#/components/parameters/collections"
+        }, {
+          "$ref" : "#/components/parameters/datetime"
+        }, {
+          "$ref" : "#/components/parameters/f-vectorTile"
+        } ],
+        "responses" : {
+          "200" : {
+            "$ref" : "#/components/responses/content-vectorTile"
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/collections/{collectionId}/tiles" : {
+      "get" : {
+        "tags" : [ "Vector Tiles" ],
+        "summary" : "Retrieve a list of available vector tilesets for the specified collection.",
+        "operationId" : "listCollectionVectorTilesets",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/collectionId-vectorTiles"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "List of available tilesets.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/tilesetsList"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The requested collection id was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/collections/{collectionId}/tiles/{tileMatrixSetId}" : {
+      "get" : {
+        "tags" : [ "Vector Tiles" ],
+        "summary" : "Retrieve the vector tileset metadata for the specified collection and tiling scheme (tile matrix set)",
+        "operationId" : "describeCollectionVectorTileset",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/collectionId-vectorTiles"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrixSetId"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Description of the tileset.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/tileSet"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/collections/{collectionId}/tiles/{tileMatrixSetId}/{tileMatrix}/{tileRow}/{tileCol}" : {
+      "get" : {
+        "tags" : [ "Vector Tiles" ],
+        "summary" : "Retrieve a vector tile from a collection.",
+        "operationId" : "getCollectionVectorTile",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/collectionId-vectorTiles"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrixSetId"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrix"
+        }, {
+          "$ref" : "#/components/parameters/tileRow"
+        }, {
+          "$ref" : "#/components/parameters/tileCol"
+        }, {
+          "$ref" : "#/components/parameters/datetime"
+        }, {
+          "$ref" : "#/components/parameters/f-vectorTile"
+        } ],
+        "responses" : {
+          "200" : {
+            "$ref" : "#/components/responses/content-vectorTile"
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/collections/{collectionId}/styles/{styleId}/tiles" : {
+      "get" : {
+        "tags" : [ "Vector Tiles" ],
+        "summary" : "Retrieve a list of vector tilesets for the specified collection intended for use with a specified style",
+        "operationId" : "listCollectionStyledVectorTilesets",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/collectionId-vectorTiles"
+        }, {
+          "$ref" : "#/components/parameters/styleId"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "List of available tilesets.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/tilesetsList"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/collections/{collectionId}/styles/{styleId}/tiles/{tileMatrixSetId}" : {
+      "get" : {
+        "tags" : [ "Vector Tiles" ],
+        "summary" : "Retrieve the vector tileset metadata for the specified collection, style and tiling scheme (tile matrix set).",
+        "operationId" : "describeCollectionStyledVectorTileset",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/collectionId-all"
+        }, {
+          "$ref" : "#/components/parameters/styleId"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrixSetId"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Description of the tileset.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/tileSet"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/collections/{collectionId}/styles/{styleId}/tiles/{tileMatrixSetId}/{tileMatrix}/{tileRow}/{tileCol}" : {
+      "get" : {
+        "tags" : [ "Vector Tiles" ],
+        "summary" : "Retrieve vector tiles for a specified collection, intended for use with a specified style",
+        "operationId" : "getCollectionStyledVectorTile",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/collectionId-vectorTiles"
+        }, {
+          "$ref" : "#/components/parameters/styleId"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrixSetId"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrix"
+        }, {
+          "$ref" : "#/components/parameters/tileRow"
+        }, {
+          "$ref" : "#/components/parameters/tileCol"
+        }, {
+          "$ref" : "#/components/parameters/transparent"
+        }, {
+          "$ref" : "#/components/parameters/bgcolor"
+        }, {
+          "$ref" : "#/components/parameters/f-vectorTile"
+        } ],
+        "responses" : {
+          "200" : {
+            "$ref" : "#/components/responses/content-vectorTile"
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/processes/{processId}/tiles" : {
+      "post" : {
+        "summary" : "Submit a workflow for execution and retrieve a list of the tilesets for the results ",
+        "description" : "Post a workflow to set up deferred execution of it, obtaining a list of available tilesets for the results with links to resources supporting GET methods for all supportedTiles API execution/output retrieval mechanisms  (equivalent to the modular synchronous Tiles API execution end-points supported)",
+        "operationId" : "execDeferredListVectorTilesets",
+        "tags" : [ "Vector Tiles" ],
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/processId"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "requestBody" : {
+          "description" : "Mandatory execute request JSON",
+          "required" : true,
+          "content" : {
+            "application/json" : {
+              "schema" : {
+                "$ref" : "#/components/schemas/execute"
+              },
+              "examples" : {
+                "osmere" : {
+                  "$ref" : "#/components/examples/osmere"
+                },
+                "elevationContours" : {
+                  "$ref" : "#/components/examples/elevationContours"
+                },
+                "renderMap" : {
+                  "$ref" : "#/components/examples/renderMap"
+                },
+                "nestedWorkflow" : {
+                  "$ref" : "#/components/examples/nestedWorkflow"
+                },
+                "evis2" : {
+                  "$ref" : "#/components/examples/EVISentinel2"
+                },
+                "evis2-wcps" : {
+                  "$ref" : "#/components/examples/EVISentinel2-WCPS"
+                }
+              }
+            }
+          }
+        },
+        "responses" : {
+          "303" : {
+            "description" : "Successful, see other for GET-accessible resource",
+            "headers" : {
+              "Location" : {
+                "schema" : {
+                  "type" : "string"
+                },
+                "description" : "GET-accessible path for same result, which can also be used as a replacement to the /processes/{id} portion of the synchronous execution paths using GET, without having to re-submit (POST) the workflow."
+              }
+            },
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/tilesetsList"
+                }
+              }
+            }
+          },
+          "400" : {
+            "description" : "Invalid request",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The process {id} does not exist.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "410" : {
+            "description" : "Resource has expired",
+            "headers" : {
+              "Cache-Control" : {
+                "description" : "410 is cachable by default, but deferred execution may come back online.",
+                "schema" : {
+                  "type" : "string",
+                  "enum" : [ "no-cache" ]
+                }
+              }
+            },
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "default" : {
+            "description" : "An error occured.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/processes/{processId}/tiles/{tileMatrixSetId}" : {
+      "post" : {
+        "summary" : "Submit a workflow for execution and retrieve the tileset metadata of the results for the specified tiling scheme (tile matrix set)",
+        "description" : "Post a workflow to set up deferred execution of it for the specified supported TileMatrixSet, obtaining the tileset description resource with templated links to retrieve individual tiles via GET method, as well as information such as the tile limits for each tile matrix  (equivalent to the capability available thorugh the modular synchronous Tiles API execution)",
+        "operationId" : "execDeferredDescribeVectorTileset",
+        "tags" : [ "Vector Tiles" ],
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/processId"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrixSetId"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "requestBody" : {
+          "description" : "Mandatory execute request JSON",
+          "required" : true,
+          "content" : {
+            "application/json" : {
+              "schema" : {
+                "$ref" : "#/components/schemas/execute"
+              },
+              "examples" : {
+                "osmere" : {
+                  "$ref" : "#/components/examples/osmere"
+                },
+                "elevationContours" : {
+                  "$ref" : "#/components/examples/elevationContours"
+                },
+                "renderMap" : {
+                  "$ref" : "#/components/examples/renderMap"
+                },
+                "nestedWorkflow" : {
+                  "$ref" : "#/components/examples/nestedWorkflow"
+                },
+                "evis2" : {
+                  "$ref" : "#/components/examples/EVISentinel2"
+                },
+                "evis2-wcps" : {
+                  "$ref" : "#/components/examples/EVISentinel2-WCPS"
+                }
+              }
+            }
+          }
+        },
+        "responses" : {
+          "303" : {
+            "description" : "Successful, see other for GET-accessible resource",
+            "headers" : {
+              "Location" : {
+                "schema" : {
+                  "type" : "string"
+                },
+                "description" : "GET-accessible path for same result, which can also be used as a replacement to the /processes/{id} portion of the synchronous execution paths using GET, without having to re-submit (POST) the workflow."
+              }
+            },
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/tileSet"
+                }
+              }
+            }
+          },
+          "400" : {
+            "description" : "Invalid request",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The process {id} does not exist.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "410" : {
+            "description" : "Resource has expired",
+            "headers" : {
+              "Cache-Control" : {
+                "description" : "410 is cachable by default, but deferred execution may come back online.",
+                "schema" : {
+                  "type" : "string",
+                  "enum" : [ "no-cache" ]
+                }
+              }
+            },
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "default" : {
+            "description" : "An error occured.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/processes/{processId}/tiles/{tileMatrixSetId}/{tileMatrix}/{tileRow}/{tileCol}" : {
+      "post" : {
+        "summary" : "Submit a workflow for execution and retrieve a vector tile from the results",
+        "description" : "Post a workflow to synchronously retrieve vector tiles using MOAW extension",
+        "operationId" : "execSyncGetVectorTile",
+        "tags" : [ "Vector Tiles" ],
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/processId"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrixSetId"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrix"
+        }, {
+          "$ref" : "#/components/parameters/tileRow"
+        }, {
+          "$ref" : "#/components/parameters/tileCol"
+        }, {
+          "$ref" : "#/components/parameters/f-vectorTile"
+        } ],
+        "requestBody" : {
+          "description" : "Mandatory execute request JSON",
+          "required" : true,
+          "content" : {
+            "application/json" : {
+              "schema" : {
+                "$ref" : "#/components/schemas/execute"
+              },
+              "examples" : {
+                "osmere" : {
+                  "$ref" : "#/components/examples/osmere"
+                },
+                "elevationContours" : {
+                  "$ref" : "#/components/examples/elevationContours"
+                },
+                "renderMap" : {
+                  "$ref" : "#/components/examples/renderMap"
+                },
+                "nestedWorkflow" : {
+                  "$ref" : "#/components/examples/nestedWorkflow"
+                },
+                "evis2" : {
+                  "$ref" : "#/components/examples/EVISentinel2"
+                },
+                "evis2-wcps" : {
+                  "$ref" : "#/components/examples/EVISentinel2-WCPS"
+                }
+              }
+            }
+          }
+        },
+        "responses" : {
+          "200" : {
+               "$ref" : "#/components/responses/content-vectorTile"
+          },
+          "400" : {
+            "description" : "Invalid request",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The process id does not exist.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "default" : {
+            "description" : "An error occured.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/collections/{collectionId}/coverage" : {
+      "get" : {
+        "tags" : [ "Coverages" ],
+        "operationId" : "getCoverage",
+        "summary" : "Retrieve coverage data from a collection.",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/collectionId-coverage"
+        }, {
+          "$ref" : "#/components/parameters/subset"
+        }, {
+          "$ref" : "#/components/parameters/scaleFactor"
+        }, {
+          "$ref" : "#/components/parameters/scaleAxes"
+        }, {
+          "$ref" : "#/components/parameters/scaleSize"
+        }, {
+          "$ref" : "#/components/parameters/bbox"
+        }, {
+          "$ref" : "#/components/parameters/f-coverage"
+        } ],
+        "responses" : {
+          "200" : {
+            "$ref" : "#/components/responses/content-coverage"
+          },
+          "406" : {
+            "$ref" : "#/components/responses/NotAcceptable"
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/collections/{collectionId}/coverage/domainset" : {
+      "get" : {
+        "tags" : [ "Coverages" ],
+        "operationId" : "getCoverageDomainSet",
+        "summary" : "Retrieve the domain set of the coverage for the specified collection.",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/collectionId-coverage"
+        }, {
+          "$ref" : "#/components/parameters/subset"
+        }, {
+          "$ref" : "#/components/parameters/scaleFactor"
+        }, {
+          "$ref" : "#/components/parameters/scaleAxes"
+        }, {
+          "$ref" : "#/components/parameters/scaleSize"
+        }, {
+          "$ref" : "#/components/parameters/bbox"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "$ref" : "#/components/responses/DomainSet"
+          },
+          "406" : {
+            "$ref" : "#/components/responses/NotAcceptable"
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/collections/{collectionId}/coverage/rangetype" : {
+      "get" : {
+        "tags" : [ "Coverages" ],
+        "operationId" : "getCoverageRangeType",
+        "summary" : "Retrieve the range type of the coverage for the specified collection.",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/collectionId-coverage"
+        }, {
+          "$ref" : "#/components/parameters/subset"
+        }, {
+          "$ref" : "#/components/parameters/scaleFactor"
+        }, {
+          "$ref" : "#/components/parameters/scaleAxes"
+        }, {
+          "$ref" : "#/components/parameters/scaleSize"
+        }, {
+          "$ref" : "#/components/parameters/bbox"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "$ref" : "#/components/responses/RangeType"
+          },
+          "406" : {
+            "$ref" : "#/components/responses/NotAcceptable"
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/processes/{processId}/coverage" : {
+      "post" : {
+        "summary" : "Submit a workflow for execution and retrieve the results as a coverage",
+        "description" : "Post a workflow to synchronously retrieve coverage data using MOAW extension",
+        "operationId" : "execSyncGetCoverage",
+        "tags" : [ "Coverages" ],
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/processId"
+        }, {
+          "$ref" : "#/components/parameters/f-coverage"
+        } ],
+        "requestBody" : {
+          "description" : "Mandatory execute request JSON",
+          "required" : true,
+          "content" : {
+            "application/json" : {
+              "schema" : {
+                "$ref" : "#/components/schemas/execute"
+              },
+              "examples" : {
+                "EVISentinel2" : {
+                  "$ref" : "#/components/examples/EVISentinel2"
+                },
+                "EVISentinel2-WCPS" : {
+                  "$ref" : "#/components/examples/EVISentinel2-WCPS"
+                }
+              }
+            }
+          }
+        },
+        "responses" : {
+          "200" : {
+             "$ref" : "#/components/responses/content-coverage"
+          },
+          "400" : {
+            "description" : "Invalid request",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The process {id} does not exist.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "default" : {
+            "description" : "An error occured.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/collections/{collectionId}/coverage/tiles" : {
+      "get" : {
+        "tags" : [ "Coverage Tiles" ],
+        "operationId" : "listCollectionCoverageTileSets",
+        "summary" : "Retrieve the list of available coverage tilesets for the specified collection.",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/collectionId-coverage"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "List of available tilesets.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/tilesetsList"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The requested collection id was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/collections/{collectionId}/coverage/tiles/{tileMatrixSetId}" : {
+      "get" : {
+        "tags" : [ "Coverage Tiles" ],
+        "operationId" : "describeCollectionCoverageTileSet",
+        "summary" : "Retrieve the coverage tileset metadata for the specified collection and tiling scheme (tile matrix set)",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/collectionId-coverage"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrixSetId"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Description of the tileset.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/tileSet"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/collections/{collectionId}/coverage/tiles/{tileMatrixSetId}/{tileMatrix}/{tileRow}/{tileCol}" : {
+      "get" : {
+        "tags" : [ "Coverage Tiles" ],
+        "operationId" : "getCollectionCoverageTile",
+        "summary" : "Retrieve a coverage tile",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/collectionId-coverage"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrixSetId"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrix"
+        }, {
+          "$ref" : "#/components/parameters/tileRow"
+        }, {
+          "$ref" : "#/components/parameters/tileCol"
+        }, {
+          "$ref" : "#/components/parameters/datetime"
+        }, {
+          "$ref" : "#/components/parameters/f-coverageTile"
+        } ],
+        "responses" : {
+          "200" : {
+            "$ref" : "#/components/responses/content-coverageTile"
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/processes/{processId}/coverage/tiles" : {
+      "post" : {
+        "summary" : "Submit a workflow for execution and retrieve the list of resulting coverage tilesets",
+        "description" : "Post a workflow to set up deferred execution of it, obtaining a list of available map tilesets for the results with links to resources supporting GET methods for all supported combined Map Tiles API execution/output retrieval mechanisms (equivalent to the modular synchronous Map Tiles API execution end-points supported)",
+        "tags" : [ "Coverage Tiles" ],
+        "operationId" : "execDeferredListCoverageTileSets",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/processId"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "requestBody" : {
+          "description" : "Mandatory execute request JSON",
+          "required" : true,
+          "content" : {
+            "application/json" : {
+              "schema" : {
+                "$ref" : "#/components/schemas/execute"
+              },
+              "examples" : {
+                "renderMap" : {
+                  "$ref" : "#/components/examples/renderMap"
+                },
+                "nestedWorkflow" : {
+                  "$ref" : "#/components/examples/nestedWorkflow"
+                },
+                "evis2" : {
+                  "$ref" : "#/components/examples/EVISentinel2"
+                },
+                "evis2-wcps" : {
+                  "$ref" : "#/components/examples/EVISentinel2-WCPS"
+                }
+              }
+            }
+          }
+        },
+        "responses" : {
+          "303" : {
+            "description" : "Successful, see other for GET-accessible resource",
+            "headers" : {
+              "Location" : {
+                "schema" : {
+                  "type" : "string"
+                },
+                "description" : "GET-accessible path for same result, which can also be used as a replacement to the /processes/{id} portion of the synchronous execution paths using GET, without having to re-submit (POST) the workflow."
+              }
+            },
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/tilesetsList"
+                }
+              }
+            }
+          },
+          "400" : {
+            "description" : "Invalid request",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The process {id} does not exist.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "410" : {
+            "description" : "Resource has expired",
+            "headers" : {
+              "Cache-Control" : {
+                "description" : "410 is cachable by default, but deferred execution may come back online.",
+                "schema" : {
+                  "type" : "string",
+                  "enum" : [ "no-cache" ]
+                }
+              }
+            },
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "default" : {
+            "description" : "An error occured.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/processes/{processId}/coverage/tiles/{tileMatrixSetId}" : {
+      "post" : {
+        "summary" : "Submit a workflow for deferred execution and retrieve the coverage tileset metadata for the results and the specified tiling scheme (tile matrix set)",
+        "description" : "Post a workflow to set up deferred execution of it for the specified supported TileMatrixSet, obtaining the tileset description resource with templated links to retrieve individual tiles via GET method, as well as information such as the tile limits for each tile matrix  (equivalent to the capability available thorugh the modular synchronous Tiles API execution)",
+        "tags" : [ "Coverage Tiles" ],
+        "operationId" : "execDeferredDescribeCoverageTileSet",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/processId"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrixSetId"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "requestBody" : {
+          "description" : "Mandatory execute request JSON",
+          "required" : true,
+          "content" : {
+            "application/json" : {
+              "schema" : {
+                "$ref" : "#/components/schemas/execute"
+              },
+              "examples" : {
+                "renderMap" : {
+                  "$ref" : "#/components/examples/renderMap"
+                },
+                "nestedWorkflow" : {
+                  "$ref" : "#/components/examples/nestedWorkflow"
+                },
+                "evis2" : {
+                  "$ref" : "#/components/examples/EVISentinel2"
+                },
+                "evis2-wcps" : {
+                  "$ref" : "#/components/examples/EVISentinel2-WCPS"
+                }
+              }
+            }
+          }
+        },
+        "responses" : {
+          "303" : {
+            "description" : "Successful, see other for GET-accessible resource",
+            "headers" : {
+              "Location" : {
+                "schema" : {
+                  "type" : "string"
+                },
+                "description" : "GET-accessible path for same result, which can also be used as a replacement to the /processes/{id} portion of the synchronous execution paths using GET, without having to re-submit (POST) the workflow."
+              }
+            },
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/tileSet"
+                }
+              }
+            }
+          },
+          "400" : {
+            "description" : "Invalid request",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The process {id} does not exist.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "410" : {
+            "description" : "Resource has expired",
+            "headers" : {
+              "Cache-Control" : {
+                "description" : "410 is cachable by default, but deferred execution may come back online.",
+                "schema" : {
+                  "type" : "string",
+                  "enum" : [ "no-cache" ]
+                }
+              }
+            },
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "default" : {
+            "description" : "An error occured.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/processes/{processId}/coverage/tiles/{tileMatrixSetId}/{tileMatrix}/{tileRow}/{tileCol}" : {
+      "post" : {
+        "summary" : "Submit a workflow for execution and retrieve a single coverage tile of the results.",
+        "description" : "Post a workflow to synchronously retrieve coverage tiles using MOAW extension",
+        "tags" : [ "Coverage Tiles" ],
+        "operationId" : "execSyncGetCoverageTile",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/processId"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrixSetId"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrix"
+        }, {
+          "$ref" : "#/components/parameters/tileRow"
+        }, {
+          "$ref" : "#/components/parameters/tileCol"
+        }, {
+          "$ref" : "#/components/parameters/f-coverageTile"
+        } ],
+        "requestBody" : {
+          "description" : "Mandatory execute request JSON",
+          "required" : true,
+          "content" : {
+            "application/json" : {
+              "schema" : {
+                "$ref" : "#/components/schemas/execute"
+              },
+              "examples" : {
+                "renderMap" : {
+                  "$ref" : "#/components/examples/renderMap"
+                },
+                "nestedWorkflow" : {
+                  "$ref" : "#/components/examples/nestedWorkflow"
+                },
+                "evis2" : {
+                  "$ref" : "#/components/examples/EVISentinel2"
+                },
+                "evis2-wcps" : {
+                  "$ref" : "#/components/examples/EVISentinel2-WCPS"
+                }
+              }
+            }
+          }
+        },
+        "responses" : {
+          "200" : {
+            "$ref" : "#/components/responses/content-coverageTile"
+          },
+          "400" : {
+            "description" : "Invalid request",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The process id does not exist.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "default" : {
+            "description" : "An error occured.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/map" : {
+      "get" : {
+        "tags" : [ "Maps" ],
+        "summary" : "Retrieve a default map for the whole dataset",
+        "operationId" : "getMap",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/bbox"
+        }, {
+          "$ref" : "#/components/parameters/datetime"
+        }, {
+          "$ref" : "#/components/parameters/subset"
+        }, {
+          "$ref" : "#/components/parameters/transparent"
+        }, {
+          "$ref" : "#/components/parameters/bgcolor"
+        }, {
+          "$ref" : "#/components/parameters/f-map"
+        } ],
+        "responses" : {
+          "200" : {
+            "$ref" : "#/components/responses/content-map"
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/styles/{styleId}/map" : {
+      "get" : {
+        "tags" : [ "Maps" ],
+        "summary" : "Retrieve a map of the specified style for the whole dataset",
+        "operationId" : "getStyledMap",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/styleId"
+        }, {
+          "$ref" : "#/components/parameters/bbox"
+        }, {
+          "$ref" : "#/components/parameters/datetime"
+        }, {
+          "$ref" : "#/components/parameters/subset"
+        }, {
+          "$ref" : "#/components/parameters/transparent"
+        }, {
+          "$ref" : "#/components/parameters/bgcolor"
+        }, {
+          "$ref" : "#/components/parameters/f-map"
+        } ],
+        "responses" : {
+          "200" : {
+            "$ref" : "#/components/responses/content-map"
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/collections/{collectionId}/map" : {
+      "get" : {
+        "tags" : [ "Maps" ],
+        "summary" : "Retrieve the default map for the specified collection",
+        "operationId" : "getCollectionMap",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/collectionId-all"
+        }, {
+          "$ref" : "#/components/parameters/bbox"
+        }, {
+          "$ref" : "#/components/parameters/datetime"
+        }, {
+          "$ref" : "#/components/parameters/subset"
+        }, {
+          "$ref" : "#/components/parameters/transparent"
+        }, {
+          "$ref" : "#/components/parameters/bgcolor"
+        }, {
+          "$ref" : "#/components/parameters/f-map"
+        } ],
+        "responses" : {
+          "200" : {
+            "$ref" : "#/components/responses/content-map"
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/collections/{collectionId}/styles/{styleId}/map" : {
+      "get" : {
+        "tags" : [ "Maps" ],
+        "summary" : "Retrieve a map of the specified collection and style",
+        "operationId" : "getCollectionStyledMap",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/collectionId-all"
+        }, {
+          "$ref" : "#/components/parameters/styleId"
+        }, {
+          "$ref" : "#/components/parameters/bbox"
+        }, {
+          "$ref" : "#/components/parameters/datetime"
+        }, {
+          "$ref" : "#/components/parameters/subset"
+        }, {
+          "$ref" : "#/components/parameters/transparent"
+        }, {
+          "$ref" : "#/components/parameters/bgcolor"
+        }, {
+          "$ref" : "#/components/parameters/f-map"
+        } ],
+        "responses" : {
+          "200" : {
+            "$ref" : "#/components/responses/content-map"
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/processes/{processId}/map" : {
+      "post" : {
+        "summary" : "Submit a workflow for execution and retrieve the results as a map",
+        "description" : "Post a workflow to set up deferred execution of it, obtaining a link to a map resource for the results supporting GET methods for all supported Maps API execution/output retrieval mechanisms (equivalent to the modular synchronous Maps API execution end-points supported)",
+        "operationId" : "execSyncGetMap",
+        "tags" : [ "Maps" ],
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/processId"
+        }, {
+          "$ref" : "#/components/parameters/bbox"
+        }, {
+          "$ref" : "#/components/parameters/datetime"
+        }, {
+          "$ref" : "#/components/parameters/subset"
+        }, {
+          "$ref" : "#/components/parameters/transparent"
+        }, {
+          "$ref" : "#/components/parameters/bgcolor"
+        }, {
+          "$ref" : "#/components/parameters/f-map"
+        } ],
+        "requestBody" : {
+          "description" : "Mandatory execute request JSON",
+          "required" : true,
+          "content" : {
+            "application/json" : {
+              "schema" : {
+                "$ref" : "#/components/schemas/execute"
+              },
+              "examples" : {
+                "elevationContours" : {
+                  "$ref" : "#/components/examples/elevationContours"
+                },
+                "osmere" : {
+                  "$ref" : "#/components/examples/osmere"
+                },
+                "renderMap" : {
+                  "$ref" : "#/components/examples/renderMap"
+                },
+                "nestedWorkflow" : {
+                  "$ref" : "#/components/examples/nestedWorkflow"
+                },
+                "evis2" : {
+                  "$ref" : "#/components/examples/EVISentinel2"
+                },
+                "evis2-wcps" : {
+                  "$ref" : "#/components/examples/EVISentinel2-WCPS"
+                }
+              }
+            }
+          }
+        },
+        "responses" : {
+          "303" : {
+            "$ref" : "#/components/responses/content-map"
+          },
+          "400" : {
+            "description" : "Invalid request",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The process {id} does not exist.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "410" : {
+            "description" : "Resource has expired",
+            "headers" : {
+              "Cache-Control" : {
+                "description" : "410 is cachable by default, but deferred execution may come back online.",
+                "schema" : {
+                  "type" : "string",
+                  "enum" : [ "no-cache" ]
+                }
+              }
+            },
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "default" : {
+            "description" : "An error occured.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/map/tiles" : {
+      "get" : {
+        "tags" : [ "Map Tiles" ],
+        "summary" : "Retrieve the list of all default map tilesets for the whole dataset",
+        "operationId" : "listMapTileSets",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "List of available tilesets.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/tilesetsList"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/map/tiles/{tileMatrixSetId}" : {
+      "get" : {
+        "tags" : [ "Map Tiles" ],
+        "summary" : "Retrieve a default map tileset of the whole dataset for the specified tiling scheme (tile matrix set)",
+        "operationId" : "describeMapTileSet",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/tileMatrixSetId"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Description of the tileset.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/tileSet"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/map/tiles/{tileMatrixSetId}/{tileMatrix}/{tileRow}/{tileCol}" : {
+      "get" : {
+        "tags" : [ "Map Tiles" ],
+        "summary" : "Retrieve a default map tile of the whole dataset",
+        "operationId" : "getMapTile",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/tileMatrixSetId"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrix"
+        }, {
+          "$ref" : "#/components/parameters/tileRow"
+        }, {
+          "$ref" : "#/components/parameters/tileCol"
+        }, {
+          "$ref" : "#/components/parameters/collections"
+        }, {
+          "$ref" : "#/components/parameters/transparent"
+        }, {
+          "$ref" : "#/components/parameters/bgcolor"
+        }, {
+          "$ref" : "#/components/parameters/f-mapTile"
+        } ],
+        "responses" : {
+          "200" : {
+            "$ref" : "#/components/responses/content-mapTile"
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/styles/{styleId}/map/tiles" : {
+      "get" : {
+        "tags" : [ "Map Tiles" ],
+        "summary" : "Retrieve the list of styled map tilesets for the whole dataset ",
+        "operationId" : "listStyledMapTileSets",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/styleId"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "List of available tilesets.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/tilesetsList"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/styles/{styleId}/map/tiles/{tileMatrixSetId}" : {
+      "get" : {
+        "tags" : [ "Map Tiles" ],
+        "summary" : "Retrieve a styled map tileset of the whole dataset for the specified tiling scheme (tile matrix set)",
+        "operationId" : "describeStyledMapTileSet",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/styleId"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrixSetId"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Description of the tileset.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/tileSet"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/styles/{styleId}/map/tiles/{tileMatrixSetId}/{tileMatrix}/{tileRow}/{tileCol}" : {
+      "get" : {
+        "tags" : [ "Map Tiles" ],
+        "summary" : "Retrieve a styled map tiles",
+        "operationId" : "getStyledMapTile",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/styleId"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrixSetId"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrix"
+        }, {
+          "$ref" : "#/components/parameters/tileRow"
+        }, {
+          "$ref" : "#/components/parameters/tileCol"
+        }, {
+          "$ref" : "#/components/parameters/collections"
+        }, {
+          "$ref" : "#/components/parameters/datetime"
+        }, {
+          "$ref" : "#/components/parameters/transparent"
+        }, {
+          "$ref" : "#/components/parameters/bgcolor"
+        }, {
+          "$ref" : "#/components/parameters/f-mapTile"
+        } ],
+        "responses" : {
+          "200" : {
+            "$ref" : "#/components/responses/content-mapTile"
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/collections/{collectionId}/map/tiles" : {
+      "get" : {
+        "tags" : [ "Map Tiles" ],
+        "summary" : "Retrieve a list of all map tilesets for specified collection.",
+        "operationId" : "listCollectionMapTileSets",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/collectionId-all"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "List of available tilesets.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/tilesetsList"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/collections/{collectionId}/map/tiles/{tileMatrixSetId}" : {
+      "get" : {
+        "tags" : [ "Map Tiles" ],
+        "summary" : "Retrieve a map tile set metadata for the specified collection and tiling scheme (tile matrix set)^",
+        "operationId" : "describeCollectionMapTileSet",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/collectionId-all"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrixSetId"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Description of the tileset.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/tileSet"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/collections/{collectionId}/map/tiles/{tileMatrixSetId}/{tileMatrix}/{tileRow}/{tileCol}" : {
+      "get" : {
+        "tags" : [ "Map Tiles" ],
+        "summary" : "Retrieve a map tile from the specified collection",
+        "operationId" : "getCollectionMapTile",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/collectionId-all"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrixSetId"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrix"
+        }, {
+          "$ref" : "#/components/parameters/tileRow"
+        }, {
+          "$ref" : "#/components/parameters/tileCol"
+        }, {
+          "$ref" : "#/components/parameters/transparent"
+        }, {
+          "$ref" : "#/components/parameters/bgcolor"
+        }, {
+          "$ref" : "#/components/parameters/f-mapTile"
+        } ],
+        "responses" : {
+          "200" : {
+            "$ref" : "#/components/responses/content-mapTile"
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/collections/{collectionId}/styles/{styleId}/map/tiles" : {
+      "get" : {
+        "tags" : [ "Map Tiles" ],
+        "summary" : "Retrieve a list of styled map tilesets for the specified collection",
+        "operationId" : "listCollectionStyledMapTileSets",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/collectionId-all"
+        }, {
+          "$ref" : "#/components/parameters/styleId"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "List of available tilesets.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/tilesetsList"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/collections/{collectionId}/styles/{styleId}/map/tiles/{tileMatrixSetId}" : {
+      "get" : {
+        "tags" : [ "Map Tiles" ],
+        "summary" : "Retrieve the map tileset metadata for the specified collection, style and tiling scheme (tile matrix set).",
+        "operationId" : "describeCollectionStyledMapTileSet",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/collectionId-all"
+        }, {
+          "$ref" : "#/components/parameters/styleId"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrixSetId"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Description of the tileset.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/tileSet"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/collections/{collectionId}/styles/{styleId}/map/tiles/{tileMatrixSetId}/{tileMatrix}/{tileRow}/{tileCol}" : {
+      "get" : {
+        "tags" : [ "Map Tiles" ],
+        "summary" : "Retrieve a map tile for a specified collection and style",
+        "operationId" : "getCollectionStyledMapTile",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/collectionId-all"
+        }, {
+          "$ref" : "#/components/parameters/styleId"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrixSetId"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrix"
+        }, {
+          "$ref" : "#/components/parameters/tileRow"
+        }, {
+          "$ref" : "#/components/parameters/tileCol"
+        }, {
+          "$ref" : "#/components/parameters/transparent"
+        }, {
+          "$ref" : "#/components/parameters/bgcolor"
+        }, {
+          "$ref" : "#/components/parameters/f-mapTile"
+        } ],
+        "responses" : {
+          "200" : {
+            "$ref" : "#/components/responses/content-mapTile"
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/processes/{processId}/map/tiles" : {
+      "post" : {
+        "summary" : "Submit a workflow for execution and retrieve the list of resulting map tilesets",
+        "operationId" : "execDeferredListMapTileSets",
+        "tags" : [ "Map Tiles" ],
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/processId"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "requestBody" : {
+          "description" : "Mandatory execute request JSON",
+          "required" : true,
+          "content" : {
+            "application/json" : {
+              "schema" : {
+                "$ref" : "#/components/schemas/execute"
+              },
+              "examples" : {
+                "elevationContours" : {
+                  "$ref" : "#/components/examples/elevationContours"
+                },
+                "osmere" : {
+                  "$ref" : "#/components/examples/osmere"
+                },
+                "renderMap" : {
+                  "$ref" : "#/components/examples/renderMap"
+                },
+                "nestedWorkflow" : {
+                  "$ref" : "#/components/examples/nestedWorkflow"
+                },
+                "evis2" : {
+                  "$ref" : "#/components/examples/EVISentinel2"
+                },
+                "evis2-wcps" : {
+                  "$ref" : "#/components/examples/EVISentinel2-WCPS"
+                }
+              }
+            }
+          }
+        },
+        "responses" : {
+          "303" : {
+            "description" : "Successful, see other for GET-accessible resource",
+            "headers" : {
+              "Location" : {
+                "schema" : {
+                  "type" : "string"
+                },
+                "description" : "GET-accessible path for same result, which can also be used as a replacement to the /processes/{id} portion of the synchronous execution paths using GET, without having to re-submit (POST) the workflow."
+              }
+            },
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/tilesetsList"
+                }
+              }
+            }
+          },
+          "400" : {
+            "description" : "Invalid request",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The process {id} does not exist.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "410" : {
+            "description" : "Resource has expired",
+            "headers" : {
+              "Cache-Control" : {
+                "description" : "410 is cachable by default, but deferred execution may come back online.",
+                "schema" : {
+                  "type" : "string",
+                  "enum" : [ "no-cache" ]
+                }
+              }
+            },
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "default" : {
+            "description" : "An error occured.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/processes/{processId}/map/tiles/{tileMatrixSetId}" : {
+      "post" : {
+        "summary" : "Submit a workflow for execution and retrieve the map tileset metadata for a specified tiling scheme (tile matrix set)",
+        "description" : "Post a workflow to set up deferred execution of it for the specified supported TileMatrixSet, obtaining the map tileset description resource with templated links to retrieve individual map tiles via GET method, as well as information such as the tile limits for each tile matrix  (equivalent to the capability available through the modular synchronous Tiles API execution)",
+        "operationId" : "execDeferredDescribeMapTileSet",
+        "tags" : [ "Map Tiles" ],
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/processId"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrixSetId"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "requestBody" : {
+          "description" : "Mandatory execute request JSON",
+          "required" : true,
+          "content" : {
+            "application/json" : {
+              "schema" : {
+                "$ref" : "#/components/schemas/execute"
+              },
+              "examples" : {
+                "elevationContours" : {
+                  "$ref" : "#/components/examples/elevationContours"
+                },
+                "osmere" : {
+                  "$ref" : "#/components/examples/osmere"
+                },
+                "renderMap" : {
+                  "$ref" : "#/components/examples/renderMap"
+                },
+                "nestedWorkflow" : {
+                  "$ref" : "#/components/examples/nestedWorkflow"
+                },
+                "evis2" : {
+                  "$ref" : "#/components/examples/EVISentinel2"
+                },
+                "evis2-wcps" : {
+                  "$ref" : "#/components/examples/EVISentinel2-WCPS"
+                }
+              }
+            }
+          }
+        },
+        "responses" : {
+          "303" : {
+            "description" : "Successful, see other for GET-accessible resource",
+            "headers" : {
+              "Location" : {
+                "schema" : {
+                  "type" : "string"
+                },
+                "description" : "GET-accessible path for same result, which can also be used as a replacement to the /processes/{id} portion of the synchronous execution paths using GET, without having to re-submit (POST) the workflow."
+              }
+            },
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/tileSet"
+                }
+              }
+            }
+          },
+          "400" : {
+            "description" : "Invalid request",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The process {id} does not exist.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "410" : {
+            "description" : "Resource has expired",
+            "headers" : {
+              "Cache-Control" : {
+                "description" : "410 is cachable by default, but deferred execution may come back online.",
+                "schema" : {
+                  "type" : "string",
+                  "enum" : [ "no-cache" ]
+                }
+              }
+            },
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "default" : {
+            "description" : "An error occured.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/processes/{processId}/map/tiles/{tileMatrixSetId}/{tileMatrix}/{tileRow}/{tileCol}" : {
+      "post" : {
+        "summary" : "Submit a workflow for execution and retrieve a map tile of the results",
+        "description" : "Post a workflow to synchronously retrieve map tiles using MOAW extension",
+        "operationId" : "execSyncGetMapTile",
+        "tags" : [ "Map Tiles" ],
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/processId"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrixSetId"
+        }, {
+          "$ref" : "#/components/parameters/tileMatrix"
+        }, {
+          "$ref" : "#/components/parameters/tileRow"
+        }, {
+          "$ref" : "#/components/parameters/tileCol"
+        }, {
+          "$ref" : "#/components/parameters/datetime"
+        }, {
+          "$ref" : "#/components/parameters/transparent"
+        }, {
+          "$ref" : "#/components/parameters/bgcolor"
+        }, {
+          "$ref" : "#/components/parameters/f-mapTile"
+        } ],
+        "requestBody" : {
+          "description" : "Mandatory execute request JSON",
+          "required" : true,
+          "content" : {
+            "application/json" : {
+              "schema" : {
+                "$ref" : "#/components/schemas/execute"
+              },
+              "examples" : {
+                "elevationContours" : {
+                  "$ref" : "#/components/examples/elevationContours"
+                },
+                "osmere" : {
+                  "$ref" : "#/components/examples/osmere"
+                },
+                "renderMap" : {
+                  "$ref" : "#/components/examples/renderMap"
+                },
+                "nestedWorkflow" : {
+                  "$ref" : "#/components/examples/nestedWorkflow"
+                },
+                "evis2" : {
+                  "$ref" : "#/components/examples/EVISentinel2"
+                },
+                "evis2-wcps" : {
+                  "$ref" : "#/components/examples/EVISentinel2-WCPS"
+                }
+              }
+            }
+          }
+        },
+        "responses" : {
+          "200" : {
+            "$ref" : "#/components/responses/content-mapTile"
+          },
+          "400" : {
+            "description" : "Invalid request",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The process {id} does not exist.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "default" : {
+            "description" : "An error occured.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/styles" : {
+      "get" : {
+        "tags" : [ "Styles" ],
+        "summary" : "Retrieve information about the available styles",
+        "operationId" : "listStyles",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "the set of available styles",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/stylesList"
+                }
+              }
+            }
+          },
+          "400" : {
+            "description" : "invalid or unknown query parameters"
+          },
+          "406" : {
+            "description" : "The media types accepted by the client are not \nsupported for this resource"
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/styles/{styleId}" : {
+      "get" : {
+        "tags" : [ "Styles" ],
+        "summary" : "Retrieve a style by id",
+        "operationId" : "getStyle",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/styleId"
+        }, {
+          "$ref" : "#/components/parameters/f-style"
+        } ],
+        "responses" : {
+          "200" : {
+            "$ref" : "#/components/responses/response-style"
+          },
+          "404" : {
+            "description" : "style not found"
+          },
+          "406" : {
+            "description" : "The requested style encoding is not supported \nfor this style"
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/collections/{collectionId}/styles" : {
+      "get" : {
+        "tags" : [ "Styles" ],
+        "summary" : "Retrieve a list of styles for the specified collection",
+        "operationId" : "listCollectionStyles",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/collectionId-all"
+        }, {
+          "$ref" : "#/components/parameters/f-metadata"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "List of styles for the specified collection.",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/stylesList"
+                }
+              }
+            }
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    },
+    "/collections/{collectionId}/styles/{styleId}" : {
+      "get" : {
+        "tags" : [ "Styles" ],
+        "summary" : "Retrieve the specified style for a particular collection",
+        "operationId" : "getCollectionStyle",
+        "parameters" : [ {
+          "$ref" : "#/components/parameters/collectionId-all"
+        }, {
+          "$ref" : "#/components/parameters/styleId"
+        }, {
+          "$ref" : "#/components/parameters/f-style"
+        } ],
+        "responses" : {
+          "200" : {
+             "$ref" : "#/components/responses/response-style"
+          },
+          "404" : {
+            "description" : "The requested URI was not found",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/exception"
+                }
+              }
+            }
+          },
+          "500" : {
+            "$ref" : "#/components/responses/ServerError"
+          }
+        }
+      }
+    }
+  },
+  "components" : {
+    "examples" : {
+      "renderMap" : {
+        "summary" : "A sample RenderMap execution (Workflows)",
+        "value" : {
+          "id" : "SampleRenderMapExecution",
+          "process" : "https://maps.ecere.comhttp://127.0.0.1:8080/fakeogcapi/processes/RenderMap",
+          "inputs" : {
+            "transparent": false,
+            "bgColor" : "002040",
+            "layers": [
+              { "collection" : "https://maps.ecere.comhttp://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:bathymetry" },
+              { "collection" : "https://maps.ecere.comhttp://127.0.0.1:8080/fakeogcapi/collections/SRTM_ViewFinderPanorama" }
+            ]
+          }
+        }
+      },
+      "renderMapSync" : {
+        "summary" : "A sample RenderMap execution",
+        "value" : {
+         "process" : "https://maps.ecere.com/processes/RenderMap",
+         "inputs" : {
+            "background" : "navy",
+            "transparent" : false,
+            "layers" : [
+                  { "href" : "https://maps.ecere.comhttp://127.0.0.1:8080/fakeogcapi/collections/SRTM_ViewFinderPanorama/coverage?subset=Lat(0:45),Lon(0:45)&scaleFactor=128&f=image/tiff" }
+            ]
+         }
+        }
+      },
+      "elevationContours" : {
+        "summary" : "Generate contours from elevation data (Workflows)",
+        "value" : {
+          "id" : "SampleElevationContoursExecution",
+          "process" : "https://maps.ecere.comhttp://127.0.0.1:8080/fakeogcapi/processes/ElevationContours",
+          "inputs" : {
+            "data": { "collection" : "https://maps.ecere.comhttp://127.0.0.1:8080/fakeogcapi/collections/SRTM_ViewFinderPanorama" },
+            "distance": 1000
+          }
+        }
+      },
+      "elevationContoursSync" : {
+        "summary" : "Generate contours from elevation data",
+        "value" : {
+           "process" : "https://maps.ecere.comhttp://127.0.0.1:8080/fakeogcapi/processes/ElevationContours",
+           "inputs" : {
+             "data" : { "href" : "https://maps.ecere.comhttp://127.0.0.1:8080/fakeogcapi/collections/SRTM_ViewFinderPanorama/coverage?subset=Lat(0:45),Lon(0:45)&scaleFactor=128&f=image/tiff" },
+             "distance" : 1000,
+             "minHeight" : -11000,
+             "maxHeight" : 9000,
+             "geometryType" : "lines"
+           }
+        }
+      },
+      "osmere" : {
+         "summary" : "Compute a route in Washington D.C.",
+         "value" : {
+            "process" : "https://maps.ecere.comhttp://127.0.0.1:8080/fakeogcapi/processes/OSMERE",
+            "inputs" : {
+               "dataset" : "dc",
+               "preference" : "fastest",
+               "mode" : "motor",
+               "waypoints" : { "value" : {
+                  "type" : "MultiPoint",
+                  "coordinates" : [
+                     [ -77.047712, 38.892346 ],
+                     [ -76.99473, 38.902629 ]
+                  ]
+               } }
+            }
+         }
+      },
+      "nestedSync" : {
+         "summary" : "Example workflow with nested processing",
+         "value" : {
+            "process" : "https://maps.ecere.comhttp://127.0.0.1:8080/fakeogcapi/processes/RenderMap",
+            "inputs" : {
+               "background" : "gray",
+               "transparent" : false,
+               "layers" : [
+                  { "href" : "https://maps.ecere.comhttp://127.0.0.1:8080/fakeogcapi/collections/osm:dc/map.tif?width=2458" },
+                  {
+                     "process" : "https://maps.ecere.comhttp://127.0.0.1:8080/fakeogcapi/processes/OSMERE",
+                     "inputs" : {
+                        "dataset" : "dc",
+                        "preference" : "fastest",
+                        "mode" : "motor",
+                        "waypoints" : { "value" : {
+                           "type" : "MultiPoint",
+                           "coordinates" : [
+                              [ -77.047712, 38.892346 ],
+                              [ -76.99473, 38.902629 ]
+                           ]
+                        } }
+                     }
+                  }
+               ]
+            }
+         }
+      },
+      "nestedWorkflow" : {
+        "summary" : "Example workflow with nested processing",
+        "value" : {
+          "id" : "SampleNestedWorkflow",
+          "process" : "https://maps.ecere.comhttp://127.0.0.1:8080/fakeogcapi/processes/RenderMap",
+          "inputs" : {
+            "transparent": false,
+            "layers": [
+               { "collection" : "https://maps.ecere.comhttp://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:bathymetry" },
+               { "collection" : "https://maps.ecere.comhttp://127.0.0.1:8080/fakeogcapi/collections/SRTM_ViewFinderPanorama" },
+               {
+                  "process" : "https://maps.ecere.comhttp://127.0.0.1:8080/fakeogcapi/processes/ElevationContours",
+                  "inputs" : {
+                   "data": { "collection" : "https://maps.ecere.comhttp://127.0.0.1:8080/fakeogcapi/collections/SRTM_ViewFinderPanorama" },
+                   "distance": 500
+                 }
+               }
+            ]
+          }
+        }
+      },
+      "EVISentinel2" : {
+        "summary" : "Enhanced Vegetation Index on sentinel-2 using theoretical CPL",
+        "description" : "This workflow calculates an Enhanced Vegetation Index on sentinel-2 data using a theoretical Coverage Processing Language.",
+        "value" : {
+          "id" : "EVISentinel2",
+          "process" : "http://maps.ecere.comhttp://127.0.0.1:8080/fakeogcapi/processes/CoverageProcessor",
+          "inputs" : {
+            "data": { "collection" : "http://rasdaman.orghttp://127.0.0.1:8080/fakeogcapi/collections/sentinel-2" },
+            "code": "double BLUE = data[bands:'B02'], RED = data[bands:'B04'], NIR = data[bands:'B08']; return min[time](2.5 * (NIR - RED) / (1 + NIR + 6*RED + -7.5*BLUE));"
+          }
+        }
+      },
+      "EVISentinel2-WCPS" : {
+        "summary" : "EVI S2 - Attempt at integrating WCPS",
+        "description" : "This is an attempt at parameterizing WCPS in a way that simple text substitution could enable its use as part of Modular OGC API Workflows.",
+        "value" : {
+          "id" : "EVISentinel2-WCPS",
+          "process" : "http://maps.ecere.comhttp://127.0.0.1:8080/fakeogcapi/processes/wcps",
+          "inputs" : {
+            "data": { "collection" : "http://rasdaman.orghttp://127.0.0.1:8080/fakeogcapi/collections/sentinel-2" },
+            "code": "for $c in ({data})\n  let $blue := $c.b02, $red = $c.b04, $nir = $c.b08\n  return\n    encode(\n      scale(\n        extend(\n          condense min over $c time({timeRange}) values\n            2.5 * ($nir - $red) / (1 + $nir + 6 * $red + -7.5 * $blue),\n          { Lat({latRange}, Long({longRange}) }\n        ),\n        { Long:\"CRS:1\"(0:{right}), Lat:\"CRS:1\"(0:{bottom}) }\n      ),\n      {format}\n    )\n"
+          }
+        }
+      }
+    },
+    "parameters" : {
+      "bbox" : {
+        "name" : "bbox",
+        "in" : "query",
+        "description" : "Only features that have a geometry that intersects the bounding box are selected.\nThe bounding box is provided as four or six numbers, depending on whether the\ncoordinate reference system includes a vertical axis (height or depth):\n* Lower left corner, coordinate axis 1\n* Lower left corner, coordinate axis 2\n* Minimum value, coordinate axis 3 (optional)\n* Upper right corner, coordinate axis 1\n* Upper right corner, coordinate axis 2\n* Maximum value, coordinate axis 3 (optional)\nThe coordinate reference system of the values is WGS 84 longitude/latitude\n(http://www.opengis.net/def/crs/OGC/1.3/CRS84) unless a different coordinate\nreference system is specified in the parameter `bbox-crs`.\nFor WGS 84 longitude/latitude the values are in most cases the sequence of\nminimum longitude, minimum latitude, maximum longitude and maximum latitude.\nHowever, in cases where the box spans the antimeridian the first value\n(west-most box edge) is larger than the third value (east-most box edge).\nIf the vertical axis is included, the third and the sixth number are\nthe bottom and the top of the 3-dimensional bounding box.\nIf a feature has multiple spatial geometry properties, it is the decision of the\nserver whether only a single spatial geometry property is used to determine\nthe extent or all relevant geometries.",
+        "required" : false,
+        "schema" : {
+          "type" : "array",
+          "minItems" : 4,
+          "maxItems" : 6,
+          "items" : {
+            "type" : "number",
+            "format" : "double"
+          }
+        },
+        "style" : "form",
+        "explode" : false
+      },
+      "collectionId-all" : {
+        "name" : "collectionId",
+        "in" : "path",
+        "description" : "Local identifier of a collection",
+        "required" : true,
+        "allowEmptyValue" : false,
+        "schema" : {
+          "$ref" : "#/components/schemas/all-collection-list"
+        }
+      },
+      "collectionId-features" : {
+        "name" : "collectionId",
+        "in" : "path",
+        "description" : "Local identifier of a feature collection",
+        "required" : true,
+        "allowEmptyValue" : false,
+        "schema" : {
+          "$ref" : "#/components/schemas/feature-collection-list"
+        }
+      },
+      "collectionId-vectorTiles" : {
+        "name" : "collectionId",
+        "in" : "path",
+        "description" : "Local identifier of a vector tile collection",
+        "required" : true,
+        "allowEmptyValue" : false,
+        "schema" : {
+          "$ref" : "#/components/schemas/vectorTile-collection-list"
+        }
+      },
+      "collectionId-coverage" : {
+        "name" : "collectionId",
+        "in" : "path",
+        "description" : "Local identifier of a coverage collection",
+        "required" : true,
+        "allowEmptyValue" : false,
+        "schema" : {
+          "$ref" : "#/components/schemas/coverage-collection-list"
+        },
+        "style" : "simple",
+        "explode" : false
+      },
+      "datetime" : {
+        "name" : "datetime",
+        "in" : "query",
+        "description" : "Either a date-time or an interval, open or closed. Date and time expressions\nadhere to RFC 3339. Open intervals are expressed using double-dots.\nExamples:\n* A date-time: \"2018-02-12T23:20:50Z\"\n* A closed interval: \"2018-02-12T00:00:00Z/2018-03-18T12:31:12Z\"\n* Open intervals: \"2018-02-12T00:00:00Z/..\" or \"../2018-03-18T12:31:12Z\"\nOnly features that have a temporal property that intersects the value of\n`datetime` are selected.\nIf a feature has multiple temporal properties, it is the decision of the\nserver whether only a single temporal property is used to determine\nthe extent or all relevant temporal properties.",
+        "required" : false,
+        "schema" : {
+          "type" : "string"
+        },
+        "style" : "form",
+        "explode" : false
+      },
+      "featureId" : {
+        "name" : "featureId",
+        "in" : "path",
+        "description" : "Identifier of a feature",
+        "required" : true,
+        "schema" : {
+          "type" : "string"
+        }
+      },
+      "f-vector" : {
+        "name" : "f",
+        "in" : "query",
+        "description" : "The format of the vector data response (e.g. json). Accepted values are 'html', 'json' (GeoJSON) or 'mvt' (Mapbox Vector Tiles).",
+        "required" : false,
+        "schema" : {
+          "type" : "string",
+          "enum" : [ "html", "json", "mvt" ]
+        },
+        "style" : "form",
+        "explode" : false
+      },
+      "f-vectorTile" : {
+        "name" : "f",
+        "in" : "query",
+        "description" : "The format of the vector tile response (e.g. json). Accepted values are 'html', 'json' (GeoJSON), 'mvt' (Mapbox Vector Tiles) or 'gmt' (GNOSIS Map Tiles).",
+        "required" : false,
+        "schema" : {
+          "type" : "string",
+          "enum" : [ "html", "json", "mvt", "gmt" ]
+        },
+        "style" : "form",
+        "explode" : false
+      },
+      "f-coverage" : {
+        "name" : "f",
+        "in" : "query",
+        "description" : "The coverage data format of the response (e.g. tiff). Accepted values are 'tiff' (GeoTIFF), 'png' or 'html'.",
+        "required" : false,
+        "schema" : {
+          "type" : "string",
+          "enum" : [ "png", "tiff", "html" ]
+        },
+        "style" : "form",
+        "explode" : false
+      },
+      "f-coverageTile" : {
+        "name" : "f",
+        "in" : "query",
+        "description" : "The format of the coverage tile response (e.g. tiff). Accepted values are 'tiff' (GeoTIFF), 'png', 'gmt' (GNOSIS Map Tiles) or 'html'.",
+        "required" : false,
+        "schema" : {
+          "type" : "string",
+          "enum" : [ "png", "tiff", "gmt", "html" ]
+        },
+        "style" : "form",
+        "explode" : false
+      },
+      "f-map" : {
+        "name" : "f",
+        "in" : "query",
+        "description" : "The format of the map data response (e.g. png). Accepted values are 'png', 'jpg', 'tiff' (GeoTIFF), or 'html'.",
+        "required" : false,
+        "schema" : {
+          "type" : "string",
+          "enum" : [ "png", "jpg", "tiff", "gmt", "html" ]
+        },
+        "style" : "form",
+        "explode" : false
+      },
+      "f-mapTile" : {
+        "name" : "f",
+        "in" : "query",
+        "description" : "The format of the map tile response (e.g. png). Accepted values are 'png', 'jpg', 'tiff' (GeoTIFF), 'gmt' (GNOSIS Map Tiles) or 'html'.",
+        "required" : false,
+        "schema" : {
+          "type" : "string",
+          "enum" : [ "png", "jpg", "tiff", "gmt", "html" ]
+        },
+        "style" : "form",
+        "explode" : false
+      },
+      "f-metadata" : {
+        "name" : "f",
+        "in" : "query",
+        "description" : "The format of the response. If no value is provided, the accept header is used to determine the format. Accepted values are 'json', 'econ' or 'html'.",
+        "required" : false,
+        "schema" : {
+          "type" : "string",
+          "enum" : [ "json", "econ", "html" ]
+        },
+        "style" : "form",
+        "explode" : false
+      },
+      "f-style" : {
+        "name" : "f",
+        "in" : "query",
+        "description" : "The format of the style sheet response. If no value is provided, the accept header is used to determine the format. Accepted values are 'mbstyle' (Mapbox GL Styling), 'sld' (OGC Styled Layer Description/Symbology Encoding 1.0), cmss (GNOSIS Cascading Map Style Sheets) or 'html'.",
+        "required" : false,
+        "schema" : {
+          "type" : "string",
+          "enum" : [ "mbstyle", "sld", "cmss", "html" ]
+        },
+        "style" : "form",
+        "explode" : false
+      },
+      "collections" : {
+        "name" : "collections",
+        "in" : "query",
+        "style" : "form",
+        "description" : "The collections that should be included in the response. The parameter value is a comma-separated list of collection identifiers. If the parameters is missing, some or all collections will be included. The collection will be rendered in the order specified, with the last one showing on top, unless the priority is overridden by styling rules.",
+        "required" : false,
+        "explode" : false,
+        "schema" :
+        {
+          "type" : "array",
+          "items" : {
+             "$ref" : "#/components/schemas/all-collection-list"
+          }
+        }
+      },
+      "filter" : {
+       "name" : "filter",
+       "in" : "query",
+       "description" : "A query filter supported by this service.",
+       "required" : false,
+       "schema" : {
+         "type" : "string"
+       },
+       "style" : "form",
+       "explode" : true
+      },
+      "filter-lang" : {
+       "name" : "filter-lang",
+       "in" : "query",
+       "description" : "A query filter-lang supported by this service (only CMSS is currently supported).",
+       "required" : false,
+       "schema" : {
+         "type" : "string",
+         "enum" : [ "cmss" ]
+       },
+       "style" : "form",
+       "explode" : true
+      },
+      "filter-crs" : {
+       "name" : "filter-crs",
+       "in" : "query",
+       "required" : false,
+       "schema" : {
+         "type" : "string",
+         "format" : "uri-reference"
+       },
+       "style" : "form",
+       "explode" : false
+      },
+      "i" : {
+        "name" : "i",
+        "in" : "query",
+        "description" : "Horizontal (x) coordinate within a map or tile.",
+        "required" : true,
+        "schema" : {
+          "type" : "number"
+        }
+      },
+      "j" : {
+        "name" : "j",
+        "in" : "query",
+        "description" : "Vertical (y) coordinate within a map or tile.",
+        "required" : true,
+        "schema" : {
+          "type" : "number"
+        }
+      },
+      "limit-collections" : {
+        "name" : "limit",
+        "in" : "query",
+        "description" : "Limits the number of collections returned in the response document. Minimum = 1. Maximum = 10000. Default = 10000.",
+        "required" : false,
+        "schema" : {
+          "type" : "integer",
+          "minimum" : 1,
+          "maximum" : 10000
+        },
+        "style" : "form",
+        "explode" : false
+      },
+      "limit-items" : {
+        "name" : "limit",
+        "in" : "query",
+        "description" : "Limits the number of features returned in the response document. Minimum = 1. Maximum = 10000. Default = 10.",
+        "required" : false,
+        "schema" : {
+          "type" : "integer",
+          "minimum" : 1,
+          "maximum" : 10000
+        },
+        "style" : "form",
+        "explode" : false
+      },
+      "processId" : {
+        "name" : "processId",
+        "in" : "path",
+        "description" : "Local identifier of a process",
+        "required" : true,
+        "schema" : {
+          "$ref" : "#/components/schemas/processes-list"
+        }
+      },
+      "propertyName" : {
+        "name" : "propertyName",
+        "in" : "query",
+        "description" : "A list of feature properties to include in the response.",
+        "required" : false,
+        "allowEmptyValue" : false,
+        "schema" : {
+          "type" : "string"
+        },
+        "style" : "form",
+        "explode" : true
+      },
+      "resultType" : {
+        "name" : "resultType",
+        "in" : "query",
+        "description" : "The possible values for this parameter are \"results\" and \"hits\". If the value of the resultType parameter is set to \"results\" the server shall generate a complete response document containing resources that satisfy the operation. The root element of the response container shall include a count of the number of resources actually presented in the response document. The root element of the response container shall also include a count of the total number of resources that the operations actually found which will always be equal to or greater than the number of resource presented in the response document. If the value of the resultType attribute is set to \"hits\" the server shall generate an empty response document containing no resource instances and the root element of the response container shall contain the count of the total number of resources that the operation found. The value for the number of resources presented in the response document shall be set to zero.",
+        "required" : false,
+        "schema" : {
+          "type" : "string",
+          "enum" : [ "hits", "results" ]
+        },
+        "style" : "form",
+        "explode" : true
+      },
+      "scaleAxes" : {
+        "name" : "scaleAxes",
+        "in" : "query",
+        "description" : "Scale the resulting coverage along one or more axis by a given factor.",
+        "required" : false,
+        "style" : "form",
+        "explode" : true,
+        "schema" : {
+          "type" : "string"
+        }
+      },
+      "scaleFactor" : {
+        "name" : "scaleFactor",
+        "in" : "query",
+        "description" : "Scale the resulting coverage along all axis by a given factor.",
+        "required" : false,
+        "schema" : {
+          "type" : "number",
+          "format" : "double",
+          "minimum" : 0,
+          "exclusiveMinimum" : true
+        }
+      },
+      "scaleSize" : {
+        "name" : "scaleSize",
+        "in" : "query",
+        "description" : "Scale the resulting coverage along one or more axis to a given size in data cells/pixels.",
+        "required" : false,
+        "schema" : {
+          "type" : "string"
+        }
+      },
+      "subset" : {
+        "name" : "subset",
+        "in" : "query",
+        "description" : "Get a subset of the data by slicing or trimming along one or more axis.",
+        "style" : "form",
+        "explode" : false,
+        "required" : false,
+        "schema" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string"
+          }
+        }
+      },
+      "styleId" : {
+        "name" : "styleId",
+        "in" : "path",
+        "description" : "An identifier representing a specific style.",
+        "required" : true,
+        "schema" : {
+          "type" : "string"
+        }
+      },
+      "tileCol" : {
+        "name" : "tileCol",
+        "in" : "path",
+        "description" : "Column index of the tile on the selected TileMatrix. It cannot exceed the MatrixHeight-1 for the selected TileMatrix. For example, Ireland is fully within the Tile at WebMercatorQuad tileMatrix=5, tileRow=10 and tileCol=15.",
+        "required" : true,
+        "schema" : {
+          "minimum" : 0,
+          "type" : "integer"
+        },
+        "example" : 170
+      },
+      "tileMatrix" : {
+        "name" : "tileMatrix",
+        "in" : "path",
+        "description" : "Identifier selecting one of the scales defined in the TileMatrixSet and representing the scaleDenominator the tile. For example,\nIreland is fully within the Tile at WebMercatorQuad tileMatrix=5, tileRow=10 and tileCol=15.",
+        "required" : true,
+        "schema" : {
+          "type" : "string"
+        },
+        "example" : "0"
+      },
+      "tileMatrixSetId" : {
+        "name" : "tileMatrixSetId",
+        "in" : "path",
+        "description" : "Identifier for a supported TileMatrixSet",
+        "required" : true,
+        "allowEmptyValue" : false,
+        "schema" : {
+         "$ref" : "#/components/schemas/tile-matrix-list"
+        }
+      },
+      "tileRow" : {
+        "name" : "tileRow",
+        "in" : "path",
+        "description" : "Row index of the tile on the selected TileMatrix. It cannot exceed the MatrixWidth-1 for the selected TileMatrix. For example, Ireland is fully within the Tile at WebMercatorQuad tileMatrix=5, tileRow=10 and tileCol=15.",
+        "required" : true,
+        "schema" : {
+          "minimum" : 0,
+          "type" : "integer"
+        },
+        "example" : "37"
+      },
+      "transparent" : {
+       "name" : "transparent",
+       "in" : "query",
+       "description" : "Background transparency of map (default=true).",
+       "required" : false,
+       "style" : "form",
+       "explode" : false,
+       "schema" : {
+         "type" : "boolean",
+         "default" : true
+       }
+      },
+      "bgcolor" : {
+       "name" : "bgcolor",
+       "in" : "query",
+       "description" : "Web color name or hexadecimal 0x[AA]RRGGBB color value for the background color (default to 0x9C9C9C gray). If alpha is not specified, full opacity is assumed.",
+       "required" : false,
+       "style" : "form",
+       "explode" : false,
+       "schema" : {
+         "type" : "string",
+         "default" : "0xFFFFFF"
+       }
+     }
+    },
+    "schemas" : {
+      "additionalParameter" : {
+        "type" : "object",
+        "required" : [ "name", "value" ],
+        "properties" : {
+          "name" : {
+            "type" : "string"
+          },
+          "value" : {
+            "type" : "array",
+            "items" : {
+              "oneOf" : [ {
+                "type" : "string"
+              }, {
+                "type" : "number"
+              }, {
+                "type" : "integer"
+              }, {
+                "type" : "array",
+                "items" : { }
+              }, {
+                "type" : "object"
+              } ]
+            }
+          }
+        }
+      },
+      "allowedValues" : {
+        "type" : "array",
+        "items" : {
+          "oneOf" : [ {
+            "type" : "string"
+          }, {
+            "$ref" : "#/components/schemas/range"
+          } ]
+        }
+      },
+      "anyValue" : {
+        "type" : "object",
+        "properties" : {
+          "anyValue" : {
+            "type" : "boolean",
+            "default" : true
+          }
+        }
+      },
+      "boundingBoxData" : {
+        "type" : "object",
+        "required" : [ "bbox" ],
+        "properties" : {
+          "crs" : {
+            "type" : "string",
+            "format" : "uri"
+          },
+          "bbox" : {
+            "type" : "array",
+            "minItems" : 4,
+            "maxItems" : 6,
+            "items" : {
+              "type" : "number"
+            }
+          }
+        }
+      },
+      "boundingBoxDataType" : {
+        "type" : "object",
+        "required" : [ "supportedCRS" ],
+        "properties" : {
+          "supportedCRS" : {
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/components/schemas/supportedCRS"
+            }
+          }
+        }
+      },
+      "tiles-boundingBox" : {
+        "type" : "object",
+        "required" : [ "lowerLeft", "upperRight" ],
+        "properties" : {
+          "lowerLeft" : {
+            "type" : "array",
+            "minItems" : 2,
+            "items" : {
+              "type" : "number"
+            }
+          },
+          "upperRight" : {
+            "type" : "array",
+            "minItems" : 2,
+            "items" : {
+              "type" : "number"
+            }
+          }
+        }
+      },
+      "chainedInput" : {
+        "type" : "object",
+        "required" : [ "input" ],
+        "properties" : {
+          "input" : {
+            "type" : "string"
+          }
+        }
+      },
+      "collection" : {
+        "type" : "object",
+        "required" : [ "id", "links" ],
+        "properties" : {
+          "id" : {
+            "description" : "Identifier of the collection used, for example, in URIs",
+            "type" : "string",
+            "example" : "address"
+          },
+          "title" : {
+            "description" : "tTtle of the collection",
+            "type" : "string",
+            "example" : "address"
+          },
+          "description" : {
+            "description" : "A description of the features in the collection",
+            "type" : "string",
+            "example" : "An address."
+          },
+          "links" : {
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/components/schemas/link"
+            },
+            "example" : [ {
+              "href" : "http://data.example.com/buildings",
+              "rel" : "item"
+            }, {
+              "href" : "http://example.com/concepts/buildings.html",
+              "rel" : "describedby",
+              "type" : "text/html"
+            } ]
+          },
+          "extent" : {
+            "$ref" : "#/components/schemas/extent"
+          },
+          "itemType" : {
+            "description" : "Indicator about the type of the items in the collection.",
+            "type" : "string",
+            "default" : "feature"
+          },
+          "layerDataType" : {
+            "description" : "Type of data layer.",
+            "type" : "string"
+          },
+          "scaleDenominator" : {
+            "description" : "Scale denominator.",
+            "type" : "number"
+          },
+          "crs" : {
+            "description" : "The list of coordinate reference systems supported by this service.",
+            "type" : "array",
+            "items" : {
+              "type" : "string"
+            },
+            "default" : [ "http://www.opengis.net/def/crs/OGC/1.3/CRS84" ],
+            "example" : [ "http://www.opengis.net/def/crs/OGC/1.3/CRS84", "http://www.opengis.net/def/crs/EPSG/0/4326" ]
+          }
+        }
+      },
+      "collections" : {
+        "type" : "object",
+        "required" : [ "links", "collections" ],
+        "properties" : {
+          "links" : {
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/components/schemas/link"
+            }
+          },
+          "collections" : {
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/components/schemas/collection"
+            }
+          }
+        }
+      },
+      "collectionInput" : {
+        "type" : "object",
+        "required" : [ "collection" ],
+        "properties" : {
+          "collection" : {
+            "type" : "string"
+          }
+        }
+      },
+      "complexDataType" : {
+        "type" : "object",
+        "required" : [ "formats" ],
+        "properties" : {
+          "formats" : {
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/components/schemas/formatDescription"
+            }
+          }
+        }
+      },
+      "confClasses" : {
+        "type" : "object",
+        "required" : [ "conformsTo" ],
+        "properties" : {
+          "conformsTo" : {
+            "type" : "array",
+            "items" : {
+              "type" : "string"
+            }
+          }
+        }
+      },
+      "formatDescription" : {
+        "allOf" : [ {
+          "$ref" : "#/components/schemas/format"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "maximumMegabytes" : {
+              "type" : "integer"
+            },
+            "default" : {
+              "type" : "boolean",
+              "default" : false
+            }
+          }
+        } ]
+      },
+      "all-collection-list" : {
+        "$ref" : "./api/all-collections"
+      },
+      "vectorTile-collection-list" : {
+        "$ref" : "./api/vectortiles-collections"
+      },
+      "feature-collection-list" : {
+        "$ref" : "./api/feature-collections"
+      },
+      "coverage-collection-list" : {
+        "$ref" : "./api/coverage-collections"
+      },
+      "tile-matrix-list": {
+        "$ref" : "./api/tileMatrixSets"
+      },
+      "dataDescriptionType" : {
+        "allOf" : [ {
+          "$ref" : "#/components/schemas/descriptionType"
+        }, {
+          "type" : "object",
+          "required" : [ "id" ]
+        } ]
+      },
+      "descriptionType" : {
+        "type" : "object",
+        "required" : [ "id" ],
+        "properties" : {
+          "id" : {
+            "type" : "string"
+          },
+          "title" : {
+            "type" : "string"
+          },
+          "description" : {
+            "type" : "string"
+          },
+          "keywords" : {
+            "type" : "array",
+            "items" : {
+              "type" : "string"
+            }
+          },
+          "metadata" : {
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/components/schemas/metadata"
+            }
+          },
+          "additionalParameters" : {
+            "allOf" : [ {
+              "$ref" : "#/components/schemas/metadata"
+            }, {
+              "type" : "object",
+              "properties" : {
+                "parameters" : {
+                  "type" : "array",
+                  "items" : {
+                    "$ref" : "#/components/schemas/additionalParameter"
+                  }
+                }
+              }
+            } ]
+          }
+        }
+      },
+      "domainSet-json" : {
+        "title" : "Coverage Domain Set Schema (JSON)",
+        "type" : "object",
+        "properties" : { }
+      },
+      "execute" : {
+        "type" : "object",
+        "properties" : {
+          "id" : {
+            "type" : "string"
+          },
+          "process" : {
+            "type" : "string"
+          },
+          "inputs" : {
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/components/schemas/input"
+            }
+          }
+        }
+      },
+      "exception" : {
+        "type" : "object",
+        "description" : "Information about the exception: an error code plus an optional description.",
+        "required" : [ "code" ],
+        "properties" : {
+          "code" : {
+            "type" : "string"
+          },
+          "description" : {
+            "type" : "string"
+          }
+        }
+      },
+      "extent" : {
+        "type" : "object",
+        "description" : "The extent of the features in the collection. In the Core only spatial and temporal\\nextents are specified. Extensions may add additional members to represent other\\nextents, for example, thermal or pressure ranges.",
+        "properties" : {
+          "spatial" : {
+            "description" : "The spatial extent of the features in the collection.",
+            "type" : "object",
+            "properties" : {
+              "bbox" : {
+                "description" : "One or more bounding boxes that describe the spatial extent of the dataset.\nIn the Core only a single bounding box is supported. Extensions may support\nadditional areas. If multiple areas are provided, the union of the bounding\nboxes describes the spatial extent.",
+                "type" : "array",
+                "minItems" : 1,
+                "items" : {
+                  "description" : "Each bounding box is provided as four or six numbers, depending on\nwhether the coordinate reference system includes a vertical axis\n(height or depth):\n* Lower left corner, coordinate axis 1\n* Lower left corner, coordinate axis 2\n* Minimum value, coordinate axis 3 (optional)\n* Upper right corner, coordinate axis 1\n* Upper right corner, coordinate axis 2\n* Maximum value, coordinate axis 3 (optional)\nThe coordinate reference system of the values is WGS 84 longitude/latitude\n(http://www.opengis.net/def/crs/OGC/1.3/CRS84) unless a different coordinate\nreference system is specified in `crs`.\nFor WGS 84 longitude/latitude the values are in most cases the sequence of\nminimum longitude, minimum latitude, maximum longitude and maximum latitude.\nHowever, in cases where the box spans the antimeridian the first value\n(west-most box edge) is larger than the third value (east-most box edge).\nIf the vertical axis is included, the third and the sixth number are\nthe bottom and the top of the 3-dimensional bounding box.\nIf a feature has multiple spatial geometry properties, it is the decision of the\nserver whether only a single spatial geometry property is used to determine\nthe extent or all relevant geometries.",
+                  "type" : "array",
+                  "oneOf" : [ {
+                    "minItems" : 4,
+                    "maxItems" : 4
+                  }, {
+                    "minItems" : 6,
+                    "maxItems" : 6
+                  } ],
+                  "items" : {
+                    "type" : "number"
+                  },
+                  "example" : [ -180, -90, 180, 90 ]
+                }
+              },
+              "crs" : {
+                "description" : "Coordinate reference system of the coordinates in the spatial\nextent (property `spatial`). In the Core, only WGS84 longitude/latitude\nis supported. Extensions may support additional coordinate reference systems.",
+                "type" : "string",
+                "enum" : [ "http://www.opengis.net/def/crs/OGC/1.3/CRS84" ],
+                "default" : "http://www.opengis.net/def/crs/OGC/1.3/CRS84"
+              }
+            }
+          }
+        }
+      },
+      "featureCollectionGeoJSON" : {
+        "type" : "object",
+        "required" : [ "type", "features" ],
+        "properties" : {
+          "type" : {
+            "type" : "string",
+            "enum" : [ "FeatureCollection" ]
+          },
+          "features" : {
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/components/schemas/featureGeoJSON"
+            }
+          },
+          "links" : {
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/components/schemas/link"
+            }
+          },
+          "timeStamp" : {
+            "$ref" : "#/components/schemas/timeStamp-response"
+          },
+          "numberMatched" : {
+            "$ref" : "#/components/schemas/numberMatched"
+          },
+          "numberReturned" : {
+            "$ref" : "#/components/schemas/numberReturned"
+          }
+        }
+      },
+      "featureGeoJSON" : {
+        "type" : "object",
+        "required" : [ "type", "geometry", "properties" ],
+        "properties" : {
+          "type" : {
+            "type" : "string",
+            "enum" : [ "Feature" ]
+          },
+          "geometry" : {
+            "$ref" : "#/components/schemas/geometryGeoJSON"
+          },
+          "properties" : {
+            "type" : "object",
+            "nullable" : true
+          },
+          "id" : {
+            "oneOf" : [ {
+              "type" : "string"
+            }, {
+              "type" : "integer"
+            } ]
+          },
+          "links" : {
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/components/schemas/link"
+            }
+          }
+        }
+      },
+      "format" : {
+        "type" : "object",
+        "required" : [ "mediaType" ],
+        "properties" : {
+          "mimeType" : {
+            "type" : "string"
+          },
+          "schema" : {
+            "type" : "string"
+          },
+          "encoding" : {
+            "type" : "string"
+          }
+        }
+      },
+      "geometryGeoJSON" : {
+        "oneOf" : [ {
+          "$ref" : "#/components/schemas/pointGeoJSON"
+        }, {
+          "$ref" : "#/components/schemas/multipointGeoJSON"
+        }, {
+          "$ref" : "#/components/schemas/linestringGeoJSON"
+        }, {
+          "$ref" : "#/components/schemas/multilinestringGeoJSON"
+        }, {
+          "$ref" : "#/components/schemas/polygonGeoJSON"
+        }, {
+          "$ref" : "#/components/schemas/multipolygonGeoJSON"
+        }, {
+          "$ref" : "#/components/schemas/geometrycollectionGeoJSON"
+        } ]
+      },
+      "geometrycollectionGeoJSON" : {
+        "type" : "object",
+        "required" : [ "type", "geometries" ],
+        "properties" : {
+          "type" : {
+            "type" : "string",
+            "enum" : [ "GeometryCollection" ]
+          },
+          "geometries" : {
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/components/schemas/geometryGeoJSON"
+            }
+          }
+        }
+      },
+      "inlineOrRefData" : {
+        "type" : "object",
+        "properties" : {
+          "dataType" : {
+            "$ref" : "#/components/schemas/nameReferenceType"
+          },
+          "uom" : {
+            "$ref" : "#/components/schemas/nameReferenceType"
+          },
+          "format" : {
+            "$ref" : "#/components/schemas/format"
+          },
+          "href" : {
+            "type" : "string"
+          },
+          "value" : {
+            "oneOf" : [ {
+              "type" : "string"
+            }, {
+              "type" : "number"
+            }, {
+              "type" : "boolean"
+            }, {
+              "type" : "object"
+            } ]
+          }
+        },
+        "oneOf" : [ {
+          "required" : [ "href" ]
+        }, {
+          "required" : [ "value" ]
+        } ]
+      },
+      "input" : {
+        "type" : "object",
+        "required" : [ "id" ],
+        "properties" : {
+          "id" : {
+            "type" : "string"
+          }
+        },
+        "anyOf" : [ {
+          "$ref" : "#/components/schemas/inlineOrRefData"
+        }, {
+          "$ref" : "#/components/schemas/boundingBoxData"
+        }, {
+          "$ref" : "#/components/schemas/collectionInput"
+        }, {
+          "$ref" : "#/components/schemas/processInput"
+        }, {
+          "$ref" : "#/components/schemas/chainedInput"
+        }, {
+          "$ref" : "#/components/schemas/listInput"
+        } ]
+      },
+      "inputDescription" : {
+        "allOf" : [ {
+          "$ref" : "#/components/schemas/dataDescriptionType"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "input" : {
+              "oneOf" : [ {
+                "$ref" : "#/components/schemas/complexDataType"
+              }, {
+                "$ref" : "#/components/schemas/literalDataType"
+              }, {
+                "$ref" : "#/components/schemas/boundingBoxDataType"
+              } ]
+            },
+            "minOccurs" : {
+              "type" : "integer"
+            },
+            "maxOccurs" : {
+              "oneOf" : [ {
+                "type" : "integer"
+              }, {
+                "type" : "string",
+                "enum" : [ "unbounded" ]
+              } ]
+            }
+          }
+        } ]
+      },
+      "jobControlOptions" : {
+        "type" : "string",
+        "enum" : [ "modular-deferred", "modular-sync" ]
+      },
+      "landingPage" : {
+        "type" : "object",
+        "required" : [ "links" ],
+        "properties" : {
+          "title" : {
+            "type" : "string",
+            "example" : "Buildings in Bonn"
+          },
+          "description" : {
+            "type" : "string",
+            "example" : "Access to data about buildings in the city of Bonn via a Web API that conforms to the OGC API Features specification."
+          },
+          "links" : {
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/components/schemas/link"
+            }
+          }
+        }
+      },
+      "keyword" : {
+        "required" : [ "keyword" ],
+        "type" : "object",
+        "nullable" : true,
+        "properties" : {
+          "keyword" : {
+            "type" : "string",
+            "example" : "land cover"
+          },
+          "code" : {
+            "type" : "string",
+            "example" : "4612"
+          },
+          "codeSpace" : {
+            "type" : "string"
+          }
+        }
+      },
+      "layers-array" : {
+        "required" : [ "id", "type" ],
+        "type" : "object",
+        "properties" : {
+          "id" : {
+            "type" : "string",
+            "example" : "1"
+          },
+          "type" : {
+            "type" : "string",
+            "example" : "fill",
+            "enum" : [ "fill", "line", "symbol", "circle", "heatmap", "fill-extrusion", "raster", "hillshade", "background" ]
+          },
+          "source" : {
+            "type" : "string",
+            "example" : "daraa"
+          },
+          "source-layer" : {
+            "type" : "string",
+            "example" : "vegetationsrf"
+          },
+          "layout" : {
+            "type" : "object"
+          },
+          "paint" : {
+            "type" : "object",
+            "properties" : {
+              "fill-color" : {
+                "type" : "string",
+                "example" : "#11083b"
+              }
+            }
+          }
+        }
+      },
+      "linestringGeoJSON" : {
+        "type" : "object",
+        "required" : [ "type", "coordinates" ],
+        "properties" : {
+          "type" : {
+            "type" : "string",
+            "enum" : [ "LineString" ]
+          },
+          "coordinates" : {
+            "type" : "array",
+            "minItems" : 2,
+            "items" : {
+              "type" : "array",
+              "minItems" : 2,
+              "items" : {
+                "type" : "number"
+              }
+            }
+          }
+        }
+      },
+      "link" : {
+        "type" : "object",
+        "required" : [ "href" ],
+        "properties" : {
+          "href" : {
+            "type" : "string",
+            "example" : "http://data.example.com/buildings/123"
+          },
+          "rel" : {
+            "type" : "string",
+            "example" : "alternate"
+          },
+          "type" : {
+            "type" : "string",
+            "example" : "application/geo+json"
+          },
+          "hreflang" : {
+            "type" : "string",
+            "example" : "en"
+          },
+          "title" : {
+            "type" : "string",
+            "example" : "Trierer Strasse 70, 53115 Bonn"
+          },
+          "length" : {
+            "type" : "integer"
+          }
+        }
+      },
+      "listInput" : {
+        "type" : "object",
+        "required" : [ "list" ],
+        "properties" : {
+          "list" : {
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/components/schemas/input"
+            }
+          }
+        }
+      },
+      "literalDataDomain" : {
+        "type" : "object",
+        "properties" : {
+          "valueDefinition" : {
+            "oneOf" : [ {
+              "$ref" : "#/components/schemas/allowedValues"
+            }, {
+              "$ref" : "#/components/schemas/anyValue"
+            }, {
+              "$ref" : "#/components/schemas/valuesReference"
+            } ]
+          },
+          "defaultValue" : {
+            "type" : "string"
+          },
+          "dataType" : {
+            "$ref" : "#/components/schemas/nameReferenceType"
+          },
+          "uom" : {
+            "$ref" : "#/components/schemas/nameReferenceType"
+          }
+        }
+      },
+      "literalDataType" : {
+        "type" : "object",
+        "required" : [ "literalDataDomains" ],
+        "properties" : {
+          "literalDataDomains" : {
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/components/schemas/literalDataDomain"
+            }
+          }
+        }
+      },
+      "mb-style" : {
+        "required" : [ "layers", "sources", "version" ],
+        "type" : "object",
+        "properties" : {
+          "version" : {
+            "type" : "number",
+            "example" : 8
+          },
+          "name" : {
+            "type" : "string",
+            "example" : "night"
+          },
+          "sources" : {
+            "type" : "object",
+            "properties" : {
+              "daraa" : {
+                "type" : "object",
+                "properties" : {
+                  "type" : {
+                    "type" : "string",
+                    "example" : "vector"
+                  },
+                  "url" : {
+                    "type" : "string",
+                    "example" : "https://services.interactive-instruments.de/vtp/daraa/tiles/default/{z}/{y}/{x}?f=mvt"
+                  }
+                }
+              }
+            }
+          },
+          "sprite" : {
+            "type" : "string",
+            "example" : "http://vtp2018.s3-eu-west-1.amazonaws.com/static/mapstorestyle/sprites/sprites"
+          },
+          "glyphs" : {
+            "type" : "string",
+            "example" : "http://fonts.openmaptiles.org/{fontstack}/{range}.pbf"
+          },
+          "layers" : {
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/components/schemas/layers-array"
+            }
+          }
+        }
+      },
+      "metadata" : {
+        "type" : "object",
+        "properties" : {
+          "title" : {
+            "type" : "string"
+          },
+          "role" : {
+            "type" : "string"
+          },
+          "href" : {
+            "type" : "string"
+          }
+        }
+      },
+      "multilinestringGeoJSON" : {
+        "type" : "object",
+        "required" : [ "type", "coordinates" ],
+        "properties" : {
+          "type" : {
+            "type" : "string",
+            "enum" : [ "MultiLineString" ]
+          },
+          "coordinates" : {
+            "type" : "array",
+            "items" : {
+              "type" : "array",
+              "minItems" : 2,
+              "items" : {
+                "type" : "array",
+                "minItems" : 2,
+                "items" : {
+                  "type" : "number"
+                }
+              }
+            }
+          }
+        }
+      },
+      "multipointGeoJSON" : {
+        "type" : "object",
+        "required" : [ "type", "coordinates" ],
+        "properties" : {
+          "type" : {
+            "type" : "string",
+            "enum" : [ "MultiPoint" ]
+          },
+          "coordinates" : {
+            "type" : "array",
+            "items" : {
+              "type" : "array",
+              "minItems" : 2,
+              "items" : {
+                "type" : "number"
+              }
+            }
+          }
+        }
+      },
+      "multipolygonGeoJSON" : {
+        "type" : "object",
+        "required" : [ "type", "coordinates" ],
+        "properties" : {
+          "type" : {
+            "type" : "string",
+            "enum" : [ "MultiPolygon" ]
+          },
+          "coordinates" : {
+            "type" : "array",
+            "items" : {
+              "type" : "array",
+              "items" : {
+                "type" : "array",
+                "minItems" : 4,
+                "items" : {
+                  "type" : "array",
+                  "minItems" : 2,
+                  "items" : {
+                    "type" : "number"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "numberMatched" : {
+        "description" : "The number of features of the feature type that match the selection\nparameters like `bbox`.",
+        "type" : "integer",
+        "minimum" : 0,
+        "example" : 127
+      },
+      "numberReturned" : {
+        "description" : "The number of features in the feature collection.\nA server may omit this information in a response, if the information\nabout the number of features is not known or difficult to compute.\nIf the value is provided, the value shall be identical to the number\nof items in the \"features\" array.",
+        "type" : "integer",
+        "minimum" : 0,
+        "example" : 10
+      },
+      "nameReferenceType" : {
+        "type" : "object",
+        "required" : [ "name" ],
+        "properties" : {
+          "name" : {
+            "type" : "string"
+          },
+          "reference" : {
+            "type" : "string",
+            "format" : "uri"
+          }
+        }
+      },
+      "outputDescription" : {
+        "allOf" : [ {
+          "$ref" : "#/components/schemas/dataDescriptionType"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "output" : {
+              "oneOf" : [ {
+                "$ref" : "#/components/schemas/complexDataType"
+              }, {
+                "$ref" : "#/components/schemas/literalDataType"
+              }, {
+                "$ref" : "#/components/schemas/boundingBoxDataType"
+              } ]
+            }
+          }
+        } ]
+      },
+      "pointGeoJSON" : {
+        "type" : "object",
+        "required" : [ "type", "coordinates" ],
+        "properties" : {
+          "type" : {
+            "type" : "string",
+            "enum" : [ "Point" ]
+          },
+          "coordinates" : {
+            "type" : "array",
+            "minItems" : 2,
+            "items" : {
+              "type" : "number"
+            }
+          }
+        }
+      },
+      "polygonGeoJSON" : {
+        "type" : "object",
+        "required" : [ "type", "coordinates" ],
+        "properties" : {
+          "type" : {
+            "type" : "string",
+            "enum" : [ "Polygon" ]
+          },
+          "coordinates" : {
+            "type" : "array",
+            "items" : {
+              "type" : "array",
+              "minItems" : 4,
+              "items" : {
+                "type" : "array",
+                "minItems" : 2,
+                "items" : {
+                  "type" : "number"
+                }
+              }
+            }
+          }
+        }
+      },
+      "process" : {
+        "allOf" : [ {
+          "$ref" : "#/components/schemas/processSummary"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "inputs" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/components/schemas/inputDescription"
+              }
+            },
+            "outputs" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/components/schemas/outputDescription"
+              }
+            },
+            "links" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/components/schemas/link"
+              }
+            }
+          }
+        } ]
+      },
+      "processes-list" : {
+        "$ref" : "./api/processes-list"
+      },
+      "processInput" : {
+        "type" : "object",
+        "required" : [ "process" ],
+        "properties" : {
+          "process" : {
+            "type" : "string"
+          },
+          "inputs" : {
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/components/schemas/input"
+            }
+          }
+        }
+      },
+      "processList" : {
+        "type" : "array",
+        "items" : {
+          "$ref" : "#/components/schemas/processSummary"
+        }
+      },
+      "processSummary" : {
+        "allOf" : [ {
+          "$ref" : "#/components/schemas/descriptionType"
+        }, {
+          "type" : "object",
+          "required" : [ "id", "version" ],
+          "properties" : {
+            "id" : {
+              "type" : "string"
+            },
+            "version" : {
+              "type" : "string"
+            },
+            "jobControlOptions" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/components/schemas/jobControlOptions"
+              }
+            },
+            "outputTransmission" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/components/schemas/transmissionMode"
+              }
+            },
+            "links" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/components/schemas/link"
+              }
+            }
+          }
+        } ]
+      },
+      "range" : {
+        "type" : "object",
+        "properties" : {
+          "minimumValue" : {
+            "type" : "string"
+          },
+          "maximumValue" : {
+            "type" : "string"
+          },
+          "spacing" : {
+            "type" : "string"
+          },
+          "rangeClosure" : {
+            "type" : "string",
+            "enum" : [ "closed", "open", "open-closed", "closed-open" ]
+          }
+        }
+      },
+      "rangeType-json" : {
+        "title" : "Coverage Range Type Schema (JSON)",
+        "type" : "object",
+        "properties" : { }
+      },
+      "supportedCRS" : {
+        "type" : "object",
+        "properties" : {
+          "crs" : {
+            "type" : "string"
+          },
+          "default" : {
+            "type" : "boolean",
+            "default" : false
+          }
+        }
+      },
+      "stylesList" : {
+        "type" : "object",
+        "required" : [ "styles" ],
+        "properties" : {
+          "styles" : {
+            "type" : "array",
+            "nullable" : true,
+            "items" : {
+              "$ref" : "#/components/schemas/style"
+            },
+            "example" : [ {
+              "id" : "night",
+              "title" : "Topographic night style",
+              "links" : [ {
+                "href" : "https://example.com/api/1.0/styles/night?f=mapbox",
+                "type" : "application/vnd.mapbox.style+json",
+                "rel" : "stylesheet"
+              }, {
+                "href" : "https://example.com/api/1.0/styles/night?f=sld10",
+                "type" : "application/vnd.ogc.sld+xml;version=1.0",
+                "rel" : "stylesheet"
+              }, {
+                "href" : "https://example.com/api/1.0/styles/night/metadata?f=json",
+                "type" : "application/json",
+                "rel" : "describedBy"
+              } ]
+            }, {
+              "id" : "topographic",
+              "title" : "Regular topographic style",
+              "links" : [ {
+                "href" : "https://example.com/api/1.0/styles/topographic?f=mapbox",
+                "type" : "application/vnd.mapbox.style+json",
+                "rel" : "stylesheet"
+              }, {
+                "href" : "https://example.com/api/1.0/styles/topographic?f=sld10",
+                "type" : "application/vnd.ogc.sld+xml;version=1.0",
+                "rel" : "stylesheet"
+              }, {
+                "href" : "https://example.com/api/1.0/styles/topographic/metadata?f=json",
+                "type" : "application/json",
+                "rel" : "describedBy"
+              } ]
+            } ]
+          }
+        }
+      },
+      "style" : {
+        "type" : "object",
+        "nullable" : true,
+        "required" : [ "id", "links" ],
+        "properties" : {
+          "id" : {
+            "type" : "string",
+            "nullable" : true
+          },
+          "title" : {
+            "type" : "string",
+            "nullable" : true
+          },
+          "links" : {
+            "type" : "array",
+            "nullable" : true,
+            "minItems" : 1,
+            "items" : {
+              "$ref" : "#/components/schemas/link"
+            }
+          }
+        }
+      },
+      "tileMatrixSet" : {
+        "description" : "A definition of a tile matrix following the 2D Tile Matrix Set standard. For tileset metadata, this property is only required for offline use, as an alternative to tileMatrixSetURI and tileMatrixSetDefinition.",
+        "required" : [ "identifier" ],
+        "type" : "object",
+        "properties" : {
+          "uri" : {
+            "type" : "string",
+            "description" : "URI for a tile matrix set registered with OGC Naming Authority",
+            "example" : "http://www.opengis.net/def/tilematrixset/OGC/1.0/GNOSISGlobalGrid"
+          },
+          "title" : {
+            "type" : "string",
+            "description" : "Title of this tile matrix set, normally used for display to a human",
+            "example" : "Google Maps Compatible for the World"
+          },
+          "description" : {
+            "type" : "string",
+            "description" : "Brief narrative description of this tile matrix set, normally available for display to a human",
+            "example" : "The GNOSIS Global Grid is based on WGS84 and is (almost) a quad-tree roughly approximating equal area by adjusting the number of tiles per row in polar zones."
+          },
+          "keywords" : {
+            "type" : "array",
+            "description" : "Unordered list of one or more commonly used or formalized word(s) or phrase(s) used to describe this dataset",
+            "items" : {
+              "$ref" : "#/components/schemas/keyword"
+            }
+          },
+          "id" : {
+            "type" : "string",
+            "description" : "Tile matrix set identifier,",
+            "example" : "WebMercatorQuad"
+          },
+          "crs" : {
+            "type" : "string",
+            "description" : "Reference to one coordinate reference system (CRS)",
+            "format" : "uri"
+          },
+          "orderedAxes": {
+            "type": "array",
+            "minItems": 1,
+            "items": {
+               "type": "string"
+            }
+          },
+          "wellKnownScaleSet" : {
+            "type" : "string",
+            "description" : "Reference to a well-known scale set"
+          },
+          "tileMatrices" : {
+            "type" : "array",
+            "description" : "Describes a scale level and its tile matrix",
+            "items" : {
+              "$ref" : "#/components/schemas/tileMatrix"
+            }
+          }
+        }
+      },
+      "tileMatrix" : {
+        "required" : [ "identifier", "matrixHeight", "matrixWidth", "scaleDenominator", "cellSize", "tileHeight", "tileWidth", "pointOfOrigin" ],
+        "type" : "object",
+        "properties" : {
+          "title" : {
+            "type" : "string",
+            "description" : "Title of this tile matrix, normally used for display to a human",
+            "example" : "Google Maps Compatible for the World zoom level 3"
+          },
+          "abstract" : {
+            "type" : "string",
+            "description" : "Brief narrative description of this tile matrix, normally available for display to a human",
+            "example" : "Google Maps Compatible zoom level 3 that is equivalent to a scale of 1:69885283.00358972 and has 19567.87924100512 meters of pixel size in the equator"
+          },
+          "keywords" : {
+            "type" : "array",
+            "description" : "keywords about the elements in the collection",
+            "items" : {
+              "$ref" : "#/components/schemas/keyword"
+            }
+          },
+          "identifier" : {
+            "type" : "string",
+            "description" : "Identifier selecting one of the scales defined in the TileMatrixSet and representing the scaleDenominator the tile.",
+            "example" : "15"
+          },
+          "scaleDenominator" : {
+            "type" : "number",
+            "description" : "Scale denominator of this tile matrix",
+            "example" : 4265.4591676995678
+          },
+          "cellSize": {
+            "description": "Cell size of this tile matrix",
+            "type": "number",
+            "example": 0.0000107288361
+          },
+          "pointOfOrigin" : {
+            "type" : "array",
+            "description" : "Position in CRS coordinates of the corner of origin for this tile matrix.",
+            "example" : [ 90, -180 ],
+            "items" : {
+              "type" : "number",
+              "format" : "double"
+            }
+          },
+          "cornerOfOrigin": {
+            "description": "Corner of the tile matrix used as the origin for numbering tile rows and columns.",
+            "type": "string",
+            "enum": ["topLeft", "bottomLeft"],
+            "default": "topLeft"
+          },
+          "tileWidth" : {
+            "minimum" : 1,
+            "type" : "number",
+            "description" : "Width of each tile of this tile matrix in pixels",
+            "format" : "integer",
+            "example" : 256
+          },
+          "tileHeight" : {
+            "minimum" : 1,
+            "type" : "number",
+            "description" : "Height of each tile of this tile matrix in pixels",
+            "format" : "integer",
+            "example" : 256
+          },
+          "matrixHeight" : {
+            "minimum" : 1,
+            "type" : "number",
+            "description" : "Width of the matrix (number of tiles in width)",
+            "format" : "integer",
+            "example" : 65536
+          },
+          "matrixWidth" : {
+            "minimum" : 1,
+            "type" : "number",
+            "description" : "Height of the matrix (number of tiles in height)",
+            "format" : "integer",
+            "example" : 131072
+          },
+          "variableMatrixWidths": {
+             "description": "Describes the rows that has variable matrix width",
+             "type": "array",
+             "items": {
+               "description": "Variable Matrix Width data structure",
+               "type": "object",
+               "required": ["coalesce", "minTileRow", "maxTileRow"],
+               "properties":
+               {
+                  "coalesce" : {
+                  "description": "Coalescence factor",
+                     "type": "number",
+                     "format" : "integer",
+                     "minimum": 2,
+                     "multipleOf" : 1
+                  },
+                  "minTileRow": {
+                     "description": "First tile row where the coalescence factor applies on this tilematrix",
+                     "type": "number",
+                     "format" : "integer",
+                     "minimum": 0,
+                     "multipleOf" : 1
+                  },
+                  "maxTileRow": {
+                     "description": "Last tile row where the coalescence factor applies on this tilematrix",
+                     "type": "number",
+                     "format" : "integer",
+                     "minimum": 0,
+                     "multipleOf" : 1
+                  }
+               }
+             }
+          }
+        }
+      },
+      "tileMatrixSetLimits" : {
+        "type" : "array",
+        "minItems" : 1,
+        "items" : {
+           "type" : "object",
+           "required" : [ "tileMatrix", "minTileRow", "maxTileRow", "minTileCol", "maxTileCol" ],
+           "properties" : {
+             "tileMatrix" : {
+               "type" : "string",
+               "format" : "uri",
+               "example" : "5"
+             },
+             "minTileRow" : {
+               "type" : "number",
+               "format" : "integer",
+               "minimum" : 0,
+               "example" : 0
+             },
+             "maxTileRow" : {
+               "type" : "number",
+               "format" : "integer",
+               "minimum" : 0,
+               "example" : 1
+             },
+             "minTileCol" : {
+               "type" : "number",
+               "format" : "integer",
+               "minimum" : 0,
+               "example" : 3
+             },
+             "maxTileCol" : {
+               "type" : "number",
+               "format" : "integer",
+               "minimum" : 0,
+               "example" : 4
+             }
+           }
+        }
+      },
+      "tiles-links" :
+      {
+         "type" : "array",
+         "example" : [ {
+           "href" : "http://data.example.com/collections/buildings/map/tiles/WorldMercatorWGS84Quad",
+           "rel" : "self",
+           "type" : "application/json"
+         }, {
+           "href" : "http://data.example.com/collections/buildings/map/tiles/WorldMercatorWGS84Quad/{tileMatrix}/{tileRow}/{tileCol}",
+           "templated" : true,
+           "rel" : "item",
+           "type" : "image/png"
+         } ],
+         "items" : {
+           "$ref" : "#/components/schemas/link"
+         }
+      },
+      "tileSet" : {
+        "description" : "A resource describing a tileset based on the OGC TileSet Metadata Standard",
+        "anyOf" :
+        [
+            {
+               "required" : [ "tileMatrixSetDefinition", "links" ],
+               "properties" :
+               {
+                   "tileMatrixSetDefinition" : {
+                     "type" : "string",
+                     "example" : "http://data.example.com/tileMatrixSets/WorldMercatorWGS84Quad",
+                     "description" : "Reference to a tile matrix set definition following the 2D Tile Matrix Set Standard. Required for custom Tile Matrix Sets."
+                   },
+                   "links" : {
+                      "$ref" : "#/components/schemas/tiles-links"
+                   }
+               }
+            },
+            {
+               "required" : [ "tileMatrixSet", "mediaType" ],
+               "properties" :
+               {
+                   "tileMatrixSet" : {
+                     "$ref" : "#/components/schemas/tileMatrixSet"
+                   },
+                   "mediaType" : {
+                     "type" : "string",
+                     "description" : "Media type of individual tiles (for offline tilesets only -- the supported media types are specified in links for online tiles)"
+                   },
+                   "links" : {
+                      "$ref" : "#/components/schemas/tiles-links"
+                   }
+               }
+            }
+        ],
+        "type" : "object",
+        "required" : [ "dataType" ],
+        "properties" : {
+          "tileMatrixSetURI" : {
+            "type" : "string",
+            "format" : "uri",
+            "description" : "Reference to a Tile Matrix Set on the OGC definitions server (http://www.opengis.net/def/tms/). Required if the tile matrix set is registered on the definition server.",
+            "example" : "http://www.opengis.net/def/tilematrixset/OGC/1.0/GNOSISGlobalGrid"
+          },
+          "tileMatrixSetLimits" : {
+              "$ref" : "#/components/schemas/tileMatrixSetLimits"
+          },
+          "title" : {
+            "type" : "string",
+            "description" : "A title for this tileset"
+          },
+          "abstract" : {
+            "type" : "string",
+            "description" : "Brief narrative description of this tile set"
+          },
+            "dataType": {
+					"description": "Type of data represented in the tileset",
+               "type" : "string",
+               "enum" : [ "imagery", "vector", "coverage" ]
+				},
+            "crs": {
+               "description": "Coordinate Reference System (CRS)",
+				   "type": "string"
+            },
+            "orderedAxes": {
+               "type": "array",
+               "minItems": 1,
+               "items": {
+                  "type": "string"
+               }
+            },
+            "epoch": {
+            "description": "Epoch of the Coordinate Reference System (CRS)",
+            "type": "number"
+          },
+          "keywords" : {
+            "type" : "array",
+            "description" : "keywords about this tileset",
+            "items" : {
+              "$ref" : "#/components/schemas/keyword"
+            }
+          },
+          "layers" : {
+            "type" : "array",
+            "items" : {
+               "$ref" : "#/components/schemas/layerDescription"
+            }
+          },
+          "boundingBox" :
+          {
+             "$ref" : "#/components/schemas/tiles-boundingBox"
+          },
+          "centerPoint" :
+          {
+             "$ref" : "#/components/schemas/tilePoint"
+          },
+          "created" :
+          {
+             "$ref" : "#/components/schemas/timeStamp"
+          },
+          "updated" :
+          {
+             "$ref" : "#/components/schemas/timeStamp"
+          },
+          "version" : { "type" : "string" },
+          "pointOfContact" : { "type" : "string" },
+          "accessConstraints" : {
+             "$ref" : "#/components/schemas/classificationCode"
+          }
+        }
+      },
+      "layerDescription" :
+      {
+         "type" : "object",
+         "required" : [ "identifier", "dataType" ],
+         "properties" :
+         {
+            "identifier" : { "type" : "string" },
+            "dataType" :
+            {
+               "type" : "string",
+               "enum" : [ "imagery", "vector", "coverage" ]
+            },
+            "geometryType" :
+            {
+               "type" : "string",
+               "enum" : [ "points", "lines", "polygons" ]
+            },
+            "featureType" : { "type" : "string" },
+            "propertiesSchema" :
+            {
+               "type" : "object",
+               "required" : [ "type", "properties" ],
+               "properties" :
+               {
+                  "type" :
+                  {
+                     "type" : "string",
+                     "enum" : [ "object" ]
+                  },
+                  "properties" :
+                  {
+                     "type" : "array",
+                     "items" :
+                     {
+                        "type" : "object"
+                     }
+                  }
+               }
+            },
+            "pointOfContact" : { "type" : "string" },
+            "publisher" : { "type" : "string" },
+            "theme" : { "type" : "string" },
+            "supportedCRS" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/components/schemas/supportedCRS"
+              }
+            },
+            "style" :
+            {
+               "$ref" : "#/components/schemas/layerStyle"
+            },
+            "links" :
+            {
+               "$ref" : "#/components/schemas/layers-links"
+            },
+            "created" :
+            {
+               "$ref" : "#/components/schemas/timeStamp"
+            },
+            "updated" :
+            {
+               "$ref" : "#/components/schemas/timeStamp"
+            },
+            "boundingBox" :
+            {
+               "$ref" : "#/components/schemas/tiles-boundingBox"
+            },
+            "geoDataClass" : { "type" : "string" },
+            "minTileMatrix" : { "type" : "string" },
+            "maxTileMatrix" : { "type" : "string" },
+            "maxCellSize" : { "type" : "number" },
+            "minCellSize" : { "type" : "number" },
+            "minScaleDenominator" : { "type" : "number" },
+            "maxScaleDenominator" : { "type" : "number" }
+         }
+      },
+      "layers-links" :
+      {
+         "type" : "array",
+         "items" :
+         {
+            "$ref" : "#/components/schemas/link"
+         }
+      },
+      "layerStyle" :
+      {
+         "type" : "object",
+         "required" : [ "id" ],
+         "properties" :
+         {
+            "id" : { "type" : "string" },
+            "links" : { "type" : "array", "items" : { "$ref" : "#/components/schemas/link" } }
+         }
+      },
+
+      "tilePoint" :
+      {
+         "type" : "object",
+         "required" : [ "coordinates", "tileMatrix" ],
+         "properties" :
+         {
+            "coordinates" :
+            {
+               "type" : "array",
+               "minItems" : 2,
+               "items" : { "type" : "number" }
+            },
+            "tileMatrix" : { "type" : "string" },
+            "scaleDenominator" : { "type" : "number" },
+            "cellSize" : { "type" : "number" }
+         }
+      },
+      "classificationCode" :
+      {
+         "type" : "string",
+         "enum" : [ "unclassified", "confidential", "restricted", "secret", "topSecret" ]
+      },
+      "tilesetsList" : {
+        "description" : "A list of tilesets available through the Tiles API for one or more data type, style and Tile Matrix Set, as well as potentially links to other related tilesets for the same data (e.g. of different dataType and  style) available.",
+        "type" : "object",
+        "properties" : {
+          "links" : {
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/components/schemas/link"
+            }
+          },
+          "tilesets" : {
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/components/schemas/tileSet"
+            }
+          }
+        }
+      },
+      "timeStamp-response" : {
+        "description" : "This property indicates the time and date when the response was generated.",
+        "type" : "string",
+        "format" : "date-time",
+        "example" : "2017-08-17T08:05:32Z"
+      },
+      "timeStamp" : {
+        "type" : "string",
+        "format" : "date-time",
+        "example" : "2017-08-17T08:05:32Z"
+      },
+      "transmissionMode" : {
+        "type" : "string",
+        "enum" : [ "value", "reference" ]
+      },
+      "valuesReference" : {
+        "type" : "string",
+        "format" : "uri"
+      }
+    },
+    "responses" : {
+      "LandingPage" : {
+        "description" : "The landing page provides links to the API definition\n(link relations to\nthe Conformance declaration (path `/conformance`,\nlink relation `conformance`), and the Feature\nCollections (path `/collections`, link relation\n`data`).",
+        "content" : {
+          "application/json" : {
+            "schema" : {
+              "$ref" : "#/components/schemas/landingPage"
+            },
+            "example" : {
+              "title" : "Buildings in Bonn",
+              "description" : "Access to data about buildings in the city of Bonn via a Web API that conforms to the OGC API Features specification.",
+              "links" : [ {
+                "href" : "http://data.example.org/",
+                "rel" : "self",
+                "type" : "application/json",
+                "title" : "this document"
+              }, {
+                "href" : "http://data.example.org/api",
+                "rel" : "service-desc",
+                "type" : "application/vnd.oai.openapi+json;version=3.0",
+                "title" : "the API definition"
+              }, {
+                "href" : "http://data.example.org/api.html",
+                "rel" : "service-doc",
+                "type" : "text/html",
+                "title" : "the API documentation"
+              }, {
+                "href" : "http://data.example.org/conformance",
+                "rel" : "conformance",
+                "type" : "application/json",
+                "title" : "OGC API conformance classes implemented by this service"
+              }, {
+                "href" : "http://data.example.org/collections",
+                "rel" : "data",
+                "type" : "application/json",
+                "title" : "Information about the feature collections"
+              } ]
+            }
+          },
+          "text/html" : {
+            "schema" : {
+              "type" : "string"
+            }
+          }
+        }
+      },
+      "ConformanceDeclaration" : {
+        "description" : "The URIs of all conformance classes supported by the server.\nTo support \"generic\" clients that want to access multiple\nOGC API Features implementations - and not \"just\" the specified\nAPI / server, the server declares the conformance\nclasses it implements and conforms to.",
+        "content" : {
+          "application/json" : {
+            "schema" : {
+              "$ref" : "#/components/schemas/confClasses"
+            },
+            "example" : {
+              "conformsTo" : [ "http://www.opengis.net/spechttp://127.0.0.1:8080/fakeogcapi-features-1/1.0/conf/core", "http://www.opengis.net/spechttp://127.0.0.1:8080/fakeogcapi-features-1/1.0/conf/oas30", "http://www.opengis.net/spechttp://127.0.0.1:8080/fakeogcapi-features-1/1.0/conf/html", "http://www.opengis.net/spechttp://127.0.0.1:8080/fakeogcapi-features-1/1.0/conf/geojson" ]
+            }
+          },
+          "text/html" : {
+            "schema" : {
+              "type" : "string"
+            }
+          }
+        }
+      },
+      "collectionsList" : {
+        "description" : "The collections of (mostly geospatial) data available from this API. The dataset contains one or more collections. This resource provides information about and access to the collections. The response contains the list of collections. Each collection is accessible via one or more OGC API set of specifications, for which a link to relevant accessible resources, e.g. /collections/{collectionId}/(items, coverage, map, tiles...) is provided, with the corresponding relation type, as well as key information about the collection. This information includes:\n* a local identifier for the collection that is unique for the dataset;\n* a list of coordinate reference systems (CRS) in which data may be returned by the server. The first CRS is the default coordinate reference system (the default is always WGS 84 with axis order longitude/latitude);\n* an optional title and description for the collection;\n* an optional extent that can be used to provide an indication of the spatial and temporal extent of the collection - typically derived from the data;\n* for collections accessible via the Features or Records API, an optional indicator about the type of the items in the collection (the default value, if the indicator is not provided, is 'feature').",
+        "content" : {
+          "application/json" : {
+            "schema" : {
+              "$ref" : "#/components/schemas/collections"
+            },
+            "example" : {
+              "links" : [ {
+                "href" : "http://data.example.org/collections.json",
+                "rel" : "self",
+                "type" : "application/json",
+                "title" : "this document"
+              }, {
+                "href" : "http://data.example.org/collections.html",
+                "rel" : "alternate",
+                "type" : "text/html",
+                "title" : "this document as HTML"
+              }, {
+                "href" : "http://schemas.example.org/1.0/buildings.xsd",
+                "rel" : "describedby",
+                "type" : "application/xml",
+                "title" : "GML application schema for Acme Corporation building data"
+              }, {
+                "href" : "http://download.example.org/buildings.gpkg",
+                "rel" : "enclosure",
+                "type" : "application/geopackage+sqlite3",
+                "title" : "Bulk download (GeoPackage)",
+                "length" : 472546
+              } ],
+              "collections" : [ {
+                "id" : "buildings",
+                "title" : "Buildings",
+                "description" : "Buildings in the city of Bonn.",
+                "extent" : {
+                  "spatial" : {
+                    "bbox" : [ [ 7.01, 50.63, 7.22, 50.78 ] ]
+                  },
+                  "temporal" : {
+                    "interval" : [ [ "2010-02-15T12:34:56Z", null ] ]
+                  }
+                },
+                "links" : [ {
+                  "href" : "http://data.example.org/collections/buildings/items",
+                  "rel" : "items",
+                  "type" : "application/geo+json",
+                  "title" : "Buildings"
+                }, {
+                  "href" : "http://data.example.org/collections/buildings/items.html",
+                  "rel" : "items",
+                  "type" : "text/html",
+                  "title" : "Buildings"
+                }, {
+                  "href" : "https://creativecommons.org/publicdomain/zero/1.0/",
+                  "rel" : "license",
+                  "type" : "text/html",
+                  "title" : "CC0-1.0"
+                }, {
+                  "href" : "https://creativecommons.org/publicdomain/zero/1.0/rdf",
+                  "rel" : "license",
+                  "type" : "application/rdf+xml",
+                  "title" : "CC0-1.0"
+                } ]
+              } ]
+            }
+          },
+          "text/html" : {
+            "schema" : {
+              "type" : "string"
+            }
+          }
+        }
+      },
+      "Collection" : {
+        "description" : "Information about the collection of (mostly geospatial) data available from this API. The collection is accessible via one or more OGC API set of specifications, for which a link to relevant accessible resources, e.g. /collections/{collectionId}/(items, coverage, map, tiles...) is contained in the response, with the corresponding relation type, as well as key information about the collection. This information includes:\n* a local identifier for the collection that is unique for the dataset;\n* a list of coordinate reference systems (CRS) in which data may be returned by the server. The first CRS is the default coordinate reference system (the default is always WGS 84 with axis order longitude/latitude);\n* an optional title and description for the collection;\n* an optional extent that can be used to provide an indication of the spatial and temporal extent of the collection - typically derived from the data;\n* for collections accessible via the Features or Records API, an optional indicator about the type of the items in the collection (the default value, if the indicator is not provided, is 'feature').",
+        "content" : {
+          "application/json" : {
+            "schema" : {
+              "$ref" : "#/components/schemas/collection"
+            },
+            "example" : {
+              "id" : "buildings",
+              "title" : "Buildings",
+              "description" : "Buildings in the city of Bonn.",
+              "extent" : {
+                "spatial" : {
+                  "bbox" : [ [ 7.01, 50.63, 7.22, 50.78 ] ]
+                },
+                "temporal" : {
+                  "interval" : [ [ "2010-02-15T12:34:56Z", null ] ]
+                }
+              },
+              "links" : [ {
+                "href" : "http://data.example.org/collections/buildings/items",
+                "rel" : "items",
+                "type" : "application/geo+json",
+                "title" : "Buildings"
+              }, {
+                "href" : "http://data.example.org/collections/buildings/items.html",
+                "rel" : "items",
+                "type" : "text/html",
+                "title" : "Buildings"
+              }, {
+                "href" : "https://creativecommons.org/publicdomain/zero/1.0/",
+                "rel" : "license",
+                "type" : "text/html",
+                "title" : "CC0-1.0"
+              }, {
+                "href" : "https://creativecommons.org/publicdomain/zero/1.0/rdf",
+                "rel" : "license",
+                "type" : "application/rdf+xml",
+                "title" : "CC0-1.0"
+              } ]
+            }
+          },
+          "text/html" : {
+            "schema" : {
+              "type" : "string"
+            }
+          }
+        }
+      },
+      "DomainSet" : {
+        "description" : "The domain set of a coverage.",
+        "content" : {
+          "application/json" : {
+            "schema" : {
+              "$ref" : "#/components/schemas/domainSet-json"
+            }
+          },
+          "text/html" : {
+            "schema" : {
+              "type" : "string"
+            }
+          }
+        }
+      },
+      "Features" : {
+        "description" : "The response is a document consisting of features in the collection.\nThe features included in the response are determined by the server\nbased on the query parameters of the request. To support access to\nlarger collections without overloading the client, the API supports\npaged access with links to the next page, if more features are selected\nthat the page size.\nThe `bbox` and `datetime` parameter can be used to select only a\nsubset of the features in the collection (the features that are in the\nbounding box or time interval). The `bbox` parameter matches all features\nin the collection that are not associated with a location, too. The\n`datetime` parameter matches all features in the collection that are\nnot associated with a time stamp or interval, too.\nThe `limit` parameter may be used to control the subset of the\nselected features that should be returned in the response, the page size.\nEach page may include information about the number of selected and\nreturned features (`numberMatched` and `numberReturned`) as well as\nlinks to support paging (link relation `next`).",
+        "content" : {
+          "application/geo+json" : {
+            "schema" : {
+              "$ref" : "#/components/schemas/featureCollectionGeoJSON"
+            },
+            "example" : {
+              "type" : "FeatureCollection",
+              "links" : [ {
+                "href" : "http://data.example.com/collections/buildings/items.json",
+                "rel" : "self",
+                "type" : "application/geo+json",
+                "title" : "this document"
+              }, {
+                "href" : "http://data.example.com/collections/buildings/items.html",
+                "rel" : "alternate",
+                "type" : "text/html",
+                "title" : "this document as HTML"
+              }, {
+                "href" : "http://data.example.com/collections/buildings/items.json&offset=10&limit=2",
+                "rel" : "next",
+                "type" : "application/geo+json",
+                "title" : "next page"
+              } ],
+              "timeStamp" : "2018-04-03T14:52:23Z",
+              "numberMatched" : 123,
+              "numberReturned" : 2,
+              "features" : [ {
+                "type" : "Feature",
+                "id" : "123",
+                "geometry" : {
+                  "type" : "Polygon",
+                  "coordinates" : [ "..." ]
+                },
+                "properties" : {
+                  "function" : "residential",
+                  "floors" : "2",
+                  "lastUpdate" : "2015-08-01T12:34:56Z"
+                }
+              }, {
+                "type" : "Feature",
+                "id" : "132",
+                "geometry" : {
+                  "type" : "Polygon",
+                  "coordinates" : [ "..." ]
+                },
+                "properties" : {
+                  "function" : "public use",
+                  "floors" : "10",
+                  "lastUpdate" : "2013-12-03T10:15:37Z"
+                }
+              } ]
+            }
+          },
+          "text/html" : {
+            "schema" : {
+              "type" : "string"
+            }
+          }
+        }
+      },
+      "Feature" : {
+        "description" : "fetch the feature with id `featureId` in the feature collection\nwith id `collectionId`",
+        "content" : {
+          "application/geo+json" : {
+            "schema" : {
+              "$ref" : "#/components/schemas/featureGeoJSON"
+            },
+            "example" : {
+              "type" : "Feature",
+              "links" : [ {
+                "href" : "http://data.example.com/id/building/123",
+                "rel" : "canonical",
+                "title" : "canonical URI of the building"
+              }, {
+                "href" : "http://data.example.com/collections/buildings/items/123.json",
+                "rel" : "self",
+                "type" : "application/geo+json",
+                "title" : "this document"
+              }, {
+                "href" : "http://data.example.com/collections/buildings/items/123.html",
+                "rel" : "alternate",
+                "type" : "text/html",
+                "title" : "this document as HTML"
+              }, {
+                "href" : "http://data.example.com/collections/buildings",
+                "rel" : "collection",
+                "type" : "application/geo+json",
+                "title" : "the collection document"
+              } ],
+              "id" : "123",
+              "geometry" : {
+                "type" : "Polygon",
+                "coordinates" : [ "..." ]
+              },
+              "properties" : {
+                "function" : "residential",
+                "floors" : "2",
+                "lastUpdate" : "2015-08-01T12:34:56Z"
+              }
+            }
+          },
+          "text/html" : {
+            "schema" : {
+              "type" : "string"
+            }
+          }
+        }
+      },
+      "content-coverage" : {
+        "description" : "A coverage returned as a response.",
+        "content" : {
+          "image/png" : {
+            "schema" : {
+              "type" : "string",
+              "format" : "binary"
+            }
+          },
+          "image/jpeg" : {
+            "schema" : {
+              "type" : "string",
+              "format" : "binary"
+            }
+          },
+          "image/tiff; application=geotiff" : {
+            "schema" : {
+              "type" : "string",
+              "format" : "binary"
+            }
+          },
+          "text/html" : {
+            "schema" : {
+              "type" : "string"
+            }
+          }
+        }
+      },
+      "content-coverageTile" : {
+        "description" : "A coverage returned as a response.",
+        "content" : {
+          "image/png" : {
+            "schema" : {
+              "type" : "string",
+              "format" : "binary"
+            }
+          },
+          "image/jpeg" : {
+            "schema" : {
+              "type" : "string",
+              "format" : "binary"
+            }
+          },
+          "image/tiff; application=geotiff" : {
+            "schema" : {
+              "type" : "string",
+              "format" : "binary"
+            }
+          },
+          "application/vnd.gnosis-map-tile" : {
+            "schema" : {
+              "type" : "string",
+              "format" : "binary"
+            }
+          },
+          "text/html" : {
+            "schema" : {
+              "type" : "string"
+            }
+          }
+        }
+      },
+      "content-process-results" : {
+        "description" : "Processing results returned as a response.",
+        "content" : {
+          "application/geo+json" : {
+            "schema" : {
+              "$ref" : "#/components/schemas/featureCollectionGeoJSON"
+            }
+          },
+          "image/png" : {
+            "schema" : {
+              "type" : "string",
+              "format" : "binary"
+            }
+          },
+          "image/jpeg" : {
+            "schema" : {
+              "type" : "string",
+              "format" : "binary"
+            }
+          },
+          "image/tiff; application=geotiff" : {
+            "schema" : {
+              "type" : "string",
+              "format" : "binary"
+            }
+          }
+        }
+      },
+      "content-vector" : {
+        "description" : "Vector features returned as a response.",
+        "content" : {
+          "application/geo+json" : {
+            "schema" : {
+              "$ref" : "#/components/schemas/featureCollectionGeoJSON"
+            }
+          },
+          "application/vnd.mapbox-vector-tile" : {
+            "schema" : {
+              "type" : "string",
+              "format" : "binary"
+            }
+          },
+          "text/mapml" : {
+            "schema" : {
+              "type" : "string",
+              "format" : "binary"
+            }
+          },
+          "text/html" : {
+            "schema" : {
+              "type" : "string"
+            }
+          }
+        }
+      },
+      "content-vectorTile" : {
+        "description" : "A vector tile returned as a response.",
+        "content" : {
+           "application/geo+json" : {
+             "schema" : {
+               "type" : "string",
+               "format" : "binary"
+             }
+           },
+           "application/vnd.mapbox-vector-tile" : {
+             "schema" : {
+               "type" : "string",
+               "format" : "binary"
+             }
+           },
+           "application/vnd.gnosis-map-tile" : {
+             "schema" : {
+               "type" : "string",
+               "format" : "binary"
+             }
+           },
+           "text/mapml" : {
+             "schema" : {
+               "type" : "string",
+               "format" : "binary"
+             }
+           }
+        }
+      },
+      "content-map" : {
+        "description" : "A map image returned as a response.",
+        "content" : {
+          "image/png" : {
+            "schema" : {
+              "type" : "string",
+              "format" : "binary"
+            }
+          },
+          "image/jpeg" : {
+            "schema" : {
+              "type" : "string",
+              "format" : "binary"
+            }
+          },
+          "image/tiff; application=geotiff" : {
+            "schema" : {
+              "type" : "string",
+              "format" : "binary"
+            }
+          }
+        }
+      },
+      "content-mapTile" : {
+        "description" : "A map image returned as a response.",
+        "content" : {
+          "image/png" : {
+            "schema" : {
+              "type" : "string",
+              "format" : "binary"
+            }
+          },
+          "image/jpeg" : {
+            "schema" : {
+              "type" : "string",
+              "format" : "binary"
+            }
+          },
+          "image/tiff; application=geotiff" : {
+            "schema" : {
+              "type" : "string",
+              "format" : "binary"
+            }
+          },
+          "application/vnd.gnosis.map-tile" : {
+            "schema" : {
+              "type" : "string",
+              "format" : "binary"
+            }
+          }
+        }
+      },
+      "RangeType" : {
+        "description" : "The range type of a coverage.",
+        "content" : {
+          "application/json" : {
+            "schema" : {
+              "$ref" : "#/components/schemas/rangeType-json"
+            }
+          },
+          "text/html" : {
+            "schema" : {
+              "type" : "string"
+            }
+          }
+        }
+      },
+      "InvalidParameter" : {
+        "description" : "A query parameter has an invalid value.",
+        "content" : {
+          "application/json" : {
+            "schema" : {
+              "$ref" : "#/components/schemas/exception"
+            }
+          },
+          "text/html" : {
+            "schema" : {
+              "type" : "string"
+            }
+          }
+        }
+      },
+      "response-style" :
+      {
+         "description" : "A cartographic style sheet to be applied to vector features and/or raster coverages",
+         "content" : {
+           "application/vnd.gnosis.cmss+eccss" : {
+             "schema" : {
+               "type" : "string"
+             }
+           },
+           "application/vnd.ogc.sld+xml;version=1.0" : {
+             "schema" : {
+               "type" : "string"
+             }
+           },
+           "application/vnd.mapbox.style+json" : {
+             "schema" : {
+               "$ref" : "#/components/schemas/mb-style"
+             }
+           }
+         }
+      },
+      "NotFound" : {
+        "description" : "The requested resource does not exist on the server. For example, a path parameter had an incorrect value."
+      },
+      "NotAcceptable" : {
+        "description" : "Content negotiation failed. For example, the `Accept` header submitted in the request did not support any of the media types supported by the server for the requested resource."
+      },
+      "ServerError" : {
+        "description" : "A server error occurred.",
+        "content" : {
+          "application/json" : {
+            "schema" : {
+              "$ref" : "#/components/schemas/exception"
+            }
+          },
+          "text/html" : {
+            "schema" : {
+              "type" : "string"
+            }
+          }
+        }
+      }
+    }
+  },
+  "servers" : [ {
+    "description" : "GNOSIS Map Server",
+    "url" : "http://127.0.0.1:8080/fakeogcapi"
+  } ]
+}
diff --git a/autotest/gdrivers/data/ogcapi/request_collections_NaturalEarth_physical_ne_10m_lakes_europe.http_data b/autotest/gdrivers/data/ogcapi/request_collections_NaturalEarth_physical_ne_10m_lakes_europe.http_data
index 29a7bb28a7bf..9b7ab88b7888 100644
--- a/autotest/gdrivers/data/ogcapi/request_collections_NaturalEarth_physical_ne_10m_lakes_europe.http_data
+++ b/autotest/gdrivers/data/ogcapi/request_collections_NaturalEarth_physical_ne_10m_lakes_europe.http_data
@@ -1,15 +1,14 @@
 HTTP/1.1 200 OK
-Date: Tue, 20 Jun 2023 10:38:08 GMT
+Date: Fri, 12 Jul 2024 14:17:02 GMT
 Server: Apache/2.4.52 (Ubuntu)
-Expires: Wed, 12 Jun 2024 14:15:05 GMT
+Access-Control-Allow-Headers: x-requested-with, Content-Type, origin, authorization, acc$
+Expires: Sat, 12 Jul 2025 14:17:02 GMT
 Access-Control-Allow-Origin: *
 Vary: Accept,Accept-Encoding,Prefer
-Content-Length: 11484
-Access-Control-Allow-Headers: x-requested-with, Content-Type, origin, authorization, acc$
-Age: 591783
+Content-Type: application/json
+Content-Length: 11200
 Keep-Alive: timeout=5, max=100
 Connection: Keep-Alive
-Content-Type: application/json
 
 {
    "links" : [
@@ -43,52 +42,40 @@ Content-Type: application/json
          "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/dggs"
       },
       {
-         "rel" : "queryables",
+         "rel" : "http://www.opengis.net/def/rel/ogc/1.0/schema",
          "type" : "application/json",
-         "title" : "Queryables (as JSON)",
-         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/queryables?f=json"
+         "title" : "Schema (as JSON)",
+         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/schema?f=json"
       },
       {
-         "rel" : "queryables",
+         "rel" : "http://www.opengis.net/def/rel/ogc/1.0/schema",
          "type" : "text/plain",
-         "title" : "Queryables (as ECON)",
-         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/queryables?f=econ"
-      },
-      {
-         "rel" : "queryables",
-         "type" : "text/xml",
-         "title" : "Queryables (as XSD/WFS schema)",
-         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/queryables?f=xsd"
+         "title" : "Schema (as ECON)",
+         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/schema?f=econ"
       },
       {
-         "rel" : "queryables",
+         "rel" : "http://www.opengis.net/def/rel/ogc/1.0/schema",
          "type" : "text/html",
-         "title" : "Queryables (as HTML)",
-         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/queryables?f=html"
+         "title" : "Schema (as HTML)",
+         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/schema?f=html"
       },
       {
-         "rel" : "http://www.opengis.net/def/rel/ogc/0.0/schema-item",
+         "rel" : "http://www.opengis.net/def/rel/ogc/1.0/queryables",
          "type" : "application/json",
-         "title" : "Data attributes (as JSON)",
-         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/schemas/feature?f=json"
+         "title" : "Queryables (as JSON)",
+         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/queryables?f=json"
       },
       {
-         "rel" : "describedby",
+         "rel" : "http://www.opengis.net/def/rel/ogc/1.0/queryables",
          "type" : "text/plain",
-         "title" : "Data attributes (as ECON)",
-         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/schema?f=econ"
-      },
-      {
-         "rel" : "describedby",
-         "type" : "text/xml",
-         "title" : "Data attributes (as XSD/WFS schema)",
-         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/schema?f=xsd"
+         "title" : "Queryables (as ECON)",
+         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/queryables?f=econ"
       },
       {
-         "rel" : "describedby",
+         "rel" : "http://www.opengis.net/def/rel/ogc/1.0/queryables",
          "type" : "text/html",
-         "title" : "Data attributes (as HTML)",
-         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/schema?f=html"
+         "title" : "Queryables (as HTML)",
+         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/queryables?f=html"
       },
       {
          "rel" : "items",
@@ -256,6 +243,7 @@ Content-Type: application/json
    "storageCrs" : "http://www.opengis.net/def/crs/OGC/1.3/CRS84",
    "id" : "NaturalEarth:physical:ne_10m_lakes_europe",
    "dataType" : "vector",
+   "attribution" : "<a href='https://www.naturalearthdata.com/'>Natural Earth</a>",
    "minScaleDenominator" : 4367830.1877243574709,
    "minCellSize" : 0.010986328125,
    "geometryDimension" : 2
diff --git a/autotest/gdrivers/data/ogcapi/request_collections_NaturalEarth_physical_ne_10m_lakes_europe_f_json.http_data b/autotest/gdrivers/data/ogcapi/request_collections_NaturalEarth_physical_ne_10m_lakes_europe_f_json.http_data
index 1c08d6da6531..995f137c297a 100644
--- a/autotest/gdrivers/data/ogcapi/request_collections_NaturalEarth_physical_ne_10m_lakes_europe_f_json.http_data
+++ b/autotest/gdrivers/data/ogcapi/request_collections_NaturalEarth_physical_ne_10m_lakes_europe_f_json.http_data
@@ -1,15 +1,14 @@
 HTTP/1.1 200 OK
-Date: Tue, 20 Jun 2023 10:38:13 GMT
+Date: Fri, 12 Jul 2024 14:16:47 GMT
 Server: Apache/2.4.52 (Ubuntu)
-Expires: Wed, 12 Jun 2024 14:15:05 GMT
+Access-Control-Allow-Headers: x-requested-with, Content-Type, origin, authorization, acc$
+Expires: Sat, 12 Jul 2025 14:16:47 GMT
 Access-Control-Allow-Origin: *
 Vary: Accept,Accept-Encoding,Prefer
-Content-Length: 11484
-Access-Control-Allow-Headers: x-requested-with, Content-Type, origin, authorization, acc$
-Age: 591787
+Content-Type: application/json
+Content-Length: 11200
 Keep-Alive: timeout=5, max=100
 Connection: Keep-Alive
-Content-Type: application/json
 
 {
    "links" : [
@@ -43,52 +42,40 @@ Content-Type: application/json
          "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/dggs"
       },
       {
-         "rel" : "queryables",
+         "rel" : "http://www.opengis.net/def/rel/ogc/1.0/schema",
          "type" : "application/json",
-         "title" : "Queryables (as JSON)",
-         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/queryables?f=json"
+         "title" : "Schema (as JSON)",
+         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/schema?f=json"
       },
       {
-         "rel" : "queryables",
+         "rel" : "http://www.opengis.net/def/rel/ogc/1.0/schema",
          "type" : "text/plain",
-         "title" : "Queryables (as ECON)",
-         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/queryables?f=econ"
-      },
-      {
-         "rel" : "queryables",
-         "type" : "text/xml",
-         "title" : "Queryables (as XSD/WFS schema)",
-         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/queryables?f=xsd"
+         "title" : "Schema (as ECON)",
+         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/schema?f=econ"
       },
       {
-         "rel" : "queryables",
+         "rel" : "http://www.opengis.net/def/rel/ogc/1.0/schema",
          "type" : "text/html",
-         "title" : "Queryables (as HTML)",
-         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/queryables?f=html"
+         "title" : "Schema (as HTML)",
+         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/schema?f=html"
       },
       {
-         "rel" : "http://www.opengis.net/def/rel/ogc/0.0/schema-item",
+         "rel" : "http://www.opengis.net/def/rel/ogc/1.0/queryables",
          "type" : "application/json",
-         "title" : "Data attributes (as JSON)",
-         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/schemas/feature?f=json"
+         "title" : "Queryables (as JSON)",
+         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/queryables?f=json"
       },
       {
-         "rel" : "describedby",
+         "rel" : "http://www.opengis.net/def/rel/ogc/1.0/queryables",
          "type" : "text/plain",
-         "title" : "Data attributes (as ECON)",
-         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/schema?f=econ"
-      },
-      {
-         "rel" : "describedby",
-         "type" : "text/xml",
-         "title" : "Data attributes (as XSD/WFS schema)",
-         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/schema?f=xsd"
+         "title" : "Queryables (as ECON)",
+         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/queryables?f=econ"
       },
       {
-         "rel" : "describedby",
+         "rel" : "http://www.opengis.net/def/rel/ogc/1.0/queryables",
          "type" : "text/html",
-         "title" : "Data attributes (as HTML)",
-         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/schema?f=html"
+         "title" : "Queryables (as HTML)",
+         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/queryables?f=html"
       },
       {
          "rel" : "items",
@@ -256,6 +243,7 @@ Content-Type: application/json
    "storageCrs" : "http://www.opengis.net/def/crs/OGC/1.3/CRS84",
    "id" : "NaturalEarth:physical:ne_10m_lakes_europe",
    "dataType" : "vector",
+   "attribution" : "<a href='https://www.naturalearthdata.com/'>Natural Earth</a>",
    "minScaleDenominator" : 4367830.1877243574709,
    "minCellSize" : 0.010986328125,
    "geometryDimension" : 2
diff --git a/autotest/gdrivers/data/ogcapi/request_collections_NaturalEarth_physical_ne_10m_lakes_europe_items.json_limit_1000_crs_http___www.opengis.net_def_crs_OGC_1.3_CRS84.http_data b/autotest/gdrivers/data/ogcapi/request_collections_NaturalEarth_physical_ne_10m_lakes_europe_items.json_limit_1000_crs_http___www.opengis.net_def_crs_OGC_1.3_CRS84.http_data
deleted file mode 100644
index 492488527f86..000000000000
--- a/autotest/gdrivers/data/ogcapi/request_collections_NaturalEarth_physical_ne_10m_lakes_europe_items.json_limit_1000_crs_http___www.opengis.net_def_crs_OGC_1.3_CRS84.http_data
+++ /dev/null
@@ -1,258 +0,0 @@
-HTTP/1.1 200 OK
-Date: Tue, 20 Jun 2023 10:37:55 GMT
-Server: Apache/2.4.52 (Ubuntu)
-Expires: Wed, 12 Jun 2024 14:15:06 GMT
-Access-Control-Allow-Origin: *
-Vary: Accept,Accept-Encoding,Prefer
-Content-Crs: <http://www.opengis.net/def/crs/OGC/1.3/CRS84>
-Content-Length: 15561
-Access-Control-Allow-Headers: x-requested-with, Content-Type, origin, authorization, acc$
-Age: 591768
-Keep-Alive: timeout=5, max=100
-Connection: Keep-Alive
-Content-Type: application/json; charset=utf-8
-
-{
-   "type" : "FeatureCollection",
-   "features" : [ {
-      "type" : "Feature",
-      "id" : 1,
-      "geometry" : {
-         "type" : "Polygon",
-         "coordinates" : [
-            [ [-4.6543673319905, 58.1553000824025], [-4.6250972807178, 58.1436693142282], [-4.6081017670756, 58.1342702801685], [-4.5893036989562, 58.1245279023988], [-4.5722223493866, 58.1163305713239], [-4.5518792345724, 58.1083907480315], [-4.5339395257279, 58.101137612159], [-4.5218366599524, 58.0922965116279], [-4.4935108038821, 58.0780048297015], [-4.4530820820363, 58.0534128364768], [-4.4285330067753, 58.0354731276323], [-4.4254429133858, 58.0470180598791], [-4.4260437648782, 58.0616530855155], [-4.4324814594397, 58.0646573429775], [-4.4707642830983, 58.0880047152536], [-4.5038969511079, 58.1081761582128], [-4.5227808551547, 58.1120816929134], [-4.5409780717817, 58.1248712461088], [-4.5504200238052, 58.126330456876], [-4.563467084783, 58.126330456876], [-4.5802050906427, 58.14002128731], [-4.6111918604651, 58.154055461454], [-4.6317924830617, 58.1573601446622], [-4.6504188793261, 58.1622527925289], [-4.6814056491485, 58.1725960217909], [-4.7105898644937, 58.182252563633], [-4.7324780260026, 58.1904928126717], [-4.7421774858085, 58.1910936641641], [-4.7303321278154, 58.179591649881], [-4.6950535616188, 58.1656003937008], [-4.6762554934994, 58.1598064685955], [-4.6543673319905, 58.1553000824025] ]
-         ]
-      },
-      "properties" : {
-         "feature::id" : 1,
-         "id" : 98696,
-         "name" : "Loch Bhanabhaidh",
-         "pfafstette" : 57,
-         "lke_type" : "N",
-         "altitude" : 92,
-         "objectid" : 52843,
-         "scalerank" : 11,
-         "featurecla" : "Lake",
-         "funkyname" : 0
-      }
-   }, {
-      "type" : "Feature",
-      "id" : 2,
-      "geometry" : {
-         "type" : "Polygon",
-         "coordinates" : [
-            [ [-5.3823418329976, 57.6568508514924], [-5.347063266801, 57.6379669474455], [-5.3269776597693, 57.6345764283098], [-5.3370204632851, 57.6465076222304], [-5.392298800586, 57.6738463651346], [-5.4348734206189, 57.6929448590002], [-5.482598196301, 57.7117858450833], [-5.5333272294452, 57.7340173503021], [-5.5455159311481, 57.7360774125618], [-5.5558162424464, 57.7279229994507], [-5.5528119849844, 57.7191248168834], [-5.5443142281633, 57.7050906427394], [-5.5226835744369, 57.690798960813], [-5.5008812488555, 57.6859921488738], [-5.4810531496063, 57.6883526368797], [-5.4579632851126, 57.690798960813], [-5.4488646767991, 57.6829449734481], [-5.4330708661417, 57.6722584004761], [-5.4098951657206, 57.6668078190808], [-5.3823418329976, 57.6568508514924] ]
-         ]
-      },
-      "properties" : {
-         "feature::id" : 2,
-         "id" : 100550,
-         "name" : "Loch Maree",
-         "pfafstette" : 1,
-         "lke_type" : "N",
-         "altitude" : 39,
-         "objectid" : 54265,
-         "scalerank" : 12,
-         "featurecla" : "Lake",
-         "funkyname" : 0
-      }
-   }, {
-      "type" : "Feature",
-      "id" : 3,
-      "geometry" : {
-         "type" : "Polygon",
-         "coordinates" : [
-            [ [-5.6786474546786, 56.7646722212049], [-5.6926387108588, 56.7644147134225], [-5.7287756363304, 56.7677193966307], [-5.7285181285479, 56.7613675379967], [-5.6886902581945, 56.7580199368248], [-5.6689479948727, 56.7613675379967], [-5.6553000824025, 56.7631700924739], [-5.6409654825124, 56.7664747756821], [-5.625, 56.7784488875664], [-5.6206223676982, 56.7817535707746], [-5.5902364493683, 56.7938993545138], [-5.5324688701703, 56.8212380974181], [-5.471096182018, 56.8537699139352], [-5.4567615821278, 56.8656152719282], [-5.4643151437466, 56.8656152719282], [-5.4819973448086, 56.8574179408533], [-5.5114390679363, 56.8452292391503], [-5.5415674784838, 56.8270320225234], [-5.5850004577916, 56.8078476927303], [-5.625, 56.7896075581395], [-5.6303218275041, 56.7871612342062], [-5.6616519410365, 56.7719682750412], [-5.6786474546786, 56.7646722212049] ]
-         ]
-      },
-      "properties" : {
-         "feature::id" : 3,
-         "line::hidden" : [
-            { "contour" : 0, "segments" : [ { "from" : 2, "to" : 3 } ] }
-         ],
-         "id" : 103640,
-         "pfafstette" : 1,
-         "lke_type" : "N",
-         "altitude" : 3,
-         "objectid" : 56386,
-         "scalerank" : 12,
-         "featurecla" : "Lake",
-         "note" : "_untitled_56386",
-         "funkyname" : 0
-      }
-   }, {
-      "type" : "Feature",
-      "id" : 4,
-      "geometry" : {
-         "type" : "Polygon",
-         "coordinates" : [
-            [ [-4.4452710126351, 56.7525693554294], [-4.4300780534701, 56.7802085240798], [-4.4121383446255, 56.7975044634682], [-4.3905076908991, 56.8154441723128], [-4.3622676707563, 56.8394782320088], [-4.348619758286, 56.8604651162791], [-4.3263882530672, 56.8854004532137], [-4.3102510986999, 56.9020955411097], [-4.3239848470976, 56.8987479399377], [-4.3391778062626, 56.8866021561985], [-4.3531690624428, 56.8725679820546], [-4.366816974913, 56.8576754486358], [-4.4026963926021, 56.82458569859], [-4.4400350210584, 56.7929551593115], [-4.4522237227614, 56.7878050036623], [-4.4626098699872, 56.7699082127816], [-4.4541121131661, 56.7458741530855], [-4.4452710126351, 56.7525693554294] ]
-         ]
-      },
-      "properties" : {
-         "feature::id" : 4,
-         "id" : 103920,
-         "pfafstette" : 943,
-         "lke_type" : "N",
-         "altitude" : 358,
-         "objectid" : 56990,
-         "scalerank" : 12,
-         "featurecla" : "Lake",
-         "note" : "_untitled_56990",
-         "funkyname" : 0
-      }
-   }, {
-      "type" : "Feature",
-      "id" : 5,
-      "geometry" : {
-         "type" : "Polygon",
-         "coordinates" : [
-            [ [-4.2500801135323, 56.6966472486724], [-4.2175482970152, 56.6969047564549], [-4.1923983702619, 56.7048445797473], [-4.2109389305988, 56.7123981413661], [-4.2664747756821, 56.709737227614], [-4.3239848470976, 56.7020978300678], [-4.3674178264054, 56.6999519318806], [-4.4151426020875, 56.6987502288958], [-4.4378891228713, 56.6926129600806], [-4.4206361014466, 56.6908533235671], [-4.3772031221388, 56.68870742538], [-4.3032983885735, 56.6914112570958], [-4.2500801135323, 56.6966472486724] ]
-         ]
-      },
-      "properties" : {
-         "feature::id" : 5,
-         "id" : 104752,
-         "name" : "Loch Rannoch",
-         "pfafstette" : 9153,
-         "lke_type" : "N",
-         "altitude" : 205,
-         "objectid" : 57822,
-         "scalerank" : 12,
-         "featurecla" : "Lake",
-         "funkyname" : 0
-      }
-   }, {
-      "type" : "Feature",
-      "id" : 6,
-      "geometry" : {
-         "type" : "Polygon",
-         "coordinates" : [
-            [ [-5.3078362479399, 56.222790010987], [-5.2792528840872, 56.2403434581578], [-5.2729010254532, 56.25], [-5.2704117835561, 56.2537767808094], [-5.2627723860099, 56.2677251190258], [-5.2476652627724, 56.2771670710493], [-5.2273221479583, 56.2926604559605], [-5.2175368522249, 56.3121452114997], [-5.1989962918879, 56.3296986586706], [-5.1554774766526, 56.346822926204], [-5.1269799487273, 56.3562219602637], [-5.1032892327413, 56.3635180141], [-5.0719591192089, 56.3704707242263], [-5.0512726606849, 56.3814577229445], [-5.0443199505585, 56.3933030809376], [-5.0625171671855, 56.396908189892], [-5.0859503753891, 56.389054202527], [-5.113675379967, 56.3714149194287], [-5.1461213605567, 56.3571232375023], [-5.1713571232375, 56.3537756363303], [-5.2005413385827, 56.3419302783373], [-5.2238887108588, 56.3254926982238], [-5.237879967039, 56.3045058139535], [-5.2577080662882, 56.2860081715803], [-5.2798537355796, 56.2732186183849], [-5.2841455319539, 56.2589269364585], [-5.2931583043399, 56.25], [-5.2995101629738, 56.2437768952573], [-5.3324711591284, 56.2246354834279], [-5.3595094762864, 56.2136484847098], [-5.3755607947262, 56.2081979033144], [-5.3865477934444, 56.1990992950009], [-5.3595094762864, 56.2015456189343], [-5.3078362479399, 56.222790010987] ]
-         ]
-      },
-      "properties" : {
-         "feature::id" : 6,
-         "id" : 105653,
-         "name" : "Loch Awe",
-         "pfafstette" : 15,
-         "lke_type" : "N",
-         "altitude" : 124,
-         "objectid" : 58413,
-         "scalerank" : 11,
-         "featurecla" : "Lake",
-         "funkyname" : 0
-      }
-   }, {
-      "type" : "Feature",
-      "id" : 7,
-      "geometry" : {
-         "type" : "Polygon",
-         "coordinates" : [
-            [ [-4.297204037722, 56.4774652078374], [-4.2798651803699, 56.4799115317707], [-4.2528268632119, 56.4881517808094], [-4.2142006958433, 56.4966066196667], [-4.1719694195202, 56.5033018220106], [-4.1322273850943, 56.5233874290423], [-4.1020131386193, 56.5510265976927], [-4.0838159219923, 56.5665199826039], [-4.0543741988647, 56.5728718412379], [-4.0227865775499, 56.5793095357993], [-4.0139454770189, 56.5869060153818], [-4.0299967954587, 56.5877643746567], [-4.0689663065373, 56.5829575627175], [-4.1214978941586, 56.5546746246109], [-4.1662184123787, 56.520941105109], [-4.1993510803882, 56.5096965986083], [-4.2154023988281, 56.505748145944], [-4.2363463651346, 56.5015851034609], [-4.2777192821828, 56.4923577412562], [-4.3011524903864, 56.4835166407251], [-4.297204037722, 56.4774652078374] ]
-         ]
-      },
-      "properties" : {
-         "feature::id" : 7,
-         "id" : 105409,
-         "pfafstette" : 6551,
-         "lke_type" : "N",
-         "altitude" : 126,
-         "objectid" : 58448,
-         "scalerank" : 12,
-         "featurecla" : "Lake",
-         "note" : "_untitled_58448",
-         "funkyname" : 0
-      }
-   }, {
-      "type" : "Feature",
-      "id" : 8,
-      "geometry" : {
-         "type" : "Polygon",
-         "coordinates" : [
-            [ [-4.5220941677349, 56.06837117744], [-4.5202916132577, 56.0787573246658], [-4.5297335652811, 56.0863108862846], [-4.5428664621864, 56.094250709577], [-4.5553126716719, 56.1036497436367], [-4.569303927852, 56.1103020280168], [-4.5856985900018, 56.1203877494964], [-4.5993465024721, 56.1324476973082], [-4.6193462735763, 56.1360957242263], [-4.6388310291156, 56.1574259522066], [-4.6628650888116, 56.1872539370079], [-4.6805472898737, 56.2030048297015], [-4.6780580479766, 56.2184982146127], [-4.6808047976561, 56.2467811527193], [-4.6817489928585, 56.25], [-4.6895600622597, 56.2762657938107], [-4.6941093664164, 56.2966518265885], [-4.7050963651346, 56.3078534151254], [-4.705697216627, 56.2984543810657], [-4.7011479124702, 56.2796133949826], [-4.7054397088445, 56.2677680369896], [-4.7017487639627, 56.25], [-4.7008045687603, 56.2455365317707], [-4.7008045687603, 56.2194424098151], [-4.7020062717451, 56.2036056811939], [-4.6826073521333, 56.1854513825307], [-4.6701611426479, 56.1720180598791], [-4.6597749954221, 56.1470827229445], [-4.6421786302875, 56.1181560153818], [-4.6364276231459, 56.0926627449185], [-4.6316208112067, 56.072877563633], [-4.6340242171763, 56.063864791247], [-4.6354834279436, 56.0525773667826], [-4.6281873741073, 56.0400882393335], [-4.6096468137704, 56.0239940029299], [-4.5893036989562, 56.017298800586], [-4.590848745651, 56.0281999633767], [-4.5881019959714, 56.0449379692364], [-4.5622653817982, 56.0589721433803], [-4.5375446346823, 56.063864791247], [-4.5220941677349, 56.06837117744] ],
-            [ [-4.6041533144113, 56.0573841787218], [-4.5959130653726, 56.063864791247], [-4.6011490569493, 56.0556245422084], [-4.6041533144113, 56.0573841787218] ]
-         ]
-      },
-      "properties" : {
-         "feature::id" : 8,
-         "id" : 106243,
-         "name" : "Loch Lomond North Basin",
-         "pfafstette" : 15,
-         "lke_type" : "N",
-         "altitude" : 9,
-         "objectid" : 59258,
-         "scalerank" : 10,
-         "featurecla" : "Lake",
-         "funkyname" : 0
-      }
-   }, {
-      "type" : "Feature",
-      "id" : 9,
-      "geometry" : {
-         "type" : "Polygon",
-         "coordinates" : [
-            [ [-7.6527879509248, 54.3903217130562], [-7.6636891137154, 54.4100210584142], [-7.6798262680828, 54.4304070911921], [-7.6992251876946, 54.445943394067], [-7.7226583958982, 54.4659431651712], [-7.730211957517, 54.4884750961362], [-7.7236025911005, 54.4951273805164], [-7.735705456876, 54.5012217313679], [-7.7551902124153, 54.5069727385094], [-7.7514992675334, 54.5167151162791], [-7.7399972532503, 54.5252557910639], [-7.7472933070866, 54.5343114814137], [-7.7671214063358, 54.5377449185131], [-7.7822285295734, 54.5395474729903], [-7.7962197857535, 54.5401483244827], [-7.8105543856437, 54.5395474729903], [-7.8369060153818, 54.5413071095037], [-7.8695236678264, 54.5334531221388], [-7.8938152353049, 54.5213073383996], [-7.9211110602454, 54.5167151162791], [-7.9560462827321, 54.51122161692], [-7.974930186779, 54.4961144936825], [-7.9788786394433, 54.4848270692181], [-7.9873763962644, 54.4875738188976], [-8.0011101446622, 54.48817467039], [-8.0110671122505, 54.4802348470976], [-7.9919257004212, 54.4787756363303], [-7.9092657022523, 54.4817369758286], [-7.8366485075994, 54.476329312397], [-7.8211980406519, 54.4702349615455], [-7.8080651437466, 54.4640976927303], [-7.781627678081, 54.4528961041934], [-7.7506409082586, 54.4389906839407], [-7.7260059970701, 54.4231110373558], [-7.7020577733016, 54.417059604468], [-7.6889248763963, 54.4092056171031], [-7.68128547885, 54.3991198956235], [-7.6691826130745, 54.3857294909357], [-7.654247161692, 54.3735837071965], [-7.6527879509248, 54.3903217130562] ]
-         ]
-      },
-      "properties" : {
-         "feature::id" : 9,
-         "id" : 110629,
-         "name" : "Lower Lough Erne",
-         "lge_id" : "en",
-         "pfafstette" : 1151,
-         "lke_type" : "N",
-         "altitude" : 40,
-         "objectid" : 62367,
-         "scalerank" : 10,
-         "featurecla" : "Lake",
-         "funkyname" : 0
-      }
-   }, {
-      "type" : "Feature",
-      "id" : 10,
-      "geometry" : {
-         "type" : "Polygon",
-         "coordinates" : [
-            [ [-8.1280614814137, 54.4278749313313], [-8.1031690624428, 54.4169308505768], [-8.0888344625527, 54.4241839864494], [-8.0870319080755, 54.4381752426295], [-8.1194778886651, 54.4549132484893], [-8.1817947720198, 54.4688615867057], [-8.2217084783007, 54.4652564777513], [-8.2064296832082, 54.4549132484893], [-8.1815372642373, 54.4491622413477], [-8.1611083134957, 54.4424670390038], [-8.1280614814137, 54.4278749313313] ]
-         ]
-      },
-      "properties" : {
-         "feature::id" : 10,
-         "id" : 110689,
-         "name" : "Melvin ( Lough )",
-         "lge_id" : "en",
-         "pfafstette" : 1,
-         "altitude" : 24,
-         "objectid" : 62564,
-         "scalerank" : 12,
-         "featurecla" : "Lake",
-         "funkyname" : 0
-      }
-   } ],
-   "numberMatched" : 768,
-   "numberReturned" : 10,
-   "links" : [
-      {
-         "rel" : "self",
-         "type" : "application/geo+json",
-         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/items?limit=10&f=json"
-      },
-      {
-         "rel" : "alternate",
-         "type" : "text/html",
-         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/items?limit=10&f=html"
-      },
-      {
-         "rel" : "next",
-         "type" : "application/geo+json",
-         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/items?offset=10&limit=10&f=json"
-      },
-      {
-         "rel" : "collection",
-         "type" : "application/json",
-         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe"
-      }
-   ],
-   "timeStamp" : "2023-06-13T14:15:06Z"
-}
diff --git a/autotest/gdrivers/data/ogcapi/request_collections_NaturalEarth_physical_ne_10m_lakes_europe_items.json_limit_1000_crs_http___www.opengis.net_def_crs_OGC_1.3_CRS84_f_json.http_data b/autotest/gdrivers/data/ogcapi/request_collections_NaturalEarth_physical_ne_10m_lakes_europe_items.json_limit_1000_crs_http___www.opengis.net_def_crs_OGC_1.3_CRS84_f_json.http_data
new file mode 100644
index 000000000000..568271b3a224
--- /dev/null
+++ b/autotest/gdrivers/data/ogcapi/request_collections_NaturalEarth_physical_ne_10m_lakes_europe_items.json_limit_1000_crs_http___www.opengis.net_def_crs_OGC_1.3_CRS84_f_json.http_data
@@ -0,0 +1,16188 @@
+HTTP/1.1 200 OK
+Date: Fri, 12 Jul 2024 14:16:48 GMT
+Server: Apache/2.4.52 (Ubuntu)
+Expires: Sat, 12 Jul 2025 14:15:59 GMT
+Access-Control-Allow-Origin: *
+Vary: Accept,Accept-Encoding,Prefer
+Content-Crs: <http://www.opengis.net/def/crs/OGC/1.3/CRS84>
+Content-Length: 1022237
+Access-Control-Allow-Headers: x-requested-with, Content-Type, origin, authorization, acc$
+Age: 48
+Keep-Alive: timeout=5, max=100
+Connection: Keep-Alive
+Content-Type: application/json; charset=utf-8
+
+{
+   "type" : "FeatureCollection",
+   "features" : [ {
+      "type" : "Feature",
+      "id" : 1,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-4.6543673319905, 58.1553000824025], [-4.6250972807178, 58.1436693142282], [-4.6081017670756, 58.1342702801685], [-4.5893036989562, 58.1245279023988], [-4.5722223493866, 58.1163305713239], [-4.5518792345724, 58.1083907480315], [-4.5339395257279, 58.101137612159], [-4.5218366599524, 58.0922965116279], [-4.4935108038821, 58.0780048297015], [-4.4530820820363, 58.0534128364768], [-4.4285330067753, 58.0354731276323], [-4.4254429133858, 58.0470180598791], [-4.4260437648782, 58.0616530855155], [-4.4324814594397, 58.0646573429775], [-4.4707642830983, 58.0880047152536], [-4.5038969511079, 58.1081761582128], [-4.5227808551547, 58.1120816929134], [-4.5409780717817, 58.1248712461088], [-4.5504200238052, 58.126330456876], [-4.563467084783, 58.126330456876], [-4.5802050906427, 58.14002128731], [-4.6111918604651, 58.154055461454], [-4.6317924830617, 58.1573601446622], [-4.6504188793261, 58.1622527925289], [-4.6814056491485, 58.1725960217909], [-4.7105898644937, 58.182252563633], [-4.7324780260026, 58.1904928126717], [-4.7421774858085, 58.1910936641641], [-4.7303321278154, 58.179591649881], [-4.6950535616188, 58.1656003937008], [-4.6762554934994, 58.1598064685955], [-4.6543673319905, 58.1553000824025] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 1,
+         "id" : 98696,
+         "name" : "Loch Bhanabhaidh",
+         "pfafstette" : 57,
+         "lke_type" : "N",
+         "altitude" : 92,
+         "objectid" : 52843,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 2,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-5.3823418329976, 57.6568508514924], [-5.347063266801, 57.6379669474455], [-5.3269776597693, 57.6345764283098], [-5.3370204632851, 57.6465076222304], [-5.392298800586, 57.6738463651346], [-5.4348734206189, 57.6929448590002], [-5.482598196301, 57.7117858450833], [-5.5333272294452, 57.7340173503021], [-5.5455159311481, 57.7360774125618], [-5.5558162424464, 57.7279229994507], [-5.5528119849844, 57.7191248168834], [-5.5443142281633, 57.7050906427394], [-5.5226835744369, 57.690798960813], [-5.5008812488555, 57.6859921488738], [-5.4810531496063, 57.6883526368797], [-5.4579632851126, 57.690798960813], [-5.4488646767991, 57.6829449734481], [-5.4330708661417, 57.6722584004761], [-5.4098951657206, 57.6668078190808], [-5.3823418329976, 57.6568508514924] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 2,
+         "id" : 100550,
+         "name" : "Loch Maree",
+         "pfafstette" : 1,
+         "lke_type" : "N",
+         "altitude" : 39,
+         "objectid" : 54265,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 3,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-5.6786474546786, 56.7646722212049], [-5.6926387108588, 56.7644147134225], [-5.7287756363304, 56.7677193966307], [-5.7285181285479, 56.7613675379967], [-5.6886902581945, 56.7580199368248], [-5.6689479948727, 56.7613675379967], [-5.6553000824025, 56.7631700924739], [-5.6409654825124, 56.7664747756821], [-5.625, 56.7784488875664], [-5.6206223676982, 56.7817535707746], [-5.5902364493683, 56.7938993545138], [-5.5324688701703, 56.8212380974181], [-5.471096182018, 56.8537699139352], [-5.4567615821278, 56.8656152719282], [-5.4643151437466, 56.8656152719282], [-5.4819973448086, 56.8574179408533], [-5.5114390679363, 56.8452292391503], [-5.5415674784838, 56.8270320225234], [-5.5850004577916, 56.8078476927303], [-5.625, 56.7896075581395], [-5.6303218275041, 56.7871612342062], [-5.6616519410365, 56.7719682750412], [-5.6786474546786, 56.7646722212049] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 3,
+         "line::hidden" : [
+            { "contour" : 0, "segments" : [ { "from" : 2, "to" : 3 } ] }
+         ],
+         "id" : 103640,
+         "pfafstette" : 1,
+         "lke_type" : "N",
+         "altitude" : 3,
+         "objectid" : 56386,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_56386",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 4,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-4.4452710126351, 56.7525693554294], [-4.4300780534701, 56.7802085240798], [-4.4121383446255, 56.7975044634682], [-4.3905076908991, 56.8154441723128], [-4.3622676707563, 56.8394782320088], [-4.348619758286, 56.8604651162791], [-4.3263882530672, 56.8854004532137], [-4.3102510986999, 56.9020955411097], [-4.3239848470976, 56.8987479399377], [-4.3391778062626, 56.8866021561985], [-4.3531690624428, 56.8725679820546], [-4.366816974913, 56.8576754486358], [-4.4026963926021, 56.82458569859], [-4.4400350210584, 56.7929551593115], [-4.4522237227614, 56.7878050036623], [-4.4626098699872, 56.7699082127816], [-4.4541121131661, 56.7458741530855], [-4.4452710126351, 56.7525693554294] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 4,
+         "id" : 103920,
+         "pfafstette" : 943,
+         "lke_type" : "N",
+         "altitude" : 358,
+         "objectid" : 56990,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_56990",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 5,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-4.2500801135323, 56.6966472486724], [-4.2175482970152, 56.6969047564549], [-4.1923983702619, 56.7048445797473], [-4.2109389305988, 56.7123981413661], [-4.2664747756821, 56.709737227614], [-4.3239848470976, 56.7020978300678], [-4.3674178264054, 56.6999519318806], [-4.4151426020875, 56.6987502288958], [-4.4378891228713, 56.6926129600806], [-4.4206361014466, 56.6908533235671], [-4.3772031221388, 56.68870742538], [-4.3032983885735, 56.6914112570958], [-4.2500801135323, 56.6966472486724] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 5,
+         "id" : 104752,
+         "name" : "Loch Rannoch",
+         "pfafstette" : 9153,
+         "lke_type" : "N",
+         "altitude" : 205,
+         "objectid" : 57822,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 6,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-5.3078362479399, 56.222790010987], [-5.2792528840872, 56.2403434581578], [-5.2729010254532, 56.25], [-5.2704117835561, 56.2537767808094], [-5.2627723860099, 56.2677251190258], [-5.2476652627724, 56.2771670710493], [-5.2273221479583, 56.2926604559605], [-5.2175368522249, 56.3121452114997], [-5.1989962918879, 56.3296986586706], [-5.1554774766526, 56.346822926204], [-5.1269799487273, 56.3562219602637], [-5.1032892327413, 56.3635180141], [-5.0719591192089, 56.3704707242263], [-5.0512726606849, 56.3814577229445], [-5.0443199505585, 56.3933030809376], [-5.0625171671855, 56.396908189892], [-5.0859503753891, 56.389054202527], [-5.113675379967, 56.3714149194287], [-5.1461213605567, 56.3571232375023], [-5.1713571232375, 56.3537756363303], [-5.2005413385827, 56.3419302783373], [-5.2238887108588, 56.3254926982238], [-5.237879967039, 56.3045058139535], [-5.2577080662882, 56.2860081715803], [-5.2798537355796, 56.2732186183849], [-5.2841455319539, 56.2589269364585], [-5.2931583043399, 56.25], [-5.2995101629738, 56.2437768952573], [-5.3324711591284, 56.2246354834279], [-5.3595094762864, 56.2136484847098], [-5.3755607947262, 56.2081979033144], [-5.3865477934444, 56.1990992950009], [-5.3595094762864, 56.2015456189343], [-5.3078362479399, 56.222790010987] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 6,
+         "id" : 105653,
+         "name" : "Loch Awe",
+         "pfafstette" : 15,
+         "lke_type" : "N",
+         "altitude" : 124,
+         "objectid" : 58413,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 7,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-4.297204037722, 56.4774652078374], [-4.2798651803699, 56.4799115317707], [-4.2528268632119, 56.4881517808094], [-4.2142006958433, 56.4966066196667], [-4.1719694195202, 56.5033018220106], [-4.1322273850943, 56.5233874290423], [-4.1020131386193, 56.5510265976927], [-4.0838159219923, 56.5665199826039], [-4.0543741988647, 56.5728718412379], [-4.0227865775499, 56.5793095357993], [-4.0139454770189, 56.5869060153818], [-4.0299967954587, 56.5877643746567], [-4.0689663065373, 56.5829575627175], [-4.1214978941586, 56.5546746246109], [-4.1662184123787, 56.520941105109], [-4.1993510803882, 56.5096965986083], [-4.2154023988281, 56.505748145944], [-4.2363463651346, 56.5015851034609], [-4.2777192821828, 56.4923577412562], [-4.3011524903864, 56.4835166407251], [-4.297204037722, 56.4774652078374] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 7,
+         "id" : 105409,
+         "pfafstette" : 6551,
+         "lke_type" : "N",
+         "altitude" : 126,
+         "objectid" : 58448,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_58448",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 8,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-4.5220941677349, 56.06837117744], [-4.5202916132577, 56.0787573246658], [-4.5297335652811, 56.0863108862846], [-4.5428664621864, 56.094250709577], [-4.5553126716719, 56.1036497436367], [-4.569303927852, 56.1103020280168], [-4.5856985900018, 56.1203877494964], [-4.5993465024721, 56.1324476973082], [-4.6193462735763, 56.1360957242263], [-4.6388310291156, 56.1574259522066], [-4.6628650888116, 56.1872539370079], [-4.6805472898737, 56.2030048297015], [-4.6780580479766, 56.2184982146127], [-4.6808047976561, 56.2467811527193], [-4.6817489928585, 56.25], [-4.6895600622597, 56.2762657938107], [-4.6941093664164, 56.2966518265885], [-4.7050963651346, 56.3078534151254], [-4.705697216627, 56.2984543810657], [-4.7011479124702, 56.2796133949826], [-4.7054397088445, 56.2677680369896], [-4.7017487639627, 56.25], [-4.7008045687603, 56.2455365317707], [-4.7008045687603, 56.2194424098151], [-4.7020062717451, 56.2036056811939], [-4.6826073521333, 56.1854513825307], [-4.6701611426479, 56.1720180598791], [-4.6597749954221, 56.1470827229445], [-4.6421786302875, 56.1181560153818], [-4.6364276231459, 56.0926627449185], [-4.6316208112067, 56.072877563633], [-4.6340242171763, 56.063864791247], [-4.6354834279436, 56.0525773667826], [-4.6281873741073, 56.0400882393335], [-4.6096468137704, 56.0239940029299], [-4.5893036989562, 56.017298800586], [-4.590848745651, 56.0281999633767], [-4.5881019959714, 56.0449379692364], [-4.5622653817982, 56.0589721433803], [-4.5375446346823, 56.063864791247], [-4.5220941677349, 56.06837117744] ],
+            [ [-4.6041533144113, 56.0573841787218], [-4.5959130653726, 56.063864791247], [-4.6011490569493, 56.0556245422084], [-4.6041533144113, 56.0573841787218] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 8,
+         "id" : 106243,
+         "name" : "Loch Lomond North Basin",
+         "pfafstette" : 15,
+         "lke_type" : "N",
+         "altitude" : 9,
+         "objectid" : 59258,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 9,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-7.6527879509248, 54.3903217130562], [-7.6636891137154, 54.4100210584142], [-7.6798262680828, 54.4304070911921], [-7.6992251876946, 54.445943394067], [-7.7226583958982, 54.4659431651712], [-7.730211957517, 54.4884750961362], [-7.7236025911005, 54.4951273805164], [-7.735705456876, 54.5012217313679], [-7.7551902124153, 54.5069727385094], [-7.7514992675334, 54.5167151162791], [-7.7399972532503, 54.5252557910639], [-7.7472933070866, 54.5343114814137], [-7.7671214063358, 54.5377449185131], [-7.7822285295734, 54.5395474729903], [-7.7962197857535, 54.5401483244827], [-7.8105543856437, 54.5395474729903], [-7.8369060153818, 54.5413071095037], [-7.8695236678264, 54.5334531221388], [-7.8938152353049, 54.5213073383996], [-7.9211110602454, 54.5167151162791], [-7.9560462827321, 54.51122161692], [-7.974930186779, 54.4961144936825], [-7.9788786394433, 54.4848270692181], [-7.9873763962644, 54.4875738188976], [-8.0011101446622, 54.48817467039], [-8.0110671122505, 54.4802348470976], [-7.9919257004212, 54.4787756363303], [-7.9092657022523, 54.4817369758286], [-7.8366485075994, 54.476329312397], [-7.8211980406519, 54.4702349615455], [-7.8080651437466, 54.4640976927303], [-7.781627678081, 54.4528961041934], [-7.7506409082586, 54.4389906839407], [-7.7260059970701, 54.4231110373558], [-7.7020577733016, 54.417059604468], [-7.6889248763963, 54.4092056171031], [-7.68128547885, 54.3991198956235], [-7.6691826130745, 54.3857294909357], [-7.654247161692, 54.3735837071965], [-7.6527879509248, 54.3903217130562] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 9,
+         "id" : 110629,
+         "name" : "Lower Lough Erne",
+         "lge_id" : "en",
+         "pfafstette" : 1151,
+         "lke_type" : "N",
+         "altitude" : 40,
+         "objectid" : 62367,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 10,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-8.1280614814137, 54.4278749313313], [-8.1031690624428, 54.4169308505768], [-8.0888344625527, 54.4241839864494], [-8.0870319080755, 54.4381752426295], [-8.1194778886651, 54.4549132484893], [-8.1817947720198, 54.4688615867057], [-8.2217084783007, 54.4652564777513], [-8.2064296832082, 54.4549132484893], [-8.1815372642373, 54.4491622413477], [-8.1611083134957, 54.4424670390038], [-8.1280614814137, 54.4278749313313] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 10,
+         "id" : 110689,
+         "name" : "Melvin ( Lough )",
+         "lge_id" : "en",
+         "pfafstette" : 1,
+         "altitude" : 24,
+         "objectid" : 62564,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 11,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-9.4830674327046, 53.570545687603], [-9.4472738509431, 53.5696444103644], [-9.3980040285662, 53.5687431331258], [-9.3548285570408, 53.5687431331258], [-9.3198933345541, 53.5866828419703], [-9.3162882255997, 53.6040216993225], [-9.3107947262406, 53.6103735579564], [-9.2964601263505, 53.6085280855155], [-9.2865031587621, 53.6073263825307], [-9.2958592748581, 53.6176696117927], [-9.3010094305072, 53.6307595907343], [-9.2877048617469, 53.6358668284197], [-9.2940567203809, 53.666038156931], [-9.3210950375389, 53.6963382393335], [-9.3463308002198, 53.6766388939755], [-9.3761158670573, 53.6447079289507], [-9.3934547244095, 53.6292145440396], [-9.4028108405054, 53.6238068806079], [-9.4192913385827, 53.6137211591284], [-9.4524240065922, 53.6040216993225], [-9.4791189800403, 53.5970689891961], [-9.4666727705549, 53.5958243682476], [-9.4307933528658, 53.5982277742172], [-9.4067592931698, 53.58874290423], [-9.4171454403955, 53.5775413156931], [-9.4398919611793, 53.5760391869621], [-9.4676169657572, 53.5762966947445], [-9.4830674327046, 53.570545687603] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 11,
+         "id" : 112193,
+         "name" : "Mask ( Lough )",
+         "lge_id" : "en",
+         "pfafstette" : 59,
+         "lke_type" : "R",
+         "altitude" : 17,
+         "objectid" : 63754,
+         "scalerank" : 10,
+         "featurecla" : "Reservoir",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 12,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-9.2281347280718, 54.0468921671855], [-9.2238429316975, 54.0580937557224], [-9.2253021424648, 54.0744884178722], [-9.2350874381981, 54.0833295184032], [-9.2463319446988, 54.0891234435085], [-9.2630699505585, 54.1040159769273], [-9.2897649240066, 54.106076039187], [-9.2983485167552, 54.0909689159495], [-9.2983485167552, 54.0742309100897], [-9.2998077275224, 54.0571495605201], [-9.2842714246475, 54.0416132576451], [-9.2673617469328, 54.0291670481597], [-9.2688209577001, 54.0118281908075], [-9.2666750595129, 53.9991673915034], [-9.2435851950192, 53.9993819813221], [-9.2259029939572, 53.9975794268449], [-9.2132851126168, 53.9939743178905], [-9.1906244277605, 53.9997682429958], [-9.1958604193371, 54.0170212644204], [-9.2204094945981, 54.0307120948544], [-9.2311389855338, 54.0365060199597], [-9.2281347280718, 54.0468921671855] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 12,
+         "id" : 111227,
+         "name" : "Conn (Lough)",
+         "lge_id" : "en",
+         "pfafstette" : 913,
+         "lke_type" : "B",
+         "altitude" : 6,
+         "objectid" : 64142,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 13,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-9.1654745010072, 53.4271138527742], [-9.1353460904596, 53.4192169474455], [-9.121097326497, 53.4052256912653], [-9.1301959348105, 53.4018780900934], [-9.1386936916316, 53.3967279344442], [-9.1298525911005, 53.3873289003846], [-9.1186080845999, 53.3763419016664], [-9.1292517396081, 53.3669428676067], [-9.1435863394983, 53.3602476652628], [-9.1363761215895, 53.3529086934627], [-9.1274491851309, 53.3423079564182], [-9.1125995696759, 53.3286171259843], [-9.0831578465483, 53.3210635643655], [-9.063329747299, 53.3259132942685], [-9.0526860922908, 53.333509773851], [-9.0457333821645, 53.3423079564182], [-9.0502826863212, 53.3569429820546], [-9.0651323017762, 53.3650973951657], [-9.0810119483611, 53.3842388069951], [-9.0690807544406, 53.4079724409449], [-9.0535444515657, 53.4185731779894], [-9.0714841604102, 53.4219636971251], [-9.0957757278887, 53.4273713605567], [-9.1314834737228, 53.4365128868339], [-9.1489940029299, 53.4375], [-9.1700238051639, 53.4386587850211], [-9.1824700146493, 53.4438518586339], [-9.1888218732833, 53.4526500412012], [-9.2022981138986, 53.4544955136422], [-9.2159460263688, 53.4565555759018], [-9.2208386742355, 53.4717914530306], [-9.2202378227431, 53.4924349935909], [-9.2289930873467, 53.511619323384], [-9.2445293902216, 53.5246663843618], [-9.2542288500275, 53.5338079106391], [-9.2639283098334, 53.5377134453397], [-9.2779195660136, 53.5389580662882], [-9.2897649240066, 53.5389580662882], [-9.3198933345541, 53.5328637154367], [-9.3490775498993, 53.5317049304157], [-9.3837552646036, 53.52831441128], [-9.423239791247, 53.5185720335103], [-9.4469305072331, 53.5152673503021], [-9.4641835286578, 53.5048812030764], [-9.4830674327046, 53.4933362708295], [-9.4994620948544, 53.4985293444424], [-9.5092473905878, 53.5077137886834], [-9.5253845449551, 53.5082288042483], [-9.5149983977294, 53.4948813175243], [-9.4785181285479, 53.486083134957], [-9.4505356161875, 53.4915337163523], [-9.4201496978575, 53.4918341420985], [-9.3891629280352, 53.489087392419], [-9.3733691173778, 53.4842805804798], [-9.3581761582128, 53.4736369254715], [-9.338948910456, 53.469388047061], [-9.3280477476653, 53.4626499267533], [-9.3195499908442, 53.4499032915217], [-9.290365775499, 53.4414055347006], [-9.278520417506, 53.4375], [-9.2672759110053, 53.4337661371544], [-9.2548297015199, 53.4307189617286], [-9.23877838308, 53.4279722120491], [-9.2071049258378, 53.4240666773485], [-9.1654745010072, 53.4271138527742] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 13,
+         "id" : 112557,
+         "name" : "Corrib ( Lough )",
+         "lge_id" : "en",
+         "pfafstette" : 13,
+         "lke_type" : "B",
+         "altitude" : 5,
+         "objectid" : 65702,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 14,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-6.5310840505402, 53.1141989791247], [-6.5249896996887, 53.1144994048709], [-6.5085092016114, 53.1193920527376], [-6.4769215802967, 53.1312374107306], [-6.4613852774217, 53.148876693829], [-6.4835309467131, 53.1619237548068], [-6.5057624519319, 53.177760483428], [-6.5045607489471, 53.1883612204725], [-6.4860201886102, 53.1917088216444], [-6.4726297839224, 53.1971594030397], [-6.4933162424465, 53.1969018952573], [-6.5152044039553, 53.1838548342794], [-6.5261914026735, 53.1683614493683], [-6.5465345174877, 53.1558723219191], [-6.5607832814503, 53.1452286669108], [-6.5537447353965, 53.1406364447903], [-6.5458478300678, 53.1458295184032], [-6.5361483702619, 53.15037882256], [-6.520097051822, 53.1604216260758], [-6.5078225141916, 53.1649280122688], [-6.5036165537447, 53.1540697674419], [-6.5167494506501, 53.1400355932979], [-6.5315990661051, 53.1251430598792], [-6.5310840505402, 53.1141989791247] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 14,
+         "id" : 114569,
+         "name" : "Pollaphuca Reservoir",
+         "lge_id" : "en",
+         "pfafstette" : 7971,
+         "lke_type" : "B",
+         "altitude" : 182,
+         "objectid" : 67053,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 15,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-9.5356848562534, 52.0244260437649], [-9.5137966947446, 52.0198338216444], [-9.5062431331258, 52.026571941952], [-9.5163717725691, 52.032923800586], [-9.5101915857902, 52.0377735304889], [-9.4892476194836, 52.0423657526094], [-9.4880459164988, 52.0503055759019], [-9.5004921259843, 52.0520652124153], [-9.5153417414393, 52.0529664896539], [-9.52658624794, 52.0663998123054], [-9.5378307544406, 52.0760992721113], [-9.5573155099799, 52.0788460217909], [-9.5846113349204, 52.0788460217909], [-9.5970575444058, 52.0709491164622], [-9.5867572331075, 52.0636101446622], [-9.5719076176525, 52.0539106848563], [-9.5561138069951, 52.0438249633767], [-9.5488177531588, 52.0350267808094], [-9.5356848562534, 52.0244260437649] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 15,
+         "id" : 116430,
+         "name" : "Leane ( Lough )",
+         "lge_id" : "en",
+         "pfafstette" : 551,
+         "lke_type" : "B",
+         "altitude" : 17,
+         "objectid" : 67929,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 16,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-2.0954266617836, 47.3628055759019], [-2.083838811573, 47.3615609549533], [-2.0784311481414, 47.3710458249405], [-2.0884739516572, 47.3882988463651], [-2.1040102545321, 47.39683952115], [-2.1249542208387, 47.3947365409266], [-2.1416922266984, 47.3971828648599], [-2.1561984984435, 47.40417849295], [-2.1749965665629, 47.4184701748764], [-2.1878719556858, 47.4303155328694], [-2.1845243545138, 47.4184701748764], [-2.1784300036623, 47.3928910684856], [-2.1668421534518, 47.3667540285662], [-2.138258789599, 47.3570545687603], [-2.1243533693463, 47.3640072788867], [-2.1097612616737, 47.3792860739791], [-2.0920790606116, 47.3843933116645], [-2.0945683025087, 47.3716037584691], [-2.0954266617836, 47.3628055759019] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 16,
+         "id" : 131773,
+         "pfafstette" : 3,
+         "altitude" : 0,
+         "objectid" : 80857,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_80857",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 17,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-1.7005813953488, 47.1181731825673], [-1.7072765976927, 47.0974867240432], [-1.6914827870353, 47.0810491439297], [-1.6659036806446, 47.0761994140267], [-1.64830731551, 47.0831521241531], [-1.6388653634865, 47.0928945019227], [-1.642298800586, 47.1114779802234], [-1.6705388207288, 47.1272717908808], [-1.7005813953488, 47.1181731825673] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 17,
+         "id" : 132438,
+         "pfafstette" : 1231,
+         "lke_type" : "N",
+         "altitude" : -1,
+         "objectid" : 82683,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_82683",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 18,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-1.1866387795275, 44.3152009705182], [-1.1759951245193, 44.3221536806446], [-1.1623472120491, 44.3333981871452], [-1.1246223219191, 44.3422392876763], [-1.099429477202, 44.3516812396997], [-1.1121761124336, 44.3580330983336], [-1.1417036714887, 44.3662304294085], [-1.1727333592748, 44.3853718412379], [-1.1936344076176, 44.3923245513642], [-1.1996858405054, 44.36498580846], [-1.1933339818714, 44.3291493087347], [-1.1866387795275, 44.3152009705182] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 18,
+         "id" : 136391,
+         "name" : "tang de Biscarrosse",
+         "pfafstette" : 51,
+         "lke_type" : "N",
+         "altitude" : 18,
+         "objectid" : 84651,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 19,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-1.1796860694012, 44.4434827641458], [-1.1596004623695, 44.4486329197949], [-1.1511027055484, 44.4567873329061], [-1.1298153955319, 44.473825764512], [-1.0911892281633, 44.4936109457975], [-1.0905454587072, 44.5039112570958], [-1.1155237136056, 44.5176020875298], [-1.1331629967039, 44.5251985671123], [-1.150501854056, 44.5324946209486], [-1.1723470976012, 44.5322371131661], [-1.1935914896539, 44.5167437282549], [-1.1978832860282, 44.4929671763413], [-1.197239516572, 44.4720661279985], [-1.1954369620948, 44.4559289736312], [-1.1796860694012, 44.4434827641458] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 19,
+         "id" : 136281,
+         "name" : "tang de Cazaux",
+         "pfafstette" : 191,
+         "lke_type" : "N",
+         "altitude" : 20,
+         "objectid" : 84907,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 20,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-5.0605429408533, 42.9805381340414], [-5.0812723173412, 42.9634997024355], [-5.0770663568943, 42.9557744689617], [-5.0524743636697, 42.9529418833547], [-5.0342771470427, 42.9700232329244], [-5.0190412699139, 42.9679631706647], [-5.0093847280718, 42.9687356940121], [-4.9996423503021, 42.9663322880425], [-4.9853506683758, 42.9665468778612], [-4.9798571690167, 42.9708386742355], [-4.9883978438015, 42.9841861609595], [-4.9999427760483, 43.0033704907526], [-5.0077967634133, 43.0149154229995], [-5.0096422358542, 43.0051301272661], [-5.0261227339315, 42.993284769273], [-5.0439766068486, 42.9854307819081], [-5.0605429408533, 42.9805381340414] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 20,
+         "id" : 137030,
+         "pfafstette" : 49793,
+         "lke_type" : "N",
+         "altitude" : 1089,
+         "objectid" : 85068,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_85068",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 21,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-1.0902879509247, 45.1130459164988], [-1.0851377952756, 45.1267367469328], [-1.0823910455961, 45.1485819904779], [-1.0766400384545, 45.1640753753891], [-1.0803309833364, 45.1808133812489], [-1.0906312946347, 45.1993539415858], [-1.0982706921809, 45.2118001510712], [-1.116124565098, 45.2184953534151], [-1.1255665171214, 45.2115426432888], [-1.1277124153086, 45.184461408167], [-1.1368110236221, 45.1626161646219], [-1.1380127266069, 45.1452773072697], [-1.1405019685039, 45.1288397271562], [-1.1411028199963, 45.1197411188427], [-1.1393002655191, 45.0978529573338], [-1.1382702343893, 45.0769089910273], [-1.1268540560337, 45.0708146401758], [-1.110116050174, 45.074119323384], [-1.0970689891961, 45.0948057819081], [-1.0902879509247, 45.1130459164988] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 21,
+         "id" : 135612,
+         "name" : "tang de Carcans",
+         "pfafstette" : 95,
+         "lke_type" : "N",
+         "altitude" : 12,
+         "objectid" : 85494,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 22,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-6.0178281221388, 41.6413689113715], [-6.0300168238418, 41.6523559100897], [-6.0327206555576, 41.6511112891412], [-6.0223774262955, 41.6380642281633], [-6.0050385689434, 41.6334720060428], [-5.9941374061527, 41.6213262223036], [-5.989244758286, 41.6137297427211], [-5.9849958798755, 41.5985367835561], [-5.9804465757187, 41.5820992034426], [-5.9789444469877, 41.5648461820179], [-5.9825495559421, 41.5501682384179], [-5.9589875938473, 41.5432155282915], [-5.9593309375572, 41.5668204083501], [-5.9589875938473, 41.5778932429958], [-5.9449963376671, 41.5882793902216], [-5.9293312809009, 41.5942020692181], [-5.9140524858085, 41.6046311344076], [-5.9069710217909, 41.6087083409632], [-5.8945248123054, 41.640124290423], [-5.8867137429042, 41.6484932933529], [-5.8730229124702, 41.650467519685], [-5.8585595586889, 41.6568622962827], [-5.8573578557041, 41.6681068027834], [-5.8515639305988, 41.6739007278887], [-5.8437528611976, 41.6836431056583], [-5.8300620307636, 41.6934284013917], [-5.8222509613624, 41.7032136971251], [-5.8125085835927, 41.7032136971251], [-5.8056417093939, 41.7088788683391], [-5.8080880333272, 41.7182779023988], [-5.8364138893975, 41.7170332814503], [-5.8554694652994, 41.7051450054935], [-5.8710916041018, 41.6953597097601], [-5.8847395165721, 41.6856173319905], [-5.9003616553745, 41.6641154321553], [-5.9132370444973, 41.651969648416], [-5.9275287264237, 41.6295235533785], [-5.9277433162424, 41.6211545504486], [-5.9382152993957, 41.6127855475188], [-5.9597601171946, 41.6131718091925], [-5.9764981230544, 41.6150172816334], [-5.9950386833913, 41.6316694515656], [-6.0178281221388, 41.6413689113715] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 22,
+         "id" : 138193,
+         "pfafstette" : 41137,
+         "lke_type" : "N",
+         "altitude" : 670,
+         "objectid" : 85963,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_85963",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 23,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-6.2561515748031, 41.2478111838491], [-6.2385122917048, 41.2398713605567], [-6.2172249816883, 41.230128982787], [-6.19958569859, 41.2210732924373], [-6.174049510163, 41.2180261170115], [-6.1965385231643, 41.2385409036806], [-6.2193708798755, 41.2491416407251], [-6.228126144479, 41.2555793352866], [-6.2387697994873, 41.2631328969053], [-6.2473104742721, 41.269356001648], [-6.2567095083318, 41.2888407571873], [-6.2752500686687, 41.2857935817616], [-6.2950352499542, 41.2906433116645], [-6.3101852911555, 41.2994414942318], [-6.323618613807, 41.2954930415675], [-6.321773141366, 41.2793558872001], [-6.3068806079473, 41.2602573933345], [-6.2956361014466, 41.2414164072514], [-6.284048251236, 41.2252792528841], [-6.2807435680278, 41.2374250366233], [-6.2764946896173, 41.2505150155649], [-6.2561515748031, 41.2478111838491] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 23,
+         "id" : 138392,
+         "pfafstette" : 21151,
+         "lke_type" : "N",
+         "altitude" : 707,
+         "objectid" : 86384,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_86384",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 24,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-4.0397820911921, 42.9854307819081], [-3.9978083226515, 42.9869329106391], [-3.9917568897638, 42.9899800860648], [-3.979868613807, 42.9948727339315], [-3.9592250732467, 42.9975765656473], [-3.947980566746, 43.0000228895807], [-3.935791865043, 43.0015250183117], [-3.9151483244827, 42.9990786943783], [-3.8917151162791, 42.9975765656473], [-3.8710715757187, 43.0075764511994], [-3.8686252517854, 43.0277049761948], [-3.8856636833913, 43.0410095449551], [-3.9178521561985, 43.0453013413294], [-3.9500835469694, 43.0319109366417], [-3.9673794863578, 43.0243144570592], [-3.9802119575169, 43.0285633354697], [-3.9959628502106, 43.0181771882439], [-4.0066494231826, 42.9997224638345], [-4.0230440853324, 42.990623855521], [-4.0473356528108, 42.993284769273], [-4.0558763275957, 43.0026838033327], [-4.0373357672587, 43.0087781541842], [-4.0202973356528, 43.0133703763047], [-4.0291813541476, 43.0185634499176], [-4.0519278749313, 43.0155162744919], [-4.0734726927303, 43.0042717679912], [-4.0781078328145, 42.9918255585058], [-4.0397820911921, 42.9854307819081] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 24,
+         "id" : 137132,
+         "pfafstette" : 995993,
+         "lke_type" : "N",
+         "altitude" : 834,
+         "objectid" : 86670,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_86670",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 25,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-5.2792958020509, 38.9560777559055], [-5.3026431743271, 38.9502838308002], [-5.3309261124336, 38.9462924601721], [-5.3442735991577, 38.9311424189709], [-5.3774491851309, 38.9220008926937], [-5.3910970976012, 38.9207991897088], [-5.404144158579, 38.9235459393884], [-5.4145303058048, 38.92895360282], [-5.4253885506318, 38.93629257462], [-5.4400664942318, 38.9462924601721], [-5.4594654138436, 38.953331006226], [-5.4704524125618, 38.9448332494049], [-5.4753450604285, 38.9338462506867], [-5.4722978850028, 38.925949345358], [-5.4550877815418, 38.9199837483977], [-5.4374914164073, 38.9180524400293], [-5.4166332860282, 38.9138035616188], [-5.4017407526094, 38.9056062305439], [-5.3837581258011, 38.9068079335287], [-5.3735436504303, 38.9077092107673], [-5.3552176799121, 38.9074087850211], [-5.3421706189343, 38.9071083592749], [-5.331526963926, 38.9046620353415], [-5.3254326130745, 38.9177520142831], [-5.3050894982604, 38.9311424189709], [-5.2868493636697, 38.9280952435451], [-5.2683088033327, 38.9259064273943], [-5.251570797473, 38.9271510483428], [-5.2168072468412, 38.9121726789965], [-5.1933311206739, 38.8985247665263], [-5.1634602179088, 38.8812717451016], [-5.1513144341696, 38.8703705823109], [-5.1373231779894, 38.8648770829518], [-5.1172804889214, 38.8487399285845], [-5.0865512268815, 38.8448343938839], [-5.0659076863212, 38.8389975508149], [-5.0720020371727, 38.8201994826955], [-5.0777530443142, 38.8016589223585], [-5.0816585790148, 38.7858221937374], [-5.078954747299, 38.7733330662882], [-5.0780963880242, 38.7559083730086], [-5.0689548617469, 38.7506294634682], [-5.0605429408533, 38.785221342245], [-5.0643197216627, 38.8047060977843], [-5.0516160043948, 38.8128605108954], [-5.0379680919246, 38.8241050173961], [-5.01268941128, 38.8274097006043], [-5.008183025087, 38.8338473951657], [-5.0306291201245, 38.8372379143014], [-5.0410152673503, 38.8457785890863], [-5.0576674372826, 38.8514437603003], [-5.0692123695294, 38.8605852865776], [-5.0783538958066, 38.8639758057132], [-5.0883537813587, 38.865177508698], [-5.1047913614723, 38.8761215894525], [-5.1184392739425, 38.8891686504303], [-5.1266795229811, 38.8836751510712], [-5.1379240294818, 38.8816150888116], [-5.153417414393, 38.8928166773485], [-5.168610373558, 38.9007565006409], [-5.1835029069768, 38.9044045275591], [-5.189811847647, 38.9249193142282], [-5.1905414530306, 38.9511851080388], [-5.1935457104926, 38.9718286485992], [-5.1871080159312, 38.9879228850028], [-5.1850479536715, 39.0025579106391], [-5.1795544543124, 39.0186950650064], [-5.1591684215345, 39.0268494781176], [-5.14856768449, 39.0317421259843], [-5.1613143197217, 39.0356476606849], [-5.1768077046329, 39.0295533098334], [-5.1871080159312, 39.0238023026918], [-5.1962924601721, 39.0177079518403], [-5.1965928859183, 39.0016137154367], [-5.1974941631569, 38.9897683574437], [-5.2114854193371, 38.9688243911372], [-5.2366782640542, 38.951485533785], [-5.2607123237502, 38.95933952115], [-5.2792958020509, 38.9560777559055] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 25,
+         "id" : 139988,
+         "pfafstette" : 61571,
+         "lke_type" : "N",
+         "altitude" : 426,
+         "objectid" : 86994,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_86994",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 26,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-5.4294228392236, 39.0095106207654], [-5.4065904825124, 39.0104548159678], [-5.4017407526094, 39.0204976194836], [-5.3847452389672, 39.0254761032778], [-5.3437585835928, 39.0450037767808], [-5.3280935268266, 39.0586516892511], [-5.3169348562534, 39.0736729765611], [-5.2995959989013, 39.0849174830617], [-5.2822142235854, 39.1039301409998], [-5.2832013367515, 39.1104965894525], [-5.3162910867973, 39.1050889260209], [-5.3264197262406, 39.0929002243179], [-5.34521779436, 39.0715270783739], [-5.3643592061893, 39.0629864035891], [-5.3983502334737, 39.0517848150522], [-5.4189937740341, 39.0413128318989], [-5.4409248535067, 39.0340596960264], [-5.4499805438564, 39.0329009110053], [-5.4907096914485, 39.0274074116462], [-5.5195076451199, 39.0274074116462], [-5.5351297839224, 39.013759499176], [-5.5175763367515, 39.000068668742], [-5.4938427028017, 38.9977081807361], [-5.4774051226882, 38.9973648370262], [-5.4561607306354, 38.9985236220473], [-5.4400664942318, 39.007407640542], [-5.4294228392236, 39.0095106207654] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 26,
+         "id" : 139903,
+         "pfafstette" : 711151,
+         "lke_type" : "N",
+         "altitude" : 312,
+         "objectid" : 87124,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_87124",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 27,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-2.2307040835012, 39.695683025087], [-2.2635363257645, 39.7176999404871], [-2.2741799807727, 39.7173995147409], [-2.2595878731002, 39.6986014466215], [-2.2477425151071, 39.6796746246109], [-2.2346096182018, 39.6672284151254], [-2.2224638344625, 39.6560268265885], [-2.2091163477385, 39.6372287584691], [-2.1978718412379, 39.6204907526094], [-2.1899320179454, 39.6174435771837], [-2.1811338353781, 39.6143964017579], [-2.1738377815418, 39.6052119575169], [-2.1598894433254, 39.6034094030397], [-2.1422072422633, 39.5919932246841], [-2.121563701703, 39.5852121864127], [-2.1103621131661, 39.5902765061344], [-2.1225078969053, 39.6047827778795], [-2.1395034105475, 39.6209199322468], [-2.1477007416224, 39.6261130058597], [-2.1607478026002, 39.6233662561802], [-2.1674859229079, 39.6309198177989], [-2.1768849569676, 39.6379583638528], [-2.1987731184765, 39.651606276323], [-2.2115197537081, 39.6689022157114], [-2.2307040835012, 39.695683025087] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 27,
+         "id" : 139752,
+         "pfafstette" : 9535,
+         "lke_type" : "N",
+         "altitude" : 804,
+         "objectid" : 87151,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_87151",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 28,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-6.2876962781542, 38.7937190990661], [-6.2953356757004, 38.7888693691632], [-6.3026746475005, 38.7804145303058], [-6.2925889260209, 38.7752214566929], [-6.2813444195202, 38.7721742812672], [-6.2734475141915, 38.7642344579747], [-6.2612158945248, 38.7485264832448], [-6.2421174006592, 38.7214023301593], [-6.2211734343527, 38.7168101080388], [-6.2187271104193, 38.7326897546237], [-6.2250789690533, 38.7438913431606], [-6.2266669337118, 38.7520886742355], [-6.2327612845633, 38.7703288088262], [-6.2652501831166, 38.7910152673503], [-6.2876962781542, 38.7937190990661] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 28,
+         "id" : 140028,
+         "pfafstette" : 4511,
+         "altitude" : 265,
+         "objectid" : 87622,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_87622",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 29,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-0.387120032961, 39.3253439159495], [-0.3652747894158, 39.3195929088079], [-0.3548886421901, 39.3271464704267], [-0.3403394524812, 39.3311378410548], [-0.3290949459806, 39.3444853277788], [-0.3348888710859, 39.3632833958982], [-0.3469917368614, 39.3648713605567], [-0.3628284654825, 39.3654722120491], [-0.380768174327, 39.3636696575719], [-0.3956607077458, 39.3459445385461], [-0.387120032961, 39.3253439159495] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 29,
+         "id" : 140210,
+         "pfafstette" : 1,
+         "altitude" : -3,
+         "objectid" : 87746,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_87746",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 30,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-5.5853008835378, 40.58459989013], [-5.5655586202161, 40.604299235488], [-5.5673611746933, 40.6295349981688], [-5.5696787447354, 40.6447708752976], [-5.5892922541659, 40.6511227339315], [-5.5932407068303, 40.6407365867057], [-5.5834983290606, 40.6301358496612], [-5.5864167505951, 40.6201359641091], [-5.5897643517671, 40.6070459851675], [-5.5965453900385, 40.5960589864494], [-5.6078328145028, 40.5815527147043], [-5.6038843618385, 40.5702652902399], [-5.5989917139718, 40.5751579381066], [-5.5853008835378, 40.58459989013] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 30,
+         "id" : 138833,
+         "pfafstette" : 2773,
+         "lke_type" : "N",
+         "altitude" : 917,
+         "objectid" : 87921,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_87921",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 31,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-6.1327195110786, 40.277607695477], [-6.1381700924739, 40.2642172907892], [-6.1652513275957, 40.2551186824757], [-6.1685560108039, 40.2420287035341], [-6.1594574024904, 40.232543833547], [-6.1485562396997, 40.2331446850394], [-6.1345220655558, 40.2298829197949], [-6.1257238829885, 40.2349901574803], [-6.1135780992492, 40.2371789736312], [-6.0940933437099, 40.2380373329061], [-6.0834926066654, 40.2484234801318], [-6.0867972898736, 40.2587237914301], [-6.10143231551, 40.2563633034243], [-6.105938701703, 40.2745605200513], [-6.115123145944, 40.2967491073063], [-6.1375692409815, 40.287950924739], [-6.1327195110786, 40.277607695477] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 31,
+         "id" : 138926,
+         "pfafstette" : 47133,
+         "lke_type" : "N",
+         "altitude" : 372,
+         "objectid" : 87940,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_87940",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 32,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-5.7287327183666, 36.6537006729537], [-5.7013939754624, 36.6539581807361], [-5.6840551181102, 36.6643014099982], [-5.6993339132027, 36.6679923548801], [-5.7181319813221, 36.6691940578649], [-5.7242263321736, 36.6767476194836], [-5.7327670069584, 36.6767476194836], [-5.7613503708112, 36.6773913889398], [-5.7819509934078, 36.6730995925655], [-5.7749982832814, 36.6597521058414], [-5.751865500824, 36.6576062076543], [-5.7287327183666, 36.6537006729537] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 32,
+         "id" : 140902,
+         "pfafstette" : 415,
+         "lke_type" : "N",
+         "altitude" : 85,
+         "objectid" : 88742,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_88742",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 33,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [29.0267922541659, 69.399377403406], [29.0097967405237, 69.3890341741439], [29.0085950375389, 69.3725536760667], [29.0281656290057, 69.3710944652994], [29.0544314228163, 69.3786480269181], [29.0728003112983, 69.3872316196667], [29.0880791063908, 69.3926392830983], [29.1033579014832, 69.3947851812855], [29.1248168833547, 69.4011370399194], [29.1510826771654, 69.4087764374657], [29.140954037722, 69.4194200924739], [29.1208684306904, 69.4337117744003], [29.1043879326131, 69.4331109229079], [29.0793238417872, 69.4199780260026], [29.0599249221754, 69.417231276323], [29.0427577366783, 69.4096777147043], [29.0267922541659, 69.399377403406] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 33,
+         "id" : 1224,
+         "name" : "Surnujrvi",
+         "pfafstette" : 49753,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 957,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 34,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [27.7238028749313, 69.4196776002564], [27.7341031862296, 69.434269707929], [27.7450901849478, 69.4233256271745], [27.7648324482695, 69.4184758972716], [27.7919566013551, 69.4276174235488], [27.8261193004944, 69.4391623557957], [27.8616553744735, 69.4516085652811], [27.8793375755356, 69.4586041933712], [27.8977064640176, 69.4677886376122], [27.9334142098517, 69.4789902261491], [27.9689502838308, 69.491693943417], [27.9950444057865, 69.5008783876579], [28.0170184032229, 69.5084319492767], [28.0154733565281, 69.5172730498077], [27.998134499176, 69.5169726240615], [27.9734137520601, 69.5099340780077], [27.9421694744552, 69.5087323750229], [27.9165903680645, 69.5045264145761], [27.8989081670024, 69.4929385643655], [27.8846594030397, 69.485342084783], [27.864917139718, 69.4755997070134], [27.8436298297015, 69.4625097280718], [27.8098104742721, 69.453454037722], [27.780454587072, 69.4531106940121], [27.7655191356894, 69.4494626670939], [27.7490386376122, 69.4439691677349], [27.7365065921992, 69.4400636330342], [27.7119575169383, 69.4339692821828], [27.6764214429592, 69.4260723768541], [27.6453488372093, 69.4166304248306], [27.6250915583227, 69.4078322422633], [27.6381386193005, 69.4047850668376], [27.6542757736678, 69.4117377769639], [27.6692112250504, 69.4154287218458], [27.6951336751511, 69.4193771745102], [27.7121291887933, 69.414570362571], [27.7238028749313, 69.4196776002564] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 34,
+         "id" : 1381,
+         "name" : "IIJRVI 7",
+         "pfafstette" : 937,
+         "lke_type" : "N",
+         "altitude" : 193,
+         "objectid" : 1111,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 35,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [27.8594236403589, 69.3935405603369], [27.8783075444058, 69.3959868842703], [27.9035433070866, 69.4057721800037], [27.9363326313862, 69.4151712140634], [27.9682635964109, 69.4266303103827], [27.985602453763, 69.4331109229079], [27.9971044680461, 69.4358147546237], [28.0211385277422, 69.4458146401758], [28.0357306354148, 69.4537544634682], [28.0211385277422, 69.4537544634682], [28.00379967039, 69.453454037722], [27.9883492034426, 69.4519089910273], [27.9770188610145, 69.4513081395349], [27.9600233473723, 69.4565012131478], [27.931354147592, 69.453454037722], [27.9086934627358, 69.4479605383629], [27.8870628090093, 69.4409219923091], [27.8637154367332, 69.4239693966307], [27.8556468595495, 69.4096777147043], [27.8561618751144, 69.4002786806446], [27.8594236403589, 69.3935405603369] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 35,
+         "id" : 1604,
+         "name" : "Paudijrvi",
+         "pfafstette" : 44995,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 1389,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 36,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [27.2624347646951, 65.2800254074346], [27.2637223036074, 65.266592084783], [27.2624347646951, 65.2596393746567], [27.2658682017945, 65.2529441723128], [27.2748809741806, 65.2450043490203], [27.2907606207654, 65.2456052005127], [27.2967691356894, 65.2598968824391], [27.2932498626625, 65.2714847326497], [27.2883572147958, 65.2811841924556], [27.2997733931514, 65.2899823750229], [27.3120479307819, 65.2948750228896], [27.3022626350485, 65.3039736312031], [27.2795161142648, 65.3082225096136], [27.2685291155466, 65.3164198406885], [27.2594305072331, 65.325861792712], [27.2400315876213, 65.3353466626991], [27.2199459805896, 65.3349604010255], [27.1992595220656, 65.3283081166453], [27.1877575077825, 65.325861792712], [27.1918776323018, 65.3155614814137], [27.2123924189709, 65.3076216581212], [27.226555347006, 65.2991239013001], [27.2402032594763, 65.2900252929866], [27.2624347646951, 65.2800254074346] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 36,
+         "id" : 22790,
+         "name" : "Jongunjrvi",
+         "pfafstette" : 395,
+         "lke_type" : "N",
+         "altitude" : 119,
+         "objectid" : 2315,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 37,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [26.8269891045596, 68.9765496246109], [26.8089635597876, 68.9780946713056], [26.8007233107489, 68.9792534563267], [26.8166887932613, 68.9883949826039], [26.8329976194836, 68.9980944424098], [26.8444996337667, 69.0048325627174], [26.8594350851492, 69.0175791979491], [26.8953145028383, 69.0343172038088], [26.9466443874748, 69.04981058872], [26.9868156015382, 69.0601109000183], [27.0098196301044, 69.0583083455411], [27.036085423915, 69.0589091970335], [27.0592611243362, 69.0722566837576], [27.0513642190075, 69.0780506088629], [27.0335103460905, 69.076848905878], [27.0340253616554, 69.0889946896173], [27.0196049258378, 69.0908401620582], [26.9912790697674, 69.0762480543857], [26.9797770554843, 69.0726429454312], [26.957459714338, 69.0750034334371], [26.933425654642, 69.0689949185131], [26.9140267350302, 69.0610550952206], [26.8942844717085, 69.0586087712873], [26.8802073796008, 69.0531152719282], [26.8511948361106, 69.0388235900018], [26.8077618568028, 69.0191242446438], [26.7861312030764, 69.007579312397], [26.7610671122505, 68.9911417322835], [26.7473333638528, 68.9695539965208], [26.7718824391137, 68.966506821095], [26.7928264054203, 68.9589103415126], [26.8137703717268, 68.9547043810657], [26.8417528840872, 68.9610562396997], [26.866988646768, 68.9604553882073], [26.8961728621132, 68.9637600714155], [26.939262497711, 68.9701548480132], [26.9675883537814, 68.9768071323933], [26.9607214795825, 68.9844465299396], [26.9418375755356, 68.9814422724776], [26.921236952939, 68.9796397180004], [26.9047564548617, 68.9798543078191], [26.8783189891961, 68.9735024491851], [26.8444996337667, 68.9713994689617], [26.8269891045596, 68.9765496246109] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 37,
+         "id" : 4352,
+         "name" : "Muddusjrvi",
+         "pfafstette" : 6415,
+         "lke_type" : "N",
+         "altitude" : 146,
+         "objectid" : 2712,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 38,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [26.6499954220839, 68.8862931468596], [26.6405534700604, 68.9005848287859], [26.637291704816, 68.9063358359275], [26.6160043947995, 68.8986964383813], [26.5808116645303, 68.8874519318806], [26.5437305438564, 68.8786537493133], [26.5193531404505, 68.8747482146127], [26.4889672221205, 68.8680530122688], [26.4795252700971, 68.8556068027834], [26.5114562351218, 68.8504137291705], [26.5354902948178, 68.8589114859916], [26.5590093389489, 68.8619586614173], [26.5881935542941, 68.8650058368431], [26.6237296282732, 68.8731602499542], [26.6506821095038, 68.8735465116279], [26.6577206555576, 68.87620742538], [26.6499954220839, 68.8862931468596] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 38,
+         "id" : 6188,
+         "name" : "Paadarjrvi",
+         "pfafstette" : 6195,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 3450,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 39,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [20.4431995055851, 68.8029893792346], [20.4198521333089, 68.803590230727], [20.4033716352317, 68.7999422038088], [20.3789942318257, 68.8066374061527], [20.3623420618934, 68.8133755264604], [20.334702893243, 68.8151351629738], [20.316334004761, 68.8184827641458], [20.3058620216078, 68.8252208844534], [20.2826863211866, 68.8352207700055], [20.2677508698041, 68.8376670939388], [20.2838880241714, 68.8236329197949], [20.2998535066838, 68.8096845815785], [20.3110121772569, 68.8041910822194], [20.3268059879143, 68.8060365546603], [20.3474066105109, 68.8054357031679], [20.3788225599707, 68.7950495559421], [20.3916979490936, 68.7768523393151], [20.4105818531405, 68.766852453763], [20.4310108038821, 68.7592988921443], [20.4504097234939, 68.7510586431057], [20.4790789232741, 68.7492131706647], [20.5027696392602, 68.7492131706647], [20.5231985900018, 68.7501144479033], [20.5249153085516, 68.7434192455594], [20.5268036989562, 68.7364665354331], [20.5456876030031, 68.7373678126717], [20.5659448818898, 68.7522603460905], [20.558734663981, 68.7653074070683], [20.5328122138803, 68.7711442501373], [20.522168558872, 68.7698996291888], [20.516160043948, 68.7619598058963], [20.5000228895807, 68.7647065555759], [20.4909242812672, 68.7744060153818], [20.4816540010987, 68.7786978117561], [20.4696369712507, 68.7872384865409], [20.4431995055851, 68.8029893792346] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 39,
+         "id" : 7516,
+         "name" : "Rastojaure",
+         "pfafstette" : 62953,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 5178,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 40,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [24.0922564548617, 67.888450489837], [24.1188655923823, 67.8860041659037], [24.1428996520784, 67.8854033144113], [24.1686504303241, 67.8902530443142], [24.1916544588903, 67.8969911646219], [24.2096800036623, 67.90063919154], [24.2084783006775, 67.9084502609412], [24.1904527559055, 67.9148450375389], [24.169165445889, 67.92334279436], [24.1430713239333, 67.9300809146676], [24.1125137337484, 67.9357890038454], [24.090539736312, 67.9400808002197], [24.0757759567845, 67.9455742995788], [24.0668490203259, 67.9406816517121], [24.0558620216078, 67.9303813404139], [24.0476217725691, 67.9388361792712], [24.0436733199048, 67.9504669474455], [24.0211843069035, 67.9571621497894], [24.0132874015748, 67.9461751510712], [24.0443600073247, 67.92334279436], [24.0586087712873, 67.9088365226149], [24.054316974913, 67.8935577275224], [24.0647889580663, 67.888450489837], [24.0922564548617, 67.888450489837] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 40,
+         "id" : 9754,
+         "pfafstette" : 0,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 5711,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_5711",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 41,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [25.7059718915949, 67.2024068394067], [25.6922381431972, 67.20519650705], [25.6767876762498, 67.2091020417506], [25.6467451016297, 67.2060548663249], [25.6172175425746, 67.1911623329061], [25.6198784563267, 67.181162447354], [25.6500068668742, 67.1750680965025], [25.6867446438381, 67.1662699139352], [25.7181605932979, 67.1558837667094], [25.7363578099249, 67.1601755630837], [25.7529241439297, 67.1668278474638], [25.7925803424281, 67.1544245559421], [25.8196186595862, 67.1525790835012], [25.8077733015931, 67.1610768403223], [25.7944687328328, 67.1713771516206], [25.7893185771837, 67.1854113257645], [25.7697479857169, 67.1939090825856], [25.7473448086431, 67.1942095083318], [25.7228815693096, 67.194509934078], [25.7059718915949, 67.2024068394067] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 41,
+         "id" : 11665,
+         "name" : "UNARINJRVI 1",
+         "pfafstette" : 2255,
+         "lke_type" : "N",
+         "altitude" : 180,
+         "objectid" : 6734,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 42,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [18.8401277238601, 67.4398290148325], [18.8806422816334, 67.4389277375939], [18.952658624794, 67.4315887657938], [19.0131729536715, 67.4275973951657], [19.0417563175243, 67.4261381843985], [19.0739447903314, 67.4285845083318], [19.0513699414027, 67.433734663981], [19.0168638985534, 67.4376831166453], [18.9887955502655, 67.4413311435635], [18.9639031312946, 67.4404298663249], [18.9579804522981, 67.444077893243], [18.9520577733016, 67.4525756500641], [18.9118865592382, 67.4604725553928], [18.8486254806812, 67.4662664804981], [18.8043341420985, 67.4702149331624], [18.7788408716352, 67.4777684947812], [18.740815555759, 67.4887554934994], [18.6772969694195, 67.4969528245743], [18.6458810199597, 67.5], [18.6457951840322, 67.5], [18.6332631386193, 67.5012446209485], [18.6145509064274, 67.5021458981871], [18.586740065922, 67.5093990340597], [18.5355818531405, 67.527038317158], [18.5007324665812, 67.5410295733382], [18.5209897454679, 67.545578877495], [18.5433070866142, 67.5449780260026], [18.5706029115547, 67.5425317020692], [18.5913752060062, 67.5449351080388], [18.5659677714704, 67.5504286073979], [18.5417620399194, 67.5540766343161], [18.5136078557041, 67.5580680049441], [18.4821919062443, 67.5580680049441], [18.4633080021974, 67.5644627815418], [18.4250251785387, 67.5826599981688], [18.3918925105292, 67.59849672679], [18.3803904962461, 67.6027456052005], [18.3755836843069, 67.5957070591467], [18.3982443691632, 67.5832608496612], [18.4389305987914, 67.5683683162424], [18.4624496429226, 67.5553212552646], [18.4794451565647, 67.5473814319722], [18.4739516572057, 67.5346777147043], [18.4499175975096, 67.5197851812855], [18.477728438015, 67.5127466352316], [18.5402169932247, 67.5030471754258], [18.5508606482329, 67.5], [18.5699162241348, 67.4945065006409], [18.5937786119758, 67.4890130012818], [18.6268254440579, 67.4836053378502], [18.662361518037, 67.4781547564549], [18.7068245284746, 67.471459554111], [18.7523175700421, 67.4620605200513], [18.79540720564, 67.445580021974], [18.8401277238601, 67.4398290148325] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 42,
+         "id" : 12223,
+         "pfafstette" : 631,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 7461,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_7461",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 43,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [17.5685542940853, 67.9136433345541], [17.6040903680645, 67.8802531587621], [17.6167940853324, 67.8750600851492], [17.625206006226, 67.8720129097235], [17.6377380516389, 67.8774634911188], [17.6344762863944, 67.8890513413294], [17.6274377403406, 67.8975920161143], [17.6198841787219, 67.9072485579564], [17.6100988829885, 67.9166905099799], [17.5955067753159, 67.9309821919062], [17.5882965574071, 67.945874725325], [17.5968801501557, 67.9607672587438], [17.5666659036807, 67.9826554202527], [17.504177348471, 67.9960458249405], [17.4604010254532, 68.0042860739791], [17.4418604651163, 68.017333134957], [17.443577183666, 68.0304231138986], [17.4585126350485, 68.0358307773302], [17.4696713056217, 68.0379766755173], [17.4906152719282, 68.03686080846], [17.485808459989, 68.0434701748764], [17.4549075260941, 68.0589635597876], [17.4265816700238, 68.0565172358542], [17.3860671122505, 68.0449723036074], [17.3462392418971, 68.0550151071232], [17.3259819630105, 68.0786629051456], [17.2889008423366, 68.0978472349387], [17.2432361289141, 68.108147546237], [17.2325924739059, 68.1085338079106], [17.2427211133492, 68.1030403085515], [17.2542231276323, 68.0938987822743], [17.2593732832815, 68.0832551272661], [17.262291704816, 68.073255241714], [17.262463376671, 68.0586202160776], [17.2931926387109, 68.0459164988097], [17.3398873832631, 68.0349295000916], [17.3584279436001, 68.0288780672038], [17.3867537996704, 68.0163460217909], [17.4219465299396, 67.9993934261124], [17.4416887932613, 67.9945007782457], [17.4899285845083, 67.9820545687603], [17.5436618751145, 67.9659603323567], [17.5637474821461, 67.9574196575719], [17.5556789049625, 67.947376854056], [17.5685542940853, 67.9136433345541] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 43,
+         "id" : 10299,
+         "pfafstette" : 6591,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 7911,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_7911",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 44,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [24.7121635231643, 66.6699236632485], [24.740746887017, 66.6601812854789], [24.7693302508698, 66.651983954404], [24.7810039370079, 66.6623701016298], [24.7676993682476, 66.671168284197], [24.7507038546054, 66.6829707242263], [24.7373134499176, 66.6994083043399], [24.7283006775316, 66.7133995605201], [24.7224638344626, 66.7188930598791], [24.7036657663432, 66.7279916681927], [24.6883869712507, 66.7413391549167], [24.6753399102728, 66.7349872962827], [24.6565418421535, 66.7209531221388], [24.6565418421535, 66.7055026551914], [24.6722498168834, 66.6891079930416], [24.6765416132576, 66.6820694469877], [24.6877861197583, 66.6713828740158], [24.7121635231643, 66.6699236632485] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 44,
+         "id" : 14831,
+         "name" : "Raanujrvi",
+         "pfafstette" : 2653,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 8242,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 45,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [18.4845953122139, 67.2030506088629], [18.480732695477, 67.2118487914301], [18.4666556033693, 67.2242950009156], [18.4553252609412, 67.2285867972899], [18.4426215436733, 67.23558242538], [18.4226217725691, 67.2416338582677], [18.3977293535982, 67.2501316150888], [18.3757553561619, 67.2672129646585], [18.3335240798389, 67.2854101812855], [18.3055415674785, 67.2951096410914], [18.2829667185497, 67.3009035661967], [18.2398770829518, 67.3072554248306], [18.2016800952206, 67.3103026002564], [18.1811653085515, 67.3084571278154], [18.1848562534334, 67.3024486128914], [18.2289759201611, 67.2984572422633], [18.2851984526643, 67.289659059696], [18.3130951290972, 67.2768695065007], [18.3295756271745, 67.2705176478667], [18.3371291887933, 67.2619769730819], [18.3593606940121, 67.2458398187145], [18.40245032961, 67.2364407846548], [18.4307761856803, 67.2315910547519], [18.4399606299213, 67.2179002243179], [18.4575569950558, 67.211548365684], [18.4741233290606, 67.2094883034243], [18.4845953122139, 67.2030506088629] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 45,
+         "id" : 13810,
+         "name" : "Sitojaure",
+         "pfafstette" : 48931,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 8942,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 46,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [24.4440120856986, 66.6522843801502], [24.4418661875114, 66.6470913065373], [24.4941402673503, 66.63829312397], [24.5571438381249, 66.6295378593664], [24.5920790606116, 66.6164478804249], [24.6159414484527, 66.5963193554294], [24.6271859549533, 66.5842164896539], [24.6448681560154, 66.5930146722212], [24.6753399102728, 66.6057613074529], [24.6938804706098, 66.6155036852225], [24.6832368156015, 66.6404390221571], [24.6675288408716, 66.6528852316426], [24.6520783739242, 66.6467908807911], [24.6144822376854, 66.6492372047244], [24.5728518128548, 66.6607821369713], [24.5576588536898, 66.6644301638894], [24.5631523530489, 66.6559324070683], [24.5676158212782, 66.6440441311115], [24.5422083867424, 66.6395377449185], [24.5016938289691, 66.6489367789782], [24.4790331441128, 66.6607821369713], [24.46581441128, 66.6659752105842], [24.4541407251419, 66.6595375160227], [24.4440120856986, 66.6522843801502] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 46,
+         "id" : 15655,
+         "name" : "Iso Vietonen",
+         "pfafstette" : 2611,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 9216,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 47,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [27.9551306995056, 66.3559787584692], [27.9119552279802, 66.3681245422084], [27.876762497711, 66.3751201702985], [27.8569343984618, 66.3875663797839], [27.8420847830068, 66.3890255905512], [27.8516125709577, 66.3814720289324], [27.8591661325765, 66.3759785295734], [27.8226000274675, 66.3765793810657], [27.7888665079656, 66.3747768265886], [27.8105829976195, 66.364519433254], [27.8436298297015, 66.3544337117744], [27.8642304522981, 66.3495410639077], [27.8971056125252, 66.3486397866691], [27.9238005859733, 66.3443479902948], [27.9424269822377, 66.3410862250504], [27.9833707196484, 66.3337472532503], [28.0078339589819, 66.3325455502655], [27.9876625160227, 66.3416870765428], [27.9551306995056, 66.3559787584692] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 47,
+         "id" : 15286,
+         "name" : "Murtoselka",
+         "pfafstette" : 56263,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 9307,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 48,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [18.271893883904, 67.0921076725875], [18.25086408167, 67.0905626258927], [18.1958432521516, 67.0854124702436], [18.1444275315876, 67.0750692409815], [18.1580754440579, 67.0677731871452], [18.1930965024721, 67.0692753158762], [18.2587609869987, 67.0692753158762], [18.3049407159861, 67.0665285661967], [18.3210778703534, 67.0640822422633], [18.3494037264237, 67.0632238829885], [18.3806480040286, 67.0638676524446], [18.4153257187328, 67.0577303836294], [18.4562694561436, 67.0495759705182], [18.4914621864127, 67.0416361472258], [18.5039083958982, 67.03125], [18.5246806903497, 67.014898255814], [18.547513047061, 66.9942547152536], [18.5663969511079, 66.9857140404688], [18.580559879143, 66.9908641961179], [18.5930060886284, 66.9969585469694], [18.6003879783922, 67.0115935726058], [18.5978987364951, 67.0306920664714], [18.5766972624061, 67.0458850256363], [18.5469121955686, 67.0628805392785], [18.5526632027101, 67.072322491302], [18.5644227247757, 67.0769147134225], [18.53832860282, 67.081506935543], [18.4912046786303, 67.0887600714155], [18.4663122596594, 67.0866570911921], [18.4211625618019, 67.081163591833], [18.3659700604285, 67.081506935543], [18.3347257828237, 67.0805627403406], [18.302279802234, 67.0866570911921], [18.271893883904, 67.0921076725875] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 48,
+         "id" : 15441,
+         "name" : "Tjaktjajaure",
+         "pfafstette" : 4837,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 9318,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 49,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [24.3564594396631, 66.5742166041018], [24.3409231367881, 66.5690235304889], [24.3242709668559, 66.5659763550632], [24.3368888481963, 66.5544314228163], [24.3530260025636, 66.5422427211134], [24.3616095953122, 66.5312986403589], [24.3935405603369, 66.5212558368431], [24.4136261673686, 66.5103975920161], [24.4150853781359, 66.5033590459623], [24.414227018861, 66.5273501876946], [24.4120811206739, 66.5575215162058], [24.4284757828237, 66.5601824299579], [24.4418661875114, 66.5632296053836], [24.4363726881524, 66.5696672999451], [24.4301066654459, 66.5766629280352], [24.4180037996704, 66.5875211728621], [24.4206647134225, 66.6082076313862], [24.4267590642739, 66.636790995239], [24.417231276323, 66.6601812854789], [24.4108794176891, 66.6750738188977], [24.392853872917, 66.6781209943234], [24.3665022431789, 66.6820694469877], [24.3527684947812, 66.6781209943234], [24.3461591283648, 66.6601812854789], [24.3301078099249, 66.6498380562168], [24.3191208112067, 66.6428424281267], [24.3232409357261, 66.6303962186413], [24.3276185680278, 66.6200529893792], [24.3309661691998, 66.6100101858634], [24.3428115271928, 66.6024137062809], [24.353798525911, 66.591555461454], [24.3564594396631, 66.5742166041018] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 49,
+         "id" : 15510,
+         "name" : "Miekojrvi",
+         "pfafstette" : 231,
+         "lke_type" : "N",
+         "altitude" : 77,
+         "objectid" : 9434,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 50,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [18.7696564273942, 66.7237427897821], [18.7416739150339, 66.724601149057], [18.7270818073613, 66.718592634133], [18.7092279344442, 66.7227985945798], [18.686395577733, 66.7252449185131], [18.6525762223036, 66.7291504532137], [18.6328339589819, 66.7410387291705], [18.6219327961912, 66.7525836614173], [18.5978987364951, 66.761982695477], [18.5374702435451, 66.7671757690899], [18.4903463193554, 66.7686778978209], [18.4714624153085, 66.7705233702619], [18.4379864035891, 66.7689783235671], [18.4040812122322, 66.7689783235671], [18.3751545046695, 66.7680770463285], [18.3557555850577, 66.7644290194104], [18.323824620033, 66.7598797152536], [18.3188461362388, 66.7550299853507], [18.3904332997619, 66.7583775865226], [18.4592737136056, 66.760823910456], [18.4900029756455, 66.7614247619484], [18.5156679179637, 66.7605234847098], [18.5439937740341, 66.7598797152536], [18.5742080205091, 66.7556308368431], [18.5909460263688, 66.7480343572606], [18.5937786119758, 66.7391932567295], [18.5952378227431, 66.7273478987365], [18.6128341878777, 66.7161463101996], [18.6356665445889, 66.7130991347739], [18.6584989013001, 66.7100090413844], [18.6823612891412, 66.7076056354148], [18.7036485991577, 66.7033567570042], [18.7216741439297, 66.6988074528475], [18.7253650888116, 66.689708844534], [18.7221891594946, 66.6677777650614], [18.7407297198315, 66.6525848058964], [18.7659654825124, 66.6541298525911], [18.7875961362388, 66.6574774537631], [18.8120593755722, 66.6583787310017], [18.8240764054202, 66.6641726561069], [18.816780351584, 66.6696232375023], [18.8034757828237, 66.6766617835561], [18.7857935817616, 66.6845157709211], [18.7766091375206, 66.6915543169749], [18.7915445889031, 66.6988074528475], [18.8118877037173, 66.701554202527], [18.8191837575536, 66.6966615546603], [18.8268231550998, 66.689708844534], [18.8549773393151, 66.6860608176158], [18.8757496337667, 66.6933568714521], [18.868196072148, 66.7009533510346], [18.8578957608497, 66.7033567570042], [18.8447628639443, 66.7076056354148], [18.8324883263139, 66.7149016892511], [18.8054500091558, 66.728592519685], [18.777209989013, 66.731940120857], [18.786394433254, 66.7255453442593], [18.7947205182201, 66.720094762864], [18.7696564273942, 66.7237427897821] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 50,
+         "id" : 18063,
+         "pfafstette" : 4459,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 10225,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_10225",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 51,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [16.3436756088629, 66.8841701382531], [16.3657354422267, 66.8914661920894], [16.3865077366783, 66.8966592657023], [16.4059066562901, 66.9051570225234], [16.3962930324117, 66.911551799121], [16.3740615271928, 66.9145560565831], [16.3414438747482, 66.9161440212415], [16.2928607397913, 66.9173457242263], [16.2661657663432, 66.9200495559421], [16.2059089452481, 66.9246417780626], [16.146338811573, 66.9224958798755], [16.1567249587988, 66.9133543535983], [16.215951748764, 66.9051570225234], [16.2859080296649, 66.8942129417689], [16.3153497527925, 66.884513481963], [16.3436756088629, 66.8841701382531] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 51,
+         "id" : 17481,
+         "name" : "Mavasjaure",
+         "pfafstette" : 967,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 10411,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 52,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [15.8761273118477, 66.9638687969237], [15.844024674968, 66.9669159723494], [15.8187030763597, 66.9705210813038], [15.8120078740158, 66.9717657022523], [15.7928664621864, 66.9686756088629], [15.7910639077092, 66.9598345083318], [15.8093469602637, 66.9492337712873], [15.8330376762498, 66.9398347372276], [15.8539816425563, 66.9328820271013], [15.8642819538546, 66.9324957654276], [15.8962129188793, 66.9367875618019], [15.943336843069, 66.9337403863761], [15.9858256271745, 66.9313369804065], [16.010117194653, 66.9389763779528], [16.0017052737594, 66.9516800952207], [15.991748306171, 66.9668730543857], [15.9895165720564, 66.9808213926021], [15.9787870811207, 66.9829672907893], [15.9574997711042, 66.9805209668559], [15.9414484526644, 66.9848127632302], [15.9156976744186, 66.9817655878044], [15.8877151620582, 66.9698343938839], [15.8761273118477, 66.9638687969237] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 52,
+         "id" : 16981,
+         "name" : "Balvatnet",
+         "lge_id" : "no",
+         "pfafstette" : 753,
+         "lke_type" : "B",
+         "altitude" : 0,
+         "objectid" : 10764,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 53,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [28.4370135964109, 65.8431520097052], [28.4293741988647, 65.8294611792712], [28.4104044588903, 65.8255556445706], [28.3889454770189, 65.8125085835928], [28.3824219465299, 65.7951697262406], [28.4037950924739, 65.78392521974], [28.4195889031313, 65.7733244826955], [28.4286875114448, 65.767230131844], [28.4493739699689, 65.7678309833364], [28.4734080296649, 65.7684318348288], [28.509287447354, 65.7614791247024], [28.5326348196301, 65.7611357809925], [28.5189010712324, 65.7675305575902], [28.4960687145212, 65.771736518037], [28.4858542391503, 65.7821226652628], [28.4931502929866, 65.7888178676067], [28.5000171671855, 65.7943113669658], [28.5195019227248, 65.8070150842337], [28.5492869895624, 65.8213067661601], [28.5372699597143, 65.8298474409449], [28.5031930965025, 65.8328946163706], [28.4776998260392, 65.8319075032046], [28.460704312397, 65.8337529756455], [28.45752838308, 65.8422936504303], [28.4517773759385, 65.8528943874748], [28.4308334096319, 65.8663277101264], [28.4175288408716, 65.866885643655], [28.4265416132577, 65.8574436916316], [28.4370135964109, 65.8431520097052] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 53,
+         "id" : 18861,
+         "name" : "Kostonjrvi",
+         "pfafstette" : 8551,
+         "lke_type" : "N",
+         "altitude" : 232,
+         "objectid" : 11258,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 54,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [17.4044360007325, 66.7091077641458], [17.3713891686504, 66.7161463101996], [17.3581704358176, 66.7103523850943], [17.3703591375206, 66.7051593114814], [17.3864962918879, 66.6902667780626], [17.4122470701337, 66.6738291979491], [17.4368819813221, 66.6666189800403], [17.4575684398462, 66.6605246291888], [17.4819458432521, 66.6547307040835], [17.491988646768, 66.6470913065373], [17.5058940670207, 66.633443394067], [17.5337907434536, 66.6203534151254], [17.5608290606116, 66.6127998535067], [17.5742194652994, 66.6018128547885], [17.5813438472807, 66.591212117744], [17.6037470243545, 66.583873145944], [17.6286394433254, 66.5772208615638], [17.6478666910822, 66.565332585607], [17.658252838308, 66.5504400521883], [17.6658063999267, 66.5422427211134], [17.6812568668742, 66.548637497711], [17.6900979674052, 66.5632296053836], [17.6955914667643, 66.5708690029299], [17.7143895348837, 66.5623712461088], [17.7375652353049, 66.5532297198315], [17.7688095129097, 66.5450323887567], [17.7878650888116, 66.5340453900385], [17.7976503845449, 66.521599180553], [17.8135300311298, 66.4994105932979], [17.8390233015931, 66.483874290423], [17.8836579838857, 66.4726727018861], [17.9085504028566, 66.4699259522066], [17.8812545779161, 66.4836597006043], [17.8451176524446, 66.5012131477751], [17.8402250045779, 66.5182515793811], [17.8361907159861, 66.5276506134408], [17.8132725233474, 66.5291956601355], [17.7922427211133, 66.5373500732467], [17.7727579655741, 66.5501825444058], [17.7502689525728, 66.5580365317707], [17.7402261490569, 66.5699677256913], [17.7251190258194, 66.582027673503], [17.709496887017, 66.5902679225417], [17.6916430141, 66.601555347006], [17.6594545412928, 66.6146453259476], [17.6284677714704, 66.6209971845816], [17.6013436183849, 66.6249456372459], [17.5809146676433, 66.6276923869255], [17.5551638893975, 66.6309970701337], [17.534391594946, 66.63829312397], [17.5241771195752, 66.6413832173595], [17.5094991759751, 66.6450312442776], [17.506838262223, 66.6625846914485], [17.5076966214979, 66.6848161966673], [17.4995422083867, 66.69872161692], [17.4773107031679, 66.7040005264604], [17.4512165812122, 66.7000091558323], [17.4305301226881, 66.6985070271013], [17.4044360007325, 66.7091077641458] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 54,
+         "id" : 18884,
+         "name" : "Tjeggelvas",
+         "pfafstette" : 7993,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 11294,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 55,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [27.922169703351, 66.2574391137154], [27.9338433894891, 66.2483405054019], [27.9425986540927, 66.2556365592382], [27.9338433894891, 66.2644776597693], [27.9299807727522, 66.2669239837026], [27.9542723402307, 66.2656793627541], [27.9880058597326, 66.2647780855155], [28.0439708844534, 66.2592845861564], [28.0879188793261, 66.2471388024172], [28.0983908624794, 66.2422461545505], [28.1047427211133, 66.2368384911189], [28.1125537905146, 66.2270531953855], [28.125, 66.2185983565281], [28.125, 66.2185554385644], [28.1359869987182, 66.216452458341], [28.1614802691815, 66.2137486266252], [28.173583134957, 66.2173537355796], [28.1843126258927, 66.2243064457059], [28.200964795825, 66.2319458432522], [28.2021664988097, 66.2477396539096], [28.1909219923091, 66.2559369849845], [28.1779607672588, 66.2519456143564], [28.1636261673686, 66.2480400796557], [28.1316952023439, 66.2535335790148], [28.125, 66.2558940670207], [28.1031976744186, 66.2635763825307], [28.0524686412745, 66.2727179088079], [28.0007095770005, 66.2760225920161], [27.9916109686871, 66.2714732878594], [27.9597658395898, 66.2702715848746], [27.9248306171031, 66.2692844717085], [27.922169703351, 66.2574391137154] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 55,
+         "id" : 15986,
+         "pfafstette" : 56275,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 11346,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_11346",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 56,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [16.7014397546237, 66.9428819126534], [16.6855601080388, 66.9473882988464], [16.6533716352317, 66.9544268449002], [16.6220415216993, 66.9651134178722], [16.6025567661601, 66.9696198040652], [16.5701107855704, 66.9851131889764], [16.524446072148, 67.0106064594397], [16.5053904962461, 67.0297907892328], [16.5022145669291, 67.0403915262773], [16.4469362296283, 67.0431382759568], [16.3830742995788, 67.0397906747848], [16.3715722852957, 67.0252844030398], [16.4050482970152, 67.0079455456876], [16.4582665720564, 67.0021516205823], [16.5004978483794, 67.0030528978209], [16.5350038912287, 66.9951130745285], [16.5464200695843, 66.9808213926021], [16.5117423548801, 66.975327893243], [16.4809272569127, 66.9720661279986], [16.488051638894, 66.9635254532137], [16.5073647225783, 66.9592765748032], [16.5307979307819, 66.9614224729903], [16.5508835378136, 66.9638687969237], [16.5739734023073, 66.9571735945797], [16.5939731734115, 66.9507359000183], [16.6123420618934, 66.942281061161], [16.6655603369346, 66.9324957654276], [16.7280488921443, 66.9324957654276], [16.7624690990661, 66.928590230727], [16.7800654642007, 66.9261439067936], [16.7766320271013, 66.9349420893609], [16.7480486632485, 66.9428819126534], [16.7170618934261, 66.942281061161], [16.7014397546237, 66.9428819126534] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 56,
+         "id" : 16459,
+         "name" : "Peskehaure",
+         "pfafstette" : 9717,
+         "lke_type" : "N",
+         "altitude" : 632,
+         "objectid" : 11377,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 57,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [20.7283464566929, 69.0400252929866], [20.758389031313, 69.0297249816883], [20.7963285112617, 69.0175791979491], [20.836843069035, 69.00440338308], [20.8747825489837, 68.9826010574986], [20.8904046877861, 68.9629017121406], [20.8686023622047, 68.9550048068119], [20.8674006592199, 68.9492108817067], [20.8691173777697, 68.9356058872001], [20.8871429225417, 68.9273656381615], [20.9161554660319, 68.95131386193], [20.927314136605, 68.97436080846], [20.9168421534518, 68.9916996658121], [20.8995032960996, 69.007579312397], [20.8778726423732, 69.0096393746567], [20.8495467863029, 69.0035879417689], [20.8423365683941, 69.013931171031], [20.8557269730819, 69.0255190212415], [20.8249977110419, 69.0452183665995], [20.7655992492218, 69.057664576085], [20.733839956052, 69.0567632988464], [20.7075741622414, 69.0601109000183], [20.6890336019044, 69.0580079197949], [20.6488623878411, 69.0566345449551], [20.6625961362388, 69.04981058872], [20.7283464566929, 69.0400252929866] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 57,
+         "id" : 7003,
+         "pfafstette" : 9817,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 11904,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_11904",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 58,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.0998386284563, 66.3750772523348], [14.1475634041384, 66.3750772523348], [14.1701382530672, 66.3775235762681], [14.1989791247024, 66.3772231505219], [14.2236140358909, 66.3793261307453], [14.2463605566746, 66.3820728804248], [14.2582059146677, 66.3860642510529], [14.246961408167, 66.393059879143], [14.2168329976195, 66.3924590276506], [14.177348470976, 66.3891114264787], [14.156146996887, 66.3888110007325], [14.0655900933895, 66.3906135552097], [14.0531438839041, 66.3900127037173], [14.0333157846548, 66.3924590276506], [14.0219854422267, 66.40391812397], [14.0095392327413, 66.4149051226882], [13.9950329609962, 66.4140038454496], [13.9965780076909, 66.3954632851126], [14.0098825764512, 66.3747768265886], [14.0168352865776, 66.3623306171031], [14.0229296374291, 66.3598842931698], [14.0433585881707, 66.3704850302143], [14.0998386284563, 66.3750772523348] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 58,
+         "id" : 21058,
+         "name" : "Langvatnet",
+         "lge_id" : "no",
+         "pfafstette" : 41,
+         "lke_type" : "B",
+         "altitude" : 0,
+         "objectid" : 12128,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 59,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [28.6162390130013, 65.4760746658121], [28.6208741530855, 65.4620404916682], [28.6433631660868, 65.4562894845267], [28.6711740065922, 65.4562894845267], [28.6851652627724, 65.4601950192272], [28.6980406518953, 65.4611392144296], [28.708598470976, 65.4635855383629], [28.7235339223585, 65.4702378227431], [28.7426753341879, 65.4763321735946], [28.778211408167, 65.4772334508332], [28.8161508881157, 65.4818256729537], [28.7961511170115, 65.4896796603186], [28.7697994872734, 65.490280511811], [28.7328900384545, 65.4939714566929], [28.6735774125618, 65.4893792345724], [28.6347795733382, 65.4833278016847], [28.6162390130013, 65.4760746658121] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 59,
+         "id" : 20508,
+         "name" : "Tyrjrvi",
+         "pfafstette" : 943,
+         "lke_type" : "N",
+         "altitude" : 224,
+         "objectid" : 12167,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 60,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [18.3405626258927, 66.4361495147409], [18.3271722212049, 66.4258921214064], [18.3220220655558, 66.4164501693829], [18.2806491485076, 66.4173514466215], [18.2289759201611, 66.4240895669291], [18.2158430232558, 66.4322439800403], [18.1921523072697, 66.4388962644204], [18.1557578740157, 66.4407417368614], [18.1319813221022, 66.4437889122871], [18.1003937007874, 66.4492824116462], [18.0429694652994, 66.4620290468779], [18.0058883446255, 66.4763207288043], [17.9848585423915, 66.4812133766709], [17.9660604742721, 66.4751190258195], [17.9875194561436, 66.4689817570042], [18.0197937648782, 66.4644753708112], [18.0703511261674, 66.4504411966673], [18.1192776048343, 66.4352911554661], [18.1313804706098, 66.4240895669291], [18.1533544680461, 66.4188964933162], [18.1882038546054, 66.4128021424648], [18.1918947994873, 66.4031026826589], [18.1855429408533, 66.3900127037173], [18.1982466581212, 66.3878238875664], [18.2355852865775, 66.396064136605], [18.2684604468046, 66.4006563587255], [18.3006489196118, 66.4070082173595], [18.3320648690716, 66.4140038454496], [18.3559272569126, 66.4191969190625], [18.3906049716169, 66.4255487776964], [18.4223642647867, 66.4303126716719], [18.4648530488921, 66.4231024537631], [18.5040800677532, 66.4125017167186], [18.5189296832082, 66.3963645623512], [18.5420195477019, 66.3921156839407], [18.5678561618751, 66.3927165354331], [18.5836499725325, 66.3796265564915], [18.5915468778612, 66.3635323200879], [18.5754097234939, 66.3516869620949], [18.5808173869255, 66.3443479902948], [18.5964395257279, 66.35082860282], [18.5991004394799, 66.3693262451932], [18.6003879783922, 66.3802703259476], [18.5981562442776, 66.3930169611793], [18.5940361197583, 66.4036176982238], [18.5724054660319, 66.413102568211], [18.5371268998352, 66.4319006363304], [18.5119769730818, 66.4364499404871], [18.4863120307636, 66.436793284197], [18.4553252609412, 66.4413425883538], [18.4275144204358, 66.4446901895257], [18.3797896447537, 66.4425872093023], [18.3405626258927, 66.4361495147409] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 60,
+         "id" : 19913,
+         "name" : "Saddajaure",
+         "pfafstette" : 753,
+         "lke_type" : "N",
+         "altitude" : 459,
+         "objectid" : 12432,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 61,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [17.8283796465849, 66.3696266709394], [17.861083134957, 66.3490260483428], [17.878765336019, 66.3367944286761], [17.8845163431606, 66.3404424555942], [17.8755035707746, 66.3519873878411], [17.8654607672587, 66.3635323200879], [17.8483794176891, 66.3802703259476], [17.8149892418971, 66.3991113120308], [17.7797965116279, 66.4261496291888], [17.7584233656839, 66.4510420481597], [17.7314708844534, 66.4689817570042], [17.7025441768907, 66.4854622550815], [17.6948189434169, 66.4863206143564], [17.6994540835012, 66.4674796282732], [17.7408270005493, 66.4346903039736], [17.7788523164256, 66.4051627449185], [17.7906976744186, 66.3918581761582], [17.8032297198315, 66.3854633995605], [17.8283796465849, 66.3696266709394] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 61,
+         "id" : 19929,
+         "pfafstette" : 81,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 12439,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_12439",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 62,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [17.1980005951291, 66.0222057544406], [17.204695797473, 66.0313043627541], [17.195339681377, 66.0568834691449], [17.1767991210401, 66.0845226377953], [17.1682155282915, 66.1060674555942], [17.159460263688, 66.1343933116645], [17.1496749679546, 66.1666247024355], [17.1435806171031, 66.1854227705549], [17.1210916041018, 66.200916155466], [17.0974008881157, 66.2149074116462], [17.0858130379051, 66.2130619392053], [17.0971433803333, 66.1978689800403], [17.1233233382164, 66.1836202160776], [17.13207860282, 66.167869323384], [17.1357695477019, 66.1535776414576], [17.1384304614539, 66.1392430415675], [17.140919703351, 66.1237067386926], [17.1447823200879, 66.1094579747299], [17.1533659128365, 66.0842222120491], [17.1707047701886, 66.0593297930782], [17.1843526826588, 66.0404888069951], [17.1980005951291, 66.0222057544406] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 62,
+         "id" : 21757,
+         "pfafstette" : 931,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 12799,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_12799",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 63,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.9950215162058, 66.2018603506684], [15.0193130836843, 66.195422656107], [15.0421454403955, 66.2000148782274], [15.0268666453031, 66.2079117835561], [15.0051501556492, 66.2149074116462], [14.9898713605567, 66.2213021882439], [14.9704724409449, 66.2349930186779], [14.9594854422267, 66.2477396539096], [14.9570820362571, 66.2574391137154], [14.948755951291, 66.2727179088079], [14.9384556399927, 66.2702715848746], [14.9147649240066, 66.2559799029482], [14.8791430141, 66.2507868293353], [14.8520188610145, 66.254177348471], [14.8244655282915, 66.2589841604102], [14.8038649056949, 66.2483405054019], [14.8178561618751, 66.2343921671855], [14.8640358908625, 66.2334479719832], [14.8891858176158, 66.2388985533785], [14.9062671671855, 66.2407440258195], [14.9314170939389, 66.2340917414393], [14.9499576542758, 66.2213021882439], [14.9733908624794, 66.2107014511994], [14.9950215162058, 66.2018603506684] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 63,
+         "id" : 21944,
+         "name" : "Kaldvatnet",
+         "lge_id" : "no",
+         "pfafstette" : 2191,
+         "lke_type" : "B",
+         "altitude" : 0,
+         "objectid" : 13126,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 64,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [16.875, 66.6176925013734], [16.8532835103461, 66.6146453259476], [16.875, 66.6088514008423], [16.8766308826222, 66.6084222212049], [16.9177462918879, 66.5951176524446], [16.9448704449734, 66.5875211728621], [16.9554282640542, 66.5818130836843], [16.96581441128, 66.5699677256913], [16.9858141823842, 66.5644742263322], [16.9961144936825, 66.5610837071965], [17.014054202527, 66.5495816929134], [17.0343973173411, 66.538637612159], [17.0515645028383, 66.5309982146127], [17.080319538546, 66.5249038637612], [17.1040102545321, 66.51709279436], [17.1153405969603, 66.5052045184032], [17.1360270554843, 66.4908699185131], [17.1548251236037, 66.482372161692], [17.1734515198681, 66.4748186000733], [17.2095026094122, 66.4574797427211], [17.2396310199597, 66.4453339589819], [17.2733645394616, 66.4343469602637], [17.3104456601355, 66.4194544268449], [17.3356814228163, 66.4100553927852], [17.3487284837942, 66.4128021424648], [17.2992011536349, 66.4395400338766], [17.2512188701703, 66.467179202527], [17.2714761490569, 66.4714280809376], [17.2900167093939, 66.4777799395715], [17.2690727430873, 66.4872648095587], [17.2422919337118, 66.4951187969237], [17.2243522248672, 66.5027581944699], [17.1909620490753, 66.5079512680828], [17.1635803882073, 66.5176507278887], [17.1301043764878, 66.5297965116279], [17.0949974821461, 66.5407835103461], [17.0690750320454, 66.5492812671672], [17.0429809100897, 66.5599249221754], [17.0092473905878, 66.5802680369896], [16.9768014099982, 66.5975210584142], [16.9379177348471, 66.6070059284014], [16.9047850668376, 66.6140015564915], [16.8789484526643, 66.618250434902], [16.875, 66.6176925013734] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 64,
+         "line::hidden" : [
+            { "contour" : 0, "segments" : [ { "from" : 42, "to" : 43 } ] }
+         ],
+         "id" : 19549,
+         "pfafstette" : 811,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 13319,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_13319",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 65,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [29.1225851492401, 65.6790766343161], [29.1278211408167, 65.6660295733382], [29.1552028016847, 65.6620382027101], [29.1841295092474, 65.6705359595312], [29.192541430141, 65.6848276414576], [29.2310817615821, 65.6866731138986], [29.268162882256, 65.6832825947629], [29.277347326497, 65.6927674647501], [29.2515107123238, 65.7036686275408], [29.2029275773668, 65.707960423915], [29.1676490111701, 65.6984755539279], [29.1396664988098, 65.6915228438015], [29.1208684306904, 65.6906215665629], [29.1225851492401, 65.6790766343161] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 65,
+         "id" : 19310,
+         "name" : "Irnijrvi",
+         "pfafstette" : 977,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 13353,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 66,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [29.0500537905146, 65.583927508698], [29.071512772386, 65.5918244140267], [29.0842164896539, 65.6000217451016], [29.1144307361289, 65.6085195019227], [29.1587220747116, 65.6149142785204], [29.1873054385644, 65.6185193874748], [29.2625835469694, 65.6132833958982], [29.2861025911005, 65.6122104468046], [29.2267899652078, 65.6246566562901], [29.1900521882439, 65.6362445065007], [29.1682498626625, 65.6450426890679], [29.1558036531771, 65.6507507782457], [29.1454175059513, 65.6474460950376], [29.132112937191, 65.6371028657755], [29.0858473722762, 65.628004257462], [29.050311298297, 65.605472326497], [29.0274789415858, 65.5851292116828], [29.0034448818898, 65.5711808734664], [29.0129726698407, 65.5595930232558], [29.0222429500092, 65.5662882255997], [29.0286806445706, 65.5762881111518], [29.0500537905146, 65.583927508698] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 66,
+         "id" : 19579,
+         "name" : "Irnijrvi",
+         "pfafstette" : 957,
+         "lke_type" : "N",
+         "altitude" : 237,
+         "objectid" : 13382,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 67,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.2606093206373, 66.7568325398279], [14.2533991027285, 66.7674761948361], [14.2500515015565, 66.7747722486724], [14.2624977110419, 66.7754160181286], [14.2744289049625, 66.7780769318806], [14.261982695477, 66.7848150521883], [14.2451588536898, 66.7793215528292], [14.2369186046512, 66.7695791750595], [14.2119403497528, 66.7689783235671], [14.177348470976, 66.7774760803882], [14.1558036531771, 66.7762314594397], [14.1697949093573, 66.7656307223952], [14.1891938289691, 66.7550299853507], [14.1792368613807, 66.7428842016114], [14.1697090734298, 66.7327984801319], [14.1576062076543, 66.7258457700055], [14.1255035707746, 66.7282920939388], [14.1108256271745, 66.7374336202161], [14.1125423457242, 66.7492789782091], [14.101727018861, 66.7577767350302], [14.0867915674785, 66.7562316883355], [14.0803538729171, 66.7440429866325], [14.0740020142831, 66.7243007233108], [14.0859332082036, 66.7072622917048], [14.1370055850577, 66.6969619804065], [14.19872161692, 66.6954598516755], [14.2324551364219, 66.7017687923457], [14.2400086980407, 66.7206526963926], [14.240952893243, 66.7391932567295], [14.2500515015565, 66.7465322285296], [14.2606093206373, 66.7568325398279] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 67,
+         "id" : 19152,
+         "name" : "Storglomvatnet",
+         "lge_id" : "no",
+         "pfafstette" : 19,
+         "lke_type" : "B",
+         "altitude" : 0,
+         "objectid" : 13408,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 68,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [15.0715013275957, 66.0064119437832], [15.0873809741806, 66.019802348471], [15.0737330617103, 66.0338365226149], [15.0566517121406, 66.0413900842337], [15.0436904870903, 66.0425917872185], [15.0017167185497, 66.0480852865776], [14.9462667093939, 66.0574843206373], [14.9126190258195, 66.0587289415858], [14.903177073796, 66.0538362937191], [14.8956235121773, 66.0486432201062], [14.8872115912837, 66.051690395532], [14.8730486632485, 66.0589864493683], [14.8573406885186, 66.0558963559788], [14.8622333363853, 66.0461968961729], [14.8837781541842, 66.0440939159495], [14.8976835744369, 66.0425917872185], [14.9053229719832, 66.0370982878594], [14.9225759934078, 66.0367978621132], [14.9426616004395, 66.0374416315693], [14.9658373008607, 66.0313901986816], [14.9929614539462, 66.0237508011353], [15.0178538729171, 66.0158968137704], [15.0268666453031, 66.0012188701703], [15.0214589818715, 65.9845237822743], [15.0251499267534, 65.9738801272661], [15.0427462918879, 65.9747814045047], [15.054248306171, 65.9906181331258], [15.0715013275957, 66.0064119437832] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 68,
+         "id" : 23709,
+         "pfafstette" : 29555,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 14109,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_14109",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 69,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.4412081120674, 66.0562826176525], [14.4487616736861, 66.04834279436], [14.464641320271, 66.0495874153086], [14.4852419428676, 66.0611752655191], [14.5227522431789, 66.0750806857719], [14.5639534883721, 66.0857672587438], [14.5816356894342, 66.0918186916316], [14.5661852224867, 66.0985138939755], [14.5390610694012, 66.101260643655], [14.5227522431789, 66.0942650155649], [14.5035249954221, 66.0854668329976], [14.4582894616371, 66.0839217863029], [14.4230108954404, 66.0824196575719], [14.3984618201795, 66.0793724821461], [14.3774320179454, 66.07872871269], [14.3537413019594, 66.0798445797473], [14.3582047701886, 66.0717760025636], [14.4016377494964, 66.0675271241531], [14.4297060977843, 66.0648232924373], [14.4412081120674, 66.0562826176525] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 69,
+         "id" : 23527,
+         "name" : "Grasvatnet",
+         "lge_id" : "no",
+         "pfafstette" : 71,
+         "lke_type" : "B",
+         "altitude" : 0,
+         "objectid" : 14553,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 70,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [16.2665949459806, 65.7101063221022], [16.2798136788134, 65.7149560520051], [16.2702858908625, 65.724655511811], [16.2441917689068, 65.7422947949094], [16.2295996612342, 65.7596336522615], [16.2153508972716, 65.7729382210218], [16.1904584783007, 65.7921225508149], [16.1719179179638, 65.8018220106208], [16.1587850210584, 65.8064142327413], [16.1363818439846, 65.8122081578466], [16.1035066837576, 65.8116073063542], [16.0867686778978, 65.8064142327413], [16.0992148873833, 65.8027232878594], [16.1396436092291, 65.7939680232558], [16.1809306903498, 65.7760283144113], [16.2017029848013, 65.7565864768358], [16.2205010529207, 65.7349987410731], [16.2420458707197, 65.7210074848929], [16.2526895257279, 65.7149131340414], [16.2665949459806, 65.7101063221022] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 70,
+         "id" : 25309,
+         "name" : "Overstjuktan",
+         "pfafstette" : 22935,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 14972,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 71,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [16.8451290972349, 65.8164141182934], [16.8673606024538, 65.809461408167], [16.875, 65.8089463926021], [16.899205731551, 65.8073155099799], [16.9331967588354, 65.8006632255997], [16.9651277238601, 65.7884745238967], [16.9846124793994, 65.7827235167552], [17.0307922083867, 65.7647838079107], [17.0733668284197, 65.7410930919246], [17.0554271195752, 65.7349987410731], [17.0366290514558, 65.7289043902216], [17.0483885735213, 65.7192049304157], [17.0739676799121, 65.7101063221022], [17.0952549899286, 65.7046128227431], [17.1335378135872, 65.7009218778612], [17.1824642922542, 65.6900207150705], [17.2214338033327, 65.6805358450833], [17.249759659403, 65.6805358450833], [17.2928492950009, 65.6803212552646], [17.3432349844351, 65.6738835607032], [17.3792002380516, 65.6617377769639], [17.4061527192822, 65.6537979536715], [17.431388481963, 65.6507507782457], [17.4460664255631, 65.6523387429042], [17.4305301226881, 65.6635832494049], [17.3873546511628, 65.6760294588903], [17.3481276323018, 65.687273965391], [17.3274411737777, 65.6912224180553], [17.31370742538, 65.6930678904963], [17.3022912470243, 65.6942695934811], [17.2751670939388, 65.6906215665629], [17.2204896081304, 65.6933683162424], [17.1678721845816, 65.7037544634682], [17.1377437740341, 65.7170590322285], [17.1244392052738, 65.7322949093573], [17.1180873466398, 65.7453848882989], [17.0996326222304, 65.7529384499176], [17.0843538271379, 65.76087827321], [17.0764569218092, 65.7684318348288], [17.04126419154, 65.7763287401575], [16.9985178996521, 65.7909208478301], [16.9803206830251, 65.8003198818898], [16.9450421168284, 65.811306880608], [16.892853872917, 65.8161566105109], [16.875, 65.8174441494232], [16.8585195019227, 65.8186029344442], [16.8208375297565, 65.8252552188244], [16.7752586522615, 65.8246972852957], [16.7745719648416, 65.8219076176524], [16.8140564914851, 65.8231093206373], [16.8451290972349, 65.8164141182934] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 71,
+         "line::hidden" : [
+            { "contour" : 0, "segments" : [ { "from" : 46, "to" : 47 } ] }
+         ],
+         "id" : 24942,
+         "name" : "Storvindeln",
+         "pfafstette" : 8113,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 15009,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 72,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.4582894616371, 66.1800151071232], [14.4394913935177, 66.1927617423549], [14.3947708752976, 66.2030620536532], [14.3752861197583, 66.2055083775865], [14.3497070133675, 66.2049075260941], [14.3415526002564, 66.1872682429958], [14.3503937007874, 66.167869323384], [14.3222395165721, 66.1596290743454], [14.298377128731, 66.15417849295], [14.3271321644388, 66.1483845678447], [14.3615523713606, 66.1428910684856], [14.3981184764695, 66.1379984206189], [14.4299636055668, 66.1437923457242], [14.4455857443692, 66.1510883995605], [14.4597486724043, 66.1458953259476], [14.4789759201612, 66.1413460217909], [14.5023232924373, 66.1486849935909], [14.4837827321004, 66.1565818989196], [14.449448361106, 66.1684701748764], [14.4582894616371, 66.1800151071232] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 72,
+         "id" : 22550,
+         "name" : "Storakersvatnet",
+         "lge_id" : "no",
+         "pfafstette" : 0,
+         "lke_type" : "B",
+         "altitude" : 0,
+         "objectid" : 15389,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 73,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [28.0017396081304, 65.3398530488922], [27.9885208752976, 65.3465482512361], [27.9697228071782, 65.3480932979308], [27.949723036074, 65.3480932979308], [27.9162470243545, 65.3429002243179], [27.8910112616737, 65.3380075764512], [27.8688655923823, 65.3298531633401], [27.855732695477, 65.3158189891961], [27.8403680644571, 65.3045744826955], [27.8287802142465, 65.2957763001282], [27.8436298297015, 65.2918278474638], [27.8618270463285, 65.2939308276872], [27.8874919886468, 65.2988234755539], [27.9141011261674, 65.304316974913], [27.9384785295733, 65.3103684078008], [27.9636284563267, 65.3229004532137], [27.9831990477934, 65.3338016160044], [28.0017396081304, 65.3398530488922] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 73,
+         "id" : 22127,
+         "name" : "Puhosjrvi",
+         "pfafstette" : 4237,
+         "lke_type" : "N",
+         "altitude" : 250,
+         "objectid" : 15394,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 74,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.8195728804248, 66.1188999267534], [14.8151094121956, 66.130144433254], [14.7897878135873, 66.1310027925289], [14.7688438472807, 66.1298440075078], [14.740260483428, 66.1310457104926], [14.7105612525179, 66.1302731871452], [14.6606905786486, 66.1343503937008], [14.6347681285479, 66.1319469877312], [14.6186309741806, 66.1279985350669], [14.6000904138436, 66.134650819447], [14.5873866965757, 66.1495433528658], [14.5843824391137, 66.165036737777], [14.5745971433803, 66.1726761353232], [14.5636959805896, 66.1599295000916], [14.5590608405054, 66.1398438930599], [14.5476446621498, 66.1364962918879], [14.5378593664164, 66.1319469877312], [14.5421511627907, 66.1191574345358], [14.5673869254715, 66.1112605292071], [14.5908201336752, 66.1128055759019], [14.6089315143747, 66.1167540285662], [14.6298754806812, 66.1097584004761], [14.6573429774767, 66.0963679957883], [14.6838662790698, 66.0909603323567], [14.6951107855704, 66.0872693874748], [14.71287882256, 66.0830205090643], [14.736912882256, 66.0875268952573], [14.7463548342794, 66.0973121909907], [14.7406038271379, 66.1082133537814], [14.7092737136056, 66.1122047244095], [14.68283624794, 66.1179128135873], [14.6940807544406, 66.1249513596411], [14.7244666727706, 66.1225479536715], [14.7502174510163, 66.1128055759019], [14.7846376579381, 66.1018185771837], [14.8105601080388, 66.0930203946164], [14.8159677714704, 66.0821192318257], [14.8308173869255, 66.0741794085332], [14.8430060886285, 66.0671408624794], [14.8521905328695, 66.0693296786303], [14.8646367423549, 66.0775270097052], [14.8691860465116, 66.0836213605567], [14.8554522981139, 66.099758514924], [14.8320190899103, 66.1103592519685], [14.8195728804248, 66.1188999267534] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 74,
+         "id" : 22947,
+         "name" : "Umbukta",
+         "lge_id" : "no",
+         "pfafstette" : 29733,
+         "altitude" : 0,
+         "objectid" : 15442,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 75,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [26.9721376579381, 64.663294268449], [26.9983176158213, 64.6547965116279], [27.0256134407618, 64.65745742538], [27.0414930873466, 64.6675431468596], [27.0608920069584, 64.6672427211133], [27.0549693279619, 64.6596033235671], [27.0478449459806, 64.6519639260209], [27.0610636788134, 64.6468566883355], [27.0896470426662, 64.6511484847098], [27.1226938747482, 64.6538952343893], [27.14209279436, 64.6623500732467], [27.1403760758103, 64.6751825444058], [27.1181445705915, 64.6745816929134], [27.0752266068486, 64.6802897820912], [27.0426947903314, 64.6870279023988], [27.0388321735946, 64.6875], [27.0307635964109, 64.6884871131661], [27.0293043856437, 64.6875], [27.0159139809559, 64.678487227614], [26.9905065464201, 64.6669422953671], [26.9721376579381, 64.663294268449] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 75,
+         "id" : 27852,
+         "pfafstette" : 185,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 15657,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_15657",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 76,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.8454953305256, 65.5340568348288], [14.8218046145395, 65.5401511856803], [14.8077275224318, 65.5413958066288], [14.7354536714888, 65.5456446850394], [14.7197456967588, 65.5474901574803], [14.7032651986816, 65.5459021928218], [14.7116771195752, 65.5383486312031], [14.7202607123238, 65.5249582265153], [14.7336511170116, 65.516503387658], [14.7730498077275, 65.5213531175609], [14.815710263688, 65.5246578007691], [14.8375125892694, 65.5213101995971], [14.869786898004, 65.5213101995971], [14.9120181743271, 65.5285633354697], [14.9409448818898, 65.5325547060978], [14.9618888481963, 65.5346576863212], [14.9768242995788, 65.5459021928218], [14.9509018494781, 65.5519965436733], [14.9072113623879, 65.5480910089727], [14.8987136055668, 65.5419966581212], [14.8862673960813, 65.532855131844], [14.86377838308, 65.5286491713972], [14.8454953305256, 65.5340568348288] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 76,
+         "id" : 27555,
+         "pfafstette" : 2657,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 15922,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_15922",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 77,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [17.2737078831716, 65.3793804934994], [17.238085973265, 65.3829856024538], [17.2155969602637, 65.3826851767076], [17.2080433986449, 65.3826851767076], [17.1931079472624, 65.3869769730819], [17.1751682384179, 65.3918696209485], [17.150275819447, 65.3961184993591], [17.1235808459989, 65.409165560337], [17.1064136605017, 65.4255602224867], [17.1022935359824, 65.4456029115547], [17.0935382713789, 65.4659460263688], [17.0718217817249, 65.4744867011536], [17.0530237136056, 65.484271996887], [17.0429809100897, 65.4867183208204], [17.0478735579564, 65.4766325993408], [17.0542254165904, 65.4689932017946], [17.0395474729903, 65.4663322880425], [17.0073590001831, 65.4659889443326], [16.9856425105292, 65.4693794634683], [16.9675311298297, 65.4784780717817], [16.9340551181102, 65.4860745513642], [16.9104502380516, 65.4830273759385], [16.9155145577733, 65.4695940532869], [16.9487330617103, 65.4601950192272], [16.986672541659, 65.4529418833547], [17.023238646768, 65.4441007828237], [17.0554271195752, 65.4279636284563], [17.0939674510163, 65.4067621543673], [17.1347395165721, 65.3897237227614], [17.1702755905512, 65.378779642007], [17.2049533052554, 65.3720844396631], [17.2378284654825, 65.3659900888116], [17.2673560245376, 65.3641875343344], [17.2836648507599, 65.3614407846548], [17.2937076542758, 65.3471920206922], [17.3113898553378, 65.3329003387658], [17.3232352133309, 65.3404539003846], [17.3037504577916, 65.3632862570958], [17.2737078831716, 65.3793804934994] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 77,
+         "id" : 27429,
+         "name" : "Storjuktan",
+         "pfafstette" : 22515,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 15940,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 78,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [15.3230005951291, 65.5425975096136], [15.3314125160227, 65.5301513001282], [15.3442879051456, 65.5134132942685], [15.3654893792346, 65.4963319446988], [15.3955319538546, 65.4909242812672], [15.4545870719649, 65.4851303561619], [15.5219682750412, 65.484271996887], [15.5451439754624, 65.4873191723128], [15.565572926204, 65.4860745513642], [15.5872035799304, 65.490623855521], [15.6123535066838, 65.4933706052005], [15.6384476286395, 65.4893792345724], [15.6627391961179, 65.4875766800952], [15.7026529023988, 65.4885208752976], [15.7251419154001, 65.4879200238052], [15.738188976378, 65.48877838308], [15.7581887474822, 65.4867183208204], [15.8032526094122, 65.4805810520051], [15.8484023072697, 65.4818256729537], [15.8229948727339, 65.4930272614906], [15.7816219556858, 65.5051730452298], [15.7561286852225, 65.5110098882989], [15.7344980314961, 65.5064176661784], [15.7132965574071, 65.5036709164988], [15.6916659036807, 65.5030700650064], [15.6657434535799, 65.5015250183117], [15.6378467771471, 65.5067180919246], [15.6147569126534, 65.505816814686], [15.592782915217, 65.503971342245], [15.577933299762, 65.5048726194836], [15.5551867789782, 65.5036709164988], [15.5288351492401, 65.5006237410731], [15.4962174967955, 65.4993791201245], [15.4699517029848, 65.5079197949094], [15.4646298754807, 65.5189067936276], [15.4582780168467, 65.5243573750229], [15.4414541750595, 65.5322542803516], [15.4207677165354, 65.5407949551364], [15.4025704999085, 65.5413958066288], [15.4013687969237, 65.5522969694195], [15.3918410089727, 65.5644427531588], [15.3803389946896, 65.5593355154734], [15.3605967313679, 65.5574900430324], [15.3379360465116, 65.5687345495331], [15.3142453305256, 65.5805799075261], [15.2795676158213, 65.6018672175426], [15.2575936183849, 65.6164593252152], [15.24205731551, 65.6256008514924], [15.2284094030397, 65.638690830434], [15.1861781267167, 65.65504257462], [15.148238646768, 65.6599352224867], [15.1606848562534, 65.6443989196118], [15.1745902765061, 65.6264592107673], [15.190641594946, 65.6101074665812], [15.202658624794, 65.5997213193554], [15.2018861014466, 65.5863738326314], [15.2171648965391, 65.5748289003846], [15.232701199414, 65.5757301776232], [15.2336453946164, 65.5866742583776], [15.2509842519685, 65.5936269685039], [15.2868636696576, 65.5885197308185], [15.3090093389489, 65.5793352865776], [15.3105543856437, 65.5656873741073], [15.3154470335104, 65.5532411646219], [15.3230005951291, 65.5425975096136] ],
+            [ [15.3646310199597, 65.503971342245], [15.3750171671855, 65.507318943417], [15.3742446438381, 65.503971342245], [15.3646310199597, 65.503971342245] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 78,
+         "id" : 26794,
+         "name" : "Ajaure",
+         "pfafstette" : 25953,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 16377,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 79,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [15.2859194744552, 65.4204100668376], [15.2611987273393, 65.4316545733382], [15.2220575444058, 65.4386072834646], [15.1910707745834, 65.4410536073979], [15.18162882256, 65.4359034517488], [15.1563930598792, 65.4259035661967], [15.1365649606299, 65.4228563907709], [15.118196072148, 65.4216546877861], [15.0569950558506, 65.4222555392785], [15.0086694286761, 65.4173628914118], [15.0351927302692, 65.4098093297931], [15.0673812030764, 65.4088651345907], [15.0934753250321, 65.4067621543673], [15.1457494048709, 65.4055175334188], [15.1794829243728, 65.4134573567112], [15.1953625709577, 65.4228563907709], [15.2284094030397, 65.4219551135323], [15.2622287584692, 65.4137148644937], [15.2840310840506, 65.4100239196118], [15.2859194744552, 65.4204100668376] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 79,
+         "id" : 28304,
+         "name" : "Gottern",
+         "pfafstette" : 9915,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 16447,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 80,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [28.0213960355246, 64.5404630562168], [28.0141858176158, 64.5344116233291], [27.9723837209302, 64.5268151437466], [27.9624267533419, 64.5197765976927], [28.012984114631, 64.5083175013734], [28.0353872917048, 64.5095192043582], [28.0475759934078, 64.5183173869255], [28.070580021974, 64.5207637108588], [28.0876613715437, 64.510377563633], [28.0891205823109, 64.4983176158213], [28.1015667917964, 64.4909786440212], [28.125, 64.4892190075078], [28.1345277879509, 64.4885323200879], [28.1594202069218, 64.4954850302142], [28.1390770921077, 64.5052703259476], [28.125, 64.5086608450833], [28.1027684947812, 64.5140255905512], [28.0977041750595, 64.5226091832998], [28.0898931056583, 64.5301627449185], [28.0700650064091, 64.5344116233291], [28.0468893059879, 64.5287035341512], [28.0278337300861, 64.524411737777], [28.0237994414942, 64.5313644479033], [28.0213960355246, 64.5404630562168] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 80,
+         "id" : 28064,
+         "name" : "Lahnajrvi",
+         "pfafstette" : 5571,
+         "lke_type" : "N",
+         "altitude" : 133,
+         "objectid" : 16489,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 81,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [15.3524423182567, 65.7219516800952], [15.3366485075994, 65.7243550860648], [15.314674510163, 65.7234538088262], [15.2883228804248, 65.7219516800952], [15.2853186229628, 65.7115655328694], [15.2900395989746, 65.6982609641091], [15.2937305438564, 65.6900207150705], [15.3391377494964, 65.6878748168834], [15.396476149057, 65.6769307361289], [15.4132141549167, 65.6580897500458], [15.4314113715437, 65.6462443920527], [15.4731276323018, 65.638690830434], [15.4973333638528, 65.6301501556492], [15.5132130104377, 65.61731768449], [15.5302943600073, 65.6219528245743], [15.520509064274, 65.6437980681194], [15.5062603003113, 65.6580897500458], [15.4823979124703, 65.6638836751511], [15.4599947353965, 65.6660295733382], [15.4360465116279, 65.6699351080388], [15.3976778520418, 65.6881752426296], [15.371927073796, 65.7089904550449], [15.3524423182567, 65.7219516800952] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 81,
+         "id" : 26353,
+         "pfafstette" : 2739,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 17273,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_17273",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 82,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [18.0454587071965, 64.9319607214796], [18.0678618842703, 64.9265101400842], [18.0724970243545, 64.9167677623146], [18.0690635872551, 64.8942787493133], [18.0706086339498, 64.8671975141916], [18.0693210950375, 64.8480131843985], [18.033184169566, 64.8435067982055], [17.9900086980406, 64.8514466214979], [17.9626270371727, 64.8623907022523], [17.9362754074345, 64.8800299853507], [17.9140439022157, 64.9018752288958], [17.8955033418788, 64.9153085515473], [17.8873489287676, 64.920716214979], [17.876104422267, 64.9253084370994], [17.854731276323, 64.9314027879509], [17.8486369254715, 64.9402009705182], [17.8295813495697, 64.9514025590551], [17.7997962827321, 64.9653938152353], [17.7922427211133, 64.9756941265336], [17.7705262314594, 64.9897712186413], [17.7507839681377, 64.9948784563267], [17.7668352865775, 64.9802863486541], [17.7870067295367, 64.9693851858634], [17.800654642007, 64.9583981871452], [17.8288946621498, 64.9344070454129], [17.8567055026552, 64.9201153634866], [17.8815979216261, 64.9079695797473], [17.900138481963, 64.8952229445157], [17.9189365500824, 64.8796866416407], [17.9724123329061, 64.8529058322652], [18.0195362570958, 64.8410604742721], [18.0499221754257, 64.8368115958616], [18.0715528291522, 64.8274125618019], [18.0955010529207, 64.8116616691082], [18.1231402215711, 64.7945803195385], [18.136015610694, 64.7918764878228], [18.1319813221022, 64.7997304751877], [18.1201359641091, 64.8098161966673], [18.1030546145395, 64.82372161692], [18.0912950924739, 64.8510603598242], [18.1010803882073, 64.8769398919612], [18.0973894433254, 64.890330296649], [18.0821964841604, 64.9143214383813], [18.0900933894891, 64.9304156747849], [18.1013378959897, 64.9362095998901], [18.0852007416224, 64.9386559238235], [18.0615100256363, 64.9402009705182], [18.0258881157297, 64.9520463285113], [17.9991931422816, 64.9583981871452], [17.9779058322651, 64.9617457883172], [17.9554168192639, 64.961445362571], [17.9812534334371, 64.9520463285113], [18.0171328511262, 64.9402009705182], [18.0454587071965, 64.9319607214796] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 82,
+         "id" : 31348,
+         "pfafstette" : 21739,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 17641,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_17641",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 83,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [16.1682269730819, 65.1775373100165], [16.1062534334371, 65.2036743499359], [16.0762108588171, 65.2084811618751], [16.091918833547, 65.1970220655558], [16.1180129555027, 65.1851767075627], [16.1520898187145, 65.1711425334188], [16.1846216352317, 65.1605417963743], [16.2457368156015, 65.1450054934994], [16.2980967313679, 65.1313575810291], [16.3056502929866, 65.1268511948361], [16.3350920161143, 65.112173251236], [16.3720873008607, 65.0893408945248], [16.3776666361472, 65.0760363257645], [16.364018723677, 65.0678819126534], [16.309598745651, 65.0666372917048], [16.2512303149606, 65.0756929820546], [16.2255653726424, 65.085134934078], [16.2128616553745, 65.0842336568394], [16.2245353415126, 65.0784826496979], [16.2561229628273, 65.0690836156382], [16.2925173960813, 65.0617875618019], [16.3326886101447, 65.0556502929866], [16.3584393883904, 65.0395560565831], [16.3915720563999, 65.0088697125069], [16.4405843709943, 64.9778400247208], [16.4648759384728, 64.9605870032961], [16.4856482329244, 64.941402673503], [16.5307979307819, 64.9137205868888], [16.5810977842886, 64.893334554111], [16.6193806079473, 64.8857380745285], [16.66367194653, 64.887326039187], [16.6894227247757, 64.8945362570958], [16.6782640542025, 64.8994289049625], [16.6621268998352, 64.9064245330526], [16.6296809192456, 64.9210166407252], [16.6054751876946, 64.9219608359275], [16.6176638893976, 64.9067249587988], [16.6095953122139, 64.8997293307087], [16.5829861746933, 64.9030769318806], [16.5745742537997, 64.9116176066655], [16.566677348471, 64.9182698910456], [16.5427291247024, 64.9283556125252], [16.5150041201245, 64.9453082082036], [16.4946610053104, 64.9656942409815], [16.4767212964659, 64.983633949826], [16.448481276323, 64.9987839910273], [16.4201554202527, 65.0140627861198], [16.3986964383813, 65.0352642602088], [16.3867652444607, 65.0562940624428], [16.3962930324117, 65.0690836156382], [16.4038465940304, 65.0833752975646], [16.397065555759, 65.09582150705], [16.3755207379601, 65.1082677165354], [16.3342336568394, 65.1313575810291], [16.2861655374474, 65.1489968641275], [16.2405008240249, 65.1586963239334], [16.2053080937557, 65.1678378502106], [16.1682269730819, 65.1775373100165] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 83,
+         "id" : 29884,
+         "name" : "Vojmsjn",
+         "pfafstette" : 9591,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 17962,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 84,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [25.9436515748031, 64.3387057086614], [25.9221067570042, 64.3438987822743], [25.8940384087164, 64.3502077229445], [25.8795321369712, 64.3396069859], [25.889918284197, 64.3280191356894], [25.9011627906977, 64.3161737776964], [25.9215059055118, 64.3076760208753], [25.9572994872734, 64.3073755951291], [25.9919772019777, 64.2955302371361], [26.0250240340597, 64.2826548480132], [26.032491759751, 64.2888350347921], [26.004766755173, 64.3052296969419], [25.9850244918513, 64.325916155466], [25.968887337484, 64.3380619392053], [25.9436515748031, 64.3387057086614] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 84,
+         "id" : 31643,
+         "name" : "Uljua syvnne",
+         "pfafstette" : 6211,
+         "lke_type" : "N",
+         "altitude" : 79,
+         "objectid" : 18607,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 85,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [27.4011456235122, 64.4587472532503], [27.3946220930233, 64.4487473676982], [27.4111025911005, 64.4344556857718], [27.4274972532503, 64.4265158624794], [27.44457860282, 64.4177176799121], [27.4607157571873, 64.4079753021425], [27.4706727247757, 64.4067306811939], [27.4873248947079, 64.4128679500092], [27.4968526826589, 64.419563152353], [27.4825180827687, 64.432266869621], [27.4700718732833, 64.4477602545321], [27.4784837941769, 64.4593481047427], [27.4764237319172, 64.4696913340048], [27.4633766709394, 64.4756998489288], [27.4424327046328, 64.4763436183849], [27.4089566929134, 64.4830388207288], [27.3885277421718, 64.4815796099615], [27.3954804522981, 64.4742406381615], [27.4135918329976, 64.4685325489837], [27.4159952389672, 64.4602922999451], [27.4011456235122, 64.4587472532503] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 85,
+         "id" : 28990,
+         "name" : "Kivesjrvi",
+         "pfafstette" : 0,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 19095,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 86,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [20.4136719465299, 64.4581464017579], [20.4359034517488, 64.4420092473906], [20.434701748764, 64.4329106390771], [20.4182212506867, 64.4308076588537], [20.422169703351, 64.4216232146127], [20.4321266709394, 64.3981900064091], [20.4377918421534, 64.37733187603], [20.4604525270097, 64.3742847006043], [20.4763321735946, 64.3793919382897], [20.4804522981139, 64.3851429454312], [20.4841432429958, 64.3951428309833], [20.4902375938473, 64.4136833913203], [20.5021687877678, 64.4283613349203], [20.4878341878777, 64.43810371269], [20.4704953305255, 64.4477602545321], [20.45873580846, 64.4581464017579], [20.4392510529207, 64.4705926112434], [20.4164186962095, 64.4708930369896], [20.4136719465299, 64.4581464017579] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 86,
+         "id" : 34007,
+         "name" : "Stora Bygdetrasket",
+         "pfafstette" : 33,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 19312,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 87,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.0280797930782, 64.6894742263322], [14.0297965116279, 64.6875], [14.0388092840139, 64.6770280168467], [14.0345174876396, 64.6687877678081], [14.053487227614, 64.6623500732467], [14.0728861472258, 64.6526506134408], [14.0878215986083, 64.6414061069401], [14.1026712140634, 64.6292603232009], [14.0922850668376, 64.6146252975645], [14.0818989196118, 64.6015782365867], [14.0824997711042, 64.5906341558323], [14.089881660868, 64.582994758286], [14.1177783373009, 64.5754411966673], [14.1318554294085, 64.5797329930416], [14.1194092199231, 64.5946255264604], [14.1159757828237, 64.6131660867973], [14.1165766343161, 64.6311057956418], [14.1218126258927, 64.6380585057682], [14.1340013275957, 64.649603438015], [14.1293661875115, 64.6611483702619], [14.1186366965757, 64.6681439983519], [14.1053321278154, 64.6757833958982], [14.0864482237686, 64.6812339772935], [14.0816414118293, 64.6875], [14.0776071232375, 64.6927359915766], [14.0679076634316, 64.704366759751], [14.0512554934994, 64.7176713285113], [14.0344316517122, 64.7323063541476], [14.014431880608, 64.7383577870353], [13.9941746017213, 64.7347526780809], [13.9728872917048, 64.7335080571324], [13.953660043948, 64.7325638619301], [13.9406988188977, 64.7198601446622], [13.9548617469328, 64.7097744231826], [13.9782949551364, 64.7055684627358], [13.9965780076909, 64.7003753891229], [14.0280797930782, 64.6894742263322] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 87,
+         "id" : 34223,
+         "name" : "Storjorm",
+         "pfafstette" : 2813,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 19654,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 88,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [27.9489505127266, 63.8289690532869], [27.9723837209302, 63.8192266755173], [27.9895509064274, 63.8176816288225], [28.0064605841421, 63.8100851492401], [28.0274903863761, 63.8000423457242], [28.0505802508698, 63.7918879326131], [28.0651723585424, 63.7900424601721], [28.0427691814686, 63.807080891778], [28.0025979674052, 63.8250206006226], [27.9837998992858, 63.8369088765794], [27.9694652993957, 63.8505997070134], [27.9472337941769, 63.8584536943783], [27.9347875846914, 63.8684964978941], [27.9265473356528, 63.8885391869621], [27.9201954770189, 63.9067364035891], [27.9123844076177, 63.9128307544406], [27.8995090184948, 63.9143758011353], [27.8791659036806, 63.9171225508149], [27.8640587804431, 63.9128307544406], [27.876762497711, 63.9049338491119], [27.8858611060245, 63.8893975462369], [27.8874919886468, 63.8687969236404], [27.8783075444058, 63.8614579518403], [27.8774491851309, 63.8532606207654], [27.8971056125252, 63.8411148370262], [27.9201954770189, 63.8377672358542], [27.9489505127266, 63.8289690532869] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 88,
+         "id" : 33144,
+         "name" : "Laakajrvi",
+         "pfafstette" : 66975,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 19796,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 89,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [26.259184444241, 63.9995250412012], [26.2834760117195, 63.9909843664164], [26.3142052737594, 63.9930444286761], [26.3303424281267, 64.0058768998352], [26.3276815143747, 64.0191814685955], [26.3090551181102, 64.0289238463651], [26.292231276323, 64.0381082906061], [26.2785833638528, 64.0436017899652], [26.2644204358176, 64.0536016755173], [26.2542917963743, 64.0599535341513], [26.2436481413661, 64.0490094533968], [26.2324036348654, 64.0402112708295], [26.2214166361472, 64.0301684673137], [26.228798525911, 64.0138167231276], [26.2461373832631, 64.0058768998352], [26.259184444241, 63.9995250412012] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 89,
+         "id" : 33387,
+         "name" : "Iso Lamujrvi",
+         "pfafstette" : 47,
+         "lke_type" : "N",
+         "altitude" : 137,
+         "objectid" : 19890,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 90,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.1691940578649, 64.7471988875664], [14.1807819080755, 64.7274137062809], [14.19872161692, 64.7280145577733], [14.195545687603, 64.7362118888482], [14.1951165079656, 64.7450100714155], [14.2084210767259, 64.7574991988647], [14.2209531221388, 64.7714904550449], [14.2285066837576, 64.7857821369713], [14.2314251052921, 64.8049235488006], [14.2126270371727, 64.8195156564732], [14.1857603918696, 64.8167689067936], [14.1733141823842, 64.8164684810474], [14.1530569034975, 64.8210607031679], [14.1340013275957, 64.8271550540194], [14.1105681193921, 64.837412447354], [14.0788946621498, 64.8350090413844], [14.0722852957334, 64.8180135277422], [14.0706544131112, 64.8088290835012], [14.0704827412562, 64.8012755218825], [14.104731276323, 64.7934215345175], [14.1435291155466, 64.7927777650614], [14.1758034242813, 64.7909752105842], [14.2050734755539, 64.7915760620766], [14.2136570683025, 64.7849237776964], [14.1952881798206, 64.7671986586706], [14.1691940578649, 64.7471988875664] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 90,
+         "id" : 33389,
+         "name" : "Stora Blosjn",
+         "pfafstette" : 2853,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 19891,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 91,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.9852362204725, 64.5766858176158], [15.0011158670573, 64.5648404596228], [15.009012772386, 64.5614499404871], [15.024549075261, 64.5556560153818], [15.0603426570225, 64.5472011765244], [15.0827458340963, 64.5508062854788], [15.078625709577, 64.5735957242263], [15.0676387108588, 64.5933809055118], [15.042574620033, 64.5972864402124], [14.9980257736678, 64.5952263779527], [14.9664381523531, 64.60436790423], [14.9507301776232, 64.6146252975645], [14.9366530855155, 64.6125652353049], [14.9072113623879, 64.6098184856253], [14.8807738967222, 64.6070717359458], [14.8871257553562, 64.6027799395715], [14.9071255264604, 64.5994752563633], [14.936567249588, 64.5946255264604], [14.9658373008607, 64.5891320271013], [14.9852362204725, 64.5766858176158] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 91,
+         "id" : 35066,
+         "name" : "Storsjouten",
+         "pfafstette" : 4837,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 20121,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 92,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [11.9670733382165, 64.3040279939572], [11.9902490386376, 64.3082768723677], [12.0205491210401, 64.3147145669291], [12.0478449459806, 64.327418284197], [12.0245834096319, 64.3335126350485], [11.9743693920528, 64.3183196758835], [11.9488761215895, 64.3055301226881], [11.9339406702069, 64.2985774125618], [11.9160009613624, 64.2912813587255], [11.9051856344992, 64.283684879143], [11.9292196941952, 64.2742429271196], [11.9573738784106, 64.2660026780809], [11.9677600256363, 64.2684490020143], [11.9650132759568, 64.2894358862846], [11.9670733382165, 64.3040279939572] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 92,
+         "id" : 37992,
+         "name" : "Bangsjene",
+         "lge_id" : "no",
+         "pfafstette" : 59,
+         "lke_type" : "B",
+         "altitude" : 0,
+         "objectid" : 21001,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 93,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [26.289570362571, 63.4524068394067], [26.2989264786669, 63.4453682933528], [26.3069092199231, 63.453866050174], [26.3098276414576, 63.4718057590185], [26.3034757828237, 63.4876854056034], [26.29540720564, 63.5040371497894], [26.2837335195019, 63.5128353323567], [26.2481974455228, 63.5195305347006], [26.2257084325215, 63.5144232970152], [26.2236483702619, 63.4973419474455], [26.2220174876396, 63.4860974409449], [26.2393563449918, 63.473393723677], [26.2698280992492, 63.4630075764512], [26.289570362571, 63.4524068394067] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 93,
+         "id" : 37886,
+         "pfafstette" : 0,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 21196,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_21196",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 94,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [16.1229056033694, 64.2827406839407], [16.1220472440945, 64.2742429271196], [16.1169829243728, 64.2651443188061], [16.1265965482512, 64.2569040697674], [16.1465963193554, 64.2635563541476], [16.161531770738, 64.2663460217909], [16.173377128731, 64.2538998123054], [16.1841066196667, 64.2417111106025], [16.1970678447171, 64.2317112250504], [16.2289988097418, 64.2176770509064], [16.2496852682659, 64.20338536898], [16.2563804706098, 64.1909391594946], [16.2766377494964, 64.18870742538], [16.2722601171947, 64.2076342473906], [16.2429042299945, 64.2235138939755], [16.2295996612342, 64.2335137795276], [16.2202435451383, 64.2380630836843], [16.1867675334188, 64.2584491164622], [16.1621326222304, 64.2863887108588], [16.1511456235122, 64.2985774125618], [16.1423045229812, 64.3067747436367], [16.1362101721297, 64.3159162699139], [16.1235064548618, 64.3040279939572], [16.1229056033694, 64.2827406839407] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 94,
+         "id" : 37201,
+         "name" : "Bellvikssjn",
+         "pfafstette" : 443555,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 21470,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 95,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [25.8413351492401, 63.5462684261124], [25.8491462186413, 63.5380710950375], [25.8662275682109, 63.5313758926936], [25.8832230818531, 63.5265690807544], [25.9023644936825, 63.5241227568211], [25.9150682109504, 63.5268695065006], [25.929316974913, 63.5335217908808], [25.9582436824757, 63.531976744186], [25.9819343984618, 63.5323630058597], [25.9968698498444, 63.527470357993], [26.017127128731, 63.5198309604468], [26.0424487273393, 63.5128353323567], [26.0597875846914, 63.5086293719099], [26.0610751236037, 63.5164833592749], [26.047341375206, 63.5271270142831], [26.0354101812855, 63.5371698177989], [26.0232214795825, 63.5468692776048], [26.0114619575169, 63.5572554248306], [25.9844236403589, 63.5678561618751], [25.96287882256, 63.5812465665629], [25.987084554111, 63.5876413431606], [26.010775270097, 63.5949373969969], [26.0278566196667, 63.6031347280718], [26.0361827046328, 63.6101303561619], [26.0369552279802, 63.6231774171397], [26.0424487273393, 63.6347652673503], [26.0278566196667, 63.6509024217176], [26.0129211682842, 63.6648078419703], [25.9990157480315, 63.6788420161143], [25.9844236403589, 63.6821466993225], [25.9868270463285, 63.6718034700604], [25.9844236403589, 63.6660095449551], [25.9828785936642, 63.6593143426112], [25.9797885002747, 63.6480698361106], [25.9682864859916, 63.625623741073], [25.9500892693646, 63.6101303561619], [25.9333512635049, 63.6082848837209], [25.9254543581762, 63.6198298159678], [25.9226217725691, 63.6389712277971], [25.9229651162791, 63.6509024217176], [25.9105189067936, 63.6654086934627], [25.8913774949643, 63.6678550173961], [25.8827939022157, 63.6509024217176], [25.875240340597, 63.6392716535433], [25.85669978026, 63.6337781541842], [25.8466569767442, 63.6250228895806], [25.8293181193921, 63.6289284242813], [25.802623145944, 63.6380699505585], [25.7944687328328, 63.6344219236403], [25.8069149423183, 63.6259241668193], [25.8338674235488, 63.6116324848929], [25.8615924281267, 63.5958386742355], [25.8764420435818, 63.5797015198681], [25.8855406518953, 63.5630064319722], [25.8901757919795, 63.5523627769639], [25.8801329884637, 63.5468692776048], [25.8606482329244, 63.5569120811207], [25.8350691265336, 63.5724054660319], [25.8179019410364, 63.5691007828236], [25.8284597601172, 63.5569549990844], [25.8413351492401, 63.5462684261124] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 95,
+         "id" : 36589,
+         "name" : "Pyhjrvi",
+         "pfafstette" : 551,
+         "lke_type" : "N",
+         "altitude" : 132,
+         "objectid" : 21626,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 96,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [18.4018494781176, 63.9848900155649], [18.4095747115913, 63.9897397454678], [18.4159265702252, 63.9979370765427], [18.4110339223585, 64.0097824345358], [18.3977293535982, 64.0299109595312], [18.384081441128, 64.0423571690167], [18.3667425837759, 64.0530008240249], [18.3471719923091, 64.0666487364951], [18.3222795733382, 64.0836871681011], [18.2837392418971, 64.1033865134591], [18.2529241439297, 64.1186653085515], [18.2398770829518, 64.1299098150522], [18.229834279436, 64.1301244048709], [18.2363578099249, 64.1201245193188], [18.2717222120491, 64.1013264511994], [18.2973871543673, 64.0827858908625], [18.3031381615089, 64.0669062442776], [18.3329232283465, 64.0499536485991], [18.3711202160776, 64.0338164942318], [18.3836522614906, 64.017421832082], [18.3867423548801, 64.0031301501556], [18.3945534242813, 63.9911989562351], [18.4018494781176, 63.9848900155649] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 96,
+         "id" : 38117,
+         "pfafstette" : 571,
+         "altitude" : 0,
+         "objectid" : 22001,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_22001",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 97,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [15.8603335011903, 64.2231705502655], [15.8989596685589, 64.2058316929134], [15.9175002288958, 64.1970335103461], [15.9290022431789, 64.1931279756455], [15.9482294909357, 64.1863898553378], [15.9752678080938, 64.1736003021425], [15.9968126258927, 64.1678492950009], [16.0017052737594, 64.1717548297015], [15.9872848379418, 64.1827418284197], [15.964881660868, 64.1925271241531], [15.9524354513825, 64.2012823887566], [15.9389592107673, 64.2113251922725], [15.9120067295367, 64.2253593664164], [15.8877151620582, 64.2362176112434], [15.8726080388207, 64.2423119620949], [15.8338960355246, 64.2502517853873], [15.7895188610145, 64.2590499679546], [15.7697765976927, 64.2830840276506], [15.7442833272295, 64.3126115867057], [15.7132965574071, 64.3350147637795], [15.6950993407801, 64.3523536211317], [15.6916659036807, 64.3714521149973], [15.6822239516572, 64.3861300585973], [15.6725244918513, 64.3939840459623], [15.6531255722395, 64.4058723219191], [15.6249713880242, 64.4159151254349], [15.614156061161, 64.4231682613075], [15.5928687511445, 64.4353140450467], [15.5641995513642, 64.43776036898], [15.5705514099982, 64.4289621864127], [15.5962163523164, 64.4171168284197], [15.6320957700055, 64.40037882256], [15.6660009613624, 64.3842845861564], [15.6743270463285, 64.3626968503937], [15.6937259659403, 64.3310663111152], [15.7128673777697, 64.3141137154367], [15.7353563907709, 64.2970752838308], [15.7614505127266, 64.2684490020143], [15.7773301593115, 64.2502517853873], [15.8122653817982, 64.2398656381615], [15.8603335011903, 64.2231705502655] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 97,
+         "id" : 36120,
+         "pfafstette" : 47131,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 22394,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_22394",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 98,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [16.0605887200147, 64.3632977018861], [16.0864253341879, 64.357804202527], [16.1003307544406, 64.3605509522066], [16.1074551364219, 64.3732975874382], [16.1031633400476, 64.3866450741622], [16.0907171305622, 64.3915377220289], [16.0566402673503, 64.4058723219191], [16.0098596868705, 64.4244558002197], [15.9852247756821, 64.4453997665263], [15.9733794176891, 64.4526529023988], [15.9667700512727, 64.4365157480315], [15.9744094488189, 64.418576039187], [15.9895165720564, 64.410722051822], [16.0202458340963, 64.3906364447903], [16.0605887200147, 64.3632977018861] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 98,
+         "id" : 35825,
+         "name" : "Ormsjn",
+         "pfafstette" : 44393,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 22402,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 99,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [25.1120731093206, 63.3128805392785], [25.1167082494049, 63.3022368842703], [25.1120731093206, 63.2970438106574], [25.109669703351, 63.2942970609778], [25.1178241164622, 63.2885889718], [25.1269227247757, 63.2806491485076], [25.112673960813, 63.2770011215894], [25.0990260483428, 63.2742972898736], [25.1075238051639, 63.2688037905145], [25.1271802325581, 63.2596622642373], [25.1357638253067, 63.2487181834829], [25.1247768265885, 63.2475164804981], [25.1208283739242, 63.2359715482512], [25.109841375206, 63.2247270417506], [25.091472486724, 63.2247270417506], [25.0981676890679, 63.2180318394067], [25.1144765152902, 63.2043410089727], [25.109669703351, 63.1970878731002], [25.097996017213, 63.1885901162791], [25.1108714063358, 63.1758005630837], [25.13087117744, 63.169062442776], [25.1416006683758, 63.1563587255081], [25.1528451748764, 63.140865340597], [25.1594545412928, 63.1247711041934], [25.1151632027101, 63.1213376670939], [25.0527604834279, 63.1320242400659], [25.0327607123237, 63.1308225370811], [25.0415159769273, 63.1259298892144], [25.0640049899286, 63.1219385185863], [25.1022878135873, 63.1119386330342], [25.1235751236037, 63.1003937007874], [25.1106138985534, 63.0949002014283], [25.109841375206, 63.0815527147043], [25.1306136696576, 63.0648147088445], [25.1545618934261, 63.046875], [25.16160043948, 63.0228838582677], [25.1689823292437, 63.0116822697308], [25.1823727339315, 62.998291865043], [25.1916430141, 62.9870473585424], [25.2051192547153, 62.9779058322651], [25.2193680186779, 62.9688072239516], [25.2312133766709, 62.9782920939388], [25.2257198773118, 62.9949442638711], [25.2148187145212, 63.0067896218641], [25.1991965757187, 63.0159311481414], [25.1828877494964, 63.0235705456876], [25.1816860465116, 63.0329695797473], [25.1932738967222, 63.0371755401941], [25.2107844259293, 63.0420681880608], [25.2011708020509, 63.0569607214796], [25.1838319446988, 63.0779046877861], [25.2234023072697, 63.0837415308551], [25.257908350119, 63.0842994643838], [25.2439170939388, 63.0942993499359], [25.2358485167552, 63.1016383217359], [25.2294108221937, 63.1146853827138], [25.240226149057, 63.1219385185863], [25.2567066471342, 63.1259728071782], [25.2451187969236, 63.1350714154917], [25.2375652353049, 63.1423245513642], [25.218509659403, 63.1560153817982], [25.200484114631, 63.1739550906427], [25.2141320271013, 63.1845558276872], [25.2326725874382, 63.1964011856803], [25.2246040102545, 63.2061864814137], [25.2057201062077, 63.2112937190991], [25.1806560153818, 63.221980292071], [25.1698406885186, 63.2378170206922], [25.1646905328694, 63.2475164804981], [25.1504417689068, 63.255370467863], [25.1440899102728, 63.2648553378502], [25.1360213330892, 63.2712501144479], [25.1519009796741, 63.277902398828], [25.1694115088812, 63.2839967496795], [25.1545618934261, 63.2942970609778], [25.1436607306354, 63.3046832082036], [25.1324162241348, 63.3185886284563], [25.1083821644387, 63.3377729582494], [25.0947342519685, 63.3484595312214], [25.0874381981322, 63.3560130928401], [25.0768803790515, 63.3672575993408], [25.0632324665812, 63.3645108496612], [25.0637474821461, 63.3514637886834], [25.0855498077275, 63.3399188564365], [25.1028886650797, 63.3262280260025], [25.1120731093206, 63.3128805392785] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 99,
+         "id" : 42151,
+         "name" : "Kivijrvi",
+         "lge_id" : "fi",
+         "pfafstette" : 9799,
+         "lke_type" : "N",
+         "altitude" : 131,
+         "objectid" : 23002,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 100,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [25.8403051181102, 63.306786188427], [25.8090608405054, 63.31897489013], [25.7756706647134, 63.3383738097418], [25.7558425654642, 63.3530517533419], [25.7385037081121, 63.3663563221022], [25.7309501464933, 63.3694034975279], [25.7181605932979, 63.3572577137887], [25.7065727430873, 63.3454123557956], [25.6850279252884, 63.3454123557956], [25.6577321003479, 63.347858679729], [25.6427966489654, 63.3542534563267], [25.6308654550449, 63.3569572880425], [25.6166166910822, 63.3438673091009], [25.6161875114448, 63.329833134957], [25.6496635231643, 63.3216787218458], [25.6753284654825, 63.3140822422633], [25.6779893792346, 63.3022368842703], [25.696787447354, 63.2936962094854], [25.7077744460721, 63.2815504257462], [25.7150704999084, 63.2666578923274], [25.7288042483062, 63.2676020875297], [25.7399629188793, 63.269404642007], [25.7476023164256, 63.2739110282], [25.7771298754807, 63.2718509659403], [25.8138676524446, 63.2645119941403], [25.8300048068119, 63.2624519318806], [25.8413351492401, 63.2624519318806], [25.8320648690716, 63.2718509659403], [25.8199620032961, 63.2833958981871], [25.8479445156565, 63.2821512772386], [25.8868281908075, 63.2669583180736], [25.9138665079656, 63.2402204266618], [25.9272569126534, 63.2161863669657], [25.929488646768, 63.2049418604651], [25.9315487090276, 63.1921952252335], [25.9350679820546, 63.186100874382], [25.9429648873833, 63.1931394204358], [25.9585011902582, 63.1970878731002], [25.9833936092291, 63.1870021516206], [26.0100027467497, 63.1888476240615], [26.0027066929134, 63.2141263047061], [25.9560977842886, 63.2386324620033], [25.9186733199048, 63.2566150888116], [25.889918284197, 63.2727093252151], [25.8725794268449, 63.2855417963743], [25.8554980772752, 63.2991897088445], [25.8403051181102, 63.306786188427] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 100,
+         "id" : 41022,
+         "name" : "Kolimajrvi 52",
+         "pfafstette" : 96513,
+         "lke_type" : "N",
+         "altitude" : 111,
+         "objectid" : 23641,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 101,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [28.7073967679912, 62.7730583913203], [28.7204438289691, 62.7682086614173], [28.7311733199048, 62.7737021607764], [28.7426753341879, 62.7852041750595], [28.7527181377037, 62.794302783373], [28.7637051364219, 62.7952898965391], [28.7758080021974, 62.8000967084783], [28.7900567661601, 62.807993613807], [28.8097990294818, 62.8101824299579], [28.7940910547519, 62.8272637795275], [28.7900567661601, 62.8399674967954], [28.82044268449, 62.8377786806446], [28.8298846365135, 62.8493665308551], [28.811773255814, 62.8669628959897], [28.7946919062443, 62.8612118888482], [28.787395852408, 62.8469202069218], [28.7734904321553, 62.8518128547885], [28.7449070683025, 62.8593664164072], [28.7182979307819, 62.8675637474821], [28.7031049716169, 62.876104422267], [28.6870536531771, 62.88794978026], [28.6825043490203, 62.9015976927302], [28.6733199047794, 62.9077349615455], [28.6551226881524, 62.9043444424098], [28.6521184306904, 62.8855034563267], [28.6711740065922, 62.8679070911921], [28.6916887932613, 62.8584651391686], [28.6897145669291, 62.8460189296832], [28.6949505585058, 62.8287229902948], [28.7090276506134, 62.8104399377403], [28.7058517212965, 62.787950924739], [28.7073967679912, 62.7730583913203] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 101,
+         "id" : 42825,
+         "pfafstette" : 0,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 24045,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_24045",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 102,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [23.4592164896539, 63.3846393746566], [23.4626499267533, 63.3879440578648], [23.4683150979674, 63.4003902673503], [23.4814479948727, 63.3979439434169], [23.5017052737594, 63.3961413889397], [23.5153531862296, 63.4055833409632], [23.5300311298297, 63.4080296648965], [23.5473699871818, 63.4101755630837], [23.5424773393151, 63.4191883354697], [23.5357821369713, 63.4314199551364], [23.5241942867607, 63.4420206921809], [23.5036795000916, 63.4432223951657], [23.488744048709, 63.4371280443142], [23.461705731551, 63.4295744826955], [23.4266846731368, 63.4314199551364], [23.4071999175975, 63.4310766114265], [23.4192169474455, 63.421634659403], [23.4467702801685, 63.4110339223585], [23.4549246932796, 63.3973430919245], [23.4592164896539, 63.3846393746566] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 102,
+         "id" : 43161,
+         "pfafstette" : 533,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 24102,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_24102",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 103,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [25.4294943691632, 63.4295744826955], [25.400481825673, 63.4347675563084], [25.3731860007325, 63.4436086568394], [25.351555347006, 63.4490592382347], [25.3415983794177, 63.4432223951657], [25.3555037996704, 63.429316974913], [25.3827996246109, 63.41712827321], [25.4011685130928, 63.4071283876579], [25.4130138710859, 63.4009911188427], [25.4460607031679, 63.3824505585058], [25.4773908167002, 63.3645108496612], [25.4902662058231, 63.3557126670939], [25.4974764237319, 63.3423651803699], [25.5051158212782, 63.3338674235488], [25.5200512726607, 63.3310777559055], [25.536360098883, 63.3292322834646], [25.5498363394983, 63.3310777559055], [25.5458020509064, 63.3393180049441], [25.5321541384362, 63.353867194653], [25.5388493407801, 63.3681159586156], [25.5361025911005, 63.376399125618], [25.533012497711, 63.3842960309467], [25.5290640450467, 63.3958838811573], [25.5114676799121, 63.4049824894708], [25.475588262223, 63.418630401941], [25.4294943691632, 63.4295744826955] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 103,
+         "id" : 40363,
+         "name" : "Alvajrvi",
+         "pfafstette" : 0,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 24255,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 104,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [24.8555095220656, 63.4949385414759], [24.8670973722761, 63.5052388527742], [24.8637497711042, 63.5162258514924], [24.8695007782457, 63.5198309604468], [24.8821186595862, 63.5264832448269], [24.8761959805896, 63.5368693920527], [24.8670973722761, 63.5448092153452], [24.8481276323018, 63.5539078236587], [24.8217760025636, 63.5624055804797], [24.8034929500092, 63.5672553103827], [24.76795687603, 63.5782423091009], [24.7387726606849, 63.5809461408167], [24.7555106665446, 63.5693582906061], [24.7934501464933, 63.5556674601721], [24.8083855978758, 63.5429637429042], [24.789330021974, 63.5413757782457], [24.7725061801868, 63.5484143242996], [24.765295962278, 63.556354147592], [24.7367984343527, 63.5601738463651], [24.6967988921443, 63.5651523301593], [24.6782583318074, 63.5572554248306], [24.6728506683758, 63.5426203991943], [24.67748580846, 63.5335647088445], [24.6858977293536, 63.5262686550082], [24.692678767625, 63.5189296832082], [24.7158544680461, 63.5140370353415], [24.7512188701703, 63.5037367240432], [24.7752529298663, 63.4979427989379], [24.8023770829518, 63.5003891228713], [24.8354239150339, 63.4955393929683], [24.8555095220656, 63.4949385414759] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 104,
+         "id" : 39222,
+         "name" : "Lestijrvi",
+         "pfafstette" : 97,
+         "lke_type" : "N",
+         "altitude" : 141,
+         "objectid" : 24507,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 105,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [17.2331933253983, 63.8885391869621], [17.2465837300861, 63.8973373695294], [17.2365409265702, 63.910427348471], [17.2216913111152, 63.9234744094488], [17.2289873649515, 63.9363068806079], [17.2490729719831, 63.9392682201062], [17.2641800952206, 63.9471651254349], [17.2663259934078, 63.9602121864127], [17.2627208844534, 63.9778943874748], [17.2563690258194, 63.9927869208936], [17.2575707288042, 64.0052760483428], [17.2602316425563, 64.0161772111335], [17.2520772294451, 64.0079369620949], [17.2508755264603, 63.9863921442959], [17.2569698773118, 63.9621005768174], [17.2477854330709, 63.9466071919062], [17.2265839589819, 63.9472080433986], [17.1949963376671, 63.9508560703168], [17.1630653726424, 63.9581521241531], [17.1470140542025, 63.9636456235122], [17.1208340963193, 63.964847326497], [17.0998901300128, 63.9660919474455], [17.1079587071965, 63.9587529756455], [17.128902673503, 63.9532594762864], [17.1560268265885, 63.9466071919062], [17.186155237136, 63.932615935726], [17.1955971891595, 63.910084004761], [17.2031507507782, 63.8951914713422], [17.2177428584508, 63.8918438701703], [17.2331933253983, 63.8885391869621] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 105,
+         "id" : 39516,
+         "name" : "Hallbymagasinet",
+         "pfafstette" : 739,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 24511,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 106,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [11.5689663065373, 63.8273810886284], [11.5978930141, 63.8213725737044], [11.6299956509797, 63.8322737364951], [11.6391800952207, 63.8502134453397], [11.6348882988464, 63.8690973493866], [11.6245021516206, 63.8827452618568], [11.6135151529024, 63.8991828419703], [11.5984080296649, 63.9146762268815], [11.5834725782824, 63.9226160501739], [11.5692238143197, 63.9204272340231], [11.5683654550449, 63.904075489837], [11.5930003662333, 63.8924447216627], [11.6063049349936, 63.8769513367515], [11.5917986632485, 63.8523593435268], [11.5716272202893, 63.8377672358542], [11.5689663065373, 63.8273810886284] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 106,
+         "id" : 45476,
+         "name" : "Leksdalsvatnet",
+         "lge_id" : "no",
+         "pfafstette" : 53,
+         "lke_type" : "B",
+         "altitude" : 0,
+         "objectid" : 25444,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 107,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [28.5122058688885, 62.7451187969236], [28.5193302508698, 62.735376419154], [28.5223345083318, 62.726191974913], [28.5254246017213, 62.7149903863761], [28.5523770829519, 62.7076943325398], [28.5721193462736, 62.7131449139352], [28.6035352957334, 62.7161920893609], [28.6478266343161, 62.7047329930416], [28.65452183666, 62.6928876350485], [28.6364962918879, 62.6885958386742], [28.602591100531, 62.6876087255081], [28.581904642007, 62.6822010620765], [28.5989001556492, 62.6739608130379], [28.6186424189709, 62.6618579472624], [28.6298869254715, 62.6460212186413], [28.642333134957, 62.6386822468412], [28.6596719923091, 62.6368367744003], [28.6779550448636, 62.6350771378868], [28.6909162699139, 62.6302703259476], [28.696581441128, 62.6183391320271], [28.711946072148, 62.6080388207288], [28.7432761856803, 62.5986397866691], [28.7590699963377, 62.5867515107123], [28.7730612525179, 62.5797129646585], [28.7849066105109, 62.5678676066654], [28.8056789049625, 62.5529750732466], [28.8235327778795, 62.5560222486724], [28.8034471708478, 62.5670092473906], [28.7958936092291, 62.5837472532503], [28.8310863394983, 62.5934467130562], [28.8640473356528, 62.5879532136971], [28.8891972624062, 62.5846056125252], [28.9308276872368, 62.5736615317707], [28.9763207288043, 62.5566660181285], [29.0017281633401, 62.5454215116279], [29.0219854422267, 62.5390267350302], [29.0372642373192, 62.5420739104559], [29.0239596685589, 62.5466232146127], [29.0043890770921, 62.5529750732466], [28.9809558688885, 62.5639620719648], [28.9517716535433, 62.584305186779], [28.9389821003479, 62.606837117744], [28.9297118201795, 62.6140902536165], [28.905076908991, 62.6183391320271], [28.9004417689068, 62.6369226103278], [28.8967508240249, 62.6533172724776], [28.8754635140084, 62.66125709577], [28.8636181560154, 62.6648622047244], [28.8511719465299, 62.665763481963], [28.8308288317158, 62.6703127861197], [28.799241210401, 62.6684673136788], [28.7745204632851, 62.6712569813221], [28.76001419154, 62.6785530351584], [28.7536623329061, 62.6876087255081], [28.7327183665995, 62.7010420481597], [28.7010449093573, 62.7101406564732], [28.6961522614906, 62.7183809055118], [28.6916887932613, 62.7274365958616], [28.6804442867607, 62.7399257233107], [28.6660238509431, 62.7508698040652], [28.6553801959348, 62.7569641549167], [28.666367194653, 62.7611701153635], [28.6770108496612, 62.7760626487823], [28.6648221479583, 62.7843028978209], [28.632977018861, 62.78245742538], [28.5986426478667, 62.7843028978209], [28.5746085881707, 62.7843028978209], [28.5619907068303, 62.7918564594396], [28.5471410913752, 62.8007404779344], [28.530317249588, 62.7994958569859], [28.5134075718733, 62.7988950054935], [28.5019913935177, 62.8065344030397], [28.4873134499176, 62.8107403634865], [28.4703179362754, 62.8177359915766], [28.4540091100531, 62.8159334370994], [28.4299750503571, 62.8065344030397], [28.4262841054752, 62.7925002288958], [28.4389878227431, 62.7806548709028], [28.4493739699689, 62.7925002288958], [28.4673136788134, 62.801641755173], [28.4852533876579, 62.7961482558139], [28.4807040835012, 62.7906547564548], [28.4770989745468, 62.7831011948361], [28.4748672404322, 62.7651614859916], [28.4758114356345, 62.7506122962827], [28.4876567936276, 62.7548182567295], [28.5013905420253, 62.7569641549167], [28.5122058688885, 62.7451187969236] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 107,
+         "id" : 45091,
+         "name" : "Juojrvi",
+         "lge_id" : "fi",
+         "pfafstette" : 6459,
+         "lke_type" : "N",
+         "altitude" : 101,
+         "objectid" : 25537,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 108,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [16.8544852133309, 63.7255796786303], [16.8736266251602, 63.7262234480864], [16.875, 63.7259230223402], [16.8909654825124, 63.7225325032045], [16.9095918787768, 63.7149789415858], [16.9281324391137, 63.7164810703168], [16.9344842977477, 63.7229187648782], [16.926244048709, 63.7310731779894], [16.9079609961545, 63.7517596365134], [16.8986907159861, 63.7751499267533], [16.8879612250504, 63.7897849523897], [16.8758583592749, 63.8034757828237], [16.875, 63.8042053882073], [16.8654722120491, 63.8122739653909], [16.8596353689801, 63.799741919978], [16.8728541018129, 63.77270360282], [16.8639271653543, 63.7578110694012], [16.820408350119, 63.7584119208936], [16.7800654642007, 63.7669955136422], [16.747791155466, 63.7855360739791], [16.72410043948, 63.7964372367698], [16.721096182018, 63.7833472578282], [16.7338857352133, 63.77270360282], [16.7538855063175, 63.7669955136422], [16.7639283098334, 63.7584119208936], [16.7800654642007, 63.7544634682293], [16.8113097418055, 63.7498712461088], [16.835944652994, 63.7372104468046], [16.8544852133309, 63.7255796786303] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 108,
+         "id" : 44843,
+         "name" : "Betarsjn",
+         "pfafstette" : 653,
+         "lke_type" : "N",
+         "altitude" : 198,
+         "objectid" : 26571,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 109,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [25.5339566929134, 62.6625017167185], [25.530523255814, 62.6712569813221], [25.5378193096502, 62.6852053195385], [25.5488063083684, 62.7004411966673], [25.5342142006958, 62.7107415079656], [25.5141285936642, 62.7262778108405], [25.4978197674419, 62.7390244460721], [25.4898370261857, 62.750569378319], [25.4961888848196, 62.7682086614173], [25.4894936824757, 62.7822428355612], [25.4670905054019, 62.7873500732466], [25.4427989379235, 62.7910410181285], [25.4180781908075, 62.7858479445157], [25.4072628639443, 62.7706549853507], [25.412327183666, 62.761255951291], [25.4130138710859, 62.7548182567295], [25.3907823658671, 62.7608696896173], [25.3722418055301, 62.7654619117378], [25.3862330617103, 62.7557624519319], [25.3923274125618, 62.7402261490569], [25.3798812030764, 62.72168558872], [25.3913832173595, 62.7073939067936], [25.4068336843069, 62.707994758286], [25.4136147225783, 62.7192392647867], [25.4284643380333, 62.7250331898919], [25.4497516480498, 62.7232306354147], [25.4611678264054, 62.7104410822194], [25.4780775041201, 62.6985957242263], [25.5023690715986, 62.6843469602637], [25.5203087804431, 62.6648622047244], [25.5339566929134, 62.6625017167185] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 109,
+         "id" : 51690,
+         "name" : "Pyhjrvi",
+         "pfafstette" : 6511,
+         "lke_type" : "N",
+         "altitude" : 120,
+         "objectid" : 26655,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 110,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [24.8081280900934, 62.8669628959897], [24.7907892327413, 62.8782503204541], [24.7881283189892, 62.8809970701337], [24.7917334279436, 62.889795252701], [24.7810039370079, 62.8964904550449], [24.7534506042849, 62.9015976927302], [24.726068943417, 62.9116404962461], [24.7038374381981, 62.9074345357993], [24.6858977293536, 62.9013831029115], [24.6767991210401, 62.9013831029115], [24.6777433162424, 62.8952887520601], [24.686326908991, 62.8840442455594], [24.6965413843618, 62.8703534151254], [24.7226355063175, 62.8600101858634], [24.7430644570591, 62.860911463102], [24.7393735121773, 62.8700100714155], [24.7393735121773, 62.8797524491851], [24.7604033144113, 62.8833575581395], [24.7758537813587, 62.8739585240798], [24.7922484435085, 62.8587655649148], [24.8154241439297, 62.8408258560703], [24.8266686504303, 62.8311263962644], [24.8320763138619, 62.836534059696], [24.8252094396631, 62.8493665308551], [24.8081280900934, 62.8669628959897] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 110,
+         "id" : 50785,
+         "name" : "Pjrvi",
+         "pfafstette" : 673,
+         "lke_type" : "N",
+         "altitude" : 144,
+         "objectid" : 26905,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 111,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [11.7407239974364, 63.6058385597876], [11.7433849111884, 63.603091810108], [11.7668181193921, 63.5936927760483], [11.7987490844168, 63.5748517899652], [11.8276757919795, 63.5566545733382], [11.8482764145761, 63.5484143242996], [11.8808940670207, 63.5550666086797], [11.9109366416407, 63.5597017487639], [11.9347990294818, 63.5599592565464], [11.9455285204175, 63.5666544588903], [11.9299063816151, 63.5709462552646], [11.8911085423915, 63.5742080205091], [11.8625251785387, 63.5842937419886], [11.849134773851, 63.5945940532869], [11.8254440578649, 63.5976412287127], [11.7984915766343, 63.6009459119209], [11.7687065097968, 63.6067398370262], [11.7407239974364, 63.6058385597876] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 111,
+         "id" : 51066,
+         "name" : "Feren",
+         "lge_id" : "no",
+         "pfafstette" : 2751,
+         "lke_type" : "B",
+         "altitude" : 0,
+         "objectid" : 26933,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 112,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.1940864768358, 63.5839933162424], [14.1818977751328, 63.5827486952939], [14.1645589177806, 63.5876413431606], [14.1437007874016, 63.5952378227431], [14.1073921900751, 63.6021905328694], [14.0824997711042, 63.6027913843618], [14.0576073521333, 63.6046368568028], [14.0153760758103, 63.6128771058414], [13.9855910089727, 63.6298726194836], [13.965848745651, 63.6380699505585], [13.9375228895807, 63.6456235121772], [13.9175231184765, 63.6611598150522], [13.8898839498261, 63.6654086934627], [13.851000274675, 63.6617606665446], [13.8420733382165, 63.6545504486358], [13.8597555392785, 63.6496578007691], [13.8847337941769, 63.6475119025819], [13.911428767625, 63.637812442776], [13.932630241714, 63.625623741073], [13.9515141457609, 63.615623855521], [13.9825867515107, 63.6073836064823], [14.0119426387109, 63.5970403772203], [14.0561481413661, 63.588242194653], [14.1066196667277, 63.58339246475], [14.1355463742904, 63.5751951336751], [14.1637005585058, 63.568199505585], [14.2026700695843, 63.5675557361289], [14.2275624885552, 63.5660536073979], [14.2382061435635, 63.5691007828236], [14.2406095495331, 63.5794010941219], [14.2183780443142, 63.5861392144296], [14.1940864768358, 63.5839933162424] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 112,
+         "id" : 49448,
+         "name" : "Landsjn",
+         "pfafstette" : 6711,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 28491,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 113,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.1859320637246, 63.3451119300494], [14.1260185863395, 63.3572577137887], [14.041298525911, 63.3775579106391], [13.9823292437283, 63.391592084783], [13.9513424739059, 63.3909912332906], [13.9245616645303, 63.3918495925654], [13.8959783006775, 63.3933946392602], [13.886879692364, 63.3863990111701], [13.8987250503571, 63.3788454495514], [13.944818943417, 63.37974672679], [13.9878227430874, 63.3806050860648], [14.0364058780443, 63.365712552646], [14.0933150979674, 63.3506054294085], [14.1145165720564, 63.346013207288], [14.1293661875115, 63.3399188564365], [14.1479925837759, 63.3380733839956], [14.1731425105292, 63.3399188564365], [14.1859320637246, 63.3451119300494] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 113,
+         "id" : 54532,
+         "pfafstette" : 76511,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 29332,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_29332",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 114,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [25.3259762406153, 62.6797547381432], [25.3440017853873, 62.6737033052554], [25.3379074345358, 62.6676089544039], [25.3324139351767, 62.6570082173594], [25.3664907983886, 62.6378238875664], [25.4099237776964, 62.637223036074], [25.4315544314228, 62.6517293078191], [25.418507370445, 62.664261353232], [25.3928424281267, 62.6678664621864], [25.3725851492401, 62.6730595357993], [25.3530145577733, 62.6800551638894], [25.3312122321919, 62.6876087255081], [25.3171351400842, 62.6837031908075], [25.3259762406153, 62.6797547381432] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 114,
+         "id" : 54202,
+         "pfafstette" : 6413,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 29534,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_29534",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 115,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [12.4890416132577, 63.2952412561802], [12.4858656839407, 63.2830954724409], [12.5032045412928, 63.2700913294268], [12.5184833363853, 63.2533104056034], [12.541401529024, 63.2421946529939], [12.592988921443, 63.2353706967588], [12.6333318073613, 63.2426667505951], [12.6420870719649, 63.2621085881706], [12.6509281724959, 63.2842971754257], [12.6570225233474, 63.2973871543673], [12.6437179545871, 63.3010351812855], [12.6304133858268, 63.3095758560703], [12.6194263871086, 63.3210349523897], [12.602173365684, 63.3288031038271], [12.5662081120674, 63.3250263230178], [12.5376247482146, 63.3171294176891], [12.5136765244461, 63.3046402902399], [12.4890416132577, 63.2952412561802] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 115,
+         "id" : 56337,
+         "pfafstette" : 93373,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 30012,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_30012",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 116,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [24.0236735488006, 62.8083369575169], [24.021270142831, 62.8177359915766], [24.0047896447537, 62.8228861472258], [23.9990386376122, 62.815332585607], [24.0085664255631, 62.8059335515473], [24.0102831441128, 62.7988950054935], [24.0077939022157, 62.7852041750595], [24.0151757919795, 62.7752042895074], [24.0202401117012, 62.7688095129097], [24.0264202984801, 62.7606121818348], [24.0319137978392, 62.7536165537447], [24.0357764145761, 62.7429299807727], [24.036119758286, 62.7262778108405], [24.0224718458158, 62.7183809055118], [24.0112273393151, 62.7159345815785], [24.0185233931514, 62.708338101996], [24.0282228529573, 62.6994540835012], [24.0357764145761, 62.6919005218824], [24.0410124061527, 62.679454312397], [24.0476217725691, 62.664261353232], [24.0692524262955, 62.6590682796191], [24.0927714704267, 62.6499267533419], [24.1142304522981, 62.6369226103278], [24.1254749587988, 62.6229313541476], [24.1294234114631, 62.6058500045779], [24.1430713239333, 62.6006998489288], [24.1525991118843, 62.6058500045779], [24.1473631203076, 62.6183391320271], [24.1379211682842, 62.6362788408716], [24.1251316150888, 62.65357478026], [24.1157754989929, 62.6715144891045], [24.1054751876946, 62.6855486632485], [24.0859904321553, 62.6864499404871], [24.0704541292804, 62.6916430141], [24.0710549807728, 62.7122865546603], [24.0671065281084, 62.7314708844534], [24.0555186778978, 62.7447754532137], [24.0500251785387, 62.7563633034243], [24.0464200695843, 62.7696678721846], [24.04247161692, 62.7843028978209], [24.0290812122322, 62.7876504989928], [24.0204976194836, 62.7952898965391], [24.0236735488006, 62.8083369575169] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 116,
+         "id" : 53990,
+         "name" : "htrinjrvi",
+         "pfafstette" : 9735,
+         "lke_type" : "N",
+         "altitude" : 154,
+         "objectid" : 30292,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 117,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.2639569218092, 63.3618070179454], [14.2843000366233, 63.359704037722], [14.3327973356528, 63.3626653772203], [14.3776895257279, 63.3639099981688], [14.3976892968321, 63.3648541933712], [14.382839681377, 63.3709056262589], [14.3686767533419, 63.3809913477385], [14.3505653726424, 63.391592084783], [14.3178618842703, 63.4037378685222], [14.2600084691449, 63.4107764145761], [14.2085069126534, 63.4110339223585], [14.1767476194836, 63.4132227385094], [14.146962552646, 63.4152828007691], [14.1355463742904, 63.4174286989562], [14.1183791887933, 63.423480131844], [14.1026712140634, 63.4317203808826], [14.086534059696, 63.4463124885552], [14.0673926478667, 63.453866050174], [14.0920275590551, 63.4301753341879], [14.1859320637246, 63.3954976194836], [14.2597509613624, 63.3739098837209], [14.2639569218092, 63.3618070179454] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 117,
+         "id" : 52913,
+         "name" : "N?ldsjn",
+         "pfafstette" : 76513,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 30500,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 2
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 118,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [28.1186481413661, 62.0089040468779], [28.125, 62.0061143792346], [28.1357294909357, 62.0013504852591], [28.1478323567112, 61.9986037355795], [28.1599352224867, 61.9955994781175], [28.1885185863395, 61.9919514511994], [28.2192478483794, 61.984011627907], [28.2481745559421, 61.9731104651163], [28.2524663523164, 61.9789043902216], [28.228003112983, 61.9892047015199], [28.2013939754624, 62.0004492080205], [28.1813083684307, 62.0080027696392], [28.1530683482879, 62.0205348150522], [28.125, 62.0303630287493], [28.09495742538, 62.0409208478301], [28.055215390954, 62.0466289370079], [28.0680907800769, 62.0338823017762], [28.0989058780443, 62.0189897683574], [28.1186481413661, 62.0089040468779] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 118,
+         "id" : 60351,
+         "name" : "Kolkonjrvi",
+         "pfafstette" : 59891,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 30826,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 119,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [11.9741118842703, 63.1140845312214], [11.9494769730819, 63.1162304294085], [11.9360865683941, 63.124170252701], [11.9219236403589, 63.1137841054752], [11.9315372642373, 63.0958443966306], [11.954970472441, 63.0927972212049], [11.9853563907709, 63.0900933894891], [12.0093046145395, 63.0831406793627], [12.0133389031313, 63.0685056537264], [12.0014935451383, 63.0509092885918], [11.9917082494049, 63.0393214383812], [11.9807212506867, 63.0350296420069], [11.9676741897089, 63.0311241073063], [11.9829529848013, 63.0259310336935], [11.9984034517488, 63.0207379600806], [11.9907640542025, 63.0110385002747], [11.9553138161509, 63.0082917505951], [11.9063015015565, 63.0101372230361], [11.8796065281084, 63.0070900476103], [11.8528257187328, 63.0052445751694], [11.8321392602088, 63.0021973997436], [11.867160318623, 62.9964463926021], [11.918232695477, 62.9976910135506], [11.9498203167918, 62.9985493728255], [11.9706784471709, 62.990952893243], [11.9682750412013, 62.9815538591833], [11.9607214795825, 62.9703522706464], [11.9841546877861, 62.9699660089727], [12.0226950192273, 62.9736569538546], [12.0559135231643, 62.9712106299212], [12.0804625984252, 62.9739573796008], [12.0755699505585, 62.9873048663248], [12.057630241714, 62.9973905878044], [12.0425231184765, 63.0037853644021], [12.0345403772203, 63.0162315738876], [12.0290468778612, 63.0241284792162], [12.0222658395898, 63.0366176066654], [12.0287893700788, 63.0490638161509], [12.0425231184765, 63.0633554980773], [12.0520509064274, 63.0870462140633], [12.0458707196484, 63.1113377815418], [12.0290468778612, 63.1237839910273], [12.0209783006775, 63.1188913431606], [12.0087895989746, 63.1146853827138], [11.9741118842703, 63.1140845312214] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 119,
+         "id" : 60425,
+         "name" : "Essandsjen",
+         "lge_id" : "no",
+         "pfafstette" : 77,
+         "lke_type" : "B",
+         "altitude" : 0,
+         "objectid" : 30943,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 120,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [23.3350119025819, 62.008045687603], [23.3531232832815, 61.9986037355795], [23.3643677897821, 62.0064577229445], [23.3719213514008, 62.0150413156931], [23.3811057956418, 62.0292900796557], [23.3847967405237, 62.0603197674418], [23.3823074986266, 62.0819075032045], [23.3726080388207, 62.0974008881157], [23.3568142281633, 62.1013064228163], [23.3507198773118, 62.0833667139718], [23.3561275407435, 62.0616073063541], [23.3442821827504, 62.0338823017762], [23.3350119025819, 62.008045687603] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 120,
+         "id" : 68760,
+         "name" : "Aurejrvi",
+         "pfafstette" : 4859,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 31748,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 121,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.8569115088812, 62.9800517304523], [14.8691860465116, 62.9705668604651], [14.8854948727339, 62.9585069126533], [14.9050654642007, 62.9566614402124], [14.9028337300861, 62.966918833547], [14.8950226606849, 62.9794508789599], [14.8730486632485, 63.0031845129097], [14.8533922358542, 63.027175654642], [14.8622333363853, 63.0377763916865], [14.8713319446988, 63.0442140862479], [14.8628341878777, 63.0527547610328], [14.8388859641092, 63.0572611472258], [14.8260964109138, 63.045029527559], [14.81871452115, 63.0313816150888], [14.8047232649698, 63.0234847097601], [14.8169119666728, 63.0013390404688], [14.8400018311665, 62.9861460813038], [14.8569115088812, 62.9800517304523] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 121,
+         "id" : 60533,
+         "name" : "Locknesjn",
+         "pfafstette" : 72595,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 31921,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 122,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [27.5317879051456, 62.2259401895257], [27.5002861197583, 62.2362834187877], [27.4971101904413, 62.2207900338766], [27.4862090276506, 62.2192449871818], [27.4713594121956, 62.2141377494964], [27.4578831715803, 62.2131506363303], [27.4356516663615, 62.2177857764146], [27.4187419886468, 62.2089875938473], [27.411360098883, 62.1910478850027], [27.4211453946164, 62.1751682384179], [27.4280981047427, 62.1633228804248], [27.4335916041018, 62.1506620811207], [27.4390851034609, 62.1411772111335], [27.4457803058048, 62.1302760483428], [27.4563381248856, 62.1387308872001], [27.4523896722212, 62.1578293810657], [27.4486987273393, 62.1651683528658], [27.4433768998352, 62.170962277971], [27.4333340963194, 62.1792025270097], [27.4350508148691, 62.1858548113898], [27.4518746566563, 62.1943525682109], [27.4706727247757, 62.2028932429958], [27.480973036074, 62.2067987776964], [27.5105005951291, 62.2013052783373], [27.5566803241165, 62.1888590688518], [27.577624290423, 62.190661623329], [27.5676673228346, 62.1989018723677], [27.5317879051456, 62.2259401895257] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 122,
+         "id" : 58044,
+         "name" : "Lngelmenjrvi",
+         "pfafstette" : 62713,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 32214,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 123,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [13.4753822559971, 63.1912939479949], [13.4965837300861, 63.1882467725691], [13.5115191814686, 63.1870021516206], [13.5292872184582, 63.1870021516206], [13.5560680278337, 63.1839120582311], [13.5934924922176, 63.1843412378685], [13.6182132393335, 63.1915943737411], [13.6186424189709, 63.2046414347189], [13.6078270921077, 63.2119374885552], [13.5813037905146, 63.2076886101447], [13.5588147775133, 63.2018946850394], [13.5141800952207, 63.1998346227797], [13.451691540011, 63.2080319538546], [13.4213914576085, 63.2216798663248], [13.4035375846915, 63.2284179866325], [13.3840528291522, 63.2329243728255], [13.3603621131661, 63.2426667505951], [13.3418215528292, 63.2429242583776], [13.3409631935543, 63.2335252243179], [13.3211350943051, 63.2271733656839], [13.2749553653177, 63.2213794405786], [13.2242263321736, 63.2174309879143], [13.1902353048892, 63.2143408945248], [13.1880035707746, 63.2055856299212], [13.2041407251419, 63.199448361106], [13.2339257919795, 63.1989333455411], [13.2544405786486, 63.2047272706464], [13.2701485533785, 63.2137400430324], [13.3123798297015, 63.2192335423915], [13.3586453946164, 63.2164867927119], [13.3764992675334, 63.2088473951657], [13.3861987273393, 63.208632805347], [13.4060268265885, 63.2076456921809], [13.4299750503571, 63.2016800952206], [13.4509190166636, 63.1952424006592], [13.4753822559971, 63.1912939479949] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 123,
+         "id" : 57818,
+         "name" : "Hottjen",
+         "pfafstette" : 7833,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 32318,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 124,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [15.8587884544955, 63.1755001373375], [15.8342393792346, 63.1764014145761], [15.8098619758286, 63.1748563678813], [15.8171580296649, 63.1654144158579], [15.8538958066288, 63.1606076039187], [15.8918352865776, 63.1581612799853], [15.9262554934994, 63.1515089956052], [15.9787870811207, 63.1372173136788], [16.0229925837759, 63.1347709897455], [16.0207608496612, 63.1478180507233], [15.9724352224867, 63.169062442776], [15.9302039461637, 63.1855000228896], [15.922650384545, 63.1776031175609], [15.892264466215, 63.1748563678813], [15.8587884544955, 63.1755001373375] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 124,
+         "id" : 57400,
+         "pfafstette" : 3111,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 32487,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_32487",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 125,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [27.6946186595862, 62.1967988921443], [27.680455731551, 62.2065412699139], [27.6700695843252, 62.2143523393151], [27.6463788683391, 62.2296311344076], [27.6081818806079, 62.2405322971983], [27.6059501464933, 62.2283865134591], [27.6305850576817, 62.2110476561069], [27.6539324299579, 62.2049533052554], [27.6770222944516, 62.195339681377], [27.6874084416773, 62.1825072102179], [27.6749622321919, 62.1803613120307], [27.6611426478667, 62.1792025270097], [27.6694687328328, 62.1706618522248], [27.6865500824025, 62.1542242721113], [27.7238887108588, 62.1372287584691], [27.7573647225783, 62.1362845632668], [27.7553904962461, 62.1551684673137], [27.7250904138436, 62.1797604605384], [27.6946186595862, 62.1967988921443] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 125,
+         "id" : 57899,
+         "name" : "Sysmjrvi",
+         "pfafstette" : 6255,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 32521,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 126,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [13.1330685771837, 62.8628427714704], [13.1235407892328, 62.8567484206189], [13.1110945797473, 62.8483364997253], [13.0959874565098, 62.8428430003662], [13.115987227614, 62.8379503524995], [13.1348711316609, 62.8306542986632], [13.1175322743087, 62.8230578190807], [13.0995925654642, 62.8185514328877], [13.0727259201612, 62.8167059604468], [13.0461167826406, 62.8230578190807], [13.0257736678264, 62.8243024400293], [13.0136708020509, 62.8118562305438], [13.0226835744369, 62.8045172587438], [13.0482626808277, 62.8045172587438], [13.0747001464933, 62.80481768449], [13.098133354697, 62.8057189617286], [13.1306651712141, 62.8002254623695], [13.1749565097968, 62.7954186504303], [13.1989905694928, 62.8012125755356], [13.1847418055301, 62.8130579335286], [13.1743556583044, 62.8249032915217], [13.1782182750412, 62.83520360282], [13.1952996246109, 62.8388945477019], [13.2053424281267, 62.8419417231276], [13.1860293444424, 62.844388047061], [13.1579609961546, 62.8477356482329], [13.1452572788867, 62.8567484206189], [13.1330685771837, 62.8628427714704] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 126,
+         "id" : 65193,
+         "name" : "Storsjn",
+         "pfafstette" : 955,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 33755,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 127,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [16.3515725141916, 62.7138316013551], [16.3326886101447, 62.7220718503937], [16.3220449551364, 62.7235310611609], [16.3326886101447, 62.7089389534884], [16.3689113715437, 62.6988532320088], [16.3926020875298, 62.6998403451749], [16.4213571232375, 62.6934455685772], [16.4731161875115, 62.6849478117561], [16.502901254349, 62.6828019135689], [16.551312717451, 62.6806560153818], [16.6016125709577, 62.6696690166636], [16.6176638893976, 62.65357478026], [16.6551741897089, 62.6472229216261], [16.7080491210401, 62.635377563633], [16.735945797473, 62.6207854559604], [16.7469327961912, 62.6174378547885], [16.7538855063175, 62.6217296511628], [16.7420401483245, 62.6290257049991], [16.723928767625, 62.639883949826], [16.7082207928951, 62.6493688198132], [16.6711396722212, 62.6536176982238], [16.6305392785204, 62.6630167322835], [16.6095953122139, 62.6825014878227], [16.5794669016664, 62.7022866691082], [16.5536302874931, 62.7000978529573], [16.5444458432522, 62.6894541979491], [16.5156049716169, 62.6919005218824], [16.4909700604285, 62.6952481230544], [16.4779229994507, 62.6982523805164], [16.4566356894342, 62.7086385277422], [16.4374942776048, 62.7189817570042], [16.4247047244095, 62.71434661692], [16.3945763138619, 62.7067930553012], [16.3652204266618, 62.709840230727], [16.3515725141916, 62.7138316013551] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 127,
+         "id" : 65196,
+         "name" : "Holmsjn",
+         "pfafstette" : 4193,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 33798,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 128,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [29.4551135323201, 61.5053046603186], [29.4627529298663, 61.5141457608497], [29.4363154642007, 61.5390810977843], [29.4335687145212, 61.5566345449551], [29.4609503753891, 61.5642739425014], [29.4754566471342, 61.5609263413294], [29.4919371452115, 61.5572783144113], [29.4976023164256, 61.57251419154], [29.4870444973448, 61.5882650842337], [29.4803492950009, 61.5980074620033], [29.4779458890313, 61.6065910547519], [29.4633537813587, 61.6083506912653], [29.4450707288043, 61.6074494140267], [29.431422816334, 61.60290010987], [29.4107363578099, 61.599552508698], [29.3901357352133, 61.5977070362571], [29.3877323292437, 61.5804110968687], [29.3842988921443, 61.5658189891961], [29.3857581029116, 61.5557761856803], [29.3913374381981, 61.5396819492767], [29.3822388298846, 61.5341884499176], [29.3742560886285, 61.5278365912836], [29.3675608862846, 61.5110985854239], [29.358805621681, 61.4940172358542], [29.3660158395898, 61.480369323384], [29.38000709577, 61.4697256683758], [29.3901357352133, 61.4658201336752], [29.3913374381981, 61.4758200192272], [29.398204312397, 61.4837169245559], [29.4187190990661, 61.4770646401758], [29.4381180186779, 61.4846182017945], [29.4475599707013, 61.5025579106391], [29.4551135323201, 61.5053046603186] ],
+            [ [29.3997493590917, 61.5542740569493], [29.3903932429958, 61.5578791659037], [29.401036898004, 61.5578791659037], [29.3997493590917, 61.5542740569493] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 128,
+         "id" : 65108,
+         "name" : "Simpelejrvi",
+         "pfafstette" : 426915,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 34175,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 129,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [23.7756077183666, 62.3301879234572], [23.7917448727339, 62.3460246520784], [23.797238372093, 62.3536640496246], [23.8000709577001, 62.3575695843252], [23.7951783098334, 62.362118888482], [23.7805003662333, 62.3493722532503], [23.7607581029116, 62.3320333958982], [23.7411875114448, 62.3216472486724], [23.721960263688, 62.3240935726057], [23.6986987273393, 62.3359389305988], [23.6807590184948, 62.3508314640176], [23.6740638161509, 62.3755092931697], [23.6642785204175, 62.384650819447], [23.6514031312946, 62.3728054614539], [23.6589566929134, 62.3544794909357], [23.6691711682842, 62.3383852545321], [23.6971536806446, 62.3111752655191], [23.7419600347922, 62.2737078831716], [23.7598139077092, 62.278815120857], [23.7556079472624, 62.3016474775682], [23.7598139077092, 62.3086001876945], [23.7656507507782, 62.3168404367332], [23.7756077183666, 62.3301879234572] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 129,
+         "id" : 62481,
+         "name" : "Toisvesi",
+         "pfafstette" : 9391,
+         "lke_type" : "N",
+         "altitude" : 98,
+         "objectid" : 34331,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 130,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [9.4562866233291, 62.6700552783373], [9.483668284197, 62.6606562442776], [9.4894192913386, 62.6648622047244], [9.4833249404871, 62.6779092657022], [9.4683894891046, 62.6849478117561], [9.4362010162974, 62.6973940212415], [9.4021241530855, 62.7067930553012], [9.365987227614, 62.7086385277422], [9.3404939571507, 62.7116857031679], [9.3142281633401, 62.7165783510346], [9.2492503662333, 62.7210847372276], [9.2133709485442, 62.7159345815785], [9.2456452572789, 62.7110848516755], [9.2974043215528, 62.7086385277422], [9.3198074986266, 62.7061922038088], [9.3343996062992, 62.7031450283831], [9.3741416407251, 62.6988532320088], [9.4033258560703, 62.6922867835561], [9.4209222212049, 62.6812997848379], [9.4562866233291, 62.6700552783373] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 130,
+         "id" : 68612,
+         "name" : "Gjevilvatnet",
+         "lge_id" : "no",
+         "pfafstette" : 613,
+         "lke_type" : "B",
+         "altitude" : 0,
+         "objectid" : 35197,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 131,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [8.1609366416407, 62.4888985533785], [8.1702927577367, 62.5092845861564], [8.177245467863, 62.5409151254349], [8.1821381157297, 62.5560222486724], [8.1781038271379, 62.5761078557041], [8.174241210401, 62.5925454358176], [8.1708936092291, 62.6123306171031], [8.1621383446255, 62.6311286852225], [8.1326107855704, 62.635377563633], [8.1103792803516, 62.6323303882073], [8.1235121772569, 62.6283819355429], [8.1450569950559, 62.6225450924739], [8.1486621040103, 62.6123306171031], [8.1474604010255, 62.6000989974364], [8.1465162058231, 62.5800992263322], [8.1508938381249, 62.5609148965391], [8.153554751877, 62.5462798709028], [8.1495204632851, 62.5307864859916], [8.1456578465483, 62.5156364447903], [8.1456578465483, 62.5003576496979], [8.1609366416407, 62.4888985533785] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 131,
+         "id" : 70000,
+         "name" : "Eikesdalsvatnet",
+         "lge_id" : "no",
+         "pfafstette" : 1535,
+         "lke_type" : "B",
+         "altitude" : 757,
+         "objectid" : 35919,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 132,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [13.076931880608, 62.5286835057682], [13.1067169474455, 62.5356362158945], [13.121824070683, 62.5429751876946], [13.1333260849661, 62.5517733702618], [13.1244849844351, 62.5606144707929], [13.1062019318806, 62.5545630379051], [13.0957299487274, 62.5451210858817], [13.0780477476653, 62.5426747619484], [13.0590780076909, 62.5472669840688], [13.0469751419154, 62.5520737960081], [13.0370181743271, 62.5600136193005], [13.0329838857352, 62.5670092473906], [13.0263745193188, 62.5764082814503], [13.0205376762498, 62.5867515107123], [13.013327458341, 62.6000989974364], [12.9959886009888, 62.6131460584142], [12.9831990477935, 62.6043907938106], [12.9975336476836, 62.5825455502655], [13.0108382164439, 62.5597131935543], [13.0141858176158, 62.5441768906794], [13.0336705731551, 62.5344345129097], [13.076931880608, 62.5286835057682] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 132,
+         "id" : 70080,
+         "pfafstette" : 9613,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 36071,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_36071",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 133,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [16.3853060336935, 62.6232317798938], [16.4165503112983, 62.5970518220106], [16.4313999267534, 62.58580731551], [16.4414427302692, 62.5915583226515], [16.4365500824025, 62.6043907938106], [16.4301982237686, 62.6249914164072], [16.4250480681194, 62.6478237731185], [16.4209279436001, 62.6602699826039], [16.4531164164073, 62.6651626304706], [16.4707127815419, 62.6733599615455], [16.4460778703534, 62.6812997848379], [16.4296832082036, 62.677608839956], [16.4041041018129, 62.6624158807911], [16.3556926387109, 62.6518151437466], [16.3342336568394, 62.6469224958799], [16.3506283189892, 62.6402702114997], [16.3853060336935, 62.6232317798938] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 133,
+         "id" : 66517,
+         "name" : "Leringen",
+         "pfafstette" : 4153,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 36408,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 134,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [23.2309787584691, 61.7305381340414], [23.243682475737, 61.749636627907], [23.2460858817066, 61.7667179774766], [23.2284895165721, 61.7770612067387], [23.2081464017579, 61.7767607809925], [23.1884041384362, 61.780022546237], [23.1765587804431, 61.7924687557224], [23.1699494140267, 61.8016531999634], [23.1601641182934, 61.8016531999634], [23.1494346273576, 61.7953013413294], [23.1294348562534, 61.7934558688885], [23.1163019593481, 61.8028549029482], [23.0969030397363, 61.8140994094488], [23.080594213514, 61.8168461591284], [23.0589635597876, 61.82225382256], [23.0322685863395, 61.8341850164805], [23.0363887108588, 61.8518242995788], [23.0395646401758, 61.8657726377953], [23.0337277971068, 61.8609658258561], [23.026174235488, 61.8502792528841], [23.016989791247, 61.8399789415858], [22.9999942776048, 61.8359875709577], [22.9832562717451, 61.8311807590185], [23.0020543398645, 61.8229405099799], [23.0302943600073, 61.8138419016664], [23.0508949826039, 61.7986489425014], [23.0455731550998, 61.7907091192089], [23.0306377037173, 61.7824688701703], [23.0153589086248, 61.7627695248123], [23.0157880882622, 61.7515250183117], [23.0386204449734, 61.7530700650064], [23.0577618568028, 61.7715677073796], [23.0854868613807, 61.7867606665446], [23.1028257187328, 61.7779624839773], [23.113984389306, 61.7639283098334], [23.1364734023073, 61.7600227751328], [23.1564731734115, 61.7545292757737], [23.1735545229811, 61.7442289644754], [23.1780179912104, 61.7323836064823], [23.1865157480315, 61.7208386742355], [23.1993911371544, 61.7122979994506], [23.1829964750046, 61.7101521012635], [23.1653142739425, 61.7049590276506], [23.1728678355613, 61.6955599935909], [23.1826531312946, 61.6910536073979], [23.2133823933346, 61.6840150613441], [23.2456567020692, 61.6898089864494], [23.243682475737, 61.7077486952939], [23.2312362662516, 61.7192936275408], [23.2309787584691, 61.7305381340414] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 134,
+         "id" : 73834,
+         "name" : "Kyrsjrvi",
+         "pfafstette" : 4173,
+         "lke_type" : "N",
+         "altitude" : 83,
+         "objectid" : 37074,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 135,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [12.8239734023073, 62.4307876304706], [12.8454323841787, 62.425036623329], [12.8675780534701, 62.4167105383629], [12.8884361838491, 62.4089423869255], [12.9072342519685, 62.404350164805], [12.9257748123055, 62.4092428126717], [12.9094659860831, 62.4187276826588], [12.8759899743637, 62.4299292711957], [12.8537584691449, 62.4411737776964], [12.846719923091, 62.4487273393151], [12.8618270463285, 62.45692467039], [12.8916121131661, 62.4679116691082], [12.9184787584692, 62.4746068714521], [12.9269765152903, 62.4803578785937], [12.9045733382165, 62.4885122917048], [12.8807109503754, 62.4840059055118], [12.8627712415309, 62.4779115546603], [12.8403680644571, 62.4752077229445], [12.8236300585973, 62.4615598104743], [12.7988234755539, 62.4559804751877], [12.774446072148, 62.4706584187878], [12.765261627907, 62.4788986678264], [12.7446610053104, 62.4846067570042], [12.7157342977477, 62.4943920527376], [12.7111849935909, 62.5098854376488], [12.7038889397546, 62.5159368705365], [12.692644433254, 62.5074391137154], [12.7062923457242, 62.4879972761399], [12.7414850759934, 62.4706584187878], [12.7552188243911, 62.4618173182567], [12.7331589910273, 62.4511736632485], [12.7193394067021, 62.4390278795092], [12.7311847646951, 62.4332339544039], [12.7446610053104, 62.4301867789782], [12.7534162699139, 62.4323755951291], [12.7838021882439, 62.4375257507782], [12.8239734023073, 62.4307876304706] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 135,
+         "id" : 71948,
+         "name" : "Lossnen",
+         "pfafstette" : 97733,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 37519,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 136,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [8.7253937007874, 62.2913471662699], [8.7104582494049, 62.3019479033144], [8.7139775224318, 62.3125486403589], [8.7194710217909, 62.3228918696209], [8.7090848745651, 62.3395869575169], [8.6911451657206, 62.3505739562351], [8.6684844808643, 62.3633635094305], [8.6438495696759, 62.3782560428493], [8.6289141182934, 62.3885563541476], [8.6140645028383, 62.4001442043582], [8.5954381065739, 62.4052943600073], [8.5690864768357, 62.4101440899103], [8.5449665812122, 62.4104874336202], [8.5730349295001, 62.3934490020143], [8.6181846273576, 62.3700157938106], [8.6411028199963, 62.3544794909357], [8.6658235671123, 62.342419543124], [8.6833340963194, 62.3132353277788], [8.7075398278704, 62.2824631477751], [8.7319172312763, 62.26795687603], [8.7705433986449, 62.2560686000732], [8.8070236678264, 62.2545235533785], [8.794405786486, 62.2621629509247], [8.773204312397, 62.2688152353049], [8.7556079472624, 62.2757679454312], [8.7411016755173, 62.2837077687237], [8.7253937007874, 62.2913471662699] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 136,
+         "id" : 74206,
+         "name" : "Aursjen",
+         "lge_id" : "no",
+         "pfafstette" : 51,
+         "lke_type" : "B",
+         "altitude" : 1018,
+         "objectid" : 38287,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 137,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [27.1432944973448, 62.0195906198498], [27.1238097418055, 62.0125949917597], [27.1093034700604, 62.009547816334], [27.102522431789, 62.0189897683574], [27.0839818714521, 62.0296763413294], [27.0564285387292, 62.0417362891412], [27.0400338765794, 62.0493756866874], [27.0287035341513, 62.0463285112617], [27.018059879143, 62.0469293627541], [27.0041544588903, 62.0682595907343], [26.9943691631569, 62.0719076176524], [27.0072445522798, 62.0454272340231], [27.0190899102728, 62.0225948773118], [27.0260426203992, 62.0137966947445], [27.0493041567478, 62.007702343893], [27.0600336476836, 61.9949986266252], [27.0517933986449, 61.9807069446988], [27.0251842611243, 61.9766726561069], [26.9980601080388, 61.9721662699139], [26.9941116553745, 61.9515656473173], [27.0046694744552, 61.9426816288225], [27.0172015198682, 61.9433253982787], [27.0324803149606, 61.9405786485991], [27.0425231184765, 61.9374885552097], [27.0327378227431, 61.9360293444424], [27.0238967222121, 61.9293341420985], [27.042093938839, 61.9195488463651], [27.0627803973631, 61.9244414942318], [27.0588319446988, 61.9332396767991], [27.0541968046145, 61.9393340276506], [27.0678447170848, 61.9374885552097], [27.0822651529024, 61.9405786485991], [27.0882736678264, 61.9456858862846], [27.0996040102545, 61.9445271012635], [27.1162561801868, 61.9429820545688], [27.1440670206922, 61.9368447857535], [27.1785730635415, 61.9225960217909], [27.1975428035158, 61.9213943188061], [27.1806331258011, 61.9390336019044], [27.1594316517121, 61.9572737364951], [27.1606333546969, 61.9786039644754], [27.1680152444607, 61.9998054385643], [27.184324070683, 62.0098482420802], [27.1979719831533, 62.0274875251785], [27.1901609137521, 62.0429809100897], [27.1758263138619, 62.0366290514558], [27.1657835103461, 62.0326805987914], [27.163122596594, 62.0417362891412], [27.1582299487273, 62.0558133812488], [27.1382301776231, 62.0636673686138], [27.1198612891412, 62.0700621452115], [27.1130802508698, 62.0876585103461], [27.0972006042849, 62.1001047198315], [27.0801192547153, 62.0961991851309], [27.0898187145212, 62.0782594762864], [27.1172003753891, 62.0588605566746], [27.1432944973448, 62.0417362891412], [27.1555690349753, 62.0250412012452], [27.1432944973448, 62.0195906198498] ],
+            [ [27.11170687603, 62.004698086431], [27.1162561801868, 61.9955994781175], [27.1084451107856, 61.9867583775865], [27.1038099707013, 61.9958569859], [27.11170687603, 62.004698086431] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 137,
+         "id" : 61213,
+         "name" : "Kyyvesi",
+         "pfafstette" : 0,
+         "lke_type" : "N",
+         "altitude" : 101,
+         "objectid" : 38563,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 138,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [29.4025819446988, 60.7921368568028], [29.4213800128182, 60.7826519868156], [29.4370021516206, 60.7853987364952], [29.4218950283831, 60.8143254440579], [29.3991485075994, 60.8219219236404], [29.3757152993957, 60.8306771882439], [29.3638699414027, 60.8431663156931], [29.3569172312763, 60.8553550173961], [29.3441276780809, 60.8687025041201], [29.3220678447171, 60.8823933345541], [29.2976046053836, 60.8881872596594], [29.2688495696759, 60.8878439159495], [29.2335710034792, 60.8945391182934], [29.2206956143564, 60.9067278199963], [29.2061035066838, 60.905783624794], [29.1919405786486, 60.9162556079473], [29.1843011811024, 60.9259550677532], [29.1747733931514, 60.9217491073064], [29.1788076817433, 60.9150539049625], [29.1582070591467, 60.9180152444607], [29.1425849203443, 60.9278005401941], [29.132112937191, 60.9411480269181], [29.1133148690716, 60.9532079747299], [29.1196667277056, 60.9399463239333], [29.1188942043582, 60.9259550677532], [29.1296236952939, 60.9088308002197], [29.1486792711958, 60.8933374153086], [29.1703099249222, 60.876899835195], [29.1952881798206, 60.8712775819447], [29.2119403497528, 60.8662990981505], [29.2158029664897, 60.8507627952756], [29.2270474729903, 60.8519215802966], [29.2498798297015, 60.8549687557224], [29.2684203900385, 60.8538099707013], [29.2836991851309, 60.8535095449551], [29.2933128090094, 60.8394753708112], [29.2778623420619, 60.8343681331258], [29.2635277421718, 60.8286171259843], [29.2666178355613, 60.8145829518403], [29.2817249587988, 60.807630241714], [29.2929694652994, 60.8088319446988], [29.3076474088995, 60.8124370536532], [29.3188919154001, 60.8200764511994], [29.3279905237136, 60.8274154229995], [29.3423251236037, 60.8240249038638], [29.3408659128365, 60.8139821003479], [29.3574322468412, 60.8067289644754], [29.3788912287127, 60.7988749771104], [29.4025819446988, 60.7921368568028] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 138,
+         "id" : 78258,
+         "pfafstette" : 533131,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 39146,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_39146",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 139,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [21.8580330983336, 61.7271905328694], [21.8666166910822, 61.7320831807361], [21.8959725782824, 61.73109606757], [21.9236975828603, 61.7262463376671], [21.9413797839224, 61.7232849981688], [21.9479891503388, 61.7275338765794], [21.9182040835012, 61.7344865867057], [21.892367469328, 61.7423834920344], [21.877002838308, 61.7472761399011], [21.8620673869255, 61.7532846548251], [21.8427543032412, 61.758477728438], [21.8070465574071, 61.7724689846182], [21.780008240249, 61.7818680186779], [21.7656736403589, 61.779507530672], [21.7474764237319, 61.787361518037], [21.7360602453763, 61.7859023072697], [21.7489356344992, 61.7630699505585], [21.7872184581578, 61.7351303561619], [21.8194927668925, 61.7214395257279], [21.8376899835195, 61.7138001281817], [21.8488486540926, 61.7183923503021], [21.8580330983336, 61.7271905328694] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 139,
+         "id" : 77486,
+         "name" : "Isojrvi Sotamiehenluoto",
+         "pfafstette" : 53,
+         "lke_type" : "N",
+         "altitude" : 35,
+         "objectid" : 39427,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 140,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [15.8332951840322, 62.0460280855155], [15.8272008331807, 62.0390753753891], [15.8414495971434, 62.0326805987914], [15.855698361106, 62.0320368293353], [15.8797324208021, 62.0286892281633], [15.9028222852957, 62.0308780443142], [15.8865134590734, 62.0405345861564], [15.8508057132393, 62.0636673686138], [15.8120078740158, 62.0892464750046], [15.7840253616554, 62.1043965162058], [15.7424807727523, 62.1226366507965], [15.7023095586889, 62.1286880836843], [15.7205067753159, 62.1190315418421], [15.7648839498261, 62.1004909815052], [15.7883171580297, 62.0870576588537], [15.795269868156, 62.0782594762864], [15.8165571781725, 62.0645686458524], [15.837501144479, 62.0529807956418], [15.8332951840322, 62.0460280855155] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 140,
+         "id" : 76741,
+         "name" : "Hennan",
+         "pfafstette" : 4713,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 39672,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 141,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [24.1516549166819, 61.5582225096136], [24.126762497711, 61.5411411600439], [24.1115695385461, 61.5369351995971], [24.0962907434536, 61.533287172679], [24.0820419794909, 61.5317421259842], [24.0681365592382, 61.5241885643655], [24.0805827687237, 61.5047038088262], [24.0907972440945, 61.4913563221022], [24.0810977842886, 61.4886095724226], [24.0750034334371, 61.4834164988097], [24.0953465482512, 61.4715711408167], [24.1218698498444, 61.4749187419887], [24.1308826222304, 61.490712552646], [24.126934169566, 61.5016566334005], [24.124273255814, 61.5126007141549], [24.1385220197766, 61.5244031541842], [24.142127128731, 61.5344888756638], [24.1384361838491, 61.5454329564182], [24.1561183849112, 61.5551753341879], [24.1944870444973, 61.5615271928218], [24.2230704083501, 61.5670206921809], [24.2544005218824, 61.5703682933529], [24.2817821827504, 61.5776643471892], [24.2712243636697, 61.5867200375389], [24.2610098882988, 61.5934581578465], [24.2500228895807, 61.5989516572056], [24.2260746658121, 61.5865054477202], [24.1944870444973, 61.5719133400476], [24.1516549166819, 61.5582225096136] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 141,
+         "id" : 76859,
+         "name" : "Vesijrvi",
+         "pfafstette" : 642411,
+         "lke_type" : "N",
+         "altitude" : 87,
+         "objectid" : 39860,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 142,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.0947743087347, 62.1064994964292], [14.0904825123604, 62.0968000366233], [14.0949459805896, 62.0888602133309], [14.1053321278154, 62.0801049487273], [14.0962335195019, 62.075813152353], [14.0867915674785, 62.0697188015015], [14.0771779436001, 62.0603197674418], [14.0637017029848, 62.0509207333821], [14.0649892418971, 62.0390753753891], [14.0798388573521, 62.038088262223], [14.089881660868, 62.0478735579564], [14.1011261673686, 62.0597189159494], [14.1260185863395, 62.062465665629], [14.1737433620216, 62.0426804843435], [14.2055884911189, 62.0171013779527], [14.1845586888848, 62.0080027696392], [14.1643014099982, 62.0052560199597], [14.180696072148, 62.0007496337667], [14.2059318348288, 62.0037968091924], [14.2275624885552, 62.0086036211316], [14.2527124153086, 62.0119512223036], [14.270995467863, 62.0137966947445], [14.2782915216993, 62.018388916865], [14.2667036714888, 62.0241828419703], [14.2530557590185, 62.0284317203809], [14.2576050631753, 62.0341827275224], [14.2597509613624, 62.0441826130745], [14.2600084691449, 62.0590751464933], [14.2396653543307, 62.0746972852957], [14.2016400384545, 62.0937528611976], [14.1879921259843, 62.1067999221754], [14.1830994781176, 62.1113921442959], [14.1677348470976, 62.115383514924], [14.156146996887, 62.1155981047427], [14.1606963010438, 62.108044543124], [14.1682498626625, 62.0998472120491], [14.165503112983, 62.0861992995788], [14.1689365500824, 62.0761135780992], [14.1904813678814, 62.0727659769273], [14.2163179820546, 62.0670149697857], [14.2308242537997, 62.0554271195752], [14.2296225508149, 62.0451268082769], [14.2147729353598, 62.0411354376488], [14.1914255630837, 62.051779092657], [14.1703957608497, 62.0654270051272], [14.1601812854789, 62.0742681056583], [14.1461041933712, 62.0849546786303], [14.1312545779161, 62.09435371269], [14.1053321278154, 62.1140959760117], [14.0782938106574, 62.1265851034609], [14.0837873100165, 62.1180444286761], [14.0947743087347, 62.1064994964292] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 142,
+         "id" : 78695,
+         "pfafstette" : 775,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 40469,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_40469",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 143,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [13.2758995605201, 62.1201903268632], [13.2591615546603, 62.126241759751], [13.2560714612708, 62.133237387841], [13.2363291979491, 62.1347824345358], [13.2230246291888, 62.126241759751], [13.2607924372826, 62.1141388939755], [13.3169291338583, 62.1049973676982], [13.3439674510163, 62.0992034425929], [13.3819927668925, 62.0879589360923], [13.4129795367149, 62.0721651254349], [13.4352110419337, 62.0560279710675], [13.4701462644204, 62.0448263825307], [13.4849958798755, 62.0515215848746], [13.4758114356345, 62.0652124153085], [13.4540949459806, 62.0727659769273], [13.4291166910822, 62.0809203900384], [13.3995891320271, 62.0927657480315], [13.3652547610328, 62.1004051455777], [13.3413065372643, 62.1064994964292], [13.315469923091, 62.1143964017579], [13.2758995605201, 62.1201903268632] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 143,
+         "id" : 78878,
+         "name" : "Lofssjn",
+         "pfafstette" : 9251,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 40484,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 144,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [12.4714452481231, 62.3067547152536], [12.4628616553745, 62.3186859091741], [12.4546214063358, 62.3232352133309], [12.4399434627358, 62.331732970152], [12.4026048342794, 62.3463250778246], [12.3777124153086, 62.3484709760117], [12.3581418238418, 62.3454667185497], [12.3199448361106, 62.3472263550632], [12.2814045046695, 62.3493722532503], [12.2548812030764, 62.3533207059147], [12.2467267899652, 62.3444796053836], [12.2759110053104, 62.3353809970701], [12.3032068302509, 62.3299733336385], [12.3164255630837, 62.3262823887566], [12.3644078465483, 62.3232352133309], [12.4035490294818, 62.3201880379051], [12.4196861838491, 62.3168404367332], [12.4294714795825, 62.3067547152536], [12.4392567753159, 62.29834279436], [12.4558231093207, 62.2913471662699], [12.4826897546237, 62.2779567615821], [12.5032903772203, 62.2739224729903], [12.487153222853, 62.2894158579015], [12.4714452481231, 62.3067547152536] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 144,
+         "id" : 74983,
+         "name" : "Rogen",
+         "pfafstette" : 99715,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 40725,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 145,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [26.5123145943966, 61.3877094396631], [26.5075936183849, 61.4022157114082], [26.4991816974913, 61.4169794909357], [26.4831303790515, 61.4165503112983], [26.4688816150888, 61.4183957837392], [26.4442467039004, 61.421442959165], [26.4287104010255, 61.4159494598059], [26.437293993774, 61.4080954724409], [26.4613280534701, 61.4004560748947], [26.4692249587988, 61.3916149743637], [26.4338605566746, 61.3831172175426], [26.3956635689434, 61.3819155145578], [26.3850199139352, 61.3797696163706], [26.4125732466581, 61.378868339132], [26.4521436092291, 61.3812717451016], [26.4767785204175, 61.3840184947812], [26.4919714795825, 61.383718069035], [26.4897397454679, 61.3709714338033], [26.4772935359824, 61.3636324620033], [26.4664782091192, 61.3573235213331], [26.474031770738, 61.3456927531588], [26.4962632759568, 61.3350920161143], [26.5184089452481, 61.3284397317341], [26.528451748764, 61.3362937190991], [26.5348036073979, 61.3536325764512], [26.5360053103827, 61.3703705823109], [26.5256191631569, 61.3709714338033], [26.5168638985534, 61.3688255356162], [26.5148038362937, 61.3773232924373], [26.5123145943966, 61.3877094396631] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 145,
+         "id" : 75570,
+         "name" : "Enonvesi",
+         "pfafstette" : 2239,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 41001,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 146,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [11.6603815693097, 61.8983044543124], [11.6638150064091, 61.9086476835744], [11.6586648507599, 61.9177462918879], [11.6336865958616, 61.9323813175243], [11.5969488188977, 61.9523810886284], [11.579867469328, 61.9703637154367], [11.5776357352133, 61.9880029985351], [11.5637303149606, 61.9952561344076], [11.5467348013185, 61.9937969236403], [11.5412413019594, 61.9801060932064], [11.5480223402307, 61.960964681377], [11.5671637520601, 61.9454283785021], [11.5865626716719, 61.9381323246658], [11.592056171031, 61.9326388253067], [11.6035581853141, 61.9199351080388], [11.6267338857352, 61.9098493865592], [11.6473345083318, 61.9019953991943], [11.6603815693097, 61.8983044543124] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 146,
+         "id" : 81742,
+         "name" : "Slensjen",
+         "lge_id" : "no",
+         "pfafstette" : 97811,
+         "lke_type" : "B",
+         "altitude" : 0,
+         "objectid" : 41194,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 147,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [26.3907709210767, 60.9694738829885], [26.3923159677715, 60.9667271333089], [26.4101698406885, 60.9591306537264], [26.4263069950558, 60.9627786806446], [26.4384956967588, 60.9809758972716], [26.4299121040103, 60.9940658762131], [26.428452893243, 61.0059112342062], [26.4607272019777, 61.0113618156015], [26.4783235671123, 61.001104422267], [26.4905122688152, 60.9913191265336], [26.509911188427, 60.9958684306904], [26.5244174601721, 60.9983147546237], [26.5397820911921, 60.9965122001465], [26.5561767533419, 60.9934650247207], [26.5688804706098, 60.9962117744003], [26.5649320179454, 61.010117194653], [26.5427005127266, 61.031146996887], [26.5175505859733, 61.0469408075444], [26.5053618842703, 61.0439365500824], [26.4880230269181, 61.0453957608497], [26.4725725599707, 61.0447949093573], [26.4631306079473, 61.0353958752976], [26.4408991027284, 61.0293015244461], [26.4168650430324, 61.0329495513642], [26.4060497161692, 61.0335933208204], [26.407251419154, 61.0229496658121], [26.3974661234206, 61.0117051593115], [26.398066974913, 60.9999027192822], [26.4060497161692, 60.9822634361839], [26.3907709210767, 60.9694738829885] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 147,
+         "id" : 81926,
+         "name" : "Pelinginselka",
+         "pfafstette" : 19,
+         "lke_type" : "N",
+         "altitude" : 65,
+         "objectid" : 41268,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 148,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [24.6051261215895, 61.2253937007874], [24.6051261215895, 61.2478827137887], [24.5920790606116, 61.244492194653], [24.5698475553928, 61.2393849569676], [24.5519078465482, 61.2412304294085], [24.5300196850394, 61.2414450192272], [24.5132816791796, 61.2383978438015], [24.5227236312031, 61.2259516343161], [24.5327664347189, 61.2150933894891], [24.5445259567845, 61.2053080937557], [24.5780019685039, 61.2056514374657], [24.6051261215895, 61.2253937007874] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 148,
+         "id" : 81859,
+         "name" : "Iso Roinevesi",
+         "pfafstette" : 6459,
+         "lke_type" : "N",
+         "altitude" : 84,
+         "objectid" : 41419,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 149,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [16.5922564548618, 61.8156873741073], [16.6253891228713, 61.8022540514558], [16.6833283739242, 61.7937562946347], [16.7319115088812, 61.7907091192089], [16.772511902582, 61.7806663156931], [16.7986060245376, 61.774014031313], [16.8012669382897, 61.781009659403], [16.7861598150522, 61.7986060245376], [16.7773187145212, 61.811395577733], [16.7739711133492, 61.8181336980407], [16.7697651529024, 61.82959279436], [16.7532846548251, 61.83693176616], [16.723928767625, 61.8405797930782], [16.6994655282915, 61.8466741439297], [16.6520840963194, 61.8563306857718], [16.6156038271379, 61.8542706235122], [16.6435863394983, 61.8375326176524], [16.6748306171031, 61.8238417872185], [16.6806674601721, 61.8156873741073], [16.6372344808643, 61.8168890770921], [16.5922564548618, 61.8156873741073] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 149,
+         "id" : 81646,
+         "pfafstette" : 171,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 41468,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_41468",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 150,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [6.9004360465116, 61.9450850347921], [6.8522820911921, 61.9390336019044], [6.8630115821278, 61.9362868522249], [6.8845563999268, 61.9387331761582], [6.9069595770006, 61.9405786485991], [6.9438690258195, 61.9438404138436], [6.982666865043, 61.9460721479582], [7.0107352133309, 61.9408790743453], [7.0307349844351, 61.9287332906061], [7.0711637062809, 61.9116948590002], [7.1054980772752, 61.9104502380516], [7.1091031862296, 61.9222955960447], [7.0982878593664, 61.9268878181652], [7.0639534883721, 61.9396344533968], [7.01588536898, 61.9566728850027], [6.9726240615272, 61.9603209119209], [6.9477316425563, 61.9539261353232], [6.9004360465116, 61.9450850347921] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 150,
+         "id" : 81864,
+         "name" : "Strynevatnet",
+         "lge_id" : "no",
+         "pfafstette" : 131,
+         "lke_type" : "B",
+         "altitude" : 0,
+         "objectid" : 41472,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 151,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [24.880144433254, 61.2126470655558], [24.8823761673686, 61.2050076680095], [24.8760243087347, 61.1980120399194], [24.8874404870903, 61.1883125801135], [24.9136204449734, 61.1831195065006], [24.9319034975279, 61.1876688106574], [24.9296717634133, 61.1996000045779], [24.9348219190624, 61.2102007416224], [24.9487273393151, 61.2214452481231], [24.943577183666, 61.2305438564366], [24.9284700604285, 61.2424321323933], [24.9081269456144, 61.2521315921992], [24.8821186595862, 61.259341810108], [24.8561962094854, 61.2776677806263], [24.8342222120491, 61.2858221937374], [24.8295870719648, 61.271873855521], [24.8440075077825, 61.2514878227431], [24.8642647866691, 61.2317455594213], [24.880144433254, 61.2126470655558] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 151,
+         "id" : 80941,
+         "name" : "Kuohijrvi",
+         "pfafstette" : 64793,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 41545,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 152,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [6.208598470976, 61.9144416086797], [6.2334908899469, 61.9116948590002], [6.2820740249039, 61.9199351080388], [6.3675666086797, 61.9368877037173], [6.4295401483245, 61.9487330617103], [6.4532308643106, 61.9484755539278], [6.4746040102545, 61.947273850943], [6.4661062534334, 61.9542265610694], [6.45666430141, 61.9621663843618], [6.4687671671855, 61.96547106757], [6.4940029298663, 61.9691190944882], [6.5109984435085, 61.9770589177806], [6.4982947262406, 61.9803636009888], [6.4646470426662, 61.9846124793994], [6.4426730452298, 61.9852562488555], [6.4189823292437, 61.9782606207654], [6.3879097234939, 61.9727671214063], [6.3691116553745, 61.9624238921443], [6.3293696209486, 61.9533252838308], [6.2797564548618, 61.9468875892694], [6.2516881065739, 61.9362868522249], [6.2290274217176, 61.9274886696576], [6.2031049716169, 61.9277890954038], [6.1733199047794, 61.9296345678447], [6.1396722212049, 61.9250423457242], [6.1225908716352, 61.9180896355979], [6.1506592199231, 61.9147420344259], [6.1788134041384, 61.9147420344259], [6.1912596136239, 61.915900819447], [6.208598470976, 61.9144416086797] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 152,
+         "id" : 81344,
+         "name" : "Hornindalsvatnet",
+         "lge_id" : "no",
+         "pfafstette" : 153,
+         "lke_type" : "B",
+         "altitude" : 0,
+         "objectid" : 41820,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 153,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [16.5994666727706, 61.8688627311848], [16.6164621864128, 61.8679185359824], [16.6360327778795, 61.869163156931], [16.6367194652994, 61.875], [16.6372344808643, 61.879506386193], [16.6402387383263, 61.8861586705731], [16.6539724867241, 61.8828110694012], [16.6749164530306, 61.8773175700421], [16.6836717176341, 61.875], [16.6956029115547, 61.871824070683], [16.7204953305256, 61.8642705090643], [16.7433276872368, 61.85997871269], [16.7822113623879, 61.8512234480864], [16.8122539370079, 61.8545710492584], [16.8042711957517, 61.875], [16.8032411646219, 61.8776179957883], [16.7855589635598, 61.89736025911], [16.7645291613258, 61.9107935817616], [16.7404951016298, 61.9223814319721], [16.6913969511079, 61.9287332906061], [16.6508823933346, 61.9314800402856], [16.6256466306537, 61.9326817432704], [16.5876213147775, 61.9199351080388], [16.5605829976195, 61.9007507782457], [16.5468492492218, 61.8904075489837], [16.5388665079656, 61.8824677256912], [16.563329747299, 61.8773175700421], [16.5764626442044, 61.875], [16.5889088536898, 61.8728111838491], [16.5994666727706, 61.8688627311848] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 153,
+         "id" : 80508,
+         "name" : "Norra Dellen",
+         "pfafstette" : 33,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 41832,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 154,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [24.4975737044497, 61.1645360282], [24.5114791247024, 61.1582270875298], [24.520234389306, 61.147840940304], [24.5418650430324, 61.1363389260209], [24.5588605566746, 61.1384419062443], [24.5543112525179, 61.1494289049625], [24.5485602453763, 61.1682269730819], [24.5346548251236, 61.1876688106574], [24.5178309833364, 61.1986128914118], [24.5076165079656, 61.2053080937557], [24.4914793535982, 61.1992137429042], [24.471651254349, 61.1931623100165], [24.4604925837759, 61.1849220609778], [24.468990340597, 61.1764672221205], [24.4802348470976, 61.1721754257462], [24.4975737044497, 61.1645360282] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 154,
+         "id" : 82594,
+         "name" : "Hauhonselka",
+         "pfafstette" : 6457,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 42519,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 155,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [22.5034334370994, 61.6074494140267], [22.5, 61.6040159769273], [22.4887554934994, 61.5928573063541], [22.4316746017213, 61.5937585835928], [22.3935634499176, 61.5892521973997], [22.4264386101447, 61.5755613669658], [22.4626613715437, 61.5727716993225], [22.4836911737777, 61.5727716993225], [22.5, 61.5722566837576], [22.5109869987182, 61.5719133400476], [22.5260941219557, 61.5786085423915], [22.5297850668376, 61.5810119483611], [22.5453213697125, 61.578866050174], [22.5673812030764, 61.5888659357261], [22.5717588353781, 61.6071060703168], [22.5468664164073, 61.6137583546969], [22.5161371543673, 61.6156038271379], [22.5034334370994, 61.6074494140267] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 155,
+         "line::hidden" : [
+            { "contour" : 0, "segments" : [ { "from" : 8, "to" : 9 } ] }
+         ],
+         "id" : 79245,
+         "name" : "Karhijrvi",
+         "pfafstette" : 637,
+         "lke_type" : "N",
+         "altitude" : 52,
+         "objectid" : 42682,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 156,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [24.4555999359092, 61.3971084737228], [24.4287332906061, 61.4032028245743], [24.4184329793078, 61.3977093252152], [24.4119094488189, 61.394061298297], [24.4018666453031, 61.3903703534151], [24.3764592107673, 61.3892115683941], [24.3562019318806, 61.4032028245743], [24.34495742538, 61.418095357993], [24.3248718183483, 61.4159494598059], [24.3102797106757, 61.409254257462], [24.3027261490569, 61.4034603323567], [24.2966317982055, 61.4004560748947], [24.2847006042849, 61.3846622642373], [24.2856447994873, 61.3660787859366], [24.2893357443692, 61.3593835835927], [24.3047003753891, 61.353332150705], [24.3229834279436, 61.3560789003845], [24.3518242995788, 61.3566797518769], [24.3935405603369, 61.3576239470793], [24.4101927302692, 61.3652204266618], [24.40504257462, 61.3706710080571], [24.3972315052188, 61.3761215894525], [24.4198921900751, 61.380370467863], [24.4513081395349, 61.37586408167], [24.4865867057316, 61.3673234068852], [24.5139683665995, 61.3706280900934], [24.5021230086065, 61.3800700421168], [24.490020142831, 61.3867652444607], [24.4802348470976, 61.3904561893426], [24.4555999359092, 61.3971084737228] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 156,
+         "id" : 79760,
+         "pfafstette" : 64411,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 42744,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_42744",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 157,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [15.9296889305988, 61.9909643380333], [15.9435943508515, 61.9889042757737], [15.9545813495697, 61.9962432475737], [15.9652250045779, 61.9922089589819], [15.9819630104377, 61.9803636009888], [16.0068554294085, 61.9758572147958], [16.0239367789782, 61.984998741073], [16.0120055850577, 61.997702458341], [15.9968126258927, 62.007702343893], [15.9807613074529, 62.0180884911188], [15.9518345998901, 62.0274875251785], [15.9368991485076, 62.03358187603], [15.9317489928585, 62.0201485533785], [15.9187019318806, 62.0080027696392], [15.8995605200513, 62.0128954175059], [15.8828225141916, 62.0143975462369], [15.8603335011903, 62.0125949917597], [15.8497756821095, 62.0068439846182], [15.8658270005494, 61.9962432475737], [15.8871143105658, 61.997702458341], [15.9055690349753, 62.0043976606849], [15.9180152444607, 62.0007496337667], [15.9296889305988, 61.9909643380333] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 157,
+         "id" : 79271,
+         "name" : "Storsjn",
+         "pfafstette" : 435,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 42751,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 158,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [24.7032365867057, 61.3117017258744], [24.7269273026918, 61.2986546648965], [24.7334508331807, 61.3022597738509], [24.7331933253983, 61.3177531587621], [24.7456395348837, 61.3320877586523], [24.7648667826405, 61.3268946850394], [24.7810039370079, 61.3226458066288], [24.7914759201611, 61.3427314136605], [24.7850382255997, 61.3554780488921], [24.7685577275224, 61.3536325764512], [24.7646951107856, 61.3615723997436], [24.7583432521516, 61.3700701565647], [24.743922816334, 61.3618299075261], [24.7277856619667, 61.3496841237869], [24.7124210309467, 61.3548771973997], [24.7011765244461, 61.3536325764512], [24.671648965391, 61.3545767716535], [24.6372287584691, 61.360671122505], [24.6218641274492, 61.3557784746383], [24.617228987365, 61.3438901986816], [24.6276151345907, 61.3359932933529], [24.6428080937557, 61.3317873329061], [24.6557693188061, 61.33080021974], [24.6765416132576, 61.3301993682476], [24.7032365867057, 61.3117017258744] ],
+            [ [24.6364562351218, 61.3448343938839], [24.6364562351218, 61.3402850897272], [24.6288168375755, 61.3442335423915], [24.6364562351218, 61.3448343938839] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 158,
+         "id" : 79686,
+         "name" : "Kukkiajrvi",
+         "pfafstette" : 647573,
+         "lke_type" : "N",
+         "altitude" : 87,
+         "objectid" : 43006,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 159,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [6.1654229994507, 61.5211413889398], [6.1405305804798, 61.508909769273], [6.1533201336752, 61.5050042345724], [6.1660238509431, 61.5080514099982], [6.1897145669291, 61.5141457608497], [6.2310874839773, 61.5223430919245], [6.2602716993225, 61.5220426661784], [6.2985545229811, 61.5220426661784], [6.3583821644388, 61.5393815235305], [6.414089681377, 61.5551753341879], [6.4426730452298, 61.5581795916499], [6.468509659403, 61.5523856665446], [6.5070499908442, 61.5444887612159], [6.5491095953122, 61.5374931331258], [6.5949459805896, 61.5293816379784], [6.5873065830434, 61.5375360510895], [6.5430152444607, 61.5472355108954], [6.5152902398828, 61.5515273072697], [6.4849043215528, 61.5554328419703], [6.4673079564182, 61.5645743682476], [6.4302268357444, 61.5694670161143], [6.3794119666728, 61.5673211179271], [6.3534895165721, 61.5566345449551], [6.3255928401392, 61.5415274217176], [6.2982111792712, 61.5335875984252], [6.2687694561436, 61.5350897271562], [6.2374393426112, 61.5381369025819], [6.2073109320637, 61.5323429774767], [6.1654229994507, 61.5211413889398] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 159,
+         "id" : 84828,
+         "name" : "Jlstravatnet",
+         "lge_id" : "no",
+         "pfafstette" : 553,
+         "lke_type" : "B",
+         "altitude" : 0,
+         "objectid" : 43335,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 160,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [9.6088170664713, 60.3895234389306], [9.5878731001648, 60.395961133492], [9.5823796008057, 60.3919697628639], [9.598860098883, 60.3831715802966], [9.6125938472807, 60.364244758286], [9.6205765885369, 60.3420990889947], [9.6434089452481, 60.3272065555759], [9.6555118110236, 60.3138590688519], [9.6620353415125, 60.3017132851126], [9.6664988097418, 60.2880224546786], [9.6406621955686, 60.2695248123054], [9.611220472441, 60.2534305759018], [9.6069286760667, 60.2390959760117], [9.6091604101813, 60.2099117606665], [9.6167139718, 60.180126693829], [9.6346536806446, 60.1682384178722], [9.6650395989746, 60.1652341604102], [9.6884728071782, 60.163088262223], [9.7119060153818, 60.1575947628639], [9.7416910822194, 60.1567364035891], [9.7543947994873, 60.1455348150522], [9.7695019227248, 60.1339040468779], [9.7719911646219, 60.1457494048709], [9.7522489013001, 60.1591827275224], [9.738085973265, 60.167594648416], [9.72254967039, 60.1724872962827], [9.6899320179454, 60.1755344717085], [9.6586877403406, 60.1773799441494], [9.635254532137, 60.183130951291], [9.6267567753159, 60.2044611792712], [9.6273576268083, 60.2275510437649], [9.635254532137, 60.2502975645486], [9.6664988097418, 60.2688810428493], [9.6909620490753, 60.2779796511628], [9.6936229628273, 60.2877220289324], [9.6852968778612, 60.2952755905512], [9.6762841054752, 60.3132582173595], [9.6607478026003, 60.3348459531221], [9.644267304523, 60.3466913111152], [9.6423789141183, 60.361583844534], [9.641091375206, 60.3746309055118], [9.6303618842703, 60.3807252563633], [9.6088170664713, 60.3895234389306] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 160,
+         "id" : 90716,
+         "name" : "Krderen",
+         "lge_id" : "no",
+         "pfafstette" : 411151,
+         "lke_type" : "B",
+         "altitude" : 518,
+         "objectid" : 43642,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 161,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [11.6534288591833, 60.3530431697491], [11.6664759201612, 60.3454466901666], [11.68870742538, 60.3378931285479], [11.6971193462736, 60.3269061298297], [11.7057029390222, 60.3135586431057], [11.7209817341146, 60.3095672724776], [11.7260460538363, 60.3266057040835], [11.7172907892328, 60.3466913111152], [11.7135998443509, 60.3627855475188], [11.7114539461637, 60.37793558872], [11.6901666361472, 60.3840299395715], [11.6658750686688, 60.3822273850943], [11.6498237502289, 60.3883217359458], [11.6430427119575, 60.4035576130745], [11.6412401574803, 60.4211539782091], [11.6291372917048, 60.4308963559788], [11.6103392235854, 60.4321409769273], [11.6008114356345, 60.4260466260758], [11.6057040835012, 60.4142012680828], [11.6114550906428, 60.3968624107306], [11.6035581853141, 60.3855749862662], [11.5905969602637, 60.3779785066838], [11.5944595770006, 60.3676781953855], [11.6084508331807, 60.3585366691082], [11.6200386833913, 60.3503393380333], [11.6242446438381, 60.3621846960264], [11.6318840413844, 60.3709828785937], [11.6476778520418, 60.3634293169749], [11.6534288591833, 60.3530431697491] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 161,
+         "id" : 90502,
+         "name" : "Storsjen",
+         "lge_id" : "no",
+         "pfafstette" : 3413,
+         "lke_type" : "R",
+         "altitude" : 252,
+         "objectid" : 43643,
+         "scalerank" : 11,
+         "featurecla" : "Reservoir",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 162,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [11.2030477476653, 61.5338880241714], [11.2401288683391, 61.5032016800952], [11.25, 61.4965923136788], [11.2693130836843, 61.4837169245559], [11.2811584416774, 61.4742320545688], [11.2976389397546, 61.4584811618751], [11.3136902581945, 61.4448332494049], [11.3288832173595, 61.4311424189709], [11.3486254806812, 61.4129022843801], [11.3580674327046, 61.4120010071415], [11.3474237776964, 61.424447216627], [11.3450203717268, 61.4335887429042], [11.3291407251419, 61.4551335607032], [11.3039907983886, 61.4801118156015], [11.2714589818715, 61.5047038088262], [11.25, 61.521098470976], [11.2340345174876, 61.533287172679], [11.2218458157847, 61.5590808688885], [11.2273393151438, 61.5797673274126], [11.2324036348654, 61.5974066105109], [11.2251075810291, 61.6232432246841], [11.2163523164256, 61.6566763184398], [11.2163523164256, 61.6837146355979], [11.2072537081121, 61.6971050402857], [11.1938633034243, 61.689208134957], [11.1913740615272, 61.6703671488738], [11.1880264603553, 61.6591226423732], [11.1875114447903, 61.6439296832082], [11.1968675608863, 61.6198956235122], [11.1997001464933, 61.5959044817799], [11.1956658579015, 61.5639735167552], [11.2030477476653, 61.5338880241714] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 162,
+         "line::hidden" : [
+            { "contour" : 0, "segments" : [ { "from" : 26, "to" : 27 } ] }
+         ],
+         "id" : 84346,
+         "name" : "Storsjen",
+         "lge_id" : "no",
+         "pfafstette" : 6559,
+         "lke_type" : "B",
+         "altitude" : 0,
+         "objectid" : 43764,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 163,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [23.8111437923457, 60.7910209897455], [23.8083970426662, 60.8047118201795], [23.7950924739059, 60.8105057452847], [23.7798136788134, 60.8120078740157], [23.745822651529, 60.8132524949643], [23.7057372733932, 60.8092611243362], [23.703419703351, 60.7953127861198], [23.7277112708295, 60.7822228071782], [23.7468526826589, 60.7761284563267], [23.7598139077092, 60.7713216443875], [23.7766377494964, 60.7773301593115], [23.7971525361655, 60.7840682796191], [23.8111437923457, 60.7910209897455] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 163,
+         "id" : 85488,
+         "name" : "Pyhjrvi",
+         "pfafstette" : 297,
+         "lke_type" : "N",
+         "altitude" : 97,
+         "objectid" : 43980,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 164,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [16.7344865867057, 61.2283979582494], [16.7561172404322, 61.220458134957], [16.766331715803, 61.2080119254715], [16.7818680186779, 61.197754532137], [16.8064170939389, 61.1865100256363], [16.823755951291, 61.1843212094854], [16.8144856711225, 61.197411188427], [16.7888207288043, 61.2135054248306], [16.775516160044, 61.2287842199231], [16.778005401941, 61.2363377815418], [16.787361518037, 61.2463376670939], [16.8004085790148, 61.2551358496612], [16.8071037813587, 61.2597280717817], [16.7775762223036, 61.2612302005127], [16.7463319446988, 61.2554791933712], [16.723928767625, 61.2591701382531], [16.6876201702985, 61.2685691723128], [16.6566334004761, 61.267024125618], [16.6372344808643, 61.2542774903864], [16.6101103277788, 61.2463376670939], [16.5886513459074, 61.2405866599524], [16.6007542116829, 61.2305438564366], [16.6243590917415, 61.2289988097418], [16.6780065464201, 61.2311447079289], [16.7344865867057, 61.2283979582494] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 164,
+         "id" : 85686,
+         "name" : "Bergviken",
+         "pfafstette" : 131,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 43997,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 165,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [6.3063655923824, 61.760323200879], [6.2906576176525, 61.7591214978942], [6.2878250320454, 61.7581773026918], [6.3108290606116, 61.7563747482146], [6.3510861106025, 61.7420830662882], [6.3800128181652, 61.7220403772203], [6.3784677714704, 61.7101950192272], [6.3745193188061, 61.6947016343161], [6.3867080205091, 61.6779636284563], [6.4077378227431, 61.6663757782457], [6.4238749771104, 61.6579209393884], [6.4340894524812, 61.6414833592749], [6.4438747482146, 61.6302388527742], [6.447479857169, 61.6414833592749], [6.4369220380883, 61.6612685405603], [6.4164930873466, 61.6739722578282], [6.4043043856437, 61.6894656427394], [6.4061069401209, 61.7062036485992], [6.4065361197583, 61.7289930873466], [6.3940899102729, 61.7475765656473], [6.3771802325581, 61.7530700650064], [6.3413008148691, 61.760323200879], [6.3063655923824, 61.760323200879] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 165,
+         "id" : 83861,
+         "name" : "Breimsvatnet",
+         "lge_id" : "no",
+         "pfafstette" : 171,
+         "lke_type" : "B",
+         "altitude" : 0,
+         "objectid" : 44405,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 166,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [16.3977522431789, 61.5041029573338], [16.4074517029848, 61.5098968824391], [16.3928595953122, 61.5356476606849], [16.3743190349753, 61.5600250640908], [16.3755207379601, 61.5703253753891], [16.3859068851859, 61.5800677531588], [16.3911428767625, 61.5868058734664], [16.3764649331624, 61.5946598608313], [16.3536325764512, 61.6041447308185], [16.3420447262406, 61.6262904001099], [16.3330319538546, 61.6557750412012], [16.3210149240066, 61.6621268998352], [16.2971525361656, 61.6557750412012], [16.2697708752976, 61.6600239196118], [16.2441917689068, 61.6634144387475], [16.2135483427944, 61.6670195477019], [16.1940635872551, 61.675173960813], [16.1821323933346, 61.6764185817616], [16.1713170664714, 61.6776202847464], [16.1655660593298, 61.6767619254715], [16.1755230269182, 61.6651740752609], [16.2029046877861, 61.6566763184398], [16.2380115821278, 61.6542299945065], [16.2871097326497, 61.6481785616187], [16.3220449551364, 61.6335435359824], [16.3247058688885, 61.6041447308185], [16.3354353598242, 61.577020577733], [16.3530317249588, 61.5627718137704], [16.3703705823109, 61.5515273072697], [16.3773232924373, 61.5298966535433], [16.3804133858268, 61.5071501327596], [16.3977522431789, 61.5041029573338] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 166,
+         "id" : 83672,
+         "name" : "Orsjn",
+         "pfafstette" : 3355,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 44418,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 167,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [13.0506660867973, 60.9007622230361], [13.0455159311482, 60.9144530534701], [13.0365889946896, 60.9168564594397], [13.0241427852042, 60.919302783373], [13.0153875206006, 60.9241525132759], [13.0023404596228, 60.9308477156198], [12.9825123603736, 60.9375858359275], [12.964572651529, 60.94518231551], [12.9382210217909, 60.9572851812855], [12.9141869620949, 60.9554397088445], [12.9260323200879, 60.9429934993591], [12.9415686229628, 60.9299464383813], [12.9580491210401, 60.917800654642], [12.9798514466215, 60.9083157846548], [13.0020829518403, 60.9016635002747], [13.0290354330709, 60.8940670206922], [13.0488635323201, 60.8901614859916], [13.0506660867973, 60.9007622230361] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 167,
+         "id" : 87507,
+         "name" : "Tisjn",
+         "pfafstette" : 95491,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 44759,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 168,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.0740020142831, 60.8624364814137], [14.0937442776048, 60.860376419154], [14.0820705914668, 60.8752689525728], [14.0612982970152, 60.893423251236], [14.0522855246292, 60.902607695477], [14.0297965116279, 60.9214486815602], [13.999067249588, 60.940332585607], [13.9606985900018, 60.949345357993], [13.9350336476836, 60.9448389718], [13.9421580296649, 60.9348390862479], [13.9580376762498, 60.9293455868888], [13.97168558872, 60.9217491073064], [13.9749473539645, 60.9105475187694], [13.978037447354, 60.8977150476103], [13.9855910089727, 60.8840242171763], [13.9922003753891, 60.8703763047061], [14.0038740615272, 60.8743247573704], [14.0176078099249, 60.881577893243], [14.0305690349753, 60.87672816334], [14.0482512360374, 60.8694321095037], [14.0740020142831, 60.8624364814137] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 168,
+         "id" : 87355,
+         "name" : "Venjansjn",
+         "pfafstette" : 631,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 44850,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 169,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [15.3539873649515, 60.9642808093756], [15.3677211133492, 60.9798171122505], [15.3755321827504, 60.9828642876762], [15.3834290880791, 60.9868127403406], [15.4077206555576, 60.9898169978026], [15.4338147775133, 60.9852247756821], [15.4572479857169, 60.9858256271745], [15.4823979124703, 60.9876710996155], [15.4964750045779, 60.988915720564], [15.4589647042666, 60.9987868522249], [15.4036005310383, 61.0132072880425], [15.3715837300861, 61.0111043078191], [15.3552749038638, 60.9958684306904], [15.3371635231643, 60.9813192409815], [15.3028291521699, 60.9733794176891], [15.2839452481231, 60.9664267075627], [15.2908121223219, 60.9621778291522], [15.3077218000366, 60.9539804980773], [15.3326142190075, 60.9484869987182], [15.3539873649515, 60.9642808093756] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 169,
+         "id" : 86959,
+         "name" : "Ljugaren",
+         "pfafstette" : 2643,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 45191,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 170,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.588674235488, 61.0590865912836], [14.5974295000916, 61.0886141503388], [14.6121074436916, 61.1077126442044], [14.6135666544589, 61.1180558734664], [14.5941677348471, 61.1308454266618], [14.5655843709943, 61.1378410547519], [14.5394044131112, 61.1368968595495], [14.5300482970152, 61.1286566105109], [14.5107352133309, 61.1244506500641], [14.4895337392419, 61.1183992171763], [14.4970873008607, 61.1068113669658], [14.5058425654642, 61.0968114814137], [14.5002632301776, 61.0804597372276], [14.4953705823109, 61.0664255630837], [14.5135677989379, 61.0594728529573], [14.5291041018129, 61.0512326039187], [14.5364001556492, 61.0423485854239], [14.5570007782458, 61.0381426249771], [14.5776872367698, 61.0421339956052], [14.588674235488, 61.0590865912836] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 170,
+         "id" : 86669,
+         "name" : "Orsasjn",
+         "pfafstette" : 4195,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 45265,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 171,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [24.1392087071965, 60.3877208844534], [24.1485648232924, 60.3922701886101], [24.157148416041, 60.3965619849844], [24.1662470243545, 60.3898238646768], [24.1638436183849, 60.3715837300861], [24.1538008148691, 60.3609829930416], [24.1491656747848, 60.3527856619667], [24.1528566196667, 60.3417986632485], [24.1643586339498, 60.3487513733748], [24.1728563907709, 60.3646310199597], [24.1799807727522, 60.3746309055118], [24.2118259018495, 60.3755751007142], [24.2410101171947, 60.3701245193188], [24.2576622871269, 60.3637297427211], [24.2773187145212, 60.3558328373924], [24.2913958066288, 60.3542448727339], [24.3011811023622, 60.364244758286], [24.2937992125984, 60.3770772294452], [24.287361518037, 60.3877208844534], [24.2853872917048, 60.3977207700055], [24.2939708844534, 60.40832150705], [24.305215390954, 60.4196089315144], [24.2925975096136, 60.4168621818348], [24.2764603552463, 60.4095661279985], [24.2683059421351, 60.4010683711774], [24.2773187145212, 60.38561790423], [24.28418558872, 60.373429202527], [24.2709668558872, 60.3691374061527], [24.2624690990661, 60.3755751007142], [24.2453877494964, 60.3823132210218], [24.2162893700787, 60.3883217359458], [24.1799807727522, 60.3962615592382], [24.1482214795825, 60.403815120857], [24.126762497711, 60.4095661279985], [24.1123420618934, 60.4093086202161], [24.1220415216993, 60.3952744460721], [24.1392087071965, 60.3877208844534] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 171,
+         "id" : 86867,
+         "name" : "Hiidenvesi syvnne 90",
+         "pfafstette" : 51,
+         "lke_type" : "N",
+         "altitude" : 32,
+         "objectid" : 45414,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 172,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [16.8347429500092, 60.6928676066654], [16.8633263138619, 60.6965585515473], [16.8694206647134, 60.704455456876], [16.8724249221754, 60.7141119987182], [16.875, 60.7184467130562], [16.8812660227065, 60.729004532137], [16.8845277879509, 60.7408928080938], [16.8925963651346, 60.7491330571324], [16.8842702801685, 60.7618367744003], [16.875, 60.7623517899652], [16.8608370719649, 60.7630813953488], [16.847790010987, 60.7539827870353], [16.8420390038455, 60.7451416865043], [16.8342279344443, 60.729004532137], [16.8222967405237, 60.7159574711591], [16.8101938747482, 60.7098631203076], [16.8132839681377, 60.6980177623146], [16.8347429500092, 60.6928676066654] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 172,
+         "id" : 87877,
+         "name" : "Ojaren",
+         "pfafstette" : 61,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 45485,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 173,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [15.68042139718, 61.090073361106], [15.692610098883, 61.0755241713972], [15.7090047610328, 61.0682281175609], [15.7284036806446, 61.0618762589269], [15.738017304523, 61.0709748672404], [15.7320946255265, 61.0782709210767], [15.7229101812855, 61.0843652719282], [15.7035112616737, 61.1013178676067], [15.6919234114631, 61.1353947308185], [15.6873741073064, 61.1621755401941], [15.6855715528292, 61.1731196209485], [15.6737261948361, 61.1846216352316], [15.6451428309833, 61.1901151345907], [15.6193920527376, 61.195909059696], [15.6023107031679, 61.1953082082036], [15.583770142831, 61.1961665674785], [15.5600794268449, 61.1980120399194], [15.5478907251419, 61.2032051135323], [15.5594785753525, 61.211445362571], [15.5855726973082, 61.211445362571], [15.6008514924007, 61.2129045733382], [15.6023107031679, 61.2208443966307], [15.5950146493316, 61.2220460996154], [15.5782766434719, 61.2226469511079], [15.5529550448636, 61.2226469511079], [15.5400796557407, 61.2129045733382], [15.5326977659769, 61.2083981871452], [15.5170756271745, 61.2147071278154], [15.5078053470061, 61.2129045733382], [15.4868613806995, 61.2047072422633], [15.4526128456327, 61.2071535661967], [15.4311538637612, 61.2165526002564], [15.4163042483062, 61.2223465253617], [15.4086648507599, 61.2162950924739], [15.4152742171764, 61.2108015931148], [15.429694652994, 61.2020463285113], [15.4417975187695, 61.1980120399194], [15.4554454312397, 61.2016600668376], [15.4872905603369, 61.1922610327779], [15.5223116187512, 61.1849220609778], [15.5529550448636, 61.1788277101264], [15.5947571415492, 61.1715745742538], [15.617160318623, 61.1621326222304], [15.6101217725691, 61.1494289049625], [15.6064308276872, 61.1405878044314], [15.623340505402, 61.1347509613624], [15.6379326130745, 61.1274978254898], [15.6460011902582, 61.1223047518769], [15.6647992583776, 61.1135494872734], [15.68042139718, 61.090073361106] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 173,
+         "id" : 86144,
+         "name" : "Lake Dalkarlsaspen",
+         "pfafstette" : 275,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 45857,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 174,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [8.3186172404322, 61.3867652444607], [8.3252266068486, 61.382215940304], [8.3525224317891, 61.37586408167], [8.3820499908442, 61.3648770829518], [8.4152684947812, 61.3566797518769], [8.443508514924, 61.3542334279436], [8.4602465207837, 61.351486678264], [8.4881431972166, 61.349984549533], [8.5124347646951, 61.3511862525179], [8.5586144936825, 61.3504137291705], [8.6152662058231, 61.3411863669658], [8.6574974821461, 61.3375383400476], [8.6936344076177, 61.3365941448453], [8.7131191631569, 61.3375383400476], [8.7362090276506, 61.3390404687786], [8.7456509796741, 61.3320448406885], [8.7562087987548, 61.3220449551364], [8.7787836476836, 61.3204999084417], [8.7868522248672, 61.3301993682476], [8.7726892968321, 61.3344911646219], [8.7538912287127, 61.3387400430324], [8.7286554660319, 61.3478386513459], [8.6921751968504, 61.353332150705], [8.6564674510163, 61.3573235213331], [8.6179271195752, 61.3615723997436], [8.5656530397363, 61.3648770829518], [8.5230784197034, 61.365177508698], [8.468057590185, 61.3660787859366], [8.4082299487273, 61.3706280900934], [8.3902902398828, 61.3754778199963], [8.3750114447903, 61.3809713193554], [8.3437671671855, 61.3883102911555], [8.3186172404322, 61.3867652444607] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 174,
+         "id" : 85816,
+         "name" : "Bygdin",
+         "lge_id" : "no",
+         "pfafstette" : 24951,
+         "lke_type" : "B",
+         "altitude" : 0,
+         "objectid" : 45864,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 175,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [8.836808734664, 61.3420447262406], [8.8247058688885, 61.3411863669658], [8.8351778520418, 61.3289976652628], [8.8625595129097, 61.3192982054569], [8.8793833546969, 61.3147059833364], [8.900069813221, 61.3059078007691], [8.9226446621498, 61.3038477385094], [8.9495971433803, 61.3080536989562], [8.9930301226882, 61.3159076863212], [9.0219568302509, 61.3369374885552], [9.0400682109504, 61.3496841237869], [9.0495959989013, 61.3551776231459], [9.0355189067936, 61.3600702710126], [9.0039312854789, 61.3542334279436], [8.9773221479583, 61.342645577733], [8.9653051181102, 61.3305856299213], [8.9526872367698, 61.3250921305622], [8.9406702069218, 61.3208003341879], [8.9230738417872, 61.3198990569493], [8.8957780168467, 61.3293410089727], [8.8747482146127, 61.3384396172862], [8.8562076542758, 61.339984663981], [8.836808734664, 61.3420447262406] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 175,
+         "id" : 86002,
+         "name" : "Vinstri",
+         "lge_id" : "no",
+         "pfafstette" : 2493531,
+         "lke_type" : "B",
+         "altitude" : 0,
+         "objectid" : 45873,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 176,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [11.8263882530672, 61.2451359641091], [11.8558299761948, 61.2123037218458], [11.8687053653177, 61.1947073567112], [11.8962586980407, 61.1740208981871], [11.9358290606116, 61.1518752288958], [11.9631248855521, 61.1299441494232], [11.9798628914118, 61.1171975141915], [11.9831246566563, 61.1274978254898], [11.9345415216993, 61.1669823521333], [11.8893059879143, 61.1992137429042], [11.8859583867424, 61.2192993499359], [11.8679328419703, 61.2469385185863], [11.8467313678814, 61.2645778016847], [11.8282766434719, 61.2785690578649], [11.8069034975279, 61.295907915217], [11.7944572880425, 61.3080536989562], [11.7742000091558, 61.309255401941], [11.7560886284563, 61.3047060977843], [11.7556594488189, 61.2926032320088], [11.7621829793078, 61.2794703351035], [11.7841569767442, 61.271873855521], [11.8263882530672, 61.2451359641091] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 176,
+         "id" : 86160,
+         "name" : "Ossjen",
+         "lge_id" : "no",
+         "pfafstette" : 6417,
+         "lke_type" : "B",
+         "altitude" : 0,
+         "objectid" : 45905,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 177,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.9287561801868, 61.2083981871452], [14.9135632210218, 61.2056514374657], [14.9557944973448, 61.197411188427], [14.9962232191906, 61.1955657159861], [15.0098711316609, 61.1943210950375], [15.030557590185, 61.1892138573521], [15.0515015564915, 61.1852654046878], [15.0734755539279, 61.1822611472258], [15.0837758652262, 61.1895142830983], [15.0713296557407, 61.2062522889581], [15.0500423457242, 61.2189989241897], [15.0327034883721, 61.2268529115547], [15.0227465207838, 61.2214452481231], [15.0002575077825, 61.2089990386376], [14.9612879967039, 61.2041063907709], [14.9287561801868, 61.2083981871452] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 177,
+         "id" : 86228,
+         "name" : "Skattungen",
+         "pfafstette" : 427133,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 46038,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 178,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [8.2714933162425, 61.3317873329061], [8.2676306995056, 61.3487399285845], [8.2584462552646, 61.3603706967588], [8.2428241164622, 61.3625595129097], [8.2231676890679, 61.3579243728255], [8.2329529848013, 61.3487399285845], [8.2429099523897, 61.3360791292804], [8.2284895165721, 61.3281393059879], [8.2143265885369, 61.3205428264054], [8.1933826222304, 61.3138476240615], [8.1613658212782, 61.3016589223585], [8.1711511170115, 61.2888693691632], [8.1994769730819, 61.2834617057315], [8.2060863394983, 61.2663803561619], [8.2173308459989, 61.2490844167735], [8.2368156015382, 61.2460801593115], [8.2434249679546, 61.2579255173045], [8.2344121955686, 61.2736764099982], [8.2307212506867, 61.2883543535982], [8.2521802325581, 61.3028606253433], [8.2674590276506, 61.3189548617469], [8.2714933162425, 61.3317873329061] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 178,
+         "id" : 85939,
+         "name" : "Tyin",
+         "lge_id" : "no",
+         "pfafstette" : 759,
+         "lke_type" : "B",
+         "altitude" : 0,
+         "objectid" : 46142,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 179,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [8.8708855978759, 60.3664764924007], [8.8781816517121, 60.3603392235854], [8.8802417139718, 60.3536440212415], [8.8833318073613, 60.3457900338766], [8.8992114539462, 60.3323996291888], [8.9051341329427, 60.3396527650613], [8.893889626442, 60.3539444469877], [8.888224455228, 60.3624851217726], [8.8823017762315, 60.3703820271013], [8.8774091283648, 60.3831715802966], [8.8814434169566, 60.4044159723494], [8.8827309558689, 60.4236003021425], [8.8637612158945, 60.4381065738876], [8.8237616736861, 60.44604639718], [8.7908865134591, 60.4539862204724], [8.7754360465116, 60.454887497711], [8.7688266800952, 60.4429992217543], [8.7815303973631, 60.4357460858817], [8.8235041659037, 60.4284929500092], [8.8617011536349, 60.4211539782091], [8.8726023164256, 60.417162607581], [8.8620444973448, 60.4120124519319], [8.8525167093939, 60.3961757233108], [8.86084279436, 60.373429202527], [8.8708855978759, 60.3664764924007] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 179,
+         "id" : 90336,
+         "name" : "Tunhovdfjorden",
+         "lge_id" : "no",
+         "pfafstette" : 5111,
+         "lke_type" : "B",
+         "altitude" : 0,
+         "objectid" : 46220,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 180,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [10.0573956235122, 60.5527404550449], [10.0155076908991, 60.5602940166636], [9.9853792803516, 60.5645858130379], [9.9816883354697, 60.5566459897455], [9.9953362479399, 60.5472469556858], [10.0200569950559, 60.5436418467314], [10.0428893517671, 60.5405946713056], [10.0483828511262, 60.5257021378868], [10.037395852408, 60.5060027925288], [10.0291556033694, 60.4816253891229], [10.0391984068852, 60.4630848287859], [10.0580823109321, 60.4521407480315], [10.0678676066655, 60.4351452343893], [10.061429912104, 60.4205531267167], [10.0540480223402, 60.4035146951108], [10.0595415216993, 60.3862187557224], [10.0732752700971, 60.3789227018861], [10.0814296832082, 60.3852745605201], [10.0750778245743, 60.3977207700055], [10.0832322376854, 60.4202527009705], [10.0979101812855, 60.4417975187695], [10.085978987365, 60.4500377678081], [10.0658933803333, 60.4582780168467], [10.0577389672221, 60.4684924922175], [10.0632324665812, 60.4833850256363], [10.0687259659403, 60.5013676524446], [10.079627128731, 60.5229553882073], [10.0834897454679, 60.5435989287676], [10.0573956235122, 60.5527404550449] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 180,
+         "id" : 89936,
+         "name" : "Sperillen",
+         "lge_id" : "no",
+         "pfafstette" : 73133,
+         "lke_type" : "B",
+         "altitude" : 0,
+         "objectid" : 46249,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 181,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [15.614156061161, 60.5083632805347], [15.610808459989, 60.5001230314961], [15.6047141091375, 60.4874193142282], [15.6162161234206, 60.4840717130562], [15.6341558322652, 60.4865180369896], [15.6490912836477, 60.48377128731], [15.6604216260758, 60.4913248489288], [15.6581898919612, 60.5102087529756], [15.656387337484, 60.526002563633], [15.6667734847098, 60.5284488875664], [15.6824814594397, 60.5199082127815], [15.7029104101813, 60.5327406839407], [15.7223951657206, 60.5512812442776], [15.734841375206, 60.543040995239], [15.7508926936459, 60.5508949826039], [15.7657423091009, 60.57458569859], [15.7581887474822, 60.5894782320088], [15.737845632668, 60.5940704541293], [15.701451199414, 60.5931262589269], [15.674584554111, 60.5900790835012], [15.6557864859916, 60.58192467039], [15.6405935268266, 60.5686201016297], [15.6387051364219, 60.5531267167186], [15.6241988646768, 60.5476332173595], [15.610808459989, 60.5384487731185], [15.6084050540194, 60.523341649881], [15.5915812122322, 60.5147580571324], [15.5594785753525, 60.51415720564], [15.5451439754624, 60.5105091787218], [15.5594785753525, 60.4965179225417], [15.5762165812122, 60.4929128135873], [15.5861735488006, 60.4983633949826], [15.5962163523164, 60.5041573200879], [15.6045424372826, 60.5105091787218], [15.614156061161, 60.5083632805347] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 181,
+         "id" : 89145,
+         "name" : "Runn",
+         "pfafstette" : 2311,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 46693,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 182,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [11.0613326313862, 60.3880213101996], [11.074723036074, 60.4102098974547], [11.0735213330892, 60.4293942272478], [11.0659677714704, 60.4242011536349], [11.050688976378, 60.4044159723494], [11.0312900567662, 60.3883217359458], [11.0185863394983, 60.379781061161], [11.0136936916316, 60.3666910822194], [11.0239081670024, 60.3527856619667], [11.0409895165721, 60.344545412928], [11.0597875846915, 60.3381506363303], [11.0735213330892, 60.3178075215162], [11.0820190899103, 60.302314136605], [11.0900018311665, 60.2956618522249], [11.1020188610145, 60.2883228804248], [11.1148942501373, 60.2952755905512], [11.1177268357444, 60.3166058185314], [11.122791155466, 60.3299533052554], [11.1236495147409, 60.335704312397], [11.1048514466215, 60.3436441356894], [11.0781564731734, 60.3517985488006], [11.0568691631569, 60.3646310199597], [11.0500881248856, 60.3783218503937], [11.0613326313862, 60.3880213101996] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 182,
+         "id" : 90560,
+         "name" : "Hurdalsjen",
+         "lge_id" : "no",
+         "pfafstette" : 214333,
+         "lke_type" : "B",
+         "altitude" : 0,
+         "objectid" : 46998,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 183,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [17.3183425654642, 60.1427022294452], [17.3269261582128, 60.1445477018861], [17.3362822743087, 60.1460498306171], [17.3567112250504, 60.1563930598791], [17.3842645577733, 60.167594648416], [17.4052943600073, 60.1770795184032], [17.391818119392, 60.1904270051273], [17.3732775590551, 60.199826039187], [17.3604021699322, 60.2016715116279], [17.337569813221, 60.1937746062992], [17.3132782457425, 60.1865214704267], [17.2900167093939, 60.1831738692547], [17.2781713514008, 60.1737319172313], [17.2678710401025, 60.164933734664], [17.2598024629189, 60.1569939113715], [17.2706177897821, 60.1481957288042], [17.2949093572606, 60.1472944515656], [17.3088147775133, 60.1451485533785], [17.3183425654642, 60.1427022294452] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 183,
+         "id" : 90737,
+         "name" : "Tamnaren",
+         "pfafstette" : 751,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 47101,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 184,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [10.188467084783, 60.80896069859], [10.1611712598425, 60.8092611243362], [10.1409998168834, 60.8062997848379], [10.1683814777513, 60.7998620902765], [10.2011708020509, 60.7974157663432], [10.218509659403, 60.7865146035525], [10.2275224317891, 60.7664289965208], [10.2367927119575, 60.74853220564], [10.2505264603553, 60.7354851446621], [10.2774789415858, 60.7169445843252], [10.3173926478667, 60.6873741073064], [10.339881660868, 60.6557864859916], [10.3339589818715, 60.6247567982055], [10.3130150155649, 60.6068600073247], [10.2985087438198, 60.5965596960264], [10.294474455228, 60.5591352316426], [10.3015130012818, 60.5266034151254], [10.3339589818715, 60.5208953259476], [10.3737868522249, 60.512655076909], [10.3882072880425, 60.4922690441311], [10.3933574436916, 60.4733851400842], [10.3930999359092, 60.4512394707929], [10.3825421168284, 60.4284929500092], [10.3761902581945, 60.4126133034243], [10.369924235488, 60.4013687969236], [10.3589372367698, 60.391626419154], [10.3576496978575, 60.3676352774217], [10.3537870811207, 60.3478930141], [10.3454609961546, 60.3336442501373], [10.351555347006, 60.3138590688519], [10.3613406427394, 60.2952755905512], [10.3747310474272, 60.27978220564], [10.3882072880425, 60.2609841375206], [10.4059753250321, 60.2528297244095], [10.4212541201245, 60.2634304614539], [10.412327183666, 60.275275819447], [10.4062328328145, 60.2873786852225], [10.4018552005127, 60.2956189342611], [10.3865764054203, 60.3069063587255], [10.3816837575536, 60.3269061298297], [10.3920699047794, 60.3457900338766], [10.4064045046695, 60.3575924739059], [10.4136147225783, 60.368922816334], [10.4176490111701, 60.3801244048709], [10.4258034242813, 60.3995233244827], [10.4377346182018, 60.4211539782091], [10.4585927485809, 60.4305530122688], [10.4706956143563, 60.4375486403589], [10.4555884911188, 60.4411537493133], [10.4446014924007, 60.4542437282549], [10.4529275773668, 60.4733851400842], [10.4504383354697, 60.4888785249954], [10.4200524171397, 60.5120113074529], [10.382112937191, 60.5299080983336], [10.3431434261124, 60.5332556995056], [10.318851858634, 60.5405946713056], [10.3225428035158, 60.5539421580297], [10.3310405603369, 60.5782337255081], [10.3403108405054, 60.60497161692], [10.3559329793078, 60.6192632988464], [10.3625423457242, 60.6502929866325], [10.3492377769639, 60.6928676066654], [10.3276071232375, 60.7165583226515], [10.2995387749496, 60.7263436183849], [10.2722429500092, 60.7387898278703], [10.2595392327413, 60.7518368888482], [10.2476938747482, 60.762223036074], [10.2395394616371, 60.7813215299396], [10.2334451107856, 60.8010208752976], [10.2097543947995, 60.8098619758286], [10.188467084783, 60.80896069859] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 184,
+         "id" : 88501,
+         "name" : "Randsfjorden",
+         "lge_id" : "no",
+         "pfafstette" : 6137,
+         "lke_type" : "B",
+         "altitude" : 134,
+         "objectid" : 47310,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 185,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [7.8400819446988, 60.6928676066654], [7.8672060977843, 60.6706790194104], [7.8930427119575, 60.6658292895074], [7.9128708112067, 60.6706790194104], [7.9279779344442, 60.6773742217543], [7.9114116004395, 60.6818806079473], [7.8848024629189, 60.694112227614], [7.8449745925655, 60.7165583226515], [7.7804259750961, 60.7292620399194], [7.7544176890679, 60.7241977201978], [7.7775933894891, 60.7187042208387], [7.80248580846, 60.7129102957334], [7.8237731184765, 60.707459714338], [7.8400819446988, 60.6928676066654] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 185,
+         "id" : 88898,
+         "name" : "Strandavatnet",
+         "lge_id" : "no",
+         "pfafstette" : 4857,
+         "lke_type" : "B",
+         "altitude" : 0,
+         "objectid" : 47349,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 186,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [8.0857443691632, 60.7375452069218], [8.0705514099982, 60.7509356116096], [8.0708089177806, 60.762223036074], [8.0666887932613, 60.7728237731185], [8.0497791155466, 60.7797764832448], [8.0377620856986, 60.7846691311115], [8.0216249313313, 60.7938106573888], [8.0134705182201, 60.8038534609046], [8.0161314319722, 60.81629967039], [7.9985350668376, 60.8229519547702], [7.977762772386, 60.8189605841421], [7.959565555759, 60.8166000961362], [7.9375057223952, 60.8181022248672], [7.9267762314594, 60.8129520692181], [7.9462609869987, 60.8095615500824], [7.9760460538363, 60.8022654962461], [7.977762772386, 60.7885746658121], [7.9675482970152, 60.7782743545138], [7.9741576634316, 60.7710212186413], [7.9951016297382, 60.7548840642739], [8.0140713697125, 60.7473305026552], [8.0273759384728, 60.7561286852225], [8.0429980772752, 60.7557853415125], [8.0544142556308, 60.7424378547885], [8.0771607764146, 60.7275453213697], [8.1130401941037, 60.7235968687054], [8.122825489837, 60.7314508560703], [8.1157011078557, 60.7448841787218], [8.1066883354697, 60.759390450467], [8.0903795092474, 60.7587895989745], [8.0913237044497, 60.7448841787218], [8.0997356253433, 60.736343503937], [8.0857443691632, 60.7375452069218] ],
+            [ [8.0256592199231, 60.77123580846], [8.0189640175792, 60.774068394067], [8.0248866965757, 60.7782743545138], [8.0256592199231, 60.77123580846] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 186,
+         "id" : 88394,
+         "name" : "Djupsvatnet",
+         "lge_id" : "no",
+         "pfafstette" : 482511,
+         "lke_type" : "B",
+         "altitude" : 0,
+         "objectid" : 47442,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 187,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [8.1950993407801, 59.7791870765428], [8.1930392785204, 59.7831355292071], [8.1569023530489, 59.7926203991943], [8.13501419154, 59.8059249679546], [8.1194778886651, 59.8266114264787], [8.1034265702252, 59.8460961820179], [8.1146710767259, 59.8546368568028], [8.1358725508149, 59.8558385597876], [8.162567524263, 59.8539930873466], [8.1875457791613, 59.853091810108], [8.1988761215895, 59.8454524125618], [8.2335538362937, 59.8308603048892], [8.2926947903314, 59.8249376258927], [8.2998191723128, 59.8318045000916], [8.2495193188061, 59.8399589132027], [8.2180175334188, 59.851589681377], [8.2096914484527, 59.8546368568028], [8.1917517396081, 59.85609606757], [8.1705502655191, 59.870130241714], [8.1465162058231, 59.8837781541842], [8.1279756454862, 59.8822760254532], [8.1150144204358, 59.8795292757737], [8.0944996337667, 59.8776838033327], [8.0598219190624, 59.8889283098334], [8.0398221479583, 59.9107735533785], [8.05956441128, 59.9268677897821], [8.0702939022157, 59.9451937603003], [8.0422255539279, 59.96193176616], [8.0134705182201, 59.9658373008606], [8.026517579198, 59.9572966260758], [8.0551009430507, 59.9451937603003], [8.0434272569127, 59.928713262223], [8.020509064274, 59.9107735533785], [8.007977018861, 59.8980698361106], [8.0014534883721, 59.8858811344076], [8.0167322834646, 59.866782640542], [8.0340711408167, 59.8439932017945], [8.0662596136239, 59.8242080205091], [8.110980131844, 59.806525819447], [8.13501419154, 59.7910324345358], [8.1538122596594, 59.7843801501556], [8.174584554111, 59.7807750412012], [8.1950993407801, 59.7791870765428] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 187,
+         "id" : 92671,
+         "name" : "Msvatn",
+         "lge_id" : "no",
+         "pfafstette" : 91177,
+         "lke_type" : "B",
+         "altitude" : 1394,
+         "objectid" : 47810,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 188,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [8.2009361838491, 60.0524886696576], [8.1985327778795, 60.0463943188061], [8.2280603369346, 60.0502998535067], [8.2635964109138, 60.0563942043582], [8.2775876670939, 60.0597418055301], [8.2949265244461, 60.0694841832998], [8.3162138344626, 60.0740334874565], [8.319818943417, 60.0554929271196], [8.3110636788134, 60.0369952847464], [8.2945831807361, 60.0241628135873], [8.2829953305256, 60.0047638939755], [8.298617469328, 60.0014162928035], [8.3449688701703, 60.0029184215345], [8.3726938747482, 60.0032617652445], [8.3525224317891, 60.0072102179088], [8.3362136055668, 60.0169096777147], [8.3310634499176, 60.0339481093206], [8.3328660043948, 60.0478535295733], [8.3429088079106, 60.0627460629921], [8.3388745193188, 60.0746343389489], [8.3206773026918, 60.0806857718367], [8.3021367423549, 60.0874238921443], [8.2949265244461, 60.0855784197033], [8.2766434718916, 60.0780248580846], [8.2502918421535, 60.0725313587255], [8.2344121955686, 60.0627460629921], [8.2194767441861, 60.0566946301044], [8.2009361838491, 60.0524886696576] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 188,
+         "id" : 92360,
+         "name" : "Gystvatnet",
+         "lge_id" : "no",
+         "pfafstette" : 857,
+         "lke_type" : "B",
+         "altitude" : 1137,
+         "objectid" : 47917,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 189,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [15.977070362571, 59.9157091192089], [15.991748306171, 59.9114602407984], [16.010288866508, 59.8995290468779], [16.0235934352683, 59.9050225462369], [16.0050528749313, 59.926052348471], [15.9950100714155, 59.939399835195], [16.0086579838857, 59.9454941860465], [16.0141514832448, 59.9561378410547], [16.0056537264237, 59.9691849020326], [15.9731219099066, 59.9688844762864], [15.9299464383813, 59.9688844762864], [15.9050540194104, 59.9688844762864], [15.8950112158945, 59.9625326176524], [15.9095174876396, 59.9578116416407], [15.934495742538, 59.9627901254349], [15.9460835927486, 59.9572966260758], [15.928487227614, 59.953090665629], [15.9093458157847, 59.9515456189343], [15.9268563449918, 59.9445929088079], [15.946512772386, 59.9348076130745], [15.9560405603369, 59.9229622550815], [15.977070362571, 59.9157091192089] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 189,
+         "id" : 92385,
+         "pfafstette" : 8391,
+         "lke_type" : "N",
+         "altitude" : 80,
+         "objectid" : 47982,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_47982",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 190,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [13.0364173228347, 60.1190115134591], [13.0365889946896, 60.0935182429958], [13.046374290423, 60.0819303927852], [13.0665457333822, 60.0655786485992], [13.0847429500092, 60.0502998535067], [13.097790010987, 60.036394433254], [13.1030260025636, 60.0141629280352], [13.1086911737777, 59.9901717863029], [13.1153863761216, 59.9668244140267], [13.1202790239883, 59.9512881111518], [13.1330685771837, 59.9323612891412], [13.1406221388024, 59.9077692959165], [13.1412229902948, 59.8762245925655], [13.1440555759019, 59.8572977705548], [13.1475748489288, 59.8688856207654], [13.1530683482879, 59.8822760254532], [13.1616519410365, 59.9050225462369], [13.1579609961546, 59.9327475508149], [13.1512657938107, 59.9490992950009], [13.146029802234, 59.9606871452115], [13.1420813495697, 59.9739917139718], [13.1382187328328, 59.9886696575719], [13.1379612250504, 59.9956223676982], [13.1428538729171, 60.0078110694012], [13.1353003112983, 60.0221027513276], [13.1126396264421, 60.0424458661417], [13.097790010987, 60.0576388253067], [13.0773610602454, 60.080471182018], [13.0478335011903, 60.1196552829152], [13.0364173228347, 60.1190115134591] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 190,
+         "id" : 91892,
+         "name" : "Ovre Fryken",
+         "pfafstette" : 6531,
+         "lke_type" : "N",
+         "altitude" : 65,
+         "objectid" : 48307,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 191,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [8.2570728804248, 60.1114579518403], [8.280076908991, 60.1023164255631], [8.2833386742355, 60.1035181285479], [8.277244323384, 60.1205565601538], [8.2595621223219, 60.1348482420802], [8.2419657571873, 60.1436893426112], [8.2341546877861, 60.1561355520967], [8.2119231825673, 60.1704272340231], [8.1797347097601, 60.1877660913752], [8.1657434535799, 60.193474180553], [8.1708936092291, 60.1788820728804], [8.1950993407801, 60.1622299029482], [8.2082322376854, 60.1533888024171], [8.2054854880059, 60.1412430186779], [8.2215368064457, 60.1245050128182], [8.2570728804248, 60.1114579518403] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 191,
+         "id" : 91742,
+         "name" : "Mr",
+         "lge_id" : "no",
+         "pfafstette" : 8613,
+         "lke_type" : "B",
+         "altitude" : 0,
+         "objectid" : 48315,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 192,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [18.5350668375755, 59.8436498580846], [18.571547106757, 59.8391005539279], [18.6031347280718, 59.8363538042483], [18.6362673960813, 59.8433923503021], [18.6462243636696, 59.8585423915034], [18.6311172404322, 59.8658384453397], [18.5978987364951, 59.8661388710859], [18.5591008972716, 59.868284769273], [18.5362685405603, 59.8633921214063], [18.5241656747848, 59.8621904184215], [18.5048525911005, 59.8676839177806], [18.4848528199963, 59.8658384453397], [18.4824494140267, 59.8570831807361], [18.4991874198865, 59.8481991622414], [18.5350668375755, 59.8436498580846] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 192,
+         "id" : 92164,
+         "name" : "Erken",
+         "pfafstette" : 51,
+         "lke_type" : "N",
+         "altitude" : 15,
+         "objectid" : 48359,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 193,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [8.9885666544589, 59.8512463376671], [8.9675368522249, 59.866782640542], [8.942644433254, 59.8925763367515], [8.9112284837942, 59.9239064502838], [8.8918295641824, 59.9403011124336], [8.8662504577916, 59.9652364493682], [8.8307143838125, 59.9937768952573], [8.81543558872, 59.9956223676982], [8.7893414667643, 59.9962232191906], [8.7659940944882, 59.9937768952573], [8.776380241714, 59.9862233336385], [8.8061653085516, 59.9764380379051], [8.8261650796557, 59.9645926799121], [8.8178389946896, 59.9509447674419], [8.8093412378685, 59.9397002609412], [8.8270234389306, 59.942747436367], [8.8538042483062, 59.9375543627541], [8.8767224409449, 59.9223614035891], [8.8969797198315, 59.9056663156931], [8.9243613806995, 59.8815893380333], [8.945305347006, 59.8612891411829], [8.9538889397546, 59.8488429316975], [8.9826439754624, 59.8384997024354], [9.0051329884637, 59.82605349295], [8.9990386376122, 59.8181136696576], [9.0069355429409, 59.7938221021791], [9.0215276506134, 59.7524491851309], [9.0307979307819, 59.744251854056], [9.0380939846182, 59.7688867652445], [9.0295103918696, 59.786826474089], [9.0271069859, 59.8090150613441], [9.0307979307819, 59.8342508240249], [9.0124290423, 59.8439502838308], [8.9885666544589, 59.8512463376671] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 193,
+         "id" : 92886,
+         "name" : "Tinnsj",
+         "lge_id" : "no",
+         "pfafstette" : 739,
+         "lke_type" : "B",
+         "altitude" : 192,
+         "objectid" : 48692,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 194,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [28.7168387200147, 58.9634453396814], [28.7502288958066, 58.9500978529573], [28.769026963926, 58.9497545092474], [28.7985545229811, 58.952501258927], [28.8261936916316, 58.9564067936276], [28.8361506592199, 58.9661920893609], [28.8337472532503, 58.9816854742721], [28.8220735671123, 58.9947754532137], [28.7861083134957, 59.0035307178173], [28.7432761856803, 59.0047753387658], [28.7247356253434, 58.9953763047061], [28.7098860098883, 58.9895823796008], [28.696581441128, 58.9819429820546], [28.7168387200147, 58.9634453396814] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 194,
+         "id" : 91356,
+         "pfafstette" : 2773,
+         "lke_type" : "N",
+         "altitude" : 66,
+         "objectid" : 48832,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_48832",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 195,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [15.1433459989013, 60.1904270051273], [15.1369941402674, 60.2022723631203], [15.1174235488006, 60.2105126121589], [15.0988829884637, 60.2074654367332], [15.0884110053104, 60.2038174098151], [15.0713296557407, 60.2099117606665], [15.0476389397546, 60.21901036898], [15.0345918787768, 60.233044543124], [15.0266091375206, 60.2418427256913], [15.0174246932796, 60.2290531724959], [14.9988841329427, 60.2196112204724], [14.9828328145028, 60.2147185726057], [14.9884979857169, 60.2047186870536], [14.9956223676982, 60.1977659769273], [15.0017167185497, 60.1898261536349], [15.0181113806995, 60.190813266801], [15.0436904870903, 60.193474180553], [15.0725313587255, 60.1883669428676], [15.1072090734298, 60.1670796328511], [15.1530454587072, 60.1545905054019], [15.1789679088079, 60.1639895394616], [15.1657491759751, 60.1724872962827], [15.1469511078557, 60.1788820728804], [15.1433459989013, 60.1904270051273] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 195,
+         "id" : 91117,
+         "pfafstette" : 8775,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 48916,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_48916",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 196,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [13.4199322468413, 59.6263562076543], [13.4208764420436, 59.6451542757737], [13.4101469511079, 59.664295687603], [13.3925505859733, 59.664295687603], [13.3791601812855, 59.6630939846182], [13.3752975645486, 59.677986518037], [13.3837953213697, 59.6828791659037], [13.39744323384, 59.677986518037], [13.4011341787219, 59.6892310245376], [13.4005333272295, 59.7087586980406], [13.3993316242447, 59.7208186458524], [13.4008766709394, 59.7284580433986], [13.3877437740341, 59.7410759247391], [13.3574436916316, 59.7475565372642], [13.3437957791613, 59.744251854056], [13.3566711682842, 59.7308614493682], [13.3652547610328, 59.6974712735763], [13.3549544497345, 59.6743384911188], [13.33667139718, 59.6785873695294], [13.3172724775682, 59.677986518037], [13.315641594946, 59.6713342336568], [13.3369289049625, 59.6646390313129], [13.3615638161509, 59.6551541613258], [13.3722933070866, 59.6379011399011], [13.3964990386376, 59.6242103094671], [13.4199322468413, 59.6263562076543] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 196,
+         "id" : 94047,
+         "name" : "Visten",
+         "pfafstette" : 93431,
+         "lke_type" : "N",
+         "altitude" : 107,
+         "objectid" : 49113,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 197,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [7.9990500824025, 59.6791882210218], [8.0136421900751, 59.6728792803516], [8.026174235488, 59.6728792803516], [8.0369037264237, 59.6737805575902], [8.0371612342062, 59.6831795916499], [8.0256592199231, 59.6968275041201], [8.0297793444424, 59.7035656244278], [8.0273759384728, 59.7144667872185], [8.0097795733382, 59.7245095907343], [7.9799945065006, 59.7226641182934], [7.9401666361472, 59.7199173686138], [7.9169909357261, 59.7177714704267], [7.8975920161143, 59.7181577321003], [7.8739013001282, 59.7281576176524], [7.8522706464018, 59.7466981779894], [7.8279790789233, 59.7530500366233], [7.8243739699689, 59.7421488738326], [7.8602533876579, 59.7206040560337], [7.9213685680278, 59.7065698818898], [7.9587930324117, 59.7044669016664], [7.9675482970152, 59.6928790514558], [7.9838571232375, 59.6850250640908], [7.9990500824025, 59.6791882210218] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 197,
+         "id" : 94002,
+         "name" : "Totak",
+         "lge_id" : "no",
+         "pfafstette" : 2773,
+         "lke_type" : "B",
+         "altitude" : 702,
+         "objectid" : 49241,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 198,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [12.484148965391, 59.7497453534151], [12.477797106757, 59.7609898599158], [12.456595632668, 59.7625349066105], [12.4300723310749, 59.7637366095953], [12.4045790606116, 59.7670842107673], [12.3798583134957, 59.7734360694012], [12.3740214704267, 59.7648953946164], [12.3850084691449, 59.7530500366233], [12.396510483428, 59.7554963605567], [12.4099008881157, 59.7588439617286], [12.423377128731, 59.7436510025636], [12.4411451657206, 59.7324494140267], [12.453591375206, 59.7457969007508], [12.4613166086797, 59.7539942318257], [12.4674109595312, 59.742749725325], [12.4692135140084, 59.7300030900934], [12.4705010529207, 59.7206040560337], [12.4741061618751, 59.7114196117927], [12.4898999725325, 59.7096170573155], [12.498826908991, 59.7071707333822], [12.50535043948, 59.7008188747482], [12.5232901483245, 59.7050677531588], [12.5349638344626, 59.7165697674419], [12.5286119758286, 59.7229645440396], [12.5096422358543, 59.7196169428676], [12.4992560886285, 59.7254537859366], [12.4929042299945, 59.7360974409449], [12.484148965391, 59.7497453534151] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 198,
+         "id" : 94031,
+         "name" : "Bergsjn",
+         "pfafstette" : 4593,
+         "lke_type" : "N",
+         "altitude" : 113,
+         "objectid" : 49340,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 199,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.7195740249039, 59.5847257828237], [14.7297885002747, 59.5752838308002], [14.743093069035, 59.5703911829335], [14.7515049899286, 59.579489791247], [14.7512474821461, 59.5907772157114], [14.7524491851309, 59.6002191677348], [14.7539083958982, 59.6105623969969], [14.743093069035, 59.6090173503021], [14.7285009613624, 59.6062706006226], [14.7212049075261, 59.603523850943], [14.7124496429226, 59.6029229994506], [14.703866050174, 59.6117640999817], [14.6874713880242, 59.6223648370262], [14.6740809833364, 59.6354548159678], [14.68283624794, 59.6354548159678], [14.6977716993225, 59.6275579106391], [14.7090162058231, 59.643094213514], [14.6957974729903, 59.6569996337667], [14.6700466947446, 59.6573429774767], [14.6488452206556, 59.6591455319538], [14.6321072147958, 59.6524932475737], [14.6321072147958, 59.6442959164988], [14.6400041201245, 59.6324505585058], [14.6484160410181, 59.6230086064823], [14.676484389306, 59.6132662287127], [14.7078145028383, 59.596184879143], [14.7195740249039, 59.5847257828237] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 199,
+         "id" : 94298,
+         "pfafstette" : 8783,
+         "lke_type" : "N",
+         "altitude" : 189,
+         "objectid" : 49348,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_49348",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 200,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [13.1853426570225, 59.7491445019227], [13.1771024079839, 59.7646378868339], [13.1701496978575, 59.7832213651346], [13.1646561984985, 59.8032211362388], [13.1591626991394, 59.8218046145395], [13.1464589818715, 59.8281135552097], [13.1318668741989, 59.814208134957], [13.130836843069, 59.7940796099615], [13.1260300311298, 59.7807750412012], [13.1267167185497, 59.7658825077824], [13.1420813495697, 59.75060371269], [13.1549567386926, 59.7360974409449], [13.1752998535067, 59.7181577321003], [13.1967588353781, 59.7032651986815], [13.2320374015748, 59.6816345449551], [13.2637108588171, 59.6606476606849], [13.2800196850394, 59.6455834554111], [13.30628547885, 59.62206441128], [13.3176158212782, 59.5953265198682], [13.3083455411097, 59.5731379326131], [13.3083455411097, 59.5621938518586], [13.3181308368431, 59.5442541430141], [13.3297186870537, 59.5345546832082], [13.3393323109321, 59.5627517853873], [13.3372722486724, 59.5974295000916], [13.3256843984618, 59.6139099981688], [13.3172724775682, 59.6275579106391], [13.30628547885, 59.6500469236404], [13.2785604742721, 59.6746818348288], [13.2546122505036, 59.6934799029482], [13.2371017212965, 59.7032651986815], [13.2197628639443, 59.7089732878594], [13.2114367789782, 59.7260117194653], [13.1987330617103, 59.7403034013917], [13.1853426570225, 59.7491445019227] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 200,
+         "id" : 93648,
+         "name" : "Mellan Fryken",
+         "pfafstette" : 633,
+         "lke_type" : "N",
+         "altitude" : 65,
+         "objectid" : 49454,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 201,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.3430118110236, 59.7300030900934], [14.3381191631569, 59.7406038271379], [14.3339990386376, 59.762449070683], [14.3275613440762, 59.78832860282], [14.3171751968504, 59.7913757782457], [14.3210378135873, 59.7795304202527], [14.31992194653, 59.7709897454679], [14.310565830434, 59.7740369208936], [14.2938278245743, 59.7746806903498], [14.2836991851309, 59.7606465162058], [14.2755447720198, 59.7509041384362], [14.2521973997437, 59.7545950833181], [14.2424121040103, 59.7494020097052], [14.256317524263, 59.7342519685039], [14.2732272019777, 59.730904367332], [14.2849008881157, 59.7315052188244], [14.2946861838491, 59.7175568806079], [14.3019822376854, 59.7063123741073], [14.3175185405603, 59.702020577733], [14.3271321644388, 59.7023210034792], [14.3427543032412, 59.7060119483611], [14.3585481138986, 59.7105612525179], [14.3505653726424, 59.7196169428676], [14.3430118110236, 59.7300030900934] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 201,
+         "id" : 93674,
+         "name" : "Yngen",
+         "pfafstette" : 86451,
+         "lke_type" : "N",
+         "altitude" : 203,
+         "objectid" : 49558,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 202,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.5054133858268, 59.6922781999634], [14.534597601172, 59.6664415857901], [14.5488463651346, 59.6545962277971], [14.5491038729171, 59.6822783144113], [14.5485888573521, 59.703866050174], [14.5412928035159, 59.7089732878594], [14.5388035616188, 59.6965270783739], [14.5333100622597, 59.6895743682476], [14.5224947353965, 59.7016772340231], [14.5208638527742, 59.7242520829518], [14.5196621497894, 59.7418484480864], [14.5002632301776, 59.7479427989379], [14.4817226698407, 59.7412046786303], [14.4792334279436, 59.7242520829518], [14.4725382255997, 59.7160118339132], [14.4560577275224, 59.7245095907343], [14.4370021516206, 59.7272563404138], [14.4403497527925, 59.7187585835927], [14.4606928676067, 59.7096170573155], [14.4713365226149, 59.69017521974], [14.4846410913752, 59.6771281587621], [14.4939113715437, 59.6849392281633], [14.5054133858268, 59.6922781999634] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 202,
+         "id" : 93907,
+         "name" : "Torrvarpen",
+         "pfafstette" : 8793,
+         "lke_type" : "N",
+         "altitude" : 178,
+         "objectid" : 49609,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 203,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [9.9937053653177, 59.6087169245559], [10.0246921351401, 59.6004766755173], [10.0246921351401, 59.60704312397], [10.0112158945248, 59.6184163843618], [10.0024606299213, 59.6333089177806], [9.9926753341879, 59.6451542757737], [9.9759373283282, 59.6555404229995], [9.943405511811, 59.673480131844], [9.9055518677898, 59.6895743682476], [9.8745650979674, 59.7028789370079], [9.8620330525545, 59.7111191860465], [9.852934444241, 59.7163122596594], [9.8359389305988, 59.7229645440396], [9.8191150888116, 59.7196169428676], [9.8149091283648, 59.7102179088079], [9.8290720563999, 59.7047673274126], [9.8601446621498, 59.6905185634499], [9.8939640175792, 59.6707333821644], [9.9169680461454, 59.6585875984252], [9.9319034975279, 59.6497464978942], [9.9434913477385, 59.6424504440579], [9.9550791979491, 59.633909769273], [9.9689846182018, 59.6236094579747], [9.9937053653177, 59.6087169245559] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 203,
+         "id" : 94354,
+         "name" : "Fiskumvatnet-Eikeren",
+         "lge_id" : "no",
+         "pfafstette" : 1417,
+         "lke_type" : "B",
+         "altitude" : 21,
+         "objectid" : 49824,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 204,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.6163134041384, 59.5570007782457], [14.6239528016847, 59.547601744186], [14.6384590734298, 59.549447216627], [14.6355406518953, 59.5661852224867], [14.6226652627724, 59.5834811618751], [14.6159700604285, 59.5865712552646], [14.6093606940121, 59.5886313175243], [14.6061847646951, 59.6045109641091], [14.6137383263139, 59.6163563221022], [14.6269570591467, 59.6282016800952], [14.6235236220473, 59.6433088033327], [14.6122791155466, 59.6451542757737], [14.6057555850577, 59.647600599707], [14.5933093755723, 59.6545962277971], [14.5829232283465, 59.6485447949093], [14.5829232283465, 59.6336522614906], [14.5913351492401, 59.617558025087], [14.5904767899652, 59.5992320545688], [14.5849832906061, 59.5806914942318], [14.5947685863395, 59.5740392098517], [14.609875709577, 59.5685886284563], [14.6163134041384, 59.5570007782457] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 204,
+         "id" : 94356,
+         "name" : "Halvarsnoren",
+         "pfafstette" : 87575,
+         "lke_type" : "N",
+         "altitude" : 234,
+         "objectid" : 49826,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 205,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [12.6147912470244, 59.603523850943], [12.607838536898, 59.6145108496612], [12.6010574986266, 59.631248855521], [12.6047484435085, 59.6439096548251], [12.6075810291156, 59.6557550128182], [12.5868945705915, 59.6630939846182], [12.5634613623879, 59.6588021882439], [12.5604571049259, 59.6421071003479], [12.5359080296649, 59.6463559787585], [12.4968526826589, 59.6706475462369], [12.4816597234939, 59.6785873695294], [12.4783979582494, 59.6710338079106], [12.4595140542025, 59.6676862067387], [12.4370250412013, 59.6765273072697], [12.4303298388574, 59.6828791659037], [12.4262955502655, 59.6767848150522], [12.4443210950376, 59.6664415857901], [12.4894707928951, 59.6439096548251], [12.5287836476836, 59.6227081807361], [12.5397706464018, 59.6126653772203], [12.5510151529024, 59.5983736952939], [12.574963376671, 59.5804339864494], [12.5905855154734, 59.5627517853873], [12.5981390770921, 59.5570007782457], [12.6098985991577, 59.5500480681194], [12.634876854056, 59.5415073933346], [12.6665503112983, 59.5306062305439], [12.6895543398645, 59.5193617240432], [12.7050906427394, 59.5129669474455], [12.7085240798389, 59.4992761170115], [12.7129017121406, 59.4895766572056], [12.7394250137338, 59.4788900842337], [12.7677508698041, 59.4576456921809], [12.7719568302509, 59.4448990569493], [12.7692959164988, 59.4354141869621], [12.7785661966673, 59.4226675517304], [12.7901540468779, 59.4105217679912], [12.8092954587072, 59.3962300860648], [12.8280935268266, 59.3807367011536], [12.8352179088079, 59.3707368156015], [12.8476641182934, 59.3734406473173], [12.8486083134957, 59.3850284975279], [12.8425139626442, 59.396530511811], [12.8242309100897, 59.4099209164988], [12.795647546237, 59.4366588079106], [12.7793387200147, 59.4600920161143], [12.7713559787585, 59.47047816334], [12.7585664255631, 59.4794909357261], [12.7452618568028, 59.4880316105109], [12.7360774125618, 59.4929242583776], [12.729038866508, 59.5047696163706], [12.7248329060612, 59.5187608725508], [12.7212277971068, 59.5278594808643], [12.7309272569127, 59.5388035616187], [12.7375366233291, 59.547601744186], [12.7250904138436, 59.5563999267533], [12.7163351492401, 59.567644433254], [12.7060348379418, 59.5837386696576], [12.6840608405054, 59.5847257828237], [12.6680095220656, 59.5813781816517], [12.6489539461637, 59.5853266343161], [12.6279241439297, 59.587172106757], [12.6195980589636, 59.5959702893243], [12.6147912470244, 59.603523850943] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 205,
+         "id" : 94519,
+         "name" : "Glafsfjorden",
+         "pfafstette" : 45111,
+         "lke_type" : "N",
+         "altitude" : 47,
+         "objectid" : 49951,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 206,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [12.8691231001648, 59.4409076863212], [12.8779642006959, 59.4309078007691], [12.8944446987731, 59.4263155786486], [12.9096376579381, 59.4394055575902], [12.931525819447, 59.4615512268815], [12.958907480315, 59.4728386513459], [12.9777913843619, 59.4846840093389], [12.9786497436367, 59.5047696163706], [12.9652593389489, 59.5351555347006], [12.9560748947079, 59.5624942776048], [12.955559879143, 59.5861849935909], [12.9479204815968, 59.6108628227431], [12.9341867331991, 59.6260557819081], [12.9394227247757, 59.635755241714], [12.9443153726424, 59.6424504440579], [12.934358405054, 59.6588021882439], [12.9199379692364, 59.6664415857901], [12.9050025178539, 59.6685874839773], [12.8935863394983, 59.670132530672], [12.9013974088995, 59.6600468091925], [12.9153886650797, 59.6454976194836], [12.9145303058048, 59.6333089177806], [12.9162470243545, 59.6150687831899], [12.9135861106025, 59.5935239653909], [12.8815693096503, 59.5910776414576], [12.8509258835378, 59.6059701748764], [12.8444881889764, 59.6227081807361], [12.8352179088079, 59.6251115867057], [12.8190807544406, 59.6233090322285], [12.8111838491119, 59.6135237364951], [12.8152181377037, 59.59901746475], [12.8276643471892, 59.5889746612342], [12.8476641182934, 59.576485533785], [12.8644021241531, 59.5649406015382], [12.8750457791613, 59.5618934261124], [12.891955456876, 59.5637388985534], [12.9044016663615, 59.5549407159861], [12.9190796099616, 59.5418936550082], [12.9346159128365, 59.5284603323567], [12.9327275224318, 59.5178166773485], [12.9331567020692, 59.509876854056], [12.9396802325582, 59.4941259613624], [12.9350450924739, 59.4734395028383], [12.9153886650797, 59.4603924418605], [12.8959897454679, 59.4603924418605], [12.8780500366233, 59.4543410089727], [12.8691231001648, 59.4409076863212] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 206,
+         "id" : 94531,
+         "name" : "Varmeln",
+         "pfafstette" : 62153,
+         "lke_type" : "N",
+         "altitude" : 76,
+         "objectid" : 49983,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 207,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [6.6891079930416, 59.5880304660319], [6.6706532686321, 59.5800906427394], [6.6578637154367, 59.565798960813], [6.6492801226882, 59.5536960950375], [6.641125709577, 59.546099615455], [6.6206967588354, 59.5470008926936], [6.601555347006, 59.5433528657755], [6.5928000824025, 59.5327092107673], [6.6058471433803, 59.5263573521333], [6.6213834462553, 59.5318079335287], [6.6449883263139, 59.5403056903497], [6.6686790423, 59.5506489196118], [6.6778634865409, 59.567644433254], [6.6927989379235, 59.5758846822926], [6.7140004120125, 59.5831378181652], [6.7370902765061, 59.5925797701886], [6.7626693828969, 59.5950260941219], [6.7885918329976, 59.6010775270097], [6.7970037538912, 59.6233090322285], [6.7915102545321, 59.6461413889398], [6.780008240249, 59.6469997482146], [6.777003982787, 59.6394032686321], [6.7764031312946, 59.6263562076543], [6.7680770463285, 59.6126653772203], [6.7544291338583, 59.6093177760483], [6.7316826130745, 59.6047255539278], [6.7113394982604, 59.5937385552097], [6.6891079930416, 59.5880304660319] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 207,
+         "id" : 94554,
+         "name" : "Suldalsvatnet",
+         "lge_id" : "no",
+         "pfafstette" : 193,
+         "lke_type" : "B",
+         "altitude" : 68,
+         "objectid" : 50057,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 208,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [7.5708146401758, 59.8272981138985], [7.5783682017945, 59.8351521012635], [7.5881534975279, 59.8357100347922], [7.599827183666, 59.8363108862846], [7.6089257919795, 59.8466970335103], [7.5969087621315, 59.8600445202344], [7.5778531862296, 59.8749370536532], [7.5668661875115, 59.8801301272661], [7.5575100714155, 59.8776838033327], [7.5352785661967, 59.8749370536532], [7.5018025544772, 59.8798297015199], [7.4897855246292, 59.8905162744919], [7.4826611426479, 59.8989281953855], [7.4709874565098, 59.9117606665446], [7.4612021607764, 59.9229622550815], [7.4614596685589, 59.9087134911188], [7.4718458157847, 59.8913746337667], [7.4721891594946, 59.8846365134591], [7.4714166361472, 59.8703877494964], [7.5010300311298, 59.8582848837209], [7.5444630104377, 59.8484995879875], [7.5642052737594, 59.8339503982787], [7.5708146401758, 59.8272981138985] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 208,
+         "id" : 93151,
+         "name" : "Songevatnet",
+         "lge_id" : "no",
+         "pfafstette" : 2919,
+         "lke_type" : "B",
+         "altitude" : 965,
+         "objectid" : 50335,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 209,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [12.2011479124703, 59.2138716581212], [12.193851858634, 59.2257170161143], [12.1897317341146, 59.2415966626991], [12.1750537905146, 59.2430558734664], [12.1646676432888, 59.2445580021974], [12.1585732924373, 59.2585492583776], [12.1547106757004, 59.2670470151987], [12.1498180278337, 59.2761456235122], [12.1548823475554, 59.2864888527742], [12.1582299487274, 59.2971325077825], [12.1510197308185, 59.3071753112983], [12.1479296374291, 59.3144713651346], [12.1498180278337, 59.3445997756821], [12.1379726698407, 59.3785908029665], [12.1184020783739, 59.3910799304157], [12.1091317982055, 59.3822817478484], [12.1159986724043, 59.3688913431606], [12.1269856711225, 59.3588914576085], [12.1220930232558, 59.3512520600623], [12.1169428676067, 59.3418101080388], [12.1164278520418, 59.3159734938656], [12.1067283922359, 59.2989779802234], [12.1008057132393, 59.2904802234023], [12.1079300952207, 59.2777335881707], [12.1105910089727, 59.2667465894525], [12.1187454220839, 59.2549012314594], [12.133080021974, 59.2412104010254], [12.1287882255997, 59.2299658945248], [12.1296465848746, 59.2199660089727], [12.1493888481963, 59.215416704816], [12.1680152444607, 59.215073361106], [12.1771138527742, 59.2069189479949], [12.1904184215345, 59.1986786989562], [12.2114482237686, 59.186532915217], [12.2214051913569, 59.1679923548801], [12.2309329793078, 59.1634430507233], [12.238744048709, 59.1752884087164], [12.226898690716, 59.1926272660685], [12.2157400201428, 59.2077773072697], [12.2011479124703, 59.2138716581212] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 209,
+         "id" : 96112,
+         "name" : "Vastra Silen",
+         "pfafstette" : 241,
+         "lke_type" : "N",
+         "altitude" : 140,
+         "objectid" : 50689,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 210,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [12.2129932704633, 59.3187202435451], [12.2282720655558, 59.3227116141732], [12.2433791887933, 59.3397071278154], [12.2621772569127, 59.346445248123], [12.275310153818, 59.3594923091009], [12.2698166544589, 59.3701359641091], [12.2580571323933, 59.3752432017945], [12.2475851492401, 59.379835423915], [12.2346239241897, 59.382839681377], [12.2158258560703, 59.3737410730635], [12.2042380058597, 59.3436555804798], [12.2129932704633, 59.3187202435451] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 210,
+         "id" : 96125,
+         "name" : "J?rnsjn",
+         "pfafstette" : 24281,
+         "lke_type" : "N",
+         "altitude" : 138,
+         "objectid" : 50729,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 2
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 211,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [9.353798525911, 59.3056731825673], [9.3396355978759, 59.3081195065006], [9.3186057956418, 59.3123683849112], [9.2991210401026, 59.322411188427], [9.2839280809376, 59.3345569721663], [9.2741427852042, 59.3436555804798], [9.2653875206006, 59.352797106757], [9.2580914667643, 59.36498580846], [9.2619540835012, 59.3850284975279], [9.2583489745468, 59.3974747070134], [9.2434135231643, 59.3938266800952], [9.2373191723128, 59.3837838765794], [9.2321690166636, 59.3752432017945], [9.2118259018495, 59.3792345724226], [9.1896802325581, 59.3862302005127], [9.1872768265885, 59.3756294634682], [9.2019547701886, 59.3630974180553], [9.2197228071782, 59.3491061618751], [9.2364608130379, 59.3342136284563], [9.2495078740158, 59.3342136284563], [9.256803927852, 59.3291063907709], [9.2688209577001, 59.3193210950375], [9.2792929408533, 59.3107804202527], [9.2768895348837, 59.2965316562901], [9.2876190258195, 59.2874759659403], [9.3303653177074, 59.2856304934994], [9.3689056491485, 59.2777335881707], [9.3857294909357, 59.2688495696759], [9.3975748489288, 59.2552016572056], [9.4137120032961, 59.235116050174], [9.4345701336752, 59.2312105154734], [9.4541407251419, 59.2285066837576], [9.471651254349, 59.2136141503388], [9.4944836110603, 59.19837827321], [9.5280454587072, 59.194043558872], [9.5267579197949, 59.1980778474638], [9.4961144936825, 59.2129703808826], [9.4792906518953, 59.2281633400476], [9.4538832173595, 59.2418112525178], [9.4252998535067, 59.26648908167], [9.4137120032961, 59.2773902444607], [9.3955147866691, 59.2840854468046], [9.3698498443509, 59.2989779802234], [9.353798525911, 59.3056731825673] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 211,
+         "id" : 96134,
+         "name" : "Nordsj",
+         "lge_id" : "no",
+         "pfafstette" : 173,
+         "lke_type" : "B",
+         "altitude" : 17,
+         "objectid" : 50752,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 212,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [10.8586740065922, 59.4336545504486], [10.850862937191, 59.4281610510895], [10.8352407983886, 59.4117663889398], [10.8239962918879, 59.3886765244461], [10.8474295000916, 59.3728827137887], [10.8729227705548, 59.3740414988097], [10.8817638710859, 59.3719385185863], [10.8876865500824, 59.3676896401758], [10.8945534242813, 59.3874748214613], [10.908458844534, 59.3847280717817], [10.9235659677715, 59.3670887886834], [10.9179866324849, 59.3850284975279], [10.9088021882439, 59.4111226194836], [10.9030511811024, 59.4257147271562], [10.8982443691632, 59.4397059833364], [10.8917208386742, 59.45580021974], [10.8838239333455, 59.4537401574803], [10.875240340597, 59.4394484755539], [10.8586740065922, 59.4336545504486] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 212,
+         "id" : 95776,
+         "name" : "Vannsj",
+         "lge_id" : "no",
+         "pfafstette" : 33,
+         "lke_type" : "B",
+         "altitude" : 33,
+         "objectid" : 50834,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 213,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [8.4426501556492, 59.3934833363853], [8.468057590185, 59.3874748214613], [8.4761261673686, 59.3874748214613], [8.461705731551, 59.3928824848929], [8.4475428035158, 59.3989768357444], [8.4033373008607, 59.4029682063725], [8.3569859000183, 59.4041699093573], [8.322479857169, 59.4108221937374], [8.2853987364952, 59.4151139901117], [8.2365580937557, 59.4239550906427], [8.1852282091192, 59.4318090780077], [8.1338124885552, 59.4370021516206], [8.0811950650064, 59.4488475096136], [8.0432555850577, 59.4545985167552], [8.0181056583043, 59.4497058688885], [8.0289209851676, 59.4439548617469], [8.0578476927303, 59.4448990569493], [8.0823967679912, 59.4427531587621], [8.1022248672404, 59.4375600851492], [8.1191345449551, 59.4317661600439], [8.1477179088079, 59.4248134499176], [8.1921809192456, 59.4154144158579], [8.2417082494049, 59.4074745925655], [8.3078877494964, 59.4001356207654], [8.3882301776232, 59.3944275315876], [8.4426501556492, 59.3934833363853] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 213,
+         "id" : 95789,
+         "name" : "Bandak",
+         "lge_id" : "no",
+         "pfafstette" : 2333,
+         "lke_type" : "B",
+         "altitude" : 74,
+         "objectid" : 50850,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 214,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [6.9720232100348, 59.3862302005127], [6.967817249588, 59.3853289232741], [6.9626670939388, 59.3843847280718], [6.9456715802967, 59.398375984252], [6.9340837300861, 59.4181182475737], [6.9183757553562, 59.4275601995971], [6.8991485075993, 59.4366588079106], [6.882839681377, 59.4409076863212], [6.870822651529, 59.4351995971434], [6.8776036898004, 59.4309078007691], [6.8796637520601, 59.4242125984252], [6.859148965391, 59.4174744781176], [6.83494323384, 59.4129680919246], [6.8353724134774, 59.3992772614906], [6.8508228804248, 59.3919812076543], [6.8644707928951, 59.3874748214613], [6.8611231917231, 59.3774320179454], [6.8715093389489, 59.3707368156015], [6.8933116645303, 59.3621961408167], [6.9028394524812, 59.3549430049441], [6.9101355063175, 59.340951748764], [6.9161440212415, 59.3208661417323], [6.9326245193188, 59.3126688106574], [6.9571735945798, 59.3233124656656], [6.9733107489471, 59.3612948635781], [6.9720232100348, 59.3862302005127] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 214,
+         "id" : 95744,
+         "name" : "Blsj",
+         "lge_id" : "no",
+         "pfafstette" : 53,
+         "lke_type" : "B",
+         "altitude" : 1121,
+         "objectid" : 51118,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 215,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [6.8647283006775, 59.16099672679], [6.8447285295733, 59.1515976927303], [6.8426684673137, 59.1461041933712], [6.8563163797839, 59.1497093023256], [6.8836980406519, 59.1455033418788], [6.898204312397, 59.1485505173045], [6.9106505218824, 59.1643014099982], [6.94043558872, 59.1737862799853], [6.9601778520418, 59.1789793535982], [6.9806926387109, 59.186532915217], [7.004040010987, 59.199880401941], [7.0307349844351, 59.215073361106], [7.04661463102, 59.2244723951657], [7.0305633125801, 59.2260603598242], [7.0144261582128, 59.2209102041751], [6.9997482146127, 59.2196655832265], [6.9870444973448, 59.2138716581212], [6.9818085057682, 59.202884659403], [6.964469648416, 59.2020263001282], [6.9462724317891, 59.2095798617469], [6.9346845815785, 59.2093652719282], [6.9308219648416, 59.1962752929866], [6.9265301684673, 59.1877346182018], [6.9164873649515, 59.180181056583], [6.9079896081304, 59.1761467679912], [6.8940841878777, 59.179193943417], [6.8814663065373, 59.1703957608497], [6.8647283006775, 59.16099672679] ],
+            [ [6.961465390954, 59.1843870170298], [6.9508217359458, 59.1877346182018], [6.9617228987365, 59.1929276918147], [6.9724523896722, 59.1895800906427], [6.961465390954, 59.1843870170298] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 215,
+         "id" : 96874,
+         "name" : "Svartevatnet",
+         "lge_id" : "no",
+         "pfafstette" : 793,
+         "lke_type" : "B",
+         "altitude" : 1227,
+         "objectid" : 51224,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 216,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [16.8535410181286, 59.0525001144479], [16.8611804156748, 59.050654642007], [16.875, 59.0494100210584], [16.881008514924, 59.0488520875298], [16.8925963651346, 59.0497962827321], [16.9030683482879, 59.0543455868889], [16.9183471433803, 59.0439594396631], [16.9211797289874, 59.0269639260209], [16.9131969877312, 59.0169640404688], [16.8955147866691, 59.0166206967588], [16.8828110694012, 59.0145177165354], [16.875, 59.013916865043], [16.8633263138619, 59.012929751877], [16.8149148507599, 59.0294102499542], [16.7851297839224, 59.0431010803882], [16.7648725050357, 59.0549464383813], [16.7384350393701, 59.0621995742538], [16.7234995879876, 59.0567489928585], [16.7180060886285, 59.0509550677532], [16.7369758286028, 59.0406547564549], [16.7524262955503, 59.0351612570958], [16.7731127540744, 59.0294102499542], [16.7955159311482, 59.0278222852957], [16.8079621406336, 59.0282085469694], [16.8186057956418, 59.0205691494232], [16.8332837392419, 59.0151614859916], [16.8532835103461, 59.0102688381249], [16.8556869163157, 59.0010843938839], [16.8559444240982, 58.980698361106], [16.871824070683, 58.9676513001282], [16.875, 58.970526803699], [16.8879612250504, 58.9822863257645], [16.9045275590551, 58.9984663980956], [16.9283899468962, 59.0062774674968], [16.9460721479582, 59.0127151620582], [16.9602350759934, 59.0172215482512], [16.9738829884636, 59.0241742583776], [16.9872733931514, 59.0312128044314], [17.0044405786486, 59.0235734068852], [17.0222086156382, 59.016921122505], [17.0531953854605, 59.0153760758103], [17.0874439205274, 59.0059770417506], [17.1062419886468, 58.991384934078], [17.1159414484527, 58.9923291292804], [17.1074436916316, 59.0053761902582], [17.095855841421, 59.0133160135506], [17.0770577733016, 59.0245605200513], [17.0593755722395, 59.0370067295367], [17.0490752609412, 59.0415560336935], [17.0390324574254, 59.0485945797473], [17.0278737868522, 59.0546460126351], [17.0044405786486, 59.0588519730819], [17.0014363211866, 59.0625], [16.9952561344076, 59.0700535616188], [16.983668284197, 59.0779933849112], [16.9726812854788, 59.0755470609778], [16.9683036531771, 59.0667917963743], [16.9661577549899, 59.0625], [16.9640118568028, 59.0582511215895], [16.9724237776964, 59.0564056491485], [16.9903634865409, 59.0582511215895], [17.0119941402673, 59.0531009659403], [17.0227236312031, 59.0418564594397], [17.0083031953855, 59.0363629600806], [16.9700203717268, 59.0445602911555], [16.9440979216261, 59.0551610282], [16.9313942043582, 59.0615987227614], [16.9216089086248, 59.0625], [16.9083043398645, 59.0637446209485], [16.8913946621498, 59.0664913706281], [16.875, 59.07018231551], [16.8712232191906, 59.0710406747848], [16.8538843618385, 59.0813839040469], [16.8422965116279, 59.0901391686504], [16.8371463559788, 59.0758904046878], [16.8461591283648, 59.0625], [16.848133354697, 59.0594528245743], [16.8535410181286, 59.0525001144479] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 216,
+         "id" : 96996,
+         "name" : "Baven",
+         "pfafstette" : 435,
+         "lke_type" : "N",
+         "altitude" : 31,
+         "objectid" : 51231,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 217,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [8.9270222944516, 59.3138705136422], [8.9161211316609, 59.3172610327779], [8.8726023164256, 59.3139134316059], [8.8313152353049, 59.3211665674785], [8.8170664713423, 59.3333123512177], [8.8082253708112, 59.3324110739791], [8.7714875938473, 59.3248145943966], [8.7280546145395, 59.3166601812855], [8.7213594121956, 59.3065744598059], [8.743161737777, 59.3078190807544], [8.7729468046145, 59.3130121543673], [8.8090837300861, 59.3078190807544], [8.8449631477751, 59.3032268586339], [8.8772374565098, 59.3075186550082], [8.9070225233474, 59.3108662561802], [8.9270222944516, 59.3138705136422] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 217,
+         "id" : 96462,
+         "name" : "Flvatn",
+         "lge_id" : "no",
+         "pfafstette" : 2155,
+         "lke_type" : "B",
+         "altitude" : 605,
+         "objectid" : 51287,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 218,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [8.4890015564915, 59.0305690349753], [8.5059112342062, 59.0454615683941], [8.5115764054203, 59.0625], [8.5121772569127, 59.0643454724409], [8.5236792711958, 59.0779933849112], [8.5364688243911, 59.1029287218458], [8.5216192089361, 59.1257181605933], [8.5112330617103, 59.1464475370811], [8.5066837575536, 59.1673485854239], [8.5075421168284, 59.1832282320088], [8.5138939754624, 59.199880401941], [8.503937007874, 59.2105240569493], [8.4930358450833, 59.2220689891961], [8.5027353048892, 59.2397511902582], [8.5192158029665, 59.2609955823109], [8.5210183574437, 59.2780340139169], [8.522477568211, 59.2858880012818], [8.5309753250321, 59.2971325077825], [8.5124347646951, 59.3199648644937], [8.4822205182201, 59.3279046877861], [8.4742377769639, 59.3126258926936], [8.4871131660868, 59.3047719053287], [8.4924349935909, 59.2962741485076], [8.479731276323, 59.2907806491485], [8.4693451290972, 59.2887205868888], [8.4761261673686, 59.2752872642373], [8.4790445889031, 59.2630556445706], [8.4626499267533, 59.2582488326314], [8.45286463102, 59.2415108267717], [8.4553538729171, 59.2226698406885], [8.4629074345358, 59.1917259888299], [8.4704609961546, 59.1606963010438], [8.46754257462, 59.1503959897455], [8.4687442776048, 59.1397094167735], [8.4741519410364, 59.1333146401758], [8.4872848379418, 59.1123706738693], [8.5031644845266, 59.0910833638528], [8.4906324391137, 59.0822851812855], [8.4716626991394, 59.0706973310749], [8.468057590185, 59.0625], [8.4644524812305, 59.0543455868889], [8.4732935817616, 59.0370067295367], [8.4890015564915, 59.0305690349753] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 218,
+         "id" : 96502,
+         "name" : "Nisser",
+         "lge_id" : "no",
+         "pfafstette" : 7731,
+         "lke_type" : "B",
+         "altitude" : 246,
+         "objectid" : 51381,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 219,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [12.3644078465483, 59.2482489470793], [12.344579747299, 59.2406095495331], [12.341575489837, 59.2327126442044], [12.3488715436733, 59.2267041292803], [12.3397729353598, 59.2230131843985], [12.3220048983703, 59.2184638802417], [12.3027776506135, 59.2172192592932], [12.2939365500824, 59.2455021973997], [12.2907606207654, 59.2652444607215], [12.2756534975279, 59.2618968595495], [12.2698166544589, 59.2521973997436], [12.2780569034975, 59.2403091237869], [12.2826062076543, 59.2303092382347], [12.2747093023256, 59.2157171305622], [12.2612330617103, 59.2117257599341], [12.2522202893243, 59.2050734755539], [12.2446667277056, 59.1953310977843], [12.2438942043582, 59.1874341924556], [12.2546236952939, 59.1879921259842], [12.2731642556308, 59.1928847738509], [12.290503112983, 59.1944727385094], [12.3120479307819, 59.1889792391503], [12.3276700695843, 59.171339956052], [12.3366828419703, 59.1524560520051], [12.3486140358909, 59.1597950238052], [12.3474123329061, 59.1934856253433], [12.3570259567845, 59.2086785845083], [12.3731631111518, 59.2147729353598], [12.3820042116829, 59.216918833547], [12.3895577733016, 59.250137337484], [12.3771115638162, 59.2822399743637], [12.3716180644571, 59.2667465894525], [12.3759956967588, 59.2521973997436], [12.3644078465483, 59.2482489470793] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 219,
+         "id" : 96719,
+         "name" : "Ostra Silen",
+         "pfafstette" : 2421,
+         "lke_type" : "N",
+         "altitude" : 108,
+         "objectid" : 51523,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 220,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [13.7180404229995, 59.5020228666911], [13.726967359458, 59.4859286302875], [13.7406152719282, 59.4840831578465], [13.7512589269365, 59.5008211637063], [13.7479113257645, 59.5184604468046], [13.7248214612708, 59.5245547976561], [13.7111735488006, 59.5276019730819], [13.7032766434719, 59.5354130424831], [13.6879978483794, 59.5512926890679], [13.6655088353781, 59.5563999267533], [13.6420756271745, 59.5512926890679], [13.6260243087347, 59.5318079335287], [13.6296294176891, 59.5078167917964], [13.647998306171, 59.507215940304], [13.6472257828237, 59.5192758881157], [13.6445648690716, 59.5329667185497], [13.6619037264237, 59.5370010071416], [13.6822468412379, 59.5288036760667], [13.6980406518953, 59.5211642785204], [13.7123752517854, 59.5160141228713], [13.7180404229995, 59.5020228666911] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 220,
+         "id" : 95055,
+         "pfafstette" : 93215,
+         "lke_type" : "N",
+         "altitude" : 73,
+         "objectid" : 51626,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_51626",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 221,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [12.5090413843619, 59.519061298297], [12.5029470335104, 59.5245547976561], [12.48998580846, 59.5287607581029], [12.4743636696576, 59.5323658670573], [12.4558231093207, 59.5293616095953], [12.4280122688152, 59.5227093252152], [12.4135918329976, 59.5348551089544], [12.4020898187145, 59.5424086705732], [12.3889569218092, 59.5296620353415], [12.3896436092291, 59.5135677989379], [12.4099008881157, 59.5041687648782], [12.4269822376854, 59.4962289415858], [12.4433768998352, 59.492022981139], [12.4613166086797, 59.4823235213331], [12.4737628181652, 59.4697914759202], [12.4870673869255, 59.4627958478301], [12.496337667094, 59.4679460034792], [12.507839681377, 59.481336408167], [12.5249210309467, 59.4849844350852], [12.5254360465116, 59.5023232924373], [12.5090413843619, 59.519061298297] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 221,
+         "id" : 95301,
+         "name" : "Stora Gla",
+         "pfafstette" : 4525,
+         "lke_type" : "N",
+         "altitude" : 147,
+         "objectid" : 51685,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 222,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.3387200146493, 59.3731831395349], [14.3545138253067, 59.3716380928401], [14.3661875114448, 59.3722389443325], [14.380178767625, 59.3737839910273], [14.389191540011, 59.3846422358542], [14.3999210309467, 59.3986764099982], [14.4128822559971, 59.4050282686321], [14.4205216535433, 59.4215087667094], [14.4126247482146, 59.4424527330159], [14.3981184764695, 59.4330107809925], [14.386015610694, 59.4135689434169], [14.3691917689068, 59.3992772614906], [14.3573464109138, 59.3938266800952], [14.3573464109138, 59.401380241714], [14.3730543856437, 59.4093200650064], [14.3846422358543, 59.4168736266252], [14.36498580846, 59.4202212277971], [14.3372608038821, 59.4166161188427], [14.3250721021791, 59.4187190990661], [14.3114241897089, 59.4223671259843], [14.2989779802234, 59.4342124839773], [14.2964887383263, 59.4564439891961], [14.3108233382165, 59.4658859412196], [14.3256729536715, 59.4795767716535], [14.3034414484527, 59.505370467863], [14.277347326497, 59.5086751510712], [14.2646436092291, 59.4780317249588], [14.2479056033694, 59.4570448406885], [14.2385494872734, 59.4658430232558], [14.22876419154, 59.4661863669658], [14.2233565281084, 59.4515513413294], [14.2339143471892, 59.4448990569493], [14.249793993774, 59.4294056720381], [14.2607809924922, 59.4178607397912], [14.2795790606116, 59.4275601995971], [14.2944286760667, 59.4269593481047], [14.2917677623146, 59.4123672404322], [14.3093641274492, 59.4041699093573], [14.3296214063358, 59.3913803561619], [14.3387200146493, 59.3731831395349] ],
+            [ [14.2810382713789, 59.4904779344442], [14.2764889672221, 59.4956280900934], [14.2834416773485, 59.4949843206372], [14.2810382713789, 59.4904779344442] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 222,
+         "id" : 95219,
+         "name" : "Ullvettern",
+         "pfafstette" : 86333,
+         "lke_type" : "N",
+         "altitude" : 138,
+         "objectid" : 51844,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 223,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [5.5644856711225, 59.4685897729354], [5.579764466215, 59.481336408167], [5.5922106757004, 59.4731390770921], [5.6015667917964, 59.4594911646219], [5.6140130012818, 59.4603924418605], [5.6177039461637, 59.4825381111518], [5.6235407892327, 59.4986752655191], [5.625, 59.5000486403589], [5.6296351400842, 59.5043833546969], [5.6252575077825, 59.5105206235122], [5.625, 59.5104777055484], [5.5991633858268, 59.5089755768174], [5.5715242171763, 59.5050271241531], [5.561738921443, 59.4919371452115], [5.5480910089727, 59.4816368339132], [5.5304946438381, 59.4670447262406], [5.5141858176158, 59.4554997939938], [5.48912172679, 59.4633966993225], [5.4699803149606, 59.4691906244278], [5.4639718000366, 59.4612937190991], [5.4819115088812, 59.4464011856803], [5.5104948727339, 59.4381609366416], [5.5292929408533, 59.4412081120674], [5.5419966581212, 59.4506929820546], [5.5535845083318, 59.4573452664347], [5.5644856711225, 59.4685897729354] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 223,
+         "line::hidden" : [
+            { "contour" : 0, "segments" : [ { "from" : 9, "to" : 10 } ] }
+         ],
+         "id" : 95220,
+         "pfafstette" : 1,
+         "altitude" : 0,
+         "objectid" : 51845,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_51845",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 224,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [9.2278772202893, 59.0497533647684], [9.2124267533419, 59.0540022431789], [9.1962895989746, 59.0373071552829], [9.2116542299945, 59.0123289003845], [9.2274480406519, 59.0007839681377], [9.2136284563267, 58.996234663981], [9.1999805438564, 58.9910845083318], [9.2249587987548, 58.9889386101447], [9.2615249038638, 58.9883377586523], [9.2647008331807, 58.9996251831167], [9.2480486632485, 59.0072216626992], [9.2280488921443, 59.0086808734664], [9.2192077916133, 59.0229725553928], [9.2258171580297, 59.033959554111], [9.2553447170848, 59.0373071552829], [9.2945717359458, 59.0312557223952], [9.3137131477751, 59.0200112158945], [9.3313095129097, 59.0133160135506], [9.3489058780443, 59.0081229399377], [9.3620387749496, 59.0023290148325], [9.3696781724959, 59.005075764512], [9.3584336659952, 59.0153760758103], [9.3486483702619, 59.0263630745285], [9.3343996062992, 59.0312128044314], [9.3162023896722, 59.0388092840139], [9.3073612891412, 59.0482083180736], [9.293370032961, 59.0437019318806], [9.256803927852, 59.0412556079473], [9.2278772202893, 59.0497533647684] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 224,
+         "id" : 98261,
+         "name" : "Tokke",
+         "lge_id" : "no",
+         "pfafstette" : 15,
+         "lke_type" : "B",
+         "altitude" : 140,
+         "objectid" : 51940,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 225,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [16.672169703351, 58.8202710126351], [16.6557750412013, 58.8245198910456], [16.6353460904596, 58.8372665262772], [16.6283933803333, 58.8552491530855], [16.6228998809742, 58.867695362571], [16.6059902032595, 58.8788969511079], [16.5986083134957, 58.8901414576085], [16.599895852408, 58.9013859641091], [16.5682223951657, 58.9102270646402], [16.5271928218275, 58.9105274903864], [16.5034162699139, 58.9126733885735], [16.4836740065922, 58.9181668879326], [16.4736312030764, 58.9117291933712], [16.4919142556308, 58.8972229216261], [16.524446072148, 58.8801415720564], [16.5435874839773, 58.8713433894891], [16.563329747299, 58.86584989013], [16.5779218549716, 58.8555495788317], [16.5595529664897, 58.8498414896539], [16.5621280443142, 58.8366656747849], [16.5858187603003, 58.823618613807], [16.6031576176525, 58.8172238372093], [16.6317409815052, 58.811773255814], [16.6621268998352, 58.8074814594397], [16.6892510529207, 58.8044342840139], [16.7041006683758, 58.796580296649], [16.7259888298846, 58.7929322697308], [16.7408384453397, 58.7974815738876], [16.7253879783922, 58.8023742217543], [16.7089933162425, 58.8074814594397], [16.6909677714704, 58.8142195797473], [16.672169703351, 58.8202710126351] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 225,
+         "id" : 98237,
+         "name" : "Yngaren",
+         "pfafstette" : 535,
+         "lke_type" : "N",
+         "altitude" : 21,
+         "objectid" : 52119,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 226,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [16.8535410181286, 58.8603563907709], [16.8654722120491, 58.8579959027651], [16.8744849844351, 58.8694979170482], [16.8712232191906, 58.8791973768541], [16.8524251510712, 58.8758497756821], [16.8289919428676, 58.8731888619301], [16.8030694927669, 58.8788969511079], [16.7726835744369, 58.8834891732284], [16.745130241714, 58.8807424235488], [16.7350874381981, 58.8731888619301], [16.7251304706098, 58.8707425379967], [16.7129417689068, 58.8697983427944], [16.73877838308, 58.85851091833], [16.7676192547153, 58.8424166819264], [16.7714818714521, 58.8315584370994], [16.7867606665446, 58.8297129646585], [16.8007519227248, 58.83580731551], [16.7787779252884, 58.8531032548984], [16.7696793169749, 58.8682962140634], [16.7968034700604, 58.8674378547885], [16.8119964292254, 58.8652490386376], [16.8301936458524, 58.8661503158762], [16.8535410181286, 58.8603563907709] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 226,
+         "id" : 98363,
+         "pfafstette" : 33,
+         "lke_type" : "N",
+         "altitude" : 33,
+         "objectid" : 52141,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_52141",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 227,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [15.9822205182201, 58.9364070225234], [15.9995593755723, 58.9312139489105], [16.0195591466764, 58.9270079884637], [16.0317478483794, 58.92662172679], [16.0500309009339, 58.9260208752976], [16.0633354696942, 58.9278663477385], [16.040331441128, 58.9400550494415], [16.0007610785571, 58.952501258927], [15.9877140175792, 58.9634024217176], [15.9699459805896, 58.9670504486358], [15.9148393151438, 58.9804837712873], [15.8886593572606, 58.9804837712873], [15.8867709668559, 58.953660043948], [15.87707150705, 58.9321152261491], [15.8901185680278, 58.9258062854789], [15.9172427211134, 58.9275659219923], [15.9342382347556, 58.9306130974181], [15.9238520875298, 58.935806171031], [15.9025647775133, 58.9342182063725], [15.888916865043, 58.9352053195386], [15.9083157846548, 58.9424584554111], [15.9405900933895, 58.9433597326497], [15.9635941219557, 58.9406129829702], [15.9822205182201, 58.9364070225234] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 227,
+         "id" : 97839,
+         "name" : "Tisnaren",
+         "pfafstette" : 911,
+         "lke_type" : "N",
+         "altitude" : 46,
+         "objectid" : 52268,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 228,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.5430095220656, 59.0661480269181], [14.5479021699323, 59.0625], [14.5643826680095, 59.0503542162608], [14.5803481505219, 59.0403543307087], [14.600862937191, 59.0409551822011], [14.6145108496612, 59.046148255814], [14.6272145669291, 59.0582511215895], [14.630905511811, 59.0625], [14.6457551272661, 59.0795384316059], [14.6414633308918, 59.0931863440762], [14.6262703717268, 59.0819847555393], [14.6182017945431, 59.0719848699872], [14.5986312030764, 59.0722852957334], [14.5780305804798, 59.0755470609778], [14.5682452847464, 59.0798388573521], [14.5517647866691, 59.0861907159861], [14.5366576634316, 59.0831864585241], [14.5430095220656, 59.0661480269181] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 228,
+         "id" : 97539,
+         "name" : "Toften",
+         "pfafstette" : 9797,
+         "lke_type" : "N",
+         "altitude" : 76,
+         "objectid" : 52288,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 229,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [7.7857478026003, 58.7464521149973], [7.7917563175243, 58.7303578785937], [7.7876361930049, 58.7157228529573], [7.7787950924739, 58.7056800494415], [7.7805118110236, 58.69224672679], [7.7920996612342, 58.6844356573888], [7.8010265976927, 58.6777404550449], [7.8088376670939, 58.6801867789782], [7.811498580846, 58.6928904962461], [7.8168204083501, 58.7047787722029], [7.8261765244461, 58.7193708798755], [7.8218847280718, 58.7333621360557], [7.8313266800952, 58.7464521149973], [7.8501247482146, 58.7591558322652], [7.8529573338217, 58.7728466626992], [7.8412836476836, 58.7825890404688], [7.8243739699689, 58.7953356757004], [7.8045458707197, 58.8035759247391], [7.7939880516389, 58.8209147820912], [7.7866061618751, 58.8424595998901], [7.7729582494049, 58.852159059696], [7.7619712506867, 58.8610430781908], [7.7468641274492, 58.8674378547885], [7.7307269730819, 58.8746480726973], [7.7246326222304, 58.8886822468412], [7.7325295275591, 58.9023301593115], [7.7402547610328, 58.9184673136788], [7.7302119575169, 58.9376087255082], [7.7121864127449, 58.9500978529573], [7.7024011170115, 58.9570505630837], [7.6997402032595, 58.9458060565831], [7.7082379600806, 58.9323727339315], [7.7104696941952, 58.9109137520601], [7.705834554111, 58.8862359229079], [7.7125297564549, 58.8743905649149], [7.7341604101813, 58.8637898278704], [7.7556193920527, 58.8543049578832], [7.7651471800037, 58.8397128502106], [7.7702973356528, 58.8139191540011], [7.7870353415126, 58.796580296649], [7.8030866599524, 58.7852928721846], [7.8200821735946, 58.7746492171763], [7.8359618201795, 58.7692415537447], [7.808322651529, 58.7579541292804], [7.7857478026003, 58.7464521149973] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 229,
+         "id" : 98864,
+         "name" : "Byglandsfjorden",
+         "lge_id" : "no",
+         "pfafstette" : 31335,
+         "lke_type" : "B",
+         "altitude" : 204,
+         "objectid" : 52797,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 230,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [8.2550128181652, 59.0357621085882], [8.2662573246658, 59.0402684947812], [8.2631672312763, 59.0485087438198], [8.2582745834096, 59.0588519730819], [8.2577595678447, 59.0625], [8.2559570133675, 59.0740878502106], [8.2529527559055, 59.0834868842703], [8.2307212506867, 59.089538317158], [8.1933826222304, 59.1026712140634], [8.1665159769273, 59.113915720564], [8.153211408167, 59.1208684306903], [8.1379326130745, 59.1303103827138], [8.1237696850394, 59.1391514832448], [8.1013665079656, 59.1500097280718], [8.0846285021058, 59.1658464566929], [8.0872894158579, 59.1825415445889], [8.0783624793994, 59.19837827321], [8.0614528016847, 59.2059318348288], [8.0561309741806, 59.1940864768357], [8.0497791155466, 59.1837861655374], [8.0422255539279, 59.1758892602087], [8.0462598425197, 59.1671339956052], [8.0529550448636, 59.156146996887], [8.062396996887, 59.1437007874016], [8.0724398004029, 59.1336579838857], [8.0841993224684, 59.1248168833547], [8.1115809833364, 59.119924235488], [8.132009934078, 59.1096239241897], [8.1523530488922, 59.0896241530855], [8.1845415216993, 59.0749462094854], [8.2058288317158, 59.0655471754257], [8.210978987365, 59.0625], [8.2237685405603, 59.0549464383813], [8.238017304523, 59.0451611426479], [8.2550128181652, 59.0357621085882] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 230,
+         "id" : 97225,
+         "name" : "Fyresvatnet",
+         "lge_id" : "no",
+         "pfafstette" : 6191,
+         "lke_type" : "B",
+         "altitude" : 278,
+         "objectid" : 52902,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 231,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [7.1262703717268, 59.0631008514924], [7.1266995513642, 59.0625], [7.1319355429409, 59.0551610282], [7.1566562900568, 59.0531009659403], [7.1769994048709, 59.0598390862479], [7.182664576085, 59.0625], [7.1879005676616, 59.0649463239333], [7.1976000274675, 59.0728861472258], [7.2039518861015, 59.0792380058597], [7.2145955411097, 59.0886370399194], [7.2018918238418, 59.0944309650247], [7.200690120857, 59.1114693966306], [7.2033510346091, 59.1339584096319], [7.1882439113716, 59.13794978026], [7.1790594671306, 59.140954037722], [7.1630081486907, 59.1433145257279], [7.1556262589269, 59.1385077137887], [7.149274400293, 59.1230572468412], [7.142922541659, 59.1016841008973], [7.137257370445, 59.0867915674785], [7.1295321369713, 59.0765341741439], [7.1262703717268, 59.0631008514924] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 231,
+         "line::hidden" : [
+            { "contour" : 0, "segments" : [ { "from" : 0, "to" : 1 } ] }
+         ],
+         "id" : 97509,
+         "name" : "Rosskreppfjorden",
+         "lge_id" : "no",
+         "pfafstette" : 7913,
+         "lke_type" : "B",
+         "altitude" : 923,
+         "objectid" : 52950,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 232,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [15.4484927211134, 59.0518992629555], [15.4221410913752, 59.0370067295367], [15.3984503753891, 59.0299681834829], [15.4093515381798, 59.0233158991027], [15.4351023164256, 59.0218137703717], [15.4944149423183, 59.0218137703717], [15.5409380150156, 59.0278222852957], [15.5363887108588, 59.0418564594397], [15.5384487731185, 59.0500537905146], [15.5485774125618, 59.0582511215895], [15.5474615455045, 59.0625], [15.5457448269548, 59.0692381203076], [15.5317535707746, 59.0743882759568], [15.5183631660868, 59.0667917963743], [15.5126121589453, 59.0625], [15.5043719099066, 59.0564056491485], [15.4739859915766, 59.0585944652994], [15.4484927211134, 59.0518992629555] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 232,
+         "id" : 97457,
+         "name" : "Sottern",
+         "pfafstette" : 677,
+         "lke_type" : "N",
+         "altitude" : 73,
+         "objectid" : 53119,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 233,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [9.9547358542392, 59.1339154916682], [9.9365386376122, 59.1433145257279], [9.9172255539279, 59.1534002472075], [9.9067535707746, 59.1734858542392], [9.8865821278154, 59.2035713468229], [9.8576554202527, 59.2224123329061], [9.8452092107673, 59.2209102041751], [9.8601446621498, 59.2123266114265], [9.8821186595862, 59.2001808276872], [9.8926764786669, 59.171339956052], [9.904350164805, 59.1449024903864], [9.91919978026, 59.1403102682659], [9.937396996887, 59.1363618156015], [9.94958569859, 59.1248168833547], [9.9645211499725, 59.1129286073979], [9.9897569126534, 59.0886370399194], [10.0106150430324, 59.0670922221205], [10.0194561435635, 59.0749462094854], [10.0131042849295, 59.0953322422633], [9.9999713880242, 59.1084222212049], [9.9905294360007, 59.1200100714155], [9.9747356253433, 59.1284649102728], [9.9547358542392, 59.1339154916682] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 233,
+         "id" : 97215,
+         "name" : "Farris",
+         "lge_id" : "no",
+         "pfafstette" : 1,
+         "lke_type" : "B",
+         "altitude" : 25,
+         "objectid" : 53243,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 234,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [6.6672198315327, 58.4476572514192], [6.677520142831, 58.4464126304706], [6.6851595403772, 58.4682578740158], [6.6860178996521, 58.4950816013551], [6.6909105475188, 58.5159826496979], [6.7037859366416, 58.5357678309833], [6.7131420527376, 58.5740935726058], [6.7133995605201, 58.6105309238235], [6.7140862479399, 58.6475691265336], [6.7082494048709, 58.6704014832448], [6.698893288775, 58.6628479216261], [6.6994941402674, 58.6281702069218], [6.6980349295001, 58.5963250778246], [6.6965757187328, 58.5750377678081], [6.6937431331258, 58.5492011536349], [6.6900521882439, 58.5343086202161], [6.6843011811024, 58.5221199185131], [6.6778634865409, 58.5001888390405], [6.6703099249222, 58.47254967039], [6.6672198315327, 58.4476572514192] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 234,
+         "id" : 100335,
+         "name" : "Sirdalsvatnet",
+         "lge_id" : "no",
+         "pfafstette" : 313,
+         "lke_type" : "B",
+         "altitude" : 392,
+         "objectid" : 54185,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 235,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.5473871543673, 58.8372665262772], [14.5415503112983, 58.8528028291522], [14.525413156931, 58.8488972944516], [14.5196621497894, 58.8376527879509], [14.5214647042666, 58.8239190395532], [14.5135677989379, 58.8175242629555], [14.5049842061894, 58.8260649377404], [14.4919371452115, 58.8315584370994], [14.4770875297565, 58.8379102957334], [14.4636112891412, 58.8473093297931], [14.4189766068486, 58.8357643975462], [14.3715951748764, 58.823618613807], [14.3588914576085, 58.811773255814], [14.362153222853, 58.7905288637612], [14.3730543856437, 58.7801427165354], [14.3849855795642, 58.772202893243], [14.4001785387292, 58.7686407022523], [14.4211225050357, 58.7692415537447], [14.4409506042849, 58.7622030076909], [14.4519376030031, 58.7528039736312], [14.4460149240066, 58.7342634132943], [14.4387188701703, 58.7120319080755], [14.4519376030031, 58.7066242446438], [14.4670447262406, 58.7038774949643], [14.4800917872185, 58.6965385231643], [14.4941688793261, 58.7108302050907], [14.4990615271928, 58.7427611701154], [14.513224455228, 58.7658939525728], [14.5300482970152, 58.782889466215], [14.5351984526644, 58.8044342840139], [14.5415503112983, 58.8196272431789], [14.5473871543673, 58.8372665262772] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 235,
+         "id" : 99062,
+         "name" : "Unden",
+         "pfafstette" : 82271,
+         "lke_type" : "N",
+         "altitude" : 118,
+         "objectid" : 54529,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 236,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.7585435359824, 58.3531089772936], [14.7675563083684, 58.3448687282549], [14.7776849478118, 58.33667139718], [14.7938221021791, 58.3403194240982], [14.8083283739242, 58.3421648965391], [14.8472978850028, 58.3458129234572], [14.8750228895807, 58.3598041796374], [14.8681560153818, 58.3737954358176], [14.8481562442776, 58.3843961728621], [14.8232638253067, 58.3777009705182], [14.8044657571873, 58.3652547610328], [14.7922770554844, 58.3698040651895], [14.7715905969603, 58.3740958615638], [14.7512474821461, 58.3631517808094], [14.7585435359824, 58.3531089772936] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 236,
+         "id" : 101189,
+         "name" : "Takern",
+         "pfafstette" : 633,
+         "lke_type" : "N",
+         "altitude" : 93,
+         "objectid" : 55224,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 237,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [16.4287390130013, 58.2403634865409], [16.4487387841055, 58.2315653039736], [16.4602407983886, 58.2342691356894], [16.4417002380517, 58.2454707242263], [16.4183528657755, 58.2591615546603], [16.3958638527742, 58.2716077641458], [16.3813575810291, 58.2801484389306], [16.3726023164256, 58.2886891137154], [16.3515725141916, 58.2917362891412], [16.3356928676067, 58.2889895394617], [16.3208432521516, 58.2913929454312], [16.3035043947995, 58.2956418238418], [16.2968950283831, 58.2874874107306], [16.2859080296649, 58.2789467359458], [16.2439342611243, 58.2822943371178], [16.218612662516, 58.2789467359458], [16.248826908991, 58.2713502563633], [16.2900281541842, 58.2637966947446], [16.3156930965025, 58.2577023438931], [16.3305427119575, 58.264054202527], [16.379383354697, 58.256715230727], [16.4287390130013, 58.2403634865409] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 237,
+         "id" : 101293,
+         "name" : "Yxningen",
+         "pfafstette" : 53,
+         "lke_type" : "N",
+         "altitude" : 64,
+         "objectid" : 55231,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 238,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [6.5003547885003, 58.3172724775682], [6.5087667093939, 58.316972051822], [6.5338308002197, 58.3221651254349], [6.5515130012818, 58.3269719373741], [6.5664484526644, 58.3327658624794], [6.5766629280352, 58.3394181468596], [6.5833581303791, 58.3497184581579], [6.6086797289874, 58.3619500778246], [6.6225851492401, 58.3843961728621], [6.6211259384728, 58.4105332127816], [6.6135723768541, 58.4284729216261], [6.6037870811207, 58.4427646035525], [6.5903108405054, 58.4491593801502], [6.565675929317, 58.4555541567479], [6.5550322743087, 58.4504040010987], [6.5666201245193, 58.4345672724776], [6.5876499267533, 58.4044817798938], [6.5905683482879, 58.3740958615638], [6.5699677256913, 58.3564565784655], [6.54713536898, 58.3364138893975], [6.5193245284746, 58.324826039187], [6.5003547885003, 58.3172724775682] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 238,
+         "id" : 101088,
+         "name" : "Lundevatnet",
+         "lge_id" : "no",
+         "pfafstette" : 17,
+         "lke_type" : "R",
+         "altitude" : 210,
+         "objectid" : 55956,
+         "scalerank" : 12,
+         "featurecla" : "Reservoir",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 239,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [22.1760552096686, 57.1279298663249], [22.1872997161692, 57.131577893243], [22.1966558322651, 57.1549681834829], [22.203866050174, 57.1744529390222], [22.209359549533, 57.185997871269], [22.2058402765061, 57.201190830434], [22.1984583867423, 57.2123924189709], [22.2046385735213, 57.2227356482329], [22.2111621040102, 57.2303321278154], [22.2009476286394, 57.2349243499359], [22.1813770371727, 57.2419628959898], [22.16747161692, 57.2354822834646], [22.1570854696942, 57.219388047061], [22.134081441128, 57.2175854925838], [22.1124507874016, 57.2060405603369], [22.1106482329244, 57.1829077778795], [22.1262703717268, 57.1759121497894], [22.1479868613807, 57.1762554934994], [22.1514202984801, 57.1638092840139], [22.158115500824, 57.1507622230361], [22.1709050540194, 57.1379297518769], [22.1760552096686, 57.1279298663249] ],
+            [ [22.1702183665995, 57.1801610282], [22.1526220014649, 57.1777576222304], [22.1538237044497, 57.1862982970152], [22.1720209210767, 57.1932510071416], [22.1789736312031, 57.1893454724409], [22.1702183665995, 57.1801610282] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 239,
+         "id" : 103571,
+         "name" : "Lake Usmas",
+         "pfafstette" : 397,
+         "lke_type" : "N",
+         "altitude" : 21,
+         "objectid" : 56172,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 240,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [13.2858565281084, 57.6826445477019], [13.2932384178722, 57.6710137795276], [13.2843973173412, 57.6567650155649], [13.2785604742721, 57.6379669474455], [13.3019936824757, 57.6373231779894], [13.321821781725, 57.6518723676982], [13.3268861014466, 57.6707991897089], [13.3342679912104, 57.6883526368797], [13.3552119575169, 57.7005842565464], [13.3815635872551, 57.7038460217909], [13.3977007416224, 57.7242320545688], [13.39744323384, 57.7495107352133], [13.3977007416224, 57.7610127494964], [13.4054259750961, 57.7886948361106], [13.4042242721113, 57.8099392281633], [13.3892888207288, 57.795647546237], [13.3752975645486, 57.7650041201245], [13.3747825489837, 57.7473648370262], [13.3744392052738, 57.7352190532869], [13.348860098883, 57.7120862708295], [13.3296328511262, 57.6944469877312], [13.3271436092291, 57.6871938518586], [13.3108347830068, 57.6905414530306], [13.2920367148874, 57.6947903314411], [13.2858565281084, 57.6826445477019] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 240,
+         "id" : 103361,
+         "name" : "Asunden",
+         "pfafstette" : 931,
+         "lke_type" : "N",
+         "altitude" : 165,
+         "objectid" : 56203,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 241,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [23.0983622505036, 57.2960395303058], [23.0832551272661, 57.2884001327596], [23.0769032686321, 57.2823486998718], [23.0740706830251, 57.2701599981688], [23.0738990111701, 57.2625635185863], [23.0979330708661, 57.2613618156015], [23.1242847006043, 57.2522202893243], [23.1248855520967, 57.229731276323], [23.1254864035891, 57.2151391686504], [23.1462586980407, 57.2120919932247], [23.1632542116828, 57.2151391686504], [23.1522672129647, 57.2221777147043], [23.1421385735213, 57.2336368110236], [23.1454861746933, 57.249773965391], [23.1369884178722, 57.2686149514741], [23.1327824574254, 57.2929923548801], [23.1130401941036, 57.3157817936275], [23.0890061344076, 57.3190864768357], [23.0969030397363, 57.3087432475737], [23.0983622505036, 57.2960395303058] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 241,
+         "id" : 102901,
+         "name" : "Engures Ezers",
+         "pfafstette" : 3,
+         "lke_type" : "N",
+         "altitude" : -1,
+         "objectid" : 56627,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 242,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [15.2151048342794, 57.538225599707], [15.2267785204175, 57.5327750183117], [15.2385380424831, 57.5376247482146], [15.2177657480315, 57.5518735121773], [15.1916716260758, 57.5680106665446], [15.1749336202161, 57.5738045916499], [15.1486678264054, 57.5838473951657], [15.1302989379235, 57.5938901986816], [15.1208569859, 57.5868516526277], [15.1035181285479, 57.5889975508149], [15.0835183574437, 57.5889975508149], [15.0925311298297, 57.5768088491119], [15.1220586888848, 57.5595129097235], [15.1387108588171, 57.5525172816334], [15.1608565281084, 57.5561653085516], [15.1965642739425, 57.5486117469328], [15.2151048342794, 57.538225599707] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 242,
+         "id" : 103985,
+         "name" : "Solgen",
+         "pfafstette" : 935,
+         "lke_type" : "N",
+         "altitude" : 195,
+         "objectid" : 56763,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 243,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [23.6671111060245, 56.9134688015016], [23.6454804522981, 56.9049710446805], [23.6531198498444, 56.8939840459623], [23.6774972532503, 56.8945848974547], [23.6985270554843, 56.8991771195752], [23.7231619666728, 56.9019238692547], [23.7410158395898, 56.9098636925472], [23.7589555484344, 56.9134688015016], [23.8069378318989, 56.9271167139718], [23.8373237502289, 56.9453997665263], [23.8229891503388, 56.9481465162058], [23.794405786486, 56.941107970152], [23.7726034609046, 56.9356573887566], [23.7483118934261, 56.9314514283098], [23.7087415308552, 56.9247562259659], [23.6859091741439, 56.9192627266069], [23.6671111060245, 56.9134688015016] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 243,
+         "id" : 103989,
+         "name" : "Babites Ezers",
+         "pfafstette" : 121,
+         "lke_type" : "N",
+         "altitude" : -2,
+         "objectid" : 56767,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 244,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [12.4637200146493, 57.9990357764146], [12.4802005127266, 58.0065893380333], [12.4929042299945, 58.0202801684673], [12.4907583318074, 58.026674945065], [12.4886982695477, 58.0349151941037], [12.4977968778612, 58.0434129509248], [12.5069813221022, 58.0518677897821], [12.5434615912837, 58.0655586202161], [12.5727316425563, 58.0753439159495], [12.5588262223036, 58.0798932201062], [12.5376247482146, 58.0765456189343], [12.5177966489654, 58.0743997207471], [12.5029470335104, 58.0832408212782], [12.4865523713606, 58.0789919428676], [12.4692135140084, 58.046374290423], [12.4631191631569, 58.017833844534], [12.4607157571873, 58.0051301272661], [12.4637200146493, 57.9990357764146] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 244,
+         "id" : 102423,
+         "name" : "Anten",
+         "pfafstette" : 14217,
+         "lke_type" : "N",
+         "altitude" : 67,
+         "objectid" : 57227,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 245,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [12.3743648141366, 57.8519559146677], [12.3756523530489, 57.8574494140267], [12.3835492583776, 57.8723419474455], [12.4062957791613, 57.8747024354514], [12.4251796832082, 57.8804963605567], [12.4518746566563, 57.8901958203626], [12.4692135140084, 57.8992944286761], [12.4780546145395, 57.9050883537814], [12.4823464109138, 57.9163757782458], [12.4826897546237, 57.9312683116645], [12.4947926203992, 57.9345729948727], [12.5068096502472, 57.9409248535067], [12.5038912287127, 57.9494655282915], [12.4829472624062, 57.9479633995605], [12.4621749679546, 57.9394656427394], [12.441574345358, 57.9327275224318], [12.4343641274492, 57.9494655282915], [12.4364241897089, 57.971096182018], [12.4245788317158, 57.9719116233291], [12.4170252700971, 57.9613108862846], [12.4106734114631, 57.9528131294635], [12.4014031312946, 57.9415257049991], [12.3896436092291, 57.9294657571873], [12.3808883446255, 57.9224272111335], [12.3676696117927, 57.9150882393335], [12.3427771928218, 57.907491759751], [12.3308459989013, 57.8917408670573], [12.3236357809925, 57.870753982787], [12.3227774217176, 57.8586081990478], [12.3381420527376, 57.8619558002197], [12.3566826130745, 57.8622562259659], [12.3743648141366, 57.8519559146677] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 245,
+         "id" : 102775,
+         "name" : "Mjrn",
+         "pfafstette" : 1417,
+         "lke_type" : "N",
+         "altitude" : 58,
+         "objectid" : 57311,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 246,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.3449002014283, 57.2002466352317], [14.3508228804248, 57.2029933849112], [14.3566597234939, 57.2093452435451], [14.3652433162425, 57.2169417231276], [14.3758869712507, 57.2224352224867], [14.3874748214613, 57.2221347967405], [14.3947708752976, 57.2358256271745], [14.3898782274309, 57.2646664988098], [14.3791487364952, 57.2807607352133], [14.3715951748764, 57.2880997070134], [14.3679042299945, 57.3060394158579], [14.3537413019594, 57.3190864768357], [14.3339990386376, 57.3135929774767], [14.3212094854422, 57.3032926661784], [14.3123683849112, 57.2923485854239], [14.3236128914118, 57.2807607352133], [14.3364024446072, 57.2683145257279], [14.3330548434353, 57.2558683162425], [14.3299647500458, 57.243422106757], [14.3345140542025, 57.2309758972716], [14.3394067020692, 57.2172850668376], [14.3449002014283, 57.2002466352317] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 246,
+         "id" : 105174,
+         "name" : "Rusken",
+         "pfafstette" : 671,
+         "lke_type" : "N",
+         "altitude" : 181,
+         "objectid" : 57701,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 247,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [12.2016629280352, 57.4549647500458], [12.2132507782458, 57.4500721021791], [12.2273278703534, 57.4470249267533], [12.2461259384728, 57.4561664530306], [12.2793444424098, 57.4668101080388], [12.3169405786486, 57.4717027559055], [12.3549658945248, 57.4783979582494], [12.3950512726607, 57.4920887886834], [12.4072399743637, 57.5029899514741], [12.4194286760667, 57.5136336064823], [12.4358233382165, 57.5312728895807], [12.4272397454679, 57.5421740523714], [12.4123901300128, 57.5345346548251], [12.3994289049625, 57.5230755585058], [12.3796866416407, 57.5106293490203], [12.3251808276872, 57.4920887886834], [12.2652673503022, 57.4832047701886], [12.2397740798389, 57.4771962552646], [12.2184867698224, 57.468956006226], [12.1981436550083, 57.4637629326131], [12.1892167185497, 57.4565097967405], [12.2016629280352, 57.4549647500458] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 247,
+         "id" : 104502,
+         "name" : "Lygnern",
+         "pfafstette" : 531,
+         "lke_type" : "N",
+         "altitude" : 73,
+         "objectid" : 57932,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 248,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [25.4865752609412, 56.5865626716719], [25.5281198498444, 56.5802108130379], [25.5612525178539, 56.5780649148508], [25.5752437740341, 56.5777644891046], [25.6057155282915, 56.5841163477385], [25.6291487364951, 56.5899102728438], [25.6491485075993, 56.5942020692181], [25.6603930141, 56.6048457242263], [25.6445133675151, 56.6051032320088], [25.6169600347922, 56.5969488188976], [25.5920676158213, 56.5887514878227], [25.5622825489837, 56.5853180507233], [25.5437419886468, 56.5871635231643], [25.5221113349203, 56.5874639489105], [25.4955880333272, 56.59021069859], [25.4961888848196, 56.6042448727339], [25.4821976286394, 56.6230429408533], [25.4536142647867, 56.6406822239517], [25.4333569859, 56.6503816837576], [25.3929282640542, 56.6436864814137], [25.3573921900751, 56.6299956509797], [25.3472635506318, 56.6242875618019], [25.3299246932796, 56.614588101996], [25.2812557223952, 56.6039444469877], [25.2526723585424, 56.5954466901666], [25.2700112158945, 56.5860047381432], [25.300139626442, 56.59021069859], [25.3318130836843, 56.6045023805164], [25.3593664164073, 56.6209828785937], [25.3774777971068, 56.6306823383996], [25.4044302783373, 56.6379354742721], [25.4463182109504, 56.6318411234206], [25.4767899652078, 56.6185365546603], [25.4905237136056, 56.6108971571141], [25.484601034609, 56.5987513733748], [25.4865752609412, 56.5865626716719] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 248,
+         "id" : 104512,
+         "name" : "Pljavinjas",
+         "pfafstette" : 1791,
+         "lke_type" : "N",
+         "altitude" : 72,
+         "objectid" : 57968,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 249,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [29.0774354513825, 55.8635237364951], [29.0824997711042, 55.888759499176], [29.0864482237686, 55.9100468091925], [29.0949459805896, 55.9255401941036], [29.0837873100165, 55.9507330388207], [29.065847601172, 55.9528789370079], [29.0637017029848, 55.9337375251785], [29.0627575077825, 55.9224930186779], [29.0544314228163, 55.9112485121773], [29.0541739150339, 55.8939096548251], [29.050311298297, 55.8875148782274], [29.038122596594, 55.8817209531221], [29.0405260025636, 55.8698755951291], [29.0581223676982, 55.861377838308], [29.0774354513825, 55.8635237364951] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 249,
+         "id" : 105234,
+         "pfafstette" : 4653,
+         "lke_type" : "N",
+         "altitude" : 143,
+         "objectid" : 58190,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_58190",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 250,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.994163156931, 57.1814056491485], [14.987811298297, 57.164968069035], [14.9774251510712, 57.1558694607215], [14.9890130012818, 57.1361271973998], [14.9990558047977, 57.1179299807728], [15.0074677256913, 57.1121360556675], [15.0199139351767, 57.0944967725691], [15.0303000824025, 57.0793038134041], [15.0409437374107, 57.0735098882989], [15.0505573612892, 57.0741107397913], [15.0433471433803, 57.0859560977843], [15.0248065830434, 57.1199900430324], [15.0214589818715, 57.1626075810291], [15.0159654825124, 57.1887446209486], [14.9931331258011, 57.205697216627], [14.9684982146127, 57.2084439663065], [14.9490992950009, 57.2105898644937], [14.9406873741073, 57.2084868842703], [14.9648931056583, 57.199345357993], [14.994163156931, 57.1814056491485] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 250,
+         "id" : 105596,
+         "name" : "?rken",
+         "pfafstette" : 7991,
+         "lke_type" : "N",
+         "altitude" : 185,
+         "objectid" : 58231,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 2
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 251,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [13.1625103003113, 57.21788591833], [13.1524674967955, 57.2288299990844], [13.1579609961546, 57.2440229582494], [13.1606219099066, 57.2552674647501], [13.1473173411463, 57.2555678904963], [13.130836843069, 57.2370273301593], [13.1354719831533, 57.2211906015382], [13.1457722944516, 57.2075426890679], [13.1369311939205, 57.1893454724409], [13.1260300311298, 57.1781009659403], [13.1038843618385, 57.1626075810291], [13.0749576542758, 57.1519210080571], [13.070408350119, 57.1461270829518], [13.0610522340231, 57.133423365684], [13.0503227430874, 57.1218355154734], [13.0740134590734, 57.1273290148325], [13.0957299487274, 57.1403760758103], [13.1122962827321, 57.1519210080571], [13.1359869987182, 57.1683585881707], [13.1542700512727, 57.1799464383813], [13.1667162607581, 57.1905471754257], [13.1743556583044, 57.2038517441861], [13.1801925013734, 57.2139374656656], [13.1865443600073, 57.2209330937557], [13.2013939754624, 57.2305896355979], [13.1989905694928, 57.2409757828237], [13.1831109229079, 57.2407182750412], [13.1755573612892, 57.2260832494049], [13.1625103003113, 57.21788591833] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 251,
+         "id" : 105627,
+         "pfafstette" : 413,
+         "lke_type" : "N",
+         "altitude" : 160,
+         "objectid" : 58340,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_58340",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 252,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [27.0740249038638, 56.209099180553], [27.0619220380883, 56.2099575398279], [27.045441540011, 56.2136484847098], [27.0327378227431, 56.2148501876946], [27.0171156839407, 56.2124038637612], [27.0019227247757, 56.2078974775682], [26.9917082494049, 56.2033052554477], [26.9801203991943, 56.1930049441494], [26.9838113440762, 56.1823612891412], [27.0144547701886, 56.1762669382897], [27.0417505951291, 56.1781124107306], [27.0536817890496, 56.1765673640359], [27.0727373649515, 56.1710738646768], [27.0980589635598, 56.1723184856253], [27.1096468137704, 56.1796145394616], [27.1053550173961, 56.1902581944699], [27.1041533144113, 56.2005585057682], [27.105698361106, 56.2078974775682], [27.094024674968, 56.2097429500092], [27.0807201062077, 56.210944652994], [27.0740249038638, 56.209099180553] ],
+            [ [27.0573727339315, 56.1996572285296], [27.0642396081304, 56.1896573429775], [27.0558276872368, 56.1836059100897], [27.0488749771104, 56.1936057956418], [27.0573727339315, 56.1996572285296] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 252,
+         "id" : 105383,
+         "pfafstette" : 32933,
+         "lke_type" : "N",
+         "altitude" : 146,
+         "objectid" : 58356,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_58356",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 253,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [28.0928115271928, 56.0577275224318], [28.0712667093939, 56.049186847647], [28.0566746017213, 56.0394873878411], [28.0697216626991, 56.0297879280352], [28.1050002288958, 56.0269124244644], [28.125, 56.0239940029299], [28.146029802234, 56.0209468275041], [28.1872310474272, 56.0215476789965], [28.2140976927303, 56.0342943142282], [28.2207928950742, 56.052019433254], [28.2119517945431, 56.0680707516938], [28.1894627815419, 56.0823624336202], [28.1574459805896, 56.0906026826589], [28.1262017029848, 56.0890576359641], [28.125, 56.088070522798], [28.1074036348654, 56.0741651025453], [28.0928115271928, 56.0577275224318] ],
+            [ [28.1322960538363, 56.0443800357077], [28.125, 56.0456246566563], [28.1162447353964, 56.0471267853873], [28.1074036348654, 56.0553241164622], [28.112811298297, 56.0656673457242], [28.125, 56.0663969511079], [28.1274892418971, 56.0665257049991], [28.1382187328328, 56.0534786440212], [28.1322960538363, 56.0443800357077] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 253,
+         "id" : 105298,
+         "pfafstette" : 78939,
+         "lke_type" : "N",
+         "altitude" : 126,
+         "objectid" : 58423,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_58423",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 254,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.7743373466398, 57.0145406061161], [14.7770840963194, 56.9914507416224], [14.7810325489837, 56.9844551135323], [14.7721914484527, 56.9850559650247], [14.7597452389672, 56.9893048434353], [14.7438655923824, 56.995356276323], [14.7302176799121, 56.9999484984435], [14.7140805255448, 57.0026952481231], [14.7014626442044, 57.0124376258927], [14.6914198406885, 57.0181886330342], [14.6842954587072, 57.0145406061161], [14.6891881065739, 57.0008497756821], [14.703866050174, 56.9859572422633], [14.7090162058231, 56.9692621543673], [14.7151105566746, 56.9589189251053], [14.7375995696759, 56.9535112616737], [14.7542517396081, 56.9404212827321], [14.7548525911005, 56.9251854056034], [14.7472990294818, 56.9175889260209], [14.74292139718, 56.9105932979308], [14.7545092473906, 56.9047993728255], [14.7675563083684, 56.91540010987], [14.7751957059147, 56.9291338582677], [14.7804316974913, 56.9394770875298], [14.7909895165721, 56.9458718641275], [14.8122768265885, 56.9382324665812], [14.8336499725325, 56.9321810336935], [14.8454953305256, 56.9415800677532], [14.8391434718916, 56.9494769730819], [14.8317615821278, 56.956472601172], [14.8242080205091, 56.9665583226515], [14.8235213330892, 56.9804637429042], [14.8442077916133, 56.9947554248306], [14.8594865867057, 57.0029956738693], [14.8464395257279, 57.0029956738693], [14.8174269822377, 57.0035965253617], [14.8053241164622, 57.0124376258927], [14.8059249679546, 57.0242829838857], [14.7922770554844, 57.033081166453], [14.7743373466398, 57.0145406061161] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 254,
+         "id" : 106374,
+         "name" : "Helgasjn",
+         "pfafstette" : 719,
+         "lke_type" : "N",
+         "altitude" : 161,
+         "objectid" : 59410,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 255,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [15.1737319172313, 56.7528697811756], [15.163088262223, 56.7580628547885], [15.154075489837, 56.7711099157663], [15.1430884911189, 56.7887062809009], [15.1281530397363, 56.7929551593115], [15.1211144936825, 56.7819681605933], [15.1101274949643, 56.7725691265336], [15.0964795824941, 56.7622688152353], [15.084977568211, 56.7568611518037], [15.0806857718367, 56.7695219511079], [15.0725313587255, 56.7802085240798], [15.0586259384728, 56.7911526048343], [15.0505573612892, 56.7996074436916], [15.0460080571324, 56.7844144845266], [15.0554500091558, 56.7586207883172], [15.0715013275957, 56.744629532137], [15.0913294268449, 56.7263893975462], [15.1122733931514, 56.7102522431789], [15.1208569859, 56.717591214979], [15.1408567570042, 56.7270760849661], [15.169440120857, 56.7395222944516], [15.1737319172313, 56.7528697811756] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 255,
+         "id" : 107098,
+         "name" : "Rottnen",
+         "pfafstette" : 91,
+         "lke_type" : "N",
+         "altitude" : 148,
+         "objectid" : 59648,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 256,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [27.0710206464018, 55.7097057544406], [27.0776300128182, 55.7154567615821], [27.0859560977843, 55.7188043627541], [27.0959989013001, 55.7321947674419], [27.0992606665446, 55.7568296786303], [27.0964280809376, 55.7729668329976], [27.0627803973631, 55.7838679957883], [27.0278451748764, 55.7826662928035], [27.02089246475, 55.764726583959], [27.030248580846, 55.7507353277788], [27.0396905328694, 55.742194652994], [27.0520509064274, 55.7329672907892], [27.0347978850027, 55.7230961591284], [27.0019227247757, 55.7124095861564], [26.9983176158213, 55.6933110922908], [27.0095621223219, 55.6836116324849], [27.0223516755173, 55.6887188701703], [27.0290468778612, 55.6887188701703], [27.0376304706098, 55.6832253708112], [27.0529951016297, 55.6756718091925], [27.0654413111152, 55.6762726606849], [27.0621795458707, 55.6853712689984], [27.0588319446988, 55.6966586934627], [27.0710206464018, 55.7097057544406] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 256,
+         "id" : 107009,
+         "pfafstette" : 36211,
+         "lke_type" : "N",
+         "altitude" : 131,
+         "objectid" : 59717,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_59717",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 257,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [27.3954804522981, 55.6282903772203], [27.378141594946, 55.6367881340414], [27.3564251052921, 55.6318954861747], [27.3548800585973, 55.6179471479582], [27.3420905054019, 55.6097498168834], [27.3169405786486, 55.6030546145395], [27.3008034242813, 55.5969173457242], [27.2820053561619, 55.5948572834646], [27.2771127082952, 55.5857157571873], [27.2973699871818, 55.580265175792], [27.3226057498627, 55.5850719877312], [27.3412321461271, 55.5860161829335], [27.3525624885552, 55.5889775224318], [27.3630344717085, 55.5944710217909], [27.3886994140267, 55.5889775224318], [27.4147935359824, 55.5938701702985], [27.4208878868339, 55.6061017899652], [27.4062957791613, 55.6067026414576], [27.3983130379051, 55.6127969923091], [27.3954804522981, 55.6282903772203] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 257,
+         "id" : 107365,
+         "pfafstette" : 3745,
+         "lke_type" : "N",
+         "altitude" : 137,
+         "objectid" : 59743,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_59743",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 258,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.0649892418971, 56.98351091833], [14.0517705090643, 56.9778028291522], [14.0600965940304, 56.9616656747848], [14.0764054202527, 56.9600777101264], [14.0879932704633, 56.9677171076726], [14.1044737685406, 56.9762148644937], [14.1084222212049, 56.9914507416224], [14.1053321278154, 57.0163431605933], [14.1183791887933, 57.0449265244461], [14.1339154916682, 57.0720077595679], [14.1345163431606, 57.0917500228896], [14.1300528749313, 57.1050975096136], [14.1214692821828, 57.1179299807728], [14.1104822834646, 57.1063421305622], [14.1029287218458, 57.0914495971434], [14.0995811206739, 57.0838531175609], [14.0959760117195, 57.0731665445889], [14.0843881615089, 57.0586173548801], [14.0776071232375, 57.034926638894], [14.0810405603369, 57.0203345312214], [14.0871349111884, 57.006042849295], [14.0820705914668, 56.9878027147043], [14.0649892418971, 56.98351091833] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 258,
+         "id" : 106112,
+         "name" : "Flaren",
+         "pfafstette" : 6213,
+         "lke_type" : "N",
+         "altitude" : 150,
+         "objectid" : 59924,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 259,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [13.9782949551364, 57.0449265244461], [13.9709989013001, 57.0275876670939], [13.9673079564183, 57.0096479582494], [13.9725439479949, 56.9975450924739], [13.980698361106, 56.9896481871452], [13.9950329609962, 56.9917511673686], [14.0026723585424, 57.0090900247208], [14.0127151620582, 57.0358279161326], [14.0248180278337, 57.0492183208204], [14.0352041750595, 57.0589177806263], [14.0433585881707, 57.0810634499176], [14.0430152444607, 57.0959989013001], [14.0437019318806, 57.1099901574803], [14.050311298297, 57.1230372184582], [14.0576073521333, 57.143423251236], [14.0525430324117, 57.1662126899835], [14.0364058780443, 57.1565132301776], [14.0193245284746, 57.1367280488922], [14.0078225141916, 57.1209342382348], [14.0026723585424, 57.1096897317341], [13.9970930232558, 57.0966426707563], [14.0026723585424, 57.0805055163889], [14.0031873741073, 57.0708060565831], [13.9785524629189, 57.0641108542392], [13.9597543947995, 57.0573727339315], [13.9673079564183, 57.0513213010438], [13.9782949551364, 57.0449265244461] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 259,
+         "id" : 105903,
+         "name" : "Vidstern",
+         "pfafstette" : 6311,
+         "lke_type" : "N",
+         "altitude" : 143,
+         "objectid" : 60206,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 260,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.8242080205091, 56.416092519685], [14.8383709485442, 56.4015004120125], [14.8630058597327, 56.4035604742721], [14.8889283098334, 56.4136461957517], [14.9016320271013, 56.4261353232009], [14.9016320271013, 56.4337318027834], [14.887984114631, 56.4416716260758], [14.8706452572789, 56.4513710858817], [14.8530488921443, 56.4513710858817], [14.8366542299945, 56.4437316883355], [14.8244655282915, 56.4385386147226], [14.8181136696576, 56.4333455411097], [14.8242080205091, 56.416092519685] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 260,
+         "id" : 108512,
+         "name" : "Mien",
+         "pfafstette" : 55,
+         "lke_type" : "N",
+         "altitude" : 93,
+         "objectid" : 60426,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 261,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [26.2815876213148, 55.5055020829518], [26.2673388573521, 55.4933133812489], [26.2917162607581, 55.4777770783739], [26.3205571323933, 55.4781633400476], [26.3211579838857, 55.4893649285845], [26.3415869346274, 55.4929700375389], [26.3786680553012, 55.4845151986816], [26.4038179820546, 55.4887640770921], [26.3992686778978, 55.5109955823109], [26.3823590001831, 55.5130556445706], [26.3691402673503, 55.5069612937191], [26.3518014099982, 55.5082059146676], [26.334462552646, 55.5097080433986], [26.3199562809009, 55.5100084691448], [26.2996131660868, 55.5078625709577], [26.2815876213148, 55.5055020829518] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 261,
+         "id" : 108384,
+         "name" : "Dysnai",
+         "lge_id" : "lt",
+         "pfafstette" : 68733,
+         "lke_type" : "B",
+         "altitude" : 141,
+         "objectid" : 60547,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 262,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.2844717084783, 56.2373821186596], [14.2993213239334, 56.2419314228163], [14.3046431514375, 56.25], [14.3099649789416, 56.2580685771837], [14.3187202435451, 56.2644204358176], [14.3323681560154, 56.2653217130562], [14.3467027559055, 56.2842056171031], [14.361809879143, 56.2969522523347], [14.3723676982238, 56.3021453259476], [14.383183025087, 56.3051925013734], [14.3959725782824, 56.3099993133126], [14.3952858908625, 56.3184970701337], [14.3834405328695, 56.3157932384179], [14.3628399102729, 56.3178962186413], [14.3412092565464, 56.3190979216261], [14.3291063907709, 56.2987548068119], [14.3166601812855, 56.280214246475], [14.3032697765977, 56.2826176524446], [14.2895360282, 56.2768666453031], [14.2782915216993, 56.2546351400842], [14.2757164438748, 56.25], [14.2691929133858, 56.2382833958982], [14.2630985625343, 56.22729639718], [14.2724546786303, 56.2242492217543], [14.2789782091192, 56.2315881935543], [14.2844717084783, 56.2373821186596] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 262,
+         "id" : 109005,
+         "name" : "Immeln",
+         "pfafstette" : 79,
+         "lke_type" : "N",
+         "altitude" : 99,
+         "objectid" : 60929,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 263,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [8.2390473356528, 56.3288832173595], [8.2624805438564, 56.3130464887383], [8.283252838308, 56.3011582127815], [8.3020509064274, 56.310600164805], [8.3071152261491, 56.3225313587255], [8.2932098058964, 56.3312866233291], [8.2764718000366, 56.3443766022706], [8.2667723402307, 56.3604708386742], [8.2336396722212, 56.3762217313679], [8.2047129646585, 56.3923588857352], [8.1943268174327, 56.4041613257645], [8.1853140450467, 56.4272941082219], [8.1749278978209, 56.4421866416407], [8.1600782823659, 56.4440321140817], [8.1494346273576, 56.4446329655741], [8.1433402765061, 56.4242469327962], [8.1491771195752, 56.3874662378685], [8.1508938381249, 56.3629171626076], [8.1469453854605, 56.3476812854789], [8.1667734847098, 56.3413294268449], [8.1853140450467, 56.3382822514192], [8.1977602545321, 56.3333896035525], [8.2173308459989, 56.3315441311115], [8.2390473356528, 56.3288832173595] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 263,
+         "id" : 108806,
+         "pfafstette" : 1,
+         "altitude" : -2,
+         "objectid" : 60948,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_60948",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 264,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.1910822193738, 56.6577206555576], [14.2053309833364, 56.6534288591833], [14.213914576085, 56.6497808322652], [14.22876419154, 56.6601669794909], [14.2357169016664, 56.6805530122688], [14.22876419154, 56.6902524720747], [14.2281633400476, 56.697891869621], [14.2250732466581, 56.7090934581579], [14.2102236312031, 56.7081492629555], [14.2016400384545, 56.7099518174327], [14.1951165079656, 56.717591214979], [14.165503112983, 56.7109389305988], [14.1359755539279, 56.6948446941952], [14.1269627815419, 56.6787075398279], [14.1272202893243, 56.6659179866325], [14.1272202893243, 56.6491799807728], [14.1300528749313, 56.62793558872], [14.1306537264237, 56.6121417780626], [14.1251602270647, 56.5917986632485], [14.1333146401758, 56.576863211866], [14.1423274125618, 56.5793095357993], [14.1518552005127, 56.5905969602637], [14.1625846914485, 56.6063478529573], [14.1728850027468, 56.6197382576451], [14.1818977751328, 56.6288368659586], [14.1752884087164, 56.6340299395715], [14.174344213514, 56.6467765748032], [14.1910822193738, 56.6577206555576] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 264,
+         "id" : 107501,
+         "name" : "Mckeln",
+         "pfafstette" : 0,
+         "lke_type" : "N",
+         "altitude" : 134,
+         "objectid" : 61491,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 265,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [27.0952263779528, 55.6170029527559], [27.0735098882988, 55.6179471479582], [27.0657846548251, 55.6249427760483], [27.036428767625, 55.6434404184215], [26.9937683116645, 55.6455863166087], [26.9680175334188, 55.6355005951291], [26.963639901117, 55.6240414988097], [26.9783178447171, 55.6194492766892], [26.9990043032412, 55.6121961408167], [27.0195190899103, 55.6036554660319], [27.0327378227431, 55.5963164942318], [27.0460423915034, 55.5926684673137], [27.0764283098334, 55.5912092565464], [27.094024674968, 55.5924109595312], [27.1008057132393, 55.596616919978], [27.11170687603, 55.6027112708295], [27.0952263779528, 55.6170029527559] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 265,
+         "id" : 107518,
+         "pfafstette" : 363,
+         "lke_type" : "N",
+         "altitude" : 127,
+         "objectid" : 61538,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_61538",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 266,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [26.6424418604651, 55.6464875938473], [26.6172060977843, 55.6561870536532], [26.5880218824391, 55.6626247482146], [26.5704255173045, 55.6635260254532], [26.5588376670939, 55.6473888710859], [26.5408979582494, 55.6379898370262], [26.5244174601721, 55.634341810108], [26.50707860282, 55.6306937831899], [26.4919714795825, 55.6240414988097], [26.510254532137, 55.6145566288226], [26.5408979582494, 55.6155008240249], [26.561326908991, 55.619148850943], [26.5964338033327, 55.6158012497711], [26.6196095037539, 55.5948572834646], [26.6272489013001, 55.5778188518586], [26.6406393059879, 55.5848573979125], [26.6645875297565, 55.5967027559055], [26.6588365226149, 55.6100073246658], [26.6455319538546, 55.6270886742355], [26.6424418604651, 55.6464875938473] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 266,
+         "id" : 107655,
+         "name" : "Drkiai",
+         "lge_id" : "lt",
+         "pfafstette" : 68239,
+         "lke_type" : "B",
+         "altitude" : 142,
+         "objectid" : 61579,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 267,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [13.5351240615272, 55.8978151895257], [13.5188152353049, 55.883909769273], [13.5060256821095, 55.8762703717268], [13.5127208844534, 55.8604765610694], [13.536669108222, 55.8516783785021], [13.5737502288958, 55.8547255539278], [13.5920332814503, 55.8707768723677], [13.5892865317708, 55.8847681285479], [13.5737502288958, 55.8893603506684], [13.5661966672771, 55.9030940990661], [13.5476561069401, 55.9115489379235], [13.5351240615272, 55.8978151895257] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 267,
+         "id" : 110241,
+         "name" : "V?stra Ringsjn",
+         "pfafstette" : 959,
+         "lke_type" : "N",
+         "altitude" : 53,
+         "objectid" : 61610,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 2
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 268,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.1758892602088, 56.0242944286761], [14.1646447537081, 56.0175992263322], [14.1718549716169, 56.0039083958982], [14.1922839223586, 55.9829644295916], [14.2148587712873, 55.9674710446805], [14.2206097784289, 55.9616771195752], [14.222927348471, 55.9547244094488], [14.2299658945248, 55.9596170573155], [14.2369186046512, 55.9662693416957], [14.2479056033694, 55.9729216260758], [14.2552874931331, 55.9878141594946], [14.2521973997437, 56.0024491851309], [14.2373477842886, 56.0060542940853], [14.2255024262956, 56.0072559970701], [14.2056743270463, 56.016955456876], [14.1758892602088, 56.0242944286761] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 268,
+         "id" : 109964,
+         "name" : "Hammarsjn",
+         "pfafstette" : 311,
+         "lke_type" : "N",
+         "altitude" : -2,
+         "objectid" : 61831,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 269,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [29.1490226149057, 54.5058139534884], [29.1545161142648, 54.5039684810474], [29.1667906518953, 54.5139683665995], [29.1758034242813, 54.5228523850943], [29.1836144936825, 54.5291613257645], [29.192369758286, 54.5373586568394], [29.1839578373924, 54.553452893243], [29.1760609320637, 54.5705771607764], [29.1764042757737, 54.5875297564549], [29.1667906518953, 54.5993751144479], [29.1481642556308, 54.5997184581578], [29.1284219923091, 54.5824225187695], [29.1252460629921, 54.5656845129097], [29.1335721479583, 54.5538391549167], [29.1547736220473, 54.5425517304523], [29.1669623237502, 54.5313072239517], [29.1535719190625, 54.51856058872], [29.1490226149057, 54.5058139534884] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 269,
+         "id" : 109982,
+         "pfafstette" : 74627,
+         "lke_type" : "N",
+         "altitude" : 164,
+         "objectid" : 61891,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_61891",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 270,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [12.0832951840322, 55.9784151254349], [12.0643254440579, 55.9577715848746], [12.0784025361655, 55.9489304843435], [12.0974581120674, 55.9486300585973], [12.1130802508698, 55.9525785112617], [12.1357409357261, 55.9573853232009], [12.1506763871086, 55.9665697674419], [12.163465940304, 55.9677714704267], [12.1799464383813, 55.9729216260758], [12.1710195019227, 55.9878141594946], [12.1501613715437, 56.0012474821461], [12.1273290148325, 56.0085006180187], [12.1050975096136, 56.0161400155649], [12.0881878318989, 56.0248952801685], [12.0717073338217, 56.016955456876], [12.0549693279619, 56.0042946575719], [12.0410639077092, 55.9954106390771], [12.0467290789233, 55.983908624794], [12.0600336476836, 55.9802176799121], [12.0695614356345, 55.9900029756455], [12.0883595037539, 55.9966552600256], [12.0832951840322, 55.9784151254349] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 270,
+         "id" : 110074,
+         "name" : "ARRESOE",
+         "lge_id" : "da",
+         "pfafstette" : 3,
+         "lke_type" : "N",
+         "altitude" : 20,
+         "objectid" : 61912,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 271,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [26.5001258926936, 54.7796734801318], [26.5244174601721, 54.7644805209669], [26.5414988097418, 54.7647809467131], [26.5437305438564, 54.7741799807727], [26.5336877403406, 54.7832785890862], [26.5247608038821, 54.7927205411097], [26.4934306903498, 54.8158104056034], [26.4566929133858, 54.839243613807], [26.443817524263, 54.8470976011719], [26.4301696117927, 54.8549945065006], [26.4150624885552, 54.8629343297931], [26.4099123329061, 54.8561962094854], [26.4290537447354, 54.8388573521333], [26.4576371085882, 54.8170121085882], [26.4789244186047, 54.7984715482512], [26.5001258926936, 54.7796734801318] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 271,
+         "id" : 110308,
+         "pfafstette" : 65841,
+         "lke_type" : "N",
+         "altitude" : 145,
+         "objectid" : 62429,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_62429",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 272,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [21.4546042391503, 55.3388945477019], [21.4425013733748, 55.3461906015382], [21.4355486632485, 55.3498386284563], [21.4255058597326, 55.3568342565464], [21.4097120490753, 55.3571346822926], [21.3951199414027, 55.3598814319722], [21.3826737319172, 55.3529287218458], [21.3867080205091, 55.3361907159861], [21.3896264420436, 55.324345357993], [21.3942615821278, 55.3146029802234], [21.4160639077092, 55.3182510071415], [21.4401838033327, 55.3236586705732], [21.4587243636696, 55.3164055347006], [21.4643895348837, 55.3000537905146], [21.4526300128182, 55.2921139672221], [21.4431022248672, 55.2880796786303], [21.4577801684673, 55.2717279344442], [21.4817283922358, 55.258080021974], [21.4912561801868, 55.2613417872185], [21.477522431789, 55.2717279344442], [21.4736598150522, 55.2796677577367], [21.4869643838125, 55.2874788271379], [21.4788099707013, 55.3029722120491], [21.4702263779527, 55.3176501556491], [21.4647328785937, 55.3267916819264], [21.4546042391503, 55.3388945477019] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 272,
+         "id" : 110452,
+         "pfafstette" : 1411,
+         "altitude" : 5,
+         "objectid" : 62577,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_62577",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 273,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.5123660959531, 56.1431342702802], [14.5086751510712, 56.1452801684673], [14.4938255356162, 56.1415892235854], [14.4809501464933, 56.1509882576451], [14.4667872184582, 56.1601727018861], [14.452795962278, 56.1556663156931], [14.4326245193188, 56.1568680186779], [14.4056720380883, 56.1689708844534], [14.3895348837209, 56.1753656610511], [14.3830971891595, 56.1683271149973], [14.382839681377, 56.1509882576451], [14.3762303149606, 56.1346365134591], [14.3701359641092, 56.1106024537631], [14.3715951748764, 56.0814182384179], [14.3819813221022, 56.0653240020143], [14.4164873649515, 56.0640793810657], [14.452795962278, 56.0722767121406], [14.4637829609962, 56.0857100347922], [14.4641263047061, 56.1018042711958], [14.4667872184582, 56.1185422770555], [14.4792334279436, 56.1279413111152], [14.4999198864677, 56.1324476973082], [14.5123660959531, 56.1431342702802] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 273,
+         "id" : 109522,
+         "name" : "Ivsjn",
+         "pfafstette" : 13,
+         "lke_type" : "N",
+         "altitude" : 9,
+         "objectid" : 62650,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 274,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [23.6847933070866, 54.2772328785937], [23.7011879692364, 54.2698939067936], [23.7194710217909, 54.2729410822194], [23.7370673869255, 54.2833272294452], [23.7170676158213, 54.3096788591833], [23.67955731551, 54.3359017350302], [23.6674544497345, 54.3377042895074], [23.6589566929134, 54.3313095129097], [23.6632484892877, 54.306717519685], [23.6847933070866, 54.2772328785937] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 274,
+         "id" : 112520,
+         "name" : "Dusia",
+         "lge_id" : "lt",
+         "pfafstette" : 2693,
+         "lke_type" : "B",
+         "altitude" : 106,
+         "objectid" : 63790,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 275,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [27.360116050174, 53.9641034151254], [27.3852659769273, 53.9601978804248], [27.4014031312946, 53.9687385552097], [27.4187419886468, 53.9857340688519], [27.4346216352316, 53.9930301226882], [27.4509304614539, 53.9927296969419], [27.4603724134774, 54.0000257507782], [27.4443210950375, 54.0068497070134], [27.4044073887566, 54.0116136009888], [27.3734206189343, 54.0048754806812], [27.356940120857, 53.9963348058964], [27.3383995605201, 53.9824293856437], [27.329386788134, 53.9620433528658], [27.3350519593481, 53.9535455960447], [27.3408029664897, 53.9620433528658], [27.360116050174, 53.9641034151254] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 275,
+         "id" : 112137,
+         "pfafstette" : 84955,
+         "lke_type" : "N",
+         "altitude" : 207,
+         "objectid" : 63958,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_63958",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 276,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [27.1640667917964, 54.476329312397], [27.1616633858268, 54.4854279207105], [27.1755688060795, 54.4924235488006], [27.2178000824025, 54.5012217313679], [27.2585721479582, 54.5161142647867], [27.2788294268449, 54.532251419154], [27.2771127082952, 54.5443972028932], [27.2646664988097, 54.5419937969236], [27.244924235488, 54.5258995605201], [27.2129074345358, 54.5164146905329], [27.1838090551181, 54.5155134132943], [27.1571999175975, 54.5091615546603], [27.1396893883904, 54.5055135277422], [27.1223505310383, 54.5024663523164], [27.0986598150522, 54.4990758331807], [27.0900762223036, 54.5146121360557], [27.0912779252884, 54.5304059467131], [27.0815784654825, 54.5224661234206], [27.0688747482146, 54.5115220426662], [27.0400338765794, 54.509719488189], [27.0178023713606, 54.5100199139352], [26.9962575535616, 54.5115220426662], [26.9723951657206, 54.5061143792346], [26.9885323200879, 54.4951273805164], [27.0099054660319, 54.4887755218824], [27.0324803149606, 54.4838828740157], [27.0683597326497, 54.4817369758286], [27.108874290423, 54.4838828740157], [27.1367709668559, 54.4738829884636], [27.1467279344442, 54.4562866233291], [27.1657835103461, 54.4374027192822], [27.1800322743087, 54.4313512863944], [27.1736804156748, 54.4428962186413], [27.1665560336935, 54.4616942867607], [27.1640667917964, 54.476329312397] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 276,
+         "id" : 110788,
+         "pfafstette" : 6933,
+         "lke_type" : "N",
+         "altitude" : 153,
+         "objectid" : 64244,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_64244",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 277,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [17.0730234847098, 54.6462415308552], [17.1001476377953, 54.6404476057499], [17.1425505859733, 54.6431943554294], [17.1670138253067, 54.6535805026552], [17.156284334371, 54.6601469511078], [17.1450398278703, 54.6717777192822], [17.1132805347006, 54.6805329838857], [17.0758560703168, 54.6751253204541], [17.068817524263, 54.6671854971617], [17.0660707745834, 54.6564989241897], [17.0730234847098, 54.6462415308552] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 277,
+         "id" : 113031,
+         "name" : "Jezioro Gardno",
+         "pfafstette" : 1,
+         "lke_type" : "N",
+         "altitude" : -2,
+         "objectid" : 64977,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 278,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [13.4901460355246, 54.4351280672038], [13.4768414667643, 54.4287762085699], [13.5061973539645, 54.4193342565464], [13.539330021974, 54.4214372367698], [13.5500595129097, 54.4320808917781], [13.5564113715437, 54.4414799258378], [13.5494586614173, 54.4466729994506], [13.5466260758103, 54.4606213376671], [13.5394158579015, 54.4773593435268], [13.5116908533236, 54.479505241714], [13.4892876762498, 54.4764580662882], [13.4780431697491, 54.462466810108], [13.4892876762498, 54.450621452115], [13.5046523072697, 54.4433253982787], [13.4901460355246, 54.4351280672038] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 278,
+         "id" : 113930,
+         "pfafstette" : 0,
+         "lke_type" : "N",
+         "altitude" : -3,
+         "objectid" : 65498,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_65498",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 279,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [17.4636627906977, 54.713708569859], [17.4882977018861, 54.7195024949643], [17.501001419154, 54.7337512589269], [17.5171385735213, 54.7358542391503], [17.531043993774, 54.7404893792346], [17.5329323841787, 54.7562402719282], [17.5052932155283, 54.7620341970335], [17.4623752517854, 54.7580428264054], [17.4429763321736, 54.7549956509797], [17.4186847646951, 54.7528926707563], [17.3718183482879, 54.7443949139352], [17.3426341329427, 54.7398885277422], [17.3200592840139, 54.7395022660685], [17.2959393883904, 54.7337512589269], [17.2916475920161, 54.7240088811573], [17.3107890038454, 54.7179574482695], [17.3354239150339, 54.7066700238052], [17.3547369987182, 54.6933225370811], [17.3806594488189, 54.68482478026], [17.4022042666178, 54.6839664209852], [17.41954312397, 54.6894170023805], [17.4374828328145, 54.7024640633584], [17.4636627906977, 54.713708569859] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 279,
+         "id" : 112741,
+         "name" : "Jezioro ebsko",
+         "pfafstette" : 1,
+         "lke_type" : "N",
+         "altitude" : -4,
+         "objectid" : 65811,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 280,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [26.969991759751, 52.829524125618], [26.9772878135873, 52.8210692867607], [26.9949700146493, 52.8170779161326], [27.0186607306354, 52.8241164621864], [27.042093938839, 52.8310691723128], [27.0466432429958, 52.8374210309467], [27.0333386742355, 52.8426570225234], [27.0178023713606, 52.8532577595679], [27.0038111151804, 52.8617555163889], [26.9885323200879, 52.8602533876579], [26.9772878135873, 52.8593091924556], [26.9611506592199, 52.8593091924556], [26.9475027467497, 52.8520560565831], [26.9587472532503, 52.8380648004029], [26.969991759751, 52.829524125618] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 280,
+         "id" : 115370,
+         "pfafstette" : 446513,
+         "lke_type" : "N",
+         "altitude" : 148,
+         "objectid" : 65994,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_65994",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 281,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [27.514191540011, 52.7527009705182], [27.541229857169, 52.7678080937557], [27.5703282365867, 52.7845460996155], [27.5911005310383, 52.7955330983336], [27.6098985991577, 52.8079793078191], [27.6229456601355, 52.8155757874016], [27.6345335103461, 52.8271636376122], [27.6383961270829, 52.8441162332906], [27.6286966672771, 52.8386227339315], [27.6053492950009, 52.8231293490203], [27.589812992126, 52.8104256317524], [27.5743625251785, 52.8003399102729], [27.5558219648416, 52.7900395989746], [27.5480967313679, 52.7827006271745], [27.5332471159128, 52.776606276323], [27.5190841878777, 52.7717994643838], [27.5009728071782, 52.7672072422633], [27.483633949826, 52.7566065052188], [27.4852648324483, 52.7474220609779], [27.4985694012086, 52.745061572972], [27.514191540011, 52.7527009705182] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 281,
+         "id" : 115171,
+         "pfafstette" : 444113,
+         "lke_type" : "N",
+         "altitude" : 141,
+         "objectid" : 66144,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_66144",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 282,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [12.8092954587072, 53.7788265656473], [12.8357329243728, 53.7796849249222], [12.8613120307636, 53.7902856619667], [12.8737582402491, 53.8039764924007], [12.8880928401392, 53.8122167414393], [12.9054316974913, 53.8210578419703], [12.9145303058048, 53.8407571873283], [12.9033716352317, 53.8547484435085], [12.8808826222304, 53.8511004165904], [12.8595094762864, 53.8407571873283], [12.8344453854606, 53.8288689113715], [12.8224283556125, 53.8164227018861], [12.8120422083868, 53.7976246337667], [12.8092954587072, 53.7788265656473] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 282,
+         "id" : 115808,
+         "name" : "Kummerower See",
+         "pfafstette" : 433,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 66713,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 283,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [10.7317226698407, 53.9068508514924], [10.732666865043, 53.9056491485076], [10.7543833546969, 53.8977522431789], [10.7769582036257, 53.8900270097052], [10.817644433254, 53.8916578923274], [10.8459702893243, 53.9026448910456], [10.8590173503021, 53.9105417963743], [10.8706052005127, 53.9181382759568], [10.884253112983, 53.9189966352316], [10.8977293535982, 53.9059495742538], [10.9150682109504, 53.8986106024538], [10.9387589269365, 53.9041041018128], [10.9396172862113, 53.9138893975462], [10.9094030397363, 53.9217433849112], [10.8876007141549, 53.9296402902399], [10.8945534242813, 53.9400264374657], [10.899446072148, 53.9494254715254], [10.8757553561619, 53.9463353781359], [10.8532663431606, 53.9266360327779], [10.8352407983886, 53.90625], [10.7963571232375, 53.8971513916865], [10.7615077366783, 53.9026448910456], [10.7317226698407, 53.9068508514924] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 283,
+         "id" : 115637,
+         "pfafstette" : 1,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 66850,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_66850",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 284,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [10.4145589177806, 54.3070179454312], [10.4506958432522, 54.2988206143563], [10.4843435268266, 54.2994643838125], [10.4883778154184, 54.3188633034243], [10.4799658945248, 54.3243568027834], [10.4723264969786, 54.323755951291], [10.4355887200147, 54.3286056811939], [10.3962758652262, 54.3300648919612], [10.3862330617103, 54.3222109045962], [10.3929282640542, 54.310065120857], [10.4145589177806, 54.3070179454312] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 284,
+         "id" : 114495,
+         "name" : "Selenter See",
+         "pfafstette" : 3,
+         "lke_type" : "N",
+         "altitude" : 34,
+         "objectid" : 67195,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 285,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [24.9570534242813, 52.580127838308], [24.9746497894159, 52.5762223036074], [24.9749931331258, 52.6007284609046], [24.9719030397363, 52.6094837255082], [24.9622035799304, 52.6250200283831], [24.93422106757, 52.6365220426662], [24.9150796557407, 52.6380670893609], [24.8992858450833, 52.6359211911738], [24.8886421900751, 52.6425734755539], [24.8804019410364, 52.651414576085], [24.8588571232375, 52.6483674006592], [24.8203167917964, 52.646564846182], [24.7949093572606, 52.6344619804065], [24.8035787859366, 52.6237754074345], [24.8217760025636, 52.6176810565831], [24.8332780168467, 52.6158355841421], [24.8515610694012, 52.6182819080755], [24.889328877495, 52.612187557224], [24.9139637886834, 52.6073807452848], [24.9355944424098, 52.593818668742], [24.9570534242813, 52.580127838308] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 285,
+         "id" : 116859,
+         "pfafstette" : 4649533,
+         "lke_type" : "N",
+         "altitude" : 144,
+         "objectid" : 67543,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_67543",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 286,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [12.5518735121773, 53.5028211408167], [12.5859503753891, 53.4918341420985], [12.6014866782641, 53.4878427714704], [12.6139328877495, 53.4930358450833], [12.617194652994, 53.5100742766892], [12.6047484435085, 53.526812282549], [12.5825169382897, 53.5313615867057], [12.5647489013001, 53.5246663843618], [12.5419165445889, 53.5136793856437], [12.5518735121773, 53.5028211408167] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 286,
+         "id" : 116919,
+         "name" : "Klpinsee",
+         "pfafstette" : 18799,
+         "lke_type" : "N",
+         "altitude" : 60,
+         "objectid" : 67552,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 287,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [12.296683299762, 53.4104187648782], [12.3084428218275, 53.4024789415858], [12.3103312122322, 53.4067278199963], [12.3029493224684, 53.4240666773485], [12.305696072148, 53.4359120353415], [12.3063827595679, 53.4375], [12.3107603918696, 53.4477573933345], [12.3291292803516, 53.4635512039919], [12.3476698406885, 53.4750961362388], [12.3610602453763, 53.4854822834646], [12.3707597051822, 53.4993877037173], [12.3562534334371, 53.5064691677348], [12.3381420527376, 53.5064691677348], [12.332734389306, 53.516125709577], [12.3251808276872, 53.5280139855338], [12.3066402673503, 53.5346662699139], [12.2990867057316, 53.5228209119209], [12.2919623237502, 53.5048812030764], [12.2854387932613, 53.49058952115], [12.2829495513642, 53.4754823979125], [12.2826062076543, 53.4568989196118], [12.2802028016847, 53.4402038317158], [12.278486083135, 53.4375], [12.2736792711958, 53.42981768449], [12.2844087621315, 53.4188736037356], [12.296683299762, 53.4104187648782] ],
+            [ [12.3251808276872, 53.504280351584], [12.3329918970885, 53.4969413797839], [12.326897546237, 53.4948813175243], [12.3251808276872, 53.504280351584] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 287,
+         "id" : 116922,
+         "name" : "Plauer See",
+         "pfafstette" : 187395,
+         "lke_type" : "N",
+         "altitude" : 62,
+         "objectid" : 67555,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 288,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [10.9088021882439, 53.5988286257096], [10.9145531953855, 53.5805884911188], [10.9186733199048, 53.5656959577001], [10.9292311389855, 53.5593440990661], [10.9370422083867, 53.5696444103644], [10.9419348562534, 53.5781421671855], [10.9512909723494, 53.5927342748581], [10.9455399652078, 53.6100731322102], [10.9382439113716, 53.6203734435085], [10.9461408167002, 53.6371114493682], [10.9546385735213, 53.6550511582128], [10.9482867148874, 53.6729908670573], [10.9414198406885, 53.6657377311848], [10.93249290423, 53.6426049487273], [10.9121497894159, 53.6371114493682], [10.8887165812122, 53.6429053744735], [10.8778154184215, 53.6341071919062], [10.8986735488006, 53.6213605566746], [10.9130939846182, 53.6161674830617], [10.9088021882439, 53.5988286257096] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 288,
+         "id" : 116443,
+         "name" : "Lassahner See",
+         "pfafstette" : 1627,
+         "lke_type" : "N",
+         "altitude" : 48,
+         "objectid" : 67935,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 289,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.8719327961912, 53.2317083638528], [14.8968252151621, 53.2197771699322], [14.9133057132393, 53.2252277513276], [14.9086705731551, 53.2441545733382], [14.9025762223036, 53.2693474180553], [14.9019753708112, 53.2906347280718], [14.9048079564183, 53.3033384453397], [14.9135632210218, 53.3206773026918], [14.92455021974, 53.3429088079106], [14.9230051730452, 53.3569000640908], [14.9048079564183, 53.3496040102545], [14.8828339589819, 53.3216644158579], [14.8725336476836, 53.2949265244461], [14.8677268357444, 53.2839395257279], [14.8603449459806, 53.2614934306904], [14.8719327961912, 53.2317083638528] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 289,
+         "id" : 117270,
+         "name" : "Miedwie",
+         "lge_id" : "pl",
+         "pfafstette" : 12219,
+         "lke_type" : "B",
+         "altitude" : 9,
+         "objectid" : 68382,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 290,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [26.28004257462, 52.2790583226515], [26.3002140175792, 52.2863972944516], [26.3118018677898, 52.2924916453031], [26.3251064365501, 52.3101309284014], [26.3381534975279, 52.3271693600073], [26.3120593755722, 52.3316757462003], [26.283218503937, 52.329229422267], [26.2655363028749, 52.3250234618202], [26.2524892418971, 52.3201308139535], [26.2583260849661, 52.3067833272295], [26.2624462094854, 52.2918907938107], [26.2670813495697, 52.2800454358176], [26.28004257462, 52.2790583226515] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 290,
+         "id" : 117304,
+         "pfafstette" : 464215,
+         "lke_type" : "N",
+         "altitude" : 133,
+         "objectid" : 68493,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_68493",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 291,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [23.8613578099249, 52.902484663981], [23.8747482146127, 52.9163900842337], [23.851830021974, 52.9364756912653], [23.8148347372276, 52.941368339132], [23.7859080296649, 52.9471622642373], [23.7786119758286, 52.958063427028], [23.7722601171947, 52.9638573521333], [23.7677966489654, 52.9538145486175], [23.7589555484344, 52.942870467863], [23.7524320179454, 52.9374628044314], [23.7644490477934, 52.9337718595495], [23.7829896081304, 52.9298234068852], [23.7939766068486, 52.9188793261308], [23.8254783922359, 52.9066906244278], [23.8613578099249, 52.902484663981] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 291,
+         "id" : 116178,
+         "pfafstette" : 69915,
+         "lke_type" : "N",
+         "altitude" : 139,
+         "objectid" : 68565,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_68565",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 292,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [25.9117206097784, 52.6806846273576], [25.9382439113715, 52.6702984801319], [25.9657972440945, 52.6687534334371], [25.9909471708478, 52.6766503387658], [25.9980715528292, 52.6912853644021], [25.983736952939, 52.7037315738876], [25.950690120857, 52.7109847097601], [25.9166132576451, 52.7100834325215], [25.9009052829152, 52.6985385002747], [25.9117206097784, 52.6806846273576] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 292,
+         "id" : 116148,
+         "pfafstette" : 8673,
+         "lke_type" : "N",
+         "altitude" : 148,
+         "objectid" : 68809,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_68809",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 293,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [16.1768105658304, 53.6246223219191], [16.1630768174327, 53.6346651254349], [16.1539782091192, 53.6438066517121], [16.1451371085882, 53.641660753525], [16.1502872642373, 53.6255665171214], [16.1447937648782, 53.6121761124336], [16.1292574620033, 53.6048800585973], [16.1335492583776, 53.597927348471], [16.1508881157297, 53.6011891137154], [16.1639351767076, 53.602433734664], [16.1618751144479, 53.5930347006043], [16.1635918329976, 53.5851377952756], [16.1788706280901, 53.5851377952756], [16.1919176890679, 53.5817901941036], [16.2116599523897, 53.5723911600439], [16.2287413019594, 53.5748374839773], [16.2175826313862, 53.5857815647317], [16.2080548434353, 53.5988286257096], [16.2011021333089, 53.6094293627541], [16.1892567753159, 53.6164679088079], [16.1768105658304, 53.6246223219191] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 293,
+         "id" : 115995,
+         "name" : "Drawsko",
+         "lge_id" : "pl",
+         "pfafstette" : 4295,
+         "lke_type" : "B",
+         "altitude" : 126,
+         "objectid" : 68865,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 294,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [27.952383949826, 52.3963531175609], [27.9895509064274, 52.3867394936825], [28.0248294726241, 52.3854948727339], [28.0390782365867, 52.3961385277422], [28.0359881431972, 52.4048937923457], [28.0248294726241, 52.4158807910639], [28.0119540835012, 52.4256231688336], [27.9868041567478, 52.4295716214979], [27.9630276048343, 52.4365243316243], [27.9295515931148, 52.4346788591833], [27.8947022065556, 52.4238206143564], [27.89830731551, 52.4122327641458], [27.922341375206, 52.4042929408533], [27.952383949826, 52.3963531175609] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 294,
+         "id" : 116092,
+         "pfafstette" : 4433,
+         "lke_type" : "N",
+         "altitude" : 131,
+         "objectid" : 68911,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_68911",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 295,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [19.6064708844534, 52.5702996246109], [19.5911920893609, 52.5751493545138], [19.5347120490753, 52.5878959897455], [19.5197765976927, 52.5912435909174], [19.4821804614539, 52.6067369758286], [19.4275029756455, 52.6295264145761], [19.3474180553012, 52.6423588857352], [19.2757450558506, 52.6490111701154], [19.242955731551, 52.6569080754441], [19.2043295641824, 52.6651483244827], [19.1550597418055, 52.6711568394067], [19.1350599707013, 52.6674658945248], [19.1800379967039, 52.6554059467131], [19.2463891686504, 52.6374662378685], [19.2739425013734, 52.6277667780626], [19.3167746291888, 52.6262217313679], [19.3635552096686, 52.6247196026369], [19.3977179088079, 52.6198269547702], [19.4255287493133, 52.6109858542392], [19.4714509705182, 52.5958358130379], [19.5128238875664, 52.5836041933712], [19.5434673136788, 52.5718017533419], [19.5772866691082, 52.5633039965208], [19.6076725874382, 52.5620593755722], [19.6350542483062, 52.5575100714155], [19.65745742538, 52.551759064274], [19.6850965940304, 52.5423600302143], [19.7082722944516, 52.5326176524446], [19.7286154092657, 52.5295275590551], [19.7183150979674, 52.536566105109], [19.687671671855, 52.549913591833], [19.6456120673869, 52.5624027192822], [19.6064708844534, 52.5702996246109] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 295,
+         "id" : 118742,
+         "pfafstette" : 1773,
+         "lke_type" : "N",
+         "altitude" : 53,
+         "objectid" : 68979,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_68979",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 296,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [5.5049155374474, 52.9457030534701], [5.4836282274309, 52.9283641961179], [5.4821690166636, 52.9216260758103], [5.479765610694, 52.9107249130196], [5.4846582585607, 52.9003816837576], [5.4959027650613, 52.9061326908991], [5.4956452572789, 52.9159179866325], [5.5062030763596, 52.9271195751694], [5.5344430965025, 52.9365186092291], [5.5578763047061, 52.9438575810291], [5.5830262314594, 52.9499090139169], [5.6088628456327, 52.9593509659403], [5.6177039461637, 52.9708529802234], [5.5995067295367, 52.973256386193], [5.5715242171763, 52.967247871269], [5.5422541659037, 52.9593509659403], [5.5049155374474, 52.9457030534701] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 296,
+         "id" : 118636,
+         "name" : "Heegermeer en Fluessen",
+         "lge_id" : "nl",
+         "pfafstette" : 0,
+         "lke_type" : "P",
+         "altitude" : -2,
+         "objectid" : 69074,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 297,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [5.7527238600989, 52.8982787035342], [5.7478312122322, 52.888793833547], [5.7573590001831, 52.8821415491668], [5.7631100073247, 52.8821415491668], [5.7904058322652, 52.884287447354], [5.8302337026186, 52.8893946850394], [5.8438816150888, 52.9030855154734], [5.8381306079473, 52.917677623146], [5.8027662058231, 52.9216260758103], [5.7678309833364, 52.911325764512], [5.7527238600989, 52.8982787035342] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 297,
+         "id" : 118875,
+         "name" : "Tjeukemeer",
+         "lge_id" : "nl",
+         "pfafstette" : 0,
+         "lke_type" : "P",
+         "altitude" : -2,
+         "objectid" : 69732,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 298,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [18.3469144845266, 52.5997413477385], [18.3489745467863, 52.6070803195386], [18.3593606940121, 52.6133892602088], [18.3621074436916, 52.6052348470976], [18.3647683574437, 52.5888831029116], [18.3703476927303, 52.5666515976927], [18.3794463010438, 52.5447634361839], [18.3784162699139, 52.5326176524446], [18.3706052005127, 52.5173817753159], [18.375240340597, 52.5055793352866], [18.3852831441128, 52.5161800723311], [18.3900041201245, 52.5383257416224], [18.3833089177806, 52.5505573612892], [18.3806480040286, 52.5587117744003], [18.3789312854788, 52.5678962186413], [18.3754978483794, 52.5781106940121], [18.3708627082952, 52.5887972669841], [18.3703476927303, 52.604333569859], [18.3700043490203, 52.6179814823292], [18.3633091466764, 52.6377666636147], [18.3581589910273, 52.6548050952207], [18.3437385552097, 52.6654058322652], [18.3295756271745, 52.6751052920711], [18.3337815876213, 52.6669508789599], [18.3420218366599, 52.6554059467131], [18.3486312030764, 52.6429597372276], [18.3481161875114, 52.6213290835012], [18.3365283373009, 52.6039902261491], [18.3286314319722, 52.5927886376122], [18.3344682750412, 52.5693554294085], [18.350862937191, 52.551415720564], [18.3614207562717, 52.556265450467], [18.3551547335653, 52.5645056995056], [18.3434810474272, 52.5690979216261], [18.3459702893243, 52.5858359274858], [18.3469144845266, 52.5997413477385] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 298,
+         "id" : 118958,
+         "name" : "Gopo",
+         "lge_id" : "pl",
+         "pfafstette" : 495,
+         "lke_type" : "B",
+         "altitude" : 75,
+         "objectid" : 69999,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 299,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [9.2927691814686, 52.4590562625893], [9.31457150705, 52.4560090871635], [9.3380047152536, 52.4572107901483], [9.3535410181286, 52.4642493362022], [9.3701073521333, 52.4748500732467], [9.3816952023439, 52.4906868018678], [9.3729399377403, 52.5049355658304], [9.3368030122688, 52.502832585607], [9.293370032961, 52.4882404779345], [9.2804946438381, 52.4706011948361], [9.2927691814686, 52.4590562625893] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 299,
+         "id" : 120351,
+         "name" : "Steinhuder Meer",
+         "pfafstette" : 7329,
+         "lke_type" : "N",
+         "altitude" : 38,
+         "objectid" : 70601,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 300,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [23.8501133034243, 51.4922003753891], [23.8717439571507, 51.4997539370079], [23.8874519318806, 51.5082946117927], [23.888052783373, 51.5250326176525], [23.8704564182384, 51.532285753525], [23.8552634590734, 51.5280797930782], [23.8417872184582, 51.5253330433987], [23.8144913935177, 51.5205262314594], [23.7932040835012, 51.5034448818898], [23.8011868247574, 51.4882948406885], [23.8254783922359, 51.4840030443142], [23.8501133034243, 51.4922003753891] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 300,
+         "id" : 120807,
+         "pfafstette" : 894,
+         "lke_type" : "N",
+         "altitude" : 157,
+         "objectid" : 71425,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_71425",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 301,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [19.9520463285113, 51.4693680186779], [19.9282697765977, 51.4501836888848], [19.9069824665812, 51.4298834920344], [19.8723047518769, 51.4113858496612], [19.8542792071049, 51.3970941677348], [19.8656953854605, 51.3940469923091], [19.8763390404688, 51.4058923503022], [19.8843217817249, 51.4113429316975], [19.9149652078374, 51.4222440944882], [19.9526471800037, 51.445977728438], [19.9870673869255, 51.4642607809925], [19.9882690899103, 51.4757627952756], [19.9520463285113, 51.4693680186779] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 301,
+         "id" : 122107,
+         "pfafstette" : 42535,
+         "lke_type" : "N",
+         "altitude" : 159,
+         "objectid" : 72033,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_72033",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 302,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [18.6447651529024, 51.7459742950009], [18.6574688701703, 51.7438283968138], [18.6736060245376, 51.7593646996887], [18.6799578831716, 51.7857592473906], [18.6823612891412, 51.8024972532503], [18.695236678264, 51.8033985304889], [18.7062236769822, 51.8110379280352], [18.7149789415858, 51.8231837117744], [18.7213308002197, 51.8444710217909], [18.7036485991577, 51.8669600347922], [18.6778978209119, 51.8630545000916], [18.6711167826405, 51.84996452115], [18.6660524629189, 51.8268317386926], [18.6525762223036, 51.8036989562351], [18.6478552462919, 51.7861455090643], [18.6447651529024, 51.7624118751145], [18.6447651529024, 51.7459742950009] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 302,
+         "id" : 121385,
+         "pfafstette" : 9539,
+         "lke_type" : "N",
+         "altitude" : 112,
+         "objectid" : 73364,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_73364",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 303,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [26.5645886742355, 50.2904115546603], [26.6013264511994, 50.2794245559421], [26.6145451840322, 50.2769782320088], [26.610081715803, 50.2959050540194], [26.622098745651, 50.3095958844534], [26.6291372917048, 50.3150893838125], [26.6147168558872, 50.3216558322651], [26.579867469328, 50.3222566837576], [26.5498248947079, 50.3147031221388], [26.5451897546237, 50.3007977018861], [26.5645886742355, 50.2904115546603] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 303,
+         "id" : 123280,
+         "pfafstette" : 49721,
+         "altitude" : 195,
+         "objectid" : 75036,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_75036",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 304,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [29.1648164255631, 48.7183694607215], [29.1527135597876, 48.7275539049624], [29.128937007874, 48.7403005401941], [29.1073921900751, 48.7422747665263], [29.089881660868, 48.7520171442959], [29.0820705914668, 48.7637337483977], [29.1073921900751, 48.7735190441311], [29.1191517121406, 48.7813301135323], [29.1171774858085, 48.7949780260026], [29.0974352224867, 48.7988835607032], [29.0879074345358, 48.7793558872001], [29.0703110694012, 48.7774245788317], [29.056663156931, 48.7754503524995], [29.0546889305988, 48.7637337483977], [29.0742595220656, 48.7422747665263], [29.089881660868, 48.7305152444607], [29.1073921900751, 48.7266097097601], [29.1269627815419, 48.7187986403589], [29.1406106940121, 48.7148931056583], [29.1445591466764, 48.7031765015565], [29.1582070591467, 48.6973396584875], [29.1738291979491, 48.7012451931881], [29.1960607031679, 48.7163093984618], [29.1860178996521, 48.7277684947812], [29.1855887200147, 48.7329615683941], [29.1731425105292, 48.7263092840139], [29.1648164255631, 48.7183694607215] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 304,
+         "id" : 126352,
+         "pfafstette" : 91311,
+         "altitude" : 208,
+         "objectid" : 76059,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_76059",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 305,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [19.5252700970518, 49.3992200375389], [19.5505058597326, 49.3855721250687], [19.5691322559971, 49.3877180232558], [19.5879303241165, 49.3928252609412], [19.5957413935177, 49.4107649697857], [19.6079300952206, 49.4402496108771], [19.6162561801868, 49.4545412928035], [19.5881878318989, 49.4423955090643], [19.5671580296649, 49.419563152353], [19.5513642190075, 49.4141125709577], [19.5340253616554, 49.4229965894525], [19.5237250503571, 49.4311510025636], [19.5099913019593, 49.4278034013917], [19.4942833272294, 49.4183614493682], [19.4879314685955, 49.4107649697857], [19.5015793810657, 49.4087049075261], [19.5252700970518, 49.3992200375389] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 305,
+         "id" : 127640,
+         "pfafstette" : 92953,
+         "lke_type" : "N",
+         "altitude" : 619,
+         "objectid" : 76987,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_76987",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 306,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [22.4331338124885, 49.3752718137704], [22.4288420161143, 49.3587913156931], [22.43922816334, 49.3508944103644], [22.4479834279436, 49.3603792803516], [22.4589704266618, 49.3694349707013], [22.4741633858268, 49.3709800173961], [22.481974455228, 49.3697783144113], [22.4993133125801, 49.359134659403], [22.5, 49.3582763001282], [22.5133045687603, 49.3423966535433], [22.5161371543673, 49.3317529985351], [22.5230898644937, 49.3430404229994], [22.5166521699322, 49.3581475462369], [22.5060943508515, 49.3679328419703], [22.5, 49.3717525407434], [22.4987982970152, 49.3725250640908], [22.4896138527742, 49.3758726652628], [22.4775109869987, 49.3797781999634], [22.4665239882805, 49.3883188747482], [22.4531335835927, 49.4019667872185], [22.4389706555576, 49.4007650842336], [22.4382839681377, 49.3901643471891], [22.4331338124885, 49.3752718137704] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 306,
+         "id" : 127294,
+         "pfafstette" : 499791,
+         "lke_type" : "N",
+         "altitude" : 492,
+         "objectid" : 77223,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_77223",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 307,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [27.193336843069, 48.5879417689068], [27.1582299487273, 48.5918473036074], [27.1445820362571, 48.5879417689068], [27.1305907800769, 48.5866113120308], [27.1198612891412, 48.6015038454495], [27.1056125251785, 48.6161388710859], [27.0874153085515, 48.6161388710859], [27.099861518037, 48.6063964933162], [27.1126510712324, 48.5930060886284], [27.1157411646219, 48.5812036485991], [27.1132519227248, 48.5723196301044], [27.0957413935177, 48.5742938564365], [27.0488749771104, 48.576225164805], [27.00587117744, 48.5879417689068], [26.9784895165721, 48.595752838308], [26.9609789873649, 48.5918473036074], [26.9505928401392, 48.5811178126717], [26.9725668375755, 48.5705170756272], [27.0038969511079, 48.5586717176341], [27.039089681377, 48.5488864219007], [27.0801192547153, 48.5488864219007], [27.121062992126, 48.5469551135323], [27.1426078099249, 48.5566974913019], [27.1584874565098, 48.5738646767991], [27.1992595220656, 48.5625772523347], [27.2559112342062, 48.5606030260026], [27.2715333730086, 48.5821049258377], [27.2733359274858, 48.5927056628822], [27.2685291155466, 48.6045510208753], [27.2707608496612, 48.6124908441677], [27.2900739333455, 48.6063964933162], [27.3280992492218, 48.5918473036074], [27.3515324574254, 48.5977270646402], [27.36912882256, 48.6113749771104], [27.3925620307636, 48.609443668742], [27.4199436916316, 48.6016325993408], [27.4495570866142, 48.5879417689068], [27.4531621955686, 48.6074694424098], [27.4316173777696, 48.623134499176], [27.3759956967588, 48.6416750595129], [27.3482706921809, 48.6286709164988], [27.3287859366416, 48.6267825260941], [27.3250949917598, 48.6419325672954], [27.326897546237, 48.6504732420802], [27.3181422816334, 48.6412887978392], [27.3214040468779, 48.621289026735], [27.3144513367515, 48.6172547381432], [27.2988291979491, 48.6250658075444], [27.280975325032, 48.6347652673503], [27.2553962186413, 48.6286279985351], [27.2394307361289, 48.6343360877129], [27.2314479948727, 48.639829587072], [27.2339372367698, 48.6306880607947], [27.2258686595862, 48.6157955273759], [27.2299887841055, 48.5966970335103], [27.2244952847464, 48.5796586019044], [27.193336843069, 48.5879417689068] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 307,
+         "id" : 127365,
+         "pfafstette" : 3571,
+         "lke_type" : "N",
+         "altitude" : 238,
+         "objectid" : 77442,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_77442",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 308,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.1777776506135, 49.4649274400293], [14.1855887200147, 49.4434255401941], [14.2038717725691, 49.4375886971251], [14.2012108588171, 49.4610219053287], [14.192541430141, 49.4764294543124], [14.1952881798206, 49.5000772523347], [14.1972624061527, 49.5196049258377], [14.1897946804615, 49.5366433574437], [14.1894513367515, 49.5490895669291], [14.1914255630837, 49.5684455685772], [14.1952881798206, 49.580162172679], [14.1961465390954, 49.6017069904779], [14.1839578373924, 49.60436790423], [14.165159769273, 49.5797759110053], [14.1673915033877, 49.5570293902216], [14.1709966123421, 49.5427377082952], [14.1718549716169, 49.5287035341512], [14.1732283464567, 49.5214503982787], [14.1786360098883, 49.5050128181652], [14.1722841512544, 49.485013047061], [14.1777776506135, 49.4649274400293] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 308,
+         "id" : 127943,
+         "pfafstette" : 93911,
+         "lke_type" : "N",
+         "altitude" : 398,
+         "objectid" : 77728,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_77728",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 309,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [16.5046179728987, 48.8773375984252], [16.5065921992309, 48.8764792391503], [16.5312271104193, 48.882874015748], [16.554660318623, 48.8887537767808], [16.57251419154, 48.8896979719831], [16.5835011902582, 48.8903417414393], [16.5986083134957, 48.8912859366416], [16.6328568485625, 48.8906850851492], [16.6621268998352, 48.8887537767808], [16.6804099523897, 48.8849340780077], [16.6949162241348, 48.8776809421351], [16.7101950192273, 48.8688827595678], [16.7180060886285, 48.8658355841421], [16.7262463376671, 48.8716295092474], [16.7132851126167, 48.8964790102545], [16.6876201702985, 48.9095689891961], [16.669165445889, 48.9138178676067], [16.6398953946164, 48.9168650430324], [16.58787882256, 48.9132170161143], [16.5481367881341, 48.9065218137704], [16.5319996337667, 48.9013716581212], [16.5137165812122, 48.8926593114814], [16.5046179728987, 48.8773375984252] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 309,
+         "id" : 129343,
+         "pfafstette" : 96571,
+         "lke_type" : "N",
+         "altitude" : 168,
+         "objectid" : 78502,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_78502",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 310,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [29.1662756363304, 47.3615609549533], [29.1523702160776, 47.3789856482329], [29.1486792711958, 47.3870971433803], [29.1393231550998, 47.395337392419], [29.1237868522249, 47.3913460217909], [29.1133148690716, 47.3985133217359], [29.1012978392236, 47.4111312030764], [29.0901391686504, 47.4373111609595], [29.0815555759019, 47.4345214933162], [29.0722852957334, 47.423877838308], [29.0754612250504, 47.4025905282915], [29.1115981505219, 47.3804448590002], [29.1406106940121, 47.3652948177989], [29.1465333730086, 47.3516469053287], [29.1327996246109, 47.3418616095953], [29.1116839864494, 47.3561532915217], [29.0873924189709, 47.3719471021791], [29.0703110694012, 47.3640072788867], [29.0703110694012, 47.3388144341696], [29.0821564273943, 47.3129778199963], [29.0937442776048, 47.2969265015565], [29.1154607672587, 47.2852098974547], [29.1122848379418, 47.3053813404138], [29.0962335195019, 47.3230206235122], [29.1035295733382, 47.3340505401941], [29.1269627815419, 47.3184284013917], [29.1523702160776, 47.3242652444607], [29.1758034242813, 47.3438358359275], [29.1662756363304, 47.3615609549533] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 310,
+         "id" : 129179,
+         "pfafstette" : 311,
+         "lke_type" : "N",
+         "altitude" : 104,
+         "objectid" : 78997,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_78997",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 311,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.0947743087347, 48.7062236769822], [14.0843881615089, 48.721116210401], [14.098894433254, 48.7408584737228], [14.1145165720564, 48.7560943508515], [14.1044737685406, 48.7581973310749], [14.0788946621498, 48.7554934993591], [14.0531438839041, 48.7587981825673], [14.0349466672771, 48.7593990340597], [14.0239596685589, 48.7716306537264], [14.0092817249588, 48.7858794176891], [13.9878227430874, 48.7888836751511], [13.9734881431972, 48.7829180781908], [13.9832734389306, 48.7612445065006], [14.0096250686688, 48.7575535616187], [14.0372642373192, 48.7383692318257], [14.0425002288958, 48.7158373008606], [14.0402684947812, 48.7171677577367], [14.0396676432888, 48.707768723677], [14.0512554934994, 48.6992280488921], [14.0719419520235, 48.6867818394067], [14.0823280992492, 48.678884934078], [14.1251602270647, 48.6629194515656], [14.1682498626625, 48.6387566379784], [14.1943439846182, 48.6363532320088], [14.2181205365318, 48.637812442776], [14.2340001831167, 48.6477694103644], [14.2029275773668, 48.6535204175059], [14.1818977751328, 48.6633915491668], [14.1673915033877, 48.6721897317341], [14.1371772569127, 48.6904298663248], [14.12327183666, 48.6930478621132], [14.1121131660868, 48.7024468961729], [14.0947743087347, 48.7062236769822] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 311,
+         "id" : 130010,
+         "pfafstette" : 997171,
+         "lke_type" : "N",
+         "altitude" : 730,
+         "objectid" : 79150,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_79150",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 312,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [19.4951416865043, 49.0925282686321], [19.5018368888482, 49.0937728895807], [19.5176306995056, 49.1004680919245], [19.5377163065373, 49.0968200650064], [19.5590894524812, 49.0928286943783], [19.5801192547152, 49.0989230452298], [19.5760849661234, 49.106562442776], [19.5526517579198, 49.11291430141], [19.5397763687969, 49.1253605108954], [19.5371154550449, 49.1339011856803], [19.5261284563267, 49.1311544360007], [19.5185748947079, 49.1339011856803], [19.5061286852225, 49.1339011856803], [19.4890473356528, 49.1278068348288], [19.484841375206, 49.1138155786486], [19.4951416865043, 49.0925282686321] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 312,
+         "id" : 128336,
+         "pfafstette" : 928537,
+         "lke_type" : "N",
+         "altitude" : 555,
+         "objectid" : 79561,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_79561",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 313,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [22.0459279436001, 48.81811080846], [22.0069584325215, 48.8105572468412], [21.9933105200513, 48.8056645989745], [21.9653280076909, 48.7989693966306], [21.9543410089727, 48.7822313907709], [21.980005951291, 48.7737336339498], [22.0234389305988, 48.7822313907709], [22.0453270921077, 48.7897849523897], [22.0622367698224, 48.7971239241897], [22.0818073612891, 48.8123168833547], [22.0459279436001, 48.81811080846] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 313,
+         "id" : 128473,
+         "pfafstette" : 686445,
+         "lke_type" : "N",
+         "altitude" : 109,
+         "objectid" : 79643,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_79643",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 314,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [27.2563404138436, 47.8862330617103], [27.2626922724776, 47.9083787310016], [27.2612330617103, 47.9123701016297], [27.2490443600073, 47.893786623329], [27.2381431972166, 47.8816408395898], [27.2253536440212, 47.8880785341512], [27.2224352224867, 47.9011255951291], [27.2111907159861, 47.9148164255631], [27.1875, 47.9180352728438], [27.1894742263322, 47.9375629463468], [27.1875, 47.9492795504486], [27.1730795641824, 47.9649875251785], [27.181663156931, 47.9727127586523], [27.1758263138619, 47.9883348974547], [27.1618350576817, 47.9975622596594], [27.1432086614173, 47.9871331944699], [27.1464704266618, 47.9707814502838], [27.1406335835927, 47.9570906198498], [27.1492171763413, 47.9329707242263], [27.154281496063, 47.912155511811], [27.1715345174876, 47.9027564777513], [27.1865558047977, 47.8944303927852], [27.1943668741989, 47.8682933528658], [27.2050963651346, 47.847048960813], [27.2323921900751, 47.8574780260026], [27.2487868522249, 47.8661045367149], [27.2563404138436, 47.8862330617103] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 314,
+         "id" : 128755,
+         "pfafstette" : 18735,
+         "lke_type" : "N",
+         "altitude" : 82,
+         "objectid" : 79875,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_79875",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 315,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [26.0692295367149, 46.9719516800952], [26.0801306995056, 46.9601063221022], [26.1005596502472, 46.9467159174144], [26.1216752884087, 46.9543553149606], [26.1145509064274, 46.9643552005127], [26.095752838308, 46.974655511811], [26.08373580846, 46.9913935176708], [26.0859675425746, 47.0090328007691], [26.074723036074, 47.0248266114265], [26.0622768265885, 47.0345689891961], [26.0437362662516, 47.0506632255997], [26.0296591741439, 47.054955021974], [25.9894879600806, 47.0592039003845], [26.0039083958982, 47.0430238280535], [26.035152673503, 47.0313072239517], [26.05369323384, 47.0214790102545], [26.0605601080388, 47.0059427073796], [26.0610751236037, 46.9886467679912], [26.0692295367149, 46.9719516800952] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 315,
+         "id" : 131552,
+         "pfafstette" : 28531,
+         "lke_type" : "N",
+         "altitude" : 617,
+         "objectid" : 80189,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_80189",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 316,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [4.3044142556308, 48.2773444652994], [4.2996074436916, 48.2664862204724], [4.3107661142648, 48.2557996475005], [4.3347143380333, 48.2628381935543], [4.358147546237, 48.2764861060245], [4.3657011078557, 48.2867434993591], [4.3703362479399, 48.2946833226515], [4.3725679820546, 48.300777673503], [4.3481905786486, 48.307129532137], [4.3193497070134, 48.2946833226515], [4.3044142556308, 48.2773444652994] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 316,
+         "id" : 131155,
+         "name" : "Etang de la Morge des Champs",
+         "pfafstette" : 8824,
+         "lke_type" : "N",
+         "altitude" : 250,
+         "objectid" : 80303,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 317,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [12.4206303790515, 47.8931857718366], [12.4002872642373, 47.884945522798], [12.3878410547519, 47.8901385964109], [12.3672404321553, 47.8931857718366], [12.3578843160593, 47.8831858862846], [12.3701588536898, 47.8573063541476], [12.381317524263, 47.8412550357077], [12.4109309192456, 47.8424567386925], [12.4376258926937, 47.8460618476469], [12.4517029848013, 47.8479073200879], [12.4688701702985, 47.8479073200879], [12.4768529115547, 47.8576926158213], [12.4980543856437, 47.8661474546786], [12.5202858908625, 47.871598036074], [12.5275819446988, 47.8858897180004], [12.5306720380883, 47.9023702160776], [12.5136765244461, 47.9117692501373], [12.4968526826589, 47.9272626350485], [12.47496452115, 47.9406101217726], [12.4506729536715, 47.9364041613258], [12.4379692364036, 47.9232712644204], [12.4311881981322, 47.9083787310016], [12.4206303790515, 47.8931857718366] ],
+            [ [12.4029481779894, 47.8749885552097], [12.4118751144479, 47.8658470289324], [12.402347326497, 47.8615981505219], [12.3896436092291, 47.8618985762681], [12.3893002655191, 47.871598036074], [12.4029481779894, 47.8749885552097] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 317,
+         "id" : 132037,
+         "name" : "CHIEMSEE",
+         "pfafstette" : 986393,
+         "lke_type" : "N",
+         "altitude" : 518,
+         "objectid" : 80711,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 318,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [13.4953820271013, 47.8148175700421], [13.4934936366966, 47.8125], [13.4865409265702, 47.8038305713239], [13.4968412378685, 47.7980366462186], [13.5083432521516, 47.8016846731368], [13.5280855154734, 47.8071781724959], [13.5325489837026, 47.8125], [13.5463685680278, 47.8291092519685], [13.5582139260209, 47.86524617744], [13.5703167917964, 47.894129967039], [13.5827630012818, 47.9321552829152], [13.5873981413661, 47.9579489791247], [13.5743510803882, 47.9527559055118], [13.5554671763413, 47.9448160822194], [13.5442226698407, 47.9360608176158], [13.5388150064091, 47.9235716901666], [13.5322056399927, 47.9035290010987], [13.527312992126, 47.8821987731185], [13.5257679454313, 47.8731860007325], [13.527312992126, 47.8573063541476], [13.5156393059879, 47.8321135094305], [13.4953820271013, 47.8148175700421] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 318,
+         "id" : 131954,
+         "name" : "Attersee",
+         "pfafstette" : 9786713,
+         "lke_type" : "N",
+         "altitude" : 467,
+         "objectid" : 80726,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 319,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [11.2976389397546, 47.8606539553195], [11.2919737685406, 47.8479073200879], [11.3063942043582, 47.8339160639077], [11.3274240065922, 47.8290663340047], [11.3366942867607, 47.8379074345358], [11.3372951382531, 47.8606539553195], [11.3340333730086, 47.9071770280168], [11.3386685130929, 47.9512966947445], [11.3519730818532, 47.9758886879692], [11.3592691356894, 47.9974335057682], [11.3491404962461, 48.0050299853507], [11.3333466855887, 47.9907383034243], [11.3149777971068, 47.964901689251], [11.2990981505219, 47.9409105475188], [11.2851927302692, 47.9203099249222], [11.2731757004212, 47.90297106757], [11.2803000824025, 47.8913832173594], [11.2956647134225, 47.8761473402307], [11.2976389397546, 47.8606539553195] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 319,
+         "id" : 131959,
+         "name" : "Starnberger See",
+         "pfafstette" : 992465,
+         "lke_type" : "N",
+         "altitude" : 584,
+         "objectid" : 80764,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 320,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [13.7834473997436, 47.8558471433803], [13.7877391961179, 47.8342164896539], [13.7977819996338, 47.8238732603919], [13.8093698498444, 47.842714246475], [13.8132324665812, 47.8588514008423], [13.8163225599707, 47.8731860007325], [13.8103140450467, 47.8929711820179], [13.8068806079473, 47.9111254806812], [13.8044772019777, 47.9232712644204], [13.7825890404688, 47.9168764878227], [13.7716020417506, 47.9013831029115], [13.7779539003846, 47.8779928126717], [13.7834473997436, 47.8558471433803] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 320,
+         "id" : 131995,
+         "name" : "Traunsee",
+         "pfafstette" : 9787135,
+         "lke_type" : "N",
+         "altitude" : 420,
+         "objectid" : 80916,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 321,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [20.5966741439297, 47.5688547198315], [20.6062019318806, 47.5633183025087], [20.6348711316609, 47.5704856024538], [20.6496349111884, 47.5831464017579], [20.6617377769639, 47.5983393609229], [20.6766732283464, 47.6113864219008], [20.6885185863395, 47.6244764008423], [20.6880035707746, 47.6333175013734], [20.6836259384728, 47.6457637108588], [20.6620811206739, 47.6455062030764], [20.6419955136422, 47.6369655282915], [20.6304076634316, 47.6299699002014], [20.6140130012818, 47.6061933482879], [20.5966741439297, 47.5688547198315] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 321,
+         "id" : 131679,
+         "name" : "Middle of Poroszl basin",
+         "pfafstette" : 6591,
+         "lke_type" : "N",
+         "altitude" : 84,
+         "objectid" : 80952,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 322,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [11.1160959531221, 47.9555026551913], [11.1306022248672, 47.9500091558323], [11.1372974272111, 47.9497087300861], [11.1446793169749, 47.9500091558323], [11.1511170115364, 47.9655025407434], [11.1608164713423, 47.989279092657], [11.1704300952207, 48.0041716260758], [11.15918558872, 48.0101801409998], [11.1426192547153, 48.01683242538], [11.1330914667643, 48.0403085515473], [11.1342931697491, 48.0643426112433], [11.137984114631, 48.0782480314961], [11.1239928584508, 48.0816814685955], [11.105108954404, 48.06923525911], [11.0978129005677, 48.0454587071965], [11.0973837209302, 48.0090213559787], [11.1042505951291, 47.9786354376488], [11.1087998992859, 47.9655883766709], [11.1160959531221, 47.9555026551913] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 322,
+         "id" : 131823,
+         "name" : "Ammersee",
+         "pfafstette" : 9924939,
+         "lke_type" : "N",
+         "altitude" : 533,
+         "objectid" : 81005,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 323,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [16.7688209577001, 47.8044314228163], [16.7758595037539, 47.8125], [16.8000652353049, 47.8403537584691], [16.8149148507599, 47.8524995422084], [16.823755951291, 47.8609543810657], [16.8393780900934, 47.880439136605], [16.8495925654642, 47.9077778795092], [16.8510517762315, 47.9293226973082], [16.8371463559788, 47.9366616691082], [16.8071037813587, 47.9317690212415], [16.772511902582, 47.9220695614356], [16.7469327961912, 47.9022843801501], [16.7335423915034, 47.883786737777], [16.7286497436367, 47.8664478804248], [16.72410043948, 47.8366628135872], [16.7135426203992, 47.8175214017579], [16.711568394067, 47.8125], [16.7021264420436, 47.7886376121589], [16.7031564731734, 47.7643031267167], [16.7110533785021, 47.7570929088079], [16.7074482695477, 47.7500543627541], [16.6949162241348, 47.7433591604102], [16.6904527559055, 47.7251190258195], [16.7010964109138, 47.7129732420802], [16.7067615821278, 47.7248186000732], [16.7049590276506, 47.7418141137154], [16.717748580846, 47.7381660867973], [16.7295081029116, 47.7154195660136], [16.7443577183666, 47.6904413111152], [16.7676192547153, 47.6840894524812], [16.7806663156931, 47.6819435542941], [16.793713376671, 47.6737033052555], [16.8004085790148, 47.6783384453397], [16.8061595861564, 47.6883812488555], [16.8007519227248, 47.7041750595129], [16.7818680186779, 47.7181663156931], [16.7618682475737, 47.7120290468779], [16.7411817890496, 47.7114281953855], [16.7372333363853, 47.7387669382897], [16.7460744369163, 47.7697966260758], [16.7524262955503, 47.780783624794], [16.7688209577001, 47.8044314228163] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 323,
+         "id" : 131705,
+         "name" : "Neusiedler See",
+         "lge_id" : "de",
+         "pfafstette" : 9422653,
+         "lke_type" : "B",
+         "altitude" : 115,
+         "objectid" : 81020,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 324,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [4.8305884911188, 48.5843366599524], [4.8132496337667, 48.5831349569676], [4.8100737044497, 48.5797873557956], [4.7942798937923, 48.5861821323933], [4.7880138710859, 48.5996154550449], [4.7892155740707, 48.6086282274309], [4.7612330617103, 48.6159671992309], [4.723894433254, 48.6159671992309], [4.7047530214246, 48.6049802005127], [4.70286463102, 48.595581166453], [4.7059547244094, 48.5810748947079], [4.7129074345358, 48.5663969511078], [4.738744048709, 48.565195248123], [4.7646664988097, 48.565195248123], [4.7803744735396, 48.5560966398095], [4.7907606207654, 48.5560966398095], [4.8061252517854, 48.564036463102], [4.8190006409083, 48.5700878959897], [4.8256958432522, 48.5728346456693], [4.8408029664897, 48.5764397546237], [4.8305884911188, 48.5843366599524] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 324,
+         "id" : 130371,
+         "name" : "tang de Bonnevais",
+         "pfafstette" : 896623,
+         "lke_type" : "N",
+         "altitude" : 300,
+         "objectid" : 81340,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 325,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [9.1644444698773, 47.1281730681194], [9.2060748947079, 47.1224220609778], [9.247791155466, 47.1218212094854], [9.2800654642007, 47.1239241897089], [9.3021252975646, 47.1306193920527], [9.2321690166636, 47.13941757462], [9.1503673777696, 47.1446106482329], [9.1313976377953, 47.1406192776048], [9.1379211682842, 47.1326794543124], [9.1644444698773, 47.1281730681194] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 325,
+         "id" : 133316,
+         "name" : "Walensee",
+         "lge_id" : "de",
+         "pfafstette" : 829153,
+         "lke_type" : "N",
+         "altitude" : 418,
+         "objectid" : 81473,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 326,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [8.4793879326131, 47.0941391228713], [8.507112937191, 47.0755556445706], [8.5240226149057, 47.0740964338033], [8.5268552005127, 47.0886456235122], [8.5137223036074, 47.1087741485076], [8.4995593755722, 47.1254263184398], [8.5011902581945, 47.1372716764329], [8.510288866508, 47.1610053103827], [8.4924349935909, 47.1850822880425], [8.4620490752609, 47.1868419245559], [8.4589589818715, 47.1561555804798], [8.4761261673686, 47.1232804202527], [8.4756969877312, 47.1120788317158], [8.4793879326131, 47.0941391228713] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 326,
+         "id" : 133210,
+         "name" : "ZUGER SEE",
+         "pfafstette" : 8421,
+         "lke_type" : "N",
+         "altitude" : 411,
+         "objectid" : 81474,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 327,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [7.0913351492401, 47.0694612937191], [7.07665720564, 47.059804751877], [7.0915926570225, 47.0552554477202], [7.1061847646951, 47.0506632255997], [7.1225794268449, 47.0473156244278], [7.1533086888848, 47.0551696117927], [7.1870422083867, 47.0774011170115], [7.2043810657389, 47.0980446575719], [7.2140805255448, 47.1145251556492], [7.2282434535799, 47.1302760483428], [7.2331361014466, 47.1388167231276], [7.2258400476103, 47.1406192776048], [7.1976000274675, 47.1232804202527], [7.1450684398462, 47.0956412516023], [7.1119357718367, 47.0786028199963], [7.0913351492401, 47.0694612937191] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 327,
+         "id" : 133254,
+         "name" : "BIELER SEE",
+         "pfafstette" : 85953,
+         "lke_type" : "N",
+         "altitude" : 425,
+         "objectid" : 81526,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 328,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [28.6232775590551, 45.346219213514], [28.6338353781359, 45.3330863166087], [28.6096296465849, 45.3254469190624], [28.5876556491485, 45.3199534197034], [28.5839647042666, 45.3017562030764], [28.6023335927486, 45.2801684673137], [28.635981276323, 45.268923960813], [28.6599295000916, 45.267421832082], [28.6816459897455, 45.2652759338949], [28.7116885643655, 45.2680656015382], [28.7324608588171, 45.2777650613441], [28.72997161692, 45.2920567432705], [28.7259373283282, 45.3057475737045], [28.7365809833364, 45.3075501281817], [28.7472246383446, 45.3111552371361], [28.7405294360007, 45.3242452160776], [28.7250789690533, 45.3327858908625], [28.7122894158579, 45.3403394524812], [28.6857661142648, 45.3501247482146], [28.6712598425197, 45.3611117469328], [28.6706589910273, 45.3805106665446], [28.6627620856986, 45.399308734664], [28.6669680461454, 45.4148021195752], [28.669714795825, 45.4245874153086], [28.6645646401758, 45.4425271241531], [28.6535776414576, 45.4716684215345], [28.6530626258927, 45.5060027925288], [28.6521184306904, 45.5303372779711], [28.6448223768541, 45.5412813587255], [28.6406164164073, 45.5613669657572], [28.6371829793078, 45.5816671626076], [28.6341787218458, 45.603297816334], [28.6231917231276, 45.6214521149973], [28.621131660868, 45.6339841604102], [28.6162390130013, 45.6528251464933], [28.6098871543673, 45.6692627266069], [28.6067970609779, 45.6795630379051], [28.5947800311298, 45.6823097875847], [28.5873981413661, 45.6691768906794], [28.5849947353965, 45.6400355932979], [28.5968400933895, 45.6105938701703], [28.6110888573521, 45.5862593847281], [28.6162390130013, 45.5649291567479], [28.6162390130013, 45.5553155328694], [28.5995010071416, 45.5398221479583], [28.5885140084234, 45.4932990752609], [28.5930633125801, 45.4516686504303], [28.5946083592749, 45.4163900842337], [28.5958100622597, 45.3740729719832], [28.6031919520234, 45.3549744781176], [28.6232775590551, 45.346219213514] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 328,
+         "id" : 133066,
+         "name" : "Yalpug and Kugurlui",
+         "pfafstette" : 16113,
+         "lke_type" : "N",
+         "altitude" : -1,
+         "objectid" : 81564,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 329,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [29.0360625343344, 45.4443296786303], [29.0451611426479, 45.465574070683], [29.0430152444607, 45.4707671442959], [29.0254188793261, 45.4641148599158], [29.0073074986266, 45.4635140084234], [28.9956338124886, 45.4847584004761], [28.9897969694195, 45.5005522111335], [28.9891102819996, 45.5118396355979], [28.9819859000183, 45.5284918055301], [28.9711705731551, 45.5452298113899], [28.9740031587621, 45.5683625938473], [28.9722006042849, 45.5890061344076], [28.9601835744369, 45.5923537355796], [28.9540892235854, 45.5659162699139], [28.963016160044, 45.5349295000916], [28.9675654642007, 45.5163460217909], [28.968509659403, 45.5023976835744], [28.9756340413844, 45.4904664896539], [28.9703122138803, 45.4762177256913], [28.9575226606849, 45.4716684215345], [28.953831715803, 45.462913156931], [28.9526300128182, 45.4333426799121], [28.968509659403, 45.4102957333822], [28.9940029298663, 45.4075489837026], [29.0034448818898, 45.4029567615821], [29.0165777787951, 45.4005962735763], [29.0303115271928, 45.4148450375389], [29.0360625343344, 45.4443296786303] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 329,
+         "id" : 133092,
+         "pfafstette" : 143,
+         "altitude" : -1,
+         "objectid" : 81636,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_81636",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 330,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [8.7614447903314, 47.242420687603], [8.7231619666728, 47.2461116324849], [8.7006729536715, 47.2567123695294], [8.6526048342794, 47.2746520783739], [8.5981848562534, 47.3038362937191], [8.5742366324849, 47.3369689617286], [8.5522626350485, 47.361947216627], [8.537155511811, 47.3607455136422], [8.5471124793994, 47.3376127311848], [8.5580994781176, 47.3187288271379], [8.5656530397363, 47.307183894891], [8.5780992492218, 47.2919909357261], [8.5903737868522, 47.2764975508149], [8.6103735579564, 47.2655105520967], [8.6367251876946, 47.2594591192089], [8.6658235671123, 47.2461116324849], [8.6907159860831, 47.2299744781176], [8.7084840230727, 47.2178286943783], [8.730973036074, 47.212034769273], [8.7688266800952, 47.215382370445], [8.8052211133492, 47.2095884453397], [8.8337186412745, 47.2020348837209], [8.8523450375389, 47.2056829106391], [8.873031496063, 47.2135798159678], [8.8984389305988, 47.2147815189526], [8.9221296465849, 47.2175282686321], [8.9370650979674, 47.2281719236404], [8.9067650155649, 47.2293736266252], [8.869855566746, 47.2275281541842], [8.855005951291, 47.2278714978942], [8.8325169382897, 47.2275281541842], [8.8176673228347, 47.2373134499176], [8.806422816334, 47.2458112067387], [8.791229857169, 47.2451674372826], [8.7614447903314, 47.242420687603] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 330,
+         "id" : 132978,
+         "name" : "ZUERICH SEE",
+         "pfafstette" : 8231,
+         "lke_type" : "N",
+         "altitude" : 454,
+         "objectid" : 81867,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 331,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [29.1341729994507, 45.5291355749863], [29.1213834462553, 45.5023976835744], [29.1304820545688, 45.4923977980223], [29.1526277238601, 45.49145360282], [29.171168284197, 45.4953591375206], [29.1660181285479, 45.5120971433803], [29.1627563633034, 45.5320969144845], [29.1672198315327, 45.5452298113899], [29.1755459164988, 45.5553155328694], [29.186532915217, 45.5704226561069], [29.2006958432522, 45.5896069859], [29.2206956143564, 45.6120530809376], [29.2295367148874, 45.6348854376488], [29.222927348471, 45.645872436367], [29.2202664347189, 45.6585761536349], [29.2186355520967, 45.6805072331075], [29.1958031953855, 45.6963010437649], [29.1818977751328, 45.6920092473906], [29.1812969236404, 45.6634688015016], [29.1873054385644, 45.6285335790148], [29.1972624061527, 45.6075466947446], [29.1870479307819, 45.594113372093], [29.1697090734298, 45.577418284197], [29.1599237776964, 45.5686201016297], [29.1521127082952, 45.5586202160776], [29.1341729994507, 45.5291355749863] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 331,
+         "id" : 132918,
+         "pfafstette" : 12313,
+         "lke_type" : "N",
+         "altitude" : 7,
+         "objectid" : 82033,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_82033",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 332,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [27.1759121497894, 46.2003296099615], [27.1820065006409, 46.2144067020692], [27.1584874565098, 46.2388270234389], [27.1453545596045, 46.2540199826039], [27.1367709668559, 46.271530511811], [27.1250114447903, 46.2754789644754], [27.1084451107856, 46.2907577595678], [27.0937671671855, 46.3056073750229], [27.0741965757187, 46.304749015748], [27.0820076451199, 46.2871955685772], [27.0996040102545, 46.2695992034426], [27.1172003753891, 46.2500715299396], [27.1562557223952, 46.2110161829335], [27.1759121497894, 46.2003296099615] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 332,
+         "id" : 132586,
+         "pfafstette" : 27331,
+         "lke_type" : "N",
+         "altitude" : 108,
+         "objectid" : 82042,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_82042",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 333,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [28.1335835927486, 45.8339818714521], [28.1406221388024, 45.816471342245], [28.1496349111884, 45.7941969190624], [28.1784757828237, 45.8275870948544], [28.1845701336752, 45.8631660867973], [28.17040720564, 45.8695179454312], [28.1576176524446, 45.8674578831716], [28.1455147866691, 45.8656124107306], [28.134184444241, 45.8494752563633], [28.1335835927486, 45.8339818714521] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 333,
+         "id" : 132929,
+         "pfafstette" : 181315,
+         "lke_type" : "N",
+         "altitude" : 3,
+         "objectid" : 82075,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_82075",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 334,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [28.3481734114631, 45.3658327229445], [28.3718641274492, 45.3503393380333], [28.3898038362937, 45.3431291201245], [28.418473036074, 45.3439874793994], [28.4387303149606, 45.3494809787585], [28.4441379783922, 45.3705107809925], [28.4418204083501, 45.4227419428676], [28.4372711041934, 45.4574196575719], [28.4317776048343, 45.4838142052738], [28.4262841054752, 45.5160455960447], [28.4195889031313, 45.5178910684856], [28.4122070133675, 45.4947582860282], [28.4162413019594, 45.4641148599158], [28.4195889031313, 45.4431279756455], [28.4111769822377, 45.4202956189343], [28.382250274675, 45.4190939159495], [28.3459416773485, 45.4345873008606], [28.3198475553928, 45.4300809146676], [28.3095472440945, 45.4102957333822], [28.3207917505951, 45.3868625251785], [28.3481734114631, 45.3658327229445] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 334,
+         "id" : 133395,
+         "pfafstette" : 1781,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 82335,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_82335",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 335,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [6.8533121223219, 46.8652576222304], [6.8867022981139, 46.8914375801135], [6.913053927852, 46.9084330937557], [6.9545985167552, 46.9303641732283], [7.0016366050174, 46.9588617011536], [7.0350267808094, 46.9801490111701], [7.043438701703, 47.0023375984252], [7.0219797198315, 47.0111786989562], [6.9988040194104, 47.015384659403], [6.9848985991577, 47.0196764557773], [6.964812992126, 47.0114791247024], [6.9185474272111, 46.9947411188427], [6.88000709577, 46.9825524171397], [6.8730543856437, 46.9664581807361], [6.8557155282915, 46.9482609641091], [6.8229262039919, 46.9339692821828], [6.7924544497345, 46.9126819721663], [6.7717679912104, 46.8974460950375], [6.7590642739425, 46.8837981825673], [6.7341718549716, 46.8643992629555], [6.7088502563633, 46.8501075810291], [6.6894513367515, 46.8364167505951], [6.6674773393151, 46.8266743728255], [6.6472200604285, 46.8172753387658], [6.6435291155466, 46.8017819538546], [6.6596662699139, 46.7941425563084], [6.692369758286, 46.8048291292804], [6.7304809100897, 46.8151294405787], [6.7496223219191, 46.8129835423915], [6.7851583958982, 46.8297215482512], [6.8244712506867, 46.850965940304], [6.8533121223219, 46.8652576222304] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 335,
+         "id" : 133544,
+         "name" : "Neuchatel",
+         "lge_id" : "fr",
+         "pfafstette" : 8619,
+         "lke_type" : "N",
+         "altitude" : 422,
+         "objectid" : 82396,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 336,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [7.0510780992492, 46.9403211408167], [7.0410352957334, 46.9211368110236], [7.0566574345358, 46.9129823979125], [7.073652948178, 46.915729147592], [7.1086740065922, 46.9351709851676], [7.1295321369713, 46.9582608496612], [7.1167425837759, 46.9652564777513], [7.088845907343, 46.9585612754074], [7.0510780992492, 46.9403211408167] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 336,
+         "id" : 133658,
+         "name" : "MURTENSEE",
+         "pfafstette" : 86231,
+         "lke_type" : "N",
+         "altitude" : 423,
+         "objectid" : 82405,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 337,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [29.3369174601721, 45.3023570545688], [29.358977293536, 45.2926575947629], [29.3635265976927, 45.2811555804798], [29.359148965391, 45.2741170344259], [29.3661016755173, 45.2719711362388], [29.3873031496063, 45.2777650613441], [29.4028394524812, 45.29480349295], [29.3946850393701, 45.3121423503021], [29.3788912287127, 45.3196959119209], [29.3715951748764, 45.3303395669291], [29.3657583318074, 45.3382793902216], [29.3527112708295, 45.335532640542], [29.3386341787219, 45.3275928172496], [29.328419703351, 45.3133011353232], [29.3369174601721, 45.3023570545688] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 337,
+         "id" : 133421,
+         "pfafstette" : 0,
+         "lke_type" : "N",
+         "altitude" : -1,
+         "objectid" : 82409,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_82409",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 338,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [28.0959874565098, 45.4635140084234], [28.1023393151437, 45.4862605292071], [28.0986483702619, 45.5126979948727], [28.067404092657, 45.5139426158213], [28.0429408533236, 45.495959989013], [28.0491210401025, 45.4741147454679], [28.0717817249588, 45.4680203946164], [28.0959874565098, 45.4635140084234] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 338,
+         "id" : 133554,
+         "name" : "Lacul Brates",
+         "pfafstette" : 0,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 82416,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 339,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [8.3859984435085, 47.0576159357261], [8.3532949551364, 47.0488177531588], [8.3383595037539, 47.059461408167], [8.3307201062077, 47.0580021973997], [8.3322651529024, 47.0470151986816], [8.3392178630288, 47.0275304431423], [8.3351835744369, 47.0114791247024], [8.3240249038638, 47.0145263001282], [8.3127803973631, 47.0181314090826], [8.3113211865959, 47.0090328007691], [8.3149262955503, 46.9943977751328], [8.2975874381981, 46.9777456052005], [8.2829953305256, 46.9646556262589], [8.2942398370262, 46.9616084508332], [8.3215356619667, 46.9707070591467], [8.3383595037539, 46.9843978895807], [8.3437671671855, 46.9904922404322], [8.3599043215528, 47.0017367469328], [8.4146676432888, 47.0097624061527], [8.4389592107673, 46.9998912744919], [8.42213536898, 46.9898913889398], [8.446512772386, 46.9816940578649], [8.4724352224867, 46.9759001327596], [8.4936366965757, 46.9716083363853], [8.5316620124519, 46.9764580662882], [8.5699448361106, 46.9889471937374], [8.5912321461271, 46.9950415445889], [8.5948372550815, 46.9837541201245], [8.5872836934627, 46.954956166453], [8.5878845449551, 46.9327246612342], [8.5948372550815, 46.915729147592], [8.600588262223, 46.8998924189709], [8.6167254165904, 46.90504257462], [8.6246223219191, 46.9215230726973], [8.6170687603003, 46.9351709851676], [8.6167254165904, 46.9470163431606], [8.6155237136056, 46.9780460309467], [8.5991290514558, 47.0059856253433], [8.5805884911188, 47.0090328007691], [8.5623054385644, 47.0029384499176], [8.537327183666, 46.9998912744919], [8.5075421168284, 47.0008783876579], [8.4875423457242, 47.01087827321], [8.4653108405054, 47.0300196850394], [8.4236804156748, 47.0385174418605], [8.413122596594, 47.0494615226149], [8.4304614539462, 47.0677016572056], [8.4210195019227, 47.0743539415858], [8.3859984435085, 47.0576159357261] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 339,
+         "id" : 133448,
+         "name" : "Vierwaldstttersee",
+         "lge_id" : "de",
+         "pfafstette" : 8451,
+         "lke_type" : "N",
+         "altitude" : 434,
+         "objectid" : 82510,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 340,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [9.1416121131661, 45.8950112158945], [9.1291659036807, 45.8823504165904], [9.1191231001648, 45.8774577687237], [9.1069343984618, 45.8723076130745], [9.0924281267167, 45.8607197628639], [9.084702893243, 45.8540674784838], [9.0732867148874, 45.842179202527], [9.0675357077458, 45.8266858176158], [9.0759476286395, 45.8227802829152], [9.0829861746933, 45.8288746337667], [9.0893380333272, 45.8378874061527], [9.106076039187, 45.8540245605201], [9.127105841421, 45.8665136879692], [9.1474489562351, 45.870719648416], [9.1560325489837, 45.8990455044864], [9.1540583226515, 45.9333369575169], [9.1681354147592, 45.9494741118843], [9.1982638253067, 45.9568130836843], [9.2231562442776, 45.9680146722212], [9.2468469602637, 45.9850101858634], [9.2647008331807, 45.9847526780809], [9.269335973265, 45.9765124290423], [9.2819538546054, 45.9473282136971], [9.3096788591833, 45.9056977888665], [9.335429637429, 45.8911056811939], [9.3562019318806, 45.8813633034243], [9.365987227614, 45.8695179454312], [9.3814376945614, 45.858874290423], [9.396373145944, 45.8397328785937], [9.4004074345358, 45.8196901895257], [9.4128536440212, 45.8193468458158], [9.408218503937, 45.8415783510346], [9.3923388573521, 45.8570717359458], [9.383841100531, 45.8705050585973], [9.363154642007, 45.8941528566197], [9.3413523164256, 45.9035518906794], [9.3310520051273, 45.9111483702619], [9.3203225141915, 45.9208907480315], [9.3137131477751, 45.9357832814503], [9.3078763047061, 45.9537229902948], [9.3029836568394, 45.9674138207288], [9.2942283922359, 45.9971988875664], [9.2849581120674, 46.0257822514192], [9.2937133766709, 46.0398164255631], [9.3076187969236, 46.0534643380333], [9.3131122962827, 46.0671551684673], [9.3061595861564, 46.0786142647867], [9.3054728987365, 46.0871549395715], [9.3162023896722, 46.1038929454312], [9.3170607489471, 46.123291865043], [9.3286485991577, 46.1342788637612], [9.3556869163157, 46.1424761948361], [9.3730257736678, 46.1485705456876], [9.3798926478667, 46.1619180324116], [9.3701073521333, 46.1750080113532], [9.3489058780443, 46.1722612616737], [9.3392064182384, 46.1625618018678], [9.3243568027834, 46.1579695797473], [9.3076187969236, 46.1516177211134], [9.2988635323201, 46.1442787493133], [9.2853872917048, 46.1342788637612], [9.2792929408533, 46.1026483244827], [9.2707951840322, 46.0735070271013], [9.256803927852, 46.0582282320088], [9.2446152261491, 46.0469837255081], [9.2364608130379, 46.0285290010987], [9.2373191723128, 46.0063404138436], [9.2309673136788, 45.9953534151254], [9.2144009796741, 45.9892590642739], [9.2009247390588, 45.9823063541476], [9.1847875846915, 45.976555347006], [9.1516549166819, 45.9655683482879], [9.1311401300128, 45.9337232191906], [9.1383503479216, 45.9081441127999], [9.1416121131661, 45.8950112158945] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 340,
+         "id" : 135053,
+         "name" : "Lago di Como",
+         "pfafstette" : 4535,
+         "lke_type" : "N",
+         "altitude" : 198,
+         "objectid" : 82985,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 341,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [28.7739196117927, 44.9063100851493], [28.7944343984618, 44.9002586522615], [28.8032325810291, 44.8990569492767], [28.7961511170115, 44.9206446850394], [28.7761513459074, 44.9446358267717], [28.7566236724043, 44.9507301776232], [28.7380401941037, 44.9424899285845], [28.7357226240615, 44.9267819538546], [28.7485550952207, 44.9142499084417], [28.7739196117927, 44.9063100851493] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 341,
+         "id" : 134404,
+         "name" : "Lacul Babadag",
+         "pfafstette" : 79,
+         "lke_type" : "N",
+         "altitude" : -2,
+         "objectid" : 83314,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 342,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [14.059495742538, 46.6236724043216], [14.0655900933895, 46.6184793307087], [14.0974352224867, 46.6254749587988], [14.1420699047794, 46.6284792162608], [14.1734858542392, 46.6199814594397], [14.195545687603, 46.6169342840139], [14.2290216993225, 46.6196381157297], [14.2521973997437, 46.6260328923274], [14.2430129555027, 46.6339727156199], [14.2140862479399, 46.6306251144479], [14.177348470976, 46.6339297976561], [14.1437007874016, 46.6442730269181], [14.0959760117195, 46.6375778245743], [14.059495742538, 46.6236724043216] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 342,
+         "id" : 134216,
+         "name" : "Wrther See",
+         "pfafstette" : 882231,
+         "lke_type" : "N",
+         "altitude" : 437,
+         "objectid" : 83462,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 343,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [29.1672627494964, 44.882318943417], [29.1648164255631, 44.8665680507233], [29.1736146081304, 44.8565252472075], [29.1953310977843, 44.8586282274309], [29.2116828419703, 44.8692718824391], [29.2241290514558, 44.8801730452298], [29.2335280855155, 44.8939067936276], [29.2219402353049, 44.9039495971434], [29.201897546237, 44.9048079564183], [29.1818977751328, 44.8975977385094], [29.1672627494964, 44.882318943417] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 343,
+         "id" : 134336,
+         "name" : "Lacul Dranov",
+         "pfafstette" : 41,
+         "lke_type" : "N",
+         "altitude" : -3,
+         "objectid" : 83467,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 344,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [28.5649520463285, 44.3692776048343], [28.5794583180736, 44.3677325581395], [28.584737227614, 44.3653720701337], [28.5967971754258, 44.3571318210951], [28.6071833226515, 44.3474323612892], [28.6128055759019, 44.337947491302], [28.6311315464201, 44.3458443966307], [28.6353804248306, 44.3665737731185], [28.6092433849112, 44.3817238143197], [28.5822909036807, 44.387517739425], [28.574222326497, 44.3923245513642], [28.5645657846548, 44.4002643746567], [28.5551667505951, 44.3881185909174], [28.5649520463285, 44.3692776048343] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 344,
+         "id" : 135277,
+         "name" : "Lacul Tasaul",
+         "pfafstette" : 311,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 83685,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 345,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [6.2180404229995, 45.8020509064274], [6.2279973905878, 45.8084886009888], [6.2322891869621, 45.8221365134591], [6.2207013367515, 45.8397328785937], [6.2007015656473, 45.8513207288042], [6.1887703717268, 45.8631660867973], [6.1729765610694, 45.8941528566197], [6.1472257828237, 45.913637612159], [6.139328877495, 45.9056977888665], [6.144994048709, 45.8805049441494], [6.151174235488, 45.8586597006043], [6.1654229994507, 45.8537670527376], [6.1843069034975, 45.8449259522066], [6.2004440578649, 45.8370290468779], [6.2110877128731, 45.8193897637795], [6.2180404229995, 45.8020509064274] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 345,
+         "id" : 135366,
+         "name" : "Lac d' Annecy",
+         "pfafstette" : 64431,
+         "lke_type" : "N",
+         "altitude" : 447,
+         "objectid" : 83715,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 346,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [8.9750904138436, 45.9384871131661], [8.9655626258927, 45.9527787950925], [8.9714853048892, 45.9749673823476], [9.0071072147958, 46.0032932384179], [9.039295687603, 46.0169840688519], [9.0683940670207, 46.0178424281267], [9.1106253433437, 46.0263831029116], [9.1218698498444, 46.0412756363303], [9.1045309924922, 46.0394301638894], [9.066677348471, 46.0333787310016], [9.0216134865409, 46.0233359274858], [8.9897683574437, 46.0108897180004], [8.9741462186413, 46.0111901437466], [8.960498306171, 46.0123918467314], [8.9532880882622, 45.998100164805], [8.95165720564, 45.9749673823476], [8.9392109961546, 45.9531221388024], [8.9249622321919, 45.9364270509064], [8.9088250778246, 45.9364270509064], [8.9027307269731, 45.9500749633767], [8.903074070683, 45.9665125434902], [8.906421671855, 45.9874994277605], [8.9033315784655, 45.9993447857535], [8.8945763138619, 45.9911045367149], [8.8896836659952, 45.9817055026552], [8.8859927211134, 45.9743665308552], [8.8926879234572, 45.9419205502655], [8.9015290239883, 45.9127363349203], [8.9279664896539, 45.9279292940853], [8.9602407983886, 45.938830456876], [8.9714853048892, 45.9239379234572], [8.9773221479583, 45.9142384636513], [8.9830731550998, 45.9215345174876], [8.9750904138436, 45.9384871131661] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 346,
+         "id" : 135281,
+         "name" : "Lago di Lugano - Ceresio",
+         "pfafstette" : 64393,
+         "lke_type" : "N",
+         "altitude" : 615,
+         "objectid" : 83770,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 347,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [7.9131283189892, 46.7172335652811], [7.8940727430874, 46.7062894845266], [7.9045447262406, 46.6983496612342], [7.9441150888116, 46.7093366599524], [7.9704667185497, 46.7214824436916], [7.9854021699323, 46.7275338765794], [8.0106379326131, 46.7397654962461], [8.0377620856986, 46.7467182063725], [8.0483199047793, 46.7555163889398], [8.0305518677898, 46.7649583409632], [8.0054877769639, 46.7652587667094], [7.98411463102, 46.758306056583], [7.9490077366783, 46.7373191723128], [7.9131283189892, 46.7172335652811] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 347,
+         "id" : 134116,
+         "name" : "BRIENZER SEE",
+         "pfafstette" : 89711,
+         "lke_type" : "N",
+         "altitude" : 563,
+         "objectid" : 84060,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 348,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [7.7036028199963, 46.6868476469511], [7.7344179179637, 46.6722555392785], [7.7769067020692, 46.6643586339498], [7.796133949826, 46.6692083638528], [7.8085801593115, 46.6704100668376], [7.8223139077092, 46.6740580937557], [7.8163912287127, 46.6865472212049], [7.7775933894891, 46.6913969511079], [7.7393105658304, 46.7032423091009], [7.7072937648782, 46.7211820179454], [7.6833455411097, 46.7305810520051], [7.6657491759751, 46.7430272614906], [7.645062717451, 46.7525121314778], [7.633217359458, 46.7428126716719], [7.6372516480498, 46.7285209897455], [7.6444618659586, 46.722426638894], [7.6564788958066, 46.7108387886834], [7.6860064548618, 46.6975342199231], [7.7036028199963, 46.6868476469511] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 348,
+         "id" : 134120,
+         "name" : "THUNER SEE",
+         "pfafstette" : 89393,
+         "lke_type" : "N",
+         "altitude" : 558,
+         "objectid" : 84079,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 349,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [29.2594076176525, 45.0865655328694], [29.2730555301227, 45.0942049304157], [29.2830983336385, 45.1018014099982], [29.3000938472807, 45.1105995925655], [29.2859309192456, 45.1273375984252], [29.2500515015565, 45.1293976606849], [29.2322834645669, 45.1248912744919], [29.2226698406885, 45.1199986266252], [29.2339143471892, 45.1014580662882], [29.2594076176525, 45.0865655328694] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 349,
+         "id" : 133924,
+         "name" : "Lacul Isacov",
+         "pfafstette" : 1,
+         "lke_type" : "N",
+         "altitude" : -1,
+         "objectid" : 84113,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 350,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [12.1002477797107, 44.6087598425197], [12.11938919154, 44.5808202481231], [12.1290457333822, 44.5591895943966], [12.1777576222304, 44.5642109961546], [12.2053538729171, 44.573481276323], [12.2237656793628, 44.5836957516938], [12.2442804660319, 44.60669978026], [12.2354822834646, 44.6388453351035], [12.2275424601721, 44.662621887017], [12.2117915674785, 44.6765702252335], [12.1926501556492, 44.6896602041751], [12.1808047976561, 44.6972137657938], [12.175311298297, 44.6810766114265], [12.1665131157297, 44.6634373283282], [12.1324362525179, 44.6604759888299], [12.103037447354, 44.6440384087164], [12.1002477797107, 44.6087598425197] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 350,
+         "id" : 136553,
+         "pfafstette" : 1,
+         "altitude" : -3,
+         "objectid" : 84417,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_84417",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 351,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [23.5285719190624, 43.8839183528658], [23.5749662378685, 43.8714721433803], [23.594751419154, 43.8668370032961], [23.6126911279985, 43.8680387062809], [23.6269828099249, 43.8799699002014], [23.6120902765061, 43.8911714887383], [23.5796013779528, 43.8953774491851], [23.5547089589819, 43.900570522798], [23.5190441311115, 43.8947765976927], [23.5285719190624, 43.8839183528658] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 351,
+         "id" : 136504,
+         "name" : "Balta Bistre?",
+         "pfafstette" : 357215,
+         "lke_type" : "N",
+         "altitude" : 24,
+         "objectid" : 84539,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 2
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 352,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [6.3073956235122, 44.4757141549167], [6.3410862250504, 44.469319378319], [6.3554637429042, 44.4716798663249], [6.3361935771837, 44.4744266160044], [6.3164083958982, 44.4786325764512], [6.3119020097052, 44.4917654733565], [6.3228890084234, 44.5066580067753], [6.3514723722761, 44.5215505401941], [6.3828024858085, 44.530091214979], [6.3989396401758, 44.5346834370994], [6.4143042711958, 44.5388893975462], [6.4252912699139, 44.5424945065007], [6.4143042711958, 44.5461425334188], [6.4009997024355, 44.5434816196667], [6.3652490386376, 44.5346834370994], [6.3220306491485, 44.5221513916865], [6.3076102133309, 44.5084176432888], [6.2888121452115, 44.496357695477], [6.2734475141915, 44.4853706967588], [6.2831040560337, 44.4802205411097], [6.3073956235122, 44.4757141549167] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 352,
+         "id" : 136657,
+         "pfafstette" : 2797,
+         "lke_type" : "N",
+         "altitude" : 865,
+         "objectid" : 84606,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_84606",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 353,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [26.6694372596594, 43.0389494826955], [26.6837289415858, 43.0361598150522], [26.6986214750046, 43.0416533144113], [26.7165611838491, 43.0471468137704], [26.7502517853873, 43.046202618568], [26.768320248123, 43.0522540514558], [26.7779767899652, 43.0662882255997], [26.7959164988097, 43.0838845907343], [26.7993070179454, 43.0979187648782], [26.7879766755173, 43.0960732924373], [26.7822256683757, 43.0885197308185], [26.7707665720564, 43.0729834279436], [26.7590499679546, 43.0577475508149], [26.74145360282, 43.0580908945248], [26.7143723676982, 43.0562883400476], [26.6867761170115, 43.0468034700604], [26.6694372596594, 43.0389494826955] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 353,
+         "id" : 136759,
+         "pfafstette" : 6557,
+         "lke_type" : "N",
+         "altitude" : 257,
+         "objectid" : 85211,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_85211",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 354,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [15.5925254074345, 43.8817295367149], [15.6190487090277, 43.8643906793628], [15.6379326130745, 43.8653777925288], [15.6150144204358, 43.8884247390588], [15.5798646081304, 43.9170081029116], [15.558233954404, 43.9388533464567], [15.5333415354331, 43.9464927440029], [15.5139426158213, 43.9385958386742], [15.5244145989745, 43.9191540010987], [15.5617961453946, 43.899411737777], [15.5925254074345, 43.8817295367149] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 354,
+         "id" : 137065,
+         "pfafstette" : 1,
+         "lke_type" : "N",
+         "altitude" : -4,
+         "objectid" : 85221,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_85221",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 355,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [10.0082116370628, 45.6692627266069], [10.028211408167, 45.6659151254349], [10.0669234114631, 45.6765158624794], [10.0993693920527, 45.6975027467497], [10.1103563907709, 45.71814628731], [10.1020303058048, 45.7342405237136], [10.091815830434, 45.7473305026552], [10.0803138161509, 45.7658710629921], [10.0713868796924, 45.7844116233291], [10.0783395898187, 45.7923514466215], [10.0947342519685, 45.7996904184215], [10.0969659860831, 45.8187889122871], [10.0805713239334, 45.8276300128182], [10.0707860282, 45.8145829518403], [10.0519879600806, 45.7920081029116], [10.0371383446255, 45.771064136605], [10.0456361014466, 45.7531673457242], [10.0500995696759, 45.7282320087896], [10.0519879600806, 45.7050992263322], [10.0500995696759, 45.6944555713239], [10.0264088536898, 45.6905071186596], [9.9896710767259, 45.6850565372642], [9.9712163523164, 45.6746703900385], [9.9773107031679, 45.671408624794], [9.9930186778978, 45.6735116050174], [10.0082116370628, 45.6692627266069] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 355,
+         "id" : 135588,
+         "name" : "Lago d' Iseo",
+         "pfafstette" : 295511,
+         "lke_type" : "N",
+         "altitude" : 186,
+         "objectid" : 85416,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 356,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [27.615349180553, 44.1538294268449], [27.6214864493682, 44.1407394479033], [27.6220873008606, 44.1370914209852], [27.6375806857718, 44.1406965299396], [27.6584388161509, 44.1534431651712], [27.6615289095404, 44.1750738188977], [27.6390398965391, 44.1896230086065], [27.6162075398279, 44.1936143792346], [27.6111003021425, 44.1756746703901], [27.615349180553, 44.1538294268449] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 356,
+         "id" : 135791,
+         "name" : "Lacul Oltina",
+         "pfafstette" : 312515,
+         "lke_type" : "N",
+         "altitude" : 7,
+         "objectid" : 85442,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 357,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [5.8586453946164, 45.6808076588537], [5.8691173777696, 45.6616233290606], [5.8861128914118, 45.6582757278887], [5.8948681560154, 45.6786617606665], [5.8910055392785, 45.7054425700421], [5.8889454770189, 45.7169445843252], [5.8869712506867, 45.7254852591101], [5.8809627357627, 45.7364722578282], [5.8864562351218, 45.7460858817066], [5.88207860282, 45.7583175013734], [5.8716066196667, 45.7732100347922], [5.8618213239334, 45.7944544268449], [5.8432807635964, 45.811793284197], [5.8256843984618, 45.8114499404871], [5.8222509613624, 45.8023942501373], [5.8310920618934, 45.7820082173595], [5.845684169566, 45.7509785295733], [5.8595895898187, 45.7181892052738], [5.8606196209486, 45.6993482191906], [5.8586453946164, 45.6808076588537] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 357,
+         "id" : 135513,
+         "name" : "Lac du Bourget",
+         "pfafstette" : 63831,
+         "lke_type" : "N",
+         "altitude" : 230,
+         "objectid" : 85503,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 358,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [26.8952715848746, 44.2625835469694], [26.8903789370079, 44.2550299853507], [26.8952715848746, 44.2355452298114], [26.9208077733016, 44.2258457700055], [26.9288334325215, 44.2483777009705], [26.9140696529939, 44.276016869621], [26.895872436367, 44.2942140862479], [26.8762160089727, 44.2987633904047], [26.8642848150522, 44.3003084370994], [26.8572891869621, 44.298720472441], [26.8469459577, 44.2880768174327], [26.8469459577, 44.2768752288958], [26.8737696850394, 44.2677766205823], [26.8952715848746, 44.2625835469694] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 358,
+         "id" : 135806,
+         "pfafstette" : 31851,
+         "lke_type" : "N",
+         "altitude" : 13,
+         "objectid" : 85506,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_85506",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 359,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [24.1538008148691, 41.6565618705365], [24.1589509705182, 41.6632141549167], [24.1557750412012, 41.6787075398279], [24.1342731413661, 41.6857460858817], [24.1091232146127, 41.6948446941952], [24.092041865043, 41.7127844030397], [24.0622567982055, 41.7323120765428], [24.0339309421351, 41.7349729902948], [24.0378364768357, 41.7225267808094], [24.068007805347, 41.706732970152], [24.1038872230361, 41.6854456601355], [24.1355177623146, 41.6668621818348], [24.1538008148691, 41.6565618705365] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 359,
+         "id" : 138345,
+         "pfafstette" : 49115,
+         "lke_type" : "N",
+         "altitude" : 1195,
+         "objectid" : 85709,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_85709",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 360,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [25.5786342931697, 41.6450169382897], [25.5998786852225, 41.6370771149972], [25.605973036074, 41.6399097006043], [25.6010803882073, 41.6499095861564], [25.587432475737, 41.6526134178722], [25.5786342931697, 41.6590081944699], [25.5708232237685, 41.6693085057682], [25.5603083226515, 41.6668621818348], [25.5417677623146, 41.6544159723494], [25.5139140038454, 41.6453173640359], [25.4880344717085, 41.6450169382897], [25.4743865592382, 41.6377208844534], [25.469923091009, 41.6260901162791], [25.4662750640908, 41.6258326084966], [25.4540005264603, 41.6292231276323], [25.4306960721479, 41.6371629509247], [25.4162756363303, 41.6338153497528], [25.439708844534, 41.6240300540194], [25.4662750640908, 41.6258326084966], [25.4694939113715, 41.624931331258], [25.469923091009, 41.6260901162791], [25.4758457700055, 41.6264763779527], [25.5019828099249, 41.6359183299762], [25.5247722486724, 41.6411114035891], [25.5466604101813, 41.6471628364768], [25.5786342931697, 41.6450169382897] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 360,
+         "id" : 138264,
+         "pfafstette" : 6315,
+         "lke_type" : "N",
+         "altitude" : 219,
+         "objectid" : 85711,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_85711",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 361,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [11.910893723677, 42.5540623283282], [11.9190910547519, 42.5465087667094], [11.9488761215895, 42.542903657755], [11.9841546877861, 42.5483542391503], [11.9951416865043, 42.5701994826955], [11.995356276323, 42.5911863669658], [11.9941545733382, 42.6112719739974], [11.9924378547885, 42.6332030534701], [11.9826954770189, 42.6489110282], [11.9506786760667, 42.659597601172], [11.9111512314595, 42.6568508514924], [11.8796494460722, 42.6380098654093], [11.8627826863212, 42.6085252243179], [11.873168833547, 42.5850920161143], [11.8877180232558, 42.5708003341879], [11.8989196117927, 42.5617017258744], [11.910893723677, 42.5540623283282] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 361,
+         "id" : 138374,
+         "name" : "Lago di Bolsena",
+         "lge_id" : "it",
+         "pfafstette" : 55,
+         "lke_type" : "N",
+         "altitude" : 305,
+         "objectid" : 85790,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 362,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [29.3675608862846, 41.0326205136422], [29.4077321003479, 41.0298737639626], [29.4311653085516, 41.0298737639626], [29.4191911966673, 41.0350239196118], [29.3964875938473, 41.0368693920527], [29.3821100759934, 41.0459250824025], [29.3861014466215, 41.0523198590002], [29.3925820591467, 41.0666115409266], [29.3803933574437, 41.0821049258378], [29.363655351584, 41.0775127037173], [29.3569601492401, 41.0544657571873], [29.3463164942318, 41.0271270142831], [29.345458134957, 41.0109898599158], [29.3497499313313, 40.9874278978209], [29.3542563175243, 40.9851961637063], [29.3547284151254, 41.0058826222304], [29.3506082906061, 41.0207751556491], [29.3675608862846, 41.0326205136422] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 362,
+         "id" : 138210,
+         "pfafstette" : 5,
+         "lke_type" : "N",
+         "altitude" : 86,
+         "objectid" : 85810,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_85810",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 363,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [24.1667620399194, 41.9796912195569], [24.1571054980773, 41.9677600256363], [24.1679637429042, 41.9547129646585], [24.1936286852225, 41.9581464017579], [24.2111821323933, 41.9705926112434], [24.2085212186413, 41.9820517075627], [24.2026414576085, 42.0021373145944], [24.1950878959897, 42.0176306995056], [24.1887360373558, 42.0112359229079], [24.1832425379967, 41.9927382805347], [24.1667620399194, 41.9796912195569] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 363,
+         "id" : 138163,
+         "name" : "Batak",
+         "pfafstette" : 982273,
+         "lke_type" : "N",
+         "altitude" : 1108,
+         "objectid" : 85883,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 364,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [20.2792958020509, 42.1504617972899], [20.2832013367515, 42.1231230543856], [20.2986088857352, 42.1027370216078], [20.318351149057, 42.0938100851492], [20.3300677531588, 42.0840677073796], [20.3496383446255, 42.0840677073796], [20.3671917917964, 42.0742824116462], [20.3691660181286, 42.060634499176], [20.3630287493133, 42.0279739287676], [20.3626854056034, 42.0106350714155], [20.3750028611976, 42.0196049258378], [20.3886936916316, 42.0449694424098], [20.4004102957334, 42.066471342245], [20.4080926112434, 42.0841535433071], [20.4211396722212, 42.1050975096136], [20.4034574711591, 42.103037447354], [20.3785650521883, 42.1027370216078], [20.3613549487273, 42.1035953808826], [20.3437585835928, 42.1035953808826], [20.3320419794909, 42.1133377586523], [20.3125143059879, 42.1211488280535], [20.3086087712873, 42.1309341237869], [20.3144456143564, 42.1465562625893], [20.3027290102545, 42.1660839360923], [20.2851755630837, 42.1817060748947], [20.2750469236404, 42.1875], [20.2714847326497, 42.1895171442959], [20.2597681285479, 42.1934226789965], [20.2539312854789, 42.1973282136971], [20.2207127815419, 42.2051392830983], [20.1992108817067, 42.2149245788317], [20.1777518998352, 42.2227356482329], [20.1502844030397, 42.2153966764329], [20.1835887429042, 42.2012337483977], [20.2231161875115, 42.1875], [20.2285238509431, 42.1856116095953], [20.2630728117561, 42.1638951199414], [20.2792958020509, 42.1504617972899] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 364,
+         "id" : 138325,
+         "pfafstette" : 31115,
+         "lke_type" : "N",
+         "altitude" : 324,
+         "objectid" : 85904,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_85904",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 365,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [28.6198870399194, 41.3298274125618], [28.6350370811207, 41.3188404138436], [28.6535776414576, 41.3173812030764], [28.6447794588903, 41.3225313587255], [28.6296294176891, 41.3307716077641], [28.6123334783007, 41.3429173915034], [28.5974409448819, 41.3541189800403], [28.5895011215895, 41.3626596548251], [28.5786428767625, 41.3736037355796], [28.5581280900934, 41.3833031953855], [28.5323773118477, 41.3915434444241], [28.5025922450101, 41.40124290423], [28.477571072148, 41.4067364035891], [28.4673136788134, 41.4070368293353], [28.4764552050906, 41.3961356665446], [28.5025922450101, 41.3887966947445], [28.522978277788, 41.3812431331258], [28.545166865043, 41.3708569859], [28.5539650476103, 41.3633034242813], [28.5527633446255, 41.3539043902216], [28.5488578099249, 41.3410719190624], [28.5548234068852, 41.330127838308], [28.574222326497, 41.3332179316975], [28.6004881203076, 41.3365655328694], [28.6198870399194, 41.3298274125618] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 365,
+         "id" : 138091,
+         "name" : "Durusu Golu",
+         "pfafstette" : 3,
+         "lke_type" : "N",
+         "altitude" : 4,
+         "objectid" : 85933,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 366,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [12.0749690990661, 43.1042706235122], [12.1050975096136, 43.0926398553379], [12.1332946117927, 43.0926398553379], [12.1614058780443, 43.0987771241531], [12.1814056491485, 43.1081761582128], [12.1743241851309, 43.1209657114082], [12.1628650888116, 43.1401500412013], [12.1722641228713, 43.1589481093206], [12.1859120353415, 43.1690338308002], [12.1820065006409, 43.1811796145395], [12.1559123786852, 43.1893340276506], [12.1175437190991, 43.1966729994507], [12.0769004074345, 43.2009218778612], [12.0373729628273, 43.1939262497711], [12.0236821323933, 43.173239791247], [12.0427377082952, 43.1452572788867], [12.0527375938473, 43.1297638939755], [12.0549264099982, 43.119163156931], [12.0749690990661, 43.1042706235122] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 366,
+         "id" : 138015,
+         "name" : "Trasimeno",
+         "lge_id" : "it",
+         "pfafstette" : 0,
+         "lke_type" : "Y",
+         "altitude" : 259,
+         "objectid" : 86014,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 367,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [18.4851103277788, 42.7556050860648], [18.4970844396631, 42.7468498214613], [18.4995307635964, 42.7474506729537], [18.4885437648782, 42.7574505585058], [18.476569652994, 42.772943943417], [18.4675568806079, 42.8122138802417], [18.4487588124885, 42.8447456967588], [18.4336087712873, 42.8541447308185], [18.4226217725691, 42.8550030900934], [18.4045533098334, 42.8580502655191], [18.3933088033327, 42.8559472852957], [18.4077292391503, 42.8398530488922], [18.4182441402673, 42.824359663981], [18.4331366736861, 42.8125143059879], [18.4569132255997, 42.8015273072697], [18.4642521973997, 42.7814846182018], [18.4697456967588, 42.7650041201245], [18.4851103277788, 42.7556050860648] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 367,
+         "id" : 138018,
+         "pfafstette" : 4595,
+         "lke_type" : "N",
+         "altitude" : 383,
+         "objectid" : 86017,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_86017",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 368,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [23.5954810245376, 42.4489991530855], [23.6096439525728, 42.4404155603369], [23.6152662058231, 42.4402009705182], [23.6230772752243, 42.4510592153452], [23.6240214704267, 42.4632479170482], [23.6099872962827, 42.4714452481231], [23.5965539736312, 42.4799859229079], [23.564708844534, 42.5058225370811], [23.5349237776964, 42.5164661920894], [23.5376276094122, 42.5070242400659], [23.5471124793994, 42.4915308551547], [23.5564256775316, 42.4702006271745], [23.5753095815785, 42.4553080937557], [23.5954810245376, 42.4489991530855] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 368,
+         "id" : 137870,
+         "name" : "Iskar",
+         "pfafstette" : 352777,
+         "lke_type" : "N",
+         "altitude" : 818,
+         "objectid" : 86146,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 369,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [25.1184249679546, 41.0312042208387], [25.1516005539279, 41.0227064640176], [25.1697977705548, 41.0205605658304], [25.1765358908625, 41.033650544772], [25.1658922358542, 41.052191105109], [25.1401414576085, 41.0676844900201], [25.1306136696576, 41.0831778749313], [25.1275664942318, 41.1001733885735], [25.1077813129463, 41.1060102316425], [25.0941334004761, 41.0923623191723], [25.0825455502655, 41.0752809696026], [25.0804425700421, 41.0546374290423], [25.0896270142831, 41.0375989974364], [25.1184249679546, 41.0312042208387] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 369,
+         "id" : 138600,
+         "name" : "Limni Vistonis",
+         "pfafstette" : 1,
+         "lke_type" : "N",
+         "altitude" : -2,
+         "objectid" : 86352,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 370,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [12.2044955136422, 42.0999902719282], [12.2275424601721, 42.0917929408533], [12.2458684306904, 42.0939817570042], [12.2656536119758, 42.1006340413844], [12.2832070591467, 42.1246251831166], [12.2762543490203, 42.1505047152536], [12.2641514832448, 42.1613629600806], [12.2558683162425, 42.1665560336935], [12.2363406427394, 42.1662556079473], [12.2090018998352, 42.1638092840139], [12.1856974455228, 42.1493030122688], [12.1760409036807, 42.1304191082219], [12.1856974455228, 42.1137240203259], [12.2044955136422, 42.0999902719282] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 370,
+         "id" : 138620,
+         "name" : "Lago di Bracciano",
+         "pfafstette" : 553,
+         "lke_type" : "N",
+         "altitude" : 161,
+         "objectid" : 86427,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 371,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [29.6079014832448, 40.3933574436916], [29.6311201016297, 40.3952029161326], [29.6517636421901, 40.3988509430507], [29.6694458432522, 40.4022414621864], [29.6897031221388, 40.4079495513642], [29.7104754165904, 40.4328848882988], [29.7100891549167, 40.4544726240615], [29.6909477430874, 40.4575197994873], [29.6718921671855, 40.4663179820546], [29.6509052829152, 40.4873048663248], [29.6245107352133, 40.4994506500641], [29.5939960629921, 40.4940429866325], [29.5542111106025, 40.4900516160044], [29.5232243407801, 40.4921975141915], [29.4997482146127, 40.4955021973997], [29.4846410913752, 40.4994506500641], [29.4460578419703, 40.5058454266618], [29.4003931285479, 40.5121972852957], [29.381852568211, 40.5040428721846], [29.359148965391, 40.4933992171763], [29.3414238463651, 40.4797513047061], [29.3369174601721, 40.4572193737411], [29.3493636696576, 40.434687442776], [29.3696209485442, 40.4219408075444], [29.3957579884637, 40.4258892602087], [29.4211654229995, 40.4283355841421], [29.4405643426112, 40.4146876716718], [29.483181880608, 40.3991942867607], [29.5183316929134, 40.395803767625], [29.5348121909907, 40.394301638894], [29.5715499679546, 40.3906106940121], [29.6079014832448, 40.3933574436916] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 371,
+         "id" : 138504,
+         "name" : "Iznik Gl",
+         "pfafstette" : 171,
+         "lke_type" : "N",
+         "altitude" : 83,
+         "objectid" : 86450,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 372,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [19.6230372184582, 42.0313215299396], [19.63441047885, 42.027415995239], [19.6489167505951, 42.0243688198132], [19.6504188793261, 42.033252838308], [19.6523501876946, 42.0428664621864], [19.648444652994, 42.052780511811], [19.6445391182933, 42.0625658075444], [19.6675002288958, 42.0720935954953], [19.6523501876946, 42.0796471571141], [19.6364705411097, 42.0826943325398], [19.6186595861564, 42.0702481230544], [19.6172003753891, 42.0488749771104], [19.6230372184582, 42.0313215299396] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 372,
+         "id" : 138436,
+         "pfafstette" : 13,
+         "lke_type" : "N",
+         "altitude" : 164,
+         "objectid" : 86505,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_86505",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 373,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [23.212309444241, 41.1726618293353], [23.2281461728621, 41.1617606665446], [23.2492618110236, 41.1569967725691], [23.2372018632119, 41.1736060245376], [23.219991759751, 41.2003439159495], [23.2008074299579, 41.2236912882256], [23.1853140450467, 41.2414164072514], [23.1662584691448, 41.2609869987182], [23.1324391137154, 41.2705577046328], [23.1144994048709, 41.2632616507966], [23.1175465802967, 41.250171671855], [23.115143174327, 41.2356224821461], [23.1084050540194, 41.2179831990478], [23.1287910867973, 41.2036915171214], [23.1610224775682, 41.1985413614723], [23.1873741073064, 41.1887989837026], [23.212309444241, 41.1726618293353] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 373,
+         "id" : 138657,
+         "name" : "Limni Kerkinis",
+         "pfafstette" : 471,
+         "lke_type" : "N",
+         "altitude" : 30,
+         "objectid" : 86539,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 374,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [4.5835097738509, 43.5146951107856], [4.6011061389855, 43.5187293993774], [4.6241530855155, 43.5320339681377], [4.6387022752243, 43.5473127632302], [4.6325650064091, 43.5655099798572], [4.613552348471, 43.5791578923274], [4.5888745193188, 43.5828488372093], [4.5625228895807, 43.584908899469], [4.5372442089361, 43.5846513916865], [4.5117080205091, 43.581904642007], [4.492180347006, 43.5764969785754], [4.4870731093206, 43.5591581212232], [4.5078024858084, 43.5442655878044], [4.5307635964109, 43.536325764512], [4.507716649881, 43.5314331166453], [4.4682750412012, 43.5287722028933], [4.4448418329976, 43.5293730543857], [4.4329964750046, 43.5250812580114], [4.4393483336385, 43.5150813724593], [4.4448418329976, 43.5013905420253], [4.4428676066654, 43.4828499816883], [4.4514082814503, 43.4792019547702], [4.4721805759018, 43.4834508331807], [4.4917082494049, 43.4810045092474], [4.4999055804798, 43.4846954541293], [4.5141543444424, 43.490746887017], [4.5259997024354, 43.4952961911738], [4.518059879143, 43.4995021516206], [4.5080599935909, 43.5071415491668], [4.5178452893243, 43.5162830754441], [4.5478449459806, 43.5138796694745], [4.5705485488006, 43.5140942592932], [4.5835097738509, 43.5146951107856] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 374,
+         "id" : 137402,
+         "pfafstette" : 0,
+         "altitude" : 1,
+         "objectid" : 86572,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_86572",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 375,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [4.2320545687603, 43.4792019547702], [4.2566036440212, 43.478901529024], [4.2944572880425, 43.478901529024], [4.3138562076543, 43.4828499816883], [4.3166458752976, 43.4989871360557], [4.3154441723128, 43.5229353598242], [4.2937276826588, 43.5283859412196], [4.2779767899652, 43.5132359000183], [4.2687923457242, 43.5062402719282], [4.2508526368797, 43.5132359000183], [4.2460887429042, 43.5253387657938], [4.2438999267533, 43.5469265015565], [4.2265610694012, 43.564866210401], [4.2010677989379, 43.5734498031496], [4.1889649331624, 43.5658104056034], [4.197376854056, 43.5479136147226], [4.2162178401392, 43.543664736312], [4.229264901117, 43.5320339681377], [4.2235138939755, 43.5214332310932], [4.2168186916316, 43.507441974913], [4.2208529802234, 43.487742629555], [4.2320545687603, 43.4792019547702] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 375,
+         "id" : 137390,
+         "pfafstette" : 1,
+         "altitude" : 0,
+         "objectid" : 86580,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_86580",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 376,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [27.3520474729903, 42.4905866599524], [27.3657383034243, 42.4881832539828], [27.3738068806079, 42.494492194653], [27.3864676799121, 42.4999856940121], [27.4147935359824, 42.4902862342062], [27.4429906381615, 42.4945780305805], [27.4475399423182, 42.5140627861198], [27.4311452801685, 42.5216163477385], [27.4132055713239, 42.5222171992309], [27.4004160181285, 42.5240626716719], [27.3745364859916, 42.5206292345724], [27.3491290514558, 42.5039770646402], [27.3520474729903, 42.4905866599524] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 376,
+         "id" : 137128,
+         "pfafstette" : 211,
+         "lke_type" : "N",
+         "altitude" : -2,
+         "objectid" : 86649,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_86649",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 377,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [15.8958695751694, 43.7258514924007], [15.9040669062443, 43.7267098516755], [15.8971141961179, 43.7370530809376], [15.8897752243179, 43.7437912012452], [15.8706338124886, 43.7583833089178], [15.8527799395715, 43.7847778566197], [15.8689170939388, 43.7948206601355], [15.8871143105658, 43.7972669840689], [15.8906335835928, 43.814262497711], [15.8767281633401, 43.8346056125252], [15.857200489837, 43.8398416041018], [15.8569429820546, 43.8185542940853], [15.8548829197949, 43.7996703900385], [15.8464280809376, 43.7884688015016], [15.8479302096686, 43.7711299441494], [15.8596468137704, 43.7598854376488], [15.8781873741073, 43.7416453030581], [15.8958695751694, 43.7258514924007] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 377,
+         "id" : 137130,
+         "pfafstette" : 131,
+         "altitude" : 7,
+         "objectid" : 86651,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_86651",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 378,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [25.8776866645303, 42.5890404687786], [25.8923646081304, 42.5908859412196], [25.9154115546603, 42.5975811435635], [25.931162447354, 42.6048771973998], [25.9112485121772, 42.609340665629], [25.8905191356894, 42.6184821919063], [25.8764849615455, 42.6313575810291], [25.8852831441128, 42.6434604468046], [25.8715923136788, 42.6480097509614], [25.8594036119758, 42.6513573521333], [25.84936080846, 42.6559495742538], [25.8312923457242, 42.6410141228713], [25.8506054294085, 42.6270657846548], [25.8576868934261, 42.6164650476103], [25.8679442867607, 42.6036325764512], [25.8776866645303, 42.5890404687786] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 378,
+         "id" : 137221,
+         "name" : "Jrebchevo",
+         "pfafstette" : 49133,
+         "lke_type" : "N",
+         "altitude" : 269,
+         "objectid" : 86688,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 379,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [6.1533201336752, 43.74499290423], [6.1750795412928, 43.7401002563633], [6.179714681377, 43.7388985533785], [6.1770108496612, 43.7540915125435], [6.1867961453946, 43.7677823429775], [6.2082551272661, 43.7860224775682], [6.2204867469328, 43.8078677211134], [6.1992423548801, 43.800915010987], [6.1772683574437, 43.7821169428676], [6.1584702893243, 43.7686836202161], [6.1429339864494, 43.7531902353049], [6.1533201336752, 43.74499290423] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 379,
+         "id" : 137230,
+         "name" : "Sainte-Croix",
+         "pfafstette" : 223391,
+         "lke_type" : "N",
+         "altitude" : 470,
+         "objectid" : 86695,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 380,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [3.5288008148691, 43.3454695797473], [3.5449379692364, 43.3469717084783], [3.5585858817066, 43.356370742538], [3.5886284563267, 43.3798468687054], [3.6148942501373, 43.3958981871452], [3.6254949871818, 43.4010483427944], [3.6506449139352, 43.4196318210951], [3.6765244460721, 43.4320780305805], [3.6914169794909, 43.4351252060062], [3.6928761902582, 43.4484297747665], [3.6838634178722, 43.4600176249771], [3.6746789736312, 43.4712621314778], [3.6652799395715, 43.4795023805164], [3.6573401162791, 43.4716054751877], [3.6448939067936, 43.4643094213514], [3.6191431285479, 43.456369598059], [3.5996154550449, 43.442678767625], [3.5734784151254, 43.4235373557957], [3.5504314685955, 43.4043530260026], [3.5418907938106, 43.3955548434353], [3.5290583226515, 43.3804477201978], [3.5257536394433, 43.3621217496796], [3.5257536394433, 43.3512635048526], [3.5288008148691, 43.3454695797473] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 380,
+         "id" : 137495,
+         "pfafstette" : 1,
+         "altitude" : -2,
+         "objectid" : 86758,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_86758",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 381,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [27.3186143792346, 42.3909311481414], [27.3347086156382, 42.388484824208], [27.3593864447903, 42.3930770463285], [27.3822188015015, 42.3978838582677], [27.3913603277788, 42.4063816150888], [27.3955233702618, 42.421875], [27.4077120719648, 42.4270680736129], [27.4211453946164, 42.417368613807], [27.4333770142831, 42.4091283647684], [27.4348362250503, 42.4179694652994], [27.4317890496246, 42.4331195065006], [27.4393426112434, 42.4419606070317], [27.4411880836843, 42.4547072422633], [27.425050929317, 42.4547072422633], [27.3999010025636, 42.4456086339498], [27.3769828099249, 42.4422610327779], [27.359772706464, 42.4273684993591], [27.3356957288042, 42.4140210126351], [27.3166401529024, 42.402175654642], [27.3186143792346, 42.3909311481414] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 381,
+         "id" : 137159,
+         "name" : "Mandra",
+         "pfafstette" : 1,
+         "lke_type" : "N",
+         "altitude" : 2,
+         "objectid" : 86773,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 382,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [17.0013504852591, 43.6489425013734], [17.0271012635048, 43.6419039553195], [17.0480881477751, 43.6404018265885], [17.0678733290606, 43.6446507049991], [17.0761994140267, 43.6662813587255], [17.0797186870536, 43.6875257507783], [17.1009630791064, 43.6899291567479], [17.1162418741989, 43.6917746291888], [17.0903623420619, 43.6942209531221], [17.0572725920161, 43.6960664255631], [17.0202773072697, 43.702761627907], [16.984011627907, 43.7088130607947], [16.9730246291888, 43.7054654596228], [16.9730246291888, 43.6887274537631], [16.9738829884636, 43.6717748580846], [16.9787756363303, 43.6601440899103], [17.0013504852591, 43.6489425013734] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 382,
+         "id" : 137172,
+         "pfafstette" : 5991,
+         "lke_type" : "N",
+         "altitude" : 701,
+         "objectid" : 86834,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_86834",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 383,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [20.8708770142831, 39.6587735762681], [20.8916063907709, 39.6456835973265], [20.9102757049991, 39.6546534517488], [20.9231081761582, 39.6687734618202], [20.9145675013734, 39.6788591832998], [20.8945248123054, 39.6861123191723], [20.869889901117, 39.69250709577], [20.8474438060795, 39.6973139077092], [20.8422936504303, 39.6909191311115], [20.8537527467497, 39.6831080617103], [20.8616925700421, 39.6748678126717], [20.8708770142831, 39.6587735762681] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 383,
+         "id" : 139935,
+         "name" : "Limni Ioanninon",
+         "pfafstette" : 637,
+         "lke_type" : "N",
+         "altitude" : 464,
+         "objectid" : 86888,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 384,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [27.9582637108588, 38.6177554477202], [27.9743579472624, 38.6074122184582], [27.9970615500824, 38.6074122184582], [28.02684661692, 38.6092576908991], [28.0496789736312, 38.60376419154], [28.0725113303424, 38.617455021974], [28.0849575398279, 38.64148908167], [28.0668890770921, 38.6530340139169], [28.0402799395715, 38.6602871497894], [28.0286920893609, 38.6533344396631], [28.0025550494415, 38.6484417917964], [27.954229422267, 38.6484417917964], [27.93568886193, 38.6371972852957], [27.9448303882073, 38.6274549075261], [27.9582637108588, 38.6177554477202] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 384,
+         "id" : 139893,
+         "name" : "Marmara Golu",
+         "pfafstette" : 5623,
+         "lke_type" : "N",
+         "altitude" : 74,
+         "objectid" : 87099,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 385,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [28.421133949826, 38.7359515198682], [28.4125932750412, 38.7347498168834], [28.401606276323, 38.7253507828237], [28.3918638985534, 38.7143637841055], [28.3818640130013, 38.7025184261124], [28.3725508148691, 38.70191757462], [28.3636667963743, 38.7040634728072], [28.3567140862479, 38.6925185405603], [28.347186298297, 38.6694286760667], [28.3354696941952, 38.6387423319905], [28.3469287905146, 38.6311029344442], [28.3755121543673, 38.6520898187145], [28.4028508972716, 38.6785272843802], [28.4260265976927, 38.6949648644937], [28.4345672724776, 38.7000721021791], [28.4256832539828, 38.7061664530306], [28.4375286119758, 38.7247499313313], [28.4466701382531, 38.7411445934811], [28.4305329838857, 38.7365952893243], [28.421133949826, 38.7359515198682] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 385,
+         "id" : 139762,
+         "pfafstette" : 77,
+         "lke_type" : "N",
+         "altitude" : 232,
+         "objectid" : 87159,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_87159",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 386,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [21.9194487044497, 40.1836602728438], [21.9447273850943, 40.207994758286], [21.9626670939389, 40.2186384132943], [21.9692335423915, 40.2222864402124], [21.9763150064091, 40.2304837712873], [22.0036537493133, 40.2435308322652], [22.0397906747848, 40.2660627632302], [22.0595758560703, 40.2888092840139], [22.064468503937, 40.2958907480315], [22.0556703213697, 40.2991954312397], [22.0422369987182, 40.2940023576268], [22.0276019730819, 40.2867492217543], [22.0127094396631, 40.2736163248489], [21.9961001876946, 40.266921122505], [21.980005951291, 40.2569212369529], [21.9567873329061, 40.2447754532137], [21.9284614768358, 40.2271361701154], [21.9048136788134, 40.2043467313679], [21.886015610694, 40.1861065967771], [21.8745135964109, 40.1696690166636], [21.860479422267, 40.1551627449185], [21.8500932750412, 40.139883949826], [21.8640416132577, 40.1386822468412], [21.8941700238052, 40.1566219556858], [21.9194487044497, 40.1836602728438] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 386,
+         "id" : 139435,
+         "pfafstette" : 155193,
+         "lke_type" : "N",
+         "altitude" : 277,
+         "objectid" : 87310,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_87310",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 387,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [21.2702715848746, 40.5043432979308], [21.2915159769273, 40.4946438381249], [21.3097131935543, 40.4979485213331], [21.3207001922725, 40.5085492583776], [21.3164083958982, 40.5207379600806], [21.3170092473906, 40.5301369941403], [21.3255928401392, 40.5438278245743], [21.3188547198315, 40.5575186550082], [21.2905288637612, 40.5599220609778], [21.2666235579564, 40.5511667963743], [21.2647780855155, 40.5364888527742], [21.2802714704267, 40.5270898187145], [21.2900567661601, 40.5192358313496], [21.2817306811939, 40.5189354056034], [21.2678252609412, 40.5262314594397], [21.2582974729903, 40.5207379600806], [21.2702715848746, 40.5043432979308] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 387,
+         "id" : 139347,
+         "name" : "Limni Kastorias",
+         "pfafstette" : 631,
+         "lke_type" : "N",
+         "altitude" : 623,
+         "objectid" : 87350,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 388,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [21.6057183894891, 38.8910141228713], [21.57752128731, 38.9028594808643], [21.5446890450467, 38.9250480681194], [21.5332299487273, 38.9350479536715], [21.5163631889764, 38.9344471021791], [21.5051186824757, 38.9435886284563], [21.5127151620582, 38.9648330205091], [21.5182086614173, 38.9891245879876], [21.5033161279985, 38.9891245879876], [21.4829300952207, 38.9895108496612], [21.4651191402674, 38.9998111609595], [21.4419005218824, 39.0141028428859], [21.4139609274858, 39.0301541613258], [21.3986821323933, 39.025948200879], [21.4096691311115, 39.0095106207654], [21.4314285387292, 38.9964635597876], [21.4571793169749, 38.990712552646], [21.474861518037, 38.9682235396448], [21.4848614035891, 38.9423869254715], [21.4949042071049, 38.9274943920527], [21.4881660867973, 38.9201554202527], [21.4765782365867, 38.9168936550082], [21.488552348471, 38.9074087850211], [21.504904092657, 38.8949196575719], [21.5143031267167, 38.8903703534151], [21.5349037493133, 38.8885677989379], [21.5516417551731, 38.8873231779894], [21.5810834783007, 38.8897695019227], [21.6057183894891, 38.8910141228713] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 388,
+         "id" : 140312,
+         "name" : "Lake Kremaston, centre",
+         "pfafstette" : 573,
+         "lke_type" : "N",
+         "altitude" : 295,
+         "objectid" : 87533,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 389,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [21.3608714063358, 38.7560371268998], [21.3686824757371, 38.7502432017945], [21.3700129326131, 38.7751356207654], [21.3850342199231, 38.7955216535433], [21.4002700970518, 38.7904144158579], [21.41125709577, 38.7928607397913], [21.4173514466215, 38.8010151529024], [21.4039610419337, 38.8050065235305], [21.3772231505219, 38.8174527330159], [21.3561933482879, 38.8338473951657], [21.3420304202527, 38.8424309879143], [21.3300992263322, 38.8375383400476], [21.3413008148691, 38.8247058688885], [21.3532749267534, 38.812259659403], [21.3545195477019, 38.783719213514], [21.3608714063358, 38.7560371268998] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 389,
+         "id" : 140402,
+         "pfafstette" : 39,
+         "lke_type" : "N",
+         "altitude" : 142,
+         "objectid" : 87725,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_87725",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 390,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [21.77417139718, 39.3098076130745], [21.7690641594946, 39.3168461591284], [21.7582917505951, 39.3232409357261], [21.748291865043, 39.3298932201062], [21.7331847418055, 39.33693176616], [21.7221977430874, 39.3499788271379], [21.7121549395715, 39.3512234480864], [21.7099661234206, 39.3393780900934], [21.7227985945798, 39.3289919428676], [21.7361031633401, 39.3053012268815], [21.7458455411097, 39.2830697216627], [21.7541716260758, 39.2869752563633], [21.7668753433437, 39.2931125251785], [21.7735705456876, 39.2979622550815], [21.77417139718, 39.3098076130745] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 390,
+         "id" : 140112,
+         "name" : "Tehniti Limni Tavropou (Plastira)",
+         "pfafstette" : 69773,
+         "lke_type" : "N",
+         "altitude" : 786,
+         "objectid" : 87741,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 391,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [16.0959531221388, 41.3657497482146], [16.1193863303424, 41.3730028840872], [16.0981419382897, 41.3808568714521], [16.0708031953855, 41.3898267258744], [16.0573698727339, 41.389225874382], [16.0543226973082, 41.3998266114265], [16.014795252701, 41.4226589681377], [15.9600748489288, 41.4390965482512], [15.9488732603919, 41.4330451153635], [15.9558259705182, 41.4184100897272], [15.9719202069218, 41.4062643059879], [15.9892590642739, 41.4008137245926], [16.0068554294085, 41.3928739013001], [16.0217479628273, 41.3859211911738], [16.026640610694, 41.3810285433071], [16.0382284609046, 41.3722732787035], [16.0547089589819, 41.3731316379784], [16.0655672038088, 41.3747196026369], [16.0959531221388, 41.3657497482146] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 391,
+         "id" : 138961,
+         "pfafstette" : 1,
+         "altitude" : -2,
+         "objectid" : 87806,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_87806",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 392,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [23.5318766022706, 40.6395778016847], [23.5500738188976, 40.6402215711408], [23.5659105475188, 40.6472171992309], [23.5820477018861, 40.6590625572239], [23.5881420527376, 40.6733542391503], [23.5632496337667, 40.6845558276872], [23.5400310153818, 40.6927531587621], [23.5200312442776, 40.6973453808826], [23.4944092199231, 40.6991479353598], [23.4717056171031, 40.699791704816], [23.4431222532503, 40.7009934078008], [23.4096891594946, 40.7009934078008], [23.3801186824757, 40.7003925563084], [23.3601189113715, 40.6912939479949], [23.3540245605201, 40.6770022660685], [23.3683162424464, 40.6730538134041], [23.4020926799121, 40.6678607397912], [23.4367703946164, 40.6733542391503], [23.4607186183849, 40.6815086522615], [23.4762120032961, 40.6751567936275], [23.4931645989745, 40.6712083409632], [23.5133360419337, 40.6666161188427], [23.5243230406519, 40.6508223081853], [23.5318766022706, 40.6395778016847] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 392,
+         "id" : 138965,
+         "name" : "Limni Vilvi",
+         "pfafstette" : 15,
+         "lke_type" : "N",
+         "altitude" : 30,
+         "objectid" : 87808,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 393,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [23.1506363303424, 40.6745559421351], [23.1618808368431, 40.6654144158579], [23.1859148965391, 40.6660152673503], [23.2044983748398, 40.6772597738509], [23.206300929317, 40.6937402719282], [23.1859148965391, 40.7049418604651], [23.1628679500092, 40.7092336568394], [23.1367309100897, 40.7137400430324], [23.1087913156931, 40.7128387657938], [23.0975468091925, 40.7015513413294], [23.0975468091925, 40.6870021516206], [23.1144994048709, 40.6790623283281], [23.138190120857, 40.6776031175609], [23.1506363303424, 40.6745559421351] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 393,
+         "id" : 138996,
+         "name" : "Limni Korinia",
+         "pfafstette" : 951,
+         "lke_type" : "N",
+         "altitude" : 64,
+         "objectid" : 87819,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 394,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [15.7243693920527, 41.8506369025819], [15.7492618110236, 41.8463880241714], [15.7702916132576, 41.8460875984252], [15.7871154550449, 41.8488343481047], [15.8032526094122, 41.8600359366416], [15.8053126716719, 41.8780185634499], [15.8037247070134, 41.8941127998535], [15.7969007507782, 41.9081040560337], [15.7658710629921, 41.9093057590185], [15.712309444241, 41.9065590093389], [15.6831252288958, 41.900207150705], [15.6845844396631, 41.8810657388757], [15.6977602545321, 41.8594350851492], [15.7243693920527, 41.8506369025819] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 394,
+         "id" : 138705,
+         "pfafstette" : 0,
+         "lke_type" : "N",
+         "altitude" : -4,
+         "objectid" : 87829,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_87829",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 395,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [22.7124010025636, 41.2168244140267], [22.7248472120491, 41.1942924830617], [22.740726858634, 41.1821466993225], [22.7564777513276, 41.1897002609412], [22.7746749679546, 41.2100862937191], [22.7790526002564, 41.2337770097052], [22.7699110739791, 41.2484120353415], [22.7531730681194, 41.2544634682293], [22.7324436916316, 41.2535621909907], [22.7166927989379, 41.2386696575719], [22.7124010025636, 41.2168244140267] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 395,
+         "id" : 138714,
+         "name" : "Doirani Lake - Doirani Community",
+         "pfafstette" : 14779,
+         "lke_type" : "N",
+         "altitude" : 148,
+         "objectid" : 87862,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 396,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [15.3242452160776, 41.8892201519868], [15.3132582173595, 41.880679477202], [15.3308116645303, 41.8688341192089], [15.3579358176158, 41.8627826863212], [15.3828282365867, 41.8712804431423], [15.4113686824757, 41.8740701107856], [15.4506815372642, 41.8701216581212], [15.488277673503, 41.8734692592932], [15.5129555026552, 41.8855721250687], [15.5335990432155, 41.8965591237868], [15.5421397180004, 41.9038551776231], [15.5195219511079, 41.9059581578465], [15.4976767075627, 41.9026105566746], [15.4821833226515, 41.8986191860465], [15.4214114859916, 41.8919669016664], [15.3564766068486, 41.891366050174], [15.3242452160776, 41.8892201519868] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 396,
+         "id" : 138715,
+         "pfafstette" : 0,
+         "lke_type" : "N",
+         "altitude" : -3,
+         "objectid" : 87863,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_87863",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 397,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [27.8606253433437, 40.1864070225233], [27.8469345129097, 40.1770079884636], [27.8720844396631, 40.1593257874016], [27.9116118842703, 40.1495834096319], [27.9338433894891, 40.1617291933712], [27.9487359229079, 40.167608954404], [27.9795081029115, 40.1593687053653], [28.0168467313679, 40.155076908991], [28.038691974913, 40.1511284563267], [28.0566316837575, 40.1486821323933], [28.06457150705, 40.1575232329244], [28.0609234801318, 40.1696690166636], [28.0560308322651, 40.1931022248672], [28.0593355154733, 40.2149903863761], [28.0564170939388, 40.2286382988464], [28.0402799395715, 40.2383377586523], [28.0290783510346, 40.2435308322652], [28.0137995559421, 40.2517710813038], [27.9916968046145, 40.2502689525728], [27.9656026826588, 40.2490243316242], [27.9338433894891, 40.2481230543856], [27.9184787584691, 40.2368356299213], [27.9095518220106, 40.2274365958616], [27.8857323521333, 40.2119002929866], [27.8708398187145, 40.1952052050906], [27.8606253433437, 40.1864070225233] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 397,
+         "id" : 138838,
+         "name" : "Kus Gl",
+         "lge_id" : "tr",
+         "pfafstette" : 4211,
+         "lke_type" : "N",
+         "altitude" : 15,
+         "objectid" : 87935,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 398,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [28.4636227339315, 40.1988532320088], [28.4843950283831, 40.19129967039], [28.4943949139352, 40.1842611243362], [28.5086865958616, 40.177608839956], [28.5376133034243, 40.177608839956], [28.5584714338033, 40.1742183208204], [28.5600593984618, 40.1645617789782], [28.5694584325215, 40.1478237731185], [28.5967971754258, 40.1329312396997], [28.6259813907709, 40.1301844900201], [28.6545647546237, 40.1329312396997], [28.6770108496612, 40.1425877815418], [28.6884699459806, 40.1547764832448], [28.7019032686321, 40.1629738143197], [28.7194996337667, 40.1772654962461], [28.7122894158579, 40.1939605841421], [28.6946072147958, 40.1900550494415], [28.6839635597876, 40.1888533464567], [28.6711740065922, 40.1921580296649], [28.651517579198, 40.1936172404321], [28.6290285661967, 40.2043467313679], [28.613277673503, 40.2028446026369], [28.5925482970152, 40.2100977385094], [28.5505316105109, 40.2228872917048], [28.5205319538546, 40.2212993270463], [28.5062402719282, 40.2201405420253], [28.4792448727339, 40.2247327641458], [28.4624210309467, 40.2210847372276], [28.4591163477385, 40.209840230727], [28.4636227339315, 40.1988532320088] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 398,
+         "id" : 138776,
+         "name" : "Ulubat Golu",
+         "pfafstette" : 715,
+         "lke_type" : "N",
+         "altitude" : 40,
+         "objectid" : 87968,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 399,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [21.757476309284, 40.7188901986816], [21.7731842840139, 40.7247270417506], [21.7927548754807, 40.7347269273027], [21.8142138573521, 40.7472160547519], [21.8185056537264, 40.7699625755356], [21.8246000045779, 40.7830096365135], [21.8343423823476, 40.7903486083135], [21.8286342931698, 40.7970008926936], [21.8133554980773, 40.8057990752609], [21.796875, 40.8149406015382], [21.7854159036807, 40.8110350668376], [21.7705233702619, 40.7855417963743], [21.7568325398279, 40.7472160547519], [21.7504806811939, 40.7255854010254], [21.757476309284, 40.7188901986816] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 399,
+         "id" : 139095,
+         "name" : "Limni Vegoritis",
+         "pfafstette" : 579,
+         "lke_type" : "N",
+         "altitude" : 509,
+         "objectid" : 88012,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 400,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [21.4741319126534, 37.8728283510346], [21.4769215802967, 37.8895234389306], [21.4841317982055, 37.9056605932979], [21.5066208112068, 37.9058751831166], [21.5255047152536, 37.9093086202161], [21.5082087758652, 37.9183213926021], [21.4829300952207, 37.9287075398279], [21.4677800540194, 37.932698910456], [21.4492394936825, 37.9242011536349], [21.4510420481597, 37.9052743316242], [21.459840230727, 37.8889225874382], [21.4653337300861, 37.8776780809376], [21.4741319126534, 37.8728283510346] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 400,
+         "id" : 140750,
+         "name" : "Dam",
+         "pfafstette" : 193,
+         "lke_type" : "N",
+         "altitude" : 102,
+         "objectid" : 88767,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 401,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [21.5918129692364, 38.5314474226332], [21.6045166865043, 38.5226063221022], [21.6257610785571, 38.5183145257279], [21.650138481963, 38.5280998214613], [21.63794978026, 38.5578848882989], [21.6115981505219, 38.5821764557773], [21.6021991164622, 38.5931634544955], [21.5830147866691, 38.605609663981], [21.5601824299579, 38.607111792712], [21.5440881935543, 38.6080559879143], [21.5191957745834, 38.6092576908991], [21.4949042071049, 38.6017041292804], [21.4775653497528, 38.5974123329061], [21.462672816334, 38.5852236312031], [21.4504411966673, 38.5654384499176], [21.455333844534, 38.5529922404322], [21.4714280809376, 38.5523913889398], [21.4848614035891, 38.5606316379784], [21.5261484847098, 38.5599878685222], [21.5717702801685, 38.5453957608497], [21.5918129692364, 38.5314474226332] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 401,
+         "id" : 140485,
+         "name" : "Limni Trikhonis",
+         "pfafstette" : 253,
+         "lke_type" : "N",
+         "altitude" : 11,
+         "objectid" : 89436,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 402,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [27.3938066517121, 37.5439479948727], [27.3836780122688, 37.5366090230727], [27.3789141182933, 37.5241628135873], [27.3799012314594, 37.5147637795276], [27.3852659769273, 37.503175929317], [27.3913603277788, 37.4950215162058], [27.4062528611976, 37.4895280168467], [27.4353083226515, 37.4833907480315], [27.4611878547885, 37.48497871269], [27.4829043444424, 37.4852362204724], [27.5102430873466, 37.4873821186596], [27.5253931285479, 37.4904292940853], [27.5251785387292, 37.5047209760117], [27.5038053927852, 37.5180684627358], [27.4844064731734, 37.5235619620949], [27.4734194744552, 37.5280683482879], [27.4597286440212, 37.5348064685955], [27.4436344076176, 37.5333472578282], [27.4196861838491, 37.5280683482879], [27.420544543124, 37.540900819447], [27.4350508148691, 37.559098036074], [27.4229908670573, 37.5627460629921], [27.4062528611976, 37.5517590642739], [27.3938066517121, 37.5439479948727] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 402,
+         "id" : 140552,
+         "name" : "Bafa Golu",
+         "pfafstette" : 1,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 89464,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 403,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [22.2177714704267, 38.4879715253617], [22.2207328099249, 38.5013619300494], [22.2163122596594, 38.5189153772203], [22.2119346273576, 38.5329495513642], [22.2070419794909, 38.5444944836111], [22.2028789370079, 38.5563827595678], [22.2077715848746, 38.5745799761948], [22.2074282411646, 38.5824768815235], [22.1992309100897, 38.5745799761948], [22.1784586156382, 38.5587861655375], [22.1506477751328, 38.5423485854239], [22.1538237044497, 38.5287006729537], [22.1727505264604, 38.5362542345724], [22.1863984389306, 38.5447949093573], [22.2025355932979, 38.5287006729537], [22.2119346273576, 38.5025636330342], [22.2177714704267, 38.4879715253617] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 403,
+         "id" : 140454,
+         "pfafstette" : 575,
+         "lke_type" : "N",
+         "altitude" : 552,
+         "objectid" : 89559,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_89559",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 404,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [28.6325907571873, 36.8667025270097], [28.6398868110236, 36.8688913431606], [28.6460240798389, 36.8913803561619], [28.6576119300494, 36.9056291201245], [28.6788563221022, 36.9101784242813], [28.6958089177806, 36.9226246337667], [28.7050791979491, 36.935757530672], [28.7159374427761, 36.9415514557773], [28.7292420115364, 36.9470449551364], [28.704092084783, 36.9603495238967], [28.668212667094, 36.9667443004944], [28.6572256683758, 36.9518517670756], [28.6437923457242, 36.9385042803516], [28.62413591833, 36.9232684032229], [28.6092433849112, 36.913225599707], [28.5959388161509, 36.9062728895807], [28.5976555347006, 36.8858868568028], [28.6201445477019, 36.8749427760483], [28.6325907571873, 36.8667025270097] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 404,
+         "id" : 140695,
+         "name" : "Kyceiz Golu",
+         "pfafstette" : 15,
+         "lke_type" : "N",
+         "altitude" : -2,
+         "objectid" : 89586,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 405,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [23.239519433254, 38.4253542162608], [23.2470729948727, 38.4007622230361], [23.2595192043582, 38.3977150476103], [23.2826090688519, 38.4003759613624], [23.3084886009888, 38.3985734068852], [23.3054414255631, 38.4146676432888], [23.2866433574437, 38.4275001144479], [23.2674590276506, 38.4338519730819], [23.2489184673137, 38.4393454724409], [23.239519433254, 38.4253542162608] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 405,
+         "id" : 140463,
+         "name" : "Iliki Limni",
+         "pfafstette" : 15,
+         "lke_type" : "N",
+         "altitude" : 173,
+         "objectid" : 89592,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 406,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.3999725325032, 69.219250709577], [32.4343069034975, 69.2103237731185], [32.4792849295001, 69.2022981138986], [32.5185977842886, 69.2141005539279], [32.5134476286394, 69.2349157663432], [32.4967954587072, 69.2355595357993], [32.4810016480498, 69.2293364310566], [32.4756798205457, 69.2397654962461], [32.5129326130745, 69.2471903039736], [32.5505287493133, 69.2510529207105], [32.564262497711, 69.2575764511994], [32.5755928401392, 69.2682630241714], [32.594648416041, 69.2887778108405], [32.6198841787218, 69.3000652353049], [32.6336179271196, 69.3104943004944], [32.6567936275407, 69.3197216626991], [32.6998832631386, 69.3310090871635], [32.7414278520418, 69.3387343206373], [32.7646035524629, 69.3479187648782], [32.7325009155832, 69.3654722120491], [32.6911279985351, 69.3642705090643], [32.6775659219923, 69.3538843618385], [32.6459783006775, 69.3497213193554], [32.6209142098517, 69.3360734068852], [32.6037470243545, 69.3200220884453], [32.5805713239333, 69.3045716214979], [32.5529321552829, 69.295043833547], [32.5268380333272, 69.3045716214979], [32.5149926753342, 69.3021252975646], [32.5247779710676, 69.2923829197949], [32.5268380333272, 69.2750869804065], [32.5007439113715, 69.2629411966673], [32.47997161692, 69.2599369392053], [32.4446072147958, 69.255816814686], [32.407011078557, 69.2516108542392], [32.3901872367698, 69.2438856207654], [32.3779985350668, 69.2322977705548], [32.3999725325032, 69.219250709577] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 406,
+         "id" : 282,
+         "pfafstette" : 13,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 161,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_161",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 407,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.1800494414942, 69.1535003891229], [33.1621955685772, 69.1407537538912], [33.1659723493866, 69.1258612204724], [33.2027101263505, 69.1250028611976], [33.2432246841238, 69.1293804934994], [33.2603918696209, 69.1392087071965], [33.2535249954221, 69.1535003891229], [33.2463147775133, 69.1776202847464], [33.2705205090643, 69.1853026002564], [33.2926661783556, 69.1850450924739], [33.2859709760117, 69.1992938564365], [33.2633102911555, 69.2055169611793], [33.247859824208, 69.2013539186962], [33.2131821095037, 69.1975342199231], [33.1608221937374, 69.1823841787218], [33.1312946346823, 69.1677491530855], [33.1177325581395, 69.1552600256363], [33.1264878227431, 69.1413116874199], [33.1438266800952, 69.151139901117], [33.1714658487456, 69.1618693920527], [33.2161005310383, 69.1597234938656], [33.2339544039553, 69.1478352179088], [33.2138687969236, 69.1395520509064], [33.1951565647317, 69.146976858634], [33.1800494414942, 69.1535003891229] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 407,
+         "id" : 413,
+         "pfafstette" : 1,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 282,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_282",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 408,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [34.0754898370262, 69.0750034334371], [34.0942020692181, 69.0794669016664], [34.1063907709211, 69.0961190715986], [34.1287081120674, 69.1005825398279], [34.1578923274125, 69.1050460080571], [34.1951451199414, 69.1082648553379], [34.2294794909357, 69.1244020097052], [34.2243293352866, 69.1493802646036], [34.2087071964841, 69.1442730269181], [34.1934284013917, 69.1341443874748], [34.1769479033144, 69.146976858634], [34.1602957333822, 69.1344877311848], [34.1448452664347, 69.1171917917964], [34.1254463468229, 69.1238011582128], [34.1075924739059, 69.1139729445157], [34.0930003662333, 69.1047455823109], [34.0770348837209, 69.094059009339], [34.0754898370262, 69.0750034334371] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 408,
+         "id" : 311,
+         "pfafstette" : 73,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 300,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_300",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 409,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [36.0308322651529, 68.6364676799121], [36.0158968137704, 68.6239785524629], [36.0215619849844, 68.6144936824757], [36.0402742171763, 68.6189142327413], [36.0668833546969, 68.6189142327413], [36.0957242263322, 68.6097297885003], [36.1159815052188, 68.6189142327413], [36.1431056583043, 68.6272832356711], [36.1588994689617, 68.6150516160044], [36.1657663431606, 68.6040646172862], [36.1837918879326, 68.6135924052371], [36.2076542757737, 68.6222189159495], [36.2337483977293, 68.6272832356711], [36.2507439113715, 68.6338067661601], [36.2656793627541, 68.6435491439297], [36.2816448452664, 68.6534631935543], [36.2974386559238, 68.6632055713239], [36.3223310748947, 68.6727333592749], [36.3422450100714, 68.6780981047427], [36.3599272111335, 68.6923897866691], [36.3592405237136, 68.7170676158213], [36.3333180736129, 68.7208873145944], [36.3044772019776, 68.7105011673686], [36.2788980955869, 68.6974541063908], [36.2625892693646, 68.6816602957334], [36.2442203808826, 68.688226744186], [36.2277398828053, 68.6857804202527], [36.2318600073246, 68.6730337850211], [36.2382118659586, 68.6584416773485], [36.2165812122322, 68.6495576588537], [36.1913454495513, 68.6397294451566], [36.1740065921992, 68.629643723677], [36.1716031862296, 68.6474546786303], [36.1537493133126, 68.6611455090643], [36.1219900201428, 68.6513602133309], [36.0941791796374, 68.6471542528841], [36.0730635414759, 68.6424761948361], [36.0570980589635, 68.6385706601355], [36.0308322651529, 68.6364676799121] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 409,
+         "id" : 497,
+         "pfafstette" : 557,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 479,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_479",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 410,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [36.029973905878, 68.7062952069218], [36.0500595129097, 68.6986128914118], [36.0828488372093, 68.6905443142282], [36.1180415674785, 68.6997716764329], [36.1317753158762, 68.7108015931148], [36.145337392419, 68.7221319355429], [36.1419039553195, 68.7470672724776], [36.1219900201428, 68.761358954404], [36.1077412561802, 68.7550929316975], [36.0955525544772, 68.7506294634682], [36.0813037905145, 68.7464664209852], [36.0562396996887, 68.7369386330342], [36.0311756088628, 68.7274108450833], [36.018128547885, 68.721788591833], [36.0107466581212, 68.7155654870903], [36.029973905878, 68.7062952069218] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 410,
+         "id" : 509,
+         "pfafstette" : 971,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 489,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_489",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 411,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.4034059696026, 69.121097326497], [32.4355086064823, 69.1098099020326], [32.4701863211866, 69.1198956235122], [32.4959370994323, 69.1359898599158], [32.5316448452664, 69.1484360694012], [32.5529321552829, 69.1647878135872], [32.5441768906794, 69.1754743865592], [32.5242629555026, 69.1734143242996], [32.5000572239517, 69.1692512818165], [32.467611243362, 69.1660324345358], [32.449757370445, 69.1490369208936], [32.4320751693829, 69.1320843252152], [32.4092428126717, 69.1291659036807], [32.4034059696026, 69.121097326497] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 411,
+         "id" : 735,
+         "pfafstette" : 31,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 513,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_513",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 412,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.0674441494232, 69.178178218275], [32.0811778978209, 69.1630281770738], [32.0942249587988, 69.1588651345907], [32.1314777513276, 69.1630281770738], [32.1683872001465, 69.1668907938107], [32.1704472624061, 69.1880064319722], [32.1519067020692, 69.2019547701886], [32.1431514374657, 69.2188644479033], [32.1177440029299, 69.2331561298297], [32.0737960080571, 69.2165468778612], [32.0911348654093, 69.20105349295], [32.1258125801135, 69.1897660684856], [32.1101904413111, 69.1811395577733], [32.0901048342794, 69.1874055804798], [32.0720792895074, 69.1927703259476], [32.0571438381249, 69.1874055804798], [32.0674441494232, 69.178178218275] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 412,
+         "id" : 709,
+         "pfafstette" : 141,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 535,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_535",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 413,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.2245238967222, 69.1250028611976], [32.2626350485259, 69.1383074299579], [32.3012612158945, 69.1525991118843], [32.3180850576817, 69.158822216627], [32.3450375389123, 69.1692512818165], [32.3728483794177, 69.1680924967955], [32.3961957516938, 69.1612685405603], [32.4109595312214, 69.1713113440762], [32.4004875480681, 69.1906673457242], [32.3785135506318, 69.1924699002014], [32.3639214429592, 69.1808391320271], [32.334737227614, 69.1784786440212], [32.3077847463834, 69.1819979170482], [32.2758537813587, 69.1832425379967], [32.238085973265, 69.1725559650247], [32.2111334920344, 69.1567621543673], [32.1870994323384, 69.1460755813954], [32.171648965391, 69.1335435359824], [32.1486449368248, 69.1306251144479], [32.1338811572972, 69.1267195797473], [32.1213491118843, 69.121097326497], [32.1091604101813, 69.1092090505402], [32.116885643655, 69.0949602865776], [32.135254532137, 69.099724180553], [32.1599752792529, 69.1005825398279], [32.1819492766893, 69.10290010987], [32.1973997436367, 69.1115695385461], [32.2119918513093, 69.119251854056], [32.2245238967222, 69.1250028611976] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 413,
+         "id" : 728,
+         "pfafstette" : 91,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 553,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_553",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 414,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [29.939743178905, 69.426415720564], [29.9148507599341, 69.4139265931148], [29.9220609778429, 69.4002786806446], [29.9500434902033, 69.4092056171031], [29.9867812671672, 69.4205359595312], [30.0212873100165, 69.424913591833], [30.0386261673686, 69.4347418055301], [30.0762223036074, 69.4392052737594], [30.1141617835561, 69.4627243178905], [30.1100416590368, 69.4891617835561], [30.0834325215162, 69.4779172770555], [30.0437763230178, 69.4680890633584], [30.0166521699322, 69.4576599981688], [29.9883263138619, 69.441608679729], [29.9625755356162, 69.4323813175243], [29.939743178905, 69.426415720564] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 414,
+         "id" : 635,
+         "pfafstette" : 1931,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 586,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_586",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 415,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [37.0148553378502, 68.4905036852225], [36.9830960446805, 68.4830359595312], [36.9575169382897, 68.4732935817616], [36.9231825672954, 68.4702034883721], [36.9049853506684, 68.4607615363487], [36.8929683208204, 68.4562980681194], [36.8758011353232, 68.4455685771837], [36.877174510163, 68.4304185359824], [36.8974317890496, 68.4381866874199], [36.9159723493865, 68.4426501556492], [36.9468732832814, 68.4354828557041], [36.9722807178172, 68.4405471754257], [37.0023232924373, 68.4432510071415], [37.0418078190807, 68.4503324711591], [37.0713353781359, 68.4580577046329], [37.0972578282366, 68.4628215986083], [37.1091031862296, 68.479731276323], [37.0915926570225, 68.4996881294635], [37.0558849111884, 68.4988297701886], [37.0148553378502, 68.4905036852225] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 415,
+         "id" : 861,
+         "pfafstette" : 245,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 669,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_669",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 416,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [36.538294268449, 68.5196020646402], [36.5509979857169, 68.5190441311115], [36.5757187328328, 68.5285719190625], [36.6042162607581, 68.5389580662882], [36.6222418055301, 68.5449236632485], [36.6273919611793, 68.5327349615455], [36.6337438198132, 68.5196020646402], [36.6509110053104, 68.5281856573888], [36.6907388756638, 68.5377134453397], [36.7430987914301, 68.5445803195385], [36.7916819263871, 68.5517476194836], [36.8188060794726, 68.5573698727339], [36.7693645852408, 68.5689577229445], [36.7190647317341, 68.5629921259843], [36.701382530672, 68.5520051272661], [36.6879921259842, 68.5639792391503], [36.6663614722578, 68.5784855108954], [36.6387223036074, 68.5743653863761], [36.6253318989196, 68.5689577229445], [36.6042162607581, 68.5657388756638], [36.5843023255814, 68.5517476194836], [36.5537447353964, 68.534494598059], [36.538294268449, 68.5196020646402] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 416,
+         "id" : 807,
+         "pfafstette" : 5133,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 733,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_733",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 417,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.5668261307453, 68.8347915903681], [33.5846800036623, 68.8448343938839], [33.6066540010987, 68.8446198040652], [33.6365249038638, 68.8297272706464], [33.6552371360557, 68.8407142693646], [33.6700009155832, 68.8505424830617], [33.6847646951108, 68.8605852865776], [33.6928332722945, 68.8862502288958], [33.6821896172862, 68.9004989928585], [33.6741210401025, 68.9111855658304], [33.6675975096136, 68.9233313495697], [33.6480269181469, 68.909082585607], [33.6294863578099, 68.8978380791064], [33.6085423915034, 68.9028594808643], [33.5960103460905, 68.8891686504303], [33.5800448635781, 68.8746194607215], [33.5589292254166, 68.8553063770372], [33.5668261307453, 68.8347915903681] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 417,
+         "id" : 1190,
+         "pfafstette" : 255,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 911,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_911",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 418,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [34.7338514008423, 68.6944498489288], [34.7163408716352, 68.6846216352316], [34.7204609961545, 68.6768964017579], [34.7374565097967, 68.6805015107123], [34.7674990844168, 68.6857804202527], [34.7968549716169, 68.696252403406], [34.8236357809925, 68.7045784883721], [34.844408075444, 68.711445362571], [34.8406312946347, 68.7289558917781], [34.8358244826955, 68.7456080617103], [34.8250091558322, 68.7535908029665], [34.8076702984801, 68.7497711041934], [34.7826062076543, 68.7453076359641], [34.7534219923091, 68.7289558917781], [34.7456967588354, 68.7048359961545], [34.7338514008423, 68.6944498489288] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 418,
+         "id" : 1246,
+         "pfafstette" : 265,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 930,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_930",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 419,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [34.2317112250503, 68.7711442501373], [34.2220976011719, 68.7663803561619], [34.2425265519136, 68.7547495879875], [34.2756592199231, 68.7515307407068], [34.2923113898553, 68.7628181651712], [34.3163454495513, 68.7726034609046], [34.3412378685222, 68.7773673548801], [34.336602728438, 68.7880968458158], [34.330765885369, 68.8121309055118], [34.3252723860099, 68.8332465436733], [34.3024400292987, 68.8305856299213], [34.2859595312214, 68.8198990569493], [34.2708524079839, 68.8157360144662], [34.2566036440212, 68.811272546237], [34.2426982237685, 68.8050494414942], [34.2301661783556, 68.7996846960264], [34.239951474089, 68.7905431697491], [34.2454449734481, 68.7774102728438], [34.2317112250503, 68.7711442501373] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 419,
+         "id" : 1210,
+         "pfafstette" : 71,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 945,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_945",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 420,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [37.7257484892877, 68.1554002243179], [37.736048800586, 68.1477179088079], [37.7499542208387, 68.1429540148324], [37.7684947811756, 68.1599066105109], [37.8031724958799, 68.1663872230361], [37.8428286943783, 68.1747562259659], [37.8400819446988, 68.1934684581578], [37.8342451016297, 68.2116227568211], [37.8342451016297, 68.2294337117744], [37.8213697125069, 68.2380602224867], [37.8050608862846, 68.2490472212049], [37.80214246475, 68.2642401803699], [37.7988806995056, 68.2773301593115], [37.7676364219007, 68.2874158807911], [37.7381088628456, 68.2796906473173], [37.7085813037905, 68.2696049258378], [37.681457150705, 68.2642401803699], [37.6921008057132, 68.25621452115], [37.7005127266068, 68.2437683116645], [37.7066929133858, 68.2327383949826], [37.7123580845999, 68.2216655603369], [37.7006843984618, 68.1866445019227], [37.7046328511262, 68.1562585835927], [37.7257484892877, 68.1554002243179] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 420,
+         "id" : 1331,
+         "pfafstette" : 81,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 1051,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_1051",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 421,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.4102728438015, 68.9396830937557], [32.4334485442227, 68.9367646722212], [32.4540491668193, 68.9435886284563], [32.4665812122322, 68.9492108817067], [32.4873535066838, 68.9539747756821], [32.5060657388757, 68.9682664576085], [32.5028039736312, 68.9804551593115], [32.4926753341879, 68.9962060520051], [32.4665812122322, 69.0090385231643], [32.437396996887, 68.9935451382531], [32.4106161875114, 68.9777942455594], [32.3874404870903, 68.9718286485992], [32.3970541109687, 68.9620433528658], [32.4051226881524, 68.9506700924739], [32.4102728438015, 68.9396830937557] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 421,
+         "id" : 1465,
+         "pfafstette" : 3281,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 1265,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_1265",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 422,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [36.2953785936642, 68.4059982146127], [36.2788980955869, 68.4036806445706], [36.2797564548617, 68.3825650064091], [36.2953785936642, 68.3786594717085], [36.3096273576268, 68.3852688381249], [36.3364081670024, 68.3935520051273], [36.3679957883171, 68.4010197308185], [36.4013001281816, 68.4045390038454], [36.4253341878777, 68.4156118384911], [36.4382095770005, 68.4208907480315], [36.4531450283831, 68.4310193874748], [36.4697971983153, 68.4417917963743], [36.4828442592932, 68.4470707059147], [36.4603552462919, 68.4553967908808], [36.4229307819081, 68.4539375801135], [36.4059352682659, 68.4432510071415], [36.3913431605933, 68.4364270509064], [36.3654207104926, 68.4283584737228], [36.3398416041018, 68.4215345174876], [36.3259361838491, 68.4099037493133], [36.3110007324666, 68.3974146218641], [36.2953785936642, 68.4059982146127] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 422,
+         "id" : 1478,
+         "pfafstette" : 573,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 1276,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_1276",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 423,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [38.4934650247207, 68.0617532274309], [38.4787012451932, 68.0483628227431], [38.4538088262223, 68.0394358862846], [38.4364699688702, 68.0209811618751], [38.4505470609778, 68.0061744643838], [38.4821346822926, 67.9999513596411], [38.5020486174693, 68.0050156793627], [38.5241942867607, 68.0070757416224], [38.5374130195935, 67.9948870399194], [38.5420481596777, 67.9829987639626], [38.5595586888848, 67.9865609549533], [38.5868545138253, 67.9845008926936], [38.61878547885, 68.0037710584142], [38.6399011170115, 68.0299080983336], [38.6560382713789, 68.0373758240249], [38.6641068485625, 68.0570322514192], [38.64917139718, 68.0676759064274], [38.6062534334371, 68.0724398004029], [38.5549235488006, 68.0665171214063], [38.5144089910273, 68.0659162699139], [38.4934650247207, 68.0617532274309] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 423,
+         "id" : 1610,
+         "pfafstette" : 235,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 1397,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_1397",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 424,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [36.8605223402307, 68.2226097555393], [36.8804362754074, 68.2389614997253], [36.8979468046145, 68.2609784151254], [36.9200924739059, 68.257716649881], [36.9405214246475, 68.2559140954038], [36.955628547885, 68.268059879143], [36.9563152353049, 68.2865146035525], [36.9389763779527, 68.2996475004578], [36.9077321003479, 68.2966432429958], [36.8812946346823, 68.2942398370262], [36.8627540743453, 68.3085315189526], [36.8277330159311, 68.3231236266252], [36.7971754257462, 68.3141966901666], [36.7870467863029, 68.3005487776964], [36.7789782091192, 68.2883171580297], [36.7944286760666, 68.2687036485992], [36.8280763596411, 68.2425666086797], [36.8605223402307, 68.2226097555393] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 424,
+         "id" : 1771,
+         "pfafstette" : 279,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 1511,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_1511",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 425,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [36.7115111701154, 68.3085315189526], [36.6907388756638, 68.3043255585058], [36.6752884087163, 68.3005487776964], [36.6620696758835, 68.2951840322285], [36.6464475370811, 68.2841970335103], [36.6222418055301, 68.2805919245559], [36.5990661051089, 68.2648410318623], [36.5717702801685, 68.2508497756821], [36.5509979857169, 68.2467296511628], [36.5542597509613, 68.2276740752609], [36.586877403406, 68.2113223310749], [36.6131431972166, 68.2136828190808], [36.6033579014832, 68.2249702435451], [36.5978644021241, 68.2365580937557], [36.610739791247, 68.2384035661967], [36.641297381432, 68.2312791842153], [36.6675631752426, 68.2344980314961], [36.6632713788683, 68.2472446667277], [36.6574345357993, 68.2639397546237], [36.6716832997619, 68.2788322880425], [36.7070477018861, 68.283252838308], [36.7334851675517, 68.2888750915583], [36.731768449002, 68.3014071369712], [36.7115111701154, 68.3085315189526] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 425,
+         "id" : 1938,
+         "pfafstette" : 295,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 1669,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_1669",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 426,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [36.4103987364951, 68.266901094122], [36.4038752060062, 68.2808923503021], [36.4212140633583, 68.2918793490203], [36.435291155466, 68.3061710309467], [36.4263642190075, 68.3207631386193], [36.4085103460904, 68.3144541979491], [36.3637039919428, 68.3129949871818], [36.3197559970701, 68.3115357764146], [36.3055072331075, 68.3073298159678], [36.2861083134957, 68.2966432429958], [36.2703145028383, 68.283596182018], [36.2534906610511, 68.2616221845816], [36.2332333821644, 68.2425666086797], [36.2194996337667, 68.2386610739791], [36.2066242446438, 68.2332963285113], [36.1959805896356, 68.2276740752609], [36.1796717634133, 68.213983244827], [36.1740065921992, 68.1928676066655], [36.1745216077641, 68.1598636925472], [36.1782983885735, 68.1408939525728], [36.1968389489104, 68.1512371818348], [36.2124610877129, 68.1610224775682], [36.2251648049808, 68.1663872230361], [36.2370101629738, 68.1708936092291], [36.2488555209668, 68.1756575032045], [36.2629326130745, 68.1818806079473], [36.277868064457, 68.1964297976561], [36.3079106390771, 68.2163866507966], [36.338639901117, 68.2311933482879], [36.3659357260575, 68.2407211362388], [36.3987250503571, 68.244025819447], [36.4169222669841, 68.25587117744], [36.4103987364951, 68.266901094122] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 426,
+         "id" : 2122,
+         "pfafstette" : 715,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 1796,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_1796",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 427,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [37.5969945980589, 68.0198223768541], [37.6103850027467, 67.9990500824025], [37.6381958432521, 68.0005092931697], [37.6526162790698, 68.0046294176891], [37.6637749496429, 68.0114962918879], [37.6804271195752, 68.0195219511079], [37.7013710858817, 68.0385775270097], [37.6938175242629, 68.0608519501923], [37.6747619483611, 68.0590923136788], [37.6380241713972, 68.0454014832448], [37.5969945980589, 68.0198223768541] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 427,
+         "id" : 2444,
+         "pfafstette" : 931,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 1852,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_1852",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 428,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.3542963742904, 68.2395623512177], [33.3391892510529, 68.2285753524995], [33.3218503937008, 68.1970306491485], [33.3100050357077, 68.1610224775682], [33.3062282548984, 68.1414089681377], [33.3282022523347, 68.1256580754441], [33.3515496246109, 68.1298211179271], [33.374725325032, 68.133683734664], [33.4035661966673, 68.1464732878594], [33.4128364768357, 68.1800780534701], [33.4279436000732, 68.2095197765977], [33.4224501007142, 68.2285324345358], [33.3937809009339, 68.2380602224867], [33.3721502472075, 68.2443262451932], [33.3542963742904, 68.2395623512177] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 428,
+         "id" : 5529,
+         "pfafstette" : 29733,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 2003,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_2003",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 429,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.2509613623878, 68.230334989013], [32.2415194103644, 68.2205067753159], [32.2578282365867, 68.2113223310749], [32.2796305621681, 68.2205067753159], [32.3110465116279, 68.2365580937557], [32.3381706647134, 68.2535536073979], [32.3675265519136, 68.2705062030764], [32.3996291887933, 68.283252838308], [32.4336202160776, 68.2915789232741], [32.4643494781176, 68.2972440944882], [32.4483839956052, 68.3063856207654], [32.4190281084051, 68.3088319446988], [32.4052943600073, 68.3144541979491], [32.3776551913569, 68.322823200879], [32.3496726789965, 68.3169005218824], [32.3318188060795, 68.3014071369712], [32.3146516205823, 68.2749267533419], [32.2899308734664, 68.2564720289324], [32.2658968137704, 68.2452275224318], [32.2509613623878, 68.230334989013] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 429,
+         "id" : 5977,
+         "pfafstette" : 9511,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 2022,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_2022",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 430,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.0890633583593, 68.1512371818348], [33.1058872001465, 68.1550997985717], [33.1288912287127, 68.165228438015], [33.1541269913935, 68.1747562259659], [33.1721525361655, 68.1857432246841], [33.187259659403, 68.2029962461088], [33.1658006775316, 68.2131248855521], [33.139363211866, 68.2036400155649], [33.1055438564366, 68.1993911371544], [33.0595357993042, 68.192266755173], [33.0415102545321, 68.1744558002197], [33.0576474088995, 68.1649280122688], [33.0742995788317, 68.1590053332723], [33.0890633583593, 68.1512371818348] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 430,
+         "id" : 5998,
+         "pfafstette" : 2963,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 2149,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_2149",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 431,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [35.9261124336202, 67.8971199185131], [35.9379577916132, 67.896476149057], [35.9544382896905, 67.9071627220289], [35.981905786486, 67.9163900842337], [36.0062831898919, 67.9262182979308], [36.0021630653726, 67.9449734480864], [35.9655969602637, 67.9613251922725], [35.9316059329793, 67.9690075077825], [35.9015633583593, 67.9710675700421], [35.8813060794726, 67.9788357214796], [35.8612204724409, 67.9868184627358], [35.836499725325, 67.982440830434], [35.8555553012269, 67.9710675700421], [35.8723791430141, 67.9597801455777], [35.861048800586, 67.9577200833181], [35.8261994140267, 67.966904527559], [35.788088262223, 67.9619260437649], [35.8030237136056, 67.952398255814], [35.8241393517671, 67.9404241439297], [35.8258560703168, 67.9229136147226], [35.8469717084783, 67.9211539782091], [35.8773576268083, 67.9240723997436], [35.8986449368247, 67.9169909357261], [35.915297106757, 67.9288362937191], [35.9319492766892, 67.9434284013917], [35.9298892144296, 67.9193085057682], [35.9261124336202, 67.8971199185131] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 431,
+         "id" : 4768,
+         "pfafstette" : 971,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 2312,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_2312",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 432,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [36.4419863578099, 67.8111552371361], [36.4749473539645, 67.8120135964109], [36.5156335835927, 67.8269061298297], [36.5465345174876, 67.8366914255631], [36.5618133125801, 67.8474209164988], [36.544474455228, 67.8685365546603], [36.5013848196301, 67.8670773438931], [36.4608702618568, 67.8515839589819], [36.4440464200696, 67.8405969602637], [36.4376945614356, 67.8242452160776], [36.4419863578099, 67.8111552371361] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 432,
+         "id" : 4825,
+         "pfafstette" : 9931,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 2438,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_2438",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 433,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [36.7544291338583, 67.9288362937191], [36.7724546786303, 67.9202527009705], [36.8176043764878, 67.9288362937191], [36.8515954037722, 67.9431279756455], [36.8500503570774, 67.9547158258561], [36.8521104193371, 67.9651448910456], [36.8824963376671, 67.9687070820363], [36.9116805530123, 67.9787498855521], [36.8934833363853, 67.9936424189709], [36.8598356528108, 67.9907239974364], [36.8390633583593, 67.9865609549533], [36.8244712506867, 67.97643231551], [36.7825833180736, 67.96840665629], [36.7400086980406, 67.9654453167918], [36.7688495696759, 67.9550162516023], [36.7947720197766, 67.9418833546969], [36.7703946163706, 67.9345014649332], [36.7544291338583, 67.9288362937191] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 433,
+         "id" : 3586,
+         "pfafstette" : 833,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 2659,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_2659",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 434,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.4780832265153, 68.098619758286], [32.5028039736312, 68.0941992080205], [32.5295847830068, 68.0932550128182], [32.5580823109321, 68.1027828007691], [32.5776529023988, 68.1182761856803], [32.5996268998352, 68.1251430598791], [32.6116439296832, 68.1307223951657], [32.6044337117744, 68.1425677531588], [32.5690693096502, 68.1520955411097], [32.5488120307636, 68.1702927577367], [32.5414301409998, 68.1854427989379], [32.5228895806629, 68.1732111792712], [32.4967954587072, 68.1636833913203], [32.4748214612708, 68.1607649697858], [32.4852934444241, 68.1509367560886], [32.4913019593481, 68.1378038591833], [32.473963101996, 68.1241559467131], [32.4605726973082, 68.1104651162791], [32.4780832265153, 68.098619758286] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 434,
+         "id" : 6535,
+         "pfafstette" : 9419,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 3292,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_3292",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 435,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.6928332722945, 67.9892647866691], [33.7118888481963, 67.9767327412562], [33.7338628456327, 67.967247871269], [33.75, 67.9630419108222], [33.7637337483977, 67.9594797198315], [33.798239791247, 67.9707671442959], [33.8262223036074, 67.9787498855521], [33.8440761765244, 67.9835137795275], [33.8394410364402, 67.9978054614539], [33.8169520234389, 68.0044148278704], [33.7978964475371, 68.0126979948727], [33.7937763230177, 68.0290497390588], [33.7851927302692, 68.0451010574986], [33.7639054202527, 68.055229696942], [33.75, 68.0524400292987], [33.7429614539462, 68.0510237364951], [33.7153222852957, 68.0466461041934], [33.6918032411646, 68.0362170390038], [33.6682841970335, 68.0260883995605], [33.6456235121773, 68.0228266343161], [33.6399583409632, 68.0052731871452], [33.6504303241165, 67.9910244231826], [33.665022431789, 67.9951874656656], [33.677211133492, 68.0008526368797], [33.6928332722945, 67.9892647866691] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 435,
+         "id" : 6410,
+         "pfafstette" : 8553,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 3340,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_3340",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 436,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.6564502838308, 68.0172043810657], [32.6729307819081, 68.0269896767991], [32.6888962644204, 68.0371183162424], [32.7070934810474, 68.0489636742355], [32.7163637612159, 68.0668604651163], [32.6925013733748, 68.0748432063725], [32.6538752060062, 68.0680192501373], [32.6361930049441, 68.0629978483794], [32.6047770554843, 68.0694784609046], [32.570614356345, 68.0644570591467], [32.576794543124, 68.0516245879876], [32.5991118842703, 68.0448006317524], [32.6154207104926, 68.0484057407068], [32.6324162241348, 68.0463456784472], [32.6466649880974, 68.0290497390588], [32.6564502838308, 68.0172043810657] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 436,
+         "id" : 6784,
+         "pfafstette" : 921,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 3528,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_3528",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 437,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.7802256912653, 67.9826554202527], [32.7973928767625, 67.9746297610328], [32.8284654825124, 67.9731705502655], [32.8615981505219, 67.9713679957883], [32.8883789598975, 67.9702092107673], [32.9017693645852, 67.9996509338949], [32.8993659586156, 68.0288351492401], [32.8803103827138, 68.0249296145395], [32.8600531038271, 68.0299080983336], [32.8574780260026, 68.0810663111152], [32.8569630104376, 68.1280614814137], [32.8296671854972, 68.136344648416], [32.8087232191906, 68.1497779710676], [32.7927577366783, 68.1616233290606], [32.7735304889214, 68.1461728621132], [32.7465780076909, 68.1361300585973], [32.721857260575, 68.1307223951657], [32.7421145394616, 68.1152290102545], [32.7616851309284, 68.1030832265153], [32.7654619117378, 68.0914953763047], [32.7737021607764, 68.0745427806263], [32.764088536898, 68.0614528016847], [32.7414278520418, 68.0540279939571], [32.7222006042849, 68.0382771012635], [32.7182521516206, 68.0219682750412], [32.7311275407435, 68.0120971433803], [32.7506981322102, 67.9998655237136], [32.7709554110969, 67.9886639351767], [32.7802256912653, 67.9826554202527] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 437,
+         "id" : 6508,
+         "pfafstette" : 915,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 3605,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_3605",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 438,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [30.4563037905146, 68.9177520142831], [30.4829129280352, 68.9069796053836], [30.520337392419, 68.9221725645486], [30.5457448269548, 68.9492108817067], [30.5277192821828, 68.9537601858634], [30.501796832082, 68.9539747756821], [30.4822262406153, 68.960841649881], [30.4552737593847, 68.9542752014283], [30.4411966672771, 68.9364213285113], [30.4563037905146, 68.9177520142831] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 438,
+         "id" : 2979,
+         "pfafstette" : 823,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 3633,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_3633",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 439,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [34.2981482329244, 68.1646705044864], [34.3105086064823, 68.1581040560337], [34.3341993224684, 68.1563015015565], [34.3616668192639, 68.1669880745285], [34.38501419154, 68.1765158624794], [34.4131683757553, 68.1905071186596], [34.4313655923823, 68.2014941173778], [34.4438976377953, 68.2071592885918], [34.4674166819264, 68.2110219053287], [34.4921374290423, 68.2146270142831], [34.5127380516389, 68.2237685405603], [34.5429522981139, 68.2220518220106], [34.5510208752976, 68.2003353323567], [34.536085423915, 68.1845844396631], [34.5259567844717, 68.1785759247391], [34.5608061710309, 68.1809793307087], [34.6129944149423, 68.1990907114082], [34.6493888481963, 68.2083180736129], [34.675311298297, 68.2146270142831], [34.6887017029848, 68.2467296511628], [34.7043238417872, 68.2722658395898], [34.7159975279253, 68.2802914988097], [34.6971136238784, 68.2889609274858], [34.6725645486175, 68.2865146035525], [34.6490455044863, 68.2826519868156], [34.6320499908442, 68.2909780717817], [34.645097051822, 68.3001625160227], [34.6590024720747, 68.3070293902216], [34.6492171763413, 68.3156988188976], [34.6384018494781, 68.3290463056217], [34.6320499908442, 68.3469430965025], [34.6181445705915, 68.3403337300861], [34.5929088079106, 68.3293467313679], [34.5678447170848, 68.3245828373924], [34.5779733565281, 68.3159134087164], [34.6001190258194, 68.3063856207654], [34.6013207288042, 68.2808923503021], [34.5637245925654, 68.2645406061161], [34.5173731917231, 68.2612359229079], [34.4826954770188, 68.2659998168833], [34.4620948544223, 68.2800339910273], [34.4418375755356, 68.2853558185314], [34.3984045962278, 68.2755276048343], [34.3779756454862, 68.2589183528658], [34.378834004761, 68.2419657571873], [34.3628685222487, 68.2249702435451], [34.3475897271562, 68.2133823933346], [34.3238990111701, 68.2095197765977], [34.2957448269548, 68.2015370353415], [34.282011078557, 68.191107970152], [34.2808093755722, 68.1779750732467], [34.2981482329244, 68.1646705044864] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 439,
+         "id" : 3566,
+         "name" : "Chudozero",
+         "lge_id" : "ru",
+         "pfafstette" : 431,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 3784,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 440,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [36.743613806995, 68.0951004852591], [36.767819538546, 68.0923966535433], [36.7841283647683, 68.0974180553012], [36.798377128731, 68.1015810977843], [36.816231001648, 68.1075466947445], [36.8399217176341, 68.1111088857352], [36.8658441677348, 68.1218383766709], [36.8804362754074, 68.1574602865776], [36.8787195568577, 68.1806789049625], [36.8605223402307, 68.1711511170115], [36.8394067020692, 68.1613658212782], [36.8255012818165, 68.1550997985717], [36.8129692364036, 68.1482758423366], [36.7899652078374, 68.138190120857], [36.7647294451566, 68.1313661646219], [36.7453305255448, 68.1295206921809], [36.7365752609412, 68.1111088857352], [36.743613806995, 68.0951004852591] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 440,
+         "id" : 2519,
+         "pfafstette" : 283,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 3926,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_3926",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 441,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [36.677348470976, 68.0093933116645], [36.7082494048709, 67.9996509338949], [36.7372619483611, 68.0023118476469], [36.7789782091192, 68.0120971433803], [36.8061023622047, 68.0236849935909], [36.798548800586, 68.0371183162424], [36.786188427028, 68.043040995239], [36.7662744918513, 68.0510237364951], [36.7492789782091, 68.0584914621864], [36.7400086980406, 68.0638562076543], [36.7178630287493, 68.0486632484893], [36.6903955319538, 68.0456589910273], [36.6615546603186, 68.0543284197033], [36.6464475370811, 68.0414959485442], [36.65331441128, 68.0329123557956], [36.6598379417689, 68.0219253570775], [36.677348470976, 68.0093933116645] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 441,
+         "id" : 3419,
+         "pfafstette" : 87,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 4028,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_4028",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 442,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [34.3743705365318, 68.3819641549167], [34.3560016480498, 68.3626081532686], [34.3654436000732, 68.3478014557773], [34.3901643471891, 68.346857260575], [34.4025247207471, 68.3522220060428], [34.4174601721296, 68.36205021974], [34.4303355612525, 68.3676724729903], [34.4595197765977, 68.3587884544955], [34.4864722578282, 68.3596468137704], [34.4792620399194, 68.3742818394067], [34.4480177623146, 68.3932515793811], [34.4243270463285, 68.3953116416407], [34.4004646584874, 68.3914919428676], [34.3743705365318, 68.3819641549167] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 442,
+         "id" : 3448,
+         "pfafstette" : 485,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 4119,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_4119",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 443,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [29.9917597509614, 68.9602837163523], [29.9766526277239, 68.9522151391687], [29.9907297198315, 68.9477516709394], [30.0036051089544, 68.9489962918879], [30.0236907159861, 68.9498546511628], [30.0803424281267, 68.963502563633], [30.1266938289691, 68.9855623969969], [30.1442043581762, 68.9944464154917], [30.1781953854605, 69.0045321369713], [30.2257484892877, 69.0138024171397], [30.2518426112434, 69.0250469236404], [30.2444607214796, 69.0449179408533], [30.2140748031496, 69.0401540468779], [30.1747619483611, 69.0304116691082], [30.1469511078557, 69.0188238188976], [30.1174235488006, 68.9997682429958], [30.0772523347372, 68.9843606940121], [30.0458363852774, 68.9739316288226], [30.0199139351767, 68.9682664576085], [29.9917597509614, 68.9602837163523] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 443,
+         "id" : 2603,
+         "pfafstette" : 855,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 4147,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_4147",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 444,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [35.1086110602454, 66.9593624107306], [35.14088536898, 66.9608216214979], [35.1827733015931, 66.9688901986816], [35.2053481505219, 66.9786325764512], [35.2261204449734, 66.9926238326314], [35.2386524903864, 67.004211682842], [35.2201977659769, 67.0157995330526], [35.1931594488189, 67.0110356390771], [35.1738463651346, 67.0066150888116], [35.1467222120491, 66.9985894295917], [35.1247482146127, 66.9873020051273], [35.1117011536349, 66.9771733656839], [35.1086110602454, 66.9593624107306] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 444,
+         "id" : 8885,
+         "pfafstette" : 95,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 4355,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_4355",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 445,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [34.6735087438198, 66.9884607901483], [34.6639809558689, 66.9815939159495], [34.6755688060795, 66.9667443004944], [34.6954827412562, 66.9599203442593], [34.7109332082036, 66.9771733656839], [34.7380573612891, 66.9914650476103], [34.760288866508, 66.9985465116279], [34.7753959897455, 67.0095335103461], [34.799172541659, 67.0205205090643], [34.8072411188427, 67.0434816196667], [34.7906747848379, 67.057129532137], [34.7780569034975, 67.0687173823476], [34.7710183574437, 67.0850691265336], [34.7412332906061, 67.0942964887383], [34.7134224501007, 67.0854124702436], [34.7026071232375, 67.0788460217909], [34.6836373832631, 67.0865712552646], [34.6684444240981, 67.0776443188061], [34.6517064182384, 67.0618934261124], [34.6365992950009, 67.0436962094855], [34.6288740615272, 67.0220226377953], [34.6541956601355, 67.0086751510713], [34.6836373832631, 66.9956280900934], [34.6735087438198, 66.9884607901483] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 445,
+         "id" : 8856,
+         "pfafstette" : 431,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 4406,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_4406",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 446,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [38.2896905328694, 66.4182098058964], [38.2671156839407, 66.4196690166636], [38.2507210217909, 66.4191540010987], [38.2563861930049, 66.4467931697491], [38.2549269822377, 66.4717285066838], [38.2443691631569, 66.4785953808826], [38.2364722578282, 66.4874793993774], [38.2272878135872, 66.5038311435635], [38.2128673777696, 66.5249896996887], [38.1948418329976, 66.5270497619484], [38.1767304522981, 66.5065349752793], [38.1689193828969, 66.4877798251236], [38.1749278978209, 66.4720718503937], [38.1788763504852, 66.4565355475188], [38.1817947720198, 66.4414284242813], [38.1865157480315, 66.4297976561069], [38.1853140450467, 66.4027593389489], [38.189434169566, 66.3748197445523], [38.1977602545321, 66.361171832082], [38.22582860282, 66.346322216627], [38.2569870444973, 66.3382536394433], [38.2762142922542, 66.3310434215345], [38.3015358908625, 66.3349489562351], [38.325655786486, 66.3394124244644], [38.3634235945797, 66.3525453213697], [38.3723505310383, 66.3757210217909], [38.353037447354, 66.3855063175243], [38.3501190258194, 66.4018580617103], [38.3342393792346, 66.4194544268449], [38.3066860465116, 66.4167505951291], [38.2896905328694, 66.4182098058964] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 446,
+         "id" : 8857,
+         "pfafstette" : 27,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 4440,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_4440",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 447,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.4545641823842, 67.3381563587255], [32.4682979307819, 67.3253238875664], [32.4825466947446, 67.3208175013734], [32.5137051364219, 67.3253238875664], [32.5437477110419, 67.3309461408167], [32.5622882713789, 67.3461390999817], [32.5550780534701, 67.3580273759385], [32.5446919062443, 67.3666538866508], [32.5357649697858, 67.3725765656473], [32.5117309100897, 67.3797009476287], [32.49533624794, 67.3758812488555], [32.4712163523164, 67.3645509064274], [32.4463239333456, 67.3523622047244], [32.4545641823842, 67.3381563587255] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 447,
+         "id" : 8941,
+         "pfafstette" : 119,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 4481,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_4481",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 448,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [37.95372871269, 66.3506998489288], [37.9751018586339, 66.3477385094305], [37.9968183482879, 66.3614722578282], [38.0198223768541, 66.381042849295], [38.0417963742904, 66.3858067432705], [38.0589635597876, 66.3953345312214], [38.0732123237502, 66.4003988509431], [38.0699505585058, 66.3786823612891], [38.0693497070134, 66.3614722578282], [38.0958730086065, 66.3652490386376], [38.1187053653177, 66.379540720564], [38.131838262223, 66.3885105749863], [38.1454861746933, 66.3950341054752], [38.1285764969786, 66.4086820179454], [38.0852293535982, 66.4196690166636], [38.0722681285479, 66.4467931697491], [38.0898644936825, 66.4845180598792], [38.0937271104193, 66.5032302920711], [38.0708089177806, 66.5047753387658], [38.0467748580846, 66.4967067615821], [38.0349295000916, 66.4741319126534], [38.0198223768541, 66.4563209577001], [38.001968503937, 66.4431880607947], [37.9870330525545, 66.414604696942], [37.9721834370994, 66.3964933162425], [37.9543295641824, 66.3742188930599], [37.95372871269, 66.3506998489288] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 448,
+         "id" : 9014,
+         "pfafstette" : 93,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 4736,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_4736",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 449,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [34.6137669382897, 67.2890582082036], [34.5866427852042, 67.2751098699872], [34.5990889946896, 67.2539942318257], [34.62672816334, 67.2509899743637], [34.6567707379601, 67.2619769730819], [34.6799464383812, 67.2721056125252], [34.6921351400842, 67.2754102957334], [34.6987445065006, 67.2875989974364], [34.6689594396631, 67.3029636284563], [34.6386593572606, 67.297684718916], [34.6137669382897, 67.2890582082036] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 449,
+         "id" : 7789,
+         "pfafstette" : 2973,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 4850,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_4850",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 450,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [31.0653955319539, 67.6740752609412], [31.0417048159678, 67.6931308368431], [31.0314045046695, 67.699654367332], [31.034322926204, 67.7154052600256], [31.0090871635232, 67.7284523210035], [30.9697743087347, 67.7370788317158], [30.955353872917, 67.7302119575169], [30.9766411829335, 67.6990535158396], [31.0010185863395, 67.6743756866874], [31.0248809741806, 67.6624874107306], [31.0578419703351, 67.6484961545505], [31.0808459989013, 67.6452773072697], [31.0805026551914, 67.6556634544955], [31.0653955319539, 67.6740752609412] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 450,
+         "id" : 7992,
+         "pfafstette" : 27211,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 4876,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_4876",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 451,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [31.5131157297198, 67.633045687603], [31.5737158945248, 67.6250200283831], [31.590539736312, 67.62853930141], [31.554316974913, 67.6321444103644], [31.5405832265153, 67.6399125618019], [31.5570637245926, 67.6562643059879], [31.5112273393151, 67.669611792712], [31.4628158762131, 67.6746761124336], [31.4269364585241, 67.6815429866325], [31.3896836659952, 67.6823584279436], [31.4116576634316, 67.6740752609412], [31.4348333638528, 67.6684530076909], [31.4595541109687, 67.6591827275224], [31.4815281084051, 67.6469940258194], [31.5131157297198, 67.633045687603] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 451,
+         "id" : 7971,
+         "lge_id" : "ru",
+         "pfafstette" : 255,
+         "lke_type" : "N",
+         "altitude" : 127,
+         "objectid" : 4898,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_4898",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 452,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [34.0883652261491, 67.3663534609046], [34.1186653085515, 67.347598310749], [34.1582356711225, 67.338070522798], [34.1884499175975, 67.3315469923091], [34.2233851400842, 67.3555810520051], [34.2201233748398, 67.3824047793445], [34.2040720563999, 67.3764821003479], [34.1946301043765, 67.3731774171397], [34.1772912470243, 67.3806022248673], [34.1576348196301, 67.3714177806263], [34.1445019227248, 67.3609887154368], [34.1305965024721, 67.3797867835561], [34.1145451840322, 67.3919325672954], [34.1014122871269, 67.3912887978392], [34.1109400750778, 67.400516160044], [34.1264763779527, 67.4272540514558], [34.1453602819996, 67.4537344350852], [34.1638150064091, 67.4632622230361], [34.1899091283648, 67.4739917139718], [34.2207242263322, 67.4936052234023], [34.21840665629, 67.5], [34.2184924922175, 67.5], [34.2143723676982, 67.5115020142831], [34.1829564182384, 67.5054934993591], [34.1642441860465, 67.5], [34.155488921443, 67.4974249221754], [34.1445019227248, 67.4926610282], [34.1299956509797, 67.4810731779894], [34.1091375206006, 67.4769530534701], [34.0972921626076, 67.4715453900385], [34.0801249771104, 67.4632622230361], [34.0637303149606, 67.4472109045962], [34.0547175425746, 67.4382839681377], [34.0351469511078, 67.4112456509797], [34.0437305438564, 67.3752374793994], [34.0698246658121, 67.3788425883538], [34.0851034609046, 67.3839069080755], [34.0883652261491, 67.3663534609046] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 452,
+         "id" : 7478,
+         "pfafstette" : 393,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 5072,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_5072",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 453,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [34.2375480681194, 67.2375995696759], [34.261152948178, 67.2364407846548], [34.2846719923091, 67.2414621864128], [34.3107661142648, 67.2449814594397], [34.3401220014649, 67.2492303378502], [34.3789198406885, 67.2509899743637], [34.4177176799121, 67.2551530168467], [34.4267304522981, 67.2729639718001], [34.418061023622, 67.2863972944516], [34.4138550631752, 67.2967405237136], [34.3992629555026, 67.3181995055851], [34.3577183665995, 67.3351521012635], [34.3294783464567, 67.344079037722], [34.321753112983, 67.3607312076543], [34.3089635597876, 67.3719757141549], [34.2926547335653, 67.3621904184215], [34.2783201336751, 67.3524051226882], [34.2557452847464, 67.3425339910273], [34.2372905603369, 67.3184999313313], [34.2607237685406, 67.2935216764329], [34.2905088353781, 67.2709468275041], [34.269822376854, 67.2628782503205], [34.2406381615089, 67.2527496108771], [34.2375480681194, 67.2375995696759] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 453,
+         "id" : 7756,
+         "pfafstette" : 351,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 5327,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_5327",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 454,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [34.29419978026, 66.8707368156016], [34.321581441128, 66.8499216031862], [34.3601217725691, 66.8600073246658], [34.3857867148874, 66.8707368156016], [34.4067306811939, 66.8796637520601], [34.4008938381249, 66.8974747070134], [34.3999496429225, 66.9204358176158], [34.3947994872734, 66.9394484755539], [34.379177348471, 66.9358433665995], [34.3618384911188, 66.9248134499176], [34.3276757919795, 66.921251258927], [34.3044142556308, 66.9165302829152], [34.3139420435818, 66.9078608542392], [34.3220106207654, 66.8980755585058], [34.3081052005127, 66.8903932429958], [34.29419978026, 66.8707368156016] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 454,
+         "id" : 9487,
+         "pfafstette" : 25,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 5532,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_5532",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 455,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [37.4782835103461, 66.4190681651712], [37.4948498443508, 66.4015576359641], [37.4828328145028, 66.39623580846], [37.4780260025636, 66.3846479582494], [37.5051501556491, 66.367695362571], [37.5401712140633, 66.3716008972716], [37.5600851492401, 66.3941757462004], [37.5630035707746, 66.4253771058414], [37.5370811206739, 66.4455485488006], [37.5077252334737, 66.4604410822194], [37.4774251510712, 66.4743894204358], [37.4533910913752, 66.4824150796557], [37.4331338124885, 66.4919428676067], [37.4221468137704, 66.5038311435635], [37.4152799395715, 66.5136593572606], [37.4069538546054, 66.5222858679729], [37.4024903863761, 66.5377363349204], [37.3991427852042, 66.562671671855], [37.384979857169, 66.5822851812855], [37.3558814777513, 66.5752037172679], [37.336396722212, 66.5636158670573], [37.3198303882073, 66.5490237593847], [37.3034357260575, 66.5347749954221], [37.2900453213697, 66.5211270829519], [37.3047232649698, 66.5038311435635], [37.3204312396997, 66.4928012268815], [37.3287573246658, 66.484217634133], [37.3466970335103, 66.4699688701703], [37.3843790056766, 66.4547759110053], [37.4179408533236, 66.4464069080755], [37.4412023896722, 66.439969213514], [37.4592279344442, 66.4345615500824], [37.4782835103461, 66.4190681651712] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 455,
+         "id" : 9150,
+         "pfafstette" : 33,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 5573,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_5573",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 456,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [34.151969648416, 66.8626682384179], [34.1724844350851, 66.8730543856437], [34.1904241439297, 66.8846422358543], [34.2082780168467, 66.8903074070683], [34.1990077366783, 66.9028394524812], [34.1608965848746, 66.9171311344076], [34.1204678630287, 66.9191911966673], [34.0981505218824, 66.9152856619667], [34.0788374381981, 66.9084617057316], [34.0820133675151, 66.8933116645303], [34.0958329518403, 66.8825821735946], [34.1115409265702, 66.8781616233291], [34.1296523072697, 66.8721960263688], [34.151969648416, 66.8626682384179] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 456,
+         "id" : 9584,
+         "pfafstette" : 13,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 5782,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_5782",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 457,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [31.6854742721113, 67.3717182063725], [31.6628135872551, 67.3830056308369], [31.6557750412013, 67.3835635643655], [31.6714830159312, 67.3725765656473], [31.6858176158213, 67.3613320591467], [31.7006672312763, 67.3497442089361], [31.717576908991, 67.3402164209852], [31.7336282274309, 67.3297873557957], [31.7566322559971, 67.3160536073979], [31.7839280809376, 67.3139506271745], [31.8254726698407, 67.3111609595312], [31.8943130836843, 67.2943800357078], [31.9345701336752, 67.2943800357078], [31.9470163431606, 67.3015044176891], [31.9616942867607, 67.3104313541476], [31.9333684306904, 67.3257959851676], [31.8633263138619, 67.3386713742904], [31.8222967405237, 67.3354525270097], [31.8076187969237, 67.3288431605933], [31.7737994414942, 67.3309461408167], [31.7197228071782, 67.3493579472624], [31.6854742721113, 67.3717182063725] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 457,
+         "id" : 9288,
+         "pfafstette" : 2255,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 5854,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_5854",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 458,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [36.1574402581945, 67.4272969694195], [36.1909162699139, 67.4121040102545], [36.2067959164988, 67.4181125251785], [36.2139202984801, 67.4356230543857], [36.2360659677715, 67.4409877998535], [36.2576107855704, 67.4508160135506], [36.2432761856803, 67.4638630745285], [36.2194996337667, 67.4739917139718], [36.1942638710859, 67.4817169474455], [36.1787275682109, 67.4703866050174], [36.1540926570225, 67.4629617972899], [36.1312603003113, 67.4519747985717], [36.1574402581945, 67.4272969694195] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 458,
+         "id" : 6970,
+         "pfafstette" : 481,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 5890,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_5890",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 459,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [39.8610030214246, 66.6586791567479], [39.8776551913569, 66.6622842657023], [39.9104445156565, 66.6664902261491], [39.9448647225783, 66.6560611609595], [39.9605726973082, 66.6554603094671], [39.9787699139352, 66.6596662699139], [39.9914736312031, 66.6697519913935], [39.9558517212965, 66.6860608176158], [39.9113028749313, 66.6953310977843], [39.8767109961545, 66.7056743270463], [39.8443508514924, 66.7033567570042], [39.8452092107673, 66.6792797793444], [39.8610030214246, 66.6586791567479] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 459,
+         "id" : 7252,
+         "pfafstette" : 57,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 5924,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_5924",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 460,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [37.4283270005493, 67.1885443371178], [37.4618888481963, 67.179316974913], [37.4800002288958, 67.1873855520967], [37.4913305713239, 67.2161835057682], [37.4913305713239, 67.2372991439297], [37.4794852133309, 67.2433076588537], [37.4608588170665, 67.2560542940854], [37.4291853598242, 67.2646378868339], [37.4236060245376, 67.2495307635964], [37.4221468137704, 67.2153251464933], [37.4283270005493, 67.1885443371178] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 460,
+         "id" : 6992,
+         "pfafstette" : 4111,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 5982,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_5982",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 461,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [37.2000034334371, 67.2319343984618], [37.203351034609, 67.2135225920161], [37.2172564548617, 67.2064411279986], [37.2448956235122, 67.1977716993225], [37.2770840963193, 67.2012909723494], [37.2949379692364, 67.2057973585424], [37.3109034517487, 67.2164839315144], [37.2873844076176, 67.2414621864128], [37.2443806079473, 67.258114356345], [37.2276426020875, 67.2545092473906], [37.2172564548617, 67.2488869941403], [37.2000034334371, 67.2319343984618] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 461,
+         "id" : 7074,
+         "pfafstette" : 41651,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 6253,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_6253",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 462,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.5986712598425, 66.1087283693463], [33.6039930873466, 66.1328053470061], [33.5605601080388, 66.1390284517488], [33.5088010437649, 66.1491570911921], [33.5015049899286, 66.1598007462003], [33.4868270463285, 66.1667105383629], [33.4675139626442, 66.1777404550449], [33.5015049899286, 66.1824614310566], [33.5439937740341, 66.1809163843618], [33.5749805438564, 66.1785988143197], [33.622791155466, 66.1755945568577], [33.64450764512, 66.1860236220473], [33.6542929408533, 66.196409769273], [33.668198361106, 66.202418284197], [33.6491427852042, 66.2109589589819], [33.6081990477935, 66.213619872734], [33.5834783006775, 66.2210875984252], [33.5571266709394, 66.2285124061527], [33.5142087071965, 66.2309158121223], [33.4919772019777, 66.228297816334], [33.4613337758652, 66.2243922816334], [33.4250251785387, 66.2210875984252], [33.40245032961, 66.2157657709211], [33.3639958340963, 66.2187700283831], [33.3343824391137, 66.2148644936825], [33.3037390130013, 66.2113023026918], [33.2407354422267, 66.2107014511994], [33.1850279252884, 66.1955514099982], [33.1511227339315, 66.1868819813221], [33.1279470335104, 66.1773541933712], [33.1348139077092, 66.1637062809009], [33.1533544680462, 66.1682126670939], [33.1750709577001, 66.1720752838308], [33.1922381431972, 66.1527192821828], [33.2121520783739, 66.1366679637429], [33.2343835835928, 66.1417322834646], [33.2531816517121, 66.1452515564915], [33.2659712049075, 66.1398868110236], [33.2898335927486, 66.1316036440212], [33.3269147134225, 66.1298440075078], [33.3459702893243, 66.1247796877861], [33.37206441128, 66.1152518998352], [33.3950684398462, 66.1071833226515], [33.4404756454862, 66.0992005813954], [33.4853678355613, 66.1030202801685], [33.4954964750046, 66.1039644753708], [33.5249381981322, 66.089071941952], [33.5695728804248, 66.0840076222304], [33.5986712598425, 66.1087283693463] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 462,
+         "id" : 12015,
+         "name" : "Loukhskoe ozereo",
+         "lge_id" : "ru",
+         "pfafstette" : 31,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 6443,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 463,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [31.7463319446988, 66.5588519730819], [31.7713960355246, 66.5507833958982], [31.8040995238967, 66.5478649743637], [31.8189491393518, 66.5710406747848], [31.8410948086431, 66.5930146722212], [31.865987227614, 66.5944738829885], [31.8755150155649, 66.6049458661417], [31.8956006225966, 66.6103106116096], [31.9184329793078, 66.6159757828237], [31.9051284105475, 66.6249027192822], [31.878175929317, 66.6212976103278], [31.853798525911, 66.6165337163523], [31.8124256088629, 66.6194950558506], [31.7862456509797, 66.6275207150705], [31.7690784654825, 66.632284609046], [31.7268471891595, 66.6355034563267], [31.6794657571873, 66.6331858862846], [31.6433288317158, 66.6284219923091], [31.6170630379052, 66.6188942043582], [31.6040159769273, 66.6013836751511], [31.6247882713789, 66.5939588674236], [31.6429854880059, 66.588036188427], [31.6586934627358, 66.5764054202527], [31.7110533785021, 66.5671351400842], [31.7463319446988, 66.5588519730819] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 463,
+         "id" : 11327,
+         "pfafstette" : 3435,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 6549,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_6549",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 464,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [30.9023931056583, 66.5573927623146], [30.8859984435085, 66.5675214017579], [30.8580159311482, 66.5873924189709], [30.8586167826406, 66.6034437374107], [30.8758698040652, 66.6058471433804], [30.9294314228163, 66.6046025224318], [30.9808471433803, 66.60790720564], [31.0060829060612, 66.5971777147043], [31.0320053561619, 66.582027673503], [31.0497733931514, 66.588036188427], [31.0771550540194, 66.5906971021791], [31.1179271195752, 66.6034437374107], [31.1324333913203, 66.6272202893243], [31.1047083867424, 66.6255035707746], [31.0635071415492, 66.6188942043582], [31.0444515656473, 66.624258949826], [31.0248809741806, 66.6304820545688], [30.9978426570225, 66.6281215665629], [30.9594739974364, 66.6272202893243], [30.9128650888116, 66.6251173091009], [30.8926078099249, 66.6239156061161], [30.8672003753891, 66.6331858862846], [30.8319218091925, 66.6385506317524], [30.8056560153818, 66.6480355017396], [30.7634247390588, 66.6599237776964], [30.7296053836294, 66.6545590322285], [30.7331246566563, 66.6462329472624], [30.746858405054, 66.6275207150705], [30.7447983427944, 66.6081647134225], [30.7417082494049, 66.6004823979125], [30.7578454037722, 66.5971777147043], [30.789089681377, 66.5980789919429], [30.8330376762498, 66.5859332082036], [30.8752689525728, 66.5659763550632], [30.9023931056583, 66.5573927623146] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 464,
+         "id" : 11667,
+         "pfafstette" : 253,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 6736,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_6736",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 465,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.8331006225966, 66.3026317295367], [32.8813404138436, 66.2933614493683], [32.9166189800403, 66.2933614493683], [32.9389363211866, 66.3046917917964], [32.9645154275774, 66.3129749587988], [32.9922404321553, 66.3210006180187], [33.0251155923824, 66.3248203167918], [33.0557590184948, 66.3287258514924], [33.1212518311665, 66.3289833592749], [33.187774674968, 66.3305284059696], [33.2028817982055, 66.3364510849661], [33.2161005310383, 66.3465797244095], [33.2332677165354, 66.3623306171031], [33.2502632301776, 66.384047106757], [33.232666865043, 66.4057635964109], [33.2070019227248, 66.4037035341513], [33.1952424006592, 66.3970941677349], [33.1773885277422, 66.3908710629921], [33.1462300860648, 66.3867080205091], [33.1015954037722, 66.3896693600073], [33.0798789141183, 66.3792832127816], [33.0644284471709, 66.3691545733382], [33.0388493407801, 66.3584250824025], [33.0129268906794, 66.3500989974364], [32.9873477842886, 66.341815830434], [32.9686355520967, 66.3252065784655], [32.9489791247024, 66.3254640862479], [32.8882072880425, 66.3364510849661], [32.8342164896539, 66.3334897454679], [32.8179076634316, 66.3156787905146], [32.8331006225966, 66.3026317295367] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 465,
+         "id" : 11383,
+         "pfafstette" : 15,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 6737,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_6737",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 466,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.9567901941037, 66.4446901895257], [32.9694939113716, 66.4428876350485], [32.9953305255448, 66.4488532320088], [33.0272614905695, 66.4407846548251], [33.0421111060245, 66.4401838033327], [33.066574345358, 66.4512566379784], [33.0870891320271, 66.4601406564732], [33.1108656839407, 66.4625440624428], [33.1355005951291, 66.473531061161], [33.0698361106025, 66.4922432933529], [33.0010815326863, 66.4979513825307], [32.9773049807728, 66.4979513825307], [32.9371337667094, 66.4931874885552], [32.936532915217, 66.4800975096136], [32.9497516480498, 66.4625440624428], [32.9567901941037, 66.4446901895257] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 466,
+         "id" : 11204,
+         "pfafstette" : 3,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 7173,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_7173",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 467,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [31.0780992492218, 66.7098373695294], [31.1074551364219, 66.7232706921809], [31.0439365500824, 66.7280345861564], [30.9719202069218, 66.7134424784838], [30.9667700512727, 66.70606058872], [30.9511479124703, 66.6988503708112], [30.9216203534151, 66.6911680553012], [30.8877151620582, 66.6846445248123], [30.8617927119575, 66.6765759476286], [30.8484881431972, 66.6676060932064], [30.8804191082219, 66.6673485854239], [30.9192169474455, 66.6787218458158], [30.9441952023439, 66.6813398416041], [30.9653108405054, 66.6891079930416], [30.976898690716, 66.7027559055118], [31.022477568211, 66.7075197994873], [31.0780992492218, 66.7098373695294] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 467,
+         "id" : 11231,
+         "pfafstette" : 2611,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 7264,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_7264",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 468,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [30.7781026826589, 66.3852058917781], [30.8024800860648, 66.3867080205091], [30.8098619758286, 66.3902702114997], [30.8241107397913, 66.3973945934811], [30.8290892235854, 66.4185102316426], [30.8029951016297, 66.4387245925655], [30.7896905328694, 66.4536171259843], [30.8191322559971, 66.4622436366966], [30.8672003753891, 66.4732306354148], [30.8955262314594, 66.4800545916499], [30.9207619941403, 66.4776511856803], [30.9478003112983, 66.4848614035891], [30.9582722944516, 66.4987668238418], [30.9930358450833, 66.5133160135506], [31.0387863944333, 66.5377363349204], [31.0253959897455, 66.5564485671123], [30.9984435085149, 66.5567489928585], [30.9684009338949, 66.5546889305988], [30.9294314228163, 66.5546889305988], [30.9008480589636, 66.5546889305988], [30.8744105932979, 66.542800654642], [30.8801616004395, 66.5243459302326], [30.8642819538546, 66.515762337484], [30.8120078740158, 66.5026723585424], [30.7911497436367, 66.4818142281634], [30.7807635964109, 66.4637457654276], [30.75587117744, 66.4565355475188], [30.7206784471709, 66.4550763367515], [30.6879749587988, 66.4455485488006], [30.6838548342794, 66.4354199093573], [30.6716661325765, 66.4164501693829], [30.6797347097601, 66.4006563587255], [30.7084897454679, 66.394733679729], [30.7344121955686, 66.3932744689617], [30.7587895989746, 66.3914719144845], [30.7781026826589, 66.3852058917781] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 468,
+         "id" : 12082,
+         "name" : "Susijarvi and Rugozero and Siikajarvi",
+         "pfafstette" : 239,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 7503,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 469,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [34.2292219831533, 65.9930644570592], [34.2117114539462, 66.0055106665446], [34.1728277787951, 66.0102745605201], [34.1455319538546, 66.0037939479949], [34.1287939479949, 65.992764031313], [34.091541155466, 65.9784723493866], [34.0517991210401, 65.965382370445], [34.0446747390588, 65.9582579884637], [34.0651895257279, 65.9487302005127], [34.0999530763596, 65.9567987776964], [34.1348024629189, 65.9650819446988], [34.1561756088628, 65.9689874793994], [34.1774629188793, 65.9665411554661], [34.2013253067204, 65.9707900338766], [34.2180633125801, 65.9817770325948], [34.2292219831533, 65.9930644570592] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 469,
+         "id" : 12556,
+         "pfafstette" : 73,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 7541,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_7541",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 470,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [30.9534654825124, 66.4404842290789], [30.9683150979674, 66.4301409998169], [30.9897740798389, 66.4235745513642], [31.0227350759934, 66.4348619758286], [31.0568977751328, 66.4446901895257], [31.0910604742721, 66.4473940212415], [31.1103735579564, 66.4631449139352], [31.1020474729903, 66.4771361701154], [31.0858244826955, 66.4744323383996], [31.0539793535983, 66.4714280809376], [31.0132072880425, 66.4788958066288], [30.9963834462553, 66.4728872917048], [30.9775853781359, 66.4622436366966], [30.9526071232375, 66.4536171259843], [30.9534654825124, 66.4404842290789] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 470,
+         "id" : 12401,
+         "pfafstette" : 242255,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 7542,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_7542",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 471,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.861844213514, 66.0120771149973], [33.8748912744918, 66.0108754120125], [33.9045905054019, 66.0150384544955], [33.9343755722395, 66.0058540102545], [33.9489676799121, 66.0052531587621], [33.9790102545321, 66.0094162012452], [34.0045035249954, 66.0150813724593], [34.0238166086797, 66.0251670939389], [34.0348036073979, 66.0388150064091], [34.019095632668, 66.0534071140817], [33.9780660593298, 66.0572697308185], [33.955491210401, 66.0676129600806], [33.9861346365135, 66.0750806857719], [34.0107695477019, 66.0786857947262], [33.9801261215894, 66.0893723676982], [33.9421866416407, 66.0866685359824], [33.9326588536898, 66.0858101767076], [33.9028737868522, 66.0953379646585], [33.8794405786486, 66.0866685359824], [33.8847624061527, 66.0640936870537], [33.88622161692, 66.047184009339], [33.8737754074345, 66.0403600531038], [33.8615867057315, 66.0302314136605], [33.861844213514, 66.0120771149973] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 471,
+         "id" : 12363,
+         "pfafstette" : 53,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 7719,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_7719",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 472,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [31.6262474821461, 66.9709502609412], [31.6580926112434, 66.9620233244827], [31.672341375206, 66.9616799807728], [31.7060748947079, 66.9655855154734], [31.7277055484344, 66.9724094717085], [31.7190361197583, 66.9867011536349], [31.6968046145395, 66.9929242583776], [31.6810108038821, 66.9982890038455], [31.660496017213, 67.0045121085882], [31.6352602545321, 67.0006924098151], [31.6132862570958, 66.9964864493683], [31.5858187603003, 66.9929242583776], [31.5688232466581, 66.9807355566746], [31.5805827687237, 66.973654092657], [31.6262474821461, 66.9709502609412] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 472,
+         "id" : 10074,
+         "pfafstette" : 23273,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 7722,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_7722",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 473,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [31.7473619758286, 66.099758514924], [31.723928767625, 66.0928916407252], [31.7312248214613, 66.0866685359824], [31.7551730452298, 66.0846084737228], [31.7651300128182, 66.0709176432888], [31.7413534609046, 66.0664541750595], [31.7220403772203, 66.0667975187695], [31.7425551638894, 66.0596302188244], [31.7717393792346, 66.0519049853507], [31.7832413935177, 66.0534071140817], [31.8139706555576, 66.0593297930782], [31.8653863761216, 66.0608748397729], [31.8877037172679, 66.0715184947812], [31.8564594396631, 66.0744798342795], [31.8249576542758, 66.0744798342795], [31.7961167826406, 66.089071941952], [31.7473619758286, 66.099758514924] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 473,
+         "id" : 13929,
+         "pfafstette" : 91,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 8844,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_8844",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 474,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.4419463010438, 65.9511765244461], [32.4804866324849, 65.94250709577], [32.4958512635049, 65.9428075215162], [32.519026963926, 65.9466701382531], [32.5610865683941, 65.9439663065373], [32.5920733382165, 65.9550391411829], [32.6086396722212, 65.9710904596228], [32.5864081670024, 65.9787727751328], [32.5483828511262, 65.9754680919246], [32.5343057590185, 65.9763693691632], [32.5221170573155, 65.9754680919246], [32.5053790514558, 65.9597171992309], [32.4860659677715, 65.9576571369713], [32.4448647225783, 65.9636227339315], [32.4114745467863, 65.9588588399561], [32.4419463010438, 65.9511765244461] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 474,
+         "id" : 13977,
+         "pfafstette" : 93,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 8957,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_8957",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 475,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.0097624061527, 66.0088153497528], [32.0249553653177, 66.0129354742721], [32.0493327687237, 66.0168410089727], [32.0713067661601, 66.0218624107306], [32.0952549899286, 66.0201456921809], [32.1201474088995, 66.0287722028933], [32.1184306903498, 66.052849180553], [32.0961133492035, 66.0605744140267], [32.0805770463285, 66.0564113715437], [32.0625515015565, 66.0531066883355], [32.0374874107306, 66.0444801776231], [32.0198910455961, 66.0334502609412], [32.0068439846182, 66.0210040514558], [32.0097624061527, 66.0088153497528] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 475,
+         "id" : 13834,
+         "pfafstette" : 69,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 9034,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_9034",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 476,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [30.1145051272661, 66.1131489196118], [30.0915869346274, 66.1102304980773], [30.0808574436916, 66.1286852224867], [30.0586259384728, 66.1429339864494], [30.0225748489288, 66.1384276002564], [30.0112445065006, 66.1170115363487], [30.0808574436916, 66.0914324299579], [30.1499553653177, 66.0840505401941], [30.1697834645669, 66.0828917551731], [30.1750194561436, 66.1009602179088], [30.1427451474089, 66.1197582860282], [30.1145051272661, 66.1131489196118] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 476,
+         "id" : 15222,
+         "pfafstette" : 6973,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 9210,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_9210",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 477,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.0871864127449, 66.1140072788867], [32.0981734114631, 66.1197582860282], [32.0842679912104, 66.1239213285113], [32.0276162790698, 66.1220758560703], [31.9839257919795, 66.1185565830434], [31.9672736220473, 66.130144433254], [31.9192055026552, 66.1485562396997], [31.8701073521333, 66.1458953259476], [31.8516526277239, 66.1355091787219], [31.8276185680278, 66.1253805392785], [31.8005802508698, 66.1170544543124], [31.7576622871269, 66.1146510483428], [31.7181777604834, 66.113449345358], [31.8127689525728, 66.093578328145], [31.9319092199231, 66.0792866462187], [31.9958569859, 66.0762823887567], [32.0439251052921, 66.0780849432338], [32.0580021973998, 66.0834496887017], [32.0719934535799, 66.0995010071416], [32.0871864127449, 66.1140072788867] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 477,
+         "id" : 13470,
+         "pfafstette" : 7513,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 9581,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_9581",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 478,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.3525796557407, 65.9868413523164], [33.3198761673686, 65.9844379463468], [33.2983313495697, 65.9802319859], [33.272237227614, 65.9671849249222], [33.2731814228163, 65.9431079472624], [33.2963571232375, 65.9339235030214], [33.3498329060612, 65.9309192455594], [33.3952401117012, 65.9323784563267], [33.4165274217176, 65.930318394067], [33.438501419154, 65.9288591832998], [33.4487158945248, 65.9249965665629], [33.4445957700055, 65.9170138253067], [33.4330937557224, 65.9104044588903], [33.4457974729903, 65.8964132027101], [33.4776426020875, 65.889589246475], [33.490088811573, 65.8845249267534], [33.5118911371544, 65.8764563495697], [33.53832860282, 65.8797610327779], [33.5615043032412, 65.8836665674785], [33.5845083318074, 65.8979582494049], [33.5712895989746, 65.9175288408716], [33.5530065464201, 65.9264557773302], [33.5273416041018, 65.9339235030214], [33.5068268174327, 65.9392882484893], [33.4851103277788, 65.9496314777513], [33.4518059879143, 65.9642235854239], [33.4248535066838, 65.9728500961362], [33.4089738600989, 65.9785152673503], [33.3965276506134, 65.9838370948544], [33.3525796557407, 65.9868413523164] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 478,
+         "id" : 13235,
+         "pfafstette" : 4913,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 9583,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_9583",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 479,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [31.7356882896905, 66.1494145989746], [31.7258171580297, 66.137826748764], [31.7392933986449, 66.1229342153452], [31.7624690990661, 66.127140175792], [31.7859023072697, 66.1310027925289], [31.8090780076909, 66.1334491164622], [31.8180907800769, 66.14649617744], [31.8281335835928, 66.1512600714155], [31.8407514649332, 66.1628479216261], [31.8208375297565, 66.1773541933712], [31.7914816425563, 66.1732340688519], [31.769335973265, 66.167869323384], [31.7489928584508, 66.1583415354331], [31.7356882896905, 66.1494145989746] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 479,
+         "id" : 13410,
+         "pfafstette" : 483,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 9818,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_9818",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 480,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.6900979674052, 66.0531066883355], [32.6850336476836, 66.0386004165904], [32.7084668558872, 66.0233645394616], [32.7254623695294, 66.0317335423915], [32.7319859000183, 66.0450381111518], [32.7477797106757, 66.05602510987], [32.7617709668559, 66.0652953900385], [32.7725004577916, 66.074222326497], [32.7852041750595, 66.0843509659403], [32.7983370719649, 66.0950375389123], [32.8159334370994, 66.1116897088445], [32.8503536440212, 66.1212174967955], [32.8747310474272, 66.1310027925289], [32.8535295733382, 66.1396722212049], [32.8280363028749, 66.1346079014833], [32.8170493041568, 66.1288998123054], [32.8018563449918, 66.1191574345358], [32.7900109869987, 66.1090287950925], [32.7751613715437, 66.0992434993591], [32.761084279436, 66.0938787538912], [32.7228014557773, 66.1030202801685], [32.6877803973631, 66.0995010071416], [32.7075226606849, 66.0891148599158], [32.7257198773119, 66.0769261582128], [32.7118144570592, 66.0707030534701], [32.700827458341, 66.0649949642923], [32.6900979674052, 66.0531066883355] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 480,
+         "id" : 12829,
+         "pfafstette" : 2311,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 9995,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_9995",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 481,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.9675196850394, 65.3160335790148], [32.9793650430324, 65.3229004532137], [32.9945580021974, 65.3247030076909], [33.0173045229811, 65.3222566837576], [33.0614241897089, 65.3229004532137], [33.0952435451383, 65.3274068394067], [33.081595632668, 65.3350891549167], [33.0580765885369, 65.3449173686138], [33.0447720197766, 65.3580502655191], [33.0394501922725, 65.368093069035], [33.0325833180736, 65.3856465162058], [33.0139569218092, 65.396633514924], [32.9980772752243, 65.4022986861381], [32.9646012635049, 65.4094230681194], [32.9282068302509, 65.4162470243545], [32.9052886376122, 65.4124273255814], [32.8835721479583, 65.4044445843252], [32.861083134957, 65.398135643655], [32.8440017853873, 65.3814834737228], [32.830697216627, 65.3728140450467], [32.8173926478667, 65.3618270463285], [32.8402250045779, 65.3491233290606], [32.8737868522249, 65.3419131111518], [32.912155511811, 65.3342307956418], [32.94872161692, 65.3371492171764], [32.9588502563633, 65.3294669016664], [32.9675196850394, 65.3160335790148] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 481,
+         "id" : 17865,
+         "pfafstette" : 433,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 10328,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_10328",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 482,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.4047678996521, 65.3131151574803], [33.4348104742721, 65.3062912012452], [33.4480292071049, 65.3041882210218], [33.478071781725, 65.3083512635049], [33.5097452389672, 65.3119134544955], [33.5220197765977, 65.3276643471892], [33.4712049075261, 65.3446169428676], [33.4075146493316, 65.3386084279436], [33.3830514099982, 65.3279647729354], [33.3745536531771, 65.3207974729903], [33.4047678996521, 65.3131151574803] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 482,
+         "id" : 17792,
+         "pfafstette" : 593,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 10340,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_10340",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 483,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [37.472446667277, 64.7413191265336], [37.4931331258011, 64.7359543810657], [37.4860945797473, 64.7324351080388], [37.4743350576817, 64.7247527925289], [37.5356219099066, 64.7122207471159], [37.60583569859, 64.7244523667826], [37.5913294268449, 64.7431645989746], [37.5684112342062, 64.7508469144845], [37.5434329793078, 64.7651385964109], [37.5134762406153, 64.7668982329244], [37.4973390862479, 64.7624776826589], [37.4848928767625, 64.758615065922], [37.463777238601, 64.7550099569676], [37.4497001464933, 64.7502460629921], [37.472446667277, 64.7413191265336] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 483,
+         "id" : 16993,
+         "pfafstette" : 97,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 10792,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_10792",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 484,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.3908624793994, 65.2578368201795], [33.3769570591467, 65.2423005173045], [33.3956692913386, 65.221184879143], [33.4336087712873, 65.2117429271196], [33.4624496429225, 65.2162063953488], [33.4818485625343, 65.2313135185863], [33.5002174510163, 65.2477081807361], [33.5281999633767, 65.2506695202344], [33.5499164530306, 65.253072926204], [33.565710263688, 65.2578368201795], [33.5799590276506, 65.2700255218825], [33.5735213330892, 65.2839309421351], [33.5576416865043, 65.2791670481597], [33.5431354147592, 65.2756477751328], [33.5205605658304, 65.2670212644204], [33.483908624794, 65.2557338399561], [33.4318920527376, 65.2586522614906], [33.3908624793994, 65.2578368201795] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 484,
+         "id" : 18194,
+         "pfafstette" : 911,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 11018,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_11018",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 485,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.9717256454862, 65.1992108817067], [32.9998798297015, 65.1903268632119], [33.0126693828969, 65.1893826680095], [33.0349008881157, 65.2004555026552], [33.0657159860831, 65.2054339864494], [33.0813381248856, 65.2101978804248], [33.0649434627358, 65.2236312030764], [33.0463170664714, 65.2357769868156], [33.027003982787, 65.2432447125069], [33.0112101721297, 65.2598968824391], [33.0261456235122, 65.272943943417], [33.0412527467497, 65.2874931331258], [33.0236563816151, 65.3059049395715], [32.9980772752243, 65.3026860922908], [32.9767041292804, 65.3041882210218], [32.9529275773668, 65.2964629875481], [32.9279493224684, 65.2812700283831], [32.9070911920894, 65.2771069859], [32.9246017212965, 65.2688238188977], [32.9383354696942, 65.2396825215162], [32.9421122505036, 65.2081378181652], [32.9717256454862, 65.1992108817067] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 485,
+         "id" : 18669,
+         "pfafstette" : 417,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 11264,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_11264",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 486,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [38.7382690899103, 64.2992640999817], [38.72496452115, 64.2766892510529], [38.7356081761582, 64.2623975691265], [38.7787836476836, 64.2581916086797], [38.8177531587621, 64.2781484618202], [38.788053927852, 64.3049292711958], [38.7382690899103, 64.2992640999817] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 486,
+         "id" : 18883,
+         "pfafstette" : 93,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 11293,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_11293",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 487,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [57.7949608588171, 58.8569229536715], [57.8023427485809, 58.8557212506867], [57.8205399652078, 58.8682962140634], [57.8696381157297, 58.879540720564], [57.9126419154001, 58.9027164209852], [57.9360751236037, 58.9190681651712], [57.952727293536, 58.9319006363303], [57.9668043856437, 58.9431022248673], [58.0051730452298, 58.9627586522615], [58.0277478941586, 58.9847326496979], [58.0316105108955, 59.0017281633401], [58.0239711133492, 59.0130155878044], [58.012984114631, 58.9961059100897], [58.0038855063175, 58.9704838857352], [57.9597658395898, 58.9565355475188], [57.9061183849112, 58.9414284242813], [57.8860327778795, 58.9173085286578], [57.8669772019777, 58.8937894845266], [57.8195957700055, 58.878038591833], [57.7949608588171, 58.8569229536715] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 487,
+         "id" : 16425,
+         "pfafstette" : 27457399,
+         "altitude" : 200,
+         "objectid" : 11345,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_11345",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 488,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [29.5626659494598, 66.0613898553379], [29.5962277971068, 66.0646945385461], [29.6009487731185, 66.0754669474455], [29.6237811298297, 66.0754669474455], [29.6469568302509, 66.0771407480315], [29.6717634132943, 66.0807458569859], [29.7071278154184, 66.074222326497], [29.7231791338583, 66.0756815372643], [29.6934799029482, 66.0849518174327], [29.6379440578649, 66.0858101767076], [29.5668719099066, 66.0861106024538], [29.5091901666362, 66.0934924922176], [29.498031496063, 66.0911749221754], [29.5156278611976, 66.0795870719648], [29.5358851400842, 66.0700592840139], [29.5626659494598, 66.0613898553379] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 488,
+         "id" : 15989,
+         "name" : "Suininki",
+         "pfafstette" : 7891,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 11347,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 489,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.0620250412013, 65.5524257233108], [33.0400510437649, 65.5533699185131], [33.0230555301227, 65.5473614035891], [32.9978197674419, 65.5295504486358], [33.0025407434536, 65.5119540835012], [33.0239138893976, 65.5063747482146], [33.0403085515473, 65.5055163889398], [33.0682052279802, 65.5087352362205], [33.0887200146493, 65.4971473860099], [33.1125824024904, 65.4855595357993], [33.13035043948, 65.4796368568028], [33.1438266800952, 65.4775338765794], [33.175585973265, 65.4798514466215], [33.1936973539645, 65.4748729628273], [33.20580021974, 65.4695082173595], [33.2256283189892, 65.4620404916682], [33.2413362937191, 65.4539719144845], [33.2541258469145, 65.4591220701337], [33.2674304156748, 65.4650447491302], [33.2942112250504, 65.4754738143197], [33.3142109961546, 65.5061172404322], [33.2948120765428, 65.5351727018861], [33.2573017762315, 65.5381340413844], [33.2055427119575, 65.5349151941037], [33.1611655374474, 65.5438421305622], [33.1189342611243, 65.5512669382897], [33.0804797656107, 65.5498077275224], [33.0620250412013, 65.5524257233108] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 489,
+         "id" : 16438,
+         "pfafstette" : 223,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 11391,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_11391",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 490,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.0371326222304, 65.5881334691449], [33.0692352591101, 65.5881334691449], [33.0984194744552, 65.5925969373741], [33.1155008240249, 65.5988200421168], [33.1264878227431, 65.6005796786303], [33.1464875938473, 65.6012234480864], [33.1647706464018, 65.6214807269731], [33.1622814045047, 65.6374462094855], [33.1348997436367, 65.6303647454679], [33.0846857260575, 65.6216953167918], [33.0371326222304, 65.6071890450467], [33.0371326222304, 65.5881334691449] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 490,
+         "id" : 15945,
+         "pfafstette" : 231,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 11614,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_11614",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 491,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.8965333730086, 65.540537447354], [32.9270051272661, 65.5337134911189], [32.9362754074346, 65.5277908121223], [32.9597086156382, 65.5373186000733], [32.984772706464, 65.5456446850394], [33.0046866416407, 65.5777473219191], [32.9915537447354, 65.6146138527742], [32.9704381065739, 65.6231545275591], [32.9497516480498, 65.6294205502655], [32.9157606207654, 65.6261587850211], [32.9006534975279, 65.6154722120491], [32.870267579198, 65.6112662516023], [32.8339589818715, 65.6029830845999], [32.8135300311298, 65.5928973631203], [32.8027147042666, 65.5872321919063], [32.8155900933895, 65.5783052554477], [32.8223711316609, 65.5670178309833], [32.8251178813404, 65.5571896172862], [32.8491519410365, 65.5607947262406], [32.8654607672588, 65.5536703442593], [32.8965333730086, 65.540537447354] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 491,
+         "id" : 16177,
+         "pfafstette" : 237,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 11678,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_11678",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 492,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [42.036428767625, 63.1252002838308], [42.0646687877678, 63.0987628181652], [42.0980589635598, 63.0936555804798], [42.1128227430873, 63.1064451336751], [42.099861518037, 63.1218956006226], [42.0820076451199, 63.1334834508332], [42.063467084783, 63.1462300860648], [42.0611495147409, 63.1582041979491], [42.0475016022706, 63.1751138756638], [42.0183173869255, 63.1668307086614], [42.015398965391, 63.1499210309467], [42.036428767625, 63.1252002838308] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 492,
+         "id" : 20977,
+         "pfafstette" : 3757,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 11905,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_11905",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 493,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.7300002288958, 64.7493877037173], [33.743819813221, 64.7434650247208], [33.75, 64.7414478804249], [33.7636479124702, 64.7369414942318], [33.7803000824025, 64.7303321278154], [33.7900853781359, 64.7226498123055], [33.8103426570225, 64.7330359595312], [33.8308574436916, 64.7431645989746], [33.8486254806812, 64.7444092199231], [33.8463079106391, 64.7577567066471], [33.8058791887933, 64.7687437053653], [33.7835618476469, 64.7592159174144], [33.7722315052188, 64.7487868522249], [33.75, 64.7568983473723], [33.7444206647134, 64.7589154916682], [33.7429614539462, 64.7758680873467], [33.7400430324117, 64.7847950238052], [33.7247642373192, 64.7966403817982], [33.701588536898, 64.8148375984252], [33.6696575718733, 64.8231207654276], [33.6597006042849, 64.8326485533785], [33.6762669382897, 64.8386141503388], [33.7048503021425, 64.8368115958616], [33.725965940304, 64.8418759155832], [33.7493991485076, 64.8454810245376], [33.75, 64.8458672862113], [33.7746349111884, 64.8629915537447], [33.75, 64.8811029344442], [33.7475965940304, 64.8828625709577], [33.7094854422267, 64.8784420206922], [33.6860522340231, 64.8748798297015], [33.6673400018312, 64.8704163614723], [33.6578122138803, 64.8534637657938], [33.641160043948, 64.8448372550815], [33.6340356619667, 64.8394725096136], [33.6248512177257, 64.8353523850943], [33.6120616645303, 64.8308889168651], [33.6001304706098, 64.8302880653726], [33.5712895989746, 64.8394725096136], [33.5507748123054, 64.8291292803516], [33.5302600256363, 64.8248804019411], [33.5056251144479, 64.8287430186779], [33.5097452389672, 64.8148375984252], [33.5300025178539, 64.8059106619667], [33.5461396722212, 64.7987004440579], [33.5754097234939, 64.7904172770555], [33.6120616645303, 64.7776706418239], [33.6403875206006, 64.7654390221571], [33.6554946438381, 64.7597738509431], [33.6664816425563, 64.7532503204541], [33.6825329609962, 64.7460830205091], [33.7021893883904, 64.7455680049442], [33.7300002288958, 64.7493877037173] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 493,
+         "id" : 20211,
+         "pfafstette" : 215,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 12323,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_12323",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 494,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.0137108588171, 65.1445333958982], [32.0356848562534, 65.1439325444058], [32.0652124153086, 65.1492972898737], [32.0800620307636, 65.1602842885918], [32.1040102545321, 65.1685674555942], [32.1283876579381, 65.1772368842703], [32.1135380424831, 65.1864213285113], [32.0923365683941, 65.2052193966307], [32.0600622596594, 65.223030351584], [32.0276162790698, 65.2179660318623], [32.0047839223585, 65.2084382439114], [31.9804923548801, 65.1995113074529], [31.9929385643655, 65.1900264374657], [32.0149125618019, 65.1786960950375], [32.0137108588171, 65.157580456876], [32.0137108588171, 65.1445333958982] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 494,
+         "id" : 19776,
+         "pfafstette" : 58373,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 12486,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_12486",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 495,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.3691459897455, 64.5852694103644], [33.3950684398462, 64.5766858176158], [33.426484389306, 64.5870290468779], [33.4414198406885, 64.6013207288042], [33.4714624153086, 64.6040245605201], [33.4946381157297, 64.607543833547], [33.4871703900385, 64.6182733244827], [33.4767842428127, 64.6319641549167], [33.4726641182934, 64.6459554110969], [33.4423640358909, 64.6530797930782], [33.4221067570042, 64.6658264283098], [33.3937809009339, 64.6780580479766], [33.3454552737594, 64.6694315372642], [33.3156702069218, 64.6611483702619], [33.3028806537264, 64.6441528566197], [33.3194469877312, 64.6248397729354], [33.3579014832448, 64.6179728987365], [33.3933517212965, 64.6040245605201], [33.40245032961, 64.5915783510346], [33.3852831441128, 64.5909345815785], [33.3691459897455, 64.5852694103644] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 495,
+         "id" : 21834,
+         "pfafstette" : 291,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 12933,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_12933",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 496,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [30.4980200512727, 65.559893449002], [30.5140713697125, 65.5616530855155], [30.5136421900751, 65.552726149057], [30.4834279436001, 65.5459021928218], [30.4626556491485, 65.5280912378685], [30.4794794909357, 65.5107952984801], [30.5042002380516, 65.5007524949643], [30.5280626258927, 65.4909242812672], [30.5598219190625, 65.500967084783], [30.5841993224684, 65.5102802829152], [30.5996497894159, 65.5227264924007], [30.5844568302509, 65.5393786623329], [30.5669463010438, 65.552726149057], [30.5664312854789, 65.5714383812489], [30.5517533418788, 65.5815670206922], [30.529350164805, 65.5762451931881], [30.5018826680095, 65.569077893243], [30.4892647866691, 65.5619535112617], [30.4980200512727, 65.559893449002] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 496,
+         "id" : 19058,
+         "name" : "Pistojrvi and Ohtajrvi",
+         "lge_id" : "fi",
+         "pfafstette" : 977,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 13171,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 497,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.295510208753, 65.2780082631386], [32.3070980589636, 65.2717851583959], [32.3400590551181, 65.26942467039], [32.3810886284563, 65.2667208386742], [32.4079552737594, 65.2714847326497], [32.4281267167186, 65.2818708798755], [32.4444355429409, 65.2913986678264], [32.4328476927303, 65.3002826863212], [32.41919978026, 65.3071495605201], [32.3928481505219, 65.3133726652628], [32.3633205914668, 65.3184799029482], [32.3246944240982, 65.3261622184582], [32.2766263047061, 65.3139735167552], [32.2804030855155, 65.2895531953855], [32.295510208753, 65.2780082631386] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 497,
+         "id" : 19172,
+         "pfafstette" : 4255,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 13470,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_13470",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 498,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.6080388207288, 65.2574505585058], [32.594648416041, 65.2521287310017], [32.6064937740341, 65.2370216077642], [32.6316437007874, 65.2334164988098], [32.658252838308, 65.2381803927852], [32.6945614356345, 65.2497682429958], [32.7153337300861, 65.2658624793994], [32.6850336476836, 65.2738881386193], [32.6362788408716, 65.2675791979491], [32.6080388207288, 65.2574505585058] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 498,
+         "id" : 19182,
+         "pfafstette" : 42511,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 13509,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_13509",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 499,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [30.7064296832082, 65.476933025087], [30.7238543764878, 65.463242194653], [30.7441116553745, 65.4614396401758], [30.756386193005, 65.4698086431057], [30.7766434718916, 65.4837569813221], [30.8010208752976, 65.4899800860648], [30.8188747482146, 65.4896796603186], [30.8387886833913, 65.4920830662882], [30.8580159311482, 65.5045721937374], [30.8301192547153, 65.5177050906428], [30.8029951016297, 65.5220827229445], [30.7790468778612, 65.5316105108955], [30.7368156015382, 65.5327692959165], [30.7143265885369, 65.5235848516755], [30.7307212506867, 65.5101944469877], [30.7519227247757, 65.498306171031], [30.7242835561253, 65.4962031908076], [30.7033395898187, 65.4914822147958], [30.7064296832082, 65.476933025087] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 499,
+         "id" : 19205,
+         "lge_id" : "fi",
+         "pfafstette" : 9815,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 13564,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_13564",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 500,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [30.7754417689068, 64.6943239562351], [30.7820511353232, 64.6875], [30.7880596502472, 64.6812768952573], [30.8276300128182, 64.6771138527742], [30.8762131477751, 64.681663156931], [30.8857409357261, 64.6875], [30.8945820362571, 64.6928647454679], [30.8762131477751, 64.7101606848563], [30.8503765336019, 64.7107615363487], [30.8265141457609, 64.7101606848563], [30.7870296191174, 64.7158258560703], [30.7679740432155, 64.7077572788867], [30.7754417689068, 64.6943239562351] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 500,
+         "id" : 24211,
+         "pfafstette" : 78935,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 13925,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_13925",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 501,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [35.2268071323933, 63.8770800906427], [35.2413134041384, 63.8809856253433], [35.2550471525362, 63.8799985121773], [35.2748752517854, 63.8740758331807], [35.2873214612708, 63.881543558872], [35.2692959164988, 63.8951914713422], [35.2603689800403, 63.9305558734664], [35.2945316791796, 63.9520148553378], [35.3192524262955, 63.9574225187694], [35.3078362479399, 63.9663065372642], [35.2976217725691, 63.9727871497894], [35.2734160410181, 64.0058768998352], [35.2276654916682, 64.0367349157663], [35.2053481505219, 64.0390524858084], [35.1821724501007, 64.0355332127815], [35.1593400933895, 64.0322285295733], [35.1477522431789, 64.0280654870903], [35.1354777055484, 64.0242887062809], [35.1154779344442, 64.0242887062809], [35.0945339681377, 64.0254045733382], [35.0674098150522, 64.0164776368797], [35.0367663889397, 64.0129583638528], [35.0275819446988, 64.0060914896539], [35.032217084783, 63.987379257462], [35.0471525361655, 63.9763922587438], [35.0524743636696, 63.9668644707929], [35.074448361106, 63.9549761948361], [35.1086110602454, 63.9564354056034], [35.1238898553378, 63.9490535158396], [35.1429454312397, 63.9363068806079], [35.1509281724959, 63.9272941082219], [35.1553916407251, 63.9121011490569], [35.1753055759018, 63.9038179820546], [35.1908418787768, 63.90858187603], [35.2128158762131, 63.9112427897821], [35.2235453671489, 63.8934318348288], [35.2268071323933, 63.8770800906427] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 501,
+         "id" : 24344,
+         "name" : "Sumozero",
+         "lge_id" : "ru",
+         "pfafstette" : 191,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 13943,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 502,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [34.2087930324116, 64.0123145943966], [34.2355738417872, 64.0019713651346], [34.2687923457242, 64.0111558093756], [34.2944572880425, 64.0212415308552], [34.3226114722578, 64.0468635552097], [34.3607226240615, 64.0709405328694], [34.3953145028383, 64.0723997436367], [34.3864734023073, 64.0810691723128], [34.3841558322651, 64.1149314457059], [34.3853575352499, 64.1470340825856], [34.3808940670207, 64.1729136147226], [34.3632977018861, 64.2020119941403], [34.3547141091375, 64.214243613807], [34.3729113257645, 64.2317541430141], [34.3526540468779, 64.2424407159861], [34.3268174327046, 64.2347584004761], [34.3057017945431, 64.2270760849661], [34.2818394067021, 64.2187070820363], [34.2687923457242, 64.2103380791064], [34.2572044955136, 64.2038574665812], [34.2658739241897, 64.1951880379051], [34.2748008606482, 64.184201039187], [34.2604662607581, 64.1767762314594], [34.2453591375206, 64.1660896584875], [34.255144433254, 64.1526992537997], [34.2632130104376, 64.1396092748581], [34.2503376213148, 64.0944166590368], [34.2329129280351, 64.0381941265336], [34.2170332814503, 64.0183231093206], [34.2087930324116, 64.0123145943966] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 502,
+         "id" : 23983,
+         "name" : "Belomorkanal",
+         "lge_id" : "ru",
+         "pfafstette" : 151,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 14152,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 503,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [60.0349352224867, 56.8379761032778], [60.012360373558, 56.8219677028017], [60.0178538729171, 56.8138562076543], [60.0315017853873, 56.8144141411829], [60.0546774858085, 56.8066459897455], [60.0782823658671, 56.7971182017945], [60.102659769273, 56.7980623969969], [60.1237754074346, 56.7817535707746], [60.1430884911189, 56.7534277147043], [60.1743327687237, 56.7510243087347], [60.1908991027285, 56.7703803103827], [60.1799121040103, 56.7813673091009], [60.1618865592383, 56.7974186275408], [60.1490970060429, 56.8164742034426], [60.1136467679912, 56.8375898416041], [60.0690979216261, 56.8391778062626], [60.0349352224867, 56.8379761032778] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 503,
+         "id" : 23497,
+         "pfafstette" : 26991,
+         "altitude" : 298,
+         "objectid" : 14465,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_14465",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 504,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.9961030488922, 64.4125246062992], [32.9961030488922, 64.4009367560886], [33.0004806811939, 64.3815807544406], [32.9900086980407, 64.3542420115363], [32.9797083867424, 64.3304654596228], [33.0166178355613, 64.3129549304157], [33.0580765885369, 64.3114098837209], [33.0489779802234, 64.320079312397], [33.0415102545321, 64.3331263733748], [33.0340425288409, 64.3438987822743], [33.0259739516572, 64.3536411600439], [33.0524972532503, 64.3614093114814], [33.093784334371, 64.3584050540194], [33.1071747390588, 64.3483193325398], [33.081595632668, 64.3417958020509], [33.0625400567662, 64.3361306308368], [33.0831406793628, 64.3269032686321], [33.0991061618751, 64.3165171214063], [33.081938976378, 64.303727568211], [33.0914667643289, 64.2888350347921], [33.1167025270097, 64.2852728438015], [33.1411657663432, 64.2975044634682], [33.1637406152719, 64.3081910364402], [33.1455433986449, 64.3251436321187], [33.130178767625, 64.3417958020509], [33.1606505218824, 64.342954587072], [33.2053710401026, 64.3411949505585], [33.2585893151438, 64.3391348882989], [33.302279802234, 64.3513235900018], [33.2713788683391, 64.3857437969236], [33.2226240615272, 64.412224180553], [33.1913797839224, 64.4205502655191], [33.1640839589819, 64.4104645440395], [33.1398782274309, 64.4057006500641], [33.0947285295733, 64.4149280122688], [33.066402673503, 64.4229965894525], [33.0439136605017, 64.4285759247391], [33.0120685314045, 64.4247562259659], [32.9961030488922, 64.4125246062992] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 504,
+         "id" : 23944,
+         "name" : "Berezovoe and Tungudskoe",
+         "lge_id" : "ru",
+         "pfafstette" : 2771,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 14506,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 505,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.9752449185131, 64.6572428355612], [32.94872161692, 64.6518780900934], [32.9597086156382, 64.6426507278887], [32.9868327687237, 64.6331658579015], [33.0004806811939, 64.6197754532137], [33.0215963193554, 64.6108485167552], [33.0489779802234, 64.6176724729903], [33.0747287584692, 64.6281015381798], [33.096788591833, 64.6343246429225], [33.0775613440762, 64.6483158991027], [33.048377128731, 64.6622213193554], [33.0207379600806, 64.6685302600256], [33.0004806811939, 64.6620067295367], [32.9752449185131, 64.6572428355612] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 505,
+         "id" : 22319,
+         "pfafstette" : 29633,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 15341,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_15341",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 506,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.9569504211683, 64.5020085607032], [33.9336888848196, 64.4969442409815], [33.91626419154, 64.4862576680095], [33.88622161692, 64.4878027147043], [33.8638184398462, 64.4886610739791], [33.873689571507, 64.4808929225417], [33.9026162790698, 64.4684467130562], [33.9360064548617, 64.4503353323567], [33.9682807635964, 64.4405071186596], [33.9899972532503, 64.4273742217543], [34.0065635872551, 64.4113658212781], [34.0376361930049, 64.4050997985717], [34.0598676982238, 64.4089624153085], [34.0801249771104, 64.4128679500092], [34.1166052462919, 64.4226103277788], [34.1365191814686, 64.4449705868888], [34.1284506042849, 64.4568588628456], [34.1178069492767, 64.4633823933345], [34.1059615912836, 64.4749702435451], [34.0755756729537, 64.4821375434902], [34.0591810108039, 64.4883606482329], [34.0417563175243, 64.4934249679546], [34.0269067020692, 64.507716649881], [34.0256191631569, 64.5249267533419], [34.001241759751, 64.5288322880425], [33.9780660593298, 64.515398965391], [33.9569504211683, 64.5020085607032] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 506,
+         "id" : 22136,
+         "pfafstette" : 14591,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 15427,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_15427",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 507,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.2211648507599, 64.54393941128], [33.2577309558689, 64.5350553927852], [33.2864859915766, 64.5389609274858], [33.3153268632119, 64.5490037310016], [33.3422793444424, 64.5520079884636], [33.3554980772752, 64.5641966901666], [33.3359274858085, 64.5733811344076], [33.3132668009522, 64.5793467313679], [33.2647695019227, 64.587672816334], [33.214812992126, 64.5841106253433], [33.2309501464933, 64.576986243362], [33.2463147775133, 64.5665142602088], [33.2241691082219, 64.5626087255081], [33.202624290423, 64.5573298159678], [33.2211648507599, 64.54393941128] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 507,
+         "id" : 22607,
+         "pfafstette" : 2953,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 15484,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_15484",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 508,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [31.0910604742721, 64.8790428721846], [31.0944080754441, 64.8564680232558], [31.100588262223, 64.8394725096136], [31.1125194561436, 64.8477985945798], [31.11878547885, 64.8707167872185], [31.1366393517671, 64.8819612937191], [31.1628193096503, 64.8730343572606], [31.1892567753159, 64.8769398919612], [31.1815315418422, 64.8894290194104], [31.1604159036807, 64.9046219785754], [31.1218755722395, 64.9093858725508], [31.0835069126534, 64.893334554111], [31.0910604742721, 64.8790428721846] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 508,
+         "id" : 22397,
+         "pfafstette" : 78173,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 15496,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_15496",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 509,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.6677691814686, 64.4737685405603], [33.6762669382897, 64.4619231825673], [33.6976400842337, 64.4606785616187], [33.7196999175975, 64.4693479902948], [33.731974455228, 64.4731676890679], [33.75, 64.4685325489837], [33.7562660227065, 64.4669445843252], [33.7812442776048, 64.4764294543124], [33.7759224501007, 64.4892619254715], [33.75, 64.5018368888482], [33.7464807269731, 64.5035536073979], [33.7033910913752, 64.5174590276506], [33.6738635323201, 64.5242829838857], [33.653348745651, 64.5261284563267], [33.638155786486, 64.5151414576085], [33.6265679362754, 64.5109784151254], [33.6094007507783, 64.501708134957], [33.6186710309467, 64.4872018632119], [33.6388424739059, 64.491021561985], [33.6551513001282, 64.4907211362388], [33.6677691814686, 64.4737685405603] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 509,
+         "id" : 22608,
+         "pfafstette" : 2655,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 15509,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_15509",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 510,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [38.6465104834279, 62.8730572468412], [38.6774114173228, 62.8694950558506], [38.7109732649698, 62.8789799258377], [38.7243636696576, 62.8888081395349], [38.7353506683757, 62.8965333730086], [38.748998580846, 62.9045590322285], [38.7617022981139, 62.909322926204], [38.7558654550448, 62.9194515656473], [38.7568096502472, 62.9414255630837], [38.7538053927852, 62.9625412012452], [38.7362090276506, 62.9718114814137], [38.7344064731734, 62.98610316334], [38.7175826313862, 62.9982489470793], [38.6889992675334, 62.9917254165903], [38.6696861838491, 62.9759745238967], [38.6664244186046, 62.9643437557224], [38.6835916041018, 62.9569189479949], [38.6899434627358, 62.9417259888299], [38.676553058048, 62.9289793535982], [38.6548365683941, 62.9024560520051], [38.6465104834279, 62.8730572468412] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 510,
+         "id" : 27309,
+         "pfafstette" : 69971,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 15601,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_15601",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 511,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.0046866416407, 63.828625709577], [33.0349008881157, 63.8160936641641], [33.0498363394983, 63.8208575581395], [33.0614241897089, 63.8319303927852], [33.0864024446072, 63.8257072880425], [33.1098356528109, 63.8306857718366], [33.1021962552646, 63.8381534975279], [33.0843423823476, 63.8488400704999], [33.048377128731, 63.8601274949643], [33.0171328511262, 63.8720157709211], [33.0376476377953, 63.8806422816334], [33.0617675334188, 63.8928309833364], [33.0325833180736, 63.9058780443142], [32.9874336202161, 63.8969940258194], [32.9737857077458, 63.8809427073796], [32.9841718549716, 63.8711144936825], [33.0010815326863, 63.8592691356894], [33.0224546786303, 63.8488829884636], [33.0400510437649, 63.8437757507782], [33.0143861014466, 63.8429173915034], [32.97876419154, 63.8520589177806], [32.966575489837, 63.8503421992309], [32.9746440670207, 63.8405139855338], [32.9853735579564, 63.8339904550449], [33.0046866416407, 63.828625709577] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 511,
+         "id" : 27882,
+         "pfafstette" : 24911,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 15746,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_15746",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 512,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.943645852408, 63.7682401345907], [33.9269078465482, 63.7638195843252], [33.9569504211683, 63.7507296053836], [33.9949757370445, 63.7482832814503], [34.0175505859733, 63.7518883904047], [34.0354044588903, 63.7563518586339], [34.0264775224318, 63.76502128731], [34.015919703351, 63.7715448177989], [33.9897397454679, 63.7888407571873], [33.9643323109321, 63.8069092199231], [33.9453625709577, 63.8137331761582], [33.9130024262955, 63.8199991988647], [33.8999553653177, 63.8196987731185], [33.9289679088079, 63.7998277559055], [33.9596113349203, 63.7766091375206], [33.943645852408, 63.7682401345907] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 512,
+         "id" : 27503,
+         "pfafstette" : 2253,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 15834,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_15834",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 513,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [31.8451290972349, 64.0878931285479], [31.8276185680278, 64.0982792757737], [31.7991210401026, 64.1166910822194], [31.7756878318989, 64.1309827641458], [31.7497653817982, 64.1419697628639], [31.7277055484344, 64.138450489837], [31.7321690166636, 64.1193949139352], [31.7485636788134, 64.1032577595678], [31.7773187145212, 64.0893523393151], [31.8022969694195, 64.085532640542], [31.8240134590734, 64.084373855521], [31.8451290972349, 64.0878931285479] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 513,
+         "id" : 27520,
+         "pfafstette" : 6659,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 15866,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_15866",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 514,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [29.8134785295733, 64.4663008148691], [29.8328774491851, 64.4482323521333], [29.8356241988647, 64.4324385414759], [29.8461820179454, 64.4175889260209], [29.8629200238052, 64.4271167139718], [29.8831773026918, 64.448790285662], [29.9086705731551, 64.4627815418422], [29.903348745651, 64.4776740752609], [29.8834348104743, 64.4740689663065], [29.8643792345724, 64.4690046465849], [29.8469545412928, 64.4779745010071], [29.8260964109138, 64.491021561985], [29.8047232649698, 64.4853563907709], [29.8134785295733, 64.4663008148691] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 514,
+         "id" : 27005,
+         "name" : "nttijrvi",
+         "pfafstette" : 49593,
+         "lke_type" : "N",
+         "altitude" : 183,
+         "objectid" : 16029,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 515,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.1478724134774, 64.1556605932979], [32.1638378959898, 64.1470340825856], [32.1876144479033, 64.1322273850943], [32.2378284654825, 64.1181502929866], [32.2503605108955, 64.132441974913], [32.2199745925655, 64.1535576130745], [32.2046099615455, 64.162484549533], [32.1936229628273, 64.1693085057682], [32.1849535341513, 64.1800809146676], [32.1679580205091, 64.1951880379051], [32.1424647500458, 64.1984927211133], [32.1383446255265, 64.1877632301776], [32.137915445889, 64.1690939159495], [32.1478724134774, 64.1556605932979] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 515,
+         "id" : 26851,
+         "pfafstette" : 6621,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 16202,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_16202",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 516,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [35.721822926204, 63.6237782686321], [35.7346124793994, 63.6166538866508], [35.7663717725691, 63.6160530351584], [35.8019936824757, 63.6389283098333], [35.8019936824757, 63.6618035845083], [35.7797621772569, 63.6681125251785], [35.7495479307819, 63.65918558872], [35.7316082219374, 63.6540783510346], [35.7033682017945, 63.6621040102545], [35.6874885552097, 63.6513745193188], [35.7021664988097, 63.6321043535982], [35.721822926204, 63.6237782686321] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 516,
+         "id" : 26572,
+         "pfafstette" : 95,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 16296,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_16296",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 517,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [35.8225084691448, 63.4674281267167], [35.827658624794, 63.4727070362571], [35.82165010987, 63.4857970151987], [35.839503982787, 63.4875566517121], [35.8661989562351, 63.4790159769273], [35.8806193920527, 63.4786297152536], [35.8722074711591, 63.4872991439297], [35.8734091741439, 63.5235648232924], [35.8740100256363, 63.5613326313862], [35.8579587071965, 63.5556674601721], [35.8369289049625, 63.5446804614539], [35.7973585423915, 63.5467405237136], [35.7473161966673, 63.535152673503], [35.7514363211866, 63.5161400155649], [35.7922083867423, 63.5063547198315], [35.7952126442043, 63.4923634636513], [35.8015645028383, 63.4816768906793], [35.8115214704267, 63.4751104422267], [35.8225084691448, 63.4674281267167] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 517,
+         "id" : 27141,
+         "pfafstette" : 9955,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 16380,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_16380",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 518,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.4749816883355, 63.8934318348288], [33.4799601721297, 63.8770800906427], [33.502105841421, 63.8711574116462], [33.520303058048, 63.8767796648965], [33.5112044497345, 63.8892687923457], [33.5058826222304, 63.904418833547], [33.5190155191357, 63.9094831532686], [33.526139901117, 63.8987965802966], [33.5451954770189, 63.8895263001282], [33.5677703259476, 63.8909855108954], [33.559701748764, 63.904418833547], [33.5528348745651, 63.9279378776781], [33.5677703259476, 63.9412853644021], [33.5826199414027, 63.9522723631203], [33.5742080205091, 63.9654052600256], [33.5654527559055, 63.9713279390222], [33.5481138985534, 63.9787527467497], [33.5062259659403, 63.97669268449], [33.4613337758652, 63.9727871497894], [33.4316345449551, 63.9609417917964], [33.417643288775, 63.9406845129097], [33.4179866324849, 63.9311567249588], [33.4221067570042, 63.920770577733], [33.4468275041201, 63.90858187603], [33.4749816883355, 63.8934318348288] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 518,
+         "id" : 26928,
+         "pfafstette" : 2415,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 16418,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_16418",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 519,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.2656278611976, 63.5955382484893], [33.2906919520235, 63.5806886330342], [33.3181594488189, 63.5788431605933], [33.3433093755722, 63.5836070545688], [33.3709485442227, 63.5744655282915], [33.4012486266252, 63.5720192043582], [33.4255401941037, 63.5883709485442], [33.4095747115913, 63.6039072514191], [33.3827939022157, 63.6166538866508], [33.332494048709, 63.6306022248672], [33.284425929317, 63.6436922038088], [33.2665720563999, 63.654679202527], [33.2519799487274, 63.6511170115363], [33.2275167093939, 63.6513745193188], [33.1906930965025, 63.6654086934627], [33.178246887017, 63.6826187969236], [33.169405786486, 63.6936057956418], [33.1614230452298, 63.7058374153085], [33.1452858908625, 63.7224895852408], [33.1098356528109, 63.7445065006409], [33.0834840230727, 63.7644204358176], [33.0744712506867, 63.776866645303], [33.0678618842703, 63.7911583272294], [33.0412527467497, 63.7973814319721], [33.0067467039004, 63.8048062396997], [32.9808242537997, 63.8066517121406], [32.9808242537997, 63.7899995422084], [32.9882919794909, 63.7730040285662], [32.9945580021974, 63.7649783693463], [33.0048583134957, 63.7539913706281], [33.015158624794, 63.7430043719099], [33.020995467863, 63.7310731779894], [33.0336991851309, 63.7203436870536], [33.063741759751, 63.7084983290606], [33.0878616553745, 63.6963096273576], [33.0908659128365, 63.680558734664], [33.0935268265885, 63.6540783510346], [33.1140416132577, 63.6401300128182], [33.1223676982238, 63.6281988188976], [33.1294920802051, 63.6175551638894], [33.142367469328, 63.6228769913935], [33.1566162332906, 63.6231774171397], [33.1872596594031, 63.6145509064274], [33.2225382255997, 63.6055810520051], [33.2502632301776, 63.6003021424647], [33.2656278611976, 63.5955382484893] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 519,
+         "id" : 28534,
+         "pfafstette" : 24931,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 16686,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_16686",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 520,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [30.9864264786669, 64.0468635552097], [30.9456544131112, 64.0581080617103], [30.9213628456327, 64.0614127449185], [30.8926078099249, 64.0628719556858], [30.8744105932979, 64.0730005951291], [30.8574150796557, 64.0848888710859], [30.8342393792346, 64.1042448727339], [30.8062568668742, 64.1140301684673], [30.7920081029116, 64.1021848104743], [30.8149262955503, 64.0899531908075], [30.8369002929866, 64.0777644891046], [30.8532949551364, 64.0682367011536], [30.8930369895624, 64.058494323384], [30.9138092840139, 64.043301364219], [30.8859984435085, 64.0391383217359], [30.8702904687786, 64.0323143655008], [30.9065132301776, 64.0233874290423], [30.9657400201428, 64.0195248123054], [31.0085721479583, 64.0150184261124], [31.0183574436916, 64.0067352591101], [30.9997310474272, 63.999567959165], [30.988744048709, 63.9835166407251], [31.0233359274858, 63.9597400888116], [31.0563827595679, 63.9484526643472], [31.0788717725691, 63.9472509613624], [31.0976698406885, 63.9588817295367], [31.0864253341879, 63.9692249587987], [31.082734389306, 63.9802119575169], [31.110116050174, 63.9905981047427], [31.1393861014466, 64.0064348333638], [31.1262532045413, 64.0216277925288], [31.0932922083867, 64.0260054248306], [31.0572411188427, 64.0311555804798], [31.0286577549899, 64.0275504715254], [31.0192158029665, 64.0319710217909], [30.9864264786669, 64.0468635552097] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 520,
+         "id" : 28577,
+         "name" : "Rovkulskoe",
+         "lge_id" : "ru",
+         "pfafstette" : 99757,
+         "lke_type" : "N",
+         "altitude" : 183,
+         "objectid" : 16770,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 521,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [35.2241462186413, 63.7426610281999], [35.2371932796191, 63.7308585881707], [35.2553904962461, 63.7245496475004], [35.264918284197, 63.73497871269], [35.2846605475188, 63.7385409036806], [35.3066345449551, 63.7445065006409], [35.3019994048709, 63.7572102179088], [35.2976217725691, 63.7664804980773], [35.3546168284197, 63.7715018998352], [35.4092943142282, 63.7634762406153], [35.4316116553745, 63.7521888161509], [35.4548731917231, 63.7385409036806], [35.4849157663431, 63.7296139672221], [35.5153875206006, 63.7331761582128], [35.5393357443692, 63.7356224821461], [35.56422816334, 63.7504291796374], [35.5578763047061, 63.7691843297931], [35.5445717359458, 63.7748065830434], [35.5298079564182, 63.7917591787218], [35.4914392968321, 63.8069092199231], [35.4604525270097, 63.8146344533968], [35.4206246566563, 63.8224026048343], [35.3747882713789, 63.8205571323933], [35.343543993774, 63.8188404138436], [35.3078362479399, 63.8214584096319], [35.2785661966673, 63.8167374336202], [35.262257370445, 63.80274617744], [35.2383091466764, 63.7947634361838], [35.2165926570225, 63.7911583272294], [35.2032880882622, 63.7851498123054], [35.1886959805896, 63.7691843297931], [35.204489791247, 63.7507296053836], [35.2241462186413, 63.7426610281999] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 521,
+         "id" : 25811,
+         "name" : "Piilojarvi and Karasjarvi",
+         "pfafstette" : 595,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 17389,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 522,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [31.1889992675334, 64.3961728621132], [31.2104582494049, 64.3899497573705], [31.2297713330892, 64.388190120857], [31.264191540011, 64.3848854376488], [31.3010151529024, 64.3845850119026], [31.3260792437283, 64.3857437969236], [31.3468515381798, 64.3971170573155], [31.3315727430874, 64.412224180553], [31.3149205731551, 64.4020955411097], [31.2910581853141, 64.3938123741073], [31.243161737777, 64.3979754165904], [31.2145783739242, 64.401880951291], [31.1428195385461, 64.4217519685039], [31.0727774217176, 64.43810371269], [31.0447949093573, 64.4428676066654], [31.0124347646951, 64.4420092473906], [31.0245376304706, 64.4283613349203], [31.0593011811024, 64.4169880745285], [31.0916613257645, 64.4149280122688], [31.1119186046512, 64.4116233290606], [31.152347326497, 64.4039410135506], [31.1889992675334, 64.3961728621132] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 522,
+         "id" : 26168,
+         "pfafstette" : 62555,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 17616,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_17616",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 523,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [37.1260128639443, 62.8263625022889], [37.1500469236404, 62.8290663340047], [37.1723642647867, 62.8465768632119], [37.1902181377037, 62.8649886696576], [37.1726217725691, 62.8912544634682], [37.1200901849478, 62.9146876716718], [37.0814640175792, 62.9137434764695], [37.0624084416773, 62.9027564777513], [37.0661852224867, 62.8900098425197], [37.0969144845266, 62.8792803515839], [37.1263562076543, 62.8688942043582], [37.1254978483794, 62.8459330937557], [37.1260128639443, 62.8263625022889] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 523,
+         "id" : 30158,
+         "pfafstette" : 9767,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 17871,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_17871",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 524,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [35.2038889397546, 63.2045985167552], [35.1698979124702, 63.1968303653177], [35.1342760025636, 63.1846416636147], [35.1195980589636, 63.1715087667094], [35.1328167917964, 63.152539026735], [35.1510140084234, 63.1433116645303], [35.1623443508515, 63.1379469190624], [35.1765072788866, 63.141852453763], [35.1958203625709, 63.1433116645303], [35.2229445156565, 63.1578608542391], [35.2326439754624, 63.1864013001282], [35.2216569767442, 63.1979891503387], [35.2038889397546, 63.2045985167552] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 524,
+         "id" : 30598,
+         "pfafstette" : 6833,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 17878,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_17878",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 525,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [34.3132553561619, 63.3865277650613], [34.3244998626625, 63.3776437465666], [34.3503364768357, 63.3853689800403], [34.3735121772569, 63.3909912332906], [34.3857867148874, 63.3927079518403], [34.4104216260758, 63.3837810153818], [34.4347131935543, 63.3867852728438], [34.4465585515473, 63.3906478895806], [34.457631386193, 63.3948538500275], [34.4706784471708, 63.4013773805164], [34.4856138985534, 63.4121068714521], [34.4861289141183, 63.4272569126533], [34.4438976377953, 63.4367847006043], [34.4046706189343, 63.4350250640908], [34.373168833547, 63.4210338079106], [34.336946072148, 63.4079867469328], [34.3220106207654, 63.4032228529573], [34.3132553561619, 63.3865277650613] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 525,
+         "id" : 29686,
+         "pfafstette" : 625,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 18007,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_18007",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 526,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [34.5266434718916, 63.3821072147958], [34.5111071690167, 63.3618070179454], [34.5191757462003, 63.3427943600073], [34.5489608130379, 63.340176364219], [34.5750549349936, 63.3454552737594], [34.6012348928768, 63.3475582539828], [34.6335950375389, 63.3383738097418], [34.6589166361472, 63.332665720564], [34.6738520875297, 63.3436956372459], [34.693336843069, 63.3514637886834], [34.7157400201428, 63.3558843389489], [34.7144524812305, 63.3689743178905], [34.6643242995788, 63.3788025315876], [34.6166853598242, 63.3769570591467], [34.6032949551364, 63.3775579106391], [34.5668146859549, 63.3850256363303], [34.5266434718916, 63.3821072147958] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 526,
+         "id" : 29911,
+         "pfafstette" : 643,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 18012,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_18012",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 527,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.2196198040652, 63.518800929317], [33.196444103644, 63.5175992263322], [33.1753284654825, 63.5137366095953], [33.1479468046145, 63.5194017808094], [33.1342988921443, 63.5158825077824], [33.1098356528109, 63.5125778245742], [33.0866599523897, 63.5232643975462], [33.0698361106025, 63.5283287172679], [33.0477762772386, 63.5342943142282], [33.0207379600806, 63.5432212506867], [33.0160169840689, 63.5604313541476], [33.0346433803333, 63.5892293078191], [33.0278623420619, 63.6070831807361], [33.0112101721297, 63.6041218412379], [32.9912104010255, 63.5928344167735], [32.9611678264054, 63.5886713742904], [32.9419405786486, 63.5806886330342], [32.9246017212965, 63.5595729948727], [32.8735293444424, 63.5509035661967], [32.8373065830434, 63.5589721433803], [32.8257187328328, 63.5643368888482], [32.8095815784655, 63.5548091008973], [32.7888092840139, 63.5446804614539], [32.7668352865776, 63.5399165674785], [32.7807407068303, 63.5283287172679], [32.7977362204725, 63.5140370353415], [32.7888092840139, 63.5060542940853], [32.7771355978759, 63.4982861426478], [32.7828866050174, 63.4854965894525], [32.8069206647134, 63.4887583546969], [32.8408258560703, 63.4976852911555], [32.8894948269548, 63.4949814594397], [32.9276059787585, 63.4765696529939], [32.942884773851, 63.4560548663248], [32.9710389580663, 63.4477716993225], [33.0090642739425, 63.429316974913], [33.036360098883, 63.4109051684673], [33.0498363394983, 63.4144244414942], [33.0712953213697, 63.4183299761948], [33.100136193005, 63.4103043169749], [33.1158441677349, 63.4162699139352], [33.1203934718916, 63.4346817203809], [33.1348139077092, 63.4548960813038], [33.1401357352133, 63.4742520829518], [33.132839681377, 63.4912046786303], [33.1455433986449, 63.5001316150888], [33.1514660776415, 63.4881575032045], [33.1560153817982, 63.4718057590185], [33.1854571049258, 63.4647242950009], [33.217988921443, 63.4679431422816], [33.232666865043, 63.4792734847098], [33.2454564182384, 63.4846382301776], [33.2564434169566, 63.4885437648782], [33.2488040194104, 63.5048955090643], [33.2196198040652, 63.518800929317] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 527,
+         "id" : 30215,
+         "name" : "Maslozero",
+         "lge_id" : "ru",
+         "pfafstette" : 42373,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 18090,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 528,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.7849466672771, 63.3309490020143], [32.8125, 63.3220220655557], [32.8318989196118, 63.3157560428493], [32.8433150979674, 63.323481276323], [32.8342164896539, 63.3321077870353], [32.8149892418971, 63.3421505905512], [32.7983370719649, 63.3541247024354], [32.7905260025636, 63.3639099981688], [32.8101824299579, 63.3751974226332], [32.848894433254, 63.3668713376671], [32.8657182750412, 63.3484595312214], [32.8714692821828, 63.3357128959897], [32.9021127082952, 63.3240821278154], [32.9387646493316, 63.332665720564], [32.9579918970885, 63.3665709119209], [32.9458031953855, 63.3945534242812], [32.9226274949643, 63.3948538500275], [32.8990226149057, 63.3879869758286], [32.8708684306904, 63.3924504440579], [32.8604822834646, 63.4061412744918], [32.8532720655558, 63.4165274217176], [32.8462335195019, 63.4269564869071], [32.8410833638528, 63.4421494460721], [32.818851858634, 63.4489734023073], [32.7795390038455, 63.4620633812488], [32.7429728987365, 63.4691877632302], [32.724861518037, 63.4469133400476], [32.7397969694195, 63.4287161234206], [32.7629726698407, 63.4180295504486], [32.7412561801868, 63.4109051684673], [32.7143895348837, 63.4079867469328], [32.7236598150522, 63.3993173182567], [32.7300116736861, 63.3873861243362], [32.73705021974, 63.3740386376121], [32.7453763047061, 63.3645108496612], [32.7519856711225, 63.3555839132027], [32.7658910913752, 63.3424939342611], [32.7849466672771, 63.3309490020143] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 528,
+         "id" : 31737,
+         "pfafstette" : 47173,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 18443,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_18443",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 529,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [34.6616633858268, 63.0356304934993], [34.684495742538, 63.025501854056], [34.7068130836843, 63.0207379600806], [34.7317055026552, 63.0190641594946], [34.748100164805, 63.0219825810291], [34.7683574436916, 63.0329695797473], [34.7953957608497, 63.0371326222304], [34.8159105475188, 63.0302657480315], [34.8312751785387, 63.0323687282549], [34.8312751785387, 63.0445574299579], [34.8010609320637, 63.0499221754257], [34.7795161142648, 63.0559306903497], [34.7490443600073, 63.0633554980773], [34.7091306537264, 63.0722824345358], [34.6923926478667, 63.0776471800037], [34.6695602911555, 63.06957860282], [34.6513630745285, 63.0508663706281], [34.6616633858268, 63.0356304934993] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 529,
+         "id" : 32334,
+         "pfafstette" : 48875,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 18714,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_18714",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 530,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [60.0051501556492, 55.8251979948727], [60.0129612250504, 55.7967004669474], [60.0381111518037, 55.7755848287859], [60.0827458340963, 55.7684604468046], [60.1246337667094, 55.7818508514924], [60.1113291979491, 55.791936572972], [60.0746772569127, 55.7851126167369], [60.0554500091559, 55.7972584004761], [60.0349352224867, 55.8127517853873], [60.0236048800586, 55.8222795733382], [60.0167380058597, 55.8329661463102], [60.0051501556492, 55.8251979948727] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 530,
+         "id" : 29359,
+         "pfafstette" : 248919,
+         "altitude" : 370,
+         "objectid" : 18795,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_18795",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 531,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [38.9096834370994, 62.6551627449185], [38.9399835195019, 62.6563215299396], [38.9495113074528, 62.6601412287127], [38.9684810474272, 62.680956441128], [38.9589532594763, 62.7065355475188], [38.9287390130013, 62.7062351217726], [38.9111426478667, 62.6911279985351], [38.8674521607764, 62.6852053195385], [38.8310577275224, 62.6949476973082], [38.8082253708112, 62.7011708020509], [38.7708009064274, 62.6931880607947], [38.7353506683757, 62.6806560153818], [38.7121749679546, 62.6715144891045], [38.7365523713605, 62.6625446346823], [38.7593847280718, 62.6399697857535], [38.7659082585607, 62.6179957883171], [38.7914873649515, 62.6251201702985], [38.8221307910639, 62.6288969511078], [38.8611003021425, 62.6194549990844], [38.8876236037356, 62.6262789553195], [38.900413156931, 62.6357638253067], [38.9138035616187, 62.6414289965208], [38.900413156931, 62.6491971479582], [38.881872596594, 62.6541756317524], [38.9096834370994, 62.6551627449185] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 531,
+         "id" : 28869,
+         "pfafstette" : 69633,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 19232,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_19232",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 532,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.265124290423, 63.2310359824208], [32.2480429408533, 63.2262720884453], [32.2124210309467, 63.2277742171763], [32.186498580846, 63.2227098974547], [32.189674510163, 63.20545687603], [32.195339681377, 63.1834828785937], [32.1986014466215, 63.1646848104743], [32.2034082585607, 63.1530969602637], [32.2087300860648, 63.1427108130379], [32.2251247482146, 63.1409511765244], [32.2378284654825, 63.1545990889947], [32.261948361106, 63.1626247482146], [32.2792872184582, 63.172410043948], [32.2851240615272, 63.2092765748031], [32.2798022340231, 63.2348556811939], [32.265124290423, 63.2310359824208] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 532,
+         "id" : 33818,
+         "pfafstette" : 49219,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 19423,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_19423",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 533,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.6831338124886, 62.8929711820179], [33.7094854422267, 62.8997951382531], [33.7303435726058, 62.9084645669291], [33.7421889305988, 62.9197519913935], [33.6804728987365, 62.9465328007691], [33.622791155466, 62.9556743270463], [33.6388424739059, 62.9473911600439], [33.6539495971434, 62.937863372093], [33.6415033876579, 62.9289793535982], [33.6287138344626, 62.9223699871818], [33.6391858176158, 62.9158893746566], [33.656009659403, 62.9045590322285], [33.6831338124886, 62.8929711820179] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 533,
+         "id" : 34319,
+         "pfafstette" : 0,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 19433,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_19433",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 534,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.8430461453946, 62.869752563633], [33.8578957608497, 62.8587655649148], [33.8817581486907, 62.862070248123], [33.8760929774766, 62.871598036074], [33.8693119392053, 62.8822846090459], [33.8808997894158, 62.883443394067], [33.9067364035891, 62.8765765198681], [33.9297404321553, 62.8817266755173], [33.9144616370628, 62.8953745879875], [33.898410318623, 62.913829312397], [33.8784105475188, 62.9313398416041], [33.8469087621315, 62.9372625206006], [33.8353209119209, 62.92567467039], [33.8225313587255, 62.9143872459256], [33.8103426570225, 62.9057607352133], [33.7970380882622, 62.8959325215162], [33.7905145577733, 62.8885506317524], [33.8083684306903, 62.8846450970518], [33.834462552646, 62.8819841832997], [33.8430461453946, 62.869752563633] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 534,
+         "id" : 34216,
+         "pfafstette" : 44833,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 19629,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_19629",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 535,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.4885552096686, 63.1688907709211], [32.5096708478301, 63.1623672404321], [32.5239196117927, 63.1563587255081], [32.537567524263, 63.1671311344076], [32.5620307635964, 63.1751138756638], [32.5869231825673, 63.1894055575902], [32.6076954770189, 63.2051993682476], [32.6303561618751, 63.2135254532137], [32.6264935451383, 63.2321947674418], [32.604176203992, 63.2413792116828], [32.5881248855521, 63.2307355566746], [32.567610098883, 63.2209502609412], [32.5461511170115, 63.2110791292803], [32.5212586980407, 63.196787447354], [32.4912161234206, 63.1882467725691], [32.4765381798206, 63.1763155786486], [32.4885552096686, 63.1688907709211] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 535,
+         "id" : 33441,
+         "pfafstette" : 47733,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 20033,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_20033",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 536,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.7699139351767, 62.9807384178722], [33.7746349111884, 62.980094648416], [33.8022740798389, 62.9780345861564], [33.8323166544589, 62.9824980543856], [33.8433036531771, 62.9869615226149], [33.8621017212965, 63.0115964338033], [33.8489688243911, 63.0422398599158], [33.822273850943, 63.0356304934993], [33.8020165720564, 63.0255876899835], [33.7791842153452, 63.0211242217542], [33.7690555759018, 62.9988068806079], [33.7699139351767, 62.9807384178722] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 536,
+         "id" : 33460,
+         "pfafstette" : 4471,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 20069,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_20069",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 537,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [31.7258171580297, 63.1851995971434], [31.7428985075994, 63.1920235533785], [31.7580914667643, 63.2063152353049], [31.7756878318989, 63.2158430232558], [31.7636708020509, 63.2224094717085], [31.7446152261491, 63.2164438747482], [31.7116542299945, 63.2113795550265], [31.663500274675, 63.2241261902582], [31.6303676066655, 63.2346410913752], [31.6386936916316, 63.2120233244827], [31.6806674601721, 63.1870021516206], [31.7051306995056, 63.1864013001282], [31.7258171580297, 63.1851995971434] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 537,
+         "id" : 34577,
+         "pfafstette" : 49933,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 20223,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_20223",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 538,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [34.4882748123054, 62.6825014878227], [34.4995193188061, 62.6709136376122], [34.5105063175243, 62.6711282274309], [34.4956567020692, 62.6943468458158], [34.4697342519685, 62.7134024217176], [34.4620090184948, 62.7252906976744], [34.4819229536715, 62.7264494826955], [34.4948841787218, 62.7146041247024], [34.5061286852225, 62.709496887017], [34.5206349569676, 62.7142607809925], [34.512223036074, 62.7228872917048], [34.5034677714704, 62.7330588491119], [34.4858714063358, 62.7431874885552], [34.4626957059147, 62.7407411646219], [34.442781770738, 62.736878547885], [34.4184902032595, 62.7220718503937], [34.421408624794, 62.7032737822743], [34.4443268174327, 62.7041750595129], [34.4526529023988, 62.6979519547702], [34.4700775956784, 62.6878662332906], [34.4882748123054, 62.6825014878227] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 538,
+         "id" : 34973,
+         "pfafstette" : 487233,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 20242,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_20242",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 539,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [39.8758526368797, 61.6615260483428], [39.907011078557, 61.6448309604468], [39.9409162699139, 61.6448309604468], [39.940401254349, 61.6698092153452], [39.9206589910273, 61.6936286852225], [39.9119037264237, 61.7055169611793], [39.8793719099066, 61.7078774491851], [39.8523335927486, 61.6977488097418], [39.8512177256913, 61.6790794955136], [39.8758526368797, 61.6615260483428] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 539,
+         "id" : 34978,
+         "pfafstette" : 94911,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 20303,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_20303",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 540,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.4779973905878, 63.00146779436], [32.4894135689434, 63.0000085835927], [32.5030614814137, 63.0149011170115], [32.5276963926021, 63.0288065372642], [32.5542196941952, 63.0556302646035], [32.5510437648782, 63.0847286440212], [32.5417734847098, 63.0957585607032], [32.5334473997437, 63.1049859229079], [32.5187694561436, 63.0903938152353], [32.4943920527376, 63.0766600668376], [32.4726755630837, 63.0716815830434], [32.4807441402674, 63.0618533693463], [32.4822033510346, 63.0306520097052], [32.4779973905878, 63.00146779436] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 540,
+         "id" : 34611,
+         "pfafstette" : 47793,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 20308,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_20308",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 541,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.1191917689068, 62.8248174555942], [33.108633949826, 62.8183797610328], [33.1247711041934, 62.7990237593847], [33.1489768357444, 62.7937019318806], [33.1809078007691, 62.8076073521333], [33.2131821095038, 62.8216415262772], [33.2080319538546, 62.8311693142282], [33.2063152353049, 62.8638298846365], [33.2245982878594, 62.8902673503021], [33.2385037081121, 62.898636353232], [33.230005951291, 62.9164473081853], [33.1895772294452, 62.9337432475737], [33.1580754440579, 62.9530134132943], [33.1403074070683, 62.9569189479949], [33.1191917689068, 62.9307389901117], [33.1235694012086, 62.9075203717268], [33.1318096502472, 62.8921128227431], [33.1355005951291, 62.8772202893243], [33.1426249771104, 62.8665337163523], [33.1348997436367, 62.8403537584691], [33.1191917689068, 62.8248174555942] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 541,
+         "id" : 34984,
+         "pfafstette" : 499615,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 20321,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_20321",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 542,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [34.1861323475554, 62.6819006363303], [34.1903383080022, 62.6931880607947], [34.212913156931, 62.7073939067936], [34.2352304980773, 62.7115998672404], [34.2319687328328, 62.7202263779527], [34.2253593664164, 62.7348184856253], [34.2036428767625, 62.7529298663248], [34.1790079655741, 62.7508698040652], [34.1547163980956, 62.7404836568394], [34.1284506042849, 62.7255911234206], [34.1447594305072, 62.7077801684673], [34.1758320362571, 62.694647271562], [34.1861323475554, 62.6819006363303] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 542,
+         "id" : 35253,
+         "pfafstette" : 4929251,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 20393,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_20393",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 543,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.9626270371727, 62.8709971845816], [32.9831418238418, 62.8795807773301], [33.0019398919612, 62.9003959897455], [33.0033991027285, 62.9155460309467], [32.997304751877, 62.9366616691082], [32.9924121040103, 62.9539146905329], [32.9651162790698, 62.9628416269914], [32.9360178996521, 62.9723694149423], [32.9162756363304, 62.9934850531038], [32.888464795825, 63.0109955823109], [32.8683791887933, 63.0082917505951], [32.8561904870903, 63.0020686458524], [32.8440017853873, 62.9869615226149], [32.8379074345358, 62.9660604742721], [32.8420275590551, 62.9488503708112], [32.8625423457242, 62.9352024583409], [32.8696667277056, 62.9244300494415], [32.882112937191, 62.9140868201794], [32.9011685130928, 62.9015976927302], [32.8847738509431, 62.8873489287676], [32.8532720655558, 62.8843446713056], [32.8364482237685, 62.8632290331441], [32.8497527925289, 62.8406541842153], [32.894301638894, 62.8218990340597], [32.9279493224684, 62.8144742263322], [32.9529275773668, 62.8224998855521], [32.9746440670207, 62.82752128731], [32.9657171305622, 62.839709989013], [32.9567901941037, 62.8506969877312], [32.9484641091375, 62.8602247756821], [32.9431422816334, 62.8703534151254], [32.9626270371727, 62.8709971845816] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 543,
+         "id" : 34917,
+         "name" : "Yangozero",
+         "pfafstette" : 4675,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 20492,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 544,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [29.7626636605017, 63.4019782320088], [29.7356253433437, 63.4197891869621], [29.7073853232009, 63.4498317615821], [29.6694458432522, 63.4691019273027], [29.642922541659, 63.4673422907892], [29.6625789690533, 63.456355292071], [29.6877288958066, 63.4412481688335], [29.6860121772569, 63.4278577641458], [29.6836087712873, 63.4135660822194], [29.7053252609412, 63.3984589589819], [29.7321919062443, 63.3847681285479], [29.7561401300128, 63.3740386376121], [29.7736506592199, 63.3844247848379], [29.7626636605017, 63.4019782320088] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 544,
+         "id" : 34933,
+         "name" : "Viekinjrvi",
+         "pfafstette" : 9221311,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 20547,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 545,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.0932693188061, 63.257215940304], [33.0700936183849, 63.2479456601355], [33.0489779802234, 63.2441259613624], [33.0266606390771, 63.239018723677], [33.0432269730819, 63.2245124519319], [33.0593641274492, 63.20545687603], [33.0649434627358, 63.1893197216627], [33.0709519776598, 63.1706504074345], [33.0732695477019, 63.1451571369712], [33.1223676982238, 63.1302646035525], [33.1684615912837, 63.13734606757], [33.184598745651, 63.1477751327596], [33.1987616736861, 63.1718950283831], [33.2085469694195, 63.2122808322651], [33.2251991393518, 63.2286325764512], [33.2367869895624, 63.2339973219191], [33.2192764603553, 63.2485465116279], [33.2053710401026, 63.2696621497894], [33.2005642281634, 63.2860138939755], [33.1858004486358, 63.2836963239333], [33.1599638344626, 63.2791899377403], [33.1367022981139, 63.2741256180187], [33.1259728071782, 63.2702630012818], [33.11498580846, 63.2672587438198], [33.0932693188061, 63.257215940304] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 545,
+         "id" : 32554,
+         "name" : "Seletskoe ozero",
+         "lge_id" : "ru",
+         "pfafstette" : 4571,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 20612,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 546,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.5082860282, 63.1709508331807], [33.4894879600806, 63.1548995147409], [33.4905179912104, 63.1364877082952], [33.5198738784106, 63.1234406473173], [33.5400453213697, 63.1288053927852], [33.5591008972716, 63.1329255173045], [33.5808173869255, 63.1439125160227], [33.5776414576085, 63.1587621314777], [33.571547106757, 63.1667448727339], [33.5639935451383, 63.176573086431], [33.5490580937557, 63.1751138756638], [33.5302600256363, 63.17541430141], [33.5082860282, 63.1709508331807] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 546,
+         "id" : 32838,
+         "pfafstette" : 4523,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 20626,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_20626",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 547,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.5256363303424, 63.3068291063908], [32.4926753341879, 63.2984601034609], [32.5203145028383, 63.2777307269731], [32.5658075444058, 63.2791899377403], [32.5871806903498, 63.28893231551], [32.6100988829885, 63.2936962094854], [32.6010861106025, 63.313138047061], [32.5703568485625, 63.3273868110236], [32.5488120307636, 63.3163568943417], [32.5256363303424, 63.3068291063908] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 547,
+         "id" : 32877,
+         "pfafstette" : 477131,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 20648,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_20648",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 548,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [35.3825993407801, 62.7933585881706], [35.3965047610328, 62.7933585881706], [35.4271481871452, 62.7978649743637], [35.4517830983336, 62.8076073521333], [35.4639718000366, 62.8153755035708], [35.4741004394799, 62.8243024400293], [35.4604525270097, 62.8444738829885], [35.4462037630471, 62.8606110373558], [35.4286932338399, 62.8730572468412], [35.3995090184948, 62.8876493545138], [35.3540159769273, 62.9019410364402], [35.3032011078557, 62.9022414621864], [35.2844030397363, 62.8870485030214], [35.2770211499725, 62.8632719511078], [35.2854330708661, 62.8490231871452], [35.3002826863212, 62.8391091375206], [35.3276643471891, 62.8258045687603], [35.3456898919612, 62.8130150155649], [35.362084554111, 62.8020280168467], [35.3825993407801, 62.7933585881706] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 548,
+         "id" : 32704,
+         "pfafstette" : 48475,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 20688,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_20688",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 549,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [31.1586991851309, 46.6682641686504], [31.1728621131661, 46.6516119987182], [31.1937202435452, 46.6602814273943], [31.2055656015382, 46.6870193188061], [31.2058231093206, 46.7173623191723], [31.1892567753159, 46.7328127861198], [31.1847933070866, 46.7500228895807], [31.1907159860831, 46.7777049761948], [31.1803298388574, 46.7990781221388], [31.1768105658304, 46.8184341237869], [31.1780122688152, 46.8407085469694], [31.143162882256, 46.8600645486175], [31.1135494872734, 46.8959868842703], [31.1090001831167, 46.9260294588903], [31.0974123329061, 46.9162870811207], [31.0777559055118, 46.9108794176891], [31.046511627907, 46.9400636330342], [31.0265976927303, 46.9798485854239], [31.0198166544589, 47.006371887017], [31.0132072880425, 47.0286463101996], [31.0043661875115, 47.0387749496429], [31.0005035707746, 47.0030672038088], [31.0005035707746, 46.9601921580297], [31.0005035707746, 46.92808952115], [31.0158682017946, 46.9102785661967], [31.0574986266252, 46.8969310794726], [31.0846227797107, 46.8668885048526], [31.0905454587072, 46.8481333546969], [31.1167254165904, 46.8427686092291], [31.1320900476103, 46.8303223997436], [31.1425620307636, 46.7994643838125], [31.1473688427028, 46.7741857031679], [31.1428195385461, 46.7369329106391], [31.152347326497, 46.6959462552646], [31.1586991851309, 46.6682641686504] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 549,
+         "id" : 129392,
+         "name" : "Tiligul Liman",
+         "lge_id" : "uk",
+         "pfafstette" : 1,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 20719,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 550,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [30.5149297289874, 63.6217182063724], [30.5030843709943, 63.6344648416041], [30.4870330525545, 63.6442930553012], [30.4724409448819, 63.6457522660685], [30.4885780992492, 63.6285421626076], [30.5063461362388, 63.6112891411829], [30.4968183482879, 63.6145079884636], [30.4690933437099, 63.6198727339315], [30.4399091283648, 63.624636627907], [30.4224844350852, 63.6091861609595], [30.4278920985168, 63.5830062030763], [30.4487502288958, 63.5714183528658], [30.4840287950925, 63.5506460584142], [30.52917849295, 63.5402169932247], [30.577933299762, 63.5289295687603], [30.6124393426112, 63.51528165629], [30.6405935268266, 63.506612227614], [30.6683185314045, 63.5057538683391], [30.6801638893976, 63.5191013550632], [30.683597326497, 63.535152673503], [30.6660009613624, 63.5469980314961], [30.6570740249039, 63.5580708661417], [30.6436836202161, 63.5788431605933], [30.6187053653177, 63.5892293078191], [30.5759590734298, 63.6012034197033], [30.5322685863395, 63.6133921214063], [30.5149297289874, 63.6217182063724] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 550,
+         "id" : 32673,
+         "name" : "Tuulos and Koroppi",
+         "lge_id" : "fi",
+         "pfafstette" : 0,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 20932,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 551,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [36.0563255356162, 62.0494615226149], [36.0827630012818, 62.0349123329061], [36.117784059696, 62.04860316334], [36.1308311206739, 62.0595901620582], [36.1550368522249, 62.0518649285845], [36.178212552646, 62.0548262680827], [36.1897145669291, 62.0584313770372], [36.2016457608497, 62.0634956967588], [36.1987273393151, 62.0777444607215], [36.163362937191, 62.0961991851309], [36.1101446621498, 62.0946541384362], [36.0780420252701, 62.0703196529939], [36.0634499175975, 62.0610493728255], [36.0563255356162, 62.0494615226149] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 551,
+         "id" : 37759,
+         "pfafstette" : 47457,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 21039,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_21039",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 552,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.5603026002564, 62.4443497070134], [33.5692295367149, 62.4321180873466], [33.5787573246658, 62.4249937053653], [33.592748580846, 62.4356802783373], [33.6106024537631, 62.4360236220472], [33.6320614356345, 62.4371824070683], [33.6271687877678, 62.457096342245], [33.622791155466, 62.4809158121223], [33.6275979674052, 62.4990271928218], [33.6302588811573, 62.5213016160044], [33.6287138344626, 62.5412584691448], [33.6123191723128, 62.5210011902582], [33.5936069401209, 62.5043919382897], [33.5909460263688, 62.5201428309833], [33.5849375114448, 62.5319881889764], [33.5651094121956, 62.5139197262406], [33.5591008972716, 62.4909586156382], [33.5555816242447, 62.467782915217], [33.5603026002564, 62.4443497070134] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 552,
+         "id" : 37831,
+         "pfafstette" : 4971,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 21054,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_21054",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 553,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [36.6367480772752, 61.9475313587255], [36.6455033418788, 61.9346988875664], [36.6633572147958, 61.9228535295733], [36.6883354696942, 61.9365443600073], [36.7036142647867, 61.9528961041934], [36.7202664347189, 61.9677028016847], [36.7187213880242, 61.9888184398462], [36.6887646493316, 61.9992904229994], [36.6604387932613, 61.9909643380333], [36.6457608496612, 61.98049235488], [36.6318554294085, 61.9653423136788], [36.6367480772752, 61.9475313587255] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 553,
+         "id" : 37868,
+         "pfafstette" : 462265,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 21154,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_21154",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 554,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [38.1184478575352, 61.6950878959897], [38.144026963926, 61.6861609595312], [38.1726103277788, 61.6780923823476], [38.2017087071965, 61.6867618110236], [38.2095197765977, 61.7085212186413], [38.1921809192456, 61.728091810108], [38.1757862570958, 61.7459027650613], [38.1611083134957, 61.7634132942685], [38.1364734023073, 61.7822542803516], [38.1130401941036, 61.7956017670756], [38.0910661966673, 61.7914387245926], [38.0724398004028, 61.7807521516206], [38.0529550448636, 61.7795504486358], [38.0378479216261, 61.7602802829152], [38.0399079838857, 61.7355595357993], [38.0575043490203, 61.7212678538729], [38.0821392602087, 61.7091220701337], [38.0991347738509, 61.7031135552097], [38.1184478575352, 61.6950878959897] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 554,
+         "id" : 37163,
+         "pfafstette" : 84735,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 21796,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_21796",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 555,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.7583260849661, 62.4681262589269], [33.75, 62.4610877128731], [33.7348928767625, 62.448255241714], [33.7263092840139, 62.4208306628822], [33.7348928767625, 62.4122470701337], [33.7433906335836, 62.4014746612342], [33.7491416407251, 62.393491919978], [33.75, 62.3928481505219], [33.7574677256913, 62.3872258972716], [33.7657938106574, 62.3810027925288], [33.7725748489288, 62.3702303836294], [33.8451062076543, 62.3480417963743], [33.9161783556125, 62.3316900521882], [33.922101034609, 62.323878982787], [33.9417574620033, 62.3289862204724], [33.9587529756455, 62.3346084737227], [33.9685382713789, 62.3402307269731], [33.9531736403589, 62.3492005813953], [33.9257919794909, 62.3560245376305], [33.910255676616, 62.3785993865592], [33.8960069126534, 62.39649617744], [33.8891400384545, 62.4131054294085], [33.8838182109504, 62.43422106757], [33.8505138710859, 62.4526328740157], [33.8142052737594, 62.4755939846182], [33.7907720655557, 62.4761519181468], [33.7583260849661, 62.4681262589269] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 555,
+         "line::hidden" : [
+            { "contour" : 0, "segments" : [ { "from" : 24, "to" : 25 } ] }
+         ],
+         "id" : 38166,
+         "pfafstette" : 495733,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 22138,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_22138",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 556,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [35.1634602179088, 62.4752077229445], [35.1756489196118, 62.4675254074345], [35.1955628547885, 62.4642207242263], [35.2062923457242, 62.4767098516755], [35.204833134957, 62.4951216581212], [35.1775373100165, 62.5031902353049], [35.1580525544772, 62.5147780855155], [35.1411428767625, 62.5311298297015], [35.1162504577916, 62.5225462369529], [35.1376236037356, 62.4934049395715], [35.1634602179088, 62.4752077229445] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 556,
+         "id" : 35624,
+         "pfafstette" : 4854433,
+         "altitude" : 0,
+         "objectid" : 22381,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_22381",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 557,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.6320728804248, 62.9289793535982], [32.6579953305256, 62.9155460309467], [32.6772225782824, 62.9045590322285], [32.6855486632485, 62.9152885231642], [32.6965356619667, 62.9253742446438], [32.7124153085516, 62.9369620948544], [32.7065784654825, 62.9530134132943], [32.6919005218825, 62.9625412012452], [32.6662355795642, 62.959236518037], [32.6274377403406, 62.9524125618019], [32.6094980314961, 62.9497087300861], [32.613017304523, 62.9381208798755], [32.6320728804248, 62.9289793535982] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 557,
+         "id" : 35441,
+         "pfafstette" : 48451,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 22440,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_22440",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 558,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [31.9159437374107, 63.0038712003296], [31.9256431972166, 62.9854164759202], [31.9252998535067, 62.9676055209668], [31.9370593755722, 62.9595798617469], [31.9574883263139, 62.9470907342977], [31.9753421992309, 62.9432281175609], [31.9952561344076, 62.9488503708112], [32.0107924372826, 62.9432281175609], [32.0192901941037, 62.9488503708112], [32.023238646768, 62.9661463101996], [32.0077881798206, 62.9788929454312], [31.9670161142648, 62.9910816471342], [31.9260723768541, 63.0121972852957], [31.8757725233474, 63.0392356024538], [31.8364596685589, 63.0559306903497], [31.8144856711225, 63.0487633904047], [31.7897649240066, 63.0397935359824], [31.7914816425563, 63.0490638161509], [31.7850439479949, 63.0621537950925], [31.7645291613258, 63.0612954358176], [31.7800654642007, 63.0434844808643], [31.8034986724043, 63.0276477522432], [31.8171465848746, 63.0207379600806], [31.8388630745285, 63.0246434947812], [31.878175929317, 63.0244289049624], [31.9061584416774, 63.0145148553378], [31.9159437374107, 63.0038712003296] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 558,
+         "id" : 35667,
+         "pfafstette" : 4943,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 22473,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_22473",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 559,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [34.5465574070683, 62.6034036806446], [34.5688747482146, 62.5903566196667], [34.5796042391503, 62.5846485304889], [34.5917929408533, 62.5953351034609], [34.6018357443692, 62.6006998489288], [34.6166853598242, 62.5935754669474], [34.6353975920161, 62.6096267853873], [34.6386593572606, 62.6319012085698], [34.6187454220839, 62.6390255905512], [34.5949688701703, 62.6479525270097], [34.5802909265702, 62.6431886330342], [34.5559993590917, 62.6328024858085], [34.5344545412928, 62.6221588308002], [34.5465574070683, 62.6034036806446] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 559,
+         "id" : 35492,
+         "pfafstette" : 492643,
+         "altitude" : 0,
+         "objectid" : 22537,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_22537",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 560,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.0641823841787, 62.9396230086065], [32.0500194561436, 62.9277347326497], [32.0574013459074, 62.9144301638894], [32.0646115638162, 62.9129280351584], [32.0829804522981, 62.9072199459806], [32.1008343252152, 62.8941728850027], [32.1097612616737, 62.8852459485442], [32.1325936183849, 62.88794978026], [32.1489024446072, 62.898636353232], [32.1650395989746, 62.9152885231642], [32.1572285295734, 62.9322411188427], [32.1294176890679, 62.9295802050906], [32.1091604101813, 62.9235716901666], [32.1056411371544, 62.9407817936275], [32.0996326222304, 62.9545155420253], [32.0815212415309, 62.9470907342977], [32.0641823841787, 62.9396230086065] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 560,
+         "id" : 36228,
+         "pfafstette" : 49415,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 22660,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_22660",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 561,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.095684169566, 62.3952515564915], [32.1189457059147, 62.3988137474821], [32.1430656015382, 62.4104015976927], [32.1679580205091, 62.4232340688518], [32.1543101080388, 62.4455514099982], [32.137915445889, 62.4645640679363], [32.1306193920528, 62.4752077229445], [32.1079587071965, 62.4725897271562], [32.0846971708478, 62.4689846182018], [32.0671866416407, 62.4493281908075], [32.0739676799121, 62.4246932796191], [32.0823796008057, 62.4116462186413], [32.095684169566, 62.3952515564915] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 561,
+         "id" : 42407,
+         "pfafstette" : 449913,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 22930,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_22930",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 562,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [56.8072468412379, 55.7164438747482], [56.7956589910273, 55.7206069172313], [56.8042425837759, 55.7042122550815], [56.8031267167186, 55.687259659403], [56.7902513275957, 55.6667448727339], [56.7863887108588, 55.6456292345724], [56.7612387841055, 55.6403074070683], [56.7263035616188, 55.6281187053653], [56.6782354422267, 55.6132261719465], [56.6409826496979, 55.5998786852225], [56.637463376671, 55.5760592153452], [56.6288797839224, 55.565072216627], [56.6154893792346, 55.5579907526094], [56.6149743636697, 55.5389351767076], [56.5967771470427, 55.5356304934994], [56.5705971891595, 55.5487204724409], [56.5512841054752, 55.5427977934444], [56.5432155282915, 55.5157594762864], [56.5590093389489, 55.4958026231459], [56.5634728071782, 55.4830559879143], [56.5354044588903, 55.4743865592382], [56.5049327046329, 55.4640004120125], [56.5108553836294, 55.4431851995971], [56.5266491942868, 55.4384213056217], [56.5200398278704, 55.4491078785937], [56.5156621955686, 55.4601377952756], [56.5454472624062, 55.4687643059879], [56.5784082585607, 55.4779916681926], [56.5705971891595, 55.4985493728255], [56.555661737777, 55.5219825810291], [56.564331166453, 55.5332700054935], [56.5911119758286, 55.527347326497], [56.6323132210218, 55.5246434947812], [56.6540297106757, 55.5359738372093], [56.6742869895624, 55.5469608359275], [56.7053595953122, 55.5552869208936], [56.7040720563999, 55.5701794543124], [56.673514466215, 55.581423960813], [56.6492228987365, 55.5897071278154], [56.6811538637612, 55.6037842199231], [56.7372905603369, 55.6227968778612], [56.7710240798389, 55.6349426616004], [56.7954014832448, 55.6400069813221], [56.803727568211, 55.6640839589819], [56.8208947537081, 55.6893197216627], [56.8269032686321, 55.7018517670756], [56.8072468412379, 55.7164438747482] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 562,
+         "id" : 41963,
+         "pfafstette" : 24571,
+         "altitude" : 134,
+         "objectid" : 22993,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_22993",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 563,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.389918284197, 62.3075701565647], [33.4154973905878, 62.2948235213331], [33.420647546237, 62.2831927531588], [33.438501419154, 62.2730641137154], [33.4657972440945, 62.2813901986815], [33.4689731734115, 62.3167975187694], [33.4503467771471, 62.3434924922175], [33.4345529664897, 62.3402736449368], [33.4134373283282, 62.3343509659403], [33.3879440578649, 62.3319046420069], [33.368888481963, 62.3275270097052], [33.354038866508, 62.3191580067753], [33.360219053287, 62.3113898553378], [33.389918284197, 62.3075701565647] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 563,
+         "id" : 41069,
+         "pfafstette" : 49825,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 23395,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_23395",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 564,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [31.1750938472807, 62.695806056583], [31.1467679912104, 62.7032737822743], [31.1241931422816, 62.7032737822743], [31.0997299029482, 62.71400327321], [31.0693439846182, 62.7228872917048], [31.049172541659, 62.7086385277422], [31.0614470792895, 62.6831023393151], [31.0800734755539, 62.6836602728438], [31.1013607855704, 62.6842182063724], [31.1446220930233, 62.6690681651712], [31.1687419886468, 62.6613858496612], [31.1803298388574, 62.6488538042483], [31.1962953213697, 62.6444332539828], [31.1904584783007, 62.6547764832448], [31.1910593297931, 62.6667076771653], [31.1960378135873, 62.679454312397], [31.1750938472807, 62.695806056583] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 564,
+         "id" : 40352,
+         "name" : "Karpanjrvi",
+         "pfafstette" : 837,
+         "lke_type" : "N",
+         "altitude" : 145,
+         "objectid" : 24226,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 565,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [53.1281473173411, 56.8723963101996], [53.1411085423915, 56.8572033510346], [53.1716661325764, 56.8515810977843], [53.1925242629555, 56.857804202527], [53.1738120307636, 56.8676324162241], [53.1511513459073, 56.8851429454312], [53.1247997161692, 56.9107649697858], [53.0918387200146, 56.9306789049625], [53.0800791979491, 56.9333398187145], [53.0872894158579, 56.9098636925472], [53.113812717451, 56.8860442226699], [53.1281473173411, 56.8723963101996] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 565,
+         "id" : 46587,
+         "pfafstette" : 2389111,
+         "altitude" : 94,
+         "objectid" : 24835,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_24835",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 566,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [54.5265862479399, 56.260514901117], [54.574482695477, 56.2566093664164], [54.6374862662516, 56.2607294909357], [54.6659837941769, 56.2702572788867], [54.6870135964109, 56.2801713285113], [54.7034082585607, 56.2926175379967], [54.6901036898004, 56.3000423457242], [54.6609194744552, 56.2926175379967], [54.6252975645486, 56.2893128547885], [54.5991176066654, 56.2860940075078], [54.5825512726607, 56.2780683482879], [54.5631523530489, 56.2797850668376], [54.5375732466581, 56.2741628135873], [54.5265862479399, 56.260514901117] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 566,
+         "id" : 46714,
+         "pfafstette" : 252353,
+         "altitude" : 76,
+         "objectid" : 24849,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_24849",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 567,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [31.5692524262956, 62.2929780488921], [31.5513985533785, 62.2954243728255], [31.554316974913, 62.2840511124336], [31.5650464658488, 62.2676993682476], [31.5635872550815, 62.2406610510895], [31.5791235579564, 62.2314336888848], [31.6095953122139, 62.2320774583409], [31.6233290606116, 62.2439657342977], [31.6315693096503, 62.2757679454312], [31.6423846365135, 62.3182567295367], [31.6408395898187, 62.3467971754257], [31.6095953122139, 62.3292437282549], [31.5890805255448, 62.3039650476103], [31.5876213147775, 62.2902742171763], [31.5692524262956, 62.2929780488921] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 567,
+         "id" : 46175,
+         "pfafstette" : 424773,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 24922,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_24922",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 568,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [31.7980910089727, 62.3325054934994], [31.8125114447903, 62.324222326497], [31.8428115271928, 62.3194584325215], [31.865987227614, 62.3411749221754], [31.8489917139718, 62.36645360282], [31.8088204999084, 62.3700157938106], [31.7773187145212, 62.3592433849112], [31.7653875206006, 62.3432779023988], [31.78418558872, 62.3370547976561], [31.7980910089727, 62.3325054934994] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 568,
+         "id" : 44935,
+         "pfafstette" : 449853,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 26216,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_26216",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 569,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [31.1636776689251, 62.5201428309833], [31.1511456235122, 62.5240054477202], [31.136982695477, 62.5210011902582], [31.1233347830068, 62.5064949185131], [31.1413603277788, 62.4793707654276], [31.1610167551731, 62.4624610877129], [31.1690853323567, 62.4538774949643], [31.2096857260575, 62.4455514099982], [31.2272820911921, 62.4556371314777], [31.2199002014283, 62.4809158121223], [31.1986987273393, 62.5025893838125], [31.1636776689251, 62.5201428309833] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 569,
+         "id" : 44103,
+         "name" : "Viiksinselka",
+         "pfafstette" : 8417,
+         "lke_type" : "N",
+         "altitude" : 145,
+         "objectid" : 26281,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 570,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.1883755264604, 61.7688209577001], [33.1747276139901, 61.7563747482146], [33.1770451840322, 61.734615340597], [33.2046843526827, 61.7206670023805], [33.2309501464933, 61.7242291933712], [33.2424521607764, 61.748306171031], [33.2221948818898, 61.7694218091925], [33.1883755264604, 61.7688209577001] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 570,
+         "id" : 51713,
+         "pfafstette" : 44593,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 26712,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_26712",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 571,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [31.7231562442776, 62.0500623741073], [31.6999805438564, 62.0527232878594], [31.6896802325581, 62.0429809100897], [31.6702813129464, 62.0373157388757], [31.6672770554844, 62.0233244826955], [31.7011822468412, 62.0036680553012], [31.7375766800952, 62.01087827321], [31.7460744369163, 62.0334531221388], [31.7231562442776, 62.0500623741073] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 571,
+         "id" : 50806,
+         "pfafstette" : 424593,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 26930,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_26930",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 572,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.0580765885369, 61.7525121314778], [33.0956727247757, 61.7501087255081], [33.094127678081, 61.7792500228896], [33.0608233382165, 61.8065887657938], [33.0391068485625, 61.8167174052371], [33.0085492583776, 61.8253439159495], [32.9692364035891, 61.8330262314594], [32.9270051272661, 61.8383909769273], [32.8859755539279, 61.8321678721846], [32.8711259384728, 61.8166744872734], [32.8842588353781, 61.802382805347], [32.8967050448636, 61.7913958066288], [32.9118980040286, 61.7845718503937], [32.9377346182018, 61.7774903863761], [32.9671763413294, 61.7661171259843], [32.9891503387658, 61.7643574894708], [33.0129268906794, 61.7652587667094], [33.0580765885369, 61.7525121314778] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 572,
+         "id" : 51341,
+         "name" : "Shotozero",
+         "pfafstette" : 44571,
+         "lke_type" : "N",
+         "altitude" : 64,
+         "objectid" : 27047,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 573,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [36.4853335011902, 61.2892556308368], [36.5251613715437, 61.2791699093573], [36.5466203534151, 61.2886976973082], [36.5584657114082, 61.3056502929866], [36.5700535616187, 61.3130751007142], [36.5637017029848, 61.3255213101996], [36.550311298297, 61.3192982054569], [36.5100542483062, 61.3171952252335], [36.4667929408533, 61.3086116324849], [36.4853335011902, 61.2892556308368] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 573,
+         "id" : 49290,
+         "pfafstette" : 45813,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 28292,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_28292",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 574,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [29.9530477476653, 62.33606768449], [29.9826611426479, 62.3218618384911], [30.0012017029848, 62.3159391594946], [29.981802783373, 62.3064113715437], [30.012188701703, 62.2900596273576], [30.0496131660868, 62.3096302188244], [30.0373386284563, 62.3396727934444], [30.0071243819813, 62.3563249633767], [29.9806869163157, 62.3664106848562], [29.9747642373192, 62.3753805392785], [29.9625755356162, 62.3839641320271], [29.9416315693097, 62.3952515564915], [29.9248077275224, 62.4092428126717], [29.9057521516206, 62.3973545367149], [29.906009659403, 62.3768397500458], [29.927726149057, 62.3687711728621], [29.9390564914851, 62.3601875801135], [29.945580021974, 62.3473980269181], [29.9530477476653, 62.33606768449] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 574,
+         "id" : 49310,
+         "name" : "Suuri Onkamojrvi",
+         "pfafstette" : 77453,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 28352,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 575,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [59.1812969236404, 53.5808030809376], [59.1999233199048, 53.5712752929866], [59.2400945339682, 53.5816614402124], [59.2685920618934, 53.6063821873283], [59.2793215528292, 53.6280557590185], [59.2790640450467, 53.6604588216444], [59.2764031312946, 53.6878834004761], [59.2654161325765, 53.7152221433803], [59.2485064548618, 53.7268099935909], [59.2336568394067, 53.7360373557956], [59.2183780443142, 53.7405008240249], [59.2092794360007, 53.7297284151254], [59.2090219282183, 53.7146212918879], [59.2223264969786, 53.7009304614539], [59.2246440670207, 53.6851795687603], [59.2318542849295, 53.6566391228713], [59.2386353232009, 53.6292574620033], [59.2307384178722, 53.6093864447903], [59.1922839223586, 53.6069830388207], [59.171168284197, 53.6233777009705], [59.1661898004029, 53.6305020829518], [59.1559753250321, 53.6227339315144], [59.1390656473174, 53.6105881477751], [59.1245593755723, 53.6021762268815], [59.1293661875115, 53.5791721983153], [59.1812969236404, 53.5808030809376] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 575,
+         "id" : 55687,
+         "pfafstette" : 993359,
+         "altitude" : 391,
+         "objectid" : 29058,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_29058",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 576,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.8171351400842, 61.5559049395715], [32.8318989196118, 61.575861792712], [32.8161909448819, 61.5827286669108], [32.8041739150339, 61.5827286669108], [32.7646893883904, 61.5832436824757], [32.7037458798755, 61.5901105566746], [32.6722440944882, 61.5933723219191], [32.652072651529, 61.5958186458524], [32.6396264420436, 61.5940160913752], [32.6262360373558, 61.5809261124336], [32.6132748123054, 61.5687374107306], [32.5973093297931, 61.5625143059879], [32.5848631203076, 61.5526860922908], [32.6157640542025, 61.5485230498077], [32.6719007507783, 61.5527290102545], [32.7087243636697, 61.5488234755539], [32.7182521516206, 61.5401540468779], [32.7355910089727, 61.5336305163889], [32.7662344350852, 61.5386948361106], [32.7888092840139, 61.5434587300861], [32.8171351400842, 61.5559049395715] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 576,
+         "id" : 56448,
+         "pfafstette" : 444373,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 30231,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_30231",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 577,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [38.1484904321553, 59.9766097097601], [38.1641125709577, 59.9903005401941], [38.1581898919612, 60.0000858359275], [38.1579323841787, 60.009356116096], [38.1855715528291, 60.0248065830434], [38.183253982787, 60.0408579014832], [38.1787046786303, 60.0491839864494], [38.1981035982421, 60.0562654504669], [38.2312362662516, 60.0711579838857], [38.2293478758469, 60.0943766022706], [38.19544268449, 60.0928315555759], [38.1755287493133, 60.0848488143197], [38.1638550631752, 60.0750635185863], [38.1540697674418, 60.0699562809009], [38.1266881065739, 60.0783252838308], [38.0939846182018, 60.0767802371361], [38.0798216901666, 60.0628748168834], [38.0664312854788, 60.0536045367149], [38.0566459897455, 60.048239791247], [38.065229582494, 60.039055347006], [38.0783624793994, 60.0426175379967], [38.0890061344076, 60.0378536440212], [38.1103792803516, 60.0212443920527], [38.1184478575352, 59.9962232191906], [38.0726114722578, 59.9641205823109], [38.0644570591467, 59.9356230543856], [38.0762165812122, 59.912189846182], [38.1152719282183, 59.8999153085515], [38.1478037447354, 59.8835635643655], [38.1799063816151, 59.8766966901666], [38.1962152078374, 59.8700444057865], [38.2208501190258, 59.8614608130379], [38.244025819447, 59.8528343023256], [38.250034334371, 59.845752838308], [38.252695248123, 59.8288002426295], [38.2446266709394, 59.814208134957], [38.2578454037722, 59.8145085607032], [38.2793043856436, 59.8360104605384], [38.2729525270097, 59.8540789232741], [38.2578454037722, 59.8770400338766], [38.2251419154001, 59.8900012589269], [38.2143265885369, 59.8977694103644], [38.1972452389672, 59.9024045504486], [38.1777604834279, 59.9024045504486], [38.1484904321553, 59.9063100851492], [38.117160318623, 59.9160953808826], [38.1035124061527, 59.9278119849844], [38.0951863211866, 59.9430049441494], [38.0981905786486, 59.9618030122688], [38.1484904321553, 59.9766097097601] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 577,
+         "id" : 65134,
+         "name" : "Sheksinskoe Reservoir river part 2",
+         "pfafstette" : 66275171,
+         "lke_type" : "N",
+         "altitude" : 126,
+         "objectid" : 34210,
+         "scalerank" : 10,
+         "featurecla" : "Reservoir",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 578,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [59.0217279344443, 53.3718355154734], [59.0176078099249, 53.3524795138253], [59.0113417872185, 53.3322651529024], [59.0373500732467, 53.3128233153269], [59.0605257736678, 53.3203768769456], [59.0493671030947, 53.3388316013551], [59.0478220563999, 53.3584021928218], [59.0399251510712, 53.3801186824757], [59.0332299487274, 53.3967279344442], [59.0315990661051, 53.4157835103461], [59.0225004577916, 53.4375], [59.0216420985168, 53.4396458981871], [59.0194103644021, 53.4375], [58.9973505310383, 53.4160839360923], [59.0066208112068, 53.3971141961179], [59.0217279344443, 53.3718355154734] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 578,
+         "id" : 61606,
+         "pfafstette" : 99135,
+         "altitude" : 344,
+         "objectid" : 34618,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_34618",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 579,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [38.4141526277238, 59.6538237044497], [38.4259979857169, 59.6451971937374], [38.4195602911555, 59.6279870902765], [38.4204186504303, 59.6136954083501], [38.4230795641824, 59.59167849295], [38.431148141366, 59.5622796877861], [38.4492595220655, 59.5497476423732], [38.4570705914668, 59.5325375389123], [38.4726927302692, 59.5078597097601], [38.4550963651346, 59.4805209668559], [38.443336843069, 59.4414656198498], [38.4394742263322, 59.404384499176], [38.4511479124702, 59.3691917689068], [38.46754257462, 59.3279046877861], [38.4502037172679, 59.3011667963743], [38.440675929317, 59.2827120719648], [38.4299464383812, 59.2713817295367], [38.4526071232375, 59.2520686458524], [38.4965551181102, 59.2482489470793], [38.5185291155466, 59.267819538546], [38.5085721479582, 59.3169176890679], [38.4863406427394, 59.3750715299396], [38.476555347006, 59.410221342245], [38.4770703625709, 59.4426244048709], [38.4968126258927, 59.4694481322102], [38.5105463742904, 59.4902204266618], [38.5162115455045, 59.5065292528841], [38.503937007874, 59.5235247665263], [38.4902032594763, 59.5371726789965], [38.4820488463651, 59.5594041842153], [38.4745811206739, 59.5742967176341], [38.4927783373008, 59.5792752014283], [38.5096880150156, 59.5864425013734], [38.5277135597876, 59.5948115043032], [38.5406747848379, 59.6054551593115], [38.5519192913386, 59.6138241622413], [38.5682281175609, 59.6191459897455], [38.582391045596, 59.6218498214613], [38.6008457700055, 59.6574288134041], [38.6240214704266, 59.6733942959165], [38.64882805347, 59.6874284700604], [38.6728621131661, 59.6924498718183], [38.6974970243545, 59.6817632988464], [38.7109732649698, 59.6856259155832], [38.7082265152902, 59.7067415537447], [38.6931193920527, 59.7106470884453], [38.6674544497345, 59.7049819172313], [38.6434203900384, 59.6978146172862], [38.6237639626442, 59.6948961957517], [38.6080559879143, 59.7121062992126], [38.5890004120124, 59.7189302554477], [38.5666830708661, 59.7168701931881], [38.5783567570042, 59.7406467451016], [38.5985281999634, 59.7706893197217], [38.5869403497528, 59.7858393609229], [38.5726057498627, 59.7786720609778], [38.5536360098883, 59.7673846365134], [38.5224775682109, 59.7796162561802], [38.498100164805, 59.7790154046878], [38.4826496978575, 59.7454106390771], [38.4597315052188, 59.7218486769822], [38.4287447353964, 59.7115054477202], [38.4013630745285, 59.708200764512], [38.3791315693096, 59.7183294039553], [38.3713204999084, 59.7415051043765], [38.3628227430873, 59.7632645119941], [38.3437671671855, 59.7500886971251], [38.340505401941, 59.7365266205823], [38.3544966581212, 59.700518449002], [38.3823074986266, 59.6737805575902], [38.3990455044863, 59.6618064457059], [38.4141526277238, 59.6538237044497] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 579,
+         "id" : 69582,
+         "name" : "Sheksinskoe Reservoir river part 1",
+         "lge_id" : "ru",
+         "pfafstette" : 662591,
+         "lke_type" : "N",
+         "altitude" : 111,
+         "objectid" : 36288,
+         "scalerank" : 10,
+         "featurecla" : "Reservoir",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 580,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [42.5543627540743, 58.8016446163706], [42.5552211133492, 58.7743058734664], [42.5704140725142, 58.7612158945248], [42.5957356711225, 58.7552502975646], [42.6441471342245, 58.7594133400476], [42.6848333638528, 58.7743058734664], [42.6920435817616, 58.7897563404138], [42.6783956692913, 58.8051638893976], [42.6474947353964, 58.8146916773485], [42.6135037081121, 58.8213010437649], [42.5783968137704, 58.8224598287859], [42.5543627540743, 58.8016446163706] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 580,
+         "id" : 69826,
+         "pfafstette" : 64859,
+         "lke_type" : "N",
+         "altitude" : 148,
+         "objectid" : 36298,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_36298",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 581,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [37.0172587438198, 60.0271670710493], [36.9909929500091, 60.0193989196118], [36.9551135323201, 60.0009871131661], [36.9383755264603, 59.9793135414759], [36.9673022340231, 59.9713308002197], [37.0106493774034, 59.9742492217543], [37.0334817341146, 59.9665669062443], [37.0620650979674, 59.9644639260209], [37.1057555850577, 59.9721891594946], [37.1369998626625, 59.9754509247391], [37.1479868613807, 59.9813736037356], [37.1235236220472, 59.9918455868888], [37.079318119392, 59.9935193874748], [37.0594900201428, 60.0001287538912], [37.0346834370994, 59.999828328145], [36.9984606757004, 59.9914593252152], [36.9901345907343, 60.0003862616737], [37.006872596594, 60.0096565418422], [37.0231814228163, 60.0167380058597], [37.0172587438198, 60.0271670710493] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 581,
+         "id" : 70975,
+         "pfafstette" : 66242955,
+         "lke_type" : "N",
+         "altitude" : 140,
+         "objectid" : 38880,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_38880",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 582,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [37.7500400567662, 59.7890582082036], [37.7643746566563, 59.7952813129463], [37.7949322468412, 59.7946804614539], [37.8317558597326, 59.7887148644937], [37.823515610694, 59.8036073979125], [37.8019707928951, 59.8237788408716], [37.7899537630471, 59.8309461408167], [37.7646321644387, 59.84107478026], [37.7575936183849, 59.8609887154367], [37.7678080937557, 59.8728769913935], [37.7437740340597, 59.8800013733748], [37.7102121864127, 59.892833844534], [37.693645852408, 59.8948939067936], [37.6896973997436, 59.8704735854239], [37.7156198498443, 59.8475983107489], [37.7393105658304, 59.8300877815418], [37.7437740340597, 59.8116330571324], [37.7426581670024, 59.7982426524446], [37.7500400567662, 59.7890582082036] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 582,
+         "id" : 70532,
+         "pfafstette" : 6627835,
+         "lke_type" : "N",
+         "altitude" : 133,
+         "objectid" : 39059,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_39059",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 583,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [42.1687019318806, 58.4186876258927], [42.1545390038454, 58.4044388619301], [42.1701611426479, 58.388087117744], [42.1918776323018, 58.3806193920528], [42.214881660868, 58.3859841375206], [42.245095907343, 58.3961127769639], [42.2900739333455, 58.3936664530306], [42.3444939113715, 58.3967136284563], [42.3896436092291, 58.4080439708845], [42.4142785204175, 58.4279149880974], [42.3944504211683, 58.4508331807361], [42.356940120857, 58.4540949459806], [42.3259533510346, 58.4406616233291], [42.2647523347372, 58.4329793078191], [42.2097315052188, 58.4350822880425], [42.1916201245193, 58.4282154138436], [42.1687019318806, 58.4186876258927] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 583,
+         "id" : 77326,
+         "pfafstette" : 6464211,
+         "lke_type" : "N",
+         "altitude" : 98,
+         "objectid" : 39196,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_39196",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 584,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [30.0369094488189, 60.8212781541842], [29.9860945797473, 60.8379732420802], [29.9716741439297, 60.8367286211317], [29.9812019318806, 60.8212781541842], [29.997339086248, 60.8026088399561], [30.0225748489288, 60.7865146035525], [30.057595907343, 60.7755276048343], [30.0681537264237, 60.7618367744003], [30.0751922724776, 60.7546265564915], [30.0924452939022, 60.7632959851676], [30.0895268723677, 60.7844116233291], [30.0778531862296, 60.8043255585058], [30.0369094488189, 60.8212781541842] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 584,
+         "id" : 78054,
+         "pfafstette" : 4228173,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 39294,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_39294",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 585,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [30.2700398278704, 60.8626081532686], [30.2518426112434, 60.8569429820546], [30.2712415308552, 60.8373294726241], [30.2815418421535, 60.8189176661784], [30.2182807635964, 60.8283596182018], [30.1483244826955, 60.8420504486358], [30.1369941402674, 60.8212781541842], [30.1533029664897, 60.7975016022706], [30.1905557590185, 60.7879738143197], [30.2283235671123, 60.7883171580297], [30.2503834004761, 60.7850553927852], [30.2836877403406, 60.774068394067], [30.3160478850028, 60.7736821323933], [30.3299533052555, 60.7865146035525], [30.3398244369163, 60.7898192867607], [30.3535581853141, 60.7904201382531], [30.3502105841421, 60.8082310932064], [30.3425711865959, 60.8242824116462], [30.3398244369163, 60.836170687603], [30.3100393700788, 60.8515782365867], [30.2700398278704, 60.8626081532686] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 585,
+         "id" : 77130,
+         "name" : "Pyukhayarvi",
+         "lge_id" : "ru",
+         "pfafstette" : 422859,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 39417,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 586,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [54.55662882256, 54.3440132301776], [54.5316505676616, 54.3323824620033], [54.5343114814136, 54.3172753387658], [54.5652124153085, 54.3077475508149], [54.5987742629555, 54.3009235945797], [54.6201474088995, 54.3009235945797], [54.6225508148691, 54.3193354010254], [54.5952549899286, 54.340451039187], [54.55662882256, 54.3440132301776] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 586,
+         "id" : 78584,
+         "pfafstette" : 242291,
+         "altitude" : 202,
+         "objectid" : 40277,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_40277",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 587,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [54.0325146493316, 54.5107924372825], [54.038952343893, 54.4947411188427], [54.0826428309833, 54.4959857397912], [54.1216123420619, 54.5061143792346], [54.099895852408, 54.5197622917048], [54.054488646768, 54.5256849707013], [54.0325146493316, 54.5107924372825] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 587,
+         "id" : 78851,
+         "pfafstette" : 2366461,
+         "altitude" : 164,
+         "objectid" : 40395,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_40395",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 588,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [30.2370788317158, 59.0243030122688], [30.2446323933346, 59.0481224821461], [30.2458340963194, 59.0625], [30.2464349478118, 59.0706973310749], [30.2617137429042, 59.0781221388024], [30.2682372733932, 59.0831864585241], [30.2524434627358, 59.0947743087347], [30.2266068485625, 59.0864911417323], [30.2060920618934, 59.0718990340597], [30.1882381889764, 59.0695385460538], [30.1795687603003, 59.0630150155649], [30.1798262680828, 59.0625], [30.1902124153086, 59.0379509247391], [30.1961350943051, 59.0079512680828], [30.1798262680828, 58.9958054843435], [30.1700409723494, 58.9851189113716], [30.1971651254349, 58.9693680186779], [30.2274652078374, 58.976191974913], [30.2280660593298, 59.0000114447903], [30.2370788317158, 59.0243030122688] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 588,
+         "id" : 89919,
+         "pfafstette" : 9233,
+         "lke_type" : "N",
+         "altitude" : 73,
+         "objectid" : 46197,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_46197",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 589,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [39.375, 57.1823927623146], [39.3639271653543, 57.1726074665812], [39.3454724409449, 57.1444103644021], [39.3532835103461, 57.1220930232558], [39.375, 57.1219213514008], [39.4270165720564, 57.1215350897272], [39.4846124793994, 57.1489167505951], [39.4871017212965, 57.1774142785204], [39.4917368613807, 57.1990878502106], [39.4888184398462, 57.2131220243545], [39.4721662699139, 57.2127786806446], [39.4289907983886, 57.1952681514375], [39.3787767808094, 57.1857403634865], [39.375, 57.1823927623146] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 589,
+         "line::hidden" : [
+            { "contour" : 0, "segments" : [ { "from" : 3, "to" : 5 }, { "from" : 9, "to" : 10 } ] }
+         ],
+         "id" : 90265,
+         "pfafstette" : 65673,
+         "lke_type" : "N",
+         "altitude" : 90,
+         "objectid" : 46370,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_46370",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 590,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [35.1098985991577, 58.3764563495697], [35.1276666361472, 58.3797610327779], [35.12620742538, 58.3990741164622], [35.1177096685589, 58.4160267121406], [35.1346193462736, 58.4276145623512], [35.1657777879509, 58.438344053287], [35.1972795733382, 58.4484297747665], [35.2282663431606, 58.4481293490203], [35.2434593023256, 58.4537516022706], [35.2297255539278, 58.466541155466], [35.210498306171, 58.4626356207654], [35.1750480681194, 58.4555541567479], [35.1257782457425, 58.4452109274858], [35.0923022340231, 58.4216918833547], [35.0964223585424, 58.4035805026552], [35.1075810291155, 58.3907480314961], [35.1098985991577, 58.3764563495697] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 590,
+         "id" : 88439,
+         "pfafstette" : 667461,
+         "lke_type" : "N",
+         "altitude" : 171,
+         "objectid" : 47574,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_47574",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 591,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [34.2944572880425, 57.8591232146127], [34.306560153818, 57.8663334325215], [34.2978907251419, 57.8746595174876], [34.2956589910273, 57.8811830479766], [34.3178904962461, 57.9055175334188], [34.3176329884636, 57.9260323200879], [34.3027833730086, 57.931697491302], [34.2754017121406, 57.9400664942318], [34.2432132393334, 57.9575770234389], [34.2242434993591, 57.9783922358542], [34.1865615271928, 57.9863749771104], [34.1663042483062, 57.9807098058964], [34.1852739882805, 57.9680060886285], [34.1992652444607, 57.9519118522249], [34.2170332814503, 57.9397231505219], [34.2381489196118, 57.9326416865043], [34.2628696667277, 57.9201096410914], [34.2826977659769, 57.9005390496246], [34.2727407983886, 57.8796380012818], [34.2748008606482, 57.8648313037905], [34.2944572880425, 57.8591232146127] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 591,
+         "id" : 91887,
+         "pfafstette" : 262379,
+         "lke_type" : "N",
+         "altitude" : 156,
+         "objectid" : 48303,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_48303",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 592,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.3217645577733, 58.0140570637246], [33.2956704358176, 58.0220827229445], [33.2554133858268, 58.022340230727], [33.2175597418055, 58.0265461911738], [33.2424521607764, 58.0165033876579], [33.2618510803882, 57.9995078740158], [33.2695763138619, 57.9789930873467], [33.2942112250504, 57.9665039598975], [33.3088891686504, 57.9691219556858], [33.3263138619301, 57.9777913843619], [33.3422793444424, 57.9896796603186], [33.3217645577733, 58.0140570637246] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 592,
+         "id" : 92712,
+         "pfafstette" : 246853,
+         "lke_type" : "N",
+         "altitude" : 196,
+         "objectid" : 48566,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_48566",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 593,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.8893975462369, 58.1424676112434], [33.949482695477, 58.1353861472258], [33.9602121864127, 58.1413517441861], [33.9394398919612, 58.1567592931698], [33.9295687603003, 58.1677462918879], [33.9469934535799, 58.1776174235488], [33.955491210401, 58.1852997390588], [33.940298251236, 58.1814800402857], [33.91626419154, 58.1784757828237], [33.8989253341879, 58.1787762085699], [33.8790113990112, 58.1799349935909], [33.8520589177806, 58.1811796145395], [33.8356642556308, 58.1666304248306], [33.8384110053104, 58.1508366141732], [33.8893975462369, 58.1424676112434] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 593,
+         "id" : 91236,
+         "pfafstette" : 26411,
+         "lke_type" : "N",
+         "altitude" : 152,
+         "objectid" : 48816,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_48816",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 594,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [36.5212129188793, 57.0284460263688], [36.5446461270829, 57.0156993911372], [36.5673926478667, 57.0064720289324], [36.5994094488189, 57.0281885185863], [36.6089372367698, 57.0644541979491], [36.5959760117195, 57.0858273438931], [36.5759762406153, 57.0834239379235], [36.5546030946713, 57.0667717679912], [36.5233588170665, 57.0599478117561], [36.4902261490569, 57.0650121314778], [36.474861518037, 57.0537247070134], [36.4814708844534, 57.0433385597876], [36.4980372184581, 57.0356562442776], [36.5212129188793, 57.0284460263688] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 594,
+         "id" : 94230,
+         "pfafstette" : 675677,
+         "lke_type" : "N",
+         "altitude" : 135,
+         "objectid" : 49142,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_49142",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 595,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.4110339223585, 57.6593830113532], [33.4197033510346, 57.6724300723311], [33.4173857809925, 57.6882238829885], [33.4200466947446, 57.7013138619301], [33.4003902673503, 57.70899617744], [33.3512921168284, 57.7024726469511], [33.3177302691815, 57.6870221800037], [33.3237387841055, 57.6760351812855], [33.3370433528658, 57.6757347555393], [33.3503479216261, 57.6700695843252], [33.3468286485992, 57.6447909036807], [33.3569572880425, 57.629040010987], [33.3884590734298, 57.6361643929683], [33.3966993224684, 57.6489968641275], [33.4110339223585, 57.6593830113532] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 595,
+         "id" : 94247,
+         "pfafstette" : 29479,
+         "lke_type" : "N",
+         "altitude" : 195,
+         "objectid" : 49185,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_49185",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 596,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [32.9698372550815, 57.6801982237685], [32.9663179820546, 57.6632027101264], [32.972927348471, 57.6418724821461], [32.9858885735213, 57.6350056079473], [33.0224546786303, 57.6543186916316], [33.0336991851309, 57.6780952435451], [33.02451474089, 57.6953053470061], [33.0400510437649, 57.7072365409266], [33.0570465574071, 57.7003696667277], [33.0706944698773, 57.6935457104926], [33.0915526002564, 57.6846187740341], [33.1052005127266, 57.6813999267534], [33.0972177714704, 57.6947044955136], [33.0869174601721, 57.7092966031862], [33.078591375206, 57.7208844533968], [33.0813381248856, 57.7331160730635], [33.0923251236037, 57.7473648370262], [33.0842565464201, 57.7592960309467], [33.0573040651895, 57.7601543902216], [33.0234847097601, 57.7578368201795], [33.0051158212782, 57.7545321369713], [33.0055450009156, 57.7346182017946], [32.9949013459074, 57.7129017121406], [32.9802234023073, 57.6947044955136], [32.9698372550815, 57.6801982237685] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 596,
+         "id" : 94278,
+         "pfafstette" : 2462275,
+         "altitude" : 223,
+         "objectid" : 49306,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_49306",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 597,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [34.5206349569676, 57.5463800128182], [34.5173731917231, 57.5529035433071], [34.5108496612342, 57.5681394204358], [34.5081887474821, 57.5877100119026], [34.5049269822377, 57.6099844350852], [34.4663008148691, 57.6287395852408], [34.4170309924922, 57.6248769685039], [34.3928252609412, 57.6085252243179], [34.3806365592382, 57.6011004165904], [34.3627826863212, 57.5945339681377], [34.3789198406885, 57.577624290423], [34.4147992583776, 57.5681394204358], [34.4282754989928, 57.5618304797656], [34.4141984068852, 57.5463800128182], [34.3678470060428, 57.541401529024], [34.3347143380333, 57.5404144158579], [34.3589200695843, 57.5288265656473], [34.3876751052921, 57.5252643746567], [34.4112799853507, 57.5255218824391], [34.4359148965391, 57.5184404184215], [34.463639901117, 57.5219596914485], [34.496858405054, 57.5288265656473], [34.5160856528108, 57.5362513733749], [34.5206349569676, 57.5463800128182] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 597,
+         "id" : 93662,
+         "pfafstette" : 2973,
+         "lke_type" : "N",
+         "altitude" : 159,
+         "objectid" : 49495,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_49495",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 598,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [38.7392991210401, 56.7554877769639], [38.7685691723128, 56.7365180369896], [38.7980967313679, 56.7349729902948], [38.8287401574803, 56.7438999267534], [38.8381821095037, 56.7686206738693], [38.824448361106, 56.7935989287676], [38.7914873649515, 56.8087060520051], [38.7477968778612, 56.8117103094671], [38.7223036073979, 56.790036737777], [38.7392991210401, 56.7554877769639] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 598,
+         "id" : 93159,
+         "pfafstette" : 674957,
+         "lke_type" : "N",
+         "altitude" : 134,
+         "objectid" : 50382,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_50382",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 599,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.0564457059147, 57.4349220609778], [33.0361025911005, 57.4241925700421], [33.0166178355613, 57.4132055713239], [33.0010815326863, 57.4027765061344], [32.9824551364219, 57.3875835469694], [32.9892361746933, 57.3700730177623], [33.0124977110419, 57.3825621452115], [33.0400510437649, 57.4016177211134], [33.066574345358, 57.4072399743637], [33.0802222578282, 57.4188278245743], [33.0908659128365, 57.4376258926936], [33.0908659128365, 57.4577544176891], [33.0816814685955, 57.4726469511079], [33.075415445889, 57.4960801593115], [33.0373901300128, 57.5151357352133], [33.0033991027285, 57.5282686321187], [32.9888928309833, 57.5371955685772], [32.9785066837576, 57.5240626716719], [32.987776963926, 57.5083117789782], [32.994300494415, 57.499170252701], [33.0200512726607, 57.4830330983336], [33.060565830434, 57.4634625068669], [33.0634842519685, 57.447411188427], [33.0564457059147, 57.4349220609778] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 599,
+         "id" : 95542,
+         "pfafstette" : 694811,
+         "lke_type" : "N",
+         "altitude" : 206,
+         "objectid" : 50839,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_50839",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 600,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [37.7253193096502, 56.045839246475], [37.738538042483, 56.0354101812855], [37.757250274675, 56.0285862250504], [37.7876361930049, 56.0247236083135], [37.8038591832997, 56.0291870765428], [37.7880653726424, 56.0475988829885], [37.7590528291522, 56.0645943966307], [37.7464349478117, 56.0675128181652], [37.7266068485625, 56.0681136696576], [37.7033453122139, 56.0806457150705], [37.6853197674419, 56.0898301593115], [37.6546763413294, 56.1014609274858], [37.6338182109504, 56.1055810520051], [37.6430884911188, 56.0925339910273], [37.6830880333272, 56.0749376258927], [37.7126155923823, 56.0569120811207], [37.7253193096502, 56.045839246475] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 600,
+         "id" : 98283,
+         "pfafstette" : 7299253,
+         "lke_type" : "N",
+         "altitude" : 157,
+         "objectid" : 51945,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_51945",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 601,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.108633949826, 57.0433385597876], [33.1384190166636, 57.0242829838857], [33.172581715803, 57.0269868156015], [33.1912081120674, 57.0406347280718], [33.1887188701703, 57.0570293902216], [33.1651998260392, 57.0638533464567], [33.1404790789233, 57.0736815601538], [33.1054580205091, 57.0873294726241], [33.075930461454, 57.0796042391503], [33.0864024446072, 57.0644541979491], [33.108633949826, 57.0433385597876] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 601,
+         "id" : 97959,
+         "pfafstette" : 69434,
+         "lke_type" : "N",
+         "altitude" : 217,
+         "objectid" : 52214,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_52214",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 602,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.2126670939388, 56.8908081166453], [33.2347269273027, 56.8842845861564], [33.2546408624794, 56.8935119483611], [33.2231390770921, 56.9190910547519], [33.1819378318989, 56.949949070683], [33.1470884453397, 56.951794543124], [33.0881191631569, 56.949949070683], [33.0272614905695, 56.9541121131661], [32.9802234023073, 56.9308934947812], [32.9584210767259, 56.9161297152536], [32.9562751785387, 56.9166018128548], [32.9507816791796, 56.9273742217543], [32.9443439846182, 56.9389620719648], [32.9261467679912, 56.9514082814503], [32.8937866233291, 56.9677600256363], [32.8634007049991, 56.9654424555942], [32.8434867698224, 56.9574167963743], [32.8144742263322, 56.9445843252152], [32.7828866050174, 56.933597326497], [32.7596250686688, 56.9410650521882], [32.7361060245376, 56.9467302234023], [32.7141320271013, 56.9656999633767], [32.6838319446988, 56.9921803470061], [32.6684673136788, 56.9966438152353], [32.6855486632485, 56.9992618110236], [32.7109560977843, 57.0242829838857], [32.7222006042849, 57.0463428172496], [32.7239173228347, 57.0573298159678], [32.7178229719832, 57.069475599707], [32.7011708020509, 57.0796042391503], [32.6817718824391, 57.0917929408533], [32.6579953305256, 57.1048829197949], [32.6374805438564, 57.1140673640359], [32.6288969511079, 57.1298182567295], [32.6238326313862, 57.150933894891], [32.6204850302143, 57.1777576222304], [32.612845632668, 57.2029933849112], [32.60082860282, 57.21754257462], [32.588983244827, 57.2347526780809], [32.576794543124, 57.2279287218458], [32.5871806903498, 57.2053109549533], [32.5883823933346, 57.176813427028], [32.5881248855521, 57.1530797930782], [32.6024594854422, 57.1307624519319], [32.6316437007874, 57.104539576085], [32.6635746658121, 57.0905912378685], [32.6745616645303, 57.0733811344076], [32.6676947903314, 57.0540251327596], [32.6650338765794, 57.0398192867607], [32.6675231184765, 57.0225233473723], [32.655248580846, 57.0076308139535], [32.643403222853, 56.9945837529757], [32.6594545412928, 56.9782320087896], [32.6806560153818, 56.9618802646036], [32.6958489745468, 56.9360436504303], [32.7222006042849, 56.9223528199963], [32.7421145394616, 56.9196919062443], [32.7414278520418, 56.9104216260758], [32.7439170939388, 56.8946707333822], [32.7607409357261, 56.8911085423915], [32.7619426387109, 56.9054002243179], [32.7733588170665, 56.9193056445706], [32.8128433437099, 56.9267733702619], [32.8503536440212, 56.9434255401941], [32.888464795825, 56.9553138161509], [32.918507370445, 56.9404212827321], [32.9379921259843, 56.9205502655191], [32.9562751785387, 56.9166018128548], [32.9570477018861, 56.9151855200513], [32.9584210767259, 56.9161297152536], [32.972584004761, 56.9130825398279], [33.0067467039004, 56.9285759247391], [33.066746017213, 56.9363011582128], [33.1210801593115, 56.9324385414759], [33.1467451016297, 56.9250137337484], [33.1684615912837, 56.9101641182934], [33.1883755264604, 56.9017951153635], [33.2126670939388, 56.8908081166453] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 602,
+         "id" : 97579,
+         "pfafstette" : 69715,
+         "lke_type" : "N",
+         "altitude" : 249,
+         "objectid" : 52460,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_52460",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 603,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [40.143231550998, 55.2067930553012], [40.1738749771104, 55.207994758286], [40.1896687877678, 55.2330588491119], [40.170441540011, 55.25941047885], [40.1476950192272, 55.2570929088079], [40.1303561618751, 55.2425008011353], [40.1416006683758, 55.2309129509247], [40.1476950192272, 55.2177800540194], [40.143231550998, 55.2067930553012] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 603,
+         "id" : 99617,
+         "pfafstette" : 9251,
+         "lke_type" : "N",
+         "altitude" : 109,
+         "objectid" : 53644,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_53644",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 604,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [35.0070671580297, 55.8894891045596], [35.0209725782824, 55.8760986998718], [35.0466375206006, 55.8730515244461], [35.0715299395715, 55.8704335286578], [35.0957356711225, 55.8909912332906], [35.0998557956418, 55.9123643792346], [35.0498134499176, 55.9105189067936], [35.0070671580297, 55.8894891045596] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 604,
+         "id" : 101565,
+         "pfafstette" : 68675,
+         "lke_type" : "N",
+         "altitude" : 209,
+         "objectid" : 55120,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_55120",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 605,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [34.4909357260575, 56.1148084142099], [34.4929099523897, 56.1127483519502], [34.5156564731734, 56.124636627907], [34.5171156839407, 56.1020617789782], [34.5024377403406, 56.0726200558506], [34.4917940853323, 56.0538219877312], [34.4632965574071, 56.0271270142831], [34.4481035982421, 56.009273141366], [34.4582322376854, 55.9854965894525], [34.49119323384, 55.9664410135506], [34.5165148324483, 55.950690120857], [34.533424510163, 55.9299178264054], [34.5382313221022, 55.9162699139352], [34.5263859641091, 55.9019782320088], [34.5347120490753, 55.8858839956052], [34.5691322559971, 55.8734377861198], [34.6152261490569, 55.8719356573888], [34.6475862937191, 55.8820213788683], [34.6765130012818, 55.882579312397], [34.6914484526643, 55.8701331029116], [34.6910192730269, 55.8564422724776], [34.6924784837942, 55.8367858450833], [34.6970277879509, 55.821979147592], [34.7097315052188, 55.8267430415675], [34.7346239241897, 55.8267430415675], [34.7626922724776, 55.832665720564], [34.7685291155466, 55.8510775270097], [34.7465551181102, 55.8629658029665], [34.7233794176891, 55.8778154184215], [34.6975428035158, 55.8921071003479], [34.6591741439297, 55.8942529985351], [34.6377151620582, 55.8837810153818], [34.6194321095037, 55.8751974226332], [34.5815784654825, 55.8766995513642], [34.5426947903314, 55.893094213514], [34.5414930873466, 55.9079009110053], [34.5480166178356, 55.9218921671855], [34.5432098058963, 55.9403039736312], [34.533424510163, 55.9486300585973], [34.5197765976927, 55.9608187603003], [34.5038969511078, 55.9745095907343], [34.4825238051639, 55.9754108679729], [34.4658716352316, 55.9866982924373], [34.4587472532503, 56.0113761215895], [34.4751419154001, 56.029487502289], [34.4939399835195, 56.0461396722212], [34.5078454037722, 56.0624914164073], [34.5137680827687, 56.072877563633], [34.5179740432155, 56.0919331395349], [34.5366004394799, 56.1201731596777], [34.5417505951291, 56.1364819859], [34.5396905328694, 56.1475119025819], [34.5283601904413, 56.1555375618019], [34.509047106757, 56.1522757965574], [34.5084462552646, 56.1371686733199], [34.5019227247757, 56.1249370536532], [34.4909357260575, 56.1148084142099] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 605,
+         "id" : 101167,
+         "pfafstette" : 6815,
+         "lke_type" : "N",
+         "altitude" : 188,
+         "objectid" : 55141,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_55141",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 606,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [45.3678927852042, 52.9873763962644], [45.3712403863761, 53.0031702069218], [45.3895234389306, 53.0275476103278], [45.4218835835928, 53.0332556995056], [45.4631706647134, 53.0413242766893], [45.4557887749496, 53.0676329884637], [45.4361323475554, 53.0715385231643], [45.4067764603553, 53.0692209531221], [45.3660043947995, 53.0531696346823], [45.3309833363853, 53.050723310749], [45.3066917689068, 53.0525687831899], [45.2714990386376, 53.0566889077092], [45.2263493407801, 53.0659162699139], [45.187637337484, 53.0736844213514], [45.1581956143563, 53.0885769547702], [45.1252346182018, 53.0878902673503], [45.1074665812122, 53.075916155466], [45.1321014924007, 53.053727568211], [45.1716718549716, 53.0313243911372], [45.2090104834279, 53.0251012863944], [45.2495250412013, 53.0190927714704], [45.2861769822377, 53.0128696667277], [45.3122711041934, 53.0051873512177], [45.3294382896905, 52.9638573521333], [45.3481505218824, 52.9418833546969], [45.3646310199597, 52.9651019730819], [45.3678927852042, 52.9873763962644] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 606,
+         "id" : 102052,
+         "pfafstette" : 47933,
+         "altitude" : 143,
+         "objectid" : 55455,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_55455",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 607,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [55.3896664988097, 48.744163156931], [55.411983839956, 48.7322319630104], [55.4240867057315, 48.7292706235122], [55.4446014924006, 48.7476824299579], [55.4362754074345, 48.7762657938107], [55.4012543490203, 48.7759653680644], [55.3768769456143, 48.7640341741439], [55.3691517121406, 48.7578110694012], [55.3896664988097, 48.744163156931] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 607,
+         "id" : 103427,
+         "pfafstette" : 655,
+         "altitude" : 72,
+         "objectid" : 56378,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_56378",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 608,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [31.2344064731734, 56.0821478438015], [31.2617022981139, 56.0559678859183], [31.312603003113, 56.0618905649148], [31.3191265336019, 56.0836070545688], [31.2832471159128, 56.0890147180004], [31.2593847280718, 56.0958386742355], [31.2407583318074, 56.1133492034426], [31.234148965391, 56.1291000961362], [31.2287413019594, 56.1406879463468], [31.2168101080388, 56.1511170115363], [31.1951794543124, 56.1587993270463], [31.1541498809742, 56.1716317982055], [31.1320900476103, 56.1733485167552], [31.1202446896173, 56.1596576863212], [31.1320900476103, 56.1448509888299], [31.1659952389672, 56.1195723081853], [31.1922610327779, 56.1062248214613], [31.2196426936459, 56.1038214154917], [31.2344064731734, 56.0821478438015] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 608,
+         "id" : 103151,
+         "pfafstette" : 94421,
+         "altitude" : 165,
+         "objectid" : 56440,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_56440",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 609,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [30.0389695110786, 56.1306022248672], [30.0488406427394, 56.1062248214613], [30.0654069767442, 56.100602568211], [30.0856642556308, 56.1020617789782], [30.1037756363304, 56.1035209897455], [30.1263504852591, 56.103263481963], [30.1560497161692, 56.1127483519502], [30.1533029664897, 56.1284992446438], [30.1304706097784, 56.1219757141549], [30.1043764878228, 56.1186710309467], [30.0776815143747, 56.1380270325948], [30.0538191265336, 56.148670687603], [30.0389695110786, 56.1306022248672] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 609,
+         "id" : 103934,
+         "pfafstette" : 249643,
+         "lke_type" : "N",
+         "altitude" : 149,
+         "objectid" : 57028,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_57028",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 610,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [31.1689136605017, 56.2592702801685], [31.1753513550632, 56.25], [31.1774114173228, 56.2471244964292], [31.1860808459989, 56.2370816929134], [31.1948361106025, 56.2257084325215], [31.2202435451383, 56.1909448818898], [31.2495135964109, 56.1621040102545], [31.2653932429958, 56.1674258377586], [31.2544062442776, 56.1811166681926], [31.2606722669841, 56.193906221388], [31.2838479674053, 56.2165669062443], [31.2998134499176, 56.2385409036806], [31.3210149240066, 56.238154642007], [31.3381821095038, 56.2400001144479], [31.3391263047061, 56.25], [31.339984663981, 56.2581114951474], [31.3241908533236, 56.2738623878411], [31.3156930965025, 56.2842914530306], [31.2989550906427, 56.2878536440212], [31.2716592657023, 56.287553218275], [31.2614447903315, 56.2816305392785], [31.2439342611243, 56.2762657938107], [31.2217027559055, 56.269699345358], [31.2050505859733, 56.2596565418422], [31.182389901117, 56.2619741118843], [31.1689136605017, 56.2592702801685] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 610,
+         "line::hidden" : [
+            { "contour" : 0, "segments" : [ { "from" : 18, "to" : 19 } ] }
+         ],
+         "id" : 102655,
+         "pfafstette" : 94413,
+         "lke_type" : "N",
+         "altitude" : 162,
+         "objectid" : 57361,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_57361",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 611,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [57.8032011078557, 47.0318651574803], [57.8257759567845, 47.0333243682476], [57.8398530488922, 47.053281221388], [57.8291235579564, 47.0743968595495], [57.819338262223, 47.1139672221205], [57.798480131844, 47.1592027559055], [57.771098470976, 47.1641812396997], [57.771098470976, 47.1490741164622], [57.786634773851, 47.1222503891229], [57.7932441402674, 47.0833237960081], [57.7939308276873, 47.0494615226149], [57.8032011078557, 47.0318651574803] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 611,
+         "id" : 104970,
+         "pfafstette" : 861,
+         "altitude" : 96,
+         "objectid" : 57538,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_57538",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 612,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [50.0004577916133, 50.1313575810291], [49.993161737777, 50.1394261582128], [49.9607157571873, 50.1266366050174], [49.9343641274492, 50.1046196896173], [49.9286131203076, 50.086808734664], [49.9226046053836, 50.0659935222487], [49.9099008881157, 50.0570236678264], [49.8881843984618, 50.0433328373924], [49.8815750320454, 50.0124748214613], [49.8664679088079, 49.9925608862846], [49.8468973173412, 49.9759087163523], [49.8542792071049, 49.9542351446621], [49.8606310657389, 49.9363383537814], [49.8705880333272, 49.90685371269], [49.8938495696759, 49.8840213559788], [49.9026906702069, 49.8923474409449], [49.9092142006958, 49.912862227614], [49.9236346365135, 49.915523141366], [49.9277547610328, 49.8837209302325], [49.935565830434, 49.8463393838125], [49.9523896722212, 49.8349661234206], [49.9636341787218, 49.8468543993774], [49.9755653726424, 49.8504595083318], [49.9859515198682, 49.849257805347], [49.9755653726424, 49.8697725920161], [49.9717027559055, 49.8917465894525], [49.9586556949277, 49.9137635048526], [49.9236346365135, 49.9318748855521], [49.9118751144479, 49.941402673503], [49.8982272019777, 49.9523896722212], [49.8890427577367, 49.96728220564], [49.9179694652994, 49.9708443966306], [49.9450936183849, 49.9538488829885], [49.9685268265885, 49.9464240752609], [49.9910158395898, 49.9616170344259], [49.998998580846, 49.9844923091009], [50.0195133675151, 50.0074534197033], [50.0317879051456, 50.030886627907], [50.0161657663432, 50.0606716947445], [49.9755653726424, 50.0826456921809], [49.9621749679546, 50.0939331166453], [49.9743636696576, 50.1123878410547], [49.9882690899103, 50.1248769685039], [50.0004577916133, 50.1313575810291] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 612,
+         "id" : 106691,
+         "pfafstette" : 75,
+         "altitude" : 2,
+         "objectid" : 59007,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_59007",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 613,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [53.7255653726424, 48.53832860282], [53.7330330983336, 48.5398736495147], [53.7512303149606, 48.5440796099615], [53.7781827961912, 48.5547661829335], [53.803246887017, 48.5654527559055], [53.8174956509797, 48.5716758606482], [53.7885689434169, 48.5725771378868], [53.7473676982238, 48.5693582906061], [53.7295138253067, 48.5571266709394], [53.7255653726424, 48.53832860282] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 613,
+         "id" : 106591,
+         "pfafstette" : 43,
+         "altitude" : 16,
+         "objectid" : 59040,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_59040",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 614,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [49.8435497161692, 50.2334164988097], [49.856940120857, 50.2125154504669], [49.8730772752243, 50.2021722212049], [49.9128193096503, 50.1935027925288], [49.9404584783007, 50.1932452847464], [49.9457803058048, 50.2065927714704], [49.956767304523, 50.2229015976927], [49.9658659128365, 50.2390387520601], [49.9482695477019, 50.251227453763], [49.9252655191357, 50.2553904962461], [49.9060382713789, 50.2402404550449], [49.8884419062443, 50.2369357718366], [49.8608885735213, 50.2595106207654], [49.8396012635049, 50.2827292391503], [49.820717359458, 50.2970209210767], [49.7880997070134, 50.2955187923457], [49.7666407251419, 50.2762057086614], [49.79333569859, 50.2535879417689], [49.8435497161692, 50.2334164988097] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 614,
+         "id" : 106421,
+         "pfafstette" : 81,
+         "altitude" : 5,
+         "objectid" : 59180,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_59180",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 615,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [52.4477259201611, 49.153815120857], [52.460429637429, 49.1333003341879], [52.4840345174876, 49.1329999084417], [52.4863520875297, 49.1517550585973], [52.4687557223952, 49.1627420573155], [52.4521893883904, 49.1787933757553], [52.4272969694195, 49.207891755173], [52.4016320271012, 49.2159603323567], [52.406009659403, 49.2016686504303], [52.4221468137704, 49.1841581212232], [52.4331338124885, 49.1716260758103], [52.4477259201611, 49.153815120857] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 615,
+         "id" : 106547,
+         "pfafstette" : 263,
+         "altitude" : -6,
+         "objectid" : 59184,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_59184",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 616,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [49.4014946896173, 50.4162041063908], [49.4226103277788, 50.4126848333638], [49.4371165995239, 50.438864791247], [49.4162584691448, 50.4715682796191], [49.3800357077458, 50.4786497436367], [49.3633835378136, 50.4703236586706], [49.3735121772569, 50.4527702114997], [49.3965162058231, 50.4382210217909], [49.40037882256, 50.4289507416224], [49.4014946896173, 50.4162041063908] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 616,
+         "id" : 106349,
+         "pfafstette" : 83,
+         "altitude" : 9,
+         "objectid" : 59301,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_59301",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 617,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [49.4901632027101, 50.0190412699139], [49.5073303882073, 50.0151357352133], [49.5317077916133, 50.0344488188976], [49.5319652993957, 50.0470237822743], [49.5278451748764, 50.0600708432521], [49.5209783006775, 50.0719162012452], [49.5017510529207, 50.0885683711774], [49.4841546877861, 50.0956927531588], [49.4746268998352, 50.0814439891961], [49.4862147500458, 50.0752208844534], [49.5007210217909, 50.0677531587621], [49.4960858817066, 50.0463800128182], [49.4901632027101, 50.0190412699139] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 617,
+         "id" : 107352,
+         "pfafstette" : 0,
+         "altitude" : 4,
+         "objectid" : 59679,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_59679",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 618,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.0678618842703, 54.3366313404138], [33.0649434627358, 54.3363309146676], [33.0611666819264, 54.3240992950009], [33.0680335561253, 54.3021252975645], [33.102797106757, 54.2890782365867], [33.1342988921443, 54.2824688701703], [33.1506077183666, 54.2655162744919], [33.166401529024, 54.2548297015199], [33.1928389946896, 54.2432418513093], [33.2115512268815, 54.2227270646402], [33.2309501464933, 54.2081349569676], [33.2427955044864, 54.1977488097418], [33.2579026277239, 54.1778777925288], [33.2807349844351, 54.166504532137], [33.2979021699323, 54.1673628914118], [33.3237387841055, 54.1745731093206], [33.2924945065007, 54.199551364219], [33.2454564182384, 54.2191219556858], [33.2324093572606, 54.2257313221022], [33.2121520783739, 54.2354736998718], [33.2080319538546, 54.2491645303058], [33.1953282365867, 54.2584348104743], [33.1779893792346, 54.2681771882439], [33.1586762955503, 54.2822542803516], [33.1155008240249, 54.290537447354], [33.0854582494049, 54.2982197628639], [33.0680335561253, 54.3092067615821], [33.066746017213, 54.3234984435085], [33.0678618842703, 54.3366313404138] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 618,
+         "id" : 108661,
+         "pfafstette" : 299773,
+         "lke_type" : "N",
+         "altitude" : 195,
+         "objectid" : 60494,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_60494",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 619,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [50.7510071415492, 49.2370759705182], [50.736672541659, 49.2335137795275], [50.7446552829152, 49.2141577778795], [50.7780454587072, 49.1945871864127], [50.818474180553, 49.191540010987], [50.8309203900384, 49.2035141228713], [50.8054271195751, 49.2151019730819], [50.7739253341879, 49.2263035616187], [50.7510071415492, 49.2370759705182] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 619,
+         "id" : 108665,
+         "pfafstette" : 0,
+         "altitude" : -4,
+         "objectid" : 60512,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_60512",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 620,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [49.0065635872551, 49.7612330617103], [49.043473036074, 49.7502460629921], [49.0779790789233, 49.7615334874565], [49.0912836476836, 49.7799882118659], [49.0717988921443, 49.7862542345724], [49.0568634407618, 49.7953957608497], [49.0657903772203, 49.8076273805164], [49.0730005951291, 49.8150521882439], [49.0446747390588, 49.8361678264054], [49.001241759751, 49.8537212735763], [48.9825295275591, 49.8498586568394], [48.9924006592199, 49.8382708066288], [49.0033876579381, 49.826382530672], [49.015919703351, 49.8129921259842], [49.0065635872551, 49.7895159998169], [49.0065635872551, 49.7612330617103] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 620,
+         "id" : 108849,
+         "pfafstette" : 743,
+         "altitude" : 1,
+         "objectid" : 61110,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_61110",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 621,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [53.4030797930782, 47.4190281084051], [53.3875434902032, 47.4210881706647], [53.3879726698407, 47.4350794268449], [53.4213628456327, 47.443748855521], [53.4562980681194, 47.4398433208204], [53.4944092199231, 47.433233954404], [53.5240226149057, 47.4300151071232], [53.5549235488006, 47.4288563221022], [53.5812751785387, 47.4353798525911], [53.5623912744918, 47.4493281908075], [53.5436790422999, 47.4514311710309], [53.5326062076543, 47.4528903817982], [53.5124347646951, 47.4597143380333], [53.4895165720564, 47.467782915217], [53.464881660868, 47.4698429774767], [53.4511479124702, 47.4597143380333], [53.4404184215345, 47.4504869758286], [53.4259121497894, 47.4517315967772], [53.3977579655741, 47.464778657755], [53.367715390954, 47.4650790835012], [53.3469430965025, 47.4689417002381], [53.3313209577, 47.4858513779528], [53.3205914667643, 47.4873535066838], [53.3132095770005, 47.4748643792346], [53.3149262955503, 47.4570534242813], [53.3022225782824, 47.4484269135689], [53.2847120490752, 47.4597143380333], [53.2722658395898, 47.4686412744919], [53.2644547701886, 47.4773107031679], [53.2409357260575, 47.4989842748581], [53.2086614173228, 47.5028039736312], [53.1827389672221, 47.4986838491119], [53.1494346273576, 47.4968812946347], [53.1237696850393, 47.4713021882439], [53.1268597784288, 47.4511307452848], [53.1332974729903, 47.4433625938473], [53.1146710767259, 47.4385986998718], [53.095615500824, 47.4371394891046], [53.1047141091375, 47.4258520646402], [53.0974180553012, 47.4098007462003], [53.071581441128, 47.4035776414576], [53.0549292711957, 47.4008738097418], [53.0429980772752, 47.388985533785], [53.0322685863395, 47.3797581715803], [53.0278051181102, 47.3690286806446], [53.0522683574437, 47.3625480681194], [53.0678904962461, 47.3544794909357], [53.0419680461454, 47.3414324299579], [53.0210240798388, 47.3267974043216], [53.0305518677898, 47.3191150888116], [53.0444572880425, 47.3057246841238], [53.0589635597876, 47.2929780488921], [53.0854868613807, 47.2857678309833], [53.107460858817, 47.2816047885003], [53.1235121772569, 47.2888150064091], [53.1362158945248, 47.2982998763963], [53.1152719282183, 47.310188152353], [53.0898644936825, 47.3063255356162], [53.0771607764146, 47.3066259613624], [53.1125251785387, 47.3246944240981], [53.1570740249038, 47.3244798342794], [53.1699494140267, 47.3143511948361], [53.1931251144479, 47.3036646218641], [53.1993911371544, 47.2810039370079], [53.1860865683941, 47.2700169382897], [53.1792196941952, 47.2563690258195], [53.1711511170115, 47.2423777696393], [53.1655717817249, 47.2316911966673], [53.1987044497345, 47.221562557224], [53.246858405054, 47.2453820271013], [53.2593904504669, 47.2751670939388], [53.249862662516, 47.3022054110969], [53.2783601904413, 47.3241794085332], [53.3155271470427, 47.3205742995788], [53.3290033876579, 47.3232352133309], [53.3429946438381, 47.3292437282549], [53.3599043215528, 47.3348659815052], [53.3898610602454, 47.3458529802234], [53.4304614539462, 47.349758514924], [53.4511479124702, 47.3557241118843], [53.4702034883721, 47.3625480681194], [53.4942375480681, 47.3595008926936], [53.5077137886834, 47.3607455136422], [53.5314903405969, 47.3678698956235], [53.5514042757736, 47.3776981093206], [53.5766400384545, 47.3842216398096], [53.6000732466581, 47.387826748764], [53.5927771928218, 47.4005304660319], [53.5791292803516, 47.4017321690167], [53.5638504852591, 47.3963674235488], [53.5364688243911, 47.4095003204541], [53.4975851492401, 47.4228478071782], [53.4623924189709, 47.4193285341513], [53.4494311939205, 47.4077406839407], [53.4290022431789, 47.4021184306904], [53.397929637429, 47.4002729582494], [53.3874576542758, 47.4056377037173], [53.4053973631203, 47.4148221479582], [53.4277147042666, 47.423706166453], [53.4247962827321, 47.4356802783373], [53.4143242995788, 47.4309163843618], [53.4030797930782, 47.4190281084051] ],
+            [ [53.2932098058963, 47.3598871543673], [53.3027375938473, 47.3586425334188], [53.2757851126167, 47.3455954724409], [53.2312362662516, 47.3434924922175], [53.2124381981322, 47.3565824711591], [53.2099489562351, 47.37413591833], [53.2096914484526, 47.3928481505219], [53.2206784471708, 47.4047364264787], [53.2362147500458, 47.4031913797839], [53.2541544588903, 47.399672106757], [53.2697765976927, 47.388985533785], [53.2784460263688, 47.3664106848563], [53.2932098058963, 47.3598871543673] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 621,
+         "id" : 110207,
+         "name" : "North Caspian swamp",
+         "pfafstette" : 311,
+         "altitude" : -26,
+         "objectid" : 61783,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 622,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [57.4697285295734, 45.5872894158579], [57.4755653726424, 45.6033407342977], [57.4702435451383, 45.6247567982055], [57.4667242721113, 45.6538122596594], [57.4480120399194, 45.6734686870536], [57.4134201611427, 45.6826960492584], [57.3688713147775, 45.68776036898], [57.3403737868522, 45.6922238372093], [57.3177989379235, 45.6945843252152], [57.2785719190625, 45.7028674922175], [57.2345380882622, 45.7150991118843], [57.1976286394433, 45.713639901117], [57.169646127083, 45.7195625801135], [57.1489596685589, 45.7317512818165], [57.121234663981, 45.7314508560703], [57.0929946438381, 45.7216226423732], [57.0644971159128, 45.709133514924], [57.0456990477935, 45.6927388527742], [57.0338536898004, 45.6784900888116], [57.0183173869255, 45.6799922175426], [56.9990043032412, 45.6859148965391], [56.9775453213697, 45.6672455823109], [56.9824379692364, 45.6351429454312], [57.0061286852225, 45.6247138802417], [57.0617503662333, 45.6130831120674], [57.1506763871086, 45.5955725828603], [57.2097315052188, 45.6024394570591], [57.2534219923091, 45.6095638390405], [57.2951382530672, 45.5997356253433], [57.335910318623, 45.591452458341], [57.3786566105109, 45.5916670481597], [57.4060382713789, 45.5851435176708], [57.4366816974913, 45.573255241714], [57.453591375206, 45.5744569446988], [57.4697285295734, 45.5872894158579] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 622,
+         "id" : 110062,
+         "pfafstette" : 6551,
+         "altitude" : 62,
+         "objectid" : 61873,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_61873",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 623,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [57.1987445065007, 45.9484869987182], [57.2104181926387, 45.9315344030397], [57.2484435085149, 45.9178435726057], [57.290331441128, 45.9149251510712], [57.3201165079656, 45.917628982787], [57.3219190624428, 45.9368991485076], [57.2868980040286, 45.9592164896539], [57.2559112342062, 45.9678430003662], [57.2222635506318, 45.9746669566014], [57.1978861472258, 45.9666412973814], [57.1987445065007, 45.9484869987182] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 623,
+         "id" : 109603,
+         "pfafstette" : 6953,
+         "altitude" : 69,
+         "objectid" : 62226,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_62226",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 624,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [56.25, 45.8357415079656], [56.2412447353964, 45.8364281953855], [56.2352362204724, 45.8625652353049], [56.2321461270829, 45.8890456189343], [56.2239058780443, 45.9041956601355], [56.2429614539461, 45.9151826588537], [56.25, 45.9140238738326], [56.268197216627, 45.9110196163706], [56.2860510895441, 45.9190881935543], [56.2869094488189, 45.9419634682293], [56.2646779436001, 45.9454827412562], [56.25, 45.9454827412562], [56.2352362204724, 45.9454827412562], [56.2070820362571, 45.9508904046878], [56.1897431789049, 45.9455685771837], [56.1819321095037, 45.9499462094854], [56.1698292437282, 45.9583152124153], [56.1615031587621, 45.9484869987182], [56.1754085790148, 45.9333369575169], [56.1894856711225, 45.9190881935543], [56.1834771561985, 45.9008909769273], [56.1814170939388, 45.8634235945797], [56.1493144570591, 45.827157915217], [56.1056239699689, 45.811793284197], [56.1088857352133, 45.8004200238052], [56.144335973265, 45.7962569813221], [56.1960950375389, 45.8102482375023], [56.2387554934993, 45.8203768769456], [56.25, 45.8164284242813], [56.274205731551, 45.8078877494964], [56.3029607672588, 45.8075444057865], [56.3315441311115, 45.8155700650064], [56.3561790423, 45.8250978529573], [56.3512005585058, 45.8378874061527], [56.3283682017946, 45.8334239379235], [56.3029607672588, 45.8281450283831], [56.2824459805896, 45.8337672816334], [56.2649354513825, 45.8345827229445], [56.25, 45.8357415079656] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 624,
+         "id" : 110725,
+         "pfafstette" : 73799,
+         "altitude" : 14,
+         "objectid" : 62290,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_62290",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 625,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [56.4313713147775, 45.9202469785754], [56.4156633400476, 45.9145388893975], [56.4172083867424, 45.9020926799121], [56.4758343252152, 45.8932086614173], [56.534288591833, 45.9000326176524], [56.5372070133675, 45.9217491073064], [56.52244323384, 45.9466415262772], [56.5096536806446, 45.9666412973814], [56.5001258926937, 45.9702034883721], [56.49205731551, 45.9556542986633], [56.4685382713789, 45.9327361060245], [56.4313713147775, 45.9202469785754] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 625,
+         "id" : 110369,
+         "pfafstette" : 7453,
+         "altitude" : -2,
+         "objectid" : 62301,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_62301",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 626,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [48.5698303882073, 49.2296082448269], [48.5944652993957, 49.2082780168467], [48.6294005218824, 49.1992652444607], [48.6433059421351, 49.2111964383812], [48.6389283098334, 49.2296082448269], [48.6391858176158, 49.2540285661967], [48.6362673960813, 49.2712386696576], [48.5996154550449, 49.2769038408716], [48.5550666086797, 49.2926547335653], [48.523478987365, 49.2888350347922], [48.5273416041018, 49.2623546511628], [48.556525819447, 49.2457453991943], [48.5698303882073, 49.2296082448269] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 626,
+         "id" : 110652,
+         "pfafstette" : 4237,
+         "altitude" : -7,
+         "objectid" : 62441,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_62441",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 627,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [47.7621143105658, 49.6438095129097], [47.7517281633401, 49.6363417872184], [47.7546465848746, 49.6205908945248], [47.7737021607764, 49.6182304065189], [47.7948177989379, 49.6199900430324], [47.8046889305988, 49.6108055987914], [47.8206544131111, 49.5968143426112], [47.8500961362388, 49.6063421305622], [47.8569630104377, 49.634582150705], [47.8388516297382, 49.6562557223952], [47.8135300311298, 49.6601612570958], [47.7902684947812, 49.6572428355612], [47.773444652994, 49.6512343206372], [47.7621143105658, 49.6438095129097] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 627,
+         "id" : 110412,
+         "pfafstette" : 479,
+         "altitude" : 7,
+         "objectid" : 62473,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_62473",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 628,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [48.1137841054752, 49.4648416041018], [48.132839681377, 49.4496486449368], [48.1670023805164, 49.4514082814503], [48.1912081120674, 49.4653995376305], [48.2036543215528, 49.4630390496246], [48.217817249588, 49.4582751556491], [48.2463147775133, 49.4653995376305], [48.2829667185497, 49.4567730269181], [48.293438701703, 49.43776036898], [48.2951554202527, 49.4270737960081], [48.3083741530855, 49.4369020097052], [48.2985030214247, 49.4612364951474], [48.2805633125801, 49.4820517075627], [48.2583318073613, 49.4975450924739], [48.2303492950009, 49.5038111151804], [48.1858004486358, 49.5005064319722], [48.1364447903314, 49.4954421122505], [48.1174750503571, 49.4841546877861], [48.1137841054752, 49.4648416041018] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 628,
+         "id" : 110431,
+         "pfafstette" : 4781,
+         "altitude" : 0,
+         "objectid" : 62532,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_62532",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 629,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [56.1189285387292, 46.0531639122871], [56.1279413111152, 46.0477991668193], [56.1599581120674, 46.0409752105841], [56.1826187969236, 46.0436361243362], [56.1633057132393, 46.0632496337667], [56.1245078740157, 46.093249290423], [56.122791155466, 46.1238927165354], [56.1513745193188, 46.1375835469694], [56.1644215802966, 46.146167139718], [56.1337781541842, 46.1580983336385], [56.0990146035524, 46.1420470151987], [56.092748580846, 46.1131632255997], [56.1028772202893, 46.0971548251236], [56.1184135231642, 46.0730778474638], [56.1189285387292, 46.0531639122871] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 629,
+         "id" : 110358,
+         "pfafstette" : 75111,
+         "altitude" : 92,
+         "objectid" : 62598,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_62598",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 630,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [39.7211762955503, 52.584462552646], [39.7321632942684, 52.5723167689068], [39.7640084233657, 52.5711579838857], [39.7937076542758, 52.5672524491851], [39.81370742538, 52.5631323246658], [39.8056388481963, 52.5791836431057], [39.7658968137704, 52.6005997070134], [39.7480429408533, 52.6139471937374], [39.7428927852042, 52.62853930141], [39.7155969602637, 52.625535043948], [39.6965413843618, 52.6047627494964], [39.7089875938473, 52.5943766022707], [39.7211762955503, 52.584462552646] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 630,
+         "id" : 109379,
+         "pfafstette" : 96411,
+         "lke_type" : "N",
+         "altitude" : 105,
+         "objectid" : 62615,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_62615",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 631,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [57.6408853689801, 45.8099478117561], [57.6860350668376, 45.7861283418788], [57.7066356894342, 45.7834674281267], [57.7282663431606, 45.7799052371361], [57.7551329884637, 45.7728237731185], [57.7868922816334, 45.7697765976927], [57.8201966214979, 45.7802056628823], [57.8156473173412, 45.8176730452298], [57.7898107031679, 45.8524795138253], [57.7761627906977, 45.8718355154734], [57.7649182841971, 45.8958695751694], [57.7441459897455, 45.9033373008606], [57.7164209851676, 45.9118779756455], [57.692644433254, 45.9169852133309], [57.6775373100165, 45.9068565738876], [57.6359068851859, 45.9056548709028], [57.5948773118477, 45.9107621085882], [57.5847486724043, 45.8902473219191], [57.589812992126, 45.8640244460722], [57.6055209668559, 45.8468143426112], [57.6408853689801, 45.8099478117561] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 631,
+         "id" : 109116,
+         "pfafstette" : 681,
+         "altitude" : 69,
+         "objectid" : 62683,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_62683",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 632,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [51.8492778337301, 48.4209479719831], [51.8718526826588, 48.4194458432521], [51.8947708752976, 48.4150252929866], [51.9135689434169, 48.4078579930416], [51.9321095037539, 48.4108193325398], [51.9663580388207, 48.4152828007691], [52.0000057223952, 48.4343383766709], [52.0014649331624, 48.4637371818348], [51.9867869895623, 48.4931789049624], [51.9565727430873, 48.5151958203626], [51.9221525361655, 48.5264832448269], [51.8786337209302, 48.5214189251053], [51.8450718732833, 48.5086722898736], [51.8472177714704, 48.4887154367332], [51.8552005127266, 48.4598316471342], [51.8498786852225, 48.4376430598791], [51.8492778337301, 48.4209479719831] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 632,
+         "id" : 109366,
+         "pfafstette" : 25413,
+         "altitude" : -27,
+         "objectid" : 62904,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_62904",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 633,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [55.6103506683757, 45.533684879143], [55.6227968778612, 45.5266034151254], [55.6574745925654, 45.5334702893243], [55.7007359000183, 45.532526094122], [55.7369586614173, 45.535530351584], [55.7688037905145, 45.539693394067], [55.7966146310199, 45.5456589910273], [55.835669978026, 45.5477190532869], [55.8790171214063, 45.5557876304706], [55.8945534242813, 45.5757015656473], [55.8745536531771, 45.5810663111152], [55.8506054294085, 45.5744569446988], [55.8318073612891, 45.5646287310016], [55.8124942776048, 45.5646287310016], [55.7771298754807, 45.5670321369712], [55.7395337392419, 45.5688346914485], [55.7048560245376, 45.5720964566929], [55.6672598882988, 45.5738560932064], [55.6501785387292, 45.5684913477385], [55.6267453305255, 45.5533413065373], [55.6103506683757, 45.533684879143] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 633,
+         "id" : 111943,
+         "pfafstette" : 6471,
+         "altitude" : 79,
+         "objectid" : 63091,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_63091",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 634,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [39.1406679179637, 51.5498821186596], [39.1810108038821, 51.5591094808643], [39.2156026826588, 51.5962764374657], [39.2268471891595, 51.6435720335104], [39.2413534609046, 51.6758892602088], [39.2576622871269, 51.7038717725691], [39.2651300128182, 51.7282920939388], [39.2580914667643, 51.7421975141915], [39.2763745193188, 51.7684203900385], [39.2824688701703, 51.7894931102362], [39.2551730452298, 51.7883343252152], [39.2330273759385, 51.762154367332], [39.2336282274309, 51.7312105154734], [39.226589681377, 51.6845586888848], [39.1972337941769, 51.6319841832998], [39.1878776780809, 51.6042591787219], [39.1882210217909, 51.5864482237685], [39.1706246566563, 51.580525544772], [39.1592943142282, 51.573358244827], [39.1486506592199, 51.5603111838491], [39.1406679179637, 51.5498821186596] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 634,
+         "id" : 111737,
+         "pfafstette" : 9613,
+         "lke_type" : "N",
+         "altitude" : 90,
+         "objectid" : 63313,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_63313",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 635,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [54.2081349569676, 46.4922575993408], [54.223928767625, 46.492558025087], [54.2349157663431, 46.5077080662882], [54.2295081029115, 46.522600599707], [54.2271905328694, 46.5374931331258], [54.2245296191174, 46.5481797060978], [54.2150018311664, 46.5704541292804], [54.2012680827687, 46.5942306811939], [54.1950878959897, 46.6031576176524], [54.1828991942867, 46.6124278978209], [54.1626419154001, 46.6129858313496], [54.1804099523897, 46.5859475141915], [54.2060748947079, 46.5466775773668], [54.2063324024904, 46.514918284197], [54.2081349569676, 46.4922575993408] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 635,
+         "id" : 111497,
+         "pfafstette" : 0,
+         "altitude" : -19,
+         "objectid" : 63621,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_63621",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 636,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [46.0950947628639, 49.3872030076909], [46.082906061161, 49.3794777742172], [46.070717359458, 49.3637268815235], [46.0588720014649, 49.3637268815235], [46.046683299762, 49.368490775499], [46.0253959897455, 49.3479759888299], [46.0239367789782, 49.3220964566929], [46.0516617835561, 49.3090064777513], [46.0789576084966, 49.3054872047244], [46.1028199963377, 49.3257015656473], [46.1120902765061, 49.357804202527], [46.1057384178722, 49.3789198406885], [46.0950947628639, 49.3872030076909] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 636,
+         "id" : 112509,
+         "pfafstette" : 94,
+         "altitude" : 12,
+         "objectid" : 63718,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_63718",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 637,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [29.8381134407618, 53.4375], [29.8386284563267, 53.4360407892327], [29.8408601904413, 53.4375], [29.8591432429958, 53.4493882759568], [29.8564823292437, 53.4782720655558], [29.8576840322285, 53.4990443600073], [29.8686710309467, 53.5171986586706], [29.8510746658121, 53.5453957608497], [29.8348516755173, 53.5562969236404], [29.8296156839407, 53.5278852316425], [29.8402593389489, 53.5126922724776], [29.8315899102729, 53.501104422267], [29.8256672312763, 53.4865981505219], [29.8298731917231, 53.4687442776048], [29.8328774491851, 53.4517916819264], [29.8381134407618, 53.4375] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 637,
+         "id" : 112307,
+         "pfafstette" : 9233,
+         "lke_type" : "N",
+         "altitude" : 139,
+         "objectid" : 63853,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_63853",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 638,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [55.3370490752609, 45.5414530305805], [55.3494952847464, 45.5468177760483], [55.3754177348471, 45.5515816700238], [55.3906106940121, 45.5673325627174], [55.4055461453946, 45.588448200879], [55.4161898004028, 45.6116239013001], [55.4165331441128, 45.6360013047061], [55.4191940578648, 45.6639408991027], [55.3962758652261, 45.6871595174876], [55.3777353048892, 45.6865157480315], [55.3732718366599, 45.6651855200513], [55.366919978026, 45.6428252609412], [55.3527570499908, 45.6241559467131], [55.3361907159861, 45.6092634132943], [55.3240020142831, 45.6059587300861], [55.3040022431789, 45.5976755630837], [55.2587667093939, 45.5848430919246], [55.1945614356345, 45.5723968824391], [55.1652055484343, 45.5485774125618], [55.1598837209302, 45.5287063953488], [55.1637463376671, 45.5021830937557], [55.1838319446988, 45.4835137795276], [55.1869220380882, 45.4963033327229], [55.1904413111152, 45.5203803103827], [55.2175654642007, 45.5388350347922], [55.2519856711225, 45.5438135185863], [55.2832299487273, 45.5363887108588], [55.3147317341146, 45.5322256683758], [55.3370490752609, 45.5414530305805] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 638,
+         "id" : 112239,
+         "pfafstette" : 6113331,
+         "altitude" : -62,
+         "objectid" : 63900,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_63900",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 639,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [48.3920641823842, 49.085704312397], [48.3998752517854, 49.0682367011536], [48.4330937557224, 49.0514986952939], [48.4702607123238, 49.046133949826], [48.5134361838491, 49.0545029527559], [48.5420195477019, 49.075017739425], [48.526139901117, 49.0946312488555], [48.478071781725, 49.0999959943234], [48.4355829976195, 49.1042019547702], [48.4003902673503, 49.1127855475188], [48.3674292711958, 49.1250171671855], [48.3537813587255, 49.1235579564182], [48.3618499359092, 49.1151889534884], [48.3852831441128, 49.105060314045], [48.3920641823842, 49.085704312397] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 639,
+         "id" : 111217,
+         "pfafstette" : 4375,
+         "altitude" : -6,
+         "objectid" : 64111,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_64111",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 640,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [53.6830765885369, 46.9438404138436], [53.6783556125252, 46.9233256271745], [53.6806731825673, 46.9159437374107], [53.7009304614539, 46.9305358450833], [53.718784334371, 46.9480463742904], [53.7199860373558, 46.9605784197034], [53.7356940120857, 46.9682607352133], [53.7558654550448, 46.9754280351584], [53.7333764420436, 46.9822519913935], [53.6965528291522, 46.9685611609595], [53.6830765885369, 46.9438404138436] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 640,
+         "id" : 111097,
+         "pfafstette" : 1,
+         "altitude" : -25,
+         "objectid" : 64114,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_64114",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 641,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [50.6432830525545, 48.2936962094854], [50.6329827412562, 48.2927949322468], [50.6416521699322, 48.263052783373], [50.6739264786669, 48.24318176616], [50.7025098425197, 48.255370467863], [50.7143552005127, 48.2731814228163], [50.682424235488, 48.2850267808094], [50.6432830525545, 48.2936962094854] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 641,
+         "id" : 111107,
+         "pfafstette" : 521,
+         "altitude" : -28,
+         "objectid" : 64134,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_64134",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 642,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [53.0827401117011, 47.1531942409815], [53.0908086888848, 47.1603615409266], [53.1191345449551, 47.1755545000916], [53.1359583867423, 47.1844385185863], [53.129177348471, 47.1992881340414], [53.1252288958066, 47.2135798159678], [53.1396493316242, 47.2355967313679], [53.1351000274675, 47.2519484755539], [53.1235121772569, 47.240918558872], [53.095615500824, 47.2167986632485], [53.0649720747116, 47.1962838765794], [53.0763024171397, 47.1737090276506], [53.0827401117011, 47.1531942409815] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 642,
+         "id" : 111119,
+         "pfafstette" : 1,
+         "altitude" : -28,
+         "objectid" : 64180,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_64180",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 643,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [55.6825386833913, 45.9140238738326], [55.723482420802, 45.8973287859366], [55.7645119941402, 45.9023931056583], [55.7767865317707, 45.921148255814], [55.7936962094854, 45.9532508926936], [55.8291464475371, 45.9850531038271], [55.8214212140633, 45.9966409540377], [55.7824517029848, 45.9882719511079], [55.7441688793261, 45.9823492721113], [55.7214223585424, 45.9805896355979], [55.7133537813587, 45.9559547244095], [55.6864013001282, 45.9321352545321], [55.6825386833913, 45.9140238738326] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 643,
+         "id" : 111125,
+         "pfafstette" : 7361,
+         "altitude" : 14,
+         "objectid" : 64204,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_64204",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 644,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [56.4810703167918, 45.5230841420985], [56.5033876579381, 45.5183202481231], [56.5200398278704, 45.5152730726973], [56.5390954037722, 45.5138138619301], [56.5911119758286, 45.5102516709394], [56.6517121406336, 45.4980629692364], [56.6992652444607, 45.4905952435451], [56.7335137795276, 45.4948012039919], [56.7426982237686, 45.5153159906611], [56.7296511627907, 45.5405946713056], [56.70372871269, 45.5456589910273], [56.6635574986266, 45.5405946713056], [56.6020989745468, 45.5536417322835], [56.5512841054752, 45.5679334142099], [56.5221857260575, 45.5620107352133], [56.4870788317158, 45.5622682429958], [56.4555770463285, 45.5657875160227], [56.4240752609412, 45.5608090322285], [56.3826165079656, 45.5486632484893], [56.3893117103095, 45.5372899880974], [56.4228735579564, 45.5340711408167], [56.4523152810841, 45.5284059696026], [56.4810703167918, 45.5230841420985] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 644,
+         "id" : 111131,
+         "pfafstette" : 6411,
+         "altitude" : 66,
+         "objectid" : 64224,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_64224",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 645,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [48.3703476927303, 49.1372058688885], [48.3995319080754, 49.1329999084417], [48.4015919703351, 49.1434289736312], [48.3825363944333, 49.1535576130745], [48.3462277971068, 49.1514975508149], [48.3196186595862, 49.1544159723494], [48.2979021699322, 49.1689651620582], [48.2672587438198, 49.1716260758103], [48.2409929500092, 49.179694652994], [48.2361003021425, 49.2014111426479], [48.2425379967039, 49.218921671855], [48.2488040194104, 49.2442003524995], [48.2467439571507, 49.2670756271745], [48.2357569584325, 49.2810668833547], [48.2211648507599, 49.2956589910273], [48.1997058688885, 49.3010237364951], [48.1878605108954, 49.2867320545688], [48.1991908533236, 49.2709811618751], [48.2163580388207, 49.2611100302142], [48.2071735945797, 49.2492646722212], [48.199448361106, 49.2260889718], [48.2112937190991, 49.2043724821461], [48.2121520783739, 49.1879778199963], [48.1875171671855, 49.1871194607215], [48.163568943417, 49.1894799487273], [48.1721525361655, 49.1782354422267], [48.1916372917048, 49.1699093572606], [48.2060577275224, 49.1651883812488], [48.2348985991577, 49.1558751831166], [48.2767865317707, 49.1463473951657], [48.3100908716352, 49.141626419154], [48.3344682750412, 49.1395234389306], [48.3703476927303, 49.1372058688885] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 645,
+         "id" : 110988,
+         "pfafstette" : 4377,
+         "altitude" : -5,
+         "objectid" : 64405,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_64405",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 646,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [55.6106081761582, 44.7946375434902], [55.6110802737594, 44.8145085607032], [55.5969173457243, 44.836568394067], [55.5814239608131, 44.8540789232741], [55.56957860282, 44.8614608130379], [55.5329695797473, 44.8570831807361], [55.5029270051273, 44.8406885185863], [55.5163603277788, 44.8267401803699], [55.5373472120491, 44.806525819447], [55.5073475553928, 44.7851097555393], [55.4704810245377, 44.7884144387475], [55.4511679408533, 44.7898736495148], [55.4434856253434, 44.7722772843802], [55.4385071415492, 44.7550671809193], [55.4401809421352, 44.7408613349204], [55.4646012635049, 44.7378141594946], [55.4902662058231, 44.7398742217543], [55.50146779436, 44.7449814594397], [55.5107380745285, 44.7512474821461], [55.5312528611976, 44.7381575032046], [55.548720472441, 44.7297885002747], [55.5632267441861, 44.7315910547519], [55.5903508972716, 44.7342519685039], [55.6180329838858, 44.7482861426479], [55.6248998580846, 44.766955456876], [55.6188913431606, 44.7803458615638], [55.6106081761582, 44.7946375434902] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 646,
+         "id" : 113839,
+         "pfafstette" : 2595,
+         "altitude" : 69,
+         "objectid" : 64545,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_64545",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 647,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [53.526983954404, 44.9366960034792], [53.4375, 44.8397014054203], [53.4075003433437, 44.8071266709394], [53.3670716214979, 44.7559684581579], [53.3349689846182, 44.7077715848746], [53.2438970655557, 44.5900905282915], [53.2302491530855, 44.56897489013], [53.1997344808643, 44.513052783373], [53.1633400476103, 44.4612937190991], [53.1405076908991, 44.4364013001282], [53.1655288637612, 44.4161440212415], [53.2225239196118, 44.3979468046145], [53.2641543444424, 44.3869598058964], [53.2914930873466, 44.3822817478484], [53.3227802829152, 44.4021527650614], [53.3530374473539, 44.4420235533785], [53.3932086614173, 44.4839114859916], [53.4259121497894, 44.5341684215345], [53.4304185359824, 44.5737387841055], [53.4375, 44.5842536852225], [53.4433797610328, 44.593008949826], [53.477070362571, 44.6224506729537], [53.5044091054752, 44.6501327595679], [53.5273702160777, 44.6801753341879], [53.5456532686321, 44.7533075444058], [53.5642367469328, 44.8073841787219], [53.5870261856803, 44.8252809696027], [53.6123048663249, 44.8576840322285], [53.6543215528292, 44.8891858176158], [53.7003296099616, 44.9215030443142], [53.7365952893243, 44.9483267716536], [53.7645348837209, 44.9539919428676], [53.7912727751328, 44.9456229399378], [53.8376670939389, 44.9361809879143], [53.8962501144479, 44.9370393471892], [53.9617000091559, 44.9542923686138], [54.0329867469328, 44.9757084325215], [54.0768059879143, 44.9884121497894], [54.0898101309284, 45], [54.0897672129646, 45], [54.1035009613624, 45.0122316196667], [54.1213548342794, 45.0384544955136], [54.1383503479216, 45.0473814319722], [54.166504532137, 45.0556645989745], [54.2133709485442, 45.0612868522249], [54.2610098882988, 45.0633469144845], [54.2756878318989, 45.0455359595312], [54.2839280809375, 45.021201474089], [54.3122539370079, 45.018197216627], [54.3464166361472, 45.0134333226515], [54.3931113806995, 45.0092702801685], [54.4522523347372, 45.0221027513276], [54.4941402673503, 45.0374673823476], [54.52589956052, 45.0544628959897], [54.5461568394067, 45.0496990020143], [54.5625515015565, 45.0283258560703], [54.5895898187145, 45.0348493865592], [54.6222933070866, 45.0521453259476], [54.6552543032411, 45.0714154916682], [54.6780008240249, 45.0796986586706], [54.7037516022706, 45.087466810108], [54.7509613623878, 45.1237754074345], [54.7775704999084, 45.1549767670756], [54.7866691082219, 45.1683242537997], [54.8033212781542, 45.1730881477751], [54.8277845174876, 45.1766503387658], [54.8506168741988, 45.190298251236], [54.8792002380516, 45.2081521241531], [54.9186847646951, 45.2435165262772], [54.9097578282366, 45.2661772111335], [54.885981276323, 45.2575936183849], [54.8749942776048, 45.2414564640176], [54.8354239150339, 45.2366925700421], [54.7798022340231, 45.234375], [54.7456395348837, 45.2364779802234], [54.7281290056766, 45.2477654046878], [54.6889878227431, 45.2617137429042], [54.6496749679546, 45.2803830571324], [54.6374862662516, 45.2825289553195], [54.6753399102728, 45.2590528291522], [54.710704312397, 45.2349329335287], [54.7148244369163, 45.2212421030947], [54.719888756638, 45.2081950421168], [54.701691540011, 45.2025298709028], [54.668473036074, 45.208495467863], [54.6445248123054, 45.2105984480864], [54.614053058048, 45.2147185726058], [54.5857272019776, 45.2164782091192], [54.6074436916316, 45.2051907846548], [54.6068428401392, 45.1850193416957], [54.5678733290606, 45.1733885735213], [54.5403199963377, 45.1760494872734], [54.520234389306, 45.181113806995], [54.4953419703351, 45.1942037859366], [54.4756855429408, 45.2153194240982], [54.4638401849478, 45.232872871269], [54.4403211408167, 45.2444607214796], [54.4106219099066, 45.2530443142282], [54.3723390862479, 45.2631729536715], [54.353798525911, 45.2813272523347], [54.3392064182384, 45.2940738875664], [54.3332837392419, 45.3069063587255], [54.3510517762314, 45.3104256317524], [54.3616095953122, 45.3155757874016], [54.362811298297, 45.3348459531221], [54.3452149331624, 45.3446312488555], [54.3163740615272, 45.3529573338216], [54.3015244460721, 45.3746309055118], [54.3088204999084, 45.3847595449551], [54.3356871452115, 45.3835578419703], [54.368648141366, 45.379781061161], [54.3906221388024, 45.3818411234206], [54.4119094488189, 45.3942873329061], [54.4380035707746, 45.3972915903681], [54.4560291155466, 45.4052743316242], [54.4501922724776, 45.4181068027834], [54.3907938106574, 45.4237290560337], [54.3518242995788, 45.4332139260209], [54.3616095953122, 45.4475056079473], [54.3752575077824, 45.4546729078923], [54.3955147866691, 45.4499090139169], [54.4308791887932, 45.4478060336935], [54.4631534975279, 45.4439863349203], [54.4860716901666, 45.4284929500092], [54.5117366324849, 45.4257891182934], [54.5224661234206, 45.4255316105109], [54.5388607855704, 45.4234715482512], [54.5422083867423, 45.4457030534701], [54.5137966947445, 45.4754881203076], [54.4665869346273, 45.4995221800037], [54.4272740798388, 45.520337392419], [54.3889054202527, 45.5361312030764], [54.3428115271928, 45.5531267167186], [54.3017819538546, 45.5628690944882], [54.266160043948, 45.5657875160227], [54.2459027650613, 45.5780191356894], [54.2192077916132, 45.5997356253433], [54.2004097234938, 45.6199499862662], [54.2156026826588, 45.6223104742721], [54.2301089544039, 45.6232546694745], [54.1936286852225, 45.633683734664], [54.1531141274492, 45.6299927897821], [54.1430713239333, 45.6202504120125], [54.1010975553928, 45.6273747939938], [54.0588662790698, 45.6285335790148], [54.0660764969786, 45.6160873695294], [54.0779218549716, 45.6011948361106], [54.0624713880242, 45.5869889901117], [54.0439308276872, 45.5709376716719], [54.0377506409082, 45.5593498214613], [54.0317421259842, 45.5483628227431], [54.0244460721479, 45.5251442043582], [54.0166350027467, 45.5081916086797], [54.0137165812122, 45.4843721388024], [54.0178367057315, 45.4406816517121], [54.0241885643655, 45.4056605932979], [54.0225576817433, 45.3889225874382], [54.0207551272661, 45.3755751007142], [54.0288237044497, 45.3541161188427], [54.0371497894158, 45.337206441128], [54.0750034334371, 45.3045029527559], [54.1153463193554, 45.2539885094305], [54.1228140450467, 45.2227871497894], [54.111569538546, 45.1983668284197], [54.0805827687237, 45.1766503387658], [54.0368922816334, 45.152573361106], [53.9750904138436, 45.1243333409632], [53.93663591833, 45.1121446392602], [53.8899411737777, 45.1014580662882], [53.8177531587621, 45.0812437053653], [53.7595563999267, 45.0645915354331], [53.7125183116645, 45.0506002792529], [53.6798148232924, 45.0393128547885], [53.6349226332173, 45.02270360282], [53.60376419154, 45], [53.5676272660685, 44.9736483702619], [53.526983954404, 44.9366960034792] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 647,
+         "id" : 113582,
+         "pfafstette" : 1,
+         "altitude" : -29,
+         "objectid" : 64688,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_64688",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 648,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [37.769095632668, 51.4164072514192], [37.7219717084783, 51.4219007507783], [37.748065830434, 51.4060211041934], [37.7860053103827, 51.3851200558506], [37.8255756729537, 51.4167076771654], [37.8187087987548, 51.4297976561069], [37.805661737777, 51.4241324848929], [37.7946747390588, 51.4125446346823], [37.769095632668, 51.4164072514192] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 648,
+         "id" : 113494,
+         "pfafstette" : 48939,
+         "lke_type" : "N",
+         "altitude" : 133,
+         "objectid" : 64719,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_64719",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 649,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [55.1013436183849, 44.9798714750046], [55.0991118842703, 44.9658373008607], [55.1140044176891, 44.9616742583776], [55.1291544588903, 44.9605154733565], [55.1408710629922, 44.9593566883355], [55.1603987364952, 44.9641205823109], [55.1854199093573, 44.9673394295917], [55.2073939067936, 44.9635197308185], [55.2358485167552, 44.9697428355613], [55.2483805621681, 45], [55.2511273118476, 45.0066093664164], [55.2288099707013, 45.0285833638528], [55.1869220380882, 45.0200426890679], [55.1595403772203, 45.004506386193], [55.1389397546237, 45], [55.13889683666, 45], [55.1378238875664, 44.9997424922176], [55.1167082494049, 44.9935193874748], [55.1013436183849, 44.9798714750046] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 649,
+         "id" : 113816,
+         "pfafstette" : 2559,
+         "altitude" : 52,
+         "objectid" : 64730,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_64730",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 650,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [54.4368018677898, 45.5726543902216], [54.456458295184, 45.565572926204], [54.4834107764146, 45.5726543902216], [54.4856425105292, 45.5896069859], [54.4819515656473, 45.6095638390405], [54.4695053561619, 45.6196495605201], [54.4415228438015, 45.6264735167552], [54.4287332906061, 45.6235550952207], [54.4123386284563, 45.6101646905329], [54.4032400201428, 45.5955725828603], [54.4210080571324, 45.5967313678813], [54.4394627815418, 45.603297816334], [54.4406644845266, 45.5896069859], [54.4368018677898, 45.5726543902216] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 650,
+         "id" : 113348,
+         "pfafstette" : 4253,
+         "altitude" : -21,
+         "objectid" : 64863,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_64863",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 651,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [46.6257324665812, 48.7756220243545], [46.6590368064457, 48.7548068119392], [46.6896802325581, 48.7580685771837], [46.7141434718916, 48.7654933849112], [46.7280488921443, 48.7795275590551], [46.7164610419337, 48.8023599157663], [46.6924269822377, 48.8039049624611], [46.6598951657206, 48.7975960217909], [46.6198956235122, 48.7949351080388], [46.6257324665812, 48.7756220243545] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 651,
+         "id" : 113378,
+         "pfafstette" : 83,
+         "altitude" : -2,
+         "objectid" : 65007,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_65007",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 652,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [35.6495490752609, 51.701554202527], [35.6263733748398, 51.6914255630837], [35.6257725233474, 51.6785930919246], [35.6599352224867, 51.6705245147409], [35.7106642556308, 51.6738291979491], [35.7363291979491, 51.686361243362], [35.7137543490203, 51.6937431331258], [35.6772740798388, 51.6994512223036], [35.6495490752609, 51.701554202527] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 652,
+         "id" : 114065,
+         "pfafstette" : 247531,
+         "lke_type" : "N",
+         "altitude" : 152,
+         "objectid" : 65334,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_65334",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 653,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [47.8304397088445, 48.3778154184215], [47.8159334370994, 48.3792746291888], [47.8041739150339, 48.3817209531221], [47.803143883904, 48.3941671626076], [47.7930152444607, 48.408458844534], [47.7784231367881, 48.4239522294451], [47.7658910913752, 48.4295744826955], [47.7294108221937, 48.4304328419703], [47.6894971159128, 48.4397031221388], [47.6591970335103, 48.4545527375938], [47.6179099523897, 48.4688015015565], [47.5761936916316, 48.4869558002197], [47.5602282091192, 48.5089727156198], [47.5441768906794, 48.5264832448269], [47.5117309100897, 48.5422341375206], [47.4715596960264, 48.5615901391686], [47.4510449093573, 48.5806457150705], [47.4272683574437, 48.5906885185863], [47.4074402581945, 48.6026197125069], [47.4006592199231, 48.6236495147409], [47.3925906427394, 48.6454089223585], [47.377311847647, 48.6510740935726], [47.3466684215345, 48.6531341558323], [47.3434924922175, 48.6668249862662], [47.3538786394433, 48.6903011124336], [47.3381706647134, 48.7176398553378], [47.3310462827321, 48.7372962827321], [47.3249519318806, 48.7566093664164], [47.2930209668559, 48.7721027513276], [47.2509613623878, 48.7572102179088], [47.2226355063175, 48.7224037493133], [47.2072708752976, 48.7072966260758], [47.1892453305255, 48.6963096273576], [47.174309879143, 48.6730910089727], [47.1791166910822, 48.6513745193188], [47.1973139077092, 48.6454089223585], [47.2224638344626, 48.6332631386193], [47.2456395348837, 48.6100445202344], [47.2393735121773, 48.5981562442776], [47.2361117469328, 48.5877700970518], [47.2543089635598, 48.5936927760483], [47.2710469694195, 48.5972978850027], [47.2477854330709, 48.5633497756821], [47.2239230452298, 48.532491759751], [47.2343950283831, 48.5348093297931], [47.259287447354, 48.5457963285113], [47.2931926387109, 48.5395732237685], [47.3122482146127, 48.5205176478667], [47.3217760025636, 48.5130499221754], [47.325896127083, 48.5051530168467], [47.3384281724959, 48.4878570774583], [47.3572262406153, 48.4839944607215], [47.3698441219557, 48.4732649697857], [47.401345907343, 48.4569132255997], [47.4350794268449, 48.4450678676067], [47.4450363944333, 48.4176862067387], [47.4350794268449, 48.3944675883538], [47.4344785753525, 48.3844247848379], [47.4460664255631, 48.38708569859], [47.4591993224684, 48.3879440578648], [47.4698429774767, 48.3703476927303], [47.4955937557224, 48.3513779527559], [47.5297564548618, 48.3477728438015], [47.5574814594397, 48.3457127815418], [47.6076954770189, 48.3377300402856], [47.6401414576085, 48.3356270600623], [47.6834027650613, 48.3367858450833], [47.7378227430873, 48.3338674235488], [47.7529298663248, 48.3192323979125], [47.7754188793261, 48.3103054614539], [47.8141308826222, 48.3088462506867], [47.8405683482879, 48.2999193142282], [47.8561046511628, 48.2951554202527], [47.873100164805, 48.3046832082036], [47.9023702160776, 48.3109063129463], [47.9449448361106, 48.3115500824025], [47.9717256454862, 48.3234383583593], [47.9604811389855, 48.335326634316], [47.9209107764146, 48.3593606940121], [47.9003959897455, 48.3882444836111], [47.8784219923091, 48.3935663111152], [47.8474352224867, 48.3822788866508], [47.8304397088445, 48.3778154184215] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 653,
+         "id" : 112887,
+         "pfafstette" : 71,
+         "altitude" : -16,
+         "objectid" : 65637,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_65637",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 654,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [56.0737788408716, 45.0078110694012], [56.0859675425746, 45.004506386193], [56.1094007507782, 45.0140341741439], [56.134979857169, 45.0256220243545], [56.1294005218824, 45.0426175379967], [56.0797015198681, 45.0437763230178], [56.0559249679546, 45.0291842153452], [56.0678561618751, 45.0196564273942], [56.0737788408716, 45.0078110694012] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 654,
+         "id" : 112790,
+         "pfafstette" : 6131,
+         "altitude" : 72,
+         "objectid" : 65779,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_65779",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 655,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [44.9521893883904, 48.7955359595312], [44.9560520051273, 48.7842485350668], [44.9635197308185, 48.7816305392785], [44.9950215162058, 48.7797850668376], [45, 48.7793988051639], [45.0214589818715, 48.7777250045779], [45.0412870811207, 48.7786262818165], [45.0668661875115, 48.7780254303241], [45.0776815143747, 48.7916733427943], [45.066437007874, 48.8112868522249], [45.0227465207837, 48.8330033418788], [45, 48.8283252838308], [44.966438152353, 48.8214154916682], [44.9521893883904, 48.7955359595312] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 655,
+         "id" : 114743,
+         "pfafstette" : 0,
+         "altitude" : 14,
+         "objectid" : 66399,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_66399",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 656,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [53.5882278886651, 45.4799086705732], [53.6262532045413, 45.4572909036806], [53.6752655191357, 45.4376773942501], [53.7009304614539, 45.4487502288958], [53.6658235671122, 45.4694796053836], [53.6514031312946, 45.4793078190808], [53.6259956967588, 45.5045864997253], [53.5841077641457, 45.5239425013734], [53.5609320637246, 45.5236420756272], [53.5537218458158, 45.5060886284563], [53.5882278886651, 45.4799086705732] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 656,
+         "id" : 114493,
+         "pfafstette" : 0,
+         "altitude" : -28,
+         "objectid" : 67170,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_67170",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 657,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [44.7916762039919, 48.1352430873466], [44.8106459439663, 48.148032640542], [44.830559879143, 48.170907915217], [44.833907480315, 48.1801352774217], [44.8345083318074, 48.1922810611609], [44.836568394067, 48.2199631477751], [44.8220621223219, 48.2454993362022], [44.8100450924739, 48.2458426799121], [44.78832860282, 48.2398770829518], [44.7610327778795, 48.2348127632302], [44.7536508881157, 48.2199631477751], [44.7582860282, 48.1908218503937], [44.7711614173228, 48.1652856619667], [44.7812900567662, 48.149534769273], [44.7916762039919, 48.1352430873466] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 657,
+         "id" : 116513,
+         "pfafstette" : 0,
+         "altitude" : 5,
+         "objectid" : 67871,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_67871",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 658,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [52.1540812122322, 45.1439468503937], [52.1700466947445, 45.1269513367515], [52.1769135689434, 45.1204707242263], [52.1887589269364, 45.1374662378685], [52.1997459256546, 45.1594402353049], [52.1902181377037, 45.1754915537447], [52.1650682109504, 45.1716289370079], [52.1433517212965, 45.1760494872734], [52.1301329884636, 45.1814142327413], [52.1335664255631, 45.1608994460721], [52.1540812122322, 45.1439468503937] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 658,
+         "id" : 117181,
+         "pfafstette" : 0,
+         "altitude" : -19,
+         "objectid" : 68421,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_68421",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 659,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [44.6325363944333, 48.3361849935909], [44.6506477751328, 48.2975588262223], [44.6596605475188, 48.2871297610328], [44.6711625618019, 48.2922369987182], [44.6706475462369, 48.3156702069218], [44.6578579930416, 48.3504766755173], [44.6294463010438, 48.3876865500824], [44.6064422724776, 48.4039953763047], [44.6108199047793, 48.3906478895807], [44.6168284197034, 48.3730515244461], [44.6325363944333, 48.3361849935909] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 659,
+         "id" : 116250,
+         "pfafstette" : 119615,
+         "altitude" : 0,
+         "objectid" : 68783,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_68783",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 660,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [52.5515444744552, 44.4925809146677], [52.5693554294085, 44.4788900842337], [52.6035181285479, 44.4619374885552], [52.6596977430873, 44.4645984023073], [52.69630676616, 44.4675168238418], [52.7155769318806, 44.4758858267717], [52.7308557269731, 44.5023232924373], [52.7141177211133, 44.5157566150888], [52.6814142327412, 44.5163145486175], [52.6528308688885, 44.5276019730819], [52.6321014924006, 44.5282028245743], [52.6023164255631, 44.5216792940853], [52.5747201748764, 44.5321083592749], [52.5476389397546, 44.5362714017579], [52.5278537584691, 44.5211213605567], [52.536394433254, 44.5014649331624], [52.5515444744552, 44.4925809146677] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 660,
+         "id" : 118416,
+         "pfafstette" : 22455,
+         "altitude" : -29,
+         "objectid" : 69263,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_69263",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 661,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [30.1589681377037, 51.3296700466948], [30.1810279710676, 51.3340476789965], [30.1882381889764, 51.3406570454129], [30.1881523530489, 51.3566225279253], [30.1765645028383, 51.3750772523347], [30.1345048983703, 51.4138750915583], [30.1127025727889, 51.4095403772203], [30.124032915217, 51.3944332539828], [30.1369941402674, 51.3803561618751], [30.1376808276872, 51.3603993087347], [30.1503845449551, 51.3500989974364], [30.1589681377037, 51.3296700466948] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 661,
+         "id" : 118347,
+         "pfafstette" : 43113,
+         "lke_type" : "N",
+         "altitude" : 106,
+         "objectid" : 69400,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_69400",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 662,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [44.7878135872551, 47.6937459943234], [44.7773416041018, 47.6779951016297], [44.7874702435451, 47.6595403772203], [44.8261822468412, 47.6437894845266], [44.8490146035525, 47.64589246475], [44.8406026826588, 47.655420252701], [44.8222337941769, 47.6666218412379], [44.8210320911921, 47.6891966901666], [44.8398301593115, 47.703488372093], [44.8569115088812, 47.7118573750229], [44.8412893700787, 47.7355910089727], [44.8076416865043, 47.7638739470793], [44.7885861106024, 47.7668352865776], [44.7957963285113, 47.7422003753891], [44.7990580937557, 47.7154624839773], [44.7878135872551, 47.6937459943234] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 662,
+         "id" : 118070,
+         "pfafstette" : 677,
+         "altitude" : -3,
+         "objectid" : 69517,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_69517",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 663,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [45.0366519410364, 47.5319881889764], [45, 47.5568376899835], [44.9958798754807, 47.5596273576268], [44.9589704266618, 47.5810434215345], [44.942404092657, 47.5864510849661], [44.9291853598242, 47.5810434215345], [44.9163099707013, 47.5938329747299], [44.9034345815785, 47.5991977201978], [44.9054946438381, 47.5837472532503], [44.9680690349753, 47.5548634636514], [45, 47.5415159769273], [45.0291842153452, 47.5292843572606], [45.0387120032961, 47.5052502975646], [45.0515015564915, 47.4832333821644], [45.0749347646951, 47.4644782320088], [45.09081441128, 47.4422038088262], [45.1115867057316, 47.4183843389489], [45.1621440670207, 47.3853804248306], [45.199482695477, 47.3764534883721], [45.1797404321553, 47.3964103415125], [45.1266938289691, 47.428212552646], [45.0948486998718, 47.4564096548251], [45.0746772569127, 47.4787699139352], [45.054419978026, 47.5031902353049], [45.0366519410364, 47.5319881889764] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 663,
+         "id" : 118405,
+         "pfafstette" : 673,
+         "altitude" : -4,
+         "objectid" : 69555,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_69555",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 664,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [37.5975096136239, 49.4360007324666], [37.6344190624428, 49.4538116874199], [37.654075489837, 49.4787470243545], [37.6813713147775, 49.5040257049991], [37.6933883446255, 49.5293473036074], [37.6992251876946, 49.5441969190624], [37.6769078465482, 49.5640250183117], [37.6680667460172, 49.5478020280168], [37.6606848562534, 49.5344116233291], [37.648410318623, 49.5176306995056], [37.6327881798205, 49.5000772523347], [37.6169943691632, 49.4781461728621], [37.5913294268449, 49.4522666407251], [37.5578534151254, 49.4412796420069], [37.5448063541476, 49.4321381157297], [37.5400853781359, 49.4104216260758], [37.53004257462, 49.3768168604651], [37.5413729170482, 49.3447142235854], [37.5546774858084, 49.3280620536532], [37.5644627815418, 49.3170321369712], [37.5558791887932, 49.3051867789782], [37.5161371543673, 49.2899938198132], [37.4902147042666, 49.2742429271196], [37.496824070683, 49.2605520966856], [37.5136479124702, 49.2438999267533], [37.5163946621498, 49.2284065418421], [37.5146779436001, 49.2129989928584], [37.5294417231276, 49.2049733336385], [37.5476389397546, 49.2094368018678], [37.5652353048892, 49.2129989928584], [37.578282365867, 49.2257885460538], [37.5698704449734, 49.2415823567112], [37.5383686595861, 49.2525693554294], [37.5351927302692, 49.2697794588903], [37.5717588353781, 49.2872899880974], [37.6171660410181, 49.3105944424098], [37.6135609320637, 49.3292208386742], [37.5969087621315, 49.3313238188976], [37.5769948269548, 49.3342851583959], [37.5635185863395, 49.3503364768357], [37.5598276414576, 49.3714521149972], [37.5644627815418, 49.3987908579015], [37.5762223036074, 49.4178464338033], [37.5975096136239, 49.4360007324666] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 664,
+         "id" : 119107,
+         "pfafstette" : 481131,
+         "lke_type" : "N",
+         "altitude" : 94,
+         "objectid" : 69774,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_69774",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 665,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [52.1804328419703, 44.4892762314595], [52.2114196117927, 44.4878170206922], [52.2497453534151, 44.4871732512361], [52.2863972944515, 44.4773450375389], [52.3081137841055, 44.473825764512], [52.3276414576085, 44.4732678309833], [52.3600016022706, 44.4898770829518], [52.3734349249222, 44.5100914438748], [52.3555810520051, 44.5219797198315], [52.3406885185863, 44.5312070820363], [52.3266543444424, 44.5397906747849], [52.2991010117194, 44.53893231551], [52.2700455502655, 44.5365718275041], [52.2500028611976, 44.5341684215345], [52.2280288637612, 44.5254989928585], [52.2026643471891, 44.5142974043216], [52.1828791659037, 44.5032245696759], [52.1804328419703, 44.4892762314595] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 665,
+         "id" : 118936,
+         "pfafstette" : 224753,
+         "altitude" : -26,
+         "objectid" : 69942,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_69942",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 666,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [53.1906787905145, 44.0403543307087], [53.1696919062443, 44.0340453900385], [53.1799492995788, 44.0138739470793], [53.2144982603918, 44.0097109045962], [53.2486609595312, 44.0108696896173], [53.2597767121406, 44.01709279436], [53.2368156015382, 44.0293244140267], [53.1906787905145, 44.0403543307087] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 666,
+         "id" : 119174,
+         "pfafstette" : 22579,
+         "altitude" : 5,
+         "objectid" : 69960,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_69960",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 667,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [52.3452378227431, 44.8463107718367], [52.320216649881, 44.8383280305805], [52.3267830983336, 44.8225771378868], [52.3525338765794, 44.8106888619301], [52.3823189434169, 44.806525819447], [52.41652456052, 44.8136502014283], [52.4450650064091, 44.832405351584], [52.4262669382897, 44.846096182018], [52.3962672816334, 44.8436927760484], [52.3798726194836, 44.8427914988098], [52.3452378227431, 44.8463107718367] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 667,
+         "id" : 117836,
+         "pfafstette" : 931,
+         "altitude" : -34,
+         "objectid" : 70210,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_70210",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 668,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [36.9074745925654, 49.9708443966306], [36.907217084783, 49.992818394067], [36.892367469328, 50.0159940944882], [36.8503937007874, 50.0294274171397], [36.8302222578282, 50.0468091924556], [36.8144284471708, 50.0766800952206], [36.8174327046328, 50.1257353277788], [36.8206944698773, 50.1465076222304], [36.8091066196667, 50.1349626899835], [36.8042139718, 50.1233748397729], [36.7934844808643, 50.1118728254898], [36.7897077000549, 50.0846628364768], [36.7903943874748, 50.0514443325398], [36.8097074711591, 50.0255218824391], [36.8355440853324, 50.0059083730086], [36.8486769822377, 49.9913591832998], [36.8575180827687, 49.9797284151254], [36.8679042299945, 49.9628187374107], [36.889191540011, 49.9488703991943], [36.9055003662333, 49.9348791430141], [36.9274743636696, 49.9200295275591], [36.9343412378685, 49.8919182613074], [36.95545687603, 49.8790428721846], [36.9933963559788, 49.9004160181285], [36.9976023164255, 49.9221325077825], [36.9726240615272, 49.9372825489837], [36.9551135323201, 49.9482695477019], [36.937259659403, 49.9586986128914], [36.9074745925654, 49.9708443966306] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 668,
+         "id" : 117806,
+         "pfafstette" : 49753,
+         "lke_type" : "N",
+         "altitude" : 98,
+         "objectid" : 70407,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_70407",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 669,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [36.423445797473, 49.1127855475188], [36.4450764511994, 49.106562442776], [36.4682521516206, 49.1107254852591], [36.4918570316792, 49.1080216535433], [36.5024148507599, 49.12025327321], [36.4876510712324, 49.1320986312031], [36.477522431789, 49.1393088491119], [36.4653337300861, 49.1573343938839], [36.4502266068486, 49.1645446117927], [36.4555484343527, 49.1532142693646], [36.4629303241164, 49.1399097006043], [36.4394971159128, 49.1300814869072], [36.423445797473, 49.1127855475188] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 669,
+         "id" : 120982,
+         "pfafstette" : 492663,
+         "lke_type" : "N",
+         "altitude" : 128,
+         "objectid" : 71174,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_71174",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 670,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [53.7835904596228, 43.633320362571], [53.8293410089727, 43.6205308093756], [53.8869798342795, 43.62379257462], [53.8647483290606, 43.6362387841055], [53.8370662424465, 43.6440498535067], [53.8135901162791, 43.6443073612892], [53.7835904596228, 43.633320362571] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 670,
+         "id" : 119437,
+         "pfafstette" : 226933,
+         "altitude" : -14,
+         "objectid" : 71857,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_71857",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 671,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [51.8933116645303, 43.3722503891229], [51.8762303149606, 43.395769433254], [51.8694063587255, 43.4234086019044], [51.8745135964109, 43.434996452115], [51.8925820591467, 43.4510477705549], [51.8890627861197, 43.4730217679912], [51.8640416132576, 43.4896739379235], [51.8510803882073, 43.4956824528475], [51.8376470655557, 43.4980429408533], [51.82726091833, 43.4929786211317], [51.810565830434, 43.4718629829702], [51.777003982787, 43.4727642602088], [51.754643723677, 43.4790302829152], [51.7285066837575, 43.4834508331807], [51.6979061756088, 43.4834508331807], [51.6985070271013, 43.4682578740158], [51.7131420527376, 43.4429791933712], [51.7300088124885, 43.4133228804248], [51.7478197674418, 43.392765175792], [51.75915010987, 43.3832373878411], [51.7796648965391, 43.3722503891229], [51.7927548754807, 43.3493751144479], [51.772840940304, 43.3309203900385], [51.7676049487273, 43.3095901620582], [51.7945574299579, 43.2893328831716], [51.8186344076176, 43.2967576908991], [51.8447285295733, 43.2967576908991], [51.8762303149606, 43.2756420527376], [51.9009081441128, 43.274740775499], [51.8915091100531, 43.2889895394616], [51.8641274491851, 43.3053842016114], [51.8647712186413, 43.3246972852957], [51.8896636376121, 43.3402335881707], [51.9051570225233, 43.3555982191906], [51.8933116645303, 43.3722503891229] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 671,
+         "id" : 122176,
+         "pfafstette" : 195,
+         "altitude" : -134,
+         "objectid" : 71872,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_71872",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 672,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [51.1711740065922, 43.741816974913], [51.2043495925654, 43.7379114402124], [51.2355938701703, 43.7492847006043], [51.2439199551364, 43.7786835057682], [51.2391560611609, 43.8087260803882], [51.2064525727888, 43.8200564228163], [51.1711740065922, 43.8173955090643], [51.158684879143, 43.8060222486724], [51.1606591054752, 43.7861512314594], [51.1643071323933, 43.7605721250687], [51.1711740065922, 43.741816974913] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 672,
+         "id" : 122075,
+         "pfafstette" : 717,
+         "altitude" : -33,
+         "objectid" : 71907,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_71907",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 673,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [52.90797816334, 42.8986935771837], [52.9421408624794, 42.8751316150888], [52.9645011215894, 42.8653463193554], [52.9751018586339, 42.8844018952573], [52.9727842885918, 42.9051741897089], [52.9493510803882, 42.9198092153452], [52.9052743316242, 42.9337146355979], [52.8684078007691, 42.9459462552646], [52.8364339177806, 42.9551306995056], [52.8164341466764, 42.9441007828237], [52.8332579884636, 42.9209250824025], [52.8686653085515, 42.9096805759019], [52.90797816334, 42.8986935771837] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 673,
+         "id" : 122330,
+         "pfafstette" : 21,
+         "altitude" : -58,
+         "objectid" : 72100,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_72100",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 674,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [53.4375, 42.7646607764146], [53.4047965116279, 42.7675791979491], [53.3842817249588, 42.760755241714], [53.3985734068852, 42.7458627082952], [53.4277576222303, 42.7377941311115], [53.4375, 42.7372361975829], [53.4638945477019, 42.7357340688519], [53.5002460629921, 42.7359486586706], [53.5246663843619, 42.7490815555759], [53.5371125938473, 42.7690384087164], [53.5293015244461, 42.7808837667094], [53.5100313587255, 42.7707980452298], [53.4931645989746, 42.7583089177806], [53.4550963651346, 42.7630728117561], [53.4375, 42.7646607764146] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 674,
+         "line::hidden" : [
+            { "contour" : 0, "segments" : [ { "from" : 6, "to" : 7 } ] }
+         ],
+         "id" : 122038,
+         "pfafstette" : 455,
+         "altitude" : -6,
+         "objectid" : 72124,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_72124",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 675,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [51.3093269318806, 43.4971416636147], [51.3188547198315, 43.4781719236404], [51.337309444241, 43.4724638344626], [51.3428887795275, 43.4980429408533], [51.3289833592748, 43.5402312992126], [51.299584554111, 43.5746944240982], [51.276365935726, 43.5854668329976], [51.2805289782091, 43.572376854056], [51.2897992583776, 43.5512612158945], [51.2997991439297, 43.5233216214979], [51.3093269318806, 43.4971416636147] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 675,
+         "id" : 122572,
+         "pfafstette" : 1,
+         "altitude" : -30,
+         "objectid" : 72830,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_72830",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 676,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [43.4977854330709, 45.990417849295], [43.5355532411646, 45.9880573612891], [43.5595873008606, 45.9847526780809], [43.5749519318806, 45.9913191265336], [43.5705742995788, 46.0070700192272], [43.5506603644021, 46.0150956784472], [43.4852533876579, 46.0281856573888], [43.4438804706098, 46.0391726561069], [43.4065418421534, 46.0477991668193], [43.3583020509064, 46.066210973265], [43.3357272019777, 46.1010174418605], [43.3106631111518, 46.1372831212232], [43.2892899652078, 46.1381843984618], [43.2625949917597, 46.1351801409998], [43.2265439022157, 46.1390427577367], [43.2001064365501, 46.1429482924373], [43.1727247756821, 46.152175654642], [43.1466306537264, 46.1586991851309], [43.1198498443508, 46.1672827778795], [43.0883480589636, 46.1830336705732], [43.0720392327413, 46.2056943554294], [43.0778760758103, 46.2146212918879], [43.0971891594946, 46.2181405649149], [43.0995925654642, 46.227968778612], [43.0565029298663, 46.232131821095], [43.0205376762498, 46.2318313953488], [42.9991645303058, 46.233633949826], [42.9680060886285, 46.2318313953488], [42.9538431605933, 46.2437196713056], [42.9529848013184, 46.2618310520051], [42.9983061710309, 46.2583117789782], [43.0663740615272, 46.2520886742355], [43.0805369895623, 46.259513481963], [43.0466317982055, 46.2678395669291], [42.9846582585607, 46.2749210309467], [42.9480063175243, 46.2874959943234], [42.9424269822377, 46.3020022660685], [42.9364184673137, 46.3135901162791], [42.9219121955686, 46.3350490981505], [42.8950455502655, 46.3659071140817], [42.8720415216993, 46.3795979445157], [42.8370204632851, 46.3870227522432], [42.7865489379234, 46.3932458569859], [42.7556480040286, 46.3983101767076], [42.7371932796191, 46.4111426478667], [42.6895543398645, 46.4134602179088], [42.6340184947812, 46.4111426478667], [42.5945339681377, 46.4387818165171], [42.5668947994873, 46.4718286485992], [42.5561653085515, 46.4883949826039], [42.568611518037, 46.4937597280718], [42.5814010712324, 46.5056050860648], [42.5451783098334, 46.5192959164988], [42.4948784563267, 46.5204976194836], [42.4812305438564, 46.5306262589269], [42.4963376670939, 46.5345317936275], [42.5098139077092, 46.5413986678264], [42.4729044588903, 46.5532440258194], [42.4327332448269, 46.546634659403], [42.402347326497, 46.5362485121773], [42.3566826130745, 46.5389523438931], [42.3088720014649, 46.5440166636147], [42.2514477659769, 46.5597675563084], [42.2190017853873, 46.5832436824757], [42.1982294909357, 46.5903251464933], [42.1614058780443, 46.5811836202161], [42.1322216626991, 46.5722566837576], [42.093509659403, 46.5654327275224], [42.0423514466215, 46.5645314502838], [41.997201748764, 46.567836133492], [41.9680175334188, 46.5710549807728], [41.951451199414, 46.5704541292804], [41.9578888939755, 46.5603684078008], [41.9960000457792, 46.5571495605201], [42.0483599615455, 46.5502826863212], [42.0949688701703, 46.5493814090826], [42.1262131477751, 46.5535444515656], [42.1541956601355, 46.5559049395715], [42.1845815784655, 46.557664576085], [42.2099890130013, 46.5565057910639], [42.2358256271745, 46.5538448773119], [42.259773850943, 46.5434587300861], [42.2822628639443, 46.5344888756638], [42.3080994781176, 46.5329867469328], [42.3343652719282, 46.5261198727339], [42.3795149697858, 46.5116136009888], [42.411360098883, 46.4941030717817], [42.4286131203076, 46.4741462186413], [42.4677543032412, 46.4634596456693], [42.4878399102728, 46.445305347006], [42.4514454770189, 46.4262926890679], [42.4074974821461, 46.4170653268632], [42.3832917505951, 46.4102413706281], [42.3745364859916, 46.400413156931], [42.3679271195752, 46.3917866462186], [42.3598585423915, 46.3771945385461], [42.3735064548617, 46.3573235213331], [42.3878410547519, 46.3590831578465], [42.3797724775682, 46.3712289415858], [42.3847509613624, 46.386722326497], [42.4362525178539, 46.3995547976561], [42.4856081761582, 46.3991685359824], [42.5145348837209, 46.3864219007508], [42.5312728895807, 46.365349180553], [42.5480967313679, 46.3483965848746], [42.5876670939388, 46.3245771149973], [42.6191688793261, 46.3094699917598], [42.6411428767625, 46.3053069492767], [42.6584817341146, 46.3005430553012], [42.6388253067204, 46.3171523072697], [42.6174521607764, 46.3364224729903], [42.6518723676982, 46.3343624107306], [42.7062923457242, 46.3275384544955], [42.7490386376122, 46.3206715802966], [42.7873214612708, 46.3144484755539], [42.8068062168101, 46.3040623283281], [42.8305827687237, 46.2874101583959], [42.8577069218092, 46.2737622459257], [42.8819984892877, 46.2570671580297], [42.9143586339498, 46.2377969923091], [42.9301524446072, 46.2146212918879], [42.9506672312763, 46.1943210950375], [42.9777913843618, 46.1792139718], [43.016331715803, 46.1640639305988], [43.0607088903131, 46.1479696941952], [43.0995925654642, 46.1367251876946], [43.1617377769639, 46.1220901620582], [43.2143552005127, 46.1120044405787], [43.2441402673503, 46.0986569538546], [43.2804488646768, 46.0724340780077], [43.3080880333272, 46.0531209943234], [43.3271436092291, 46.04333569859], [43.3601046053836, 46.0275848058964], [43.4191597234939, 46.0034649102728], [43.4977854330709, 45.990417849295] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 676,
+         "id" : 123797,
+         "name" : "Manych-Gudilo",
+         "lge_id" : "ru",
+         "pfafstette" : 239,
+         "lke_type" : "N",
+         "altitude" : 11,
+         "objectid" : 74043,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 677,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [35.1574517029848, 48.5161400155649], [35.1640610694012, 48.4994020097052], [35.1715287950925, 48.4920201199414], [35.1808849111884, 48.5051530168467], [35.198481276323, 48.5175992263322], [35.2184810474272, 48.5273416041018], [35.2172793444424, 48.5494443554294], [35.2140175791979, 48.5785427348471], [35.1995113074528, 48.5952378227431], [35.1808849111884, 48.582405351584], [35.1634602179088, 48.5559249679546], [35.1492114539462, 48.5333501190258], [35.1574517029848, 48.5161400155649] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 677,
+         "id" : 123707,
+         "pfafstette" : 12115,
+         "altitude" : 49,
+         "objectid" : 74128,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_74128",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 678,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [42.4330765885369, 46.3037619025819], [42.4116176066654, 46.2901139901117], [42.4214029023988, 46.2716592657023], [42.4638916865043, 46.2609726927303], [42.5000286119758, 46.2722171992309], [42.5209725782824, 46.2912727751328], [42.5180541567478, 46.3047060977843], [42.4758228804248, 46.3099850073247], [42.4330765885369, 46.3037619025819] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 678,
+         "id" : 124541,
+         "pfafstette" : 24251,
+         "lke_type" : "N",
+         "altitude" : 12,
+         "objectid" : 74287,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_74287",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 679,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [44.6218069034975, 45.4733851400842], [44.6388882530672, 45.4684066562901], [44.6587163523164, 45.4858313495697], [44.6654973905878, 45.5203803103827], [44.6582013367515, 45.5328265198682], [44.6301329884636, 45.5375904138436], [44.6058414209852, 45.5319681605933], [44.5894467588354, 45.5224832906061], [44.5662710584142, 45.5266034151254], [44.5385460538363, 45.5349295000916], [44.5026666361472, 45.5326119300494], [44.4753708112067, 45.5340711408167], [44.4533968137704, 45.5388350347922], [44.4128822559971, 45.55188209577], [44.370650979674, 45.5676329884636], [44.3192352591101, 45.5845855841421], [44.2607809924922, 45.6041990935726], [44.207734389306, 45.6285335790148], [44.1770051272661, 45.6401643471892], [44.2038717725691, 45.6116239013001], [44.265158624794, 45.5831263733748], [44.3066173777696, 45.5676329884636], [44.3322823200879, 45.5584056262589], [44.3699642922542, 45.5498220335104], [44.407217084783, 45.5334702893243], [44.4479891503388, 45.5147151391687], [44.4892762314594, 45.5060886284563], [44.5055850576817, 45.5034277147043], [44.5236964383812, 45.4938999267533], [44.5448120765428, 45.4825695843252], [44.5829232283465, 45.4736426478667], [44.6218069034975, 45.4733851400842] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 679,
+         "id" : 124703,
+         "name" : "Manych Reservoir",
+         "lge_id" : "ru",
+         "pfafstette" : 391,
+         "altitude" : 22,
+         "objectid" : 74468,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 680,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [51.4636170115363, 43.2385180141], [51.4892819538546, 43.2286468824391], [51.5263630745285, 43.2283893746567], [51.5605686916316, 43.2438398416041], [51.5754612250503, 43.2607495193188], [51.561169543124, 43.2706206509797], [51.5364917139718, 43.2845689891961], [51.5031873741073, 43.3023799441494], [51.4694967725691, 43.3035816471342], [51.4572651529024, 43.2702773072697], [51.4636170115363, 43.2385180141] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 680,
+         "id" : 123104,
+         "pfafstette" : 133,
+         "altitude" : -41,
+         "objectid" : 74748,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_74748",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 681,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [41.1120616645303, 47.0696329655741], [41.0886284563267, 47.0782594762864], [41.062534334371, 47.0842250732467], [41.0412470243545, 47.0916927989379], [41.001762497711, 47.1142676478667], [40.9755825398279, 47.1428080937557], [41.0112044497345, 47.1606619666728], [41.050345632668, 47.1823784563267], [41.0263974088995, 47.1817776048343], [40.9859686870536, 47.1644816654459], [40.9521493316242, 47.1496749679546], [40.9066562900568, 47.1433660272844], [40.8686309741806, 47.1531942409815], [40.8332665720564, 47.1540526002564], [40.7939537172679, 47.13976091833], [40.7767865317707, 47.1190315418422], [40.7832242263322, 47.1049973676982], [40.8005630836843, 47.1049973676982], [40.8076016297381, 47.0979159036807], [40.8130092931697, 47.0863280534701], [40.8229662607581, 47.0943107947262], [40.835841649881, 47.109203328145], [40.8433093755722, 47.1264563495697], [40.8948109320637, 47.1237954358176], [40.9515484801318, 47.1041390084234], [40.9755825398279, 47.0949116462186], [41.0024491851309, 47.0854696941952], [41.0270840963194, 47.0738389260209], [41.0488005859733, 47.0610493728255], [41.0776414576085, 47.0479593938839], [41.1195293902216, 47.0434530076909], [41.1472543947995, 47.0419937969236], [41.1724901574803, 47.0247836934627], [41.2048503021425, 47.006371887017], [41.2309444240981, 47.0071873283282], [41.2737765519136, 46.989676799121], [41.3187545779161, 46.9632822514192], [41.3407285753525, 46.9486043078191], [41.3593549716169, 46.9456858862846], [41.3730887200146, 46.9489905694928], [41.3891400384545, 46.9471450970518], [41.4111140358909, 46.9471450970518], [41.4299121040102, 46.934098036074], [41.4453625709577, 46.9215659906611], [41.4645898187145, 46.9043129692364], [41.4833878868339, 46.8829398232924], [41.4995250412012, 46.8636696575719], [41.501241759751, 46.8306228254898], [41.5090528291522, 46.7931554431423], [41.5208981871452, 46.7699797427211], [41.5285375846914, 46.7518254440579], [41.5726572514192, 46.7277484663981], [41.6052749038638, 46.7253450604285], [41.5755756729537, 46.7408384453397], [41.5380653726424, 46.7681771882439], [41.5307693188061, 46.7970180598791], [41.5235591008973, 46.8133698040652], [41.5185806171031, 46.8338845907343], [41.519095632668, 46.8589057635964], [41.5036451657206, 46.8832402490386], [41.4917139718, 46.9001499267533], [41.4624439205274, 46.9299349935909], [41.4140324574254, 46.9602779939572], [41.3870799761948, 46.9637972669841], [41.3491404962461, 46.9679603094671], [41.3100851492401, 46.9947411188427], [41.2812442776048, 47.0146550540194], [41.2328328145028, 47.0289467359458], [41.1930049441494, 47.0432384178722], [41.1760094305072, 47.0488177531588], [41.1522328785937, 47.0607489470793], [41.1242503662333, 47.0648690715986], [41.1120616645303, 47.0696329655741] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 681,
+         "id" : 123033,
+         "name" : "Veselovskoe Reservoir",
+         "lge_id" : "ru",
+         "pfafstette" : 21315,
+         "lke_type" : "R",
+         "altitude" : 6,
+         "objectid" : 74879,
+         "scalerank" : 10,
+         "featurecla" : "Reservoir",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 682,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.290262772386, 48.0267464750046], [33.2846834370994, 48.0243001510712], [33.2791041018129, 48.00915010987], [33.260391869621, 47.9785066837575], [33.2445980589636, 47.9414255630837], [33.2302634590734, 47.9369620948544], [33.1973024629189, 47.9420264145761], [33.1736117469328, 47.9526271516206], [33.157217084783, 47.9648587712873], [33.1518952572789, 47.9824122184582], [33.1508652261491, 48.0011244506501], [33.142367469328, 47.9826697262406], [33.1530969602637, 47.957391045596], [33.1640839589819, 47.9437431331258], [33.2014225874382, 47.9229708386742], [33.2615077366783, 47.9134430507233], [33.2856276323018, 47.9282926661783], [33.2775590551181, 47.9517687923457], [33.2739539461637, 47.9842147729354], [33.2873443508515, 48.0115535158396], [33.290262772386, 48.0267464750046] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 682,
+         "id" : 126220,
+         "pfafstette" : 1145,
+         "lke_type" : "N",
+         "altitude" : 92,
+         "objectid" : 75954,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_75954",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 683,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [45.09047106757, 45.2566065052188], [45.1035181285479, 45.2450186550082], [45.1162218458158, 45.2346325077825], [45.1344190624428, 45.2346325077825], [45.1416292803516, 45.250726744186], [45.1151059787585, 45.270941105109], [45.0658361563816, 45.2905546145395], [45.0459222212049, 45.2923571690167], [45.0622310474272, 45.2712415308551], [45.09047106757, 45.2566065052188] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 683,
+         "id" : 124979,
+         "pfafstette" : 223,
+         "altitude" : 11,
+         "objectid" : 76613,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_76613",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 684,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [38.8859927211133, 45.8958695751694], [38.8685680278337, 45.8845392327413], [38.8834176432888, 45.8598614035891], [38.9128593664164, 45.8509773850943], [38.9294257004212, 45.8705908945248], [38.933631660868, 45.8941099386559], [38.9167219831533, 45.90745742538], [38.9006706647134, 45.9041956601355], [38.8859927211133, 45.8958695751694] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 684,
+         "id" : 127744,
+         "pfafstette" : 17,
+         "lke_type" : "N",
+         "altitude" : -2,
+         "objectid" : 76762,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_76762",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 685,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [41.7163465940304, 45.0494414942318], [41.7148873832631, 45.0274245788317], [41.7383205914668, 45.0099140496246], [41.761152948178, 45.0250211728621], [41.7675906427394, 45.0366090230727], [41.7878479216261, 45.0532182750412], [41.7929980772752, 45.0767802371361], [41.7687923457242, 45.0890118568028], [41.7426982237685, 45.0803424281267], [41.7163465940304, 45.0494414942318] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 685,
+         "id" : 127693,
+         "pfafstette" : 29981,
+         "lke_type" : "N",
+         "altitude" : 229,
+         "objectid" : 76947,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_76947",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 686,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [38.3467714246475, 46.226466649881], [38.4133801043765, 46.1922610327779], [38.4557830525545, 46.1896001190258], [38.4514054202527, 46.2214452481231], [38.4439376945614, 46.2481831395349], [38.4348390862479, 46.2594705639993], [38.4106333546969, 46.2728180507233], [38.3782732100348, 46.2989980086065], [38.3261708020509, 46.3198132210218], [38.2908063999267, 46.3099850073247], [38.2917505951291, 46.2775819446988], [38.3066860465116, 46.2523461820179], [38.3467714246475, 46.226466649881] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 686,
+         "id" : 127386,
+         "name" : "Beysugskiy Liman",
+         "lge_id" : "ru",
+         "pfafstette" : 1,
+         "lke_type" : "N",
+         "altitude" : -3,
+         "objectid" : 77093,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 687,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [38.7084840230727, 46.1604588216444], [38.7237628181652, 46.1625618018678], [38.7561229628273, 46.172046671855], [38.7743201794543, 46.1877975645486], [38.761015610694, 46.2053080937557], [38.7397283006775, 46.212775819447], [38.7181834828786, 46.2059518632119], [38.7059089452481, 46.1806731825673], [38.7084840230727, 46.1604588216444] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 687,
+         "id" : 127380,
+         "pfafstette" : 535,
+         "lke_type" : "N",
+         "altitude" : -2,
+         "objectid" : 77123,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_77123",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 688,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [38.6162104010254, 46.1771109915766], [38.6328625709577, 46.175050929317], [38.6633343252152, 46.1854370765428], [38.6784414484527, 46.2038488829885], [38.6601583958982, 46.2195997756821], [38.6262532045413, 46.2193851858634], [38.6098585423915, 46.194406930965], [38.6162104010254, 46.1771109915766] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 688,
+         "id" : 127397,
+         "pfafstette" : 531,
+         "lke_type" : "N",
+         "altitude" : -2,
+         "objectid" : 77133,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_77133",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 689,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.604593938839, 47.5361512314594], [33.6251087255082, 47.5230612525179], [33.6545504486358, 47.5210011902582], [33.665537447354, 47.5233187603003], [33.6597006042849, 47.5459794451566], [33.6365249038638, 47.5655500366233], [33.6118041567479, 47.5626316150888], [33.604593938839, 47.5361512314594] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 689,
+         "id" : 127252,
+         "pfafstette" : 115873,
+         "lke_type" : "N",
+         "altitude" : 86,
+         "objectid" : 77405,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_77405",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 690,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [46.8849998855521, 42.9608387886834], [46.9025962506867, 42.9399377403406], [46.9257719511079, 42.9444441265336], [46.9316517121406, 42.9661176982238], [46.914570362571, 42.984271996887], [46.8947851812855, 42.9946152261491], [46.8757296053836, 42.9798085286578], [46.8849998855521, 42.9608387886834] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 690,
+         "id" : 128196,
+         "pfafstette" : 2591,
+         "altitude" : 331,
+         "objectid" : 77543,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_77543",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 691,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [35.3825993407801, 46.5493814090826], [35.3765908258561, 46.5719562580114], [35.3682647408899, 46.5981362158945], [35.3618270463285, 46.6129858313496], [35.3569343984618, 46.6382645119941], [35.3504967039004, 46.6614402124153], [35.3496383446255, 46.6718692776048], [35.3474066105109, 46.6884785295733], [35.3213124885552, 46.6992080205091], [35.2995959989013, 46.7072765976927], [35.2892098516755, 46.70873580846], [35.2868922816334, 46.6929849157663], [35.2858622505036, 46.6756460584142], [35.2808837667094, 46.6546162561802], [35.2895531953855, 46.6356465162058], [35.2886090001831, 46.6159900888116], [35.2807979307819, 46.5909689159495], [35.2910124061527, 46.5735013047061], [35.2978792803516, 46.5303258331807], [35.3074070683025, 46.4869357718367], [35.3239734023073, 46.4586099157663], [35.3430289782091, 46.4328162195569], [35.3641446163706, 46.4084388161509], [35.3777925288409, 46.3881815372642], [35.395303058048, 46.4078379646585], [35.4217405237136, 46.4399406015382], [35.4565899102728, 46.4536314319722], [35.4868041567478, 46.4637600714155], [35.4975336476836, 46.4780517533419], [35.4910959531221, 46.4913563221022], [35.479765610694, 46.4886954083501], [35.4637142922542, 46.4738887108588], [35.434358405054, 46.4777084096319], [35.4158178447171, 46.5045321369712], [35.3977064640176, 46.5321283876579], [35.3825993407801, 46.5493814090826] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 691,
+         "id" : 128011,
+         "name" : "Molochnyy Liman",
+         "lge_id" : "ru",
+         "pfafstette" : 13,
+         "lke_type" : "N",
+         "altitude" : 0,
+         "objectid" : 77598,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 692,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [38.1870307635964, 45.9472852957334], [38.1948418329976, 45.9484869987182], [38.2209359549533, 45.94518231551], [38.2536394433254, 45.9472852957334], [38.2544119666728, 45.9669417231276], [38.2335538362937, 45.9811904870903], [38.2107214795825, 45.9794308505768], [38.1921809192456, 45.9764265931148], [38.1838548342794, 45.9639374656656], [38.1870307635964, 45.9472852957334] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 692,
+         "id" : 127927,
+         "pfafstette" : 5,
+         "lke_type" : "N",
+         "altitude" : -3,
+         "objectid" : 77671,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_77671",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 693,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [38.1726103277788, 45.8212352362205], [38.1847131935543, 45.80162172679], [38.1760437648782, 45.7900338765794], [38.1573315326863, 45.8066431285479], [38.1517521973997, 45.8370290468779], [38.1460870261857, 45.8596468137704], [38.1338983244827, 45.8783161279985], [38.123168833547, 45.9008909769273], [38.1211087712873, 45.913465940304], [38.1161302874931, 45.9267705090643], [38.0976755630837, 45.9180152444607], [38.0932979307819, 45.9019210080571], [38.0889202984801, 45.8893031267167], [38.1029973905878, 45.8658699185131], [38.1041132576451, 45.8625652353049], [38.1205079197949, 45.8643677897821], [38.1382759567845, 45.8444109366416], [38.1372459256546, 45.8144112799854], [38.1395634956967, 45.7908922358542], [38.1538122596594, 45.7733817066471], [38.16505676616, 45.76355349295], [38.1826531312946, 45.7730812809009], [38.1981035982421, 45.7769868156015], [38.2103781358725, 45.7748409174144], [38.231493774034, 45.7751413431606], [38.2579312396997, 45.7799052371361], [38.2673731917231, 45.8069435542941], [38.2596479582494, 45.8334239379235], [38.2394765152902, 45.8501190258194], [38.2429099523897, 45.8661703442593], [38.2581029115547, 45.8780586202161], [38.2361289141183, 45.8804191082219], [38.2011936916316, 45.8893460446805], [38.1797347097601, 45.9101612570958], [38.1635975553928, 45.9229937282549], [38.1502929866325, 45.9327361060245], [38.1376751052921, 45.925311298297], [38.1306365592382, 45.8997321919062], [38.1502929866325, 45.8681874885552], [38.1606791338583, 45.845355131844], [38.1586190715986, 45.8328230864311], [38.1726103277788, 45.8212352362205] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 693,
+         "id" : 128078,
+         "name" : "Liman in Primorsko-Akhtarsk area",
+         "lge_id" : "ru",
+         "pfafstette" : 1,
+         "lke_type" : "N",
+         "altitude" : -5,
+         "objectid" : 77868,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 694,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [37.7439457059147, 45.4951445477019], [37.7527009705182, 45.4707242263322], [37.7753616553745, 45.467419543124], [37.7729582494049, 45.4870759705182], [37.7787950924739, 45.5043289919429], [37.7920138253067, 45.5197794588903], [37.7712415308551, 45.5301656061161], [37.7472933070866, 45.5444572880425], [37.7307269730818, 45.5506803927852], [37.7187957791613, 45.5399938198132], [37.729868613807, 45.5310668833547], [37.7458340963193, 45.5167752014283], [37.7439457059147, 45.4951445477019] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 694,
+         "id" : 129225,
+         "pfafstette" : 0,
+         "lke_type" : "N",
+         "altitude" : -3,
+         "objectid" : 78488,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_78488",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 695,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [42.2299887841055, 44.2181634544955], [42.2575850347922, 44.2133995605201], [42.2954386788134, 44.2187643059879], [42.3159105475188, 44.2312105154734], [42.3161680553012, 44.2520257278887], [42.2732071735946, 44.2656736403589], [42.2287870811207, 44.2440429866325], [42.2299887841055, 44.2181634544955] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 695,
+         "id" : 128995,
+         "pfafstette" : 95225,
+         "altitude" : 620,
+         "objectid" : 78830,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_78830",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 696,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [39.493196072148, 45.1439468503937], [39.4822090734298, 45.1178098104743], [39.4999771104193, 45.0964366645303], [39.5187751785387, 45.0928315555759], [39.5681308368431, 45.1397838079106], [39.5961133492034, 45.1834742950009], [39.5732809924922, 45.1896973997436], [39.547616050174, 45.1875515015565], [39.5271012635048, 45.1642041292803], [39.493196072148, 45.1439468503937] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 696,
+         "id" : 128812,
+         "pfafstette" : 195,
+         "altitude" : 24,
+         "objectid" : 78833,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_78833",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 697,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [39.375, 44.9764809558689], [39.3684335515473, 44.9851933025087], [39.375, 44.9884121497894], [39.3847852957334, 44.9931760437649], [39.4028537584691, 44.9989270509064], [39.4064588674235, 45], [39.4065017853873, 45], [39.4313942043582, 45.007510643655], [39.4438404138436, 45.0333472578282], [39.4463296557407, 45.0571238097418], [39.4426387108588, 45.0894410364402], [39.4040983794177, 45.0877672358542], [39.3932830525545, 45.0838617011536], [39.375, 45.0806428538729], [39.3546568851859, 45.0770377449185], [39.3227259201611, 45.0589692821828], [39.3047003753891, 45.0426175379967], [39.2786062534334, 45.0357935817616], [39.2636708020509, 45.03038591833], [39.2459027650613, 45.0271241530855], [39.217920252701, 45.0244203213697], [39.1917402948178, 45.0209010483428], [39.1653028291522, 45.0223602591101], [39.1489081670024, 45.0158796465849], [39.130110098883, 45.0081114951474], [39.1231573887566, 45], [39.0942306811939, 44.9664381523531], [39.1110974409449, 44.9527473219191], [39.1162046786303, 44.9385414759202], [39.1355177623146, 44.9311166681927], [39.1533287172679, 44.92455021974], [39.1692083638528, 44.9171254120125], [39.1970192043582, 44.9179837712873], [39.2407526094122, 44.9251081532686], [39.2714818714521, 44.9409448818898], [39.2931125251785, 44.9512881111518], [39.3246143105658, 44.9643780900934], [39.3454724409449, 44.9664810703168], [39.3612233336385, 44.9536915171214], [39.375, 44.9518460446805], [39.3881758148691, 44.950086408167], [39.3992915674785, 44.9587558368431], [39.3791630424831, 44.9709445385461], [39.375, 44.9764809558689] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 697,
+         "id" : 129174,
+         "name" : "Krasnodarsk Reservoir",
+         "lge_id" : "ru",
+         "pfafstette" : 1593,
+         "lke_type" : "N",
+         "altitude" : 23,
+         "objectid" : 79047,
+         "scalerank" : 10,
+         "featurecla" : "Reservoir",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 698,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [37.4869529390221, 45.26441757462], [37.5134762406153, 45.2509842519685], [37.5369094488189, 45.2435165262772], [37.5532182750412, 45.2399972532503], [37.5746772569126, 45.2423577412562], [37.5660078282366, 45.259911188427], [37.5283258560703, 45.2833873145944], [37.5014592107673, 45.3045029527559], [37.4797427211133, 45.3223139077092], [37.4416315693096, 45.3164770646402], [37.42455021974, 45.2965202114997], [37.4569103644021, 45.273945362571], [37.4869529390221, 45.26441757462] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 698,
+         "id" : 129996,
+         "pfafstette" : 0,
+         "lke_type" : "N",
+         "altitude" : -5,
+         "objectid" : 79122,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_79122",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 699,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [38.5002460629921, 44.9566528566197], [38.5120914209852, 44.9456229399378], [38.5320053561619, 44.9596141961179], [38.5576273805164, 44.9798714750046], [38.5796013779528, 44.9893992629555], [38.5781421671855, 45], [38.5781850851492, 45], [38.5774983977293, 45.004506386193], [38.5352671214063, 45.0069097921626], [38.4961259384728, 45.0030471754257], [38.4836797289874, 45], [38.4814479948727, 44.9994420664714], [38.4853535295733, 44.978970197766], [38.5002460629921, 44.9566528566197] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 699,
+         "id" : 130026,
+         "pfafstette" : 145,
+         "altitude" : 8,
+         "objectid" : 79179,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_79179",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 700,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [38.7911869392053, 45], [38.7906719236404, 44.9997424922176], [38.7865088811573, 44.9913305713239], [38.7865088811573, 44.977468069035], [38.8047060977843, 44.9616742583776], [38.8385254532137, 44.9616742583776], [38.8674521607764, 44.977468069035], [38.8637182979308, 45], [38.863675379967, 45], [38.8613578099249, 45.0142487639626], [38.8453064914851, 45.0128324711591], [38.8162081120674, 45.0110728346457], [38.791229857169, 45], [38.7911869392053, 45] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 700,
+         "id" : 129847,
+         "pfafstette" : 1517,
+         "lke_type" : "N",
+         "altitude" : 12,
+         "objectid" : 79363,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_79363",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 701,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [37.7399972532503, 45.6009373283282], [37.7527009705182, 45.5988772660685], [37.7776792254166, 45.6253147317341], [37.8019707928951, 45.6639408991027], [37.7925288408716, 45.6800780534701], [37.7800826313862, 45.6865157480315], [37.7807693188061, 45.7020520509064], [37.7587094854422, 45.7123952801685], [37.7354479490936, 45.6939834737228], [37.7263493407801, 45.6851423731917], [37.7093538271379, 45.677245467863], [37.7043753433437, 45.6517521973997], [37.7267785204175, 45.6324391137154], [37.7375938472807, 45.6173319904779], [37.7399972532503, 45.6009373283282] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 701,
+         "id" : 128782,
+         "pfafstette" : 0,
+         "altitude" : -4,
+         "objectid" : 79555,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_79555",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 702,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [36.0922907892327, 45.0847629783922], [36.0949517029848, 45.0654498947079], [36.1194149423183, 45.055922106757], [36.1201016297381, 45.071115065922], [36.1105738417872, 45.1053636009888], [36.1082562717451, 45.1335607031679], [36.0922907892327, 45.1216295092474], [36.0910890862479, 45.0975525315876], [36.0922907892327, 45.0847629783922] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 702,
+         "id" : 131347,
+         "pfafstette" : 1,
+         "lke_type" : "N",
+         "altitude" : 50,
+         "objectid" : 80239,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_80239",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 703,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [37.2139946896173, 45.0193989196118], [37.2351103277788, 45.0099140496246], [37.2630928401392, 45.0012446209485], [37.2839509705182, 45.0173388573521], [37.3067833272294, 45.0363085973265], [37.3144227247757, 45.048239791247], [37.2981138985534, 45.0628318989196], [37.248758240249, 45.0678962186413], [37.2145955411097, 45.0663511719465], [37.1682441402673, 45.0633469144845], [37.1194034975279, 45.0571238097418], [37.1654973905878, 45.0366090230727], [37.2139946896173, 45.0193989196118] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 703,
+         "id" : 130878,
+         "pfafstette" : 1,
+         "lke_type" : "N",
+         "altitude" : -3,
+         "objectid" : 80500,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_80500",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 704,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [36.3357214795825, 45.1781524674968], [36.3620731093206, 45.1680238280535], [36.3906564731734, 45.1638178676067], [36.3972658395898, 45.1826159357261], [36.38087117744, 45.19630676616], [36.3620731093206, 45.1954484068852], [36.3276529023988, 45.1960063404138], [36.3134041384362, 45.1882381889764], [36.3357214795825, 45.1781524674968] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 704,
+         "id" : 131112,
+         "pfafstette" : 1,
+         "lke_type" : "N",
+         "altitude" : -2,
+         "objectid" : 80531,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_80531",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 705,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [29.9704724409449, 46.7039719144845], [29.9629188793261, 46.7019118522249], [29.9500434902033, 46.674186847647], [29.9416315693097, 46.6489510849661], [29.9430907800769, 46.6347023210035], [29.9438633034243, 46.6186510025636], [29.9458375297565, 46.6034580433986], [29.963605566746, 46.5950890404688], [29.9868671030947, 46.6004537859366], [29.9776826588537, 46.6189085103461], [29.9598287859367, 46.6430284059696], [29.9666956601355, 46.6762898278704], [29.9704724409449, 46.7039719144845] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 705,
+         "id" : 130916,
+         "pfafstette" : 12115,
+         "lke_type" : "N",
+         "altitude" : 11,
+         "objectid" : 80659,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_80659",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 706,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [35.7716077641457, 45.3571203763047], [35.7856848562534, 45.3439874793994], [35.8233668284197, 45.3593950283831], [35.8722933070866, 45.3716695660136], [35.8890313129463, 45.3731287767808], [35.8704049166819, 45.3861758377587], [35.8449974821461, 45.4072914759202], [35.8219076176524, 45.4019267304523], [35.7906633400476, 45.3820127952756], [35.7707494048709, 45.3734721204908], [35.7716077641457, 45.3571203763047] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 706,
+         "id" : 130917,
+         "pfafstette" : 1,
+         "lke_type" : "N",
+         "altitude" : -4,
+         "objectid" : 80692,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_80692",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 707,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.8662218458158, 45.9808900613441], [33.8728312122322, 46.0115334874565], [33.8724878685222, 46.0156965299396], [33.8842473905878, 46.0159969556858], [33.8608141823842, 46.0314474226332], [33.8291407251419, 46.0516617835561], [33.8115443600073, 46.0584857397913], [33.8049349935909, 46.0460395303058], [33.8269948269548, 46.0192158029665], [33.8421877861197, 45.9856539553195], [33.8430461453946, 45.9651391686504], [33.8662218458158, 45.9808900613441] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 707,
+         "id" : 130546,
+         "pfafstette" : 0,
+         "altitude" : -1,
+         "objectid" : 81114,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_81114",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 708,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [36.9806068027834, 45.1575947628639], [36.9745982878594, 45.1486678264054], [36.9580319538546, 45.1260929774767], [36.9621520783739, 45.09849672679], [37.0112502288958, 45.0830033418788], [37.0537390130013, 45.0788832173595], [37.0873866965757, 45.0764798113899], [37.1379440578648, 45.06811080846], [37.1661840780077, 45.0738188976378], [37.1605189067936, 45.0948486998718], [37.1587163523164, 45.1246337667094], [37.1812912012452, 45.1416292803516], [37.1994884178722, 45.149912447354], [37.1926215436733, 45.1618007233107], [37.1491885643655, 45.1757919794909], [37.0969144845266, 45.1861781267167], [37.0593183482878, 45.1858777009705], [37.0269582036257, 45.1721868705365], [37.0141686504303, 45.1763928309833], [36.9690189525728, 45.1977659769273], [36.8919382896905, 45.1879806811939], [36.852797106757, 45.1727877220289], [36.8447285295733, 45.1665646172862], [36.8582047701886, 45.1581956143563], [36.9161440212415, 45.1629595083318], [36.97047816334, 45.1674229765611], [36.9806068027834, 45.1575947628639] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 708,
+         "id" : 130707,
+         "name" : "Kiziltashskiy Liman",
+         "lge_id" : "ru",
+         "pfafstette" : 1,
+         "lke_type" : "N",
+         "altitude" : -3,
+         "objectid" : 81160,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 709,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [38.0673754806812, 45.0122316196667], [38.07424235488, 45.0006008514924], [38.1005939846182, 45.0051501556491], [38.1399068394067, 45.0104290651895], [38.1738120307636, 45.0184547244095], [38.201451199414, 45.025879532137], [38.1995628090093, 45.0502998535067], [38.1641984068852, 45.0589692821828], [38.1330399652078, 45.0381111518037], [38.1086625618019, 45.0300854925838], [38.0788774949643, 45.0312442776048], [38.0673754806812, 45.0122316196667] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 709,
+         "id" : 130153,
+         "pfafstette" : 123,
+         "altitude" : 2,
+         "objectid" : 81164,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_81164",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 710,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.9022729353598, 45.9865981505219], [33.898066974913, 45.9613194698773], [33.9093973173411, 45.9484869987182], [33.9155775041201, 45.9696026368797], [33.9311996429225, 45.9850531038271], [33.9570362570958, 45.9948813175243], [33.9497402032595, 46.0079283785021], [33.9167792071049, 46.0198595724226], [33.904075489837, 46.0067266755173], [33.9022729353598, 45.9865981505219] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 710,
+         "id" : 130611,
+         "pfafstette" : 483,
+         "lke_type" : "N",
+         "altitude" : -2,
+         "objectid" : 81169,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_81169",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 711,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [30.4614539461637, 46.8427686092291], [30.4724409448819, 46.8178761902582], [30.4941574345358, 46.7681771882439], [30.5024835195019, 46.7271905328694], [30.5078053470061, 46.6923840642739], [30.49913591833, 46.6694229536715], [30.4709817341146, 46.6846588308002], [30.4556171030947, 46.6899377403406], [30.4599947353965, 46.6735859961546], [30.5095220655558, 46.6549166819264], [30.5610236220473, 46.6519982603919], [30.5817959164988, 46.6441871909907], [30.5967313678814, 46.6153463193554], [30.6174178264054, 46.5921706189343], [30.6463445339681, 46.5755613669658], [30.6567306811939, 46.5597675563084], [30.6677176799121, 46.5517848150522], [30.6913225599707, 46.5603684078008], [30.683597326497, 46.5865483656839], [30.6523530488922, 46.6073635780992], [30.6335549807728, 46.6251745330526], [30.610980131844, 46.6536720609778], [30.571409769273, 46.672513047061], [30.5390496246109, 46.70873580846], [30.5273759384728, 46.7634132942685], [30.5072044955137, 46.8073612891412], [30.4858313495697, 46.8427686092291], [30.4712392418971, 46.8677897820912], [30.4536428767625, 46.8749570820363], [30.4543295641824, 46.8606654001099], [30.4614539461637, 46.8427686092291] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 711,
+         "id" : 130182,
+         "name" : "Liman near Odessa",
+         "pfafstette" : 2151,
+         "lke_type" : "N",
+         "altitude" : 50,
+         "objectid" : 81275,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 712,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [30.6035124061527, 46.7708810199597], [30.6008514924007, 46.7444006363303], [30.617160318623, 46.7170618934261], [30.6460011902582, 46.7048302737594], [30.6769879600806, 46.6932424235488], [30.6972452389672, 46.6694229536715], [30.7001636605018, 46.6504532136971], [30.7080605658304, 46.6236724043216], [30.7205067753159, 46.5886084279436], [30.7409357260575, 46.5740592382348], [30.7599913019594, 46.5838874519319], [30.7538969511079, 46.6010975553928], [30.7519227247757, 46.6144879600806], [30.7495193188061, 46.6317409815052], [30.7429099523897, 46.6525132759568], [30.7304637429042, 46.6774915308552], [30.6975027467497, 46.7039719144845], [30.653211408167, 46.719422381432], [30.6294348562534, 46.7328127861198], [30.6199070683025, 46.761653657755], [30.6035124061527, 46.7708810199597] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 712,
+         "id" : 130366,
+         "pfafstette" : 1,
+         "lke_type" : "N",
+         "altitude" : 49,
+         "objectid" : 81318,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_81318",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 713,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [34.0409837941769, 45.893423251236], [34.0507690899103, 45.8981871452115], [34.0519707928951, 45.9143242995788], [34.0307693188061, 45.9520491897088], [34.0003834004761, 45.978229147592], [33.9985808459989, 45.951190830434], [34.0214990386376, 45.921148255814], [34.0348894433254, 45.9056548709028], [34.0409837941769, 45.893423251236] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 713,
+         "id" : 130657,
+         "pfafstette" : 487,
+         "altitude" : -4,
+         "objectid" : 81342,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_81342",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 714,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [34.0707688610145, 45.9735081715803], [34.0723139077092, 45.9990443600073], [34.0836442501373, 46.0192158029665], [34.0627861197583, 46.0287435909174], [34.0503399102728, 46.0237651071232], [34.046648965391, 45.9996452114997], [34.0354044588903, 45.9802892098517], [34.0399537630471, 45.9532508926936], [34.0600393700787, 45.9267705090643], [34.0815841878777, 45.9122213193554], [34.0892235854239, 45.9250108725508], [34.0964338033327, 45.9449677256913], [34.0927428584508, 45.9547101034609], [34.0707688610145, 45.9735081715803] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 714,
+         "id" : 130382,
+         "pfafstette" : 4891,
+         "lke_type" : "N",
+         "altitude" : -4,
+         "objectid" : 81365,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_81365",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 715,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [43.9882948406885, 41.6154035433071], [44.0075650064091, 41.6112834187878], [44.0293244140267, 41.6160473127632], [44.0531009659403, 41.6166481642556], [44.0812980681194, 41.6220129097235], [44.0888945477019, 41.6360041659037], [44.0622854101813, 41.6436864814137], [44.0313844762864, 41.6407680598791], [44.0105263459074, 41.6341586934627], [43.9909986724043, 41.6267338857352], [43.9882948406885, 41.6154035433071] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 715,
+         "id" : 132982,
+         "pfafstette" : 879,
+         "altitude" : 1505,
+         "objectid" : 81601,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_81601",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 716,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [43.7828465482512, 41.4129595083318], [43.8098419474455, 41.4150624885552], [43.8381248855521, 41.4406845129097], [43.8408287172679, 41.4730446575719], [43.8227602545321, 41.4908556125252], [43.7985974409449, 41.4763064228163], [43.7801427165354, 41.4394398919612], [43.7828465482512, 41.4129595083318] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 716,
+         "id" : 133297,
+         "pfafstette" : 98971,
+         "altitude" : 2077,
+         "objectid" : 81727,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_81727",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 717,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [48.1894484755539, 40.0606144707929], [48.2011650796557, 40.0477819996338], [48.2167872184582, 40.0528034013917], [48.2343835835927, 40.0488978666911], [48.2500057223952, 40.0332757278887], [48.2636965528291, 40.0195848974547], [48.2783315784655, 40.0213016160044], [48.2929666041018, 40.0371812625893], [48.2910352957334, 40.0519450421168], [48.2656278611976, 40.0586402444607], [48.2324522752243, 40.0782108359275], [48.2050706143563, 40.0762366095953], [48.1894484755539, 40.0606144707929] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 717,
+         "id" : 132921,
+         "pfafstette" : 37,
+         "altitude" : -14,
+         "objectid" : 82053,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_82053",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 718,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.4130939846182, 45.2037315738876], [33.450690120857, 45.1906845129097], [33.4712049075261, 45.1778520417506], [33.501762497711, 45.1668650430324], [33.532491759751, 45.16626419154], [33.5549807727523, 45.1790966626991], [33.5712895989746, 45.1989676799121], [33.5733496612342, 45.2233450833181], [33.5541224134774, 45.24205731551], [33.5145520509064, 45.2427010849661], [33.4928355612525, 45.2453619987182], [33.4601320728804, 45.2427010849661], [33.4306903497528, 45.2260059970701], [33.4101755630837, 45.2149760803882], [33.4130939846182, 45.2037315738876] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 718,
+         "id" : 132195,
+         "pfafstette" : 1,
+         "lke_type" : "N",
+         "altitude" : -2,
+         "objectid" : 82645,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_82645",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 719,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [43.3071438381249, 41.0609892876762], [43.3166716260758, 41.0826628593664], [43.294440120857, 41.0841220701337], [43.2872299029482, 41.0903880928401], [43.2810067982055, 41.1070831807361], [43.2283035387292, 41.1023192867607], [43.1652999679546, 41.0897872413477], [43.1397637795276, 41.0838645623512], [43.1462443920528, 41.0669119666728], [43.1698063541476, 41.0487147500458], [43.1897202893243, 41.0439508560703], [43.2087329472624, 41.0377277513276], [43.2329386788134, 41.016955456876], [43.2480458020509, 40.9940372642373], [43.26856058872, 40.9809472852957], [43.2883457700055, 40.9752821140817], [43.2994615226149, 41.0238223310749], [43.2937105154734, 41.041332860282], [43.3071438381249, 41.0609892876762] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 719,
+         "id" : 134395,
+         "name" : "Cildir",
+         "lge_id" : "tr",
+         "pfafstette" : 286771,
+         "altitude" : 1959,
+         "objectid" : 83661,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 720,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [43.1694630104377, 41.1992280488921], [43.1882610785571, 41.1956229399377], [43.2095913065373, 41.2006872596594], [43.2236254806812, 41.203090665629], [43.2419514511994, 41.2072107901483], [43.2526809421351, 41.2277255768174], [43.2458569859, 41.2435193874748], [43.2155998214613, 41.2420601767076], [43.1936258240249, 41.2268672175426], [43.1804500091558, 41.2089704266618], [43.1694630104377, 41.1992280488921] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 720,
+         "id" : 134180,
+         "pfafstette" : 99183,
+         "altitude" : 1798,
+         "objectid" : 84331,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_84331",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 721,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [35.5331984755539, 41.2735190441311], [35.5312671671855, 41.2907720655558], [35.5398078419703, 41.3046774858085], [35.5644427531588, 41.3086688564365], [35.5879188793261, 41.324290995239], [35.6132833958982, 41.3399131340414], [35.6328110694012, 41.349655511811], [35.6504074345358, 41.3555352728438], [35.6699351080388, 41.3594408075444], [35.710964681377, 41.363346342245], [35.7303636009888, 41.369698200879], [35.7131534975279, 41.3781959577001], [35.6835830205091, 41.3867795504486], [35.6562442776048, 41.3809427073796], [35.6269742263322, 41.3750629463468], [35.5886484847098, 41.3567369758286], [35.5586059100897, 41.3360075993408], [35.5331984755539, 41.3262223036074], [35.5117394936825, 41.3203854605384], [35.4902375938473, 41.3262223036074], [35.4550877815418, 41.3340333730086], [35.4316545733382, 41.3281965299396], [35.4179637429042, 41.3145056995056], [35.4267619254715, 41.3005573612891], [35.462898850943, 41.3027890954038], [35.5017396081304, 41.2842056171031], [35.5213531175609, 41.2752786806446], [35.5331984755539, 41.2735190441311] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 721,
+         "id" : 136598,
+         "pfafstette" : 1513,
+         "lke_type" : "N",
+         "altitude" : 171,
+         "objectid" : 84392,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_84392",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 722,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [45.316176638894, 39.2170618934261], [45.2828293810657, 39.214915995239], [45.2691814685955, 39.196718778612], [45.3108118934261, 39.1625989974364], [45.3242452160776, 39.1319555713239], [45.3554894936825, 39.1114407846548], [45.3873346227797, 39.0916126854056], [45.3969911646219, 39.1236724043216], [45.3735579564182, 39.1599380836843], [45.349395142831, 39.1831137841055], [45.3339875938473, 39.1968046145395], [45.316176638894, 39.2170618934261] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 722,
+         "id" : 135922,
+         "pfafstette" : 2517,
+         "altitude" : 764,
+         "objectid" : 84820,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_84820",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 723,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [49.3292208386742, 37.5095277879509], [49.2954014832448, 37.5223602591101], [49.2787063953488, 37.5178967908808], [49.2813673091009, 37.5027038317158], [49.3238560932064, 37.4771676432888], [49.3526540468779, 37.4628759613624], [49.3808511490569, 37.451931880608], [49.4130825398279, 37.4456229399377], [49.4011513459073, 37.4593137703717], [49.3713662790698, 37.4821890450467], [49.3292208386742, 37.5095277879509] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 723,
+         "id" : 135945,
+         "pfafstette" : 23,
+         "altitude" : -31,
+         "objectid" : 84915,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_84915",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 724,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [43.5500595129097, 39.7923771973997], [43.5476131889764, 39.7673560245376], [43.5628919840689, 39.7462403863761], [43.5925482970152, 39.7519055575902], [43.5949946209486, 39.7697165125435], [43.5798445797473, 39.7952956189343], [43.5661537493133, 39.8194155145578], [43.5506603644021, 39.8336213605567], [43.5417763459074, 39.8155099798572], [43.5500595129097, 39.7923771973997] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 724,
+         "id" : 135952,
+         "pfafstette" : 2549973,
+         "altitude" : 2251,
+         "objectid" : 84964,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_84964",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 725,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [35.2949179408533, 41.2461803012269], [35.3359475141915, 41.2422747665263], [35.3364196117927, 41.2339486815602], [35.3610974409449, 41.2573389718], [35.3496383446255, 41.2676392830983], [35.3281364447903, 41.2715448177989], [35.3066345449551, 41.2715448177989], [35.2695534242813, 41.2813301135323], [35.2461202160776, 41.2988835607032], [35.2246183162424, 41.3008577870353], [35.2050906427394, 41.3008577870353], [35.1958203625709, 41.2934758972716], [35.2363349203442, 41.2735190441311], [35.2949179408533, 41.2461803012269] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 725,
+         "id" : 136741,
+         "pfafstette" : 1593,
+         "lke_type" : "N",
+         "altitude" : 206,
+         "objectid" : 85183,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_85183",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 726,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [36.9453282365867, 40.4024131340414], [36.924083844534, 40.401812282549], [36.9152856619667, 40.3934861975829], [36.9309078007691, 40.3818983473723], [36.9961001876946, 40.3555467176341], [37.028074070683, 40.3542591787218], [36.9961001876946, 40.3809112342062], [36.9453282365867, 40.4024131340414] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 726,
+         "id" : 137088,
+         "pfafstette" : 24595,
+         "lke_type" : "N",
+         "altitude" : 787,
+         "objectid" : 85323,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_85323",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 727,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [30.1528308688885, 40.7229244872734], [30.1629595083318, 40.7199631477751], [30.1845901620582, 40.7167013825307], [30.2178945019227, 40.7122379143014], [30.2580657159861, 40.7063152353049], [30.2883228804248, 40.7030105520967], [30.313344053287, 40.71313919154], [30.3274211453946, 40.7312076542758], [30.3030008240249, 40.7464006134408], [30.2524434627358, 40.7443405511811], [30.1899549075261, 40.7321947674419], [30.1528308688885, 40.7229244872734] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 727,
+         "id" : 138295,
+         "name" : "Sapanca Golu",
+         "pfafstette" : 1185,
+         "lke_type" : "N",
+         "altitude" : 30,
+         "objectid" : 85734,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 728,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.7790554614539, 39.1381786760667], [33.75, 39.1590797244095], [33.7475536760667, 39.1608393609229], [33.7169102499542, 39.1774915308552], [33.7082837392419, 39.1922553103827], [33.6649365958616, 39.2068045000916], [33.6220615500824, 39.225602568211], [33.597426638894, 39.2472761399011], [33.5744655282915, 39.2656879463468], [33.5581137841055, 39.2788208432522], [33.5444229536715, 39.2892069904779], [33.5224918741989, 39.2805375618019], [33.5207751556491, 39.2626836888848], [33.5212472532503, 39.2428126716719], [33.5090585515473, 39.2282205639993], [33.4980715528292, 39.2038431605933], [33.5144232970152, 39.1696804614539], [33.549186847647, 39.1670195477019], [33.5825341054752, 39.1714400979674], [33.6063535753525, 39.1798091008973], [33.6336923182567, 39.181525819447], [33.6672541659037, 39.1607535249954], [33.6939920573155, 39.143800929317], [33.7139918284197, 39.1437580113532], [33.75, 39.1242303378502], [33.7521888161509, 39.1230715528292], [33.7668667597509, 39.1066768906794], [33.7900424601721, 39.0971920206922], [33.8147202893243, 39.0891234435085], [33.8378959897455, 39.0959473997436], [33.8703848882988, 39.0911835057682], [33.8819727385094, 39.0804969327962], [33.8938180965025, 39.0947886147226], [33.8884533510346, 39.1156038271379], [33.8596124793994, 39.124273255814], [33.8142052737594, 39.1245307635964], [33.7790554614539, 39.1381786760667] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 728,
+         "id" : 138674,
+         "pfafstette" : 77173,
+         "lke_type" : "N",
+         "altitude" : 856,
+         "objectid" : 86320,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_86320",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 729,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [31.750967084783, 40.0491982924373], [31.7422118201794, 40.0506575032045], [31.6949591420985, 40.0319452710126], [31.6729851446621, 40.04773908167], [31.6679637429042, 40.08580731551], [31.643800929317, 40.100656930965], [31.6298955090643, 40.0958930369896], [31.6411400155649, 40.0863652490386], [31.6553887795276, 40.069112227614], [31.6456464017579, 40.0468378044314], [31.621097326497, 40.0449923319905], [31.6010975553928, 40.043576039187], [31.5739734023073, 40.0483399331624], [31.5418707654276, 40.0510437648782], [31.5168495925655, 40.0426747619484], [31.5039312854788, 40.0469236403589], [31.4714423869255, 40.0503999954221], [31.4746183162424, 40.0332757278887], [31.5214847326497, 40.0254646584875], [31.5468921671855, 40.0273959668559], [31.5957328099249, 40.0284689159495], [31.6289083958982, 40.0195848974547], [31.654315830434, 40.0156793627541], [31.6757748123054, 40.0000572239517], [31.7166756317524, 40.029541865043], [31.750967084783, 40.0491982924373] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 729,
+         "id" : 138486,
+         "pfafstette" : 1793,
+         "lke_type" : "N",
+         "altitude" : 467,
+         "objectid" : 86390,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_86390",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 730,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [34.3868596639809, 39.1938432750412], [34.4011513459073, 39.1950020600623], [34.4204215116279, 39.2092937419887], [34.4112799853507, 39.2295081029116], [34.3868596639809, 39.2493791201245], [34.3666023850943, 39.2380916956601], [34.3684049395715, 39.217576908991], [34.3835549807727, 39.2075341054752], [34.3868596639809, 39.1938432750412] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 730,
+         "id" : 138582,
+         "name" : "Seyfe Golu",
+         "pfafstette" : 4871,
+         "lke_type" : "N",
+         "altitude" : 1115,
+         "objectid" : 86543,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 731,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [35.3689085103461, 37.2871698177989], [35.3442306811939, 37.2771270142831], [35.3147031221388, 37.2628353323567], [35.3047032365867, 37.2565263916865], [35.2868922816334, 37.2410759247391], [35.2591672770555, 37.2336511170115], [35.2502403405969, 37.2274280122688], [35.2686950650064, 37.2119346273576], [35.3055615958616, 37.2101320728804], [35.3291235579564, 37.2375137337484], [35.3574494140267, 37.2520200054935], [35.3819555713239, 37.2500028611976], [35.3956464017579, 37.259788156931], [35.4104101812855, 37.2766978346457], [35.3856465162058, 37.2854530992492], [35.3689085103461, 37.2871698177989] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 731,
+         "id" : 139603,
+         "pfafstette" : 39,
+         "lke_type" : "N",
+         "altitude" : 137,
+         "objectid" : 86928,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_86928",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 732,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [31.8567169474455, 38.3592605520967], [31.8674464383812, 38.3321793169749], [31.8849998855521, 38.3238532320088], [31.8935834783007, 38.3553979353598], [31.8879612250504, 38.3899039782091], [31.8686481413661, 38.3854405099799], [31.8567169474455, 38.3592605520967] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 732,
+         "id" : 139553,
+         "pfafstette" : 9281,
+         "lke_type" : "N",
+         "altitude" : 1022,
+         "objectid" : 87090,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_87090",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 733,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [29.9116319126534, 38.2739396401758], [29.8822331074895, 38.2614934306904], [29.8613320591467, 38.2501201702985], [29.8430490065922, 38.2362147500458], [29.847426638894, 38.2153566196667], [29.8803876350485, 38.2100347921626], [29.9169966581212, 38.2082751556492], [29.9447216626992, 38.2248414896539], [29.9397002609412, 38.259390450467], [29.9116319126534, 38.2739396401758] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 733,
+         "id" : 139900,
+         "pfafstette" : 939,
+         "lke_type" : "N",
+         "altitude" : 815,
+         "objectid" : 87121,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_87121",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 734,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [35.2790812122322, 37.0772580571324], [35.3123855520967, 37.064811847647], [35.3347458112067, 37.0642109961545], [35.342041865043, 37.0793610373558], [35.3252180232558, 37.0849832906061], [35.33019650705, 37.0983736952939], [35.3427714704266, 37.1106053149606], [35.3276643471891, 37.1174292711958], [35.310325489837, 37.1174292711958], [35.2906690624428, 37.1079014832448], [35.266592084783, 37.0882450558506], [35.2790812122322, 37.0772580571324] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 734,
+         "id" : 139769,
+         "name" : "Seyhan Baraji",
+         "pfafstette" : 15,
+         "lke_type" : "N",
+         "altitude" : 56,
+         "objectid" : 87186,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 735,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [33.066402673503, 38.5878845449551], [33.0742137429042, 38.564708844534], [33.1084193600073, 38.5501596548251], [33.1315950604285, 38.5587432475737], [33.1262303149606, 38.5816614402124], [33.1071747390588, 38.6027770783739], [33.0879045733382, 38.6265965482512], [33.0709519776598, 38.6458667139718], [33.0610379280352, 38.6399011170115], [33.0429694652994, 38.6265965482512], [33.0344287905146, 38.6123048663249], [33.0485917185497, 38.6054809100897], [33.064728872917, 38.6018758011353], [33.066402673503, 38.5878845449551] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 735,
+         "id" : 139231,
+         "pfafstette" : 31,
+         "altitude" : 922,
+         "objectid" : 87244,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_87244",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 736,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [31.4814422724776, 38.4915766343161], [31.4969785753525, 38.5076279527559], [31.5034162699139, 38.5287006729537], [31.499896996887, 38.5584857397913], [31.5041458752976, 38.5893437557224], [31.5035450238052, 38.602433734664], [31.471184879143, 38.6048800585973], [31.4323870399194, 38.5962106299213], [31.4006277467497, 38.5765971204908], [31.3747482146127, 38.5656101217726], [31.3587827321003, 38.5650092702802], [31.3408430232558, 38.5680135277422], [31.316766045596, 38.5709748672404], [31.2998134499176, 38.5563827595678], [31.3076245193188, 38.5332070591467], [31.3388687969236, 38.4971988875664], [31.3658641961179, 38.4612336339498], [31.4053916407251, 38.4443239562351], [31.4532451702985, 38.4475857214796], [31.4704552737594, 38.4728644021242], [31.4814422724776, 38.4915766343161] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 736,
+         "id" : 139482,
+         "name" : "Aksehir Gl",
+         "lge_id" : "tr",
+         "pfafstette" : 9379,
+         "lke_type" : "N",
+         "altitude" : 953,
+         "objectid" : 87455,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 737,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [29.7177714704267, 37.811670252701], [29.7446381157297, 37.8033012497711], [29.7535650521883, 37.8000394845266], [29.7729639718, 37.7902112708295], [29.8112897134225, 37.7913700558506], [29.8427914988097, 37.7932155282915], [29.8857523805164, 37.8023570545688], [29.9149365958616, 37.8178933574437], [29.9557086614173, 37.8422707608497], [29.9943777467497, 37.8773347372276], [29.9770818073613, 37.8960040514558], [29.9453225141915, 37.9046734801318], [29.9217605520967, 37.8984503753891], [29.8956235121773, 37.8820986312031], [29.8740357764146, 37.8663477385094], [29.8572977705549, 37.8598242080205], [29.839744323384, 37.865746887017], [29.8275127037173, 37.8654035433071], [29.8043370032961, 37.858579587072], [29.7686721754258, 37.8452321003479], [29.7270417505951, 37.8315412699139], [29.7041235579564, 37.8253181651712], [29.7177714704267, 37.811670252701] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 737,
+         "id" : 140163,
+         "pfafstette" : 6811,
+         "altitude" : 837,
+         "objectid" : 87585,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_87585",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 738,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [30.1176810565831, 37.6701268082769], [30.1563930598791, 37.6894398919612], [30.2072937648782, 37.7105984480864], [30.2339029023988, 37.7316282503205], [30.24939628731, 37.7589669932247], [30.2788380104377, 37.7789238463651], [30.3145886742355, 37.7901683528658], [30.3320562854789, 37.8101252060062], [30.3208117789782, 37.8205542711958], [30.2836877403406, 37.8124856940121], [30.237550929317, 37.805661737777], [30.1879806811939, 37.7932155282915], [30.1629595083318, 37.7810268265885], [30.137723745651, 37.7654905237136], [30.0952349615455, 37.7313278245743], [30.0766514832448, 37.6995256134408], [30.0666515976927, 37.6796116782641], [30.0692266755173, 37.6668650430324], [30.0963079106391, 37.6611998718184], [30.1176810565831, 37.6701268082769] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 738,
+         "id" : 140164,
+         "name" : "Burdur Gl",
+         "lge_id" : "tr",
+         "pfafstette" : 2373,
+         "lke_type" : "N",
+         "altitude" : 843,
+         "objectid" : 87586,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 739,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [29.6593172038088, 37.5374673823476], [29.6926215436733, 37.5214160639077], [29.7163122596594, 37.5246778291522], [29.7214624153086, 37.5372527925288], [29.7187585835928, 37.555922106757], [29.7026643471892, 37.5826599981688], [29.6640810977843, 37.5900848058964], [29.6417208386742, 37.5669091054752], [29.6593172038088, 37.5374673823476] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 739,
+         "id" : 140363,
+         "name" : "Salda Golu",
+         "pfafstette" : 265,
+         "lke_type" : "N",
+         "altitude" : 1140,
+         "objectid" : 87627,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 1
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 740,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [30.8544966581212, 37.4283699185131], [30.8321793169749, 37.4450650064091], [30.8286171259843, 37.4155803653177], [30.8637669382897, 37.3876407709211], [30.8759985579564, 37.400172816334], [30.8803761902582, 37.425709004761], [30.8777152765061, 37.4435628776781], [30.8684020783739, 37.4304299807727], [30.860719762864, 37.4165245605201], [30.8544966581212, 37.4283699185131] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 740,
+         "id" : 140292,
+         "pfafstette" : 1391,
+         "lke_type" : "N",
+         "altitude" : 254,
+         "objectid" : 87754,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_87754",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 741,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [30.2458770142831, 39.6380012818165], [30.2390101400842, 39.6486878547885], [30.2104696941952, 39.6600611151804], [30.1870364859916, 39.657958134957], [30.1611569538546, 39.6312202435451], [30.1483244826955, 39.6059844808643], [30.1530883766709, 39.5966712827321], [30.1611569538546, 39.6049973676982], [30.1795687603003, 39.6287739196118], [30.2145898187145, 39.6371000045779], [30.2458770142831, 39.6380012818165] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 741,
+         "id" : 138904,
+         "pfafstette" : 6755,
+         "lke_type" : "N",
+         "altitude" : 975,
+         "objectid" : 87873,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_87873",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 742,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [35.2412275682109, 38.3375440624428], [35.2532016800952, 38.324153657755], [35.2814846182018, 38.3182309787585], [35.304316974913, 38.3307630241714], [35.2902828007691, 38.3497327641458], [35.2690384087163, 38.3720930232558], [35.2565921992309, 38.395268723677], [35.2365924281267, 38.3875005722395], [35.2351332173594, 38.3595609778429], [35.2412275682109, 38.3375440624428] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 742,
+         "id" : 138927,
+         "name" : "Yaygl and Camiz Gl",
+         "pfafstette" : 8393,
+         "lke_type" : "N",
+         "altitude" : 1070,
+         "objectid" : 87952,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 743,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [45.8051839177806, 35.1815715986083], [45.7914930873466, 35.1753055759018], [45.7522231505219, 35.162258514924], [45.7236397866691, 35.1542328557041], [45.7317083638528, 35.1384390450467], [45.7578024858085, 35.1410999587987], [45.7932098058964, 35.1551770509064], [45.8093469602637, 35.166764901117], [45.8051839177806, 35.1815715986083] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 743,
+         "id" : 141672,
+         "pfafstette" : 2429193,
+         "altitude" : 450,
+         "objectid" : 88052,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_88052",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 744,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [42.2505035707746, 38.8792975187695], [42.2160833638528, 38.8683105200513], [42.2285295733382, 38.8575381111518], [42.2570700192273, 38.8489545184032], [42.2778423136788, 38.8495553698956], [42.3010180141, 38.8513150064091], [42.3316614402124, 38.8548771973998], [42.3335069126534, 38.884876854056], [42.3149663523164, 38.9101555347006], [42.2960395303058, 38.8979668329976], [42.2505035707746, 38.8792975187695] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 744,
+         "id" : 141179,
+         "pfafstette" : 421,
+         "altitude" : 1813,
+         "objectid" : 88378,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_88378",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 745,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [39.9433625938473, 38.3965562625893], [39.9148221479582, 38.3906765015565], [39.8984274858085, 38.3786594717085], [39.915036737777, 38.369217519685], [39.9397145669291, 38.3711488280535], [39.9694996337667, 38.3720930232558], [40.0016022706464, 38.3493035845083], [40.023705021974, 38.3555266892511], [40.0069670161143, 38.3765135735213], [39.9852505264603, 38.3958695751694], [39.9704867469328, 38.3984875709577], [39.9433625938473, 38.3965562625893] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 745,
+         "id" : 141458,
+         "pfafstette" : 49919,
+         "lke_type" : "N",
+         "altitude" : 788,
+         "objectid" : 88385,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_88385",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 746,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [39.3671889305988, 38.501104422267], [39.3311807590185, 38.4918341420985], [39.3106659723494, 38.4853106116096], [39.3086059100897, 38.4636370399194], [39.3620816929134, 38.4621778291522], [39.375, 38.4663408716352], [39.4096777147043, 38.4775853781359], [39.4349563953488, 38.4856110373558], [39.479505241714, 38.498100164805], [39.5090328007691, 38.5168553149606], [39.5039255630837, 38.5299023759385], [39.4709645669291, 38.5349666956601], [39.4323813175243, 38.5334645669291], [39.4079609961545, 38.5216192089361], [39.375, 38.5050099569676], [39.3671889305988, 38.501104422267] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 746,
+         "id" : 141459,
+         "name" : "Hazar Dagi",
+         "pfafstette" : 49993,
+         "lke_type" : "N",
+         "altitude" : 1239,
+         "objectid" : 88386,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 747,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [36.9099209164988, 37.7274652078374], [36.9297060977843, 37.7402976789965], [36.922238372093, 37.7583661417323], [36.8984618201795, 37.7422719053287], [36.8733118934261, 37.729868613807], [36.8513378959898, 37.7158773576268], [36.8730543856437, 37.7031736403589], [36.8840413843618, 37.7132593618385], [36.9099209164988, 37.7274652078374] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 747,
+         "id" : 141827,
+         "pfafstette" : 2515,
+         "altitude" : 600,
+         "objectid" : 88395,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_88395",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 748,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [42.9538860785571, 36.6755459164988], [42.9364184673137, 36.6922839223585], [42.9105389351767, 36.7017687923457], [42.9082213651346, 36.7186784700604], [42.8725565372643, 36.7329272340231], [42.8493808368431, 36.7252449185131], [42.8132439113716, 36.7344293627541], [42.7773644936825, 36.7676478666911], [42.742214681377, 36.7832700054935], [42.7055627403406, 36.8087632759568], [42.6870221800037, 36.82691757462], [42.6638464795825, 36.8322823200879], [42.6467222120491, 36.8218961728621], [42.6384390450467, 36.8055444286761], [42.6203705823109, 36.8055444286761], [42.5876670939388, 36.8418530260026], [42.5510151529024, 36.849792849295], [42.5282257141549, 36.8474323612891], [42.5040199826039, 36.8513808139535], [42.5178395669291, 36.8203940441311], [42.5543198361106, 36.8132267441861], [42.5820448406885, 36.7930553012269], [42.6132891182934, 36.7676478666911], [42.6484389305988, 36.7773902444607], [42.6777518998352, 36.7773902444607], [42.7030305804798, 36.7733988738326], [42.7299830617103, 36.7436996429225], [42.7285238509431, 36.7031850851492], [42.7634590734298, 36.6914684810474], [42.8047032365867, 36.7012537767808], [42.8227716993225, 36.6859320637246], [42.8398530488922, 36.6778205685772], [42.833029092657, 36.6654601950192], [42.8231150430324, 36.6559324070683], [42.8635437648782, 36.6211688564366], [42.9223842931698, 36.6253748168834], [42.9477488097418, 36.6464475370811], [42.9538860785571, 36.6755459164988] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 748,
+         "id" : 141568,
+         "pfafstette" : 475135,
+         "altitude" : 307,
+         "objectid" : 88427,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_88427",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 749,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [44.9343355154734, 36.0720335103461], [44.9572966260758, 36.0500595129097], [44.971459554111, 36.0473556811939], [44.9732621085882, 36.081561298297], [44.9587558368431, 36.1109601034609], [44.9560520051273, 36.1255522111335], [44.9593566883355, 36.1522901025453], [44.942404092657, 36.1740065921992], [44.9144215802967, 36.1731053149606], [44.8879411966673, 36.1428481505219], [44.8972114768358, 36.1009172999451], [44.9343355154734, 36.0720335103461] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 749,
+         "id" : 141521,
+         "pfafstette" : 443993,
+         "altitude" : 477,
+         "objectid" : 88562,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_88562",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 750,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [43.5388150064091, 38.6223905878044], [43.5581280900934, 38.6152232878594], [43.5999731047427, 38.6360385002747], [43.6308740386376, 38.659857970152], [43.6343074757371, 38.6800723310749], [43.6374404870903, 38.7044926524446], [43.6276981093206, 38.7237628181652], [43.5744798342795, 38.7419600347922], [43.536154092657, 38.7365952893243], [43.5283430232558, 38.7100719877312], [43.5339652765061, 38.6622184581579], [43.5388150064091, 38.6223905878044] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 750,
+         "id" : 141127,
+         "name" : "Ercek",
+         "lge_id" : "tr",
+         "pfafstette" : 411,
+         "altitude" : 1803,
+         "objectid" : 88647,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 751,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [45.6401643471892, 32.1296322788867], [45.6491771195752, 32.1430656015382], [45.6469883034243, 32.1751682384179], [45.6024394570591, 32.2185582997619], [45.55188209577, 32.234910043948], [45.5271184306904, 32.2375709577001], [45.5087924601721, 32.2518197216627], [45.4956166453031, 32.2557252563633], [45.4951445477019, 32.2400172816334], [45.5073332494049, 32.2259401895257], [45.5164747756821, 32.2066700238052], [45.535187007874, 32.1638378959897], [45.5614098837209, 32.1317352591101], [45.6038986678264, 32.1252546465849], [45.6401643471892, 32.1296322788867] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 751,
+         "id" : 142612,
+         "pfafstette" : 123,
+         "altitude" : 0,
+         "objectid" : 88948,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_88948",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 752,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [47.6538322880425, 31.639122871269], [47.614519433254, 31.6542299945065], [47.5822880424831, 31.6447022065556], [47.5715585515473, 31.6218269318806], [47.581300929317, 31.6016125709577], [47.5920304202527, 31.5781364447903], [47.6065796099615, 31.5558620216078], [47.6279527559055, 31.5567632988464], [47.6525876670939, 31.5609263413294], [47.6782526094122, 31.5677502975645], [47.6806560153818, 31.6001533601904], [47.6538322880425, 31.639122871269] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 752,
+         "id" : 142469,
+         "pfafstette" : 2435,
+         "altitude" : 0,
+         "objectid" : 88970,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_88970",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 753,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [37.6105995925655, 36.08606768449], [37.5781536119758, 36.0881277467497], [37.5481110373558, 36.0910890862479], [37.5306434261124, 36.0895869575169], [37.5097852957334, 36.0850805713239], [37.4898713605567, 36.0964538317158], [37.4678973631203, 36.0982134682293], [37.4542494506501, 36.0848659815052], [37.4743779756455, 36.0583426799121], [37.5336906015382, 36.0191156610511], [37.5832608496612, 35.9754251739608], [37.5964366645303, 35.9376144479033], [37.5945053561619, 35.9186447079289], [37.5948486998718, 35.9019925379967], [37.6064365500824, 35.8945248123054], [37.6311143792346, 35.9305329838857], [37.6596977430873, 35.9585154962461], [37.6826159357261, 35.9653394524812], [37.6982380745285, 35.9846096182018], [37.6959205044864, 36.002763916865], [37.6967788637612, 36.0268408945248], [37.6967788637612, 36.051518723677], [37.6781095495331, 36.0568834691448], [37.662101149057, 36.0643511948361], [37.64356058872, 36.0812608725508], [37.6254921259843, 36.0833638527742], [37.6105995925655, 36.08606768449] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 753,
+         "id" : 142124,
+         "name" : "Sabkha al Jabbul",
+         "pfafstette" : 0,
+         "altitude" : 321,
+         "objectid" : 89022,
+         "scalerank" : 10,
+         "featurecla" : "Alkaline Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 754,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [38.251364791247, 36.5733153268632], [38.2579741576634, 36.5625], [38.2617080205091, 36.5564056491485], [38.2542832127815, 36.5432727522432], [38.23316757462, 36.5275218595495], [38.2297341375206, 36.4992818394067], [38.247201748764, 36.4787670527376], [38.216815830434, 36.4621148828053], [38.1914083958982, 36.4454197949093], [38.1977602545321, 36.4224157663431], [38.2287899423183, 36.4151626304706], [38.2650127037173, 36.4348190578648], [38.289433025087, 36.4517287355796], [38.29359606757, 36.4784666269914], [38.2753988509431, 36.494217519685], [38.2871154550449, 36.5031873741073], [38.3066431285479, 36.5195820362571], [38.2893042711958, 36.5578648599158], [38.28625709577, 36.5625], [38.269562007874, 36.5879503524995], [38.2536823612891, 36.6135723768541], [38.2197342519685, 36.6524131340414], [38.2058288317158, 36.6667048159678], [38.1942409815052, 36.6818119392053], [38.1511513459073, 36.6839149194287], [38.1020531953855, 36.6856745559421], [38.0923108176158, 36.7059318348288], [38.0923108176158, 36.7255453442593], [38.0782766434719, 36.7463605566746], [38.0634699459806, 36.7680770463285], [38.0461740065922, 36.7787636193005], [38.0274617744003, 36.7724546786303], [38.039693394067, 36.7320688747482], [38.0602081807361, 36.6958031953855], [38.0670321369713, 36.6806531541842], [38.0878902673503, 36.6707820225233], [38.1184049395715, 36.6678636009888], [38.1377180232558, 36.665159769273], [38.1628679500092, 36.6547736220472], [38.2026529023988, 36.6372201748764], [38.2317083638528, 36.6021991164622], [38.251364791247, 36.5733153268632] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 754,
+         "id" : 141932,
+         "pfafstette" : 935351,
+         "altitude" : 397,
+         "objectid" : 89055,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_89055",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 755,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [42.213379532137, 34.3381477751327], [42.1875, 34.3271178584508], [42.1734658258561, 34.3211522614906], [42.1614058780443, 34.3203368201794], [42.1626075810291, 34.3423108176158], [42.1796889305988, 34.3708083455411], [42.1800751922725, 34.3930827687237], [42.1645818073613, 34.3866021561985], [42.1523501876946, 34.3860013047061], [42.1351400842337, 34.4011084279436], [42.1191316837575, 34.3785335790148], [42.0884024217176, 34.3752718137704], [42.0423514466215, 34.3795636101447], [42.0335961820179, 34.3711087712873], [42.0606774171397, 34.3464309421351], [42.101191974913, 34.3203797381432], [42.1140244460721, 34.3083627082952], [42.1250114447903, 34.2732558139535], [42.1432086614173, 34.2613675379967], [42.1738520875298, 34.2672902169932], [42.1875, 34.2751012863944], [42.1972852957334, 34.2807235396447], [42.2217056171031, 34.2732558139535], [42.2362118888482, 34.2675906427394], [42.2475851492401, 34.2617967176341], [42.2671128227431, 34.2508526368797], [42.2879709531221, 34.2625692409815], [42.3057819080755, 34.3078047747665], [42.3076273805164, 34.3321392602087], [42.3308030809376, 34.3265599249222], [42.3521762268815, 34.2995216077641], [42.3183568714521, 34.2810239653909], [42.3008034242813, 34.2512818165171], [42.2892155740707, 34.2382347555393], [42.3010180141, 34.2207242263322], [42.3186143792346, 34.2039862204724], [42.3476698406885, 34.2102522431789], [42.3757381889764, 34.2245439251053], [42.3894290194104, 34.2358313495697], [42.3971113349204, 34.247462117744], [42.4111455090643, 34.2619683894891], [42.4262955502655, 34.2700369666728], [42.4348362250504, 34.276002563633], [42.4235917185497, 34.297375709577], [42.4095575444058, 34.324414026735], [42.4143214383813, 34.3439846182018], [42.418699070683, 34.3538986678264], [42.4047936504303, 34.351795687603], [42.3926049487274, 34.3481905786486], [42.373806880608, 34.3604221983153], [42.3498586568394, 34.365486518037], [42.3430347006043, 34.3714521149972], [42.3308030809376, 34.3860013047061], [42.3004171626076, 34.3752718137704], [42.2697737364952, 34.365486518037], [42.2519627815419, 34.3607226240615], [42.213379532137, 34.3381477751327] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 755,
+         "id" : 142160,
+         "name" : "Qadisiyah",
+         "pfafstette" : 0,
+         "altitude" : 0,
+         "objectid" : 89064,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 756,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [44.9658373008607, 34.2221834370994], [44.9763092840139, 34.1882353277788], [44.9736483702619, 34.1466049029482], [44.9724037493133, 34.1260901162791], [44.9815881935543, 34.1383217359458], [44.994163156931, 34.1532142693646], [45, 34.1518408945248], [45.0223602591101, 34.1466049029482], [45.0387120032961, 34.1526134178722], [45.0432183894891, 34.1826130745285], [45.0428750457792, 34.2010677989379], [45.0322313907709, 34.2251018586339], [45.0185834783007, 34.2554877769639], [45, 34.2664747756821], [44.9950215162058, 34.2694361151804], [44.9709445385461, 34.2542860739791], [44.9658373008607, 34.2221834370994] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 756,
+         "line::hidden" : [
+            { "contour" : 0, "segments" : [ { "from" : 9, "to" : 10 } ] }
+         ],
+         "id" : 141950,
+         "pfafstette" : 242737,
+         "altitude" : 0,
+         "objectid" : 89079,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_89079",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 757,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [37.6613715436733, 35.8841815830434], [37.6986243362022, 35.8868424967954], [37.7072937648782, 35.9022929637429], [37.6957059146676, 35.9170996612342], [37.6718864447903, 35.9138808139535], [37.6501699551364, 35.9070568577184], [37.639397546237, 35.898430347006], [37.6613715436733, 35.8841815830434] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 757,
+         "id" : 142171,
+         "pfafstette" : 6915,
+         "altitude" : 311,
+         "objectid" : 89088,
+         "scalerank" : 12,
+         "featurecla" : "Alkaline Lake",
+         "note" : "_untitled_89088",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 758,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [46.5175791979491, 32.2423348516755], [46.5398107031679, 32.2195024949643], [46.5633726652628, 32.2141377494964], [46.5894667872185, 32.2298457242263], [46.5844883034243, 32.2489013001282], [46.560325489837, 32.2640513413294], [46.5410124061527, 32.2702744460721], [46.5172358542392, 32.2723345083318], [46.4890387520601, 32.2780425975096], [46.469511078557, 32.2688152353049], [46.4812276826589, 32.2584290880791], [46.5175791979491, 32.2423348516755] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 758,
+         "id" : 142365,
+         "pfafstette" : 242333,
+         "altitude" : 0,
+         "objectid" : 89162,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_89162",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 759,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [47.3506168741989, 31.8962443920527], [47.3702303836294, 31.8962443920527], [47.3708741530855, 31.9122957104926], [47.3499731047427, 31.9304070911921], [47.3249519318806, 31.9423812030764], [47.3051667505951, 31.9515656473173], [47.2934501464933, 31.9510077137887], [47.2876133034243, 31.9325529893792], [47.3006603644021, 31.9233256271745], [47.3276557635964, 31.9144416086797], [47.3506168741989, 31.8962443920527] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 759,
+         "id" : 142371,
+         "pfafstette" : 24223,
+         "altitude" : 0,
+         "objectid" : 89198,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_89198",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 760,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [46.7856447994873, 32.4481264878227], [46.7639283098334, 32.4501865500824], [46.7705376762498, 32.4008308917781], [46.7904086934627, 32.369629532137], [46.7970180598791, 32.4133200192272], [46.7856447994873, 32.4481264878227] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 760,
+         "id" : 142261,
+         "pfafstette" : 2422241,
+         "altitude" : 0,
+         "objectid" : 89216,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_89216",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 761,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [47.7243894204358, 31.67834989013], [47.7382948406885, 31.6682212506867], [47.7525865226149, 31.6688221021791], [47.7707837392419, 31.6709250824025], [47.7977362204724, 31.6839721433803], [47.7997962827321, 31.6964612708295], [47.7944315372642, 31.7056886330342], [47.7825861792712, 31.714915995239], [47.7439170939388, 31.7140147180004], [47.7157199917598, 31.7024697857535], [47.7187671671855, 31.6911823612891], [47.7243894204358, 31.67834989013] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 761,
+         "id" : 142382,
+         "pfafstette" : 2435,
+         "altitude" : 0,
+         "objectid" : 89231,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_89231",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 762,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [47.3200592840139, 31.9096777147043], [47.2950381111518, 31.9131969877312], [47.2763687969236, 31.9069738829885], [47.2627208844534, 31.9119952847464], [47.2478283510346, 31.9051713285113], [47.251605131844, 31.879334714338], [47.2717336568394, 31.8709657114082], [47.2958964704267, 31.8873174555942], [47.3158104056034, 31.8962443920527], [47.3265398965391, 31.8971456692913], [47.3200592840139, 31.9096777147043] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 762,
+         "id" : 142384,
+         "pfafstette" : 24223,
+         "altitude" : 0,
+         "objectid" : 89233,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_89233",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 763,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [45.8723076130745, 32.738552348471], [45.8378874061527, 32.750741050174], [45.8051839177806, 32.7627151620582], [45.7799052371361, 32.7471788591833], [45.787587552646, 32.7189388390405], [45.8232523805164, 32.6981236266252], [45.8640244460722, 32.6960635643655], [45.898444652994, 32.6925013733748], [45.9214057635964, 32.6823727339315], [45.9611907159861, 32.6728449459806], [46.0025636330342, 32.6695831807361], [46.0257822514192, 32.6788534609046], [46.0344516800952, 32.6898404596228], [46.0168553149606, 32.6904413111152], [45.9969413797839, 32.685291155466], [45.9841518265885, 32.7094110510895], [45.9669417231276, 32.7376939891961], [45.9238520875298, 32.7409557544406], [45.8723076130745, 32.738552348471] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 763,
+         "id" : 142298,
+         "name" : "Suwayqiyah",
+         "pfafstette" : 24251,
+         "altitude" : 0,
+         "objectid" : 89308,
+         "scalerank" : 10,
+         "featurecla" : "Alkaline Lake",
+         "note" : "_untitled_89308",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 764,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [45.4817112250504, 32.9207820225233], [45.4754881203076, 32.9249450650064], [45.4522695019227, 32.9234858542391], [45.4301667505951, 32.9345157709211], [45.4104244872734, 32.9416401529024], [45.3814977797107, 32.9362754074345], [45.3672060977843, 32.9157606207654], [45.3735579564182, 32.8985075993408], [45.4145446117927, 32.8946449826039], [45.4480206235122, 32.9070911920894], [45.465574070683, 32.9137005585058], [45.4817112250504, 32.9207820225233] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 764,
+         "id" : 142302,
+         "pfafstette" : 24259,
+         "altitude" : 0,
+         "objectid" : 89312,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_89312",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 765,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [46.6917832127815, 30.6838548342794], [46.6567621543673, 30.7099489562351], [46.5948744506501, 30.707631386193], [46.598393723677, 30.6853140450467], [46.6377065784655, 30.6701640038455], [46.6917832127815, 30.6838548342794] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 765,
+         "id" : 142969,
+         "pfafstette" : 238231,
+         "altitude" : 0,
+         "objectid" : 89735,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_89735",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 766,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [44.2527124153086, 32.03392521974], [44.2202235167552, 32.0479164759202], [44.2014254486358, 32.0318651574803], [44.2285066837576, 31.997702458341], [44.2666178355613, 31.9887755218824], [44.2844287905146, 32.0039255630837], [44.2734417917964, 32.0193331120674], [44.2527124153086, 32.03392521974] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 766,
+         "id" : 142905,
+         "pfafstette" : 2933,
+         "altitude" : 0,
+         "objectid" : 89809,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "note" : "_untitled_89809",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 767,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [36.5268780900934, 34.6502901254349], [36.5200112158945, 34.6306336980406], [36.5552039461637, 34.6289169794909], [36.5625, 34.6319641549167], [36.6040016709394, 34.64943176616], [36.6131861151804, 34.6669422953671], [36.5712981825673, 34.6660410181285], [36.5625, 34.6629080067753], [36.5268780900934, 34.6502901254349] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 767,
+         "id" : 142917,
+         "pfafstette" : 83911,
+         "altitude" : 0,
+         "objectid" : 89876,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_89876",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 768,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [48.1584617057315, 30.5890061344076], [48.1616376350485, 30.6065166636147], [48.1611226194836, 30.6101217725691], [48.1697062122322, 30.6436836202161], [48.1367452160776, 30.6778463193554], [48.1048571690167, 30.6463874519319], [48.1037842199231, 30.5981476606849], [48.1054580205091, 30.5800791979491], [48.1120673869255, 30.570250984252], [48.1033979582494, 30.5592639855338], [48.0942564319722, 30.5476761353232], [48.1048571690167, 30.5301656061161], [48.1212089132027, 30.5280626258927], [48.1334405328694, 30.5316248168834], [48.1440412699139, 30.5524400292987], [48.1584617057315, 30.5890061344076] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 768,
+         "id" : 142795,
+         "pfafstette" : 221,
+         "altitude" : 0,
+         "objectid" : 89891,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "note" : "_untitled_89891",
+         "funkyname" : 0
+      }
+   } ],
+   "numberMatched" : 768,
+   "numberReturned" : 768,
+   "links" : [
+      {
+         "rel" : "self",
+         "type" : "application/geo+json",
+         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/items?limit=1000&f=json"
+      },
+      {
+         "rel" : "alternate",
+         "type" : "text/html",
+         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/items?limit=1000&f=html"
+      },
+      {
+         "rel" : "collection",
+         "type" : "application/json",
+         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe"
+      }
+   ],
+   "timeStamp" : "2024-07-12T14:15:59Z"
+}
diff --git a/autotest/gdrivers/data/ogcapi/request_collections_NaturalEarth_physical_ne_10m_lakes_europe_items.json_limit_20.http_data b/autotest/gdrivers/data/ogcapi/request_collections_NaturalEarth_physical_ne_10m_lakes_europe_items.json_limit_20.http_data
deleted file mode 100644
index 2a15ae0f5c5c..000000000000
--- a/autotest/gdrivers/data/ogcapi/request_collections_NaturalEarth_physical_ne_10m_lakes_europe_items.json_limit_20.http_data
+++ /dev/null
@@ -1,258 +0,0 @@
-HTTP/1.1 200 OK
-Date: Tue, 20 Jun 2023 10:37:54 GMT
-Server: Apache/2.4.52 (Ubuntu)
-Expires: Wed, 12 Jun 2024 14:15:05 GMT
-Access-Control-Allow-Origin: *
-Vary: Accept,Accept-Encoding,Prefer
-Content-Crs: <http://www.opengis.net/def/crs/OGC/1.3/CRS84>
-Content-Length: 15561
-Access-Control-Allow-Headers: x-requested-with, Content-Type, origin, authorization, acc$
-Age: 591768
-Keep-Alive: timeout=5, max=100
-Connection: Keep-Alive
-Content-Type: application/json; charset=utf-8
-
-{
-   "type" : "FeatureCollection",
-   "features" : [ {
-      "type" : "Feature",
-      "id" : 1,
-      "geometry" : {
-         "type" : "Polygon",
-         "coordinates" : [
-            [ [-4.6543673319905, 58.1553000824025], [-4.6250972807178, 58.1436693142282], [-4.6081017670756, 58.1342702801685], [-4.5893036989562, 58.1245279023988], [-4.5722223493866, 58.1163305713239], [-4.5518792345724, 58.1083907480315], [-4.5339395257279, 58.101137612159], [-4.5218366599524, 58.0922965116279], [-4.4935108038821, 58.0780048297015], [-4.4530820820363, 58.0534128364768], [-4.4285330067753, 58.0354731276323], [-4.4254429133858, 58.0470180598791], [-4.4260437648782, 58.0616530855155], [-4.4324814594397, 58.0646573429775], [-4.4707642830983, 58.0880047152536], [-4.5038969511079, 58.1081761582128], [-4.5227808551547, 58.1120816929134], [-4.5409780717817, 58.1248712461088], [-4.5504200238052, 58.126330456876], [-4.563467084783, 58.126330456876], [-4.5802050906427, 58.14002128731], [-4.6111918604651, 58.154055461454], [-4.6317924830617, 58.1573601446622], [-4.6504188793261, 58.1622527925289], [-4.6814056491485, 58.1725960217909], [-4.7105898644937, 58.182252563633], [-4.7324780260026, 58.1904928126717], [-4.7421774858085, 58.1910936641641], [-4.7303321278154, 58.179591649881], [-4.6950535616188, 58.1656003937008], [-4.6762554934994, 58.1598064685955], [-4.6543673319905, 58.1553000824025] ]
-         ]
-      },
-      "properties" : {
-         "feature::id" : 1,
-         "id" : 98696,
-         "name" : "Loch Bhanabhaidh",
-         "pfafstette" : 57,
-         "lke_type" : "N",
-         "altitude" : 92,
-         "objectid" : 52843,
-         "scalerank" : 11,
-         "featurecla" : "Lake",
-         "funkyname" : 0
-      }
-   }, {
-      "type" : "Feature",
-      "id" : 2,
-      "geometry" : {
-         "type" : "Polygon",
-         "coordinates" : [
-            [ [-5.3823418329976, 57.6568508514924], [-5.347063266801, 57.6379669474455], [-5.3269776597693, 57.6345764283098], [-5.3370204632851, 57.6465076222304], [-5.392298800586, 57.6738463651346], [-5.4348734206189, 57.6929448590002], [-5.482598196301, 57.7117858450833], [-5.5333272294452, 57.7340173503021], [-5.5455159311481, 57.7360774125618], [-5.5558162424464, 57.7279229994507], [-5.5528119849844, 57.7191248168834], [-5.5443142281633, 57.7050906427394], [-5.5226835744369, 57.690798960813], [-5.5008812488555, 57.6859921488738], [-5.4810531496063, 57.6883526368797], [-5.4579632851126, 57.690798960813], [-5.4488646767991, 57.6829449734481], [-5.4330708661417, 57.6722584004761], [-5.4098951657206, 57.6668078190808], [-5.3823418329976, 57.6568508514924] ]
-         ]
-      },
-      "properties" : {
-         "feature::id" : 2,
-         "id" : 100550,
-         "name" : "Loch Maree",
-         "pfafstette" : 1,
-         "lke_type" : "N",
-         "altitude" : 39,
-         "objectid" : 54265,
-         "scalerank" : 12,
-         "featurecla" : "Lake",
-         "funkyname" : 0
-      }
-   }, {
-      "type" : "Feature",
-      "id" : 3,
-      "geometry" : {
-         "type" : "Polygon",
-         "coordinates" : [
-            [ [-5.6786474546786, 56.7646722212049], [-5.6926387108588, 56.7644147134225], [-5.7287756363304, 56.7677193966307], [-5.7285181285479, 56.7613675379967], [-5.6886902581945, 56.7580199368248], [-5.6689479948727, 56.7613675379967], [-5.6553000824025, 56.7631700924739], [-5.6409654825124, 56.7664747756821], [-5.625, 56.7784488875664], [-5.6206223676982, 56.7817535707746], [-5.5902364493683, 56.7938993545138], [-5.5324688701703, 56.8212380974181], [-5.471096182018, 56.8537699139352], [-5.4567615821278, 56.8656152719282], [-5.4643151437466, 56.8656152719282], [-5.4819973448086, 56.8574179408533], [-5.5114390679363, 56.8452292391503], [-5.5415674784838, 56.8270320225234], [-5.5850004577916, 56.8078476927303], [-5.625, 56.7896075581395], [-5.6303218275041, 56.7871612342062], [-5.6616519410365, 56.7719682750412], [-5.6786474546786, 56.7646722212049] ]
-         ]
-      },
-      "properties" : {
-         "feature::id" : 3,
-         "line::hidden" : [
-            { "contour" : 0, "segments" : [ { "from" : 2, "to" : 3 } ] }
-         ],
-         "id" : 103640,
-         "pfafstette" : 1,
-         "lke_type" : "N",
-         "altitude" : 3,
-         "objectid" : 56386,
-         "scalerank" : 12,
-         "featurecla" : "Lake",
-         "note" : "_untitled_56386",
-         "funkyname" : 0
-      }
-   }, {
-      "type" : "Feature",
-      "id" : 4,
-      "geometry" : {
-         "type" : "Polygon",
-         "coordinates" : [
-            [ [-4.4452710126351, 56.7525693554294], [-4.4300780534701, 56.7802085240798], [-4.4121383446255, 56.7975044634682], [-4.3905076908991, 56.8154441723128], [-4.3622676707563, 56.8394782320088], [-4.348619758286, 56.8604651162791], [-4.3263882530672, 56.8854004532137], [-4.3102510986999, 56.9020955411097], [-4.3239848470976, 56.8987479399377], [-4.3391778062626, 56.8866021561985], [-4.3531690624428, 56.8725679820546], [-4.366816974913, 56.8576754486358], [-4.4026963926021, 56.82458569859], [-4.4400350210584, 56.7929551593115], [-4.4522237227614, 56.7878050036623], [-4.4626098699872, 56.7699082127816], [-4.4541121131661, 56.7458741530855], [-4.4452710126351, 56.7525693554294] ]
-         ]
-      },
-      "properties" : {
-         "feature::id" : 4,
-         "id" : 103920,
-         "pfafstette" : 943,
-         "lke_type" : "N",
-         "altitude" : 358,
-         "objectid" : 56990,
-         "scalerank" : 12,
-         "featurecla" : "Lake",
-         "note" : "_untitled_56990",
-         "funkyname" : 0
-      }
-   }, {
-      "type" : "Feature",
-      "id" : 5,
-      "geometry" : {
-         "type" : "Polygon",
-         "coordinates" : [
-            [ [-4.2500801135323, 56.6966472486724], [-4.2175482970152, 56.6969047564549], [-4.1923983702619, 56.7048445797473], [-4.2109389305988, 56.7123981413661], [-4.2664747756821, 56.709737227614], [-4.3239848470976, 56.7020978300678], [-4.3674178264054, 56.6999519318806], [-4.4151426020875, 56.6987502288958], [-4.4378891228713, 56.6926129600806], [-4.4206361014466, 56.6908533235671], [-4.3772031221388, 56.68870742538], [-4.3032983885735, 56.6914112570958], [-4.2500801135323, 56.6966472486724] ]
-         ]
-      },
-      "properties" : {
-         "feature::id" : 5,
-         "id" : 104752,
-         "name" : "Loch Rannoch",
-         "pfafstette" : 9153,
-         "lke_type" : "N",
-         "altitude" : 205,
-         "objectid" : 57822,
-         "scalerank" : 12,
-         "featurecla" : "Lake",
-         "funkyname" : 0
-      }
-   }, {
-      "type" : "Feature",
-      "id" : 6,
-      "geometry" : {
-         "type" : "Polygon",
-         "coordinates" : [
-            [ [-5.3078362479399, 56.222790010987], [-5.2792528840872, 56.2403434581578], [-5.2729010254532, 56.25], [-5.2704117835561, 56.2537767808094], [-5.2627723860099, 56.2677251190258], [-5.2476652627724, 56.2771670710493], [-5.2273221479583, 56.2926604559605], [-5.2175368522249, 56.3121452114997], [-5.1989962918879, 56.3296986586706], [-5.1554774766526, 56.346822926204], [-5.1269799487273, 56.3562219602637], [-5.1032892327413, 56.3635180141], [-5.0719591192089, 56.3704707242263], [-5.0512726606849, 56.3814577229445], [-5.0443199505585, 56.3933030809376], [-5.0625171671855, 56.396908189892], [-5.0859503753891, 56.389054202527], [-5.113675379967, 56.3714149194287], [-5.1461213605567, 56.3571232375023], [-5.1713571232375, 56.3537756363303], [-5.2005413385827, 56.3419302783373], [-5.2238887108588, 56.3254926982238], [-5.237879967039, 56.3045058139535], [-5.2577080662882, 56.2860081715803], [-5.2798537355796, 56.2732186183849], [-5.2841455319539, 56.2589269364585], [-5.2931583043399, 56.25], [-5.2995101629738, 56.2437768952573], [-5.3324711591284, 56.2246354834279], [-5.3595094762864, 56.2136484847098], [-5.3755607947262, 56.2081979033144], [-5.3865477934444, 56.1990992950009], [-5.3595094762864, 56.2015456189343], [-5.3078362479399, 56.222790010987] ]
-         ]
-      },
-      "properties" : {
-         "feature::id" : 6,
-         "id" : 105653,
-         "name" : "Loch Awe",
-         "pfafstette" : 15,
-         "lke_type" : "N",
-         "altitude" : 124,
-         "objectid" : 58413,
-         "scalerank" : 11,
-         "featurecla" : "Lake",
-         "funkyname" : 0
-      }
-   }, {
-      "type" : "Feature",
-      "id" : 7,
-      "geometry" : {
-         "type" : "Polygon",
-         "coordinates" : [
-            [ [-4.297204037722, 56.4774652078374], [-4.2798651803699, 56.4799115317707], [-4.2528268632119, 56.4881517808094], [-4.2142006958433, 56.4966066196667], [-4.1719694195202, 56.5033018220106], [-4.1322273850943, 56.5233874290423], [-4.1020131386193, 56.5510265976927], [-4.0838159219923, 56.5665199826039], [-4.0543741988647, 56.5728718412379], [-4.0227865775499, 56.5793095357993], [-4.0139454770189, 56.5869060153818], [-4.0299967954587, 56.5877643746567], [-4.0689663065373, 56.5829575627175], [-4.1214978941586, 56.5546746246109], [-4.1662184123787, 56.520941105109], [-4.1993510803882, 56.5096965986083], [-4.2154023988281, 56.505748145944], [-4.2363463651346, 56.5015851034609], [-4.2777192821828, 56.4923577412562], [-4.3011524903864, 56.4835166407251], [-4.297204037722, 56.4774652078374] ]
-         ]
-      },
-      "properties" : {
-         "feature::id" : 7,
-         "id" : 105409,
-         "pfafstette" : 6551,
-         "lke_type" : "N",
-         "altitude" : 126,
-         "objectid" : 58448,
-         "scalerank" : 12,
-         "featurecla" : "Lake",
-         "note" : "_untitled_58448",
-         "funkyname" : 0
-      }
-   }, {
-      "type" : "Feature",
-      "id" : 8,
-      "geometry" : {
-         "type" : "Polygon",
-         "coordinates" : [
-            [ [-4.5220941677349, 56.06837117744], [-4.5202916132577, 56.0787573246658], [-4.5297335652811, 56.0863108862846], [-4.5428664621864, 56.094250709577], [-4.5553126716719, 56.1036497436367], [-4.569303927852, 56.1103020280168], [-4.5856985900018, 56.1203877494964], [-4.5993465024721, 56.1324476973082], [-4.6193462735763, 56.1360957242263], [-4.6388310291156, 56.1574259522066], [-4.6628650888116, 56.1872539370079], [-4.6805472898737, 56.2030048297015], [-4.6780580479766, 56.2184982146127], [-4.6808047976561, 56.2467811527193], [-4.6817489928585, 56.25], [-4.6895600622597, 56.2762657938107], [-4.6941093664164, 56.2966518265885], [-4.7050963651346, 56.3078534151254], [-4.705697216627, 56.2984543810657], [-4.7011479124702, 56.2796133949826], [-4.7054397088445, 56.2677680369896], [-4.7017487639627, 56.25], [-4.7008045687603, 56.2455365317707], [-4.7008045687603, 56.2194424098151], [-4.7020062717451, 56.2036056811939], [-4.6826073521333, 56.1854513825307], [-4.6701611426479, 56.1720180598791], [-4.6597749954221, 56.1470827229445], [-4.6421786302875, 56.1181560153818], [-4.6364276231459, 56.0926627449185], [-4.6316208112067, 56.072877563633], [-4.6340242171763, 56.063864791247], [-4.6354834279436, 56.0525773667826], [-4.6281873741073, 56.0400882393335], [-4.6096468137704, 56.0239940029299], [-4.5893036989562, 56.017298800586], [-4.590848745651, 56.0281999633767], [-4.5881019959714, 56.0449379692364], [-4.5622653817982, 56.0589721433803], [-4.5375446346823, 56.063864791247], [-4.5220941677349, 56.06837117744] ],
-            [ [-4.6041533144113, 56.0573841787218], [-4.5959130653726, 56.063864791247], [-4.6011490569493, 56.0556245422084], [-4.6041533144113, 56.0573841787218] ]
-         ]
-      },
-      "properties" : {
-         "feature::id" : 8,
-         "id" : 106243,
-         "name" : "Loch Lomond North Basin",
-         "pfafstette" : 15,
-         "lke_type" : "N",
-         "altitude" : 9,
-         "objectid" : 59258,
-         "scalerank" : 10,
-         "featurecla" : "Lake",
-         "funkyname" : 0
-      }
-   }, {
-      "type" : "Feature",
-      "id" : 9,
-      "geometry" : {
-         "type" : "Polygon",
-         "coordinates" : [
-            [ [-7.6527879509248, 54.3903217130562], [-7.6636891137154, 54.4100210584142], [-7.6798262680828, 54.4304070911921], [-7.6992251876946, 54.445943394067], [-7.7226583958982, 54.4659431651712], [-7.730211957517, 54.4884750961362], [-7.7236025911005, 54.4951273805164], [-7.735705456876, 54.5012217313679], [-7.7551902124153, 54.5069727385094], [-7.7514992675334, 54.5167151162791], [-7.7399972532503, 54.5252557910639], [-7.7472933070866, 54.5343114814137], [-7.7671214063358, 54.5377449185131], [-7.7822285295734, 54.5395474729903], [-7.7962197857535, 54.5401483244827], [-7.8105543856437, 54.5395474729903], [-7.8369060153818, 54.5413071095037], [-7.8695236678264, 54.5334531221388], [-7.8938152353049, 54.5213073383996], [-7.9211110602454, 54.5167151162791], [-7.9560462827321, 54.51122161692], [-7.974930186779, 54.4961144936825], [-7.9788786394433, 54.4848270692181], [-7.9873763962644, 54.4875738188976], [-8.0011101446622, 54.48817467039], [-8.0110671122505, 54.4802348470976], [-7.9919257004212, 54.4787756363303], [-7.9092657022523, 54.4817369758286], [-7.8366485075994, 54.476329312397], [-7.8211980406519, 54.4702349615455], [-7.8080651437466, 54.4640976927303], [-7.781627678081, 54.4528961041934], [-7.7506409082586, 54.4389906839407], [-7.7260059970701, 54.4231110373558], [-7.7020577733016, 54.417059604468], [-7.6889248763963, 54.4092056171031], [-7.68128547885, 54.3991198956235], [-7.6691826130745, 54.3857294909357], [-7.654247161692, 54.3735837071965], [-7.6527879509248, 54.3903217130562] ]
-         ]
-      },
-      "properties" : {
-         "feature::id" : 9,
-         "id" : 110629,
-         "name" : "Lower Lough Erne",
-         "lge_id" : "en",
-         "pfafstette" : 1151,
-         "lke_type" : "N",
-         "altitude" : 40,
-         "objectid" : 62367,
-         "scalerank" : 10,
-         "featurecla" : "Lake",
-         "funkyname" : 0
-      }
-   }, {
-      "type" : "Feature",
-      "id" : 10,
-      "geometry" : {
-         "type" : "Polygon",
-         "coordinates" : [
-            [ [-8.1280614814137, 54.4278749313313], [-8.1031690624428, 54.4169308505768], [-8.0888344625527, 54.4241839864494], [-8.0870319080755, 54.4381752426295], [-8.1194778886651, 54.4549132484893], [-8.1817947720198, 54.4688615867057], [-8.2217084783007, 54.4652564777513], [-8.2064296832082, 54.4549132484893], [-8.1815372642373, 54.4491622413477], [-8.1611083134957, 54.4424670390038], [-8.1280614814137, 54.4278749313313] ]
-         ]
-      },
-      "properties" : {
-         "feature::id" : 10,
-         "id" : 110689,
-         "name" : "Melvin ( Lough )",
-         "lge_id" : "en",
-         "pfafstette" : 1,
-         "altitude" : 24,
-         "objectid" : 62564,
-         "scalerank" : 12,
-         "featurecla" : "Lake",
-         "funkyname" : 0
-      }
-   } ],
-   "numberMatched" : 768,
-   "numberReturned" : 10,
-   "links" : [
-      {
-         "rel" : "self",
-         "type" : "application/geo+json",
-         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/items?limit=10&f=json"
-      },
-      {
-         "rel" : "alternate",
-         "type" : "text/html",
-         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/items?limit=10&f=html"
-      },
-      {
-         "rel" : "next",
-         "type" : "application/geo+json",
-         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/items?offset=10&limit=10&f=json"
-      },
-      {
-         "rel" : "collection",
-         "type" : "application/json",
-         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe"
-      }
-   ],
-   "timeStamp" : "2023-06-13T14:15:05Z"
-}
diff --git a/autotest/gdrivers/data/ogcapi/request_collections_NaturalEarth_physical_ne_10m_lakes_europe_items.json_limit_1000.http_data b/autotest/gdrivers/data/ogcapi/request_collections_NaturalEarth_physical_ne_10m_lakes_europe_items.json_limit_20_f_json.http_data
similarity index 52%
rename from autotest/gdrivers/data/ogcapi/request_collections_NaturalEarth_physical_ne_10m_lakes_europe_items.json_limit_1000.http_data
rename to autotest/gdrivers/data/ogcapi/request_collections_NaturalEarth_physical_ne_10m_lakes_europe_items.json_limit_20_f_json.http_data
index 2a15ae0f5c5c..79b615f1cbe7 100644
--- a/autotest/gdrivers/data/ogcapi/request_collections_NaturalEarth_physical_ne_10m_lakes_europe_items.json_limit_1000.http_data
+++ b/autotest/gdrivers/data/ogcapi/request_collections_NaturalEarth_physical_ne_10m_lakes_europe_items.json_limit_20_f_json.http_data
@@ -1,13 +1,13 @@
 HTTP/1.1 200 OK
-Date: Tue, 20 Jun 2023 10:37:54 GMT
+Date: Fri, 12 Jul 2024 14:16:47 GMT
 Server: Apache/2.4.52 (Ubuntu)
-Expires: Wed, 12 Jun 2024 14:15:05 GMT
+Expires: Sat, 12 Jul 2025 14:15:59 GMT
 Access-Control-Allow-Origin: *
 Vary: Accept,Accept-Encoding,Prefer
 Content-Crs: <http://www.opengis.net/def/crs/OGC/1.3/CRS84>
-Content-Length: 15561
+Content-Length: 29139
 Access-Control-Allow-Headers: x-requested-with, Content-Type, origin, authorization, acc$
-Age: 591768
+Age: 48
 Keep-Alive: timeout=5, max=100
 Connection: Keep-Alive
 Content-Type: application/json; charset=utf-8
@@ -229,24 +229,238 @@ Content-Type: application/json; charset=utf-8
          "featurecla" : "Lake",
          "funkyname" : 0
       }
+   }, {
+      "type" : "Feature",
+      "id" : 11,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-9.4830674327046, 53.570545687603], [-9.4472738509431, 53.5696444103644], [-9.3980040285662, 53.5687431331258], [-9.3548285570408, 53.5687431331258], [-9.3198933345541, 53.5866828419703], [-9.3162882255997, 53.6040216993225], [-9.3107947262406, 53.6103735579564], [-9.2964601263505, 53.6085280855155], [-9.2865031587621, 53.6073263825307], [-9.2958592748581, 53.6176696117927], [-9.3010094305072, 53.6307595907343], [-9.2877048617469, 53.6358668284197], [-9.2940567203809, 53.666038156931], [-9.3210950375389, 53.6963382393335], [-9.3463308002198, 53.6766388939755], [-9.3761158670573, 53.6447079289507], [-9.3934547244095, 53.6292145440396], [-9.4028108405054, 53.6238068806079], [-9.4192913385827, 53.6137211591284], [-9.4524240065922, 53.6040216993225], [-9.4791189800403, 53.5970689891961], [-9.4666727705549, 53.5958243682476], [-9.4307933528658, 53.5982277742172], [-9.4067592931698, 53.58874290423], [-9.4171454403955, 53.5775413156931], [-9.4398919611793, 53.5760391869621], [-9.4676169657572, 53.5762966947445], [-9.4830674327046, 53.570545687603] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 11,
+         "id" : 112193,
+         "name" : "Mask ( Lough )",
+         "lge_id" : "en",
+         "pfafstette" : 59,
+         "lke_type" : "R",
+         "altitude" : 17,
+         "objectid" : 63754,
+         "scalerank" : 10,
+         "featurecla" : "Reservoir",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 12,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-9.2281347280718, 54.0468921671855], [-9.2238429316975, 54.0580937557224], [-9.2253021424648, 54.0744884178722], [-9.2350874381981, 54.0833295184032], [-9.2463319446988, 54.0891234435085], [-9.2630699505585, 54.1040159769273], [-9.2897649240066, 54.106076039187], [-9.2983485167552, 54.0909689159495], [-9.2983485167552, 54.0742309100897], [-9.2998077275224, 54.0571495605201], [-9.2842714246475, 54.0416132576451], [-9.2673617469328, 54.0291670481597], [-9.2688209577001, 54.0118281908075], [-9.2666750595129, 53.9991673915034], [-9.2435851950192, 53.9993819813221], [-9.2259029939572, 53.9975794268449], [-9.2132851126168, 53.9939743178905], [-9.1906244277605, 53.9997682429958], [-9.1958604193371, 54.0170212644204], [-9.2204094945981, 54.0307120948544], [-9.2311389855338, 54.0365060199597], [-9.2281347280718, 54.0468921671855] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 12,
+         "id" : 111227,
+         "name" : "Conn (Lough)",
+         "lge_id" : "en",
+         "pfafstette" : 913,
+         "lke_type" : "B",
+         "altitude" : 6,
+         "objectid" : 64142,
+         "scalerank" : 11,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 13,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-9.1654745010072, 53.4271138527742], [-9.1353460904596, 53.4192169474455], [-9.121097326497, 53.4052256912653], [-9.1301959348105, 53.4018780900934], [-9.1386936916316, 53.3967279344442], [-9.1298525911005, 53.3873289003846], [-9.1186080845999, 53.3763419016664], [-9.1292517396081, 53.3669428676067], [-9.1435863394983, 53.3602476652628], [-9.1363761215895, 53.3529086934627], [-9.1274491851309, 53.3423079564182], [-9.1125995696759, 53.3286171259843], [-9.0831578465483, 53.3210635643655], [-9.063329747299, 53.3259132942685], [-9.0526860922908, 53.333509773851], [-9.0457333821645, 53.3423079564182], [-9.0502826863212, 53.3569429820546], [-9.0651323017762, 53.3650973951657], [-9.0810119483611, 53.3842388069951], [-9.0690807544406, 53.4079724409449], [-9.0535444515657, 53.4185731779894], [-9.0714841604102, 53.4219636971251], [-9.0957757278887, 53.4273713605567], [-9.1314834737228, 53.4365128868339], [-9.1489940029299, 53.4375], [-9.1700238051639, 53.4386587850211], [-9.1824700146493, 53.4438518586339], [-9.1888218732833, 53.4526500412012], [-9.2022981138986, 53.4544955136422], [-9.2159460263688, 53.4565555759018], [-9.2208386742355, 53.4717914530306], [-9.2202378227431, 53.4924349935909], [-9.2289930873467, 53.511619323384], [-9.2445293902216, 53.5246663843618], [-9.2542288500275, 53.5338079106391], [-9.2639283098334, 53.5377134453397], [-9.2779195660136, 53.5389580662882], [-9.2897649240066, 53.5389580662882], [-9.3198933345541, 53.5328637154367], [-9.3490775498993, 53.5317049304157], [-9.3837552646036, 53.52831441128], [-9.423239791247, 53.5185720335103], [-9.4469305072331, 53.5152673503021], [-9.4641835286578, 53.5048812030764], [-9.4830674327046, 53.4933362708295], [-9.4994620948544, 53.4985293444424], [-9.5092473905878, 53.5077137886834], [-9.5253845449551, 53.5082288042483], [-9.5149983977294, 53.4948813175243], [-9.4785181285479, 53.486083134957], [-9.4505356161875, 53.4915337163523], [-9.4201496978575, 53.4918341420985], [-9.3891629280352, 53.489087392419], [-9.3733691173778, 53.4842805804798], [-9.3581761582128, 53.4736369254715], [-9.338948910456, 53.469388047061], [-9.3280477476653, 53.4626499267533], [-9.3195499908442, 53.4499032915217], [-9.290365775499, 53.4414055347006], [-9.278520417506, 53.4375], [-9.2672759110053, 53.4337661371544], [-9.2548297015199, 53.4307189617286], [-9.23877838308, 53.4279722120491], [-9.2071049258378, 53.4240666773485], [-9.1654745010072, 53.4271138527742] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 13,
+         "id" : 112557,
+         "name" : "Corrib ( Lough )",
+         "lge_id" : "en",
+         "pfafstette" : 13,
+         "lke_type" : "B",
+         "altitude" : 5,
+         "objectid" : 65702,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 14,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-6.5310840505402, 53.1141989791247], [-6.5249896996887, 53.1144994048709], [-6.5085092016114, 53.1193920527376], [-6.4769215802967, 53.1312374107306], [-6.4613852774217, 53.148876693829], [-6.4835309467131, 53.1619237548068], [-6.5057624519319, 53.177760483428], [-6.5045607489471, 53.1883612204725], [-6.4860201886102, 53.1917088216444], [-6.4726297839224, 53.1971594030397], [-6.4933162424465, 53.1969018952573], [-6.5152044039553, 53.1838548342794], [-6.5261914026735, 53.1683614493683], [-6.5465345174877, 53.1558723219191], [-6.5607832814503, 53.1452286669108], [-6.5537447353965, 53.1406364447903], [-6.5458478300678, 53.1458295184032], [-6.5361483702619, 53.15037882256], [-6.520097051822, 53.1604216260758], [-6.5078225141916, 53.1649280122688], [-6.5036165537447, 53.1540697674419], [-6.5167494506501, 53.1400355932979], [-6.5315990661051, 53.1251430598792], [-6.5310840505402, 53.1141989791247] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 14,
+         "id" : 114569,
+         "name" : "Pollaphuca Reservoir",
+         "lge_id" : "en",
+         "pfafstette" : 7971,
+         "lke_type" : "B",
+         "altitude" : 182,
+         "objectid" : 67053,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 15,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-9.5356848562534, 52.0244260437649], [-9.5137966947446, 52.0198338216444], [-9.5062431331258, 52.026571941952], [-9.5163717725691, 52.032923800586], [-9.5101915857902, 52.0377735304889], [-9.4892476194836, 52.0423657526094], [-9.4880459164988, 52.0503055759019], [-9.5004921259843, 52.0520652124153], [-9.5153417414393, 52.0529664896539], [-9.52658624794, 52.0663998123054], [-9.5378307544406, 52.0760992721113], [-9.5573155099799, 52.0788460217909], [-9.5846113349204, 52.0788460217909], [-9.5970575444058, 52.0709491164622], [-9.5867572331075, 52.0636101446622], [-9.5719076176525, 52.0539106848563], [-9.5561138069951, 52.0438249633767], [-9.5488177531588, 52.0350267808094], [-9.5356848562534, 52.0244260437649] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 15,
+         "id" : 116430,
+         "name" : "Leane ( Lough )",
+         "lge_id" : "en",
+         "pfafstette" : 551,
+         "lke_type" : "B",
+         "altitude" : 17,
+         "objectid" : 67929,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 16,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-2.0954266617836, 47.3628055759019], [-2.083838811573, 47.3615609549533], [-2.0784311481414, 47.3710458249405], [-2.0884739516572, 47.3882988463651], [-2.1040102545321, 47.39683952115], [-2.1249542208387, 47.3947365409266], [-2.1416922266984, 47.3971828648599], [-2.1561984984435, 47.40417849295], [-2.1749965665629, 47.4184701748764], [-2.1878719556858, 47.4303155328694], [-2.1845243545138, 47.4184701748764], [-2.1784300036623, 47.3928910684856], [-2.1668421534518, 47.3667540285662], [-2.138258789599, 47.3570545687603], [-2.1243533693463, 47.3640072788867], [-2.1097612616737, 47.3792860739791], [-2.0920790606116, 47.3843933116645], [-2.0945683025087, 47.3716037584691], [-2.0954266617836, 47.3628055759019] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 16,
+         "id" : 131773,
+         "pfafstette" : 3,
+         "altitude" : 0,
+         "objectid" : 80857,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_80857",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 17,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-1.7005813953488, 47.1181731825673], [-1.7072765976927, 47.0974867240432], [-1.6914827870353, 47.0810491439297], [-1.6659036806446, 47.0761994140267], [-1.64830731551, 47.0831521241531], [-1.6388653634865, 47.0928945019227], [-1.642298800586, 47.1114779802234], [-1.6705388207288, 47.1272717908808], [-1.7005813953488, 47.1181731825673] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 17,
+         "id" : 132438,
+         "pfafstette" : 1231,
+         "lke_type" : "N",
+         "altitude" : -1,
+         "objectid" : 82683,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_82683",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 18,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-1.1866387795275, 44.3152009705182], [-1.1759951245193, 44.3221536806446], [-1.1623472120491, 44.3333981871452], [-1.1246223219191, 44.3422392876763], [-1.099429477202, 44.3516812396997], [-1.1121761124336, 44.3580330983336], [-1.1417036714887, 44.3662304294085], [-1.1727333592748, 44.3853718412379], [-1.1936344076176, 44.3923245513642], [-1.1996858405054, 44.36498580846], [-1.1933339818714, 44.3291493087347], [-1.1866387795275, 44.3152009705182] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 18,
+         "id" : 136391,
+         "name" : "tang de Biscarrosse",
+         "pfafstette" : 51,
+         "lke_type" : "N",
+         "altitude" : 18,
+         "objectid" : 84651,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 19,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-1.1796860694012, 44.4434827641458], [-1.1596004623695, 44.4486329197949], [-1.1511027055484, 44.4567873329061], [-1.1298153955319, 44.473825764512], [-1.0911892281633, 44.4936109457975], [-1.0905454587072, 44.5039112570958], [-1.1155237136056, 44.5176020875298], [-1.1331629967039, 44.5251985671123], [-1.150501854056, 44.5324946209486], [-1.1723470976012, 44.5322371131661], [-1.1935914896539, 44.5167437282549], [-1.1978832860282, 44.4929671763413], [-1.197239516572, 44.4720661279985], [-1.1954369620948, 44.4559289736312], [-1.1796860694012, 44.4434827641458] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 19,
+         "id" : 136281,
+         "name" : "tang de Cazaux",
+         "pfafstette" : 191,
+         "lke_type" : "N",
+         "altitude" : 20,
+         "objectid" : 84907,
+         "scalerank" : 10,
+         "featurecla" : "Lake",
+         "funkyname" : 0
+      }
+   }, {
+      "type" : "Feature",
+      "id" : 20,
+      "geometry" : {
+         "type" : "Polygon",
+         "coordinates" : [
+            [ [-5.0605429408533, 42.9805381340414], [-5.0812723173412, 42.9634997024355], [-5.0770663568943, 42.9557744689617], [-5.0524743636697, 42.9529418833547], [-5.0342771470427, 42.9700232329244], [-5.0190412699139, 42.9679631706647], [-5.0093847280718, 42.9687356940121], [-4.9996423503021, 42.9663322880425], [-4.9853506683758, 42.9665468778612], [-4.9798571690167, 42.9708386742355], [-4.9883978438015, 42.9841861609595], [-4.9999427760483, 43.0033704907526], [-5.0077967634133, 43.0149154229995], [-5.0096422358542, 43.0051301272661], [-5.0261227339315, 42.993284769273], [-5.0439766068486, 42.9854307819081], [-5.0605429408533, 42.9805381340414] ]
+         ]
+      },
+      "properties" : {
+         "feature::id" : 20,
+         "id" : 137030,
+         "pfafstette" : 49793,
+         "lke_type" : "N",
+         "altitude" : 1089,
+         "objectid" : 85068,
+         "scalerank" : 12,
+         "featurecla" : "Lake",
+         "note" : "_untitled_85068",
+         "funkyname" : 0
+      }
    } ],
    "numberMatched" : 768,
-   "numberReturned" : 10,
+   "numberReturned" : 20,
    "links" : [
       {
          "rel" : "self",
          "type" : "application/geo+json",
-         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/items?limit=10&f=json"
+         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/items?limit=20&f=json"
       },
       {
          "rel" : "alternate",
          "type" : "text/html",
-         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/items?limit=10&f=html"
+         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/items?limit=20&f=html"
       },
       {
          "rel" : "next",
          "type" : "application/geo+json",
-         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/items?offset=10&limit=10&f=json"
+         "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe/items?offset=20&limit=20&f=json"
       },
       {
          "rel" : "collection",
@@ -254,5 +468,5 @@ Content-Type: application/json; charset=utf-8
          "href" : "http://127.0.0.1:8080/fakeogcapi/collections/NaturalEarth:physical:ne_10m_lakes_europe"
       }
    ],
-   "timeStamp" : "2023-06-13T14:15:05Z"
+   "timeStamp" : "2024-07-12T14:15:59Z"
 }
diff --git a/autotest/gdrivers/data/ogcapi/request_collections_NaturalEarth_physical_ne_10m_lakes_europe_map.png_width_256_height_256_bbox_-9.5433_53.0905_-8.8722_53.7616.http_data b/autotest/gdrivers/data/ogcapi/request_collections_NaturalEarth_physical_ne_10m_lakes_europe_map.png_width_256_height_256_bbox_-9.5433_53.0905_-8.8722_53.7616.http_data
new file mode 100644
index 000000000000..fb2122ed9eea
Binary files /dev/null and b/autotest/gdrivers/data/ogcapi/request_collections_NaturalEarth_physical_ne_10m_lakes_europe_map.png_width_256_height_256_bbox_-9.5433_53.0905_-8.8722_53.7616.http_data differ
diff --git a/autotest/gdrivers/data/ogcapi/request_collections_NaturalEarth_physical_ne_10m_lakes_europe_map.png_width_256_height_256_bbox_-9.5446_52.4188_-8.2024_53.7610.http_data b/autotest/gdrivers/data/ogcapi/request_collections_NaturalEarth_physical_ne_10m_lakes_europe_map.png_width_256_height_256_bbox_-9.5446_52.4188_-8.2024_53.7610.http_data
deleted file mode 100644
index f6a708ca6132..000000000000
Binary files a/autotest/gdrivers/data/ogcapi/request_collections_NaturalEarth_physical_ne_10m_lakes_europe_map.png_width_256_height_256_bbox_-9.5446_52.4188_-8.2024_53.7610.http_data and /dev/null differ
diff --git a/autotest/gdrivers/data/ogcapi/request_collections_SRTM_ViewFinderPanorama_coverage_f_tif_subset_Lon_-9.1406_-8.4375__Lat_53.0627_53.7658__scaleSize_Lon_256__Lat_256_.http_data b/autotest/gdrivers/data/ogcapi/request_collections_SRTM_ViewFinderPanorama_coverage_f_tif_subset_Lon_-9.1406_-8.4375__Lat_53.0627_53.7658__scaleSize_Lon_256__Lat_256_.http_data
new file mode 100644
index 000000000000..ef7d0f77d13e
Binary files /dev/null and b/autotest/gdrivers/data/ogcapi/request_collections_SRTM_ViewFinderPanorama_coverage_f_tif_subset_Lon_-9.1406_-8.4375__Lat_53.0627_53.7658__scaleSize_Lon_256__Lat_256_.http_data differ
diff --git a/autotest/gdrivers/data/ogcapi/request_collections_SRTM_ViewFinderPanorama_coverage_f_tif_subset_Lon_-9.8437_-8.4375__Lat_53.0627_54.4689__scaleSize_Lon_256__Lat_256_.http_data b/autotest/gdrivers/data/ogcapi/request_collections_SRTM_ViewFinderPanorama_coverage_f_tif_subset_Lon_-9.8437_-8.4375__Lat_53.0627_54.4689__scaleSize_Lon_256__Lat_256_.http_data
deleted file mode 100644
index 98e25ab8500a..000000000000
Binary files a/autotest/gdrivers/data/ogcapi/request_collections_SRTM_ViewFinderPanorama_coverage_f_tif_subset_Lon_-9.8437_-8.4375__Lat_53.0627_54.4689__scaleSize_Lon_256__Lat_256_.http_data and /dev/null differ
diff --git a/autotest/gdrivers/data/ogcapi/request_collections_SRTM_ViewFinderPanorama_coverage_f_tif_subset_Lon_-9.8437_-9.1406__Lat_53.0627_53.7658__scaleSize_Lon_256__Lat_256_.http_data b/autotest/gdrivers/data/ogcapi/request_collections_SRTM_ViewFinderPanorama_coverage_f_tif_subset_Lon_-9.8437_-9.1406__Lat_53.0627_53.7658__scaleSize_Lon_256__Lat_256_.http_data
new file mode 100644
index 000000000000..1c5cf06b2cb3
Binary files /dev/null and b/autotest/gdrivers/data/ogcapi/request_collections_SRTM_ViewFinderPanorama_coverage_f_tif_subset_Lon_-9.8437_-9.1406__Lat_53.0627_53.7658__scaleSize_Lon_256__Lat_256_.http_data differ
diff --git a/autotest/gdrivers/data/ogcapi/request_f_json.http_data b/autotest/gdrivers/data/ogcapi/request_f_json.http_data
new file mode 100644
index 000000000000..f0ee88ae3535
--- /dev/null
+++ b/autotest/gdrivers/data/ogcapi/request_f_json.http_data
@@ -0,0 +1,107 @@
+HTTP/1.1 200 OK
+Date: Fri, 12 Jul 2024 14:16:47 GMT
+Server: Apache/2.4.52 (Ubuntu)
+Expires: Sat, 12 Jul 2025 14:15:59 GMT
+Access-Control-Allow-Origin: *
+Vary: Accept,Accept-Encoding,Prefer
+Content-Length: 4397
+Access-Control-Allow-Headers: x-requested-with, Content-Type, origin, authorization, acc$
+Age: 48
+Keep-Alive: timeout=5, max=100
+Connection: Keep-Alive
+Content-Type: application/json
+
+{
+   "links" : [
+      {
+         "rel" : "self",
+         "type" : "application/json",
+         "title" : "The JSON representation of the landing page for this OGC (geospatial) API Service providing links to the API definition, the conformance declaration and information about the data collections offered at this endpoint.",
+         "href" : "http://127.0.0.1:8080/fakeogcapi?f=json"
+      },
+      {
+         "rel" : "alternate",
+         "type" : "text/plain",
+         "title" : "The ECON representation of the landing page for this OGC (geospatial) API Service providing links to the API definition, the conformance declaration and information about the data collections offered at this endpoint.",
+         "href" : "http://127.0.0.1:8080/fakeogcapi?f=econ"
+      },
+      {
+         "rel" : "alternate",
+         "type" : "text/html",
+         "title" : "The HTML representation of the landing page for this OGC (geospatial) API Service providing links to the API definition, the conformance declaration and information about the data collections offered at this endpoint.",
+         "href" : "http://127.0.0.1:8080/fakeogcapi?f=html"
+      },
+      {
+         "rel" : "service-desc",
+         "type" : "application/vnd.oai.openapi+json;version=3.0",
+         "title" : "The JSON OpenAPI 3.0 document that describes the API offered at this endpoint",
+         "href" : "http://127.0.0.1:8080/fakeogcapi/api?f=json"
+      },
+      {
+         "rel" : "service-doc",
+         "type" : "text/html",
+         "title" : "The HTML documentation of the API offered at this endpoint",
+         "href" : "http://127.0.0.1:8080/fakeogcapi/api?f=html"
+      },
+      {
+         "rel" : "http://www.opengis.net/def/rel/ogc/1.0/conformance",
+         "type" : "application/json",
+         "title" : "The JSON representation of the conformance declaration for this server listing the requirement classes implemented by this server",
+         "href" : "http://127.0.0.1:8080/fakeogcapi/conformance"
+      },
+      {
+         "rel" : "conformance",
+         "type" : "application/json",
+         "title" : "The JSON representation of the conformance declaration for this server listing the requirement classes implemented by this server",
+         "href" : "http://127.0.0.1:8080/fakeogcapi/conformance"
+      },
+      {
+         "rel" : "data",
+         "type" : "application/json",
+         "title" : "The JSON representation of the list of all data collections served from this endpoint",
+         "href" : "http://127.0.0.1:8080/fakeogcapi/collections?f=json"
+      },
+      {
+         "rel" : "data",
+         "type" : "text/plain",
+         "title" : "The ECON representation of the list of all data collections served from this endpoint",
+         "href" : "http://127.0.0.1:8080/fakeogcapi/collections?f=econ"
+      },
+      {
+         "rel" : "data",
+         "type" : "text/html",
+         "title" : "The HTML representation of the list of all data collections served from this endpoint",
+         "href" : "http://127.0.0.1:8080/fakeogcapi/collections?f=html"
+      },
+      {
+         "rel" : "http://www.opengis.net/def/rel/ogc/1.0/processes",
+         "type" : "application/json",
+         "title" : "The JSON representation of the list of all processes available from this endpoint",
+         "href" : "http://127.0.0.1:8080/fakeogcapi/processes"
+      },
+      {
+         "rel" : "http://www.opengis.net/def/rel/ogc/1.0/routes",
+         "type" : "application/json",
+         "title" : "Routing end-point",
+         "href" : "http://127.0.0.1:8080/fakeogcapi/routes"
+      },
+      {
+         "rel" : "http://www.opengis.net/def/rel/ogc/1.0/tiling-schemes",
+         "type" : "application/json",
+         "title" : "The list of supported tiling schemes (as JSON)",
+         "href" : "http://127.0.0.1:8080/fakeogcapi/tileMatrixSets?f=json"
+      },
+      {
+         "rel" : "http://www.opengis.net/def/rel/ogc/1.0/tiling-schemes",
+         "type" : "text/plain",
+         "title" : "The list of supported tiling schemes (as ECON)",
+         "href" : "http://127.0.0.1:8080/fakeogcapi/tileMatrixSets?f=econ"
+      },
+      {
+         "rel" : "http://www.opengis.net/def/rel/ogc/1.0/tiling-schemes",
+         "type" : "text/html",
+         "title" : "The list of supported tiling schemes (as HTML)",
+         "href" : "http://127.0.0.1:8080/fakeogcapi/tileMatrixSets?f=html"
+      }
+   ]
+}
diff --git a/autotest/gdrivers/data/s102/MD_test_s102_v3.0_with_QualityOfBathymetryCoverage.xml b/autotest/gdrivers/data/s102/MD_test_s102_v3.0_with_QualityOfBathymetryCoverage.xml
new file mode 100644
index 000000000000..7d5c8daa45e2
--- /dev/null
+++ b/autotest/gdrivers/data/s102/MD_test_s102_v3.0_with_QualityOfBathymetryCoverage.xml
@@ -0,0 +1 @@
+<nothing/>
\ No newline at end of file
diff --git a/autotest/gdrivers/data/s102/generate_test.py b/autotest/gdrivers/data/s102/generate_test.py
index c4d3f81a8ed3..d00b5c1581e4 100755
--- a/autotest/gdrivers/data/s102/generate_test.py
+++ b/autotest/gdrivers/data/s102/generate_test.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -35,7 +19,13 @@
 import numpy as np
 
 
-def generate(filename, version, with_QualityOfSurvey=False):
+def generate(
+    filename,
+    version,
+    with_QualityOfSurvey=False,
+    with_QualityOfCoverage=False,
+    use_compound_type_for_Quality=False,
+):
     f = h5py.File(os.path.join(os.path.dirname(__file__), f"{filename}.h5"), "w")
     BathymetryCoverage = f.create_group("BathymetryCoverage")
     BathymetryCoverage_01 = BathymetryCoverage.create_group("BathymetryCoverage.01")
@@ -71,7 +61,7 @@ def generate(filename, version, with_QualityOfSurvey=False):
     f.attrs["issueDate"] = "2023-12-31"
     f.attrs["geographicIdentifier"] = "Somewhere"
     f.attrs["verticalDatum"] = np.int16(12)
-    if version == "INT.IHO.S-102.2.2":
+    if version >= "INT.IHO.S-102.2.2":
         f.attrs["horizontalCRS"] = np.int32(4326)
         f.attrs["verticalCS"] = np.int32(6498)  # Depth, metres, orientation down
         f.attrs["verticalCoordinateBase"] = np.int32(2)
@@ -90,9 +80,12 @@ def generate(filename, version, with_QualityOfSurvey=False):
         b"<nothing/>"
     )
 
-    if with_QualityOfSurvey:
-        QualityOfSurvey = f.create_group("QualityOfSurvey")
-        QualityOfSurvey_01 = QualityOfSurvey.create_group("QualityOfSurvey.01")
+    if with_QualityOfSurvey or with_QualityOfCoverage:
+        quality_name = (
+            "QualityOfSurvey" if with_QualityOfSurvey else "QualityOfBathymetryCoverage"
+        )
+        qualityGroup = f.create_group(quality_name)
+        quality01Group = qualityGroup.create_group(quality_name + ".01")
 
         for attr_name in (
             "gridOriginLongitude",
@@ -102,16 +95,26 @@ def generate(filename, version, with_QualityOfSurvey=False):
             "numPointsLongitudinal",
             "numPointsLatitudinal",
         ):
-            QualityOfSurvey_01.attrs[attr_name] = BathymetryCoverage_01.attrs[attr_name]
-
-        Group_001 = QualityOfSurvey_01.create_group("Group_001")
-
-        values = Group_001.create_dataset("values", (2, 3), dtype=np.uint32)
-        data = np.array(
-            [0, 1, 2, 1000000, 3, 2],
-            dtype=np.uint32,
-        ).reshape(values.shape)
-        values[...] = data
+            quality01Group.attrs[attr_name] = BathymetryCoverage_01.attrs[attr_name]
+
+        Group_001 = quality01Group.create_group("Group_001")
+
+        if use_compound_type_for_Quality:
+            # As found in product 102DE00CA22_UNC_MD.H5
+            data_struct_type = np.dtype([("iD", "u4")])
+            values = Group_001.create_dataset("values", (2, 3), dtype=data_struct_type)
+            data = np.array(
+                [(0), (1), (2), (1000000), (3), (2)],
+                dtype=data_struct_type,
+            ).reshape(values.shape)
+            values[...] = data
+        else:
+            values = Group_001.create_dataset("values", (2, 3), dtype=np.uint32)
+            data = np.array(
+                [0, 1, 2, 1000000, 3, 2],
+                dtype=np.uint32,
+            ).reshape(values.shape)
+            values[...] = data
 
         featureAttributeTable_struct_type = np.dtype(
             [
@@ -121,7 +124,7 @@ def generate(filename, version, with_QualityOfSurvey=False):
             ]
         )
 
-        featureAttributeTable = QualityOfSurvey.create_dataset(
+        featureAttributeTable = qualityGroup.create_dataset(
             "featureAttributeTable", (5,), dtype=featureAttributeTable_struct_type
         )
 
@@ -137,7 +140,7 @@ def generate(filename, version, with_QualityOfSurvey=False):
         )
         featureAttributeTable[...] = data
 
-        GroupFQualityOfSurvey_struct_type = np.dtype(
+        GroupFQuality_struct_type = np.dtype(
             [
                 ("code", "S16"),
                 ("name", "S16"),
@@ -149,12 +152,12 @@ def generate(filename, version, with_QualityOfSurvey=False):
                 ("closure", "S16"),
             ]
         )
-        GroupFQualityOfSurvey = group_f.create_dataset(
-            "QualityOfSurvey", (1,), dtype=GroupFQualityOfSurvey_struct_type
+        GroupFQuality = group_f.create_dataset(
+            quality_name, (1,), dtype=GroupFQuality_struct_type
         )
-        GroupFQualityOfSurvey[...] = np.array(
+        GroupFQuality[...] = np.array(
             [("id", "", "", "0", "H5T_INTEGER", "1", "", "geSemiInterval")],
-            dtype=GroupFQualityOfSurvey_struct_type,
+            dtype=GroupFQuality_struct_type,
         )
 
 
@@ -166,3 +169,10 @@ def generate(filename, version, with_QualityOfSurvey=False):
     "INT.IHO.S-102.2.2",
     with_QualityOfSurvey=True,
 )
+
+generate(
+    "test_s102_v3.0_with_QualityOfBathymetryCoverage",
+    "INT.IHO.S-102.3.0.0",
+    with_QualityOfCoverage=True,
+    use_compound_type_for_Quality=True,
+)
diff --git a/autotest/gdrivers/data/s102/test_s102_v3.0_with_QualityOfBathymetryCoverage.h5 b/autotest/gdrivers/data/s102/test_s102_v3.0_with_QualityOfBathymetryCoverage.h5
new file mode 100644
index 000000000000..8877ede735bb
Binary files /dev/null and b/autotest/gdrivers/data/s102/test_s102_v3.0_with_QualityOfBathymetryCoverage.h5 differ
diff --git a/autotest/gdrivers/data/s104/generate_test.py b/autotest/gdrivers/data/s104/generate_test.py
index ff4ea7c9097e..8104232cde1b 100755
--- a/autotest/gdrivers/data/s104/generate_test.py
+++ b/autotest/gdrivers/data/s104/generate_test.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/data/s111/generate_test.py b/autotest/gdrivers/data/s111/generate_test.py
index 70c402484855..f7c13aa27e88 100755
--- a/autotest/gdrivers/data/s111/generate_test.py
+++ b/autotest/gdrivers/data/s111/generate_test.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/data/snap_tiff/S1A_IW_GRDH_1SDV_20171009T141532_20171009T141557_018737_01F9E2_E974_tnr_empty_truncated.tif.zip.zip b/autotest/gdrivers/data/snap_tiff/S1A_IW_GRDH_1SDV_20171009T141532_20171009T141557_018737_01F9E2_E974_tnr_empty_truncated.tif.zip.zip
new file mode 100644
index 000000000000..521325d7b95d
Binary files /dev/null and b/autotest/gdrivers/data/snap_tiff/S1A_IW_GRDH_1SDV_20171009T141532_20171009T141557_018737_01F9E2_E974_tnr_empty_truncated.tif.zip.zip differ
diff --git a/autotest/gdrivers/data/stacit/test.json b/autotest/gdrivers/data/stacit/test.json
index 5f5a0f6f84b8..120eaae8cfcb 100644
--- a/autotest/gdrivers/data/stacit/test.json
+++ b/autotest/gdrivers/data/stacit/test.json
@@ -14,7 +14,7 @@
       "geometry": null,
       "properties": {
         "datetime": "2021-07-19T10:57:30Z",
-        "proj:epsg": 26711,
+        "proj:epsg": 26711
       },
       "collection": "my_collection",
       "assets": {
diff --git a/autotest/gdrivers/data/stacit/test_page2.json b/autotest/gdrivers/data/stacit/test_page2.json
index 003d2926f31d..7a4cc1bcdd84 100644
--- a/autotest/gdrivers/data/stacit/test_page2.json
+++ b/autotest/gdrivers/data/stacit/test_page2.json
@@ -13,7 +13,7 @@
       "id": "int16",
       "geometry": null,
       "properties": {
-        "datetime": "2021-07-19T10:57:30Z",
+        "datetime": "2021-07-19T10:57:30Z"
       },
       "collection": "my_collection",
       "assets": {
diff --git a/autotest/gdrivers/data/vrt/lut_with_nan.vrt b/autotest/gdrivers/data/vrt/lut_with_nan.vrt
new file mode 100644
index 000000000000..096afea3203d
--- /dev/null
+++ b/autotest/gdrivers/data/vrt/lut_with_nan.vrt
@@ -0,0 +1,9 @@
+<VRTDataset rasterXSize="3" rasterYSize="2">
+  <VRTRasterBand dataType="Byte" band="1">
+    <ComplexSource>
+      <SourceFilename relativeToVRT="1">../aaigrid/nodata_nan.asc</SourceFilename>
+      <SourceBand>1</SourceBand>
+      <LUT>nan:0,0:10,2:20</LUT>
+    </ComplexSource>
+  </VRTRasterBand>
+</VRTDataset>
diff --git a/autotest/gdrivers/data/wms/demo_mapserver_org.xml b/autotest/gdrivers/data/wms/demo_mapserver_org.xml
new file mode 100644
index 000000000000..f76a7c536988
--- /dev/null
+++ b/autotest/gdrivers/data/wms/demo_mapserver_org.xml
@@ -0,0 +1,215 @@
+<?xml version='1.0' encoding="UTF-8" standalone="no" ?>
+<WMS_Capabilities version="1.3.0"  xmlns="http://www.opengis.net/wms"   xmlns:sld="http://www.opengis.net/sld"   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"   xmlns:ms="http://mapserver.gis.umn.edu/mapserver"   xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd  http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd  http://mapserver.gis.umn.edu/mapserver https://demo.mapserver.org/cgi-bin/wms?service=WMS&amp;version=1.3.0&amp;request=GetSchemaExtension">
+<Service>
+  <Name>WMS</Name>
+  <Title>WMS Demo Server for MapServer</Title>
+  <Abstract>This demonstration server showcases MapServer (www.mapserver.org) and its OGC support</Abstract>
+  <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://demo.mapserver.org/cgi-bin/wms?"/>
+  <ContactInformation>
+    <ContactPersonPrimary>
+      <ContactPerson>Jeff McKenna</ContactPerson>
+      <ContactOrganization>GatewayGeo</ContactOrganization>
+    </ContactPersonPrimary>
+      <ContactPosition>Director</ContactPosition>
+  <ContactElectronicMailAddress>info@gatewaygeomatics.com</ContactElectronicMailAddress>
+  </ContactInformation>
+  <MaxWidth>4096</MaxWidth>
+  <MaxHeight>4096</MaxHeight>
+</Service>
+
+<Capability>
+  <Request>
+    <GetCapabilities>
+      <Format>text/xml</Format>
+      <DCPType>
+        <HTTP>
+          <Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://demo.mapserver.org/cgi-bin/wms?"/></Get>
+          <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://demo.mapserver.org/cgi-bin/wms?"/></Post>
+        </HTTP>
+      </DCPType>
+    </GetCapabilities>
+    <GetMap>
+      <Format>image/png</Format>
+      <Format>image/jpeg</Format>
+      <Format>image/png; mode=8bit</Format>
+      <Format>image/vnd.jpeg-png</Format>
+      <Format>image/vnd.jpeg-png8</Format>
+      <Format>application/x-pdf</Format>
+      <Format>image/svg+xml</Format>
+      <Format>image/tiff</Format>
+      <Format>application/vnd.google-earth.kml+xml</Format>
+      <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
+      <Format>application/x-protobuf</Format>
+      <Format>application/json</Format>
+      <DCPType>
+        <HTTP>
+          <Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://demo.mapserver.org/cgi-bin/wms?"/></Get>
+          <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://demo.mapserver.org/cgi-bin/wms?"/></Post>
+        </HTTP>
+      </DCPType>
+    </GetMap>
+    <GetFeatureInfo>
+      <Format>text/html</Format>
+      <Format>application/vnd.ogc.gml</Format>
+      <Format>text/plain</Format>
+      <DCPType>
+        <HTTP>
+          <Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://demo.mapserver.org/cgi-bin/wms?"/></Get>
+          <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://demo.mapserver.org/cgi-bin/wms?"/></Post>
+        </HTTP>
+      </DCPType>
+    </GetFeatureInfo>
+    <sld:DescribeLayer>
+      <Format>text/xml</Format>
+      <DCPType>
+        <HTTP>
+          <Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://demo.mapserver.org/cgi-bin/wms?"/></Get>
+          <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://demo.mapserver.org/cgi-bin/wms?"/></Post>
+        </HTTP>
+      </DCPType>
+    </sld:DescribeLayer>
+    <sld:GetLegendGraphic>
+      <Format>image/png</Format>
+      <Format>image/jpeg</Format>
+      <Format>image/png; mode=8bit</Format>
+      <Format>image/vnd.jpeg-png</Format>
+      <Format>image/vnd.jpeg-png8</Format>
+      <DCPType>
+        <HTTP>
+          <Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://demo.mapserver.org/cgi-bin/wms?"/></Get>
+          <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://demo.mapserver.org/cgi-bin/wms?"/></Post>
+        </HTTP>
+      </DCPType>
+    </sld:GetLegendGraphic>
+    <ms:GetStyles>
+      <Format>text/xml</Format>
+      <DCPType>
+        <HTTP>
+          <Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://demo.mapserver.org/cgi-bin/wms?"/></Get>
+          <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://demo.mapserver.org/cgi-bin/wms?"/></Post>
+        </HTTP>
+      </DCPType>
+    </ms:GetStyles>
+  </Request>
+  <Exception>
+    <Format>XML</Format>
+    <Format>INIMAGE</Format>
+    <Format>BLANK</Format>
+  </Exception>
+  <sld:UserDefinedSymbolization SupportSLD="1" UserLayer="0" UserStyle="1" RemoteWFS="0" InlineFeature="0" RemoteWCS="0"/>
+  <Layer queryable="1">
+    <Name>WMS_server</Name>
+    <Title>WMS Demo Server for MapServer</Title>
+    <Abstract>This demonstration server showcases MapServer (www.mapserver.org) and its OGC support</Abstract>
+    <CRS>EPSG:4326</CRS>
+    <CRS>EPSG:4269</CRS>
+    <CRS>EPSG:3978</CRS>
+    <CRS>EPSG:3857</CRS>
+    <EX_GeographicBoundingBox>
+        <westBoundLongitude>-180.000000</westBoundLongitude>
+        <eastBoundLongitude>180.000000</eastBoundLongitude>
+        <southBoundLatitude>-90.000000</southBoundLatitude>
+        <northBoundLatitude>90.000000</northBoundLatitude>
+    </EX_GeographicBoundingBox>
+    <BoundingBox CRS="EPSG:4326"
+                minx="-90.000000" miny="-180.000000" maxx="90.000000" maxy="180.000000" />
+    <Layer queryable="0" opaque="0" cascaded="0">
+        <Name>bluemarble</Name>
+        <Title>Blue Marble World Elevation and Bathymetry Raster</Title>
+        <CRS>EPSG:4326</CRS>
+        <EX_GeographicBoundingBox>
+            <westBoundLongitude>-180.000000</westBoundLongitude>
+            <eastBoundLongitude>180.000000</eastBoundLongitude>
+            <southBoundLatitude>-90.000000</southBoundLatitude>
+            <northBoundLatitude>90.000000</northBoundLatitude>
+        </EX_GeographicBoundingBox>
+        <BoundingBox CRS="EPSG:4326"
+                    minx="-90.000000" miny="-180.000000" maxx="90.000000" maxy="180.000000" />
+    <Attribution>
+        <Title>NASA Blue Marble</Title>
+        <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://earthobservatory.nasa.gov/Features/BlueMarble/"/>
+    </Attribution>
+        <MetadataURL type="TC211">
+          <Format>text/xml</Format>
+          <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="https://demo.mapserver.org/cgi-bin/wms?request=GetMetadata&amp;layer=bluemarble"/>
+        </MetadataURL>
+    </Layer>
+    <Layer queryable="0" opaque="0" cascaded="0">
+        <Name>continents</Name>
+        <Title>World continents</Title>
+        <CRS>EPSG:4326</CRS>
+        <EX_GeographicBoundingBox>
+            <westBoundLongitude>-180.000000</westBoundLongitude>
+            <eastBoundLongitude>180.000000</eastBoundLongitude>
+            <southBoundLatitude>-90.000000</southBoundLatitude>
+            <northBoundLatitude>83.627419</northBoundLatitude>
+        </EX_GeographicBoundingBox>
+        <BoundingBox CRS="EPSG:4326"
+                    minx="-90.000000" miny="-180.000000" maxx="83.627419" maxy="180.000000" />
+        <MetadataURL type="TC211">
+          <Format>text/xml</Format>
+          <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="https://demo.mapserver.org/cgi-bin/wms?request=GetMetadata&amp;layer=continents"/>
+        </MetadataURL>
+        <Style>
+          <Name>default</Name>
+          <Title>default</Title>
+          <LegendURL width="121" height="112">
+             <Format>image/png</Format>
+             <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="https://demo.mapserver.org/cgi-bin/wms?version=1.3.0&amp;service=WMS&amp;request=GetLegendGraphic&amp;sld_version=1.1.0&amp;layer=continents&amp;format=image/png&amp;STYLE=default"/>
+          </LegendURL>
+        </Style>
+    </Layer>
+    <Layer queryable="0" opaque="0" cascaded="0">
+        <Name>country_bounds</Name>
+        <Title>World country boundaries</Title>
+        <CRS>EPSG:4326</CRS>
+        <EX_GeographicBoundingBox>
+            <westBoundLongitude>-180.000000</westBoundLongitude>
+            <eastBoundLongitude>180.000000</eastBoundLongitude>
+            <southBoundLatitude>-90.000000</southBoundLatitude>
+            <northBoundLatitude>83.627419</northBoundLatitude>
+        </EX_GeographicBoundingBox>
+        <BoundingBox CRS="EPSG:4326"
+                    minx="-90.000000" miny="-180.000000" maxx="83.627419" maxy="180.000000" />
+        <MetadataURL type="TC211">
+          <Format>text/xml</Format>
+          <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="https://demo.mapserver.org/cgi-bin/wms?request=GetMetadata&amp;layer=country_bounds"/>
+        </MetadataURL>
+        <Style>
+          <Name>default</Name>
+          <Title>default</Title>
+          <LegendURL width="142" height="23">
+             <Format>image/png</Format>
+             <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="https://demo.mapserver.org/cgi-bin/wms?version=1.3.0&amp;service=WMS&amp;request=GetLegendGraphic&amp;sld_version=1.1.0&amp;layer=country_bounds&amp;format=image/png&amp;STYLE=default"/>
+          </LegendURL>
+        </Style>
+    </Layer>
+    <Layer queryable="1" opaque="0" cascaded="0">
+        <Name>cities</Name>
+        <Title>World cities</Title>
+        <CRS>EPSG:4326</CRS>
+        <EX_GeographicBoundingBox>
+            <westBoundLongitude>-178.166667</westBoundLongitude>
+            <eastBoundLongitude>179.383333</eastBoundLongitude>
+            <southBoundLatitude>-54.800000</southBoundLatitude>
+            <northBoundLatitude>78.933333</northBoundLatitude>
+        </EX_GeographicBoundingBox>
+        <BoundingBox CRS="EPSG:4326"
+                    minx="-54.800000" miny="-178.166667" maxx="78.933333" maxy="179.383333" />
+        <MetadataURL type="TC211">
+          <Format>text/xml</Format>
+          <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="https://demo.mapserver.org/cgi-bin/wms?request=GetMetadata&amp;layer=cities"/>
+        </MetadataURL>
+        <Style>
+          <Name>default</Name>
+          <Title>default</Title>
+          <LegendURL width="192" height="41">
+             <Format>image/png</Format>
+             <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="https://demo.mapserver.org/cgi-bin/wms?version=1.3.0&amp;service=WMS&amp;request=GetLegendGraphic&amp;sld_version=1.1.0&amp;layer=cities&amp;format=image/png&amp;STYLE=default"/>
+          </LegendURL>
+        </Style>
+    </Layer>
+  </Layer>
+</Capability>
+</WMS_Capabilities>
diff --git a/autotest/gdrivers/data/wmts/clip_WGS84BoundingBox_with_tilematrix.xml b/autotest/gdrivers/data/wmts/clip_WGS84BoundingBox_with_tilematrix.xml
new file mode 100644
index 000000000000..bdf9dc4d910d
--- /dev/null
+++ b/autotest/gdrivers/data/wmts/clip_WGS84BoundingBox_with_tilematrix.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0"?>
+<Capabilities xmlns="http://www.opengis.net/wmts/1.0" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gml="http://www.opengis.net/gml" xsi:schemaLocation="http://www.opengis.net/wmts/1.0 http://schemas.opengis.net/wmts/1.0/wmtsGetCapabilities_response.xsd" version="1.0.0">
+  <Contents>
+    <Layer>
+      <ows:Title>title</ows:Title>
+      <ows:WGS84BoundingBox>
+        <ows:LowerCorner>0.10594674240568917 45.2375427360256</ows:LowerCorner>
+        <ows:UpperCorner>20.448891294525627 56.84787345153812</ows:UpperCorner>
+      </ows:WGS84BoundingBox>
+      <ows:Identifier>de_basemapde_web_raster_grau</ows:Identifier>
+      <Style>
+        <ows:Identifier>default</ows:Identifier>
+      </Style>
+      <Format>image/png</Format>
+      <TileMatrixSetLink>
+        <TileMatrixSet>DE_EPSG_25832_ADV</TileMatrixSet>
+      </TileMatrixSetLink>
+      <ResourceURL format="image/png" resourceType="tile"
+        template="https://sgx.geodatenzentrum.de/wmts_basemapde/tile/1.0.0/de_basemapde_web_raster_grau/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.png"/>
+    </Layer>
+    <TileMatrixSet>
+      <ows:Identifier>DE_EPSG_25832_ADV</ows:Identifier>
+      <ows:SupportedCRS>EPSG:25832</ows:SupportedCRS>
+      <TileMatrix>
+        <ows:Identifier>00</ows:Identifier>
+        <ScaleDenominator>17471320.750897426</ScaleDenominator>
+        <TopLeftCorner>-46133.17 6301219.54</TopLeftCorner>
+        <TileWidth>256</TileWidth>
+        <TileHeight>256</TileHeight>
+        <MatrixWidth>1</MatrixWidth>
+        <MatrixHeight>1</MatrixHeight>
+      </TileMatrix>
+      <TileMatrix>
+        <ows:Identifier>01</ows:Identifier>
+        <ScaleDenominator>8735660.375448713</ScaleDenominator>
+        <TopLeftCorner>-46133.17 6301219.54</TopLeftCorner>
+        <TileWidth>256</TileWidth>
+        <TileHeight>256</TileHeight>
+        <MatrixWidth>2</MatrixWidth>
+        <MatrixHeight>2</MatrixHeight>
+      </TileMatrix>
+      <TileMatrix>
+        <ows:Identifier>02</ows:Identifier>
+        <ScaleDenominator>4367830.187724357</ScaleDenominator>
+        <TopLeftCorner>-46133.17 6301219.54</TopLeftCorner>
+        <TileWidth>256</TileWidth>
+        <TileHeight>256</TileHeight>
+        <MatrixWidth>4</MatrixWidth>
+        <MatrixHeight>4</MatrixHeight>
+      </TileMatrix>
+      <TileMatrix>
+        <ows:Identifier>03</ows:Identifier>
+        <ScaleDenominator>2183915.0938621783</ScaleDenominator>
+        <TopLeftCorner>-46133.17 6301219.54</TopLeftCorner>
+        <TileWidth>256</TileWidth>
+        <TileHeight>256</TileHeight>
+        <MatrixWidth>8</MatrixWidth>
+        <MatrixHeight>8</MatrixHeight>
+      </TileMatrix>
+      <TileMatrix>
+        <ows:Identifier>04</ows:Identifier>
+        <ScaleDenominator>1091957.5469310891</ScaleDenominator>
+        <TopLeftCorner>-46133.17 6301219.54</TopLeftCorner>
+        <TileWidth>256</TileWidth>
+        <TileHeight>256</TileHeight>
+        <MatrixWidth>16</MatrixWidth>
+        <MatrixHeight>16</MatrixHeight>
+      </TileMatrix>
+      <TileMatrix>
+        <ows:Identifier>05</ows:Identifier>
+        <ScaleDenominator>545978.7734655463</ScaleDenominator>
+        <TopLeftCorner>-46133.17 6301219.54</TopLeftCorner>
+        <TileWidth>256</TileWidth>
+        <TileHeight>256</TileHeight>
+        <MatrixWidth>32</MatrixWidth>
+        <MatrixHeight>32</MatrixHeight>
+      </TileMatrix>
+      <TileMatrix>
+        <ows:Identifier>06</ows:Identifier>
+        <ScaleDenominator>272989.38673277246</ScaleDenominator>
+        <TopLeftCorner>-46133.17 6301219.54</TopLeftCorner>
+        <TileWidth>256</TileWidth>
+        <TileHeight>256</TileHeight>
+        <MatrixWidth>64</MatrixWidth>
+        <MatrixHeight>64</MatrixHeight>
+      </TileMatrix>
+      <TileMatrix>
+        <ows:Identifier>07</ows:Identifier>
+        <ScaleDenominator>136494.69336638605</ScaleDenominator>
+        <TopLeftCorner>-46133.17 6301219.54</TopLeftCorner>
+        <TileWidth>256</TileWidth>
+        <TileHeight>256</TileHeight>
+        <MatrixWidth>128</MatrixWidth>
+        <MatrixHeight>128</MatrixHeight>
+      </TileMatrix>
+      <TileMatrix>
+        <ows:Identifier>08</ows:Identifier>
+        <ScaleDenominator>68247.3466831932</ScaleDenominator>
+        <TopLeftCorner>-46133.17 6301219.54</TopLeftCorner>
+        <TileWidth>256</TileWidth>
+        <TileHeight>256</TileHeight>
+        <MatrixWidth>256</MatrixWidth>
+        <MatrixHeight>256</MatrixHeight>
+      </TileMatrix>
+      <TileMatrix>
+        <ows:Identifier>09</ows:Identifier>
+        <ScaleDenominator>34123.673341596535</ScaleDenominator>
+        <TopLeftCorner>-46133.17 6301219.54</TopLeftCorner>
+        <TileWidth>256</TileWidth>
+        <TileHeight>256</TileHeight>
+        <MatrixWidth>512</MatrixWidth>
+        <MatrixHeight>512</MatrixHeight>
+      </TileMatrix>
+      <TileMatrix>
+        <ows:Identifier>10</ows:Identifier>
+        <ScaleDenominator>17061.836670798286</ScaleDenominator>
+        <TopLeftCorner>-46133.17 6301219.54</TopLeftCorner>
+        <TileWidth>256</TileWidth>
+        <TileHeight>256</TileHeight>
+        <MatrixWidth>1024</MatrixWidth>
+        <MatrixHeight>1024</MatrixHeight>
+      </TileMatrix>
+      <TileMatrix>
+        <ows:Identifier>11</ows:Identifier>
+        <ScaleDenominator>8530.918335399143</ScaleDenominator>
+        <TopLeftCorner>-46133.17 6301219.54</TopLeftCorner>
+        <TileWidth>256</TileWidth>
+        <TileHeight>256</TileHeight>
+        <MatrixWidth>2048</MatrixWidth>
+        <MatrixHeight>2048</MatrixHeight>
+      </TileMatrix>
+      <TileMatrix>
+        <ows:Identifier>12</ows:Identifier>
+        <ScaleDenominator>4265.4591676995715</ScaleDenominator>
+        <TopLeftCorner>-46133.17 6301219.54</TopLeftCorner>
+        <TileWidth>256</TileWidth>
+        <TileHeight>256</TileHeight>
+        <MatrixWidth>4096</MatrixWidth>
+        <MatrixHeight>4096</MatrixHeight>
+      </TileMatrix>
+      <TileMatrix>
+        <ows:Identifier>13</ows:Identifier>
+        <ScaleDenominator>2132.729583849782</ScaleDenominator>
+        <TopLeftCorner>-46133.17 6301219.54</TopLeftCorner>
+        <TileWidth>256</TileWidth>
+        <TileHeight>256</TileHeight>
+        <MatrixWidth>8192</MatrixWidth>
+        <MatrixHeight>8192</MatrixHeight>
+      </TileMatrix>
+    </TileMatrixSet>
+  </Contents>
+</Capabilities>
diff --git a/autotest/gdrivers/data/zarr/generate_test_files.py b/autotest/gdrivers/data/zarr/generate_test_files.py
index 23aedd82bdee..416d2d78d727 100644
--- a/autotest/gdrivers/data/zarr/generate_test_files.py
+++ b/autotest/gdrivers/data/zarr/generate_test_files.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2021, Even Rouault <even.rouault@spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import lzma
diff --git a/autotest/gdrivers/dds.py b/autotest/gdrivers/dds.py
index c9c2c1d194ad..35771deeceb1 100644
--- a/autotest/gdrivers/dds.py
+++ b/autotest/gdrivers/dds.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2019 Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import pytest
diff --git a/autotest/gdrivers/derived.py b/autotest/gdrivers/derived.py
index 00ef1e9ff98f..9d67fe14d896 100755
--- a/autotest/gdrivers/derived.py
+++ b/autotest/gdrivers/derived.py
@@ -9,29 +9,16 @@
 ###############################################################################
 # Copyright (c) 2016, Julien Michel, <julien dot michel at cnes dot fr>
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
+import gdaltest
 import pytest
 
 from osgeo import gdal
 
+pytestmark = pytest.mark.require_driver("Derived")
+
 
 def test_derived_test1():
     filename = "../gcore/data/cfloat64.tif"
@@ -159,6 +146,12 @@ def test_derived_test3():
         # Raster with zero band
         gdal.Open("DERIVED_SUBDATASET:LOGAMPLITUDE:data/hdf5/CSK_DGM.h5")
 
+
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
+def test_derived_vrt_errors():
     for function in [
         "real",
         "imag",
diff --git a/autotest/gdrivers/dimap.py b/autotest/gdrivers/dimap.py
index 9758e256362d..35568398722b 100755
--- a/autotest/gdrivers/dimap.py
+++ b/autotest/gdrivers/dimap.py
@@ -9,28 +9,13 @@
 ###############################################################################
 # Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
 import shutil
 
+import gdaltest
 import pytest
 
 from osgeo import gdal
@@ -41,6 +26,10 @@
 # Open and verify a the GCPs and metadata.
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_dimap_1():
 
     shutil.copy("data/dimap/METADATA.DIM", "tmp")
diff --git a/autotest/gdrivers/dipex.py b/autotest/gdrivers/dipex.py
index 91fafb02e3db..7ee22a86a99a 100755
--- a/autotest/gdrivers/dipex.py
+++ b/autotest/gdrivers/dipex.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/doq1.py b/autotest/gdrivers/doq1.py
index a62eb6ce923c..248e7210f9fb 100755
--- a/autotest/gdrivers/doq1.py
+++ b/autotest/gdrivers/doq1.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/doq2.py b/autotest/gdrivers/doq2.py
index 7f510ceed329..f838f6cfcaac 100755
--- a/autotest/gdrivers/doq2.py
+++ b/autotest/gdrivers/doq2.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2008, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import pytest
diff --git a/autotest/gdrivers/dted.py b/autotest/gdrivers/dted.py
index e2d0c1a3d0c9..a18a034247f4 100755
--- a/autotest/gdrivers/dted.py
+++ b/autotest/gdrivers/dted.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2007-2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/ecrgtoc.py b/autotest/gdrivers/ecrgtoc.py
index c023dc38f01b..8ada6bd9a73e 100755
--- a/autotest/gdrivers/ecrgtoc.py
+++ b/autotest/gdrivers/ecrgtoc.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/ecw.py b/autotest/gdrivers/ecw.py
index 008057c1c11e..2ef47be51da9 100755
--- a/autotest/gdrivers/ecw.py
+++ b/autotest/gdrivers/ecw.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import array
@@ -111,6 +95,10 @@ def startup_and_cleanup():
     else:
         gdaltest.ecw_drv.major_version = 3
         gdaltest.ecw_drv.minor_version = 3
+    gdaltest.ecw_drv.version = (
+        gdaltest.ecw_drv.major_version,
+        gdaltest.ecw_drv.minor_version,
+    )
 
     # we set ECW to not resolve projection and datum strings to get 3.x behavior.
     with gdal.config_option("ECW_DO_NOT_RESOLVE_DATUM_PROJECTION", "YES"):
@@ -1038,6 +1026,10 @@ def test_ecw_31():
 # It ignores the content of panBandMap. (#4234)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_ecw_32():
 
     ds = gdal.Open("data/ecw/jrc.ecw")
@@ -1479,7 +1471,7 @@ def test_ecw_41(tmp_path):
     # Check that no statistics is already included in the file
     assert ds.GetRasterBand(1).GetMinimum() is None
     assert ds.GetRasterBand(1).GetMaximum() is None
-    assert ds.GetRasterBand(1).GetStatistics(1, 0) == [0.0, 0.0, 0.0, -1.0]
+    assert ds.GetRasterBand(1).GetStatistics(1, 0) is None
     assert ds.GetRasterBand(1).GetDefaultHistogram(force=0) is None
 
     # Now compute the stats
@@ -2477,3 +2469,16 @@ def test_ecw_online_7():
         expected_band_count,
         ds.RasterCount,
     )
+
+
+###############################################################################
+# Test reading a dataset whose tile dimensions are larger than dataset ones
+
+
+def test_ecw_byte_tile_2048():
+
+    ds = gdal.Open("data/jpeg2000/byte_tile_2048.jp2")
+    (blockxsize, blockysize) = ds.GetRasterBand(1).GetBlockSize()
+    assert (blockxsize, blockysize) == (
+        (20, 20) if gdaltest.ecw_drv.version >= (5, 1) else (256, 256)
+    )
diff --git a/autotest/gdrivers/eedai.py b/autotest/gdrivers/eedai.py
index 39a15f90d5f8..6e94c5352403 100755
--- a/autotest/gdrivers/eedai.py
+++ b/autotest/gdrivers/eedai.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2017, Planet Labs
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import json
@@ -302,7 +286,8 @@ def test_eedai_3():
 # Test OAuth2 with GOOGLE_APPLICATION_CREDENTIALS
 
 
-def test_eedai_GOOGLE_APPLICATION_CREDENTIALS():
+@pytest.mark.parametrize("use_vsi_path", [False, True])
+def test_eedai_GOOGLE_APPLICATION_CREDENTIALS(use_vsi_path):
 
     gdal.FileFromMemBuffer(
         "/vsimem/my.json",
@@ -313,7 +298,12 @@ def test_eedai_GOOGLE_APPLICATION_CREDENTIALS():
     )
 
     gdal.SetConfigOption("EEDA_URL", "/vsimem/ee/")
-    gdal.SetConfigOption("GOOGLE_APPLICATION_CREDENTIALS", "/vsimem/my.json")
+    if use_vsi_path:
+        gdal.SetPathSpecificOption(
+            "/vsigs/to_test_eeda", "GOOGLE_APPLICATION_CREDENTIALS", "/vsimem/my.json"
+        )
+    else:
+        gdal.SetConfigOption("GOOGLE_APPLICATION_CREDENTIALS", "/vsimem/my.json")
     gdal.SetConfigOption("EEDA_PRIVATE_KEY", None)
     gdal.SetConfigOption("EEDA_CLIENT_EMAIL", None)
     gdal.SetConfigOption("GO2A_AUD", "/vsimem/oauth2/v4/token")
@@ -323,8 +313,11 @@ def test_eedai_GOOGLE_APPLICATION_CREDENTIALS():
         '{ "access_token": "my_token", "token_type": "Bearer", "expires_in": 3600 }',
     )
 
+    open_options = []
+    if use_vsi_path:
+        open_options.append("VSI_PATH_FOR_AUTH=/vsigs/to_test_eeda")
     try:
-        ds = gdal.Open("EEDAI:image")
+        ds = gdal.OpenEx("EEDAI:image", open_options=open_options)
         assert ds is not None
     except RuntimeError:
         pass
@@ -335,6 +328,7 @@ def test_eedai_GOOGLE_APPLICATION_CREDENTIALS():
         gdal.SetConfigOption("GOOGLE_APPLICATION_CREDENTIALS", None)
         gdal.SetConfigOption("EEDA_PRIVATE_KEY", None)
         gdal.SetConfigOption("EEDA_CLIENT_EMAIL", None)
+        gdal.ClearPathSpecificOptions("/vsigs/to_test_eeda")
 
     if "CPLRSASHA256Sign() not implemented" in gdal.GetLastErrorMsg():
         pytest.skip("CPLRSASHA256Sign() not implemented")
diff --git a/autotest/gdrivers/ehdr.py b/autotest/gdrivers/ehdr.py
index 8165192b8f55..d5687c8f08c0 100755
--- a/autotest/gdrivers/ehdr.py
+++ b/autotest/gdrivers/ehdr.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2008-2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -153,6 +137,10 @@ def test_ehdr_7():
 # Test signed 8bit integer support. (#2717)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_ehdr_8():
 
     drv = gdal.GetDriverByName("EHDR")
@@ -379,20 +367,20 @@ def test_ehdr_approx_stats_flag():
     approx_ok = 1
     force = 1
     stats = ds.GetRasterBand(1).GetStatistics(approx_ok, force)
-    assert stats == [0.0, 0.0, 0.0, 0.0], "did not get expected stats"
+    assert stats == [0.0, 0.0, 0.0, 0.0]
     md = ds.GetRasterBand(1).GetMetadata()
     assert "STATISTICS_APPROXIMATE" in md, "did not get expected metadata"
 
     approx_ok = 0
     force = 0
     stats = ds.GetRasterBand(1).GetStatistics(approx_ok, force)
-    assert stats == [0.0, 0.0, 0.0, -1.0], "did not get expected stats"
+    assert stats is None
 
     ds = gdal.Open(tmpfile, gdal.GA_Update)
     approx_ok = 0
     force = 0
     stats = ds.GetRasterBand(1).GetStatistics(approx_ok, force)
-    assert stats == [0.0, 0.0, 0.0, -1.0], "did not get expected stats"
+    assert stats is None
 
     approx_ok = 0
     force = 1
diff --git a/autotest/gdrivers/eir.py b/autotest/gdrivers/eir.py
index 58c0db273e9f..e6bce73bcf58 100755
--- a/autotest/gdrivers/eir.py
+++ b/autotest/gdrivers/eir.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/elas.py b/autotest/gdrivers/elas.py
index c62e870d1cc7..7bba07b144fc 100755
--- a/autotest/gdrivers/elas.py
+++ b/autotest/gdrivers/elas.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/envi.py b/autotest/gdrivers/envi.py
index 9cc41b9f074e..d415c1e2cb57 100755
--- a/autotest/gdrivers/envi.py
+++ b/autotest/gdrivers/envi.py
@@ -13,23 +13,7 @@
 # Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2009-2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -1056,3 +1040,120 @@ def test_envi_read_metadata_with_leading_space():
     assert ds.GetRasterBand(1).GetMetadataItem("wavelength") == "3"
     ds = None
     gdal.GetDriverByName("ENVI").Delete("/vsimem/test.bin")
+
+
+###############################################################################
+# Test wavelength / fwhm
+
+
+def test_envi_read_wavelength_fwhm_um():
+
+    gdal.FileFromMemBuffer(
+        "/vsimem/test.hdr",
+        """ENVI
+samples = 1
+lines = 1
+bands = 3
+header offset = 0
+file type = ENVI Standard
+data type = 1
+interleave = bip
+sensor type = Unknown
+byte order = 0
+wavelength units = um
+wavelength = {3, 2, 1}
+fwhm = {.3, .2, .1}""",
+    )
+    gdal.FileFromMemBuffer("/vsimem/test.bin", "xyz")
+
+    ds = gdal.Open("/vsimem/test.bin")
+    assert (
+        ds.GetRasterBand(1).GetMetadataItem("CENTRAL_WAVELENGTH_UM", "IMAGERY")
+        == "3.000"
+    )
+    assert ds.GetRasterBand(1).GetMetadataItem("FWHM_UM", "IMAGERY") == "0.300"
+    assert (
+        ds.GetRasterBand(2).GetMetadataItem("CENTRAL_WAVELENGTH_UM", "IMAGERY")
+        == "2.000"
+    )
+    assert ds.GetRasterBand(2).GetMetadataItem("FWHM_UM", "IMAGERY") == "0.200"
+    ds = None
+    gdal.GetDriverByName("ENVI").Delete("/vsimem/test.bin")
+
+
+###############################################################################
+# Test wavelength / fwhm
+
+
+def test_envi_read_wavelength_fwhm_nm():
+
+    gdal.FileFromMemBuffer(
+        "/vsimem/test.hdr",
+        """ENVI
+samples = 1
+lines = 1
+bands = 3
+header offset = 0
+file type = ENVI Standard
+data type = 1
+interleave = bip
+sensor type = Unknown
+byte order = 0
+wavelength units = nm
+wavelength = {3000, 2000, 1000}
+fwhm = {300, 200, 100}""",
+    )
+    gdal.FileFromMemBuffer("/vsimem/test.bin", "xyz")
+
+    ds = gdal.Open("/vsimem/test.bin")
+    assert (
+        ds.GetRasterBand(1).GetMetadataItem("CENTRAL_WAVELENGTH_UM", "IMAGERY")
+        == "3.000"
+    )
+    assert ds.GetRasterBand(1).GetMetadataItem("FWHM_UM", "IMAGERY") == "0.300"
+    assert (
+        ds.GetRasterBand(2).GetMetadataItem("CENTRAL_WAVELENGTH_UM", "IMAGERY")
+        == "2.000"
+    )
+    assert ds.GetRasterBand(2).GetMetadataItem("FWHM_UM", "IMAGERY") == "0.200"
+    ds = None
+    gdal.GetDriverByName("ENVI").Delete("/vsimem/test.bin")
+
+
+###############################################################################
+# Test wavelength / fwhm
+
+
+def test_envi_read_wavelength_fwhm_mm():
+
+    gdal.FileFromMemBuffer(
+        "/vsimem/test.hdr",
+        """ENVI
+samples = 1
+lines = 1
+bands = 3
+header offset = 0
+file type = ENVI Standard
+data type = 1
+interleave = bip
+sensor type = Unknown
+byte order = 0
+wavelength units = mm
+wavelength = {0.003, 0.002, 0.001}
+fwhm = {0.0003, 0.0002, 0.0001}""",
+    )
+    gdal.FileFromMemBuffer("/vsimem/test.bin", "xyz")
+
+    ds = gdal.Open("/vsimem/test.bin")
+    assert (
+        ds.GetRasterBand(1).GetMetadataItem("CENTRAL_WAVELENGTH_UM", "IMAGERY")
+        == "3.000"
+    )
+    assert ds.GetRasterBand(1).GetMetadataItem("FWHM_UM", "IMAGERY") == "0.300"
+    assert (
+        ds.GetRasterBand(2).GetMetadataItem("CENTRAL_WAVELENGTH_UM", "IMAGERY")
+        == "2.000"
+    )
+    assert ds.GetRasterBand(2).GetMetadataItem("FWHM_UM", "IMAGERY") == "0.200"
+    ds = None
+    gdal.GetDriverByName("ENVI").Delete("/vsimem/test.bin")
diff --git a/autotest/gdrivers/envisat.py b/autotest/gdrivers/envisat.py
index 36d111f6117c..81b5d1784b71 100755
--- a/autotest/gdrivers/envisat.py
+++ b/autotest/gdrivers/envisat.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2011, Antonio Valentino <antonio dot valentino at tiscali dot it>
 # Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gzip
diff --git a/autotest/gdrivers/ers.py b/autotest/gdrivers/ers.py
index 701580704ac9..0bfd6abf93f8 100755
--- a/autotest/gdrivers/ers.py
+++ b/autotest/gdrivers/ers.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
@@ -140,6 +124,10 @@ def test_ers_7():
 # Test GCP support
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_ers_8():
 
     src_ds = gdal.Open("../gcore/data/gcps.vrt")
diff --git a/autotest/gdrivers/esric.py b/autotest/gdrivers/esric.py
index 93ec860a4416..32f075e8f81a 100755
--- a/autotest/gdrivers/esric.py
+++ b/autotest/gdrivers/esric.py
@@ -8,23 +8,7 @@
 ###############################################################################
 # Copyright (c) 2020, Esri
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import pytest
@@ -112,16 +96,18 @@ def test_esric_4(esric_ds):
 
 
 @pytest.fixture
-def tpkx_ds():
-    return gdal.Open("data/esric/Usa.tpkx")
+def tpkx_ds_extent_source_tiling_scheme():
+    return gdal.OpenEx(
+        "data/esric/Usa.tpkx", open_options=["EXTENT_SOURCE=TILING_SCHEME"]
+    )
 
 
 ###############################################################################
 # Check that the configuration was read as expected
 
 
-def test_tpkx_2(tpkx_ds):
-    ds = tpkx_ds
+def test_tpkx_2(tpkx_ds_extent_source_tiling_scheme):
+    ds = tpkx_ds_extent_source_tiling_scheme
     b1 = ds.GetRasterBand(1)
 
     assert (
@@ -145,8 +131,8 @@ def test_tpkx_2(tpkx_ds):
 # Check that the raster returns right checksums
 
 
-def test_tpkx_3(tpkx_ds):
-    ds = tpkx_ds
+def test_tpkx_3(tpkx_ds_extent_source_tiling_scheme):
+    ds = tpkx_ds_extent_source_tiling_scheme
     # There are no tiles at this level, driver will return black
     b1 = ds.GetRasterBand(1)
     b2 = ds.GetRasterBand(2)
@@ -167,8 +153,8 @@ def test_tpkx_3(tpkx_ds):
 
 
 @pytest.mark.require_driver("PNG")
-def test_tpkx_4(tpkx_ds):
-    ds = tpkx_ds
+def test_tpkx_4(tpkx_ds_extent_source_tiling_scheme):
+    ds = tpkx_ds_extent_source_tiling_scheme
 
     # Read from level 1, band 2, where we have data
     # Overviews are counted from zero, in reverse order from levels
@@ -198,3 +184,50 @@ def test_tpkx_ingest_more_bytes(tmp_vsimem):
     data = b"{" + (b" " * 900) + data[1:]
     gdal.FileFromMemBuffer(filename, data)
     gdal.Open(filename)
+
+
+###############################################################################
+# Open a tpkx dataset where minLOD > 0
+
+
+def test_tpkx_minLOD_not_zero():
+    ds = gdal.Open("data/esric/Usa_lod5.tpkx")
+    gt = ds.GetGeoTransform()
+    # Corresponds to lon=-100 lat=40
+    X = -11131949
+    Y = 4865942
+    x = (X - gt[0]) / gt[1]
+    y = (Y - gt[3]) / gt[5]
+    assert ds.GetRasterBand(1).ReadRaster(x, y, 1, 1) != b"\0"
+
+
+###############################################################################
+# Test opening a tpkx file with fullExtent / initialExtent
+
+
+@pytest.mark.parametrize("extent_source", [None, "INITIAL_EXTENT", "FULL_EXTENT"])
+def test_tpkx_default_full_extent(extent_source):
+    open_options = {}
+    if extent_source:
+        open_options["EXTENT_SOURCE"] = extent_source
+    ds = gdal.OpenEx("data/esric/Usa.tpkx", open_options=open_options)
+    assert ds.RasterXSize == 2532
+    assert ds.RasterYSize == 1921
+    assert ds.RasterCount == 4
+    assert ds.GetSpatialRef().GetAuthorityCode(None) == "3857"
+    assert ds.GetGeoTransform() == pytest.approx(
+        (
+            -19841829.550377003848553,
+            4891.969810249979673,
+            0,
+            11545048.752193037420511,
+            0,
+            -4891.969810249979673,
+        )
+    )
+    assert ds.GetDriver().GetDescription() == "ESRIC"
+    assert ds.GetFileList() == ["data/esric/Usa.tpkx"]
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_Byte
+    assert ds.GetRasterBand(1).GetBlockSize() == [256, 256]
+    assert ds.GetRasterBand(1).Checksum() == 62015
+    assert ds.GetRasterBand(1).GetOverviewCount() == 3
diff --git a/autotest/gdrivers/exr.py b/autotest/gdrivers/exr.py
index de3641221b31..56a6c785eddd 100644
--- a/autotest/gdrivers/exr.py
+++ b/autotest/gdrivers/exr.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2020, Even Rouault <even.rouault@spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/fast.py b/autotest/gdrivers/fast.py
index 19b163946e77..bcfbf9a1c705 100755
--- a/autotest/gdrivers/fast.py
+++ b/autotest/gdrivers/fast.py
@@ -10,29 +10,13 @@
 # Copyright (c) 2007, Mateusz Loskot <mateusz@loskot.net>
 # Copyright (c) 2008-2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
 import pytest
 
-from osgeo import gdal
+from osgeo import gdal, osr
 
 pytestmark = pytest.mark.require_driver("FAST")
 
@@ -185,20 +169,9 @@ def test_fast_7():
     gt = (676565.09, 5, 0, 5348341.5, 0, -5)
 
     # Expected definition of the projection
-    proj = """PROJCS["UTM Zone 32, Northern Hemisphere",
-    GEOGCS["Unknown datum based upon the WGS 84 ellipsoid",
-        DATUM["Not specified (based on WGS 84 spheroid)",
-            SPHEROID["WGS 84",6378137,298.257223563,
-                AUTHORITY["EPSG","7030"]]],
-        PRIMEM["Greenwich",0],
-        UNIT["degree",0.0174532925199433]],
-    PROJECTION["Transverse_Mercator"],
-    PARAMETER["latitude_of_origin",0],
-    PARAMETER["central_meridian",9],
-    PARAMETER["scale_factor",0.9996],
-    PARAMETER["false_easting",500000],
-    PARAMETER["false_northing",0],
-    UNIT["Meter",1]]"""
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(32632)
+    proj = srs.ExportToWkt()
 
     tst.testOpen(check_gt=gt, check_prj=proj)
 
diff --git a/autotest/gdrivers/fit.py b/autotest/gdrivers/fit.py
index bf20aad0ae48..404c0f74c8fe 100755
--- a/autotest/gdrivers/fit.py
+++ b/autotest/gdrivers/fit.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2008, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import pytest
diff --git a/autotest/gdrivers/fits.py b/autotest/gdrivers/fits.py
index a00c3b9350d1..ca18ee7372c3 100755
--- a/autotest/gdrivers/fits.py
+++ b/autotest/gdrivers/fits.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2008,2020, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -505,9 +489,9 @@ def test_fits_vector():
         "1.25 + 2.25j",
         ["1.25 + 2.25j", "2.25 + 1.25j"],
         ["1.25 + 2.25j", "2.25 + 1.25j"],
-        "1.25340000000000007 + 2.25j",
-        ["1.25340000000000007 + 2.25j", "2.25 + 1.25j"],
-        ["1.25340000000000007 + 2.25j", "2.25 + 1.25j"],
+        "1.2534000000000001 + 2.25j",
+        ["1.2534000000000001 + 2.25j", "2.25 + 1.25j"],
+        ["1.2534000000000001 + 2.25j", "2.25 + 1.25j"],
     ]
 
     f = lyr.GetNextFeature()
@@ -817,9 +801,9 @@ def test_fits_vector_write_with_source_fits_metadata():
             "1.25 + 2.25j",
             # ['1.25 + 2.25j', '2.25 + 1.25j'],
             # ['1.25 + 2.25j', '2.25 + 1.25j'],
-            "1.25340000000000007 + 2.25j",
-            # ['1.25340000000000007 + 2.25j', '2.25 + 1.25j'],
-            # ['1.25340000000000007 + 2.25j', '2.25 + 1.25j']
+            "1.2534000000000001 + 2.25j",
+            # ['1.2534000000000001 + 2.25j', '2.25 + 1.25j'],
+            # ['1.2534000000000001 + 2.25j', '2.25 + 1.25j']
         ]
 
         f = lyr.GetNextFeature()
@@ -935,9 +919,9 @@ def test_fits_vector_write_without_source_fits_metadata():
             "1.25 + 2.25j",
             # ['1.25 + 2.25j', '2.25 + 1.25j'],
             # ['1.25 + 2.25j', '2.25 + 1.25j'],
-            "1.25340000000000007 + 2.25j",
-            # ['1.25340000000000007 + 2.25j', '2.25 + 1.25j'],
-            # ['1.25340000000000007 + 2.25j', '2.25 + 1.25j']
+            "1.2534000000000001 + 2.25j",
+            # ['1.2534000000000001 + 2.25j', '2.25 + 1.25j'],
+            # ['1.2534000000000001 + 2.25j', '2.25 + 1.25j']
         ]
 
         f = lyr.GetNextFeature()
@@ -1056,9 +1040,9 @@ def test_fits_vector_write_without_source_fits_metadata_compute_repeat():
             "1.25 + 2.25j",
             # ['1.25 + 2.25j', '2.25 + 1.25j'],
             # ['1.25 + 2.25j', '2.25 + 1.25j'],
-            "1.25340000000000007 + 2.25j",
-            # ['1.25340000000000007 + 2.25j', '2.25 + 1.25j'],
-            # ['1.25340000000000007 + 2.25j', '2.25 + 1.25j']
+            "1.2534000000000001 + 2.25j",
+            # ['1.2534000000000001 + 2.25j', '2.25 + 1.25j'],
+            # ['1.2534000000000001 + 2.25j', '2.25 + 1.25j']
         ]
 
         f = lyr.GetNextFeature()
diff --git a/autotest/gdrivers/gdalhttp.py b/autotest/gdrivers/gdalhttp.py
index 4ab2831cce7a..40231a90e658 100755
--- a/autotest/gdrivers/gdalhttp.py
+++ b/autotest/gdrivers/gdalhttp.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2009-2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/genbin.py b/autotest/gdrivers/genbin.py
index 795b87f65ab4..732ac3e8b2fa 100755
--- a/autotest/gdrivers/genbin.py
+++ b/autotest/gdrivers/genbin.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/generate_fits.py b/autotest/gdrivers/generate_fits.py
index b2e9a2305926..9001f7d00b93 100644
--- a/autotest/gdrivers/generate_fits.py
+++ b/autotest/gdrivers/generate_fits.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2020, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/georaster.py b/autotest/gdrivers/georaster.py
index 30a11919c7dd..db5956f5f007 100755
--- a/autotest/gdrivers/georaster.py
+++ b/autotest/gdrivers/georaster.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2008, Ivan Lucena <ivan.lucena@pmldnet.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/gff.py b/autotest/gdrivers/gff.py
index 7267f7771007..71b903c8882f 100755
--- a/autotest/gdrivers/gff.py
+++ b/autotest/gdrivers/gff.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/gif.py b/autotest/gdrivers/gif.py
index 3b321abd2594..32288405d39a 100755
--- a/autotest/gdrivers/gif.py
+++ b/autotest/gdrivers/gif.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2008-2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/gpkg.py b/autotest/gdrivers/gpkg.py
index 1a9bb542a4cf..7896951a17ec 100755
--- a/autotest/gdrivers/gpkg.py
+++ b/autotest/gdrivers/gpkg.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2014, Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -850,6 +834,10 @@ def test_gpkg_10():
 # Single band with 32 bit color table
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 @pytest.mark.parametrize("tile_drv_name", ["JPEG", "WEBP"])
 def test_gpkg_11(tile_drv_name):
 
@@ -4206,6 +4194,18 @@ def test_gpkg_sql_gdal_get_layer_pixel_value():
     ds.ReleaseResultSet(sql_lyr)
     assert f[0] == 156
 
+    with ds.ExecuteSQL(
+        "select gdal_get_layer_pixel_value('byte', 1, 'georef', 440780 + 30, 3751080 - 30)"
+    ) as sql_lyr:
+        f = sql_lyr.GetNextFeature()
+        assert f[0] == 156
+
+    with ds.ExecuteSQL(
+        "select gdal_get_layer_pixel_value('byte', 1, 'georef', 440780 + 30, 3751080 - 30, 'cubicspline')"
+    ) as sql_lyr:
+        f = sql_lyr.GetNextFeature()
+        assert f[0] == pytest.approx(150.1388888888889)
+
     sql_lyr = ds.ExecuteSQL(
         "select gdal_get_layer_pixel_value('float32', 1, 'pixel', 0, 1)"
     )
@@ -4298,3 +4298,112 @@ def test_gpkg_gti_gpkg_ext(tmp_vsimem):
     ds = gdal.Open(filename)
     assert ds.GetDriver().ShortName == "GPKG"
     assert ds.GetRasterBand(1).Checksum() == 4672
+
+
+###############################################################################
+# Test rename a raster table with SQL
+
+
+@pytest.mark.parametrize("data_type", [gdal.GDT_Byte, gdal.GDT_UInt16])
+def test_gpkg_rename_raster_table(data_type, tmp_vsimem):
+
+    test_layer_path = str(tmp_vsimem / "test_gpkg_rename_raster_table.gpkg")
+
+    if data_type == gdal.GDT_UInt16:
+        src_ds = gdal.Open("data/int16.tif")
+    else:
+        src_ds = gdal.Open("data/small_world.tif")
+
+    ds = gdaltest.gpkg_dr.CreateCopy(
+        test_layer_path,
+        src_ds,
+        options=[
+            "TILE_FORMAT=PNG",
+            "RASTER_TABLE=weird'layer\"name",
+        ],
+    )
+    ds = None
+    src_ds = None
+
+    ds = gdal.OpenEx(test_layer_path, gdal.OF_RASTER | gdal.OF_UPDATE)
+    # Get layer name
+    layer_name = ds.GetMetadataItem("IDENTIFIER")
+    assert layer_name == "weird'layer\"name"
+
+    checksum = ds.GetRasterBand(1).Checksum()
+
+    ds.ExecuteSQL('ALTER TABLE "weird\'layer""name" RENAME TO bar')
+    ds.ExecuteSQL("VACUUM")
+    ds = None
+
+    ds = gdal.Open(test_layer_path)
+    layer_name = ds.GetMetadataItem("IDENTIFIER")
+    assert layer_name == "bar"
+    assert ds.GetRasterBand(1).Checksum() == checksum
+    ds = None
+
+    # Check that there is no more any reference to the layer
+    f = gdal.VSIFOpenL(test_layer_path, "rb")
+    content = gdal.VSIFReadL(1, 1000000, f).decode("latin1")
+    gdal.VSIFCloseL(f)
+
+    assert "weird" not in content
+
+
+###############################################################################
+# Test GetDataCoverageStatus() is used on the source dataset
+
+
+def test_gpkg_copy_using_get_data_coverage_status(tmp_vsimem):
+
+    tmp_gtiff = str(tmp_vsimem / "tmp.tif")
+    src_ds = gdal.GetDriverByName("GTiff").Create(
+        tmp_gtiff,
+        1024,
+        768,
+        1,
+        options=["TILED=YES", "BLOCKXSIZE=256", "BLOCKYSIZE=256", "SPARSE_OK=YES"],
+    )
+    src_ds.SetGeoTransform([2, 0.001, 0, 49, 0, -0.001])
+    src_ds.WriteRaster(512, 256, 256, 256, b"\x01" * (256 * 256))
+
+    tmp_gpkg = str(tmp_vsimem / "tmp.gpkg")
+    gdaltest.gpkg_dr.CreateCopy(tmp_gpkg, src_ds)
+
+    ds = gdal.Open(tmp_gpkg)
+    assert ds.GetRasterBand(1).Checksum() == src_ds.GetRasterBand(1).Checksum()
+
+    with ds.ExecuteSQL("SELECT COUNT(*) FROM tmp") as sql_lyr:
+        assert sql_lyr.GetFeatureCount() == 1
+
+    (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(0, 0, 1024, 768)
+    assert (
+        flags
+        == (gdal.GDAL_DATA_COVERAGE_STATUS_DATA | gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY)
+        and pct == 100.0 / 12
+    )
+
+    (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(0, 0, 1024, 256)
+    assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY and pct == 0.0
+
+    (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(0, 512, 1024, 256)
+    assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY and pct == 0.0
+
+    (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(0, 0, 512, 768)
+    assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY and pct == 0.0
+
+    (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(768, 0, 256, 768)
+    assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY and pct == 0.0
+
+    (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(512, 256, 256, 256)
+    assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_DATA and pct == 100.0
+
+    (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(512 + 1, 256 + 2, 3, 4)
+    assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_DATA and pct == 100.0
+
+    (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(512 - 1, 256 - 1, 2, 2)
+    assert (
+        flags
+        == (gdal.GDAL_DATA_COVERAGE_STATUS_DATA | gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY)
+        and pct == 25.0
+    )
diff --git a/autotest/gdrivers/grassasciigrid.py b/autotest/gdrivers/grassasciigrid.py
index faf9fa90a170..320b45adc8a8 100755
--- a/autotest/gdrivers/grassasciigrid.py
+++ b/autotest/gdrivers/grassasciigrid.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/grib.py b/autotest/gdrivers/grib.py
index 3675b3205ecc..f8a0c12002fd 100755
--- a/autotest/gdrivers/grib.py
+++ b/autotest/gdrivers/grib.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2008, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -1732,7 +1716,8 @@ def test_grib_grib2_write_data_encodings_warnings_and_errors():
     tests += [["data/byte.tif", ["JPEG2000_DRIVER=DERIVED"]]]  # Read-only driver
     tests += [["../gcore/data/cfloat32.tif", []]]  # complex data type
     tests += [["data/aaigrid/float64.asc", []]]  # no projection
-    tests += [["data/test_nosrs.vrt", []]]  # no geotransform
+    if gdaltest.vrt_has_open_support():
+        tests += [["data/test_nosrs.vrt", []]]  # no geotransform
     tests += [["data/envi/rotation.img", []]]  # geotransform with rotation terms
     gdal.GetDriverByName("GTiff").Create(
         "/vsimem/huge.tif", 65535, 65535, 1, options=["SPARSE_OK=YES"]
@@ -2252,6 +2237,48 @@ def test_grib_grib2_sidecar():
             ) == ds_idx.GetRasterBand(i).GetMetadataItem(key)
 
 
+def test_grib_grib2_sidecar_vsisubfile():
+
+    ds = gdal.Open("/vsisubfile/0_5359,data/grib/gfs.t06z.pgrb2.10p0.f010.grib2")
+    assert ds.RasterCount == 1
+    assert ds.GetRasterBand(1).GetDescription() == "REFD:1 hybrid level:10 hour fcst"
+
+    ds_ref = gdal.OpenEx(
+        "/vsisubfile/0_5359,data/grib/gfs.t06z.pgrb2.10p0.f010.grib2",
+        open_options=["USE_IDX=NO"],
+    )
+    assert ds_ref.RasterCount == 1
+    assert ds_ref.GetRasterBand(1).GetDescription() == '1[-] HYBL="Hybrid level"'
+    assert ds.GetRasterBand(1).Checksum() == ds_ref.GetRasterBand(1).Checksum()
+
+    size = 16077 - 5359
+    ds = gdal.Open(f"/vsisubfile/5359_{size},data/grib/gfs.t06z.pgrb2.10p0.f010.grib2")
+    assert ds.RasterCount == 2
+    assert ds.GetRasterBand(1).GetDescription() == "REFD:2 hybrid level:10 hour fcst"
+    assert ds.GetRasterBand(2).GetDescription() == "REFC:entire atmosphere:10 hour fcst"
+
+    ds_ref = gdal.OpenEx(
+        f"/vsisubfile/5359_{size},data/grib/gfs.t06z.pgrb2.10p0.f010.grib2",
+        open_options=["USE_IDX=NO"],
+    )
+    assert ds_ref.RasterCount == 2
+    assert ds_ref.GetRasterBand(1).GetDescription() == '2[-] HYBL="Hybrid level"'
+    assert ds.GetRasterBand(1).Checksum() == ds_ref.GetRasterBand(1).Checksum()
+    assert ds.GetRasterBand(2).Checksum() == ds_ref.GetRasterBand(2).Checksum()
+
+    ds = gdal.Open("/vsisubfile/16077_-1,data/grib/gfs.t06z.pgrb2.10p0.f010.grib2")
+    assert ds.RasterCount == 3
+    assert ds.GetRasterBand(1).GetDescription() == "VIS:surface:10 hour fcst"
+    assert (
+        ds.GetRasterBand(2).GetDescription()
+        == "UGRD:planetary boundary layer:10 hour fcst"
+    )
+    assert (
+        ds.GetRasterBand(3).GetDescription()
+        == "VGRD:planetary boundary layer:10 hour fcst"
+    )
+
+
 # Test reading a (broken) mix of GRIBv2/GRIBv1 bands
 
 
@@ -2377,3 +2404,10 @@ def test_grib_grib2_template_5_42_CCDS_aes_decompression():
         assert ds.GetRasterBand(1).Checksum() == 41970
     else:
         assert ds.GetRasterBand(1).Checksum() == -1
+
+
+# https://github.com/OSGeo/gdal/issues/10655
+def test_grib_grib2_minx_180():
+    ds = gdal.Open("data/grib/minx_180.grib2")
+    gt = ds.GetGeoTransform()
+    assert gt == pytest.approx((-180.0625, 0.125, 0.0, 90.0625, 0.0, -0.125), rel=1e-6)
diff --git a/autotest/gdrivers/gribmultidim.py b/autotest/gdrivers/gribmultidim.py
index ae537b83a3e5..be55bec53338 100755
--- a/autotest/gdrivers/gribmultidim.py
+++ b/autotest/gdrivers/gribmultidim.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2019, Even Rouault <even.rouault@spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import struct
diff --git a/autotest/gdrivers/gsc.py b/autotest/gdrivers/gsc.py
index f72131390ef8..82e8b4a6a22f 100755
--- a/autotest/gdrivers/gsc.py
+++ b/autotest/gdrivers/gsc.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/gsg.py b/autotest/gdrivers/gsg.py
index 395fe918826a..4af7a31f4b55 100755
--- a/autotest/gdrivers/gsg.py
+++ b/autotest/gdrivers/gsg.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2008, Andrey Kiselev <dron@ak4719.spb.edu>
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/gta.py b/autotest/gdrivers/gta.py
index 556dec404f59..cef89095a7c0 100755
--- a/autotest/gdrivers/gta.py
+++ b/autotest/gdrivers/gta.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
@@ -98,6 +82,10 @@ def test_gta_2():
 # Test writing and readings GCPs
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gta_3():
 
     src_ds = gdal.Open("../gcore/data/gcps.vrt")
diff --git a/autotest/gdrivers/gti.py b/autotest/gdrivers/gti.py
index c8b674b65c83..c9691ebd0574 100755
--- a/autotest/gdrivers/gti.py
+++ b/autotest/gdrivers/gti.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2023, Even Rouault <even.rouault@spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import math
@@ -34,6 +18,7 @@
 import struct
 
 import gdaltest
+import ogrtest
 import pytest
 
 from osgeo import gdal, ogr
@@ -48,14 +33,19 @@ def create_basic_tileindex(
     sort_field_name=None,
     sort_field_type=None,
     sort_values=None,
+    lyr_name="index",
+    add_to_existing=False,
 ):
     if isinstance(src_ds, list):
         src_ds_list = src_ds
     else:
         src_ds_list = [src_ds]
-    index_ds = ogr.GetDriverByName("GPKG").CreateDataSource(index_filename)
+    if add_to_existing:
+        index_ds = ogr.Open(index_filename, update=1)
+    else:
+        index_ds = ogr.GetDriverByName("GPKG").CreateDataSource(index_filename)
     lyr = index_ds.CreateLayer(
-        "index", srs=(src_ds_list[0].GetSpatialRef() if src_ds_list else None)
+        lyr_name, srs=(src_ds_list[0].GetSpatialRef() if src_ds_list else None)
     )
     lyr.CreateField(ogr.FieldDefn(location_field_name))
     if sort_values:
@@ -115,13 +105,17 @@ def check_basic(
 
 def test_gti_no_metadata(tmp_vsimem):
 
-    index_filename = str(tmp_vsimem / "index.gti.gpkg")
+    index_filename = str(tmp_vsimem / "index.gpkg")
 
     src_ds = gdal.Open(os.path.join(os.getcwd(), "data", "byte.tif"))
     index_ds, _ = create_basic_tileindex(index_filename, src_ds)
     del index_ds
 
-    vrt_ds = gdal.Open(index_filename)
+    with pytest.raises(Exception):
+        gdal.Open(index_filename)
+
+    vrt_ds = gdal.OpenEx(index_filename, allowed_drivers=["GTI"])
+    assert vrt_ds.GetDriver().GetDescription() == "GTI"
     check_basic(vrt_ds, src_ds)
     assert (
         vrt_ds.GetMetadataItem("SCANNED_ONE_FEATURE_AT_OPENING", "__DEBUG__") == "YES"
@@ -810,9 +804,9 @@ def test_gti_invalid_srs(tmp_vsimem):
         gdal.Open(index_filename)
 
 
-def test_gti_valid_srs(tmp_vsimem):
+def test_gti_valid_srs(tmp_path):
 
-    index_filename = str(tmp_vsimem / "index.gti.gpkg")
+    index_filename = str(tmp_path / "index.gti.gpkg")
 
     src_ds = gdal.Open(os.path.join(os.getcwd(), "data", "byte.tif"))
     index_ds, lyr = create_basic_tileindex(index_filename, src_ds)
@@ -1009,6 +1003,10 @@ def test_gti_no_metadata_rgb(tmp_vsimem):
     check_basic(vrt_ds, src_ds)
 
 
+@pytest.mark.skipif(
+    gdal.GetDriverByName("VRT").GetMetadataItem(gdal.DMD_OPENOPTIONLIST) is None,
+    reason="VRT driver open missing",
+)
 def test_gti_rgb_left_right(tmp_vsimem):
 
     index_filename = str(tmp_vsimem / "index.gti.gpkg")
@@ -1053,7 +1051,25 @@ def test_gti_rgb_left_right(tmp_vsimem):
         == "<LocationInfo><File>/vsimem/test_gti_rgb_left_right/left.tif</File></LocationInfo>"
     )
 
+    if ogrtest.have_geos():
+        (flags, pct) = vrt_ds.GetRasterBand(1).GetDataCoverageStatus(
+            0, 0, vrt_ds.RasterXSize, vrt_ds.RasterYSize
+        )
+        assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_DATA and pct == 100.0
+
+        (flags, pct) = vrt_ds.GetRasterBand(1).GetDataCoverageStatus(1, 2, 3, 4)
+        assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_DATA and pct == 100.0
 
+        (flags, pct) = vrt_ds.GetRasterBand(1).GetDataCoverageStatus(
+            vrt_ds.RasterXSize // 2 - 1, 2, 2, 4
+        )
+        assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_DATA and pct == 100.0
+
+
+@pytest.mark.skipif(
+    gdal.GetDriverByName("VRT").GetMetadataItem(gdal.DMD_OPENOPTIONLIST) is None,
+    reason="VRT driver open missing",
+)
 def test_gti_overlapping_sources(tmp_vsimem):
 
     filename1 = str(tmp_vsimem / "one.tif")
@@ -1078,6 +1094,12 @@ def test_gti_overlapping_sources(tmp_vsimem):
     vrt_ds = gdal.Open(index_filename)
     assert vrt_ds.GetRasterBand(1).Checksum() == 2
 
+    if ogrtest.have_geos():
+        (flags, pct) = vrt_ds.GetRasterBand(1).GetDataCoverageStatus(
+            0, 0, vrt_ds.RasterXSize, vrt_ds.RasterYSize
+        )
+        assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_DATA and pct == 100.0
+
     # Test unsupported sort_field_type = OFTBinary
     index_filename = str(tmp_vsimem / "index.gti.gpkg")
     sort_values = [None, None]
@@ -1315,6 +1337,49 @@ def test_gti_overlapping_sources(tmp_vsimem):
     assert vrt_ds.GetRasterBand(1).Checksum() == 2, sort_values
 
 
+@pytest.mark.skipif(
+    gdal.GetDriverByName("VRT").GetMetadataItem(gdal.DMD_OPENOPTIONLIST) is None,
+    reason="VRT driver open missing",
+)
+def test_gti_gap_between_sources(tmp_vsimem):
+
+    filename1 = str(tmp_vsimem / "one.tif")
+    ds = gdal.GetDriverByName("GTiff").Create(filename1, 1, 1)
+    ds.SetGeoTransform([2, 1, 0, 49, 0, -1])
+    ds.GetRasterBand(1).Fill(1)
+    del ds
+
+    filename2 = str(tmp_vsimem / "two.tif")
+    ds = gdal.GetDriverByName("GTiff").Create(filename2, 1, 1)
+    ds.SetGeoTransform([4, 1, 0, 49, 0, -1])
+    ds.GetRasterBand(1).Fill(2)
+    del ds
+
+    index_filename = str(tmp_vsimem / "index.gti.gpkg")
+    index_ds, _ = create_basic_tileindex(
+        index_filename, [gdal.Open(filename1), gdal.Open(filename2)]
+    )
+    del index_ds
+
+    vrt_ds = gdal.Open(index_filename)
+    assert vrt_ds.GetRasterBand(1).Checksum() == 3
+
+    if ogrtest.have_geos():
+        (flags, pct) = vrt_ds.GetRasterBand(1).GetDataCoverageStatus(
+            0, 0, vrt_ds.RasterXSize, vrt_ds.RasterYSize
+        )
+        assert (
+            flags
+            == gdal.GDAL_DATA_COVERAGE_STATUS_DATA
+            | gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY
+            and pct == pytest.approx(100.0 * 2 / 3)
+        )
+
+
+@pytest.mark.skipif(
+    gdal.GetDriverByName("VRT").GetMetadataItem(gdal.DMD_OPENOPTIONLIST) is None,
+    reason="VRT driver open missing",
+)
 def test_gti_no_source(tmp_vsimem):
 
     index_filename = str(tmp_vsimem / "index.gti.gpkg")
@@ -1355,6 +1420,12 @@ def test_gti_no_source(tmp_vsimem):
         is None
     )
 
+    if ogrtest.have_geos():
+        (flags, pct) = vrt_ds.GetRasterBand(1).GetDataCoverageStatus(
+            0, 0, vrt_ds.RasterXSize, vrt_ds.RasterYSize
+        )
+        assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY and pct == 0.0
+
 
 def test_gti_invalid_source(tmp_vsimem):
 
@@ -2009,6 +2080,47 @@ def test_gti_overlapping_sources_mask_band(tmp_vsimem):
     ) == (255, 254)
 
 
+def test_gti_consistency_index_geometry_vs_source_extent(tmp_vsimem):
+
+    filename1 = str(tmp_vsimem / "test.tif")
+    ds = gdal.GetDriverByName("GTiff").Create(filename1, 10, 10)
+    ds.SetGeoTransform([2, 1, 0, 49, 0, -1])
+    ds.GetRasterBand(1).Fill(255)
+    expected_cs = ds.GetRasterBand(1).Checksum()
+    del ds
+
+    index_filename = str(tmp_vsimem / "index.gti.gpkg")
+    index_ds, _ = create_basic_tileindex(
+        index_filename,
+        [gdal.Open(filename1)],
+    )
+    del index_ds
+
+    vrt_ds = gdal.Open(index_filename)
+    with gdal.quiet_errors():
+        gdal.ErrorReset()
+        assert vrt_ds.GetRasterBand(1).Checksum() == expected_cs
+        assert gdal.GetLastErrorMsg() == ""
+
+    # No intersection
+    with gdal.Open(filename1, gdal.GA_Update) as ds:
+        ds.SetGeoTransform([100, 1, 0, 49, 0, -1])
+
+    vrt_ds = gdal.Open(index_filename)
+    with gdal.quiet_errors():
+        assert vrt_ds.GetRasterBand(1).Checksum() == 0
+        assert "does not intersect at all" in gdal.GetLastErrorMsg()
+
+    # Partial intersection
+    with gdal.Open(filename1, gdal.GA_Update) as ds:
+        ds.SetGeoTransform([4, 1, 0, 49, 0, -1])
+
+    vrt_ds = gdal.Open(index_filename)
+    with gdal.quiet_errors():
+        assert vrt_ds.GetRasterBand(1).Checksum() == 958
+        assert "does not fully contain" in gdal.GetLastErrorMsg()
+
+
 def test_gti_mask_band_explicit(tmp_vsimem):
 
     index_filename = str(tmp_vsimem / "index.gti.gpkg")
@@ -2065,7 +2177,7 @@ def test_gti_ovr_factor(tmp_vsimem):
     src_ds = gdal.Open(os.path.join(os.getcwd(), "data", "byte.tif"))
     index_ds, lyr = create_basic_tileindex(index_filename, src_ds)
     lyr.SetMetadataItem("MASK_BAND", "YES")
-    lyr.SetMetadataItem("OVERVIEW_1_FACTOR", "2")
+    lyr.SetMetadataItem("OVERVIEW_0_FACTOR", "2")
     del index_ds
 
     vrt_ds = gdal.Open(index_filename)
@@ -2102,6 +2214,7 @@ def test_gti_ovr_factor_invalid(tmp_vsimem):
 
     src_ds = gdal.Open(os.path.join(os.getcwd(), "data", "byte.tif"))
     index_ds, lyr = create_basic_tileindex(index_filename, src_ds)
+    # Also test GDAL 3.9.0 and 3.9.1 where the idx started at 1
     lyr.SetMetadataItem("OVERVIEW_1_FACTOR", "0.5")
     del index_ds
 
@@ -2116,7 +2229,7 @@ def test_gti_ovr_ds_name(tmp_vsimem):
 
     src_ds = gdal.Open(os.path.join(os.getcwd(), "data", "byte.tif"))
     index_ds, lyr = create_basic_tileindex(index_filename, src_ds)
-    lyr.SetMetadataItem("OVERVIEW_1_DATASET", "/i/do/not/exist")
+    lyr.SetMetadataItem("OVERVIEW_0_DATASET", "/i/do/not/exist")
     del index_ds
 
     vrt_ds = gdal.Open(index_filename)
@@ -2130,7 +2243,7 @@ def test_gti_ovr_lyr_name(tmp_vsimem):
 
     src_ds = gdal.Open(os.path.join(os.getcwd(), "data", "byte.tif"))
     index_ds, lyr = create_basic_tileindex(index_filename, src_ds)
-    lyr.SetMetadataItem("OVERVIEW_1_LAYER", "non_existing")
+    lyr.SetMetadataItem("OVERVIEW_0_LAYER", "non_existing")
     del index_ds
 
     vrt_ds = gdal.Open(index_filename)
@@ -2138,6 +2251,57 @@ def test_gti_ovr_lyr_name(tmp_vsimem):
         vrt_ds.GetRasterBand(1).GetOverviewCount()
 
 
+def test_gti_ovr_of_ovr(tmp_vsimem):
+
+    index_filename = str(tmp_vsimem / "index.gti.gpkg")
+
+    ovr_filename = str(tmp_vsimem / "byte_ovr.tif")
+    ovr_ds = gdal.Translate(ovr_filename, "data/byte.tif", width=10)
+    ovr_ds.BuildOverviews("NEAR", [2])
+    ovr_ds = None
+
+    src_ds = gdal.Open(os.path.join(os.getcwd(), "data", "byte.tif"))
+    index_ds, lyr = create_basic_tileindex(index_filename, src_ds)
+    lyr.SetMetadataItem("OVERVIEW_0_DATASET", ovr_filename)
+    del index_ds
+
+    vrt_ds = gdal.Open(index_filename)
+    ovr_ds = gdal.Open(ovr_filename)
+    assert vrt_ds.GetRasterBand(1).GetOverviewCount() == 2
+    assert (
+        vrt_ds.GetRasterBand(1).GetOverview(0).ReadRaster()
+        == ovr_ds.GetRasterBand(1).ReadRaster()
+    )
+    assert (
+        vrt_ds.GetRasterBand(1).GetOverview(1).ReadRaster()
+        == ovr_ds.GetRasterBand(1).GetOverview(0).ReadRaster()
+    )
+
+
+def test_gti_ovr_of_ovr_OVERVIEW_LEVEL_NONE(tmp_vsimem):
+
+    index_filename = str(tmp_vsimem / "index.gti.gpkg")
+
+    ovr_filename = str(tmp_vsimem / "byte_ovr.tif")
+    ovr_ds = gdal.Translate(ovr_filename, "data/byte.tif", width=10)
+    ovr_ds.BuildOverviews("NEAR", [2])
+    ovr_ds = None
+
+    src_ds = gdal.Open(os.path.join(os.getcwd(), "data", "byte.tif"))
+    index_ds, lyr = create_basic_tileindex(index_filename, src_ds)
+    lyr.SetMetadataItem("OVERVIEW_0_DATASET", ovr_filename)
+    lyr.SetMetadataItem("OVERVIEW_0_OPEN_OPTIONS", "OVERVIEW_LEVEL=NONE")
+    del index_ds
+
+    vrt_ds = gdal.Open(index_filename)
+    ovr_ds = gdal.Open(ovr_filename)
+    assert vrt_ds.GetRasterBand(1).GetOverviewCount() == 1
+    assert (
+        vrt_ds.GetRasterBand(1).GetOverview(0).ReadRaster()
+        == ovr_ds.GetRasterBand(1).ReadRaster()
+    )
+
+
 def test_gti_external_ovr(tmp_vsimem):
 
     index_filename = str(tmp_vsimem / "index.gti.gpkg")
@@ -2307,7 +2471,10 @@ def test_gti_xml(tmp_vsimem):
 
     index_filename = str(tmp_vsimem / "index.gti.gpkg")
 
-    src_ds = gdal.Open(os.path.join(os.getcwd(), "data", "byte.tif"))
+    tile_filename = str(tmp_vsimem / "byte.tif")
+    gdal.Translate(tile_filename, "data/byte.tif")
+
+    src_ds = gdal.Open(tile_filename)
     index_ds, _ = create_basic_tileindex(index_filename, src_ds)
     del index_ds
 
@@ -2432,30 +2599,46 @@ def test_gti_xml(tmp_vsimem):
     assert vrt_ds.GetRasterBand(1).GetOverview(0).XSize == 10
     del vrt_ds
 
+    tile_ovr_filename = str(tmp_vsimem / "byte_ovr.tif")
+    gdal.Translate(tile_ovr_filename, "data/byte.tif", width=10)
+
+    index2_filename = str(tmp_vsimem / "index2.gti.gpkg")
+    create_basic_tileindex(index2_filename, gdal.Open(tile_ovr_filename))
+
     xml_content = f"""<GDALTileIndexDataset>
   <IndexDataset>{index_filename}</IndexDataset>
+  <IndexLayer>index</IndexLayer>
       <Overview>
-          <Dataset>{index_filename}</Dataset>
+          <Dataset>{index2_filename}</Dataset>
       </Overview>
 </GDALTileIndexDataset>"""
     vrt_ds = gdal.Open(xml_content)
     assert vrt_ds.GetRasterBand(1).GetOverviewCount() == 1
-    assert vrt_ds.GetRasterBand(1).GetOverview(0).XSize == 20
+    assert vrt_ds.GetRasterBand(1).GetOverview(0).XSize == 10
     del vrt_ds
 
+    create_basic_tileindex(
+        index_filename,
+        gdal.Open(tile_ovr_filename),
+        add_to_existing=True,
+        lyr_name="index_ovr",
+    )
+
     xml_content = f"""<GDALTileIndexDataset>
   <IndexDataset>{index_filename}</IndexDataset>
+  <IndexLayer>index</IndexLayer>
       <Overview>
-          <Layer>index</Layer>
+          <Layer>index_ovr</Layer>
       </Overview>
 </GDALTileIndexDataset>"""
     vrt_ds = gdal.Open(xml_content)
     assert vrt_ds.GetRasterBand(1).GetOverviewCount() == 1
-    assert vrt_ds.GetRasterBand(1).GetOverview(0).XSize == 20
+    assert vrt_ds.GetRasterBand(1).GetOverview(0).XSize == 10
     del vrt_ds
 
     xml_content = f"""<GDALTileIndexDataset>
   <IndexDataset>{index_filename}</IndexDataset>
+  <IndexLayer>index</IndexLayer>
       <Overview>
           <Layer>index</Layer>
           <OpenOptions>
@@ -2518,6 +2701,7 @@ def test_gti_xml(tmp_vsimem):
 
     xml_content = f"""<GDALTileIndexDataset>
   <IndexDataset>{index_filename}</IndexDataset>
+  <IndexLayer>index</IndexLayer>
       <Overview>
       </Overview>
 </GDALTileIndexDataset>"""
@@ -2529,6 +2713,7 @@ def test_gti_xml(tmp_vsimem):
 
     xml_content = f"""<GDALTileIndexDataset>
   <IndexDataset>{index_filename}</IndexDataset>
+  <IndexLayer>index</IndexLayer>
       <Overview>
           <Dataset>i_do_not_exist</Dataset>
       </Overview>
@@ -2539,6 +2724,7 @@ def test_gti_xml(tmp_vsimem):
 
     xml_content = f"""<GDALTileIndexDataset>
   <IndexDataset>{index_filename}</IndexDataset>
+  <IndexLayer>index</IndexLayer>
       <Overview>
           <Layer>i_do_not_exist</Layer>
       </Overview>
@@ -2603,3 +2789,199 @@ def test_gti_xml_vrtti_embedded(tmp_vsimem):
     assert band.GetCategoryNames() == ["cat"]
     assert band.GetDefaultRAT() is not None
     del vrt_ds
+
+
+###############################################################################
+# Test multi-threaded reading
+
+
+@pytest.mark.parametrize("use_threads", [True, False])
+@pytest.mark.parametrize("num_tiles", [2, 128])
+def test_gti_read_multi_threaded(tmp_vsimem, use_threads, num_tiles):
+
+    width = 2048
+    src_ds = gdal.Translate(
+        "", "../gdrivers/data/small_world.tif", width=width, format="MEM"
+    )
+    assert width % num_tiles == 0
+    tile_width = width // num_tiles
+    tiles_ds = []
+    for i in range(num_tiles):
+        tile_filename = str(tmp_vsimem / ("%d.tif" % i))
+        gdal.Translate(
+            tile_filename, src_ds, srcWin=[i * tile_width, 0, tile_width, 1024]
+        )
+        tiles_ds.append(gdal.Open(tile_filename))
+
+    index_filename = str(tmp_vsimem / "index.gti.gpkg")
+    index_ds, _ = create_basic_tileindex(index_filename, tiles_ds)
+    del index_ds
+
+    vrt_ds = gdal.Open(index_filename)
+
+    pcts = []
+
+    def cbk(pct, msg, user_data):
+        if pcts:
+            assert pct >= pcts[-1]
+        pcts.append(pct)
+        return 1
+
+    with gdal.config_options({} if use_threads else {"GTI_NUM_THREADS": "0"}):
+        assert vrt_ds.ReadRaster(1, 2, 1030, 1020, callback=cbk) == src_ds.ReadRaster(
+            1, 2, 1030, 1020
+        )
+    assert pcts[-1] == 1.0
+
+    assert vrt_ds.GetMetadataItem("MULTI_THREADED_RASTERIO_LAST_USED", "__DEBUG__") == (
+        "1" if gdal.GetNumCPUs() >= 2 and use_threads else "0"
+    )
+
+    # Again
+    pcts = []
+    with gdal.config_options({} if use_threads else {"GTI_NUM_THREADS": "0"}):
+        assert vrt_ds.ReadRaster(1, 2, 1030, 1020, callback=cbk) == src_ds.ReadRaster(
+            1, 2, 1030, 1020
+        )
+    assert pcts[-1] == 1.0
+
+    assert vrt_ds.GetMetadataItem("MULTI_THREADED_RASTERIO_LAST_USED", "__DEBUG__") == (
+        "1" if gdal.GetNumCPUs() >= 2 and use_threads else "0"
+    )
+
+
+###############################################################################
+# Test multi-threaded reading
+
+
+def test_gti_read_multi_threaded_disabled_since_overlapping_sources(tmp_vsimem):
+
+    src_ds = gdal.Translate(
+        "", "../gdrivers/data/small_world.tif", width=2048, format="MEM"
+    )
+    OVERLAP = 1
+    left_filename = str(tmp_vsimem / "left.tif")
+    gdal.Translate(left_filename, src_ds, srcWin=[0, 0, 1024 + OVERLAP, 1024])
+    right_filename = str(tmp_vsimem / "right.tif")
+    gdal.Translate(right_filename, src_ds, srcWin=[1024, 0, 1024, 1024])
+
+    index_filename = str(tmp_vsimem / "index.gti.gpkg")
+    index_ds, _ = create_basic_tileindex(
+        index_filename, [gdal.Open(left_filename), gdal.Open(right_filename)]
+    )
+    del index_ds
+
+    vrt_ds = gdal.Open(index_filename)
+
+    assert vrt_ds.ReadRaster(1, 2, 1030, 1020) == src_ds.ReadRaster(1, 2, 1030, 1020)
+
+    assert (
+        vrt_ds.GetMetadataItem("MULTI_THREADED_RASTERIO_LAST_USED", "__DEBUG__") == "0"
+    )
+
+
+###############################################################################
+# Test multi-threaded reading
+
+
+def test_gti_read_multi_threaded_disabled_because_invalid_filename(tmp_vsimem):
+
+    src_ds = gdal.Translate(
+        "", "../gdrivers/data/small_world.tif", width=2048, format="MEM"
+    )
+    left_filename = str(tmp_vsimem / "left.tif")
+    gdal.Translate(left_filename, src_ds, srcWin=[0, 0, 1024, 1024])
+    right_filename = str(tmp_vsimem / "right.tif")
+    gdal.Translate(right_filename, src_ds, srcWin=[1024, 0, 1024, 1024])
+
+    index_filename = str(tmp_vsimem / "index.gti.gpkg")
+    index_ds, _ = create_basic_tileindex(
+        index_filename, [gdal.Open(left_filename), gdal.Open(right_filename)]
+    )
+    lyr = index_ds.GetLayer(0)
+    f = lyr.GetFeature(2)
+    f["location"] = "/i/do/not/exist"
+    lyr.SetFeature(f)
+    del index_ds
+
+    vrt_ds = gdal.Open(index_filename)
+
+    with pytest.raises(Exception, match="/i/do/not/exist"):
+        vrt_ds.ReadRaster()
+
+    assert vrt_ds.GetMetadataItem("MULTI_THREADED_RASTERIO_LAST_USED", "__DEBUG__") == (
+        "1" if gdal.GetNumCPUs() >= 2 else "0"
+    )
+
+
+###############################################################################
+# Test multi-threaded reading
+
+
+def test_gti_read_multi_threaded_disabled_because_truncated_source(tmp_vsimem):
+
+    src_ds = gdal.Translate(
+        "", "../gdrivers/data/small_world.tif", width=2048, format="MEM"
+    )
+    left_filename = str(tmp_vsimem / "left.tif")
+    gdal.Translate(left_filename, src_ds, srcWin=[0, 0, 1024, 1024])
+    right_filename = str(tmp_vsimem / "right.tif")
+    gdal.Translate(right_filename, src_ds, srcWin=[1024, 0, 1024, 1024])
+
+    index_filename = str(tmp_vsimem / "index.gti.gpkg")
+    index_ds, _ = create_basic_tileindex(
+        index_filename, [gdal.Open(left_filename), gdal.Open(right_filename)]
+    )
+    del index_ds
+
+    f = gdal.VSIFOpenL(right_filename, "rb+")
+    assert f
+    gdal.VSIFTruncateL(f, gdal.VSIStatL(right_filename).size - 10)
+    gdal.VSIFCloseL(f)
+
+    vrt_ds = gdal.Open(index_filename)
+
+    with pytest.raises(Exception, match="right.tif"):
+        vrt_ds.ReadRaster()
+
+    assert vrt_ds.GetMetadataItem("MULTI_THREADED_RASTERIO_LAST_USED", "__DEBUG__") == (
+        "1" if gdal.GetNumCPUs() >= 2 else "0"
+    )
+
+
+###############################################################################
+
+
+@pytest.mark.require_curl()
+@pytest.mark.require_driver("Parquet")
+@pytest.mark.xfail(
+    reason="https://naipeuwest.blob.core.windows.net/naip/v002/ok/2010/ok_100cm_2010/34099/m_3409901_nw_14_1_20100425.tif now leads to HTTP/1.1 409 Public access is not permitted on this storage account."
+)
+def test_gti_stac_geoparquet():
+
+    url = (
+        "https://github.com/stac-utils/stac-geoparquet/raw/main/tests/data/naip.parquet"
+    )
+
+    conn = gdaltest.gdalurlopen(url, timeout=4)
+    if conn is None:
+        pytest.skip("cannot open URL")
+
+    ds = gdal.Open("GTI:/vsicurl/" + url)
+    assert ds.GetSpatialRef().GetAuthorityCode(None) == "26914"
+    assert ds.GetGeoTransform() == pytest.approx(
+        (408231.0, 1.0, 0.0, 3873862.0, 0.0, -1.0), rel=1e-5
+    )
+    assert ds.RasterCount == 4
+    assert [band.GetColorInterpretation() for band in ds] == [
+        gdal.GCI_RedBand,
+        gdal.GCI_GreenBand,
+        gdal.GCI_BlueBand,
+        gdal.GCI_Undefined,
+    ]
+    assert [band.GetDescription() for band in ds] == [
+        "Red",
+        "Green",
+        "Blue",
+        "NIR (near-infrared)",
+    ]
diff --git a/autotest/gdrivers/gtx.py b/autotest/gdrivers/gtx.py
index 6fed29fb51db..b217db1674d4 100755
--- a/autotest/gdrivers/gtx.py
+++ b/autotest/gdrivers/gtx.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2010, Frank Warmerdam
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/gxf.py b/autotest/gdrivers/gxf.py
index 1eec4661677a..d1657b6d0d99 100755
--- a/autotest/gdrivers/gxf.py
+++ b/autotest/gdrivers/gxf.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/hdf5.py b/autotest/gdrivers/hdf5.py
index 25fe8d22c970..48b0eede7fac 100755
--- a/autotest/gdrivers/hdf5.py
+++ b/autotest/gdrivers/hdf5.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import array
@@ -52,7 +36,9 @@ def check_no_file_leaks():
     yield
 
     diff = len(gdaltest.get_opened_files()) - num_files
-    assert diff == 0, "Leak of file handles: %d leaked" % diff
+    # For some weird reason, we sometimes get less files opened than at the
+    # start. Cf https://github.com/OSGeo/gdal/actions/runs/11349015748/job/31564138716?pr=10896
+    assert diff <= 0, "Leak of file handles: %d leaked" % diff
 
 
 ###############################################################################
@@ -1305,6 +1291,8 @@ def test_hdf5_band_specific_attribute():
         ds.attrs["fwhm"] = [0.01, 0.02]
         ds.attrs["fwhm_units"] = "Micrometers"
         ds.attrs["bad_band_list"] = [0, 1]
+        ds.attrs["center_wavelengths"] = [300, 400]
+        ds.attrs["my_coefficients"] = [1, 2]
         f.close()
 
     ds = gdal.Open("data/hdf5/fwhm.h5")
@@ -1315,11 +1303,15 @@ def test_hdf5_band_specific_attribute():
         "fwhm": "0.01",
         "fwhm_units": "Micrometers",
         "bad_band": "0",
+        "center_wavelength": "300",
+        "my_coefficient": "1",
     }
     assert ds.GetRasterBand(2).GetMetadata_Dict() == {
         "fwhm": "0.02",
         "fwhm_units": "Micrometers",
         "bad_band": "1",
+        "center_wavelength": "400",
+        "my_coefficient": "2",
     }
     ds = None
 
@@ -1602,3 +1594,28 @@ def test_hdf5_read_netcdf_nodata_scale_offset():
     assert band.GetNoDataValue() == pytest.approx(9.96921e36, rel=1e-7)
     assert band.GetOffset() == 1.5
     assert band.GetScale() == 0.01
+
+
+###############################################################################
+# Test force opening a netCDF file with HDF5 driver
+
+
+def test_hdf5_force_opening_netcdf_file():
+
+    ds = gdal.OpenEx("data/netcdf/trmm-nc4.nc", allowed_drivers=["HDF5"])
+    assert ds.GetDriver().GetDescription() == "HDF5Image"
+
+    ds = gdal.OpenEx(
+        "data/netcdf/byte_hdf5_starting_at_offset_1024.nc", allowed_drivers=["HDF5"]
+    )
+    assert ds.GetDriver().GetDescription() == "HDF5Image"
+
+
+###############################################################################
+# Test force opening, but provided file is still not recognized (for good reasons)
+
+
+def test_hdf5_force_opening_no_match():
+
+    drv = gdal.IdentifyDriverEx("data/byte.tif", allowed_drivers=["HDF5"])
+    assert drv is None
diff --git a/autotest/gdrivers/hdf5multidim.py b/autotest/gdrivers/hdf5multidim.py
index 6f1f003c326f..2a2280a615b6 100755
--- a/autotest/gdrivers/hdf5multidim.py
+++ b/autotest/gdrivers/hdf5multidim.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2019, Even Rouault <even.rouault@spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import struct
@@ -840,3 +824,67 @@ def test_hdf5_multidim_block_size_structural_info():
     var = rg.OpenMDArray("Band1")
     assert var.GetBlockSize() == [1, 2]
     assert var.GetStructuralInfo() == {"COMPRESSION": "DEFLATE", "FILTER": "SHUFFLE"}
+
+
+###############################################################################
+# Test reading a compound data type made of 2 Float16 values
+
+
+def test_hdf5_multidim_read_cfloat16():
+
+    ds = gdal.OpenEx("data/hdf5/complex.h5", gdal.OF_MULTIDIM_RASTER)
+    rg = ds.GetRootGroup()
+    var = rg.OpenMDArray("f16")
+    assert var.GetDataType().GetNumericDataType() == gdal.GDT_CFloat32
+    assert struct.unpack("f" * (5 * 5 * 2), var.Read()) == (
+        0.0,
+        0.0,
+        1.0,
+        1.0,
+        2.0,
+        2.0,
+        3.0,
+        3.0,
+        4.0,
+        4.0,
+        5.0,
+        5.0,
+        6.0,
+        6.0,
+        7.0,
+        7.0,
+        8.0,
+        8.0,
+        9.0,
+        9.0,
+        10.0,
+        10.0,
+        11.0,
+        11.0,
+        12.0,
+        12.0,
+        13.0,
+        13.0,
+        14.0,
+        14.0,
+        15.0,
+        15.0,
+        16.0,
+        16.0,
+        17.0,
+        17.0,
+        18.0,
+        18.0,
+        19.0,
+        19.0,
+        20.0,
+        20.0,
+        21.0,
+        21.0,
+        22.0,
+        22.0,
+        23.0,
+        23.0,
+        24.0,
+        24.0,
+    )
diff --git a/autotest/gdrivers/heif.py b/autotest/gdrivers/heif.py
index 5c587a4393ea..8d97e90cb43c 100644
--- a/autotest/gdrivers/heif.py
+++ b/autotest/gdrivers/heif.py
@@ -10,25 +10,12 @@
 ###############################################################################
 # Copyright (c) 2020, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
+import os
+import shutil
+
 import pytest
 
 from osgeo import gdal
@@ -130,9 +117,12 @@ def test_heif_rgba_16bit():
     assert ds.GetRasterBand(1).DataType == gdal.GDT_UInt16
 
 
-def test_heif_subdatasets():
+def test_heif_subdatasets(tmp_path):
 
-    ds = gdal.Open("data/heif/subdatasets.heic")
+    filename = str(tmp_path / "out.heic")
+    shutil.copy("data/heif/subdatasets.heic", filename)
+
+    ds = gdal.Open(filename)
     assert ds
     assert len(ds.GetSubDatasets()) == 2
     subds1_name = ds.GetSubDatasets()[0][0]
@@ -141,15 +131,23 @@ def test_heif_subdatasets():
     ds = gdal.Open(subds1_name)
     assert ds
     assert ds.RasterXSize == 64
+    assert ds.GetRasterBand(1).GetMetadataItem("STATISTICS_MINIMUM") is None
+    assert ds.GetRasterBand(1).ComputeStatistics(False)
+    assert ds.GetRasterBand(1).GetMetadataItem("STATISTICS_MINIMUM") is not None
+    ds.Close()
+
+    ds = gdal.Open(subds1_name)
+    assert ds.GetRasterBand(1).GetMetadataItem("STATISTICS_MINIMUM") is not None
 
     ds = gdal.Open(subds2_name)
     assert ds
     assert ds.RasterXSize == 162
+    assert ds.GetRasterBand(1).GetMetadataItem("STATISTICS_MINIMUM") is None
 
     with pytest.raises(Exception):
-        gdal.Open("HEIF:0:data/heif/subdatasets.heic")
+        gdal.Open(f"HEIF:0:{filename}")
     with pytest.raises(Exception):
-        gdal.Open("HEIF:3:data/heif/subdatasets.heic")
+        gdal.Open(f"HEIF:3:{filename}")
     with pytest.raises(Exception):
         gdal.Open("HEIF:1:non_existing.heic")
     with pytest.raises(Exception):
@@ -158,3 +156,61 @@ def test_heif_subdatasets():
         gdal.Open("HEIF:1")
     with pytest.raises(Exception):
         gdal.Open("HEIF:1:")
+
+
+def test_heif_identify_no_match():
+
+    drv = gdal.IdentifyDriverEx("data/byte.tif", allowed_drivers=["HEIF"])
+    assert drv is None
+
+
+def test_heif_identify_heic():
+
+    drv = gdal.IdentifyDriverEx("data/heif/subdatasets.heic", allowed_drivers=["HEIF"])
+    assert drv.GetDescription() == "HEIF"
+
+
+@pytest.mark.parametrize(
+    "major_brand,compatible_brands,expect_success",
+    [
+        ("heic", [], True),
+        ("heix", [], True),
+        ("j2ki", [], True),
+        ("j2ki", ["j2ki"], True),
+        ("jpeg", [], True),
+        ("jpg ", [], False),
+        ("miaf", [], True),
+        ("mif1", [], True),
+        ("mif2", [], True),
+        ("mif9", [], False),  # this doesn't exist
+        ("fake", ["miaf"], True),
+        ("j2kj", [], False),
+        ("fake", [], False),
+        ("fake", ["fake", "also"], False),
+        ("fake", ["fake", "avif"], True),
+        ("fake", ["fake", "bvif"], False),
+        ("fake", ["fake", "mif2"], True),
+        ("fake", ["fake", "mif9"], False),
+    ],
+)
+def test_identify_various(major_brand, compatible_brands, expect_success):
+
+    f = gdal.VSIFOpenL("/vsimem/heif_header.bin", "wb")
+    gdal.VSIFSeekL(f, 4, os.SEEK_SET)
+    gdal.VSIFWriteL("ftyp", 1, 4, f)  # box type
+    gdal.VSIFWriteL(major_brand, 1, 4, f)
+    gdal.VSIFWriteL(b"\x00\x00\x00\x00", 1, 4, f)  # minor_version
+    for brand in compatible_brands:
+        gdal.VSIFWriteL(brand, 1, 4, f)
+    length = gdal.VSIFTellL(f)
+    gdal.VSIFSeekL(f, 0, os.SEEK_SET)  # go back and fill in actual box size
+    gdal.VSIFWriteL(length.to_bytes(4, "big"), 1, 4, f)
+    gdal.VSIFCloseL(f)
+
+    drv = gdal.IdentifyDriverEx("/vsimem/heif_header.bin", allowed_drivers=["HEIF"])
+    if expect_success:
+        assert drv.GetDescription() == "HEIF"
+    else:
+        assert drv is None
+
+    gdal.Unlink("/vsimem/heif_header.bin")
diff --git a/autotest/gdrivers/hf2.py b/autotest/gdrivers/hf2.py
index 926d110aad3b..6499a65c83db 100755
--- a/autotest/gdrivers/hf2.py
+++ b/autotest/gdrivers/hf2.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/hfa.py b/autotest/gdrivers/hfa.py
index e68e2236bbe8..3b72e082dcc2 100755
--- a/autotest/gdrivers/hfa.py
+++ b/autotest/gdrivers/hfa.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2008-2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -38,6 +22,8 @@
 
 from osgeo import gdal
 
+pytestmark = pytest.mark.require_driver("HFA")
+
 ###############################################################################
 # Verify we can read the special histogram metadata from a provided image.
 
@@ -666,6 +652,10 @@ def test_hfa_vsimem():
 # the .img file.  (#2422)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_hfa_proName():
 
     drv = gdal.GetDriverByName("HFA")
diff --git a/autotest/gdrivers/idrisi.py b/autotest/gdrivers/idrisi.py
index e12243136cec..28be6e5fd407 100755
--- a/autotest/gdrivers/idrisi.py
+++ b/autotest/gdrivers/idrisi.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2006, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import shutil
diff --git a/autotest/gdrivers/ilwis.py b/autotest/gdrivers/ilwis.py
index ee3ab8995ced..fccb9d336167 100755
--- a/autotest/gdrivers/ilwis.py
+++ b/autotest/gdrivers/ilwis.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/iris.py b/autotest/gdrivers/iris.py
index 211a939e6ebb..09da26c8f18b 100755
--- a/autotest/gdrivers/iris.py
+++ b/autotest/gdrivers/iris.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2012-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/isce.py b/autotest/gdrivers/isce.py
index 7f7135fbf65c..45f5255edede 100755
--- a/autotest/gdrivers/isce.py
+++ b/autotest/gdrivers/isce.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2014, Matthieu Volat <matthieu.volat@ujf-grenoble.fr>
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/isg.py b/autotest/gdrivers/isg.py
index 4a22e6bba634..0b76a16303e8 100755
--- a/autotest/gdrivers/isg.py
+++ b/autotest/gdrivers/isg.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2019, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
@@ -123,3 +107,17 @@ def test_isg_header_larger_than_1024bytes():
         ds = gdal.Open("data/isg/header_larger_than_1024bytes.isg")
     expected_gt = [12.99375, 0.0125, 0.0, 47.00416666666666, 0.0, -0.008333333333333333]
     assert ds.GetGeoTransform() == pytest.approx(expected_gt, rel=1e-8)
+
+
+###############################################################################
+# Test if we can read dms angles
+
+
+def test_isg_dms():
+
+    gdal.ErrorReset()
+    # Header of https://www.gsi.go.jp/butsuri/data/GSIGEO2024beta.zip
+    ds = gdal.Open("data/isg/header_dms.isg")
+    assert gdal.GetLastErrorMsg() == ""
+    expected_gt = [119.9875, 0.025, 0.0, 50.0083333333, 0.0, -0.01666666666]
+    assert ds.GetGeoTransform() == pytest.approx(expected_gt, rel=1e-8)
diff --git a/autotest/gdrivers/isis.py b/autotest/gdrivers/isis.py
index 9f04f9e9b528..798b5a0f3392 100755
--- a/autotest/gdrivers/isis.py
+++ b/autotest/gdrivers/isis.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2017, Hobu Inc
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import json
diff --git a/autotest/gdrivers/isis2.py b/autotest/gdrivers/isis2.py
index a2601e89087a..8adb883f2f46 100755
--- a/autotest/gdrivers/isis2.py
+++ b/autotest/gdrivers/isis2.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2008, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/jdem.py b/autotest/gdrivers/jdem.py
index ab7a33149dbf..4cd6f4702c09 100755
--- a/autotest/gdrivers/jdem.py
+++ b/autotest/gdrivers/jdem.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/jp2kak.py b/autotest/gdrivers/jp2kak.py
index 4b1c169ec291..21549b715484 100755
--- a/autotest/gdrivers/jp2kak.py
+++ b/autotest/gdrivers/jp2kak.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
@@ -456,6 +440,51 @@ def test_jp2kak_lossless_uint32_nbits_20():
     gdal.GetDriverByName("JP2KAK").Delete(tmpfilename)
 
 
+###############################################################################
+# Test lossless copying of multi band with tiling (to cause a stripe_height != 1)
+
+
+@pytest.mark.parametrize("use_stripe_compressor", ["YES", "NO"])
+def test_jp2kak_lossless_multiband(tmp_vsimem, use_stripe_compressor):
+
+    src_ds = gdal.Open("data/rgbsmall.tif")
+    out_filename = str(tmp_vsimem / "out.jp2")
+    with gdaltest.config_option("JP2KAK_USE_STRIPE_COMPRESSOR", use_stripe_compressor):
+        gdal.GetDriverByName("JP2KAK").CreateCopy(
+            out_filename,
+            src_ds,
+            options=["QUALITY=100", "BLOCKXSIZE=32", "BLOCKYSIZE=24"],
+        )
+    ds = gdal.Open(out_filename)
+    assert [ds.GetRasterBand(i + 1).Checksum() for i in range(3)] == [
+        src_ds.GetRasterBand(i + 1).Checksum() for i in range(3)
+    ]
+
+
+###############################################################################
+# Test lossless copying of multi band with tiling (to cause a stripe_height != 1)
+
+
+@pytest.mark.parametrize("use_stripe_compressor", ["YES", "NO"])
+def test_jp2kak_lossless_multiband_non_byte(tmp_vsimem, use_stripe_compressor):
+
+    src_ds = gdal.Open("data/rgbsmall.tif")
+    src_ds = gdal.Translate(
+        "", src_ds, options="-f MEM -ot UInt16 -scale 0 255 0 65535"
+    )
+    out_filename = str(tmp_vsimem / "out.jp2")
+    with gdaltest.config_option("JP2KAK_USE_STRIPE_COMPRESSOR", use_stripe_compressor):
+        gdal.GetDriverByName("JP2KAK").CreateCopy(
+            out_filename,
+            src_ds,
+            options=["QUALITY=100", "BLOCKXSIZE=32", "BLOCKYSIZE=24"],
+        )
+    ds = gdal.Open(out_filename)
+    assert [ds.GetRasterBand(i + 1).Checksum() for i in range(3)] == [
+        src_ds.GetRasterBand(i + 1).Checksum() for i in range(3)
+    ]
+
+
 ###############################################################################
 # Test lossy copying of Int32
 
diff --git a/autotest/gdrivers/jp2lura.py b/autotest/gdrivers/jp2lura.py
index df6fb0543ea0..452e58a31085 100755
--- a/autotest/gdrivers/jp2lura.py
+++ b/autotest/gdrivers/jp2lura.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2016, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/jp2metadata.py b/autotest/gdrivers/jp2metadata.py
index d560247629bf..3a17317777c9 100755
--- a/autotest/gdrivers/jp2metadata.py
+++ b/autotest/gdrivers/jp2metadata.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/jp2openjpeg.py b/autotest/gdrivers/jp2openjpeg.py
index 46820ee810e7..387a15cc0756 100755
--- a/autotest/gdrivers/jp2openjpeg.py
+++ b/autotest/gdrivers/jp2openjpeg.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -389,6 +373,10 @@ def test_jp2openjpeg_12():
 # Check that PAM overrides internal GCPs (#5279)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_jp2openjpeg_13():
 
     # Create a dataset with GCPs
@@ -1446,6 +1434,10 @@ def test_jp2openjpeg_32():
 # Test crazy tile size
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_jp2openjpeg_33():
 
     src_ds = gdal.Open(
@@ -2744,10 +2736,10 @@ def test_jp2openjpeg_45():
     )
     del out_ds
 
-    dircontent = gdal.ReadDir("/vsimem/")
+    dircontent = gdal.ReadDir("/vsimem/.#!HIDDEN!#.")
     if dircontent:
         for filename in dircontent:
-            assert not filename.startswith("gmljp2")
+            assert "gmljp2" not in filename
 
     ds = ogr.Open("/vsimem/jp2openjpeg_45.jp2")
     assert ds.GetLayerCount() == 1
@@ -3818,6 +3810,10 @@ def test_jp2openjpeg_mosaic():
 
 
 @pytest.mark.require_curl()
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_jp2openjpeg_vrt_protocol():
 
     (webserver_process, webserver_port) = webserver.launch(
diff --git a/autotest/gdrivers/jpeg.py b/autotest/gdrivers/jpeg.py
index 28fa78db0806..1afece500db4 100755
--- a/autotest/gdrivers/jpeg.py
+++ b/autotest/gdrivers/jpeg.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -593,7 +577,7 @@ def test_jpeg_17():
 
     assert not (
         gdal.GetLastErrorType() != gdal.CE_Failure or gdal.GetLastErrorMsg() == ""
-    )
+    ), "Premature end of file should be a failure by default"
 
     gdal.ErrorReset()
     ds = gdal.Open("data/jpeg/byte_corrupted2.jpg")
@@ -603,7 +587,7 @@ def test_jpeg_17():
 
     assert not (
         gdal.GetLastErrorType() != gdal.CE_Failure or gdal.GetLastErrorMsg() == ""
-    )
+    ), "Premature end of file should be a failure with GDAL_ERROR_ON_LIBJPEG_WARNING = TRUE"
 
     gdal.ErrorReset()
     ds = gdal.Open("data/jpeg/byte_corrupted2.jpg")
@@ -613,7 +597,35 @@ def test_jpeg_17():
 
     assert not (
         gdal.GetLastErrorType() != gdal.CE_Warning or gdal.GetLastErrorMsg() == ""
-    )
+    ), "Premature end of file should be a warning with GDAL_ERROR_ON_LIBJPEG_WARNING = FALSE"
+
+    gdal.ErrorReset()
+    with gdaltest.error_handler("CPLQuietErrorHandler"):
+        ds = gdal.Open("data/jpeg/byte_corrupted3.jpg")
+        assert ds.GetRasterBand(1).Checksum() != 0
+
+    assert not (
+        gdal.GetLastErrorType() != gdal.CE_Warning or gdal.GetLastErrorMsg() == ""
+    ), "Extraneous bytes before marker should be a warning by default"
+
+    gdal.ErrorReset()
+    with gdaltest.error_handler("CPLQuietErrorHandler"):
+        with gdaltest.config_option("GDAL_ERROR_ON_LIBJPEG_WARNING", "TRUE"):
+            ds = gdal.Open("data/jpeg/byte_corrupted3.jpg")
+
+    assert not (
+        gdal.GetLastErrorType() != gdal.CE_Failure or gdal.GetLastErrorMsg() == ""
+    ), "Extraneous bytes before marker should be a failure with GDAL_ERROR_ON_LIBJPEG_WARNING = TRUE"
+
+    gdal.ErrorReset()
+    with gdaltest.error_handler("CPLQuietErrorHandler"):
+        with gdaltest.config_option("GDAL_ERROR_ON_LIBJPEG_WARNING", "FALSE"):
+            ds = gdal.Open("data/jpeg/byte_corrupted3.jpg")
+            assert ds.GetRasterBand(1).Checksum() != 0
+
+    assert not (
+        gdal.GetLastErrorType() != gdal.CE_Warning or gdal.GetLastErrorMsg() == ""
+    ), "Extraneous bytes before marker should be a warning with GDAL_ERROR_ON_LIBJPEG_WARNING = FALSE"
 
 
 ###############################################################################
@@ -772,6 +784,10 @@ def test_jpeg_mask_lsb_order_issue_4351():
 # Test correct GCP reading with PAM (#5352)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_jpeg_20():
 
     src_ds = gdal.Open("data/rgb_gcp.vrt")
@@ -1105,7 +1121,7 @@ def test_jpeg_28():
         "EXIF_XResolution": "(96)",
         "EXIF_TransferFunction": "0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0",
         "EXIF_ExifVersion": "0123",
-        "EXIF_DateTime": "dt                 ",
+        "EXIF_DateTime": "dt",
         "EXIF_FlashpixVersion": "ABCD",
         "EXIF_ComponentsConfiguration": "0x1f 0x00 0x00 0x00",
         "EXIF_Make": "make",
@@ -1587,6 +1603,65 @@ def test_jpeg_copy_mdd():
     gdal.Unlink(filename)
 
 
+###############################################################################
+
+
+def test_jpeg_read_DNG_tags():
+
+    # File generated with:
+    # gdal_translate autotest/gcore/data/byte.tif DNG_CameraSerialNumber_and_DNG_UniqueCameraModel.jpg
+    # exiftool "-CameraSerialNumber=SerialNumber" "-UniqueCameraModel=CameraModel" DNG_CameraSerialNumber_and_DNG_UniqueCameraModel.jpg
+    ds = gdal.Open("data/jpeg/DNG_CameraSerialNumber_and_DNG_UniqueCameraModel.jpg")
+    assert ds.GetMetadataItem("DNG_CameraSerialNumber") == "SerialNumber"
+    assert ds.GetMetadataItem("DNG_UniqueCameraModel") == "CameraModel"
+
+
+###############################################################################
+
+
+def test_jpeg_read_DNG_tags_same_value_ax_EXIF():
+    """Check that DNG tags are not emitted when they have a corresponding EXIF
+    tag at the same value."""
+
+    # File generated with:
+    # gdal_translate autotest/gcore/data/byte.tif DNG_and_EXIF_same_values.jpg
+    # exiftool"-exif:SerialNumber=SerialNumber" "-CameraSerialNumber=SerialNumber" "-UniqueCameraModel=CameraModel" "-Model=CameraModel" DNG_and_EXIF_same_values.jpg
+    ds = gdal.Open("data/jpeg/DNG_and_EXIF_same_values.jpg")
+    assert ds.GetMetadataItem("DNG_CameraSerialNumber") is None
+    assert ds.GetMetadataItem("DNG_UniqueCameraModel") is None
+    assert ds.GetMetadataItem("EXIF_BodySerialNumber") == "SerialNumber"
+    assert ds.GetMetadataItem("EXIF_Model") == "CameraModel"
+
+
+###############################################################################
+
+
+def test_jpeg_read_pix4d_xmp_crs_vertcs_orthometric():
+
+    # File generated with:
+    # gdal_translate autotest/gcore/data/byte.tif pix4d_xmp_crs_vertcs_orthometric.jpg
+    # exiftool "-xmp<=pix4d_xmp_crs_vertcs_orthometric.xml"  pix4d_xmp_crs_vertcs_orthometric.jpg
+    # where pix4d_xmp_crs_vertcs_orthometric.xml is the XMP content
+    ds = gdal.Open("data/jpeg/pix4d_xmp_crs_vertcs_orthometric.jpg")
+    srs = ds.GetSpatialRef()
+    assert srs.GetAuthorityCode("GEOGCS") == "6318"
+    assert srs.GetAuthorityCode("VERT_CS") == "6360"
+
+
+###############################################################################
+
+
+def test_jpeg_read_pix4d_xmp_crs_vertcs_ellipsoidal():
+
+    # File generated with:
+    # gdal_translate autotest/gcore/data/byte.tif pix4d_xmp_crs_vertcs_ellipsoidal.jpg
+    # exiftool "-xmp<=pix4d_xmp_crs_vertcs_ellipsoidal.xml"  pix4d_xmp_crs_vertcs_ellipsoidal.jpg
+    # where pix4d_xmp_crs_vertcs_ellipsoidal.xml is the XMP content
+    ds = gdal.Open("data/jpeg/pix4d_xmp_crs_vertcs_ellipsoidal.jpg")
+    srs = ds.GetSpatialRef()
+    assert srs.GetAuthorityCode(None) == "6319"
+
+
 ###############################################################################
 # Cleanup
 
diff --git a/autotest/gdrivers/jpegxl.py b/autotest/gdrivers/jpegxl.py
index 4ae20bcfa469..27f21373acb8 100755
--- a/autotest/gdrivers/jpegxl.py
+++ b/autotest/gdrivers/jpegxl.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import base64
diff --git a/autotest/gdrivers/jpipkak.py b/autotest/gdrivers/jpipkak.py
index 027e835aebed..859bcffdc92b 100755
--- a/autotest/gdrivers/jpipkak.py
+++ b/autotest/gdrivers/jpipkak.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2010, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/kea.py b/autotest/gdrivers/kea.py
index a6a6d0c224c1..8f69cf943015 100755
--- a/autotest/gdrivers/kea.py
+++ b/autotest/gdrivers/kea.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2014, Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/kmlsuperoverlay.py b/autotest/gdrivers/kmlsuperoverlay.py
index 30298a605218..4f71b22d539f 100755
--- a/autotest/gdrivers/kmlsuperoverlay.py
+++ b/autotest/gdrivers/kmlsuperoverlay.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2010-2014, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -127,6 +111,10 @@ def test_kmlsuperoverlay_3():
 # Test overviews
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_kmlsuperoverlay_4():
 
     vrt_xml = """<VRTDataset rasterXSize="800" rasterYSize="400">
@@ -231,6 +219,10 @@ def test_kmlsuperoverlay_4():
 # Test that a raster which crosses the anti-meridian will be able to be displayed correctly (#4528)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_kmlsuperoverlay_5():
 
     from xml.etree import ElementTree
@@ -379,11 +371,29 @@ def test_kmlsuperoverlay_single_overlay_document_pct():
     assert ds.GetRasterBand(1).GetColorTable()
 
 
+###############################################################################
+# Test raster KML with gx:LatLonQuad
+
+
+def test_kmlsuperoverlay_gx_latlonquad():
+
+    ds = gdal.Open("data/kml/small_world_latlonquad.kml")
+    assert ds.GetProjectionRef().find("WGS_1984") >= 0
+    got_gt = ds.GetGeoTransform()
+    ref_gt = [-180.0, 0.9, 0.0, 90.0, 0.0, -0.9]
+    for i in range(6):
+        assert got_gt[i] == pytest.approx(ref_gt[i], abs=1e-6)
+
+
 ###############################################################################
 # Test that a raster with lots of blank space doesn't have unnecessary child
 # KML/PNG files in transparent areas
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_kmlsuperoverlay_8():
 
     # a large raster with actual data on each end and blank space in between
diff --git a/autotest/gdrivers/kro.py b/autotest/gdrivers/kro.py
index a7093b467b9c..fe10bd74bbf1 100755
--- a/autotest/gdrivers/kro.py
+++ b/autotest/gdrivers/kro.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/ktx2.py b/autotest/gdrivers/ktx2.py
index a86645368649..2162d942a88d 100755
--- a/autotest/gdrivers/ktx2.py
+++ b/autotest/gdrivers/ktx2.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2022, Even Rouault <even.rouault@spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/l1b.py b/autotest/gdrivers/l1b.py
index a249373021c9..fcc6dca84cc4 100755
--- a/autotest/gdrivers/l1b.py
+++ b/autotest/gdrivers/l1b.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/lan.py b/autotest/gdrivers/lan.py
index 9b3d9c9ef4ea..af971d9433eb 100755
--- a/autotest/gdrivers/lan.py
+++ b/autotest/gdrivers/lan.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/lcp.py b/autotest/gdrivers/lcp.py
index 0374a0362f33..20a72dcabaaf 100755
--- a/autotest/gdrivers/lcp.py
+++ b/autotest/gdrivers/lcp.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2008-2009, Even Rouault <even dot rouault at spatialys.com>
 # Copyright (c) 2013, Kyle Shannon <kyle at pobox dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import array
diff --git a/autotest/gdrivers/leveller.py b/autotest/gdrivers/leveller.py
index 2a88e5e89f0d..800d5a58938c 100755
--- a/autotest/gdrivers/leveller.py
+++ b/autotest/gdrivers/leveller.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/loslas.py b/autotest/gdrivers/loslas.py
index b7e4b1b3e6a6..306521139612 100755
--- a/autotest/gdrivers/loslas.py
+++ b/autotest/gdrivers/loslas.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/mbtiles.py b/autotest/gdrivers/mbtiles.py
index c52898067ec9..50f0b3feb64e 100755
--- a/autotest/gdrivers/mbtiles.py
+++ b/autotest/gdrivers/mbtiles.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2012-2016, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
diff --git a/autotest/gdrivers/mem.py b/autotest/gdrivers/mem.py
index 09a3233f9c65..17fd0537d97d 100755
--- a/autotest/gdrivers/mem.py
+++ b/autotest/gdrivers/mem.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import ctypes
@@ -156,7 +140,14 @@ def test_mem_2(mem_native_memory):
         for i in range(width * height):
             float_p[i] = 5.0
 
-        dsro = gdal.Open(dsname)
+        with pytest.raises(
+            Exception,
+            match="Opening a MEM dataset with the MEM:::DATAPOINTER= syntax is no longer supported by default for security reasons",
+        ):
+            gdal.Open(dsname)
+
+        with gdal.config_option("GDAL_MEM_ENABLE_OPEN", "YES"):
+            dsro = gdal.Open(dsname)
         if dsro is None:
             free(p)
             pytest.fail("opening MEM dataset failed in read only mode.")
@@ -168,7 +159,8 @@ def test_mem_2(mem_native_memory):
             pytest.fail("checksum failed.")
         dsro = None
 
-        dsup = gdal.Open(dsname, gdal.GA_Update)
+        with gdal.config_option("GDAL_MEM_ENABLE_OPEN", "YES"):
+            dsup = gdal.Open(dsname, gdal.GA_Update)
         if dsup is None:
             free(p)
             pytest.fail("opening MEM dataset failed in update mode.")
@@ -210,9 +202,10 @@ def test_geotransform(ds_definition, expected_sr, mem_native_memory):
     proj_crs = "+proj=laea +lon_0=147 +lat_0=-42"
     ll_crs = """GEOGCS[\\"WGS 84\\",DATUM[\\"WGS_1984\\",SPHEROID[\\"WGS 84\\",6378137,298.257223563,AUTHORITY[\\"EPSG\\",\\"7030\\"]],AUTHORITY[\\"EPSG\\",\\"6326\\"]],PRIMEM[\\"Greenwich\\",0,AUTHORITY[\\"EPSG\\",\\"8901\\"]],UNIT[\\"degree\\",0.0174532925199433,AUTHORITY[\\"EPSG\\",\\"9122\\"]],AXIS[\\"Latitude\\",NORTH],AXIS[\\"Longitude\\",EAST],AUTHORITY[\\"EPSG\\",\\"4326\\"]]"""
 
-    dsro = gdal.Open(
-        ds_definition.format(datapointer=p, proj_crs=proj_crs, ll_crs=ll_crs)
-    )
+    with gdal.config_option("GDAL_MEM_ENABLE_OPEN", "YES"):
+        dsro = gdal.Open(
+            ds_definition.format(datapointer=p, proj_crs=proj_crs, ll_crs=ll_crs)
+        )
     if dsro is None:
         free(p)
         pytest.fail("opening MEM dataset failed in read only mode.")
diff --git a/autotest/gdrivers/memmultidim.py b/autotest/gdrivers/memmultidim.py
index 0c59a4367536..a1b33c5a5ecc 100755
--- a/autotest/gdrivers/memmultidim.py
+++ b/autotest/gdrivers/memmultidim.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2019, Even Rouault <even.rouault@spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import array
@@ -90,7 +74,7 @@ def test_mem_md_subgroup():
 
     with gdal.quiet_errors():
         assert not rg.CreateGroup("")  # unnamed group not supported
-    with pytest.raises(ValueError):
+    with pytest.raises(Exception):
         assert not rg.CreateGroup(None)
 
     subg = rg.CreateGroup("subgroup")
@@ -339,12 +323,12 @@ def test_mem_md_datatypes():
     assert dt_byte.GetNumericDataType() == gdal.GDT_Byte
     assert dt_byte.GetSize() == 1
     assert dt_byte.CanConvertTo(dt_byte)
-    with pytest.raises(ValueError):
+    with pytest.raises(Exception):
         assert dt_byte.CanConvertTo(None)
     assert dt_byte == gdal.ExtendedDataType.Create(gdal.GDT_Byte)
     assert not dt_byte != gdal.ExtendedDataType.Create(gdal.GDT_Byte)
     assert dt_byte.Equals(dt_byte)
-    with pytest.raises(ValueError):
+    with pytest.raises(Exception):
         assert dt_byte.Equals(None)
     assert not dt_byte.GetComponents()
 
@@ -762,9 +746,9 @@ def test_mem_md_array_invalid_args():
         rg.CreateMDArray("myarray", [None], edt)
     with pytest.raises((TypeError, SystemError)):
         rg.CreateMDArray("myarray", [1], edt)
-    with pytest.raises(ValueError):
+    with pytest.raises(Exception):
         rg.CreateMDArray("myarray", [dim], None)
-    with pytest.raises(ValueError):
+    with pytest.raises(Exception):
         rg.CreateMDArray(None, [dim], edt)
 
 
@@ -837,7 +821,7 @@ def test_mem_md_group_attribute_single_numeric():
     float64dt = gdal.ExtendedDataType.Create(gdal.GDT_Float64)
     with gdal.quiet_errors():
         assert not rg.CreateAttribute("", [1], float64dt)  # unnamed attr not supported
-    with pytest.raises(ValueError):
+    with pytest.raises(Exception):
         rg.CreateAttribute(None, [1], float64dt)
 
     attr = rg.CreateAttribute("attr", [1], float64dt)
@@ -955,7 +939,7 @@ def test_mem_md_array_attribute():
         assert not myarray.CreateAttribute(
             "", [1], float64dt
         )  # unnamed attr not supported
-    with pytest.raises(ValueError):
+    with pytest.raises(Exception):
         myarray.CreateAttribute(None, [1], float64dt)
 
     attr = myarray.CreateAttribute("attr", [1], float64dt)
diff --git a/autotest/gdrivers/mff.py b/autotest/gdrivers/mff.py
index 0cb2305c9851..f2db3f9d3daa 100755
--- a/autotest/gdrivers/mff.py
+++ b/autotest/gdrivers/mff.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/mff2.py b/autotest/gdrivers/mff2.py
index dcb5a85d4561..534cc844ee20 100755
--- a/autotest/gdrivers/mff2.py
+++ b/autotest/gdrivers/mff2.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/mrf.py b/autotest/gdrivers/mrf.py
index 24bd8a6738fe..7cbe7b6376db 100755
--- a/autotest/gdrivers/mrf.py
+++ b/autotest/gdrivers/mrf.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2016, Even Rouault, <even.rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import glob
@@ -77,6 +61,10 @@ def module_disable_exceptions():
     ("../../gcore/data/uint32.tif", 4672, [4672], ["COMPRESS=LERC"]),
     ("../../gcore/data/uint32.tif", 4672, [4672], ["COMPRESS=QB3"]),
     ("../../gcore/data/uint32.tif", 4672, [4672], ["COMPRESS=LERC", "OPTIONS=V1:YES"]),
+    ("../../gcore/data/int64.tif", 4672, [4672], ["COMPRESS=DEFLATE"]),
+    ("../../gcore/data/int64.tif", 4672, [4672], ["COMPRESS=ZSTD"]),
+    ("../../gcore/data/int64.tif", 4672, [4672], ["COMPRESS=TIF"]),
+    ("../../gcore/data/int64.tif", 4672, [4672], ["COMPRESS=QB3"]),
     ("float32.tif", 4672, [4672], ["COMPRESS=DEFLATE"]),
     ("float32.tif", 4672, [4672], ["COMPRESS=ZSTD"]),
     ("float32.tif", 4672, [4672], ["COMPRESS=TIF"]),
@@ -199,6 +187,10 @@ def cleanup(base="/vsimem/out."):
         gdal.Unlink(base + ext)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_mrf_zen_test():
 
     expectedCS = 770
@@ -229,6 +221,30 @@ def test_mrf_zen_test():
             gdal.Unlink(f)
 
 
+def test_mrf_in_tar(tmp_path):
+    import tarfile
+
+    files = tuple("plain." + ext for ext in ("mrf", "idx", "pzp", "mrf.aux.xml"))
+    gdal.Translate(
+        tmp_path / "plain.mrf",
+        "data/byte.tif",
+        format="MRF",
+        creationOptions=["COMPRESS=DEFLATE"],
+    )
+    tarname = tmp_path / "plain.mrf.tar"
+    # the .mrf has to be the first file in the tar, with no path
+    with tarfile.TarFile(tarname, "w", format=tarfile.GNU_FORMAT) as tar:
+        for fn in files:
+            tar.add(tmp_path / fn, arcname=fn)
+    for fn in files:
+        gdal.Unlink(tmp_path / fn)
+    ds = gdal.Open(tarname)
+    cs = ds.GetRasterBand(1).Checksum()
+    ds = None
+    assert cs == 4672
+    gdal.Unlink(tarname)
+
+
 def test_mrf_overview_nnb_fact_2():
 
     expected_cs = 1087
diff --git a/autotest/gdrivers/mrsid.py b/autotest/gdrivers/mrsid.py
index c84cd3f26d13..a1c887b31357 100755
--- a/autotest/gdrivers/mrsid.py
+++ b/autotest/gdrivers/mrsid.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2009-2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/ndf.py b/autotest/gdrivers/ndf.py
index 708d9f0f38a0..e31bba57a01d 100755
--- a/autotest/gdrivers/ndf.py
+++ b/autotest/gdrivers/ndf.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2008, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/netcdf.py b/autotest/gdrivers/netcdf.py
index 07e6ca616fb4..21c0b3026ca6 100755
--- a/autotest/gdrivers/netcdf.py
+++ b/autotest/gdrivers/netcdf.py
@@ -12,23 +12,7 @@
 # Copyright (c) 2008-2016, Even Rouault <even.rouault at spatialys.com>
 # Copyright (c) 2010, Kyle Shannon <kyle at pobox dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import json
@@ -110,8 +94,6 @@ def netcdf_setup():
 
 @pytest.fixture(autouse=True, scope="module")
 def netcdf_teardown():
-    gdaltest.clean_tmp()
-
     diff = len(gdaltest.get_opened_files()) - gdaltest.count_opened_files
     assert diff == 0, "Leak of file handles: %d leaked" % diff
 
@@ -124,7 +106,14 @@ def netcdf_teardown():
 def netcdf_test_copy(ifile, band, checksum, ofile, opts=None, driver="NETCDF"):
     # pylint: disable=unused-argument
     opts = [] if opts is None else opts
-    test = gdaltest.GDALTest("NETCDF", "../" + ifile, band, checksum, options=opts)
+    test = gdaltest.GDALTest(
+        "NETCDF",
+        ifile if os.path.isabs(ifile) else "../" + ifile,
+        band,
+        checksum,
+        options=opts,
+        filename_absolute=os.path.isabs(ifile),
+    )
     test.testCreateCopy(
         check_gt=0, check_srs=0, new_filename=ofile, delete_copy=0, check_minmax=0
     )
@@ -173,7 +162,7 @@ def netcdf_test_copy_timeout(
 # check support for DEFLATE compression, requires HDF5 and zlib
 
 
-def netcdf_test_deflate(ifile, checksum, zlevel=1, timeout=None):
+def netcdf_test_deflate(path, ifile, checksum, zlevel=1, timeout=None):
 
     try:
         from multiprocessing import Process
@@ -182,9 +171,9 @@ def netcdf_test_deflate(ifile, checksum, zlevel=1, timeout=None):
     except (ImportError, AttributeError):
         pytest.skip("from multiprocessing import Process failed")
 
-    ofile1 = "tmp/" + os.path.basename(ifile) + "-1.nc"
+    ofile1 = str(path / (os.path.basename(ifile) + "-1.nc"))
     ofile1_opts = ["FORMAT=NC4C", "COMPRESS=NONE"]
-    ofile2 = "tmp/" + os.path.basename(ifile) + "-2.nc"
+    ofile2 = str(path / (os.path.basename(ifile) + "-2.nc"))
     ofile2_opts = ["FORMAT=NC4C", "COMPRESS=DEFLATE", "ZLEVEL=" + str(zlevel)]
 
     assert os.path.exists(ifile), "ifile %s does not exist" % ifile
@@ -302,13 +291,14 @@ def test_netcdf_1():
 # operation because the new file will only be accessible via subdatasets.
 
 
-def test_netcdf_2():
+def test_netcdf_2(tmp_path):
 
     src_ds = gdal.Open("data/byte.tif")
 
-    gdaltest.netcdf_drv.CreateCopy("tmp/netcdf2.nc", src_ds)
+    out_filename = str(tmp_path / "out.nc")
+    gdaltest.netcdf_drv.CreateCopy(out_filename, src_ds)
 
-    tst = gdaltest.GDALTest("NetCDF", "tmp/netcdf2.nc", 1, 4672, filename_absolute=1)
+    tst = gdaltest.GDALTest("NetCDF", out_filename, 1, 4672, filename_absolute=1)
 
     wkt = """PROJCS["NAD27 / UTM zone 11N",
     GEOGCS["NAD27",
@@ -332,17 +322,15 @@ def test_netcdf_2():
     tst.testOpen(check_prj=wkt)
 
     # Check that no nodata value is reported for a Byte dataset
-    ds = gdal.Open("tmp/netcdf2.nc")
+    ds = gdal.Open(out_filename)
     assert ds.GetRasterBand(1).GetNoDataValue() is None
     ds = None
 
     # Test update mode
-    ds = gdal.Open("tmp/netcdf2.nc", gdal.GA_Update)
+    ds = gdal.Open(out_filename, gdal.GA_Update)
     assert ds.GetRasterBand(1).GetNoDataValue() is None
     ds = None
 
-    gdaltest.clean_tmp()
-
 
 ###############################################################################
 
@@ -558,7 +546,9 @@ def test_netcdf_11():
 
 def test_netcdf_cf_geog_with_srs():
 
+    gdal.ErrorReset()
     ds = gdal.Open("data/netcdf/cf_geog_with_srs.nc")
+    assert gdal.GetLastErrorMsg() == ""
 
     gt = ds.GetGeoTransform()
     assert gt == pytest.approx([-0.1, 0.2, 0, -79.1, 0, -0.2], rel=1e-5)
@@ -608,7 +598,7 @@ def test_netcdf_longitude_latitude():
 # check for scale/offset set/get.
 
 
-def test_netcdf_12():
+def test_netcdf_12(tmp_path):
 
     ds = gdal.Open("data/netcdf/scale_offset.nc")
 
@@ -617,10 +607,12 @@ def test_netcdf_12():
 
     assert scale == 0.01 and offset == 1.5
 
-    gdaltest.netcdf_drv.CreateCopy("tmp/tmp.nc", ds)
+    out_filename = str(tmp_path / "out.nc")
+
+    gdaltest.netcdf_drv.CreateCopy(out_filename, ds)
     ds = None
 
-    ds = gdal.Open("tmp/tmp.nc")
+    ds = gdal.Open(out_filename)
 
     scale = ds.GetRasterBand(1).GetScale()
     offset = ds.GetRasterBand(1).GetOffset()
@@ -628,8 +620,6 @@ def test_netcdf_12():
     assert scale == 0.01 and offset == 1.5
     ds = None
 
-    gdaltest.netcdf_drv.Delete("tmp/tmp.nc")
-
 
 ###############################################################################
 # check for scale/offset = None if no scale or offset is available
@@ -809,10 +799,10 @@ def test_netcdf_19():
 # check support for writing with DEFLATE compression
 
 
-def test_netcdf_20():
+def test_netcdf_20(tmp_path):
 
     # simple test with tiny file
-    return netcdf_test_deflate("data/utm.tif", 50235)
+    return netcdf_test_deflate(tmp_path, "data/utm.tif", 50235)
 
 
 ###############################################################################
@@ -963,9 +953,11 @@ def netcdf_24_nc4():
 # check support for writing attributes (single values and array values)
 
 
-def test_netcdf_25():
+def test_netcdf_25(tmp_path):
+
+    out_filename = str(tmp_path / "out.nc")
 
-    netcdf_test_copy("data/netcdf/nc_vars.nc", 1, None, "tmp/netcdf_25.nc")
+    netcdf_test_copy("data/netcdf/nc_vars.nc", 1, None, out_filename)
 
     vals_global = {
         "NC_GLOBAL#test": "testval",
@@ -982,18 +974,18 @@ def test_netcdf_25():
         "valid_range_s": "0,255",
     }
 
-    return netcdf_check_vars("tmp/netcdf_25.nc", vals_global, vals_band)
+    return netcdf_check_vars(out_filename, vals_global, vals_band)
 
 
 ###############################################################################
 # check support for NC4 writing attributes (single values and array values)
 
 
-def netcdf_25_nc4():
+def netcdf_25_nc4(tmp_path):
 
-    netcdf_test_copy(
-        "data/netcdf/nc4_vars.nc", 1, None, "tmp/netcdf_25_nc4.nc", ["FORMAT=NC4"]
-    )
+    out_filename = str(tmp_path / "out.nc")
+
+    netcdf_test_copy("data/netcdf/nc4_vars.nc", 1, None, out_filename, ["FORMAT=NC4"])
 
     vals_global = {
         "NC_GLOBAL#test": "testval",
@@ -1020,7 +1012,7 @@ def netcdf_25_nc4():
         "valid_range_s": "0,255",
     }
 
-    return netcdf_check_vars("tmp/netcdf_25_nc4.nc", vals_global, vals_band)
+    return netcdf_check_vars(out_filename, vals_global, vals_band)
 
 
 ###############################################################################
@@ -1162,10 +1154,10 @@ def netcdf_test_4dfile(ofile):
 # check support for writing multi-dimensional files using CreateCopy()
 
 
-def test_netcdf_28():
+def test_netcdf_28(tmp_path):
 
     ifile = "data/netcdf/netcdf-4d.nc"
-    ofile = "tmp/netcdf_28.nc"
+    ofile = str(tmp_path / "out.nc")
 
     # copy file
     netcdf_test_copy(ifile, 0, None, ofile)
@@ -1184,15 +1176,19 @@ def test_netcdf_28():
 # metadata to netcdf file with SetMetadata() and SetMetadataItem()).
 
 
-def test_netcdf_29():
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
+def test_netcdf_29(tmp_path):
 
     # create tif file using gdalwarp
     if test_cli_utilities.get_gdalwarp_path() is None:
         pytest.skip("gdalwarp not found")
 
-    ifile = "data/netcdf/netcdf-4d.nc"
-    ofile1 = "tmp/netcdf_29.vrt"
-    ofile = "tmp/netcdf_29.nc"
+    ifile = os.path.join(os.getcwd(), "data", "netcdf", "netcdf-4d.nc")
+    ofile1 = str(tmp_path / "out.vrt")
+    ofile = str(tmp_path / "out.nc")
 
     warp_cmd = "%s -q -overwrite -of vrt %s %s" % (
         test_cli_utilities.get_gdalwarp_path(),
@@ -1253,10 +1249,10 @@ def test_netcdf_31():
 # Test NC_UBYTE write/read - netcdf-4 (FORMAT=NC4) only (#5053)
 
 
-def test_netcdf_32():
+def test_netcdf_32(tmp_path):
 
     ifile = "data/byte.tif"
-    ofile = "tmp/netcdf_32.nc"
+    ofile = str(tmp_path / "out.nc")
 
     # test basic read/write
     netcdf_test_copy(ifile, 1, 4672, ofile, ["FORMAT=NC4"])
@@ -1267,14 +1263,14 @@ def test_netcdf_32():
 # TEST NC_UBYTE metadata read - netcdf-4 (FORMAT=NC4) only (#5053)
 
 
-def test_netcdf_33():
+def test_netcdf_33(tmp_path):
 
     ifile = "data/netcdf/nc_vars.nc"
-    ofile = "tmp/netcdf_33.nc"
+    ofile = str(tmp_path / "out.nc")
 
     netcdf_test_copy(ifile, 1, None, ofile, ["FORMAT=NC4"])
 
-    return netcdf_check_vars("tmp/netcdf_33.nc")
+    return netcdf_check_vars(ofile)
 
 
 ###############################################################################
@@ -1322,10 +1318,10 @@ def test_netcdf_34():
 # test writing a long metadata > 8196 chars (bug #5113)
 
 
-def test_netcdf_35():
+def test_netcdf_35(tmp_path):
 
     ifile = "data/netcdf/netcdf_fixes.nc"
-    ofile = "tmp/netcdf_35.nc"
+    ofile = str(tmp_path / "out.nc")
 
     # copy file
     netcdf_test_copy(ifile, 0, None, ofile)
@@ -1359,18 +1355,8 @@ def test_netcdf_36():
 
     gt = ds.GetGeoTransform()
     assert gt is not None, "got no GeoTransform"
-    gt_expected = (
-        -3.498749944898817,
-        0.0025000042385525173,
-        0.0,
-        46.61749818589952,
-        0.0,
-        -0.001666598849826389,
-    )
-    assert gt == gt_expected, "got GeoTransform %s, expected %s" % (
-        str(gt),
-        str(gt_expected),
-    )
+    gt_expected = (-3.49875, 0.0025, 0.0, 46.61749818589952, 0.0, -0.001666598849826389)
+    assert gt == pytest.approx(gt_expected, rel=1e-8)
 
 
 ###############################################################################
@@ -1455,6 +1441,10 @@ def test_netcdf_38():
 # Test VRT and NETCDF:
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_netcdf_39():
 
     shutil.copy("data/netcdf/two_vars_scale_offset.nc", "tmp")
@@ -1486,6 +1476,10 @@ def test_netcdf_39():
     assert cs == 65463
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_netcdf_39_absolute():
 
     if (
@@ -1531,9 +1525,10 @@ def test_netcdf_39_absolute():
 # Check support of reading of chunked bottom-up files.
 
 
-def test_netcdf_40():
+def test_netcdf_40(tmp_path):
+    ofile = str(tmp_path / "out.nc")
 
-    return netcdf_test_copy("data/netcdf/bug5291.nc", 0, None, "tmp/netcdf_40.nc")
+    return netcdf_test_copy("data/netcdf/bug5291.nc", 0, None, ofile)
 
 
 ###############################################################################
@@ -1552,7 +1547,7 @@ def test_netcdf_41():
 # Test writing & reading GEOLOCATION array
 
 
-def test_netcdf_42():
+def test_netcdf_42(tmp_path):
 
     src_ds = gdal.GetDriverByName("MEM").Create("", 60, 39, 1)
     src_ds.SetMetadata(
@@ -1573,20 +1568,21 @@ def test_netcdf_42():
     sr.ImportFromEPSG(32631)
     src_ds.SetProjection(sr.ExportToWkt())
 
-    gdaltest.netcdf_drv.CreateCopy("tmp/netcdf_42.nc", src_ds)
+    ofile = str(tmp_path / "out.nc")
+    gdaltest.netcdf_drv.CreateCopy(ofile, src_ds)
 
-    ds = gdal.Open("tmp/netcdf_42.nc")
+    ds = gdal.Open(ofile)
     got_md = ds.GetMetadata("GEOLOCATION")
     assert got_md["SRS"].startswith('GEOGCRS["WGS 84",')
     del got_md["SRS"]
     assert got_md == {
         "LINE_OFFSET": "0",
-        "X_DATASET": 'NETCDF:"tmp/netcdf_42.nc":lon',
+        "X_DATASET": f'NETCDF:"{ofile}":lon',
         "PIXEL_STEP": "1",
         "PIXEL_OFFSET": "0",
         "X_BAND": "1",
         "LINE_STEP": "1",
-        "Y_DATASET": 'NETCDF:"tmp/netcdf_42.nc":lat',
+        "Y_DATASET": f'NETCDF:"{ofile}":lat',
         "Y_BAND": "1",
         "GEOREFERENCING_CONVENTION": "PIXEL_CENTER",
     }
@@ -1594,10 +1590,10 @@ def test_netcdf_42():
     assert ds.GetMetadataItem("transverse_mercator#spatial_ref") == wkt
     assert ds.GetMetadataItem("transverse_mercator#crs_wkt") == wkt
 
-    ds = gdal.Open('NETCDF:"tmp/netcdf_42.nc":lon')
+    ds = gdal.Open(f'NETCDF:"{ofile}":lon')
     assert ds.GetRasterBand(1).Checksum() == 36043
 
-    ds = gdal.Open('NETCDF:"tmp/netcdf_42.nc":lat')
+    ds = gdal.Open(f'NETCDF:"{ofile}":lat')
     assert ds.GetRasterBand(1).Checksum() == 33501
 
 
@@ -1607,7 +1603,7 @@ def test_netcdf_42():
 
 @pytest.mark.parametrize("write_bottomup", [True, False])
 @pytest.mark.parametrize("read_bottomup", [True, False])
-def test_netcdf_geolocation_array_no_srs(write_bottomup, read_bottomup):
+def test_netcdf_geolocation_array_no_srs(tmp_path, write_bottomup, read_bottomup):
 
     lon_ds = gdal.GetDriverByName("GTiff").Create(
         "/vsimem/test_netcdf_geolocation_array_no_srs_lon.tif", 3, 2, 1
@@ -1645,20 +1641,19 @@ def test_netcdf_geolocation_array_no_srs(write_bottomup, read_bottomup):
     )
 
     options = ["WRITE_BOTTOMUP=" + ("YES" if write_bottomup else "NO")]
-    gdaltest.netcdf_drv.CreateCopy(
-        "tmp/test_netcdf_geolocation_array_no_srs.nc", src_ds, options=options
-    )
+    ofile = str(tmp_path / "out.nc")
+    gdaltest.netcdf_drv.CreateCopy(ofile, src_ds, options=options)
 
-    ds = gdal.Open("tmp/test_netcdf_geolocation_array_no_srs.nc")
+    ds = gdal.Open(ofile)
     assert ds.GetMetadata("GEOLOCATION") == {
         "LINE_OFFSET": "0",
-        "X_DATASET": 'NETCDF:"tmp/test_netcdf_geolocation_array_no_srs.nc":lon',
+        "X_DATASET": f'NETCDF:"{ofile}":lon',
         "PIXEL_STEP": "1",
         "SRS": 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AXIS["Latitude",NORTH],AXIS["Longitude",EAST],AUTHORITY["EPSG","4326"]]',
         "PIXEL_OFFSET": "0",
         "X_BAND": "1",
         "LINE_STEP": "1",
-        "Y_DATASET": 'NETCDF:"tmp/test_netcdf_geolocation_array_no_srs.nc":lat',
+        "Y_DATASET": f'NETCDF:"{ofile}":lat',
         "Y_BAND": "1",
         "GEOREFERENCING_CONVENTION": "PIXEL_CENTER",
     }
@@ -1667,7 +1662,7 @@ def test_netcdf_geolocation_array_no_srs(write_bottomup, read_bottomup):
     with gdaltest.config_option(
         "GDAL_NETCDF_BOTTOMUP", "YES" if read_bottomup else "NO"
     ):
-        ds = gdal.Open('NETCDF:"tmp/test_netcdf_geolocation_array_no_srs.nc":Band1')
+        ds = gdal.Open(f'NETCDF:"{ofile}":Band1')
         got_data = struct.unpack(
             "B" * 6, ds.GetRasterBand(1).ReadRaster(0, 0, 3, 2, buf_type=gdal.GDT_Byte)
         )
@@ -1679,7 +1674,7 @@ def test_netcdf_geolocation_array_no_srs(write_bottomup, read_bottomup):
             assert got_data == (0, 1, 2, 3, 4, 5)
         ds = None
 
-        ds = gdal.Open('NETCDF:"tmp/test_netcdf_geolocation_array_no_srs.nc":lon')
+        ds = gdal.Open(f'NETCDF:"{ofile}":lon')
         got_data = struct.unpack(
             "B" * 6, ds.GetRasterBand(1).ReadRaster(0, 0, 3, 2, buf_type=gdal.GDT_Byte)
         )
@@ -1691,7 +1686,7 @@ def test_netcdf_geolocation_array_no_srs(write_bottomup, read_bottomup):
             assert got_data == (10, 11, 12, 13, 14, 15)
         ds = None
 
-        ds = gdal.Open('NETCDF:"tmp/test_netcdf_geolocation_array_no_srs.nc":lat')
+        ds = gdal.Open(f'NETCDF:"{ofile}":lat')
         got_data = struct.unpack(
             "B" * 6, ds.GetRasterBand(1).ReadRaster(0, 0, 3, 2, buf_type=gdal.GDT_Byte)
         )
@@ -1703,7 +1698,6 @@ def test_netcdf_geolocation_array_no_srs(write_bottomup, read_bottomup):
             assert got_data == (20, 21, 22, 23, 24, 25)
         ds = None
 
-    gdal.Unlink("tmp/test_netcdf_geolocation_array_no_srs.nc")
     gdal.Unlink("/vsimem/test_netcdf_geolocation_array_no_srs_lon.tif")
     gdal.Unlink("/vsimem/test_netcdf_geolocation_array_no_srs_lat.tif")
 
@@ -1712,30 +1706,29 @@ def test_netcdf_geolocation_array_no_srs(write_bottomup, read_bottomup):
 # Test reading GEOLOCATION array from geotransform (non default)
 
 
-def test_netcdf_43():
+def test_netcdf_43(tmp_path):
 
     src_ds = gdal.Open("data/byte.tif")
-    gdaltest.netcdf_drv.CreateCopy(
-        "tmp/netcdf_43.nc", src_ds, options=["WRITE_LONLAT=YES"]
-    )
+    ofile = str(tmp_path / "out.nc")
+    gdaltest.netcdf_drv.CreateCopy(ofile, src_ds, options=["WRITE_LONLAT=YES"])
 
-    ds = gdal.Open("tmp/netcdf_43.nc")
+    ds = gdal.Open(ofile)
     got_md = ds.GetMetadata("GEOLOCATION")
     assert got_md["SRS"].startswith('GEOGCRS["NAD27",')
     del got_md["SRS"]
     assert got_md == {
         "LINE_OFFSET": "0",
-        "X_DATASET": 'NETCDF:"tmp/netcdf_43.nc":lon',
+        "X_DATASET": f'NETCDF:"{ofile}":lon',
         "PIXEL_STEP": "1",
         "PIXEL_OFFSET": "0",
         "X_BAND": "1",
         "LINE_STEP": "1",
-        "Y_DATASET": 'NETCDF:"tmp/netcdf_43.nc":lat',
+        "Y_DATASET": f'NETCDF:"{ofile}":lat',
         "Y_BAND": "1",
         "GEOREFERENCING_CONVENTION": "PIXEL_CENTER",
     }
 
-    tmp_ds = gdal.Warp("", "tmp/netcdf_43.nc", options="-f MEM -geoloc")
+    tmp_ds = gdal.Warp("", ofile, options="-f MEM -geoloc")
     gt = tmp_ds.GetGeoTransform()
     assert gt[0] == pytest.approx(-117.3, abs=1), gt
     assert gt[3] == pytest.approx(33.9, abs=1), gt
@@ -1745,10 +1738,13 @@ def test_netcdf_43():
 # Test NC_USHORT/UINT read/write - netcdf-4 only (#6337)
 
 
-def test_netcdf_44():
+@pytest.mark.parametrize(
+    "f,md5", [("data/netcdf/ushort.nc", 18), ("data/netcdf/uint.nc", 10)]
+)
+def test_netcdf_44(tmp_path, f, md5):
 
-    for f, md5 in ("data/netcdf/ushort.nc", 18), ("data/netcdf/uint.nc", 10):
-        netcdf_test_copy(f, 1, md5, "tmp/netcdf_44.nc", ["FORMAT=NC4"])
+    ofile = str(tmp_path / "out.nc")
+    netcdf_test_copy(f, 1, md5, ofile, ["FORMAT=NC4"])
 
 
 ###############################################################################
@@ -1943,11 +1939,12 @@ def test_netcdf_read_trajectory():
 # Test creating a vector NetCDF 3 file with WKT geometry field
 
 
-def test_netcdf_50():
+def test_netcdf_50(tmp_path):
 
     ds = gdal.OpenEx("../ogr/data/poly.shp", gdal.OF_VECTOR)
+    ofile = str(tmp_path / "out.nc")
     out_ds = gdal.VectorTranslate(
-        "tmp/netcdf_50.nc",
+        ofile,
         ds,
         format="netCDF",
         layerCreationOptions=["WKT_DEFAULT_WIDTH=1"],
@@ -1966,7 +1963,7 @@ def test_netcdf_50():
     assert src_json == out_json
     out_ds = None
 
-    out_ds = gdal.OpenEx("tmp/netcdf_50.nc", gdal.OF_VECTOR)
+    out_ds = gdal.OpenEx(ofile, gdal.OF_VECTOR)
     out_lyr = out_ds.GetLayer(0)
     srs = out_lyr.GetSpatialRef().ExportToWkt()
     assert 'PROJCS["OSGB' in srs
@@ -1976,20 +1973,19 @@ def test_netcdf_50():
     assert src_json == out_json
     out_ds = None
 
-    gdal.Unlink("tmp/netcdf_50.nc")
-
 
 ###############################################################################
 # Test creating a vector NetCDF 3 file with X,Y,Z fields
 
 
 @pytest.mark.require_driver("CSV")
-def test_netcdf_51():
+def test_netcdf_51(tmp_path):
 
     ds = gdal.OpenEx("data/netcdf/test_ogr_nc3.nc", gdal.OF_VECTOR)
+    ofile = str(tmp_path / "out.nc")
     # Test autogrow of string fields
     gdal.VectorTranslate(
-        "tmp/netcdf_51.nc",
+        ofile,
         ds,
         format="netCDF",
         layerCreationOptions=["STRING_DEFAULT_WIDTH=1"],
@@ -1997,7 +1993,7 @@ def test_netcdf_51():
     )
 
     with gdal.quiet_errors():
-        ds = gdal.OpenEx("tmp/netcdf_51.nc", gdal.OF_VECTOR)
+        ds = gdal.OpenEx(ofile, gdal.OF_VECTOR)
         gdal.VectorTranslate(
             "/vsimem/netcdf_51.csv",
             ds,
@@ -2031,7 +2027,7 @@ def test_netcdf_51():
 """
     assert content == expected_content
 
-    ds = gdal.OpenEx("tmp/netcdf_51.nc", gdal.OF_VECTOR | gdal.OF_UPDATE)
+    ds = gdal.OpenEx(ofile, gdal.OF_VECTOR | gdal.OF_UPDATE)
     lyr = ds.GetLayer(0)
     lyr.CreateField(ogr.FieldDefn("extra", ogr.OFTInteger))
     lyr.CreateField(ogr.FieldDefn("extra_str", ogr.OFTString))
@@ -2042,7 +2038,7 @@ def test_netcdf_51():
     assert lyr.CreateFeature(f) == 0
     ds = None
 
-    ds = gdal.OpenEx("tmp/netcdf_51.nc", gdal.OF_VECTOR)
+    ds = gdal.OpenEx(ofile, gdal.OF_VECTOR)
     lyr = ds.GetLayer(0)
     f = lyr.GetFeature(lyr.GetFeatureCount())
     assert f["int32"] == 1 and f["extra"] == 5 and f["extra_str"] == "foobar"
@@ -2052,11 +2048,8 @@ def test_netcdf_51():
     import netcdf_cf
 
     if netcdf_cf.cfchecks_available():
-        netcdf_cf.netcdf_cf_check_file("tmp/netcdf_51.nc", "auto")
+        netcdf_cf.netcdf_cf_check_file(ofile, "auto")
 
-    gdal.Unlink("tmp/netcdf_51.nc")
-    gdal.Unlink("tmp/netcdf_51.csv")
-    gdal.Unlink("tmp/netcdf_51.csvt")
     gdal.Unlink("/vsimem/netcdf_51.csv")
     gdal.Unlink("/vsimem/netcdf_51.csvt")
     gdal.Unlink("/vsimem/netcdf_51.prj")
@@ -2067,18 +2060,19 @@ def test_netcdf_51():
 
 
 @pytest.mark.require_driver("CSV")
-def test_netcdf_51_no_gdal_tags():
+def test_netcdf_51_no_gdal_tags(tmp_path):
 
     ds = gdal.OpenEx("data/netcdf/test_ogr_nc3.nc", gdal.OF_VECTOR)
+    ofile = str(tmp_path / "out.nc")
     gdal.VectorTranslate(
-        "tmp/netcdf_51_no_gdal_tags.nc",
+        ofile,
         ds,
         format="netCDF",
         datasetCreationOptions=["WRITE_GDAL_TAGS=NO", "GEOMETRY_ENCODING=WKT"],
     )
 
     with gdal.quiet_errors():
-        ds = gdal.OpenEx("tmp/netcdf_51_no_gdal_tags.nc", gdal.OF_VECTOR)
+        ds = gdal.OpenEx(ofile, gdal.OF_VECTOR)
         gdal.VectorTranslate(
             "/vsimem/netcdf_51_no_gdal_tags.csv",
             ds,
@@ -2111,9 +2105,6 @@ def test_netcdf_51_no_gdal_tags():
 """
     assert content == expected_content
 
-    gdal.Unlink("tmp/netcdf_51_no_gdal_tags.nc")
-    gdal.Unlink("tmp/netcdf_51_no_gdal_tags.csv")
-    gdal.Unlink("tmp/netcdf_51_no_gdal_tags.csvt")
     gdal.Unlink("/vsimem/netcdf_51_no_gdal_tags.csv")
     gdal.Unlink("/vsimem/netcdf_51_no_gdal_tags.csvt")
     gdal.Unlink("/vsimem/netcdf_51_no_gdal_tags.prj")
@@ -2124,7 +2115,7 @@ def test_netcdf_51_no_gdal_tags():
 
 
 @pytest.mark.require_driver("CSV")
-def test_netcdf_52():
+def test_netcdf_52(tmp_path):
 
     if gdaltest.netcdf_drv_version == "4.7.0":
         pytest.skip(
@@ -2132,15 +2123,16 @@ def test_netcdf_52():
         )
 
     ds = gdal.OpenEx("data/netcdf/test_ogr_nc4.nc", gdal.OF_VECTOR)
+    ofile = str(tmp_path / "out.nc")
     gdal.VectorTranslate(
-        "tmp/netcdf_52.nc",
+        ofile,
         ds,
         format="netCDF",
         datasetCreationOptions=["FORMAT=NC4", "GEOMETRY_ENCODING=WKT"],
     )
 
     with gdal.quiet_errors():
-        ds = gdal.OpenEx("tmp/netcdf_52.nc", gdal.OF_VECTOR)
+        ds = gdal.OpenEx(ofile, gdal.OF_VECTOR)
         gdal.VectorTranslate(
             "/vsimem/netcdf_52.csv",
             ds,
@@ -2173,7 +2165,7 @@ def test_netcdf_52():
 """
     assert content == expected_content
 
-    ds = gdal.OpenEx("tmp/netcdf_52.nc", gdal.OF_VECTOR | gdal.OF_UPDATE)
+    ds = gdal.OpenEx(ofile, gdal.OF_VECTOR | gdal.OF_UPDATE)
     lyr = ds.GetLayer(0)
     lyr.CreateField(ogr.FieldDefn("extra", ogr.OFTInteger))
     f = lyr.GetNextFeature()
@@ -2182,21 +2174,20 @@ def test_netcdf_52():
     assert lyr.CreateFeature(f) == 0
     ds = None
 
-    ds = gdal.OpenEx("tmp/netcdf_52.nc", gdal.OF_VECTOR)
+    ds = gdal.OpenEx(ofile, gdal.OF_VECTOR)
     lyr = ds.GetLayer(0)
     f = lyr.GetFeature(lyr.GetFeatureCount())
     assert f["int32"] == 1 and f["extra"] == 5
     f = None
     ds = None
 
-    import netcdf_cf
-
-    if netcdf_cf.cfchecks_available():
-        netcdf_cf.netcdf_cf_check_file("tmp/netcdf_52.nc", "auto")
+    # Latest release version of cfchecker (4.1.0) doesn't support variable-length
+    # strings as valid variable types, but next one will:
+    # https://github.com/cedadev/cf-checker/blob/c0486c606f7cf4d38d3b484b427726ce1bde73ee/src/cfchecker/cfchecks.py#L745
+    # import netcdf_cf
+    # if netcdf_cf.cfchecks_available():
+    #     netcdf_cf.netcdf_cf_check_file(ofile, "auto")
 
-    gdal.Unlink("tmp/netcdf_52.nc")
-    gdal.Unlink("tmp/netcdf_52.csv")
-    gdal.Unlink("tmp/netcdf_52.csvt")
     gdal.Unlink("/vsimem/netcdf_52.csv")
     gdal.Unlink("/vsimem/netcdf_52.csvt")
     gdal.Unlink("/vsimem/netcdf_52.prj")
@@ -2206,11 +2197,12 @@ def test_netcdf_52():
 # Test creating a vector NetCDF 4 file with WKT geometry field
 
 
-def test_netcdf_53():
+def test_netcdf_53(tmp_path):
 
     ds = gdal.OpenEx("../ogr/data/poly.shp", gdal.OF_VECTOR)
+    ofile = str(tmp_path / "out.nc")
     out_ds = gdal.VectorTranslate(
-        "tmp/netcdf_53.nc",
+        ofile,
         ds,
         format="netCDF",
         datasetCreationOptions=["FORMAT=NC4", "GEOMETRY_ENCODING=WKT"],
@@ -2228,7 +2220,7 @@ def test_netcdf_53():
     assert src_json == out_json
     out_ds = None
 
-    out_ds = gdal.OpenEx("tmp/netcdf_53.nc", gdal.OF_VECTOR)
+    out_ds = gdal.OpenEx(ofile, gdal.OF_VECTOR)
     out_lyr = out_ds.GetLayer(0)
     srs = out_lyr.GetSpatialRef().ExportToWkt()
     assert 'PROJCS["OSGB' in srs
@@ -2238,23 +2230,22 @@ def test_netcdf_53():
     assert src_json == out_json
     out_ds = None
 
-    gdal.Unlink("tmp/netcdf_53.nc")
-
 
 ###############################################################################
 # Test appending to a vector NetCDF 4 file with unusual types (ubyte, ushort...)
 
 
-def test_netcdf_54():
+def test_netcdf_54(tmp_path):
 
     if gdaltest.netcdf_drv_version == "4.7.0":
         pytest.skip(
             "buggy netCDF version: https://github.com/Unidata/netcdf-c/pull/1442"
         )
 
-    shutil.copy("data/netcdf/test_ogr_nc4.nc", "tmp/netcdf_54.nc")
+    ofile = str(tmp_path / "out.nc")
+    shutil.copy("data/netcdf/test_ogr_nc4.nc", ofile)
 
-    ds = gdal.OpenEx("tmp/netcdf_54.nc", gdal.OF_VECTOR | gdal.OF_UPDATE)
+    ds = gdal.OpenEx(ofile, gdal.OF_VECTOR | gdal.OF_UPDATE)
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     assert f is not None
@@ -2265,7 +2256,7 @@ def test_netcdf_54():
     assert lyr.CreateFeature(f) == 0
     ds = None
 
-    ds = gdal.OpenEx("tmp/netcdf_54.nc", gdal.OF_VECTOR)
+    ds = gdal.OpenEx(ofile, gdal.OF_VECTOR)
     lyr = ds.GetLayer(0)
     f = lyr.GetFeature(lyr.GetFeatureCount())
     f.SetFID(-1)
@@ -2273,8 +2264,6 @@ def test_netcdf_54():
     f = None
     ds = None
 
-    gdal.Unlink("tmp/netcdf_54.nc")
-
     assert src_json == out_json
 
 
@@ -2282,11 +2271,12 @@ def test_netcdf_54():
 # Test auto-grow of bidimensional char variables in a vector NetCDF 4 file
 
 
-def test_netcdf_55():
+def test_netcdf_55(tmp_path):
 
-    shutil.copy("data/netcdf/test_ogr_nc4.nc", "tmp/netcdf_55.nc")
+    ofile = str(tmp_path / "out.nc")
+    shutil.copy("data/netcdf/test_ogr_nc4.nc", ofile)
 
-    ds = gdal.OpenEx("tmp/netcdf_55.nc", gdal.OF_VECTOR | gdal.OF_UPDATE)
+    ds = gdal.OpenEx(ofile, gdal.OF_VECTOR | gdal.OF_UPDATE)
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     assert f is not None
@@ -2297,7 +2287,7 @@ def test_netcdf_55():
     assert lyr.CreateFeature(f) == 0
     ds = None
 
-    ds = gdal.OpenEx("tmp/netcdf_55.nc", gdal.OF_VECTOR)
+    ds = gdal.OpenEx(ofile, gdal.OF_VECTOR)
     lyr = ds.GetLayer(0)
     f = lyr.GetFeature(lyr.GetFeatureCount())
     f.SetFID(-1)
@@ -2305,8 +2295,6 @@ def test_netcdf_55():
     f = None
     ds = None
 
-    gdal.Unlink("tmp/netcdf_55.nc")
-
     assert src_json == out_json
 
 
@@ -2314,14 +2302,15 @@ def test_netcdf_55():
 # Test truncation of bidimensional char variables and WKT in a vector NetCDF 3 file
 
 
-def test_netcdf_56():
+def test_netcdf_56(tmp_path):
 
+    ofile = str(tmp_path / "out.nc")
     ds = ogr.GetDriverByName("netCDF").CreateDataSource(
-        "tmp/netcdf_56.nc", options=["GEOMETRY_ENCODING=WKT"]
+        ofile, options=["GEOMETRY_ENCODING=WKT"]
     )
     # Test auto-grow of WKT field
     lyr = ds.CreateLayer(
-        "netcdf_56",
+        "out",
         options=[
             "AUTOGROW_STRINGS=NO",
             "STRING_DEFAULT_WIDTH=5",
@@ -2338,7 +2327,7 @@ def test_netcdf_56():
     assert ret == 0
     ds = None
 
-    ds = gdal.OpenEx("tmp/netcdf_56.nc", gdal.OF_VECTOR)
+    ds = gdal.OpenEx(ofile, gdal.OF_VECTOR)
     lyr = ds.GetLayer(0)
     assert lyr.GetDataset().GetDescription() == ds.GetDescription()
     f = lyr.GetFeature(lyr.GetFeatureCount())
@@ -2347,91 +2336,69 @@ def test_netcdf_56():
         pytest.fail()
     ds = None
 
-    gdal.Unlink("tmp/netcdf_56.nc")
-
 
 ###############################################################################
 # Test OGR field alternative name and comment
 
 
-def test_netcdf_ogr_field_alternative_name_comment():
+def test_netcdf_ogr_field_alternative_name_comment(tmp_path):
 
-    filename = "tmp/test_netcdf_ogr_field_alternative_name_comment.nc"
-    try:
+    filename = str(tmp_path / "out.nc")
 
-        ds = ogr.GetDriverByName("netCDF").CreateDataSource(
-            filename, options=["GEOMETRY_ENCODING=WKT"]
-        )
-        lyr = ds.CreateLayer("test")
+    ds = ogr.GetDriverByName("netCDF").CreateDataSource(
+        filename, options=["GEOMETRY_ENCODING=WKT"]
+    )
+    lyr = ds.CreateLayer("test")
 
-        fld_defn = ogr.FieldDefn("id", ogr.OFTInteger)
-        fld_defn.SetAlternativeName("identifier")
-        fld_defn.SetComment("this is an identifier")
-        lyr.CreateField(fld_defn)
+    fld_defn = ogr.FieldDefn("id", ogr.OFTInteger)
+    fld_defn.SetAlternativeName("identifier")
+    fld_defn.SetComment("this is an identifier")
+    lyr.CreateField(fld_defn)
 
-        fld_defn = ogr.FieldDefn("fld2", ogr.OFTInteger)
-        fld_defn.SetAlternativeName(
-            "not compatible of standard_name. will be put in long_name, and read back as comment"
-        )
-        lyr.CreateField(fld_defn)
+    fld_defn = ogr.FieldDefn("fld2", ogr.OFTInteger)
+    fld_defn.SetAlternativeName(
+        "not compatible of standard_name. will be put in long_name, and read back as comment"
+    )
+    lyr.CreateField(fld_defn)
 
-        fld_defn = ogr.FieldDefn("fld3", ogr.OFTInteger)
-        fld_defn.SetComment("comment of field 3")
-        lyr.CreateField(fld_defn)
+    fld_defn = ogr.FieldDefn("fld3", ogr.OFTInteger)
+    fld_defn.SetComment("comment of field 3")
+    lyr.CreateField(fld_defn)
 
-        fld_defn = ogr.FieldDefn("fld4", ogr.OFTInteger)
-        lyr.CreateField(fld_defn)
+    fld_defn = ogr.FieldDefn("fld4", ogr.OFTInteger)
+    lyr.CreateField(fld_defn)
 
-        ds = None
+    ds = None
 
-        ds = ogr.Open(filename)
-        lyr = ds.GetLayer(0)
-        assert lyr.GetLayerDefn().GetFieldDefn(0).GetName() == "id"
-        assert lyr.GetLayerDefn().GetFieldDefn(0).GetAlternativeName() == "identifier"
-        assert (
-            lyr.GetLayerDefn().GetFieldDefn(0).GetComment() == "this is an identifier"
-        )
+    ds = ogr.Open(filename)
+    lyr = ds.GetLayer(0)
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetName() == "id"
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetAlternativeName() == "identifier"
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetComment() == "this is an identifier"
 
-        assert lyr.GetLayerDefn().GetFieldDefn(1).GetName() == "fld2"
-        assert lyr.GetLayerDefn().GetFieldDefn(1).GetAlternativeName() == ""
-        assert (
-            lyr.GetLayerDefn().GetFieldDefn(1).GetComment()
-            == "not compatible of standard_name. will be put in long_name, and read back as comment"
-        )
+    assert lyr.GetLayerDefn().GetFieldDefn(1).GetName() == "fld2"
+    assert lyr.GetLayerDefn().GetFieldDefn(1).GetAlternativeName() == ""
+    assert (
+        lyr.GetLayerDefn().GetFieldDefn(1).GetComment()
+        == "not compatible of standard_name. will be put in long_name, and read back as comment"
+    )
 
-        assert lyr.GetLayerDefn().GetFieldDefn(2).GetName() == "fld3"
-        assert lyr.GetLayerDefn().GetFieldDefn(2).GetAlternativeName() == ""
-        assert lyr.GetLayerDefn().GetFieldDefn(2).GetComment() == "comment of field 3"
+    assert lyr.GetLayerDefn().GetFieldDefn(2).GetName() == "fld3"
+    assert lyr.GetLayerDefn().GetFieldDefn(2).GetAlternativeName() == ""
+    assert lyr.GetLayerDefn().GetFieldDefn(2).GetComment() == "comment of field 3"
 
-        assert lyr.GetLayerDefn().GetFieldDefn(3).GetName() == "fld4"
-        assert lyr.GetLayerDefn().GetFieldDefn(3).GetAlternativeName() == ""
-        assert lyr.GetLayerDefn().GetFieldDefn(3).GetComment() == ""
+    assert lyr.GetLayerDefn().GetFieldDefn(3).GetName() == "fld4"
+    assert lyr.GetLayerDefn().GetFieldDefn(3).GetAlternativeName() == ""
+    assert lyr.GetLayerDefn().GetFieldDefn(3).GetComment() == ""
 
-        ds = None
-
-    finally:
-        os.unlink(filename)
+    ds = None
 
 
 ###############################################################################
 # Test one layer per file creation
 
 
-def test_netcdf_57():
-
-    try:
-        shutil.rmtree("tmp/netcdf_57")
-    except OSError:
-        pass
-
-    with gdal.quiet_errors():
-        ds = ogr.GetDriverByName("netCDF").CreateDataSource(
-            "/not_existing_dir/invalid_subdir",
-            options=["MULTIPLE_LAYERS=SEPARATE_FILES", "GEOMETRY_ENCODING=WKT"],
-        )
-    assert ds is None
-
-    open("tmp/netcdf_57", "wb").close()
+def test_netcdf_57(tmp_path):
 
     with gdal.quiet_errors():
         ds = ogr.GetDriverByName("netCDF").CreateDataSource(
@@ -2440,10 +2407,9 @@ def test_netcdf_57():
         )
     assert ds is None
 
-    os.unlink("tmp/netcdf_57")
-
+    ofile = str(tmp_path / "out")
     ds = ogr.GetDriverByName("netCDF").CreateDataSource(
-        "tmp/netcdf_57",
+        ofile,
         options=["MULTIPLE_LAYERS=SEPARATE_FILES", "GEOMETRY_ENCODING=WKT"],
     )
     for ilayer in range(2):
@@ -2455,23 +2421,23 @@ def test_netcdf_57():
     ds = None
 
     for ilayer in range(2):
-        ds = ogr.Open("tmp/netcdf_57/lyr%d.nc" % ilayer)
+        ds = ogr.Open(os.path.join(ofile, "lyr%d.nc" % ilayer))
         lyr = ds.GetLayer(0)
         f = lyr.GetNextFeature()
         assert f["lyr_id"] == ilayer
         ds = None
 
-    shutil.rmtree("tmp/netcdf_57")
-
 
 ###############################################################################
 # Test one layer per group (NC4)
 
 
-def test_netcdf_58():
+def test_netcdf_58(tmp_path):
+
+    ofile = str(tmp_path / "out.nc")
 
     ds = ogr.GetDriverByName("netCDF").CreateDataSource(
-        "tmp/netcdf_58.nc",
+        ofile,
         options=[
             "FORMAT=NC4",
             "MULTIPLE_LAYERS=SEPARATE_GROUPS",
@@ -2491,15 +2457,13 @@ def test_netcdf_58():
         lyr.CreateFeature(f)
     ds = None
 
-    ds = ogr.Open("tmp/netcdf_58.nc")
+    ds = ogr.Open(ofile)
     for ilayer in range(2):
         lyr = ds.GetLayer(ilayer)
         f = lyr.GetNextFeature()
         assert f["lyr_id"] == "lyr_%d" % ilayer
     ds = None
 
-    gdal.Unlink("tmp/netcdf_58.nc")
-
 
 ###############################################################################
 # check for UnitType set/get.
@@ -2569,12 +2533,11 @@ def test_netcdf_60():
 
 
 @pytest.mark.require_driver("CSV")
-def test_netcdf_61():
+def test_netcdf_61(tmp_path):
 
-    shutil.copy("data/netcdf/profile.nc", "tmp/netcdf_61.nc")
-    ds = gdal.VectorTranslate(
-        "tmp/netcdf_61.nc", "data/netcdf/profile.nc", accessMode="append"
-    )
+    ofile = str(tmp_path / "out.nc")
+    shutil.copy("data/netcdf/profile.nc", ofile)
+    ds = gdal.VectorTranslate(ofile, "data/netcdf/profile.nc", accessMode="append")
     gdal.VectorTranslate(
         "/vsimem/netcdf_61.csv",
         ds,
@@ -2611,10 +2574,12 @@ def test_netcdf_61():
 
 
 @pytest.mark.require_driver("CSV")
-def test_netcdf_62():
+def test_netcdf_62(tmp_path):
+
+    ofile = str(tmp_path / "out.nc")
 
     ds = gdal.VectorTranslate(
-        "tmp/netcdf_62.nc",
+        ofile,
         "data/netcdf/profile.nc",
         format="netCDF",
         layerCreationOptions=[
@@ -2651,7 +2616,7 @@ def test_netcdf_62():
     gdal.Unlink("/vsimem/netcdf_62.csv")
 
     if gdaltest.netcdf_have_ncdump:
-        hdr = netcdf_ncdump("tmp/netcdf_62.nc")
+        hdr = netcdf_ncdump(ofile)
         assert "profile = 2" in hdr
         assert "record = UNLIMITED" in hdr
         assert 'profile:cf_role = "profile_id"' in hdr
@@ -2660,12 +2625,13 @@ def test_netcdf_62():
         assert "char station(profile" in hdr
         assert "char foo(record" in hdr
 
-    import netcdf_cf
-
-    if netcdf_cf.cfchecks_available():
-        netcdf_cf.netcdf_cf_check_file("tmp/netcdf_62.nc", "auto")
-
-    gdal.Unlink("tmp/netcdf_62.nc")
+    # Disable cfchecker validation as it fails with a '(5): co-ordinate variable not monotonic'
+    # error which I believe is incorrect given the particular nature of
+    # a https://cfconventions.org/Data/cf-conventions/cf-conventions-1.11/cf-conventions.html#_indexed_ragged_array_representation_of_profiles
+    # where coordinate variables can clearly not be sorted in any order.
+    # import netcdf_cf
+    # if netcdf_cf.cfchecks_available():
+    #    netcdf_cf.netcdf_cf_check_file(ofile, "auto")
 
 
 ###############################################################################
@@ -2673,11 +2639,13 @@ def test_netcdf_62():
 
 
 @pytest.mark.require_driver("CSV")
-def test_netcdf_63():
+def test_netcdf_63(tmp_path):
+
+    ofile = str(tmp_path / "out.nc")
 
-    shutil.copy("data/netcdf/profile.nc", "tmp/netcdf_63.nc")
+    shutil.copy("data/netcdf/profile.nc", ofile)
     ds = gdal.VectorTranslate(
-        "tmp/netcdf_63.nc",
+        ofile,
         "data/netcdf/profile.nc",
         format="netCDF",
         datasetCreationOptions=["FORMAT=NC4", "GEOMETRY_ENCODING=WKT"],
@@ -2716,7 +2684,7 @@ def test_netcdf_63():
     del ds
 
     if gdaltest.netcdf_have_ncdump:
-        hdr = netcdf_ncdump("tmp/netcdf_63.nc")
+        hdr = netcdf_ncdump(ofile)
         assert "profile = UNLIMITED" in hdr
         assert "record = UNLIMITED" in hdr
         assert 'profile:cf_role = "profile_id"' in hdr
@@ -2733,10 +2701,12 @@ def test_netcdf_63():
 
 
 @pytest.mark.require_driver("CSV")
-def test_netcdf_64():
+def test_netcdf_64(tmp_path):
+
+    ofile = str(tmp_path / "out.nc")
 
     gdal.VectorTranslate(
-        "tmp/netcdf_64.nc",
+        ofile,
         "data/netcdf/profile.nc",
         format="netCDF",
         selectFields=["id", "station", "foo"],
@@ -2750,7 +2720,7 @@ def test_netcdf_64():
     )
     gdal.VectorTranslate(
         "/vsimem/netcdf_64.csv",
-        "tmp/netcdf_64.nc",
+        ofile,
         format="CSV",
         layerCreationOptions=[
             "LINEFORMAT=LF",
@@ -2781,10 +2751,12 @@ def test_netcdf_64():
 # (they must be filled as empty strings to avoid crashes in netcdf lib)
 
 
-def test_netcdf_65():
+def test_netcdf_65(tmp_path):
+
+    ofile = str(tmp_path / "out.nc")
 
     ds = ogr.GetDriverByName("netCDF").CreateDataSource(
-        "tmp/netcdf_65.nc", options=["FORMAT=NC4", "GEOMETRY_ENCODING=WKT"]
+        ofile, options=["FORMAT=NC4", "GEOMETRY_ENCODING=WKT"]
     )
     lyr = ds.CreateLayer("test")
     lyr.CreateField(ogr.FieldDefn("str", ogr.OFTString))
@@ -2792,7 +2764,7 @@ def test_netcdf_65():
     lyr.CreateFeature(f)
     ds = None
 
-    ds = ogr.Open("tmp/netcdf_65.nc")
+    ds = ogr.Open(ofile)
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     if f["str"] != "":
@@ -2800,8 +2772,6 @@ def test_netcdf_65():
         pytest.fail()
     ds = None
 
-    gdal.Unlink("tmp/netcdf_65.nc")
-
 
 ###############################################################################
 # Test creating a "Indexed ragged array representation of profiles" v1.6.0 H3.5
@@ -2809,13 +2779,15 @@ def test_netcdf_65():
 
 
 @pytest.mark.require_driver("CSV")
-def test_netcdf_66():
+def test_netcdf_66(tmp_path):
+
+    ofile = str(tmp_path / "out.nc")
 
     # First trying with no so good configs
 
     with gdal.quiet_errors():
         gdal.VectorTranslate(
-            "tmp/netcdf_66.nc",
+            ofile,
             "data/netcdf/profile.nc",
             format="netCDF",
             datasetCreationOptions=["CONFIG_FILE=not_existing"],
@@ -2823,7 +2795,7 @@ def test_netcdf_66():
 
     with gdal.quiet_errors():
         gdal.VectorTranslate(
-            "tmp/netcdf_66.nc",
+            ofile,
             "data/netcdf/profile.nc",
             format="netCDF",
             datasetCreationOptions=["CONFIG_FILE=<Configuration>"],
@@ -2866,7 +2838,7 @@ def test_netcdf_66():
 
     with gdal.quiet_errors():
         gdal.VectorTranslate(
-            "tmp/netcdf_66.nc",
+            ofile,
             "data/netcdf/profile.nc",
             format="netCDF",
             datasetCreationOptions=["CONFIG_FILE=" + myconfig, "GEOMETRY_ENCODING=WKT"],
@@ -2899,14 +2871,14 @@ def test_netcdf_66():
 """
 
     gdal.VectorTranslate(
-        "tmp/netcdf_66.nc",
+        ofile,
         "data/netcdf/profile.nc",
         format="netCDF",
         datasetCreationOptions=["CONFIG_FILE=" + myconfig, "GEOMETRY_ENCODING=WKT"],
     )
     gdal.VectorTranslate(
         "/vsimem/netcdf_66.csv",
-        "tmp/netcdf_66.nc",
+        ofile,
         format="CSV",
         layerCreationOptions=[
             "LINEFORMAT=LF",
@@ -2931,7 +2903,7 @@ def test_netcdf_66():
     gdal.Unlink("/vsimem/netcdf_66.csv")
 
     if gdaltest.netcdf_have_ncdump:
-        hdr = netcdf_ncdump("tmp/netcdf_66.nc")
+        hdr = netcdf_ncdump(ofile)
         assert "char my_station(obs, my_station_max_width)" in hdr
         assert 'my_station:long_name = "my station attribute"' in hdr
         assert 'lon:my_extra_lon_attribute = "foo"' in hdr
@@ -2941,8 +2913,6 @@ def test_netcdf_66():
         assert 'parentIndex:instance_dimension = "profile"' in hdr
         assert ':featureType = "profile"' in hdr
 
-    gdal.Unlink("tmp/netcdf_66.nc")
-
 
 ###############################################################################
 # ticket #5950: optimize IReadBlock() and CheckData() handling of partial
@@ -3214,9 +3184,10 @@ def test_netcdf_81():
 
 
 @pytest.mark.require_proj(7, 1)
-def test_netcdf_write_rotated_pole_from_method_proj():
+def test_netcdf_write_rotated_pole_from_method_proj(tmp_path):
 
-    ds = gdal.GetDriverByName("netCDF").Create("tmp/rotated_pole.nc", 2, 2)
+    ofile = str(tmp_path / "out.nc")
+    ds = gdal.GetDriverByName("netCDF").Create(ofile, 2, 2)
     gt = [2, 1, 0, 49, 0, -1]
     ds.SetGeoTransform(gt)
     ds.SetProjection(
@@ -3224,13 +3195,13 @@ def test_netcdf_write_rotated_pole_from_method_proj():
     )
     ds = None
 
-    ds = gdal.Open("tmp/rotated_pole.nc")
+    ds = gdal.Open(ofile)
     got_gt = ds.GetGeoTransform()
     wkt = ds.GetProjectionRef()
     md = ds.GetMetadata()
     ds = None
 
-    gdal.Unlink("tmp/rotated_pole.nc")
+    gdal.Unlink(ofile)
 
     older_wkt = """GEOGCRS["unnamed",BASEGEOGCRS["unknown",DATUM["unknown",ELLIPSOID["unknown",6367470,594.313048347956,LENGTHUNIT["metre",1,ID["EPSG",9001]]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8901]]],DERIVINGCONVERSION["unknown",METHOD["PROJ ob_tran o_proj=longlat"],PARAMETER["lon_0",18,ANGLEUNIT["degree",0.0174532925199433,ID["EPSG",9122]]],PARAMETER["o_lon_p",0,ANGLEUNIT["degree",0.0174532925199433,ID["EPSG",9122]]],PARAMETER["o_lat_p",39.25,ANGLEUNIT["degree",0.0174532925199433,ID["EPSG",9122]]]],CS[ellipsoidal,2],AXIS["longitude",east,ORDER[1],ANGLEUNIT["degree",0.0174532925199433,ID["EPSG",9122]]],AXIS["latitude",north,ORDER[2],ANGLEUNIT["degree",0.0174532925199433,ID["EPSG",9122]]]]"""
 
@@ -3247,20 +3218,22 @@ def test_netcdf_write_rotated_pole_from_method_proj():
 
 
 @pytest.mark.require_proj(8, 2)
-def test_netcdf_write_rotated_pole_from_method_netcdf_cf():
+def test_netcdf_write_rotated_pole_from_method_netcdf_cf(tmp_path):
+
+    ofile = str(tmp_path / "out.nc")
 
     expected_wkt = """GEOGCRS["Rotated_pole",BASEGEOGCRS["unknown",DATUM["unnamed",ELLIPSOID["Spheroid",6367470,594.313048347956,LENGTHUNIT["metre",1,ID["EPSG",9001]]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433,ID["EPSG",9122]]]],DERIVINGCONVERSION["Pole rotation (netCDF CF convention)",METHOD["Pole rotation (netCDF CF convention)"],PARAMETER["Grid north pole latitude (netCDF CF convention)",39.25,ANGLEUNIT["degree",0.0174532925199433,ID["EPSG",9122]]],PARAMETER["Grid north pole longitude (netCDF CF convention)",-162,ANGLEUNIT["degree",0.0174532925199433,ID["EPSG",9122]]],PARAMETER["North pole grid longitude (netCDF CF convention)",0,ANGLEUNIT["degree",0.0174532925199433,ID["EPSG",9122]]]],CS[ellipsoidal,2],AXIS["latitude",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433,ID["EPSG",9122]]],AXIS["longitude",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433,ID["EPSG",9122]]]]"""
 
-    ds = gdal.GetDriverByName("netCDF").Create("tmp/rotated_pole.nc", 2, 2)
+    ds = gdal.GetDriverByName("netCDF").Create(ofile, 2, 2)
     ds.SetGeoTransform([2, 1, 0, 49, 0, -1])
     ds.SetProjection(expected_wkt)
     ds = None
 
-    ds = gdal.Open("tmp/rotated_pole.nc")
+    ds = gdal.Open(ofile)
     wkt = ds.GetProjectionRef()
     ds = None
 
-    gdal.Unlink("tmp/rotated_pole.nc")
+    gdal.Unlink(ofile)
 
     assert wkt == expected_wkt
 
@@ -3270,20 +3243,22 @@ def test_netcdf_write_rotated_pole_from_method_netcdf_cf():
 
 
 @pytest.mark.require_proj(7, 0)
-def test_netcdf_write_rotated_pole_from_method_grib():
+def test_netcdf_write_rotated_pole_from_method_grib(tmp_path):
 
-    ds = gdal.GetDriverByName("netCDF").Create("tmp/rotated_pole.nc", 2, 2)
+    ofile = str(tmp_path / "out.nc")
+
+    ds = gdal.GetDriverByName("netCDF").Create(ofile, 2, 2)
     ds.SetGeoTransform([2, 1, 0, 49, 0, -1])
     ds.SetProjection(
         """GEOGCRS["Coordinate System imported from GRIB file",BASEGEOGCRS["Coordinate System imported from GRIB file",DATUM["unnamed",ELLIPSOID["Sphere",6367470,0,LENGTHUNIT["metre",1,ID["EPSG",9001]]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433,ID["EPSG",9122]]]],DERIVINGCONVERSION["Pole rotation (GRIB convention)",METHOD["Pole rotation (GRIB convention)"],PARAMETER["Latitude of the southern pole (GRIB convention)",-30,ANGLEUNIT["degree",0.0174532925199433,ID["EPSG",9122]]],PARAMETER["Longitude of the southern pole (GRIB convention)",-15,ANGLEUNIT["degree",0.0174532925199433,ID["EPSG",9122]]],PARAMETER["Axis rotation (GRIB convention)",0,ANGLEUNIT["degree",0.0174532925199433,ID["EPSG",9122]]]],CS[ellipsoidal,2],AXIS["latitude",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433,ID["EPSG",9122]]],AXIS["longitude",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433,ID["EPSG",9122]]]]"""
     )
     ds = None
 
-    ds = gdal.Open("tmp/rotated_pole.nc")
+    ds = gdal.Open(ofile)
     wkt = ds.GetProjectionRef()
     ds = None
 
-    gdal.Unlink("tmp/rotated_pole.nc")
+    gdal.Unlink(ofile)
 
     # Before PROJ 7.0.1
     deprecated_expected_projection = """PROJCS["unnamed",GEOGCS["unknown",DATUM["unnamed",SPHEROID["Spheroid",6367470,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]]],PROJECTION["Rotated_pole"],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],EXTENSION["PROJ4","+proj=ob_tran +o_proj=longlat +lon_0=-15 +o_lon_p=0 +o_lat_p=30 +a=6367470 +b=6367470 +to_meter=0.0174532925199433 +wktext"]]"""
@@ -3443,7 +3418,7 @@ def test_netcdf_open_empty_double_attr():
 
 
 @pytest.mark.slow()
-def test_netcdf_huge_block_size():
+def test_netcdf_huge_block_size(tmp_path):
 
     if sys.maxsize < 2**32:
         pytest.skip("Test not available on 32 bit")
@@ -3453,7 +3428,7 @@ def test_netcdf_huge_block_size():
     if psutil.virtual_memory().available < 2 * 50000 * 50000:
         pytest.skip("Not enough virtual memory available")
 
-    tmpfilename = "tmp/test_netcdf_huge_block_size.nc"
+    tmpfilename = str(tmp_path / "out.nc")
     with gdaltest.SetCacheMax(50000 * 50000 + 100000):
         with gdaltest.config_option("BLOCKYSIZE", "50000"):
             gdal.Translate(
@@ -3471,8 +3446,6 @@ def test_netcdf_huge_block_size():
     assert data == ref_ds.ReadRaster()
     ds = None
 
-    gdal.Unlink(tmpfilename)
-
 
 ###############################################################################
 # Test reading a netCDF file whose fastest varying dimension is Latitude, and
@@ -4254,15 +4227,16 @@ def test_states_full_layer():
 #  simple geometry writing tests
 
 
-def test_point_write():
+def test_point_write(tmp_path):
 
     src = gdal.OpenEx(
         "data/netcdf-sg/write-tests/point_write_test.json", gdal.OF_VECTOR
     )
     assert src is not None
-    gdal.VectorTranslate("tmp/test_point_write.nc", src, format="netCDF")
+    ofile = str(tmp_path / "out.nc")
+    gdal.VectorTranslate(ofile, src, format="netCDF")
 
-    nc_tsrc = ogr.Open("tmp/test_point_write.nc")
+    nc_tsrc = ogr.Open(ofile)
     assert src is not None
     assert src.GetLayerCount() == 1
 
@@ -4301,15 +4275,16 @@ def test_point_write():
     assert fnam == "FishingSpot4"
 
 
-def test_point3D_write():
+def test_point3D_write(tmp_path):
 
     src = gdal.OpenEx(
         "data/netcdf-sg/write-tests/point3D_write_test.json", gdal.OF_VECTOR
     )
     assert src is not None
-    gdal.VectorTranslate("tmp/test_point3D_write.nc", src, format="netCDF")
+    ofile = str(tmp_path / "out.nc")
+    gdal.VectorTranslate(ofile, src, format="netCDF")
 
-    nc_tsrc = ogr.Open("tmp/test_point3D_write.nc")
+    nc_tsrc = ogr.Open(ofile)
     assert src is not None
     assert src.GetLayerCount() == 1
 
@@ -4348,15 +4323,16 @@ def test_point3D_write():
     assert fnam == "FishingSpot4"
 
 
-def test_line_write():
+def test_line_write(tmp_path):
 
     src = gdal.OpenEx("data/netcdf-sg/write-tests/line_write_test.json", gdal.OF_VECTOR)
     assert src is not None
     assert src.GetLayerCount() == 1
 
-    gdal.VectorTranslate("tmp/line_write_test.nc", src, format="netCDF")
+    ofile = str(tmp_path / "out.nc")
+    gdal.VectorTranslate(ofile, src, format="netCDF")
 
-    nc_tsrc = ogr.Open("tmp/line_write_test.nc")
+    nc_tsrc = ogr.Open(ofile)
     assert src is not None
 
     # Test layer properties
@@ -4387,7 +4363,7 @@ def test_line_write():
     assert fnam == "seg3"
 
 
-def test_line3D_write():
+def test_line3D_write(tmp_path):
 
     src = gdal.OpenEx(
         "data/netcdf-sg/write-tests/line3D_write_test.json", gdal.OF_VECTOR
@@ -4395,9 +4371,10 @@ def test_line3D_write():
     assert src is not None
     assert src.GetLayerCount() == 1
 
-    gdal.VectorTranslate("tmp/line3D_write_test.nc", src, format="netCDF")
+    ofile = str(tmp_path / "out.nc")
+    gdal.VectorTranslate(ofile, src, format="netCDF")
 
-    nc_tsrc = ogr.Open("tmp/line3D_write_test.nc")
+    nc_tsrc = ogr.Open(ofile)
     assert src is not None
 
     # Test layer properties
@@ -4428,7 +4405,7 @@ def test_line3D_write():
     assert fnam == "path3"
 
 
-def test_polygon_no_ir_write():
+def test_polygon_no_ir_write(tmp_path):
 
     src = gdal.OpenEx(
         "data/netcdf-sg/write-tests/polygon_no_ir_write_test.json", gdal.OF_VECTOR
@@ -4436,9 +4413,10 @@ def test_polygon_no_ir_write():
     assert src is not None
     assert src.GetLayerCount() == 1
 
-    gdal.VectorTranslate("tmp/polygon_no_ir_write_test.nc", src, format="netCDF")
+    ofile = str(tmp_path / "out.nc")
+    gdal.VectorTranslate(ofile, src, format="netCDF")
 
-    nc_tsrc = ogr.Open("tmp/polygon_no_ir_write_test.nc")
+    nc_tsrc = ogr.Open(ofile)
     assert src is not None
 
     # Test layer properties
@@ -4465,7 +4443,7 @@ def test_polygon_no_ir_write():
     assert fnam == "Square"
 
 
-def test_polygon_write():
+def test_polygon_write(tmp_path):
 
     src = gdal.OpenEx(
         "data/netcdf-sg/write-tests/polygon_write_test.json", gdal.OF_VECTOR
@@ -4473,9 +4451,10 @@ def test_polygon_write():
     assert src is not None
     assert src.GetLayerCount() == 1
 
-    gdal.VectorTranslate("tmp/polygon_write_test.nc", src, format="netCDF")
+    ofile = str(tmp_path / "out.nc")
+    gdal.VectorTranslate(ofile, src, format="netCDF")
 
-    nc_tsrc = ogr.Open("tmp/polygon_write_test.nc")
+    nc_tsrc = ogr.Open(ofile)
     assert src is not None
 
     # Test layer properties
@@ -4512,7 +4491,7 @@ def test_polygon_write():
     assert fnam == "Triangle_Flipped"
 
 
-def test_polygon3D_no_ir_write():
+def test_polygon3D_no_ir_write(tmp_path):
 
     src = gdal.OpenEx(
         "data/netcdf-sg/write-tests/polygon3D_no_ir_write_test.json", gdal.OF_VECTOR
@@ -4520,9 +4499,10 @@ def test_polygon3D_no_ir_write():
     assert src is not None
     assert src.GetLayerCount() == 1
 
-    gdal.VectorTranslate("tmp/polygon3D_no_ir_write_test.nc", src, format="netCDF")
+    ofile = str(tmp_path / "out.nc")
+    gdal.VectorTranslate(ofile, src, format="netCDF")
 
-    nc_tsrc = ogr.Open("tmp/polygon3D_no_ir_write_test.nc")
+    nc_tsrc = ogr.Open(ofile)
     assert src is not None
 
     # Test layer properties
@@ -4549,7 +4529,7 @@ def test_polygon3D_no_ir_write():
     assert fid == 1
 
 
-def test_polygon3D_write():
+def test_polygon3D_write(tmp_path):
 
     src = gdal.OpenEx(
         "data/netcdf-sg/write-tests/polygon3D_write_test.json", gdal.OF_VECTOR
@@ -4557,9 +4537,10 @@ def test_polygon3D_write():
     assert src is not None
     assert src.GetLayerCount() == 1
 
-    gdal.VectorTranslate("tmp/polygon3D_write_test.nc", src, format="netCDF")
+    ofile = str(tmp_path / "out.nc")
+    gdal.VectorTranslate(ofile, src, format="netCDF")
 
-    nc_tsrc = ogr.Open("tmp/polygon3D_write_test.nc")
+    nc_tsrc = ogr.Open(ofile)
     assert src is not None
 
     # Test layer properties
@@ -4596,7 +4577,7 @@ def test_polygon3D_write():
     assert fnam == "Trianglyflipped"
 
 
-def test_multipoint_write():
+def test_multipoint_write(tmp_path):
 
     src = gdal.OpenEx(
         "data/netcdf-sg/write-tests/multipoint_write_test.json", gdal.OF_VECTOR
@@ -4604,9 +4585,10 @@ def test_multipoint_write():
     assert src is not None
     assert src.GetLayerCount() == 1
 
-    gdal.VectorTranslate("tmp/multipoint_write_test.nc", src, format="netCDF")
+    ofile = str(tmp_path / "out.nc")
+    gdal.VectorTranslate(ofile, src, format="netCDF")
 
-    nc_tsrc = ogr.Open("tmp/multipoint_write_test.nc")
+    nc_tsrc = ogr.Open(ofile)
     assert src is not None
 
     # Test layer properties
@@ -4637,7 +4619,7 @@ def test_multipoint_write():
     assert fnam == "Peaks3"
 
 
-def test_multipoint3D_write():
+def test_multipoint3D_write(tmp_path):
 
     src = gdal.OpenEx(
         "data/netcdf-sg/write-tests/multipoint3D_write_test.json", gdal.OF_VECTOR
@@ -4645,10 +4627,11 @@ def test_multipoint3D_write():
     assert src is not None
     assert src.GetLayerCount() == 1
 
-    gdal.VectorTranslate("tmp/multipoint3D_write_test.nc", src, format="netCDF")
+    ofile = str(tmp_path / "out.nc")
+    gdal.VectorTranslate(ofile, src, format="netCDF")
 
-    nc_tsrc = ogr.Open("tmp/multipoint3D_write_test.nc")
-    assert src is not None
+    nc_tsrc = ogr.Open(ofile)
+    assert nc_tsrc is not None
 
     # Test layer properties
     layer = nc_tsrc.GetLayerByName("drilling_sites")
@@ -4671,7 +4654,7 @@ def test_multipoint3D_write():
     assert fnam == "site2"
 
 
-def test_multiline_write():
+def test_multiline_write(tmp_path):
 
     src = gdal.OpenEx(
         "data/netcdf-sg/write-tests/multiline_write_test.json", gdal.OF_VECTOR
@@ -4679,10 +4662,11 @@ def test_multiline_write():
     assert src is not None
     assert src.GetLayerCount() == 1
 
-    gdal.VectorTranslate("tmp/multiline_write_test.nc", src, format="netCDF")
+    ofile = str(tmp_path / "out.nc")
+    gdal.VectorTranslate(ofile, src, format="netCDF")
 
-    nc_tsrc = ogr.Open("tmp/multiline_write_test.nc")
-    assert src is not None
+    nc_tsrc = ogr.Open(ofile)
+    assert nc_tsrc is not None
 
     # Test layer properties
     layer = nc_tsrc.GetLayerByName("streams")
@@ -4712,7 +4696,7 @@ def test_multiline_write():
     assert fnam == "not_fresh_river"
 
 
-def test_multiline3D_write():
+def test_multiline3D_write(tmp_path):
 
     src = gdal.OpenEx(
         "data/netcdf-sg/write-tests/multiline3D_write_test.json", gdal.OF_VECTOR
@@ -4720,10 +4704,11 @@ def test_multiline3D_write():
     assert src is not None
     assert src.GetLayerCount() == 1
 
-    gdal.VectorTranslate("tmp/multiline3D_write_test.nc", src, format="netCDF")
+    ofile = str(tmp_path / "out.nc")
+    gdal.VectorTranslate(ofile, src, format="netCDF")
 
-    nc_tsrc = ogr.Open("tmp/multiline3D_write_test.nc")
-    assert src is not None
+    nc_tsrc = ogr.Open(ofile)
+    assert nc_tsrc is not None
 
     # Test layer properties
     layer = nc_tsrc.GetLayerByName("streams")
@@ -4746,7 +4731,7 @@ def test_multiline3D_write():
     assert fnam == "not_fresh_river"
 
 
-def test_multipolygon_write():
+def test_multipolygon_write(tmp_path):
 
     src = gdal.OpenEx(
         "data/netcdf-sg/write-tests/multipolygon_write_test.json", gdal.OF_VECTOR
@@ -4754,10 +4739,11 @@ def test_multipolygon_write():
     assert src is not None
     assert src.GetLayerCount() == 1
 
-    gdal.VectorTranslate("tmp/multipolygon_write_test.nc", src, format="netCDF")
+    ofile = str(tmp_path / "out.nc")
+    gdal.VectorTranslate(ofile, src, format="netCDF")
 
-    nc_tsrc = ogr.Open("tmp/multipolygon_write_test.nc")
-    assert src is not None
+    nc_tsrc = ogr.Open(ofile)
+    assert nc_tsrc is not None
 
     # Test layer properties
     layer = nc_tsrc.GetLayerByName("shapes")
@@ -4786,7 +4772,7 @@ def test_multipolygon_write():
     assert fnam == "Square_in_Square_and_Triangle"
 
 
-def test_multipolygon3D_write():
+def test_multipolygon3D_write(tmp_path):
 
     src = gdal.OpenEx(
         "data/netcdf-sg/write-tests/multipolygon3D_write_test.json", gdal.OF_VECTOR
@@ -4794,10 +4780,11 @@ def test_multipolygon3D_write():
     assert src is not None
     assert src.GetLayerCount() == 1
 
-    gdal.VectorTranslate("tmp/multipolygon3D_write_test.nc4", src, format="netCDF")
+    ofile = str(tmp_path / "out.nc")
+    gdal.VectorTranslate(ofile, src, format="netCDF")
 
-    nc_tsrc = ogr.Open("tmp/multipolygon3D_write_test.nc4")
-    assert src is not None
+    nc_tsrc = ogr.Open(ofile)
+    assert nc_tsrc is not None
 
     # Test layer properties
     layer = nc_tsrc.GetLayerByName("shapes")
@@ -4837,7 +4824,7 @@ def test_multipolygon3D_write():
     assert fnam == "Single_Triangly"
 
 
-def test_multipolygon_with_no_ir_write():
+def test_multipolygon_with_no_ir_write(tmp_path):
 
     src = gdal.OpenEx(
         "data/netcdf-sg/write-tests/multipolygon_no_ir_write_test.json", gdal.OF_VECTOR
@@ -4845,10 +4832,11 @@ def test_multipolygon_with_no_ir_write():
     assert src is not None
     assert src.GetLayerCount() == 1
 
-    gdal.VectorTranslate("tmp/multipolygon_no_ir_write_test.nc", src, format="netCDF")
+    ofile = str(tmp_path / "out.nc")
+    gdal.VectorTranslate(ofile, src, format="netCDF")
 
-    nc_tsrc = ogr.Open("tmp/multipolygon_no_ir_write_test.nc")
-    assert src is not None
+    nc_tsrc = ogr.Open(ofile)
+    assert nc_tsrc is not None
 
     # Test layer properties
     layer = nc_tsrc.GetLayerByName("mpoly_shape")
@@ -4871,7 +4859,7 @@ def test_multipolygon_with_no_ir_write():
     assert fnam == "DoubleTriangle"
 
 
-def test_multipolygon3D_with_no_ir_write():
+def test_multipolygon3D_with_no_ir_write(tmp_path):
 
     src = gdal.OpenEx(
         "data/netcdf-sg/write-tests/multipolygon3D_no_ir_write_test.json",
@@ -4880,10 +4868,11 @@ def test_multipolygon3D_with_no_ir_write():
     assert src is not None
     assert src.GetLayerCount() == 1
 
-    gdal.VectorTranslate("tmp/multipolygon3D_no_ir_write_test.nc", src, format="netCDF")
+    ofile = str(tmp_path / "out.nc")
+    gdal.VectorTranslate(ofile, src, format="netCDF")
 
-    nc_tsrc = ogr.Open("tmp/multipolygon3D_no_ir_write_test.nc")
-    assert src is not None
+    nc_tsrc = ogr.Open(ofile)
+    assert nc_tsrc is not None
 
     # Test layer properties
     layer = nc_tsrc.GetLayerByName("mpoly_shape")
@@ -4909,7 +4898,7 @@ def test_multipolygon3D_with_no_ir_write():
     assert fnam == "DoubleTriangle"
 
 
-def test_write_buffer_restrict_correctness():
+def test_write_buffer_restrict_correctness(tmp_path):
 
     # Tests whether or not having the write buffer restriction
     # Writes correct data.
@@ -4917,16 +4906,19 @@ def test_write_buffer_restrict_correctness():
     assert src is not None
     assert src.GetLayerCount() == 1
 
+    ofile = str(tmp_path / "out.nc")
     gdal.VectorTranslate(
-        "tmp/Yahara_alb_4K_restrict.nc",
+        ofile,
         src,
         format="netCDF",
         layerCreationOptions=["BUFFER_SIZE=4096"],
     )
-    gdal.VectorTranslate("tmp/Yahara_alb_default_buf.nc", src, format="netCDF")
 
-    fk_ds = ogr.Open("tmp/Yahara_alb_4K_restrict.nc")
-    db_ds = ogr.Open("tmp/Yahara_alb_default_buf.nc")
+    ofile2 = str(tmp_path / "out2.nc")
+    gdal.VectorTranslate(ofile2, src, format="netCDF")
+
+    fk_ds = ogr.Open(ofile)
+    db_ds = ogr.Open(ofile2)
 
     fk_ds_layer = fk_ds.GetLayerByName("geometry_container")
     db_ds_layer = db_ds.GetLayerByName("geometry_container")
@@ -4941,19 +4933,20 @@ def test_write_buffer_restrict_correctness():
         assert lftgeo.Equal(dftgeo)
 
 
-def test_write_nc_from_nc():
+def test_write_nc_from_nc(tmp_path):
 
     # Tests writing a netCDF file (of different name than source) out from another netCDF source file
     src = gdal.OpenEx("data/netcdf-sg/multipoint_test.nc", gdal.OF_VECTOR)
     assert src is not None
     assert src.GetLayerCount() == 1
 
-    gdal.VectorTranslate("tmp/multipoint_test_replica.nc", src, format="netCDF")
+    ofile = str(tmp_path / "out.nc")
+    gdal.VectorTranslate(ofile, src, format="netCDF")
 
-    ncds = ogr.Open("tmp/multipoint_test_replica.nc")
-    assert src is not None
+    nc_tsrc = ogr.Open(ofile)
+    assert nc_tsrc is not None
 
-    layer = ncds.GetLayerByName("names_geometry")
+    layer = nc_tsrc.GetLayerByName("names_geometry")
 
     ft = layer.GetNextFeature()
     ft_geo = ft.GetGeometryRef()
@@ -4981,7 +4974,7 @@ def test_write_nc_from_nc():
     assert ft_wkt == "MULTIPOINT (-7 7,-8 8,-9 9,-10 10)"
 
 
-def test_multipolygon_with_no_ir_NC4_write():
+def test_multipolygon_with_no_ir_NC4_write(tmp_path):
 
     # Almost identical to test_multipolygon_with_no_ir
     # except this time, it is writing an NC4 file
@@ -4992,15 +4985,16 @@ def test_multipolygon_with_no_ir_NC4_write():
     assert src is not None
     assert src.GetLayerCount() == 1
 
+    ofile = str(tmp_path / "out.nc")
     gdal.VectorTranslate(
-        "tmp/multipolygon_no_ir_write_test.nc4",
+        ofile,
         src,
         format="netCDF",
         datasetCreationOptions=["FORMAT=NC4"],
     )
 
-    nc_tsrc = ogr.Open("tmp/multipolygon_no_ir_write_test.nc4")
-    assert src is not None
+    nc_tsrc = ogr.Open(ofile)
+    assert nc_tsrc is not None
 
     # Test layer properties
     layer = nc_tsrc.GetLayerByName("mpoly_shape")
@@ -5023,7 +5017,7 @@ def test_multipolygon_with_no_ir_NC4_write():
     assert fnam == "DoubleTriangle"
 
 
-def test_multipolygon3D_NC4C_write():
+def test_multipolygon3D_NC4C_write(tmp_path):
 
     src = gdal.OpenEx(
         "data/netcdf-sg/write-tests/multipolygon3D_write_test.json", gdal.OF_VECTOR
@@ -5034,15 +5028,16 @@ def test_multipolygon3D_NC4C_write():
     # This test is identical to test_multipolygon3D_write
     # except it writes to NC4C
 
+    ofile = str(tmp_path / "out.nc")
     gdal.VectorTranslate(
-        "tmp/multipolygon3D_write_test.nc",
+        ofile,
         src,
         format="netCDF",
         datasetCreationOptions=["FORMAT=NC4C"],
     )
 
-    nc_tsrc = ogr.Open("tmp/multipolygon3D_write_test.nc")
-    assert src is not None
+    nc_tsrc = ogr.Open(ofile)
+    assert nc_tsrc is not None
 
     # Test layer properties
     layer = nc_tsrc.GetLayerByName("shapes")
@@ -5094,21 +5089,22 @@ def test_netcdf_dimension_labels_with_null():
         assert gdal.Open("data/netcdf/dimension_labels_with_null.nc")
 
 
-def test_write_multiple_layers_one_nc():
+def test_write_multiple_layers_one_nc(tmp_path):
 
     # tests writing multiple layers in NC3
     # each geometry container a layer
     # this also tests "update mode" for CF-1.8
 
+    ofile = str(tmp_path / "out.nc")
     netcdf_write_multiple_layers(
-        "tmp/mlnc.nc",
+        ofile,
         inputs=(
             "data/netcdf-sg/write-tests/multipolygon_no_ir_write_test.json",
             "data/netcdf-sg/write-tests/point3D_write_test.json",
         ),
     )
 
-    nc_tsrc = ogr.Open("tmp/mlnc.nc")
+    nc_tsrc = ogr.Open(ofile)
     assert nc_tsrc.GetLayerCount() == 2
 
     # Test layer properties
@@ -5166,27 +5162,30 @@ def test_write_multiple_layers_one_nc():
     assert fnam == "FishingSpot4"
 
 
-def test_write_multiple_layers_one_nc_NC4():
+def test_write_multiple_layers_one_nc_NC4(tmp_path):
 
     # nearly identical to previous test except that
     # it writes to NC4, not NC3 (changing a file from NC3 to NC4)
     # and it writes them all at once (non update)
 
+    ofile = str(tmp_path / "out.nc")
     netcdf_write_multiple_layers(
-        "tmp/mlnc.nc",
+        ofile,
         inputs=(
             "data/netcdf-sg/write-tests/multipolygon_no_ir_write_test.json",
             "data/netcdf-sg/write-tests/point3D_write_test.json",
         ),
     )
 
-    src = gdal.OpenEx("tmp/mlnc.nc", gdal.OF_VECTOR)
+    src = gdal.OpenEx(ofile, gdal.OF_VECTOR)
     assert src is not None
+
+    ofile2 = str(tmp_path / "out2.nc")
     gdal.VectorTranslate(
-        "tmp/mlnc4.nc4", src, format="netCDF", datasetCreationOptions=["FORMAT=NC4"]
+        ofile2, src, format="netCDF", datasetCreationOptions=["FORMAT=NC4"]
     )
 
-    nc_tsrc = ogr.Open("tmp/mlnc4.nc4")
+    nc_tsrc = ogr.Open(ofile2)
     assert nc_tsrc.GetLayerCount() == 2
 
     # Test layer properties
@@ -5244,15 +5243,16 @@ def test_write_multiple_layers_one_nc_NC4():
     assert fnam == "FishingSpot4"
 
 
-def test_write_multiple_layers_one_nc_back_to_NC3():
+def test_write_multiple_layers_one_nc_back_to_NC3(tmp_path):
 
     # nearly identical to previous test except that
     # it writes to from NC4 to NC3
     # and it writes them all at once (non update)
     # test_write_multiple_layers_one_nc writes one and then another in update mode
 
+    ofile = str(tmp_path / "out.nc")
     netcdf_write_multiple_layers(
-        "tmp/mlnc4.nc4",
+        ofile,
         inputs=(
             "data/netcdf-sg/write-tests/multipolygon_no_ir_write_test.json",
             "data/netcdf-sg/write-tests/point3D_write_test.json",
@@ -5260,11 +5260,12 @@ def test_write_multiple_layers_one_nc_back_to_NC3():
         options=["FORMAT=NC4"],
     )
 
-    src = gdal.OpenEx("tmp/mlnc4.nc4", gdal.OF_VECTOR)
+    src = gdal.OpenEx(ofile, gdal.OF_VECTOR)
     assert src is not None
-    gdal.VectorTranslate("tmp/mlnc_noupdate3.nc", src, format="netCDF")
+    ofile2 = str(tmp_path / "mlnc_noupdate3.nc")
+    gdal.VectorTranslate(ofile2, src, format="netCDF")
 
-    nc_tsrc = ogr.Open("tmp/mlnc_noupdate3.nc")
+    nc_tsrc = ogr.Open(ofile2)
     assert nc_tsrc.GetLayerCount() == 2
 
     # Test layer properties
@@ -5322,16 +5323,17 @@ def test_write_multiple_layers_one_nc_back_to_NC3():
     assert fnam == "FishingSpot4"
 
 
-def test_SG_NC3_field_write():
+def test_SG_NC3_field_write(tmp_path):
     # Tests all the NC3 field writing capabilities with
     # buffering.
     src = gdal.OpenEx("data/netcdf-sg/write-tests/field_test_nc3.nc", gdal.OF_VECTOR)
     assert src is not None
     assert src.GetLayerCount() == 1
 
-    gdal.VectorTranslate("tmp/bufft.nc", src, format="netCDF")
+    ofile = str(tmp_path / "out.nc")
+    gdal.VectorTranslate(ofile, src, format="netCDF")
 
-    nc_tsrc = ogr.Open("tmp/bufft.nc")
+    nc_tsrc = ogr.Open(ofile)
     assert nc_tsrc is not None
 
     # Test layer properties
@@ -5358,7 +5360,7 @@ def test_SG_NC3_field_write():
     assert fdbl == 99.5
 
 
-def test_states_full_layer_buffer_restrict_correctness():
+def test_states_full_layer_buffer_restrict_correctness(tmp_path):
     # Tests whether or not having the write buffer restriction
     # Writes correct data.
     # Note: this is different than the Yahara version in that it also tests
@@ -5368,16 +5370,18 @@ def test_states_full_layer_buffer_restrict_correctness():
     assert src is not None
     assert src.GetLayerCount() == 1
 
+    ofile = str(tmp_path / "out.nc")
     gdal.VectorTranslate(
-        "tmp/states_4K_restrict.nc",
+        ofile,
         src,
         format="netCDF",
         layerCreationOptions=["BUFFER_SIZE=4096"],
     )
-    gdal.VectorTranslate("tmp/states_default_buf.nc", src, format="netCDF")
+    ofile2 = str(tmp_path / "out2.nc")
+    gdal.VectorTranslate(ofile2, src, format="netCDF")
 
-    fk_ds = ogr.Open("tmp/states_4K_restrict.nc")
-    db_ds = ogr.Open("tmp/states_default_buf.nc")
+    fk_ds = ogr.Open(ofile)
+    db_ds = ogr.Open(ofile2)
 
     fk_ds_layer = fk_ds.GetLayerByName("geometry_container")
     db_ds_layer = db_ds.GetLayerByName("geometry_container")
@@ -5392,7 +5396,7 @@ def test_states_full_layer_buffer_restrict_correctness():
         assert lftgeo.Equal(dftgeo)
 
 
-def test_empty_polygon_read_write():
+def test_empty_polygon_read_write(tmp_path):
     # Tests writing features to a layer of empty polygons
     src = gdal.OpenEx(
         "data/netcdf-sg/write-tests/empty_polygon_write_test.json", gdal.OF_VECTOR
@@ -5400,9 +5404,10 @@ def test_empty_polygon_read_write():
     assert src is not None
     assert src.GetLayerCount() == 1
 
-    gdal.VectorTranslate("tmp/empty_polygon.nc", src, format="netCDF")
+    ofile = str(tmp_path / "out.nc")
+    gdal.VectorTranslate(ofile, src, format="netCDF")
 
-    nc_tsrc = ogr.Open("tmp/empty_polygon.nc")
+    nc_tsrc = ogr.Open(ofile)
     assert nc_tsrc is not None
 
     nc_layer = nc_tsrc.GetLayerByName("places")
@@ -5415,7 +5420,7 @@ def test_empty_polygon_read_write():
     assert second.GetGeometryRef().IsEmpty()
 
 
-def test_empty_multiline_read_write():
+def test_empty_multiline_read_write(tmp_path):
     # Tests writing features to a layer of empty polygons
     src = gdal.OpenEx(
         "data/netcdf-sg/write-tests/empty_mline_write_test.json", gdal.OF_VECTOR
@@ -5423,9 +5428,10 @@ def test_empty_multiline_read_write():
     assert src is not None
     assert src.GetLayerCount() == 1
 
-    gdal.VectorTranslate("tmp/empty_mline.nc", src, format="netCDF")
+    ofile = str(tmp_path / "out.nc")
+    gdal.VectorTranslate(ofile, src, format="netCDF")
 
-    nc_tsrc = ogr.Open("tmp/empty_mline.nc")
+    nc_tsrc = ogr.Open(ofile)
     assert nc_tsrc is not None
 
     nc_layer = nc_tsrc.GetLayerByName("places")
@@ -5438,7 +5444,7 @@ def test_empty_multiline_read_write():
     assert second.GetGeometryRef().IsEmpty()
 
 
-def test_empty_multipolygon_read_write():
+def test_empty_multipolygon_read_write(tmp_path):
     # Tests writing features to a layer of empty polygons
     src = gdal.OpenEx(
         "data/netcdf-sg/write-tests/empty_multipolygon_write_test.json", gdal.OF_VECTOR
@@ -5446,9 +5452,10 @@ def test_empty_multipolygon_read_write():
     assert src is not None
     assert src.GetLayerCount() == 1
 
-    gdal.VectorTranslate("tmp/empty_multipolygon.nc", src, format="netCDF")
+    ofile = str(tmp_path / "out.nc")
+    gdal.VectorTranslate(ofile, src, format="netCDF")
 
-    nc_tsrc = ogr.Open("tmp/empty_multipolygon.nc")
+    nc_tsrc = ogr.Open(ofile)
     assert nc_tsrc is not None
 
     nc_layer = nc_tsrc.GetLayerByName("places")
@@ -5464,28 +5471,30 @@ def test_empty_multipolygon_read_write():
     )
 
 
-def test_states_full_layer_buffer_restrict_correctness_single_datum():
+def test_states_full_layer_buffer_restrict_correctness_single_datum(tmp_path):
     # Single datum regression test
 
     src = gdal.OpenEx("data/netcdf-sg/write-tests/cf1.8_states.json")
     assert src is not None
     assert src.GetLayerCount() == 1
 
+    ofile = str(tmp_path / "out.nc")
     gdal.VectorTranslate(
-        "tmp/states_4K_restrict.nc",
+        ofile,
         src,
         format="netCDF",
         layerCreationOptions=["BUFFER_SIZE=4096"],
     )
 
+    ofile2 = str(tmp_path / "out2.nc")
     gdal.VectorTranslate(
-        "tmp/states_4K_restrict_sd.nc",
+        ofile2,
         src,
         format="netCDF",
         layerCreationOptions=["BUFFER_SIZE=4096", "GROUPLESS_WRITE_BACK=YES"],
     )
-    fk_ds = ogr.Open("tmp/states_4K_restrict_sd.nc")
-    db_ds = ogr.Open("tmp/states_4K_restrict.nc")
+    fk_ds = ogr.Open(ofile2)
+    db_ds = ogr.Open(ofile)
 
     fk_ds_layer = fk_ds.GetLayerByName("geometry_container")
     db_ds_layer = db_ds.GetLayerByName("geometry_container")
@@ -5601,31 +5610,31 @@ def test_netcdf_chunked_not_multiple():
     assert ds.GetRasterBand(1).Checksum() == 4672
 
 
-def test_netcdf_create():
+def test_netcdf_create(tmp_path):
 
-    ds = gdaltest.netcdf_drv.Create("tmp/test_create.nc", 2, 2)
+    ofile = str(tmp_path / "out.nc")
+    ds = gdaltest.netcdf_drv.Create(ofile, 2, 2)
     ds.SetGeoTransform([2, 0.1, 0, 49, 0, -0.1])
     ds.GetRasterBand(1).WriteRaster(0, 0, 2, 2, b"ABCD")
     ds = None
-    ds = gdal.Open("tmp/test_create.nc")
+    ds = gdal.Open(ofile)
     assert ds.GetGeoTransform() == pytest.approx([2, 0.1, 0, 49, 0, -0.1], rel=1e-10)
     assert ds.GetRasterBand(1).ReadRaster() == b"ABCD"
     ds = None
-    gdal.Unlink("tmp/test_create.nc")
 
 
-def test_netcdf_sg1_8_max_variable_with_max_width_string_field_no_warning():
+def test_netcdf_sg1_8_max_variable_with_max_width_string_field_no_warning(tmp_path):
 
-    gdal.VectorTranslate("tmp/poly.nc", "../ogr/data/poly.shp", format="netCDF")
+    ofile = str(tmp_path / "out.nc")
+    gdal.VectorTranslate(ofile, "../ogr/data/poly.shp", format="netCDF")
 
     gdal.ErrorReset()
     # Check that opening in raster/vector mode doesn't emit warning
-    ds = gdal.OpenEx("tmp/poly.nc")
+    ds = gdal.OpenEx(ofile)
     assert gdal.GetLastErrorType() == 0
     assert ds
     assert ds.GetLayerCount() == 1
     ds = None
-    gdal.Unlink("tmp/poly.nc")
 
 
 ###############################################################################
@@ -5721,7 +5730,7 @@ def test_netcdf_modis_array():
 # Test import/export of Polar Stereographic Variant A (with scale factor)
 
 
-def test_netcdf_polar_stereographic_variant_a():
+def test_netcdf_polar_stereographic_variant_a(tmp_path):
 
     ds = gdal.Open("data/netcdf/polar_stero_variant_a.nc")
     assert (
@@ -5729,22 +5738,21 @@ def test_netcdf_polar_stereographic_variant_a():
         == "+proj=stere +lat_0=90 +lon_0=-100 +k=0.93301243 +x_0=4245000 +y_0=5295000 +R=6371229 +units=m +no_defs"
     )
 
-    gdal.Translate("tmp/out.nc", ds, format="netCDF")
-    ds = gdal.Open("tmp/out.nc")
+    ofile = str(tmp_path / "out.nc")
+    gdal.Translate(ofile, ds, format="netCDF")
+    ds = gdal.Open(ofile)
     assert (
         ds.GetSpatialRef().ExportToProj4()
         == "+proj=stere +lat_0=90 +lon_0=-100 +k=0.93301243 +x_0=4245000 +y_0=5295000 +R=6371229 +units=m +no_defs"
     )
     ds = None
 
-    gdal.Unlink("tmp/out.nc")
-
 
 ###############################################################################
 # Test import/export of Polar Stereographic Variant B (with latitude of true scale)
 
 
-def test_netcdf_polar_stereographic_variant_b():
+def test_netcdf_polar_stereographic_variant_b(tmp_path):
 
     ds = gdal.Open("data/netcdf/polar_stero_variant_b.nc")
     assert (
@@ -5752,16 +5760,15 @@ def test_netcdf_polar_stereographic_variant_b():
         == "+proj=stere +lat_0=90 +lat_ts=59.9999376869521 +lon_0=-100 +x_0=4245000 +y_0=5295000 +R=6371229 +units=m +no_defs"
     )
 
-    gdal.Translate("tmp/out.nc", ds, format="netCDF")
-    ds = gdal.Open("tmp/out.nc")
+    ofile = str(tmp_path / "out.nc")
+    gdal.Translate(ofile, ds, format="netCDF")
+    ds = gdal.Open(ofile)
     assert (
         ds.GetSpatialRef().ExportToProj4()
         == "+proj=stere +lat_0=90 +lat_ts=59.9999376869521 +lon_0=-100 +x_0=4245000 +y_0=5295000 +R=6371229 +units=m +no_defs"
     )
     ds = None
 
-    gdal.Unlink("tmp/out.nc")
-
 
 ###############################################################################
 # Test /vsi access through userfaultfd
@@ -5773,11 +5780,10 @@ def has_working_userfaultfd():
     )
 
 
-def test_netcdf_open_userfaultfd():
+def test_netcdf_open_userfaultfd(tmp_path):
 
-    gdal.Unlink("tmp/test_netcdf_open_userfaultfd.zip")
-
-    f = gdal.VSIFOpenL("/vsizip/tmp/test_netcdf_open_userfaultfd.zip/test.nc", "wb")
+    ofile = str(tmp_path / "out.zip")
+    f = gdal.VSIFOpenL(f"/vsizip/{ofile}/test.nc", "wb")
     assert f
     data = open("data/netcdf/byte_no_cf.nc", "rb").read()
     gdal.VSIFWriteL(data, 1, len(data), f)
@@ -5786,18 +5792,10 @@ def test_netcdf_open_userfaultfd():
     # Can only work on Linux, with some kernel versions... not in Docker by default
     # so mostly test that we don't crash
     if has_working_userfaultfd():
-        assert (
-            gdal.Open("/vsizip/tmp/test_netcdf_open_userfaultfd.zip/test.nc")
-            is not None
-        )
+        assert gdal.Open(f"/vsizip/{ofile}/test.nc") is not None
     else:
         with gdal.quiet_errors():
-            assert (
-                gdal.Open("/vsizip/tmp/test_netcdf_open_userfaultfd.zip/test.nc")
-                is None
-            )
-
-    gdal.Unlink("tmp/test_netcdf_open_userfaultfd.zip")
+            assert gdal.Open(f"/vsizip/{ofile}/test.nc") is None
 
 
 def test_netcdf_write_4D():
@@ -5836,43 +5834,39 @@ def test_netcdf__crs_wkt():
     assert ds.GetSpatialRef().IsGeographic()
 
 
-def test_netcdf_default_metadata():
+def test_netcdf_default_metadata(tmp_path):
 
     src_ds = gdal.GetDriverByName("MEM").Create("", 1, 1)
 
-    tmpfilename = "tmp/test_netcdf_default_metadata.nc"
+    tmpfilename = str(tmp_path / "out.nc")
     gdal.GetDriverByName("netCDF").CreateCopy(tmpfilename, src_ds)
     ds = gdal.Open(tmpfilename)
     assert ds.GetMetadataItem("NC_GLOBAL#GDAL") == gdal.VersionInfo("")
     assert "GDAL CreateCopy" in ds.GetMetadataItem("NC_GLOBAL#history")
     assert ds.GetMetadataItem("NC_GLOBAL#conventions").startswith("CF")
     ds = None
-    gdal.Unlink(tmpfilename)
 
 
-def test_netcdf_default_metadata_with_existing_history_and_conventions():
+def test_netcdf_default_metadata_with_existing_history_and_conventions(tmp_path):
 
     src_ds = gdal.GetDriverByName("MEM").Create("", 1, 1)
     src_ds.SetMetadataItem("NC_GLOBAL#history", "past history")
     src_ds.SetMetadataItem("NC_GLOBAL#Conventions", "my conventions")
 
-    tmpfilename = (
-        "tmp/test_netcdf_default_metadata_with_existing_history_and_conventions.nc"
-    )
+    tmpfilename = str(tmp_path / "out.nc")
     gdal.GetDriverByName("netCDF").CreateCopy(tmpfilename, src_ds)
     ds = gdal.Open(tmpfilename)
     assert "GDAL CreateCopy" in ds.GetMetadataItem("NC_GLOBAL#history")
     assert "past history" in ds.GetMetadataItem("NC_GLOBAL#history")
     assert ds.GetMetadataItem("NC_GLOBAL#conventions") == "my conventions"
     ds = None
-    gdal.Unlink(tmpfilename)
 
 
-def test_netcdf_default_metadata_disabled():
+def test_netcdf_default_metadata_disabled(tmp_path):
 
     src_ds = gdal.GetDriverByName("MEM").Create("", 1, 1)
 
-    tmpfilename = "tmp/test_netcdf_default_metadata_disabled.nc"
+    tmpfilename = str(tmp_path / "out.nc")
     gdal.GetDriverByName("netCDF").CreateCopy(
         tmpfilename, src_ds, options=["WRITE_GDAL_VERSION=NO", "WRITE_GDAL_HISTORY=NO"]
     )
@@ -5880,12 +5874,11 @@ def test_netcdf_default_metadata_disabled():
     assert ds.GetMetadataItem("NC_GLOBAL#GDAL") is None
     assert ds.GetMetadataItem("NC_GLOBAL#history") is None
     ds = None
-    gdal.Unlink(tmpfilename)
 
 
-def test_netcdf_update_metadata():
+def test_netcdf_update_metadata(tmp_path):
 
-    tmpfilename = "tmp/test_netcdf_update_metadata.nc"
+    tmpfilename = str(tmp_path / "out.nc")
     ds = gdal.GetDriverByName("netCDF").Create(tmpfilename, 2, 2)
     ds.GetRasterBand(1).SetMetadata({"foo": "bar"})
     ds.SetMetadata(
@@ -5900,8 +5893,6 @@ def test_netcdf_update_metadata():
     assert ds.GetMetadataItem("bla#ignored") is None
     ds = None
 
-    gdal.Unlink(tmpfilename)
-
 
 def test_netcdf_read_gmt_file():
     """Test reading a GMT generated file that doesn't completely follow
@@ -5932,11 +5923,12 @@ def test_netcdf_read_int64():
 ###############################################################################
 
 
-def test_netcdf_write_int64():
+def test_netcdf_write_int64(tmp_path):
 
     src_ds = gdal.Open("data/netcdf/int64.nc")
-    gdaltest.netcdf_drv.CreateCopy("tmp/int64.nc", src_ds)
-    ds = gdal.Open("tmp/int64.nc")
+    tmpfilename = str(tmp_path / "out.nc")
+    gdaltest.netcdf_drv.CreateCopy(tmpfilename, src_ds)
+    ds = gdal.Open(tmpfilename)
     assert ds.GetRasterBand(1).DataType == gdal.GDT_Int64
     assert struct.unpack("q" * 4, ds.ReadRaster()) == (
         10000000001,
@@ -5945,7 +5937,6 @@ def test_netcdf_write_int64():
         10000000000,
     )
     ds = None
-    os.unlink("tmp/int64.nc")
 
 
 ###############################################################################
@@ -5961,29 +5952,29 @@ def test_netcdf_read_uint64():
 ###############################################################################
 
 
-def test_netcdf_write_uint64():
+def test_netcdf_write_uint64(tmp_path):
 
     src_ds = gdal.Open("data/netcdf/uint64.nc")
-    gdaltest.netcdf_drv.CreateCopy("tmp/uint64.nc", src_ds)
-    ds = gdal.Open("tmp/uint64.nc")
+    tmpfilename = str(tmp_path / "out.nc")
+    gdaltest.netcdf_drv.CreateCopy(tmpfilename, src_ds)
+    ds = gdal.Open(tmpfilename)
     assert ds.GetRasterBand(1).DataType == gdal.GDT_UInt64
     assert struct.unpack("Q" * 4, ds.ReadRaster()) == (10000000001, 1, 0, 10000000000)
     ds = None
-    os.unlink("tmp/uint64.nc")
 
 
 ###############################################################################
 
 
-def test_netcdf_write_uint64_nodata():
+def test_netcdf_write_uint64_nodata(tmp_path):
 
-    filename = "tmp/test_tiff_write_uint64_nodata.nc"
+    filename = str(tmp_path / "out.nc")
     ds = gdal.GetDriverByName("netCDF").Create(filename, 1, 1, 1, gdal.GDT_UInt64)
     val = (1 << 64) - 1
     assert ds.GetRasterBand(1).SetNoDataValue(val) == gdal.CE_None
     ds = None
 
-    filename_copy = "tmp/test_tiff_write_uint64_nodata_filename_copy.nc"
+    filename_copy = str(tmp_path / "out2.nc")
     ds = gdal.Open(filename)
     assert ds.GetRasterBand(1).GetNoDataValue() == val
     ds = gdal.GetDriverByName("netCDF").CreateCopy(filename_copy, ds)
@@ -5993,22 +5984,19 @@ def test_netcdf_write_uint64_nodata():
     assert ds.GetRasterBand(1).GetNoDataValue() == val
     ds = None
 
-    gdal.GetDriverByName("netCDF").Delete(filename)
-    gdal.GetDriverByName("netCDF").Delete(filename_copy)
-
 
 ###############################################################################
 
 
-def test_netcdf_write_int64_nodata():
+def test_netcdf_write_int64_nodata(tmp_path):
 
-    filename = "tmp/test_tiff_write_int64_nodata.nc"
+    filename = str(tmp_path / "out.nc")
     ds = gdal.GetDriverByName("netCDF").Create(filename, 1, 1, 1, gdal.GDT_Int64)
     val = -(1 << 63)
     assert ds.GetRasterBand(1).SetNoDataValue(val) == gdal.CE_None
     ds = None
 
-    filename_copy = "tmp/test_tiff_write_int64_nodata_filename_copy.nc"
+    filename_copy = str(tmp_path / "out2.nc")
     ds = gdal.Open(filename)
     assert ds.GetRasterBand(1).GetNoDataValue() == val
     ds = gdal.GetDriverByName("netCDF").CreateCopy(filename_copy, ds)
@@ -6018,9 +6006,6 @@ def test_netcdf_write_int64_nodata():
     assert ds.GetRasterBand(1).GetNoDataValue() == val
     ds = None
 
-    gdal.GetDriverByName("netCDF").Delete(filename)
-    gdal.GetDriverByName("netCDF").Delete(filename_copy)
-
 
 ###############################################################################
 
@@ -6038,10 +6023,10 @@ def test_netcdf_read_geogcrs_component_names():
 ###############################################################################
 
 
-def test_netcdf_stats():
+def test_netcdf_stats(tmp_path):
 
     src_ds = gdal.Open("data/byte.tif")
-    filename = "tmp/test_netcdf_stats.nc"
+    filename = str(tmp_path / "out.nc")
     gdal.GetDriverByName("netCDF").CreateCopy(filename, src_ds)
     ds = gdal.Open(filename)
     gdal.ErrorReset()
@@ -6054,13 +6039,12 @@ def test_netcdf_stats():
     ds = gdal.Open(filename)
     assert float(ds.GetRasterBand(1).GetMetadataItem("STATISTICS_MINIMUM")) == 74
     ds = None
-    gdal.GetDriverByName("netCDF").Delete(filename)
 
 
 ###############################################################################
 
 
-def test_netcdf_short_as_unsigned():
+def test_netcdf_short_as_unsigned(tmp_path):
     """Test https://github.com/OSGeo/gdal/issues/6352"""
 
     ds = gdal.Open("data/netcdf/short_as_unsigned.nc")
@@ -6097,15 +6081,16 @@ def test_netcdf_short_as_unsigned():
     )
     ds = None
 
-    shutil.copy("data/netcdf/short_as_unsigned.nc", "tmp/short_as_unsigned.nc")
+    filename = str(tmp_path / "out.nc")
+    shutil.copy("data/netcdf/short_as_unsigned.nc", filename)
 
-    ds = gdal.Open("tmp/short_as_unsigned.nc", gdal.GA_Update)
+    ds = gdal.Open(filename, gdal.GA_Update)
     ds.GetRasterBand(1).WriteRaster(
         0, 0, 7, 1, struct.pack("H" * 7, 2, 1, 0, 65535, 65534, 65533, 65532)
     )
     ds = None
 
-    ds = gdal.OpenEx("tmp/short_as_unsigned.nc", open_options=["HONOUR_VALID_RANGE=NO"])
+    ds = gdal.OpenEx(filename, open_options=["HONOUR_VALID_RANGE=NO"])
     assert struct.unpack("H" * 7, ds.GetRasterBand(1).ReadRaster()) == (
         2,
         1,
@@ -6117,8 +6102,6 @@ def test_netcdf_short_as_unsigned():
     )
     ds = None
 
-    gdal.GetDriverByName("netCDF").Delete("tmp/short_as_unsigned.nc")
-
 
 ###############################################################################
 
@@ -6515,6 +6498,32 @@ def test_band_names_creation_option(tmp_path):
         assert gdal.GetSubdatasetInfo(sds_names[1]).GetSubdatasetComponent() == "prate"
 
 
+@gdaltest.enable_exceptions()
+def test_band_names_creation_option_createcopy(tmp_path):
+
+    fname = tmp_path / "out.nc"
+
+    # 1 band, 2 names
+    with pytest.raises(Exception, match="but 2 names provided"):
+        src_ds = gdal.GetDriverByName("MEM").Create("", 1, 1)
+        gdal.GetDriverByName("NetCDF").CreateCopy(
+            fname, src_ds, options={"BAND_NAMES": "t2m,prate"}
+        )
+
+    # 2 bands, 2 names
+    src_ds = gdal.GetDriverByName("MEM").Create("", 1, 1, 2)
+    with gdal.GetDriverByName("NetCDF").CreateCopy(
+        fname, src_ds, options={"BAND_NAMES": "t2m,prate"}
+    ):
+        pass
+
+    with gdal.Open(fname) as ds:
+        sds_names = [sds[0] for sds in ds.GetSubDatasets()]
+
+        assert gdal.GetSubdatasetInfo(sds_names[0]).GetSubdatasetComponent() == "t2m"
+        assert gdal.GetSubdatasetInfo(sds_names[1]).GetSubdatasetComponent() == "prate"
+
+
 @gdaltest.enable_exceptions()
 def test_netcdf_create_metadata_with_equal_sign(tmp_path):
 
@@ -6529,3 +6538,48 @@ def test_netcdf_create_metadata_with_equal_sign(tmp_path):
 
     ds = gdal.Open(fname)
     assert ds.GetRasterBand(1).GetMetadataItem("long_name") == value
+
+
+###############################################################################
+# Test force opening a HDF55 file with netCDF driver
+
+
+def test_netcdf_force_opening_hdf5_file():
+
+    ds = gdal.OpenEx("data/hdf5/groups.h5", allowed_drivers=["netCDF"])
+    assert ds.GetDriver().GetDescription() == "netCDF"
+
+    ds = gdal.Open(ds.GetSubDatasets()[0][0])
+    assert ds.GetDriver().GetDescription() == "netCDF"
+
+
+###############################################################################
+# Test force opening, but provided file is still not recognized (for good reasons)
+
+
+def test_netcdf_force_opening_no_match():
+
+    drv = gdal.IdentifyDriverEx("data/byte.tif", allowed_drivers=["netCDF"])
+    assert drv is None
+
+
+###############################################################################
+
+
+def test_netcdf_extra_dim_no_georef(tmp_path):
+
+    fname = tmp_path / "out.nc"
+
+    src_ds = gdal.Translate("", "../gcore/data/stefan_full_rgba.tif", format="MEM")
+    size_z = 4
+    src_ds.SetMetadataItem("NETCDF_DIM_EXTRA", "{Z}")
+    src_ds.SetMetadataItem("NETCDF_DIM_Z_DEF", f"{{{size_z},4}}")
+    src_ds.SetMetadataItem("NETCDF_DIM_Z_VALUES", "{0,1,2,3}")
+    src_ds.SetMetadataItem("Z#axis", "Z")
+
+    # Create netCDF file
+    gdal.GetDriverByName("netCDF").CreateCopy(fname, src_ds)
+
+    ds = gdal.Open(fname)
+    assert ds.RasterCount == 4
+    assert ds.ReadRaster() == src_ds.ReadRaster()
diff --git a/autotest/gdrivers/netcdf_cf.py b/autotest/gdrivers/netcdf_cf.py
index 24edf4e53236..7e60718ed431 100755
--- a/autotest/gdrivers/netcdf_cf.py
+++ b/autotest/gdrivers/netcdf_cf.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/netcdf_multidim.py b/autotest/gdrivers/netcdf_multidim.py
index 21d2df20d439..253cb99b7197 100755
--- a/autotest/gdrivers/netcdf_multidim.py
+++ b/autotest/gdrivers/netcdf_multidim.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2019, Even Rouault <even.rouault@spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import array
@@ -33,7 +17,6 @@
 import shutil
 import stat
 import struct
-import sys
 import time
 
 import gdaltest
@@ -1115,23 +1098,20 @@ def dims_from_non_netcdf(rg):
         )
         assert att.Read() == "bar"
 
-        # There is an issue on 32-bit platforms, likely in libnetcdf or libhdf5 itself,
-        # with writing more than one string
-        if sys.maxsize > 0x7FFFFFFF:
-            att = rg.CreateAttribute(
-                "att_two_strings", [2], gdal.ExtendedDataType.CreateString()
-            )
-            assert att
-            with gdal.quiet_errors():
-                assert att.Write(["not_enough_elements"]) != gdal.CE_None
-            assert att.Write([1, 2]) == gdal.CE_None
-            assert att.Read() == ["1", "2"]
-            assert att.Write(["foo", "barbaz"]) == gdal.CE_None
-            assert att.Read() == ["foo", "barbaz"]
-            att = next(
-                (x for x in rg.GetAttributes() if x.GetName() == att.GetName()), None
-            )
-            assert att.Read() == ["foo", "barbaz"]
+        att = rg.CreateAttribute(
+            "att_two_strings", [2], gdal.ExtendedDataType.CreateString()
+        )
+        assert att
+        with gdal.quiet_errors():
+            assert att.Write(["not_enough_elements"]) != gdal.CE_None
+        assert att.Write([1, 2]) == gdal.CE_None
+        assert att.Read() == ["1", "2"]
+        assert att.Write(["foo", "barbaz"]) == gdal.CE_None
+        assert att.Read() == ["foo", "barbaz"]
+        att = next(
+            (x for x in rg.GetAttributes() if x.GetName() == att.GetName()), None
+        )
+        assert att.Read() == ["foo", "barbaz"]
 
         att = rg.CreateAttribute(
             "att_double", [], gdal.ExtendedDataType.Create(gdal.GDT_Float64)
@@ -1254,6 +1234,15 @@ def dims_from_non_netcdf(rg):
         assert var
         assert var.Read() == ["", "0123456789"]
 
+        var = rg.CreateMDArray(
+            "my_var_string_array_zero_dim", [], gdal.ExtendedDataType.CreateString()
+        )
+        assert var
+        assert var.Write(["foo"]) == gdal.CE_None
+        var = rg.OpenMDArray("my_var_string_array_zero_dim")
+        assert var
+        assert var.Read() == ["foo"]
+
     f()
 
     def f2():
@@ -1523,6 +1512,10 @@ def copy():
     gdal.Unlink(tmpfilename2)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_netcdf_multidim_dims_with_same_name_different_size():
 
     src_ds = gdal.OpenEx(
@@ -2091,6 +2084,9 @@ def test_netcdf_multidim_getcoordinatevariables():
 
 def test_netcdf_multidim_getresampled_with_geoloc():
 
+    if os.path.exists("data/netcdf/sentinel5p_fake.nc.aux.xml"):
+        os.unlink("data/netcdf/sentinel5p_fake.nc.aux.xml")
+
     ds = gdal.OpenEx("data/netcdf/sentinel5p_fake.nc", gdal.OF_MULTIDIM_RASTER)
     rg = ds.GetRootGroup()
 
@@ -2113,6 +2109,8 @@ def test_netcdf_multidim_getresampled_with_geoloc():
         warped_ds = gdal.Warp("", "data/netcdf/sentinel5p_fake.nc", format="MEM")
     assert warped_ds.ReadRaster() == resampled_ar.Read()
 
+    assert not os.path.exists("data/netcdf/sentinel5p_fake.nc.aux.xml")
+
 
 def test_netcdf_multidim_cache():
 
@@ -3570,6 +3568,9 @@ def reopen():
 
 def test_netcdf_multidim_getresampled_with_geoloc_EMIT_L2A():
 
+    if os.path.exists("data/netcdf/fake_EMIT_L2A.nc.aux.xml"):
+        os.unlink("data/netcdf/fake_EMIT_L2A.nc.aux.xml")
+
     ds = gdal.OpenEx("data/netcdf/fake_EMIT_L2A.nc", gdal.OF_MULTIDIM_RASTER)
     rg = ds.GetRootGroup()
 
@@ -3765,6 +3766,90 @@ def test_netcdf_multidim_getresampled_with_geoloc_EMIT_L2A():
         20.0,
     )
 
+    assert not os.path.exists("data/netcdf/fake_EMIT_L2A.nc.aux.xml")
+
+
+def test_netcdf_multidim_getresampled_with_geoloc_EMIT_L2A_with_good_wavelengths():
+
+    ds = gdal.OpenEx(
+        "data/netcdf/fake_EMIT_L2A_with_good_wavelengths.nc", gdal.OF_MULTIDIM_RASTER
+    )
+    rg = ds.GetRootGroup()
+
+    ar = rg.OpenMDArray("reflectance")
+
+    # Use glt_x and glt_y arrays, and good_wavelengths variable
+    resampled_ar = ar.GetResampled(
+        [None, None, None], gdal.GRIORA_NearestNeighbour, None
+    )
+    assert resampled_ar is not None
+
+    # Read one band that is valid according to good_wavelengths variable
+    assert struct.unpack(
+        "f" * (3 * 3), resampled_ar.Read(array_start_idx=[0, 0, 1], count=[3, 3, 1])
+    ) == (
+        -9999.0,
+        -9999.0,
+        -9999.0,
+        -9999.0,
+        -9999.0,
+        -9999.0,
+        -9999.0,
+        -9999.0,
+        -9999.0,
+    )
+
+    # Read one band that is invalid according to good_wavelengths variable
+    assert struct.unpack(
+        "f" * (3 * 3), resampled_ar.Read(array_start_idx=[0, 0, 0], count=[3, 3, 1])
+    ) == (
+        -9999.0,
+        -9999.0,
+        -9999.0,
+        -9999.0,
+        30.0,
+        40.0,
+        -9999.0,
+        10.0,
+        20.0,
+    )
+
+    # Read all bands
+    assert struct.unpack("f" * (3 * 3 * 2), resampled_ar.Read()) == (
+        -9999.0,
+        -9999.0,
+        -9999.0,
+        -9999.0,
+        -9999.0,
+        -9999.0,
+        -9999.0,
+        -9999.0,
+        30.0,
+        -9999.0,
+        40.0,
+        -9999.0,
+        -9999.0,
+        -9999.0,
+        10.0,
+        -9999.0,
+        20.0,
+        -9999.0,
+    )
+
+    # Test *not* using good_wavelengths variable
+    resampled_ar = ar.GetResampled(
+        [None, None, None],
+        gdal.GRIORA_NearestNeighbour,
+        None,
+        ["USE_GOOD_WAVELENGTHS=NO"],
+    )
+    assert resampled_ar is not None
+
+    # Read one band that is valid according to good_wavelengths variable
+    assert struct.unpack(
+        "f" * (3 * 3), resampled_ar.Read(array_start_idx=[0, 0, 1], count=[3, 3, 1])
+    ) == (-9999.0, -9999.0, -9999.0, -9999.0, -30.0, -40.0, -9999.0, -10.0, -20.0)
+
 
 def test_netcdf_multidim_getresampled_with_geoloc_EMIT_L2B_MIN():
 
@@ -3901,12 +3986,7 @@ def test():
 
         view = ar.GetView("[0:10,...]")
         classic_ds = view.AsClassicDataset(1, 0)
-        assert classic_ds.GetRasterBand(1).GetStatistics(False, False) == [
-            0.0,
-            0.0,
-            0.0,
-            -1.0,
-        ]
+        assert classic_ds.GetRasterBand(1).GetStatistics(False, False) is None
         classic_ds.GetRasterBand(1).ComputeStatistics(False)
 
         view = ar.GetView("[10:20,...]")
@@ -3923,9 +4003,17 @@ def test2():
         rg_subset = rg.SubsetDimensionFromSelection("/x=440750")
         rg_subset.OpenMDArray("Band1").GetStatistics(False, force=True)
 
+    def test3():
+        ds = gdal.Open(filename)
+        ds.SetMetadataItem("foo", "bar")
+
     def reopen():
 
+        ds = gdal.Open(filename)
+        assert ds.GetMetadataItem("foo") == "bar"
+
         aux_xml = open(filename + ".aux.xml", "rb").read().decode("UTF-8")
+        assert '<MDI key="foo">bar</MDI>' in aux_xml
         assert (
             '<DerivedDataset name="AsClassicDataset(1,0) view of Sliced view of /Band1 ([0:10,...])">'
             in aux_xml
@@ -3957,12 +4045,7 @@ def reopen():
         )
 
         classic_ds = ar.AsClassicDataset(1, 0)
-        assert classic_ds.GetRasterBand(1).GetStatistics(False, False) == [
-            0.0,
-            0.0,
-            0.0,
-            -1.0,
-        ]
+        assert classic_ds.GetRasterBand(1).GetStatistics(False, False) is None
 
         rg_subset = rg.SubsetDimensionFromSelection("/x=440750")
 
@@ -3976,6 +4059,7 @@ def reopen():
 
     test()
     test2()
+    test3()
     reopen()
 
 
@@ -4006,3 +4090,70 @@ def test2():
 
     test()
     test2()
+
+
+###############################################################################
+
+
+def test_netcdf_multidim_chunk_cache_options():
+
+    ds = gdal.OpenEx("data/netcdf/nc4_vars.nc", gdal.OF_MULTIDIM_RASTER)
+    rg = ds.GetRootGroup()
+
+    var = rg.OpenMDArray(
+        "Band1",
+        [
+            "RAW_DATA_CHUNK_CACHE_SIZE=2000000",
+            "CHUNK_SLOTS=1000",
+            "PREEMPTION=0.9",
+            "INCLUDE_CHUNK_CACHE_PARAMETERS_IN_STRUCTURAL_INFO=YES",
+        ],
+    )
+    assert var.GetStructuralInfo() == {
+        "RAW_DATA_CHUNK_CACHE_SIZE": "2000000",
+        "CHUNK_SLOTS": "1000",
+        "PREEMPTION": "0.900000",
+    }
+
+
+###############################################################################
+
+
+def test_netcdf_multidim_as_classic_dataset_metadata():
+    def set_metadata():
+        ds = gdal.OpenEx(
+            "data/netcdf/fake_EMIT_L2A_with_good_wavelengths.nc",
+            gdal.OF_MULTIDIM_RASTER,
+        )
+        rg = ds.GetRootGroup()
+        ar = rg.OpenMDArray("reflectance")
+        resampled_ar = ar.GetResampled(
+            [None, None, None], gdal.GRIORA_NearestNeighbour, None
+        )
+        assert resampled_ar is not None
+        classic_ds = ar.AsClassicDataset(1, 0)
+        classic_ds.SetMetadataItem("foo", "bar")
+
+    def check_metadata():
+        ds = gdal.OpenEx(
+            "data/netcdf/fake_EMIT_L2A_with_good_wavelengths.nc",
+            gdal.OF_MULTIDIM_RASTER,
+        )
+        rg = ds.GetRootGroup()
+        ar = rg.OpenMDArray("reflectance")
+        resampled_ar = ar.GetResampled(
+            [None, None, None], gdal.GRIORA_NearestNeighbour, None
+        )
+        assert resampled_ar is not None
+        classic_ds = ar.AsClassicDataset(1, 0)
+        assert classic_ds.GetMetadataItem("foo") == "bar"
+
+    pam_filename = "data/netcdf/fake_EMIT_L2A_with_good_wavelengths.nc.aux.xml"
+    if os.path.exists(pam_filename):
+        os.unlink(pam_filename)
+
+    set_metadata()
+    check_metadata()
+
+    assert os.path.exists(pam_filename)
+    os.unlink(pam_filename)
diff --git a/autotest/gdrivers/netcdf_multidim_pamproxydb.py b/autotest/gdrivers/netcdf_multidim_pamproxydb.py
index 8091ff900d8e..f2884ab73c6d 100755
--- a/autotest/gdrivers/netcdf_multidim_pamproxydb.py
+++ b/autotest/gdrivers/netcdf_multidim_pamproxydb.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2021, Even Rouault <even.rouault@spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
diff --git a/autotest/gdrivers/ngsgeoid.py b/autotest/gdrivers/ngsgeoid.py
index 7c66f8b1a471..31cc41ef3b7f 100755
--- a/autotest/gdrivers/ngsgeoid.py
+++ b/autotest/gdrivers/ngsgeoid.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/ngw.py b/autotest/gdrivers/ngw.py
index 43befc3c9a92..71c3a8b76dd5 100755
--- a/autotest/gdrivers/ngw.py
+++ b/autotest/gdrivers/ngw.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2018-2021, NextGIS <info@nextgis.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/nitf.py b/autotest/gdrivers/nitf.py
index a24070cbdc97..24eecec66f45 100755
--- a/autotest/gdrivers/nitf.py
+++ b/autotest/gdrivers/nitf.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import array
@@ -63,11 +47,6 @@ def setup_and_cleanup():
 
     yield
 
-    try:
-        gdal.GetDriverByName("NITF").Delete("tmp/test_create.ntf")
-    except RuntimeError:
-        pass
-
     try:
         gdal.GetDriverByName("NITF").Delete("tmp/nitf9.ntf")
     except RuntimeError:
@@ -249,21 +228,20 @@ def test_nitf_3():
 # Test direction creation of an NITF file.
 
 
-def nitf_create(creation_options, set_inverted_color_interp=True, createcopy=False):
+def nitf_create(
+    filename,
+    creation_options,
+    set_inverted_color_interp=True,
+    createcopy=False,
+    nbands=3,
+):
 
     drv = gdal.GetDriverByName("NITF")
 
-    try:
-        os.remove("tmp/test_create.ntf")
-    except OSError:
-        pass
-
     if createcopy:
-        ds = gdal.GetDriverByName("MEM").Create("", 200, 100, 3, gdal.GDT_Byte)
+        ds = gdal.GetDriverByName("MEM").Create("", 200, 100, nbands, gdal.GDT_Byte)
     else:
-        ds = drv.Create(
-            "tmp/test_create.ntf", 200, 100, 3, gdal.GDT_Byte, creation_options
-        )
+        ds = drv.Create(filename, 200, 100, nbands, gdal.GDT_Byte, creation_options)
     ds.SetGeoTransform((100, 0.1, 0.0, 30.0, 0.0, -0.1))
 
     if set_inverted_color_interp:
@@ -276,23 +254,27 @@ def nitf_create(creation_options, set_inverted_color_interp=True, createcopy=Fal
         ds.GetRasterBand(3).SetRasterColorInterpretation(gdal.GCI_BlueBand)
 
     my_list = list(range(200)) + list(range(20, 220)) + list(range(30, 230))
-    try:
-        raw_data = array.array("h", my_list).tobytes()
-    except Exception:
-        # Python 2
-        raw_data = array.array("h", my_list).tostring()
+    if nbands == 4:
+        my_list += list(range(40, 240))
+    raw_data = array.array("h", my_list).tobytes()
 
     for line in range(100):
         ds.WriteRaster(
-            0, line, 200, 1, raw_data, buf_type=gdal.GDT_Int16, band_list=[1, 2, 3]
+            0,
+            line,
+            200,
+            1,
+            raw_data,
+            buf_type=gdal.GDT_Int16,
         )
 
     assert ds.FlushCache() == gdal.CE_None
 
     if createcopy:
-        ds = drv.CreateCopy("tmp/test_create.ntf", ds, options=creation_options)
+        ds = drv.CreateCopy(filename, ds, options=creation_options)
 
     ds = None
+    gdal.Unlink(filename + ".aux.xml")
 
 
 ###############################################################################
@@ -300,11 +282,12 @@ def nitf_create(creation_options, set_inverted_color_interp=True, createcopy=Fal
 
 
 def nitf_check_created_file(
+    filename,
     checksum1,
     checksum2,
     checksum3,
-    filename="tmp/test_create.ntf",
     set_inverted_color_interp=True,
+    createcopy=False,
 ):
     ds = gdal.Open(filename)
 
@@ -331,6 +314,10 @@ def nitf_check_created_file(
     ), "geotransform differs from expected"
 
     if set_inverted_color_interp:
+
+        if createcopy:
+            assert ds.GetMetadataItem("NITF_IREP") == "MULTI"
+
         assert (
             ds.GetRasterBand(1).GetRasterColorInterpretation() == gdal.GCI_BlueBand
         ), "Got wrong color interpretation."
@@ -343,6 +330,11 @@ def nitf_check_created_file(
             ds.GetRasterBand(3).GetRasterColorInterpretation() == gdal.GCI_RedBand
         ), "Got wrong color interpretation."
 
+        if ds.RasterCount == 4:
+            assert (
+                ds.GetRasterBand(4).GetRasterColorInterpretation() == gdal.GCI_GrayIndex
+            ), "Got wrong color interpretation."
+
     ds = None
 
 
@@ -350,11 +342,29 @@ def nitf_check_created_file(
 # Test direction creation of an non-compressed NITF file.
 
 
-def test_nitf_5():
+@pytest.mark.parametrize("createcopy", [False, True])
+@pytest.mark.parametrize("set_inverted_color_interp", [False, True])
+@pytest.mark.parametrize("nbands", [3, 4])
+def test_nitf_5(tmp_path, createcopy, set_inverted_color_interp, nbands):
 
-    nitf_create(["ICORDS=G"])
+    filename = str(tmp_path / "test.ntf")
 
-    nitf_check_created_file(32498, 42602, 38982)
+    nitf_create(
+        filename,
+        ["ICORDS=G"],
+        set_inverted_color_interp=set_inverted_color_interp,
+        createcopy=createcopy,
+        nbands=nbands,
+    )
+
+    nitf_check_created_file(
+        filename,
+        32498,
+        42602,
+        38982,
+        set_inverted_color_interp=set_inverted_color_interp,
+        createcopy=createcopy,
+    )
 
 
 ###############################################################################
@@ -827,11 +837,13 @@ def test_nitf_26():
 # Test Create() with IC=NC compression, and multi-blocks
 
 
-def test_nitf_27():
+def test_nitf_27(tmp_path):
 
-    nitf_create(["ICORDS=G", "IC=NC", "BLOCKXSIZE=10", "BLOCKYSIZE=10"])
+    filename = str(tmp_path / "test.ntf")
 
-    nitf_check_created_file(32498, 42602, 38982)
+    nitf_create(filename, ["ICORDS=G", "IC=NC", "BLOCKXSIZE=10", "BLOCKYSIZE=10"])
+
+    nitf_check_created_file(filename, 32498, 42602, 38982)
 
 
 ###############################################################################
@@ -839,7 +851,7 @@ def test_nitf_27():
 
 
 @pytest.mark.require_driver("JP2ECW")
-def test_nitf_28_jp2ecw():
+def test_nitf_28_jp2ecw(tmp_path):
 
     import ecw
 
@@ -849,9 +861,17 @@ def test_nitf_28_jp2ecw():
     # Deregister other potential conflicting JPEG2000 drivers
     gdaltest.deregister_all_jpeg2000_drivers_but("JP2ECW")
     try:
-        nitf_create(["ICORDS=G", "IC=C8", "TARGET=75"], set_inverted_color_interp=False)
+        filename = str(tmp_path / "test.ntf")
+
+        nitf_create(
+            filename,
+            ["ICORDS=G", "IC=C8", "TARGET=75"],
+            set_inverted_color_interp=False,
+        )
 
-        nitf_check_created_file(32398, 42502, 38882, set_inverted_color_interp=False)
+        nitf_check_created_file(
+            filename, 32398, 42502, 38882, set_inverted_color_interp=False
+        )
 
         tmpfilename = "/vsimem/nitf_28_jp2ecw.ntf"
         src_ds = gdal.GetDriverByName("MEM").Create("", 1025, 1025)
@@ -860,10 +880,11 @@ def test_nitf_28_jp2ecw():
         blockxsize, blockysize = ds.GetRasterBand(1).GetBlockSize()
         ds = None
         gdal.Unlink(tmpfilename)
-        assert (blockxsize, blockysize) == (
-            256,
-            256,
-        )  # 256 since this is hardcoded as such in the ECW driver
+        # 256 for ECW < 5.1, 1024 for ECW >= 5.1
+        assert (blockxsize, blockysize) == (256, 256) or (blockxsize, blockysize) == (
+            1024,
+            1024,
+        )
     finally:
         gdaltest.reregister_all_jpeg2000_drivers()
 
@@ -879,10 +900,10 @@ def test_nitf_28_jp2mrsid():
     gdaltest.deregister_all_jpeg2000_drivers_but("JP2MrSID")
 
     nitf_check_created_file(
+        "data/nitf/test_jp2_ecw33.ntf",
         32398,
         42502,
         38882,
-        filename="data/nitf/test_jp2_ecw33.ntf",
         set_inverted_color_interp=False,
     )
 
@@ -900,10 +921,10 @@ def test_nitf_28_jp2kak():
     gdaltest.deregister_all_jpeg2000_drivers_but("JP2KAK")
 
     nitf_check_created_file(
+        "data/nitf/test_jp2_ecw33.ntf",
         32398,
         42502,
         38882,
-        filename="data/nitf/test_jp2_ecw33.ntf",
         set_inverted_color_interp=False,
     )
 
@@ -921,10 +942,10 @@ def test_nitf_28_jp2openjpeg():
     gdaltest.deregister_all_jpeg2000_drivers_but("JP2OpenJPEG")
     try:
         nitf_check_created_file(
+            "data/nitf/test_jp2_ecw33.ntf",
             32398,
             42502,
             38882,
-            filename="data/nitf/test_jp2_ecw33.ntf",
             set_inverted_color_interp=False,
         )
     finally:
@@ -936,20 +957,52 @@ def test_nitf_28_jp2openjpeg():
 
 
 @pytest.mark.require_driver("JP2OpenJPEG")
-def test_nitf_28_jp2openjpeg_bis():
+def test_nitf_28_jp2openjpeg_bis(tmp_path):
 
     # Deregister other potential conflicting JPEG2000 drivers
     gdaltest.deregister_all_jpeg2000_drivers_but("JP2OpenJPEG")
     try:
+        filename = str(tmp_path / "test.ntf")
+
         nitf_create(
+            filename,
             ["ICORDS=G", "IC=C8", "QUALITY=25"],
             set_inverted_color_interp=False,
             createcopy=True,
         )
-        ds = gdal.Open("tmp/test_create.ntf")
+        ds = gdal.Open(filename)
+        size = os.stat(filename).st_size
+        assert ds.GetRasterBand(1).Checksum() in (31604, 31741)
+        ds = None
+
+        nitf_create(
+            filename,
+            ["ICORDS=G", "IC=C8", "QUALITY=1,25"],
+            set_inverted_color_interp=False,
+            createcopy=True,
+        )
+        ds = gdal.Open(filename)
+        size2 = os.stat(filename).st_size
+        assert ds.GetRasterBand(1).Checksum() in (31604, 31741)
+        ds = None
+
+        assert size2 > size
+
+        # Check that floating-point values in QUALITY are honored
+        nitf_create(
+            filename,
+            ["ICORDS=G", "IC=C8", "QUALITY=1.9,25"],
+            set_inverted_color_interp=False,
+            createcopy=True,
+        )
+        ds = gdal.Open(filename)
+        size3 = os.stat(filename).st_size
         assert ds.GetRasterBand(1).Checksum() in (31604, 31741)
         ds = None
 
+        # The fact that size3 > size2 is a bit of a chance here...
+        assert size3 > size2
+
         tmpfilename = "/vsimem/nitf_28_jp2openjpeg_bis.ntf"
         src_ds = gdal.GetDriverByName("MEM").Create("", 1025, 1025)
         gdal.GetDriverByName("NITF").CreateCopy(tmpfilename, src_ds, options=["IC=C8"])
@@ -966,16 +1019,17 @@ def test_nitf_28_jp2openjpeg_bis():
 # Test CreateCopy() with IC=C8 compression and NPJE profiles with the JP2OpenJPEG driver
 
 
-def test_nitf_jp2openjpeg_npje_numerically_lossless():
+def test_nitf_jp2openjpeg_npje_numerically_lossless(tmp_vsimem):
     jp2openjpeg_drv = gdal.GetDriverByName("JP2OpenJPEG")
     if jp2openjpeg_drv is None:
         pytest.skip()
 
     src_ds = gdal.Open("../gcore/data/uint16.tif")
     # May throw a warning with openjpeg < 2.5
+    out1_filename = str(tmp_vsimem / "tmp.ntf")
     with gdal.quiet_errors():
         gdal.GetDriverByName("NITF").CreateCopy(
-            "/vsimem/tmp.ntf",
+            out1_filename,
             src_ds,
             strict=False,
             options=[
@@ -986,19 +1040,17 @@ def test_nitf_jp2openjpeg_npje_numerically_lossless():
             ],
         )
 
-    ds = gdal.Open("/vsimem/tmp.ntf")
+    ds = gdal.Open(out1_filename)
+    assert ds.GetMetadataItem("NITF_ABPP") == "12"
+    assert ds.GetRasterBand(1).GetMetadataItem("NBITS", "IMAGE_STRUCTURE") == "12"
     assert ds.GetRasterBand(1).Checksum() == 4672
     assert (
         ds.GetMetadataItem("J2KLRA", "TRE")
         == "0050000102000000.03125000100.06250000200.12500000300.25000000400.50000000500.60000000600.70000000700.80000000800.90000000901.00000001001.10000001101.20000001201.30000001301.50000001401.70000001502.00000001602.30000001703.50000001803.90000001912.000000"
     )
     assert ds.GetMetadataItem("COMRAT", "DEBUG") in (
-        "N141",
-        "N142",
-        "N143",
-        "N147",
-        "N169",
-        "N174",
+        "N145",  # OpenJPEG 2.3.1 and 2.4
+        "N172",  # OpenJPEG 2.5
     )
     assert (
         ds.GetMetadataItem("COMPRESSION_REVERSIBILITY", "IMAGE_STRUCTURE") == "LOSSLESS"
@@ -1018,7 +1070,7 @@ def test_nitf_jp2openjpeg_npje_numerically_lossless():
         in structure
     )
     assert (
-        '<Field name="Ssiz0" type="uint8" description="Unsigned 16 bits">15</Field>'
+        '<Field name="Ssiz0" type="uint8" description="Unsigned 12 bits">11</Field>'
         in structure
     )
     assert '<Field name="XTsiz" type="uint32">1024</Field>' in structure
@@ -1051,7 +1103,25 @@ def test_nitf_jp2openjpeg_npje_numerically_lossless():
         assert '<Marker name="TLM"' in structure
         assert '<Marker name="PLT"' in structure
 
-    gdal.Unlink("/vsimem/tmp.ntf")
+    # Check that NBITS is propagated as ABPP
+    out2_filename = str(tmp_vsimem / "tmp.ntf")
+    with gdal.quiet_errors():
+        gdal.GetDriverByName("NITF").CreateCopy(
+            out2_filename,
+            gdal.Open(out1_filename),
+            strict=False,
+            options=[
+                "IC=C8",
+                "JPEG2000_DRIVER=JP2OpenJPEG",
+                "PROFILE=NPJE_NUMERICALLY_LOSSLESS",
+                "QUALITY=10,100",
+            ],
+        )
+
+    ds = gdal.Open(out2_filename)
+    assert ds.GetMetadataItem("NITF_ABPP") == "12"
+    assert ds.GetRasterBand(1).GetMetadataItem("NBITS", "IMAGE_STRUCTURE") == "12"
+    assert ds.GetRasterBand(1).Checksum() == 4672
 
 
 ###############################################################################
@@ -1370,11 +1440,15 @@ def test_nitf_30():
 # Verify we can write a file with a custom TRE and read it back properly.
 
 
-def test_nitf_31():
+def test_nitf_31(tmp_path):
 
-    nitf_create(["TRE=CUSTOM= Test TRE1\\0MORE", "TRE=TOTEST=SecondTRE", "ICORDS=G"])
+    filename = str(tmp_path / "test.ntf")
 
-    ds = gdal.Open("tmp/test_create.ntf")
+    nitf_create(
+        filename, ["TRE=CUSTOM= Test TRE1\\0MORE", "TRE=TOTEST=SecondTRE", "ICORDS=G"]
+    )
+
+    ds = gdal.Open(filename)
 
     md = ds.GetMetadata("TRE")
     assert len(md) == 2, "Did not get expected TRE count"
@@ -1392,27 +1466,31 @@ def test_nitf_31():
     ), "Did not get expected TRE contents"
 
     ds = None
-    return nitf_check_created_file(32498, 42602, 38982)
+    return nitf_check_created_file(filename, 32498, 42602, 38982)
 
 
 ###############################################################################
 # Test Create() with ICORDS=D
 
 
-def test_nitf_32():
+def test_nitf_32(tmp_path):
+
+    filename = str(tmp_path / "test.ntf")
 
-    nitf_create(["ICORDS=D"])
+    nitf_create(filename, ["ICORDS=D"])
 
-    return nitf_check_created_file(32498, 42602, 38982)
+    return nitf_check_created_file(filename, 32498, 42602, 38982)
 
 
 ###############################################################################
 # Test Create() with ICORDS=D and a consistent BLOCKA
 
 
-def test_nitf_33():
+def test_nitf_33(tmp_path):
 
+    filename = str(tmp_path / "test.ntf")
     nitf_create(
+        filename,
         [
             "ICORDS=D",
             "BLOCKA_BLOCK_COUNT=01",
@@ -1422,10 +1500,10 @@ def test_nitf_33():
             "BLOCKA_LRLC_LOC_01=+20.050000+119.950000",
             "BLOCKA_LRFC_LOC_01=+20.050000+100.050000",
             "BLOCKA_FRFC_LOC_01=+29.950000+100.050000",
-        ]
+        ],
     )
 
-    return nitf_check_created_file(32498, 42602, 38982)
+    return nitf_check_created_file(filename, 32498, 42602, 38982)
 
 
 ###############################################################################
@@ -1443,6 +1521,10 @@ def test_nitf_34():
 # Test CreateCopy() writing file with a text segment.
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_nitf_35():
 
     src_ds = gdal.Open("data/nitf/text_md.vrt")
@@ -1488,8 +1570,7 @@ def test_nitf_36():
         ds.GetRasterBand(1).GetMinimum() is None
     ), "Did not expect to have minimum value at that point."
 
-    (_, _, mean, stddev) = ds.GetRasterBand(1).GetStatistics(False, False)
-    assert stddev < 0, "Did not expect to have statistics at that point."
+    assert ds.GetRasterBand(1).GetStatistics(False, False) is None
 
     (exp_mean, exp_stddev) = (65.4208, 47.254550335)
     (_, _, mean, stddev) = ds.GetRasterBand(1).GetStatistics(False, True)
@@ -1536,6 +1617,10 @@ def test_nitf_37():
 # Create and read a NITF file with 999 images
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_nitf_38():
 
     ds = gdal.Open("data/byte.tif")
@@ -1744,6 +1829,32 @@ def test_nitf_42(not_jpeg_9b):
     ds = None
 
 
+###############################################################################
+# Check creating a 12-bit JPEG compressed NITF
+
+
+def test_nitf_write_jpeg12(not_jpeg_9b, tmp_path):
+    # Check if JPEG driver supports 12bit JPEG reading/writing
+    jpg_drv = gdal.GetDriverByName("JPEG")
+    md = jpg_drv.GetMetadata()
+    if md[gdal.DMD_CREATIONDATATYPES].find("UInt16") == -1:
+        pytest.skip("12bit jpeg not available")
+
+    ds = gdal.GetDriverByName("MEM").Create("", 10000, 1, 3, gdal.GDT_UInt16)
+    ds.GetRasterBand(1).Fill(4096)
+    ds.GetRasterBand(2).Fill(0)
+    ds.GetRasterBand(3).Fill(4096)
+    out_filename = str(tmp_path / "out.ntf")
+    with gdal.quiet_errors():
+        gdal.GetDriverByName("NITF").CreateCopy(out_filename, ds, options=["IC=C3"])
+
+    ds = gdal.Open(out_filename)
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_UInt16
+    assert [
+        ds.GetRasterBand(i + 1).GetStatistics(0, 1)[2] for i in range(3)
+    ] == pytest.approx([4095, 0, 4095], abs=1)
+
+
 ###############################################################################
 # Test CreateCopy() in IC=C8 with various JPEG2000 drivers
 
@@ -1890,6 +2001,10 @@ def test_nitf_check_jpeg2000_overviews(driver_to_test):
 # Check reading of rsets.
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_nitf_47():
 
     ds = gdal.Open("data/nitf/rset.ntf.r0")
@@ -1909,6 +2024,10 @@ def test_nitf_47():
 # Check building of standard overviews in place of rset overviews.
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_nitf_48():
 
     try:
@@ -1950,6 +2069,10 @@ def test_nitf_48():
 # Test TEXT and CGM creation options with CreateCopy() (#3376)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_nitf_49():
 
     options = [
@@ -2671,6 +2794,10 @@ def test_nitf_68():
 # Test SetGCPs() support
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_nitf_69():
 
     vrt_txt = """<VRTDataset rasterXSize="20" rasterYSize="20">
@@ -2899,6 +3026,7 @@ def test_nitf_72():
     src_md = src_md_max_precision
     src_ds.SetMetadata(src_md, "RPC")
 
+    gdal.ErrorReset()
     gdal.GetDriverByName("NITF").CreateCopy("/vsimem/nitf_72.ntf", src_ds)
 
     assert gdal.GetLastErrorMsg() == "", "fail: did not expect warning"
@@ -3990,6 +4118,386 @@ def test_nitf_86():
     assert data == expected_data
 
 
+###############################################################################
+# Test parsing CSCSDB DES (STDI-0002-1-v5.0 App M)
+
+
+def test_nitf_CSCSDB(tmp_vsimem):
+    tre_data = "DES=CSCSDB=01U                                                                                                                                                                      008517261ee9-2175-4ff2-86ad-dddda1f8270c001002001824ecf8e-1041-4cce-9edb-bc92d88624ca000020050407132420050407072409.88900000031231+2.50000000000000E+03+0.00000000000000E+00+0.00000000000000E+00+2.50000000000000E+03+0.00000000000000E+00+2.50000000000000E+0300101020050407072409.8890000002451+2.01640000000000E-08+0.00000000000000E+00+2.01640000000000E-080010312005040726649.889000000001.8750000000081+7.22500000000000E-09+0.00000000000000E+00+7.22500000000000E-09100104020050407072409.889000000161+2.01640000000000E-0800105020050407072409.889000000171+1.96000000000000E-0400107000100303+4.00000000000000E+00+0.00000000000000E+00+4.00000000000000E+00+4.00000000000000E+00+0.00000000000000E+00+4.00000000000000E+00+4.00000000000000E+00+0.00000000000000E+00+4.00000000000000E+00+4.00000000000000E+00+0.00000000000000E+00+4.00000000000000E+00+4.00000000000000E+00+0.00000000000000E+00+4.00000000000000E+00+4.00000000000000E+00+0.00000000000000E+00+4.00000000000000E+00+4.00000000000000E+00+0.00000000000000E+00+4.00000000000000E+00+4.00000000000000E+00+0.00000000000000E+00+4.00000000000000E+00+4.00000000000000E+00+0.00000000000000E+00+4.00000000000000E+000910107010101.0001.0000000.00000000.000000+1.00000000000000E+03020101.0001.0000000.00000000.000000+5.00000000000000E+02030101.0001.0000000.00000000.000000+5.00000000000000E+02040101.0001.0000000.00000000.000000+5.00000000000000E+02050101.0001.0000000.00000000.000000+5.00000000000000E+02060101.0001.0000000.00000000.000000+5.00000000000000E+02070101.0001.0000000.00000000.000000+1.00000000000000E+020000000000"
+
+    filename = str(tmp_vsimem / "test.ntf")
+    ds = gdal.GetDriverByName("NITF").Create(filename, 1, 1, options=[tre_data])
+    ds = None
+
+    ds = gdal.Open(filename)
+    data = ds.GetMetadata("xml:DES")[0]
+    ds = None
+
+    expected_data = """<des_list>
+  <des name="CSCSDB">
+    <field name="DESVER" value="01" />
+    <field name="DECLAS" value="U" />
+    <field name="DESCLSY" value="" />
+    <field name="DESCODE" value="" />
+    <field name="DESCTLH" value="" />
+    <field name="DESREL" value="" />
+    <field name="DESDCTP" value="" />
+    <field name="DESDCDT" value="" />
+    <field name="DESDCXM" value="" />
+    <field name="DESDG" value="" />
+    <field name="DESDGDT" value="" />
+    <field name="DESCLTX" value="" />
+    <field name="DESCATP" value="" />
+    <field name="DESCAUT" value="" />
+    <field name="DESCRSN" value="" />
+    <field name="DESSRDT" value="" />
+    <field name="DESCTLN" value="" />
+    <field name="DESSHL" value="0085" />
+    <field name="DESSHF" value="17261ee9-2175-4ff2-86ad-dddda1f8270c001002001824ecf8e-1041-4cce-9edb-bc92d88624ca0000">
+      <user_defined_fields>
+        <field name="UUID" value="17261ee9-2175-4ff2-86ad-dddda1f8270c" />
+        <field name="NUMAIS" value="001" />
+        <repeated number="1">
+          <group index="0">
+            <field name="AISDLVL" value="002" />
+          </group>
+        </repeated>
+        <field name="NUM_ASSOC_ELEM" value="001" />
+        <repeated name="ASSOC_ELEM" number="1">
+          <group index="0">
+            <field name="ASSOC_ELEM_UUID" value="824ecf8e-1041-4cce-9edb-bc92d88624ca" />
+          </group>
+        </repeated>
+        <field name="RESERVEDSUBH_LEN" value="0000" />
+      </user_defined_fields>
+    </field>
+    <field name="DESDATA" value="MjAwNTA0MDcxMzI0MjAwNTA0MDcwNzI0MDkuODg5MDAwMDAwMzEyMzErMi41MDAwMDAwMDAwMDAwMEUrMDMrMC4wMDAwMDAwMDAwMDAwMEUrMDArMC4wMDAwMDAwMDAwMDAwMEUrMDArMi41MDAwMDAwMDAwMDAwMEUrMDMrMC4wMDAwMDAwMDAwMDAwMEUrMDArMi41MDAwMDAwMDAwMDAwMEUrMDMwMDEwMTAyMDA1MDQwNzA3MjQwOS44ODkwMDAwMDAyNDUxKzIuMDE2NDAwMDAwMDAwMDBFLTA4KzAuMDAwMDAwMDAwMDAwMDBFKzAwKzIuMDE2NDAwMDAwMDAwMDBFLTA4MDAxMDMxMjAwNTA0MDcyNjY0OS44ODkwMDAwMDAwMDEuODc1MDAwMDAwMDA4MSs3LjIyNTAwMDAwMDAwMDAwRS0wOSswLjAwMDAwMDAwMDAwMDAwRSswMCs3LjIyNTAwMDAwMDAwMDAwRS0wOTEwMDEwNDAyMDA1MDQwNzA3MjQwOS44ODkwMDAwMDAxNjErMi4wMTY0MDAwMDAwMDAwMEUtMDgwMDEwNTAyMDA1MDQwNzA3MjQwOS44ODkwMDAwMDAxNzErMS45NjAwMDAwMDAwMDAwMEUtMDQwMDEwNzAwMDEwMDMwMys0LjAwMDAwMDAwMDAwMDAwRSswMCswLjAwMDAwMDAwMDAwMDAwRSswMCs0LjAwMDAwMDAwMDAwMDAwRSswMCs0LjAwMDAwMDAwMDAwMDAwRSswMCswLjAwMDAwMDAwMDAwMDAwRSswMCs0LjAwMDAwMDAwMDAwMDAwRSswMCs0LjAwMDAwMDAwMDAwMDAwRSswMCswLjAwMDAwMDAwMDAwMDAwRSswMCs0LjAwMDAwMDAwMDAwMDAwRSswMCs0LjAwMDAwMDAwMDAwMDAwRSswMCswLjAwMDAwMDAwMDAwMDAwRSswMCs0LjAwMDAwMDAwMDAwMDAwRSswMCs0LjAwMDAwMDAwMDAwMDAwRSswMCswLjAwMDAwMDAwMDAwMDAwRSswMCs0LjAwMDAwMDAwMDAwMDAwRSswMCs0LjAwMDAwMDAwMDAwMDAwRSswMCswLjAwMDAwMDAwMDAwMDAwRSswMCs0LjAwMDAwMDAwMDAwMDAwRSswMCs0LjAwMDAwMDAwMDAwMDAwRSswMCswLjAwMDAwMDAwMDAwMDAwRSswMCs0LjAwMDAwMDAwMDAwMDAwRSswMCs0LjAwMDAwMDAwMDAwMDAwRSswMCswLjAwMDAwMDAwMDAwMDAwRSswMCs0LjAwMDAwMDAwMDAwMDAwRSswMCs0LjAwMDAwMDAwMDAwMDAwRSswMCswLjAwMDAwMDAwMDAwMDAwRSswMCs0LjAwMDAwMDAwMDAwMDAwRSswMDA5MTAxMDcwMTAxMDEuMDAwMS4wMDAwMDAwLjAwMDAwMDAwLjAwMDAwMCsxLjAwMDAwMDAwMDAwMDAwRSswMzAyMDEwMS4wMDAxLjAwMDAwMDAuMDAwMDAwMDAuMDAwMDAwKzUuMDAwMDAwMDAwMDAwMDBFKzAyMDMwMTAxLjAwMDEuMDAwMDAwMC4wMDAwMDAwMC4wMDAwMDArNS4wMDAwMDAwMDAwMDAwMEUrMDIwNDAxMDEuMDAwMS4wMDAwMDAwLjAwMDAwMDAwLjAwMDAwMCs1LjAwMDAwMDAwMDAwMDAwRSswMjA1MDEwMS4wMDAxLjAwMDAwMDAuMDAwMDAwMDAuMDAwMDAwKzUuMDAwMDAwMDAwMDAwMDBFKzAyMDYwMTAxLjAwMDEuMDAwMDAwMC4wMDAwMDAwMC4wMDAwMDArNS4wMDAwMDAwMDAwMDAwMEUrMDIwNzAxMDEuMDAwMS4wMDAwMDAwLjAwMDAwMDAwLjAwMDAwMCsxLjAwMDAwMDAwMDAwMDAwRSswMjAwMDAwMDAwMDA=">
+      <data_fields>
+        <field name="COV_VERSION_DATE" value="20050407" />
+        <field name="CORE_SETS" value="1" />
+        <repeated name="CORE_SETS" number="1">
+          <group index="0">
+            <field name="REF_FRAME_POSITION" value="3" />
+            <field name="REF_FRAME_ATTITUDE" value="2" />
+            <field name="NUM_GROUPS" value="4" />
+            <repeated name="GROUPS" number="4">
+              <group index="0">
+                <field name="CORR_REF_DATE" value="20050407" />
+                <field name="CORR_REF_TIME" value="072409.889000000" />
+                <field name="NUM_ADJ_PARM" value="3" />
+                <repeated name="ADJ_PARM" number="3">
+                  <group index="0">
+                    <field name="ADJ_PARM_ID" value="1" />
+                  </group>
+                  <group index="1">
+                    <field name="ADJ_PARM_ID" value="2" />
+                  </group>
+                  <group index="2">
+                    <field name="ADJ_PARM_ID" value="3" />
+                  </group>
+                </repeated>
+                <field name="BASIC_SUB_ALLOC" value="1" />
+                <repeated number="6">
+                  <group index="0">
+                    <field name="ERRCOV_C1" value="+2.50000000000000E+03" />
+                  </group>
+                  <group index="1">
+                    <field name="ERRCOV_C1" value="+0.00000000000000E+00" />
+                  </group>
+                  <group index="2">
+                    <field name="ERRCOV_C1" value="+0.00000000000000E+00" />
+                  </group>
+                  <group index="3">
+                    <field name="ERRCOV_C1" value="+2.50000000000000E+03" />
+                  </group>
+                  <group index="4">
+                    <field name="ERRCOV_C1" value="+0.00000000000000E+00" />
+                  </group>
+                  <group index="5">
+                    <field name="ERRCOV_C1" value="+2.50000000000000E+03" />
+                  </group>
+                </repeated>
+                <field name="BASIC_PF_FLAG" value="0" />
+                <field name="BASIC_PL_FLAG" value="0" />
+                <field name="BASIC_SR_FLAG" value="1" />
+                <field name="BASIC_SR_SPDCF" value="01" />
+                <field name="POST_SUB_ALLOC" value="0" />
+              </group>
+              <group index="1">
+                <field name="CORR_REF_DATE" value="20050407" />
+                <field name="CORR_REF_TIME" value="072409.889000000" />
+                <field name="NUM_ADJ_PARM" value="2" />
+                <repeated name="ADJ_PARM" number="2">
+                  <group index="0">
+                    <field name="ADJ_PARM_ID" value="4" />
+                  </group>
+                  <group index="1">
+                    <field name="ADJ_PARM_ID" value="5" />
+                  </group>
+                </repeated>
+                <field name="BASIC_SUB_ALLOC" value="1" />
+                <repeated number="3">
+                  <group index="0">
+                    <field name="ERRCOV_C1" value="+2.01640000000000E-08" />
+                  </group>
+                  <group index="1">
+                    <field name="ERRCOV_C1" value="+0.00000000000000E+00" />
+                  </group>
+                  <group index="2">
+                    <field name="ERRCOV_C1" value="+2.01640000000000E-08" />
+                  </group>
+                </repeated>
+                <field name="BASIC_PF_FLAG" value="0" />
+                <field name="BASIC_PL_FLAG" value="0" />
+                <field name="BASIC_SR_FLAG" value="1" />
+                <field name="BASIC_SR_SPDCF" value="03" />
+                <field name="POST_SUB_ALLOC" value="1" />
+                <field name="POST_START_DATE" value="20050407" />
+                <field name="POST_START_TIME" value="26649.889000000" />
+                <field name="POST_DT" value="001.875000000" />
+                <field name="NUM_POSTS" value="008" />
+                <field name="COMMON_POSTS_COV" value="1" />
+                <repeated number="3">
+                  <group index="0">
+                    <field name="ERRCOV_C2" value="+7.22500000000000E-09" />
+                  </group>
+                  <group index="1">
+                    <field name="ERRCOV_C2" value="+0.00000000000000E+00" />
+                  </group>
+                  <group index="2">
+                    <field name="ERRCOV_C2" value="+7.22500000000000E-09" />
+                  </group>
+                </repeated>
+                <field name="POST_INTERP" value="1" />
+                <field name="POST_PF_FLAG" value="0" />
+                <field name="POST_PL_FLAG" value="0" />
+                <field name="POST_SR_FLAG" value="1" />
+                <field name="POST_SR_SPDCF" value="04" />
+                <field name="POST_CORR" value="0" />
+              </group>
+              <group index="2">
+                <field name="CORR_REF_DATE" value="20050407" />
+                <field name="CORR_REF_TIME" value="072409.889000000" />
+                <field name="NUM_ADJ_PARM" value="1" />
+                <repeated name="ADJ_PARM" number="1">
+                  <group index="0">
+                    <field name="ADJ_PARM_ID" value="6" />
+                  </group>
+                </repeated>
+                <field name="BASIC_SUB_ALLOC" value="1" />
+                <repeated number="1">
+                  <group index="0">
+                    <field name="ERRCOV_C1" value="+2.01640000000000E-08" />
+                  </group>
+                </repeated>
+                <field name="BASIC_PF_FLAG" value="0" />
+                <field name="BASIC_PL_FLAG" value="0" />
+                <field name="BASIC_SR_FLAG" value="1" />
+                <field name="BASIC_SR_SPDCF" value="05" />
+                <field name="POST_SUB_ALLOC" value="0" />
+              </group>
+              <group index="3">
+                <field name="CORR_REF_DATE" value="20050407" />
+                <field name="CORR_REF_TIME" value="072409.889000000" />
+                <field name="NUM_ADJ_PARM" value="1" />
+                <repeated name="ADJ_PARM" number="1">
+                  <group index="0">
+                    <field name="ADJ_PARM_ID" value="7" />
+                  </group>
+                </repeated>
+                <field name="BASIC_SUB_ALLOC" value="1" />
+                <repeated number="1">
+                  <group index="0">
+                    <field name="ERRCOV_C1" value="+1.96000000000000E-04" />
+                  </group>
+                </repeated>
+                <field name="BASIC_PF_FLAG" value="0" />
+                <field name="BASIC_PL_FLAG" value="0" />
+                <field name="BASIC_SR_FLAG" value="1" />
+                <field name="BASIC_SR_SPDCF" value="07" />
+                <field name="POST_SUB_ALLOC" value="0" />
+              </group>
+            </repeated>
+          </group>
+        </repeated>
+        <field name="IO_CAL_AP" value="0" />
+        <field name="TS_CAL_AP" value="0" />
+        <field name="UE_FLAG" value="1" />
+        <field name="LINE_DIMENSION" value="003" />
+        <field name="SAMPLE_DIMENSION" value="03" />
+        <repeated name="LINE" number="3">
+          <group index="0">
+            <repeated name="SAMPLE" number="3">
+              <group index="0">
+                <field name="URR" value="+4.00000000000000E+00" />
+                <field name="URC" value="+0.00000000000000E+00" />
+                <field name="UCC" value="+4.00000000000000E+00" />
+              </group>
+              <group index="1">
+                <field name="URR" value="+4.00000000000000E+00" />
+                <field name="URC" value="+0.00000000000000E+00" />
+                <field name="UCC" value="+4.00000000000000E+00" />
+              </group>
+              <group index="2">
+                <field name="URR" value="+4.00000000000000E+00" />
+                <field name="URC" value="+0.00000000000000E+00" />
+                <field name="UCC" value="+4.00000000000000E+00" />
+              </group>
+            </repeated>
+          </group>
+          <group index="1">
+            <repeated name="SAMPLE" number="3">
+              <group index="0">
+                <field name="URR" value="+4.00000000000000E+00" />
+                <field name="URC" value="+0.00000000000000E+00" />
+                <field name="UCC" value="+4.00000000000000E+00" />
+              </group>
+              <group index="1">
+                <field name="URR" value="+4.00000000000000E+00" />
+                <field name="URC" value="+0.00000000000000E+00" />
+                <field name="UCC" value="+4.00000000000000E+00" />
+              </group>
+              <group index="2">
+                <field name="URR" value="+4.00000000000000E+00" />
+                <field name="URC" value="+0.00000000000000E+00" />
+                <field name="UCC" value="+4.00000000000000E+00" />
+              </group>
+            </repeated>
+          </group>
+          <group index="2">
+            <repeated name="SAMPLE" number="3">
+              <group index="0">
+                <field name="URR" value="+4.00000000000000E+00" />
+                <field name="URC" value="+0.00000000000000E+00" />
+                <field name="UCC" value="+4.00000000000000E+00" />
+              </group>
+              <group index="1">
+                <field name="URR" value="+4.00000000000000E+00" />
+                <field name="URC" value="+0.00000000000000E+00" />
+                <field name="UCC" value="+4.00000000000000E+00" />
+              </group>
+              <group index="2">
+                <field name="URR" value="+4.00000000000000E+00" />
+                <field name="URC" value="+0.00000000000000E+00" />
+                <field name="UCC" value="+4.00000000000000E+00" />
+              </group>
+            </repeated>
+          </group>
+        </repeated>
+        <field name="LINE_SPDCF" value="09" />
+        <field name="SAMPLE_SPDCF" value="10" />
+        <field name="SPDC_FLAG" value="1" />
+        <field name="NUM_SPDCF" value="07" />
+        <repeated name="SPDCF" number="7">
+          <group index="0">
+            <field name="SPDCF_ID" value="01" />
+            <field name="SPDCF_P" value="01" />
+            <repeated name="CONSTITUENT" number="1">
+              <group index="0">
+                <field name="SPDCF_FAM" value="0" />
+                <field name="SPDCF_WEIGHT" value="1.000" />
+                <field name="FP_A" value="1.000000" />
+                <field name="FP_ALPHA" value="0.000000" />
+                <field name="FP_BETA" value="00.000000" />
+                <field name="FP_T" value="+1.00000000000000E+03" />
+              </group>
+            </repeated>
+          </group>
+          <group index="1">
+            <field name="SPDCF_ID" value="02" />
+            <field name="SPDCF_P" value="01" />
+            <repeated name="CONSTITUENT" number="1">
+              <group index="0">
+                <field name="SPDCF_FAM" value="0" />
+                <field name="SPDCF_WEIGHT" value="1.000" />
+                <field name="FP_A" value="1.000000" />
+                <field name="FP_ALPHA" value="0.000000" />
+                <field name="FP_BETA" value="00.000000" />
+                <field name="FP_T" value="+5.00000000000000E+02" />
+              </group>
+            </repeated>
+          </group>
+          <group index="2">
+            <field name="SPDCF_ID" value="03" />
+            <field name="SPDCF_P" value="01" />
+            <repeated name="CONSTITUENT" number="1">
+              <group index="0">
+                <field name="SPDCF_FAM" value="0" />
+                <field name="SPDCF_WEIGHT" value="1.000" />
+                <field name="FP_A" value="1.000000" />
+                <field name="FP_ALPHA" value="0.000000" />
+                <field name="FP_BETA" value="00.000000" />
+                <field name="FP_T" value="+5.00000000000000E+02" />
+              </group>
+            </repeated>
+          </group>
+          <group index="3">
+            <field name="SPDCF_ID" value="04" />
+            <field name="SPDCF_P" value="01" />
+            <repeated name="CONSTITUENT" number="1">
+              <group index="0">
+                <field name="SPDCF_FAM" value="0" />
+                <field name="SPDCF_WEIGHT" value="1.000" />
+                <field name="FP_A" value="1.000000" />
+                <field name="FP_ALPHA" value="0.000000" />
+                <field name="FP_BETA" value="00.000000" />
+                <field name="FP_T" value="+5.00000000000000E+02" />
+              </group>
+            </repeated>
+          </group>
+          <group index="4">
+            <field name="SPDCF_ID" value="05" />
+            <field name="SPDCF_P" value="01" />
+            <repeated name="CONSTITUENT" number="1">
+              <group index="0">
+                <field name="SPDCF_FAM" value="0" />
+                <field name="SPDCF_WEIGHT" value="1.000" />
+                <field name="FP_A" value="1.000000" />
+                <field name="FP_ALPHA" value="0.000000" />
+                <field name="FP_BETA" value="00.000000" />
+                <field name="FP_T" value="+5.00000000000000E+02" />
+              </group>
+            </repeated>
+          </group>
+          <group index="5">
+            <field name="SPDCF_ID" value="06" />
+            <field name="SPDCF_P" value="01" />
+            <repeated name="CONSTITUENT" number="1">
+              <group index="0">
+                <field name="SPDCF_FAM" value="0" />
+                <field name="SPDCF_WEIGHT" value="1.000" />
+                <field name="FP_A" value="1.000000" />
+                <field name="FP_ALPHA" value="0.000000" />
+                <field name="FP_BETA" value="00.000000" />
+                <field name="FP_T" value="+5.00000000000000E+02" />
+              </group>
+            </repeated>
+          </group>
+          <group index="6">
+            <field name="SPDCF_ID" value="07" />
+            <field name="SPDCF_P" value="01" />
+            <repeated name="CONSTITUENT" number="1">
+              <group index="0">
+                <field name="SPDCF_FAM" value="0" />
+                <field name="SPDCF_WEIGHT" value="1.000" />
+                <field name="FP_A" value="1.000000" />
+                <field name="FP_ALPHA" value="0.000000" />
+                <field name="FP_BETA" value="00.000000" />
+                <field name="FP_T" value="+1.00000000000000E+02" />
+              </group>
+            </repeated>
+          </group>
+        </repeated>
+        <field name="DIRECT_COVARIANCE_FLAG" value="0" />
+        <field name="RESERVED_LEN" value="000000000" />
+      </data_fields>
+    </field>
+  </des>
+</des_list>
+"""
+    assert data == expected_data
+
+
 ###############################################################################
 # Test parsing ILLUMB TRE (STDI-0002-1-v5.0 App AL)
 
@@ -5326,6 +5834,7 @@ def test_nitf_create_three_images_final_uncompressed():
     src_ds_8193.GetRasterBand(1).Fill(2)
 
     # Write first image segment, reserve space for two other ones and a DES
+    gdal.ErrorReset()
     ds = gdal.GetDriverByName("NITF").CreateCopy(
         "/vsimem/out.ntf", src_ds_2049, options=["NUMI=3", "NUMDES=1"]
     )
@@ -5723,6 +6232,22 @@ def test_nitf_metadata_validation_des():
     gdal.Unlink(filename)
 
 
+###############################################################################
+# Test CreateCopy() with IC=C8 compression and NPJE profiles with the JP2OpenJPEG driver
+
+
+def test_nitf_report_ABPP_as_NBITS(tmp_vsimem):
+
+    out_filename = str(tmp_vsimem / "tmp.ntf")
+    gdal.GetDriverByName("NITF").Create(
+        out_filename, 1, 1, 1, gdal.GDT_UInt16, options=["NBITS=9"]
+    )
+
+    ds = gdal.Open(out_filename)
+    assert ds.GetMetadataItem("NITF_ABPP") == "09"
+    assert ds.GetRasterBand(1).GetMetadataItem("NBITS", "IMAGE_STRUCTURE") == "9"
+
+
 ###############################################################################
 # Test NITF21_CGM_ANNO_Uncompressed_unmasked.ntf for bug #1313 and #1714
 
diff --git a/autotest/gdrivers/noaa_b.py b/autotest/gdrivers/noaa_b.py
index 9dda59e3981b..464bc69e3a41 100755
--- a/autotest/gdrivers/noaa_b.py
+++ b/autotest/gdrivers/noaa_b.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/nsidcbin.py b/autotest/gdrivers/nsidcbin.py
index 62a9192360b9..3818289f94be 100644
--- a/autotest/gdrivers/nsidcbin.py
+++ b/autotest/gdrivers/nsidcbin.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2022, Michael Sumner, <mdsumner at gmail dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import pytest
diff --git a/autotest/gdrivers/ntv2.py b/autotest/gdrivers/ntv2.py
index e0a119d3010f..fc98584b6d0a 100755
--- a/autotest/gdrivers/ntv2.py
+++ b/autotest/gdrivers/ntv2.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/nwt_grc.py b/autotest/gdrivers/nwt_grc.py
index 36d2e1013274..72f9d2aeb8f5 100755
--- a/autotest/gdrivers/nwt_grc.py
+++ b/autotest/gdrivers/nwt_grc.py
@@ -9,27 +9,14 @@
 ###############################################################################
 # Copyright (c) 2009, Chaitanya kumar CH, <chaitanya at osgeo dot in>
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
 import gdaltest
+import pytest
+
+pytestmark = pytest.mark.require_driver("NWT_GRC")
 
 ###############################################################################
 # Test a GRC dataset
diff --git a/autotest/gdrivers/nwt_grd.py b/autotest/gdrivers/nwt_grd.py
index 04d8ca300946..40e3cafae287 100755
--- a/autotest/gdrivers/nwt_grd.py
+++ b/autotest/gdrivers/nwt_grd.py
@@ -9,31 +9,18 @@
 ###############################################################################
 # Copyright (c) 2009, Chaitanya kumar CH, <chaitanya at osgeo dot in>
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import shutil
 
 import gdaltest
+import pytest
 
 from osgeo import gdal
 
+pytestmark = pytest.mark.require_driver("NWT_GRD")
+
 ###############################################################################
 # Test a GRD dataset with three bands + Z
 
@@ -51,6 +38,13 @@ def test_nwt_grd_1():
 
 
 def test_nwt_grd_2():
+
+    if (
+        gdal.GetDriverByName("NWT_GRD").GetMetadataItem(gdal.DMD_CREATIONDATATYPES)
+        is None
+    ):
+        pytest.skip("NWT_GRD driver has no write support due to missing MITAB driver")
+
     """
     Test writing a GRD via CreateCopy
     """
diff --git a/autotest/gdrivers/ogcapi.py b/autotest/gdrivers/ogcapi.py
index f12a239ec7ed..4edd36cbff41 100644
--- a/autotest/gdrivers/ogcapi.py
+++ b/autotest/gdrivers/ogcapi.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2023, Alessandro Pasotti <elpaso at itopen dot it>
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -211,6 +195,7 @@ def init():
 
 
 @pytest.mark.parametrize("remove_type_application_json", [False, True])
+@pytest.mark.require_driver("OAPIF")
 def test_ogr_ogcapi_features(remove_type_application_json):
 
     global global_remove_type_application_json
@@ -242,9 +227,6 @@ def test_ogr_ogcapi_features(remove_type_application_json):
         assert lyr is not None
 
         feat = lyr.GetNextFeature()
-        fdef = feat.GetDefnRef()
-        assert fdef.GetFieldDefn(0).GetName() == "feature::id"
-        assert fdef.GetFieldDefn(3).GetName() == "name"
 
         ogrtest.check_feature_geometry(
             feat,
@@ -346,19 +328,19 @@ def test_ogr_ogcapi_raster(api, collection, tmp_path):
     )
 
     assert ds is not None
+    if (api, collection) == ("COVERAGE", "SRTM"):
+        assert ds.GetRasterBand(1).DataType == gdal.GDT_Float32
 
     options = gdal.TranslateOptions(
         gdal.ParseCommandLine(
             f"-outsize 100 100 -oo API={api} -projwin -9.5377 53.5421 -9.0557 53.2953"
         )
     )
-    out_path = str(tmp_path / "lough_corrib.png")
+    out_path = str(tmp_path / "out.tif")
 
     gdal.Translate(out_path, ds, options=options)
 
-    control_image_path = os.path.join(
-        BASE_TEST_DATA_PATH, f"expected_map_lough_corrib_{api}.png"
-    )
+    control_image_path = os.path.join(BASE_TEST_DATA_PATH, f"expected_{api}.tif")
 
     # When recording also regenerate control images
     if RECORD:
@@ -385,7 +367,10 @@ def test_ogr_ogcapi_raster(api, collection, tmp_path):
 )
 def test_ogc_api_wrong_collection(api, of_type):
 
-    with pytest.raises(Exception, match="Invalid data collection"):
+    with pytest.raises(
+        Exception,
+        match=r"HTTP error code : 400, <h1>GNOSIS Map Server \(OGCAPI\) - 400 Bad Request</h1><h3>Invalid data collection</h3>",
+    ):
         gdal.OpenEx(
             f"OGCAPI:http://127.0.0.1:{gdaltest.webserver_port}/fakeogcapi/collections/NOT_EXISTS",
             of_type,
@@ -455,7 +440,7 @@ def test_ogc_api_raster_tiles():
 def test_ogc_api_raster_tiles_format(image_format, raster_count, statistics):
 
     ds = gdal.OpenEx(
-        f"OGCAPI:http://127.0.0.1:{gdaltest.webserver_port}/fakeogcapi/collections/blueMarble",
+        f"http://127.0.0.1:{gdaltest.webserver_port}/fakeogcapi/collections/blueMarble",
         gdal.OF_RASTER,
         open_options=[
             "API=TILES",
@@ -463,6 +448,7 @@ def test_ogc_api_raster_tiles_format(image_format, raster_count, statistics):
             "TILEMATRIXSET=WorldMercatorWGS84Quad",
             f"IMAGE_FORMAT={image_format}",
         ],
+        allowed_drivers=["OGCAPI"],
     )
 
     assert ds is not None
diff --git a/autotest/gdrivers/openfilegdb.py b/autotest/gdrivers/openfilegdb.py
index 8afb9187e293..3ebc614b98d5 100755
--- a/autotest/gdrivers/openfilegdb.py
+++ b/autotest/gdrivers/openfilegdb.py
@@ -8,23 +8,7 @@
 ###############################################################################
 # Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import struct
diff --git a/autotest/gdrivers/ozi.py b/autotest/gdrivers/ozi.py
index 800b261a9011..59af83a14160 100755
--- a/autotest/gdrivers/ozi.py
+++ b/autotest/gdrivers/ozi.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/paux.py b/autotest/gdrivers/paux.py
index 7dc07d911cc4..4f9f62647ee9 100755
--- a/autotest/gdrivers/paux.py
+++ b/autotest/gdrivers/paux.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/pcidsk.py b/autotest/gdrivers/pcidsk.py
index d8c7f24b168c..37a5524e8214 100755
--- a/autotest/gdrivers/pcidsk.py
+++ b/autotest/gdrivers/pcidsk.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2009-2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -60,6 +44,7 @@ def test_pcidsk_1():
 # Test lossless copying (16, multiband) via Create().
 
 
+@pytest.mark.require_driver("PNG")
 def test_pcidsk_2():
 
     tst = gdaltest.GDALTest("PCIDSK", "png/rgba16.png", 2, 2042)
@@ -222,6 +207,7 @@ def test_pcidsk_5(tmp_path):
 # Test FILE interleaving.
 
 
+@pytest.mark.require_driver("PNG")
 def test_pcidsk_8():
 
     tst = gdaltest.GDALTest(
@@ -284,6 +270,7 @@ def test_pcidsk_10():
 # Test INTERLEAVING=TILED interleaving.
 
 
+@pytest.mark.require_driver("PNG")
 def test_pcidsk_11():
 
     tst = gdaltest.GDALTest(
@@ -297,6 +284,7 @@ def test_pcidsk_11():
     tst.testCreate()
 
 
+@pytest.mark.require_driver("PNG")
 def test_pcidsk_11_v1():
 
     tst = gdaltest.GDALTest(
@@ -310,6 +298,7 @@ def test_pcidsk_11_v1():
     tst.testCreate()
 
 
+@pytest.mark.require_driver("PNG")
 def test_pcidsk_11_v2():
 
     tst = gdaltest.GDALTest(
@@ -327,6 +316,7 @@ def test_pcidsk_11_v2():
 # Test INTERLEAVING=TILED interleaving and COMPRESSION=RLE
 
 
+@pytest.mark.require_driver("PNG")
 def test_pcidsk_12():
 
     tst = gdaltest.GDALTest(
@@ -340,6 +330,7 @@ def test_pcidsk_12():
     tst.testCreate()
 
 
+@pytest.mark.require_driver("PNG")
 def test_pcidsk_12_v1():
 
     tst = gdaltest.GDALTest(
@@ -358,6 +349,7 @@ def test_pcidsk_12_v1():
     tst.testCreate()
 
 
+@pytest.mark.require_driver("PNG")
 def test_pcidsk_12_v2():
 
     tst = gdaltest.GDALTest(
@@ -518,6 +510,8 @@ def test_pcidsk_external_ovr_rrd():
     with gdaltest.config_option("USE_RRD", "YES"):
         ds.BuildOverviews("NEAR", [2])
     ds = None
+    if gdal.GetLastErrorMsg() == "This build does not support creating .aux overviews":
+        pytest.skip(gdal.GetLastErrorMsg())
     assert gdal.VSIStatL("/vsimem/test.aux") is not None
     ds = gdal.Open("/vsimem/test.pix")
     assert ds.GetRasterBand(1).GetOverviewCount() == 1
diff --git a/autotest/gdrivers/pcraster.py b/autotest/gdrivers/pcraster.py
index d711c2d7db7d..753c36854648 100755
--- a/autotest/gdrivers/pcraster.py
+++ b/autotest/gdrivers/pcraster.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/pdf.py b/autotest/gdrivers/pdf.py
index 7db4786de764..109f8acaaf3e 100755
--- a/autotest/gdrivers/pdf.py
+++ b/autotest/gdrivers/pdf.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2010-2019, Even Rouault <even.rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -374,12 +358,14 @@ def test_pdf_ogcbp(poppler_or_pdfium_or_podofo):
         tst = gdaltest.GDALTest(
             "PDF", "byte.tif", 1, None, options=["GEO_ENCODING=OGC_BP"]
         )
+        gdal.ErrorReset()
         tst.testCreateCopy(
             check_minmax=0,
             check_gt=1,
             check_srs=True,
             check_checksum_not_null=pdf_checksum_available(),
         )
+        assert gdal.GetLastErrorMsg() == ""
 
 
 ###############################################################################
@@ -1007,11 +993,19 @@ def _pdf_update_gcps(poppler_or_pdfium):
     gdaltest.pdf_drv.Delete(out_filename)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_pdf_update_gcps_iso32000(poppler_or_pdfium):
     gdal.SetConfigOption("GDAL_PDF_GEO_ENCODING", None)
     _pdf_update_gcps(poppler_or_pdfium)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_pdf_update_gcps_ogc_bp(poppler_or_pdfium):
     with gdal.config_option("GDAL_PDF_GEO_ENCODING", "OGC_BP"):
         _pdf_update_gcps(poppler_or_pdfium)
@@ -1021,6 +1015,10 @@ def test_pdf_update_gcps_ogc_bp(poppler_or_pdfium):
 # Check SetGCPs() but with GCPs that do *not* resolve to a geotransform
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_pdf_set_5_gcps_ogc_bp(poppler_or_pdfium):
     dpi = 300
     out_filename = "tmp/pdf_set_5_gcps_ogc_bp.pdf"
@@ -1246,6 +1244,10 @@ def test_pdf_set_neatline_ogc_bp(poppler_or_pdfium):
 # Check that we can generate identical file
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_pdf_check_identity_iso32000(poppler_or_pdfium):
     out_filename = "tmp/pdf_check_identity_iso32000.pdf"
 
@@ -1279,6 +1281,10 @@ def test_pdf_check_identity_iso32000(poppler_or_pdfium):
 # Check that we can generate identical file
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_pdf_check_identity_ogc_bp(poppler_or_pdfium):
     out_filename = "tmp/pdf_check_identity_ogc_bp.pdf"
 
@@ -1453,6 +1459,10 @@ def test_pdf_custom_layout(poppler_or_pdfium):
 # Test CLIPPING_EXTENT, EXTRA_RASTERS, EXTRA_RASTERS_LAYER_NAME, OFF_LAYERS, EXCLUSIVE_LAYERS options
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_pdf_extra_rasters(poppler_or_pdfium):
     subbyte = """<VRTDataset rasterXSize="10" rasterYSize="10">
   <SRS>PROJCS["NAD27 / UTM zone 11N",GEOGCS["NAD27",DATUM["North_American_Datum_1927",SPHEROID["Clarke 1866",6378206.4,294.9786982139006,AUTHORITY["EPSG","7008"]],AUTHORITY["EPSG","6267"]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433],AUTHORITY["EPSG","4267"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-117],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AUTHORITY["EPSG","26711"]]</SRS>
@@ -1719,6 +1729,10 @@ def test_pdf_jpeg_direct_copy(poppler_or_pdfium):
 # Test direct copy of source JPEG file within VRT file
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 @pytest.mark.require_driver("JPEG")
 def test_pdf_jpeg_in_vrt_direct_copy(poppler_or_pdfium):
 
diff --git a/autotest/gdrivers/pds.py b/autotest/gdrivers/pds.py
index e112c7d38a11..9bc9b5d40f37 100755
--- a/autotest/gdrivers/pds.py
+++ b/autotest/gdrivers/pds.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/pds4.py b/autotest/gdrivers/pds4.py
index 987eb65fa006..dcf31e28ca28 100755
--- a/autotest/gdrivers/pds4.py
+++ b/autotest/gdrivers/pds4.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2017, Hobu Inc
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import contextlib
@@ -1800,3 +1784,24 @@ def test_pds4_oblique_cylindrical_write():
     check_pds4_oblique_cylindrical(filename)
 
     gdal.GetDriverByName("PDS4").Delete(filename)
+
+
+###############################################################################
+
+
+def test_pds4_read_right_to_left(tmp_path):
+
+    numpy = pytest.importorskip("numpy")
+    pytest.importorskip("osgeo.gdal_array")
+
+    tmp_filename = str(tmp_path / "tmp.xml")
+    ref_ds = gdal.Open("data/byte.tif")
+    gdal.Translate(tmp_filename, ref_ds, format="PDS4")
+    xml_content = open(tmp_filename, "rt").read()
+    # Generate a fake Right to Left oriented image
+    open(tmp_filename, "wt").write(
+        xml_content.replace("Left to Right", "Right to Left")
+    )
+    ds = gdal.Open(tmp_filename)
+    # Test that we flip the image along the horizontal axis
+    assert numpy.all(ds.ReadAsArray()[::, ::-1] == ref_ds.ReadAsArray())
diff --git a/autotest/gdrivers/plmosaic.py b/autotest/gdrivers/plmosaic.py
index 774bd6a9fbea..3c7edb225155 100755
--- a/autotest/gdrivers/plmosaic.py
+++ b/autotest/gdrivers/plmosaic.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2015, Planet Labs
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import json
diff --git a/autotest/gdrivers/png.py b/autotest/gdrivers/png.py
index a80c76726f98..4136217e6e4f 100755
--- a/autotest/gdrivers/png.py
+++ b/autotest/gdrivers/png.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import array
diff --git a/autotest/gdrivers/pnm.py b/autotest/gdrivers/pnm.py
index 74aff3783bc1..c1119c8260bf 100755
--- a/autotest/gdrivers/pnm.py
+++ b/autotest/gdrivers/pnm.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/postgisraster.py b/autotest/gdrivers/postgisraster.py
index f00f9ce61954..ae8d53c2e244 100755
--- a/autotest/gdrivers/postgisraster.py
+++ b/autotest/gdrivers/postgisraster.py
@@ -12,23 +12,7 @@
 #               2012, David Zwarg <dzwarg@azavea.com>
 # Copyright (c) 2009-2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/prf.py b/autotest/gdrivers/prf.py
index 33e253f69879..310b60ba5257 100755
--- a/autotest/gdrivers/prf.py
+++ b/autotest/gdrivers/prf.py
@@ -5,23 +5,7 @@
 ###############################################################################
 # Copyright (c) 2016, Andrew Sudorgin
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
@@ -85,6 +69,10 @@ def test_prf_3():
     ds = None
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_prf_4():
 
     tst = gdaltest.GDALTest("prf", "./PRF/dem.x-dem", 1, 0)
diff --git a/autotest/gdrivers/r.py b/autotest/gdrivers/r.py
index 3ead1e41c668..831872ab2784 100755
--- a/autotest/gdrivers/r.py
+++ b/autotest/gdrivers/r.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2009, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/rasterlite.py b/autotest/gdrivers/rasterlite.py
index 11ea371aefcc..c9083dd72a93 100755
--- a/autotest/gdrivers/rasterlite.py
+++ b/autotest/gdrivers/rasterlite.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/rik.py b/autotest/gdrivers/rik.py
index 35dcb113b392..4e6d00ce89cf 100755
--- a/autotest/gdrivers/rik.py
+++ b/autotest/gdrivers/rik.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2009-2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/rl2.py b/autotest/gdrivers/rl2.py
index 9cf2f9cec6d2..b21743ee4036 100755
--- a/autotest/gdrivers/rl2.py
+++ b/autotest/gdrivers/rl2.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2016, Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/rmf.py b/autotest/gdrivers/rmf.py
index 0b8fc5e52976..ac73d5a85dcb 100755
--- a/autotest/gdrivers/rmf.py
+++ b/autotest/gdrivers/rmf.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2008, Andrey Kiselev <dron@ak4719.spb.edu>
 # Copyright (c) 2023, NextGIS <info@nextgis.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/roipac.py b/autotest/gdrivers/roipac.py
index 892a7c5769ac..29e5b925e60d 100755
--- a/autotest/gdrivers/roipac.py
+++ b/autotest/gdrivers/roipac.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2014, Matthieu Volat <matthieu.volat@ujf-grenoble.fr>
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/rpftoc.py b/autotest/gdrivers/rpftoc.py
index 635e57d71eef..b77d085a33a0 100755
--- a/autotest/gdrivers/rpftoc.py
+++ b/autotest/gdrivers/rpftoc.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2008-2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/rraster.py b/autotest/gdrivers/rraster.py
index c69638f06d85..87ecff82741e 100755
--- a/autotest/gdrivers/rraster.py
+++ b/autotest/gdrivers/rraster.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2016, Even Rouault, <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import pprint
diff --git a/autotest/gdrivers/rs2.py b/autotest/gdrivers/rs2.py
index fa42ea2eece1..965d75be7031 100755
--- a/autotest/gdrivers/rs2.py
+++ b/autotest/gdrivers/rs2.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/s102.py b/autotest/gdrivers/s102.py
index c704d230f68c..171f40cfa44a 100755
--- a/autotest/gdrivers/s102.py
+++ b/autotest/gdrivers/s102.py
@@ -10,26 +10,11 @@
 ###############################################################################
 # Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
+import shutil
 import struct
 
 import gdaltest
@@ -210,34 +195,40 @@ def test_s102_multidim():
 ###############################################################################
 
 
-def test_s102_QualityOfSurvey():
+@pytest.mark.parametrize(
+    "filename,quality_group_name",
+    [
+        ("data/s102/test_s102_v2.2_with_QualityOfSurvey.h5", "QualityOfSurvey"),
+        (
+            "data/s102/test_s102_v3.0_with_QualityOfBathymetryCoverage.h5",
+            "QualityOfBathymetryCoverage",
+        ),
+    ],
+)
+def test_s102_QualityOfSurvey(filename, quality_group_name):
 
-    ds = gdal.Open("data/s102/test_s102_v2.2_with_QualityOfSurvey.h5")
+    ds = gdal.Open(filename)
     assert ds.GetSubDatasets() == [
         (
-            'S102:"data/s102/test_s102_v2.2_with_QualityOfSurvey.h5":BathymetryCoverage',
+            f'S102:"{filename}":BathymetryCoverage',
             "Bathymetric gridded data",
         ),
         (
-            'S102:"data/s102/test_s102_v2.2_with_QualityOfSurvey.h5":QualityOfSurvey',
-            "Georeferenced metadata QualityOfSurvey",
+            f'S102:"{filename}":{quality_group_name}',
+            f"Georeferenced metadata {quality_group_name}",
         ),
     ]
 
     with pytest.raises(Exception, match="Unsupported subdataset component"):
-        gdal.Open('S102:"data/s102/test_s102_v2.2_with_QualityOfSurvey.h5":invalid')
+        gdal.Open(f'S102:"{filename}":invalid')
 
-    ds = gdal.Open(
-        'S102:"data/s102/test_s102_v2.2_with_QualityOfSurvey.h5":BathymetryCoverage'
-    )
+    ds = gdal.Open(f'S102:"{filename}":BathymetryCoverage')
     assert len(ds.GetSubDatasets()) == 0
     assert ds.RasterCount == 2
     assert ds.RasterXSize == 3
     assert ds.RasterYSize == 2
 
-    ds = gdal.Open(
-        'S102:"data/s102/test_s102_v2.2_with_QualityOfSurvey.h5":QualityOfSurvey'
-    )
+    ds = gdal.Open(f'S102:"{filename}":{quality_group_name}')
     assert len(ds.GetSubDatasets()) == 0
     assert ds.RasterCount == 1
     assert ds.RasterXSize == 3
@@ -277,7 +268,7 @@ def test_s102_QualityOfSurvey():
     assert rat.GetValueAsString(4, 2) == "e"
 
     ds = gdal.OpenEx(
-        'S102:"data/s102/test_s102_v2.2_with_QualityOfSurvey.h5":QualityOfSurvey',
+        f'S102:"{filename}":{quality_group_name}',
         open_options=["NORTH_UP=NO"],
     )
     assert ds.GetGeoTransform() == pytest.approx((1.8, 0.4, 0.0, 47.75, 0.0, 0.5))
@@ -310,3 +301,57 @@ def test_s102_QualityOfSurvey_multidim():
     x_data = struct.unpack("d" * x.GetDimensions()[0].GetSize(), x.Read())
     assert x_data[0] == 2.0
     assert x_data[-1] == 2.8
+
+
+###############################################################################
+# Test force opening
+
+
+def test_s102_force_opening():
+
+    drv = gdal.IdentifyDriverEx("data/hdf5/groups.h5", allowed_drivers=["S102"])
+    assert drv.GetDescription() == "S102"
+
+
+###############################################################################
+# Test force opening, but provided file is still not recognized (for good reasons)
+
+
+def test_s102_force_opening_no_match():
+
+    drv = gdal.IdentifyDriverEx("data/byte.tif", allowed_drivers=["S102"])
+    assert drv is None
+
+
+###############################################################################
+
+
+def test_s102_metadata_compute_stats_first(tmp_path):
+
+    out_filename = str(tmp_path / "out.h5")
+    shutil.copy("data/s102/test_s102_v2.1.h5", out_filename)
+    with gdal.Open(out_filename) as ds:
+        ds.GetRasterBand(1).ComputeStatistics(False)
+    with gdal.Open(out_filename) as ds:
+        assert ds.GetRasterBand(1).GetMetadataItem("STATISTICS_MINIMUM") is not None
+        ds.SetMetadataItem("foo", "bar")
+    with gdal.Open(out_filename) as ds:
+        assert ds.GetRasterBand(1).GetMetadataItem("STATISTICS_MINIMUM") is not None
+        assert ds.GetMetadataItem("foo") == "bar"
+
+
+###############################################################################
+
+
+def test_s102_metadata_compute_stats_after(tmp_path):
+
+    out_filename = str(tmp_path / "out.h5")
+    shutil.copy("data/s102/test_s102_v2.1.h5", out_filename)
+    with gdal.Open(out_filename) as ds:
+        ds.SetMetadataItem("foo", "bar")
+    with gdal.Open(out_filename) as ds:
+        assert ds.GetMetadataItem("foo") == "bar"
+        ds.GetRasterBand(1).ComputeStatistics(False)
+    with gdal.Open(out_filename) as ds:
+        assert ds.GetRasterBand(1).GetMetadataItem("STATISTICS_MINIMUM") is not None
+        assert ds.GetMetadataItem("foo") == "bar"
diff --git a/autotest/gdrivers/s104.py b/autotest/gdrivers/s104.py
index c9c2bb87c1b6..ca05884f2858 100755
--- a/autotest/gdrivers/s104.py
+++ b/autotest/gdrivers/s104.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/s111.py b/autotest/gdrivers/s111.py
index 2f45bacc9a2b..95d9e2dae3bd 100755
--- a/autotest/gdrivers/s111.py
+++ b/autotest/gdrivers/s111.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/safe.py b/autotest/gdrivers/safe.py
index d74a99f99f5b..df2656e19c30 100755
--- a/autotest/gdrivers/safe.py
+++ b/autotest/gdrivers/safe.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
@@ -46,6 +30,12 @@ def test_safe_1():
     tst = gdaltest.GDALTest("SAFE", "SAFE_FAKE/test.SAFE/manifest.safe", 1, 65372)
     tst.testOpen()
 
+    ds = gdal.Open("data/SAFE_FAKE/test.SAFE/manifest.safe")
+    assert (
+        ds.GetMetadataItem("FOOTPRINT")
+        == "POLYGON((-8.407759 38.130520,-11.335915 38.535374,-11.026125 40.036644,-8.035001 39.633217, -8.407759 38.130520))"
+    )
+
 
 def test_safe_2():
 
diff --git a/autotest/gdrivers/saga.py b/autotest/gdrivers/saga.py
index fbf21bf01df0..9e8811871d1f 100755
--- a/autotest/gdrivers/saga.py
+++ b/autotest/gdrivers/saga.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/sar_ceos.py b/autotest/gdrivers/sar_ceos.py
index 98656f16bbda..1f463ee77b72 100755
--- a/autotest/gdrivers/sar_ceos.py
+++ b/autotest/gdrivers/sar_ceos.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/sdts.py b/autotest/gdrivers/sdts.py
index b2714ffb504e..485613447c81 100755
--- a/autotest/gdrivers/sdts.py
+++ b/autotest/gdrivers/sdts.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2008, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/sentinel2.py b/autotest/gdrivers/sentinel2.py
index 63cbb9e6b836..e72ae4ba2d8c 100755
--- a/autotest/gdrivers/sentinel2.py
+++ b/autotest/gdrivers/sentinel2.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2015, Even Rouault, <even.rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -244,6 +228,9 @@ def test_sentinel2_l1c_2():
         pprint.pprint(got_md)
         pytest.fail()
 
+    assert band.GetMetadataItem("CENTRAL_WAVELENGTH_UM", "IMAGERY") == "0.665"
+    assert band.GetMetadataItem("FWHM_UM", "IMAGERY") == "0.030"
+
     assert band.GetColorInterpretation() == gdal.GCI_RedBand
 
     assert band.DataType == gdal.GDT_UInt16
@@ -252,7 +239,7 @@ def test_sentinel2_l1c_2():
 
     band = ds.GetRasterBand(4)
 
-    assert band.GetColorInterpretation() == gdal.GCI_Undefined
+    assert band.GetColorInterpretation() == gdal.GCI_NIRBand
 
     got_md = band.GetMetadata()
     expected_md = {
@@ -843,7 +830,7 @@ def test_sentinel2_l1c_tile_3():
 
     band = ds.GetRasterBand(4)
 
-    assert band.GetColorInterpretation() == gdal.GCI_Undefined
+    assert band.GetColorInterpretation() == gdal.GCI_NIRBand
 
     got_md = band.GetMetadata()
     expected_md = {
@@ -2618,7 +2605,7 @@ def test_sentinel2_l1c_safe_compact_2():
 
     band = ds.GetRasterBand(4)
 
-    assert band.GetColorInterpretation() == gdal.GCI_Undefined
+    assert band.GetColorInterpretation() == gdal.GCI_NIRBand
 
     got_md = band.GetMetadata()
     expected_md = {
@@ -2804,7 +2791,7 @@ def test_sentinel2_l1c_processing_baseline_5_09__1():
 
     band = ds.GetRasterBand(4)
 
-    assert band.GetColorInterpretation() == gdal.GCI_Undefined
+    assert band.GetColorInterpretation() == gdal.GCI_NIRBand
 
     got_md = band.GetMetadata()
     expected_md = {
@@ -2900,13 +2887,13 @@ def test_sentinel2_l1c_processing_baseline_5_09__2():
         pprint.pprint(got_md)
         pytest.fail()
 
-    assert band.GetColorInterpretation() == gdal.GCI_Undefined
+    assert band.GetColorInterpretation() == gdal.GCI_RedEdgeBand
 
     assert band.DataType == gdal.GDT_UInt16
 
     band = ds.GetRasterBand(4)
 
-    assert band.GetColorInterpretation() == gdal.GCI_Undefined
+    assert band.GetColorInterpretation() == gdal.GCI_NIRBand
 
     got_md = band.GetMetadata()
     expected_md = {
@@ -3035,7 +3022,7 @@ def test_sentinel2_l2a_processing_baseline_5_09__1():
 
     band = ds.GetRasterBand(4)
 
-    assert band.GetColorInterpretation() == gdal.GCI_Undefined
+    assert band.GetColorInterpretation() == gdal.GCI_NIRBand
 
     got_md = band.GetMetadata()
     expected_md = {
@@ -3158,13 +3145,13 @@ def test_sentinel2_l2a_processing_baseline_5_09__2():
         pprint.pprint(got_md)
         pytest.fail()
 
-    assert band.GetColorInterpretation() == gdal.GCI_Undefined
+    assert band.GetColorInterpretation() == gdal.GCI_RedEdgeBand
 
     assert band.DataType == gdal.GDT_UInt16
 
     band = ds.GetRasterBand(4)
 
-    assert band.GetColorInterpretation() == gdal.GCI_Undefined
+    assert band.GetColorInterpretation() == gdal.GCI_NIRBand
 
     got_md = band.GetMetadata()
     expected_md = {
diff --git a/autotest/gdrivers/sgi.py b/autotest/gdrivers/sgi.py
index d1ef04845cdb..3ec03db2f091 100755
--- a/autotest/gdrivers/sgi.py
+++ b/autotest/gdrivers/sgi.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/sigdem.py b/autotest/gdrivers/sigdem.py
index 1670399e2c6c..d491eb7fcfbf 100755
--- a/autotest/gdrivers/sigdem.py
+++ b/autotest/gdrivers/sigdem.py
@@ -10,27 +10,12 @@
 ###############################################################################
 # Copyright (c) 2018, Paul Austin <paul.austin@revolsys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
 import gdaltest
+import pytest
 
 ###############################################################################
 # Create simple copy and check.
@@ -49,6 +34,10 @@ def test_sigdem_copy_check_prj():
 # Verify writing files with non-square pixels.
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_sigdem_non_square():
 
     tst = gdaltest.GDALTest("SIGDEM", "sigdem/nonsquare_nad27_utm11.vrt", 1, 12481)
diff --git a/autotest/gdrivers/snap_tiff.py b/autotest/gdrivers/snap_tiff.py
new file mode 100755
index 000000000000..e8e54455d12c
--- /dev/null
+++ b/autotest/gdrivers/snap_tiff.py
@@ -0,0 +1,134 @@
+#!/usr/bin/env pytest
+# -*- coding: utf-8 -*-
+###############################################################################
+# Project:  GDAL/OGR Test Suite
+# Purpose:  SNAP_TIFF driver testing.
+# Author:   Even Rouault <even.rouault at spatialys.com>
+#
+###############################################################################
+# Copyright (c) 2024, Even Rouault <even.rouault at spatialys.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.
+###############################################################################
+
+import pytest
+
+from osgeo import gdal
+
+pytestmark = pytest.mark.require_driver("SNAP_TIFF")
+
+
+def test_snap_tiff():
+    ds = gdal.Open(
+        "/vsizip/vsizip/data/snap_tiff/S1A_IW_GRDH_1SDV_20171009T141532_20171009T141557_018737_01F9E2_E974_tnr_empty_truncated.tif.zip.zip"
+    )
+    assert ds.GetDriver().GetDescription() == "SNAP_TIFF"
+    assert ds.RasterXSize == 25548
+    assert ds.RasterYSize == 16716
+    assert ds.RasterCount == 1
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_Float32
+    assert ds.GetGCPCount() == 4
+    assert ds.GetGCPSpatialRef().GetAuthorityCode(None) == "4326"
+    gcps = ds.GetGCPs()
+    assert len(gcps) == 4
+    assert gcps[0].GCPPixel == 0.5
+    assert gcps[0].GCPLine == 0.5
+    assert gcps[0].GCPX == -121.18662152623274
+    assert gcps[0].GCPY == 39.655540466308594
+    assert gcps[3].GCPPixel == 25547.5
+    assert gcps[3].GCPLine == 16715.5
+    assert gcps[3].GCPX == -124.43485147116212
+    assert gcps[3].GCPY == 38.550738598352105
+    assert ds.GetRasterBand(1).GetNoDataValue() == 0
+    assert ds.GetRasterBand(1).GetDescription() == "Intensity_VV"
+    assert ds.GetRasterBand(1).GetUnitType() == "intensity"
+    assert ds.GetRasterBand(1).GetScale() == 1
+    assert ds.GetRasterBand(1).GetOffset() == 0
+    assert ds.GetMetadataDomainList() == [
+        "",
+        "DERIVED_SUBDATASETS",
+        "GEOLOCATION",
+        "SUBDATASETS",
+        "xml:DIMAP",
+    ]
+    assert ds.GetMetadata() == {
+        "IMAGE_DESCRIPTION": "S1A_IW_GRDH_1SDV_20171009T141532_20171009T141557_018737_01F9E2_E974_tnr"
+    }
+    assert (
+        ds.GetMetadataItem("IMAGE_DESCRIPTION")
+        == "S1A_IW_GRDH_1SDV_20171009T141532_20171009T141557_018737_01F9E2_E974_tnr"
+    )
+    assert ds.GetMetadata("GEOLOCATION") == {
+        "LINE_OFFSET": "0",
+        "LINE_STEP": "16.025886864813039",
+        "PIXEL_OFFSET": "0",
+        "PIXEL_STEP": "16.02697616060226",
+        "SRS": 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS '
+        '84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AXIS["Latitude",NORTH],AXIS["Longitude",EAST],AUTHORITY["EPSG","4326"]]',
+        "X_BAND": "1",
+        "X_DATASET": 'SNAP_TIFF:"/vsizip/vsizip/data/snap_tiff/S1A_IW_GRDH_1SDV_20171009T141532_20171009T141557_018737_01F9E2_E974_tnr_empty_truncated.tif.zip.zip":GEOLOCATION',
+        "Y_BAND": "2",
+        "Y_DATASET": 'SNAP_TIFF:"/vsizip/vsizip/data/snap_tiff/S1A_IW_GRDH_1SDV_20171009T141532_20171009T141557_018737_01F9E2_E974_tnr_empty_truncated.tif.zip.zip":GEOLOCATION',
+    }
+    assert ds.GetMetadataItem("LINE_OFFSET", "GEOLOCATION") == "0"
+    assert ds.GetMetadata("SUBDATASETS") == {
+        "SUBDATASET_1_DESC": "Main content of "
+        "/vsizip/vsizip/data/snap_tiff/S1A_IW_GRDH_1SDV_20171009T141532_20171009T141557_018737_01F9E2_E974_tnr_empty_truncated.tif.zip.zip",
+        "SUBDATASET_1_NAME": 'SNAP_TIFF:"/vsizip/vsizip/data/snap_tiff/S1A_IW_GRDH_1SDV_20171009T141532_20171009T141557_018737_01F9E2_E974_tnr_empty_truncated.tif.zip.zip":MAIN',
+        "SUBDATASET_2_DESC": "Geolocation array of "
+        "/vsizip/vsizip/data/snap_tiff/S1A_IW_GRDH_1SDV_20171009T141532_20171009T141557_018737_01F9E2_E974_tnr_empty_truncated.tif.zip.zip",
+        "SUBDATASET_2_NAME": 'SNAP_TIFF:"/vsizip/vsizip/data/snap_tiff/S1A_IW_GRDH_1SDV_20171009T141532_20171009T141557_018737_01F9E2_E974_tnr_empty_truncated.tif.zip.zip":GEOLOCATION',
+    }
+    assert ds.GetMetadata("xml:DIMAP")[0].startswith("<?xml")
+
+    subds = gdal.Open(ds.GetMetadataItem("SUBDATASET_1_NAME", "SUBDATASETS"))
+    assert subds.RasterXSize == ds.RasterXSize
+
+    subds = gdal.Open(ds.GetMetadataItem("SUBDATASET_2_NAME", "SUBDATASETS"))
+    assert subds.RasterXSize == 1595
+    assert subds.RasterYSize == 1044
+    assert subds.RasterCount == 2
+    assert subds.GetRasterBand(1).DataType == gdal.GDT_Float64
+    assert subds.GetMetadata("SUBDATASETS") == {}
+    subds.GetRasterBand(1).SetNoDataValue(0)
+    assert subds.GetRasterBand(1).ComputeRasterMinMax() == (
+        -124.43485147116212,
+        -121.18662152623274,
+    )
+    subds.GetRasterBand(2).SetNoDataValue(0)
+    assert subds.GetRasterBand(2).ComputeRasterMinMax() == (
+        38.15253672014443,
+        40.05228536834884,
+    )
+    with gdal.quiet_errors():
+        subds.Close()
+
+    with pytest.raises(Exception):
+        gdal.Open("SNAP_TIFF:")
+
+    with pytest.raises(Exception):
+        gdal.Open("SNAP_TIFF:data/byte.tif:MAIN")
+
+    with pytest.raises(Exception):
+        gdal.Open("SNAP_TIFF:data/non_existing.tif:MAIN")
+
+    with pytest.raises(Exception):
+        gdal.Open(
+            "SNAP_TIFF:/vsizip/vsizip/data/snap_tiff/S1A_IW_GRDH_1SDV_20171009T141532_20171009T141557_018737_01F9E2_E974_tnr_empty_truncated.tif.zip.zip:INVALID"
+        )
diff --git a/autotest/gdrivers/snodas.py b/autotest/gdrivers/snodas.py
index dc17d6d17b4c..115d6c13153b 100755
--- a/autotest/gdrivers/snodas.py
+++ b/autotest/gdrivers/snodas.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/srp.py b/autotest/gdrivers/srp.py
index 1def42f714cd..bf186bb169d4 100755
--- a/autotest/gdrivers/srp.py
+++ b/autotest/gdrivers/srp.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2012-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/srtmhgt.py b/autotest/gdrivers/srtmhgt.py
index 2e29d1e73c43..06eae960314c 100755
--- a/autotest/gdrivers/srtmhgt.py
+++ b/autotest/gdrivers/srtmhgt.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2008-2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import struct
@@ -191,3 +175,42 @@ def test_srtmhgt_hgts():
 
     assert min_ == 1.25
     assert max_ == 1.25
+
+
+###############################################################################
+# Test reading files of all supported sizes
+
+
+@pytest.mark.parametrize(
+    "width,height,nb_bytes",
+    [
+        (1201, 1201, 2),
+        (1801, 3601, 2),
+        (3601, 3601, 1),
+        (3601, 3601, 2),
+        (3601, 3601, 4),
+        (7201, 7201, 2),
+    ],
+)
+def test_srtmhgt_all_supported_sizes(tmp_vsimem, width, height, nb_bytes):
+
+    filename = str(tmp_vsimem / "n00e000.hgt")
+    f = gdal.VSIFOpenL(filename, "wb")
+    if f is None:
+        pytest.skip()
+    gdal.VSIFTruncateL(f, width * height * nb_bytes)
+    gdal.VSIFCloseL(f)
+
+    ds = gdal.Open(filename)
+    assert ds is not None
+    assert ds.GetGeoTransform()[1] == pytest.approx(1.0 / (width - 1), rel=1e-8)
+    assert ds.GetRasterBand(1).DataType == (
+        gdal.GDT_Byte
+        if nb_bytes == 1
+        else gdal.GDT_Int16
+        if nb_bytes == 2
+        else gdal.GDT_Float32
+    )
+
+    out_filename = str(tmp_vsimem / "create" / "n00e000.hgt")
+    gdal.GetDriverByName("SRTMHGT").CreateCopy(out_filename, ds)
diff --git a/autotest/gdrivers/stacit.py b/autotest/gdrivers/stacit.py
index 6b0da1308bf3..8c14463ae675 100755
--- a/autotest/gdrivers/stacit.py
+++ b/autotest/gdrivers/stacit.py
@@ -9,26 +9,14 @@
 ###############################################################################
 # Copyright (c) 2021, Even Rouault <even.rouault@spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
+import json
+
+import gdaltest
 import pytest
+import webserver
 
 from osgeo import gdal
 
@@ -39,6 +27,7 @@ def test_stacit_basic():
 
     ds = gdal.Open("data/stacit/test.json")
     assert ds is not None
+    assert ds.GetDriver().GetDescription() == "STACIT"
     assert ds.RasterCount == 1
     assert ds.RasterXSize == 40
     assert ds.RasterYSize == 20
@@ -157,7 +146,7 @@ def test_stacit_overlapping_sources():
     # Check that the source covered by another one is not listed
     vrt = ds.GetMetadata("xml:VRT")[0]
     only_one_simple_source = """
-    <ColorInterp>Gray</ColorInterp>
+    <ColorInterp>Coastal</ColorInterp>
     <SimpleSource>
       <SourceFilename relativeToVRT="0">data/byte.tif</SourceFilename>
       <SourceBand>1</SourceBand>
@@ -241,3 +230,135 @@ def test_stacit_overlapping_sources_with_nodata():
     vrt = ds.GetMetadata("xml:VRT")[0]
     assert len(ds.GetFileList()) == 3
     assert two_sources in vrt
+
+
+# Launch a single webserver in a module-scoped fixture.
+@pytest.fixture(scope="module")
+def webserver_launch():
+
+    process, port = webserver.launch(handler=webserver.DispatcherHttpHandler)
+
+    yield process, port
+
+    webserver.server_stop(process, port)
+
+
+@pytest.fixture(scope="function")
+def webserver_port(webserver_launch):
+
+    webserver_process, webserver_port = webserver_launch
+
+    if webserver_port == 0:
+        pytest.skip()
+    yield webserver_port
+
+
+@pytest.mark.require_curl
+def test_stacit_post_paging(tmp_vsimem, webserver_port):
+
+    initial_doc = {
+        "type": "FeatureCollection",
+        "stac_version": "1.0.0-beta.2",
+        "stac_extensions": [],
+        "features": json.loads(open("data/stacit/test.json", "rb").read())["features"],
+        "links": [
+            {
+                "rel": "next",
+                "href": f"http://localhost:{webserver_port}/request",
+                "method": "POST",
+                "body": {"token": "page_2"},
+                "headers": {"foo": "bar"},
+            }
+        ],
+    }
+
+    filename = str(tmp_vsimem / "tmp.json")
+    gdal.FileFromMemBuffer(filename, json.dumps(initial_doc))
+
+    next_page_doc = {
+        "type": "FeatureCollection",
+        "stac_version": "1.0.0-beta.2",
+        "stac_extensions": [],
+        "features": json.loads(open("data/stacit/test_page2.json", "rb").read())[
+            "features"
+        ],
+    }
+
+    handler = webserver.SequentialHandler()
+    handler.add(
+        "POST",
+        "/request",
+        200,
+        {"Content-type": "application/json"},
+        json.dumps(next_page_doc),
+        expected_headers={"Content-Type": "application/json", "foo": "bar"},
+        expected_body=b'{\n  "token":"page_2"\n}',
+    )
+    with webserver.install_http_handler(handler):
+        ds = gdal.Open(filename)
+    assert ds is not None
+    assert ds.RasterCount == 1
+    assert ds.RasterXSize == 40
+    assert ds.RasterYSize == 20
+    assert ds.GetSpatialRef().GetName() == "NAD27 / UTM zone 11N"
+    assert ds.GetGeoTransform() == pytest.approx(
+        [440720.0, 60.0, 0.0, 3751320.0, 0.0, -60.0], rel=1e-8
+    )
+
+
+###############################################################################
+# Test force opening a STACIT file
+
+
+def test_stacit_force_opening(tmp_vsimem):
+
+    filename = str(tmp_vsimem / "test.foo")
+
+    with open("data/stacit/test.json", "rb") as fsrc:
+        with gdaltest.vsi_open(filename, "wb") as fdest:
+            fdest.write(fsrc.read(1))
+            fdest.write(b" " * (1000 * 1000))
+            fdest.write(fsrc.read())
+
+    with pytest.raises(Exception):
+        gdal.OpenEx(filename)
+
+    ds = gdal.OpenEx(filename, allowed_drivers=["STACIT"])
+    assert ds.GetDriver().GetDescription() == "STACIT"
+
+
+###############################################################################
+# Test force opening a URL as STACIT
+
+
+def test_stacit_force_opening_url():
+
+    drv = gdal.IdentifyDriverEx("http://example.com", allowed_drivers=["STACIT"])
+    assert drv.GetDescription() == "STACIT"
+
+
+###############################################################################
+# Test force opening, but provided file is still not recognized (for good reasons)
+
+
+def test_stacit_force_opening_no_match():
+
+    drv = gdal.IdentifyDriverEx("data/byte.tif", allowed_drivers=["STACIT"])
+    assert drv is None
+
+
+###############################################################################
+# Test opening a top-level Feature
+
+
+def test_stacit_single_feature(tmp_vsimem):
+
+    j = json.loads(open("data/stacit/test.json", "rb").read())
+    j = j["features"][0]
+
+    filename = str(tmp_vsimem / "feature.json")
+    with gdaltest.tempfile(filename, json.dumps(j)):
+        ds = gdal.Open(filename)
+        assert ds is not None
+        assert ds.RasterXSize == 20
+        assert ds.GetRasterBand(1).Checksum() == 4672
diff --git a/autotest/gdrivers/stacta.py b/autotest/gdrivers/stacta.py
index f0452ffb31ed..7bce7f6e5054 100755
--- a/autotest/gdrivers/stacta.py
+++ b/autotest/gdrivers/stacta.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2020, Even Rouault <even.rouault@spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import copy
@@ -398,3 +382,47 @@ def test_stacta_with_raster_extension_errors():
     with gdaltest.tempfile("/vsimem/test.json", json.dumps(j)):
         with gdal.quiet_errors():
             assert gdal.Open("/vsimem/test.json") is not None
+
+
+###############################################################################
+# Test force opening a STACTA file
+
+
+def test_stacta_force_opening(tmp_vsimem):
+
+    filename = str(tmp_vsimem / "test.foo")
+
+    with open("data/stacta/test.json", "rb") as fsrc:
+        with gdaltest.vsi_open(filename, "wb") as fdest:
+            fdest.write(fsrc.read(1))
+            fdest.write(b" " * (1000 * 1000))
+            fdest.write(fsrc.read())
+
+    with pytest.raises(Exception):
+        gdal.OpenEx(filename)
+
+    with gdaltest.vsi_open(tmp_vsimem / "WorldCRS84Quad/0/0/0.tif", "wb") as fdest:
+        fdest.write(open("data/stacta/WorldCRS84Quad/0/0/0.tif", "rb").read())
+
+    ds = gdal.OpenEx(filename, allowed_drivers=["STACTA"])
+    assert ds.GetDriver().GetDescription() == "STACTA"
+
+
+###############################################################################
+# Test force opening a URL as STACTA
+
+
+def test_stacta_force_opening_url():
+
+    drv = gdal.IdentifyDriverEx("http://example.com", allowed_drivers=["STACTA"])
+    assert drv.GetDescription() == "STACTA"
+
+
+###############################################################################
+# Test force opening, but provided file is still not recognized (for good reasons)
+
+
+def test_stacta_force_opening_no_match():
+
+    drv = gdal.IdentifyDriverEx("data/byte.tif", allowed_drivers=["STACTA"])
+    assert drv is None
diff --git a/autotest/gdrivers/terragen.py b/autotest/gdrivers/terragen.py
index c49ce7a91d97..dfb4eb9162a1 100755
--- a/autotest/gdrivers/terragen.py
+++ b/autotest/gdrivers/terragen.py
@@ -8,23 +8,7 @@
 ###############################################################################
 # Copyright (c) 2017, Even Rouault, <even.rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/test_validate_jp2.py b/autotest/gdrivers/test_validate_jp2.py
index ad3d7e7c22cc..b652701feda7 100755
--- a/autotest/gdrivers/test_validate_jp2.py
+++ b/autotest/gdrivers/test_validate_jp2.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2015, European Union (European Environment Agency)
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -114,6 +98,10 @@ def validate(filename, inspire_tg=True, expected_gmljp2=True, oidoc=None):
 # Highly corrupted file
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_validate_jp2_2():
 
     import build_jp2_from_xml
@@ -284,6 +272,10 @@ def test_validate_jp2_4():
 # Also a RGN marker
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_validate_jp2_5():
 
     import build_jp2_from_xml
diff --git a/autotest/gdrivers/tga.py b/autotest/gdrivers/tga.py
index ec841ca06c95..b09dfdd5f4e9 100644
--- a/autotest/gdrivers/tga.py
+++ b/autotest/gdrivers/tga.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2020, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import pytest
diff --git a/autotest/gdrivers/til.py b/autotest/gdrivers/til.py
index f1025e9519ab..8c7fe3b2407b 100755
--- a/autotest/gdrivers/til.py
+++ b/autotest/gdrivers/til.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/tiledb_multidim.py b/autotest/gdrivers/tiledb_multidim.py
index 7b3b87f7da1c..738ad873d0a9 100755
--- a/autotest/gdrivers/tiledb_multidim.py
+++ b/autotest/gdrivers/tiledb_multidim.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2023, TileDB, Inc
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import array
diff --git a/autotest/gdrivers/tiledb_read.py b/autotest/gdrivers/tiledb_read.py
index 64724a87d8d9..13f11e010777 100755
--- a/autotest/gdrivers/tiledb_read.py
+++ b/autotest/gdrivers/tiledb_read.py
@@ -10,30 +10,26 @@
 ###############################################################################
 # Copyright (c) 2019, TileDB, Inc
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
 import pytest
 
+from osgeo import gdal
+
+pytestmark = pytest.mark.require_driver("TileDB")
+
 
-@pytest.mark.require_driver("TileDB")
 def test_tiledb_open():
     ut = gdaltest.GDALTest("TileDB", "tiledb_array", 1, 4857)
     ut.testOpen()
+
+
+###############################################################################
+
+
+def test_tiledb_force_identify():
+
+    drv = gdal.IdentifyDriverEx("data/tiledb_array", allowed_drivers=["TileDB"])
+    assert drv is not None
diff --git a/autotest/gdrivers/tiledb_write.py b/autotest/gdrivers/tiledb_write.py
index 8fc07d0e5f6f..31107fd4b0c8 100755
--- a/autotest/gdrivers/tiledb_write.py
+++ b/autotest/gdrivers/tiledb_write.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2019, TileDB, Inc
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import math
diff --git a/autotest/gdrivers/usgsdem.py b/autotest/gdrivers/usgsdem.py
index 554c4e12d978..72737b7b5852 100755
--- a/autotest/gdrivers/usgsdem.py
+++ b/autotest/gdrivers/usgsdem.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2008-2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/vicar.py b/autotest/gdrivers/vicar.py
index 1df52fd84912..0ed10e2d1ad8 100755
--- a/autotest/gdrivers/vicar.py
+++ b/autotest/gdrivers/vicar.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import json
@@ -560,3 +544,8 @@ def test_vicar_open_from_pds3():
     assert ds
     assert ds.GetDriver().ShortName == "VICAR"
     assert struct.unpack("B", ds.GetRasterBand(1).ReadRaster())[0] == ord("x")
+
+    ds = gdal.OpenEx("/vsimem/test", allowed_drivers=["VICAR"])
+    assert ds
+    assert ds.GetDriver().ShortName == "VICAR"
+    assert struct.unpack("B", ds.GetRasterBand(1).ReadRaster())[0] == ord("x")
diff --git a/autotest/gdrivers/vrtderived.py b/autotest/gdrivers/vrtderived.py
index b5fd42965881..a5b5a39368ac 100755
--- a/autotest/gdrivers/vrtderived.py
+++ b/autotest/gdrivers/vrtderived.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2011, Antonio Valentino
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -37,6 +21,10 @@
 
 from osgeo import gdal
 
+pytestmark = pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 
 ###############################################################################
 @pytest.fixture(autouse=True, scope="module")
diff --git a/autotest/gdrivers/vrtfilt.py b/autotest/gdrivers/vrtfilt.py
index 706e69085efe..fa1d9879936d 100755
--- a/autotest/gdrivers/vrtfilt.py
+++ b/autotest/gdrivers/vrtfilt.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2008-2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
@@ -34,6 +18,11 @@
 
 from osgeo import gdal
 
+pytestmark = pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
+
 ###############################################################################
 # Verify simple 3x3 averaging filter.
 
@@ -238,3 +227,27 @@ def test_vrtfilt_invalid_kernel_size():
 
     with pytest.raises(Exception):
         vrt_ds.GetRasterBand(1).SetMetadata(md, "vrt_sources")
+
+
+###############################################################################
+
+
+def test_vrtfilt_serialize_separatable_kernel():
+
+    vrt_ds = gdal.GetDriverByName("VRT").Create("", 1, 1, 1)
+
+    filterSourceXML = """<KernelFilteredSource>
+      <SourceFilename relativeToVRT="0">data/rgbsmall.tif</SourceFilename>
+      <SourceBand>1</SourceBand>
+      <Kernel normalized="0">
+        <Size>3</Size>
+        <Coefs>1 1 1</Coefs>
+      </Kernel>
+    </KernelFilteredSource>"""
+
+    md = {}
+    md["source_0"] = filterSourceXML
+
+    vrt_ds.GetRasterBand(1).SetMetadata(md, "vrt_sources")
+
+    assert filterSourceXML in vrt_ds.GetMetadata("xml:VRT")[0]
diff --git a/autotest/gdrivers/vrtlut.py b/autotest/gdrivers/vrtlut.py
index 060aec9e5664..ce7f80fed916 100755
--- a/autotest/gdrivers/vrtlut.py
+++ b/autotest/gdrivers/vrtlut.py
@@ -9,27 +9,20 @@
 ###############################################################################
 # Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
+import struct
 
 import gdaltest
+import pytest
+
+from osgeo import gdal
+
+pytestmark = pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 
 ###############################################################################
 # Simple test
@@ -39,3 +32,13 @@ def test_vrtlut_1():
 
     tst = gdaltest.GDALTest("VRT", "vrt/byte_lut.vrt", 1, 4655)
     tst.testOpen()
+
+
+###############################################################################
+
+
+@pytest.mark.require_driver("AAIGRID")
+def test_vrtlut_with_nan():
+
+    ds = gdal.Open("data/vrt/lut_with_nan.vrt")
+    assert struct.unpack("B" * 2 * 3, ds.ReadRaster()) == (0, 10, 10, 15, 20, 20)
diff --git a/autotest/gdrivers/vrtmask.py b/autotest/gdrivers/vrtmask.py
index 13b3822176d9..3a5b7cfc8101 100755
--- a/autotest/gdrivers/vrtmask.py
+++ b/autotest/gdrivers/vrtmask.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -36,6 +20,11 @@
 
 from osgeo import gdal
 
+pytestmark = pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
+
 ###############################################################################
 # Test with a global dataset mask band
 
diff --git a/autotest/gdrivers/vrtmultidim.py b/autotest/gdrivers/vrtmultidim.py
index 1c701a6b0b54..b05271c1b18f 100755
--- a/autotest/gdrivers/vrtmultidim.py
+++ b/autotest/gdrivers/vrtmultidim.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2019, Even Rouault <even.rouault@spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import math
@@ -36,6 +20,10 @@
 
 from osgeo import gdal, osr
 
+pytestmark = pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 
 ###############################################################################
 @pytest.fixture(autouse=True, scope="module")
diff --git a/autotest/gdrivers/vrtovr.py b/autotest/gdrivers/vrtovr.py
index da56dc867369..89382fd65bf7 100755
--- a/autotest/gdrivers/vrtovr.py
+++ b/autotest/gdrivers/vrtovr.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2010, 2020, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import struct
@@ -35,6 +19,11 @@
 
 from osgeo import gdal
 
+pytestmark = pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
+
 ###############################################################################
 # Simple test
 
diff --git a/autotest/gdrivers/vrtpansharpen.py b/autotest/gdrivers/vrtpansharpen.py
index e3ba9af028d4..6df41becf6c4 100755
--- a/autotest/gdrivers/vrtpansharpen.py
+++ b/autotest/gdrivers/vrtpansharpen.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2015, Even Rouault <even.rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import shutil
@@ -36,6 +20,11 @@
 
 from osgeo import gdal
 
+pytestmark = pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
+
 
 @pytest.fixture(autouse=True, scope="module")
 def startup_and_cleanup():
diff --git a/autotest/gdrivers/vrtprocesseddataset.py b/autotest/gdrivers/vrtprocesseddataset.py
index 1c353d170732..eea8907b0ced 100755
--- a/autotest/gdrivers/vrtprocesseddataset.py
+++ b/autotest/gdrivers/vrtprocesseddataset.py
@@ -7,23 +7,7 @@
 ###############################################################################
 # Copyright (c) 2024, Even Rouault <even.rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
@@ -31,6 +15,11 @@
 
 from osgeo import gdal
 
+pytestmark = pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
+
 np = pytest.importorskip("numpy")
 pytest.importorskip("osgeo.gdal_array")
 
@@ -676,19 +665,20 @@ def test_vrtprocesseddataset_dehazing_different_resolution(tmp_vsimem):
     src_ds.GetRasterBand(1).WriteArray(
         np.array([[1, 1, 2, 2, 3, 3], [1, 1, 2, 2, 3, 3]])
     )
-    src_ds.SetGeoTransform([0, 0.5, 0, 0, 0, 0.5])
+    src_ds.SetGeoTransform([0, 0.5 * 10, 0, 0, 0, 0.5 * 10])
+    src_ds.BuildOverviews("NEAR", [2])
     src_ds.Close()
 
     gain_filename = str(tmp_vsimem / "gain.tif")
     gain_ds = gdal.GetDriverByName("GTiff").Create(gain_filename, 3, 1, 1)
     gain_ds.GetRasterBand(1).WriteArray(np.array([[2, 4, 6]]))
-    gain_ds.SetGeoTransform([0, 1, 0, 0, 0, 1])
+    gain_ds.SetGeoTransform([0, 1 * 10, 0, 0, 0, 1 * 10])
     gain_ds.Close()
 
     offset_filename = str(tmp_vsimem / "offset.tif")
     offset_ds = gdal.GetDriverByName("GTiff").Create(offset_filename, 3, 1, 1)
     offset_ds.GetRasterBand(1).WriteArray(np.array([[1, 2, 3]]))
-    offset_ds.SetGeoTransform([0, 1, 0, 0, 0, 1])
+    offset_ds.SetGeoTransform([0, 1 * 10, 0, 0, 0, 1 * 10])
     offset_ds.Close()
 
     ds = gdal.Open(
@@ -712,6 +702,62 @@ def test_vrtprocesseddataset_dehazing_different_resolution(tmp_vsimem):
         ds.GetRasterBand(1).ReadAsArray(),
         np.array([[1, 2, 6, 8, 15, 15], [1, 2, 6, 8, 15, 15]]),
     )
+    np.testing.assert_equal(
+        ds.GetRasterBand(1).GetOverview(0).ReadAsArray(),
+        np.array([[1, 6, 15]]),
+    )
+
+
+###############################################################################
+# Test we properly request auxiliary datasets on the right-most/bottom-most
+# truncated tile
+
+
+def test_vrtprocesseddataset_dehazing_edge_effects(tmp_vsimem):
+
+    src_filename = str(tmp_vsimem / "src.tif")
+    src_ds = gdal.GetDriverByName("GTiff").Create(
+        src_filename,
+        257,
+        257,
+        1,
+        gdal.GDT_Byte,
+        ["TILED=YES", "BLOCKXSIZE=256", "BLOCKYSIZE=256"],
+    )
+    src_ds.GetRasterBand(1).Fill(10)
+    src_ds.SetGeoTransform([0, 1, 0, 0, 0, -1])
+    src_ds.Close()
+
+    gain_filename = str(tmp_vsimem / "gain.tif")
+    gain_ds = gdal.GetDriverByName("GTiff").Create(gain_filename, 1, 1)
+    gain_ds.GetRasterBand(1).Fill(2)
+    gain_ds.SetGeoTransform([0, 257, 0, 0, 0, -257])
+    gain_ds.Close()
+
+    offset_filename = str(tmp_vsimem / "offset.tif")
+    offset_ds = gdal.GetDriverByName("GTiff").Create(offset_filename, 1, 1)
+    offset_ds.GetRasterBand(1).Fill(3)
+    offset_ds.SetGeoTransform([0, 257, 0, 0, 0, -257])
+    offset_ds.Close()
+
+    ds = gdal.Open(
+        f"""<VRTDataset subclass='VRTProcessedDataset'>
+    <Input>
+        <SourceFilename>{src_filename}</SourceFilename>
+    </Input>
+    <ProcessingSteps>
+        <Step>
+            <Algorithm>LocalScaleOffset</Algorithm>
+            <Argument name="gain_dataset_filename_1">{gain_filename}</Argument>
+            <Argument name="gain_dataset_band_1">1</Argument>
+            <Argument name="offset_dataset_filename_1">{offset_filename}</Argument>
+            <Argument name="offset_dataset_band_1">1</Argument>
+        </Step>
+    </ProcessingSteps>
+    </VRTDataset>
+        """
+    )
+    assert ds.GetRasterBand(1).ComputeRasterMinMax() == (17, 17)
 
 
 ###############################################################################
@@ -1181,7 +1227,7 @@ def test_vrtprocesseddataset_serialize(tmp_vsimem):
     with gdaltest.tempfile(vrt_filename, content):
         ds = gdal.Open(vrt_filename)
         np.testing.assert_equal(ds.GetRasterBand(1).ReadAsArray(), np.array([[11, 12]]))
-        assert ds.GetRasterBand(1).GetStatistics(False, False) == [0.0, 0.0, 0.0, -1.0]
+        assert ds.GetRasterBand(1).GetStatistics(False, False) is None
         ds.GetRasterBand(1).ComputeStatistics(False)
         ds.Close()
 
diff --git a/autotest/gdrivers/vrtrawlink.py b/autotest/gdrivers/vrtrawlink.py
index 1f4203fc2874..a8d1d226b05f 100755
--- a/autotest/gdrivers/vrtrawlink.py
+++ b/autotest/gdrivers/vrtrawlink.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -37,6 +21,11 @@
 
 from osgeo import gdal
 
+pytestmark = pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
+
 
 def _xmlsearch(root, nodetype, name):
     for node in root[2:]:
diff --git a/autotest/gdrivers/vrtwarp.py b/autotest/gdrivers/vrtwarp.py
index 3f37e1d0a6c1..41f5b1c26cc0 100755
--- a/autotest/gdrivers/vrtwarp.py
+++ b/autotest/gdrivers/vrtwarp.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -38,6 +22,11 @@
 
 from osgeo import gdal
 
+pytestmark = pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
+
 ###############################################################################
 # Verify reading from simple existing warp definition.
 
@@ -100,6 +89,12 @@ def test_vrtwarp_4():
     tmp_ds.BuildOverviews("NONE", overviewlist=[2, 4])
     tmp_ds.GetRasterBand(1).GetOverview(0).Fill(127)
     cs_ov0 = tmp_ds.GetRasterBand(1).GetOverview(0).Checksum()
+    data_ov0 = tmp_ds.GetRasterBand(1).GetOverview(0).ReadRaster()
+    data_ov0_subsampled = (
+        tmp_ds.GetRasterBand(1)
+        .GetOverview(0)
+        .ReadRaster(0, 0, 10, 10, 9, 9, resample_alg=gdal.GRIORA_Bilinear)
+    )
     tmp_ds.GetRasterBand(1).GetOverview(1).Fill(255)
     cs_ov1 = tmp_ds.GetRasterBand(1).GetOverview(1).Checksum()
 
@@ -109,6 +104,8 @@ def test_vrtwarp_4():
     for i in range(3):
         assert vrtwarp_ds.GetRasterBand(1).GetOverviewCount() == 2
         assert vrtwarp_ds.GetRasterBand(1).Checksum() == cs_main, i
+        assert vrtwarp_ds.GetRasterBand(1).GetOverview(-1) is None
+        assert vrtwarp_ds.GetRasterBand(1).GetOverview(2) is None
         assert vrtwarp_ds.GetRasterBand(1).GetOverview(0).Checksum() == cs_ov0
         assert vrtwarp_ds.GetRasterBand(1).GetOverview(1).Checksum() == cs_ov1
         if i == 0:
@@ -136,6 +133,13 @@ def test_vrtwarp_4():
     assert vrtwarp_ds.GetRasterBand(1).GetOverviewCount() == 3
     assert vrtwarp_ds.GetRasterBand(1).Checksum() == cs_main
     assert vrtwarp_ds.GetRasterBand(1).GetOverview(0).Checksum() == cs_ov0
+    assert vrtwarp_ds.GetRasterBand(1).ReadRaster(0, 0, 20, 20, 10, 10) == data_ov0
+    assert (
+        vrtwarp_ds.GetRasterBand(1).ReadRaster(
+            0, 0, 20, 20, 9, 9, resample_alg=gdal.GRIORA_Bilinear
+        )
+        == data_ov0_subsampled
+    )
     assert vrtwarp_ds.GetRasterBand(1).GetOverview(1).Checksum() == cs_ov1
     assert vrtwarp_ds.GetRasterBand(1).GetOverview(2).Checksum() == expected_cs_ov2
     vrtwarp_ds = None
@@ -714,8 +718,15 @@ def test_vrtwarp_irasterio_optim_three_band():
     assert warped_vrt_ds.ReadRaster(buf_type=gdal.GDT_UInt16) == expected_data
 
     with gdaltest.config_option("GDAL_VRT_WARP_USE_DATASET_RASTERIO", "NO"):
-        expected_data = warped_vrt_ds.ReadRaster(buf_xsize=20, buf_ysize=20)
-    assert warped_vrt_ds.ReadRaster(buf_xsize=20, buf_ysize=20) == expected_data
+        expected_data = warped_vrt_ds.ReadRaster(buf_xsize=20, buf_ysize=40)
+    assert warped_vrt_ds.ReadRaster(buf_xsize=20, buf_ysize=40) == expected_data
+
+    with gdaltest.config_option("GDAL_VRT_WARP_USE_DATASET_RASTERIO", "NO"):
+        expected_data = warped_vrt_ds.ReadRaster(1, 2, 3, 4, buf_xsize=20, buf_ysize=40)
+    assert (
+        warped_vrt_ds.ReadRaster(1, 2, 3, 4, buf_xsize=20, buf_ysize=40)
+        == expected_data
+    )
 
 
 ###############################################################################
@@ -732,3 +743,31 @@ def test_vrtwarp_irasterio_optim_window_splitting():
     with gdaltest.config_option("GDAL_VRT_WARP_USE_DATASET_RASTERIO", "NO"):
         expected_data = warped_vrt_ds.ReadRaster()
     assert warped_vrt_ds.ReadRaster() == expected_data
+
+
+###############################################################################
+# Test gdal.AutoCreateWarpedVRT() on a Int16 band with nodata = 32767
+
+
+def test_vrtwarp_autocreatewarpedvrt_int16_nodata_32767():
+
+    ds = gdal.GetDriverByName("MEM").Create("", 1, 1, 1, gdal.GDT_Int16)
+    ds.SetGeoTransform([0, 1, 0, 0, 0, -1])
+    ds.GetRasterBand(1).SetNoDataValue(32767)
+    vrt_ds = gdal.AutoCreateWarpedVRT(ds)
+    assert vrt_ds.GetRasterBand(1).DataType == gdal.GDT_Int16
+    assert vrt_ds.GetRasterBand(1).GetNoDataValue() == 32767
+
+
+###############################################################################
+# Test gdal.AutoCreateWarpedVRT() on a source nodata value that does not fit
+# the source band type
+
+
+def test_vrtwarp_autocreatewarpedvrt_invalid_nodata():
+
+    ds = gdal.GetDriverByName("MEM").Create("", 1, 1, 1, gdal.GDT_Byte)
+    ds.SetGeoTransform([0, 1, 0, 0, 0, -1])
+    ds.GetRasterBand(1).SetNoDataValue(-9999)
+    vrt_ds = gdal.AutoCreateWarpedVRT(ds)
+    assert vrt_ds.GetRasterBand(1).DataType == gdal.GDT_Byte
diff --git a/autotest/gdrivers/wcs.py b/autotest/gdrivers/wcs.py
index 514f2508a785..aff6ea11e8d1 100755
--- a/autotest/gdrivers/wcs.py
+++ b/autotest/gdrivers/wcs.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/gdrivers/webp.py b/autotest/gdrivers/webp.py
index 0f2d56f8dfbd..1e67cca72500 100755
--- a/autotest/gdrivers/webp.py
+++ b/autotest/gdrivers/webp.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/wms.py b/autotest/gdrivers/wms.py
index 1eab4bc2405e..dee274fdabd6 100755
--- a/autotest/gdrivers/wms.py
+++ b/autotest/gdrivers/wms.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2007-2014, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import base64
@@ -37,6 +21,7 @@
 
 import gdaltest
 import pytest
+import webserver
 
 from osgeo import gdal
 
@@ -567,6 +552,10 @@ def test_wms_12():
 # Test reading WMS through VRT (test effect of r21866)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 @gdaltest.disable_exceptions()
 def test_wms_13():
 
@@ -1162,3 +1151,40 @@ def test_wms_cache_path():
 
     with pytest.raises(Exception):
         gdal.Open("<GDAL_WMS><Service/><Cache/></GDAL_WMS>")
+
+
+# Launch a single webserver in a module-scoped fixture.
+@pytest.fixture(scope="module")
+def webserver_launch():
+
+    process, port = webserver.launch(handler=webserver.DispatcherHttpHandler)
+
+    yield process, port
+
+    webserver.server_stop(process, port)
+
+
+@pytest.fixture(scope="function")
+def webserver_port(webserver_launch):
+
+    webserver_process, webserver_port = webserver_launch
+
+    if webserver_port == 0:
+        pytest.skip()
+    yield webserver_port
+
+
+@pytest.mark.require_curl
+@gdaltest.enable_exceptions()
+def test_wms_force_opening_url(tmp_vsimem, webserver_port):
+
+    handler = webserver.SequentialHandler()
+    handler.add(
+        "GET",
+        "/?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetCapabilities",
+        200,
+        {"Content-type": "application/xml"},
+        open("data/wms/demo_mapserver_org.xml", "rb").read(),
+    )
+    with webserver.install_http_handler(handler):
+        gdal.OpenEx(f"http://localhost:{webserver_port}", allowed_drivers=["WMS"])
diff --git a/autotest/gdrivers/wmts.py b/autotest/gdrivers/wmts.py
index 532ccf027bc2..f0e7b985157b 100755
--- a/autotest/gdrivers/wmts.py
+++ b/autotest/gdrivers/wmts.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2015, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import shutil
@@ -34,6 +18,7 @@
 
 import gdaltest
 import pytest
+import webserver
 
 from osgeo import gdal
 
@@ -879,6 +864,7 @@ def test_wmts_15():
             </TileMatrix>
         </TileMatrixSet>
     </Contents>
+    <ServiceMetadataURL xlink:href="/vsimem/do_not_use"/>
 </Capabilities>""",
     )
 
@@ -1870,6 +1856,18 @@ def test_wmts_check_no_overflow_zoom_level():
     gdal.Unlink(inputXml)
 
 
+###############################################################################
+# Test fix for https://github.com/OSGeo/gdal/issues/10348
+
+
+def test_wmts_clip_extent_with_union_of_tile_matrix_extent():
+
+    ds = gdal.Open("data/wmts/clip_WGS84BoundingBox_with_tilematrix.xml")
+    assert ds.GetGeoTransform() == pytest.approx(
+        (-46133.17, 0.5971642834779389, 0.0, 6301219.54, 0.0, -0.5971642834779389)
+    )
+
+
 ###############################################################################
 # Test when local wmts tiles are missing
 
@@ -1925,3 +1923,82 @@ def test_wmts_24():
     data = struct.unpack("h", structval)
     #   Expect a null value for the pixel data
     assert data[0] == 0
+
+
+###############################################################################
+# Test force opening a URL as WMTS
+
+
+def test_wmts_force_identifying_url():
+
+    drv = gdal.IdentifyDriverEx("http://example.com", allowed_drivers=["WMTS"])
+    assert drv.GetDescription() == "WMTS"
+
+
+# Launch a single webserver in a module-scoped fixture.
+@pytest.fixture(scope="module")
+def webserver_launch():
+
+    process, port = webserver.launch(handler=webserver.DispatcherHttpHandler)
+
+    yield process, port
+
+    webserver.server_stop(process, port)
+
+
+@pytest.fixture(scope="function")
+def webserver_port(webserver_launch):
+
+    webserver_process, webserver_port = webserver_launch
+
+    if webserver_port == 0:
+        pytest.skip()
+    yield webserver_port
+
+
+@pytest.mark.require_curl
+@gdaltest.enable_exceptions()
+def test_wmts_force_opening_url(tmp_vsimem, webserver_port):
+
+    handler = webserver.SequentialHandler()
+    handler.add(
+        "GET",
+        "/",
+        200,
+        {"Content-type": "application/xml"},
+        open("data/wmts/WMTSCapabilities.xml", "rb").read(),
+    )
+    with webserver.install_http_handler(handler):
+        gdal.OpenEx(f"http://localhost:{webserver_port}", allowed_drivers=["WMTS"])
+
+
+###############################################################################
+# Test force opening
+
+
+@gdaltest.enable_exceptions()
+def test_wmts_force_opening(tmp_vsimem):
+
+    filename = str(tmp_vsimem / "test.foo")
+
+    with open("data/wmts/WMTSCapabilities.xml", "rb") as fsrc:
+        with gdaltest.vsi_open(filename, "wb") as fdest:
+            fdest.write(fsrc.read(1))
+            fdest.write(b" " * (1000 * 1000))
+            fdest.write(fsrc.read())
+
+    with pytest.raises(Exception):
+        gdal.OpenEx(filename)
+
+    ds = gdal.OpenEx(filename, allowed_drivers=["WMTS"])
+    assert ds.GetDriver().GetDescription() == "WMTS"
+
+
+###############################################################################
+# Test force opening, but provided file is still not recognized (for good reasons)
+
+
+def test_wmts_force_opening_no_match():
+
+    drv = gdal.IdentifyDriverEx("data/byte.tif", allowed_drivers=["WMTS"])
+    assert drv is None
diff --git a/autotest/gdrivers/xmp.py b/autotest/gdrivers/xmp.py
index 44d16432b802..4196f201209b 100755
--- a/autotest/gdrivers/xmp.py
+++ b/autotest/gdrivers/xmp.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/gdrivers/xpm.py b/autotest/gdrivers/xpm.py
index 06f05a165bf5..514b28dd09db 100755
--- a/autotest/gdrivers/xpm.py
+++ b/autotest/gdrivers/xpm.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2008, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/gdrivers/xyz.py b/autotest/gdrivers/xyz.py
index 2977b9bf9b11..ac63ff4284fe 100755
--- a/autotest/gdrivers/xyz.py
+++ b/autotest/gdrivers/xyz.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import struct
@@ -557,3 +541,119 @@ def test_xyz_looks_like_missing_lines():
             9,
             10,
         )
+
+
+###############################################################################
+
+
+def yxzContent():
+    content = """0 0 65
+0 1 66
+1 0 67
+1 1 68
+2 0 69
+2 1 70
+"""
+    return content
+
+
+###############################################################################
+# Test with open option COLUMN_ORDER. Basic case with YXZ
+
+
+def test_xyz_column_order_basic_yxz():
+
+    content = yxzContent()
+
+    gdal.FileFromMemBuffer("/vsimem/grid.xyz", content)
+    ds = gdal.OpenEx("/vsimem/grid.xyz", open_options=["COLUMN_ORDER=YXZ"])
+    assert ds.RasterXSize == 2 and ds.RasterYSize == 3
+    buf = ds.ReadRaster(0, 2, 2, 1)
+    assert struct.unpack("B" * 2, buf) == (69, 70)
+    buf = ds.ReadRaster(0, 1, 2, 1)
+    assert struct.unpack("B" * 2, buf) == (67, 68)
+    buf = ds.ReadRaster(0, 0, 2, 1)
+    assert struct.unpack("B" * 2, buf) == (65, 66)
+    buf = ds.ReadRaster(0, 2, 2, 1)
+    assert struct.unpack("B" * 2, buf) == (69, 70)
+    ds = None
+    gdal.Unlink("/vsimem/grid.xyz")
+
+
+###############################################################################
+# Test with open option COLUMN_ORDER. Overrides header
+
+
+def test_xyz_column_order_overrides_header():
+
+    content = (
+        """x y z
+"""
+        + yxzContent()
+    )
+
+    gdal.FileFromMemBuffer("/vsimem/grid.xyz", content)
+    ds = gdal.OpenEx("/vsimem/grid.xyz", open_options=["COLUMN_ORDER=YXZ"])
+    assert ds.RasterXSize == 2 and ds.RasterYSize == 3
+    buf = ds.ReadRaster(0, 2, 2, 1)
+    assert struct.unpack("B" * 2, buf) == (69, 70)
+    ds = None
+    gdal.Unlink("/vsimem/grid.xyz")
+
+
+###############################################################################
+# Test with open option COLUMN_ORDER. Auto
+
+
+def test_xyz_column_order_auto():
+
+    content = (
+        """y x z
+"""
+        + yxzContent()
+    )
+
+    gdal.FileFromMemBuffer("/vsimem/grid.xyz", content)
+    ds = gdal.OpenEx("/vsimem/grid.xyz", open_options=["COLUMN_ORDER=AUTO"])
+    assert ds.RasterXSize == 2 and ds.RasterYSize == 3
+    buf = ds.ReadRaster(0, 2, 2, 1)
+    assert struct.unpack("B" * 2, buf) == (69, 70)
+    ds = None
+    gdal.Unlink("/vsimem/grid.xyz")
+
+
+###############################################################################
+# Test with open option COLUMN_ORDER. wrong option
+
+
+def test_xyz_column_order_wrong_option():
+
+    content = (
+        """y x z
+"""
+        + yxzContent()
+    )
+
+    gdal.FileFromMemBuffer("/vsimem/grid.xyz", content)
+    with pytest.raises(Exception):
+        gdal.OpenEx("/vsimem/grid.xyz", open_options=["COLUMN_ORDER=WRONG"])
+    gdal.Unlink("/vsimem/grid.xyz")
+
+
+###############################################################################
+# Test with open option COLUMN_ORDER. XYZ
+
+
+def test_xyz_column_order_xyz():
+
+    content = (
+        """y x z
+"""
+        + yxzContent()
+    )
+
+    gdal.FileFromMemBuffer("/vsimem/grid.xyz", content)
+    ds = gdal.OpenEx("/vsimem/grid.xyz", open_options=["COLUMN_ORDER=XYZ"])
+    assert ds.RasterXSize == 3 and ds.RasterYSize == 2
+    ds = None
+    gdal.Unlink("/vsimem/grid.xyz")
diff --git a/autotest/gdrivers/zarr_driver.py b/autotest/gdrivers/zarr_driver.py
index ec4b1e1689d2..64e425215392 100644
--- a/autotest/gdrivers/zarr_driver.py
+++ b/autotest/gdrivers/zarr_driver.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2021, Even Rouault <even.rouault@spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import array
@@ -723,9 +707,9 @@ def test_zarr_read_array_attributes():
         "double": 1.5,
         "doublearray": [1.5, 2.5],
         "int": 1,
+        "intarray": [1, 2],
         "int64": 1234567890123,
         "int64array": [1234567890123, -1234567890123],
-        "intarray": [1, 2],
         "intdoublearray": [1, 2.5],
         "mixedstrintarray": ["foo", 1],
         "null": "",
@@ -1437,12 +1421,46 @@ def create():
             assert attr
             assert attr.Write(4000000000) == gdal.CE_None
 
+            attr = rg.CreateAttribute(
+                "int64_attr", [], gdal.ExtendedDataType.Create(gdal.GDT_Int64)
+            )
+            assert attr
+            assert attr.Write(12345678901234) == gdal.CE_None
+
+            attr = rg.CreateAttribute(
+                "uint64_attr", [], gdal.ExtendedDataType.Create(gdal.GDT_UInt64)
+            )
+            assert attr
+            # We cannot write UINT64_MAX
+            # assert attr.Write(18000000000000000000) == gdal.CE_None
+            assert attr.Write(9000000000000000000) == gdal.CE_None
+
             attr = rg.CreateAttribute(
                 "int_array_attr", [2], gdal.ExtendedDataType.Create(gdal.GDT_Int32)
             )
             assert attr
             assert attr.Write([12345678, -12345678]) == gdal.CE_None
 
+            attr = rg.CreateAttribute(
+                "uint_array_attr", [2], gdal.ExtendedDataType.Create(gdal.GDT_UInt32)
+            )
+            assert attr
+            assert attr.Write([12345678, 4000000000]) == gdal.CE_None
+
+            attr = rg.CreateAttribute(
+                "int64_array_attr", [2], gdal.ExtendedDataType.Create(gdal.GDT_Int64)
+            )
+            assert attr
+            assert attr.Write([12345678091234, -12345678091234]) == gdal.CE_None
+
+            attr = rg.CreateAttribute(
+                "uint64_array_attr", [2], gdal.ExtendedDataType.Create(gdal.GDT_UInt64)
+            )
+            assert attr
+            # We cannot write UINT64_MAX
+            # assert attr.Write([12345678091234, 18000000000000000000]) == gdal.CE_None
+            assert attr.Write([12345678091234, 9000000000000000000]) == gdal.CE_None
+
             attr = rg.CreateAttribute(
                 "double_attr", [], gdal.ExtendedDataType.Create(gdal.GDT_Float64)
             )
@@ -1519,17 +1537,52 @@ def update():
         attr = rg.GetAttribute("int_attr")
         assert attr
         assert attr.GetDataType().GetNumericDataType() == gdal.GDT_Int32
+        assert attr.ReadAsInt() == 12345678
+        assert attr.ReadAsInt64() == 12345678
         assert attr.ReadAsDouble() == 12345678
 
         attr = rg.GetAttribute("uint_attr")
         assert attr
-        assert attr.GetDataType().GetNumericDataType() == gdal.GDT_Float64
+        assert attr.GetDataType().GetNumericDataType() == gdal.GDT_Int64
+        assert attr.ReadAsInt64() == 4000000000
         assert attr.ReadAsDouble() == 4000000000
 
+        attr = rg.GetAttribute("int64_attr")
+        assert attr
+        assert attr.GetDataType().GetNumericDataType() == gdal.GDT_Int64
+        assert attr.ReadAsInt64() == 12345678901234
+        assert attr.ReadAsDouble() == 12345678901234
+
+        attr = rg.GetAttribute("uint64_attr")
+        assert attr
+        assert attr.GetDataType().GetNumericDataType() == gdal.GDT_Int64
+        assert attr.ReadAsInt64() == 9000000000000000000
+        assert attr.ReadAsDouble() == 9000000000000000000
+
         attr = rg.GetAttribute("int_array_attr")
         assert attr
         assert attr.GetDataType().GetNumericDataType() == gdal.GDT_Int32
         assert attr.ReadAsIntArray() == (12345678, -12345678)
+        assert attr.ReadAsInt64Array() == (12345678, -12345678)
+        assert attr.ReadAsDoubleArray() == (12345678, -12345678)
+
+        attr = rg.GetAttribute("uint_array_attr")
+        assert attr
+        assert attr.GetDataType().GetNumericDataType() == gdal.GDT_Int64
+        assert attr.ReadAsInt64Array() == (12345678, 4000000000)
+        assert attr.ReadAsDoubleArray() == (12345678, 4000000000)
+
+        attr = rg.GetAttribute("int64_array_attr")
+        assert attr
+        assert attr.GetDataType().GetNumericDataType() == gdal.GDT_Int64
+        assert attr.ReadAsInt64Array() == (12345678091234, -12345678091234)
+        assert attr.ReadAsDoubleArray() == (12345678091234, -12345678091234)
+
+        attr = rg.GetAttribute("uint64_array_attr")
+        assert attr
+        assert attr.GetDataType().GetNumericDataType() == gdal.GDT_Int64
+        assert attr.ReadAsInt64Array() == (12345678091234, 9000000000000000000)
+        assert attr.ReadAsDoubleArray() == (12345678091234, 9000000000000000000)
 
         attr = rg.GetAttribute("double_attr")
         assert attr
@@ -5470,3 +5523,21 @@ def test_zarr_read_cf1_zarrv3():
         ds.GetSpatialRef().ExportToProj4()
         == "+proj=utm +zone=11 +ellps=clrk66 +units=m +no_defs"
     )
+
+
+###############################################################################
+# Test bug fix for https://github.com/OSGeo/gdal/issues/11016
+
+
+@gdaltest.enable_exceptions()
+def test_zarr_write_partial_blocks_compressed(tmp_vsimem):
+
+    out_filename = "/vsimem/test.zarr"
+    src_ds = gdal.Open("data/small_world.tif")
+    gdal.Translate(
+        out_filename,
+        src_ds,
+        options="-of ZARR -co FORMAT=ZARR_V2 -co BLOCKSIZE=3,50,50 -co COMPRESS=ZLIB -co INTERLEAVE=BAND",
+    )
+    out_ds = gdal.Open(out_filename)
+    assert out_ds.ReadRaster() == src_ds.ReadRaster()
diff --git a/autotest/gdrivers/zmap.py b/autotest/gdrivers/zmap.py
index e7d62f876cf8..8edf855053bc 100755
--- a/autotest/gdrivers/zmap.py
+++ b/autotest/gdrivers/zmap.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/generate_parquet_test_file.py b/autotest/generate_parquet_test_file.py
index 71e226d4ed9e..3f8b723de818 100644
--- a/autotest/generate_parquet_test_file.py
+++ b/autotest/generate_parquet_test_file.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2022, Planet Labs
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 wkt_epsg_4326 = (
@@ -1245,6 +1229,91 @@ def __arrow_ext_deserialize__(cls, storage_type, serialized):
     )
 
 
+def generate_arrow_stringview():
+    import pathlib
+
+    import pyarrow as pa
+    import pyarrow.feather as feather
+
+    stringview = pa.array(["foo", "bar", "looooooooooong string"], pa.string_view())
+    list_stringview = pa.array(
+        [None, [None], ["foo", "bar", "looooooooooong string"]],
+        pa.list_(pa.string_view()),
+    )
+    list_of_list_stringview = pa.array(
+        [None, [None], [["foo", "bar", "looooooooooong string"]]],
+        pa.list_(pa.list_(pa.string_view())),
+    )
+    map_stringview = pa.array(
+        [None, [], [("x", "x_val"), ("y", None)]],
+        type=pa.map_(pa.string_view(), pa.string_view()),
+    )
+
+    names = [
+        "stringview",
+        "list_stringview",
+        "list_of_list_stringview",
+        "map_stringview",
+    ]
+
+    locals_ = locals()
+    table = pa.table([locals_[x] for x in names], names=names)
+
+    HERE = pathlib.Path(__file__).parent
+    feather.write_feather(table, HERE / "ogr/data/arrow/stringview.feather")
+
+
+def generate_arrow_binaryview():
+    import pathlib
+
+    import pyarrow as pa
+    import pyarrow.feather as feather
+
+    binaryview = pa.array([b"foo", b"bar", b"looooooooooong binary"], pa.binary_view())
+
+    names = ["binaryview"]
+
+    locals_ = locals()
+    table = pa.table([locals_[x] for x in names], names=names)
+
+    HERE = pathlib.Path(__file__).parent
+    feather.write_feather(table, HERE / "ogr/data/arrow/binaryview.feather")
+
+
+def generate_arrow_listview():
+    import pathlib
+
+    import pyarrow as pa
+    import pyarrow.feather as feather
+
+    listview = pa.array([[1]], pa.list_view(pa.int32()))
+
+    names = ["listview"]
+
+    locals_ = locals()
+    table = pa.table([locals_[x] for x in names], names=names)
+
+    HERE = pathlib.Path(__file__).parent
+    feather.write_feather(table, HERE / "ogr/data/arrow/listview.feather")
+
+
+def generate_arrow_largelistview():
+    import pathlib
+
+    import pyarrow as pa
+    import pyarrow.feather as feather
+
+    largelistview = pa.array([[1]], pa.large_list_view(pa.int32()))
+
+    names = ["largelistview"]
+
+    locals_ = locals()
+    table = pa.table([locals_[x] for x in names], names=names)
+
+    HERE = pathlib.Path(__file__).parent
+    feather.write_feather(table, HERE / "ogr/data/arrow/largelistview.feather")
+
+
 if __name__ == "__main__":
     generate_test_parquet()
     generate_all_geoms_parquet()
@@ -1252,3 +1321,7 @@ def __arrow_ext_deserialize__(cls, storage_type, serialized):
     generate_nested_types()
     generate_extension_custom()
     generate_extension_json()
+    generate_arrow_stringview()
+    generate_arrow_binaryview()
+    generate_arrow_listview()
+    generate_arrow_largelistview()
diff --git a/autotest/gnm/gnm_test.py b/autotest/gnm/gnm_test.py
index f42e6610415b..530d2db8fdfd 100755
--- a/autotest/gnm/gnm_test.py
+++ b/autotest/gnm/gnm_test.py
@@ -12,23 +12,7 @@
 # Copyright (c) 2014, Mikhail Gusev
 # Copyright (c) 2014-2015, NextGIS <info@nextgis.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/ogc_cite_testing/generate_sample_gpkg.py b/autotest/ogc_cite_testing/generate_sample_gpkg.py
index 98735a0aa759..420445049b1d 100755
--- a/autotest/ogc_cite_testing/generate_sample_gpkg.py
+++ b/autotest/ogc_cite_testing/generate_sample_gpkg.py
@@ -7,23 +7,7 @@
 ###############################################################################
 # Copyright (c) 2014-2017, Even Rouault <even.rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
diff --git a/autotest/ogc_cite_testing/kml_generate_test_files.py b/autotest/ogc_cite_testing/kml_generate_test_files.py
index 3aff01641804..f18ee7c6f9ca 100755
--- a/autotest/ogc_cite_testing/kml_generate_test_files.py
+++ b/autotest/ogc_cite_testing/kml_generate_test_files.py
@@ -12,23 +12,7 @@
 ###############################################################################
 # Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 from osgeo import gdal, ogr
diff --git a/autotest/ogr/data/arrow/binaryview.feather b/autotest/ogr/data/arrow/binaryview.feather
new file mode 100644
index 000000000000..9f62bd82944c
Binary files /dev/null and b/autotest/ogr/data/arrow/binaryview.feather differ
diff --git a/autotest/ogr/data/arrow/largelistview.feather b/autotest/ogr/data/arrow/largelistview.feather
new file mode 100644
index 000000000000..65e2ffc575e1
Binary files /dev/null and b/autotest/ogr/data/arrow/largelistview.feather differ
diff --git a/autotest/ogr/data/arrow/listview.feather b/autotest/ogr/data/arrow/listview.feather
new file mode 100644
index 000000000000..c9737dff6168
Binary files /dev/null and b/autotest/ogr/data/arrow/listview.feather differ
diff --git a/autotest/ogr/data/arrow/stringview.feather b/autotest/ogr/data/arrow/stringview.feather
new file mode 100644
index 000000000000..43ab1534e0f8
Binary files /dev/null and b/autotest/ogr/data/arrow/stringview.feather differ
diff --git a/autotest/ogr/data/csv/inf_nan.csv b/autotest/ogr/data/csv/inf_nan.csv
new file mode 100644
index 000000000000..7ab5a1f7cd1e
--- /dev/null
+++ b/autotest/ogr/data/csv/inf_nan.csv
@@ -0,0 +1,5 @@
+id,v
+1,10
+2,inf
+3,-inf
+4,NaN
diff --git a/autotest/ogr/data/dxf/closed_polyline_with_bulge.dxf b/autotest/ogr/data/dxf/closed_polyline_with_bulge.dxf
new file mode 100644
index 000000000000..b367a69a8c3d
--- /dev/null
+++ b/autotest/ogr/data/dxf/closed_polyline_with_bulge.dxf
@@ -0,0 +1,64 @@
+  0
+SECTION
+  2
+ENTITIES
+  0
+LWPOLYLINE
+  5
+215
+330
+1F
+100
+AcDbEntity
+  8
+test
+100
+AcDbPolyline
+ 90
+        8
+ 70
+   129
+ 43
+0.5
+ 10
+40585366.70650577
+ 20
+3433935.538090975
+ 10
+40585329.92564863
+ 20
+3433998.440817071
+ 42
+0.2621272319479089
+ 10
+40585297.73920335
+ 20
+3434017.254552271
+ 10
+40585271.13131783
+ 20
+3434017.686781913
+ 10
+40585252.16981492
+ 20
+3433885.990375476
+ 10
+40585256.74147
+ 20
+3433885.916111596
+ 42
+0.1393571566538866
+ 10
+40585329.65156154
+ 20
+3433905.365607637
+ 10
+40585364.24837356
+ 20
+3433925.992208718
+ 42
+0.4117239835866821
+  0
+ENDSEC
+  0
+EOF
diff --git a/autotest/ogr/data/esrijson/GetLatLon.json b/autotest/ogr/data/esrijson/GetLatLon.json
new file mode 100644
index 000000000000..e40a4ae2b9a1
--- /dev/null
+++ b/autotest/ogr/data/esrijson/GetLatLon.json
@@ -0,0 +1,139 @@
+{
+ "trs": "WA330160N0260E0SN070",
+ "generatedplss": [
+  "WA330160N0260E0SN070"
+ ],
+ "coordinates": [
+  {
+   "plssid": "WA330160N0260E0SN070",
+   "lat": 46.889846925914661,
+   "lon": -119.61030783431359
+  }
+ ],
+ "features": [
+  {
+   "attributes": {
+    "landdescription": "WA330160N0260E0SN070"
+   },
+   "geometry": {
+    "rings": [
+     [
+      [
+       -119.60204327043593,
+       46.886243867876424
+      ],
+      [
+       -119.60206398468807,
+       46.882628224420934
+      ],
+      [
+       -119.60732767297685,
+       46.882649819203635
+      ],
+      [
+       -119.6125944631483,
+       46.882671183730082
+      ],
+      [
+       -119.6126044856519,
+       46.882671170222224
+      ],
+      [
+       -119.61785486360311,
+       46.882664173764368
+      ],
+      [
+       -119.61875770280301,
+       46.882662936567044
+      ],
+      [
+       -119.61874405829215,
+       46.883568936820438
+      ],
+      [
+       -119.61868552316993,
+       46.886246722756596
+      ],
+      [
+       -119.61868498238411,
+       46.886271509249347
+      ],
+      [
+       -119.61867486286243,
+       46.886734870031582
+      ],
+      [
+       -119.61866382256761,
+       46.887240158406691
+      ],
+      [
+       -119.6186061309634,
+       46.889880080462206
+      ],
+      [
+       -119.61859592700011,
+       46.890346766295536
+      ],
+      [
+       -119.61858348713005,
+       46.890915726238376
+      ],
+      [
+       -119.61858325446639,
+       46.89092222006439
+      ],
+      [
+       -119.61847427175444,
+       46.893957399712157
+      ],
+      [
+       -119.61845184261844,
+       46.894581451904436
+      ],
+      [
+       -119.61836141820194,
+       46.897097152613171
+      ],
+      [
+       -119.61782949338284,
+       46.897096441799754
+      ],
+      [
+       -119.61263370425482,
+       46.897089367425643
+      ],
+      [
+       -119.61256327453992,
+       46.8970893336651
+      ],
+      [
+       -119.60729432661518,
+       46.897086677014869
+      ],
+      [
+       -119.60202277267778,
+       46.897083939339161
+      ],
+      [
+       -119.60202262984565,
+       46.893471725151699
+      ],
+      [
+       -119.60202248521686,
+       46.8898595819661
+      ],
+      [
+       -119.60204327043593,
+       46.886243867876424
+      ]
+     ]
+    ],
+    "spatialReference": {
+     "wkid": 4326,
+     "latestWkid": 4326
+    }
+   }
+  }
+ ],
+ "status": "success"
+}
\ No newline at end of file
diff --git a/autotest/ogr/data/filegdb/arc_segment_interior_point_but_line.gdb.zip b/autotest/ogr/data/filegdb/arc_segment_interior_point_but_line.gdb.zip
new file mode 100644
index 000000000000..0c73d8614373
Binary files /dev/null and b/autotest/ogr/data/filegdb/arc_segment_interior_point_but_line.gdb.zip differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000001.TablesByName.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000001.TablesByName.atx
new file mode 100644
index 000000000000..f4eaf0253170
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000001.TablesByName.atx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000001.gdbindexes b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000001.gdbindexes
new file mode 100644
index 000000000000..b02aa7510589
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000001.gdbindexes differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000001.gdbtable b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000001.gdbtable
new file mode 100644
index 000000000000..f48181819f71
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000001.gdbtable differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000001.gdbtablx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000001.gdbtablx
new file mode 100644
index 000000000000..3d6f920bbf82
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000001.gdbtablx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000002.gdbtable b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000002.gdbtable
new file mode 100644
index 000000000000..a0af90eaae1f
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000002.gdbtable differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000002.gdbtablx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000002.gdbtablx
new file mode 100644
index 000000000000..7c12c5681950
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000002.gdbtablx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000003.gdbindexes b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000003.gdbindexes
new file mode 100644
index 000000000000..58df68d525b4
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000003.gdbindexes differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000003.gdbtable b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000003.gdbtable
new file mode 100644
index 000000000000..f8006ccdaad9
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000003.gdbtable differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000003.gdbtablx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000003.gdbtablx
new file mode 100644
index 000000000000..2f80ed4fe5fe
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000003.gdbtablx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.CatItemsByPhysicalName.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.CatItemsByPhysicalName.atx
new file mode 100644
index 000000000000..1e7ad8630e15
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.CatItemsByPhysicalName.atx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.CatItemsByType.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.CatItemsByType.atx
new file mode 100644
index 000000000000..4519bd34bec5
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.CatItemsByType.atx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.FDO_UUID.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.FDO_UUID.atx
new file mode 100644
index 000000000000..f0a699c8fb58
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.FDO_UUID.atx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.gdbindexes b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.gdbindexes
new file mode 100644
index 000000000000..a4f334d7ba2a
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.gdbindexes differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.gdbtable b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.gdbtable
new file mode 100644
index 000000000000..0cbf02d63282
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.gdbtable differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.gdbtablx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.gdbtablx
new file mode 100644
index 000000000000..93fec31b61e3
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.gdbtablx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.horizon b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.horizon
new file mode 100644
index 000000000000..b64b92356a70
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.horizon differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.spx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.spx
new file mode 100644
index 000000000000..15bba5bf1c63
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000004.spx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.CatItemTypesByName.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.CatItemTypesByName.atx
new file mode 100644
index 000000000000..5f5004620ba9
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.CatItemTypesByName.atx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.CatItemTypesByParentTypeID.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.CatItemTypesByParentTypeID.atx
new file mode 100644
index 000000000000..269f1f31a465
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.CatItemTypesByParentTypeID.atx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.CatItemTypesByUUID.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.CatItemTypesByUUID.atx
new file mode 100644
index 000000000000..44d74cc880f4
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.CatItemTypesByUUID.atx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.gdbindexes b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.gdbindexes
new file mode 100644
index 000000000000..bc887093f340
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.gdbindexes differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.gdbtable b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.gdbtable
new file mode 100644
index 000000000000..bf93ec49a465
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.gdbtable differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.gdbtablx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.gdbtablx
new file mode 100644
index 000000000000..4d8932a45d48
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000005.gdbtablx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.CatRelsByDestinationID.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.CatRelsByDestinationID.atx
new file mode 100644
index 000000000000..0a32c40e3588
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.CatRelsByDestinationID.atx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.CatRelsByOriginID.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.CatRelsByOriginID.atx
new file mode 100644
index 000000000000..1664d21885e8
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.CatRelsByOriginID.atx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.CatRelsByType.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.CatRelsByType.atx
new file mode 100644
index 000000000000..0413692ccd84
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.CatRelsByType.atx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.FDO_UUID.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.FDO_UUID.atx
new file mode 100644
index 000000000000..282a6a278350
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.FDO_UUID.atx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.gdbindexes b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.gdbindexes
new file mode 100644
index 000000000000..c608a88be082
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.gdbindexes differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.gdbtable b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.gdbtable
new file mode 100644
index 000000000000..553f570678a6
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.gdbtable differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.gdbtablx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.gdbtablx
new file mode 100644
index 000000000000..431307d13c60
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000006.gdbtablx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByBackwardLabel.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByBackwardLabel.atx
new file mode 100644
index 000000000000..8797338e7a9c
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByBackwardLabel.atx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByDestItemTypeID.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByDestItemTypeID.atx
new file mode 100644
index 000000000000..47d2132ee8b7
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByDestItemTypeID.atx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByForwardLabel.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByForwardLabel.atx
new file mode 100644
index 000000000000..233026824883
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByForwardLabel.atx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByName.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByName.atx
new file mode 100644
index 000000000000..70ed36c3fea8
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByName.atx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByOriginItemTypeID.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByOriginItemTypeID.atx
new file mode 100644
index 000000000000..139b478cc0a4
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByOriginItemTypeID.atx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByUUID.atx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByUUID.atx
new file mode 100644
index 000000000000..dea48d3ebdbb
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.CatRelTypesByUUID.atx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.gdbindexes b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.gdbindexes
new file mode 100644
index 000000000000..2a98c93adab6
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.gdbindexes differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.gdbtable b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.gdbtable
new file mode 100644
index 000000000000..a25ba57b9184
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.gdbtable differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.gdbtablx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.gdbtablx
new file mode 100644
index 000000000000..bf096e13d28f
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000007.gdbtablx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.gdbindexes b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.gdbindexes
new file mode 100644
index 000000000000..c9d0caa2233c
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.gdbindexes differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.gdbtable b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.gdbtable
new file mode 100644
index 000000000000..451b4e263cc6
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.gdbtable differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.gdbtablx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.gdbtablx
new file mode 100644
index 000000000000..8ced06e569cc
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.gdbtablx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.horizon b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.horizon
new file mode 100644
index 000000000000..bab2232e79cb
--- /dev/null
+++ b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.horizon
@@ -0,0 +1 @@
+÷^"ѾˆSÁÖˆ,~ÑcÁ÷^"ÑNYWAÖˆ,~ÑcA
\ No newline at end of file
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.spx b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.spx
new file mode 100644
index 000000000000..c52ff8ff444f
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/a00000009.spx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/gdb b/autotest/ogr/data/filegdb/objectid64/3features.gdb/gdb
new file mode 100644
index 000000000000..a786e127004d
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/gdb differ
diff --git a/autotest/ogr/data/filegdb/objectid64/3features.gdb/timestamps b/autotest/ogr/data/filegdb/objectid64/3features.gdb/timestamps
new file mode 100644
index 000000000000..977ba66918c8
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/3features.gdb/timestamps differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000001.gdbtable b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000001.gdbtable
new file mode 100644
index 000000000000..08d801103d45
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000001.gdbtable differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000001.gdbtablx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000001.gdbtablx
new file mode 100644
index 000000000000..52fde329b77d
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000001.gdbtablx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000002.gdbtable b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000002.gdbtable
new file mode 100644
index 000000000000..0b29eb53e07d
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000002.gdbtable differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000002.gdbtablx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000002.gdbtablx
new file mode 100644
index 000000000000..b17fb6b96e25
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000002.gdbtablx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000003.gdbtable b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000003.gdbtable
new file mode 100644
index 000000000000..5300ca649431
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000003.gdbtable differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000003.gdbtablx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000003.gdbtablx
new file mode 100644
index 000000000000..730418420e46
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000003.gdbtablx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000004.freelist b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000004.freelist
new file mode 100644
index 000000000000..040b0de5c092
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000004.freelist differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000004.gdbtable b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000004.gdbtable
new file mode 100644
index 000000000000..56afc1dd9910
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000004.gdbtable differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000004.gdbtablx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000004.gdbtablx
new file mode 100644
index 000000000000..0a43ae9a2000
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000004.gdbtablx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000005.gdbtable b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000005.gdbtable
new file mode 100644
index 000000000000..9a0fe221dc4a
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000005.gdbtable differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000005.gdbtablx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000005.gdbtablx
new file mode 100644
index 000000000000..4a92352cb2d6
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000005.gdbtablx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000006.FDO_OriginID.atx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000006.FDO_OriginID.atx
new file mode 100644
index 000000000000..9fc0f2b2ec2e
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000006.FDO_OriginID.atx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000006.gdbindexes b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000006.gdbindexes
new file mode 100644
index 000000000000..9e15d35d6136
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000006.gdbindexes differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000006.gdbtable b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000006.gdbtable
new file mode 100644
index 000000000000..1da41b719ca6
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000006.gdbtable differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000006.gdbtablx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000006.gdbtablx
new file mode 100644
index 000000000000..e5f0a9e3946b
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000006.gdbtablx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000007.gdbtable b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000007.gdbtable
new file mode 100644
index 000000000000..231ae0568629
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000007.gdbtable differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000007.gdbtablx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000007.gdbtablx
new file mode 100644
index 000000000000..5ed1ca9acb22
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000007.gdbtablx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.gdbindexes b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.gdbindexes
new file mode 100644
index 000000000000..cc24e2a06b9b
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.gdbindexes differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.gdbtable b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.gdbtable
new file mode 100644
index 000000000000..c99336adb5db
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.gdbtable differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.gdbtablx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.gdbtablx
new file mode 100644
index 000000000000..a3af82aa62a8
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.gdbtablx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.horizon b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.horizon
new file mode 100644
index 000000000000..b64b92356a70
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.horizon differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.spx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.spx
new file mode 100644
index 000000000000..5fa796d466b1
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a00000009.spx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.gdbindexes b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.gdbindexes
new file mode 100644
index 000000000000..cc24e2a06b9b
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.gdbindexes differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.gdbtable b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.gdbtable
new file mode 100644
index 000000000000..c99336adb5db
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.gdbtable differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.gdbtablx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.gdbtablx
new file mode 100644
index 000000000000..d4842ffc23d1
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.gdbtablx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.horizon b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.horizon
new file mode 100644
index 000000000000..b64b92356a70
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.horizon differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.spx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.spx
new file mode 100644
index 000000000000..5fa796d466b1
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000a.spx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.gdbindexes b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.gdbindexes
new file mode 100644
index 000000000000..cc24e2a06b9b
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.gdbindexes differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.gdbtable b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.gdbtable
new file mode 100644
index 000000000000..c99336adb5db
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.gdbtable differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.gdbtablx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.gdbtablx
new file mode 100644
index 000000000000..eee05bd71076
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.gdbtablx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.horizon b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.horizon
new file mode 100644
index 000000000000..b64b92356a70
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.horizon differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.spx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.spx
new file mode 100644
index 000000000000..5fa796d466b1
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000b.spx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.gdbindexes b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.gdbindexes
new file mode 100644
index 000000000000..cc24e2a06b9b
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.gdbindexes differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.gdbtable b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.gdbtable
new file mode 100644
index 000000000000..c99336adb5db
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.gdbtable differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.gdbtablx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.gdbtablx
new file mode 100644
index 000000000000..b83ce08a274d
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.gdbtablx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.horizon b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.horizon
new file mode 100644
index 000000000000..b64b92356a70
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.horizon differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.spx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.spx
new file mode 100644
index 000000000000..5fa796d466b1
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000c.spx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.gdbindexes b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.gdbindexes
new file mode 100644
index 000000000000..cc24e2a06b9b
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.gdbindexes differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.gdbtable b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.gdbtable
new file mode 100644
index 000000000000..c99336adb5db
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.gdbtable differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.gdbtablx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.gdbtablx
new file mode 100644
index 000000000000..f343e6d9eb39
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.gdbtablx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.horizon b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.horizon
new file mode 100644
index 000000000000..b64b92356a70
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.horizon differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.spx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.spx
new file mode 100644
index 000000000000..5fa796d466b1
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000d.spx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.gdbindexes b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.gdbindexes
new file mode 100644
index 000000000000..cc24e2a06b9b
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.gdbindexes differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.gdbtable b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.gdbtable
new file mode 100644
index 000000000000..c99336adb5db
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.gdbtable differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.gdbtablx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.gdbtablx
new file mode 100644
index 000000000000..3a77f69dfcb1
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.gdbtablx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.horizon b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.horizon
new file mode 100644
index 000000000000..b64b92356a70
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.horizon differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.spx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.spx
new file mode 100644
index 000000000000..5fa796d466b1
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000e.spx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.gdbindexes b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.gdbindexes
new file mode 100644
index 000000000000..cc24e2a06b9b
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.gdbindexes differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.gdbtable b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.gdbtable
new file mode 100644
index 000000000000..e035332fb4d8
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.gdbtable differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.gdbtablx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.gdbtablx
new file mode 100644
index 000000000000..f29a29ad7844
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.gdbtablx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.horizon b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.horizon
new file mode 100644
index 000000000000..b64b92356a70
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.horizon differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.spx b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.spx
new file mode 100644
index 000000000000..5fa796d466b1
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/a0000000f.spx differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/gdb b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/gdb
new file mode 100644
index 000000000000..506f9c628294
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/gdb differ
diff --git a/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/timestamps b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/timestamps
new file mode 100644
index 000000000000..fca0d9f1179b
Binary files /dev/null and b/autotest/ogr/data/filegdb/objectid64/with_holes_8.gdb/timestamps differ
diff --git a/autotest/ogr/data/flatgeobuf/test_ogr_flatgeobuf_singlepart_mls_new.fgb b/autotest/ogr/data/flatgeobuf/test_ogr_flatgeobuf_singlepart_mls_new.fgb
new file mode 100644
index 000000000000..4a1482c1f1fc
Binary files /dev/null and b/autotest/ogr/data/flatgeobuf/test_ogr_flatgeobuf_singlepart_mls_new.fgb differ
diff --git a/autotest/ogr/data/geojson/feature_with_type_Topology_property.json b/autotest/ogr/data/geojson/feature_with_type_Topology_property.json
new file mode 100644
index 000000000000..9b9f0bbd6dcf
--- /dev/null
+++ b/autotest/ogr/data/geojson/feature_with_type_Topology_property.json
@@ -0,0 +1,7 @@
+{
+"crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:EPSG::27700" } },
+"features": [
+{ "properties": { "type": "Topology" }, "geometry": null, "type": "Feature" }
+],
+"type": "FeatureCollection"
+}
diff --git a/autotest/ogr/data/geojson/point_with_utf8bom.json b/autotest/ogr/data/geojson/point_with_utf8bom.json
index e9596eb9425d..28c794825fe6 100644
--- a/autotest/ogr/data/geojson/point_with_utf8bom.json
+++ b/autotest/ogr/data/geojson/point_with_utf8bom.json
@@ -1 +1 @@
-{ "geometry": { "type": "Point", "coordinates": [ 100.0, 0.0 ] } }
\ No newline at end of file
+{ "geometry": { "type": "Point", "coordinates": [ 100.0, 0.0 ] }, "type": "Feature" }
diff --git a/autotest/ogr/data/gml/billionlaugh.gml b/autotest/ogr/data/gml/billionlaugh.gml
new file mode 100644
index 000000000000..6fc911bf771f
--- /dev/null
+++ b/autotest/ogr/data/gml/billionlaugh.gml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE lolz [
+ <!ENTITY lol "lol">
+ <!ENTITY lol1 "&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;">
+ <!ENTITY lol2 "&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;">
+ <!ENTITY lol3 "&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;">
+ <!ENTITY lol4 "&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;">
+ <!ENTITY lol5 "&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;">
+ <!ENTITY lol6 "&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;">
+ <!ENTITY lol7 "&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;">
+ <!ENTITY lol8 "&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;">
+ <!ENTITY lol9 "&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;">
+]>
+<ogr:FeatureCollection
+     gml:id="aFeatureCollection"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://ogr.maptools.org/ billionlaugh.xsd"
+     xmlns:ogr="http://ogr.maptools.org/"
+     xmlns:gml="http://www.opengis.net/gml/3.2">
+  <lolz>&lol9;</lolz>
+</ogr:FeatureCollection>
diff --git a/autotest/ogr/data/gml/billionlaugh.xsd b/autotest/ogr/data/gml/billionlaugh.xsd
new file mode 100644
index 000000000000..1e8c85b3fa03
--- /dev/null
+++ b/autotest/ogr/data/gml/billionlaugh.xsd
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema 
+    targetNamespace="http://ogr.maptools.org/"
+    xmlns:ogr="http://ogr.maptools.org/"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:gml="http://www.opengis.net/gml/3.2"
+    xmlns:gmlsf="http://www.opengis.net/gmlsf/2.0"
+    elementFormDefault="qualified"
+    version="1.0">
+<xs:annotation>
+  <xs:appinfo source="http://schemas.opengis.net/gmlsfProfile/2.0/gmlsfLevels.xsd">
+    <gmlsf:ComplianceLevel>0</gmlsf:ComplianceLevel>
+  </xs:appinfo>
+</xs:annotation>
+<xs:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
+<xs:import namespace="http://www.opengis.net/gmlsf/2.0" schemaLocation="http://schemas.opengis.net/gmlsfProfile/2.0/gmlsfLevels.xsd"/>
+<xs:element name="FeatureCollection" type="ogr:FeatureCollectionType" substitutionGroup="gml:AbstractFeature"/>
+<xs:complexType name="FeatureCollectionType">
+  <xs:complexContent>
+    <xs:extension base="gml:AbstractFeatureType">
+      <xs:sequence minOccurs="0" maxOccurs="unbounded">
+        <xs:element name="featureMember">
+          <xs:complexType>
+            <xs:complexContent>
+              <xs:extension base="gml:AbstractFeatureMemberType">
+                <xs:sequence>
+                  <xs:element ref="gml:AbstractFeature"/>
+                </xs:sequence>
+              </xs:extension>
+            </xs:complexContent>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+    </xs:extension>
+  </xs:complexContent>
+</xs:complexType>
+<xs:element name="poly" type="ogr:poly_Type" substitutionGroup="gml:AbstractFeature"/>
+<xs:complexType name="poly_Type">
+  <xs:complexContent>
+    <xs:extension base="gml:AbstractFeatureType">
+      <xs:sequence>
+        <xs:element name="geometryProperty" type="gml:SurfacePropertyType" nillable="true" minOccurs="0" maxOccurs="1"/> <!-- restricted to Polygon --><!-- srsName="urn:ogc:def:crs:EPSG::27700" -->
+        <xs:element name="AREA" nillable="true" minOccurs="0" maxOccurs="1">
+          <xs:simpleType>
+            <xs:restriction base="xs:decimal">
+              <xs:totalDigits value="11"/>
+              <xs:fractionDigits value="3"/>
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element name="EAS_ID" nillable="true" minOccurs="0" maxOccurs="1">
+          <xs:simpleType>
+            <xs:restriction base="xs:long">
+              <xs:totalDigits value="11"/>
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element name="PRFEDEA" nillable="true" minOccurs="0" maxOccurs="1">
+          <xs:simpleType>
+            <xs:restriction base="xs:string">
+              <xs:maxLength value="16"/>
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+      </xs:sequence>
+    </xs:extension>
+  </xs:complexContent>
+</xs:complexType>
+</xs:schema>
diff --git a/autotest/ogr/data/gml/min_example/ft1_schema.xsd b/autotest/ogr/data/gml/min_example/ft1_schema.xsd
new file mode 100644
index 000000000000..a1d71b57ff07
--- /dev/null
+++ b/autotest/ogr/data/gml/min_example/ft1_schema.xsd
@@ -0,0 +1,30 @@
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:ft1="http://www.esdi-humboldt.eu/hale/shp/entwick" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://www.esdi-humboldt.eu/hale/shp/entwick">
+<import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
+<element name="entwick" substitutionGroup="gml:AbstractFeature">
+<complexType>
+<complexContent>
+<extension base="gml:AbstractFeatureType">
+<sequence>
+<element minOccurs="0" name="arokstatus" type="decimal"/>
+<element minOccurs="0" name="oa_nr" type="decimal"/>
+<element minOccurs="0" name="bezeich" type="string"/>
+<element minOccurs="0" name="aktennr" type="string"/>
+<element minOccurs="0" name="quelle" type="string"/>
+<element minOccurs="0" name="dat_erst" type="date"/>
+<element minOccurs="0" name="erst_ID" type="decimal"/>
+<element minOccurs="0" name="bearbeiter" type="string"/>
+<element minOccurs="0" name="dat_geneh" type="date"/>
+<element minOccurs="0" name="inkraft" type="date"/>
+<element minOccurs="0" name="bemerk" type="string"/>
+<element minOccurs="0" name="sonderfest" type="string"/>
+<element minOccurs="0" name="SHAPE_Leng" type="decimal"/>
+<element minOccurs="0" name="SHAPE_Area" type="decimal"/>
+<element minOccurs="0" name="ars" type="string"/>
+<element minOccurs="0" name="UUID" type="string"/>
+<element minOccurs="0" name="geometry" type="gml:MultiSurfacePropertyType"/>
+</sequence>
+</extension>
+</complexContent>
+</complexType>
+</element>
+</schema>
\ No newline at end of file
diff --git a/autotest/ogr/data/gml/min_example/ft2_schema.xsd b/autotest/ogr/data/gml/min_example/ft2_schema.xsd
new file mode 100644
index 000000000000..08439de44bc9
--- /dev/null
+++ b/autotest/ogr/data/gml/min_example/ft2_schema.xsd
@@ -0,0 +1,31 @@
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:ft2="http://www.esdi-humboldt.eu/hale/shp/sanier" xmlns:xlink="http://www.w3.org/1999/xlink" targetNamespace="http://www.esdi-humboldt.eu/hale/shp/sanier" elementFormDefault="qualified" attributeFormDefault="unqualified">
+<import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
+<element name="sanier" substitutionGroup="gml:AbstractFeature">
+<complexType>
+<complexContent>
+<extension base="gml:AbstractFeatureType">
+<sequence>
+<element name="arokstatus" minOccurs="0" type="string"/>
+<element name="oa_nr" minOccurs="0" type="string"/>
+<element name="bezeich" minOccurs="0" type="string"/>
+<element name="aktennr" minOccurs="0" type="string"/>
+<element name="dat_erst" minOccurs="0" type="date"/>
+<element name="erst_ID" minOccurs="0" type="string"/>
+<element name="bearbeiter" minOccurs="0" type="string"/>
+<element name="dat_geneh" minOccurs="0" type="date"/>
+<element name="inkraft" minOccurs="0" type="date"/>
+<element name="bemerk" minOccurs="0" type="string"/>
+<element name="sonderfest" minOccurs="0" type="string"/>
+<element name="ars" minOccurs="0" type="string"/>
+<element name="ars_text" minOccurs="0" type="string"/>
+<element name="UUID" minOccurs="0" type="string"/>
+<element name="SHAPE_Leng" minOccurs="0" type="decimal"/>
+<element name="SHAPE_Area" minOccurs="0" type="decimal"/>
+<element name="quelle" minOccurs="0" type="string"/>
+<element name="geometry" minOccurs="0" type="gml:MultiSurfacePropertyType"/>
+</sequence>
+</extension>
+</complexContent>
+</complexType>
+</element>
+</schema>
diff --git a/autotest/ogr/data/gml/min_example/minimal_example.gml b/autotest/ogr/data/gml/min_example/minimal_example.gml
new file mode 100644
index 000000000000..31282fae09e7
--- /dev/null
+++ b/autotest/ogr/data/gml/min_example/minimal_example.gml
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<wfs:FeatureCollection xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs/2.0 http://schemas.opengis.net/wfs/2.0/wfs.xsd http://www.opengis.net/gml/3.2 http://schemas.opengis.net/gml/3.2.1/gml.xsd http://www.esdi-humboldt.eu/hale/shp/entwick minimal_example.xsd" xmlns:wfs="http://www.opengis.net/wfs/2.0" timeStamp="2024-07-03T15:51:36Z" xmlns:ft1="http://www.esdi-humboldt.eu/hale/shp/entwick" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:ft2="http://www.esdi-humboldt.eu/hale/shp/sanier" xmlns:gss="http://www.isotc211.org/2005/gss" xmlns:gsr="http://www.isotc211.org/2005/gsr" xmlns:gts="http://www.isotc211.org/2005/gts" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2" numberMatched="2" numberReturned="2">
+  <!--NOTE: numberReturned attribute should be 'unknown' as well, but this would not validate against the current version of the WFS 2.0 schema (change upcoming). See change request (CR 144): https://portal.opengeospatial.org/files?artifact_id=43925.-->
+  <wfs:member>
+    <ft2:sanier gml:id="SANIER_909">
+      <ft2:arokstatus>Rechtsbestand</ft2:arokstatus>
+      <ft2:oa_nr>430050</ft2:oa_nr>
+      <ft2:dat_erst>2021-01-13+01:00</ft2:dat_erst>
+      <ft2:geometry>
+        <!--Inlined geometry 'GEOMETRY_c3a1b0a4-0407-463f-9054-2237cc14db64'-->
+        <gml:MultiSurface gml:id="GEOMETRY_c3a1b0a4-0407-463f-9054-2237cc14db64" srsName="EPSG:25832">
+          <gml:surfaceMember>
+            <gml:Polygon gml:id="GEOMETRY_d3e9063b-904d-41a0-a037-19cec638cba9" srsName="EPSG:25832">
+              <gml:exterior>
+                <gml:LinearRing>
+                  <gml:posList>431972.151 5347601.362 431964.001 5347621.025 431963.856 5347621.360 431956.503 5347639.346 431955.348 5347642.027 431946.479 5347638.798 431947.704 5347635.782 431940.320 5347632.646 431940.752 5347631.530 431947.244 5347615.889 431947.460 5347615.331 431952.550 5347600.374 431933.614 5347599.266 431911.933 5347598.080 431892.851 5347597.085 431878.817 5347596.364 431869.832 5347595.804 431854.833 5347594.983 431838.573 5347594.178 431818.376 5347593.085 431792.611 5347591.726 431758.084 5347589.805 431735.436 5347588.520 431731.173 5347591.906 431728.161 5347606.839 431723.676 5347628.792 431721.715 5347650.938 431733.163 5347652.690 431746.073 5347652.536 431783.096 5347652.203 431811.603 5347653.307 431823.703 5347653.718 431835.730 5347654.240 431866.763 5347655.648 431875.746 5347655.985 431885.769 5347656.421 431893.342 5347656.775 431897.351 5347656.950 431914.654 5347658.077 431924.753 5347658.734 431929.434 5347659.234 431929.953 5347659.228 431947.776 5347660.460 431964.722 5347662.703 431979.637 5347668.972 431992.836 5347674.484 432002.386 5347678.817 432009.223 5347679.625 432013.965 5347679.123 432026.152 5347674.309 432033.238 5347671.223 432049.740 5347642.567 432046.810 5347639.601 432047.754 5347637.811 432058.913 5347615.334 432066.808 5347599.121 432072.679 5347587.378 432074.245 5347588.138 432091.528 5347556.472 432072.344 5347546.918 432050.620 5347535.949 432045.918 5347533.671 432038.566 5347551.879 432032.299 5347567.628 432027.252 5347580.028 432025.523 5347584.384 432022.856 5347590.974 432020.624 5347596.670 432013.056 5347615.437 432000.188 5347619.036 431986.354 5347610.086 431972.967 5347601.353 431972.151 5347601.362</gml:posList>
+                </gml:LinearRing>
+              </gml:exterior>
+            </gml:Polygon>
+          </gml:surfaceMember>
+        </gml:MultiSurface>
+      </ft2:geometry>
+    </ft2:sanier>
+  </wfs:member>
+  <wfs:member>
+    <ft1:entwick gml:id="ENTWICK_8">
+    <ft1:oa_nr>430070</ft1:oa_nr>
+     <ft1:dat_erst>2004-02-26+01:00</ft1:dat_erst>
+      <ft1:SHAPE_Leng>8266.565325510000000</ft1:SHAPE_Leng>
+      <ft1:geometry>
+        <!--Inlined geometry 'GEOMETRY_97f2fc9d-7431-4064-8371-93c458c1d4ef'-->
+        <gml:MultiSurface gml:id="GEOMETRY_97f2fc9d-7431-4064-8371-93c458c1d4ef" srsName="EPSG:25832">
+          <gml:surfaceMember>
+            <gml:Polygon gml:id="GEOMETRY_032ce23c-d27e-4513-9f45-589b666f4d47" srsName="EPSG:25832">
+              <gml:exterior>
+                <gml:LinearRing>
+                  <gml:posList>510586.451 5282926.087 510579.955 5282909.071 510578.087 5282904.956 510574.792 5282901.504 510570.005 5282892.827 510563.498 5282882.145 510556.314 5282871.907 510548.528 5282862.557 510546.805 5282860.887 510539.391 5282853.427 510537.215 5282852.868 510536.092 5282851.866 510535.345 5282849.863 510529.578 5282844.630 510523.285 5282839.283 510520.438 5282836.833 510510.099 5282829.034 510494.586 5282819.115 510475.245 5282809.633 510450.727 5282800.476 510442.555 5282796.904 510440.289 5282805.125 510437.725 5282812.455 510433.622 5282841.344 510431.571 5282855.567 510428.379 5282877.789 510427.163 5282886.678 510424.276 5282906.789 510456.971 5282916.295 510465.753 5282914.533 510464.393 5282919.643 510460.259 5282923.636 510455.585 5282935.854 510453.023 5282942.406 510447.304 5282951.287 510443.543 5282957.060 510469.192 5282962.663 510493.040 5282968.485 510507.141 5282970.845 510519.369 5282971.533 510539.995 5282974.905 510566.854 5282975.621 510580.431 5282977.090 510591.818 5282986.558 510594.415 5282961.223 510591.371 5282943.546 510588.986 5282934.983 510586.451 5282926.087</gml:posList>
+                </gml:LinearRing>
+              </gml:exterior>
+            </gml:Polygon>
+          </gml:surfaceMember>
+          <gml:surfaceMember>
+            <gml:Polygon gml:id="GEOMETRY_1ca95764-7c1c-408d-b1c9-e2754a4c89c1" srsName="EPSG:25832">
+              <gml:exterior>
+                <gml:LinearRing>
+                  <gml:posList>510782.868 5283252.645 510784.376 5283248.425 510788.725 5283250.100 510792.850 5283250.330 510838.847 5283246.304 510855.506 5283244.667 510879.146 5283240.489 510903.164 5283234.754 510950.903 5283222.063 510977.629 5283213.222 510986.789 5283209.461 510995.585 5283199.808 511013.361 5283202.064 511025.750 5283196.420 511043.924 5283187.230 511069.535 5283172.830 511086.886 5283162.305 511106.717 5283149.117 511110.471 5283147.790 511123.993 5283138.369 511140.221 5283126.731 511175.681 5283101.681 511193.260 5283090.156 511213.766 5283077.637 511233.067 5283067.227 511243.733 5283061.469 511267.011 5283050.733 511293.591 5283040.115 511311.985 5283033.816 511334.736 5283024.524 511367.164 5283016.029 511389.832 5283010.962 511401.538 5283009.984 511409.042 5283009.443 511428.027 5283007.480 511441.309 5283006.395 511457.967 5283005.317 511472.298 5283004.789 511498.634 5283004.507 511519.567 5283003.882 511526.096 5283003.339 511531.873 5283003.018 511539.527 5283002.477 511545.005 5283001.710 511564.744 5282998.304 511588.538 5282993.016 511611.283 5282987.283 511631.630 5282979.988 511645.668 5282976.126 511654.526 5282973.699 511671.572 5282966.175 511686.665 5282959.982 511702.663 5282951.234 511740.462 5282921.858 511763.377 5282942.910 511770.049 5282945.591 511775.076 5282945.712 511779.583 5282943.165 511782.505 5282944.949 511822.034 5282913.243 511824.515 5282911.248 511825.340 5282910.916 511826.241 5282910.807 511827.141 5282910.809 511828.042 5282910.921 511828.866 5282911.257 511829.691 5282911.592 511830.440 5282912.037 511831.114 5282912.595 511831.713 5282913.263 511832.236 5282914.042 511832.610 5282914.821 511834.212 5282938.608 511828.029 5282954.044 511852.613 5282966.320 511851.216 5282952.313 511852.850 5282923.198 511852.126 5282910.637 511851.185 5282893.853 511850.446 5282888.294 511847.448 5282886.733 511861.425 5282875.758 511865.183 5282872.543 511864.139 5282869.762 511863.398 5282864.982 511850.637 5282831.391 511855.517 5282829.845 511919.784 5282809.305 511922.636 5282808.421 511929.815 5282820.439 511934.810 5282836.231 511934.196 5282842.454 511933.661 5282847.454 511937.490 5282846.128 511987.718 5282830.005 512045.183 5282797.226 512047.224 5282790.006 512054.215 5282783.464 512068.803 5282767.934 512109.633 5282725.341 512137.673 5282699.393 512137.224 5282698.947 512127.865 5282689.592 512105.777 5282667.540 512077.698 5282639.586 512027.723 5282605.362 512115.531 5282523.078 512155.990 5282479.707 512176.683 5282451.520 512185.750 5282421.753 512184.438 5282403.302 512183.634 5282392.964 512173.659 5282390.720 512160.526 5282391.804 512152.346 5282392.454 512143.868 5282391.769 512137.797 5282388.756 512130.459 5282381.294 512122.314 5282365.272 512120.825 5282359.379 512117.723 5282335.811 512116.232 5282331.362 512114.442 5282326.024 512106.658 5282316.338 512088.172 5282293.294 512071.333 5282272.254 512071.943 5282267.253 512069.087 5282269.470 512066.231 5282271.687 512028.429 5282300.394 512012.880 5282308.253 512016.771 5282313.485 512014.291 5282315.147 511973.113 5282343.735 511888.879 5282402.022 511886.400 5282403.796 511894.263 5282411.369 511899.730 5282416.716 511894.169 5282420.372 511841.500 5282454.829 511796.419 5282484.522 511753.969 5282512.444 511746.470 5282510.206 511741.071 5282508.639 511686.251 5282494.081 511694.314 5282477.092 511696.197 5282473.428 511702.750 5282460.772 511711.105 5282447.896 511738.487 5282413.498 511743.978 5282406.619 511744.429 5282406.175 511765.490 5282381.211 511763.017 5282379.316 511749.906 5282369.732 511743.162 5282364.828 511736.719 5282360.147 511726.604 5282352.791 511722.708 5282349.894 511718.588 5282346.551 511708.999 5282338.641 511697.313 5282328.948 511688.698 5282321.818 511656.825 5282350.984 511646.115 5282340.737 511641.172 5282336.060 511637.428 5282332.496 511628.815 5282324.254 511626.793 5282322.361 511630.480 5282317.033 511655.817 5282292.189 511659.952 5282288.085 511665.065 5282283.094 511678.295 5282270.895 511681.228 5282267.789 511685.440 5282263.240 511693.862 5282254.478 511695.518 5282251.480 511697.702 5282247.594 511700.564 5282242.488 511700.278 5282235.485 511695.934 5282231.031 511675.107 5282214.429 511668.141 5282208.858 511656.378 5282199.499 511655.323 5282201.609 511646.583 5282219.818 511643.517 5282214.477 511638.433 5282205.131 511633.424 5282196.230 511628.486 5282188.662 511625.492 5282184.989 511604.915 5282155.718 511597.130 5282146.255 511594.059 5282143.581 511581.052 5282156.115 511570.147 5282168.652 511524.346 5282220.463 511514.122 5282230.335 511513.373 5282229.333 511510.441 5282232.106 511503.825 5282238.428 511499.089 5282242.975 511494.428 5282247.411 511498.100 5282250.086 511494.341 5282253.746 511497.716 5282254.530 511511.635 5282273.674 511512.682 5282275.010 511529.371 5282297.827 511457.163 5282347.475 511455.510 5282348.583 511450.344 5282342.794 511436.456 5282345.989 511434.353 5282346.986 511426.468 5282350.527 511340.249 5282390.813 511328.608 5282396.236 511329.596 5282389.903 511328.714 5282380.343 511327.464 5282367.115 511325.848 5282349.218 511324.598 5282336.323 511323.929 5282332.877 511319.990 5282313.086 511319.693 5282311.863 511312.526 5282293.066 511301.745 5282280.375 511296.954 5282274.809 511291.341 5282267.352 511283.706 5282257.334 511284.764 5282253.780 511294.018 5282240.906 511292.978 5282236.125 511290.492 5282240.565 511278.454 5282257.435 511275.218 5282261.986 511255.063 5282285.397 511236.636 5282307.812 511231.087 5282306.357 511227.336 5282305.682 511224.845 5282313.235 511215.962 5282328.111 511230.423 5282338.919 511233.118 5282342.592 511221.745 5282364.465 511214.143 5282376.676 511211.578 5282383.562 511210.070 5282387.781 511204.065 5282388.437 511190.330 5282390.411 511183.417 5282395.732 511179.133 5282399.058 511174.925 5282402.385 511165.544 5282403.033 511157.740 5282403.574 511154.738 5282403.791 511152.937 5282403.898 511141.757 5282404.099 511135.678 5282404.310 511131.101 5282404.412 511128.925 5282404.075 511118.424 5282402.610 511104.396 5282400.693 511101.470 5282400.354 511089.243 5282398.664 511086.467 5282398.325 511080.240 5282397.758 511073.414 5282397.078 511069.962 5282396.738 511066.136 5282396.397 511061.260 5282395.833 511059.010 5282395.606 511057.283 5282395.713 511050.680 5282396.146 511039.574 5282396.680 511026.516 5282397.433 511022.014 5282397.647 510986.814 5282401.915 510959.050 5282402.751 510955.674 5282402.412 510952.449 5282401.850 510947.575 5282399.729 510943.831 5282395.944 510938.813 5282391.044 510933.420 5282385.921 510930.130 5282380.136 510929.460 5282377.244 510920.751 5282379.673 510909.190 5282382.875 510897.776 5282387.077 510891.394 5282389.510 510889.817 5282390.174 510885.463 5282391.166 510879.232 5282392.599 510873.527 5282393.922 510866.246 5282395.576 510857.237 5282397.670 510851.007 5282398.992 510848.155 5282399.876 510842.148 5282401.755 510838.846 5282402.193 510827.664 5282403.506 510825.788 5282403.391 510808.981 5282402.693 510808.531 5282402.803 510808.599 5282406.471 510822.832 5282419.278 510813.278 5282432.375 510806.057 5282442.031 510800.565 5282450.023 510797.705 5282454.130 510795.449 5282457.349 510788.895 5282471.229 510784.601 5282480.446 510782.039 5282485.998 510775.109 5282500.656 510768.255 5282515.091 510791.113 5282529.471 510783.962 5282541.905 510754.432 5282524.291 510747.204 5282537.502 510732.063 5282529.139 510717.442 5282523.444 510673.654 5282506.248 510673.721 5282510.805 510667.942 5282511.128 510657.965 5282510.331 510657.652 5282517.333 510656.514 5282523.776 510654.250 5282530.886 510649.727 5282542.547 510640.757 5282565.203 510639.400 5282568.646 510634.576 5282580.751 510630.204 5282591.635 510627.112 5282599.965 510624.396 5282608.184 510622.963 5282612.294 510621.838 5282612.181 510618.064 5282624.288 510619.414 5282624.847 510617.825 5282631.846 510549.934 5282624.942 510551.844 5282606.163 510576.300 5282608.319 510576.532 5282604.763 510577.838 5282588.094 510591.567 5282589.009 510591.644 5282588.008 510592.639 5282577.118 510593.712 5282564.672 510609.767 5282566.035 510609.996 5282563.702 510612.669 5282538.256 510612.669 5282538.144 510597.515 5282536.561 510600.794 5282507.670 510590.137 5282509.096 510590.167 5282492.425 510590.197 5282476.087 510601.657 5282446.212 510580.052 5282443.616 510556.298 5282425.901 510547.009 5282417.549 510542.584 5282457.551 510515.900 5282441.944 510515.099 5282428.939 510511.743 5282417.708 510504.448 5282426.919 510497.602 5282436.576 510491.507 5282446.567 510485.935 5282457.005 510476.974 5282474.771 510470.575 5282486.651 510499.962 5282501.041 510503.560 5282502.826 510497.984 5282515.819 510495.268 5282523.928 510493.686 5282528.037 510489.685 5282541.367 510490.422 5282548.704 510487.948 5282547.365 510459.313 5282531.754 510444.847 5282523.948 510440.034 5282529.719 510433.042 5282537.042 510430.337 5282539.593 510426.729 5282543.254 510420.340 5282549.133 510413.351 5282555.345 510412.523 5282557.010 510411.017 5282560.230 510402.977 5282566.662 510388.926 5282577.862 510387.347 5282579.082 510386.897 5282579.414 510385.695 5282580.190 510370.218 5282591.387 510335.734 5282616.333 510332.128 5282618.882 510319.058 5282627.528 510316.428 5282629.302 510299.526 5282640.497 510293.967 5282644.155 510296.886 5282648.495 510280.951 5282664.471 510277.943 5282668.578 510273.424 5282677.794 510269.344 5282694.236 510267.148 5282705.234 510263.907 5282713.898 510263.604 5282715.120 510263.377 5282716.453 510263.225 5282717.675 510263.223 5282719.009 510263.370 5282720.232 510263.593 5282721.455 510263.891 5282722.678 510264.339 5282723.790 510264.938 5282724.903 510265.611 5282725.904 510266.360 5282726.906 510267.259 5282727.796 510268.158 5282728.576 510269.207 5282729.244 510275.655 5282732.034 510277.680 5282731.927 510294.480 5282736.180 510319.077 5282743.225 510330.178 5282745.135 510371.947 5282758.213 510421.891 5282772.528 510433.069 5282773.215 510437.278 5282769.110 510440.728 5282769.894 510443.879 5282769.677 510451.594 5282777.027 510456.388 5282781.481 510483.684 5282789.643 510497.626 5282797.004 510515.091 5282806.705 510521.912 5282810.162 510538.993 5282824.753 510547.382 5282832.658 510555.095 5282840.452 510564.231 5282849.916 510571.941 5282860.044 510578.827 5282869.392 510584.066 5282876.181 510583.381 5282881.403 510587.953 5282884.524 510600.925 5282888.771 510609.173 5282891.453 510610.264 5282910.460 510611.214 5282924.021 510612.964 5282951.810 510614.818 5282963.593 510616.679 5282971.710 510620.785 5282982.610 510624.294 5282992.174 510626.304 5283001.180 510625.627 5283001.734 510627.923 5283018.521 510628.366 5283021.967 510629.193 5283021.302 510629.255 5283028.526 510627.892 5283035.303 510625.548 5283045.079 510617.176 5283069.293 510614.676 5283082.291 510614.442 5283087.626 510615.542 5283101.187 510619.121 5283113.641 510620.026 5283110.753 510623.725 5283098.534 510628.700 5283085.873 510636.833 5283069.106 510646.017 5283052.452 510647.071 5283050.564 510659.938 5283029.582 510661.744 5283026.918 510662.271 5283026.030 510668.439 5283017.039 510673.630 5283009.380 510682.200 5283000.393 510689.191 5282993.071 510690.319 5282991.739 510696.330 5282986.749 510700.162 5282983.644 510703.392 5282981.428 510707.750 5282978.435 510711.130 5282976.107 510716.237 5282973.449 510725.249 5282968.686 510734.261 5282963.924 510736.814 5282962.595 510741.398 5282958.936 510754.471 5282948.624 510759.055 5282944.965 510762.211 5282942.526 510767.771 5282937.868 510775.286 5282931.547 510783.101 5282925.004 510792.043 5282917.464 510794.824 5282915.135 510809.395 5282906.604 510815.554 5282903.059 510818.933 5282901.398 510827.269 5282897.190 510834.028 5282893.869 510842.663 5282890.106 510848.519 5282887.672 510859.858 5282882.802 510876.897 5282878.611 510893.833 5282889.313 510902.658 5282904.889 510912.067 5282928.579 510898.536 5282942.558 510894.101 5282947.106 510893.273 5282947.882 510890.793 5282950.545 510879.968 5282961.750 510874.105 5282967.741 510873.653 5282968.296 510872.826 5282969.183 510868.317 5282973.398 510861.327 5282979.942 510858.170 5282982.826 510849.603 5282990.923 510848.250 5282992.143 510843.289 5282996.802 510840.659 5282999.242 510836.074 5283003.568 510829.385 5283009.779 510827.957 5283011.110 510821.644 5283016.989 510813.452 5283024.643 510810.821 5283027.083 510807.514 5283030.188 510805.711 5283031.852 510797.519 5283039.395 510791.356 5283045.051 510783.691 5283052.150 510775.950 5283059.249 510772.267 5283062.687 510765.803 5283068.566 510759.190 5283074.666 510758.364 5283075.331 510752.127 5283080.210 510735.147 5283093.182 510725.005 5283101.055 510719.671 5283104.601 510725.506 5283113.614 510732.326 5283117.850 510742.733 5283129.650 510751.118 5283139.001 510753.214 5283141.450 510760.327 5283149.466 510770.434 5283161.043 510774.701 5283165.941 510775.366 5283171.388 510776.169 5283183.615 510778.286 5283215.294 510782.197 5283250.421 510782.868 5283252.645</gml:posList>
+                </gml:LinearRing>
+              </gml:exterior>
+            </gml:Polygon>
+          </gml:surfaceMember>
+        </gml:MultiSurface>
+      </ft1:geometry>
+    </ft1:entwick>
+  </wfs:member>
+</wfs:FeatureCollection>
diff --git a/autotest/ogr/data/gml/min_example/minimal_example.xsd b/autotest/ogr/data/gml/min_example/minimal_example.xsd
new file mode 100644
index 000000000000..df213dd1a8a4
--- /dev/null
+++ b/autotest/ogr/data/gml/min_example/minimal_example.xsd
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://www.esdi-humboldt.eu/hale/shp/sanier">
+  <import namespace="http://www.esdi-humboldt.eu/hale/shp/entwick" schemaLocation="ft1_schema.xsd"/>
+  <include schemaLocation="ft2_schema.xsd"/>
+</schema>
diff --git a/autotest/ogr/data/gml/same_nested_property_name.gml b/autotest/ogr/data/gml/same_nested_property_name.gml
new file mode 100644
index 000000000000..11dffc32bc8d
--- /dev/null
+++ b/autotest/ogr/data/gml/same_nested_property_name.gml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ogr:FeatureCollection
+     gml:id="aFeatureCollection"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xmlns:ogr="http://ogr.maptools.org/"
+     xmlns:gml="http://www.opengis.net/gml/3.2">
+  <ogr:featureMember>
+    <ogr:test gml:id="test.0">
+      <ogr:geometryProperty><gml:Point gml:id="test.geom.0"><gml:posList>0 0</gml:posList></gml:Point></ogr:geometryProperty>
+      <ogr:foo><ogr:test>foo</ogr:test></ogr:foo>
+      <ogr:bar><ogr:test>bar</ogr:test></ogr:bar>
+    </ogr:test>
+  </ogr:featureMember>
+</ogr:FeatureCollection>
diff --git a/autotest/ogr/data/gmlas/test_ossfuzz_70511.xsd b/autotest/ogr/data/gmlas/test_ossfuzz_70511.xsd
new file mode 100644
index 000000000000..045587271fa4
--- /dev/null
+++ b/autotest/ogr/data/gmlas/test_ossfuzz_70511.xsd
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <!-- matches string recognized in GMLASBaseEntityResolver::resolveEntity() -->
+    <xs:import namespace="http://foo" schemaLocation="foo/gml/3.2.1/gml.xsd"/>
+    <!-- matches string recognized in GMLASErrorHandler::handle() -->
+    <xs:import namespace="http://bar" schemaLocation="foo.http://www.opengis.net/gml/3.2:AbstractCRS' not found"/>
+    <xs:element name="foo">
+      <xs:complexType>
+        <xs:sequence>
+           <xs:element name="x"/>
+         </xs:sequence>
+        <xs:attribute name="y" type="invalid"/>
+      </xs:complexType>
+    </xs:element>
+</xs:schema>
diff --git a/autotest/ogr/data/mitab/utf8.mid b/autotest/ogr/data/mitab/utf8.mid
new file mode 100644
index 000000000000..8a99fb046564
--- /dev/null
+++ b/autotest/ogr/data/mitab/utf8.mid
@@ -0,0 +1,3 @@
+"Значение �","Значение Б","Значение В","Значение Г","Значение Д"
+"Значение 1","Значение 2","Значение 3","Значение 4","Значение 5"
+"Полигон","Синий","Заливка","� а Б б","ЪЫ�Щ"
diff --git a/autotest/ogr/data/mitab/utf8.mif b/autotest/ogr/data/mitab/utf8.mif
new file mode 100644
index 000000000000..55f4f1eb9697
--- /dev/null
+++ b/autotest/ogr/data/mitab/utf8.mif
@@ -0,0 +1,31 @@
+Version   1520
+Charset "UTF-8"
+Delimiter ","
+CoordSys Earth Projection 8, 1001, "m", 39, 0, 1, 7500000, 0 Bounds (-749281.53901, -10002137.4978) (15749281.539, 10002137.4978)
+Columns 5
+  Поле_� Char(10)
+  Поле_Б Char(10)
+  Поле_В Char(10)
+  Поле_Г Char(10)
+  Поле_Д Char(10)
+Data
+
+Point 7404648.72 6144520.22
+    Symbol (35,16711680,12) 
+Pline 4
+7404638.32 6144512.27
+7404646.55 6144515.77
+7404653.33 6144520.94
+7404657.51 6144525.21
+    Pen (2,2,65280) 
+Region  1
+  6
+7404649.37 6144522.85
+7404646.78 6144518.96
+7404642.44 6144519.88
+7404642.59 6144522.85
+7404645.79 6144523.76
+7404649.37 6144522.85
+    Pen (1,2,0) 
+    Brush (2,16777215,16777215)
+    Center 7404645.9 6144521.36
diff --git a/autotest/ogr/data/nas/billionlaugh.xml b/autotest/ogr/data/nas/billionlaugh.xml
new file mode 100644
index 000000000000..24f73f6e6614
--- /dev/null
+++ b/autotest/ogr/data/nas/billionlaugh.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE lolz [
+ <!ENTITY lol "lol">
+ <!ENTITY lol1 "&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;">
+ <!ENTITY lol2 "&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;">
+ <!ENTITY lol3 "&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;">
+ <!ENTITY lol4 "&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;">
+ <!ENTITY lol5 "&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;">
+ <!ENTITY lol6 "&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;">
+ <!ENTITY lol7 "&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;">
+ <!ENTITY lol8 "&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;">
+ <!ENTITY lol9 "&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;">
+]>
+<!--Die NAS-Datei wurde mit der 3A-Version 6.0.9.3 erstellt.-->
+<AX_NutzerbezogeneBestandsdatenaktualisierung_NBA xsi:schemaLocation="http://www.adv-online.de/namespaces/adv/gid/6.0 NAS-Operationen.xsd" xmlns="http://www.adv-online.de/namespaces/adv/gid/6.0" xmlns:gsr="http://www.isotc211.org/2005/gsr" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:fc="http://www.adv-online.de/namespaces/adv/gid/fc/6.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:kom="http://www.lverma.nrw.de/namespaces/geobasis/3.5" xmlns:wfsext="http://www.adv-online.de/namespaces/adv/gid/wfsext" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:gts="http://www.isotc211.org/2005/gts" xmlns:ogc="http://www.adv-online.de/namespaces/adv/gid/ogc" xmlns:wfs="http://www.adv-online.de/namespaces/adv/gid/wfs" xmlns:gss="http://www.isotc211.org/2005/gss">
+  <lolz>&lol9;</lolz>
+  <erlaeuterung>&lt;?xml version="1.0" encoding="utf-8"?&gt;&lt;Protocol xmlns="http://www.aed-sicad.de/namespaces/va" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;&lt;auftragsid&gt;AMGR000000161077&lt;/auftragsid&gt;&lt;profilkennung&gt;NBABenutzerLA&lt;/profilkennung&gt;&lt;auftragsnummer&gt;Admin_100413082150_001_0006&lt;/auftragsnummer&gt;&lt;antragsnummer&gt;Admin_100413082150_0006&lt;/antragsnummer&gt;&lt;nasoperation&gt;NutzerbezogeneBestandsdatenaktualisierung_NBA&lt;/nasoperation&gt;&lt;status&gt;beendet&lt;/status&gt;&lt;startzeitreal&gt;2010-10-13T22:29:43.66646+02:00&lt;/startzeitreal&gt;&lt;endzeitreal&gt;2010-10-13T22:29:43.66646+02:00&lt;/endzeitreal&gt;&lt;Message&gt;&lt;Category&gt;NOTHING&lt;/Category&gt;&lt;MessageLevel&gt;Info&lt;/MessageLevel&gt;&lt;MessageObject&gt;&lt;FeatureClass /&gt;&lt;Id /&gt;&lt;/MessageObject&gt;&lt;MessageText&gt;Das Ergebnis wurde mit der 3A-Version 6.0.9.3 erstellt.&lt;/MessageText&gt;&lt;ProcessingTime&gt;2010-10-13T22:29:43.66646+02:00&lt;/ProcessingTime&gt;&lt;/Message&gt;&lt;/Protocol&gt;</erlaeuterung>
+  <erfolgreich>true</erfolgreich>
+  <antragsnummer>Admin_100413082150_0006</antragsnummer>
+  <allgemeineAngaben>
+    <AX_K_Benutzungsergebnis>
+      <folgeverarbeitung>
+        <AX_FOLGEVA />
+      </folgeverarbeitung>
+      <empfaenger>
+        <AA_Empfaenger>
+          <direkt>true</direkt>
+        </AA_Empfaenger>
+      </empfaenger>
+    </AX_K_Benutzungsergebnis>
+  </allgemeineAngaben>
+  <geaenderteObjekte>
+    <wfs:Transaction version="1.0.0" service="WFS" />
+  </geaenderteObjekte>
+  <auftragsnummer>Admin_100413082150_001_0006</auftragsnummer>
+  <portionskennung>
+    <AX_Portionskennung>
+      <profilkennung>NBABenutzerLA</profilkennung>
+      <datum>2010-10-13T20:10:14Z</datum>
+      <laufendeNummerVonGesamtzahl>16</laufendeNummerVonGesamtzahl>
+      <gesamtzahl>130</gesamtzahl>
+      <suedwestEcke>484560.000 5753705.000</suedwestEcke>
+    </AX_Portionskennung>
+  </portionskennung>
+</AX_NutzerbezogeneBestandsdatenaktualisierung_NBA>
diff --git a/autotest/ogr/data/parquet/schema.json b/autotest/ogr/data/parquet/schema_1_1_0.json
similarity index 52%
rename from autotest/ogr/data/parquet/schema.json
rename to autotest/ogr/data/parquet/schema_1_1_0.json
index ad2fd9459437..26e0f59313aa 100644
--- a/autotest/ogr/data/parquet/schema.json
+++ b/autotest/ogr/data/parquet/schema_1_1_0.json
@@ -7,7 +7,7 @@
   "properties": {
     "version": {
       "type": "string",
-      "const": "1.0.0"
+      "const": "1.1.0"
     },
     "primary_column": {
       "type": "string",
@@ -23,7 +23,7 @@
           "properties": {
             "encoding": {
               "type": "string",
-              "const": "WKB"
+              "pattern": "^(WKB|point|linestring|polygon|multipoint|multilinestring|multipolygon)$"
             },
             "geometry_types": {
               "type": "array",
@@ -36,7 +36,7 @@
             "crs": {
               "oneOf": [
                 {
-                  "$ref": "https://proj.org/schemas/v0.5/projjson.schema.json"
+                  "$ref": "https://proj.org/schemas/v0.7/projjson.schema.json"
                 },
                 {
                   "type": "null"
@@ -71,6 +71,56 @@
             },
             "epoch": {
               "type": "number"
+            },
+            "covering": {
+              "type": "object",
+              "required": [
+                "bbox"
+              ],
+              "properties": {
+                "bbox": {
+                  "type": "object",
+                  "required": ["xmin", "xmax", "ymin", "ymax"],
+                  "properties": {
+                    "xmin": {
+                      "type": "array",
+                      "items": [
+                        { "type": "string", "minLength": 1 },
+                        { "const": "xmin" }
+                      ],
+                      "minItems": 2,
+                      "maxItems": 2
+                    },
+                    "xmax": {
+                      "type": "array",
+                      "items": [
+                        { "type": "string", "minLength": 1 },
+                        { "const": "xmax" }
+                      ],
+                      "minItems": 2,
+                      "maxItems": 2
+                    },
+                    "ymin": {
+                      "type": "array",
+                      "items": [
+                        { "type": "string", "minLength": 1 },
+                        { "const": "ymin" }
+                      ],
+                      "minItems": 2,
+                      "maxItems": 2
+                    },
+                    "ymax": {
+                      "type": "array",
+                      "items": [
+                        { "type": "string", "minLength": 1 },
+                        { "const": "ymax" }
+                      ],
+                      "minItems": 2,
+                      "maxItems": 2
+                    }
+                  }
+                }
+              }
             }
           }
         }
diff --git a/autotest/ogr/data/shp/date_empty_string.dbf b/autotest/ogr/data/shp/date_empty_string.dbf
new file mode 100644
index 000000000000..2aaa96f938aa
Binary files /dev/null and b/autotest/ogr/data/shp/date_empty_string.dbf differ
diff --git a/autotest/ogr/data/xlsx/row_without_r_attribute.xlsx b/autotest/ogr/data/xlsx/row_without_r_attribute.xlsx
new file mode 100644
index 000000000000..53fbf6b644cf
Binary files /dev/null and b/autotest/ogr/data/xlsx/row_without_r_attribute.xlsx differ
diff --git a/autotest/ogr/data/xlsx/with_xml_prefix.xlsx b/autotest/ogr/data/xlsx/with_xml_prefix.xlsx
new file mode 100644
index 000000000000..4d23ef8ddf26
Binary files /dev/null and b/autotest/ogr/data/xlsx/with_xml_prefix.xlsx differ
diff --git a/autotest/ogr/data/xodr/5g_living_lab_A39_Wolfsburg-West.xodr b/autotest/ogr/data/xodr/5g_living_lab_A39_Wolfsburg-West.xodr
new file mode 100644
index 000000000000..57cc798a758c
--- /dev/null
+++ b/autotest/ogr/data/xodr/5g_living_lab_A39_Wolfsburg-West.xodr
@@ -0,0 +1,7424 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<OpenDRIVE>
+   <header revMajor="1" revMinor="5" name="A39 Wolfsburg-West (excerpt from DOI https://doi.org/10.5281/zenodo.7072631), CC BY 4.0 International" north="5809625.125783434" south="5809312.122844906" east="618707.2351308718" west="618103.5052432719" vendor="German Aerospace Center (DLR), Institute of Transportation Systems">
+      <geoReference><![CDATA[+proj=utm +zone=32 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs]]></geoReference>
+   </header>
+   <road length="323.91588390559633" id="255959" junction="-1">
+      <link>
+         <successor elementType="junction" elementId="2104802"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618704.7812043082" y="5809570.242840896" hdg="3.226490809114308" length="323.91588390559633">
+            <paramPoly3 aU="0.0" bU="323.90094973436425" cU="-0.1319857746373292" dU="0.09317153846652793" aV="0.0" bV="-6.750155989720952E-14" cV="17.721939903656395" dV="-12.576797982945743" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="103.29337049393511" b="-0.0024543736345764323" c="4.655766256419369E-6" d="0.0"/>
+         <elevation s="10.122371372049885" a="103.26900345351484" b="-0.002360118844438562" c="-4.999104644666727E-6" d="3.8793248812777765E-7"/>
+         <elevation s="20.24474274409977" a="103.24500358284261" b="-0.0023420789480530263" c="-2.1195980940035698E-5" d="2.3759718781101906E-6"/>
+         <elevation s="30.367114116149658" a="103.22158866772514" b="-0.002040842770865385" c="7.371757805009257E-5" d="-3.692540168283489E-6"/>
+         <elevation s="35.474370583980075" a="103.21259650172841" b="-0.0015768030297804766" c="2.425898795801434E-5" d="-3.7735828911533177E-6"/>
+         <elevation s="40.48948548819954" a="103.20482281170978" b="-0.001618212229138831" c="8.886114149552748E-8" d="3.9044109534484744E-7"/>
+         <elevation s="50.611856860249425" a="103.18885672235099" b="-0.0014963966605567945" c="1.1792914935911933E-5" d="-5.374593700709662E-7"/>
+         <elevation s="60.734228232299316" a="103.17436053732938" b="-0.0014228602658931495" c="-1.3305420869655816E-5" d="7.552646784350713E-7"/>
+         <elevation s="70.8565996043492" a="103.15937784411496" b="-0.0014600663887677895" c="-8.782052649179821E-7" d="1.2074585985396994E-7"/>
+         <elevation s="80.97897097639908" a="103.14463375995518" b="-0.0014407296958658248" c="-2.6550130408044906E-5" d="2.61556348422112E-6"/>
+         <elevation s="91.10134234844897" a="103.13004253311408" b="-0.0011742395027487744" c="4.949449445708439E-7" d="-8.104272302051354E-8"/>
+         <elevation s="101.22371372049885" a="103.11812310356336" b="-0.0011891309659164452" c="3.9136538457974016E-5" d="-2.0109611418336035E-6"/>
+         <elevation s="111.34608509254873" a="103.10801060860182" b="-0.0010149655408715353" c="3.0969821795083697E-6" d="-6.236210422755466E-7"/>
+         <elevation s="121.46845646459863" a="103.09740727835" b="-0.0011439610635145929" c="5.6452326652701594E-6" d="-1.6610719462980046E-6"/>
+         <elevation s="123.30037905598387" a="103.09532036332207" b="-0.001140001180254705" c="3.1669471682902825E-6" d="-1.5758508647035503E-6"/>
+         <elevation s="131.59082783664851" a="103.08518896712138" b="-0.0014124223285551698" c="-2.2105112480031185E-5" d="7.516772512194594E-7"/>
+         <elevation s="141.7131992086984" a="103.06940657229916" b="-0.0016288786735398919" c="-2.1952716405529303E-5" d="1.4966558530186085E-6"/>
+         <elevation s="151.83557058074828" a="103.05222140469421" b="-0.001613252907831391" c="8.343361555420764E-6" d="8.686167895187385E-9"/>
+         <elevation s="161.95794195279817" a="103.03675534947892" b="-0.0014416736826356894" c="2.85739435949918E-5" d="-1.8969074718701052E-6"/>
+         <elevation s="172.08031332484805" a="103.02312254669634" b="-0.0014462866342916034" c="-1.0685620744164824E-5" d="4.178361683749507E-9"/>
+         <elevation s="182.20268469689793" a="103.00739215554324" b="-0.0016613299023921827" c="-2.6652848883144535E-4" d="1.8248398712165882E-5"/>
+         <elevation s="192.32505606894782" a="102.9821929626672" b="-0.0014478062880479202" c="1.3573785707282483E-4" d="-7.377982319733339E-6"/>
+         <elevation s="202.4474274409977" a="102.9737935901597" b="-9.677256664406644E-4" c="5.9340117327896304E-6" d="-1.9241458468741156E-6"/>
+         <elevation s="212.56979881304758" a="102.96261027278324" b="-0.0014390509423950991" c="-2.4757103921777793E-5" d="1.6572973327597945E-6"/>
+         <elevation s="222.69217018509747" a="102.94722587900462" b="-0.001430820144789118" c="8.199924652076611E-5" d="-4.11470670186257E-6"/>
+         <elevation s="232.81454155714735" a="102.93687680647419" b="-0.0010355746927521957" c="3.300713078878161E-5" d="-3.3810726564146316E-6"/>
+         <elevation s="235.08550756805522" a="102.93465567957979" b="-9.379700308284783E-4" c="2.7790321618489433E-5" d="-3.843242756965974E-6"/>
+         <elevation s="242.93691292919726" a="102.92714430301528" b="-0.0012123289675708359" c="-1.2741972187251984E-5" d="-8.947689605285342E-8"/>
+         <elevation s="253.05928430124715" a="102.91347428382143" b="-0.0014977909696854595" c="-7.466881653200214E-5" d="5.0228825610702796E-6"/>
+         <elevation s="263.18165567329703" a="102.89587188644508" b="-0.0014654721119499866" c="-5.843841692634037E-6" d="-1.4008615073040973E-6"/>
+         <elevation s="273.3040270453469" a="102.87898613843026" b="-0.002014386089191782" c="-9.123052078047436E-5" d="2.3095796134522046E-6"/>
+         <elevation s="275.01018560422875" a="102.87529517714421" b="-0.002305524157355631" c="-6.112282450956682E-5" d="2.767550979264203E-6"/>
+         <elevation s="283.4263984173968" a="102.8532117591969" b="-0.002746270744034666" c="-5.181031921748499E-5" d="3.2156296454188095E-6"/>
+         <elevation s="293.5487697894467" a="102.82343950751141" b="-0.0028067139139777244" c="-1.3791487520472167E-5" d="-2.8556229504772807E-7"/>
+         <elevation s="303.67114116149656" a="102.79331962349782" b="-0.0031736972270677505" c="-2.7179028970798022E-5" d="5.961100748271339E-7"/>
+         <elevation s="313.79351253354645" a="102.75902771595291" b="-0.003540693065900037" c="4.005233291690202E-6" d="-6.295294321239888E-7"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.025177632738165118" b="-1.8984798269067378E-5" c="-2.362215661001183E-6" d="1.0453542105628015E-22"/>
+         <superelevation s="10.122371372049885" a="0.024743423268536416" b="-6.680724663212061E-5" c="-1.3430188727004744E-5" d="1.093417012594946E-6"/>
+         <superelevation s="20.24474274409977" a="0.02382513721665621" b="-2.595561285241912E-6" c="1.2820915128693082E-7" d="0.0"/>
+         <superelevation s="30.367114116149658" a="0.023812000599032143" b="0.0" c="1.555368983008027E-5" d="-1.0243772108597355E-6"/>
+         <superelevation s="40.48948548819954" a="0.02434322340668737" b="0.0" c="-5.724704773657737E-6" d="3.770331781783217E-7"/>
+         <superelevation s="50.611856860249425" a="0.024147701072367803" b="0.0" c="1.930503272717745E-6" d="-1.8034631304966994E-8"/>
+         <superelevation s="60.734228232299316" a="0.024326800232082696" b="3.353892718426049E-5" c="3.0285877746896483E-6" d="-1.4455021649035843E-7"/>
+         <superelevation s="70.8565996043492" a="0.02482668802512625" b="5.0419020303115634E-5" c="8.630575582856817E-7" d="-7.51653641308004E-8"/>
+         <superelevation s="80.97897097639908" a="0.025347520327528815" b="4.478652723214438E-5" c="2.4485716892602177E-6" d="-3.069653816149056E-7"/>
+         <superelevation s="91.10134234844897" a="0.025733379747342633" b="0.0" c="-1.5784685225015695E-5" d="7.703201068645854E-7"/>
+         <superelevation s="101.22371372049885" a="0.024914990098889103" b="-8.277034585468739E-5" c="-1.3525487366731745E-6" d="1.1487386334680718E-7"/>
+         <superelevation s="111.34608509254873" a="0.024057715388674322" b="-7.484159111414136E-5" c="-4.251470949351366E-6" d="5.161353829183832E-7"/>
+         <superelevation s="121.46845646459863" a="0.023399841340224208" b="-2.2581131948308676E-6" c="3.34622161917383E-7" d="-2.2038456511707855E-8"/>
+         <superelevation s="131.59082783664851" a="0.023388412610045105" b="-2.2581131948308676E-6" c="-1.7560386449520138E-5" d="8.086989457226942E-7"/>
+         <superelevation s="141.7131992086984" a="0.02240502798013821" b="-1.0917990946157368E-4" c="-1.3703777751604853E-5" d="1.236399353043196E-6"/>
+         <superelevation s="151.83557058074828" a="0.021178093430171442" b="-6.556021314524374E-6" c="3.238382130803985E-7" d="0.0"/>
+         <superelevation s="161.95794195279817" a="0.021144912188937097" b="0.0" c="2.8644394786108876E-5" d="-1.5064833996019197E-6"/>
+         <superelevation s="172.08031332484805" a="0.022517417619237732" b="1.1682467954079479E-4" c="5.979314001154364E-6" d="-7.738589901841268E-7"/>
+         <superelevation s="182.20268469689793" a="0.023509997772402383" b="0.0" c="-1.0030204385115243E-4" d="6.605964825469563E-6"/>
+         <superelevation s="192.32505606894782" a="0.020084268319760245" b="0.0" c="5.957923350919836E-5" d="-3.3158304187436404E-6"/>
+         <superelevation s="202.4474274409977" a="0.02274984478346867" b="1.8692240537017117E-4" c="-4.180434601373621E-6" d="-3.3277436443942114E-7"/>
+         <superelevation s="212.56979881304758" a="0.023868464329587693" b="0.0" c="-2.8878903651584632E-5" d="1.4999532882749981E-6"/>
+         <superelevation s="222.69217018509747" a="0.022465157771092578" b="-1.235795238730098E-4" c="1.369581942693762E-5" d="-1.2060962970533809E-6"/>
+         <superelevation s="232.81454155714735" a="0.021366628660340274" b="-2.1704975452404107E-4" c="-5.4257490332159816E-5" d="4.279549246276413E-6"/>
+         <superelevation s="242.93691292919726" a="0.018048805580525757" b="0.0" c="7.017189392472311E-6" d="2.0907084211256045E-22"/>
+         <superelevation s="253.05928430124715" a="0.01876780366232659" b="1.4206119403722836E-4" c="3.672964573498595E-5" d="-2.6658865947449863E-6"/>
+         <superelevation s="263.18165567329703" a="0.02120424998985395" b="6.618398960331895E-5" c="-9.807581717373212E-6" d="6.45934393361232E-7"/>
+         <superelevation s="273.3040270453469" a="0.02153921945067829" b="6.618398960331895E-5" c="2.1892296640642134E-5" d="-9.659737913537784E-7"/>
+         <superelevation s="283.4263984173968" a="0.023450423896158906" b="2.1245991781585958E-4" c="3.4651852929894055E-6" d="-1.1151335140341865E-7"/>
+         <superelevation s="293.5487697894467" a="0.025840415830292948" b="2.48333925048677E-4" c="3.6956822786671857E-6" d="-2.4579774895854894E-7"/>
+         <superelevation s="303.67114116149656" a="0.028477880323401924" b="2.475969786079347E-4" c="2.0253435963899516E-6" d="-3.265809355301199E-7"/>
+         <superelevation s="313.79351253354645" a="0.03085295296642696" b="1.8821273719001638E-4" c="-4.5862034285448586E-6" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="3.4800343205990814" b="0.007860051256802019" c="-7.182959259161647E-7" d="1.8945779588459565E-7"/>
+         <laneOffset s="5.432783269634432" a="3.5227454543949284" b="0.007869022181353597" c="9.770930108525953E-5" d="-2.2576476958564796E-6"/>
+         <laneOffset s="10.122371372049885" a="3.5615639318226364" b="0.00863650276642378" c="6.044621563968048E-5" d="-2.549034917993312E-6"/>
+         <laneOffset s="20.24474274409977" a="3.6525355212439012" b="0.009076680128983801" c="-1.9339519676543174E-5" d="-2.7018641048544095E-6"/>
+         <laneOffset s="30.367114116149658" a="3.7396292025977953" b="0.00785463806858465" c="-1.0000177269797285E-4" d="-2.7973660857050666E-6"/>
+         <laneOffset s="40.48948548819954" a="3.805989021101191" b="0.004970253359490471" c="-1.849295948993651E-4" d="-2.224799391831027E-6"/>
+         <laneOffset s="42.42283411089362" a="3.814890939319227" b="0.0042302387925383135" c="-5.5179998269409954E-5" d="-2.5124838460621745E-6"/>
+         <laneOffset s="50.611856860249425" a="3.8444523380115143" b="0.0028210360646861673" c="-1.1714338682706856E-4" d="-2.6081375036967632E-6"/>
+         <laneOffset s="59.8206838525588" a="3.8584599429087487" b="-0.0" c="-8.483186816871087E-5" d="7.483502278992369E-7"/>
+         <laneOffset s="70.8565996043492" a="3.8491339904236264" b="-0.001598966752614362" c="-5.735170005065764E-5" d="7.262272506555277E-7"/>
+         <laneOffset s="80.97897097639908" a="3.827825477846203" b="-0.0025368042001546547" c="-2.5461074914616335E-5" d="-2.5124153473185133E-6"/>
+         <laneOffset s="82.65151530024461" a="3.823499580408273" b="-0.0026430584789204777" c="5.79812008016489E-6" d="-4.664838513775209E-6"/>
+         <laneOffset s="91.10134234844897" a="3.798765813957235" b="-0.0035442747471499457" c="-1.1509625772339152E-4" d="-3.74488329167294E-6"/>
+         <laneOffset s="94.26678720394173" a="3.786274558668222" b="-0.004385508114808118" c="-1.5194580353708505E-4" d="2.14279740819408E-6"/>
+         <laneOffset s="101.22371372049885" a="3.7491323974423243" b="-0.006188533053905036" c="-1.135490166700178E-4" d="1.9058570576135979E-6"/>
+         <laneOffset s="111.34608509254873" a="3.6768319460528756" b="-0.007901467608152211" c="-5.988547709656358E-5" d="1.892795723334813E-6"/>
+         <laneOffset s="120.69190651351337" a="3.599300679609109" b="-0.008524850361867599" c="-1.258644674814436E-4" d="5.63797226551602E-6"/>
+         <laneOffset s="131.59082783664851" a="3.4987371785708286" b="-0.009259279477892998" c="5.4131813628712344E-5" d="7.3818115667105565E-6"/>
+         <laneOffset s="133.2355195630569" a="3.48368778637354" b="-0.009021315544177243" c="-1.0912798771395705E-5" d="5.992477526405594E-7"/>
+         <laneOffset s="141.7131992086984" a="3.4067887703874367" b="-0.009077140268734329" c="-1.3816320197240586E-6" d="5.304348559558127E-7"/>
+         <laneOffset s="151.83557058074828" a="3.3153151673896537" b="-0.008942062164895152" c="1.2015869606863206E-5" d="3.6156048850871474E-7"/>
+         <laneOffset s="161.95794195279817" a="3.22640646516434" b="-0.008587664907284779" c="2.5708723387625478E-5" d="1.7320182259960023E-7"/>
+         <laneOffset s="172.08031332484805" a="3.142292747742737" b="-0.008013958391599383" c="3.584057102611661E-5" d="2.2049729116540514E-7"/>
+         <laneOffset s="182.20268469689793" a="3.0650734872649537" b="-0.007220597204983794" c="3.802160327596458E-5" d="7.932587024369012E-7"/>
+         <laneOffset s="192.32505606894782" a="2.9967024438034304" b="-0.0062070220513055375" c="6.258186047936836E-5" d="-3.826924546035534E-7"/>
+         <laneOffset s="198.7536571097105" a="2.959284618862584" b="-0.005449840915911912" c="4.252756368730043E-5" d="-2.4307621038440835E-6"/>
+         <laneOffset s="202.4474274409977" a="2.939611897150162" b="-0.005235162321395381" c="3.3445222344667115E-5" d="2.414551003320633E-7"/>
+         <laneOffset s="212.56979881304758" a="2.890296945935653" b="-0.0044838521902025585" c="4.028442089491895E-5" d="5.677422172796001E-7"/>
+         <laneOffset s="222.69217018509747" a="2.8496262083547834" b="-0.0034937877583622787" c="5.246579748514907E-5" d="6.07466579017095E-7"/>
+         <laneOffset s="229.75184201265378" a="2.8277897895984228" b="-0.0026621786144256404" c="1.4023429248582799E-5" d="5.369009084154852E-6"/>
+         <laneOffset s="233.6127279442813" a="2.8180294586083887" b="-0.0023137944548588495" c="1.2595686189059841E-5" d="2.482387484731531E-6"/>
+         <laneOffset s="242.93691292919726" a="2.7995626293797566" b="-0.0014314459652560252" c="7.718854543053382E-5" d="1.961304820360483E-6"/>
+         <laneOffset s="250.19916989234932" a="2.793989261402136" b="-0.0" c="2.9781586268460446E-4" d="-6.426338976827953E-6"/>
+         <laneOffset s="253.05928430124715" a="2.7962751173270237" b="0.0015458676164367272" c="2.5333821722636616E-4" d="-5.140302111426048E-6"/>
+         <laneOffset s="263.18165567329703" a="2.8325492772169465" b="0.005094571544419328" c="1.0333299544854776E-4" d="-5.280081154635988E-6"/>
+         <laneOffset s="266.644100697624" a="2.8512085872549195" b="0.005620240012868663" c="7.614562231031977E-5" d="1.791716265225621E-6"/>
+         <laneOffset s="273.3040270453469" a="2.8925456521489687" b="0.006872901162114715" c="1.1646519394789388E-4" d="1.6309744232386395E-6"/>
+         <laneOffset s="283.4263984173968" a="2.9757405991476564" b="0.009732049724196208" c="1.749205718845643E-4" d="1.5301470102762207E-6"/>
+         <laneOffset s="293.5487697894467" a="3.0937618137337717" b="0.013743619317797008" c="2.499200988055098E-4" d="-3.8926190774532E-6"/>
+         <laneOffset s="296.2417287216495" a="3.132509223077494" b="0.015004980297211678" c="4.3331743847764505E-4" d="-1.1321948247865258E-5"/>
+         <laneOffset s="303.67114116149656" a="3.2632620238804058" b="0.019568783719334095" c="1.9721801480067252E-4" d="-1.0946851058959263E-5"/>
+         <laneOffset s="313.79351253354645" a="3.4701982882735836" b="0.02019648972560269" c="-1.1763152559089946E-4" d="-1.1880017709691984E-5"/>
+         <laneOffset s="318.90467119568814" a="3.568766489491975" b="0.018062964231860792" c="-0.001386873975492813" d="2.6703848376682216E-4"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                     <successor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.546373606885485" b="0.0078034038138833865" c="-1.6187680347036653E-4" d="-1.0363363053335543E-7"/>
+                  <width sOffset="5.432783269634432" a="0.583973375434101" b="0.006035344353118919" c="-2.5890560821256E-4" d="2.3434718611994085E-6"/>
+                  <width sOffset="10.122371372049885" a="0.6068244339925117" b="0.0037616375959768945" c="-2.2450298054277587E-4" d="2.731015120793737E-6"/>
+                  <width sOffset="20.24474274409977" a="0.6247305184538336" b="5.611161871652004E-5" c="-1.421020394350236E-4" d="2.7289615523828685E-6"/>
+                  <width sOffset="24.214738028644895" a="0.6228843832279876" b="-9.431448703756378E-4" c="-1.5159326735014555E-5" d="-2.5365458320053808E-6"/>
+                  <width sOffset="30.367114116149658" a="0.6159172885716107" b="-0.0014177145844697344" c="-6.175624392561005E-5" d="-2.553667286317431E-6"/>
+                  <width sOffset="40.48948548819954" a="0.5925903940321366" b="-0.003452918509264136" c="-1.3930826798682784E-4" d="-2.4088317351319044E-6"/>
+                  <width sOffset="42.26678834446002" a="0.5859999408358667" b="-0.003970931566838037" c="1.89802663901045E-4" d="2.2907348814693403E-6"/>
+                  <width sOffset="42.42283411089362" a="0.5853849242285447" b="-0.003911528422403038" c="4.8221507166730445E-5" d="2.5784192156086746E-6"/>
+                  <width sOffset="50.611856860249425" a="0.5580030237886318" b="-0.0026030272822750973" c="1.1153927314529693E-4" d="2.5712694773614713E-6"/>
+                  <width sOffset="59.8206838525588" a="0.5454989898281863" b="1.0541465391994253E-4" c="7.820922065688614E-5" d="-7.852182548368224E-7"/>
+                  <width sOffset="60.734228232299316" a="0.5456599626819849" b="2.4634389878110455E-4" c="7.86805114300944E-5" d="-9.302752245074081E-7"/>
+                  <width sOffset="68.29611711357086" a="0.551619653923388" b="0.0012767050180618506" c="-4.662186183629878E-6" d="-2.510383217149887E-6"/>
+                  <width sOffset="70.8565996043492" a="0.5548159280864717" b="0.001203455377172462" c="-1.8198928226469264E-5" d="-8.371627480415816E-7"/>
+                  <width sOffset="80.97897097639908" a="0.5642647706429558" b="5.776896384351647E-4" c="-4.871651584644295E-5" d="2.133420181869381E-6"/>
+                  <width sOffset="82.65151530024461" a="0.5651046841774412" b="4.326326920718643E-4" c="-8.18773694794581E-5" d="4.2858433483266996E-6"/>
+                  <width sOffset="86.35973002599064" a="0.5658016351310469" b="2.197007632792191E-6" c="-2.8917430970393877E-4" d="1.2944100035053014E-5"/>
+                  <width sOffset="91.10134234844897" a="0.5606904865855689" b="-0.0018670457014412748" c="-1.031968858564644E-4" d="1.245371497412077E-5"/>
+                  <width sOffset="94.26678720394173" a="0.5541414248663341" b="-0.00214601359541167" c="1.6354639296866638E-5" d="6.5660342742534025E-6"/>
+                  <width sOffset="101.22371372049885" a="0.5422141415568862" b="-9.650924858084107E-4" c="1.460763987936345E-4" d="9.599814187381834E-6"/>
+                  <width sOffset="103.69597193893918" a="0.5408660704216413" b="-6.679138990591579E-5" c="2.5600919149831088E-5" d="-4.4038374895339357E-7"/>
+                  <width sOffset="111.34608509254873" a="0.5416562155569076" b="2.475891056549053E-4" c="1.436366946004059E-5" d="-6.004894769265606E-7"/>
+                  <width sOffset="120.69190651351337" a="0.5447345423614154" b="3.587215454697659E-4" c="1.1657565004212718E-4" d="-4.345666016707664E-6"/>
+                  <width sOffset="121.46845646459863" a="0.5450813711534526" b="5.319134774735817E-4" c="1.0449615465488248E-4" d="-4.467945579437206E-6"/>
+                  <width sOffset="128.77525839791414" a="0.5528039699529836" b="0.0013433566960021001" c="-2.536864816161631E-5" d="-5.5150620946990706E-6"/>
+                  <width sOffset="131.59082783664851" a="0.556262078324953" b="0.0010693414880467277" c="-7.039381578946604E-5" d="-7.120389031928814E-6"/>
+                  <width sOffset="133.2355195630569" a="0.5577987214229201" b="7.800070459123183E-4" c="-4.059324949189406E-6" d="-3.378252178600176E-7"/>
+                  <width sOffset="141.7131992086984" a="0.5639137865014403" b="6.383401713437771E-4" c="-1.2661166217939604E-5" d="-2.407601112220697E-7"/>
+                  <width sOffset="151.83557058074828" a="0.5688283019165681" b="3.080115403765113E-4" c="-2.0565396656917582E-5" d="-2.477094876862416E-7"/>
+                  <width sOffset="157.25455440227165" a="0.5698540825197029" b="6.330218293070129E-5" c="-1.7271558656191337E-4" d="5.772280404906758E-6"/>
+                  <width sOffset="161.95794195279817" a="0.5669316203906507" b="-0.001178313855409589" c="-9.079104894982917E-5" d="5.733346856934737E-6"/>
+                  <width sOffset="172.08031332484805" a="0.5516480332633975" b="-0.001253997810152306" c="8.480537185615836E-5" d="5.672707863583327E-6"/>
+                  <width sOffset="180.993319640687" a="0.5512248656196492" b="0.0016096921752803452" c="3.967399822862969E-4" d="-2.4658041978720145E-5"/>
+                  <width sOffset="182.20268469689793" a="0.5537082141456695" b="0.0024611072356081507" c="3.081604170822453E-4" d="-2.2376990087887497E-5"/>
+                  <width sOffset="192.32505606894782" a="0.5869867374822961" b="0.0018213351285447594" c="-3.6834833010930166E-4" d="-2.5222690524371173E-5"/>
+                  <width sOffset="194.4886270811495" a="0.588947622885696" b="-1.2676564409222924E-4" c="-3.622550168982112E-4" d="1.0911263733262867E-5"/>
+                  <width sOffset="198.7536571097105" a="0.5826638985629278" b="-0.002621379282619833" c="-2.0997064902643424E-4" d="1.2959333382491727E-5"/>
+                  <width sOffset="202.4474274409977" a="0.5707694177754861" b="-0.003642096917675133" c="-6.823140162929847E-5" d="1.010137586731137E-5"/>
+                  <width sOffset="207.68017328984942" a="0.5512902996221998" b="-0.003526395702188439" c="-6.665674240774627E-4" d="4.2917269874052273E-5"/>
+                  <width sOffset="212.56979881304758" a="0.5231281302185673" b="-0.006966671255124927" c="-3.6892591674126074E-5" d="4.326293415750996E-5"/>
+                  <width sOffset="221.8757865384393" a="0.4899675246930242" b="0.00358657771203966" c="-5.153562189512693E-5" d="1.050592134334017E-6"/>
+                  <width sOffset="222.69217018509747" a="0.4928617721395874" b="0.0035045326372219" c="-4.390324707382799E-5" d="1.0108677716917625E-6"/>
+                  <roadMark sOffset="0.0" type="curb" weight="standard" color="standard" width="0.12">
+                     <type name="curb" width="0.12">
+                        <line length="229.75184201265378" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.0"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.1265611754830366">
+                     <type name="solid" width="0.126561">
+                        <line length="229.75184201265378" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.126561"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="1"/>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="3.1773007020500676" b="-0.007680407140990728" c="1.4631526739111936E-4" d="1.8148538396939583E-7"/>
+                  <width sOffset="5.432783269634432" a="3.1399223304209154" b="-0.006074539171131351" c="2.446129272440894E-4" d="-2.265620107772605E-6"/>
+                  <width sOffset="10.122371372049885" a="3.1165811654932685" b="-0.003929749584695627" c="2.083507512908082E-4" d="-2.7364744586447884E-6"/>
+                  <width sOffset="13.629653552544172" a="3.1052432930848397" b="-0.0025692441793275216" c="4.678662540733791E-5" d="2.5821290143187726E-6"/>
+                  <width sOffset="20.24474274409977" a="3.091042323572056" b="-0.0016112714912504215" c="9.613617378722077E-5" d="2.4784636691235977E-6"/>
+                  <width sOffset="30.367114116149658" a="3.087153348002578" b="0.0010968286393383923" c="1.7248594848012723E-4" d="2.405477346374942E-6"/>
+                  <width sOffset="39.54185932142676" a="3.1135933728564233" b="0.004869307916415342" c="-1.7227644540077745E-4" d="-2.8018650178428523E-6"/>
+                  <width sOffset="40.48948548819954" a="3.1180505687189064" b="0.004535252395964724" c="-1.8022169427537595E-4" d="-2.229298325255209E-6"/>
+                  <width sOffset="42.42283411089362" a="3.126129043276168" b="0.0038133914065488577" c="-5.049819166563834E-5" d="-2.516982779486397E-6"/>
+                  <width sOffset="50.611856860249425" a="3.152588361011468" b="0.0024799624235799823" c="-1.125857130642337E-4" d="-2.602330540792887E-6"/>
+                  <width sOffset="59.8206838525588" a="3.16384611470092" b="-2.5565464794707025E-4" c="-8.011376845578205E-5" d="7.541571909091361E-7"/>
+                  <width sOffset="60.734228232299316" a="3.16354627779792" b="-4.0014143795410795E-4" c="-7.838553476302764E-5" d="7.648446793723933E-7"/>
+                  <width sOffset="70.8565996043492" a="3.1522575955821246" b="-0.0017519329546295801" c="-5.297271813719162E-5" d="7.438090603043673E-7"/>
+                  <width sOffset="80.97897097639908" a="3.129867618499963" b="-0.0025957146164960893" c="-2.1219247009130727E-5" d="-2.469911021082396E-6"/>
+                  <width sOffset="82.65151530024461" a="3.1254552557566226" b="-0.0026874228995074243" c="1.025321909442208E-5" d="-4.622334187539226E-6"/>
+                  <width sOffset="87.31883017280465" a="3.112665599359305" b="-0.002893789295923983" c="1.6456022372961213E-4" d="-6.174721331899477E-6"/>
+                  <width sOffset="91.10134234844897" a="3.103740071784634" b="-0.0019139197897081845" c="9.195263972703613E-5" d="-5.336372235441582E-6"/>
+                  <width sOffset="94.26678720394173" a="3.0984337750097866" b="-0.001492189776865166" c="3.99897824444589E-5" d="5.513084644258728E-7"/>
+                  <width sOffset="101.22371372049885" a="3.0901738083911003" b="-8.55729772859604E-4" c="4.596906661324788E-5" d="3.162672588220557E-7"/>
+                  <width sOffset="111.34608509254873" a="3.086549915364506" b="1.721186641345119E-4" c="5.1998565052456444E-5" d="3.122746414498937E-7"/>
+                  <width sOffset="120.69190651351337" a="3.092955199324267" b="0.0012258835733861984" c="-5.829422868296919E-5" d="4.057451183888074E-6"/>
+                  <width sOffset="121.46845646459863" a="3.0938739060291356" b="0.0011426871047725204" c="-4.858103028424862E-5" d="4.073761985439211E-6"/>
+                  <width sOffset="131.59082783664851" a="3.1046880333126756" b="0.0014113989614050661" c="7.099580879870078E-5" d="5.803101232917933E-6"/>
+                  <width sOffset="133.2355195630569" a="3.1072272114113724" b="0.0016920237559176089" c="-1.8382790745599802E-6" d="-9.7946258115198E-7"/>
+                  <width sOffset="141.7131992086984" a="3.120842741403745" b="0.0014496700549126822" c="-3.2053346628432635E-5" d="-1.0454644624846464E-6"/>
+                  <width sOffset="151.83557058074828" a="3.131148260650972" b="4.7939589762964474E-4" c="-6.631029813189755E-5" d="-1.2028240991575475E-6"/>
+                  <width sOffset="159.21523219073973" a="3.1305914153758616" b="-6.958144813166145E-4" c="6.947960935623922E-5" d="-1.0882608238330231E-6"/>
+                  <width sOffset="161.95794195279817" a="3.129183202662246" b="-3.3924886085572384E-4" c="6.32055264424128E-5" d="-1.2729148286055309E-6"/>
+                  <width sOffset="172.08031332484805" a="3.130905170267362" b="5.490530285956804E-4" c="2.9392986031616097E-5" d="-1.230266128479288E-6"/>
+                  <width sOffset="182.20268469689793" a="3.138198579005114" b="7.65938400702269E-4" c="-1.2743737186155208E-5" d="-6.396371185950811E-7"/>
+                  <width sOffset="192.32505606894782" a="3.1439825303956246" b="3.11328452659544E-4" c="-3.1405903756784445E-5" d="-2.077272097452869E-6"/>
+                  <width sOffset="193.69613052219566" a="3.1443449926705407" b="2.1349393834298874E-4" c="-1.0667277954372726E-5" d="4.977950977965769E-7"/>
+                  <width sOffset="198.7536571097105" a="3.1452162870951716" b="1.4379252260641497E-4" c="-1.5788207583804352E-5" d="-1.5502745514391225E-6"/>
+                  <width sOffset="202.4474274409977" a="3.145453880221041" b="-3.6299058358304354E-5" c="-1.4555317651158766E-5" d="1.1403987723891823E-6"/>
+                  <width sOffset="212.56979881304758" a="3.144777853687227" b="1.9576273268530515E-5" c="1.9341109960509563E-5" d="1.5342349335068608E-6"/>
+                  <width sOffset="217.4171434708474" a="3.145501944381856" b="3.1523093044163227E-4" c="2.449727241783099E-4" d="-1.7671410577380692E-5"/>
+                  <width sOffset="222.69217018509747" a="3.1513875320717952" b="0.0014245371858847733" c="-4.063058655003383E-5" d="-1.768713111303382E-5"/>
+                  <roadMark sOffset="0.0" type="broken" weight="standard" color="standard" width="0.12776277635737676">
+                     <type name="broken" width="0.127763">
+                        <line length="4.0" space="8.0" tOffset="-0.0" sOffset="0.0" width="0.127763"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="driving" level="false">
+                  <link>
+                     <predecessor id="2"/>
+                     <successor id="-2"/>
+                  </link>
+                  <width sOffset="0.0" a="3.2156008729874554" b="-0.0015600850489988528" c="1.4138731466849453E-4" d="1.6460320727023648E-7"/>
+                  <width sOffset="5.399912678413104" a="3.2113251885322605" b="-1.872772003123739E-5" c="-2.2725801570728382E-4" d="1.0656226206478953E-4"/>
+                  <width sOffset="8.862757562309106" a="3.2129601101797145" b="0.002240812227667475" c="-6.114035774145117E-5" d="5.547447529663992E-6"/>
+                  <width sOffset="10.122371372049885" a="3.2156967480477596" b="0.002113190939036941" c="-5.3530834281892564E-5" d="3.043318497171349E-7"/>
+                  <width sOffset="13.629653552544172" a="3.2224629505081053" b="0.0017489262407512224" c="8.244266030339408E-5" d="-5.014271623244296E-6"/>
+                  <width sOffset="20.24474274409977" a="3.236188402266441" b="0.002181392714535081" c="-1.9362679745576472E-5" d="-5.1787396248238994E-6"/>
+                  <width sOffset="30.367114116149658" a="3.250914128284475" b="1.9752193736407523E-4" c="-1.753927793929997E-4" d="-5.266126463618679E-6"/>
+                  <width sOffset="39.54185932142676" a="3.2338954959522828" b="-0.004350689773266334" c="9.063243416842906E-5" d="-5.878409768856523E-8"/>
+                  <width sOffset="40.48948548819954" a="3.2298540059611005" b="-0.004179076804452351" c="9.108131059547839E-5" d="2.7526439870487212E-8"/>
+                  <width sOffset="50.611856860249425" a="3.1969127978235026" b="-0.0023266978271925328" c="9.189667114099093E-5" d="-2.6667002687806513E-8"/>
+                  <width sOffset="60.734228232299316" a="3.1827493940100084" b="-4.74470456368066E-4" c="9.382323677532921E-5" d="-3.861159358546661E-7"/>
+                  <width sOffset="64.48658823498918" a="3.1822696604605065" b="2.1333689035453566E-4" c="3.213651540173775E-5" d="-1.7736705455831172E-7"/>
+                  <width sOffset="70.8565996043492" a="3.1848867785353816" b="6.011657345347955E-4" c="3.175510098390602E-5" d="-8.034045824406128E-8"/>
+                  <width sOffset="80.97897097639908" a="3.194142379175755" b="0.0012193439557318623" c="3.447136326560442E-5" d="-9.312139136234135E-7"/>
+                  <width sOffset="83.62809761766367" a="3.197597178933967" b="0.0013823765492631934" c="0.00133419204012936" d="-8.418127686927222E-5"/>
+                  <width sOffset="87.31883017280465" a="3.2166407931727887" b="0.007790641039593748" c="1.8309163097153357E-4" d="-8.262888972490502E-5"/>
+                  <width sOffset="91.10134234844897" a="3.244256849968496" b="0.005629120362667671" c="-7.546461470672257E-4" d="-8.254728360227802E-5"/>
+                  <width sOffset="91.54235135379798" a="3.2465854922152593" b="0.004915345267491138" c="-2.3453134485619797E-4" d="2.586873412151717E-6"/>
+                  <width sOffset="101.22371372049885" a="3.2745377812313734" b="0.0011015728413475874" c="-1.6353205736249809E-4" d="2.574511412125853E-6"/>
+                  <width sOffset="111.34608509254873" a="3.2716026098499973" b="-0.0014177197190851296" c="-8.885666675892775E-5" d="2.5399580159791947E-6"/>
+                  <width sOffset="121.46845646459863" a="3.2507818059968043" b="-0.0024358494793525302" c="-1.324419769722261E-5" d="2.4433491000198165E-6"/>
+                  <width sOffset="131.54438504080105" a="3.2273931809976903" b="-0.001958566469526926" c="1.279829870970533E-4" d="-1.0120846282441083E-6"/>
+                  <width sOffset="131.59082783664851" a="3.2273024956443725" b="-0.00194668524303508" c="1.2762636369424132E-4" d="-9.975850380990513E-7"/>
+                  <width sOffset="141.7131992086984" a="3.219639670698456" b="3.3043277913169E-4" c="9.270107593645999E-5" d="-9.69466188056807E-7"/>
+                  <width sOffset="151.83557058074828" a="3.2314773149663614" b="0.0019091407101450766" c="6.0670313051298236E-5" d="-1.130884413857897E-6"/>
+                  <width sOffset="159.21523219073973" a="3.2484157031713714" b="0.002619831591797711" c="-1.2678553180431218E-4" d="-1.2454476891564303E-6"/>
+                  <width sOffset="161.95794195279817" a="3.2546217061904854" b="0.0018962532808026455" c="-1.3367589574319352E-4" d="-1.5259622964561276E-6"/>
+                  <width sOffset="170.21457788138812" a="3.26030650009202" b="-6.232570001070067E-4" c="-8.741374441940975E-5" d="-8.858537304215593E-7"/>
+                  <width sOffset="172.08031332484805" a="3.2588336296681333" b="-9.58689729969783E-4" c="-7.299977537273635E-5" d="4.91074810951012E-6"/>
+                  <width sOffset="181.2986392369175" a="3.247639611929016" b="-0.0010526513987473432" c="-1.341468339935766E-4" d="5.154053450615843E-6"/>
+                  <width sOffset="182.20268469689793" a="3.2465821374457287" b="-0.0012825638755061212" c="-1.1990608097816178E-4" d="5.136185852045543E-6"/>
+                  <width sOffset="192.32505606894782" a="3.2266407437851665" b="-0.0021312338168209587" c="3.5334176521311055E-5" d="4.652263053701057E-6"/>
+                  <width sOffset="193.69613052219566" a="3.22379707710409" b="-0.002008105640808504" c="2.518706367125818E-5" d="2.077195858448234E-6"/>
+                  <width sOffset="202.4474274409977" a="3.20954468245293" b="-0.0010900193285859278" c="8.745858727361654E-5" d="2.2599586830963014E-6"/>
+                  <width sOffset="212.56979881304758" a="3.2098162633183405" b="0.0013752396581166318" c="1.5560625015948183E-4" d="2.5841844292683806E-6"/>
+                  <width sOffset="217.4171434708474" a="3.2204330955805758" b="0.003065953717238291" c="-1.0135169768138306E-5" d="2.178982994015338E-5"/>
+                  <width sOffset="222.69217018509747" a="3.2395224266297196" b="0.004777992468342105" c="3.277015546272538E-4" d="2.2298563291876196E-5"/>
+                  <width sOffset="227.20658955758267" a="3.269822392526231" b="0.009100089935197366" c="0.00475372973058643" d="-0.0010939124709485255"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.1">
+                     <type name="solid" width="0.1">
+                        <line length="229.75184201265378" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.1"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-3" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="3"/>
+                     <successor id="-4"/>
+                  </link>
+                  <width sOffset="0.0" a="0.3834527587231662" b="0.007351963742304887" c="-2.927879518156013E-4" d="-8.875673787668145E-8"/>
+                  <width sOffset="5.399912678413104" a="0.4146013250767684" b="0.004182140807794282" c="7.708607149515622E-5" d="-1.0648641559538327E-4"/>
+                  <width sOffset="8.862757562309106" a="0.4255860505509137" b="8.852850547537289E-4" c="-8.824365279471316E-5" d="-5.471601060253374E-6"/>
+                  <width sOffset="10.122371372049885" a="0.42655022287542144" b="6.369350382889084E-4" c="-9.976003744974726E-5" d="1.8484469724960295E-8"/>
+                  <width sOffset="20.24474274409977" a="0.42279503419140463" b="-0.0013769993665088427" c="-9.979331162137654E-5" d="1.4316090249351957E-7"/>
+                  <width sOffset="21.80574594998185" a="0.4204029088564436" b="-0.001687508191410737" c="-4.950868815589742E-4" d="4.5721006844476034E-5"/>
+                  <width sOffset="30.367114116149658" a="0.39835810941304484" b="-1.1110899774537542E-4" c="6.782825354455548E-4" d="4.57858789620825E-5"/>
+                  <width sOffset="30.458272010493964" a="0.39835365199982276" b="1.3694026866127237E-5" c="6.385548862343974E-4" d="-5.506071823312482E-5"/>
+                  <width sOffset="36.67532945375102" a="0.40988896929873286" b="0.0015689706993425733" c="-1.4158530566894126E-4" d="4.897846454053386E-6"/>
+                  <width sOffset="40.48948548819954" a="0.41408528498181507" b="7.026722733003195E-4" c="-8.405017900751811E-5" d="5.277491871784863E-6"/>
+                  <width sOffset="50.611856860249425" a="0.41805962803224217" b="6.233315059202067E-4" c="7.62276245190168E-5" d="5.240949270742254E-6"/>
+                  <width sOffset="55.46398074594762" a="0.4234774397355143" b="0.0017332279371203103" c="-8.419323863625793E-6" d="-5.70129433032089E-7"/>
+                  <width sOffset="60.734228232299316" a="0.4322946711969906" b="0.001596977191406531" c="-1.7739734299204463E-5" d="-1.5940436228666242E-7"/>
+                  <width sOffset="64.48658823498918" a="0.4380289034590681" b="0.0014571121139421667" c="3.7806021432171986E-5" d="-3.681532435809023E-7"/>
+                  <width sOffset="70.8565996043492" a="0.4487496219533669" b="0.0018939459746243146" c="3.0462168123753797E-5" d="-4.7128127009191406E-7"/>
+                  <width sOffset="80.97897097639908" a="0.47055327813508585" b="0.0023657788985891872" c="1.3656181960408573E-5" d="3.722433831104185E-7"/>
+                  <width sOffset="83.62809761766367" a="0.4769232838420998" b="0.002445969878691546" c="-0.0012905068460755899" d="8.362230633876206E-5"/>
+                  <width sOffset="91.10134234844897" a="0.4580305544023968" b="-0.002831813499238999" c="5.819321772965284E-4" d="8.451559163026839E-5"/>
+                  <width sOffset="91.54235135379798" a="0.45690212754022896" b="-0.00226922679365701" c="6.442149978272393E-5" d="-6.185653843006184E-7"/>
+                  <width sOffset="93.65820265876368" a="0.4523833257240555" b="-0.002004921795060363" c="7.481362842681095E-5" d="-8.201764355268587E-7"/>
+                  <width sOffset="101.22371372049885" a="0.4411420137787858" b="-0.0010137483398536913" c="5.470782061960377E-5" d="-9.42998337921269E-7"/>
+                  <width sOffset="111.34608509254873" a="0.4355079288233634" b="-1.9606821022368718E-4" c="2.5603714907548503E-5" d="-9.475535597047198E-7"/>
+                  <width sOffset="121.46845646459863" a="0.4351639047134923" b="3.100656956914281E-5" c="-3.3788662276419167E-6" d="-9.591833993167851E-7"/>
+                  <width sOffset="128.64387617047802" a="0.43485806427541895" b="-1.6563841107372114E-4" c="4.966456635846211E-5" d="-3.4430018665201067E-6"/>
+                  <width sOffset="131.54438504080105" a="0.43471143860886086" b="3.55691941646228E-5" c="-4.766495745191668E-5" d="1.2432656014775602E-8"/>
+                  <width sOffset="131.59082783664851" a="0.4347129877327953" b="3.1141886799977356E-5" c="-4.997244127326344E-5" d="1.3066624728799367E-7"/>
+                  <width sOffset="141.7131992086984" a="0.4300434432298297" b="-9.403721983238158E-4" c="-4.6638885408601576E-5" d="1.3200586169938382E-7"/>
+                  <width sOffset="151.83557058074828" a="0.41588282590361736" b="-0.0018439875222127956" c="-4.317433242843248E-5" d="1.492887635260964E-7"/>
+                  <width sOffset="156.03651460895" a="0.4073854678719253" b="-0.0021988295169142955" c="-9.613979554054193E-5" d="4.620761686850458E-6"/>
+                  <width sOffset="161.95794195279817" a="0.39195366467433157" b="-0.002851341660650199" c="-1.4297743619951303E-5" d="4.682217381274166E-6"/>
+                  <width sOffset="170.21457788138812" a="0.37007195597420317" b="-0.002129855300320854" c="1.762025245518215E-5" d="4.0421088153492665E-6"/>
+                  <width sOffset="172.08031332484805" a="0.3661857967446034" b="-0.0020218944779131333" c="2.647972754674983E-5" d="-1.7030049373142935E-6"/>
+                  <width sOffset="181.2986392369175" a="0.34846344647483063" b="-0.001967848433579132" c="1.763368521799308E-4" d="-1.946310279025226E-6"/>
+                  <width sOffset="182.20268469689793" a="0.34682710374383063" b="-0.0016537875199260244" c="1.6539627582829182E-4" d="-1.254308565090317E-6"/>
+                  <width sOffset="192.32505606894782" a="0.345732830241507" b="0.0013090591290361381" c="1.2597887114637965E-4" d="-1.4530186077236742E-6"/>
+                  <width sOffset="202.4474274409977" a="0.3703846942645197" b="0.0034128296356488045" c="8.274282377023974E-5" d="-1.433753610988453E-6"/>
+                  <width sOffset="212.56979881304758" a="0.41192161629342605" b="0.004647219299389995" c="3.855756099194454E-5" d="-1.3139848571921253E-6"/>
+                  <width sOffset="221.45646326254013" a="0.45534273267238756" b="0.005021208302593883" c="-0.0011395620183737756" d="1.3161348899649904E-4"/>
+                  <width sOffset="222.69217018509747" a="0.4600557357887318" b="0.002807789132034848" c="-6.781032569407384E-4" d="1.1472985173871738E-4"/>
+                  <width sOffset="227.20658955758267" a="0.4694671219020443" b="0.003699881205732421" c="-0.0032483202387144404" d="0.0012309408859791052"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+         <laneSection s="229.75184201265378">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.5157702005518985" b="0.003035789418670461" c="-2.2435486539997782E-5" d="-2.512374774807251E-6"/>
+                  <width sOffset="3.0626995444935687" a="0.5247852868778198" b="0.0028276639151744443" c="-6.312342439767668E-5" d="-4.527238980380391E-6"/>
+                  <width sOffset="3.8608859316275073" a="0.526999771475785" b="0.0027182424666928363" c="-1.0349027996331783E-5" d="-1.6406173809405432E-6"/>
+                  <width sOffset="13.18507091654348" a="0.550115453968711" b="0.00209734204358954" c="-5.650172741116725E-5" d="-1.6271424172045524E-6"/>
+                  <width sOffset="20.447327879695536" a="0.561743749876225" b="0.0010192336073085904" c="-2.6984872494800635E-4" d="6.760501380007925E-6"/>
+                  <width sOffset="23.307442288593364" a="0.5626096151985456" b="-3.584549814568093E-4" c="-2.1305441630729843E-4" d="4.727871453232192E-6"/>
+                  <width sOffset="29.833223795653197" a="0.5525112212003473" b="-0.002535127212580331" c="2.933001294009153E-4" d="-6.559424435981598E-6"/>
+                  <width sOffset="33.42981366064325" a="0.5468822124171875" b="-6.79914157788915E-4" c="2.283404255542312E-4" d="-4.392101014743967E-6"/>
+                  <width sOffset="36.892258684970244" a="0.5470831976466748" b="7.433537371832645E-4" c="1.5505960161220177E-4" d="-1.1463898434607138E-5"/>
+                  <width sOffset="43.55218503269313" a="0.5555250699823606" b="0.0012832942491833588" c="-6.229556851154521E-5" d="-1.884472396864186E-5"/>
+                  <width sOffset="44.91323230530165" a="0.5571087820472997" b="0.001008993113386464" c="4.5104064083059464E-5" d="-2.493672246322148E-6"/>
+                  <width sOffset="53.674556404743015" a="0.567734061732581" b="0.0012250869311411193" c="-1.764134639422143E-5" d="-2.3835837416220315E-6"/>
+                  <width sOffset="63.7969277767929" a="0.5758551082424912" b="1.352592637415169E-4" c="-1.044762175370349E-4" d="2.9312948835932318E-6"/>
+                  <width sOffset="66.48988670899573" a="0.5755189379184369" b="-3.6366756664720466E-4" c="-2.9563997693297613E-4" d="1.0360624054004589E-5"/>
+                  <width sOffset="73.91929914884278" a="0.5607475413935137" b="-0.0030409299363815916" c="-6.503993270140266E-5" d="9.971133272835723E-6"/>
+                  <width sOffset="84.04167052089267" a="0.5336436568982172" b="-0.001292647838829826" c="2.657464910740062E-4" d="-2.488491191008066E-6"/>
+                  <width sOffset="85.83745344568806" a="0.5321649197997029" b="-3.6227674711160687E-4" c="3.1432600944366967E-4" d="1.1376347442014293E-5"/>
+                  <width sOffset="89.15282918303436" a="0.5348333916704915" b="0.002097077653688457" c="0.0015145570919424757" d="-2.6754215403449773E-4"/>
+                  <roadMark sOffset="0.0" type="curb" weight="standard" color="standard" width="0.12">
+                     <type name="curb" width="0.12">
+                        <line length="94.16404189294255" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.0"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.1265611754830366">
+                     <type name="solid" width="0.126561">
+                        <line length="94.16404189294255" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.126561"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="3.153196151140815" b="-0.0017936650236603207" c="-6.035919567103471E-4" d="3.748667388993166E-5"/>
+                  <width sOffset="3.0626995444935687" a="3.1431178604582466" b="-0.004436017191056253" c="-2.609562381052409E-4" d="3.730020013945413E-5"/>
+                  <width sOffset="3.8608859316275073" a="3.1394298044225804" b="-0.004781308583500437" c="-2.3525384011685764E-4" d="3.4413578540015236E-5"/>
+                  <width sOffset="12.144962964529384" a="3.1032407674582436" b="-0.0015940387192017525" c="3.425271369476167E-4" d="-2.652829597355835E-5"/>
+                  <width sOffset="13.18507091654348" a="3.1019234993585174" b="-9.67605207068916E-4" c="2.5385291437374067E-4" d="-2.781363963302914E-5"/>
+                  <width sOffset="18.180184041495295" a="3.0999576045551684" b="-5.135044700076624E-4" c="-1.9365445706008013E-4" d="2.0467250858363856E-5"/>
+                  <width sOffset="20.447327879695536" a="3.0980365481283125" b="-0.0010759880913609066" c="1.234489664336059E-4" d="1.2079607061153408E-5"/>
+                  <width sOffset="22.389285487551632" a="3.0965010406446805" b="-0.0022367477535232766" c="1.7715248914925937E-4" d="-6.44780991211783E-6"/>
+                  <width sOffset="23.307442288593364" a="3.0945917064257813" b="-0.0019277469697309725" c="1.700547362323385E-4" d="-5.1617730474274616E-6"/>
+                  <width sOffset="33.42981366064325" a="3.08714895509607" b="-7.169558034574725E-5" c="1.9806221108887188E-5" d="-5.283235369643075E-6"/>
+                  <width sOffset="36.892258684970244" a="3.086918855435332" b="-1.245542834788704E-4" c="-7.413915917511599E-6" d="1.7885620502184827E-6"/>
+                  <width sOffset="43.55218503269313" a="3.086288830204195" b="1.468641325875781E-5" c="3.307441733537507E-5" d="1.6177875612984153E-6"/>
+                  <width sOffset="53.674556404743015" a="3.091504284354655" b="0.0011815566829337498" c="9.151133464649855E-5" d="1.5124345202992165E-6"/>
+                  <width sOffset="61.00429951664822" a="3.1056768337918434" b="0.0027668330747070806" c="4.903342287454751E-4" d="-5.6964580589106934E-5"/>
+                  <width sOffset="63.7969277767929" a="3.115986939429908" b="0.0041727140922314145" c="4.188862332541872E-5" d="-6.23386692763605E-5"/>
+                  <width sOffset="66.48988670899573" a="3.126310226954946" b="0.003042077487124697" c="-2.468924758078269E-4" d="-6.976799844676133E-5"/>
+                  <width sOffset="67.25264839309492" a="3.1284560021672396" b="0.0025436630538944634" c="-4.2630390334213574E-4" d="3.76155229136119E-5"/>
+                  <width sOffset="73.91929914884278" a="3.137612226000767" b="0.0018750036903816096" c="3.396052508721802E-4" d="3.932882160985339E-5"/>
+                  <width sOffset="75.11715381703638" a="3.14041308885219" b="0.0028578927246856976" c="-2.1953312438052118E-4" d="8.881342643564302E-6"/>
+                  <width sOffset="84.04167052089267" a="3.1547462015639063" b="0.0010615555034142916" c="3.4506377593302747E-5" d="7.989209661040856E-6"/>
+                  <width sOffset="89.15282918303436" a="3.1621401709774246" b="0.0020404196151599316" c="-9.300717515506004E-4" d="2.869077111375522E-4"/>
+                  <width sOffset="90.92313736565623" a="3.164429307247486" b="0.0014448909572741166" c="0.003871801327539328" d="-8.413619844848752E-4"/>
+                  <roadMark sOffset="0.0" type="broken" weight="standard" color="standard" width="0.12776277635737676">
+                     <type name="broken" width="0.127763">
+                        <line length="4.0" space="8.0" tOffset="-0.0" sOffset="0.0" width="0.127763"/>
+                     </type>
+                  </roadMark>
+                  <roadMark sOffset="22.389285487551632" type="solid" weight="standard" color="standard" width="0.12776277635737676">
+                     <type name="solid" width="0.127763">
+                        <line length="71.77475640539092" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.127763"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="driving" level="false">
+                  <link>
+                     <predecessor id="-2"/>
+                  </link>
+                  <width sOffset="0.0" a="3.3057431027363213" b="0.01203886197417051" c="0.005667789417681253" d="-5.922364791593321E-4"/>
+                  <width sOffset="3.0626995444935687" a="3.3787650381255983" b="0.03009057127938203" c="1.9454964696039031E-4" d="-5.911718541749993E-4"/>
+                  <width sOffset="7.077154109452778" a="3.464450952422883" b="0.0030708899999521205" c="-4.632393531998653E-4" d="-1.8972036554272956E-5"/>
+                  <width sOffset="12.144962964529384" a="3.4656471004291762" b="-0.003086085598863291" c="-4.742060880024942E-4" d="4.196983795962571E-5"/>
+                  <width sOffset="13.18507091654348" a="3.4619714555312098" b="-0.003936324641485942" c="-3.5140194771024274E-4" d="4.147571490345209E-5"/>
+                  <width sOffset="18.180184041495295" a="3.4387104618577102" b="-0.004342308613584378" c="3.0083625821557015E-4" d="-6.8051755879103005E-6"/>
+                  <width sOffset="22.389285487551632" a="3.4252555538262466" b="-3.94611548556318E-4" c="2.315759667754984E-4" d="1.1722241386352339E-5"/>
+                  <width sOffset="23.307442288593364" a="3.425097533063046" b="6.02805164945327E-5" c="2.8872394235122023E-4" d="3.1649960489678997E-6"/>
+                  <width sOffset="25.111080213163177" a="3.4261640783639136" b="0.0011326756594454575" c="4.2184210091670817E-4" d="-2.4986290626813716E-5"/>
+                  <width sOffset="33.42981366064325" a="3.4503947454486354" b="0.0029638063059967746" c="-1.9309322621093342E-4" d="-2.4860311525439874E-5"/>
+                  <width sOffset="37.314086284768194" a="3.457536748931499" b="3.3850748517266424E-4" c="-0.0016616096986976198" d="1.798418883322194E-4"/>
+                  <width sOffset="42.37386837143194" a="3.44000626196564" b="-0.0026636489566495575" c="3.627597280969473E-4" d="-2.2633164352544268E-5"/>
+                  <width sOffset="43.55218503269313" a="3.4373342784735934" b="-0.001903030996964229" c="2.9791825539275175E-4" d="-1.664127688583475E-5"/>
+                  <width sOffset="53.674556404743015" a="3.431336803978304" b="-9.870681736460912E-4" c="-2.0781128516174932E-4" d="-1.6636751252927354E-5"/>
+                  <width sOffset="54.15622622187729" a="3.4308112904452597" b="-0.0011988404900734485" c="1.1175573013084058E-5" d="-3.7594955279911685E-6"/>
+                  <width sOffset="61.00429951664822" a="3.421918279368891" b="-0.001574695327097187" c="-4.316259543450061E-4" d="5.4717519581426025E-5"/>
+                  <width sOffset="63.7969277767929" a="3.4153462848713634" b="-0.0027052485256788064" c="6.48343636829502E-5" d="4.51696355046821E-5"/>
+                  <width sOffset="65.93971924175182" a="3.4102916045284513" b="-0.0018051988506134556" c="5.58938583538382E-4" d="5.0684840849197634E-5"/>
+                  <width sOffset="67.25264839309492" a="3.4089997053173806" b="-7.539633591939661E-5" c="7.783377583445674E-4" d="-5.669868051118821E-5"/>
+                  <width sOffset="73.91929914884278" a="3.4262901996596886" b="0.0027426276907931615" c="-3.3688234006309774E-4" d="-5.776602875676398E-5"/>
+                  <width sOffset="75.11715381703638" a="3.428992806172301" b="0.0016868977581667721" c="1.560007512414456E-4" d="-2.731854979047358E-5"/>
+                  <width sOffset="83.56260194634822" a="3.4379102046668066" b="-0.0015236451180161703" c="-7.089426108157916E-4" d="2.4759376272424027E-5"/>
+                  <width sOffset="84.04167052089267" a="3.4370202893732706" b="-0.002185862041849531" c="-6.720379882442702E-4" d="2.4718342603308112E-5"/>
+                  <width sOffset="90.4143214870534" a="3.402195683603881" b="-0.00773970298227895" c="-4.917350487981825E-4" d="-2.2314148172156704E-5"/>
+                  <width sOffset="90.92313736565623" a="3.398127353350325" b="-0.008257439154407712" c="-0.003803924300556759" d="0.0011059555474513605"/>
+                  <width sOffset="93.40629158339672" a="3.3711012311679025" b="0.011508984711091803" c="-0.008796628430090998" d="0.0010761062032176292"/>
+                  <roadMark sOffset="0.0" type="broken" weight="bold" color="standard" width="0.23">
+                     <type name="broken" width="0.23">
+                        <line length="3.0" space="3.0" tOffset="-0.0" sOffset="0.0" width="0.23"/>
+                     </type>
+                  </roadMark>
+                  <roadMark sOffset="37.314086284768194" type="broken" weight="bold" color="standard" width="0.2372225485186795">
+                     <type name="broken" width="0.237223">
+                        <line length="3.0" space="3.0" tOffset="-0.0" sOffset="0.0" width="0.237223"/>
+                     </type>
+                  </roadMark>
+                  <roadMark sOffset="93.40629158339672" type="solid" weight="bold" color="standard" width="0.2372225485186795">
+                     <type name="solid" width="0.237223">
+                        <line length="0.7577503095458269" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.237223"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-3" type="driving" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="0.0" b="0.0" c="0.008893983338251824" d="2.5314467059551755E-5"/>
+                  <width sOffset="3.0626995444935687" a="0.08415395364206812" b="0.05519155629936541" c="0.009160083282844607" d="2.44363141824102E-5"/>
+                  <width sOffset="3.15049073391927" a="0.08906990199547105" b="0.056800470526176886" c="0.0193945889932918" d="-0.0013478277243907828"/>
+                  <width sOffset="7.077154109452778" a="0.5295424289934099" b="0.14676732067266304" c="-0.0029447169382399705" d="-0.0019200275420105828"/>
+                  <width sOffset="7.63630109102894" a="0.610350632249816" b="0.14167339846604435" c="0.0063907170980249854" d="-5.921761594740312E-4"/>
+                  <width sOffset="13.18507091654348" a="1.492059011932655" b="0.15789737209889335" c="-0.0034692283597309746" d="-5.935925719778887E-4"/>
+                  <width sOffset="14.560801335768417" a="1.7011716803662456" b="0.14498156534393553" c="4.868707359871336E-4" d="-5.22316487267632E-4"/>
+                  <width sOffset="19.222314539947945" a="2.3346775541773694" b="0.1154713239653891" c="-0.0044231596917116665" d="-1.3672436561499225E-5"/>
+                  <width sOffset="23.307442288593364" a="2.7316456856221136" b="0.07864847129248936" c="-0.004583012551712647" d="-7.189683316741152E-6"/>
+                  <width sOffset="25.111080213163177" a="2.8585478233000257" b="0.06204611431142277" c="-0.004737907946050953" d="2.0961603359133534E-5"/>
+                  <width sOffset="27.469831189843347" a="2.978813915809252" b="0.040044896926913126" c="-0.003885707969203617" d="1.5619775683392472E-4"/>
+                  <width sOffset="33.42981366064325" a="3.1125231851392146" b="0.010372478966654016" c="-0.001101936555666967" d="1.560534610096251E-4"/>
+                  <width sOffset="34.27131202141814" a="3.120564295787131" b="0.008849436848339344" c="-8.510098923022644E-5" d="2.4718518018410478E-5"/>
+                  <width sOffset="37.314086284768194" a="3.1473995855717636" b="0.009018118008183432" c="0.0013193614121637814" d="-1.7998368183922808E-4"/>
+                  <width sOffset="41.46362665785634" a="3.194678531851772" b="0.010670357766683795" c="-8.550474666620209E-4" d="-1.831115553518481E-4"/>
+                  <width sOffset="42.37386837143194" a="3.2035445980377393" b="0.008658612292547177" c="-6.495619261674451E-4" d="1.9363497332339245E-5"/>
+                  <width sOffset="43.55218503269313" a="3.2128769926828316" b="0.007208487603057578" c="-5.730458157366671E-4" d="1.4982859075755035E-5"/>
+                  <width sOffset="48.8248063670695" a="3.237149850450339" b="0.0024151749432775897" c="-0.0011326626327901638" d="6.328161530564906E-5"/>
+                  <width sOffset="53.674556404743015" a="3.229440846195032" b="-0.0041059212532460095" c="-1.6951248461635928E-4" d="6.370600972340598E-5"/>
+                  <width sOffset="54.15622622187729" a="3.227430939133211" b="-0.004224878854491441" c="-3.204838194311163E-4" d="5.0828753987533435E-5"/>
+                  <width sOffset="59.033360100612384" a="3.205099096649757" b="-0.0037238593022479675" c="-3.309019320792828E-4" d="2.9043390675247726E-5"/>
+                  <width sOffset="63.7969277767929" a="3.182990937415776" b="-0.004899285789496244" c="9.71004412153229E-5" d="3.907404045822025E-5"/>
+                  <width sOffset="65.93971924175182" a="3.1733230712203526" b="-0.003944921947880899" c="1.4454611085004419E-4" d="3.355883511370413E-5"/>
+                  <width sOffset="69.21087237853149" a="3.163139987577029" b="-0.0019219738288842637" c="7.395604351342157E-5" d="3.801516893780323E-5"/>
+                  <width sOffset="73.87357726679582" a="3.159639891797882" b="0.0012471390613802511" c="-7.764101863868899E-4" d="1.7310946941321887E-4"/>
+                  <width sOffset="73.91929914884278" a="3.1596953068108276" b="0.0011772268424774385" c="-7.687699666501337E-4" d="1.7283860856775188E-4"/>
+                  <width sOffset="81.47710083253023" a="3.1992953196335066" b="0.019174618837150315" c="0.006622073202595731" d="-1.12548486509196E-5"/>
+                  <width sOffset="83.56260194634822" a="3.267983403079514" b="0.04664844827408529" c="0.006724448380790518" d="-6.333277471380409E-5"/>
+                  <width sOffset="84.04167052089267" a="3.291867551246572" b="0.05304778618663965" c="0.006708335972216301" d="-5.601964372620594E-5"/>
+                  <width sOffset="87.78801965896477" a="3.5818099181536898" b="0.1009525943013883" c="-0.0018547877361246203" d="0.0026786875673597776"/>
+                  <width sOffset="90.4143214870534" a="3.882672504766265" b="0.1466385608866456" c="0.01954259959919645" d="0.0027257200580948337"/>
+                  <width sOffset="90.73029122295364" a="3.9310429081895513" b="0.1598046830649912" c="0.021735010237865893" d="-0.0022118817921077485"/>
+                  <width sOffset="93.40629158339672" a="4.471938423168817" b="0.210413025999155" c="0.017209499495451336" d="-0.0021820324478763592"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.1">
+                     <type name="solid" width="0.1">
+                        <line length="94.16404189294255" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.1"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-4" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="-3"/>
+                  </link>
+                  <width sOffset="0.0" a="0.478137531690654" b="0.011087541255720177" c="-0.020914928959246615" d="0.004491076850604698"/>
+                  <width sOffset="2.3981416191169274" a="0.4463840656110265" b="-0.011740711722677703" c="0.013182325546219429" d="-0.0014502431783990472"/>
+                  <width sOffset="3.15049073391927" a="0.4443949442771675" b="0.005632070271706008" c="-3.19011799086992E-4" d="-7.797913818363114E-5"/>
+                  <width sOffset="7.63630109102894" a="0.45620118917699326" b="-0.0019373869447325553" c="-0.013924577526432055" d="-0.001405830520719053"/>
+                  <width sOffset="8.083663044660739" a="0.45242184594153745" b="-0.015240097403785652" c="-0.0015803148634882381" d="2.6450104323992097E-4"/>
+                  <width sOffset="13.18507091654348" a="0.36866459956087816" b="-0.01071334585867409" c="0.00246603674142417" d="2.6474722662313494E-4"/>
+                  <width sOffset="14.560801335768417" a="0.3592825659753176" b="-0.002424933382900424" c="-0.002847269988768813" d="1.934711419128051E-4"/>
+                  <width sOffset="17.448338571477677" a="0.3331983043879827" b="-0.01402871717086765" c="0.004817244177518849" d="4.411565052078433E-5"/>
+                  <width sOffset="19.222314539947945" a="0.323717803883409" b="0.003479128270071144" c="0.002657699310311573" d="-4.6452840018555155E-4"/>
+                  <width sOffset="23.307442288593364" a="0.3506142633233216" b="0.001936686355348216" c="-0.003067841761173893" d="-4.624539080849522E-4"/>
+                  <width sOffset="23.9169044842032" a="0.35055037765097197" b="-0.002318108216963294" c="0.0014767697410234541" d="3.265990769324532E-6"/>
+                  <width sOffset="27.469831189843347" a="0.3611024775077061" b="0.008299283712944278" c="8.077108488387663E-4" d="-1.3197016270553535E-4"/>
+                  <width sOffset="33.42981366064325" a="0.4113180860586576" b="0.0038638774439781094" c="-0.0015300271067760253" d="-1.3472086976646633E-4"/>
+                  <width sOffset="34.27131202141814" a="0.4134058129183691" b="0.001002651418133469" c="-0.0024930086515281722" d="-3.3859267746919014E-6"/>
+                  <width sOffset="35.490765753389695" a="0.4109150879543346" b="-0.005092671293775289" c="-2.627695975695688E-4" d="1.1825801500008974E-5"/>
+                  <width sOffset="41.46362665785634" a="0.3736428155653009" b="-0.006965985010034175" c="-1.170077792816245E-4" d="1.4953675013150922E-5"/>
+                  <width sOffset="43.55218503269313" a="0.35871978711441965" b="-0.007259052960235493" c="-3.612141103860996E-5" d="1.2898358339053276E-5"/>
+                  <width sOffset="48.8248063670695" a="0.321332018295033" b="-0.0065642181893645875" c="9.645167113240083E-4" d="-3.5400397890844994E-5"/>
+                  <width sOffset="53.674556404743015" a="0.30814470767076063" b="2.9325163908400925E-4" c="4.281112523529047E-4" d="-3.602776845329394E-5"/>
+                  <width sOffset="59.033360100612384" a="0.3164659352492887" b="0.0017777757788470811" c="6.030280630358522E-4" d="-1.4242405140988107E-5"/>
+                  <width sOffset="63.7969277767929" a="0.33707864586972835" b="0.006553357857661335" c="3.9884075109505727E-4" d="-2.0947075418528273E-5"/>
+                  <width sOffset="67.47806703354283" a="0.36556218554753706" b="0.008638186526485316" c="-6.35026303006824E-4" d="1.0273432002060224E-5"/>
+                  <width sOffset="69.21087237853149" a="0.3786771943471354" b="0.006529974045845819" c="-1.8170239576914074E-4" d="5.817098178453389E-6"/>
+                  <width sOffset="73.87357726679582" a="0.4057638628745268" b="0.005214930146648172" c="0.001281794612949075" d="-1.292771763748692E-4"/>
+                  <width sOffset="73.91929914884278" a="0.40600496651856854" b="0.005331331512609765" c="0.0013113133184706766" d="-1.2945321486908874E-4"/>
+                  <width sOffset="80.11308459901832" a="0.4585723297559108" b="0.006676685636823873" c="-0.0018055868158671484" d="-1.71123903908443E-4"/>
+                  <width sOffset="81.47710083253023" a="0.4638857908738352" b="7.958374301186525E-4" c="-0.005977837553212539" d="1.2969553310340471E-5"/>
+                  <width sOffset="84.04167052089267" a="0.42682918842123296" b="-0.02960942160720695" c="-0.005852577712349813" d="-1.4130506758926899E-5"/>
+                  <width sOffset="85.77185437420943" a="0.35800635510885126" b="-0.04998839307267865" c="0.014160509771206902" d="-6.739466499707026E-4"/>
+                  <width sOffset="87.78801965896477" a="0.3092594993038791" b="-0.001107159256116319" c="0.018017662529236776" d="-0.0034086538610566116"/>
+                  <width sOffset="90.73029122295364" a="0.3751578793371424" b="0.016392792570875447" c="-0.011678568949358365" d="0.001528947989185344"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects>
+         <object type="pole" name="Guidepost" id="256747" s="40.116613927686515" t="-3.6779723552420616" zOffset="-0.07863386291396068" validLength="0.0" orientation="none" radius="0.0" height="0.9805377693846822" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256748" s="83.32486943704029" t="-3.5978158331603765" zOffset="-0.07538349965923885" validLength="0.0" orientation="none" radius="0.0" height="1.0623639672994614" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256749" s="139.3780857854188" t="-3.9364997604407623" zOffset="-0.08130118077191639" validLength="0.0" orientation="none" radius="0.0" height="0.9387256316840649" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256750" s="188.74082607786585" t="-4.358227666126116" zOffset="-0.03598215164019791" validLength="0.0" orientation="none" radius="0.0" height="1.0073953978717327" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256754" s="231.1923479336318" t="-4.727825247338834" zOffset="-0.11819679466364619" validLength="0.0" orientation="none" radius="0.0" height="1.0524508459493518" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256755" s="237.06555055133333" t="-5.356338957178787" zOffset="-0.06850320376970842" validLength="0.0" orientation="none" radius="0.0" height="0.9705749610438943" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256756" s="245.0484068201466" t="-6.617867467548916" zOffset="-0.05982540093238242" validLength="0.0" orientation="none" radius="0.0" height="0.9436710784211755" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256757" s="252.97740195353677" t="-7.702474324574986" zOffset="-0.12682154679755797" validLength="0.0" orientation="none" radius="0.0" height="0.982394265010953" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256758" s="261.0554541335152" t="-8.01693295072619" zOffset="-0.14789806570431097" validLength="0.0" orientation="none" radius="0.0" height="1.009479895234108" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256759" s="269.1615312306495" t="-7.897180769265869" zOffset="-0.1592666837719321" validLength="0.0" orientation="none" radius="0.0" height="0.9455228038132191" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256760" s="277.1718070592072" t="-7.774866019431" zOffset="-0.08496110094631604" validLength="0.0" orientation="none" radius="0.0" height="0.9873329112306237" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256761" s="293.4966369915528" t="-7.795397415567236" zOffset="-0.13755004007249738" validLength="0.0" orientation="none" radius="0.0" height="0.9859102927148342" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256762" s="309.2173751373615" t="-7.558453431750131" zOffset="-0.12825279433725711" validLength="0.0" orientation="none" radius="0.0" height="1.0753161013126373" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="FlagPole" id="256792" s="104.01672842547717" t="-10.244819961435839" zOffset="-0.5344799370352291" validLength="0.0" orientation="none" radius="0.06536864600933212" height="8.20026398357004" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="FlagPole" id="256794" s="175.89992911809696" t="-10.674228854266936" zOffset="-0.13727506399339973" validLength="0.0" orientation="none" radius="0.07273765490050857" height="9.11448891274631" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="FlagPole" id="256795" s="238.77693969836295" t="-12.002479893129804" zOffset="-0.5435944192666966" validLength="0.0" orientation="none" radius="0.07640724824192881" height="8.052201573736966" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="FlagPole" id="256806" s="19.83943938789428" t="-10.379439342355369" zOffset="-0.358152120722508" validLength="0.0" orientation="none" radius="0.07008218418739462" height="6.251875847578049" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="FlagPole" id="256807" s="24.901882485941037" t="-10.33054956204791" zOffset="-0.5951591059478432" validLength="0.0" orientation="none" radius="0.07462544153070534" height="7.746867150999606" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="FlagPole" id="256809" s="108.76675855122599" t="-10.202387849482802" zOffset="-0.5434912962175247" validLength="0.0" orientation="none" radius="0.08565855048838199" height="8.10281196795404" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="FlagPole" id="256810" s="123.90281135690712" t="-10.259104344185497" zOffset="-0.5169997983452674" validLength="0.0" orientation="none" radius="0.07675776236799989" height="8.277686597779393" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="FlagPole" id="256811" s="158.99800757526572" t="6.315132524251681" zOffset="0.28241961370710555" validLength="0.0" orientation="none" radius="0.07524337360487172" height="7.251816504634917" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="FlagPole" id="256812" s="170.581697485298" t="-10.53409068297844" zOffset="-0.2957400081977113" validLength="0.0" orientation="none" radius="0.07498271606034217" height="8.123983090743423" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="FlagPole" id="256813" s="180.74403516209702" t="-10.523672820612008" zOffset="-0.07204099198858671" validLength="0.0" orientation="none" radius="0.07333815753132952" height="8.056001312099397" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Pole" id="256814" s="212.24080350741926" t="-5.349654082632909" zOffset="-0.09150248666209393" validLength="0.0" orientation="none" radius="0.0524883524590706" height="1.6680315928533673" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="FlagPole" id="256815" s="213.20870340109505" t="5.880394375472049" zOffset="0.22260226917808268" validLength="0.0" orientation="none" radius="0.060939612733237544" height="6.942650642246008" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="FlagPole" id="256816" s="217.24436947154666" t="5.910237688529795" zOffset="0.24800870073995895" validLength="0.0" orientation="none" radius="0.0737081583517907" height="7.685413796454668" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="FlagPole" id="256817" s="271.5687459352582" t="5.899249715909499" zOffset="0.25742565907270887" validLength="0.0" orientation="none" radius="0.060792631694864645" height="8.127884236164391" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="FlagPole" id="256818" s="275.4710244702505" t="5.961718690153242" zOffset="0.2471951107942516" validLength="0.0" orientation="none" radius="0.06782374223158492" height="7.409095847047865" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="FlagPole" id="256825" s="155.17978528068522" t="6.426287725745748" zOffset="0.2080819967005283" validLength="0.0" orientation="none" radius="0.06700765831059885" height="7.838361393660307" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="FlagPole" id="256833" s="243.86284196923484" t="-12.25506311089489" zOffset="-0.5393761441818157" validLength="0.0" orientation="none" radius="0.073" height="8.06443748716265" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="FlagPole" id="256838" s="29.817844195997942" t="-10.230236727634741" zOffset="-0.5872933617240506" validLength="0.0" orientation="none" radius="0.06858509311332554" height="7.969752531498671" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256839" s="39.36703713485868" t="-4.89270894141041" zOffset="-0.3428684010910388" validLength="0.0" orientation="none" radius="0.043" height="5.496364625170827" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256840" s="39.274797464550375" t="-6.590510927073761" zOffset="-0.5071886582409064" validLength="0.0" orientation="none" radius="0.043" height="5.64968469273299" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Pole" id="256841" s="40.37048587387452" t="-6.643081749915135" zOffset="-0.3828430163737835" validLength="0.0" orientation="none" radius="0.043" height="2.039721946232021" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Pole" id="256842" s="40.335782101049816" t="-4.907747079348122" zOffset="-0.24853798322703824" validLength="0.0" orientation="none" radius="0.043" height="3.830958620645106" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="FlagPole" id="256843" s="114.01372790119274" t="-10.323852687618519" zOffset="-0.5311471858608314" validLength="0.0" orientation="none" radius="0.0731543173911888" height="8.137870703823864" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="FlagPole" id="256844" s="119.02933288261856" t="-10.274727488563352" zOffset="-0.5251892503931117" validLength="0.0" orientation="none" radius="0.073" height="8.10438765771687" hdg="0.0" pitch="0.0" roll="0.0"/>
+      </objects>
+      <signals>
+         <signal s="39.2149589268607" t="-5.752064936707646" id="253569" dynamic="no" orientation="+" zOffset="1.6464330614348057" country="DEU" type="449" subtype="-1" height="3.4599999919176287" width="2.557930198728433" hOffset="0.004253156916919642"/>
+      </signals>
+   </road>
+   <road length="5.00000000000009" id="255960" junction="2104802">
+      <link>
+         <predecessor elementType="road" elementId="255959" contactPoint="end"/>
+         <successor elementType="road" elementId="2233865" contactPoint="start"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618382.5516278079" y="5809537.271610171" hdg="3.2194319645809575" length="5.00000000000009">
+            <paramPoly3 aU="0.0" bU="5.000284886880416" cU="-3.818943187251754E-4" dU="1.8495617513911673E-5" aV="0.0" bV="-9.43689570931383E-16" cV="0.0256557512054032" dV="-0.0012380973860253374" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="102.73533182815927" b="-0.004501065106410508" c="4.653410781778446E-5" d="4.834150363268536E-7"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.032288198768976664" b="-4.420446433824593E-4" c="-0.0" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="3.2743602215954577" b="0.024437897250745834" c="-0.006332334868138513" d="0.003187198543713802"/>
+         <laneOffset s="0.9039644910671434" a="3.2936310418509556" b="0.020802760609529684" c="-3.1886999140126533E-4" d="-7.663491347177347E-5"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="1"/>
+                     <successor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.5497079698474261" b="0.004492247844974644" c="0.004944394528989935" d="-0.003182900567088698"/>
+                  <width sOffset="0.9039644910671434" a="0.5554579903450039" b="0.005628623219591792" c="-0.0010574146929898706" d="8.093289009688082E-5"/>
+                  <roadMark sOffset="0.0" type="curb" weight="standard" color="standard" width="0.12">
+                     <type name="curb" width="0.12">
+                        <line length="5.00000000000009" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.0"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.13041680493783328">
+                     <type name="solid" width="0.130417">
+                        <line length="5.00000000000009" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.130417"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="3.181138813515793" b="-1.096662728683473E-8" c="-0.006016033008589158" d="0.0032454449807590604"/>
+                  <width sOffset="0.9039644910671434" a="3.178620124398533" b="-0.002920507766041823" c="1.5539000060836968E-4" d="-1.838847642651536E-5"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.13237744300278567">
+                     <type name="solid" width="0.132377">
+                        <line length="5.00000000000009" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.132377"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="driving" level="false">
+                  <link>
+                     <predecessor id="-2"/>
+                     <successor id="-2"/>
+                  </link>
+                  <width sOffset="0.0" a="3.375239473379912" b="-5.804063788611424E-9" c="0.005723924134595501" d="-9.91527087849409E-4"/>
+                  <width sOffset="2.9937044604280185" a="3.3999357434711306" b="0.007612478920096638" c="-4.674518349976823E-4" d="-3.662381655036843E-5"/>
+                  <roadMark sOffset="0.0" type="solid" weight="bold" color="standard" width="0.25">
+                     <type name="solid" width="0.25">
+                        <line length="5.00000000000009" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.25"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-3" type="shoulder" level="false">
+                  <link>
+                     <successor id="-3"/>
+                  </link>
+                  <width sOffset="0.0" a="0.0" b="0.0" c="0.011861710739724373" d="3.551614452118449E-5"/>
+                  <width sOffset="2.9937044604280185" a="0.10726072310934587" b="0.07197582814535418" c="0.009467044033538752" d="-9.193871267778586E-4"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects/>
+      <signals/>
+   </road>
+   <road length="211.08060560503478" id="255961" junction="-1">
+      <link>
+         <successor elementType="junction" elementId="2104811"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618103.9380210286" y="5809510.592440319" hdg="0.08243300012912091" length="211.08060560503478">
+            <paramPoly3 aU="0.0" bU="211.07463213628304" cU="-0.13094590592123523" dU="0.09056922766097086" aV="-0.0" bV="7.105427357601002E-15" cV="12.73898211744801" dV="-8.783792652173432" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="102.20076641363144" b="-2.5889422384496325E-5" c="1.3935784636931393E-6" d="0.0"/>
+         <elevation s="10.051457409763561" a="102.20064698294013" b="2.125566765454324E-6" c="1.1150922972387234E-4" d="-5.110063702880037E-6"/>
+         <elevation s="11.947958901845714" a="102.20101722465546" b="3.699420349630878E-4" c="1.1664649596224251E-4" d="-5.253281019748846E-6"/>
+         <elevation s="20.102914819527122" a="102.2089424433322" b="0.001224354434225628" c="5.863564305723145E-5" d="-2.0480540040653456E-6"/>
+         <elevation s="30.154372229290683" a="102.22509322087502" b="0.001782346048615774" c="3.765843959558178E-5" d="-2.295561359988141E-6"/>
+         <elevation s="40.205829639054244" a="102.244481914946" b="0.001843616390543444" c="1.3602208778399318E-5" d="-1.4321731646410967E-7"/>
+         <elevation s="50.2572870488178" a="102.26424176256853" b="0.0020736519268451173" c="-1.1215536836592716E-4" d="6.591561294419365E-6"/>
+         <elevation s="60.308744458581366" a="102.28044756949069" b="0.0018168739392822497" c="1.193123873171637E-5" d="5.515521174929742E-7"/>
+         <elevation s="70.36020186834493" a="102.3004753454273" b="0.002223899518350901" c="5.8768078911539545E-5" d="-3.843036773886845E-6"/>
+         <elevation s="80.41165927810849" a="102.32486355289485" b="0.0022405024800422283" c="-1.078809087809312E-4" d="8.60707634111397E-6"/>
+         <elevation s="87.61836466750427" a="102.33862878435022" b="0.0020266375362304636" c="1.2405370503209314E-4" d="7.651424651017038E-6"/>
+         <elevation s="90.46311668787204" a="102.3455741314542" b="0.0029182016723483385" c="4.985362348495337E-5" d="-1.0988690065257804E-6"/>
+         <elevation s="100.5145740976356" a="102.37882719246593" b="0.0035873426906182716" c="2.630023973010859E-4" d="-1.8136864209876784E-5"/>
+         <elevation s="110.56603150739917" a="102.42303852908624" b="0.0033772575828170505" c="-6.815706168507772E-5" d="-1.098869006496121E-6"/>
+         <elevation s="119.47958815534376" a="102.44694851166724" b="0.001900293575619294" c="-7.825026517864629E-5" d="3.036248475546279E-7"/>
+         <elevation s="120.61748891716273" a="102.44900998466464" b="0.0017233909197851786" c="-3.1853508689961175E-4" d="2.17664337932881E-5"/>
+         <elevation s="130.6689463269263" a="102.45625458224475" b="0.001917212900701527" c="-2.1215552027388572E-5" d="3.036248475546936E-7"/>
+         <elevation s="140.72040373668986" a="102.47369025686797" b="0.0015827457564766374" c="9.926041977948729E-5" d="-6.121635654999546E-6"/>
+         <elevation s="150.7718611464534" a="102.49341099309636" b="0.0017227299851002224" c="6.6716608821129554E-6" d="-2.424545594752306E-6"/>
+         <elevation s="160.82331855621698" a="102.5089388232797" b="0.0011219812273144346" c="-9.278820783725785E-5" d="5.481003470881777E-6"/>
+         <elevation s="170.87477596598055" a="102.51640786158845" b="9.17934663533084E-4" c="1.138672219075109E-5" d="1.2050944560151762E-6"/>
+         <elevation s="171.25407633129637" a="102.51675773849665" b="9.270927655440879E-4" c="1.7620403175957068E-5" d="3.846682829667919E-7"/>
+         <elevation s="180.9262333757441" a="102.5277211868233" b="0.0013759052502343146" c="4.203383714708157E-5" d="-1.894837011760227E-6"/>
+         <elevation s="190.97769078550766" a="102.5438735550987" b="0.0016465915383210203" c="3.465943661815455E-5" d="-4.089612900848888E-6"/>
+         <elevation s="201.0291481952712" a="102.55977283436297" b="0.001103804430656286" c="-4.905445645430341E-5" d="-5.168018405897578E-7"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="-0.023854011754730953" b="0.0" c="-9.646248005946667E-7" d="0.0"/>
+         <superelevation s="10.051457409763561" a="-0.02395146953085933" b="-1.9391770199157918E-5" c="-2.7387771420666983E-5" d="1.2539681201477202E-6"/>
+         <superelevation s="20.102914819527122" a="-0.02563999513326474" b="-1.8989385202289075E-4" c="-1.0057547961384487E-5" d="7.837859252925192E-7"/>
+         <superelevation s="30.154372229290683" a="-0.027768889462827392" b="-1.5451798270667278E-4" c="1.7238068272013103E-6" d="3.95467716000334E-7"/>
+         <superelevation s="40.205829639054244" a="-0.028746256977702146" b="0.0" c="3.885344698377454E-6" d="0.0"/>
+         <superelevation s="50.2572870488178" a="-0.02835371362451175" b="7.810675351598184E-5" c="1.1929372653037387E-5" d="-6.968714278519291E-7"/>
+         <superelevation s="60.308744458581366" a="-0.02707106561215328" b="1.0670339987344887E-4" c="4.376391367728446E-6" d="-6.423113988116236E-7"/>
+         <superelevation s="70.36020186834493" a="-0.026208664265901866" b="0.0" c="-1.0627539165441253E-5" d="5.186282283237737E-7"/>
+         <superelevation s="80.41165927810849" a="-0.02675570795919518" b="-5.645069039870401E-5" c="-6.220969890729132E-6" d="5.988554273170122E-7"/>
+         <superelevation s="90.46311668787204" a="-0.02734348768649051" b="0.0" c="2.7876873413649024E-5" d="-9.37302197929851E-7"/>
+         <superelevation s="100.5145740976356" a="-0.025478883221076026" b="2.7631443814499175E-4" c="2.7221655700985162E-5" d="-1.8094180566102943E-6"/>
+         <superelevation s="110.56603150739917" a="-0.02178876207305624" b="2.751227956986133E-4" c="-9.236700376057339E-6" d="8.335011399439405E-9"/>
+         <superelevation s="120.61748891716273" a="-0.019948113094236636" b="9.196449834084404E-5" c="-1.28548779725271E-5" d="8.237803594867853E-7"/>
+         <superelevation s="130.6689463269263" a="-0.019485924475095003" b="8.322800927814189E-5" c="1.0700947814631975E-5" d="-6.959626952805693E-7"/>
+         <superelevation s="140.72040373668986" a="-0.018274987513119335" b="8.740516839842481E-5" c="-6.595817376750031E-6" d="3.2889622627034857E-7"/>
+         <superelevation s="150.7718611464534" a="-0.017728825819995044" b="5.449694288109597E-5" c="5.469661467999282E-6" d="-5.425786332512541E-7"/>
+         <superelevation s="160.82331855621698" a="-0.017179440112456028" b="0.0" c="-5.015016013363258E-5" d="2.4150930565773726E-6"/>
+         <superelevation s="170.87477596598055" a="-0.01979363330270729" b="-2.761608298758119E-4" c="-3.1357867926333545E-6" d="1.5281730738021992E-7"/>
+         <superelevation s="180.9262333757441" a="-0.02273107775193939" b="-2.9288106355915245E-4" c="8.118296461689046E-8" d="-1.4415466148748346E-8"/>
+         <superelevation s="190.97769078550766" a="-0.02568139637568944" b="-2.956183106448263E-4" c="-7.546569770227668E-6" d="7.300393910682636E-7"/>
+         <superelevation s="201.0291481952712" a="-0.02867386746992484" b="-2.2605478729216722E-4" c="7.129349923317172E-6" d="-4.2705435407186815E-22"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="-4.903895325576003" b="0.02245578423826846" c="-6.406792425902279E-4" d="1.787478123195259E-7"/>
+         <laneOffset s="1.259194248750341" a="-4.876634616221369" b="0.02084315525472948" c="-6.984263575600719E-4" d="8.629334443234215E-6"/>
+         <laneOffset s="7.972735015020148" a="-4.765571305593802" b="0.012632142104982924" c="-1.869700896498987E-4" d="9.154941219386297E-7"/>
+         <laneOffset s="10.051457409763561" a="-4.74011227961256" b="0.011866692068659146" c="-1.899212927878562E-4" d="3.8602504385762974E-7"/>
+         <laneOffset s="20.102914819527122" a="-4.6396308040947245" b="0.00816572290784581" c="-1.9187821324374876E-4" d="5.150165159938109E-7"/>
+         <laneOffset s="30.154372229290683" a="-4.576416180653673" b="0.0044645106621187015" c="-1.8787093460766028E-4" d="2.4776975768596203E-7"/>
+         <laneOffset s="40.205829639054244" a="-4.550270665478634" b="7.62855137521107E-4" c="-1.8261703936990538E-4" d="-4.906090519759842E-7"/>
+         <laneOffset s="42.27721375309923" a="-4.5494784023164705" b="-0.0" c="-1.1999792917697254E-4" d="-1.9213501906925223E-7"/>
+         <laneOffset s="50.2572870488178" a="-4.557217698684458" b="-0.00195189091921971" c="-1.1746717754883037E-4" d="-3.1995087649734853E-7"/>
+         <laneOffset s="60.30639092000851" a="-4.589019503436866" b="-0.00440970088344121" c="-0.0015615878083582507" d="1.218778103648153E-4"/>
+         <laneOffset s="67.57128749481545" a="-4.6567422859567795" b="-0.00780158342148773" c="4.4918099403394417E-4" d="-4.644119393111696E-5"/>
+         <laneOffset s="70.36020186834493" a="-4.676013901010148" b="-0.006379793623779934" c="6.200261248928518E-5" d="-4.43026996136615E-5"/>
+         <laneOffset s="72.72331527154681" a="-4.691328469083897" b="-0.00682895456966957" c="3.776657091849718E-5" d="-5.884043604958981E-6"/>
+         <laneOffset s="80.41165927810849" a="-4.744273494520018" b="-0.007291658427538901" c="-1.1128732384568911E-4" d="-3.5128826423298124E-6"/>
+         <laneOffset s="82.98341191852884" a="-4.763821632692912" b="-0.007933767051662202" c="-2.0851975040168125E-4" d="5.022649742096438E-6"/>
+         <laneOffset s="90.46311668787204" a="-4.832727935256196" b="-0.010210108156988737" c="-9.150884475771032E-5" d="4.292628326454301E-6"/>
+         <laneOffset s="100.5145740976356" a="-4.94024046932575" b="-0.01074862681946376" c="6.277531155611445E-5" d="3.2336457625199317E-6"/>
+         <laneOffset s="108.20534662124962" a="-5.017721715132731" b="-0.009209254672745174" c="1.286336689320275E-4" d="-1.5260375143948227E-5"/>
+         <laneOffset s="110.56603150739917" a="-5.038945770441561" b="-0.00885705812916307" c="7.305557418450375E-5" d="-2.451773275596828E-6"/>
+         <laneOffset s="120.61748891716273" a="-5.123080994069792" b="-0.008131549316938812" c="6.300313083487591E-6" d="-2.1566232861616255E-6"/>
+         <laneOffset s="130.9799537472189" a="-5.209067092172112" b="-0.00869571477924423" c="-4.7534013370502815E-4" d="5.845177897072614E-5"/>
+         <laneOffset s="138.92913520486906" a="-5.278866802837695" b="-0.00517223115314793" c="2.2026470507162152E-4" d="-6.26725739543083E-6"/>
+         <laneOffset s="140.72040373668986" a="-5.287460928267678" b="-0.004443452857248292" c="2.0485497111626198E-4" d="-8.757359348428507E-8"/>
+         <laneOffset s="151.64225732065842" a="-5.3116692521015665" b="-0.0" c="1.8174846598731544E-5" d="-1.1919525247898411E-7"/>
+         <laneOffset s="160.82331855621698" a="-5.310229503904873" b="3.0358718144922345E-4" c="9.493218638162378E-6" d="4.2576362842123144E-7"/>
+         <laneOffset s="171.8493870539245" a="-5.30515727062522" b="6.682185397057448E-4" c="6.410439428799973E-4" d="-3.1069187118882296E-5"/>
+         <laneOffset s="178.57216176323115" a="-5.281132635913052" b="0.005074825591773087" c="1.7006875156629284E-4" d="1.2914580872147683E-5"/>
+         <laneOffset s="180.9262333757441" a="-5.268075194516853" b="0.006090238015827321" c="2.055218904513475E-4" d="1.0831971169387634E-6"/>
+         <laneOffset s="190.79712939957258" a="-5.186892364610599" b="0.010464231033812133" c="2.5841810990862094E-5" d="1.5914432468217372E-5"/>
+         <laneOffset s="201.0291481952712" a="-5.0600686010429845" b="0.015991505564789798" c="4.5497875549913307E-4" d="3.115410680303565E-5"/>
+         <laneOffset s="202.9926088332872" a="-5.026680064694065" b="0.018138485171189798" c="8.024176701088183E-4" d="-6.558460516911954E-5"/>
+         <laneOffset s="209.08086201176843" a="-4.901305921757724" b="0.02061608943738831" c="-0.0017420406708340958" d="8.676047684692299E-4"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="4" type="shoulder" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="0.33410621849629063" b="-0.013178686976658211" c="0.0014484121390453963" d="-1.3425731810741839E-6"/>
+                  <width sOffset="0.6186769195326619" a="0.326506946973554" b="-0.011388030310348862" c="0.0027600653695032088" d="-1.6363798443721835E-4"/>
+                  <width sOffset="8.737195758545212" a="0.32840810815154864" b="0.00107094551882605" c="1.8344624772553383E-4" d="-7.740836264370161E-6"/>
+                  <width sOffset="10.051457409763561" a="0.33011490199538596" b="0.0015130263950860964" c="1.4881111039874E-4" d="-1.0310145052848792E-5"/>
+                  <width sOffset="20.102914819527122" a="0.3498875506613359" b="0.0013796060546365715" c="-1.4583958656117437E-4" d="-1.0484081184874561E-5"/>
+                  <width sOffset="20.32316593076959" a="0.3501842236518993" b="0.0013138376269325267" c="-0.0011250612694982687" d="1.8481934542201848E-4"/>
+                  <width sOffset="25.98779413891108" a="0.3551196404964294" b="0.006359186550302698" c="-2.2283800379395072E-4" d="9.511340775324779E-7"/>
+                  <width sOffset="30.154372229290683" a="0.37781593570271443" b="0.0045517787887094045" c="-2.2207177315372218E-4" d="-1.6609937659937632E-6"/>
+                  <width sOffset="40.205829639054244" a="0.39944486917410327" b="-4.1595070109096035E-4" c="-2.7471254886521053E-4" d="-2.062722393966786E-6"/>
+                  <width sOffset="40.75995326087947" a="0.39912967879351946" b="-7.223002213928701E-4" c="-2.0676699293776507E-4" d="2.059293515968093E-6"/>
+                  <width sOffset="50.2572870488178" a="0.3753836049607022" b="-0.004092529713797931" c="-1.3012633696030977E-4" d="-6.606116201716181E-6"/>
+                  <width sOffset="52.04689341378203" a="0.3676049699698769" b="-0.0046217516010973484" c="2.2176038340091634E-4" d="-2.8972276768640172E-6"/>
+                  <width sOffset="60.308744458581366" a="0.3429238479392751" b="-0.0015507275786596037" c="1.508670494949275E-4" d="-2.703776078054651E-6"/>
+                  <width sOffset="70.36020186834493" a="0.3398334146874813" b="6.626378064781922E-4" c="6.925506588013568E-5" d="-2.7287755440399294E-6"/>
+                  <width sOffset="80.41165927810849" a="0.3507197366744226" b="0.0012277872139081492" c="-3.118378263471079E-5" d="8.393255538692839E-6"/>
+                  <width sOffset="81.6429409626765" a="0.352199879875001" b="0.0011891690737522356" c="1.9036370793323846E-4" d="-7.909719693062515E-6"/>
+                  <width sOffset="89.02311063796124" a="0.368165161754634" b="0.0027065481629672677" c="1.974285730871323E-4" d="-4.266310757962787E-6"/>
+                  <width sOffset="90.46311668787204" a="0.37245925951656034" b="0.0032486047533387043" c="1.7551373846634008E-4" d="-5.896337509102627E-6"/>
+                  <width sOffset="98.3084047585062" a="0.4059009735568093" b="0.004913783448611017" c="8.681783169027499E-5" d="-5.6279665997228586E-6"/>
+                  <width sOffset="100.5145740976356" a="0.4171037380780902" b="0.005214676092684235" c="3.8882942619350655E-5" d="-3.0942796555671523E-5"/>
+                  <width sOffset="103.15944082987303" a="0.430595366016556" b="0.00477099220174383" c="-4.468889671469789E-4" d="1.6872689548123892E-5"/>
+                  <width sOffset="110.56603150739917" a="0.44827240603626084" b="9.279299125259438E-4" c="-7.024070469294666E-5" d="1.7726590232023957E-5"/>
+                  <width sOffset="116.93707783792061" a="0.4559173400678693" b="0.0021914955402139585" c="-6.127470340156854E-4" d="8.868088318026041E-5"/>
+                  <width sOffset="117.30143831036384" a="0.4566387766770985" b="0.0017802933800292933" c="-2.753989572173408E-4" d="-7.665028987834943E-5"/>
+                  <width sOffset="120.61748891716273" a="0.456719009267907" b="-0.002574764205625038" c="-0.0010251112399999548" d="-8.30625983575455E-5"/>
+                  <width sOffset="122.05214010453156" a="0.4506699421291298" b="-0.0060290026285817425" c="-7.472651560472164E-4" d="5.911336763795885E-5"/>
+                  <width sOffset="130.6689463269263" a="0.3810555179169004" b="-0.005739693444334008" c="7.768211756708593E-4" d="5.9853679684268867E-5"/>
+                  <width sOffset="135.61406604955758" a="0.37890663923074275" b="0.006334277179232727" c="3.3255925515771707E-4" d="-4.176670319479609E-5"/>
+                  <width sOffset="140.72040373668986" a="0.41436189969261417" b="0.006463436060236493" c="-3.1751260730888346E-4" d="-4.2022952132653575E-5"/>
+                  <width sOffset="141.45096815162177" a="0.41889800627122575" b="0.005932223215607214" c="-5.176882856923488E-4" d="-2.2810029428636628E-5"/>
+                  <width sOffset="145.14264629572546" a="0.4325949387601824" b="0.0011773475519368229" c="-0.005732231812343339" d="5.415279036552228E-4"/>
+                  <width sOffset="150.7718611464534" a="0.35417632658091414" b="-0.011878675498667666" c="0.0034067277756806846" d="5.448837762330122E-4"/>
+                  <width sOffset="152.27587707662218" a="0.34587063815949914" b="0.0020665559795677315" c="6.724593292801008E-4" d="7.602500286784052E-6"/>
+                  <width sOffset="153.90981316467824" a="0.3510757185213622" b="0.004324957371478956" c="0.005012812701715172" d="-6.29707681624389E-4"/>
+                  <width sOffset="159.2660308547656" a="0.4212900922274594" b="0.003827210123326344" c="-0.0011339523165328227" d="1.0036031739394077E-4"/>
+                  <width sOffset="160.82331855621698" a="0.4248791863476953" b="0.001025595091479209" c="-6.64218593573058E-4" d="1.015331610751409E-4"/>
+                  <width sOffset="165.08539892708842" a="0.42504551550925473" b="8.968388849620529E-4" c="7.582923108646585E-5" d="-2.7316505843054226E-5"/>
+                  <width sOffset="166.4813098514468" a="0.4263708794500447" b="9.488564382575102E-4" c="1.6614087245764318E-5" d="-1.3068112379617504E-5"/>
+                  <width sOffset="170.87477596598055" a="0.42975209996461405" b="3.38099834736396E-4" c="-1.8331253175729917E-4" d="4.730027637089732E-6"/>
+                  <width sOffset="172.58375745733076" a="0.42981812939278274" b="-2.470118052234076E-4" c="-6.353847838338957E-5" d="-2.456223072056195E-6"/>
+                  <width sOffset="176.33917153072284" a="0.42786431683799275" b="-8.281597327820574E-4" c="3.884018087596594E-4" d="-3.97515791533573E-5"/>
+                  <width sOffset="180.9262333757441" a="0.42840120943121196" b="2.2583130854268545E-4" c="-1.7415619848245139E-4" d="-4.073351168334288E-5"/>
+                  <width sOffset="186.67662200784386" a="0.4161956168044121" b="-0.005817901695012631" c="-0.001643377148692482" d="2.1169783517651535E-4"/>
+                  <width sOffset="190.97769078550766" a="0.3776152844625589" b="-0.008205740886370577" c="0.0011206648309772505" d="2.0975685042354562E-4"/>
+                  <width sOffset="191.85089596893667" a="0.37144413943818755" b="-0.005768789408973173" c="0.0022701322831257496" d="-1.8562298571241545E-4"/>
+                  <width sOffset="196.5875960955272" a="0.375325620093923" b="0.003242987711698833" c="0.004277259999163755" d="-1.1620185643988374E-4"/>
+                  <width sOffset="200.8335410975509" a="0.45731102080844366" b="0.03328033087181244" c="-0.01472623318575985" d="0.001951181676086979"/>
+                  <width sOffset="201.0291481952712" a="0.4632720359123521" b="0.027743188544104472" c="-0.013533943296115094" d="0.001951873725836523"/>
+                  <width sOffset="204.3649363960207" a="0.47767017087617525" b="0.002608776470764171" c="-6.562751703451039E-4" d="7.304109398448283E-5"/>
+                  <width sOffset="205.32999077476524" a="0.47964222147855917" b="0.0015461700932452166" c="-0.0010713929271284712" d="-3.981210628886695E-7"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+               <lane id="3" type="driving" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="3.2170719299744617" b="0.00493813540316872" c="-7.726477411890264E-4" d="-3.5713723100037343E-7"/>
+                  <width sOffset="0.6186769195326619" a="3.219831216278779" b="0.003981686659612734" c="-0.0020874556864523054" d="1.6193827402514132E-4"/>
+                  <width sOffset="8.575960512826086" a="3.200931681521128" b="0.00152173174711916" c="0.002891468871211173" d="-6.941918252798338E-5"/>
+                  <width sOffset="8.737195758545212" a="3.2012519162866204" b="0.002448731104254165" c="0.0014490153578812274" d="-2.2531633051031842E-4"/>
+                  <width sOffset="10.051457409763561" a="3.20646155904933" b="0.005089946071135768" c="5.66363160955442E-4" d="-2.2312121542841993E-4"/>
+                  <width sOffset="13.379848363695631" a="3.221450121271526" b="0.0014447669100104248" c="-9.792389176187485E-4" d="8.412952451355236E-5"/>
+                  <width sOffset="19.0001337526673" a="3.2135739385210567" b="-0.0015900861642959199" c="-5.121992064090624E-4" d="9.97547291425124E-5"/>
+                  <width sOffset="20.102914819527122" a="3.2113313059344932" b="-0.002355830355306645" c="-2.1589501256362583E-4" d="8.40017982315751E-5"/>
+                  <width sOffset="20.32316593076959" a="3.210802856012068" b="-0.0024387076673605367" c="8.119037471036303E-4" d="-1.1130162805239129E-4"/>
+                  <width sOffset="25.60173701705433" a="3.204182218304213" b="-0.0031710205824015698" c="-9.584054055398086E-4" d="-2.874829530255843E-4"/>
+                  <width sOffset="25.98779413891108" a="3.202798641194046" b="-0.004039558512622444" c="9.472154369325021E-4" d="-1.0361474169221203E-4"/>
+                  <width sOffset="30.154372229290683" a="3.1949167171349506" b="-0.0015426360268515989" c="-3.2324926855197304E-4" d="-1.0063811635284355E-4"/>
+                  <width sOffset="30.547180077349363" a="3.1942547812568463" b="-0.0018431705078720485" c="7.477703309962465E-5" d="-3.978750988306995E-6"/>
+                  <width sOffset="36.95304872659514" a="3.1844702825248286" b="-0.001374952772307852" c="-7.695526282716487E-5" d="8.444643354945834E-6"/>
+                  <width sOffset="40.205829639054244" a="3.1794742643477125" b="-0.0016075422257816603" c="6.499388450177847E-6" d="8.33889229164329E-6"/>
+                  <width sOffset="48.502509631908204" a="3.1713467364708823" b="2.223248900544003E-4" c="0.0017497268351921384" d="-1.4673645607271167E-4"/>
+                  <width sOffset="50.2572870488178" a="3.176331828720794" b="0.005007575202106882" c="9.632879347897675E-4" d="-1.3583627099923522E-4"/>
+                  <width sOffset="52.04689341378203" a="3.187599977511521" b="0.007150262856913908" c="-1.5334619389822387E-4" d="-1.3954515952406063E-4"/>
+                  <width sOffset="54.47715279452869" a="3.2020683218628054" b="0.003932392411005108" c="-3.5255915980895455E-4" d="7.514844519874682E-6"/>
+                  <width sOffset="60.308744458581366" a="3.2145011128109644" b="5.871126495230437E-4" c="-2.2643317454240592E-4" d="7.53662322075167E-6"/>
+                  <width sOffset="70.36020186834493" a="3.2051790677499827" b="-0.0016805384299510059" c="-5.107710021617527E-7" d="7.4934775762788935E-6"/>
+                  <width sOffset="73.95536838153153" a="3.1994788597944295" b="-0.001393646454091086" c="1.130740433117219E-4" d="-3.203487487603412E-7"/>
+                  <width sOffset="80.41165927810849" a="3.195108203580951" b="2.637142299091906E-5" c="1.2759296921656182E-4" d="-1.1570716657763811E-5"/>
+                  <width sOffset="81.6429409626765" a="3.1953125131933753" b="2.879516809601128E-4" c="-1.056915703894188E-4" d="4.7322585739915986E-6"/>
+                  <width sOffset="89.02311063796124" a="3.1935832024164155" b="-4.988373379345972E-4" c="-1.8310704212929222E-4" d="1.0888496389830092E-6"/>
+                  <width sOffset="90.46311668787204" a="3.1924884310074724" b="-0.0010194142620792036" c="-1.8105012614031958E-4" d="3.6246806527333238E-6"/>
+                  <width sOffset="91.10409771516595" a="3.191761574717754" b="-0.00124704598102306" c="-4.0793387314581544E-5" d="4.717874689836836E-6"/>
+                  <width sOffset="100.5145740976356" a="3.180345443035029" b="-7.614129795386337E-4" c="5.9417404204982924E-5" d="1.1139270447675224E-5"/>
+                  <width sOffset="102.873191919521" a="3.179026264784344" b="-2.9522119047990444E-4" c="3.3557479518452017E-4" d="8.179109148638013E-6"/>
+                  <width sOffset="103.15944082987303" a="3.1789694463543148" b="-1.0109480124944129E-4" c="5.828517685177861E-4" d="-3.9636377061492955E-5"/>
+                  <width sOffset="110.56603150739917" a="3.194089954795629" b="0.0020097263224655507" c="-3.1316910106384997E-4" d="-4.066330632816721E-5"/>
+                  <width sOffset="114.66826358397857" a="3.19425707705203" b="-0.002612542271890254" c="-8.943473019941937E-4" d="1.3815539497730258E-5"/>
+                  <width sOffset="117.30143831036384" a="3.1814289780338383" b="-0.007035113043540473" c="-0.00102562376501231" d="1.7914671255204792E-4"/>
+                  <width sOffset="119.79798394031224" a="3.160260631136135" b="-0.008806421412697503" c="2.5042763760594456E-4" d="1.2538897884915707E-4"/>
+                  <width sOffset="120.61748891716273" a="3.1532809195959715" b="-0.008143338668269065" c="5.340588099066472E-4" d="1.299912614097672E-4"/>
+                  <width sOffset="122.05214010453156" a="3.143081124339661" b="-0.005808309043212043" c="4.581915124623916E-4" d="-1.2184704585735978E-5"/>
+                  <width sOffset="130.6689463269263" a="3.1192567929270867" b="-6.261332590254496E-4" c="1.4281803165019105E-4" d="-1.2934279730424435E-5"/>
+                  <width sOffset="133.2246401525426" a="3.1183735061338034" b="-1.49578432149188E-4" c="1.1611713517966927E-4" d="1.379927279706778E-5"/>
+                  <width sOffset="138.84642495462106" a="3.123654193297435" b="0.0024643485354417663" c="7.451362463218685E-4" d="-4.2168237241939676E-5"/>
+                  <width sOffset="140.72040373668986" a="3.1306115864860398" b="0.004812828765365774" c="5.123803561681555E-4" d="-4.078764255357663E-5"/>
+                  <width sOffset="141.45096815162177" a="3.1343852338783593" b="0.0054961743998310966" c="5.310606135861328E-4" d="-6.000056525353328E-5"/>
+                  <width sOffset="150.72283719253423" a="3.1831737803776003" b="-1.302824487773367E-4" c="-4.022819267007118E-4" d="-3.7280471692810905E-7"/>
+                  <width sOffset="150.7718611464534" a="3.183166426549425" b="-1.6972803794497167E-4" c="-4.0857033344683555E-4" d="5.755339475197913E-7"/>
+                  <width sOffset="153.90981316467824" a="3.1786285242900454" b="-0.0027168748384179173" c="-0.004706239713411525" d="6.378857158586243E-4"/>
+                  <width sOffset="156.9532779772408" a="3.144749831191268" b="-0.013637834687555025" c="0.0011807474135583681" d="5.860895441978586E-4"/>
+                  <width sOffset="159.2660308547656" a="3.126774730079367" b="0.0012283920219403627" c="0.0012753989995968756" d="-1.439784548202287E-4"/>
+                  <width sOffset="160.82331855621698" a="3.1312369613459587" b="0.004153212491966306" c="6.073394053297138E-4" d="-1.4527478189134977E-4"/>
+                  <width sOffset="162.72260081822807" a="3.1403206123485243" b="0.0048880929679144544" c="-1.581468553871442E-4" d="-1.086905786394272E-4"/>
+                  <width sOffset="165.08539892708842" a="3.149553540115005" b="0.0023203566394432037" c="-3.704088825972755E-4" d="2.015908828017639E-5"/>
+                  <width sOffset="170.87477596598055" a="3.15448371474265" b="5.8492901019092935E-5" c="2.881467850872685E-5" d="5.66192653586337E-6"/>
+                  <width sOffset="172.58375745733076" a="3.1546960949590903" b="2.0658937473168977E-4" c="-3.7680402843520035E-5" d="1.284817724496319E-5"/>
+                  <width sOffset="174.69327601875204" a="3.1550848309961452" b="2.1914016520263417E-4" c="-1.3093149787604086E-4" d="2.1714375585640455E-5"/>
+                  <width sOffset="176.33917153072284" a="3.15518764060302" b="-3.538805551538907E-5" c="-5.033254091307826E-4" d="5.900973166707491E-5"/>
+                  <width sOffset="180.9262333757441" a="3.150130216738332" b="-9.280621817218462E-4" c="3.4353547743061616E-4" d="5.9900126817260475E-5"/>
+                  <width sOffset="181.5046906633308" a="3.1497199180080617" b="-4.7049092729877385E-4" c="0.0011647551174676129" d="-1.8972920592459202E-4"/>
+                  <width sOffset="185.0219659487701" a="3.1542188320556894" b="6.81489515745216E-4" c="-8.182434031221948E-4" d="2.111404242663143E-4"/>
+                  <width sOffset="186.67662200784386" a="3.1540627262845957" b="-2.920976320852659E-4" c="9.96371326482446E-4" d="-4.129092259368079E-5"/>
+                  <width sOffset="189.8331698154215" a="3.1617696961035757" b="0.004763847072196849" c="4.7432699908631095E-5" d="-2.1219360618946959E-4"/>
+                  <width sOffset="190.97769078550766" a="3.1669660231926686" b="0.004038547313357878" c="-7.114699117325093E-4" d="-2.276148999239462E-4"/>
+                  <width sOffset="191.85089596893667" a="3.169798469085109" b="0.0022753684775646734" c="-0.001907718588044287" d="1.6776493621592996E-4"/>
+                  <width sOffset="200.8335410975509" a="3.157901962196118" b="0.008612458302741464" c="0.020136533183233607" d="-0.0018996185961233742"/>
+                  <width sOffset="201.0291481952712" a="3.160342869551937" b="0.016272105531900196" c="0.019006356963965677" d="-0.0018964075210180609"/>
+                  <width sOffset="203.34847096590727" a="3.276663206892408" b="0.07383206188174081" c="0.005996320955777042" d="-0.0018701931559320926"/>
+                  <width sOffset="204.3649363960207" a="3.3559422528622647" b="0.0802253060381424" c="0.0069488047900853125" d="8.639475916777653E-6"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.14">
+                     <type name="solid" width="0.14">
+                        <line length="211.08060560503478" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.14"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="2" type="driving" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="3.426277451909371" b="0.00779512588613079" c="-5.753118799773078E-4" d="-1.724248335246645E-8"/>
+                  <width sOffset="8.575960512826086" a="3.4508047485987925" b="-0.002076382448235655" c="-0.0016889137370830018" d="2.313402138793168E-4"/>
+                  <width sOffset="10.051457409763561" a="3.444807265808052" b="-0.005549410247578213" c="-6.557670930239716E-4" d="2.3050375347262965E-4"/>
+                  <width sOffset="12.933985442505142" a="3.428882944359133" b="-0.003584199467436322" c="0.00127588560816214" d="2.36543662454169E-4"/>
+                  <width sOffset="13.379848363695631" a="3.427559486782709" b="-0.0023053890975303516" c="9.099819265415104E-4" d="-7.070707748834488E-5"/>
+                  <width sOffset="19.0001337526673" a="3.430793969973079" b="0.0012229248459043364" c="6.692561640324147E-4" d="-8.633228211758255E-5"/>
+                  <width sOffset="20.102914819527122" a="3.432840706194798" b="0.002384038079196703" c="4.2532947823484854E-4" d="-7.091851236822521E-5"/>
+                  <width sOffset="25.24121747534547" a="3.446699264261822" b="0.001137776760540589" c="-7.431010617284155E-4" d="-7.647025232921649E-5"/>
+                  <width sOffset="25.60173701705433" a="3.4470092876828615" b="5.721543403838358E-4" c="-8.180396371618044E-4" d="9.971107263976606E-5"/>
+                  <width sOffset="30.154372229290683" a="3.4420677598674527" b="-6.763369090565597E-4" c="5.505388737232233E-4" d="1.0016712967794298E-4"/>
+                  <width sOffset="30.547180077349363" a="3.441893107548199" b="-1.9745816356036032E-4" c="1.519575502970778E-4" d="3.5077643285809146E-6"/>
+                  <width sOffset="36.95304872659514" a="3.4477858891179247" b="0.002181206990694557" c="2.94638610191268E-4" d="-8.915630012024556E-6"/>
+                  <width sOffset="37.31346037300836" a="3.4486098766648086" b="0.0023901150350158053" c="1.486990305837485E-4" d="-9.410220443580793E-6"/>
+                  <width sOffset="40.205829639054244" a="3.4565392593386854" b="0.0030141279811724056" c="6.957544320835649E-5" d="-8.529424651797612E-6"/>
+                  <width sOffset="48.502509631908204" a="3.4814645692109316" b="0.002407252105651146" c="-0.001678394361595038" d="1.4654592371259053E-4"/>
+                  <width sOffset="50.2572870488178" a="3.481312419844789" b="-0.002129413065636339" c="-9.209013923603912E-4" d="1.4462502561679051E-4"/>
+                  <width sOffset="54.47715279452869" a="3.46679558849055" b="-0.0021754442473719826" c="9.181334935544496E-5" d="-2.4349784271667822E-6"/>
+                  <width sOffset="60.308744458581366" a="3.4567487257343066" b="-0.0013530306260216346" c="4.14470167562814E-5" d="-2.8253685180711944E-6"/>
+                  <width sOffset="70.36020186834493" a="3.444467053384433" b="-0.001376180946385622" c="-4.41091253984843E-5" d="-3.2732321437779194E-6"/>
+                  <width sOffset="73.95536838153153" a="3.4387972318614386" b="-0.0018202620063791503" c="-1.1217648454334135E-4" d="4.540594181265127E-6"/>
+                  <width sOffset="80.41165927810849" a="3.42359113477152" b="-0.002700943848343301" c="-1.926997505535187E-5" d="4.4138739132604295E-6"/>
+                  <width sOffset="85.05459816146626" a="3.4110771896363685" b="-0.0025944344108991806" c="9.302881619738185E-5" d="2.142361826132744E-6"/>
+                  <width sOffset="90.46311668787204" a="3.400105372621364" b="-0.0014001326877682834" c="1.258929261501764E-4" d="2.6147603772231835E-6"/>
+                  <width sOffset="91.10409771516595" a="3.3992603266827865" b="-0.0012355198582239026" c="-2.3657227138768576E-6" d="1.5215663426092315E-6"/>
+                  <width sOffset="96.5224850863607" a="3.3927383941649656" b="-0.0011271420210153312" c="1.159424988582279E-4" d="-4.6583073839134295E-7"/>
+                  <width sOffset="100.5145740976356" a="3.390056855740017" b="-2.237079882934645E-4" c="7.584714660594453E-5" d="3.13810556517387E-6"/>
+                  <width sOffset="102.873191919521" a="3.389992333319074" b="1.8645345352896227E-4" c="-9.928562388401003E-5" d="6.098266970548709E-6"/>
+                  <width sOffset="109.06043793117271" a="3.388789550079674" b="-3.4179389710211304E-4" c="1.0436398310977694E-4" d="1.8826111261833238E-5"/>
+                  <width sOffset="110.56603150739917" a="3.3885757725049857" b="1.0049135373017826E-4" c="1.5101601257275059E-4" d="8.161003079411745E-6"/>
+                  <width sOffset="114.66826358397857" a="3.392092738959214" b="0.001751504435911929" c="3.3219824065386947E-4" d="-4.631784274653644E-5"/>
+                  <width sOffset="119.79798394031224" a="3.4035667916081502" b="0.0015032451502410941" c="-3.1490207733223506E-4" d="7.439890955816427E-6"/>
+                  <width sOffset="121.08300649296872" a="3.4049942900650563" b="7.307887032379033E-4" c="-1.6629331874261753E-4" d="5.096921211900481E-6"/>
+                  <width sOffset="130.6689463269263" a="3.4012084983696216" b="-0.0010522948147752339" c="-2.8961286166004368E-5" d="7.245805112923927E-6"/>
+                  <width sOffset="133.1479923703808" a="3.3985322173040444" b="-0.0010622965727454334" c="4.5258535057336074E-4" d="-2.379420690165124E-5"/>
+                  <width sOffset="133.2246401525426" a="3.3984534427990525" b="-9.933366105307683E-4" c="3.746467510694529E-4" d="-5.052775859877471E-5"/>
+                  <width sOffset="138.84642495462106" a="3.3957321844435864" b="-0.0015716780255206047" c="-8.73811289923594E-4" d="5.439751440493258E-6"/>
+                  <width sOffset="140.72040373668986" a="3.389754044941935" b="-0.004789375759407508" c="-8.530006268240448E-4" d="4.863669953419839E-6"/>
+                  <width sOffset="143.1265160356826" a="3.3733596777147854" b="-0.008809733509837643" c="3.576535758420507E-5" d="4.0004895019527674E-5"/>
+                  <width sOffset="150.72283719253423" a="3.3260376194842074" b="-0.001341024422658243" c="2.118258376865945E-4" d="-1.962285631822632E-5"/>
+                  <width sOffset="150.7718611464534" a="3.325972383943926" b="-0.0013203968241018256" c="2.0761977099137128E-4" d="-1.964558260483141E-5"/>
+                  <width sOffset="156.9532779772408" a="3.321103476622131" b="-0.0010055961980310318" c="-2.19531768915279E-4" d="3.2150589055928386E-5"/>
+                  <width sOffset="160.82331855621698" a="3.31578733037604" b="-0.001260211140636034" c="1.5845556512181835E-4" d="3.0818965580603635E-5"/>
+                  <width sOffset="162.72260081822807" a="3.3141765740259856" b="-3.247901748061862E-4" c="2.717901207304471E-4" d="-5.765237671470302E-6"/>
+                  <width sOffset="170.87477596598055" a="3.326467971759897" b="0.0029571333629901287" c="1.4580642378466757E-4" d="-6.598648833204881E-6"/>
+                  <width sOffset="174.69327601875204" a="3.3395183856156194" b="0.0037820134761495515" c="2.44777101200539E-4" d="-1.5464847173938243E-5"/>
+                  <width sOffset="180.9262333757441" a="3.3688562498956793" b="0.005030967260191545" c="-3.14809312626686E-5" d="-1.645732055686505E-5"/>
+                  <width sOffset="181.5046906633308" a="3.3717527301810053" b="0.004978026019982146" c="-7.773111476758467E-4" d="2.331720121843545E-4"/>
+                  <width sOffset="185.0219659487701" a="3.389791541672621" b="0.008163862024938545" c="0.0016640882992750693" d="-1.6769761800425196E-4"/>
+                  <width sOffset="185.72675826698634" a="3.3963132654062536" b="0.01025963289913978" c="-2.1195291675140185E-4" d="-1.1561464748514882E-4"/>
+                  <width sOffset="189.8331698154215" a="3.426863742023012" b="0.002670204943034025" c="-0.0010783085745398812" d="5.5288036111204064E-5"/>
+                  <width sOffset="190.97769078550766" a="3.428590230764442" b="4.1918147279035485E-4" c="-8.422317272687656E-4" d="7.11395090330869E-5"/>
+                  <width sOffset="197.98359444257906" a="3.414650621546139" b="-9.068526402281687E-4" c="9.712318995905205E-5" d="1.1835990932516916E-5"/>
+                  <width sOffset="201.0291481952712" a="3.4131239609127375" b="1.4085718894035065E-5" c="2.3777858328356713E-4" d="1.1509925878703126E-5"/>
+                  <width sOffset="203.34847096590727" a="3.414579303164558" b="0.001302800870589458" c="1.327568533002177E-4" d="-1.4704439206712568E-5"/>
+                  <width sOffset="210.02898056105732" a="3.4248234425566224" b="0.001107825287648339" c="-8.615250001146977E-5" d="-1.801318249808192E-5"/>
+                  <roadMark sOffset="0.0" type="broken" weight="bold" color="standard" width="0.25">
+                     <type name="broken" width="0.25">
+                        <line length="3.0" space="3.0" tOffset="-0.0" sOffset="0.0" width="0.25"/>
+                     </type>
+                  </roadMark>
+                  <roadMark sOffset="185.0219659487701" type="solid" weight="bold" color="standard" width="0.25">
+                     <type name="solid" width="0.25">
+                        <line length="26.05863965626469" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.25"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="1" type="driving" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="3.182444967386613" b="-0.00533396082474126" c="4.390466642526519E-4" d="-1.7124343791939128E-7"/>
+                  <width sOffset="1.259194248750341" a="3.1764242719864946" b="-0.004229085311072769" c="4.968221276177487E-4" d="-8.62183006883368E-6"/>
+                  <width sOffset="7.972735015020148" a="3.1678158367877876" b="0.0012759861090838893" c="-1.4482997521974379E-5" d="-9.079897475507801E-7"/>
+                  <width sOffset="10.051457409763561" a="3.1703975195262584" b="0.001204003338978018" c="-1.5005066196466802E-5" d="4.0438036906910575E-7"/>
+                  <width sOffset="12.933985442505142" a="3.1737531015362173" b="0.001127578241556933" c="5.0139738977615796E-5" d="-5.635528611926838E-6"/>
+                  <width sOffset="20.102914819527122" a="3.182337153747916" b="9.775852993381164E-4" c="-6.543656422925022E-5" d="-5.425359024255014E-6"/>
+                  <width sOffset="25.24121747534547" a="3.1848966001689396" b="-1.2460394056146296E-4" c="-7.383977566376957E-5" d="1.2638095208825798E-7"/>
+                  <width sOffset="30.154372229290683" a="3.1825169654275687" b="-8.410242668348712E-4" c="-6.718835687614418E-5" d="-6.242933531073566E-8"/>
+                  <width sOffset="37.31346037300836" a="3.1730295177533825" b="-0.0018126379916374876" c="6.777052071052412E-5" d="4.3216109359373216E-7"/>
+                  <width sOffset="40.205829639054244" a="3.1683641109506255" b="-0.0014097571293499303" c="7.271358984065132E-5" d="7.972238113300497E-7"/>
+                  <width sOffset="42.27721375309923" a="3.165763035058694" b="-0.0010982597972655755" c="1.199983047270416E-5" d="4.987497784231414E-7"/>
+                  <width sOffset="50.2572870488178" a="3.158016465875887" b="-8.114572373597009E-4" c="1.8770491850060082E-5" d="5.581888003130813E-7"/>
+                  <width sOffset="60.30639092000851" a="3.1523240283438083" b="-2.6509876108164656E-4" c="0.0014700734923045107" d="-1.2164454895947167E-4"/>
+                  <width sOffset="60.308744458581366" a="3.1523234125650106" b="-2.5818103372426005E-4" c="0.0014717052139940866" d="-1.2160671822446345E-4"/>
+                  <width sOffset="67.57128749481545" a="3.1814901634677346" b="0.001876195786407903" c="-5.322966010062362E-4" d="4.671228607146857E-5"/>
+                  <width sOffset="70.36020186834493" a="3.183595783591291" b="-2.872933913627973E-6" c="-1.4252075349257024E-4" d="4.468338653646475E-5"/>
+                  <width sOffset="72.72331527154681" a="3.1833827725968105" b="7.211863117401619E-5" c="-1.1558589281269592E-4" d="6.264730527762568E-6"/>
+                  <width sOffset="80.41165927810849" a="3.179951977598577" b="-5.942730095280287E-4" c="3.959436740838849E-5" d="4.136454279752027E-6"/>
+                  <width sOffset="82.98341191852884" a="3.1787558864416297" b="-3.0854474229914143E-4" c="1.4163780997945266E-4" d="-4.399078104702314E-6"/>
+                  <width sOffset="85.05459816146626" a="3.178685346645784" b="2.2155816461495205E-4" c="6.348512902494046E-5" d="-2.1275660175364383E-6"/>
+                  <width sOffset="90.46311668787204" a="3.1814041166688023" b="7.215720104395296E-4" c="2.65539953388217E-5" d="-1.8699431542417078E-6"/>
+                  <width sOffset="96.5224850863607" a="3.1863353259242677" b="8.374026986659542E-4" c="-1.0101294203498435E-4" d="1.174539267752165E-7"/>
+                  <width sOffset="100.5145740976356" a="3.1880759640782426" b="3.651289717316111E-5" c="-1.0985982779215129E-4" d="2.2183022459773773E-6"/>
+                  <width sOffset="108.20534662124962" a="3.182867881007353" b="-0.001259676688879191" c="-4.9929109336504615E-5" d="2.0712323152644042E-5"/>
+                  <width sOffset="109.06043793117271" a="3.181767185090215" b="-0.0012996312032103972" c="-8.7251499748578E-5" d="7.984478861384698E-6"/>
+                  <width sOffset="110.56603150739917" a="3.1796399361599184" b="-0.001508063860392421" c="-7.629491401570663E-5" d="6.280124452932935E-6"/>
+                  <width sOffset="120.61748891716273" a="3.16315105616018" b="-0.0011383372591274657" c="1.0590187350989318E-4" d="5.98497446130951E-6"/>
+                  <width sOffset="121.08300649296872" a="3.162644693563858" b="-0.0010358479416254715" c="-5.667269665067318E-6" d="8.32794420755003E-6"/>
+                  <width sOffset="130.6689463269263" a="3.159530056499118" b="0.0011512702845914678" c="2.3945467115453364E-4" d="6.999572484720203E-6"/>
+                  <width sOffset="130.9799537472189" a="3.1599114820646643" b="0.0013022457575706846" c="6.60582076029674E-4" d="-5.360882977252158E-5"/>
+                  <width sOffset="133.1479923703808" a="3.1652934877577605" b="0.0034106332079885844" c="-1.1575454762103507E-4" d="-2.2568818588282714E-5"/>
+                  <width sOffset="138.92913520486906" a="3.176781504967225" b="-1.9061286556484609E-4" c="1.9115131469077967E-4" d="4.2150217777876625E-5"/>
+                  <width sOffset="140.72040373668986" a="3.1772956625694686" b="8.999288018129727E-4" c="4.0484911971617007E-4" d="3.516602077505833E-5"/>
+                  <width sOffset="143.1265160356826" a="3.182294675057383" b="0.0034589216859658573" c="-1.9496907113208766E-4" d="2.479570895273876E-8"/>
+                  <width sOffset="150.7718611464534" a="3.1973542097427843" b="4.820580409099399E-4" c="-1.9308025916330883E-4" d="4.7521534440106154E-8"/>
+                  <width sOffset="151.64225732065842" a="3.1976275469761655" b="1.4605340857584283E-4" c="-9.145444855423247E-6" d="7.914319548480931E-8"/>
+                  <width sOffset="160.82331855621698" a="3.198258833519548" b="-1.8629824177152565E-6" c="-3.992886698630403E-6" d="-2.2500163710550137E-7"/>
+                  <width sOffset="170.87477596598055" a="3.197608206375081" b="-1.5032860214401702E-4" c="-1.7711422437818376E-5" d="-1.6682612170195402E-7"/>
+                  <width sOffset="171.8493870539245" a="3.1974447165215256" b="-1.85327487299221E-4" c="-6.356664216506957E-4" d="3.1328124627125144E-5"/>
+                  <width sOffset="178.57216176323115" a="3.176988166102855" b="-0.004484522226265978" c="-1.5946889474189292E-4" d="-1.265564336388155E-5"/>
+                  <width sOffset="180.9262333757441" a="3.165382459788098" b="-0.005445724180646138" c="-2.0601052775488717E-4" d="1.682137740266821E-7"/>
+                  <width sOffset="185.72675826698634" a="3.134511213815108" b="-0.007412012034271425" c="0.0013178772526386106" d="-5.1914756747260915E-5"/>
+                  <width sOffset="190.79712939957258" a="3.124043208176674" b="0.0019482644982935938" c="7.399524585423513E-4" d="-6.674599222625839E-5"/>
+                  <width sOffset="190.97769078550766" a="3.1244187208350085" b="0.0022089499397550793" c="6.87877830562341E-4" d="-6.71761712871906E-5"/>
+                  <width sOffset="197.98359444257906" a="3.150557528956724" b="0.0019558007808376642" c="-1.6817679944097956E-4" d="-7.872653186577678E-6"/>
+                  <width sOffset="201.0291481952712" a="3.1547317262797603" b="7.123518486846746E-4" c="-1.978075682530712E-4" d="-2.5997337617072593E-5"/>
+                  <width sOffset="202.9926088332872" a="3.155171031196311" b="-3.6509596658227186E-4" c="-5.14871142914815E-4" d="7.074137435508224E-5"/>
+                  <width sOffset="209.08086201176843" a="3.14982795846826" b="0.0012320470937734265" c="0.0021237743471892315" d="-8.624479992832219E-4"/>
+                  <width sOffset="210.02898056105732" a="3.15217015034738" b="0.002933388807423696" c="-4.051245788888456E-4" d="-8.59139255990231E-4"/>
+                  <roadMark sOffset="0.0" type="broken" weight="standard" color="standard" width="0.13216460286150195">
+                     <type name="broken" width="0.132165">
+                        <line length="4.0" space="8.0" tOffset="-0.0" sOffset="0.0" width="0.132165"/>
+                     </type>
+                  </roadMark>
+                  <roadMark sOffset="143.1265160356826" type="solid" weight="standard" color="standard" width="0.13216460286150195">
+                     <type name="solid" width="0.132165">
+                        <line length="67.95408956935216" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.132165"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.12715914993014782">
+                     <type name="solid" width="0.127159">
+                        <line length="211.08060560503478" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.127159"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="shoulder" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="0.5162585609768717" b="0.004015844679391003" c="-6.648087573192775E-4" d="2.196795601694377E-5"/>
+                  <width sOffset="1.259194248750341" a="0.5203050484968772" b="0.002446093158270095" c="-6.402453353208709E-4" d="3.0418542647859155E-5"/>
+                  <width sOffset="7.972735015020148" a="0.5170744476121154" b="-0.0020374932964644828" c="3.100591452288381E-4" d="2.270470232661054E-5"/>
+                  <width sOffset="10.051457409763561" a="0.5143827984989278" b="-4.5411255051838566E-4" c="4.555182030834231E-4" d="1.8903632071096646E-5"/>
+                  <width sOffset="12.512341725052371" a="0.5163055970023551" b="0.0021312810954857257" c="-3.7097900723313495E-5" d="-4.97478831531347E-7"/>
+                  <width sOffset="20.102914819527122" a="0.5301282099734062" b="0.001482103026425206" c="-4.328080272779822E-5" d="-6.02055921784235E-8"/>
+                  <width sOffset="30.154372229290683" a="0.5405916283958652" b="5.937846985361417E-4" c="-4.374723074937879E-5" d="-2.9574501451718794E-8"/>
+                  <width sOffset="40.205829639054244" a="0.5421101353055624" b="-2.9462604980707815E-4" c="-4.437403041351274E-5" d="-1.8985354234970418E-7"/>
+                  <width sOffset="42.27721375309923" a="0.5413077716126553" b="-4.809011482932857E-4" c="2.0114020333273033E-5" d="1.0862049064029341E-7"/>
+                  <width sOffset="43.983966260104566" a="0.5405461246331527" b="-4.1129260322302514E-4" c="5.107705640655844E-4" d="-1.3960461478620686E-5"/>
+                  <width sOffset="50.2572870488178" a="0.5546204908547017" b="0.004348939398838471" c="2.459796117045653E-4" d="-1.4124193919954844E-5"/>
+                  <width sOffset="60.30639092000851" a="0.6088302768451532" b="0.005013715234993294" c="-0.001614301809229588" d="1.0811149501638591E-4"/>
+                  <width sOffset="60.308744458581366" a="0.6088420678769113" b="0.005006118387621337" c="-0.0016237104537065482" d="1.0808249894088503E-4"/>
+                  <width sOffset="67.57128749481545" a="0.6009593914935589" b="-0.0014761334468893104" c="8.563068755841743E-5" d="-6.023650535495379E-5"/>
+                  <width sOffset="68.88108180901264" a="0.5990375116090663" b="-0.0015618344959039557" c="-1.1284581330181943E-4" d="-2.6401113232247008E-5"/>
+                  <width sOffset="70.36020186834493" a="0.5963950528907889" b="-0.0020689402696878086" c="-2.32158119285705E-4" d="-2.703769694220602E-5"/>
+                  <width sOffset="72.72331527154681" a="0.5898526718719497" b="-0.00361913243151274" c="-1.3399668319877283E-4" d="1.138095906649235E-5"/>
+                  <width sOffset="80.41165927810849" a="0.5592791313885375" b="-0.00366135052092033" c="1.2270230564545126E-4" d="1.3311494017593796E-5"/>
+                  <width sOffset="82.98341191852884" a="0.5509010055175008" b="-0.0027661074280364356" c="1.5527428438516334E-4" d="2.184702640201591E-5"/>
+                  <width sOffset="86.32931933132694" a="0.5442025173399854" b="-9.93301968897832E-4" c="0.001156173953201607" d="-1.3148098504085448E-4"/>
+                  <width sOffset="90.46311668787204" a="0.5505656835930823" b="0.0018251238021021396" c="-4.7758308918107985E-4" d="-1.2705618197859903E-4"/>
+                  <width sOffset="92.1851179706651" a="0.5516435993721123" b="-9.499482568641922E-4" c="-7.19309883498413E-4" d="3.588705851300206E-5"/>
+                  <width sOffset="100.5145740976356" a="0.5145644422108244" b="-0.005463353424054126" c="1.4870837865535439E-4" d="4.243928174364406E-5"/>
+                  <width sOffset="103.84752938330749" a="0.49957856059395045" b="-0.0030577548091699023" c="3.6030795653648384E-4" d="-7.11732886585514E-7"/>
+                  <width sOffset="108.20534662124962" a="0.49303697664595614" b="4.2008996838410056E-5" c="3.422538064421876E-4" d="-1.9205753793071256E-5"/>
+                  <width sOffset="110.56603150739917" a="0.49479080481008975" b="0.0013368243898566785" c="2.310156572725693E-4" d="-8.093207417484398E-6"/>
+                  <width sOffset="120.61748891716273" a="0.5233489769424224" b="0.003527898626153582" c="-1.3753987766230524E-5" d="-8.118149710782641E-6"/>
+                  <width sOffset="130.6689463269263" a="0.5491757922654603" b="7.908296437602446E-4" c="-2.6544719303874345E-4" d="-7.756049591708735E-6"/>
+                  <width sOffset="130.9799537472189" a="0.5493958372892678" b="6.234669242734196E-4" c="-6.87280407909179E-4" d="5.285235266944543E-5"/>
+                  <width sOffset="138.34822122435025" a="0.5378190176835229" b="-8.963856231619946E-4" c="7.288910585568682E-4" d="6.25589013416168E-5"/>
+                  <width sOffset="138.92913520486906" a="0.5375565308740509" b="1.379396734425397E-5" c="1.3958852583623039E-4" d="-2.1601350314415418E-6"/>
+                  <width sOffset="140.72040373668986" a="0.5380167138484548" b="4.930817286740181E-4" c="1.2993080890484393E-4" d="2.571980802230509E-8"/>
+                  <width sOffset="150.7718611464534" a="0.5561261657279912" b="0.0031128652677167943" c="1.2732385636148833E-4" d="2.3576817282954795E-8"/>
+                  <width sOffset="151.64225732065842" a="0.5589320665111401" b="0.0033345632472896796" c="-5.642530674279409E-5" d="-8.044841490833791E-9"/>
+                  <width sOffset="160.82331855621698" a="0.5847844745740742" b="0.0022964405098370986" c="-5.5243447773321005E-5" d="-1.3634262283264434E-7"/>
+                  <width sOffset="170.87477596598055" a="0.6021472455802783" b="0.0011445613647201294" c="-2.2019353347795726E-5" d="-4.981942985511459E-6"/>
+                  <width sOffset="171.8493870539245" a="0.6032372202879159" b="0.0010874442065623778" c="5.808815034811969E-4" d="-3.6476893734328665E-5"/>
+                  <width sOffset="174.43330623844955" a="0.6092961284580962" b="0.003358716845103384" c="3.7193085233198627E-5" d="-3.2875902268065525E-5"/>
+                  <width sOffset="178.57216176323115" a="0.6215036221290431" b="0.0019770855062599775" c="-2.1537449907907204E-4" d="1.1107865722985042E-5"/>
+                  <width sOffset="180.9262333757441" a="0.6251091993110522" b="0.001147739335027177" c="-1.6268190160271439E-4" d="2.576243312358532E-7"/>
+                  <width sOffset="190.79712939957258" a="0.6208353453413" b="-0.0019885883743707526" c="-3.6680941065686995E-4" d="1.5088859957216575E-5"/>
+                  <width sOffset="190.97769078550766" a="0.6204644130202288" b="-0.0021195758056643376" c="-3.1665062874815513E-4" d="1.1872697361400213E-5"/>
+                  <width sOffset="195.8581829798189" a="0.603957668317368" b="-0.004362003045986735" c="-9.857673931833947E-5" d="1.2839250280045363E-5"/>
+                  <width sOffset="201.0291481952712" a="0.5805413001002719" b="-0.004351555260027982" c="7.471866243542714E-5" d="3.092927195109084E-5"/>
+                  <width sOffset="202.9926088332872" a="0.5725193651555704" b="-0.0037004274384124583" c="4.208332138995218E-4" d="-6.580944002106645E-5"/>
+                  <width sOffset="209.08086201176843" a="0.5507378150657987" b="-0.005894190472488261" c="-0.00212773168155047" d="8.673799336175536E-4"/>
+                  <roadMark sOffset="0.0" type="curb" weight="standard" color="standard" width="0.12">
+                     <type name="curb" width="0.12">
+                        <line length="211.08060560503478" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.0"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects>
+         <object type="railing" name="" id="256207" s="106.34439531174722" t="5.765274145081843" zOffset="0.0" validLength="8.959375092808983" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="106.34439531174722" length="8.959375092808983" distance="0.0" tStart="5.765274145081843" tEnd="5.6885222750102225" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.3110342424272898" zOffsetEnd="0.4670379236196209"/>
+         </object>
+         <object type="railing" name="" id="268691663" s="115.3037704045562" t="5.6885222750102225" zOffset="0.0" validLength="10.655581051383976" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="115.3037704045562" length="10.655581051383976" distance="0.0" tStart="5.6885222750102225" tEnd="5.515809017503594" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.4670379236196209" zOffsetEnd="0.4537529722175077"/>
+         </object>
+         <object type="railing" name="" id="537127119" s="125.95935145594018" t="5.515809017503594" zOffset="0.0" validLength="35.70241352759763" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="125.95935145594018" length="35.70241352759763" distance="0.0" tStart="5.515809017503594" tEnd="5.324192829308176" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.4537529722175077" zOffsetEnd="0.4498423769235484"/>
+         </object>
+         <object type="railing" name="" id="256213" s="161.6617649835378" t="5.324192829308176" zOffset="0.0" validLength="11.024323072910732" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="161.6617649835378" length="11.024323072910732" distance="0.0" tStart="5.324192829308176" tEnd="5.2297075027044055" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.4498423769235484" zOffsetEnd="-0.1316023048051494"/>
+         </object>
+         <object type="railing" name="" id="256214" s="5.773288691586721" t="6.030974693711087" zOffset="0.0" validLength="7.481643969894012" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="5.773288691586721" length="7.481643969894012" distance="0.0" tStart="6.030974693711087" tEnd="6.142047397442769" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.435421773397955" zOffsetEnd="0.4224864978101192"/>
+         </object>
+         <object type="railing" name="" id="268691670" s="13.254932661480733" t="6.142047397442769" zOffset="0.0" validLength="14.700262307826048" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="13.254932661480733" length="14.700262307826048" distance="0.0" tStart="6.142047397442769" tEnd="6.167519866985608" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.4224864978101192" zOffsetEnd="0.39728984261797223"/>
+         </object>
+         <object type="railing" name="" id="537127126" s="27.95519496930678" t="6.167519866985608" zOffset="0.0" validLength="60.95580253830787" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="27.95519496930678" length="60.95580253830787" distance="0.0" tStart="6.167519866985608" tEnd="5.876189582321614" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.39728984261797223" zOffsetEnd="0.4367847231182293"/>
+         </object>
+         <object type="railing" name="" id="805562582" s="88.91099750761465" t="5.876189582321614" zOffset="0.0" validLength="7.488097310417274" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="88.91099750761465" length="7.488097310417274" distance="0.0" tStart="5.876189582321614" tEnd="5.901697840760118" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.4367847231182293" zOffsetEnd="0.3093768179834126"/>
+         </object>
+         <object type="railing" name="" id="1073998038" s="96.39909481803193" t="5.901697840760118" zOffset="0.0" validLength="0.6846566598881481" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="96.39909481803193" length="0.6846566598881481" distance="0.0" tStart="5.901697840760118" tEnd="5.993996073146216" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.3093768179834126" zOffsetEnd="0.27424394740705055"/>
+         </object>
+         <object type="railing" name="" id="1073741896" s="97.08375147792007" t="5.993996073146216" zOffset="0.0" validLength="0.14481003252160463" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="97.08375147792007" length="0.14481003252160463" distance="0.0" tStart="5.993996073146216" tEnd="6.454638071266319" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.27424394740705055" zOffsetEnd="0.2633648289639933"/>
+         </object>
+         <object type="railing" name="" id="256224" s="0.0" t="6.006397176558443" zOffset="0.0" validLength="5.773288691586721" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="0.0" length="5.773288691586721" distance="0.0" tStart="6.006397176558443" tEnd="6.030974693711087" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.09486876103043301" zOffsetEnd="0.435421773397955"/>
+         </object>
+         <object type="pole" name="Guidepost" id="256719" s="113.7100334268475" t="-6.405744464351547" zOffset="0.19824485800049274" validLength="0.0" orientation="none" radius="0.0" height="1.0382176544517279" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256721" s="188.7252646803847" t="5.362844872398457" zOffset="-0.07784652634516931" validLength="0.0" orientation="none" radius="0.0" height="1.0812949556857347" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256734" s="205.21345924581414" t="6.048322091420185" zOffset="-0.08966627813616412" validLength="0.0" orientation="none" radius="0.0" height="0.9392402255907655" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256735" s="138.82120296603924" t="5.521368272611527" zOffset="0.6320448533936371" validLength="0.0" orientation="none" radius="0.0" height="0.5913012810051441" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256736" s="89.07602365800835" t="6.027093021036329" zOffset="0.6099914271230347" validLength="0.0" orientation="none" radius="0.0" height="0.5679353503510356" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256737" s="39.08443033481453" t="6.299213549370509" zOffset="0.5930171834726963" validLength="0.0" orientation="none" radius="0.0" height="0.579293517395854" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256738" s="13.257949439889739" t="6.244620384543999" zOffset="0.6048485331839117" validLength="0.0" orientation="none" radius="0.0" height="0.5803130306303501" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256805" s="163.18445624064088" t="6.104182239290386" zOffset="0.2015837574854089" validLength="0.0" orientation="none" radius="0.030661904102430377" height="2.1755412044003606" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256819" s="163.27365932566067" t="-7.39257085255801" zOffset="0.24567571386262443" validLength="0.0" orientation="none" radius="0.03692098845997528" height="2.981771525926888" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256832" s="202.18200881493598" t="6.731776104476527" zOffset="0.035906431261906846" validLength="0.0" orientation="none" radius="0.032661086326777417" height="2.7604090999811888" hdg="0.0" pitch="0.0" roll="0.0"/>
+      </objects>
+      <signals>
+         <signal s="163.2234497105777" t="6.091568411053374" id="247350" dynamic="no" orientation="-" zOffset="1.7535144488643368" country="DEU" type="274" subtype="57" value="70.0" unit="km/h" height="0.6249999691034673" width="0.6248470800524245" hOffset="-3.1007762535969707"/>
+         <signal s="202.34037437723717" t="6.7954724543005876" id="252725" dynamic="no" orientation="-" zOffset="2.001492635952232" country="DEU" type="205" subtype="-1" height="0.7189999830224325" width="0.8058566262472608" hOffset="3.1067265530069945"/>
+         <signal s="163.17687160657852" t="-7.496111756775351" id="253307" dynamic="no" orientation="-" zOffset="2.6654814223210366" country="DEU" type="274" subtype="70" value="70.0" unit="km/h" height="0.5699999987019227" width="0.5698604411497755" hOffset="2.9131422462648646"/>
+      </signals>
+   </road>
+   <road length="142.79555475230282" id="255962" junction="-1">
+      <link>
+         <successor elementType="junction" elementId="2104769"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618104.3662243502" y="5809494.52754585" hdg="0.06944230506701676" length="142.79555475230282">
+            <paramPoly3 aU="0.0" bU="142.79837448621487" cU="-0.2886908080890238" dU="0.1897405671374518" aV="-0.0" bV="1.9539925233402755E-14" cV="13.677393283251677" dV="-8.831581474652587" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="102.21186977767975" b="-0.0031493561610583263" c="-3.9278859697797035E-4" d="1.2707295471008819E-4"/>
+         <elevation s="3.994281353526389" a="102.20112154049701" b="-2.0509865287394864E-4" c="8.638355039918156E-5" d="-7.789787311922877E-7"/>
+         <elevation s="10.199682482307344" a="102.2029890546748" b="7.770021000244343E-4" c="9.164358975753703E-5" d="-2.1218163976713293E-6"/>
+         <elevation s="20.399364964614687" a="102.21819675659954" b="0.0019842530307848387" c="8.968885551401102E-5" d="-5.609943679813133E-6"/>
+         <elevation s="30.59904744692203" a="102.2418133939036" b="0.0020629821175237643" c="-1.4884437908424238E-4" d="9.45195878213933E-6"/>
+         <elevation s="39.942812598759566" a="102.25580500395165" b="0.0017570849163406252" c="1.5983519328485117E-4" d="9.246668951026367E-6"/>
+         <elevation s="40.798729929229374" a="102.25743181579656" b="0.0020510185160449884" c="4.497857924136863E-5" d="-2.156115795371907E-6"/>
+         <elevation s="50.99841241153672" a="102.28074295981313" b="0.002295628004696549" c="-3.2958994827927474E-4" d="1.970978769944448E-5"/>
+         <elevation s="55.9199375994963" a="102.28640734800977" b="4.8365409740650346E-4" c="-3.310817841182131E-5" d="2.092735939921739E-5"/>
+         <elevation s="61.19809489384406" a="102.29111503185824" b="0.0018831961779565134" c="1.482176522698096E-6" d="2.333031373686858E-7"/>
+         <elevation s="71.39777737615141" a="102.3107247910056" b="0.0019862456795252115" c="5.786273792345785E-5" d="-1.9870352933270087E-6"/>
+         <elevation s="81.59745985845875" a="102.33489506989686" b="0.0025464539441577986" c="9.779945055797106E-5" d="-7.422950181594262E-6"/>
+         <elevation s="91.79714234076609" a="102.36316595444872" b="0.0022247936598868297" c="-2.2734900006952095E-4" d="1.5941949002355685E-5"/>
+         <elevation s="99.85703137063625" a="102.37467550684562" b="0.0016668318791692575" c="2.0885879856871232E-4" d="1.2800324028264528E-5"/>
+         <elevation s="101.99682482307344" a="102.37932389917233" b="0.002736488404525104" c="1.5880289644122278E-4" d="-9.222864384806295E-6"/>
+         <elevation s="112.19650730538078" a="102.41396957327582" b="0.0030975054313565928" c="-6.348717421869211E-5" d="-1.566104791724475E-6"/>
+         <elevation s="120.82700795866721" a="102.43496695279977" b="0.001651696743722594" c="-2.576035989068985E-5" d="1.3422170449914824E-6"/>
+         <elevation s="122.39618978768812" a="102.43750052088856" b="0.0015807663168058482" c="-3.97044620564126E-5" d="6.443791057846005E-7"/>
+         <elevation s="132.59587226999545" a="102.45017699674625" b="9.719315896576433E-4" c="-2.6559537501145732E-5" d="-2.543536786342108E-17"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.030966863533448095" b="-6.825173592987139E-4" c="6.089425694274574E-6" d="1.7888366731308436E-6"/>
+         <superelevation s="10.199682482307344" a="0.026537058099920977" b="0.0" c="1.3898800373227063E-5" d="-7.65648802548411E-7"/>
+         <superelevation s="20.399364964614687" a="0.02717056250635914" b="4.456727505172095E-5" c="-7.903702444377503E-7" d="-9.113800766374557E-8"/>
+         <superelevation s="30.59904744692203" a="0.0274462022091794" b="0.0" c="-2.8049892663617207E-5" d="1.320299720595386E-6"/>
+         <superelevation s="40.798729929229374" a="0.025929054846389528" b="-1.6013370464531458E-4" c="-1.9049721934117735E-5" d="1.7582022935235298E-6"/>
+         <superelevation s="50.99841241153672" a="0.024179576324983812" b="0.0" c="4.712039867312443E-5" d="-2.514895059844263E-6"/>
+         <superelevation s="61.19809489384406" a="0.0264130998626412" b="1.7632603262099608E-4" c="-7.972548075991146E-6" d="3.716473117885144E-7"/>
+         <superelevation s="71.39777737615141" a="0.027776515417182065" b="1.2968245190742237E-4" c="2.2859699613726644E-6" d="-2.624737476598621E-7"/>
+         <superelevation s="81.59745985845875" a="0.029058539528606802" b="9.439658166022145E-5" c="4.9871493216467646E-8" d="-3.057153307856862E-7"/>
+         <superelevation s="91.79714234076609" a="0.029702145737880974" b="0.0" c="-2.1802038484590974E-5" d="1.4250141951254778E-6"/>
+         <superelevation s="101.99682482307344" a="0.028946098115726775" b="0.0" c="2.55089735141685E-5" d="-1.2586925993652508E-6"/>
+         <superelevation s="112.19650730538078" a="0.030264276573009837" b="1.275281851124354E-4" c="-3.6595634443206444E-6" d="3.423643090689677E-7"/>
+         <superelevation s="122.39618978768812" a="0.031547592107110285" b="1.597275101991305E-4" c="1.2257338230414875E-5" d="-8.758005162096896E-7"/>
+         <superelevation s="132.59587226999545" a="0.03352261634845111" b="1.3643158749997213E-4" c="-5.6084361359445144E-6" d="2.0435266786178843E-22"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="4.976506358954307" b="0.02989432659611831" c="-6.368759108345998E-4" d="1.7320184198112922E-5"/>
+         <laneOffset s="3.3386735320591323" a="5.0698592414749015" b="0.026220875922276673" c="-6.497396766059012E-4" d="1.3884697734151226E-5"/>
+         <laneOffset s="9.996887660627756" a="5.219737664834995" b="0.019415265702688863" c="-2.9237824532372905E-5" d="-3.306277171101478E-5"/>
+         <laneOffset s="20.399364964614687" a="5.38132295081086" b="0.00807365434908783" c="-0.0010524339972808863" d="-3.4272189079094E-5"/>
+         <laneOffset s="23.379691721624788" a="5.395129730719288" b="8.872074578830055E-4" c="-4.291957622803998E-5" d="-1.195997449032692E-7"/>
+         <laneOffset s="30.59904744692203" a="5.3992528660457335" b="2.488037889964785E-4" c="-5.4998972879466554E-5" d="2.5552341983031885E-6"/>
+         <laneOffset s="33.41261626187631" a="5.3995744233701295" b="-0.0" c="-0.002637658710495793" d="2.488278789686595E-4"/>
+         <laneOffset s="38.58893587457788" a="5.363411622003239" b="-0.0073052339138417795" c="1.5674768142709183E-4" d="-2.1783298870546416E-5"/>
+         <laneOffset s="40.798729929229374" a="5.347798928032503" b="-0.006931589671057285" c="-3.678962101467917E-5" d="-3.0463616419509145E-5"/>
+         <laneOffset s="46.60395689846389" a="5.300359740873388" b="-0.010438665824252768" c="-5.805651967036987E-4" d="3.303208342989737E-5"/>
+         <laneOffset s="50.99841241153672" a="5.24607923615156" b="-0.01362753028420446" c="-1.4085743316541097E-4" d="2.8575233838227935E-5"/>
+         <laneOffset s="54.41960981907882" a="5.198952344756771" b="-0.013587948120017889" c="-1.8919053559640913E-4" d="3.404198173168783E-6"/>
+         <laneOffset s="61.19809489384406" a="5.099214001953687" b="-0.015683551701384392" c="-9.929206916721817E-5" d="4.56064449678847E-6"/>
+         <laneOffset s="71.39777737615141" a="4.933756391131946" b="-0.016285667119522382" c="5.180953538514999E-5" d="4.4326855117238655E-6"/>
+         <laneOffset s="80.0534504279068" a="4.7995491337744" b="-0.014392474936187859" c="-1.670790022125827E-4" d="1.4362803844672648E-6"/>
+         <laneOffset s="81.59745985845875" a="4.776933992983777" b="-0.014898145919291287" c="-1.3017470272281938E-4" d="1.322145140354007E-5"/>
+         <laneOffset s="91.79714234076609" a="4.625464501884161" b="-0.013427204693560794" c="2.718040059961438E-4" d="1.3933672069399453E-5"/>
+         <laneOffset s="98.12927420647304" a="4.554877550446998" b="-0.008308957964868816" c="0.0012683857822712544" d="-2.705392572032047E-4"/>
+         <laneOffset s="101.7572979844955" a="4.5285083028377775" b="-0.009788455212023752" c="-0.0035301640485246623" d="7.431145370838209E-4"/>
+         <laneOffset s="105.57293990398837" a="4.481044766064041" b="-0.004270850644319824" c="1.1701038285995753E-4" d="-9.598855236514535E-7"/>
+         <laneOffset s="112.19650730538078" a="4.4576110068911765" b="-0.002847133600398773" c="1.1256578995928705E-4" d="-3.32259620861718E-7"/>
+         <laneOffset s="122.39618978768812" a="4.439929200211234" b="-6.545613849567606E-4" c="1.338025353329347E-4" d="-5.7616267625480755E-6"/>
+         <laneOffset s="125.44100368170935" a="4.439014011414118" b="-0.0" c="0.0014990562737837376" d="-3.397362108517514E-5"/>
+         <laneOffset s="132.59587226999545" a="4.5033102944348595" b="0.016233553729800836" c="7.861034628577812E-4" d="-3.3169484067497566E-5"/>
+         <laneOffset s="141.82211811548962" a="4.693950655252642" b="0.02226860243048309" c="-9.907128128835618E-4" d="0.0014442050039455954"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="0.542096433060931" b="0.01831321381401794" c="-0.0019063568341730792" d="6.302506415466024E-5"/>
+                  <width sOffset="1.6758879610825181" a="0.5677297855980745" b="0.012454569550355208" c="-0.003338651260503595" d="2.7060257910930635E-4"/>
+                  <width sOffset="3.3386735320591323" a="0.5804522327819512" b="0.0035961786411029643" c="-0.0018024459810384679" d="2.740380655733932E-4"/>
+                  <width sOffset="6.996112711054544" a="0.5829012953826789" b="0.001408813164744803" c="3.8475388648103554E-4" d="-1.8879889188671317E-4"/>
+                  <width sOffset="9.996887660627756" a="0.5854918793733974" b="-0.0013822711809089554" c="-0.0016580350495622321" d="-1.41851422440835E-4"/>
+                  <width sOffset="11.18421859378554" a="0.5812758059107663" b="-0.005919470933660374" c="-2.2975534458234112E-4" d="3.281191464061365E-5"/>
+                  <width sOffset="20.399364964614687" a="0.5328930840710644" b="-0.0017948718705772526" c="6.74068045944827E-4" d="3.412069881750552E-5"/>
+                  <width sOffset="23.379691721624788" a="0.5344343393977606" b="0.00313222991573611" c="-3.368008465480257E-4" d="-3.189051668713536E-8"/>
+                  <width sOffset="28.65566129090193" a="0.5415800661467163" b="-4.243352182380305E-4" c="-1.3027073895162394E-4" d="-4.512122839355982E-7"/>
+                  <width sOffset="30.59904744692203" a="0.5402601072219184" b="-9.357802671040392E-4" c="-1.3243719717569743E-4" d="-9.876493899767984E-7"/>
+                  <width sOffset="33.41261626187631" a="0.5365568321406116" b="-0.0017044778027964975" c="0.0024634540636363374" d="-2.472602941607863E-4"/>
+                  <width sOffset="35.14617395313968" a="0.5397170901191917" b="0.004607385248675059" c="-0.0013599489409209884" d="3.1882763357675415E-5"/>
+                  <width sOffset="38.58893587457788" a="0.5407612755696576" b="-0.003622893763423266" c="3.897684834708849E-5" d="3.024939411969583E-4"/>
+                  <width sOffset="40.3014384234955" a="0.5361905507416926" b="-8.28057695059151E-4" c="5.383350917845704E-4" d="-1.6970418240907126E-5"/>
+                  <width sOffset="40.798729929229374" a="0.5359098073128408" b="-3.052290526100324E-4" c="5.621448466999252E-4" d="-8.290100699539643E-6"/>
+                  <width sOffset="46.60395689846389" a="0.5514606606810375" b="0.005383382197537338" c="4.3099805105633145E-4" d="-7.178580054895738E-5"/>
+                  <width sOffset="50.64167536127546" a="0.5754983892039904" b="0.005352871361203311" c="-4.068101213921911E-4" d="-2.355180620543134E-5"/>
+                  <width sOffset="50.99841241153672" a="0.5773551163251209" b="0.005053631173702616" c="-4.3624922716809487E-4" d="-1.9094956649558226E-5"/>
+                  <width sOffset="54.41960981907882" a="0.5887738340369344" b="0.001398145710227153" c="-2.906144255151613E-4" d="6.076079015502682E-6"/>
+                  <width sOffset="61.19809489384406" a="0.5867904695836623" b="-0.0017041568993069675" c="-1.7300044245893042E-4" d="5.0848021926193025E-6"/>
+                  <width sOffset="71.39777737615141" a="0.5568062937047316" b="-0.003646286410465563" c="-1.733622330992208E-5" d="5.232810119148353E-6"/>
+                  <width sOffset="80.0534504279068" a="0.5273398082663423" b="-0.002770262758123778" c="4.5253642447867705E-4" d="8.229215247003886E-6"/>
+                  <width sOffset="81.59745985845875" a="0.524171618122252" b="-0.0013139672576154351" c="4.719786899642283E-4" d="-3.7961108297057074E-6"/>
+                  <width sOffset="88.0311618991435" a="0.5342434011117616" b="0.00428778146143988" c="2.534036469791411E-4" d="-2.5174095677789774E-5"/>
+                  <width sOffset="91.79714234076609" a="0.5526404426266778" b="0.005125304774041347" c="-2.7935747984679683E-5" d="-2.5004568841532377E-5"/>
+                  <width sOffset="98.12927420647304" a="0.5776259673278314" b="0.001763777471318252" c="-0.0012348246589581424" d="2.594683604310661E-4"/>
+                  <width sOffset="101.7572979844955" a="0.5801622142997376" b="0.003049631911334805" c="0.0034432287416292875" d="-7.541854338665308E-4"/>
+                  <width sOffset="101.99682482307344" a="0.5810798674022397" b="0.0045693134178816245" c="0.002906248036761877" d="-7.553933137482839E-4"/>
+                  <width sOffset="105.57293990398837" a="0.6000403173422919" b="-0.00362579840929977" c="-3.386697225315564E-4" d="-1.131889114072059E-5"/>
+                  <width sOffset="107.54718033247663" a="0.5914750147060577" b="-0.005095379713950091" c="-0.001449550673147222" d="1.6575935755584582E-4"/>
+                  <width sOffset="112.19650730538078" a="0.5531100680758474" b="-0.007824966987995677" c="8.813067670568281E-4" d="1.6349657587263659E-4"/>
+                  <width sOffset="115.2577481366949" a="0.5421051633185261" b="0.0021672926250528675" c="2.2037013792951395E-4" d="-4.508195101089215E-7"/>
+                  <width sOffset="122.39618978768812" a="0.5686417450052783" b="0.005244573665901166" c="2.0663603432604201E-4" d="3.2855674516827044E-6"/>
+                  <width sOffset="125.44100368170935" a="0.5866189415135263" b="0.006594290622096879" c="-0.0011812351235008084" d="3.1497561774316146E-5"/>
+                  <width sOffset="127.48864219298727" a="0.5954393733446306" b="0.002152996711623144" c="-7.587606196848799E-4" d="2.7714584685924486E-5"/>
+                  <width sOffset="132.59587226999545" a="0.5903358884580907" b="-0.003428628430689716" c="-3.2786003163476915E-4" d="2.9053098488830872E-5"/>
+                  <width sOffset="141.82211811548962" a="0.5536113613049851" b="-0.002059148855759984" c="0.0013350198880739109" d="-0.00144832138952335"/>
+                  <roadMark sOffset="0.0" type="curb" weight="standard" color="standard" width="0.12">
+                     <type name="curb" width="0.12">
+                        <line length="142.79555475230282" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.0"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.12471041185111698">
+                     <type name="solid" width="0.12471">
+                        <line length="142.79555475230282" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.12471"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="3.1881551378168327" b="0.001904364246117847" c="-2.2668077348789742E-4" d="1.81874699709142E-5"/>
+                  <width sOffset="3.3386735320591323" a="3.1926632891379727" b="9.989310978804657E-4" c="-2.3085778709599982E-4" d="1.4751983506949294E-5"/>
+                  <width sOffset="9.996887660627756" a="3.193434395076442" b="-1.1332343354562846E-4" c="4.0696778813495004E-4" d="-3.2195485991280306E-5"/>
+                  <width sOffset="10.199682482307344" a="3.193427882009109" b="4.776629697998691E-5" c="3.932465963170707E-4" d="-3.166350253491562E-5"/>
+                  <width sOffset="20.399364964614687" a="3.2012274874640383" b="-0.0018124499966269206" c="-5.697340832611147E-4" d="-3.267589299699136E-5"/>
+                  <width sOffset="23.379691721624788" a="3.1899002121066244" b="-0.006079153379194003" c="4.540527895689913E-4" d="1.4766963372125823E-6"/>
+                  <width sOffset="24.631155567010826" a="3.1830063858735365" b="-0.004935753843123999" c="2.957917335990656E-4" d="-5.744417537784727E-8"/>
+                  <width sOffset="30.59904744692203" a="3.1640729703363033" b="-0.0014113854222651662" c="2.892807207345524E-4" d="1.3106883499368944E-6"/>
+                  <width sOffset="33.04252767903528" a="3.1623705778432725" b="2.5794793488408718E-5" c="5.012208015254615E-4" d="-3.2755573020820825E-6"/>
+                  <width sOffset="33.41261626187631" a="3.1624486081531824" b="3.9544107013172883E-4" c="-0.00210664365695176" d="2.429970874424711E-4"/>
+                  <width sOffset="38.58893587457788" a="3.1417521985074637" b="-0.0018810812362220963" c="5.972166133671823E-4" d="-2.761409039665246E-5"/>
+                  <width sOffset="40.798729929229374" a="3.1402137390949987" b="3.538356761934964E-4" c="3.7180064231366703E-4" d="-3.612407683633539E-5"/>
+                  <width sOffset="46.60395689846389" a="3.1477304488850595" b="0.0010183941964354397" c="-2.705557057854011E-4" d="2.7371623013060337E-5"/>
+                  <width sOffset="50.99841241153672" a="3.149303792032482" b="2.2624405319295743E-4" c="9.403759312599916E-5" d="2.3309627156739024E-5"/>
+                  <width sOffset="54.41960981907882" a="3.1521118933877084" b="0.0016881753985643969" c="-8.339549088516167E-6" d="-1.8614085083222639E-6"/>
+                  <width sOffset="61.19809489384406" a="3.1625922322059767" b="0.0013185331683904442" c="-3.079768451445644E-5" d="-7.921436455072256E-7"/>
+                  <width sOffset="71.39777737615141" a="3.17199630958178" b="4.4305148004078823E-4" c="-5.0994658175284876E-5" d="-5.466190172418379E-9"/>
+                  <width sOffset="74.93480740866117" a="3.172925181267404" b="8.210704946143635E-5" c="1.287287675046294E-4" d="1.4153825194115545E-5"/>
+                  <width sOffset="79.35132317534907" a="3.1770180490017523" b="0.0020474093592472466" c="2.65322861952682E-4" d="6.395541339368328E-6"/>
+                  <width sOffset="80.0534504279068" a="3.1785886042160176" b="0.0024294488567612807" c="-5.519785362485356E-5" d="3.399136216025961E-6"/>
+                  <width sOffset="81.59745985845875" a="3.1822206181643393" b="0.002283307110222437" c="-2.0800613398109667E-5" d="1.4521302866977405E-5"/>
+                  <width sOffset="84.15376232693251" a="3.1881640892780094" b="-3.351432026086256E-4" c="-1.5997980679412828E-4" d="1.3301767028490322E-5"/>
+                  <width sOffset="91.79714234076609" a="3.182195957041308" b="-4.4939822662965444E-4" c="1.4397410674969077E-4" d="1.2981333005358138E-5"/>
+                  <width sOffset="93.52372530164027" a="3.1819160494863192" b="1.6386376862235E-4" c="2.1322720502414672E-5" d="4.641649136324849E-5"/>
+                  <width sOffset="98.12927420647304" a="3.1876573753188335" b="0.0033139012671518607" c="0.0013945352129188914" d="-2.3805643790924372E-4"/>
+                  <width sOffset="99.46588662793549" a="3.194009704349226" b="0.005765920563779444" c="0.001481641175660929" d="-5.845588101695985E-4"/>
+                  <width sOffset="101.7572979844955" a="3.2079683071998586" b="0.003348225546542542" c="-0.004390734169670858" d="4.290949841201954E-4"/>
+                  <width sOffset="101.99682482307344" a="3.2085242838155734" b="0.0013186837336858388" c="-0.004082967825106754" d="4.3093922668842755E-4"/>
+                  <width sOffset="103.39585467211454" a="3.2035576726604535" b="-0.00757529195586627" c="-3.8440676309811677E-4" d="7.432977949777776E-4"/>
+                  <width sOffset="105.57293990398837" a="3.1929135337182215" b="0.0013199613850028557" c="-3.889413107668245E-4" d="-7.76627629695249E-7"/>
+                  <width sOffset="111.11467054520244" a="3.1881515388004127" b="-0.0030624070913553795" c="-9.27042142061028E-6" d="8.242658145406102E-6"/>
+                  <width sOffset="112.19650730538078" a="3.1848381008467124" b="-0.0030535243580861156" c="1.5715150977256583E-5" d="-2.3700144158112369E-7"/>
+                  <width sOffset="122.39618978768812" a="3.1550765401199463" b="-0.002806913542413748" c="2.645511809082422E-5" d="-1.4278242480026334E-6"/>
+                  <width sOffset="124.23406250746261" a="3.1499982859376576" b="-0.0027241398747442523" c="-0.005014039417221485" d="9.894889652908886E-4"/>
+                  <width sOffset="125.44100368170935" a="3.1411461026282987" b="-0.01050325461780676" c="-1.3391514098115608E-5" d="9.612769709690609E-4"/>
+                  <width sOffset="126.59143334309432" a="3.1305087448578997" b="-0.00671734983036085" c="0.0010049294124088832" d="-3.861068877102912E-5"/>
+                  <width sOffset="132.59587226999545" a="3.1180474038024135" b="0.0011745980244141866" c="3.181023023122349E-4" d="-3.7804725366983674E-5"/>
+                  <width sOffset="137.32074422273178" a="3.1267110343503015" b="0.0016486781862754644" c="9.046654138654458E-4" d="-2.2887873703708378E-4"/>
+                  <width sOffset="141.82211811548962" a="3.1315873299763606" b="-0.004119722114158415" c="-0.0030448677326679763" d="0.0012484957509756411"/>
+                  <roadMark sOffset="0.0" type="broken" weight="standard" color="standard" width="0.12502542257949023">
+                     <type name="broken" width="0.125025">
+                        <line length="4.0" space="8.0" tOffset="-0.0" sOffset="0.0" width="0.125025"/>
+                     </type>
+                  </roadMark>
+                  <roadMark sOffset="84.15376232693251" type="solid broken" weight="bold" color="standard" width="0.32">
+                     <type name="solid broken" width="0.12">
+                        <line length="4.0" space="8.0" tOffset="-0.0" sOffset="0.0" width="0.12"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="driving" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="3.392675439794246" b="-0.003670148489827132" c="7.78433237490926E-5" d="1.6385429062860435E-7"/>
+                  <width sOffset="6.85234998157159" a="3.3712341279167553" b="-0.0025802479063988804" c="-8.050237561751569E-4" d="1.471278845602845E-4"/>
+                  <width sOffset="10.199682482307344" a="3.359095308235532" b="-0.0030240695949241107" c="6.616889817675704E-4" d="1.450716371282282E-4"/>
+                  <width sOffset="12.774972900058808" a="3.3581736228999874" b="0.003270410831938521" c="-7.348397933154658E-5" d="-1.4819459257816843E-6"/>
+                  <width sOffset="20.399364964614687" a="3.378179971556563" b="0.0018914269229278798" c="-1.0347423974431922E-4" d="-1.6109508939288127E-6"/>
+                  <width sOffset="24.631155567010826" a="3.384208989306102" b="9.291173165519489E-4" c="3.9879291893562966E-5" d="-7.681038135480258E-8"/>
+                  <width sOffset="30.59904744692203" a="3.39115786511531" b="0.0013969009468736487" c="3.4497557376434156E-5" d="1.2298910357923865E-6"/>
+                  <width sOffset="30.946604717624197" a="3.3916475869999223" b="0.0014213263986118524" c="2.2796752684890438E-5" d="1.1592914320904E-6"/>
+                  <width sOffset="33.04252767903528" a="3.3947373951190962" b="0.0015321648032684454" c="-1.722460483044663E-4" d="5.745537109839726E-6"/>
+                  <width sOffset="40.798729929229374" a="3.398939965377641" b="-1.0285390106095412E-4" c="-5.608548368442437E-5" d="8.750381071373156E-6"/>
+                  <width sOffset="42.69100137771314" a="3.3986038025076315" b="-2.2111458155315948E-4" c="3.8436210919479824E-4" d="-2.519797070295718E-5"/>
+                  <width sOffset="50.99841241153672" a="3.408846424324139" b="9.480249131517387E-4" c="-2.414274771618213E-4" d="-2.625628583877924E-5"/>
+                  <width sOffset="55.584157979337554" a="3.405584835058268" b="-0.002922660274409369" c="-2.091473465446461E-4" d="7.81308159043496E-6"/>
+                  <width sOffset="60.28336217326025" a="3.3880429227574766" b="-0.004370714857706296" c="-3.0304124054096355E-4" d="2.5892641528341052E-5"/>
+                  <width sOffset="61.19809489384406" a="3.383811139326945" b="-0.004860122422493987" c="-2.2670860830100722E-4" d="2.597982298899268E-5"/>
+                  <width sOffset="69.72584672469411" a="3.341990036690391" b="-0.0030587948921557816" c="5.118350747452852E-4" d="-1.703487578070795E-5"/>
+                  <width sOffset="71.39777737615141" a="3.338227088217063" b="-0.0014901448197672893" c="4.4536443695379017E-4" d="-1.4191826696353236E-5"/>
+                  <width sOffset="74.93480740866117" a="3.337900176678861" b="0.0011277459466032015" c="1.1499225731370737E-4" d="-2.8351118080620616E-5"/>
+                  <width sOffset="79.35132317534907" a="3.3426815194755743" b="4.844584954555656E-4" c="-2.0970954076347939E-4" d="-2.0592834229795915E-5"/>
+                  <width sOffset="81.59745985845875" a="3.342478308519129" b="-7.692946663831156E-4" c="-3.2822908181294886E-4" d="-2.2030249707899737E-5"/>
+                  <width sOffset="83.67888144875687" a="3.3392564349032767" b="-0.002421986860361037" c="-2.7976073411019325E-4" d="8.829809703141309E-6"/>
+                  <width sOffset="84.15376232693251" a="3.3380441358913115" b="1.150620705593075E-4" c="-1.663969026164945E-5" d="1.0049345543373096E-5"/>
+                  <width sOffset="91.53954241517015" a="3.342035073474748" b="0.0015138356706916444" c="9.50695291401376E-4" d="-7.774373564173353E-5"/>
+                  <width sOffset="91.79714234076609" a="3.342486794472893" b="0.00198815705184178" c="8.890873069808615E-4" d="-7.671108095874996E-5"/>
+                  <width sOffset="93.52372530164027" a="3.3481751213308604" b="0.0043722754271510785" c="6.816346024765505E-4" d="-1.101462393166183E-4"/>
+                  <width sOffset="99.46588662793549" a="3.37511375318974" b="8.054873535345529E-4" c="-0.0023235591065338453" d="2.363561329435363E-4"/>
+                  <width sOffset="101.99682482307344" a="3.3661003662423292" b="-0.006414038953742682" c="-5.283778625057398E-4" d="2.345118902682895E-4"/>
+                  <width sOffset="102.15348735788741" a="3.3650834602807578" b="-0.0065623260029378525" c="0.0011141926158757943" d="3.120151881174213E-4"/>
+                  <width sOffset="103.39585467211454" a="3.3592486804611594" b="-0.0023490886553167774" c="3.872344914243798E-4" d="-3.4338017216352695E-7"/>
+                  <width sOffset="111.11467054520244" a="3.364030058132493" b="0.0035675189286844314" c="-1.3299446289863757E-5" d="-9.362665946107708E-6"/>
+                  <width sOffset="112.19650730538078" a="3.3678621114282183" b="0.003505869897095123" c="-2.2472136320349822E-5" d="-2.531897646502065E-7"/>
+                  <width sOffset="122.39618978768812" a="3.401014353785447" b="0.002968431917346935" c="-2.8590186845034693E-6" d="-6.629044194494503E-6"/>
+                  <width sOffset="124.23406250746261" a="3.406419144108427" b="0.002890748610639627" c="0.004993213020478505" d="-9.975458337339912E-4"/>
+                  <width sOffset="125.74777139368832" a="3.4187760465539574" b="0.011150216474686895" c="-9.296230987761859E-4" d="-9.625819690341225E-4"/>
+                  <width sOffset="126.59143334309432" a="3.4269433659622264" b="0.007526243337468085" c="-0.0010665807460303255" d="3.730569070646912E-5"/>
+                  <width sOffset="132.59587226999545" a="3.4417564197988546" b="-0.0012472162608810154" c="-3.781709150848681E-4" d="3.759910350245921E-5"/>
+                  <width sOffset="137.32074422273178" a="3.4313869917493216" b="-0.002302700593692173" c="-9.676486375801753E-4" d="2.2867311517260343E-4"/>
+                  <width sOffset="139.43546325003885" a="3.4243526516044107" b="-0.003327406967889305" c="-8.563964342077814E-4" d="4.600184080869199E-4"/>
+                  <roadMark sOffset="0.0" type="broken" weight="bold" color="standard" width="0.25">
+                     <type name="broken" width="0.25">
+                        <line length="3.0" space="3.0" tOffset="-0.0" sOffset="0.0" width="0.25"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-3" type="driving" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="3.28985035369271" b="0.004031909166456158" c="-2.0940063626749436E-4" d="4.497242275795759E-6"/>
+                  <width sOffset="5.513653350638662" a="3.3064688604700634" b="0.0021329376585148864" c="-4.073959607541844E-4" d="3.2685163758760834E-5"/>
+                  <width sOffset="6.85234998157159" a="3.30867253373849" b="0.0012179045543055794" c="6.101060358216418E-4" d="-1.1427886651087833E-4"/>
+                  <width sOffset="10.199682482307344" a="3.315299178748501" b="0.001461001161507807" c="-5.481642796864773E-4" d="-1.1712113340212884E-4"/>
+                  <width sOffset="12.202436978206276" a="3.315085658732774" b="-0.0021440033726435673" c="-0.0026508124857675987" d="1.311227982987999E-6"/>
+                  <width sOffset="12.774972900058808" a="3.3129894564785847" b="-0.005178084661738474" c="-7.925825583502796E-4" d="1.478648110379999E-4"/>
+                  <width sOffset="20.3097940191161" a="3.292229176157285" b="0.00806240128377773" c="-3.6833730292540833E-4" d="1.9682036005202465E-8"/>
+                  <width sOffset="20.399364964614687" a="3.292948377924066" b="0.0079964171165337" c="-3.6952287649206724E-4" d="-4.833960402419677E-8"/>
+                  <width sOffset="30.59904744692203" a="3.336015233350324" b="4.432982783143068E-4" c="-3.7509698451483614E-4" d="3.333015465653057E-7"/>
+                  <width sOffset="30.946604717624197" a="3.3361240086467205" b="1.8268369447684333E-4" c="-3.617662829797767E-4" d="4.0390115158336107E-7"/>
+                  <width sOffset="40.798729929229374" a="3.3031954612743744" b="-0.006828036506132449" c="-3.3907422661276845E-4" d="-2.7712739184410904E-6"/>
+                  <width sOffset="41.19904599235852" a="3.3004075731538256" b="-0.007100842539599089" c="0.0010935703917652644" d="-5.012259104918507E-5"/>
+                  <width sOffset="42.69100137771314" a="3.2920811883807497" b="-0.00417243433746816" c="4.7845507874890087E-4" d="-1.6174239274817812E-5"/>
+                  <width sOffset="50.99841241153672" a="3.2811657040736595" b="4.283095491968338E-4" c="8.021244953575043E-5" d="-1.7900920406022212E-5"/>
+                  <width sOffset="55.17528782947668" a="3.28304965173775" b="1.614705141456934E-4" c="0.0010440508705314216" d="-1.065042883546602E-4"/>
+                  <width sOffset="55.584157979337554" a="3.2832829313412044" b="9.618184868019821E-4" c="5.199175276587122E-4" d="-1.4057365578292605E-4"/>
+                  <width sOffset="58.82257102670367" a="3.2870760373001513" b="-9.348844408457041E-5" c="-0.0012267831369757467" d="8.040215317560343E-5"/>
+                  <width sOffset="60.28336217326025" a="3.284572253883888" b="-0.0031629232718532203" c="-6.703911850769377E-4" d="6.23225932348104E-5"/>
+                  <width sOffset="61.19809489384406" a="3.2811657851434224" b="-0.0042329381142215804" c="-4.561677973747664E-4" d="7.19064461674695E-5"/>
+                  <width sOffset="68.80757021920707" a="3.2542247679743417" b="0.0013157040146243235" c="6.74813328576319E-4" d="-8.411321229495824E-5"/>
+                  <width sOffset="69.72584672469411" a="3.255936841542935" b="0.0023422536738523184" c="3.692005347553134E-4" d="-4.1098513526123214E-5"/>
+                  <width sOffset="71.39777737615141" a="3.260692893299459" b="0.0032321546063526965" c="1.840032087322108E-4" d="-4.2132161772974705E-5"/>
+                  <width sOffset="75.52357321786849" a="3.2742012958051134" b="0.0025989287970267436" c="5.410579891417148E-5" d="2.475874212415981E-5"/>
+                  <width sOffset="78.9073071645186" a="3.284574089893201" b="0.0038155252520098194" c="6.603411275394965E-4" d="-7.071249448804162E-5"/>
+                  <width sOffset="81.59745985845875" a="3.298240611524242" b="0.005833139859766925" c="1.269128101251977E-4" d="-7.727410968815433E-5"/>
+                  <width sOffset="83.05711623406134" a="3.3067850735534536" b="0.005709718147292632" c="4.626410733132713E-4" d="-1.4766808975707919E-5"/>
+                  <width sOffset="83.67888144875687" a="3.3105104815230346" b="0.006267900209986344" c="2.4906554900705225E-4" d="-4.56268683881845E-5"/>
+                  <width sOffset="91.27605731299822" a="3.3524973779876825" b="0.002151940774075727" c="-1.8634327772867995E-4" d="-3.2089867145226186E-5"/>
+                  <width sOffset="91.53954241517015" a="3.3530508585550174" b="0.00204705995970037" c="-9.563770965379513E-4" d="5.5703214048288864E-5"/>
+                  <width sOffset="101.99682482307344" a="3.3335727679337492" b="3.190832206268557E-4" c="7.980157396882541E-4" d="5.3611302124719217E-5"/>
+                  <width sOffset="102.15348735788741" a="3.3336425482747947" b="5.73068928495667E-4" c="-7.091404096973589E-4" d="-2.3891995684228292E-5"/>
+                  <width sOffset="105.4834631463374" a="3.3268051637171667" b="-0.004944568156506805" c="-3.715707779002509E-4" d="1.4785641081579868E-5"/>
+                  <width sOffset="112.19650730538078" a="3.281340234059844" b="-0.007934367181822315" c="-6.11753235201233E-5" d="1.550960952920289E-5"/>
+                  <width sOffset="122.39618978768812" a="3.210505308395295" b="-0.004341746986208486" c="4.2835483127922063E-4" d="1.4606608432793013E-5"/>
+                  <width sOffset="125.74777139368832" a="3.201315260469368" b="-9.781821922890898E-4" c="0.001968074692164954" d="-2.035725626869515E-5"/>
+                  <width sOffset="126.80754130694221" a="3.2024647512127005" b="0.003124640046454298" c="0.001462022030330268" d="-3.467121846647223E-5"/>
+                  <width sOffset="132.59587226999545" a="3.262811898924745" b="0.01656502066388256" c="9.074224139826503E-4" d="-4.7793578567993585E-5"/>
+                  <width sOffset="134.3441678920895" a="3.2942906267021277" b="0.019299657324146884" c="0.005935962203928075" d="-1.08992226756437E-5"/>
+                  <width sOffset="138.04591289151958" a="3.4465201685837124" b="0.06279844073483551" c="0.0077550300174886126" d="-3.6409784506958025E-4"/>
+                  <width sOffset="139.43546325003885" a="3.547778686207712" b="0.08224139502742034" c="0.007576719103725586" d="-5.95443137983952E-4"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.12">
+                     <type name="solid" width="0.12">
+                        <line length="142.79555475230282" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.12"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-4" type="shoulder" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="0.13614912676402113" b="0.0032268197409870206" c="-1.3976653973331722E-5" d="-1.9969562629350977E-6"/>
+                  <width sOffset="5.513653350638662" a="0.1531810726855003" b="0.002890570243568199" c="2.2537580157114598E-4" d="-3.0184877745968195E-5"/>
+                  <width sOffset="6.7542904566067135" a="0.15705647544342582" b="0.003310409488791133" c="-0.0011231290909089436" d="7.35303409313989E-5"/>
+                  <width sOffset="10.199682482307344" a="0.15813711583220602" b="-0.0018102549023679589" c="-3.660066349405515E-4" d="7.352283098363267E-5"/>
+                  <width sOffset="12.202436978206276" a="0.15363417393237722" b="-0.0023915919043330826" c="0.0014746914825950067" d="-4.490953040248257E-5"/>
+                  <width sOffset="18.186786172645846" a="0.18250959971801972" b="0.010433586714380085" c="0.8279271402391967" d="-0.23345352280446333"/>
+                  <width sOffset="20.3097940191161" a="1.7024059066921398" b="0.36918645509414505" c="-0.6560256824131772" d="-0.23330567767612145"/>
+                  <width sOffset="20.5495322617529" a="1.7499946433837028" b="0.014410237632656746" c="-0.0010088102143409163" d="-1.6011025218734842E-7"/>
+                  <width sOffset="27.745863992296044" a="1.8013923775441523" b="-1.3410325879177493E-4" c="-2.0018851292589104" d="0.884894609831842"/>
+                  <width sOffset="29.25404883532319" a="0.28333406733742184" b="-1.5875279569709243E-4" c="0.005030658728044921" d="-2.5544925347279634E-4"/>
+                  <width sOffset="30.59904744692203" a="0.2915995721440776" b="0.011987365818460128" c="0.0039995308138744455" d="-2.547769913866172E-4"/>
+                  <width sOffset="40.798729929229374" a="0.5596060442270376" b="0.014059210796848116" c="-0.0038468014242186814" d="-2.368736945639303E-4"/>
+                  <width sOffset="41.19904599235852" a="0.5646025149850713" b="0.01086545886801818" c="-0.005567247233563824" d="-1.895223774372738E-4"/>
+                  <width sOffset="42.43188018438815" a="0.5691811561669899" b="-0.0037256805175410776" c="-27.044428509307757" d="126.91152933159098"/>
+                  <width sOffset="42.57393800392181" a="0.38671218547823916" b="-0.004085317933438841" c="0.0030513773689901263" d="-2.522137144100168E-4"/>
+                  <width sOffset="49.8002952882026" a="0.42135797664693087" b="5.033864307938795E-4" c="-3.736002116868253E-4" d="7.005219836723467E-5"/>
+                  <width sOffset="50.99841241153672" a="0.4215452764693701" b="-9.017062648877805E-5" c="-1.2745850130017536E-4" d="6.419797304884126E-5"/>
+                  <width sOffset="55.17528782947668" a="0.4236231359738083" b="0.0022051218417104106" c="-5.111658589729355E-4" d="1.5280134099479467E-4"/>
+                  <width sOffset="56.17297522752271" a="0.4254660975846809" b="0.0016414406326014288" c="1.992851180819929E-4" d="1.2731780563209408E-4"/>
+                  <width sOffset="58.82257102670367" a="0.4335825572514409" b="0.005378940343393696" c="0.0015923012685983506" d="-9.365800332630736E-5"/>
+                  <width sOffset="61.19809489384406" a="0.45409037700814725" b="0.011358471408720875" c="9.080027719783194E-4" d="-1.0085832410124316E-4"/>
+                  <width sOffset="68.80757021920707" a="0.5486592936752102" b="0.007656984876293708" c="-8.839041562538979E-4" d="5.516133436161206E-5"/>
+                  <width sOffset="71.39777737615141" a="0.5635208065449024" b="0.004188255957737544" c="-4.7624394353370885E-4" d="5.2425893037149716E-5"/>
+                  <width sOffset="75.52357321786849" a="0.5763758550208777" b="0.0029356961393736565" c="-2.1893703277920317E-4" d="-1.4465010859990346E-5"/>
+                  <width sOffset="78.9073071645186" a="0.5832423041681238" b="9.571886293312584E-4" c="-7.206786176563386E-4" d="8.100622575225454E-5"/>
+                  <width sOffset="81.59745985845875" a="0.5821788566857968" b="-0.0011615753257707348" c="-1.0391875468557605E-4" d="8.984252077365354E-5"/>
+                  <width sOffset="83.05711623406134" a="0.5805413516652704" b="-8.906921271870649E-4" c="-3.846103337568713E-4" d="2.733522006089333E-5"/>
+                  <width sOffset="91.27605731299822" a="0.5624164451042519" b="-0.0016733077375841055" c="-3.1510784766406016E-4" d="1.3798218809624452E-5"/>
+                  <width sOffset="91.79714234076609" a="0.561460900695721" b="-0.0019904638259284468" c="-2.9795421053759264E-4" d="1.4980575237378996E-5"/>
+                  <width sOffset="96.92065542251031" a="0.5454561205650466" b="-0.0038638707559508385" c="6.943958513097072E-4" d="-2.2146540397930856E-5"/>
+                  <width sOffset="101.99682482307344" a="0.5408385289072424" b="0.0014738885296917163" c="3.5278048039377903E-4" d="-2.2387504441563533E-5"/>
+                  <width sOffset="105.4834631463374" a="0.5493171598652529" b="0.003117453462468306" c="-4.576398457476008E-4" d="-6.106514120667659E-5"/>
+                  <width sOffset="106.96342503999179" a="0.5527305642998952" b="0.0013616238043464269" c="-5.802530800910104E-5" d="7.6221460807540394E-6"/>
+                  <width sOffset="112.19650730538078" a="0.5593593420912661" b="0.0013805222249209824" c="6.850335193268333E-5" d="8.351322053366998E-6"/>
+                  <width sOffset="120.53104608675123" a="0.5804589503335249" b="0.0042627720633582255" c="-1.2646474702219417E-4" d="-3.37834229347622E-5"/>
+                  <width sOffset="122.39618978768812" a="0.5877504921660801" b="0.0034384488457556706" c="-2.822913115050095E-4" d="-1.67365673421128E-5"/>
+                  <width sOffset="126.80754130694221" a="0.5959885529091924" b="-2.9205483419317084E-5" c="-6.245331811524085E-5" d="-2.4226051435040515E-6"/>
+                  <width sOffset="128.8932145475275" a="0.5956339861436231" b="-3.2133514816892804E-4" c="-0.005850593369159619" d="8.265088553383016E-4"/>
+                  <width sOffset="132.59587226999545" a="0.5561898965595393" b="-0.009653323172356643" c="0.003378536459367358" d="7.943989406124081E-4"/>
+                  <width sOffset="133.61107112102218" a="0.550703044743238" b="-3.373594496422931E-4" c="0.008692147017761347" d="-7.550620216547164E-4"/>
+                  <width sOffset="134.3441678920895" a="0.5548296697941106" b="0.011189629444450963" c="0.0017523347251965533" d="-7.919563775476825E-4"/>
+                  <width sOffset="138.04591289151958" a="0.5800911698483127" b="-0.008393313191448662" c="-0.008982633198513284" d="-4.3875775531445786E-4"/>
+                  <width sOffset="138.20080521867357" a="0.5785739715199734" b="-0.011207574656759402" c="-0.0056421080205306725" d="3.301960558775709E-4"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects>
+         <object type="pole" name="Guidepost" id="256727" s="39.44092450223664" t="-5.434716049927163" zOffset="-0.12258851564030238" validLength="0.0" orientation="none" radius="0.0" height="1.0348451202735305" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256728" s="90.37923993255359" t="-6.334890568927262" zOffset="-0.16579234284770905" validLength="0.0" orientation="none" radius="0.0" height="0.9673358649015427" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256777" s="138.82238178801006" t="-6.57346900559677" zOffset="-0.18064665296967064" validLength="0.0" orientation="none" radius="0.0" height="1.0235646581277251" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256823" s="106.66877827975355" t="-6.948377204208534" zOffset="-0.18443895759200757" validLength="0.0" orientation="none" radius="0.04105537693089938" height="3.3336200108751655" hdg="0.0" pitch="0.0" roll="0.0"/>
+      </objects>
+      <signals>
+         <signal s="106.5035604839039" t="-6.905887925897504" id="253580" dynamic="no" orientation="+" zOffset="2.427756950294622" country="DEU" type="138" subtype="10" height="0.7739999907261573" width="0.899779541449687" hOffset="0.07727538942423623"/>
+         <signal s="106.50314114793441" t="-6.897626816597941" id="253592" dynamic="no" orientation="+" zOffset="2.0052233763157687" country="DEU" type="1000" subtype="21" height="0.41999997495370245" width="0.7594641531827063" hOffset="0.07727513434645517"/>
+      </signals>
+   </road>
+   <road length="4.999999999999678" id="255963" junction="2104769">
+      <link>
+         <predecessor elementType="road" elementId="255962" contactPoint="end"/>
+         <successor elementType="road" elementId="2233547" contactPoint="start"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618246.2694786945" y="5809510.797425049" hdg="0.07546534904918656" length="4.999999999999678">
+            <paramPoly3 aU="0.0" bU="5.000318526549728" cU="-4.1555383613449686E-4" dU="1.888275279160973E-5" aV="-0.0" bV="8.326672684688674E-16" cV="0.025507034886621368" dV="-0.0011561529372939993" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="102.510173121607" b="-2.3281157114969476E-4" c="6.797822451454524E-5" d="-1.6458240123872198E-7"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.03433070985322398" b="-1.3933592516600157E-4" c="-0.0" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="3.1764026087050583" b="0.023274883608178292" c="0.18732114673316666" d="-0.3807190200324951"/>
+         <laneOffset s="0.34813370422048256" a="3.19114455888634" b="0.015274396957395917" c="-0.003135281669651298" d="3.203551067387906E-4"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="1"/>
+                     <successor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.5515360037845505" b="0.0069789806866468705" c="-0.18816292299024054" d="0.3807204613532441"/>
+                  <width sOffset="0.34813370422048256" a="0.5472244834395337" b="0.01439389001601043" c="0.002295010729571446" d="-3.1891378598976415E-4"/>
+                  <roadMark sOffset="0.0" type="curb" weight="standard" color="standard" width="0.12">
+                     <type name="curb" width="0.12">
+                        <line length="4.999999999999678" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.0"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.12721969952060494">
+                     <type name="solid" width="0.12722">
+                        <line length="4.999999999999678" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.12722"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="3.1258434116365335" b="-0.006655794863805076" c="0.19129025051009593" d="-0.3812980076597112"/>
+                  <width sOffset="0.34813370422048256" a="3.130622098522054" b="-0.01210323873639277" c="2.2912678519623362E-4" d="-2.58632520477358E-4"/>
+                  <width sOffset="3.132001038043936" a="3.0931240713893806" b="-0.01684066355062367" c="-2.0552989049221174E-4" d="3.677527366780483E-4"/>
+                  <roadMark sOffset="0.0" type="solid broken" weight="bold" color="standard" width="0.32">
+                     <type name="solid broken" width="0.12">
+                        <line length="4.0" space="8.0" tOffset="-0.0" sOffset="0.0" width="0.12"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="driving" level="false">
+                  <link>
+                     <predecessor id="-2"/>
+                     <successor id="-2"/>
+                  </link>
+                  <width sOffset="0.0" a="3.4209546896461376" b="0.006333967437038769" c="-0.002534904191924365" d="4.921230752779734E-4"/>
+                  <width sOffset="3.132001038043936" a="3.431046285078783" b="0.004937663632705248" c="3.637465559472395E-4" d="-1.342621818774349E-4"/>
+                  <roadMark sOffset="0.0" type="solid" weight="bold" color="standard" width="0.25">
+                     <type name="solid" width="0.25">
+                        <line length="4.999999999999678" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.25"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-3" type="shoulder" level="false">
+                  <link>
+                     <successor id="-3"/>
+                  </link>
+                  <width sOffset="0.0" a="0.0" b="0.0" c="0.0029883814274838257" d="6.526518816826945E-4"/>
+                  <width sOffset="1.9431681886721477" a="0.01607248364534586" b="0.019006905280368584" c="0.00909960884596775" d="-0.0016280619673741331"/>
+                  <width sOffset="4.29104843275024" a="0.08978873346648575" b="0.0348122107913896" c="0.002440630041441708" d="-0.0010574497886641188"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects/>
+      <signals/>
+   </road>
+   <road length="4.999999999985158" id="255964" junction="2104769">
+      <link>
+         <predecessor elementType="road" elementId="255962" contactPoint="end"/>
+         <successor elementType="road" elementId="2233498" contactPoint="start"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618246.5839332794" y="5809506.638464388" hdg="0.07546534904918656" length="4.999999999985158">
+            <paramPoly3 aU="0.0" bU="4.9619420532499685" cU="0.06364643982864195" dU="-0.026198656772968586" aV="-0.0" bV="8.326672684688674E-16" cV="0.040290370483449196" dV="-0.09122618195796448" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="102.36692923521669" b="0.002502101540929609" c="-4.247175586351604E-5" d="1.8081052621192706E-6"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.03433070985322398" b="0.0025197780628493896" c="-0.0" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="0.8028950886565537" b="0.02353687251527983" c="-0.016180839788100296" d="0.006027669461666352"/>
+         <laneOffset s="0.9095511713614038" a="0.8154524987633257" b="0.009062040402808001" c="0.01645099006065827" d="-0.07313698856621507"/>
+         <laneOffset s="1.2011471792846398" a="0.8176804014989982" b="-0.0" c="-0.020550868078556536" d="0.004121429395256641"/>
+         <laneOffset s="4.502713777520678" a="0.7419917572304657" b="-9.251493823861486E-4" c="0.003185378807527215" d="-0.004184750488677751"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <successor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.0" b="0.0" c="0.0048997404840012675" d="-0.004295394961280041"/>
+                  <width sOffset="0.9095511713614038" a="8.213756745080181E-4" b="-0.0017473965913633992" c="-0.023005312461919697" d="0.07486926306660138"/>
+                  <width sOffset="1.2011471792846398" a="2.1204125751328462E-4" b="0.003934092031216568" c="0.015511918664114666" d="-0.002389154894870328"/>
+                  <width sOffset="3.673717620032008" a="0.06865787288475844" b="0.03682367021277554" c="-0.0034691945551999564" d="-0.00426329773892538"/>
+                  <width sOffset="4.502713777520678" a="0.09437153925861108" b="0.02228211477963751" c="0.0030133071124200327" d="0.004042882145010634"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.2">
+                     <type name="solid" width="0.2">
+                        <line length="4.999999999985158" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.2"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-3"/>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="3.887071262449559" b="0.11326192135649697" c="-0.009249870285137816" d="0.005703370384052849"/>
+                  <width sOffset="0.9095511713614038" a="3.9867280504269433" b="0.11059037043843764" c="0.022497059745876145" d="-0.0734612876438285"/>
+                  <width sOffset="1.2011471792846398" a="4.019067254870396" b="0.1049716258718328" c="-0.014788491342554857" d="0.003797130317643273"/>
+                  <width sOffset="3.5043619644274697" a="4.228783171079074" b="0.09727851394301854" c="0.01399719024053266" d="0.0034209009321729093"/>
+                  <width sOffset="4.502713777520678" a="4.343256454085225" b="0.13545565542331356" c="0.007157704185660755" d="-0.004885278951764522"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.12485439399458217">
+                     <type name="solid" width="0.124854">
+                        <line length="4.999999999985158" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.124854"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="-4"/>
+                     <successor id="-2"/>
+                  </link>
+                  <width sOffset="0.0" a="0.4399933845140853" b="0.037352172871214825" c="-0.006122395578994523" d="2.740425421320586E-4"/>
+                  <width sOffset="3.5043619644274697" a="0.5074960747641994" b="0.004538174180785032" c="-0.005790224312093853" d="6.5027192758411E-4"/>
+                  <width sOffset="3.849351698177696" a="0.508399257972338" b="7.752203229474397E-4" c="-0.005140831918141377" d="0.0013293427964371106"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects>
+         <object type="pole" name="RoadSignPole" id="256796" s="3.589049790418185" t="-5.1069471779480144" zOffset="-0.14527255943185935" validLength="0.0" orientation="none" radius="0.0357241350530005" height="2.9073556130751967" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256797" s="0.8927658674294643" t="-4.873121633821707" zOffset="-0.25405533319370477" validLength="0.0" orientation="none" radius="0.035443343914443606" height="3.580014212988317" hdg="0.0" pitch="0.0" roll="0.0"/>
+      </objects>
+      <signals>
+         <signal s="0.842951669237658" t="-4.82530328714897" id="249402" dynamic="no" orientation="+" zOffset="1.9681100510512977" country="DEU" type="205" subtype="-1" height="0.7339999978803771" width="0.8226685368113252" hOffset="-0.444740550751531"/>
+         <signal s="0.8470112663058648" t="-4.808652293360823" id="253518" dynamic="no" orientation="+" zOffset="2.715109551768265" country="DEU" type="1000" subtype="32" height="0.559999996986715" width="0.7458356253174117" hOffset="-0.44627459876791803"/>
+      </signals>
+   </road>
+   <road length="389.62987499256246" id="255965" junction="-1">
+      <link>
+         <predecessor elementType="junction" elementId="2104772"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618318.5837261812" y="5809517.36977673" hdg="0.07730358217726474" length="88.00037823735755">
+            <paramPoly3 aU="0.0" bU="95.17367365840128" cU="-15.142518550349951" dU="7.951419377232137" aV="-0.0" bV="-8.881784197001252E-16" cV="2.264023441663528" dV="-0.6709499371878206" pRange="normalized"/>
+         </geometry>
+         <geometry s="88.00037823735755" x="618406.1805188211" y="5809525.752688841" hdg="0.10563851446069594" length="271.99979751532294">
+            <paramPoly3 aU="0.0" bU="271.9825674045364" cU="0.02745574309094984" dU="-0.010226147637849426" aV="-0.0" bV="-7.105427357601002E-15" cV="0.033339169815002206" dV="-0.01757045746184953" pRange="normalized"/>
+         </geometry>
+         <geometry s="360.0001757526805" x="618676.66237371" y="5809554.448611767" hdg="0.10568986232115085" length="29.62969923988198">
+            <paramPoly3 aU="0.0" bU="70.40234255304102" cU="-74.12186677867066" dU="33.344333729438006" aV="-0.0" bV="2.6645352591003757E-15" cV="0.3985428894290779" dV="-0.6354567820286108" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="102.63276262152934" b="6.38397458099058E-4" c="4.626360006960973E-4" d="-3.036066837258057E-5"/>
+         <elevation s="7.986745365256115" a="102.65190448605976" b="0.0022183611368678923" c="-3.0772433385078106E-5" d="-1.36234147707935E-7"/>
+         <elevation s="10.25341776296217" a="102.65677309474847" b="0.002076759253191083" c="-3.279917112405028E-5" d="8.229635066881649E-7"/>
+         <elevation s="20.50683552592434" a="102.6755058421262" b="0.0016637128653600103" c="-2.4045838978826242E-5" d="9.457011927274096E-7"/>
+         <elevation s="30.76025328888651" a="102.69105602001447" b="0.0014688808073859833" c="-1.1056410882323578E-5" d="7.780366685075001E-7"/>
+         <elevation s="41.01367105184868" a="102.70579337842415" b="0.0014875398050472157" c="3.713488371558514E-5" d="-2.7302519886151617E-6"/>
+         <elevation s="51.267088814810855" a="102.72200670658479" b="0.0013879434850597044" c="-1.8889253564520724E-5" d="7.673657282294855E-8"/>
+         <elevation s="61.52050657777302" a="102.73433471467274" b="0.0010247872096864456" c="-1.1861262424919136E-4" d="8.692353233787626E-6"/>
+         <elevation s="71.77392434073519" a="102.74174231588599" b="0.0013339660891738857" c="5.623864600326309E-5" d="-2.6767074724993337E-6"/>
+         <elevation s="82.02734210369736" a="102.75844713560431" b="0.0016430152990473137" c="-8.940064257324578E-6" d="1.1568371564268063E-6"/>
+         <elevation s="92.28075986665954" a="102.7756007995638" b="0.0018245466819158118" c="2.5292600183376852E-5" d="-8.715114382375061E-7"/>
+         <elevation s="95.84102523134737" a="102.78237793634827" b="0.001971502916562135" c="4.257641187409881E-6" d="-7.922117491600353E-7"/>
+         <elevation s="102.53417762962171" a="102.7955267026854" b="0.0019220278064839013" c="4.2349665390116883E-5" d="-4.162174907102059E-6"/>
+         <elevation s="112.78759539258388" a="102.81519969386737" b="0.0014777449222031056" c="-4.557545027331282E-5" d="1.5562732475605082E-6"/>
+         <elevation s="123.04101315554604" a="102.82723777852347" b="0.0010339817050242493" c="-3.8133180722789004E-5" d="2.6987859632897813E-6"/>
+         <elevation s="127.78800097897863" a="102.83157547211181" b="8.543886814866154E-4" c="-5.073267809783575E-6" d="2.550233500288831E-6"/>
+         <elevation s="133.29443091850823" a="102.83655206308133" b="0.001030492629388612" c="4.994824544790654E-6" d="5.914918953841951E-7"/>
+         <elevation s="143.54784868147038" a="102.84828086274813" b="0.0013194758744279104" c="-6.049776978467115E-6" d="2.2751143192136755E-6"/>
+         <elevation s="153.80126644443257" a="102.86362647241377" b="0.0019129799789661406" c="1.4133419045286232E-4" d="-8.147298841438515E-6"/>
+         <elevation s="164.05468420739473" a="102.88931735357114" b="0.002241657437200775" c="-2.741317573407325E-5" d="2.131457530563097E-6"/>
+         <elevation s="174.3081019703569" a="102.9117176294609" b="0.002351756812507668" c="2.528655754813801E-4" d="-1.6785001961699388E-5"/>
+         <elevation s="179.70183767369173" a="102.92912500075732" b="0.0036145897680413376" c="-1.0918002409025366E-5" d="-1.7086062497434225E-5"/>
+         <elevation s="184.56151973331907" a="102.94447196702633" b="0.0022979342439975433" c="-2.1297272248780628E-4" d="1.4148162509698163E-5"/>
+         <elevation s="194.81493749628123" a="102.9608945454894" b="0.0023928359558029323" c="1.2542019770509634E-5" d="-2.935767369145453E-7"/>
+         <elevation s="205.06835525924342" a="102.98643140063432" b="0.002557439656740085" c="1.5010219431856405E-4" d="-1.1441052323843784E-5"/>
+         <elevation s="207.6554419040985" a="102.99385424862282" b="0.00310436893762827" c="6.735362008710467E-5" d="-1.1070271903027887E-5"/>
+         <elevation s="215.32177302220558" a="103.01662398084743" b="0.002185192167737984" c="-6.401473293959904E-5" d="3.4669919225962224E-6"/>
+         <elevation s="225.57519078516776" a="103.03603694238404" b="0.0019659339416376958" c="7.509275068048903E-6" d="7.72036817087735E-8"/>
+         <elevation s="235.6090458888469" a="103.05659684981825" b="0.0021399460918714443" c="1.6586636044225603E-5" d="-1.1157901727894793E-7"/>
+         <elevation s="235.82860854812992" a="103.05706750049647" b="0.0021472135667843927" c="1.0708790299885858E-4" d="-6.553767718495899E-6"/>
+         <elevation s="246.08202631109208" a="103.08327745198024" b="0.0022762041356478684" c="2.122680731299423E-6" d="-1.1157901725998561E-7"/>
+         <elevation s="256.33544407405424" a="103.10671920815508" b="0.002284541831802043" c="-2.2182069988677694E-4" d="1.4544598898667377E-5"/>
+         <elevation s="266.58886183701645" a="103.122501603795" b="0.0023230346625151845" c="5.552140106875455E-7" d="-2.9659606347480025E-7"/>
+         <elevation s="276.8422795999786" a="103.14605929861597" b="0.0022408746205188823" c="-3.181815113790355E-5" d="1.2453602217121544E-6"/>
+         <elevation s="287.09569736294077" a="103.1670332568095" b="0.0019811688121988175" c="-1.4413288760291581E-5" d="5.700930596666282E-7"/>
+         <elevation s="297.3491151259029" a="103.18644624432748" b="0.0018654039256665632" c="-3.6774373879309484E-6" d="-1.1157901726496377E-7"/>
+         <elevation s="307.60253288886514" a="103.20506611297434" b="0.0017547995535171766" c="1.577534663678629E-4" d="-1.1989385241722798E-5"/>
+         <elevation s="315.4764857734831" a="103.22281094305701" b="0.0020090917690522526" c="-1.2558409784944346E-4" d="-1.142517966955852E-5"/>
+         <elevation s="317.8559506518273" a="103.22672654556014" b="0.0012173828017899176" c="-1.5746654932575268E-4" d="9.679904599753116E-6"/>
+         <elevation s="328.10936841478946" a="103.23308864560296" b="0.001041262086776675" c="1.1284969951890935E-4" d="-5.74623567486646E-6"/>
+         <elevation s="335.4433459654392" a="103.24452836837273" b="0.0017693141695210024" c="-2.2616121945272902E-5" d="-6.1988622298616385E-6"/>
+         <elevation s="338.3627861777516" a="103.24934677025949" b="0.0014787601904553953" c="-1.7716749500124437E-5" d="4.260558537995706E-7"/>
+         <elevation s="348.6162039407138" a="103.26310578342384" b="0.0012498227704640925" c="-1.5960233397177375E-5" d="6.808014046727061E-7"/>
+         <elevation s="358.869621703676" a="103.27497668024994" b="0.0011372521051218937" c="-1.2597739884934554E-6" d="-7.21102947605614E-8"/>
+         <elevation s="369.12303946663815" a="103.2864272252951" b="0.0010886747040456733" c="-5.315825840679535E-6" d="2.5135988382977957E-7"/>
+         <elevation s="379.3764572296003" a="103.29730195334703" b="0.0010589422739823002" c="-1.6123004444479476E-7" d="-9.327229761053656E-18"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.0358830170657189" b="-5.926766137034281E-5" c="-5.78828183564299E-6" d="0.0"/>
+         <superelevation s="10.25341776296217" a="0.03466678399489116" b="-1.7796700495156697E-4" c="-1.4496878068578762E-5" d="8.493359418547667E-7"/>
+         <superelevation s="20.50683552592434" a="0.03223347696613575" b="-2.0737347322754112E-4" c="3.993367131815058E-6" d="-1.0465317607541477E-7"/>
+         <superelevation s="30.76025328888651" a="0.030414210286974303" b="-1.5848952416700873E-4" c="4.0456224391638226E-6" d="-2.1440273157832876E-7"/>
+         <superelevation s="41.01367105184868" a="0.028983358361460893" b="-1.4314874450928558E-4" c="-1.363635806558353E-5" d="1.2956907890704586E-6"/>
+         <superelevation s="51.267088814810855" a="0.027478682527579817" b="-1.4129366162033762E-5" c="2.067022892562618E-6" d="-1.3439570039622452E-7"/>
+         <superelevation s="61.52050657777302" a="0.02740624538058722" b="-1.4129366162033762E-5" c="-2.283522097357696E-5" d="1.5295211247776282E-6"/>
+         <superelevation s="71.77392434073519" a="0.026509420651126162" b="0.0" c="4.012248605146629E-6" d="-1.8733150066858053E-7"/>
+         <superelevation s="82.02734210369736" a="0.02672930127742267" b="2.319459264129344E-5" c="2.885991799823942E-7" d="-1.1501223357626469E-8"/>
+         <superelevation s="92.28075986665954" a="0.026985068347511982" b="2.5485388848041037E-5" c="2.203594689823105E-6" d="-2.0976900144962863E-7"/>
+         <superelevation s="102.53417762962171" a="0.027251925954843673" b="4.513476368126915E-6" c="-6.602885699873667E-7" d="4.29312830285454E-8"/>
+         <superelevation s="112.78759539258388" a="0.027275065234226504" b="4.513476368126915E-6" c="2.369322599370262E-5" d="-1.1417538255287757E-6"/>
+         <superelevation s="123.04101315554604" a="0.028581499331801527" b="1.3028000300274373E-4" c="6.26908876024048E-6" d="-5.841584548897814E-7"/>
+         <superelevation s="133.29443091850823" a="0.0299466958281207" b="7.459692595443231E-5" c="-1.091298448170526E-5" d="7.095510156704854E-7"/>
+         <superelevation s="143.54784868147038" a="0.030329132550942474" b="7.459692595443231E-5" c="3.386132226418986E-5" d="-2.4019610380679964E-6"/>
+         <superelevation s="153.80126644443257" a="0.032064696361283035" b="1.1412439449210806E-5" c="-5.565187975874404E-7" d="0.0"/>
+         <superelevation s="164.05468420739473" a="0.03212320461596667" b="0.0" c="-4.1646748584048896E-5" d="2.707828716033078E-6"/>
+         <superelevation s="174.3081019703569" a="0.030663727964884962" b="0.0" c="3.593531418454068E-5" d="-2.2805371216404788E-6"/>
+         <superelevation s="184.56151973331907" a="0.03198335356550717" b="1.7643351988704483E-5" c="-8.603644363560057E-7" d="0.0"/>
+         <superelevation s="194.81493749628123" a="0.032073805894846756" b="0.0" c="-3.760564778913449E-6" d="0.0"/>
+         <superelevation s="205.06835525924342" a="0.031678448033094726" b="-7.711728340576498E-5" c="-3.6295843169628786E-5" d="2.6044264052282385E-6"/>
+         <superelevation s="215.32177302220558" a="0.02987934572274263" b="0.0" c="5.1526462608621086E-6" d="-1.7655399872358875E-7"/>
+         <superelevation s="225.57519078516776" a="0.03023073709663764" b="4.997973942240277E-5" c="8.107612937477012E-7" d="7.034933819344299E-8"/>
+         <superelevation s="235.82860854812992" a="0.0309042720187064" b="8.87939093189883E-5" c="1.542014365516756E-5" d="-1.2841318239553823E-6"/>
+         <superelevation s="246.08202631109208" a="0.03205161919074597" b="0.0" c="-3.3822139802023096E-5" d="1.6158952073510652E-6"/>
+         <superelevation s="256.33544407405424" a="0.03023769419457039" b="-1.8393538183401252E-4" c="-1.9994661410865623E-5" d="1.8832178010799962E-6"/>
+         <superelevation s="266.58886183701645" a="0.028279686568077778" b="0.0" c="1.0062940092151182E-5" d="-6.542820046145007E-7"/>
+         <superelevation s="276.8422795999786" a="0.028632334172153977" b="0.0" c="-2.4740238449774862E-6" d="0.0"/>
+         <superelevation s="287.09569736294077" a="0.028372233672686865" b="-5.073440007616954E-5" c="-1.546292723075352E-5" d="7.359552159207205E-7"/>
+         <superelevation s="297.3491151259029" a="0.027019711638636347" b="-1.357115029288046E-4" c="-1.4348177290727464E-5" d="1.3631905917064735E-6"/>
+         <superelevation s="307.60253288886514" a="0.025589220203149864" b="0.0" c="3.381212765234716E-5" d="-1.7358613825985504E-6"/>
+         <superelevation s="317.8559506518273" a="0.027272772871801066" b="1.458930052815627E-4" c="8.874030852350844E-6" d="-1.039548696363331E-6"/>
+         <superelevation s="328.10936841478946" a="0.028581024066841678" b="0.0" c="-1.3701375667639675E-6" d="8.908493398258358E-8"/>
+         <superelevation s="338.3627861777516" a="0.02853300870296696" b="0.0" c="1.5005384354994044E-5" d="-9.256824434683851E-7"/>
+         <superelevation s="348.6162039407138" a="0.029112707155165223" b="1.5754809946516183E-5" c="-2.3048134257376855E-6" d="1.4985659604893794E-7"/>
+         <superelevation s="358.869621703676" a="0.029193477479244074" b="1.5754809946516183E-5" c="-1.5851569689434318E-7" d="1.4985659604893964E-7"/>
+         <superelevation s="369.12303946663815" a="0.029499893612036785" b="5.976858446157551E-5" c="2.1942185811460257E-5" d="-1.1801236708465605E-6"/>
+         <superelevation s="379.3764572296003" a="0.031147428577830764" b="1.3752505606323177E-4" c="-2.2584162068401732E-6" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="3.9431784581421803" b="0.024143123401784164" c="-7.205326622215016E-5" d="-3.2630621715278114E-5"/>
+         <laneOffset s="3.379746529386885" a="4.022693323009659" b="0.02253789175235869" c="-4.7118591747535247E-4" d="2.198831916809419E-5"/>
+         <laneOffset s="10.25341776296217" a="4.16249008027541" b="0.019177007424849058" c="-1.0923267342243705E-4" d="7.619619896195298E-5"/>
+         <laneOffset s="11.255715896688761" a="4.181678146449212" b="0.019187680473904976" c="1.3835859855155082E-4" d="-7.006558768084371E-5"/>
+         <laneOffset s="15.20148872080786" a="4.255238211868174" b="0.017006964374447896" c="-6.037668739876913E-4" d="2.9600663498534914E-5"/>
+         <laneOffset s="21.106327032571606" a="4.340704300463096" b="0.012972942094836347" c="-1.059191692188968E-4" d="-1.1323465449191889E-5"/>
+         <laneOffset s="30.76025328888651" a="4.445884585871003" b="0.0077618874736250605" c="-4.561133595812705E-4" d="-9.374126272320635E-6"/>
+         <laneOffset s="34.74499236010533" a="4.468978344412743" b="0.0036803708022709884" c="-3.553151761898391E-4" d="1.6591962835782607E-5"/>
+         <laneOffset s="41.01367105184868" a="4.48217402224375" b="0.0011816673218766848" c="-6.139096224425261E-5" d="1.659249599987085E-5"/>
+         <laneOffset s="48.01128412024726" a="4.493122173097926" b="0.002759920701670033" c="5.345106763846616E-4" d="-5.5872803545557956E-5"/>
+         <laneOffset s="51.267088814810855" a="4.5058455862823275" b="0.004463646001538939" c="-2.1578205161403104E-5" d="-5.781035430839505E-5"/>
+         <laneOffset s="56.21738830256365" a="4.520400247975032" b="-0.0" c="-3.046039444211951E-4" d="8.609806782376791E-6"/>
+         <laneOffset s="61.52050657777302" a="4.513117917917108" b="-0.002504299061659628" c="-1.728790473199899E-4" d="8.966628105327305E-6"/>
+         <laneOffset s="69.12505664946526" a="4.48801960484131" b="-0.0035780355047258477" c="-7.855284085008725E-6" d="-5.552069794929358E-6"/>
+         <laneOffset s="71.77392434073519" a="4.478383556044191" b="-0.003736519015073942" c="-5.833276381119161E-5" d="-7.433024935851043E-6"/>
+         <laneOffset s="80.36271055684094" a="4.437278995540781" b="-0.006383475686962024" c="-4.032045562466731E-4" d="4.0456414241564045E-5"/>
+         <laneOffset s="82.02734210369736" a="4.425722194377192" b="-0.007389535783769324" c="-1.935797639331629E-4" d="4.2289977203414854E-5"/>
+         <laneOffset s="86.04821680414653" a="4.3956292629742375" b="-0.006895094570126127" c="7.470753496659039E-6" d="7.353953403489075E-6"/>
+         <laneOffset s="92.28075986665954" a="4.354725884047394" b="-0.0059449870030976034" c="1.4984212344290647E-4" d="6.7751777515931994E-6"/>
+         <laneOffset s="95.39828450203697" a="4.33785383195647" b="-0.004813170938920084" c="3.247898088240403E-4" d="-1.6902251051259674E-5"/>
+         <laneOffset s="102.53417762962171" a="4.313904457296985" b="-0.002759877302596836" c="-3.55698710899769E-5" d="-1.6846468392090133E-5"/>
+         <laneOffset s="105.94943016116711" a="4.303392809460197" b="-0.003592326574809261" c="1.2790121166019554E-5" d="-3.690452724296712E-6"/>
+         <laneOffset s="112.78759539258388" a="4.278245914696083" b="-0.003935106936246689" c="-5.6146024707997876E-5" d="-4.577957619898224E-6"/>
+         <laneOffset s="117.74539624969721" a="4.256798502994123" b="-0.004829404256784832" c="-1.7257508439914474E-4" d="7.207901287121745E-6"/>
+         <laneOffset s="123.04101315554604" a="4.2274546392931915" b="-0.006050781723376566" c="-4.019066334379019E-5" d="7.924918337491586E-6"/>
+         <laneOffset s="130.4969479416126" a="4.1833909084064524" b="-0.005328438114247281" c="-6.5266732343648415E-6" d="1.1699170979815586E-6"/>
+         <laneOffset s="133.29443091850823" a="4.168459229147344" b="-0.005337487627503713" c="1.838756913323711E-5" d="4.34442457954263E-6"/>
+         <laneOffset s="142.94729472150104" a="4.122558017188381" b="-0.003768090718608057" c="7.923507061207413E-5" d="3.358120628703541E-6"/>
+         <laneOffset s="147.5337411318111" a="4.107266604895325" b="-0.002829356762741983" c="8.941772237598951E-5" d="-5.412952894330529E-6"/>
+         <laneOffset s="153.80126644443257" a="4.0917133656865055" b="-0.0023463938792550863" c="-1.4712282147759479E-6" d="-4.359019088338671E-6"/>
+         <laneOffset s="160.14037555735723" a="4.075669813924084" b="-0.0028905388807032376" c="2.3883702919733E-5" d="-4.585389772566683E-6"/>
+         <laneOffset s="164.05468420739473" a="4.064446288639762" b="-0.002914331953819456" c="-3.760813348118915E-5" d="-3.874390340636806E-6"/>
+         <laneOffset s="171.84612215086898" a="4.037623842084577" b="-0.0042059769225925156" c="-6.792371810424733E-4" d="7.104439511387146E-5"/>
+         <laneOffset s="174.3081019703569" a="4.024211910122751" b="-0.006258639698558903" c="-1.5939554808943514E-4" d="6.663882119880326E-5"/>
+         <laneOffset s="180.48695056879342" a="3.995175199475273" b="-5.959568829154086E-4" c="1.3363317517969486E-4" d="-1.3012839143656995E-5"/>
+         <laneOffset s="184.56151973331907" a="3.994085252609664" b="-1.5508356498457698E-4" c="-1.2531797829694999E-5" d="-1.15581923367309E-5"/>
+         <laneOffset s="187.78417110727167" a="3.9930684849040814" b="-5.959669871410092E-4" c="-1.8265380749457082E-4" d="2.5272331739824363E-6"/>
+         <laneOffset s="194.81493749628123" a="3.9807278175095226" b="-0.0027895833738300633" c="-1.3044182876509422E-4" d="2.6512928231538706E-6"/>
+         <laneOffset s="205.06835525924342" a="3.941269377746373" b="-0.004628320770748384" c="-5.649269491785591E-5" d="2.960975814027823E-6"/>
+         <laneOffset s="215.32177302220558" a="3.891065886639952" b="-0.004852922131020365" c="2.9896310728370714E-5" d="2.3371912450729636E-6"/>
+         <laneOffset s="219.8864557155188" a="3.869759059440769" b="-0.004433892335890424" c="-8.368412412999153E-5" d="4.947121177515534E-6"/>
+         <laneOffset s="225.57519078516776" a="3.8427384105716174" b="-0.004905714105753622" c="6.45086204927435E-6" d="5.0061642791971056E-6"/>
+         <laneOffset s="232.73223085156593" a="3.8097937452496144" b="-0.004044080349039306" c="1.8645363479205475E-4" d="-2.203351513442223E-5"/>
+         <laneOffset s="235.82860854812992" a="3.798405277347593" b="-0.0035231612006051734" c="4.390998360343069E-6" d="-2.2805847336724033E-5"/>
+         <laneOffset s="239.12328097798337" a="3.786029668231015" b="-0.004236890677438231" c="-1.9575045328314291E-4" d="8.637286847317765E-6"/>
+         <laneOffset s="246.08202631109208" a="3.7499776955240254" b="-0.005706486309183542" c="-1.8311816323881286E-5" d="1.0030398419257158E-5"/>
+         <laneOffset s="252.44016396939256" a="3.7155329468096836" b="-0.0047228803209561875" c="-5.737699904552676E-5" d="9.33070115406154E-6"/>
+         <laneOffset s="256.33544407405424" a="3.696816892720473" b="-0.004745149303829253" c="2.538865787485244E-5" d="6.495874181929474E-6"/>
+         <laneOffset s="265.8648578604777" a="3.659525230812768" b="-0.002491605565624821" c="3.960320137275646E-4" d="-4.2597416540258285E-5"/>
+         <laneOffset s="272.2527305099486" a="3.648665926885228" b="-0.0026465535652261275" c="-2.9267915835248754E-4" d="9.422212877948634E-6"/>
+         <laneOffset s="276.8422795999786" a="3.6312653408288287" b="-0.00473767692546228" c="-1.6150530012927882E-4" d="9.790786191163115E-6"/>
+         <laneOffset s="287.35895645147275" a="3.57496630729676" b="-0.0048860777185968495" c="-2.0790687874139853E-5" d="9.820311057642344E-7"/>
+         <laneOffset s="297.3491151259029" a="3.5250577715617353" b="-0.00500745251242993" c="9.277567417851549E-7" d="9.624186454367385E-7"/>
+         <laneOffset s="307.60253288886514" a="3.4748492631940944" b="-0.004684882503877081" c="3.465723363897884E-5" d="-1.4224947776537866E-6"/>
+         <laneOffset s="310.06198118071103" a="3.4635155122303485" b="-0.0045402206815412585" c="1.2048359948167742E-5" d="8.312125353552512E-7"/>
+         <laneOffset s="317.4281656499494" a="3.431057392058391" b="-0.0042274133413749875" c="7.944151979026133E-5" d="-3.7015985954289277E-6"/>
+         <laneOffset s="328.10936841478946" a="3.3904561036199476" b="-0.0037972763486213684" c="-3.603525886517429E-5" d="-3.4275726386480552E-6"/>
+         <laneOffset s="331.5613501739954" a="3.3767775811241005" b="-0.004168593158891025" c="-3.7437729989591196E-5" d="1.0187375760688994E-6"/>
+         <laneOffset s="338.3627861777516" a="3.3470138363418727" b="-0.004536474838568447" c="-1.4665344587544765E-5" d="8.107031211704639E-7"/>
+         <laneOffset s="346.2656038737195" a="3.3106471216439606" b="-0.004616373686803195" c="9.660547512941606E-5" d="-1.4878300214390085E-5"/>
+         <laneOffset s="348.6162039407138" a="3.3001364129031114" b="-0.004408834153529375" c="-2.672652405406583E-6" d="-1.3466553764429583E-5"/>
+         <laneOffset s="353.67318459714556" a="3.2760311484491615" b="-0.00546900795051959" c="-2.4572589481539666E-4" d="9.937559534415954E-6"/>
+         <laneOffset s="358.869621703676" a="3.2423708965999793" b="-0.007217775740085712" c="-8.954429753654989E-5" d="9.928895614053403E-6"/>
+         <laneOffset s="367.5780871718542" a="3.179281653697973" b="-0.00651841857076042" c="-6.814659028422366E-4" d="8.303070463105948E-5"/>
+         <laneOffset s="369.12303946663815" a="3.167890617298723" b="-0.008029530806303142" c="-2.805173553615392E-4" d="8.656796650239111E-5"/>
+         <laneOffset s="375.86752099347035" a="3.1275338751121695" b="-0.0" c="0.00109325579557021" d="-9.155491835970683E-6"/>
+         <laneOffset s="379.3764572296003" a="3.1405991769344035" b="0.007334145106151316" c="0.0010146083262602555" d="-6.657689317449441E-6"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <successor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.5363372936064708" b="6.859181759521805E-4" c="-1.987268013186298E-5" d="2.6600290193224322E-5"/>
+                  <width sOffset="3.379746529386885" a="0.5394554488788259" b="0.0014631292678124151" c="3.1811699502319623E-4" d="-2.8018650690148933E-5"/>
+                  <width sOffset="10.25341776296217" a="0.5554432901594382" b="0.001864971032521593" c="-1.8505065923272738E-4" d="-8.186384036697905E-5"/>
+                  <width sOffset="11.255715896688761" a="0.5570442154253161" b="0.0012472975492496333" c="-4.496839304154378E-4" d="6.439794627582067E-5"/>
+                  <width sOffset="15.20148872080786" a="0.5589206926994281" b="7.064549593328619E-4" c="2.2535186582536523E-4" d="-3.526830490354408E-5"/>
+                  <width sOffset="20.50683552592434" a="0.5637450471951659" b="1.1953486954407837E-4" c="-3.598445759411715E-4" d="-3.475373500441202E-5"/>
+                  <width sOffset="21.106327032571606" a="0.5636798950309885" b="-3.493831058422499E-4" c="-3.9583459195097876E-4" d="6.170393940214424E-6"/>
+                  <width sOffset="27.325342920055178" a="0.5476818648060666" b="-0.004556844934028961" c="1.4307812082010735E-4" d="1.736324841646853E-5"/>
+                  <width sOffset="30.76025328888651" a="0.5344213169690146" b="-0.00295933734280521" c="3.165372077546336E-4" d="1.1606482699426071E-5"/>
+                  <width sOffset="34.74499236010533" a="0.5283894989191182" b="1.1616727760351952E-4" c="2.4242509799118003E-4" d="-1.4359606408679201E-5"/>
+                  <width sOffset="41.01367105184868" a="0.5351068423353196" b="0.0014626977640949735" c="-2.1679804101123435E-5" d="-1.4358335138331946E-5"/>
+                  <width sOffset="48.01128412024726" a="0.5393607766422432" b="-9.49952068370572E-4" c="-5.706800630053783E-4" d="5.8106964407117515E-5"/>
+                  <width sOffset="51.267088814810855" a="0.5322239690076129" b="-0.0028181501995026633" c="6.122418725001307E-7" d="5.9712194802590935E-5"/>
+                  <width sOffset="56.21738830256365" a="0.5255319347728671" b="0.0015777366644812167" c="3.118820211971597E-4" d="-6.707966285372709E-6"/>
+                  <width sOffset="56.70574959466866" a="0.5263760418437311" b="0.00187755939369243" c="2.5292184307281363E-4" d="-8.882229400728313E-6"/>
+                  <width sOffset="61.52050657777302" a="0.5402878477831861" b="0.003695353357547989" c="1.2575509699321963E-4" d="-9.09920738536848E-6"/>
+                  <width sOffset="69.12505664946526" a="0.5716601496849636" b="0.0040293760670800744" c="-4.229328356231601E-5" d="5.41949051489618E-6"/>
+                  <width sOffset="71.77392434073519" a="0.5821374083988955" b="0.00391939500864527" c="5.132151559148428E-6" d="6.469098629305443E-6"/>
+                  <width sOffset="73.41910337786986" a="0.5886282116800183" b="0.003988809684967923" c="-2.032572135217944E-4" d="1.1220786819266097E-5"/>
+                  <width sOffset="80.36271055684094" a="0.6102816206286592" b="0.0027891194882285557" c="1.8383080031192348E-4" d="-3.666865235852272E-5"/>
+                  <width sOffset="82.02734210369736" a="0.6152647305684136" b="0.003096314279601482" c="-4.7520860915193416E-6" d="-3.8477495156143644E-5"/>
+                  <width sOffset="86.04821680414653" a="0.6251364781475575" b="0.001191852178111994" c="-1.5981406569196466E-4" d="-3.5414713562192796E-6"/>
+                  <width sOffset="92.28075986665954" a="0.6254994434942374" b="-0.0012129449553663638" c="-2.2889757954992838E-4" d="-2.965078541217698E-6"/>
+                  <width sOffset="95.39828450203697" a="0.61940357212697" b="-0.002726585079717717" c="-3.682110304763631E-4" d="2.0712350261633934E-5"/>
+                  <width sOffset="102.53417762962171" a="0.5887234656877007" b="-0.004817535259310652" c="7.482504243770346E-5" d="2.0717267577378266E-5"/>
+                  <width sOffset="105.94943016116711" a="0.5739684010194175" b="-0.0035815069176761295" c="6.612432033166983E-5" d="7.561251909589441E-6"/>
+                  <width sOffset="112.78759539258388" a="0.5549872275164427" b="-0.0016164650167758065" c="2.2488027589561563E-4" d="2.693829349389852E-6"/>
+                  <width sOffset="113.9826863982419" a="0.5533811863268792" b="-0.001067417901843861" c="8.259539092035891E-5" d="4.454656091417216E-6"/>
+                  <width sOffset="117.74539624969721" a="0.5507714969950577" b="-2.566460515795316E-4" c="1.812193790560856E-4" d="-7.331202815599591E-6"/>
+                  <width sOffset="123.04101315554604" a="0.5534056922249304" b="0.0010459117200125314" c="5.8530526039090085E-5" d="-7.942210726089425E-6"/>
+                  <width sOffset="130.4969479416126" a="0.561165801997995" b="5.9416584973451E-4" c="2.4479743164597468E-5" d="-1.1872094865886237E-6"/>
+                  <width sOffset="133.29443091850823" a="0.5629935557369814" b="7.032561919341537E-4" c="6.399308975916356E-6" d="-4.109836665016982E-6"/>
+                  <width sOffset="142.94729472150104" a="0.5666817450569601" b="-3.2203685699454645E-4" c="-4.7654856938575975E-5" d="-3.123532711453766E-6"/>
+                  <width sOffset="143.54784868147038" a="0.5664704805519243" b="-3.826551304153291E-4" c="-3.322234935508505E-5" d="-6.120179079179113E-6"/>
+                  <roadMark sOffset="0.0" type="curb" weight="standard" color="standard" width="0.12">
+                     <type name="curb" width="0.12">
+                        <line length="147.5337411318111" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.0"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.12100879759058412">
+                     <type name="solid" width="0.121009">
+                        <line length="147.5337411318111" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.121009"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="3.1507580564448996" b="-3.847272722230788E-5" c="0.012032105444485368" d="-0.0057869724490430055"/>
+                  <width sOffset="1.2126446200495682" a="3.1580853546792236" b="0.0036135130997439514" c="-0.004306737778417646" d="0.0012386328181372374"/>
+                  <width sOffset="2.9960515734001025" a="3.15785773607841" b="7.074591176553513E-5" c="3.827398554164592E-4" d="-6.004637866934113E-5"/>
+                  <width sOffset="3.379746529386885" a="3.1579378366697055" b="3.379362043996331E-4" c="2.453384177920245E-4" d="-5.427437765890524E-6"/>
+                  <width sOffset="10.25341776296217" a="3.1700896608086815" b="0.0029413911975567295" c="4.889388002308134E-5" d="4.82344260481598E-5"/>
+                  <width sOffset="11.255715896688761" a="3.173135498322509" b="0.0031847728242995754" c="2.1240705357554126E-4" d="-9.802736059463782E-5"/>
+                  <width sOffset="14.977509477833541" a="3.182877135923114" b="6.922925119005781E-4" c="-9.582778982423685E-4" d="4.982831541452196E-5"/>
+                  <width sOffset="15.20148872080786" a="3.182984681320668" b="2.7052296213252516E-4" c="-8.375331702855313E-4" d="1.494945667891543E-4"/>
+                  <width sOffset="18.400652470772837" a="3.1801730693152432" b="-4.98215432879992E-4" c="-5.070606985268253E-5" d="2.5793616286662536E-5"/>
+                  <width sOffset="20.50683552592434" a="3.179139794792423" b="-3.6854597112287793E-4" c="1.262575865816923E-4" d="2.9471338815732336E-5"/>
+                  <width sOffset="21.106327032571606" a="3.1789705799734094" b="-1.853901502566046E-4" c="1.527473476390682E-4" d="-1.1452790133167961E-5"/>
+                  <width sOffset="30.76025328888651" a="3.18111221661639" b="-4.3830833306155153E-4" c="-1.9764957372145505E-4" d="-9.477186049751635E-6"/>
+                  <width sOffset="34.74499236010533" a="3.1756277395054826" b="-0.0024649127068072786" c="-9.808338929541833E-5" d="1.6488903058351594E-5"/>
+                  <width sOffset="41.01367105184868" a="3.16038348804432" b="-0.0017507589583698002" c="1.9903007778238486E-4" d="1.6176797447431672E-5"/>
+                  <width sOffset="46.72185194257099" a="3.159883649146898" b="0.0021027221591125153" c="3.0356158987781813E-4" d="1.582159233610518E-5"/>
+                  <width sOffset="48.01128412024726" a="3.163133598194899" b="0.0029644829386042838" c="6.123422387515853E-4" d="-5.664370720882056E-5"/>
+                  <width sOffset="51.267088814810855" a="3.1773214554676814" b="0.005150501623221147" c="5.1391944334717E-5" d="-5.8205768211915057E-5"/>
+                  <width sOffset="56.21738830256365" a="3.197016458218627" b="0.0013802344042844346" c="-2.3750604665723083E-4" d="8.214392878858239E-6"/>
+                  <width sOffset="61.52050657777302" a="3.198881700887142" b="-4.457692325367962E-4" c="-1.1110098637219893E-4" d="8.51762074860701E-6"/>
+                  <width sOffset="69.12505664946526" a="3.1928126980091758" b="-6.578141441583004E-4" c="4.367928008255144E-5" d="-6.0010771516508845E-6"/>
+                  <width sOffset="71.77392434073519" a="3.191265176345191" b="-5.527325509090989E-4" c="-9.675361677980715E-6" d="-7.809740179335207E-6"/>
+                  <width sOffset="80.36271055684094" a="3.1808561239208712" b="-0.00244724091441778" c="-3.642537341856641E-4" d="4.00796989981386E-5"/>
+                  <width sOffset="82.02734210369736" a="3.175957898321786" b="-0.003326755108636459" c="-1.569627601610994E-4" d="4.1915122024105306E-5"/>
+                  <width sOffset="86.04821680414653" a="3.1627685336226374" b="-0.0025560304652362947" c="3.9566020148266865E-5" d="6.979098224180069E-6"/>
+                  <width sOffset="92.28075986665954" a="3.1500645334883015" b="-0.0012495359258418593" c="1.744441570889164E-4" d="6.400508884879331E-6"/>
+                  <width sOffset="95.39828450203697" a="3.148058419853971" b="2.4750855258932718E-5" c="3.4588772420377943E-4" d="-1.7276919917972843E-5"/>
+                  <width sOffset="102.53417762962171" a="3.159570122254718" b="0.002321913923127346" c="-2.2758413172592556E-5" d="-1.7235671931840148E-5"/>
+                  <width sOffset="105.94943016116711" a="3.1665480029159734" b="0.001563354427372994" c="2.161389396013877E-5" d="-4.079656264046038E-6"/>
+                  <width sOffset="112.78759539258388" a="3.1769446605990916" b="0.0012866528378778106" c="-5.643678094858523E-5" d="-4.8957358631913555E-6"/>
+                  <width sOffset="117.74539624969721" a="3.181339822256625" b="3.6603972743228744E-4" c="-1.7759228438064248E-4" d="6.890123043827952E-6"/>
+                  <width sOffset="123.04101315554604" a="3.179321146818217" b="-9.352109754284963E-4" c="-5.254055162875462E-5" d="7.610134242863864E-6"/>
+                  <width sOffset="130.4969479416126" a="3.1725817631027855" b="-4.495247430116875E-4" c="-2.591759056310149E-5" d="8.551330033669794E-7"/>
+                  <width sOffset="133.29443091850823" a="3.171140117830264" b="-5.744561954668615E-4" c="-5.14768420910589E-6" d="3.973961561699457E-6"/>
+                  <width sOffset="142.94729472150104" a="3.1686896304782306" b="4.3701875898499937E-4" c="4.497173010383489E-5" d="2.9876576108330814E-6"/>
+                  <width sOffset="144.23613709128088" a="3.169333978291934" b="5.678302269022809E-4" c="1.6959470648445055E-4" d="-1.9976085222545068E-5"/>
+                  <roadMark sOffset="0.0" type="solid broken" weight="bold" color="standard" width="0.31">
+                     <type name="solid broken" width="0.1">
+                        <line length="4.0" space="8.0" tOffset="-0.0" sOffset="0.0" width="0.1"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="driving" level="false">
+                  <link>
+                     <successor id="-2"/>
+                  </link>
+                  <width sOffset="0.0" a="3.455974455762243" b="-4.2201907772754926E-5" c="-0.0135472052019418" d="0.006062130869002098"/>
+                  <width sOffset="1.2126446200495682" a="3.446812026252348" b="-0.006154875747219148" c="0.0037926461538353973" d="-9.634743981781521E-4"/>
+                  <width sOffset="2.9960515734001025" a="3.4424330248584547" b="-0.0018203203338588367" c="5.753268381178749E-4" d="3.352047928393624E-4"/>
+                  <width sOffset="3.034869871736867" a="3.442363249665216" b="-0.0017741385957631105" c="-0.0011034570529777628" d="1.2837101021720353E-4"/>
+                  <width sOffset="10.25341776296217" a="3.420343702533323" b="0.0023623979340527783" c="0.0016695568847843857" d="1.2891702620136298E-4"/>
+                  <width sOffset="10.758813382178406" a="3.421980736188365" b="0.004148757195829533" c="-2.2244772439196156E-5" d="2.836069168286437E-5"/>
+                  <width sOffset="14.977509477833541" a="3.441216554944119" b="0.005475308772293963" c="4.128627929451268E-4" d="-1.1949498452153768E-4"/>
+                  <width sOffset="18.400652470772837" a="3.460004016285464" b="0.004101191838355552" c="-1.6633676769064237E-4" d="4.205965980845172E-6"/>
+                  <width sOffset="20.50683552592434" a="3.4679433024858417" b="0.0034564935596165993" c="-1.632861433482327E-4" d="3.6864704230014943E-7"/>
+                  <width sOffset="30.76025328888651" a="3.4866148718975096" b="2.242819136901962E-4" c="-1.6183087838621979E-4" d="2.7505727492417334E-7"/>
+                  <width sOffset="41.01367105184868" a="3.472197333964157" b="-0.003007604852957934" c="-1.637215455881941E-4" d="5.828177143361516E-7"/>
+                  <width sOffset="46.72185194257099" a="3.449803187580214" b="-0.0048197388246687635" c="1.8747687322742356E-5" d="9.380228251706077E-7"/>
+                  <width sOffset="51.267088814810855" a="3.428371725922154" b="-0.0045911771231191625" c="2.616952636101124E-5" d="4.0308655003321573E-7"/>
+                  <width sOffset="61.52050657777302" a="3.384482253060433" b="-0.00392739036839038" c="3.582173083865063E-5" d="5.663837983719852E-7"/>
+                  <width sOffset="70.93472836344908" a="3.3511562898858385" b="-0.0031023312683462257" c="3.9658967301539356E-4" d="-9.674421109976719E-6"/>
+                  <width sOffset="71.77392434073519" a="3.3488264065797395" b="-0.0024571379818490264" c="3.71542545973976E-4" d="-9.746713223498927E-6"/>
+                  <width sOffset="82.02734210369736" a="3.3521869221279843" b="0.002087932698373266" c="7.287763490723207E-5" d="-9.75945577307651E-6"/>
+                  <width sOffset="92.28075986665954" a="3.370736798651203" b="5.043121988059429E-4" c="-2.2568990098447304E-4" d="-9.799137611454996E-6"/>
+                  <width sOffset="99.62613597437984" a="3.35838060477775" b="-0.004397366399543506" c="-0.001061575075408331" d="0.0013975655945509652"/>
+                  <width sOffset="100.27937525359681" a="3.3554446485531795" b="-0.003995177378743629" c="0.001027612071912795" d="-9.595914328584911E-6"/>
+                  <width sOffset="102.53417762962171" a="3.351550825483752" b="4.925861681761316E-4" c="9.644846284302829E-4" d="-9.509591176506347E-6"/>
+                  <width sOffset="103.90895238737109" a="3.354026192820516" b="0.0030905648682639066" c="2.1308455499292097E-4" d="-1.220632355887917E-5"/>
+                  <width sOffset="112.78759539258388" a="3.3897204543186996" b="0.00398768375244365" c="-1.0842538614355159E-4" d="-1.2433203874781853E-5"/>
+                  <width sOffset="123.04101315554604" a="3.4058062029545946" b="-0.0021571820552583553" c="-4.753484047762904E-4" d="-1.4958420123321272E-5"/>
+                  <width sOffset="125.73348167394045" a="3.396260104172308" b="-0.0050422214022139734" c="5.385503312918656E-4" d="-2.4053598676958517E-5"/>
+                  <width sOffset="133.29443091850823" a="3.378526920777332" b="-0.0010236029916238939" c="-1.1794405815476447E-6" d="-2.373386058501127E-5"/>
+                  <width sOffset="143.54784868147038" a="3.342323146596441" b="-0.008533395278137379" c="-7.210498326083686E-4" d="-2.526009568740431E-5"/>
+                  <width sOffset="144.23613709128088" a="3.3360998821388534" b="-0.009561875987551281" c="-8.862796431203548E-4" d="-2.2963528538309958E-6"/>
+                  <roadMark sOffset="0.0" type="broken" weight="bold" color="standard" width="0.23447625350355766">
+                     <type name="broken" width="0.234476">
+                        <line length="3.0" space="3.0" tOffset="-0.0" sOffset="0.0" width="0.234476"/>
+                     </type>
+                  </roadMark>
+                  <roadMark sOffset="103.90895238737109" type="broken" weight="bold" color="standard" width="0.23447625350355766">
+                     <type name="broken" width="0.234476">
+                        <line length="3.0" space="3.0" tOffset="-0.0" sOffset="0.0" width="0.234476"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-3" type="driving" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="4.372011341844063" b="-0.2326562065193257" c="0.019618094501735715" d="-0.0013364039663998485"/>
+                  <width sOffset="3.034869871736867" a="3.8092654225582057" b="-0.15050606478450018" c="0.009168478230355728" d="-0.001129570178013893"/>
+                  <width sOffset="3.5606953138045583" a="3.732496294496878" b="-0.14180097924067142" c="0.014890569888785364" d="-8.220740185959662E-4"/>
+                  <width sOffset="8.902376680379062" a="3.2746234049996885" b="-0.05308971437865266" c="0.004612597638352989" d="1.4252626017571287E-4"/>
+                  <width sOffset="10.25341776296217" a="3.2116679296130854" b="-0.03984563188301107" c="0.005073253919234348" d="1.1544744071404646E-4"/>
+                  <width sOffset="10.758813382178406" a="3.1928408595093334" b="-0.03462916687631973" c="0.007135557769666082" d="2.1600377522940144E-4"/>
+                  <width sOffset="13.142438083206297" a="3.1537651137732343" b="0.0030696010147898255" c="0.00264640438454868" d="-4.075757997783322E-4"/>
+                  <width sOffset="17.56508382956358" a="3.183846229096148" b="0.002561521445479116" c="-0.0021982816518106964" d="2.152076749623207E-4"/>
+                  <width sOffset="20.50683552592434" a="3.177836551091513" b="-0.004784917051379324" c="-3.691825779771228E-4" d="2.1435686126513497E-4"/>
+                  <width sOffset="23.316983811341768" a="3.16623172624049" b="-0.0017815470656429456" c="3.03110153659757E-4" d="-6.507001643038827E-6"/>
+                  <width sOffset="30.76025328888651" a="3.167080861041228" b="0.0016492062438909823" c="1.4104213007531458E-4" d="-6.171354058151317E-6"/>
+                  <width sOffset="36.694158370794256" a="3.180543917871435" b="0.002671164576132124" c="-1.2048186388951979E-5" d="2.1141591465939876E-6"/>
+                  <width sOffset="41.01367105184868" a="3.1920276389327933" b="0.0026854191362354713" c="-7.03304105796978E-7" d="2.5271764220618156E-7"/>
+                  <width sOffset="51.267088814810855" a="3.2197608446200734" b="0.002750703164655693" c="2.7815957326861085E-6" d="5.4528282634584876E-8"/>
+                  <width sOffset="56.89742914456218" a="3.2353461507349093" b="0.002787211585385388" c="-5.3515659279611317E-5" d="9.39341130722804E-8"/>
+                  <width sOffset="61.52050657777302" a="3.2470971453001627" b="0.0022984204296113203" c="-5.855727181000661E-5" d="7.911048151303189E-7"/>
+                  <width sOffset="66.9614679474091" a="3.2579966558964077" b="0.0017314644666775042" c="1.6177311957700372E-5" d="1.0764427182917145E-6"/>
+                  <width sOffset="70.93472836344908" a="3.26519912302017" b="0.001910998565490858" c="-3.1576348040736975E-4" d="1.1317247625294288E-5"/>
+                  <width sOffset="71.77392434073519" a="3.266587137468045" b="0.0014049341915548337" c="-2.9356563357568917E-4" d="1.0263414839180097E-5"/>
+                  <width sOffset="82.02734210369736" a="3.261192838462339" b="-0.0013781102559327074" c="2.416014795246213E-5" d="1.0123501511473698E-5"/>
+                  <width sOffset="87.84183153076425" a="3.255986701134755" b="-7.037766361094652E-5" c="0.0021013906882226337" d="-4.822943826869094E-4"/>
+                  <width sOffset="91.704299616879" a="3.2592736268209714" b="-0.005422826059276306" c="1.4075591599516007E-4" d="9.98713905969844E-6"/>
+                  <width sOffset="92.28075986665954" a="3.2561962704015595" b="-0.005250589307024191" c="1.5687601623891713E-4" d="1.0026634585975058E-5"/>
+                  <width sOffset="99.45941794701977" a="3.2302976379700996" b="-0.0014481590979138273" c="-0.005152878534069615" d="4.330385451181669E-4"/>
+                  <width sOffset="99.62613597437984" a="3.229914986657171" b="-0.003130205796745913" c="-0.004316342417478899" d="-9.743261871685186E-4"/>
+                  <width sOffset="100.27937525359681" a="3.225756742253089" b="-0.010016712575705407" c="-0.005576099748555921" d="4.328353217109991E-4"/>
+                  <width sOffset="102.53417762962171" a="3.179783299564658" b="-0.028560940491391025" c="-0.002646455971984712" d="4.3279229208991274E-4"/>
+                  <width sOffset="103.90895238737109" a="3.136641160899386" b="-0.033383562615036555" c="-1.4930078083671045E-4" d="4.354890250568463E-4"/>
+                  <width sOffset="104.05167042083698" a="3.131874949411224" b="-0.03339956775029388" c="-8.821104385573574E-4" d="-1.2744935024923052E-4"/>
+                  <width sOffset="111.36215141298156" a="2.7907714750320483" b="-0.06673074841310064" c="-0.004065012511326829" d="2.0620405328336977E-4"/>
+                  <width sOffset="112.78759539258388" a="2.6879881093025744" b="-0.07706269144075717" c="-0.003177764741569635" d="2.0605554743868116E-4"/>
+                  <width sOffset="118.6399414479715" a="2.1694545803250627" b="-0.09308527006004715" c="-0.0017596086869756497" d="1.2322740233668128E-4"/>
+                  <width sOffset="123.04101315554604" a="1.7362016859256526" b="-0.10141306364228544" c="-1.1506562784215324E-4" d="1.2350544908482715E-4"/>
+                  <width sOffset="125.73348167394045" a="1.4647267209121941" b="-0.09934666851504098" c="-2.521859888181837E-4" d="1.326006271854741E-4"/>
+                  <width sOffset="125.81501140765661" a="1.4566254090387885" b="-0.09938514560023651" c="-0.0036612967308605384" d="4.860834942313037E-4"/>
+                  <width sOffset="131.5646888871948" a="0.8565483120795077" b="-0.0932796982127744" c="0.0020018105110463707" d="2.6481428311586843E-5"/>
+                  <width sOffset="133.29443091850823" a="0.7013249814788369" b="-0.08611676875746084" c="0.002151101031568103" d="3.2010121912785694E-5"/>
+                  <width sOffset="142.15763634967973" a="0.12932456344602627" b="-0.04044166723261226" c="0.0016306983336106117" d="2.6077011757990085E-4"/>
+                  <width sOffset="143.54784868147038" a="0.07695434400877721" b="-0.03439566971516619" c="0.0027274453877259536" d="2.6547475013436475E-4"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.11372405129999665">
+                     <type name="solid" width="0.113724">
+                        <line length="147.5337411318111" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.113724"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-4" type="shoulder" level="false">
+                  <link>
+                     <successor id="-3"/>
+                  </link>
+                  <width sOffset="0.0" a="0.5784617660921603" b="0.007167071831060662" c="-0.005229753121548612" d="0.0010384395114014968"/>
+                  <width sOffset="1.9474008028909124" a="0.580254919384207" b="-0.0013873388267498232" c="0.007183881997958582" d="-5.376641095969099E-4"/>
+                  <width sOffset="3.5606953138045583" a="0.5944567346335772" b="0.01759392989233116" c="-0.0029223115452528103" d="-8.451602690096456E-4"/>
+                  <width sOffset="6.021978835082899" a="0.6074557137159502" b="-0.012151075807596862" c="-0.007154064068928568" d="0.0018293816472884825"/>
+                  <width sOffset="8.902376680379062" a="0.5568188642174148" b="-0.007830730419565515" c="0.005758176645483383" d="8.647813685192835E-4"/>
+                  <width sOffset="9.954389507103485" a="0.5559604486908212" b="0.007155861973725489" c="0.006157912528663313" d="-0.0018971693090950557"/>
+                  <width sOffset="10.25341776296217" a="0.5586001537892722" b="0.010329718985881357" c="0.004573011057612373" d="-0.0018700904895759796"/>
+                  <width sOffset="13.142438083206297" a="0.581517728589529" b="-0.010073022555345396" c="-0.005601408030049973" d="-0.0012465109145704722"/>
+                  <width sOffset="13.652808928732727" a="0.574751993864246" b="-0.016764680765911522" c="-8.144137438790904E-4" d="3.7044546283274826E-4"/>
+                  <width sOffset="17.56508382956358" a="0.5188812189427274" b="-0.006127103703517548" c="0.0029704356199580723" d="-2.52338011907891E-4"/>
+                  <width sOffset="20.50683552592434" a="0.5201387343392536" b="0.004798338276995022" c="7.901423672796484E-4" d="-2.525843070357574E-4"/>
+                  <width sOffset="23.316983811341768" a="0.5342572398187277" b="0.0032552483732284365" c="-2.0442473792173322E-4" d="-3.172044412758373E-5"/>
+                  <width sOffset="29.448731995964295" a="0.539218630103437" b="-0.0028296213881264494" c="-4.020127208740653E-4" d="5.5795292990487886E-5"/>
+                  <width sOffset="30.76025328888651" a="0.5349418945005189" b="-0.0035961994162026518" c="-2.345824312289403E-4" d="2.2657006551441905E-5"/>
+                  <width sOffset="36.694158370794256" a="0.5100764097555262" b="-0.003986836003962573" c="2.119807765613131E-4" d="1.4371493346694777E-5"/>
+                  <width sOffset="38.87633026932956" a="0.5025352115181132" b="-0.0028563732867584006" c="8.354971292688041E-5" d="8.055568604040916E-6"/>
+                  <width sOffset="41.01367105184868" a="0.4968904957445819" b="-0.002388825904490564" c="1.162664751193492E-4" d="3.820519037599405E-8"/>
+                  <width sOffset="51.267088814810855" a="0.484661443774951" b="7.481408182026528E-6" c="1.1560916576011921E-4" d="3.8814450553526756E-7"/>
+                  <width sOffset="53.88031115001577" a="0.4854774080093289" b="6.196581525244068E-4" c="4.227891960660563E-5" d="-2.491433790420757E-6"/>
+                  <width sOffset="56.89742914456218" a="0.48766342801816176" b="8.067405579895903E-4" c="7.694636382128868E-5" d="-2.5308396209282983E-6"/>
+                  <width sOffset="61.52050657777302" a="0.4927875467859275" b="0.001355924825828591" c="4.5559592659583975E-5" d="-3.1102889595690346E-6"/>
+                  <width sOffset="66.9614679474091" a="0.5010128419312672" b="0.001575469244414084" c="-6.703076512518989E-5" d="-3.3956268627237833E-6"/>
+                  <width sOffset="71.77392434073519" a="0.5066638437624347" b="6.943785054992673E-4" c="-1.1219409750730245E-4" d="-2.9237068678687256E-6"/>
+                  <width sOffset="75.05567467913289" a="0.5076309673843227" b="-1.3647149213324994E-4" c="1.4214331878177977E-4" d="-1.2056044719391255E-5"/>
+                  <width sOffset="82.02734210369736" a="0.5095030740282862" b="8.755910048745957E-5" c="-1.0980154098365628E-4" d="-1.1811774421977592E-5"/>
+                  <width sOffset="87.84183153076425" a="0.5039780492948918" b="-0.002387328287217187" c="-0.002216481416218315" d="4.8060610977640245E-4"/>
+                  <width sOffset="91.704299616879" a="0.48938403030939703" b="0.002000491273486031" c="-2.754093446994041E-4" d="-1.1675411974493024E-5"/>
+                  <width sOffset="92.28075986665954" a="0.4904434771565924" b="0.0016713267511628386" c="-2.879263210456355E-4" d="-1.3620227456321285E-5"/>
+                  <width sOffset="94.43240744626539" a="0.4925709289152955" b="2.4312671115103308E-4" c="-5.987655591738905E-4" d="2.399597959923865E-8"/>
+                  <width sOffset="99.45941794701977" a="0.47866487242163025" b="-0.005775055600472709" c="0.004927284219374915" d="-4.2298791442830456E-4"/>
+                  <width sOffset="102.53417762962171" a="0.4951953010168024" b="0.012528404223553068" c="0.001024028311150065" d="-4.2294099349561776E-4"/>
+                  <width sOffset="104.05167042083698" a="0.5150872306750003" b="0.012714489654363025" c="1.7864654272723053E-5" d="1.399973812258329E-4"/>
+                  <width sOffset="106.65070675810968" a="0.5507111858617613" b="0.015644394106834807" c="-0.004682574606694425" d="4.0161403619701187E-4"/>
+                  <width sOffset="111.36215141298156" a="0.5624785616837622" b="-0.001734251487702211" c="0.0013817262211880668" d="6.796063266329E-5"/>
+                  <width sOffset="112.78759539258388" a="0.5630108372936125" b="0.002619160858796224" c="0.0016744649828938614" d="6.584298565974792E-5"/>
+                  <width sOffset="115.50734760169388" a="0.5838450494866958" b="0.01318855251327819" c="-8.69291178795333E-4" d="-1.3078677745247938E-4"/>
+                  <width sOffset="118.6399414479715" a="0.6126084848599689" b="0.00389199159660876" c="1.0117231467492724E-4" d="-4.7958632350475155E-5"/>
+                  <width sOffset="123.04101315554604" a="0.6276087752094002" b="0.0019957303904339085" c="-5.424376551318045E-4" d="-4.658412915269231E-5"/>
+                  <width sOffset="125.81501140765661" a="0.6279764446014493" b="-0.0020891157114478615" c="0.00251143288960017" d="-4.000669957457058E-4"/>
+                  <width sOffset="127.87486517300344" a="0.6308326079769255" b="0.0031648034467834513" c="-0.00463390392834916" d="1.7728643598137738E-4"/>
+                  <width sOffset="131.5646888871948" a="0.5883267023609555" b="-0.023790616165255213" c="4.9925876680610194E-5" d="6.368885019011597E-4"/>
+                  <width sOffset="133.29443091850823" a="0.5506206056935645" b="-0.017901172877267446" c="0.003338640090169201" d="6.310957491302521E-4"/>
+                  <width sOffset="133.98517277039628" a="0.5400564527787326" b="-0.012385562636055142" c="4.963598941466825E-4" d="3.695391619344439E-5"/>
+                  <width sOffset="139.52309196421416" a="0.4929650966000989" b="-0.003487991698125033" c="5.896999537748772E-4" d="2.6023093652641782E-5"/>
+                  <width sOffset="142.15763634967973" a="0.4883446872453576" b="1.6105485475393505E-4" c="0.002166916496727226" d="-2.0273690201462203E-4"/>
+                  <width sOffset="143.54784868147038" a="0.49221184261384376" b="0.005010519977545584" c="0.0013163635583529113" d="-2.0735254617530545E-4"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+         <laneSection s="147.5337411318111">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="1"/>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.5640298819368725" b="-9.391966258098499E-4" c="1.3177973934487785E-5" d="-1.913432931339751E-5"/>
+                  <width sOffset="1.865931048182631" a="0.562198979258155" b="-0.0010898781515220192" c="1.0928556430064928E-5" d="1.196233863519705E-6"/>
+                  <width sOffset="6.267525312621473" a="0.5577155188309151" b="-9.241443892200516E-4" c="3.0409262019317074E-5" d="2.2690047291578284E-6"/>
+                  <width sOffset="12.606634425546133" a="0.5536572314294528" b="-2.650739994586918E-4" c="-3.469215632704312E-5" d="2.4953754135684E-6"/>
+                  <width sOffset="14.836159066709456" a="0.5529214502748143" b="-3.825561466961544E-4" c="1.4787245971878666E-5" d="4.289049044263933E-6"/>
+                  <width sOffset="16.52094307558363" a="0.55233941067661" b="-2.9620615504867337E-4" c="3.834982657832753E-5" d="4.067309166656016E-6"/>
+                  <width sOffset="24.31238101905788" a="0.5542834232495784" b="0.0010421308083636712" c="6.844882193234879E-4" d="-7.085147628798098E-5"/>
+                  <width sOffset="26.77436083854579" a="0.5599407371888221" b="0.0031241575273561976" c="1.654315565138271E-4" d="-6.718754908372749E-5"/>
+                  <width sOffset="32.95320943698232" a="0.5697109574872843" b="-0.002526782403327972" c="-1.3776868632319996E-4" d="1.2464111258718011E-5"/>
+                  <width sOffset="37.027778601507976" a="0.5579713094217542" b="-0.0030286867021282375" c="8.183165906845031E-6" d="1.1219723056762378E-5"/>
+                  <width sOffset="40.25042997546058" a="0.5486714047072594" b="-0.002626377028973936" c="1.7503287010188983E-4" d="-2.865702454167441E-6"/>
+                  <width sOffset="42.25245090489565" a="0.5440918948517814" b="-0.001959996051558825" c="1.8069421867862703E-4" d="-3.1589375333498907E-6"/>
+                  <width sOffset="47.281196364470134" a="0.5384033029616053" b="-3.823178870964012E-4" c="1.3288797558354599E-4" d="-3.127984540385885E-6"/>
+                  <width sOffset="57.53461412743232" a="0.5450822251873682" b="0.0013562347559834508" c="3.5598942754047416E-5" d="-3.08362622584606E-6"/>
+                  <width sOffset="67.78803189039448" a="0.5594068241983354" b="0.001113687715952574" c="-5.971480001127109E-5" d="-3.5965928752887325E-6"/>
+                  <width sOffset="69.67945454433536" a="0.5612753134520774" b="8.491956513951458E-4" c="-1.023082480284239E-4" d="-9.016340641023119E-7"/>
+                  <width sOffset="72.3527145837077" a="0.5627970820616666" b="2.82872454516918E-4" c="3.604688917103551E-5" d="-3.5115639965201344E-6"/>
+                  <width sOffset="78.04144965335666" a="0.5649263383541356" b="3.52074247411978E-4" c="-2.5105954725217725E-5" d="-3.5859275174605636E-6"/>
+                  <width sOffset="85.19848971975483" a="0.5648455150486504" b="-5.583426897519516E-4" c="-1.7461465324532894E-4" d="2.345375189611781E-5"/>
+                  <width sOffset="88.29486741631882" a="0.562138811917881" b="-9.650961278485854E-4" c="3.0062430505761076E-5" d="2.3809962286335073E-5"/>
+                  <width sOffset="91.58953984617227" a="0.560136981117378" b="8.357474327780681E-6" c="2.4012857167192038E-4" d="-7.633171897699174E-6"/>
+                  <width sOffset="96.11720364673428" a="0.5643889141785281" b="0.0017133662510298228" c="2.0648486610013285E-4" d="-1.4911745896057222E-5"/>
+                  <width sOffset="98.54828517928098" a="0.5695603522162056" b="0.0024529370436176022" c="1.0237246812558075E-4" d="-1.3468022872731265E-5"/>
+                  <width sOffset="104.90642283758146" a="0.5858332307975722" b="0.0021213621104625023" c="7.586698236891813E-5" d="-1.2768325607502653E-5"/>
+                  <width sOffset="108.80170294224314" a="0.5944930181221992" b="0.0021311990584571903" c="-6.1003970352429605E-5" d="-9.929599938205759E-6"/>
+                  <width sOffset="118.33111672866659" a="0.600669628897506" b="-0.0017365778759341707" c="-5.298115068867586E-4" d="3.9163690784437245E-5"/>
+                  <width sOffset="119.05512070520535" a="0.5991494850822976" b="-0.002442162474678834" c="-4.4855816494621543E-4" d="3.7568090782436124E-5"/>
+                  <width sOffset="120.9210637696574" a="0.5932748544031261" b="-0.0037237230985527016" c="-2.660814933331731E-4" d="5.0147374241620596E-5"/>
+                  <width sOffset="124.71898937813751" a="0.5780415908576706" b="-0.003574825410547211" c="1.776770530708944E-4" d="-1.872255176564172E-6"/>
+                  <width sOffset="129.3085384681675" a="0.5651963380863516" b="-0.002062221625285285" c="1.512298584051886E-4" d="-2.0396134039817327E-6"/>
+                  <width sOffset="137.73033583726783" a="0.5573366334515257" b="5.104385584475766E-5" c="6.69833665152975E-5" d="-1.091995959017113E-5"/>
+                  <width sOffset="139.56195623112967" a="0.5575877436846666" b="1.865161250325818E-4" c="-6.314590633834099E-6" d="-1.3873785354225331E-5"/>
+                  <width sOffset="139.82521531966165" a="0.5576361549839821" b="1.8030679573022203E-4" c="1.5091320031403632E-4" d="-5.065030323460986E-6"/>
+                  <width sOffset="149.81537399409183" a="0.5694489883606608" b="0.001679080658174539" c="-1.950080977046375E-6" d="-5.0462019755520064E-6"/>
+                  <width sOffset="160.06879175705404" a="0.5810206414071044" b="4.7530032895202676E-5" c="-1.5620879257725374E-4" d="-6.159263819861839E-6"/>
+                  <width sOffset="162.03525293979334" a="0.5804632161675962" b="-6.382800786576045E-4" c="-2.594319661784238E-4" d="1.466846116806481E-5"/>
+                  <width sOffset="162.52824004889993" a="0.5800872584177736" b="-8.833784035489718E-4" c="-2.256246627364462E-4" d="1.241475385522363E-5"/>
+                  <width sOffset="169.8944245181383" a="0.5662996882113251" b="-0.0021864654550158577" c="-3.0112685950980423E-7" d="1.694756498178967E-5"/>
+                  <width sOffset="170.3222095200162" a="0.5653656227106696" b="-0.0021774188765482485" c="3.8690087425048345E-5" d="1.631511555570643E-5"/>
+                  <width sOffset="175.75805562903088" a="0.5572932847999263" b="-3.1053435084430923E-4" c="3.3906715523264854E-4" d="-1.252904802565796E-5"/>
+                  <width sOffset="180.57562728297836" a="0.5622657863374654" b="0.002084066380197659" c="1.6075067147519988E-4" d="-1.1944334657965149E-5"/>
+                  <width sOffset="184.02760904218428" a="0.5708841557025957" b="0.002766890695634204" c="2.9625118232385188E-6" d="-1.639064487268013E-5"/>
+                  <width sOffset="189.2820267941393" a="0.5831265770425254" b="0.0014404399286797429" c="-2.7240781494661774E-4" d="5.56832390606664E-6"/>
+                  <width sOffset="190.82904504594052" a="0.5847236359888339" b="6.375796373784392E-4" c="-2.47107932417536E-4" d="5.476243550660589E-6"/>
+                  <width sOffset="198.7318627419084" a="0.5770321941665664" b="-0.0022420696339872136" c="-2.0932497189905564E-4" d="2.116524688619304E-5"/>
+                  <width sOffset="201.08246280890268" a="0.5708802879384893" b="-0.002875313891293643" c="-6.358710321043533E-5" d="1.985806153071283E-5"/>
+                  <width sOffset="206.13944346533447" a="0.557281857720334" b="-0.001994937591736904" c="2.764313326181541E-4" d="-3.5460517681345742E-6"/>
+                  <width sOffset="211.3358805718649" a="0.5538821747620446" b="5.907168094242531E-4" c="2.211113890881038E-4" d="-3.583364320773739E-6"/>
+                  <width sOffset="220.04434604004308" a="0.5734283671072369" b="0.003626539816182982" c="9.78812514827797E-4" d="-7.668517333776047E-5"/>
+                  <width sOffset="221.58929833482705" a="0.5810847186113537" b="0.006101862732175076" c="6.218015310291859E-4" d="-8.347858988485825E-5"/>
+                  <width sOffset="224.31272638710658" a="0.6006283888881288" b="0.0076312289784704265" c="2.0813611959091702E-4" d="-9.785354100262357E-5"/>
+                  <width sOffset="228.33377986165925" a="0.6283172592080377" b="0.004558538054825721" c="-5.94491841806347E-4" d="-2.130082664268346E-6"/>
+                  <width sOffset="231.8427160977892" a="0.6369010897848328" b="3.077893416628683E-4" c="-6.22430475263482E-4" d="-4.171893794241017E-6"/>
+                  <roadMark sOffset="0.0" type="curb" weight="standard" color="standard" width="0.12">
+                     <type name="curb" width="0.12">
+                        <line length="242.09613386075137" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.0"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.12100879759058412">
+                     <type name="solid" width="0.121009">
+                        <line length="242.09613386075137" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.121009"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                     <successor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="3.1723343449505217" b="0.001034671222798838" c="-0.001703905879852722" d="5.623880902193169E-4"/>
+                  <width sOffset="2.573003820405006" a="3.1732959282565862" b="0.0034359742639997392" c="0.0011695503646214427" d="-4.5239476691319E-6"/>
+                  <width sOffset="5.65659200756167" a="3.1948791026697614" b="-9.379361873373135E-5" c="3.683848823527698E-6" d="-5.407384108259763E-6"/>
+                  <width sOffset="6.267525312621473" a="3.1948219429664277" b="-9.534719493357663E-5" c="4.6617029412304905E-6" d="-4.353450304160175E-6"/>
+                  <width sOffset="12.606634425546133" a="3.1932958878776843" b="-5.610662236669776E-4" c="3.0122537467389663E-5" d="-4.579820988392134E-6"/>
+                  <width sOffset="14.952710023098518" a="3.192086241605285" b="-4.953496991598355E-4" c="-6.584391261900389E-5" d="1.1755803898121878E-6"/>
+                  <width sOffset="16.52094307558363" a="3.191152018312349" b="-6.931933911068708E-4" c="-6.671789288065734E-5" d="1.7757991339662242E-6"/>
+                  <width sOffset="24.31238101905788" a="3.1825407718615963" b="-0.0014094423570800143" c="-5.762776384611714E-4" d="7.669458458845259E-5"/>
+                  <width sOffset="26.032244976599543" a="3.178802296476566" b="-0.0027111085315240915" c="-1.0008543267303984E-4" d="5.937954907589311E-5"/>
+                  <width sOffset="26.77436083854579" a="3.176759488194504" b="-0.002761551148232331" c="2.7226114840202384E-5" d="5.497397516321311E-5"/>
+                  <width sOffset="32.95320943698232" a="3.1737039280808093" b="0.0038713182432767485" c="1.0402888537538037E-4" d="-2.467768517924602E-5"/>
+                  <width sOffset="37.027778601507976" a="3.189535623347737" b="0.0034899588017546623" c="-1.8657875080882257E-4" d="-2.2740997702199376E-5"/>
+                  <width sOffset="38.29078140736311" a="3.193600008586821" b="0.002909832142958773" c="-3.2536963299453834E-4" d="4.014820627809981E-6"/>
+                  <width sOffset="40.25042997546058" a="3.198082978668944" b="0.001680865285810037" c="-3.6014465693251496E-4" d="1.8100246138564537E-5"/>
+                  <width sOffset="47.281196364470134" a="3.1983888018176954" b="-6.991441036360269E-4" c="2.075351062586525E-5" d="1.8166510221655404E-5"/>
+                  <width sOffset="50.82711434100682" a="3.196980587945089" b="1.3328810712248326E-4" c="2.5216079545567374E-4" d="-1.7279480339696588E-5"/>
+                  <width sOffset="57.53461412743232" a="3.204004971526339" b="0.001183784922390756" c="-9.997975835416771E-5" d="-1.7263697177487237E-5"/>
+                  <width sOffset="62.524497092306405" a="3.2052776412124677" b="-0.001103532530131698" c="-2.838485181527083E-4" d="1.4131737250356598E-5"/>
+                  <width sOffset="67.78803189039448" a="3.1936659563253076" b="-0.002917074833571769" c="-6.368250622432646E-5" d="1.3767784637952473E-5"/>
+                  <width sOffset="72.3527145837077" a="3.1803329966034304" b="-0.002637845468237248" c="-2.0731845578352877E-5" d="1.6377714570394137E-5"/>
+                  <width sOffset="76.75863378275196" a="3.169709170716458" b="-0.0018667524635011638" c="1.3934212709186685E-4" d="1.1027627903237425E-6"/>
+                  <width sOffset="78.04144965335666" a="3.167546102698994" b="-0.0015038077052268164" c="1.4651508269111557E-4" d="-5.7745013931361866E-8"/>
+                  <width sOffset="85.19848971975483" a="3.1642670956761343" b="5.845472719845334E-4" c="2.1779005032331045E-4" d="-2.709742442754953E-5"/>
+                  <width sOffset="88.29486741631882" a="3.167360715997652" b="0.0011538736525466345" c="-1.237461698308699E-5" d="-2.784886103826051E-5"/>
+                  <width sOffset="91.58953984617227" a="3.1700320616957316" b="1.6544603417674789E-4" c="-2.623613032440372E-4" d="3.5942731457803265E-6"/>
+                  <width sOffset="98.11525895077838" a="3.160937898007274" b="-0.0027995598318430103" c="-3.1382040639440915E-4" d="2.953689400265778E-5"/>
+                  <width sOffset="98.54828517928098" a="3.159669168491027" b="-0.003054729224945032" c="-2.783250586169743E-4" d="3.093000557495921E-5"/>
+                  <width sOffset="104.90642283758146" a="3.1369452830444757" b="-0.0028428660169336523" c="8.12574965624193E-5" d="3.0230308309766016E-5"/>
+                  <width sOffset="108.80170294224314" a="3.1288911893006475" b="-8.337524120278208E-4" c="4.0825262532658593E-4" d="2.739548134305268E-5"/>
+                  <width sOffset="109.12486031433218" a="3.1286653146946697" b="-5.613099341064956E-4" c="3.6600443713054933E-4" d="-3.407682505606332E-5"/>
+                  <width sOffset="113.06890526920279" a="3.130054195483557" b="7.355207772136189E-4" c="1.478254186534174E-4" d="3.936589933444318E-6"/>
+                  <width sOffset="118.33111672866659" a="3.1385916967453857" b="0.0026183207949959483" c="3.949086615310195E-4" d="-4.515670078901154E-5"/>
+                  <width sOffset="119.05512070520535" a="3.1406772379243426" b="0.003119140721210837" c="2.977282322796187E-4" d="-4.495406069771423E-5"/>
+                  <width sOffset="122.46691354461939" a="3.152999431528035" b="0.0035808744679694344" c="-1.0008690985191294E-4" d="-4.599823498992956E-5"/>
+                  <width sOffset="124.71898937813751" a="3.160030806873565" b="0.00243018001441969" c="-2.832520059811961E-4" d="6.021394428146294E-6"/>
+                  <width sOffset="129.3085384681675" a="3.1657999409635527" b="2.106852913063605E-4" c="-1.9904079392011882E-4" d="6.3543187204402365E-6"/>
+                  <width sOffset="134.18245549794386" a="3.1628342806165985" b="-0.0012766895340153173" c="-1.2171579809257187E-4" d="1.452029100003711E-5"/>
+                  <width sOffset="139.56195623112967" a="3.1547044743638315" b="-0.0013256206546927965" c="1.1351671241490206E-4" d="1.4484783589125246E-5"/>
+                  <width sOffset="139.82521531966165" a="3.1543636242724418" b="-0.0012628404233181387" c="-4.322852604341502E-5" d="5.676028493399811E-6"/>
+                  <width sOffset="145.9531687973231" a="3.1463078310033694" b="-0.0011532097205838292" c="-5.395924664656991E-5" d="5.799880402265073E-6"/>
+                  <width sOffset="149.81537399409183" a="3.1413831457504786" b="-0.0013104690939071358" c="7.362901440003201E-6" d="5.952070246826052E-6"/>
+                  <width sOffset="158.05429873884486" a="3.1344148207025757" b="2.293314710382667E-5" c="1.9625445304859103E-4" d="-7.705500365235751E-6"/>
+                  <width sOffset="160.06879175705404" a="3.135194461830719" b="7.198286265873328E-4" c="1.5408333426913067E-4" d="-9.845317588085186E-6"/>
+                  <width sOffset="162.52824004889993" a="3.137750407602169" b="0.0012990890049011262" c="6.932796905740963E-5" d="-7.591610275076161E-6"/>
+                  <width sOffset="169.8944245181383" a="3.1480471970820494" b="0.001084676560313553" c="-4.941107081653618E-5" d="-1.2124421418501963E-5"/>
+                  <width sOffset="170.0642489327031" a="3.148229917229321" b="0.0010668451309552972" c="-1.6964025327702238E-7" d="3.0463833414096994E-8"/>
+                  <width sOffset="180.57562728297836" a="3.1594605671140066" b="0.0010733765874919319" c="3.6811422552337234E-6" d="2.7875181572022407E-7"/>
+                  <width sOffset="182.28162410554847" a="3.161303841902566" b="0.0010883704803661687" c="-1.868678955389296E-6" d="-6.519431566353422E-6"/>
+                  <width sOffset="184.02760904218428" a="3.1631637236288346" b="0.0010222223642139452" c="-1.9238833297748262E-6" d="-2.073121351559607E-6"/>
+                  <width sOffset="190.82904504594052" a="3.1693750369278746" b="7.083471567984065E-4" c="-4.238899652798162E-5" d="-2.2520536527355486E-6"/>
+                  <width sOffset="194.69954084541894" a="3.1713510926207853" b="2.79002015385014E-4" c="-8.454993059603896E-5" d="5.504114878794716E-6"/>
+                  <width sOffset="198.7318627419084" a="3.1714622407293973" b="-1.3437861052875526E-4" c="7.408346104417358E-5" d="-1.0184888456758504E-5"/>
+                  <width sOffset="201.08246280890268" a="3.171423425748139" b="4.50782421713555E-5" c="7.759005655856588E-6" d="-8.784071025122448E-6"/>
+                  <width sOffset="206.13944346533447" a="3.170713829548066" b="-5.503540259161489E-4" c="-1.6425656284199195E-4" d="1.462004226364531E-5"/>
+                  <width sOffset="206.2600048496161" a="3.17064511624759" b="-5.893225140823355E-4" c="-2.7138776676234E-4" d="1.4961969239724909E-5"/>
+                  <width sOffset="211.3358805718649" a="3.1626183029216213" b="-0.002187920053889054" c="-4.2319985759647696E-5" d="1.4953508725300012E-5"/>
+                  <width sOffset="217.86368396197338" a="3.1506921729772928" b="-8.288266662876765E-4" c="9.0571419071354E-4" d="-5.120678210729094E-5"/>
+                  <width sOffset="220.04434604004308" a="3.152660715453399" b="0.002390777661262604" c="-2.80597812012855E-4" d="2.1895026909642042E-5"/>
+                  <width sOffset="221.58929833482705" a="3.155765340621601" b="0.0016805394414975295" c="-1.6296677576528118E-4" d="2.5419818461359716E-5"/>
+                  <width sOffset="228.33377986165925" a="3.167485297154543" b="0.002951179099795224" c="-2.6431289421719817E-5" d="-7.030363987700744E-5"/>
+                  <width sOffset="229.53369406468602" a="3.1708669446236164" b="0.002584080244055577" c="-6.392499143744409E-4" d="1.8543397984040507E-5"/>
+                  <width sOffset="231.8427160977892" a="3.1736537120155597" b="-7.140704742564143E-5" c="-4.928664013495129E-4" d="2.1122348874064253E-5"/>
+                  <roadMark sOffset="0.0" type="solid broken" weight="bold" color="standard" width="0.31">
+                     <type name="solid broken" width="0.1">
+                        <line length="4.0" space="8.0" tOffset="-0.0" sOffset="0.0" width="0.1"/>
+                     </type>
+                  </roadMark>
+                  <roadMark sOffset="5.65659200756167" type="broken" weight="standard" color="standard" width="0.13">
+                     <type name="broken" width="0.13">
+                        <line length="6.0" space="6.0" tOffset="-0.0" sOffset="0.0" width="0.13"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+                  <speed sOffset="202.08652532101866" max="60.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="driving" level="false">
+                  <link>
+                     <predecessor id="-2"/>
+                     <successor id="2"/>
+                  </link>
+                  <width sOffset="0.0" a="3.294848681466888" b="-0.015481987600246548" c="-0.003982260434322924" d="0.017242403954447837"/>
+                  <width sOffset="0.5136669487660015" a="3.288182275594424" b="-0.005924680720510715" c="0.0010964409319658471" d="-5.685272311627554E-4"/>
+                  <width sOffset="2.573003820405006" a="3.275666061385058" b="-0.008641945666742165" c="-9.483024674474456E-4" d="-1.6151932742763409E-6"/>
+                  <width sOffset="5.65659200756167" a="3.239953552497283" b="-0.0039228253413392394" c="1.607723008673288E-4" d="-7.317568317719653E-7"/>
+                  <width sOffset="6.267525312621473" a="3.237616807561591" b="-0.0037272023967454045" c="1.6618033807262562E-4" d="-7.895015438748232E-8"/>
+                  <width sOffset="10.562658749823527" a="3.2246674434525735" b="-0.0023040384013263793" c="0.0025344902082761055" d="-2.896810061235317E-4"/>
+                  <width sOffset="14.952710023098518" a="3.2388895055239875" b="0.0032003703487151537" c="-0.001216920569752844" d="-2.95436407501337E-4"/>
+                  <width sOffset="15.677247182861493" a="3.2404570964609962" b="9.716903456163327E-4" c="-9.107776159491705E-5" d="-2.8897749535387535E-6"/>
+                  <width sOffset="16.52094307558363" a="3.241210340902165" b="8.11835456119877E-4" c="-9.963324689020178E-5" d="-2.778994265490792E-6"/>
+                  <width sOffset="26.032244976599543" a="3.2375274908813516" b="-0.0018376523386040206" c="-2.5940825768425906E-4" d="1.4536041248910935E-5"/>
+                  <width sOffset="26.77436083854579" a="3.2360268155019987" b="-0.002198657742525839" c="-2.2687253290774216E-4" d="1.4192575553841947E-5"/>
+                  <width sOffset="37.027778601507976" a="3.204930510794929" b="-0.002374789383650733" c="2.1494622813355234E-4" d="1.382204426556688E-5"/>
+                  <width sOffset="38.29078140736311" a="3.2023018696600114" b="-0.0017656882216880601" c="3.1994312067183347E-4" d="-1.2933774064480827E-5"/>
+                  <width sOffset="42.311008348017396" a="3.199534012436478" b="1.796839985393657E-4" c="-2.2596669295780024E-5" d="-7.211212758413551E-6"/>
+                  <width sOffset="47.281196364470134" a="3.198983501395837" b="-5.793461585395729E-4" c="-1.3100998595364045E-4" d="-7.0601756052673745E-6"/>
+                  <width sOffset="50.82711434100682" a="3.1949671529244665" b="-0.0017747615674698633" c="-2.4427081607435565E-4" d="2.8385814956080538E-5"/>
+                  <width sOffset="56.032570593189064" a="3.183113607671127" b="-0.0020103515554148773" c="2.2113548821112812E-4" d="1.4762030153026592E-6"/>
+                  <width sOffset="57.53461412743232" a="3.1805978861569946" b="-0.0013360497560058106" c="2.0449670340545823E-4" d="-1.9004449405048592E-6"/>
+                  <width sOffset="62.417418312051325" a="3.178728541778027" b="5.250550105149587E-4" c="2.695486502830145E-4" d="2.225599970868801E-5"/>
+                  <width sOffset="62.524497092306405" a="3.1787878819614255" b="5.835464447732841E-4" c="2.021353606000451E-4" d="-9.139434791297297E-6"/>
+                  <width sOffset="67.78803189039448" a="3.1861267587847384" b="0.0019518208538303263" c="5.01536777295857E-5" d="-1.0283142414468894E-5"/>
+                  <width sOffset="76.75863378275196" a="3.200248527837423" b="3.691324043259719E-4" c="-1.701815641616441E-4" d="4.991809365601703E-6"/>
+                  <width sOffset="78.04144965335666" a="3.2004525409687865" b="-4.284700601777129E-5" c="-1.459418303080145E-4" d="6.1634059368602616E-6"/>
+                  <width sOffset="88.29486741631882" a="3.1913139279051057" b="-0.001091727890563549" c="5.0176590539971336E-5" d="5.907414517860976E-6"/>
+                  <width sOffset="96.25730858948145" a="3.1887845240084243" b="8.309269710830261E-4" c="2.4516630275163177E-4" d="-3.1382845103036766E-6"/>
+                  <width sOffset="98.11525895077838" a="3.1911545264144094" b="0.0017094407308252107" c="3.4949872618516756E-4" d="-2.9080905369810077E-5"/>
+                  <width sOffset="98.54828517928098" a="3.1919579328957757" b="0.0019957659300776304" c="3.12837851472214E-4" d="-2.7285056102298446E-5"/>
+                  <width sOffset="109.06428800932315" a="3.2158104970710553" b="-4.7668807651851577E-4" c="-5.716424965297836E-4" d="-8.453825480850044E-6"/>
+                  <width sOffset="109.12486031433218" a="3.2157795237380293" b="-5.460325351948161E-4" c="-5.043713562110186E-4" d="5.301848046524828E-5"/>
+                  <width sOffset="113.06890526920279" a="3.2090329691591695" b="-0.002050373716414272" c="-6.207211637336929E-5" d="1.5005065475738036E-5"/>
+                  <width sOffset="117.31027276032944" a="3.2003648216258425" b="-0.001767127739091171" c="6.888032375449739E-5" d="3.94730900498647E-6"/>
+                  <width sOffset="119.05512070520535" a="3.197512126993314" b="-0.0014907036765006462" c="8.153449362145732E-5" d="6.812825075388012E-7"/>
+                  <width sOffset="122.46691354461939" a="3.1934023000303657" b="-9.105550130870605E-4" c="2.6200992921670055E-5" d="1.7254567998839658E-6"/>
+                  <width sOffset="129.3085384681675" a="3.188951598916207" b="-3.097456067597546E-4" c="6.194181176071001E-5" d="1.849176070509213E-6"/>
+                  <width sOffset="134.18245549794386" a="3.1891274544547317" b="4.258348011634697E-4" c="1.0456627482903274E-4" d="-6.316796209086083E-6"/>
+                  <width sOffset="139.56195623112967" a="3.1934608962617252" b="0.0010024576756656211" c="-1.8900925545228673E-6" d="-6.119429352786765E-6"/>
+                  <width sOffset="145.9531687973231" a="3.198193037616739" b="2.2840573730147778E-4" c="-4.143777647570054E-6" d="-6.243281261655912E-6"/>
+                  <width sOffset="149.67826829572107" a="3.198663650653546" b="-6.236840336642938E-5" c="-8.325092786151436E-5" d="-1.5766504735750357E-6"/>
+                  <width sOffset="149.81537399409183" a="3.1986535305778756" b="-8.528567007136953E-5" c="-8.57340896376609E-5" d="-1.7484527646314004E-6"/>
+                  <width sOffset="158.05429873884486" a="3.191153413711035" b="-0.00185405339176869" c="-1.7072577697142146E-4" d="1.1909117847458516E-5"/>
+                  <width sOffset="160.06879175705404" a="3.1868229589789947" b="-0.0023969170558882182" c="-9.75117874408147E-5" d="1.1093780947486178E-5"/>
+                  <width sOffset="168.0171170585889" a="3.1671817478560635" b="-0.0018444499119733742" c="1.4956039806715777E-4" d="1.833740376290998E-6"/>
+                  <width sOffset="170.0642489327031" a="3.1640484174136603" b="-0.0012090559595468228" c="1.054036242915741E-4" d="-1.032114488002146E-5"/>
+                  <width sOffset="170.3222095200162" a="3.1637433654025795" b="-0.0011567364182857587" c="1.1901278215042606E-4" d="-5.199267753044053E-6"/>
+                  <width sOffset="180.35289556673195" a="3.1588676581999118" b="-3.385444234076428E-4" c="2.260905386185123E-5" d="-4.960792418209947E-6"/>
+                  <width sOffset="180.57562728297836" a="3.1587933204267253" b="-3.2921122273506936E-4" c="1.9539941359826174E-5" d="-4.935054447647602E-6"/>
+                  <width sOffset="182.28162410554847" a="3.1582640532494546" b="-3.0563038685977196E-4" c="1.2588500858918232E-6" d="1.8631289343491687E-6"/>
+                  <width sOffset="190.82904504594052" a="3.1569071225027145" b="1.242411395723196E-4" c="5.0514975817018645E-5" d="1.733895879356813E-6"/>
+                  <width sOffset="194.69954084541894" a="3.158245285196885" b="5.932022612723251E-4" c="8.665932742901568E-5" d="-6.0222726521760594E-6"/>
+                  <width sOffset="201.08246280890268" a="3.16399619833382" b="9.634089631347844E-4" c="-2.6880346754681656E-5" d="-5.9314946388258945E-6"/>
+                  <width sOffset="206.2600048496161" a="3.167440452593164" b="2.0804502149719337E-4" c="-6.592993802348646E-6" d="-6.2734216048209595E-6"/>
+                  <width sOffset="211.3358805718649" a="3.1675061757597556" b="-3.4378039569950714E-4" c="-1.0018272502230695E-4" d="-6.696467310871072E-6"/>
+                  <width sOffset="213.93987284874743" a="3.1658134175582275" b="-0.0010017522101891116" c="4.201266449145687E-5" d="-1.1842935547496073E-5"/>
+                  <width sOffset="217.86368396197338" a="3.1618141132461615" b="-0.0012190646307161544" c="-7.525891434722016E-4" d="5.431735528516522E-5"/>
+                  <width sOffset="221.58929833482705" a="3.149635133240787" b="-0.0045649708256946" c="-1.39770985714693E-4" d="5.4144044540431804E-5"/>
+                  <width sOffset="229.53369406468602" a="3.131695489397786" b="0.0034658851714617096" c="0.001510397779932406" d="-3.470299332063732E-5"/>
+                  <width sOffset="231.8427160977892" a="3.147323885772278" b="0.00988590303507092" c="0.0012828942885662682" d="-3.5774557233574245E-5"/>
+                  <width sOffset="236.30274933630687" a="3.213760676541412" b="0.019194534003835122" c="-0.009641329967557061" d="7.822544058437237E-4"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.11372405129999665">
+                     <type name="solid" width="0.113724">
+                        <line length="242.09613386075137" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.113724"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+                  <speed sOffset="202.08254115521015" max="60.0" unit="km/h"/>
+               </lane>
+               <lane id="-3" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="-4"/>
+                     <successor id="3"/>
+                  </link>
+                  <width sOffset="0.0" a="0.51996610372708" b="0.0056214467678786795" c="0.006125245801292632" d="-0.01781097667007686"/>
+                  <width sOffset="0.5136669487660015" a="0.5220558500352985" b="-0.002184358705096058" c="1.7037339903747462E-4" d="-4.5484466260013606E-8"/>
+                  <width sOffset="6.267525312621473" a="0.515119227699727" b="-2.2826743816351555E-4" c="1.7121649540247666E-4" d="-2.2310588542590907E-7"/>
+                  <width sOffset="8.756294303120512" a="0.5156081935421604" b="6.198234364648631E-4" c="-1.0427311191137637E-5" d="-3.8085341010095346E-6"/>
+                  <width sOffset="10.562658749823527" a="0.5166713489296995" b="5.448711902823921E-4" c="-0.0024003932875205814" d="2.857935218682341E-4"/>
+                  <width sOffset="15.677247182861493" a="0.49490327403253476" b="-0.0015809453572697002" c="2.1674866113108803E-4" d="-6.7531106814032545E-6"/>
+                  <width sOffset="16.52094307558363" a="0.493719667896809" b="-0.0012296265006091379" c="1.9492409960145758E-4" d="-6.367198711831817E-6"/>
+                  <width sOffset="25.24747213791636" a="0.49360192461627195" b="7.177644792425515E-4" c="1.1171342859200533E-4" d="2.5605350397720028E-8"/>
+                  <width sOffset="26.77436083854579" a="0.49495840970874205" b="0.001059091510995344" c="1.0512152347663705E-4" d="-4.2025353192584966E-6"/>
+                  <width sOffset="37.027778601507976" a="0.5123392144383394" b="0.0018893312138778295" c="-2.3891486646999464E-5" d="-4.107651532702243E-6"/>
+                  <width sOffset="42.311008348017396" a="0.5210483656591021" b="0.0012929181137750613" c="9.755318220797029E-5" d="-9.83021283877522E-6"/>
+                  <width sOffset="47.281196364470134" a="0.5286773174585235" b="0.001534132999588683" c="-4.917173722055807E-5" d="-9.496458009945991E-6"/>
+                  <width sOffset="49.01070965474119" a="0.5311344090883212" b="0.0012788287758009665" c="-4.2515192441878075E-5" d="-9.546059786901996E-6"/>
+                  <width sOffset="56.032570593189064" a="0.534712819033917" b="-7.302920419419933E-4" c="-2.657314559198108E-4" d="1.736355215377165E-5"/>
+                  <width sOffset="57.53461412743232" a="0.5330752044400042" b="-0.0014110489306682775" c="-1.736025814535356E-4" d="2.1224486434021778E-5"/>
+                  <width sOffset="62.417418312051325" a="0.5245171776294746" b="-0.00158829535429604" c="4.4412003668506573E-5" d="-2.931958143028269E-6"/>
+                  <width sOffset="67.78803189039448" a="0.5168138726820048" b="-0.0013649596523741844" c="-2.537553543080655E-7" d="-3.1916525891242717E-6"/>
+                  <width sOffset="68.85534816047561" a="0.5153528594026997" b="-0.0013764087741978352" c="-7.329801878339703E-5" d="2.3503466970318362E-6"/>
+                  <width sOffset="78.04144965335666" a="0.49834571959014484" b="-0.0021280566387201056" c="-7.882075322146276E-6" d="2.3635801737121752E-6"/>
+                  <width sOffset="88.29486741631882" a="0.47824506728228533" b="-0.0015442252454833361" c="6.814014335922551E-5" d="1.866154997366386E-6"/>
+                  <width sOffset="93.79538965192177" a="0.4721232227637713" b="-6.252267696805094E-4" c="1.0335418457412074E-4" d="-4.248053301635141E-6"/>
+                  <width sOffset="96.25730858948145" a="0.47114701088141864" b="-1.9357044594692664E-4" c="1.810170550106925E-5" d="4.797645726598194E-6"/>
+                  <width sOffset="98.54828517928098" a="0.47085624227457057" b="-3.5086886819045426E-5" c="5.020191230971689E-5" d="4.064364729272126E-6"/>
+                  <width sOffset="108.80170294224314" a="0.480155594132575" b="0.0022762868712065546" c="1.6505922951469312E-4" d="4.075736133358608E-6"/>
+                  <width sOffset="109.06428800932315" a="0.48076476785181876" b="0.0023638141261506356" c="1.919610782838688E-4" d="-1.4755493987331682E-5"/>
+                  <width sOffset="117.31027276032944" a="0.5050360305234993" b="0.0025196749581974562" c="-1.130861063499219E-4" d="-3.6977375166399397E-6"/>
+                  <width sOffset="119.05512070520535" a="0.5090685471379222" b="0.002091265614738907" c="-1.2871810091505823E-4" d="-1.1833458195980466E-6"/>
+                  <width sOffset="124.5670546161382" a="0.5164866633883416" b="5.644391211117351E-4" c="4.624748043023343E-5" d="-1.8282003079936502E-6"/>
+                  <width sOffset="129.3085384681675" a="0.5200077832178831" b="8.796995012028946E-4" c="2.128393238904827E-5" d="-1.6003465048483557E-6"/>
+                  <width sOffset="139.56195623112967" a="0.5295402216714122" b="8.114199512632824E-4" c="-2.858513392414159E-5" d="-1.575651502900023E-6"/>
+                  <width sOffset="149.67826829572107" a="0.5331921294367512" b="-2.506877553257107E-4" c="-6.706786226893402E-5" d="-6.242282670710645E-6"/>
+                  <width sOffset="149.81537399409183" a="0.5331564818888612" b="-2.6943055428357886E-4" c="-7.807368616353586E-5" d="-6.094988300366788E-6"/>
+                  <width sOffset="158.4202634409167" a="0.5211737942705574" b="-0.0029669556096417996" c="-2.0804474926437594E-4" d="1.2055908934841573E-5"/>
+                  <width sOffset="160.06879175705404" a="0.515771303903382" b="-0.0035545998660709423" c="-1.5154974442578483E-4" d="9.59994656534156E-6"/>
+                  <width sOffset="168.0171170585889" a="0.4827644403964846" b="-0.004144278126683809" c="9.481950398500624E-5" d="1.8859987136622237E-5"/>
+                  <width sOffset="168.81086895275564" a="0.47954408388460523" b="-0.003958104048919577" c="3.6517463562958695E-4" d="-1.3044052650895978E-5"/>
+                  <width sOffset="170.3222095200162" a="0.47435112467053386" b="-0.0029436812977269595" c="3.189851786524387E-4" d="-4.708006230673795E-6"/>
+                  <width sOffset="180.35289556673195" a="0.4721670874727444" b="0.002034515688710524" c="1.1725864223938058E-4" d="-4.946481644512398E-6"/>
+                  <width sOffset="180.57562728297836" a="0.47262600112015374" b="0.0020860139497546615" c="1.1732352006790466E-4" d="-4.7096992059157125E-6"/>
+                  <width sOffset="190.82904504594052" a="0.5012723914039685" b="0.0030065196525176797" c="-2.732587260988617E-5" d="-4.727666620834975E-6"/>
+                  <width sOffset="201.08246280890268" a="0.5241303796658388" b="9.550571688788515E-4" c="-1.7171042187780607E-4" d="-4.912110398782458E-6"/>
+                  <width sOffset="204.20430428026054" a="0.525288993513374" b="-2.606669876129477E-4" c="6.421515147380452E-5" d="-2.069171488264626E-6"/>
+                  <width sOffset="211.3358805718649" a="0.5259454656968332" b="3.395331764897329E-4" c="1.9277343055658742E-5" d="-1.6784714658949367E-6"/>
+                  <width sOffset="213.93987284874743" a="0.5269306858890426" b="4.0578526537978117E-4" c="-1.8834287414026287E-4" d="3.467996770729473E-6"/>
+                  <width sOffset="221.58929833482705" a="0.5205663320787677" b="-0.0018668682230113358" c="-1.0294997684163755E-4" d="1.91261742876812E-6"/>
+                  <width sOffset="225.52281346670588" a="0.5117464846249677" b="-0.002587999650046594" c="8.86075816319222E-5" d="-4.9944051460062145E-6"/>
+                  <width sOffset="231.8427160977892" a="0.4976689600170725" b="-0.002066464217431733" c="-1.9172845854557673E-5" d="-4.003989602969864E-6"/>
+                  <width sOffset="232.64426477914697" a="0.49599820820150553" b="-0.0021049176092420773" c="-0.0029710146003629114" d="1.041940158638166E-4"/>
+                  <width sOffset="236.30274933630687" a="0.4536338977206418" b="-0.019659982369362682" c="0.00861811910665429" d="-7.138349472134803E-4"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects>
+         <object type="pole" name="Guidepost" id="256725" s="223.5541695792882" t="-3.614271526961413" zOffset="-0.14067392927735511" validLength="0.0" orientation="none" radius="0.0" height="1.0086013618856668" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256726" s="324.27484268646515" t="-4.096267047940505" zOffset="-0.08433045858176058" validLength="0.0" orientation="none" radius="0.0" height="0.8986092358827591" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256744" s="276.1980952276956" t="-3.8295028618785385" zOffset="-0.060842238060075715" validLength="0.0" orientation="none" radius="0.0" height="1.0475095510482788" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256745" s="299.5856227603062" t="-4.056300650005854" zOffset="-0.1326898537709127" validLength="0.0" orientation="none" radius="0.0" height="1.0444199806079268" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256746" s="348.935924561396" t="-4.037948486276925" zOffset="-0.05966092163374981" validLength="0.0" orientation="none" radius="0.0" height="0.9895395888015628" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256786" s="250.71208415068855" t="-3.8771833419294577" zOffset="-0.16144685232205802" validLength="0.0" orientation="none" radius="0.0" height="0.9914489006623626" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256791" s="45.12500239086223" t="-10.198574600966865" zOffset="-0.10616721738287538" validLength="0.0" orientation="none" radius="0.03725283127234014" height="2.716227201744914" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256793" s="140.69128501350568" t="-7.777083232139639" zOffset="-0.137989179012024" validLength="0.0" orientation="none" radius="0.03446537218214718" height="3.563297546468675" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="FlagPole" id="256808" s="294.15571049785075" t="6.685977028362914" zOffset="0.3347256560665244" validLength="0.0" orientation="none" radius="0.061294237049325274" height="7.630854868330061" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256820" s="46.10321016571302" t="6.120379214890686" zOffset="0.30920929742877945" validLength="0.0" orientation="none" radius="0.04072131656214111" height="2.9433525763452053" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="FlagPole" id="256821" s="289.58182581737526" t="6.4344627836165715" zOffset="0.14194566323570257" validLength="0.0" orientation="none" radius="0.08924460782337079" height="8.10373949073255" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256822" s="349.5139437351535" t="5.118539567380694" zOffset="0.2447597744521488" validLength="0.0" orientation="none" radius="0.056824454416671395" height="2.768886269070208" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="FlagPole" id="256826" s="346.8380459691517" t="6.343210970265484" zOffset="0.15967352131033863" validLength="0.0" orientation="none" radius="0.07697311663983156" height="7.662982980720699" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="FlagPole" id="256827" s="351.1022329802733" t="6.409814477003527" zOffset="0.22561161370062166" validLength="0.0" orientation="none" radius="0.07090377246215064" height="7.463584970682859" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256828" s="387.92872822932054" t="5.231157856658988" zOffset="0.23396361211408134" validLength="0.0" orientation="none" radius="0.049263358583195284" height="3.410569882951677" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256848" s="349.4777936108334" t="-8.378754066825314" zOffset="-0.1417675874296691" validLength="0.0" orientation="none" radius="0.03487159886418606" height="3.071917664259672" hdg="0.0" pitch="0.0" roll="0.0"/>
+      </objects>
+      <signals>
+         <signal s="45.04959084823882" t="-10.17211727764187" id="250230" dynamic="no" orientation="+" zOffset="1.9926138185495859" country="DEU" type="274" subtype="57" value="70.0" unit="km/h" height="0.6249999813466179" width="0.6248471996823927" hOffset="0.09068566656401968"/>
+         <signal s="45.95002795113553" t="6.112471928384923" id="252335" dynamic="no" orientation="+" zOffset="2.6682925926976395" country="DEU" type="274" subtype="57" value="70.0" unit="km/h" height="0.5799999467236417" width="0.5798581601179281" hOffset="0.030971339494614038"/>
+         <signal s="349.50317745977094" t="-8.315166415205429" id="253442" dynamic="no" orientation="+" zOffset="2.377103723938575" country="DEU" type="274" subtype="60" value="60.0" unit="km/h" height="0.5599999978697098" width="0.5598634996949267" hOffset="-0.008552820187428973"/>
+         <signal s="349.77370648036634" t="5.185610610884246" id="253483" dynamic="no" orientation="+" zOffset="2.4197472583337145" country="DEU" type="274" subtype="60" value="60.0" unit="km/h" height="0.589999999028709" width="0.5898561819627643" hOffset="0.1464596745025505"/>
+      </signals>
+   </road>
+   <road length="17.160503250369555" id="255966" junction="-1">
+      <link>
+         <predecessor elementType="junction" elementId="2104771"/>
+         <successor elementType="road" elementId="255974" contactPoint="start"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618271.6355239917" y="5809498.65577888" hdg="-0.7233818503252318" length="17.160503250369555">
+            <paramPoly3 aU="0.0" bU="17.383691584073738" cU="-0.4143884602906516" dU="-0.810455998019709" aV="-0.0" bV="-0.0" cV="-3.921430787659837" dV="-0.8953873025366164" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="102.14162621447886" b="1.9917042388955306E-11" c="4.459343683843153E-4" d="2.3734495733970777E-5"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.04506435668111686" b="-7.404903180701923E-4" c="-0.0" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="2.1555567850151474" b="0.040591704571858435" c="0.9254372300164968" d="-4.284970487428129"/>
+         <laneOffset s="0.11202285074608223" a="2.1656936449895516" b="0.0866141231355519" c="-0.03742514589473264" d="0.0037523943981150206"/>
+         <laneOffset s="1.450870724899202" a="2.2235770783054516" b="0.0065796234061552385" c="-0.005106422576947204" d="0.0017239474975299025"/>
+         <laneOffset s="3.425531453622931" a="2.2299321958420553" b="0.006579206972653477" c="0.012640010433188076" d="-0.0016852047513509231"/>
+         <laneOffset s="6.745434315717128" a="2.329426032291999" b="0.03478467884858823" c="0.003928352087231073" d="-0.0013220142483998324"/>
+         <laneOffset s="8.662845661978421" a="2.401245751556179" b="0.03526819019575552" c="0.001457771371293497" d="-0.0014047004744443274"/>
+         <laneOffset s="10.564292746924972" a="2.4639200511778894" b="0.025575852463508946" c="-0.011982596076592876" d="0.0025157585936746952"/>
+         <laneOffset s="13.760944119755965" a="2.50540987112562" b="0.02608992941296596" c="0.005169371149429213" d="0.0018354915211837492"/>
+         <laneOffset s="15.368894718985274" a="2.568357431713824" b="0.05695113451755703" c="0.0029084892604121777" d="0.005095607236526284"/>
+         <laneOffset s="16.95507538795446" a="2.6863453449752224" b="0.10463908468097408" c="0.44315091706252974" d="-2.06609653175294"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <successor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.4035492511168268" b="0.09180624147533259" c="-0.9384029899439574" d="4.220513236200324"/>
+                  <width sOffset="0.11202285074608223" a="0.40799066438974707" b="0.04045225496783626" c="0.002797330865885024" d="-0.06820964562591772"/>
+                  <width sOffset="0.7631157364216423" a="0.4166879706435016" b="-0.042651797664409866" c="0.012393827518162946" d="0.01385609451937827"/>
+                  <width sOffset="1.4333169698126893" a="0.39784077164629217" b="-0.007367867511919567" c="0.026077784776069757" d="-0.003742785419677377"/>
+                  <width sOffset="1.450870724899202" a="0.3977194531204913" b="-0.006455801259374769" c="0.008633617438317434" d="-0.0017143383792326094"/>
+                  <width sOffset="3.425531453622931" a="0.4054363682590334" b="0.0075870475970688965" c="-0.009055891326199267" d="0.0016948138696481767"/>
+                  <width sOffset="5.5765886031222225" a="0.39672306172403937" b="-0.00784648238393736" c="0.023329586299882382" d="-0.003989753244044575"/>
+                  <width sOffset="6.745434315717128" a="0.4130534755894546" b="0.03033848522748238" c="0.0012668784933279305" d="-0.004352943746995396"/>
+                  <width sOffset="7.944540608672085" a="0.44374903946300126" b="0.01460001160448169" c="-0.00993685800755993" d="0.002821074096813647"/>
+                  <width sOffset="8.662845661978421" a="0.4501548004174172" b="0.00469132332841065" c="-0.008991637312546364" d="0.002903760322858665"/>
+                  <width sOffset="10.564292746924972" a="0.4465282638894208" b="0.0019927234147014278" c="0.012999879072123651" d="-0.0010166987452603692"/>
+                  <width sOffset="13.760944119755965" a="0.5525279039418565" b="0.05393723358851743" c="0.010223827013296483" d="-3.364316726150959E-4"/>
+                  <width sOffset="13.90501592900357" a="0.560509945456825" b="0.05686221447899161" c="0.0026924048093470024" d="-0.0020179518309565445"/>
+                  <width sOffset="15.368894718985274" a="0.6431886730539209" b="0.05177186724757319" c="0.004945315118842192" d="-0.005278067546299179"/>
+                  <width sOffset="16.95507538795446" a="0.7166868534729756" b="0.027621828940540605" c="-0.43616535773195475" d="2.0659140714431703"/>
+                  <roadMark sOffset="0.0" type="curb" weight="standard" color="standard" width="0.12">
+                     <type name="curb" width="0.12">
+                        <line length="17.160503250369555" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.0"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.16">
+                     <type name="solid" width="0.16">
+                        <line length="17.160503250369555" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.16"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="5.449593613018987" b="-0.13229859052924042" c="1.041473444081592" d="-4.3097227968206475"/>
+                  <width sOffset="0.11202285074608223" a="5.441784165036945" b="-0.061210616021741895" c="0.07029259538826588" d="-0.020999914994402902"/>
+                  <width sOffset="1.450870724899202" a="5.435435136911376" b="0.014083666210069661" c="0.0031925882743923965" d="-0.023028361894988723"/>
+                  <width sOffset="2.3334081209311703" a="5.4345217924163425" b="-0.03408963320695963" c="0.0015370191672861204" d="7.324868804874857E-4"/>
+                  <width sOffset="3.425531453622931" a="5.400079108806828" b="-0.028111419571479793" c="0.011470715951372236" d="-0.002676665368389737"/>
+                  <width sOffset="4.010751568010215" a="5.387019783176586" b="-0.017435765970976944" c="0.00834034682326838" d="-0.0016822034351625685"/>
+                  <width sOffset="6.745434315717128" a="5.3673084510436935" b="-0.009560384179968337" c="0.0026119585721682548" d="-0.0013190129322114955"/>
+                  <width sOffset="8.662845661978421" a="5.349281924121685" b="-0.014091905843450485" c="1.5864212937031965E-4" d="-0.001401699158255998"/>
+                  <width sOffset="10.564292746924972" a="5.313424243021757" b="-0.02869214081055196" c="-0.013264604786764993" d="0.0025187599098632635"/>
+                  <width sOffset="11.646290475833418" a="5.270040837789006" b="-0.09878281471993823" c="-0.004902085933945642" d="0.002528070615314543"/>
+                  <width sOffset="13.760944119755965" a="5.063134447864841" b="-0.08560046706579558" c="0.004161853021837298" d="0.0018478035428232784"/>
+                  <width sOffset="14.972222403412486" a="4.968838593660136" b="-0.06738487789250279" c="0.03696999397911577" d="-0.021578718998279182"/>
+                  <width sOffset="15.368894718985274" a="4.9465792104342166" b="-0.04824109642842838" c="1.7593171957503047E-4" d="-0.018318603282929"/>
+                  <width sOffset="16.091511114768338" a="4.904899078283327" b="-0.07668335422007662" c="-0.09061369332278718" d="0.07729760769576496"/>
+                  <width sOffset="16.95507538795446" a="4.820882968045706" b="-0.06025234219946021" c="0.5256354306200942" d="-1.9938945312937058"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.12">
+                     <type name="solid" width="0.12">
+                        <line length="11.646290475833418" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.12"/>
+                     </type>
+                  </roadMark>
+                  <roadMark sOffset="11.646290475833418" type="solid" weight="standard" color="standard" width="0.12">
+                     <type name="solid" width="0.12">
+                        <line length="5.514212774536137" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.12"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link>
+                     <successor id="-2"/>
+                  </link>
+                  <width sOffset="0.0" a="0.5186319070565788" b="0.16992212423323502" c="-0.1196488642520521" d="0.02476949698658491"/>
+                  <width sOffset="2.3334081209311703" a="0.5783608265123132" b="0.016137246734395146" c="-0.005571430510365197" d="0.001008648211108307"/>
+                  <width sOffset="3.78566190295704" a="0.5931351795966431" b="0.006336826113320648" c="-0.001958457225835044" d="0.0010919450434146972"/>
+                  <width sOffset="4.010751568010215" a="0.5944747605412761" b="0.005621140508734683" c="-0.002790046704681052" d="9.748311019996722E-5"/>
+                  <width sOffset="10.441083183406349" a="0.5411741285834282" b="-0.01816817502565892" c="0.005967364129411552" d="-0.0022553323619593705"/>
+                  <width sOffset="11.646290475833418" a="0.5239972852175239" b="0.036620279469217434" c="-0.0023737062454366542" d="-0.0022646430674112014"/>
+                  <width sOffset="13.809601482005313" a="0.5691820997358388" b="-0.005444858072659764" c="-0.009573867351350344" d="6.542824425194907E-7"/>
+                  <width sOffset="14.972222403412486" a="0.549911946097279" b="-0.02770376187955785" c="-0.035665113349599514" d="0.02342717682353792"/>
+                  <width sOffset="16.091511114768338" a="0.5070727551497431" b="-0.019493670640560623" c="0.09407786612506268" d="-0.07218903415515569"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects>
+         <object type="pole" name="Guidepost" id="256729" s="4.585335736114427" t="3.4071893573537935" zOffset="0.12530366998964837" validLength="0.0" orientation="none" radius="0.0" height="1.0205326778814197" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256730" s="15.277636600674601" t="4.016385463350293" zOffset="0.17599994700063348" validLength="0.0" orientation="none" radius="0.0" height="1.0884952899068594" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256779" s="15.520648713507974" t="-3.476204574916612" zOffset="-0.010431359490752357" validLength="0.0" orientation="none" radius="0.0" height="0.8885906003415585" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Pole" id="256799" s="12.301119736179542" t="-6.197015522927658" zOffset="0.025246015967127278" validLength="0.0" orientation="none" radius="0.047485215537349745" height="1.5296894498169422" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256800" s="17.160503250369555" t="-3.859320911744024" zOffset="-0.04789509179794038" validLength="0.0" orientation="none" radius="0.03805120173595476" height="3.073499442078173" hdg="0.0" pitch="0.0" roll="0.0"/>
+      </objects>
+      <signals/>
+   </road>
+   <road length="97.95655974355459" id="255967" junction="-1">
+      <link>
+         <predecessor elementType="junction" elementId="2104780"/>
+         <successor elementType="junction" elementId="2104786"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618242.503161432" y="5809614.287236325" hdg="-0.18441150621901348" length="50.008792514819746">
+            <paramPoly3 aU="0.0" bU="49.949648569819416" cU="0.10327839502007663" dU="-0.23515544500777835" aV="-0.0" bV="3.552713678800501E-15" cV="-6.728988876262441" dV="2.693958202741398" pRange="normalized"/>
+         </geometry>
+         <geometry s="50.008792514819746" x="618290.7363436422" y="5809601.185634682" hdg="-0.2927025390402851" length="47.94776722873485">
+            <paramPoly3 aU="0.0" bU="47.59307400729791" cU="3.669180800110428" dU="-4.753910046575228" aV="-0.0" bV="-3.552713678800501E-15" cV="6.0457123010231735" dV="-13.474034824706766" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="107.4387429913791" b="-0.010195634677663885" c="-7.554996440852791E-4" d="0.0"/>
+         <elevation s="10.884062193728289" a="107.23827445877373" b="-0.026641444904791478" c="-8.784689967659243E-4" d="1.1298111908207079E-5"/>
+         <elevation s="21.768124387456577" a="106.85880870483004" b="-0.04174884904942086" c="-6.921650229930043E-4" d="5.479087727254782E-6"/>
+         <elevation s="32.652186581184864" a="106.3294803196328" b="-0.05486877898403812" c="-0.0012047117478841305" d="5.804966719428215E-5"/>
+         <elevation s="43.536248774913155" a="105.66441829891764" b="-0.060462914105207405" c="-5.615375432264755E-4" d="5.700612146772099E-5"/>
+         <elevation s="54.420310968641445" a="105.01331608456253" b="-0.05242721721347077" c="0.0011307765365765987" d="-4.147327797404488E-5"/>
+         <elevation s="65.30437316236973" a="104.52317611332658" b="-0.04255145603671621" c="1.5192860715047943E-4" d="6.987506537351443E-6"/>
+         <elevation s="76.18843535609803" a="104.08705069668791" b="-0.03676097624374552" c="-1.7610568308534458E-4" d="-2.60066651559523E-7"/>
+         <elevation s="78.29233766211894" a="104.00892725700756" b="-0.03750544803013268" c="-4.0760661880463544E-4" d="1.142915605222424E-5"/>
+         <elevation s="87.07249754982631" a="103.65593662877205" b="-0.04201988827133179" c="-1.0813175441585094E-4" d="1.182413464396668E-5"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.03724485524683241" b="0.0" c="-1.0696485718779322E-5" d="0.0"/>
+         <superelevation s="10.884062193728289" a="0.03597771949320505" b="-2.3284243163504116E-4" c="-2.6447247848324352E-5" d="1.1465059742382776E-6"/>
+         <superelevation s="21.768124387456577" a="0.03178868772663803" b="-4.0109445489392505E-4" c="-7.307283277223542E-6" d="5.34480599571765E-7"/>
+         <superelevation s="32.652186581184864" a="0.027246645507955" b="-3.702120853210914E-4" c="-2.1032075749331786E-5" d="2.3299602845784414E-6"/>
+         <superelevation s="43.536248774913155" a="0.023729865003628826" b="0.0" c="2.0849699842781613E-5" d="0.0"/>
+         <superelevation s="54.420310968641445" a="0.026199779031261666" b="4.5385885961880595E-4" c="1.4334490816424842E-4" d="-7.01499988202165E-6"/>
+         <superelevation s="65.30437316236973" a="0.039075811357386796" b="0.001081158859756332" c="6.118223272955208E-6" d="-1.4219603713276487E-6"/>
+         <superelevation s="76.18843535609803" a="0.04973457957303822" b="7.089928417994736E-4" c="-1.6269615212514907E-5" d="-7.869829847683011E-7"/>
+         <superelevation s="87.07249754982631" a="0.05450925572749407" b="7.514918710883763E-5" c="-3.452258254833538E-6" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="-0.08135464116736954" b="-0.03962508192971343" c="0.0015472288772813774" d="-6.810458610511721E-6"/>
+         <laneOffset s="10.534960600283972" a="-0.3350464806807887" b="-0.009292675720133725" c="8.900746646564008E-4" d="-3.0267862010927655E-7"/>
+         <laneOffset s="15.769101538473755" a="-0.3593443664750569" b="-0.0" c="0.0010052302536973472" d="-1.740603471878781E-5"/>
+         <laneOffset s="21.768124387456577" a="-0.3269257304226605" b="0.010181559021033241" c="6.9526951319816E-4" d="-1.717898937846341E-5"/>
+         <laneOffset s="32.652186581184864" a="-0.1558952718443008" b="0.01921105821134171" c="1.3581087130493151E-4" d="-1.7193555615918413E-5"/>
+         <laneOffset s="38.20512129720916" a="-0.047973750291505995" b="0.01912886182252161" c="0.002272446831109846" d="-2.6947759719474093E-4"/>
+         <laneOffset s="43.536248774913155" a="0.07775963463997129" b="0.020381865465059778" c="-0.002037212130869941" d="-2.6952409014278407E-4"/>
+         <laneOffset s="45.76893394288077" a="0.11011094373478542" b="0.007254320634817955" c="-2.923215204380297E-4" d="-2.5873140247090556E-8"/>
+         <laneOffset s="54.420310968641445" a="0.15097486177894912" b="0.002190543734364177" c="-2.895905763138217E-4" d="-5.507512095037529E-7"/>
+         <laneOffset s="58.162500427918516" a="0.155088007826386" b="-0.0" c="-0.005896856036568597" d="4.982525547521326E-4"/>
+         <laneOffset s="65.98863832236694" a="0.03274653641316204" b="-7.476503140060818E-4" c="9.235982459449201E-5" d="-1.6871461976175982E-7"/>
+         <laneOffset s="70.08203726925018" a="0.031222106862711013" b="-0.0" c="0.0021233649089424365" d="-2.1087827487992027E-4"/>
+         <laneOffset s="76.79480370651211" a="0.06311592066874393" b="-0.0" c="-0.0022443781475957876" d="1.3980256095489092E-4"/>
+         <laneOffset s="81.45103173400588" a="0.028569722764127455" b="-0.011807721611402795" c="-0.006486308666973616" d="0.0017183856528594824"/>
+         <laneOffset s="84.6773902732852" a="-0.019333743815683677" b="-0.0" c="0.012323242182319024" d="-0.0024464561387302903"/>
+         <laneOffset s="88.03551088626153" a="0.02698921695693458" b="-0.0" c="-0.006164251877807729" d="6.249535490415982E-4"/>
+         <laneOffset s="91.682535985718" a="-0.024684767242315764" b="-0.020025230996468475" c="-0.008234683789471339" d="0.0012515614690794365"/>
+         <laneOffset s="96.97900097014062" a="-0.17579537878035653" b="-0.0019262201742028225" c="0.0547592458191209" d="-0.05500851836048852"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="2" type="shoulder" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="0.29216386877374667" b="6.230091666188792E-4" c="-0.0012372598835204613" d="9.313624654301364E-5"/>
+                  <width sOffset="10.884062193728289" a="0.2724612902297565" b="0.006789726511990675" c="0.0017875519542310688" d="9.610972299180625E-5"/>
+                  <width sOffset="15.840450788612033" a="0.3617285237924084" b="0.031592363960858516" c="-0.0018229650945410102" d="-2.4230889286095453E-5"/>
+                  <width sOffset="21.768124387456577" a="0.4798967771622187" b="0.007426254718369157" c="-0.002293558934052179" d="-2.645717299874252E-5"/>
+                  <width sOffset="22.650178297163432" a="0.4846445451525545" b="0.003318416910774001" c="-2.2650475904520347E-4" d="-1.334997661644E-6"/>
+                  <width sOffset="32.652186581184864" a="0.4938400019085978" b="-0.0016132482198215068" c="-2.5317146995576024E-4" d="-5.798885595902837E-6"/>
+                  <width sOffset="36.07259752215725" a="0.4851280747595683" b="-0.0035486763099234937" c="-0.0018808880924272426" d="1.620218124798236E-4"/>
+                  <width sOffset="39.33044767136731" a="0.4592063542340181" b="-0.010645081318021365" c="-6.953393189689444E-5" d="1.4568801281730849E-4"/>
+                  <width sOffset="42.99148840134675" a="0.4264511710938046" b="-0.005296149308181199" c="-0.0015125390649419553" d="2.9429303328387863E-4"/>
+                  <width sOffset="43.536248774913155" a="0.4231647488201773" b="-0.006682085386627285" c="-0.0010382087943750736" d="2.91788604190433E-4"/>
+                  <width sOffset="49.207541002388716" a="0.4051010485775546" b="0.009696820602497113" c="2.6365694548773934E-4" d="-3.5383791200328205E-5"/>
+                  <width sOffset="52.09280708647113" a="0.4344239485330945" b="0.010334576738987444" c="5.87007247175533E-4" d="-4.958870904237523E-5"/>
+                  <width sOffset="54.420310968641445" a="0.4610324448050447" b="0.01226119311191559" c="2.740009724976551E-4" d="-3.510881563392565E-5"/>
+                  <width sOffset="62.571289202912624" a="0.5601645925089187" b="0.009730219564564421" c="-0.0035923077880141525" d="2.1560552652893127E-4"/>
+                  <width sOffset="65.30437316236973" a="0.5643261493300384" b="-0.005074381215046711" c="-0.0022867185953194666" d="3.9000759919350985E-4"/>
+                  <width sOffset="66.48902085745243" a="0.5557540335136193" b="-0.008850294558725814" c="-0.0046925872733497445" d="4.105122748990109E-4"/>
+                  <width sOffset="72.2529930234873" a="0.42745012453161246" b="-0.022030369504945888" c="0.0030172617031113936" d="4.128875374071567E-4"/>
+                  <width sOffset="72.5076533858946" a="0.4220423567280349" b="-0.020413285963270585" c="0.0010158329250062746" d="-1.3105873954204154E-4"/>
+                  <width sOffset="75.98505455441104" a="0.35782994840107385" b="-0.018102780976735084" c="-0.00342706862679801" d="6.906970074413445E-4"/>
+                  <width sOffset="76.18843535609803" a="0.3540122444342835" b="-0.019411071450186945" c="-0.002682558277404469" d="6.576594121033056E-4"/>
+                  <width sOffset="78.47170197599627" a="0.30353495694988997" b="-0.021375322811702888" c="0.001193143738015966" d="7.083497965341268E-4"/>
+                  <width sOffset="80.72558442064467" a="0.2695290322858215" b="-0.005201690055225065" c="0.003221373349660957" d="-6.411172864398777E-5"/>
+                  <width sOffset="83.65268870224381" a="0.2802958007215284" b="0.012008985161573072" c="0.009372875674325728" d="-0.00190539471984487"/>
+                  <width sOffset="84.94096533234386" a="0.307248532778055" b="0.026671795338025515" c="-0.007319797891232217" d="-2.0079434432932787E-4"/>
+                  <width sOffset="87.07249754982631" a="0.32889875136416125" b="-0.007269859622317916" c="-0.00853460871091376" d="-1.888385346420138E-4"/>
+                  <width sOffset="87.1173688129542" a="0.32855534268010755" b="-0.008036917608258805" c="0.001285536885034073" d="7.567734292273201E-4"/>
+                  <width sOffset="89.69073088698426" a="0.32928291829666767" b="0.013613883794218122" c="-0.0040621188581669064" d="-9.554341668828852E-4"/>
+                  <width sOffset="90.5496434897171" a="0.3373738968688915" b="0.00452131382572046" c="-0.004124385825869629" d="5.895942876761032E-4"/>
+                  <width sOffset="92.916216684119" a="0.33278931246822996" b="-0.005093641261454323" c="-0.0010663815856558029" d="-1.5133847937251672E-4"/>
+                  <width sOffset="94.74383164104806" a="0.31899434059155096" b="-0.01050800279854468" c="-0.013608127905504558" d="0.0037295279146911872"/>
+                  <width sOffset="95.41789302443294" a="0.306870556150558" b="-0.023769798932829603" c="0.021561441186955826" d="-0.0032690238921439184"/>
+                  <width sOffset="97.32343467558641" a="0.3172487241542692" b="0.02279229961610734" c="0.01621446972538606" d="0.0037274387488471015"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+               <lane id="1" type="driving" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="4.394469847707875" b="-0.03800859782833068" c="-6.978637903144061E-4" d="3.240020700269231E-5"/>
+                  <width sOffset="10.534960600283972" a="3.9544812679152996" b="-0.04192468359678347" c="7.680513955502863E-4" d="2.5892427018341414E-5"/>
+                  <width sOffset="10.884062193728289" a="3.93993999957818" b="-0.04137896098513171" c="7.795094848249014E-4" d="2.6231110653186307E-5"/>
+                  <width sOffset="15.769101538473755" a="3.759461940080131" b="-0.03188518504294316" c="0.0010440211309056418" d="4.3334466751864286E-5"/>
+                  <width sOffset="21.768124387456577" a="3.615110178553981" b="-0.014680373666821291" c="0.0018206176400192274" d="4.3107421411082414E-5"/>
+                  <width sOffset="22.650178297163432" a="3.603607355536629" b="-0.011367992660319766" c="-2.0237728485853038E-4" d="1.7985246074889315E-5"/>
+                  <width sOffset="32.652186581184864" a="3.4876548249478576" b="-0.010018610010605347" c="2.913185474418216E-4" d="2.3495484554069928E-5"/>
+                  <width sOffset="36.07259752215725" a="3.4577354566889826" b="-0.007201115822250531" c="0.002100624091996864" d="-1.443252135216887E-4"/>
+                  <width sOffset="38.20512129720916" a="3.4505321610175503" b="-2.1087916957254066E-4" c="-0.0012457667909458704" d="1.0795882805712134E-4"/>
+                  <width sOffset="42.99148840134675" a="3.4328210993726893" b="-0.004716486749203729" c="0.0033475393381152286" d="-4.064619240473757E-5"/>
+                  <width sOffset="43.536248774913155" a="3.431238601925609" b="-0.0011054601519029025" c="0.0032809127261278813" d="-4.059969945690217E-5"/>
+                  <width sOffset="45.76893394288077" a="3.4446735622695153" b="0.012937875948039352" c="-5.41204240123409E-4" d="-3.1009791645944626E-4"/>
+                  <width sOffset="49.207541002388716" a="3.4701546161933443" b="-0.0017839120055138337" c="-7.752930498133875E-5" d="1.707447893133323E-5"/>
+                  <width sOffset="54.420310968641445" a="3.46116733098655" b="-0.0012003039223001184" c="2.518042591783259E-4" d="1.6034005069918578E-5"/>
+                  <width sOffset="58.162500427918516" a="3.461042099513558" b="0.001357914319410233" c="0.0060328935276083035" d="-4.8276930089172026E-4"/>
+                  <width sOffset="62.571289202912624" a="3.5429215896907946" b="0.02640205408305522" c="0.002655405087881444" d="-7.334836430546637E-4"/>
+                  <width sOffset="65.30437316236973" a="3.619941429504033" b="0.02448013041419339" c="-0.002769372794846315" d="-9.131499318396406E-4"/>
+                  <width sOffset="65.98863832236694" a="3.6351030971382423" b="0.019407497855995805" c="0.0010650808906046414" d="-4.1472866245432735E-4"/>
+                  <width sOffset="66.48902085745243" a="3.6450289877643454" b="0.02016187098451239" c="0.004234445440493436" d="-4.35233338173215E-4"/>
+                  <width sOffset="70.08203726925018" a="3.7519483245045557" b="0.033734452034562865" c="-0.002490033073648496" d="-2.2452377791309198E-4"/>
+                  <width sOffset="72.5076533858946" a="3.8159204968115126" b="0.01769168990279249" c="-0.0018069915086444319" d="3.1942249900331597E-4"/>
+                  <width sOffset="75.98505455441104" a="3.8690225486021754" b="0.016712097288173085" c="0.004600959114871642" d="-5.023332478437796E-4"/>
+                  <width sOffset="76.79480370651211" a="3.885305262531201" b="0.023175212550758127" c="0.003501680588983696" d="-8.53014083678588E-4"/>
+                  <width sOffset="80.72558442064467" a="3.978699035620686" b="0.011164033040076692" c="-0.0037959714364476684" d="-8.055255850045573E-5"/>
+                  <width sOffset="81.45103173400588" a="3.9847694793950414" b="0.0055293003754791365" c="0.002223506979385813" d="-0.0016591356504050579"/>
+                  <width sOffset="83.65268870224381" a="3.990014668896232" b="-0.008806852246904258" c="-0.015449523189423567" d="1.8214734079617374E-4"/>
+                  <width sOffset="84.6773902732852" a="3.9649640500693675" b="-0.039895382218505276" c="-0.017066749365256994" d="0.004346989132385959"/>
+                  <width sOffset="87.1173688129542" a="3.829159467930926" b="-0.04554104883682056" c="0.004907365353679803" d="0.0034013771624993834"/>
+                  <width sOffset="88.03551088626153" a="3.7941157471256406" b="-0.027927803213647625" c="0.008117217489400618" d="3.2996747472753074E-4"/>
+                  <width sOffset="90.5496434897171" a="3.7804530380408905" b="0.019144756422168147" c="0.008206327074927945" d="-0.001215060979831576"/>
+                  <width sOffset="91.682535985718" a="3.810907656170547" b="0.03306013584482382" c="0.012984822425934784" d="-0.001841668899869546"/>
+                  <width sOffset="92.916216684119" a="3.8679978335224545" b="0.05668950168383604" c="0.007296678172237878" d="-0.0011007361328206817"/>
+                  <width sOffset="94.74383164104806" a="3.989257101346273" b="0.07233057934869153" c="0.012973493626773401" d="-0.004981602526881084"/>
+                  <width sOffset="96.97900097014062" a="4.160114647805894" b="0.05566250082419739" c="-0.0635380570247683" d="0.05127847730268767"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.16">
+                     <type name="solid" width="0.16">
+                        <line length="97.95655974355459" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.16"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="40.0" unit="km/h"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.16">
+                     <type name="solid" width="0.16">
+                        <line length="97.95655974355459" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.16"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="3.929881258395168" b="-0.07332850847926115" c="5.956559468362556E-4" d="4.553587182752929E-4"/>
+                  <width sOffset="5.162765656457036" a="3.6298415710074474" b="-0.03076644666709601" c="0.004660002686222957" d="-7.115165095307554E-4"/>
+                  <width sOffset="8.207287017831021" a="3.5592875468972482" b="-0.02217686628629555" c="-0.011550779723320958" d="0.003024958173544819"/>
+                  <width sOffset="10.534960600283972" a="3.483233388868058" b="-0.026781502197954" c="0.009130655489203455" d="0.003031465953535094"/>
+                  <width sOffset="11.285353782490704" a="3.4695590244667747" b="-0.007957375105954638" c="0.0018078901673043825" d="-1.2181352761404595E-4"/>
+                  <width sOffset="15.769101538473755" a="3.45924555250917" b="9.080565928486677E-4" c="2.8925515075353605E-4" d="-1.3891688371763514E-4"/>
+                  <width sOffset="16.324667249403177" a="3.4598154960870295" b="0.0011008256330512143" c="8.986797908342179E-4" d="-1.3778730524529607E-5"/>
+                  <width sOffset="21.768124387456577" a="3.4902143185308843" b="0.009659833459000029" c="6.249058852912981E-4" d="-1.4912025718270577E-5"/>
+                  <width sOffset="28.369859188828137" a="3.5769306602046225" b="0.015961031236174556" c="-0.003680495612025622" d="2.6518491705057454E-4"/>
+                  <width sOffset="32.652186581184864" a="3.598612049623937" b="-9.719992321706103E-4" c="-3.4651705847975415E-4" d="2.7104764746616603E-4"/>
+                  <width sOffset="35.427421209288205" a="3.5990392245267357" b="0.003367436266889321" c="-0.0014056911561220297" d="7.445981377782612E-5"/>
+                  <width sOffset="38.20512129720916" a="3.5991429751857607" b="-0.0027182302401207413" c="0.0016378499731292242" d="-1.778242278009935E-4"/>
+                  <width sOffset="43.536248774913155" a="3.6042578112032735" b="-4.16840802999148E-4" c="-0.0012106370489145947" d="-1.792363869398382E-4"/>
+                  <width sOffset="45.76893394288077" a="3.5952974101690605" b="-0.008503200855386054" c="0.0011390056088906014" d="9.026183006269696E-5"/>
+                  <width sOffset="49.76358296617442" a="3.585259075846844" b="0.004917638292370342" c="1.9622827283659165E-4" d="-2.379980001843656E-5"/>
+                  <width sOffset="54.420310968641445" a="3.6100110686672306" b="0.005196897428035856" c="-5.26747737570748E-5" d="-2.9599706298875867E-5"/>
+                  <width sOffset="58.162500427918516" a="3.62716999786639" b="0.003559118203662252" c="-0.005986060314629368" d="4.692035996630587E-4"/>
+                  <width sOffset="59.32533667801435" a="3.623952152997327" b="-0.008459143020041467" c="-0.0032390347759653462" d="3.420397996976931E-4"/>
+                  <width sOffset="64.56670490956198" a="3.5398825992282905" b="-0.014223599443371059" c="-0.004812033895134071" d="0.0016477085565762238"/>
+                  <width sOffset="65.98863832236694" a="3.5146653237646603" b="-0.01791390375218367" c="-0.003492202079744277" d="0.001149287287204347"/>
+                  <width sOffset="68.59945150295684" a="3.4645443636123088" b="-0.012647060629638801" c="8.97003132529614E-4" d="4.830466734675005E-6"/>
+                  <width sOffset="70.08203726925018" a="3.4477814203293566" b="-0.009955439501254184" c="0.002951564809294316" d="-2.0587909352548704E-4"/>
+                  <width sOffset="75.79664143020034" a="3.4488572122678596" b="0.003608613756715489" c="0.006628175984773475" d="-0.0010750737842616727"/>
+                  <width sOffset="76.79480370651211" a="3.457993873642977" b="0.01362722610049414" c="0.0032878684590149517" d="-7.243929484268592E-4"/>
+                  <width sOffset="81.04826104803897" a="3.519696184764916" b="0.002279909618622159" c="-2.7137697339630435E-4" d="-1.8284404069494404E-4"/>
+                  <width sOffset="81.45103173400588" a="3.5205584947301287" b="0.0019723190405082653" c="-0.006687097959761767" d="0.0013957390512095796"/>
+                  <width sOffset="84.4696678726028" a="3.503969902233537" b="-2.4490210469386466E-4" c="0.007381897847695622" d="0.0020639921197345167"/>
+                  <width sOffset="84.6773902732852" a="3.5042560485231515" b="0.003089044065124736" c="0.010845276216656067" d="-0.002100849671854755"/>
+                  <width sOffset="87.73610486103173" a="3.55505106942588" b="0.010469275240679527" c="-0.006677880407981901" d="-0.002381723149740176"/>
+                  <width sOffset="88.03551088626153" a="3.5575230764992347" b="0.005829958639792152" c="-0.0026581968878545983" d="6.896865380328962E-4"/>
+                  <width sOffset="91.682535985718" a="3.5768844949259493" b="0.013961068821297495" c="-0.0040203802926758745" d="0.0013162944580707321"/>
+                  <width sOffset="95.32773620855939" a="3.6381100802074156" b="0.037121613820908825" c="0.011956032507588109" d="9.153944228001316E-4"/>
+                  <width sOffset="96.97900097014062" a="3.7361294410721055" b="0.08409471427959006" c="0.059598083285638544" d="-0.05534468540676746"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.1514706264231801">
+                     <type name="solid" width="0.151471">
+                        <line length="97.95655974355459" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.151471"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="40.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="0.30465523267337513" b="-0.02089888753107543" c="0.004413924862802754" d="-3.6851736091812114E-4"/>
+                  <width sOffset="5.162765656457036" a="0.26369723379389676" b="-0.004790318335433517" c="0.0016946028553897268" d="7.983578668870134E-4"/>
+                  <width sOffset="6.283323036007559" a="0.2615805440787007" b="0.002014852525049489" c="0.0040443671700422824" d="1.2880225054408344E-4"/>
+                  <width sOffset="8.207287017831021" a="0.28134513461753974" b="0.01900762373865962" c="0.014499900615350057" d="-0.0036076724325315554"/>
+                  <width sOffset="10.884062193728289" a="0.3669247757394243" b="0.019085296259807347" c="-0.014599211059517345" d="-0.0035408641979589807"/>
+                  <width sOffset="11.285353782490704" a="0.3720037439240751" b="0.00565760650568047" c="-0.004714828645525594" d="-3.875847168104136E-4"/>
+                  <width sOffset="11.943392704446357" a="0.3735746379069087" b="-0.0010509652600597507" c="-0.00584541025091631" d="5.44919744285702E-4"/>
+                  <width sOffset="16.324667249403177" a="0.30259242985730017" b="-0.02089152974253443" c="4.759617512708426E-4" d="4.1978159109755283E-4"/>
+                  <width sOffset="18.42935321704916" a="0.26464436951094594" b="-0.01330950635595606" c="6.394609735559643E-4" d="-1.2063483254436428E-5"/>
+                  <width sOffset="21.768124387456577" a="0.22688631024480044" b="-0.009442907793503083" c="5.06637074976992E-4" d="-1.9936118493729006E-5"/>
+                  <width sOffset="28.369859188828137" a="0.18089137631774221" b="-0.00536016229332326" c="0.004121863953071151" d="-3.0003306126256935E-4"/>
+                  <width sOffset="32.652186581184864" a="0.20996368572518564" b="0.013435865563669162" c="2.8422379753321704E-4" d="-2.968879021780868E-4"/>
+                  <width sOffset="35.427421209288205" a="0.24309455956790416" b="0.008153613949814403" c="0.0011282595861096985" d="-1.0030006846240688E-4"/>
+                  <width sOffset="35.62101019099165" a="0.24471456514421197" b="0.008579174453697656" c="0.0012140023570436614" d="-8.614091202434621E-5"/>
+                  <width sOffset="43.536248774913155" a="0.34596216783559575" b="0.01160696773527192" c="-8.315692080826476E-4" d="-8.604048149430546E-5"/>
+                  <width sOffset="49.76358296617442" a="0.3652163694872024" b="-0.008759820879502358" c="-4.14507374852911E-4" d="2.8021148586830965E-5"/>
+                  <width sOffset="54.420310968641445" a="0.31826524873639483" b="-0.010797391532386312" c="-4.3869141293483E-5" d="2.8642891683435535E-5"/>
+                  <width sOffset="59.32533667801435" a="0.26762849282630796" b="-0.009160368250881266" c="-7.325914565716201E-4" d="1.5580669164845268E-4"/>
+                  <width sOffset="61.51998409236409" a="0.2456431540942936" b="-0.010124609974694807" c="1.769177374488837E-4" d="1.474011460215471E-4"/>
+                  <width sOffset="64.56670490956198" a="0.220607217085397" b="-0.004941815231879252" c="0.00847545689698329" d="-0.0011582676108567692"/>
+                  <width sOffset="65.30437316236973" a="0.2211088195271178" b="0.005671506301628435" c="0.006114340277432367" d="-0.0011384120136442714"/>
+                  <width sOffset="68.59945150295684" a="0.26545523957485617" b="0.008884900468632453" c="-5.266120481590372E-4" d="6.044806825405843E-6"/>
+                  <width sOffset="73.45429151252694" a="0.29686972532702427" b="0.004199084693703284" c="0.008346061558368598" d="-0.0010878649710789696"/>
+                  <width sOffset="75.79664143020034" a="0.33851623355651217" b="0.025391827813695755" c="-0.006504583466995199" d="-2.186702803434363E-4"/>
+                  <width sOffset="76.18843535609803" a="0.3474529766418475" b="0.020194215936724255" c="-0.006401584929367116" d="-2.494922360954952E-4"/>
+                  <width sOffset="78.10636404768117" a="0.3608759605792722" b="-0.007114585374938021" c="-0.004637362569802661" d="0.0010765070252911886"/>
+                  <width sOffset="81.04826104803897" a="0.327219715541462" b="-0.006449148201574737" c="-8.207222855965001E-4" d="5.349581175592643E-4"/>
+                  <width sOffset="84.4696678726028" a="0.3169728069934781" b="0.006721500887719908" c="0.0032408949898622905" d="-1.332949509661739E-4"/>
+                  <width sOffset="86.89719993426962" a="0.3504809593092615" b="0.02009976766805017" c="0.004000106012356316" d="-5.418013435765693E-4"/>
+                  <width sOffset="87.73610486103173" a="0.36983800040779347" b="0.025667288210724237" c="8.820045737445562E-4" d="-2.6092786569147596E-4"/>
+                  <width sOffset="93.144566851617" a="0.49317827415922677" b="0.012310300693600278" c="-0.002121600744650697" d="-6.507158211128757E-5"/>
+                  <width sOffset="95.32773620855939" a="0.5092646102996872" b="0.0021162351507274108" c="-0.004129729841481132" d="3.358284531594216E-4"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects>
+         <object type="railing" name="" id="256204" s="61.500520234716724" t="-4.415104719925689" zOffset="0.0" validLength="5.316013629542574" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="61.500520234716724" length="5.316013629542574" distance="0.0" tStart="-4.415104719925689" tEnd="-4.373002403725022" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.47059309278797173" zOffsetEnd="0.4713801403567072"/>
+         </object>
+         <object type="railing" name="" id="268691660" s="66.8165338642593" t="-4.373002403725022" zOffset="0.0" validLength="11.696212768721864" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="66.8165338642593" length="11.696212768721864" distance="0.0" tStart="-4.373002403725022" tEnd="-4.565217024473803" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.4713801403567072" zOffsetEnd="0.330882681610326"/>
+         </object>
+         <object type="railing" name="" id="537127116" s="78.51274663298116" t="-4.565217024473803" zOffset="0.0" validLength="10.494591418417912" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="78.51274663298116" length="10.494591418417912" distance="0.0" tStart="-4.565217024473803" tEnd="-4.68939108292599" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.330882681610326" zOffsetEnd="0.30432740102178685"/>
+         </object>
+         <object type="railing" name="" id="805562572" s="89.00733805139907" t="-4.68939108292599" zOffset="0.0" validLength="5.104877520402553" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="89.00733805139907" length="5.104877520402553" distance="0.0" tStart="-4.68939108292599" tEnd="-4.8361909436447315" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.30432740102178685" zOffsetEnd="0.28722460016259505"/>
+         </object>
+         <object type="railing" name="" id="1073998028" s="94.11221557180163" t="-4.8361909436447315" zOffset="0.0" validLength="3.844344171752965" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="94.11221557180163" length="3.844344171752965" distance="0.0" tStart="-4.8361909436447315" tEnd="-5.159788562583477" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.28722460016259505" zOffsetEnd="0.2697059780007504"/>
+         </object>
+         <object type="railing" name="" id="256208" s="0.0" t="5.448315805340973" zOffset="0.0" validLength="10.734671335744412" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="0.0" length="10.734671335744412" distance="0.0" tStart="5.448315805340973" tEnd="4.785242705393497" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.699493737751048" zOffsetEnd="0.44715716521431376"/>
+         </object>
+         <object type="railing" name="" id="268691664" s="10.734671335744412" t="4.785242705393497" zOffset="0.0" validLength="5.031876099008748" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="10.734671335744412" length="5.031876099008748" distance="0.0" tStart="4.785242705393497" tEnd="4.552627662368199" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.44715716521431376" zOffsetEnd="0.3689653936046466"/>
+         </object>
+         <object type="railing" name="" id="537127120" s="15.76654743475316" t="4.552627662368199" zOffset="0.0" validLength="8.386463575940276" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="15.76654743475316" length="8.386463575940276" distance="0.0" tStart="4.552627662368199" tEnd="4.314824391887362" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.3689653936046466" zOffsetEnd="0.29551261230807996"/>
+         </object>
+         <object type="railing" name="" id="805562576" s="24.153011010693437" t="4.314824391887362" zOffset="0.0" validLength="4.472779253281814" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="24.153011010693437" length="4.472779253281814" distance="0.0" tStart="4.314824391887362" tEnd="4.279358130735657" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.29551261230807996" zOffsetEnd="0.28540295262394694"/>
+         </object>
+         <object type="railing" name="" id="1073998032" s="28.62579026397525" t="4.279358130735657" zOffset="0.0" validLength="6.559988162609702" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="28.62579026397525" length="6.559988162609702" distance="0.0" tStart="4.279358130735657" tEnd="4.3405144759385905" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.28540295262394694" zOffsetEnd="0.3325797673101715"/>
+         </object>
+         <object type="railing" name="" id="1073741897" s="35.18577842658495" t="4.3405144759385905" zOffset="0.0" validLength="19.67996687402976" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="35.18577842658495" length="19.67996687402976" distance="0.0" tStart="4.3405144759385905" tEnd="4.670758740033603" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.3325797673101715" zOffsetEnd="0.6581993811232463"/>
+         </object>
+         <object type="railing" name="" id="1073741898" s="54.86574530061471" t="4.670758740033603" zOffset="0.0" validLength="6.831626716842408" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="54.86574530061471" length="6.831626716842408" distance="0.0" tStart="4.670758740033603" tEnd="4.6698689453871545" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.6581993811232463" zOffsetEnd="0.7104406137230865"/>
+         </object>
+         <object type="railing" name="" id="1073741899" s="61.69737201745712" t="4.6698689453871545" zOffset="0.0" validLength="14.967619428844408" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="61.69737201745712" length="14.967619428844408" distance="0.0" tStart="4.6698689453871545" tEnd="4.8211672626638435" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.7104406137230865" zOffsetEnd="0.7452484634877476"/>
+         </object>
+         <object type="railing" name="" id="1073741900" s="76.66499144630153" t="4.8211672626638435" zOffset="0.0" validLength="13.056752040656875" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="76.66499144630153" length="13.056752040656875" distance="0.0" tStart="4.8211672626638435" tEnd="4.71315749641996" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.7452484634877476" zOffsetEnd="0.8054887194168214"/>
+         </object>
+         <object type="railing" name="" id="1073741901" s="89.7217434869584" t="4.71315749641996" zOffset="0.0" validLength="4.117408846670074" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="89.7217434869584" length="4.117408846670074" distance="0.0" tStart="4.71315749641996" tEnd="4.768485653589488" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.8054887194168214" zOffsetEnd="0.8045147397340526"/>
+         </object>
+         <object type="railing" name="" id="1073741902" s="93.83915233362848" t="4.768485653589488" zOffset="0.0" validLength="4.117407409926116" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="93.83915233362848" length="4.117407409926116" distance="0.0" tStart="4.768485653589488" tEnd="4.926511016615871" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.8045147397340526" zOffsetEnd="0.8015926804041766"/>
+         </object>
+         <object type="railing" name="" id="429530" s="0.0" t="-4.945421184132327" zOffset="0.0" validLength="5.889825495864279" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="0.0" length="5.889825495864279" distance="0.0" tStart="-4.945421184132327" tEnd="-4.734957659399066" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.3754538519767931" zOffsetEnd="0.24493429363368308"/>
+         </object>
+         <object type="railing" name="" id="268864986" s="5.889825495864279" t="-4.734957659399066" zOffset="0.0" validLength="7.8391532857524195" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="5.889825495864279" length="7.8391532857524195" distance="0.0" tStart="-4.734957659399066" tEnd="-4.749286458746303" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.24493429363368308" zOffsetEnd="0.10504133248740971"/>
+         </object>
+         <object type="railing" name="" id="537300442" s="13.728978781616698" t="-4.749286458746303" zOffset="0.0" validLength="11.386629085762339" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="13.728978781616698" length="11.386629085762339" distance="0.0" tStart="-4.749286458746303" tEnd="-4.848932168213463" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.10504133248740971" zOffsetEnd="0.08749495716433103"/>
+         </object>
+         <object type="railing" name="" id="805735898" s="25.115607867379037" t="-4.848932168213463" zOffset="0.0" validLength="8.909910908638562" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="25.115607867379037" length="8.909910908638562" distance="0.0" tStart="-4.848932168213463" tEnd="-4.767557533000551" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.08749495716433103" zOffsetEnd="0.16653859246105868"/>
+         </object>
+         <object type="railing" name="" id="1074171354" s="34.0255187760176" t="-4.767557533000551" zOffset="0.0" validLength="12.479578572018923" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="34.0255187760176" length="12.479578572018923" distance="0.0" tStart="-4.767557533000551" tEnd="-4.560931347250225" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.16653859246105868" zOffsetEnd="0.3595544702648891"/>
+         </object>
+         <object type="railing" name="" id="1073741903" s="46.50509734803652" t="-4.560931347250225" zOffset="0.0" validLength="14.995422886680203" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="46.50509734803652" length="14.995422886680203" distance="0.0" tStart="-4.560931347250225" tEnd="-4.415104719925689" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.3595544702648891" zOffsetEnd="0.47059309278797173"/>
+         </object>
+         <object type="pole" name="Guidepost" id="256772" s="93.72329884463696" t="4.89310686328613" zOffset="0.9784041851726784" validLength="0.0" orientation="none" radius="0.0" height="0.5249343104660511" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256773" s="93.18068954335706" t="-5.028139041182506" zOffset="0.45604353390783103" validLength="0.0" orientation="none" radius="0.0" height="0.5578115405514836" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256774" s="85.59744309117286" t="4.908181229786391" zOffset="0.968763738131571" validLength="0.0" orientation="none" radius="0.0" height="0.5621783137321472" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256775" s="68.77383800650715" t="4.8494575370366375" zOffset="0.8925637329825804" validLength="0.0" orientation="none" radius="0.0" height="0.6124884970486164" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256776" s="67.62303000216613" t="-4.57904073173865" zOffset="0.6516050036435104" validLength="0.0" orientation="none" radius="0.0" height="0.5530306827276945" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256780" s="84.3522778862444" t="-4.706122176104637" zOffset="0.49862042721508715" validLength="0.0" orientation="none" radius="0.0" height="0.5034639062359929" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256829" s="83.05641188723246" t="-5.436040871004042" zOffset="-0.44732830753909525" validLength="0.0" orientation="none" radius="0.03604639817400316" height="2.8587933154776692" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256837" s="82.90173075955013" t="5.943459242730329" zOffset="0.114416339709706" validLength="0.0" orientation="none" radius="0.03098956089230741" height="2.9835449401289225" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="429468" s="57.90332163691999" t="4.743132676351382" zOffset="0.9218730592077975" validLength="0.0" orientation="none" radius="0.0" height="0.5014449348673224" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="429471" s="46.83782898856635" t="4.675099149220264" zOffset="0.79028437206523" validLength="0.0" orientation="none" radius="0.0" height="0.5061783734709024" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="429474" s="31.345161368213905" t="4.375638329281153" zOffset="0.5394708950931744" validLength="0.0" orientation="none" radius="0.0" height="0.5154963424429297" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="429477" s="19.549816431124373" t="4.326385243952478" zOffset="0.48905393704140465" validLength="0.0" orientation="none" radius="0.0" height="0.5432121297344565" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="429480" s="11.744276035006772" t="4.523716861890415" zOffset="0.6182571296210568" validLength="0.0" orientation="none" radius="0.0" height="0.537272110581398" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="429483" s="4.409125528546201" t="4.960887670780209" zOffset="0.8055236539698285" validLength="0.0" orientation="none" radius="0.0" height="0.5193124422803521" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="429510" s="10.60813030779528" t="-4.796130614258935" zOffset="0.38201438595164916" validLength="0.0" orientation="none" radius="0.0" height="0.5052273310720921" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="429515" s="19.247394979385877" t="-4.90584095981423" zOffset="0.2651452117187887" validLength="0.0" orientation="none" radius="0.0" height="0.45763459987938404" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="429521" s="31.674879168987406" t="-4.865573901747125" zOffset="0.35789718874369214" validLength="0.0" orientation="none" radius="0.0" height="0.5106203630566597" hdg="0.0" pitch="0.0" roll="0.0"/>
+      </objects>
+      <signals>
+         <signal s="82.97120228150814" t="-5.353046424387329" id="253184" dynamic="no" orientation="+" zOffset="1.5230290793122947" country="DEU" type="330.2" subtype="-1" height="0.8299999697183947" width="0.8237479841597763" hOffset="-0.18824995460327235"/>
+         <signal s="83.02442981703587" t="5.971256447567778" id="253319" dynamic="no" orientation="-" zOffset="1.9525570570681197" country="DEU" type="330.1" subtype="-1" height="0.8399997350305868" width="0.8173610407559426" hOffset="2.995159459960608"/>
+      </signals>
+   </road>
+   <road length="5.00000000519884" id="255968" junction="2104786">
+      <link>
+         <predecessor elementType="road" elementId="255967" contactPoint="end"/>
+         <successor elementType="road" elementId="2233780" contactPoint="start"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618335.6483242443" y="5809582.652802205" hdg="-0.9011456766760793" length="5.00000000519884">
+            <paramPoly3 aU="0.0" bU="4.988321527186695" cU="0.01679943075603907" dU="-0.022175336425093922" aV="-0.0" bV="4.440892098500626E-16" cV="-0.3576673273553873" dV="3.7377310616328735E-4" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="103.37807652327331" b="-0.0318149697223986" c="0.0029194007537145248" d="-1.2098996758975627E-4"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.05491821994064443" b="0.0012057081800999183" c="1.110223022316408E-18" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="-3.402261457511456" b="-0.033002751138959605" c="0.0067594768314362804" d="-5.602719578659543E-4"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <successor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.0" b="0.0" c="0.04387434891313955" d="-0.02822994843082956"/>
+                  <width sOffset="0.9371088987136861" a="0.015297611000359979" b="0.0078577426167043" c="-0.042460731722636036" d="0.060927981846458236"/>
+                  <width sOffset="1.4884908901190768" a="0.016934726339677297" b="0.016603936039906113" c="-0.0019984305778298814" d="-0.0021959721883185474"/>
+                  <width sOffset="2.034927034853682" a="0.02505270225023315" b="0.012452804423761853" c="-0.014900351507305652" d="0.008559907716410041"/>
+                  <width sOffset="2.9984052636648" a="0.03087473085861392" b="0.007578713705087907" c="0.005271371685869743" d="2.5155855455032003E-4"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.08519677457676113">
+                     <type name="solid" width="0.085197">
+                        <line length="5.00000000519884" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.085197"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="3.823588487793956" b="0.06686753764082512" c="0.0055917574761777744" d="-6.020992366429301E-4"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.14">
+                     <type name="solid" width="0.14">
+                        <line length="5.00000000519884" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.14"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="40.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="-2"/>
+                     <successor id="-2"/>
+                  </link>
+                  <width sOffset="0.0" a="0.4923894514025102" b="-0.013405147714804125" c="5.282904710499682E-4" d="-1.5454799990818205E-4"/>
+                  <width sOffset="2.326727060926394" a="0.4621126127638524" b="-0.013456782671379092" c="7.264996822484566E-4" d="-9.920196039322407E-5"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects>
+         <object type="railing" name="" id="256206" s="0.0" t="-8.380450226370609" zOffset="0.0" validLength="5.00000000519884" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="0.0" length="5.00000000519884" distance="0.0" tStart="-8.380450226370609" tEnd="-8.8477821553059" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.09265494064329233" zOffsetEnd="-0.010503459084312106"/>
+         </object>
+      </objects>
+      <signals/>
+   </road>
+   <road length="5.000000000314177" id="255969" junction="2104786">
+      <link>
+         <predecessor elementType="road" elementId="2233740" contactPoint="start"/>
+         <successor elementType="road" elementId="255967" contactPoint="end"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618336.1680767725" y="5809576.68794681" hdg="2.213261180806022" length="5.000000000314177">
+            <paramPoly3 aU="-0.0" bU="5.005019360936193" cU="-0.0044270947498434715" dU="-0.0011268434664287825" aV="-0.0" bV="-4.440892098500626E-16" cV="0.04912409498361152" dV="0.012506027918555556" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="103.06276320714413" b="0.019720908350736272" c="8.798968973209583E-4" d="1.4128251658168694E-4"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="-0.05150000366356894" b="-6.836432553721408E-4" c="-0.0" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="0.3266457842376699" b="-0.03139856200078996" c="4.366142457095263E-4" d="-3.765497976358464E-4"/>
+         <laneOffset s="1.0969353116847382" a="0.2922319459978856" b="-0.0317999567575751" c="-0.005573998052598185" d="0.0016264867288532507"/>
+         <laneOffset s="4.292297601505428" a="0.18677247366977573" b="-0.017600894801581436" c="0.05901378033151855" d="-0.0765585467963253"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.12613941023347258" b="-0.052744206385066196" c="0.0076266834342225065" d="-6.999473552082231E-4"/>
+                  <width sOffset="1.0969353116847382" a="0.07653550003688919" b="-0.0385389204715964" c="0.01009475251288161" d="-0.0027029838816971293"/>
+                  <width sOffset="1.8653479577801866" a="0.051655848118871084" b="-0.02781304481870503" c="7.205637113740055E-4" d="0.0015706658008182977"/>
+                  <width sOffset="3.4808118469887335" a="0.015227142924990333" b="-0.013187944789971234" c="0.02512261397900686" d="-0.016070638218577"/>
+                  <width sOffset="4.292297601505428" a="0.012481104817342742" b="-0.004162644034742376" c="-0.06299680327139554" d="0.06211439530660146"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.18">
+                     <type name="solid" width="0.18">
+                        <line length="5.000000000314177" space="0.0" tOffset="0.0" sOffset="0.0" width="0.18"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="1"/>
+                     <successor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="4.5237414646078555" b="-0.06829221402227822" c="0.001709845615958383" d="-0.0028649050516813984"/>
+                  <width sOffset="0.365697272080304" a="4.4988557415548955" b="-0.06819105215668154" c="-0.004364127725718017" d="7.236935547120119E-4"/>
+                  <width sOffset="1.0969353116847382" a="4.4469412754767115" b="-0.07341258803811557" c="-0.007548010946456043" d="0.002726730081201439"/>
+                  <width sOffset="4.259365468368702" a="4.225530955012144" b="-0.03934291072219459" c="0.03510700138800711" d="-0.026494521302793762"/>
+                  <width sOffset="4.292297601505428" a="4.224272437201437" b="-0.03711681577809582" c="0.08148557338845391" d="-0.1046795548277672"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.14">
+                     <type name="solid" width="0.14">
+                        <line length="5.000000000314177" space="0.0" tOffset="0.0" sOffset="0.0" width="0.14"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="3.141771287573647E-10" max="40.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="2"/>
+                     <successor id="2"/>
+                  </link>
+                  <width sOffset="0.0" a="0.4504796426719917" b="-0.013051342840350033" c="-0.0025573492722459797" d="0.002475180132484906"/>
+                  <width sOffset="0.365697272080304" a="0.44548584838628" b="-0.013928723251858927" c="0.0030890600499953215" d="-0.0011134184739088212"/>
+                  <width sOffset="4.259365468368702" a="0.3723584827869244" b="-0.04051362362169972" c="-0.02670251827366807" d="0.02810783290987676"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects>
+         <object type="railing" name="" id="256209" s="0.0" t="-5.241308392889576" zOffset="0.0" validLength="5.000000000314177" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="0.0" length="5.000000000314177" distance="0.0" tStart="-5.241308392889576" tEnd="-4.926511016615871" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.7428840641145411" zOffsetEnd="0.8015926804041908"/>
+         </object>
+         <object type="pole" name="Guidepost" id="256781" s="1.0093911082310358" t="6.026961645794442" zOffset="0.32955867281704343" validLength="0.0" orientation="none" radius="0.0" height="0.5312271686270833" hdg="0.0" pitch="0.0" roll="0.0"/>
+      </objects>
+      <signals/>
+   </road>
+   <road length="27.3432097038022" id="255970" junction="-1">
+      <link>
+         <predecessor elementType="road" elementId="2233780" contactPoint="end"/>
+         <successor elementType="junction" elementId="2104811"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618336.6829488871" y="5809555.811678873" hdg="4.3768073867071" length="27.3432097038022">
+            <paramPoly3 aU="0.0" bU="25.61531295654438" cU="4.760372637923309" dU="-6.170186867391347" aV="0.0" bV="2.6645352591003757E-15" cV="-11.241275464980697" dV="0.45747602864218617" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="102.53816443363624" b="-0.019954507177252834" c="0.0017213048081887168" d="-5.260332022842251E-5"/>
+         <elevation s="13.6716048519011" a="102.4526657607029" b="-0.002385207184097838" c="-3.618926406308379E-4" d="-5.441529906292962E-5"/>
+         <elevation s="14.701459243709143" a="102.44976608539703" b="-0.0033037392444777696" c="1.021579369414179E-4" d="1.6193311853069852E-5"/>
+         <elevation s="22.542237226392526" a="102.43794836787461" b="0.0012848436928744721" c="7.128614256742576E-4" d="-4.687975707681487E-5"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.058288669844597914" b="0.0" c="-1.8095041631856698E-6" d="0.0"/>
+         <superelevation s="13.6716048519011" a="0.057950450392434905" b="-4.94776517938899E-5" c="-1.5777457013247447E-4" d="3.802651984625421E-6"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="1.407737907318219" b="0.041929574658097775" c="0.05395129081277941" d="-0.01465192508328116"/>
+         <laneOffset s="2.126901763879186" a="1.6000047092823255" b="0.07258453685791329" c="-0.00537512241548864" d="-0.0010499844897332465"/>
+         <laneOffset s="4.98466090443677" a="1.7390310668081315" b="0.016137926423967244" c="-0.002666803793976681" d="2.1580266644000354E-4"/>
+         <laneOffset s="10.28378296341452" a="1.781774296073879" b="0.006054155108589262" c="1.1273388180625842E-4" d="-1.7154129833855876E-4"/>
+         <laneOffset s="13.166310521184446" a="1.7960537119852185" b="0.0024280801563165916" c="-0.0010064399674313427" d="1.7846981090865357E-4"/>
+         <laneOffset s="16.925706802640775" a="1.8004401684332616" b="0.002427840666171989" c="0.05881389623911547" d="-0.01810175809088305"/>
+         <laneOffset s="18.689094150266076" a="1.8883476233131158" b="0.040987053995665906" c="0.0070720004998128475" d="-0.006756665430606705"/>
+         <laneOffset s="20.502149382420352" a="1.9456377726962877" b="-0.0" c="-0.01611057357615047" d="0.0026904155146210895"/>
+         <laneOffset s="22.511158013454992" a="1.9024291137420546" b="-0.0321560780014347" c="-0.018101834563690113" d="0.0029690134259108443"/>
+         <laneOffset s="26.781297143061828" a="1.666221339889267" b="-0.02433902427539461" c="0.010348561933386284" d="-0.00602499101477471"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.4307661941621095" b="0.04207954151804922" c="-0.054324962922933394" d="0.013848219107240486"/>
+                  <width sOffset="2.126901763879186" a="0.40775529657259435" b="-0.0010721493888272426" c="-1.2676066890877826E-4" d="2.462785136925675E-4"/>
+                  <width sOffset="4.8270900908609695" a="0.40878459152181823" b="0.0036301577452217577" c="0.010647861098210552" d="0.0012654064997067286"/>
+                  <width sOffset="4.98466090443677" a="0.4096259200979697" b="0.007079996685906694" c="-4.6409244724560485E-4" d="-3.80656484385265E-7"/>
+                  <width sOffset="10.28378296341452" a="0.43405500560079147" b="0.0021293643412463514" c="1.810124518069333E-4" d="3.8696330829421377E-4"/>
+                  <width sOffset="12.078305662217787" a="0.4406953457229117" b="0.006517453675002882" c="-9.465349086807194E-4" d="4.130005775124635E-4"/>
+                  <width sOffset="13.166310521184446" a="0.44719781809683257" b="0.005924458482364306" c="3.726128655211127E-5" d="6.298946826982052E-5"/>
+                  <width sOffset="13.6716048519011" a="0.4502090534767569" b="0.006010362175270973" c="6.546770826241523E-5" d="6.515365842740077E-5"/>
+                  <width sOffset="16.925706802640775" a="0.4727057164037407" b="0.008506210723248319" c="-0.05710600232687858" d="0.01834538156021911"/>
+                  <width sOffset="18.689094150266076" a="0.41072584931046396" b="-0.021756978505716" c="-0.004075298957358231" d="0.007000288899967071"/>
+                  <width sOffset="18.993744829345907" a="0.40391726915719706" b="-0.022290930493614632" c="0.007717858601379815" d="0.017327821845691645"/>
+                  <width sOffset="20.419784950621203" a="0.43807483478330767" b="0.10543409944196827" c="2.1168049449347963" d="-1.1497325620389613"/>
+                  <width sOffset="20.502149382420352" a="0.4604766313372599" b="0.4307339615888748" c="1.8191456885981476" d="-1.159179642984089"/>
+                  <width sOffset="21.649708212196625" a="1.598622161730459" b="0.026346707826289357" c="-0.7692454498350301" d="0.6473593647846845"/>
+                  <width sOffset="22.220463032916236" a="1.483432786452663" b="-0.2191009607360521" c="-0.07057881807665475" d="0.03791409043392161"/>
+                  <width sOffset="22.511158013454992" a="1.4147084254097537" b="-0.25052314885107846" c="-0.019308045776789372" d="0.03763549252263261"/>
+                  <width sOffset="23.15344877668534" a="1.255806667412357" b="-0.22874776029926702" c="0.01747184349486506" d="-0.006678743314763674"/>
+                  <width sOffset="23.91954906702513" a="1.0878143610445974" b="-0.21373684835216525" c="-0.015614237732035059" d="0.007500982360275061"/>
+                  <width sOffset="25.837415718798102" a="0.6733774410123132" b="-0.19085827892628912" c="0.00340395627448886" d="-4.450993821220805E-4"/>
+                  <width sOffset="26.781297143061828" a="0.4958881919112963" b="-0.185622050066514" c="0.011727497880134625" d="0.008548905058562345"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.16">
+                     <type name="solid" width="0.16">
+                        <line length="27.3432097038022" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.16"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="5.225574954747821" b="-0.02997153663348231" c="0.05716805526712944" d="-0.014651782234769843"/>
+                  <width sOffset="2.126901763879186" a="5.279468243807059" b="0.014368848166409515" c="-0.0021574464868866837" d="-0.0010498416412219268"/>
+                  <width sOffset="4.98466090443677" a="5.278409593677725" b="-0.023683576834681284" c="5.520968145574486E-4" d="2.1594551493100365E-4"/>
+                  <width sOffset="5.357139978994054" a="5.269675714803927" b="-0.02318240654314497" c="0.0027689341417762798" d="-1.8352833517871448E-4"/>
+                  <width sOffset="10.28378296341452" a="5.200725268861535" b="-0.009263001861966106" c="-5.947579501370899E-4" d="-5.708722439733537E-4"/>
+                  <width sOffset="10.310022270384465" a="5.200481794307374" b="-0.009295393073531274" c="-3.449783058026803E-4" d="2.822991482294649E-4"/>
+                  <width sOffset="13.166310521184446" a="5.177695337470715" b="-0.00435679468409422" c="0.0024382486251231412" d="6.32310257477522E-4"/>
+                  <width sOffset="14.010351862532152" a="5.176135253186384" b="0.0011105550538247785" c="0.0010577792458736075" d="-1.63108867828386E-4"/>
+                  <width sOffset="16.925706802640775" a="5.1843217060418105" b="0.0031192280799348443" c="0.05743873849115475" d="-0.018443336769654678"/>
+                  <width sOffset="17.157135932892807" a="5.187891363957654" b="0.02674177816729747" c="0.02714618159188232" d="-0.01618942747095487"/>
+                  <width sOffset="18.689094150266076" a="5.234361312497723" b="-0.004069296652170415" c="-0.0032390599318030677" d="-0.004844334810678582"/>
+                  <width sOffset="20.502149382420352" a="5.187464753783908" b="-0.06358693140553483" c="-0.016020150899557644" d="0.00460274613454921"/>
+                  <width sOffset="22.212142698666753" a="5.0549018010148465" b="-0.07799927905056993" c="0.004365542873241392" d="0.001407836571444446"/>
+                  <width sOffset="22.511158013454992" a="5.03200678443657" b="-0.07501092602475057" c="-0.012578027997388318" d="0.001686434482726844"/>
+                  <width sOffset="26.781297143061828" a="4.613660141659871" b="-0.0901789998397601" c="-5.580030966037663E-4" d="-0.007307569957967117"/>
+                  <width sOffset="27.315426761814418" a="4.5642201133535565" b="-0.09702951925010997" c="-0.03208159682456846" d="0.6252144031103941"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.11335667116327237">
+                     <type name="solid" width="0.113357">
+                        <line length="27.3432097038022" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.113357"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="40.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="-2"/>
+                  </link>
+                  <width sOffset="0.0" a="0.3516836393373697" b="0.022972536747123656" c="-0.0022497603526889028" d="5.1439212240296085E-5"/>
+                  <width sOffset="5.357139978994054" a="0.41809346223678556" b="0.003296728438206366" c="-0.003398590942090019" d="4.5091306237032657E-4"/>
+                  <width sOffset="8.258208656290865" a="0.41006375956484087" b="-0.005037440189735367" c="0.0014586294908316706" d="1.9899011228649452E-4"/>
+                  <width sOffset="10.310022270384465" a="0.4075874911937021" b="0.0034614402715305564" c="0.0023887838328075675" d="-6.541813359002028E-4"/>
+                  <width sOffset="13.6716048519011" a="0.4213670550744526" b="-0.0026555847794368275" c="-0.0043073168156400055" d="-6.425437071160743E-4"/>
+                  <width sOffset="14.010351862532152" a="0.4199482447009948" b="-0.005794960948796073" c="-0.001978738722724291" d="1.528754181930908E-4"/>
+                  <width sOffset="17.157135932892807" a="0.38688242351608615" b="-0.013706856110199773" c="0.01695203980611357" d="-0.0021010338804720438"/>
+                  <width sOffset="18.81727469661384" a="0.4012348300644777" b="0.02520688988698785" c="0.01001123098852498" d="-0.0021591042625005346"/>
+                  <width sOffset="22.212142698666753" a="0.5177118787954798" b="0.018528641536392526" c="-0.008752089326481041" d="0.0010358053006115791"/>
+                  <width sOffset="27.315426761814418" a="0.5219999001019517" b="0.010127857189149644" c="0.026919961783500472" d="-0.6314861677785538"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects>
+         <object type="railing" name="" id="256199" s="13.49074558784201" t="2.969267577861581" zOffset="0.0" validLength="3.6622311450983744" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="13.49074558784201" length="3.6622311450983744" distance="0.0" tStart="2.969267577861581" tEnd="3.6369396864343724" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.7322282908240039" zOffsetEnd="0.10607313957770942"/>
+         </object>
+         <object type="railing" name="" id="256210" s="0.0" t="2.274696232335219" zOffset="0.0" validLength="7.499804470995674" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="0.0" length="7.499804470995674" distance="0.0" tStart="2.274696232335219" tEnd="2.593905615231265" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.7326357747386181" zOffsetEnd="0.7555311663956343"/>
+         </object>
+         <object type="railing" name="" id="268691666" s="7.499804470995674" t="2.593905615231265" zOffset="0.0" validLength="5.9909411168463365" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="7.499804470995674" length="5.9909411168463365" distance="0.0" tStart="2.593905615231265" tEnd="2.969267577861581" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.7555311663956343" zOffsetEnd="0.7322282908240039"/>
+         </object>
+         <object type="pole" name="Guidepost" id="256733" s="17.59831108756465" t="-4.437940225523946" zOffset="-0.14262763792129363" validLength="0.0" orientation="none" radius="0.0" height="1.05799073074013" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256783" s="2.1765312519682305" t="2.621130244510514" zOffset="0.9162699825528478" validLength="0.0" orientation="none" radius="0.0" height="0.50585669092834" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256784" s="9.589389417517598" t="2.870356904936447" zOffset="0.9283747374095128" validLength="0.0" orientation="none" radius="0.0" height="0.5017593884840608" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256785" s="6.521349533359336" t="-4.64377985862718" zOffset="-0.23676179152111843" validLength="0.0" orientation="none" radius="0.0" height="1.0238681882619858" hdg="0.0" pitch="0.0" roll="0.0"/>
+      </objects>
+      <signals/>
+   </road>
+   <road length="2.3954492240179213" id="255971" junction="-1">
+      <link>
+         <predecessor elementType="junction" elementId="2104812"/>
+         <successor elementType="junction" elementId="2104772"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618314.2671997447" y="5809512.243934418" hdg="0.3863532914312755" length="2.3954492240179213">
+            <paramPoly3 aU="0.0" bU="2.4074531872699567" cU="-0.013203516834232768" dU="-0.004319016626828837" aV="-0.0" bV="1.1102230246251565E-16" cV="-0.11426195871935727" dV="-0.023173189431607354" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="102.44942028521172" b="0.010141446185248947" c="0.0013767303956579385" d="-2.8833484172142054E-4"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.0415468638609636" b="-0.0012409491600329085" c="-0.0" d="-6.310145179558321E-20"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="1.3308453850658968" b="-0.0068740564225703805" c="-0.03663114048693799" d="0.011524923206904028"/>
+         <laneOffset s="2.2089570838080026" a="1.2611419430102049" b="-0.0" c="0.01213579567809786" d="-2.744505219855575E-4"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="0.30415473382499214" b="-0.16942558770107508" c="0.0648251172899101" d="-0.011435367982503521"/>
+                  <width sOffset="1.3100597273438297" a="0.16774235849497354" b="-0.058454110256738474" c="0.037776913184701805" d="-0.03178145984980458"/>
+                  <width sOffset="2.206105043581306" a="0.12283119670878695" b="-0.06730619422494441" c="-0.02895240295019587" d="-0.016700694815655726"/>
+                  <width sOffset="2.2089570838080026" a="0.12263900084520474" b="-0.06747174859802303" c="-0.0014880499914976721" d="-0.004901306983504062"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.16">
+                     <type name="solid" width="0.16">
+                        <line length="2.3954492240179213" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.16"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="4.7968803488589815" b="0.004417222257063066" c="-0.047810649288566744" d="0.00942811802413667"/>
+                  <width sOffset="2.2089570838080026" a="4.674967942523726" b="-0.06879286020051949" c="-0.012938971109076873" d="-0.002371255704738511"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.14">
+                     <type name="solid" width="0.14">
+                        <line length="2.3954492240179213" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.14"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="40.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="0.6200747545060459" b="-0.01737591990920161" c="-0.006389286044625181" d="0.002207864715602972"/>
+                  <width sOffset="1.9187659522519898" a="0.5788081409036625" b="-0.017509168915489974" c="0.00478933444761491" d="0.0037930384188726756"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects/>
+      <signals/>
+   </road>
+   <road length="121.1417693566872" id="255972" junction="-1">
+      <link>
+         <predecessor elementType="junction" elementId="2104816"/>
+         <successor elementType="junction" elementId="2104836"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618256.9549774269" y="5809355.112831772" hdg="0.5493179474556875" length="11.999899129659582">
+            <paramPoly3 aU="0.0" bU="8.982041601824736" cU="12.399340894852442" dU="-9.653358951752837" aV="-0.0" bV="-0.0" cV="5.8979234043877256" dV="-3.473182525726275" pRange="normalized"/>
+         </geometry>
+         <geometry s="11.999899129659582" x="618265.6916129201" y="5809363.3041140195" hdg="0.8274203730779807" length="42.07073566258047">
+            <paramPoly3 aU="0.0" bU="47.584604298144114" cU="-15.187224502466972" dU="6.083449424836713" aV="-0.0" bV="3.552713678800501E-15" cV="18.36133907001869" dV="-3.5063203364329034" pRange="normalized"/>
+         </geometry>
+         <geometry s="54.07063479224005" x="618280.798470546" y="5809401.6867748415" hdg="1.463815138882098" length="67.07113456444715">
+            <paramPoly3 aU="0.0" bU="66.5669909273945" cU="0.9447548520382842" dU="-0.5163754560399725" aV="-0.0" bV="-0.0" cV="6.552358025463324" dV="-3.5465077043251694" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="106.62247750719847" b="-0.02230373966925212" c="-1.2354869585378913E-4" d="3.372269324418897E-21"/>
+         <elevation s="10.0951474463906" a="106.38472687169691" b="-0.024798224272158657" c="-2.019919334335896E-4" d="7.770390476840307E-6"/>
+         <elevation s="20.1902948927812" a="106.12179404632626" b="-0.02650081282552692" c="-5.987106614349085E-7" d="-4.408726851121123E-6"/>
+         <elevation s="25.82576015832984" a="105.97164157563878" b="-0.026927604093701166" c="-8.672251741564703E-5" d="-4.018309777258692E-6"/>
+         <elevation s="30.2854423391718" a="105.84947180138786" b="-0.027940871483323" c="-2.6465132904510103E-4" d="1.7098880878712805E-5"/>
+         <elevation s="40.3805897855624" a="105.55802505118412" b="-0.028056516315410507" c="1.3871371634321884E-4" d="-1.2153743567136181E-5"/>
+         <elevation s="50.475737231953" a="105.2764230004965" b="-0.02897168249163249" c="-1.851813644897148E-4" d="8.557581796209077E-6"/>
+         <elevation s="55.50716095193803" a="105.12705627522897" b="-0.03018522299434019" c="4.199370405569914E-5" d="6.3092433591247425E-6"/>
+         <elevation s="60.5708846783436" a="104.97610261343479" b="-0.029274602396218152" c="-6.468571500805306E-5" d="1.0036454969047337E-5"/>
+         <elevation s="70.6660321247342" a="104.68430460743987" b="-0.027512120402018655" c="3.08218931290755E-4" d="-1.9550815858008628E-5"/>
+         <elevation s="80.7611795711248" a="104.4178626981626" b="-0.027266477640099485" c="-1.543776734632649E-4" d="3.0061856095814846E-6"/>
+         <elevation s="90.8563270175154" a="104.12996346219836" b="-0.029464309210937525" c="-5.9498090138302453E-5" d="-7.1020051913324975E-6"/>
+         <elevation s="100.951474463906" a="103.81914668538118" b="-0.03283693189741719" c="-1.6333748155937034E-4" d="-7.633783294146277E-6"/>
+         <elevation s="111.0466219102966" a="103.46315320281485" b="-0.038468686231350836" c="-2.563438698186024E-4" d="-1.857921363282749E-6"/>
+         <elevation s="114.49390617932514" a="103.32741826166745" b="-0.040302303935079775" c="-1.4580870451627473E-4" d="-3.032069093015355E-6"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="-0.0342665422150466" b="3.370573121450984E-6" c="-1.6694026210860803E-7" d="0.0"/>
+         <superelevation s="10.0951474463906" a="-0.03424952899872666" b="0.0" c="-2.0358298148411715E-5" d="1.3444279875734148E-6"/>
+         <superelevation s="20.1902948927812" a="-0.03494111397235736" b="0.0" c="7.043494842268029E-5" d="-3.3616734433106924E-6"/>
+         <superelevation s="30.2854423391718" a="-0.03122149310300761" b="3.943177677370355E-4" c="-1.0113690883728461E-5" d="1.255599407541769E-6"/>
+         <superelevation s="40.3805897855624" a="-0.026979721960283407" b="5.740013142036867E-4" c="1.390626059175224E-5" d="1.31842634003807E-7"/>
+         <superelevation s="50.475737231953" a="-0.01963223730039122" b="8.950818567337754E-4" c="4.737196943989144E-5" d="-3.0513439602286224E-6"/>
+         <superelevation s="60.5708846783436" a="-0.008907755319650344" b="9.186301743706692E-4" c="8.912621064908976E-7" d="-1.4984255676553382E-6"/>
+         <superelevation s="70.6660321247342" a="-0.001084823182440389" b="4.7850237094443707E-4" c="-2.369962268929118E-5" d="0.0"/>
+         <superelevation s="80.7611795711248" a="0.0013304528116254014" b="0.0" c="-4.397322752453781E-5" d="2.3091366814675495E-6"/>
+         <superelevation s="90.8563270175154" a="-7.752684891924194E-4" b="-1.8184620505464548E-4" c="1.750831524647776E-6" d="8.896269243729593E-8"/>
+         <superelevation s="100.951474463906" a="-0.0023410756935610495" b="-1.1929730200515402E-4" c="6.0809549922496385E-6" d="-2.510057912767817E-7"/>
+         <superelevation s="111.0466219102966" a="-0.003183916196589656" b="-7.32625355629042E-5" c="1.0130740465755281E-6" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="-0.19764285551781094" b="0.04208055235115278" c="0.0072365309054133325" d="-0.006965505687974341"/>
+         <laneOffset s="1.2695708410602367" a="-0.14680826348190965" b="0.026773911920827145" c="-0.009938886869029944" d="-4.0860750451946425E-4"/>
+         <laneOffset s="2.520065419028615" a="-0.12966844303996922" b="-0.0" c="-0.009794345186158753" d="-5.666426914339139E-9"/>
+         <laneOffset s="4.385155869556256" a="-0.16373872058882463" b="-0.015542939979075021" c="-0.0037022289583130827" d="0.0027042154050957276"/>
+         <laneOffset s="6.298954455573634" a="-0.18808938377233564" b="-0.0" c="0.0012464159756388018" d="-5.534297803294356E-5"/>
+         <laneOffset s="10.0951474463906" a="-0.17315484379675877" b="0.007070614725970656" c="6.160117119852603E-4" d="-5.533039718650173E-5"/>
+         <laneOffset s="17.784765708390868" a="-0.10751771888816758" b="0.006729307374712392" c="4.6006188435937214E-4" d="-3.851337803362131E-5"/>
+         <laneOffset s="20.1902948927812" a="-0.0892040901630501" b="0.008274110803928017" c="1.820399508654192E-4" d="-3.8569102003020616E-5"/>
+         <laneOffset s="30.364980451418813" a="-0.026797924673537428" b="-0.0" c="-0.008515315596508716" d="5.764026083428999E-4"/>
+         <laneOffset s="38.27249114699403" a="-0.2742494656207845" b="-0.02654473705933093" c="8.795243350347481E-4" d="-6.940593440122914E-5"/>
+         <laneOffset s="40.3805897855624" a="-0.3269499468564676" b="-0.023761825500561228" c="4.5535275283993125E-4" d="-7.042562878155397E-5"/>
+         <laneOffset s="42.3142806867633" a="-0.37170453969808737" b="-0.02279080073883043" c="-1.5860433881711888E-4" d="1.5855558559255877E-4"/>
+         <laneOffset s="45.39749835638073" a="-0.438834039422831" b="-0.019247025975422126" c="-0.0038749563838289644" d="0.0015494919607011584"/>
+         <laneOffset s="48.43004681987952" a="-0.4896242174057427" b="-0.0" c="0.0013544944740792068" d="-4.473857133694515E-5"/>
+         <laneOffset s="50.475737231953" a="-0.4843388649097398" b="0.0049800801859271205" c="0.001095281261968049" d="-4.085046011942435E-5"/>
+         <laneOffset s="58.46417851849793" a="-0.3954851085008317" b="0.014658620157255057" c="0.001792465502489438" d="-1.2192141662029774E-4"/>
+         <laneOffset s="60.5708846783436" a="-0.35778832928218063" b="0.020587677528010766" c="0.0010277231968447045" d="-1.202456997611359E-4"/>
+         <laneOffset s="68.94920891311624" a="-0.18387551165471952" b="0.01248645809271648" c="-6.885985845222412E-4" d="-9.753537941591325E-6"/>
+         <laneOffset s="70.6660321247342" a="-0.16451745834281922" b="0.010035808895125954" c="-7.385393462064802E-4" d="-9.659705972585822E-6"/>
+         <laneOffset s="73.60040446832156" a="-0.1416719489183602" b="0.0054519841463600135" c="-3.212003159598286E-4" d="5.844531056148083E-10"/>
+         <laneOffset s="80.7611795711248" a="-0.11910139424700149" b="8.519876017644723E-4" c="-3.211755404006738E-4" d="-9.466199405611746E-9"/>
+         <laneOffset s="82.08745997063474" a="-0.11853639597647786" b="-0.0" c="-0.0022096930741520695" d="1.49784708362881E-4"/>
+         <laneOffset s="89.7364400511546" a="-0.18078731373639478" b="-0.007513481430462" c="-9.730514186043219E-5" d="8.194343892340895E-6"/>
+         <laneOffset s="90.8563270175154" a="-0.18931208961843185" b="-0.007700592219780362" c="-6.985981373548462E-5" d="8.15501674621202E-6"/>
+         <laneOffset s="100.951474463906" a="-0.2657802396700145" b="-0.006617800212276366" c="1.770832549984765E-4" d="8.155162293364661E-6"/>
+         <laneOffset s="111.68239699415045" a="-0.30632643572049817" b="-0.0" c="0.0016618142519939107" d="-1.0237678168890463E-4"/>
+         <laneOffset s="116.482856398499" a="-0.2793562101617066" b="0.008877305962017083" c="0.0011854686749165641" d="-1.0873572472970906E-4"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="2" type="shoulder" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="2.361929908699989" b="-0.027398746996348554" c="-0.11626808140966191" d="0.1037585519790145"/>
+                  <width sOffset="0.7127269426969454" a="2.320906127297407" b="-0.035011822673108574" c="0.03205370145427185" d="-0.006925566561515286"/>
+                  <width sOffset="2.8646078043415906" a="2.324982771252701" b="0.006731267123801874" c="0.0037893727663139178" d="-9.184536422021716E-4"/>
+                  <width sOffset="4.890423676249123" a="2.346534553615391" b="0.010776601891803121" c="7.398469601618374E-4" d="-3.851750522228263E-4"/>
+                  <width sOffset="9.71541251850825" a="2.3724895231749503" b="-0.008985114885349189" c="-0.002326507348295497" d="1.5027745843662082E-4"/>
+                  <width sOffset="10.0951474463906" a="2.3687503108639714" b="-0.010687017681256962" c="-0.0021452542738799275" d="1.4829207838807623E-4"/>
+                  <width sOffset="13.532320455787424" a="2.3126945503693657" b="-0.020178399593609526" c="0.014243479244362986" d="-0.001344083331102557"/>
+                  <width sOffset="19.88595967537518" a="2.4147377440872404" b="-0.0019593595389244163" c="-0.01920170773886496" d="-1.7408981747447103E-4"/>
+                  <width sOffset="20.723145948852085" a="2.3995371355053594" b="-0.034476220492652775" c="-0.007924002230824678" d="0.0013165219712427503"/>
+                  <width sOffset="24.723802278398882" a="2.219082869045831" b="-0.03466484579738564" c="-0.00336604595755383" d="-2.2448501175432773E-6"/>
+                  <width sOffset="30.2854423391718" a="1.921785292889636" b="-0.07231462992034823" c="-0.0034932187335051665" d="9.139290170973253E-6"/>
+                  <width sOffset="30.336590293373288" a="1.918077410077581" b="-0.07267190017571808" c="0.006406559825664365" d="-5.482103995699642E-4"/>
+                  <width sOffset="33.51742516891668" a="1.734096885931308" b="-0.048555384681082295" c="-0.013646019941830047" d="0.0010054237801990283"/>
+                  <width sOffset="41.11422314582424" a="1.0185006365163987" b="-0.08181443868776117" c="0.01347244286982954" d="0.0019222640417681097"/>
+                  <width sOffset="41.376697216595566" a="0.9979893792727403" b="-0.07434481531989931" c="-0.0013306433613186233" d="9.419774574236296E-4"/>
+                  <width sOffset="46.35305471152497" a="0.7111555346983116" b="-0.01760656173998787" c="0.058101506190309946" d="-0.01423219247926705"/>
+                  <width sOffset="48.16679556213509" a="0.7854381943724689" b="0.05269854204609274" c="-0.03207621733137025" d="-0.014792510443266635"/>
+                  <width sOffset="48.824773378939256" a="0.8020119383393407" b="-0.008724914835409013" c="-2.6214707599793484E-4" d="-1.4754398324796634E-5"/>
+                  <width sOffset="50.475737231953" a="0.7868264950323551" b="-0.009711152906744996" c="-2.482532710230083E-4" d="-3.6905854291128594E-5"/>
+                  <width sOffset="52.196347289349966" a="0.7691944407053124" b="-0.010893226287358199" c="-0.0066136521081195665" d="6.31550646509285E-4"/>
+                  <width sOffset="58.12243360593435" a="0.6038140311413023" b="-0.022742040504967483" c="2.0188800443570875E-4" d="5.610026547977183E-5"/>
+                  <width sOffset="58.53220478129748" a="0.5945327579922917" b="-0.022548324941857597" c="0.0017839436122756452" d="-4.897720179522316E-5"/>
+                  <width sOffset="60.5708846783436" a="0.5555634024058365" b="-0.015885224430690986" c="0.0014683225702670326" d="-5.611904305781404E-5"/>
+                  <width sOffset="69.19110382246403" a="0.4917904527029697" b="-0.0030810113085595996" c="0.001827889744189682" d="2.7916351081618152E-5"/>
+                  <width sOffset="69.30113044942148" a="0.49147362477957346" b="-0.0026777643683664667" c="0.0014238782874814245" d="-1.0466476349017528E-4"/>
+                  <width sOffset="70.6660321247342" a="0.4902052265410708" b="6.241856211414536E-4" c="9.953349967092597E-4" d="-1.0478121874639094E-4"/>
+                  <width sOffset="74.06688604663807" a="0.49971841873405287" b="0.0037585252905897645" c="1.5372455567733959E-4" d="-3.023873807904437E-5"/>
+                  <width sOffset="80.7611795711248" a="0.5226965605704397" b="0.0017513628507256885" c="-4.5380077253151757E-4" d="-3.0242847421511164E-5"/>
+                  <width sOffset="82.19979133220463" a="0.5241868602282365" b="2.579044578656055E-4" c="-6.382788633079596E-4" d="-6.867632092154715E-5"/>
+                  <width sOffset="82.30801796339392" a="0.5242072091380439" b="1.1733369758949342E-4" c="-0.002296928002997576" d="1.6334099046137168E-4"/>
+                  <width sOffset="89.5787634429059" a="0.46641765489278075" b="-0.007378977222611464" c="0.0017613246567885473" d="1.7760781204920057E-4"/>
+                  <width sOffset="89.9956488381631" a="0.4636604417463164" b="-0.005817834957139417" c="-1.6001095740739737E-4" d="5.33759805956308E-5"/>
+                  <width sOffset="90.8563270175154" a="0.45856865781547596" b="-0.005974653352541041" c="-2.3591532808370935E-5" d="5.279617187097242E-5"/>
+                  <width sOffset="99.8067395893453" a="0.4410588579697472" b="0.0062915245474801625" c="-3.0012285179023388E-5" d="-1.6835638353105605E-5"/>
+                  <width sOffset="100.951474463906" a="0.44819640207365463" b="0.006156627161225553" c="-8.522253077530673E-5" d="-1.5123484706341472E-5"/>
+                  <width sOffset="108.33593275293882" a="0.4829226879927897" b="0.0024239216774480264" c="1.3701244736410485E-4" d="-6.304589673478825E-5"/>
+                  <width sOffset="111.0466219102966" a="0.48924420198721696" b="0.0017769653146562077" c="-3.780191646113099E-4" d="-6.264469288336671E-5"/>
+                  <width sOffset="111.79052122764844" a="0.4903311061442932" b="0.001110548793084455" c="0.009944452618485224" d="-8.042998798533597E-4"/>
+                  <width sOffset="112.67673437753669" a="0.49856560151664153" b="0.01684133011983123" c="0.00602382656862507" d="-7.41615859270577E-4"/>
+                  <width sOffset="116.55636506279157" a="0.6112653657721614" b="0.030094405389115005" c="9.277146512180054E-4" d="-3.07180828239906E-8"/>
+                  <width sOffset="118.01133088662124" a="0.657015505335325" b="0.03279379652900499" c="-0.00421174714782192" d="-1.9781539121797363E-4"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+               <lane id="1" type="driving" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="4.311825194100258" b="-0.05783288930061228" c="0.11530565036671747" d="-0.09732074373102653"/>
+                  <width sOffset="0.7127269426969454" a="4.293944010238438" b="-0.04178088708556852" c="-0.019250934326443037" d="0.013363374809502959"/>
+                  <width sOffset="1.2695708410602367" a="4.26701670858687" b="-0.05078946729110688" c="-0.006281184123433396" d="0.006806476626048345"/>
+                  <width sOffset="2.520065419028615" a="4.206992322646172" b="-0.034568028990549934" c="0.01757577613476403" d="0.006397874787948953"/>
+                  <width sOffset="2.8646078043415906" a="4.1974302581799625" b="-0.020178364631121895" c="0.00774413952453817" d="3.907618686428165E-4"/>
+                  <width sOffset="4.385155869556256" a="4.186026815414958" b="-0.014909088212771489" c="0.003434508201469863" d="-0.002313459202879823"/>
+                  <width sOffset="6.298954455573634" a="4.1538568853523765" b="-0.0271831750655731" c="7.293492693530366E-4" d="4.4609918024884876E-4"/>
+                  <width sOffset="9.71541251850825" a="4.0872891425839235" b="-0.006578735269807611" c="0.0027925450136045667" d="-8.935333041259069E-5"/>
+                  <width sOffset="10.0951474463906" a="4.0851887554025135" b="-0.004496535390704128" c="0.0026908796599184725" d="-8.936591125877874E-5"/>
+                  <width sOffset="17.784765708390868" a="4.169090758396677" b="0.021034458960129697" c="-4.911486400505215E-4" d="-1.0618293041153706E-4"/>
+                  <width sOffset="19.88595967537518" a="4.210134769158227" b="0.01756406380363504" c="0.0066652438441831795" d="-0.0012761764440366618"/>
+                  <width sOffset="20.1902948927812" a="4.216061494486682" b="0.021266402574510887" c="0.005500174306495106" d="-0.0012761207200684454"/>
+                  <width sOffset="24.723802278398882" a="4.306612732172958" b="-0.0075465734270185065" c="-6.128342231666692E-4" d="4.264610129184716E-5"/>
+                  <width sOffset="30.336590293373288" a="4.252489822529108" b="-0.010395500399423507" c="-0.00979311983642781" d="5.99995784457149E-4"/>
+                  <width sOffset="30.364980451418813" a="4.252186813094103" b="-0.010950106047514042" c="-0.0022219478190808224" d="-1.4975925502213466E-5"/>
+                  <width sOffset="38.27249114699403" a="4.0192583724512945" b="-0.04889953493634215" c="0.001701674747407593" d="6.308326172419392E-4"/>
+                  <width sOffset="40.3805897855624" a="3.929645700334822" b="-0.03331452689300224" c="0.005676474806861759" d="6.318523116210921E-4"/>
+                  <width sOffset="41.11422314582424" a="3.9085097222153724" b="-0.023965401632373783" c="0.0028626598169315645" d="-2.849879498692657E-4"/>
+                  <width sOffset="42.3142806867633" a="3.883379956716811" b="-0.018325954646750468" c="0.0020420669008779117" d="-5.139691642433208E-4"/>
+                  <width sOffset="45.39749835638073" a="3.8312250864876387" b="-0.02039141025628649" c="0.002470966668735086" d="-0.0019049055393517724"/>
+                  <width sOffset="46.35305471152497" a="3.8123341113106646" b="-0.020887153318329316" c="-0.04835906692421048" d="0.013269264397338772"/>
+                  <width sOffset="48.43004681987952" a="3.679227321723379" b="-0.050043265551662136" c="0.0431886829225924" d="0.014863494929380753"/>
+                  <width sOffset="48.824773378939256" a="3.6671172379021364" b="-0.009000223790481474" c="-2.237698850988542E-4" d="8.573888443436957E-5"/>
+                  <width sOffset="50.475737231953" a="3.652034093426934" b="-0.009038005063434457" c="-1.643432626731705E-5" d="7.973749742117973E-5"/>
+                  <width sOffset="52.196347289349966" a="3.6368407292016514" b="-0.008386370860692821" c="0.006570054178662391" d="-5.887190033792285E-4"/>
+                  <width sOffset="58.12243360593435" a="3.69535140647325" b="0.007458262223896596" c="5.159861089127683E-4" d="-1.3268622342117072E-5"/>
+                  <width sOffset="58.46417851849793" a="3.6979599618679666" b="0.007806284568543896" c="-0.0011737960907316504" d="6.780233416051114E-5"/>
+                  <width sOffset="60.5708846783436" a="3.7098299073551715" b="0.0037633608231943463" c="-7.979482423165865E-4" d="5.516192633111771E-5"/>
+                  <width sOffset="68.94920891311624" a="3.7177897828269484" b="0.0020089148281963298" c="-7.175053296078561E-4" d="-5.5330235487243556E-5"/>
+                  <width sOffset="69.30113044942148" a="3.718405489497691" b="0.0014833459279434552" c="-3.626949515291817E-4" d="7.725087921687215E-5"/>
+                  <width sOffset="70.6660321247342" a="3.7199508557631487" b="9.250051360059335E-4" c="-5.324693436822847E-5" d="7.429274887113726E-5"/>
+                  <width sOffset="73.60040446832156" a="3.724083800567568" b="0.0025316147646215178" c="9.83862760909308E-5" d="6.463245843593892E-5"/>
+                  <width sOffset="74.06688604663807" a="3.725292722330725" b="0.002665598585875507" c="-3.8590585361054463E-5" d="-9.910022221900557E-6"/>
+                  <width sOffset="80.7611795711248" a="3.738434681212332" b="8.166148759745865E-4" c="-2.37988654771008E-4" d="-9.615903104975411E-6"/>
+                  <width sOffset="82.08745997063474" a="3.739076681331271" b="1.3459181078677394E-4" c="0.0016122310630278574" d="-1.5941007766478752E-4"/>
+                  <width sOffset="82.19979133220463" a="3.7391119179305687" b="4.907655625514993E-4" c="0.0016124657525064463" d="-1.2097660324048568E-4"/>
+                  <width sOffset="89.5787634429059" a="3.7819248805614705" b="0.004526196727527949" c="-0.001561003547308896" d="-1.3524342482603617E-4"/>
+                  <width sOffset="89.7364400511546" a="3.782599216202236" b="0.004023842007221417" c="-3.002649012381642E-4" d="6.346939646032791E-6"/>
+                  <width sOffset="90.8563270175154" a="3.786737802444255" b="0.0033751964909891257" c="-2.774572468331661E-4" d="6.9660755170456E-6"/>
+                  <width sOffset="100.951474463906" a="3.7997014999276106" b="-9.696703738036692E-5" c="-6.585981678163189E-5" d="6.952689160656714E-6"/>
+                  <width sOffset="108.33593275293882" a="3.7981937825247396" b="6.774991936407595E-5" c="-4.6910549160707356E-4" d="5.487510118910698E-5"/>
+                  <width sOffset="111.0466219102966" a="3.7960235071398167" b="-0.0012658087361862962" c="-2.05193403102627E-5" d="5.447389733685825E-5"/>
+                  <width sOffset="111.68239699415045" a="3.795224442425481" b="-0.001225843431657981" c="-0.0011388136529904495" d="1.6500584131936533E-4"/>
+                  <width sOffset="112.67673437753669" a="3.7930418062258697" b="-0.0030011461995213774" c="0.0011356834364347737" d="1.0232182073716952E-4"/>
+                  <width sOffset="116.482856398499" a="3.8037130123703076" b="0.010090828344484753" c="0.0013060102655733997" d="1.0868076377792872E-4"/>
+                  <width sOffset="118.01133088662124" a="3.8225758173506335" b="0.014844946260292844" c="0.006943685307683495" d="3.064654369132457E-4"/>
+                  <roadMark sOffset="0.0" type="solid" weight="bold" color="standard" width="0.3">
+                     <type name="solid" width="0.3">
+                        <line length="46.35305471152497" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.3"/>
+                     </type>
+                  </roadMark>
+                  <roadMark sOffset="46.35305471152497" type="solid" weight="standard" color="standard" width="0.15">
+                     <type name="solid" width="0.15">
+                        <line length="74.78871464516223" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.15"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.15">
+                     <type name="solid" width="0.15">
+                        <line length="4.385155869556256" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.15"/>
+                     </type>
+                  </roadMark>
+                  <roadMark sOffset="4.385155869556256" type="solid" weight="standard" color="standard" width="0.15">
+                     <type name="solid" width="0.15">
+                        <line length="116.75661348713095" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.15"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="4.11977481089088" b="-0.020307830132044097" c="0.009603314812927852" d="-0.004076506637052188"/>
+                  <width sOffset="1.2695708410602367" a="4.101129517317561" b="-0.015635317165310556" c="0.0034312639031906667" d="0.002480391546402304"/>
+                  <width sOffset="2.4237621395767657" a="4.091468116798985" b="0.002198169717703508" c="0.0010368285225049352" d="-0.0029585867610345934"/>
+                  <width sOffset="2.520065419028615" a="4.091686781178158" b="0.0023155530359913346" c="0.0018594897892417403" d="-0.002549984922916112"/>
+                  <width sOffset="4.385155869556256" a="4.0859299706876016" b="0.00363273990582684" c="-0.006316219863877063" d="1.5423614860656486E-4"/>
+                  <width sOffset="5.663147725079453" a="4.080578469999745" b="-0.01175569051271005" c="0.004800973257740201" d="0.0028031858325983576"/>
+                  <width sOffset="6.298954455573634" a="4.075765406073109" b="-0.002251143004191169" c="-4.2949940640801256E-4" d="4.362744946970949E-5"/>
+                  <width sOffset="10.0951474463906" a="4.063416819538092" b="-0.0036259121228736767" c="7.123053905622374E-5" d="4.3294860296000036E-5"/>
+                  <width sOffset="17.784765708390868" a="4.059432509470778" b="0.005149664198466198" c="0.0021904524545277473" d="6.01118794521601E-5"/>
+                  <width sOffset="18.224663030998514" a="4.062126823647949" b="0.007111709225615918" c="0.00295824136327577" d="-2.704022827643347E-4"/>
+                  <width sOffset="20.1902948927812" a="4.085482003583663" b="0.015607069293459426" c="0.0013458027567788077" d="-2.6297564947940947E-4"/>
+                  <width sOffset="23.691957085839768" a="4.145343281824225" b="0.015358625818547016" c="-0.0010476492930186808" d="6.156048804973005E-5"/>
+                  <width sOffset="30.2854423391718" a="4.218710635687738" b="0.009572156287775413" c="6.449228822874814E-5" d="8.501724697221755E-5"/>
+                  <width sOffset="30.364980451418813" a="4.219472437706514" b="0.00958402901420641" c="-0.007435291469667971" d="6.999889573190785E-4"/>
+                  <width sOffset="32.2297490185191" a="4.216028296056438" b="-0.010843822025141742" c="-0.001387091216709315" d="-1.3911331330235764E-4"/>
+                  <width sOffset="36.49337901192692" a="4.133796761103063" b="-0.030258540547420117" c="-7.380609100381174E-5" d="5.363250764356418E-4"/>
+                  <width sOffset="38.27249114699403" a="4.082750026888503" b="-0.025428366434370835" c="-0.001490148175333608" d="-1.0948346614781876E-4"/>
+                  <width sOffset="38.506653885480134" a="4.076712537153992" b="-0.026144250443367174" c="-0.08932815927237371" d="0.02432573897043112"/>
+                  <width sOffset="39.856300420736176" a="3.938515150620725" b="-0.06192605087637014" c="7.02055953441163E-4" d="-2.513335035434425E-5"/>
+                  <width sOffset="40.3805897855624" a="3.9062373392905263" b="-0.061210615852692093" c="6.772965938257323E-4" d="-2.615304473496027E-5"/>
+                  <width sOffset="41.5791571992592" a="3.8338002387571284" b="-0.05969975615467998" c="-2.625476301682314E-4" d="-1.0196139469686338E-6"/>
+                  <width sOffset="42.3142806867633" a="3.789771258295171" b="-0.0600874190318719" c="-4.70209155548354E-4" d="2.2796160042729815E-4"/>
+                  <width sOffset="45.39749835638073" a="3.6067202536276266" b="-0.056485766351528126" c="-0.003544579646611664" d="0.0016188979755359042"/>
+                  <width sOffset="48.43004681987952" a="3.447975672053165" b="-0.03332012739067979" c="0.0023163025222308242" d="2.4667443497709205E-5"/>
+                  <width sOffset="50.475737231953" a="3.3897175594871505" b="-0.023533563070146826" c="0.002325927718249525" d="8.365705605302079E-5"/>
+                  <width sOffset="52.044478963050615" a="3.358846436365755" b="-0.015618375668276086" c="0.002674390237057264" d="-1.2000532943772916E-4"/>
+                  <width sOffset="58.46417851849793" a="3.3370495112006693" b="0.003882013786951582" c="0.002039374504027472" d="-2.0107628593859754E-4"/>
+                  <width sOffset="60.5708846783436" a="3.3523988830920217" b="0.009797482588555693" c="7.02744061442384E-4" d="-1.7897856783572467E-4"/>
+                  <width sOffset="62.161784371058566" a="3.3690436551798286" b="0.010674509439400357" c="3.335015855384029E-4" d="-1.0215733950333315E-4"/>
+                  <width sOffset="68.94920891311624" a="3.424916555280948" b="0.001082843283671451" c="-4.406035144098474E-4" d="8.334822316192736E-6"/>
+                  <width sOffset="70.6660321247342" a="3.42551911160996" b="-3.5633318289675885E-4" c="-4.01498776396139E-4" d="8.106892171663331E-6"/>
+                  <width sOffset="73.60040446832156" a="3.4212212087397775" b="-0.0025032128102629976" c="1.7224169655276334E-4" d="1.7767182597370012E-5"/>
+                  <width sOffset="77.6170501206002" a="3.4150968960283543" b="-2.596076414737281E-4" c="7.165345575132803E-6" d="-6.407748544463562E-8"/>
+                  <width sOffset="80.7611795711248" a="3.4143494977580877" b="-2.1645041694139415E-4" c="6.333990474362435E-6" d="2.1335162863741063E-7"/>
+                  <width sOffset="82.08745997063474" a="3.4140740631660407" b="-1.9852325295549123E-4" c="-0.001881296986537139" d="1.5000752618841583E-4"/>
+                  <width sOffset="82.38962894669268" a="3.413846440413641" b="-0.001294372619009201" c="-0.001347754077709657" d="1.33479599686522E-4"/>
+                  <width sOffset="89.7364400511546" a="3.3845222220582674" b="5.161759516239348E-4" c="2.694813182681022E-4" d="-8.110764783949366E-6"/>
+                  <width sOffset="90.8563270175154" a="3.385426858325669" b="0.0010892369141136072" c="2.4234247930614527E-4" d="-8.172515892394719E-6"/>
+                  <width sOffset="100.951474463906" a="3.4127124520849343" b="0.003483570669313581" c="-4.700517813148133E-6" d="-8.170217008183399E-6"/>
+                  <width sOffset="111.67865968903152" a="3.439455110565828" b="5.622220588627063E-4" c="3.1735295630759E-4" d="1.9923485245477933E-5"/>
+                  <width sOffset="111.68239699415045" a="3.4394572161948584" b="5.645949833549874E-4" c="0.001539770078170644" d="-9.061033977474382E-5"/>
+                  <width sOffset="116.482856398499" a="3.4676269690231716" b="0.009083616893949143" c="0.001232877481320973" d="-9.696928281551856E-5"/>
+                  <width sOffset="118.60095404270425" a="3.4914766104821933" b="0.013001215844047488" c="0.0037493451883426924" d="0.002490782087455581"/>
+                  <roadMark sOffset="0.0" type="solid" weight="bold" color="standard" width="0.3">
+                     <type name="solid" width="0.3">
+                        <line length="39.856300420736176" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.3"/>
+                     </type>
+                  </roadMark>
+                  <roadMark sOffset="39.856300420736176" type="solid" weight="standard" color="standard" width="0.15">
+                     <type name="solid" width="0.15">
+                        <line length="81.28546893595103" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.15"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="40.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="2.387261483585003" b="0.06172551802971027" c="-0.0024681270256867722" d="-0.002888971200623396"/>
+                  <width sOffset="2.4237621395767657" a="2.4812349803870237" b="-0.001153636849342392" c="-0.012491689680875953" d="0.0025500071067879222"/>
+                  <width sOffset="5.663147725079453" a="2.4330969545568273" b="-0.0018080269707193447" c="0.001763823616717379" d="-9.894257719741832E-5"/>
+                  <width sOffset="6.205832302923601" a="2.4326194103988605" b="1.8955067457704974E-5" c="0.0017105888806484546" d="-1.0505888254027272E-4"/>
+                  <width sOffset="10.0951474463906" a="2.452387914502469" b="0.008557388164789079" c="4.8535232393650656E-4" d="-1.0504428069186132E-4"/>
+                  <width sOffset="18.224663030998514" a="2.497594471893631" b="-0.004378075122070014" c="-0.002764984771208354" d="2.2546988152110308E-4"/>
+                  <width sOffset="20.1902948927812" a="2.4800180525034303" b="-0.012634509677648849" c="-0.0014527281161000245" d="2.254176223137141E-4"/>
+                  <width sOffset="23.691957085839768" a="2.427641998066024" b="-0.014516467991342985" c="5.461773623227247E-4" d="-9.911851512514956E-5"/>
+                  <width sOffset="23.923691353433952" a="2.424306131671929" b="-0.014279300191242855" c="-0.016338620764860253" d="5.465926525191385E-4"/>
+                  <width sOffset="30.2854423391718" a="1.8129424528945934" b="-0.15579888418681243" c="-0.005867411484440219" d="5.196872861912927E-4"/>
+                  <width sOffset="32.2297490185191" a="1.4916606619094583" b="-0.17272121294606918" c="-0.004968365137481339" d="0.001358789556812597"/>
+                  <width sOffset="36.49337901192692" a="0.7702388098027031" b="-0.14098532031471855" c="0.009319094379044983" d="6.833511670745729E-4"/>
+                  <width sOffset="38.506653885480134" a="0.5297458560887645" b="-0.09515209112551531" c="0.10120751583473979" d="-0.02375187126966503"/>
+                  <width sOffset="39.52675141937726" a="0.5127849730882037" b="0.03718246455058015" c="0.018119313222579755" d="-0.0243552935391143"/>
+                  <width sOffset="39.856300420736176" a="0.5261345481193302" b="-0.031220012942099244" c="0.0025037579628697207" d="-4.4212183423412475E-6"/>
+                  <width sOffset="41.5791571992592" a="0.4797560709898212" b="-0.022632149837311495" c="0.00332671224732891" d="-2.9554649130335464E-5"/>
+                  <width sOffset="48.48646749449504" a="0.472409483106778" b="0.019094877796764248" c="4.114555596405531E-4" d="-1.0848464672722193E-4"/>
+                  <width sOffset="50.475737231953" a="0.5111685719970973" b="0.019443985574843406" c="-2.1885732765607028E-4" d="-2.0100172855244046E-4"/>
+                  <width sOffset="52.044478963050615" a="0.5403565800552923" b="0.017273358343909216" c="-0.0011195703004792629" d="2.6606569383085665E-6"/>
+                  <width sOffset="59.47153345280405" a="0.6079800120641918" b="0.001083433687148189" c="-0.0011906789063952318" d="1.8304348792376343E-4"/>
+                  <width sOffset="60.5708846783436" a="0.6079752637584046" b="-8.708506265056367E-4" c="-6.276800975674331E-4" d="9.779942100443173E-5"/>
+                  <width sOffset="62.161784371058566" a="0.6053949833891861" b="-0.002125422969846351" c="-6.458812609097564E-4" d="2.0978192672039793E-5"/>
+                  <width sOffset="70.6660321247342" a="0.5535108437244394" b="-0.008559322477146272" c="-1.1144974941462493E-4" d="2.0974785537096094E-5"/>
+                  <width sOffset="77.6170501206002" a="0.49567434036052216" b="-0.007068406715736438" c="7.051083669451794E-4" d="3.880604561988692E-5"/>
+                  <width sOffset="80.7611795711248" a="0.48162688677905807" b="-0.0014836454380627731" c="0.00107138123114" d="3.851856585320613E-5"/>
+                  <width sOffset="81.64119014057368" a="0.48117721093778787" b="4.914966583624012E-4" c="0.0019017152406857322" d="-8.91580834999679E-5"/>
+                  <width sOffset="82.38962894669268" a="0.48257295298187497" b="0.003188303077915111" c="0.001303967084932391" d="-7.263015699586833E-5"/>
+                  <width sOffset="90.8563270175154" a="0.5589604140193298" b="0.009649421050891253" c="-5.406519481385388E-4" d="-7.266716389368576E-5"/>
+                  <width sOffset="96.61516745401569" a="0.5827210513619194" b="-0.003807490033336406" c="-2.636400102886248E-4" d="1.6201608335098285E-5"/>
+                  <width sOffset="100.951474463906" a="0.562574282068451" b="-0.005179994413148198" c="-5.227567506350066E-5" d="1.6307521207624526E-5"/>
+                  <width sOffset="111.45194649659646" a="0.5212985245850414" b="-8.836353367784504E-4" c="-1.6845422340680538E-4" d="1.2798039750415956E-4"/>
+                  <width sOffset="111.67865968903152" a="0.5210910257701564" b="-9.402827822390051E-4" c="-6.66393467452584E-4" d="9.988857635495896E-5"/>
+                  <width sOffset="116.61374203406473" a="0.5122266339702928" b="-2.1932590994774067E-4" c="0.002931231312041965" d="-2.186611238110412E-4"/>
+                  <width sOffset="118.60095404270425" a="0.5216503050019088" b="0.008840144295097824" c="-0.0015049856566357743" d="-0.002806412494082238"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects>
+         <object type="railing" name="" id="429165" s="60.41193740306465" t="-4.783248381811608" zOffset="0.0" validLength="3.2926988929772776" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="60.41193740306465" length="3.2926988929772776" distance="0.0" tStart="-4.783248381811608" tEnd="-4.967957725061936" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.6247524446121913" zOffsetEnd="0.4027620962045472"/>
+         </object>
+         <object type="railing" name="" id="268864621" s="63.704636296041926" t="-4.967957725061936" zOffset="0.0" validLength="3.2927000208468087" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="63.704636296041926" length="3.2927000208468087" distance="0.0" tStart="-4.967957725061936" tEnd="-5.029527506144571" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.4027620962045472" zOffsetEnd="0.2007964681793834"/>
+         </object>
+         <object type="railing" name="" id="537300077" s="66.99733631688873" t="-5.029527506144571" zOffset="0.0" validLength="2.7584275949162134" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="66.99733631688873" length="2.7584275949162134" distance="0.0" tStart="-5.029527506144571" tEnd="-4.964981490027523" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.2007964681793834" zOffsetEnd="0.04701618402572877"/>
+         </object>
+         <object type="railing" name="" id="805735533" s="69.75576391180495" t="-4.964981490027523" zOffset="0.0" validLength="2.7584273277353333" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="69.75576391180495" length="2.7584273277353333" distance="0.0" tStart="-4.964981490027523" tEnd="-4.789596783699002" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.04701618402572877" zOffsetEnd="-0.092710601273929"/>
+         </object>
+         <object type="railing" name="" id="429185" s="0.0" t="-7.504464982087448" zOffset="0.0" validLength="12.392409814987891" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="0.0" length="12.392409814987891" distance="0.0" tStart="-7.504464982087448" tEnd="-7.390340503735918" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.7259892008283584" zOffsetEnd="0.7248358063782729"/>
+         </object>
+         <object type="railing" name="" id="268864641" s="12.392409814987891" t="-7.390340503735918" zOffset="0.0" validLength="12.314555644710586" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="12.392409814987891" length="12.314555644710586" distance="0.0" tStart="-7.390340503735918" tEnd="-7.385016225961232" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.7248358063782729" zOffsetEnd="0.6703835847081832"/>
+         </object>
+         <object type="railing" name="" id="537300097" s="24.706965459698477" t="-7.385016225961232" zOffset="0.0" validLength="1.4865688584621246" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="24.706965459698477" length="1.4865688584621246" distance="0.0" tStart="-7.385016225961232" tEnd="-7.296863326726379" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.6703835847081832" zOffsetEnd="0.6581865030956278"/>
+         </object>
+         <object type="railing" name="" id="805735553" s="26.1935343181606" t="-7.296863326726379" zOffset="0.0" validLength="15.326650791030957" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="26.1935343181606" length="15.326650791030957" distance="0.0" tStart="-7.296863326726379" tEnd="-5.6152479730129174" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.6581865030956278" zOffsetEnd="0.6145275636613758"/>
+         </object>
+         <object type="railing" name="" id="1074171009" s="41.52018510919156" t="-5.6152479730129174" zOffset="0.0" validLength="6.608195566549149" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="41.52018510919156" length="6.608195566549149" distance="0.0" tStart="-5.6152479730129174" tEnd="-5.130713615434241" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.6145275636613758" zOffsetEnd="0.62423585911295"/>
+         </object>
+         <object type="railing" name="" id="1073741904" s="48.12838067574071" t="-5.130713615434241" zOffset="0.0" validLength="5.830562499067902" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="48.12838067574071" length="5.830562499067902" distance="0.0" tStart="-5.130713615434241" tEnd="-4.897894808859389" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.62423585911295" zOffsetEnd="0.6461369591938462"/>
+         </object>
+         <object type="railing" name="" id="1073741905" s="53.95894317480861" t="-4.897894808859389" zOffset="0.0" validLength="6.452994228256038" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="53.95894317480861" length="6.452994228256038" distance="0.0" tStart="-4.897894808859389" tEnd="-4.783248381811608" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.6461369591938462" zOffsetEnd="0.6247524446121913"/>
+         </object>
+         <object type="pole" name="Guidepost" id="256731" s="119.51476908317372" t="5.088431519872744" zOffset="0.024612083027747644" validLength="0.0" orientation="none" radius="0.0" height="1.0711021106690168" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256739" s="119.4366257000357" t="-4.839401406327133" zOffset="0.020325933006404284" validLength="0.0" orientation="none" radius="0.0" height="1.073945764452219" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256803" s="117.58020832868195" t="5.3024682396738605" zOffset="0.0444183729403278" validLength="0.0" orientation="none" radius="0.03282471892295658" height="3.4283825187012553" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256804" s="103.78785752420703" t="6.320229485303467" zOffset="0.06664303267484684" validLength="0.0" orientation="none" radius="0.03998224092937806" height="3.4750077091157436" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="428765" s="98.23663794877757" t="4.827487449323532" zOffset="-0.0029637997752587353" validLength="0.0" orientation="none" radius="0.0" height="1.10784119553864" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="428770" s="65.62605766529747" t="4.61750845264324" zOffset="0.1062616425903542" validLength="0.0" orientation="none" radius="0.0" height="0.8537615165114403" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="428774" s="40.76929650564333" t="5.367161489122866" zOffset="-0.05709721636384302" validLength="0.0" orientation="none" radius="0.0" height="0.9216054975986481" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="428778" s="21.42927461980546" t="7.389298227975523" zOffset="-0.21267460805425742" validLength="0.0" orientation="none" radius="0.0" height="0.9715935718268156" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="428831" s="5.168873998219775" t="-7.590645277837371" zOffset="0.8819940565078213" validLength="0.0" orientation="none" radius="0.0" height="0.48806767351925373" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="428834" s="19.45206173264393" t="-7.5545542302564535" zOffset="0.9105671535326252" validLength="0.0" orientation="none" radius="0.0" height="0.544827719219029" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="428837" s="29.90810297297716" t="-7.01277895969325" zOffset="0.8404361677195311" validLength="0.0" orientation="none" radius="0.0" height="0.49971493892371655" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="428840" s="40.899307229544135" t="-5.660532502647904" zOffset="0.8294701570854812" validLength="0.0" orientation="none" radius="0.0" height="0.4874574923887849" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="428843" s="60.19597471414151" t="-4.950793637752604" zOffset="1.3125557003266692" validLength="0.0" orientation="none" radius="0.0" height="0.0" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="428846" s="86.78797552652534" t="-4.631161496807778" zOffset="0.04315482673173676" validLength="0.0" orientation="none" radius="0.0" height="0.960639719851315" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="428848" s="60.19761207131889" t="-4.950603378746122" zOffset="0.7992367223548342" validLength="0.0" orientation="none" radius="0.0" height="0.5133670754730701" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="429084" s="81.36532243712719" t="-5.196574510382802" zOffset="0.039114049158868625" validLength="0.0" orientation="none" radius="0.03998224092937806" height="2.784695434384048" hdg="0.0" pitch="0.0" roll="0.0"/>
+      </objects>
+      <signals>
+         <signal s="117.77770996256544" t="5.232211464448075" id="252055" dynamic="no" orientation="-" zOffset="2.2736221356467894" country="DEU" type="330.1" subtype="-1" height="0.8249999137632874" width="0.8247980132246067" hOffset="-3.104969254852934"/>
+         <signal s="103.71949052319852" t="6.341740043080103" id="428899" dynamic="no" orientation="-" zOffset="1.9855261024887625" country="DEU" type="274" subtype="40" value="40.0" unit="km/h" height="0.7499999976657986" width="0.7498163470979027" hOffset="-3.099252173525223"/>
+         <signal s="81.29861658443971" t="-5.1673854860299295" id="429091" dynamic="no" orientation="+" zOffset="2.2480839944075797" country="DEU" type="138" subtype="10" height="0.8599999902646571" width="0.9997550106637069" hOffset="-0.006577323524503729"/>
+         <signal s="81.3004274410417" t="-5.1614800191963965" id="429105" dynamic="no" orientation="+" zOffset="1.8400304359398092" country="DEU" type="1004" subtype="30" height="0.349999989332737" width="0.7498163502435595" hOffset="-0.006579093335601015"/>
+         <signal s="81.30186555544685" t="-5.154954619915168" id="429119" dynamic="no" orientation="+" zOffset="1.4064390340655848" country="DEU" type="1000" subtype="30" height="0.34999998746646704" width="0.7498164013013192" hOffset="-0.006580495605667069"/>
+         <signal s="103.7190135617955" t="6.295604702468515" id="429148" dynamic="no" orientation="-" zOffset="2.734184147879546" country="DEU" type="142" subtype="10" height="0.7739999989704976" width="0.8997795096384407" hOffset="-3.099252454954859"/>
+      </signals>
+   </road>
+   <road length="5.00000000000004" id="255973" junction="2104836">
+      <link>
+         <predecessor elementType="road" elementId="255972" contactPoint="end"/>
+         <successor elementType="road" elementId="2234084" contactPoint="start"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618286.7612450294" y="5809468.493754379" hdg="1.5006433411097593" length="5.00000000000004">
+            <paramPoly3 aU="0.0" bU="4.392924932402629" cU="0.8207228070886067" dU="-0.2180072687840809" aV="-0.0" bV="-0.0" cV="-0.20652315747948907" dV="0.019409055917024055" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="103.05904464126772" b="-0.0433161652989245" c="-1.0860955762656613E-4" d="3.124943134888126E-5"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="-0.0038202678911689555" b="4.1439140733821894E-4" c="3.469446951953558E-20" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="1.5790436610261869" b="0.013751124690719783" c="0.012093565452649979" d="-0.002281892882887096"/>
+         <laneOffset s="1.3305745591604663" a="1.6133759263943641" b="0.03381412007287116" c="0.013736084776525827" d="-0.005645607831327801"/>
+         <laneOffset s="2.6976960488907507" a="1.6708514312203702" b="0.039716631814806704" c="-0.002132392714401115" d="1.8670496723641427E-4"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <successor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.0" b="0.0" c="0.0071878950547623905" d="1.8209546929725227E-4"/>
+                  <width sOffset="1.3305745591604663" a="0.013154615381904655" b="0.02009522169929146" c="-0.0028364353228499586" d="0.003545810417734418"/>
+                  <width sOffset="1.7856927425219749" a="0.022047060884365033" b="0.01971675349266276" c="0.008494731138349476" d="0.0047924957469888275"/>
+                  <width sOffset="2.6976960488907507" a="0.05072968786502985" b="0.04716967471833939" c="0.014320829163920246" d="-0.00103981705157543"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.14">
+                     <type name="solid" width="0.14">
+                        <line length="5.00000000000004" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.14"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="3.589571028959365" b="0.06651375034307125" c="-0.1255087653478215" d="0.08988112437020679"/>
+                  <width sOffset="0.756676034704457" a="3.606979487167741" b="0.030961438578752703" c="0.012157440048015715" d="-0.0034816210659015983"/>
+                  <width sOffset="1.3305745591604663" a="3.6280942873327007" b="0.04147559729681308" c="0.01691435364467868" d="-0.0068453360143452425"/>
+                  <width sOffset="2.6976960488907507" a="3.6989186938431278" b="0.049341316269759586" c="-0.003874646388758545" d="-0.001013023215786401"/>
+                  <width sOffset="3.2494224235592326" a="3.724792015496342" b="0.044140728203356766" c="-0.0028988794521036783" d="3.7869642448666786E-4"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.14407533094474215">
+                     <type name="solid" width="0.144075">
+                        <line length="5.00000000000004" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.144075"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="40.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="-2"/>
+                     <successor id="-2"/>
+                  </link>
+                  <width sOffset="0.0" a="0.48836251797196395" b="-0.028395551431869687" c="0.13664167427140275" d="-0.09216278097555286"/>
+                  <width sOffset="0.756676034704457" a="0.5051829222791628" b="0.02008562460843854" c="-0.0062039557425084945" d="0.0011999644605584236"/>
+                  <width sOffset="3.2494224235592326" a="0.5352879624321916" b="0.011524809970567908" c="1.1716366937115658E-4" d="-1.9175517970915389E-4"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects/>
+      <signals/>
+   </road>
+   <road length="11.415245875729132" id="255974" junction="-1">
+      <link>
+         <predecessor elementType="road" elementId="255966" contactPoint="end"/>
+         <successor elementType="junction" elementId="2104836"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618283.4145437772" y="5809484.948333622" hdg="-1.3639930665775446" length="11.415245875729132">
+            <paramPoly3 aU="0.0" bU="11.222716761704348" cU="0.37888027033428584" dU="-0.2408675647091397" aV="-0.0" bV="2.6645352591003757E-15" cV="-0.8549570720935511" dV="-0.09815830618042981" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="102.48731756963598" b="0.035851764292577956" c="-0.0012480458876643287" d="8.314489204177335E-5"/>
+         <elevation s="9.656027594664817" a="102.79199357539144" b="0.03500644029977424" c="2.9827242481656683E-5" d="4.8500521812425585E-5"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.03235717017100614" b="-0.0021583872765849428" c="-0.0" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="-0.2102317084035555" b="0.031892972592891936" c="0.04526214754662868" d="-0.01439486295032438"/>
+         <laneOffset s="1.58380629029925" a="-0.10337109030679476" b="0.0669398683893421" c="0.003025696922118788" d="-9.36261165995834E-4"/>
+         <laneOffset s="5.166261161598056" a="0.1322230761476444" b="0.05257083434806269" c="-0.08814731663721144" d="0.9506875542699595"/>
+         <laneOffset s="5.255034903677139" a="0.13686042326899348" b="0.059396970685807675" c="-0.009474732126848366" d="8.583279569425307E-4"/>
+         <laneOffset s="10.471359034448685" a="0.31071441754180634" b="0.030615830559640504" c="-0.0012655862198009248" d="7.81704242143867E-4"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="1"/>
+                     <successor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.7218644858622876" b="-0.02452717034783238" c="-0.044910767047968286" d="0.014407665795721562"/>
+                  <width sOffset="1.58380629029925" a="0.6276021536789349" b="-0.05836468325678103" c="-0.0026134847422380507" d="9.490640113937197E-4"/>
+                  <width sOffset="2.2895003056436836" a="0.5854465576353461" b="-0.06063541119530998" c="-6.770417311399935E-4" d="9.427291770865037E-4"/>
+                  <width sOffset="5.166261161598056" a="0.4278538451864037" b="-0.04112540398569487" c="0.08856965088662681" d="-0.9506810862588688"/>
+                  <roadMark sOffset="0.0" type="curb" weight="standard" color="standard" width="0.12">
+                     <type name="curb" width="0.12">
+                        <line length="5.255034903677139" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.0"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.16990684678954757">
+                     <type name="solid" width="0.169907">
+                        <line length="5.255034903677139" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.169907"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="4.8134021608083915" b="-0.08863230714226986" c="0.03739362220538509" d="-0.01273281825293042"/>
+                  <width sOffset="1.58380629029925" a="4.716239455837009" b="-0.06600242121214644" c="0.0030542421203463743" d="7.257835313990191E-4"/>
+                  <width sOffset="2.9599607263764356" a="4.633085567934748" b="-0.053472734724435866" c="-0.004753918430788358" d="0.0018857522110924826"/>
+                  <width sOffset="4.967557273348642" a="4.521832062737114" b="-0.049759379714523086" c="-4.982749649102471E-4" d="0.00121245463406793"/>
+                  <width sOffset="5.166261161598056" a="4.511934519282638" b="-0.049813783165934" c="-0.08088619004910423" d="0.9528362700700227"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.13168603467553125">
+                     <type name="solid" width="0.131686">
+                        <line length="5.255034903677139" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.131686"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="-2"/>
+                     <successor id="-2"/>
+                  </link>
+                  <width sOffset="0.0" a="0.5055561004390103" b="-0.008969148978063599" c="0.012196193479141797" d="-0.001599132680317613"/>
+                  <width sOffset="2.9599607263764356" a="0.5443923114291831" b="0.021199591152354064" c="0.008800614919366522" d="-0.0027591013600518507"/>
+                  <width sOffset="3.245469002064777" a="0.5510981389357781" b="0.025550163694422284" c="0.005701293627762746" d="-0.002671796274754106"/>
+                  <width sOffset="4.967557273348642" a="0.5983605890491486" b="0.021416084443919667" c="-0.0010000680398671701" d="-0.001998498697752112"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+         <laneSection s="5.255034903677139">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.42423588459524597" b="0.7969060947976997" c="0.30228371852720387" d="-0.8665310327906126"/>
+                  <width sOffset="0.6979298590759759" a="0.833073694559301" b="-0.04742586409013056" c="-0.10654921749306699" d="0.03222686446836244"/>
+                  <width sOffset="2.3690304248815472" a="0.606665774131147" b="-0.13354676811015145" c="-0.023469303688692975" d="0.009881944823024482"/>
+                  <width sOffset="4.525699767531016" a="0.3086158604795045" b="-0.09688844676243998" c="0.034688525396648774" d="-0.011505515836319534"/>
+                  <width sOffset="5.216324130771547" a="0.25445751230905184" b="-0.06543804715096235" c="0.01607336134671107" d="-0.011428892121520729"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.16990684678954757">
+                     <type name="solid" width="0.169907">
+                        <line length="6.160210972051994" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.169907"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="4.507541527352055" b="-0.04164765141832919" c="6.729188831857535E-4" d="-9.551934085157774E-4"/>
+                  <width sOffset="2.1742595807066696" a="4.410351826391458" b="-0.05226820825681936" c="-1.9149046846926284E-4" d="-8.731624281513133E-5"/>
+                  <width sOffset="3.84505353518864" a="4.3220806118716775" b="-0.05363933410254639" c="-8.243138936797972E-4" d="0.0017654650637151767"/>
+                  <width sOffset="5.216324130771547" a="4.251528820727399" b="-0.04594079718642393" c="0.0012156724998309007" d="0.0016888413489116374"/>
+                  <width sOffset="5.660383332051133" a="4.231515984441522" b="-0.04386207541470458" c="5.505416477668924E-4" d="0.0029392418391932097"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.13168603467553125">
+                     <type name="solid" width="0.131686">
+                        <line length="6.160210972051994" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.131686"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="-2"/>
+                  </link>
+                  <width sOffset="0.0" a="0.6043871046624902" b="0.020345601953875955" c="-0.00540977016625001" d="0.0014095189816644565"/>
+                  <width sOffset="2.1742595807066696" a="0.6375374404664802" b="0.016811212805808787" c="-0.0015818956240589571" d="5.416418159637795E-4"/>
+                  <width sOffset="3.84505353518864" a="0.66373584503821" b="0.01606123411137983" c="0.0013281810641014961" d="-0.0013111394905665698"/>
+                  <width sOffset="5.660383332051133" a="0.6894255981067761" b="0.007921132599678166" c="-0.0028973032175896823" d="-0.002561539980841545"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects/>
+      <signals/>
+   </road>
+   <road length="398.68567638011814" id="255975" junction="-1">
+      <link/>
+      <type s="0.0" type="bicycle"/>
+      <planView>
+         <geometry s="0.0" x="618311.5144678315" y="5809505.589720951" hdg="-0.1745329077461404" length="8.013866065033445">
+            <paramPoly3 aU="0.0" bU="5.968264525315577" cU="-0.8092344679087069" dU="2.3611746646881575" aV="-0.0" bV="-4.440892098500626E-16" cV="2.733217324896054" dV="-0.13104747079645035" pRange="normalized"/>
+         </geometry>
+         <geometry s="8.013866065033445" x="618319.3722857772" y="5809506.84648829" hdg="0.24309359434427802" length="16.0133149747726">
+            <paramPoly3 aU="0.0" bU="22.921366243139516" cU="-18.0709728325812" dU="11.13949960946684" aV="-0.0" bV="4.440892098500626E-15" cV="1.7731205224788722" dV="-2.0340623388835755" pRange="normalized"/>
+         </geometry>
+         <geometry s="24.027181039806045" x="618334.954853891" y="5809510.4420884345" hdg="0.11721764672410417" length="96.0027778982061">
+            <paramPoly3 aU="0.0" bU="95.82967795015178" cU="0.501005538814751" dU="-0.3451901138318587" aV="-0.0" bV="-1.7763568394002505E-15" cV="-5.180259318950434" dV="3.5408240389050083" pRange="normalized"/>
+         </geometry>
+         <geometry s="120.02995893801216" x="618430.4734137102" y="5809520.039349324" hdg="0.11995212938891586" length="17.995471707176954">
+            <paramPoly3 aU="0.0" bU="25.394865558483396" cU="-21.831717480518197" dU="14.295469489175751" aV="-0.0" bV="3.9968028886505635E-15" cV="4.390318479867115" dV="-2.398785458077123" pRange="normalized"/>
+         </geometry>
+         <geometry s="138.02543064518912" x="618447.965389614" y="5809524.1536176875" hdg="0.18421848791093254" length="30.000732542985368">
+            <paramPoly3 aU="0.0" bU="27.90411709002686" cU="5.061104058559314" dU="-3.01090865740853" aV="-0.0" bV="4.440892098500626E-15" cV="-2.4418679977408275" dV="0.9021906523830872" pRange="normalized"/>
+         </geometry>
+         <geometry s="168.02616318817448" x="618477.6949018377" y="5809528.1269722" hdg="0.10926795508182408" length="216.00046100278718">
+            <paramPoly3 aU="0.0" bU="215.99279388453553" cU="0.007363650865984617" dU="-0.007720662967181796" aV="-0.0" bV="1.0658141036401503E-14" cV="-3.9079994115458265" dV="2.152713923175071" pRange="normalized"/>
+         </geometry>
+         <geometry s="384.0266241909617" x="618692.5906168029" y="5809549.936270741" hdg="0.10298120742280337" length="14.659052189156428">
+            <paramPoly3 aU="0.0" bU="14.711292951033847" cU="0.12171026898288254" dU="-0.17910223340209924" aV="-0.0" bV="2.220446049250313E-15" cV="0.08136976167024222" dV="-0.3556579483498349" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="102.20367709771834" b="0.012730254515060891" c="1.8561875583981578E-4" d="-1.4662952149417273E-6"/>
+         <elevation s="4.988561527559328" a="102.27161998499601" b="0.014472726132076843" c="7.530071474390297E-4" d="-5.5291837452665926E-5"/>
+         <elevation s="10.22270965077226" a="102.3600733455987" b="0.01781105163717811" c="-1.6621106895255855E-4" d="-4.443764522126398E-5"/>
+         <elevation s="15.937499128362106" a="102.44813773350141" b="0.01155748609538423" c="-2.288640989727199E-4" d="2.0412495107749524E-6"/>
+         <elevation s="20.44541930154452" a="102.4957741248113" b="0.00961852672028874" c="-2.2191538468781412E-4" d="-9.891197029576264E-6"/>
+         <elevation s="30.668128952316778" a="102.56034364762326" b="0.001980370821930641" c="-1.881411857961119E-4" d="-3.777952899459162E-5"/>
+         <elevation s="30.89259647897306" a="102.56077826965928" b="0.0018901970082689742" c="-6.105366175574922E-4" d="6.444058392412733E-6"/>
+         <elevation s="40.89083860308904" a="102.52508537895308" b="-0.00838585094151612" c="-8.447939012640784E-4" d="9.982268608348696E-5"/>
+         <elevation s="46.85599134519698" a="102.46619035074748" b="-0.007808514192202773" c="1.9905464911378325E-4" d="6.294574586691161E-5"/>
+         <elevation s="51.113548253861296" a="102.44141127022445" b="-0.002690528092129672" c="6.436655866123561E-5" d="1.3232612633934011E-19"/>
+         <elevation s="61.336257904633555" a="102.42063333222832" b="-0.0013745268113032065" c="5.226780984435755E-4" d="-2.5581520895223833E-5"/>
+         <elevation s="71.55896755540581" a="102.43387474338824" b="0.0012917482087221569" c="5.539361195635706E-5" d="-5.452608602873874E-6"/>
+         <elevation s="74.78664409372495" a="102.43843782642949" b="0.0014789194067145652" c="8.352726452778934E-5" d="-7.292928085107313E-6"/>
+         <elevation s="81.78167720617807" a="102.45037379317823" b="0.0015769317732386458" c="-6.590653447692094E-4" d="4.7231710038237186E-5"/>
+         <elevation s="92.00438685695033" a="102.44807768000301" b="0.0029097429428186793" c="3.6467286414372323E-4" d="-1.8453086270604624E-5"/>
+         <elevation s="101.71365340772398" a="102.49381686166502" b="0.004772445617161396" c="-2.799346001444898E-5" d="-2.3442036561599157E-5"/>
+         <elevation s="102.22709650772259" a="102.49625668817818" b="0.00472515988191702" c="2.277479337925667E-4" d="-1.8765670430491133E-5"/>
+         <elevation s="112.44980615849485" a="102.54831355896332" b="0.003498310691137697" c="-3.0991244875142553E-4" d="3.443858002962165E-6"/>
+         <elevation s="115.66495113610584" a="102.55647197950469" b="0.001612282889882769" c="-2.9959333225627156E-4" d="2.108829040128028E-5"/>
+         <elevation s="122.67251580926711" a="102.56031509642783" b="5.201259893156999E-4" c="-9.873896741792232E-5" d="2.4261608227283836E-5"/>
+         <elevation s="126.59179262166631" a="102.56229753199324" b="8.641833916718479E-4" c="1.4230866077029588E-4" d="9.760963483002341E-6"/>
+         <elevation s="132.89522546003937" a="102.5758439333562" b="0.0038217544248604664" c="3.505859734208156E-4" d="-1.610627255863628E-5"/>
+         <elevation s="143.11793511081163" a="102.63434365994507" b="0.005940131951415891" c="-9.275942579658756E-5" d="3.785168264306436E-6"/>
+         <elevation s="146.65953893362317" a="102.65438592187532" b="0.0054255292929724355" c="1.191632884206412E-5" d="7.750590951290405E-6"/>
+         <elevation s="153.3406447615839" a="102.69347779385028" b="0.006622651257022858" c="6.663059128335992E-4" d="-5.600771097154911E-5"/>
+         <elevation s="163.56335441235615" a="102.7709770239369" b="0.0026865003932188334" c="-0.0012679944307077986" d="6.583117479161671E-5"/>
+         <elevation s="173.7860640631284" a="102.73625833976658" b="-0.0025993551027245106" c="8.748337937604223E-5" d="-3.7253684880869505E-7"/>
+         <elevation s="180.59625895993523" a="102.722495929937" b="-0.0014596307603443053" c="5.931862835401813E-5" d="-3.2667064193836226E-7"/>
+         <elevation s="184.00877371390067" a="102.71819271733658" b="-0.001066191862144439" c="2.107475786490217E-5" d="4.3922093205151764E-6"/>
+         <elevation s="194.23148336467293" a="102.71418798923558" b="7.416979947953259E-4" c="6.088617058001267E-5" d="3.258067762574279E-7"/>
+         <elevation s="204.45419301544518" a="102.72848105149335" b="0.002088685413293996" c="4.021798363893984E-4" d="-1.9910208992197223E-5"/>
+         <elevation s="214.5223202484997" a="102.76995812444557" b="0.004132355366482264" c="-2.0622945472640203E-4" d="-2.033672900594068E-5"/>
+         <elevation s="214.67690266621744" a="102.77059191080588" b="0.004067138588467787" c="1.3736037540057315E-4" d="-1.4397707250816664E-5"/>
+         <elevation s="224.8996123169897" a="102.811142525479" b="0.0023616840214130456" c="-3.334326940165621E-5" d="-1.0071323986076403E-7"/>
+         <elevation s="235.12232196776196" a="102.8316932442509" b="0.001648392151019169" c="-2.0732761995712512E-4" d="1.2062662490433604E-5"/>
+         <elevation s="245.34503161853422" a="102.83976444224069" b="0.001191273965661169" c="7.161560922570485E-5" d="-3.3627249785761113E-6"/>
+         <elevation s="254.43367311048905" a="102.85398262240082" b="0.0016597335690782503" c="1.1558915326090995E-5" d="-3.6463508529574746E-6"/>
+         <elevation s="255.56774126930648" a="102.85587442109916" b="0.0016718819333939193" c="3.6085136012083545E-5" d="-7.350536625914363E-7"/>
+         <elevation s="265.79045092007874" a="102.87595135164817" b="0.002179209983189451" c="3.3422097452397334E-5" d="-1.978283333519664E-6"/>
+         <elevation s="276.013160570851" a="102.89960809483041" b="0.002242324445946577" c="-1.1662083293668103E-5" d="-3.150462019790614E-7"/>
+         <elevation s="286.23587022162326" a="102.92097542703449" b="0.0019051176942211146" c="-5.534419396872986E-5" d="2.8742755722870824E-6"/>
+         <elevation s="296.4585798723955" a="102.93773783678638" b="0.001674700537503451" c="-3.1684986182530695E-5" d="2.665495554889772E-6"/>
+         <elevation s="306.6812895231678" a="102.95439419360711" b="0.0018625508934031606" c="5.771360604376298E-5" d="-3.10642785779446E-6"/>
+         <elevation s="316.90399917394006" a="102.97614716737891" b="0.0020686292906013965" c="2.8985205852693874E-5" d="-4.171280970779725E-6"/>
+         <elevation s="326.27520243475396" a="102.99464532232682" b="0.0015129229929076568" c="-3.490829995876501E-5" d="-3.719057522565163E-6"/>
+         <elevation s="327.1267088247123" a="102.99590597907066" b="0.0014453840574649639" c="-1.1937450819943636E-5" d="6.784420435092768E-7"/>
+         <elevation s="337.3494184754845" a="103.01015899946762" b="0.0014140171698858197" c="1.4600069887237674E-4" d="-1.395708171740088E-5"/>
+         <elevation s="347.5721281262568" a="103.0249611962961" b="2.3358757193379194E-5" c="-5.83023576322579E-5" d="1.629289882806361E-6"/>
+         <elevation s="357.7948377770291" a="103.0208477584163" b="-6.578564748530013E-4" c="-9.4419317944607E-5" d="6.927360870106632E-6"/>
+         <elevation s="360.20229486843766" a="103.01881341627285" b="-9.92027561829961E-4" c="4.793562457920439E-4" d="-8.059611078716093E-6"/>
+         <elevation s="368.01754742780133" a="103.03649148824444" b="0.005023753742859021" c="2.3544852545259322E-4" d="-1.7912163518910035E-5"/>
+         <elevation s="378.24025707857356" a="103.09331735002253" b="0.004221930505260771" c="-3.0758404812115313E-4" d="-1.254228344473367E-5"/>
+         <elevation s="382.15306927497795" a="103.10437647657801" b="0.0012388224610569818" c="-4.9673968032968235E-5" d="2.3768041687646464E-6"/>
+         <elevation s="388.46296672934585" a="103.11081267807118" b="8.958431619933143E-4" c="-4.381632622903048E-5" d="1.3607432746386793E-17"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.014818669771268321" b="7.729778589324346E-4" c="-8.461980265611658E-6" d="-1.913707657016621E-6"/>
+         <superelevation s="10.22270965077226" a="0.019791852239930723" b="0.0" c="-8.461980265611524E-6" d="0.0"/>
+         <superelevation s="20.44541930154452" a="0.018907543209234174" b="-1.7300873465182404E-4" c="-8.257473460035457E-4" d="5.4402361980817105E-5"/>
+         <superelevation s="30.668128952316778" a="-0.011036111961711757" b="0.0" c="0.0015678600646921797" d="-1.0224686788880464E-4"/>
+         <superelevation s="40.89083860308904" a="0.04357966238251272" b="0.0" c="-0.0013264874691072716" d="8.650592745124505E-5"/>
+         <superelevation s="51.113548253861296" a="-0.002627994738614252" b="0.0" c="3.105238410758184E-4" d="-1.5485683350482267E-5"/>
+         <superelevation s="61.336257904633555" a="0.013279384092709446" b="0.001493852210351594" c="3.2499492037633582E-6" d="-9.133974962104459E-7"/>
+         <superelevation s="71.55896755540581" a="0.02791444007656317" b="0.001273938277004311" c="7.834391766760326E-5" d="-9.172593809876973E-6"/>
+         <superelevation s="81.78167720617807" a="0.03932558633034976" b="0.0" c="-3.0038630701644225E-4" d="1.6179597715046456E-5"/>
+         <superelevation s="92.00438685695033" a="0.02521893524938679" b="-0.00106903602730592" c="-1.3337567717247846E-5" d="4.279679420606141E-6"/>
+         <superelevation s="102.22709650772259" a="0.017468696503622826" b="0.0" c="0.0011253963631064237" d="-7.33919154217856E-5"/>
+         <superelevation s="112.44980615849485" a="0.05667142587940979" b="0.0" c="-2.494060804585448E-4" d="1.1053918575677454E-5"/>
+         <superelevation s="122.67251580926711" a="0.04241657765174333" b="-0.0016336826484476534" c="-2.3002140137086616E-4" d="2.021160026799451E-5"/>
+         <superelevation s="132.89522546003937" a="0.023270099126239768" b="0.0" c="2.17157402975028E-4" d="-1.416176404583842E-5"/>
+         <superelevation s="143.11793511081163" a="0.030834689860547736" b="0.0" c="-0.0010757376810844367" d="7.015346014469995E-5"/>
+         <superelevation s="153.3406447615839" a="-0.0066381993129014565" b="0.0" c="2.2543673810096945E-4" d="-9.42910489753014E-6"/>
+         <superelevation s="163.56335441235615" a="0.006847569567259061" b="0.0016530169684884635" c="2.3826359615065806E-4" d="-2.011295129588338E-5"/>
+         <superelevation s="173.7860640631284" a="0.02715842572041318" b="2.1877702344495452E-4" c="-1.0700539823530282E-5" d="0.0"/>
+         <superelevation s="184.00877371390067" a="0.028276672714882163" b="0.0" c="-3.019502817178952E-4" d="1.894646317515479E-5"/>
+         <superelevation s="194.23148336467293" a="0.016962455723592396" b="-2.335683432351979E-4" c="1.1423993794910987E-5" d="0.0"/>
+         <superelevation s="204.45419301544518" a="0.015768605045339723" b="0.0" c="1.3772922751317533E-4" d="-5.109185973200829E-6"/>
+         <superelevation s="214.67690266621744" a="0.02470362734923776" b="0.001214143872628872" c="-3.6519691508613E-6" d="3.6117378281977073E-6"/>
+         <superelevation s="224.8996123169897" a="0.04059228561363807" b="0.0022717987348771043" c="2.201106551440447E-4" d="-1.4665302557901475E-5"/>
+         <superelevation s="235.12232196776196" a="0.07115150505251852" b="0.0021743141610775694" c="-2.6488310276901402E-5" d="-5.2079435275108885E-6"/>
+         <superelevation s="245.34503161853422" a="0.08504705033015499" b="0.0" c="-5.3854997091872104E-5" d="1.562887501607545E-6"/>
+         <superelevation s="255.56774126930648" a="0.08108865024533471" b="-6.111049830326837E-4" c="-5.1151621687083464E-5" d="2.8613269755256603E-6"/>
+         <superelevation s="265.79045092007874" a="0.07255275271478852" b="-7.59862773911459E-4" c="-5.228263320140689E-5" d="5.833291106263646E-6"/>
+         <superelevation s="276.013160570851" a="0.06555293722108019" b="0.0" c="3.1566170678583025E-5" d="-2.627157536213028E-7"/>
+         <superelevation s="286.23587022162326" a="0.0685710594013959" b="5.630192173770221E-4" c="7.851968778419044E-5" d="-5.118491342612228E-6"/>
+         <superelevation s="296.4585798723955" a="0.07706410119518081" b="5.63681884410127E-4" c="-2.324987794139072E-5" d="-2.817389971780641E-7"/>
+         <superelevation s="306.6812895231678" a="0.08009577188084567" b="0.0" c="-1.2855370026794755E-4" d="5.013423521350794E-6"/>
+         <superelevation s="316.90399917394006" a="0.07201732280353482" b="-0.0010565689890095974" c="-4.996340670037283E-5" d="2.33903273002206E-6"/>
+         <superelevation s="327.1267088247123" a="0.0584937758795355" b="-0.0013447784147957952" c="1.2793206386220837E-5" d="-1.4608757043322824E-6"/>
+         <superelevation s="337.3494184754845" a="0.0445227642453685" b="-0.00154121710089557" c="-9.475419795819107E-5" d="7.5986886721399326E-6"/>
+         <superelevation s="347.5721281262568" a="0.026982946017014703" b="-0.001096231053565477" c="5.361744053264101E-5" d="0.0"/>
+         <superelevation s="357.7948377770291" a="0.021379720131634666" b="0.0" c="1.48123102701077E-4" d="-7.994493604545638E-6"/>
+         <superelevation s="368.01754742780133" a="0.02831853325055754" b="5.220742380991268E-4" c="5.087031187355055E-6" d="-1.99699522261077E-6"/>
+         <superelevation s="378.24025707857356" a="0.03205374683610567" b="0.0" c="-2.534160074498529E-4" d="1.3133620004921121E-5"/>
+         <superelevation s="388.46296672934585" a="0.019601615875807533" b="-0.001063657226633803" c="1.5106360497913182E-5" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="0.9476862050490011" b="0.12557935142113388" c="-0.04724639902327393" d="0.0065102270501540055"/>
+         <laneOffset s="3.939600834025424" a="1.1071970288169903" b="0.056440498097761936" c="0.013922982064356978" d="-0.005742536703042666"/>
+         <laneOffset s="5.657320466988927" a="1.2161220528571848" b="0.05344094739204616" c="-0.0030007311834678637" d="-6.569702326850035E-7"/>
+         <laneOffset s="10.22270965077226" a="1.3974946866967213" b="0.026000856760230156" c="-0.003006094464345632" d="1.121313948402488E-7"/>
+         <laneOffset s="14.54844719469452" a="1.4537265896893612" b="-0.0" c="-0.035555022652468536" d="0.007110573614136638"/>
+         <laneOffset s="17.83757603029964" a="1.3220948489288542" b="-0.0031156837608687813" c="6.92947251678877E-4" d="-6.824485844808355E-5"/>
+         <laneOffset s="20.44541930154452" a="1.317471902364574" b="-8.938565313959765E-4" c="1.2026771077512736E-4" d="-6.37545302050801E-5"/>
+         <laneOffset s="24.539693295315846" a="1.3114526242570705" b="-0.003115205392200151" c="-0.0042948854359655805" d="3.4866146121128547E-4"/>
+         <laneOffset s="30.21028440523538" a="1.2192583119086853" b="-0.018190024589947514" c="0.0013811429495679745" d="-1.595627601381569E-4"/>
+         <laneOffset s="40.9465594699916" a="0.9857001950890038" b="-0.043710613685588026" c="-0.02387816106845742" d="0.003783463367227285"/>
+         <laneOffset s="45.927216171090365" a="0.6431137754563959" b="-0.0" c="0.0012718085173427424" d="-5.5269930719050544E-5"/>
+         <laneOffset s="51.113548253861296" a="0.6696126571436559" b="0.00873208413304573" c="3.960751919112497E-4" d="-5.722935505386985E-5"/>
+         <laneOffset s="55.29789479800307" a="0.7088927298791965" b="0.009040671412754732" c="4.6684724246659557E-4" d="-1.7676264176360263E-5"/>
+         <laneOffset s="61.336257904633555" a="0.7766139120287556" b="0.012745130977769335" c="1.604027356624317E-4" d="-1.7760371711116913E-5"/>
+         <laneOffset s="69.77122873431978" a="0.8848725066033727" b="0.011660231941286047" c="8.85494432504841E-4" d="-8.894461889926534E-5"/>
+         <laneOffset s="71.55896755540581" a="0.9080398082909167" b="0.013973493787969601" c="4.7131893855976997E-4" d="-6.987040653271004E-5"/>
+         <laneOffset s="82.27626000007811" a="1.0259237751259938" b="-0.0" c="-0.0014688054043992108" d="1.1568709961863736E-4"/>
+         <laneOffset s="90.74050196102927" a="0.9908470413525916" b="-0.0" c="0.0021275618917520694" d="-9.82989472037273E-5"/>
+         <laneOffset s="92.00438685695033" a="0.994047160128261" b="0.004906916982084131" c="0.0016664973004066337" d="-1.3911692929953742E-4"/>
+         <laneOffset s="99.02012646355043" a="1.0624591037193005" b="0.0077480820910536775" c="-9.896288014218538E-4" d="9.939721485040091E-5"/>
+         <laneOffset s="102.22709650772259" a="1.080407355474015" b="0.004467460993019805" c="2.8058737237878257E-5" d="9.031617282123136E-5"/>
+         <laneOffset s="107.90539770787272" a="1.1232152775437165" b="0.013522334315947774" c="0.007461322063687375" d="-5.679982352097383E-4"/>
+         <laneOffset s="112.44980615849485" a="1.2854485217342055" b="0.04614662525648885" c="-1.9539543006434214E-4" d="-5.427104872075306E-4"/>
+         <laneOffset s="117.65498958290793" a="1.443818277325923" b="-0.0" c="-0.0010879220050485396" d="9.724003375847225E-6"/>
+         <laneOffset s="122.67251580926711" a="1.4176575485102836" b="-0.010182932418685639" c="-0.001221793871461908" d="8.512326652706773E-5"/>
+         <laneOffset s="124.29835929133452" a="1.3982378789262033" b="-0.013480787515171818" c="-0.013969636101002578" d="0.0010329638267214314"/>
+         <laneOffset s="129.88662825270737" a="1.0669166643700787" b="-0.07283844790139261" c="-0.019333026041486522" d="0.002779534016860946"/>
+         <laneOffset s="132.89522546003937" a="0.7484736573179199" b="-0.11369085729486905" c="0.0057368754293589345" d="0.002772894344991851"/>
+         <laneOffset s="135.96624348286844" a="0.5337443236084473" b="-0.0" c="7.325457564626504E-4" d="-8.641317604245034E-7"/>
+         <laneOffset s="141.70790452651812" a="0.5577303531058099" b="0.008326596221405061" c="0.008370197716027048" d="-8.894335815966003E-4"/>
+         <laneOffset s="143.11793511081163" a="0.5836191792958766" b="0.026625986925733598" c="0.004571618664510966" d="-8.739910808033575E-4"/>
+         <laneOffset s="145.96445239696192" a="0.6762947379477673" b="0.031407410590396194" c="0.004746216325046531" d="-9.232604009835021E-4"/>
+         <laneOffset s="150.22099590845065" a="0.8247719346546011" b="0.021629016813331934" c="-0.009583007687156897" d="0.0019306553719359654"/>
+         <laneOffset s="153.56729289186373" a="0.8621846509717788" b="0.022350556636028033" c="0.024820585418671687" d="-0.003983289256612938"/>
+         <laneOffset s="158.13122504632446" a="1.1025222023458574" b="-0.0" c="-0.001277399789733446" d="5.9172482445409647E-5"/>
+         <laneOffset s="163.56335441235615" a="1.0743134937552752" b="-0.008639811756184852" c="-2.8915589499134637E-4" d="5.53501610093669E-5"/>
+         <laneOffset s="167.10216274134893" a="1.042570666571905" b="-0.00860686883943837" c="-0.0012694397796833737" d="7.903299867342523E-5"/>
+         <laneOffset s="173.7860640631284" a="0.9519308392081495" b="-0.014984201440379239" c="3.347962190416569E-4" d="8.062797650107619E-5"/>
+         <laneOffset s="180.39342058907752" a="0.8907989491558249" b="-0.0" c="0.0016489922186130811" d="-5.2085295213987465E-5"/>
+         <laneOffset s="184.00877371390067" a="0.9098912451596626" b="0.00988099231439039" c="0.0010774212695149755" d="-5.146306070270742E-5"/>
+         <laneOffset s="194.23148336467293" a="1.0685177678861155" b="0.015775066866699338" c="-5.08933797873055E-4" d="-5.18187617925829E-5"/>
+         <laneOffset s="201.5498301643374" a="1.1363968486076323" b="-0.0" c="-0.002503226937541288" d="1.1147089022741867E-4"/>
+         <laneOffset s="204.45419301544518" a="1.1180122715572005" b="-0.011719679567162673" c="-0.0015274746678079014" d="1.1099136380072081E-4"/>
+         <laneOffset s="214.67690266621744" a="0.9571518922355061" b="-0.00815248423258833" c="0.0019517137804670405" d="7.468435145680912E-5"/>
+         <laneOffset s="215.9449130797457" a="0.9501047854267931" b="-0.0028426536418041525" c="8.605786920937896E-5" d="-1.2526542298588452E-6"/>
+         <laneOffset s="224.8996123169897" a="0.9306509033712109" b="-0.001602747365688647" c="1.1459599857978053E-4" d="-2.9544175534742733E-6"/>
+         <laneOffset s="235.12232196776196" a="0.9230859593608648" b="-1.8602764226738304E-4" c="3.894430998417154E-4" d="-1.5924319865642632E-4"/>
+         <laneOffset s="236.46205985686527" a="0.9231528106702608" b="-0.0" c="4.778377739635458E-5" d="-2.319104763959083E-6"/>
+         <laneOffset s="245.34503161853422" a="0.9252977633073015" b="2.9994178849181705E-4" c="8.10514521301205E-6" d="5.717610968523336E-7"/>
+         <laneOffset s="255.56774126930648" a="0.9298218187379695" b="6.449084901252059E-4" c="-7.48572810108637E-7" d="1.1473911933259552E-6"/>
+         <laneOffset s="265.79045092007874" a="0.9375620739854243" b="9.893237990537325E-4" c="3.7374486740719006E-6" d="8.541298903215411E-7"/>
+         <laneOffset s="276.013160570851" a="0.9489786986457657" b="0.0013335169430582564" c="2.2467054487111095E-5" d="-4.1960335090247094E-7"/>
+         <laneOffset s="284.90207302990063" a="0.9623126949162059" b="0.0016334702416531087" c="2.5272192956910596E-4" d="-4.228736592817834E-5"/>
+         <laneOffset s="286.23587022162326" a="0.9648406676570063" b="0.002081940273169729" c="1.796468570573238E-4" d="-4.112288122691331E-6"/>
+         <laneOffset s="296.4585798723955" a="1.0005043100139888" b="0.004465646476606556" c="7.790486897400815E-5" d="-3.4386261606447484E-6"/>
+         <laneOffset s="306.6812895231678" a="1.0506231462699733" b="0.004980395763007949" c="-3.97380943392892E-5" d="-1.7396091961053937E-6"/>
+         <laneOffset s="316.90399917394006" a="1.0955250592754917" b="0.00362254648607137" c="-1.3762041551426227E-4" d="-1.4493429307925921E-6"/>
+         <laneOffset s="328.0890555989161" a="1.116798294129466" b="-0.0" c="-1.9121400022568063E-4" d="5.040077982786787E-6"/>
+         <laneOffset s="337.3494184754845" a="1.104403274657493" b="-0.002244796668698791" c="-9.598431262507124E-5" d="4.505122273221747E-6"/>
+         <laneOffset s="347.5721281262568" a="1.076237521255523" b="-0.002794829095599646" c="1.831702411511527E-5" d="3.490819065928463E-6"/>
+         <laneOffset s="357.7948377770291" a="1.0533102770277194" b="-0.0013259183621579678" c="1.2913081066743E-4" d="2.0801430984269186E-6"/>
+         <laneOffset s="362.41341793810477" a="1.0501458788086668" b="-0.0" c="2.534543290274298E-4" d="-2.4366930455622537E-6"/>
+         <laneOffset s="368.01754742780133" a="1.0576770635786839" b="0.0026111994595641587" c="2.279255676238766E-4" d="-1.243745570338596E-6"/>
+         <laneOffset s="378.24025707857356" a="1.1068609755124983" b="0.0068813048717725105" c="1.7129157914058392E-4" d="3.451642806075154E-6"/>
+         <laneOffset s="381.5007736974996" a="1.131238222205644" b="0.008108385871812562" c="1.843824342748418E-4" d="1.7341863800792533E-6"/>
+         <laneOffset s="388.46296672934585" a="1.1972130194128243" b="0.01092797720242785" c="1.9753751125970183E-4" d="3.2607370058148784E-7"/>
+         <laneSection s="0.0">
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="biking" level="false">
+                  <link>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="2.425457002647293" b="-0.061409342167990655" c="0.028928125518710046" d="-0.0037769595448365967"/>
+                  <width sOffset="2.8527770106310646" a="2.3980075277588995" b="0.011427135591285265" c="0.009948271377626971" d="0.006237455087698484"/>
+                  <width sOffset="3.939600834025424" a="2.430184847574277" b="0.05515395656874354" c="0.014511609075803213" d="-0.006015308665497676"/>
+                  <width sOffset="5.657320466988927" a="2.5372542610113484" b="0.051762107483029667" c="-0.0038177414377133143" d="-2.7342893268836863E-4"/>
+                  <width sOffset="6.465098546832751" a="2.576431340991342" b="0.04505909020039642" c="-0.022841355028391484" d="0.002135775154560062"/>
+                  <width sOffset="10.22270965077226" a="2.536550085096347" b="-0.03612963171409406" c="0.001242574257802739" d="0.0021374941991984244"/>
+                  <width sOffset="12.742648516712359" a="2.4875999299820606" b="0.01085264434342859" c="-0.0016462814295831036" d="3.312431847280849E-7"/>
+                  <width sOffset="14.54844719469452" a="2.5018311976217316" b="0.004910179146685282" c="-0.03419487029514432" d="0.0071107927259266394"/>
+                  <width sOffset="16.463341857194816" a="2.4357761645426073" b="-0.04782694567035077" c="0.03768954416401609" d="0.001165041770143099"/>
+                  <width sOffset="17.83757603029964" a="2.44425177862756" b="0.062362185969754694" c="0.008577856573189926" d="-0.006013776702441611"/>
+                  <width sOffset="20.245957220794104" a="2.5601893841752723" b="-9.654434558916559E-4" c="-0.008265686424418892" d="7.842140652873769E-4"/>
+                  <width sOffset="20.44541930154452" a="2.5596741867020274" b="-0.004169225326001839" c="-0.007835187372976752" d="7.887043935025008E-4"/>
+                  <width sOffset="24.539693295315846" a="2.465393231941313" b="-0.028664689684814358" c="-0.001779739313434767" d="0.0012011203849188927"/>
+                  <width sOffset="26.86645590630162" a="2.404192241622704" b="-0.017438787474922064" c="0.0037601797460448286" d="2.6346378913443707E-5"/>
+                  <width sOffset="30.21028440523538" a="2.38890824545477" b="0.008591756445638137" c="0.0037691517025923342" d="-4.8187784243734484E-4"/>
+                  <width sOffset="30.668128952316778" a="2.393585782212366" b="0.011740091498593942" c="0.003159128686292455" d="-4.828106549615413E-4"/>
+                  <width sOffset="38.241624191375394" a="2.453967487772454" b="-0.023487530976455465" c="-0.002602213672455803" d="-1.963840862424486E-4"/>
+                  <width sOffset="40.89083860308904" a="2.3698293847838787" b="-0.041410043998918636" c="-0.003991356333078172" d="-1.412058212592934E-4"/>
+                  <width sOffset="40.9465594699916" a="2.36750956438171" b="-0.041856162922753314" c="-0.024134935634340732" d="0.0038018203075349402"/>
+                  <width sOffset="45.927216171090365" a="2.0300578249662022" b="6.627774534087264E-4" c="0.0012893228047244167" d="-3.691299041139695E-5"/>
+                  <width sOffset="51.113548253861296" a="2.063026023647048" b="0.011057828577618313" c="6.588946101637153E-4" d="-4.03344623897647E-5"/>
+                  <width sOffset="52.851223420062865" a="2.084018847555418" b="0.012982346639491348" c="0.0026456256114423126" d="-3.1455270347446933E-4"/>
+                  <width sOffset="55.29789479800307" a="2.1270126070913955" b="0.020279372594621703" c="0.0011259787347929102" d="-2.7499961259698177E-4"/>
+                  <width sOffset="60.06164774515692" a="2.2194417848440304" b="0.012285160734882566" c="1.1812507897051188E-4" d="-5.3084333254470415E-5"/>
+                  <width sOffset="61.336257904633555" a="2.23518255968834" b="0.012327560216774013" c="1.3482497955671072E-5" d="-1.745603866316031E-5"/>
+                  <width sOffset="69.77122873431978" a="2.3296484099952512" b="0.008829084073819526" c="7.462753159461511E-4" d="-8.864028585706627E-5"/>
+                  <width sOffset="70.07020312820832" a="2.3323524175616845" b="0.009251548975476854" c="8.586382542955521E-4" d="-1.3817448047334315E-4"/>
+                  <width sOffset="71.55896755540581" a="2.3475729591601144" b="0.010889411306196105" c="4.2248576675060605E-4" d="-7.424179727168332E-5"/>
+                  <width sOffset="81.78167720617807" a="2.4237302164876118" b="-0.0037483381975360573" c="-0.0018563380312189399" d="-7.204899914861703E-5"/>
+                  <width sOffset="82.27626000007811" a="2.4214135535342027" b="-0.005637436076946687" c="-0.0016569002199509338" d="1.1350850700160042E-4"/>
+                  <width sOffset="90.74050196102927" a="2.323823332344299" b="-0.009289841432246232" c="0.0018841466710651292" d="-1.0047753982068934E-4"/>
+                  <width sOffset="92.00438685695033" a="2.314888929711053" b="-0.005008662376303448" c="0.0013773508262376758" d="-1.3968379523324496E-4"/>
+                  <width sOffset="96.70190217471762" a="2.307274777796889" b="-0.0013154694954966902" c="-0.0024788102932341376" d="9.187675948717954E-5"/>
+                  <width sOffset="99.02012646355043" a="2.2920483399702727" b="-0.01132706367447258" c="-0.001567939136289161" d="3.303909036371592E-4"/>
+                  <width sOffset="102.22709650772259" a="2.2504942166278985" b="-0.011189860131900861" c="0.001732305560728833" d="3.053994923022989E-4"/>
+                  <width sOffset="105.17529135816176" a="2.2403872199272863" b="0.006987950901787752" c="0.003812178416912759" d="-7.110279103362246E-5"/>
+                  <width sOffset="107.90539770787272" a="2.286432211123717" b="0.026213366068331315" c="0.009124559901941769" d="-7.294171990645819E-4"/>
+                  <width sOffset="112.44980615849485" a="2.525538196914783" b="0.06395381823739504" c="-6.97401338601832E-4" d="-6.820849543358146E-4"/>
+                  <width sOffset="114.66220023272433" a="2.6562294009998624" b="0.05085218687864673" c="-0.00458916222873705" d="-4.967793489045852E-4"/>
+                  <width sOffset="117.65498958290793" a="2.7539985727635545" b="0.010034753116094208" c="-0.0014672337412962614" d="5.565514167880303E-5"/>
+                  <width sOffset="122.67251580926711" a="2.774440071059315" b="-4.8556478743065276E-4" c="-9.80252139989855E-4" d="1.2988904773504647E-4"/>
+                  <width sOffset="124.29835929133452" a="2.7716176768256826" b="-0.0026430046142867872" c="-0.013509747908740589" d="0.0010777296079294099"/>
+                  <width sOffset="129.88662825270737" a="2.5230349262710776" b="-0.05266676901183491" c="-0.018122648172256166" d="0.0028242997980688933"/>
+                  <width sOffset="131.92420229253608" a="2.364374458822429" b="-0.09134223998415139" c="-3.542655003075652E-4" d="0.0025162223006597916"/>
+                  <width sOffset="132.89522546003937" a="2.2776487585612837" b="-0.08491270772179108" c="0.006958071573687822" d="0.0025095826287904123"/>
+                  <width sOffset="135.96624348286844" a="2.155188567344735" b="0.028828782093447813" c="-4.721631774389757E-4" d="-2.6417584796163587E-4"/>
+                  <width sOffset="136.73075438836014" a="2.176834473098151" b="0.02764362023527787" c="0.004455957024888327" d="-8.537589953739453E-4"/>
+                  <width sOffset="141.70790452651812" a="2.319540563471705" b="0.008551540794878418" c="-6.393664647171785E-4" d="-0.0017423284565790582"/>
+                  <width sOffset="141.720366129922" a="2.3196470267216465" b="0.008534794025520053" c="-0.00493848669709626" d="0.0011853456442727864"/>
+                  <width sOffset="143.11793511081163" a="2.3251648166105006" b="0.0016766903662333021" c="-1.1470299781200614E-4" d="0.0012678265338197678"/>
+                  <width sOffset="144.9501757686982" a="2.335650280476565" b="0.01402504691219399" c="4.2250208129028196E-4" d="-9.86302314637139E-4"/>
+                  <width sOffset="145.96445239696192" a="2.3492810582869277" b="0.011838118421493325" c="0.005059441741753613" d="-0.0010355716348170278"/>
+                  <width sOffset="149.33109549749148" a="2.406965081490003" b="0.010692393164698787" c="-0.007437949274981091" d="-7.147519026153115E-4"/>
+                  <width sOffset="150.22099590845065" a="2.4100862565765144" b="-0.0042437599267732065" c="-0.011885653115135047" d="0.0021391638703044586"/>
+                  <width sOffset="153.3406447615839" a="2.346120869687593" b="-0.015945518745063003" c="0.00813452094787395" d="0.0021394117484611944"/>
+                  <width sOffset="153.56729289186373" a="2.3429496216192565" b="-0.011928470085047948" c="0.02461115633040939" d="-0.003774532880089876"/>
+                  <width sOffset="158.13122504632446" a="2.4423230050717475" b="-0.023145808772196047" c="0.001371420939791125" d="2.6792885896848316E-4"/>
+                  <width sOffset="161.30758488295035" a="2.391226562519557" b="-0.006323942772522137" c="0.0020023049598410043" d="-3.765590882174926E-5"/>
+                  <width sOffset="163.56335441235615" a="2.3867176938331705" b="0.0021346984180239514" c="0.0018006188471201834" d="-3.803925183263282E-5"/>
+                  <width sOffset="167.10216274134893" a="2.4151356396923003" b="0.013449672953241149" c="-1.711267335868839E-4" d="-1.4356414168572969E-5"/>
+                  <width sOffset="173.7860640631284" a="2.4931000908653194" b="0.009237986088929867" c="-4.2332439021635645E-4" d="-1.214432752770061E-5"/>
+                  <width sOffset="180.39342058907752" a="2.5321544842265102" b="0.002053315184933969" c="-9.4806745599764E-4" d="-1.4485759924583852E-4"/>
+                  <width sOffset="180.7806993060282" a="2.5327990795973787" b="0.0012538031728961698" c="-0.0018581586642340154" d="6.955650665762321E-5"/>
+                  <width sOffset="184.00877371390067" a="2.5198233175172904" b="-0.008568312386019402" c="-0.0012000453786065368" d="7.118097891778907E-5"/>
+                  <width sOffset="194.23148336467293" a="2.3828661433462823" b="-0.010787696557989526" c="9.615531549183767E-4" d="7.033898977361444E-5"/>
+                  <width sOffset="199.63077948948217" a="2.3637232841409164" b="0.005747374698467283" c="0.004628233429926579" d="-4.540891931040097E-4"/>
+                  <width sOffset="201.5498301643374" a="2.3885882120934574" b="0.01849410526245618" c="0.0011573627814282041" d="-2.907995410839907E-4"/>
+                  <width sOffset="204.45419301544518" a="2.444940166062479" b="0.017857943527791922" c="-0.0013643300745787787" d="-2.924539307419976E-4"/>
+                  <width sOffset="209.5342565212163" a="2.4621091972048457" b="-0.018645938764212" c="-6.673807523328319E-4" d="1.6801851859244338E-4"/>
+                  <width sOffset="214.67690266621744" a="2.3714212650346935" b="-0.012179483673785891" c="0.0020549123453171975" d="1.29342528230363E-4"/>
+                  <width sOffset="215.9449130797457" a="2.3595452443630482" b="-0.006344292857607868" c="3.971778460596821E-4" d="5.3405522543680764E-5"/>
+                  <width sOffset="219.04302126335503" a="2.3452902535660822" b="-0.0023454904208499473" c="0.0013930250695422008" d="-3.528246820901805E-5"/>
+                  <width sOffset="224.8996123169897" a="2.3722464503269354" b="0.01034073603834267" c="9.564569766307777E-4" d="-3.671918484390468E-5"/>
+                  <width sOffset="235.12232196776196" a="2.5386826307435895" b="0.01838401773690125" c="3.228837679346458E-4" d="-1.9171110255945174E-4"/>
+                  <width sOffset="236.46205985686527" a="2.563430932944242" b="0.01821687157201227" c="-1.4927099762666244E-4" d="-3.478700866698445E-5"/>
+                  <width sOffset="245.34503161853422" a="2.689089065129892" b="0.007330096431085387" c="-0.0010239510399371043" d="-2.3595910730065943E-5"/>
+                  <width sOffset="248.4190147696153" a="2.7012605679341224" b="3.659802987420389E-4" c="-0.0013919458830732468" d="3.4456196122429864E-5"/>
+                  <width sOffset="255.56774126930648" a="2.645330356804573" b="-0.014252722166718952" c="-7.395769351146636E-4" d="3.420809310037707E-5"/>
+                  <width sOffset="265.79045092007874" a="2.458885235653311" b="-0.018649056310669813" c="2.3075752484276674E-4" d="3.291549134278786E-5"/>
+                  <width sOffset="276.013160570851" a="2.32752039630323" b="-0.0036117409160371632" c="0.00123274909806717" d="3.164175810211859E-5"/>
+                  <width sOffset="276.7693643054735" a="2.3255078074836213" b="-0.001693039515478421" c="8.382959582888599E-5" d="-1.0663074248598694E-6"/>
+                  <width sOffset="284.90207302990063" a="2.316709807259591" b="-5.410959067967572E-4" c="2.9925802018057916E-4" d="-4.293407000206916E-5"/>
+                  <width sOffset="286.23587022162326" a="2.316418603650603" b="2.80620500181265E-5" c="2.5664036241575294E-4" d="-5.668224269427821E-6"/>
+                  <width sOffset="296.4585798723955" a="2.3374699334434688" b="0.003498129068852833" c="1.4248728035910253E-4" d="-4.273301764637704E-6"/>
+                  <width sOffset="305.55231224266066" a="2.3778505195817763" b="0.005029456972999652" c="2.5194145561491395E-4" d="-1.4673997459648365E-5"/>
+                  <width sOffset="306.6812895231678" a="2.3838286685917414" b="0.005542219353758537" c="1.7641685204418143E-4" d="-5.450056233621255E-6"/>
+                  <width sOffset="316.90399917394006" a="2.453099037894818" b="0.007440481226705037" c="-9.400130120739463E-5" d="-4.417124389975935E-6"/>
+                  <width sOffset="327.1267088247123" a="2.5146185579730123" b="0.004133766455160794" c="-3.0827214760247566E-4" d="-2.439636591228514E-6"/>
+                  <width sOffset="328.0890555989161" a="2.5183090061605284" b="0.0035336589163704945" c="-3.2027611414539483E-4" d="4.049784322096095E-6"/>
+                  <width sOffset="334.0178962870608" a="2.5288454302310477" b="1.6299055406887868E-4" c="-2.1284331024692932E-4" d="2.158167513452669E-5"/>
+                  <width sOffset="337.3494184754845" a="2.5278240995357426" b="-5.365862347123406E-4" c="-1.5487204451129988E-4" d="5.282050183422873E-6"/>
+                  <width sOffset="347.5721281262568" a="2.5117968954574703" b="-0.0020470272921563207" c="-5.813139515833821E-5" d="4.490620202401769E-6"/>
+                  <width sOffset="353.05213156186124" a="2.4995724750782253" b="-0.002279581912473131" c="-2.601854920375452E-4" d="7.193088187916945E-6"/>
+                  <width sOffset="357.7948377770291" a="2.483676018254295" b="-0.004262160555987238" c="-1.5223500638098937E-4" d="4.611306251122706E-6"/>
+                  <width sOffset="362.41341793810477" a="2.4611978271029535" b="-0.005373284484736178" c="7.159651743447314E-6" d="9.447010713619209E-8"/>
+                  <width sOffset="368.01754742780133" a="2.431326730193479" b="-0.00528413639347324" c="3.546972072460938E-5" d="1.4632233223376012E-6"/>
+                  <width sOffset="378.24025707857356" a="2.38257843735658" b="-0.004100205920917124" c="4.216753297915738E-5" d="1.110601442439101E-5"/>
+                  <width sOffset="381.5007736974996" a="2.3700428911986124" b="-0.0034710269642086247" c="1.3013000572325824E-4" d="9.388557998161946E-6"/>
+                  <width sOffset="381.6944263223652" a="2.3693756659473824" b="-0.003419570679353657" c="6.724362680747141E-6" d="3.6272796723108225E-6"/>
+                  <width sOffset="388.46296672934585" a="2.3476630039976145" b="-0.0028300112322420506" c="3.368787751382006E-5" d="6.071445117575088E-7"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects/>
+      <signals/>
+   </road>
+   <road length="23.892971563712937" id="255976" junction="-1">
+      <type s="0.0" type="bicycle"/>
+      <planView>
+         <geometry s="0.0" x="618273.2694593961" y="5809502.145824729" hdg="0.015811566012347233" length="23.892971563712937">
+            <paramPoly3 aU="0.0" bU="23.891684780027273" cU="-0.13196175756234807" dU="0.08022742807970848" aV="-0.0" bV="2.7755575615628914E-15" cV="3.846009117989247" dV="-2.3558288989527894" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="102.2715390258724" b="0.010021865544267785" c="-2.000022927965542E-4" d="-2.580961799589663E-5"/>
+         <elevation s="8.959864425456264" a="102.32671295164894" b="2.2195451515131409E-4" c="-2.9250256183607814E-4" d="1.0174422850456645E-19"/>
+         <elevation s="11.946485781856468" a="102.3247667500582" b="-0.0015252342808114879" c="-2.925025798772162E-4" d="5.033810587779474E-13"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.009544964341173755" b="-0.0031222703719521487" c="1.3067735687988038E-4" d="0.0"/>
+         <superelevation s="11.946485781856468" a="-0.009105114961645271" b="0.0" c="2.1284480997650173E-4" d="-2.292653382118776E-6"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="0.8597246788998183" b="0.02449024036871889" c="3.253989787938803E-5" d="-2.1085795756153154E-4"/>
+         <laneOffset s="6.27380915211116" a="0.9625830058580057" b="-0.0" c="-0.003842398205312253" d="1.714999068304753E-4"/>
+         <laneOffset s="11.946485781856468" a="0.870243502512567" b="-0.027037144652338058" c="-9.197611303916412E-4" d="1.7173838340350746E-4"/>
+         <laneSection s="0.0">
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="biking" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="1.848252277880636" b="-0.027297315479555" c="0.0075210436261996345" d="-5.265241845352775E-4"/>
+                  <width sOffset="6.27380915211116" a="1.8430069106967617" b="0.004900817354846342" c="-0.002295183468392919" d="-1.441663201432656E-4"/>
+                  <width sOffset="10.708409900427748" a="1.8070310602954125" b="-0.023961015096402215" c="0.0049790838931033365" d="-2.0775180102562902E-4"/>
+                  <width sOffset="11.946485781856468" a="1.7846033404621515" b="-0.012587393493392714" c="0.0042176143408213535" d="-2.0596239049523675E-4"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects/>
+      <signals/>
+   </road>
+   <road length="152.7119336866646" id="255977" junction="-1">
+      <type s="0.0" type="bicycle"/>
+      <planView>
+         <geometry s="0.0" x="618104.5569823437" y="5809486.52389773" hdg="0.07558760936328879" length="24.000153327128125">
+            <paramPoly3 aU="0.0" bU="27.06940582550069" cU="-5.85827147168604" dU="2.7814708073655203" aV="-0.0" bV="3.9968028886505635E-15" cV="0.7847753552143645" dV="-0.24517269493847418" pRange="normalized"/>
+         </geometry>
+         <geometry s="24.000153327128125" x="618128.4403309708" y="5809488.873776834" hdg="0.11076838420309398" length="96.00011341284092">
+            <paramPoly3 aU="0.0" bU="96.2830914236831" cU="-1.0653671458297458" dU="0.7706484313740887" aV="-0.0" bV="-3.552713678800501E-15" cV="-0.6301806494772786" dV="-0.5864611510699407" pRange="normalized"/>
+         </geometry>
+         <geometry s="120.00026673996905" x="618223.9749244192" y="5809498.275338794" hdg="0.0794743319090816" length="32.71166694669554">
+            <paramPoly3 aU="0.0" bU="31.613836813396674" cU="5.9869650432726385" dU="-4.898975674253574" aV="-0.0" bV="3.552713678800501E-15" cV="-0.252084248417096" dV="-0.372072076007006" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="102.0219742051904" b="-0.0050412154711626115" c="1.8075710833562056E-4" d="1.0904464789455956E-6"/>
+         <elevation s="10.180795579110972" a="101.99053650857648" b="-0.0010216433840398744" c="7.698746606566891E-4" d="-4.2854328938364286E-5"/>
+         <elevation s="14.971758286169106" a="101.998600408459" b="0.003404290345480712" c="2.0102294576872953E-4" d="-4.6591013075864266E-5"/>
+         <elevation s="20.361591158221945" a="102.0154936947665" b="0.0015108020115114583" c="-1.6694463623961677E-5" d="6.223616032575332E-6"/>
+         <elevation s="30.54238673733292" a="102.0357118198862" b="0.0031060834090388006" c="4.804508624862348E-5" d="-3.3081841570647603E-6"/>
+         <elevation s="40.72318231644389" a="102.06882314671464" b="0.0030556918567886584" c="-5.670622181231746E-5" d="-1.9488645199401577E-6"/>
+         <elevation s="47.909626338406525" a="102.0871308047631" b="0.0019387124853835723" c="-1.061111114309815E-5" d="6.757437525416149E-7"/>
+         <elevation s="50.90397789555486" a="102.09285899301021" b="0.0018933421328325623" c="-1.2461006437112128E-5" d="5.894633992375705E-8"/>
+         <elevation s="61.08477347466584" a="102.11090535803426" b="0.0016579453309213846" c="-1.2086975045460807E-5" d="3.789499136670828E-8"/>
+         <elevation s="71.2655690537768" a="102.1265717502543" b="0.0014236185749561241" c="-1.0707114593513295E-5" d="-1.941266217774486E-7"/>
+         <elevation s="81.44636463288778" a="102.13975069522338" b="0.0011452418282104492" c="-8.706529994827407E-5" d="4.820258958291333E-6"/>
+         <elevation s="91.62716021199876" a="102.14747243053418" b="8.712930446856412E-4" c="2.0033801700617603E-4" d="-1.4100464977400908E-5"/>
+         <elevation s="91.82678374721829" a="102.14765423234495" b="9.495917192471193E-4" c="2.1356280019666206E-4" d="-1.5232073911657088E-5"/>
+         <elevation s="101.80795579110972" a="102.1632620082179" b="6.603747778273581E-4" c="-1.7794290722848775E-4" d="8.69565979041745E-6"/>
+         <elevation s="109.79289359644903" a="102.16161663447734" b="-5.180655528801799E-4" c="-2.8850395697249914E-4" d="2.7834886375842788E-5"/>
+         <elevation s="111.9887513702207" a="102.15938264520545" b="-0.0013824508221233094" c="-2.374276855276821E-4" d="1.7985986636676535E-5"/>
+         <elevation s="120.77218295598013" a="102.14111059808704" b="-0.0013905256211851772" c="3.903501214876516E-5" d="-3.9778361302293044E-19"/>
+         <elevation s="122.16954694933168" a="102.13924374843688" b="-0.0012814333802717295" c="3.233686778105992E-4" d="-1.602100475353548E-5"/>
+         <elevation s="132.35034252844264" a="102.14280867957842" b="3.2120335694234455E-4" c="1.0144238478558746E-4" d="-1.0243487839437654E-5"/>
+         <elevation s="142.5311381075536" a="102.14578395986959" b="-7.984377566666893E-4" c="-4.659552783155884E-4" d="1.1748392644162848E-5"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.03336199218610397" b="-0.004074526225428794" c="8.42580235402928E-5" d="7.5862057941462326E-6"/>
+         <superelevation s="10.180795579110972" a="0.008618455151809012" b="0.0" c="2.527740706208785E-4" d="-1.6552345616913093E-5"/>
+         <superelevation s="20.361591158221945" a="0.0173516812145585" b="0.0" c="-4.490685724952337E-4" d="2.8517311239442115E-5"/>
+         <superelevation s="30.54238673733292" a="8.985382930032241E-4" b="-2.7641263570676763E-4" c="1.3575198203267788E-5" d="-4.109841872554967E-22"/>
+         <superelevation s="40.72318231644389" a="-5.085119768037114E-4" b="0.0" c="1.0797343861934217E-4" d="-4.329341944776543E-6"/>
+         <superelevation s="50.90397789555486" a="0.006114352928289884" b="8.523203364984473E-4" c="2.9489322859711427E-5" d="-9.496482695210855E-7"/>
+         <superelevation s="61.08477347466584" a="0.01684608625081583" b="0.001157480735137007" c="1.7863517503396626E-5" d="-7.57361680810788E-7"/>
+         <superelevation s="71.2655690537768" a="0.029682502430667796" b="0.001285711944587049" c="1.6375160198972413E-5" d="-1.3685307293406719E-6"/>
+         <superelevation s="81.44636463288778" a="0.043025227213739824" b="0.0011935973849002478" c="-4.01546822589104E-5" d="2.815534310343962E-6"/>
+         <superelevation s="91.62716021199876" a="0.05398604438952953" b="0.0012514627185878345" c="8.787610648731035E-5" d="-6.944646877314549E-6"/>
+         <superelevation s="101.80795579110972" a="0.06850699943938227" b="8.813513211496376E-4" c="-8.520324780485787E-5" d="4.117385026616437E-6"/>
+         <superelevation s="111.9887513702207" a="0.07299342825638419" b="4.2676118800277535E-4" c="-1.9744254092406034E-5" d="1.8051159850615092E-6"/>
+         <superelevation s="122.16954694933168" a="0.07719653627169187" b="5.860299850634553E-4" c="1.0859463637891544E-4" d="-8.99574655818062E-6"/>
+         <superelevation s="132.35034252844264" a="0.08492593121870518" b="0.0" c="-1.4376950165538916E-5" d="0.0"/>
+         <superelevation s="142.5311381075536" a="0.08343578048156504" b="-2.9273758137284266E-4" c="-9.380021876430253E-4" d="3.0240768196039724E-5"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="1.3074474917825833" b="0.0041297990122889745" c="3.4027124714486966E-5" d="1.3539456485966774E-5"/>
+         <laneOffset s="4.236574268860595" a="1.326583975831479" b="0.005147157197996223" c="9.539256537742742E-4" d="-9.856193205556563E-5"/>
+         <laneOffset s="10.180795579110972" a="1.3701844709374218" b="0.006040154574517744" c="-8.101482735044982E-4" d="-1.0234415147967045E-4"/>
+         <laneOffset s="12.703076946623913" a="1.3786230888401618" b="-0.0" c="-2.1614394964301735E-4" d="-6.196021015374052E-7"/>
+         <laneOffset s="20.361591158221945" a="1.365667311056468" b="-0.003419707288827864" c="-2.4605942788046795E-4" d="4.84048217011022E-6"/>
+         <laneOffset s="23.507297053570888" a="1.3526257206936572" b="-0.0048240720004915525" c="-0.00867484205340708" d="6.342663064729079E-4"/>
+         <laneOffset s="30.54238673733292" a="1.1101898679561268" b="-0.03270640516302817" c="0.004703397173139878" d="6.337351069239857E-4"/>
+         <laneOffset s="31.97027622167952" a="1.0749233232559525" b="-0.015398235023090267" c="2.189596477035648E-4" d="3.5967871970358945E-11"/>
+         <laneOffset s="40.72318231644389" a="0.9569192776259168" b="-0.011565160286447138" c="2.1943615625235626E-4" d="-3.159714385671158E-8"/>
+         <laneOffset s="50.90397789555486" a="0.8618876528905853" b="-0.007106915986548755" c="2.2189294686445025E-4" d="-1.9283363445943365E-7"/>
+         <laneOffset s="61.08477347466584" a="0.8123290041111303" b="-0.0026487833295395034" c="2.2916179539741674E-4" d="-1.1211590032922033E-6"/>
+         <laneOffset s="67.13246827635268" a="0.8044434832781757" b="-0.0" c="2.2055179815657155E-4" d="-5.376970596127073E-6"/>
+         <laneOffset s="71.2655690537768" a="0.8078314297538355" b="0.0015475689607551046" c="1.858838123809722E-4" d="-2.834528135198645E-6"/>
+         <laneOffset s="81.44636463288778" a="0.8398624441447669" b="0.004451074544470208" c="1.9725191876756413E-4" d="-4.1378327418479986E-5"/>
+         <laneOffset s="82.91220863738928" a="0.8466805324703307" b="0.004762626961237489" c="-2.0399690880267858E-4" d="2.515264045646234E-5"/>
+         <laneOffset s="91.62716021199876" a="0.889341583482752" b="0.006938038471599887" c="5.19752025396554E-4" d="1.9313655120425427E-5"/>
+         <laneOffset s="96.35811469234736" a="0.9358432635326994" b="0.013152715465988894" c="0.0014185920288764526" d="-8.50736191021626E-5"/>
+         <laneOffset s="101.80795579110972" a="1.0358863496414425" b="0.021034662276614" c="1.0038164053015592E-4" d="-8.283393334934274E-5"/>
+         <laneOffset s="106.75522479726453" a="1.13237727955179" b="0.015945693728668827" c="-0.0010347491154903033" d="6.22785548248476E-5"/>
+         <laneOffset s="111.9887513702207" a="1.1964152545750812" b="0.010232311299806608" c="-2.582815840103014E-5" d="6.281849635393164E-5"/>
+         <laneOffset s="118.76389622594985" a="1.2840914104469499" b="0.01853292690684696" c="0.0013415413411028622" d="-1.9733162103005675E-4"/>
+         <laneOffset s="122.99452401879977" a="1.37156643401521" b="0.01928840179339196" c="-8.879399664800291E-5" d="-1.0576942644400007E-5"/>
+         <laneOffset s="132.35034252844264" a="1.5355912156181002" b="0.014849478870784494" c="-3.6285486922940744E-4" d="-8.102643761594328E-6"/>
+         <laneOffset s="142.5311381075536" a="1.640611211917993" b="0.004941693360657516" c="-9.61940035711992E-4" d="5.3426451503965197E-5"/>
+         <laneOffset s="146.25506452107282" a="1.6484329380370346" b="-0.0" c="-0.0030903582796705984" d="6.510579018072002E-5"/>
+         <laneSection s="0.0">
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="biking" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="2.588526648426622" b="-0.033214952248121224" c="-1.3873925472595612E-4" d="2.1277639554912934E-4"/>
+                  <width sOffset="4.236574268860595" a="2.4614984715394153" b="-0.02293341987493479" c="0.003313405542658402" d="1.006750070076055E-4"/>
+                  <width sOffset="8.198735696808695" a="2.4289108698734316" b="0.008064482596415462" c="8.888485013395133E-4" d="-1.3042924418977208E-4"/>
+                  <width sOffset="10.180795579110972" a="2.44737144711298" b="0.010050786634836148" c="1.0164712241439683E-4" d="-1.3745225985011296E-4"/>
+                  <width sOffset="12.703076946623913" a="2.4711633990515756" b="0.0079401779653692" c="4.2999386350171776E-4" d="-3.572771047198122E-5"/>
+                  <width sOffset="20.361591158221945" a="2.541145066910696" b="0.008239811144369882" c="-4.2372540871378847E-4" d="-2.5312583889077043E-5"/>
+                  <width sOffset="23.282145889567673" a="2.5609650922926677" b="0.005117062970466708" c="-3.6336492086631574E-5" d="-3.7223754890866536E-6"/>
+                  <width sOffset="23.507297053570888" a="2.5621153204835596" b="0.0051001344678248935" c="-0.008513313609037305" d="6.257034488075097E-4"/>
+                  <width sOffset="30.54238673733292" a="2.394510143950791" b="-0.02178085587090152" c="0.0046770680586527245" d="6.245265582271264E-4"/>
+                  <width sOffset="31.97027622167952" a="2.374763585944712" b="-0.0046042009186578955" c="1.531841636653322E-4" d="-9.20851272898251E-6"/>
+                  <width sOffset="35.32175815540494" a="2.3607066631856797" b="-0.0038877149602674684" c="1.904742210207298E-4" d="-2.168410201318346E-7"/>
+                  <width sOffset="40.72318231644389" a="2.3452304523349765" b="-0.001849030100730795" c="1.882339285427445E-4" d="-2.9693930186150966E-7"/>
+                  <width sOffset="50.90397789555486" a="2.3456026999340858" b="0.0018913801668197115" c="1.888547562118122E-4" d="-7.648142507561751E-7"/>
+                  <width sOffset="61.08477347466584" a="2.3836259343330024" b="0.005498947725195501" c="1.9810526015416938E-4" d="-2.249151958188596E-6"/>
+                  <width sOffset="67.13246827635268" a="2.4236300203828547" b="0.007648322445842662" c="1.6902999152435558E-4" d="-6.504963551024402E-6"/>
+                  <width sOffset="71.2655690537768" a="2.4576694913360764" b="0.008712194874978941" c="1.5803823558513446E-4" d="-4.600865867082627E-6"/>
+                  <width sOffset="81.44636463288778" a="2.5578920584708236" b="0.010499484916594786" c="1.6604604533295052E-4" d="-4.335750093827362E-5"/>
+                  <width sOffset="82.91220863738928" a="2.5735028871413648" b="0.01070679350601958" c="-2.4390626115085412E-4" d="2.317346693666833E-5"/>
+                  <width sOffset="91.62716021199876" a="2.6636259085729916" b="0.011735631921834817" c="5.014124343791023E-4" d="1.606124931060861E-5"/>
+                  <width sOffset="96.35811469234736" a="2.732069919003714" b="0.017558396015259884" c="0.0013540914863454268" d="-8.83260249119793E-5"/>
+                  <width sOffset="101.80795579110972" a="2.8536810994581763" b="0.024447510559513923" c="4.579844068625752E-5" d="-8.415533242858104E-5"/>
+                  <width sOffset="106.75522479726453" a="2.965560354494087" b="0.018721440872859162" c="-0.0011089442654626295" d="6.095715574560871E-5"/>
+                  <width sOffset="111.9887513702207" a="3.041903669329726" b="0.012122875295020506" c="-8.6945311773332E-5" d="6.149105635755225E-5"/>
+                  <width sOffset="118.76389622594985" a="3.1391704051944127" b="0.01941253697451326" c="0.00125344339294226" d="-1.986590610264294E-4"/>
+                  <width sOffset="122.16954694933168" a="3.2119736437811452" b="0.021037702128963488" c="-5.320463258311945E-4" d="-3.081068740617848E-4"/>
+                  <width sOffset="122.99452401879977" a="3.2287941693328177" b="0.01953076933961443" c="-2.2041506070496366E-4" d="-1.2135219567573482E-4"/>
+                  <width sOffset="123.5398301796823" a="3.239359198368975" b="0.01918212652534302" c="-0.0022984049868263663" d="2.7778048240043373E-5"/>
+                  <width sOffset="132.35034252844264" a="3.248947463562679" b="-0.014849300874453604" c="-0.0015071532362932118" d="3.3614831488121533E-5"/>
+                  <width sOffset="142.5311381075536" a="2.9770266631144042" b="-0.03508494835450576" c="-9.420588002855549E-4" d="1.0185529724570158E-4"/>
+                  <width sOffset="146.25506452107282" a="2.8385687901903296" b="-0.037863789557729836" c="-0.002529440670742464" d="1.1353463592245692E-4"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects/>
+      <signals/>
+   </road>
+   <road length="18.750280437254858" id="255978" junction="2104812">
+      <link>
+         <predecessor elementType="road" elementId="2234084" contactPoint="end"/>
+         <successor elementType="road" elementId="255971" contactPoint="start"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618299.1077341053" y="5809501.298719764" hdg="0.8547954389697635" length="18.750280437254858">
+            <paramPoly3 aU="0.0" bU="18.716445480532407" cU="-0.10549580120650859" dU="-0.6392822837880103" aV="-0.0" bV="3.552713678800501E-15" cV="-5.764266069792496" dV="1.0450255227936665" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="102.16251816009508" b="-0.0031117760179199573" c="0.0022260390350649925" d="-6.964431601954856E-5"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.02690339682507837" b="7.80973227834512E-4" c="-0.0" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="2.0091986133783073" b="0.041259347632803055" c="-0.059942151657285225" d="0.00908026469491689"/>
+         <laneOffset s="3.9042705876861143" a="1.7969719457094238" b="-0.011561030120786098" c="-0.028357128082879886" d="0.04558703413731905"/>
+         <laneOffset s="4.459319245410254" a="1.7896141055061998" b="-9.069765079473084E-4" c="-0.014495730292816365" d="0.005452580505021379"/>
+         <laneOffset s="6.435674462544391" a="1.7732933273607918" b="0.0056886094030731025" c="-0.0041343667400204065" d="4.5632398267853144E-4"/>
+         <laneOffset s="11.684028126089721" a="1.755236541491008" b="-0.0" c="0.006821066124072561" d="0.004718613407757467"/>
+         <laneOffset s="13.27883992489374" a="1.7917254439238735" b="0.057760946769659115" c="-0.05192951635406028" d="0.08639097683029086"/>
+         <laneOffset s="13.657637565805263" a="1.8108495000212024" b="0.05560750564757128" c="-0.01945416604211317" d="0.0050748883624549355"/>
+         <laneOffset s="15.065340854618999" a="1.8647340673609671" b="0.03100574960156562" c="0.00865993732918483" d="-0.0105978063293702"/>
+         <laneOffset s="16.362132881703587" a="1.8963937909493866" b="-0.0" c="-0.03232793332182117" d="0.012985926849351676"/>
+         <laneOffset s="17.690117150963385" a="1.8697945891982055" b="-0.01715828304744531" c="0.011619683568126298" d="-0.008825369307599211"/>
+         <laneSection s="0.0">
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="4.924003273991612" b="0.10568879619217211" c="-0.08224105536057469" d="0.015411786494301414"/>
+                  <width sOffset="1.5377148988355325" a="4.948095735125744" b="-0.03791118569869416" c="-0.012860395449830888" d="0.005721021204257027"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.14">
+                     <type name="solid" width="0.14">
+                        <line length="3.9042705876861143" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.14"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="40.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="-2"/>
+                     <successor id="-2"/>
+                  </link>
+                  <width sOffset="0.0" a="0.4759470485118915" b="-0.013335609718715252" c="0.022003849398852065" d="-0.006353813702069768"/>
+                  <width sOffset="1.5377148988355325" a="0.484367603638018" b="0.009263627675115994" c="-0.005591071364306483" d="0.003336951587974905"/>
+                  <width sOffset="2.6009652331066575" a="0.49190748091599934" b="0.008691494738761928" c="0.021196786720803166" d="-0.008912735701777787"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+         <laneSection s="3.9042705876861143">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <successor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.0" b="0.0" c="4.387476467289196" d="-5.269764611708744"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.16">
+                     <type name="solid" width="0.16">
+                        <line length="0.5550486577241394" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.16"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="4.862178031584774" b="-0.002657658881879285" c="0.024886013858781378" d="-0.019976643176125748"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.14">
+                     <type name="solid" width="0.14">
+                        <line length="0.5550486577241394" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.14"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="40.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="-2"/>
+                     <successor id="-2"/>
+                  </link>
+                  <width sOffset="0.0" a="0.5195090958566149" b="0.018525617808390973" c="-0.0016461826010695582" d="-0.005368382673854824"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+         <laneSection s="4.459319245410254">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="1"/>
+                     <successor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.45056576920599123" b="1.4215809123010168E-5" c="0.006926115059891372" d="-0.0019225249002242503"/>
+                  <roadMark sOffset="0.0" type="curb" weight="standard" color="standard" width="0.12">
+                     <type name="curb" width="0.12">
+                        <line length="1.9763552171341372" space="0.0" tOffset="0.0" sOffset="0.0" width="0.0"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.16">
+                     <type name="solid" width="0.16">
+                        <line length="1.9763552171341372" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.16"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="4.864953777306187" b="0.006505084790183484" c="0.04194952070559673" d="-0.05013830178369343"/>
+                  <width sOffset="0.6156148665333196" a="4.873158899306662" b="0.0011500908659653735" c="-0.01260184682210434" d="0.007801325967649264"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.14">
+                     <type name="solid" width="0.14">
+                        <line length="1.9763552171341372" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.14"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="40.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="-2"/>
+                  </link>
+                  <width sOffset="0.0" a="0.5283665736222303" b="0.011736536824496605" c="-0.020912886868096385" d="0.025197323416965775"/>
+                  <width sOffset="0.6156148665333196" a="0.5335448650562191" b="0.014635939371168515" c="-0.01242363054570583" d="-0.03274230433440529"/>
+                  <width sOffset="0.9912455717267408" a="0.5355542469122065" b="-0.008557117717516684" c="-0.8024207083463015" d="0.2631588264505089"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+         <laneSection s="6.435674462544391">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="1"/>
+                     <successor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.4628060006062762" b="0.004863111967258047" c="-0.008674270539362722" d="0.00289581304583892"/>
+                  <width sOffset="2.0306493203392773" a="0.4611605688195606" b="0.005457282600997982" c="0.0015022348008706958" d="-4.836141421316034E-4"/>
+                  <width sOffset="5.2483536635453305" a="0.4781625079584466" b="1.0330452532096384E-4" c="-0.006936731101177005" d="-0.004745903567210543"/>
+                  <roadMark sOffset="0.0" type="curb" weight="standard" color="standard" width="0.12">
+                     <type name="curb" width="0.12">
+                        <line length="6.843165462349349" space="0.0" tOffset="0.0" sOffset="0.0" width="0.0"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.16">
+                     <type name="solid" width="0.16">
+                        <line length="6.843165462349349" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.16"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="4.871046072508253" b="0.010189548143121431" c="8.587691403877063E-4" d="-0.011143647517422698"/>
+                  <width sOffset="0.5676234691764188" a="4.875068571709297" b="3.9313374928465965E-4" c="-0.0025744671517387214" d="1.9844366456532825E-4"/>
+                  <width sOffset="5.2483536635453305" a="4.840854758107733" b="-0.010664391779380836" c="0.003982700531427279" d="0.004460733089644266"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.14">
+                     <type name="solid" width="0.14">
+                        <line length="0.5676234691764188" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.14"/>
+                     </type>
+                  </roadMark>
+                  <roadMark sOffset="0.5676234691764188" type="none" color="standard" width="0.0"/>
+                  <speed sOffset="0.0" max="40.0" unit="km/h"/>
+               </lane>
+            </right>
+         </laneSection>
+         <laneSection s="13.27883992489374">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="1"/>
+                     <successor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.4414334750164126" b="-0.05823480137942545" c="0.992262719759297" d="-0.38337843846378156"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.16">
+                     <type name="solid" width="0.16">
+                        <line length="0.37879764091152346" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.16"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="4.852070757897276" b="0.03607553962556048" c="0.016319256606758835" d="0.0782900097643798"/>
+                  <width sOffset="0.14841449122808648" a="4.858040291050486" b="0.03568561309371643" c="-0.014057096757408665" d="0.0830174328724699"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+                  <roadMark sOffset="0.14841449122808648" type="solid" weight="standard" color="standard" width="0.14">
+                     <type name="solid" width="0.14">
+                        <line length="0.23038314968343698" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.14"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="40.0" unit="km/h"/>
+               </lane>
+            </right>
+         </laneSection>
+         <laneSection s="13.657637565805263">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="1"/>
+                     <successor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.540914032618391" b="0.5284685366770744" c="0.298491553178976" d="-0.5298873448711054"/>
+                  <width sOffset="0.8115680594799848" a="0.8831590255671613" b="-0.03405836083103994" c="-0.0717586914084358" d="0.009619186656546614"/>
+                  <width sOffset="1.4077032888137353" a="0.8393920855116541" b="-0.1093588095528427" c="-0.06123797553464799" d="0.02529188134837425"/>
+                  <width sOffset="2.704495315898324" a="0.6497503334617254" b="-0.1405868853584465" c="0.0369153731064349" d="0.0017081481697349705"/>
+                  <width sOffset="2.91144461858606" a="0.6222521273876658" b="-0.12508819413220573" c="-0.0027075749401581223" d="-0.005004989702741273"/>
+                  <width sOffset="4.032479585158121" a="0.4715700643590761" b="-0.15002836941007558" c="-0.011752177489251803" d="0.016806306453986727"/>
+                  <width sOffset="4.155175396994959" a="0.4530163342573086" b="-0.15215323569182443" c="-0.015200291061450847" d="0.008661135520457039"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.16">
+                     <type name="solid" width="0.16">
+                        <line length="5.092642871449595" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.16"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="4.8665306844297085" b="0.04242737498193974" c="-0.021052679340084434" d="0.005035193414214526"/>
+                  <width sOffset="1.4077032888137353" a="4.898583148051289" b="0.013089172154307854" c="0.006893787903651404" d="-0.010637501277610543"/>
+                  <width sOffset="2.704495315898324" a="4.90395215134574" b="-0.022697495793205822" c="-0.03424851102453742" d="0.012946231901112123"/>
+                  <width sOffset="3.3375697046859933" a="4.8791415108913965" b="-0.05049531012212592" c="-0.04700837985990673" d="0.034387588387979375"/>
+                  <width sOffset="4.032479585158121" a="4.832890991465909" b="-0.06601121270201614" c="0.016892742106197057" d="0.012576292231028437"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.14">
+                     <type name="solid" width="0.14">
+                        <line length="5.092642871449595" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.14"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="40.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link>
+                     <successor id="-2"/>
+                  </link>
+                  <width sOffset="0.0" a="0.0" b="0.4784955947301673" c="0.08256987831614707" d="-0.09721479904637859"/>
+                  <width sOffset="1.570527267583623" a="0.5785635625805914" b="0.018494877535885527" c="-0.0019099006121384612" d="2.142757642471803E-5"/>
+                  <width sOffset="3.3375697046859933" a="0.605399474217692" b="0.01194584557056679" c="0.035551342077529885" d="-0.021419928910443562"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects>
+         <object type="pole" name="RoadSignPole" id="256789" s="0.9528591499843507" t="-4.650734481653483" zOffset="-0.027739917009355963" validLength="0.0" orientation="none" radius="0.03578111838879256" height="3.2435387717559934" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256790" s="10.079792912571511" t="-5.614163103756945" zOffset="-0.024975198672734678" validLength="0.0" orientation="none" radius="0.03554647291002787" height="3.0169445984065533" hdg="0.0" pitch="0.0" roll="0.0"/>
+      </objects>
+      <signals>
+         <signal s="0.8576128691531157" t="-4.675103455953313" id="250717" dynamic="no" orientation="+" zOffset="1.979174968141919" country="DEU" type="205" subtype="-1" height="0.7189999537396629" width="0.8058566737838095" hOffset="-0.26761126633533683"/>
+         <signal s="0.8510308950557602" t="-4.67432003830301" id="253530" dynamic="no" orientation="+" zOffset="2.735312775975089" country="DEU" type="1000" subtype="32" height="0.4499999752016845" width="0.594560568259873" hOffset="-0.2677847258781831"/>
+         <signal s="9.959993728815329" t="-5.634846950238677" id="253686" dynamic="no" orientation="+" zOffset="2.3258030981770474" country="DEU" type="240" subtype="-1" height="0.5999999975734214" width="0.599853220370366" hOffset="-0.5454691141325365"/>
+         <signal s="10.006003799536844" t="-5.614117738123742" id="253698" dynamic="no" orientation="+" zOffset="2.0863523604587186" country="DEU" type="1000" subtype="31" height="0.2299998516377217" width="0.41692057026741436" hOffset="-0.5593643155503374"/>
+      </signals>
+   </road>
+   <road length="15.574389481068032" id="255979" junction="2104771">
+      <link>
+         <predecessor elementType="road" elementId="2233498" contactPoint="end"/>
+         <successor elementType="road" elementId="255966" contactPoint="start"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618258.1288554514" y="5809505.726293289" hdg="-0.19163364375718084" length="15.574389481068032">
+            <paramPoly3 aU="0.0" bU="15.445656549836572" cU="0.4441957206488293" dU="-0.988538204168184" aV="-0.0" bV="-4.440892098500626E-16" cV="-3.7359247812424314" dV="-0.13078971711445805" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="102.32019600667411" b="-2.494117656703602E-4" c="-0.0018517832614477316" d="7.96089149891147E-5"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.05149316715545063" b="-4.127808979060482E-4" c="-0.0" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="1.635391276742072" b="0.0421175009476422" c="-0.1158830142211899" d="0.06918747839087717"/>
+         <laneOffset s="0.8409803581462209" a="1.6300046842573355" b="-0.005995067230852081" c="-0.007226888496705816" d="0.00428793667668589"/>
+         <laneOffset s="2.6260389607442822" a="1.6206647960773441" b="0.00919377821832072" c="-0.032726639919345525" d="0.014789885854566094"/>
+         <laneOffset s="3.655396707991464" a="1.611583170272323" b="-0.011167977316575258" c="-0.008057387778357577" d="0.0019575387323047993"/>
+         <laneOffset s="6.585305888880188" a="1.5589293057495481" b="-0.007970108737121387" c="-0.02206504963752204" d="0.042917701539475925"/>
+         <laneOffset s="7.177473466266962" a="1.5553841821556578" b="0.011046355070826328" c="-0.013192804560471304" d="0.003148248276618521"/>
+         <laneOffset s="9.458388458664588" a="1.5493025362596842" b="-0.0" c="-8.592390501078782E-4" d="0.005117492581703351"/>
+         <laneOffset s="11.034974276138387" a="1.567221210297328" b="0.03545114113124186" c="-0.12693791195278867" d="0.20680327633803147"/>
+         <laneOffset s="11.336523161063383" a="1.572039399094026" b="0.015310108584043382" c="0.02132450478588219" d="-0.014470535174246601"/>
+         <laneOffset s="12.598432387163976" a="1.5962385302931585" b="-0.0" c="-0.016666452798951247" d="0.0047079851132762135"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="1"/>
+                     <successor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.6413473584754461" b="0.21339869736872297" c="0.10028289860141133" d="-0.06903689330998584"/>
+                  <width sOffset="0.8189293600969081" a="0.8454442416991883" b="0.23875011391133283" c="-0.08380528774831336" d="-0.054589860829002475"/>
+                  <width sOffset="0.8409803581462209" a="0.8506675846416674" b="0.2349745010492295" c="-0.021516765148236864" d="0.010309680894064987"/>
+                  <width sOffset="1.7943586614774203" a="1.0640638368935214" b="0.22205960756766377" c="-0.006533401585857659" d="-0.004120299154633098"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.18">
+                     <type name="solid" width="0.18">
+                        <line length="2.6260389607442822" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.18"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="5.122057096673841" b="0.15021282974886352" c="-0.11958826030642576" d="0.031098208834797164"/>
+                  <width sOffset="0.4010568303114765" a="5.165071717766681" b="0.06929557421886776" c="-0.039284833468892104" d="0.06656743901990768"/>
+                  <width sOffset="0.8409803581462209" a="5.193621095588049" b="0.07337985984105828" c="-0.017330890975899974" d="0.0016678973057142094"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.16">
+                     <type name="solid" width="0.16">
+                        <line length="0.4010568303114765" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.16"/>
+                     </type>
+                  </roadMark>
+                  <roadMark sOffset="0.4010568303114765" type="none" color="standard" width="0.0"/>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+            </right>
+         </laneSection>
+         <laneSection s="2.6260389607442822">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="1"/>
+                     <successor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="1.241857064438594" b="-1.5035497213161522" c="-0.9446903185858045" d="1.9072600886063085"/>
+                  <width sOffset="0.6964780716283716" a="0.38078113914047984" b="-0.04393098132545939" c="0.018485793685869258" d="-0.016905260341404535"/>
+                  <width sOffset="1.029357747247182" a="0.36758223056224093" b="-0.037243650128553324" c="0.02260653956467456" d="-0.004072913219145931"/>
+                  <width sOffset="3.3581069304133933" a="0.35201129527928" b="0.0017831567878127414" c="-0.011258431978226575" d="0.007254806798750548"/>
+                  <width sOffset="3.959266928135906" a="0.35059068009740924" b="-0.003887564454514972" c="0.03303936090795548" d="-0.033705356008422775"/>
+                  <roadMark sOffset="0.0" type="curb" weight="standard" color="standard" width="0.12">
+                     <type name="curb" width="0.12">
+                        <line length="4.55143450552268" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.0"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.18">
+                     <type name="solid" width="0.18">
+                        <line length="4.55143450552268" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.18"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="5.278871654528936" b="0.027450482911265596" c="-0.028230107773567444" d="0.014802088516033674"/>
+                  <width sOffset="1.029357747247182" a="5.293360442101893" b="0.016384596768275944" c="-0.0035231729202234233" d="0.0019697413937724145"/>
+                  <width sOffset="3.7705814045044765" a="5.352373597177661" b="0.04147271230548152" c="0.031314199502794265" d="-0.022484666254858073"/>
+                  <width sOffset="3.959266928135906" a="5.3611627092971625" b="0.050888272001570756" c="-0.012627287545472295" d="0.018475496552331893"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+                  <roadMark sOffset="3.7705814045044765" type="solid" weight="standard" color="standard" width="0.16">
+                     <type name="solid" width="0.16">
+                        <line length="0.7808531010182032" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.16"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+            </right>
+         </laneSection>
+         <laneSection s="7.177473466266962">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="1"/>
+                     <successor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.3528753049412461" b="-2.1549494740085405E-4" c="-0.00801713807471802" d="0.004005190570573108"/>
+                  <width sOffset="1.466914065774576" a="0.3479502424907883" b="0.0021191501343902283" c="-9.572511055252456E-4" d="-0.003135255594122172"/>
+                  <width sOffset="2.2809149923976264" a="0.3473499447294026" b="-0.005671494075359802" c="5.955405894531926E-4" d="-0.005104499899206898"/>
+                  <roadMark sOffset="0.0" type="curb" weight="standard" color="standard" width="0.12">
+                     <type name="curb" width="0.12">
+                        <line length="3.857500809871425" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.0"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.18">
+                     <type name="solid" width="0.18">
+                        <line length="3.857500809871425" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.18"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="5.390705632581452" b="0.05536931953960714" c="-0.01603462396299546" d="0.002390436755227535"/>
+                  <width sOffset="2.2809149923976264" a="5.461943460554896" b="0.019531357765669062" c="-0.008886569434289147" d="0.0043596810603123695"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.16">
+                     <type name="solid" width="0.16">
+                        <line length="3.857500809871425" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.16"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link>
+                     <successor id="-2"/>
+                  </link>
+                  <width sOffset="0.0" a="0.0" b="0.7991345927398759" c="0.061695548317735514" d="-0.30897237717689524"/>
+                  <width sOffset="0.9945161490454506" a="0.5518558773677635" b="0.0050701754267878235" c="-0.025784145445198508" d="0.012197196263790152"/>
+                  <width sOffset="2.308363050827907" a="0.5416715654375648" b="4.8150557147203996E-4" c="0.021499089234613612" d="-0.008511986019604434"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+         <laneSection s="11.034974276138387">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.31988513434652566" b="-2.140357965016075" c="3.6421798237433123" d="-0.20613473454739425"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.18">
+                     <type name="solid" width="0.18">
+                        <line length="0.3015488849249959" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.18"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="5.487732370436001" b="0.024020047547521413" c="-0.03211608600386104" d="-0.015557961367553386"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.16">
+                     <type name="solid" width="0.16">
+                        <line length="0.3015488849249959" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.16"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="-2"/>
+                     <successor id="-2"/>
+                  </link>
+                  <width sOffset="0.0" a="0.5623668930868315" b="0.005809705448594104" c="-3.2992291376654492E-6" d="-0.0071332272147683895"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+         <laneSection s="11.336523161063383">
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="5.4916286127993095" b="4.0677067501914896E-4" c="0.08966277708656673" d="-0.06776964368099925"/>
+                  <width sOffset="0.7264791279116807" a="5.513261702162551" b="0.02338229732413539" c="-0.01616274411093417" d="-0.013856083562106125"/>
+                  <width sOffset="1.2619092261005935" a="5.519020756674723" b="-0.005842752170061798" c="-0.021629088713298283" d="0.005322436725415518"/>
+                  <width sOffset="3.6627929927165894" a="5.4539763443865485" b="-0.017661154437360247" c="0.2830682137781864" d="-0.46187083355580644"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.16">
+                     <type name="solid" width="0.16">
+                        <line length="4.237866320004649" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.16"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="-2"/>
+                     <successor id="-2"/>
+                  </link>
+                  <width sOffset="0.0" a="0.5639229076110577" b="0.0038618056175057456" c="-0.007523324656370699" d="0.011613944974486326"/>
+                  <width sOffset="0.7264791279116807" a="0.5672107933053772" b="0.011319271175341108" c="-0.02408563252958251" d="-0.042299615144518694"/>
+                  <width sOffset="0.8712689242131866" a="0.5682163793795318" b="0.00168424532342346" c="-0.017898753772006303" d="0.005354793110916685"/>
+                  <width sOffset="2.5508689906067055" a="0.5459241740128227" b="-0.013122730868165304" c="-0.001141299363549743" d="-5.560538585180172E-4"/>
+                  <width sOffset="3.6627929927165894" a="0.5291571827670278" b="-0.01772328042541235" c="-0.2693578149516095" d="0.46663721642270245"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects>
+         <object type="pole" name="Guidepost" id="256778" s="10.730808066803483" t="-5.140717076177685" zOffset="-0.1820664335989619" validLength="0.0" orientation="none" radius="0.0" height="0.9506458239629865" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256798" s="10.038887613090472" t="3.31070442992988" zOffset="0.22305327737420555" validLength="0.0" orientation="none" radius="0.03508985033506051" height="3.036735763773322" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256850" s="3.697000242948763" t="3.065298352436225" zOffset="0.2834731534195214" validLength="0.0" orientation="none" radius="0.05" height="1.1476382706314325" hdg="0.0" pitch="0.0" roll="0.0"/>
+      </objects>
+      <signals>
+         <signal s="9.903335113299633" t="3.23225715935211" id="253494" dynamic="no" orientation="+" zOffset="1.8933507926246307" country="DEU" type="205" subtype="-1" height="0.7739999996299891" width="0.8997797834774874" hOffset="0.3718279053355806"/>
+         <signal s="9.909662377614474" t="3.230660894576864" id="253506" dynamic="no" orientation="+" zOffset="2.6853913998502605" country="DEU" type="1000" subtype="32" height="0.549999980447446" width="0.7466623654779533" hOffset="0.37704804442432555"/>
+         <signal s="8.667219069914804" t="3.7899260677981017" id="253710" dynamic="no" orientation="+" zOffset="1.4357082085665525" country="DEU" type="333.1" subtype="20" height="0.30999999557552105" width="1.443003543227883" hOffset="0.4572914731729263"/>
+         <signal s="8.704996687408865" t="3.78144125528352" id="253722" dynamic="no" orientation="+" zOffset="1.7788767037491908" country="DEU" type="333" subtype="-1" height="0.48999999903749053" width="1.4964763002022505" hOffset="0.4535720043537989"/>
+         <signal s="3.7213306506504775" t="3.07981908128344" id="253734" dynamic="no" orientation="+" zOffset="0.6356154245039249" country="DEU" type="626" subtype="30" height="0.7699999895771757" width="0.5159874979739266" hOffset="0.2957732611010495"/>
+      </signals>
+   </road>
+   <road length="30.632404288737746" id="428457" junction="-1">
+      <link>
+         <successor elementType="junction" elementId="2104780"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618208.1270994544" y="5809604.184099472" hdg="0.6108652381980156" length="30.632404288737746">
+            <paramPoly3 aU="0.0" bU="30.145223321860158" cU="1.0787869379600412" dU="-2.8225099428311307" aV="-0.0" bV="-0.0" cV="-10.747062367666077" dV="0.8459027970554932" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="108.60231979171554" b="-0.03722337025200945" c="1.4633563685305056E-4" d="6.3491899995204805E-6"/>
+         <elevation s="10.210801429579249" a="108.24425561038765" b="-0.032249053470993" c="-5.46748377813597E-6" d="-4.955638453992521E-6"/>
+         <elevation s="20.421602859158497" a="107.90912119867377" b="-0.03391073977450785" c="-1.1265050285995336E-4" d="-6.4122691880708E-6"/>
+         <elevation s="26.021221221301143" a="107.7145758924273" b="-0.03577552348642306" c="-0.0018132681147961514" d="1.6292697944123607E-4"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.05474131250798055" b="-1.051545285363979E-4" c="-9.203992298255183E-6" d="0.0"/>
+         <superelevation s="10.210801429579249" a="0.05270798797312301" b="-2.9311480397011474E-4" c="1.1052505337173989E-5" d="-1.9838303364463405E-6"/>
+         <superelevation s="20.421602859158497" a="0.04875543838916277" b="-6.879101544179383E-4" c="-2.9460489933683957E-5" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="3.7080061725638545" b="-0.0" c="-6.391086580389571E-4" d="2.8819925505362985E-6"/>
+         <laneOffset s="4.537511763748019" a="3.695116800160485" b="-0.005621913962010086" c="1.2616169136775188E-4" d="-1.1142784427218458E-4"/>
+         <laneOffset s="10.210801429579249" a="3.646935804655812" b="-0.01494973219189218" c="-0.001916136631157323" d="-5.412036961930681E-5"/>
+         <laneOffset s="11.548323583217286" a="3.6233828061174544" b="-0.020365941003182095" c="-0.003700521118992275" d="2.0446279429817962E-4"/>
+         <laneOffset s="18.843047677207064" a="3.3572702281873745" b="-0.04171426635907148" c="-2.591172624869544E-4" d="-1.8263200315750442E-5"/>
+         <laneOffset s="20.421602859158497" a="3.2907044406989527" b="-0.042668854879340246" c="-6.102040000117884E-4" d="-8.933478053851043E-5"/>
+         <laneOffset s="25.48729668509326" a="3.047285674416264" b="-0.05572839561689394" c="-0.0036522209351917286" d="6.569144283445309E-4"/>
+         <laneOffset s="28.880463901691957" a="2.841803771985094" b="-0.057823270425730953" c="4.930448628802042E-4" d="1.1076661884968186E-4"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="0.5193352030761358" b="-0.04145030960566421" c="0.005608990657135361" d="8.887250138417048E-4"/>
+                  <width sOffset="2.49499015400027" a="0.4646359336999799" b="0.003135318616045687" c="0.017280529720164736" d="-0.003318678417842485"/>
+                  <width sOffset="4.537511763748019" a="0.5148533652411631" b="0.03219150040098974" c="-0.003780926556678053" d="-0.003204368581019671"/>
+                  <width sOffset="5.8452144649457205" a="0.5433186864230355" b="0.005863603700908633" c="-0.006118233794397719" d="6.551813598748848E-4"/>
+                  <width sOffset="10.210801429579249" a="0.5068249872863206" b="-0.010095733580775569" c="0.002518749664330148" d="6.013312777527647E-4"/>
+                  <width sOffset="11.548323583217286" a="0.4992665303046544" b="-1.3068387914935697E-4" c="0.006498854289188277" d="3.427481138350574E-4"/>
+                  <width sOffset="13.766880060617131" a="0.5347066281665098" b="0.03376647796893308" c="0.012724097962654494" d="-1.954778499763545E-4"/>
+                  <width sOffset="17.888072941180315" a="0.8762912837984578" b="0.12868327910279415" c="4.863464909886063" d="-4.984131069710206"/>
+                  <width sOffset="18.547380548022232" a="1.6468030504803344" b="0.04211832417410144" c="-0.05189170486012889" d="0.003239298204833461"/>
+                  <width sOffset="18.843047677207064" a="1.6548034568128793" b="0.012282510492737639" c="-0.04798534769856939" d="0.003462024199464844"/>
+                  <width sOffset="20.421602859158497" a="1.5682383152375108" b="-0.11333213363939876" c="-0.03163558138175935" d="0.00345607087757766"/>
+                  <width sOffset="25.48729668509326" a="0.6315854960772289" b="-0.167783134957351" c="0.022570998334388078" d="0.0027098216686952514"/>
+                  <width sOffset="26.790535293079508" a="0.4572574008736163" b="-0.09514500773941098" c="0.003771448638397959" d="-2.4280058392077013E-4"/>
+                  <width sOffset="28.880463901691957" a="0.2726676873168348" b="-0.08256240525765984" c="0.004790936687862441" d="3.033472255740198E-4"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.16">
+                     <type name="solid" width="0.16">
+                        <line length="30.632404288737746" space="0.0" tOffset="0.0" sOffset="0.0" width="0.16"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="5.259920004854401" b="0.01962217687882931" c="-9.574439527047599E-4" d="3.5297021119050606E-6"/>
+                  <width sOffset="4.537511763748019" a="5.329572792245147" b="0.01115136972984437" c="-1.8335663403552682E-4" d="-1.1078013471081654E-4"/>
+                  <width sOffset="6.728023821808791" a="5.351955803084301" b="0.00875339661707103" c="-9.102149035471621E-4" d="-1.1508768312186852E-4"/>
+                  <width sOffset="10.210801429579249" a="5.366539366187986" b="-0.00177470652546078" c="-0.0022585003310066814" d="-5.778020847210088E-5"/>
+                  <width sOffset="10.534220479451584" a="5.365727198740988" b="-0.00325372199677482" c="4.155272146548405E-4" d="-7.745251337376752E-4"/>
+                  <width sOffset="11.548323583217286" a="5.362047160389366" b="-0.004800523925225994" c="-0.0035080407193957323" d="-5.159419698198698E-4"/>
+                  <width sOffset="14.322546753707666" a="5.310714423822187" b="-0.03617725414438332" c="-0.0023386767847487218" d="2.084192071543815E-4"/>
+                  <width sOffset="18.556699234227754" a="5.131427625464294" b="-0.044772234195498285" c="-0.0030225525276474235" d="6.497364465819675E-4"/>
+                  <width sOffset="18.843047677207064" a="5.118374585750621" b="-0.046343414356196114" c="-0.0034974946273185316" d="4.270104519903763E-4"/>
+                  <width sOffset="20.421602859158497" a="5.038183410423503" b="-0.054193270249428396" c="-0.0018967771885046783" d="3.445500501833873E-4"/>
+                  <width sOffset="23.02217294373649" a="4.890481971742111" b="-0.057068134729195745" c="7.955780094477671E-5" d="-3.269413861606882E-4"/>
+                  <width sOffset="25.48729668509326" a="4.7453877864504435" b="-0.06263620171551289" c="-0.004022684114760017" d="4.193078227223678E-4"/>
+                  <width sOffset="28.19709307943208" a="4.55446127523837" b="-0.0752005839125207" c="0.0013293504287717145" d="3.4440720145504424E-4"/>
+                  <width sOffset="28.880463901691957" a="4.5038021023752215" b="-0.07290119529489242" c="-5.063717829099879E-4" d="-2.0174060803973545E-4"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.1514706264231801">
+                     <type name="solid" width="0.151471">
+                        <line length="30.632404288737746" space="0.0" tOffset="0.0" sOffset="0.0" width="0.151471"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="40.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="0.2658828076531796" b="-0.005195267027315261" c="0.0013570059353799555" d="9.947731710464377E-9"/>
+                  <width sOffset="6.728023821808791" a="0.29235860088480514" b="0.01306602038298858" c="0.0013560693279892411" d="4.31749614329246E-6"/>
+                  <width sOffset="7.283533658084764" a="0.3000361148888344" b="0.014576637107390425" c="0.012152747584669776" d="-0.0032512344728484553"/>
+                  <width sOffset="10.534220479451584" a="0.36415829603452177" b="-0.009480850855717721" c="-0.02228357678344247" d="-0.002534489548357539"/>
+                  <width sOffset="10.603328083145925" a="0.3633958373841151" b="-0.012597093150724948" c="-0.002276923195773209" d="7.212652048069234E-4"/>
+                  <width sOffset="14.322546753707666" a="0.32215526500804437" b="3.970485376537282E-4" c="3.073274161050736E-4" d="-3.0959721673014595E-6"/>
+                  <width sOffset="18.556699234227754" a="0.32911119397675304" b="0.0028330766144215543" c="0.0035993128131887224" d="-4.4441321161718255E-4"/>
+                  <width sOffset="20.421602859158497" a="0.34403012223645635" b="0.011620991469920003" c="0.0011214867202898155" d="-3.787715008474205E-4"/>
+                  <width sOffset="22.06258766745972" a="0.3644462155717936" b="0.012241773732832683" c="-0.002145256565300575" d="-4.306084027644865E-4"/>
+                  <width sOffset="23.02217294373649" a="0.37383739956287054" b="0.006935142811960121" c="-0.002673128344711678" d="2.4088303357906849E-4"/>
+                  <width sOffset="28.19709307943208" a="0.3715227415963296" b="-0.0013789113412258271" c="-8.767950274051306E-4" d="3.1578365484625034E-4"/>
+                  <width sOffset="29.560854073671557" a="0.3688124823015648" b="-0.0020084640037632204" c="-0.006532107990402031" d="0.0010451339268721567"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects>
+         <object type="railing" name="" id="429538" s="0.0" t="-2.489140096924042" zOffset="0.0" validLength="10.049306523209403" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="0.0" length="10.049306523209403" distance="0.0" tStart="-2.489140096924042" tEnd="-2.6411929478282765" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.3386746727787437" zOffsetEnd="0.3984224598523622"/>
+         </object>
+         <object type="railing" name="" id="268864994" s="10.049306523209403" t="-2.6411929478282765" zOffset="0.0" validLength="8.207424231573835" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="10.049306523209403" length="8.207424231573835" distance="0.0" tStart="-2.6411929478282765" tEnd="-2.6741128258107576" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.3984224598523622" zOffsetEnd="0.3991138671445566"/>
+         </object>
+         <object type="railing" name="" id="537300450" s="18.256730754783238" t="-2.6741128258107576" zOffset="0.0" validLength="12.375673533954508" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="18.256730754783238" length="12.375673533954508" distance="0.0" tStart="-2.6741128258107576" tEnd="-2.560098620199778" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.3991138671445566" zOffsetEnd="0.4343362751042787"/>
+         </object>
+         <object type="pole" name="RoadSignPole" id="429372" s="16.222547454596906" t="5.136297636074278" zOffset="0.3731039016929145" validLength="0.0" orientation="none" radius="0.05" height="2.869139578193426" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="429420" s="15.43438644122326" t="-3.6023872354747666" zOffset="-0.016761637447430644" validLength="0.0" orientation="none" radius="0.05" height="2.913049035705626" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="429496" s="7.95768253710612" t="4.641910235681778" zOffset="0.22365258096000673" validLength="0.0" orientation="none" radius="0.0" height="0.9903418347239494" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="429499" s="13.480642228124571" t="-2.743908604201536" zOffset="0.6378855225221827" validLength="0.0" orientation="none" radius="0.0" height="0.46155801601707935" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="429502" s="30.313734926310172" t="-2.634217976192177" zOffset="0.68722501744233" validLength="0.0" orientation="none" radius="0.0" height="0.43816839158535004" hdg="0.0" pitch="0.0" roll="0.0"/>
+      </objects>
+      <signals>
+         <signal s="16.252265161600327" t="5.103827764131535" id="429409" dynamic="no" orientation="-" zOffset="2.444862787039952" country="DEU" type="267" subtype="-1" height="0.799999996618004" width="0.7998033408608151" hOffset="2.660064606576592"/>
+         <signal s="15.383086758458042" t="-3.6120606501072494" id="429457" dynamic="no" orientation="+" zOffset="2.165343911293121" country="DEU" type="267" subtype="-1" height="0.7999999975704005" width="0.7998033785687761" hOffset="-2.9735987649544797"/>
+      </signals>
+   </road>
+   <road length="17.852320659167106" id="428488" junction="-1">
+      <link>
+         <successor elementType="junction" elementId="2104780"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618220.7518438715" y="5809621.771996235" hdg="-0.3490658503988662" length="17.852320659167106">
+            <paramPoly3 aU="0.0" bU="17.655616037605405" cU="0.4011741522486872" dU="-0.2579717409028819" aV="-0.0" bV="-0.0" cV="1.291697684902311" dV="-0.08476713485260343" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="108.4789383173458" b="-0.04282123172325932" c="1.9374579371232662E-5" d="-1.2763011128327987E-6"/>
+         <elevation s="14.006751273735835" a="107.8794458169971" b="-0.043029670922844855" c="-0.0019150387692465295" d="2.1930893497973297E-4"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.008694719179292298" b="0.0014714378510730622" c="-0.0" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="-1.9313637831154207" b="0.06744861650441" c="-0.003057977741532199" d="3.029320451463424E-6"/>
+         <laneOffset s="4.561970011934946" a="-1.6870189272787979" b="0.03973694574376713" c="-0.004813219594447373" d="3.818999031415479E-4"/>
+         <laneOffset s="9.18617997541155" a="-1.5684269253453111" b="0.01972113070799576" c="4.952522766079224E-4" d="-4.020856397871331E-4"/>
+         <laneOffset s="13.660934173434097" a="-1.5062899014342512" b="-0.0" c="-5.861101637129586E-4" d="8.047656149079703E-6"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="2" type="shoulder" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="0.4612106869534025" b="-0.03210681630393012" c="2.0471770019554465E-4" d="2.7492071009049796E-4"/>
+                  <width sOffset="7.139162162583444" a="0.3424632560467904" b="0.012852385773257471" c="-8.419031923194754E-4" d="8.437819788688372E-6"/>
+                  <width sOffset="10.865282482035148" a="0.37910034765232936" b="0.006929771966567987" c="-0.011512516535873119" d="8.775004612469785E-4"/>
+                  <width sOffset="11.908497733302273" a="0.3747967938777559" b="-0.014225347544679454" c="-0.002755396468656927" d="5.43818561908534E-4"/>
+                  <width sOffset="16.453703164478604" a="0.30428019795626504" b="-0.0055689660477574385" c="2.1308696567089126E-4" d="-5.020170017797719E-4"/>
+                  <width sOffset="17.1387524565584" a="0.300403789127889" b="-0.005983794388276974" c="1.7130931390515027E-4" d="4.5310793528708157E-4"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+               <lane id="1" type="driving" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="5.039178887751651" b="0.0017703420641785872" c="0.0011710004745409067" d="-2.7951905757296223E-4"/>
+                  <width sOffset="4.561970011934946" a="5.045087462676719" b="-0.004997211464091919" c="-8.577713406123875E-4" d="-6.583896402630126E-4"/>
+                  <width sOffset="7.139162162583444" a="5.015241454114525" b="-0.022537407332703402" c="9.865703066062744E-4" d="-3.9190674996123745E-4"/>
+                  <width sOffset="9.18617997541155" a="4.9698793753904855" b="-0.023424952663404466" c="-0.001430665847390248" d="3.920787929674842E-4"/>
+                  <width sOffset="11.908497733302273" a="4.903416768747025" b="-0.02249730250545729" c="-0.004239431140342725" d="7.25760692305662E-4"/>
+                  <width sOffset="13.660934173434097" a="4.854878133420354" b="-0.030669463590554596" c="-0.004740223461792633" d="3.156273963694561E-4"/>
+                  <width sOffset="17.1387524565584" a="4.70415812580311" b="-0.05218798683236236" c="-0.002437080795820465" d="-6.394975407002846E-4"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.16">
+                     <type name="solid" width="0.16">
+                        <line length="17.852320659167106" space="0.0" tOffset="0.0" sOffset="0.0" width="0.16"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="40.0" unit="km/h"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.16">
+                     <type name="solid" width="0.16">
+                        <line length="17.852320659167106" space="0.0" tOffset="0.0" sOffset="0.0" width="0.16"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="shoulder" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="0.2986827596866597" b="0.020138402810727415" c="0.003656601671347541" d="-2.6694619365241224E-6"/>
+                  <width sOffset="3.5388906060346095" a="0.415626406401546" b="0.04591873442468452" c="3.819138735024536" d="-2.1959066516643713"/>
+                  <width sOffset="4.561970011934946" a="2.1085815396940415" b="0.9651728218231417" c="-2.9224185836277057" d="-2.1955277810814713"/>
+                  <width sOffset="4.699279725424025" a="2.1803261363318054" b="0.038436743110355776" c="-0.6118609932727003" d="0.3373034277865971"/>
+                  <width sOffset="5.557729246400406" a="1.9758055716882343" b="-0.2663541184067498" c="-0.08285639124212353" d="0.03343778129139934"/>
+                  <width sOffset="7.088483133304514" a="1.4938703614031323" b="-0.2849646283727243" c="0.03527570193500765" d="-0.0019778239505898057"/>
+                  <width sOffset="9.18617997541155" a="1.033069334018489" b="-0.16307841757437658" c="0.022839592628401698" d="-0.002761809493518541"/>
+                  <width sOffset="13.48902766709357" a="0.5342116034904476" b="-0.11992839190270871" c="-0.002157608936449143" d="6.256720165278194E-4"/>
+                  <width sOffset="13.660934173434097" a="0.5135345498090815" b="-0.12061473664036516" c="0.0024814031084665856" d="0.0010358053124274356"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects>
+         <object type="railing" name="" id="429544" s="0.0" t="4.363163668250403" zOffset="0.0" validLength="3.169662160429472" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="0.0" length="3.169662160429472" distance="0.0" tStart="4.363163668250403" tEnd="4.598190797594475" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.5501295004316018" zOffsetEnd="0.5508017921350257"/>
+         </object>
+         <object type="railing" name="" id="268865000" s="3.169662160429472" t="4.598190797594475" zOffset="0.0" validLength="1.9017999596171693" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="3.169662160429472" length="1.9017999596171693" distance="0.0" tStart="4.598190797594475" tEnd="4.653349907419059" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.5508017921350257" zOffsetEnd="0.5518507493102118"/>
+         </object>
+         <object type="railing" name="" id="537300456" s="5.071462120046641" t="4.653349907419059" zOffset="0.0" validLength="6.3904301589284245" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="5.071462120046641" length="6.3904301589284245" distance="0.0" tStart="4.653349907419059" tEnd="4.55474421256159" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.5518507493102118" zOffsetEnd="0.5673205054235309"/>
+         </object>
+         <object type="railing" name="" id="805735912" s="11.461892278975066" t="4.55474421256159" zOffset="0.0" validLength="6.39042838019204" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="11.461892278975066" length="6.39042838019204" distance="0.0" tStart="4.55474421256159" tEnd="4.2589271279874055" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.5673205054235309" zOffsetEnd="0.6008755917640582"/>
+         </object>
+         <object type="pole" name="RoadSignPole" id="429192" s="1.8232103241414765" t="5.113339134972119" zOffset="0.1549109588817288" validLength="0.0" orientation="none" radius="0.05" height="2.9380403393879533" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="429224" s="2.9546151506893614" t="-3.0410482047796896" zOffset="0.1347419312130711" validLength="0.0" orientation="none" radius="0.05" height="1.774208778515458" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="429489" s="6.316072226688058" t="4.530367446422225" zOffset="0.861086395279159" validLength="0.0" orientation="none" radius="0.0" height="0.47308522555977106" hdg="0.0" pitch="0.0" roll="0.0"/>
+      </objects>
+      <signals>
+         <signal s="1.8642114226590942" t="5.131304760102968" id="429199" dynamic="no" orientation="-" zOffset="2.108690147949787" country="DEU" type="101" subtype="-1" height="1.117999996907411" width="1.2996804050113318" hOffset="-3.0332117373725014"/>
+         <signal s="1.8635109718714669" t="5.13455439968166" id="429213" dynamic="no" orientation="-" zOffset="1.7144506657827066" country="DEU" type="1000" subtype="21" height="0.35000000202299303" width="0.7998034243006514" hOffset="-3.033206124621826"/>
+         <signal s="2.9989190882787335" t="-3.04661604966667" id="429261" dynamic="no" orientation="-" zOffset="1.10250320682961" country="DEU" type="222" subtype="-1" height="0.7999999956957865" width="0.7998034751685175" hOffset="-3.0454796776207735"/>
+         <signal s="2.9984362647465472" t="-3.0481017149232343" id="429361" dynamic="no" orientation="-" zOffset="0.3209292310655769" country="DEU" type="605" subtype="10" height="0.7999999984957971" width="0.49987723181429183" hOffset="-3.0454758833054094"/>
+      </signals>
+   </road>
+   <road length="4.9999999931172585" id="428539" junction="2104816">
+      <link>
+         <predecessor elementType="road" elementId="2234012" contactPoint="start"/>
+         <successor elementType="road" elementId="255972" contactPoint="start"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618254.1224685742" y="5809350.191121091" hdg="0.6665033065466341" length="4.9999999931172585">
+            <paramPoly3 aU="0.0" bU="4.257926949815653" cU="0.05543093708991338" dU="0.67673699791198" aV="-0.0" bV="-0.0" cV="-0.005531686093935874" dV="-0.2474190607139782" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="106.82387628914633" b="-0.023973548177540424" c="1.1594450843492098E-5" d="-8.019479817954546E-8"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="-0.03210270167787861" b="-4.3276810802932435E-4" c="-0.0" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="2.0068400163580686" b="-0.04163975603583651" c="-0.002358666423832991" d="0.005112748161774351"/>
+         <laneOffset s="1.8085922312309473" a="1.9540620529430661" b="-0.0" c="0.026718388367301768" d="-0.0023286256468453633"/>
+         <laneOffset s="3.2827550965332444" a="2.0046653302746087" b="0.06359311044312753" c="0.007600099853120104" d="0.013979697246165178"/>
+         <laneOffset s="4.163047331740097" a="2.076071545076785" b="0.10947293514137438" c="0.11673548944041952" d="-0.10090307175708528"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.28990232632986945" b="-0.06784459395560044" c="2.5182119406628924E-4" d="6.597066671206603E-5"/>
+                  <width sOffset="1.8085922312309473" a="0.16841310628045725" b="-0.0662863389331192" c="-7.266616742771029E-4" d="0.007507344475330958"/>
+                  <width sOffset="2.793702048029054" a="0.10958555655770019" b="-0.04586170948215119" c="0.0015417421040499132" d="0.002225819861802671"/>
+                  <width sOffset="3.2827550965332444" a="0.08778584083708374" b="-0.04275665486164781" c="0.013627342217433187" d="-0.014082503031207342"/>
+                  <width sOffset="4.163047331740097" a="0.05110111795511907" b="-0.05150277175954205" c="-0.09577954477278512" d="0.100800265972042"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.14">
+                     <type name="solid" width="0.14">
+                        <line length="4.9999999931172585" space="0.0" tOffset="0.0" sOffset="0.0" width="0.14"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="1"/>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="4.006387570982423" b="0.017647125062107208" c="-0.024103960590608854" d="-0.0021763476283402083"/>
+                  <width sOffset="0.9291397830273072" a="4.000229542683273" b="-0.03278129989506" c="0.005839675959921989" d="0.005109206995762533"/>
+                  <width sOffset="1.8085922312309473" a="3.979391853677412" b="-0.01065492206061876" c="0.02065601473658813" d="-0.0023321668128576016"/>
+                  <width sOffset="3.2827550965332444" a="4.001102211584264" b="0.03504124969840745" c="0.001522065456101433" d="0.01397615608015294"/>
+                  <width sOffset="4.163047331740097" a="4.042662072966052" b="0.07021194912481014" c="0.11064810326056716" d="-0.10090661292309755"/>
+                  <roadMark sOffset="0.0" type="solid" weight="bold" color="standard" width="0.3">
+                     <type name="solid" width="0.3">
+                        <line length="4.9999999931172585" space="0.0" tOffset="0.0" sOffset="0.0" width="0.3"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="40.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="2"/>
+                     <successor id="-2"/>
+                  </link>
+                  <width sOffset="0.0" a="2.0252304962868344" b="-0.01583893476662493" c="0.024757384642961115" d="0.007284345014108931"/>
+                  <width sOffset="0.9291397830273072" a="2.037729950510348" b="0.049032948469049105" c="0.00905187884058051" d="-1.2096099933629303E-6"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects>
+         <object type="railing" name="" id="429177" s="0.0" t="-4.957107036029125" zOffset="0.0" validLength="4.999999993117331" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="0.0" length="4.999999993117331" distance="0.0" tStart="-4.957107036029125" tEnd="-5.117913854187516" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.5960556620998643" zOffsetEnd="0.6441783226826414"/>
+         </object>
+      </objects>
+      <signals/>
+   </road>
+   <road length="4.999999999999762" id="428578" junction="2104816">
+      <link>
+         <predecessor elementType="road" elementId="255972" contactPoint="start"/>
+         <successor elementType="road" elementId="2233980" contactPoint="start"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618255.913350641" y="5809356.814371541" hdg="3.690910601045481" length="4.999999999999762">
+            <paramPoly3 aU="0.0" bU="4.999728990568018" cU="0.003163111755595603" dU="-0.005378837460129871" aV="0.0" bV="-8.881784197001252E-16" cV="-0.12948180476543372" dV="-0.006250735616988636" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="106.5540872770034" b="0.024334970385864064" c="0.0026151235510466905" d="-3.296165365050934E-4"/>
+         <elevation s="3.9999180824309897" a="106.67217126582668" b="0.029434584619490663" c="-4.648847504964156E-5" d="6.619108346504236E-7"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.0342665422150466" b="1.2042921042290257E-4" c="-0.0" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="2.1938645787652127" b="0.09283238750620765" c="-0.19690143559171397" d="0.1107254066566601"/>
+         <laneOffset s="0.9155533894123428" a="2.198783714533007" b="0.010727567253655937" c="0.030662230784818893" d="-0.007996040257491639"/>
+         <laneOffset s="3.0576980127594102" a="2.2838662753367016" b="0.032017137992973205" c="-0.003238793253006114" d="-1.7866954438122264E-4"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <successor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.0" b="0.0" c="0.19418469287337198" d="-0.11066424991842952"/>
+                  <width sOffset="0.9155533894123428" a="0.07784352909360681" b="0.07728396595212227" c="-0.03321099672624364" d="0.008057196995722226"/>
+                  <width sOffset="3.0576980127594102" a="0.17019982645411158" b="0.045916649807561036" c="0.0010830470455277757" d="2.3982628261179579E-4"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.14">
+                     <type name="solid" width="0.14">
+                        <line length="4.999999999999762" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.14"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="1"/>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="4.311825194100576" b="0.01564868425386981" c="-0.18842501521753036" d="0.10994985586761796"/>
+                  <width sOffset="0.9155533894123428" a="4.252588588752224" b="-0.052885193638886344" c="0.03700847669829579" d="-0.008771591046533814"/>
+                  <width sOffset="3.0576980127594102" a="4.2229014262363265" b="-0.015082973971287168" c="-0.001876573198163736" d="-9.542203334726739E-4"/>
+                  <width sOffset="3.252187280024824" a="4.219889946306431" b="-0.01592120389377815" c="-0.0012190380261870599" d="5.737581327030617E-4"/>
+                  <roadMark sOffset="0.0" type="solid" weight="bold" color="standard" width="0.3">
+                     <type name="solid" width="0.3">
+                        <line length="4.999999999999762" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.3"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="2"/>
+                     <successor id="-2"/>
+                  </link>
+                  <width sOffset="0.0" a="2.3619299086998535" b="0.06044779075657338" c="-0.028074611350538098" d="0.00256109669100109"/>
+                  <width sOffset="3.252187280024824" a="2.3496753574654194" b="-0.04089597314584127" c="-0.00430140511872682" d="0.0010331182248745911"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects>
+         <object type="pole" name="Guidepost" id="428782" s="3.321706419661129" t="-5.169165528904605" zOffset="-0.16850501281476227" validLength="0.0" orientation="none" radius="0.0" height="1.0602403124794364" hdg="0.0" pitch="0.0" roll="0.0"/>
+      </objects>
+      <signals/>
+   </road>
+   <road length="6.744822053859168" id="2233498" junction="-1">
+      <link>
+         <predecessor elementType="junction" elementId="2104769"/>
+         <successor elementType="junction" elementId="2104771"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618251.572934302" y="5809506.964596245" hdg="0.036946848957290834" length="6.744822053859168">
+            <paramPoly3 aU="0.0" bU="6.7647787804111905" cU="-0.010830768423307983" dU="-0.055653612438195624" aV="-0.0" bV="6.38378239159465E-16" cV="-0.4255041420871829" dV="-0.2263038942780949" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="102.37860396218247" b="-0.002143941086472195" c="-1.5350176932943157E-5" d="1.8081052621009878E-6"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.04692960016743353" b="6.766030225224369E-4" c="-0.0" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="0.7418047943458234" b="0.009167398256013004" c="-0.0036376960407663666" d="4.7644308519579357E-4"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="0.10669447570713275" b="0.028788805689052677" c="4.2929813452255655E-4" d="0.0015954873006325697"/>
+                  <width sOffset="2.2345432355874717" a="0.1909694956586192" b="0.05460705863067176" c="-0.005754307333514484" d="0.01070925658163239"/>
+                  <width sOffset="3.3334390297606014" a="0.25823936052177965" b="0.08075688446485794" c="0.027493330917229934" d="-0.00865721576012785"/>
+                  <width sOffset="4.577266706319264" a="0.3845627590341777" b="0.10896989148200442" c="0.005454409446929286" d="-4.949129236936496E-4"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.2">
+                     <type name="solid" width="0.2">
+                        <line length="6.744822053859168" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.2"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="4.411785969057038" b="0.12786524868765695" c="0.017095942105131313" d="-0.006947931553307024"/>
+                  <width sOffset="1.8565334545876082" a="4.6636375181923535" b="0.11950097528937206" c="-0.008119952869164122" d="5.910454915561147E-4"/>
+                  <width sOffset="5.399830443963692" a="5.011412540873877" b="0.08421981226500212" c="-0.06556765119726404" d="0.04766840023902509"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.12485439399458217">
+                     <type name="solid" width="0.124854">
+                        <line length="6.744822053859168" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.124854"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="1.4842349571608793E-11" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="0.5045100314894344" b="-0.006745796388297531" c="-0.005017673002056019" d="0.002927847543969201"/>
+                  <width sOffset="1.8565334545876082" a="0.4934268723867361" b="0.004897629063509046" c="-0.0021920393885289397" d="-0.004611129500892973"/>
+                  <width sOffset="2.6388458437540194" a="0.4937090523052916" b="-0.00699829917023119" c="-9.799777131696275E-4" d="-1.335374297595824E-4"/>
+                  <width sOffset="5.399830443963692" a="0.46410587709716733" b="-0.015463587807681173" c="0.061644385386023216" d="-0.04721089217722869"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects/>
+      <signals/>
+   </road>
+   <road length="62.630194772113065" id="2233547" junction="-1">
+      <link>
+         <predecessor elementType="junction" elementId="2104769"/>
+         <successor elementType="junction" elementId="2104772"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618251.2533340767" y="5809511.198669434" hdg="0.0849750517461978" length="62.630194772113065">
+            <paramPoly3 aU="0.0" bU="62.62482691259206" cU="-0.02342546933537143" dU="0.015499690130671373" aV="-0.0" bV="-2.6645352591003757E-15" cV="3.45799330826324" dV="-2.2722316174326784" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="102.51068794656396" b="0.0014591354411618348" c="8.459053419400006E-5" d="-1.645824012747737E-7"/>
+         <elevation s="6.939210189211874" a="102.52483145768655" b="0.0026093432043491384" c="1.7938923310571796E-4" d="-3.4553589106897917E-6"/>
+         <elevation s="10.438365795352178" a="102.5360103721814" b="0.0037378417097572248" c="2.952858067280802E-4" d="-1.8033224078141267E-5"/>
+         <elevation s="20.876731590704356" a="102.58669127117128" b="0.004007772058693871" c="-9.724137537710182E-5" d="1.2273937056436229E-6"/>
+         <elevation s="31.315097386056536" a="102.61932647937452" b="0.0023788985069603235" c="-1.6710087049537554E-4" d="2.236639719214123E-6"/>
+         <elevation s="34.797367082590654" a="102.62567859253556" b="0.001296483748475158" c="-4.7475191589842246E-5" d="5.691998626901264E-6"/>
+         <elevation s="41.75346318140871" a="102.63431571303988" b="0.001462260631791163" c="2.240241739682709E-5" d="-2.802965272106659E-6"/>
+         <elevation s="52.19182897676089" a="102.64883230262554" b="0.0010137209672313418" c="-3.611433627924765E-5" d="-3.1184328984516064E-15"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.033634030227394016" b="-3.2858275113452535E-4" c="2.4445475044222608E-6" d="7.626104013766178E-22"/>
+         <superelevation s="10.438365795352178" a="0.03047051990309329" b="-2.775485890239737E-4" c="1.3383089401512601E-5" d="-1.0479170888953533E-6"/>
+         <superelevation s="20.876731590704356" a="0.027839722830961804" b="-3.4069492850303596E-4" c="-5.812070605689872E-5" d="4.75426064167322E-6"/>
+         <superelevation s="31.315097386056536" a="0.023357923326421195" b="0.0" c="6.629185423373089E-5" d="-2.7496906749562214E-6"/>
+         <superelevation s="41.75346318140871" a="0.027453664123454385" b="4.851426452358824E-4" c="3.6039154956394346E-5" d="-2.6011595525112606E-6"/>
+         <superelevation s="52.19182897676089" a="0.033486116114215016" b="3.8725942957357657E-4" c="-1.8264554845980074E-5" d="7.626104013766182E-22"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="3.2266007372357706" b="0.005990262935538758" c="-8.365669905451759E-5" d="-1.3304654962263352E-6"/>
+         <laneOffset s="10.438365795352178" a="3.2785008857077838" b="0.0038088839958267066" c="-1.4103164449885057E-4" d="-1.5230406397260248E-6"/>
+         <laneOffset s="21.837225079363236" a="3.3013372392708815" b="-0.0" c="-0.0023447759231697597" d="1.4914971386656528E-4"/>
+         <laneOffset s="29.444246992748184" a="3.2313073926716758" b="-0.009781081551196209" c="-3.3875470926400075E-4" d="4.8120694476230185E-5"/>
+         <laneOffset s="31.315097386056536" a="3.212137883897606" b="-0.010543321299963956" c="-7.466143884621801E-5" d="3.932295308603547E-5"/>
+         <laneOffset s="35.20430272115061" a="3.172316702515511" b="-0.009339681324502887" c="-1.4646603270060843E-4" d="2.0176950018763626E-5"/>
+         <laneOffset s="41.75346318140871" a="3.1105352551575627" b="-0.008661881304076737" c="2.8917178700227293E-4" d="2.0352226409955323E-5"/>
+         <laneOffset s="49.83518473329581" a="3.070162323498073" b="-0.0" c="4.5102489138821775E-4" d="-1.7471777987006505E-5"/>
+         <laneOffset s="52.19182897676089" a="3.0724385376911085" b="0.0018347076090465824" c="3.95309458348926E-4" d="-3.8402591987542914E-7"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="0.6317429553947385" b="0.014933537609962102" c="-7.075932817887055E-4" d="-6.414231000622719E-5"/>
+                  <width sOffset="7.0510785192251255" a="0.6793746348414871" b="-0.004612079941882544" c="-3.8192126196074175E-4" d="1.3471102081804337E-5"/>
+                  <width sOffset="10.438365795352178" a="0.6598936906633694" b="-0.006735743242381249" c="-2.693736260383741E-4" d="8.24849791344194E-6"/>
+                  <width sOffset="19.584826680979436" a="0.5820618101659814" b="-0.009593221662646164" c="-7.062704486452331E-4" d="1.0415149954297572E-4"/>
+                  <width sOffset="20.876731590704356" a="0.5687140745094466" b="-0.010896597908235715" c="-4.0529983342103165E-4" d="6.49984500469734E-5"/>
+                  <width sOffset="21.837225079363236" a="0.5579316499220157" b="-0.011495281090218619" c="0.0019336534315717584" d="-8.567430445920217E-5"/>
+                  <width sOffset="27.712862857767753" a="0.5397666564233545" b="0.0023543805134072712" c="-2.794288190148368E-6" d="-1.543661386329062E-4"/>
+                  <width sOffset="29.444246992748184" a="0.5430334329427153" b="9.564785768828559E-4" c="5.931386729563739E-4" d="-5.333711924254641E-5"/>
+                  <width sOffset="31.315097386056536" a="0.5465496364803846" b="0.0026157732720244256" c="2.9130828774414047E-4" d="-4.9043571886812996E-5"/>
+                  <width sOffset="35.20430272115061" a="0.5582440956459136" b="0.002656201604984516" c="2.4969643409728415E-4" d="-2.9897568819540252E-5"/>
+                  <width sOffset="40.5606897870732" a="0.5750411080214684" b="0.002757780211855791" c="1.2988655452095938E-5" d="-9.051044092458711E-5"/>
+                  <width sOffset="41.75346318140871" a="0.5781954005698835" b="0.002402455371467537" c="-2.0306985750177662E-4" d="-2.0833396457137222E-5"/>
+                  <width sOffset="49.83518473329581" a="0.5733510891458455" b="-0.004962004037640099" c="-3.7658900890864214E-4" d="1.6990607939658713E-5"/>
+                  <width sOffset="51.684152997117984" a="0.5629964607421751" b="-0.006180349749370005" c="-9.344578981848571E-4" d="1.3834215950053286E-4"/>
+                  <width sOffset="52.19182897676089" a="0.55963610470842" b="-0.007022186599105001" c="-7.91567786141076E-4" d="1.2125440743891702E-4"/>
+                  <width sOffset="57.22163616226273" a="0.5197195071271441" b="-0.0057822219477169515" c="9.782586665821563E-4" d="-1.5267883388840957E-5"/>
+                  <roadMark sOffset="0.0" type="curb" weight="standard" color="standard" width="0.12">
+                     <type name="curb" width="0.12">
+                        <line length="62.630194772113065" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.0"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.12721969952060494">
+                     <type name="solid" width="0.12722">
+                        <line length="62.630194772113065" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.12722"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="3.063345647307552" b="-0.013791065311489072" c="1.6161636330890526E-4" d="2.6211907385456147E-4"/>
+                  <width sOffset="2.245539136955954" a="3.0361601890589345" b="-0.009100069734811107" c="7.267235421077197E-4" d="1.4909496989175703E-4"/>
+                  <width sOffset="6.303834329169389" a="3.0211637626858145" b="0.004165122633745376" c="-7.71957944106918E-5" d="-1.5823043492775317E-6"/>
+                  <width sOffset="10.438365795352178" a="3.0369531485831294" b="0.0034456403564787456" c="-1.1013166586549979E-4" d="-1.615999992236363E-6"/>
+                  <width sOffset="16.480861331319733" a="3.0533957896386275" b="0.001937691183446244" c="0.0017964939596444357" d="-9.71024135711173E-5"/>
+                  <width sOffset="20.876731590704356" a="3.0883801913866367" b="0.012102873377214595" c="5.183709611714597E-4" d="-9.704346961780359E-5"/>
+                  <width sOffset="21.837225079363236" a="3.100397154094057" b="0.012830075541798864" c="-0.0019129194017455861" d="5.362928488869282E-5"/>
+                  <width sOffset="26.66800938547616" a="3.123781498308636" b="-0.0018971707858691095" c="3.8493911842479855E-4" d="1.2221485803735194E-4"/>
+                  <width sOffset="29.444246992748184" a="3.1240965516081243" b="0.0030661054424460862" c="5.097362208759482E-6" d="2.118583864701443E-5"/>
+                  <width sOffset="31.315097386056536" a="3.1299893449518077" b="0.003307634712923427" c="1.1869237029673255E-4" d="1.2469509695532883E-5"/>
+                  <width sOffset="35.20430272115061" a="3.145382300442082" b="0.004796711061156837" c="-2.664278894576245E-4" d="-6.676493371739102E-6"/>
+                  <width sOffset="41.75346318140871" a="3.1634937890678185" b="4.478585617386458E-4" c="-3.577045765915528E-4" d="-6.601965941311295E-6"/>
+                  <width sOffset="47.04482240343212" a="3.154870302860673" b="-0.003892163340443" c="5.829435046193101E-4" d="2.0246523412314944E-5"/>
+                  <width sOffset="49.83518473329581" a="3.1489885041195396" b="-1.6599044902884126E-4" c="4.208389373079942E-4" d="-1.757748098462217E-5"/>
+                  <width sOffset="52.19182897676089" a="3.150704508498266" b="0.0015246808991103812" c="3.6546790385787967E-4" d="-4.096046889587098E-7"/>
+                  <width sOffset="59.46108033788545" a="3.180942519657336" b="0.0067731040024572" c="-0.0025879545849489477" d="1.4609087018909302E-4"/>
+                  <roadMark sOffset="0.0" type="solid broken" weight="bold" color="standard" width="0.32">
+                     <type name="solid broken" width="0.12">
+                        <line length="4.0" space="8.0" tOffset="-0.0" sOffset="0.0" width="0.12"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="3.2240876635114546E-13" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="driving" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="3.4406639479639654" b="0.004795412127486824" c="-0.005629921114689228" d="0.008810416377815027"/>
+                  <width sOffset="0.3294496203546924" a="3.4419477780076684" b="0.003954631250685804" c="-7.544711463134865E-5" d="-2.5636462147151046E-4"/>
+                  <width sOffset="2.245539136955954" a="3.447444753335841" b="8.418539277601205E-4" c="-3.484110676679546E-4" d="-1.4334051750870195E-4"/>
+                  <width sOffset="6.303834329169389" a="3.435542240502093" b="-0.009068407701702356" c="5.255680681703209E-4" d="7.336756733040797E-6"/>
+                  <width sOffset="7.360719935263507" a="3.4265536956394556" b="-0.00793289141921951" c="4.7114914526095834E-4" d="4.573251907484126E-6"/>
+                  <width sOffset="10.438365795352178" a="3.4067350603237454" b="-0.0049028787767691736" c="5.109720158959613E-4" d="4.414372410908448E-6"/>
+                  <width sOffset="10.941041400586245" a="3.4044001772909738" b="-0.1383352260654511" c="-0.25009342488562825" d="0.5596071617505048"/>
+                  <width sOffset="11.413697265587267" a="3.342234060651079" b="3.03233484908209E-4" c="0.00149396800173858" d="-7.43267278620274E-5"/>
+                  <width sOffset="16.480861331319733" a="3.3724596442447727" b="0.009718322419486957" c="-0.0015718288156267484" d="2.115968571684827E-5"/>
+                  <width sOffset="20.572363953750106" a="3.387358450764489" b="-0.0020812966138109255" c="-5.766599072761769E-4" d="9.141945949827958E-5"/>
+                  <width sOffset="20.876731590704356" a="3.3866741275655676" b="-0.0024069226379148517" c="-4.956103700210427E-4" d="9.136051554386477E-5"/>
+                  <width sOffset="26.66800938547616" a="3.3738579781979903" b="0.0010450358727253327" c="-4.2897199186246087E-4" d="2.2774942395212586E-5"/>
+                  <width sOffset="31.315097386056536" a="3.371736117259578" b="-0.0014664015092853769" c="-1.0836510450650388E-4" d="1.9204710102141162E-5"/>
+                  <width sOffset="34.45099757579014" a="3.366664215656562" b="-0.0015794759452559017" c="9.90429635451166E-4" d="-6.962486481291106E-5"/>
+                  <width sOffset="41.75346318140871" a="3.3808330917332663" b="0.001747233307991123" c="-4.0575461343122295E-4" d="-1.2359798230097128E-4"/>
+                  <width sOffset="43.1026094438547" a="3.382148291424543" b="-2.2528856922790497E-5" c="-1.5237611334804804E-5" d="6.417681837101377E-5"/>
+                  <width sOffset="47.04482240343212" a="3.385754532948158" b="0.002849455410637071" c="-3.0168975738676035E-4" d="3.732832901736666E-5"/>
+                  <width sOffset="52.19182897676089" a="3.3975182546186944" b="0.0027105271503035954" c="3.1822960754424425E-4" d="3.5253433364967246E-5"/>
+                  <width sOffset="56.73099080020529" a="3.419675647545507" b="0.007778602693449141" c="0.2656142341061289" d="-0.22321157692281796"/>
+                  <width sOffset="57.31299507009443" a="3.4701697522170734" b="-0.004030605228905006" c="-8.5170216176614E-4" d="-2.531413002294059E-6"/>
+                  <width sOffset="59.46108033788545" a="3.4575565935239503" b="-0.007724704833011226" c="0.0020764746957819707" d="-1.4903188788044144E-4"/>
+                  <width sOffset="60.92986241342861" a="3.4502180800259574" b="-0.0025894559742949148" c="0.0014109205831167454" d="-1.3150451007240655E-4"/>
+                  <roadMark sOffset="0.0" type="solid" weight="bold" color="standard" width="0.25">
+                     <type name="solid" width="0.25">
+                        <line length="10.941041400586245" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.25"/>
+                     </type>
+                  </roadMark>
+                  <roadMark sOffset="10.941041400586245" type="solid" weight="standard" color="standard" width="0.11514119786997853">
+                     <type name="solid" width="0.115141">
+                        <line length="46.37195366950819" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.115141"/>
+                     </type>
+                  </roadMark>
+                  <roadMark sOffset="57.31299507009443" type="solid" weight="bold" color="standard" width="0.25">
+                     <type name="solid" width="0.25">
+                        <line length="5.317199702018634" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.25"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="3.2240876635114546E-13" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-3" type="shoulder" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="0.1153187968534799" b="0.036891357467480936" c="0.007074603447522219" d="-0.00741627525018671"/>
+                  <width sOffset="0.3294496203546924" a="0.12797530977703708" b="0.03913798634211767" c="0.0028980272431185193" d="0.00165050574909963"/>
+                  <width sOffset="1.5858474964443428" a="0.18499622849472486" b="0.05423628325129817" c="0.007018620328842333" d="-2.472653795078295E-4"/>
+                  <width sOffset="3.9466073803632433" a="0.34889789550733585" b="0.08324066911074737" c="-0.0027740765793784995" d="0.004198233679598704"/>
+                  <width sOffset="5.985825110173202" a="0.5427086059847581" b="0.12430069433861382" c="0.03869791153153086" d="-0.022785152495138877"/>
+                  <width sOffset="7.057700891192869" a="0.6923443769368038" b="0.12872460832329596" c="-0.03114021380400875" d="0.03465706630066169"/>
+                  <width sOffset="7.360719935263507" a="0.7294553498870413" b="0.11939914442403264" c="4.4272075881788306E-4" d="0.034659829805479034"/>
+                  <width sOffset="7.66039703937947" a="0.7662090958112677" b="0.12900251113297506" c="0.039269574542684156" d="-0.02711795102266165"/>
+                  <width sOffset="8.717148856412274" a="0.9143841173383356" b="0.12114906665414873" c="0.0601546213576792" d="-0.07787703661229245"/>
+                  <width sOffset="9.722295086604086" a="1.017846444397767" b="0.006035512234707692" c="-2.3129103626754337" d="1.4823287125353926"/>
+                  <width sOffset="10.762267311034392" a="0.18989759548413954" b="0.004913735988706977" c="0.006094231948122614" d="-0.0028965342052474125"/>
+                  <width sOffset="10.941041400586245" a="0.190954267095798" b="0.14076439623452716" c="0.25515181004536897" d="-0.5624992815835208"/>
+                  <width sOffset="11.413697265587267" a="0.25509321892263115" b="0.004969357852307862" c="-5.365150460789289E-4" d="-0.0028177931051579946"/>
+                  <width sOffset="11.916026131549959" a="0.2570969208796239" b="0.0022972663988572424" c="-0.0018001602975961652" d="1.2863648493334777E-4"/>
+                  <width sOffset="17.96339206668929" a="0.23360505855854985" b="-0.005362236004681513" c="5.032571910788211E-4" d="6.509094073903473E-5"/>
+                  <width sOffset="20.572363953750106" a="0.22419659613610232" b="-0.0014070980594086445" c="2.772743150166454E-4" d="-5.168833054874301E-6"/>
+                  <width sOffset="20.876731590704356" a="0.2237938618795572" b="-0.0012397479201008785" c="2.3273042790531695E-4" d="-1.1081686537254024E-5"/>
+                  <width sOffset="31.315097386056536" a="0.22360725114503577" b="-3.4616674755294508E-6" c="-1.1674210309705504E-4" d="-9.38247405721122E-6"/>
+                  <width sOffset="34.45099757579014" a="0.22215903197448972" b="-0.001012442924449193" c="-0.0011231321874239767" d="7.944710085783779E-5"/>
+                  <width sOffset="38.682929175299165" a="0.2037813445825165" b="-0.006249967316814884" c="0.0010007930451303854" d="-7.001701781297675E-6"/>
+                  <width sOffset="41.75346318140871" a="0.1938235673761346" b="-3.020690553444307E-4" c="8.953965547036315E-4" d="5.2042863606223074E-5"/>
+                  <width sOffset="43.1026094438547" a="0.1951736311297294" b="0.00239815735491751" c="2.152645897695167E-4" d="-1.3573193706577374E-4"/>
+                  <width sOffset="46.4802099517723" a="0.2004993642891857" b="-7.930522927720365E-4" c="2.8339912382924746E-5" d="-1.2379776097071291E-5"/>
+                  <width sOffset="52.19182897676089" a="0.19458757647326763" b="-0.0016808998770936983" c="-1.595594614985083E-4" d="-1.283335150023893E-5"/>
+                  <width sOffset="55.72157650547484" a="0.18610207496443687" b="-0.003286985814172447" c="0.12257419289764644" d="7.48442293313553E-4"/>
+                  <width sOffset="56.73099080020529" a="0.3084468802604503" b="0.24645710135661245" c="-0.13997528343535975" d="0.22399527264949737"/>
+                  <width sOffset="57.31299507009443" a="0.44863109239144405" b="0.40530750212779615" c="0.12785899561020037" d="7.8622713987485E-4"/>
+                  <width sOffset="57.4745517116707" a="0.5174517164462635" b="0.4466820048586189" c="5.863689847992793" d="-8.980355395150903"/>
+                  <width sOffset="57.944662254771636" a="1.0903146284023717" b="0.005765533250220015" c="-0.13428621665033572" d="0.02897227942092396"/>
+                  <width sOffset="60.21870888779236" a="0.7496997778471424" b="-0.15550869396425468" c="-0.021386056621575247" d="0.008802101025706785"/>
+                  <width sOffset="60.92986241342861" a="0.6314592005720461" b="-0.17257152688453936" c="-0.0025982530734080596" d="0.008784573647900687"/>
+                  <width sOffset="62.36513473536991" a="0.4043927357547883" b="-0.12574108824439123" c="0.009531971992374306" d="0.025701658105069178"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects>
+         <object type="pole" name="Guidepost" id="256722" s="20.436546146548878" t="-4.196820044559263" zOffset="-0.07520628349521985" validLength="0.0" orientation="none" radius="0.0" height="1.1332996357232332" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256723" s="34.263299111084095" t="-4.4550905740268645" zOffset="-0.08761317348921693" validLength="0.0" orientation="none" radius="0.0" height="1.029637043364346" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256724" s="51.34163232413098" t="-4.619386079209587" zOffset="-0.11100793165020661" validLength="0.0" orientation="none" radius="0.0" height="1.0636598877608776" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256846" s="16.163499754576637" t="-5.87991248896971" zOffset="0.07617326411680381" validLength="0.0" orientation="none" radius="0.0378215527973112" height="1.8692424278706312" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256847" s="16.136605615181466" t="-6.8093185111163645" zOffset="-0.0202621180659861" validLength="0.0" orientation="none" radius="0.03478837316279364" height="2.0099557572975755" hdg="0.0" pitch="0.0" roll="0.0"/>
+      </objects>
+      <signals/>
+   </road>
+   <road length="2.3954492240904393" id="2233584" junction="2104772">
+      <link>
+         <predecessor elementType="road" elementId="255971" contactPoint="end"/>
+         <successor elementType="road" elementId="255965" contactPoint="start"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618316.5327543936" y="5809513.017186694" hdg="0.2611533670827939" length="2.3954492240904393">
+            <paramPoly3 aU="0.0" bU="2.3872892269695702" cU="-0.0030077381592584704" dU="-0.0013924091350706472" aV="-0.0" bV="2.220446049250313E-16" cV="-0.18569037473336697" dV="-0.023546465588801812" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="102.4776502173641" b="0.008858839268751579" c="-6.953440229460813E-4" d="-2.883348417074419E-4"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.03857423315851708" b="-0.00112347031434993" c="-0.0" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="1.2615622376064823" b="0.03917850412447299" c="-0.03342411830835713" d="0.010450261867173486"/>
+         <laneOffset s="1.5732383482725383" a="1.281164192893601" b="0.01160596272030931" c="-0.01753382190362788" d="0.020545984937605052"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.10997250646325063" b="-0.0749598204062523" c="-0.007839392146085193" d="0.013953161166924239"/>
+                  <width sOffset="1.1269814693410107" a="0.03550952944375352" b="-0.03946432422291332" c="-0.008461588092036423" d="0.005475340333041118"/>
+                  <width sOffset="1.5732383482725383" a="0.01669981165420742" b="-0.043745244738602376" c="0.03230059852434847" d="-0.0046203827373926115"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.16">
+                     <type name="solid" width="0.16">
+                        <line length="2.3954492240904393" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.16"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                     <successor id="-3"/>
+                  </link>
+                  <width sOffset="0.0" a="4.661673226068976" b="-0.055109085818753734" c="-0.026582820778416217" d="-0.00927781885498633"/>
+                  <width sOffset="0.9433255745317077" a="4.57824425809015" b="-0.13002956222955575" c="0.045691066393031776" d="-0.03160362536951837"/>
+                  <width sOffset="1.5732383482725383" a="4.506567628991267" b="-0.11008680674723507" c="-0.047463477309358154" d="-0.021507902299086"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.14">
+                     <type name="solid" width="0.14">
+                        <line length="2.3954492240904393" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.14"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="3.624167632665376E-11" max="40.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="-2"/>
+                     <successor id="-4"/>
+                  </link>
+                  <width sOffset="0.0" a="0.5719609228236378" b="-0.004215986477013073" c="-0.020205246984172427" d="0.019784288434047337"/>
+                  <width sOffset="0.9433255745317077" a="0.5666115086870502" b="0.010479688143164467" c="-0.06274606979971784" d="0.042110094948579244"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects/>
+      <signals/>
+   </road>
+   <road length="4.999999999999649" id="2233633" junction="2104772">
+      <link>
+         <predecessor elementType="road" elementId="2233547" contactPoint="end"/>
+         <successor elementType="road" elementId="255965" contactPoint="start"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618313.5436614776" y="5809517.694625916" hdg="0.08656056094139619" length="4.999999999999649">
+            <paramPoly3 aU="0.0" bU="4.999812037729362" cU="1.131293697320423E-4" dU="6.0543232164572E-6" aV="-0.0" bV="7.216449660063518E-16" cV="-0.021408866083919696" dV="-0.0011563354777620603" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="102.65547889357356" b="9.079793092056213E-4" c="-3.2211674063096295E-5" d="-3.2155667017981332E-15"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.03553837529063122" b="6.892835501754108E-5" c="5.551115123126561E-19" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="3.1342258247482104" b="0.010882574404349445" c="-0.001315720004629547" d="5.20886081587726E-4"/>
+         <laneOffset s="2.5989832449278794" a="3.1627664984797903" b="0.014598815288691568" c="9.461684173263428E-5" d="5.428827551845735E-4"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="1"/>
+                     <successor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.5146469472813893" b="0.0034908259174148536" c="0.002178382675299133" d="-5.216120006864225E-4"/>
+                  <width sOffset="2.5989832449278794" a="0.5292767959060662" b="0.004243966559767838" c="7.623858742127329E-4" d="-5.436086742832654E-4"/>
+                  <roadMark sOffset="0.0" type="curb" weight="standard" color="standard" width="0.12">
+                     <type name="curb" width="0.12">
+                        <line length="4.999999999999649" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.0"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.12721969952060494">
+                     <type name="solid" width="0.12722">
+                        <line length="4.999999999999649" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.12722"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="3.1810655199824174" b="-0.0051729080731389675" c="-0.00213639854371376" d="5.097950170026949E-4"/>
+                  <width sOffset="2.5989832449278794" a="3.1621401070791877" b="-0.005947277638502033" c="-8.125381704262725E-4" d="5.317916905995246E-4"/>
+                  <width sOffset="3.004011845949208" a="3.159633328612744" b="-0.0063437616781548845" c="-3.267325222779666E-4" d="6.399047219495302E-4"/>
+                  <roadMark sOffset="0.0" type="solid broken" weight="bold" color="standard" width="0.32">
+                     <type name="solid broken" width="0.12">
+                        <line length="4.0" space="8.0" tOffset="-0.0" sOffset="0.0" width="0.12"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="driving" level="false">
+                  <link>
+                     <predecessor id="-2"/>
+                     <successor id="-2"/>
+                  </link>
+                  <width sOffset="0.0" a="3.449247838581479" b="0.0011526987537071511" c="2.4221577222221396E-4" d="-3.897166125013838E-5"/>
+                  <width sOffset="3.004011845949208" a="3.4538398736294407" b="0.0015528858468562869" c="5.136866135286157E-5" d="-1.4708469260018726E-4"/>
+                  <roadMark sOffset="0.0" type="solid" weight="bold" color="standard" width="0.25">
+                     <type name="solid" width="0.25">
+                        <line length="4.999999999999649" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.25"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-3" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="-3"/>
+                  </link>
+                  <width sOffset="0.0" a="0.37221210772808755" b="-0.1145075600025787" c="0.01859545601878914" d="-0.00859216886418689"/>
+                  <width sOffset="1.0507181684691318" a="0.26245954587995257" b="-0.10388787977168629" c="-0.01088214549057189" d="0.006919537620544386"/>
+                  <width sOffset="2.7231234938540894" a="0.09064714343656899" b="-0.08222601013144082" c="0.0015415635269330516" d="0.011058124277749907"/>
+                  <width sOffset="3.7059236628737864" a="0.0218216856101634" b="-0.04715291260618694" c="0.0337828413141479" d="-0.008018119962731487"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects/>
+      <signals/>
+   </road>
+   <road length="5.000000000000043" id="2233666" junction="2104780">
+      <link>
+         <predecessor elementType="road" elementId="255967" contactPoint="start"/>
+         <successor elementType="road" elementId="428488" contactPoint="end"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618242.788914409" y="5809615.8191708485" hdg="2.95718114737078" length="5.000000000000043">
+            <paramPoly3 aU="-0.0" bU="4.971384886128051" cU="0.03366571760304255" dU="-0.005995664489290045" aV="-0.0" bV="-2.220446049250313E-16" cV="-0.08325149997731976" dV="-9.234688401415465E-4" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="107.4968106440233" b="0.02622188791837403" c="0.003904698434378067" d="-2.1930893498006048E-4"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="-0.03724485524683241" b="4.5631114402960193E-4" c="-0.0" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="1.6407936421427272" b="-0.042327209354850424" c="0.002673273150783392" d="1.6025999247263665E-4"/>
+         <laneOffset s="4.82820526346412" a="1.5167851179115723" b="-0.005305252153415055" c="0.02743987090852138" d="-0.13600923444459964"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.0" b="0.0" c="0.015077625526549721" d="-0.00226180918255554"/>
+                  <width sOffset="3.9171312509925613" a="0.09540574760446696" b="0.014007037569155719" c="0.018869470356283873" d="-0.003838630105980685"/>
+                  <width sOffset="4.82820526346412" a="0.12092697536309349" b="0.03883117351280604" c="-0.014067651383041436" d="0.13233086433107516"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.16">
+                     <type name="solid" width="0.16">
+                        <line length="5.000000000000043" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.16"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="1"/>
+                     <successor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="4.394469847707935" b="0.052846252186071856" c="-5.501403881187175E-4" d="1.6420441401743979E-4"/>
+                  <width sOffset="4.82820526346412" a="4.655279470340754" b="0.059017456888113065" c="0.024273590800271787" d="-0.13600529002330286"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.16">
+                     <type name="solid" width="0.16">
+                        <line length="5.000000000000043" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.16"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="40.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="2"/>
+                     <successor id="2"/>
+                  </link>
+                  <width sOffset="0.0" a="0.2921638687737329" b="-0.003112425831277063" c="7.894876535603011E-4" d="3.7495720114843053E-7"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects>
+         <object type="railing" name="" id="2233665" s="0.0" t="-3.889958290045064" zOffset="0.0" validLength="5.000000000000043" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="0.0" length="5.000000000000043" distance="0.0" tStart="-3.889958290045064" tEnd="-4.2589271279874055" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.6414260851068503" zOffsetEnd="0.6008755917640725"/>
+         </object>
+         <object type="pole" name="Guidepost" id="429486" s="4.660109392798317" t="-4.209521020063616" zOffset="0.8932466314715128" validLength="0.0" orientation="none" radius="0.0" height="0.4898761259391904" hdg="0.0" pitch="0.0" roll="0.0"/>
+      </objects>
+      <signals/>
+   </road>
+   <road length="5.000000000000211" id="2233698" junction="2104780">
+      <link>
+         <predecessor elementType="road" elementId="428457" contactPoint="end"/>
+         <successor elementType="road" elementId="255967" contactPoint="start"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618237.0713183222" y="5809612.363975707" hdg="-0.0610091374321684" length="5.000000000000211">
+            <paramPoly3 aU="0.0" bU="5.018068037973363" cU="-0.01826947797698704" dU="-0.012238100307776969" aV="-0.0" bV="-0.0" cV="-0.2993122730026382" dV="-0.004897903133357375" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="107.5270274714737" b="-0.043106483749076656" c="4.3051448274805806E-4" d="1.6438361017589688E-4"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.03865975999681748" b="-2.8298094999700175E-4" c="-0.0" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="2.7426097661152595" b="-0.04669295349799027" c="-0.007781584335901128" d="0.002334022897852255"/>
+         <laneOffset s="1.915403776737108" a="2.641026647574554" b="-0.050813714590157155" c="6.549961718500233E-4" d="1.557481900779476E-4"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.14435923908873294" b="-0.06733759699630372" c="0.010952881728285834" d="-6.178043461501608E-4"/>
+                  <width sOffset="1.3372324476249915" a="0.07242174966191373" b="-0.04135875512063168" c="0.006862533212733278" d="-0.0025289236305843068"/>
+                  <width sOffset="1.915403776737108" a="0.05031455422792108" b="-0.03595943682150601" c="0.0074512881154373024" d="-3.5064892281152214E-4"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.16">
+                     <type name="solid" width="0.16">
+                        <line length="5.000000000000211" space="0.0" tOffset="0.0" sOffset="0.0" width="0.16"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="4.373444545580115" b="-0.0792790857428834" c="0.006377301823050679" d="-0.0049133387759181845"/>
+                  <width sOffset="1.2151236848829932" a="4.277711578235071" b="-0.08554467576492628" c="-0.00931607684616364" d="0.004069930917745862"/>
+                  <width sOffset="1.915403776737108" a="4.214635476055667" b="-0.09260481484817858" c="-0.00574101036826833" d="0.001891656209969323"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.1514706264231801">
+                     <type name="solid" width="0.151471">
+                        <line length="5.000000000000211" space="0.0" tOffset="0.0" sOffset="0.0" width="0.151471"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="1.7763568394002505E-13" max="40.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="-2"/>
+                     <successor id="-2"/>
+                  </link>
+                  <width sOffset="0.0" a="0.36044592302962797" b="-0.011645856909072688" c="-0.01611700725790727" d="0.00739359144183585"/>
+                  <width sOffset="1.2151236848829932" a="0.33576288797391496" b="-0.018063690961768204" c="0.008617812687856182" d="-0.001589678251825984"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects>
+         <object type="railing" name="" id="2233697" s="0.0" t="-2.560098620199778" zOffset="0.0" validLength="5.000000000000211" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="0.0" length="5.000000000000211" distance="0.0" tStart="-2.560098620199778" tEnd="-2.370763290882291" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.4343362751042787" zOffsetEnd="0.4713909772868942"/>
+         </object>
+      </objects>
+      <signals/>
+   </road>
+   <road length="56.07066369542149" id="2233740" junction="-1">
+      <link>
+         <predecessor elementType="junction" elementId="2104786"/>
+         <successor elementType="junction" elementId="2104802"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618336.1680767725" y="5809576.68794681" hdg="-0.9283314727837717" length="24.999944655388294">
+            <paramPoly3 aU="0.0" bU="25.017040544857494" cU="0.11060612009277404" dU="-0.1407194415239026" aV="-0.0" bV="7.105427357601002E-15" cV="-1.2273117827120654" dV="1.5617442142211315" pRange="normalized"/>
+         </geometry>
+         <geometry s="24.999944655388294" x="618351.4072645385" y="5809556.883262179" hdg="-0.8386867990654219" length="31.070719040033197">
+            <paramPoly3 aU="0.0" bU="30.39891624634503" cU="3.3772122408823035" dU="-4.605473829324196" aV="-0.0" bV="-1.7763568394002505E-15" cV="5.16803257144979" dV="3.4066850356113823" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="103.06276320714413" b="-0.01985913705766076" c="8.746897888466595E-4" d="-1.4128251661080137E-4"/>
+         <elevation s="3.8751643554891424" a="102.99071926856153" b="-0.019444879428819346" c="6.459300308737556E-4" d="-8.529553122702962E-6"/>
+         <elevation s="11.214132739084297" a="102.87943243643791" b="-0.011342176165555964" c="5.093320406477026E-4" d="-1.3094896965695756E-5"/>
+         <elevation s="22.428265478168594" a="102.79782460158445" b="-0.004859057900419956" c="-8.679975326095194E-5" d="4.479173245659679E-6"/>
+         <elevation s="22.611621181132556" a="102.79693077507017" b="-0.004890436599346445" c="4.4891012476335726E-4" d="-4.10891359816878E-5"/>
+         <elevation s="29.514526330966554" a="102.77104795941595" b="-0.004566572829880322" c="-3.248505949142258E-4" d="2.2398024606161053E-5"/>
+         <elevation s="33.64239821725289" a="102.74823788747979" b="-0.006103514355995947" c="-2.2494405401909327E-4" d="1.2205419507810118E-5"/>
+         <elevation s="44.85653095633719" a="102.66871676021997" b="-0.006543876802743098" c="1.0692422153896393E-4" d="9.389296215672985E-6"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.05150000366356894" b="-6.134084323362646E-4" c="-1.1369681176804167E-4" d="0.0"/>
+         <superelevation s="11.214132739084297" a="0.030323015921528886" b="-0.0031634307106912654" c="-2.7225257738379476E-4" d="1.41389235623316E-5"/>
+         <superelevation s="22.428265478168594" a="-0.01945026013760632" b="-0.003935387586884074" c="-2.163542071759096E-4" d="2.329321108472547E-5"/>
+         <superelevation s="33.64239821725289" a="-0.05794090163659638" b="0.0" c="2.2703504292725216E-4" d="-1.0885271996210997E-5"/>
+         <superelevation s="44.85653095633719" a="-0.044740696340399344" b="9.853121742749574E-4" c="-1.7102727205842225E-5" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="-0.3266457842376699" b="-0.029495839610982878" c="-5.155045979757152E-4" d="2.0370715672978656E-4"/>
+         <laneOffset s="5.086275098693497" a="-0.46320155929733414" b="-0.018930004787535395" c="0.0019980948773357294" d="-1.0331988856529043E-4"/>
+         <laneOffset s="9.211895187675518" a="-0.5145457491096626" b="-0.007718987283299668" c="5.439754806613749E-4" d="-2.5450071621036496E-5"/>
+         <laneOffset s="11.214132739084297" a="-0.5280245066564792" b="-0.0058467356062817" c="4.861713809846601E-4" d="-2.025078418037956E-6"/>
+         <laneOffset s="17.471838633720683" a="-0.546069965149376" b="-0.0" c="0.001216040601029614" d="1.647156988921308E-6"/>
+         <laneOffset s="22.428265478168594" a="-0.5159959500772873" b="0.012175825559076776" c="0.0011633315677998198" d="1.8019073549129614E-5"/>
+         <laneOffset s="24.867408412876696" a="-0.4791147416709131" b="0.018172498523105422" c="0.004284096188670167" d="-5.75143800532101E-4"/>
+         <laneOffset s="28.124693893407112" a="-0.39434453972951156" b="0.02777487750626876" c="0.0024563827674504786" d="-3.3464298249748865E-4"/>
+         <laneOffset s="33.94590579610157" a="-0.21543471456200444" b="0.02235348038641153" c="-0.0016915472728347323" d="6.457529527310802E-5"/>
+         <laneOffset s="37.75097708257813" a="-0.15131172858285558" b="0.01228543778464561" c="-8.410574591757695E-4" d="-7.91948367513031E-5"/>
+         <laneOffset s="42.22602834066798" a="-0.1202741150821323" b="-0.0" c="-0.006889814702078857" d="4.914767822380243E-4"/>
+         <laneOffset s="44.85653095633719" a="-0.1590026904061099" b="-0.026044965515284475" c="-0.002995985546872695" d="4.924251687552665E-4"/>
+         <laneOffset s="48.86555812458715" a="-0.27984097724332707" b="-0.026323727022016286" c="-0.008953517988051747" d="0.0025951180518230363"/>
+         <laneOffset s="52.18442720652583" a="-0.37095832423539343" b="-0.0" c="0.007040536684028525" d="-8.800319481760109E-4"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="2" type="shoulder" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="0.4504796426719917" b="0.013334573291188624" c="-0.0016747745499502014" d="-6.340609015738715E-7"/>
+                  <width sOffset="8.164891517923094" a="0.44736025253271094" b="-0.014140941616103821" c="-0.0012891587769919325" d="8.308816082512973E-5"/>
+                  <width sOffset="9.709344588070948" a="0.42275125589459783" b="-0.01752845271260375" c="-3.887827849825817E-4" d="-1.8805004848442155E-4"/>
+                  <width sOffset="11.214132739084297" a="0.3948535269990492" b="-0.019975978638390637" c="-7.075346817937165E-4" d="7.588746704524544E-5"/>
+                  <width sOffset="15.75878027141416" a="0.29657957698867676" b="-0.02170487160424197" c="-0.00364540819446958" d="7.762710333846053E-4"/>
+                  <width sOffset="18.096195913152386" a="0.23584290739494662" b="-0.026023041828577988" c="0.0014727035299075598" d="8.376943966912667E-4"/>
+                  <width sOffset="20.519984611065674" a="0.1933483819665227" b="-0.00412025786341174" c="0.0028163060241892615" d="-1.271212605531669E-4"/>
+                  <width sOffset="22.428265478168594" a="0.1948580771720687" b="0.005239598050748057" c="0.0018038151963672196" d="-2.960403741332039E-4"/>
+                  <width sOffset="26.695941636826205" a="0.22706151815205455" b="0.004460393159448975" c="3.637851324430749E-4" d="-4.4557897822579076E-4"/>
+                  <width sOffset="27.402392062683717" a="0.23023702216854236" b="0.004307257234501485" c="0.0016183493907447732" d="3.961991232147268E-5"/>
+                  <width sOffset="30.63056865459673" a="0.26233949154004765" b="0.0159945445463988" c="-0.004953088132873436" d="5.617890362242682E-4"/>
+                  <width sOffset="33.52528065781353" a="0.2807620526827703" b="0.001441310863741621" c="-0.006399077150988521" d="9.314281576531547E-4"/>
+                  <width sOffset="33.64239821725289" a="0.28084457869506796" b="-1.924986692486072E-5" c="-0.005942994585097254" d="9.887587051876463E-4"/>
+                  <width sOffset="37.37639598947735" a="0.2493879868558233" b="-0.0030434921911969073" c="0.01107950667853061" d="4.525978537526695E-4"/>
+                  <width sOffset="37.56792981658382" a="0.24921468930366064" b="0.0012505193797492653" c="0.009889602252748562" d="-0.0013261037252165248"/>
+                  <width sOffset="41.21352861151152" a="0.32095863352337783" b="0.020484254142004926" c="-0.007423206232929271" d="8.846024981069863E-4"/>
+                  <width sOffset="44.85653095633719" a="0.3398347353497577" b="0.0016186548720536625" c="0.0014584086427097513" d="0.0012506679159545505"/>
+                  <width sOffset="45.01996255137849" a="0.34014368809104134" b="0.002195570566809805" c="-0.0027310893391449204" d="-0.0012865078632633684"/>
+                  <width sOffset="45.97297061310536" a="0.33864211202685723" b="-0.006515243112492557" c="0.002446943328860659" d="-0.00104006254443634"/>
+                  <width sOffset="47.975730599301045" a="0.3270534552823987" b="-0.009229183737955109" c="-0.004673071285049398" d="0.0014911420040821229"/>
+                  <width sOffset="50.76061372881402" a="0.29731513954948685" b="-5.631118344343762E-4" c="0.01890665593214717" d="-0.0023019920663023396"/>
+                  <width sOffset="51.497842631594175" a="0.30625350463927337" b="0.023560511938926988" c="-0.00443517220087309" d="-0.0010642973707288483"/>
+                  <width sOffset="53.54484571206591" a="0.32676869015694265" b="-0.007976035907837437" c="-0.004742928797377633" d="0.0013758175865897912"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+               <lane id="1" type="driving" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="4.5237414646078555" b="0.0688180487399165" c="-1.3318194901553056E-4" d="-1.8268607215898348E-4"/>
+                  <width sOffset="5.086275098693497" a="4.846285181527951" b="0.05328487608658032" c="-0.0023260243673270523" d="1.2434097313610478E-4"/>
+                  <width sOffset="9.211895187675518" a="5.035259039494962" b="0.040441416914525775" c="-6.117299442607474E-4" d="4.647115618563544E-5"/>
+                  <width sOffset="9.709344588070948" a="5.055230942352928" b="0.03986730621274197" c="-0.0010577774946820412" d="3.1760936550179767E-4"/>
+                  <width sOffset="11.214132739084297" a="5.113909803897112" b="0.03884141604842307" c="-8.70803275892511E-4" d="-5.9687992784705695E-5"/>
+                  <width sOffset="15.75878027141416" a="5.266842360438573" b="0.027228072739510684" c="0.002287932938952235" d="-7.600715591238968E-4"/>
+                  <width sOffset="17.471838633720683" a="5.316378788576972" b="0.028375350848814627" c="-0.0023860941374792893" d="-7.637437945308011E-4"/>
+                  <width sOffset="20.519984611065674" a="5.359071413507096" b="-0.007459250697532697" c="-0.004622521723807787" d="2.010718627132096E-4"/>
+                  <width sOffset="22.428265478168594" a="5.3294012525585055" b="-0.022904759023955244" c="-0.0025073412288902043" d="3.066588678148923E-4"/>
+                  <width sOffset="24.867408412876696" a="5.263066124221527" b="-0.02966296071108705" c="-0.0032522981295600288" d="8.998217418961583E-4"/>
+                  <width sOffset="27.402392062683717" a="5.181629518662686" b="-0.028804858729341354" c="0.0013918994457166852" d="4.146228513479259E-4"/>
+                  <width sOffset="28.124693893407112" a="5.1617061443267485" b="-0.02614516467294308" c="-0.0015021612513692255" d="1.7412203331323276E-4"/>
+                  <width sOffset="30.63056865459673" a="5.089496833914903" b="-0.030393470573626874" c="0.006761960518778286" d="-3.480470905896653E-4"/>
+                  <width sOffset="33.52528065781353" a="5.049735204958326" b="5.152902519532654E-6" c="0.01006411366361783" d="-7.176862118529803E-4"/>
+                  <width sOffset="33.94590579610157" a="5.051464561093829" b="0.008090660314920894" c="0.007462329978976811" d="-0.0011169044896234795"/>
+                  <width sOffset="37.56792981658382" a="5.125595309583983" b="0.018189932824078527" c="-0.003224066867967422" d="6.617970895204295E-4"/>
+                  <width sOffset="37.75097708257813" a="5.128820959457562" b="0.017076142691564662" c="-0.002973995432409879" d="8.055672215406695E-4"/>
+                  <width sOffset="41.21352861151152" a="5.185733837293574" b="0.02545538989694894" c="0.00820344066928511" d="-0.0014051390017828852"/>
+                  <width sOffset="42.22602834066798" a="5.218458724696956" b="0.03774589403114366" c="0.008920886474476631" d="-0.0019758106207722163"/>
+                  <width sOffset="44.85653095633719" a="5.34351439915834" b="0.043663598797785426" c="-0.0066865748151988666" d="-0.001976759007076883"/>
+                  <width sOffset="45.01996255137849" a="5.350463184076206" b="0.04131960659826485" c="-0.002853075508751974" d="5.604167722005157E-4"/>
+                  <width sOffset="47.975730599301045" a="5.462140065510484" b="0.03914190000129919" c="0.0029873381301155034" d="-0.001970787776317732"/>
+                  <width sOffset="48.86555812458715" a="5.497946422303895" b="0.039776963348632954" c="0.00960632458130841" d="-0.0040734806593852695"/>
+                  <width sOffset="50.76061372881402" a="5.580102110783713" b="0.0322995137877198" c="-0.02467385106009061" d="-2.8034658900184415E-4"/>
+                  <width sOffset="52.18442720652583" a="5.5752614595242305" b="-0.03966740309560077" c="-0.01602681828919498" d="0.0031948034109969548"/>
+                  <width sOffset="53.54484571206591" a="5.499679549158254" b="-0.06553552635079761" c="-0.009216112636301942" d="7.546884536786408E-4"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.14">
+                     <type name="solid" width="0.14">
+                        <line length="56.07066369542149" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.14"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="40.0" unit="km/h"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.18">
+                     <type name="solid" width="0.18">
+                        <line length="56.07066369542149" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.18"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="shoulder" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="0.12613941023347258" b="0.052627185654361065" c="0.013977134577130205" d="-0.001464369162396604"/>
+                  <width sOffset="1.2301580516012232" a="0.20930456120852775" b="0.08036731443331692" c="0.015973370248580514" d="-8.009950933398752E-4"/>
+                  <width sOffset="5.086275098693497" a="0.7108002650510783" b="0.1678261621940981" c="0.006112445305595656" d="-0.001108022138635103"/>
+                  <width sOffset="6.586665218718556" a="0.9726226440758616" b="0.17868522698920766" c="0.05868805249244703" d="-0.011623717556559153"/>
+                  <width sOffset="9.211895187675518" a="1.635876883516697" b="0.24649835599261855" c="-0.03303208612116933" d="-0.011545847739614864"/>
+                  <width sOffset="11.121263012470259" a="1.9057381945845833" b="-0.005920037593307915" c="-5.586175864434997" d="5.14453525144882"/>
+                  <width sOffset="11.214132739084297" a="1.8611295079573646" b="-0.9103817395766187" c="-4.152766050192431" d="5.1445586764417515"/>
+                  <width sOffset="11.703157866299378" a="1.0244611894569975" b="-1.2811003024229735" c="-0.15664818245911297" d="0.5929945445633702"/>
+                  <width sOffset="12.642900193102953" a="0.17434540312144575" b="-0.004469885755930345" c="0.0040143645450110175" d="-2.840160142776949E-4"/>
+                  <width sOffset="17.471838633720683" a="0.21438872073835047" b="0.014431745695632128" c="6.677632532271298E-4" d="-2.8034377887073593E-4"/>
+                  <width sOffset="21.00457146845955" a="0.26134590476898323" b="0.008653563671558407" c="5.474839822268505E-4" d="-3.0030801558334896E-5"/>
+                  <width sOffset="22.428265478168594" a="0.2746889697076903" b="0.010029854290915418" c="4.838633277607459E-4" d="3.873528698897963E-5"/>
+                  <width sOffset="24.867408412876696" a="0.30259402965380217" b="0.013081635196143113" c="0.003756217365568239" d="-5.544275870922507E-4"/>
+                  <width sOffset="28.124693893407112" a="0.3658970322890348" b="0.019904501527091285" c="0.002130939808096113" d="-3.139267690576365E-4"/>
+                  <width sOffset="33.64239821725289" a="0.48786521146906003" b="0.014747734207514457" c="-0.0030479516148163243" d="-3.1167300704968E-4"/>
+                  <width sOffset="33.94590579610157" a="0.492051779064404" b="0.01281145037008247" c="-0.0016355838757880535" d="8.754527071708322E-5"/>
+                  <width sOffset="37.75097708257813" a="0.5219423918960765" b="0.004167014218192426" c="-5.228868800902523E-4" d="-5.622486130732884E-5"/>
+                  <width sOffset="42.22602834066798" a="0.525079872017112" b="-0.003890768309212582" c="-0.006263268670466834" d="5.144467576820039E-4"/>
+                  <width sOffset="44.85653095633719" a="0.4808701300244135" b="-0.026162646606460328" c="-0.0021881717737618264" d="5.153951442996087E-4"/>
+                  <width sOffset="44.92914530374781" a="0.4789590059639444" b="-0.02647227914348323" c="0.09371359578043884" d="5.037497655990146E-4"/>
+                  <width sOffset="47.08974220334002" a="0.8643157648775777" b="0.38553711201666796" c="0.6782299491758976" d="-0.31844977134434244"/>
+                  <width sOffset="48.766985755695515" a="1.9163638342834721" b="-0.026886307687424865" c="-0.6543910124170241" d="0.29451853678874534"/>
+                  <width sOffset="48.86555812458715" a="1.9076372730239861" b="-0.1473109736278025" c="-0.5791768129364911" d="0.29662122967190707"/>
+                  <width sOffset="49.92712991457479" a="1.4534161887372834" b="-0.37416826714307005" c="0.0279261446738098" d="0.001360689490888275"/>
+                  <width sOffset="52.18442720652583" a="0.7667521959390066" b="-0.2272933104301516" c="0.02729607025626473" d="-0.002114460509109713"/>
+                  <width sOffset="52.87216972364787" a="0.6226558606861743" b="-0.19274832886771395" c="0.034064307217272105" d="-0.0032303751087621184"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects>
+         <object type="railing" name="" id="257080" s="12.366814421267254" t="-2.196115795348445" zOffset="0.0" validLength="0.712848752445387" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="12.366814421267254" length="0.712848752445387" distance="0.0" tStart="-2.196115795348445" tEnd="-1.6300532922756008" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.567600133170252" zOffsetEnd="0.5772797280764548"/>
+         </object>
+         <object type="railing" name="" id="268692536" s="13.07966317371264" t="-1.6300532922756008" zOffset="0.0" validLength="0.37496457779992376" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="13.07966317371264" length="0.37496457779992376" distance="0.0" tStart="-1.6300532922756008" tEnd="-1.5337558025912974" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.5772797280764548" zOffsetEnd="0.5908027948524006"/>
+         </object>
+         <object type="railing" name="" id="537127992" s="13.454627751512565" t="-1.5337558025912974" zOffset="0.0" validLength="20.660833447969626" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="13.454627751512565" length="20.660833447969626" distance="0.0" tStart="-1.5337558025912974" tEnd="-1.3592537396243107" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.5908027948524006" zOffsetEnd="0.629084412149062"/>
+         </object>
+         <object type="railing" name="" id="805563448" s="34.11546119948219" t="-1.3592537396243107" zOffset="0.0" validLength="7.4336816536998995" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="34.11546119948219" length="7.4336816536998995" distance="0.0" tStart="-1.3592537396243107" tEnd="-1.1846909224708342" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.629084412149062" zOffsetEnd="0.623427124869657"/>
+         </object>
+         <object type="railing" name="" id="257081" s="41.54914285318209" t="-1.1846909224708342" zOffset="0.0" validLength="2.1614800379590093" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="41.54914285318209" length="2.1614800379590093" distance="0.0" tStart="-1.1846909224708342" tEnd="-1.2821513555390325" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.623427124869657" zOffsetEnd="0.37303263151184013"/>
+         </object>
+         <object type="railing" name="" id="268692537" s="43.7106228911411" t="-1.2821513555390325" zOffset="0.0" validLength="2.1614805803302346" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="43.7106228911411" length="2.1614805803302346" distance="0.0" tStart="-1.2821513555390325" tEnd="-1.5745326547438039" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.37303263151184013" zOffsetEnd="0.003000389472709919"/>
+         </object>
+         <object type="railing" name="" id="537127993" s="45.872103471471334" t="-1.5745326547438039" zOffset="0.0" validLength="0.32214536237351865" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="45.872103471471334" length="0.32214536237351865" distance="0.0" tStart="-1.5745326547438039" tEnd="-1.8109502545521885" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.003000389472709919" zOffsetEnd="-0.06239302906252703"/>
+         </object>
+         <object type="railing" name="" id="2233733" s="0.0" t="5.241308392889576" zOffset="0.0" validLength="7.09101161697734" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="0.0" length="7.09101161697734" distance="0.0" tStart="5.241308392889576" tEnd="5.6085829076285485" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.7428840641145411" zOffsetEnd="0.6278508852279641"/>
+         </object>
+         <object type="railing" name="" id="270669189" s="7.09101161697734" t="5.6085829076285485" zOffset="0.0" validLength="7.091014240185482" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="7.09101161697734" length="7.091014240185482" distance="0.0" tStart="5.6085829076285485" tEnd="5.76359875747593" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.6278508852279641" zOffsetEnd="0.49628996742264747"/>
+         </object>
+         <object type="railing" name="" id="539104645" s="14.182025857162822" t="5.76359875747593" zOffset="0.0" validLength="7.036298105922972" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="14.182025857162822" length="7.036298105922972" distance="0.0" tStart="5.76359875747593" tEnd="5.732120323053375" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.49628996742264747" zOffsetEnd="0.34940718669920273"/>
+         </object>
+         <object type="railing" name="" id="807540101" s="21.218323963085794" t="5.732120323053375" zOffset="0.0" validLength="11.695585636268731" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="21.218323963085794" length="11.695585636268731" distance="0.0" tStart="5.732120323053375" tEnd="5.853562572953846" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.34940718669920273" zOffsetEnd="0.22880023939277522"/>
+         </object>
+         <object type="railing" name="" id="1075975557" s="32.913909599354525" t="5.853562572953846" zOffset="0.0" validLength="6.024981482139317" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="32.913909599354525" length="6.024981482139317" distance="0.0" tStart="5.853562572953846" tEnd="6.05941093307273" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.22880023939277522" zOffsetEnd="0.193814437400668"/>
+         </object>
+         <object type="railing" name="" id="1073741926" s="38.93889108149384" t="6.05941093307273" zOffset="0.0" validLength="7.8997213088083384" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="38.93889108149384" length="7.8997213088083384" distance="0.0" tStart="6.05941093307273" tEnd="6.09065456354306" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.193814437400668" zOffsetEnd="0.03388871470315963"/>
+         </object>
+         <object type="railing" name="" id="1073741927" s="46.83861239030218" t="6.09065456354306" zOffset="0.0" validLength="5.489734390424218" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="46.83861239030218" length="5.489734390424218" distance="0.0" tStart="6.09065456354306" tEnd="6.083142148077539" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.03388871470315963" zOffsetEnd="-0.17965333374409226"/>
+         </object>
+         <object type="pole" name="Guidepost" id="256764" s="44.284475210213145" t="6.340266497026679" zOffset="0.19993604335292048" validLength="0.0" orientation="none" radius="0.0" height="0.5935544865205884" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256765" s="41.23109506641346" t="-1.3458980497729645" zOffset="0.8010764847002605" validLength="0.0" orientation="none" radius="0.0" height="0.513442168943584" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256766" s="40.72614941799765" t="6.2186302077625" zOffset="0.3377532282697473" validLength="0.0" orientation="none" radius="0.0" height="0.5213737934827805" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256767" s="26.665870465419083" t="5.897815030295382" zOffset="0.4641948339204731" validLength="0.0" orientation="none" radius="0.0" height="0.49975253641605377" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256768" s="26.904448364425917" t="-1.6821696428816129" zOffset="0.7799093150163401" validLength="0.0" orientation="none" radius="0.0" height="0.5751111889258027" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256770" s="14.073725089028416" t="5.8832351943025625" zOffset="0.6784803508616761" validLength="0.0" orientation="none" radius="0.0" height="0.4982993509620428" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256834" s="43.83817708465429" t="-3.032274031446437" zOffset="-0.39697859996618945" validLength="0.0" orientation="none" radius="0.035" height="2.325354930013418" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256835" s="43.64791328008216" t="-2.224745395996898" zOffset="-0.21278148267423092" validLength="0.0" orientation="none" radius="0.03549115283708261" height="2.180771254003048" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256836" s="13.893941697753524" t="6.323006844812658" zOffset="0.17124279778218465" validLength="0.0" orientation="none" radius="0.035" height="2.4428082928061485" hdg="0.0" pitch="0.0" roll="0.0"/>
+      </objects>
+      <signals>
+         <signal s="46.43520867112099" t="-2.7064449244551883" id="254038" dynamic="no" orientation="-" zOffset="0.7819717768795726" country="DEU" type="626" subtype="30" height="0.7499998665217305" width="0.5233371287718926" hOffset="-2.692745703861244"/>
+         <signal s="43.66128984560161" t="-2.5429510710406595" id="254051" dynamic="no" orientation="-" zOffset="1.139917579674261" country="DEU" type="unknown" subtype="-1" height="0.7999998798691434" width="1.4829524554681717" hOffset="-2.7723596376104913"/>
+      </signals>
+   </road>
+   <road length="25.342113424647387" id="2233780" junction="-1">
+      <link>
+         <predecessor elementType="junction" elementId="2104786"/>
+         <successor elementType="road" elementId="255970" contactPoint="start"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618338.4611670669" y="5809578.524204258" hdg="-1.0442883947430812" length="25.342113424647387">
+            <paramPoly3 aU="0.0" bU="25.42985325512298" cU="0.04243541535406958" dU="-2.88311866191694" aV="-0.0" bV="1.7763568394002505E-15" cV="-9.287446887374726" dV="-0.3660541888129769" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="103.27686294749466" b="-0.021261368268772448" c="0.0010894749970695324" d="-1.2098996766426322E-4"/>
+         <elevation s="5.7665570715638435" a="103.16728596648657" b="-0.020766232457105085" c="6.089532565953264E-4" d="-2.4356868972411624E-5"/>
+         <elevation s="12.671056712323693" a="103.04491849715868" b="-0.015840627771515247" c="1.0443727738467895E-4" d="-2.435686897237467E-5"/>
+         <elevation s="18.490669063349902" a="102.95146856449153" b="-0.01709980595778881" c="5.994112421484445E-4" d="-8.907567667771757E-5"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.0609467608474123" b="0.0012990243167603226" c="-5.1259510009804806E-5" d="0.0"/>
+         <superelevation s="12.671056712323693" a="0.0691767662415911" b="0.0" c="-7.609286719000358E-5" d="6.532829829955749E-7"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="-3.4683222871922106" b="0.007724623903897175" c="-0.01776866146131157" d="0.0035074096926412043"/>
+         <laneOffset s="2.1790876633920604" a="-3.499570801030717" b="-0.019750323031047092" c="-0.002800718523651348" d="4.196991902298528E-5"/>
+         <laneOffset s="5.341737317086711" a="-3.5887202543774337" b="-0.0" c="-0.004271396069570412" d="1.497311483163329E-4"/>
+         <laneOffset s="6.815306528889023" a="-3.597516093025552" b="-0.011613014037835524" c="-0.04148556228912522" d="0.012449791474239535"/>
+         <laneOffset s="9.168901112373645" a="-3.692339455439827" b="-0.0" c="0.010336233116926144" d="-0.0021651278956205883"/>
+         <laneOffset s="12.351540850140992" a="-3.6574402127576726" b="-0.0" c="-0.0012294260467277847" d="-9.207484644157412E-6"/>
+         <laneOffset s="15.635275439479166" a="-3.671023027356939" b="-0.008372068182891988" c="-0.02590861823622492" d="0.00599229425446623"/>
+         <laneOffset s="17.825540910993467" a="-3.7506878221506548" b="-0.03562574047506352" c="-0.0116619601407666" d="0.004482661003712375"/>
+         <laneOffset s="20.536957366797715" a="-3.8436640201191437" b="-0.0" c="0.016039926201011648" d="-0.0017979837173524944"/>
+         <laneOffset s="24.549183844812795" a="-3.7015832796025556" b="0.04188001625958801" c="0.029054767174151484" d="-0.03396982300399637"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <successor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.06918065673592722" b="0.028612798995399893" c="-0.5256529238684163" d="6.088079547232188"/>
+                  <width sOffset="0.045547458500293736" a="0.06996866408694391" b="0.01861894890630728" c="0.022268906572320203" d="-0.0033732229432843755"/>
+                  <width sOffset="2.1790876633920604" a="0.1783005898959078" b="0.06757749405720995" c="0.008639102901067265" d="9.221683033383188E-5"/>
+                  <width sOffset="4.143061110075559" a="0.3450422512291862" b="0.10257852543642618" c="0.011809161984212014" d="-8.771090129006478E-4"/>
+                  <width sOffset="5.341737317086711" a="0.48345775013885284" b="0.0909021807237079" c="0.010523938865566244" d="-9.848702421939165E-4"/>
+                  <width sOffset="6.815306528889023" a="0.6371088448649558" b="0.1155020252068823" c="0.04404619931618926" d="-0.01328493056811712"/>
+                  <width sOffset="8.053893972948236" a="0.8224965234829451" b="0.16347097368708027" c="-0.0023488921984462226" d="-0.01233292751534323"/>
+                  <width sOffset="9.168901112373645" a="0.9847514056843165" b="0.11223451005777893" c="-0.0075193089555228645" d="0.0022819918545166347"/>
+                  <width sOffset="9.987247058590945" a="1.072813073978434" b="0.10451240002904577" c="0.04539647882262137" d="-0.014871603184615131"/>
+                  <width sOffset="12.351540850140992" a="1.3771271429299121" b="0.06978196548010696" c="-0.06919284548691955" d="-0.017027523595592235"/>
+                  <width sOffset="12.780287907117891" a="1.3929846394301006" b="0.0010593032696558297" c="-1.5221098694547874" d="0.8521473288305289"/>
+                  <width sOffset="13.890896080108739" a="0.6840536813536895" b="-0.22663133711383093" c="0.09340209279505339" d="-0.01801724124498371"/>
+                  <width sOffset="15.635275439479166" a="0.47729835243229024" b="-0.0652457644443965" c="0.023703868955499505" d="-0.024018742984110927"/>
+                  <width sOffset="16.08152721652058" a="0.45076824747159216" b="-0.058439301319038406" c="0.038776208744841764" d="-0.010236598969526046"/>
+                  <width sOffset="17.825540910993467" a="0.41248970098898896" b="-0.016593242927470636" c="0.010345389888059964" d="-0.008726965713125773"/>
+                  <width sOffset="17.878831251493704" a="0.41163350017242717" b="-0.015564974320769386" c="0.015852831774842886" d="-0.004280714666962241"/>
+                  <width sOffset="20.536957366797715" a="0.401872560235502" b="-0.022025217034840484" c="-0.00952201047841441" d="0.001999930054102647"/>
+                  <width sOffset="22.111349967613936" a="0.35139855817875043" b="-0.03713623047724901" c="0.022323359015387803" d="-8.276652580463774E-4"/>
+                  <width sOffset="24.549183844812795" a="0.38154375779344596" b="0.05694852290452623" c="-0.01838636680629388" d="0.031344174028598244"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.08519677457676113">
+                     <type name="solid" width="0.085197">
+                        <line length="5.341737317086711" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.085197"/>
+                     </type>
+                  </roadMark>
+                  <roadMark sOffset="5.341737317086711" type="solid" weight="standard" color="standard" width="0.17306630859063976">
+                     <type name="solid" width="0.173066">
+                        <line length="20.000376107560676" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.173066"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="4.222457708725736" b="0.05942552126164606" c="-0.001179212152893367" d="0.0010992946894241534"/>
+                  <width sOffset="2.1790876633920604" a="4.357726385910494" b="0.06994605666055198" c="-0.0019537503018520067" d="-0.0023661450841942293"/>
+                  <width sOffset="3.7823393732379813" a="4.455094629235818" b="0.045435417767929046" c="-0.007267432469057247" d="7.631586754553477E-4"/>
+                  <width sOffset="5.341737317086711" a="4.511168065888619" b="0.06454346052409321" c="-0.0055661142565609206" d="8.70919904748486E-4"/>
+                  <width sOffset="6.815306528889023" a="4.596977724545248" b="0.053812714028436646" c="-0.03959211583398708" d="0.013170980230672253"/>
+                  <width sOffset="8.311446317608926" a="4.632974470375398" b="0.023789154841153307" c="0.018669404400061502" d="0.011529184793912456"/>
+                  <width sOffset="9.168901112373645" a="4.674367168536264" b="0.08123525898882622" c="0.012243178812072238" d="-0.0030857345759469435"/>
+                  <width sOffset="10.760186009286661" a="4.82220387771824" b="0.09675905335197796" c="0.0015910380804536673" d="-0.0028346572982352377"/>
+                  <width sOffset="12.351540850140992" a="4.968787461959952" b="0.08028732023698373" c="-0.00283499169047385" d="-6.787368872587218E-4"/>
+                  <width sOffset="13.352938240717936" a="5.045662468287157" b="0.07256750827361329" c="0.002060783694155935" d="-0.0011716724988559094"/>
+                  <width sOffset="15.635275439479166" a="5.20809091905175" b="0.06366436694312841" c="-0.030550158874634862" d="0.004829829240254442"/>
+                  <width sOffset="17.825540910993467" a="5.251724005997719" b="-6.516683703887416E-4" c="-0.023941821728329704" d="0.0033201960230129046"/>
+                  <width sOffset="17.863861412730426" a="5.25166406294543" b="-0.0024719668789951812" c="-0.017506549235544493" d="0.003956993995517595"/>
+                  <width sOffset="19.98252485128967" a="5.205476021661374" b="-0.023367248932098746" c="0.01185927409134665" d="0.004534103026510019"/>
+                  <width sOffset="20.536957366797715" a="5.196938692764244" b="-0.0060356271646736315" c="0.010639640439032826" d="-0.001746541694557923"/>
+                  <width sOffset="24.549183844812795" a="5.231192110555449" b="-0.005005614873102089" c="0.024273672549985983" d="-0.03391838098119842"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.14">
+                     <type name="solid" width="0.14">
+                        <line length="25.342113424647387" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.14"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="40.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link>
+                     <successor id="-2"/>
+                  </link>
+                  <width sOffset="0.0" a="0.42943562982668926" b="-0.00998263067100292" c="-0.004363720546842635" d="0.0012564027036833382"/>
+                  <width sOffset="3.7823393732379813" a="0.3972347171265165" b="0.010929859993735344" c="0.003825807408779294" d="-0.0018729010559655713"/>
+                  <width sOffset="5.073732881749798" a="0.41369617605466935" b="0.01144081019272497" c="0.0057052888633099905" d="-0.001222879650028986"/>
+                  <width sOffset="8.311446317608926" a="0.4690407174613114" b="0.009927425572846996" c="-0.005317350252097322" d="4.1891578672949455E-4"/>
+                  <width sOffset="10.760186009286661" a="0.4676169580366256" b="-0.008578320692025312" c="-0.006318610856945202" d="1.678385090139314E-4"/>
+                  <width sOffset="11.335486526275005" a="0.4606225284737189" b="-0.015681871998492664" c="-0.0025048166653510603" d="5.748560160875681E-4"/>
+                  <width sOffset="12.671056712323693" a="0.43657981789393396" b="-0.01929639459073139" c="-2.4531829951131116E-4" d="6.467834165832974E-4"/>
+                  <width sOffset="13.352938240717936" a="0.42351296128761895" b="-0.01872876067937808" c="-0.005857060733584001" d="0.0011397190281849372"/>
+                  <width sOffset="16.575128971538618" a="0.34048297138589767" b="-0.020974451049462807" c="0.015869245275563628" d="-0.006103984334581855"/>
+                  <width sOffset="17.863861412730426" a="0.326743887472686" b="-0.010485093445717644" c="-0.013783540384301608" d="-0.006740782341101342"/>
+                  <width sOffset="18.07305234144285" a="0.3238856140402433" b="-0.017136823660246197" c="0.004654612659591076" d="5.906597088454377E-4"/>
+                  <width sOffset="19.98252485128967" a="0.3122466667044037" b="0.007099673159376489" c="0.0038229502775438042" d="1.3550677856230366E-5"/>
+                  <width sOffset="22.48413802863022" a="0.3541437267761971" b="0.02648116195091" c="-0.017660590668654705" d="0.0028319693572787883"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects>
+         <object type="railing" name="" id="256201" s="13.8092477553155" t="-1.0403380524876473" zOffset="0.0" validLength="0.07239536833854388" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="13.8092477553155" length="0.07239536833854388" distance="0.0" tStart="-1.0403380524876473" tEnd="-1.5222111080508824" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.40762711379975486" zOffsetEnd="0.4207972262488579"/>
+         </object>
+         <object type="railing" name="" id="268691657" s="13.881643123654044" t="-1.5222111080508824" zOffset="0.0" validLength="0.33837474185828675" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="13.881643123654044" length="0.33837474185828675" distance="0.0" tStart="-1.5222111080508824" tEnd="-2.05469223332725" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.4207972262488579" zOffsetEnd="0.43102438696038065"/>
+         </object>
+         <object type="railing" name="" id="537127113" s="14.22001786551233" t="-2.05469223332725" zOffset="0.0" validLength="0.16918808475668357" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="14.22001786551233" length="0.16918808475668357" distance="0.0" tStart="-2.05469223332725" tEnd="-2.19124566281069" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.43102438696038065" zOffsetEnd="0.4335811855820208"/>
+         </object>
+         <object type="railing" name="" id="805562569" s="14.389205950269014" t="-2.19124566281069" zOffset="0.0" validLength="1.1157860869910206" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="14.389205950269014" length="1.1157860869910206" distance="0.0" tStart="-2.19124566281069" tEnd="-2.537722683046583" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.4335811855820208" zOffsetEnd="0.43403354851408665"/>
+         </object>
+         <object type="railing" name="" id="1073998025" s="15.504992037260035" t="-2.537722683046583" zOffset="0.0" validLength="1.8931972061965325" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="15.504992037260035" length="1.8931972061965325" distance="0.0" tStart="-2.537722683046583" tEnd="-2.845055819293217" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.43403354851408665" zOffsetEnd="0.4322739865325002"/>
+         </object>
+         <object type="railing" name="" id="1073741928" s="17.398189243456567" t="-2.845055819293217" zOffset="0.0" validLength="6.194592951167028" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="17.398189243456567" length="6.194592951167028" distance="0.0" tStart="-2.845055819293217" tEnd="-2.8760075953497264" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.4322739865325002" zOffsetEnd="0.43475798710098673"/>
+         </object>
+         <object type="railing" name="" id="1073741929" s="23.592782194623595" t="-2.8760075953497264" zOffset="0.0" validLength="1.7493312300237918" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="23.592782194623595" length="1.7493312300237918" distance="0.0" tStart="-2.8760075953497264" tEnd="-2.7914661814300556" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.43475798710098673" zOffsetEnd="0.43700101739680236"/>
+         </object>
+         <object type="railing" name="" id="2233773" s="0.0" t="-8.8477821553059" zOffset="0.0" validLength="5.764738557130454" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="0.0" length="5.764738557130454" distance="0.0" tStart="-8.8477821553059" tEnd="-9.367805140126263" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="-0.010503459084312106" zOffsetEnd="-0.1509773699877644"/>
+         </object>
+         <object type="railing" name="" id="270669229" s="5.764738557130454" t="-9.367805140126263" zOffset="0.0" validLength="7.967919440355463" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="5.764738557130454" length="7.967919440355463" distance="0.0" tStart="-9.367805140126263" tEnd="-9.979417207605769" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="-0.1509773699877644" zOffsetEnd="-0.5534769876719638"/>
+         </object>
+         <object type="pole" name="Guidepost" id="256732" s="18.8043792906248" t="-2.7170572341568935" zOffset="0.6008044973421107" validLength="0.0" orientation="none" radius="0.0" height="0.5482534905895591" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256769" s="14.822999226223674" t="0.15390990481243394" zOffset="0.6148434958332984" validLength="0.0" orientation="none" radius="0.0" height="0.45977343805134296" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256771" s="1.898338297684283" t="2.81216648499841" zOffset="0.6699827391104662" validLength="0.0" orientation="none" radius="0.0" height="0.5676866993308067" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256782" s="18.691525847331533" t="-10.227431565901083" zOffset="-0.6962972216891643" validLength="0.0" orientation="none" radius="0.0" height="1.0579122379422188" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256830" s="14.633044861042325" t="-1.7079120870945286" zOffset="-0.14576156849797428" validLength="0.0" orientation="none" radius="0.035" height="1.772577847354114" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256831" s="15.407233925783265" t="0.1288129256111293" zOffset="-0.08917478997334172" validLength="0.0" orientation="none" radius="0.03974516665296304" height="2.4950873143970966" hdg="0.0" pitch="0.0" roll="0.0"/>
+      </objects>
+      <signals>
+         <signal s="15.311847675632555" t="0.05007865124547012" id="253225" dynamic="no" orientation="+" zOffset="1.6638547375020067" country="DEU" type="267" subtype="-1" height="0.7499999983076461" width="0.7498166020570706" hOffset="0.603982854434371"/>
+         <signal s="11.261823023605393" t="7.212032724391947" id="253266" dynamic="no" orientation="+" zOffset="1.6252811321314198" country="DEU" type="267" subtype="-1" height="0.7499999985417437" width="0.7498166123384142" hOffset="0.5877273528361502"/>
+         <signal s="14.577678209382132" t="-1.733429973919349" id="254021" dynamic="no" orientation="+" zOffset="0.8613662097252615" country="DEU" type="222" subtype="-1" height="0.6999999657084943" width="0.7284043462524915" hOffset="0.2985564177490726"/>
+      </signals>
+   </road>
+   <road length="5.000000000000385" id="2233816" junction="2104802">
+      <link>
+         <predecessor elementType="road" elementId="255959" contactPoint="end"/>
+         <successor elementType="road" elementId="2233740" contactPoint="end"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618382.2748187436" y="5809540.820585333" hdg="3.2194319645809575" length="5.000000000000385">
+            <paramPoly3 aU="0.0" bU="5.113899350277614" cU="-0.14512149755503417" dU="-3.932704549891861E-4" aV="0.0" bV="7.216449660063518E-16" cV="-0.5086493747554933" dV="0.022610501034350902" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="102.62035382736202" b="-0.002185202460419971" c="5.506573475235262E-4" d="-9.389296215789127E-6"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.032288198768976664" b="7.107719688218351E-4" c="-0.0" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="0.2795922310869313" b="0.024437914050964443" c="-0.009267403734435546" d="0.0011853605647016965"/>
+         <laneOffset s="4.419997387584382" a="0.30891301092169865" b="0.011987065744637542" c="0.03149313967675756" d="-0.05218359502424264"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.0" b="0.0" c="0.014858621150085155" d="-9.896589834537776E-4"/>
+                  <width sOffset="4.08286074338404" a="0.18033306440768393" b="0.07183925297850044" c="0.025614708518673465" d="-0.026982776100150034"/>
+                  <width sOffset="4.419997387584382" a="0.20643014362240975" b="0.07990988932001605" c="-0.02671861085138026" d="0.026386179488795923"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.18">
+                     <type name="solid" width="0.18">
+                        <line length="5.000000000000385" space="0.0" tOffset="0.0" sOffset="0.0" width="0.18"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-3"/>
+                     <successor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="4.640311025476274" b="0.18111201056718154" c="-0.013786276297640034" d="6.056977163213715E-4"/>
+                  <width sOffset="2.9505169182531583" a="5.070225832461882" b="0.11557752307261467" c="-0.008421379432957402" d="0.0020647859597848644"/>
+                  <width sOffset="4.419997387584382" a="5.228431735635066" b="0.10420334609578534" c="0.025723780104017085" d="-0.051304169629165654"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.14">
+                     <type name="solid" width="0.14">
+                        <line length="5.000000000000385" space="0.0" tOffset="0.0" sOffset="0.0" width="0.14"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="4.982680934517703E-13" max="40.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="-4"/>
+                     <successor id="2"/>
+                  </link>
+                  <width sOffset="0.0" a="0.35564998476678955" b="-0.021647573201199338" c="-2.938162692246874E-4" d="5.675949453636072E-4"/>
+                  <width sOffset="2.9505169182531583" a="0.3037997931232166" b="-0.00855771427321625" c="0.004726746411184662" d="-8.914932980999615E-4"/>
+                  <width sOffset="4.476254010933624" a="0.29857990212919283" b="-3.6002096162147945E-4" c="-0.005903455047518004" d="0.012264641823232506"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects>
+         <object type="pole" name="Guidepost" id="256763" s="1.4482015419199872" t="-5.658053936236785" zOffset="-0.19260078340647624" validLength="0.0" orientation="none" radius="0.0" height="0.9393957825377584" hdg="0.0" pitch="0.0" roll="0.0"/>
+      </objects>
+      <signals/>
+   </road>
+   <road length="58.853111738232855" id="2233865" junction="-1">
+      <link>
+         <predecessor elementType="junction" elementId="2104802"/>
+         <successor elementType="junction" elementId="2104811"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618377.5687445658" y="5809536.858468904" hdg="3.2289519252271752" length="58.853111738232855">
+            <paramPoly3 aU="0.0" bU="58.84786493883226" cU="-0.01627965623462635" dU="0.010938232799371422" aV="0.0" bV="6.217248937900877E-15" cV="3.039925473079857" dV="-2.0189720323504616" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="102.71405028220221" b="-0.00234492816528434" c="3.849366631736151E-5" d="4.83415036325018E-7"/>
+         <elevation s="11.77062234764657" a="102.69257057035148" b="-0.0012378114398864512" c="7.48457662025607E-5" d="-1.1547152023725586E-6"/>
+         <elevation s="23.54124469529314" a="102.68648735788729" b="4.420216842327192E-5" c="8.307283570286682E-5" d="4.834146718722075E-7"/>
+         <elevation s="23.938264269115088" a="102.68651803158313" b="1.1039384611553526E-4" c="2.322942006535099E-5" d="-2.680228848145423E-6"/>
+         <elevation s="30.92336256397528" a="102.68750908417175" b="4.259546405498599E-5" c="-5.554473477764388E-4" d="2.043588478392057E-5"/>
+         <elevation s="35.31186704293971" a="102.6787258716871" b="-0.0036518485113498315" c="-2.9085142016679893E-4" d="2.0435884783922398E-5"/>
+         <elevation s="47.08248939058628" a="102.62877124498715" b="-0.002004827629141124" c="2.688629605522973E-4" d="2.502116670739739E-5"/>
+         <elevation s="48.885043881846315" a="102.62617756978909" b="-7.916508281553072E-4" c="-1.4512339330894603E-4" d="4.585282480504903E-6"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.030077975552064328" b="-5.402086153168162E-4" c="4.364030541489632E-6" d="0.0"/>
+         <superelevation s="11.77062234764657" a="0.02432400969384136" b="-4.3747390448187933E-4" c="-2.331681869434229E-5" d="2.3516895214437193E-6"/>
+         <superelevation s="23.54124469529314" a="0.019779295318851108" b="-8.918371029826263E-6" c="3.7884025017629644E-7" d="8.310401541777743E-24"/>
+         <superelevation s="35.31186704293971" a="0.01972680793017697" b="0.0" c="4.2230435640956266E-5" d="-1.5491596472007893E-6"/>
+         <superelevation s="47.08248939058628" a="0.02305137589739753" b="3.502601958813514E-4" c="5.76128931412851E-6" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="3.3682235963951674" b="0.013381525097348895" c="-8.938322630996198E-4" d="-1.5878703642300531E-4"/>
+         <laneOffset s="3.7460726010643786" a="3.3974613055077127" b="-0.0" c="-5.8958801180004345E-5" d="1.3075140420007703E-6"/>
+         <laneOffset s="11.77062234764657" a="3.3943403770763014" b="-6.936498473520436E-4" c="-7.436576131912506E-5" d="5.520773098671019E-6"/>
+         <laneOffset s="15.532310676010493" a="3.390972650091068" b="-0.001018769708626975" c="-3.6907860740539953E-4" d="6.543840612977938E-6"/>
+         <laneOffset s="23.54124469529314" a="3.3625012564860777" b="-0.005671396958974662" c="-2.2094672705539047E-4" d="5.797423699086377E-6"/>
+         <laneOffset s="35.31186704293971" a="3.2745881426592414" b="-0.008463101367906116" c="-1.1364307090276778E-5" d="5.512320457921308E-6"/>
+         <laneOffset s="47.08248939058628" a="3.182387117662941" b="-0.006439475811674325" c="1.971064967095259E-4" d="5.2706346774548324E-6"/>
+         <laneOffset s="58.33700311855401" a="3.142393776020837" b="-0.0" c="0.008004841015864758" d="-0.00125374461456116"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="0.5663340591257442" b="0.001018671165720306" c="-5.672554505474962E-4" d="-1.9924221810589996E-4"/>
+                  <width sOffset="2.193730083709716" a="0.5637354153260654" b="-0.004346670170165789" c="0.0018125760334798196" d="1.5989134601162439E-4"/>
+                  <width sOffset="3.7460726010643786" a="0.5619538998748324" b="0.002436710322540958" c="-6.21623243727638E-5" d="-2.0320445356890923E-7"/>
+                  <width sOffset="11.77062234764657" a="0.5773995583055145" b="0.0013998059178069377" c="-7.883313026326809E-5" d="3.40304091927235E-6"/>
+                  <width sOffset="14.969310173656368" a="0.5811818848223176" b="9.999364689761553E-4" c="-9.9320427150985E-4" d="1.9532263255294316E-5"/>
+                  <width sOffset="15.532310676010493" a="0.5814335196411187" b="-9.983913962083031E-5" c="-6.031991201547146E-4" d="1.8509195746896416E-5"/>
+                  <width sOffset="23.54124469529314" a="0.5514513919450437" b="-0.006200095679242979" c="-1.5976729612622142E-4" d="1.8459691869870254E-5"/>
+                  <width sOffset="35.31186704293971" a="0.48644093706405434" b="-0.0022885814197081376" c="4.872143219806733E-4" d="1.8744816157595268E-5"/>
+                  <width sOffset="35.3451831540783" a="0.48636523191430214" b="-0.002256054828491144" c="-0.001350900450959699" d="1.6055200337486249E-4"/>
+                  <width sOffset="43.46258764981242" a="0.46491315149353785" b="0.007549735385074372" c="6.577252971356484E-4" d="-4.0347728322056783E-5"/>
+                  <width sOffset="47.08248939058628" a="0.4989472224660978" b="0.010725425076673538" c="2.4413365399042676E-4" d="-3.6394792878202036E-5"/>
+                  <width sOffset="55.680730338883365" a="0.5860808264657353" b="0.006851691504844271" c="-2.686620357434163E-4" d="-1.473437587739841E-5"/>
+                  <width sOffset="58.33700311855401" a="0.6021090135248506" b="0.0051125244314541565" c="-0.008015856828603181" d="0.0012442808733649662"/>
+                  <roadMark sOffset="0.0" type="curb" weight="standard" color="standard" width="0.12">
+                     <type name="curb" width="0.12">
+                        <line length="58.853111738232855" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.0"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.13041680493783328">
+                     <type name="solid" width="0.130417">
+                        <line length="58.853111738232855" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.130417"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="3.1680009983480266" b="-0.0026503849142673654" c="-5.613166727309231E-5" d="-6.451375895238607E-5"/>
+                  <width sOffset="3.7460726010643786" a="3.1538933501397315" b="-0.005786907853454424" c="0.0018382054198821831" d="9.558079151262061E-5"/>
+                  <width sOffset="4.917749746371527" a="3.149790243807797" b="-0.0010856935264953855" c="1.2849457382451647E-5" d="1.1915627616970752E-6"/>
+                  <width sOffset="11.77062234764657" a="3.14333703193575" b="-7.417081165041372E-4" c="-9.537253774759426E-6" d="5.404821820645111E-6"/>
+                  <width sOffset="12.141648588235704" a="3.143060801913592" b="-7.465531683750627E-4" c="0.001009854224175481" d="-2.2463862355605468E-5"/>
+                  <width sOffset="15.532310676010493" a="3.1512637068146123" b="0.005326822290726379" c="4.243369956003222E-4" d="-2.144079484132311E-5"/>
+                  <width sOffset="23.54124469529314" a="3.2101296270983357" b="0.007997964027820667" c="-9.93528078650604E-5" d="-2.215477728438344E-5"/>
+                  <width sOffset="33.07417731139438" a="3.2581516326008235" b="6.36507063262598E-5" c="3.0450926770444965E-4" d="-2.86814557226662E-5"/>
+                  <width sOffset="35.31186704293971" a="3.2594974521443394" b="9.955991128114162E-4" c="1.1692857840577854E-4" d="-2.8972187293623214E-5"/>
+                  <width sOffset="46.19392488121303" a="3.2468433591682437" b="-0.0067521420102004" c="-2.8259131299422256E-4" d="5.504643169050349E-6"/>
+                  <width sOffset="47.08248939058628" a="3.240624388180036" b="-0.0072413047113265095" c="-2.540971446306124E-4" d="5.262957389059505E-6"/>
+                  <width sOffset="58.33700311855401" a="3.1344446140915556" b="-0.010960901360792672" c="0.007553378162081675" d="-0.0012537522918495273"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.13237744300278567">
+                     <type name="solid" width="0.132377">
+                        <line length="58.853111738232855" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.132377"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="driving" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="3.413031262609586" b="0.0052241614277988915" c="-5.079330133425852E-4" d="-9.311284041987764E-5"/>
+                  <width sOffset="4.917749746371527" a="3.415364285377481" b="-0.006527209610761837" c="2.7967549391793423E-4" d="1.2763883310545871E-6"/>
+                  <width sOffset="8.740383414339822" a="3.394571217127959" b="-0.5947653930674026" c="-0.8489569785818145" d="2.6273872980659054"/>
+                  <width sOffset="9.143229093244937" a="3.1889670655256195" b="3.9111953899635937E-4" c="0.0024041597559287162" d="-5.367837682358575E-4"/>
+                  <width sOffset="11.190460683660266" a="3.1952382399007715" b="0.0034856276997126297" c="2.1044462369502505E-4" d="-6.002890885860274E-6"/>
+                  <width sOffset="12.141648588235704" a="3.198738962296355" b="0.0038696789625992" c="-8.200604937021732E-4" d="2.186579328814101E-5"/>
+                  <width sOffset="15.703951225668696" a="3.2031058188985346" b="-0.0011404976007692432" c="-2.892990081257208E-4" d="1.764876953927645E-5"/>
+                  <width sOffset="23.54124469529314" a="3.184893708542492" b="-0.002423009996673409" c="1.1703142071981102E-4" d="1.6938538507974323E-5"/>
+                  <width sOffset="33.07417731139438" a="3.187104995232935" b="0.004426256044181568" c="-4.3600881314475774E-4" d="2.3465216946325006E-5"/>
+                  <width sOffset="35.31186704293971" a="3.1950892958138617" b="0.0028274401543071405" c="-2.722293926819782E-4" d="2.278474515620118E-5"/>
+                  <width sOffset="41.56781266797088" a="3.207701977596447" b="0.002096505445513145" c="-6.638704525655082E-4" d="1.716732928932684E-4"/>
+                  <width sOffset="46.19392488121303" a="3.220189388710852" b="0.006976123268083199" c="0.0011723581361660347" d="1.3719646242982674E-4"/>
+                  <width sOffset="47.08248939058628" a="3.2274100079858843" b="0.009384524051814985" c="0.0015855884979111344" d="1.3047497145846266E-4"/>
+                  <width sOffset="49.66571193250237" a="3.2644821357230445" b="0.020188373554015464" c="1.18002265668542" d="-1.0719447346890316"/>
+                  <width sOffset="50.19796117139363" a="3.447886767096713" b="0.0035099632333800684" c="-2.5875089954915926E-4" d="-3.6537511466114092E-6"/>
+                  <width sOffset="54.64428451652745" a="3.4580565720166243" b="9.922812101234007E-4" c="4.694475611954934E-5" d="-7.597826496063761E-5"/>
+                  <roadMark sOffset="0.0" type="solid" weight="bold" color="standard" width="0.25">
+                     <type name="solid" width="0.25">
+                        <line length="8.740383414339822" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.25"/>
+                     </type>
+                  </roadMark>
+                  <roadMark sOffset="8.740383414339822" type="solid" weight="standard" color="standard" width="0.10751047125170603">
+                     <type name="solid" width="0.10751">
+                        <line length="41.457577757053805" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.10751"/>
+                     </type>
+                  </roadMark>
+                  <roadMark sOffset="50.19796117139363" type="solid" weight="bold" color="standard" width="0.25">
+                     <type name="solid" width="0.25">
+                        <line length="8.655150566839225" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.25"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-3" type="shoulder" level="false">
+                  <link/>
+                  <width sOffset="0.0" a="0.2823476856919864" b="0.09946130596195463" c="-0.015239979449150117" d="0.05833446511288345"/>
+                  <width sOffset="0.20688779286463976" a="0.302789276400516" b="0.10064596766443067" c="0.02305558885099727" d="-0.002539001554762091"/>
+                  <width sOffset="5.898003886849024" a="1.1543098921943447" b="0.11636437428187921" c="0.040957011681438275" d="-0.02476827429398923"/>
+                  <width sOffset="7.789503648009001" a="1.3533322298053725" b="0.005459063696909202" c="-3.030091634507275" d="1.9300709882340308"/>
+                  <width sOffset="8.740383414339822" a="0.2781943680718957" b="0.06873609168204808" c="3.3249560079450644" d="-0.6973150334433156"/>
+                  <width sOffset="8.836005027529948" a="0.31455906235305386" b="0.6854837210228115" c="0.11356156978903367" d="-2.631760155489133"/>
+                  <width sOffset="9.143229093244937" a="0.4595594833642851" b="0.010052526450863719" c="0.011875126091141363" d="-0.0038360736549961933"/>
+                  <width sOffset="11.190460683660266" a="0.49699530775888157" b="0.010442030017149564" c="-0.012787914348293225" d="-0.004366854532352393"/>
+                  <width sOffset="11.637375278824699" a="0.49871803883487953" b="-0.0036047914648750876" c="-0.0011855478737512566" d="1.70711469103917E-4"/>
+                  <width sOffset="15.356767201132161" a="0.47769340493334855" b="-0.005339021809907581" c="4.2363378921273957E-4" d="-5.522151579244351E-6"/>
+                  <width sOffset="15.703951225668696" a="0.4758906141997339" b="-0.005046860908721057" c="1.2079841452550754E-4" d="-1.3051278279832924E-6"/>
+                  <width sOffset="23.54124469529314" a="0.443128428266224" b="-0.003393890919273926" c="8.905693444617309E-5" d="-1.3653268230278706E-6"/>
+                  <width sOffset="35.31186704293971" a="0.4132922775348167" b="-0.001864867894350081" c="3.449355731212796E-5" d="-6.792267052535246E-7"/>
+                  <width sOffset="36.090306724089196" a="0.4118611719714247" b="-0.0018124003564747183" c="2.359987499646633E-5" d="4.981009285397438E-5"/>
+                  <width sOffset="41.56781266797088" a="0.41082769734624014" b="0.0029295038664846496" c="0.0016613665542308791" d="-9.907845488315813E-5"/>
+                  <width sOffset="43.14234237533002" a="0.41917230348519174" b="0.007424356644164335" c="-0.0012044625996243835" d="1.9471199552799657E-4"/>
+                  <width sOffset="47.08248939058628" a="0.44163686900873866" b="0.007001407334315118" c="0.0011121936287707352" d="1.9497475368015677E-4"/>
+                  <width sOffset="49.55942890753202" a="0.46876544632269734" b="0.016099724539425268" c="5.151816434659508" d="-6.447746590974853"/>
+                  <width sOffset="49.66571193250237" a="0.5209308649645732" b="0.8926981831208622" c="1.9185324683412912" d="-5.375671381314102"/>
+                  <width sOffset="50.09052943042839" a="0.8342666650939567" b="-0.3876902264910263" c="0.13718922730687988" d="1.0931437831505784"/>
+                  <width sOffset="50.19796117139363" a="0.7955552332791265" b="0.04143600937663828" c="-0.04183965337557619" d="0.02120270221334607"/>
+                  <width sOffset="51.64350145721423" a="0.8320695661641464" b="0.053388855166024964" c="15.21464164010273" d="-39.19187389563521"/>
+                  <width sOffset="51.903967326443585" a="1.1856286000181835" b="0.002558101393894668" c="-1.237173359585064" d="1.6503929002682616"/>
+                  <width sOffset="52.281584596666896" a="1.099047577571243" b="-0.22578560196037814" c="-0.00748739928416905" d="0.01557442545775286"/>
+                  <width sOffset="53.3680813088334" a="0.8648690576779168" b="-0.1869000067619341" c="0.04457100968620868" d="-0.00830991591824274"/>
+                  <width sOffset="54.64428451652745" a="0.6816666968011691" b="-0.11373962192731381" c="0.012401152701888914" d="-0.008237591404428828"/>
+                  <width sOffset="55.55075161485966" a="0.5826196924186795" b="-0.11156320469365284" c="0.010467686800962375" d="-6.159659329763509E-4"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects>
+         <object type="railing" name="" id="256202" s="43.151758916677586" t="-6.319899648189793" zOffset="0.0" validLength="3.8252312523448424" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="43.151758916677586" length="3.8252312523448424" distance="0.0" tStart="-6.319899648189793" tEnd="-6.355779341773268" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.4611330803314286" zOffsetEnd="-0.08360737087549125"/>
+         </object>
+         <object type="railing" name="" id="256211" s="9.900079036373734" t="-6.223581687294977" zOffset="0.0" validLength="0.47396649087145093" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="9.900079036373734" length="0.47396649087145093" distance="0.0" tStart="-6.223581687294977" tEnd="-6.086420482023722" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="-0.09729351457216523" zOffsetEnd="-0.030750000976134395"/>
+         </object>
+         <object type="railing" name="" id="268691667" s="10.374045527245185" t="-6.086420482023722" zOffset="0.0" validLength="2.1868872212203687" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="10.374045527245185" length="2.1868872212203687" distance="0.0" tStart="-6.086420482023722" tEnd="-5.928846895572244" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="-0.030750000976134395" zOffsetEnd="0.23284798588377215"/>
+         </object>
+         <object type="railing" name="" id="537127123" s="12.560932748465554" t="-5.928846895572244" zOffset="0.0" validLength="2.1868865488393414" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="12.560932748465554" length="2.1868865488393414" distance="0.0" tStart="-5.928846895572244" tEnd="-5.876322366755199" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.23284798588377215" zOffsetEnd="0.4250504838459716"/>
+         </object>
+         <object type="railing" name="" id="256212" s="14.747819297304895" t="-5.876322366755199" zOffset="0.0" validLength="15.481113691863607" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="14.747819297304895" length="15.481113691863607" distance="0.0" tStart="-5.876322366755199" tEnd="-5.965393454625813" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.4250504838459716" zOffsetEnd="0.4439943428173973"/>
+         </object>
+         <object type="railing" name="" id="268691668" s="30.228932989168502" t="-5.965393454625813" zOffset="0.0" validLength="12.922825927509084" orientation="none" length="0.0" width="0.08" height="0.18" hdg="0.0" pitch="0.0" roll="0.0">
+            <repeat s="30.228932989168502" length="12.922825927509084" distance="0.0" tStart="-5.965393454625813" tEnd="-6.319899648189793" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.4439943428173973" zOffsetEnd="0.4611330803314286"/>
+         </object>
+         <object type="pole" name="Guidepost" id="256751" s="10.170573631181876" t="-4.150682146579666" zOffset="-0.019721421530263683" validLength="0.0" orientation="none" radius="0.0" height="1.1455537797883153" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256752" s="29.850121973835364" t="-4.369845883676811" zOffset="-0.0429243130637218" validLength="0.0" orientation="none" radius="0.0" height="0.965790475718677" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256753" s="48.6464956061557" t="-4.659138225838869" zOffset="0.03268911367726446" validLength="0.0" orientation="none" radius="0.0" height="1.0275485077872872" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="FlagPole" id="256824" s="4.545465143765653" t="6.504341911272189" zOffset="0.3106561780674326" validLength="0.0" orientation="none" radius="0.06978973868405583" height="7.709907037205994" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Pole" id="256845" s="10.196563139458142" t="-5.331141816374437" zOffset="0.07442018483158108" validLength="0.0" orientation="none" radius="0.03445418826320364" height="1.435732714831829" hdg="0.0" pitch="0.0" roll="0.0"/>
+      </objects>
+      <signals/>
+   </road>
+   <road length="4.999999999999767" id="2233902" junction="2104811">
+      <link>
+         <predecessor elementType="road" elementId="255970" contactPoint="end"/>
+         <successor elementType="road" elementId="255961" contactPoint="end"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618318.5293656532" y="5809536.507691858" hdg="3.4731207445975563" length="4.999999999999767">
+            <paramPoly3 aU="0.0" bU="5.001582164343699" cU="-0.026136474972031393" dU="-0.02693650454585527" aV="0.0" bV="2.220446049250313E-16" cV="-0.5858041165432595" dV="-0.0294342874792502" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="102.45536017224359" b="0.00141249836027124" c="1.544283301427784E-5" d="-4.506777825549351E-5"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.037501216074233755" b="-0.0014550919130127797" c="-0.0" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="1.6547434877531972" b="0.0038418678233543098" c="-0.012842276816175396" d="0.0029248816429530847"/>
+         <laneOffset s="2.769012696379953" a="1.629013183144693" b="-0.0" c="0.12892386858864774" d="-0.036888767501981855"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.3968044972280791" b="-0.17967823158902863" c="0.028118718312709207" d="0.005667723665147701"/>
+                  <width sOffset="0.8887731066535487" a="0.26330185680619067" b="-0.11626480570712047" c="0.03503257060096162" d="-0.002885387849986694"/>
+                  <width sOffset="2.769012696379953" a="0.1493670582355382" b="-0.015127696276104571" c="-0.09871213299141732" d="0.03692826129497876"/>
+                  <width sOffset="3.0192511675747014" a="0.13997889956549847" b="-0.05759357798953384" c="-0.048881464806656325" d="0.021345394974623205"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.16">
+                     <type name="solid" width="0.16">
+                        <line length="4.999999999999767" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.16"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                     <successor id="3"/>
+                  </link>
+                  <width sOffset="0.0" a="4.561512992315297" b="-0.0881751006775936" c="-0.01677700759145484" d="0.0029354359718851827"/>
+                  <width sOffset="2.769012696379953" a="4.251041336914881" b="-0.11356483367170342" c="0.1250768130258125" d="-0.03687821317304973"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.11335667116327237">
+                     <type name="solid" width="0.113357">
+                        <line length="4.999999999999767" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.113357"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="3.907985046680551E-14" max="40.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="-2"/>
+                     <successor id="4"/>
+                  </link>
+                  <width sOffset="0.0" a="0.5222885185797601" b="0.010530139996037968" c="0.03374394811969481" d="-0.02522511871320757"/>
+                  <width sOffset="0.8302046113963719" a="0.5398542933945705" b="0.01440044314773739" c="-0.008477345643167319" d="7.220446337234257E-6"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects>
+         <object type="pole" name="Guidepost" id="256720" s="0.9083064685816225" t="-4.159291428790483" zOffset="-0.11607312869635678" validLength="0.0" orientation="none" radius="0.0" height="0.9909190656617284" hdg="0.0" pitch="0.0" roll="0.0"/>
+      </objects>
+      <signals/>
+   </road>
+   <road length="4.999999999999963" id="2233951" junction="2104811">
+      <link>
+         <predecessor elementType="road" elementId="2233865" contactPoint="end"/>
+         <successor elementType="road" elementId="255961" contactPoint="end"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618319.0396871859" y="5809530.707504605" hdg="3.229341654717609" length="4.999999999999963">
+            <paramPoly3 aU="0.0" bU="4.999811302948089" cU="1.1086933337972073E-4" dU="6.225697045973542E-6" aV="0.0" bV="2.7755575615628914E-16" cV="-0.021777941462436987" dV="-0.0012382095331758044" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="102.60840803255327" b="0.00120598010584234" c="1.301888389662073E-6" d="5.557005693275621E-13"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.02797236890844117" b="4.506775201458083E-4" c="-5.551115123125866E-19" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="3.1443536519858677" b="0.008182776981112248" c="0.005631448546337454" d="-8.121928171531387E-4"/>
+         <laneOffset s="3.330344938563641" a="3.2040642465498395" b="0.01866753669762304" c="-0.002674399196135868" d="0.0017574818375645485"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="1"/>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.6027835201993734" b="-0.002173943666991647" c="-0.005765522644143151" d="8.082445267306718E-4"/>
+                  <width sOffset="3.330344938563641" a="0.5614515309340247" b="-0.013683103175062416" c="0.0025008775912564885" d="-0.0017614301279869756"/>
+                  <roadMark sOffset="0.0" type="curb" weight="standard" color="standard" width="0.12">
+                     <type name="curb" width="0.12">
+                        <line length="4.999999999999963" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.0"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.13041680493783328">
+                     <type name="solid" width="0.130417">
+                        <line length="4.999999999999963" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.130417"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                     <successor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="3.1306272180235153" b="-0.0041260277069399345" c="0.005356048457651497" d="-8.12146117166516E-4"/>
+                  <width sOffset="3.330344938563641" a="3.1462924554259377" b="0.004525931303012352" c="-0.0029493327036295976" d="0.0017575285375511737"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.13237744300278567">
+                     <type name="solid" width="0.132377">
+                        <line length="4.999999999999963" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.132377"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="driving" level="false">
+                  <link>
+                     <predecessor id="-2"/>
+                     <successor id="2"/>
+                  </link>
+                  <width sOffset="0.0" a="3.4573998576644724" b="-0.002564205043674748" c="0.0015366698931675612" d="-0.002104267762315082"/>
+                  <width sOffset="0.5935248137163285" a="3.4559792991584812" b="-0.002963923593553375" c="-0.0011786467187141656" d="6.82463428000011E-5"/>
+                  <roadMark sOffset="0.0" type="solid" weight="bold" color="standard" width="0.25">
+                     <type name="solid" width="0.25">
+                        <line length="4.999999999999963" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.25"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-3" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="-3"/>
+                  </link>
+                  <width sOffset="0.0" a="0.30617053888100676" b="-0.06216374247571461" c="-4.5784969223651613E-4" d="0.0016701817165717106"/>
+                  <width sOffset="0.5935248137163285" a="0.2694627326466832" b="-0.0609421595019511" c="0.0014845444013353623" d="-5.023323885433686E-4"/>
+                  <width sOffset="2.5516614931053425" a="0.152050289526926" b="-0.0609065559227958" c="-0.026343279041602753" d="0.010559984113785371"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects/>
+      <signals/>
+   </road>
+   <road length="60.94955325531674" id="2233980" junction="-1">
+      <link>
+         <predecessor elementType="junction" elementId="2104816"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618251.5802006853" y="5809354.320905356" hdg="3.6353125800829496" length="30.986346998274815">
+            <paramPoly3 aU="0.0" bU="31.10563461430499" cU="-0.18269614856901306" dU="-1.2111571856528027" aV="0.0" bV="-5.329070518200751E-15" cV="-5.761487278364629" dV="-1.5768783706798755" pRange="normalized"/>
+         </geometry>
+         <geometry s="30.986346998274815" x="618221.9390302845" y="5809346.70233761" hdg="3.095176668761238" length="29.96320625704192">
+            <paramPoly3 aU="-0.0" bU="30.14871129910815" cU="-0.8432261889365885" dU="-1.0383122113033834" aV="-0.0" bV="-0.0" cV="-9.9732795492477" dV="1.2991737903323306" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="106.70156242763748" b="0.028657300354515743" c="-2.76597999084154E-6" d="6.619108346518849E-7"/>
+         <elevation s="10.158258875886123" a="106.99307911801124" b="0.028806013453605776" c="4.66352579056749E-5" d="-8.68847449657006E-7"/>
+         <elevation s="20.316517751772246" a="107.28959960796534" b="0.029484509811440334" c="2.1072330418953186E-4" d="-1.656703966224069E-5"/>
+         <elevation s="30.47477662765837" a="107.59348935856106" b="0.028637003990770137" c="-1.0520623162292224E-4" d="8.617237807180075E-6"/>
+         <elevation s="40.63303550354449" a="107.88256807704711" b="0.02916722380137654" c="1.0206610058627945E-4" d="-1.4670938962180862E-6"/>
+         <elevation s="50.79129437943061" a="108.1878506545924" b="0.030786682305139423" c="7.898372301164635E-5" d="6.619108346400237E-7"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.03486868826716109" b="-3.379859369454574E-5" c="1.6636017110558934E-6" d="0.0"/>
+         <superelevation s="10.158258875886123" a="0.03469702083496604" b="0.0" c="2.4787514106058694E-5" d="0.0"/>
+         <superelevation s="20.316517751772246" a="0.037254849952841104" b="5.035959703580477E-4" c="8.444243990537492E-5" d="-5.731003433504409E-6"/>
+         <superelevation s="30.47477662765837" a="0.045076715488675936" b="4.4502172605029414E-4" c="-3.495638681199362E-5" d="1.2848616779926802E-6"/>
+         <superelevation s="40.63303550354449" a="0.04733703843798222" b="1.325851635766971E-4" c="-6.5259787723777415E-6" d="0.0"/>
+         <superelevation s="50.79129437943061" a="0.048010455645339116" b="0.0" c="-3.735216488562313E-5" d="1.0115311586982526E-6"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="2.3325255743577933" b="0.023919631930540412" c="-0.01246133185996145" d="0.0021023180765529417"/>
+         <laneOffset s="1.6422853636639632" a="2.3475109908706955" b="-0.0" c="-0.0033443787473833504" d="5.810779855706087E-4"/>
+         <laneOffset s="5.479267467536795" a="2.3310985283467947" b="-0.0" c="1.0640638019258427E-4" d="6.039640741263992E-8"/>
+         <laneOffset s="10.083661082979356" a="2.3333602860916725" b="9.83715006539393E-4" c="0.008284924574380707" d="-7.352622683868577E-4"/>
+         <laneOffset s="16.701023091403293" a="2.4896048570834832" b="0.014042148169141037" c="-0.020952956530949206" d="0.038198995099025336"/>
+         <laneOffset s="17.213282213462" a="2.4964345931918452" b="0.022646789020540504" c="-0.007343645457961604" d="7.937711036888433E-4"/>
+         <laneOffset s="20.299386279126512" a="2.5197144380943906" b="-0.0" c="-0.012638678976532737" d="0.0013959988455394534"/>
+         <laneOffset s="25.021408722374847" a="2.3848872529426064" b="-0.02597841572751734" c="-0.004221137228534822" d="0.0011015063128251648"/>
+         <laneOffset s="29.379894059055722" a="2.2826740943513277" b="-0.0" c="0.0012758374170185323" d="-9.163369788393288E-5"/>
+         <laneOffset s="30.47477662765837" a="2.284083257068885" b="0.0024642417065449036" c="0.001158275569532313" d="-6.669769953430166E-6"/>
+         <laneOffset s="33.75854001044837" a="2.304428876388022" b="0.009855485083109707" c="0.008120286564379063" d="-7.608693642670935E-4"/>
+         <laneOffset s="41.43584964860538" a="2.514410779016088" b="-0.0" c="-0.0034195721600538604" d="2.772932879694168E-4"/>
+         <laneOffset s="46.81273840999047" a="2.458653240947915" b="-0.012722895428826042" c="-0.003086225131787242" d="3.710622396680394E-4"/>
+         <laneOffset s="50.79129437943061" a="2.382551004840279" b="-0.019659804552189186" c="0.0013334394340485712" d="3.738701505595196E-4"/>
+         <laneOffset s="53.95462600739923" a="2.3455384452691543" b="-0.0" c="0.01037400219163489" d="-0.0014011655896198124"/>
+         <laneOffset s="57.5724095356444" a="2.4149707219953487" b="0.0200449193798581" c="1.8541475150919725E-4" d="8.131364147942793E-6"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <successor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.26522696625871456" b="0.054593408727414895" c="0.00846792473359103" d="-0.0018949773407784829"/>
+                  <width sOffset="1.6422853636639632" a="0.369330141157314" b="0.06707406935994359" c="3.7250958797410564E-4" d="-3.7373724979615367E-4"/>
+                  <width sOffset="5.479267467536795" a="0.6110640842081527" b="0.05342573124223848" c="-6.915874618911307E-4" d="2.072803393670097E-4"/>
+                  <width sOffset="6.930668093510709" a="0.6877831038818272" b="0.05272813805586429" c="-0.0012268896022231762" d="5.072432477933864E-8"/>
+                  <width sOffset="10.083661082979356" a="0.8418391863816082" b="0.04499290223359082" c="-0.009404093729454773" d="7.353733894379955E-4"/>
+                  <width sOffset="10.158258875886123" a="0.8451435306663577" b="0.043602129645808486" c="-0.009231187005789695" d="7.344330384207749E-4"/>
+                  <width sOffset="16.701023091403293" a="0.9409563293201657" b="0.017125477251199256" c="0.019825870903806834" d="-0.03819982432899142"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.14">
+                     <type name="solid" width="0.14">
+                        <line length="17.213282213462" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.14"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="4.191402155520993" b="-0.013717605772945549" c="0.0024902104097899863" d="0.0012095225405902763"/>
+                  <width sOffset="1.4458943413823393" a="4.180430153783551" b="0.0010694778834819153" c="-0.003111394121414876" d="0.0021026404609345833"/>
+                  <width sOffset="1.6422853636639632" a="4.180536111780047" b="9.067109415844463E-5" c="-0.003113440500683074" d="5.814003699463209E-4"/>
+                  <width sOffset="4.519653441037741" a="4.16887043891456" b="-0.0033856856228454482" c="0.005424484909904753" d="-2.6444870296281244E-4"/>
+                  <width sOffset="5.479267467536795" a="4.1703829884869315" b="0.006294578021472428" c="0.001425206488757037" d="-8.454662921252437E-4"/>
+                  <width sOffset="7.65804441609907" a="4.1821185309463145" b="4.6453165442560736E-4" c="-0.0023278060057522983" d="8.49757959210072E-5"/>
+                  <width sOffset="10.083661082979356" a="4.170762112875452" b="-0.009328303523007817" c="0.006468234042674474" d="-6.503468693048728E-4"/>
+                  <width sOffset="10.158258875886123" a="4.170101966673838" b="-0.008374128766529145" c="0.006326986112468855" d="-6.508753499364623E-4"/>
+                  <width sOffset="16.701023091403293" a="4.203858255940533" b="-0.009169726409158965" c="-0.021089977034688196" d="0.03828338201747573"/>
+                  <roadMark sOffset="0.0" type="solid" weight="bold" color="standard" width="0.3">
+                     <type name="solid" width="0.3">
+                        <line length="17.213282213462" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.3"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="2.3803181647963356E-13" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link>
+                     <successor id="-2"/>
+                  </link>
+                  <width sOffset="0.0" a="2.2705728437292243" b="-0.043309818072374474" c="-0.006182478066219544" d="0.002390931901807335"/>
+                  <width sOffset="1.4458943413823393" a="2.2022535829131806" b="-0.04619271654376387" c="0.015036756579004554" d="0.0014978139814690432"/>
+                  <width sOffset="2.719807326366613" a="2.170907089883176" b="-5.894760764544281E-4" c="0.003540291130047201" d="-1.5957128174501627E-4"/>
+                  <width sOffset="4.519653441037741" a="2.1803843246722137" b="0.01060371472542268" c="-8.405369409547453E-4" d="6.86277791163429E-4"/>
+                  <width sOffset="7.65804441609907" a="2.226597988080801" b="0.02560632264008874" c="0.0038476522278649474" d="-2.4416429688289224E-4"/>
+                  <width sOffset="10.158258875886123" a="2.3108551896048266" b="0.04026736806117789" c="0.0020225453962719134" d="-2.4476064766844704E-4"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+         <laneSection s="17.213282213462">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.9497966243075169" b="-2.2332704012255826" c="-6.269023795780116" d="25.122915220523666"/>
+                  <width sOffset="0.27116072458198204" a="0.3841710137578027" b="-0.09137289721365571" c="0.026362600364060792" d="-0.0034490729443560266"/>
+                  <width sOffset="3.086104065664511" a="0.25892348572967183" b="-0.024944834051188816" c="0.00987977982066528" d="-0.004051300686207113"/>
+                  <width sOffset="3.7850279415731904" a="0.24493196734703515" b="-0.01707152137435288" c="0.00977870363993445" d="-0.0012862010982504935"/>
+                  <width sOffset="7.808126508912846" a="0.2507718497219047" b="-8.428812800999781E-4" c="0.0056134341430479195" d="-9.917085655362003E-4"/>
+                  <width sOffset="12.16661184559372" a="0.2716241600539595" b="-0.008427401690094215" c="0.0015521151121740883" d="2.0143144516482762E-4"/>
+                  <width sOffset="12.53172203835593" a="0.26876393911236596" b="-0.007213459864448392" c="-4.598380115212378E-4" d="8.770537401897362E-5"/>
+                  <width sOffset="13.261494414196367" a="0.2632889474626534" b="-0.007744486867426008" c="-4.51245702046921E-4" d="2.7414460900058808E-6"/>
+                  <width sOffset="16.54525779698637" a="0.23308912894784184" b="-0.010619371215400715" c="-0.007451955755066772" d="7.569410404012654E-4"/>
+                  <width sOffset="17.119654756755217" a="0.22467420603472732" b="-0.018430915762590695" c="0.034100363975298635" d="-0.006260527768063323"/>
+                  <width sOffset="20.70290835891589" a="0.3084363349913901" b="-0.015200426592061528" c="1.4772896835720754E-4" d="7.562404608064604E-4"/>
+                  <width sOffset="23.41975329008249" a="0.2833949776661826" b="0.0023482782968972243" c="0.0063360102464243544" d="7.602765272843207E-4"/>
+                  <width sOffset="24.222567435143375" a="0.2897572181015353" b="0.013991574326756668" c="0.0021826621106420152" d="-2.778861249532662E-4"/>
+                  <width sOffset="29.59945619652847" a="0.3848935146375787" b="0.013361595858009586" c="0.001839752226821165" d="-3.71655076666331E-4"/>
+                  <width sOffset="29.855612478704714" a="0.38843064184979736" b="0.014230964434979369" c="-0.007373142902277937" d="8.009612514842312E-4"/>
+                  <width sOffset="33.57801216596861" a="0.38055220709511595" b="-0.007365624546187766" c="0.0015688915005163731" d="8.075526440181047E-4"/>
+                  <width sOffset="34.65105708647821" a="0.37545277908507746" b="-0.0012091325533230782" c="-0.0037387907048603525" d="2.2036163147457822E-4"/>
+                  <width sOffset="36.741343793937226" a="0.3586020345573879" b="-0.013950944327615403" c="-0.007849470679075925" d="0.001995397371653903"/>
+                  <width sOffset="38.46068460339454" a="0.3215533350278519" b="-0.023246795897694503" c="-0.0012569535022271614" d="0.001404592413036575"/>
+                  <width sOffset="40.359127322182395" a="0.28250088748497104" b="-0.012832494031170122" c="0.0017239072846687022" d="-4.704540731207998E-6"/>
+                  <roadMark sOffset="0.0" type="curb" weight="standard" color="standard" width="0.12">
+                     <type name="curb" width="0.12">
+                        <line length="43.736271041854735" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.0"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.14">
+                     <type name="solid" width="0.14">
+                        <line length="43.736271041854735" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.14"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="4.1987728855124855" b="-6.390337996846837E-4" c="7.729757562942446E-4" d="-1.4873825308592216E-4"/>
+                  <width sOffset="2.801427907596974" a="4.199778890867471" b="1.8994522980570958E-4" c="6.295952694348123E-4" d="7.885037801559278E-4"/>
+                  <width sOffset="3.086104065664511" a="4.199902177491285" b="7.401090118877377E-4" c="-0.011341014259772176" d="0.001390731522012811"/>
+                  <width sOffset="7.04373010895139" a="4.11140716872778" b="-0.023678612457378456" c="0.01144263213298303" d="4.3385593873398196E-4"/>
+                  <width sOffset="7.808126508912846" a="4.100187050456148" b="-0.005424690349232243" c="0.0010792739958342549" d="1.3936340601967165E-4"/>
+                  <width sOffset="11.058032475153269" a="4.0987401580163425" b="0.006006210034385055" c="0.011885067813573286" d="-2.4376934793172425E-4"/>
+                  <width sOffset="12.16661184559372" a="4.119672543391793" b="0.03145855230410393" c="0.0021686321102093523" d="-0.0014369093586406516"/>
+                  <width sOffset="13.261494414196367" a="4.154829692453674" b="0.03103978511424507" c="-0.0022488874566328736" d="-0.0013486933887027204"/>
+                  <width sOffset="15.210538182881216" a="4.196798894107811" b="0.0069032904707006315" c="-0.009738948234558705" d="0.0012652549713015218"/>
+                  <width sOffset="16.54525779698637" a="4.191671631673914" b="-0.01233217419082305" c="0.0023550504804423092" d="5.110553769876908E-4"/>
+                  <width sOffset="19.38532059572502" a="4.187350384136898" b="0.013411259953938447" c="-0.0019653666956379826" d="-3.5518604425678764E-4"/>
+                  <width sOffset="23.41975329008249" a="4.186143614232315" b="-0.01979073311384732" c="-0.006250223712751976" d="-3.5466914403651785E-4"/>
+                  <width sOffset="24.222567435143375" a="4.1660434849309205" b="-0.03051203314351054" c="-0.0011199935431324337" d="6.834935082009512E-4"/>
+                  <width sOffset="27.683361540161876" a="4.075364335939979" b="-0.013705365491224739" c="0.00678967996932001" d="-3.2730533949925056E-4"/>
+                  <width sOffset="29.59945619652847" a="4.071728793624257" b="0.0087089486603644" c="7.686574704710005E-4" d="-2.3353638780074167E-4"/>
+                  <width sOffset="33.57801216596861" a="4.103837608324222" b="0.003735364482972608" c="-0.0020279663989897466" d="-2.3072847692845358E-4"/>
+                  <width sOffset="33.7580030638282" a="4.104442895060674" b="0.0029829089571272206" c="0.010220595680023084" d="-0.00306376779075899"/>
+                  <width sOffset="36.28978114150833" a="4.12778777045265" b="-0.004179868518280111" c="4.6771389149572254E-4" d="7.699248413105123E-4"/>
+                  <width sOffset="36.741343793937226" a="4.126066561770269" b="-0.0032864808488484772" c="0.007003258743574599" d="-0.0010051108988574002"/>
+                  <width sOffset="38.828205507647105" a="4.140572550317636" b="0.012811435033016972" c="-3.2170317303493903E-4" d="-0.0013985778810013374"/>
+                  <width sOffset="40.359127322182395" a="4.1544136993103" b="0.001992798645938862" c="-0.001726289403803271" d="1.0719072766485454E-5"/>
+                  <roadMark sOffset="0.0" type="solid" weight="bold" color="standard" width="0.3">
+                     <type name="solid" width="0.3">
+                        <line length="43.736271041854735" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.3"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="2.3803181647963356E-13" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="-2"/>
+                  </link>
+                  <width sOffset="0.0" a="2.609663045542815" b="0.032257902704487584" c="-0.004589755918893599" d="2.1221545044675019E-4"/>
+                  <width sOffset="2.801427907596974" a="2.668676522001483" b="0.011538561560677379" c="-0.003912895055481622" d="-7.250265827841901E-4"/>
+                  <width sOffset="3.103235538310244" a="2.671782599035046" b="0.00897855505976288" c="-0.004242629513829109" d="-8.680706567699688E-4"/>
+                  <width sOffset="4.212943319317379" a="2.6753353166066978" b="-0.0036445632776467623" c="-0.001611453158529196" d="1.1728164487017662E-5"/>
+                  <width sOffset="7.04373010895139" a="2.6523712334686316" b="-0.012485978108125198" c="-0.007783513879782335" d="9.686037477658724E-4"/>
+                  <width sOffset="11.058032475153269" a="2.5394783263630973" b="-0.028150680367189148" c="-0.005565748853719224" d="0.0013517365017170718"/>
+                  <width sOffset="13.261494414196367" a="2.4648876474806025" b="-0.03298947817566667" c="0.003311544300585698" d="0.0013511264199700661"/>
+                  <width sOffset="15.210538182881216" a="2.423173213462342" b="-0.004682926541878794" c="0.010815831331803158" d="-0.0012628219400340026"/>
+                  <width sOffset="19.38532059572502" a="2.5002452680741367" b="0.019596114176396735" c="0.0036745161232960215" d="-3.9658051878953255E-4"/>
+                  <width sOffset="23.41975329008249" a="2.6130710064413663" b="0.02988028661302681" c="-0.001117186876878916" d="-3.972285214159841E-4"/>
+                  <width sOffset="27.683361540161876" a="2.6893728732109228" b="-0.0013090913621258882" c="-0.0070114498805583375" d="6.135703262840932E-4"/>
+                  <width sOffset="29.583829196355964" a="2.665772779006421" b="-0.02131092065236984" c="-0.0033911947174872052" d="5.939378564861508E-4"/>
+                  <width sOffset="33.57801216596861" a="2.5643980719514827" b="-0.019974866532188197" c="0.0037133411062533783" d="5.956801812801493E-4"/>
+                  <width sOffset="33.7580030638282" a="2.5609265513539414" b="-0.018580237074591367" c="-0.008338157017898617" d="0.003428719495177006"/>
+                  <width sOffset="36.28978114150833" a="2.516081545209965" b="0.005132286322828321" c="0.004186654944608811" d="-4.0497313690392026E-4"/>
+                  <width sOffset="38.828205507647105" a="2.549462610113271" b="0.01855884756677863" c="0.0021350534675985246" d="-1.1506154760031289E-5"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects>
+         <object type="pole" name="Guidepost" id="428787" s="20.55745041104982" t="-5.212645213992711" zOffset="-0.1240915477767146" validLength="0.0" orientation="none" radius="0.0" height="0.9758895020931959" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="428790" s="42.10934103326444" t="-5.162126528329244" zOffset="-0.20862034532886753" validLength="0.0" orientation="none" radius="0.0" height="1.0103901186957955" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="428793" s="48.110805042729694" t="3.4305616685337395" zOffset="0.21667837546084456" validLength="0.0" orientation="none" radius="0.0" height="0.8863060344010592" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="428796" s="29.244532926753738" t="3.2226009491564986" zOffset="0.3054578027860657" validLength="0.0" orientation="none" radius="0.0" height="0.9000925365835428" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="428852" s="23.688698262898118" t="3.6286311099255917" zOffset="0.3406850342982608" validLength="0.0" orientation="none" radius="0.03998224092937806" height="1.2207705499604344" hdg="0.0" pitch="0.0" roll="0.0"/>
+      </objects>
+      <signals>
+         <signal s="23.604669906237657" t="3.6527521725660566" id="429071" dynamic="no" orientation="+" zOffset="1.0408217208904205" country="DEU" type="222" subtype="-1" height="0.7499999977224876" width="0.7498158958862474" hOffset="0.1663397025452789"/>
+      </signals>
+   </road>
+   <road length="77.21606328278918" id="2234012" junction="-1">
+      <link>
+         <predecessor elementType="junction" elementId="2104816"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618254.1224685742" y="5809350.191121091" hdg="3.8080959601364275" length="9.010539338002687">
+            <paramPoly3 aU="0.0" bU="6.580965350945594" cU="-0.13241433888416243" dU="2.498584918721682" aV="0.0" bV="-4.440892098500626E-16" cV="0.013214183189588877" dV="-0.9134974674224383" pRange="normalized"/>
+         </geometry>
+         <geometry s="9.010539338002687" x="618246.533532298" y="5809345.367243237" hdg="3.6140661309032995" length="52.001566724734985">
+            <paramPoly3 aU="0.0" bU="47.601235010502435" cU="7.334524848824388" dU="-3.10727673579335" aV="0.0" bV="-7.105427357601002E-15" cV="-14.36759181658137" dV="11.293723774129804" pRange="normalized"/>
+         </geometry>
+         <geometry s="61.01210606273767" x="618198.9842129514" y="5809324.517721484" hdg="3.7109504797103137" length="16.2039572200515">
+            <paramPoly3 aU="0.0" bU="15.600089010755301" cU="1.8094742346738415" dU="-1.322518848464062" aV="0.0" bV="4.440892098500626E-15" cV="1.6866990035376288" dV="-0.008741831252380483" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="106.82387628914633" b="0.024953684515132142" c="2.4784942840994946E-5" d="8.019479775210525E-8"/>
+         <elevation s="11.030866183255597" a="107.10226051620981" b="0.025529757601886683" c="4.378239841162073E-5" d="-1.4014296777274169E-6"/>
+         <elevation s="22.061732366511194" a="107.38732224941315" b="0.025984095231650524" c="-5.413807103218568E-5" d="6.234482223423641E-6"/>
+         <elevation s="33.09259854976679" a="107.6757299516685" b="0.027065551152247083" c="4.954508244523986E-4" d="-3.259350544622336E-5"/>
+         <elevation s="44.12346473302239" a="107.9908247123486" b="0.026098120558131557" c="1.4433961900993455E-5" d="8.019479775824031E-8"/>
+         <elevation s="55.154330916277985" a="108.28057355280632" b="0.02644583307365917" c="-1.2381720597913172E-4" d="9.535894306597477E-6"/>
+         <elevation s="65.01193177383352" a="108.53836871431535" b="0.02678462607639633" c="1.2665027860986726E-4" d="-3.7498350367763613E-6"/>
+         <elevation s="66.18519709953358" a="108.5699624717775" b="0.027066329313753364" c="-3.2667121885003695E-5" d="-1.3205534545629472E-5"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.03210270167787861" b="-4.4336605702839334E-4" c="-1.7621158051925727E-5" d="-1.2924132666095174E-21"/>
+         <superelevation s="11.030866183255597" a="0.025067847366606312" b="-8.321193299579742E-4" c="-3.2728240599591835E-6" d="-1.3007440896841638E-6"/>
+         <superelevation s="22.061732366511194" a="0.013744707723345165" b="-0.0013791471551055968" c="-8.012972895998481E-5" d="4.365952420780666E-6"/>
+         <superelevation s="33.09259854976679" a="-0.005358528063368663" b="-0.0015532004036959595" c="-8.588143843568368E-6" d="2.2463230270512863E-6"/>
+         <superelevation s="44.12346473302239" a="-0.020521583894552234" b="-9.226719179175974E-4" c="9.456834771966008E-5" d="-4.8589760079813456E-6"/>
+         <superelevation s="55.154330916277985" a="-0.025714268978562282" b="-6.100510697270741E-4" c="-8.315037784503833E-5" d="6.393087916193143E-6"/>
+         <superelevation s="66.18519709953358" a="-0.0339803673247748" b="-1.1075947111742349E-4" c="5.020433993005546E-6" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="-2.0068400163580686" b="-0.03800985774790663" c="-0.006018744650475713" d="0.005369671990680604"/>
+         <laneOffset s="0.432821211043815" a="-2.023983620836402" b="-0.04020216881340668" c="-0.006769990359677059" d="0.0017535875434188366"/>
+         <laneOffset s="3.5564027076590286" a="-2.1621691490191086" b="-0.03116739646634093" c="0.014155592432601187" d="-0.003166743305332772"/>
+         <laneOffset s="6.6975955092837545" a="-2.218548846874229" b="-0.035976151025957324" c="-0.013557582821738271" d="0.002001241880963659"/>
+         <laneOffset s="10.198011776965727" a="-2.4247663842143354" b="-0.05732738368084479" c="-0.0028528629423805155" d="6.087131560322445E-4"/>
+         <laneOffset s="15.66600482787674" a="-2.724012886804576" b="-0.03392660416296384" c="0.004016109000395497" d="-6.161667737202979E-5"/>
+         <laneOffset s="18.661196916043423" a="-2.7912560283370427" b="-0.011526890462664046" c="5.51182295148592E-4" d="3.8913058332067004E-4"/>
+         <laneOffset s="21.366622830641163" a="-2.810701365529899" b="-0.0" c="0.003454776217744666" d="-1.9631184366890965E-4"/>
+         <laneOffset s="32.85454492329809" a="-2.6523924697474235" b="0.001653191688735232" c="-8.998848245746308E-5" d="8.037507866721171E-7"/>
+         <laneOffset s="43.581841606490855" a="-2.644021422965137" b="-0.0" c="-0.0029136062377256374" d="1.0485909487323982E-4"/>
+         <laneOffset s="54.512437133470925" a="-2.855190744684136" b="-0.0261098634217682" c="-8.880085838896192E-4" d="2.8476899751176413E-5"/>
+         <laneOffset s="63.48536613324174" a="-3.140396439809967" b="-0.03516761862476003" c="-0.003177613010980211" d="5.07986818380934E-4"/>
+         <laneOffset s="66.18519709953358" a="-3.2485081373018874" b="-0.04121737391880615" c="8.767992747073302E-4" d="4.98690232418273E-4"/>
+         <laneOffset s="69.01787347986398" a="-3.346893127060343" b="-0.024245442456984158" c="0.0014769196375863966" d="1.4535185225086933E-7"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="2" type="shoulder" level="false">
+                  <link>
+                     <successor id="2"/>
+                  </link>
+                  <width sOffset="0.0" a="2.0252304962868344" b="0.015345102167736935" c="0.023883393606555718" d="-0.005216887864552781"/>
+                  <width sOffset="2.2307176713742614" a="2.120398372275826" b="0.044020030594695614" c="-0.0035491712522594723" d="0.0023839765249466013"/>
+                  <width sOffset="2.9749904969284033" a="2.1521781250607868" b="0.042698681612567485" c="-0.008095026720867706" d="0.001775975752267465"/>
+                  <width sOffset="5.391128957773997" a="2.233137209192118" b="0.03468424528427126" c="-0.0011366465159521582" d="4.468913378532081E-5"/>
+                  <width sOffset="11.030866183255597" a="2.4006107210844103" b="0.026127702978518883" c="-4.0729956434053325E-4" d="4.5310391497931836E-5"/>
+                  <width sOffset="16.80838975406469" a="2.546706791968156" b="0.02595868982277395" c="0.0020535510929588735" d="-0.001074596312280942"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+               <lane id="1" type="driving" level="false">
+                  <link>
+                     <successor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="4.006387570982423" b="-0.019447367328149667" c="-0.013562766303579317" d="4.692475911464303E-4"/>
+                  <width sOffset="0.432821211043815" a="3.9954676155530464" b="-0.030924154834098223" c="-0.005229895860596445" d="0.004085332038408162"/>
+                  <width sOffset="2.2307176713742614" a="3.946706129634891" b="-0.010113107207262731" c="0.00932546918449505" d="-0.003515532351090491"/>
+                  <width sOffset="3.5564027076590286" a="3.9414977619652887" b="-0.003922857424129143" c="-0.009149158695076612" d="0.0014047984976609685"/>
+                  <width sOffset="5.391128957773997" a="3.9121784738187175" b="-0.02330867653642986" c="0.00449773310109715" d="0.003136085116143253"/>
+                  <width sOffset="6.6975955092837545" a="3.896396754270115" b="0.004502125445489856" c="0.014660425450308894" d="-0.002031900070153315"/>
+                  <width sOffset="10.198011776965727" a="4.004640197472936" b="0.03244721818492344" c="0.003633756298420525" d="-6.393713452227416E-4"/>
+                  <width sOffset="11.030866183255597" a="4.033815179320602" b="0.03716950505926954" c="0.0020033111161453392" d="-6.396004866251207E-4"/>
+                  <width sOffset="15.66600482787674" a="4.18544737425878" b="0.01451624496082558" c="-0.0037742537031072174" d="3.072934677921022E-5"/>
+                  <width sOffset="16.80838975406469" a="4.197150762314987" b="0.006013253270936308" c="-0.0053444445681041135" d="0.001150636050557957"/>
+                  <roadMark sOffset="0.0" type="solid" weight="bold" color="standard" width="0.3">
+                     <type name="solid" width="0.3">
+                        <line length="18.661196916043423" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.3"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="40.0" unit="km/h"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.14">
+                     <type name="solid" width="0.14">
+                        <line length="18.661196916043423" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.14"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="shoulder" level="false">
+                  <link>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.28990232632986945" b="0.06629502376605917" c="-0.012633922170394316" d="0.006053879969606482"/>
+                  <width sOffset="0.432821211043815" a="0.31672031509169773" b="0.058760861074271496" c="-0.012496748701462562" d="0.002437795522344885"/>
+                  <width sOffset="1.3919724934986473" a="0.3637353118115665" b="0.04151642087636665" c="-0.011514941819495654" d="0.002564204340805174"/>
+                  <width sOffset="3.5564027076590286" a="0.42565059144244666" b="0.027707876466250426" c="0.009628344214388455" d="-0.0023561265079463725"/>
+                  <width sOffset="6.6975955092837545" a="0.5346633143740132" b="0.018452494955528982" c="-0.010445920093472724" d="0.002811858678350614"/>
+                  <width sOffset="7.619166709314891" a="0.5449977484464772" b="0.006363456422589557" c="-0.007779594900049962" d="0.0020114385130135595"/>
+                  <width sOffset="10.198011776965727" a="0.5441674671457943" b="0.006369581345712888" c="-0.0025288490632621352" d="6.189097880816547E-4"/>
+                  <width sOffset="11.030866183255597" a="0.5480758220450652" b="0.0034451689298929528" c="-0.0010604789204471843" d="6.109653009979236E-4"/>
+                  <width sOffset="15.66600482787674" a="0.60210296276041" b="0.032993106101911925" c="0.0043189017323157055" d="-5.936453240635454E-5"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+         <laneSection s="18.661196916043423">
+            <left>
+               <lane id="2" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="2"/>
+                  </link>
+                  <width sOffset="0.0" a="2.5950179019050292" b="0.022501431245904858" c="-0.0018248843140940547" d="-0.0016481888990791805"/>
+                  <width sOffset="1.5075742879024077" a="2.6191455903043463" b="0.005761220452330426" c="1.8482313038966448E-4" d="5.445434345641263E-4"/>
+                  <width sOffset="2.467688453648883" a="2.6253293422681208" b="0.0076220348616702965" c="0.0014925021314446869" d="-8.659214793780609E-5"/>
+                  <width sOffset="3.400535450467771" a="2.633668022580463" b="0.010180528748114676" c="0.0013062661664779685" d="-7.328146676871429E-5"/>
+                  <width sOffset="8.417085184723533" a="2.708360902977338" b="0.017753873243062226" c="-0.004711148226232459" d="3.027370768398808E-4"/>
+                  <width sOffset="14.431401633723368" a="2.710587061475066" b="-0.006062980534869021" c="7.6411554347068E-4" d="3.003963046492096E-4"/>
+                  <width sOffset="17.20738055781952" a="2.706070709637219" b="0.0051239716829632395" c="-6.214767307279924E-4" d="-9.529069068331198E-5"/>
+                  <width sOffset="18.59142419811573" a="2.71171938498165" b="0.002856059940965954" c="-0.0021012983786570915" d="1.045579579508795E-4"/>
+                  <width sOffset="25.462267816978965" a="2.666058444170438" b="-0.011211254596361617" c="1.0389833549634886E-4" d="1.0405436719636441E-4"/>
+                  <width sOffset="30.494013769753764" a="2.6255329259470543" b="-0.0022621832478599245" c="1.9394022082065457E-4" d="-1.407413448831227E-5"/>
+                  <width sOffset="32.14586266756234" a="2.622261891714887" b="-0.0017366716198221992" c="7.323272998970179E-4" d="-2.3405428061733805E-5"/>
+                  <width sOffset="36.49313400023456" a="2.6266292478816755" b="0.003303578066692226" c="5.297449543359771E-4" d="-5.1930745289731554E-5"/>
+                  <width sOffset="38.77834166779532" a="2.6363253015328123" b="0.004911158353065517" c="4.430101502581675E-4" d="-4.322429946855421E-5"/>
+                  <width sOffset="45.135094176907046" a="2.674342773192277" b="0.005303508421583423" c="0.001488212322881413" d="-1.9806011175164425E-4"/>
+                  <width sOffset="47.52400018349016" a="2.6928052041462767" b="0.00902299607226378" c="8.985157870920328E-5" d="-2.0131568703695557E-4"/>
+                  <width sOffset="51.5317360220307" a="2.7174510789076125" b="4.263344103788355E-5" c="-0.002141667291394018" d="-1.8608441602669732E-4"/>
+                  <width sOffset="53.382497379862926" a="2.70901442055228" b="-0.00979699136539328" c="-0.0016419863858204364" d="-1.2195653509649923E-7"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+               <lane id="1" type="driving" level="false">
+                  <link>
+                     <predecessor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="4.197263857903427" b="-0.0019411609818675568" c="-0.0011084373685814675" d="0.0018186781028450647"/>
+                  <width sOffset="1.5075742879024077" a="4.198049670425116" b="0.00711710259486589" c="-0.0023470693931775645" d="-3.740542307976646E-4"/>
+                  <width sOffset="2.7054259145977397" a="4.202564313966353" b="-1.1591266420924862E-4" c="-0.0034365558294371483" d="2.1138819618981994E-4"/>
+                  <width sOffset="3.400535450467771" a="4.2008942733925965" b="-0.004587064206750351" c="-0.003051837687099589" d="1.980775150224325E-4"/>
+                  <width sOffset="8.417085184723533" a="4.12608755240756" b="-0.020252134992867942" c="0.004843713453720862" d="-1.7794102858615705E-4"/>
+                  <width sOffset="14.19334800725467" a="4.13642352071625" b="0.017893868367678242" c="-0.0014606697879510475" d="-3.7505662303703144E-4"/>
+                  <width sOffset="14.431401633723368" a="4.1405953858447555" b="0.017134670040873497" c="-0.0017092630055078229" d="-3.7968192379083727E-4"/>
+                  <width sOffset="17.20738055781952" a="4.166867085658051" b="-0.0011326400202997025" c="-9.839563544723324E-4" d="1.6005071541801617E-5"/>
+                  <width sOffset="24.920644690447432" a="4.1069354672343925" b="-0.013455032056847362" c="0.0022358816530262853" d="-8.8050272541852E-5"/>
+                  <width sOffset="25.462267816978965" a="4.100289828985217" b="-0.011110511758464163" c="0.002110755975905213" d="-8.787645372018482E-5"/>
+                  <width sOffset="32.14586266756234" a="4.094083751244682" b="0.0053279241909578445" c="-2.5936797451351344E-4" d="-7.854516014691845E-5"/>
+                  <width sOffset="35.8512402174275" a="4.1062687252134005" b="1.705782623331667E-4" c="2.8043301262873905E-4" d="-2.1629650262663193E-6"/>
+                  <width sOffset="36.49313400023456" a="4.106493192431988" b="5.279210728829989E-4" c="2.948109977434783E-4" d="-1.5006445307603358E-6"/>
+                  <width sOffset="44.82416921719832" a="4.1304853068843" b="0.0051276208137513955" c="0.0033134732563260792" d="-4.810105631512632E-4"/>
+                  <width sOffset="45.135094176907046" a="4.132385481550239" b="0.00704859976862374" c="9.95297991497671E-4" d="-3.261747508774205E-4"/>
+                  <width sOffset="47.52400018349016" a="4.150457162744042" b="0.006219633900152996" c="-0.001265839102196089" d="-3.12772570483047E-4"/>
+                  <width sOffset="50.35667656382056" a="4.150809029071534" b="-0.008480904522507555" c="-2.8602575612465104E-4" d="1.8577231008296523E-4"/>
+                  <width sOffset="53.382497379862926" a="4.127675080300851" b="-0.005109263684978832" c="-1.3255903244908788E-4" d="-1.9014940860719786E-7"/>
+                  <roadMark sOffset="0.0" type="solid" weight="bold" color="standard" width="0.3">
+                     <type name="solid" width="0.3">
+                        <line length="58.554866366745756" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.3"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="40.0" unit="km/h"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.14">
+                     <type name="solid" width="0.14">
+                        <line length="58.554866366745756" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.14"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.7380741307610776" b="-0.8890347314362638" c="-1.2132598585911893" d="2.074664170904245"/>
+                  <width sOffset="0.6143372458608845" a="0.21503604665147558" b="-0.030737591014530122" c="0.0019824549510177223" d="4.041521496177154E-4"/>
+                  <width sOffset="2.7054259145977397" a="0.16312501030342608" b="-0.017144962947442367" c="0.004263110922312401" d="-1.812902773724608E-4"/>
+                  <width sOffset="3.400535450467771" a="0.15320633299363662" b="-0.011481090860484617" c="0.003815105386953444" d="-1.9586021378893635E-4"/>
+                  <width sOffset="13.70039914419226" a="0.2256732330795983" b="0.00477425968475588" c="-0.0026144371986147803" d="-1.9702619665608347E-4"/>
+                  <width sOffset="14.19334800725467" a="0.22736779347696112" b="0.002053060736570335" c="3.150720800779423E-4" d="8.939779856425068E-8"/>
+                  <width sOffset="24.920644690447432" a="0.28575882780945916" b="0.008843666422359345" c="-0.002531534904506001" d="1.0414474187995349E-4"/>
+                  <width sOffset="25.462267816978965" a="0.2898226694668091" b="0.0061930450557754" c="-0.002318456281003818" d="9.951025673955015E-5"/>
+                  <width sOffset="29.34718143667429" a="0.2847252998682177" b="-0.007315367989522736" c="9.355757472106878E-4" d="-6.449989871292416E-8"/>
+                  <width sOffset="35.8512402174275" a="0.2767054255650243" b="0.004846525742691468" c="-4.786021925099966E-4" d="-7.644669501700953E-5"/>
+                  <width sOffset="36.49313400023456" a="0.2795989645142014" b="0.004137607747731437" c="-5.646328089068336E-4" d="-8.226726933565946E-5"/>
+                  <width sOffset="41.21128524449199" a="0.2779109850083916" b="-0.006684481227205573" c="-8.011844863307755E-4" d="5.992111825818563E-5"/>
+                  <width sOffset="44.82416921719832" a="0.24612872788217555" b="-0.010127215812558238" c="-0.003207888368879179" d="5.394310368879257E-4"/>
+                  <width sOffset="47.52400018349016" a="0.20602000590410796" b="-0.0156528488478552" c="0.0011417313180893123" d="5.328020886109065E-4"/>
+                  <width sOffset="50.35667656382056" a="0.18295221912537096" b="0.0036411623767329156" c="0.002031735228946535" d="3.425720804498908E-5"/>
+                  <width sOffset="52.250425839897986" a="0.19736671075674073" b="0.011704925084514053" c="0.0018479878823125435" d="-5.691491692041929E-8"/>
+                  <roadMark sOffset="0.0" type="curb" weight="standard" color="standard" width="0.12">
+                     <type name="curb" width="0.12">
+                        <line length="58.554866366745756" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.0"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects>
+         <object type="railing" name="" id="2234011" s="0.0" t="4.957107036029125" zOffset="0.0" validLength="4.481349528796613" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="0.0" length="4.481349528796613" distance="0.0" tStart="4.957107036029125" tEnd="4.790967107600202" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.5960556620998643" zOffsetEnd="0.5726018657679572"/>
+         </object>
+         <object type="railing" name="" id="270669467" s="4.481349528796613" t="4.790967107600202" zOffset="0.0" validLength="14.766074175295621" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="4.481349528796613" length="14.766074175295621" distance="0.0" tStart="4.790967107600202" tEnd="4.734359440730054" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.5726018657679572" zOffsetEnd="0.5620112321829038"/>
+         </object>
+         <object type="railing" name="" id="539104923" s="19.247423704092235" t="4.734359440730054" zOffset="0.0" validLength="27.885953980810662" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="19.247423704092235" length="27.885953980810662" distance="0.0" tStart="4.734359440730054" tEnd="4.8913925139549015" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.5620112321829038" zOffsetEnd="0.4838096987723401"/>
+         </object>
+         <object type="railing" name="" id="807540379" s="47.1333776849029" t="4.8913925139549015" zOffset="0.0" validLength="4.198907988534813" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="47.1333776849029" length="4.198907988534813" distance="0.0" tStart="4.8913925139549015" tEnd="4.836325116460835" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.4838096987723401" zOffsetEnd="0.46611354051530157"/>
+         </object>
+         <object type="railing" name="" id="1075975835" s="51.33228567343771" t="4.836325116460835" zOffset="0.0" validLength="12.999820905104343" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="51.33228567343771" length="12.999820905104343" distance="0.0" tStart="4.836325116460835" tEnd="4.390448470444067" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.46611354051530157" zOffsetEnd="0.41884237176086686"/>
+         </object>
+         <object type="railing" name="" id="1073741930" s="64.33210657854205" t="4.390448470444067" zOffset="0.0" validLength="12.883956704247126" orientation="none" length="0.0" width="0.08" height="0.18" hdg="3.141592653589793" pitch="0.0" roll="0.0">
+            <repeat s="64.33210657854205" length="12.883956704247126" distance="0.0" tStart="4.390448470444067" tEnd="4.091958711596686" widthStart="0.08" widthEnd="0.08" heightStart="0.18" heightEnd="0.18" zOffsetStart="0.41884237176086686" zOffsetEnd="0.41716782539953784"/>
+         </object>
+         <object type="pole" name="Guidepost" id="428799" s="77.21606328278918" t="-4.5362327355913905" zOffset="0.2891582772867878" validLength="0.0" orientation="none" radius="0.0" height="0.9312817668542266" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="428802" s="66.55681199632222" t="-4.205084180228349" zOffset="0.24843477138429648" validLength="0.0" orientation="none" radius="0.0" height="0.9998155329376459" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="428806" s="55.94786074598779" t="4.8777562731057875" zOffset="0.6240644468883545" validLength="0.0" orientation="none" radius="0.0" height="0.493148447945714" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="428809" s="55.325267587777724" t="-3.83770470094584" zOffset="0.23838447307215915" validLength="0.0" orientation="none" radius="0.0" height="1.0511610200628638" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="428812" s="45.04876313575158" t="-3.7661874507073554" zOffset="1.1245398011184307" validLength="0.0" orientation="none" radius="0.0" height="0.0" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="428814" s="45.047543235377645" t="-3.769293183966826" zOffset="0.09384898401933128" validLength="0.0" orientation="none" radius="0.0" height="1.0307226870208979" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="428818" s="32.23753706656291" t="-3.714112707940392" zOffset="0.19800280612592758" validLength="0.0" orientation="none" radius="0.0" height="0.9339931104332209" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="428822" s="31.73917259036024" t="5.0556925614615915" zOffset="0.7701461172347734" validLength="0.0" orientation="none" radius="0.0" height="0.5281560895964503" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="428825" s="19.436927425018933" t="4.8761448092366475" zOffset="0.7840482056979994" validLength="0.0" orientation="none" radius="0.0" height="0.4783770451322198" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="428828" s="5.041452223255426" t="4.753010507815471" zOffset="0.7801645083598174" validLength="0.0" orientation="none" radius="0.0" height="0.5335727659985423" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="428857" s="25.859597454289208" t="-3.785781481242796" zOffset="0.1744846876013071" validLength="0.0" orientation="none" radius="0.03998224092937806" height="3.0750867780297995" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="429080" s="17.912240813199432" t="5.429758060498788" zOffset="0.8102506070245283" validLength="0.0" orientation="none" radius="0.03998224092937806" height="2.0266966754570603" hdg="0.0" pitch="0.0" roll="0.0"/>
+      </objects>
+      <signals>
+         <signal s="17.964423662143304" t="5.42583049758035" id="428985" dynamic="no" orientation="+" zOffset="2.1222166350933804" country="DEU" type="267" subtype="-1" height="0.7499999977473463" width="0.749815809155818" hOffset="0.15855910243616841"/>
+         <signal s="25.4442555611735" t="-3.940740414768122" id="429028" dynamic="no" orientation="+" zOffset="2.356351264906536" country="DEU" type="267" subtype="-1" height="0.7499999967637601" width="0.7498157309448562" hOffset="-0.08298261779890952"/>
+      </signals>
+   </road>
+   <road length="5.0" id="2234048" junction="2104836">
+      <link>
+         <predecessor elementType="road" elementId="255974" contactPoint="end"/>
+         <successor elementType="road" elementId="255972" contactPoint="end"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618284.8144621361" y="5809473.633969674" hdg="-1.5401900605634444" length="5.0">
+            <paramPoly3 aU="0.0" bU="5.037342484046629" cU="-0.02657085860089136" dU="-0.018801599016645753" aV="-0.0" bV="-4.163336342344337E-16" cV="-0.23129785602981948" dV="-0.011870824360482512" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="102.85393391774431" b="0.03682036977548229" c="2.8579625632346506E-4" d="4.850052181252229E-5"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="0.0077186487137436335" b="-7.796761645149356E-4" c="6.938893903907229E-20" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="0.33914211653945275" b="0.03975280152506116" c="-0.0037799763443760524" d="1.573078214650052E-4"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.19740062073684744" b="-0.06618790467904885" c="0.002787087383197839" d="5.108937446276049E-4"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.16990684678954757">
+                     <type name="solid" width="0.169907">
+                        <line length="5.0" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.169907"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                     <successor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="4.210097072743462" b="-0.035842859538453266" c="0.004049844031807769" d="-0.003301305319129908"/>
+                  <width sOffset="1.334760771895704" a="4.161620100512424" b="-0.04267639481275635" c="-0.003813418481938902" d="-2.416498924704958E-4"/>
+                  <width sOffset="3.2515287819333647" a="4.064107106098549" b="-0.0599587367508399" c="-0.008626934399983343" d="0.0025437143599881633"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.13168603467553125">
+                     <type name="solid" width="0.131686">
+                        <line length="5.0" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.131686"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="70.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="-2"/>
+                     <successor id="2"/>
+                  </link>
+                  <width sOffset="0.0" a="0.6923411111274489" b="0.003768381257058806" c="0.0028998544304558588" d="-0.009696958947078073"/>
+                  <width sOffset="0.43766078680944" a="0.6937329209132881" b="7.344172523175985E-4" c="-0.004148148335569114" d="0.003460447403178878"/>
+                  <width sOffset="1.334760771895704" a="0.6935517437784098" b="0.0016465932450644705" c="-1.9114238854847014E-4" d="4.0079197651874174E-4"/>
+                  <width sOffset="3.2515287819333647" a="0.6988280832012972" b="0.005331370703014468" c="0.0055374888967594325" d="-0.002384572275940081"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects/>
+      <signals/>
+   </road>
+   <road length="30.612982014663952" id="2234084" junction="-1">
+      <link>
+         <predecessor elementType="junction" elementId="2104836"/>
+         <successor elementType="junction" elementId="2104812"/>
+      </link>
+      <type s="0.0" type="rural"/>
+      <planView>
+         <geometry s="0.0" x="618287.2980705887" y="5809473.463991166" hdg="1.4347914552291492" length="8.997371503342837">
+            <paramPoly3 aU="0.0" bU="9.683131353094078" cU="0.567911990682686" dU="-1.267243931952258" aV="-0.0" bV="8.881784197001252E-16" cV="-0.4418372183444006" dV="0.029079989647997156" pRange="normalized"/>
+         </geometry>
+         <geometry s="8.997371503342837" x="618288.9250934165" y="5809482.308866356" hdg="1.3217779715950044" length="21.615610511321115">
+            <paramPoly3 aU="0.0" bU="22.774185600725843" cU="-3.529812440635782" dU="1.3558862213067833" aV="-0.0" bV="-0.0" cV="-7.456404901047769" dV="1.6463656093006915" pRange="normalized"/>
+         </geometry>
+      </planView>
+      <elevationProfile>
+         <elevation s="0.0" a="102.84365475475103" b="-0.03987030900278936" c="2.939525720704698E-4" d="3.12494313487012E-5"/>
+         <elevation s="3.90324489129635" a="102.69436795231908" b="-0.03614728592921538" c="1.7057335224017787E-4" d="3.5562384838116956E-5"/>
+         <elevation s="9.838741922313654" a="102.49326155445063" b="-0.03036380888763725" c="5.927342272544537E-4" d="-7.59041621728278E-13"/>
+         <elevation s="10.204327338221317" a="102.48224020927753" b="-0.029930418909954543" c="3.6599514237158044E-4" d="1.9136875514308466E-5"/>
+         <elevation s="20.408654676442634" a="102.2352649315815" b="-0.01648287969739801" c="7.367591973551303E-4" d="-7.590786132658571E-13"/>
+      </elevationProfile>
+      <lateralProfile>
+         <superelevation s="0.0" a="-0.001748310854477844" b="0.003142804931310202" c="-3.964542111416419E-5" d="-4.8804713851490625E-6"/>
+         <superelevation s="10.204327338221317" a="0.02100789938559655" b="8.091097090211232E-4" c="-6.79542364979623E-5" d="2.7741971073159147E-6"/>
+         <superelevation s="20.408654676442634" a="0.025136109547288822" b="2.8887241873355284E-4" c="-1.1336605730365815E-5" d="0.0"/>
+      </lateralProfile>
+      <lanes>
+         <laneOffset s="0.0" a="1.7532666941248265" b="0.03804383589669091" c="-0.0061400491702721" d="0.0016955557762167543"/>
+         <laneOffset s="1.7578100467104543" a="1.8103777440161288" b="0.03217502950669257" c="-0.0017306988609903991" d="3.9112214294675295E-4"/>
+         <laneOffset s="5.760847962902128" a="1.936531241490124" b="0.037121313583933765" c="-0.03296910674974814" d="-0.0026982901775362013"/>
+         <laneOffset s="5.972576844989206" a="1.9428873085469516" b="0.021004622883628605" c="0.008153936886010894" d="-1.5935104667598393E-5"/>
+         <laneOffset s="8.6950081538711" a="2.060183399836965" b="0.0650473736157713" c="0.015319872194690545" d="-0.00248280364718617"/>
+         <laneOffset s="10.204327338221317" a="2.184723383655321" b="0.09432471679009016" c="0.004243552586355224" d="-0.002477191073728961"/>
+         <laneOffset s="11.617929182725792" a="2.3195432755545564" b="0.09147181319709757" c="0.010460137025009801" d="-0.005579095870040512"/>
+         <laneOffset s="13.3192875229281" a="2.4779718773047565" b="0.07861660509222275" c="-0.011459522526504857" d="0.0015965281211199145"/>
+         <laneOffset s="15.176625150225078" a="2.5946868821640305" b="0.05257084417645647" c="-0.007185646129084325" d="6.632588474779412E-4"/>
+         <laneOffset s="17.704323165532152" a="2.6923708642382698" b="0.02895775147081884" c="-0.008052028074894297" d="0.0018088019922779498"/>
+         <laneOffset s="20.045156191425516" a="2.7392358100483194" b="0.020994832492555265" c="0.00537083036341101" d="-9.630822928062379E-4"/>
+         <laneOffset s="25.17851552904984" a="2.8582614168463523" b="-0.0" c="-0.005698560387795628" d="9.797950539948382E-5"/>
+         <laneOffset s="30.131685696213566" a="2.730360060230516" b="-0.04924042201109882" c="-0.16505223270980363" d="0.33313306968106915"/>
+         <laneSection s="0.0">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <successor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.22254814156442215" b="0.09851317203695503" c="0.0032168225614468264" d="-4.2597469915931787E-4"/>
+                  <width sOffset="1.7578100467104543" a="0.40334157228667444" b="0.10587364530897425" c="0.005502519369271604" d="8.784589341082115E-4"/>
+                  <width sOffset="2.0976531563219494" a="0.43999198464548694" b="0.10991800036208872" c="-0.0029080786047739927" d="0.0034751149680847465"/>
+                  <width sOffset="3.824278732201483" a="0.6389976252957998" b="0.1309560868531929" c="-0.009395953250445243" d="0.019361492667686036"/>
+                  <width sOffset="4.7313604577303305" a="0.7645048747332959" b="0.1617020410412877" c="0.42260422033611966" d="-0.701054590637227"/>
+                  <width sOffset="5.297982210523948" a="0.8642745283341913" b="-0.034626674657455406" c="-2.4854332283015643" d="1.6202043993560882"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.14">
+                     <type name="solid" width="0.14">
+                        <line length="5.760847962902128" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.14"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <successor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="3.795211691431764" b="0.037926761275534855" c="-0.0019363835005529184" d="0.0016354738828154027"/>
+                  <width sOffset="1.7578100467104543" a="3.8647795049591114" b="0.04627950594484884" c="0.0021561291411644444" d="3.310402495437075E-4"/>
+                  <width sOffset="1.9653788422505674" a="3.874481543182787" b="0.04721738461625989" c="0.0037290525170416648" d="3.6190948554441446E-5"/>
+                  <width sOffset="5.431699576228528" a="4.0844654459571865" b="0.07437411266861553" c="0.024250844430036965" d="-0.05641649969429085"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.14407533094474215">
+                     <type name="solid" width="0.144075">
+                        <line length="5.760847962902128" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.144075"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="40.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link>
+                     <successor id="-2"/>
+                  </link>
+                  <width sOffset="0.0" a="0.5547933811665247" b="0.009904437532887687" c="-1.2382224491541E-4" d="-0.0012090793742839552"/>
+                  <width sOffset="1.9653788422505674" a="0.5646020997392882" b="-0.004593261162962721" c="-0.008619501805877342" d="-9.142301073441845E-4"/>
+                  <width sOffset="1.987060871578353" a="0.5644984470799379" b="-0.004968327112028286" c="-0.007678654469559869" d="8.346899553999458E-4"/>
+                  <width sOffset="5.208245556649587" a="0.49671852817186135" b="-0.028454749475343544" c="0.010226137077821577" d="-0.019946798986417557"/>
+                  <width sOffset="5.431699576228528" a="0.49064825323335004" b="-0.026872539286721956" c="-0.02329088376287914" d="0.03650589165635296"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+         <laneSection s="5.760847962902128">
+            <left>
+               <lane id="1" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="1"/>
+                  </link>
+                  <width sOffset="0.0" a="0.47642617702403456" b="0.0826664720222062" c="0.06402052211464934" d="-0.0758894909393122"/>
+                  <width sOffset="0.21172888208707796" a="0.4960787262070132" b="0.10136306255227355" c="-0.027020430645833444" d="-0.07857184601217972"/>
+                  <width sOffset="0.7410542954773511" a="0.5305091097248784" b="0.006713810586649424" c="-0.03234795306118125" d="0.007219830097923307"/>
+                  <width sOffset="2.9341601909689725" a="0.4658051127740359" b="-0.030995220350319" c="0.007857520802639894" d="0.00968669864382031"/>
+                  <width sOffset="2.9824211399351075" a="0.46432864396727336" b="-0.030169113102131162" c="0.004697240166640491" d="-3.565404663869224E-4"/>
+                  <width sOffset="4.443479375319189" a="0.429164952956949" b="-0.018726541597053586" c="0.003132748364547463" d="-3.2418248530652815E-4"/>
+                  <width sOffset="5.857081219823664" a="0.4080374196360599" b="-0.011813036438796692" c="-0.01496391656470187" d="0.0027777223110041598"/>
+                  <width sOffset="6.81063076180031" a="0.38557540683501923" b="-0.03277371990394032" c="0.00430603872957206" d="0.0054880392561140025"/>
+                  <width sOffset="7.558439560025972" a="0.36576997802729183" b="-0.01712650162015359" c="0.010061586535436463" d="-0.0016875847350429653"/>
+                  <width sOffset="9.41577718732295" a="0.3578569682839472" b="0.0027840262225495085" c="0.005280341512255202" d="-7.543154614009808E-4"/>
+                  <width sOffset="11.943475202630024" a="0.3864493263118276" b="0.01501969713735423" c="0.00545623259118329" d="-0.0018998586062008722"/>
+                  <width sOffset="13.402677458653" a="0.41408096961295193" b="0.018807248170779424" c="0.001291821118466636" d="-0.0026446845701535754"/>
+                  <width sOffset="14.284308228523388" a="0.429853799006521" b="0.01491814240820663" c="-0.006423632878303343" d="1.2719971492811653E-4"/>
+                  <width sOffset="14.647806713540506" a="0.4344338685159048" b="0.010298601902373819" c="-0.006212832498140867" d="1.5045454717582034E-4"/>
+                  <width sOffset="17.72957871399364" a="0.41157015102547145" b="-0.023707720233799367" c="0.0030219488701194253" d="9.624265426375199E-4"/>
+                  <width sOffset="19.417667566147713" a="0.3847905980740909" b="-0.00527736484556957" c="0.00413378173222461" d="-9.8635255568081E-5"/>
+                  <width sOffset="23.957319080075777" a="0.4367961436002141" b="0.026156337136244642" c="-0.0017726277389795795" d="0.0022797153019904655"/>
+                  <width sOffset="24.37083773331144" a="0.44747036201231616" b="0.02585978592528691" c="0.16186508647675377" d="-0.3307553748736723"/>
+                  <roadMark sOffset="0.0" type="curb" weight="standard" color="standard" width="0.12">
+                     <type name="curb" width="0.12">
+                        <line length="24.852134051761823" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.0"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </left>
+            <center>
+               <lane id="0" type="driving" level="false">
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.14">
+                     <type name="solid" width="0.14">
+                        <line length="0.21172888208707796" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.14"/>
+                     </type>
+                  </roadMark>
+                  <roadMark sOffset="0.21172888208707796" type="solid" weight="standard" color="standard" width="0.18">
+                     <type name="solid" width="0.18">
+                        <line length="24.640405169674747" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.18"/>
+                     </type>
+                  </roadMark>
+               </lane>
+            </center>
+            <right>
+               <lane id="-1" type="driving" level="false">
+                  <link>
+                     <predecessor id="-1"/>
+                  </link>
+                  <width sOffset="0.0" a="4.109561085246897" b="0.07200210129541036" c="-0.02124612284275895" d="-0.005502128705623042"/>
+                  <width sOffset="0.21172888208707796" a="4.123801340570719" b="0.06047251831242273" c="0.018095960001686326" d="-0.0028197736327543904"/>
+                  <width sOffset="2.9073037257659493" a="4.3630678652984285" b="0.09656407503278636" c="0.00731290487867467" d="-0.0015746406175437327"/>
+                  <width sOffset="2.9341601909689725" a="4.365666479094308" b="0.09695346536178605" c="0.014482119029927895" d="-0.004041509110169093"/>
+                  <width sOffset="4.443479375319189" a="4.531095209437275" b="0.11304953393470138" c="-0.00365195275250298" d="-0.004035896536711528"/>
+                  <width sOffset="5.3623301611922525" a="4.6287566253338275" b="0.09611597250834106" c="-0.00260316514662158" d="-0.00248675960436648"/>
+                  <width sOffset="5.857081219823664" a="4.675371747617573" b="0.0917140184059653" c="0.010427724064601122" d="-0.005588664400685321"/>
+                  <width sOffset="7.558439560025972" a="4.834071481042039" b="0.07866542639372924" c="-0.011540773985161335" d="0.0015869595904925925"/>
+                  <width sOffset="7.844425389378467" a="4.8556619019131" b="0.07245381300581304" c="-0.019488804658788838" d="0.002782536932573794"/>
+                  <width sOffset="9.41577718732295" a="4.932187576746198" b="0.031817750283424165" c="-0.010993770283008561" d="0.0018492676589319027"/>
+                  <width sOffset="10.808836088123945" a="4.960176210991945" b="0.011953950330306214" c="-0.0095857303530119" d="0.0018690111406951624"/>
+                  <width sOffset="11.943475202630024" a="4.96412904601835" b="-0.002580210846798235" c="-0.00911970707899663" d="0.003014554285495641"/>
+                  <width sOffset="13.145329363085198" a="4.953088350403286" b="-0.011438176867305933" c="-0.0035759973047070435" d="0.0023049787805809697"/>
+                  <width sOffset="14.284308228523388" a="4.938827223575654" b="-0.010613588356633362" c="0.005020517160219671" d="-4.6690550451348393E-4"/>
+                  <width sOffset="14.647806713540506" a="4.935610141761401" b="-0.007148765874958114" c="0.004552750560219939" d="-4.559418429753449E-4"/>
+                  <width sOffset="18.14010906018717" a="4.9467508264241005" b="0.007968156604438776" c="-0.0038971494400383364" d="-9.650957356620154E-4"/>
+                  <width sOffset="19.417667566147713" a="4.94855746489393" b="-0.0067150758504927" c="-0.0038338965476966483" d="9.596606254347815E-5"/>
+                  <width sOffset="21.223562755434187" a="4.924492609180334" b="-0.019623396409063812" c="8.284370975923062E-4" d="0.0012543745656071422"/>
+                  <width sOffset="24.37083773331144" a="4.910043247026314" b="0.022866261162097917" c="-0.14813757766416918" d="0.33428946474128124"/>
+                  <roadMark sOffset="0.0" type="solid" weight="standard" color="standard" width="0.14407533094474215">
+                     <type name="solid" width="0.144075">
+                        <line length="24.852134051761823" space="0.0" tOffset="-0.0" sOffset="0.0" width="0.144075"/>
+                     </type>
+                  </roadMark>
+                  <speed sOffset="0.0" max="40.0" unit="km/h"/>
+               </lane>
+               <lane id="-2" type="shoulder" level="false">
+                  <link>
+                     <predecessor id="-2"/>
+                  </link>
+                  <width sOffset="0.0" a="0.4805816788057351" b="-0.030339854714499556" c="-0.00859551599680634" d="0.0025844938639267064"/>
+                  <width sOffset="2.9073037257659493" a="0.38323231195662766" b="-0.014783762328509129" c="0.001926532439841589" d="0.0013393607988229415"/>
+                  <width sOffset="4.443479375319189" a="0.36992350247813865" b="6.172361043248475E-4" c="0.00816403753474409" d="0.0013449130413298138"/>
+                  <width sOffset="5.3623301611922525" a="0.37842678718782174" b="0.019026777563190087" c="-3.0258696964922065E-4" d="-2.0422389100712402E-4"/>
+                  <width sOffset="7.844425389378467" a="0.42066595693836994" b="0.013750132581554261" c="0.007486278131819767" d="-0.0013998012331058038"/>
+                  <width sOffset="10.36964160935536" a="0.4805854674062391" b="0.02478066573162327" c="-0.006082080931245532" d="-7.716140511991815E-4"/>
+                  <width sOffset="10.808836088123945" a="0.49023044666221427" b="0.018991718955777878" c="-7.783704376054506E-4" d="-7.913575329638711E-4"/>
+                  <width sOffset="13.145329363085198" a="0.520261118941741" b="0.0023938652820302275" c="-9.999210436540938E-4" d="-8.178202804907828E-5"/>
+                  <width sOffset="14.647806713540506" a="0.5213232031854083" b="-0.0011647057784209894" c="-0.0013900000842378345" d="-9.150907173207745E-5"/>
+                  <width sOffset="18.14010906018717" a="0.49640539178447574" b="-0.014221489036049582" c="0.0013243075737007807" d="4.176448209547106E-4"/>
+                  <width sOffset="20.791039298885806" a="0.4757920980251309" b="0.0016047155976137584" c="0.010556421814105918" d="-0.0010537644638063525"/>
+                  <width sOffset="21.223562755434187" a="0.47837576869177934" b="0.010145111870190036" c="0.0050466685760401685" d="-0.002212172966869129"/>
+                  <roadMark sOffset="0.0" type="none" color="standard" width="0.0"/>
+               </lane>
+            </right>
+         </laneSection>
+      </lanes>
+      <objects>
+         <object type="pole" name="Guidepost" id="256740" s="10.506081287070137" t="-3.440985969484045" zOffset="-0.07385239422072232" validLength="0.0" orientation="none" radius="0.0" height="0.9680221723392606" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256741" s="11.661383003813745" t="3.5963431087253093" zOffset="0.07306948050856477" validLength="0.0" orientation="none" radius="0.0" height="1.1004119468852878" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256742" s="25.222786033447" t="4.0469515001421215" zOffset="0.058003222510606633" validLength="0.0" orientation="none" radius="0.0" height="1.1634854320436716" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Guidepost" id="256743" s="25.993344996952835" t="-3.3642555344596605" zOffset="-0.06554901755298204" validLength="0.0" orientation="none" radius="0.0" height="1.0310321189463139" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="Pole" id="256787" s="8.00291453753922" t="3.3279729180701114" zOffset="0.23756495398279753" validLength="0.0" orientation="none" radius="0.03273629810883571" height="1.8450005175545812" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256788" s="25.394589978750904" t="4.969645411174552" zOffset="0.1451156544971326" validLength="0.0" orientation="none" radius="0.04838820699694389" height="3.609563022851944" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256801" s="11.440691768728293" t="5.138276496472238" zOffset="0.15672312413610712" validLength="0.0" orientation="none" radius="0.03128451168068725" height="2.797446525655687" hdg="0.0" pitch="0.0" roll="0.0"/>
+         <object type="pole" name="RoadSignPole" id="256802" s="3.3279182942876453" t="-3.7490259472407343" zOffset="0.00948361577002288" validLength="0.0" orientation="none" radius="0.03575690456907796" height="3.2123374566435814" hdg="0.0" pitch="0.0" roll="0.0"/>
+      </objects>
+      <signals>
+         <signal s="3.2823357792686108" t="-3.816615132217417" id="248766" dynamic="no" orientation="+" zOffset="2.3189534219939105" country="DEU" type="334" subtype="-1" height="0.8249999542191174" width="0.8247981238963353" hOffset="-0.003381122844635152"/>
+         <signal s="25.291962228031768" t="4.882920150164912" id="251068" dynamic="no" orientation="+" zOffset="2.4041089369783037" country="DEU" type="205" subtype="-1" height="0.7339999304144066" width="0.8226686493754387" hOffset="0.46954758434808264"/>
+         <signal s="11.292457352701321" t="5.022666084429824" id="253360" dynamic="no" orientation="+" zOffset="2.1605245211827793" country="DEU" type="267" subtype="-1" height="0.7499999957864276" width="0.7498164918311979" hOffset="0.3951188212820621"/>
+         <signal s="7.439525209778407" t="12.027774177156967" id="253401" dynamic="no" orientation="+" zOffset="2.042814860491063" country="DEU" type="267" subtype="-1" height="0.749999998580326" width="0.74981647036313" hOffset="0.6345581025594784"/>
+         <signal s="25.288995540045654" t="4.899488332651515" id="253542" dynamic="no" orientation="+" zOffset="3.1539070597214476" country="DEU" type="1000" subtype="32" height="0.5599999935397646" width="0.755645269875501" hOffset="0.46948686247522525"/>
+         <signal s="8.021985650436584" t="3.2637623330258196" id="253633" dynamic="no" orientation="+" zOffset="1.3025835291587526" country="DEU" type="222" subtype="-1" height="0.7499999985861835" width="0.7498165824681522" hOffset="0.22420404500943308"/>
+         <signal s="8.005922096783587" t="3.317702141260729" id="253645" dynamic="no" orientation="+" zOffset="0.529576562279658" country="DEU" type="630" subtype="-1" height="0.7668597893949762" width="0.4898806149742034" hOffset="0.19888508130860483"/>
+      </signals>
+   </road>
+   <junction id="2104769">
+      <connection id="1" incomingRoad="255962" connectingRoad="255963" contactPoint="start">
+         <laneLink from="-1" to="-1"/>
+         <laneLink from="-2" to="-2"/>
+         <laneLink from="1" to="1"/>
+      </connection>
+      <connection id="2" incomingRoad="255962" connectingRoad="255964" contactPoint="start">
+         <laneLink from="-3" to="-1"/>
+         <laneLink from="-4" to="-2"/>
+      </connection>
+   </junction>
+   <junction id="2104786">
+      <connection id="1" incomingRoad="255967" connectingRoad="255968" contactPoint="start">
+         <laneLink from="-1" to="-1"/>
+         <laneLink from="-2" to="-2"/>
+      </connection>
+      <connection id="2" incomingRoad="2233740" connectingRoad="255969" contactPoint="start">
+         <laneLink from="-1" to="1"/>
+         <laneLink from="2" to="-2"/>
+         <laneLink from="1" to="-1"/>
+      </connection>
+   </junction>
+   <junction id="2104812">
+      <connection id="1" incomingRoad="2234084" connectingRoad="255978" contactPoint="start">
+         <laneLink from="-1" to="-1"/>
+         <laneLink from="-2" to="-2"/>
+      </connection>
+   </junction>
+   <junction id="2104771">
+      <connection id="1" incomingRoad="2233498" connectingRoad="255979" contactPoint="start">
+         <laneLink from="1" to="1"/>
+         <laneLink from="-1" to="-1"/>
+      </connection>
+   </junction>
+   <junction id="2104816">
+      <connection id="1" incomingRoad="255972" connectingRoad="428578" contactPoint="start">
+         <laneLink from="2" to="-2"/>
+         <laneLink from="1" to="-1"/>
+      </connection>
+      <connection id="2" incomingRoad="2234012" connectingRoad="428539" contactPoint="start">
+         <laneLink from="-1" to="1"/>
+         <laneLink from="2" to="-2"/>
+         <laneLink from="1" to="-1"/>
+      </connection>
+   </junction>
+   <junction id="2104772">
+      <connection id="1" incomingRoad="255971" connectingRoad="2233584" contactPoint="start">
+         <laneLink from="-1" to="-1"/>
+         <laneLink from="-2" to="-2"/>
+         <laneLink from="1" to="1"/>
+      </connection>
+      <connection id="2" incomingRoad="2233547" connectingRoad="2233633" contactPoint="start">
+         <laneLink from="-1" to="-1"/>
+         <laneLink from="-2" to="-2"/>
+         <laneLink from="-3" to="-3"/>
+         <laneLink from="1" to="1"/>
+      </connection>
+   </junction>
+   <junction id="2104780">
+      <connection id="1" incomingRoad="255967" connectingRoad="2233666" contactPoint="start">
+         <laneLink from="2" to="-2"/>
+         <laneLink from="1" to="-1"/>
+      </connection>
+      <connection id="2" incomingRoad="428457" connectingRoad="2233698" contactPoint="start">
+         <laneLink from="-1" to="-1"/>
+         <laneLink from="-2" to="-2"/>
+         <laneLink from="1" to="1"/>
+      </connection>
+   </junction>
+   <junction id="2104802">
+      <connection id="1" incomingRoad="255959" connectingRoad="255960" contactPoint="start">
+         <laneLink from="-1" to="-1"/>
+         <laneLink from="-2" to="-2"/>
+         <laneLink from="1" to="1"/>
+      </connection>
+      <connection id="2" incomingRoad="255959" connectingRoad="2233816" contactPoint="start">
+         <laneLink from="-3" to="-1"/>
+         <laneLink from="-4" to="-2"/>
+      </connection>
+   </junction>
+   <junction id="2104811">
+      <connection id="1" incomingRoad="255970" connectingRoad="2233902" contactPoint="start">
+         <laneLink from="-1" to="-1"/>
+         <laneLink from="-2" to="-2"/>
+         <laneLink from="1" to="1"/>
+      </connection>
+      <connection id="2" incomingRoad="2233865" connectingRoad="2233951" contactPoint="start">
+         <laneLink from="-1" to="-1"/>
+         <laneLink from="-2" to="-2"/>
+         <laneLink from="-3" to="-3"/>
+         <laneLink from="1" to="1"/>
+      </connection>
+   </junction>
+   <junction id="2104836">
+      <connection id="1" incomingRoad="255972" connectingRoad="255973" contactPoint="start">
+         <laneLink from="-1" to="-1"/>
+         <laneLink from="-2" to="-2"/>
+      </connection>
+      <connection id="2" incomingRoad="255974" connectingRoad="2234048" contactPoint="start">
+         <laneLink from="-1" to="-1"/>
+         <laneLink from="-2" to="-2"/>
+         <laneLink from="1" to="1"/>
+      </connection>
+   </junction>
+</OpenDRIVE>
diff --git a/autotest/ogr/ogr_arrow.py b/autotest/ogr/ogr_arrow.py
index 5c2088f71165..8ffbe0c11913 100755
--- a/autotest/ogr/ogr_arrow.py
+++ b/autotest/ogr/ogr_arrow.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2022, Planet Labs
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import json
@@ -738,38 +722,204 @@ def test_ogr_arrow_write_arrow_fid_in_input_but_not_in_output(tmp_vsimem):
 
 
 @gdaltest.enable_exceptions()
-def test_ogr_arrow_write_arrow_fid_in_output_but_not_in_input(tmp_vsimem):
-
-    src_ds = ogr.Open("data/poly.shp")
-    src_lyr = src_ds.GetLayer(0)
+def test_ogr_arrow_ipc_read_stdin(tmp_path):
 
-    outfilename = str(tmp_vsimem / "poly.feather")
-    with ogr.GetDriverByName("Arrow").CreateDataSource(outfilename) as dst_ds:
-        dst_lyr = dst_ds.CreateLayer(
+    outfilename = str(tmp_path / "poly.bin")
+    with ogr.GetDriverByName("Arrow").CreateDataSource(outfilename) as ds:
+        lyr = ds.CreateLayer(
             "test",
-            srs=src_lyr.GetSpatialRef(),
-            geom_type=ogr.wkbPoint,
-            options=["GEOMETRY_ENCODING=WKB", "FID=my_fid"],
+            geom_type=ogr.wkbNone,
+            options=["FORMAT=STREAM"],
         )
+        fld_defn = ogr.FieldDefn("foo")
+        fld_defn.SetComment("x" * (1024 * 1024))
+        lyr.CreateField(fld_defn)
+        f = ogr.Feature(lyr.GetLayerDefn())
+        f["foo"] = "bar"
+        lyr.CreateFeature(f)
 
-        stream = src_lyr.GetArrowStream(["INCLUDE_FID=NO"])
-        schema = stream.GetSchema()
+    assert gdal.VSIStatL(outfilename).size > 1024 * 1024
 
-        success, error_msg = dst_lyr.IsArrowSchemaSupported(schema)
-        assert success
+    # By default, as the header section is larger than 1 MB, we can't
+    # identify /vsistdin/
+    with gdaltest.config_options(
+        {
+            "CPL_VSISTDIN_FILE": outfilename,
+            "CPL_VSISTDIN_RESET_POSITION": "YES",
+            "CPL_VSISTDIN_FILE_CLOSE": "YES",
+        }
+    ):
+        with pytest.raises(Exception):
+            gdal.Open("/vsistdin/")
 
-        for i in range(schema.GetChildrenCount()):
-            if schema.GetChild(i).GetName() not in ("wkb_geometry", "OGC_FID"):
-                dst_lyr.CreateFieldFromArrowSchema(schema.GetChild(i))
+    with gdaltest.config_options(
+        {
+            "CPL_VSISTDIN_FILE": outfilename,
+            "CPL_VSISTDIN_RESET_POSITION": "YES",
+            "CPL_VSISTDIN_FILE_CLOSE": "YES",
+        }
+    ):
+        ds = gdal.OpenEx("/vsistdin/", allowed_drivers=["ARROW"])
+        lyr = ds.GetLayer(0)
+        f = lyr.GetNextFeature()
+        assert f["foo"] == "bar"
 
-        while True:
-            array = stream.GetNextRecordBatch()
-            if array is None:
-                break
-            assert dst_lyr.WriteArrowBatch(schema, array) == ogr.OGRERR_NONE
 
-    ds = ogr.Open(outfilename)
-    lyr = ds.GetLayer(0)
-    src_lyr.ResetReading()
-    for i in range(src_lyr.GetFeatureCount()):
-        assert str(src_lyr.GetNextFeature()) == str(lyr.GetNextFeature())
+###############################################################################
+
+
+@gdaltest.enable_exceptions()
+def test_ogr_arrow_vsi_arrow_file_system():
+
+    version = int(
+        ogr.GetDriverByName("ARROW").GetMetadataItem("ARROW_VERSION").split(".")[0]
+    )
+    if version < 16:
+        pytest.skip("requires Arrow >= 16.0.0")
+
+    ogr.Open("gdalvsi://data/arrow/test.feather")
+
+
+###############################################################################
+
+
+@gdaltest.enable_exceptions()
+def test_ogr_arrow_string_view():
+
+    version = int(
+        ogr.GetDriverByName("ARROW").GetMetadataItem("ARROW_VERSION").split(".")[0]
+    )
+    if version < 15:
+        pytest.skip("requires Arrow >= 15")
+
+    with ogr.Open("data/arrow/stringview.feather") as ds:
+        lyr = ds.GetLayer(0)
+        f = lyr.GetNextFeature()
+        assert f["stringview"] == "foo"
+        assert f["list_stringview"] is None
+        assert f["list_of_list_stringview"] is None
+        assert f["map_stringview"] is None
+
+        f = lyr.GetNextFeature()
+        assert f["stringview"] == "bar"
+        assert f["list_stringview"] == [""]
+        assert f["list_of_list_stringview"] == "[null]"
+        assert f["map_stringview"] == "{}"
+
+        f = lyr.GetNextFeature()
+        assert f["stringview"] == "looooooooooong string"
+        assert f["list_stringview"] == ["foo", "bar", "looooooooooong string"]
+        assert f["list_of_list_stringview"] == '[["foo","bar","looooooooooong string"]]'
+        assert f["map_stringview"] == '{"x":"x_val","y":null}'
+
+
+###############################################################################
+
+
+@gdaltest.enable_exceptions()
+def test_ogr_arrow_binary_view():
+
+    version = int(
+        ogr.GetDriverByName("ARROW").GetMetadataItem("ARROW_VERSION").split(".")[0]
+    )
+    if version < 15:
+        pytest.skip("requires Arrow >= 15")
+
+    with ogr.Open("data/arrow/binaryview.feather") as ds:
+        lyr = ds.GetLayer(0)
+        f = lyr.GetNextFeature()
+        assert f.GetFieldAsBinary("binaryview") == b"foo"
+        f = lyr.GetNextFeature()
+        assert f.GetFieldAsBinary("binaryview") == b"bar"
+        f = lyr.GetNextFeature()
+        assert f.GetFieldAsBinary("binaryview") == b"looooooooooong binary"
+
+
+###############################################################################
+
+
+@gdaltest.enable_exceptions()
+@pytest.mark.parametrize(
+    "geom_type,encoding,expected_arrow_type",
+    [
+        (
+            ogr.wkbPoint,
+            "GEOARROW_STRUCT",
+            "struct<x: double not null, y: double not null>",
+        ),
+        (
+            ogr.wkbPoint,
+            "GEOARROW_INTERLEAVED",
+            "fixed_size_list<xy: double not null>[2]",
+        ),
+        (
+            ogr.wkbLineString,
+            "GEOARROW_STRUCT",
+            "list<vertices: struct<x: double not null, y: double not null>>",
+        ),
+        (
+            ogr.wkbLineString,
+            "GEOARROW_INTERLEAVED",
+            "list<vertices: fixed_size_list<xy: double not null>[2]>",
+        ),
+        (
+            ogr.wkbPolygon,
+            "GEOARROW_STRUCT",
+            "list<rings: list<vertices: struct<x: double not null, y: double not null>>>",
+        ),
+        (
+            ogr.wkbPolygon,
+            "GEOARROW_INTERLEAVED",
+            "list<rings: list<vertices: fixed_size_list<xy: double not null>[2]>>",
+        ),
+        (
+            ogr.wkbMultiPoint,
+            "GEOARROW_STRUCT",
+            "list<points: struct<x: double not null, y: double not null>>",
+        ),
+        (
+            ogr.wkbMultiPoint,
+            "GEOARROW_INTERLEAVED",
+            "list<points: fixed_size_list<xy: double not null>[2]>",
+        ),
+        (
+            ogr.wkbMultiLineString,
+            "GEOARROW_STRUCT",
+            "list<linestrings: list<vertices: struct<x: double not null, y: double not null>>>",
+        ),
+        (
+            ogr.wkbMultiLineString,
+            "GEOARROW_INTERLEAVED",
+            "list<linestrings: list<vertices: fixed_size_list<xy: double not null>[2]>>",
+        ),
+        (
+            ogr.wkbMultiPolygon,
+            "GEOARROW_STRUCT",
+            "list<polygons: list<rings: list<vertices: struct<x: double not null, y: double not null>>>>",
+        ),
+        (
+            ogr.wkbMultiPolygon,
+            "GEOARROW_INTERLEAVED",
+            "list<polygons: list<rings: list<vertices: fixed_size_list<xy: double not null>[2]>>>",
+        ),
+    ],
+)
+def test_ogr_arrow_check_geoarrow_types(
+    tmp_path, geom_type, encoding, expected_arrow_type
+):
+    pytest.importorskip("pyarrow")
+    import pyarrow.feather
+
+    filename = str(tmp_path / "out.feather")
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(4326)
+    with ogr.GetDriverByName("ARROW").CreateDataSource(filename) as ds:
+        ds.CreateLayer(
+            "test",
+            geom_type=geom_type,
+            srs=srs,
+            options=["GEOMETRY_ENCODING=" + encoding],
+        )
+
+    schema = pyarrow.feather.read_table(filename).schema
+    assert str(schema.field("geometry").type) == expected_arrow_type
diff --git a/autotest/ogr/ogr_as_sqlite_extension.py b/autotest/ogr/ogr_as_sqlite_extension.py
index 4dd19201ce89..6efa4ccf0317 100755
--- a/autotest/ogr/ogr_as_sqlite_extension.py
+++ b/autotest/ogr/ogr_as_sqlite_extension.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 # This file is meant at being run by ogr_virtualogr_3()
diff --git a/autotest/ogr/ogr_avc.py b/autotest/ogr/ogr_avc.py
index 7e154ded3e3d..cd2bcd0aaaf7 100755
--- a/autotest/ogr/ogr_avc.py
+++ b/autotest/ogr/ogr_avc.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/ogr/ogr_basic_test.py b/autotest/ogr/ogr_basic_test.py
index ee33cc6d5b8a..09703b7deaf5 100755
--- a/autotest/ogr/ogr_basic_test.py
+++ b/autotest/ogr/ogr_basic_test.py
@@ -1228,6 +1228,8 @@ def test_driver_open_throw_2():
 
     with gdaltest.enable_exceptions():
         drv = ogr.GetDriverByName("MapInfo File")
+        if not drv:
+            pytest.skip("MapInfo driver not available")
 
         assert isinstance(drv, ogr.Driver)
 
diff --git a/autotest/ogr/ogr_cad.py b/autotest/ogr/ogr_cad.py
index 6909f87b19e4..906144e70941 100755
--- a/autotest/ogr/ogr_cad.py
+++ b/autotest/ogr/ogr_cad.py
@@ -12,23 +12,7 @@
 #  Copyright (c) 2016 Alexandr Borzykh
 #  Copyright (c) 2016-2019, NextGIS <info@nextgis.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.
+# SPDX-License-Identifier: MIT
 ################################################################################
 
 
diff --git a/autotest/ogr/ogr_carto.py b/autotest/ogr/ogr_carto.py
index cd593aedfeaf..30cf4d025291 100755
--- a/autotest/ogr/ogr_carto.py
+++ b/autotest/ogr/ogr_carto.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import uuid
diff --git a/autotest/ogr/ogr_csv.py b/autotest/ogr/ogr_csv.py
index 0d861ffa26d3..0ab07472aed8 100755
--- a/autotest/ogr/ogr_csv.py
+++ b/autotest/ogr/ogr_csv.py
@@ -27,6 +27,7 @@
 # Boston, MA 02111-1307, USA.
 ###############################################################################
 
+import math
 import pathlib
 import sys
 
@@ -712,6 +713,9 @@ def test_ogr_csv_17():
 
 def test_ogr_csv_write_to_stdout():
 
+    if gdaltest.is_travis_branch("sanitize"):
+        pytest.skip("fails on sanitize for unknown reason")
+
     python_exe = sys.executable
     if sys.platform == "win32":
         python_exe = python_exe.replace("\\", "/")
@@ -3089,6 +3093,96 @@ def test_ogr_csv_geom_coord_precision_OGR_APPLY_GEOM_SET_PRECISION(tmp_vsimem):
     assert b"MULTIPOLYGON" in data
 
 
+###############################################################################
+# Test invalid GEOMETRY option
+
+
+@gdaltest.enable_exceptions()
+def test_ogr_csv_invalid_geometry_option(tmp_vsimem):
+
+    filename = str(tmp_vsimem / "test.csv")
+    ds = gdal.GetDriverByName("CSV").Create(filename, 0, 0, 0, gdal.GDT_Unknown)
+    with pytest.raises(
+        Exception,
+        match="Geometry type 3D Line String is not compatible with GEOMETRY=AS_XYZ",
+    ):
+        ds.CreateLayer(
+            "test", geom_type=ogr.wkbLineString25D, options=["GEOMETRY=AS_XYZ"]
+        )
+
+    filename = str(tmp_vsimem / "test2.csv")
+    ds = gdal.GetDriverByName("CSV").Create(filename, 0, 0, 0, gdal.GDT_Unknown)
+    with gdal.quiet_errors(), pytest.raises(
+        Exception, match="Unsupported value foo for creation option GEOMETRY"
+    ):
+        ds.CreateLayer("test", geom_type=ogr.wkbLineString25D, options=["GEOMETRY=foo"])
+
+
+###############################################################################
+# Test force opening a CSV file
+
+
+@gdaltest.enable_exceptions()
+def test_ogr_csv_force_opening(tmp_vsimem):
+
+    filename = str(tmp_vsimem / "test.bin")
+
+    with gdaltest.vsi_open(filename, "wb") as fdest:
+        fdest.write(b"foo\nbar\n")
+
+    with pytest.raises(Exception):
+        gdal.OpenEx(filename)
+
+    ds = gdal.OpenEx(filename, allowed_drivers=["CSV"])
+    assert ds.GetDriver().GetDescription() == "CSV"
+
+
+###############################################################################
+# Test opening a CSV file with inf/nan numeric values
+
+
+@gdaltest.enable_exceptions()
+def test_ogr_csv_inf_nan():
+
+    ds = gdal.OpenEx("data/csv/inf_nan.csv", open_options=["AUTODETECT_TYPE=YES"])
+    lyr = ds.GetLayer(0)
+    assert lyr.GetLayerDefn().GetFieldDefn(1).GetType() == ogr.OFTReal
+    f = lyr.GetNextFeature()
+    assert f["v"] == 10.0
+    f = lyr.GetNextFeature()
+    assert f["v"] == float("inf")
+    f = lyr.GetNextFeature()
+    assert f["v"] == float("-inf")
+    f = lyr.GetNextFeature()
+    assert math.isnan(f["v"])
+
+
+###############################################################################
+# Test reading invalid WKT
+
+
+@gdaltest.enable_exceptions()
+def test_ogr_csv_invalid_wkt(tmp_vsimem):
+
+    filename = str(tmp_vsimem / "test.csv")
+
+    with gdaltest.vsi_open(filename, "wb") as fdest:
+        fdest.write(b"id,WKT\n")
+        fdest.write(b'1,"POINT (1"\n')
+        fdest.write(b'1,"POINT (1 2)"\n')
+
+    ds = ogr.Open(filename)
+    lyr = ds.GetLayer(0)
+    gdal.ErrorReset()
+    with gdal.quiet_errors():
+        f = lyr.GetNextFeature()
+    assert gdal.GetLastErrorMsg() == "Ignoring invalid WKT: POINT (1"
+    assert f.GetGeometryRef() is None
+    f = lyr.GetNextFeature()
+    assert gdal.GetLastErrorMsg() == ""
+    assert f.GetGeometryRef().ExportToWkt() == "POINT (1 2)"
+
+
 ###############################################################################
 
 
diff --git a/autotest/ogr/ogr_csw.py b/autotest/ogr/ogr_csw.py
index 653de9c73981..715b75f12be5 100755
--- a/autotest/ogr/ogr_csw.py
+++ b/autotest/ogr/ogr_csw.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
@@ -46,9 +30,14 @@ def module_disable_exceptions():
 ###############################################################################
 @pytest.fixture(autouse=True, scope="module")
 def setup_and_cleanup():
+
+    vsimem_hidden_before = gdal.ReadDirRecursive("/vsimem/.#!HIDDEN!#.")
+
     with gdal.config_option("CPL_CURL_ENABLE_VSIMEM", "YES"):
         yield
 
+    assert gdal.ReadDirRecursive("/vsimem/.#!HIDDEN!#.") == vsimem_hidden_before
+
 
 ###############################################################################
 # Test underlying OGR drivers
diff --git a/autotest/ogr/ogr_db2_hack.py b/autotest/ogr/ogr_db2_hack.py
index 9878ad6d6be4..154a1cab5030 100755
--- a/autotest/ogr/ogr_db2_hack.py
+++ b/autotest/ogr/ogr_db2_hack.py
@@ -44,14 +44,12 @@ def test_ogr_db2_hack_1():
     # XDR Case.
     geom = ogr.CreateGeometryFromWkt("POINT(10 20)")
     wkb = geom.ExportToWkb(byte_order=ogr.wkbXDR).decode("latin1")
-    geom.Destroy()
 
     assert wkb[0] == "0", "WKB wkbXDR point geometry has wrong byte order"
 
     # NDR Case.
     geom = ogr.CreateGeometryFromWkt("POINT(10 20)")
     wkb = geom.ExportToWkb(byte_order=ogr.wkbNDR).decode("latin1")
-    geom.Destroy()
 
     assert wkb[0] == "1", "WKB wkbNDR point geometry has wrong byte order"
 
@@ -65,14 +63,12 @@ def test_ogr_db2_hack_1():
     # XDR Case.
     geom = ogr.CreateGeometryFromWkt("POINT(10 20)")
     wkb = geom.ExportToWkb(byte_order=ogr.wkbXDR).decode("latin1")
-    geom.Destroy()
 
     assert wkb[0] == chr(0), "WKB wkbXDR point geometry has wrong byte order"
 
     # NDR Case.
     geom = ogr.CreateGeometryFromWkt("POINT(10 20)")
     wkb = geom.ExportToWkb(byte_order=ogr.wkbNDR).decode("latin1")
-    geom.Destroy()
 
     assert wkb[0] == chr(1), "WKB wkbNDR point geometry has wrong byte order"
 
@@ -90,7 +86,6 @@ def test_ogr_db2_hack_3():
 
     geom = ogr.CreateGeometryFromWkt(wkt)
     wkb = geom.ExportToWkb()
-    geom.Destroy()
 
     # Check primary byte order value.
     assert (
@@ -107,6 +102,4 @@ def test_ogr_db2_hack_3():
         "Conversion to/from DB2 format seems to have " "corrupted geometry."
     )
 
-    geom.Destroy()
-
     ogr.SetGenerate_DB2_V72_BYTE_ORDER(0)
diff --git a/autotest/ogr/ogr_dgn.py b/autotest/ogr/ogr_dgn.py
index 6d5551aa1873..5cf724fc168c 100755
--- a/autotest/ogr/ogr_dgn.py
+++ b/autotest/ogr/ogr_dgn.py
@@ -315,3 +315,32 @@ def test_ogr_dgn_open_dgnv8_not_supported():
     finally:
         if dgnv8_drv:
             dgnv8_drv.Register()
+
+
+###############################################################################
+# Test ENCODING creation option and open option
+
+
+def test_ogr_dgn_encoding(tmp_path):
+
+    filename = tmp_path / "test.dgn"
+    with ogr.GetDriverByName("DGN").CreateDataSource(
+        filename, options=["ENCODING=ISO-8859-1"]
+    ) as ds:
+        lyr = ds.CreateLayer("elements")
+        f = ogr.Feature(lyr.GetLayerDefn())
+        f["Text"] = "\xc3\xa9ven"  # UTF-8 encoded
+        f.SetGeometry(ogr.CreateGeometryFromWkt("POINT(0 0)"))
+        lyr.CreateFeature(f)
+
+    with ogr.Open(filename) as ds:
+        lyr = ds.GetLayer(0)
+        assert lyr.TestCapability(ogr.OLCStringsAsUTF8) == 0
+        f = lyr.GetNextFeature()
+        assert f["Text"] == "\xe9ven"  # ISO-8859-1
+
+    with gdal.OpenEx(filename, open_options=["ENCODING=ISO-8859-1"]) as ds:
+        lyr = ds.GetLayer(0)
+        assert lyr.TestCapability(ogr.OLCStringsAsUTF8) == 1
+        f = lyr.GetNextFeature()
+        assert f["Text"] == "\xc3\xa9ven"  # UTF-8
diff --git a/autotest/ogr/ogr_dgnv8.py b/autotest/ogr/ogr_dgnv8.py
index 1b7b77262c3c..aa3c9c61cf46 100755
--- a/autotest/ogr/ogr_dgnv8.py
+++ b/autotest/ogr/ogr_dgnv8.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2017, Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/ogr/ogr_dwg.py b/autotest/ogr/ogr_dwg.py
index 9f9e7be46236..17df5abb4921 100755
--- a/autotest/ogr/ogr_dwg.py
+++ b/autotest/ogr/ogr_dwg.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2017, Jorge Gustavo Rocha <jgr at geomaster dot pt>
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import json
diff --git a/autotest/ogr/ogr_dxf.py b/autotest/ogr/ogr_dxf.py
index 1e11b9d389e8..2f96653d95ed 100644
--- a/autotest/ogr/ogr_dxf.py
+++ b/autotest/ogr/ogr_dxf.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2009, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
@@ -3890,12 +3874,21 @@ def test_ogr_dxf_54():
 # Test hidden objects in blocks
 
 
-def test_ogr_dxf_55():
+@pytest.mark.parametrize("use_config_option", [True, False])
+def test_ogr_dxf_55(use_config_option):
 
-    with gdaltest.config_option("DXF_MERGE_BLOCK_GEOMETRIES", "FALSE"):
-        ds = ogr.Open("data/dxf/block-hidden-entities.dxf")
+    if use_config_option:
+        with gdaltest.config_option("DXF_MERGE_BLOCK_GEOMETRIES", "FALSE"):
+            ds = ogr.Open("data/dxf/block-hidden-entities.dxf")
+    else:
+        ds = gdal.OpenEx(
+            "data/dxf/block-hidden-entities.dxf",
+            open_options={"MERGE_BLOCK_GEOMETRIES": False},
+        )
     lyr = ds.GetLayer(0)
 
+    assert lyr.GetFeatureCount() == 6
+
     # Red features should be hidden, black features should be visible
     for number, f in enumerate(lyr):
         assert "#ff000000)" in f.GetStyleString() or "#000000)" in f.GetStyleString(), (
@@ -3993,3 +3986,30 @@ def test_ogr_dxf_read_broken_file_2():
         lyr = ds.GetLayer(0)
         for f in lyr:
             pass
+
+
+###############################################################################
+
+
+def test_ogr_dxf_read_closed_polyline_with_bulge():
+    """Test https://github.com/OSGeo/gdal/issues/10153"""
+
+    ds = ogr.Open("data/dxf/closed_polyline_with_bulge.dxf")
+    lyr = ds.GetLayer(0)
+    f = lyr.GetNextFeature()
+    g = f.GetGeometryRef()
+    assert g.GetX(0) == g.GetX(g.GetPointCount() - 1)
+    assert g.GetY(0) == g.GetY(g.GetPointCount() - 1)
+    assert (
+        g.ExportToWkt()
+        == "LINESTRING (40585366.7065058 3433935.53809098,40585329.9256486 3433998.44081707,40585329.9256486 3433998.44081707,40585328.5387678 3434000.63680805,40585327.0051198 3434002.73293274,40585325.3318693 3434004.71939884,40585323.526833 3434006.58692634,40585321.5984435 3434008.32679087,40585319.5557093 3434009.93086443,40585317.4081735 3434011.39165342,40585315.1658683 3434012.70233358,40585312.8392691 3434013.85678191,40585310.4392448 3434014.84960528,40585307.9770074 3434015.67616559,40585305.4640596 3434016.33260146,40585302.9121409 3434016.81584629,40585300.3331728 3434017.12364253,40585297.7392033 3434017.25455227,40585271.1313178 3434017.68678191,40585252.1698149 3433885.99037548,40585256.74147 3433885.9161116,40585256.74147 3433885.9161116,40585266.2920614 3433886.0916242,40585275.8076317 3433886.92740148,40585285.2425893 3433888.41943902,40585294.551729 3433890.56058809,40585303.6904483 3433893.34058991,40585312.6149614 3433896.74612477,40585321.2825086 3433900.76087591,40585329.6515615 3433905.36560764,40585364.2483736 3433925.99220872,40585364.2483736 3433925.99220872,40585364.6481964 3433926.24937651,40585365.0296424 3433926.53308859,40585365.3909523 3433926.84203644,40585365.7304596 3433927.17479516,40585366.0465985 3433927.52983003,40585366.337911 3433927.90550359,40585366.6030535 3433928.30008319,40585366.840803 3433928.71174899,40585367.0500632 3433929.13860232,40585367.2298688 3433929.5786745,40585367.3793906 3433930.02993587,40585367.4979389 3433930.49030515,40585367.5849671 3433930.95765907,40585367.6400736 3433931.42984214,40585367.6630045 3433931.9046766,40585367.6536538 3433932.37997246,40585367.6120647 3433932.85353759,40585367.5384291 3433933.32318787,40585367.4330866 3433933.7867572,40585367.2965229 3433934.24210757,40585367.129368 3433934.68713883,40585366.9323928 3433935.11979846,40585366.7065058 3433935.53809098)"
+    )
+
+    ds = gdal.OpenEx(
+        "data/dxf/closed_polyline_with_bulge.dxf",
+        open_options=["CLOSED_LINE_AS_POLYGON=YES"],
+    )
+    lyr = ds.GetLayer(0)
+    f = lyr.GetNextFeature()
+    g = f.GetGeometryRef()
+    assert g.GetGeometryType() == ogr.wkbPolygon
diff --git a/autotest/ogr/ogr_edigeo.py b/autotest/ogr/ogr_edigeo.py
index 63e1e6276830..66b42e578c1d 100755
--- a/autotest/ogr/ogr_edigeo.py
+++ b/autotest/ogr/ogr_edigeo.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/ogr/ogr_eeda.py b/autotest/ogr/ogr_eeda.py
index 8360d2eb109e..a08ce389d481 100755
--- a/autotest/ogr/ogr_eeda.py
+++ b/autotest/ogr/ogr_eeda.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2017, Planet Labs
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import json
diff --git a/autotest/ogr/ogr_elasticsearch.py b/autotest/ogr/ogr_elasticsearch.py
index 7824a7f340fe..c6f22e9b4fbe 100755
--- a/autotest/ogr/ogr_elasticsearch.py
+++ b/autotest/ogr/ogr_elasticsearch.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import json
diff --git a/autotest/ogr/ogr_esrijson.py b/autotest/ogr/ogr_esrijson.py
index 83c1e42319dc..fd11a2ce5dc4 100755
--- a/autotest/ogr/ogr_esrijson.py
+++ b/autotest/ogr/ogr_esrijson.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2009-2019, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import contextlib
@@ -102,6 +86,10 @@ def test_ogr_esrijson_read_point():
     assert rc
 
     layer_defn = lyr.GetLayerDefn()
+
+    fld_defn = layer_defn.GetFieldDefn(layer_defn.GetFieldIndex("objectid"))
+    assert fld_defn.GetAlternativeName() == "Object ID"
+
     fld_defn = layer_defn.GetFieldDefn(layer_defn.GetFieldIndex("fooDate"))
     assert fld_defn.GetType() == ogr.OFTDateTime
     assert fld_defn.GetWidth() == 0
@@ -687,3 +675,51 @@ def test_ogr_esrijson_identify_srs():
     sr = lyr.GetSpatialRef()
     assert sr
     assert sr.GetAuthorityCode(None) == "2223"
+
+
+###############################################################################
+# Test for https://github.com/OSGeo/gdal/issues/9996
+
+
+def test_ogr_esrijson_read_CadastralSpecialServices():
+
+    ds = ogr.Open("data/esrijson/GetLatLon.json")
+    lyr = ds.GetLayer(0)
+    sr = lyr.GetSpatialRef()
+    assert sr
+    assert sr.GetAuthorityCode(None) == "4326"
+    assert lyr.GetGeomType() != ogr.wkbNone
+    f = lyr.GetNextFeature()
+    assert f["landdescription"] == "WA330160N0260E0SN070"
+    assert f.GetGeometryRef().GetGeometryType() == ogr.wkbPolygon
+
+
+###############################################################################
+# Test force opening a ESRIJSON file
+
+
+def test_ogr_esrijson_force_opening(tmp_vsimem):
+
+    filename = str(tmp_vsimem / "test.json")
+
+    with open("data/esrijson/esripoint.json", "rb") as fsrc:
+        with gdaltest.vsi_open(filename, "wb") as fdest:
+            fdest.write(fsrc.read(1))
+            fdest.write(b" " * (1000 * 1000))
+            fdest.write(fsrc.read())
+
+    with pytest.raises(Exception):
+        gdal.OpenEx(filename)
+
+    ds = gdal.OpenEx(filename, allowed_drivers=["ESRIJSON"])
+    assert ds.GetDriver().GetDescription() == "ESRIJSON"
+
+
+###############################################################################
+# Test force opening a URL as ESRIJSON
+
+
+def test_ogr_esrijson_force_opening_url():
+
+    drv = gdal.IdentifyDriverEx("http://example.com", allowed_drivers=["ESRIJSON"])
+    assert drv.GetDescription() == "ESRIJSON"
diff --git a/autotest/ogr/ogr_factory.py b/autotest/ogr/ogr_factory.py
index d1a7c1a8cf6e..6de4499166d2 100755
--- a/autotest/ogr/ogr_factory.py
+++ b/autotest/ogr/ogr_factory.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2008, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2010-2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/ogr/ogr_feature.py b/autotest/ogr/ogr_feature.py
index 51a9713feaa4..be2db1812bb9 100755
--- a/autotest/ogr/ogr_feature.py
+++ b/autotest/ogr/ogr_feature.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2011, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import pytest
@@ -923,6 +907,7 @@ def test_ogr_feature_GetFieldAsISO8601DateTime():
     assert feature.GetFieldAsISO8601DateTime("field_datetime") == ""
 
 
+@pytest.mark.require_driver("MapInfo File")
 def test_ogr_feature_dump_readable():
 
     ds = ogr.Open("data/mitab/single_point_mapinfo.tab")
diff --git a/autotest/ogr/ogr_fgdb.py b/autotest/ogr/ogr_fgdb.py
index 24e7af30bf3d..efdafd567434 100755
--- a/autotest/ogr/ogr_fgdb.py
+++ b/autotest/ogr/ogr_fgdb.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2011-2014, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -3143,3 +3127,30 @@ def test_ogr_filegdb_write_geom_coord_precision(tmp_path):
             "HighPrecision": "true",
         }
     }
+
+
+###############################################################################
+# Test dummy use of CreateLayerFromGeomFieldDefn() with a geometry field
+# definition of type wkbNone
+
+
+def test_ogr_filegdb_CreateLayerFromGeomFieldDefn_geom_type_none(tmp_path):
+
+    filename = str(tmp_path / "test.gdb")
+    ds = gdal.GetDriverByName("FileGDB").Create(filename, 0, 0, 0, gdal.GDT_Unknown)
+    geom_fld = ogr.GeomFieldDefn("geometry", ogr.wkbNone)
+    ds.CreateLayerFromGeomFieldDefn("test", geom_fld)
+    ds.Close()
+
+    ds = ogr.Open(filename)
+    lyr = ds.GetLayer(0)
+    assert lyr.GetGeomType() == ogr.wkbNone
+    ds.Close()
+
+    filename2 = str(tmp_path / "test2.gdb")
+    gdal.VectorTranslate(filename2, filename, format="FileGDB")
+
+    ds = ogr.Open(filename2)
+    lyr = ds.GetLayer(0)
+    assert lyr.GetGeomType() == ogr.wkbNone
+    ds.Close()
diff --git a/autotest/ogr/ogr_fgdb_stress_test.py b/autotest/ogr/ogr_fgdb_stress_test.py
index fb42898fb24f..e72a6e87cab1 100755
--- a/autotest/ogr/ogr_fgdb_stress_test.py
+++ b/autotest/ogr/ogr_fgdb_stress_test.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/ogr/ogr_fielddomain.py b/autotest/ogr/ogr_fielddomain.py
index 92872940438c..8994bf5d7779 100755
--- a/autotest/ogr/ogr_fielddomain.py
+++ b/autotest/ogr/ogr_fielddomain.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2021, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import pytest
diff --git a/autotest/ogr/ogr_flatgeobuf.py b/autotest/ogr/ogr_flatgeobuf.py
index a37597cc044c..bdbd0819e106 100644
--- a/autotest/ogr/ogr_flatgeobuf.py
+++ b/autotest/ogr/ogr_flatgeobuf.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2018-2019, Björn Harrtell <bjorn@wololo.org>
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -41,12 +25,6 @@
 
 pytestmark = pytest.mark.require_driver("FlatGeobuf")
 
-###############################################################################
-@pytest.fixture(autouse=True, scope="module")
-def module_disable_exceptions():
-    with gdaltest.disable_exceptions():
-        yield
-
 
 ###############################################################################
 @pytest.fixture(autouse=True, scope="module")
@@ -648,11 +626,10 @@ def test_ogr_flatgeobuf_huge_number_of_columns():
             lyr.CreateField(ogr.FieldDefn("col%d" % i, ogr.OFTInteger))
             == ogr.OGRERR_NONE
         ), i
-    with gdal.quiet_errors():
-        assert (
-            lyr.CreateField(ogr.FieldDefn("col65536", ogr.OFTInteger))
-            == ogr.OGRERR_FAILURE
-        )
+    with pytest.raises(
+        Exception, match="Cannot create features with more than 65536 columns"
+    ):
+        lyr.CreateField(ogr.FieldDefn("col65536", ogr.OFTInteger))
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetGeometry(ogr.CreateGeometryFromWkt("POINT (0 0)"))
     for i in range(65536):
@@ -765,7 +742,8 @@ def test_ogr_flatgeobuf_editing():
 
     assert lyr.TestCapability(ogr.OLCDeleteFeature) == 1
     assert lyr.DeleteFeature(1) == 0
-    assert lyr.DeleteFeature(1) == ogr.OGRERR_NON_EXISTING_FEATURE
+    with pytest.raises(Exception, match="Non existing feature"):
+        lyr.DeleteFeature(1)
     assert lyr.TestCapability(ogr.OLCReorderFields) == 1
     # assert lyr.ReorderFields([0, 1]) == 0
     assert lyr.DeleteField(1) == 0
@@ -797,8 +775,8 @@ def test_ogr_flatgeobuf_editing():
 
     f = ogr.Feature(lyr.GetLayerDefn())
     f.SetGeometry(ogr.CreateGeometryFromWkt("POINT (1 1)"))
-    with gdal.quiet_errors():
-        assert lyr.CreateFeature(f) != ogr.OGRERR_NONE
+    with pytest.raises(Exception, match="not supported on read-only layer"):
+        lyr.CreateFeature(f)
 
     ogr.GetDriverByName("FlatGeobuf").DeleteDataSource("/vsimem/test.fgb")
     assert not gdal.VSIStatL("/vsimem/test.fgb")
@@ -871,8 +849,27 @@ def test_ogr_flatgeobuf_read_invalid_geometries(filename):
     with gdal.quiet_errors():
         ds = gdal.OpenEx(filename)
         lyr = ds.GetLayer(0)
-        for f in lyr:
-            pass
+        with pytest.raises(Exception, match="Fatal error parsing feature"):
+            for f in lyr:
+                pass
+
+
+###############################################################################
+# Check that we can read multilinestrings with a single part, without the
+# "ends" array (cf https://github.com/OSGeo/gdal/issues/10774)
+
+
+@pytest.mark.parametrize(
+    "filename",
+    [
+        "data/flatgeobuf/test_ogr_flatgeobuf_singlepart_mls_new.fgb",
+    ],
+)
+def test_ogr_flatgeobuf_read_singlepart_mls_new(filename):
+    with gdal.OpenEx(filename) as ds:
+        lyr = ds.GetLayer(0)
+        f = lyr.GetNextFeature()
+        ogrtest.check_feature_geometry(f, "MULTILINESTRING ((0 0,1 1))")
 
 
 ###############################################################################
@@ -959,8 +956,8 @@ def test_ogr_flatgeobuf_coordinate_epoch_custom_wkt():
 def test_ogr_flatgeobuf_invalid_output_filename():
 
     ds = ogr.GetDriverByName("FlatGeobuf").CreateDataSource("/i_do/not_exist/my.fgb")
-    with gdal.quiet_errors():
-        assert ds.CreateLayer("foo") is None
+    with pytest.raises(Exception, match="Failed to create"):
+        ds.CreateLayer("foo")
 
 
 ###############################################################################
@@ -1208,12 +1205,11 @@ def test_ogr_flatgeobuf_issue_7401():
     f.SetGeometry(ogr.CreateGeometryFromWkt("POINT (0 0)"))
     lyr.CreateFeature(f)
     f = ogr.Feature(lyr.GetLayerDefn())
-    lyr.CreateFeature(f)
+    with pytest.raises(
+        Exception, match="NULL geometry not supported with spatial index"
+    ):
+        lyr.CreateFeature(f)
     ds = None
-    assert (
-        gdal.GetLastErrorMsg()
-        == "ICreateFeature: NULL geometry not supported with spatial index"
-    )
 
     ogr.GetDriverByName("FlatGeobuf").DeleteDataSource("/vsimem/test.fgb")
     assert not gdal.VSIStatL("/vsimem/test.fgb")
@@ -1419,3 +1415,152 @@ def test_ogr_flatgeobuf_write_mismatch_geom_type(tmp_vsimem):
         match="ICreateFeature: Mismatched geometry type. Feature geometry type is Line String, expected layer geometry type is Point",
     ):
         lyr.CreateFeature(f)
+
+
+###############################################################################
+# Test OGRGenSQLResultLayer::GetArrowStream() implementation.
+# There isn't much specific of the FlatGeoBuf driver, except it is the
+# only one in a default build that implements OLCFastGetArrowStream and doesn't
+# have a specialized ExecuteSQL() implementation.
+
+
+@gdaltest.enable_exceptions()
+def test_ogr_flatgeobuf_sql_arrow(tmp_vsimem):
+
+    filename = str(tmp_vsimem / "temp.fgb")
+    with ogr.GetDriverByName("FlatGeoBuf").CreateDataSource(filename) as ds:
+        lyr = ds.CreateLayer("test", geom_type=ogr.wkbPoint)
+        lyr.CreateField(ogr.FieldDefn("foo"))
+        lyr.CreateField(ogr.FieldDefn("bar"))
+        f = ogr.Feature(lyr.GetLayerDefn())
+        f["foo"] = "bar"
+        f["bar"] = "baz"
+        f.SetGeometry(ogr.CreateGeometryFromWkt("POINT (1 2)"))
+        lyr.CreateFeature(f)
+        f = ogr.Feature(lyr.GetLayerDefn())
+        f["foo"] = "bar2"
+        f["bar"] = "baz2"
+        f.SetGeometry(ogr.CreateGeometryFromWkt("POINT (3 4)"))
+        lyr.CreateFeature(f)
+
+    with ogr.Open(filename) as ds:
+        with ds.ExecuteSQL("SELECT 'a' FROM test") as lyr:
+            assert not lyr.TestCapability(ogr.OLCFastGetArrowStream)
+
+            tmp_ds = ogr.GetDriverByName("Memory").CreateDataSource("")
+            tmp_lyr = tmp_ds.CreateLayer("test")
+            tmp_lyr.WriteArrow(lyr)
+            f = tmp_lyr.GetNextFeature()
+            assert f["FIELD_1"] == "a"
+
+        with ds.ExecuteSQL("SELECT foo, foo FROM test") as lyr:
+            assert not lyr.TestCapability(ogr.OLCFastGetArrowStream)
+
+        with ds.ExecuteSQL("SELECT CONCAT(foo, 'x') FROM test") as lyr:
+            assert not lyr.TestCapability(ogr.OLCFastGetArrowStream)
+
+        with ds.ExecuteSQL("SELECT foo AS renamed, foo FROM test") as lyr:
+            assert not lyr.TestCapability(ogr.OLCFastGetArrowStream)
+
+        with ds.ExecuteSQL("SELECT bar, foo FROM test") as lyr:
+            assert not lyr.TestCapability(ogr.OLCFastGetArrowStream)
+
+        with ds.ExecuteSQL("SELECT CAST(foo AS float) FROM test") as lyr:
+            assert not lyr.TestCapability(ogr.OLCFastGetArrowStream)
+
+        with ds.ExecuteSQL("SELECT MIN(foo) FROM test") as lyr:
+            assert not lyr.TestCapability(ogr.OLCFastGetArrowStream)
+
+        with ds.ExecuteSQL("SELECT COUNT(*) FROM test") as lyr:
+            assert not lyr.TestCapability(ogr.OLCFastGetArrowStream)
+
+        with ds.ExecuteSQL("SELECT * FROM test a JOIN test b ON a.foo = b.foo") as lyr:
+            assert not lyr.TestCapability(ogr.OLCFastGetArrowStream)
+
+        with ds.ExecuteSQL("SELECT * FROM test OFFSET 1") as lyr:
+            assert not lyr.TestCapability(ogr.OLCFastGetArrowStream)
+
+        with ds.ExecuteSQL("SELECT * FROM test ORDER BY foo") as lyr:
+            assert not lyr.TestCapability(ogr.OLCFastGetArrowStream)
+
+        with ds.ExecuteSQL("SELECT *, OGR_STYLE HIDDEN FROM test") as lyr:
+            assert not lyr.TestCapability(ogr.OLCFastGetArrowStream)
+
+        with ds.ExecuteSQL("SELECT DISTINCT foo FROM test") as lyr:
+            assert not lyr.TestCapability(ogr.OLCFastGetArrowStream)
+
+        with ds.ExecuteSQL("SELECT * FROM test") as lyr:
+            try:
+                stream = lyr.GetArrowStreamAsNumPy()
+            except ImportError:
+                stream = None
+        if stream:
+            with pytest.raises(
+                Exception,
+                match=r"Calling get_next\(\) on a freed OGRLayer is not supported",
+            ):
+                [batch for batch in stream]
+
+        sql = "SELECT foo, bar AS bar_renamed FROM test"
+        with ds.ExecuteSQL(sql) as lyr:
+            assert lyr.TestCapability(ogr.OLCFastGetArrowStream)
+
+            tmp_ds = ogr.GetDriverByName("Memory").CreateDataSource("")
+            tmp_lyr = tmp_ds.CreateLayer("test")
+            tmp_lyr.WriteArrow(lyr)
+            assert tmp_lyr.GetLayerDefn().GetFieldCount() == 2
+            assert tmp_lyr.GetLayerDefn().GetFieldDefn(0).GetName() == "foo"
+            assert tmp_lyr.GetLayerDefn().GetFieldDefn(1).GetName() == "bar_renamed"
+            assert tmp_lyr.GetFeatureCount() == 2
+            f = tmp_lyr.GetNextFeature()
+            assert f["foo"] == "bar2"
+            assert f["bar_renamed"] == "baz2"
+            assert f.GetGeometryRef().ExportToWkt() == "POINT (3 4)"
+            f = tmp_lyr.GetNextFeature()
+            assert f["foo"] == "bar"
+            assert f["bar_renamed"] == "baz"
+            assert f.GetGeometryRef().ExportToWkt() == "POINT (1 2)"
+
+        sql = "SELECT bar FROM test LIMIT 1"
+        with ds.ExecuteSQL(sql) as lyr:
+            assert lyr.TestCapability(ogr.OLCFastGetArrowStream)
+
+            tmp_ds = ogr.GetDriverByName("Memory").CreateDataSource("")
+            tmp_lyr = tmp_ds.CreateLayer("test")
+            tmp_lyr.WriteArrow(lyr)
+            assert tmp_lyr.GetLayerDefn().GetFieldCount() == 1
+            assert tmp_lyr.GetFeatureCount() == 1
+            f = tmp_lyr.GetNextFeature()
+            assert f["bar"] == "baz2"
+            assert f.GetGeometryRef().ExportToWkt() == "POINT (3 4)"
+
+        sql = "SELECT * EXCLUDE (\"_ogr_geometry_\") FROM test WHERE foo = 'bar'"
+        with ds.ExecuteSQL(sql) as lyr:
+            assert lyr.TestCapability(ogr.OLCFastGetArrowStream)
+
+            tmp_ds = ogr.GetDriverByName("Memory").CreateDataSource("")
+            tmp_lyr = tmp_ds.CreateLayer("test")
+            tmp_lyr.WriteArrow(lyr)
+            assert tmp_lyr.GetFeatureCount() == 1
+            f = tmp_lyr.GetNextFeature()
+            assert f["foo"] == "bar"
+            assert f["bar"] == "baz"
+            assert f.GetGeometryRef() is None
+
+        sql = "SELECT * FROM test"
+        with ds.ExecuteSQL(sql) as lyr:
+            lyr.SetSpatialFilterRect(1, 2, 1, 2)
+            assert lyr.TestCapability(ogr.OLCFastGetArrowStream)
+
+            tmp_ds = ogr.GetDriverByName("Memory").CreateDataSource("")
+            tmp_lyr = tmp_ds.CreateLayer("test")
+            tmp_lyr.WriteArrow(lyr)
+            assert tmp_lyr.GetLayerDefn().GetFieldCount() == 2
+            assert tmp_lyr.GetLayerDefn().GetFieldDefn(0).GetName() == "foo"
+            assert tmp_lyr.GetLayerDefn().GetFieldDefn(1).GetName() == "bar"
+            assert tmp_lyr.GetFeatureCount() == 1
+            f = tmp_lyr.GetNextFeature()
+            assert f["foo"] == "bar"
+            assert f["bar"] == "baz"
+            assert f.GetGeometryRef().ExportToWkt() == "POINT (1 2)"
+            f = tmp_lyr.GetNextFeature()
diff --git a/autotest/ogr/ogr_geoconcept.py b/autotest/ogr/ogr_geoconcept.py
index 42290916a6e8..32df14e4e900 100755
--- a/autotest/ogr/ogr_geoconcept.py
+++ b/autotest/ogr/ogr_geoconcept.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2008, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2008, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import ogrtest
diff --git a/autotest/ogr/ogr_geojson.py b/autotest/ogr/ogr_geojson.py
index f905273b2939..4bc636f9e01a 100755
--- a/autotest/ogr/ogr_geojson.py
+++ b/autotest/ogr/ogr_geojson.py
@@ -1591,7 +1591,7 @@ def test_ogr_geojson_46(tmp_vsimem):
 
 
 ###############################################################################
-# Test update support
+# Test SetFeature() support
 
 
 @gdaltest.disable_exceptions()
@@ -1764,7 +1764,7 @@ def test_ogr_geojson_47(tmp_vsimem):
 
 
 ###############################################################################
-# Test update support with file that has a single feature not in a FeatureCollection
+# Test SetFeature() support with file that has a single feature not in a FeatureCollection
 
 
 def test_ogr_geojson_48(tmp_vsimem):
@@ -1802,6 +1802,46 @@ def test_ogr_geojson_48(tmp_vsimem):
     )
 
 
+###############################################################################
+# Test UpdateFeature() support
+
+
+@pytest.mark.parametrize("check_after_update_before_reopen", [True, False])
+@pytest.mark.parametrize("sync_to_disk_after_update", [True, False])
+def test_ogr_geojson_update_feature(
+    tmp_vsimem, check_after_update_before_reopen, sync_to_disk_after_update
+):
+
+    filename = str(tmp_vsimem / "test.json")
+
+    with ogr.GetDriverByName("GeoJSON").CreateDataSource(filename) as ds:
+        lyr = ds.CreateLayer("test")
+        lyr.CreateField(ogr.FieldDefn("int64list", ogr.OFTInteger64List))
+        f = ogr.Feature(lyr.GetLayerDefn())
+        f["int64list"] = [123456790123, -123456790123]
+        lyr.CreateFeature(f)
+
+    with ogr.Open(filename, update=1) as ds:
+        lyr = ds.GetLayer(0)
+        f = ogr.Feature(lyr.GetLayerDefn())
+        f.SetFID(0)
+        f["int64list"] = [-123456790123, 123456790123]
+        lyr.UpdateFeature(f, [0], [], False)
+
+        if sync_to_disk_after_update:
+            lyr.SyncToDisk()
+
+        if check_after_update_before_reopen:
+            lyr.ResetReading()
+            f = lyr.GetNextFeature()
+            assert f["int64list"] == [-123456790123, 123456790123]
+
+    with ogr.Open(filename) as ds:
+        lyr = ds.GetLayer(0)
+        f = lyr.GetNextFeature()
+        assert f["int64list"] == [-123456790123, 123456790123]
+
+
 ###############################################################################
 # Test ARRAY_AS_STRING
 
@@ -2631,15 +2671,32 @@ def test_ogr_geojson_57(tmp_vsimem):
 
     got = read_file(tmp_vsimem / "out.json")
     gdal.Unlink(tmp_vsimem / "out.json")
-    expected = """{
-"type": "FeatureCollection",
-"bbox": [ 45.0000000, 64.3861643, 135.0000000, 90.0000000 ],
-"features": [
-{ "type": "Feature", "properties": { }, "bbox": [ 45.0, 64.3861643, 135.0, 90.0 ], "geometry": { "type": "Polygon", "coordinates": [ [ [ 135.0, 64.3861643 ], [ 135.0, 90.0 ], [ 45.0, 90.0 ], [ 45.0, 64.3861643 ], [ 135.0, 64.3861643 ] ] ] } }
-]
-}
-"""
-    assert json.loads(got) == json.loads(expected)
+    expected = {
+        "type": "FeatureCollection",
+        "bbox": [45.0, 64.3861643, 135.0, 90.0],
+        "features": [
+            {
+                "type": "Feature",
+                "properties": {},
+                "bbox": [45.0, 64.3861643, 135.0, 90.0],
+                "geometry": {
+                    "type": "MultiPolygon",
+                    "coordinates": [
+                        [
+                            [
+                                [135.0, 64.3861643],
+                                [135.0, 90.0],
+                                [45.0, 90.0],
+                                [45.0, 64.3861643],
+                                [135.0, 64.3861643],
+                            ]
+                        ]
+                    ],
+                },
+            }
+        ],
+    }
+    assert json.loads(got) == expected
 
     # Polar case: slice of spherical cap crossing the antimeridian
     src_ds = gdal.GetDriverByName("Memory").Create("", 0, 0, 0)
@@ -4079,7 +4136,7 @@ def test_ogr_geojson_write_rfc7946_from_3D_crs(tmp_vsimem):
     ds = ogr.GetDriverByName("GeoJSON").CreateDataSource(filename)
     lyr = ds.CreateLayer("out", srs=srs_4326_5773, options=["RFC7946=YES"])
     f = ogr.Feature(lyr.GetLayerDefn())
-    f.SetGeometry(ogr.CreateGeometryFromWkt("POINT(%.18g %.18g %.18g)" % (lon, lat, z)))
+    f.SetGeometry(ogr.CreateGeometryFromWkt("POINT(%.17g %.17g %.17g)" % (lon, lat, z)))
     lyr.CreateFeature(f)
     ds = None
 
@@ -4280,6 +4337,28 @@ def test_ogr_geojson_test_ogrsf():
     assert "ERROR" not in ret
 
 
+###############################################################################
+# Run test_ogrsf
+
+
+def test_ogr_geojson_test_ogrsf_update(tmp_path):
+
+    import test_cli_utilities
+
+    if test_cli_utilities.get_test_ogrsf_path() is None:
+        pytest.skip()
+
+    filename = str(tmp_path / "out.json")
+    gdal.VectorTranslate(filename, "data/poly.shp", format="GeoJSON")
+
+    ret = gdaltest.runexternal(
+        test_cli_utilities.get_test_ogrsf_path() + f" {filename}"
+    )
+
+    assert "INFO" in ret
+    assert "ERROR" not in ret
+
+
 ###############################################################################
 # Test fix for https://github.com/OSGeo/gdal/issues/7313
 
@@ -4437,6 +4516,7 @@ def test_ogr_geojson_write_geometry_validity_fixing_rfc7946(tmp_vsimem):
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     assert f.GetGeometryRef().IsValid()
+    assert "((6.3889058 51.3181847," in f.GetGeometryRef().ExportToWkt()
 
 
 ###############################################################################
@@ -5201,3 +5281,52 @@ def test_ogr_geojson_identify_jsonfg_with_geojson():
             "data/jsonfg/crs_none.json", allowed_drivers=["GeoJSON", "JSONFG"]
         )
         assert drv.GetDescription() == "JSONFG"
+
+
+###############################################################################
+# Test opening a file that has a "type: "Topology" feature property
+
+
+def test_ogr_geojson_feature_with_type_Topology_property():
+
+    ds = gdal.OpenEx("data/geojson/feature_with_type_Topology_property.json")
+    assert ds.GetDriver().GetDescription() == "GeoJSON"
+
+
+###############################################################################
+# Test force opening a GeoJSON file
+
+
+def test_ogr_geojson_force_opening(tmp_vsimem):
+
+    filename = str(tmp_vsimem / "test.json")
+
+    with gdaltest.vsi_open(filename, "wb") as f:
+        f.write(
+            b"{"
+            + b" " * (1000 * 1000)
+            + b' "type": "FeatureCollection", "features":[]}'
+        )
+
+    with pytest.raises(Exception):
+        gdal.OpenEx(filename)
+
+    ds = gdal.OpenEx(filename, allowed_drivers=["GeoJSON"])
+    assert ds.GetDriver().GetDescription() == "GeoJSON"
+
+    drv = gdal.IdentifyDriverEx("http://example.com", allowed_drivers=["GeoJSON"])
+    assert drv.GetDescription() == "GeoJSON"
+
+
+###############################################################################
+# Test force opening a STACTA file with GeoJSON
+
+
+def test_ogr_geojson_force_opening_stacta():
+
+    if gdal.GetDriverByName("STACTA"):
+        ds = gdal.OpenEx("../gdrivers/data/stacta/test.json")
+        assert ds.GetDriver().GetDescription() == "STACTA"
+
+    ds = gdal.OpenEx("../gdrivers/data/stacta/test.json", allowed_drivers=["GeoJSON"])
+    assert ds.GetDriver().GetDescription() == "GeoJSON"
diff --git a/autotest/ogr/ogr_geojsonseq.py b/autotest/ogr/ogr_geojsonseq.py
index b60a8969aa11..c041f1735b06 100755
--- a/autotest/ogr/ogr_geojsonseq.py
+++ b/autotest/ogr/ogr_geojsonseq.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2018, Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
@@ -34,6 +18,8 @@
 
 from osgeo import gdal, ogr, osr
 
+pytestmark = pytest.mark.require_driver("GeoJSONSeq")
+
 
 def _ogr_geojsonseq_create(filename, lco, expect_rs):
 
@@ -490,3 +476,50 @@ def test_ogr_geojsonseq_geom_coord_precision_not_4326(tmp_vsimem):
     gdal.VSIFCloseL(f)
 
     assert b'"coordinates": [ 2.363925, 45.151706, 9.877 ]' in data
+
+
+###############################################################################
+# Test force opening a GeoJSONSeq file
+
+
+def test_ogr_geojsonseq_force_opening(tmp_vsimem):
+
+    filename = str(tmp_vsimem / "test.json")
+
+    with gdaltest.vsi_open(filename, "wb") as f:
+        f.write(
+            b"{"
+            + b" " * (1000 * 1000)
+            + b' "type": "Feature", "properties":{},"geometry":null}\n'
+        )
+
+    with pytest.raises(Exception):
+        gdal.OpenEx(filename)
+
+    ds = gdal.OpenEx(filename, allowed_drivers=["GeoJSONSeq"])
+    assert ds.GetDriver().GetDescription() == "GeoJSONSeq"
+
+    drv = gdal.IdentifyDriverEx("http://example.com", allowed_drivers=["GeoJSONSeq"])
+    assert drv.GetDescription() == "GeoJSONSeq"
+
+
+###############################################################################
+# Test WRITE_BBOX option
+
+
+def test_ogr_geojsonseq_WRITE_BBOX(tmp_vsimem):
+
+    filename = str(tmp_vsimem / "test.geojsonl")
+    ds = gdal.GetDriverByName("GeoJSONSeq").Create(filename, 0, 0, 0, gdal.GDT_Unknown)
+    lyr = ds.CreateLayer("test", options=["WRITE_BBOX=YES"])
+    f = ogr.Feature(lyr.GetLayerDefn())
+    f.SetGeometry(ogr.CreateGeometryFromWkt("LINESTRING(2 49,3 50)"))
+    lyr.CreateFeature(f)
+    ds.Close()
+
+    f = gdal.VSIFOpenL(filename, "rb")
+    assert f
+    data = gdal.VSIFReadL(1, 10000, f)
+    gdal.VSIFCloseL(f)
+
+    assert b'"bbox": [ 2.0, 49.0, 3.0, 50.0 ]' in data
diff --git a/autotest/ogr/ogr_geom.py b/autotest/ogr/ogr_geom.py
index 51245d12808f..67911355b88c 100755
--- a/autotest/ogr/ogr_geom.py
+++ b/autotest/ogr/ogr_geom.py
@@ -646,6 +646,42 @@ def test_ogr_geom_transform_to():
     assert not (ret == 0 or gdal.GetLastErrorMsg() == "")
 
 
+###############################################################################
+# Test TransformTo() with 3D coordinates
+
+
+@pytest.mark.parametrize(
+    "input_wkt,output_wkt",
+    [
+        ("POINT Z (90 -90 0)", "POINT Z (0 0 -6356752.31424518)"),
+        ("POINT ZM (90 -90 0 20)", "POINT ZM (0 0 -6356752.31424518 20)"),
+        (
+            "LINESTRING Z (90 -90 0,0 0 1000000000)",
+            "LINESTRING Z (0 0 -6356752.31424518,1006378137.0 0 0)",
+        ),
+        (
+            "LINESTRING ZM (90 -90 0 20,0 0 1000000000 30)",
+            "LINESTRING ZM (0 0 -6356752.31424518 20,1006378137.0 0 0 30)",
+        ),
+    ],
+)
+def test_ogr_geom_transform_3d_to(input_wkt, output_wkt):
+
+    # Input SRS is EPSG:4979
+    sr = osr.SpatialReference()
+    sr.ImportFromEPSG(4979)
+    sr.SetAxisMappingStrategy(osr.OAMS_TRADITIONAL_GIS_ORDER)
+
+    # Output SRS is EPSG:4978
+    sr2 = osr.SpatialReference()
+    sr2.ImportFromEPSG(4978)
+
+    geom = ogr.CreateGeometryFromWkt(input_wkt)
+    geom.AssignSpatialReference(sr)
+    assert geom.TransformTo(sr2) == 0
+    ogrtest.check_feature_geometry(geom, output_wkt)
+
+
 ###############################################################################
 # Test Transform()
 
@@ -874,11 +910,11 @@ def test_ogr_geom_segmentize():
     for i in range(g1.GetPointCount()):
         if g1.GetPoint(i) != g2.GetPoint(g1.GetPointCount() - 1 - i):
             print(
-                "%.18g"
+                "%.17g"
                 % (g1.GetPoint(i)[0] - g2.GetPoint(g1.GetPointCount() - 1 - i)[0])
             )
             pytest.fail(
-                "%.18g"
+                "%.17g"
                 % (g1.GetPoint(i)[1] - g2.GetPoint(g1.GetPointCount() - 1 - i)[1])
             )
 
@@ -982,50 +1018,38 @@ def test_ogr_geom_flattenTo2D_triangle():
 ###############################################################################
 
 
+@gdaltest.enable_exceptions()
 def test_ogr_geom_linestring_limits():
 
     geom = ogr.CreateGeometryFromWkt("LINESTRING EMPTY")
     assert geom.Length() == 0
 
-    gdal.ErrorReset()
-    with gdal.quiet_errors():
+    with pytest.raises(Exception):
         geom.GetPoint(-1)
-    assert gdal.GetLastErrorType() != 0
 
-    gdal.ErrorReset()
-    with gdal.quiet_errors():
+    with pytest.raises(Exception):
         geom.GetPoint(0)
-    assert gdal.GetLastErrorType() != 0
 
-    gdal.ErrorReset()
-    with gdal.quiet_errors():
+    with pytest.raises(Exception):
         geom.GetPoint_2D(-1)
-    assert gdal.GetLastErrorType() != 0
 
-    gdal.ErrorReset()
-    with gdal.quiet_errors():
+    with pytest.raises(Exception):
         geom.GetPoint_2D(0)
-    assert gdal.GetLastErrorType() != 0
 
-    gdal.ErrorReset()
-    with gdal.quiet_errors():
+    with pytest.raises(Exception):
         geom.SetPoint(-1, 5, 6, 7)
-    assert gdal.GetLastErrorType() != 0
 
-    gdal.ErrorReset()
-    with gdal.quiet_errors():
+    with pytest.raises(Exception):
         geom.SetPoint_2D(-1, 5, 6)
-    assert gdal.GetLastErrorType() != 0
 
-    gdal.ErrorReset()
-    with gdal.quiet_errors():
-        geom.SetPoint(2147000000, 5, 6, 7)
-    assert gdal.GetLastErrorType() != 0
+    with pytest.raises(Exception):
+        geom.SetPoint((1 << 31) - 2, 5, 6, 7)
 
-    gdal.ErrorReset()
-    with gdal.quiet_errors():
-        geom.SetPoint_2D(2147000000, 5, 6)
-    assert gdal.GetLastErrorType() != 0
+    with pytest.raises(Exception):
+        geom.SetPoint_2D((1 << 31) - 2, 5, 6)
+
+    with pytest.raises(Exception):
+        geom.SetPoint_2D((1 << 31) - 1, 5, 6)
 
     geom = ogr.CreateGeometryFromWkt("LINESTRING(0 0)")
     assert geom.Length() == 0
@@ -1109,7 +1133,7 @@ def test_ogr_geom_length_geometrycollection():
     geom = ogr.CreateGeometryFromWkt(geom_wkt)
 
     length = geom.Length()
-    assert length == pytest.approx(4, abs=0.00000000001), (
+    assert length == pytest.approx(8, abs=0.00000000001), (
         "Length() result wrong, got %g." % length
     )
 
@@ -1634,11 +1658,11 @@ def test_ogr_geom_circularstring():
     for i in range(g1.GetPointCount()):
         if g1.GetPoint(i) != g2.GetPoint(g1.GetPointCount() - 1 - i):
             print(
-                "%.18g"
+                "%.17g"
                 % (g1.GetPoint(i)[0] - g2.GetPoint(g1.GetPointCount() - 1 - i)[0])
             )
             pytest.fail(
-                "%.18g"
+                "%.17g"
                 % (g1.GetPoint(i)[1] - g2.GetPoint(g1.GetPointCount() - 1 - i)[1])
             )
 
@@ -3962,21 +3986,57 @@ def test_ogr_geom_makevalid():
             g, "MULTIPOLYGON (((0 0,5 5,10 0,0 0)),((5 5,0 10,10 10,5 5)))"
         )
 
-    if (
-        ogr.GetGEOSVersionMajor() * 10000
-        + ogr.GetGEOSVersionMinor() * 100
-        + ogr.GetGEOSVersionMicro()
-        >= 31000
-    ):
-        g = ogr.CreateGeometryFromWkt(
-            "POLYGON ((0 0,0 10,10 10,10 0,0 0),(5 5,15 10,15 0,5 5))"
-        )
-        # Only since GEOS 3.10
-        g = g.MakeValid(["METHOD=STRUCTURE"])
-        if g is not None:
-            ogrtest.check_feature_geometry(
-                g, "POLYGON ((0 10,10 10,10.0 7.5,5 5,10.0 2.5,10 0,0 0,0 10))"
-            )
+
+###############################################################################
+
+
+@pytest.mark.require_geos(3, 10, 0)
+def test_ogr_geom_makevalid_structure():
+
+    g = ogr.CreateGeometryFromWkt(
+        "POLYGON ((0 0,0 10,10 10,10 0,0 0),(5 5,15 10,15 0,5 5))"
+    )
+    g = g.MakeValid(["METHOD=STRUCTURE"])
+    ogrtest.check_feature_geometry(
+        g, "POLYGON ((0 10,10 10,10.0 7.5,5 5,10.0 2.5,10 0,0 0,0 10))"
+    )
+
+    # Already valid multi-polygon made of a single-part
+    g = ogr.CreateGeometryFromWkt("MULTIPOLYGON (((0 0,1 0,1 1,0 1,0 0)))")
+    g = g.MakeValid(["METHOD=STRUCTURE"])
+    assert (
+        g.ExportToIsoWkt() == "MULTIPOLYGON (((0 0,1 0,1 1,0 1,0 0)))"
+        or g.ExportToIsoWkt() == "MULTIPOLYGON (((0 0,0 1,1 1,1 0,0 0)))"
+    )
+
+    # Already valid multi-polygon made of a single-part, with duplicated point
+    g = ogr.CreateGeometryFromWkt("MULTIPOLYGON (((0 0,1 0,1 0,1 1,0 1,0 0)))")
+    g = g.MakeValid(["METHOD=STRUCTURE"])
+    assert (
+        g.ExportToIsoWkt() == "MULTIPOLYGON (((0 0,1 0,1 1,0 1,0 0)))"
+        or g.ExportToIsoWkt() == "MULTIPOLYGON (((0 0,0 1,1 1,1 0,0 0)))"
+    )
+
+    # Already valid multi-polygon made of a single-part
+    g = ogr.CreateGeometryFromWkt(
+        "MULTIPOLYGON Z (((0 0 10,1 0 10,1 1 10,0 1 10,0 0 10)))"
+    )
+    g = g.MakeValid(["METHOD=STRUCTURE"])
+    assert (
+        g.ExportToIsoWkt() == "MULTIPOLYGON Z (((0 0 10,1 0 10,1 1 10,0 1 10,0 0 10)))"
+        or g.ExportToIsoWkt()
+        == "MULTIPOLYGON Z (((0 0 10,0 1 10,1 1 10,1 0 10,0 0 10)))"
+    )
+
+    # Already valid geometry collection
+    g = ogr.CreateGeometryFromWkt(
+        "GEOMETRYCOLLECTION (POLYGON ((0 0,1 0,1 1,0 1,0 0)))"
+    )
+    g = g.MakeValid(["METHOD=STRUCTURE"])
+    assert (
+        g.ExportToIsoWkt() == "GEOMETRYCOLLECTION (POLYGON ((0 0,1 0,1 1,0 1,0 0)))"
+        or g.ExportToIsoWkt() == "GEOMETRYCOLLECTION (POLYGON ((0 0,0 1,1 1,1 0,0 0)))"
+    )
 
 
 ###############################################################################
@@ -4462,6 +4522,173 @@ def test_ogr_geom_GeodesicArea():
         g.GeodesicArea()
 
 
+###############################################################################
+
+
+@gdaltest.enable_exceptions()
+def test_ogr_geom_GeodesicLength():
+
+    # Lat, lon order
+    g = ogr.CreateGeometryFromWkt("LINESTRING(49 2,49 3,48 3,49 2)")
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(4326)
+    g.AssignSpatialReference(srs)
+    assert g.GeodesicLength() == pytest.approx(317885.78639964823)
+
+    # Lat, lon order
+    g = ogr.CreateGeometryFromWkt("POLYGON((49 2,49 3,48 3,49 2))")
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(4326)
+    g.AssignSpatialReference(srs)
+    assert g.GeodesicLength() == pytest.approx(317885.78639964823)
+
+    # Lon, lat order
+    g = ogr.CreateGeometryFromWkt("POLYGON((2 49,3 49,3 48,2 49))")
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(4326)
+    srs.SetAxisMappingStrategy(osr.OAMS_TRADITIONAL_GIS_ORDER)
+    g.AssignSpatialReference(srs)
+    assert g.GeodesicLength() == pytest.approx(317885.78639964823)
+
+    # Lon, lat order
+    g = ogr.CreateGeometryFromWkt("POLYGON((12 49,13 49,13 48,12 49))")
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(4326)
+    srs.SetAxisMappingStrategy(osr.OAMS_TRADITIONAL_GIS_ORDER)
+    g.AssignSpatialReference(srs)
+    assert g.GeodesicLength() == pytest.approx(317885.78639964823)
+
+    # Lon, lat order
+    g = ogr.CreateGeometryFromWkt("POLYGON((2 89,3 89,3 88,2 89))")
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(4326)
+    srs.SetAxisMappingStrategy(osr.OAMS_TRADITIONAL_GIS_ORDER)
+    g.AssignSpatialReference(srs)
+    assert g.GeodesicLength() == pytest.approx(225369.66747743438)
+
+    # easting, northing
+    g = ogr.CreateGeometryFromWkt("POLYGON((49 2,49 3,48 3,49 2))")
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(4326)
+    g.AssignSpatialReference(srs)
+    other_srs = osr.SpatialReference()
+    other_srs.ImportFromEPSG(32631)
+    g.TransformTo(other_srs)
+    assert g.GeodesicLength() == pytest.approx(317885.78639964823)
+    # For comparison: cartesian length in UTM.
+    assert g.Length() == pytest.approx(317763.15996565996)
+
+    # POLYGON with hole
+    g = ogr.CreateGeometryFromWkt(
+        "POLYGON((49 2,49 3,48 3,49 2),(49 2,49 3,48 3,49 2))"
+    )
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(4326)
+    g.AssignSpatialReference(srs)
+    assert g.GeodesicLength() == pytest.approx(635771.5727992965)
+
+    # MULTIPOLYGON
+    g = ogr.CreateGeometryFromWkt(
+        "MULTIPOLYGON(((49 2,49 3,48 3,49 2)),((89 2,89 3,88 3,89 2)))"
+    )
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(4326)
+    g.AssignSpatialReference(srs)
+    assert g.GeodesicLength() == pytest.approx(317885.78639964823 + 225369.66747743438)
+
+    # POLYGON EMPTY
+    g = ogr.CreateGeometryFromWkt("POLYGON EMPTY")
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(4326)
+    g.AssignSpatialReference(srs)
+    assert g.GeodesicLength() == 0
+
+    # GEOMETRYCOLLECTION
+    g = ogr.CreateGeometryFromWkt(
+        "GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POLYGON((49 2,49 3,48 3,49 2))),LINESTRING(89 2,89 3,88 3,89 2))))"
+    )
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(4326)
+    g.AssignSpatialReference(srs)
+    assert g.GeodesicLength() == pytest.approx(317885.78639964823 + 225369.66747743438)
+
+    # CIRCULARSTRING
+    g = ogr.CreateGeometryFromWkt("CIRCULARSTRING(0 0,1 1,2 0,1 -1,0 0)")
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(4326)
+    g.AssignSpatialReference(srs)
+    assert g.GeodesicLength() == ogr.ForceToLineString(g).GeodesicLength()
+
+    # CIRCULARSTRING EMPTY
+    g = ogr.CreateGeometryFromWkt("CIRCULARSTRING EMPTY")
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(4326)
+    g.AssignSpatialReference(srs)
+    assert g.GeodesicLength() == 0
+
+    # COMPOUNDCURVE
+    g = ogr.CreateGeometryFromWkt("COMPOUNDCURVE(CIRCULARSTRING(0 0,1 1,2 0,1 -1,0 0))")
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(4326)
+    g.AssignSpatialReference(srs)
+    assert g.GeodesicLength() == ogr.ForceToLineString(g).GeodesicLength()
+
+    # COMPOUNDCURVE EMPTY
+    g = ogr.CreateGeometryFromWkt("COMPOUNDCURVE EMPTY")
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(4326)
+    g.AssignSpatialReference(srs)
+    assert g.GeodesicLength() == 0
+
+    # POLYHEDRALSURFACE EMPTY
+    g = ogr.CreateGeometryFromWkt("POLYHEDRALSURFACE EMPTY")
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(4326)
+    g.AssignSpatialReference(srs)
+    assert g.GeodesicLength() == 0
+
+    # POLYHEDRALSURFACE
+    g = ogr.CreateGeometryFromWkt("POLYHEDRALSURFACE(((0 0 0,0 1 0,1 1 0,0 0 0)))")
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(4326)
+    g.AssignSpatialReference(srs)
+    with pytest.raises(Exception, match="not implemented for PolyhedralSurface"):
+        g.GeodesicLength()
+
+    # GEOMETRYCOLLECTION of POLYHEDRALSURFACE
+    g = ogr.CreateGeometryFromWkt(
+        "GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POLYHEDRALSURFACE(((0 0 0,0 1 0,1 1 0,0 0 0)))))"
+    )
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(4326)
+    g.AssignSpatialReference(srs)
+    with pytest.raises(Exception, match="not implemented for PolyhedralSurface"):
+        g.GeodesicLength()
+
+    # Incompatible geometry type
+    g = ogr.CreateGeometryFromWkt("POINT(0 1)")
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(4326)
+    g.AssignSpatialReference(srs)
+    with pytest.raises(Exception, match="non-curve geometry type"):
+        g.GeodesicLength()
+
+    # No SRS
+    g = ogr.CreateGeometryFromWkt("POLYGON((49 2,49 3,48 3,49 2))")
+    with pytest.raises(
+        Exception, match="Cannot compute length on ellipsoid due to missing SRS"
+    ):
+        g.GeodesicLength()
+
+    # Engineering SRS
+    g = ogr.CreateGeometryFromWkt("POLYGON((49 2,49 3,48 3,49 2))")
+    srs = osr.SpatialReference()
+    srs.SetFromUserInput('LOCAL_CS["dummy"]')
+    g.AssignSpatialReference(srs)
+    with pytest.raises(Exception, match="CRS has no geodetic CRS"):
+        g.GeodesicLength()
+
+
 @pytest.mark.require_geos
 @gdaltest.enable_exceptions()
 def test_ogr_geom_buffer_with_args():
@@ -4519,3 +4746,13 @@ def test_ogr_geom_buffer_with_args():
 
     with pytest.raises(Exception, match="Unsupported buffer option"):
         geom.Buffer(1, {"QUALITY": "HIGH"})
+
+
+def test_ogr_subgeom_use_after_parent_free():
+
+    g = ogr.CreateGeometryFromWkt("POLYGON ((0 0, 1 0, 1 1, 0 0))")
+
+    exterior_ring = g.GetGeometryRef(0)
+    del g
+
+    assert exterior_ring.GetPointCount() > 0  # does not crash
diff --git a/autotest/ogr/ogr_geomcoordinateprecision.py b/autotest/ogr/ogr_geomcoordinateprecision.py
index bb070410c47f..ddd11dd3e5de 100755
--- a/autotest/ogr/ogr_geomcoordinateprecision.py
+++ b/autotest/ogr/ogr_geomcoordinateprecision.py
@@ -8,23 +8,7 @@
 ###############################################################################
 # Copyright (c) 2024, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import pytest
diff --git a/autotest/ogr/ogr_georss.py b/autotest/ogr/ogr_georss.py
index 4019e22144eb..5387d45585b1 100755
--- a/autotest/ogr/ogr_georss.py
+++ b/autotest/ogr/ogr_georss.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/ogr/ogr_geos.py b/autotest/ogr/ogr_geos.py
index 343d28bf7967..fee81566d24f 100755
--- a/autotest/ogr/ogr_geos.py
+++ b/autotest/ogr/ogr_geos.py
@@ -309,6 +309,19 @@ def test_ogr_geos_centroid_point_empty():
 ###############################################################################
 
 
+def test_ogr_geos_centroid_polygon_with_empty_interior_ring():
+
+    g = ogr.CreateGeometryFromWkt("POLYGON((0 0,0 1,1 1,1 0,0 0))")
+    g.AddGeometry(ogr.Geometry(ogr.wkbLinearRing))
+
+    centroid = g.Centroid()
+
+    assert centroid.ExportToWkt() == "POINT (0.5 0.5)"
+
+
+###############################################################################
+
+
 @pytest.mark.require_geos(3, 12)
 def test_ogr_geos_pointzm_empty():
 
diff --git a/autotest/ogr/ogr_gml.py b/autotest/ogr/ogr_gml.py
index 0d592827c032..da3a16c808e6 100755
--- a/autotest/ogr/ogr_gml.py
+++ b/autotest/ogr/ogr_gml.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2006, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -1362,6 +1346,35 @@ def test_ogr_gml_38(tmp_path, resolver):
     ds = None
 
 
+###############################################################################
+# Test GML_SKIP_RESOLVE_ELEMS=HUGE with a file with 2 nested identical property
+# names
+
+
+@pytest.mark.require_driver("SQLite")
+@pytest.mark.require_geos
+def test_ogr_gml_huge_resolver_same_nested_property_name(tmp_path):
+
+    shutil.copy(
+        "data/gml/same_nested_property_name.gml",
+        tmp_path,
+    )
+
+    def check_ds(ds):
+        lyr = ds.GetLayer(0)
+        f = lyr.GetNextFeature()
+        assert f["gml_id"] == "test.0"
+        assert f["test"] == "foo"
+        assert f["bar|test"] == "bar"
+
+    ds = ogr.Open(tmp_path / "same_nested_property_name.gml")
+    check_ds(ds)
+
+    with gdal.config_option("GML_SKIP_RESOLVE_ELEMS", "HUGE"):
+        ds = ogr.Open(tmp_path / "same_nested_property_name.gml")
+        check_ds(ds)
+
+
 ###############################################################################
 # Test parsing XSD where simpleTypes not inlined, but defined elsewhere in the .xsd (#4328)
 
@@ -2529,6 +2542,25 @@ def test_ogr_gml_64(parser):
     assert feat is not None, parser
 
 
+###############################################################################
+# Test we don't spend too much time parsing documents featuring the billion
+# laugh attack
+
+
+@gdaltest.enable_exceptions()
+@pytest.mark.parametrize("parser", ("XERCES", "EXPAT"))
+def test_ogr_gml_billion_laugh(parser):
+
+    with gdal.config_option("GML_PARSER", parser), pytest.raises(
+        Exception, match="File probably corrupted"
+    ):
+        with gdal.OpenEx("data/gml/billionlaugh.gml") as ds:
+            assert ds.GetDriver().GetDescription() == "GML"
+            for lyr in ds:
+                for f in lyr:
+                    pass
+
+
 ###############################################################################
 # Test SRSDIMENSION_LOC=GEOMETRY option (#5606)
 
@@ -4327,3 +4359,288 @@ def test_ogr_gml_geom_link_to_immediate_child():
         "data/gml/link_to_immediate_child.gml", open_options=["WRITE_GFS=NO"]
     )
     assert ds
+
+
+###############################################################################
+# Test scenario of https://github.com/OSGeo/gdal/issues/10332
+
+
+@pytest.mark.parametrize("use_create_geom_field", [False, True])
+@pytest.mark.parametrize("has_srs", [False, True])
+def test_ogr_gml_ogr2ogr_from_layer_with_name_geom_field(
+    tmp_vsimem, use_create_geom_field, has_srs
+):
+
+    ds = gdal.GetDriverByName("Memory").Create("", 0, 0, 0, gdal.GDT_Unknown)
+    if has_srs:
+        srs = osr.SpatialReference()
+        srs.ImportFromEPSG(4326)
+        srs.SetAxisMappingStrategy(osr.OAMS_TRADITIONAL_GIS_ORDER)
+    else:
+        srs = None
+    if use_create_geom_field:
+        lyr = ds.CreateLayer("test", geom_type=ogr.wkbNone)
+        my_geom_field = ogr.GeomFieldDefn("my_geom", ogr.wkbUnknown)
+        my_geom_field.SetSpatialRef(srs)
+        lyr.CreateGeomField(my_geom_field)
+    else:
+        lyr = ds.CreateLayer("test", geom_type=ogr.wkbUnknown, srs=srs)
+    f = ogr.Feature(lyr.GetLayerDefn())
+    f.SetGeometryDirectly(ogr.CreateGeometryFromWkt("POINT(2 49)"))
+    lyr.CreateFeature(f)
+    f = ogr.Feature(lyr.GetLayerDefn())
+    f.SetGeometryDirectly(ogr.CreateGeometryFromWkt("POINT(3 50)"))
+    lyr.CreateFeature(f)
+
+    out_filename = str(tmp_vsimem / "out.gml")
+    gdal.VectorTranslate(out_filename, ds, format="GML")
+
+    f = gdal.VSIFOpenL(out_filename, "rb")
+    assert f
+    try:
+        data = gdal.VSIFReadL(1, 10000, f)
+    finally:
+        gdal.VSIFCloseL(f)
+
+    if has_srs:
+        assert (
+            b'<gml:boundedBy><gml:Envelope srsName="urn:ogc:def:crs:EPSG::4326"><gml:lowerCorner>49 2</gml:lowerCorner><gml:upperCorner>50 3</gml:upperCorner></gml:Envelope></gml:boundedBy>'
+            in data
+        )
+    else:
+        assert (
+            b"<gml:boundedBy><gml:Envelope><gml:lowerCorner>2 49</gml:lowerCorner><gml:upperCorner>3 50</gml:upperCorner></gml:Envelope></gml:boundedBy>"
+            in data
+        )
+
+
+###############################################################################
+
+
+@pytest.mark.parametrize("first_layer_has_srs", [False, True])
+def test_ogr_gml_ogr2ogr_from_layers_with_inconsistent_srs(
+    tmp_vsimem, first_layer_has_srs
+):
+
+    ds = gdal.GetDriverByName("Memory").Create("", 0, 0, 0, gdal.GDT_Unknown)
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(4326)
+    srs.SetAxisMappingStrategy(osr.OAMS_TRADITIONAL_GIS_ORDER)
+    lyr = ds.CreateLayer(
+        "test", geom_type=ogr.wkbUnknown, srs=(srs if first_layer_has_srs else None)
+    )
+    f = ogr.Feature(lyr.GetLayerDefn())
+    f.SetGeometryDirectly(ogr.CreateGeometryFromWkt("POINT(2 49)"))
+    lyr.CreateFeature(f)
+
+    lyr = ds.CreateLayer(
+        "test2", geom_type=ogr.wkbUnknown, srs=(None if first_layer_has_srs else srs)
+    )
+    f = ogr.Feature(lyr.GetLayerDefn())
+    f.SetGeometryDirectly(ogr.CreateGeometryFromWkt("POINT(3 50)"))
+    lyr.CreateFeature(f)
+
+    out_filename = str(tmp_vsimem / "out.gml")
+    gdal.VectorTranslate(out_filename, ds, format="GML")
+
+    f = gdal.VSIFOpenL(out_filename, "rb")
+    assert f
+    try:
+        data = gdal.VSIFReadL(1, 10000, f)
+    finally:
+        gdal.VSIFCloseL(f)
+
+    assert b"<gml:boundedBy><gml:Null /></gml:boundedBy>" in data
+
+
+####################################################################################
+# Test if gml can access and use imported schemas along with included schemas
+# Open option is set to NO to disable the functionality
+
+
+def test_ogr_gml_USE_SCHEMA_IMPORT_NO(tmp_path):
+
+    # copy schema files and gml
+    shutil.copy("data/gml/min_example/ft1_schema.xsd", tmp_path)
+    shutil.copy("data/gml/min_example/ft2_schema.xsd", tmp_path)
+    shutil.copy("data/gml/min_example/minimal_example.xsd", tmp_path)
+    shutil.copy("data/gml/min_example/minimal_example.gml", tmp_path)
+
+    ds = gdal.OpenEx(
+        tmp_path / "minimal_example.gml", open_options=["USE_SCHEMA_IMPORT=NO"]
+    )
+    layer_count = ds.GetLayerCount()
+    assert (
+        layer_count != 2
+    ), f"Expected number of layers as '1' without open option set, but got {layer_count} "
+
+
+###############################################################################
+# Test if gml can access and use imported schemas along with included schemas
+# Open option is set to YES to enable the functionality
+
+
+def test_ogr_gml_USE_SCHEMA_IMPORT_YES(tmp_path):
+
+    # copy schema files and gml
+    shutil.copy("data/gml/min_example/ft1_schema.xsd", tmp_path)
+    shutil.copy("data/gml/min_example/ft2_schema.xsd", tmp_path)
+    shutil.copy("data/gml/min_example/minimal_example.xsd", tmp_path)
+    shutil.copy("data/gml/min_example/minimal_example.gml", tmp_path)
+
+    ds = gdal.OpenEx(
+        tmp_path / "minimal_example.gml", open_options=["USE_SCHEMA_IMPORT=YES"]
+    )
+
+    layer_count = ds.GetLayerCount()
+    assert (
+        layer_count == 2
+    ), f"Expected number of layers as '2' with open option set, but got {layer_count} "
+
+
+###############################################################################
+# Test if gml can access and use imported schemas along with included schemas
+# Config option is set to YES to enable the functionality
+
+
+def test_ogr_gml_GML_USE_SCHEMA_IMPORT_YES(tmp_path):
+
+    # copy schema files and gml
+    shutil.copy("data/gml/min_example/ft1_schema.xsd", tmp_path)
+    shutil.copy("data/gml/min_example/ft2_schema.xsd", tmp_path)
+    shutil.copy("data/gml/min_example/minimal_example.xsd", tmp_path)
+    shutil.copy("data/gml/min_example/minimal_example.gml", tmp_path)
+
+    with gdal.config_option("GML_USE_SCHEMA_IMPORT", "YES"):
+        ds = ogr.Open(tmp_path / "minimal_example.gml")
+
+    layer_count = ds.GetLayerCount()
+    assert (
+        layer_count == 2
+    ), f"Expected number of layers as '2' with config option set, but got {layer_count} "
+
+
+###############################################################################
+# Test if gml can access and use imported schemas along with included schemas
+# Config option is set to NO to disable the functionality
+
+
+def test_ogr_gml_GML_USE_SCHEMA_IMPORT_NO(tmp_path):
+
+    # copy schema files and gml
+    shutil.copy("data/gml/min_example/ft1_schema.xsd", tmp_path)
+    shutil.copy("data/gml/min_example/ft2_schema.xsd", tmp_path)
+    shutil.copy("data/gml/min_example/minimal_example.xsd", tmp_path)
+    shutil.copy("data/gml/min_example/minimal_example.gml", tmp_path)
+
+    with gdal.config_option("GML_USE_SCHEMA_IMPORT", "NO"):
+        ds = ogr.Open(tmp_path / "minimal_example.gml")
+
+    layer_count = ds.GetLayerCount()
+    assert (
+        layer_count == 1
+    ), f"Expected number of layers as '1' without config option set, but got {layer_count} "
+
+
+########################################################################################################
+# Test if gml can access and use imported schemas along with included schemas with some features testing
+# Open option is set to TRUE to enable the functionality
+
+
+def test_ogr_gml_get_layers_by_name_from_imported_schema(tmp_path):
+
+    # copy schema files and gml
+    shutil.copy("data/gml/min_example/ft1_schema.xsd", tmp_path)
+    shutil.copy("data/gml/min_example/ft2_schema.xsd", tmp_path)
+    shutil.copy("data/gml/min_example/minimal_example.xsd", tmp_path)
+    shutil.copy("data/gml/min_example/minimal_example.gml", tmp_path)
+
+    ds = gdal.OpenEx(
+        tmp_path / "minimal_example.gml", open_options=["USE_SCHEMA_IMPORT=YES"]
+    )
+    layer_count = ds.GetLayerCount()
+    assert layer_count == 2, f"Expected number of layers as '2', but got {layer_count} "
+
+    # layer sanier
+    lyr = ds.GetLayerByName("sanier")
+    feat = lyr.GetNextFeature()
+    assert lyr is not None, "cannot find sanier"
+
+    arokstatus = feat.GetFieldAsString("arokstatus")
+    assert (
+        arokstatus == "Rechtsbestand"
+    ), f"Expected 'arokstatus' to be 'Rechtsbestand', but got {arokstatus}"
+
+    # layer entwick
+    lyr = ds.GetLayerByName("entwick")
+    feat = lyr.GetNextFeature()
+    assert lyr is not None, "cannot find entwick"
+
+    shape_len = feat.GetFieldAsDouble("SHAPE_Leng")
+    assert (
+        shape_len == 8266.565325510000000
+    ), f"Expected 'shape_len' to be '8266.565325510000000', but got {shape_len}"
+
+
+#######################################################################################################
+# Test if gml can access and use imported schemas along with included schemas with some features testing
+# Open option is set to TRUE to enable the functionality
+
+
+def test_ogr_gml_get_layers_by_name_from_imported_schema_more_tests(tmp_path):
+
+    # copy schema files and gml
+    shutil.copy("data/gml/min_example/ft1_schema.xsd", tmp_path)
+    shutil.copy("data/gml/min_example/ft2_schema.xsd", tmp_path)
+    shutil.copy("data/gml/min_example/minimal_example.xsd", tmp_path)
+    shutil.copy("data/gml/min_example/minimal_example.gml", tmp_path)
+
+    ds = gdal.OpenEx(
+        tmp_path / "minimal_example.gml", open_options=["USE_SCHEMA_IMPORT=YES"]
+    )
+
+    layer_count = ds.GetLayerCount()
+    assert layer_count == 2, f"Expected number of layers as '2', but got {layer_count} "
+
+    # layer entwick
+    lyr = ds.GetLayerByName("entwick")
+    feat = lyr.GetNextFeature()
+    shape_len = feat.GetFieldAsDouble("SHAPE_Leng")
+    assert (
+        shape_len == 8266.565325510000000
+    ), f"Expected 'shape_len' to be '8266.565325510000000', but got {shape_len}"
+
+    oa_nr = feat.GetFieldAsDouble("oa_nr")
+    assert isinstance(
+        oa_nr, float
+    ), f"Expected 'oa_nr' to be of type 'float', but got {type(oa_nr).__name__}"
+    assert oa_nr == 430070, f"Expected oa_nr to be '430070', but got {oa_nr}"
+
+    # layer sanier
+    lyr = ds.GetLayerByName("sanier")
+    feat = lyr.GetNextFeature()
+    oa_nr = feat.GetFieldAsString("oa_nr")
+    assert isinstance(
+        oa_nr, str
+    ), f"Expected 'oa_nr' to be of type 'str', but got {type(oa_nr).__name__}"
+    assert oa_nr == "430050", f"Expected oa_nr to be '430050', but got {oa_nr}"
+
+    dat_erst = feat.GetFieldAsDateTime("dat_erst")
+    assert isinstance(
+        dat_erst, list
+    ), f"Expected 'dat_erst' to be of type 'list', but got {type(dat_erst)}"
+
+
+###############################################################################
+# Test force opening a GML file
+
+
+def test_ogr_gml_force_opening(tmp_vsimem):
+
+    filename = str(tmp_vsimem / "test.gml")
+    gdal.FileFromMemBuffer(filename, open("data/nas/empty_nas.xml", "rb").read())
+
+    # Would be opened by NAS driver if not forced
+    with gdal.config_option("NAS_GFS_TEMPLATE", ""):
+        ds = gdal.OpenEx(filename, allowed_drivers=["GML"])
+        assert ds.GetDriver().GetDescription() == "GML"
diff --git a/autotest/ogr/ogr_gml_fgd_read.py b/autotest/ogr/ogr_gml_fgd_read.py
index c3d9920253e4..3c1f305d5ad4 100755
--- a/autotest/ogr/ogr_gml_fgd_read.py
+++ b/autotest/ogr/ogr_gml_fgd_read.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2017, Hiroshi Miura <miurahr@linux.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/ogr/ogr_gml_geom.py b/autotest/ogr/ogr_gml_geom.py
index 46ddda5f0e60..2343e8f7bf3b 100755
--- a/autotest/ogr/ogr_gml_geom.py
+++ b/autotest/ogr/ogr_gml_geom.py
@@ -1579,6 +1579,17 @@ def test_gml_invalid_geoms():
             '<gml:Solid><gml:exterior><Polygon><exterior><LinearRing><posList srsDimension="2">0 0 4 0 4 4 0 4 0 0</posList></LinearRing></exterior></Polygon></gml:exterior><gml:interior/></gml:Solid>',
             "POLYGON ((0 0,4 0,4 4,0 4,0 0))",
         ),
+        ("<gml:OrientableCurve/>", None),
+        ("<gml:OrientableCurve><foo/></gml:OrientableCurve>", None),
+        ("<gml:OrientableCurve><gml:baseCurve/></gml:OrientableCurve>", None),
+        (
+            "<gml:OrientableCurve><gml:baseCurve><foo/></gml:baseCurve></gml:OrientableCurve>",
+            None,
+        ),
+        (
+            "<gml:OrientableCurve><gml:baseCurve><gml:Point><gml:pos>0 0</gml:pos></gml:Point></gml:baseCurve></gml:OrientableCurve>",
+            None,
+        ),
         ("<gml:OrientableSurface/>", None),
         ("<gml:OrientableSurface><foo/></gml:OrientableSurface>", None),
         ("<gml:OrientableSurface><gml:baseSurface/></gml:OrientableSurface>", None),
@@ -3003,3 +3014,22 @@ def test_gml_read_gml_ArcByCenterPoint_projected_crs_northing_easting():
     </gml:Surface>"""
     )
     assert g is not None
+
+
+###############################################################################
+# Test reading an OrientableCurve
+
+
+def test_gml_OrientableCurve():
+
+    g = ogr.CreateGeometryFromGML(
+        """<gml:OrientableCurve srsName="foo" gml:id="test" orientation="+"> <gml:baseCurve> <gml:Curve> <gml:segments> <gml:LineStringSegment> <gml:posList>0 1 2 3</gml:posList> </gml:LineStringSegment> </gml:segments> </gml:Curve> </gml:baseCurve> </gml:OrientableCurve>"""
+    )
+    assert g is not None
+    assert g.ExportToWkt() == "LINESTRING (0 1,2 3)"
+
+    g = ogr.CreateGeometryFromGML(
+        """<gml:OrientableCurve srsName="foo" gml:id="test" orientation="-"> <gml:baseCurve> <gml:Curve> <gml:segments> <gml:LineStringSegment> <gml:posList>0 1 2 3</gml:posList> </gml:LineStringSegment> </gml:segments> </gml:Curve> </gml:baseCurve> </gml:OrientableCurve>"""
+    )
+    assert g is not None
+    assert g.ExportToWkt() == "LINESTRING (2 3,0 1)"
diff --git a/autotest/ogr/ogr_gmlas.py b/autotest/ogr/ogr_gmlas.py
index 13492e7ea21f..58a117a17af7 100755
--- a/autotest/ogr/ogr_gmlas.py
+++ b/autotest/ogr/ogr_gmlas.py
@@ -13,23 +13,7 @@
 # ******************************************************************************
 # Copyright (c) 2016, Even Rouault, <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import difflib
@@ -57,25 +41,18 @@ def module_disable_exceptions():
 @pytest.fixture(autouse=True, scope="module")
 def startup_and_cleanup():
 
-    gdal.SetConfigOption("GMLAS_WARN_UNEXPECTED", "YES")
-
     # FileGDB embedded libxml2 cause random crashes with CPLValidateXML() use of external libxml2
-    old_val_GDAL_XML_VALIDATION = gdal.GetConfigOption("GDAL_XML_VALIDATION")
-    if (
-        ogr.GetDriverByName("FileGDB") is not None
-        and old_val_GDAL_XML_VALIDATION is None
-    ):
-        gdal.SetConfigOption("GDAL_XML_VALIDATION", "NO")
+    # hence GDAL_XML_VALIDATION=NO
 
-    yield
+    with gdaltest.config_options(
+        {"GMLAS_WARN_UNEXPECTED": "YES", "GDAL_XML_VALIDATION": "NO"}
+    ):
+        yield
 
     files = gdal.ReadDir("/vsimem/")
     if files is not None:
         print("Remaining files: " + str(files))
 
-    gdal.SetConfigOption("GMLAS_WARN_UNEXPECTED", None)
-    gdal.SetConfigOption("GDAL_XML_VALIDATION", old_val_GDAL_XML_VALIDATION)
-
 
 ###############################################################################
 
@@ -620,12 +597,10 @@ def test_ogr_gmlas_validate():
     ds = gdal.OpenEx("GMLAS:data/gmlas/gmlas_validate.xml")
     assert ds is not None
     myhandler = MyHandler()
-    gdal.PushErrorHandler(myhandler.error_handler)
-    gdal.SetConfigOption("GMLAS_WARN_UNEXPECTED", None)
-    lyr = ds.GetLayer(0)
-    lyr.GetFeatureCount()
-    gdal.SetConfigOption("GMLAS_WARN_UNEXPECTED", "YES")
-    gdal.PopErrorHandler()
+    with gdaltest.error_handler(myhandler.error_handler):
+        with gdal.config_option("GMLAS_WARN_UNEXPECTED", "NO"):
+            lyr = ds.GetLayer(0)
+            lyr.GetFeatureCount()
     assert not myhandler.error_list
 
     ds = gdal.OpenEx("GMLAS:data/gmlas/gmlas_validate.xml")
@@ -3470,3 +3445,43 @@ def test_ogr_gmlas_bugfix_sf_2371():
     ds = gdal.OpenEx("GMLAS:data/gmlas/citygml_empty_lod1.gml")
     lyr = ds.GetLayerByName("address1")
     assert lyr.GetFeatureCount() == 0
+
+
+###############################################################################
+# Test force opening a GMLAS file
+
+
+@gdaltest.enable_exceptions()
+def test_ogr_gmlas_force_opening(tmp_vsimem):
+
+    ds = gdal.OpenEx("data/gmlas/gmlas_test1.xml", allowed_drivers=["GMLAS"])
+    assert ds.GetDriver().GetDescription() == "GMLAS"
+
+
+###############################################################################
+# Test we don't crash on a OSSFuzz generated xsd
+
+
+@gdaltest.enable_exceptions()
+def test_ogr_gmlas_ossfuzz_70511():
+
+    with gdal.quiet_errors(), pytest.raises(
+        Exception, match="Cannot get type definition for attribute y"
+    ):
+        gdal.OpenEx("GMLAS:", open_options=["XSD=data/gmlas/test_ossfuzz_70511.xsd"])
+
+
+###############################################################################
+# Test we don't spend too much time parsing documents featuring the billion
+# laugh attack
+
+
+@gdaltest.enable_exceptions()
+def test_ogr_gmlas_billion_laugh():
+
+    with gdal.quiet_errors(), pytest.raises(Exception, match="File probably corrupted"):
+        with gdal.OpenEx("GMLAS:data/gml/billionlaugh.gml") as ds:
+            assert ds.GetDriver().GetDescription() == "GMLAS"
+            for lyr in ds:
+                for f in lyr:
+                    pass
diff --git a/autotest/ogr/ogr_gmt.py b/autotest/ogr/ogr_gmt.py
index 3ca15b56f6ff..5d178a2be551 100755
--- a/autotest/ogr/ogr_gmt.py
+++ b/autotest/ogr/ogr_gmt.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/ogr/ogr_gpkg.py b/autotest/ogr/ogr_gpkg.py
index 6b8cfd24aec6..a24249c32a27 100755
--- a/autotest/ogr/ogr_gpkg.py
+++ b/autotest/ogr/ogr_gpkg.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2004, Paul Ramsey <pramsey@boundlessgeom.com>
 # Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import math
@@ -9251,6 +9235,20 @@ def test_ogr_gpkg_sql_gdal_get_pixel_value(tmp_vsimem):
     ds.ReleaseResultSet(sql_lyr)
     assert f[0] == 156
 
+    with gdaltest.config_option("OGR_SQLITE_ALLOW_EXTERNAL_ACCESS", "YES"):
+        with ds.ExecuteSQL(
+            "select gdal_get_pixel_value('../gcore/data/byte.tif', 1, 'georef', 440780 + 30, 3751080 - 30)"
+        ) as sql_lyr:
+            f = sql_lyr.GetNextFeature()
+            assert f[0] == 156
+
+    with gdaltest.config_option("OGR_SQLITE_ALLOW_EXTERNAL_ACCESS", "YES"):
+        with ds.ExecuteSQL(
+            "select gdal_get_pixel_value('../gcore/data/byte.tif', 1, 'georef', 440780 + 30, 3751080 - 30, 'cubicspline')"
+        ) as sql_lyr:
+            f = sql_lyr.GetNextFeature()
+            assert f[0] == pytest.approx(150.1388888888889)
+
     with gdaltest.config_option("OGR_SQLITE_ALLOW_EXTERNAL_ACCESS", "YES"):
         sql_lyr = ds.ExecuteSQL(
             "select gdal_get_pixel_value('../gcore/data/byte.tif', 1, 'pixel', 1, 4)"
@@ -9355,6 +9353,41 @@ def test_ogr_gpkg_sql_gdal_get_pixel_value(tmp_vsimem):
         ds.ReleaseResultSet(sql_lyr)
         assert f[0] is None
 
+    # Test Int64
+    tmp_filename = str(tmp_vsimem / "tmp_int64.tif")
+    tmp_ds = gdal.GetDriverByName("GTiff").Create(tmp_filename, 1, 1, 1, gdal.GDT_Int64)
+    tmp_ds.WriteRaster(0, 0, 1, 1, struct.pack("q", (1 << 63) - 1))
+    tmp_ds.Close()
+
+    with gdaltest.config_option("OGR_SQLITE_ALLOW_EXTERNAL_ACCESS", "YES"):
+        with ds.ExecuteSQL(
+            f"select gdal_get_pixel_value('{tmp_filename}', 1, 'pixel', 0, 0)"
+        ) as sql_lyr:
+            f = sql_lyr.GetNextFeature()
+            assert f[0] == (1 << 63) - 1
+
+    # Test UInt64
+    tmp_filename = str(tmp_vsimem / "tmp_uint64.tif")
+    tmp_ds = gdal.GetDriverByName("GTiff").Create(
+        tmp_filename, 2, 1, 1, gdal.GDT_UInt64
+    )
+    tmp_ds.WriteRaster(0, 0, 1, 1, struct.pack("Q", (1 << 63) - 1))
+    tmp_ds.WriteRaster(1, 0, 1, 1, struct.pack("Q", (1 << 64) - 1))
+    tmp_ds.Close()
+
+    with gdaltest.config_option("OGR_SQLITE_ALLOW_EXTERNAL_ACCESS", "YES"):
+        with ds.ExecuteSQL(
+            f"select gdal_get_pixel_value('{tmp_filename}', 1, 'pixel', 0, 0)"
+        ) as sql_lyr:
+            f = sql_lyr.GetNextFeature()
+            assert f[0] == (1 << 63) - 1
+
+        with ds.ExecuteSQL(
+            f"select gdal_get_pixel_value('{tmp_filename}', 1, 'pixel', 1, 0)"
+        ) as sql_lyr:
+            f = sql_lyr.GetNextFeature()
+            assert f[0] == float((1 << 64) - 1)
+
 
 ###############################################################################
 # Test SOZip writing and reading
@@ -10492,6 +10525,88 @@ def test_ogr_gpkg_ST_Area_on_ellipsoid(tmp_vsimem):
             assert f[0] is None
 
 
+###############################################################################
+# Test ST_Length(geom)
+
+
+def test_ogr_gpkg_ST_Length(tmp_vsimem):
+
+    tmpfilename = tmp_vsimem / "test_ogr_sql_ST_Length.gpkg"
+
+    ds = ogr.GetDriverByName("GPKG").CreateDataSource(tmpfilename)
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(4258)
+    lyr = ds.CreateLayer("my_layer", srs=srs)
+    geom_colname = lyr.GetGeometryColumn()
+    feat = ogr.Feature(lyr.GetLayerDefn())
+    feat.SetGeometryDirectly(
+        ogr.CreateGeometryFromWkt("POLYGON((2 49,3 49,3 48,2 49))")
+    )
+    lyr.CreateFeature(feat)
+    feat = None
+
+    with ds.ExecuteSQL(f"SELECT ST_Length({geom_colname}) FROM my_layer") as sql_lyr:
+        f = sql_lyr.GetNextFeature()
+        assert f[0] == pytest.approx(3.414213562373095)
+
+    with ds.ExecuteSQL("SELECT ST_Length(null) FROM my_layer") as sql_lyr:
+        f = sql_lyr.GetNextFeature()
+        assert f[0] is None
+
+    with gdal.quiet_errors():
+        with ds.ExecuteSQL("SELECT ST_Length(X'FF') FROM my_layer") as sql_lyr:
+            f = sql_lyr.GetNextFeature()
+            assert f[0] is None
+
+
+###############################################################################
+# Test ST_Length(geom, use_ellipsoid=True)
+
+
+def test_ogr_gpkg_ST_Length_on_ellipsoid(tmp_vsimem):
+
+    tmpfilename = tmp_vsimem / "test_ogr_sql_ST_Length_on_ellipsoid.gpkg"
+
+    ds = ogr.GetDriverByName("GPKG").CreateDataSource(tmpfilename)
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(4258)
+    lyr = ds.CreateLayer("my_layer", srs=srs)
+    geom_colname = lyr.GetGeometryColumn()
+    feat = ogr.Feature(lyr.GetLayerDefn())
+    feat.SetGeometryDirectly(
+        ogr.CreateGeometryFromWkt("POLYGON((2 49,3 49,3 48,2 49))")
+    )
+    lyr.CreateFeature(feat)
+    feat = None
+
+    with ds.ExecuteSQL(f"SELECT ST_Length({geom_colname}, 1) FROM my_layer") as sql_lyr:
+        f = sql_lyr.GetNextFeature()
+        assert f[0] == pytest.approx(317885.7863996293)
+
+    with gdal.quiet_errors():
+        with ds.ExecuteSQL(
+            f"SELECT ST_Length({geom_colname}, 0) FROM my_layer"
+        ) as sql_lyr:
+            f = sql_lyr.GetNextFeature()
+            assert f[0] == pytest.approx(317885.7863996293)
+
+    with ds.ExecuteSQL("SELECT ST_Length(null, 1) FROM my_layer") as sql_lyr:
+        f = sql_lyr.GetNextFeature()
+        assert f[0] is None
+
+    with gdal.quiet_errors():
+        with ds.ExecuteSQL("SELECT ST_Length(X'FF', 1) FROM my_layer") as sql_lyr:
+            f = sql_lyr.GetNextFeature()
+            assert f[0] is None
+
+    with gdal.quiet_errors():
+        with ds.ExecuteSQL(
+            f"SELECT ST_Length(SetSRID({geom_colname}, -10), 0) FROM my_layer"
+        ) as sql_lyr:
+            f = sql_lyr.GetNextFeature()
+            assert f[0] is None
+
+
 ###############################################################################
 # Test LAUNDER=YES layer creation option
 
@@ -10510,3 +10625,42 @@ def test_ogr_gpkg_launder(tmp_vsimem):
     assert lyr.GetGeometryColumn() == "my_geom"
     lyr.CreateField(ogr.FieldDefn("_"))
     assert lyr.GetLayerDefn().GetFieldDefn(0).GetNameRef() == "x_"
+
+
+###############################################################################
+# Test rename a "hidden" table with SQL
+
+
+def test_gpkg_rename_hidden_table(tmp_vsimem):
+
+    test_layer_path = str(tmp_vsimem / "test_gpkg_rename_hidden_table.gpkg")
+
+    src_ds = gdal.OpenEx("../ogr/data/poly.shp")
+    gdal.VectorTranslate(test_layer_path, src_ds)
+    src_ds = None
+
+    dst_ds = gdal.OpenEx(
+        test_layer_path, gdal.OF_UPDATE, open_options=["LIST_ALL_TABLES=NO"]
+    )
+    dst_ds.ExecuteSQL("CREATE TABLE hidden_foo_table(id integer primary key);")
+    dst_ds = None
+
+    dst_ds = gdal.OpenEx(
+        test_layer_path, gdal.OF_UPDATE, open_options=["LIST_ALL_TABLES=NO"]
+    )
+    dst_ds.ExecuteSQL("ALTER TABLE hidden_foo_table RENAME TO hidden_bar_table")
+    dst_ds.ExecuteSQL("VACUUM")
+    dst_ds = None
+
+    dst_ds = gdal.OpenEx(test_layer_path)
+    # Verify that layer exists
+    lyr = dst_ds.GetLayerByName("hidden_bar_table")
+    assert lyr is not None
+    dst_ds = None
+
+    # Check that there is no more any reference to the layer
+    f = gdal.VSIFOpenL(test_layer_path, "rb")
+    content = gdal.VSIFReadL(1, 1000000, f).decode("latin1")
+    gdal.VSIFCloseL(f)
+
+    assert "hidden_foo_table" not in content
diff --git a/autotest/ogr/ogr_gpsbabel.py b/autotest/ogr/ogr_gpsbabel.py
index e1ddb7dceb14..4b5ce9f5bf57 100755
--- a/autotest/ogr/ogr_gpsbabel.py
+++ b/autotest/ogr/ogr_gpsbabel.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/ogr/ogr_gpx.py b/autotest/ogr/ogr_gpx.py
index 0d6d156fc99c..457f262c80e2 100755
--- a/autotest/ogr/ogr_gpx.py
+++ b/autotest/ogr/ogr_gpx.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2007-2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import ogrtest
diff --git a/autotest/ogr/ogr_gtfs.py b/autotest/ogr/ogr_gtfs.py
index aaf29eee35aa..17856c0875ea 100755
--- a/autotest/ogr/ogr_gtfs.py
+++ b/autotest/ogr/ogr_gtfs.py
@@ -10,30 +10,14 @@
 ###############################################################################
 # Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
 import ogrtest
 import pytest
 
-from osgeo import ogr
+from osgeo import gdal, ogr
 
 pytestmark = pytest.mark.require_driver("GTFS")
 
@@ -59,6 +43,10 @@ def test_ogr_gtfs_open():
     assert ds
     assert ds.GetLayerCount() == 9
 
+    ds = gdal.OpenEx("/vsizip/data/gtfs/gtfs_extract.zip", allowed_drivers=["GTFS"])
+    assert ds
+    assert ds.GetLayerCount() == 9
+
 
 ###############################################################################
 
@@ -99,6 +87,11 @@ def test_ogr_gtfs_content():
     f = lyr.GetNextFeature()
     assert f is None
 
+    lyr = ds.GetLayerByName("routes")
+    assert lyr
+    lyr.SetAttributeFilter("route_type = 3")
+    assert lyr.GetFeatureCount() == 30
+
     lyr = ds.GetLayerByName("stops")
     assert lyr
     assert lyr.GetGeomType() == ogr.wkbPoint
diff --git a/autotest/ogr/ogr_hana.py b/autotest/ogr/ogr_hana.py
index d6a6266f9c28..16b4de256a25 100644
--- a/autotest/ogr/ogr_hana.py
+++ b/autotest/ogr/ogr_hana.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2020, SAP SE
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 from os import environ
 
@@ -424,7 +408,7 @@ def test_ogr_hana_18():
     feat_new = ogr.Feature(feature_def=layer.GetLayerDefn())
     feat_new.SetField("PRFEDEA", "9999")
     layer.CreateFeature(feat_new)
-    feat_new.Destroy()
+    feat_new = None
 
     layer.SetAttributeFilter("PRFEDEA = '9999'")
     feat = layer.GetNextFeature()
@@ -438,7 +422,7 @@ def test_ogr_hana_18():
     assert layer.SetFeature(feat) == 0, "SetFeature() method failed."
 
     fid = feat.GetFID()
-    feat.Destroy()
+    feat = None
 
     feat = layer.GetFeature(fid)
     assert feat is not None, "GetFeature(%d) failed." % fid
@@ -1170,6 +1154,93 @@ def create_feature(fid, geom_wkt=None):
     layer.CommitTransaction()
 
 
+###############################################################################
+# Test REAL_VECTOR type
+
+
+def test_ogr_hana_38():
+    conn = create_connection()
+    layer_name = get_test_name()
+    table_name = f'"{gdaltest.hana_schema_name}"."{layer_name}"'
+    execute_sql(
+        conn,
+        f"CREATE COLUMN TABLE {table_name} (ID INT PRIMARY KEY, EMB1 REAL_VECTOR(3), EMB2 REAL_VECTOR)",
+    )
+    execute_sql(
+        conn,
+        f"INSERT INTO {table_name} VALUES (1, TO_REAL_VECTOR('[0.1,0.2,0.3]'), TO_REAL_VECTOR('[0.1,0.2,0.3]'))",
+    )
+
+    def check_value(expected):
+        ds = open_datasource(0)
+        layer = ds.GetLayerByName(layer_name)
+        layer_defn = layer.GetLayerDefn()
+        assert layer.GetLayerDefn().GetFieldCount() == 2
+        field_emb1 = layer_defn.GetFieldDefn(layer_defn.GetFieldIndex("EMB1"))
+        assert field_emb1.GetType() == ogr.OFTBinary
+        assert field_emb1.GetWidth() == 16
+        field_emb2 = layer_defn.GetFieldDefn(layer_defn.GetFieldIndex("EMB2"))
+        assert field_emb2.GetType() == ogr.OFTBinary
+        assert field_emb2.GetWidth() == 65000
+        check_feature_count(layer, 1)
+        feat = layer.GetNextFeature()
+        assert feat.GetFieldAsBinary("EMB1") == expected
+        assert feat.GetFieldAsBinary("EMB2") == expected
+
+    # '[0.1,0.2,0.3]'
+    vec0 = b"\x03\x00\x00\x00\xCD\xCC\xCC\x3D\xCD\xCC\x4C\x3E\x9A\x99\x99\x3E"
+    # '[0.1,0.2,0.1]'
+    vec1 = b"\x03\x00\x00\x00\xCD\xCC\xCC\x3D\xCD\xCC\x4C\x3E\xCD\xCC\xCC\x3D"
+
+    check_value(vec0)
+
+    ds = open_datasource(1)
+    layer = ds.GetLayerByName(layer_name)
+    feat = layer.GetNextFeature()
+    feat.SetField("EMB1", vec1)
+    feat.SetField("EMB2", vec1)
+    layer.SetFeature(feat)
+
+    check_value(vec1)
+
+
+###############################################################################
+# Verify a working fallback in case the fast extent estimation fails
+
+
+def test_ogr_hana_39():
+    conn = create_connection()
+
+    # Create test table
+    layer_name = get_test_name()
+    table_name = f'"{gdaltest.hana_schema_name}"."{layer_name}"'
+    execute_sql(
+        conn,
+        f"CREATE COLUMN TABLE {table_name} (id INT, geom ST_Geometry(4326)) NO AUTO MERGE",
+    )
+
+    # Check extent. The table is empty so the extent should be (0, 0, 0, 0)
+    ds = open_datasource(0)
+    layer = ds.GetLayerByName(layer_name)
+    assert layer is not None, "did not get layer"
+    check_extent(layer, (0, 0, 0, 0), force=False)
+
+    # Insert points without merging the delta.
+    # The fallback should be triggered and return the correct extent.
+    execute_sql(
+        conn,
+        f"INSERT INTO {table_name} (id, geom) VALUES (0, ST_GeomFromText('POINT(0 10)', 4326))",
+    )
+    execute_sql(
+        conn,
+        f"INSERT INTO {table_name} (id, geom) VALUES (0, ST_GeomFromText('POINT(0 40)', 4326))",
+    )
+    check_extent(layer, (0, 0, 10, 40), force=False)
+
+    # Tear-down
+    execute_sql(conn, f"DROP TABLE {table_name}")
+
+
 ###############################################################################
 #  Create a table from data/poly.shp
 
@@ -1248,7 +1319,9 @@ def create_tpoly_table(ds, layer_name="TPOLY"):
 def get_connection_str():
     uri = gdal.GetConfigOption("OGR_HANA_CONNECTION_STRING", None)
     if uri is not None:
-        conn_str = uri + ";ENCRYPT=YES;SSL_VALIDATE_CERTIFICATE=false;CHAR_AS_UTF8=1"
+        if "ENCRYPT" not in uri:
+            uri += ";ENCRYPT=YES"
+        conn_str = uri + ";SSL_VALIDATE_CERTIFICATE=false;CHAR_AS_UTF8=1"
     else:
         pytest.skip("OGR_HANA_CONNECTION_STRING not set")
 
@@ -1311,8 +1384,8 @@ def open_datasource(update=0, open_opts=None):
         return gdal.OpenEx(conn_str, update, open_options=[open_opts])
 
 
-def check_extent(layer, expected, max_error=0.001):
-    actual = layer.GetExtent()
+def check_extent(layer, expected, force=True, max_error=0.001):
+    actual = layer.GetExtent(force=force)
     minx = abs(actual[0] - expected[0])
     maxx = abs(actual[1] - expected[1])
     miny = abs(actual[2] - expected[2])
diff --git a/autotest/ogr/ogr_idrisi.py b/autotest/ogr/ogr_idrisi.py
index bf8789cb5d48..4e65ad3cf60d 100755
--- a/autotest/ogr/ogr_idrisi.py
+++ b/autotest/ogr/ogr_idrisi.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2011-2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import ogrtest
diff --git a/autotest/ogr/ogr_index_test.py b/autotest/ogr/ogr_index_test.py
index a96af7e7c72b..6b8fa6f5b10b 100755
--- a/autotest/ogr/ogr_index_test.py
+++ b/autotest/ogr/ogr_index_test.py
@@ -34,6 +34,8 @@
 
 from osgeo import ogr
 
+pytestmark = pytest.mark.require_driver("MapInfo File")
+
 ###############################################################################
 
 
@@ -48,18 +50,16 @@ def startup_and_cleanup():
 @contextlib.contextmanager
 def create_index_p_test_file():
     drv = ogr.GetDriverByName("MapInfo File")
-    p_ds = drv.CreateDataSource("index_p.mif")
-    p_lyr = p_ds.CreateLayer("index_p")
-
-    ogrtest.quick_create_layer_def(p_lyr, [("PKEY", ogr.OFTInteger)])
-    ogrtest.quick_create_feature(p_lyr, [5], None)
-    ogrtest.quick_create_feature(p_lyr, [10], None)
-    ogrtest.quick_create_feature(p_lyr, [9], None)
-    ogrtest.quick_create_feature(p_lyr, [4], None)
-    ogrtest.quick_create_feature(p_lyr, [3], None)
-    ogrtest.quick_create_feature(p_lyr, [1], None)
+    with drv.CreateDataSource("index_p.mif") as p_ds:
+        p_lyr = p_ds.CreateLayer("index_p")
 
-    p_ds.Release()
+        ogrtest.quick_create_layer_def(p_lyr, [("PKEY", ogr.OFTInteger)])
+        ogrtest.quick_create_feature(p_lyr, [5], None)
+        ogrtest.quick_create_feature(p_lyr, [10], None)
+        ogrtest.quick_create_feature(p_lyr, [9], None)
+        ogrtest.quick_create_feature(p_lyr, [4], None)
+        ogrtest.quick_create_feature(p_lyr, [3], None)
+        ogrtest.quick_create_feature(p_lyr, [1], None)
 
     yield
 
@@ -69,21 +69,19 @@ def create_index_p_test_file():
 @contextlib.contextmanager
 def create_join_t_test_file(create_index=False):
     drv = ogr.GetDriverByName("ESRI Shapefile")
-    s_ds = drv.CreateDataSource("join_t.dbf")
-    s_lyr = s_ds.CreateLayer("join_t", geom_type=ogr.wkbNone)
-
-    ogrtest.quick_create_layer_def(
-        s_lyr, [("SKEY", ogr.OFTInteger), ("VALUE", ogr.OFTString, 16)]
-    )
+    with drv.CreateDataSource("join_t.dbf") as s_ds:
+        s_lyr = s_ds.CreateLayer("join_t", geom_type=ogr.wkbNone)
 
-    for i in range(20):
-        ogrtest.quick_create_feature(s_lyr, [i, "Value " + str(i)], None)
+        ogrtest.quick_create_layer_def(
+            s_lyr, [("SKEY", ogr.OFTInteger), ("VALUE", ogr.OFTString, 16)]
+        )
 
-    if create_index:
-        s_ds.ExecuteSQL("CREATE INDEX ON join_t USING value")
-        s_ds.ExecuteSQL("CREATE INDEX ON join_t USING skey")
+        for i in range(20):
+            ogrtest.quick_create_feature(s_lyr, [i, "Value " + str(i)], None)
 
-    s_ds.Release()
+        if create_index:
+            s_ds.ExecuteSQL("CREATE INDEX ON join_t USING value")
+            s_ds.ExecuteSQL("CREATE INDEX ON join_t USING skey")
 
     yield
 
@@ -188,12 +186,9 @@ def test_ogr_index_indexed_join_works():
 
 def test_ogr_index_drop_index_removes_files():
     with create_join_t_test_file(create_index=True):
-        s_ds = ogr.OpenShared("join_t.dbf", update=1)
-
-        s_ds.ExecuteSQL("DROP INDEX ON join_t USING value")
-        s_ds.ExecuteSQL("DROP INDEX ON join_t USING skey")
-
-        s_ds.Release()
+        with ogr.OpenShared("join_t.dbf", update=1) as s_ds:
+            s_ds.ExecuteSQL("DROP INDEX ON join_t USING value")
+            s_ds.ExecuteSQL("DROP INDEX ON join_t USING skey")
 
         # After dataset closing, check that the index files do not exist after
         # dropping the index
@@ -228,17 +223,13 @@ def test_ogr_index_attribute_filter_works_after_drop_index():
 def test_ogr_index_recreating_index_causes_index_files_to_be_created():
 
     with create_join_t_test_file(create_index=True):
-        s_ds = ogr.OpenShared("join_t.dbf", update=1)
-
-        s_ds.ExecuteSQL("DROP INDEX ON join_t USING value")
-        s_ds.ExecuteSQL("DROP INDEX ON join_t USING skey")
-
-        s_ds.Release()
+        with ogr.OpenShared("join_t.dbf", update=1) as s_ds:
+            s_ds.ExecuteSQL("DROP INDEX ON join_t USING value")
+            s_ds.ExecuteSQL("DROP INDEX ON join_t USING skey")
 
         # Re-create an index
-        s_ds = ogr.OpenShared("join_t.dbf", update=1)
-        s_ds.ExecuteSQL("CREATE INDEX ON join_t USING value")
-        s_ds.Release()
+        with ogr.OpenShared("join_t.dbf", update=1) as s_ds:
+            s_ds.ExecuteSQL("CREATE INDEX ON join_t USING value")
 
         for filename in ["join_t.idm", "join_t.ind"]:
             try:
@@ -255,17 +246,13 @@ def test_ogr_index_recreating_index_causes_index_files_to_be_created():
 def test_ogr_index_recreating_index_causes_index_to_be_populated():
 
     with create_join_t_test_file(create_index=True):
-        s_ds = ogr.OpenShared("join_t.dbf", update=1)
-
-        s_ds.ExecuteSQL("DROP INDEX ON join_t USING value")
-        s_ds.ExecuteSQL("DROP INDEX ON join_t USING skey")
-
-        s_ds.Release()
+        with ogr.OpenShared("join_t.dbf", update=1) as s_ds:
+            s_ds.ExecuteSQL("DROP INDEX ON join_t USING value")
+            s_ds.ExecuteSQL("DROP INDEX ON join_t USING skey")
 
         # Re-create an index
-        s_ds = ogr.OpenShared("join_t.dbf", update=1)
-        s_ds.ExecuteSQL("CREATE INDEX ON join_t USING value")
-        s_ds.Release()
+        with ogr.OpenShared("join_t.dbf", update=1) as s_ds:
+            s_ds.ExecuteSQL("CREATE INDEX ON join_t USING value")
 
         with open("join_t.idm", "rt") as f:
             xml = f.read()
@@ -280,25 +267,19 @@ def test_ogr_index_recreating_index_causes_index_to_be_populated():
 def test_ogr_index_creating_index_in_separate_steps_works():
 
     with create_join_t_test_file(create_index=True):
-        s_ds = ogr.OpenShared("join_t.dbf", update=1)
-
-        s_ds.ExecuteSQL("DROP INDEX ON join_t USING value")
-        s_ds.ExecuteSQL("DROP INDEX ON join_t USING skey")
-
-        s_ds.Release()
+        with ogr.OpenShared("join_t.dbf", update=1) as s_ds:
+            s_ds.ExecuteSQL("DROP INDEX ON join_t USING value")
+            s_ds.ExecuteSQL("DROP INDEX ON join_t USING skey")
 
         # Re-create an index
-        s_ds = ogr.OpenShared("join_t.dbf", update=1)
-        s_ds.ExecuteSQL("CREATE INDEX ON join_t USING value")
-        s_ds.Release()
+        with ogr.OpenShared("join_t.dbf", update=1) as s_ds:
+            s_ds.ExecuteSQL("CREATE INDEX ON join_t USING value")
 
         # Close the dataset and re-open
-        s_ds = ogr.OpenShared("join_t.dbf", update=1)
-        # At this point the .ind was opened in read-only. Now it
-        # will be re-opened in read-write mode
-        s_ds.ExecuteSQL("CREATE INDEX ON join_t USING skey")
-
-        s_ds.Release()
+        with ogr.OpenShared("join_t.dbf", update=1) as s_ds:
+            # At this point the .ind was opened in read-only. Now it
+            # will be re-opened in read-write mode
+            s_ds.ExecuteSQL("CREATE INDEX ON join_t USING skey")
 
         with open("join_t.idm", "rt") as f:
             xml = f.read()
diff --git a/autotest/ogr/ogr_jml.py b/autotest/ogr/ogr_jml.py
index 021777c0163c..13da36faf116 100755
--- a/autotest/ogr/ogr_jml.py
+++ b/autotest/ogr/ogr_jml.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2014, Even Rouault <even dot rouault at spatialys dot org>
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/ogr/ogr_join_test.py b/autotest/ogr/ogr_join_test.py
index 3ff1e9084178..d2bea80434de 100755
--- a/autotest/ogr/ogr_join_test.py
+++ b/autotest/ogr/ogr_join_test.py
@@ -481,3 +481,69 @@ def test_ogr_join_23():
     ds.ReleaseResultSet(sql_lyr)
 
     ds = None
+
+
+###############################################################################
+# Test join on special fields (FID)
+
+
+def test_ogr_join_on_special_field():
+
+    ds = ogr.GetDriverByName("Memory").CreateDataSource("")
+    lyr1 = ds.CreateLayer("lyr1", options=["FID=fid1"])
+    lyr1.CreateField(ogr.FieldDefn("a"))
+    lyr2 = ds.CreateLayer("lyr2", options=["FID=fid2"])
+    lyr2.CreateField(ogr.FieldDefn("b"))
+    f = ogr.Feature(lyr1.GetLayerDefn())
+    f.SetFID(1)
+    f["a"] = "a1"
+    f.SetGeometry(ogr.CreateGeometryFromWkt("POLYGON((0 0,0 1,1 1,0 0))"))
+    f.SetStyleString("dummy")
+    lyr1.CreateFeature(f)
+    f = ogr.Feature(lyr1.GetLayerDefn())
+    f.SetFID(2)
+    f["a"] = "a2"
+    lyr1.CreateFeature(f)
+    f = ogr.Feature(lyr2.GetLayerDefn())
+    f.SetFID(1)
+    f["b"] = "b1"
+    lyr2.CreateFeature(f)
+    f = ogr.Feature(lyr2.GetLayerDefn())
+    f.SetFID(2)
+    f["b"] = "b2"
+    lyr2.CreateFeature(f)
+
+    with ds.ExecuteSQL(
+        "SELECT a, b FROM lyr1 LEFT JOIN lyr2 ON lyr1.fid1 = lyr2.fid2"
+    ) as sql_lyr:
+        f = sql_lyr.GetNextFeature()
+        assert f["a"] == "a1"
+        assert f["b"] == "b1"
+        f = sql_lyr.GetNextFeature()
+        assert f["a"] == "a2"
+        assert f["b"] == "b2"
+        assert sql_lyr.GetNextFeature() is None
+
+    # Kind of dummy, but testing Real special field ...
+    with ds.ExecuteSQL(
+        "SELECT a, b FROM lyr1 LEFT JOIN lyr2 ON lyr1.OGR_GEOM_AREA = 0.5"
+    ) as sql_lyr:
+        f = sql_lyr.GetNextFeature()
+        assert f["a"] == "a1"
+        assert f["b"] == "b1"
+        f = sql_lyr.GetNextFeature()
+        assert f["a"] == "a2"
+        assert f["b"] is None
+        assert sql_lyr.GetNextFeature() is None
+
+    # Kind of dummy, but testing String special field ...
+    with ds.ExecuteSQL(
+        "SELECT a, b FROM lyr1 LEFT JOIN lyr2 ON lyr1.OGR_STYLE = 'dummy'"
+    ) as sql_lyr:
+        f = sql_lyr.GetNextFeature()
+        assert f["a"] == "a1"
+        assert f["b"] == "b1"
+        f = sql_lyr.GetNextFeature()
+        assert f["a"] == "a2"
+        assert f["b"] is None
+        assert sql_lyr.GetNextFeature() is None
diff --git a/autotest/ogr/ogr_jsonfg.py b/autotest/ogr/ogr_jsonfg.py
index 55db4212ce79..4c23584e2eea 100755
--- a/autotest/ogr/ogr_jsonfg.py
+++ b/autotest/ogr/ogr_jsonfg.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import json
@@ -473,6 +457,32 @@ def test_jsonfg_read_two_features_types():
     assert f.GetFID() == 1
 
 
+###############################################################################
+# Test reading file with a single Feature larger than 6000 bytes
+
+
+def test_jsonfg_read_single_feature_large(tmp_vsimem):
+
+    tmp_file = str(tmp_vsimem / "test.json")
+    content = """{
+      "type": "Feature",
+      "conformsTo" : [ "[ogc-json-fg-1-0.1:core]" ],
+      %s
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [2, 49] },
+      "properties": { "foo": 1 },
+      "place": null,
+      "time": null
+    }""" % (
+        " " * 100000
+    )
+
+    gdal.FileFromMemBuffer(tmp_file, content)
+
+    ds = gdal.OpenEx(tmp_file)
+    assert ds.GetDriver().GetDescription() == "JSONFG"
+
+
 ###############################################################################
 # Test time handling
 
@@ -924,7 +934,7 @@ def test_jsonfg_write_several_layers():
         [["GEOMETRYCOLLECTION (POINT (1 2))"], ogr.wkbGeometryCollection],
         [["GEOMETRYCOLLECTION Z (POINT Z (1 2 3))"], ogr.wkbGeometryCollection25D],
         [["POINT (1 2)", "LINESTRING (1 2,3 4)"], ogr.wkbUnknown],
-        [["POLYHEDRALSURFACE EMPTY"], ogr.wkbPolyhedralSurface],
+        [["POLYHEDRALSURFACE Z EMPTY"], ogr.wkbPolyhedralSurfaceZ],
         [
             [
                 "POLYHEDRALSURFACE Z (((0 0 0,0 1 0,1 1 0,0 0 0)),((0 0 0,1 0 0,0 0 1,0 0 0)),((0 0 0,0 1 0,0 0 1,0 0 0)),((0 1 0,1 0 0,0 0 1,0 1 0)))"
@@ -1292,3 +1302,27 @@ def test_ogr_jsonfg_geom_coord_precision(tmp_vsimem, single_layer):
     prec = geom_fld.GetCoordinatePrecision()
     assert prec.GetXYResolution() == 1e-2
     assert prec.GetZResolution() == 1e-3
+
+
+###############################################################################
+# Test force opening a GeoJSON file with JSONFG
+
+
+def test_ogr_jsonfg_force_opening():
+
+    if ogr.GetDriverByName("GeoJSON"):
+        ds = gdal.OpenEx("data/geojson/featuretype.json")
+        assert ds.GetDriver().GetDescription() == "GeoJSON"
+
+    ds = gdal.OpenEx("data/geojson/featuretype.json", allowed_drivers=["JSONFG"])
+    assert ds.GetDriver().GetDescription() == "JSONFG"
+
+
+###############################################################################
+# Test force opening a URL as JSONFG
+
+
+def test_ogr_jsonfg_force_opening_url():
+
+    drv = gdal.IdentifyDriverEx("http://example.com", allowed_drivers=["JSONFG"])
+    assert drv.GetDescription() == "JSONFG"
diff --git a/autotest/ogr/ogr_kml.py b/autotest/ogr/ogr_kml.py
index b90168dd04d5..957d93cb35f7 100755
--- a/autotest/ogr/ogr_kml.py
+++ b/autotest/ogr/ogr_kml.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2007, Matuesz Loskot <mateusz@loskot.net>
 # Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
@@ -593,7 +577,7 @@ def test_ogr_kml_write_schema(tmp_vsimem):
     <SimpleField name="realfield" type="float"></SimpleField>
 </Schema>
 <Folder><name>lyr</name>
-  <Placemark>
+  <Placemark id="lyr.1">
     <ExtendedData><SchemaData schemaUrl="#lyr">
         <SimpleData name="strfield">strfield_val</SimpleData>
         <SimpleData name="intfield">1</SimpleData>
@@ -664,7 +648,7 @@ def test_ogr_kml_two_layers(tmp_vsimem):
 <Folder><name>empty</name>
 </Folder>
 <Folder><name>lyr</name>
-  <Placemark>
+  <Placemark id="lyr.1">
     <ExtendedData><SchemaData schemaUrl="#lyr">
         <SimpleData name="foo">bar</SimpleData>
     </SchemaData></ExtendedData>
diff --git a/autotest/ogr/ogr_layer_algebra.py b/autotest/ogr/ogr_layer_algebra.py
index f1d0cb14ca65..4e319ca04f55 100755
--- a/autotest/ogr/ogr_layer_algebra.py
+++ b/autotest/ogr/ogr_layer_algebra.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2012, Ari Jolma <ari.jolma@aalto.fi>
 # Copyright (c) 2012-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
@@ -261,6 +245,31 @@ def test_algebra_intersection_3(D1, D2, C):
     assert is_same(D1, C), "D1 != C"
 
 
+def test_algebra_intersection_multipoint():
+
+    driver = ogr.GetDriverByName("MEMORY")
+    ds = driver.CreateDataSource("ds")
+    layer1 = ds.CreateLayer("layer1")
+    layer2 = ds.CreateLayer("layer2")
+
+    g1 = "LINESTRING (0 0, 1 1)"
+    geom1 = ogr.CreateGeometryFromWkt(g1)
+    feat1 = ogr.Feature(layer1.GetLayerDefn())
+    feat1.SetGeometry(geom1)
+    layer1.CreateFeature(feat1)
+
+    g2 = "LINESTRING (0 1, 1 0)"
+    geom2 = ogr.CreateGeometryFromWkt(g2)
+    feat2 = ogr.Feature(layer2.GetLayerDefn())
+    feat2.SetGeometry(geom2)
+    layer2.CreateFeature(feat2)
+
+    layer3 = ds.CreateLayer("layer3")
+    layer1.Intersection(layer2, layer3, ["PROMOTE_TO_MULTI=YES"])
+    f = layer3.GetNextFeature()
+    assert f.GetGeometryRef().ExportToIsoWkt() == "MULTIPOINT ((0.5 0.5))"
+
+
 def test_algebra_KEEP_LOWER_DIMENSION_GEOMETRIES():
 
     driver = ogr.GetDriverByName("MEMORY")
diff --git a/autotest/ogr/ogr_libkml.py b/autotest/ogr/ogr_libkml.py
index 1c616123436e..52ece2b7786f 100755
--- a/autotest/ogr/ogr_libkml.py
+++ b/autotest/ogr/ogr_libkml.py
@@ -10,26 +10,9 @@
 ###############################################################################
 # Copyright (c) 2010-2014, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
-
 import gdaltest
 import ogrtest
 import pytest
@@ -289,7 +272,8 @@ def ogr_libkml_write(filename):
         lyr = ds.CreateLayer("test_wgs72", srs=srs)
 
         assert lyr.TestCapability(ogr.OLCSequentialWrite) == 1
-        assert lyr.TestCapability(ogr.OLCRandomWrite) == 0
+        assert lyr.TestCapability(ogr.OLCRandomWrite) == 1
+        assert lyr.TestCapability(ogr.OLCDeleteFeature) == 1
 
         dst_feat = ogr.Feature(lyr.GetLayerDefn())
         dst_feat.SetGeometry(ogr.CreateGeometryFromWkt("POINT (2 49)"))
@@ -455,6 +439,17 @@ def test_ogr_libkml_write_kmz_use_doc_off(tmp_vsimem):
     ogr_libkml_check_write(tmp_vsimem / "libkml_use_doc_off.kmz")
 
 
+def test_ogr_libkml_write_kmz_simulate_cloud(tmp_vsimem):
+    with gdal.config_option("CPL_VSIL_USE_TEMP_FILE_FOR_RANDOM_WRITE", "FORCED"):
+        ogr_libkml_write(tmp_vsimem / "test_ogr_libkml_write_kmz_simulate_cloud.kmz")
+
+    ogr_libkml_check_write(tmp_vsimem / "test_ogr_libkml_write_kmz_simulate_cloud.kmz")
+
+    with gdal.config_option("CPL_VSIL_USE_TEMP_FILE_FOR_RANDOM_WRITE", "FORCED"):
+        with pytest.raises(Exception):
+            ogr_libkml_write("/i_do/not/exist.kmz")
+
+
 ###############################################################################
 # Test reading attributes with XML content in them
 #
@@ -519,6 +514,32 @@ def test_ogr_libkml_test_ogrsf():
     )
 
 
+###############################################################################
+# Run test_ogrsf
+
+
+def test_ogr_libkml_test_ogrsf_write(tmp_path):
+
+    test_filename = str(tmp_path / "test.kml")
+    gdal.VectorTranslate(
+        test_filename, "data/poly.shp", options="-s_srs EPSG:32631 -t_srs EPSG:4326"
+    )
+
+    import test_cli_utilities
+
+    if test_cli_utilities.get_test_ogrsf_path() is None:
+        pytest.skip()
+
+    ret = gdaltest.runexternal(
+        test_cli_utilities.get_test_ogrsf_path()
+        + f" --config OGR_SKIP KML {test_filename}"
+    )
+
+    assert "using driver `LIBKML'" in ret
+    assert "INFO" in ret
+    assert "ERROR" not in ret
+
+
 ###############################################################################
 # Test reading KML with only Placemark
 
@@ -1376,6 +1397,13 @@ def test_ogr_libkml_read_write_style(tmp_vsimem):
         "style1_highlight", 'SYMBOL(id:"http://style1_highlight",c:#10325476)'
     )
     ds.SetStyleTable(style_table)
+    lyr = ds.CreateLayer("test")
+    feat = ogr.Feature(lyr.GetLayerDefn())
+    feat.SetStyleString("@style1_normal")
+    lyr.CreateFeature(feat)
+    feat = ogr.Feature(lyr.GetLayerDefn())
+    feat.SetStyleString("@unknown_style")
+    lyr.CreateFeature(feat)
     ds = None
 
     with gdaltest.vsi_open(
@@ -1418,6 +1446,69 @@ def test_ogr_libkml_read_write_style(tmp_vsimem):
         print(data)
         pytest.fail(styles)
 
+    ds = ogr.Open(tmp_vsimem / "ogr_libkml_read_write_style_write.kml")
+    lyr = ds.GetLayer(0)
+    f = lyr.GetNextFeature()
+    assert f.GetStyleString() == "@style1_normal"
+    f = lyr.GetNextFeature()
+    assert f.GetStyleString() == "@unknown_style"
+
+    with gdaltest.config_option("LIBKML_RESOLVE_STYLE", "YES"):
+        ds = ogr.Open(tmp_vsimem / "ogr_libkml_read_write_style_write.kml")
+        lyr = ds.GetLayer(0)
+        f = lyr.GetNextFeature()
+        assert f.GetStyleString() == 'SYMBOL(id:"http://style1_normal",c:#67452301)'
+        f = lyr.GetNextFeature()
+        assert f.GetStyleString() == "@unknown_style"
+
+
+###############################################################################
+# Test style in KMZ file
+
+
+def test_ogr_libkml_write_style_kmz(tmp_vsimem):
+
+    filename = tmp_vsimem / "ogr_libkml_read_write_style_write.kmz"
+    # Automatic StyleMap creation testing
+    ds = ogr.GetDriverByName("LIBKML").CreateDataSource(filename)
+    style_table = ogr.StyleTable()
+    style_table.AddStyle(
+        "style1_normal", 'SYMBOL(id:"http://style1_normal",c:#67452301)'
+    )
+    style_table.AddStyle(
+        "style1_highlight", 'SYMBOL(id:"http://style1_highlight",c:#10325476)'
+    )
+    ds.SetStyleTable(style_table)
+    lyr = ds.CreateLayer("test")
+    feat = ogr.Feature(lyr.GetLayerDefn())
+    feat.SetStyleString("@style1_normal")
+    lyr.CreateFeature(feat)
+    feat = ogr.Feature(lyr.GetLayerDefn())
+    feat.SetStyleString("@unknown_style")
+    lyr.CreateFeature(feat)
+    ds = None
+
+    f = gdal.VSIFOpenL(f"/vsizip/{filename}/layers/test.kml", "rb")
+    assert f
+    data = gdal.VSIFReadL(1, 10000, f)
+    gdal.VSIFCloseL(f)
+    assert b"<styleUrl>../style/style.kml#style1_normal</styleUrl>" in data
+
+    ds = ogr.Open(filename)
+    lyr = ds.GetLayer(0)
+    f = lyr.GetNextFeature()
+    assert f.GetStyleString() == "@style1_normal"
+    f = lyr.GetNextFeature()
+    assert f.GetStyleString() == "@unknown_style"
+
+    with gdaltest.config_option("LIBKML_RESOLVE_STYLE", "YES"):
+        ds = ogr.Open(filename)
+        lyr = ds.GetLayer(0)
+        f = lyr.GetNextFeature()
+        assert f.GetStyleString() == 'SYMBOL(id:"http://style1_normal",c:#67452301)'
+        f = lyr.GetNextFeature()
+        assert f.GetStyleString() == "@unknown_style"
+
 
 ###############################################################################
 # Test writing Update
@@ -1830,6 +1921,25 @@ def test_ogr_libkml_write_container_properties(tmp_vsimem):
     )
 
 
+###############################################################################
+# Test effect of NAME layer creation option
+
+
+@pytest.mark.parametrize("filename", ["out_dir", "out.kml", "out.kmz"])
+def test_ogr_libkml_name_layer_creation_option(tmp_vsimem, filename):
+
+    ds = ogr.GetDriverByName("LIBKML").CreateDataSource(tmp_vsimem / filename)
+    ds.CreateLayer(
+        "test",
+        options=["NAME=lyr_name"],
+    )
+    ds = None
+
+    ds = ogr.Open(tmp_vsimem / filename)
+    lyr = ds.GetLayer(0)
+    assert lyr.GetName() == "lyr_name"
+
+
 ###############################################################################
 # Test reading gx:TimeStamp and gx:TimeSpan
 
@@ -2084,3 +2194,151 @@ def test_ogr_libkml_read_external_style():
         lyr = ds.GetLayer(0)
         feat = lyr.GetNextFeature()
         assert feat.GetStyleString() == "LABEL(c:#FFFFFFFF,w:110.000000)"
+
+
+###############################################################################
+
+
+@pytest.mark.parametrize(
+    "input_wkt,expected_wkt",
+    [
+        ("POINT (2 90)", "POINT Z (2 90 0)"),
+        ("POINT (2 90.000000001)", "POINT Z (2 90 0)"),
+        ("POINT (2 -90.000000001)", "POINT Z (2 -90 0)"),
+        ("POINT (181 -90)", "POINT Z (-179 -90 0)"),
+        ("POINT (-181 49)", "POINT Z (179 49 0)"),
+        ("POINT (540 49)", "POINT Z (180 49 0)"),
+        ("POINT (-540 49)", "POINT Z (-180 49 0)"),
+        ("POINT (541 49)", None),
+        ("POINT (-541 49)", None),
+        ("POINT (2 91)", None),
+        ("POINT (2 -91)", None),
+        ("POINT Z (2 49 10)", "POINT Z (2 49 10)"),
+        ("POINT Z (2 91 10)", None),
+        ("LINESTRING (2 -90, 3 90)", "LINESTRING Z (2 -90 0,3 90 0)"),
+        ("LINESTRING (2 -90, 3 91)", None),
+        ("LINESTRING Z (2 -90 10, 3 90 10)", "LINESTRING Z (2 -90 10,3 90 10)"),
+        ("LINESTRING Z (2 -90 10, 3 91 10)", None),
+        (
+            "POLYGON ((-180 -90,180 -90,180 90,-180 90,-180 -90),(0 0,0 1,1 1,0 0))",
+            "POLYGON Z ((-180 -90 0,180 -90 0,180 90 0,-180 90 0,-180 -90 0),(0 0 0,0 1 0,1 1 0,0 0 0))",
+        ),
+        ("POLYGON ((-180 -90,180 -90,180 90,-180 91,-180 -90))", None),
+        (
+            "POLYGON ((-180 -90,180 -90,180 90,-180 90,-180 -90),(0 91,1 90,0 90,0 91))",
+            None,
+        ),
+        (
+            "POLYGON Z ((-180 -90 0,180 -90 0,180 90 0,-180 90 0,-180 -90 0),(0 0 0,0 1 0,1 1 0,0 0 0))",
+            "POLYGON Z ((-180 -90 0,180 -90 0,180 90 0,-180 90 0,-180 -90 0),(0 0 0,0 1 0,1 1 0,0 0 0))",
+        ),
+        ("POLYGON Z ((-180 -90 0,180 -90 0,180 90 0,-180 91 0,-180 -90 0))", None),
+        (
+            "POLYGON Z ((-180 -90 0,180 -90 0,180 90 0,-180 90 0,-180 -90 0),(0 91 0,1 90 0,0 90 0,0 91 0))",
+            None,
+        ),
+        ("MULTIPOINT ((2 90))", "POINT Z (2 90 0)"),
+        ("MULTIPOINT ((2 91))", None),
+        ("MULTIPOINT ((2 90),(2 -90))", "MULTIPOINT Z ((2 90 0),(2 -90 0))"),
+        ("MULTIPOINT ((2 90),(2 91))", None),
+    ],
+)
+def test_ogr_libkml_write_geometries(input_wkt, expected_wkt, tmp_vsimem):
+
+    filename = str(tmp_vsimem / "test.kml")
+    with ogr.GetDriverByName("LIBKML").CreateDataSource(filename) as ds:
+        lyr = ds.CreateLayer("test")
+        f = ogr.Feature(lyr.GetLayerDefn())
+        f.SetGeometry(ogr.CreateGeometryFromWkt(input_wkt))
+        if expected_wkt:
+            lyr.CreateFeature(f)
+        else:
+            with pytest.raises(Exception):
+                lyr.CreateFeature(f)
+
+    with ogr.Open(filename) as ds:
+        lyr = ds.GetLayer(0)
+        f = lyr.GetNextFeature()
+        if expected_wkt:
+            assert f.GetGeometryRef().ExportToIsoWkt() == expected_wkt
+        else:
+            assert f is None
+
+
+###############################################################################
+# Test update of existing file
+
+
+@pytest.mark.parametrize("custom_id", [False, True])
+def test_ogr_libkml_update_delete_existing_kml(tmp_vsimem, custom_id):
+
+    filename = str(tmp_vsimem / "test.kml")
+    with ogr.GetDriverByName("LIBKML").CreateDataSource(filename) as ds:
+        lyr = ds.CreateLayer("test")
+        assert lyr.TestCapability(ogr.OLCRandomWrite) == 1
+        assert lyr.TestCapability(ogr.OLCDeleteFeature) == 1
+        lyr.CreateField(ogr.FieldDefn("id"))
+        lyr.CreateField(ogr.FieldDefn("name"))
+        f = ogr.Feature(lyr.GetLayerDefn())
+        if custom_id:
+            f["id"] = "feat1"
+        f["name"] = "name1"
+        f.SetGeometry(ogr.CreateGeometryFromWkt("POINT (1 2)"))
+        lyr.CreateFeature(f)
+        assert lyr.TestCapability(ogr.OLCRandomWrite) == 1
+        assert lyr.TestCapability(ogr.OLCDeleteFeature) == 1
+        f = ogr.Feature(lyr.GetLayerDefn())
+        if custom_id:
+            f["id"] = "feat2"
+        f["name"] = "name2"
+        f.SetGeometry(ogr.CreateGeometryFromWkt("POINT (3 4)"))
+        lyr.CreateFeature(f)
+
+    with gdal.OpenEx(filename, gdal.OF_VECTOR | gdal.OF_UPDATE) as ds:
+        lyr = ds.GetLayer(0)
+        assert lyr.TestCapability(ogr.OLCRandomWrite) == 1
+        assert lyr.TestCapability(ogr.OLCDeleteFeature) == 1
+        with pytest.raises(Exception, match="Non existing feature"):
+            lyr.DeleteFeature(0)
+
+    with gdal.OpenEx(filename, gdal.OF_VECTOR | gdal.OF_UPDATE) as ds:
+        lyr = ds.GetLayer(0)
+        with pytest.raises(Exception, match="Non existing feature"):
+            lyr.DeleteFeature(3)
+
+    with gdal.OpenEx(filename, gdal.OF_VECTOR | gdal.OF_UPDATE) as ds:
+        lyr = ds.GetLayer(0)
+        lyr.DeleteFeature(1)
+        assert lyr.GetFeatureCount() == 1
+        lyr.ResetReading()
+        f = lyr.GetNextFeature()
+        assert f.GetFID() == 2
+        if custom_id:
+            assert f["id"] == "feat2"
+        assert f["name"] == "name2"
+        f["name"] = "name2_updated"
+        lyr.SetFeature(f)
+
+    with gdal.OpenEx(filename, gdal.OF_VECTOR | gdal.OF_UPDATE) as ds:
+        lyr = ds.GetLayer(0)
+        f = lyr.GetNextFeature()
+        if custom_id:
+            # FIDs are renumbered after feature update/deletion´if using
+            # custom KML ids
+            assert f.GetFID() == 1
+            assert f["id"] == "feat2"
+        else:
+            assert f.GetFID() == 2
+        assert f["name"] == "name2_updated"
+
+
+###############################################################################
+# Test that we don't report edit capabilities for a KML file without Placemark.id
+
+
+def ogr_libkml_non_editable():
+
+    with gdal.OpenEx("data/kml/placemark.kml", gdal.OF_VECTOR | gdal.OF_UPDATE) as ds:
+        lyr = ds.GetLayer(0)
+        assert lyr.TestCapability(ogr.OLCRandomWrite) == 0
+        assert lyr.TestCapability(ogr.OLCDeleteFeature) == 0
diff --git a/autotest/ogr/ogr_lvbag.py b/autotest/ogr/ogr_lvbag.py
index 24154c580b6d..c72cfb621e8b 100644
--- a/autotest/ogr/ogr_lvbag.py
+++ b/autotest/ogr/ogr_lvbag.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
@@ -603,3 +587,14 @@ def test_ogr_lvbag_test_ogrsf_num():
     )
 
     assert "INFO" in ret and "ERROR" not in ret
+
+
+###############################################################################
+# Test force opening
+
+
+def test_ogr_lvbag_force_opening():
+
+    # Would be opened by GML driver if not forced
+    ds = gdal.OpenEx("data/gml/empty.gml", allowed_drivers=["LVBAG"])
+    assert ds.GetDriver().GetDescription() == "LVBAG"
diff --git a/autotest/ogr/ogr_mapml.py b/autotest/ogr/ogr_mapml.py
index 71d75e6ef8e6..50038cf2ab6b 100755
--- a/autotest/ogr/ogr_mapml.py
+++ b/autotest/ogr/ogr_mapml.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2020, Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/ogr/ogr_mem.py b/autotest/ogr/ogr_mem.py
index a308eac2a1c9..3d26ac31a00b 100755
--- a/autotest/ogr/ogr_mem.py
+++ b/autotest/ogr/ogr_mem.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2008-2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
@@ -1464,6 +1448,18 @@ def test_ogr_mem_write_arrow():
     field_def = ogr.FieldDefn("field_stringlist", ogr.OFTStringList)
     src_lyr.CreateField(field_def)
 
+    field_def = ogr.FieldDefn("field_json", ogr.OFTString)
+    field_def.SetSubType(ogr.OFSTJSON)
+    src_lyr.CreateField(field_def)
+
+    field_def = ogr.FieldDefn("field_uuid", ogr.OFTString)
+    field_def.SetSubType(ogr.OFSTUUID)
+    src_lyr.CreateField(field_def)
+
+    field_def = ogr.FieldDefn("field_with_width", ogr.OFTString)
+    field_def.SetWidth(10)
+    src_lyr.CreateField(field_def)
+
     feat_def = src_lyr.GetLayerDefn()
     src_feature = ogr.Feature(feat_def)
     src_feature.SetField("field_bool", True)
@@ -1485,6 +1481,9 @@ def test_ogr_mem_write_arrow():
     src_feature.field_float32list = [1.5, -1.5]
     src_feature.field_reallist = [123.5, 567.0]
     src_feature.field_stringlist = ["abc", "def"]
+    src_feature["field_json"] = '{"foo":"bar"}'
+    src_feature["field_uuid"] = "INVALID_UUID"
+    src_feature["field_with_width"] = "foo"
     src_feature.SetGeometry(ogr.CreateGeometryFromWkt("POINT (1 2)"))
 
     src_lyr.CreateFeature(src_feature)
@@ -1506,6 +1505,15 @@ def test_ogr_mem_write_arrow():
         if schema.GetChild(i).GetName() != "wkb_geometry":
             dst_lyr.CreateFieldFromArrowSchema(schema.GetChild(i))
 
+    idx = dst_lyr.GetLayerDefn().GetFieldIndex("field_json")
+    assert dst_lyr.GetLayerDefn().GetFieldDefn(idx).GetSubType() == ogr.OFSTJSON
+
+    idx = dst_lyr.GetLayerDefn().GetFieldIndex("field_uuid")
+    assert dst_lyr.GetLayerDefn().GetFieldDefn(idx).GetSubType() == ogr.OFSTUUID
+
+    idx = dst_lyr.GetLayerDefn().GetFieldIndex("field_with_width")
+    assert dst_lyr.GetLayerDefn().GetFieldDefn(idx).GetWidth() == 10
+
     while True:
         array = stream.GetNextRecordBatch()
         if array is None:
@@ -2851,6 +2859,24 @@ def test_ogr_mem_write_pyarrow_invalid_dict_index(dict_values):
         lyr.WritePyArrow(table)
 
 
+###############################################################################
+
+
+def test_ogr_mem_arrow_json():
+    pytest.importorskip("pyarrow")
+
+    ds = ogr.GetDriverByName("Memory").CreateDataSource("")
+    lyr = ds.CreateLayer("foo")
+    field_def = ogr.FieldDefn("field_json", ogr.OFTString)
+    field_def.SetSubType(ogr.OFSTJSON)
+    lyr.CreateField(field_def)
+
+    stream = lyr.GetArrowStreamAsPyArrow()
+    md = stream.schema["field_json"].metadata
+    assert b"ARROW:extension:name" in md
+    assert md[b"ARROW:extension:name"] == b"arrow.json"
+
+
 ###############################################################################
 # Test Layer.GetDataset()
 
diff --git a/autotest/ogr/ogr_miramon_vector.py b/autotest/ogr/ogr_miramon_vector.py
index 410ea84f7ce9..a883e16765ca 100644
--- a/autotest/ogr/ogr_miramon_vector.py
+++ b/autotest/ogr/ogr_miramon_vector.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2024, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 # import os
diff --git a/autotest/ogr/ogr_mitab.py b/autotest/ogr/ogr_mitab.py
index cf00366e0dd9..c692563b6809 100755
--- a/autotest/ogr/ogr_mitab.py
+++ b/autotest/ogr/ogr_mitab.py
@@ -1980,7 +1980,7 @@ def test_ogr_mitab_45(tmp_vsimem, frmt, lyrCount):
 # Test read MapInfo layers with encoding specified
 
 
-@pytest.mark.parametrize("fname", ("tab-win1251.TAB", "win1251.mif"))
+@pytest.mark.parametrize("fname", ("tab-win1251.TAB", "win1251.mif", "utf8.mif"))
 def test_ogr_mitab_46(fname):
 
     fldNames = ["Поле_�", "Поле_Б", "Поле_В", "Поле_Г", "Поле_Д"]
@@ -2268,6 +2268,63 @@ def test_ogr_mitab_tab_write_field_name_with_dot(tmp_vsimem):
     ds = None
 
 
+###############################################################################
+
+
+@pytest.mark.parametrize("ext", ["mif", "tab"])
+def test_ogr_mitab_write_utf8_field_name(tmp_vsimem, ext):
+
+    tmpfile = tmp_vsimem / f"ogr_mitab_tab_write_utf8_field_name.{ext}"
+    ds = ogr.GetDriverByName("MapInfo File").CreateDataSource(
+        tmpfile, options=["ENCODING=UTF-8", f"FORMAT={ext}"]
+    )
+    lyr = ds.CreateLayer("test")
+    lyr.CreateField(ogr.FieldDefn("地市", ogr.OFTInteger))
+    f = ogr.Feature(lyr.GetLayerDefn())
+    f["地市"] = 1
+    f.SetGeometryDirectly(ogr.CreateGeometryFromWkt("POINT(2 3)"))
+    lyr.CreateFeature(f)
+    with gdal.quiet_errors():
+        ds = None
+
+    ds = ogr.Open(tmpfile)
+    lyr = ds.GetLayer(0)
+    f = lyr.GetNextFeature()
+    assert f["地市"] == 1
+    ds = None
+
+
+###############################################################################
+
+
+@pytest.mark.parametrize("ext", ["mif", "tab"])
+@pytest.mark.parametrize("dsStrictOpt", [False, True])
+def test_ogr_mitab_non_strict_fields_laundering(tmp_vsimem, ext, dsStrictOpt):
+
+    tmpfile = tmp_vsimem / f"ogr_mitab_non_strict_fields_laundering.{ext}"
+    dsOpt = [f"FORMAT={ext}"]
+    lyrOpt = []
+    if dsStrictOpt:
+        dsOpt.append("STRICT_FIELDS_NAME_LAUNDERING=NO")
+    else:
+        lyrOpt.append("STRICT_FIELDS_NAME_LAUNDERING=NO")
+    ds = ogr.GetDriverByName("MapInfo File").CreateDataSource(tmpfile, options=dsOpt)
+    lyr = ds.CreateLayer("test", options=lyrOpt)
+    lyr.CreateField(ogr.FieldDefn("dot.and space", ogr.OFTInteger))
+    f = ogr.Feature(lyr.GetLayerDefn())
+    f["dot.and space"] = 1
+    f.SetGeometryDirectly(ogr.CreateGeometryFromWkt("POINT(2 3)"))
+    lyr.CreateFeature(f)
+    with gdal.quiet_errors():
+        ds = None
+
+    ds = ogr.Open(tmpfile)
+    lyr = ds.GetLayer(0)
+    f = lyr.GetNextFeature()
+    assert f["dot.and_space"] == 1
+    ds = None
+
+
 ###############################################################################
 # Test read text labels with local encoding from mif/mid file
 
@@ -2591,6 +2648,7 @@ def _test_srs(workdir, srs, input_srs=None, ext="tab"):
     assert srs
     if isinstance(srs, str):
         tmp = osr.SpatialReference()
+        tmp.SetAxisMappingStrategy(osr.OAMS_TRADITIONAL_GIS_ORDER)
         tmp.SetFromUserInput(srs)
         srs = tmp
     if input_srs and isinstance(input_srs, str):
@@ -2709,6 +2767,17 @@ def test_ogr_mitab_write_etrs89_from_custom_wkt_no_geogcs_code(tmp_vsimem):
     _test_srs(tmp_vsimem, srs, "EPSG:25832")
 
 
+###############################################################################
+
+
+def test_ogr_mitab_write_estonia_1977(tmp_vsimem):
+
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(3301)
+    srs.SetAxisMappingStrategy(osr.OAMS_TRADITIONAL_GIS_ORDER)
+    _test_srs(tmp_vsimem, srs, "EPSG:3301")
+
+
 ###############################################################################
 # Test writing point with LABEL style string
 
diff --git a/autotest/ogr/ogr_mongodbv3.py b/autotest/ogr/ogr_mongodbv3.py
index 6b41e723e2d9..0c932ce0601f 100755
--- a/autotest/ogr/ogr_mongodbv3.py
+++ b/autotest/ogr/ogr_mongodbv3.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2015-2019, Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/ogr/ogr_mssqlspatial.py b/autotest/ogr/ogr_mssqlspatial.py
index 9a42741cd9f4..914c6f8e2093 100755
--- a/autotest/ogr/ogr_mssqlspatial.py
+++ b/autotest/ogr/ogr_mssqlspatial.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2018, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
@@ -260,9 +244,6 @@ def test_ogr_mssqlspatial_4(mssql_ds, mssql_has_z_m):
 
         ogrtest.check_feature_geometry(feat_read, geom)
 
-        feat_read.Destroy()
-
-    dst_feat.Destroy()
     mssqlspatial_lyr.ResetReading()  # to close implicit transaction
 
 
diff --git a/autotest/ogr/ogr_mvt.py b/autotest/ogr/ogr_mvt.py
index 25b006385c7e..92ec8d2c9666 100755
--- a/autotest/ogr/ogr_mvt.py
+++ b/autotest/ogr/ogr_mvt.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2018, Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import json
diff --git a/autotest/ogr/ogr_mysql.py b/autotest/ogr/ogr_mysql.py
index 04e08ed29880..d490c69b736c 100755
--- a/autotest/ogr/ogr_mysql.py
+++ b/autotest/ogr/ogr_mysql.py
@@ -350,8 +350,6 @@ def test_ogr_mysql_6(mysql_ds):
             max_error=1e-3,
         )
 
-        feat_read.Destroy()
-
         sql_lyr.ResetReading()
 
         with ogrtest.spatial_filter(sql_lyr, "LINESTRING(-10 -10,0 0)"):
@@ -556,7 +554,6 @@ def test_ogr_mysql_20(mysql_ds):
     # We are obliged to create a fake geometry
     dst_feat.SetGeometryDirectly(ogr.CreateGeometryFromWkt("POINT(0 1)"))
     layer.CreateFeature(dst_feat)
-    dst_feat.Destroy()
 
     layer = mysql_ds.GetLayerByName("select")
     layer.ResetReading()
@@ -602,8 +599,6 @@ def test_ogr_mysql_22(mysql_ds):
 
     layer.CreateFeature(dst_feat)
 
-    dst_feat.Destroy()
-
     layer.ResetReading()
     feat = layer.GetNextFeature()
     assert feat is not None
diff --git a/autotest/ogr/ogr_nas.py b/autotest/ogr/ogr_nas.py
index 35a4dc2e9778..07fc94749fd3 100755
--- a/autotest/ogr/ogr_nas.py
+++ b/autotest/ogr/ogr_nas.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2010-2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -283,3 +267,38 @@ def test_ogr_nas_5():
         os.remove("data/nas/replace_nas.gfs")
     except OSError:
         pass
+
+
+###############################################################################
+# Test force opening a NAS file
+
+
+def test_ogr_nas_force_opening(tmp_vsimem):
+
+    filename = str(tmp_vsimem / "test.xml")
+
+    prolog = '<?xml version="1.0" encoding="UTF-8"?>'
+    with gdaltest.vsi_open(filename, "wb") as f:
+        with open("data/nas/replace_nas.xml", "rb") as fsrc:
+            f.write(fsrc.read(len(prolog)) + b" " * (1000 * 1000) + fsrc.read())  # '<'
+
+    with pytest.raises(Exception):
+        gdal.OpenEx(filename)
+
+    with gdal.quiet_errors():
+        ds = gdal.OpenEx(filename, allowed_drivers=["NAS"])
+    assert ds.GetDriver().GetDescription() == "NAS"
+
+
+###############################################################################
+# Test we don't spend too much time parsing documents featuring the billion
+# laugh attack
+
+
+def test_ogr_nas_billion_laugh():
+
+    with gdal.config_option("NAS_GFS_TEMPLATE", ""):
+        with gdal.quiet_errors(), pytest.raises(
+            Exception, match="File probably corrupted"
+        ):
+            ogr.Open("data/nas/billionlaugh.xml")
diff --git a/autotest/ogr/ogr_ngw.py b/autotest/ogr/ogr_ngw.py
index 96874e0cd03f..eaced10c232c 100755
--- a/autotest/ogr/ogr_ngw.py
+++ b/autotest/ogr/ogr_ngw.py
@@ -10,23 +10,7 @@
 #
 #  Copyright (c) 2018-2021, NextGIS <info@nextgis.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.
+# SPDX-License-Identifier: MIT
 ################################################################################
 
 import os
diff --git a/autotest/ogr/ogr_ntf.py b/autotest/ogr/ogr_ntf.py
index 6e0a7059042b..fdc1c5589915 100755
--- a/autotest/ogr/ogr_ntf.py
+++ b/autotest/ogr/ogr_ntf.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2009-2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 # The following tests will download sample data from
diff --git a/autotest/ogr/ogr_oapif.py b/autotest/ogr/ogr_oapif.py
index 55ddd1104a30..6f62b21c13a4 100755
--- a/autotest/ogr/ogr_oapif.py
+++ b/autotest/ogr/ogr_oapif.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2018, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
@@ -66,7 +50,15 @@ def test_ogr_oapif_errors():
     handler = webserver.SequentialHandler()
     handler.add("GET", "/oapif/collections", 404)
     with webserver.install_http_handler(handler):
-        with pytest.raises(Exception):
+        with pytest.raises(Exception, match="HTTP error code : 404"):
+            ogr.Open("OAPIF:http://localhost:%d/oapif" % gdaltest.webserver_port)
+
+    handler = webserver.SequentialHandler()
+    handler.add("GET", "/oapif/collections", 404, {}, "unavailable resource")
+    with webserver.install_http_handler(handler):
+        with pytest.raises(
+            Exception, match="HTTP error code : 404, unavailable resource"
+        ):
             ogr.Open("OAPIF:http://localhost:%d/oapif" % gdaltest.webserver_port)
 
     # No Content-Type
@@ -184,6 +176,9 @@ def test_ogr_oapif_empty_layer_and_user_query_parameters():
     assert lyr.GetName() == "foo"
 
     handler = webserver.SequentialHandler()
+    handler.add("GET", "/oapif?FOO=BAR", 200, {}, "{}")
+    handler.add("GET", "/oapif/api?FOO=BAR", 200, {}, "{}")
+    handler.add("GET", "/oapif/api/?FOO=BAR", 200, {}, "{}")
     handler.add(
         "GET",
         "/oapif/collections/foo/items?limit=20&FOO=BAR",
@@ -198,6 +193,15 @@ def test_ogr_oapif_empty_layer_and_user_query_parameters():
 ###############################################################################
 
 
+def _add_dummy_root_and_api_pages(handler, prefix=""):
+    handler.add("GET", prefix + "/oapif", 404, {}, "{}")
+    handler.add("GET", prefix + "/oapif/api", 404, {}, "{}")
+    handler.add("GET", prefix + "/oapif/api/", 404, {}, "{}")
+
+
+###############################################################################
+
+
 def test_ogr_oapif_open_by_collection_and_legacy_wfs3_prefix():
 
     handler = webserver.SequentialHandler()
@@ -218,6 +222,7 @@ def test_ogr_oapif_open_by_collection_and_legacy_wfs3_prefix():
     assert lyr.GetName() == "foo"
 
     handler = webserver.SequentialHandler()
+    _add_dummy_root_and_api_pages(handler)
     handler.add(
         "GET",
         "/oapif/collections/foo/items?limit=20",
@@ -237,19 +242,22 @@ def test_ogr_oapif_fc_links_next_geojson():
     handler = webserver.SequentialHandler()
     handler.add(
         "GET",
-        "/oapif/collections",
+        "/subdir/oapif/collections",
         200,
         {"Content-Type": "application/json"},
         '{ "collections" : [ { "name": "foo" }] }',
     )
     with webserver.install_http_handler(handler):
-        ds = ogr.Open("OAPIF:http://localhost:%d/oapif" % gdaltest.webserver_port)
+        ds = ogr.Open(
+            "OAPIF:http://localhost:%d/subdir/oapif" % gdaltest.webserver_port
+        )
     lyr = ds.GetLayer(0)
 
     handler = webserver.SequentialHandler()
+    _add_dummy_root_and_api_pages(handler, "/subdir")
     handler.add(
         "GET",
-        "/oapif/collections/foo/items?limit=20",
+        "/subdir/oapif/collections/foo/items?limit=20",
         200,
         {"Content-Type": "application/geo+json"},
         """{ "type": "FeatureCollection", "features": [
@@ -264,15 +272,16 @@ def test_ogr_oapif_fc_links_next_geojson():
     with webserver.install_http_handler(handler):
         assert lyr.GetLayerDefn().GetFieldCount() == 1
 
+    # Test relative links
     handler = webserver.SequentialHandler()
     handler.add(
         "GET",
-        "/oapif/collections/foo/items?limit=1000",
+        "/subdir/oapif/collections/foo/items?limit=1000",
         200,
         {"Content-Type": "application/geo+json"},
         """{ "type": "FeatureCollection",
                     "links" : [
-                        { "rel": "next", "type": "application/geo+json", "href": "http://localhost:%d/oapif/foo_next" }
+                        { "rel": "next", "type": "application/geo+json", "href": "/subdir/oapif/foo_next" }
                     ],
                     "features": [
                     {
@@ -281,22 +290,22 @@ def test_ogr_oapif_fc_links_next_geojson():
                             "foo": "bar"
                         }
                     }
-                ] }"""
-        % gdaltest.webserver_port,
+                ] }""",
     )
     with webserver.install_http_handler(handler):
         f = lyr.GetNextFeature()
-    if f["foo"] != "bar":
-        f.DumpReadable()
-        pytest.fail()
+    assert f["foo"] == "bar"
 
     handler = webserver.SequentialHandler()
     handler.add(
         "GET",
-        "/oapif/foo_next",
+        "/subdir/oapif/foo_next",
         200,
         {"Content-Type": "application/geo+json"},
         """{ "type": "FeatureCollection",
+                    "links" : [
+                        { "rel": "next", "type": "application/geo+json", "href": "./foo_next2" }
+                    ],
                     "features": [
                     {
                         "type": "Feature",
@@ -308,9 +317,73 @@ def test_ogr_oapif_fc_links_next_geojson():
     )
     with webserver.install_http_handler(handler):
         f = lyr.GetNextFeature()
-    if f["foo"] != "baz":
-        f.DumpReadable()
-        pytest.fail()
+    assert f["foo"] == "baz"
+
+    handler = webserver.SequentialHandler()
+    handler.add(
+        "GET",
+        "/subdir/oapif/foo_next2",
+        200,
+        {"Content-Type": "application/geo+json"},
+        """{ "type": "FeatureCollection",
+                    "links" : [
+                        { "rel": "next", "type": "application/geo+json", "href": "../oapif/foo_next3" }
+                    ],
+                    "features": [
+                    {
+                        "type": "Feature",
+                        "properties": {
+                            "foo": "baz2"
+                        }
+                    }
+                ] }""",
+    )
+    with webserver.install_http_handler(handler):
+        f = lyr.GetNextFeature()
+    assert f["foo"] == "baz2"
+
+    handler = webserver.SequentialHandler()
+    handler.add(
+        "GET",
+        "/subdir/oapif/foo_next3",
+        200,
+        {"Content-Type": "application/geo+json"},
+        """{ "type": "FeatureCollection",
+                    "links" : [
+                        { "rel": "next", "type": "application/geo+json", "href": "foo_next4" }
+                    ],
+                    "features": [
+                    {
+                        "type": "Feature",
+                        "properties": {
+                            "foo": "baz3"
+                        }
+                    }
+                ] }""",
+    )
+    with webserver.install_http_handler(handler):
+        f = lyr.GetNextFeature()
+    assert f["foo"] == "baz3"
+
+    handler = webserver.SequentialHandler()
+    handler.add(
+        "GET",
+        "/subdir/oapif/foo_next4",
+        200,
+        {"Content-Type": "application/geo+json"},
+        """{ "type": "FeatureCollection",
+                    "features": [
+                    {
+                        "type": "Feature",
+                        "properties": {
+                            "foo": "baz4"
+                        }
+                    }
+                ] }""",
+    )
+    with webserver.install_http_handler(handler):
+        f = lyr.GetNextFeature()
+    assert f["foo"] == "baz4"
 
 
 ###############################################################################
@@ -331,6 +404,7 @@ def test_ogr_oapif_id_is_integer():
     lyr = ds.GetLayer(0)
 
     handler = webserver.SequentialHandler()
+    _add_dummy_root_and_api_pages(handler)
     handler.add(
         "GET",
         "/oapif/collections/foo/items?limit=20",
@@ -521,6 +595,7 @@ def test_ogr_oapif_spatial_filter():
     assert lyr.GetExtent() == (-10.0, 15.0, 40.0, 50.0)
 
     handler = webserver.SequentialHandler()
+    _add_dummy_root_and_api_pages(handler)
     handler.add(
         "GET",
         "/oapif/collections/foo/items?limit=20",
@@ -770,6 +845,7 @@ def test_ogr_oapif_limit_from_numberMatched():
     lyr = ds.GetLayer(0)
 
     handler = webserver.SequentialHandler()
+    _add_dummy_root_and_api_pages(handler)
     handler.add(
         "GET",
         "/oapif/collections/foo/items?limit=20",
@@ -1112,6 +1188,7 @@ def test_ogr_oapif_schema_from_xml_schema():
 </xs:complexType>
 </xs:schema>""",
     )
+    _add_dummy_root_and_api_pages(handler)
     handler.add(
         "GET",
         "/oapif/collections/foo/items?limit=20",
@@ -1161,6 +1238,7 @@ def test_ogr_oapif_schema_from_json_schema():
         {"Content-Type": "application/schema+json"},
         open("data/oapif/oapif_json_schema_eo.jsonschema", "rt").read(),
     )
+    _add_dummy_root_and_api_pages(handler)
     handler.add(
         "GET",
         "/oapif/collections/foo/items?limit=20",
@@ -1219,6 +1297,7 @@ def test_ogr_oapif_stac_catalog():
     lyr = ds.GetLayer(0)
 
     handler = webserver.SequentialHandler()
+    _add_dummy_root_and_api_pages(handler)
     handler.add(
         "GET",
         "/oapif/collections/foo/items?limit=20",
@@ -1294,6 +1373,7 @@ def test_ogr_oapif_storage_crs_easting_northing():
     )
 
     handler = webserver.SequentialHandler()
+    _add_dummy_root_and_api_pages(handler)
     handler.add(
         "GET",
         "/oapif/collections/foo/items?limit=20",
@@ -1392,6 +1472,7 @@ def test_ogr_oapif_storage_crs_latitude_longitude():
     assert (minx, miny, maxx, maxy) == pytest.approx((-10, 40, 15, 50), abs=1e-3)
 
     handler = webserver.SequentialHandler()
+    _add_dummy_root_and_api_pages(handler)
     handler.add(
         "GET",
         "/oapif/collections/foo/items?limit=20",
@@ -1500,6 +1581,7 @@ def test_ogr_oapif_storage_crs_latitude_longitude_non_compliant_server():
     assert supported_srs_list is None
 
     handler = webserver.SequentialHandler()
+    _add_dummy_root_and_api_pages(handler)
     handler.add(
         "GET",
         "/oapif/collections/foo/items?limit=20",
@@ -1599,6 +1681,7 @@ def get_collections_handler():
 
     def get_items_handler():
         handler = webserver.SequentialHandler()
+        _add_dummy_root_and_api_pages(handler)
         handler.add(
             "GET",
             "/oapif/collections/foo/items?limit=20",
@@ -1968,11 +2051,14 @@ def test_ogr_oapif_initial_request_page_size():
     )
     with webserver.install_http_handler(handler):
         ds = gdal.OpenEx(
-            "OAPIF:http://localhost:%d/oapif" % gdaltest.webserver_port, gdal.OF_VECTOR
+            "http://localhost:%d/oapif" % gdaltest.webserver_port,
+            gdal.OF_VECTOR,
+            allowed_drivers=["OAPIF"],
         )
     lyr = ds.GetLayer(0)
 
     handler = webserver.SequentialHandler()
+    _add_dummy_root_and_api_pages(handler)
     handler.add(
         "GET",
         "/oapif/collections/foo/items?limit=20",
@@ -2009,6 +2095,7 @@ def test_ogr_oapif_initial_request_page_size():
     lyr = ds.GetLayer(0)
 
     handler = webserver.SequentialHandler()
+    _add_dummy_root_and_api_pages(handler)
     handler.add(
         "GET",
         "/oapif/collections/foo/items?limit=20",
@@ -2044,6 +2131,7 @@ def test_ogr_oapif_initial_request_page_size():
     lyr = ds.GetLayer(0)
 
     handler = webserver.SequentialHandler()
+    _add_dummy_root_and_api_pages(handler)
     handler.add(
         "GET",
         "/oapif/collections/foo/items?limit=1000",
@@ -2078,6 +2166,7 @@ def test_ogr_oapif_initial_request_page_size():
     lyr = ds.GetLayer(0)
 
     handler = webserver.SequentialHandler()
+    _add_dummy_root_and_api_pages(handler)
     handler.add(
         "GET",
         "/oapif/collections/foo/items?limit=30",
@@ -2094,3 +2183,82 @@ def test_ogr_oapif_initial_request_page_size():
     )
     with webserver.install_http_handler(handler):
         assert lyr.GetLayerDefn().GetFieldCount() == 1
+
+
+def test_ogr_oapif_datetime_open_option():
+    """Test DATETIME open option"""
+
+    handler = webserver.SequentialHandler()
+    handler.add(
+        "GET",
+        "/oapif/collections",
+        200,
+        {"Content-Type": "application/json"},
+        '{ "collections" : [ { "name": "foo" }] }',
+    )
+    with webserver.install_http_handler(handler):
+        ds = gdal.OpenEx(
+            "http://localhost:%d/oapif" % gdaltest.webserver_port,
+            gdal.OF_VECTOR,
+            open_options=["DATETIME=2011-01-03T12:31:00Z"],
+            allowed_drivers=["OAPIF"],
+        )
+    lyr = ds.GetLayer(0)
+
+    handler = webserver.SequentialHandler()
+    _add_dummy_root_and_api_pages(handler)
+    handler.add(
+        "GET",
+        "/oapif/collections/foo/items?limit=20",
+        200,
+        {"Content-Type": "application/geo+json"},
+        """{ "type": "FeatureCollection", "features": [
+                    {
+                        "type": "Feature",
+                        "properties": {
+                            "foo": "bar"
+                        }
+                    }
+                ] }""",
+    )
+    handler.add(
+        "GET",
+        "/oapif/collections/foo/items?limit=1000&datetime=2011-01-03T12:31:00Z",
+        200,
+        {"Content-Type": "application/geo+json"},
+        """{ "type": "FeatureCollection", "features": [
+                    {
+                        "type": "Feature",
+                        "properties": {
+                            "foo": "bar"
+                        }
+                    },
+                    {
+                        "type": "Feature",
+                        "properties": {
+                            "bar": "baz"
+                        }
+                    }
+                ] }""",
+    )
+    with webserver.install_http_handler(handler):
+        assert lyr.GetFeatureCount() == 2
+
+    handler = webserver.SequentialHandler()
+    handler.add(
+        "GET",
+        "/oapif/collections/foo/items?limit=1000&datetime=2011-01-03T12:31:00Z",
+        200,
+        {"Content-Type": "application/geo+json"},
+        """{ "type": "FeatureCollection", "features": [
+                    {
+                        "type": "Feature",
+                        "properties": {
+                            "foo": "bar"
+                        }
+                    }
+                ] }""",
+    )
+    with webserver.install_http_handler(handler):
+        f = lyr.GetNextFeature()
+        assert f["foo"] == "bar"
diff --git a/autotest/ogr/ogr_oci.py b/autotest/ogr/ogr_oci.py
index a8ad569222fe..7952d947633a 100755
--- a/autotest/ogr/ogr_oci.py
+++ b/autotest/ogr/ogr_oci.py
@@ -98,26 +98,20 @@ def test_ogr_oci_2():
     ######################################################
     # Copy in poly.shp
 
-    dst_feat = ogr.Feature(feature_def=gdaltest.oci_lyr.GetLayerDefn())
-
     shp_ds = ogr.Open("data/poly.shp")
     gdaltest.shp_ds = shp_ds
     shp_lyr = shp_ds.GetLayer(0)
 
-    feat = shp_lyr.GetNextFeature()
     gdaltest.poly_feat = []
 
-    while feat is not None:
+    for feat in shp_lyr:
 
         gdaltest.poly_feat.append(feat)
 
+        dst_feat = ogr.Feature(feature_def=gdaltest.oci_lyr.GetLayerDefn())
         dst_feat.SetFrom(feat)
         gdaltest.oci_lyr.CreateFeature(dst_feat)
 
-        feat = shp_lyr.GetNextFeature()
-
-    dst_feat.Destroy()
-
     # Test updating non-existing feature
     shp_lyr.ResetReading()
     feat = shp_lyr.GetNextFeature()
@@ -213,10 +207,6 @@ def test_ogr_oci_4():
         geom.SetCoordinateDimension(3)
         ogrtest.check_feature_geometry(geom_ref, geom)
 
-        feat_read.Destroy()
-
-    dst_feat.Destroy()
-
 
 ###############################################################################
 # Test ExecuteSQL() results layers without geometry.
@@ -271,7 +261,6 @@ def test_ogr_oci_7():
 
     geom = ogr.CreateGeometryFromWkt("LINESTRING(479505 4763195,480526 4762819)")
     gdaltest.oci_lyr.SetSpatialFilter(geom)
-    geom.Destroy()
 
     tr = ogrtest.check_features_against_list(gdaltest.oci_lyr, "eas_id", [158])
 
@@ -398,17 +387,15 @@ def test_ogr_oci_10():
 """
     )
 
-    sql_lyr = gdaltest.oci_ds.ExecuteSQL("select * from geom_test where ora_fid = 1")
+    with gdaltest.oci_ds.ExecuteSQL(
+        "select * from geom_test where ora_fid = 1"
+    ) as sql_lyr:
 
-    feat_read = sql_lyr.GetNextFeature()
+        feat_read = sql_lyr.GetNextFeature()
 
-    expected_wkt = "POLYGON ((1 1 0,5 1 0,5 7 0,1 7 0,1 1 0))"
+        expected_wkt = "POLYGON ((1 1 0,5 1 0,5 7 0,1 7 0,1 1 0))"
 
-    try:
         ogrtest.check_feature_geometry(feat_read, expected_wkt)
-    finally:
-        feat_read.Destroy()
-        gdaltest.oci_ds.ReleaseResultSet(sql_lyr)
 
 
 ###############################################################################
@@ -433,17 +420,15 @@ def test_ogr_oci_11():
 """
     )
 
-    sql_lyr = gdaltest.oci_ds.ExecuteSQL("select * from geom_test where ora_fid = 4")
+    expected_wkt = "POLYGON ((10 9,9.989043790736547 9.209056926535308,9.956295201467611 9.415823381635519,9.902113032590307 9.618033988749895,9.827090915285202 9.8134732861516,9.732050807568877 10.0,9.618033988749895 10.175570504584947,9.486289650954788 10.338261212717716,9.338261212717717 10.486289650954788,9.175570504584947 10.618033988749895,9.0 10.732050807568877,8.8134732861516 10.827090915285202,8.618033988749895 10.902113032590307,8.415823381635519 10.956295201467611,8.209056926535308 10.989043790736547,8 11,7.790943073464693 10.989043790736547,7.584176618364482 10.956295201467611,7.381966011250105 10.902113032590307,7.1865267138484 10.827090915285202,7.0 10.732050807568877,6.824429495415054 10.618033988749895,6.661738787282284 10.486289650954788,6.513710349045212 10.338261212717716,6.381966011250105 10.175570504584947,6.267949192431122 10.0,6.172909084714799 9.8134732861516,6.097886967409693 9.618033988749895,6.043704798532389 9.415823381635519,6.010956209263453 9.209056926535308,6 9,6.010956209263453 8.790943073464694,6.043704798532389 8.584176618364483,6.097886967409693 8.381966011250105,6.172909084714798 8.1865267138484,6.267949192431123 8.0,6.381966011250105 7.824429495415054,6.513710349045212 7.661738787282284,6.661738787282284 7.513710349045212,6.824429495415053 7.381966011250105,7 7.267949192431123,7.1865267138484 7.172909084714798,7.381966011250105 7.097886967409693,7.584176618364481 7.043704798532389,7.790943073464693 7.010956209263453,8 7,8.209056926535306 7.010956209263453,8.415823381635518 7.043704798532389,8.618033988749895 7.097886967409693,8.8134732861516 7.172909084714799,9.0 7.267949192431123,9.175570504584947 7.381966011250105,9.338261212717715 7.513710349045211,9.486289650954788 7.661738787282284,9.618033988749895 7.824429495415053,9.732050807568877 8,9.827090915285202 8.1865267138484,9.902113032590307 8.381966011250105,9.956295201467611 8.584176618364481,9.989043790736547 8.790943073464693,10 9))"
 
-    feat_read = sql_lyr.GetNextFeature()
+    with gdaltest.oci_ds.ExecuteSQL(
+        "select * from geom_test where ora_fid = 4"
+    ) as sql_lyr:
 
-    expected_wkt = "POLYGON ((10 9,9.989043790736547 9.209056926535308,9.956295201467611 9.415823381635519,9.902113032590307 9.618033988749895,9.827090915285202 9.8134732861516,9.732050807568877 10.0,9.618033988749895 10.175570504584947,9.486289650954788 10.338261212717716,9.338261212717717 10.486289650954788,9.175570504584947 10.618033988749895,9.0 10.732050807568877,8.8134732861516 10.827090915285202,8.618033988749895 10.902113032590307,8.415823381635519 10.956295201467611,8.209056926535308 10.989043790736547,8 11,7.790943073464693 10.989043790736547,7.584176618364482 10.956295201467611,7.381966011250105 10.902113032590307,7.1865267138484 10.827090915285202,7.0 10.732050807568877,6.824429495415054 10.618033988749895,6.661738787282284 10.486289650954788,6.513710349045212 10.338261212717716,6.381966011250105 10.175570504584947,6.267949192431122 10.0,6.172909084714799 9.8134732861516,6.097886967409693 9.618033988749895,6.043704798532389 9.415823381635519,6.010956209263453 9.209056926535308,6 9,6.010956209263453 8.790943073464694,6.043704798532389 8.584176618364483,6.097886967409693 8.381966011250105,6.172909084714798 8.1865267138484,6.267949192431123 8.0,6.381966011250105 7.824429495415054,6.513710349045212 7.661738787282284,6.661738787282284 7.513710349045212,6.824429495415053 7.381966011250105,7 7.267949192431123,7.1865267138484 7.172909084714798,7.381966011250105 7.097886967409693,7.584176618364481 7.043704798532389,7.790943073464693 7.010956209263453,8 7,8.209056926535306 7.010956209263453,8.415823381635518 7.043704798532389,8.618033988749895 7.097886967409693,8.8134732861516 7.172909084714799,9.0 7.267949192431123,9.175570504584947 7.381966011250105,9.338261212717715 7.513710349045211,9.486289650954788 7.661738787282284,9.618033988749895 7.824429495415053,9.732050807568877 8,9.827090915285202 8.1865267138484,9.902113032590307 8.381966011250105,9.956295201467611 8.584176618364481,9.989043790736547 8.790943073464693,10 9))"
+        feat_read = sql_lyr.GetNextFeature()
 
-    try:
         ogrtest.check_feature_geometry(feat_read, expected_wkt)
-    finally:
-        feat_read.Destroy()
-        gdaltest.oci_ds.ReleaseResultSet(sql_lyr)
 
 
 ###############################################################################
@@ -468,17 +453,15 @@ def test_ogr_oci_12():
 """
     )
 
-    sql_lyr = gdaltest.oci_ds.ExecuteSQL("select * from geom_test where ora_fid = 12")
+    expected_wkt = "LINESTRING (0.0 0.0,0.104528463267653 0.005478104631727,0.207911690817759 0.021852399266194,0.309016994374947 0.048943483704846,0.4067366430758 0.086454542357399,0.5 0.133974596215561,0.587785252292473 0.190983005625053,0.669130606358858 0.256855174522606,0.743144825477394 0.330869393641142,0.809016994374947 0.412214747707527,0.866025403784439 0.5,0.913545457642601 0.5932633569242,0.951056516295154 0.690983005625053,0.978147600733806 0.792088309182241,0.994521895368273 0.895471536732347,1 1,0.994521895368273 1.104528463267654,0.978147600733806 1.207911690817759,0.951056516295154 1.309016994374948,0.913545457642601 1.4067366430758,0.866025403784439 1.5,0.809016994374947 1.587785252292473,0.743144825477394 1.669130606358858,0.669130606358858 1.743144825477394,0.587785252292473 1.809016994374948,0.5 1.866025403784439,0.4067366430758 1.913545457642601,0.309016994374947 1.951056516295154,0.207911690817759 1.978147600733806,0.104528463267653 1.994521895368273,0 2,-0.104528463267653 2.005478104631727,-0.207911690817759 2.021852399266194,-0.309016994374947 2.048943483704846,-0.4067366430758 2.086454542357399,-0.5 2.133974596215561,-0.587785252292473 2.190983005625053,-0.669130606358858 2.256855174522606,-0.743144825477394 2.330869393641142,-0.809016994374947 2.412214747707527,-0.866025403784439 2.5,-0.913545457642601 2.593263356924199,-0.951056516295154 2.690983005625053,-0.978147600733806 2.792088309182241,-0.994521895368273 2.895471536732346,-1 3,-0.994521895368273 3.104528463267653,-0.978147600733806 3.207911690817759,-0.951056516295154 3.309016994374948,-0.913545457642601 3.4067366430758,-0.866025403784439 3.5,-0.809016994374948 3.587785252292473,-0.743144825477394 3.669130606358858,-0.669130606358858 3.743144825477394,-0.587785252292473 3.809016994374948,-0.5 3.866025403784438,-0.4067366430758 3.913545457642601,-0.309016994374948 3.951056516295154,-0.20791169081776 3.978147600733806,-0.104528463267653 3.994521895368274,0 4,0.209056926535307 3.989043790736547,0.415823381635519 3.956295201467611,0.618033988749895 3.902113032590307,0.8134732861516 3.827090915285202,1.0 3.732050807568877,1.175570504584946 3.618033988749895,1.338261212717717 3.486289650954788,1.486289650954789 3.338261212717717,1.618033988749895 3.175570504584946,1.732050807568877 3.0,1.827090915285202 2.8134732861516,1.902113032590307 2.618033988749895,1.956295201467611 2.415823381635519,1.989043790736547 2.209056926535307,2 2,1.989043790736547 1.790943073464693,1.956295201467611 1.584176618364481,1.902113032590307 1.381966011250105,1.827090915285202 1.1865267138484,1.732050807568877 1.0,1.618033988749895 0.824429495415054,1.486289650954789 0.661738787282284,1.338261212717717 0.513710349045212,1.175570504584946 0.381966011250105,1.0 0.267949192431123,0.8134732861516 0.172909084714798,0.618033988749895 0.097886967409693,0.415823381635519 0.043704798532389,0.209056926535307 0.010956209263453,0.0 0.0)"
 
-    feat_read = sql_lyr.GetNextFeature()
+    with gdaltest.oci_ds.ExecuteSQL(
+        "select * from geom_test where ora_fid = 12"
+    ) as sql_lyr:
 
-    expected_wkt = "LINESTRING (0.0 0.0,0.104528463267653 0.005478104631727,0.207911690817759 0.021852399266194,0.309016994374947 0.048943483704846,0.4067366430758 0.086454542357399,0.5 0.133974596215561,0.587785252292473 0.190983005625053,0.669130606358858 0.256855174522606,0.743144825477394 0.330869393641142,0.809016994374947 0.412214747707527,0.866025403784439 0.5,0.913545457642601 0.5932633569242,0.951056516295154 0.690983005625053,0.978147600733806 0.792088309182241,0.994521895368273 0.895471536732347,1 1,0.994521895368273 1.104528463267654,0.978147600733806 1.207911690817759,0.951056516295154 1.309016994374948,0.913545457642601 1.4067366430758,0.866025403784439 1.5,0.809016994374947 1.587785252292473,0.743144825477394 1.669130606358858,0.669130606358858 1.743144825477394,0.587785252292473 1.809016994374948,0.5 1.866025403784439,0.4067366430758 1.913545457642601,0.309016994374947 1.951056516295154,0.207911690817759 1.978147600733806,0.104528463267653 1.994521895368273,0 2,-0.104528463267653 2.005478104631727,-0.207911690817759 2.021852399266194,-0.309016994374947 2.048943483704846,-0.4067366430758 2.086454542357399,-0.5 2.133974596215561,-0.587785252292473 2.190983005625053,-0.669130606358858 2.256855174522606,-0.743144825477394 2.330869393641142,-0.809016994374947 2.412214747707527,-0.866025403784439 2.5,-0.913545457642601 2.593263356924199,-0.951056516295154 2.690983005625053,-0.978147600733806 2.792088309182241,-0.994521895368273 2.895471536732346,-1 3,-0.994521895368273 3.104528463267653,-0.978147600733806 3.207911690817759,-0.951056516295154 3.309016994374948,-0.913545457642601 3.4067366430758,-0.866025403784439 3.5,-0.809016994374948 3.587785252292473,-0.743144825477394 3.669130606358858,-0.669130606358858 3.743144825477394,-0.587785252292473 3.809016994374948,-0.5 3.866025403784438,-0.4067366430758 3.913545457642601,-0.309016994374948 3.951056516295154,-0.20791169081776 3.978147600733806,-0.104528463267653 3.994521895368274,0 4,0.209056926535307 3.989043790736547,0.415823381635519 3.956295201467611,0.618033988749895 3.902113032590307,0.8134732861516 3.827090915285202,1.0 3.732050807568877,1.175570504584946 3.618033988749895,1.338261212717717 3.486289650954788,1.486289650954789 3.338261212717717,1.618033988749895 3.175570504584946,1.732050807568877 3.0,1.827090915285202 2.8134732861516,1.902113032590307 2.618033988749895,1.956295201467611 2.415823381635519,1.989043790736547 2.209056926535307,2 2,1.989043790736547 1.790943073464693,1.956295201467611 1.584176618364481,1.902113032590307 1.381966011250105,1.827090915285202 1.1865267138484,1.732050807568877 1.0,1.618033988749895 0.824429495415054,1.486289650954789 0.661738787282284,1.338261212717717 0.513710349045212,1.175570504584946 0.381966011250105,1.0 0.267949192431123,0.8134732861516 0.172909084714798,0.618033988749895 0.097886967409693,0.415823381635519 0.043704798532389,0.209056926535307 0.010956209263453,0.0 0.0)"
+        feat_read = sql_lyr.GetNextFeature()
 
-    try:
         ogrtest.check_feature_geometry(feat_read, expected_wkt)
-    finally:
-        feat_read.Destroy()
-        gdaltest.oci_ds.ReleaseResultSet(sql_lyr)
 
 
 ###############################################################################
@@ -503,17 +486,15 @@ def test_ogr_oci_13():
 """
     )
 
-    sql_lyr = gdaltest.oci_ds.ExecuteSQL("select * from geom_test where ora_fid = 13")
+    expected_wkt = "POLYGON ((0.0 0.0,0.104528463267653 0.005478104631727,0.207911690817759 0.021852399266194,0.309016994374947 0.048943483704846,0.4067366430758 0.086454542357399,0.5 0.133974596215561,0.587785252292473 0.190983005625053,0.669130606358858 0.256855174522606,0.743144825477394 0.330869393641142,0.809016994374947 0.412214747707527,0.866025403784439 0.5,0.913545457642601 0.5932633569242,0.951056516295154 0.690983005625053,0.978147600733806 0.792088309182241,0.994521895368273 0.895471536732347,1 1,0.994521895368273 1.104528463267654,0.978147600733806 1.207911690817759,0.951056516295154 1.309016994374948,0.913545457642601 1.4067366430758,0.866025403784439 1.5,0.809016994374947 1.587785252292473,0.743144825477394 1.669130606358858,0.669130606358858 1.743144825477394,0.587785252292473 1.809016994374948,0.5 1.866025403784439,0.4067366430758 1.913545457642601,0.309016994374947 1.951056516295154,0.207911690817759 1.978147600733806,0.104528463267653 1.994521895368273,0 2,-0.104528463267653 2.005478104631727,-0.207911690817759 2.021852399266194,-0.309016994374947 2.048943483704846,-0.4067366430758 2.086454542357399,-0.5 2.133974596215561,-0.587785252292473 2.190983005625053,-0.669130606358858 2.256855174522606,-0.743144825477394 2.330869393641142,-0.809016994374947 2.412214747707527,-0.866025403784439 2.5,-0.913545457642601 2.593263356924199,-0.951056516295154 2.690983005625053,-0.978147600733806 2.792088309182241,-0.994521895368273 2.895471536732346,-1 3,-0.994521895368273 3.104528463267653,-0.978147600733806 3.207911690817759,-0.951056516295154 3.309016994374948,-0.913545457642601 3.4067366430758,-0.866025403784439 3.5,-0.809016994374948 3.587785252292473,-0.743144825477394 3.669130606358858,-0.669130606358858 3.743144825477394,-0.587785252292473 3.809016994374948,-0.5 3.866025403784438,-0.4067366430758 3.913545457642601,-0.309016994374948 3.951056516295154,-0.20791169081776 3.978147600733806,-0.104528463267653 3.994521895368274,0 4,0.209056926535307 3.989043790736547,0.415823381635519 3.956295201467611,0.618033988749895 3.902113032590307,0.8134732861516 3.827090915285202,1.0 3.732050807568877,1.175570504584946 3.618033988749895,1.338261212717717 3.486289650954788,1.486289650954789 3.338261212717717,1.618033988749895 3.175570504584946,1.732050807568877 3.0,1.827090915285202 2.8134732861516,1.902113032590307 2.618033988749895,1.956295201467611 2.415823381635519,1.989043790736547 2.209056926535307,2 2,1.989043790736547 1.790943073464693,1.956295201467611 1.584176618364481,1.902113032590307 1.381966011250105,1.827090915285202 1.1865267138484,1.732050807568877 1.0,1.618033988749895 0.824429495415054,1.486289650954789 0.661738787282284,1.338261212717717 0.513710349045212,1.175570504584946 0.381966011250105,1.0 0.267949192431123,0.8134732861516 0.172909084714798,0.618033988749895 0.097886967409693,0.415823381635519 0.043704798532389,0.209056926535307 0.010956209263453,0.0 0.0))"
 
-    feat_read = sql_lyr.GetNextFeature()
+    with gdaltest.oci_ds.ExecuteSQL(
+        "select * from geom_test where ora_fid = 13"
+    ) as sql_lyr:
 
-    expected_wkt = "POLYGON ((0.0 0.0,0.104528463267653 0.005478104631727,0.207911690817759 0.021852399266194,0.309016994374947 0.048943483704846,0.4067366430758 0.086454542357399,0.5 0.133974596215561,0.587785252292473 0.190983005625053,0.669130606358858 0.256855174522606,0.743144825477394 0.330869393641142,0.809016994374947 0.412214747707527,0.866025403784439 0.5,0.913545457642601 0.5932633569242,0.951056516295154 0.690983005625053,0.978147600733806 0.792088309182241,0.994521895368273 0.895471536732347,1 1,0.994521895368273 1.104528463267654,0.978147600733806 1.207911690817759,0.951056516295154 1.309016994374948,0.913545457642601 1.4067366430758,0.866025403784439 1.5,0.809016994374947 1.587785252292473,0.743144825477394 1.669130606358858,0.669130606358858 1.743144825477394,0.587785252292473 1.809016994374948,0.5 1.866025403784439,0.4067366430758 1.913545457642601,0.309016994374947 1.951056516295154,0.207911690817759 1.978147600733806,0.104528463267653 1.994521895368273,0 2,-0.104528463267653 2.005478104631727,-0.207911690817759 2.021852399266194,-0.309016994374947 2.048943483704846,-0.4067366430758 2.086454542357399,-0.5 2.133974596215561,-0.587785252292473 2.190983005625053,-0.669130606358858 2.256855174522606,-0.743144825477394 2.330869393641142,-0.809016994374947 2.412214747707527,-0.866025403784439 2.5,-0.913545457642601 2.593263356924199,-0.951056516295154 2.690983005625053,-0.978147600733806 2.792088309182241,-0.994521895368273 2.895471536732346,-1 3,-0.994521895368273 3.104528463267653,-0.978147600733806 3.207911690817759,-0.951056516295154 3.309016994374948,-0.913545457642601 3.4067366430758,-0.866025403784439 3.5,-0.809016994374948 3.587785252292473,-0.743144825477394 3.669130606358858,-0.669130606358858 3.743144825477394,-0.587785252292473 3.809016994374948,-0.5 3.866025403784438,-0.4067366430758 3.913545457642601,-0.309016994374948 3.951056516295154,-0.20791169081776 3.978147600733806,-0.104528463267653 3.994521895368274,0 4,0.209056926535307 3.989043790736547,0.415823381635519 3.956295201467611,0.618033988749895 3.902113032590307,0.8134732861516 3.827090915285202,1.0 3.732050807568877,1.175570504584946 3.618033988749895,1.338261212717717 3.486289650954788,1.486289650954789 3.338261212717717,1.618033988749895 3.175570504584946,1.732050807568877 3.0,1.827090915285202 2.8134732861516,1.902113032590307 2.618033988749895,1.956295201467611 2.415823381635519,1.989043790736547 2.209056926535307,2 2,1.989043790736547 1.790943073464693,1.956295201467611 1.584176618364481,1.902113032590307 1.381966011250105,1.827090915285202 1.1865267138484,1.732050807568877 1.0,1.618033988749895 0.824429495415054,1.486289650954789 0.661738787282284,1.338261212717717 0.513710349045212,1.175570504584946 0.381966011250105,1.0 0.267949192431123,0.8134732861516 0.172909084714798,0.618033988749895 0.097886967409693,0.415823381635519 0.043704798532389,0.209056926535307 0.010956209263453,0.0 0.0))"
+        feat_read = sql_lyr.GetNextFeature()
 
-    try:
         ogrtest.check_feature_geometry(feat_read, expected_wkt)
-    finally:
-        feat_read.Destroy()
-        gdaltest.oci_ds.ReleaseResultSet(sql_lyr)
 
 
 ###############################################################################
@@ -538,17 +519,15 @@ def test_ogr_oci_14():
 """
     )
 
-    sql_lyr = gdaltest.oci_ds.ExecuteSQL("select * from geom_test where ora_fid = 11")
+    expected_wkt = "LINESTRING (10 10,10 14,9.58188614692939 13.9780875814731,9.16835323672896 13.9125904029352,8.76393202250021 13.8042260651806,8.3730534276968 13.6541818305704,8.0 13.4641016151378,7.64885899083011 13.2360679774998,7.32347757456457 12.9725793019096,7.02742069809042 12.6765224254354,6.76393202250021 12.3511410091699,6.53589838486224 12.0,6.3458181694296 11.6269465723032,6.19577393481939 11.2360679774998,6.08740959706478 10.831646763271,6.02191241852691 10.4181138530706,6 10,6.02191241852691 9.58188614692939,6.08740959706478 9.16835323672896,6.19577393481939 8.76393202250021,6.3458181694296 8.3730534276968,6.53589838486225 8.0,6.76393202250021 7.64885899083011,7.02742069809042 7.32347757456457,7.32347757456457 7.02742069809042,7.64885899083011 6.76393202250021,8.0 6.53589838486225,8.3730534276968 6.3458181694296,8.76393202250021 6.19577393481939,9.16835323672896 6.08740959706478,9.58188614692939 6.02191241852691,10 6,10.4181138530706 6.02191241852691,10.831646763271 6.08740959706478,11.2360679774998 6.19577393481939,11.6269465723032 6.3458181694296,12.0 6.53589838486225,12.3511410091699 6.76393202250021,12.6765224254354 7.02742069809042,12.9725793019096 7.32347757456457,13.2360679774998 7.64885899083011,13.4641016151378 8.0,13.6541818305704 8.3730534276968,13.8042260651806 8.76393202250021,13.9125904029352 9.16835323672896,13.9780875814731 9.58188614692939,14 10)"
 
-    feat_read = sql_lyr.GetNextFeature()
+    with gdaltest.oci_ds.ExecuteSQL(
+        "select * from geom_test where ora_fid = 11"
+    ) as sql_lyr:
 
-    expected_wkt = "LINESTRING (10 10,10 14,9.58188614692939 13.9780875814731,9.16835323672896 13.9125904029352,8.76393202250021 13.8042260651806,8.3730534276968 13.6541818305704,8.0 13.4641016151378,7.64885899083011 13.2360679774998,7.32347757456457 12.9725793019096,7.02742069809042 12.6765224254354,6.76393202250021 12.3511410091699,6.53589838486224 12.0,6.3458181694296 11.6269465723032,6.19577393481939 11.2360679774998,6.08740959706478 10.831646763271,6.02191241852691 10.4181138530706,6 10,6.02191241852691 9.58188614692939,6.08740959706478 9.16835323672896,6.19577393481939 8.76393202250021,6.3458181694296 8.3730534276968,6.53589838486225 8.0,6.76393202250021 7.64885899083011,7.02742069809042 7.32347757456457,7.32347757456457 7.02742069809042,7.64885899083011 6.76393202250021,8.0 6.53589838486225,8.3730534276968 6.3458181694296,8.76393202250021 6.19577393481939,9.16835323672896 6.08740959706478,9.58188614692939 6.02191241852691,10 6,10.4181138530706 6.02191241852691,10.831646763271 6.08740959706478,11.2360679774998 6.19577393481939,11.6269465723032 6.3458181694296,12.0 6.53589838486225,12.3511410091699 6.76393202250021,12.6765224254354 7.02742069809042,12.9725793019096 7.32347757456457,13.2360679774998 7.64885899083011,13.4641016151378 8.0,13.6541818305704 8.3730534276968,13.8042260651806 8.76393202250021,13.9125904029352 9.16835323672896,13.9780875814731 9.58188614692939,14 10)"
+        feat_read = sql_lyr.GetNextFeature()
 
-    try:
         ogrtest.check_feature_geometry(feat_read, expected_wkt)
-    finally:
-        feat_read.Destroy()
-        gdaltest.oci_ds.ReleaseResultSet(sql_lyr)
 
 
 ###############################################################################
@@ -573,17 +552,15 @@ def test_ogr_oci_15():
 """
     )
 
-    sql_lyr = gdaltest.oci_ds.ExecuteSQL("select * from geom_test where ora_fid = 21")
+    expected_wkt = "POLYGON ((-10 10,10 10,9.94521895368273 8.95471536732347,9.78147600733806 7.92088309182241,9.51056516295153 6.90983005625053,9.13545457642601 5.932633569242,8.66025403784439 5.0,8.09016994374947 4.12214747707527,7.43144825477394 3.30869393641142,6.69130606358858 2.56855174522606,5.87785252292473 1.90983005625053,5.0 1.33974596215561,4.067366430758 0.864545423573992,3.09016994374947 0.489434837048465,2.07911690817759 0.218523992661945,1.04528463267653 0.054781046317267,0.0 0.0,-1.04528463267653 0.054781046317267,-2.07911690817759 0.218523992661943,-3.09016994374947 0.489434837048464,-4.067366430758 0.86454542357399,-5 1.33974596215561,-5.87785252292473 1.90983005625053,-6.69130606358858 2.56855174522606,-7.43144825477394 3.30869393641142,-8.09016994374947 4.12214747707527,-8.66025403784439 5.0,-9.13545457642601 5.932633569242,-9.51056516295153 6.90983005625053,-9.78147600733806 7.92088309182241,-9.94521895368273 8.95471536732346,-10 10))"
 
-    feat_read = sql_lyr.GetNextFeature()
+    with gdaltest.oci_ds.ExecuteSQL(
+        "select * from geom_test where ora_fid = 21"
+    ) as sql_lyr:
 
-    expected_wkt = "POLYGON ((-10 10,10 10,9.94521895368273 8.95471536732347,9.78147600733806 7.92088309182241,9.51056516295153 6.90983005625053,9.13545457642601 5.932633569242,8.66025403784439 5.0,8.09016994374947 4.12214747707527,7.43144825477394 3.30869393641142,6.69130606358858 2.56855174522606,5.87785252292473 1.90983005625053,5.0 1.33974596215561,4.067366430758 0.864545423573992,3.09016994374947 0.489434837048465,2.07911690817759 0.218523992661945,1.04528463267653 0.054781046317267,0.0 0.0,-1.04528463267653 0.054781046317267,-2.07911690817759 0.218523992661943,-3.09016994374947 0.489434837048464,-4.067366430758 0.86454542357399,-5 1.33974596215561,-5.87785252292473 1.90983005625053,-6.69130606358858 2.56855174522606,-7.43144825477394 3.30869393641142,-8.09016994374947 4.12214747707527,-8.66025403784439 5.0,-9.13545457642601 5.932633569242,-9.51056516295153 6.90983005625053,-9.78147600733806 7.92088309182241,-9.94521895368273 8.95471536732346,-10 10))"
+        feat_read = sql_lyr.GetNextFeature()
 
-    try:
         ogrtest.check_feature_geometry(feat_read, expected_wkt)
-    finally:
-        feat_read.Destroy()
-        gdaltest.oci_ds.ReleaseResultSet(sql_lyr)
 
 
 ###############################################################################
@@ -634,26 +611,20 @@ def test_ogr_oci_17():
     ######################################################
     # Copy in poly.shp
 
-    dst_feat = ogr.Feature(feature_def=gdaltest.oci_lyr.GetLayerDefn())
-
     shp_ds = ogr.Open("data/poly.shp")
     gdaltest.shp_ds = shp_ds
     shp_lyr = shp_ds.GetLayer(0)
 
-    feat = shp_lyr.GetNextFeature()
     gdaltest.poly_feat = []
 
-    while feat is not None:
+    for feat in shp_lyr:
 
         gdaltest.poly_feat.append(feat)
 
+        dst_feat = ogr.Feature(feature_def=gdaltest.oci_lyr.GetLayerDefn())
         dst_feat.SetFrom(feat)
         gdaltest.oci_lyr.CreateFeature(dst_feat)
 
-        feat = shp_lyr.GetNextFeature()
-
-    dst_feat.Destroy()
-
     ######################################################
     # Create a distinct connection to the same database to monitor the
     # metadata table.
diff --git a/autotest/ogr/ogr_odbc.py b/autotest/ogr/ogr_odbc.py
index bf3f91e5301f..ebd0745ce184 100755
--- a/autotest/ogr/ogr_odbc.py
+++ b/autotest/ogr/ogr_odbc.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/ogr/ogr_ods.py b/autotest/ogr/ogr_ods.py
index 8b95b0ff278d..491665b09783 100755
--- a/autotest/ogr/ogr_ods.py
+++ b/autotest/ogr/ogr_ods.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -258,6 +242,28 @@ def test_ogr_ods_4():
     assert ret.find("INFO") != -1 and ret.find("ERROR") == -1
 
 
+###############################################################################
+# Run test_ogrsf
+
+
+def test_ogr_ods_test_ogrsf_update(tmp_path):
+
+    import test_cli_utilities
+
+    if test_cli_utilities.get_test_ogrsf_path() is None:
+        pytest.skip()
+
+    filename = str(tmp_path / "out.ods")
+    gdal.VectorTranslate(filename, "data/poly.shp", format="ODS")
+
+    ret = gdaltest.runexternal(
+        test_cli_utilities.get_test_ogrsf_path() + f" {filename}"
+    )
+
+    assert "INFO" in ret
+    assert "ERROR" not in ret
+
+
 ###############################################################################
 # Test write support
 
diff --git a/autotest/ogr/ogr_ogdi.py b/autotest/ogr/ogr_ogdi.py
index 8d200305ab9c..3d9accf1d891 100755
--- a/autotest/ogr/ogr_ogdi.py
+++ b/autotest/ogr/ogr_ogdi.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2010-2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/ogr/ogr_ogrtest.py b/autotest/ogr/ogr_ogrtest.py
index ae0a80ff5e33..f30057122f61 100644
--- a/autotest/ogr/ogr_ogrtest.py
+++ b/autotest/ogr/ogr_ogrtest.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2023, ISciences LLC
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import ogrtest
@@ -87,7 +71,7 @@ def test_check_geometry_equals_ngeoms_mismatch():
 
 def test_check_geometry_equals_orientation_differs():
     poly_ccw = ogr.CreateGeometryFromWkt("POLYGON ((0 0, 1 0, 1 1, 0 1, 0 0))")
-    poly_cw = ogr.CreateGeometryFromWkt("POLYGON ((0 0, 0 1, 1 1, 0 1, 0 0))")
+    poly_cw = ogr.CreateGeometryFromWkt("POLYGON ((0 0, 0 1, 1 1, 1 0, 0 0))")
 
     if ogrtest.have_geos():
         ogrtest.check_feature_geometry(poly_ccw, poly_cw)
diff --git a/autotest/ogr/ogr_openfilegdb.py b/autotest/ogr/ogr_openfilegdb.py
index 1678a8ccdadd..34abc6d8c257 100755
--- a/autotest/ogr/ogr_openfilegdb.py
+++ b/autotest/ogr/ogr_openfilegdb.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -781,17 +765,13 @@ def test_ogr_openfilegdb_4():
 ###############################################################################
 # Test use of attribute indexes on truncated strings
 
+IDX_NOT_USED = 0
+IDX_USED = 1
 
-def test_ogr_openfilegdb_str_indexed_truncated():
-
-    ds = ogr.Open("data/filegdb/test_str_indexed_truncated.gdb")
-
-    lyr = ds.GetLayerByName("test")
-
-    IDX_NOT_USED = 0
-    IDX_USED = 1
 
-    tests = [
+@pytest.mark.parametrize(
+    "where_clause, fids, expected_attr_index_use",
+    [
         ("str = 'a'", [1], IDX_USED),
         ("str = 'aa'", [2], IDX_USED),
         ("str != 'aa'", [1, 3], IDX_NOT_USED),
@@ -814,19 +794,47 @@ def test_ogr_openfilegdb_str_indexed_truncated():
         ("str IN ('aaa ')", [], IDX_USED),
         ("str IN ('aaaX')", [], IDX_USED),
         ("str IN ('aaaXX')", [], IDX_USED),
-    ]
-    for where_clause, fids, expected_attr_index_use in tests:
+        ("str ILIKE 'a'", [1], IDX_NOT_USED),
+        ("str ILIKE 'a%'", [1, 2, 3], IDX_NOT_USED),
+        ("str ILIKE 'aaa  '", [], IDX_NOT_USED),
+    ],
+)
+def test_ogr_openfilegdb_str_indexed_truncated(
+    where_clause, fids, expected_attr_index_use
+):
 
-        lyr.SetAttributeFilter(where_clause)
-        sql_lyr = ds.ExecuteSQL("GetLayerAttrIndexUse %s" % lyr.GetName())
-        attr_index_use = int(sql_lyr.GetNextFeature().GetField(0))
-        ds.ReleaseResultSet(sql_lyr)
-        assert attr_index_use == expected_attr_index_use, (
-            where_clause,
-            fids,
-            expected_attr_index_use,
-        )
-        assert [f.GetFID() for f in lyr] == fids, (where_clause, fids)
+    ds = ogr.Open("data/filegdb/test_str_indexed_truncated.gdb")
+
+    lyr = ds.GetLayerByName("test")
+
+    lyr.SetAttributeFilter(where_clause)
+    sql_lyr = ds.ExecuteSQL("GetLayerAttrIndexUse %s" % lyr.GetName())
+    attr_index_use = int(sql_lyr.GetNextFeature().GetField(0))
+    ds.ReleaseResultSet(sql_lyr)
+    assert attr_index_use == expected_attr_index_use, (
+        where_clause,
+        fids,
+        expected_attr_index_use,
+    )
+    assert [f.GetFID() for f in lyr] == fids, (where_clause, fids)
+
+
+def test_ogr_openfilegdb_ilike():
+
+    ds = ogr.Open("data/filegdb/Domains.gdb/a00000001.gdbtable")
+    lyr = ds.GetLayer(0)
+
+    lyr.SetAttributeFilter("Name = 'Roads'")
+    assert lyr.GetFeatureCount() == 1
+
+    lyr.SetAttributeFilter("Name ILIKE 'Roads'")
+    assert lyr.GetFeatureCount() == 1
+
+    lyr.SetAttributeFilter("Name = 'Roadsx'")
+    assert lyr.GetFeatureCount() == 0
+
+    lyr.SetAttributeFilter("Name ILIKE 'Roadsx'")
+    assert lyr.GetFeatureCount() == 0
 
 
 ###############################################################################
@@ -2734,3 +2742,204 @@ def error_handler(klass, type, msg):
         "file using Compressed Data Format (CDF) that is unhandled by the OpenFileGDB driver, but could be handled by the FileGDB driver"
         in msgs[0]
     )
+
+
+###############################################################################
+# Test reading a database with a layer with 64-bit OBJETID, non sparse
+
+
+def test_ogr_openfilegdb_read_objectid_64bit_non_sparse():
+
+    ds = ogr.Open("data/filegdb/objectid64/3features.gdb")
+    lyr = ds.GetLayer(0)
+    assert lyr.GetFeatureCount() == 3
+
+    f = lyr.GetNextFeature()
+    assert f.GetFID() == 1
+    assert f["Shape_Length"] == pytest.approx(3140.05912327677)
+    assert f["Shape_Area"] == pytest.approx(217981.09775568)
+    g1 = f.GetGeometryRef()
+    assert g1 is not None
+    minx, maxx, miny, maxy = g1.GetEnvelope()
+
+    f = lyr.GetNextFeature()
+    assert f.GetFID() == 2
+    assert f["Shape_Length"] == pytest.approx(3078.7376875286)
+    assert f["Shape_Area"] == pytest.approx(538056.426171967)
+    assert f.GetGeometryRef() is not None
+
+    f = lyr.GetNextFeature()
+    assert f.GetFID() == 3
+    assert f["Shape_Length"] == pytest.approx(3330.7300497069)
+    assert f["Shape_Area"] == pytest.approx(631040.074244291)
+    assert f.GetGeometryRef() is not None
+
+    assert lyr.GetNextFeature() is None
+
+    x = (minx + maxx) / 2
+    y = (miny + maxy) / 2
+    lyr.SetSpatialFilterRect(x, y, x, y)
+    lyr.ResetReading()
+    assert lyr.GetFeatureCount() == 1
+
+    ds = ogr.Open("data/filegdb/objectid64/3features.gdb", update=1)
+    lyr = ds.GetLayer(0)
+    with pytest.raises(Exception, match="Cannot open testpolygon in update mode"):
+        lyr.TestCapability(ogr.OLCSequentialWrite)
+
+
+def test_ogr_openfilegdb_read_objectid_64bit_non_sparse_test_ogrsf(ogrsf_path):
+    ret = gdaltest.runexternal(
+        ogrsf_path + " -ro data/filegdb/objectid64/3features.gdb"
+    )
+
+    success = "INFO" in ret and "ERROR" not in ret
+    assert success
+
+
+###############################################################################
+# Test reading a database with layers with 64-bit OBJETID, sparse
+
+
+def test_ogr_openfilegdb_read_objectid_64bit_sparse():
+
+    ds = ogr.Open("data/filegdb/objectid64/with_holes_8.gdb")
+
+    lyr = ds.GetLayerByName("with_holes_8_a")
+    assert lyr.GetFeatureCount() == 1
+    f = lyr.GetNextFeature()
+    assert f.GetFID() == 123456
+
+    lyr = ds.GetLayerByName("with_holes_8_b")
+    assert lyr.GetFeatureCount() == 1
+    f = lyr.GetNextFeature()
+    assert f.GetFID() == 1234567
+
+    lyr = ds.GetLayerByName("with_holes_8_c")
+    with gdal.quiet_errors():
+        assert lyr.GetFeatureCount() == 1
+    assert "Due to partial reverse engineering of the format" in gdal.GetLastErrorMsg()
+    f = lyr.GetNextFeature()
+    # This should be 12345678
+    assert f.GetFID() == 334
+
+    lyr = ds.GetLayerByName("with_holes_8_d")
+    with gdal.quiet_errors():
+        assert lyr.GetFeatureCount() == 1
+    assert "Due to partial reverse engineering of the format" in gdal.GetLastErrorMsg()
+    f = lyr.GetNextFeature()
+    # This should be 123456789
+    assert f.GetFID() == 277
+
+    lyr = ds.GetLayerByName("with_holes_8_e")
+    with gdal.quiet_errors():
+        assert lyr.GetFeatureCount() == 1
+    assert "Due to partial reverse engineering of the format" in gdal.GetLastErrorMsg()
+    f = lyr.GetNextFeature()
+    # This should be 1234567890
+    assert f.GetFID() == 722
+
+    lyr = ds.GetLayerByName("with_holes_8_f")
+    with gdal.quiet_errors():
+        assert lyr.GetFeatureCount() == 5
+    assert "Due to partial reverse engineering of the format" in gdal.GetLastErrorMsg()
+    # Should be 123456, 1234567, 12345678, 123456789, 1234567890
+    assert [f.GetFID() for f in lyr] == [576, 1671, 2382, 3349, 4818]
+
+
+def test_ogr_openfilegdb_read_objectid_64bit_sparse_test_ogrsf(ogrsf_path):
+    ret, _ = gdaltest.runexternal_out_and_err(
+        ogrsf_path + " -ro data/filegdb/objectid64/with_holes_8.gdb"
+    )
+
+    success = "INFO" in ret and "ERROR" not in ret
+    assert success
+
+
+###############################################################################
+# Test reading http:// resource
+
+
+@pytest.mark.require_curl()
+@pytest.mark.require_driver("HTTP")
+def test_ogr_openfilegdb_read_from_http():
+
+    import webserver
+
+    (webserver_process, webserver_port) = webserver.launch(
+        handler=webserver.DispatcherHttpHandler
+    )
+    if webserver_port == 0:
+        pytest.skip()
+
+    response = open("data/filegdb/testopenfilegdb.gdb.zip", "rb").read()
+
+    try:
+        handler = webserver.SequentialHandler()
+        handler.add(
+            "GET",
+            "/foo",
+            200,
+            {
+                "Content-Disposition": 'attachment; filename="foo.gdb.zip"; size='
+                + str(len(response))
+            },
+            response,
+        )
+        with webserver.install_http_handler(handler):
+            ds = gdal.OpenEx(
+                "http://localhost:%d/foo" % webserver_port,
+                allowed_drivers=["OpenFileGDB", "HTTP"],
+            )
+            assert ds is not None
+            assert ds.GetLayerCount() != 0
+
+        # If we have the GeoJSON driver, there will be one initial GET done by it
+        if ogr.GetDriverByName("GeoJSON"):
+            handler = webserver.SequentialHandler()
+            handler.add(
+                "GET",
+                "/foo",
+                200,
+                {
+                    "Content-Disposition": 'attachment; filename="foo.gdb.zip"; size='
+                    + str(len(response))
+                },
+                response,
+            )
+            handler.add(
+                "GET",
+                "/foo",
+                200,
+                {
+                    "Content-Disposition": 'attachment; filename="foo.gdb.zip"; size='
+                    + str(len(response))
+                },
+                response,
+            )
+            with webserver.install_http_handler(handler):
+                ds = gdal.OpenEx(
+                    "http://localhost:%d/foo" % webserver_port,
+                    allowed_drivers=["GeoJSON", "OpenFileGDB", "HTTP"],
+                )
+                assert ds is not None
+                assert ds.GetLayerCount() != 0
+
+    finally:
+        webserver.server_stop(webserver_process, webserver_port)
+
+
+###############################################################################
+# Test reading a geometry where there is an arc with an interior point, but
+# it is actually flagged as a line
+
+
+def test_ogr_openfilegdb_arc_interior_point_bug_line():
+
+    with ogr.Open("data/filegdb/arc_segment_interior_point_but_line.gdb.zip") as ds:
+        lyr = ds.GetLayer(0)
+        f = lyr.GetNextFeature()
+        ogrtest.check_feature_geometry(
+            f,
+            "MULTILINESTRING ((37252520.1717 7431529.9154,38549084.9654 758964.7573))",
+        )
diff --git a/autotest/ogr/ogr_openfilegdb_write.py b/autotest/ogr/ogr_openfilegdb_write.py
index 628f4b75a74c..2cd1db7dc95b 100755
--- a/autotest/ogr/ogr_openfilegdb_write.py
+++ b/autotest/ogr/ogr_openfilegdb_write.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import struct
@@ -1546,6 +1530,7 @@ def test_ogr_openfilegdb_write_spatial_index(
 ###############################################################################
 
 
+@gdaltest.enable_exceptions()
 def test_ogr_openfilegdb_write_attribute_index(tmp_vsimem):
 
     dirname = tmp_vsimem / "out.gdb"
@@ -1589,31 +1574,35 @@ def test_ogr_openfilegdb_write_attribute_index(tmp_vsimem):
     f = None
 
     # Errors of index creation
-    with gdal.quiet_errors():
-        gdal.ErrorReset()
+    with pytest.raises(
+        Exception, match="Invalid index name: cannot be greater than 16 characters"
+    ):
         ds.ExecuteSQL("CREATE INDEX this_name_is_wayyyyy_tooo_long ON test(int16)")
-        assert gdal.GetLastErrorMsg() != ""
 
-        gdal.ErrorReset()
+    with pytest.raises(Exception, match="Invalid layer name: non_existing_layer"):
         ds.ExecuteSQL("CREATE INDEX idx_int16 ON non_existing_layer(int16)")
-        assert gdal.GetLastErrorMsg() != ""
 
-        gdal.ErrorReset()
+    with pytest.raises(Exception, match="Cannot find field invalid_field"):
         ds.ExecuteSQL("CREATE INDEX invalid_field ON test(invalid_field)")
-        assert gdal.GetLastErrorMsg() != ""
 
-        # Reserved keyword
-        gdal.ErrorReset()
+    with pytest.raises(
+        Exception, match="Invalid index name: must not be a reserved keyword"
+    ):
         ds.ExecuteSQL("CREATE INDEX SELECT ON test(int16)")
-        assert gdal.GetLastErrorMsg() != ""
 
-        gdal.ErrorReset()
+    with pytest.raises(Exception, match="Invalid index name: must start with a letter"):
         ds.ExecuteSQL("CREATE INDEX _starting_by_ ON test(int16)")
-        assert gdal.GetLastErrorMsg() != ""
 
-        gdal.ErrorReset()
+    with pytest.raises(
+        Exception,
+        match="Invalid index name: must contain only alpha numeric character or _",
+    ):
         ds.ExecuteSQL("CREATE INDEX a&b ON test(int16)")
-        assert gdal.GetLastErrorMsg() != ""
+
+    with pytest.raises(
+        Exception, match="Creation of multiple-column indices is not supported"
+    ):
+        ds.ExecuteSQL("CREATE INDEX index_on_two_cols ON test(int16, int32)")
 
     # Create indexes
     gdal.ErrorReset()
@@ -1631,20 +1620,18 @@ def test_ogr_openfilegdb_write_attribute_index(tmp_vsimem):
     fld_defn = ogr.FieldDefn("unindexed", ogr.OFTString)
     assert lyr.CreateField(fld_defn) == ogr.OGRERR_NONE
 
-    with gdal.quiet_errors():
+    with pytest.raises(Exception, match="An index with same name already exists"):
         # Re-using an index name
-        gdal.ErrorReset()
         ds.ExecuteSQL("CREATE INDEX idx_int16 ON test(unindexed)")
-        assert gdal.GetLastErrorMsg() != ""
 
+    with pytest.raises(Exception, match="Field int16 has already a registered index"):
         # Trying to index twice a field
-        gdal.ErrorReset()
         ds.ExecuteSQL("CREATE INDEX int16_again ON test(int16)")
-        assert gdal.GetLastErrorMsg() != ""
 
-        gdal.ErrorReset()
+    with pytest.raises(
+        Exception, match="Field lower_str has already a registered index"
+    ):
         ds.ExecuteSQL("CREATE INDEX lower_str_again ON test(lower_str)")
-        assert gdal.GetLastErrorMsg() != ""
 
     ds = None
 
@@ -4510,3 +4497,77 @@ def test_ogr_openfilegdb_write_geom_coord_precision(tmp_vsimem):
         "ZTolerance": 0.0001,
         "HighPrecision": "true",
     }
+
+
+###############################################################################
+# Test repairing a corrupted header
+# Scenario similar to https://github.com/qgis/QGIS/issues/57536
+
+
+def test_ogr_openfilegdb_repair_corrupted_header(tmp_vsimem):
+
+    filename = str(tmp_vsimem / "out.gdb")
+    ds = ogr.GetDriverByName("OpenFileGDB").CreateDataSource(filename)
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(4326)
+    lyr = ds.CreateLayer("test", srs, ogr.wkbLineString)
+    f = ogr.Feature(lyr.GetLayerDefn())
+    g = ogr.Geometry(ogr.wkbLineString)
+    g.SetPoint_2D(10, 0, 0)
+    f.SetGeometry(g)
+    lyr.CreateFeature(f)
+    ds = None
+
+    # Corrupt m_nHeaderBufferMaxSize field
+    corrupted_filename = filename + "/a00000004.gdbtable"
+    f = gdal.VSIFOpenL(corrupted_filename, "r+b")
+    assert f
+    gdal.VSIFSeekL(f, 8, 0)
+    gdal.VSIFWriteL(b"\x00" * 4, 4, 1, f)
+    gdal.VSIFCloseL(f)
+
+    with gdal.config_option(
+        "OGR_OPENFILEGDB_ERROR_ON_INCONSISTENT_BUFFER_MAX_SIZE", "NO"
+    ), gdal.quiet_errors():
+        ds = ogr.Open(filename)
+    assert (
+        gdal.GetLastErrorMsg()
+        == f"A corruption in the header of {corrupted_filename} has been detected. It would need to be repaired to be properly read by other software, either by using ogr2ogr to generate a new dataset, or by opening this dataset in update mode and reading all its records."
+    )
+    assert ds.GetLayerCount() == 1
+
+    with gdal.config_option(
+        "OGR_OPENFILEGDB_ERROR_ON_INCONSISTENT_BUFFER_MAX_SIZE", "NO"
+    ), gdal.quiet_errors():
+        ds = ogr.Open(filename, update=1)
+    assert (
+        gdal.GetLastErrorMsg()
+        == f"A corruption in the header of {corrupted_filename} has been detected. It is going to be repaired to be properly read by other software."
+    )
+    assert ds.GetLayerCount() == 1
+
+    with gdal.config_option(
+        "OGR_OPENFILEGDB_ERROR_ON_INCONSISTENT_BUFFER_MAX_SIZE", "NO"
+    ), gdal.quiet_errors():
+        ds = ogr.Open(filename)
+    assert gdal.GetLastErrorMsg() == ""
+    assert ds.GetLayerCount() == 1
+
+
+###############################################################################
+# Test writing special value OGRUnsetMarker = -21121 in a int32 field
+
+
+def test_ogr_openfilegdb_write_OGRUnsetMarker(tmp_vsimem):
+
+    filename = str(tmp_vsimem / "out.gdb")
+    with ogr.GetDriverByName("OpenFileGDB").CreateDataSource(filename) as ds:
+        lyr = ds.CreateLayer("test", geom_type=ogr.wkbNone)
+        lyr.CreateField(ogr.FieldDefn("i32", ogr.OFTInteger))
+        f = ogr.Feature(lyr.GetLayerDefn())
+        f["i32"] = -21121
+        lyr.CreateFeature(f)
+    with ogr.Open(filename) as ds:
+        lyr = ds.GetLayer(0)
+        f = lyr.GetNextFeature()
+        assert f["i32"] == -21121
diff --git a/autotest/ogr/ogr_osm.py b/autotest/ogr/ogr_osm.py
index f50d66b04a68..65c141a12399 100755
--- a/autotest/ogr/ogr_osm.py
+++ b/autotest/ogr/ogr_osm.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2012-2014, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -929,3 +913,21 @@ def test_ogr_osm_tags_json_special_characters():
     assert lyr_defn.GetFieldDefn(other_tags_idx).GetSubType() == ogr.OFSTJSON
     f = lyr.GetNextFeature()
     assert f["other_tags"] == """{"foo":"x'\\\\\\"\\t\\n\\ry"}"""
+
+
+###############################################################################
+# Test that osmconf.ini can be parsed with Python's configparser
+
+
+def test_ogr_osmconf_ini():
+
+    import configparser
+
+    with ogr.Open("data/osm/test_json.pbf") as ds:
+        with ds.ExecuteSQL("SHOW config_file_path") as sql_lyr:
+            f = sql_lyr.GetNextFeature()
+            osmconf_ini_filename = f.GetField(0)
+            config = configparser.ConfigParser()
+            config.read_file(open(osmconf_ini_filename))
+            assert "general" in config
+            assert "closed_ways_are_polygons" in config["general"]
diff --git a/autotest/ogr/ogr_parquet.py b/autotest/ogr/ogr_parquet.py
index 82ed7c7afb71..b89fc1673b1e 100755
--- a/autotest/ogr/ogr_parquet.py
+++ b/autotest/ogr/ogr_parquet.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2022, Planet Labs
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import json
@@ -41,7 +25,7 @@
 
 pytestmark = pytest.mark.require_driver("Parquet")
 
-PARQUET_JSON_SCHEMA = "data/parquet/schema.json"
+GEOPARQUET_1_1_0_JSON_SCHEMA = "data/parquet/schema_1_1_0.json"
 
 
 ###############################################################################
@@ -81,7 +65,7 @@ def _validate(filename, check_data=False):
     import validate_geoparquet
 
     ret = validate_geoparquet.check(
-        filename, check_data=check_data, local_schema=PARQUET_JSON_SCHEMA
+        filename, check_data=check_data, local_schema=GEOPARQUET_1_1_0_JSON_SCHEMA
     )
     assert not ret
 
@@ -682,7 +666,7 @@ def test_ogr_parquet_write_from_another_dataset(use_vsi, row_group_size, fid):
         j = json.loads(geo)
         assert j is not None
         assert "version" in j
-        assert j["version"] == "1.0.0"
+        assert j["version"] == "1.1.0"
         assert "primary_column" in j
         assert j["primary_column"] == "geometry"
         assert "columns" in j
@@ -3317,13 +3301,22 @@ def test_ogr_parquet_bbox_double():
 
 
 @pytest.mark.require_geos
-def test_ogr_parquet_bbox_float32_but_no_covering_in_metadata():
+@pytest.mark.parametrize("use_dataset", [True, False])
+def test_ogr_parquet_bbox_float32_but_no_covering_in_metadata(use_dataset):
+
+    if use_dataset and not _has_arrow_dataset():
+        pytest.skip("Test requires build with ArrowDataset")
 
-    ds = ogr.Open("data/parquet/bbox_similar_to_overturemaps_2024-04-16-beta.0.parquet")
+    prefix = "PARQUET:" if use_dataset else ""
+
+    ds = ogr.Open(
+        prefix + "data/parquet/bbox_similar_to_overturemaps_2024-04-16-beta.0.parquet"
+    )
     lyr = ds.GetLayer(0)
     assert lyr.GetGeometryColumn() == "geometry"
     assert lyr.GetLayerDefn().GetFieldIndex("bbox.xmin") < 0
-    assert lyr.TestCapability(ogr.OLCFastGetExtent) == 1
+    if not use_dataset:
+        assert lyr.TestCapability(ogr.OLCFastGetExtent) == 1
     minx, maxx, miny, maxy = lyr.GetExtent()
     assert (minx, miny, maxx, maxy) == pytest.approx(
         (478315.53125, 4762880.5, 481645.3125, 4765610.5)
@@ -3337,14 +3330,16 @@ def test_ogr_parquet_bbox_float32_but_no_covering_in_metadata():
         maxy - (maxy - miny) / 2,
     ):
         f = lyr.GetNextFeature()
-        assert f.GetFID() == 8
+        if not use_dataset:
+            assert f.GetFID() == 8
         assert lyr.GetNextFeature() is None
 
     ds = None
 
     with gdaltest.config_option("OGR_PARQUET_USE_BBOX", "NO"):
         ds = ogr.Open(
-            "data/parquet/bbox_similar_to_overturemaps_2024-04-16-beta.0.parquet"
+            prefix
+            + "data/parquet/bbox_similar_to_overturemaps_2024-04-16-beta.0.parquet"
         )
         lyr = ds.GetLayer(0)
         assert lyr.GetGeometryColumn() == "geometry"
@@ -3859,6 +3854,8 @@ def check(lyr):
     lyr = ds.GetLayer(0)
     lyr.SetIgnoredFields(["foo"])
     check(lyr)
+    lyr.SetSpatialFilter(geom)
+    assert lyr.GetFeatureCount() == (3 if geom.GetGeometryCount() > 1 else 2)
 
     ds = ogr.Open(filename_to_open)
     lyr = ds.GetLayer(0)
@@ -4044,6 +4041,30 @@ def test_ogr_parquet_read_arrow_json_extension():
     assert f["extension_json"] == '{"foo":"bar"}'
 
 
+###############################################################################
+# Test writing a file with the arrow.json extension
+
+
+def test_ogr_parquet_writing_arrow_json_extension(tmp_vsimem):
+
+    outfilename = str(tmp_vsimem / "out.parquet")
+    with ogr.GetDriverByName("Parquet").CreateDataSource(outfilename) as ds:
+        lyr = ds.CreateLayer("test")
+        fld_defn = ogr.FieldDefn("extension_json")
+        fld_defn.SetSubType(ogr.OFSTJSON)
+        lyr.CreateField(fld_defn)
+        f = ogr.Feature(lyr.GetLayerDefn())
+        f["extension_json"] = '{"foo":"bar"}'
+        lyr.CreateFeature(f)
+
+    with gdal.config_option("OGR_PARQUET_READ_GDAL_SCHEMA", "NO"):
+        ds = ogr.Open(outfilename)
+    lyr = ds.GetLayer(0)
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetSubType() == ogr.OFSTJSON
+    f = lyr.GetNextFeature()
+    assert f["extension_json"] == '{"foo":"bar"}'
+
+
 ###############################################################################
 # Test ignored fields with arrow::dataset and bounding box column
 
@@ -4073,3 +4094,59 @@ def test_ogr_parquet_ignored_fields_bounding_box_column_arrow_dataset(tmp_path):
     lyr.SetSpatialFilterRect(0, 0, 0, 0)
     lyr.ResetReading()
     assert lyr.GetNextFeature() is None
+
+
+###############################################################################
+
+
+@gdaltest.enable_exceptions()
+def test_ogr_parquet_vsi_arrow_file_system():
+
+    version = int(
+        ogr.GetDriverByName("ARROW").GetMetadataItem("ARROW_VERSION").split(".")[0]
+    )
+    if version < 16:
+        pytest.skip("requires Arrow >= 16.0.0")
+
+    ds = ogr.Open("PARQUET:gdalvsi://data/parquet/test.parquet")
+    lyr = ds.GetLayer(0)
+    assert lyr.GetFeatureCount() > 0
+
+
+###############################################################################
+
+
+@gdaltest.enable_exceptions()
+@pytest.mark.require_driver("ARROW")
+@pytest.mark.parametrize(
+    "src_filename,expected_error_msg",
+    [
+        ("data/arrow/stringview.feather", "StringView not supported"),
+        ("data/arrow/binaryview.feather", "BinaryView not supported"),
+    ],
+)
+def test_ogr_parquet_IsArrowSchemaSupported_arrow_15_types(
+    src_filename, expected_error_msg, tmp_vsimem
+):
+
+    version = int(
+        ogr.GetDriverByName("ARROW").GetMetadataItem("ARROW_VERSION").split(".")[0]
+    )
+    if version < 15:
+        pytest.skip("requires Arrow >= 15.0.0")
+
+    src_ds = ogr.Open(src_filename)
+    src_lyr = src_ds.GetLayer(0)
+
+    outfilename = str(tmp_vsimem / "test.parquet")
+    with ogr.GetDriverByName("Parquet").CreateDataSource(outfilename) as dst_ds:
+        dst_lyr = dst_ds.CreateLayer(
+            "test", srs=src_lyr.GetSpatialRef(), geom_type=ogr.wkbPoint, options=[]
+        )
+
+        stream = src_lyr.GetArrowStream()
+        schema = stream.GetSchema()
+
+        success, error_msg = dst_lyr.IsArrowSchemaSupported(schema)
+        assert not success
+        assert error_msg == expected_error_msg
diff --git a/autotest/ogr/ogr_pcidsk.py b/autotest/ogr/ogr_pcidsk.py
index c229db2fda52..2f225ca5d02d 100755
--- a/autotest/ogr/ogr_pcidsk.py
+++ b/autotest/ogr/ogr_pcidsk.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/ogr/ogr_pdf.py b/autotest/ogr/ogr_pdf.py
index 442ffcde50dc..1fa585a61a7c 100755
--- a/autotest/ogr/ogr_pdf.py
+++ b/autotest/ogr/ogr_pdf.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/ogr/ogr_pds.py b/autotest/ogr/ogr_pds.py
index 8bfe278f00a7..341886c301b9 100755
--- a/autotest/ogr/ogr_pds.py
+++ b/autotest/ogr/ogr_pds.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/ogr/ogr_pds4.py b/autotest/ogr/ogr_pds4.py
index d05d0e08c245..900ccf2db52c 100755
--- a/autotest/ogr/ogr_pds4.py
+++ b/autotest/ogr/ogr_pds4.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2019, Hobu Inc
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import contextlib
diff --git a/autotest/ogr/ogr_pg.py b/autotest/ogr/ogr_pg.py
index b3700c8ab97f..b517527222d2 100755
--- a/autotest/ogr/ogr_pg.py
+++ b/autotest/ogr/ogr_pg.py
@@ -247,17 +247,21 @@ def pg_version(pg_autotest_ds):
         feat = sql_lyr.GetNextFeature()
         v = feat.GetFieldAsString("version")
 
-    pos = v.find(" ")  # "PostgreSQL 12.0beta1" or "PostgreSQL 12.2 ...."
+    # return of version() is something like "PostgreSQL 12.0[rcX|betaX] ...otherstuff..."
+
+    tokens = v.split(" ")
+    assert len(tokens) >= 2
+    # First token is "PostgreSQL" (or some enterprise DB alternative name)
+    v = tokens[1]
+    pos = v.find("beta")
     if pos > 0:
-        v = v[pos + 1 :]
-        pos = v.find("beta")
-        if pos > 0:
-            v = v[0:pos]
-        pos = v.find(" ")
+        v = v[0:pos]
+    else:
+        pos = v.find("rc")
         if pos > 0:
             v = v[0:pos]
 
-        return tuple([int(x) for x in v.split(".")])
+    return tuple([int(x) for x in v.split(".")])
 
 
 @pytest.fixture(scope="module")
@@ -681,9 +685,6 @@ def test_ogr_pg_4(pg_ds):
 
         ogrtest.check_feature_geometry(feat_read, geom)
 
-        feat_read.Destroy()
-
-    dst_feat.Destroy()
     pg_lyr.ResetReading()  # to close implicit transaction
 
 
@@ -915,7 +916,6 @@ def test_ogr_pg_10(pg_ds):
     pg_lyr.SetAttributeFilter(None)
 
     fid = feat.GetFID()
-    feat.Destroy()
 
     assert pg_lyr.DeleteFeature(fid) == 0, "DeleteFeature() method failed."
 
@@ -1173,7 +1173,6 @@ def test_ogr_pg_20(pg_ds):
         geom = feat.GetGeometryRef()
         assert geom is not None, "did not get geometry, expected %s" % geoms[1]
         wkt = geom.ExportToIsoWkt()
-        feat.Destroy()
         feat = None
 
         assert wkt == geoms[1], "WKT do not match: expected %s, got %s" % (
@@ -1195,23 +1194,17 @@ def test_ogr_pg_21(pg_ds):
     layer = pg_ds.ExecuteSQL("SELECT wkb_geometry FROM testgeom")
     assert layer is not None, "did not get testgeom layer"
 
-    feat = layer.GetNextFeature()
-    while feat is not None:
+    for feat in layer:
         geom = feat.GetGeometryRef()
         if (
             ogr.GT_HasZ(geom.GetGeometryType()) == 0
             or ogr.GT_HasM(geom.GetGeometryType()) == 0
         ):
-            feat.Destroy()
             feat = None
             pg_ds.ReleaseResultSet(layer)
             layer = None
             pytest.fail("expected feature with type >3000")
 
-        feat.Destroy()
-        feat = layer.GetNextFeature()
-
-    feat = None
     pg_ds.ReleaseResultSet(layer)
     layer = None
 
@@ -1259,7 +1252,6 @@ def test_ogr_pg_21_subgeoms(pg_ds):
                 ), "did not get the expected subgeometry, expected %s" % (
                     subgeom_TIN[j]
                 )
-        feat.Destroy()
         feat = None
 
 
@@ -1772,7 +1764,6 @@ def test_ogr_pg_33(pg_ds):
     # eacute in UTF8 : 0xc3 0xa9
     dst_feat.SetField("SHORTNAME", "\xc3\xa9")
     pg_lyr.CreateFeature(dst_feat)
-    dst_feat.Destroy()
 
 
 ###############################################################################
@@ -2412,7 +2403,6 @@ def test_ogr_pg_47(pg_ds, pg_postgis_version, pg_postgis_schema):
     )
     field_defn = ogr.FieldDefn("test_string", ogr.OFTString)
     lyr.CreateField(field_defn)
-    field_defn.Destroy()
 
     feature_defn = lyr.GetLayerDefn()
 
@@ -4855,9 +4845,17 @@ def test_ogr_pg_84(pg_ds):
 
 
 @only_without_postgis
-def test_ogr_pg_metadata(pg_ds):
+@pytest.mark.parametrize("run_number", [1, 2])
+def test_ogr_pg_metadata(pg_ds, run_number):
 
     pg_ds = reconnect(pg_ds, update=1)
+
+    if run_number == 1:
+        pg_ds.ExecuteSQL(
+            "DROP EVENT TRIGGER IF EXISTS ogr_system_tables_event_trigger_for_metadata"
+        )
+        pg_ds.ExecuteSQL("DROP SCHEMA ogr_system_tables CASCADE")
+
     pg_ds.StartTransaction()
     lyr = pg_ds.CreateLayer(
         "test_ogr_pg_metadata", geom_type=ogr.wkbPoint, options=["OVERWRITE=YES"]
@@ -4867,6 +4865,12 @@ def test_ogr_pg_metadata(pg_ds):
     lyr.SetMetadataItem("DESCRIPTION", "my_desc")
     pg_ds.CommitTransaction()
 
+    pg_ds = reconnect(pg_ds, update=1)
+
+    with gdal.config_option("OGR_PG_ENABLE_METADATA", "NO"):
+        lyr = pg_ds.GetLayerByName("test_ogr_pg_metadata")
+        assert lyr.GetMetadata_Dict() == {"DESCRIPTION": "my_desc"}
+
     pg_ds = reconnect(pg_ds, update=1)
     with pg_ds.ExecuteSQL(
         "SELECT * FROM ogr_system_tables.metadata WHERE table_name = 'test_ogr_pg_metadata'"
@@ -4889,6 +4893,96 @@ def test_ogr_pg_metadata(pg_ds):
     assert lyr.GetMetadata_Dict() == {}
 
 
+###############################################################################
+# Test reading/writing metadata with a user with limited rights
+
+
+@only_without_postgis
+def test_ogr_pg_metadata_restricted_user(pg_ds):
+
+    lyr = pg_ds.CreateLayer(
+        "test_ogr_pg_metadata_restricted_user",
+        geom_type=ogr.wkbPoint,
+        options=["OVERWRITE=YES"],
+    )
+    lyr.SetMetadata({"foo": "bar"})
+
+    pg_ds = reconnect(pg_ds, update=1)
+
+    try:
+        pg_ds.ExecuteSQL("CREATE ROLE test_ogr_pg_metadata_restricted_user")
+        with pg_ds.ExecuteSQL("SELECT current_schema()") as lyr:
+            f = lyr.GetNextFeature()
+            current_schema = f.GetField(0)
+        pg_ds.ExecuteSQL(
+            f"GRANT ALL PRIVILEGES ON SCHEMA {current_schema} TO test_ogr_pg_metadata_restricted_user"
+        )
+        pg_ds.ExecuteSQL("SET ROLE test_ogr_pg_metadata_restricted_user")
+
+        lyr = pg_ds.GetLayerByName("test_ogr_pg_metadata_restricted_user")
+        gdal.ErrorReset()
+        with gdal.quiet_errors():
+            assert lyr.GetMetadata() == {}
+        assert (
+            gdal.GetLastErrorMsg()
+            == "Table ogr_system_tables.metadata exists but user lacks USAGE privilege on ogr_system_tables schema"
+        )
+
+        pg_ds = reconnect(pg_ds, update=1)
+        pg_ds.ExecuteSQL("DROP SCHEMA ogr_system_tables CASCADE")
+        pg_ds.ExecuteSQL("SET ROLE test_ogr_pg_metadata_restricted_user")
+
+        lyr = pg_ds.CreateLayer(
+            "test_ogr_pg_metadata_restricted_user_bis",
+            geom_type=ogr.wkbPoint,
+            options=["OVERWRITE=YES"],
+        )
+        with gdal.quiet_errors():
+            lyr.SetMetadata({"foo": "bar"})
+
+            gdal.ErrorReset()
+            pg_ds = reconnect(pg_ds, update=1)
+        assert (
+            gdal.GetLastErrorMsg()
+            == "User lacks super user privilege to be able to create event trigger ogr_system_tables_event_trigger_for_metadata"
+        )
+
+    finally:
+        pg_ds = reconnect(pg_ds, update=1)
+        pg_ds.ExecuteSQL("DELLAYER:test_ogr_pg_metadata_restricted_user")
+        pg_ds.ExecuteSQL("DELLAYER:test_ogr_pg_metadata_restricted_user_bis")
+        with pg_ds.ExecuteSQL("SELECT CURRENT_USER") as lyr:
+            f = lyr.GetNextFeature()
+            current_user = f.GetField(0)
+        pg_ds.ExecuteSQL(
+            f"REASSIGN OWNED BY test_ogr_pg_metadata_restricted_user TO {current_user}"
+        )
+        pg_ds.ExecuteSQL("DROP OWNED BY test_ogr_pg_metadata_restricted_user")
+        pg_ds.ExecuteSQL("DROP ROLE test_ogr_pg_metadata_restricted_user")
+
+
+###############################################################################
+# Test disabling writing metadata
+
+
+@only_without_postgis
+def test_ogr_pg_write_metadata_disabled(pg_ds):
+
+    with gdal.config_option("OGR_PG_ENABLE_METADATA", "NO"):
+
+        pg_ds = reconnect(pg_ds, update=1)
+        lyr = pg_ds.CreateLayer(
+            "test_ogr_pg_metadata", geom_type=ogr.wkbPoint, options=["OVERWRITE=YES"]
+        )
+        lyr.SetMetadata({"foo": "bar"})
+        lyr.SetMetadataItem("bar", "baz")
+
+        pg_ds = reconnect(pg_ds, update=1)
+
+    lyr = pg_ds.GetLayerByName("test_ogr_pg_metadata")
+    assert lyr.GetMetadata_Dict() == {}
+
+
 ###############################################################################
 # Test append of several layers in PG_USE_COPY mode (#6411)
 
@@ -5807,7 +5901,8 @@ def test_ogr_pg_field_comment(pg_ds):
 def test_ogr_pg_long_identifiers(pg_ds):
 
     long_name = "test_" + ("X" * 64) + "_long_name"
-    short_name = "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+    short_name = "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_3ba7c630"
+    assert len(short_name) == 63
     with gdal.quiet_errors():
         lyr = pg_ds.CreateLayer(long_name)
     assert lyr.GetName() == short_name
@@ -5815,12 +5910,55 @@ def test_ogr_pg_long_identifiers(pg_ds):
     assert lyr.CreateFeature(f) == ogr.OGRERR_NONE
     assert lyr.SyncToDisk() == ogr.OGRERR_NONE
 
+    long_name2 = "test_" + ("X" * 64) + "_long_name2"
+    short_name2 = "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_bb4afe1c"
+    assert len(short_name2) == 63
+    with gdal.quiet_errors():
+        lyr = pg_ds.CreateLayer(long_name2)
+    assert lyr.GetName() == short_name2
+    f = ogr.Feature(lyr.GetLayerDefn())
+    assert lyr.CreateFeature(f) == ogr.OGRERR_NONE
+    assert lyr.SyncToDisk() == ogr.OGRERR_NONE
+
+    long_name3 = "test_" + ("X" * (64 - len("test_")))
+    assert len(long_name3) == 64
+    short_name3 = "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_b7ebb17c"
+    assert len(short_name3) == 63
+    with gdal.quiet_errors():
+        lyr = pg_ds.CreateLayer(long_name3)
+    assert lyr.GetName() == short_name3
+    f = ogr.Feature(lyr.GetLayerDefn())
+    assert lyr.CreateFeature(f) == ogr.OGRERR_NONE
+    assert lyr.SyncToDisk() == ogr.OGRERR_NONE
+
+    long_name4 = "test_" + ("X" * (63 - len("test_")))
+    assert len(long_name4) == 63
+    short_name4 = "test_" + ("x" * (63 - len("test_")))
+    with gdal.quiet_errors():
+        lyr = pg_ds.CreateLayer(long_name4)
+    assert lyr.GetName() == short_name4
+    f = ogr.Feature(lyr.GetLayerDefn())
+    assert lyr.CreateFeature(f) == ogr.OGRERR_NONE
+    assert lyr.SyncToDisk() == ogr.OGRERR_NONE
+
     pg_ds = reconnect(pg_ds, update=1)
 
-    got_lyr = pg_ds.GetLayerByName(long_name)
+    got_lyr = pg_ds.GetLayerByName(short_name)
     assert got_lyr
     assert got_lyr.GetName() == short_name
 
+    got_lyr = pg_ds.GetLayerByName(short_name2)
+    assert got_lyr
+    assert got_lyr.GetName() == short_name2
+
+    got_lyr = pg_ds.GetLayerByName(short_name3)
+    assert got_lyr
+    assert got_lyr.GetName() == short_name3
+
+    got_lyr = pg_ds.GetLayerByName(short_name4)
+    assert got_lyr
+    assert got_lyr.GetName() == short_name4
+
 
 ###############################################################################
 # Test extent 3D
@@ -5973,3 +6111,123 @@ def test_ogr_pg_no_postgis_GEOMETRY_NAME(pg_ds):
             gdal.GetLastErrorMsg()
             == "GEOMETRY_NAME=foo ignored, and set instead to 'wkb_geometry' as it is the only geometry column name recognized for non-PostGIS enabled databases."
         )
+
+
+###############################################################################
+# Test ignored conflicts
+
+
+@only_without_postgis
+def test_ogr_pg_skip_conflicts(pg_ds):
+    pg_ds.ExecuteSQL(
+        "CREATE TABLE test_ogr_skip_conflicts(id SERIAL PRIMARY KEY, gml_id character(16), beginnt character(20), UNIQUE(gml_id, beginnt))"
+    )
+
+    with gdal.config_option("OGR_PG_SKIP_CONFLICTS", "YES"):
+        # OGR_PG_SKIP_CONFLICTS and OGR_PG_RETRIEVE_FID cannot be used at the same time
+        with gdal.config_option("OGR_PG_RETRIEVE_FID", "YES"):
+            pg_ds = reconnect(pg_ds, update=1)
+            lyr = pg_ds.GetLayerByName("test_ogr_skip_conflicts")
+            feat = ogr.Feature(lyr.GetLayerDefn())
+            feat["gml_id"] = "DERPLP0300000cG3"
+            feat["beginnt"] = "2020-07-10T04:48:14Z"
+            with gdal.quiet_errors():
+                assert lyr.CreateFeature(feat) != ogr.OGRERR_NONE
+
+    with gdal.config_option("OGR_PG_RETRIEVE_FID", "NO"):
+        pg_ds = reconnect(pg_ds, update=1)
+        lyr = pg_ds.GetLayerByName("test_ogr_skip_conflicts")
+
+        assert lyr.GetFeatureCount() == 0
+
+        feat = ogr.Feature(lyr.GetLayerDefn())
+        feat["gml_id"] = "DERPLP0300000cG3"
+        feat["beginnt"] = "2020-07-10T04:48:14Z"
+        assert lyr.CreateFeature(feat) == ogr.OGRERR_NONE
+        assert lyr.GetFeatureCount() == 1
+
+        # Insert w/o OGR_PG_SKIP_CONFLICTS=YES succeeds, but doesn't add a feature
+        with gdal.config_option("OGR_PG_SKIP_CONFLICTS", "YES"):
+            pg_ds = reconnect(pg_ds, update=1)
+            lyr = pg_ds.GetLayerByName("test_ogr_skip_conflicts")
+
+            assert lyr.GetFeatureCount() == 1
+
+            feat = ogr.Feature(lyr.GetLayerDefn())
+            feat["gml_id"] = "DERPLP0300000cG3"
+            feat["beginnt"] = "2020-07-10T04:48:14Z"
+            assert lyr.CreateFeature(feat) == ogr.OGRERR_NONE
+            assert lyr.GetFeatureCount() == 1
+
+        # Other feature succeeds and increments the feature count
+        feat = ogr.Feature(lyr.GetLayerDefn())
+        feat["gml_id"] = "DERPLP0300000cG4"
+        feat["beginnt"] = "2020-07-10T04:48:14Z"
+        assert lyr.CreateFeature(feat) == ogr.OGRERR_NONE
+        assert lyr.GetFeatureCount() == 2
+
+
+###############################################################################
+# Test scenario of https://github.com/OSGeo/gdal/issues/10311
+
+
+@only_without_postgis
+@gdaltest.enable_exceptions()
+def test_ogr_pg_ogr2ogr_with_multiple_dotted_table_name(pg_ds):
+
+    tmp_schema = "tmp_schema_issue_10311"
+    pg_ds.ExecuteSQL(f'CREATE SCHEMA "{tmp_schema}"')
+    try:
+        src_ds = gdal.GetDriverByName("Memory").Create("", 0, 0, 0, gdal.GDT_Unknown)
+        lyr = src_ds.CreateLayer(tmp_schema + ".table1", geom_type=ogr.wkbNone)
+        lyr.CreateField(ogr.FieldDefn("str"))
+        f = ogr.Feature(lyr.GetLayerDefn())
+        f["str"] = "foo"
+        lyr.CreateFeature(f)
+        lyr = src_ds.CreateLayer(tmp_schema + ".table2", geom_type=ogr.wkbNone)
+        lyr.CreateField(ogr.FieldDefn("str"))
+        f = ogr.Feature(lyr.GetLayerDefn())
+        f["str"] = "bar"
+        lyr.CreateFeature(f)
+
+        gdal.VectorTranslate(pg_ds.GetDescription(), src_ds)
+
+        pg_ds = reconnect(pg_ds)
+        lyr = pg_ds.GetLayerByName(tmp_schema + ".table1")
+        assert lyr.GetFeatureCount() == 1
+        lyr = pg_ds.GetLayerByName(tmp_schema + ".table2")
+        assert lyr.GetFeatureCount() == 1
+
+    finally:
+        pg_ds.ExecuteSQL(f'DROP SCHEMA "{tmp_schema}" CASCADE')
+
+
+###############################################################################
+# Test scenario of https://lists.osgeo.org/pipermail/gdal-dev/2024-October/059608.html
+
+
+@only_without_postgis
+@gdaltest.enable_exceptions()
+def test_ogr_pg_empty_search_path(pg_ds):
+
+    with pg_ds.ExecuteSQL("SHOW search_path") as sql_lyr:
+        f = sql_lyr.GetNextFeature()
+        old_search_path = f.GetField(0)
+        old_search_path = old_search_path.replace(
+            "test_ogr_pg_empty_search_path_no_postgis, ", ""
+        )
+
+    with pg_ds.ExecuteSQL("SELECT CURRENT_USER") as lyr:
+        f = lyr.GetNextFeature()
+        current_user = f.GetField(0)
+    pg_ds.ExecuteSQL(f"ALTER ROLE {current_user} SET search_path = ''")
+    try:
+        ds = reconnect(pg_ds, update=1)
+
+        with ds.ExecuteSQL("SHOW search_path") as sql_lyr:
+            f = sql_lyr.GetNextFeature()
+            new_search_path = f.GetField(0)
+            assert new_search_path == "test_ogr_pg_empty_search_path_no_postgis, public"
+
+    finally:
+        ds.ExecuteSQL(f"ALTER ROLE {current_user} SET search_path = {old_search_path}")
diff --git a/autotest/ogr/ogr_pgdump.py b/autotest/ogr/ogr_pgdump.py
index 29de4208452a..1472b05f5aa3 100755
--- a/autotest/ogr/ogr_pgdump.py
+++ b/autotest/ogr/ogr_pgdump.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
@@ -1484,17 +1468,72 @@ def check_and_remove(needle):
 # Test long identifiers
 
 
-def test_ogr_pgdump_long_identifiers(tmp_vsimem):
+@pytest.mark.parametrize(
+    "launder,long_name,geometry_name,short_name,pk_name,idx_name",
+    [
+        (
+            True,
+            "test_" + ("X" * (63 - len("test_"))),
+            "wkb_geometry",
+            "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
+            "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_pk",
+            "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_a5a5c85f_0_geom_idx",
+        ),
+        (
+            True,
+            "test_" + ("X" * (63 - len("test_") - len("wkb_geometry") - 2)),
+            "wkb_geometry",
+            "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
+            "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_pk",
+            "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_0_geom_idx",
+        ),
+        (
+            True,
+            "test_" + ("X" * 64) + "_long_name",
+            "wkb_geometry",
+            "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_3ba7c630",
+            "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_3ba7c_pk",
+            "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_05e1f255_0_geom_idx",
+        ),
+        (
+            True,
+            "test_" + ("X" * 64) + "_long_name2",
+            "wkb_geometry",
+            "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_bb4afe1c",
+            "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_bb4af_pk",
+            "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_950ad059_0_geom_idx",
+        ),
+        (
+            False,
+            "test_" + ("X" * 64) + "_long_name2",
+            "wkb_geometry",
+            "test_XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX_bb4afe1c",
+            "test_XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX_bb4af_pk",
+            "test_XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX_2c8a17fc_0_geom_idx",
+        ),
+    ],
+)
+def test_ogr_pgdump_long_identifiers(
+    tmp_vsimem, launder, long_name, geometry_name, short_name, pk_name, idx_name
+):
 
     ds = ogr.GetDriverByName("PGDump").CreateDataSource(
         tmp_vsimem / "test_ogr_pgdump_long_identifiers.sql", options=["LINEFORMAT=LF"]
     )
 
-    long_name = "test_" + ("X" * 64) + "_long_name"
-    short_name = "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+    assert len(short_name) <= 63
+    assert len(idx_name) <= 63
+    assert len(pk_name) <= 63
 
     with gdal.quiet_errors():
-        lyr = ds.CreateLayer(long_name, geom_type=ogr.wkbPoint)
+        lyr = ds.CreateLayer(
+            long_name,
+            geom_type=ogr.wkbPoint,
+            options=[
+                "LAUNDER=" + ("YES" if launder else "NO"),
+                "GEOMETRY_NAME=" + geometry_name,
+            ],
+        )
     lyr.CreateField(ogr.FieldDefn("str", ogr.OFTString))
     f = ogr.Feature(lyr.GetLayerDefn())
     f["str"] = "foo"
@@ -1515,10 +1554,10 @@ def check_and_remove(needle):
 
     check_and_remove(f"""CREATE TABLE "public"."{short_name}"();""")
     check_and_remove(
-        f"""ALTER TABLE "public"."{short_name}" ADD COLUMN "ogc_fid" SERIAL CONSTRAINT "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_pk" PRIMARY KEY;"""
+        f"""ALTER TABLE "public"."{short_name}" ADD COLUMN "ogc_fid" SERIAL CONSTRAINT "{pk_name}" PRIMARY KEY;"""
     )
     check_and_remove(
-        f"""CREATE INDEX "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_wkb_geometry_geom_idx" ON "public"."{short_name}" USING GIST ("wkb_geometry");"""
+        f"""CREATE INDEX "{idx_name}" ON "public"."{short_name}" USING GIST ("wkb_geometry");"""
     )
 
 
diff --git a/autotest/ogr/ogr_pgeo.py b/autotest/ogr/ogr_pgeo.py
index 66f4a3f39aed..a1dfcfa7af60 100755
--- a/autotest/ogr/ogr_pgeo.py
+++ b/autotest/ogr/ogr_pgeo.py
@@ -10,26 +10,11 @@
 ###############################################################################
 # Copyright (c) 2010-2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
+import shutil
 import sys
 
 import gdaltest
@@ -977,3 +962,14 @@ def test_ogr_openfilegdb_read_relationships():
     assert rel.GetForwardPathLabel() == "attachment"
     assert rel.GetBackwardPathLabel() == "object"
     assert rel.GetRelatedTableType() == "media"
+
+
+def test_ogr_pgeo_non_ascii(tmp_path):
+
+    non_ascii_filename = str(tmp_path / "éé.mdb")
+    shutil.copy("data/pgeo/sample.mdb", non_ascii_filename)
+
+    pgeo_ds = ogr.Open(non_ascii_filename)
+    assert pgeo_ds is not None
+
+    assert pgeo_ds.GetLayerCount() == 4
diff --git a/autotest/ogr/ogr_plscenes.py b/autotest/ogr/ogr_plscenes.py
index 3b386021d50d..aae005636025 100755
--- a/autotest/ogr/ogr_plscenes.py
+++ b/autotest/ogr/ogr_plscenes.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2015, Planet Labs
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/ogr/ogr_pmtiles.py b/autotest/ogr/ogr_pmtiles.py
index 81361f82def5..242a85124d9d 100755
--- a/autotest/ogr/ogr_pmtiles.py
+++ b/autotest/ogr/ogr_pmtiles.py
@@ -9,26 +9,11 @@
 ###############################################################################
 # Copyright (c) 2023, Planet Labs
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import json
+import os
 
 import gdaltest
 import ogrtest
@@ -603,7 +588,12 @@ def test_ogr_pmtiles_read_corrupted_min_zoom_larger_than_max_zoom():
 
 ###############################################################################
 
-
+# Test started to fail on Travis s390x starting with https://github.com/OSGeo/gdal/pull/10274
+# which is totally unrelated...
+@pytest.mark.skipif(
+    os.environ.get("BUILD_NAME", "") == "s390x",
+    reason="Fails randomly on that platform",
+)
 def test_ogr_pmtiles_read_corrupted_min_zoom_larger_than_30():
 
     tmpfilename = "/vsimem/tmp.pmtiles"
diff --git a/autotest/ogr/ogr_pythondrivers.py b/autotest/ogr/ogr_pythondrivers.py
index 3b2e4fee8fd8..8d173c2f3271 100644
--- a/autotest/ogr/ogr_pythondrivers.py
+++ b/autotest/ogr/ogr_pythondrivers.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2019, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/ogr/ogr_refcount.py b/autotest/ogr/ogr_refcount.py
index fac4027994cf..d76c0304ee4b 100755
--- a/autotest/ogr/ogr_refcount.py
+++ b/autotest/ogr/ogr_refcount.py
@@ -83,15 +83,17 @@ def test_ogr_refcount_2():
 # Verify that releasing the datasources has the expected behaviour.
 
 
+@pytest.mark.filterwarnings("ignore::DeprecationWarning")
 def test_ogr_refcount_3():
 
     ds_1 = ogr.OpenShared("data/idlink.dbf")
-    ds_3 = ogr.OpenShared("data/idlink.dbf")
-
     assert ds_1 is not None
-    assert ds_3 is not None
 
-    ds_3.Release()
+    ds_2 = ogr.OpenShared("data/idlink.dbf")
+    assert ds_2 is not None
+    assert ds_1.GetRefCount() == 2
+    assert ds_2.GetRefCount() == 2
+    ds_2.Release()
 
     assert ds_1.GetRefCount() == 1
 
diff --git a/autotest/ogr/ogr_rfc30.py b/autotest/ogr/ogr_rfc30.py
index df5698e95f54..7efb6f955cb2 100755
--- a/autotest/ogr/ogr_rfc30.py
+++ b/autotest/ogr/ogr_rfc30.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 from osgeo import ogr
diff --git a/autotest/ogr/ogr_rfc35.py b/autotest/ogr/ogr_rfc35.py
index 65b00dd71f25..2688e1199088 100755
--- a/autotest/ogr/ogr_rfc35.py
+++ b/autotest/ogr/ogr_rfc35.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2011-2014, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/ogr/ogr_rfc41.py b/autotest/ogr/ogr_rfc41.py
index 9befbaa54667..9e8cccbd9c19 100755
--- a/autotest/ogr/ogr_rfc41.py
+++ b/autotest/ogr/ogr_rfc41.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/ogr/ogr_s57.py b/autotest/ogr/ogr_s57.py
index 5fc19302ad3a..40f461a3800e 100755
--- a/autotest/ogr/ogr_s57.py
+++ b/autotest/ogr/ogr_s57.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/ogr/ogr_sdts.py b/autotest/ogr/ogr_sdts.py
index cd1f4323a95d..97a18a0c6bf2 100755
--- a/autotest/ogr/ogr_sdts.py
+++ b/autotest/ogr/ogr_sdts.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2008-2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/ogr/ogr_selafin.py b/autotest/ogr/ogr_selafin.py
index a56e27241594..15123f3551f7 100755
--- a/autotest/ogr/ogr_selafin.py
+++ b/autotest/ogr/ogr_selafin.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2014, François Hissel <francois.hissel@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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import math
diff --git a/autotest/ogr/ogr_shape.py b/autotest/ogr/ogr_shape.py
index c202054a2953..889d0c688abd 100755
--- a/autotest/ogr/ogr_shape.py
+++ b/autotest/ogr/ogr_shape.py
@@ -6121,3 +6121,16 @@ def test_ogr_shape_logical_field(tmp_vsimem):
     assert f["int_field"] == -1234
     f = lyr.GetNextFeature()
     assert f["bool_field"] is None
+
+
+###############################################################################
+# Test reading a null Date filled with nul characters
+
+
+@gdaltest.enable_exceptions()
+def test_ogr_shape_read_date_empty_string():
+
+    ds = ogr.Open("data/shp/date_empty_string.dbf")
+    lyr = ds.GetLayer(0)
+    f = lyr.GetNextFeature()
+    assert f["date"] is None
diff --git a/autotest/ogr/ogr_shape_qix.py b/autotest/ogr/ogr_shape_qix.py
index 7de68d941b03..6ed720fec125 100755
--- a/autotest/ogr/ogr_shape_qix.py
+++ b/autotest/ogr/ogr_shape_qix.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import random
diff --git a/autotest/ogr/ogr_shape_sbn.py b/autotest/ogr/ogr_shape_sbn.py
index f528308b6e6e..152af2f39818 100755
--- a/autotest/ogr/ogr_shape_sbn.py
+++ b/autotest/ogr/ogr_shape_sbn.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/ogr/ogr_sosi.py b/autotest/ogr/ogr_sosi.py
index 3975da730b04..572059c1b753 100755
--- a/autotest/ogr/ogr_sosi.py
+++ b/autotest/ogr/ogr_sosi.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import shutil
diff --git a/autotest/ogr/ogr_sql_rfc28.py b/autotest/ogr/ogr_sql_rfc28.py
index d5aa09bdac81..4405220bfb17 100755
--- a/autotest/ogr/ogr_sql_rfc28.py
+++ b/autotest/ogr/ogr_sql_rfc28.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2010, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2010-2014, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
@@ -741,12 +725,11 @@ def test_ogr_rfc28_union_all_three_branch_and(data_ds):
 # Test lack of end-of-string character
 
 
+@gdaltest.enable_exceptions()
 def test_ogr_rfc28_33(data_ds):
 
-    with gdal.quiet_errors():
-        lyr = data_ds.ExecuteSQL("select * from idlink where name='foo")
-
-    assert lyr is None
+    with pytest.raises(Exception, match="Did not find end-of-string character"):
+        data_ds.ExecuteSQL("select * from idlink'")
 
 
 ###############################################################################
@@ -881,7 +864,7 @@ def test_ogr_rfc28_39(data_ds):
 
 
 ###############################################################################
-# Test MIN(), MAX() and AVG() on a date (#5333)
+# Test MIN(), MAX(), AVG(), STDDEV_POP(), STDDEV_SAMP() on a date (#5333)
 
 
 def test_ogr_rfc28_40():
@@ -896,15 +879,16 @@ def test_ogr_rfc28_40():
     feat.SetField(0, "2013/01/01 00:00:00")
     lyr.CreateFeature(feat)
 
-    with ds.ExecuteSQL("SELECT MIN(DATE), MAX(DATE), AVG(DATE) from test") as lyr:
+    with ds.ExecuteSQL(
+        "SELECT MIN(DATE), MAX(DATE), AVG(DATE), STDDEV_POP(DATE), STDDEV_SAMP(DATE) from test"
+    ) as sql_lyr:
 
-        ogrtest.check_features_against_list(lyr, "MIN_DATE", ["2013/01/01 00:00:00"])
-        lyr.ResetReading()
-        ogrtest.check_features_against_list(lyr, "MAX_DATE", ["2013/12/31 23:59:59"])
-        lyr.ResetReading()
-        ogrtest.check_features_against_list(
-            lyr, "AVG_DATE", ["2013/07/02 11:59:59.500"]
-        )
+        f = sql_lyr.GetNextFeature()
+        assert f["MIN_DATE"] == "2013/01/01 00:00:00"
+        assert f["MAX_DATE"] == "2013/12/31 23:59:59"
+        assert f["AVG_DATE"] == "2013/07/02 11:59:59.500"
+        assert f["STDDEV_POP_DATE"] == pytest.approx(15767999.5, rel=1e-15)
+        assert f["STDDEV_SAMP_DATE"] == pytest.approx(22299318.744392183, rel=1e-15)
 
 
 ###############################################################################
diff --git a/autotest/ogr/ogr_sql_sqlite.py b/autotest/ogr/ogr_sql_sqlite.py
index 5c66950c9f07..b6b1bafb2ead 100755
--- a/autotest/ogr/ogr_sql_sqlite.py
+++ b/autotest/ogr/ogr_sql_sqlite.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2012-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import json
diff --git a/autotest/ogr/ogr_sql_test.py b/autotest/ogr/ogr_sql_test.py
index 0b101b8b7b4b..4dba5ef4d41f 100755
--- a/autotest/ogr/ogr_sql_test.py
+++ b/autotest/ogr/ogr_sql_test.py
@@ -27,6 +27,7 @@
 # Boston, MA 02111-1307, USA.
 ###############################################################################
 
+import math
 import os
 import shutil
 
@@ -254,12 +255,14 @@ def test_ogr_sql_4(data_ds):
 def test_ogr_sql_5(data_ds):
 
     with data_ds.ExecuteSQL(
-        "select max(eas_id), min(eas_id), avg(eas_id), sum(eas_id), count(eas_id) from idlink"
+        "select max(eas_id), min(eas_id), avg(eas_id), STDDEV_POP(eas_id), STDDEV_SAMP(eas_id), sum(eas_id), count(eas_id) from idlink"
     ) as sql_lyr:
         feat = sql_lyr.GetNextFeature()
         assert feat["max_eas_id"] == 179
         assert feat["min_eas_id"] == 158
         assert feat["avg_eas_id"] == pytest.approx(168.142857142857, abs=1e-12)
+        assert feat["STDDEV_POP_eas_id"] == pytest.approx(5.9384599116647205, rel=1e-15)
+        assert feat["STDDEV_SAMP_eas_id"] == pytest.approx(6.414269805898183, rel=1e-15)
         assert feat["count_eas_id"] == 7
         assert feat["sum_eas_id"] == 1177
 
@@ -416,6 +419,7 @@ def test_ogr_sql_13(data_ds):
 # Verify selection of, and on ogr_style and ogr_geom_wkt.
 
 
+@pytest.mark.require_driver("MapInfo File")
 def test_ogr_sql_14():
 
     expect = [
@@ -449,6 +453,7 @@ def test_ogr_sql_15(data_ds):
 ###############################################################################
 
 
+@pytest.mark.require_driver("MapInfo File")
 def test_ogr_sql_16():
 
     expect = [2]
@@ -462,6 +467,7 @@ def test_ogr_sql_16():
 ###############################################################################
 # Test the RFC 21 CAST operator.
 #
+@pytest.mark.require_driver("MapInfo File")
 def test_ogr_sql_17():
 
     expect = ["1", "2"]
@@ -714,6 +720,8 @@ def ds_for_invalid_statements():
         "SELECT 1 - FROM my_layer",
         "SELECT 1 * FROM my_layer",
         "SELECT 1 % FROM my_layer",
+        "SELECT x.",
+        "SELECT x AS",
         "SELECT *",
         "SELECT * FROM",
         "SELECT * FROM foo",
@@ -788,10 +796,15 @@ def ds_for_invalid_statements():
         "SELECT MAX(foo) FROM my_layer",
         "SELECT SUM(foo) FROM my_layer",
         "SELECT AVG(foo) FROM my_layer",
+        "SELECT STDDEV_POP(foo) FROM my_layer",
+        "SELECT STDDEV_SAMP(foo) FROM my_layer",
         "SELECT SUM(strfield) FROM my_layer",
         "SELECT AVG(strfield) FROM my_layer",
         "SELECT AVG(intfield, intfield) FROM my_layer",
+        "SELECT STDDEV_POP(strfield) FROM my_layer",
+        "SELECT STDDEV_SAMP(strfield) FROM my_layer",
         "SELECT * FROM my_layer WHERE AVG(intfield) = 1",
+        "SELECT * FROM my_layer WHERE STDDEV_POP(intfield) = 1",
         "SELECT * FROM 'foo' foo",
         "SELECT * FROM my_layer WHERE strfield =",
         "SELECT * FROM my_layer WHERE strfield = foo",
@@ -1100,10 +1113,11 @@ def test_ogr_sql_count_and_null():
             assert feat.GetFieldAsInteger(2) == 4, fieldname
 
     with ds.ExecuteSQL(
-        "select avg(intfield) from layer where intfield is null"
+        "select avg(intfield), STDDEV_POP(intfield) from layer where intfield is null"
     ) as sql_lyr:
         feat = sql_lyr.GetNextFeature()
         assert feat.IsFieldSetAndNotNull(0) == 0
+        assert feat.IsFieldSetAndNotNull(1) == 0
 
     # Fix crash when first values is null (#4509)
     with ds.ExecuteSQL("select distinct strfield_first_null from layer") as sql_lyr:
@@ -1195,11 +1209,11 @@ def test_ogr_sql_42(data_ds):
 
 def test_ogr_sql_43(data_ds):
 
-    sql = "SELECT '\"' as a, '\\'' as b, '''' as c FROM poly"
+    sql = "SELECT '\"' as a, '\\' as b, '''' as c FROM poly"
     with data_ds.ExecuteSQL(sql) as sql_lyr:
         feat = sql_lyr.GetNextFeature()
         assert feat["a"] == '"'
-        assert feat["b"] == "'"
+        assert feat["b"] == "\\"
         assert feat["c"] == "'"
 
 
@@ -1274,6 +1288,7 @@ def test_ogr_sql_hstore_get_value_valid(data_ds, sql, expected):
 # Test 64 bit GetFeatureCount()
 
 
+@pytest.mark.require_driver("OGR_VRT")
 def test_ogr_sql_45():
 
     ds = ogr.Open(
@@ -1999,3 +2014,135 @@ def test_ogr_sql_on_null(where, feature_count, dialect, ds_for_test_ogr_sql_on_n
             "select * from layer where " + where, dialect=dialect
         ) as sql_lyr:
             assert sql_lyr.GetFeatureCount() == feature_count
+
+
+def test_ogr_sql_ogr_style_hidden():
+
+    ds = ogr.GetDriverByName("Memory").CreateDataSource("test_ogr_sql_ogr_style_hidden")
+    lyr = ds.CreateLayer("layer")
+    lyr.CreateField(ogr.FieldDefn("intfield", ogr.OFTInteger))
+    lyr.CreateField(ogr.FieldDefn("strfield", ogr.OFTString))
+    feat = ogr.Feature(lyr.GetLayerDefn())
+    feat["intfield"] = 1
+    feat["strfield"] = "my_style"
+    feat.SetGeometry(ogr.CreateGeometryFromWkt("POINT (1 2)"))
+    lyr.CreateFeature(feat)
+    feat = ogr.Feature(lyr.GetLayerDefn())
+    lyr.CreateFeature(feat)
+
+    with ds.ExecuteSQL(
+        "SELECT 'BRUSH(fc:#01234567)' AS OGR_STYLE HIDDEN FROM layer"
+    ) as sql_lyr:
+        assert sql_lyr.GetLayerDefn().GetFieldCount() == 0
+        f = sql_lyr.GetNextFeature()
+        assert f.GetStyleString() == "BRUSH(fc:#01234567)"
+
+    with ds.ExecuteSQL("SELECT strfield OGR_STYLE HIDDEN FROM layer") as sql_lyr:
+        assert sql_lyr.GetLayerDefn().GetFieldCount() == 0
+        f = sql_lyr.GetNextFeature()
+        assert f.GetStyleString() == "my_style"
+        f = sql_lyr.GetNextFeature()
+        assert f.GetStyleString() is None
+
+    with ds.ExecuteSQL(
+        "SELECT CAST(strfield AS CHARACTER(255)) AS OGR_STYLE HIDDEN FROM layer"
+    ) as sql_lyr:
+        assert sql_lyr.GetLayerDefn().GetFieldCount() == 0
+        f = sql_lyr.GetNextFeature()
+        assert f.GetStyleString() == "my_style"
+        f = sql_lyr.GetNextFeature()
+        assert f.GetStyleString() is None
+
+    with ds.ExecuteSQL("SELECT strfield OGR_STYLE HIDDEN, * FROM layer") as sql_lyr:
+        assert sql_lyr.GetLayerDefn().GetFieldCount() == 2
+        f = sql_lyr.GetNextFeature()
+        assert f.GetStyleString() == "my_style"
+        assert f["intfield"] == 1
+        assert f["strfield"] == "my_style"
+        f = sql_lyr.GetNextFeature()
+        assert f.GetStyleString() is None
+        assert not f.IsFieldSet("intfield")
+        assert not f.IsFieldSet("strfield")
+
+    with pytest.raises(
+        Exception, match="HIDDEN keyword only supported on a column named OGR_STYLE"
+    ):
+        with ds.ExecuteSQL(
+            "SELECT 'foo' AS not_OGR_STYLE HIDDEN FROM layer"
+        ) as sql_lyr:
+            pass
+
+    with ds.ExecuteSQL("SELECT 123 AS OGR_STYLE HIDDEN FROM layer") as sql_lyr:
+        gdal.ErrorReset()
+        with gdal.quiet_errors():
+            f = sql_lyr.GetNextFeature()
+        assert f.GetStyleString() is None
+
+    with ds.ExecuteSQL("SELECT intfield AS OGR_STYLE HIDDEN FROM layer") as sql_lyr:
+        gdal.ErrorReset()
+        with gdal.quiet_errors():
+            f = sql_lyr.GetNextFeature()
+        assert f.GetStyleString() is None
+
+    with ds.ExecuteSQL(
+        'SELECT "_ogr_geometry_" AS OGR_STYLE HIDDEN FROM layer'
+    ) as sql_lyr:
+        gdal.ErrorReset()
+        with gdal.quiet_errors():
+            f = sql_lyr.GetNextFeature()
+        assert f.GetStyleString() is None
+
+
+def test_ogr_sql_identifier_hidden():
+
+    ds = ogr.GetDriverByName("Memory").CreateDataSource("test_ogr_sql_ogr_style_hidden")
+    lyr = ds.CreateLayer("hidden")
+    lyr.CreateField(ogr.FieldDefn("hidden", ogr.OFTString))
+    feat = ogr.Feature(lyr.GetLayerDefn())
+    feat["hidden"] = "val"
+    lyr.CreateFeature(feat)
+
+    with ds.ExecuteSQL("SELECT hidden FROM hidden") as sql_lyr:
+        f = sql_lyr.GetNextFeature()
+        assert f["hidden"] == "val"
+
+    with ds.ExecuteSQL("SELECT hidden hidden FROM hidden hidden") as sql_lyr:
+        f = sql_lyr.GetNextFeature()
+        assert f["hidden"] == "val"
+
+    with ds.ExecuteSQL("SELECT hidden AS hidden FROM hidden AS hidden") as sql_lyr:
+        f = sql_lyr.GetNextFeature()
+        assert f["hidden"] == "val"
+
+    with ds.ExecuteSQL("SELECT 'foo' AS hidden FROM hidden") as sql_lyr:
+        f = sql_lyr.GetNextFeature()
+        assert f["hidden"] == "foo"
+
+
+@pytest.mark.parametrize(
+    "input,expected_output",
+    [
+        [(1, 1e100, 1, -1e100), 2],
+        [(float("inf"), 1), float("inf")],
+        [(1, float("-inf")), float("-inf")],
+        [(1, float("nan")), float("nan")],
+        [(float("inf"), float("-inf")), float("nan")],
+    ],
+)
+def test_ogr_sql_kahan_babuska_eumaier_summation(input, expected_output):
+    """Test accurate SUM() implementation using Kahan-Babuska-Neumaier algorithm"""
+
+    ds = ogr.GetDriverByName("Memory").CreateDataSource("")
+    lyr = ds.CreateLayer("test")
+    lyr.CreateField(ogr.FieldDefn("v", ogr.OFTReal))
+    for v in input:
+        feat = ogr.Feature(lyr.GetLayerDefn())
+        feat["v"] = v
+        lyr.CreateFeature(feat)
+
+    with ds.ExecuteSQL("SELECT SUM(v) FROM test") as sql_lyr:
+        f = sql_lyr.GetNextFeature()
+        if math.isnan(expected_output):
+            assert math.isnan(f["SUM_v"])
+        else:
+            assert f["SUM_v"] == expected_output
diff --git a/autotest/ogr/ogr_sqlite.py b/autotest/ogr/ogr_sqlite.py
index eb21a81fd517..0d5d22526c2c 100755
--- a/autotest/ogr/ogr_sqlite.py
+++ b/autotest/ogr/ogr_sqlite.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -1457,7 +1441,7 @@ def test_ogr_spatialite_2(sqlite_test_db):
     dst_feat = ogr.Feature(feature_def=lyr.GetLayerDefn())
     dst_feat.SetGeometry(geom)
     lyr.CreateFeature(dst_feat)
-    dst_feat.Destroy()
+    dst_feat = None
 
     lyr.CommitTransaction()
 
@@ -1577,7 +1561,6 @@ def test_ogr_spatialite_2(sqlite_test_db):
 
     geom = ogr.CreateGeometryFromWkt("POLYGON((2 2,2 8,8 8,8 2,2 2))")
     lyr.SetSpatialFilter(geom)
-    geom.Destroy()
 
     assert lyr.TestCapability(ogr.OLCFastFeatureCount) is not True
     assert lyr.TestCapability(ogr.OLCFastSpatialFilter) is not True
@@ -1638,7 +1621,6 @@ def test_ogr_spatialite_4(sqlite_test_db):
         feat = lyr.GetNextFeature()
         geom = feat.GetGeometryRef()
         assert geom is not None and geom.ExportToWkt() == "POINT (0 1)"
-        feat.Destroy()
 
     # Check that triggers and index are restored (#3474)
     with sqlite_test_db.ExecuteSQL("SELECT * FROM sqlite_master") as lyr:
@@ -1656,7 +1638,6 @@ def test_ogr_spatialite_4(sqlite_test_db):
     feat = ogr.Feature(lyr.GetLayerDefn())
     feat.SetGeometryDirectly(ogr.CreateGeometryFromWkt("POINT(100 -100)"))
     lyr.CreateFeature(feat)
-    feat.Destroy()
 
     # Check that the trigger is functional (#3474).
     with sqlite_test_db.ExecuteSQL("SELECT * FROM idx_geomspatialite_GEOMETRY") as lyr:
@@ -3314,7 +3295,7 @@ def test_ogr_sqlite_unique(tmp_vsimem):
     # and indexes
     # Note: leave create table in a single line because of regex spaces testing
     sql = (
-        'CREATE TABLE IF NOT EXISTS "test2" ( "fid" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,\n"field_default" TEXT, "field_no_unique" TEXT DEFAULT \'UNIQUE\',"field_unique" TEXT UNIQUE,`field unique2` TEXT UNIQUE,field_unique3 TEXT UNIQUE, FIELD_UNIQUE_INDEX TEXT, `field unique index2`, "field_unique_index3" TEXT, NOT_UNIQUE TEXT);',
+        'CREATE TABLE IF NOT EXISTS "test2" ( "fid" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,\n"field_default" TEXT, "field_no_unique" TEXT DEFAULT \'UNIQUE\',"field_unique" TEXT UNIQUE,`field unique2` TEXT UNIQUE,field_unique3 TEXT UNIQUE, FIELD_UNIQUE_INDEX TEXT, `field unique index2`, "field_unique_index3" TEXT, NOT_UNIQUE TEXT,field4 TEXT,field5 TEXT,field6 TEXT,CONSTRAINT ignored_constraint CHECK (fid >= 0),CONSTRAINT field5_6_uniq UNIQUE (field5, field6), CONSTRAINT field4_uniq UNIQUE (field4));',
         "CREATE UNIQUE INDEX test2_unique_idx ON test2(field_unique_index);",  # field_unique_index in lowercase whereas in uppercase in CREATE TABLE statement
         "CREATE UNIQUE INDEX test2_unique_idx2 ON test2(`field unique index2`);",
         'CREATE UNIQUE INDEX test2_unique_idx3 ON test2("field_unique_index3");',
@@ -3365,6 +3346,14 @@ def test_ogr_sqlite_unique(tmp_vsimem):
     fldDef = layerDefinition.GetFieldDefn(8)
     assert not fldDef.IsUnique()
 
+    # Constraint given by CONSTRAINT field4_uniq UNIQUE (field4)
+    fldDef = layerDefinition.GetFieldDefn(layerDefinition.GetFieldIndex("field4"))
+    assert fldDef.IsUnique()
+
+    # Constraint given by CONSTRAINT field5_6_uniq UNIQUE (field5, field6) ==> ignored
+    fldDef = layerDefinition.GetFieldDefn(layerDefinition.GetFieldIndex("field5"))
+    assert not fldDef.IsUnique()
+
     ds = None
 
 
@@ -4087,3 +4076,190 @@ def test_ogr_sql_ST_Area_on_ellipsoid(tmp_vsimem, require_spatialite):
     with ds.ExecuteSQL("SELECT ST_Area(null, 1) FROM my_layer") as sql_lyr:
         f = sql_lyr.GetNextFeature()
         assert f[0] is None
+
+
+###############################################################################
+# Test ST_Length(geom, use_ellipsoid=True)
+
+
+def test_ogr_sql_ST_Length_on_ellipsoid(tmp_vsimem, require_spatialite):
+
+    tmpfilename = tmp_vsimem / "test_ogr_sql_ST_Length_on_ellipsoid.db"
+
+    ds = ogr.GetDriverByName("SQLite").CreateDataSource(
+        tmpfilename, options=["SPATIALITE=YES"]
+    )
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(4258)
+    lyr = ds.CreateLayer("my_layer", srs=srs)
+    geom_colname = lyr.GetGeometryColumn()
+    feat = ogr.Feature(lyr.GetLayerDefn())
+    feat.SetGeometryDirectly(
+        ogr.CreateGeometryFromWkt("LINESTRING(2 49,3 49,3 48,2 49)")
+    )
+    lyr.CreateFeature(feat)
+    feat = None
+
+    with ds.ExecuteSQL(f"SELECT ST_Length({geom_colname}, 1) FROM my_layer") as sql_lyr:
+        f = sql_lyr.GetNextFeature()
+        assert f[0] == pytest.approx(317885.7863996293)
+
+    with gdal.quiet_errors():
+        with ds.ExecuteSQL(
+            f"SELECT ST_Length({geom_colname}, 0) FROM my_layer"
+        ) as sql_lyr:
+            f = sql_lyr.GetNextFeature()
+            assert f[0] == pytest.approx(317885.7863996293)
+
+    with ds.ExecuteSQL("SELECT ST_Length(null, 1) FROM my_layer") as sql_lyr:
+        f = sql_lyr.GetNextFeature()
+        assert f[0] is None
+
+    with gdal.quiet_errors():
+        with ds.ExecuteSQL("SELECT ST_Length(X'FF', 1) FROM my_layer") as sql_lyr:
+            f = sql_lyr.GetNextFeature()
+            assert f[0] is None
+
+
+def test_ogr_sqlite_stddev():
+    """Test STDDEV_POP() and STDDEV_SAMP"""
+
+    ds = ogr.Open(":memory:", update=1)
+    ds.ExecuteSQL("CREATE TABLE test(v REAL)")
+    ds.ExecuteSQL("INSERT INTO test VALUES (4),(NULL),('invalid'),(5)")
+    with ds.ExecuteSQL("SELECT STDDEV_POP(v), STDDEV_SAMP(v) FROM test") as sql_lyr:
+        f = sql_lyr.GetNextFeature()
+        assert f.GetField(0) == pytest.approx(0.5, rel=1e-15)
+        assert f.GetField(1) == pytest.approx(0.5**0.5, rel=1e-15)
+
+
+@pytest.mark.parametrize(
+    "input_values,expected_res",
+    [
+        ([], None),
+        ([1], 1),
+        ([2.5, None, 1], 1.75),
+        ([3, 2.2, 1], 2.2),
+        ([1, "invalid"], None),
+    ],
+)
+def test_ogr_sqlite_median(input_values, expected_res):
+    """Test MEDIAN"""
+
+    ds = ogr.Open(":memory:", update=1)
+    ds.ExecuteSQL("CREATE TABLE test(v)")
+    for v in input_values:
+        ds.ExecuteSQL(
+            "INSERT INTO test VALUES (%s)"
+            % (
+                "NULL"
+                if v is None
+                else ("'" + v + "'")
+                if isinstance(v, str)
+                else str(v)
+            )
+        )
+    if expected_res is None and input_values:
+        with pytest.raises(Exception), gdaltest.error_handler():
+            with ds.ExecuteSQL("SELECT MEDIAN(v) FROM test"):
+                pass
+    else:
+        with ds.ExecuteSQL("SELECT MEDIAN(v) FROM test") as sql_lyr:
+            f = sql_lyr.GetNextFeature()
+            assert f.GetField(0) == pytest.approx(expected_res)
+        with ds.ExecuteSQL("SELECT PERCENTILE(v, 50) FROM test") as sql_lyr:
+            f = sql_lyr.GetNextFeature()
+            assert f.GetField(0) == pytest.approx(expected_res)
+        with ds.ExecuteSQL("SELECT PERCENTILE_CONT(v, 0.5) FROM test") as sql_lyr:
+            f = sql_lyr.GetNextFeature()
+            assert f.GetField(0) == pytest.approx(expected_res)
+
+
+def test_ogr_sqlite_percentile():
+    """Test PERCENTILE"""
+
+    ds = ogr.Open(":memory:", update=1)
+    ds.ExecuteSQL("CREATE TABLE test(v)")
+    ds.ExecuteSQL("INSERT INTO test VALUES (5),(6),(4),(7),(3),(8),(2),(9),(1),(10)")
+
+    with pytest.raises(Exception), gdaltest.error_handler():
+        with ds.ExecuteSQL("SELECT PERCENTILE(v, 'invalid') FROM test"):
+            pass
+    with pytest.raises(Exception), gdaltest.error_handler():
+        with ds.ExecuteSQL("SELECT PERCENTILE(v, -0.1) FROM test"):
+            pass
+    with pytest.raises(Exception), gdaltest.error_handler():
+        with ds.ExecuteSQL("SELECT PERCENTILE(v, 100.1) FROM test"):
+            pass
+    with pytest.raises(Exception), gdaltest.error_handler():
+        with ds.ExecuteSQL("SELECT PERCENTILE(v, v) FROM test"):
+            pass
+
+
+def test_ogr_sqlite_percentile_cont():
+    """Test PERCENTILE_CONT"""
+
+    ds = ogr.Open(":memory:", update=1)
+    ds.ExecuteSQL("CREATE TABLE test(v)")
+    ds.ExecuteSQL("INSERT INTO test VALUES (5),(6),(4),(7),(3),(8),(2),(9),(1),(10)")
+
+    with pytest.raises(Exception), gdaltest.error_handler():
+        with ds.ExecuteSQL("SELECT PERCENTILE_CONT(v, 'invalid') FROM test"):
+            pass
+    with pytest.raises(Exception), gdaltest.error_handler():
+        with ds.ExecuteSQL("SELECT PERCENTILE_CONT(v, -0.1) FROM test"):
+            pass
+    with pytest.raises(Exception), gdaltest.error_handler():
+        with ds.ExecuteSQL("SELECT PERCENTILE_CONT(v, 1.1) FROM test"):
+            pass
+
+
+@pytest.mark.parametrize(
+    "input_values,expected_res",
+    [
+        ([], None),
+        ([1, 2, None, 3, 2], 2),
+        (["foo", "bar", "baz", "bar"], "bar"),
+        ([1, "foo", 2, "foo", "bar"], "foo"),
+        ([1, "foo", 2, "foo", 1], "foo"),
+    ],
+)
+def test_ogr_sqlite_mode(input_values, expected_res):
+    """Test MODE"""
+
+    ds = ogr.Open(":memory:", update=1)
+    ds.ExecuteSQL("CREATE TABLE test(v)")
+    for v in input_values:
+        ds.ExecuteSQL(
+            "INSERT INTO test VALUES (%s)"
+            % (
+                "NULL"
+                if v is None
+                else ("'" + v + "'")
+                if isinstance(v, str)
+                else str(v)
+            )
+        )
+    if expected_res is None and input_values:
+        with pytest.raises(Exception), gdaltest.error_handler():
+            with ds.ExecuteSQL("SELECT MODE(v) FROM test"):
+                pass
+    else:
+        with ds.ExecuteSQL("SELECT MODE(v) FROM test") as sql_lyr:
+            f = sql_lyr.GetNextFeature()
+            assert f.GetField(0) == expected_res
+
+
+def test_ogr_sqlite_run_deferred_actions_before_start_transaction():
+
+    ds = ogr.Open(":memory:", update=1)
+    lyr = ds.CreateLayer("test")
+    ds.StartTransaction()
+    ds.ExecuteSQL("INSERT INTO test VALUES (1, NULL)")
+    ds.RollbackTransaction()
+    ds.StartTransaction()
+    ds.ExecuteSQL("INSERT INTO test VALUES (1, NULL)")
+    ds.CommitTransaction()
+    lyr.ResetReading()
+    f = lyr.GetNextFeature()
+    assert f.GetFID() == 1
diff --git a/autotest/ogr/ogr_style.py b/autotest/ogr/ogr_style.py
index 3457ee10e426..982df084a2be 100755
--- a/autotest/ogr/ogr_style.py
+++ b/autotest/ogr/ogr_style.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/ogr/ogr_svg.py b/autotest/ogr/ogr_svg.py
index 768d8fd23e32..7d564b3d28fa 100755
--- a/autotest/ogr/ogr_svg.py
+++ b/autotest/ogr/ogr_svg.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/ogr/ogr_tiger.py b/autotest/ogr/ogr_tiger.py
index 84371e1433e2..636896ccf980 100755
--- a/autotest/ogr/ogr_tiger.py
+++ b/autotest/ogr/ogr_tiger.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2011-2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/ogr/ogr_tiledb.py b/autotest/ogr/ogr_tiledb.py
index 23520b55d124..067f9e35906c 100644
--- a/autotest/ogr/ogr_tiledb.py
+++ b/autotest/ogr/ogr_tiledb.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2023, Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import json
diff --git a/autotest/ogr/ogr_topojson.py b/autotest/ogr/ogr_topojson.py
index e892dd1204ca..9dc502868aee 100755
--- a/autotest/ogr/ogr_topojson.py
+++ b/autotest/ogr/ogr_topojson.py
@@ -10,35 +10,22 @@
 ###############################################################################
 # Copyright (c) 2020, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
+import gdaltest
 import ogrtest
 import pytest
 
-from osgeo import ogr
+from osgeo import gdal, ogr
+
+pytestmark = pytest.mark.require_driver("TopoJSON")
 
 ###############################################################################
 # Test TopoJSON
 
 
-def test_ogr_toposjon_objects_is_array():
+def test_ogr_topojson_objects_is_array():
 
     ds = ogr.Open("data/topojson/topojson1.topojson")
     lyr = ds.GetLayer(0)
@@ -123,7 +110,7 @@ def test_ogr_toposjon_objects_is_array():
     ds = None
 
 
-def test_ogr_toposjon_objects_is_dict():
+def test_ogr_topojson_objects_is_dict():
 
     ds = ogr.Open("data/topojson/topojson2.topojson")
     lyr = ds.GetLayer(0)
@@ -144,7 +131,7 @@ def test_ogr_toposjon_objects_is_dict():
     ds = None
 
 
-def test_ogr_toposjon_no_transform():
+def test_ogr_topojson_no_transform():
 
     ds = ogr.Open("data/topojson/topojson3.topojson")
     lyr = ds.GetLayer(0)
@@ -157,3 +144,34 @@ def test_ogr_toposjon_no_transform():
     feat = lyr.GetNextFeature()
     ogrtest.check_feature_geometry(feat, "LINESTRING (0 0,10 0,0 10,10 0,0 0)")
     ds = None
+
+
+###############################################################################
+# Test force opening a TopoJSON file
+
+
+def test_ogr_topojson_force_opening(tmp_vsimem):
+
+    filename = str(tmp_vsimem / "test.json")
+
+    with open("data/topojson/topojson1.topojson", "rb") as fsrc:
+        with gdaltest.vsi_open(filename, "wb") as fdest:
+            fdest.write(fsrc.read(1))
+            fdest.write(b" " * (1000 * 1000))
+            fdest.write(fsrc.read())
+
+    with pytest.raises(Exception):
+        gdal.OpenEx(filename)
+
+    ds = gdal.OpenEx(filename, allowed_drivers=["TopoJSON"])
+    assert ds.GetDriver().GetDescription() == "TopoJSON"
+
+
+###############################################################################
+# Test force opening a URL as TopoJSON
+
+
+def test_ogr_topojson_force_opening_url():
+
+    drv = gdal.IdentifyDriverEx("http://example.com", allowed_drivers=["TopoJSON"])
+    assert drv.GetDescription() == "TopoJSON"
diff --git a/autotest/ogr/ogr_vdv.py b/autotest/ogr/ogr_vdv.py
index c358c29b77b8..aa0a277f2b96 100755
--- a/autotest/ogr/ogr_vdv.py
+++ b/autotest/ogr/ogr_vdv.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2015, Even Rouault <even.rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/ogr/ogr_vfk.py b/autotest/ogr/ogr_vfk.py
index acd3324308a9..73a2ffc24e63 100755
--- a/autotest/ogr/ogr_vfk.py
+++ b/autotest/ogr/ogr_vfk.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2009-2019 Martin Landa <landa.martin gmail.com>
 # Copyright (c) 2010-2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import pathlib
diff --git a/autotest/ogr/ogr_virtualogr.py b/autotest/ogr/ogr_virtualogr.py
index 39a9b90df867..91a4fdebc03c 100755
--- a/autotest/ogr/ogr_virtualogr.py
+++ b/autotest/ogr/ogr_virtualogr.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2012-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/ogr/ogr_vrt.py b/autotest/ogr/ogr_vrt.py
index f93640c197a2..e5afc296eb04 100755
--- a/autotest/ogr/ogr_vrt.py
+++ b/autotest/ogr/ogr_vrt.py
@@ -1331,11 +1331,13 @@ def test_ogr_vrt_29(tmp_path):
     sr.ImportFromEPSG(4326)
     lyr = ds.CreateLayer("ogr_vrt_29", srs=sr)
     lyr.CreateField(ogr.FieldDefn("id", ogr.OFTInteger))
+    lyr.CreateField(ogr.FieldDefn("str", ogr.OFTString))
 
     for i in range(5):
         for j in range(5):
             feat = ogr.Feature(lyr.GetLayerDefn())
             feat.SetField(0, i * 5 + j)
+            feat["str"] = f"{j}-{i}"
             feat.SetGeometry(
                 ogr.CreateGeometryFromWkt("POINT(%f %f)" % (2 + i / 5.0, 49 + j / 5.0))
             )
@@ -1483,11 +1485,15 @@ def test_ogr_vrt_29(tmp_path):
         ), "did not get expected extent"
 
     feat = lyr.GetNextFeature()
+    assert feat["id"] == 0
+    assert feat["str"] == "0-0"
     ogrtest.check_feature_geometry(
         feat, "POINT(426857.987717275274917 5427937.523466162383556)"
     )
 
     feat = lyr.GetNextFeature()
+    assert feat["id"] == 1
+    assert feat["str"] == "1-0"
 
     feat.SetGeometry(None)
     assert lyr.SetFeature(feat) == 0
diff --git a/autotest/ogr/ogr_wasp.py b/autotest/ogr/ogr_wasp.py
index c9fe25464f3c..9093fd59a766 100755
--- a/autotest/ogr/ogr_wasp.py
+++ b/autotest/ogr/ogr_wasp.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2014, Oslandia <info at oslandia dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import math
diff --git a/autotest/ogr/ogr_wfs.py b/autotest/ogr/ogr_wfs.py
index 3b27bd7e71a2..2908533afd09 100755
--- a/autotest/ogr/ogr_wfs.py
+++ b/autotest/ogr/ogr_wfs.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -63,9 +47,13 @@ def ogr_wfs_init():
     if gml_ds is None:
         pytest.skip("cannot read GML files")
 
+    vsimem_hidden_before = gdal.ReadDirRecursive("/vsimem/.#!HIDDEN!#.")
+
     with gdal.config_option("CPL_CURL_ENABLE_VSIMEM", "YES"):
         yield
 
+    assert gdal.ReadDirRecursive("/vsimem/.#!HIDDEN!#.") == vsimem_hidden_before
+
 
 @pytest.fixture(
     params=["NO", None], scope="module", ids=["without-streaming", "with-streaming"]
@@ -499,34 +487,32 @@ def do_GET(self):
 # Test reading a local fake WFS server
 
 
-def test_ogr_wfs_fake_wfs_server():
+@gdaltest.enable_exceptions()
+@pytest.mark.parametrize("using_wfs_prefix", [True, False])
+def test_ogr_wfs_fake_wfs_server(using_wfs_prefix):
 
     (process, port) = webserver.launch(handler=WFSHTTPHandler)
     if port == 0:
         pytest.skip()
 
-    with gdal.config_option("OGR_WFS_LOAD_MULTIPLE_LAYER_DEFN", "NO"):
-        ds = ogr.Open("WFS:http://127.0.0.1:%d/fakewfs" % port)
-    if ds is None:
-        webserver.server_stop(process, port)
-        pytest.fail("did not managed to open WFS datastore")
+    try:
+        with gdal.config_option("OGR_WFS_LOAD_MULTIPLE_LAYER_DEFN", "NO"):
+            if using_wfs_prefix:
+                ds = gdal.OpenEx("WFS:http://127.0.0.1:%d/fakewfs" % port)
+            else:
+                ds = gdal.OpenEx(
+                    "http://127.0.0.1:%d/fakewfs" % port, allowed_drivers=["WFS"]
+                )
 
-    lyr = ds.GetLayerByName("rijkswegen")
-    if lyr.GetName() != "rijkswegen":
-        print(lyr.GetName())
-        webserver.server_stop(process, port)
-        pytest.fail("did not get expected layer name")
+        lyr = ds.GetLayerByName("rijkswegen")
+        assert lyr.GetName() == "rijkswegen"
 
-    sr = lyr.GetSpatialRef()
-    sr2 = osr.SpatialReference()
-    sr2.ImportFromEPSG(28992)
-    if not sr.IsSame(sr2):
-        print(sr)
-        webserver.server_stop(process, port)
-        pytest.fail("did not get expected SRS")
+        sr = lyr.GetSpatialRef()
+        sr2 = osr.SpatialReference()
+        sr2.ImportFromEPSG(28992)
+        assert sr.IsSame(sr2), sr
 
-    feat = lyr.GetNextFeature()
-    try:
+        feat = lyr.GetNextFeature()
         assert feat.GetField("MPLength") == "33513."
         ogrtest.check_feature_geometry(
             feat,
diff --git a/autotest/ogr/ogr_wkbwkt_geom.py b/autotest/ogr/ogr_wkbwkt_geom.py
index 6930da09fcfc..0033a03433b6 100755
--- a/autotest/ogr/ogr_wkbwkt_geom.py
+++ b/autotest/ogr/ogr_wkbwkt_geom.py
@@ -98,8 +98,6 @@ def test_wkbwkt_geom(filename):
     #           print geom_wkt.ExportToWkt()
     #           return 'fail'
 
-    geom_wkb.Destroy()
-
     ######################################################################
     # Convert geometry to WKB and back to verify that WKB encoding is
     # working smoothly.
@@ -109,17 +107,11 @@ def test_wkbwkt_geom(filename):
 
     assert str(geom_wkb) == str(geom_wkt), "XDR WKB encoding/decoding failure."
 
-    geom_wkb.Destroy()
-
     wkb_ndr = geom_wkt.ExportToWkb(ogr.wkbNDR)
     geom_wkb = ogr.CreateGeometryFromWkb(wkb_ndr)
 
     assert str(geom_wkb) == str(geom_wkt), "NDR WKB encoding/decoding failure."
 
-    geom_wkb.Destroy()
-
-    geom_wkt.Destroy()
-
 
 ###############################################################################
 # Test geometry with very large exponents of coordinate values.
@@ -166,6 +158,7 @@ def test_ogr_wkbwkt_test_broken_geom():
         "POINT Z(EMPTY)",
         "POINT Z(A)",
         "POINT Z(0 1",
+        "POINTZ M EMPTY",
         "LINESTRING",
         "LINESTRING UNKNOWN",
         "LINESTRING(",
@@ -372,76 +365,79 @@ def test_ogr_wkbwkt_test_broken_geom():
 # Test importing WKT SF1.2
 
 
-def test_ogr_wkbwkt_test_import_wkt_sf12():
-
-    list_wkt_tuples = [
+@pytest.mark.parametrize(
+    "input_wkt,expected_output_wkt",
+    [
         ("POINT EMPTY", "POINT EMPTY"),
-        ("POINT Z EMPTY", "POINT EMPTY"),
-        ("POINT M EMPTY", "POINT EMPTY"),
-        ("POINT ZM EMPTY", "POINT EMPTY"),
+        ("POINT Z EMPTY", "POINT Z EMPTY"),
+        ("POINT M EMPTY", "POINT M EMPTY"),
+        ("POINT ZM EMPTY", "POINT ZM EMPTY"),
         ("POINT (0 1)", "POINT (0 1)"),
-        ("POINT Z (0 1 2)", "POINT (0 1 2)"),
-        ("POINT M (0 1 2)", "POINT (0 1)"),
-        ("POINT ZM (0 1 2 3)", "POINT (0 1 2)"),
+        ("POINT Z (0 1 2)", "POINT Z (0 1 2)"),
+        ("POINT M (0 1 2)", "POINT M (0 1 2)"),
+        ("POINT ZM (0 1 2 3)", "POINT ZM (0 1 2 3)"),
         ("LINESTRING EMPTY", "LINESTRING EMPTY"),
-        ("LINESTRING Z EMPTY", "LINESTRING EMPTY"),
-        ("LINESTRING M EMPTY", "LINESTRING EMPTY"),
-        ("LINESTRING ZM EMPTY", "LINESTRING EMPTY"),
+        ("LINESTRING Z EMPTY", "LINESTRING Z EMPTY"),
+        ("LINESTRING M EMPTY", "LINESTRING M EMPTY"),
+        ("LINESTRING ZM EMPTY", "LINESTRING ZM EMPTY"),
         ("LINESTRING (0 1,2 3)", "LINESTRING (0 1,2 3)"),
-        ("LINESTRING Z (0 1 2,3 4 5)", "LINESTRING (0 1 2,3 4 5)"),
-        ("LINESTRING M (0 1 2,3 4 5)", "LINESTRING (0 1,3 4)"),
-        ("LINESTRING ZM (0 1 2 3,4 5 6 7)", "LINESTRING (0 1 2,4 5 6)"),
+        ("LINESTRING Z (0 1 2,3 4 5)", "LINESTRING Z (0 1 2,3 4 5)"),
+        ("LINESTRING M (0 1 2,3 4 5)", "LINESTRING M (0 1 2,3 4 5)"),
+        ("LINESTRING ZM (0 1 2 3,4 5 6 7)", "LINESTRING ZM (0 1 2 3,4 5 6 7)"),
         ("POLYGON EMPTY", "POLYGON EMPTY"),
         ("POLYGON (EMPTY)", "POLYGON EMPTY"),
-        ("POLYGON Z EMPTY", "POLYGON EMPTY"),
-        ("POLYGON Z (EMPTY)", "POLYGON EMPTY"),
-        ("POLYGON M EMPTY", "POLYGON EMPTY"),
-        ("POLYGON ZM EMPTY", "POLYGON EMPTY"),
+        ("POLYGON Z EMPTY", "POLYGON Z EMPTY"),
+        ("POLYGON Z (EMPTY)", "POLYGON Z EMPTY"),
+        ("POLYGON M EMPTY", "POLYGON M EMPTY"),
+        ("POLYGON ZM EMPTY", "POLYGON ZM EMPTY"),
         ("POLYGON ((0 1,2 3,4 5,0 1))", "POLYGON ((0 1,2 3,4 5,0 1))"),
         ("POLYGON ((0 1,2 3,4 5,0 1),EMPTY)", "POLYGON ((0 1,2 3,4 5,0 1))"),
         ("POLYGON (EMPTY,(0 1,2 3,4 5,0 1))", "POLYGON EMPTY"),
         ("POLYGON (EMPTY,(0 1,2 3,4 5,0 1),EMPTY)", "POLYGON EMPTY"),
         (
             "POLYGON Z ((0 1 10,2 3 20,4 5 30,0 1 10),(0 1 10,2 3 20,4 5 30,0 1 10))",
-            "POLYGON ((0 1 10,2 3 20,4 5 30,0 1 10),(0 1 10,2 3 20,4 5 30,0 1 10))",
+            "POLYGON Z ((0 1 10,2 3 20,4 5 30,0 1 10),(0 1 10,2 3 20,4 5 30,0 1 10))",
+        ),
+        (
+            "POLYGON M ((0 1 10,2 3 20,4 5 30,0 1 10))",
+            "POLYGON M ((0 1 10,2 3 20,4 5 30,0 1 10))",
         ),
-        ("POLYGON M ((0 1 10,2 3 20,4 5 30,0 1 10))", "POLYGON ((0 1,2 3,4 5,0 1))"),
         (
             "POLYGON ZM ((0 1 10 100,2 3 20 200,4 5 30 300,0 1 10 10))",
-            "POLYGON ((0 1 10,2 3 20,4 5 30,0 1 10))",
+            "POLYGON ZM ((0 1 10 100,2 3 20 200,4 5 30 300,0 1 10 10))",
         ),
         ("MULTIPOINT EMPTY", "MULTIPOINT EMPTY"),
         ("MULTIPOINT (EMPTY)", "MULTIPOINT EMPTY"),
-        ("MULTIPOINT Z EMPTY", "MULTIPOINT EMPTY"),
-        ("MULTIPOINT Z (EMPTY)", "MULTIPOINT EMPTY"),
-        ("MULTIPOINT M EMPTY", "MULTIPOINT EMPTY"),
-        ("MULTIPOINT ZM EMPTY", "MULTIPOINT EMPTY"),
+        ("MULTIPOINT Z EMPTY", "MULTIPOINT Z EMPTY"),
+        ("MULTIPOINT Z (EMPTY)", "MULTIPOINT Z EMPTY"),
+        ("MULTIPOINT M EMPTY", "MULTIPOINT M EMPTY"),
+        ("MULTIPOINT ZM EMPTY", "MULTIPOINT ZM EMPTY"),
         (
             "MULTIPOINT (0 1,2 3)",
-            "MULTIPOINT (0 1,2 3)",
+            "MULTIPOINT ((0 1),(2 3))",
         ),  # Not SF1.2 compliant but recognized
-        ("MULTIPOINT ((0 1),(2 3))", "MULTIPOINT (0 1,2 3)"),
+        ("MULTIPOINT ((0 1),(2 3))", "MULTIPOINT ((0 1),(2 3))"),
         (
             "MULTIPOINT ((0 1),EMPTY)",
-            "MULTIPOINT (0 1)",
+            "MULTIPOINT ((0 1))",
         ),  # We don't output empty points in multipoint
         (
             "MULTIPOINT (EMPTY,(0 1))",
-            "MULTIPOINT (0 1)",
+            "MULTIPOINT ((0 1))",
         ),  # We don't output empty points in multipoint
         (
             "MULTIPOINT (EMPTY,(0 1),EMPTY)",
-            "MULTIPOINT (0 1)",
+            "MULTIPOINT ((0 1))",
         ),  # We don't output empty points in multipoint
-        ("MULTIPOINT Z ((0 1 2),(3 4 5))", "MULTIPOINT (0 1 2,3 4 5)"),
-        ("MULTIPOINT M ((0 1 2),(3 4 5))", "MULTIPOINT (0 1,3 4)"),
-        ("MULTIPOINT ZM ((0 1 2 3),(4 5 6 7))", "MULTIPOINT (0 1 2,4 5 6)"),
+        ("MULTIPOINT Z ((0 1 2),(3 4 5))", "MULTIPOINT Z ((0 1 2),(3 4 5))"),
+        ("MULTIPOINT M ((0 1 2),(3 4 5))", "MULTIPOINT M ((0 1 2),(3 4 5))"),
+        ("MULTIPOINT ZM ((0 1 2 3),(4 5 6 7))", "MULTIPOINT ZM ((0 1 2 3),(4 5 6 7))"),
         ("MULTILINESTRING EMPTY", "MULTILINESTRING EMPTY"),
         ("MULTILINESTRING (EMPTY)", "MULTILINESTRING EMPTY"),
-        ("MULTILINESTRING Z EMPTY", "MULTILINESTRING EMPTY"),
-        ("MULTILINESTRING Z (EMPTY)", "MULTILINESTRING EMPTY"),
-        ("MULTILINESTRING M EMPTY", "MULTILINESTRING EMPTY"),
-        ("MULTILINESTRING ZM EMPTY", "MULTILINESTRING EMPTY"),
+        ("MULTILINESTRING Z EMPTY", "MULTILINESTRING Z EMPTY"),
+        ("MULTILINESTRING Z (EMPTY)", "MULTILINESTRING Z EMPTY"),
+        ("MULTILINESTRING M EMPTY", "MULTILINESTRING M EMPTY"),
+        ("MULTILINESTRING ZM EMPTY", "MULTILINESTRING ZM EMPTY"),
         ("MULTILINESTRING ((0 1,2 3,4 5,0 1))", "MULTILINESTRING ((0 1,2 3,4 5,0 1))"),
         (
             "MULTILINESTRING ((0 1,2 3,4 5,0 1),EMPTY)",
@@ -457,22 +453,22 @@ def test_ogr_wkbwkt_test_import_wkt_sf12():
         ),
         (
             "MULTILINESTRING Z ((0 1 10,2 3 20,4 5 30,0 1 10),(0 1 10,2 3 20,4 5 30,0 1 10))",
-            "MULTILINESTRING ((0 1 10,2 3 20,4 5 30,0 1 10),(0 1 10,2 3 20,4 5 30,0 1 10))",
+            "MULTILINESTRING Z ((0 1 10,2 3 20,4 5 30,0 1 10),(0 1 10,2 3 20,4 5 30,0 1 10))",
         ),
         (
             "MULTILINESTRING M ((0 1 10,2 3 20,4 5 30,0 1 10))",
-            "MULTILINESTRING ((0 1,2 3,4 5,0 1))",
+            "MULTILINESTRING M ((0 1 10,2 3 20,4 5 30,0 1 10))",
         ),
         (
             "MULTILINESTRING ZM ((0 1 10 100,2 3 20 200,4 5 30 300,0 1 10 10))",
-            "MULTILINESTRING ((0 1 10,2 3 20,4 5 30,0 1 10))",
+            "MULTILINESTRING ZM ((0 1 10 100,2 3 20 200,4 5 30 300,0 1 10 10))",
         ),
         ("MULTIPOLYGON EMPTY", "MULTIPOLYGON EMPTY"),
         ("MULTIPOLYGON (EMPTY)", "MULTIPOLYGON EMPTY"),
-        ("MULTIPOLYGON Z EMPTY", "MULTIPOLYGON EMPTY"),
-        ("MULTIPOLYGON Z (EMPTY)", "MULTIPOLYGON EMPTY"),
-        ("MULTIPOLYGON M EMPTY", "MULTIPOLYGON EMPTY"),
-        ("MULTIPOLYGON ZM EMPTY", "MULTIPOLYGON EMPTY"),
+        ("MULTIPOLYGON Z EMPTY", "MULTIPOLYGON Z EMPTY"),
+        ("MULTIPOLYGON Z (EMPTY)", "MULTIPOLYGON Z EMPTY"),
+        ("MULTIPOLYGON M EMPTY", "MULTIPOLYGON M EMPTY"),
+        ("MULTIPOLYGON ZM EMPTY", "MULTIPOLYGON ZM EMPTY"),
         ("MULTIPOLYGON ((EMPTY))", "MULTIPOLYGON EMPTY"),
         ("MULTIPOLYGON (((0 1,2 3,4 5,0 1)))", "MULTIPOLYGON (((0 1,2 3,4 5,0 1)))"),
         (
@@ -510,31 +506,31 @@ def test_ogr_wkbwkt_test_import_wkt_sf12():
         ),
         (
             "MULTIPOLYGON Z (((0 1 10,2 3 20,4 5 30,0 1 10)),((0 1 10,2 3 20,4 5 30,0 1 10)))",
-            "MULTIPOLYGON (((0 1 10,2 3 20,4 5 30,0 1 10)),((0 1 10,2 3 20,4 5 30,0 1 10)))",
+            "MULTIPOLYGON Z (((0 1 10,2 3 20,4 5 30,0 1 10)),((0 1 10,2 3 20,4 5 30,0 1 10)))",
         ),
         (
             "MULTIPOLYGON M (((0 1 10,2 3 20,4 5 30,0 1 10)))",
-            "MULTIPOLYGON (((0 1,2 3,4 5,0 1)))",
+            "MULTIPOLYGON M (((0 1 10,2 3 20,4 5 30,0 1 10)))",
         ),
         (
             "MULTIPOLYGON ZM (((0 1 10 100,2 3 20 200,4 5 30 300,0 1 10 10)))",
-            "MULTIPOLYGON (((0 1 10,2 3 20,4 5 30,0 1 10)))",
+            "MULTIPOLYGON ZM (((0 1 10 100,2 3 20 200,4 5 30 300,0 1 10 10)))",
         ),
         ("GEOMETRYCOLLECTION EMPTY", "GEOMETRYCOLLECTION EMPTY"),
-        ("GEOMETRYCOLLECTION Z EMPTY", "GEOMETRYCOLLECTION EMPTY"),
-        ("GEOMETRYCOLLECTION M EMPTY", "GEOMETRYCOLLECTION EMPTY"),
-        ("GEOMETRYCOLLECTION ZM EMPTY", "GEOMETRYCOLLECTION EMPTY"),
+        ("GEOMETRYCOLLECTION Z EMPTY", "GEOMETRYCOLLECTION Z EMPTY"),
+        ("GEOMETRYCOLLECTION M EMPTY", "GEOMETRYCOLLECTION M EMPTY"),
+        ("GEOMETRYCOLLECTION ZM EMPTY", "GEOMETRYCOLLECTION ZM EMPTY"),
         (
             "GEOMETRYCOLLECTION Z (POINT Z (0 1 2),LINESTRING Z (0 1 2,3 4 5))",
-            "GEOMETRYCOLLECTION (POINT (0 1 2),LINESTRING (0 1 2,3 4 5))",
+            "GEOMETRYCOLLECTION Z (POINT Z (0 1 2),LINESTRING Z (0 1 2,3 4 5))",
         ),
         (
             "GEOMETRYCOLLECTION M (POINT M (0 1 2),LINESTRING M (0 1 2,3 4 5))",
-            "GEOMETRYCOLLECTION (POINT (0 1),LINESTRING (0 1,3 4))",
+            "GEOMETRYCOLLECTION M (POINT M (0 1 2),LINESTRING M (0 1 2,3 4 5))",
         ),
         (
             "GEOMETRYCOLLECTION ZM (POINT ZM (0 1 2 10),LINESTRING ZM (0 1 2 10,3 4 5 20))",
-            "GEOMETRYCOLLECTION (POINT (0 1 2),LINESTRING (0 1 2,3 4 5))",
+            "GEOMETRYCOLLECTION ZM (POINT ZM (0 1 2 10),LINESTRING ZM (0 1 2 10,3 4 5 20))",
         ),
         (
             "GEOMETRYCOLLECTION (POINT EMPTY,LINESTRING EMPTY,POLYGON EMPTY,MULTIPOINT EMPTY,MULTILINESTRING EMPTY,MULTIPOLYGON EMPTY,GEOMETRYCOLLECTION EMPTY)",
@@ -542,7 +538,7 @@ def test_ogr_wkbwkt_test_import_wkt_sf12():
         ),
         (
             "GEOMETRYCOLLECTION (POINT Z EMPTY,LINESTRING Z EMPTY,POLYGON Z EMPTY,MULTIPOINT Z EMPTY,MULTILINESTRING Z EMPTY,MULTIPOLYGON Z EMPTY,GEOMETRYCOLLECTION Z EMPTY)",
-            "GEOMETRYCOLLECTION (POINT EMPTY,LINESTRING EMPTY,POLYGON EMPTY,MULTIPOINT EMPTY,MULTILINESTRING EMPTY,MULTIPOLYGON EMPTY,GEOMETRYCOLLECTION EMPTY)",
+            "GEOMETRYCOLLECTION Z (POINT Z EMPTY,LINESTRING Z EMPTY,POLYGON Z EMPTY,MULTIPOINT Z EMPTY,MULTILINESTRING Z EMPTY,MULTIPOLYGON Z EMPTY,GEOMETRYCOLLECTION Z EMPTY)",
         ),
         # Not SF1.2 compliant but recognized
         (
@@ -555,17 +551,52 @@ def test_ogr_wkbwkt_test_import_wkt_sf12():
         ("MULTICURVE (EMPTY)", "MULTICURVE EMPTY"),
         ("MULTISURFACE EMPTY", "MULTISURFACE EMPTY"),
         ("MULTISURFACE (EMPTY)", "MULTISURFACE EMPTY"),
-    ]
+    ],
+)
+def test_ogr_wkbwkt_test_import_wkt_sf12(input_wkt, expected_output_wkt):
+
+    geom = ogr.CreateGeometryFromWkt(input_wkt)
+    assert geom is not None
+    out_wkt = geom.ExportToIsoWkt()
+    assert out_wkt == expected_output_wkt
 
-    for wkt_tuple in list_wkt_tuples:
-        geom = ogr.CreateGeometryFromWkt(wkt_tuple[0])
-        assert geom is not None, "could not instantiate geometry %s" % wkt_tuple[0]
-        out_wkt = geom.ExportToWkt()
-        assert out_wkt == wkt_tuple[1], "in=%s, out=%s, expected=%s." % (
-            wkt_tuple[0],
-            out_wkt,
-            wkt_tuple[1],
-        )
+    # Test with input in lower case
+    geom = ogr.CreateGeometryFromWkt(input_wkt.lower())
+    assert geom is not None
+    out_wkt = geom.ExportToIsoWkt()
+    assert out_wkt == expected_output_wkt
+
+
+###############################################################################
+# Test importing non-conformant WKT with Z/M modifier directly appended to
+# geometry type name
+
+
+@pytest.mark.parametrize(
+    "input_wkt,expected_output_wkt",
+    [
+        ("POINTZ EMPTY", "POINT Z EMPTY"),
+        ("POINTM EMPTY", "POINT M EMPTY"),
+        ("POINTZM EMPTY", "POINT ZM EMPTY"),
+        ("POINTZ (0 1 2)", "POINT Z (0 1 2)"),
+        ("POINTM (0 1 2)", "POINT M (0 1 2)"),
+        ("POINTZM (0 1 2 3)", "POINT ZM (0 1 2 3)"),
+    ],
+)
+def test_ogr_wkbwkt_test_import_wkt_z_m_modifier_without_space(
+    input_wkt, expected_output_wkt
+):
+
+    geom = ogr.CreateGeometryFromWkt(input_wkt)
+    assert geom is not None
+    out_wkt = geom.ExportToIsoWkt()
+    assert out_wkt == expected_output_wkt
+
+    # Test with input in lower case
+    geom = ogr.CreateGeometryFromWkt(input_wkt.lower())
+    assert geom is not None
+    out_wkt = geom.ExportToIsoWkt()
+    assert out_wkt == expected_output_wkt
 
 
 ###############################################################################
diff --git a/autotest/ogr/ogr_wktempty.py b/autotest/ogr/ogr_wktempty.py
index 1b707500e3f3..3047cbd63b75 100755
--- a/autotest/ogr/ogr_wktempty.py
+++ b/autotest/ogr/ogr_wktempty.py
@@ -64,10 +64,7 @@ def test_empty_wkt(test_input, expected):
     except AttributeError:
         pytest.skip()
 
-    try:
-        assert geom.IsEmpty(), "IsEmpty returning false for an empty geometry"
-    finally:
-        geom.Destroy()
+    assert geom.IsEmpty(), "IsEmpty returning false for an empty geometry"
 
 
 def test_ogr_wktempty_test_partial_empty_geoms():
diff --git a/autotest/ogr/ogr_xls.py b/autotest/ogr/ogr_xls.py
index 4f5a0f262a02..fd61c88fcad8 100755
--- a/autotest/ogr/ogr_xls.py
+++ b/autotest/ogr/ogr_xls.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/ogr/ogr_xlsx.py b/autotest/ogr/ogr_xlsx.py
index 120e2f471567..a4b8cc287935 100755
--- a/autotest/ogr/ogr_xlsx.py
+++ b/autotest/ogr/ogr_xlsx.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -189,6 +173,28 @@ def test_ogr_xlsx_4():
     assert ret.find("INFO") != -1 and ret.find("ERROR") == -1
 
 
+###############################################################################
+# Run test_ogrsf
+
+
+def test_ogr_xlsx_test_ogrsf_update(tmp_path):
+
+    import test_cli_utilities
+
+    if test_cli_utilities.get_test_ogrsf_path() is None:
+        pytest.skip()
+
+    filename = str(tmp_path / "out.xlsx")
+    gdal.VectorTranslate(filename, "data/poly.shp", format="XLSX")
+
+    ret = gdaltest.runexternal(
+        test_cli_utilities.get_test_ogrsf_path() + f" {filename}"
+    )
+
+    assert "INFO" in ret
+    assert "ERROR" not in ret
+
+
 ###############################################################################
 # Test write support
 
@@ -628,3 +634,31 @@ def test_ogr_xlsx_write_sheet_without_row():
     assert ds.GetLayer(2).GetFeatureCount() == 1
     ds = None
     gdal.Unlink(tmpfilename)
+
+
+###############################################################################
+# Test reading a XLSX file with XML element prefixes
+
+
+def test_ogr_xlsx_read_xml_prefix():
+
+    ds = ogr.Open("data/xlsx/with_xml_prefix.xlsx")
+    lyr = ds.GetLayer(0)
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetName() == "Col1"
+    assert lyr.GetLayerDefn().GetFieldDefn(1).GetName() == "Col2"
+    f = lyr.GetNextFeature()
+    assert f["Col1"] == "foo"
+    assert f["Col2"] == "bar"
+
+
+###############################################################################
+# Test reading a XLSX file with <row> without "r" attribute
+
+
+def test_ogr_xlsx_read_row_without_r_attribute():
+
+    ds = ogr.Open("data/xlsx/row_without_r_attribute.xlsx")
+    lyr = ds.GetLayer(0)
+    f = lyr.GetNextFeature()
+    assert f["ID"] == 1
+    assert f["NAME"] == "TEST123"
diff --git a/autotest/ogr/ogr_xodr.py b/autotest/ogr/ogr_xodr.py
new file mode 100644
index 000000000000..3432ce2dc4d2
--- /dev/null
+++ b/autotest/ogr/ogr_xodr.py
@@ -0,0 +1,292 @@
+#!/usr/bin/env pytest
+# -*- coding: utf-8 -*-
+###############################################################################
+#
+# Project:  GDAL/OGR Test Suite
+# Purpose:  XODR driver testing.
+# Author:   Michael Scholz, German Aerospace Center (DLR)
+#           Gülsen Bardak, German Aerospace Center (DLR)
+#
+###############################################################################
+# Copyright 2024 German Aerospace Center (DLR), Institute of Transportation Systems
+#
+# SPDX-License-Identifier: MIT
+###############################################################################
+import gdaltest
+import pytest
+
+from osgeo import gdal, ogr
+
+pytestmark = pytest.mark.require_driver("XODR")
+xodr_file = "data/xodr/5g_living_lab_A39_Wolfsburg-West.xodr"
+
+
+def test_ogr_xodr_test_ogrsf():
+
+    import test_cli_utilities
+
+    if test_cli_utilities.get_test_ogrsf_path() is None:
+        pytest.skip()
+
+    ret = gdaltest.runexternal(
+        test_cli_utilities.get_test_ogrsf_path() + " -ro " + xodr_file
+    )
+
+    assert "INFO" in ret
+    assert "ERROR" not in ret
+    assert "FAILURE" not in ret
+
+
+def test_ogr_xodr_basics():
+    """Test basic capabilities:
+    - Data source
+    - Layer count
+    """
+    ds = gdal.OpenEx(xodr_file, gdal.OF_VECTOR)
+    assert ds is not None, f"Cannot open dataset for file: {xodr_file}"
+    assert ds.GetLayerCount() == 6, f"Bad layer count for file: {xodr_file}"
+
+
+def test_ogr_xodr_undissolvable_layers():
+    """Test all point and linestring layers for:
+    - Correct feature type definitions
+    - Spatial reference system
+    """
+    ds = gdal.OpenEx(xodr_file, gdal.OF_VECTOR)
+
+    layer_reference_line = ds.GetLayer("ReferenceLine")
+    check_feat_def_reference_line(layer_reference_line)
+    check_spatial_ref(layer_reference_line)
+
+    layer_lane_border = ds.GetLayer("LaneBorder")
+    check_feat_def_lane_border(layer_lane_border)
+    check_spatial_ref(layer_lane_border)
+
+    layer_road_object = ds.GetLayer("RoadObject")
+    check_feat_def_road_object(layer_road_object)
+    check_spatial_ref(layer_road_object)
+
+
+@pytest.mark.parametrize("dissolve_tin", [True, False])
+def test_ogr_xodr_dissolvable_layers(dissolve_tin: bool):
+    """Test all TIN layers for:
+        - Correct feature type definitions
+        - Spatial reference system
+
+    Args:
+        dissolve_tin (bool): True if to dissolve triangulated surfaces.
+    """
+    options = ["DISSOLVE_TIN=" + str(dissolve_tin)]
+    ds = gdal.OpenEx(xodr_file, gdal.OF_VECTOR, open_options=options)
+
+    layer_road_mark = ds.GetLayer("RoadMark")
+    check_feat_def_road_mark(layer_road_mark, dissolve_tin)
+    check_spatial_ref(layer_road_mark)
+
+    layer_lane = ds.GetLayer("Lane")
+    check_feat_def_lane(layer_lane, dissolve_tin)
+    check_spatial_ref(layer_lane)
+
+    layer_road_signal = ds.GetLayer("RoadSignal")
+    check_feat_def_road_signal(layer_road_signal, dissolve_tin)
+    check_spatial_ref(layer_road_signal)
+
+
+def check_feat_def_reference_line(layer):
+    assert (
+        layer.GetGeomType() == ogr.wkbLineString25D
+    ), "bad layer geometry type for ReferenceLine"
+    assert layer.GetFeatureCount() == 41
+    assert layer.GetLayerDefn().GetFieldCount() == 3
+    assert (
+        layer.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTString
+        and layer.GetLayerDefn().GetFieldDefn(1).GetType() == ogr.OFTReal
+        and layer.GetLayerDefn().GetFieldDefn(2).GetType() == ogr.OFTString
+    )
+
+
+def check_feat_def_lane_border(layer):
+    assert (
+        layer.GetGeomType() == ogr.wkbLineString25D
+    ), "bad layer geometry type for LaneBorder"
+    assert layer.GetFeatureCount() == 230
+    assert layer.GetLayerDefn().GetFieldCount() == 5
+    assert (
+        layer.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTInteger
+        and layer.GetLayerDefn().GetFieldDefn(1).GetType() == ogr.OFTString
+        and layer.GetLayerDefn().GetFieldDefn(2).GetType() == ogr.OFTString
+        and layer.GetLayerDefn().GetFieldDefn(3).GetType() == ogr.OFTInteger
+        and layer.GetLayerDefn().GetFieldDefn(4).GetType() == ogr.OFTInteger
+    )
+
+
+def check_feat_def_road_mark(layer, dissolve_tin: bool):
+    if not dissolve_tin:
+        assert (
+            layer.GetGeomType() == ogr.wkbTINZ
+        ), "bad layer geometry type for RoadMark"
+    else:
+        assert (
+            layer.GetGeomType() == ogr.wkbPolygon25D
+        ), "bad layer geometry type for dissolved RoadMark"
+    assert layer.GetFeatureCount() == 424
+    assert layer.GetLayerDefn().GetFieldCount() == 3
+    assert (
+        layer.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTString
+        and layer.GetLayerDefn().GetFieldDefn(1).GetType() == ogr.OFTInteger
+        and layer.GetLayerDefn().GetFieldDefn(2).GetType() == ogr.OFTString
+    )
+
+
+def check_feat_def_road_object(layer):
+    assert layer.GetGeomType() == ogr.wkbTINZ, "bad layer geometry type for RoadObject"
+    assert layer.GetFeatureCount() == 273
+    assert layer.GetLayerDefn().GetFieldCount() == 4
+    assert (
+        layer.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTString
+        and layer.GetLayerDefn().GetFieldDefn(1).GetType() == ogr.OFTString
+        and layer.GetLayerDefn().GetFieldDefn(2).GetType() == ogr.OFTString
+        and layer.GetLayerDefn().GetFieldDefn(3).GetType() == ogr.OFTString
+    )
+
+
+def check_feat_def_lane(layer, dissolve_tin: bool):
+    if not dissolve_tin:
+        assert layer.GetGeomType() == ogr.wkbTINZ, "bad layer geometry type for Lane"
+    else:
+        assert (
+            layer.GetGeomType() == ogr.wkbPolygon25D
+        ), "bad layer geometry type for dissolved Lane"
+    assert layer.GetFeatureCount() == 174
+    assert layer.GetLayerDefn().GetFieldCount() == 5
+    assert (
+        layer.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTInteger
+        and layer.GetLayerDefn().GetFieldDefn(1).GetType() == ogr.OFTString
+        and layer.GetLayerDefn().GetFieldDefn(2).GetType() == ogr.OFTString
+        and layer.GetLayerDefn().GetFieldDefn(3).GetType() == ogr.OFTInteger
+        and layer.GetLayerDefn().GetFieldDefn(4).GetType() == ogr.OFTInteger
+    )
+
+
+def check_feat_def_road_signal(layer, dissolve_tin: bool):
+    if not dissolve_tin:
+        assert (
+            layer.GetGeomType() == ogr.wkbTINZ
+        ), "bad layer geometry type for RoadSignal"
+    else:
+        assert (
+            layer.GetGeomType() == ogr.wkbPoint25D
+        ), "bad layer geometry type for dissolved RoadSignal"
+    assert layer.GetFeatureCount() == 50
+    assert layer.GetLayerDefn().GetFieldCount() == 10
+    assert (
+        layer.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTString
+        and layer.GetLayerDefn().GetFieldDefn(1).GetType() == ogr.OFTString
+        and layer.GetLayerDefn().GetFieldDefn(2).GetType() == ogr.OFTString
+        and layer.GetLayerDefn().GetFieldDefn(3).GetType() == ogr.OFTString
+    )
+
+
+def check_spatial_ref(layer):
+    srs_proj4 = layer.GetSpatialRef().ExportToProj4()
+    expected_proj4 = (
+        "+proj=utm +zone=32 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs"
+    )
+    assert srs_proj4 == expected_proj4, "bad spatial reference system"
+
+
+@pytest.mark.parametrize("eps", [1.0, 0.1])
+def test_ogr_xodr_geometry_eps(eps: float):
+    """Test correct geometry creation for different values of open option EPS.
+
+    Args:
+        eps (float): Value for linear approximation of parametric geometries.
+    """
+    options = ["EPSILON=" + str(eps)]
+    ds = gdal.OpenEx(xodr_file, gdal.OF_VECTOR, open_options=options)
+
+    lyr = ds.GetLayer("ReferenceLine")
+    ogr_xodr_check_reference_line_geometry_eps(lyr, eps)
+
+
+def ogr_xodr_check_reference_line_geometry_eps(lyr, eps: float):
+    lyr.ResetReading()
+    feat = lyr.GetNextFeature()
+    wkt = feat.GetGeometryRef().ExportToWkt()
+    if eps == 1.0:
+        assert (
+            wkt
+            == "LINESTRING (618251.572934302 5809506.96459625 102.378603962182,618254.944363001 5809506.95481165 102.371268481462,618258.290734177 5809506.56065761 102.363999939623)"
+        ), f"wrong geometry created for ReferenceLine with EPS {str(eps)}"
+    elif eps == 0.1:
+        assert (
+            wkt
+            == "LINESTRING (618251.572934302 5809506.96459625 102.378603962182,618254.944363001 5809506.95481165 102.371268481462,618257.937110798 5809506.62607284 102.364759846201,618258.290734177 5809506.56065761 102.363999939623)"
+        ), f"wrong geometry created for ReferenceLine with EPS {str(eps)}"
+
+
+@pytest.mark.parametrize("dissolve_tin", [True, False])
+def test_ogr_xodr_geometry_dissolve(dissolve_tin: bool):
+    """Test correct geometry creation for different values of open option DISSOLVE_TIN.
+
+    Args:
+        dissolve_tin (bool): True if to dissolve triangulated surfaces.
+    """
+    options = ["DISSOLVE_TIN=" + str(dissolve_tin)]
+    ds = gdal.OpenEx(xodr_file, gdal.OF_VECTOR, open_options=options)
+
+    lyr = ds.GetLayer("Lane")
+    ogr_xodr_check_lane_geometry_dissolve(lyr, dissolve_tin)
+
+    lyr = ds.GetLayer("RoadMark")
+    ogr_xodr_check_road_mark_geometry_dissolve(lyr, dissolve_tin)
+
+    lyr = ds.GetLayer("RoadSignal")
+    ogr_xodr_check_road_signal_geometry_dissolve(lyr, dissolve_tin)
+
+
+def ogr_xodr_check_lane_geometry_dissolve(lyr, dissolve_tin: bool):
+    lyr.ResetReading()
+    feat = lyr.GetNextFeature()
+    wkt = feat.GetGeometryRef().ExportToWkt()
+    if not dissolve_tin:
+        assert (
+            wkt
+            == "TIN Z (((618251.708293914 5809503.30115552 102.206436434521,618253.406110685 5809502.59383908 102.162274831603,618253.40871869 5809503.08668632 102.186041767762,618251.708293914 5809503.30115552 102.206436434521)),((618251.708293914 5809503.30115552 102.206436434521,618251.726901715 5809502.7975446 102.182768671482,618253.406110685 5809502.59383908 102.162274831603,618251.708293914 5809503.30115552 102.206436434521)),((618253.40871869 5809503.08668632 102.186041767762,618254.710111278 5809502.39980074 102.146632509166,618254.735144074 5809502.88656198 102.170637739305,618253.40871869 5809503.08668632 102.186041767762)),((618253.40871869 5809503.08668632 102.186041767762,618253.406110685 5809502.59383908 102.162274831603,618254.710111278 5809502.39980074 102.146632509166,618253.40871869 5809503.08668632 102.186041767762)),((618254.735144074 5809502.88656198 102.170637739305,618256.354637481 5809502.1051039 102.128452978327,618256.414547031 5809502.56472816 102.151918900654,618254.735144074 5809502.88656198 102.170637739305)),((618254.735144074 5809502.88656198 102.170637739305,618254.710111278 5809502.39980074 102.146632509166,618256.354637481 5809502.1051039 102.128452978327,618254.735144074 5809502.88656198 102.170637739305)),((618256.414547031 5809502.56472816 102.151918900654,618257.381896193 5809501.87667676 102.118091279345,618257.465586929 5809502.30800315 102.140735883984,618256.414547031 5809502.56472816 102.151918900654)),((618256.414547031 5809502.56472816 102.151918900654,618256.354637481 5809502.1051039 102.128452978327,618257.381896193 5809501.87667676 102.118091279345,618256.414547031 5809502.56472816 102.151918900654)))"
+        ), "wrong geometry created for Lane"
+    else:
+        assert (
+            wkt
+            == "POLYGON ((618257.381896193 5809501.87667676 102.118091279345,618256.354637481 5809502.1051039 102.128452978327,618254.710111278 5809502.39980074 102.146632509166,618253.406110685 5809502.59383908 102.162274831603,618251.726901715 5809502.7975446 102.182768671482,618251.708293914 5809503.30115552 102.206436434521,618253.40871869 5809503.08668632 102.186041767762,618254.735144074 5809502.88656198 102.170637739305,618256.414547031 5809502.56472816 102.151918900654,618257.465586929 5809502.30800315 102.140735883984,618257.381896193 5809501.87667676 102.118091279345))"
+        ), "wrong geometry created for dissolved Lane"
+
+
+def ogr_xodr_check_road_mark_geometry_dissolve(lyr, dissolve_tin: bool):
+    lyr.ResetReading()
+    feat = lyr.GetNextFeature()
+    wkt = feat.GetGeometryRef().ExportToWkt()
+    if not dissolve_tin:
+        assert (
+            wkt
+            == "TIN Z (((618251.72468874 5809502.85743767 102.185583413892,618252.578130818 5809502.64753279 102.169882217474,618252.576002918 5809502.76737822 102.175586986359,618251.72468874 5809502.85743767 102.185583413892)),((618251.72468874 5809502.85743767 102.185583413892,618251.72911469 5809502.73765153 102.179953929071,618252.578130818 5809502.64753279 102.169882217474,618251.72468874 5809502.85743767 102.185583413892)),((618252.576002918 5809502.76737822 102.175586986359,618253.405793556 5809502.53390956 102.159384806253,618253.406427815 5809502.6537686 102.165164856953,618252.576002918 5809502.76737822 102.175586986359)),((618252.576002918 5809502.76737822 102.175586986359,618252.578130818 5809502.64753279 102.169882217474,618253.405793556 5809502.53390956 102.159384806253,618252.576002918 5809502.76737822 102.175586986359)),((618253.406427815 5809502.6537686 102.165164856953,618253.747583384 5809502.4836466 102.15508610511,618253.749521849 5809502.6034901 102.160897877637,618253.406427815 5809502.6537686 102.165164856953)),((618253.406427815 5809502.6537686 102.165164856953,618253.405793556 5809502.53390956 102.159384806253,618253.747583384 5809502.4836466 102.15508610511,618253.406427815 5809502.6537686 102.165164856953)),((618253.749521849 5809502.6034901 102.160897877637,618254.085085834 5809502.43409623 102.150979368988,618254.088411764 5809502.55390772 102.156822862935,618253.749521849 5809502.6034901 102.160897877637)),((618253.749521849 5809502.6034901 102.160897877637,618253.747583384 5809502.4836466 102.15508610511,618254.085085834 5809502.43409623 102.150979368988,618253.749521849 5809502.6034901 102.160897877637)),((618254.088411764 5809502.55390772 102.156822862935,618254.707033446 5809502.33995247 102.143681017939,618254.713189111 5809502.45964901 102.149584000393,618254.088411764 5809502.55390772 102.156822862935)),((618254.088411764 5809502.55390772 102.156822862935,618254.085085834 5809502.43409623 102.150979368988,618254.707033446 5809502.33995247 102.143681017939,618254.088411764 5809502.55390772 102.156822862935)),((618254.713189111 5809502.45964901 102.149584000393,618255.243094449 5809502.25186128 102.137539289407,618255.251990439 5809502.3713828 102.143494733244,618254.713189111 5809502.45964901 102.149584000393)),((618254.713189111 5809502.45964901 102.149584000393,618254.707033446 5809502.33995247 102.143681017939,618255.243094449 5809502.25186128 102.137539289407,618254.713189111 5809502.45964901 102.149584000393)),((618255.251990439 5809502.3713828 102.143494733244,618256.346892323 5809502.04568328 102.125419284058,618256.362382638 5809502.16452451 102.131486672596,618255.251990439 5809502.3713828 102.143494733244)),((618255.251990439 5809502.3713828 102.143494733244,618255.243094449 5809502.25186128 102.137539289407,618256.346892323 5809502.04568328 102.125419284058,618255.251990439 5809502.3713828 102.143494733244)),((618256.362382638 5809502.16452451 102.131486672596,618256.86502563 5809501.93528991 102.120031826125,618256.884079624 5809502.05360925 102.126153745722,618256.362382638 5809502.16452451 102.131486672596)),((618256.362382638 5809502.16452451 102.131486672596,618256.346892323 5809502.04568328 102.125419284058,618256.86502563 5809501.93528991 102.120031826125,618256.362382638 5809502.16452451 102.131486672596)),((618256.884079624 5809502.05360925 102.126153745722,618257.370482622 5809501.81785335 102.11500305465,618257.393309764 5809501.93550017 102.12117950404,618256.884079624 5809502.05360925 102.126153745722)),((618256.884079624 5809502.05360925 102.126153745722,618256.86502563 5809501.93528991 102.120031826125,618257.370482622 5809501.81785335 102.11500305465,618256.884079624 5809502.05360925 102.126153745722)))"
+        ), "wrong geometry created for RoadMark"
+    else:
+        assert (
+            wkt
+            == "POLYGON ((618253.747583384 5809502.4836466 102.15508610511,618253.405793556 5809502.53390956 102.159384806253,618252.578130818 5809502.64753279 102.169882217474,618251.72911469 5809502.73765153 102.179953929071,618251.72468874 5809502.85743767 102.185583413892,618252.576002918 5809502.76737822 102.175586986359,618253.406427815 5809502.6537686 102.165164856953,618253.749521849 5809502.6034901 102.160897877637,618254.088411764 5809502.55390772 102.156822862935,618254.713189111 5809502.45964901 102.149584000393,618255.251990439 5809502.3713828 102.143494733244,618256.362382638 5809502.16452451 102.131486672596,618256.884079624 5809502.05360925 102.126153745722,618257.393309764 5809501.93550017 102.12117950404,618257.370482622 5809501.81785335 102.11500305465,618256.86502563 5809501.93528991 102.120031826125,618256.346892323 5809502.04568328 102.125419284058,618255.243094449 5809502.25186128 102.137539289407,618254.707033446 5809502.33995247 102.143681017939,618254.085085834 5809502.43409623 102.150979368988,618253.747583384 5809502.4836466 102.15508610511))"
+        ), "wrong geometry created for dissolved RoadMark"
+
+
+def ogr_xodr_check_road_signal_geometry_dissolve(lyr, dissolve_tin: bool):
+    lyr.ResetReading()
+    feat = lyr.GetNextFeature()
+    wkt = feat.GetGeometryRef().ExportToWkt()
+    if not dissolve_tin:
+        assert (
+            wkt
+            == "TIN Z (((618366.844654328 5809540.96164437 103.568946384872,618366.840967264 5809541.48457345 103.54861591048,618367.044614501 5809540.96290705 103.56516023851,618366.844654328 5809540.96164437 103.568946384872)),((618366.840967264 5809541.48457345 103.54861591048,618367.040927437 5809541.48583613 103.544829764117,618367.044614501 5809540.96290705 103.56516023851,618366.840967264 5809541.48457345 103.54861591048)),((618366.858657359 5809540.99087441 104.318245603892,618367.058617531 5809540.99213709 104.31445945753,618366.854970294 5809541.51380349 104.297915129499,618366.858657359 5809540.99087441 104.318245603892)),((618366.854970294 5809541.51380349 104.297915129499,618367.058617531 5809540.99213709 104.31445945753,618367.054930467 5809541.51506617 104.294128983137,618366.854970294 5809541.51380349 104.297915129499)),((618366.854970294 5809541.51380349 104.297915129499,618367.054930467 5809541.51506617 104.294128983137,618366.840967264 5809541.48457345 103.54861591048,618366.854970294 5809541.51380349 104.297915129499)),((618366.840967264 5809541.48457345 103.54861591048,618367.054930467 5809541.51506617 104.294128983137,618367.040927437 5809541.48583613 103.544829764117,618366.840967264 5809541.48457345 103.54861591048)),((618367.058617531 5809540.99213709 104.31445945753,618366.858657359 5809540.99087441 104.318245603892,618367.044614501 5809540.96290705 103.56516023851,618367.058617531 5809540.99213709 104.31445945753)),((618367.044614501 5809540.96290705 103.56516023851,618366.858657359 5809540.99087441 104.318245603892,618366.844654328 5809540.96164437 103.568946384872,618367.044614501 5809540.96290705 103.56516023851)),((618366.844654328 5809540.96164437 103.568946384872,618366.858657359 5809540.99087441 104.318245603892,618366.854970294 5809541.51380349 104.297915129499,618366.844654328 5809540.96164437 103.568946384872)),((618366.854970294 5809541.51380349 104.297915129499,618366.840967264 5809541.48457345 103.54861591048,618366.844654328 5809540.96164437 103.568946384872,618366.854970294 5809541.51380349 104.297915129499)),((618367.044614501 5809540.96290705 103.56516023851,618367.054930467 5809541.51506617 104.294128983137,618367.058617531 5809540.99213709 104.31445945753,618367.044614501 5809540.96290705 103.56516023851)),((618367.044614501 5809540.96290705 103.56516023851,618367.040927437 5809541.48583613 103.544829764117,618367.054930467 5809541.51506617 104.294128983137,618367.044614501 5809540.96290705 103.56516023851)))"
+        ), "wrong geometry created for RoadSignal"
+    else:
+        assert (
+            wkt == "POINT (618366.942790883 5809541.22374025 103.556888074495)"
+        ), "wrong geometry created for dissolved RoadSignal"
diff --git a/autotest/ogr/ograpispy.py b/autotest/ogr/ograpispy.py
index 25b4b2f38fa6..f1d77deb337c 100755
--- a/autotest/ogr/ograpispy.py
+++ b/autotest/ogr/ograpispy.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2014, Even Rouault <even.rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/osr/osr_basic.py b/autotest/osr/osr_basic.py
index 619b7619252a..c3b59c8a454d 100755
--- a/autotest/osr/osr_basic.py
+++ b/autotest/osr/osr_basic.py
@@ -12,25 +12,10 @@
 # Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
+import json
 import os
 import subprocess
 import sys
@@ -1838,6 +1823,9 @@ def threaded_function(arg):
 ###############################################################################
 
 
+@pytest.mark.skipif(
+    gdaltest.is_travis_branch("sanitize"), reason="fails on sanitize for unknown reason"
+)
 def test_Set_PROJ_DATA_config_option_sub_proccess_config_option_ok():
 
     backup_search_paths = osr.GetPROJSearchPaths()
@@ -1856,6 +1844,9 @@ def test_Set_PROJ_DATA_config_option_sub_proccess_config_option_ok():
 ###############################################################################
 
 
+@pytest.mark.skipif(
+    gdaltest.is_travis_branch("sanitize"), reason="fails on sanitize for unknown reason"
+)
 def test_Set_PROJ_DATA_config_option_sub_proccess_config_option_ko():
 
     backup_search_paths = osr.GetPROJSearchPaths()
@@ -2472,3 +2463,18 @@ def test_osr_basic_has_point_motion_operation():
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(8255)  # NAD83(CSRS)v7
     assert srs.HasPointMotionOperation()
+
+
+###############################################################################
+
+
+# Test workaround for https://github.com/OSGeo/PROJ/pull/4166
+def test_osr_basic_export_wkt_utm_south():
+
+    srs = osr.SpatialReference()
+    srs.SetFromUserInput("+proj=utm +zone=1 +south +datum=WGS84")
+
+    assert 'ID["EPSG",16101]' in srs.ExportToWkt(["FORMAT=WKT2_2019"])
+
+    j = json.loads(srs.ExportToPROJJSON())
+    assert j["conversion"]["id"]["code"] == 16101
diff --git a/autotest/osr/osr_basic_subprocess.py b/autotest/osr/osr_basic_subprocess.py
index ac872f4a454c..9c7712ad5b4d 100755
--- a/autotest/osr/osr_basic_subprocess.py
+++ b/autotest/osr/osr_basic_subprocess.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
diff --git a/autotest/osr/osr_cf1.py b/autotest/osr/osr_cf1.py
index 70f6e5f69f7a..8c672d26c553 100755
--- a/autotest/osr/osr_cf1.py
+++ b/autotest/osr/osr_cf1.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2024, Even Rouault, <even.rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/osr/osr_compd.py b/autotest/osr/osr_compd.py
index 4f1e1b7010f6..854ebb783873 100755
--- a/autotest/osr/osr_compd.py
+++ b/autotest/osr/osr_compd.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2010, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/osr/osr_ct.py b/autotest/osr/osr_ct.py
index 4b1d326d7227..a12c3675b768 100755
--- a/autotest/osr/osr_ct.py
+++ b/autotest/osr/osr_ct.py
@@ -12,23 +12,7 @@
 # Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.com>
 # Copyright (c) 2014, Google
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import math
diff --git a/autotest/osr/osr_ct_proj.py b/autotest/osr/osr_ct_proj.py
index 2232dd3a9f46..ae896689ad03 100755
--- a/autotest/osr/osr_ct_proj.py
+++ b/autotest/osr/osr_ct_proj.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/osr/osr_epsg.py b/autotest/osr/osr_epsg.py
index 901b034389a1..0053cc91eec5 100755
--- a/autotest/osr/osr_epsg.py
+++ b/autotest/osr/osr_epsg.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
@@ -124,6 +108,8 @@ def test_osr_epsg_6():
         (5042, False),  # WGS 84 / UPS South (E,N)
         (3031, False),  # WGS 84 / Antarctic Polar Stereographic
         (5482, True),  # RSRGD2000 / RSPS2000
+        (3903, True),  # ETRS89 / TM35FIN(N,E) + N2000 height
+        (5698, False),  # RGF93 v1 / Lambert-93 + NGF-IGN69 height
     ],
 )
 def test_osr_epsg_treats_as_northing_easting(epsg_code, is_northing_easting):
@@ -392,6 +378,45 @@ def test_osr_epsg_13():
     assert matches[0][0].IsSame(sr) != 1
 
 
+###############################################################################
+# Test FindMatches() when input SRS doesn't have expected axis order
+
+# Not sure about the minimum PROJ version, but 6.3 doesn't work
+@pytest.mark.require_proj(8, 0)
+def test_osr_epsg_find_matches_wrong_axis_order():
+
+    sr = osr.SpatialReference()
+    # NZTM2000 with implicit axis (thus east, north)
+    sr.SetFromUserInput(
+        """PROJCS["NZGD2000 / New Zealand Transverse Mercator 2000",
+    GEOGCS["NZGD2000",
+        DATUM["New_Zealand_Geodetic_Datum_2000",
+            SPHEROID["GRS 1980",6378137,298.257222101,
+                AUTHORITY["EPSG","7019"]],
+            AUTHORITY["EPSG","6167"]],
+        PRIMEM["Greenwich",0,
+            AUTHORITY["EPSG","8901"]],
+        UNIT["degree",0.0174532925199433,
+            AUTHORITY["EPSG","9122"]],
+        AUTHORITY["EPSG","4167"]],
+    PROJECTION["Transverse_Mercator"],
+    PARAMETER["latitude_of_origin",0],
+    PARAMETER["central_meridian",173],
+    PARAMETER["scale_factor",0.9996],
+    PARAMETER["false_easting",1600000],
+    PARAMETER["false_northing",10000000],
+    UNIT["metre",1,
+        AUTHORITY["EPSG","9001"]],
+    AXIS["X",EAST],
+    AXIS["Y",NORTH]]
+"""
+    )
+    matches = sr.FindMatches()
+    assert len(matches) == 1 and matches[0][1] == 90
+    assert matches[0][0].GetAuthorityCode(None) == "2193"
+    assert matches[0][0].GetDataAxisToSRSAxisMapping() == [2, 1]
+
+
 ###############################################################################
 
 
diff --git a/autotest/osr/osr_esri.py b/autotest/osr/osr_esri.py
index c109d219e016..b439340bbb46 100755
--- a/autotest/osr/osr_esri.py
+++ b/autotest/osr/osr_esri.py
@@ -13,23 +13,7 @@
 # Copyright (c) 2013, Kyle Shannon <kyle at pobox dot com>
 # Copyright (c) 2014, Google
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import pytest
diff --git a/autotest/osr/osr_micoordsys.py b/autotest/osr/osr_micoordsys.py
index 9e18c2922b43..b79827fc8286 100755
--- a/autotest/osr/osr_micoordsys.py
+++ b/autotest/osr/osr_micoordsys.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/osr/osr_ozi.py b/autotest/osr/osr_ozi.py
index 04d821132829..356f1bcaf6fd 100755
--- a/autotest/osr/osr_ozi.py
+++ b/autotest/osr/osr_ozi.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/osr/osr_pm.py b/autotest/osr/osr_pm.py
index 778c8245d2fd..513bdff9bee8 100755
--- a/autotest/osr/osr_pm.py
+++ b/autotest/osr/osr_pm.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/osr/osr_proj4.py b/autotest/osr/osr_proj4.py
index 18cdeb1d3582..50932e4ec749 100755
--- a/autotest/osr/osr_proj4.py
+++ b/autotest/osr/osr_proj4.py
@@ -12,23 +12,7 @@
 # Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.com>
 # Copyright (c) 2014, Kyle Shannon <kyle at pobox dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/osr/osr_url.py b/autotest/osr/osr_url.py
index 06ae66d3c392..17dc87c5f06d 100755
--- a/autotest/osr/osr_url.py
+++ b/autotest/osr/osr_url.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2007, Howard Butler <hobu.inc@gmail.com>
 # Copyright (c) 2008-2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import socket
diff --git a/autotest/osr/osr_usgs.py b/autotest/osr/osr_usgs.py
index 7b614c445a3b..582886cfdf59 100755
--- a/autotest/osr/osr_usgs.py
+++ b/autotest/osr/osr_usgs.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2004, Andrey Kiselev <dron@remotesensing.org>
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
@@ -113,3 +97,21 @@ def test_osr_usgs_2():
         and gdal.PackedDMSToDec(params[4]) == pytest.approx(-117.4745429, abs=0.0000005)
         and gdal.PackedDMSToDec(params[5]) == pytest.approx(33.76446203, abs=0.0000005)
     ), "Can not import Lambert Conformal Conic projection."
+
+
+###############################################################################
+# Test the osr.SpatialReference.ImportFromUSGS() function with WGS 84
+#
+
+
+def test_osr_usgs_wgs84():
+
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(32631)
+    (proj_code, zone, params, datum_code) = srs.ExportToUSGS()
+
+    srs2 = osr.SpatialReference()
+    srs2.ImportFromUSGS(proj_code, zone, params, datum_code)
+
+    assert srs2.IsSame(srs)
+    assert srs2.GetAuthorityCode(None) == "32631"
diff --git a/autotest/osr/osr_validate.py b/autotest/osr/osr_validate.py
index 640cf677f316..73a5f3c2020b 100755
--- a/autotest/osr/osr_validate.py
+++ b/autotest/osr/osr_validate.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/osr/osr_xml.py b/autotest/osr/osr_xml.py
index 41ef4d1377bf..9822297909f4 100755
--- a/autotest/osr/osr_xml.py
+++ b/autotest/osr/osr_xml.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import re
diff --git a/autotest/pymod/gdaltest.py b/autotest/pymod/gdaltest.py
index 1c1677a3164b..417a0768181e 100755
--- a/autotest/pymod/gdaltest.py
+++ b/autotest/pymod/gdaltest.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import contextlib
@@ -2199,3 +2183,8 @@ def tell(self):
 
 def vsi_open(path, mode="r"):
     return VSIFile(path, mode)
+
+
+def vrt_has_open_support():
+    drv = gdal.GetDriverByName("VRT")
+    return drv is not None and drv.GetMetadataItem(gdal.DMD_OPENOPTIONLIST) is not None
diff --git a/autotest/pymod/test_cli_utilities.py b/autotest/pymod/test_cli_utilities.py
index 5c9257d0153f..58669d86c839 100755
--- a/autotest/pymod/test_cli_utilities.py
+++ b/autotest/pymod/test_cli_utilities.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2008-2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -104,6 +88,14 @@ def get_gdalmdiminfo_path():
 #
 
 
+def get_gdalmanage_path():
+    return get_cli_utility_path("gdalmanage")
+
+
+###############################################################################
+#
+
+
 def get_gdal_translate_path():
     return get_cli_utility_path("gdal_translate")
 
diff --git a/autotest/pymod/test_py_scripts.py b/autotest/pymod/test_py_scripts.py
index 26d703a6e6d0..21a4aa99c95b 100755
--- a/autotest/pymod/test_py_scripts.py
+++ b/autotest/pymod/test_py_scripts.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2010-2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import importlib
diff --git a/autotest/pymod/uffd.py b/autotest/pymod/uffd.py
index f2614f42b3b7..74ee71341de2 100755
--- a/autotest/pymod/uffd.py
+++ b/autotest/pymod/uffd.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2018, Dr. James McClain <james.mcclain@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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/pymod/webserver.py b/autotest/pymod/webserver.py
index 4207b518ba31..199d0b230d10 100755
--- a/autotest/pymod/webserver.py
+++ b/autotest/pymod/webserver.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2010-2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import contextlib
diff --git a/autotest/pymod/xmlvalidate.py b/autotest/pymod/xmlvalidate.py
index e7be16cdbdb0..f53eedd1d517 100755
--- a/autotest/pymod/xmlvalidate.py
+++ b/autotest/pymod/xmlvalidate.py
@@ -11,23 +11,7 @@
 # ( https://github.com/EOxServer/eoxserver/blob/master/eoxserver/services/testbase.py )
 #   Copyright (C) 2011 EOX IT Services GmbH
 #
-# 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 of this Software or works derived from this 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/pyscripts/gdal2tiles/test_add_alpha_band_to_string_vrt.py b/autotest/pyscripts/gdal2tiles/test_add_alpha_band_to_string_vrt.py
index 659362191f44..913658e522c4 100644
--- a/autotest/pyscripts/gdal2tiles/test_add_alpha_band_to_string_vrt.py
+++ b/autotest/pyscripts/gdal2tiles/test_add_alpha_band_to_string_vrt.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2017, Gregory Bataille <gregory.bataille@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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/pyscripts/gdal2tiles/test_add_gdal_warp_options_to_string.py b/autotest/pyscripts/gdal2tiles/test_add_gdal_warp_options_to_string.py
index e565535b2255..be4e762bbcba 100644
--- a/autotest/pyscripts/gdal2tiles/test_add_gdal_warp_options_to_string.py
+++ b/autotest/pyscripts/gdal2tiles/test_add_gdal_warp_options_to_string.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2017, Gregory Bataille <gregory.bataille@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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/pyscripts/gdal2tiles/test_logger.py b/autotest/pyscripts/gdal2tiles/test_logger.py
index de9cd087b1bd..ca32fd84d68b 100644
--- a/autotest/pyscripts/gdal2tiles/test_logger.py
+++ b/autotest/pyscripts/gdal2tiles/test_logger.py
@@ -10,30 +10,20 @@
 ###############################################################################
 # Copyright (c) 2024, Even Rouault <even.rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
+import gdaltest
 import pytest
 
 from osgeo import gdal
 from osgeo_utils import gdal2tiles
 
+pytestmark = pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
+
 
 def test_gdal2tiles_logger():
 
diff --git a/autotest/pyscripts/gdal2tiles/test_nb_data_bands.py b/autotest/pyscripts/gdal2tiles/test_nb_data_bands.py
index cef8de5a1f33..21db8db7fd20 100644
--- a/autotest/pyscripts/gdal2tiles/test_nb_data_bands.py
+++ b/autotest/pyscripts/gdal2tiles/test_nb_data_bands.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2017, Gregory Bataille <gregory.bataille@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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 from unittest import TestCase, mock
diff --git a/autotest/pyscripts/gdal2tiles/test_option_parser.py b/autotest/pyscripts/gdal2tiles/test_option_parser.py
index bc13f199ded6..f6fecc232197 100644
--- a/autotest/pyscripts/gdal2tiles/test_option_parser.py
+++ b/autotest/pyscripts/gdal2tiles/test_option_parser.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2017, Gregory Bataille <gregory.bataille@gmail.com>
 # Copyright (c) 2021, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/pyscripts/gdal2tiles/test_reproject_dataset.py b/autotest/pyscripts/gdal2tiles/test_reproject_dataset.py
index 5ada942f957a..43318166be37 100644
--- a/autotest/pyscripts/gdal2tiles/test_reproject_dataset.py
+++ b/autotest/pyscripts/gdal2tiles/test_reproject_dataset.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2017, Gregory Bataille <gregory.bataille@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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 from unittest import TestCase, mock
diff --git a/autotest/pyscripts/gdal2tiles/test_setup_input_srs.py b/autotest/pyscripts/gdal2tiles/test_setup_input_srs.py
index a4685af2c7f4..a8905b403e98 100644
--- a/autotest/pyscripts/gdal2tiles/test_setup_input_srs.py
+++ b/autotest/pyscripts/gdal2tiles/test_setup_input_srs.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2017, Gregory Bataille <gregory.bataille@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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 from unittest import TestCase, mock
diff --git a/autotest/pyscripts/gdal2tiles/test_setup_no_data_value.py b/autotest/pyscripts/gdal2tiles/test_setup_no_data_value.py
index afe6b3af6874..c41a07e8c860 100644
--- a/autotest/pyscripts/gdal2tiles/test_setup_no_data_value.py
+++ b/autotest/pyscripts/gdal2tiles/test_setup_no_data_value.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2017, Gregory Bataille <gregory.bataille@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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 from unittest import TestCase, mock
diff --git a/autotest/pyscripts/gdal2tiles/test_update_alpha_value_for_non_alpha_inputs.py b/autotest/pyscripts/gdal2tiles/test_update_alpha_value_for_non_alpha_inputs.py
index 3c1e74763966..29ea02992966 100644
--- a/autotest/pyscripts/gdal2tiles/test_update_alpha_value_for_non_alpha_inputs.py
+++ b/autotest/pyscripts/gdal2tiles/test_update_alpha_value_for_non_alpha_inputs.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2017, Gregory Bataille <gregory.bataille@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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 from unittest import TestCase, mock
diff --git a/autotest/pyscripts/gdal2tiles/test_vsimem.py b/autotest/pyscripts/gdal2tiles/test_vsimem.py
index 340e0238f7c4..f09b3825e2fc 100644
--- a/autotest/pyscripts/gdal2tiles/test_vsimem.py
+++ b/autotest/pyscripts/gdal2tiles/test_vsimem.py
@@ -10,30 +10,20 @@
 ###############################################################################
 # Copyright (c) 2022, Even Rouault <even.rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
+import gdaltest
 import pytest
 
 from osgeo import gdal
 from osgeo_utils import gdal2tiles
 
+pytestmark = pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
+
 
 def test_gdal2tiles_vsimem():
 
diff --git a/autotest/pyscripts/test_gdal2tiles.py b/autotest/pyscripts/test_gdal2tiles.py
index a89e2ef4a952..e4012ce41468 100755
--- a/autotest/pyscripts/test_gdal2tiles.py
+++ b/autotest/pyscripts/test_gdal2tiles.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2015, Even Rouault <even dot rouault @ spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import glob
@@ -43,10 +27,15 @@
 from osgeo import gdal, osr  # noqa
 from osgeo_utils.gdalcompare import compare_db
 
-pytestmark = pytest.mark.skipif(
-    test_py_scripts.get_py_script("gdal2tiles") is None,
-    reason="gdal2tiles not available",
-)
+pytestmark = [
+    pytest.mark.skipif(
+        test_py_scripts.get_py_script("gdal2tiles") is None,
+        reason="gdal2tiles not available",
+    ),
+    pytest.mark.skipif(
+        not gdaltest.vrt_has_open_support(), reason="VRT driver open missing"
+    ),
+]
 
 
 @pytest.fixture()
@@ -643,7 +632,7 @@ def test_gdal2tiles_nodata_values_pct_threshold(script_path, tmp_path):
     input_tif = str(tmp_path / "test_gdal2tiles_nodata_values_pct_threshold.tif")
     output_folder = str(tmp_path / "test_gdal2tiles_nodata_values_pct_threshold")
 
-    src_ds = gdal.GetDriverByName("GTiff").Create(input_tif, 256, 256, 1, gdal.GDT_Byte)
+    src_ds = gdal.GetDriverByName("GTiff").Create(input_tif, 256, 256, 3, gdal.GDT_Byte)
     src_ds.GetRasterBand(1).SetNoDataValue(20)
     src_ds.GetRasterBand(1).WriteRaster(
         0, 0, 2, 2, struct.pack("B" * 4, 10, 20, 30, 40)
@@ -665,7 +654,7 @@ def test_gdal2tiles_nodata_values_pct_threshold(script_path, tmp_path):
     )
 
     ds = gdal.Open(f"{output_folder}/0/0/0.png")
-    assert struct.unpack("B" * 2, ds.ReadRaster(0, 0, 1, 1)) == (
+    assert struct.unpack("B" * 2, ds.ReadRaster(0, 0, 1, 1, band_list=[1, 4])) == (
         round((10 + 30 + 40) / 3),
         255,
     )
@@ -677,7 +666,7 @@ def test_gdal2tiles_nodata_values_pct_threshold(script_path, tmp_path):
     )
 
     ds = gdal.Open(f"{output_folder}/0/0/0.png")
-    assert struct.unpack("B" * 2, ds.ReadRaster(0, 0, 1, 1)) == (
+    assert struct.unpack("B" * 2, ds.ReadRaster(0, 0, 1, 1, band_list=[1, 4])) == (
         round((10 + 30 + 40) / 3),
         255,
     )
@@ -689,7 +678,7 @@ def test_gdal2tiles_nodata_values_pct_threshold(script_path, tmp_path):
     )
 
     ds = gdal.Open(f"{output_folder}/0/0/0.png")
-    assert struct.unpack("B" * 2, ds.ReadRaster(0, 0, 1, 1)) == (0, 0)
+    assert struct.unpack("B" * 2, ds.ReadRaster(0, 0, 1, 1, band_list=[1, 4])) == (0, 0)
 
 
 @pytest.mark.require_driver("JPEG")
diff --git a/autotest/pyscripts/test_gdal2xyz.py b/autotest/pyscripts/test_gdal2xyz.py
index 85f71bc6a2c3..f67771ec9b9f 100644
--- a/autotest/pyscripts/test_gdal2xyz.py
+++ b/autotest/pyscripts/test_gdal2xyz.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2021, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/pyscripts/test_gdal_calc.py b/autotest/pyscripts/test_gdal_calc.py
index c7259fb2a4c5..3b10b9b8a392 100755
--- a/autotest/pyscripts/test_gdal_calc.py
+++ b/autotest/pyscripts/test_gdal_calc.py
@@ -12,23 +12,7 @@
 # Copyright (c) 2014, Etienne Tourigny <etourigny dot dev @ gmail dot com>
 # Copyright (c) 2020, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/pyscripts/test_gdal_edit.py b/autotest/pyscripts/test_gdal_edit.py
index 4d29819a9bbe..a9f4875bf6da 100755
--- a/autotest/pyscripts/test_gdal_edit.py
+++ b/autotest/pyscripts/test_gdal_edit.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/pyscripts/test_gdal_fillnodata.py b/autotest/pyscripts/test_gdal_fillnodata.py
index 84af78214693..b24323242393 100755
--- a/autotest/pyscripts/test_gdal_fillnodata.py
+++ b/autotest/pyscripts/test_gdal_fillnodata.py
@@ -9,27 +9,12 @@
 ###############################################################################
 # Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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, fillnodata, 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import struct
 
+import gdaltest
 import pytest
 import test_py_scripts
 
@@ -52,6 +37,9 @@ def script_path():
 
 def test_gdal_fillnodata_help(script_path):
 
+    if gdaltest.is_travis_branch("sanitize"):
+        pytest.skip("fails on sanitize for unknown reason")
+
     assert "ERROR" not in test_py_scripts.run_py_script(
         script_path, "gdal_fillnodata", "--help"
     )
@@ -63,6 +51,9 @@ def test_gdal_fillnodata_help(script_path):
 
 def test_gdal_fillnodata_version(script_path):
 
+    if gdaltest.is_travis_branch("sanitize"):
+        pytest.skip("fails on sanitize for unknown reason")
+
     assert "ERROR" not in test_py_scripts.run_py_script(
         script_path, "gdal_fillnodata", "--version"
     )
diff --git a/autotest/pyscripts/test_gdal_ls_py.py b/autotest/pyscripts/test_gdal_ls_py.py
index 3eb86e12a0b3..54b03771de05 100755
--- a/autotest/pyscripts/test_gdal_ls_py.py
+++ b/autotest/pyscripts/test_gdal_ls_py.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2011-2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import io
diff --git a/autotest/pyscripts/test_gdal_merge.py b/autotest/pyscripts/test_gdal_merge.py
index 4b1372efb3fa..ab39d60ea2f3 100755
--- a/autotest/pyscripts/test_gdal_merge.py
+++ b/autotest/pyscripts/test_gdal_merge.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/pyscripts/test_gdal_pansharpen.py b/autotest/pyscripts/test_gdal_pansharpen.py
index 160b68879b94..584f9d9b81ea 100755
--- a/autotest/pyscripts/test_gdal_pansharpen.py
+++ b/autotest/pyscripts/test_gdal_pansharpen.py
@@ -10,26 +10,10 @@
 ###############################################################################
 # Copyright (c) 2015, Even Rouault <even.rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
-
+import gdaltest
 import pytest
 import test_py_scripts
 
@@ -95,6 +79,10 @@ def test_gdal_pansharpen_version(script_path):
 # Simple test
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdal_pansharpen_1(script_path, tmp_path, small_world_pan_tif):
 
     out_tif = str(tmp_path / "out.tif")
@@ -120,6 +108,10 @@ def test_gdal_pansharpen_1(script_path, tmp_path, small_world_pan_tif):
 # Full options
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdal_pansharpen_2(script_path, tmp_path, small_world_pan_tif):
 
     out_vrt = str(tmp_path / "out.vrt")
diff --git a/autotest/pyscripts/test_gdal_polygonize.py b/autotest/pyscripts/test_gdal_polygonize.py
index 90eec0de5b96..4319d29aa739 100755
--- a/autotest/pyscripts/test_gdal_polygonize.py
+++ b/autotest/pyscripts/test_gdal_polygonize.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2008, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -263,6 +247,7 @@ def test_gdal_polygonize_4bis(script_path, tmp_path):
 # Test -8
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_polygonize_minus_8(script_path, tmp_path):
 
     outfilename = str(tmp_path / "out.geojson")
diff --git a/autotest/pyscripts/test_gdal_proximity.py b/autotest/pyscripts/test_gdal_proximity.py
index 059e84a538a9..96a927e2665b 100755
--- a/autotest/pyscripts/test_gdal_proximity.py
+++ b/autotest/pyscripts/test_gdal_proximity.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2008, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import pytest
diff --git a/autotest/pyscripts/test_gdal_retile.py b/autotest/pyscripts/test_gdal_retile.py
index fc7ae087bbc4..25c1359862d3 100755
--- a/autotest/pyscripts/test_gdal_retile.py
+++ b/autotest/pyscripts/test_gdal_retile.py
@@ -9,25 +9,10 @@
 ###############################################################################
 # Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
+import glob
 import os
 
 import pytest
@@ -438,3 +423,81 @@ def test_gdal_retile_png(script_path, tmp_path):
         assert ds.GetRasterBand(1).Checksum() == 4672
 
     assert os.path.exists(out_dir / "byte_1_1.png.aux.xml")
+
+
+###############################################################################
+# Test gdal_retile on a input file with a geotransform with rotational terms
+# (unsupported)
+
+
+def test_gdal_retile_rotational_geotransform(script_path, tmp_path):
+
+    src_filename = str(tmp_path / "in.tif")
+    ds = gdal.GetDriverByName("GTiff").Create(src_filename, 2, 2)
+    ds.SetGeoTransform([2, 0.1, 0.001, 49, -0.01, -0.1])
+    ds.Close()
+
+    out_dir = tmp_path / "outretile"
+    out_dir.mkdir()
+
+    _, err = test_py_scripts.run_py_script(
+        script_path,
+        "gdal_retile",
+        "-ps 1 1 -targetDir " + '"' + str(out_dir) + '"' + " " + src_filename,
+        return_stderr=True,
+    )
+    assert "has a geotransform matrix with rotational terms" in err
+    assert len(glob.glob(os.path.join(str(out_dir), "*.tif"))) == 0
+
+
+###############################################################################
+# Test gdal_retile on input files with different projections
+# (unsupported)
+
+
+@pytest.mark.parametrize(
+    "srs1,srs2,expected_err",
+    [
+        (32631, 32632, "has a SRS different from other tiles"),
+        (32631, None, "has no SRS whether other tiles have one"),
+        (None, 32631, "has a SRS whether other tiles do not"),
+    ],
+)
+def test_gdal_retile_different_srs(script_path, tmp_path, srs1, srs2, expected_err):
+
+    src_filename1 = str(tmp_path / "in1.tif")
+    ds = gdal.GetDriverByName("GTiff").Create(src_filename1, 2, 2)
+    ds.SetGeoTransform([2, 0.1, 0, 49, 0, -0.1])
+    if srs1:
+        srs = osr.SpatialReference()
+        srs.ImportFromEPSG(srs1)
+        ds.SetSpatialRef(srs)
+    ds.Close()
+
+    src_filename2 = str(tmp_path / "in2.tif")
+    ds = gdal.GetDriverByName("GTiff").Create(src_filename2, 2, 2)
+    ds.SetGeoTransform([2, 0.1, 0, 49, 0, -0.1])
+    if srs2:
+        srs = osr.SpatialReference()
+        srs.ImportFromEPSG(srs2)
+        ds.SetSpatialRef(srs)
+    ds.Close()
+
+    out_dir = tmp_path / "outretile"
+    out_dir.mkdir()
+
+    _, err = test_py_scripts.run_py_script(
+        script_path,
+        "gdal_retile",
+        "-ps 1 1 -targetDir "
+        + '"'
+        + str(out_dir)
+        + '"'
+        + " "
+        + src_filename1
+        + " "
+        + src_filename2,
+        return_stderr=True,
+    )
+    assert expected_err in err
+    assert len(glob.glob(os.path.join(str(out_dir), "*.tif"))) == 0
diff --git a/autotest/pyscripts/test_gdal_sieve.py b/autotest/pyscripts/test_gdal_sieve.py
index 2e635a457049..e61699f159dc 100755
--- a/autotest/pyscripts/test_gdal_sieve.py
+++ b/autotest/pyscripts/test_gdal_sieve.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2008, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/pyscripts/test_gdal_utils.py b/autotest/pyscripts/test_gdal_utils.py
index f7062574d174..5e758def3391 100644
--- a/autotest/pyscripts/test_gdal_utils.py
+++ b/autotest/pyscripts/test_gdal_utils.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2021, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import array
diff --git a/autotest/pyscripts/test_gdal_utils_cli.py b/autotest/pyscripts/test_gdal_utils_cli.py
index 2922071399c4..c9ff105df39f 100644
--- a/autotest/pyscripts/test_gdal_utils_cli.py
+++ b/autotest/pyscripts/test_gdal_utils_cli.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2022, Matt Wilkie <maphew@gmail.ca>
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 """
 Test that command line gdal-utils are in PATH and run. We only test script
diff --git a/autotest/pyscripts/test_gdal_utils_retcodes.py b/autotest/pyscripts/test_gdal_utils_retcodes.py
index 30c9466ad939..97fb1289619d 100644
--- a/autotest/pyscripts/test_gdal_utils_retcodes.py
+++ b/autotest/pyscripts/test_gdal_utils_retcodes.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2022, Matt Wilkie <maphew@gmail.ca>
 #
-# 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 """
 Verify that gdal-utils scripts all exit with the same return code when
diff --git a/autotest/pyscripts/test_gdalattachpct.py b/autotest/pyscripts/test_gdalattachpct.py
index d81b173eadc4..6954b55444f3 100755
--- a/autotest/pyscripts/test_gdalattachpct.py
+++ b/autotest/pyscripts/test_gdalattachpct.py
@@ -9,25 +9,10 @@
 ###############################################################################
 # Copyright (c) 2024, Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
+import gdaltest
 import pytest
 import test_py_scripts
 
@@ -91,6 +76,10 @@ def test_gdalattachpct_basic(script_path, tmp_path, palette_file):
 # Test outputting to VRT
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdalattachpct_vrt_output(script_path, tmp_path, palette_file):
 
     src_filename = str(tmp_path / "src.tif")
diff --git a/autotest/pyscripts/test_gdalbuildvrtofvrt.py b/autotest/pyscripts/test_gdalbuildvrtofvrt.py
index 19630a21727a..db3001f3a618 100755
--- a/autotest/pyscripts/test_gdalbuildvrtofvrt.py
+++ b/autotest/pyscripts/test_gdalbuildvrtofvrt.py
@@ -9,27 +9,12 @@
 ###############################################################################
 # Copyright (c) 2024, Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
 
+import gdaltest
 import pytest
 import test_py_scripts
 
@@ -41,6 +26,9 @@
         test_py_scripts.get_py_script("gdalbuildvrtofvrt") is None,
         reason="gdalbuildvrtofvrt.py not available",
     ),
+    pytest.mark.skipif(
+        not gdaltest.vrt_has_open_support(), reason="VRT driver open missing"
+    ),
 ]
 
 
diff --git a/autotest/pyscripts/test_gdalcompare.py b/autotest/pyscripts/test_gdalcompare.py
index 904e24ea8edd..1a021580202a 100644
--- a/autotest/pyscripts/test_gdalcompare.py
+++ b/autotest/pyscripts/test_gdalcompare.py
@@ -10,27 +10,12 @@
 ###############################################################################
 # Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import shutil
 
+import gdaltest
 import pytest
 import test_py_scripts
 
@@ -74,6 +59,9 @@ def source_filename(tmp_vsimem):
 
 def test_gdalcompare_help(script_path):
 
+    if gdaltest.is_travis_branch("sanitize"):
+        pytest.skip("fails on sanitize for unknown reason")
+
     assert "ERROR" not in test_py_scripts.run_py_script(
         script_path, "gdalcompare", "--help"
     )
@@ -85,6 +73,9 @@ def test_gdalcompare_help(script_path):
 
 def test_gdalcompare_version(script_path):
 
+    if gdaltest.is_travis_branch("sanitize"):
+        pytest.skip("fails on sanitize for unknown reason")
+
     assert "ERROR" not in test_py_scripts.run_py_script(
         script_path, "gdalcompare", "--version"
     )
diff --git a/autotest/pyscripts/test_gdalinfo_py.py b/autotest/pyscripts/test_gdalinfo_py.py
index 235b40dbdc29..b5527c71d371 100755
--- a/autotest/pyscripts/test_gdalinfo_py.py
+++ b/autotest/pyscripts/test_gdalinfo_py.py
@@ -9,28 +9,13 @@
 ###############################################################################
 # Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
 import shutil
 
+import gdaltest
 import pytest
 import test_py_scripts
 
@@ -140,6 +125,7 @@ def test_gdalinfo_py_5(script_path):
 # Test a dataset with overviews and RAT
 
 
+@pytest.mark.require_driver("HFA")
 def test_gdalinfo_py_6(script_path):
 
     ret = test_py_scripts.run_py_script(
@@ -154,6 +140,10 @@ def test_gdalinfo_py_6(script_path):
 # Test a dataset with GCPs
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdalinfo_py_7(script_path):
 
     ret = test_py_scripts.run_py_script(
diff --git a/autotest/pyscripts/test_gdallocationinfo_py.py b/autotest/pyscripts/test_gdallocationinfo_py.py
index 0a034f1c5904..3ca9312ece20 100644
--- a/autotest/pyscripts/test_gdallocationinfo_py.py
+++ b/autotest/pyscripts/test_gdallocationinfo_py.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.com>
 # Copyright (c) 2021, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 import pytest
 
diff --git a/autotest/pyscripts/test_gdalmove.py b/autotest/pyscripts/test_gdalmove.py
index 296ebee3c08d..b8e65a63de1f 100755
--- a/autotest/pyscripts/test_gdalmove.py
+++ b/autotest/pyscripts/test_gdalmove.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2015, Even Rouault <even dot rouault @ spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import shutil
diff --git a/autotest/pyscripts/test_ogr_layer_algebra.py b/autotest/pyscripts/test_ogr_layer_algebra.py
index ca6188b68da0..2a16fc5412ef 100644
--- a/autotest/pyscripts/test_ogr_layer_algebra.py
+++ b/autotest/pyscripts/test_ogr_layer_algebra.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2022, Radha Krishna Kavuluru <kssvrk@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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import ogrtest
diff --git a/autotest/pyscripts/test_ogrinfo_py.py b/autotest/pyscripts/test_ogrinfo_py.py
index 6ef7aa74b3ba..7be7d6546465 100755
--- a/autotest/pyscripts/test_ogrinfo_py.py
+++ b/autotest/pyscripts/test_ogrinfo_py.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/pyscripts/test_ogrmerge.py b/autotest/pyscripts/test_ogrmerge.py
index b8f30feabbbf..e6600485e86c 100755
--- a/autotest/pyscripts/test_ogrmerge.py
+++ b/autotest/pyscripts/test_ogrmerge.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2017, Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
@@ -36,10 +20,13 @@
 
 from osgeo import gdal, ogr
 
-pytestmark = pytest.mark.skipif(
-    test_py_scripts.get_py_script("ogrmerge") is None,
-    reason="ogrmerge.py not available",
-)
+pytestmark = [
+    pytest.mark.require_driver("OGR_VRT"),
+    pytest.mark.skipif(
+        test_py_scripts.get_py_script("ogrmerge") is None,
+        reason="ogrmerge.py not available",
+    ),
+]
 
 
 @pytest.fixture()
diff --git a/autotest/pyscripts/test_osr_util.py b/autotest/pyscripts/test_osr_util.py
index 529c2f90ecd2..bd174fce6c92 100644
--- a/autotest/pyscripts/test_osr_util.py
+++ b/autotest/pyscripts/test_osr_util.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2021, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import pytest
diff --git a/autotest/pyscripts/test_pct.py b/autotest/pyscripts/test_pct.py
index c85ab2c76c93..88212f866c43 100755
--- a/autotest/pyscripts/test_pct.py
+++ b/autotest/pyscripts/test_pct.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
@@ -248,6 +232,7 @@ def test_rgb2pct_3(script_path, tmp_path, rgb2pct2_tif):
 # Test pct2rgb with big CT (>256 entries)
 
 
+@pytest.mark.require_driver("HFA")
 def test_pct2rgb_4(script_path, tmp_path):
     gdal_array = pytest.importorskip("osgeo.gdal_array")
     try:
diff --git a/autotest/pyscripts/test_validate_geoparquet.py b/autotest/pyscripts/test_validate_geoparquet.py
index d2ee01f81cc8..b29c6b70cc2c 100755
--- a/autotest/pyscripts/test_validate_geoparquet.py
+++ b/autotest/pyscripts/test_validate_geoparquet.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import json
@@ -37,8 +21,8 @@
 
 from osgeo import gdal, ogr
 
-CURRENT_VERSION = "1.0.0"
-PARQUET_JSON_SCHEMA = "../ogr/data/parquet/schema.json"
+CURRENT_VERSION = "1.1.0"
+GEOPARQUET_1_1_0_JSON_SCHEMA = "../ogr/data/parquet/schema_1_1_0.json"
 
 
 pytestmark = [
@@ -62,7 +46,7 @@ def script_path():
 # Validate a GeoParquet file
 
 
-def _validate(filename, check_data=False, local_schema=PARQUET_JSON_SCHEMA):
+def _validate(filename, check_data=False, local_schema=GEOPARQUET_1_1_0_JSON_SCHEMA):
     import sys
 
     from test_py_scripts import samples_path
diff --git a/autotest/slow_tests/raster.py b/autotest/slow_tests/raster.py
index c96198b55f33..e6927afa5ff8 100644
--- a/autotest/slow_tests/raster.py
+++ b/autotest/slow_tests/raster.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/test_random_tiff.py b/autotest/test_random_tiff.py
index 1f5d47de923d..8115fa3b27da 100755
--- a/autotest/test_random_tiff.py
+++ b/autotest/test_random_tiff.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import random
diff --git a/autotest/utilities/data/geog_arc_second.tif b/autotest/utilities/data/geog_arc_second.tif
new file mode 100644
index 000000000000..19c84cabfdbc
Binary files /dev/null and b/autotest/utilities/data/geog_arc_second.tif differ
diff --git a/autotest/utilities/test_gdal_contour.py b/autotest/utilities/test_gdal_contour.py
index c4af38485bd2..5f1891795b3c 100755
--- a/autotest/utilities/test_gdal_contour.py
+++ b/autotest/utilities/test_gdal_contour.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import struct
@@ -122,10 +106,11 @@ def test_gdal_contour_1(gdal_contour_path, testdata_tif, tmp_path):
     ds = ogr.Open(contour_shp)
 
     expected_envelopes = [
-        [1.25, 1.75, 49.25, 49.75],
-        [1.25 + 0.125, 1.75 - 0.125, 49.25 + 0.125, 49.75 - 0.125],
+        [1.246875, 1.753125, 49.246875, 49.753125],
+        [1.253125, 1.746875, 49.253125, 49.746875],
+        [1.378125, 1.621875, 49.378125, 49.621875],
     ]
-    expected_height = [10, 20]
+    expected_height = [0, 10, 20]
 
     lyr = ds.ExecuteSQL("select * from contour order by elev asc")
 
@@ -141,21 +126,18 @@ def test_gdal_contour_1(gdal_contour_path, testdata_tif, tmp_path):
     precision = 1.0 / size
 
     i = 0
-    feat = lyr.GetNextFeature()
-    while feat is not None:
-        envelope = feat.GetGeometryRef().GetEnvelope()
+    for feat in lyr:
+        geom = feat.GetGeometryRef()
+        envelope = geom.GetEnvelope()
         assert feat.GetField("elev") == expected_height[i]
         for j in range(4):
-            if expected_envelopes[i][j] != pytest.approx(
-                envelope[j], abs=precision / 2 * 1.001
-            ):
-                print("i=%d, wkt=%s" % (i, feat.GetGeometryRef().ExportToWkt()))
-                print(feat.GetGeometryRef().GetEnvelope())
+            if expected_envelopes[i][j] != pytest.approx(envelope[j], rel=1e-8):
+                print("i=%d, wkt=%s" % (i, geom.ExportToWkt()))
+                print(geom.GetEnvelope())
                 pytest.fail(
                     "%f, %f" % (expected_envelopes[i][j] - envelope[j], precision / 2)
                 )
         i = i + 1
-        feat = lyr.GetNextFeature()
 
     ds.ReleaseResultSet(lyr)
 
@@ -388,3 +370,270 @@ def test_gdal_contour_5(gdal_contour_path, tmp_path):
 
             i = i + 1
             feat = lyr.GetNextFeature()
+
+
+###############################################################################
+# Test missing -fl, -i or -e
+
+
+def test_gdal_contour_missing_fl_i_or_e(gdal_contour_path, testdata_tif, tmp_path):
+
+    contour_shp = str(tmp_path / "contour.shp")
+
+    _, err = gdaltest.runexternal_out_and_err(
+        gdal_contour_path + f" {testdata_tif} {contour_shp}"
+    )
+    assert "One of -i, -fl or -e must be specified." in err
+
+
+###############################################################################
+# Test -fl can be used with -i
+
+
+def test_gdal_contour_fl_and_i(gdal_contour_path, testdata_tif, tmp_path):
+
+    contour_shp = str(tmp_path / "contour.shp")
+
+    _, err = gdaltest.runexternal_out_and_err(
+        gdal_contour_path + f" -a elev -fl 6 16 -i 10 {testdata_tif} {contour_shp}"
+    )
+
+    assert err is None or err == "", "got error/warning"
+
+    ds = ogr.Open(contour_shp)
+
+    lyr = ds.ExecuteSQL("select elev from contour order by elev asc")
+
+    expected_heights = [0, 6, 10, 16, 20]
+
+    assert lyr.GetFeatureCount() == len(expected_heights)
+
+    i = 0
+    feat = lyr.GetNextFeature()
+    while feat is not None:
+        assert feat.GetField("elev") == expected_heights[i]
+        i = i + 1
+        feat = lyr.GetNextFeature()
+
+
+###############################################################################
+# Test -fl can be used with -e real DEM
+
+
+def test_gdal_contour_fl_e(gdal_contour_path, tmp_path):
+
+    contour_shp = str(tmp_path / "contour.shp")
+
+    gdaltest.runexternal(
+        gdal_contour_path
+        + f" -a elev -fl 76 112 441 -e 3 ../gdrivers/data/n43.tif {contour_shp}"
+    )
+
+    ds = ogr.Open(contour_shp)
+
+    lyr = ds.ExecuteSQL("select distinct elev from contour order by elev asc")
+
+    expected_heights = [76, 81, 112, 243, 441]
+
+    assert lyr.GetFeatureCount() == len(expected_heights)
+
+    i = 0
+    feat = lyr.GetNextFeature()
+    while feat is not None:
+        assert feat.GetField("elev") == expected_heights[i]
+        i = i + 1
+        feat = lyr.GetNextFeature()
+
+
+###############################################################################
+# Test -off does not apply to -fl
+
+
+def test_gdal_contour_fl_ignore_off(gdal_contour_path, testdata_tif, tmp_path):
+
+    contour_shp = str(tmp_path / "contour.shp")
+
+    _, err = gdaltest.runexternal_out_and_err(
+        gdal_contour_path
+        + f" -a elev -fl 6 16 -off 2 -i 10 {testdata_tif} {contour_shp}"
+    )
+
+    assert err is None or err == "", "got error/warning"
+
+    ds = ogr.Open(contour_shp)
+
+    lyr = ds.ExecuteSQL("select elev from contour order by elev asc")
+
+    expected_heights = [2, 6, 12, 16, 22]
+
+    assert lyr.GetFeatureCount() == len(expected_heights)
+
+    i = 0
+    feat = lyr.GetNextFeature()
+    while feat is not None:
+        assert feat.GetField("elev") == expected_heights[i]
+        i = i + 1
+        feat = lyr.GetNextFeature()
+
+
+###############################################################################
+# Test there are no duplicated levels when -fl is used together with -i
+
+
+def test_gdal_contour_fl_and_i_no_dups(gdal_contour_path, testdata_tif, tmp_path):
+
+    contour_shp = str(tmp_path / "contour.shp")
+
+    _, err = gdaltest.runexternal_out_and_err(
+        gdal_contour_path + f" -a elev -fl 6 16 20 -i 10 {testdata_tif} {contour_shp}"
+    )
+
+    assert err is None or err == "", "got error/warning"
+
+    ds = ogr.Open(contour_shp)
+
+    lyr = ds.ExecuteSQL("select elev from contour order by elev asc")
+
+    expected_heights = [0, 6, 10, 16, 20]
+
+    assert lyr.GetFeatureCount() == len(expected_heights)
+
+    i = 0
+    feat = lyr.GetNextFeature()
+    while feat is not None:
+        assert feat.GetField("elev") == expected_heights[i]
+        i = i + 1
+        feat = lyr.GetNextFeature()
+
+
+###############################################################################
+# Test interval with polygonize
+
+
+def test_gdal_contour_i_polygonize(gdal_contour_path, testdata_tif, tmp_path):
+
+    contour_shp = str(tmp_path / "contour.shp")
+
+    _, err = gdaltest.runexternal_out_and_err(
+        gdal_contour_path
+        + f" -amin elev -amax elev2 -i 5 -p {testdata_tif} {contour_shp}"
+    )
+
+    assert err is None or err == "", "got error/warning"
+
+    ds = ogr.Open(contour_shp)
+
+    lyr = ds.ExecuteSQL("select elev, elev2 from contour order by elev asc")
+
+    # Raster max is 25 so the last contour is 20 (with amax of 25)
+    expected_heights = [0, 5, 10, 15, 20]
+
+    assert lyr.GetFeatureCount() == len(expected_heights)
+
+    i = 0
+    feat = lyr.GetNextFeature()
+    while feat is not None:
+        assert feat.GetField("elev") == expected_heights[i]
+        assert feat.GetField("elev2") == expected_heights[i] + 5
+        i = i + 1
+        feat = lyr.GetNextFeature()
+
+
+###############################################################################
+# Test there are no duplicated levels when -fl is used together with -i
+# and polygonize
+
+
+def test_gdal_contour_fl_and_i_no_dups_polygonize(
+    gdal_contour_path, testdata_tif, tmp_path
+):
+
+    contour_shp = str(tmp_path / "contour.shp")
+
+    _, err = gdaltest.runexternal_out_and_err(
+        gdal_contour_path
+        + f" -amin elev -amax elev2 -fl 6 16 20 -i 5 -p {testdata_tif} {contour_shp}"
+    )
+
+    assert err is None or err == "", "got error/warning"
+
+    ds = ogr.Open(contour_shp)
+
+    lyr = ds.ExecuteSQL("select elev, elev2 from contour order by elev asc")
+
+    # Raster max is 25 so the last contour is 20 (with amax of 25)
+    expected_heights = [0, 5, 6, 10, 15, 16, 20]
+
+    assert lyr.GetFeatureCount() == len(expected_heights)
+
+    i = 0
+    feat = lyr.GetNextFeature()
+    while feat is not None:
+        assert feat.GetField("elev") == expected_heights[i]
+        assert (
+            feat.GetField("elev2") == expected_heights[i + 1]
+            if i < len(expected_heights) - 2
+            else expected_heights[i] + 5
+        )
+        i = i + 1
+        feat = lyr.GetNextFeature()
+
+
+###############################################################################
+# Test -e with -fl and polygonize
+
+
+def test_gdal_contour_fl_e_polygonize(gdal_contour_path, tmp_path):
+
+    contour_shp = str(tmp_path / "contour.shp")
+
+    gdaltest.runexternal(
+        gdal_contour_path
+        + f" -p -amin elev -amax elev2 -fl 76 112 441 -e 3 ../gdrivers/data/n43.tif {contour_shp}"
+    )
+
+    ds = ogr.Open(contour_shp)
+
+    lyr = ds.ExecuteSQL("select elev, elev2 from contour order by elev asc")
+
+    # Raster min is 75, max is 460
+    expected_heights = [75, 76, 81, 112, 243, 441]
+
+    assert lyr.GetFeatureCount() == len(expected_heights)
+
+    i = 0
+    feat = lyr.GetNextFeature()
+    while feat is not None:
+        assert feat.GetField("elev") == expected_heights[i]
+        assert (
+            feat.GetField("elev2") == expected_heights[i + 1]
+            if i < len(expected_heights) - 2
+            else 460
+        )
+        i = i + 1
+        feat = lyr.GetNextFeature()
+
+
+###############################################################################
+# Test -gt
+
+
+@pytest.mark.require_driver("GPKG")
+@pytest.mark.parametrize("gt", ["0", "1", "unlimited"])
+def test_gdal_contour_gt(gdal_contour_path, tmp_path, gt):
+
+    out_filename = str(tmp_path / "contour.gpkg")
+
+    gdaltest.runexternal(
+        gdal_contour_path
+        + f" -p -amin elev -amax elev2 -fl 76 112 441 -e 3 -gt {gt} ../gdrivers/data/n43.tif {out_filename}"
+    )
+
+    ds = ogr.Open(out_filename)
+
+    lyr = ds.ExecuteSQL("select elev, elev2 from contour order by elev asc")
+
+    # Raster min is 75, max is 460
+    expected_heights = [75, 76, 81, 112, 243, 441]
+
+    assert lyr.GetFeatureCount() == len(expected_heights)
diff --git a/autotest/utilities/test_gdal_create.py b/autotest/utilities/test_gdal_create.py
index dc85453edc8e..7e50e54df7f8 100755
--- a/autotest/utilities/test_gdal_create.py
+++ b/autotest/utilities/test_gdal_create.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2020, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -55,14 +39,14 @@ def gdal_create_path():
 ###############################################################################
 
 
-@pytest.mark.parametrize("burn", ("-burn 1 2", '-burn "1 2"', "-burn 1 -burn 2"))
+@pytest.mark.parametrize("burn", ("-burn 1.1 2", '-burn "1 2"', "-burn 1 -burn 2"))
 def test_gdal_create_pdf_tif(gdal_create_path, tmp_path, burn):
 
     output_tif = str(tmp_path / "tmp.tif")
 
     (_, err) = gdaltest.runexternal_out_and_err(
         gdal_create_path
-        + f" {output_tif} -bands 3 -outsize 1 2 -a_srs EPSG:4326 -a_ullr 2 50 3 49 -a_nodata 5 {burn} -ot UInt16 -co COMPRESS=DEFLATE -mo FOO=BAR"
+        + f" -bands 3 -outsize 1 2 -a_srs EPSG:4326 -a_ullr 2 50 3 49 -a_nodata 5 {burn} -ot UInt16 -co COMPRESS=DEFLATE -mo FOO=BAR  {output_tif}"
     )
     assert err is None or err == "", "got error/warning"
 
@@ -222,6 +206,10 @@ def test_gdal_create_input_file_overrrides(gdal_create_path, tmp_path):
 ###############################################################################
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdal_create_input_file_gcps(gdal_create_path, tmp_path):
 
     output_tif = str(tmp_path / "tmp.tif")
diff --git a/autotest/utilities/test_gdal_footprint.py b/autotest/utilities/test_gdal_footprint.py
index 75661c891056..bb24662d55f4 100755
--- a/autotest/utilities/test_gdal_footprint.py
+++ b/autotest/utilities/test_gdal_footprint.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
@@ -53,6 +37,7 @@ def gdal_footprint_path():
 ###############################################################################
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_footprint_basic(gdal_footprint_path, tmp_path):
 
     footprint_json = str(tmp_path / "out_footprint.json")
diff --git a/autotest/utilities/test_gdal_footprint_lib.py b/autotest/utilities/test_gdal_footprint_lib.py
index b82f9de9ead9..2b80576444c4 100755
--- a/autotest/utilities/test_gdal_footprint_lib.py
+++ b/autotest/utilities/test_gdal_footprint_lib.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import collections
@@ -123,10 +107,11 @@ def test_gdal_footprint_lib_destSRS():
 #
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_footprint_lib_inline_geojson():
 
     ret = gdal.Footprint("", "../gcore/data/byte.tif", format="GeoJSON")
-    assert type(ret) == dict
+    assert isinstance(ret, dict)
     assert ret["crs"]["properties"]["name"] == "urn:ogc:def:crs:OGC:1.3:CRS84"
 
 
@@ -134,6 +119,7 @@ def test_gdal_footprint_lib_inline_geojson():
 #
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_footprint_lib_inline_wkt():
 
     ret = gdal.Footprint("", "../gcore/data/byte.tif", format="WKT")
diff --git a/autotest/utilities/test_gdal_grid.py b/autotest/utilities/test_gdal_grid.py
index 554e95395855..48ebb0a0a9d7 100755
--- a/autotest/utilities/test_gdal_grid.py
+++ b/autotest/utilities/test_gdal_grid.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import struct
diff --git a/autotest/utilities/test_gdal_grid_lib.py b/autotest/utilities/test_gdal_grid_lib.py
index 6ad09bd42d45..2c25a4a18258 100755
--- a/autotest/utilities/test_gdal_grid_lib.py
+++ b/autotest/utilities/test_gdal_grid_lib.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2008-2015, Even Rouault <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import array
@@ -175,6 +159,7 @@ def test_gdal_grid_lib_2(tmp_vsimem, env):
 
 # May fail on minimum builds without qhull
 @gdaltest.disable_exceptions()
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_3():
 
     wkt = "POLYGON ((37.3495241627097 55.6901648563184 187.680953979492,37.349543273449 55.6901565410051 187.714370727539,37.3495794832707 55.6901531392856 187.67333984375,37.3496210575104 55.6901595647556 187.6396484375,37.3496398329735 55.6901716597552 187.596603393555,37.3496726900339 55.6901780852222 187.681350708008,37.3496793955565 55.6901829988139 187.933898925781,37.3496921360493 55.6901860225623 187.934280395508,37.3497162759304 55.6902037870796 187.435394287109,37.3497484624386 55.6902094566047 187.515319824219,37.3497618734837 55.6902241973661 190.329940795898,37.3497511446476 55.690238560154 190.345748901367,37.3497404158115 55.6902567026153 190.439697265625,37.3497142642736 55.6902650179072 189.086044311523,37.349688783288 55.6902608602615 187.763305664062,37.3496626317501 55.6902468754498 187.53678894043,37.3496378213167 55.6902412059301 187.598648071289,37.3496103286743 55.6902400720261 187.806274414062,37.3495902121067 55.6902313787607 187.759521484375,37.3495734483004 55.6902177719067 187.578125,37.349532879889 55.6902035980954 187.56965637207,37.3495161160827 55.6901939599008 187.541793823242,37.3495187982917 55.6901754394418 187.610427856445,37.3495241627097 55.6901648563184 187.680953979492))"
@@ -227,6 +212,7 @@ def _shift_by(geom, dx, dy):
 
 
 @pytest.mark.parametrize("alg", ["invdist", "invdistnn"])
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_invdistnn_quadrant_all_params(alg):
 
     wkt = "MULTIPOINT(0.5 0.5 10,-0.5 0.5 10,-0.5 -0.5 10,0.5 -0.5 10,1 0 100000000)"
@@ -253,6 +239,7 @@ def test_gdal_grid_lib_invdistnn_quadrant_all_params(alg):
 
 
 @pytest.mark.parametrize("alg", ["invdist", "invdistnn"])
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_invdistnn_quadrant_insufficient_radius(alg):
 
     wkt = "MULTIPOINT(0.5 0.5 10,-0.5 0.5 10,-0.5 -0.5 10,0.5 -0.5 10)"
@@ -272,6 +259,7 @@ def test_gdal_grid_lib_invdistnn_quadrant_insufficient_radius(alg):
     _compare_arrays(ds, [[0.0]])  # insufficient radius. should be > sqrt(2)
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_invdistnn_quadrant_min_points_not_reached():
 
     wkt = "MULTIPOINT(0.5 0.5 10,-0.5 0.5 10,-0.5 -0.5 10,0.5 -0.5 10)"
@@ -291,6 +279,7 @@ def test_gdal_grid_lib_invdistnn_quadrant_min_points_not_reached():
     _compare_arrays(ds, [[0.0]])
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_invdistnn_quadrant_missing_point_in_one_quadrant():
 
     # Missing point in 0.5 -0.5 quadrant
@@ -311,6 +300,7 @@ def test_gdal_grid_lib_invdistnn_quadrant_missing_point_in_one_quadrant():
     _compare_arrays(ds, [[0.0]])
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_invdistnn_quadrant_ignore_extra_points():
 
     wkt = "MULTIPOINT(0.5 0.5 10,-0.5 0.5 10,-0.5 -0.5 10,0.5 -0.5 10,1 0 100000000)"
@@ -341,6 +331,7 @@ def test_gdal_grid_lib_invdistnn_quadrant_ignore_extra_points():
     _compare_arrays(ds, [[10.0]])
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_average_quadrant_all_params():
 
     wkt = "MULTIPOINT(0.5 0.5 10,-0.5 0.5 10,-0.5 -0.5 10,0.5 -0.5 10,1 0 100)"
@@ -362,6 +353,7 @@ def test_gdal_grid_lib_average_quadrant_all_params():
     _compare_arrays(ds, [[expected_val]])
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_average_quadrant_insufficient_radius():
 
     wkt = "MULTIPOINT(0.5 0.5 10,-0.5 0.5 10,-0.5 -0.5 10,0.5 -0.5 10)"
@@ -381,6 +373,7 @@ def test_gdal_grid_lib_average_quadrant_insufficient_radius():
     _compare_arrays(ds, [[0.0]])  # insufficient radius. should be > sqrt(2)
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_average_quadrant_min_points_not_reached():
 
     wkt = "MULTIPOINT(0.5 0.5 10,-0.5 0.5 10,-0.5 -0.5 10,0.5 -0.5 10)"
@@ -400,6 +393,7 @@ def test_gdal_grid_lib_average_quadrant_min_points_not_reached():
     _compare_arrays(ds, [[0.0]])
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_average_quadrant_missing_point_in_one_quadrant():
 
     # Missing point in 0.5 -0.5 quadrant
@@ -420,6 +414,7 @@ def test_gdal_grid_lib_average_quadrant_missing_point_in_one_quadrant():
     _compare_arrays(ds, [[0.0]])
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_average_quadrant_ignore_extra_points():
 
     wkt = "MULTIPOINT(0.5 0.5 10,-0.5 0.5 10,-0.5 -0.5 10,0.5 -0.5 10,1 0 100000000)"
@@ -450,6 +445,7 @@ def test_gdal_grid_lib_average_quadrant_ignore_extra_points():
     _compare_arrays(ds, [[10.0]])
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_minimum_quadrant_all_params():
 
     wkt = "MULTIPOINT(0.5 0.5 10,-0.5 0.5 10,-0.5 -0.5 10,0.5 -0.5 9,1 0 5)"
@@ -469,6 +465,7 @@ def test_gdal_grid_lib_minimum_quadrant_all_params():
     _compare_arrays(ds, [[5.0]])
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_minimum_quadrant_insufficient_radius():
 
     wkt = "MULTIPOINT(0.5 0.5 10,-0.5 0.5 10,-0.5 -0.5 10,0.5 -0.5 10)"
@@ -488,6 +485,7 @@ def test_gdal_grid_lib_minimum_quadrant_insufficient_radius():
     _compare_arrays(ds, [[0.0]])  # insufficient radius. should be > sqrt(2)
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_minimum_quadrant_min_points_not_reached():
 
     wkt = "MULTIPOINT(0.5 0.5 10,-0.5 0.5 10,-0.5 -0.5 10,0.5 -0.5 10)"
@@ -507,6 +505,7 @@ def test_gdal_grid_lib_minimum_quadrant_min_points_not_reached():
     _compare_arrays(ds, [[0.0]])
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_minimum_quadrant_missing_point_in_one_quadrant():
 
     # Missing point in 0.5 -0.5 quadrant
@@ -527,6 +526,7 @@ def test_gdal_grid_lib_minimum_quadrant_missing_point_in_one_quadrant():
     _compare_arrays(ds, [[0.0]])
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_minimum_quadrant_ignore_extra_points():
 
     wkt = "MULTIPOINT(0.5 0.5 10,-0.5 0.5 10,-0.5 -0.5 10,0.5 -0.5 10,1 0 1)"
@@ -546,6 +546,7 @@ def test_gdal_grid_lib_minimum_quadrant_ignore_extra_points():
     _compare_arrays(ds, [[10.0]])
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_maximum_quadrant_all_params():
 
     wkt = "MULTIPOINT(0.5 0.5 10,-0.5 0.5 10,-0.5 -0.5 10,0.5 -0.5 11,1 0 50)"
@@ -565,6 +566,7 @@ def test_gdal_grid_lib_maximum_quadrant_all_params():
     _compare_arrays(ds, [[50.0]])
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_maximum_quadrant_insufficient_radius():
 
     wkt = "MULTIPOINT(0.5 0.5 10,-0.5 0.5 10,-0.5 -0.5 10,0.5 -0.5 10)"
@@ -584,6 +586,7 @@ def test_gdal_grid_lib_maximum_quadrant_insufficient_radius():
     _compare_arrays(ds, [[0.0]])  # insufficient radius. should be > sqrt(2)
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_maximum_quadrant_min_points_not_reached():
 
     wkt = "MULTIPOINT(0.5 0.5 10,-0.5 0.5 10,-0.5 -0.5 10,0.5 -0.5 10)"
@@ -603,6 +606,7 @@ def test_gdal_grid_lib_maximum_quadrant_min_points_not_reached():
     _compare_arrays(ds, [[0.0]])
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_maximum_quadrant_missing_point_in_one_quadrant():
 
     # Missing point in 0.5 -0.5 quadrant
@@ -623,6 +627,7 @@ def test_gdal_grid_lib_maximum_quadrant_missing_point_in_one_quadrant():
     _compare_arrays(ds, [[0.0]])
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_maximum_quadrant_ignore_extra_points():
 
     wkt = "MULTIPOINT(0.5 0.5 10,-0.5 0.5 10,-0.5 -0.5 10,0.5 -0.5 10,1 0 100)"
@@ -642,6 +647,7 @@ def test_gdal_grid_lib_maximum_quadrant_ignore_extra_points():
     _compare_arrays(ds, [[10.0]])
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_range_quadrant_all_params():
 
     wkt = "MULTIPOINT(0.5 0.5 10,-0.5 0.5 10,-0.5 -0.5 10,0.5 -0.5 1,1 0 50)"
@@ -661,6 +667,7 @@ def test_gdal_grid_lib_range_quadrant_all_params():
     _compare_arrays(ds, [[50.0 - 1.0]])
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_range_quadrant_insufficient_radius():
 
     wkt = "MULTIPOINT(0.5 0.5 10,-0.5 0.5 10,-0.5 -0.5 10,0.5 -0.5 0)"
@@ -680,6 +687,7 @@ def test_gdal_grid_lib_range_quadrant_insufficient_radius():
     _compare_arrays(ds, [[0.0]])  # insufficient radius. should be > sqrt(2)
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_range_quadrant_min_points_not_reached():
 
     wkt = "MULTIPOINT(0.5 0.5 10,-0.5 0.5 10,-0.5 -0.5 10,0.5 -0.5 0)"
@@ -699,6 +707,7 @@ def test_gdal_grid_lib_range_quadrant_min_points_not_reached():
     _compare_arrays(ds, [[0.0]])
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_range_quadrant_missing_point_in_one_quadrant():
 
     # Missing point in 0.5 -0.5 quadrant
@@ -719,6 +728,7 @@ def test_gdal_grid_lib_range_quadrant_missing_point_in_one_quadrant():
     _compare_arrays(ds, [[0.0]])
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_range_quadrant_ignore_extra_points():
 
     wkt = "MULTIPOINT(0.5 0.5 10,-0.5 0.5 10,-0.5 -0.5 10,0.5 -0.5 1,1 0 100)"
@@ -738,6 +748,7 @@ def test_gdal_grid_lib_range_quadrant_ignore_extra_points():
     _compare_arrays(ds, [[9.0]])
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_count_quadrant_all_params():
 
     wkt = "MULTIPOINT(0.5 0.5 10,-0.5 0.5 10,-0.5 -0.5 10,0.5 -0.5 1,1 0 50)"
@@ -757,6 +768,7 @@ def test_gdal_grid_lib_count_quadrant_all_params():
     _compare_arrays(ds, [[5]])
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_count_quadrant_insufficient_radius():
 
     wkt = "MULTIPOINT(0.5 0.5 10,-0.5 0.5 10,-0.5 -0.5 10,0.5 -0.5 0)"
@@ -776,6 +788,7 @@ def test_gdal_grid_lib_count_quadrant_insufficient_radius():
     _compare_arrays(ds, [[0.0]])  # insufficient radius. should be > sqrt(2)
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_count_quadrant_min_points_not_reached():
 
     wkt = "MULTIPOINT(0.5 0.5 10,-0.5 0.5 10,-0.5 -0.5 10,0.5 -0.5 0)"
@@ -795,6 +808,7 @@ def test_gdal_grid_lib_count_quadrant_min_points_not_reached():
     _compare_arrays(ds, [[0.0]])
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_count_quadrant_missing_point_in_one_quadrant():
 
     # Missing point in 0.5 -0.5 quadrant
@@ -815,6 +829,7 @@ def test_gdal_grid_lib_count_quadrant_missing_point_in_one_quadrant():
     _compare_arrays(ds, [[0.0]])
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_count_quadrant_ignore_extra_points():
 
     wkt = "MULTIPOINT(0.5 0.5 10,-0.5 0.5 10,-0.5 -0.5 10,0.5 -0.5 1,1 0 100)"
@@ -834,6 +849,7 @@ def test_gdal_grid_lib_count_quadrant_ignore_extra_points():
     _compare_arrays(ds, [[4.0]])
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_average_distance_quadrant_all_params():
 
     wkt = "MULTIPOINT(0.5 0.5 10,-0.5 0.5 10,-0.5 -0.5 10,0.5 -0.5 1,1 0 50)"
@@ -855,6 +871,7 @@ def test_gdal_grid_lib_average_distance_quadrant_all_params():
     _compare_arrays(ds, [[expected_val]])
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_average_distance_quadrant_insufficient_radius():
 
     wkt = "MULTIPOINT(0.5 0.5 10,-0.5 0.5 10,-0.5 -0.5 10,0.5 -0.5 0)"
@@ -874,6 +891,7 @@ def test_gdal_grid_lib_average_distance_quadrant_insufficient_radius():
     _compare_arrays(ds, [[0.0]])  # insufficient radius. should be > sqrt(2)
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_average_distance_quadrant_min_points_not_reached():
 
     wkt = "MULTIPOINT(0.5 0.5 10,-0.5 0.5 10,-0.5 -0.5 10,0.5 -0.5 0)"
@@ -893,6 +911,7 @@ def test_gdal_grid_lib_average_distance_quadrant_min_points_not_reached():
     _compare_arrays(ds, [[0.0]])
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_average_distance_quadrant_missing_point_in_one_quadrant():
 
     # Missing point in 0.5 -0.5 quadrant
@@ -913,6 +932,7 @@ def test_gdal_grid_lib_average_distance_quadrant_missing_point_in_one_quadrant()
     _compare_arrays(ds, [[0.0]])
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdal_grid_lib_average_distance_quadrant_ignore_extra_points():
 
     wkt = "MULTIPOINT(0.5 0.5 10,-0.5 0.5 10,-0.5 -0.5 10,0.5 -0.5 1,1 0 100)"
diff --git a/autotest/utilities/test_gdal_rasterize.py b/autotest/utilities/test_gdal_rasterize.py
index fa4c510f93be..bb81108e3e4b 100755
--- a/autotest/utilities/test_gdal_rasterize.py
+++ b/autotest/utilities/test_gdal_rasterize.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.com>
 # Copyright (c) 2008, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
@@ -56,6 +40,7 @@ def gdal_rasterize_path():
 # Simple polygon rasterization (adapted from alg/rasterize.py).
 
 
+@pytest.mark.require_driver("MapInfo File")
 def test_gdal_rasterize_1(gdal_rasterize_path, tmp_path):
 
     output_tif = str(tmp_path / "rast1.tif")
@@ -425,7 +410,7 @@ def test_gdal_rasterize_8(gdal_rasterize_path, tmp_path):
     f.write('"LINESTRING (0 0, 5 5, 10 0, 10 10)",1'.encode("ascii"))
     f.close()
 
-    cmds = f"""{input_csv} {output_tif} -init 0 -burn 1 -tr 1 1"""
+    cmds = f"""{input_csv} {output_tif} -tr 1 1 -init 0 -burn 1"""
 
     gdaltest.runexternal(gdal_rasterize_path + " " + cmds)
 
diff --git a/autotest/utilities/test_gdal_rasterize_lib.py b/autotest/utilities/test_gdal_rasterize_lib.py
index b2669d966a87..bc44636d5fc2 100755
--- a/autotest/utilities/test_gdal_rasterize_lib.py
+++ b/autotest/utilities/test_gdal_rasterize_lib.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot com>
 # Copyright (c) 2008, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import collections
@@ -712,12 +696,16 @@ def test_gdal_rasterize_lib_int64_attribute():
     feature["val"] = val
     layer.CreateFeature(feature)
 
+    noData = -(1 << 63)
     target_ds = gdal.Rasterize(
-        "", vector_ds, format="MEM", attribute="val", width=2, height=2
+        "", vector_ds, format="MEM", attribute="val", width=2, height=3, noData=noData
     )
     assert target_ds is not None
+    assert target_ds.RasterXSize == 2
+    assert target_ds.RasterYSize == 3
     assert target_ds.GetRasterBand(1).DataType == gdal.GDT_Int64
-    assert struct.unpack("Q" * 4, target_ds.ReadRaster())[0] == val
+    assert target_ds.GetRasterBand(1).GetNoDataValue() == noData
+    assert struct.unpack("Q", target_ds.ReadRaster(0, 0, 1, 1))[0] == val
 
 
 ###############################################################################
@@ -790,3 +778,38 @@ def test_gdal_rasterize_lib_dict_arguments():
     ind = opt.index("-co")
 
     assert opt[ind : ind + 4] == ["-co", "COMPRESS=DEFLATE", "-co", "LEVEL=4"]
+
+
+###############################################################################
+# Test doesn't crash without options
+
+
+@pytest.mark.require_driver("GeoJSON")
+def test_gdal_rasterize_no_options(tmp_vsimem):
+    """Test doesn't crash without options"""
+
+    gdal.FileFromMemBuffer(
+        tmp_vsimem / "test.json",
+        r"""{
+                "type": "FeatureCollection",
+                "name": "test",
+                "crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:EPSG::4326" } },
+                "features": [
+                    { "type": "Feature", "properties": { "id": 1 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 0, 0 ], [ 0, 1 ], [ 1, 1 ], [ 1, 0 ], [ 0, 0 ] ] ] } }
+                ]
+            }""",
+    )
+
+    # Open the dataset
+    ds = gdal.OpenEx(tmp_vsimem / "test.json", gdal.OF_VECTOR)
+    assert ds
+
+    # Create a raster to rasterize into.
+    target_ds = gdal.GetDriverByName("GTiff").Create(
+        tmp_vsimem / "out.tif", 10, 10, 1, gdal.GDT_Byte
+    )
+
+    assert target_ds
+
+    # Call rasterize
+    ds = gdal.Rasterize(target_ds, ds)
diff --git a/autotest/utilities/test_gdal_translate.py b/autotest/utilities/test_gdal_translate.py
index 20f9bee8a27b..4e21ee3883d9 100755
--- a/autotest/utilities/test_gdal_translate.py
+++ b/autotest/utilities/test_gdal_translate.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -420,6 +404,10 @@ def test_gdal_translate_15(gdal_translate_path, tmp_path):
 # Test -of VRT which is a special case
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdal_translate_16(gdal_translate_path, tmp_path):
 
     dst_vrt = str(tmp_path / "test16.vrt")
@@ -440,6 +428,10 @@ def test_gdal_translate_16(gdal_translate_path, tmp_path):
 # Test -expand option to VRT
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 @pytest.mark.require_driver("GIF")
 def test_gdal_translate_17(gdal_translate_path, tmp_path):
 
@@ -483,6 +475,10 @@ def test_gdal_translate_17(gdal_translate_path, tmp_path):
 # Test translation of a VRT made of VRT
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 @pytest.mark.require_driver("BMP")
 def test_gdal_translate_18(gdal_translate_path, tmp_path):
 
@@ -569,6 +565,7 @@ def test_gdal_translate_20(gdal_translate_path, tmp_path):
 # in that case, they must be copied
 
 
+@pytest.mark.require_driver("HFA")
 def test_gdal_translate_21(gdal_translate_path, tmp_path):
 
     dst_img = str(tmp_path / "test_gdal_translate_21.img")
@@ -594,6 +591,7 @@ def test_gdal_translate_21(gdal_translate_path, tmp_path):
 # in that case, they must *NOT* be copied
 
 
+@pytest.mark.require_driver("HFA")
 def test_gdal_translate_22(gdal_translate_path, tmp_path):
 
     dst_img = str(tmp_path / "test_gdal_translate_22.img")
@@ -662,6 +660,7 @@ def test_gdal_translate_24(gdal_translate_path, tmp_path):
 # Test -norat
 
 
+@pytest.mark.require_driver("HFA")
 def test_gdal_translate_25(gdal_translate_path, tmp_path):
 
     dst_tif = str(tmp_path / "test_gdal_translate_25.tif")
@@ -781,6 +780,10 @@ def test_gdal_translate_28(gdal_translate_path, tmp_path):
 # Test -r
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdal_translate_29(gdal_translate_path, tmp_path):
 
     dst_tif = str(tmp_path / "test_gdal_translate_29.tif")
@@ -872,16 +875,32 @@ def test_gdal_translate_32(gdal_translate_path, tmp_path):
 
     dst_tif = str(tmp_path / "out.tif")
 
+    src_ds = gdal.Open("../gcore/data/byte_rpc.tif")
+    src_md = src_ds.GetMetadata("RPC")
+    srcxoff = 1
+    srcyoff = 2
+    srcwidth = 13
+    srcheight = 14
+    widthratio = 200
+    heightratio = 300
     gdaltest.runexternal(
-        f"{gdal_translate_path} ../gcore/data/byte_rpc.tif {dst_tif} -srcwin 1 2 13 14 -outsize 150% 300%"
+        f"{gdal_translate_path} ../gcore/data/byte_rpc.tif {dst_tif} -srcwin {srcxoff} {srcyoff} {srcwidth} {srcheight} -outsize {widthratio}% {heightratio}%"
     )
+    widthratio /= 100.0
+    heightratio /= 100.0
     ds = gdal.Open(dst_tif)
     md = ds.GetMetadata("RPC")
-    assert (
-        float(md["LINE_OFF"]) == pytest.approx(47496, abs=1e-5)
-        and float(md["LINE_SCALE"]) == pytest.approx(47502, abs=1e-5)
-        and float(md["SAMP_OFF"]) == pytest.approx(19676.6923076923, abs=1e-5)
-        and float(md["SAMP_SCALE"]) == pytest.approx(19678.1538461538, abs=1e-5)
+    assert float(md["LINE_OFF"]) == pytest.approx(
+        (float(src_md["LINE_OFF"]) - srcyoff + 0.5) * heightratio - 0.5, abs=1e-5
+    )
+    assert float(md["LINE_SCALE"]) == pytest.approx(
+        float(src_md["LINE_SCALE"]) * heightratio, abs=1e-5
+    )
+    assert float(md["SAMP_OFF"]) == pytest.approx(
+        (float(src_md["SAMP_OFF"]) - srcxoff + 0.5) * widthratio - 0.5, abs=1e-5
+    )
+    assert float(md["SAMP_SCALE"]) == pytest.approx(
+        float(src_md["SAMP_SCALE"]) * widthratio, abs=1e-5
     )
 
 
@@ -946,6 +965,10 @@ def test_gdal_translate_33ter(gdal_translate_path, tmp_path):
 # Test NBITS is preserved
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdal_translate_34(gdal_translate_path, tmp_path):
 
     dst_vrt = str(tmp_path / "test_gdal_translate_34.vrt")
@@ -991,6 +1014,7 @@ def test_gdal_translate_35(gdal_translate_path, tmp_vsimem):
 # Test RAT is copied from hfa to gtiff - continuous/athematic
 
 
+@pytest.mark.require_driver("HFA")
 def test_gdal_translate_36(gdal_translate_path, tmp_path):
 
     dst_tif = str(tmp_path / "test_gdal_translate_36.tif")
@@ -1016,6 +1040,7 @@ def test_gdal_translate_36(gdal_translate_path, tmp_path):
 # Test RAT is copied from hfa to gtiff - thematic
 
 
+@pytest.mark.require_driver("HFA")
 def test_gdal_translate_37(gdal_translate_path, tmp_path):
 
     dst1_tif = str(tmp_path / "test_gdal_translate_37.tif")
diff --git a/autotest/utilities/test_gdal_translate_lib.py b/autotest/utilities/test_gdal_translate_lib.py
index 8948856bd329..e16e741c5333 100755
--- a/autotest/utilities/test_gdal_translate_lib.py
+++ b/autotest/utilities/test_gdal_translate_lib.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2015, Faza Mahamood <fazamhd at gmail dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import collections
@@ -292,6 +276,18 @@ def test_gdal_translate_lib_nodata_int64():
     ds = None
 
 
+###############################################################################
+# Test nodata=-inf
+
+
+def test_gdal_translate_lib_nodata_minus_inf():
+
+    ds = gdal.Translate(
+        "", "../gcore/data/float32.tif", format="MEM", noData=float("-inf")
+    )
+    assert ds.GetRasterBand(1).GetNoDataValue() == float("-inf"), "Bad nodata value"
+
+
 ###############################################################################
 # Test srcWin option
 
@@ -585,6 +581,10 @@ def test_gdal_translate_lib_104():
 # Test GCPs propagation in "VRT path"
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdal_translate_lib_gcp_vrt_path():
 
     src_ds = gdal.Open("../gcore/data/gcps.vrt")
@@ -601,6 +601,10 @@ def test_gdal_translate_lib_gcp_vrt_path():
 # Test RPC propagation in "VRT path"
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdal_translate_lib_rcp_vrt_path():
 
     src_ds = gdal.Open("../gcore/data/rpc.vrt")
@@ -612,6 +616,10 @@ def test_gdal_translate_lib_rcp_vrt_path():
 # Test GeoLocation propagation in "VRT path"
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdal_translate_lib_geolocation_vrt_path(tmp_vsimem):
 
     src_ds = gdal.Open("../gcore/data/sstgeo.vrt")
@@ -1142,6 +1150,20 @@ def test_gdal_translate_lib_scale_and_unscale_incompatible():
         )
 
 
+###############################################################################
+# Test -a_offset -inf (dummy example, but to prove -inf works as a value
+# numeric value)
+
+
+@gdaltest.enable_exceptions()
+def test_gdal_translate_lib_assign_offset():
+
+    out_ds = gdal.Translate(
+        "", gdal.Open("../gcore/data/byte.tif"), options="-f MEM -a_offset -inf"
+    )
+    assert out_ds.GetRasterBand(1).GetOffset() == float("-inf")
+
+
 ###############################################################################
 # Test option argument handling
 
@@ -1255,11 +1277,15 @@ def test_gdal_translate_ovr_rpc():
     src_rpc = src_ds.GetMetadata("RPC")
     ovr_rpc = ds.GetMetadata("RPC")
     assert ovr_rpc
-    assert float(ovr_rpc["LINE_OFF"]) == pytest.approx(0.5 * float(src_rpc["LINE_OFF"]))
+    assert float(ovr_rpc["LINE_OFF"]) == pytest.approx(
+        0.5 * (float(src_rpc["LINE_OFF"]) + 0.5) - 0.5
+    )
     assert float(ovr_rpc["LINE_SCALE"]) == pytest.approx(
         0.5 * float(src_rpc["LINE_SCALE"])
     )
-    assert float(ovr_rpc["SAMP_OFF"]) == pytest.approx(0.5 * float(src_rpc["SAMP_OFF"]))
+    assert float(ovr_rpc["SAMP_OFF"]) == pytest.approx(
+        0.5 * (float(src_rpc["SAMP_OFF"]) + 0.5) - 0.5
+    )
     assert float(ovr_rpc["SAMP_SCALE"]) == pytest.approx(
         0.5 * float(src_rpc["SAMP_SCALE"])
     )
diff --git a/autotest/utilities/test_gdal_viewshed.py b/autotest/utilities/test_gdal_viewshed.py
index 5773a0b0279e..945ae886727d 100755
--- a/autotest/utilities/test_gdal_viewshed.py
+++ b/autotest/utilities/test_gdal_viewshed.py
@@ -10,27 +10,9 @@
 ###############################################################################
 # Copyright (c) 2020, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
-import struct
-
 import gdaltest
 import pytest
 import test_cli_utilities
@@ -68,7 +50,7 @@ def viewshed_input(tmp_path):
     gdaltest.runexternal(
         test_cli_utilities.get_gdalwarp_path()
         + " -t_srs EPSG:32617 -overwrite ../gdrivers/data/n43.tif "
-        + fname
+        + fname,
     )
 
     return fname
@@ -90,7 +72,7 @@ def test_gdal_viewshed(gdal_viewshed_path, tmp_path, viewshed_input):
     cs = ds.GetRasterBand(1).Checksum()
     nodata = ds.GetRasterBand(1).GetNoDataValue()
     ds = None
-    assert cs == 14613
+    assert cs == 14695
     assert nodata is None
 
 
@@ -118,7 +100,7 @@ def test_gdal_viewshed_non_earth_crs(
     cs = ds.GetRasterBand(1).Checksum()
     nodata = ds.GetRasterBand(1).GetNoDataValue()
     ds = None
-    assert cs == 14609
+    assert cs == 14691
     assert nodata is None
 
 
@@ -212,6 +194,131 @@ def test_gdal_viewshed_all_options(gdal_viewshed_path, tmp_path, viewshed_input)
     assert nodata == 0
 
 
+###############################################################################
+
+# NOTE: Various compilers (notably Intel), may give different values when
+#  doing floating point math (because of -ffast-math, for example).
+#  The test below checks that the COUNT of visible cells is the same, but it is
+#  not the case that the actual cells marked visible aren't different. That the
+#  count is the same is luck.  If changes are made or compilers/options change,
+#  the expected value in the test below may need to be changed/added to in order
+#  to accommodate all the compilers with a single test.  See
+#  ViewshedExecutor::setOutput for the comparison that is at issue.
+#
+def test_gdal_viewshed_cumulative(gdal_viewshed_path, tmp_path, viewshed_input):
+
+    np = pytest.importorskip("numpy")
+
+    viewshed_out = str(tmp_path / "test_gdal_viewshed_out.tif")
+
+    _, err = gdaltest.runexternal_out_and_err(
+        gdal_viewshed_path
+        + " -om ACCUM -f GTiff -os 5 -a_nodata 0 {} {}".format(
+            viewshed_input, viewshed_out
+        )
+    )
+    assert err is None or err == ""
+    ds = gdal.Open(viewshed_out)
+    assert ds
+    vis_count = np.count_nonzero(ds.GetRasterBand(1).ReadAsArray())
+    nodata = ds.GetRasterBand(1).GetNoDataValue()
+    ds = None
+    assert vis_count == 13448
+    assert nodata == 0
+
+
+###############################################################################
+
+
+def test_gdal_viewshed_value_options(gdal_viewshed_path, tmp_path, viewshed_input):
+
+    viewshed_out = str(tmp_path / "test_gdal_viewshed_out.tif")
+
+    _, err = gdaltest.runexternal_out_and_err(
+        gdal_viewshed_path
+        + " -om NORMAL -f GTiff -oz {} -ox {} -oy {} -b 1 -a_nodata 0 -iv 127 -vv 254 -ov 0 {} {}".format(
+            oz[1], ox[0], oy[0], viewshed_input, viewshed_out
+        )
+    )
+    assert err is None or err == ""
+    ds = gdal.Open(viewshed_out)
+    assert ds
+    cs = ds.GetRasterBand(1).Checksum()
+    nodata = ds.GetRasterBand(1).GetNoDataValue()
+    ds = None
+    assert cs == 35108
+    assert nodata == 0
+
+
+###############################################################################
+
+
+def test_gdal_viewshed_tz_option(gdal_viewshed_path, tmp_path, viewshed_input):
+
+    viewshed_out = str(tmp_path / "test_gdal_viewshed_out.tif")
+
+    _, err = gdaltest.runexternal_out_and_err(
+        gdal_viewshed_path
+        + " -om NORMAL -f GTiff -oz {} -ox {} -oy {} -b 1 -a_nodata 0 -tz 5 {} {}".format(
+            oz[1], ox[0], oy[0], viewshed_input, viewshed_out
+        )
+    )
+    assert err is None or err == ""
+    ds = gdal.Open(viewshed_out)
+    assert ds
+    cs = ds.GetRasterBand(1).Checksum()
+    nodata = ds.GetRasterBand(1).GetNoDataValue()
+    ds = None
+    assert cs == 33725
+    assert nodata == 0
+
+
+###############################################################################
+
+
+def test_gdal_viewshed_cc_option(gdal_viewshed_path, tmp_path, viewshed_input):
+
+    viewshed_out = str(tmp_path / "test_gdal_viewshed_out.tif")
+
+    _, err = gdaltest.runexternal_out_and_err(
+        gdal_viewshed_path
+        + " -om NORMAL -f GTiff -oz {} -ox {} -oy {} -b 1 -a_nodata 0 -cc 0 {} {}".format(
+            oz[1], ox[0], oy[0], viewshed_input, viewshed_out
+        )
+    )
+    assert err is None or err == ""
+    ds = gdal.Open(viewshed_out)
+    assert ds
+    cs = ds.GetRasterBand(1).Checksum()
+    nodata = ds.GetRasterBand(1).GetNoDataValue()
+    ds = None
+    assert cs == 17241
+    assert nodata == 0
+
+
+###############################################################################
+
+
+def test_gdal_viewshed_md_option(gdal_viewshed_path, tmp_path, viewshed_input):
+
+    viewshed_out = str(tmp_path / "test_gdal_viewshed_out.tif")
+
+    _, err = gdaltest.runexternal_out_and_err(
+        gdal_viewshed_path
+        + " -om NORMAL -f GTiff -oz {} -ox {} -oy {} -b 1 -a_nodata 0 -tz 5 -md 20000 {} {}".format(
+            oz[1], ox[0], oy[0], viewshed_input, viewshed_out
+        )
+    )
+    assert err is None or err == ""
+    ds = gdal.Open(viewshed_out)
+    assert ds
+    cs = ds.GetRasterBand(1).Checksum()
+    nodata = ds.GetRasterBand(1).GetNoDataValue()
+    ds = None
+    assert cs == 22617
+    assert nodata == 0
+
+
 ###############################################################################
 
 
@@ -240,7 +347,7 @@ def test_gdal_viewshed_missing_ox(gdal_viewshed_path):
     _, err = gdaltest.runexternal_out_and_err(
         gdal_viewshed_path + " /dev/null /dev/null"
     )
-    assert "-ox: required" in err
+    assert "Option -ox is required." in err
 
 
 ###############################################################################
@@ -251,7 +358,7 @@ def test_gdal_viewshed_missing_oy(gdal_viewshed_path):
     _, err = gdaltest.runexternal_out_and_err(
         gdal_viewshed_path + " -ox 0 /dev/null /dev/null"
     )
-    assert "-oy: required" in err
+    assert "Option -oy is required." in err
 
 
 ###############################################################################
@@ -279,17 +386,6 @@ def test_gdal_viewshed_invalid_band(gdal_viewshed_path, tmp_path):
 ###############################################################################
 
 
-def test_gdal_viewshed_invalid_observer_point(gdal_viewshed_path, tmp_path):
-
-    _, err = gdaltest.runexternal_out_and_err(
-        f"{gdal_viewshed_path} -ox 0 -oy 0 ../gdrivers/data/n43.tif {tmp_path}/tmp.tif"
-    )
-    assert "The observer location falls outside of the DEM area" in err
-
-
-###############################################################################
-
-
 def test_gdal_viewshed_invalid_output_driver(gdal_viewshed_path, tmp_path):
 
     _, err = gdaltest.runexternal_out_and_err(
@@ -350,47 +446,8 @@ def test_gdal_viewshed_south_up(gdal_viewshed_path, tmp_path, viewshed_input):
     assert ds.RasterXSize == width
     assert ds.RasterYSize == height
     assert ds.GetGeoTransform() == pytest.approx(expected_gt)
-    expected_data = (
-        255,
-        255,
-        255,
-        255,
-        255,
-        255,
-        255,  # end of line
-        255,
-        255,
-        0,
-        0,
-        0,
-        255,
-        255,  # end of line
-        255,
-        255,
-        255,
-        255,
-        255,
-        255,
-        255,  # end of line
-        255,
-        255,
-        0,
-        0,
-        0,
-        255,
-        255,  # end of line
-        255,
-        255,
-        255,
-        255,
-        255,
-        255,
-        255,
-    )
-    assert (
-        struct.unpack("B" * (width * height), ds.GetRasterBand(1).ReadRaster())
-        == expected_data
-    )
+    for val in ds.GetRasterBand(1).ReadRaster():
+        assert val == 255
 
     # Tested case with south-up dataset
     src_ds_south_up_filename = str(tmp_path / "test_gdal_viewshed_src_ds_south_up.tif")
@@ -420,7 +477,5 @@ def test_gdal_viewshed_south_up(gdal_viewshed_path, tmp_path, viewshed_input):
     assert ds.RasterXSize == width
     assert ds.RasterYSize == height
     assert ds.GetGeoTransform() == pytest.approx(expected_gt)
-    assert (
-        struct.unpack("B" * (width * height), ds.GetRasterBand(1).ReadRaster())
-        == expected_data
-    )
+    for val in ds.GetRasterBand(1).ReadRaster():
+        assert val == 255
diff --git a/autotest/utilities/test_gdaladdo.py b/autotest/utilities/test_gdaladdo.py
index 29f23085d3a8..b55a16dc61c7 100755
--- a/autotest/utilities/test_gdaladdo.py
+++ b/autotest/utilities/test_gdaladdo.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import array
@@ -54,6 +38,10 @@ def gdaladdo_path():
 # Similar to tiff_ovr_1
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdaladdo_1(gdaladdo_path, tmp_path):
 
     shutil.copy("../gcore/data/mfloat32.vrt", f"{tmp_path}/mfloat32.vrt")
@@ -230,6 +218,10 @@ def test_gdaladdo_partial_refresh_from_projwin(gdaladdo_path, tmp_path):
 # Test --partial-refresh-from-source-timestamp
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdaladdo_partial_refresh_from_source_timestamp(gdaladdo_path, tmp_path):
 
     left_tif = str(tmp_path / "left.tif")
@@ -284,6 +276,10 @@ def test_gdaladdo_partial_refresh_from_source_timestamp(gdaladdo_path, tmp_path)
 # Test --partial-refresh-from-source-extent
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdaladdo_partial_refresh_from_source_extent(gdaladdo_path, tmp_path):
 
     left_tif = str(tmp_path / "left.tif")
@@ -330,6 +326,10 @@ def test_gdaladdo_partial_refresh_from_source_extent(gdaladdo_path, tmp_path):
 # Test reuse of previous resampling method and overview levels
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 @pytest.mark.parametrize("read_only", [True, False])
 def test_gdaladdo_reuse_previous_resampling_and_levels(
     gdaladdo_path, tmp_path, read_only
@@ -382,8 +382,13 @@ def test_gdaladdo_reuse_previous_resampling_and_levels(
 
 
 @pytest.mark.require_driver("GPKG")
+@pytest.mark.require_driver("GTI")
 def test_gdaladdo_partial_refresh_from_source_timestamp_gti(gdaladdo_path, tmp_path):
 
+    gti_drv = gdal.GetDriverByName("GTI")
+    if gti_drv.GetMetadataItem("IS_PLUGIN"):
+        pytest.skip("Test skipped because GTI driver as a plugin")
+
     left_tif = str(tmp_path / "left.tif")
     right_tif = str(tmp_path / "right.tif")
 
diff --git a/autotest/utilities/test_gdalbuildvrt.py b/autotest/utilities/test_gdalbuildvrt.py
index 27b7756ee074..42e6b33aed7b 100755
--- a/autotest/utilities/test_gdalbuildvrt.py
+++ b/autotest/utilities/test_gdalbuildvrt.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
@@ -35,10 +19,16 @@
 
 from osgeo import gdal, osr
 
-pytestmark = pytest.mark.skipif(
-    test_cli_utilities.get_gdalbuildvrt_path() is None,
-    reason="gdalbuildvrt not available",
-)
+pytestmark = [
+    pytest.mark.skipif(
+        test_cli_utilities.get_gdalbuildvrt_path() is None,
+        reason="gdalbuildvrt not available",
+    ),
+    pytest.mark.skipif(
+        not gdaltest.vrt_has_open_support(),
+        reason="VRT driver open missing",
+    ),
+]
 
 
 @pytest.fixture(scope="module")
diff --git a/autotest/utilities/test_gdalbuildvrt_lib.py b/autotest/utilities/test_gdalbuildvrt_lib.py
index 94f449d1e282..1130ae6a1d37 100755
--- a/autotest/utilities/test_gdalbuildvrt_lib.py
+++ b/autotest/utilities/test_gdalbuildvrt_lib.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2016, Even Rouault <even dot rouault @ spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import pathlib
@@ -97,6 +81,10 @@ def test_gdalbuildvrt_lib_2():
 # Test creating overviews
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdalbuildvrt_lib_ovr(tmp_vsimem):
 
     tmpfilename = tmp_vsimem / "my.vrt"
@@ -280,15 +268,15 @@ def test_gdalbuildvrt_lib_separate_nodata_2(tmp_vsimem):
     src2_ds.GetRasterBand(1).SetNoDataValue(2)
 
     gdal.BuildVRT(
-        tmp_vsimem / "out.vrt", [src1_ds, src2_ds], separate=True, srcNodata="3 4"
+        tmp_vsimem / "out.vrt", [src1_ds, src2_ds], separate=True, srcNodata="-3 4"
     )
 
     f = gdal.VSIFOpenL(tmp_vsimem / "out.vrt", "rb")
     data = gdal.VSIFReadL(1, 10000, f)
     gdal.VSIFCloseL(f)
 
-    assert b"<NoDataValue>3</NoDataValue>" in data
-    assert b"<NODATA>3</NODATA>" in data
+    assert b"<NoDataValue>-3</NoDataValue>" in data
+    assert b"<NODATA>-3</NODATA>" in data
     assert b"<NoDataValue>4</NoDataValue>" in data
     assert b"<NODATA>4</NODATA>" in data
 
@@ -309,14 +297,14 @@ def test_gdalbuildvrt_lib_separate_nodata_3(tmp_vsimem):
         [src1_ds, src2_ds],
         separate=True,
         srcNodata="3 4",
-        VRTNodata="5 6",
+        VRTNodata="-5 6",
     )
 
     f = gdal.VSIFOpenL(tmp_vsimem / "out.vrt", "rb")
     data = gdal.VSIFReadL(1, 10000, f)
     gdal.VSIFCloseL(f)
 
-    assert b"<NoDataValue>5</NoDataValue>" in data
+    assert b"<NoDataValue>-5</NoDataValue>" in data
     assert b"<NODATA>3</NODATA>" in data
     assert b"<NoDataValue>6</NoDataValue>" in data
     assert b"<NODATA>4</NODATA>" in data
@@ -668,6 +656,12 @@ def test_gdalbuildvrt_lib_strict_mode():
 
 
 ###############################################################################
+
+
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdalbuildvrt_lib_te_touching_on_edge(tmp_vsimem):
 
     tmp_filename = tmp_vsimem / "test_gdalbuildvrt_lib_te_touching_on_edge.vrt"
@@ -794,6 +788,10 @@ def test_gdalbuildvrt_lib_nodataMaxMaskThreshold_rgba(tmp_vsimem):
 ###############################################################################
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdalbuildvrt_lib_nodataMaxMaskThreshold_rgb_mask(tmp_vsimem):
 
     # UInt16, VRTNodata=0
diff --git a/autotest/utilities/test_gdaldem.py b/autotest/utilities/test_gdaldem.py
index 8372008cd1b4..1c934c8f272a 100755
--- a/autotest/utilities/test_gdaldem.py
+++ b/autotest/utilities/test_gdaldem.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -381,6 +365,10 @@ def test_gdaldem_color_relief_cpt(gdaldem_path, tmp_path):
 # Test gdaldem color relief to VRT
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdaldem_color_relief_vrt(gdaldem_path, n43_colorrelief_tif, tmp_path):
 
     output_vrt = str(tmp_path / "n43_colorrelief.vrt")
@@ -518,6 +506,10 @@ def test_gdaldem_color_relief_nearest_color_entry(gdaldem_path, tmp_path):
 # Test gdaldem color relief with -nearest_color_entry and -of VRT
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdaldem_color_relief_nearest_color_entry_vrt(gdaldem_path, tmp_path):
 
     output_vrt = str(tmp_path / "n43_colorrelief_nearest.vrt")
@@ -584,6 +576,10 @@ def test_gdaldem_color_relief_nodata_nan(gdaldem_path, tmp_path):
 # Test gdaldem color relief with entries with repeated DEM values in the color table (#6422)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 @pytest.mark.require_driver("AAIGRID")
 def test_gdaldem_color_relief_repeated_entry(gdaldem_path, tmp_path):
 
diff --git a/autotest/utilities/test_gdaldem_lib.py b/autotest/utilities/test_gdaldem_lib.py
index 101ff987b22b..f7254e2280e5 100755
--- a/autotest/utilities/test_gdaldem_lib.py
+++ b/autotest/utilities/test_gdaldem_lib.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2015, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import collections
@@ -469,7 +453,7 @@ def test_gdaldem_lib_color_relief():
         colorFilename="data/color_file.txt",
         colorSelection="exact_color_entry",
     )
-    assert ds.GetRasterBand(1).Checksum() == 0
+    assert ds.GetRasterBand(1).Checksum() == 8073
 
     ds = gdal.DEMProcessing(
         "",
@@ -526,6 +510,90 @@ def test_gdaldem_lib_color_relief_nodata_value(tmp_vsimem):
     gdal.Unlink(colorFilename)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
+@pytest.mark.parametrize(
+    "colorSelection",
+    ["nearest_color_entry", "exact_color_entry", "linear_interpolation"],
+)
+@pytest.mark.parametrize("format", ["MEM", "VRT"])
+def test_gdaldem_lib_color_relief_synthetic(tmp_path, colorSelection, format):
+
+    src_filename = "" if format == "MEM" else str(tmp_path / "in.tif")
+    src_ds = gdal.GetDriverByName("MEM" if format == "MEM" else "GTiff").Create(
+        src_filename, 4, 1
+    )
+    src_ds.GetRasterBand(1).SetNoDataValue(0)
+    src_ds.GetRasterBand(1).WriteRaster(0, 0, 4, 1, b"\x00\x01\x02\x03")
+    if format != "MEM":
+        src_ds.Close()
+        src_ds = gdal.Open(src_filename)
+    colorFilename = tmp_path / "color_file.txt"
+    with open(colorFilename, "wb") as f:
+        f.write(b"""0 0 0 0\n1 10 11 12\n2 20 21 22\n3 30 31 32\n""")
+
+    out_filename = "" if format == "MEM" else str(tmp_path / "out.vrt")
+    ds = gdal.DEMProcessing(
+        out_filename,
+        src_ds,
+        "color-relief",
+        format=format,
+        colorFilename=colorFilename,
+        colorSelection=colorSelection,
+    )
+    if format != "MEM":
+        ds.Close()
+        ds = gdal.Open(out_filename)
+    assert struct.unpack("B" * 4, ds.GetRasterBand(1).ReadRaster()) == (0, 10, 20, 30)
+    assert struct.unpack("B" * 4, ds.GetRasterBand(2).ReadRaster()) == (0, 11, 21, 31)
+    assert struct.unpack("B" * 4, ds.GetRasterBand(3).ReadRaster()) == (0, 12, 22, 32)
+
+
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
+@pytest.mark.parametrize(
+    "colorSelection",
+    ["nearest_color_entry", "exact_color_entry", "linear_interpolation"],
+)
+@pytest.mark.parametrize("format", ["MEM", "VRT"])
+def test_gdaldem_lib_color_relief_synthetic_nodata_255(
+    tmp_path, colorSelection, format
+):
+
+    src_filename = "" if format == "MEM" else str(tmp_path / "in.tif")
+    src_ds = gdal.GetDriverByName("MEM" if format == "MEM" else "GTiff").Create(
+        src_filename, 4, 1
+    )
+    src_ds.GetRasterBand(1).SetNoDataValue(255)
+    src_ds.GetRasterBand(1).WriteRaster(0, 0, 4, 1, b"\x00\x01\x02\xFF")
+    if format != "MEM":
+        src_ds.Close()
+        src_ds = gdal.Open(src_filename)
+    colorFilename = tmp_path / "color_file.txt"
+    with open(colorFilename, "wb") as f:
+        f.write(b"""0 0 1 2\n1 10 11 12\n2 20 21 22\n255 255 255 255\n""")
+
+    out_filename = "" if format == "MEM" else str(tmp_path / "out.vrt")
+    ds = gdal.DEMProcessing(
+        out_filename,
+        src_ds,
+        "color-relief",
+        format=format,
+        colorFilename=colorFilename,
+        colorSelection=colorSelection,
+    )
+    if format != "MEM":
+        ds.Close()
+        ds = gdal.Open(out_filename)
+    assert struct.unpack("B" * 4, ds.GetRasterBand(1).ReadRaster()) == (0, 10, 20, 255)
+    assert struct.unpack("B" * 4, ds.GetRasterBand(2).ReadRaster()) == (1, 11, 21, 255)
+    assert struct.unpack("B" * 4, ds.GetRasterBand(3).ReadRaster()) == (2, 12, 22, 255)
+
+
 ###############################################################################
 # Test gdaldem tpi
 
diff --git a/autotest/utilities/test_gdalinfo.py b/autotest/utilities/test_gdalinfo.py
index c3857c716b0f..744f1bdb34e1 100755
--- a/autotest/utilities/test_gdalinfo.py
+++ b/autotest/utilities/test_gdalinfo.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import json
@@ -124,6 +108,7 @@ def test_gdalinfo_5(gdalinfo_path, tmp_path):
 # Test a dataset with overviews and RAT
 
 
+@pytest.mark.require_driver("HFA")
 def test_gdalinfo_6(gdalinfo_path):
 
     ret = gdaltest.runexternal(gdalinfo_path + " ../gdrivers/data/hfa/int.img")
@@ -135,6 +120,10 @@ def test_gdalinfo_6(gdalinfo_path):
 # Test a dataset with GCPs
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdalinfo_7(gdalinfo_path):
 
     ret = gdaltest.runexternal(
@@ -343,6 +332,25 @@ def test_gdalinfo_20(gdalinfo_path):
     assert "GTiff -raster- (rw+vs): GeoTIFF" in ret
 
 
+###############################################################################
+# Test --formats -json
+
+
+@pytest.mark.require_driver("VRT")
+def test_gdalinfo_formats_json(gdalinfo_path):
+
+    ret = json.loads(
+        gdaltest.runexternal(gdalinfo_path + " --formats -json", check_memleak=False)
+    )
+    assert {
+        "short_name": "VRT",
+        "long_name": "Virtual Raster",
+        "scopes": ["raster", "multidimensional_raster"],
+        "capabilities": ["open", "create", "create_copy", "virtual_io"],
+        "file_extensions": ["vrt"],
+    } in ret
+
+
 ###############################################################################
 # Test erroneous use of --format.
 
@@ -537,6 +545,7 @@ def test_gdalinfo_stats(gdalinfo_path, tmp_path):
 # Test a dataset with overviews and RAT
 
 
+@pytest.mark.require_driver("HFA")
 def test_gdalinfo_33(gdalinfo_path):
 
     ret = gdaltest.runexternal(gdalinfo_path + " -json ../gdrivers/data/hfa/int.img")
@@ -549,6 +558,10 @@ def test_gdalinfo_33(gdalinfo_path):
 # Test a dataset with GCPs
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdalinfo_34(gdalinfo_path):
 
     ret = gdaltest.runexternal(gdalinfo_path + " -json ../gcore/data/gcps.vrt")
diff --git a/autotest/utilities/test_gdalinfo_lib.py b/autotest/utilities/test_gdalinfo_lib.py
index 73a8c9648fe7..8333b30d1c02 100755
--- a/autotest/utilities/test_gdalinfo_lib.py
+++ b/autotest/utilities/test_gdalinfo_lib.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2015, Faza Mahamood <fazamhd at gmail dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
@@ -156,7 +140,7 @@ def test_gdalinfo_lib_6():
 
     ret = gdal.Info("../gcore/data/byte.tif", options="-json")
     assert ret["driverShortName"] == "GTiff", "wrong value for driverShortName."
-    assert type(ret) == dict
+    assert isinstance(ret, dict)
 
 
 ###############################################################################
@@ -170,7 +154,7 @@ def test_gdalinfo_lib_7():
         options="-json".encode("ascii").decode("ascii"),
     )
     assert ret["driverShortName"] == "GTiff", "wrong value for driverShortName."
-    assert type(ret) == dict
+    assert isinstance(ret, dict)
 
 
 ###############################################################################
@@ -181,7 +165,7 @@ def test_gdalinfo_lib_8():
 
     ret = gdal.Info("../gcore/data/byte.tif", options=["-json"])
     assert ret["driverShortName"] == "GTiff", "wrong value for driverShortName."
-    assert type(ret) == dict
+    assert isinstance(ret, dict)
 
 
 ###############################################################################
@@ -201,17 +185,18 @@ def test_gdalinfo_lib_nodatavalues():
 ###############################################################################
 
 
-def test_gdalinfo_lib_coordinate_epoch():
+@pytest.mark.parametrize("epoch", ["2021.0", "2021.3"])
+def test_gdalinfo_lib_coordinate_epoch(epoch):
 
     ds = gdal.Translate(
-        "", "../gcore/data/byte.tif", options='-of MEM -a_coord_epoch 2021.3"'
+        "", "../gcore/data/byte.tif", options=f'-of MEM -a_coord_epoch {epoch}"'
     )
     ret = gdal.Info(ds)
-    assert "Coordinate epoch: 2021.3" in ret
+    assert f"Coordinate epoch: {epoch}" in ret
 
     ret = gdal.Info(ds, format="json")
     assert "coordinateEpoch" in ret
-    assert ret["coordinateEpoch"] == 2021.3
+    assert ret["coordinateEpoch"] == float(epoch)
 
 
 ###############################################################################
@@ -308,3 +293,46 @@ def test_gdalinfo_lib_json_engineering_crs():
     assert "coordinateSystem" in ret
     assert "cornerCoordinates" in ret
     assert "wgs84Extent" not in ret
+
+
+###############################################################################
+# Test -nonodata
+
+
+def test_gdalinfo_lib_nonodata(tmp_path):
+
+    ds = gdal.GetDriverByName("MEM").Create("", 1, 1)
+    ds.GetRasterBand(1).SetNoDataValue(1)
+
+    ret = gdal.Info(ds, format="json")
+    assert "noDataValue" in ret["bands"][0]
+
+    ret = gdal.Info(ds, format="json", showNodata=False)
+    assert "noDataValue" not in ret["bands"][0]
+
+
+###############################################################################
+# Test -nomask
+
+
+def test_gdalinfo_lib_nomask(tmp_path):
+
+    ds = gdal.GetDriverByName("MEM").Create("", 1, 1)
+    ds.GetRasterBand(1).CreateMaskBand(gdal.GMF_PER_DATASET)
+
+    ret = gdal.Info(ds, format="json")
+    assert "mask" in ret["bands"][0]
+
+    ret = gdal.Info(ds, format="json", showMask=False)
+    assert "mask" not in ret["bands"][0]
+
+
+###############################################################################
+
+
+def test_gdalinfo_lib_json_stac_common_name():
+
+    ds = gdal.GetDriverByName("MEM").Create("", 1, 1)
+    ds.GetRasterBand(1).SetColorInterpretation(gdal.GCI_PanBand)
+    ret = gdal.Info(ds, options="-json")
+    assert ret["stac"]["eo:bands"][0]["common_name"] == "pan"
diff --git a/autotest/utilities/test_gdallocationinfo.py b/autotest/utilities/test_gdallocationinfo.py
index 2b8c80cd7a2e..4e75959308a3 100755
--- a/autotest/utilities/test_gdallocationinfo.py
+++ b/autotest/utilities/test_gdallocationinfo.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
@@ -122,6 +106,10 @@ def test_gdallocationinfo_4(gdallocationinfo_path):
 # Test -lifonly
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdallocationinfo_5(gdallocationinfo_path):
 
     ret = gdaltest.runexternal(
@@ -254,3 +242,179 @@ def test_gdallocationinfo_echo(gdallocationinfo_path):
         strin="1 2",
     )
     assert "1,2,132" in ret
+
+    ret = gdaltest.runexternal(
+        gdallocationinfo_path
+        + ' -geoloc -E -valonly -field_sep "," ../gcore/data/byte.tif',
+        strin="440780.5 3751200.5",
+    )
+    assert "440780.5,3751200.5,132" in ret
+
+    ret = gdaltest.runexternal(
+        gdallocationinfo_path
+        + ' -geoloc -E -valonly -field_sep "," ../gcore/data/byte.tif',
+        strin="440780.5 3751200.5 extra_content",
+    )
+    assert "440780.5,3751200.5,132,extra_content" in ret
+
+
+###############################################################################
+# Test out of raster coordinates
+
+
+def test_gdallocationinfo_out_of_raster_coordinates_valonly(gdallocationinfo_path):
+
+    ret = gdaltest.runexternal(
+        gdallocationinfo_path + " -valonly ../gcore/data/byte.tif",
+        strin="1 2\n-1 -1\n1 2",
+    )
+
+    ret = ret.replace("\r\n", "\n")
+    assert "132\n\n132\n" in ret
+
+    ret = gdaltest.runexternal(
+        gdallocationinfo_path + ' -E -valonly -field_sep "," ../gcore/data/byte.tif',
+        strin="1 2\n-1 -1\n1 2",
+    )
+
+    ret = ret.replace("\r\n", "\n")
+    assert "1,2,132\n-1,-1,\n1,2,132\n" in ret
+
+
+def test_gdallocationinfo_out_of_raster_coordinates_valonly_multiband(
+    gdallocationinfo_path,
+):
+
+    ret = gdaltest.runexternal(
+        gdallocationinfo_path + " -valonly ../gcore/data/rgbsmall.tif",
+        strin="1 2\n-1 -1\n1 2",
+    )
+
+    ret = ret.replace("\r\n", "\n")
+    assert "0\n0\n0\n\n\n\n0\n0\n0\n" in ret
+
+    ret = gdaltest.runexternal(
+        gdallocationinfo_path
+        + ' -E -valonly -field_sep "," ../gcore/data/rgbsmall.tif',
+        strin="1 2\n-1 -1\n1 2",
+    )
+
+    ret = ret.replace("\r\n", "\n")
+    assert "1,2,0,0,0\n-1,-1,,,\n1,2,0,0,0\n" in ret
+
+
+###############################################################################
+
+
+def test_gdallocationinfo_nad27_interpolate_bilinear(gdallocationinfo_path):
+
+    # run on nad27 explicitly to avoid datum transformations.
+    ret = gdaltest.runexternal(
+        gdallocationinfo_path
+        + " -valonly  -r bilinear -l_srs EPSG:4267 ../gcore/data/byte.tif -117.6354747 33.8970515"
+    )
+
+    assert float(ret) == pytest.approx(130.476908, rel=1e-4)
+
+
+def test_gdallocationinfo_nad27_interpolate_cubic(gdallocationinfo_path):
+
+    # run on nad27 explicitly to avoid datum transformations.
+    ret = gdaltest.runexternal(
+        gdallocationinfo_path
+        + " -valonly  -r cubic -l_srs EPSG:4267 ../gcore/data/byte.tif -117.6354747 33.8970515"
+    )
+
+    assert float(ret) == pytest.approx(134.65629, rel=1e-4)
+
+
+def test_gdallocationinfo_nad27_interpolate_cubicspline(gdallocationinfo_path):
+
+    ret = gdaltest.runexternal(
+        gdallocationinfo_path
+        + " -valonly  -r cubicspline -l_srs EPSG:4267 ../gcore/data/byte.tif -117.6354747 33.8970515"
+    )
+
+    assert float(ret) == pytest.approx(125.795025, rel=1e-4)
+
+
+def test_gdallocationinfo_report_geoloc_interpolate_bilinear(gdallocationinfo_path):
+
+    ret = gdaltest.runexternal(
+        gdallocationinfo_path
+        + " -r bilinear -geoloc ../gcore/data/byte.tif 441319.09 3750601.80"
+    )
+    ret = ret.replace("\r\n", "\n")
+    assert "Report:" in ret
+    assert "Location: (9.98" in ret
+    assert "P,11.97" in ret
+    assert "Value: 137.2524" in ret
+
+
+def test_gdallocationinfo_report_interpolate_bilinear(gdallocationinfo_path):
+
+    ret = gdaltest.runexternal(
+        gdallocationinfo_path + " -r bilinear ../gcore/data/byte.tif 9.98 11.97"
+    )
+    ret = ret.replace("\r\n", "\n")
+    assert "Report:" in ret
+    assert "Location: (9.98" in ret
+    assert "P,11.97" in ret
+    assert "Value: 137.24" in ret
+
+
+def test_gdallocationinfo_report_interpolate_cubic(gdallocationinfo_path):
+
+    ret = gdaltest.runexternal(
+        gdallocationinfo_path + " -r cubic ../gcore/data/byte.tif 9.98 11.97"
+    )
+    ret = ret.replace("\r\n", "\n")
+    assert "Report:" in ret
+    assert "Location: (9.98" in ret
+    assert "P,11.97" in ret
+    assert "Value: 141.58" in ret
+
+
+def test_gdallocationinfo_value_interpolate_bilinear(gdallocationinfo_path):
+
+    # Those coordinates are almost 10,12. It is testing that they are not converted to integer.
+    ret = gdaltest.runexternal(
+        gdallocationinfo_path
+        + " -valonly -r bilinear ../gcore/data/byte.tif 9.9999999 11.9999999"
+    )
+    assert float(ret) == pytest.approx(139.75, rel=1e-6)
+
+
+def test_gdallocationinfo_value_interpolate_bilinear_near_border(gdallocationinfo_path):
+
+    # Those coordinates are almost 10,12. It is testing that they are not converted to integer.
+    ret = gdaltest.runexternal(
+        gdallocationinfo_path
+        + " -valonly -r bilinear ../gcore/data/byte.tif 19 19.9999999"  # should we allow 20.0?
+    )
+    assert float(ret) == pytest.approx(103, rel=1e-6)
+
+
+def test_gdallocationinfo_value_interpolate_invalid_method(gdallocationinfo_path):
+
+    (_, err) = gdaltest.runexternal_out_and_err(
+        gdallocationinfo_path + " -valonly -r mode ../gcore/data/byte.tif 10 12"
+    )
+    assert "-r can only be used with values" in err
+
+
+def test_gdallocationinfo_interpolate_float_data(gdallocationinfo_path, tmp_path):
+    dst_filename = str(tmp_path / "tmp_float.tif")
+    driver = gdal.GetDriverByName("GTiff")
+    dst_ds = driver.Create(
+        dst_filename, xsize=2, ysize=2, bands=1, eType=gdal.GDT_Float32
+    )
+    np = pytest.importorskip("numpy")
+    raster_array = np.array(([10.5, 1.1], [2.4, 3.8]))
+    dst_ds.GetRasterBand(1).WriteArray(raster_array)
+    dst_ds = None
+
+    ret = gdaltest.runexternal(
+        gdallocationinfo_path + " -valonly -r bilinear {} 1 1".format(dst_filename)
+    )
+    assert float(ret) == pytest.approx(4.45, rel=1e-6)
diff --git a/autotest/utilities/test_gdalmanage.py b/autotest/utilities/test_gdalmanage.py
new file mode 100644
index 000000000000..dbf4ed454a09
--- /dev/null
+++ b/autotest/utilities/test_gdalmanage.py
@@ -0,0 +1,259 @@
+#!/usr/bin/env pytest
+# -*- coding: utf-8 -*-
+###############################################################################
+# $Id$
+#
+# Project:  GDAL/OGR Test Suite
+# Purpose:  gdalmanage testing
+# Author:   Alessandro Pasotti <elpaso at itopen.it>
+#
+###############################################################################
+# Copyright (c) 2024, Alessandro Pasotti <elpaso at itopen.it>
+#
+# SPDX-License-Identifier: MIT
+###############################################################################
+
+import os
+
+import gdaltest
+import pytest
+import test_cli_utilities
+
+pytestmark = pytest.mark.skipif(
+    test_cli_utilities.get_gdalmanage_path() is None,
+    reason="gdalmanage not available",
+)
+
+
+@pytest.fixture()
+def gdalmanage_path():
+    return test_cli_utilities.get_gdalmanage_path()
+
+
+###############################################################################
+# Simple identify test
+
+
+def test_gdalmanage_identify(gdalmanage_path):
+
+    (ret, err) = gdaltest.runexternal_out_and_err(
+        gdalmanage_path + " identify data/utmsmall.tif"
+    )
+    assert err == ""
+    assert "GTiff" in ret
+
+
+###############################################################################
+# Test -r option
+
+
+def test_gdalmanage_identify_recursive_option(gdalmanage_path):
+
+    (ret, err) = gdaltest.runexternal_out_and_err(gdalmanage_path + " identify -r data")
+    assert err == ""
+    assert "ESRI Shapefile" in ret
+    assert len(ret.split("\n")) == 2
+
+
+###############################################################################
+# Test -fr option
+
+
+def test_gdalmanage_identify_force_recursive_option(gdalmanage_path):
+
+    (ret, err) = gdaltest.runexternal_out_and_err(
+        gdalmanage_path + " identify -fr data"
+    )
+    assert err == ""
+    ret = ret.replace("\\", "/")
+    assert len(ret.split("\n")) > 10
+    assert "whiteblackred.tif: GTiff" in ret
+    assert "utmsmall.tif: GTiff" in ret
+    assert "ESRI Shapefile" in ret
+    assert "data/path.cpg: unrecognized" not in ret
+
+    # Test both the -r and -fr options (shouldn't change the output)
+    (ret2, err2) = gdaltest.runexternal_out_and_err(
+        gdalmanage_path + " identify -r -fr data"
+    )
+    ret2 = ret2.replace("\\", "/")
+    assert ret2 == ret and err2 == err
+
+
+###############################################################################
+# Test -u option
+
+
+def test_gdalmanage_identify_report_failures_option(gdalmanage_path):
+
+    (ret, err) = gdaltest.runexternal_out_and_err(
+        gdalmanage_path + " identify -fr -u data"
+    )
+    assert err == ""
+    ret = ret.replace("\\", "/")
+    assert "whiteblackred.tif: GTiff" in ret
+    assert "utmsmall.tif: GTiff" in ret
+    assert "ESRI Shapefile" in ret
+    assert "data/path.cpg: unrecognized" in ret
+
+
+###############################################################################
+# Test identify multiple files
+
+
+def test_gdalmanage_identify_multiple_files(gdalmanage_path):
+
+    (ret, err) = gdaltest.runexternal_out_and_err(
+        gdalmanage_path + " identify data/utmsmall.tif data/whiteblackred.tif"
+    )
+    assert err == ""
+    assert len(ret.split("\n")) == 3
+    assert "whiteblackred.tif: GTiff" in ret
+    assert "utmsmall.tif: GTiff" in ret
+
+
+###############################################################################
+# Test copy file
+
+
+def test_gdalmanage_copy_file(tmp_path, gdalmanage_path):
+
+    (ret, err) = gdaltest.runexternal_out_and_err(
+        gdalmanage_path + f" copy data/utmsmall.tif {tmp_path}/utmsmall.tif"
+    )
+    assert err == ""
+    # Verify the file was created
+    assert os.path.exists(f"{tmp_path}/utmsmall.tif")
+
+
+###############################################################################
+# Test copy file with -f option
+
+
+def test_gdalmanage_copy_file_format(tmp_path, gdalmanage_path):
+
+    (ret, err) = gdaltest.runexternal_out_and_err(
+        gdalmanage_path + f" copy -f GTiff data/utmsmall.tif {tmp_path}/utmsmall2.tif"
+    )
+    assert err == ""
+    # Verify the file was created
+    assert os.path.exists(f"{tmp_path}/utmsmall2.tif")
+
+    # Wrong format
+    (ret, err) = gdaltest.runexternal_out_and_err(
+        gdalmanage_path
+        + f" copy -f WRONGFORMAT data/utmsmall.tif {tmp_path}/utmsmall3.tif"
+    )
+    assert "Failed to find driver 'WRONGFORMAT'" in err
+
+
+###############################################################################
+# Test rename file
+
+
+def test_gdalmanage_rename_file(tmp_path, gdalmanage_path):
+
+    (ret, err) = gdaltest.runexternal_out_and_err(
+        gdalmanage_path + f" copy data/utmsmall.tif {tmp_path}/utmsmall_to_rename.tif"
+    )
+    assert err == ""
+    (ret, err) = gdaltest.runexternal_out_and_err(
+        gdalmanage_path
+        + f" rename {tmp_path}/utmsmall_to_rename.tif {tmp_path}/utmsmall_renamed.tif"
+    )
+    assert err == ""
+    # Verify the file was renamed
+    assert os.path.exists(f"{tmp_path}/utmsmall_renamed.tif")
+    assert not os.path.exists(f"{tmp_path}/utmsmall_to_rename.tif")
+
+
+###############################################################################
+# Test delete file
+
+
+def test_gdalmanage_delete_file(tmp_path, gdalmanage_path):
+
+    (ret, err) = gdaltest.runexternal_out_and_err(
+        gdalmanage_path + f" copy data/utmsmall.tif {tmp_path}/utmsmall_to_delete.tif"
+    )
+    assert err == ""
+    assert os.path.exists(f"{tmp_path}/utmsmall_to_delete.tif")
+    (ret, err) = gdaltest.runexternal_out_and_err(
+        gdalmanage_path + f" delete {tmp_path}/utmsmall_to_delete.tif"
+    )
+    assert err == ""
+    # Verify the file was deleted
+    assert not os.path.exists(f"{tmp_path}/utmsmall_to_delete.tif")
+
+
+###############################################################################
+# Test delete multiple files
+
+
+def test_gdalmanage_delete_multiple_files(tmp_path, gdalmanage_path):
+
+    (ret, err) = gdaltest.runexternal_out_and_err(
+        gdalmanage_path + f" copy data/utmsmall.tif {tmp_path}/utmsmall_to_delete.tif"
+    )
+    assert err == ""
+    assert os.path.exists(f"{tmp_path}/utmsmall_to_delete.tif")
+    (ret, err) = gdaltest.runexternal_out_and_err(
+        gdalmanage_path
+        + f" copy data/whiteblackred.tif {tmp_path}/whiteblackred_to_delete.tif"
+    )
+    assert err == ""
+    assert os.path.exists(f"{tmp_path}/whiteblackred_to_delete.tif")
+    (ret, err) = gdaltest.runexternal_out_and_err(
+        gdalmanage_path
+        + f" delete {tmp_path}/utmsmall_to_delete.tif {tmp_path}/whiteblackred_to_delete.tif"
+    )
+    assert err == ""
+    # Verify the files were deleted
+    assert not os.path.exists(f"{tmp_path}/utmsmall_to_delete.tif")
+    assert not os.path.exists(f"{tmp_path}/whiteblackred_to_delete.tif")
+
+
+###############################################################################
+# Test no arguments
+
+
+def test_gdalmanage_no_arguments(gdalmanage_path):
+
+    (ret, err) = gdaltest.runexternal_out_and_err(gdalmanage_path)
+    assert "Usage: gdalmanage" in err
+
+
+###############################################################################
+# Test invalid command
+
+
+def test_gdalmanage_invalid_command(gdalmanage_path):
+
+    (ret, err) = gdaltest.runexternal_out_and_err(gdalmanage_path + " invalidcommand")
+    assert "Usage: gdalmanage" in err
+
+
+###############################################################################
+# Test invalid argument
+
+
+def test_gdalmanage_invalid_argument(gdalmanage_path):
+
+    (ret, err) = gdaltest.runexternal_out_and_err(
+        gdalmanage_path + " identify -WTF data/utmsmall.tif"
+    )
+    assert "Usage: gdalmanage" in err
+    assert "Unknown argument: -WTF" in err
+
+
+###############################################################################
+# Test valid command with no required argument
+
+
+def test_gdalmanage_valid_command_no_argument(gdalmanage_path):
+
+    (ret, err) = gdaltest.runexternal_out_and_err(gdalmanage_path + " identify")
+    assert "Usage: gdalmanage" in err
+    assert (
+        "Error: No dataset name provided. At least one dataset name is required" in err
+    )
diff --git a/autotest/utilities/test_gdalmdiminfo.py b/autotest/utilities/test_gdalmdiminfo.py
index 9977457513c5..65567314d562 100755
--- a/autotest/utilities/test_gdalmdiminfo.py
+++ b/autotest/utilities/test_gdalmdiminfo.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2019, Even Rouault <even.rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
@@ -48,6 +32,10 @@ def gdalmdiminfo_path():
 # Simple test
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdalmdiminfo_1(gdalmdiminfo_path):
 
     (ret, err) = gdaltest.runexternal_out_and_err(gdalmdiminfo_path + " data/mdim.vrt")
@@ -59,6 +47,10 @@ def test_gdalmdiminfo_1(gdalmdiminfo_path):
 # Test -if option
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdalmdiminfo_if_option(gdalmdiminfo_path):
 
     (ret, err) = gdaltest.runexternal_out_and_err(
diff --git a/autotest/utilities/test_gdalmdiminfo_lib.py b/autotest/utilities/test_gdalmdiminfo_lib.py
index 9518fb01f84e..2a159b72f4c1 100755
--- a/autotest/utilities/test_gdalmdiminfo_lib.py
+++ b/autotest/utilities/test_gdalmdiminfo_lib.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2019, Even Rouault <even.rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import pathlib
diff --git a/autotest/utilities/test_gdalmdimtranslate.py b/autotest/utilities/test_gdalmdimtranslate.py
index a6cf1cec7529..d6aedd37fbff 100755
--- a/autotest/utilities/test_gdalmdimtranslate.py
+++ b/autotest/utilities/test_gdalmdimtranslate.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2019, Even Rouault <even.rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -50,6 +34,10 @@ def gdalmdimtranslate_path():
 # Simple test
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdalmdimtranslate_1(gdalmdimtranslate_path, tmp_path):
 
     dst_vrt = str(tmp_path / "out.vrt")
@@ -65,6 +53,10 @@ def test_gdalmdimtranslate_1(gdalmdimtranslate_path, tmp_path):
 # Test -if option
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdalmdimtranslate_if(gdalmdimtranslate_path, tmp_path):
 
     dst_vrt = str(tmp_path / "out.vrt")
diff --git a/autotest/utilities/test_gdalmdimtranslate_lib.py b/autotest/utilities/test_gdalmdimtranslate_lib.py
index 333f3a74e8d7..acd81ff4312a 100755
--- a/autotest/utilities/test_gdalmdimtranslate_lib.py
+++ b/autotest/utilities/test_gdalmdimtranslate_lib.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2019, Even Rouault <even.rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import collections
@@ -42,6 +26,10 @@
 ###############################################################################
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdalmdimtranslate_no_arg(tmp_vsimem):
 
     tmpfile = tmp_vsimem / "out.vrt"
@@ -53,6 +41,10 @@ def test_gdalmdimtranslate_no_arg(tmp_vsimem):
 ###############################################################################
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdalmdimtranslate_multidim_to_mem():
 
     out_ds = gdal.MultiDimTranslate("", "data/mdim.vrt", format="MEM")
@@ -67,6 +59,10 @@ def test_gdalmdimtranslate_multidim_to_mem():
 ###############################################################################
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdalmdimtranslate_multidim_to_classic(tmp_vsimem):
 
     tmpfile = tmp_vsimem / "out.tif"
@@ -84,6 +80,10 @@ def test_gdalmdimtranslate_multidim_to_classic(tmp_vsimem):
 ###############################################################################
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdalmdimtranslate_multidim_1d_to_classic(tmp_vsimem):
 
     tmpfile = tmp_vsimem / "out.tif"
@@ -112,6 +112,10 @@ def test_gdalmdimtranslate_classic_to_classic(tmp_vsimem):
 ###############################################################################
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdalmdimtranslate_classic_to_multidim(tmp_vsimem):
 
     tmpfile = tmp_vsimem / "out.vrt"
@@ -171,6 +175,10 @@ def test_gdalmdimtranslate_classic_to_multidim(tmp_vsimem):
 ###############################################################################
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdalmdimtranslate_array(tmp_vsimem):
 
     tmpfile = tmp_vsimem / "out.vrt"
@@ -252,6 +260,10 @@ def test_gdalmdimtranslate_array(tmp_vsimem):
 ###############################################################################
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdalmdimtranslate_array_with_transpose_and_view(tmp_vsimem):
 
     tmpfile = tmp_vsimem / "out.vrt"
@@ -327,6 +339,10 @@ def test_gdalmdimtranslate_array_with_transpose_and_view(tmp_vsimem):
 ###############################################################################
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdalmdimtranslate_group(tmp_vsimem):
 
     tmpfile = tmp_vsimem / "out.vrt"
@@ -392,6 +408,10 @@ def test_gdalmdimtranslate_group(tmp_vsimem):
 ###############################################################################
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdalmdimtranslate_two_groups(tmp_vsimem):
 
     tmpfile = tmp_vsimem / "out.vrt"
@@ -462,6 +482,10 @@ def test_gdalmdimtranslate_two_groups(tmp_vsimem):
 ###############################################################################
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdalmdimtranslate_subset(tmp_vsimem):
 
     tmpfile = tmp_vsimem / "out.vrt"
@@ -717,6 +741,10 @@ def test_gdalmdimtranslate_subset(tmp_vsimem):
 ###############################################################################
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdalmdimtranslate_scaleaxes(tmp_vsimem):
 
     tmpfile = tmp_vsimem / "out.vrt"
@@ -791,6 +819,10 @@ def test_gdalmdimtranslate_scaleaxes(tmp_vsimem):
     )
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdalmdimtranslate_dims_with_same_name_different_size(tmp_vsimem):
 
     srcfile = tmp_vsimem / "in.vrt"
diff --git a/autotest/utilities/test_gdalsrsinfo.py b/autotest/utilities/test_gdalsrsinfo.py
index 02e14de5e7ae..fcc82d958368 100755
--- a/autotest/utilities/test_gdalsrsinfo.py
+++ b/autotest/utilities/test_gdalsrsinfo.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
@@ -144,6 +128,7 @@ def test_gdalsrsinfo_6(gdalsrsinfo_path):
 # Test -o mapinfo option
 
 
+@pytest.mark.require_driver("MapInfo File")
 def test_gdalsrsinfo_7(gdalsrsinfo_path):
 
     ret = gdaltest.runexternal(gdalsrsinfo_path + " -o mapinfo ../gcore/data/byte.tif")
diff --git a/autotest/utilities/test_gdaltindex.py b/autotest/utilities/test_gdaltindex.py
index ae29e50a9883..a3eab02708dc 100755
--- a/autotest/utilities/test_gdaltindex.py
+++ b/autotest/utilities/test_gdaltindex.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/utilities/test_gdaltindex_lib.py b/autotest/utilities/test_gdaltindex_lib.py
index 1ca76128ea5f..7927aeffa687 100644
--- a/autotest/utilities/test_gdaltindex_lib.py
+++ b/autotest/utilities/test_gdaltindex_lib.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -234,6 +218,7 @@ def test_gdaltindex_lib_outputSRS_writeAbsoluePath(tmp_path, four_tile_index):
 # Test -f, -lyr_name
 
 
+@pytest.mark.require_driver("MapInfo File")
 def test_gdaltindex_lib_format_layerName(tmp_path, four_tiles):
 
     index_mif = str(tmp_path / "test_gdaltindex6.mif")
diff --git a/autotest/utilities/test_gdaltransform.py b/autotest/utilities/test_gdaltransform.py
index 667f12209b9f..34a163b7855e 100755
--- a/autotest/utilities/test_gdaltransform.py
+++ b/autotest/utilities/test_gdaltransform.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2008-2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
diff --git a/autotest/utilities/test_gdalwarp.py b/autotest/utilities/test_gdalwarp.py
index df8cb2d65b70..6c499ab8fd66 100755
--- a/autotest/utilities/test_gdalwarp.py
+++ b/autotest/utilities/test_gdalwarp.py
@@ -10,26 +10,11 @@
 ###############################################################################
 # Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
+import shutil
 import stat
 
 import gdaltest
@@ -382,6 +367,10 @@ def test_gdalwarp_14(gdalwarp_path, testgdalwarp_gcp_tif, tmp_path):
 # Test -of VRT which is a special case
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdalwarp_16(gdalwarp_path, testgdalwarp_gcp_tif, tmp_path):
 
     dst_vrt = str(tmp_path / "testgdalwarp16.vrt")
@@ -425,12 +414,13 @@ def test_gdalwarp_18(gdalwarp_path, tmp_path):
     dst_tif = str(tmp_path / "testgdalwarp18.tif")
 
     (_, ret_stderr) = gdaltest.runexternal_out_and_err(
-        f"{gdalwarp_path} -wm 20 -multi ../gcore/data/byte.tif {dst_tif}"
+        f"{gdalwarp_path} -wm 20MB -multi ../gcore/data/byte.tif {dst_tif}"
     )
 
     # This error will be returned if GDAL is not compiled with thread support
     if ret_stderr.find("CPLCreateThread() failed in ChunkAndWarpMulti()") != -1:
         pytest.skip("GDAL not compiled with thread support")
+    assert not ret_stderr
 
     ds = gdal.Open(dst_tif)
     assert ds is not None
@@ -462,6 +452,10 @@ def test_gdalwarp_19(gdalwarp_path, testgdalwarp_gcp_tif, tmp_path):
 # Test -of VRT -et 0 which is a special case
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdalwarp_20(gdalwarp_path, testgdalwarp_gcp_tif, tmp_path):
 
     dst_vrt = str(tmp_path / "testgdalwarp20.vrt")
@@ -1046,9 +1040,14 @@ def test_gdalwarp_39(gdalwarp_path, tmp_path):
 # Test -ovr
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdalwarp_40(gdalwarp_path, tmp_path):
 
     src_tif = str(tmp_path / "test_gdalwarp_40_src.tif")
+    src_tif_copy = str(tmp_path / "test_gdalwarp_40_src_copy.tif")
     dst_tif = str(tmp_path / "test_gdalwarp_40.tif")
     dst_vrt = str(tmp_path / "test_gdalwarp_40.vrt")
 
@@ -1060,8 +1059,11 @@ def test_gdalwarp_40(gdalwarp_path, tmp_path):
     cs_ov0 = out_ds.GetRasterBand(1).GetOverview(0).Checksum()
     out_ds.GetRasterBand(1).GetOverview(1).Fill(255)
     cs_ov1 = out_ds.GetRasterBand(1).GetOverview(1).Checksum()
+
     out_ds = None
 
+    shutil.copy(src_tif, src_tif_copy)
+
     # Should select main resolution
     gdaltest.runexternal(f"{gdalwarp_path} {src_tif} {dst_tif} -overwrite")
 
@@ -1113,6 +1115,27 @@ def test_gdalwarp_40(gdalwarp_path, tmp_path):
     assert ds.GetRasterBand(1).Checksum() == cs_ov0
     ds = None
 
+    # Should select overview 0
+    gdaltest.runexternal(f"{gdalwarp_path} {src_tif} {dst_tif} -overwrite -ovr 0")
+
+    ds = gdal.Open(dst_tif)
+    assert ds.GetRasterBand(1).Checksum() == cs_ov0
+    ds = None
+
+    # Should select overview 0 (no overwrite)
+    gdaltest.runexternal(f"{gdalwarp_path} {src_tif} {dst_tif} -ovr 0")
+
+    # Repeat with no output file and no overwrite (takes a different code path)
+    os.unlink(dst_tif)
+    gdaltest.runexternal(f"{gdalwarp_path} {src_tif} {dst_tif} -ovr 0")
+
+    # Should not crash (actually it never did)
+    os.unlink(dst_tif)
+    gdaltest.runexternal(f"{gdalwarp_path} {src_tif} {src_tif_copy} {dst_tif} -ovr 0")
+    ds = gdal.Open(dst_tif)
+    assert ds.GetRasterBand(1).Checksum() == cs_ov0
+    ds = None
+
     # Should select overview 0 through VRT
     gdaltest.runexternal(
         f"{gdalwarp_path} {src_tif} {dst_vrt} -overwrite -ts 10 10 -of VRT"
@@ -1138,6 +1161,25 @@ def test_gdalwarp_40(gdalwarp_path, tmp_path):
     expected_cs = ds.GetRasterBand(1).Checksum()
     ds = None
 
+    # Test that tiny variations in -te that result in a target resampling factor
+    # very close to the one of overview 0 lead to overview 0 been selected
+
+    gdaltest.runexternal(
+        f"{gdalwarp_path} {src_tif} {dst_vrt} -overwrite -ts 10 10 -te 440721 3750120 441920 3751320 -of VRT"
+    )
+
+    ds = gdal.Open(dst_vrt)
+    assert ds.GetRasterBand(1).Checksum() == cs_ov0
+    ds = None
+
+    gdaltest.runexternal(
+        f"{gdalwarp_path} {src_tif} {dst_vrt} -overwrite -ts 10 10 -te 440719 3750120 441920 3751320 -of VRT"
+    )
+
+    ds = gdal.Open(dst_vrt)
+    assert ds.GetRasterBand(1).Checksum() == cs_ov0
+    ds = None
+
     # Should select overview 0 too
     gdaltest.runexternal(f"{gdalwarp_path} {src_tif} {dst_tif} -overwrite -ts 7 7")
 
@@ -1546,3 +1588,22 @@ def test_gdalwarp_if_option(gdalwarp_path, tmp_vsimem):
         f"{gdalwarp_path} -if HFA ../gcore/data/byte.tif {tmp_vsimem}/out.tif"
     )
     assert err is not None
+
+
+###############################################################################
+# Test invalid -wm
+
+
+def test_gdalwarp_invalid_wm(gdalwarp_path, tmp_vsimem):
+
+    ret, err = gdaltest.runexternal_out_and_err(
+        f"{gdalwarp_path} ../gcore/data/byte.tif {tmp_vsimem}/out.tif -wm maximum"
+    )
+    assert "non-numeric" in err
+    assert "Failed to parse value of -wm" in err
+
+    ret, err = gdaltest.runexternal_out_and_err(
+        f"{gdalwarp_path} ../gcore/data/byte.tif {tmp_vsimem}/out.tif -wm 200%"
+    )
+    assert "Memory percentage" in err
+    assert "Failed to parse value of -wm" in err
diff --git a/autotest/utilities/test_gdalwarp_lib.py b/autotest/utilities/test_gdalwarp_lib.py
index fd3aeb2985a4..3cb97c04aee6 100755
--- a/autotest/utilities/test_gdalwarp_lib.py
+++ b/autotest/utilities/test_gdalwarp_lib.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2015, Faza Mahamood <fazamhd at gmail dot com>
 # Copyright (c) 2015, Even Rouault <even.rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import collections
@@ -795,6 +779,7 @@ def test_gdalwarp_lib_45():
 
 
 @pytest.mark.require_driver("CSV")
+@pytest.mark.require_driver("GeoJSON")
 def test_gdalwarp_lib_46(tmp_vsimem):
 
     ds = gdal.Warp(
@@ -891,6 +876,7 @@ def test_gdalwarp_lib_46(tmp_vsimem):
 # Test -crop_to_cutline -tr X Y -wo CUTLINE_ALL_TOUCHED=YES (fixes for #1360)
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdalwarp_lib_cutline_all_touched_single_pixel(tmp_vsimem):
 
     cutlineDSName = (
@@ -941,6 +927,7 @@ def test_gdalwarp_lib_cutline_all_touched_single_pixel(tmp_vsimem):
 
 
 @pytest.mark.require_driver("CSV")
+@pytest.mark.require_driver("GeoJSON")
 def test_gdalwarp_lib_crop_to_cutline_slightly_shifted_wrt_pixel_boundaries(tmp_vsimem):
 
     cutlineDSName = (
@@ -1473,10 +1460,39 @@ def test_gdalwarp_lib_127():
     assert ds.GetRasterBand(1).Checksum() == 4672, "bad checksum"
 
 
+@pytest.mark.parametrize("srcNodata", [float("-inf"), -1])
+def test_gdalwarp_lib_srcnodata(srcNodata):
+
+    ds = gdal.Warp(
+        "",
+        "../gcore/data/byte.tif",
+        format="MEM",
+        srcNodata=srcNodata,
+        outputType=gdal.GDT_Float32,
+    )
+    assert ds.GetRasterBand(1).GetNoDataValue() == srcNodata, "bad nodata value"
+    assert ds.GetRasterBand(1).Checksum() == 4672, "bad checksum"
+
+
+@pytest.mark.parametrize("dstNodata", [float("-inf"), -1])
+def test_gdalwarp_lib_dstnodata(dstNodata):
+
+    ds = gdal.Warp(
+        "",
+        "../gcore/data/byte.tif",
+        format="MEM",
+        dstNodata=dstNodata,
+        outputType=gdal.GDT_Float32,
+    )
+    assert ds.GetRasterBand(1).GetNoDataValue() == dstNodata, "bad nodata value"
+    assert ds.GetRasterBand(1).Checksum() == 4672, "bad checksum"
+
+
 ###############################################################################
 # Test automatic densification of cutline (#6375)
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdalwarp_lib_128(tmp_vsimem):
 
     mem_ds = gdal.GetDriverByName("MEM").Create("", 1177, 4719)
@@ -1571,7 +1587,12 @@ def test_gdalwarp_lib_128(tmp_vsimem):
 # to an invalid geometry (#6375)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 @pytest.mark.require_geos
+@pytest.mark.require_driver("GeoJSON")
 def test_gdalwarp_lib_129(tmp_vsimem):
 
     mem_ds = gdal.GetDriverByName("MEM").Create("", 1000, 2000)
@@ -1802,7 +1823,10 @@ def test_gdalwarp_lib_134(tmp_vsimem):
         "",
         src_ds,
         format="MEM",
-        transformerOptions=["SRC_METHOD=NO_GEOTRANSFORM", "DST_METHOD=NO_GEOTRANSFORM"],
+        transformerOptions={
+            "SRC_METHOD": "NO_GEOTRANSFORM",
+            "DST_METHOD": "NO_GEOTRANSFORM",
+        },
         outputBounds=[1, 2, 4, 6],
     )
     assert ds is not None
@@ -2041,6 +2065,10 @@ def test_gdalwarp_lib_135h(gdalwarp_135_grid_gtx, gdalwarp_135_grid2_gtx):
     assert data == pytest.approx(115 / (1200.0 / 3937)), "Bad value"
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 @pytest.mark.require_driver("GTX")
 def test_gdalwarp_lib_135i(
     gdalwarp_135_src_ds, gdalwarp_135_grid_gtx, gdalwarp_135_grid2_gtx, tmp_path
@@ -3030,6 +3058,7 @@ def test_gdalwarp_lib_scale_offset():
 # Test cutline with zero-width sliver
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdalwarp_lib_cutline_zero_width_sliver(tmp_vsimem):
 
     # Geometry valid in EPSG:4326, but that has a zero-width sliver
@@ -3051,6 +3080,7 @@ def test_gdalwarp_lib_cutline_zero_width_sliver(tmp_vsimem):
 # Test cutline with zero-width sliver
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdalwarp_lib_cutline_zero_width_sliver_remove_empty_polygon(tmp_vsimem):
 
     geojson = {
@@ -3092,6 +3122,7 @@ def test_gdalwarp_lib_cutline_zero_width_sliver_remove_empty_polygon(tmp_vsimem)
 # Test cutline with zero-width sliver
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_gdalwarp_lib_cutline_zero_width_sliver_remove_empty_inner_ring(tmp_vsimem):
 
     geojson = {
@@ -3296,6 +3327,10 @@ def test_gdalwarp_lib_src_nodata_with_dstalpha():
 # Test warping from a dataset with points outside of Earth (fixes #4934)
 
 
+@pytest.mark.skipif(
+    not gdaltest.vrt_has_open_support(),
+    reason="VRT driver open missing",
+)
 def test_gdalwarp_lib_src_points_outside_of_earth():
     class MyHandler:
         def __init__(self):
@@ -3885,6 +3920,7 @@ def test_gdalwarp_lib_working_data_type_with_source_dataset_of_different_types()
 
 
 @pytest.mark.require_geos
+@pytest.mark.require_driver("GeoJSON")
 def test_gdalwarp_lib_cutline_crossing_antimeridian_in_EPSG_32601_and_raster_in_EPSG_4326(
     tmp_vsimem,
 ):
@@ -4039,11 +4075,12 @@ def test_gdalwarp_lib_ortho_to_long_lat():
 ###############################################################################
 # Test warping to a projection that has no inverse
 # Note: this test will break if PROJ get support for inverse isea !
+# Note: disabled since it will actually break with PROJ 9.5 which implements
 
 
 @pytest.mark.require_proj(8, 0, 0)
 @gdaltest.enable_exceptions()
-def test_gdalwarp_lib_to_projection_without_inverse_method():
+def DISABLED_test_gdalwarp_lib_to_projection_without_inverse_method():
 
     with pytest.raises(Exception, match="No inverse operation"):
         gdal.Warp(
@@ -4073,7 +4110,7 @@ def test_gdalwarp_lib_to_projection_without_inverse_method():
 def test_gdalwarp_lib_no_crash_on_none_dst():
 
     ds1 = gdal.Open("../gcore/data/byte.tif")
-    with pytest.raises(ValueError):
+    with pytest.raises(Exception):
         gdal.Warp(None, ds1)
 
 
@@ -4186,3 +4223,110 @@ def test_target_extent_consistent_size():
 
     assert ds.RasterXSize == 4793
     assert ds.RasterYSize == 4143
+
+
+###############################################################################
+# Test warping an image with [-180,180] longitude to [180 - X, 180 + X]
+
+
+@pytest.mark.parametrize("extra_column", [False, True])
+def test_gdalwarp_lib_minus_180_plus_180_to_span_over_180(tmp_vsimem, extra_column):
+
+    dst_filename = str(tmp_vsimem / "out.tif")
+    src_ds = gdal.Open("../gdrivers/data/small_world.tif")
+    if extra_column:
+        tmp_ds = gdal.GetDriverByName("MEM").Create(
+            "", src_ds.RasterXSize + 1, src_ds.RasterYSize
+        )
+        tmp_ds.SetGeoTransform(src_ds.GetGeoTransform())
+        tmp_ds.SetSpatialRef(src_ds.GetSpatialRef())
+        tmp_ds.WriteRaster(
+            0,
+            0,
+            src_ds.RasterXSize,
+            src_ds.RasterYSize,
+            src_ds.GetRasterBand(1).ReadRaster(),
+        )
+        tmp_ds.WriteRaster(
+            src_ds.RasterXSize,
+            0,
+            1,
+            src_ds.RasterYSize,
+            src_ds.GetRasterBand(1).ReadRaster(0, 0, 1, src_ds.RasterYSize),
+        )
+        src_ds = tmp_ds
+    out_ds = gdal.Warp(dst_filename, src_ds, outputBounds=[0, -90, 360, 90])
+    # Check that east/west hemispheres have been switched
+    assert out_ds.GetRasterBand(1).ReadRaster(
+        0, 0, src_ds.RasterXSize // 2, src_ds.RasterYSize
+    ) == src_ds.GetRasterBand(1).ReadRaster(
+        src_ds.RasterXSize // 2, 0, src_ds.RasterXSize // 2, src_ds.RasterYSize
+    )
+    assert out_ds.GetRasterBand(1).ReadRaster(
+        src_ds.RasterXSize // 2, 0, src_ds.RasterXSize // 2, src_ds.RasterYSize
+    ) == src_ds.GetRasterBand(1).ReadRaster(
+        0, 0, src_ds.RasterXSize // 2, src_ds.RasterYSize
+    )
+
+
+###############################################################################
+# Test bugfix for https://lists.osgeo.org/pipermail/gdal-dev/2024-September/059512.html
+
+
+@pytest.mark.parametrize("with_tap", [True, False])
+def test_gdalwarp_lib_blank_edge_one_by_one(with_tap):
+
+    src_ds = gdal.GetDriverByName("MEM").Create("", 1, 1)
+    src_ds.SetGeoTransform([6.8688, 0.0009, 0, 51.3747, 0, -0.0009])
+    srs = osr.SpatialReference()
+    srs.SetFromUserInput("WGS84")
+    srs.SetAxisMappingStrategy(osr.OAMS_TRADITIONAL_GIS_ORDER)
+    src_ds.SetSpatialRef(srs)
+    options = "-f MEM -tr 1000 1000 -t_srs EPSG:32631"
+    if with_tap:
+        options += " -tap"
+    out_ds = gdal.Warp("", src_ds, options=options)
+    assert out_ds.RasterXSize == 1
+    assert out_ds.RasterYSize == 1
+    gt = out_ds.GetGeoTransform()
+    if with_tap:
+        assert gt == pytest.approx((769000.0, 1000.0, 0.0, 5699000.0, 0.0, -1000.0))
+    else:
+        assert gt == pytest.approx(
+            (769234.6506516202, 1000.0, 0.0, 5698603.782217737, 0.0, -1000.0)
+        )
+
+
+###############################################################################
+# Test bugfix for https://github.com/OSGeo/gdal/issues/10892
+
+
+def test_gdalwarp_lib_average_ten_ten_to_one_one():
+
+    src_ds = gdal.GetDriverByName("MEM").Create("", 10, 10)
+    src_ds.SetGeoTransform([0, 1, 0, 0, 0, -1])
+    srs = osr.SpatialReference()
+    srs.SetFromUserInput("WGS84")
+    srs.SetAxisMappingStrategy(osr.OAMS_TRADITIONAL_GIS_ORDER)
+    src_ds.SetSpatialRef(srs)
+    src_ds.GetRasterBand(1).Fill(1)
+    out_ds = gdal.Warp(
+        "", src_ds, width=1, height=1, resampleAlg=gdal.GRIORA_Average, format="MEM"
+    )
+    assert out_ds.GetRasterBand(1).ComputeRasterMinMax() == (1, 1)
+
+
+###############################################################################
+# Test bugfix for https://github.com/OSGeo/gdal/issues/10975
+
+
+def test_gdalwarp_lib_src_is_geog_arc_second():
+
+    out_ds = gdal.Warp(
+        "",
+        "data/geog_arc_second.tif",
+        options="-f MEM -srcnodata 0 -te -81.5 28.5 -81.0 29.0 -t_srs EPSG:4326",
+    )
+    assert out_ds.RasterXSize == 5464
+    assert out_ds.RasterYSize == 5464
+    assert out_ds.GetRasterBand(1).Checksum() == 31856
diff --git a/autotest/utilities/test_gnmutils.py b/autotest/utilities/test_gnmutils.py
index 77a70a6f649c..e8e27a6eec84 100755
--- a/autotest/utilities/test_gnmutils.py
+++ b/autotest/utilities/test_gnmutils.py
@@ -12,23 +12,7 @@
 # Copyright (c) 2014, Mikhail Gusev
 # Copyright (c) 2014-2015, NextGIS <info@nextgis.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/autotest/utilities/test_nearblack.py b/autotest/utilities/test_nearblack.py
index ca99c3d2b2ef..0b44ad3ae37b 100755
--- a/autotest/utilities/test_nearblack.py
+++ b/autotest/utilities/test_nearblack.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import shutil
diff --git a/autotest/utilities/test_nearblack_lib.py b/autotest/utilities/test_nearblack_lib.py
index 22cae1d68bee..8d23b24da7b3 100755
--- a/autotest/utilities/test_nearblack_lib.py
+++ b/autotest/utilities/test_nearblack_lib.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2015, Even Rouault <even dot rouault @ spatialys dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/autotest/utilities/test_ogr2ogr.py b/autotest/utilities/test_ogr2ogr.py
index bc218fb45855..fea8e074ba66 100755
--- a/autotest/utilities/test_ogr2ogr.py
+++ b/autotest/utilities/test_ogr2ogr.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -1419,7 +1403,7 @@ def test_ogr2ogr_49_bis(ogr2ogr_path, tmp_path):
         """<kml xmlns="http://www.opengis.net/kml/2.2">""",
         """<Document id="root_doc">""",
         """<Folder><name>grid</name>""",
-        """  <Placemark>""",
+        """  <Placemark id="grid.1">""",
         """        <name>440750.000</name>""",
         """  </Placemark>""",
         """</Folder>""",
@@ -2082,6 +2066,7 @@ def ogr2ogr_62_json(tmp_path):
     return fname
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_ogr2ogr_62(ogr2ogr_path, ogr2ogr_62_json, tmp_path):
 
     dst_json = str(tmp_path / "test_ogr2ogr_62.json")
@@ -2097,6 +2082,7 @@ def test_ogr2ogr_62(ogr2ogr_path, ogr2ogr_62_json, tmp_path):
     assert "bar" in data and "baz" in data
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_ogr2ogr_62bis(ogr2ogr_path, ogr2ogr_62_json, tmp_path):
 
     dst_json = str(tmp_path / "test_ogr2ogr_62bis.json")
diff --git a/autotest/utilities/test_ogr2ogr_lib.py b/autotest/utilities/test_ogr2ogr_lib.py
index 0d614e2fb400..437502751630 100755
--- a/autotest/utilities/test_ogr2ogr_lib.py
+++ b/autotest/utilities/test_ogr2ogr_lib.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2015, Faza Mahamood <fazamhd at gmail dot 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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import collections
@@ -520,7 +504,6 @@ def test_ogr2ogr_lib_21():
         gdal.VectorTranslate(ds, src_ds, accessMode="append", selectFields=["foo"])
 
     ds = None
-    f.Destroy()
     src_ds = None
 
 
@@ -1206,12 +1189,58 @@ def test_ogr2ogr_lib_clipsrc_discard_lower_dimensionality():
 
 
 ###############################################################################
-# Test -clipsrc with a clip layer with an invalid polygon
+# Test -clipsrc/-clipdst with a clip layer with an invalid polygon (specified "inline" as WKT)
+
+
+@pytest.mark.require_geos
+@gdaltest.enable_exceptions()
+@pytest.mark.parametrize("clipSrc", [True, False])
+def test_ogr2ogr_lib_clip_invalid_polygon_inline(tmp_vsimem, clipSrc):
+
+    srcDS = gdal.GetDriverByName("Memory").Create("", 0, 0, 0, gdal.GDT_Unknown)
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(4326)
+    srcLayer = srcDS.CreateLayer("test", srs=srs, geom_type=ogr.wkbLineString)
+    f = ogr.Feature(srcLayer.GetLayerDefn())
+    f.SetGeometry(ogr.CreateGeometryFromWkt("POINT(0.25 0.25)"))
+    srcLayer.CreateFeature(f)
+    f = ogr.Feature(srcLayer.GetLayerDefn())
+    f.SetGeometry(ogr.CreateGeometryFromWkt("POINT(-0.5 0.5)"))
+    srcLayer.CreateFeature(f)
+
+    # Intersection of above geometry with clipSrc bounding box is a point
+    with pytest.raises(Exception, match="geometry is invalid"):
+        gdal.VectorTranslate(
+            "",
+            srcDS,
+            format="Memory",
+            clipSrc="POLYGON((0 0,1 1,0 1,1 0,0 0))" if clipSrc else None,
+            clipDst="POLYGON((0 0,1 1,0 1,1 0,0 0))" if not clipSrc else None,
+        )
+
+    with gdal.quiet_errors():
+        ds = gdal.VectorTranslate(
+            "",
+            srcDS,
+            format="Memory",
+            makeValid=True,
+            clipSrc="POLYGON((0 0,1 1,0 1,1 0,0 0))" if clipSrc else None,
+            clipDst="POLYGON((0 0,1 1,0 1,1 0,0 0))" if not clipSrc else None,
+        )
+    lyr = ds.GetLayer(0)
+    assert lyr.GetFeatureCount() == 1
+    ds = None
+
+
+###############################################################################
+# Test -clipsrc with a clip layer with an invalid polygon (in a dataset)
 
 
 @pytest.mark.require_driver("GPKG")
-@pytest.mark.require_geos(3, 8)
-def test_ogr2ogr_lib_clipsrc_invalid_polygon(tmp_vsimem):
+@pytest.mark.require_geos
+@gdaltest.enable_exceptions()
+@pytest.mark.parametrize("clipSrc", [True, False])
+def test_ogr2ogr_lib_clip_invalid_polygon(tmp_vsimem, clipSrc):
 
     srcDS = gdal.GetDriverByName("Memory").Create("", 0, 0, 0, gdal.GDT_Unknown)
     srs = osr.SpatialReference()
@@ -1235,8 +1264,24 @@ def test_ogr2ogr_lib_clipsrc_invalid_polygon(tmp_vsimem):
     clip_ds = None
 
     # Intersection of above geometry with clipSrc bounding box is a point
+    with pytest.raises(Exception, match=r"cannot load.*clip geometry"):
+        gdal.VectorTranslate(
+            "",
+            srcDS,
+            format="Memory",
+            clipSrc=clip_path if clipSrc else None,
+            clipDst=clip_path if not clipSrc else None,
+        )
+
     with gdal.quiet_errors():
-        ds = gdal.VectorTranslate("", srcDS, format="Memory", clipSrc=clip_path)
+        ds = gdal.VectorTranslate(
+            "",
+            srcDS,
+            format="Memory",
+            makeValid=True,
+            clipSrc=clip_path if clipSrc else None,
+            clipDst=clip_path if not clipSrc else None,
+        )
     lyr = ds.GetLayer(0)
     assert lyr.GetFeatureCount() == 1
     ds = None
@@ -1247,7 +1292,7 @@ def test_ogr2ogr_lib_clipsrc_invalid_polygon(tmp_vsimem):
 
 
 @pytest.mark.require_driver("GPKG")
-@pytest.mark.require_geos(3, 8)
+@pytest.mark.require_geos
 def test_ogr2ogr_lib_clipsrc_3d_polygon(tmp_vsimem):
 
     srcDS = gdal.GetDriverByName("Memory").Create("", 0, 0, 0, gdal.GDT_Unknown)
@@ -1417,7 +1462,7 @@ def test_ogr2ogr_lib_clipdst_discard_lower_dimensionality():
 
 
 ###############################################################################
-# Test /-clipsrc-clipdst with reprojection
+# Test -clipsrc / -clipdst with reprojection
 
 
 @pytest.mark.require_geos
@@ -2121,6 +2166,7 @@ def test_ogr2ogr_lib_reprojection_curve_geometries_forced_geom_type(geometryType
 
 
 @pytest.mark.require_driver("CSV")
+@pytest.mark.require_driver("GeoJSON")
 def test_ogr2ogr_lib_reprojection_curve_geometries_output_does_not_support_curve(
     tmp_vsimem,
 ):
@@ -2710,3 +2756,163 @@ def test_ogr2ogr_lib_coordinate_precision_with_geom():
         assert f.GetGeometryRef().ExportToWkt() == "LINESTRING (0 0,10 10)"
     else:
         assert f.GetGeometryRef().ExportToWkt() == "LINESTRING (1 1,9 9)"
+
+
+###############################################################################
+
+
+def test_ogr2ogr_lib_not_enough_gcp():
+
+    src_ds = gdal.GetDriverByName("Memory").Create("", 0, 0, 0, gdal.GDT_Unknown)
+    src_ds.CreateLayer("test")
+
+    with pytest.raises(
+        Exception, match="Failed to compute GCP transform: Not enough points available"
+    ):
+        gdal.VectorTranslate("", src_ds, options="-f Memory -gcp 0 0 0 0")
+
+
+###############################################################################
+
+
+def test_ogr2ogr_lib_two_gcps():
+
+    src_ds = gdal.GetDriverByName("Memory").Create("", 0, 0, 0, gdal.GDT_Unknown)
+    src_lyr = src_ds.CreateLayer("test")
+    f = ogr.Feature(src_lyr.GetLayerDefn())
+    f.SetGeometry(ogr.CreateGeometryFromWkt("POINT (2 3)"))
+    src_lyr.CreateFeature(f)
+
+    out_ds = gdal.VectorTranslate(
+        "", src_ds, options="-f Memory -gcp 1 2 200 300 -gcp 3 4 300 400"
+    )
+    out_lyr = out_ds.GetLayer(0)
+    f = out_lyr.GetNextFeature()
+    assert f.GetGeometryRef().GetX(0) == pytest.approx(250)
+    assert f.GetGeometryRef().GetY(0) == pytest.approx(350)
+
+
+###############################################################################
+# Test -skipInvalid
+
+
+@pytest.mark.require_geos
+@gdaltest.enable_exceptions()
+def test_ogr2ogr_lib_skip_invalid(tmp_vsimem):
+
+    srcDS = gdal.GetDriverByName("Memory").Create("", 0, 0, 0, gdal.GDT_Unknown)
+    srcLayer = srcDS.CreateLayer("test")
+    f = ogr.Feature(srcLayer.GetLayerDefn())
+    f.SetGeometry(ogr.CreateGeometryFromWkt("POINT(1 2)"))
+    srcLayer.CreateFeature(f)
+    f = ogr.Feature(srcLayer.GetLayerDefn())
+    f.SetGeometry(ogr.CreateGeometryFromWkt("POLYGON((0 0,1 1,0 1,1 0,0 0))"))
+    srcLayer.CreateFeature(f)
+
+    with gdal.quiet_errors():
+        ds = gdal.VectorTranslate("", srcDS, format="Memory", skipInvalid=True)
+    lyr = ds.GetLayer(0)
+    assert lyr.GetFeatureCount() == 1
+    ds = None
+
+
+###############################################################################
+# Test -t_srs in Arrow code path
+
+
+@gdaltest.enable_exceptions()
+@pytest.mark.parametrize("force_reproj_threading", [False, True])
+@pytest.mark.parametrize("source_driver", ["GPKG", "Parquet"])
+def test_ogr2ogr_lib_reproject_arrow(tmp_vsimem, source_driver, force_reproj_threading):
+
+    src_driver = gdal.GetDriverByName(source_driver)
+    if src_driver is None:
+        pytest.skip(f"{source_driver} is not available")
+    src_filename = str(tmp_vsimem / ("in." + source_driver.lower()))
+    with src_driver.Create(src_filename, 0, 0, 0, gdal.GDT_Unknown) as srcDS:
+        srs = osr.SpatialReference()
+        srs.ImportFromEPSG(32631)
+        srcLayer = srcDS.CreateLayer("test", srs=srs)
+        f = ogr.Feature(srcLayer.GetLayerDefn())
+        f.SetGeometry(ogr.CreateGeometryFromWkt("POINT(500000 4500000)"))
+        srcLayer.CreateFeature(f)
+        f = ogr.Feature(srcLayer.GetLayerDefn())
+        srcLayer.CreateFeature(f)
+        f = ogr.Feature(srcLayer.GetLayerDefn())
+        f.SetGeometry(ogr.CreateGeometryFromWkt("POINT(500000 4000000)"))
+        srcLayer.CreateFeature(f)
+
+    config_options = {"CPL_DEBUG": "ON", "OGR2OGR_USE_ARROW_API": "YES"}
+    if force_reproj_threading:
+        config_options["OGR2OGR_MIN_FEATURES_FOR_THREADED_REPROJ"] = "0"
+
+    with gdal.OpenEx(src_filename) as src_ds:
+        for i in range(2):
+
+            got_msg = []
+
+            def my_handler(errorClass, errno, msg):
+                got_msg.append(msg)
+                return
+
+            with gdaltest.error_handler(my_handler), gdaltest.config_options(
+                config_options
+            ):
+                ds = gdal.VectorTranslate(
+                    "", src_ds, format="Memory", dstSRS="EPSG:4326"
+                )
+
+            assert "OGR2OGR: Using WriteArrowBatch()" in got_msg
+
+            lyr = ds.GetLayer(0)
+            assert lyr.GetFeatureCount() == 3
+            f = lyr.GetNextFeature()
+            ogrtest.check_feature_geometry(f, "POINT(3 40.65085651557158)")
+            f = lyr.GetNextFeature()
+            assert f.GetGeometryRef() is None
+            f = lyr.GetNextFeature()
+            ogrtest.check_feature_geometry(f, "POINT(3 36.14471809881776)")
+
+
+###############################################################################
+# Test -t_srs in Arrow code path in a situation where it cannot be triggered
+# currently (source CRS is crossing anti-meridian)
+
+
+@gdaltest.enable_exceptions()
+@pytest.mark.require_geos
+@pytest.mark.require_driver("GPKG")
+def test_ogr2ogr_lib_reproject_arrow_optim_cannot_trigger(tmp_vsimem):
+
+    src_filename = str(tmp_vsimem / "in.gpkg")
+    with gdal.GetDriverByName("GPKG").Create(
+        src_filename, 0, 0, 0, gdal.GDT_Unknown
+    ) as srcDS:
+        srs = osr.SpatialReference()
+        srs.ImportFromEPSG(32660)
+        srcLayer = srcDS.CreateLayer("test", srs=srs)
+        f = ogr.Feature(srcLayer.GetLayerDefn())
+        f.SetGeometry(
+            ogr.CreateGeometryFromWkt(
+                "LINESTRING(657630.64 4984896.17,815261.43 4990738.26)"
+            )
+        )
+        srcLayer.CreateFeature(f)
+
+    got_msg = []
+
+    def my_handler(errorClass, errno, msg):
+        got_msg.append(msg)
+        return
+
+    config_options = {"CPL_DEBUG": "ON", "OGR2OGR_USE_ARROW_API": "YES"}
+    with gdaltest.error_handler(my_handler), gdaltest.config_options(config_options):
+        ds = gdal.VectorTranslate("", src_filename, format="Memory", dstSRS="EPSG:4326")
+
+    assert "OGR2OGR: Using WriteArrowBatch()" not in got_msg
+
+    lyr = ds.GetLayer(0)
+    assert lyr.GetFeatureCount() == 1
+    f = lyr.GetNextFeature()
+    assert f.GetGeometryRef().GetGeometryType() == ogr.wkbMultiLineString
+    assert f.GetGeometryRef().GetGeometryCount() == 2
diff --git a/autotest/utilities/test_ogrinfo.py b/autotest/utilities/test_ogrinfo.py
index 1d15129dd13e..25fcda0584a3 100755
--- a/autotest/utilities/test_ogrinfo.py
+++ b/autotest/utilities/test_ogrinfo.py
@@ -10,25 +10,10 @@
 ###############################################################################
 # Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
+import json
 import os
 import pathlib
 import stat
@@ -324,6 +309,25 @@ def test_ogrinfo_19(ogrinfo_path):
     assert "ESRI Shapefile -vector- (rw+v): ESRI Shapefile" in ret
 
 
+###############################################################################
+# Test --formats -json
+
+
+@pytest.mark.require_driver("ESRI Shapefile")
+def test_ogrinfo_formats_json(ogrinfo_path):
+
+    ret = json.loads(
+        gdaltest.runexternal(ogrinfo_path + " --formats -json", check_memleak=False)
+    )
+    assert {
+        "short_name": "ESRI Shapefile",
+        "long_name": "ESRI Shapefile",
+        "scopes": ["vector"],
+        "capabilities": ["open", "create", "virtual_io"],
+        "file_extensions": ["shp", "dbf", "shz", "shp.zip"],
+    } in ret
+
+
 ###############################################################################
 # Test --help-general
 
@@ -521,6 +525,7 @@ def test_ogrinfo_23(ogrinfo_path, tmp_path):
 # Test metadata
 
 
+@pytest.mark.require_driver("OGR_VRT")
 def test_ogrinfo_24(ogrinfo_path, tmp_path):
 
     vrt_fname = str(tmp_path / "test_ogrinfo_24.vrt")
diff --git a/autotest/utilities/test_ogrinfo_lib.py b/autotest/utilities/test_ogrinfo_lib.py
index 055e69ed2c40..1f9b58631639 100755
--- a/autotest/utilities/test_ogrinfo_lib.py
+++ b/autotest/utilities/test_ogrinfo_lib.py
@@ -8,23 +8,7 @@
 ###############################################################################
 # Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import json
@@ -33,7 +17,7 @@
 import gdaltest
 import pytest
 
-from osgeo import gdal, ogr
+from osgeo import gdal, ogr, osr
 
 ###############################################################################
 # Simple test
@@ -317,6 +301,7 @@ def test_ogrinfo_lib_json_relationships():
 # Test json output with OFSTJSON field
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_ogrinfo_lib_json_OFSTJSON():
 
     ds = gdal.OpenEx(
@@ -375,6 +360,7 @@ def test_ogrinfo_lib_json_OFSTJSON():
 # Test json output with -fields=NO
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_ogrinfo_lib_json_fields_NO():
 
     ds = gdal.OpenEx(
@@ -398,6 +384,7 @@ def test_ogrinfo_lib_json_fields_NO():
 # Test json output with -geom=NO
 
 
+@pytest.mark.require_driver("GeoJSON")
 def test_ogrinfo_lib_json_geom_NO():
 
     ds = gdal.OpenEx(
@@ -637,3 +624,24 @@ def test_ogrinfo_lib_layers():
 
     with pytest.raises(Exception, match="Couldn't fetch requested layer"):
         gdal.VectorInfo(ds, format="json", layers=["invalid"])
+
+
+###############################################################################
+
+
+@pytest.mark.parametrize("epoch", ["2021.0", "2021.3"])
+def test_ogrinfo_lib_coordinate_epoch(epoch):
+
+    ds = gdal.GetDriverByName("Memory").Create("dummy", 0, 0, 0, gdal.GDT_Unknown)
+    srs = osr.SpatialReference()
+    srs.ImportFromEPSG(4326)
+    srs.SetCoordinateEpoch(float(epoch))
+    ds.CreateLayer("foo", srs=srs)
+
+    ret = gdal.VectorInfo(ds)
+    assert f"Coordinate epoch: {epoch}" in ret
+
+    j = gdal.VectorInfo(ds, format="json")
+    crs = j["layers"][0]["geometryFields"][0]["coordinateSystem"]
+    assert "coordinateEpoch" in crs
+    assert crs["coordinateEpoch"] == float(epoch)
diff --git a/autotest/utilities/test_ogrlineref.py b/autotest/utilities/test_ogrlineref.py
index 2ed5eeee0a24..2eb3a83b7843 100755
--- a/autotest/utilities/test_ogrlineref.py
+++ b/autotest/utilities/test_ogrlineref.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
@@ -123,6 +107,7 @@ def test_ogrlineref_4(ogrlineref_path, parts_shp, tmp_path):
 # test kml
 
 
+@pytest.mark.require_driver("KML")
 def test_ogrlineref_5(ogrlineref_path, tmp_path):
 
     parts_kml = str(tmp_path / "parts.kml")
diff --git a/autotest/utilities/test_ogrtindex.py b/autotest/utilities/test_ogrtindex.py
index cd05515a09f3..4c35a9d4d184 100755
--- a/autotest/utilities/test_ogrtindex.py
+++ b/autotest/utilities/test_ogrtindex.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/autotest/utilities/test_sozip.py b/autotest/utilities/test_sozip.py
index dc4f08b433d7..c94b18457903 100755
--- a/autotest/utilities/test_sozip.py
+++ b/autotest/utilities/test_sozip.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import gdaltest
diff --git a/ci/travis/conda/setup.sh b/ci/travis/conda/setup.sh
index b4cd637babee..15dcff7011f5 100755
--- a/ci/travis/conda/setup.sh
+++ b/ci/travis/conda/setup.sh
@@ -6,8 +6,8 @@ conda config --show-sources
 
 rm -f ~/.condarc
 
-# Cf https://github.com/conda-forge/gdal-feedstock/pull/939
-conda config --add channels conda-forge/label/numpy_rc
+# For Python 3.13
+conda config --add channels conda-forge/label/python_rc
 
 conda config --show-sources
 
diff --git a/ci/travis/csa_common/script.sh b/ci/travis/csa_common/script.sh
index ac7bfe1a14c8..cf6bda36db35 100755
--- a/ci/travis/csa_common/script.sh
+++ b/ci/travis/csa_common/script.sh
@@ -8,7 +8,7 @@ rm -f filtered_scanbuild.txt
 files=$(find scanbuildoutput -name "*.sarif")
 for f in $files; do
     # CSA 10 uses artifactLocation. Earlier versions used fileLocation
-    (sed 's/fileLocation/artifactLocation/g' < $f) |jq '.runs[].results[] | (if .locations[].physicalLocation.artifactLocation.uri | (contains("/usr/include") or contains("degrib") or contains("libpng") or contains("libjpeg") or contains("EHapi") or contains("GDapi") or contains("SWapi") or contains("osr_cs_wkt_parser") or contains("ods_formula_parser") or contains("swq_parser") or contains("libjson") or contains("flatbuffers") or contains("cpl_minizip_zip.cpp") or contains("gdal_rpc.cpp") or contains("internal_libqhull") ) then empty else { "uri": .locations[].physicalLocation.artifactLocation.uri, "msg": .message.text, "location": .codeFlows[-1].threadFlows[-1].locations[-1] } end)' > tmp.txt
+    (sed 's/fileLocation/artifactLocation/g' < $f) |jq '.runs[].results[] | (if .locations[].physicalLocation.artifactLocation.uri | (contains("/usr/include") or contains("degrib") or contains("libpng") or contains("libjpeg") or contains("EHapi") or contains("GDapi") or contains("SWapi") or contains("osr_cs_wkt_parser") or contains("ods_formula_parser") or contains("swq_parser") or contains("libjson") or contains("flatbuffers") or contains("cpl_minizip_zip.cpp") or contains("gdal_rpc.cpp") or contains("gdal_interpolateatpoint.cpp") or contains("internal_libqhull") ) then empty else { "uri": .locations[].physicalLocation.artifactLocation.uri, "msg": .message.text, "location": .codeFlows[-1].threadFlows[-1].locations[-1] } end)' > tmp.txt
     if [ -s tmp.txt ]; then
         echo "Errors from $f: "
         cat $f
diff --git a/ci/travis/osx/before_install.sh b/ci/travis/osx/before_install.sh
index 27e07197e4e7..e0f953c54f4b 100755
--- a/ci/travis/osx/before_install.sh
+++ b/ci/travis/osx/before_install.sh
@@ -6,7 +6,8 @@ conda update -n base -c defaults conda
 conda install -y compilers automake pkgconfig cmake
 
 conda config --set channel_priority strict
-conda install --yes --quiet proj python=3.12 swig lxml jsonschema numpy
-conda install --yes --quiet --only-deps libgdal libgdal-arrow-parquet
-# Remove libgdal as above installation of libgdal-arrow-parquet installed it
-conda remove --yes libgdal
+conda install --yes --quiet proj python=3.12 swig lxml jsonschema numpy setuptools
+conda install --yes --quiet libgdal libgdal-arrow-parquet
+conda install --yes --quiet libavif
+# Now remove all libgdal* packages, but not their dependencies
+conda remove --yes --force $(conda list libgdal | grep libgdal | awk '{print $1}')
diff --git a/ci/travis/s390x/before_install.sh b/ci/travis/s390x/before_install.sh
index 5c85105472b8..9ddc8f5ab9f2 100755
--- a/ci/travis/s390x/before_install.sh
+++ b/ci/travis/s390x/before_install.sh
@@ -3,8 +3,9 @@
 set -e
 
 sudo pip uninstall -y setuptools
-sudo rm -rf /usr/local/lib/python*
-sudo apt-get remove -f python
+sudo rm -rf /usr/local/bin/*
+sudo rm -rf /usr/local/lib/*
+sudo apt-get remove -f python python3-pip
 
 sudo apt-get update
 sudo apt-get install -y software-properties-common
diff --git a/cmake/helpers/CheckDependentLibraries.cmake b/cmake/helpers/CheckDependentLibraries.cmake
index 6f9ee274bfb8..830ecef9a437 100644
--- a/cmake/helpers/CheckDependentLibraries.cmake
+++ b/cmake/helpers/CheckDependentLibraries.cmake
@@ -8,275 +8,7 @@ Detect GDAL dependencies and set variable HAVE_*
 
 #]=======================================================================]
 
-include(CheckFunctionExists)
-include(CMakeDependentOption)
-include(FeatureSummary)
-include(DefineFindPackage2)
-include(CheckSymbolExists)
-
-option(
-  GDAL_USE_EXTERNAL_LIBS
-  "Whether detected external libraries should be used by default. This should be set before CMakeCache.txt is created."
-  ON)
-
-set(GDAL_USE_INTERNAL_LIBS_ALLOWED_VALUES ON OFF WHEN_NO_EXTERNAL)
-set(
-  GDAL_USE_INTERNAL_LIBS WHEN_NO_EXTERNAL
-  CACHE STRING "Control how internal libraries should be used by default. This should be set before CMakeCache.txt is created.")
-set_property(CACHE GDAL_USE_INTERNAL_LIBS PROPERTY STRINGS ${GDAL_USE_INTERNAL_LIBS_ALLOWED_VALUES})
-if(NOT GDAL_USE_INTERNAL_LIBS IN_LIST GDAL_USE_INTERNAL_LIBS_ALLOWED_VALUES)
-    message(FATAL_ERROR "GDAL_USE_INTERNAL_LIBS must be one of ${GDAL_USE_INTERNAL_LIBS_ALLOWED_VALUES}")
-endif()
-
-set(GDAL_IMPORT_DEPENDENCIES [[
-include(CMakeFindDependencyMacro)
-include("${CMAKE_CURRENT_LIST_DIR}/DefineFindPackage2.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/GdalFindModulePath.cmake")
-]])
-if(TARGET Threads::Threads)
-  string(APPEND GDAL_IMPORT_DEPENDENCIES "find_dependency(Threads)\n")
-endif()
-
-# Check that the configuration has a valid value for INTERFACE_INCLUDE_DIRECTORIES. This aimed at avoiding issues like
-# https://github.com/OSGeo/gdal/issues/5324
-function (gdal_check_target_is_valid target res_var)
-  get_target_property(_interface_include_directories ${target} "INTERFACE_INCLUDE_DIRECTORIES")
-  if(_interface_include_directories)
-    foreach(_dir IN LISTS _interface_include_directories)
-      if(NOT EXISTS "${_dir}")
-        message(WARNING "Target ${target} references ${_dir} as a INTERFACE_INCLUDE_DIRECTORIES, but it does not exist. Ignoring that target.")
-        set(${res_var} FALSE PARENT_SCOPE)
-        return()
-      endif()
-    endforeach()
-  elseif("${target}" STREQUAL "geotiff_library" AND DEFINED GeoTIFF_INCLUDE_DIRS)
-    # geotiff-config.cmake of GeoTIFF 1.7.0 doesn't define a INTERFACE_INCLUDE_DIRECTORIES
-    # property, but a GeoTIFF_INCLUDE_DIRS variable.
-    set_target_properties(${target} PROPERTIES
-                          INTERFACE_INCLUDE_DIRECTORIES "${GeoTIFF_INCLUDE_DIRS}")
-  else()
-     message(WARNING "Target ${target} has no INTERFACE_INCLUDE_DIRECTORIES property. Ignoring that target.")
-     set(${res_var} FALSE PARENT_SCOPE)
-     return()
-  endif()
-  set(${res_var} TRUE PARENT_SCOPE)
-endfunction()
-
-# Package acceptance based on a candidate target list.
-# If a matching target is found, sets ${name}_FOUND to TRUE,
-# ${name}_INCLUDE_DIRS to "" and ${name}_LIBRARIES to the target name.
-# If `REQUIRED` is used, ${name}_FOUND is set to FALSE if no target matches.
-function(gdal_check_package_target name)
-  if("REQUIRED" IN_LIST ARGN)
-    list(REMOVE_ITEM ARGN "REQUIRED")
-    set(${name}_FOUND FALSE PARENT_SCOPE)
-  endif()
-  foreach(target IN LISTS ARGN)
-    if(TARGET ${target})
-      gdal_check_target_is_valid(${target} _is_valid)
-      if (_is_valid)
-        set(${name}_TARGET "${target}" PARENT_SCOPE)
-        set(${name}_FOUND TRUE PARENT_SCOPE)
-        return()
-      endif()
-    endif()
-  endforeach()
-endfunction()
-
-# Macro to declare a dependency on an external package.
-# If not marked with the ALWAYS_ON_WHEN_FOUND option, dependencies can be
-# marked for user control with either the CAN_DISABLE or DISABLED_BY_DEFAULT
-# option. User control is done via a cache variable GDAL_USE_{name in upper case}
-# with the default value ON for CAN_DISABLE or OFF for DISABLED_BY_DEFAULT.
-# The RECOMMENDED option is used for the feature summary.
-# The VERSION, CONFIG, MODULE, COMPONENTS and NAMES parameters are passed to find_package().
-# Using NAMES with find_package() implies config mode. However, gdal_check_package()
-# attempts another find_package() without NAMES if the config mode attempt was not
-# successful, allowing a fallback to Find modules.
-# The TARGETS parameter can define a list of candidate targets. If given, a
-# package will only be accepted if it defines one of the given targets. The matching
-# target name will be saved in ${name}_TARGET.
-# The NAMES and TARGETS map to GDAL_CHECK_PACKAGE_${name}_NAMES and
-# GDAL_CHECK_PACKAGE_${name}_TARGETS cache variables which can be used to
-# overwrite the default config and targets names.
-# The required find_dependency() commands for exported config are appended to
-# the GDAL_IMPORT_DEPENDENCIES string (when BUILD_SHARED_LIBS=OFF).
-macro (gdal_check_package name purpose)
-  set(_options CONFIG MODULE CAN_DISABLE RECOMMENDED DISABLED_BY_DEFAULT ALWAYS_ON_WHEN_FOUND)
-  set(_oneValueArgs VERSION NAMES)
-  set(_multiValueArgs COMPONENTS TARGETS PATHS)
-  cmake_parse_arguments(_GCP "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN})
-  string(TOUPPER ${name} key)
-  set(_find_dependency "")
-  set(_find_dependency_args "")
-  if(FIND_PACKAGE2_${name}_ENABLED)
-    find_package2(${name} QUIET OUT_DEPENDENCY _find_dependency)
-  else()
-    set(_find_package_args)
-    # For some reason passing the HDF5 version requirement cause a linking error of the libkea driver on Conda Windows builds...
-    if (_GCP_VERSION AND NOT ("${name}" STREQUAL "TileDB") AND NOT ("${name}" STREQUAL "HDF5"))
-      list(APPEND _find_package_args ${_GCP_VERSION})
-    endif ()
-    if (_GCP_CONFIG)
-      list(APPEND _find_package_args CONFIG)
-    endif ()
-    if (_GCP_MODULE)
-      list(APPEND _find_package_args MODULE)
-    endif ()
-    if (_GCP_COMPONENTS)
-      list(APPEND _find_package_args COMPONENTS ${_GCP_COMPONENTS})
-    endif ()
-    if (_GCP_PATHS)
-      list(APPEND _find_package_args PATHS ${_GCP_PATHS})
-    endif ()
-    if (_GCP_NAMES)
-      set(GDAL_CHECK_PACKAGE_${name}_NAMES "${_GCP_NAMES}" CACHE STRING "Config file name for ${name}")
-      mark_as_advanced(GDAL_CHECK_PACKAGE_${name}_NAMES)
-    endif ()
-    if (_GCP_TARGETS)
-      set(GDAL_CHECK_PACKAGE_${name}_TARGETS "${_GCP_TARGETS}" CACHE STRING "Target name candidates for ${name}")
-      mark_as_advanced(GDAL_CHECK_PACKAGE_${name}_TARGETS)
-    endif ()
-    if (GDAL_CHECK_PACKAGE_${name}_NAMES)
-      find_package(${name} NAMES ${GDAL_CHECK_PACKAGE_${name}_NAMES} ${_find_package_args})
-      gdal_check_package_target(${name} ${GDAL_CHECK_PACKAGE_${name}_TARGETS} REQUIRED)
-      if (${name}_FOUND)
-        get_filename_component(_find_dependency_args "${${name}_CONFIG}" NAME)
-        string(REPLACE ";" " " _find_dependency_args "${name} ${_find_package_args} NAMES ${GDAL_CHECK_PACKAGE_${name}_NAMES} CONFIGS ${_find_dependency_args}")
-      endif ()
-    endif ()
-    if (NOT ${name}_FOUND)
-      find_package(${name} ${_find_package_args})
-      if (${name}_FOUND)
-        gdal_check_package_target(${name} ${GDAL_CHECK_PACKAGE_${name}_TARGETS})
-      elseif (${key}_FOUND) # Some find modules do not set <Pkg>_FOUND
-        gdal_check_package_target(${key} ${GDAL_CHECK_PACKAGE_${name}_TARGETS})
-        set(${name}_FOUND "${key}_FOUND")
-      endif ()
-      if (${name}_FOUND)
-        string(REPLACE ";" " " _find_dependency_args "${name} ${_find_package_args}")
-      endif()
-    endif ()
-  endif ()
-  if (${key}_FOUND OR ${name}_FOUND)
-    if(_GCP_VERSION)
-
-      if( "${name}" STREQUAL "TileDB" AND NOT DEFINED TileDB_VERSION)
-        get_property(_dirs TARGET TileDB::tiledb_shared PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
-        foreach(_dir IN LISTS _dirs)
-          set(TILEDB_VERSION_FILENAME "${_dir}/tiledb/tiledb_version.h")
-          if(EXISTS ${TILEDB_VERSION_FILENAME})
-            file(READ ${TILEDB_VERSION_FILENAME} _tiledb_version_contents)
-            string(REGEX REPLACE "^.*TILEDB_VERSION_MAJOR +([0-9]+).*$" "\\1" TILEDB_VERSION_MAJOR "${_tiledb_version_contents}")
-            string(REGEX REPLACE "^.*TILEDB_VERSION_MINOR +([0-9]+).*$" "\\1" TILEDB_VERSION_MINOR "${_tiledb_version_contents}")
-            set(TileDB_VERSION "${TILEDB_VERSION_MAJOR}.${TILEDB_VERSION_MINOR}")
-          endif()
-        endforeach()
-      endif()
-
-      if (DEFINED ${name}_VERSION_STRING AND NOT DEFINED ${name}_VERSION)
-          set(${name}_VERSION "${${name}_VERSION_STRING}")
-      endif()
-
-      if( "${${name}_VERSION}" STREQUAL "")
-        message(WARNING "${name} has unknown version. Assuming it is at least matching the minimum version required of ${_GCP_VERSION}")
-        set(HAVE_${key} ON)
-      elseif( ${name}_VERSION VERSION_LESS ${_GCP_VERSION})
-        message(WARNING "Ignoring ${name} because it is at version ${${name}_VERSION}, whereas the minimum version required is ${_GCP_VERSION}")
-        set(HAVE_${key} OFF)
-      else()
-        set(HAVE_${key} ON)
-      endif()
-    else()
-      set(HAVE_${key} ON)
-    endif()
-  else ()
-    set(HAVE_${key} OFF)
-  endif ()
-  if (purpose STREQUAL "")
-
-  else ()
-    if (_GCP_RECOMMENDED)
-      set_package_properties(
-        ${name} PROPERTIES
-        PURPOSE ${purpose}
-        TYPE RECOMMENDED)
-    else ()
-      set_package_properties(${name} PROPERTIES PURPOSE ${purpose})
-    endif ()
-  endif ()
-
-  if (_GCP_CAN_DISABLE OR _GCP_DISABLED_BY_DEFAULT)
-    set(_gcpp_status ON)
-    if (GDAL_USE_${key})
-      if (NOT HAVE_${key})
-        message(FATAL_ERROR "Configured to use ${key}, but not found")
-      endif ()
-    elseif (NOT GDAL_USE_EXTERNAL_LIBS)
-      set(_gcpp_status OFF)
-      if (HAVE_${key} AND NOT GDAL_USE_${key})
-        message(STATUS
-          "${key} has been found, but is disabled due to GDAL_USE_EXTERNAL_LIBS=OFF. Enable it by setting GDAL_USE_${key}=ON"
-          )
-        set(_find_dependency_args "")
-      endif ()
-    endif ()
-    if (_gcpp_status AND _GCP_DISABLED_BY_DEFAULT)
-      set(_gcpp_status OFF)
-      if (HAVE_${key} AND NOT GDAL_USE_${key})
-        message(STATUS "${key} has been found, but is disabled by default. Enable it by setting GDAL_USE_${key}=ON")
-        set(_find_dependency_args "")
-      endif ()
-    endif ()
-    cmake_dependent_option(GDAL_USE_${key} "Set ON to use ${key}" ${_gcpp_status} "HAVE_${key}" OFF)
-  elseif (NOT _GCP_ALWAYS_ON_WHEN_FOUND)
-    message(FATAL_ERROR "Programming error: missing CAN_DISABLE or DISABLED_BY_DEFAULT option for component ${name}")
-  endif ()
-
-  if(_find_dependency_args)
-    string(REPLACE "\"" "\\\"" _find_dependency_args "${_find_dependency_args}")
-    set(_find_dependency "find_dependency(${_find_dependency_args})\n")
-  endif()
-  if(NOT BUILD_SHARED_LIBS AND GDAL_USE_${key} AND _find_dependency)
-    string(APPEND GDAL_IMPORT_DEPENDENCIES "${_find_dependency}")
-  endif()
-  unset(_find_dependency_args)
-  unset(_find_dependency)
-endmacro ()
-
-function (split_libpath _lib)
-  if (_lib)
-    # split lib_line into -L and -l linker options
-    get_filename_component(_path ${${_lib}} PATH)
-    get_filename_component(_name ${${_lib}} NAME_WE)
-    string(REGEX REPLACE "^lib" "" _name ${_name})
-    set(${_lib} -L${_path} -l${_name})
-  endif ()
-endfunction ()
-
-function (gdal_internal_library libname)
-  set(_options REQUIRED)
-  set(_oneValueArgs)
-  set(_multiValueArgs)
-  cmake_parse_arguments(_GIL "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN})
-  if ("${GDAL_USE_INTERNAL_LIBS}" STREQUAL "ON")
-      set(_default_value ON)
-  elseif ("${GDAL_USE_INTERNAL_LIBS}" STREQUAL "OFF")
-      set(_default_value OFF)
-  elseif( GDAL_USE_${libname} )
-      set(_default_value OFF)
-  else()
-      set(_default_value ON)
-  endif()
-  set(GDAL_USE_${libname}_INTERNAL
-      ${_default_value}
-      CACHE BOOL "Use internal ${libname} copy (if set to ON, has precedence over GDAL_USE_${libname})")
-  if (_GIL_REQUIRED
-      AND (NOT GDAL_USE_${libname})
-      AND (NOT GDAL_USE_${libname}_INTERNAL))
-    message(FATAL_ERROR "GDAL_USE_${libname} or GDAL_USE_${libname}_INTERNAL must be set to ON")
-  endif ()
-endfunction ()
+include(CheckDependentLibrariesCommon)
 
 # Custom find_package definitions
 
@@ -313,6 +45,7 @@ if (Iconv_FOUND)
       size_t ret = iconv(conv, &in, &ilen, &out, &olen);
       return (size_t)ret;
     }")
+  include(CheckCXXSourceCompiles)
   check_cxx_source_compiles("${ICONV_CONST_TEST_CODE}" _ICONV_SECOND_ARGUMENT_IS_NOT_CONST)
   if (_ICONV_SECOND_ARGUMENT_IS_NOT_CONST)
     set(ICONV_CPP_CONST "")
@@ -366,8 +99,7 @@ endif()
 
 gdal_check_package(XercesC "Read and write XML formats (needed for GMLAS and ILI drivers)" CAN_DISABLE)
 
-gdal_check_package(ZLIB "zlib (external)" CAN_DISABLE)
-gdal_internal_library(ZLIB REQUIRED)
+include(CheckDependentLibrariesZLIB)
 
 gdal_check_package(Deflate "Enable libdeflate compression library (complement to ZLib)" CAN_DISABLE)
 
@@ -415,7 +147,7 @@ set_package_properties(
   URL "https://libtiff.gitlab.io/libtiff/"
   DESCRIPTION "Support for the Tag Image File Format (TIFF)."
   TYPE RECOMMENDED)
-gdal_internal_library(TIFF REQUIRED)
+gdal_internal_library(TIFF)
 
 if (DEFINED ENV{CONDA_PREFIX} AND UNIX)
     # Currently on Unix, the Zstd cmake config file is buggy. It declares a
@@ -430,55 +162,12 @@ gdal_check_package(ZSTD "ZSTD compression library" CAN_DISABLE ${ZSTD_NAMES_AND_
 gdal_check_package(SFCGAL "gdal core supports ISO 19107:2013 and OGC Simple Features Access 1.2 for 3D operations"
                    CAN_DISABLE)
 
-gdal_check_package(GeoTIFF "libgeotiff library (external)" CAN_DISABLE RECOMMENDED
-  NAMES GeoTIFF
-  TARGETS geotiff_library GEOTIFF::GEOTIFF
-)
-gdal_internal_library(GEOTIFF REQUIRED)
+include(CheckDependentLibrariesGeoTIFF)
 
 gdal_check_package(PNG "PNG compression library (external)" CAN_DISABLE RECOMMENDED VERSION "1.6")
 gdal_internal_library(PNG)
 
-gdal_check_package(JPEG "JPEG compression library (external)" CAN_DISABLE RECOMMENDED)
-if (GDAL_USE_JPEG AND (JPEG_LIBRARY MATCHES ".*turbojpeg\.(so|lib)"))
-  message(
-    FATAL_ERROR
-      "JPEG_LIBRARY should point to a library with libjpeg ABI, not TurboJPEG. See https://libjpeg-turbo.org/About/TurboJPEG for the difference"
-    )
-endif ()
-if (GDAL_USE_JPEG AND TARGET JPEG::JPEG)
-  set(EXPECTED_JPEG_LIB_VERSION "" CACHE STRING "Expected libjpeg version number")
-  mark_as_advanced(GDAL_CHECK_PACKAGE_${name}_NAMES)
-  if (EXPECTED_JPEG_LIB_VERSION)
-    get_property(_jpeg_old_icd TARGET JPEG::JPEG PROPERTY INTERFACE_COMPILE_DEFINITIONS)
-    set_property(TARGET JPEG::JPEG PROPERTY
-                 INTERFACE_COMPILE_DEFINITIONS "${_jpeg_old_icd};EXPECTED_JPEG_LIB_VERSION=${EXPECTED_JPEG_LIB_VERSION}")
-  endif()
-
-  # Check for jpeg12_read_scanlines() which has been added in libjpeg-turbo 2.2
-  # for dual 8/12 bit mode.
-  include(CheckCSourceCompiles)
-  include(CMakePushCheckState)
-  cmake_push_check_state(RESET)
-  set(CMAKE_REQUIRED_INCLUDES "${JPEG_INCLUDE_DIRS}")
-  set(CMAKE_REQUIRED_LIBRARIES "${JPEG_LIBRARIES}")
-  check_c_source_compiles(
-      "
-      #include <stddef.h>
-      #include <stdio.h>
-      #include \"jpeglib.h\"
-      int main()
-      {
-          jpeg_read_scanlines(0,0,0);
-          jpeg12_read_scanlines(0,0,0);
-          return 0;
-      }
-      "
-      HAVE_JPEGTURBO_DUAL_MODE_8_12)
-  cmake_pop_check_state()
-
-endif()
-gdal_internal_library(JPEG)
+include(CheckDependentLibrariesJpeg)
 
 gdal_check_package(GIF "GIF compression library (external)" CAN_DISABLE)
 gdal_internal_library(GIF)
@@ -615,7 +304,7 @@ gdal_check_package(FreeXL "Enable XLS driver" CAN_DISABLE)
 define_find_package2(GTA gta/gta.h gta PKGCONFIG_NAME gta)
 gdal_check_package(GTA "Enable GTA driver" CAN_DISABLE)
 
-gdal_check_package(MRSID "MrSID raster SDK" CAN_DISABLE)
+include(CheckDependentLibrariesMrSID)
 
 set(GDAL_USE_ARMADILLO_OLD ${GDAL_USE_ARMADILLO})
 gdal_check_package(Armadillo "C++ library for linear algebra (used for TPS transformation)" CAN_DISABLE)
@@ -714,7 +403,8 @@ gdal_check_package(GEOS "Geometry Engine - Open Source (GDAL core dependency)" R
 )
 gdal_check_package(HDF4 "Enable HDF4 driver" CAN_DISABLE)
 
-gdal_check_package(ECW "Enable ECW driver" CAN_DISABLE)
+include(CheckDependentLibrariesECW)
+
 gdal_check_package(NetCDF "Enable netCDF driver" CAN_DISABLE
   NAMES netCDF
   TARGETS netCDF::netcdf NETCDF::netCDF
@@ -751,7 +441,7 @@ gdal_check_package(Crnlib "enable gdal_DDS driver" CAN_DISABLE)
 gdal_check_package(basisu "Enable BASISU driver" CONFIG CAN_DISABLE)
 gdal_check_package(IDB "enable ogr_IDB driver" CAN_DISABLE)
 gdal_check_package(rdb "enable RIEGL RDB library" CONFIG CAN_DISABLE)
-gdal_check_package(TileDB "enable TileDB driver" CONFIG CAN_DISABLE VERSION "2.15")
+include(CheckDependentLibrariesTileDB)
 
 gdal_check_package(OpenEXR "OpenEXR >=2.2" CAN_DISABLE)
 gdal_check_package(MONGOCXX "Enable MongoDBV3 driver" CAN_DISABLE)
@@ -759,16 +449,9 @@ gdal_check_package(MONGOCXX "Enable MongoDBV3 driver" CAN_DISABLE)
 define_find_package2(HEIF libheif/heif.h heif PKGCONFIG_NAME libheif)
 gdal_check_package(HEIF "HEIF >= 1.1" CAN_DISABLE)
 
-# OpenJPEG's cmake-CONFIG is broken with older OpenJPEG releases, so call module explicitly
-set(GDAL_FIND_PACKAGE_OpenJPEG_MODE "MODULE" CACHE STRING "Mode to use for find_package(OpenJPEG): CONFIG, MODULE or empty string")
-set_property(CACHE GDAL_FIND_PACKAGE_OpenJPEG_MODE PROPERTY STRINGS "CONFIG" "MODULE" "")
-# "openjp2" target name is for the one coming from the OpenJPEG CMake configuration
-# "OPENJPEG::OpenJPEG" is the one used by cmake/modules/packages/FindOpenJPEG.cmake
-gdal_check_package(OpenJPEG "Enable JPEG2000 support with OpenJPEG library"
-                   ${GDAL_FIND_PACKAGE_OpenJPEG_MODE}
-                   CAN_DISABLE
-                   TARGETS "openjp2;OPENJPEG::OpenJPEG"
-                   VERSION "2.3.1")
+include(CheckDependentLibrariesAVIF)
+
+include(CheckDependentLibrariesOpenJPEG)
 
 gdal_check_package(HDFS "Enable Hadoop File System through native library" CAN_DISABLE)
 
@@ -781,8 +464,7 @@ gdal_check_package(PDFIUM "Enable PDF driver with Pdfium (read side)" CAN_DISABL
 gdal_check_package(Podofo "Enable PDF driver with Podofo (read side)" CAN_DISABLE)
 
 
-set(Oracle_CAN_USE_CLNTSH_AS_MAIN_LIBRARY ON)
-gdal_check_package(Oracle "Enable Oracle OCI driver" CAN_DISABLE)
+include(CheckDependentLibrariesOracle)
 gdal_check_package(TEIGHA "Enable DWG and DGNv8 drivers" CAN_DISABLE)
 gdal_check_package(FileGDB "Enable FileGDB (based on closed-source SDK) driver" CAN_DISABLE)
 
@@ -790,24 +472,19 @@ option(GDAL_USE_PUBLICDECOMPWT
        "Set ON to build MSG driver and download external https://gitlab.eumetsat.int/open-source/PublicDecompWT" OFF)
 
 # proprietary libraries KAKADU
-gdal_check_package(KDU "Enable KAKADU" CAN_DISABLE)
+include(CheckDependentLibrariesKakadu)
 gdal_check_package(LURATECH "Enable JP2Lura driver" CAN_DISABLE)
 
-gdal_check_package(Arrow "Apache Arrow C++ library" CONFIG CAN_DISABLE)
-if (Arrow_FOUND)
-    gdal_check_package(Parquet "Apache Parquet C++ library" CONFIG PATHS ${Arrow_DIR} CAN_DISABLE)
-    gdal_check_package(ArrowDataset "Apache ArrowDataset C++ library" CONFIG PATHS ${Arrow_DIR} CAN_DISABLE)
-    if (Parquet_FOUND AND NOT ArrowDataset_FOUND)
-        message(WARNING "Parquet library found, but not ArrowDataset: partitioned datasets will not be supported")
-    endif()
-    option(ARROW_USE_STATIC_LIBRARIES "Use statically built Arrow libraries" OFF)
-    mark_as_advanced(ARROW_USE_STATIC_LIBRARIES)
-endif()
+include(CheckDependentLibrariesArrowParquet)
+
+gdal_check_package(OpenDrive "Enable libOpenDRIVE" CONFIG CAN_DISABLE)
 
 # bindings
 
 # finding python in top of project because of common for autotest and bindings
 
+set(JAVA_AWT_LIBRARY NotNeeded)
+set(JAVA_AWT_INCLUDE_PATH NotNeeded)
 find_package(JNI)
 find_package(Java COMPONENTS Runtime Development)
 find_program(
diff --git a/cmake/helpers/CheckDependentLibrariesAVIF.cmake b/cmake/helpers/CheckDependentLibrariesAVIF.cmake
new file mode 100644
index 000000000000..77f31d5bf5d1
--- /dev/null
+++ b/cmake/helpers/CheckDependentLibrariesAVIF.cmake
@@ -0,0 +1,2 @@
+define_find_package2(AVIF avif/avif.h avif PKGCONFIG_NAME libavif)
+gdal_check_package(AVIF "AVIF" CAN_DISABLE)
diff --git a/cmake/helpers/CheckDependentLibrariesArrowParquet.cmake b/cmake/helpers/CheckDependentLibrariesArrowParquet.cmake
new file mode 100644
index 000000000000..5f00ee29c4f5
--- /dev/null
+++ b/cmake/helpers/CheckDependentLibrariesArrowParquet.cmake
@@ -0,0 +1,10 @@
+gdal_check_package(Arrow "Apache Arrow C++ library" CONFIG CAN_DISABLE)
+if (Arrow_FOUND)
+    gdal_check_package(Parquet "Apache Parquet C++ library" CONFIG PATHS ${Arrow_DIR} CAN_DISABLE)
+    gdal_check_package(ArrowDataset "Apache ArrowDataset C++ library" CONFIG PATHS ${Arrow_DIR} CAN_DISABLE)
+    if (Parquet_FOUND AND NOT ArrowDataset_FOUND)
+        message(WARNING "Parquet library found, but not ArrowDataset: partitioned datasets will not be supported")
+    endif()
+    option(ARROW_USE_STATIC_LIBRARIES "Use statically built Arrow libraries" OFF)
+    mark_as_advanced(ARROW_USE_STATIC_LIBRARIES)
+endif()
diff --git a/cmake/helpers/CheckDependentLibrariesCommon.cmake b/cmake/helpers/CheckDependentLibrariesCommon.cmake
new file mode 100644
index 000000000000..ebb353829fcb
--- /dev/null
+++ b/cmake/helpers/CheckDependentLibrariesCommon.cmake
@@ -0,0 +1,281 @@
+# Distributed under the GDAL/OGR MIT style License.  See accompanying file LICENSE.TXT.
+
+#[=======================================================================[.rst:
+CheckDependentLibraries.cmake
+-----------------------------
+
+Detect GDAL dependencies and set variable HAVE_*
+
+#]=======================================================================]
+
+include(CheckFunctionExists)
+include(CMakeDependentOption)
+include(FeatureSummary)
+include(DefineFindPackage2)
+include(CheckSymbolExists)
+
+option(
+  GDAL_USE_EXTERNAL_LIBS
+  "Whether detected external libraries should be used by default. This should be set before CMakeCache.txt is created."
+  ON)
+
+set(GDAL_USE_INTERNAL_LIBS_ALLOWED_VALUES ON OFF WHEN_NO_EXTERNAL)
+set(
+  GDAL_USE_INTERNAL_LIBS WHEN_NO_EXTERNAL
+  CACHE STRING "Control how internal libraries should be used by default. This should be set before CMakeCache.txt is created.")
+set_property(CACHE GDAL_USE_INTERNAL_LIBS PROPERTY STRINGS ${GDAL_USE_INTERNAL_LIBS_ALLOWED_VALUES})
+if(NOT GDAL_USE_INTERNAL_LIBS IN_LIST GDAL_USE_INTERNAL_LIBS_ALLOWED_VALUES)
+    message(FATAL_ERROR "GDAL_USE_INTERNAL_LIBS must be one of ${GDAL_USE_INTERNAL_LIBS_ALLOWED_VALUES}")
+endif()
+
+set(GDAL_IMPORT_DEPENDENCIES [[
+include(CMakeFindDependencyMacro)
+include("${CMAKE_CURRENT_LIST_DIR}/DefineFindPackage2.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/GdalFindModulePath.cmake")
+]])
+if(TARGET Threads::Threads)
+  string(APPEND GDAL_IMPORT_DEPENDENCIES "find_dependency(Threads)\n")
+endif()
+
+# Check that the configuration has a valid value for INTERFACE_INCLUDE_DIRECTORIES. This aimed at avoiding issues like
+# https://github.com/OSGeo/gdal/issues/5324
+function (gdal_check_target_is_valid target res_var)
+  get_target_property(_interface_include_directories ${target} "INTERFACE_INCLUDE_DIRECTORIES")
+  if(_interface_include_directories)
+    foreach(_dir IN LISTS _interface_include_directories)
+      if(NOT EXISTS "${_dir}")
+        message(WARNING "Target ${target} references ${_dir} as a INTERFACE_INCLUDE_DIRECTORIES, but it does not exist. Ignoring that target.")
+        set(${res_var} FALSE PARENT_SCOPE)
+        return()
+      endif()
+    endforeach()
+  elseif("${target}" STREQUAL "geotiff_library" AND DEFINED GeoTIFF_INCLUDE_DIRS)
+    # geotiff-config.cmake of GeoTIFF 1.7.0 doesn't define a INTERFACE_INCLUDE_DIRECTORIES
+    # property, but a GeoTIFF_INCLUDE_DIRS variable.
+    set_target_properties(${target} PROPERTIES
+                          INTERFACE_INCLUDE_DIRECTORIES "${GeoTIFF_INCLUDE_DIRS}")
+  else()
+     message(WARNING "Target ${target} has no INTERFACE_INCLUDE_DIRECTORIES property. Ignoring that target.")
+     set(${res_var} FALSE PARENT_SCOPE)
+     return()
+  endif()
+  set(${res_var} TRUE PARENT_SCOPE)
+endfunction()
+
+# Package acceptance based on a candidate target list.
+# If a matching target is found, sets ${name}_FOUND to TRUE,
+# ${name}_INCLUDE_DIRS to "" and ${name}_LIBRARIES to the target name.
+# If `REQUIRED` is used, ${name}_FOUND is set to FALSE if no target matches.
+function(gdal_check_package_target name)
+  if("REQUIRED" IN_LIST ARGN)
+    list(REMOVE_ITEM ARGN "REQUIRED")
+    set(${name}_FOUND FALSE PARENT_SCOPE)
+  endif()
+  foreach(target IN LISTS ARGN)
+    if(TARGET ${target})
+      gdal_check_target_is_valid(${target} _is_valid)
+      if (_is_valid)
+        set(${name}_TARGET "${target}" PARENT_SCOPE)
+        set(${name}_FOUND TRUE PARENT_SCOPE)
+        return()
+      endif()
+    endif()
+  endforeach()
+endfunction()
+
+# Macro to declare a dependency on an external package.
+# If not marked with the ALWAYS_ON_WHEN_FOUND option, dependencies can be
+# marked for user control with either the CAN_DISABLE or DISABLED_BY_DEFAULT
+# option. User control is done via a cache variable GDAL_USE_{name in upper case}
+# with the default value ON for CAN_DISABLE or OFF for DISABLED_BY_DEFAULT.
+# The RECOMMENDED option is used for the feature summary.
+# The VERSION, CONFIG, MODULE, COMPONENTS and NAMES parameters are passed to find_package().
+# Using NAMES with find_package() implies config mode. However, gdal_check_package()
+# attempts another find_package() without NAMES if the config mode attempt was not
+# successful, allowing a fallback to Find modules.
+# The TARGETS parameter can define a list of candidate targets. If given, a
+# package will only be accepted if it defines one of the given targets. The matching
+# target name will be saved in ${name}_TARGET.
+# The NAMES and TARGETS map to GDAL_CHECK_PACKAGE_${name}_NAMES and
+# GDAL_CHECK_PACKAGE_${name}_TARGETS cache variables which can be used to
+# overwrite the default config and targets names.
+# The required find_dependency() commands for exported config are appended to
+# the GDAL_IMPORT_DEPENDENCIES string (when BUILD_SHARED_LIBS=OFF).
+macro (gdal_check_package name purpose)
+  set(_options CONFIG MODULE CAN_DISABLE RECOMMENDED DISABLED_BY_DEFAULT ALWAYS_ON_WHEN_FOUND)
+  set(_oneValueArgs VERSION NAMES)
+  set(_multiValueArgs COMPONENTS TARGETS PATHS)
+  cmake_parse_arguments(_GCP "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN})
+  string(TOUPPER ${name} key)
+  set(_find_dependency "")
+  set(_find_dependency_args "")
+  if(FIND_PACKAGE2_${name}_ENABLED)
+    find_package2(${name} QUIET OUT_DEPENDENCY _find_dependency)
+  else()
+    set(_find_package_args)
+    # For some reason passing the HDF5 version requirement cause a linking error of the libkea driver on Conda Windows builds...
+    if (_GCP_VERSION AND NOT ("${name}" STREQUAL "TileDB") AND NOT ("${name}" STREQUAL "HDF5"))
+      list(APPEND _find_package_args ${_GCP_VERSION})
+    endif ()
+    if (_GCP_CONFIG)
+      list(APPEND _find_package_args CONFIG)
+    endif ()
+    if (_GCP_MODULE)
+      list(APPEND _find_package_args MODULE)
+    endif ()
+    if (_GCP_COMPONENTS)
+      list(APPEND _find_package_args COMPONENTS ${_GCP_COMPONENTS})
+    endif ()
+    if (_GCP_PATHS)
+      list(APPEND _find_package_args PATHS ${_GCP_PATHS})
+    endif ()
+    if (_GCP_NAMES)
+      set(GDAL_CHECK_PACKAGE_${name}_NAMES "${_GCP_NAMES}" CACHE STRING "Config file name for ${name}")
+      mark_as_advanced(GDAL_CHECK_PACKAGE_${name}_NAMES)
+    endif ()
+    if (_GCP_TARGETS)
+      set(GDAL_CHECK_PACKAGE_${name}_TARGETS "${_GCP_TARGETS}" CACHE STRING "Target name candidates for ${name}")
+      mark_as_advanced(GDAL_CHECK_PACKAGE_${name}_TARGETS)
+    endif ()
+    if (GDAL_CHECK_PACKAGE_${name}_NAMES)
+      find_package(${name} NAMES ${GDAL_CHECK_PACKAGE_${name}_NAMES} ${_find_package_args})
+      gdal_check_package_target(${name} ${GDAL_CHECK_PACKAGE_${name}_TARGETS} REQUIRED)
+      if (${name}_FOUND)
+        get_filename_component(_find_dependency_args "${${name}_CONFIG}" NAME)
+        string(REPLACE ";" " " _find_dependency_args "${name} ${_find_package_args} NAMES ${GDAL_CHECK_PACKAGE_${name}_NAMES} CONFIGS ${_find_dependency_args}")
+      endif ()
+    endif ()
+    if (NOT ${name}_FOUND)
+      find_package(${name} ${_find_package_args})
+      if (${name}_FOUND)
+        gdal_check_package_target(${name} ${GDAL_CHECK_PACKAGE_${name}_TARGETS})
+      elseif (${key}_FOUND) # Some find modules do not set <Pkg>_FOUND
+        gdal_check_package_target(${key} ${GDAL_CHECK_PACKAGE_${name}_TARGETS})
+        set(${name}_FOUND "${key}_FOUND")
+      endif ()
+      if (${name}_FOUND)
+        string(REPLACE ";" " " _find_dependency_args "${name} ${_find_package_args}")
+      endif()
+    endif ()
+  endif ()
+  if (${key}_FOUND OR ${name}_FOUND)
+    if(_GCP_VERSION)
+
+      if( "${name}" STREQUAL "TileDB" AND NOT DEFINED TileDB_VERSION)
+        get_property(_dirs TARGET TileDB::tiledb_shared PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
+        foreach(_dir IN LISTS _dirs)
+          set(TILEDB_VERSION_FILENAME "${_dir}/tiledb/tiledb_version.h")
+          if(EXISTS ${TILEDB_VERSION_FILENAME})
+            file(READ ${TILEDB_VERSION_FILENAME} _tiledb_version_contents)
+            string(REGEX REPLACE "^.*TILEDB_VERSION_MAJOR +([0-9]+).*$" "\\1" TILEDB_VERSION_MAJOR "${_tiledb_version_contents}")
+            string(REGEX REPLACE "^.*TILEDB_VERSION_MINOR +([0-9]+).*$" "\\1" TILEDB_VERSION_MINOR "${_tiledb_version_contents}")
+            set(TileDB_VERSION "${TILEDB_VERSION_MAJOR}.${TILEDB_VERSION_MINOR}")
+          endif()
+        endforeach()
+      endif()
+
+      if (DEFINED ${name}_VERSION_STRING AND NOT DEFINED ${name}_VERSION)
+          set(${name}_VERSION "${${name}_VERSION_STRING}")
+      endif()
+
+      if( "${${name}_VERSION}" STREQUAL "")
+        message(WARNING "${name} has unknown version. Assuming it is at least matching the minimum version required of ${_GCP_VERSION}")
+        set(HAVE_${key} ON)
+      elseif( ${name}_VERSION VERSION_LESS ${_GCP_VERSION})
+        message(WARNING "Ignoring ${name} because it is at version ${${name}_VERSION}, whereas the minimum version required is ${_GCP_VERSION}")
+        set(HAVE_${key} OFF)
+      else()
+        set(HAVE_${key} ON)
+      endif()
+    else()
+      set(HAVE_${key} ON)
+    endif()
+  else ()
+    set(HAVE_${key} OFF)
+  endif ()
+  if (purpose STREQUAL "")
+
+  else ()
+    if (_GCP_RECOMMENDED)
+      set_package_properties(
+        ${name} PROPERTIES
+        PURPOSE ${purpose}
+        TYPE RECOMMENDED)
+    else ()
+      set_package_properties(${name} PROPERTIES PURPOSE ${purpose})
+    endif ()
+  endif ()
+
+  if (_GCP_CAN_DISABLE OR _GCP_DISABLED_BY_DEFAULT)
+    set(_gcpp_status ON)
+    if (GDAL_USE_${key})
+      if (NOT HAVE_${key})
+        message(FATAL_ERROR "Configured to use ${key}, but not found")
+      endif ()
+    elseif (NOT GDAL_USE_EXTERNAL_LIBS)
+      set(_gcpp_status OFF)
+      if (HAVE_${key} AND NOT GDAL_USE_${key})
+        message(STATUS
+          "${key} has been found, but is disabled due to GDAL_USE_EXTERNAL_LIBS=OFF. Enable it by setting GDAL_USE_${key}=ON"
+          )
+        set(_find_dependency_args "")
+      endif ()
+    endif ()
+    if (_gcpp_status AND _GCP_DISABLED_BY_DEFAULT)
+      set(_gcpp_status OFF)
+      if (HAVE_${key} AND NOT GDAL_USE_${key})
+        message(STATUS "${key} has been found, but is disabled by default. Enable it by setting GDAL_USE_${key}=ON")
+        set(_find_dependency_args "")
+      endif ()
+    endif ()
+    cmake_dependent_option(GDAL_USE_${key} "Set ON to use ${key}" ${_gcpp_status} "HAVE_${key}" OFF)
+  elseif (NOT _GCP_ALWAYS_ON_WHEN_FOUND)
+    message(FATAL_ERROR "Programming error: missing CAN_DISABLE or DISABLED_BY_DEFAULT option for component ${name}")
+  endif ()
+
+  if(_find_dependency_args)
+    string(REPLACE "\"" "\\\"" _find_dependency_args "${_find_dependency_args}")
+    set(_find_dependency "find_dependency(${_find_dependency_args})\n")
+  endif()
+  if(NOT BUILD_SHARED_LIBS AND GDAL_USE_${key} AND _find_dependency)
+    string(APPEND GDAL_IMPORT_DEPENDENCIES "${_find_dependency}")
+  endif()
+  unset(_find_dependency_args)
+  unset(_find_dependency)
+endmacro ()
+
+function (split_libpath _lib)
+  if (_lib)
+    # split lib_line into -L and -l linker options
+    get_filename_component(_path ${${_lib}} PATH)
+    get_filename_component(_name ${${_lib}} NAME_WE)
+    string(REGEX REPLACE "^lib" "" _name ${_name})
+    set(${_lib} -L${_path} -l${_name})
+  endif ()
+endfunction ()
+
+function (gdal_internal_library libname)
+  set(_options REQUIRED)
+  set(_oneValueArgs)
+  set(_multiValueArgs)
+  cmake_parse_arguments(_GIL "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN})
+  if ("${GDAL_USE_INTERNAL_LIBS}" STREQUAL "ON")
+      set(_default_value ON)
+  elseif ("${GDAL_USE_INTERNAL_LIBS}" STREQUAL "OFF")
+      set(_default_value OFF)
+  elseif( GDAL_USE_${libname} )
+      set(_default_value OFF)
+  else()
+      set(_default_value ON)
+  endif()
+  set(GDAL_USE_${libname}_INTERNAL
+      ${_default_value}
+      CACHE BOOL "Use internal ${libname} copy (if set to ON, has precedence over GDAL_USE_${libname})")
+  if (_GIL_REQUIRED
+      AND (NOT GDAL_USE_${libname})
+      AND (NOT GDAL_USE_${libname}_INTERNAL))
+    message(FATAL_ERROR "GDAL_USE_${libname} or GDAL_USE_${libname}_INTERNAL must be set to ON")
+  endif ()
+endfunction ()
+
+# vim: ts=4 sw=4 sts=4 et
diff --git a/cmake/helpers/CheckDependentLibrariesECW.cmake b/cmake/helpers/CheckDependentLibrariesECW.cmake
new file mode 100644
index 000000000000..a89acdf4431c
--- /dev/null
+++ b/cmake/helpers/CheckDependentLibrariesECW.cmake
@@ -0,0 +1 @@
+gdal_check_package(ECW "Enable ECW driver" CAN_DISABLE)
diff --git a/cmake/helpers/CheckDependentLibrariesGeoTIFF.cmake b/cmake/helpers/CheckDependentLibrariesGeoTIFF.cmake
new file mode 100644
index 000000000000..a2ab32b933fe
--- /dev/null
+++ b/cmake/helpers/CheckDependentLibrariesGeoTIFF.cmake
@@ -0,0 +1,5 @@
+gdal_check_package(GeoTIFF "libgeotiff library (external)" CAN_DISABLE RECOMMENDED
+  NAMES GeoTIFF
+  TARGETS geotiff_library GEOTIFF::GEOTIFF
+)
+gdal_internal_library(GEOTIFF)
diff --git a/cmake/helpers/CheckDependentLibrariesJpeg.cmake b/cmake/helpers/CheckDependentLibrariesJpeg.cmake
new file mode 100644
index 000000000000..8227c85fdd45
--- /dev/null
+++ b/cmake/helpers/CheckDependentLibrariesJpeg.cmake
@@ -0,0 +1,40 @@
+gdal_check_package(JPEG "JPEG compression library (external)" CAN_DISABLE RECOMMENDED)
+if (GDAL_USE_JPEG AND (JPEG_LIBRARY MATCHES ".*turbojpeg\.(so|lib)"))
+  message(
+    FATAL_ERROR
+      "JPEG_LIBRARY should point to a library with libjpeg ABI, not TurboJPEG. See https://libjpeg-turbo.org/About/TurboJPEG for the difference"
+    )
+endif ()
+if (GDAL_USE_JPEG AND TARGET JPEG::JPEG)
+  set(EXPECTED_JPEG_LIB_VERSION "" CACHE STRING "Expected libjpeg version number")
+  mark_as_advanced(GDAL_CHECK_PACKAGE_${name}_NAMES)
+  if (EXPECTED_JPEG_LIB_VERSION)
+    get_property(_jpeg_old_icd TARGET JPEG::JPEG PROPERTY INTERFACE_COMPILE_DEFINITIONS)
+    set_property(TARGET JPEG::JPEG PROPERTY
+                 INTERFACE_COMPILE_DEFINITIONS "${_jpeg_old_icd};EXPECTED_JPEG_LIB_VERSION=${EXPECTED_JPEG_LIB_VERSION}")
+  endif()
+
+  # Check for jpeg12_read_scanlines() which has been added in libjpeg-turbo 2.2
+  # for dual 8/12 bit mode.
+  include(CheckCSourceCompiles)
+  include(CMakePushCheckState)
+  cmake_push_check_state(RESET)
+  set(CMAKE_REQUIRED_INCLUDES "${JPEG_INCLUDE_DIRS}")
+  set(CMAKE_REQUIRED_LIBRARIES "${JPEG_LIBRARIES}")
+  check_c_source_compiles(
+      "
+      #include <stddef.h>
+      #include <stdio.h>
+      #include \"jpeglib.h\"
+      int main()
+      {
+          jpeg_read_scanlines(0,0,0);
+          jpeg12_read_scanlines(0,0,0);
+          return 0;
+      }
+      "
+      HAVE_JPEGTURBO_DUAL_MODE_8_12)
+  cmake_pop_check_state()
+
+endif()
+gdal_internal_library(JPEG)
diff --git a/cmake/helpers/CheckDependentLibrariesKakadu.cmake b/cmake/helpers/CheckDependentLibrariesKakadu.cmake
new file mode 100644
index 000000000000..5ef1b0f4383d
--- /dev/null
+++ b/cmake/helpers/CheckDependentLibrariesKakadu.cmake
@@ -0,0 +1 @@
+gdal_check_package(KDU "Enable KAKADU" CAN_DISABLE)
diff --git a/cmake/helpers/CheckDependentLibrariesMrSID.cmake b/cmake/helpers/CheckDependentLibrariesMrSID.cmake
new file mode 100644
index 000000000000..e2f37b39feae
--- /dev/null
+++ b/cmake/helpers/CheckDependentLibrariesMrSID.cmake
@@ -0,0 +1 @@
+gdal_check_package(MRSID "MrSID raster SDK" CAN_DISABLE)
diff --git a/cmake/helpers/CheckDependentLibrariesOpenJPEG.cmake b/cmake/helpers/CheckDependentLibrariesOpenJPEG.cmake
new file mode 100644
index 000000000000..8e66469463cd
--- /dev/null
+++ b/cmake/helpers/CheckDependentLibrariesOpenJPEG.cmake
@@ -0,0 +1,10 @@
+# OpenJPEG's cmake-CONFIG is broken with older OpenJPEG releases, so call module explicitly
+set(GDAL_FIND_PACKAGE_OpenJPEG_MODE "MODULE" CACHE STRING "Mode to use for find_package(OpenJPEG): CONFIG, MODULE or empty string")
+set_property(CACHE GDAL_FIND_PACKAGE_OpenJPEG_MODE PROPERTY STRINGS "CONFIG" "MODULE" "")
+# "openjp2" target name is for the one coming from the OpenJPEG CMake configuration
+# "OPENJPEG::OpenJPEG" is the one used by cmake/modules/packages/FindOpenJPEG.cmake
+gdal_check_package(OpenJPEG "Enable JPEG2000 support with OpenJPEG library"
+                   ${GDAL_FIND_PACKAGE_OpenJPEG_MODE}
+                   CAN_DISABLE
+                   TARGETS "openjp2;OPENJPEG::OpenJPEG"
+                   VERSION "2.3.1")
diff --git a/cmake/helpers/CheckDependentLibrariesOracle.cmake b/cmake/helpers/CheckDependentLibrariesOracle.cmake
new file mode 100644
index 000000000000..5a7f85289320
--- /dev/null
+++ b/cmake/helpers/CheckDependentLibrariesOracle.cmake
@@ -0,0 +1,2 @@
+set(Oracle_CAN_USE_CLNTSH_AS_MAIN_LIBRARY ON)
+gdal_check_package(Oracle "Enable Oracle OCI and GeoRaster drivers" CAN_DISABLE)
diff --git a/cmake/helpers/CheckDependentLibrariesTileDB.cmake b/cmake/helpers/CheckDependentLibrariesTileDB.cmake
new file mode 100644
index 000000000000..f6fa7478cce5
--- /dev/null
+++ b/cmake/helpers/CheckDependentLibrariesTileDB.cmake
@@ -0,0 +1 @@
+gdal_check_package(TileDB "enable TileDB driver" CONFIG CAN_DISABLE VERSION "2.15")
diff --git a/cmake/helpers/CheckDependentLibrariesZLIB.cmake b/cmake/helpers/CheckDependentLibrariesZLIB.cmake
new file mode 100644
index 000000000000..e253a7890426
--- /dev/null
+++ b/cmake/helpers/CheckDependentLibrariesZLIB.cmake
@@ -0,0 +1,2 @@
+gdal_check_package(ZLIB "zlib (external)" CAN_DISABLE)
+gdal_internal_library(ZLIB REQUIRED)
diff --git a/cmake/helpers/GdalCAndCXXStandards.cmake b/cmake/helpers/GdalCAndCXXStandards.cmake
new file mode 100644
index 000000000000..6e2480cab02c
--- /dev/null
+++ b/cmake/helpers/GdalCAndCXXStandards.cmake
@@ -0,0 +1,10 @@
+
+if (NOT CMAKE_CXX_STANDARD)
+    set(CMAKE_CXX_STANDARD 17)
+    set(CMAKE_CXX_STANDARD_REQUIRED ON)
+endif()
+
+if (NOT CMAKE_C_STANDARD)
+    set(CMAKE_C_STANDARD 99)
+    set(CMAKE_C_STANDARD_REQUIRED ON)
+endif()
diff --git a/cmake/helpers/GdalCMakeMinimumRequired.cmake b/cmake/helpers/GdalCMakeMinimumRequired.cmake
new file mode 100644
index 000000000000..85acd189bb42
--- /dev/null
+++ b/cmake/helpers/GdalCMakeMinimumRequired.cmake
@@ -0,0 +1,2 @@
+set(GDAL_CMAKE_VERSION_MIN 3.16)
+set(GDAL_CMAKE_VERSION_MAX 3.28)
diff --git a/cmake/helpers/GdalCompilationFlags.cmake b/cmake/helpers/GdalCompilationFlags.cmake
new file mode 100644
index 000000000000..3501de613802
--- /dev/null
+++ b/cmake/helpers/GdalCompilationFlags.cmake
@@ -0,0 +1,219 @@
+
+# ######################################################################################################################
+# Detect available warning flags
+
+include(CheckCCompilerFlag)
+include(CheckCXXCompilerFlag)
+
+# Do that check now, since we need the result of HAVE_GCC_WARNING_ZERO_AS_NULL_POINTER_CONSTANT for cpl_config.h
+
+set(GDAL_C_WARNING_FLAGS)
+set(GDAL_CXX_WARNING_FLAGS)
+
+if (MSVC)
+  # 1. conditional expression is constant
+  # 2. 'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2'
+  # 3. non DLL-interface classkey 'identifier' used as base for DLL-interface classkey 'identifier'
+  # 4. ??????????
+  # 5. 'identifier' : unreferenced formal parameter
+  # 6. 'conversion' : conversion from 'type1' to 'type2', signed/unsigned mismatch
+  # 7. nonstandard extension used : translation unit is empty (only applies to C source code)
+  # 8. new behavior: elements of array 'array' will be default initialized (needed for
+  #    https://trac.osgeo.org/gdal/changeset/35593)
+  # 9. interaction between '_setjmp' and C++ object destruction is non-portable
+  #
+  set(GDAL_C_WARNING_FLAGS
+      /W4
+      /wd4127
+      /wd4251
+      /wd4275
+      /wd4786
+      /wd4100
+      /wd4245
+      /wd4206
+      /wd4351
+      /wd4611)
+  set(GDAL_CXX_WARNING_FLAGS ${GDAL_C_WARNING_FLAGS})
+  add_compile_options(/EHsc)
+
+  # The following are extra disables that can be applied to external source not under our control that we wish to use
+  # less stringent warnings with.
+  set(GDAL_SOFTWARNFLAGS
+      /wd4244
+      /wd4702
+      /wd4701
+      /wd4013
+      /wd4706
+      /wd4057
+      /wd4210
+      /wd4305)
+
+else ()
+
+  set(GDAL_SOFTWARNFLAGS "")
+
+  macro (detect_and_set_c_warning_flag flag_name)
+    string(TOUPPER ${flag_name} flag_name_upper)
+    string(REPLACE "-" "_" flag_name_upper "${flag_name_upper}")
+    string(REPLACE "=" "_" flag_name_upper "${flag_name_upper}")
+    check_c_compiler_flag(-W${flag_name} "HAVE_WFLAG_${flag_name_upper}")
+    if (HAVE_WFLAG_${flag_name_upper})
+      set(GDAL_C_WARNING_FLAGS ${GDAL_C_WARNING_FLAGS} -W${flag_name})
+    endif ()
+  endmacro ()
+
+  macro (detect_and_set_cxx_warning_flag flag_name)
+    string(TOUPPER ${flag_name} flag_name_upper)
+    string(REPLACE "-" "_" flag_name_upper "${flag_name_upper}")
+    string(REPLACE "=" "_" flag_name_upper "${flag_name_upper}")
+    check_cxx_compiler_flag(-W${flag_name} "HAVE_WFLAG_${flag_name_upper}")
+    if (HAVE_WFLAG_${flag_name_upper})
+      set(GDAL_CXX_WARNING_FLAGS ${GDAL_CXX_WARNING_FLAGS} -W${flag_name})
+    endif ()
+  endmacro ()
+
+  macro (detect_and_set_c_and_cxx_warning_flag flag_name)
+    string(TOUPPER ${flag_name} flag_name_upper)
+    string(REPLACE "-" "_" flag_name_upper "${flag_name_upper}")
+    string(REPLACE "=" "_" flag_name_upper "${flag_name_upper}")
+    check_c_compiler_flag(-W${flag_name} "HAVE_WFLAG_${flag_name_upper}")
+    if (HAVE_WFLAG_${flag_name_upper})
+      set(GDAL_C_WARNING_FLAGS ${GDAL_C_WARNING_FLAGS} -W${flag_name})
+      set(GDAL_CXX_WARNING_FLAGS ${GDAL_CXX_WARNING_FLAGS} -W${flag_name})
+    endif ()
+  endmacro ()
+
+  detect_and_set_c_and_cxx_warning_flag(all)
+  detect_and_set_c_and_cxx_warning_flag(extra)
+  detect_and_set_c_and_cxx_warning_flag(init-self)
+  detect_and_set_c_and_cxx_warning_flag(unused-parameter)
+  detect_and_set_c_warning_flag(missing-prototypes)
+  detect_and_set_c_and_cxx_warning_flag(missing-declarations)
+  detect_and_set_c_and_cxx_warning_flag(shorten-64-to-32)
+  detect_and_set_c_and_cxx_warning_flag(logical-op)
+  detect_and_set_c_and_cxx_warning_flag(shadow)
+  detect_and_set_cxx_warning_flag(shadow-field) # CLang only for now
+  detect_and_set_c_and_cxx_warning_flag(missing-include-dirs)
+  check_c_compiler_flag("-Wformat -Werror=format-security -Wno-format-nonliteral" HAVE_WFLAG_FORMAT_SECURITY)
+  if (HAVE_WFLAG_FORMAT_SECURITY)
+    set(GDAL_C_WARNING_FLAGS ${GDAL_C_WARNING_FLAGS} -Wformat -Werror=format-security -Wno-format-nonliteral)
+    set(GDAL_CXX_WARNING_FLAGS ${GDAL_CXX_WARNING_FLAGS} -Wformat -Werror=format-security -Wno-format-nonliteral)
+  else ()
+    detect_and_set_c_and_cxx_warning_flag(format)
+  endif ()
+  detect_and_set_c_and_cxx_warning_flag(error=vla)
+  detect_and_set_c_and_cxx_warning_flag(no-clobbered)
+  detect_and_set_c_and_cxx_warning_flag(date-time)
+  detect_and_set_c_and_cxx_warning_flag(null-dereference)
+  detect_and_set_c_and_cxx_warning_flag(duplicate-cond)
+  detect_and_set_cxx_warning_flag(extra-semi)
+  detect_and_set_c_and_cxx_warning_flag(comma)
+  detect_and_set_c_and_cxx_warning_flag(float-conversion)
+  check_c_compiler_flag("-Wdocumentation -Wno-documentation-deprecated-sync" HAVE_WFLAG_DOCUMENTATION_AND_NO_DEPRECATED)
+  if (HAVE_WFLAG_DOCUMENTATION_AND_NO_DEPRECATED)
+    set(GDAL_C_WARNING_FLAGS ${GDAL_C_WARNING_FLAGS} -Wdocumentation -Wno-documentation-deprecated-sync)
+    set(GDAL_CXX_WARNING_FLAGS ${GDAL_CXX_WARNING_FLAGS} -Wdocumentation -Wno-documentation-deprecated-sync)
+  endif ()
+  detect_and_set_cxx_warning_flag(unused-private-field)
+  detect_and_set_cxx_warning_flag(non-virtual-dtor)
+  detect_and_set_cxx_warning_flag(overloaded-virtual)
+  detect_and_set_cxx_warning_flag(suggest-override)
+
+  check_cxx_compiler_flag(-fno-operator-names HAVE_FLAG_NO_OPERATOR_NAMES)
+  if (HAVE_FLAG_NO_OPERATOR_NAMES)
+    set(GDAL_CXX_WARNING_FLAGS ${GDAL_CXX_WARNING_FLAGS} -fno-operator-names)
+  endif ()
+
+  check_cxx_compiler_flag(-Wzero-as-null-pointer-constant HAVE_GCC_WARNING_ZERO_AS_NULL_POINTER_CONSTANT)
+  if (HAVE_GCC_WARNING_ZERO_AS_NULL_POINTER_CONSTANT)
+    set(GDAL_CXX_WARNING_FLAGS ${GDAL_CXX_WARNING_FLAGS} -Wzero-as-null-pointer-constant)
+  endif ()
+
+  # Detect -Wold-style-cast but do not add it by default, as not all targets support it
+  check_cxx_compiler_flag(-Wold-style-cast HAVE_WFLAG_OLD_STYLE_CAST)
+  if (HAVE_WFLAG_OLD_STYLE_CAST)
+    set(WFLAG_OLD_STYLE_CAST -Wold-style-cast)
+  endif ()
+
+  # Detect Weffc++ but do not add it by default, as not all targets support it
+  check_cxx_compiler_flag(-Weffc++ HAVE_WFLAG_EFFCXX)
+  if (HAVE_WFLAG_EFFCXX)
+    set(WFLAG_EFFCXX -Weffc++)
+  endif ()
+
+  if (CMAKE_BUILD_TYPE MATCHES Debug)
+    check_c_compiler_flag(-ftrapv HAVE_FTRAPV)
+    if (HAVE_FTRAPV)
+      set(GDAL_C_WARNING_FLAGS ${GDAL_C_WARNING_FLAGS} -ftrapv)
+      set(GDAL_CXX_WARNING_FLAGS ${GDAL_CXX_WARNING_FLAGS} -ftrapv)
+    endif ()
+  endif ()
+
+endif ()
+
+add_compile_definitions($<$<CONFIG:DEBUG>:DEBUG>)
+
+# message(STATUS "GDAL_C_WARNING_FLAGS: ${GDAL_C_WARNING_FLAGS}") message(STATUS "GDAL_CXX_WARNING_FLAGS: ${GDAL_CXX_WARNING_FLAGS}")
+
+if (CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+  check_cxx_compiler_flag(-fno-finite-math-only HAVE_FLAG_NO_FINITE_MATH_ONLY)
+  if (HAVE_FLAG_NO_FINITE_MATH_ONLY)
+    # Intel CXX compiler based on clang defaults to -ffinite-math-only, which breaks std::isinf(), std::isnan(), etc.
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-finite-math-only")
+  endif ()
+
+  set(TEST_LINK_STDCPP_SOURCE_CODE
+      "#include <string>
+    int main(){
+      std::string s;
+      s += \"x\";
+      return 0;
+    }")
+  check_cxx_source_compiles("${TEST_LINK_STDCPP_SOURCE_CODE}" _TEST_LINK_STDCPP)
+  if( NOT _TEST_LINK_STDCPP )
+      message(WARNING "Cannot link code using standard C++ library. Automatically adding -lstdc++ to CMAKE_EXE_LINKER_FLAGS, CMAKE_SHARED_LINKER_FLAGS and CMAKE_MODULE_LINKER_FLAGS")
+      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lstdc++")
+      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -lstdc++")
+      set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -lstdc++")
+
+      check_cxx_source_compiles("${TEST_LINK_STDCPP_SOURCE_CODE}" _TEST_LINK_STDCPP_AGAIN)
+      if( NOT _TEST_LINK_STDCPP_AGAIN )
+          message(FATAL_ERROR "Cannot link C++ program")
+      endif()
+  endif()
+
+  check_c_compiler_flag(-wd188 HAVE_WD188) # enumerated type mixed with another type
+  if( HAVE_WD188 )
+    set(GDAL_C_WARNING_FLAGS ${GDAL_C_WARNING_FLAGS} -wd188)
+  endif()
+  check_c_compiler_flag(-wd2259 HAVE_WD2259) # non-pointer conversion from ... may lose significant bits
+  if( HAVE_WD2259 )
+    set(GDAL_C_WARNING_FLAGS ${GDAL_C_WARNING_FLAGS} -wd2259)
+  endif()
+  check_c_compiler_flag(-wd2312 HAVE_WD2312) # pointer cast involving 64-bit pointed-to type
+  if( HAVE_WD2259 )
+    set(GDAL_C_WARNING_FLAGS ${GDAL_C_WARNING_FLAGS} -wd2312)
+  endif()
+endif ()
+
+# Default definitions during build
+add_definitions(-DGDAL_COMPILATION)
+
+if (MSVC)
+  add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
+  add_definitions(-DNOMINMAX)
+endif ()
+
+if (MINGW)
+  if (TARGET_CPU MATCHES "x86_64")
+    add_definitions(-m64)
+  endif ()
+  # Workaround for export too large error - force problematic large file to be optimized to prevent string table
+  # overflow error Used -Os instead of -O2 as previous issues had mentioned, since -Os is roughly speaking -O2,
+  # excluding any optimizations that take up extra space. Given that the issue is a string table overflowing, -Os seemed
+  # appropriate. Solves issue of https://github.com/OSGeo/gdal/issues/4706 with for example x86_64-w64-mingw32-gcc-posix
+  # (GCC) 9.3-posix 20200320
+  if (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE STREQUAL "")
+    add_compile_options(-Os)
+  endif ()
+endif ()
diff --git a/cmake/helpers/GdalDriverHelper.cmake b/cmake/helpers/GdalDriverHelper.cmake
index b352ae1ca08b..d8588adbf1f4 100644
--- a/cmake/helpers/GdalDriverHelper.cmake
+++ b/cmake/helpers/GdalDriverHelper.cmake
@@ -155,7 +155,11 @@ function(add_gdal_driver)
         set(_COND ${_DRIVER_PLUGIN_CAPABLE_IF})
     endif()
 
-    get_target_property(PLUGIN_OUTPUT_DIR ${GDAL_LIB_TARGET_NAME} PLUGIN_OUTPUT_DIR)
+    if(STANDALONE)
+        set(PLUGIN_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}")
+    else()
+        get_target_property(PLUGIN_OUTPUT_DIR ${GDAL_LIB_TARGET_NAME} PLUGIN_OUTPUT_DIR)
+    endif()
 
     if (_DRIVER_PLUGIN_CAPABLE OR _DRIVER_PLUGIN_CAPABLE_IF)
         set(_INITIAL_VALUE OFF)
@@ -293,7 +297,9 @@ function(add_gdal_driver)
             else()
                 message(FATAL_ERROR "Driver ${_DRIVER_TARGET} should declare DRIVER_NO_SHARED_SYMBOL_WITH_CORE")
             endif()
-            _set_driver_core_sources(${_KEY} ${_DRIVER_TARGET} ${_DRIVER_CORE_SOURCES})
+            if(NOT STANDALONE)
+                _set_driver_core_sources(${_KEY} ${_DRIVER_TARGET} ${_DRIVER_CORE_SOURCES})
+            endif()
         endif ()
 
     else ()
@@ -325,7 +331,9 @@ function(add_gdal_driver)
         target_compile_options(${_DRIVER_TARGET} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:${GDAL_CXX_WARNING_FLAGS}>)
     endif()
     target_compile_options(${_DRIVER_TARGET} PRIVATE $<$<COMPILE_LANGUAGE:C>:${GDAL_C_WARNING_FLAGS}>)
-    add_dependencies(${_DRIVER_TARGET} generate_gdal_version_h)
+    if (NOT STANDALONE)
+        add_dependencies(${_DRIVER_TARGET} generate_gdal_version_h)
+    endif()
 endfunction()
 
 # Detect whether driver is built as PLUGIN or not.
@@ -483,7 +491,7 @@ macro(gdal_dependent_format format desc depends)
     cmake_dependent_option(GDAL_ENABLE_DRIVER_${key} "Set ON to build ${desc} format" ${GDAL_BUILD_OPTIONAL_DRIVERS}
                            "${depends}" OFF)
     add_feature_info(gdal_${key} GDAL_ENABLE_DRIVER_${key} "${desc}")
-    if ((GDAL_ENABLE_DRIVER_${key} AND NOT _GDF_SKIP_ADD_SUBDIRECTORY) OR GDAL_REGISTER_DRIVER_${key}_FOR_LATER_PLUGIN)
+    if (NOT STANDALONE AND (GDAL_ENABLE_DRIVER_${key} AND NOT _GDF_SKIP_ADD_SUBDIRECTORY) OR GDAL_REGISTER_DRIVER_${key}_FOR_LATER_PLUGIN)
         add_subdirectory(${format})
     endif ()
 endmacro()
@@ -525,7 +533,7 @@ macro(ogr_dependent_driver name desc depend)
                                "${depend}" OFF)
     endif()
     add_feature_info(ogr_${key} OGR_ENABLE_DRIVER_${key} "${desc}")
-    if (OGR_ENABLE_DRIVER_${key} OR OGR_REGISTER_DRIVER_${key}_FOR_LATER_PLUGIN)
+    if (NOT STANDALONE AND OGR_ENABLE_DRIVER_${key} OR OGR_REGISTER_DRIVER_${key}_FOR_LATER_PLUGIN)
         add_subdirectory(${name})
     endif ()
 endmacro()
@@ -551,9 +559,3 @@ macro(ogr_default_driver name desc)
     add_feature_info(ogr_${key} OGR_ENABLE_DRIVER_${key} "${desc}")
     add_subdirectory(${name})
 endmacro()
-macro(ogr_default_driver2 name key desc)
-    set(OGR_ENABLE_DRIVER_${key} ON CACHE BOOL "${desc}" FORCE)
-    add_feature_info(ogr_${key} OGR_ENABLE_DRIVER_${key} "${desc}")
-    add_subdirectory(${name})
-endmacro()
-
diff --git a/cmake/helpers/GdalStandardIncludes.cmake b/cmake/helpers/GdalStandardIncludes.cmake
index e138d2175838..b4f98e6562f2 100644
--- a/cmake/helpers/GdalStandardIncludes.cmake
+++ b/cmake/helpers/GdalStandardIncludes.cmake
@@ -8,15 +8,19 @@ GdalStandardIncludes
 #]=======================================================================]
 
 function(gdal_standard_includes _TARGET)
-  target_include_directories(${_TARGET} PRIVATE
-                             $<TARGET_PROPERTY:appslib,SOURCE_DIR>
-                             $<TARGET_PROPERTY:alg,SOURCE_DIR>
-                             $<TARGET_PROPERTY:gcore,SOURCE_DIR>
-                             $<TARGET_PROPERTY:gcore,BINARY_DIR>
-                             $<TARGET_PROPERTY:cpl,SOURCE_DIR> # port
-                             $<TARGET_PROPERTY:cpl,BINARY_DIR>
-                             $<TARGET_PROPERTY:ogr,SOURCE_DIR>
-                             $<TARGET_PROPERTY:ogrsf_frmts,SOURCE_DIR> # ogr/ogrsf_frmts
-                             $<TARGET_PROPERTY:gdal_frmts,SOURCE_DIR> # frmts
-                             )
+  if (STANDALONE)
+      target_include_directories(${_TARGET} PRIVATE $<TARGET_PROPERTY:GDAL::GDAL,INCLUDE_DIRECTORIES>)
+  else()
+      target_include_directories(${_TARGET} PRIVATE
+                                 $<TARGET_PROPERTY:appslib,SOURCE_DIR>
+                                 $<TARGET_PROPERTY:alg,SOURCE_DIR>
+                                 $<TARGET_PROPERTY:gcore,SOURCE_DIR>
+                                 $<TARGET_PROPERTY:gcore,BINARY_DIR>
+                                 $<TARGET_PROPERTY:cpl,SOURCE_DIR> # port
+                                 $<TARGET_PROPERTY:cpl,BINARY_DIR>
+                                 $<TARGET_PROPERTY:ogr,SOURCE_DIR>
+                                 $<TARGET_PROPERTY:ogrsf_frmts,SOURCE_DIR> # ogr/ogrsf_frmts
+                                 $<TARGET_PROPERTY:gdal_frmts,SOURCE_DIR> # frmts
+                                 )
+    endif()
 endfunction()
diff --git a/cmake/helpers/GdalVersion.cmake b/cmake/helpers/GdalVersion.cmake
index b466522da06d..7961085ba325 100644
--- a/cmake/helpers/GdalVersion.cmake
+++ b/cmake/helpers/GdalVersion.cmake
@@ -16,8 +16,10 @@ GdalVersion
 
 #]=======================================================================]
 
+set(GDAL_ROOT_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/../..")
+
 # parse the version number from gdal_version.h and include in GDAL_MAJOR_VERSION and GDAL_MINOR_VERSION
-file(READ ${PROJECT_SOURCE_DIR}/gcore/gdal_version.h.in GDAL_VERSION_H_CONTENTS)
+file(READ ${GDAL_ROOT_SOURCE_DIR}/gcore/gdal_version.h.in GDAL_VERSION_H_CONTENTS)
 string(REGEX MATCH "GDAL_VERSION_MAJOR[ \t]+([0-9]+)"
        GDAL_VERSION_MAJOR ${GDAL_VERSION_H_CONTENTS})
 string(REGEX MATCH "([0-9]+)"
@@ -35,12 +37,16 @@ string(REGEX MATCH "GDAL_VERSION_BUILD[ \t]+([0-9]+)"
 string(REGEX MATCH "([0-9]+)"
        GDAL_VERSION_BUILD ${GDAL_VERSION_BUILD})
 
-if ((EXISTS "${PROJECT_SOURCE_DIR}/gcore/gdal_version.h") AND NOT ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}"))
+if (STANDALONE)
+    return()
+endif()
+
+if ((EXISTS "${GDAL_ROOT_SOURCE_DIR}/gcore/gdal_version.h") AND NOT ("${GDAL_ROOT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}"))
     # Try to detect issues when building with cmake out of source tree, but against a previous build done in source tree
-    message(FATAL_ERROR "${PROJECT_SOURCE_DIR}/gcore/gdal_version.h was found, and likely conflicts with ${PROJECT_BINARY_DIR}/gcore/gdal_version.h")
+    message(FATAL_ERROR "${GDAL_ROOT_SOURCE_DIR}/gcore/gdal_version.h was found, and likely conflicts with ${PROJECT_BINARY_DIR}/gcore/gdal_version.h")
 endif ()
 
-if (EXISTS ${PROJECT_SOURCE_DIR}/.git)
+if (EXISTS ${GDAL_ROOT_SOURCE_DIR}/.git)
     set(GDAL_DEV_SUFFIX "dev")
 else()
     set(GDAL_DEV_SUFFIX "")
@@ -52,11 +58,11 @@ set(GDAL_RELEASE_DATE "$ENV{GDAL_RELEASE_DATE}")
 
 add_custom_target(generate_gdal_version_h
                   COMMAND ${CMAKE_COMMAND}
-                    "-DSOURCE_DIR=${PROJECT_SOURCE_DIR}"
+                    "-DSOURCE_DIR=${GDAL_ROOT_SOURCE_DIR}"
                     "-DBINARY_DIR=${PROJECT_BINARY_DIR}"
                     "-DGDAL_SHA1SUM=${GDAL_SHA1SUM}"
                     "-DGDAL_RELEASE_DATE=${GDAL_RELEASE_DATE}"
-                    -P "${PROJECT_SOURCE_DIR}/cmake/helpers/generate_gdal_version_h.cmake"
+                    -P "${GDAL_ROOT_SOURCE_DIR}/cmake/helpers/generate_gdal_version_h.cmake"
                   VERBATIM)
 
 if (WIN32 AND NOT MINGW)
diff --git a/cmake/helpers/SetupStandalonePlugin.cmake b/cmake/helpers/SetupStandalonePlugin.cmake
new file mode 100644
index 000000000000..b0d88666d85c
--- /dev/null
+++ b/cmake/helpers/SetupStandalonePlugin.cmake
@@ -0,0 +1,59 @@
+# Distributed under the GDAL/OGR MIT License.  See accompanying file LICENSE.TXT.
+# This file is included by drivers that want to be built as plugin against an
+# installed GDAL library (and thus not requiring to build libgdal itself)
+
+include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/modules/init.cmake")
+
+# Hint used to alter the behavior of a number of .cmake files
+set(STANDALONE ON)
+
+# Detect installed GDAL
+find_package(GDAL REQUIRED)
+set(GDAL_VERSION_IMPORTED ${GDAL_VERSION})
+set(GDAL_LIB_TARGET_NAME GDAL::GDAL)
+
+# Check that we build the plugin against a GDAL version that matches the one
+# of the sources
+include(GdalVersion)
+set(GDAL_VERSION_MAJOR_SOURCE ${GDAL_VERSION_MAJOR})
+set(GDAL_VERSION_MINOR_SOURCE ${GDAL_VERSION_MINOR})
+set(GDAL_VERSION_REV_SOURCE ${GDAL_VERSION_REV})
+if(NOT "${GDAL_VERSION_IMPORTED}" MATCHES "${GDAL_VERSION_MAJOR_SOURCE}.${GDAL_VERSION_MINOR_SOURCE}.${GDAL_VERSION_REV_SOURCE}")
+    if (STRICT_VERSION_CHECK)
+        message(FATAL_ERROR "Building plugin against GDAL sources ${GDAL_VERSION_MAJOR_SOURCE}.${GDAL_VERSION_MINOR_SOURCE}.${GDAL_VERSION_REV_SOURCE} whereas linked GDAL library is at version ${GDAL_VERSION_IMPORTED}. This is not supported by this driver which expects strict version matching.")
+    elseif (NOT IGNORE_GDAL_VERSION_MISMATCH)
+        message(FATAL_ERROR "Building plugin against GDAL sources ${GDAL_VERSION_MAJOR_SOURCE}.${GDAL_VERSION_MINOR_SOURCE}.${GDAL_VERSION_REV_SOURCE} whereas linked GDAL library is at version ${GDAL_VERSION_IMPORTED}. This is not a nominally supported configuration. You can bypass this check by setting the IGNORE_GDAL_VERSION_MISMATCH variable.")
+    endif()
+endif()
+
+include(GdalCAndCXXStandards)
+include(GdalStandardIncludes)
+
+include(CheckDependentLibrariesCommon)
+
+include(GdalCompilationFlags)
+
+set(GDAL_ENABLE_PLUGINS ON)
+set(GDAL_BUILD_OPTIONAL_DRIVERS ON)
+set(OGR_ENABLE_PLUGINS ON)
+set(OGR_BUILD_OPTIONAL_DRIVERS ON)
+include(GdalDriverHelper)
+
+include(GNUInstallDirs)
+# Used by GdalDriverHelper's add_gdal_driver()
+set(INSTALL_PLUGIN_DIR
+  "${CMAKE_INSTALL_LIBDIR}/gdalplugins"
+  CACHE PATH "Installation sub-directory for plugins")
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
+
+macro(standalone_driver_finalize VAR)
+    include(SystemSummary)
+    include(driver_declaration.cmake)
+    if (NOT ${VAR})
+        message(FATAL_ERROR "${VAR} is not set, due to missing build requirements")
+    endif()
+    system_summary(DESCRIPTION "${PROJECT_NAME} is now configured on")
+    feature_summary(DESCRIPTION "Enabled drivers and features and found dependency packages" WHAT ALL)
+endmacro()
diff --git a/cmake/modules/thirdparty/SystemSummary.cmake b/cmake/modules/thirdparty/SystemSummary.cmake
index 5251c4840a26..54164304fd09 100644
--- a/cmake/modules/thirdparty/SystemSummary.cmake
+++ b/cmake/modules/thirdparty/SystemSummary.cmake
@@ -23,8 +23,8 @@ macro(gather_flags with_linker result)
     # add the main flags without a config
     list(APPEND ${result} CMAKE_C_FLAGS)
     list(APPEND ${result} CMAKE_CXX_FLAGS)
-    list(APPEND ${result} CMAKE_CXX11_STANDARD_COMPILE_OPTION)
-    list(APPEND ${result} CMAKE_CXX11_EXTENSION_COMPILE_OPTION)
+    list(APPEND ${result} CMAKE_CXX17_STANDARD_COMPILE_OPTION)
+    list(APPEND ${result} CMAKE_CXX17_EXTENSION_COMPILE_OPTION)
 
     if(${with_linker})
         list(APPEND ${result} CMAKE_EXE_LINKER_FLAGS)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index cb284dc7cd4c..a41405f330d3 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -13,7 +13,7 @@ if (UNIX
 else()
     set(BUILD_DOCS_DEFAULT OFF)
 endif()
-option(BUILD_DOCS "Set to ON to define documentation targets: 'html', 'latexpdf', 'man', 'doxygen', 'doxygen_check_warnings', 'clean_doc'" ${BUILD_DOCS_DEFAULT})
+option(BUILD_DOCS "Set to ON to define documentation targets: 'html', 'latexpdf', 'man', 'doxygen', 'doxygen_check_warnings', 'spelling', 'clean_doc'" ${BUILD_DOCS_DEFAULT})
 
 if (BUILD_DOCS)
     if (NOT UNIX)
@@ -59,6 +59,11 @@ if (BUILD_DOCS)
         COMMAND ${MAKE_EXECUTABLE} man BUILDDIR=${DOC_BUILDDIR}
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 
+    add_custom_target(
+        spelling
+        COMMAND ${MAKE_EXECUTABLE} spelling BUILDDIR=${DOC_BUILDDIR}
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+
     add_custom_target(
         clean_doc
         COMMAND ${MAKE_EXECUTABLE} clean BUILDDIR=${DOC_BUILDDIR}
diff --git a/doc/Makefile b/doc/Makefile
index fab92246973b..aa59f735c2e0 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -60,9 +60,9 @@ $(BUILDDIR)/.doxygen_up_to_date:
 	rm -rf $(BUILDDIR)/xml; \
 	mkdir -p $(BUILDDIR)/xml; \
 	(cd .. && ((cat Doxyfile | sed "s/PREDEFINED             = /PREDEFINED             = DOXYGEN_XML /"; printf "GENERATE_HTML=NO\nGENERATE_XML=YES\nXML_OUTPUT=$$BUILDDIR_ABS/xml\nXML_PROGRAMLISTING=NO") | doxygen -)); \
-	rm -rf $(BUILDDIR)/doxygen_html; \
-	mkdir -p $(BUILDDIR)/doxygen_html; \
-	(cd .. && ((cat Doxyfile; printf "HTML_OUTPUT=$$BUILDDIR_ABS/doxygen_html\nINLINE_INHERITED_MEMB=YES") | doxygen -)); \
+	rm -rf $(BUILDDIR)/html_extra/doxygen; \
+	mkdir -p $(BUILDDIR)/html_extra/doxygen; \
+	(cd .. && ((cat Doxyfile; printf "HTML_OUTPUT=$$BUILDDIR_ABS/html_extra/doxygen\nINLINE_INHERITED_MEMB=YES") | doxygen -)); \
 	echo "Doxygen replaces -- with <ndash/>. This is not desirable, so revert that;"; \
 	for i in $(BUILDDIR)/xml/*.xml; do sed "s/<ndash\/>/--/g" < $$i > $$i.tmp; mv $$i.tmp $$i; done; \
 	touch $(BUILDDIR)/.doxygen_up_to_date
@@ -73,29 +73,20 @@ generated_rst_files: $(BUILDDIR)/.doxygen_up_to_date
 
 .PHONY: html latexpdf
 html: generated_rst_files
-	$(SPHINXBUILD) -M html "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
-	# Hack to hide the TOC
-	sed 's/<div class="toctree-wrapper compound">/<div class="toctree-wrapper compound" style="display: none;">/' < "$(BUILDDIR)/html/drivers/raster/index.html" > "$(BUILDDIR)/html/drivers/raster/index.html.mod"
-	mv "$(BUILDDIR)/html/drivers/raster/index.html.mod" "$(BUILDDIR)/html/drivers/raster/index.html"
-	sed 's/<div class="toctree-wrapper compound">/<div class="toctree-wrapper compound" style="display: none;">/' < "$(BUILDDIR)/html/drivers/vector/index.html" > "$(BUILDDIR)/html/drivers/vector/index.html.mod"
-	mv "$(BUILDDIR)/html/drivers/vector/index.html.mod" "$(BUILDDIR)/html/drivers/vector/index.html"
-	sed "s/python_api_ref\.html/\.\.\/python\/index\.html/" < "$(BUILDDIR)/html/api/index.html" > "$(BUILDDIR)/html/api/index.html.mod"
-	mv "$(BUILDDIR)/html/api/index.html.mod" "$(BUILDDIR)/html/api/index.html"
-	sed 's/<div class="toctree-wrapper compound">/<div class="toctree-wrapper compound" style="display: none;">/' < "$(BUILDDIR)/html/sponsors/index.html" > "$(BUILDDIR)/html/sponsors/index.html.mod"
-	mv "$(BUILDDIR)/html/sponsors/index.html.mod" "$(BUILDDIR)/html/sponsors/index.html"
-	rm -rf $(BUILDDIR)/html/doxygen
-	cp -r $(BUILDDIR)/doxygen_html $(BUILDDIR)/html/doxygen
+	BUILDDIR="${BUILDDIR}" $(SPHINXBUILD) -M html "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 	ln -sf ../latex/gdal.pdf $(BUILDDIR)/html
-	cp -f "source/sponsors/Sustainable GDAL Sponsorship Prospectus.pdf" $(BUILDDIR)/html/sponsors
 
 man: generated_rst_files
-	$(SPHINXBUILD) -M man "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+	BUILDDIR="${BUILDDIR}" $(SPHINXBUILD) -M man "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
 latexpdf: generated_rst_files
-	$(SPHINXBUILD) -M latexpdf "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+	BUILDDIR="${BUILDDIR}" $(SPHINXBUILD) -M latexpdf "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+spelling: generated_rst_files
+	BUILDDIR="${BUILDDIR}" $(SPHINXBUILD) -b spelling "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
 clean:
 	rm -rf "$(BUILDDIR)/xml"
-	rm -rf "$(BUILDDIR)/doxygen_html"
+	rm -rf "$(BUILDDIR)/html_extra/doxygen"
 	rm -f "$(BUILDDIR)/.doxygen_up_to_date"
 	@$(SPHINXBUILD) -M clean "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
diff --git a/doc/build/html_extra/robots.txt b/doc/build/html_extra/robots.txt
new file mode 100644
index 000000000000..1b0f0fd8b207
--- /dev/null
+++ b/doc/build/html_extra/robots.txt
@@ -0,0 +1,3 @@
+User-agent: *
+Allow: /en/latest/
+Disallow: /en/
diff --git a/doc/environment.yml b/doc/environment.yml
index eca9065c503a..4f5999e986a8 100644
--- a/doc/environment.yml
+++ b/doc/environment.yml
@@ -1,55 +1,16 @@
 name: gdal-docs
 channels:
   - conda-forge
-  - defaults
 dependencies:
-  - bzip2=1.0.6=h1de35cc_1002
-  - ca-certificates=2019.3.9=hecc5488_0
-  - certifi=2019.3.9=py37_0
-  - libcxx=8.0.0=2
-  - libcxxabi=8.0.0=2
-  - libffi=3.2.1=h6de7cb9_1006
-  - ncurses=6.1=h0a44026_1002
-  - openssl=1.1.1b=h01d97ff_2
-  - pip=19.1=py37_0
-  - python=3.7.3=h0d93f26_0
-  - readline=7.0=hcfe32e1_1001
-  - setuptools=41.0.1=py37_0
-  - sqlite=3.26.0=h1765d9f_1001
-  - tk=8.6.9=ha441bb4_1001
-  - wheel=0.33.4=py37_0
-  - xz=5.2.4=h1de35cc_1001
-  - zlib=1.2.11=h1de35cc_1004
+  - pip
   - pip:
-    - alabaster==0.7.12
-    - babel==2.6.0
-    - beautifulsoup4==4.7.1
-    - breathe==4.13.0.post0
-    - bs4==0.0.1
-    - chardet==3.0.4
-    - docutils==0.14
-    - exhale==0.2.2
-    - idna==2.8
-    - imagesize==1.1.0
-    - jinja2==2.10.1
-    - lxml==4.3.3
-    - markupsafe==1.1.1
-    - packaging==19.0
-    - pygments==2.4.0
-    - pyparsing==2.4.0
-    - pytz==2019.1
-    - requests==2.21.0
-    - six==1.12.0
-    - snowballstemmer==1.2.1
-    - soupsieve==1.9.1
-    - sphinx==2.0.1
-    - sphinx-rtd-theme==0.4.3
-    - sphinxcontrib-applehelp==1.0.1
-    - sphinxcontrib-devhelp==1.0.1
-    - sphinxcontrib-htmlhelp==1.0.2
-    - sphinxcontrib-jsmath==1.0.1
-    - sphinxcontrib-qthelp==1.0.2
-    - sphinxcontrib-serializinghtml==1.1.3
-    - urllib3==1.24.3
-prefix: /Users/hobu/miniconda3/envs/gdal-docs
-
+    - breathe
+    - numpy
+    - recommonmark
+    - sphinx
+    - sphinx-bootstrap-theme
+    - sphinx-markdown-tables
+    - sphinx-rtd-theme
+    - sphinxcontrib-bibtex
+    - sphinxcontrib-jquery
+    - sphinxcontrib-spelling
diff --git a/doc/old_trac_pointers.md b/doc/old_trac_pointers.md
new file mode 100644
index 000000000000..b40174b7562b
--- /dev/null
+++ b/doc/old_trac_pointers.md
@@ -0,0 +1,8 @@
+Google Summer of Code ideas: https://web.archive.org/web/20240812224510/https://trac.osgeo.org/gdal/wiki/SummerOfCode
+Google Summer of Code selected projects: https://web.archive.org/web/20240812232901/https://trac.osgeo.org/gdal/wiki/SoCProjects
+Old Sponsorship program: http://web.archive.org/web/20230921154549/https://trac.osgeo.org/gdal/wiki/Sponsorship
+Old Build hints: http://web.archive.org/https://trac.osgeo.org/gdal/wiki/BuildHints
+Additional notes on utilities: http://web.archive.org/https://trac.osgeo.org/gdal/wiki/UserDocs
+CodeSnippets: http://web.archive.org/https://trac.osgeo.org/gdal/wiki/CodeSnippets
+LayerAlgebra: http://web.archive.org/https://trac.osgeo.org/gdal/wiki/LayerAlgebra
+Old FAQ: http://web.archive.org/https://trac.osgeo.org/gdal/wiki/FAQ
diff --git a/doc/requirements.txt b/doc/requirements.txt
index cb07a4d17772..e4378d870530 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,5 +1,6 @@
 # This file may be used to create an environment using:
 # $ pip install --upgrade -r <this file>
+numpy
 sphinx
 breathe
 sphinx_bootstrap_theme
diff --git a/doc/rtd/pre_build.sh b/doc/rtd/pre_build.sh
new file mode 100755
index 000000000000..56d8d8060346
--- /dev/null
+++ b/doc/rtd/pre_build.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+set -ex
+
+mkdir -p build-rtd
+cd build-rtd
+
+PREFIX=${READTHEDOCS_VIRTUALENV_PATH}
+
+cmake \
+    -DCMAKE_BUILD_TYPE=Debug \
+    -DCMAKE_INSTALL_PREFIX=${PREFIX} \
+    -DCMAKE_INSTALL_RPATH=${PREFIX}/lib \
+    -DGDAL_PYTHON_INSTALL_PREFIX=${PREFIX} \
+    -DGDAL_BUILD_OPTIONAL_DRIVERS=OFF \
+    -DOGR_BUILD_OPTIONAL_DRIVERS=OFF \
+    -DBUILD_APPS=OFF \
+    -DBUILD_PYTHON_BINDINGS=ON \
+    -DBUILD_JAVA_BINDINGS=ON \
+    -DBUILD_TESTING=OFF \
+    -DGDAL_JAVA_GENERATE_JAVADOC=ON \
+    -DBASH_COMPLETIONS_DIR="" \
+    ..
+
+cmake --build . -j$(nproc)
+cmake --install .
+
+# set rpath for python libraries
+find ${READTHEDOCS_VIRTUALENV_PATH} -wholename "*/osgeo/*.so" -exec patchelf --set-rpath ${READTHEDOCS_VIRTUALENV_PATH}/lib {} \;
+
+# check python import (needed for doc build)
+python3 -c "from osgeo import gdal; print(gdal.__version__)"
+
+# unpack javadoc created during cmake --build into correct location
+mkdir -p ../doc/build/html_extra
+unzip -d ../doc/build/html_extra swig/java/javadoc.zip
+
+# copy gdalicon.png into html_extra (used by test suite)
+cp ../data/gdalicon.png ../doc/build/html_extra/
+
+# copy proj_list documentation
+# see https://github.com/OSGeo/gdal/issues/8221
+git clone https://github.com/OSGeo/libgeotiff
+cp -r libgeotiff/geotiff/html/proj_list ../doc/build/html_extra
+
+# copy resources directory for gdal2tiles usage
+# see https://github.com/OSGeo/gdal/pull/6276
+cp -r ../resources ../doc/build/html_extra/resources # Do not change this without changing swig/python/gdal-utils/osgeo_utils/gdal2tiles.py
diff --git a/doc/rtd/update_redirects.py b/doc/rtd/update_redirects.py
new file mode 100755
index 000000000000..ac69b7d4180b
--- /dev/null
+++ b/doc/rtd/update_redirects.py
@@ -0,0 +1,143 @@
+#!/usr/bin/env python3
+
+import os
+import time
+
+import requests
+
+TOKEN = open(os.path.expanduser("~/.rtd"), "r").read().strip()
+HEADERS = {"Authorization": f"token {TOKEN}"}
+
+
+def get_redirects():
+    url = "https://readthedocs.org/api/v3/projects/gdal/redirects/"
+    results = []
+
+    while url:
+        response = requests.get(url, headers=HEADERS).json()
+        results += response["results"]
+        url = response["next"]
+
+    return results
+
+
+def delete_redirect(redirect_id):
+    url = f"https://readthedocs.org/api/v3/projects/gdal/redirects/{redirect_id}"
+    res = requests.delete(url, headers=HEADERS)
+    print(res.status_code)
+    if res.status_code == 429:
+        time.sleep(3)
+        delete_redirect(redirect_id)
+
+
+def create_redirect(data):
+    url = "https://readthedocs.org/api/v3/projects/gdal/redirects/"
+    res = requests.post(url, json=data, headers=HEADERS)
+    print(res.status_code)
+    if res.status_code == 429:
+        time.sleep(3)
+        create_redirect(data)
+
+
+existing_redirects = get_redirects()
+
+redirects = [
+    {"from_url": "/gdal_vrttut.html", "to_url": "/drivers/raster/vrt.html"},
+    {
+        "from_url": "/gdal_virtual_file_systems.html",
+        "to_url": "/user/virtual_file_systems.html",
+    },
+    {"from_url": "/ogr_feature_style.html", "to_url": "/user/ogr_feature_style.html"},
+    {"from_url": "/python/index.html", "to_url": "/api/index.html#python-api"},
+    {"from_url": "/ogr_apitut.html", "to_url": "/tutorials/vector_api_tut.html"},
+    {"from_url": "/ogr/ogr_arch.html", "to_url": "/user/vector_data_model.html"},
+    {"from_url": "/ogr_arch.html", "to_url": "/user/vector_data_model.html"},
+    {
+        "from_url": "build_hints.html",
+        "to_url": "/development/building_from_source.html",
+    },
+    # driver indexes
+    {"from_url": "/frmt_various.html", "to_url": "/drivers/raster"},
+    {"from_url": "/formats_list.html", "to_url": "/drivers/raster"},
+    {"from_url": "/ogr_formats.html", "to_url": "/drivers/vector"},
+    # special cases to forward to driver pages
+    {"from_url": "/drv_geopackage_raster.html", "to_url": "/drivers/raster/gpkg.html"},
+    {
+        "from_url": "/geopackage_aspatial.html",
+        "to_url": "/drivers/vector/geopackage_aspatial.html",
+    },
+    {"from_url": "/drv_geopackage.html", "to_url": "/drivers/vector/gpkg.html"},
+    {"from_url": "/drv_shape.html", "to_url": "/drivers/vector/shapefile.html"},
+    {"from_url": "/drv_wfs3.html", "to_url": "/drivers/vector/oapif.html"},
+    {
+        "from_url": "/drivers/vector/geopackage.html",
+        "to_url": "/drivers/vector/gpkg.html",
+    },
+    {"from_url": "/drivers/vector/wfs3.html", "to_url": "/drivers/vector/oapif.html"},
+    # pdf download
+    {"from_url": "/gdal.pdf", "to_url": "/_/downloads/en/latest/pdf/", "type": "exact"},
+    # wildcards to forward to driver pages
+    {"from_url": "/drv_*", "to_url": "/drivers/vector/:splat"},
+    {"from_url": "/frmt_*", "to_url": "/drivers/raster/:splat"},
+]
+
+programs = [
+    "gdal2tiles",
+    "gdaladdo",
+    "gdalbuildvrt",
+    "gdal_calc",
+    "gdalcompare",
+    "gdal-config",
+    "gdal_contour",
+    "gdaldem",
+    "gdal_edit",
+    "gdal_fillnodata",
+    "gdal_grid",
+    "gdalinfo",
+    "gdallocationinfo",
+    "gdalmanage",
+    "gdal_merge",
+    "gdalmove",
+    "gdal_pansharpen",
+    "gdal_polygonize",
+    "gdal_proximity",
+    "gdal_rasterize",
+    "gdal_retile",
+    "gdal_sieve",
+    "gdalsrsinfo",
+    "gdaltindex",
+    "gdaltransform",
+    "gdal_translate",
+    "gdalwarp",
+    "nearblack",
+    "rgb2pct",
+    "pct2rgb",
+    "ogr2ogr",
+    "ogrinfo",
+    "ogrlineref",
+    "ogrmerge",
+    "ogrtindex",
+    "gnmanalyse",
+    "gnmmanage",
+]
+
+for program in programs:
+    redirects.append(
+        {"from_url": f"/{program}.html", "to_url": f"/programs/{program}.html"}
+    )
+
+# prepend /en/latest/ to pre-RTD URLs
+redirects.append({"from_url": "/*", "to_url": "/en/latest/:splat", "type:": "exact"})
+
+for redirect in existing_redirects:
+    print(f'Deleting redirect from {redirect["from_url"]} to {redirect["to_url"]}')
+    delete_redirect(redirect["pk"])
+
+for i, redirect in enumerate(redirects):
+    data = redirect.copy()
+    data["http_status"] = 301
+    data["type"] = data.get("type", "page")
+    data["position"] = i
+
+    print(f'Creating redirect from {redirect["from_url"]} to {redirect["to_url"]}')
+    create_redirect(data)
diff --git a/doc/source/_extensions/configoptions.py b/doc/source/_extensions/configoptions.py
index 3f1e15c85e9e..a1864376226a 100644
--- a/doc/source/_extensions/configoptions.py
+++ b/doc/source/_extensions/configoptions.py
@@ -104,7 +104,14 @@ def render(self, app):
         elif len(self.choices) == 1:
             text += f"={self.choices[0]}: "
         else:
-            text += f'=[{"/".join(self.choices)}]: '
+            # Insert Unicode zero-width space around separating forward slash,
+            # so that all browsers produce line breaks.
+            # Cf https://github.com/OSGeo/gdal/issues/10778
+            zero_width_space = "\u200b"
+            concatenated_choices = f"{zero_width_space}/{zero_width_space}".join(
+                self.choices
+            )
+            text += f"=[{concatenated_choices}]: "
 
         para += nodes.strong(text, text)
 
diff --git a/doc/source/_extensions/redirects.py b/doc/source/_extensions/redirects.py
deleted file mode 100644
index fe0ef1dbc8ae..000000000000
--- a/doc/source/_extensions/redirects.py
+++ /dev/null
@@ -1,203 +0,0 @@
-import os
-
-# https://tech.signavio.com/2017/managing-sphinx-redirects
-
-
-template = """<html>
-  <head>
-    <meta http-equiv="refresh" content="1; url=%s" />
-    <script>
-      window.location.href = "%s"
-    </script>
-  </head>
-</html>"""
-
-
-def gather_redirects(src_dir):
-    output = {}
-
-    output.update({"python/index.html": "../api/python/osgeo.html"})
-
-    def fetch(path, d, prefix):
-        files = os.listdir(os.path.join(src_dir, path))
-        for f in files:
-            driver = f.split(".")[0]
-            if driver not in "gpkg":
-                entry = {
-                    "%s_%s.html" % (prefix, driver): os.path.join(path, driver)
-                    + ".html"
-                }
-                d.update(entry)
-                if prefix == "drv":
-                    entry = {
-                        "ogr/%s_%s.html"
-                        % (prefix, driver): os.path.join("..", path, driver)
-                        + ".html"
-                    }
-                    d.update(entry)
-
-    fetch("./drivers/raster", output, "frmt")
-    fetch("./drivers/vector", output, "drv")
-
-    output.update(
-        {"drv_shape.html": os.path.join("./drivers/vector", "shapefile") + ".html"}
-    )
-    output.update(
-        {"drv_geopackage.html": os.path.join("./drivers/vector", "gpkg") + ".html"}
-    )
-    output.update(
-        {
-            "geopackage_aspatial.html": os.path.join(
-                "./drivers/vector", "geopackage_aspatial"
-            )
-            + ".html"
-        }
-    )
-    output.update(
-        {
-            "drv_geopackage_raster.html": os.path.join("./drivers/raster", "gpkg")
-            + ".html"
-        }
-    )
-    output.update(
-        {
-            "ogr_feature_style.html": os.path.join("./user", "ogr_feature_style")
-            + ".html"
-        }
-    )
-    output.update(
-        {
-            "gdal_virtual_file_systems.html": os.path.join(
-                "./user", "virtual_file_systems"
-            )
-            + ".html"
-        }
-    )
-    output.update(
-        {"ogr_formats.html": os.path.join("./drivers/vector", "index") + ".html"}
-    )
-    output.update(
-        {"formats_list.html": os.path.join("./drivers/raster", "index") + ".html"}
-    )
-    output.update(
-        {"frmt_various.html": os.path.join("./drivers/raster", "index") + ".html"}
-    )
-    output.update(
-        {"gdal_vrttut.html": os.path.join("./drivers/raster", "vrt") + ".html"}
-    )
-    output.update(
-        {
-            "ogr/ogr_apitut.html": os.path.join("../tutorials", "vector_api_tut")
-            + ".html"
-        }
-    )
-    output.update(
-        {"ogr_apitut.html": os.path.join("./tutorials", "vector_api_tut") + ".html"}
-    )
-    output.update(
-        {"ogr/ogr_arch.html": os.path.join("../user", "vector_data_model") + ".html"}
-    )
-    output.update(
-        {"ogr_arch.html": os.path.join("./user", "vector_data_model") + ".html"}
-    )
-    output.update(
-        {
-            "drivers/vector/geopackage.html": os.path.join(
-                "../../drivers/vector", "gpkg"
-            )
-            + ".html"
-        }
-    )
-
-    # Legacy WFS3 renamed as OAPIF
-    output.update(
-        {"drv_wfs3.html": os.path.join("./drivers/vector", "oapif") + ".html"}
-    )
-    output.update({os.path.join("./drivers/vector", "wfs3") + ".html": "oapif.html"})
-
-    raster_tools = [
-        "gdal2tiles",
-        "gdaladdo",
-        "gdalbuildvrt",
-        "gdal_calc",
-        "gdalcompare",
-        "gdal-config",
-        "gdal_contour",
-        "gdaldem",
-        "gdal_edit",
-        "gdal_fillnodata",
-        "gdal_grid",
-        "gdalinfo",
-        "gdallocationinfo",
-        "gdalmanage",
-        "gdal_merge",
-        "gdalmove",
-        "gdal_pansharpen",
-        "gdal_polygonize",
-        "gdal_proximity",
-        "gdal_rasterize",
-        "gdal_retile",
-        "gdal_sieve",
-        "gdalsrsinfo",
-        "gdaltindex",
-        "gdaltransform",
-        "gdal_translate",
-        "gdalwarp",
-        "nearblack",
-        "rgb2pct",
-        "pct2rgb",
-    ]
-    for utility in raster_tools:
-        output.update(
-            {utility + ".html": os.path.join("./programs/", utility) + ".html"}
-        )
-
-    vector_tools = [
-        "ogr2ogr",
-        "ogrinfo",
-        "ogrlineref",
-        "ogrmerge",
-        "ogrtindex",
-    ]
-    for utility in vector_tools:
-        output.update(
-            {utility + ".html": os.path.join("./programs/", utility) + ".html"}
-        )
-
-    gnm_tools = [
-        "gnmanalyse",
-        "gnmmanage",
-    ]
-    for utility in gnm_tools:
-        output.update(
-            {utility + ".html": os.path.join("./programs/", utility) + ".html"}
-        )
-
-    output.update(
-        {"build_hints.html": os.path.join("./development/building_from_source.html")}
-    )
-
-    return output
-
-
-# copy legacy redirects
-def copy_legacy_redirects(app, docname):  # Sphinx expects two arguments
-    if app.config.enable_redirects and app.builder.name == "html":
-        redirect_files = gather_redirects(app.srcdir)
-        for key in redirect_files:
-            src = key
-            tgt = redirect_files[key]
-            html = template % (tgt, tgt)
-            outfilename = os.path.join(app.outdir, src)
-            dirname = os.path.dirname(outfilename)
-            if not os.path.exists(dirname):
-                os.makedirs(dirname)
-            with open(outfilename, "wb") as f:
-                f.write(html.encode("utf-8"))
-                f.close()
-
-
-def setup(app):
-    app.add_config_value("enable_redirects", False, "html")
-    app.connect("build-finished", copy_legacy_redirects)
-    return {"parallel_read_safe": True, "parallel_write_safe": True}
diff --git a/doc/source/sponsors/Sustainable GDAL Sponsorship Prospectus.pdf b/doc/source/_static/Sustainable GDAL Sponsorship Prospectus.pdf
similarity index 100%
rename from doc/source/sponsors/Sustainable GDAL Sponsorship Prospectus.pdf
rename to doc/source/_static/Sustainable GDAL Sponsorship Prospectus.pdf
diff --git a/doc/source/about_no_title.rst b/doc/source/about_no_title.rst
index 17c7344a53b4..0f0364b0efea 100644
--- a/doc/source/about_no_title.rst
+++ b/doc/source/about_no_title.rst
@@ -1,11 +1,15 @@
-GDAL is a translator library for raster and vector geospatial data formats that is released under an MIT style Open Source :ref:`license` by the `Open Source Geospatial Foundation`_. As a library, it presents a single raster abstract data model and single vector abstract data model to the calling application for all supported formats. It also comes with a variety of useful command line utilities for data translation and processing. The `NEWS`_ page describes the May 2024 GDAL/OGR 3.9.0 release.
+GDAL is a translator library for raster and vector geospatial data formats that is released under an MIT style Open Source :ref:`license` by the `Open Source Geospatial Foundation`_. As a library, it presents a single raster abstract data model and single vector abstract data model to the calling application for all supported formats. It also comes with a variety of useful command line utilities for data translation and processing. The `NEWS`_ page describes the October 2024 GDAL/OGR 3.9.3 release.
+
+.. only:: html
+
+   |offline-download|
 
 .. image:: ../images/OSGeo_project.png
    :alt:   OSGeo project
    :target:  `Open Source Geospatial Foundation`_
 
 .. _`Open Source Geospatial Foundation`: http://www.osgeo.org/
-.. _`NEWS`: https://github.com/OSGeo/gdal/blob/v3.9.0/NEWS.md
+.. _`NEWS`: https://github.com/OSGeo/gdal/blob/v3.9.3/NEWS.md
 
 See :ref:`software_using_gdal`
 
diff --git a/doc/source/api/csharp/csharp_compile_legacy.rst b/doc/source/api/csharp/csharp_compile_legacy.rst
index da817c98207a..e9579c045e3f 100644
--- a/doc/source/api/csharp/csharp_compile_legacy.rst
+++ b/doc/source/api/csharp/csharp_compile_legacy.rst
@@ -84,7 +84,7 @@ To test the compiled binaries, you can use:
 
     nmake /f makefile.vc test`
 
-This command will invoke some of the sample applications. 
+This command will invoke some of the sample applications.
 
 .. note:: For the tests to work the location of the proj and gdal DLLs should be available in the PATH.
 
@@ -93,7 +93,7 @@ Using MONO on Windows
 
 If you have the Windows version of the MONO package installed you can compile the C# code using the MONO compiler. In this case uncomment the following entry in csharp.opt:
 
-:program:`MONO = YES` 
+:program:`MONO = YES`
 
 .. note:: mcs.exe must be in the PATH.
 
@@ -165,7 +165,7 @@ To test the compiled binaries, you can use:
 
     nmake test
 
-This command will invoke some of the sample applications. 
+This command will invoke some of the sample applications.
 
 .. note:: For the tests to work the location of the proj and gdal libraries should be available in the PATH.
 
@@ -179,8 +179,4 @@ To run one of the prebuilt executables - you can run them with Mono as follows :
 :program:`mono GDALInfo.exe`
 
 Both the managed libraries (i.e. the DLLs) and the unmanaged libraries must be available to Mono.
-This is in more detail in `the Mono documentation <https://www.mono-project.com/docs/advanced/pinvoke/>`__ 
-
-.. note:: This document was amended from the previous version at `https://trac.osgeo.org/gdal/wiki/GdalOgrCsharpCompile <https://trac.osgeo.org/gdal/wiki/GdalOgrCsharpCompile>`__
-
-
+This is in more detail in `the Mono documentation <https://www.mono-project.com/docs/advanced/pinvoke/>`__
diff --git a/doc/source/api/csharp/csharp_raster.rst b/doc/source/api/csharp/csharp_raster.rst
index ac0e23ea40b8..fde6af99db4b 100644
--- a/doc/source/api/csharp/csharp_raster.rst
+++ b/doc/source/api/csharp/csharp_raster.rst
@@ -15,40 +15,40 @@ The :file:`Band` class contains the following :file:`ReadRaster`/:file:`WriteRas
 
 .. code-block:: C#
 
-    public CPLErr ReadRaster(int xOff, int yOff, int xSize, int ySize, byte[] buffer, 
+    public CPLErr ReadRaster(int xOff, int yOff, int xSize, int ySize, byte[] buffer,
         int buf_xSize, int buf_ySize, int pixelSpace, int lineSpace){}
-        
-    public CPLErr WriteRaster(int xOff, int yOff, int xSize, int ySize, byte[] buffer, 
+
+    public CPLErr WriteRaster(int xOff, int yOff, int xSize, int ySize, byte[] buffer,
         int buf_xSize, int buf_ySize, int pixelSpace, int lineSpace){}
-        
-    public CPLErr ReadRaster(int xOff, int yOff, int xSize, int ySize, short[] buffer, 
+
+    public CPLErr ReadRaster(int xOff, int yOff, int xSize, int ySize, short[] buffer,
         int buf_xSize, int buf_ySize, int pixelSpace, int lineSpace){}
-        
-    public CPLErr WriteRaster(int xOff, int yOff, int xSize, int ySize, short[] buffer, 
+
+    public CPLErr WriteRaster(int xOff, int yOff, int xSize, int ySize, short[] buffer,
         int buf_xSize, int buf_ySize, int pixelSpace, int lineSpace){}
-        
-    public CPLErr ReadRaster(int xOff, int yOff, int xSize, int ySize, int[] buffer, 
+
+    public CPLErr ReadRaster(int xOff, int yOff, int xSize, int ySize, int[] buffer,
         int buf_xSize, int buf_ySize, int pixelSpace, int lineSpace){}
-        
-    public CPLErr WriteRaster(int xOff, int yOff, int xSize, int ySize, int[] buffer, 
+
+    public CPLErr WriteRaster(int xOff, int yOff, int xSize, int ySize, int[] buffer,
         int buf_xSize, int buf_ySize, int pixelSpace, int lineSpace){}
-        
-    public CPLErr ReadRaster(int xOff, int yOff, int xSize, int ySize, float[] buffer, 
+
+    public CPLErr ReadRaster(int xOff, int yOff, int xSize, int ySize, float[] buffer,
         int buf_xSize, int buf_ySize, int pixelSpace, int lineSpace){}
-        
-    public CPLErr WriteRaster(int xOff, int yOff, int xSize, int ySize, float[] buffer, 
+
+    public CPLErr WriteRaster(int xOff, int yOff, int xSize, int ySize, float[] buffer,
         int buf_xSize, int buf_ySize, int pixelSpace, int lineSpace){}
-        
-    public CPLErr ReadRaster(int xOff, int yOff, int xSize, int ySize, double[] buffer, 
+
+    public CPLErr ReadRaster(int xOff, int yOff, int xSize, int ySize, double[] buffer,
         int buf_xSize, int buf_ySize, int pixelSpace, int lineSpace){}
-        
-    public CPLErr WriteRaster(int xOff, int yOff, int xSize, int ySize, double[] buffer, 
+
+    public CPLErr WriteRaster(int xOff, int yOff, int xSize, int ySize, double[] buffer,
         int buf_xSize, int buf_ySize, int pixelSpace, int lineSpace){}
-        
+
     public CPLErr ReadRaster(int xOff, int yOff, int xSize, int ySize, IntPtr buffer, i
         nt buf_xSize, int buf_ySize, DataType buf_type, int pixelSpace, int lineSpace){}
-  
-    public CPLErr WriteRaster(int xOff, int yOff, int xSize, int ySize, IntPtr buffer, 
+
+    public CPLErr WriteRaster(int xOff, int yOff, int xSize, int ySize, IntPtr buffer,
         int buf_xSize, int buf_ySize, DataType buf_type, int pixelSpace, int lineSpace){}
 
 The only difference between these functions is the actual type of the buffer parameter.
@@ -76,7 +76,7 @@ When reading the image this way the C# API will copy the image data between the
     band.ReadRaster(0, 0, width, height, r, width, height, 0, 0);
     // Copying the pixels into the C# bitmap
     int i, j;
-    for (i = 0; i< width; i++) 
+    for (i = 0; i< width; i++)
     {
         for (j=0; j<height; j++)
         {
@@ -113,13 +113,13 @@ Raster data can be read into the C# bitmap directly using the following approach
     Bitmap bitmap = new Bitmap(width, height, PixelFormat.Format8bppIndexed);
     // Obtaining the bitmap buffer
     BitmapData bitmapData = bitmap.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.ReadWrite, PixelFormat.Format8bppIndexed);
-    try 
+    try
     {
         int stride = bitmapData.Stride;
         IntPtr buf = bitmapData.Scan0;
         band.ReadRaster(0, 0, width, height, buf, width, height, DataType.GDT_Byte, 1, stride);
     }
-    finally 
+    finally
     {
         bitmap.UnlockBits(bitmapData);
     }
@@ -167,7 +167,7 @@ When reading images with indexed color representations, the programmer might hav
     Bitmap bitmap = new Bitmap(width, height, PixelFormat.Format8bppIndexed);
     // Obtaining the bitmap buffer
     BitmapData bitmapData = bitmap.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.ReadWrite, PixelFormat.Format8bppIndexed);
-    try 
+    try
         {
             int iCol = ct.GetCount();
             ColorPalette pal = bitmap.Palette;
@@ -177,13 +177,13 @@ When reading images with indexed color representations, the programmer might hav
                 pal.Entries[i] = Color.FromArgb(ce.c4, ce.c1, ce.c2, ce.c3);
             }
             bitmap.Palette = pal;
-                
+
             int stride = bitmapData.Stride;
             IntPtr buf = bitmapData.Scan0;
 
             band.ReadRaster(0, 0, width, height, buf, width, height, DataType.GDT_Byte, 1, stride);
             }
-            finally 
+            finally
             {
                 bitmap.UnlockBits(bitmapData);
             }
@@ -199,19 +199,19 @@ When reading grayscale images, the programmer should create a sufficient palette
     Bitmap bitmap = new Bitmap(width, height, PixelFormat.Format8bppIndexed);
     // Obtaining the bitmap buffer
     BitmapData bitmapData = bitmap.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.ReadWrite, PixelFormat.Format8bppIndexed);
-    try 
+    try
         {
-            ColorPalette pal = bitmap.Palette; 
-            for(int i = 0; i < 256; i++) 
-                pal.Entries[i] = Color.FromArgb( 255, i, i, i ); 
+            ColorPalette pal = bitmap.Palette;
+            for(int i = 0; i < 256; i++)
+                pal.Entries[i] = Color.FromArgb( 255, i, i, i );
             bitmap.Palette = pal;
-                
+
             int stride = bitmapData.Stride;
             IntPtr buf = bitmapData.Scan0;
 
             band.ReadRaster(0, 0, width, height, buf, width, height, DataType.GDT_Byte, 1, stride);
         }
-        finally 
+        finally
         {
             bitmap.UnlockBits(bitmapData);
         }
@@ -224,5 +224,3 @@ The following examples demonstrate the usage of the GDAL raster operations menti
 * :source_file:`swig/csharp/apps/GDALRead.cs`
 * :source_file:`swig/csharp/apps/GDALReadDirect.cs`
 * :source_file:`swig/csharp/apps/GDALReadDirect.cs`
-
-.. note:: This document was amended from the previous version at `https://trac.osgeo.org/gdal/wiki/GdalOgrCsharpRaster <https://trac.osgeo.org/gdal/wiki/GdalOgrCsharpRaster>`__
diff --git a/doc/source/api/gdalattribute_cpp.rst b/doc/source/api/gdalattribute_cpp.rst
index cfd95ebd601f..bcf8d58f0f31 100644
--- a/doc/source/api/gdalattribute_cpp.rst
+++ b/doc/source/api/gdalattribute_cpp.rst
@@ -9,6 +9,11 @@
 GDALAttribute C++ API
 ================================================================================
 
+Include file
+------------
+
+:file:`gdal_priv.h`
+
 GDALAttribute class
 -------------------
 
diff --git a/doc/source/api/gdaldataset_cpp.rst b/doc/source/api/gdaldataset_cpp.rst
index 5f9938a0d0d8..a47ecfe3f74a 100644
--- a/doc/source/api/gdaldataset_cpp.rst
+++ b/doc/source/api/gdaldataset_cpp.rst
@@ -9,6 +9,14 @@
 GDALDataset C++ API
 ================================================================================
 
+Include file
+------------
+
+:file:`gdal_priv.h`
+
+GDALDataset class
+-----------------
+
 .. doxygenclass:: GDALDataset
    :project: api
    :members:
diff --git a/doc/source/api/gdaldimension_cpp.rst b/doc/source/api/gdaldimension_cpp.rst
index 2a32768d9ea6..e6dbb1d89980 100644
--- a/doc/source/api/gdaldimension_cpp.rst
+++ b/doc/source/api/gdaldimension_cpp.rst
@@ -9,6 +9,14 @@
 GDALDimension C++ API
 ================================================================================
 
+Include file
+------------
+
+:file:`gdal_priv.h`
+
+GDALDimension class
+-------------------
+
 .. doxygenclass:: GDALDimension
    :project: api
    :members:
diff --git a/doc/source/api/gdaldriver_cpp.rst b/doc/source/api/gdaldriver_cpp.rst
index d9dfcf145e57..2081ec3a03bf 100644
--- a/doc/source/api/gdaldriver_cpp.rst
+++ b/doc/source/api/gdaldriver_cpp.rst
@@ -9,6 +9,11 @@
 GDALDriver C++ API
 ================================================================================
 
+Include file
+------------
+
+:file:`gdal_priv.h`
+
 GDALDriver class
 ----------------
 
diff --git a/doc/source/api/gdalextendeddatatype_cpp.rst b/doc/source/api/gdalextendeddatatype_cpp.rst
index 40123ddfedcb..b1755cce378f 100644
--- a/doc/source/api/gdalextendeddatatype_cpp.rst
+++ b/doc/source/api/gdalextendeddatatype_cpp.rst
@@ -9,6 +9,11 @@
 GDALExtendedDataType C++ API
 ================================================================================
 
+Include file
+------------
+
+:file:`gdal_priv.h`
+
 GDALExtendedDataType class
 --------------------------
 
diff --git a/doc/source/api/gdalgroup_cpp.rst b/doc/source/api/gdalgroup_cpp.rst
index 0436b92046e5..cfd1b2324404 100644
--- a/doc/source/api/gdalgroup_cpp.rst
+++ b/doc/source/api/gdalgroup_cpp.rst
@@ -9,6 +9,14 @@
 GDALGroup C++ API
 ================================================================================
 
+Include file
+------------
+
+:file:`gdal_priv.h`
+
+GDALGroup class
+---------------
+
 .. doxygenclass:: GDALGroup
    :project: api
    :members:
diff --git a/doc/source/api/gdalmdarray_cpp.rst b/doc/source/api/gdalmdarray_cpp.rst
index b77169a98d0a..2d811ba6d79f 100644
--- a/doc/source/api/gdalmdarray_cpp.rst
+++ b/doc/source/api/gdalmdarray_cpp.rst
@@ -9,6 +9,14 @@
 GDALMDArray C++ API
 ================================================================================
 
+Include file
+------------
+
+:file:`gdal_priv.h`
+
+GDALMDArray class
+-----------------
+
 .. doxygenclass:: GDALMDArray
    :project: api
    :members:
diff --git a/doc/source/api/gdalrasterband_cpp.rst b/doc/source/api/gdalrasterband_cpp.rst
index b5c1146fbb90..9dd6204aa516 100644
--- a/doc/source/api/gdalrasterband_cpp.rst
+++ b/doc/source/api/gdalrasterband_cpp.rst
@@ -9,6 +9,14 @@
 GDALRasterBand C++ API
 ================================================================================
 
+Include file
+------------
+
+:file:`gdal_priv.h`
+
+GDALRasterBand class
+--------------------
+
 .. doxygenclass:: GDALRasterBand
    :project: api
    :members:
diff --git a/doc/source/api/gdalwarp_cpp.rst b/doc/source/api/gdalwarp_cpp.rst
index 47b57394a7d3..8d19a8d044ee 100644
--- a/doc/source/api/gdalwarp_cpp.rst
+++ b/doc/source/api/gdalwarp_cpp.rst
@@ -9,5 +9,13 @@
 Warper C++ API
 ================================================================================
 
+Include file
+------------
+
+:file:`gdalwarper.h`
+
+Warper C++ API
+--------------
+
 .. doxygenfile:: gdalwarper.h
    :project: api
diff --git a/doc/source/api/gnm_cpp.rst b/doc/source/api/gnm_cpp.rst
index ac05bffca4fb..ac11caf60ad3 100644
--- a/doc/source/api/gnm_cpp.rst
+++ b/doc/source/api/gnm_cpp.rst
@@ -9,5 +9,13 @@
 Geographic Network C++ API
 ================================================================================
 
+Include file
+------------
+
+:file:`gnm.h`
+
+Geographic Network C++ API
+--------------------------
+
 .. doxygenfile:: gnm.h
    :project: api
diff --git a/doc/source/api/index.rst b/doc/source/api/index.rst
index 127aea2f66a1..9c411bc71114 100644
--- a/doc/source/api/index.rst
+++ b/doc/source/api/index.rst
@@ -84,13 +84,13 @@ API
        :maxdepth: 1
 
        python_bindings
+       python/osgeo
        python/raster_api
        python/vector_api
        python/spatial_ref_api
        python/mdim_api
        python/utilities
        python/general
-       python/osgeo
        python_gotchas
        python_samples
 
@@ -117,7 +117,6 @@ API
 
        Go <https://github.com/lukeroth/gdal>
        Julia <https://github.com/JuliaGeo/GDAL.jl>
-       Lua <https://trac.osgeo.org/gdal/wiki/GdalOgrInLua>
        Original Node.js bindings <https://github.com/naturalatlas/node-gdal>
        Node.js fork with full Promise-based async and TypeScript support <https://www.npmjs.com/package/gdal-async>
        Perl <https://metacpan.org/release/Geo-GDAL-FFI>
@@ -126,10 +125,6 @@ API
        Ruby <https://github.com/telus-agcg/ffi-gdal>
        Rust <https://github.com/georust/gdal>
 
-    .. warning::
-        For Perl, since GDAL 3.5 the link `Perl <https://trac.osgeo.org/gdal/wiki/GdalOgrInPerl>`__ is deprecated, use above link instead.
-
-
 
     There are also more Pythonic ways of using the vector/OGR functions with
 
diff --git a/doc/source/api/java/index.rst b/doc/source/api/java/index.rst
index 68804cd56671..679ce1da6677 100644
--- a/doc/source/api/java/index.rst
+++ b/doc/source/api/java/index.rst
@@ -6,7 +6,7 @@ Java bindings
 
 The GDAL project has SWIG generated Java bindings for GDAL and OGR.
 
-Generally speaking the classes and methods mostly match those of the GDAL and OGR C++ classes. You can find the `​Javadoc <http://gdal.org/java>`__ of the API of the Java bindings.
+Generally speaking the classes and methods mostly match those of the GDAL and OGR C++ classes. You can find the `Javadoc <../../java>`__ of the API of the Java bindings.
 
 Due to the fact the Java garbage collector works in a separate thread from the main thread, it is necessary to configure GDAL with multi-threading support, even if you do not use GDAL API from several Java threads.
 
@@ -52,7 +52,7 @@ On Windows:
 Maven Users
 -----------
 
-The Java bindings are available from the ​`Maven Central <http://search.maven.org/>`__ repository. All that is needed is to declare a dependency.
+The Java bindings are available from the `Maven Central <http://search.maven.org/>`__ repository. All that is needed is to declare a dependency.
 
 
 .. code-block:: xml
@@ -68,7 +68,7 @@ The Java bindings are available from the ​`Maven Central <http://search.maven.
 Useful Links
 ------------
 
-* ​`Javadoc <http://gdal.org/java>`__ of the API of the Java bindings.
+* `Javadoc <../../java>`__ of the API of the Java bindings.
 * `gdalinfo.java <https://github.com/OSGeo/gdal/tree/master/swig/java/apps/gdalinfo.java>`__ Sample Java program similar to gdalinfo utility.
 * `All Java sample programs <https://github.com/OSGeo/gdal/tree/master/swig/java/apps/>`__
 * `Tamas Szekeres' Windows daily builds <http://www.gisinternals.com/sdk>`__ : Tamas Szekeres maintains a complete set of Win32 and Win64 binary packages that include the GDAL Java bindings. These packages are based on the current development and stable branches built from the GDAL source repository.
diff --git a/doc/source/api/ogrfeature_cpp.rst b/doc/source/api/ogrfeature_cpp.rst
index 9d1833db43a4..22fd1e8a0506 100644
--- a/doc/source/api/ogrfeature_cpp.rst
+++ b/doc/source/api/ogrfeature_cpp.rst
@@ -9,6 +9,11 @@
 OGRFeature C++ API
 ================================================================================
 
+Include file
+------------
+
+:file:`ogr_feature.h`
+
 OGRFeature class
 ----------------
 
diff --git a/doc/source/api/ogrfeaturestyle_cpp.rst b/doc/source/api/ogrfeaturestyle_cpp.rst
index 825adc0da519..2e330ac7da62 100644
--- a/doc/source/api/ogrfeaturestyle_cpp.rst
+++ b/doc/source/api/ogrfeaturestyle_cpp.rst
@@ -9,5 +9,13 @@
 OGRFeature Style C++ API
 ================================================================================
 
+Include file
+------------
+
+:file:`ogr_featurestyle.h`
+
+OGRFeature Style C++ API
+------------------------
+
 .. doxygenfile:: ogr_featurestyle.h
    :project: api
diff --git a/doc/source/api/ogrgeometry_cpp.rst b/doc/source/api/ogrgeometry_cpp.rst
index e6265500f629..c09c35bd7bbe 100644
--- a/doc/source/api/ogrgeometry_cpp.rst
+++ b/doc/source/api/ogrgeometry_cpp.rst
@@ -9,7 +9,10 @@
 OGRGeometry C++ API
 ================================================================================
 
-Include file: ogr_geometry.h
+Include file
+------------
+
+:file:`ogr_geometry.h`
 
 OGRGeometryFactory class
 ------------------------
@@ -32,6 +35,13 @@ OGRPoint class
    :project: api
    :members:
 
+OGRSimpleCurve class
+--------------------
+
+.. doxygenclass:: OGRSimpleCurve
+   :project: api
+   :members:
+
 OGRLineString class
 -------------------
 
diff --git a/doc/source/api/ogrlayer_cpp.rst b/doc/source/api/ogrlayer_cpp.rst
index c3d3422b8d6d..951d1b8b4440 100644
--- a/doc/source/api/ogrlayer_cpp.rst
+++ b/doc/source/api/ogrlayer_cpp.rst
@@ -9,6 +9,14 @@
 OGRLayer C++ API
 ================================================================================
 
+Include file
+------------
+
+:file:`ogrsf_frmts.h`
+
+OGRLayer class
+--------------
+
 .. doxygenclass:: OGRLayer
    :project: api
    :members:
diff --git a/doc/source/api/ogrspatialref.rst b/doc/source/api/ogrspatialref.rst
index 31cb013e8b30..56b9c7ecf287 100644
--- a/doc/source/api/ogrspatialref.rst
+++ b/doc/source/api/ogrspatialref.rst
@@ -9,5 +9,13 @@
 Spatial Reference System C++ API
 ================================================================================
 
+Include file
+------------
+
+:file:`ogr_spatialref.h`
+
+Spatial Reference System C++ API
+--------------------------------
+
 .. doxygenfile:: ogr_spatialref.h
    :project: api
diff --git a/doc/source/api/python/osgeo.rst b/doc/source/api/python/osgeo.rst
index d10dfdded4ba..4585e139a2e3 100644
--- a/doc/source/api/python/osgeo.rst
+++ b/doc/source/api/python/osgeo.rst
@@ -1,7 +1,7 @@
 .. _python_osgeo:
 
-Miscellaneous Python API
-========================
+GDAL Python submodules
+======================
 
 
 Submodules
diff --git a/doc/source/build_driver_summary.py b/doc/source/build_driver_summary.py
index a1fd4e0dfa9a..ff1bd90c822f 100755
--- a/doc/source/build_driver_summary.py
+++ b/doc/source/build_driver_summary.py
@@ -10,8 +10,10 @@
 
 res = []
 
+excluded_filenames = ["driver_summary", "wms_wmts_cache"]
+
 for filename in glob.glob(os.path.join(dirname, "*.rst")):
-    if "driver_summary" in filename:
+    if os.path.basename(filename)[0:-4] in excluded_filenames:
         continue
     with open(filename, "rt", encoding="utf-8") as f:
         shortnames = []
@@ -27,7 +29,7 @@
         for l in f.readlines():
             l = l.rstrip("\n")
             if not link:
-                assert l.startswith(".. _") and l.endswith(":")
+                assert l.startswith(".. _") and l.endswith(":"), (filename, l)
                 link = l[len(".. _") : -1]
             elif l.startswith(".. shortname:: "):
                 shortname = l[len(".. shortname:: ") :]
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 091075678639..8be1263d063f 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -43,9 +43,10 @@
     doc_version = open(version_file).read().strip()
     gdal_version = gdal.__version__
     gdal_version_stripped = gdal_version
-    pos_dev = gdal_version_stripped.find("dev")
-    if pos_dev > 0:
-        gdal_version_stripped = gdal_version_stripped[0:pos_dev]
+    for suffix in ["dev", "beta"]:
+        pos_suffix = gdal_version_stripped.find(suffix)
+        if pos_suffix > 0:
+            gdal_version_stripped = gdal_version_stripped[0:pos_suffix]
 
     if doc_version.strip() != gdal_version_stripped:
         logger.warn(
@@ -66,11 +67,11 @@
 extensions = [
     "breathe",
     "configoptions",
-    "redirects",
     "driverproperties",
     "source_file",
     "sphinx.ext.napoleon",
     "sphinxcontrib.jquery",
+    "sphinxcontrib.spelling",
 ]
 
 # Add any paths that contain templates here, relative to this directory.
@@ -93,6 +94,24 @@
 # This avoids the need to add an explicit ..include directive to every file.
 rst_prolog = open(os.path.join(os.path.dirname(__file__), "substitutions.rst")).read()
 
+# Add a substitution with links to download the docs in PDF or ZIP format.
+# If building with ReadTheDocs, the link will be to the version that is being built.
+# Otherwise it will be to the latest version.
+doc_version_known = "READTHEDOCS_VERSION" in os.environ
+offline_doc_version = os.environ.get("READTHEDOCS_VERSION", "latest")
+pdf_url = f"/_/downloads/en/{offline_doc_version}/pdf/"
+zip_url = f"/_/downloads/en/{offline_doc_version}/htmlzip/"
+if doc_version_known:
+    offline_download_text = "This documentation is also "
+    url_root = ""
+else:
+    offline_download_text = "Documentation for the latest version of GDAL is "
+    url_root = "https://gdal.org"
+offline_download_text += f"available as a `PDF <{url_root}{pdf_url}>`__ or a `ZIP of individual HTML pages <{url_root}{zip_url}>`__ for offline browsing."
+rst_prolog += f"""
+.. |offline-download| replace:: {offline_download_text}
+"""
+
 # -- Options for HTML output -------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
@@ -106,14 +125,15 @@
     "theme_vcs_pageview_mode": "edit",
     "github_user": "OSGeo",
     "github_repo": "gdal",
-    "github_version": "master/doc/source/",
+    "github_version": "master",
+    "conf_py_path": "/doc/source/",
 }
 
 html_theme_options = {
     "canonical_url": "https://gdal.org/",  # Trailing slash needed to have correct <link rel="canonical" href="..."/> URLs
     "analytics_id": "",  #  Provided by Google in your dashboard
     "logo_only": True,
-    "display_version": True,
+    "version_selector": True,
     "prev_next_buttons_location": "both",
     "style_external_links": False,
     #'vcs_pageview_mode': '',
@@ -124,12 +144,14 @@
     #'navigation_depth': 4,
     "includehidden": True,
     "titles_only": False,
+    "flyout_display": "attached",
 }
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-# html_static_path = ['_static']
+html_static_path = ["_static"]
+html_extra_path = ["../build/html_extra"]
 
 # If true, links to the reST sources are added to the pages.
 html_show_sourcelink = False
@@ -516,7 +538,11 @@
 # -- Breathe -------------------------------------------------
 
 # Setup the breathe extension
-breathe_projects = {"api": "../build/xml"}
+
+build_dir = os.environ.get("BUILDDIR", "../build")
+if build_dir == "build":
+    build_dir = "../build"
+breathe_projects = {"api": os.path.join(build_dir, "xml")}
 breathe_default_project = "api"
 
 # Tell sphinx what the primary language being documented is.
@@ -527,9 +553,23 @@
 source_file_root = os.path.join(os.path.dirname(__file__), os.pardir, os.pardir)
 source_file_url_template = "https://github.com/OSGeo/gdal/blob/master/{}"
 
+# -- ReadTheDocs configuration ----------------------------------
+
+# see https://about.readthedocs.com/blog/2024/07/addons-by-default/
+
+# Define the canonical URL if you are using a custom domain on Read the Docs
+html_baseurl = os.environ.get("READTHEDOCS_CANONICAL_URL", "")
+
+# Tell Jinja2 templates the build is running on Read the Docs
+if os.environ.get("READTHEDOCS", "") == "True":
+    html_context["READTHEDOCS"] = True
+
 # -- GDAL Config option listing ------------------------------------------
 options_since_ignore_before = "3.0"
 
-# -- Redirects --------------------------------------------------
+# -- Spelling --------------------------------------------------
+
+# Avoid running git
+spelling_ignore_contributor_names = False
 
-enable_redirects = False
+spelling_word_list_filename = ["spelling_wordlist.txt"]
diff --git a/doc/source/development/building_from_source.rst b/doc/source/development/building_from_source.rst
index 26ce35a9c598..adaa100d5bb8 100644
--- a/doc/source/development/building_from_source.rst
+++ b/doc/source/development/building_from_source.rst
@@ -4,6 +4,29 @@
 Building GDAL from source
 ================================================================================
 
+.. _build_requirements:
+
+Build requirements
+--------------------------------------------------------------------------------
+
+The minimum requirements to build GDAL are:
+
+- CMake >= 3.16, and an associated build system (make, ninja, Visual Studio, etc.)
+- C99 compiler
+- C++17 compiler since GDAL 3.9 (C++11 in previous versions)
+- PROJ >= 6.3.1
+
+Additional requirements to run the GDAL test suite are:
+
+- SWIG >= 4, for building bindings to other programming languages
+- Python >= 3.8
+- Python packages listed in `autotest/requirements.txt`
+
+A number of optional libraries are also strongly recommended for most builds:
+SQLite3, expat, libcurl, zlib, libtiff, libgeotiff, libpng, libjpeg, etc.
+Consult :ref:`raster_drivers` and :ref:`vector_drivers` pages for information
+on dependencies of optional drivers.
+
 CMake (GDAL versions >= 3.5.0)
 --------------------------------------------------------------------------------
 
@@ -1134,6 +1157,20 @@ It is used by the internal libtiff library or the :ref:`raster.zarr` driver.
     Control whether to use LibLZMA. Defaults to ON when LibLZMA is found.
 
 
+libOpenDRIVE
+************
+
+`libOpenDRIVE <https://github.com/pageldev/libOpenDRIVE>`_ in version >= 0.6.0 is required for the :ref:`vector.xodr` driver.
+
+.. option:: OpenDrive_DIR
+
+    Path to libOpenDRIVE CMake configuration directory ``<installDir>/cmake/``. The :file:`cmake/` path is usually automatically created when installing libOpenDRIVE and contains the necessary configuration files for inclusion into other project builds.
+
+.. option:: GDAL_USE_OPENDRIVE=ON/OFF
+
+    Control whether to use libOpenDRIVE. Defaults to ON when libOpenDRIVE is found.
+
+
 LibQB3
 ******
 
@@ -1145,7 +1182,6 @@ by the :ref:`raster.marfa` driver.
     Control whether to use LibQB3. Defaults to ON when LibQB3 is found.
 
 
-
 LibXml2
 *******
 
@@ -1166,7 +1202,6 @@ capabilities in GMLJP2v2 generation.
     Control whether to use LibXml2. Defaults to ON when LibXml2 is found.
 
 
-
 LURATECH
 ********
 
@@ -1546,7 +1581,7 @@ The Oracle Instant Client SDK (closed source/proprietary) is required for the
 
 .. option:: Oracle_ROOT
 
-    Path to the root directory of the Oracle Instant Client SDK
+    Path to the root directory of the Oracle Instant Client SDK.
 
 .. option:: GDAL_USE_ORACLE=ON/OFF
 
@@ -1581,7 +1616,7 @@ Regular Expressions support. It is used for the REGEXP operator in drivers using
 
 .. option:: PCRE2_LIBRARY
 
-    Path to a shared or static library file with "pcre2-8" in its name
+    Path to a shared or static library file with "pcre2-8" in its name.
 
 .. option:: GDAL_USE_PCRE2=ON/OFF
 
@@ -2485,7 +2520,7 @@ How do I get PROJ ?
 
 PROJ is the only required build-time dependency of GDAL that is not vendorized
 in the GDAL source code tree. Consequently, the PROJ header and library must be available
-when configuring GDAL's CMake. Consult `PROJ installation <https://proj.org/install.html>`.
+when configuring GDAL's CMake. Consult `PROJ installation <https://proj.org/install.html>`__.
 
 Conflicting PROJ libraries
 **************************
@@ -2511,5 +2546,5 @@ crashes will occur at runtime (often at process termination with a
 Autoconf/nmake (GDAL versions < 3.5.0)
 --------------------------------------------------------------------------------
 
-See https://trac.osgeo.org/gdal/wiki/BuildHints for hints for GDAL < 3.5
+See http://web.archive.org/https://trac.osgeo.org/gdal/wiki/BuildHints for hints for GDAL < 3.5
 autoconf and nmake build systems.
diff --git a/doc/source/development/dev_documentation.rst b/doc/source/development/dev_documentation.rst
index b48b3b492c41..0dd69130f4c0 100644
--- a/doc/source/development/dev_documentation.rst
+++ b/doc/source/development/dev_documentation.rst
@@ -41,6 +41,11 @@ The following targets are available:
   verifies that there are no Doxygen warnings.
   Requires Doxygen >= 1.9.3 to be warning free.
 
+* ``spelling``: runs spell checking on the documentation, covering as well as
+  documentation generated from C/C++ API (Doxygen) and Python API. Words unknown
+  to the spell checker but still considered valid should be added to the allow
+  list in :file:`doc/source/spelling_wordlist.txt`
+
 * ``clean``: clean the ``doc/build`` directory.
 
 It is also possible to run those targets as CMake targets. In that case, the
diff --git a/doc/source/development/dev_environment.rst b/doc/source/development/dev_environment.rst
index b47b934f08b8..e8dff89f9fb4 100644
--- a/doc/source/development/dev_environment.rst
+++ b/doc/source/development/dev_environment.rst
@@ -4,28 +4,10 @@
 Setting up a development environment
 ================================================================================
 
-.. _build_requirements:
-
 Build requirements
---------------------------------------------------------------------------------
-
-The minimum requirements to build GDAL are:
-
-- CMake >= 3.16, and an associated build system (make, ninja, Visual Studio, etc.)
-- C99 compiler
-- C++17 compiler since GDAL 3.9 (C++11 in previous versions)
-- PROJ >= 6.3.1
+------------------
 
-Additional requirements to run the GDAL test suite are:
-
-- SWIG >= 4, for building bindings to other programming languages
-- Python >= 3.8
-- Python packages listed in `autotest/requirements.txt`
-
-A number of optional libraries are also strongly recommended for most builds:
-SQLite3, expat, libcurl, zlib, libtiff, libgeotiff, libpng, libjpeg, etc.
-Consult :ref:`raster_drivers` and :ref:`vector_drivers` pages for information
-on dependencies of optional drivers.
+See :ref:`build_requirements`
 
 Vagrant
 -------
@@ -98,6 +80,13 @@ Install miniconda
 
 Install `miniconda <https://repo.anaconda.com/miniconda/Miniconda3-latest-Windows-x86_64.exe>`_
 
+Install Visual Studio
++++++++++++++++++++++
+
+Install `Visual Studio <https://visualstudio.microsoft.com/vs/community/>`_ 
+In Visual Studio Installer Workloads tab check Desktop development with C++.
+Only the latest Community Edition (2022) is available.
+
 Install GDAL dependencies
 +++++++++++++++++++++++++
 
@@ -108,8 +97,8 @@ Start a Conda enabled console and assuming there is a c:\\dev directory
     cd c:\dev
     conda create --name gdal
     conda activate gdal
-    conda install --yes --quiet curl libiconv icu git python=3.7 swig numpy pytest zlib clcache
-    conda install --yes --quiet -c conda-forge compilers
+    conda install --yes --quiet curl libiconv icu git python swig numpy pytest zlib
+    conda install --yes --quiet -c conda-forge compilers clcache
     conda install --yes --quiet -c conda-forge \
         cmake proj geos hdf4 hdf5 \
         libnetcdf openjpeg poppler libtiff libpng xerces-c expat libxml2 kealib json-c \
@@ -118,9 +107,9 @@ Start a Conda enabled console and assuming there is a c:\\dev directory
 
 .. note::
 
-    The ``compilers`` package will install ``vs2017_win-64`` (at time of writing)
-    to set the appropriate environment for cmake to pick up. It is also possible
-    to use the ``vs2019_win-64`` package if Visual Studio 2019 is to be used.
+    The ``compilers`` package will install ``vs2019_win-64`` (at time of writing)
+    to set the appropriate environment for cmake to pick up. It also finds and works  
+    with Visual Studio 2022 if that is installed.
 
 Checkout GDAL sources
 +++++++++++++++++++++
@@ -154,3 +143,41 @@ From a Conda enabled console
         cd c:\dev\GDAL
         cd _build.vs2019
         ctest -V --build-config Release
+
+
+.. _setting_dev_environment_variables:
+
+Setting development environment variables
+-----------------------------------------
+
+Once GDAL has been built, a number of environment variables must be set to be
+able to execute C++ or Python utilities of the build directory, or run tests.
+
+This can be done by sourcing the following from the build directory:
+
+.. code-block:: bash
+
+    . ../scripts/setdevenv.sh
+
+(with adjustments to the above path if the build directory is not a subdirectory of the GDAL source root).
+
+For Windows, a similar ``scripts/setdevenv.bat`` script exists (it currently assumes a Release build).
+
+.. code-block:: console
+
+    cd c:\dev\gdal\build
+    ..\scripts\setdevenv.bat
+
+To verify that environment variables have been set correctly, you can check the version of a GDAL binary:
+
+.. code-block:: bash
+
+    gdalinfo --version
+    # GDAL 3.7.0dev-5327c149f5-dirty, released 2018/99/99 (debug build)
+
+and the Python bindings:
+
+.. code-block:: bash
+
+    python3 -c 'from osgeo import gdal; print(gdal.__version__)'
+    # 3.7.0dev-5327c149f5-dirty
diff --git a/doc/source/development/dev_practices.rst b/doc/source/development/dev_practices.rst
index 4bf9ad5af4cc..3121e138bce9 100644
--- a/doc/source/development/dev_practices.rst
+++ b/doc/source/development/dev_practices.rst
@@ -14,6 +14,8 @@ of a RFC (request for comment) document.
 
 GDAL's policy on substantial code additions is documented at :ref:`rfc-85`.
 
+.. _cpl:
+
 Portability
 -----------
 
@@ -31,7 +33,7 @@ C/C++ standards
 ---------------
 
 The current C and C++ standards adopted by GDAL/OGR are C99 and C++17
-(last updated per :ref:`rfc-98`)`
+(last updated per :ref:`rfc-98`).
 
 Variable naming
 ---------------
@@ -47,8 +49,7 @@ and potentially semantics of a variable. The following are some prefixes
 used in GDAL/OGR.
 
 -  *a*: array
--  *b*: C/C++ bool. In C code that pre-dates C99 adoption, it is also used for
-        ints with only TRUE/FALSE values.
+-  *b*: C/C++ bool. In C code that pre-dates C99 adoption, it is also used for ints with only TRUE/FALSE values.
 -  *by*: byte (GByte / unsigned char).
 -  *df*: floating point value (double precision)
 -  *e*: enumeration
@@ -78,25 +79,45 @@ variables.
 It may also be noted that the standard convention for variable names is
 to capitalize each word in a variable name.
 
+Function and class naming
+-------------------------
+
+- Functions and classes should have a selective enough namespace ("GDAL" or "OGR" prefix, or use of C++ namespace) to avoid symbol collision.
+
+File naming and code formatting
+-------------------------------
+
+- All source files (.h, .c, .cpp, .py, etc.) should have a header with copyright attribution and the text of the GDAL X/MIT license.
+- Use lower case filenames.
+- Use .cpp extension for C++ files (not .cc).
+- C/C++ code formatting rules are defined in :source_file:`.clang-format`. Python code formatting
+  is enforced by Black. The pre-commit utility should be used to enforce them automatically. See :ref:`commit_hooks`.
+
 Memory allocation
 -----------------
 
-As per :ref:`rfc-19`, you can use VSIMalloc2(x, y) instead of
-doing CPLMalloc(x \* y) or VSIMalloc(x \* y). VSIMalloc2 will detect
+Large memory allocations should be performed using the :cpp:func:`VSIMalloc` family of functions, which will return ``nullptr`` on allocation failure.
+As per :ref:`rfc-19`, you can use ``VSIMalloc2(x, y)`` instead of
+doing ``CPLMalloc(x * y)`` or ``VSIMalloc(x * y)``. :cpp:func:`VSIMalloc2` will detect
 potential overflows in the multiplication and return a NULL pointer if
 it happens. This can be useful in GDAL raster drivers where x and y are
 related to the raster dimensions or raster block sizes. Similarly,
-VSIMalloc3(x, y, z) can be used as a replacement for CPLMalloc(x \* y \*
-z).
+``VSIMalloc3(x, y, z)`` can be used as a replacement for ``CPLMalloc(x * y * z)``.
 
-File naming and code formatting
--------------------------------
+When working with standard library data structures such as ``std::vector`` that may throw ``std::bad_alloc``, a try/catch block should be used around blocks that may allocate a large amount of memory.
 
-- Use lower case filenames.
-- Use .cpp extension for C++ files (not .cc).
-- Code formatting rules are defined in :source_file:`.clang-format`. The
-  pre-commit utility can be used to enforce them automatically.
+Adding a new driver
+-------------------
+
+- If the driver depends on a third-party library, compilation of the driver must be made conditional on the presence of the library. Drivers should try to re-use existing library dependencies as much as possible, e.g. Expat for SAX XML parsing.
+- For a vector driver, check that the Open() method of the driver (often delegated to a Open() method of the datasource) is selective enough (i.e. it will not accept data files that are not meant for the driver), and robust enough (it will not crash for small variations w.r.t content that it would recognize). Check that it can deal with unusual filenames. For a GDAL driver, similar checks, as well for the optional Identify() method.
+- A set of tests covering the driver should be added to the Python test suite. If appropriate, small sample data files may be added to autotest/gdrivers/data or autotest/ogr/data. The ``test_ogrsf`` utility and ``GDALTest`` class may simplify testing of basic driver functionality.
+- A documentation page should be created for the driver. Documentation should, at a minimum, briefly describe the format handled by the driver and, when relevant, describe the particular syntax for the connection string, creation options, configuration options, etc. The documentation should provide a link to a more detailed format description and mention needed third-party libraries.
 
+Writing tests
+-------------
+
+See :ref:`writing_tests`.
 
 Git usage
 ---------
@@ -183,10 +204,12 @@ actually fixes it)
 
     Details here...
 
+.. _commit_hooks:
+
 Commit hooks
 ^^^^^^^^^^^^
 
-GDAL provides pre-commit hooks to run code linters before a commit is made. The
+GDAL provides pre-commit hooks to run code formatters and linters before a commit is made. The
 hooks are cloned with the repository and can be installed using
 `pre-commit <https://pre-commit.com>`_:
 
@@ -236,3 +259,50 @@ committed to https://github.com/OSGeo/gdal
 
 Committing symbolic links is allowed only under the .github directory in order to
 avoid potential problems on Windows.
+
+Source tree layout
+------------------
+
+- :file:`alg`: Algorithms: rasterization, polygonization, warper engine, etc.
+- :file:`apps`: C++ command line utilities
+- :file:`autotest`: Regression test suite (C++ and Python)
+- :file:`cmake`: CMake modules and helpers functions
+- :file:`doc`: Source code of GDAL documentation and scripts
+- :file:`docker`: Dockerfile's for `GDAL Docker images <https://github.com/OSGeo/gdal/blob/master/docker/README.md>`__
+- :file:`gcore`: Raster core functionality. Base classes: :cpp:class:`GDALDataset`, :cpp:class:`GDALRasterBand`, :cpp:class:`GDALDriver`, overview building, etc.
+- :file:`frmts`: GDAL/raster drivers (mostly, with the exception of the GDAL GeoPackage raster support in ogr/ogrsf_frmts/gpkg)
+- :file:`fuzzer`: Source code and scripts for GDAL `OSS-Fuzz integration <https://github.com/google/oss-fuzz>`__
+- :file:`gnm`: Source code for :ref:`gnm_data_model`
+- :file:`ogr`: OGR vector core classes: :cpp:class:`OGRFieldDefn`, :cpp:class:`OGRGeomFieldDefn`, :cpp:class:`OGRFeatureDefn`, :cpp:class:`OGRGeometry` and derived classes, OGR SQL, etc.
+- :file:`ogr/ogrsf_frmts`: OGR/vector drivers
+- :file:`ogr/ogrsf_frmts/generic`: OGR vector core class: `OGRLayer`, OGR SQL generic layer
+- :file:`port`: :ref:`CPL (Common Portability Library) <cpl>`
+- :file:`perftests`: C++ and Python scripts to check the speed/performance of various aspects of GDAL.
+- :file:`scripts`: various utility scripts used for Continuous Integration, release generation, and other auxiliary tasks. None of them are for end users.
+- :file:`swig/include`: definition of SWIG Python, Java, C# bindings
+- :file:`swig/python/gdal-utils/scripts`: Launcher scripts for installed/public GDAL Python utilities. No real functionality there
+- :file:`swig/python/gdal-utils/osgeo_utils`: Core code for GDAL Python utilities. Available in the PyPI gdal and gdal-utils packages.
+- :file:`swig/python/gdal-utils/samples`: Scripts that are not installed and generally not or very little documented. May serve as a staging area for future scripts that are going to be promoted as official.
+- :file:`swig/python/gdal-utils/auxiliary`: Helper methods and classes used by GDAL Python utilities. Available in the PyPI gdal and gdal-utils packages.
+- :file:`third_party`: Third-party libraries used by libgdal. Other may be found in:
+
+  * :file:`alg/internal_libqhull`
+  * :file:`apps/argparse`
+  * :file:`frmts/gtiff/libtiff`
+  * :file:`frmts/gtiff/libgeotiff`
+  * :file:`frmts/hdf4/hdf-eos`
+  * :file:`frmts/jpeg/libjpeg`
+  * :file:`frmts/jpeg/libjpeg12`
+  * :file:`frmts/grib/degrib/degrib`
+  * :file:`frmts/grib/degrib/g2clib`
+  * :file:`frmts/pcidsk/sdk`
+  * :file:`frmts/pcraster/libcsf`
+  * :file:`frmts/png/libpng`
+  * :file:`frmts/gif/giflib`
+  * :file:`frmts/zlib/`
+  * :file:`ogr/ogrsf_frmts/cad/libopencad`
+  * :file:`ogr/ogrsf_frmts/geojson/libjson`
+  * :file:`ogr/ogrsf_frmts/flatgeobuf/flatbuffers`
+  * :file:`ogr/ogrsf_frmts/pmtiles/pmtiles`
+  * :file:`ogr/ogrsf_frmts/sqlite/sqlite_rtree_bulk_load`
+
diff --git a/doc/source/development/index.rst b/doc/source/development/index.rst
index c369d385d947..59902fdbcfe5 100644
--- a/doc/source/development/index.rst
+++ b/doc/source/development/index.rst
@@ -8,8 +8,8 @@ Development
 .. toctree::
     :maxdepth: 1
 
-    dev_environment
     building_from_source
+    dev_environment
     dev_practices
     testing
     dev_documentation
diff --git a/doc/source/development/rfc/index.rst b/doc/source/development/rfc/index.rst
index f0763fe8d0ca..73f24bcf634e 100644
--- a/doc/source/development/rfc/index.rst
+++ b/doc/source/development/rfc/index.rst
@@ -106,3 +106,4 @@ RFC list
     rfc97_feature_and_fielddefn_sealing
     rfc98_build_requirements_gdal_3_9
     rfc99_geometry_coordinate_precision
+    rfc101_raster_dataset_threadsafety
diff --git a/doc/source/development/rfc/rfc101_raster_dataset_threadsafety.rst b/doc/source/development/rfc/rfc101_raster_dataset_threadsafety.rst
new file mode 100644
index 000000000000..be9ff44135fe
--- /dev/null
+++ b/doc/source/development/rfc/rfc101_raster_dataset_threadsafety.rst
@@ -0,0 +1,482 @@
+.. _rfc-101:
+
+===================================================================
+RFC 101: Raster dataset read-only thread-safety
+===================================================================
+
+============== =============================================
+Author:        Even Rouault
+Contact:       even.rouault @ spatialys.com
+Started:       2024-Aug-29
+Status:        Adopted, implemented
+Target:        GDAL 3.10
+============== =============================================
+
+Summary
+-------
+
+This RFC enables users to get instances of :cpp:class:`GDALDataset`
+(and their related objects such as :cpp:class:`GDALRasterBand`) that are
+thread-safe for read-only raster operations, that is such instances can
+be safely used from multiple threads without locking.
+
+Terminology
+-----------
+
+The exact meaning of the terms ``thread-safe`` or ``re-entrant`` is not fully
+standardized. We will use here the `QT definitions <https://doc.qt.io/qt-5/threads-reentrancy.html>`__.
+In particular, a C function or C++ method is said to be re-entrant if it can
+be called simultaneously from multiple threads, *but* only if each invocation
+uses its own data/instance. On the contrary, it is thread-safe is if can be
+called on the same data/instance (so thread-safe is stronger than re-entrant)
+
+Motivation
+----------
+
+A number of raster algorithms can be designed to read chunks of a raster in
+an independent and concurrent way, with resulting speed-ups when using
+multi-threading. Currently, given a GDALDataset instance is not thread-safe,
+this requires either to deal with I/O in a single thread, or through a mutex
+to protect against concurrent use, or one needs to open a separate GDALDataset
+for each worker thread. Both approaches can complicate the writing of such
+algorithms. The enhancement of this RFC aims at providing a special GDALDataset
+instance that can be used safely from multiple threads. Internally, it does use
+one GDALDataset per thread, but hides this implementation detail to the user.
+
+C and C++ API extensions
+------------------------
+
+A new ``GDAL_OF_THREAD_SAFE`` opening flag is added to be specified to
+:cpp:func:`GDALOpenEx` / :cpp:func:`GDALDataset::Open`. This flag is for now
+mutually exclusive with ``GDAL_OF_VECTOR``, ``GDAL_OF_MULTIDIM_RASTER`` and
+``GDAL_OF_UPDATE``. That is this flag is only meant for read-only raster
+operations (``GDAL_OF_RASTER | GDAL_OF_THREAD_SAFE``).
+
+To know if a given dataset can be used in a thread-safe way, the following
+C++ method is added to the GDALDataset class:
+
+.. code-block:: c++
+
+    /** Return whether this dataset, and its related objects (typically raster
+     * bands), can be called for the intended scope.
+     *
+     * Note that in the current implementation, nScopeFlags should be set to
+     * GDAL_OF_RASTER, as thread-safety is limited to read-only operations and
+     * excludes operations on vector layers (OGRLayer) or multidimensional API
+     * (GDALGroup, GDALMDArray, etc.)
+     *
+     * This is the same as the C function GDALDatasetIsThreadSafe().
+     *
+     * @since 3.10
+     */
+    bool IsThreadSafe(int nScopeFlags) const;
+
+
+The corresponding C function is added:
+
+.. code-block:: c
+
+    bool GDALDatasetIsThreadSafe(GDALDatasetH hDS, int nScopeFlags,
+                                 CSLConstList papszOptions);
+
+
+A new C++ function, GDALGetThreadSafeDataset, is added with two forms:
+
+.. code-block:: c++
+
+    std::unique_ptr<GDALDataset> GDALGetThreadSafeDataset(std::unique_ptr<GDALDataset> poDS, int nScopeFlags);
+
+    GDALDataset* GDALGetThreadSafeDataset(GDALDataset* poDS, int nScopeFlags);
+
+This function accepts a (generally non thread-safe) source dataset and return
+a new dataset that is a thread-safe wrapper around it, or the source dataset if
+it is already thread-safe.
+The nScopeFlags argument must be compulsory set to GDAL_OF_RASTER to express that
+the intended scope is read-only raster operations (other values will result in
+an error and a NULL returned dataset).
+This function is used internally by GDALOpenEx() when the GDAL_OF_THREAD_SAFE
+flag is passed to wrap the dataset returned by the driver.
+The first form takes ownership of the source dataset. The second form does not,
+but references it internally, and assumes that its lifetime will be longer than
+the lifetime of the returned thread-safe dataset. Note that the second form does
+increase the reference count on the passed dataset while it is being used, so
+patterns like the following one are valid:
+
+.. code-block:: c++
+
+   auto poDS = GDALDataset::Open(...);
+   GDALDataset* poThreadSafeDS = GDALGetThreadSafeDataset(poDS, GDAL_OF_RASTER | GDAL_OF_THREAD_SAFE);
+   poDS->ReleaseRef(); // can be done here, or any time later
+   if (poThreadSafeDS )
+   {
+       // ... do something with poThreadSafeDS ...
+       poThreadSafeDS->ReleaseRef();
+   }
+
+
+For proper working both when a new dataset is returned or the passed one if it
+is already thread-safe, :cpp:func:`GDALDataset::ReleaseRef()` (and not delete or
+GDALClose()) must be called on the returned dataset.
+
+
+The corresponding C function for the second form is added:
+
+.. code-block:: c
+
+    GDALDatasetH GDALGetThreadSafeDataset(GDALDatasetH hDS, int nScopeFlags, CSLConstList papszOptions);
+
+
+Usage examples
+--------------
+
+Example of a function processing a whole dataset passed as a filename:
+
+.. code-block:: c++
+
+    void foo(const char* pszFilename)
+    {
+        auto poDS = std::unique_ptr<GDALDataset>(GDALDataset::Open(
+            pszFilename, GDAL_OF_RASTER | GDAL_OF_THREAD_SAFE | GDAL_OF_VERBOSE_ERROR));
+        if( !poDS )
+        {
+            return;
+        }
+
+        // TODO: spawn threads using poDS
+    }
+
+
+Example of a function processing a whole dataset passed as an object:
+
+.. code-block:: c++
+
+    void foo(GDALDataset* poDS)
+    {
+        GDALDataset* poThreadSafeDS = GDALGetThreadSafeDataset(poDS, GDAL_OF_RASTER);
+        if( poThreadSafeDS )
+        {
+            // TODO: spawn threads using poThreadSafeDS
+
+            poThreadSafeDS->ReleaseRef();
+        }
+        else
+        {
+            // TODO: Serial version of the algorithm. It can happen if
+            // poDS is a on-the-fly dataset.
+        }
+    }
+
+
+Example of a function processing a single band passed as an object:
+
+.. code-block:: c++
+
+    void foo(GDALRasterBand* poBand)
+    {
+        GDALDataset* poThreadSafeDS = nullptr;
+        GDALRasterBand* poThreadSafeBand = nullptr;
+        GDALDataset* poDS = poBand->GetDataset();
+        // Check that poBand has a matching owing dataset
+        if( poDS && poDS->GetRasterBand(poBand->GetBand()) == poBand )
+        {
+            poThreadSafeDS = GDALGetThreadSafeDataset(poDS, GDAL_OF_RASTER);
+            if( poThreadSafeDS )
+                poThreadSafeBand = poThreadSafeDS->GetBand(poBand->GetBand());
+        }
+
+        if( poThreadSafeBand )
+        {
+            // TODO: spawn threads using poThreadSafeBand
+
+            poThreadSafeDS->ReleaseRef();
+        }
+        else
+        {
+            // TODO: Serial version of the algorithm. It can happen if
+            // poBand is a on-the-fly band, or a "detached" band, such as a
+            // mask band, or an overview band as returned by some drivers.
+        }
+    }
+
+
+SWIG bindings
+-------------
+
+The new C macro and functions are bound to SWIG as:
+
+- ``gdal.OF_THREAD_SAFE``
+- :py:func:`Dataset.IsThreadSafe(nScopeFlags)`
+- :py:func:`Dataset.GetThreadSafeDataset(nScopeFlags)`. The Python
+  implementation of this method takes care of keeping a reference on the source
+  dataset in the returned thread-safe dataset, so the user does not have to
+  care about their respective lifetimes.
+
+Usage and design limitations
+----------------------------
+
+* As implied by the RFC title, the scope of thread-safety is restricted to
+  **raster** and **read-only** operations.
+
+* For GDALDataset instances pointing to a file on the regular filesystem, the
+  limitation of the maximum number of file descriptor opened by a process
+  (1024 on most Linux systems) could be hit if working with a sufficiently large
+  number of worker threads and/or instances of GDALThreadSafeDataset.
+
+* The generic implementation of GDALGetThreadSafeDataset assumes that the
+  source dataset can be re-opened by its name (GetDescription()), which is the
+  case for datasets opened by GDALOpenEx(). A special implementation is also
+  made for dataset instances of the MEM driver. But, there is currently no
+  support for creating a thread-safe dataset wrapper on on-the-fly datasets
+  returned by some algorithms (e.g GDALTranslate() or GDALWarp() with VRT as
+  the output driver and with an empty filename, or custom GDALDataset
+  implementation by external code).
+
+* Inherent to the selected approach, there is a band block cache per thread, and
+  thus no sharing of cached blocks between threads.
+  However, this should not be a too severe limitation for algorithms where
+  threads process independent regions of the raster, hence reuse of cached blocks
+  would be non-existent or low. Optimal algorithms will make sure to work on
+  regions of interest aligned on the block size (this advice also applies for
+  the current approach of manually opening a dataset for each worker thread).
+
+* Due to implementation limitations, :cpp:func:`GDALRasterBand::GetDefaultRAT`
+  on a GDALThreadSafeDataset instance only works if the RAT is an instance of
+  :cpp:class:`GDALDefaultRasterAttributeTable`. An error is emitted if
+  this is not the case. This could potentially be extended to work with any
+  subclass of :cpp:class:`GDALRasterAttributeTable` but with significant
+  additional coding to create a thread-safe wrapper. (GDALDefaultRasterAttributeTable
+  is intrinsically thread-safe for read-only operations). This is not perceived
+  as a limitation for the intended use cases of this RFC (reading pixel values
+  in parallel).
+
+* Some drivers, like netCDF, and HDF5 in some builds, use a global lock around
+  each call to their APIs, due to the underlying libraries not being re-entrant.
+  Obviously scalability of GDALThreadSafeDataset will be limited by such global
+  lock.
+  But this is no different than the approach of opening as many dataset as
+  worker threads.
+
+Implementation details
+----------------------
+
+(This section is mostly of interest for developers familiar with GDAL internals
+and may be skipped by users of the GDAL API)
+
+The gist of the implementation lies in a new file ``gcore/gdalthreadsafedataset.cpp``
+which defines several classes (internal details):
+
+- ``GDALThreadSafeDataset`` extending :cpp:class:`GDALProxyDataset`.
+  Instances of that class are returned by GDALGetThreadSafeDataset().
+  On instantiation, it creates as many GDALThreadSafeRasterBand instances as
+  the number of bands of the source dataset.
+  All virtual methods of GDALDataset are redefined by GDALProxyDataset.
+  GDALThreadSafeDataset overloads its ReferenceUnderlyingDataset method, so that
+  a thread-local dataset is opened the first-time a thread calls a method on
+  the GDALThreadSafeDataset instance, cached for later use, and method call is
+  generally forwarded to it. There are exceptions for methods like
+  :cpp:func:`GDALDataset::GetSpatialRef`, :cpp:func:`GDALDataset::GetGCPSpatialRef`,
+  :cpp:func:`GDALDataset::GetGCPs`, :cpp:func:`GDALDataset::GetMetadata`,
+  :cpp:func:`GDALDataset::GetMetadataItem` that return non-primitive types
+  where the calls are forwarded to the dataset used to construct GDALThreadSafeDataset,
+  with a mutex being taken around them. If the call was otherwise forwarded to
+  a thread-local instance, there would be a risk of use-after-free situations
+  when the returned value is used by different threads.
+
+- ``GDALThreadSafeRasterBand`` extending :cpp:class:`GDALProxyRasterBand`.
+  On instantiation, it creates child GDALThreadSafeRasterBand instances for
+  band mask and overviews.
+  Its ReferenceUnderlyingRasterBand method calls ReferenceUnderlyingDataset
+  on the GDALThreadSafeDataset instance to get a thread-local dataset, fetches
+  the appropriate thread-local band and generally forwards its the method call.
+  There are exceptions for methods like
+  :cpp:func:`GDALRasterBand::GetUnitType`, :cpp:func:`GDALRasterBand::GetMetadata`,
+  :cpp:func:`GDALRasterBand::GetMetadataItem` that return non-primitive types where
+  the calls are forwarded to the band used to construct GDALThreadSafeRasterBand,
+  with a mutex being taken around them, and the returned value being .
+
+- ``GDALThreadLocalDatasetCache``. Instances of that class use thread-local
+  storage. The main member of such instances is a LRU cache that maps
+  GDALThreadSafeDataset* instances to a thread specific GDALDataset smart pointer.
+  On GDALThreadSafeDataset destruction, there's code to iterate over all
+  alive GDALThreadLocalDatasetCache instances and evict no-longer needed entries
+  in them, within a per-GDALThreadLocalDatasetCache instance mutex, to avoid
+  issues when dealing with several instances of GDALThreadLocalDatasetCache...
+  Note that the existence of this mutex should not cause performance issues, since
+  contention on it, should be very low in real-world use cases (it could become
+  a bottleneck if GDALThreadSafeDataset were created and destroyed at a very
+  high pace)
+
+Two protected virtual methods are added to GDALDataset for GDALThreadSafeDataset
+implementation, and may be overloaded by drivers if needed (but it is not
+anticipated that drivers but the MEM driver need to do that)
+
+- ``bool CanBeCloned(int nScopeFlags, bool bCanShareState) const``.
+  This method determines if a source dataset can be "cloned" (or re-opened).
+  It returns true for instances returned by GDALOpenEx, for instances of the MEM
+  driver if ``nScopeFlags`` == ``GDAL_OF_RASTER`` (and ``bCanShareState`` is
+  true for instances of the MEM driver)
+
+- ``std::unique_ptr<GDALDataset> Clone(int nScopeFlags, bool bCanShareState) const``.
+  This method returns a "clone" of the dataset on which it is called, and is used
+  by GDALThreadSafeDataset::ReferenceUnderlyingDataset() when a thread-local
+  dataset is needed.
+  Implementation of that method must be thread-safe.
+  The base implementation calls GDALOpenEx() reusing the dataset name, open flags
+  and open option. It is overloaded in the MEM driver to return a new instance
+  of MEMDataset, but sharing the memory buffers with the source dataset.
+
+No code in drivers, but the MEM driver, is modified by the candidate
+implementation.
+
+A few existing non-virtual methods of GDALDataset and GDALRasterBand have been
+made virtual (and overloaded by GDALProxyDataset and GDALProxyRasterBand),
+to avoid modifying state on the GDALThreadSafeRasterBand instance, which
+wouldn't be thread-safe.
+
+- :cpp:func:`GDALDataset::BlockBasedRasterIO`:
+  it interacts with the block cache
+- :cpp:func:`GDALRasterBand::GetLockedBlockRef`:
+  it interacts with the block cache
+- :cpp:func:`GDALRasterBand::TryGetLockedBlockRef`:
+  it interacts with the block cache
+- :cpp:func:`GDALRasterBand::FlushBlock`:
+  it interacts with the block cache
+- :cpp:func:`GDALRasterBand::InterpolateAtPoint`:
+  it uses a per-band cache
+- :cpp:func:`GDALRasterBand::EnablePixelTypeSignedByteWarning`: it should
+  already have been made virtual for GDALProxyRasterBand needs.
+
+Non-virtual methods :cpp:func:`GDALDataset::GetProjectionRef` and
+:cpp:func:`GDALDataset::GetGCPProjection`, which cache the return value, have
+been modify to apply a mutex when run on a dataset that IsThreadSafe() to be
+effectively thread-safe.
+
+A SetThreadSafe() method has been added to :cpp:class:`OGRSpatialReference`.
+When it is called, all methods of that class run under a per-instance (recursive)
+mutex. This is used by GDALThreadSafeDataset for its implementation of the
+:cpp:func:`GDALDataset::GetSpatialRef` and :cpp:func:`GDALDataset::GetGCPSpatialRef`
+methods, such that the returned OGRSpatialReference instances are thread-safe.
+
+Performance
+-----------
+
+The existing multireadtest utility that reads a dataset from multiple threads
+has been extended with a -thread_safe flag to asks to use GDAL_OF_THREAD_SAFE
+when opening the dataset in the main thread and use it in the worker threads,
+instead of the default behavior of opening explicitly a dataset in each thread.
+The thread-safe mode shows similar scalability as the default mode, sometimes
+with a slightly decreased efficiency, but not in a too problematic way.
+
+For example on a 20x20 raster:
+
+.. code-block:: shell
+
+    $ time multireadtest -t 4 -i 1000000 20x20.tif
+    real    0m2.084s
+    user    0m8.155s
+    sys     0m0.020s
+
+    vs
+
+    $ time multireadtest -thread_safe -t 4 -i 1000000 20x20.tif
+    real    0m2.387s
+    user    0m9.334s
+    sys     0m0.029s
+
+
+But on a 4096x4096 raster with a number of iterations reduced to 100, the
+timings between the default and thread_safe modes are very similar.
+
+A Python equivalent of multireadtest has been written. Scalability depends
+on how much Python code is executed. If relatively few long-enough calls to
+GDAL are done, scalability tends to be good due to the Python Global Interpreter
+Lock (GIL) being dropped around them. If many short calls are done, the GIL
+itself, or its repeated acquisition and release, becomes the bottleneck. This is
+no different than using a GDALDataset per thread.
+
+Documentation
+-------------
+
+Documentation for the new constant and functions will be added. The
+:ref:`multithreading` page will be updated to reflect the new capability
+introduced by this RFC.
+
+Backward compatibility
+----------------------
+
+No issue anticipated: the C and C++ API are extended.
+The C++ ABI is modified due to additions of new virtual methods.
+
+Testing
+-------
+
+Tests will be added for the new functionality, including stress tests to have
+sufficiently high confidence in the correctness of the implementation for common
+use cases.
+
+Risks
+-----
+
+Like all code related to multi-threading, the C++ language and tooling offers
+hardly any safety belt against thread-safety programming errors. So it cannot
+be excluded that the implementation suffers from  bugs in some edge scenarios,
+or in the usage of some methods of GDALDataset, GDALRasterBand and related objects
+(particularly existing non-virtual methods of those classes that could happen
+to have a non thread-safe implementation)
+
+Design discussion
+-----------------
+
+This paragraph discusses a number of thoughts that arose during the writing of
+this RFC.
+
+1.  A significantly different alternative could have consisted in adding native
+    thread-safety in each driver. But this is not realistic for the following reasons:
+
+    * if that was feasible, it would require considerable development effort to
+      rework each drivers. So realistically, only a few select drivers would be updated.
+
+    * Even updating a reduced number of drivers would be extremely difficult, in
+      particular the GeoTIFF one, due to the underlying library not being reentrant,
+      and deferred loading strategies and many state variables being modified even
+      by read-only APIs. And this applies to most typical drivers.
+
+    * Due to the inevitable locks, there would be a (small) cost bore by callers
+      even on single-thread uses of thread-safe native drivers.
+
+    * Some core mechanisms, particularly around the per-band block cache structures,
+      are not currently thread-safe.
+
+2.  A variant of the proposed implementation that did not use thread-local storage
+    has been initially attempted. It stored instead a
+    ``std::map<thread_id, std::unique_ptr<GDALDataset>>`` on each GDALThreadSafeDataset
+    instance. This implementation was simpler, but unfortunately suffered from high
+    lock contention since a mutex had to be taken around each access to this map,
+    with the contention increasing with the number of concurrent threads.
+
+3.  For the unusual situations where a dataset cannot be reopened and thus
+    GDALGetThreadSafeDataset() fails, should we provide an additional ``bForce``
+    argument to force it to still return a dataset, where calls to the wrapped
+    dataset are protected by a mutex? This would enable to always write multi-thread
+    safe code, even if the access to the dataset is serialized.
+    Similarly we could have a
+    ``std::unique_ptr<GDALRasterBand> GDALGetThreadSafeRasterBand(GDALRasterBand* poBand, int nOpenFlags, bool bForce)``
+    function that would try to use GDALGetThreadSafeDataset() internally if it
+    manages to identify the dataset to which the band belongs to, and otherwise would
+    fallback to protecting calls to the wrapped band with a mutex.
+
+    Given the absence of evidence that such option is necessary, this has been excluded
+    from the scope of this RFC.
+
+
+Related issues and PRs
+----------------------
+
+- Candidate implementation: https://github.com/OSGeo/gdal/pull/10746
+
+- https://github.com/OSGeo/gdal/issues/8448: GTiff: Allow concurrent reading of single blocks
+
+Voting history
+--------------
+
++1 from PSC members KurtS, JukkaR, JavierJS and EvenR
diff --git a/doc/source/development/rfc/rfc12_filemanagement.rst b/doc/source/development/rfc/rfc12_filemanagement.rst
index 6a7c448ae9ce..7f59bb83618b 100644
--- a/doc/source/development/rfc/rfc12_filemanagement.rst
+++ b/doc/source/development/rfc/rfc12_filemanagement.rst
@@ -24,7 +24,7 @@ GetFileList()
 -------------
 
 The following new virtual method is added on the GDALDataset class, with
-an analygous C function.
+an analogous C function.
 
 ::
 
diff --git a/doc/source/development/rfc/rfc19_safememalloc.rst b/doc/source/development/rfc/rfc19_safememalloc.rst
index a5e1e6ed034e..3f87189dce54 100644
--- a/doc/source/development/rfc/rfc19_safememalloc.rst
+++ b/doc/source/development/rfc/rfc19_safememalloc.rst
@@ -26,7 +26,7 @@ scanlines, whole image buffers, etc.. Currently no overflow checking is
 done, thus leading to potential allocation of not large enough buffers.
 Overflow can occur when raster dimensions are very large (this can be
 the case with a WMS raster source for example) or when a dataset is
-corrupted, intentionnaly or unintentionnaly. This can lead to latter
+corrupted, intentionally or unintentionally. This can lead to latter
 crash.
 
 This RFC introduces new API to allocate memory when the computation of
diff --git a/doc/source/development/rfc/rfc34_license_policy.rst b/doc/source/development/rfc/rfc34_license_policy.rst
index a0b0e12341c0..cf1db6ba45a5 100644
--- a/doc/source/development/rfc/rfc34_license_policy.rst
+++ b/doc/source/development/rfc/rfc34_license_policy.rst
@@ -1,14 +1,14 @@
 .. _rfc-34:
 
 ================================================================================
-RFC 34: License Policy Enforcement
+RFC 34: License Policy Enforcement (not implemented)
 ================================================================================
 
 Authors: Frank Warmerdam
 
 Contact: warmerdam@pobox.com
 
-Status: Development
+Status: On hold / not implemented
 
 Summary
 -------
diff --git a/doc/source/development/rfc/rfc36_open_by_drivername.rst b/doc/source/development/rfc/rfc36_open_by_drivername.rst
index 29e2601df494..3ba29ba62fce 100644
--- a/doc/source/development/rfc/rfc36_open_by_drivername.rst
+++ b/doc/source/development/rfc/rfc36_open_by_drivername.rst
@@ -1,14 +1,16 @@
 .. _rfc-36:
 
 ================================================================================
-RFC 36: Allow specification of intended driver on GDALOpen
+RFC 36: Allow specification of intended driver on GDALOpen (withdrawn)
 ================================================================================
 
 Authors: Ivan Lucena
 
 Contact: ivan.lucena@pmldnet.com
 
-Status: Proposed
+Status: Withdrawn.
+
+Covered by `RFC 46: GDAL/OGR unification <./rfc46_gdal_ogr_unification>`__
 
 Summary
 -------
diff --git a/doc/source/development/rfc/rfc39_ogr_layer_algebra.rst b/doc/source/development/rfc/rfc39_ogr_layer_algebra.rst
index 9ff04717b88a..b43204430492 100644
--- a/doc/source/development/rfc/rfc39_ogr_layer_algebra.rst
+++ b/doc/source/development/rfc/rfc39_ogr_layer_algebra.rst
@@ -19,7 +19,7 @@ for commonly needed overlay analysis methods.
 The basic functionality for spatial analysis with GDAL is provided by
 GEOS. However, GEOS operates on geometries and typically people work
 with geospatial data layers. Vector data layers are represented in GDAL
-by OGRLayer objects. Thus, there is a need for spatial analaysis
+by OGRLayer objects. Thus, there is a need for spatial analysis
 operations that work on layers.
 
 Unfortunately there is no standard for spatial analysis operations API,
diff --git a/doc/source/development/rfc/rfc41_multiple_geometry_fields.rst b/doc/source/development/rfc/rfc41_multiple_geometry_fields.rst
index 4153ecb1949b..7eb801f26eac 100644
--- a/doc/source/development/rfc/rfc41_multiple_geometry_fields.rst
+++ b/doc/source/development/rfc/rfc41_multiple_geometry_fields.rst
@@ -122,7 +122,7 @@ The OGRFeatureDefn class will be extended as the following :
            virtual void        AddGeomFieldDefn( OGRGeomFieldDefn * );
            virtual OGRErr      DeleteGeomFieldDefn( int iGeomField );
 
-           // Route OGRwkbGeometryType GetGeomType() and void SetGeomType() 
+           // Route OGRwkbGeometryType GetGeomType() and void SetGeomType()
            // on the first geometry field definition.
 
            // Same for IsGeometryIgnored() and SetGeometryIgnored()
@@ -179,7 +179,7 @@ The OGRFeature class will be extended as following :
            OGRErr              SetGeomFieldDirectly( int iField, OGRGeometry * );
            OGRErr              SetGeomField( int iField, OGRGeometry * );
 
-           // Route SetGeometryDirectly(), SetGeometry(), GetGeometryRef(), 
+           // Route SetGeometryDirectly(), SetGeometry(), GetGeometryRef(),
            // StealGeometry() on the first geometry field in the array
 
            // Modify implementation of SetFrom() to replicate all geometries
@@ -343,7 +343,7 @@ different in most use cases.
 
 (On the other side, if we introduce 64bit integer as a OGR type (this is
 an RFC that is waiting for implementation...), the above code would
-still produce a meaningful result. The string reprentation of a 64bit
+still produce a meaningful result. The string representation of a 64bit
 integer is not that bad as a default behavior.)
 
 GetFieldCount() would also take into account geometry fields, but in
diff --git a/doc/source/development/rfc/rfc46_gdal_ogr_unification.rst b/doc/source/development/rfc/rfc46_gdal_ogr_unification.rst
index 84690691bb6f..7c7dbba22985 100644
--- a/doc/source/development/rfc/rfc46_gdal_ogr_unification.rst
+++ b/doc/source/development/rfc/rfc46_gdal_ogr_unification.rst
@@ -264,7 +264,7 @@ Drivers and driver registration
      driver level because, in practice, layer creation options do not depend on the
      dataset instance.
      The value of this item is an XML snippet with a format similar to dataset creation
-     options. 
+     options.
      If specified, the passed creation options to CreateLayer() are validated
      against that authorized creation option list.
      Below an example of such an authorized open option list in the Shapefile driver.
@@ -305,17 +305,17 @@ Datasets / Datasources
 
        virtual int         TestCapability( const char * ) { return FALSE; }
 
-       virtual OGRLayer   *CreateLayer( const char *pszName, 
+       virtual OGRLayer   *CreateLayer( const char *pszName,
                                         OGRSpatialReference *poSpatialRef = NULL,
                                         OGRwkbGeometryType eGType = wkbUnknown,
                                         char ** papszOptions = NULL );
-       virtual OGRLayer   *CopyLayer( OGRLayer *poSrcLayer, 
-                                      const char *pszNewName, 
+       virtual OGRLayer   *CopyLayer( OGRLayer *poSrcLayer,
+                                      const char *pszNewName,
                                       char **papszOptions = NULL );
 
        virtual OGRStyleTable *GetStyleTable();
        virtual void        SetStyleTableDirectly( OGRStyleTable *poStyleTable );
-                               
+
        virtual void        SetStyleTable(OGRStyleTable *poStyleTable);
 
        virtual OGRLayer *  ExecuteSQL( const char *pszStatement,
@@ -337,7 +337,7 @@ Datasets / Datasources
    OGRLayerH CPL_DLL GDALDatasetGetLayer( GDALDatasetH, int );
    OGRLayerH CPL_DLL GDALDatasetGetLayerByName( GDALDatasetH, const char * );
    OGRErr    CPL_DLL GDALDatasetDeleteLayer( GDALDatasetH, int );
-   OGRLayerH CPL_DLL GDALDatasetCreateLayer( GDALDatasetH, const char *, 
+   OGRLayerH CPL_DLL GDALDatasetCreateLayer( GDALDatasetH, const char *,
                                          OGRSpatialReferenceH, OGRwkbGeometryType,
                                          char ** );
    OGRLayerH CPL_DLL GDALDatasetCopyLayer( GDALDatasetH, OGRLayerH, const char *,
@@ -383,7 +383,7 @@ Datasets / Datasources
 
 ::
 
-       virtual OGRLayer   *ICreateLayer( const char *pszName, 
+       virtual OGRLayer   *ICreateLayer( const char *pszName,
                                         OGRSpatialReference *poSpatialRef = NULL,
                                         OGRwkbGeometryType eGType = wkbUnknown,
                                         char ** papszOptions = NULL );
@@ -397,7 +397,7 @@ Datasets / Datasources
    creation option list (GDAL_DS_LAYER_CREATIONOPTIONLIST), before calling
    ICreateLayer() (this is similar to RasterIO() / IRasterIO() )
    A global pass on all in-tree OGR drivers has been made to rename CreateLayer()
-   as ICreateLayer(). 
+   as ICreateLayer().
 
 -  GDALOpenEx() is added to be able to open raster-only, vector-only, or
    raster-vector datasets. It accepts read-only/update mode,
@@ -533,7 +533,7 @@ Changes in drivers
    a file to determine if they recognize it. They have been converted to
    GDALDriver to accept a GDALOpenInfo argument and they now use its
    pabyHeader field to examine the first bytes of files. The number of
-   system calls realated to file access (open/stat), in order to
+   system calls related to file access (open/stat), in order to
    determine that a file is not recognized by any OGR driver, has now
    dropped from 46 in GDAL 1.11 to 1. The converted drivers are :
    AeronavFAA, ArcGEN, AVCBin, AVCE00, BNA, CSV, DGN, EDIGEO, ESRI
diff --git a/doc/source/development/rfc/rfc47_dataset_caching.rst b/doc/source/development/rfc/rfc47_dataset_caching.rst
index a84c74ceb814..1c2191079a7f 100644
--- a/doc/source/development/rfc/rfc47_dataset_caching.rst
+++ b/doc/source/development/rfc/rfc47_dataset_caching.rst
@@ -70,7 +70,7 @@ periods once the cache is full, and new memory is being initialized in
 GDALRasterBlock::Internalize().
 
 In order to remove the need for this LRU cache to be locked more often a
-new global config option is introducted "GDAL_DATASET_CACHING". This
+new global config option is added "GDAL_DATASET_CACHING". This
 causes the LRU cache to be per dataset when set to "YES", rather then a
 global cache ("NO" Default). Doing this will also allow threaded
 applications to flush only the cache for a single dataset, improving
diff --git a/doc/source/development/rfc/rfc48_geographical_networks_support.rst b/doc/source/development/rfc/rfc48_geographical_networks_support.rst
index 0e6bcd2d40fb..32a453bf77cd 100644
--- a/doc/source/development/rfc/rfc48_geographical_networks_support.rst
+++ b/doc/source/development/rfc/rfc48_geographical_networks_support.rst
@@ -19,7 +19,7 @@ project “GDAL/OGR Geography Network support� into GDAL library. GNM
 create, manage and analyse networks built over spatial data in GDAL.
 
 GSoC project description:
-`http://trac.osgeo.org/gdal/wiki/geography_network_support <http://trac.osgeo.org/gdal/wiki/geography_network_support>`__
+`http://web.archive.org/web/20240812232429/https://trac.osgeo.org/gdal/wiki/geography_network_support <http://web.archive.org/web/20240812232429/https://trac.osgeo.org/gdal/wiki/geography_network_support>`__
 
 GDAL fork with all changes in trunk:
 `https://github.com/MikhanGusev/gdal <https://github.com/MikhanGusev/gdal>`__
diff --git a/doc/source/development/rfc/rfc52_strict_sql_quoting.rst b/doc/source/development/rfc/rfc52_strict_sql_quoting.rst
index 8c93bee98883..3b251ee5f1b4 100644
--- a/doc/source/development/rfc/rfc52_strict_sql_quoting.rst
+++ b/doc/source/development/rfc/rfc52_strict_sql_quoting.rst
@@ -73,7 +73,7 @@ This change affects compatibility in the sense that users that relied on
 the current permissive behavior will have to adapt their SQL
 expressions. This might be quite tricky to detect as it will not always
 cause obvious runtime failures. For example " SELECT
-'i_thought_this_would_be_interpreted_as_a_column_name_but_now_it_is_a_string_litteral'
+'i_thought_this_would_be_interpreted_as_a_column_name_but_now_it_is_a_string_literal'
 FROM atable " will run without error but not produce the previously
 expected result. So applications will have to review how they build SQL
 filters ( SetAttributeFilter() ) and expressions ( ExecuteSQL() )
diff --git a/doc/source/development/rfc/rfc54_dataset_transactions.rst b/doc/source/development/rfc/rfc54_dataset_transactions.rst
index 63a65120fa7f..6f4d7d8cb392 100644
--- a/doc/source/development/rfc/rfc54_dataset_transactions.rst
+++ b/doc/source/development/rfc/rfc54_dataset_transactions.rst
@@ -96,7 +96,7 @@ MySQL
    other reading) because of the use of mysql_use_result() that can work
    with one single request at a time. mysql_store_result() would be a
    solution but requires ingesting the whole result set into memory,
-   which is inpractical for big layers.
+   which is impractical for big layers.
 -  step does not set row changes once the query has started (if done
    through another connection, because if done through ExecuteSQL() the
    long transaction is interrupted)
@@ -134,36 +134,36 @@ OGRDataSource which inherits from GDALDataset).
    /**
     \brief For datasources which support transactions, StartTransaction creates a transaction.
 
-    If starting the transaction fails, will return 
-    OGRERR_FAILURE. Datasources which do not support transactions will 
+    If starting the transaction fails, will return
+    OGRERR_FAILURE. Datasources which do not support transactions will
     always return OGRERR_UNSUPPORTED_OPERATION.
 
     Nested transactions are not supported.
-    
+
     All changes done after the start of the transaction are definitely applied in the
     datasource if CommitTransaction() is called. They may be canceled by calling
     RollbackTransaction() instead.
-    
+
     At the time of writing, transactions only apply on vector layers.
-    
+
     Datasets that support transactions will advertise the ODsCTransactions capability.
     Use of transactions at dataset level is generally preferred to transactions at
     layer level, whose scope is rarely limited to the layer from which it was started.
-    
+
     In case StartTransaction() fails, neither CommitTransaction() or RollbackTransaction()
     should be called.
-    
+
     If an error occurs after a successful StartTransaction(), the whole
     transaction may or may not be implicitly canceled, depending on drivers. (e.g.
     the PG driver will cancel it, SQLite/GPKG not). In any case, in the event of an
     error, an explicit call to RollbackTransaction() should be done to keep things balanced.
-    
+
     By default, when bForce is set to FALSE, only "efficient" transactions will be
     attempted. Some drivers may offer an emulation of transactions, but sometimes
     with significant overhead, in which case the user must explicitly allow for such
     an emulation by setting bForce to TRUE. Drivers that offer emulated transactions
     should advertise the ODsCEmulatedTransactions capability (and not ODsCTransactions).
-    
+
     This function is the same as the C function GDALDatasetStartTransaction().
 
     @param bForce can be set to TRUE if an emulation, possibly slow, of a transaction
@@ -182,10 +182,10 @@ OGRDataSource which inherits from GDALDataset).
    /**
     \brief For datasources which support transactions, CommitTransaction commits a transaction.
 
-    If no transaction is active, or the commit fails, will return 
-    OGRERR_FAILURE. Datasources which do not support transactions will 
-    always return OGRERR_UNSUPPORTED_OPERATION. 
-    
+    If no transaction is active, or the commit fails, will return
+    OGRERR_FAILURE. Datasources which do not support transactions will
+    always return OGRERR_UNSUPPORTED_OPERATION.
+
     Depending on drivers, this may or may not abort layer sequential readings that
     are active.
 
@@ -202,11 +202,11 @@ OGRDataSource which inherits from GDALDataset).
 
    /**
     \brief For datasources which support transactions, RollbackTransaction will roll
-    back a datasource to its state before the start of the current transaction. 
+    back a datasource to its state before the start of the current transaction.
 
-    If no transaction is active, or the rollback fails, will return  
+    If no transaction is active, or the rollback fails, will return
     OGRERR_FAILURE. Datasources which do not support transactions will
-    always return OGRERR_UNSUPPORTED_OPERATION. 
+    always return OGRERR_UNSUPPORTED_OPERATION.
 
     This function is the same as the C function GDALDatasetRollbackTransaction().
 
@@ -244,7 +244,7 @@ whose data is supported by files/directories.
 ::
 
    /** Returns a new datasource object that adds transactional behavior to an existing datasource.
-    * 
+    *
     * The provided poTransactionBehaviour object should implement driver-specific
     * behavior for transactions.
     *
diff --git a/doc/source/development/rfc/rfc59.1_utilities_as_a_library.rst b/doc/source/development/rfc/rfc59.1_utilities_as_a_library.rst
index a21637e17aae..202dfa7f4d4c 100644
--- a/doc/source/development/rfc/rfc59.1_utilities_as_a_library.rst
+++ b/doc/source/development/rfc/rfc59.1_utilities_as_a_library.rst
@@ -395,13 +395,13 @@ keywords. So various combinations are possible :
 ::
 
 
-   def WarpOptions(options = [], format = 'GTiff', 
+   def WarpOptions(options = [], format = 'GTiff',
             outputBounds = None,
             outputBoundsSRS = None,
             xRes = None, yRes = None, targetAlignedPixels = False,
             width = 0, height = 0,
             srcSRS = None, dstSRS = None,
-            srcAlpha = False, dstAlpha = False, 
+            srcAlpha = False, dstAlpha = False,
             warpOptions = None, errorThreshold = None,
             warpMemoryLimit = None, creationOptions = None, outputType = GDT_Unknown,
             workingType = GDT_Unknown, resampleAlg = None,
@@ -467,7 +467,7 @@ keywords. So various combinations are possible :
 ::
 
 
-   def VectorTranslateOptions(options = [], format = 'ESRI Shapefile', 
+   def VectorTranslateOptions(options = [], format = 'ESRI Shapefile',
             accessMode = None,
             srcSRS = None, dstSRS = None, reproject = True,
             SQLStatement = None, SQLDialect = None, where = None, selectFields = None, spatFilter = None,
@@ -553,7 +553,7 @@ keywords. So various combinations are possible :
 
 ::
 
-   def NearblackOptions(options = [], format = 'GTiff', 
+   def NearblackOptions(options = [], format = 'GTiff',
             creationOptions = None, white = False, colors = None,
             maxNonBlack = None, nearDist = None, setAlpha = False, setMask = False,
             callback = None, callback_data = None):
@@ -564,7 +564,7 @@ keywords. So various combinations are possible :
              creationOptions --- list of creation options
              white --- whether to search for nearly white (255) pixels instead of nearly black pixels.
              colors --- list of colors  to search for, e.g. ((0,0,0),(255,255,255)). The pixels that are considered as the collar are set to 0
-             maxNonBlack --- number of non-black (or other searched colors specified with white / colors) pixels that can be encountered before the giving up search inwards. Defaults to 2. 
+             maxNonBlack --- number of non-black (or other searched colors specified with white / colors) pixels that can be encountered before the giving up search inwards. Defaults to 2.
              nearDist --- select how far from black, white or custom colors the pixel values can be and still considered near black, white or custom color.  Defaults to 15.
              setAlpha --- adds an alpha band if the output file.
              setMask --- adds a mask band to the output file.
@@ -635,7 +635,7 @@ keywords. So various combinations are possible :
 
 ::
 
-   def RasterizeOptions(options = [], format = None, 
+   def RasterizeOptions(options = [], format = None,
             creationOptions = None, noData = None, initValues = None,
             outputBounds = None, outputSRS = None,
             width = None, height = None,
@@ -660,8 +660,8 @@ keywords. So various combinations are possible :
              bands --- list of output bands to burn values into
              inverse --- whether to invert rasterization, ie burn the fixed burn value, or the burn value associated  with the first feature into all parts of the image not inside the provided a polygon.
              allTouched -- whether to enable the ALL_TOUCHED rasterization option so that all pixels touched by lines or polygons will be updated, not just those on the line render path, or whose center point is within the polygon.
-             burnValues -- list of fixed values to burn into each band for all objects. Excusive with attribute.
-             attribute --- identifies an attribute field on the features to be used for a burn-in value. The value will be burned into all output bands. Excusive with burnValues.
+             burnValues -- list of fixed values to burn into each band for all objects. Exclusive with attribute.
+             attribute --- identifies an attribute field on the features to be used for a burn-in value. The value will be burned into all output bands. Exclusive with burnValues.
              useZ --- whether to indicate that a burn value should be extracted from the "Z" values of the feature. These values are added to the burn value given by burnValues or attribute if provided. As of now, only points and lines are drawn in 3D.
              layers --- list of layers from the datasource that will be used for input features.
              SQLStatement --- SQL statement to apply to the source dataset
diff --git a/doc/source/development/rfc/rfc5_unicode.rst b/doc/source/development/rfc/rfc5_unicode.rst
index 6405f30fda7e..d24d6c50d2f4 100644
--- a/doc/source/development/rfc/rfc5_unicode.rst
+++ b/doc/source/development/rfc/rfc5_unicode.rst
@@ -32,7 +32,7 @@ means we should convert user's input from the local encoding to UTF-8
 during interactive sessions. The opposite should be done for GDAL
 output. For example, when user passes a filename as a command-line
 parameter to GDAL utilities, that filename should be immediately
-converted to UTF-8 and only afetrwards passed to functions like
+converted to UTF-8 and only afterwards passed to functions like
 GDALOpen() or OGROpen(). All functions, which take character strings as
 parameters, assume UTF-8 (with except of several ones, which will do the
 conversion between different encodings, see Implementation). The same is
diff --git a/doc/source/development/rfc/rfc69_cplusplus_formatting.rst b/doc/source/development/rfc/rfc69_cplusplus_formatting.rst
index 14a0621f8f47..dad776a33a13 100644
--- a/doc/source/development/rfc/rfc69_cplusplus_formatting.rst
+++ b/doc/source/development/rfc/rfc69_cplusplus_formatting.rst
@@ -13,7 +13,7 @@ Contact:    schwehr@google.com / schwehr@gmail.com
 Co-Author:  Alessandro Pasotti
 Contact:    elpaso@itopen.it
 Started:    2017-May-04
-Status:     Adpoted, implemented
+Status:     Adopted, implemented
 =========== ======================================
 
 This RFC is based on `GEOS RFC
@@ -159,11 +159,11 @@ different styles mixed.
 
 To skip the "big reformat" commit from ``git blame``, git offers a mechanism
 to [git_blame_ignore] , a pre-configured ignore file ``.git-blame-ignore-revs``
-will be provided in the source tree with the "big reformat" commit 
+will be provided in the source tree with the "big reformat" commit
 hash in it.
 
-The ignore file can be specified on the command line with 
-``git blame --ignore-revs-file .git-blame-ignore-revs`` or it can be set 
+The ignore file can be specified on the command line with
+``git blame --ignore-revs-file .git-blame-ignore-revs`` or it can be set
 permanently with ``git config blame.ignoreRevsFile .git-blame-ignore-revs``.
 
 The a.m. instructions will be added to the `developers documentation <https://gdal.org/development/dev_practices.html>`__.
diff --git a/doc/source/development/rfc/rfc6_sqlgeom.rst b/doc/source/development/rfc/rfc6_sqlgeom.rst
index 611df0abb41a..2fd5fb7dac0e 100644
--- a/doc/source/development/rfc/rfc6_sqlgeom.rst
+++ b/doc/source/development/rfc/rfc6_sqlgeom.rst
@@ -64,9 +64,9 @@ for the field names and types in ogrfeaturequery.cpp as
 
 ::
 
-   char* SpecialFieldNames[SPECIAL_FIELD_COUNT] 
+   char* SpecialFieldNames[SPECIAL_FIELD_COUNT]
        = {"FID", "OGR_GEOMETRY", "OGR_STYLE", "OGR_GEOM_WKT"};
-   swq_field_type SpecialFieldTypes[SPECIAL_FIELD_COUNT] 
+   swq_field_type SpecialFieldTypes[SPECIAL_FIELD_COUNT]
        = {SWQ_INTEGER, SWQ_STRING, SWQ_STRING, SWQ_STRING};
 
 So as to make this array accessible to the other files the followings
@@ -165,7 +165,7 @@ added to OGRFeature in ogrfeature.h as:
 
 ::
 
-   char * m_pszTmpFieldValue; 
+   char * m_pszTmpFieldValue;
 
 This member will be initialized to NULL at the constructor, and will be
 freed using CPLFree() at the destructor of OGRFeature.
@@ -180,7 +180,7 @@ m_pszTmpFieldValue at the beginning of the function:
 ::
 
    CPLFree(m_pszTmpFieldValue);
-   m_pszTmpFieldValue = NULL; 
+   m_pszTmpFieldValue = NULL;
 
 In ogrfeaturequery.cpp we should change OGRFeatureQuery::Compile to add
 the special fields like:
@@ -195,7 +195,7 @@ the special fields like:
        ++iField;
    }
 
-In ogrfeaturequery.cpp OGRFeatureQueryEvaluator() should be modifyed
+In ogrfeaturequery.cpp OGRFeatureQueryEvaluator() should be modified
 according to the field specific actions like
 
 ::
@@ -211,7 +211,7 @@ according to the field specific actions like
                sField.Integer = poFeature->GetFieldAsInteger( op->field_index );
            case SWQ_STRING:
                sField.String = (char*) poFeature->GetFieldAsString( op->field_index );
-           }      
+           }
        }
        else
        {
@@ -224,12 +224,12 @@ according to the field specific actions like
        psField = poFeature->GetRawFieldRef( op->field_index );
 
 In ogrfeaturequery.cpp OGRFeatureQuery::FieldCollector should be
-modifyed to add the field names like:
+modified to add the field names like:
 
 ::
 
    if( op->field_index >= poTargetDefn->GetFieldCount()
-           && op->field_index < poTargetDefn->GetFieldCount() + SPECIAL_FIELD_COUNT) 
+           && op->field_index < poTargetDefn->GetFieldCount() + SPECIAL_FIELD_COUNT)
            pszFieldName = SpecialFieldNames[op->field_index];
 
 In ogrdatasource.cpp ExecuteSQL() will allocate the arrays according to
@@ -237,13 +237,13 @@ the number of the special fields:
 
 ::
 
-   sFieldList.names = (char **) 
+   sFieldList.names = (char **)
            CPLMalloc( sizeof(char *) * (nFieldCount+SPECIAL_FIELD_COUNT) );
-   sFieldList.types = (swq_field_type *)  
+   sFieldList.types = (swq_field_type *)
            CPLMalloc( sizeof(swq_field_type) * (nFieldCount+SPECIAL_FIELD_COUNT) );
-   sFieldList.table_ids = (int *) 
+   sFieldList.table_ids = (int *)
            CPLMalloc( sizeof(int) * (nFieldCount+SPECIAL_FIELD_COUNT) );
-   sFieldList.ids = (int *) 
+   sFieldList.ids = (int *)
            CPLMalloc( sizeof(int) * (nFieldCount+SPECIAL_FIELD_COUNT) );
 
 And the fields will be added as
@@ -288,10 +288,10 @@ field values):
 
 ::
 
-   pszError = swq_select_summarize( psSelectInfo, iField, 
+   pszError = swq_select_summarize( psSelectInfo, iField,
    poSrcFeature->GetFieldAsString( psColDef->field_index ) );
 
-OGRGenSQLResultsLayer::TranslateFeature should also be modifyed when
+OGRGenSQLResultsLayer::TranslateFeature should also be modified when
 copying the fields from primary record to the destination feature
 
 ::
@@ -350,19 +350,19 @@ the same function as:
    }
 
 When ordering by the field values the OGRGenSQLResultsLayer::Compare
-should also be modifyed:
+should also be modified:
 
 ::
 
    if( psKeyDef->field_index >= iFIDFieldIndex )
        poFDefn = NULL;
    else
-       poFDefn = poSrcLayer->GetLayerDefn()->GetFieldDefn( 
+       poFDefn = poSrcLayer->GetLayerDefn()->GetFieldDefn(
            psKeyDef->field_index );
 
-   if( (pasFirstTuple[iKey].Set.nMarker1 == OGRUnsetMarker 
+   if( (pasFirstTuple[iKey].Set.nMarker1 == OGRUnsetMarker
            && pasFirstTuple[iKey].Set.nMarker2 == OGRUnsetMarker)
-       || (pasSecondTuple[iKey].Set.nMarker1 == OGRUnsetMarker 
+       || (pasSecondTuple[iKey].Set.nMarker1 == OGRUnsetMarker
            && pasSecondTuple[iKey].Set.nMarker2 == OGRUnsetMarker) )
        nResult = 0;
    else if ( poFDefn == NULL )
@@ -397,7 +397,7 @@ straightforward and the following steps should be made:
 
 3. The field value accessors (OGRFeature::GetFieldAsString,
    OGRFeature::GetFieldAsInteger, OGRFeature::GetFieldAsDouble) should
-   be modifyed to provide the value of the new special field. All of
+   be modified to provide the value of the new special field. All of
    these functions provide const return values so GetFieldAsString
    should retain the value in the m_pszTmpFieldValue member.
 
diff --git a/doc/source/development/rfc/rfc73_proj6_wkt2_srsbarn.rst b/doc/source/development/rfc/rfc73_proj6_wkt2_srsbarn.rst
index f26d7a625549..6ea971daddb1 100644
--- a/doc/source/development/rfc/rfc73_proj6_wkt2_srsbarn.rst
+++ b/doc/source/development/rfc/rfc73_proj6_wkt2_srsbarn.rst
@@ -253,7 +253,7 @@ Alternatively the OSR_WKT_FORMAT configuration option can be used to
 modify the WKT version used by exportToWk() (when no explicit version is
 passed in the options of exportToWkt())
 
-The gdalinfo, ogrinfo and gdalsrsinfo utililies will default to
+The gdalinfo, ogrinfo and gdalsrsinfo utilities will default to
 outputting WKT2:2018
 
 Axis order issues
diff --git a/doc/source/development/rfc/rfc75_multidimensional_arrays.rst b/doc/source/development/rfc/rfc75_multidimensional_arrays.rst
index ab8d6ef4213b..021109202372 100644
--- a/doc/source/development/rfc/rfc75_multidimensional_arrays.rst
+++ b/doc/source/development/rfc/rfc75_multidimensional_arrays.rst
@@ -26,7 +26,7 @@ spatio-temporal (time series of
 2D raster) or spatio-vertical-temporal (2D + Z dimension + time dimension) data which
 are becoming increasingly more available. GDAL current raster model is however strongly
 2D oriented. A number of drivers, such as netCDF, HDF4, HDF5, work around that
-limitation by using raster bands or subdatasets to expose muliple 2D slices of what
+limitation by using raster bands or subdatasets to expose multiple 2D slices of what
 is intrinsically a N>2 Multidimensional dataset. It is desirable to have a
 proper API, and driver support, to be able to expose those multidimensional
 arrays as such, and be able to perform slice and trim operations on them.
diff --git a/doc/source/development/rfc/rfc7_vsilapi.rst b/doc/source/development/rfc/rfc7_vsilapi.rst
index 558e4d258d6f..6e152b40ce21 100644
--- a/doc/source/development/rfc/rfc7_vsilapi.rst
+++ b/doc/source/development/rfc/rfc7_vsilapi.rst
@@ -96,7 +96,7 @@ Implementation
 --------------
 
 The whole source tree ( port, gcore, frmts, ogr, swig/include ) will be
-altered adequatly so that the compilation works in VSIL_STRICT_ENFORCE
+altered adequately so that the compilation works in VSIL_STRICT_ENFORCE
 mode. Ticket #3799 contains a patch with the implementation. The
 compilation doesn't add any new warning. The autotest suite still works
 after this change.
@@ -108,7 +108,7 @@ process have been compiled.
 
 In the conversion process, a misuse of POSIX FILE API with a large file
 handler was discovered in the ceos2 driver, but the function happened to
-be unusued.
+be unused.
 
 Voting History
 --------------
diff --git a/doc/source/development/rfc/rfc96_deferred_plugin_loading.rst b/doc/source/development/rfc/rfc96_deferred_plugin_loading.rst
index dbaf1386dcdc..0125fcee587c 100644
--- a/doc/source/development/rfc/rfc96_deferred_plugin_loading.rst
+++ b/doc/source/development/rfc/rfc96_deferred_plugin_loading.rst
@@ -377,7 +377,7 @@ done by code external to libgdal core.
 
 However, the candidate implementation hits an issue with the way the GDAL
 CondaForge builds work currently. At time of writing, the GDAL CondaForge
-build recipee does:
+build recipe does:
 
 - a regular GDAL build without Arrow/Parquet dependency (and thus without the
   driver), whose libgdal.so goes in to the libgdal package.
@@ -389,7 +389,7 @@ build recipee does:
   But that modified libgdal.so is discarded currently, and the ogr_Parquet.so
   plugin then depends on a identify method that is not implemented.
 
-The initial idea was that the build recipee would have to be modified to produce
+The initial idea was that the build recipe would have to be modified to produce
 all artifacts (libgdal.so and libparquet.so) at a single time, and dispatch
 them appropriately in libgdal and libgdal-arrow-parquet packages, rather than
 doing two builds. However, CondaForge builds support several libarrow versions,
diff --git a/doc/source/development/testing.rst b/doc/source/development/testing.rst
index 7921d0ebe1a1..72f5bdfca7a2 100644
--- a/doc/source/development/testing.rst
+++ b/doc/source/development/testing.rst
@@ -24,27 +24,7 @@ Running a subset of tests using ``pytest``
 
 The test subsets exposed by ``ctest`` are still rather large and some may take several minutes to run.
 If a higher level of specificity is needed, ``pytest`` can be called directly to run groups of tests or individual tests.
-Before running ``pytest``, it is important to set environment variables so that the development build of GDAL is tested,
-rather than a system version. This can be done by sourcing the following from the build directory:
-
-.. code-block:: bash
-
-    . ../scripts/setdevenv.sh
-
-(with adjustments to the above path if the build directory is not a subdirectory of the GDAL source root).
-To verify that environment variables were set correctly, you can check the version of a GDAL binary:
-
-.. code-block:: bash
-
-    gdalinfo --version
-    # GDAL 3.7.0dev-5327c149f5-dirty, released 2018/99/99 (debug build)
-
-and the Python bindings:
-
-.. code-block:: bash
-
-    python3 -c 'from osgeo import gdal; print(gdal.__version__)'
-    # 3.7.0dev-5327c149f5-dirty
+Before running ``pytest``, it is important to set :ref:`development environment variables <setting_dev_environment_variables>` so that the development build of GDAL is tested, rather than a system version.
 
 Tests can then be run by calling ``pytest``, for example on an individual file.
 On Linux and MacOS builds, the tests are symlinked into the build directory, so this
@@ -130,6 +110,8 @@ follows:
    ``~/.valgrindrc`` file.
 
 
+.. _writing_tests:
+
 Recommendations on how to write new tests
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -314,3 +296,8 @@ and pull requests events.
 A somewhat nicer looking output of line coverage results for the latest master
 build, generated by ``lcov``, is also available at
 https://gdalautotest-coverage-results.github.io/coverage_html/index.html
+
+Post-commit testing
+^^^^^^^^^^^^^^^^^^^
+
+A weekly static analysis is run by `Coverity <https://scan.coverity.com>`__. Developers/maintainers can request access on the `GDAL project page <https://scan.coverity.com/projects/749>`__.
diff --git a/doc/source/download.rst b/doc/source/download.rst
index 162a35dfad82..cde867e88ea6 100644
--- a/doc/source/download.rst
+++ b/doc/source/download.rst
@@ -10,281 +10,29 @@ Download
        :depth: 3
        :backlinks: none
 
-Current Release
-------------------------------------------------------------------------------
-
-* **2024-05-10** `gdal-3.9.0.tar.gz`_ `3.9.0 Release Notes`_ (`3.9.0 md5`_)
-
-.. _`3.9.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.9.0/NEWS.md
-.. _`gdal-3.9.0.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.9.0/gdal-3.9.0.tar.gz
-.. _`3.9.0 md5`: https://github.com/OSGeo/gdal/releases/download/v3.9.0/gdal-3.9.0.tar.gz.md5
-
-Past Releases
-------------------------------------------------------------------------------
-
-* **2024-04-04** `gdal-3.8.5.tar.gz`_ `3.8.5 Release Notes`_ (`3.8.5 md5`_)
-
-.. _`3.8.5 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.8.5/NEWS.md
-.. _`gdal-3.8.5.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.8.5/gdal-3.8.5.tar.gz
-.. _`3.8.5 md5`: https://github.com/OSGeo/gdal/releases/download/v3.8.5/gdal-3.8.5.tar.gz.md5
-
-* **2024-02-18** `gdal-3.8.4.tar.gz`_ `3.8.4 Release Notes`_ (`3.8.4 md5`_)
-
-.. _`3.8.4 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.8.4/NEWS.md
-.. _`gdal-3.8.4.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.8.4/gdal-3.8.4.tar.gz
-.. _`3.8.4 md5`: https://github.com/OSGeo/gdal/releases/download/v3.8.4/gdal-3.8.4.tar.gz.md5
-
-* **2024-01-08** `gdal-3.8.3.tar.gz`_ `3.8.3 Release Notes`_ (`3.8.3 md5`_)
-
-.. _`3.8.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.8.3/NEWS.md
-.. _`gdal-3.8.3.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.8.3/gdal-3.8.3.tar.gz
-.. _`3.8.3 md5`: https://github.com/OSGeo/gdal/releases/download/v3.8.3/gdal-3.8.3.tar.gz.md5
-
-* **2023-12-20** `gdal-3.8.2.tar.gz`_ `3.8.2 Release Notes`_ (`3.8.2 md5`_)
-
-.. _`3.8.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.8.2/NEWS.md
-.. _`gdal-3.8.2.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.8.2/gdal-3.8.2.tar.gz
-.. _`3.8.2 md5`: https://github.com/OSGeo/gdal/releases/download/v3.8.2/gdal-3.8.2.tar.gz.md5
-
-* **2023-11-30** `gdal-3.8.1.tar.gz`_ `3.8.1 Release Notes`_ (`3.8.1 md5`_)
-
-.. _`3.8.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.8.1/NEWS.md
-.. _`gdal-3.8.1.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.8.1/gdal-3.8.1.tar.gz
-.. _`3.8.1 md5`: https://github.com/OSGeo/gdal/releases/download/v3.8.1/gdal-3.8.1.tar.gz.md5
-
-* **2023-11-13** `gdal-3.8.0.tar.gz`_ `3.8.0 Release Notes`_ (`3.8.0 md5`_)
-
-.. _`3.8.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.8.0/NEWS.md
-.. _`gdal-3.8.0.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.8.0/gdal-3.8.0.tar.gz
-.. _`3.8.0 md5`: https://github.com/OSGeo/gdal/releases/download/v3.8.0/gdal-3.8.0.tar.gz.md5
-
-* **2023-11-03** `gdal-3.7.3.tar.gz`_ `3.7.3 Release Notes`_ (`3.7.3 md5`_)
-
-.. _`3.7.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.7.3/NEWS.md
-.. _`gdal-3.7.3.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.7.3/gdal-3.7.3.tar.gz
-.. _`3.7.3 md5`: https://github.com/OSGeo/gdal/releases/download/v3.7.3/gdal-3.7.3.tar.gz.md5
-
-* **2023-09-13** `gdal-3.7.2.tar.gz`_ `3.7.2 Release Notes`_ (`3.7.2 md5`_)
-
-.. _`3.7.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.7.2/NEWS.md
-.. _`gdal-3.7.2.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.7.2/gdal-3.7.2.tar.gz
-.. _`3.7.2 md5`: https://github.com/OSGeo/gdal/releases/download/v3.7.2/gdal-3.7.2.tar.gz.md5
-
-* **2023-07-13** `gdal-3.7.1.tar.gz`_ `3.7.1 Release Notes`_ (`3.7.1 md5`_)
-
-.. _`3.7.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.7.1/NEWS.md
-.. _`gdal-3.7.1.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.7.1/gdal-3.7.1.tar.gz
-.. _`3.7.1 md5`: https://github.com/OSGeo/gdal/releases/download/v3.7.1/gdal-3.7.1.tar.gz.md5
-
-* **2023-05-10** `gdal-3.7.0.tar.gz`_ `3.7.0 Release Notes`_ (`3.7.0 md5`_)
-
-.. _`3.7.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.7.0/NEWS.md
-.. _`gdal-3.7.0.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.7.0/gdal-3.7.0.tar.gz
-.. _`3.7.0 md5`: https://github.com/OSGeo/gdal/releases/download/v3.7.0/gdal-3.7.0.tar.gz.md5
-
-* **2023-04-21** `gdal-3.6.4.tar.gz`_ `3.6.4 Release Notes`_ (`3.6.4 md5`_)
-
-.. _`3.6.4 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.6.4/NEWS.md
-.. _`gdal-3.6.4.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.6.4/gdal-3.6.4.tar.gz
-.. _`3.6.4 md5`: https://github.com/OSGeo/gdal/releases/download/v3.6.4/gdal-3.6.4.tar.gz.md5
-
-* **2023-03-13** `gdal-3.6.3.tar.gz`_ `3.6.3 Release Notes`_ (`3.6.3 md5`_)
-
-.. _`3.6.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.6.3/NEWS.md
-.. _`gdal-3.6.3.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.6.3/gdal-3.6.3.tar.gz
-.. _`3.6.3 md5`: https://github.com/OSGeo/gdal/releases/download/v3.6.3/gdal-3.6.3.tar.gz.md5
-
-* **2023-01-05** `gdal-3.6.2.tar.gz`_ `3.6.2 Release Notes`_ (`3.6.2 md5`_)
-
-.. _`3.6.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.6.2/NEWS.md
-.. _`gdal-3.6.2.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.6.2/gdal-3.6.2.tar.gz
-.. _`3.6.2 md5`: https://github.com/OSGeo/gdal/releases/download/v3.6.2/gdal-3.6.2.tar.gz.md5
-
-* **2022-12-11** `gdal-3.6.1.tar.gz`_ `3.6.1 Release Notes`_ (`3.6.1 md5`_)
-
-.. _`3.6.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.6.1/NEWS.md
-.. _`gdal-3.6.1.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.6.1/gdal-3.6.1.tar.gz
-.. _`3.6.1 md5`: https://github.com/OSGeo/gdal/releases/download/v3.6.1/gdal-3.6.1.tar.gz.md5
-
-* **2022-11-06** `3.6.0 Release Notes`_ *Warning*: this version has been officially retracted and superseded per 3.6.1
-
-.. _`3.6.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.6.0/NEWS.md
-
-* **2022-10-21** `gdal-3.5.3.tar.gz`_ `3.5.3 Release Notes`_ (`3.5.3 md5`_)
-
-.. _`3.5.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.5.3/NEWS.md
-.. _`gdal-3.5.3.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.5.3/gdal-3.5.3.tar.gz
-.. _`3.5.3 md5`: https://github.com/OSGeo/gdal/releases/download/v3.5.3/gdal-3.5.3.tar.gz.md5
-
-* **2022-09-12** `gdal-3.5.2.tar.gz`_ `3.5.2 Release Notes`_ (`3.5.2 md5`_)
-
-.. _`3.5.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.5.2/NEWS.md
-.. _`gdal-3.5.2.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.5.2/gdal-3.5.2.tar.gz
-.. _`3.5.2 md5`: https://github.com/OSGeo/gdal/releases/download/v3.5.2/gdal-3.5.2.tar.gz.md5
-
-* **2022-07-06** `gdal-3.5.1.tar.gz`_ `3.5.1 Release Notes`_ (`3.5.1 md5`_)
-
-.. _`3.5.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.5.1/NEWS.md
-.. _`gdal-3.5.1.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.5.1/gdal-3.5.1.tar.gz
-.. _`3.5.1 md5`: https://github.com/OSGeo/gdal/releases/download/v3.5.1/gdal-3.5.1.tar.gz.md5
-
-* **2022-05-13** `gdal-3.5.0.tar.gz`_ `3.5.0 Release Notes`_ (`3.5.0 md5`_)
-
-.. _`3.5.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.5.0/NEWS.md
-.. _`gdal-3.5.0.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.5.0/gdal-3.5.0.tar.gz
-.. _`3.5.0 md5`: https://github.com/OSGeo/gdal/releases/download/v3.5.0/gdal-3.5.0.tar.gz.md5
-
-* **2022-04-22** `gdal-3.4.3.tar.gz`_ `3.4.3 Release Notes`_ (`3.4.3 md5`_)
-
-.. _`3.4.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.4.3/gdal/NEWS.md
-.. _`gdal-3.4.3.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.4.3/gdal-3.4.3.tar.gz
-.. _`3.4.3 md5`: https://github.com/OSGeo/gdal/releases/download/v3.4.3/gdal-3.4.3.tar.gz.md5
-
-* **2022-03-08** `gdal-3.4.2.tar.gz`_ `3.4.2 Release Notes`_ (`3.4.2 md5`_)
-
-.. _`3.4.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.4.2/gdal/NEWS.md
-.. _`gdal-3.4.2.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.4.2/gdal-3.4.2.tar.gz
-.. _`3.4.2 md5`: https://github.com/OSGeo/gdal/releases/download/v3.4.2/gdal-3.4.2.tar.gz.md5
-
-* **2021-12-27** `gdal-3.4.1.tar.gz`_ `3.4.1 Release Notes`_ (`3.4.1 md5`_)
-
-.. _`3.4.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.4.1/gdal/NEWS.md
-.. _`gdal-3.4.1.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.4.1/gdal-3.4.1.tar.gz
-.. _`3.4.1 md5`: https://github.com/OSGeo/gdal/releases/download/v3.4.1/gdal-3.4.1.tar.gz.md5
-
-* **2021-11-08** `gdal-3.4.0.tar.gz`_ `3.4.0 Release Notes`_ (`3.4.0 md5`_)
-
-.. _`3.4.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.4.0/gdal/NEWS.md
-.. _`gdal-3.4.0.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.4.0/gdal-3.4.0.tar.gz
-.. _`3.4.0 md5`: https://github.com/OSGeo/gdal/releases/download/v3.4.0/gdal-3.4.0.tar.gz.md5
-
-* **2021-10-29** `gdal-3.3.3.tar.gz`_ `3.3.3 Release Notes`_ (`3.3.3 md5`_)
-
-.. _`3.3.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.3.3/gdal/NEWS
-.. _`gdal-3.3.3.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.3.3/gdal-3.3.3.tar.gz
-.. _`3.3.3 md5`: https://github.com/OSGeo/gdal/releases/download/v3.3.3/gdal-3.3.3.tar.gz.md5
-
-* **2021-09-01** `gdal-3.3.2.tar.gz`_ `3.3.2 Release Notes`_ (`3.3.2 md5`_)
-
-.. _`3.3.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.3.2/gdal/NEWS
-.. _`gdal-3.3.2.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.3.2/gdal-3.3.2.tar.gz
-.. _`3.3.2 md5`: https://github.com/OSGeo/gdal/releases/download/v3.3.2/gdal-3.3.2.tar.gz.md5
-
-* **2021-07-05** `gdal-3.3.1.tar.gz`_ `3.3.1 Release Notes`_ (`3.3.1 md5`_)
-
-.. _`3.3.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.3.1/gdal/NEWS
-.. _`gdal-3.3.1.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.3.1/gdal-3.3.1.tar.gz
-.. _`3.3.1 md5`: https://github.com/OSGeo/gdal/releases/download/v3.3.1/gdal-3.3.1.tar.gz.md5
-
-* **2021-05-03** `gdal-3.3.0.tar.gz`_ `3.3.0 Release Notes`_ (`3.3.0 md5`_)
-
-.. _`3.3.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.3.0/gdal/NEWS
-.. _`gdal-3.3.0.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.3.0/gdal-3.3.0.tar.gz
-.. _`3.3.0 md5`: https://github.com/OSGeo/gdal/releases/download/v3.3.0/gdal-3.3.0.tar.gz.md5
-
-* **2021-05-04** `gdal-3.2.3.tar.gz`_ `3.2.3 Release Notes`_ (`3.2.3 md5`_)
-
-.. _`3.2.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.2.3/gdal/NEWS
-.. _`gdal-3.2.3.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.2.3/gdal-3.2.3.tar.gz
-.. _`3.2.3 md5`: https://github.com/OSGeo/gdal/releases/download/v3.2.3/gdal-3.2.3.tar.gz.md5
-
-* **2021-03-10** `gdal-3.2.2.tar.gz`_ `3.2.2 Release Notes`_ (`3.2.2 md5`_)
+The GDAL project distributes GDAL as source code and :ref:`Containers` only. :ref:`Binaries` produced by others are available for a variety of platforms and package managers.
 
-.. _`3.2.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.2.2/gdal/NEWS
-.. _`gdal-3.2.2.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.2.2/gdal-3.2.2.tar.gz
-.. _`3.2.2 md5`: https://github.com/OSGeo/gdal/releases/download/v3.2.2/gdal-3.2.2.tar.gz.md5
+Source Code
+-----------
 
-* **2020-12-28** `gdal-3.2.1.tar.gz`_ `3.2.1 Release Notes`_ (`3.2.1 md5`_)
-
-.. _`3.2.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.2.1/gdal/NEWS
-.. _`gdal-3.2.1.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.2.1/gdal-3.2.1.tar.gz
-.. _`3.2.1 md5`: https://github.com/OSGeo/gdal/releases/download/v3.2.1/gdal-3.2.1.tar.gz.md5
-
-* **2020-10-26** `gdal-3.2.0.tar.gz`_ `3.2.0 Release Notes`_ (`3.2.0 md5`_)
-
-.. _`3.2.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.2.0/gdal/NEWS
-.. _`gdal-3.2.0.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.2.0/gdal-3.2.0.tar.gz
-.. _`3.2.0 md5`: https://github.com/OSGeo/gdal/releases/download/v3.2.0/gdal-3.2.0.tar.gz.md5
-
-* **2020-10-23** `gdal-3.1.4.tar.gz`_ `3.1.4 Release Notes`_ (`3.1.4 md5`_)
-
-.. _`3.1.4 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.1.4/gdal/NEWS
-.. _`gdal-3.1.4.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.1.4/gdal-3.1.4.tar.gz
-.. _`3.1.4 md5`: https://github.com/OSGeo/gdal/releases/download/v3.1.4/gdal-3.1.4.tar.gz.md5
-
-* **2020-09-01** `gdal-3.1.3.tar.gz`_ `3.1.3 Release Notes`_ (`3.1.3 md5`_)
-
-.. _`3.1.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.1.3/gdal/NEWS
-.. _`gdal-3.1.3.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.1.3/gdal-3.1.3.tar.gz
-.. _`3.1.3 md5`: https://github.com/OSGeo/gdal/releases/download/v3.1.3/gdal-3.1.3.tar.gz.md5
-
-* **2020-07-07** `gdal-3.1.2.tar.gz`_ `3.1.2 Release Notes`_ (`3.1.2 md5`_)
-
-.. _`3.1.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.1.2/gdal/NEWS
-.. _`gdal-3.1.2.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.1.2/gdal-3.1.2.tar.gz
-.. _`3.1.2 md5`: https://github.com/OSGeo/gdal/releases/download/v3.1.2/gdal-3.1.2.tar.gz.md5
-
-* **2020-06-22** `gdal-3.1.1.tar.gz`_ `3.1.1 Release Notes`_ (`3.1.1 md5`_)
-
-.. _`3.1.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.1.1/gdal/NEWS
-.. _`gdal-3.1.1.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.1.1/gdal-3.1.1.tar.gz
-.. _`3.1.1 md5`: https://github.com/OSGeo/gdal/releases/download/v3.1.1/gdal-3.1.1.tar.gz.md5
-
-
-* **2020-05-03** `gdal-3.1.0.tar.gz`_ `3.1.0 Release Notes`_ (`3.1.0 md5`_)
-
-.. _`3.1.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.1.0/gdal/NEWS
-.. _`gdal-3.1.0.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.1.0/gdal-3.1.0.tar.gz
-.. _`3.1.0 md5`: https://github.com/OSGeo/gdal/releases/download/v3.1.0/gdal-3.1.0.tar.gz.md5
-
-* **2020-01-28** `gdal-3.0.4.tar.gz`_ `3.0.4 Release Notes`_ (`3.0.4 md5`_)
-
-.. _`3.0.4 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.0.4/gdal/NEWS
-.. _`gdal-3.0.4.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.0.4/gdal-3.0.4.tar.gz
-.. _`3.0.4 md5`: https://github.com/OSGeo/gdal/releases/download/v3.0.4/gdal-3.0.4.tar.gz.md5
-
-* **2020-01-08** `gdal-2.4.4.tar.gz`_ `2.4.4 Release Notes`_ (`2.4.4 md5`_)
-
-.. _`2.4.4 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.4.4/gdal/NEWS
-.. _`gdal-2.4.4.tar.gz`: https://download.osgeo.org/gdal/2.4.4/gdal-2.4.4.tar.gz
-.. _`2.4.4 md5`: https://download.osgeo.org/gdal/2.4.4/gdal-2.4.4.tar.gz.md5
-
-* **2020-01-08** `gdal-3.0.3.tar.gz`_ `3.0.3 Release Notes`_ (`3.0.3 md5`_)
-
-.. _`3.0.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.0.3/gdal/NEWS
-.. _`gdal-3.0.3.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.0.3/gdal-3.0.3.tar.gz
-.. _`3.0.3 md5`: https://github.com/OSGeo/gdal/releases/download/v3.0.3/gdal-3.0.3.tar.gz.md5
-
-* **2019-10-28** `gdal-3.0.2.tar.gz`_ `3.0.2 Release Notes`_ (`3.0.2 md5`_)
-
-.. _`3.0.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.0.2/gdal/NEWS
-.. _`gdal-3.0.2.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.0.2/gdal-3.0.2.tar.gz
-.. _`3.0.2 md5`: https://github.com/OSGeo/gdal/releases/download/v3.0.2/gdal-3.0.2.tar.gz.md5
-
-* **2019-10-28** `gdal-2.4.3.tar.gz`_ `2.4.3 Release Notes`_ (`2.4.3 md5`_)
-
-.. _`2.4.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.4.3/gdal/NEWS
-.. _`gdal-2.4.3.tar.gz`: https://download.osgeo.org/gdal/2.4.3/gdal-2.4.3.tar.gz
-.. _`2.4.3 md5`: https://download.osgeo.org/gdal/2.4.3/gdal-2.4.3.tar.gz.md5
-
-
-* **2019-06-28** `gdal-3.0.1.tar.gz`_ `3.0.1 Release Notes`_ (`3.0.1 md5`_)
+Current Release
+...............
 
-.. _`3.0.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.0.1/gdal/NEWS
-.. _`gdal-3.0.1.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.0.1/gdal-3.0.1.tar.gz
-.. _`3.0.1 md5`: https://github.com/OSGeo/gdal/releases/download/v3.0.1/gdal-3.0.1.tar.gz.md5
+* **2024-10-14** `gdal-3.9.3.tar.gz`_ `3.9.3 Release Notes`_ (`3.9.3 md5`_)
 
+.. _`3.9.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.9.3/NEWS.md
+.. _`gdal-3.9.3.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.9.3/gdal-3.9.3.tar.gz
+.. _`3.9.3 md5`: https://github.com/OSGeo/gdal/releases/download/v3.9.3/gdal-3.9.3.tar.gz.md5
 
-* **2019-06-28** `gdal-2.4.2.tar.gz`_ `2.4.2 Release Notes`_ (`2.4.2 md5`_)
+Past Releases
+.............
 
-.. _`2.4.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.4.2/gdal/NEWS
-.. _`gdal-2.4.2.tar.gz`: https://download.osgeo.org/gdal/2.4.2/gdal-2.4.2.tar.gz
-.. _`2.4.2 md5`: https://download.osgeo.org/gdal/2.4.2/gdal-2.4.2.tar.gz.md5
+Links to :ref:`download_past` are also available.
 
 .. _source:
 
 Development Source
-------------------------------------------------------------------------------
+..................
 
 The main repository for GDAL is located on GitHub at
 https://github.com/OSGeo/GDAL.
@@ -299,6 +47,16 @@ command
 
 Additional information is available about :ref:`build_requirements` and :ref:`building_from_source`.
 
+Maintenance policy
+..................
+
+The GDAL upstream team only maintains the branch on which the latest release has
+been done, with bugfixes releases issued roughly every 2 months.
+So, for example, during the development phase of GDAL 3.10.0, GDAL 3.9.x bugfixes
+releases are done based on the release/3.9 branch, but not older branches (GDAL 3.8.x or older).
+
+.. _binaries:
+
 Binaries
 ------------------------------------------------------------------------------
 
@@ -313,25 +71,62 @@ Windows
 ................................................................................
 
 Windows builds are available via `Conda Forge`_ (64-bit only). See the
-:ref:`conda` section for more detailed information.
+:ref:`conda` section for more detailed information. GDAL is also distributed
+by `GISInternals`_ and `OSGeo4W`_ and through the `NuGet`_ and :ref:`vcpkg` package managers.
 
 .. _`Conda Forge`: https://anaconda.org/conda-forge/gdal
+.. _`GISInternals`: https://www.gisinternals.com/index.html
+.. _`OSGeo4W`: https://trac.osgeo.org/osgeo4w/
+.. _`NuGet`: https://www.nuget.org/packages?q=GDAL
 
-Debian
+Linux
 ................................................................................
 
-Debian packages are now available on `Debian`_.
+Packages are available for `Debian`_, `Alpine_`, `Fedora_`, and other distributions.
 
 .. _`Debian`: https://tracker.debian.org/pkg/gdal
+.. _`Alpine`: https://pkgs.alpinelinux.org/package/edge/community/x86/gdal
+.. _`Fedora`: https://packages.fedoraproject.org/pkgs/gdal/
+
+
+Mac OS
+......
+
+GDAL packages are available on `Homebrew`_.
+
+.. _`Homebrew`: https://formulae.brew.sh/formula/gdal
+
+
+Android
+.......
+
+GDAL can be installed using :ref:`vcpkg`. You may also refer to `vcpkg Android support <https://learn.microsoft.com/en-us/vcpkg/users/platforms/android>`__ for general instructions.
+
+For example to install default configuration for the ``arm64-android`` target:
+
+.. code-block:: shell
+
+    git clone https://github.com/Microsoft/vcpkg.git
+    cd vcpkg
+    ./bootstrap-vcpkg.sh  # ./bootstrap-vcpkg.bat for Windows
+    ./vcpkg integrate install
+    export ANDROID_NDK_HOME=/path/to/android_ndk_home  # to adapt
+    ./vcpkg search gdal --featurepackages  # list optional features
+    ./vcpkg install gdal:arm64-android  # install with default configuration
+    ./vcpkg install gdal[poppler,netcdf]:arm64-android  # install with Poppler and netdf support
+
+
+Cross-Platform Package Managers
+...............................
 
 .. _conda:
 
 Conda
-................................................................................
+^^^^^
 
 `Conda <https://anaconda.org>`__ can be used on multiple platforms (Windows, macOS, and Linux) to
 install software packages and manage environments. Conda packages for GDAL are
-available at https://anaconda.org/conda-forge/gdal.
+available through `conda-forge <https://anaconda.org/conda-forge/gdal>`__.
 
 .. only:: html
 
@@ -344,12 +139,40 @@ available at https://anaconda.org/conda-forge/gdal.
 
     conda install [-c channel] [package...]
 
+GDAL is available as several subpackages:
+
+- ``gdal``: Python bindings and Python utilities (depends on libgdal-core)
+- ``libgdal``: meta-package gathering all below libgdal-* packages (except libgdal-arrow-parquet)
+- ``libgdal-arrow-parquet``: :ref:`vector.arrow` and :ref:`vector.parquet` drivers as a plugin (depends on libgdal-core)
+- ``libgdal-core``: core library and C++ utilities, with a number of builtin drivers (available since GDAL 3.9.1)
+- ``libgdal-fits``: :ref:`raster.fits` driver as a plugin (depends on libgdal-core, available since GDAL 3.9.1)
+- ``libgdal-grib``: :ref:`raster.grib` driver as a plugin (depends on libgdal-core, available since GDAL 3.9.1)
+- ``libgdal-hdf4``: :ref:`raster.hdf4` driver as a plugin (depends on libgdal-core, available since GDAL 3.9.1)
+- ``libgdal-hdf5``: :ref:`raster.hdf5` driver as a plugin (depends on libgdal-core, available since GDAL 3.9.1)
+- ``libgdal-jp2openjpeg``: :ref:`raster.jp2openjpeg` driver as a plugin (depends on libgdal-core, available since GDAL 3.9.1)
+- ``libgdal-kea``: :ref:`raster.kea` driver as a plugin (depends on libgdal-core, available since GDAL 3.9.1)
+- ``libgdal-netcdf``: :ref:`raster.netcdf` driver as a plugin (depends on libgdal-core, available since GDAL 3.9.1)
+- ``libgdal-pdf``: :ref:`raster.pdf` driver as a plugin (depends on libgdal-core, available since GDAL 3.9.1)
+- ``libgdal-postgisraster``: :ref:`raster.postgisraster` driver as a plugin (depends on libgdal-core, available since GDAL 3.9.1)
+- ``libgdal-pg``: :ref:`vector.pg` driver as a plugin (depends on libgdal-core, available since GDAL 3.9.1)
+- ``libgdal-tiledb``: :ref:`raster.tiledb` driver as a plugin (depends on libgdal-core, available since GDAL 3.9.1)
+- ``libgdal-xls``: :ref:`vector.xls` driver as a plugin (depends on libgdal-core, available since GDAL 3.9.1)
+
+
+To install the ``gdal`` package (Python bindings and utilities), and ``libgdal-core``:
 
 ::
 
     conda install -c conda-forge gdal
 
 
+To install the ``libgdal`` meta-package with all available drivers, but libgdal-arrow-parquet:
+
+::
+
+    conda install -c conda-forge libgdal
+
+
 To install the Arrow and Parquet drivers as plugins:
 
 ::
@@ -381,25 +204,28 @@ Then install GDAL from the ``gdal-master`` channel:
     mamba install -c gdal-master libgdal-arrow-parquet # if you need the Arrow and Parquet drivers
 
 
-Vcpkg
-................................................................................
+.. _vcpkg:
 
-The gdal port in vcpkg is kept up to date by Microsoft team members and community contributors.
-The url of vcpkg is: https://github.com/Microsoft/vcpkg .
-You can download and install gdal using the vcpkg dependency manager:
+vcpkg
+^^^^^
 
-::
+The GDAL port in the `vcpkg <https://github.com/Microsoft/vcpkg>`__ dependency manager is kept up to date by Microsoft team members and community contributors.
+You can download and install GDAL using the vcpkg as follows:
+
+.. code-block:: shell
 
     git clone https://github.com/Microsoft/vcpkg.git
     cd vcpkg
     ./bootstrap-vcpkg.sh  # ./bootstrap-vcpkg.bat for Windows
     ./vcpkg integrate install
-    ./vcpkg install gdal
+    ./vcpkg search gdal --featurepackages  # list optional features
+    ./vcpkg install gdal  # install with default configuration
+    ./vcpkg install gdal[poppler,netcdf]  # install with Poppler and netdf support
 
 If the version is out of date, please `create an issue or pull request <https://github.com/Microsoft/vcpkg>`__ on the vcpkg repository.
 
 Spack
-................................................................................
+^^^^^
 
 Spack is a package management tool designed to support multiple versions and
 configurations of software on a wide variety of platforms and environments.
@@ -407,7 +233,7 @@ It was designed for large supercomputing centers. Spack builds packages from
 sources, and allows tweaking their configurations.
 
 You can find information about GDAL in Spack at
-https://spack.readthedocs.io/en/latest/package_list.html#gdal
+https://packages.spack.io/package.html?name=gdal
 
 For the default GDAL build with a reduced number of drivers:
 
@@ -424,19 +250,21 @@ For a build with netcdf driver enabled:
     ./spack install gdal +netcdf
 
 
-Linux Docker images
-................................................................................
+.. _containers:
 
-Images with nightly builds of GDAL master and tagged releases are available at
-`GitHub Container registry <https://github.com/OSGeo/gdal/pkgs/container/gdal>`_
+Containers
+----------
+
+Docker images with nightly builds of GDAL master and tagged releases are available at
+`GitHub Container registry <https://github.com/OSGeo/gdal/pkgs/container/gdal>`_.
 
 Information on the content of the different configurations can be found at
-`https://github.com/OSGeo/gdal/tree/master/docker <https://github.com/OSGeo/gdal/tree/master/docker>`_
+`https://github.com/OSGeo/gdal/tree/master/docker <https://github.com/OSGeo/gdal/tree/master/docker>`_.
 
 
-Documentation only
-------------------------------------------------------------------------------
+Documentation
+-------------
 
 Besides being included when downloading the software, the documentation is
-also available independently as a `PDF file <gdal.pdf>`_,
-and `a .ZIP of individual HTML pages <https://github.com/OSGeo/gdal-docs/archive/refs/heads/master.zip>`_ for offline browsing. (The .ZIP also includes that .PDF.) The documentation reflects the latest state of the development branch of the software.
+also available independently as a `PDF file <https://gdal.org/gdal.pdf>`_,
+and `a ZIP of individual HTML pages <https://github.com/OSGeo/gdal-docs/archive/refs/heads/master.zip>`_ for offline browsing. (The ZIP also includes the PDF.) The documentation reflects the latest state of the development branch of the software.
diff --git a/doc/source/download_past.rst b/doc/source/download_past.rst
new file mode 100644
index 000000000000..1e4b3b54ed12
--- /dev/null
+++ b/doc/source/download_past.rst
@@ -0,0 +1,650 @@
+:orphan:
+
+.. _download_past:
+
+Past Releases
+=============
+
+* **2024-08-16** `gdal-3.9.2.tar.gz`_ `3.9.2 Release Notes`_ (`3.9.2 md5`_)
+
+.. _`3.9.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.9.2/NEWS.md
+.. _`gdal-3.9.2.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.9.2/gdal-3.9.2.tar.gz
+.. _`3.9.2 md5`: https://github.com/OSGeo/gdal/releases/download/v3.9.2/gdal-3.9.2.tar.gz.md5
+
+* **2024-06-26** `gdal-3.9.1.tar.gz`_ `3.9.1 Release Notes`_ (`3.9.1 md5`_)
+
+.. _`3.9.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.9.1/NEWS.md
+.. _`gdal-3.9.1.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.9.1/gdal-3.9.1.tar.gz
+.. _`3.9.1 md5`: https://github.com/OSGeo/gdal/releases/download/v3.9.1/gdal-3.9.1.tar.gz.md5
+
+* **2024-05-10** `gdal-3.9.0.tar.gz`_ `3.9.0 Release Notes`_ (`3.9.0 md5`_)
+
+.. _`3.9.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.9.0/NEWS.md
+.. _`gdal-3.9.0.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.9.0/gdal-3.9.0.tar.gz
+.. _`3.9.0 md5`: https://github.com/OSGeo/gdal/releases/download/v3.9.0/gdal-3.9.0.tar.gz.md5
+
+* **2024-04-04** `gdal-3.8.5.tar.gz`_ `3.8.5 Release Notes`_ (`3.8.5 md5`_)
+
+.. _`3.8.5 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.8.5/NEWS.md
+.. _`gdal-3.8.5.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.8.5/gdal-3.8.5.tar.gz
+.. _`3.8.5 md5`: https://github.com/OSGeo/gdal/releases/download/v3.8.5/gdal-3.8.5.tar.gz.md5
+
+* **2024-02-18** `gdal-3.8.4.tar.gz`_ `3.8.4 Release Notes`_ (`3.8.4 md5`_)
+
+.. _`3.8.4 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.8.4/NEWS.md
+.. _`gdal-3.8.4.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.8.4/gdal-3.8.4.tar.gz
+.. _`3.8.4 md5`: https://github.com/OSGeo/gdal/releases/download/v3.8.4/gdal-3.8.4.tar.gz.md5
+
+* **2024-01-08** `gdal-3.8.3.tar.gz`_ `3.8.3 Release Notes`_ (`3.8.3 md5`_)
+
+.. _`3.8.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.8.3/NEWS.md
+.. _`gdal-3.8.3.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.8.3/gdal-3.8.3.tar.gz
+.. _`3.8.3 md5`: https://github.com/OSGeo/gdal/releases/download/v3.8.3/gdal-3.8.3.tar.gz.md5
+
+* **2023-12-20** `gdal-3.8.2.tar.gz`_ `3.8.2 Release Notes`_ (`3.8.2 md5`_)
+
+.. _`3.8.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.8.2/NEWS.md
+.. _`gdal-3.8.2.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.8.2/gdal-3.8.2.tar.gz
+.. _`3.8.2 md5`: https://github.com/OSGeo/gdal/releases/download/v3.8.2/gdal-3.8.2.tar.gz.md5
+
+* **2023-11-30** `gdal-3.8.1.tar.gz`_ `3.8.1 Release Notes`_ (`3.8.1 md5`_)
+
+.. _`3.8.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.8.1/NEWS.md
+.. _`gdal-3.8.1.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.8.1/gdal-3.8.1.tar.gz
+.. _`3.8.1 md5`: https://github.com/OSGeo/gdal/releases/download/v3.8.1/gdal-3.8.1.tar.gz.md5
+
+* **2023-11-13** `gdal-3.8.0.tar.gz`_ `3.8.0 Release Notes`_ (`3.8.0 md5`_)
+
+.. _`3.8.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.8.0/NEWS.md
+.. _`gdal-3.8.0.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.8.0/gdal-3.8.0.tar.gz
+.. _`3.8.0 md5`: https://github.com/OSGeo/gdal/releases/download/v3.8.0/gdal-3.8.0.tar.gz.md5
+
+* **2023-11-03** `gdal-3.7.3.tar.gz`_ `3.7.3 Release Notes`_ (`3.7.3 md5`_)
+
+.. _`3.7.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.7.3/NEWS.md
+.. _`gdal-3.7.3.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.7.3/gdal-3.7.3.tar.gz
+.. _`3.7.3 md5`: https://github.com/OSGeo/gdal/releases/download/v3.7.3/gdal-3.7.3.tar.gz.md5
+
+* **2023-09-13** `gdal-3.7.2.tar.gz`_ `3.7.2 Release Notes`_ (`3.7.2 md5`_)
+
+.. _`3.7.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.7.2/NEWS.md
+.. _`gdal-3.7.2.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.7.2/gdal-3.7.2.tar.gz
+.. _`3.7.2 md5`: https://github.com/OSGeo/gdal/releases/download/v3.7.2/gdal-3.7.2.tar.gz.md5
+
+* **2023-07-13** `gdal-3.7.1.tar.gz`_ `3.7.1 Release Notes`_ (`3.7.1 md5`_)
+
+.. _`3.7.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.7.1/NEWS.md
+.. _`gdal-3.7.1.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.7.1/gdal-3.7.1.tar.gz
+.. _`3.7.1 md5`: https://github.com/OSGeo/gdal/releases/download/v3.7.1/gdal-3.7.1.tar.gz.md5
+
+* **2023-05-10** `gdal-3.7.0.tar.gz`_ `3.7.0 Release Notes`_ (`3.7.0 md5`_)
+
+.. _`3.7.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.7.0/NEWS.md
+.. _`gdal-3.7.0.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.7.0/gdal-3.7.0.tar.gz
+.. _`3.7.0 md5`: https://github.com/OSGeo/gdal/releases/download/v3.7.0/gdal-3.7.0.tar.gz.md5
+
+* **2023-04-21** `gdal-3.6.4.tar.gz`_ `3.6.4 Release Notes`_ (`3.6.4 md5`_)
+
+.. _`3.6.4 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.6.4/NEWS.md
+.. _`gdal-3.6.4.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.6.4/gdal-3.6.4.tar.gz
+.. _`3.6.4 md5`: https://github.com/OSGeo/gdal/releases/download/v3.6.4/gdal-3.6.4.tar.gz.md5
+
+* **2023-03-13** `gdal-3.6.3.tar.gz`_ `3.6.3 Release Notes`_ (`3.6.3 md5`_)
+
+.. _`3.6.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.6.3/NEWS.md
+.. _`gdal-3.6.3.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.6.3/gdal-3.6.3.tar.gz
+.. _`3.6.3 md5`: https://github.com/OSGeo/gdal/releases/download/v3.6.3/gdal-3.6.3.tar.gz.md5
+
+* **2023-01-05** `gdal-3.6.2.tar.gz`_ `3.6.2 Release Notes`_ (`3.6.2 md5`_)
+
+.. _`3.6.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.6.2/NEWS.md
+.. _`gdal-3.6.2.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.6.2/gdal-3.6.2.tar.gz
+.. _`3.6.2 md5`: https://github.com/OSGeo/gdal/releases/download/v3.6.2/gdal-3.6.2.tar.gz.md5
+
+* **2022-12-11** `gdal-3.6.1.tar.gz`_ `3.6.1 Release Notes`_ (`3.6.1 md5`_)
+
+.. _`3.6.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.6.1/NEWS.md
+.. _`gdal-3.6.1.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.6.1/gdal-3.6.1.tar.gz
+.. _`3.6.1 md5`: https://github.com/OSGeo/gdal/releases/download/v3.6.1/gdal-3.6.1.tar.gz.md5
+
+* **2022-11-06** `3.6.0 Release Notes`_ *Warning*: this version has been officially retracted and superseded per 3.6.1
+
+.. _`3.6.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.6.0/NEWS.md
+
+* **2022-10-21** `gdal-3.5.3.tar.gz`_ `3.5.3 Release Notes`_ (`3.5.3 md5`_)
+
+.. _`3.5.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.5.3/NEWS.md
+.. _`gdal-3.5.3.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.5.3/gdal-3.5.3.tar.gz
+.. _`3.5.3 md5`: https://github.com/OSGeo/gdal/releases/download/v3.5.3/gdal-3.5.3.tar.gz.md5
+
+* **2022-09-12** `gdal-3.5.2.tar.gz`_ `3.5.2 Release Notes`_ (`3.5.2 md5`_)
+
+.. _`3.5.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.5.2/NEWS.md
+.. _`gdal-3.5.2.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.5.2/gdal-3.5.2.tar.gz
+.. _`3.5.2 md5`: https://github.com/OSGeo/gdal/releases/download/v3.5.2/gdal-3.5.2.tar.gz.md5
+
+* **2022-07-06** `gdal-3.5.1.tar.gz`_ `3.5.1 Release Notes`_ (`3.5.1 md5`_)
+
+.. _`3.5.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.5.1/NEWS.md
+.. _`gdal-3.5.1.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.5.1/gdal-3.5.1.tar.gz
+.. _`3.5.1 md5`: https://github.com/OSGeo/gdal/releases/download/v3.5.1/gdal-3.5.1.tar.gz.md5
+
+* **2022-05-13** `gdal-3.5.0.tar.gz`_ `3.5.0 Release Notes`_ (`3.5.0 md5`_)
+
+.. _`3.5.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.5.0/NEWS.md
+.. _`gdal-3.5.0.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.5.0/gdal-3.5.0.tar.gz
+.. _`3.5.0 md5`: https://github.com/OSGeo/gdal/releases/download/v3.5.0/gdal-3.5.0.tar.gz.md5
+
+* **2022-04-22** `gdal-3.4.3.tar.gz`_ `3.4.3 Release Notes`_ (`3.4.3 md5`_)
+
+.. _`3.4.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.4.3/gdal/NEWS.md
+.. _`gdal-3.4.3.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.4.3/gdal-3.4.3.tar.gz
+.. _`3.4.3 md5`: https://github.com/OSGeo/gdal/releases/download/v3.4.3/gdal-3.4.3.tar.gz.md5
+
+* **2022-03-08** `gdal-3.4.2.tar.gz`_ `3.4.2 Release Notes`_ (`3.4.2 md5`_)
+
+.. _`3.4.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.4.2/gdal/NEWS.md
+.. _`gdal-3.4.2.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.4.2/gdal-3.4.2.tar.gz
+.. _`3.4.2 md5`: https://github.com/OSGeo/gdal/releases/download/v3.4.2/gdal-3.4.2.tar.gz.md5
+
+* **2021-12-27** `gdal-3.4.1.tar.gz`_ `3.4.1 Release Notes`_ (`3.4.1 md5`_)
+
+.. _`3.4.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.4.1/gdal/NEWS.md
+.. _`gdal-3.4.1.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.4.1/gdal-3.4.1.tar.gz
+.. _`3.4.1 md5`: https://github.com/OSGeo/gdal/releases/download/v3.4.1/gdal-3.4.1.tar.gz.md5
+
+* **2021-11-08** `gdal-3.4.0.tar.gz`_ `3.4.0 Release Notes`_ (`3.4.0 md5`_)
+
+.. _`3.4.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.4.0/gdal/NEWS.md
+.. _`gdal-3.4.0.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.4.0/gdal-3.4.0.tar.gz
+.. _`3.4.0 md5`: https://github.com/OSGeo/gdal/releases/download/v3.4.0/gdal-3.4.0.tar.gz.md5
+
+* **2021-10-29** `gdal-3.3.3.tar.gz`_ `3.3.3 Release Notes`_ (`3.3.3 md5`_)
+
+.. _`3.3.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.3.3/gdal/NEWS
+.. _`gdal-3.3.3.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.3.3/gdal-3.3.3.tar.gz
+.. _`3.3.3 md5`: https://github.com/OSGeo/gdal/releases/download/v3.3.3/gdal-3.3.3.tar.gz.md5
+
+* **2021-09-01** `gdal-3.3.2.tar.gz`_ `3.3.2 Release Notes`_ (`3.3.2 md5`_)
+
+.. _`3.3.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.3.2/gdal/NEWS
+.. _`gdal-3.3.2.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.3.2/gdal-3.3.2.tar.gz
+.. _`3.3.2 md5`: https://github.com/OSGeo/gdal/releases/download/v3.3.2/gdal-3.3.2.tar.gz.md5
+
+* **2021-07-05** `gdal-3.3.1.tar.gz`_ `3.3.1 Release Notes`_ (`3.3.1 md5`_)
+
+.. _`3.3.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.3.1/gdal/NEWS
+.. _`gdal-3.3.1.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.3.1/gdal-3.3.1.tar.gz
+.. _`3.3.1 md5`: https://github.com/OSGeo/gdal/releases/download/v3.3.1/gdal-3.3.1.tar.gz.md5
+
+* **2021-05-03** `gdal-3.3.0.tar.gz`_ `3.3.0 Release Notes`_ (`3.3.0 md5`_)
+
+.. _`3.3.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.3.0/gdal/NEWS
+.. _`gdal-3.3.0.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.3.0/gdal-3.3.0.tar.gz
+.. _`3.3.0 md5`: https://github.com/OSGeo/gdal/releases/download/v3.3.0/gdal-3.3.0.tar.gz.md5
+
+* **2021-05-04** `gdal-3.2.3.tar.gz`_ `3.2.3 Release Notes`_ (`3.2.3 md5`_)
+
+.. _`3.2.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.2.3/gdal/NEWS
+.. _`gdal-3.2.3.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.2.3/gdal-3.2.3.tar.gz
+.. _`3.2.3 md5`: https://github.com/OSGeo/gdal/releases/download/v3.2.3/gdal-3.2.3.tar.gz.md5
+
+* **2021-03-10** `gdal-3.2.2.tar.gz`_ `3.2.2 Release Notes`_ (`3.2.2 md5`_)
+
+.. _`3.2.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.2.2/gdal/NEWS
+.. _`gdal-3.2.2.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.2.2/gdal-3.2.2.tar.gz
+.. _`3.2.2 md5`: https://github.com/OSGeo/gdal/releases/download/v3.2.2/gdal-3.2.2.tar.gz.md5
+
+* **2020-12-28** `gdal-3.2.1.tar.gz`_ `3.2.1 Release Notes`_ (`3.2.1 md5`_)
+
+.. _`3.2.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.2.1/gdal/NEWS
+.. _`gdal-3.2.1.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.2.1/gdal-3.2.1.tar.gz
+.. _`3.2.1 md5`: https://github.com/OSGeo/gdal/releases/download/v3.2.1/gdal-3.2.1.tar.gz.md5
+
+* **2020-10-26** `gdal-3.2.0.tar.gz`_ `3.2.0 Release Notes`_ (`3.2.0 md5`_)
+
+.. _`3.2.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.2.0/gdal/NEWS
+.. _`gdal-3.2.0.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.2.0/gdal-3.2.0.tar.gz
+.. _`3.2.0 md5`: https://github.com/OSGeo/gdal/releases/download/v3.2.0/gdal-3.2.0.tar.gz.md5
+
+* **2020-10-23** `gdal-3.1.4.tar.gz`_ `3.1.4 Release Notes`_ (`3.1.4 md5`_)
+
+.. _`3.1.4 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.1.4/gdal/NEWS
+.. _`gdal-3.1.4.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.1.4/gdal-3.1.4.tar.gz
+.. _`3.1.4 md5`: https://github.com/OSGeo/gdal/releases/download/v3.1.4/gdal-3.1.4.tar.gz.md5
+
+* **2020-09-01** `gdal-3.1.3.tar.gz`_ `3.1.3 Release Notes`_ (`3.1.3 md5`_)
+
+.. _`3.1.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.1.3/gdal/NEWS
+.. _`gdal-3.1.3.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.1.3/gdal-3.1.3.tar.gz
+.. _`3.1.3 md5`: https://github.com/OSGeo/gdal/releases/download/v3.1.3/gdal-3.1.3.tar.gz.md5
+
+* **2020-07-07** `gdal-3.1.2.tar.gz`_ `3.1.2 Release Notes`_ (`3.1.2 md5`_)
+
+.. _`3.1.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.1.2/gdal/NEWS
+.. _`gdal-3.1.2.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.1.2/gdal-3.1.2.tar.gz
+.. _`3.1.2 md5`: https://github.com/OSGeo/gdal/releases/download/v3.1.2/gdal-3.1.2.tar.gz.md5
+
+* **2020-06-22** `gdal-3.1.1.tar.gz`_ `3.1.1 Release Notes`_ (`3.1.1 md5`_)
+
+.. _`3.1.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.1.1/gdal/NEWS
+.. _`gdal-3.1.1.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.1.1/gdal-3.1.1.tar.gz
+.. _`3.1.1 md5`: https://github.com/OSGeo/gdal/releases/download/v3.1.1/gdal-3.1.1.tar.gz.md5
+
+
+* **2020-05-03** `gdal-3.1.0.tar.gz`_ `3.1.0 Release Notes`_ (`3.1.0 md5`_)
+
+.. _`3.1.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.1.0/gdal/NEWS
+.. _`gdal-3.1.0.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.1.0/gdal-3.1.0.tar.gz
+.. _`3.1.0 md5`: https://github.com/OSGeo/gdal/releases/download/v3.1.0/gdal-3.1.0.tar.gz.md5
+
+* **2020-01-28** `gdal-3.0.4.tar.gz`_ `3.0.4 Release Notes`_ (`3.0.4 md5`_)
+
+.. _`3.0.4 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.0.4/gdal/NEWS
+.. _`gdal-3.0.4.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.0.4/gdal-3.0.4.tar.gz
+.. _`3.0.4 md5`: https://github.com/OSGeo/gdal/releases/download/v3.0.4/gdal-3.0.4.tar.gz.md5
+
+* **2020-01-08** `gdal-2.4.4.tar.gz`_ `2.4.4 Release Notes`_ (`2.4.4 md5`_)
+
+.. _`2.4.4 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.4.4/gdal/NEWS
+.. _`gdal-2.4.4.tar.gz`: https://download.osgeo.org/gdal/2.4.4/gdal-2.4.4.tar.gz
+.. _`2.4.4 md5`: https://download.osgeo.org/gdal/2.4.4/gdal-2.4.4.tar.gz.md5
+
+* **2020-01-08** `gdal-3.0.3.tar.gz`_ `3.0.3 Release Notes`_ (`3.0.3 md5`_)
+
+.. _`3.0.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.0.3/gdal/NEWS
+.. _`gdal-3.0.3.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.0.3/gdal-3.0.3.tar.gz
+.. _`3.0.3 md5`: https://github.com/OSGeo/gdal/releases/download/v3.0.3/gdal-3.0.3.tar.gz.md5
+
+* **2019-10-28** `gdal-3.0.2.tar.gz`_ `3.0.2 Release Notes`_ (`3.0.2 md5`_)
+
+.. _`3.0.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.0.2/gdal/NEWS
+.. _`gdal-3.0.2.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.0.2/gdal-3.0.2.tar.gz
+.. _`3.0.2 md5`: https://github.com/OSGeo/gdal/releases/download/v3.0.2/gdal-3.0.2.tar.gz.md5
+
+* **2019-10-28** `gdal-2.4.3.tar.gz`_ `2.4.3 Release Notes`_ (`2.4.3 md5`_)
+
+.. _`2.4.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.4.3/gdal/NEWS
+.. _`gdal-2.4.3.tar.gz`: https://download.osgeo.org/gdal/2.4.3/gdal-2.4.3.tar.gz
+.. _`2.4.3 md5`: https://download.osgeo.org/gdal/2.4.3/gdal-2.4.3.tar.gz.md5
+
+
+* **2019-06-28** `gdal-3.0.1.tar.gz`_ `3.0.1 Release Notes`_ (`3.0.1 md5`_)
+
+.. _`3.0.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.0.1/gdal/NEWS
+.. _`gdal-3.0.1.tar.gz`: https://github.com/OSGeo/gdal/releases/download/v3.0.1/gdal-3.0.1.tar.gz
+.. _`3.0.1 md5`: https://github.com/OSGeo/gdal/releases/download/v3.0.1/gdal-3.0.1.tar.gz.md5
+
+
+* **2019-06-28** `gdal-2.4.2.tar.gz`_ `2.4.2 Release Notes`_ (`2.4.2 md5`_)
+
+.. _`2.4.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.4.2/gdal/NEWS
+.. _`gdal-2.4.2.tar.gz`: https://download.osgeo.org/gdal/2.4.2/gdal-2.4.2.tar.gz
+.. _`2.4.2 md5`: https://download.osgeo.org/gdal/2.4.2/gdal-2.4.2.tar.gz.md5
+
+
+* **2019-05** `gdal-3.0.0.tar.gz`_ `3.0.0 Release Notes`_ (`3.0.0 md5`)_
+
+.. _`gdal-3.0.0.tar.gz`: http://download.osgeo.org/gdal/3.0.0/gdal-3.0.0.tar.gz
+.. _`3.0.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.0.0/gdal/NEWS
+.. _`3.0.0 md5`: http://download.osgeo.org/gdal/3.0.0/gdal-3.0.0.tar.gz.md5
+
+
+* **2019-03** `gdal-2.4.1.tar.gz`_ `2.4.1 Release Notes`_ (`2.4.1 md5`)_
+
+.. _`gdal-2.4.1.tar.gz`: http://download.osgeo.org/gdal/2.4.1/gdal-2.4.1.tar.gz
+.. _`2.4.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.4.1/gdal/NEWS
+.. _`2.4.1 md5`: http://download.osgeo.org/gdal/2.4.1/gdal-2.4.1.tar.gz.md5
+
+
+* **2018-12** `gdal-2.4.0.tar.gz`_ `2.4.0 Release Notes`_ (`2.4.0 md5`)_
+
+.. _`gdal-2.4.0.tar.gz`: http://download.osgeo.org/gdal/2.4.0/gdal-2.4.0.tar.gz
+.. _`2.4.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.4.0/gdal/NEWS
+.. _`2.4.0 md5`: http://download.osgeo.org/gdal/2.4.0/gdal-2.4.0.tar.gz.md5
+
+
+* **2019-05** `gdal-3.0.0.tar.gz`_ `3.0.0 Release Notes`_ (`3.0.0 md5`)_
+
+.. _`gdal-3.0.0.tar.gz`: http://download.osgeo.org/gdal/3.0.0/gdal-3.0.0.tar.gz
+.. _`3.0.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.0.0/gdal/NEWS
+.. _`3.0.0 md5`: http://download.osgeo.org/gdal/3.0.0/gdal-3.0.0.tar.gz.md5
+
+
+* **2019-03** `gdal-2.4.1.tar.gz`_ `2.4.1 Release Notes`_ (`2.4.1 md5`)_
+
+.. _`gdal-2.4.1.tar.gz`: http://download.osgeo.org/gdal/2.4.1/gdal-2.4.1.tar.gz
+.. _`2.4.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.4.1/gdal/NEWS
+.. _`2.4.1 md5`: http://download.osgeo.org/gdal/2.4.1/gdal-2.4.1.tar.gz.md5
+
+
+* **2018-12** `gdal-2.4.0.tar.gz`_ `2.4.0 Release Notes`_ (`2.4.0 md5`)_
+
+.. _`gdal-2.4.0.tar.gz`: http://download.osgeo.org/gdal/2.4.0/gdal-2.4.0.tar.gz
+.. _`2.4.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.4.0/gdal/NEWS
+.. _`2.4.0 md5`: http://download.osgeo.org/gdal/2.4.0/gdal-2.4.0.tar.gz.md5
+
+
+* **2018-12** `gdal-2.3.3.tar.gz`_ `2.3.3 Release Notes`_ (`2.3.3 md5`)_
+
+.. _`gdal-2.3.3.tar.gz`: http://download.osgeo.org/gdal/2.3.3/gdal-2.3.3.tar.gz
+.. _`2.3.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.3.3/gdal/NEWS
+.. _`2.3.3 md5`: http://download.osgeo.org/gdal/2.3.3/gdal-2.3.3.tar.gz.md5
+
+
+* **2018-09** `gdal-2.3.2.tar.gz`_ `2.3.2 Release Notes`_ (`2.3.2 md5`)_
+
+.. _`gdal-2.3.2.tar.gz`: http://download.osgeo.org/gdal/2.3.2/gdal-2.3.2.tar.gz
+.. _`2.3.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.3.2/gdal/NEWS
+.. _`2.3.2 md5`: http://download.osgeo.org/gdal/2.3.2/gdal-2.3.2.tar.gz.md5
+
+
+* **2018-06** `gdal-2.3.1.tar.gz`_ `2.3.1 Release Notes`_ (`2.3.1 md5`)_
+
+.. _`gdal-2.3.1.tar.gz`: http://download.osgeo.org/gdal/2.3.1/gdal-2.3.1.tar.gz
+.. _`2.3.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.3.1/gdal/NEWS
+.. _`2.3.1 md5`: http://download.osgeo.org/gdal/2.3.1/gdal-2.3.1.tar.gz.md5
+
+
+* **2018-05** `gdal-2.3.0.tar.gz`_ `2.3.0 Release Notes`_ (`2.3.0 md5`)_
+
+.. _`gdal-2.3.0.tar.gz`: http://download.osgeo.org/gdal/2.3.0/gdal-2.3.0.tar.gz
+.. _`2.3.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.3.0/gdal/NEWS
+.. _`2.3.0 md5`: http://download.osgeo.org/gdal/2.3.0/gdal-2.3.0.tar.gz.md5
+
+
+* **2018-03** `gdal-2.2.4.tar.gz`_ `2.2.4 Release Notes`_ (`2.2.4 md5`)_
+
+.. _`gdal-2.2.4.tar.gz`: http://download.osgeo.org/gdal/2.2.4/gdal-2.2.4.tar.gz
+.. _`2.2.4 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.2.4/gdal/NEWS
+.. _`2.2.4 md5`: http://download.osgeo.org/gdal/2.2.4/gdal-2.2.4.tar.gz.md5
+
+
+* **2017-11** `gdal-2.2.3.tar.gz`_ `2.2.3 Release Notes`_ (`2.2.3 md5`)_
+
+.. _`gdal-2.2.3.tar.gz`: http://download.osgeo.org/gdal/2.2.3/gdal-2.2.3.tar.gz
+.. _`2.2.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.2.3/gdal/NEWS
+.. _`2.2.3 md5`: http://download.osgeo.org/gdal/2.2.3/gdal-2.2.3.tar.gz.md5
+
+
+* **2017-09** `gdal-2.2.2.tar.gz`_ `2.2.2 Release Notes`_ (`2.2.2 md5`)_
+
+.. _`gdal-2.2.2.tar.gz`: http://download.osgeo.org/gdal/2.2.2/gdal-2.2.2.tar.gz
+.. _`2.2.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.2.2/gdal/NEWS
+.. _`2.2.2 md5`: http://download.osgeo.org/gdal/2.2.2/gdal-2.2.2.tar.gz.md5
+
+
+* **2017-06** `gdal-2.2.1.tar.gz`_ `2.2.1 Release Notes`_ (`2.2.1 md5`)_
+
+.. _`gdal-2.2.1.tar.gz`: http://download.osgeo.org/gdal/2.2.1/gdal-2.2.1.tar.gz
+.. _`2.2.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.2.1/gdal/NEWS
+.. _`2.2.1 md5`: http://download.osgeo.org/gdal/2.2.1/gdal-2.2.1.tar.gz.md5
+
+
+* **2017-06** `gdal-2.1.4.tar.gz`_ `2.1.4 Release Notes`_ (`2.1.4 md5`)_
+
+.. _`gdal-2.1.4.tar.gz`: http://download.osgeo.org/gdal/2.1.4/gdal-2.1.4.tar.gz
+.. _`2.1.4 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.1.4/gdal/NEWS
+.. _`2.1.4 md5`: http://download.osgeo.org/gdal/2.1.4/gdal-2.1.4.tar.gz.md5
+
+
+* **2017-04** `gdal-2.2.0.tar.gz`_ `2.2.0 Release Notes`_ (`2.2.0 md5`)_
+
+.. _`gdal-2.2.0.tar.gz`: http://download.osgeo.org/gdal/2.2.0/gdal-2.2.0.tar.gz
+.. _`2.2.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.2.0/gdal/NEWS
+.. _`2.2.0 md5`: http://download.osgeo.org/gdal/2.2.0/gdal-2.2.0.tar.gz.md5
+
+
+* **2017-01** `gdal-2.1.3.tar.gz`_ `2.1.3 Release Notes`_ (`2.1.3 md5`)_
+
+.. _`gdal-2.1.3.tar.gz`: http://download.osgeo.org/gdal/2.1.3/gdal-2.1.3.tar.gz
+.. _`2.1.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.1.3/gdal/NEWS
+.. _`2.1.3 md5`: http://download.osgeo.org/gdal/2.1.3/gdal-2.1.3.tar.gz.md5
+
+
+* **2016-10** `gdal-2.1.2.tar.gz`_ `2.1.2 Release Notes`_ (`2.1.2 md5`)_
+
+.. _`gdal-2.1.2.tar.gz`: http://download.osgeo.org/gdal/2.1.2/gdal-2.1.2.tar.gz
+.. _`2.1.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.1.2/gdal/NEWS
+.. _`2.1.2 md5`: http://download.osgeo.org/gdal/2.1.2/gdal-2.1.2.tar.gz.md5
+
+
+* **2016-07** `gdal-2.1.1.tar.gz`_ `2.1.1 Release Notes`_ (`2.1.1 md5`)_
+
+.. _`gdal-2.1.1.tar.gz`: http://download.osgeo.org/gdal/2.1.1/gdal-2.1.1.tar.gz
+.. _`2.1.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.1.1/gdal/NEWS
+.. _`2.1.1 md5`: http://download.osgeo.org/gdal/2.1.1/gdal-2.1.1.tar.gz.md5
+
+
+* **2016-07** `gdal-2.0.3.tar.gz`_ `2.0.3 Release Notes`_ (`2.0.3 md5`)_
+
+.. _`gdal-2.0.3.tar.gz`: http://download.osgeo.org/gdal/2.0.3/gdal-2.0.3.tar.gz
+.. _`2.0.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.0.3/gdal/NEWS
+.. _`2.0.3 md5`: http://download.osgeo.org/gdal/2.0.3/gdal-2.0.3.tar.gz.md5
+
+
+* **2016-07** `gdal-1.11.5.tar.gz`_ `1.11.5 Release Notes`_ (`1.11.5 md5`)_
+
+.. _`gdal-1.11.5.tar.gz`: http://download.osgeo.org/gdal/1.11.5/gdal-1.11.5.tar.gz
+.. _`1.11.5 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.11.5/gdal/NEWS
+.. _`1.11.5 md5`: http://download.osgeo.org/gdal/1.11.5/gdal-1.11.5.tar.gz.md5
+
+
+* **2016-04** `gdal-2.1.0.tar.gz`_ `2.1.0 Release Notes`_ (`2.1.0 md5`)_
+
+.. _`gdal-2.1.0.tar.gz`: http://download.osgeo.org/gdal/2.1.0/gdal-2.1.0.tar.gz
+.. _`2.1.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.1.0/gdal/NEWS
+.. _`2.1.0 md5`: http://download.osgeo.org/gdal/2.1.0/gdal-2.1.0.tar.gz.md5
+
+
+* **2016-01** `gdal-2.0.2.tar.gz`_ `2.0.2 Release Notes`_ (`2.0.2 md5`)_
+
+.. _`gdal-2.0.2.tar.gz`: http://download.osgeo.org/gdal/2.0.2/gdal-2.0.2.tar.gz
+.. _`2.0.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.0.2/gdal/NEWS
+.. _`2.0.2 md5`: http://download.osgeo.org/gdal/2.0.2/gdal-2.0.2.tar.gz.md5
+
+
+* **2016-01** `gdal-1.11.4.tar.gz`_ `1.11.4 Release Notes`_ (`1.11.4 md5`)_
+
+.. _`gdal-1.11.4.tar.gz`: http://download.osgeo.org/gdal/1.11.4/gdal-1.11.4.tar.gz
+.. _`1.11.4 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.11.4/gdal/NEWS
+.. _`1.11.4 md5`: http://download.osgeo.org/gdal/1.11.4/gdal-1.11.4.tar.gz.md5
+
+
+* **2015-09** `gdal-2.0.1.tar.gz`_ `2.0.1 Release Notes`_ (`2.0.1 md5`)_
+
+.. _`gdal-2.0.1.tar.gz`: http://download.osgeo.org/gdal/2.0.1/gdal-2.0.1.tar.gz
+.. _`2.0.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.0.1/gdal/NEWS
+.. _`2.0.1 md5`: http://download.osgeo.org/gdal/2.0.1/gdal-2.0.1.tar.gz.md5
+
+
+* **2015-09** `gdal-1.11.3.tar.gz`_ `1.11.3 Release Notes`_ (`1.11.3 md5`)_
+
+.. _`gdal-1.11.3.tar.gz`: http://download.osgeo.org/gdal/1.11.3/gdal-1.11.3.tar.gz
+.. _`1.11.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.11.3/gdal/NEWS
+.. _`1.11.3 md5`: http://download.osgeo.org/gdal/1.11.3/gdal-1.11.3.tar.gz.md5
+
+
+* **2015-06** `gdal-2.0.0.tar.gz`_ `2.0.0 Release Notes`_ (`2.0.0 md5`)_
+
+.. _`gdal-2.0.0.tar.gz`: http://download.osgeo.org/gdal/2.0.0/gdal-2.0.0.tar.gz
+.. _`2.0.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.0.0/gdal/NEWS
+.. _`2.0.0 md5`: http://download.osgeo.org/gdal/2.0.0/gdal-2.0.0.tar.gz.md5
+
+
+* **2015-02** `gdal-1.11.2.tar.gz`_ `1.11.2 Release Notes`_ (`1.11.2 md5`)_
+
+.. _`gdal-1.11.2.tar.gz`: http://download.osgeo.org/gdal/1.11.2/gdal-1.11.2.tar.gz
+.. _`1.11.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.11.2/gdal/NEWS
+.. _`1.11.2 md5`: http://download.osgeo.org/gdal/1.11.2/gdal-1.11.2.tar.gz.md5
+
+
+* **2014-09** `gdal-1.11.1.tar.gz`_ `1.11.1 Release Notes`_ (`1.11.1 md5`)_
+
+.. _`gdal-1.11.1.tar.gz`: http://download.osgeo.org/gdal/1.11.1/gdal-1.11.1.tar.gz
+.. _`1.11.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.11.1/gdal/NEWS
+.. _`1.11.1 md5`: http://download.osgeo.org/gdal/1.11.1/gdal-1.11.1.tar.gz.md5
+
+
+* **2014-04** `gdal-1.11.0.tar.gz`_ `1.11.0 Release Notes`_ (`1.11.0 md5`)_
+
+.. _`gdal-1.11.0.tar.gz`: http://download.osgeo.org/gdal/1.11.0/gdal-1.11.0.tar.gz
+.. _`1.11.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.11.0/gdal/NEWS
+.. _`1.11.0 md5`: http://download.osgeo.org/gdal/1.11.0/gdal-1.11.0.tar.gz.md5
+
+
+* **2013-08** `gdal-1.10.1.tar.gz`_ `1.10.1 Release Notes`_ (`1.10.1 md5`)_
+
+.. _`gdal-1.10.1.tar.gz`: http://download.osgeo.org/gdal/1.10.1/gdal-1.10.1.tar.gz
+.. _`1.10.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.10.1/gdal/NEWS
+.. _`1.10.1 md5`: http://download.osgeo.org/gdal/1.10.1/gdal-1.10.1.tar.gz.md5
+
+
+* **2013-04** `gdal-1.10.0.tar.gz`_ `1.10.0 Release Notes`_ (`1.10.0 md5`)_
+
+.. _`gdal-1.10.0.tar.gz`: http://download.osgeo.org/gdal/1.10.0/gdal-1.10.0.tar.gz
+.. _`1.10.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.10.0/gdal/NEWS
+.. _`1.10.0 md5`: http://download.osgeo.org/gdal/1.10.0/gdal-1.10.0.tar.gz.md5
+
+
+* **2012-10** `gdal-1.9.2.tar.gz`_ `1.9.2 Release Notes`_ (`1.9.2 md5`)_
+
+.. _`gdal-1.9.2.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.9.2.tar.gz
+.. _`1.9.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.9.2/gdal/NEWS
+.. _`1.9.2 md5`: http://download.osgeo.org/gdal/old_releases/gdal-1.9.2.tar.gz.md5
+
+
+* **2012-05** `gdal-1.9.1.tar.gz`_ `1.9.1 Release Notes`_ (`1.9.1 md5`)_
+
+.. _`gdal-1.9.1.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.9.1.tar.gz
+.. _`1.9.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.9.1/gdal/NEWS
+.. _`1.9.1 md5`: http://download.osgeo.org/gdal/old_releases/gdal-1.9.1.tar.gz.md5
+
+
+* **2011-12** `gdal-1.9.0.tar.gz`_ `1.9.0 Release Notes`_ (`1.9.0 md5`)_
+
+.. _`gdal-1.9.0.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.9.0.tar.gz
+.. _`1.9.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.9.0/gdal/NEWS
+.. _`1.9.0 md5`: http://download.osgeo.org/gdal/old_releases/gdal-1.9.0.tar.gz.md5
+
+
+* **2011-07** `gdal-1.8.1.tar.gz`_ `1.8.1 Release Notes`_ (`1.8.1 md5`)_
+
+.. _`gdal-1.8.1.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.8.1.tar.gz
+.. _`1.8.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.8.1/gdal/NEWS
+.. _`1.8.1 md5`: http://download.osgeo.org/gdal/old_releases/gdal-1.8.1.tar.gz.md5
+
+
+* **2011-01** `gdal-1.8.0.tar.gz`_ `1.8.0 Release Notes`_ (`1.8.0 md5`)_
+
+.. _`gdal-1.8.0.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.8.0.tar.gz
+.. _`1.8.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.8.0/gdal/NEWS
+.. _`1.8.0 md5`: http://download.osgeo.org/gdal/old_releases/gdal-1.8.0.tar.gz.md5
+
+
+* **2010-11** `gdal-1.7.3.tar.gz`_ `1.7.3 Release Notes`_ (`1.7.3 md5`)_
+
+.. _`gdal-1.7.3.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.7.3.tar.gz
+.. _`1.7.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.7.3/gdal/NEWS
+.. _`1.7.3 md5`: http://download.osgeo.org/gdal/old_releases/gdal-1.7.3.tar.gz.md5
+
+* **2010-04** `gdal-1.7.2.tar.gz`_ `1.7.2 Release Notes`_ (`1.7.2 md5`)_
+
+.. _`gdal-1.7.2.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.7.2.tar.gz
+.. _`1.7.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.7.2/gdal/NEWS
+.. _`1.7.2 md5`: http://download.osgeo.org/gdal/old_releases/gdal-1.7.2.tar.gz.md5
+
+
+* **2010-02** `gdal-1.7.1.tar.gz`_ `1.7.1 Release Notes`_ (`1.7.1 md5`)_
+
+.. _`gdal-1.7.1.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.7.1.tar.gz
+.. _`1.7.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.7.1/gdal/NEWS
+.. _`1.7.1 md5`: http://download.osgeo.org/gdal/old_releases/gdal-1.7.1.tar.gz.md5
+
+
+* **2010-01** `1.7.0 (retracted) Release Notes`_
+
+.. _`1.7.0 (retracted) Release Notes`: https://github.com/OSGeo/gdal/blob/v1.7.0/gdal/NEWS
+
+
+* **2009-11** `gdal-1.6.3.tar.gz`_ `1.6.3 Release Notes`_
+
+.. _`gdal-1.6.3.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.6.3.tar.gz
+.. _`1.6.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.6.3/gdal/NEWS
+
+
+* **2009-08** `gdal-1.6.2.tar.gz`_ `1.6.2 Release Notes`_
+
+.. _`gdal-1.6.2.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.6.2.tar.gz
+.. _`1.6.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.6.2/gdal/NEWS
+
+
+* **2009-05** `gdal-1.6.1.tar.gz`_ `1.6.1 Release Notes`_
+
+.. _`gdal-1.6.1.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.6.1.tar.gz
+.. _`1.6.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.6.1/gdal/NEWS
+
+
+* **2008-12** `gdal-1.6.0.tar.gz`_ `1.6.0 Release Notes`_
+
+.. _`gdal-1.6.0.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.6.0.tar.gz
+.. _`1.6.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.6.0/gdal/NEWS
+
+
+* **2009-01** `gdal-1.5.4.tar.gz`_ `1.5.4 Release Notes`_
+
+.. _`gdal-1.5.4.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.5.4.tar.gz
+.. _`1.5.4 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.5.4/gdal/NEWS
+
+
+* **2008-10** `gdal-1.5.3.tar.gz`_ `1.5.3 Release Notes`_
+
+.. _`gdal-1.5.3.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.5.3.tar.gz
+.. _`1.5.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.5.3/gdal/NEWS
+
+
+* **2008-05** `gdal-1.5.2.tar.gz`_ `1.5.2 Release Notes`_
+
+.. _`gdal-1.5.2.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.5.2.tar.gz
+.. _`1.5.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.5.2/gdal/NEWS
+
+
+* **2008-03** `gdal-1.5.1.tar.gz`_ `1.5.1 Release Notes`_
+
+.. _`gdal-1.5.1.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.5.1.tar.gz
+.. _`1.5.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.5.1/gdal/NEWS
+
+
+* **2007-12** `gdal-1.5.0.tar.gz`_ `1.5.0 Release Notes`_
+
+.. _`gdal-1.5.0.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.5.0.tar.gz
+.. _`1.5.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.5.0/gdal/NEWS
+
+
+* **2008-12** `gdal-1.4.5.tar.gz`_ `1.4.5 Release Notes`_
+
+.. _`gdal-1.4.5.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.4.5.tar.gz
+.. _`1.4.5 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.4.5/gdal/NEWS
+
+
+* **2007-11** `gdal-1.4.4.tar.gz`_ `1.4.4 Release Notes`_
+
+.. _`gdal-1.4.4.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.4.4.tar.gz
+.. _`1.4.4 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.4.4/gdal/NEWS
+
+
+* **2007-06** `gdal-1.4.2.tar.gz`_ `1.4.2 Release Notes`_
+
+.. _`gdal-1.4.2.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.4.2.tar.gz
+.. _`1.4.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.4.2/gdal/NEWS
+
+
+* **2007-04** `gdal-1.4.1.tar.gz`_ `1.4.1 Release Notes`_
+
+.. _`gdal-1.4.1.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.4.1.tar.gz
+.. _`1.4.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.4.1/gdal/NEWS
+
+
+* **2007-01** `gdal-1.4.0.tar.gz`_
+
+.. _`gdal-1.4.0.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.4.0.tar.gz
diff --git a/doc/source/drivers/raster/avif.rst b/doc/source/drivers/raster/avif.rst
new file mode 100644
index 000000000000..22d81a6313e5
--- /dev/null
+++ b/doc/source/drivers/raster/avif.rst
@@ -0,0 +1,122 @@
+.. _raster.avif:
+
+================================================================================
+AVIF -- AV1 Image File Format
+================================================================================
+
+.. versionadded:: 3.10
+
+.. shortname:: AVIF
+
+.. build_dependencies:: libavif
+
+AV1 Image File Format (AVIF) is an open, royalty-free image file format
+specification for storing images or image sequences compressed with AV1 in the
+HEIF container format.
+
+It supports 8-bit, 10-bit and 12-bit images, single-bland, single-band and
+alpha channel, RGB and RGBA.
+
+Files containing animations (several images) will be exposed as GDAL subdatasets.
+
+Compression and decompression is done on entire images, so the driver can not
+handle arbitrary sizes images.
+
+Note: read-only support for AVIF files is also available through the
+:ref:`raster.heif` driver if the AVIF driver is not available, and if libheif
+has been compiled with an AV1 compatible decoder.
+
+Driver capabilities
+-------------------
+
+.. supports_virtualio
+
+.. supports_createcopy
+
+Color Profile Metadata
+----------------------
+
+GDAL can deal with the following color profile
+metadata in the COLOR_PROFILE domain:
+
+-  SOURCE_ICC_PROFILE (Base64 encoded ICC profile embedded in file.)
+
+Creation options
+----------------
+
+|about-creation-options|
+The following creation options are supported:
+
+-  .. co:: CODEC
+      :choices: AUTO, AOM, RAV1E, SVT
+      :default: AUTO
+
+      Compression library to use. Choices available depend on how libavif has
+      been built.
+
+-  .. co:: QUALITY
+      :choices: [0-100]
+      :default: 60
+
+      Quality for non-alpha channels. 0 is the lowest quality, 100 is for
+      lossless encoding. Default is 60.
+
+-  .. co:: QUALITY_ALPHA
+      :choices: [0-100]
+      :default: 100
+
+      Quality for alpha channel. 0 is the lowest quality, 100 is for
+      lossless encoding. Default is 100/lossless.
+
+-  .. co:: SPEED
+      :choices: [0-10]
+      :default: 6
+
+      Speed of encoding. 0=slowest. 10=fastest.
+
+-  .. co:: NUM_THREADS
+      :choices: <integer>|ALL_CPUS
+      :default: ALL_CPUS
+
+      Number of worker threads for compression.
+
+-  .. co:: SOURCE_ICC_PROFILE
+
+      ICC profile encoded in Base64. Can also be
+      set to empty string to avoid the ICC profile from the source dataset to be used.
+
+-  .. co:: WRITE_EXIF_METADATA
+      :choices: YES, NO
+      :default: YES
+
+      Whether to write EXIF metadata present in source file.
+
+-  .. co:: WRITE_XMP
+      :choices: YES, NO
+      :default: YES
+
+      Whether to write XMP metadata present in source file.
+
+-  .. co:: NBITS
+      :choices: 8, 10, 12
+
+      Bit depth.
+
+-  .. co:: YUV_SUBSAMPLING
+      :choices: 444, 422, 420
+      :default: 444
+
+      Type of `chroma subsampling <https://en.wikipedia.org/wiki/Chroma_subsampling>`
+      to apply to YUV channels for RGB or RGBA images (it is ignored for single
+      band of single band + alpha images)
+      4:4:4 corresponds to full horizontal and vertical resolution for chrominance
+      channels.
+      4:2:2 corresponds to half horizontal and full vertical resolution.
+      4:2:0 corresponds to half horizontal and half vertical resolution.
+      Only 4:4:4 can be used for lossless encoding.
+
+
+See Also
+--------
+
+- `libavif <https://github.com/AOMediaCodec/libavif>`__
diff --git a/doc/source/drivers/raster/cog.rst b/doc/source/drivers/raster/cog.rst
index 381cecdc9e7a..c7a50573c960 100644
--- a/doc/source/drivers/raster/cog.rst
+++ b/doc/source/drivers/raster/cog.rst
@@ -53,9 +53,7 @@ General creation options
       * ``JPEG`` should generally only be used with
         Byte data (8 bit per channel). But if GDAL is built with internal libtiff and
         libjpeg, it is    possible to read and write TIFF files with 12bit JPEG compressed TIFF
-        files (seen as UInt16 bands with NBITS=12). See the `"8 and 12 bit
-        JPEG in TIFF" <http://trac.osgeo.org/gdal/wiki/TIFF12BitJPEG>`__ wiki
-        page for more details.
+        files (seen as UInt16 bands with NBITS=12).
         For the COG driver, JPEG compression for 3 or 4-band images automatically
         selects the PHOTOMETRIC=YCBCR colorspace with a 4:2:2 subsampling of the Y,Cb,Cr
         components.
@@ -612,8 +610,6 @@ See Also
 --------
 
 - :ref:`raster.gtiff` driver
--  `How to generate and read cloud optimized GeoTIFF
-   files <https://trac.osgeo.org/gdal/wiki/CloudOptimizedGeoTIFF>`__ (before GDAL 3.1)
 - If your source dataset is an internally tiled geotiff with the desired georeferencing and compression,
   using `cogger <https://github.com/airbusgeo/cogger>`__ (possibly along with gdaladdo to create overviews) will
   be much faster than the COG driver.
diff --git a/doc/source/drivers/raster/ecw.rst b/doc/source/drivers/raster/ecw.rst
index d3af220f94c4..add3aa839c5a 100644
--- a/doc/source/drivers/raster/ecw.rst
+++ b/doc/source/drivers/raster/ecw.rst
@@ -290,6 +290,31 @@ File Metadata Keys:
    uncompressed file size by 5), etc...
 -  VERSION
 
+Standalone plugin compilation
+-----------------------------
+
+.. versionadded:: 3.10
+
+While this driver may be built as part of a whole GDAL build, either in libgdal
+itself, or as a plugin, it is also possible to only build this driver as a plugin,
+against an already built libgdal.
+
+The version of the GDAL sources used to build the driver must match the version
+of the libgdal it is built against.
+
+For example, from a "build_georaster" directory under the root of the GDAL source tree:
+
+::
+
+    cmake -S ../frmts/ecw -DCMAKE_PREFIX_PATH=/path/to/GDAL_installation_prefix -DECW_ROOT=/path/to/ecw_sdk_root
+    cmake --build .
+
+
+Note that such a plugin, when used against a libgdal not aware of it, will be
+systematically loaded at GDAL driver initialization time, and will not benefit from
+`deferred plugin loading capabilities <rfc-96>`. For that, libgdal itself must be built with the
+CMake variable GDAL_REGISTER_DRIVER_ECW_FOR_LATER_PLUGIN=ON set.
+
 See Also
 --------
 
@@ -301,4 +326,4 @@ See Also
 -  Support for non-GDAL specific issues should be directed to the
    `Hexagon Geospatial public
    forum <https://supportsi.hexagon.com/help/s/erdas-apollo>`__
--  `GDAL ECW Build Hints <http://trac.osgeo.org/gdal/wiki/ECW>`__
+-  Community contributed `patches <https://github.com/rouault/libecwj2-3.3-builds/blob/main/libecwj2-3.3.patch>`__ to apply to ECW SDK 3.3 sources
diff --git a/doc/source/drivers/raster/eedai.rst b/doc/source/drivers/raster/eedai.rst
index 7ce85962c03f..61337ed0d6c1 100644
--- a/doc/source/drivers/raster/eedai.rst
+++ b/doc/source/drivers/raster/eedai.rst
@@ -60,6 +60,12 @@ The following open options are available :
       Size of a GDAL block, which is the minimum
       unit to query pixels.
 
+-  .. oo:: VSI_PATH_FOR_AUTH
+      :since: 3.10
+
+      /vsigs/... path onto which a GOOGLE_APPLICATION_CREDENTIALS path specific
+      option is set
+
 Authentication methods
 ----------------------
 
@@ -68,7 +74,9 @@ The following authentication methods can be used:
 -  Authentication Bearer header passed through the :config:`EEDA_BEARER` or
    :config:`EEDA_BEARER_FILE` configuration options.
 -  Service account private key file, through the
-   :config:`GOOGLE_APPLICATION_CREDENTIALS` configuration option.
+   :config:`GOOGLE_APPLICATION_CREDENTIALS` configuration option, or set
+   as a path-specific option whose value is set in the VSI_PATH_FOR_AUTH
+   open option.
 -  OAuth2 Service Account authentication through the :config:`EEDA_PRIVATE_KEY`/
    :config:`EEDA_PRIVATE_KEY_FILE` + :config:`EEDA_CLIENT_EMAIL` configuration options.
 -  Finally if none of the above method succeeds, the code will check if
diff --git a/doc/source/drivers/raster/esric.rst b/doc/source/drivers/raster/esric.rst
index bd77fb232c7f..cef8bc745a55 100644
--- a/doc/source/drivers/raster/esric.rst
+++ b/doc/source/drivers/raster/esric.rst
@@ -139,6 +139,25 @@ ________________________
    file until the raster size drops below INT32_MAX is a possible
    workaround, but the highest resolution levels will not be read.
 
+Open options
+------------
+
+|about-open-options|
+The following open options are available:
+
+-  .. oo:: EXTENT_SOURCE
+      :choices: FULL_EXTENT, INITIAL_EXTENT, TILING_SCHEME
+      :default: FULL_EXTENT
+      :since: 3.9.1
+
+      Which source should be used for the extent of Esri Tile Package (.tpkx) datasets.
+      By default, or if specifying ``FULL_EXTENT``, the "fullExtent" element of
+      the root.json file will be selected, which normally covers all tiles with data.
+      ``INITIAL_EXTENT`` can be specified to use the default initial extent described
+      in the "initialExtent" element of the root.json file.
+      ``TILING_SCHEME`` will return the extent of the whole tiling scheme, which
+      is typically world coverage.
+
 See Also
 --------
 -  Implemented as :source_file:`frmts/esric/esric_dataset.cpp`.
diff --git a/doc/source/drivers/raster/fits.rst b/doc/source/drivers/raster/fits.rst
index b73949c9d74e..39a05798e1c1 100644
--- a/doc/source/drivers/raster/fits.rst
+++ b/doc/source/drivers/raster/fits.rst
@@ -244,7 +244,7 @@ of the field.
 Fields that have TSCAL and/or TZERO headers are automatically scaled and offset
 to the physical value (only applies to numeric data types)
 
-TNULL headers are used for integer numeric data types and for a single-occurence
+TNULL headers are used for integer numeric data types and for a single-occurrence
 field to set a OGR field to NULL.
 
 Layer creation options
@@ -351,10 +351,10 @@ Linux
 ^^^^^
 From source
 """""""""""
-Install CFITSIO headers from your distro (eg, cfitsio-devel on Fedora; libcfitsio-dev on Debian-Ubuntu), then compile GDAL as usual. CFITSIO will be automatically detected and linked.
+Install CFITSIO headers from your distribution (eg, cfitsio-devel on Fedora; libcfitsio-dev on Debian-Ubuntu), then compile GDAL as usual. CFITSIO will be automatically detected and linked.
 
-From distros
-""""""""""""
+From distributions
+""""""""""""""""""
 On Fedora/CentOS install CFITSIO then GDAL with dnf (yum): cfitsio is automatically linked.
 
 MacOSX
diff --git a/doc/source/drivers/raster/georaster.rst b/doc/source/drivers/raster/georaster.rst
index a1c35d5efd0b..bde1efe71aa0 100644
--- a/doc/source/drivers/raster/georaster.rst
+++ b/doc/source/drivers/raster/georaster.rst
@@ -127,7 +127,7 @@ The following creation options are supported:
 -  .. co:: BLOCKING
 
       Decline the use of blocking (NO) or request an
-      automatic blocking size (OPTIMUM).
+      automatic blocking size (OPTIMALPADDING).
 
 -  .. co:: SRID
 
@@ -451,7 +451,7 @@ Extracting:
    gdal_translate geor:spock/lion@orcl,gdal_rdt,101 out.tif
 
 Note: On the above example that accessing by RDT/RID doesn't need
-schame name as long as the users is granted full access to both
+same name as long as the users is granted full access to both
 tables.
 
 Loading:
@@ -490,3 +490,28 @@ system so one alternative is to create VRT to represent the GeoRaster descriptio
 
     % gdal_translate -of VRT geor:scott/tiger@dbdemo,landsat,scene,id=54 view_54.vrt
     % openenv view_54.vrt
+
+Standalone plugin compilation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. versionadded:: 3.10
+
+While this driver may be built as part of a whole GDAL build, either in libgdal
+itself, or as a plugin, it is also possible to only build this driver as a plugin,
+against an already built libgdal.
+
+The version of the GDAL sources used to build the driver must match the version
+of the libgdal it is built against.
+
+For example, from a "build_georaster" directory under the root of the GDAL source tree:
+
+::
+
+    cmake -S ../frmts/georaster -DCMAKE_PREFIX_PATH=/path/to/GDAL_installation_prefix -DOracle_ROOT=/path/to/instantclient_sdk_root
+    cmake --build .
+
+
+Note that such a plugin, when used against a libgdal not aware of it, will be
+systematically loaded at GDAL driver initialization time, and will not benefit from
+`deferred plugin loading capabilities <rfc-96>`. For that, libgdal itself must be built with the
+CMake variable GDAL_REGISTER_DRIVER_GEOR_FOR_LATER_PLUGIN=ON set.
diff --git a/doc/source/drivers/raster/gif.rst b/doc/source/drivers/raster/gif.rst
index 5cebd59c805b..0d22cbfa6c40 100644
--- a/doc/source/drivers/raster/gif.rst
+++ b/doc/source/drivers/raster/gif.rst
@@ -16,8 +16,9 @@ A GIF image with transparency will have that entry marked as having an
 alpha value of 0.0 (transparent). Also, the transparent value will be
 returned as the NoData value for the band.
 
-If an ESRI world file exists with the .gfw, .gifw or .wld extension, it
-will be read and used to establish the geotransform for the image.
+If an ESRI :ref:`world file <raster.wld>` exists with the .gfw, .gifw
+or .wld extension, it will be read and used to establish the geotransform
+for the image.
 
 XMP metadata can be extracted from the file,
 and will be stored as XML raw content in the xml:XMP metadata domain.
@@ -45,6 +46,7 @@ The following creation options are supported:
      :default: OFF
 
      Force the generation of an associated ESRI world file (.wld).
+     See :ref:`World Files <raster.wld>` section for details.
 
 - .. co:: INTERLACING
      :choices: ON, OFF
diff --git a/doc/source/drivers/raster/gpkg.rst b/doc/source/drivers/raster/gpkg.rst
index e380d7fca5e4..e85fd7e42b22 100644
--- a/doc/source/drivers/raster/gpkg.rst
+++ b/doc/source/drivers/raster/gpkg.rst
@@ -796,7 +796,7 @@ The ``gdal_get_layer_pixel_value()`` function (added in GDAL 3.7), variant of th
 generic ``gdal_get_pixel_value()``, can be used to extract the value of a pixel
 in a raster layer of the current dataset.
 
-It takes 5 arguments:
+It takes 5 or 6 arguments:
 
 * a string with the layer/table name
 * a band number (numbering starting at 1)
@@ -805,11 +805,13 @@ It takes 5 arguments:
   pixel space
 * georeferenced X value or column number
 * georeferenced Y value or line number
+* resampling method among ``nearest`` (default), ``bilinear``, ``cubic``, ``cubicspline``. Optional, added in GDAL 3.10
 
 .. code-block::
 
     SELECT gdal_get_layer_pixel_value('my_raster_table', 1, 'georef', 440720, 3751320)
     SELECT gdal_get_layer_pixel_value('my_raster_table', 1, 'pixel', 0, 0)
+    SELECT gdal_get_pixel_value('my_raster_table', 1, 'pixel', 0.5, 0.5, 'bilinear')  -- GDAL >= 3.10
 
 See Also
 --------
diff --git a/doc/source/drivers/raster/gti.rst b/doc/source/drivers/raster/gti.rst
index 1304fb74b3b1..f54bcff2c5cf 100644
--- a/doc/source/drivers/raster/gti.rst
+++ b/doc/source/drivers/raster/gti.rst
@@ -55,6 +55,11 @@ The GTI driver accepts different types of connection strings:
 
   For example: ``tileindex.gti.gpkg``
 
+  Starting with GDAL 3.10, specifying the ``-if GTI`` option to command line utilities
+  accepting it, or ``GTI`` as the only value of the ``papszAllowedDrivers`` of
+  :cpp:func:`GDALOpenEx`, also forces the driver to recognize the passed filename
+  if its extension is just ``.gpkg`` or ``.fgb``.
+
 * any vector file in a GDAL supported format, with its filename (or connection
   string prefixed with ``GTI:``
 
@@ -68,6 +73,19 @@ The GTI driver accepts different types of connection strings:
 
   For example: ``tileindex.gti``
 
+STAC GeoParquet support
+-----------------------
+
+.. versionadded:: 3.10
+
+The driver can support `STAC GeoParquet catalogs <https://stac-utils.github.io/stac-geoparquet/latest/spec/stac-geoparquet-spec>`_,
+provided GDAL is built with :ref:`vector.parquet` support.
+It can make use of fields ``proj:epsg`` and ``proj:transform`` from the
+`Projection Extension Specification <https://github.com/stac-extensions/projection/>`_,
+to correctly infer the appropriate projection and resolution.
+
+Example of a valid connection string: ``GTI:/vsicurl/https://github.com/stac-utils/stac-geoparquet/raw/main/tests/data/naip.parquet``
+
 Tile index requirements
 -----------------------
 
@@ -158,7 +176,7 @@ PostGIS, ...), the following layer metadata items may be set:
   virtual mosaic (unless SORT_FIELD_ASC=NO is set)
 
 * ``SORT_FIELD_ASC=YES|NO``: whether the values in SORT_FIELD should be sorted
-  in ascendent or descent order. Defaults to YES (ascendent)
+  in ascending or descending order. Defaults to YES (ascending)
 
 * ``BLOCKXSIZE=<int>`` and ``BLOCKYSIZE=<int>``: Block size of bands of the
   virtual mosaic. Defaults to 256x256.
@@ -188,28 +206,43 @@ PostGIS, ...), the following layer metadata items may be set:
 
   Unit of the band.
 
-* ``OVERVIEW_<idx>_DATASET=<string>`` where idx is an integer index starting at 0.
+* ``OVERVIEW_<idx>_DATASET=<string>`` where idx is an integer index (starting at 0
+  since GDAL 3.9.2, starting at 1 in GDAL 3.9.0 and 3.9.1)
 
   Name of the dataset to use as the first overview level. This may be a
   raster dataset (for example a GeoTIFF file, or another GTI dataset).
   This may also be a vector dataset with a GTI compatible layer, potentially
   specified with ``OVERVIEW_<idx>_LAYER``.
 
-* ``OVERVIEW_<idx>_OPEN_OPTIONS=<key1=value1>[,key2=value2]...`` where idx is an integer index starting at 0.
+  Starting with GDAL 3.9.2, overviews of ``OVERVIEW_<idx>_DATASET=<string>``
+  are also automatically added, unless ``OVERVIEW_<idx>_OPEN_OPTIONS=OVERVIEW_LEVEL=NONE``
+  is specified.
+
+* ``OVERVIEW_<idx>_OPEN_OPTIONS=<key1=value1>[,key2=value2]...`` where idx is an integer index (starting at 0
+  since GDAL 3.9.2, starting at 1 in GDAL 3.9.0 and 3.9.1)
 
   Open options(s) to use to open ``OVERVIEW_<idx>_DATASET``.
 
-* ``OVERVIEW_<idx>_LAYER=<string>`` where idx is an integer index starting at 0.
+* ``OVERVIEW_<idx>_LAYER=<string>`` where idx is an integer index (starting at 0
+  since GDAL 3.9.2, starting at 1 in GDAL 3.9.0 and 3.9.1)
+
+  Only taken into account if ``OVERVIEW_<idx>_DATASET=<string>`` is not specified,
+  or points to a GTI dataset.
 
   Name of the vector layer to use as the first overview level, assuming
   ``OVERVIEW_<idx>_DATASET`` points to a vector dataset. ``OVERVIEW_<idx>_DATASET``
   may also not be specified, in which case the vector dataset of the full
   resolution virtual mosaic is used.
 
-* ``OVERVIEW_<idx>_FACTOR=<int>`` where idx is an integer index starting at 0.
+* ``OVERVIEW_<idx>_FACTOR=<int>`` where idx is an integer index (starting at 0
+  since GDAL 3.9.2, starting at 1 in GDAL 3.9.0 and 3.9.1)
+
+  Sub-sampling factor, strictly greater than 1.
+
+  Only taken into account if ``OVERVIEW_<idx>_DATASET=<string>`` is not specified,
+  or points to a GTI dataset.
 
-  Sub-sampling factor, strictly greater than 1. If ``OVERVIEW_<idx>_DATASET``
-  and ``OVERVIEW_<idx>_LAYER`` are not specified, then all tiles of the full
+  If ``OVERVIEW_<idx>_DATASET`` and ``OVERVIEW_<idx>_LAYER`` are not specified, then all tiles of the full
   resolution virtual mosaic are used, with the specified sub-sampling factor
   (it is recommended, but not required, that those tiles do have a corresponding overview).
   ``OVERVIEW_<idx>_DATASET`` and/or ``OVERVIEW_<idx>_LAYER`` may also be
@@ -219,6 +252,8 @@ All overviews *must* have exactly the same extent as the full resolution
 virtual mosaic. The GTI driver does not check that, and if that condition is
 not met, subsampled pixel request will lead to incorrect result.
 
+They also must be listed by decreasing size with increasing overview index.
+
 In addition to those layer metadata items, the dataset-level metadata item
 ``TILE_INDEX_LAYER`` may be set to indicate, for dataset with multiple layers,
 which one should be used as the tile index layer.
@@ -307,7 +342,8 @@ mentioned in the previous section.
         </Overview>
         <Overview>                                     <!-- optional -->
             <!-- 3rd overview level (and potentially 4th, 5th... depending on
-                 the number of overview levels in the pointed GeoTIFF file)
+                 the number of overview levels in the pointed GeoTIFF file.
+                 Only since GDAL 3.9.2)
             -->
             <Dataset>some.tif</Dataset>
         </Overview>
@@ -344,13 +380,13 @@ You can refer to the documentation of the :ref:`VRT <raster.vrt>` driver for
 their syntax and semantics.
 
 
-How to build a GTI comptatible index ?
+How to build a GTI compatible index ?
 ----------------------------------------
 
 The :ref:`gdaltindex` program may be used to generate both a vector tile index,
 and optionally a wrapping .gti XML file.
 
-A GTI comptatible index may also be created by any programmatic means, provided
+A GTI compatible index may also be created by any programmatic means, provided
 the above format specifications are met.
 
 
@@ -390,7 +426,7 @@ also defined as layer metadata items or in the .gti XML file
       :choices: YES, NO
       :default: YES
 
-      Whether the values in SORT_FIELD should be sorted in ascendent or descent order
+      Whether the values in SORT_FIELD should be sorted in ascending or descending order
 
 -  .. oo:: FILTER
       :choices: <string>
@@ -426,3 +462,33 @@ also defined as layer metadata items or in the .gti XML file
       :choices: <float>
 
       Maximum Y value for the virtual mosaic extent
+
+Multi-threading optimizations
+-----------------------------
+
+Starting with GDAL 3.10, the :oo:`NUM_THREADS` open option can
+be set to control specifically the multi-threading of GTI datasets.
+It defaults to ``ALL_CPUS``, and when set, overrides :config:`GDAL_NUM_THREADS`
+or :config:`GTI_NUM_THREADS`. It applies to band-level and dataset-level
+RasterIO(), if more than 1 million pixels are requested and if the mosaic is
+made of only non-overlapping tiles.
+
+-  .. oo:: NUM_THREADS
+      :choices: integer, ALL_CPUS
+      :default: ALL_CPUS
+
+      Determines the number of threads used when an operation reads from
+      multiple sources.
+
+This can also be specified globally with the :config:`GTI_NUM_THREADS`
+configuration option.
+
+-  .. config:: GTI_NUM_THREADS
+      :choices: integer, ALL_CPUS
+      :default: ALL_CPUS
+
+      Determines the number of threads used when an operation reads from
+      multiple sources.
+
+Note that the number of threads actually used is also limited by the
+:config:`GDAL_MAX_DATASET_POOL_SIZE` configuration option.
diff --git a/doc/source/drivers/raster/gtiff.rst b/doc/source/drivers/raster/gtiff.rst
index 148d0647fcf4..0ba9c0de89bc 100644
--- a/doc/source/drivers/raster/gtiff.rst
+++ b/doc/source/drivers/raster/gtiff.rst
@@ -341,15 +341,31 @@ This driver supports the following open options:
    blocks never written and save space; however, most non-GDAL packages
    cannot read such files.
 
--  **IGNORE_COG_LAYOUT_BREAK=YES/NO** (GDAL >= 3.8): Updating a COG
-   (Cloud Optimized GeoTIFF) file generally breaks part of the optimizations,
-   but still produces a valid GeoTIFF file.
+.. oo:: IGNORE_COG_LAYOUT_BREAK
+   :choices: YES, NO
+   :since: 3.8
+   :default: NO
+
+   Updating a COG (Cloud Optimized GeoTIFF) file generally breaks part of the
+   optimizations, but still produces a valid GeoTIFF file.
    Starting with GDAL 3.8, to avoid undesired loss of the COG characteristics,
    opening such a file in update mode will be rejected, unless this option is
    also set to YES (default is NO).
    This option has only effect on COG files and when opening in update mode,
    and is ignored on regular (Geo)TIFF files.
 
+.. oo:: COLOR_TABLE_MULTIPLIER
+   :choices: AUTO, 1, 256, 257
+   :since: 3.10.0
+
+   Specifies the value by which to multiply GDAL color table entry values, usually
+   in [0,255] range, to obtain a TIFF color map value, or on reading by which
+   to divide TIFF color map values to get a GDAL color table entry. Since GDAL 2.3.0,
+   GDAL consistently uses 257, but it might be necessary to use 256 for
+   compatibility with files generated by other software.
+   In AUTO mode, GDAL 3.10 or later can automatically detect the 256 multiplication
+   factor when all values in the TIFF color map are multiple of that value.
+
 Creation Issues
 ---------------
 
@@ -368,9 +384,6 @@ The TIFF format only supports R,G,B components for palettes / color
 tables. Thus on writing the alpha information will be silently
 discarded.
 
-You may want to read hints to `generate and read cloud optimized GeoTIFF
-files <https://trac.osgeo.org/gdal/wiki/CloudOptimizedGeoTIFF>`__
-
 Creation Options
 ~~~~~~~~~~~~~~~~
 
@@ -381,7 +394,7 @@ This driver supports the following creation options:
       :choices: YES, NO
 
       Force the generation of an associated ESRI world file
-      (.tfw).See the :ref:`World Files <raster.wld>` page for details.
+      (.tfw). See the :ref:`World Files <raster.wld>` page for details.
 
 -  .. co:: RPB
       :choices: YES, NO
@@ -773,6 +786,16 @@ This driver supports the following creation options:
 
       .. note:: Write support for GeoTIFF 1.1 requires libgeotiff 1.6.0 or later.
 
+-  .. co:: COLOR_TABLE_MULTIPLIER
+      :choices: 1, 256, 257
+      :since: 3.10.0
+      :default: 257
+
+      Specifies the value by which to multiply GDAL color table entry values, usually
+      in [0,255] range, to obtain a TIFF color map value. Since GDAL 2.3.0,
+      GDAL consistently uses 257, but it might be necessary to use 256 for
+      compatibility with files generated by other software.
+
 Subdatasets
 ~~~~~~~~~~~
 
@@ -1124,6 +1147,34 @@ the default behavior of the GTiff driver.
       expected to be necessary, unless GDAL is incorrectly determining the disk
       space available on the destination file system.
 
+-  .. config:: GTIFF_READ_ANGULAR_PARAMS_IN_DEGREE
+      :choices: YES, NO
+      :default: NO
+      :since: 3.9.1
+
+      Conformant GeoTIFF files should have the values of angular projection
+      parameters written in the unit of the GeogAngularUnitsGeoKey. But some
+      non-conformant implementations, such as GDAL <= 3.9.0, always wrote them
+      in degrees.
+      This option can be set to YES when reading such non-conformant GeoTIFF
+      files (typically using grads), to instruct GDAL (>= 3.9.1) that the projection
+      parameters are in degrees, instead of being expressed in the unit of the
+      GeogAngularUnitsGeoKey.
+
+-  .. config:: GTIFF_WRITE_ANGULAR_PARAMS_IN_DEGREE
+      :choices: YES, NO
+      :default: NO
+      :since: 3.9.1
+
+      Conformant GeoTIFF files should have the values of angular projection
+      parameters written in the unit of the GeogAngularUnitsGeoKey. But some
+      non-conformant implementations, such as GDAL >= 3.0 and <= 3.9.0, assumed
+      those values to be in degree.
+      This option can be set to YES to force writing such non-conformant GeoTIFF
+      files. It should *not* be nominally used, except to workaround interoperability
+      issues.
+
+
 Codec Recommendations
 ---------------------
 
diff --git a/doc/source/drivers/raster/hdf5.rst b/doc/source/drivers/raster/hdf5.rst
index 2f4f6bf3e3a0..4a3764080b02 100644
--- a/doc/source/drivers/raster/hdf5.rst
+++ b/doc/source/drivers/raster/hdf5.rst
@@ -49,6 +49,12 @@ like this:
 | *subdataset* is the dataset name of the array to use (for internal use
   in GDAL).
 
+Starting with GDAL 3.10, specifying the ``-if HDF5`` option to command line utilities
+accepting it, or ``HDF5`` as the only value of the ``papszAllowedDrivers`` of
+:cpp:func:`GDALOpenEx`, also forces the driver to recognize the passed
+filename, when it is not using subdataset syntax (it can typically be used to
+force open a netCDF file that would be nominally recognized by the netCDF driver).
+
 On the second step you should provide this name for **gdalinfo** or
 **gdal_translate** for actual reading of the data.
 
diff --git a/doc/source/drivers/raster/heif.rst b/doc/source/drivers/raster/heif.rst
index 3bf288b3716d..803e281ac8cd 100644
--- a/doc/source/drivers/raster/heif.rst
+++ b/doc/source/drivers/raster/heif.rst
@@ -26,6 +26,16 @@ matches the one of the full resolution image)
 
 If a file contains several top-level images, they will be exposed as GDAL subdatasets.
 
+AVIF support
+------------
+
+Starting with GDAL 3.10, the AVIF_HEIF companion driver to the HEIF driver may
+be used to open images encoding with the AVIF (AV1 Image File) codec if the
+:ref:`raster.avif` driver is not available and if libheif has been compiled with
+support for one of the libraries it support that are able of AV1 decoding
+(libaom or libdav1d).
+
+
 Driver capabilities
 -------------------
 
diff --git a/doc/source/drivers/raster/index.rst b/doc/source/drivers/raster/index.rst
index e9230e34d44e..9f3b578a8fd5 100644
--- a/doc/source/drivers/raster/index.rst
+++ b/doc/source/drivers/raster/index.rst
@@ -17,19 +17,16 @@ Raster drivers
     The following drivers have been retired and moved to the
     https://github.com/OSGeo/gdal-extra-drivers repository: BPG, E00GRID, EPSILON, IGNFHeightASCIIGrid, NTv1
 
-..
-    Developer comment: make html includes a hack to hide the table from
-    the index.html file. We need to keep it visible so that the top-level
-    index.html lists those pages.
-
 .. toctree::
    :maxdepth: 1
+   :hidden:
 
    aaigrid
    ace2
    adrg
    aig
    airsar
+   avif
    bag
    basisu
    blx
@@ -167,6 +164,7 @@ Raster drivers
    sentinel2
    sgi
    sigdem
+   snap_tiff
    snodas
    srp
    srtmhgt
diff --git a/doc/source/drivers/raster/isis3.rst b/doc/source/drivers/raster/isis3.rst
index f74e70aab96f..a160de4a6efb 100644
--- a/doc/source/drivers/raster/isis3.rst
+++ b/doc/source/drivers/raster/isis3.rst
@@ -23,7 +23,7 @@ well as selected other header metadata.
 
 Starting with GDAL 2.2, a mask band is attached to each source band. The
 value of this mask band is 0 when the pixel value is the NULL value or
-one of the low/high on-intstrument/processed saturation value, or 255
+one of the low/high on-instrument/processed saturation value, or 255
 when the pixel value is valid.
 
 Implementation of this driver was supported by the United States
@@ -318,7 +318,7 @@ Python :
    from osgeo import gdal
 
    src_ds = gdal.Open('in.lbl')
-   # Load source label as JSON 
+   # Load source label as JSON
    label = json.loads( src_ds.GetMetadata_List('json:ISIS3')[0] )
    # Update parameter
    label["IsisCube"]["Mapping"]["TargetName"] = "Moon"
diff --git a/doc/source/drivers/raster/jp2ecw.rst b/doc/source/drivers/raster/jp2ecw.rst
index fe1df5c8d7d1..3a4c59172e88 100644
--- a/doc/source/drivers/raster/jp2ecw.rst
+++ b/doc/source/drivers/raster/jp2ecw.rst
@@ -379,4 +379,3 @@ See Also
 -  Support for non-GDAL specific issues should be directed to the
    `Hexagon Geospatial public
    forum <https://sgisupport.intergraph.com/infocenter/index?page=forums&forum=507301383c17ef4e013d8dfa30c2007ef1>`__
--  `GDAL ECW Build Hints <http://trac.osgeo.org/gdal/wiki/ECW>`__
diff --git a/doc/source/drivers/raster/jp2kak.rst b/doc/source/drivers/raster/jp2kak.rst
index da787ca31420..4faf1fa65638 100644
--- a/doc/source/drivers/raster/jp2kak.rst
+++ b/doc/source/drivers/raster/jp2kak.rst
@@ -234,19 +234,20 @@ The following creation options are tightly tied to the Kakadu SDK, and are
 considered to be for advanced use only. Consult the Kakadu SDK documentation to
 better understand their meaning.
 
--  **Corder**: Defaults to "PRCL".
--  **Cprecincts**: Defaults to
+-  **Corder**: Progression order. Defaults to "PRCL".
+-  **Cprecincts**: Precincts settings. Defaults to
    "{512,512},{256,512},{128,512},{64,512},{32,512},{16,512},{8,512},{4,512},{2,512}".
--  **ORGgen_plt**: Defaults to "yes".
--  **ORGgen_tlm**: Kakadu SDK defaults used.
+-  **ORGgen_plt**: Whether to generate PLT markers (Paquet Length). Defaults to "yes".
+-  **ORGgen_tlm**: Whether to generate TLM markers (Tile Length). Kakadu SDK defaults used.
 -  **ORGtparts**: Kakadu SDK defaults used.
 -  **Cmodes**: Kakadu SDK defaults used.
--  **Clevels**: Kakadu SDK defaults used.
+-  **Clevels**: Quality levels. Kakadu SDK defaults used.
+-  **Cycc** =YES/NO: Whether to use YCbCr (lossy compression) or YUV (lossless compression) color space when encoding RGB images. Default to YES starting with GDAL 3.10 (was hardcoded to NO in previous versions)
 -  **Rshift**: Kakadu SDK defaults used.
 -  **Rlevels**: Kakadu SDK defaults used.
 -  **Rweight**: Kakadu SDK defaults used.
 -  **Qguard**: Kakadu SDK defaults used.
--  **Creversible**: If not set and QUALITY >= 99.5, set to "yes", otherwise to "false".
+-  **Creversible** = YES/NO: If not set and QUALITY >= 99.5, set to "yes", otherwise to "false".
 -  **Sprofile**: Kakadu SDK defaults used.
 -  **RATE**: Kakadu SDK defaults used.
    One or more bit-rates, expressed in terms of the ratio between the total number of compressed bits
@@ -284,6 +285,31 @@ unistd.h in kdu_arch.cpp. This means that \_SC_NPROCESSORS_ONLN and
 always return 0. Therefore the jp2kak driver might not default to
 creating worker threads.
 
+Standalone plugin compilation
+-----------------------------
+
+.. versionadded:: 3.10
+
+While this driver may be built as part of a whole GDAL build, either in libgdal
+itself, or as a plugin, it is also possible to only build this driver as a plugin,
+against an already built libgdal.
+
+The version of the GDAL sources used to build the driver must match the version
+of the libgdal it is built against.
+
+For example, from a "build_jp2kak" directory under the root of the GDAL source tree:
+
+::
+
+    cmake -S ../frmts/jp2kak -DCMAKE_PREFIX_PATH=/path/to/GDAL_installation_prefix -DKDU_ROOT=/path/to/kakadu_root
+    cmake --build .
+
+
+Note that such a plugin, when used against a libgdal not aware of it, will be
+systematically loaded at GDAL driver initialization time, and will not benefit from
+`deferred plugin loading capabilities <rfc-96>`. For that, libgdal itself must be built with the
+CMake variable GDAL_REGISTER_DRIVER_JP2KAK_FOR_LATER_PLUGIN=ON set.
+
 See Also
 --------
 
diff --git a/doc/source/drivers/raster/jp2mrsid.rst b/doc/source/drivers/raster/jp2mrsid.rst
index c22375aa98a4..cfbe0def34d3 100644
--- a/doc/source/drivers/raster/jp2mrsid.rst
+++ b/doc/source/drivers/raster/jp2mrsid.rst
@@ -27,10 +27,10 @@ Georeferencing
 --------------
 
 Georeferencing information can come from different sources : internal
-(GeoJP2 or GMLJP2 boxes), worldfile .j2w/.wld sidecar files, or PAM
-(Persistent Auxiliary metadata) .aux.xml sidecar files. By default,
-information is fetched in following order (first listed is the highest
-priority): PAM, GeoJP2, GMLJP2, WORLDFILE.
+(GeoJP2 or GMLJP2 boxes), :ref:`worldfile <raster.wld>` .j2w/.wld sidecar
+files, or PAM (Persistent Auxiliary metadata) .aux.xml sidecar files. By
+default, information is fetched in following order (first listed is the
+highest priority): PAM, GeoJP2, GMLJP2, WORLDFILE.
 
 Starting with GDAL 2.2, the allowed sources and their priority order can
 be changed with the :config:`GDAL_GEOREF_SOURCES` configuration option (or
@@ -70,6 +70,7 @@ The following creation options are supported.
       :choices: YES
 
       to write an ESRI world file (with the extension .j2w).
+      See :ref:`World Files <raster.wld>` section for details.
 
 -  .. co:: COMPRESSION
 
diff --git a/doc/source/drivers/raster/jp2openjpeg.rst b/doc/source/drivers/raster/jp2openjpeg.rst
index f87cf2fb5ba2..a244542319d1 100644
--- a/doc/source/drivers/raster/jp2openjpeg.rst
+++ b/doc/source/drivers/raster/jp2openjpeg.rst
@@ -149,8 +149,8 @@ The following creation options are available:
       2.0.1 <http://docs.opengeospatial.org/is/08-085r5/08-085r5.html>`__
       specification should be included in the file. *filename* must point
       to a file with a JSON content that defines how the GMLJP2 v2 box
-      should be built. See below section for the syntax of the JSON 
-      configuration file. It is also possible to directly pass the JSON 
+      should be built. See below section for the syntax of the JSON
+      configuration file. It is also possible to directly pass the JSON
       content inlined as a string. If filename is just set to YES, a
       minimal instance will be built. Note: GDAL 2.0 and 2.1 use the older
       `OGC GML in JPEG2000, version
@@ -663,6 +663,31 @@ Feature collections can be linked from the GMLJP2 v2 box to a remote
 location. By default, the link is not followed. It will be followed if
 the open option OPEN_REMOTE_GML is set to YES.
 
+Standalone plugin compilation
+-----------------------------
+
+.. versionadded:: 3.10
+
+While this driver may be built as part of a whole GDAL build, either in libgdal
+itself, or as a plugin, it is also possible to only build this driver as a plugin,
+against an already built libgdal.
+
+The version of the GDAL sources used to build the driver must match the version
+of the libgdal it is built against.
+
+For example, from a "build_openjpeg" directory under the root of the GDAL source tree:
+
+::
+
+    cmake -S ../frmts/openjpeg -DCMAKE_PREFIX_PATH=/path/to/GDAL_installation_prefix -DOPENJPEG_ROOT=/path/to/openjpeg_install_prefix
+    cmake --build .
+
+
+Note that such a plugin, when used against a libgdal not aware of it, will be
+systematically loaded at GDAL driver initialization time, and will not benefit from
+`deferred plugin loading capabilities <rfc-96>`. For that, libgdal itself must be built with the
+CMake variable GDAL_REGISTER_DRIVER_JP2OPENJPEG_FOR_LATER_PLUGIN=ON set.
+
 See Also
 ---------
 
diff --git a/doc/source/drivers/raster/jpeg.rst b/doc/source/drivers/raster/jpeg.rst
index de018de65f1b..1de58c9d189f 100644
--- a/doc/source/drivers/raster/jpeg.rst
+++ b/doc/source/drivers/raster/jpeg.rst
@@ -20,8 +20,8 @@ IMAGE_STRUCTURE domain.
 
 EXIF metadata can be read from JPEG files (but this will not result in a
 georeferenced image even if the EXIF_GPSLatitude and EXIF_GPSLongitude
-tags are set). But if an ESRI world file exists with the .jgw,
-.jpgw/.jpegw or .wld suffixes, it will be read and used to establish the
+tags are set). But if an ESRI :ref:`world file <raster.wld>` exists with the
+.jgw, .jpgw/.jpegw or .wld suffixes, it will be read and used to establish the
 geotransform for the image. If available a MapInfo .tab file will also
 be used for georeferencing. Overviews can be built for JPEG files as an
 external .ovr file.
@@ -169,7 +169,8 @@ The following creation options are supported:
       :choices: YES
 
       Force the generation of an associated ESRI world
-      file (with the extension .wld).
+      file (with the extension .wld). See :ref:`World Files <raster.wld>`
+      section for details.
 
 -  .. co:: QUALITY
       :choices: 1-100
diff --git a/doc/source/drivers/raster/jpipkak.rst b/doc/source/drivers/raster/jpipkak.rst
index f9cb29822bd5..f13fd313ec71 100644
--- a/doc/source/drivers/raster/jpipkak.rst
+++ b/doc/source/drivers/raster/jpipkak.rst
@@ -51,7 +51,7 @@ are made at the 1:1 resolution level.
    the resolution associated with the requested view-window. The values
    'fx' and 'fy' specify the dimensions of the desired image resolution.
    'roff' is used to identify the upper left hand corner off the spatial
-   region associated with the requested view-windw. 'rsiz' is used to
+   region associated with the requested view-window. 'rsiz' is used to
    identify the horizontal and vertical extents of the spatial region
    associated with the requested view-window.
 
diff --git a/doc/source/drivers/raster/mbtiles.rst b/doc/source/drivers/raster/mbtiles.rst
index 052acc1ff4d9..5c52281ec31a 100644
--- a/doc/source/drivers/raster/mbtiles.rst
+++ b/doc/source/drivers/raster/mbtiles.rst
@@ -217,7 +217,7 @@ Tile formats
 
 MBTiles can store tiles in PNG, JPEG or WEBP (since 3.8). Support for
 those tile formats depend if the underlying drivers are available
-in GDAL. By default, GDAL will PNG tiles.
+in GDAL. By default, GDAL will produce PNG tiles.
 
 It is possible to select the tile format by setting the creation/open
 option TILE_FORMAT to one of PNG, PNG8, JPEG or WEBP. When using JPEG,
diff --git a/doc/source/drivers/raster/mem.rst b/doc/source/drivers/raster/mem.rst
index 223ead3d0f79..ae18bd9b3220 100644
--- a/doc/source/drivers/raster/mem.rst
+++ b/doc/source/drivers/raster/mem.rst
@@ -63,14 +63,29 @@ or
    the next.
 -  GEOTRANSFORM: Set the affine transformation coefficients. 6 real
    numbers with '/' as separator (optional)
--  SPATIALREFERENCE: (GDAL >= 3.7) Set the projection. The coordinate reference 
-   systems that can be passed are anything supported by the 
-   OGRSpatialReference.SetFromUserInput() as per '-a_srs' in  
+-  SPATIALREFERENCE: (GDAL >= 3.7) Set the projection. The coordinate reference
+   systems that can be passed are anything supported by the
+   OGRSpatialReference.SetFromUserInput() as per '-a_srs' in
    :ref:`gdal_translate`. If the passed string includes comma or double-quote characters (typically WKT),
    it should be surrounded by double-quote characters and the double-quote characters inside it
    should be escaped with anti-slash.
    e.g ``SPATIALREFERENCE="GEOGCRS[\"WGS 84\",[... snip ...],ID[\"EPSG\",4326]]"``
 
+.. warning::
+
+    Starting with GDAL 3.10, opening a MEM dataset using the above syntax is no
+    longer enabled by default for security reasons.
+    If you want to allow it, define the ``GDAL_MEM_ENABLE_OPEN`` configuration
+    option to ``YES``, or build GDAL with the ``GDAL_MEM_ENABLE_OPEN`` compilation
+    definition.
+
+    .. config:: GDAL_MEM_ENABLE_OPEN
+       :choices: YES, NO
+       :default: NO
+       :since: 3.10
+
+       Whether opening a MEM dataset with the ``MEM:::`` syntax is allowed.
+
 
 Creation Options
 ----------------
diff --git a/doc/source/drivers/raster/mrsid.rst b/doc/source/drivers/raster/mrsid.rst
index fbe96a84c8a6..ec77d3e4ceaa 100644
--- a/doc/source/drivers/raster/mrsid.rst
+++ b/doc/source/drivers/raster/mrsid.rst
@@ -63,6 +63,31 @@ GeoKeys, stored in MrSID files. This bug was fixed in MrSID software
 version 1.5, but if you have older encoders or files, created with older
 encoders, you cannot use georeference information from them.
 
+Standalone plugin compilation
+-----------------------------
+
+.. versionadded:: 3.10
+
+While this driver may be built as part of a whole GDAL build, either in libgdal
+itself, or as a plugin, it is also possible to only build this driver as a plugin,
+against an already built libgdal.
+
+The version of the GDAL sources used to build the driver must match the version
+of the libgdal it is built against.
+
+For example, from a "build_mrsid" directory under the root of the GDAL source tree:
+
+::
+
+    cmake -S ../frmts/mrsid -DCMAKE_PREFIX_PATH=/path/to/GDAL_installation_prefix -DMRSID_ROOT=/path/to/mrsid_sdk_root
+    cmake --build .
+
+
+Note that such a plugin, when used against a libgdal not aware of it, will be
+systematically loaded at GDAL driver initialization time, and will not benefit from
+`deferred plugin loading capabilities <rfc-96>`. For that, libgdal itself must be built with the
+CMake variable GDAL_REGISTER_DRIVER_MRSID_FOR_LATER_PLUGIN=ON set.
+
 See Also:
 ---------
 
diff --git a/doc/source/drivers/raster/msg.rst b/doc/source/drivers/raster/msg.rst
index 2ad9c9d03740..357c14a4c4e1 100644
--- a/doc/source/drivers/raster/msg.rst
+++ b/doc/source/drivers/raster/msg.rst
@@ -35,37 +35,8 @@ Driver capabilities
 Build Instructions
 ------------------
 
-CMake builds
-++++++++++++
-
 See the ``GDAL_USE_PUBLICDECOMPWT`` option of :ref:`building_from_source`.
 
-Other build systems
-+++++++++++++++++++
-
-Clone the EUMETSAT library for wavelet decompression into ``frmts/msg``.
-
-If you are building with Visual Studio 6.0, extract the .vc makefiles
-for the PublicDecompWT from the file `PublicDecompWTMakefiles.zip`
-stored in that directory.
-
-If you build using the GNUMakefile, use *--with-msg* option to enable
-MSG driver:
-
-::
-
-   ./configure --with-msg
-
-If you find that some adjustments are needed in the makefile and/or the msg
-source files, please "commit" them. The EUMETSAT library promises to be
-"platform independent", but as we are working with Microsoft Windows and
-Visual Studio 6.0, we did not have the facilities to check if the rest
-of the msg driver is. Furthermore, apply steps 4 to 7 from the :ref:`raster_driver_tut`, section "Adding
-Driver to GDAL Tree".
-
-MSG Wiki page is available at http://trac.osgeo.org/gdal/wiki/MSG. It's
-dedicated to document building and usage hints
-
 Specification of Source Dataset
 -------------------------------
 
diff --git a/doc/source/drivers/raster/netcdf.rst b/doc/source/drivers/raster/netcdf.rst
index 5e1561260538..248f53ff5bdd 100644
--- a/doc/source/drivers/raster/netcdf.rst
+++ b/doc/source/drivers/raster/netcdf.rst
@@ -222,6 +222,12 @@ should be reported as multiple bands of a same dataset.
         scale_factor=0.1
 
 
+Starting with GDAL 3.10, specifying the ``-if netCDF`` option to command line utilities
+accepting it, or ``netCDF`` as the only value of the ``papszAllowedDrivers`` of
+:cpp:func:`GDALOpenEx`, also forces the driver to recognize the passed
+filename, when it is not using subdataset syntax (it can typically be used to
+force open a HDF5 file that would be nominally recognized by the HDF5 driver).
+
 Dimension
 ---------
 
@@ -281,7 +287,7 @@ The following open options are available:
       valid_min, valid_max or valid_range attributes.
 
 -  .. oo:: IGNORE_XY_AXIS_NAME_CHECKS
-      :choices: YES, NOA
+      :choices: YES, NO
       :default: NO
       :since: 3.4.2
 
@@ -476,7 +482,7 @@ The following creation options are available:
       these variables by default. In import the CF "grid_mapping" variable
       takes precedence and the GDAL tags are used if they do not conflict
       with CF metadata. In GDAL 4, spatial_ref will not be exported. The
-      crs_wkt CF metatata attribute will be used instead.
+      crs_wkt CF metadata attribute will be used instead.
 
 -  .. co:: WRITE_LONLAT
       :choices: YES, NO, IF_NEEDED
@@ -694,6 +700,28 @@ The :cpp:func:`GDALGroup::OpenMDArray` method supports the following options:
   fill value will be used as nodata when there is no _FillValue or missing_value
   attribute (except on variables of type Byte, UByte, Char)
 
+- RAW_DATA_CHUNK_CACHE_SIZE=<integer>. (GDAL >= 3.10, advanced libnetcdf parameter)
+  The total size of the libnetcdf raw data chunk cache, in bytes. Default value
+  (at least for some versions of libnetcdf) is 1 MB. Only for netCDF4/HDF5 files.
+
+- CHUNK_SLOTS=<integer>. (GDAL >= 3.10, advanced libnetcdf parameter)
+  The total size of the libnetcdf raw data chunk cache, in bytes.
+  Default value (at least for some versions of libnetcdf) is 521.
+  Only for netCDF4/HDF5 files.
+
+- PREEMPTION=<float> between 0 and 1. (GDAL >= 3.10, advanced libnetcdf parameter)
+  Indicates how much chunks from libnetcdf chunk cache that have been fully read
+  are favored for preemption.
+  A value of zero means fully read chunks are treated no differently than other
+  chunks (the preemption is strictly least-recently used) while a value of one
+  means fully read chunks are always preempted before other chunks.
+  Default value (at least for some versions of libnetcdf) is 0.75.
+  Only for netCDF4/HDF5 files.
+
+For RAW_DATA_CHUNK_CACHE_SIZE, CHUNK_SLOTS and PREEMPTION, consult
+`nc_set_var_chunk_cache <https://docs.unidata.ucar.edu/netcdf-c/current/group__variables.html#ga2788cbfc6880ec70c304292af2bc7546>`__ and
+`documentation about netCDF chunk cacke <https://docs.unidata.ucar.edu/nug/current/netcdf_perf_chunking.html>`__
+
 The :cpp:func:`GDALGroup::CreateMDArray` method supports the following options:
 
 - NC_TYPE=NC_CHAR/NC_BYTE/NC_INT64/NC_UINT64: to overload the netCDF data type
@@ -722,9 +750,6 @@ This driver is compiled with the UNIDATA NetCDF library.
 You need to download or compile the NetCDF library before configuring
 GDAL with NetCDF support.
 
-See `NetCDF GDAL wiki <http://trac.osgeo.org/gdal/wiki/NetCDF>`__ for
-build instructions and information regarding HDF4, NetCDF-4 and HDF5.
-
 See Also:
 ---------
 
diff --git a/doc/source/drivers/raster/nitf.rst b/doc/source/drivers/raster/nitf.rst
index 7e049dd32ce9..4d95ded1e8ba 100644
--- a/doc/source/drivers/raster/nitf.rst
+++ b/doc/source/drivers/raster/nitf.rst
@@ -130,13 +130,41 @@ The following creation options are available:
       -  C8 means JPEG2000 compression (one block) and is available for
          CreateCopy() and/or Create() methods. See below paragraph for specificities.
 
+-  .. co:: QUALITY
+      :default: 75
+
+      For JPEG, quality as integer values in the 10-100 range
+      For JPEG2000, quality as a floating-point value in >0 - 100 range.
+      When JPEG2000_DRIVER=JP2OpenJPEG and PROFILE is not one of the NPJE ones,
+      several quality layers can be specified as a comma-separated list of values.
+
+-  .. co:: PROGRESSIVE
+      :choices: YES, NO
+      :default: NO
+
+      JPEG progressive mode
+
+-  .. co:: RESTART_INTERVAL
+      :choices: -1, 0, >0
+      :default: -1
+
+      Restart interval (in MCUs) for JPEG compression.
+      -1 for auto, 0 for none, > 0 for user specified.
+
 -  .. co:: NUMI
       :default: 1
 
       Number of images.
-      See :ref:`Advanced GDAL NITF Driver Information <raster.nitf_advanced>` for
+      See :ref:`raster.nitf_advanced_write_multiple_image_segments` for
       the procedure to follow to write several images in a NITF file.
 
+-  .. co:: WRITE_ONLY_FIRST_IMAGE
+      :choices: YES, NO
+      :default: NO
+
+      (Only taken into account if NUMI > 1, and on a new NITF file).
+      If YES, only write first image. Subsequent ones must be written with APPEND_SUBDATASET=YES
+
 -  .. co:: WRITE_ALL_IMAGES
       :choices: YES, NO
       :default: NO
@@ -212,6 +240,10 @@ The following creation options are available:
 
       Set the block height.
 
+-  .. co:: BLOCKSIZE
+
+      Set the block with and height. Overridden by BLOCKXSIZE and BLOCKYSIZE
+
 -  .. co:: BLOCKA_*
 
       If a complete set of BLOCKA options is provided with
@@ -260,6 +292,14 @@ The following creation options are available:
       Number of DES segments. Only to be used on
       first image segment
 
+-  .. co:: TEXT
+
+      TEXT options as text-option-name=text-option-content. Cf :ref:`raster.nitf_advanced_text`.
+
+-  .. co:: CGM
+
+      CGM options in cgm-option-name=cgm-option-content.  Cf :ref:`raster.nitf_advanced_cgm`.
+
 -  .. co:: SDE_TRE
       :choices: YES, NO
 
@@ -299,6 +339,273 @@ The following creation options are available:
       may needed to set this option to NO if changing the georeferencing of
       the input file.
 
+
+The following creation options to se fields in the NITF file header are available:
+
+-  .. co:: OSTAID
+      :choices: string of up to 10 characters
+
+      Originating Station ID
+
+-  .. co:: FDT
+      :choices: string of up to 14 characters
+
+      File Date and Time
+
+-  .. co:: FTITLE
+      :choices: string of up to 80 characters
+
+      File Title
+
+-  .. co:: FSCLAS
+      :choices: string of 1 character
+
+      File Security Classification
+
+-  .. co:: FSCLSY
+      :choices: string of up to 2 characters
+
+      File Classification Security System
+
+-  .. co:: FSCODE
+      :choices: string of up to 11 characters
+
+      File Codewords
+
+-  .. co:: FSCTLH
+      :choices: string of up to 2 characters
+
+      File Control and Handling
+
+-  .. co:: FSREL
+      :choices: string of up to 20 characters
+
+      File Releasing Instructions
+
+-  .. co:: FSDCTP
+      :choices: string of up to 2 characters
+
+      File Declassification Type
+
+-  .. co:: FSDCDT
+      :choices: string of 8 characters
+
+      File Declassification Date
+
+-  .. co:: FSDCXM
+      :choices: string of up to 4 characters
+
+      File Declassification Exemption
+
+-  .. co:: FSDG
+      :choices: string of 1 character
+
+      File Downgrade
+
+-  .. co:: FSDGDT
+      :choices: string of 8 characters
+
+      File Downgrade Date
+
+-  .. co:: FSCLTX
+      :choices: string of up to 43 characters
+
+      File Classification Text
+
+-  .. co:: FSCATP
+      :choices: string of 1 character
+
+      File Classification Authority Type
+
+-  .. co:: FSCAUT
+      :choices: string of up to 40 characters
+
+      File Classification Authority
+
+-  .. co:: FSCRSN
+      :choices: string of 1 character
+
+      File Classification Reason
+
+-  .. co:: FSSRDT
+      :choices: string of 8 characters
+
+      File Security Source Date
+
+-  .. co:: FSCTLN
+      :choices: string of up to 15 characters
+
+      File Security Control Number
+
+-  .. co:: FSCOP
+      :choices: string of up to 5 characters
+
+      File Copy Number
+
+-  .. co:: FSCPYS
+      :choices: string of up to 5 characters
+
+      File Number of Copies
+
+-  .. co:: ONAME
+      :choices: string of up to 24 characters
+
+      Originator Name
+
+-  .. co:: OPHONE
+      :choices: string of up to 18 characters
+
+      Originator Phone Number
+
+The following creation options to se fields in the NITF image header are available:
+
+-  .. co:: IID1
+      :choices: string of up to 10 characters
+
+      Image Identifier 1
+
+-  .. co:: IDATIM
+      :choices: string of 14 characters
+
+      Image Date and Time
+
+-  .. co:: TGTID
+      :choices: string of up to 17 characters
+
+      Target Identifier
+
+-  .. co:: IID2
+      :choices: string of up to 80 characters
+
+      Image Identifier 2
+
+-  .. co:: ISCLAS
+      :choices: string of 1 character
+
+      Image Security Classification
+
+-  .. co:: ISCLSY
+      :choices: string of up to 2 characters
+
+      Image Classification Security System
+
+-  .. co:: ISCODE
+      :choices: string of up to 11 characters
+
+      Image Codewords
+
+-  .. co:: ISCTLH
+      :choices: string of up to 2 characters
+
+      Image Control and Handling
+
+-  .. co:: ISREL
+      :choices: string of up to 20 characters
+
+      Image Releasing Instructions
+
+-  .. co:: ISDCTP
+      :choices: string of up to 2 characters
+
+      Image Declassification Type
+
+-  .. co:: ISDCDT
+      :choices: string of 8 characters
+
+      Image Declassification Date
+
+-  .. co:: ISDCXM
+      :choices: string of up to 4 characters
+
+      Image Declassification Exemption
+
+-  .. co:: ISDG
+      :choices: string of 1 character
+
+      Image Downgrade
+
+-  .. co:: ISDGDT
+      :choices: string of 8 characters
+
+      Image Downgrade Date
+
+-  .. co:: ISCLTX
+      :choices: string of up to 43 characters
+
+      Image Classification Text
+
+-  .. co:: ISCATP
+      :choices: string of 1 character
+
+      Image Classification Authority Type
+
+-  .. co:: ISCAUT
+      :choices: string of up to 40 characters
+
+      Image Classification Authority
+
+-  .. co:: ISCRSN
+      :choices: string of 1 character
+
+      Image Classification Reason
+
+-  .. co:: ISSRDT
+      :choices: string of 8 characters
+
+      Image Security Source Date
+
+-  .. co:: ISCTLN
+      :choices: string of up to 15 characters
+
+      Image Security Control Number
+
+-  .. co:: ISORCE
+      :choices: string of up to 42 characters
+
+      Image Source
+
+-  .. co:: ICAT
+      :choices: string of up to 8 characters
+
+      Image Category
+
+-  .. co:: ABPP
+      :choices: integer
+
+      Actual Bits-Per-Pixel Per Band.
+      Starting with GDAL 3.10, also available as the ``NBITS`` creation option.
+
+-  .. co:: PJUST
+      :choices: string of 1 character
+
+      Pixel Justification
+
+-  .. co:: ICOM
+      :choices: string of up to 720 characters
+
+      Image Comments (organized as up to 9 lines of 80 characters)
+
+-  .. co:: IDLVL
+      :choices: integer of up to 3 characters
+
+      Image Display Level
+
+-  .. co:: IALVL
+      :choices: integer of up to 3 characters
+
+      Image Attachment Level
+
+-  .. co:: ILOCROW
+      :choices: integer of up to 5 characters
+
+      Image Location Row
+
+-  .. co:: ILOCCOL
+      :choices: integer of up to 5 characters
+
+      Image Location Column
+
+
 JPEG2000 compression (write support)
 ------------------------------------
 
@@ -329,7 +636,9 @@ the JPEG2000 capable driver to use.
   :co:`drivers/raster/jp2openjpeg QUALITY`,
   :co:`drivers/raster/jp2openjpeg BLOCKXSIZE`
   and
-  :co:`drivers/raster/jp2openjpeg BLOCKYSIZE` JP2OpenJPEG-specific creation options can be
+  :co:`drivers/raster/jp2openjpeg BLOCKYSIZE`,
+  :co:`drivers/raster/jp2ecw TARGET` (target size reduction as a
+  percentage of the original) JP2OpenJPEG-specific creation options can be
   used. By default BLOCKXSIZE=BLOCKYSIZE=1024 will be used.
 
   Starting with GDAL 3.4.0 and OpenJPEG 2.5, the
diff --git a/doc/source/drivers/raster/nitf_advanced.rst b/doc/source/drivers/raster/nitf_advanced.rst
index 219f615eb723..1420b704f865 100644
--- a/doc/source/drivers/raster/nitf_advanced.rst
+++ b/doc/source/drivers/raster/nitf_advanced.rst
@@ -10,6 +10,8 @@ a number of advanced, and somewhat esoteric options not suitable for the
 information is collected here, and is primarily aimed at developers and
 advanced users.
 
+.. _raster.nitf_advanced_cgm:
+
 CGM Segments
 ------------
 
@@ -81,6 +83,8 @@ access to "NITF_IM:0:multi_image_jpeg_2.0.ntf". To open the others use
 the corresponding subdataset names. The Subdataset mechanism is generic
 GDAL concept discussed in the :ref:`raster_data_model` document.
 
+.. _raster.nitf_advanced_text:
+
 Text Segments
 -------------
 
@@ -303,6 +307,8 @@ metadata in base64 encoded format. Something like:
 Note that the ascii encoded numeric values prefixing the base64 encoded
 header is the length (decoded) in bytes, followed by one space.
 
+.. _raster.nitf_advanced_write_multiple_image_segments:
+
 Writing multiple Image Segments
 -------------------------------
 
diff --git a/doc/source/drivers/raster/ogcapi.rst b/doc/source/drivers/raster/ogcapi.rst
index e1feb51f4e39..bee04ec1c5bd 100644
--- a/doc/source/drivers/raster/ogcapi.rst
+++ b/doc/source/drivers/raster/ogcapi.rst
@@ -51,6 +51,11 @@ The driver supports opening by:
 - passing a string "OGCAPI:{url}" where {url} is the URL to a OGC API landing page
   In that case the driver will return subdatasets with the different collections.
 
+  Starting with GDAL 3.10, specifying the ``-if OGCAPI`` option to command line utilities
+  accepting it, or ``OGCAPI`` as the only value of the ``papszAllowedDrivers`` of
+  :cpp:func:`GDALOpenEx`, also forces the driver to recognize the passed
+  URL,  without the ``OGCAPI:`` prefix.
+
 - passing a string "OGCAPI:{url}" where {url} is the URL to a OGC API collection description
 
 
diff --git a/doc/source/drivers/raster/pdf.rst b/doc/source/drivers/raster/pdf.rst
index e1642071be51..92a53c35bfd3 100644
--- a/doc/source/drivers/raster/pdf.rst
+++ b/doc/source/drivers/raster/pdf.rst
@@ -193,7 +193,7 @@ at the first access to a raster block, the whole page will be rasterized
 (with Poppler), which can be a slow operation.
 
 Note: some raster-only PDF files (such as some
-USGS GeoPDF files), that are regularly tiled are exposed as tiled
+USGS PDF files), that are regularly tiled are exposed as tiled
 dataset by the GDAL PDF driver, and can be rendered with any backends.
 
 Only a few of the possible Datums available in the OGC best practice
@@ -558,7 +558,7 @@ datatype = GDT_Unknown and :co:`COMPOSITION_FILE` must be the single creation
 option.
 
 The XML schema against which the composition file must validate is
-`pdfcomposition.xsd <https://raw.githubusercontent.com/OSGeo/gdal/master/data/pdfcomposition.xsd>`__
+`pdfcomposition.xsd <https://raw.githubusercontent.com/OSGeo/gdal/master/frmts/pdf/data/pdfcomposition.xsd>`__
 
 Example on how to use the API:
 
@@ -728,8 +728,14 @@ Only GDAL builds against static builds of PDFium have been tested.
 Building PDFium can be challenging, and particular builds must be used to
 work properly with GDAL.
 
-With GDAL >= 3.9
-++++++++++++++++
+With GDAL >= 3.10
++++++++++++++++++
+
+The scripts in the `<https://github.com/rouault/pdfium_build_gdal_3_10>`__
+repository must be used to build a patched version of PDFium.
+
+With GDAL = 3.9
++++++++++++++++
 
 The scripts in the `<https://github.com/rouault/pdfium_build_gdal_3_9>`__
 repository must be used to build a patched version of PDFium.
@@ -803,7 +809,7 @@ See also
 
 Specifications :
 
--  `OGC GeoPDF Encoding Best Practice Version 2.2
+-  `OGC PDF Georegistration Encoding Best Practice Version 2.2
    (08-139r3) <http://portal.opengeospatial.org/files/?artifact_id=40537>`__
 -  `Adobe Supplement to ISO
    32000 <http://www.adobe.com/devnet/acrobat/pdfs/adobe_supplement_iso32000.pdf>`__
diff --git a/doc/source/drivers/raster/pds4.rst b/doc/source/drivers/raster/pds4.rst
index d584853f04a8..0dd5add475e9 100644
--- a/doc/source/drivers/raster/pds4.rst
+++ b/doc/source/drivers/raster/pds4.rst
@@ -194,10 +194,7 @@ The following dataset creation options are available:
           and not creating from an existing PDS4 file, the
           data/pds4_template.xml file will be used. For GDAL utilities to
           find this default PDS4 template, GDAL's data directory should be
-          defined in your environment (typically on Windows builds). Consult
-          the
-          `wiki <https://trac.osgeo.org/gdal/wiki/FAQInstallationAndBuilding#HowtosetGDAL_DATAvariable>`__
-          for more information.
+          defined in your environment (typically on Windows builds).
 
    -  .. co:: LATITUDE_TYPE
          :choices: Planetocentric, Planetographic
@@ -537,12 +534,6 @@ Converting a shapefile to a PDS4 dataset with a CSV-delimited table
 
    $ ogr2ogr my_out_pds4.xml in.shp
 
-Limitations
------------
-
-As a new driver and new format, please report any issues to the bug
-tracker, as explained on the `wiki <https://trac.osgeo.org/gdal/wiki>`__
-
 See Also:
 ---------
 
diff --git a/doc/source/drivers/raster/png.rst b/doc/source/drivers/raster/png.rst
index 6541209cb2f4..a8a74ce8a9d6 100644
--- a/doc/source/drivers/raster/png.rst
+++ b/doc/source/drivers/raster/png.rst
@@ -74,8 +74,8 @@ The following creation options are available:
       :default: NO
 
       Force the generation of an associated ESRI world
-      file (with the extension .wld). See `World File <#WLD>`__ section for
-      details.
+      file (with the extension .wld). See :ref:`World Files <raster.wld>`
+      section for details.
 
 -  .. co:: ZLEVEL=n
       :choices: [1-9]
diff --git a/doc/source/drivers/raster/postgisraster.rst b/doc/source/drivers/raster/postgisraster.rst
index 3927e23e5738..55266b389f32 100644
--- a/doc/source/drivers/raster/postgisraster.rst
+++ b/doc/source/drivers/raster/postgisraster.rst
@@ -130,6 +130,6 @@ See Also
 --------
 
 -  `GDAL PostGISRaster driver
-   Wiki <https://trac.osgeo.org/gdal/wiki/frmts_wtkraster.html>`__
+   Wiki <http://web.archive.org/web/20240812045916/https://trac.osgeo.org/gdal/wiki/frmts_wtkraster.html>`__
 -  `PostGIS Raster
    documentation <https://postgis.net/docs/RT_reference.html>`__
diff --git a/doc/source/drivers/raster/s102.rst b/doc/source/drivers/raster/s102.rst
index 85ccbd6e397c..3245d29f31ed 100644
--- a/doc/source/drivers/raster/s102.rst
+++ b/doc/source/drivers/raster/s102.rst
@@ -11,7 +11,7 @@ S102 -- S-102 Bathymetric Surface Product
 .. versionadded:: 3.8
 
 This driver provides read-only support for bathymetry data in the S-102 format,
-which is a specific product profile in an HDF5 file
+which is a specific product profile in an HDF5 file.
 
 S-102 files have two image bands representing depth (band 1),
 uncertainty (band 2) values for each cell in a raster grid area.
@@ -25,6 +25,11 @@ Georeferencing is reported.
 
 Nodata, minimum and maximum values for each band are also reported.
 
+Supported versions of the specification are S-102 v2.1, v2.2 and v3.0
+(support for v3.0 spatial metadata added in GDAL 3.10. Multiple grids per
+file, as permitted by S-102 v3.0, are not supported currently. Only the
+first one will be reported.)
+
 Driver capabilities
 -------------------
 
@@ -63,12 +68,16 @@ The following open options are supported:
 Spatial metadata support
 ------------------------
 
-Starting with GDAL 3.9, GDAL can handle QualityOfSurvey spatial metadata.
+Starting with GDAL 3.9, GDAL can handle QualityOfSurvey
+(or QualityOfBathymetryCoverage in S102 v3.0) spatial metadata.
 
 When such spatial metadata is present, the subdataset list will include
-a name of the form ``S102:"{filename}":QualityOfSurvey``
+a name of the form ``S102:"{filename}":QualityOfSurvey`` (
+or ``S102:"{filename}":QualityOfBathymetryCoverage`` in S102 v3.0)
 
-The ``/QualityOfSurvey/featureAttributeTable`` dataset is exposed as a
+The ``/QualityOfSurvey/featureAttributeTable``
+(``/QualityOfBathymetryCoverage/featureAttributeTable`` in S102 v3.0)
+dataset is exposed as a
 GDAL Raster Attribute Table associated to the GDAL raster band. The pixel
 values of the raster match the ``id`` column of the Raster Attribute Table.
 
diff --git a/doc/source/drivers/raster/safe.rst b/doc/source/drivers/raster/safe.rst
index 8c9b9f2ed91b..1cde8c865389 100644
--- a/doc/source/drivers/raster/safe.rst
+++ b/doc/source/drivers/raster/safe.rst
@@ -43,7 +43,7 @@ If the product contains multiple measurements (for example multiple
 polarizations), each one is available as a raster band - if the swath is
 the same. When the swath is the same, the geographic area is the same.
 
-If the product contains multiple swaths and multiple polatizations, the
+If the product contains multiple swaths and multiple polarizations, the
 driver shows the first swath by default. To access other swaths, the
 user must select a specific subdataset.
 
diff --git a/doc/source/drivers/raster/snap_tiff.rst b/doc/source/drivers/raster/snap_tiff.rst
new file mode 100644
index 000000000000..31ea7604c67c
--- /dev/null
+++ b/doc/source/drivers/raster/snap_tiff.rst
@@ -0,0 +1,39 @@
+.. _raster.snap_tiff:
+
+================================================================================
+SNAP_TIFF -- Sentinel Application Processing GeoTIFF
+================================================================================
+
+.. versionadded:: 3.10
+
+.. shortname:: SNAP_TIFF
+
+.. built_in_by_default::
+
+This driver deals specifically with GeoTIFF files produced by the
+Sentinel Application Processing (SNAP) toolbox.
+
+Such files are formulated in a way that makes it difficult to read them with the
+generic :ref:`raster.gtiff` driver.
+
+Driver capabilities
+-------------------
+
+.. supports_georeferencing::
+
+.. supports_virtualio::
+
+Georeferencing
+--------------
+
+SNAP GeoTIFF files contain a geolocation array (stored as a regular grid of
+GeoTIFF tie points). It is reported in the ``GEOLOCATION`` metadata domain.
+
+The 4 corners of the geolocation array are also reported as ground control points
+for faster (but less accurate) georeferencing.
+
+Metadata
+--------
+
+Extensive metadata following DIMAP conventions is reported in the ``xml:DIMAP``
+metadata domain.
diff --git a/doc/source/drivers/raster/srtmhgt.rst b/doc/source/drivers/raster/srtmhgt.rst
index 54077188a3d3..38fcacda8a36 100644
--- a/doc/source/drivers/raster/srtmhgt.rst
+++ b/doc/source/drivers/raster/srtmhgt.rst
@@ -21,6 +21,9 @@ The driver does support creating new files, but the input data must be
 exactly formatted as a SRTM-3 or SRTM-1 cell. That is the size, and
 bounds must be appropriate for a cell.
 
+Starting with GDAL 3.10, the driver also supports reading and writing 0.5
+degree resolution SRTM HGT files.
+
 See Also:
 
 -  `SRTM
diff --git a/doc/source/drivers/raster/stacit.rst b/doc/source/drivers/raster/stacit.rst
index 0c1e0d012e76..86ebb77f7f91 100644
--- a/doc/source/drivers/raster/stacit.rst
+++ b/doc/source/drivers/raster/stacit.rst
@@ -33,6 +33,11 @@ STACIT datasets/subdatasets can be accessed with one of the following syntaxes:
 
 * ``STACIT:"filename.json":collection=my_collect,asset=my_asset,crs=my_crs``: specify a collection, asset, and limit to items in a given CRS
 
+Starting with GDAL 3.10, specifying the ``-if STACIT`` option to command line utilities
+accepting it, or ``STACIT`` as the only value of the ``papszAllowedDrivers`` of
+:cpp:func:`GDALOpenEx`, also forces the driver to recognize the passed
+filename or URL.
+
 Open options
 ------------
 
diff --git a/doc/source/drivers/raster/stacta.rst b/doc/source/drivers/raster/stacta.rst
index 538d109b3755..14f466eb8131 100644
--- a/doc/source/drivers/raster/stacta.rst
+++ b/doc/source/drivers/raster/stacta.rst
@@ -47,6 +47,11 @@ STACTA datasets/subdatasets can be accessed with one of the following syntaxes:
 
 The root of the JSON file must be of type ``Feature``.
 
+Starting with GDAL 3.10, specifying the ``-if STACTA`` option to command line utilities
+accepting it, or ``STACTA`` as the only value of the ``papszAllowedDrivers`` of
+:cpp:func:`GDALOpenEx`, also forces the driver to recognize the passed
+filename or URL.
+
 Open options
 ------------
 
diff --git a/doc/source/drivers/raster/tiledb.rst b/doc/source/drivers/raster/tiledb.rst
index c8924903105f..c3cfd4e8a2eb 100644
--- a/doc/source/drivers/raster/tiledb.rst
+++ b/doc/source/drivers/raster/tiledb.rst
@@ -185,6 +185,31 @@ The following array creation options are available:
 Cf :source_file:`autotest/gdrivers/tiledb_multidim.py` for examples of how to
 use the Python multidimensional API with the TileDB driver.
 
+Standalone plugin compilation
+-----------------------------
+
+.. versionadded:: 3.10
+
+While this driver may be built as part of a whole GDAL build, either in libgdal
+itself, or as a plugin, it is also possible to only build this driver as a plugin,
+against an already built libgdal.
+
+The version of the GDAL sources used to build the driver must match the version
+of the libgdal it is built against.
+
+For example, from a "build_tiledb" directory under the root of the GDAL source tree:
+
+::
+
+    cmake -S ../frmts/tiledb -DCMAKE_PREFIX_PATH=/path/to/GDAL_installation_prefix -DTileDB_DIR:PATH=/path/to/tiledb_installation_prefix/lib/cmake/TileDB
+    cmake --build .
+
+
+Note that such a plugin, when used against a libgdal not aware of it, will be
+systematically loaded at GDAL driver initialization time, and will not benefit from
+`deferred plugin loading capabilities <rfc-96>`. For that, libgdal itself must be built with the
+CMake variable GDAL_REGISTER_DRIVER_TILEDB_FOR_LATER_PLUGIN=ON set.
+
 See Also
 --------
 
diff --git a/doc/source/drivers/raster/vicar.rst b/doc/source/drivers/raster/vicar.rst
index 7fb023a7ed17..30997485a4bc 100644
--- a/doc/source/drivers/raster/vicar.rst
+++ b/doc/source/drivers/raster/vicar.rst
@@ -13,6 +13,11 @@ VICAR -- VICAR
     :ref:`PDS <raster.pds>` driver in that situation. Starting with GDAL 3.1, if
     the :config:`GDAL_TRY_PDS3_WITH_VICAR` configuration option is
     set to YES, the dataset will be opened by the VICAR driver.
+    Alternatively, starting with GDAL 3.10, specifying the ``-if VICAR`` option
+    to command line utilities accepting it, or ``VICAR`` as the only value of
+    the ``papszAllowedDrivers`` of :cpp:func:`GDALOpenEx`, also forces the
+    driver to recognize the passed filename.
+
 
 Driver capabilities
 -------------------
diff --git a/doc/source/drivers/raster/vrt.rst b/doc/source/drivers/raster/vrt.rst
index 6c4c937e2399..f22932bf3ad2 100644
--- a/doc/source/drivers/raster/vrt.rst
+++ b/doc/source/drivers/raster/vrt.rst
@@ -424,8 +424,9 @@ the following form:
 
 The intermediary values are calculated using a linear interpolation
 between the bounding destination values of the corresponding range.
-Source values should be monotonically non-decreasing. Clamping is performed for
-input pixel values outside of the range specified by the LUT. That is, if an
+Source values should be listed in a monotonically non-decreasing order.
+If there is a Not-A-Number (NaN) source value, it should be the first one.
+Clamping is performed for input pixel values outside of the range specified by the LUT. That is, if an
 input pixel value is lower than the minimum source value, then the destination
 value corresponding to that minimum source value is used as the output pixel value.
 And similarly for an input pixel value that is greater than the maximum source value.
@@ -1361,7 +1362,7 @@ set to VRTDerivedRasterBand) are :
 
 - **PixelFunctionCode** (required if PixelFunctionType is of the form "function_name", ignored otherwise). The in-lined code of a Python module, that must be at least have a function whose name is given by PixelFunctionType.
 
-- **BufferRadius** (optional, defaults to 0): Amount of extra pixels, with respect to the original RasterIO() request to satisfy, that are fetched at the left, right, bottom and top of the input and output buffers passed to the pixel function. Note that the values of the output buffer in this buffer zone willbe ignored.
+- **BufferRadius** (optional, defaults to 0): Amount of extra pixels, with respect to the original RasterIO() request to satisfy, that are fetched at the left, right, bottom and top of the input and output buffers passed to the pixel function. Note that the values of the output buffer in this buffer zone will be ignored.
 
 - **SkipNonContributingSources** (optional, added in GDAL 3.7, defaults to false) = true/false: Whether sources that do not intersect the VRTRasterBand RasterIO() requested region should be omitted. By default, data for all sources, including ones that do not intersect it, are passed to the pixel function. By setting this parameter to false, only sources that intersect the requested region will be passed.
 
@@ -1534,6 +1535,8 @@ contrary to the Python interactive interpreter, the current path is not
 automatically added when used from GDAL. So you may need to define the
 **PYTHONPATH** environment variable if you get ModuleNotFoundError exceptions.
 
+.. _raster_vrt_security_implications:
+
 Security implications
 *********************
 
@@ -2096,6 +2099,38 @@ multi-threading if the sources are not overlapping and belong to different
 datasets. This can be enabled by setting the :config:`GDAL_NUM_THREADS`
 configuration option to an integer or ``ALL_CPUS``.
 
+Starting with GDAL 3.10, the :oo:`NUM_THREADS` open option can
+be set to control specifically the multi-threading of VRT datasets.
+It defaults to ``ALL_CPUS``, and when set, overrides :config:`GDAL_NUM_THREADS`
+or :config:`VRT_NUM_THREADS`. It applies to
+ComputeStatistics() and band-level and dataset-level RasterIO().
+For band-level RasterIO(), multi-threading is only available if more than 1
+million pixels are requested and if the VRT is made of only non-overlapping
+SimpleSource or ComplexSource belonging to different datasets.
+For dataset-level RasterIO(), multi-threading is only available if more than 1
+million pixels are requested and if the VRT is made of only non-overlapping
+SimpleSource belonging to different datasets.
+
+-  .. oo:: NUM_THREADS
+      :choices: integer, ALL_CPUS
+      :default: ALL_CPUS
+
+      Determines the number of threads used when an operation reads from
+      multiple sources.
+
+This can also be specified globally with the :config:`VRT_NUM_THREADS`
+configuration option.
+
+-  .. config:: VRT_NUM_THREADS
+      :choices: integer, ALL_CPUS
+      :default: ALL_CPUS
+
+      Determines the number of threads used when an operation reads from
+      multiple sources.
+
+Note that the number of threads actually used is also limited by the
+:config:`GDAL_MAX_DATASET_POOL_SIZE` configuration option.
+
 Multi-threading issues
 ----------------------
 
diff --git a/doc/source/drivers/raster/vrt_multidimensional.rst b/doc/source/drivers/raster/vrt_multidimensional.rst
index 1e4fa912a744..0392b73c35c7 100644
--- a/doc/source/drivers/raster/vrt_multidimensional.rst
+++ b/doc/source/drivers/raster/vrt_multidimensional.rst
@@ -36,7 +36,7 @@ Here's an example of such a file:
 .vrt Format
 -----------
 
-A `XML schema of the GDAL VRT format <https://raw.githubusercontent.com/OSGeo/gdal/master/data/gdalvrt.xsd>`_
+A `XML schema of the GDAL VRT format <https://raw.githubusercontent.com/OSGeo/gdal/master/frmts/vrt/data/gdalvrt.xsd>`_
 is available.
 
 Virtual files stored on disk are kept in an XML format with the following
diff --git a/doc/source/drivers/raster/wms.rst b/doc/source/drivers/raster/wms.rst
index a16f08fa588b..038653818b99 100644
--- a/doc/source/drivers/raster/wms.rst
+++ b/doc/source/drivers/raster/wms.rst
@@ -313,48 +313,13 @@ IIP:http://foo.com/FIF=image_name out.xml -of WMS"
 Caching
 -------
 
-Caching of remote pixel data is possible by setting a <Cache> element in the
-WMS configuration file.
-
-Before GDAL 3.9, if the <Path> sub-element of <Cache> was not specified, the
-directory of the cache was ``./gdalwmscache`` (that is to say a ``gdalwmscache``
-subdiretory of the current directory), unless the :config:`GDAL_DEFAULT_WMS_CACHE_PATH`
-configuration option is specified.
-
-Starting with GDAL 3.9, the directory of the cache is set according to the
-following logic (first listed criterion is prioritary over following ones):
-
-- Value of the <Path> sub-element of <Cache>, if specified.
-
-- ``${GDAL_DEFAULT_WMS_CACHE_PATH}`` if :config:`GDAL_DEFAULT_WMS_CACHE_PATH` is set.
-
-- ``${XDG_CACHE_HOME}/gdalwmscache`` if the ``XDG_CACHE_HOME`` configuration option is set.
-
-- On Unix, ``${HOME}/.cache/gdalwmscache`` if the ``HOME`` configuration option is set.
-
-- On Windows, ``${USERPROFILE}/.cache/gdalwmscache`` if the ``USERPROFILE`` configuration option is set.
-
-- ``${CPL_TMPDIR}/gdalwmscache_${USER}`` if :config:`CPL_TMPDIR` and ``USER`` configuration options are set.
-
-   If ``CPL_TMPDIR`` is not set, then ``TMPDIR`` is used, or ``TEMP``
-
-   If ``USER`` is not set, ``USERNAME`` is used if set.
-   If neither ``USERNAME`` or ``USER`` are set, the md5sum of the filename of the configuration file is used)
-
-- ``./gdalwmscache_{md5sum(filename)}`` if none of the above mentioned configuration options are set.
-
-Note that if the <Unique> element is set to true (which is its default value),
-a subdirectory whose name is the md5sum of the filename of the configuration file
-is appended to the caching directory.
-
-The actual caching directory can be got by querying the ``CACHE_PATH`` metadata
-item on the dataset.
+.. include:: wms_wmts_cache.rst
 
 Configuration options
 ---------------------
 
-The following :ref:`configuration options <configoptions>` are
-available:
+|about-config-options|
+The following configuration options are available:
 
 - .. config:: GDAL_MAX_CONNECTIONS
      :choices: <integer>
@@ -374,7 +339,7 @@ available:
 - .. config:: GDAL_DEFAULT_WMS_CACHE_PATH
      :choices: <string>
 
-     Sets the WMS cache path is the <Cache> element is included in the WMS
+     Sets the WMS/WMTS cache path is the <Cache> element is included in the WMS/WMTS
      configuration file without a <Path> element.
 
 
@@ -475,6 +440,11 @@ The WMS driver can open :
    A list of subdatasets will be returned, resulting from the parsing of
    the GetCapabilities request on that server.
 
+   Starting with GDAL 3.10, specifying the ``-if WMS`` option to command line utilities
+   accepting it, or ``WMS`` as the only value of the ``papszAllowedDrivers`` of
+   :cpp:func:`GDALOpenEx`, also forces the driver to recognize the passed
+   URL,  without the ``WMS:`` prefix.
+
 -  a pseudo GetMap request, such as the subdataset name
    returned by the previous syntax :
 
diff --git a/doc/source/drivers/raster/wms_wmts_cache.rst b/doc/source/drivers/raster/wms_wmts_cache.rst
new file mode 100644
index 000000000000..c0ca78086d22
--- /dev/null
+++ b/doc/source/drivers/raster/wms_wmts_cache.rst
@@ -0,0 +1,36 @@
+Caching of remote pixel data is possible by setting a <Cache> element in the
+WMS (or WMTS) configuration file.
+
+Before GDAL 3.9, if the <Path> sub-element of <Cache> was not specified, the
+directory of the cache was ``./gdalwmscache`` (that is to say a ``gdalwmscache``
+subdirectory of the current directory), unless the :config:`GDAL_DEFAULT_WMS_CACHE_PATH`
+configuration option is specified.
+
+Starting with GDAL 3.9, the directory of the cache is set according to the
+following logic (first listed criterion is prioritary over following ones):
+
+- Value of the <Path> sub-element of <Cache>, if specified.
+
+- ``${GDAL_DEFAULT_WMS_CACHE_PATH}`` if :config:`GDAL_DEFAULT_WMS_CACHE_PATH` is set.
+
+- ``${XDG_CACHE_HOME}/gdalwmscache`` if the ``XDG_CACHE_HOME`` configuration option is set.
+
+- On Unix, ``${HOME}/.cache/gdalwmscache`` if the ``HOME`` configuration option is set.
+
+- On Windows, ``${USERPROFILE}/.cache/gdalwmscache`` if the ``USERPROFILE`` configuration option is set.
+
+- ``${CPL_TMPDIR}/gdalwmscache_${USER}`` if :config:`CPL_TMPDIR` and ``USER`` configuration options are set.
+
+   If ``CPL_TMPDIR`` is not set, then ``TMPDIR`` is used, or ``TEMP``
+
+   If ``USER`` is not set, ``USERNAME`` is used if set.
+   If neither ``USERNAME`` or ``USER`` are set, the md5sum of the filename of the configuration file is used)
+
+- ``./gdalwmscache_{md5sum(filename)}`` if none of the above mentioned configuration options are set.
+
+Note that if the <Unique> element is set to true (which is its default value),
+a subdirectory whose name is the md5sum of the filename of the configuration file
+is appended to the caching directory.
+
+The actual caching directory can be got by querying the ``CACHE_PATH`` metadata
+item on the dataset.
diff --git a/doc/source/drivers/raster/wmts.rst b/doc/source/drivers/raster/wmts.rst
index 5159d9d618a8..2dcb845831f6 100644
--- a/doc/source/drivers/raster/wmts.rst
+++ b/doc/source/drivers/raster/wmts.rst
@@ -77,6 +77,12 @@ layer has more than one style or a tile matrix set, a list of
 subdatasets will be returned. If there is only one layer, it will be
 opened on the default style and the first tile matrix set listed.
 
+Starting with GDAL 3.10, specifying the ``-if WMTS`` option to command line utilities
+accepting it, or ``WMTS`` as the only value of the ``papszAllowedDrivers`` of
+:cpp:func:`GDALOpenEx`, also forces the driver to recognize the passed
+filename/URL, when it is not using subdataset syntax (it can typically be used to
+force open a HDF5 file that would be nominally recognized by the HDF5 driver).
+
 Open options
 ------------
 
@@ -459,6 +465,23 @@ generates the following file:
 The generated file will come with default values that you may need to
 edit.
 
+Caching
+-------
+
+.. include:: wms_wmts_cache.rst
+
+Configuration options
+---------------------
+
+|about-config-options|
+The following configuration options are available:
+
+- :copy-config:`GDAL_MAX_CONNECTIONS`
+
+- :copy-config:`GDAL_ENABLE_WMS_CACHE`
+
+- :copy-config:`GDAL_DEFAULT_WMS_CACHE_PATH`
+
 See Also
 --------
 
diff --git a/doc/source/drivers/raster/xyz.rst b/doc/source/drivers/raster/xyz.rst
index 66c0d7d4c45d..d0cd7664432e 100644
--- a/doc/source/drivers/raster/xyz.rst
+++ b/doc/source/drivers/raster/xyz.rst
@@ -39,16 +39,33 @@ The driver tries to autodetect an header line and will look for 'x',
 'north' for the Y column and 'z', 'alt' or 'height' for the Z column. If
 no header is present or one of the column could not be identified in the
 header, the X, Y and Z columns (in that order) are assumed to be the
-first 3 columns of each line.
+first 3 columns of each line. The open option :oo:`COLUMN_ORDER` overrides
+these assumptions (except on 'AUTO').
 
 The opening of a big dataset can be slow as the driver must scan the
 whole file to determine the dataset size and spatial resolution. The
 driver will autodetect the data type among Byte, Int16, Int32 or
 Float32.
 
+Open options
+------------
+
+|about-open-options|
+This driver supports the following open options:
+
+-  .. oo:: COLUMN_ORDER
+     :choices: AUTO, XYZ, YXZ
+     :since: 3.10
+     :default: AUTO
+
+     Specifies the order of the columns. It overrides the header.
+
 Creation options
 ----------------
 
+|about-creation-options|
+This driver supports the following creation options:
+
 -  .. co:: COLUMN_SEPARATOR
       :choices: <string>
 
diff --git a/doc/source/drivers/raster/zarr.rst b/doc/source/drivers/raster/zarr.rst
index 58faf76229b5..9f636a6813cb 100644
--- a/doc/source/drivers/raster/zarr.rst
+++ b/doc/source/drivers/raster/zarr.rst
@@ -504,7 +504,10 @@ The following options are creation options of the classic raster API only:
 
       When writing a multi-band dataset as a 3D Zarr array, whether the band
       dimension should be the first one/slowest varying one (BAND), or the
-      last one/fastest varying one (INTERLEAVE)
+      last one/fastest varying one (PIXEL)
+      The default value is BAND in Create() mode. In CreateCopy() mode, the
+      default value is the value of the INTERLEAVE metadata item of the
+      IMAGE_STRUCTURE metadata domain of the source dataset, if set.
 
 
 Examples
diff --git a/doc/source/drivers/vector/amigocloud.rst b/doc/source/drivers/vector/amigocloud.rst
index 4b3bb665668a..b407169a25c3 100644
--- a/doc/source/drivers/vector/amigocloud.rst
+++ b/doc/source/drivers/vector/amigocloud.rst
@@ -42,7 +42,7 @@ Currently the following one is supported :
 
 If several parameters are specified, they must be separated by a space.
 
-If no datset_id is provided, the driver will print list of available
+If no dataset_id is provided, the driver will print list of available
 datasets for given project.
 
 For example: **"AmigoCloud:1234 datasets"**
diff --git a/doc/source/drivers/vector/arrow.rst b/doc/source/drivers/vector/arrow.rst
index 76448ac060db..1d4bc48a73a1 100644
--- a/doc/source/drivers/vector/arrow.rst
+++ b/doc/source/drivers/vector/arrow.rst
@@ -30,6 +30,10 @@ The driver supports the 2 variants of the format:
   and the metadata section is large.
   Prefixing the filename with ``ARROW_IPC_STREAM:`` (e.g "ARROW_IPC_STREAM:/vsistdin/")
   will cause the driver to unconditionally open the file as a streaming IPC format.
+  Alternatively, starting with GDAL 3.10, specifying the ``-if ARROW`` option to
+  command line utilities accepting it, or ``ARROW`` as the only value of the
+  ``papszAllowedDrivers`` of :cpp:func:`GDALOpenEx`, also forces the driver to
+  recognize the passed filename.
 
 
 This driver also supports geometry columns using the GeoArrow specification.
@@ -112,6 +116,50 @@ The driver can be installed as a plugin for the ``libgdal`` conda-forge package
 
     conda install -c conda-forge libgdal-arrow-parquet
 
+Standalone plugin compilation
+-----------------------------
+
+.. versionadded:: 3.10
+
+While this driver may be built as part of a whole GDAL build, either in libgdal
+itself, or as a plugin, it is also possible to only build this driver as a plugin,
+against an already built libgdal.
+
+The version of the GDAL sources used to build the driver must match the version
+of the libgdal it is built against.
+
+For example, from a "build_arrow" directory under the root of the GDAL source tree:
+
+::
+
+    cmake -S ../ogr/ogrsf_frmts/parquet -DCMAKE_PREFIX_PATH=/path/to/GDAL_installation_prefix -DArrow_DIR=/path/to/lib/cmake/Arrow
+    cmake --build .
+
+
+Note that such a plugin, when used against a libgdal not aware of it, will be
+systematically loaded at GDAL driver initialization time, and will not benefit from
+`deferred plugin loading capabilities <rfc-96>`. For that, libgdal itself must be built with the
+CMake variable OGR_REGISTER_DRIVER_ARROW_FOR_LATER_PLUGIN=ON set.
+
+Arrow VSI file system
+---------------------
+
+.. versionadded:: 3.10
+
+Starting with GDAL 3.10 and Arrow 16.0, any GDAL Virtual File System can be
+used (in a read-only context) wherever the Arrow C++ library expects a URI, in
+particular outside of the context of the OGR Arrow driver, by:
+
+- loading the libgdal.so/dll library (or the ogr_Arrow.so/dll plugin library if
+  the Arrow driver is built as a library) with the arrow::fs::LoadFileSystemFactories()
+  function (cf `Defining new filesystems <https://arrow.apache.org/docs/cpp/io.html#defining-new-filesystems>`__)
+  Note: if the Arrow driver is fully loaded, e.g. by querying
+  GetGDALDriverManager()->GetDriverByName("ARROW")->GetMetadata(), the Arrow VSI
+  file system will be also registered.
+
+- Prefixing any GDAL file name with the ``gdalvsi://`` URI scheme prefix. In addition
+  to any potential vsi prefix in the GDAL file name. So the ``/vsicurl/http://example.com``
+  GDAL file name becomes the ``gdalvsi:///vsicurl/http://example.com`` Arrow URI.
 
 Links
 -----
diff --git a/doc/source/drivers/vector/csv.rst b/doc/source/drivers/vector/csv.rst
index 9fdea08e0451..f3e20f391f5b 100644
--- a/doc/source/drivers/vector/csv.rst
+++ b/doc/source/drivers/vector/csv.rst
@@ -25,6 +25,11 @@ For files structured as CSV, but not ending
 with the ".csv" extension, the 'CSV:' prefix can be added before the filename
 to force loading by the CSV driver.
 
+Starting with GDAL 3.10, specifying the ``-if CSV`` option to command line utilities
+accepting it, or ``CSV`` as the only value of the ``papszAllowedDrivers`` of
+:cpp:func:`GDALOpenEx`, also forces the driver to recognize the passed
+filename, without the ``CSV:`` prefix.
+
 The OGR CSV driver supports reading and writing. Because the CSV format
 has variable length text lines, reading is done sequentially. Reading
 features in random order will generally be very slow. OGR CSV layer
@@ -79,7 +84,7 @@ per line must be present. Lines may be terminated by a DOS (CR/LF) or
 Unix (LF) style line terminators. Each record should have the same
 number of fields. The driver will also accept a semicolon, a tabulation,
 a pipe, or a space character as field separator.
-Starting with GDAL 3.8, the autodection will select the separator with the
+Starting with GDAL 3.8, the autodetection will select the separator with the
 most occurrences if there are several candidates  on the first line of the CSV
 file (and warn about that). The :oo:`SEPARATOR` open option may also be set to
 define the desired separator.
@@ -497,7 +502,7 @@ The following configuration options are available:
       Number of decimals for coordinate
       values. A heuristic is used to remove insignificant
       trailing 00000x or 99999x that can appear when formatting decimal
-      numbers.
+      numbers. Examples: 6 gives 120.864, 24.1818; 2 gives 1.2E+02, 24.0.
 
 -  .. config:: OGR_WKT_ROUND
       :choices: YES, NO
@@ -524,7 +529,8 @@ Examples
 
    ::
 
-      ogr2ogr -f CSV -dialect sqlite -sql "select AsGeoJSON(geometry) AS geom, * from input" output.csv input.shp
+      ogr2ogr -f CSV output.csv input.shp -dialect sqlite -sql \
+          "select AsGeoJSON(geometry) AS geom, * from input"
 
 - Convert a CSV into a GeoPackage. Specify the names of the coordinate columns and assign a coordinate reference system.
 
@@ -537,6 +543,21 @@ Examples
        -oo Y_POSSIBLE_NAMES=latitude \
        -a_srs 'EPSG:4326'
 
+-  Use `ogr2ogr -segmentize` to densify a input geometry being specified in the ``WKT`` special field. Note that one needs to specify the GEOMETRY=AS_WKT layer creation option, otherwise the input geometry would be returned unmodified:
+
+   ::
+
+    $ cat input.csv
+    WKT,ID,Name
+    "LINESTRING (-900 -1450,-900 100)",0,900W
+    
+    $ ogr2ogr -segmentize 400 -lco GEOMETRY=AS_WKT \
+      -sql "SELECT ID, Name FROM input" output.csv input.csv
+
+    $ cat output.csv
+    WKT,ID,Name
+    "LINESTRING (-900 -1450,-900 -1062.5,-900 -675,-900 -287.5,-900 100)","0",900W
+
 
 Particular datasources
 ----------------------
diff --git a/doc/source/drivers/vector/dgn.rst b/doc/source/drivers/vector/dgn.rst
index cfc920916ca1..877855117037 100644
--- a/doc/source/drivers/vector/dgn.rst
+++ b/doc/source/drivers/vector/dgn.rst
@@ -122,6 +122,25 @@ Creation Issues
 -  DGN files can only have one layer. Attempts to create more than one
    layer in a DGN file will fail.
 
+Open options
+------------
+
+.. versionadded:: 3.10
+
+|about-open-options|
+The following open options are supported:
+
+- .. oo:: ENCODING
+     :since: 3.10
+     :choices: <encoding>
+
+     An encoding name supported by :cpp:func:`CPLRecode` (i.e. an
+     `iconv <https://en.wikipedia.org/wiki/Iconv>`__ name)
+     that indicates the encoding used by Text elements in the DGN file, to
+     recode them to UTF-8. If not specified (or specified to UTF-8), no
+     recoding will be done.
+
+
 Dataset creation options
 ------------------------
 
@@ -180,6 +199,20 @@ The following dataset-creation options are supported:
       Override the origin of the design plane. By
       default the origin from the seed file is used.
 
+-  .. dsco:: ENCODING
+      :since: 3.10
+      :choices: <encoding>
+
+      An encoding name supported by :cpp:func:`CPLRecode` (i.e. an
+      `iconv <https://en.wikipedia.org/wiki/Iconv>`__ name)
+      that indicates the encoding used by Text elements in the DGN file, to
+      recode them from UTF-8. If not specified (or specified to UTF-8), no
+      recoding will be done. "ISO-8859-1" (ISO Latin1) is supported even on
+      builds without iconv support.
+      Note that no fields in the DGN file itself contain the encoding name,
+      hence it is the responsibility of the reader to open the file with the
+      same value for the ENCODING open option.
+
 --------------
 
 -  `Dgnlib Page <http://dgnlib.maptools.org/>`__
diff --git a/doc/source/drivers/vector/dwg.rst b/doc/source/drivers/vector/dwg.rst
index 49fa440c97e1..6e7b58ec762d 100644
--- a/doc/source/drivers/vector/dwg.rst
+++ b/doc/source/drivers/vector/dwg.rst
@@ -8,7 +8,7 @@ AutoCAD DWG
 .. build_dependencies:: Open Design Alliance Teigha library
 
 OGR supports reading most versions of AutoCAD DWG when built with the
-Open Design Alliance Teigha library. DWG is an binary working format used
+Open Design Alliance Teigha library. DWG is a binary working format used
 for AutoCAD drawings. A reasonable effort has been made to make the OGR
 DWG driver work similarly to the OGR DXF driver which shares a common
 data model. The entire contents of the .dwg file is represented as a
@@ -85,6 +85,14 @@ The following configuration options are available:
      :config:`DWG_ALL_ATTRIBUTES` to TRUE value (this is the
      default value).
 
+- .. config:: DWG_CLOSED_LINE_AS_POLYGON
+     :choices: TRUE, FALSE
+     :default: FALSE
+     :since: 3.10
+
+     This option can be set to TRUE specified to ask for closed POLYLINE and
+     LWPOLYLINE to be exposed as OGR polygons.
+
 Building
 --------
 
diff --git a/doc/source/drivers/vector/dxf.rst b/doc/source/drivers/vector/dxf.rst
index 63ab76fe5b67..30b348621b34 100644
--- a/doc/source/drivers/vector/dxf.rst
+++ b/doc/source/drivers/vector/dxf.rst
@@ -34,9 +34,7 @@ fields:
    NULL otherwise.
 -  SubClasses: Where available, a list of classes to which an entity
    belongs.
--  ExtendedEntity (GDAL <= 2.2.x): The values of extended entity
-   attributes all appended to form a single text field, where available.
--  RawCodeValues (GDAL >= 2.3.0): A string list
+-  RawCodeValues: A string list
    containing all group codes and values that are not handled by the DXF
    reader. Only available when the configuration
    option :config:`DXF_INCLUDE_RAW_CODE_VALUES=TRUE`.
@@ -73,18 +71,27 @@ The following entity types are supported:
    polylines (those with their vertices' bulge attributes set) will be
    tessellated. Single-vertex polylines are translated to POINT.
    Polyface meshes are translated as POLYHEDRALSURFACE geometries.
--  MLINE:
 
-   -  (GDAL >= 2.3.0) Translated as a MULTILINESTRING. Only the geometry
-      is reconstructed; styling applied to individual line elements
-      within the MLINE is ignored. Fill colors and start/end caps are
-      also omitted.
-   -  (GDAL <= 2.2.x) No support.
+   Starting with GDAL 3.10, the :config:`DXF_CLOSED_LINE_AS_POLYGON`
+   configuration option can be set to TRUE to ask for closed POLYLINE and
+   LWPOLYLINE to be exposed as OGR polygons.
 
--  CIRCLE, ELLIPSE, ARC, SPLINE, (GDAL >= 2.3.0) HELIX: Translated as a
+   .. config:: DXF_CLOSED_LINE_AS_POLYGON
+      :choices: TRUE, FALSE
+      :default: FALSE
+
+
+-  MLINE: Translated as a MULTILINESTRING. Only the geometry
+   is reconstructed; styling applied to individual line elements
+   within the MLINE is ignored. Fill colors and start/end caps are
+   also omitted.
+
+-  CIRCLE, ELLIPSE, ARC, SPLINE,HELIX: Translated as a
    LINESTRING, tessellating the curve into line segments.
-   (GDAL >= 2.3.0) CIRCLEs with nonzero "thickness" (cylinders) are
+
+   CIRCLEs with nonzero "thickness" (cylinders) are
    approximated as a POLYHEDRALSURFACE.
+
 -  INSERT: By default, the block definition referenced by the INSERT
    will be inserted as a compound geometry (for example, a
    MULTILINESTRING for a block containing many lines, or a
@@ -97,6 +104,7 @@ The following entity types are supported:
 
    -  .. config:: DXF_MERGE_BLOCK_GEOMETRIES
          :choices: TRUE, FALSE
+         :default: FALSE
 
          To avoid merging blocks into a
          compound geometry the :config:`DXF_MERGE_BLOCK_GEOMETRIES` config option may
@@ -115,13 +123,9 @@ The following entity types are supported:
          Maximum number of
          features inserted from a single block. Set to -1 for no limit.
 
--  ATTDEF, ATTRIB:
-
-   -  (GDAL >= 2.3.0) Attributes (ATTRIB) are treated as TEXT entities,
-      and attribute definitions (ATTDEF) inside blocks are ignored. The
-      behavior is different when :config:`DXF_INLINE_BLOCKS` is false (see below).
-   -  (GDAL <= 2.2.x) ATTDEF entities are treated as TEXT. ATTRIB
-      entities are not supported.
+-  ATTDEF, ATTRIB: Attributes (ATTRIB) are treated as TEXT entities,
+   and attribute definitions (ATTDEF) inside blocks are ignored. The
+   behavior is different when :config:`DXF_INLINE_BLOCKS` is false (see below).
 
 -  HATCH: Line and arc boundaries are collected as a polygon geometry,
    but no effort is currently made to represent the fill style of HATCH
@@ -134,36 +138,27 @@ The following entity types are supported:
          tolerance used when looking for the next component to add to the
          hatch boundary.
 
-   (GDAL <= 2.2.x) Only line and polyline boundary paths are translated
-   correctly.
-
 -  3DFACE, SOLID, (GDAL >= 2.3.0) TRACE: Translated as POLYGON, except
    for SOLID and TRACE entities with only one distinct vertex
    (translated as POINT) or two distinct vertices (translated as
    LINESTRING).
--  DIMENSION:
-
-   -  (GDAL >= 2.3.0) The DXF format allows each DIMENSION entity to
-      reference an "anonymous" block (a block whose name starts with
-      \*D) that contains the geometry of the DIMENSION. If present, this
-      anonymous block will be inlined at the required position.
-      Otherwise, fallback will occur to a simple DIMENSION renderer that
-      explodes a linear dimension as a MULTILINESTRING feature.
-      Arrowheads, if present, are translated as one or more additional
-      features. The fallback renderer will render nonlinear dimensions
-      as if they were linear.
-   -  (GDAL <= 2.2.x) Dimensions are translated as a MULTILINESTRING and
-      a POINT for the text.
-
--  LEADER, MULTILEADER:
-
-   -  (GDAL >= 2.3.0) The leader line is translated as a LINESTRING
-      (LEADER) or MULTILINESTRING (MULTILEADER). Arrowheads, if present,
-      are translated as one or more additional features. Text for
-      MULTILEADER entities is translated into a POINT feature with a
-      label. Block content for MULTILEADERS is treated as for INSERT.
-      Spline leaders are tessellated into line segments.
-   -  (GDAL <= 2.2.x) No support.
+
+-  DIMENSION: The DXF format allows each DIMENSION entity to
+   reference an "anonymous" block (a block whose name starts with
+   \*D) that contains the geometry of the DIMENSION. If present, this
+   anonymous block will be inlined at the required position.
+   Otherwise, fallback will occur to a simple DIMENSION renderer that
+   explodes a linear dimension as a MULTILINESTRING feature.
+   Arrowheads, if present, are translated as one or more additional
+   features. The fallback renderer will render nonlinear dimensions
+   as if they were linear.
+
+-  LEADER, MULTILEADER: The leader line is translated as a LINESTRING
+   (LEADER) or MULTILINESTRING (MULTILEADER). Arrowheads, if present,
+   are translated as one or more additional features. Text for
+   MULTILEADER entities is translated into a POINT feature with a
+   label. Block content for MULTILEADERS is treated as for INSERT.
+   Spline leaders are tessellated into line segments.
 
 -  3DSOLID, REGION, BODY, SURFACE: See below.
 
@@ -186,6 +181,9 @@ specification, except DIMENSION, LEADER and MULTILEADER. These three
 entity types also currently lack support for elevations; the geometries
 will always be 2D.
 
+
+.. _dxf_inline_blocks:
+
 DXF_INLINE_BLOCKS
 ~~~~~~~~~~~~~~~~~
 
@@ -272,7 +270,68 @@ override what id will be used by OGR in transcoding:
       name. Using a value "UTF-8" will avoid any attempt to
       recode the text as it is read.
 
---------------
+Open options
+------------
+
+.. versionadded:: 3.10
+
+|about-open-options|
+The following open options are supported:
+
+- .. oo:: CLOSED_LINE_AS_POLYGON
+     :since: 3.10
+     :default: NO
+     :choices: YES, NO
+
+     See :config:`DXF_CLOSED_LINE_AS_POLYGON`
+
+- .. oo:: INLINE_BLOCKS
+     :since: 3.10
+     :default: YES
+     :choices: YES, NO
+
+     See :ref:`dxf_inline_blocks`
+
+- .. oo:: MERGE_BLOCK_GEOMETRIES
+     :since: 3.10
+     :default: YES
+     :choices: YES, NO
+
+     See :config:`DXF_MERGE_BLOCK_GEOMETRIES`
+
+- .. oo:: TRANSLATE_ESCAPE_SEQUENCES
+     :since: 3.10
+     :default: YES
+     :choices: YES, NO
+
+     See :config:`DXF_TRANSLATE_ESCAPE_SEQUENCES`
+
+- .. oo:: INCLUDE_RAW_CODE_VALUES
+     :since: 3.10
+     :default: NO
+     :choices: YES, NO
+
+     See :config:`DXF_INCLUDE_RAW_CODE_VALUES`
+
+- .. oo:: 3D_EXTENSIBLE_MODE
+     :since: 3.10
+     :default: NO
+     :choices: YES, NO
+
+     See :config:`DXF_3D_EXTENSIBLE_MODE`
+
+- .. oo:: HATCH_TOLERANCE
+     :since: 3.10
+     :choices: <tolerance>
+
+     See :config:`DXF_HATCH_TOLERANCE`
+
+- .. oo:: ENCODING
+     :since: 3.10
+     :choices: <encoding>
+
+     See :config:`DXF_ENCODING`
+
 
 DXF Writer
 ----------
diff --git a/doc/source/drivers/vector/eeda.rst b/doc/source/drivers/vector/eeda.rst
index 90717adce691..8e754b2ea84b 100644
--- a/doc/source/drivers/vector/eeda.rst
+++ b/doc/source/drivers/vector/eeda.rst
@@ -40,6 +40,12 @@ The following open options are available:
       To specify the collection if not specified
       in the connection string.
 
+-  .. oo:: VSI_PATH_FOR_AUTH
+      :since: 3.10
+
+      /vsigs/... path onto which a GOOGLE_APPLICATION_CREDENTIALS path specific
+      option is set
+
 Authentication methods
 ----------------------
 
@@ -48,7 +54,9 @@ The following authentication methods can be used:
 -  Authentication Bearer header passed through the EEDA_BEARER or
    :config:`EEDA_BEARER_FILE` configuration options.
 -  Service account private key file, through the
-   :config:`GOOGLE_APPLICATION_CREDENTIALS` configuration option.
+   :config:`GOOGLE_APPLICATION_CREDENTIALS` configuration option, or set
+   as a path-specific option whose value is set in the VSI_PATH_FOR_AUTH
+   open option.
 -  OAuth2 Service Account authentication through the
    :config:`EEDA_PRIVATE_KEY`/
    :config:`EEDA_PRIVATE_KEY_FILE` +
diff --git a/doc/source/drivers/vector/elasticsearch.rst b/doc/source/drivers/vector/elasticsearch.rst
index 8de33bc3d10e..5a799ffc7a20 100644
--- a/doc/source/drivers/vector/elasticsearch.rst
+++ b/doc/source/drivers/vector/elasticsearch.rst
@@ -250,7 +250,7 @@ Starting with GDAL 2.2, SQL requests, involving a single layer, with
 WHERE and ORDER BY statements will be translated as Elasticsearch
 queries.
 
-Otherwise, if specifying "ES" as the dialect of ExecuteSQL(), a JSON 
+Otherwise, if specifying "ES" as the dialect of ExecuteSQL(), a JSON
 string with a serialized `Elastic Search
 filter <https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-filters.html>`__
 can be passed. The search will be done on all indices and types, unless
@@ -312,9 +312,9 @@ Aggregations
 
 The driver can support issuing aggregation requests to an index. ElasticSearch
 aggregations can potentially be rather complex, so the driver currently limits
-to geohash grid based spatial aggegrations, with additional fields with
+to geohash grid based spatial aggregation, with additional fields with
 statistical indicators (min, max, average, .), which can be used for example
-to generate heatmaps. The specification of the aggegation is done through
+to generate heatmaps. The specification of the aggregation is done through
 the :oo:`AGGREGATION` open option, whose value is a JSON serialized object whose
 members are:
 
@@ -324,7 +324,7 @@ members are:
   `geohash grid aggregation <https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-geohashgrid-aggregation.html>`__. For documents with points encoded as GeoJSON, this will
   be for example `geometry.coordinates`. When this property is not specified,
   the driver will analyze the mapping and use the geometry field definition
-  found into it (provided there is a single one). Note that aggegration on
+  found into it (provided there is a single one). Note that aggregation on
   geo_shape geometries is only supported since Elasticsearch 7 and may require
   a non-free license.
 
@@ -347,22 +347,22 @@ members are:
   fields should be added, that can have the following members:
 
       * ``min`` (optional): array with the paths to index properties on which
-        to compute the minimum during aggegation.
+        to compute the minimum during aggregation.
 
       * ``max`` (optional): array with the paths to index properties on which
-        to compute the maximum  during aggegation.
+        to compute the maximum  during aggregation.
 
       * ``avg`` (optional): array with the paths to index properties on which
-        to compute the average during aggegation.
+        to compute the average during aggregation.
 
       * ``sum`` (optional): array with the paths to index properties on which
-        to compute the sum during aggegation.
+        to compute the sum during aggregation.
 
       * ``count`` (optional): array with the paths to index properties on which
-        to compute the value_count during aggegation.
+        to compute the value_count during aggregation.
 
       * ``stats`` (optional): array with the paths to index properties on which
-        to compute all the above indicators during aggegation.
+        to compute all the above indicators during aggregation.
 
   When using a GeoJSON mapping, the path to an index property is typically
   ``property.some_name``.
diff --git a/doc/source/drivers/vector/esrijson.rst b/doc/source/drivers/vector/esrijson.rst
index 5883e2ccbd8b..280e15bb547f 100644
--- a/doc/source/drivers/vector/esrijson.rst
+++ b/doc/source/drivers/vector/esrijson.rst
@@ -49,7 +49,12 @@ The driver accepts three types of sources of data:
 -  Text passed directly and encoded in ESRI JSON
 
 Starting with GDAL 2.3, the URL/filename/text might be prefixed with
-ESRIJSON: to avoid any ambiguity with other drivers.
+ESRIJSON: to avoid any ambiguity with other drivers. Alternatively, starting
+with GDAL 3.10, specifying the ``-if ESRIJSON`` option to command line utilities
+accepting it, or ``ESRIJSON`` as the only value of the ``papszAllowedDrivers`` of
+:cpp:func:`GDALOpenEx`, also forces the driver to recognize the passed
+URL/filename/text.
+
 
 Open options
 ------------
diff --git a/doc/source/drivers/vector/filegdb.rst b/doc/source/drivers/vector/filegdb.rst
index b83bddb2ce2d..718000290d68 100644
--- a/doc/source/drivers/vector/filegdb.rst
+++ b/doc/source/drivers/vector/filegdb.rst
@@ -281,21 +281,25 @@ On layer creation, the XORIGIN, YORIGIN, ZORIGIN, MORIGIN, XYSCALE, ZSCALE,
 ZORIGIN, XYTOLERANCE, ZTOLERANCE, MTOLERANCE layer creation options will be
 used in priority over the settings of :cpp:class:`OGRGeomCoordinatePrecision`.
 
-Known Issues
-------------
+Limitations
+-----------
 
 -  The SDK is known to be unable to open layers with particular spatial
    reference systems. This might be the case if messages "FGDB: Error
    opening XXXXXXX. Skipping it (Invalid function arguments.)" when
    running ``ogrinfo --debug on the.gdb`` (reported as warning in GDAL
    2.0). Using the OpenFileGDB driver will generally solve that issue.
+
 -  FGDB coordinate snapping will cause geometries to be altered during
    writing. Use the origin and scale layer creation options to control
    the snapping behavior.
--  Driver can't read data in SDC format (Smart Data Compression) because
-   operation is not supported by the ESRI SDK.
+
+-  Reading data compressed in SDC format (Smart Data Compression) is not
+   support by the driver, because it is not supported by the ESRI SDK.
+
 -  Reading data compressed in CDF format (Compressed Data Format)
    requires ESRI SDK 1.4 or later.
+
 -  Some applications create FileGeodatabases with non-spatial tables which are
    not present in the GDB_Items metadata table. These tables cannot be opened
    by the ESRI SDK, so GDAL will automatically fallback to the OpenFileGDB
@@ -303,10 +307,6 @@ Known Issues
    limitations of the OpenFileGDB driver (for instance, they will be
    read only).
 
-
-Other limitations
------------------
-
 - The driver does not support 64-bit integers.
 
 Links
diff --git a/doc/source/drivers/vector/geojson.rst b/doc/source/drivers/vector/geojson.rst
index b1f9d06be97d..0621e70791a9 100644
--- a/doc/source/drivers/vector/geojson.rst
+++ b/doc/source/drivers/vector/geojson.rst
@@ -48,7 +48,11 @@ The OGR GeoJSON driver accepts three types of sources of data:
 -  Text passed directly and encoded in GeoJSON
 
 Starting with GDAL 2.3, the URL/filename/text might be prefixed with
-GeoJSON: to avoid any ambiguity with other drivers.
+GeoJSON: to avoid any ambiguity with other drivers. Alternatively, starting
+with GDAL 3.10, specifying the ``-if GeoJSON`` option to command line utilities
+accepting it, or ``GeoJSON`` as the only value of the ``papszAllowedDrivers`` of
+:cpp:func:`GDALOpenEx`, also forces the driver to recognize the passed
+URL/filename/text.
 
 Layer
 -----
diff --git a/doc/source/drivers/vector/geojsonseq.rst b/doc/source/drivers/vector/geojsonseq.rst
index d6074a9f293c..47539dd4734e 100644
--- a/doc/source/drivers/vector/geojsonseq.rst
+++ b/doc/source/drivers/vector/geojsonseq.rst
@@ -12,7 +12,7 @@ GeoJSONSeq: sequence of GeoJSON features
 This driver implements read/creation support for features encoded
 individually as `GeoJSON <http://geojson.org/>`__ Feature objects,
 separated by newline (LF) (`Newline Delimited
-JSON <http://ndjson.org/>`__) or record-separator (RS) characters (`RFC
+JSON <https://github.com/ndjson/ndjson-spec>`__) or record-separator (RS) characters (`RFC
 8142 <https://tools.ietf.org/html/rfc8142>`__ standard: GeoJSON Text
 Sequences)
 
@@ -46,7 +46,11 @@ The driver accepts three types of sources of data:
 -  Text passed directly as filename, and encoded as GeoJSON sequences
 
 The URL/filename/text might be prefixed with GeoJSONSeq: to avoid any
-ambiguity with other drivers.
+ambiguity with other drivers. Alternatively, starting
+with GDAL 3.10, specifying the ``-if GeoJSONSeq`` option to command line utilities
+accepting it, or ``GeoJSONSeq`` as the only value of the ``papszAllowedDrivers`` of
+:cpp:func:`GDALOpenEx`, also forces the driver to recognize the passed
+URL/filename/text.
 
 Configuration options
 ---------------------
@@ -103,7 +107,7 @@ The following layer creation options are supported:
       :since: 3.8
 
       Whether to write
-      NaN / Infinity values. Such values are not allowed in strict JSON 
+      NaN / Infinity values. Such values are not allowed in strict JSON
       mode, but some JSON parsers (libjson-c >= 0.12 for example) can
       understand them as they are allowed by ECMAScript.
 
@@ -116,6 +120,14 @@ The following layer creation options are supported:
       if they start and end with brackets and braces, even if they do
       not have their subtype set to JSON.
 
+-  .. lco:: WRITE_BBOX
+      :choices: YES, NO
+      :default: NO
+      :since: 3.10
+
+      Set to YES to write a bbox property with the bounding box of the
+      geometry at the feature level.
+
 Geometry coordinate precision
 -----------------------------
 
diff --git a/doc/source/drivers/vector/gml.rst b/doc/source/drivers/vector/gml.rst
index fa0c465308ba..6b05f1213f95 100644
--- a/doc/source/drivers/vector/gml.rst
+++ b/doc/source/drivers/vector/gml.rst
@@ -115,6 +115,11 @@ The following configuration options are available:
 
      Equivalent of :oo:`READ_MODE`. See :ref:`gml_performance`.
 
+- .. config:: GML_USE_SCHEMA_IMPORT
+     :choices: YES, NO
+
+     Equivalent of :oo:`USE_SCHEMA_IMPORT`.
+
 
 Parsers
 -------
@@ -626,6 +631,20 @@ The following open options are supported:
       Whether to use gml:boundedBy at feature level as feature geometry,
       if there are no other geometry.
 
+-  .. oo:: USE_SCHEMA_IMPORT
+      :choices: YES, NO
+      :default: NO
+
+      Whether to use schema imports in XSD files so that
+      the feature types corresponding to imported schema can be detected.
+
+.. note::
+
+  When changing the value of most of the above options, it is recommended to
+  delete the ``.gfs`` file if it pre-exists, otherwise mis-behavior might be
+  observed.
+
+
 Creation Issues
 ---------------
 
diff --git a/doc/source/drivers/vector/gmlas.rst b/doc/source/drivers/vector/gmlas.rst
index c728ea540842..e4188f58c410 100644
--- a/doc/source/drivers/vector/gmlas.rst
+++ b/doc/source/drivers/vector/gmlas.rst
@@ -33,11 +33,15 @@ Driver capabilities
 Opening syntax
 --------------
 
-The connection string is GMLAS:/path/to/the.gml. Note the GMLAS: prefix.
+The connection string is GMLAS:/path/to/the.gml. Note the ``GMLAS:`` prefix.
 If this prefix it is omitted, then the GML driver is likely to be used.
 
-It is also possible to only used "GMLAS:" as the connection string, but
-in that case the schemas must be explicitly provided with the XSD open
+Alternatively, starting with GDAL 3.10, specifying the ``-if GMLAS`` option to command line utilities
+accepting it, or ``GMLAS`` as the only value of the ``papszAllowedDrivers`` of
+:cpp:func:`GDALOpenEx`, also forces the driver to recognize the passed filename.
+
+It is also possible to only used ``GMLAS:`` as the connection string, but
+in that case the schemas must be explicitly provided with the ``XSD`` open
 option.
 
 Mapping of XML structure to OGR layers and fields
diff --git a/doc/source/drivers/vector/gpkg.rst b/doc/source/drivers/vector/gpkg.rst
index e081f318c4b2..77c8c5364dc7 100644
--- a/doc/source/drivers/vector/gpkg.rst
+++ b/doc/source/drivers/vector/gpkg.rst
@@ -123,6 +123,10 @@ Spatialite, are also available :
 -  ST_Area(geom *Geometry*, use_ellipsoid *boolean*): (GDAL >= 3.9): compute
    the area in square meters, considering the geometry on the ellipsoid
    (use_ellipsoid must be set to true/1).
+-  ST_Length(geom *Geometry*): (GDAL >= 3.10): compute the area in units of the geometry SRS.
+-  ST_Length(geom *Geometry*, use_ellipsoid *boolean*): (GDAL >= 3.10): compute
+   the area in meters, considering the geometry on the ellipsoid
+   (use_ellipsoid must be set to true/1).
 -  SetSRID(geom *Geometry*, srs_id *Integer*): overrides the geometry' SRS ID,
    without reprojection.
 -  ST_Transform(geom *Geometry*, target_srs_id *Integer*): reproject the geometry
diff --git a/doc/source/drivers/vector/gtfs.rst b/doc/source/drivers/vector/gtfs.rst
index 166f701e39f2..c03b9ac2fa65 100644
--- a/doc/source/drivers/vector/gtfs.rst
+++ b/doc/source/drivers/vector/gtfs.rst
@@ -29,6 +29,11 @@ The connection name can be:
 - a directory name prefixed with ``GTFS:`` (potentially a
   ``/vsizip/path/to/the.zip`` filename prefixed with ``GTFS:``)
 
+Alternatively, starting with GDAL 3.10, specifying the ``-if GTFS`` option to
+command line utilities accepting it, or ``GTFS`` as the only value of the
+``papszAllowedDrivers`` of :cpp:func:`GDALOpenEx`, also forces the driver to
+recognize the passed filename.
+
 Driver capabilities
 -------------------
 
diff --git a/doc/source/drivers/vector/index.rst b/doc/source/drivers/vector/index.rst
index 818b44db488f..0ac42608c26a 100644
--- a/doc/source/drivers/vector/index.rst
+++ b/doc/source/drivers/vector/index.rst
@@ -18,13 +18,9 @@ Vector drivers
     The following drivers have been retired and moved to the
     https://github.com/OSGeo/gdal-extra-drivers repository: AeronavFAA, BNA, HTF, OpenAir, SEGUKOOA, SEGY, SUA, XPlane
 
-..
-    Developer comment: make html includes a hack to hide the table from
-    the index.html file. We need to keep it visible so that the top-level
-    index.html lists those pages.
-
 .. toctree::
    :maxdepth: 1
+   :hidden:
 
    amigocloud
    arrow
@@ -110,3 +106,4 @@ Vector drivers
    wfs
    xls
    xlsx
+   xodr
diff --git a/doc/source/drivers/vector/jsonfg.rst b/doc/source/drivers/vector/jsonfg.rst
index cffa11a8b6f9..b25120a7bf88 100644
--- a/doc/source/drivers/vector/jsonfg.rst
+++ b/doc/source/drivers/vector/jsonfg.rst
@@ -50,7 +50,11 @@ The JSON-FG driver accepts three types of sources of data:
 -  Text passed directly and encoded in JSON-FG
 
 The URL/filename/text might be prefixed with
-``JSONFG:`` to avoid any ambiguity with other drivers.
+``JSONFG:`` to avoid any ambiguity with other drivers. Alternatively, starting
+with GDAL 3.10, specifying the ``-if JSONFG`` option to command line utilities
+accepting it, or ``JSONFG`` as the only value of the ``papszAllowedDrivers`` of
+:cpp:func:`GDALOpenEx`, also forces the driver to recognize the passed
+URL/filename/text.
 
 Time support
 ------------
diff --git a/doc/source/drivers/vector/libkml.rst b/doc/source/drivers/vector/libkml.rst
index fb04a1953dec..b1d9eb9e8d9c 100644
--- a/doc/source/drivers/vector/libkml.rst
+++ b/doc/source/drivers/vector/libkml.rst
@@ -420,7 +420,8 @@ options :
 -  .. lco:: NAME
 
       `<name> <https://developers.google.com/kml/documentation/kmlreference#name>`__
-      element
+      element. Also used to set the name of the NetworkLink pointing to the layer,
+      starting with GDAL 3.10
 
 -  .. lco:: VISIBILITY
 
@@ -586,6 +587,13 @@ For example, if you want a field called 'Cities' to map to the
 tag in KML, you can set a configuration option. Note these are independent of layer
 creation and dataset creation options' `<name>`.
 
+-  .. config:: LIBKML_ID_FIELD
+      :default: id
+      :since: 3.10
+
+      Name of the string field that maps to the kml attribute
+      `<id> <https://developers.google.com/kml/documentation/kmlreference#object>`__.
+
 -  .. config:: LIBKML_NAME_FIELD
       :default: name
 
diff --git a/doc/source/drivers/vector/mapinfo_encodings.csv b/doc/source/drivers/vector/mapinfo_encodings.csv
new file mode 100644
index 000000000000..4a4f4ab0f57f
--- /dev/null
+++ b/doc/source/drivers/vector/mapinfo_encodings.csv
@@ -0,0 +1,38 @@
+"ENCODING value","MapInfo charset",description
+""""" (empty string)",Neutral,"No character conversions performed."
+"UTF-8","UTF-8","UTF-8 (Works with recent MapInfo versions, since v15.2)"
+"ISO-8859-1","ISO8859_1","ISO 8859-1 (UNIX)"
+"ISO-8859-2","ISO8859_2","ISO 8859-2 (UNIX)"
+"ISO-8859-3","ISO8859_3","ISO 8859-3 (UNIX)"
+"ISO-8859-4","ISO8859_4","ISO 8859-4 (UNIX)"
+"ISO-8859-5","ISO8859_5","ISO 8859-5 (UNIX)"
+"ISO-8859-6","ISO8859_6","ISO 8859-6 (UNIX)"
+"ISO-8859-7","ISO8859_7","ISO 8859-7 (UNIX)"
+"ISO-8859-8","ISO8859_8","ISO 8859-8 (UNIX)"
+"ISO-8859-9","ISO8859_9","ISO 8859-9 (UNIX)"
+"EUC-JP","PackedEUCJapaese","UNIX, standard Japanese implementation."
+"CP1252","WindowsLatin1",""
+"CP1250","WindowsLatin2",""
+"CP1256","WindowsArabic",""
+"CP1251","WindowsCyrillic",""
+"CP1257","WindowsBalticRim",""
+"CP1253","WindowsGreek",""
+"CP1255","WindowsHebrew",""
+"CP1254","WindowsTurkish","Windows Eastern Europe"
+"CP950","WindowsTradChinese","Windows Traditional Chinese"
+"CP936","WindowsSimpChinese","Windows Simplified Chinese"
+"CP932","WindowsJapanese",""
+"CP949","WindowsKorean",""
+"CP437","CodePage437","DOS Code Page 437 = IBM Extended ASCII"
+"CP850","CodePage850","DOS Code Page 850 = Multilingual"
+"CP852","CodePage852","DOS Code Page 852 = Eastern Europe"
+"CP855","CodePage855","DOS Code Page 855 = Cyrillic"
+"CP857","CodePage857",""
+"CP860","CodePage860","DOS Code Page 860 = Portuguese"
+"CP861","CodePage861","DOS Code Page 861 = Icelandic"
+"CP863","CodePage863","DOS Code Page 863 = French Canadian"
+"CP864","CodePage864","DOS Code Page 864 = Arabic"
+"CP865","CodePage865","DOS Code Page 865 = Nordic"
+"CP869","CodePage869","DOS Code Page 869 = Modern Greek"
+"(no iconv match)","LICS","Lotus worksheet release 1,2 character set"
+"(no iconv match)","LMBCS","Lotus worksheet release 3,4 character set"
diff --git a/doc/source/drivers/vector/mitab.rst b/doc/source/drivers/vector/mitab.rst
index 6e4e4d444bc3..7fcdd3d09435 100644
--- a/doc/source/drivers/vector/mitab.rst
+++ b/doc/source/drivers/vector/mitab.rst
@@ -131,6 +131,14 @@ The following dataset creation options are supported:
       bytes. Any MapInfo version should be able to handle block sizes from
       512 to 32256.
 
+-  .. dsco:: STRICT_FIELDS_NAME_LAUNDERING
+      :choices: YES, NO
+      :default: YES
+      :since: 3.10
+
+      Replaces all non alphanumeric characters in dataset's field names by
+      `_` (underscope). For recent MapInfo can be set to `NO`.
+
 Layer Creation Options
 ~~~~~~~~~~~~~~~~~~~~~~
 
@@ -150,9 +158,15 @@ The following layer creation options are supported:
       Define the encoding for field
       names and field values. The encoding name is specified in the format
       supported by :cpp:func:`CPLRecode` (e.g. ISO-8859-1, CP1251, CP1252 ...) and
-      internally converted to MapInfo charsets names. Default value is ''
+      internally converted to MapInfo charsets names. Default value is '' (empty string)
       that equals to 'Neutral' MapInfo charset.
 
+      Currently supported values for the encoding name are:
+
+      .. csv-table:: MapInfo encodings
+        :file: mapinfo_encodings.csv
+        :header-rows: 1
+
 -  .. lco:: DESCRIPTION
       :since: 3.1.0
 
@@ -160,6 +174,14 @@ The following layer creation options are supported:
       TAB format). Friendly names can be up to 256 characters long and can include
       most ASCII characters. Supported by MapInfo Pro v15.0 or higher.
 
+-  .. lco:: STRICT_FIELDS_NAME_LAUNDERING
+      :choices: YES, NO
+      :default: YES
+      :since: 3.10
+
+      Replaces all non alphanumeric characters in layer's field names by
+      `_` (underscope). For recent MapInfo can be set to `NO`.
+
 Configuration options
 ~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/doc/source/drivers/vector/mvt.rst b/doc/source/drivers/vector/mvt.rst
index ce9a2d98e339..48bca8307de9 100644
--- a/doc/source/drivers/vector/mvt.rst
+++ b/doc/source/drivers/vector/mvt.rst
@@ -442,7 +442,7 @@ See Also:
 -  `Mapbox Vector Tile
    Specification <https://github.com/mapbox/vector-tile-spec>`__
 -  :ref:`MBTiles <raster.mbtiles>` driver
--  `tippecanoe <https://github.com/mapbox/tippecanoe>`__: Builds vector
+-  `tippecanoe <https://github.com/felt/tippecanoe>`__: Builds vector
    tilesets from large (or small) collections of GeoJSON, Geobuf, or CSV
    features
 -  `Links to tools dealing with Mapbox Vector
diff --git a/doc/source/drivers/vector/nas.rst b/doc/source/drivers/vector/nas.rst
index af04a7c74d3c..e51984b14f9d 100644
--- a/doc/source/drivers/vector/nas.rst
+++ b/doc/source/drivers/vector/nas.rst
@@ -23,10 +23,13 @@ The configuration option **NAS_GFS_TEMPLATE** makes it possible to cleanly map
 element paths to feature attributes using a GFS file like in the GML
 driver. Multiple geometries per layer are also possible (eg.
 ax_flurstueck.objektkoordinaten next to the regular wkb_geometry).
-Starting with GDAL 3.7, defining the NAS_GFS_TEMPLATE configuration option is
+Starting with GDAL 3.7, defining the **NAS_GFS_TEMPLATE** configuration option is
 required for the NAS driver to open a file. It may be set to the empty string
 to mean that the driver should try to establish the schema of the file from its
 content, but using one of templates mentioned below is recommended.
+Alternatively, starting with GDAL 3.10, specifying the ``-if NAS`` option to command line utilities
+accepting it, or ``NAS`` as the only value of the ``papszAllowedDrivers`` of
+:cpp:func:`GDALOpenEx`, also forces the driver to recognize the passed filename.
 
 The GFS templates and PostgreSQL schemas are part of `norGIS
 ALKIS-Import <http://www.norbit.de/68/>`__ (also featuring a shell script and
@@ -45,8 +48,12 @@ population - which was default in ALKIS-Import. The information found there was
 redundant to the relation fields also contained in original elements/tables.
 Enabling the option also made progress reporting available.
 
+Duplicate data in datasets will usually causes errors.  When importing separate
+datasets into PostgreSQL it is useful to enable :config:`OGR_PG_SKIP_CONFLICTS` to skip
+conflicting features.
+
 This driver was implemented within the context of the `PostNAS
-project <http://trac.wheregroup.com/PostNAS>`__, which has more
+project <https://postnas-suite.github.io/postnas-suite/>`__, which has more
 information on its use and other related projects.
 
 Driver capabilities
diff --git a/doc/source/drivers/vector/oapif.rst b/doc/source/drivers/vector/oapif.rst
index a5c98b3243c7..0f044be6d43a 100644
--- a/doc/source/drivers/vector/oapif.rst
+++ b/doc/source/drivers/vector/oapif.rst
@@ -31,6 +31,11 @@ The syntax to open a OGC API - Features datasource is :
 
 where endpoint is the landing page or a the path to collections/{id}.
 
+Starting with GDAL 3.10, specifying the ``-if OAPIF`` option to command line utilities
+accepting it, or ``OAPIF`` as the only value of the ``papszAllowedDrivers`` of
+:cpp:func:`GDALOpenEx`, also forces the driver to recognize the passed
+URL without the ``OAPIF:`` prefix.
+
 Layer schema
 ------------
 
@@ -53,6 +58,9 @@ evaluated on client-side.
 
 Rectangular spatial filtering is forward to the server as well.
 
+Starting with GDAL 3.10, the ``DATETIME`` open option can also be specified for
+temporal filtering.
+
 CRS support
 -----------
 
@@ -136,6 +144,13 @@ The following open options are available:
       "GIS friendly" order, with longitude/easting first, latitude/northing second.
       Do not set this option unless actual problems arise.
 
+-  .. oo:: DATETIME
+      :since: 3.10
+
+       Temporal filter. Its value should match the ones mentioned at
+       `paragraph Parameter datetime of the OGC API Features specification <https://docs.ogc.org/is/17-069r3/17-069r3.html#_parameter_datetime>`__
+
+
 Examples
 --------
 
@@ -143,106 +158,130 @@ Examples
 
    ::
 
-      $ ogrinfo OAPIF:https://www.ldproxy.nrw.de/rest/services/kataster
+      $ ogrinfo OAPIF:https://ogc-api.nrw.de/inspire-us-feuerwehr
 
-      INFO: Open of `OAPIF:https://www.ldproxy.nrw.de/rest/services/kataster'
+      INFO: Open of `OAPIF:https://ogc-api.nrw.de/inspire-us-feuerwehr'
             using driver `OAPIF' successful.
-      1: flurstueck (Multi Polygon)
-      2: gebaeudebauwerk (Multi Polygon)
-      3: verwaltungseinheit (Multi Polygon)
+      1: governmentalservice (title: Feuerwehrleitstellen) (Point)
 
 -  Listing the summary information of a OGC API - Features layer :
 
    ::
 
-      $ ogrinfo -al -so OAPIF:https://www.ldproxy.nrw.de/rest/services/kataster flurstueck
+      $ ogrinfo OAPIF:https://ogc-api.nrw.de/inspire-us-feuerwehr governmentalservice -al -so
+
+      INFO: Open of `OAPIF:https://ogc-api.nrw.de/inspire-us-feuerwehr'
+            using driver `OAPIF' successful.
 
-      Layer name: flurstueck
+      Layer name: governmentalservice
       Metadata:
-        TITLE=Flurstück
-      Geometry: Multi Polygon
-      Feature Count: 9308456
-      Extent: (5.612726, 50.237351) - (9.589634, 52.528630)
+        DESCRIPTION=Staatliche Verwaltungs- und Sozialdienste wie öffentliche Verwaltung, Katastrophenschutz, Schulen und Krankenhäuser, die von öffentlichen oder privaten Einrichtungen erbracht werden, soweit sie in den Anwendungsbereich der Richtlinie 2007/2/EG fallen. Dieser Datensatz enthält Informationen zu Feuerwehrleitstellen.
+        TITLE=Feuerwehrleitstellen
+      Geometry: Point
+      Feature Count: 52
+      Extent: (6.020720, 50.654901) - (9.199363, 52.300806)
       Layer SRS WKT:
-      GEOGCS["WGS 84",
-          DATUM["WGS_1984",
-              SPHEROID["WGS 84",6378137,298.257223563,
-                  AUTHORITY["EPSG","7030"]],
-              AUTHORITY["EPSG","6326"]],
+      GEOGCRS["WGS 84",
+          DATUM["World Geodetic System 1984",
+              ELLIPSOID["WGS 84",6378137,298.257223563,
+                  LENGTHUNIT["metre",1]]],
           PRIMEM["Greenwich",0,
-              AUTHORITY["EPSG","8901"]],
-          UNIT["degree",0.0174532925199433,
-              AUTHORITY["EPSG","9122"]],
-          AUTHORITY["EPSG","4326"]]
+              ANGLEUNIT["degree",0.0174532925199433]],
+          CS[ellipsoidal,2],
+              AXIS["geodetic latitude (Lat)",north,
+                  ORDER[1],
+                  ANGLEUNIT["degree",0.0174532925199433]],
+              AXIS["geodetic longitude (Lon)",east,
+                  ORDER[2],
+                  ANGLEUNIT["degree",0.0174532925199433]],
+          ID["EPSG",4326]]
+      Data axis to CRS axis mapping: 2,1
       id: String (0.0)
-      aktualit: Date (0.0)
-      flaeche: Real (0.0)
-      flstkennz: String (0.0)
-      land: String (0.0)
-      gemarkung: String (0.0)
-      flur: String (0.0)
-      flurstnr: String (0.0)
-      gmdschl: String (0.0)
-      regbezirk: String (0.0)
-      kreis: String (0.0)
-      gemeinde: String (0.0)
-      lagebeztxt: String (0.0)
-      tntxt: String (0.0)
+      name: String (0.0)
+      inspireId: String (0.0)
+      serviceType.title: String (0.0)
+      serviceType.href: String (0.0)
+      areaOfResponsibility.1.title: String (0.0)
+      areaOfResponsibility.1.href: String (0.0)
+      pointOfContact.address.thoroughfare: String (0.0)
+      pointOfContact.address.locatorDesignator: String (0.0)
+      pointOfContact.address.postCode: String (0.0)
+      pointOfContact.address.adminUnit: String (0.0)
+      pointOfContact.address.text: String (0.0)
+      pointOfContact.telephoneVoice: String (0.0)
+      pointOfContact.telephoneFacsimile: String (0.0)
+      pointOfContact.telephoneFacsimileEmergency: String (0.0)
+      inDistrict.title: String (0.0)
+      inDistrict.href: String (0.0)
+      inDistrictFreeTown.title: String (0.0)
+      inDistrictFreeTown.href: String (0.0)
+      inGovernmentalDistrict.title: String (0.0)
+      inGovernmentalDistrict.href: String (0.0)
 
 -  Filtering on a property (depending on if the server exposes filtering capabilities of the properties, part or totally of the filter might be evaluated on client side)
 
    ::
 
+      $ ogrinfo OAPIF:https://ogc-api.nrw.de/inspire-us-feuerwehr governmentalservice -al -q -where "name = 'Schwelm'"
 
-      $ ogrinfo OAPIF:https://www.ldproxy.nrw.de/rest/services/kataster flurstueck -al -q -where "flur = '028'"
-      Layer name: flurstueck
+      Layer name: governmentalservice
       Metadata:
-        TITLE=Flurstück
-      OGRFeature(flurstueck):1
-        id (String) = DENW19AL0000geMFFL
-        aktualit (Date) = 2017/04/26
-        flaeche (Real) = 1739
-        flstkennz (String) = 05297001600193______
-        land (String) = Nordrhein-Westfalen
-        gemarkung (String) = Wünnenberg
-        flur (String) = 016
-        flurstnr (String) = 193
-        gmdschl (String) = 05774040
-        regbezirk (String) = Detmold
-        kreis (String) = Paderborn
-        gemeinde (String) = Bad Wünnenberg
-        lagebeztxt (String) = Bleiwäscher Straße
-        tntxt (String) = Platz / Parkplatz;1739
-        MULTIPOLYGON (((8.71191 51.491084,8.7123 51.491067,8.712385 51.491645,8.712014 51.491666,8.711993 51.491603,8.71196 51.491396,8.711953 51.491352,8.71191 51.491084)))
-
-      [...]
+        DESCRIPTION=Staatliche Verwaltungs- und Sozialdienste wie öffentliche Verwaltung, Katastrophenschutz, Schulen und Krankenhäuser, die von öffentlichen oder privaten Einrichtungen erbracht werden, soweit sie in den Anwendungsbereich der Richtlinie 2007/2/EG fallen. Dieser Datensatz enthält Informationen zu Feuerwehrleitstellen.
+        TITLE=Feuerwehrleitstellen
+      OGRFeature(governmentalservice):1
+        id (String) = LtS01
+        name (String) = Schwelm
+        inspireId (String) = https://geodaten.nrw.de/id/inspire-us-feuerwehr/governmentalservice/LtS01
+        serviceType.title (String) = Brandschutzdienst
+        serviceType.href (String) = http://inspire.ec.europa.eu/codelist/ServiceTypeValue/fireProtectionService
+        areaOfResponsibility.1.title (String) = Breckerfeld
+        areaOfResponsibility.1.href (String) = https://registry.gdi-de.org/id/de.nw.inspire.au.basis-dlm/AdministrativeUnit_05954004
+        pointOfContact.address.thoroughfare (String) = Hauptstr.
+        pointOfContact.address.locatorDesignator (String) = 92
+        pointOfContact.address.postCode (String) = 58332
+        pointOfContact.address.adminUnit (String) = Schwelm
+        pointOfContact.address.text (String) = Hauptstr. 92, 58332 Schwelm
+        pointOfContact.telephoneVoice (String) = +49233644400
+        pointOfContact.telephoneFacsimile (String) = +4923364440400
+        pointOfContact.telephoneFacsimileEmergency (String) = +49233644407100
+        inDistrict.title (String) = Ennepe-Ruhr
+        inDistrict.href (String) = Ennepe-Ruhr
+        inGovernmentalDistrict.title (String) = Arnsberg
+        inGovernmentalDistrict.href (String) = https://registry.gdi-de.org/id/de.nw.inspire.au.basis-dlm/AdministrativeUnit_059
+        POINT (7.29854802787082 51.2855116825595)
+
 
 -  Spatial filtering
 
    ::
 
-      $ ogrinfo OAPIF:https://www.ldproxy.nrw.de/rest/services/kataster flurstueck -al -q -spat 8.7 51.4 8.8 51.5
+      $ ogrinfo OAPIF:https://ogc-api.nrw.de/inspire-us-feuerwehr governmentalservice -al -q -spat 7.1 51.2 7.2 51.5
 
-      Layer name: flurstueck
+      Layer name: governmentalservice
       Metadata:
-        TITLE=Flurstück
-      OGRFeature(flurstueck):1
-        id (String) = DENW19AL0000ht7LFL
-        aktualit (Date) = 2013/02/19
-        flaeche (Real) = 18
-        flstkennz (String) = 05292602900206______
-        land (String) = Nordrhein-Westfalen
-        gemarkung (String) = Fürstenberg
-        flur (String) = 029
-        flurstnr (String) = 206
-        gmdschl (String) = 05774040
-        regbezirk (String) = Detmold
-        kreis (String) = Paderborn
-        gemeinde (String) = Bad Wünnenberg
-        lagebeztxt (String) = Karpke
-        tntxt (String) = Fließgewässer / Bach;18
-        MULTIPOLYGON (((8.768521 51.494915,8.768535 51.494882,8.768569 51.494908,8.768563 51.494925,8.768521 51.494915)))
-      [...]
+        DESCRIPTION=Staatliche Verwaltungs- und Sozialdienste wie öffentliche Verwaltung, Katastrophenschutz, Schulen und Krankenhäuser, die von öffentlichen oder privaten Einrichtungen erbracht werden, soweit sie in den Anwendungsbereich der Richtlinie 2007/2/EG fallen. Dieser Datensatz enthält Informationen zu Feuerwehrleitstellen.
+        TITLE=Feuerwehrleitstellen
+      OGRFeature(governmentalservice):1
+        id (String) = LtS33
+        name (String) = Wuppertal-Solingen
+        inspireId (String) = https://geodaten.nrw.de/id/inspire-us-feuerwehr/governmentalservice/LtS33
+        serviceType.title (String) = Brandschutzdienst
+        serviceType.href (String) = http://inspire.ec.europa.eu/codelist/ServiceTypeValue/fireProtectionService
+        areaOfResponsibility.1.title (String) = Wuppertal
+        areaOfResponsibility.1.href (String) = https://registry.gdi-de.org/id/de.nw.inspire.au.basis-dlm/AdministrativeUnit_05124000
+        pointOfContact.address.thoroughfare (String) = August-Bebel-Str.
+        pointOfContact.address.locatorDesignator (String) = 55
+        pointOfContact.address.postCode (String) = 42109
+        pointOfContact.address.adminUnit (String) = Wuppertal
+        pointOfContact.address.text (String) = August-Bebel-Str. 55, 42109 Wuppertal
+        pointOfContact.telephoneVoice (String) = +492025631111
+        pointOfContact.telephoneFacsimile (String) = +49202445331
+        pointOfContact.telephoneFacsimileEmergency (String) = 112
+        inDistrictFreeTown.title (String) = Wuppertal
+        inDistrictFreeTown.href (String) = Wuppertal
+        inGovernmentalDistrict.title (String) = Düsseldorf
+        inGovernmentalDistrict.href (String) = https://registry.gdi-de.org/id/de.nw.inspire.au.basis-dlm/AdministrativeUnit_051
+        POINT (7.13806554104892 51.2674471939457)
 
 See Also
 --------
diff --git a/doc/source/drivers/vector/oci.rst b/doc/source/drivers/vector/oci.rst
index 9f8b1fa18381..764767c2c9d5 100644
--- a/doc/source/drivers/vector/oci.rst
+++ b/doc/source/drivers/vector/oci.rst
@@ -353,8 +353,34 @@ coordinate reference system, and converting timestamps to UTC.
 
    ogr2ogr -f GPKG output.gpkg -nln new_layer_name -nlt POLYGON -s_srs EPSG:25832 -t_srs EPSG:25832 -dsco DATETIME_FORMAT=UTC OCI:username/password@host_name:port_number/service_name:MY_SCHEMA.MY_VIEW -sql "SELECT COLUMN_A, COLUMN_B, GEOMETRY FROM MY_SCHEMA.MY_VIEW"
 
+Standalone plugin compilation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. versionadded:: 3.10
+
+While this driver may be built as part of a whole GDAL build, either in libgdal
+itself, or as a plugin, it is also possible to only build this driver as a plugin,
+against an already built libgdal.
+
+The version of the GDAL sources used to build the driver must match the version
+of the libgdal it is built against.
+
+For example, from a "build_oci" directory under the root of the GDAL source tree:
+
+::
+
+    cmake -S ../ogr/ogrsf_frmts/oci -DCMAKE_PREFIX_PATH=/path/to/GDAL_installation_prefix -DOracle_ROOT=/path/to/instantclient_sdk_root
+    cmake --build .
+
+
+Note that such a plugin, when used against a libgdal not aware of it, will be
+systematically loaded at GDAL driver initialization time, and will not benefit from
+`deferred plugin loading capabilities <rfc-96>`. For that, libgdal itself must be built with the
+CMake variable OGR_REGISTER_DRIVER_OCI_FOR_LATER_PLUGIN=ON set.
+
 Credits
 ~~~~~~~
 
-I would like to thank `SRC, LLC <http://www.extendthereach.com/>`__ for
-its financial support of the development of this driver.
+`SRC, LLC <http://www.extendthereach.com/>`__ for its financial support of
+the initial development of this driver.
+
diff --git a/doc/source/drivers/vector/openfilegdb.rst b/doc/source/drivers/vector/openfilegdb.rst
index e451956981a7..f4a73dfbe0a7 100644
--- a/doc/source/drivers/vector/openfilegdb.rst
+++ b/doc/source/drivers/vector/openfilegdb.rst
@@ -68,6 +68,7 @@ Geodatabases created with ArcGIS 10 or above)
 The "CREATE INDEX idx_name ON layer_name(field_name)" SQL request can be
 used to create an attribute index. idx_name must have 16 characters or less,
 start with a letter and contain only alphanumeric characters or underscore.
+Multiple column indices are not supported.
 
 The "RECOMPUTE EXTENT ON layer_name" SQL request can be used to trigger
 an update of the layer extent in layer metadata. This is useful when updating
@@ -310,26 +311,35 @@ On layer creation, the XORIGIN, YORIGIN, ZORIGIN, MORIGIN, XYSCALE, ZSCALE,
 ZORIGIN, XYTOLERANCE, ZTOLERANCE, MTOLERANCE layer creation options will be
 used in priority over the settings of :cpp:class:`OGRGeomCoordinatePrecision`.
 
-Comparison with the FileGDB driver
-----------------------------------
-
-(Comparison done with a FileGDB driver using FileGDB API SDK 1.4)
-
-Advantages of the OpenFileGDB driver:
+Advantages of the OpenFileGDB driver, compared to the FileGDB driver
+--------------------------------------------------------------------
 
 -  Can read ArcGIS 9.X Geodatabases, and not only 10 or above.
+
 -  Can open layers with any spatial reference system.
+
 -  Thread-safe (i.e. datasources can be processed in parallel).
+
 -  Uses the VSI Virtual File API, enabling the user to read a
    Geodatabase in a ZIP file or stored on a HTTP server.
+
 -  Faster on databases with a big number of fields.
+
 -  Does not depend on a third-party library.
+
 -  Robust against corrupted Geodatabase files.
 
-Drawbacks of the OpenFileGDB driver:
+Limitations
+-----------
+
+-  Reading data compressed in SDC format (Smart Data Compression) or in
+   CDF format (Compressed Data Format) is not supported. For CDF,
+   the :ref:`FileGDB driver <vector.filegdb>` can be used.
 
--  Cannot read data from compressed data in CDF format (Compressed Data
-   Format).
+-  Support for tables with 64-bit OBJECTIDs (which require GDAL >= 3.10), where
+   OBJECTIDs are sparse, is read-only and incomplete.
+   The driver will emit a warning if such situation occurs, and will attribute
+   non-faithful OBJECTIDs.
 
 Examples
 --------
diff --git a/doc/source/drivers/vector/parquet.rst b/doc/source/drivers/vector/parquet.rst
index fd8c9d84e1d2..ac8a5326a460 100644
--- a/doc/source/drivers/vector/parquet.rst
+++ b/doc/source/drivers/vector/parquet.rst
@@ -232,6 +232,30 @@ The driver can be installed as a plugin for the ``libgdal`` conda-forge package
 
     conda install -c conda-forge libgdal-arrow-parquet
 
+Standalone plugin compilation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. versionadded:: 3.10
+
+While this driver may be built as part of a whole GDAL build, either in libgdal
+itself, or as a plugin, it is also possible to only build this driver as a plugin,
+against an already built libgdal.
+
+The version of the GDAL sources used to build the driver must match the version
+of the libgdal it is built against.
+
+For example, from a "build_parquet" directory under the root of the GDAL source tree:
+
+::
+
+    cmake -S ../ogr/ogrsf_frmts/parquet -DCMAKE_PREFIX_PATH=/path/to/GDAL_installation_prefix -DArrow_DIR=/path/to/lib/cmake/Arrow -DParquet_DIR=/path/to/lib/cmake/Parquet
+    cmake --build .
+
+
+Note that such a plugin, when used against a libgdal not aware of it, will be
+systematically loaded at GDAL driver initialization time, and will not benefit from
+`deferred plugin loading capabilities <rfc-96>`. For that, libgdal itself must be built with the
+CMake variable OGR_REGISTER_DRIVER_PARQUET_FOR_LATER_PLUGIN=ON set.
 
 Links
 -----
diff --git a/doc/source/drivers/vector/pg.rst b/doc/source/drivers/vector/pg.rst
index b5b2f44b703b..b6857c97b4a1 100644
--- a/doc/source/drivers/vector/pg.rst
+++ b/doc/source/drivers/vector/pg.rst
@@ -455,6 +455,30 @@ The following configuration options are available:
       be destroyed. Typical use case: ``ogr2ogr -append PG:dbname=foo
       abc.shp --config OGR_TRUNCATE YES``.
 
+-  .. config:: OGR_PG_ENABLE_METADATA
+      :choices: YES, NO
+      :default: YES
+      :since: 3.9
+
+      If set to "YES" (the default), the driver will try to use the
+      ``ogr_system_tables.metadata`` table to retrieve and store
+      layer metadata. To be able to store metadata, the schema ``ogr_system_tables``
+      and the event trigger ``ogr_system_tables_event_trigger_for_metadata`` must
+      already exist in the database, or the current user must have sufficient rights
+      (super-user rights for the event trigger) to be able to create them. If not,
+      a warning will be raised.
+
+-  .. config:: OGR_PG_SKIP_CONFLICTS
+      :choices: YES, NO
+      :default: NO
+      :since: 3.10
+
+      If set to "YES" (not the default),
+      conflicts when inserting features will be skipped
+      (requires OGR_PG_RETRIEVE_FID to be off and only applies when PG_USE_COPY
+      is off).
+
+
 Examples
 ~~~~~~~~
 
diff --git a/doc/source/drivers/vector/pgeo.rst b/doc/source/drivers/vector/pgeo.rst
index 2176296c7f42..f363b2feaead 100644
--- a/doc/source/drivers/vector/pgeo.rst
+++ b/doc/source/drivers/vector/pgeo.rst
@@ -104,8 +104,7 @@ How to use PGeo driver with unixODBC and MDB Tools (on Unix and Linux)
 
 This article gives step-by-step explanation of how to use OGR with
 unixODBC package and how to access Personal Geodatabase with PGeo
-driver. See also `GDAL wiki for other
-details <http://trac.osgeo.org/gdal/wiki/mdbtools>`__
+driver.
 
 Prerequisites
 ~~~~~~~~~~~~~
diff --git a/doc/source/drivers/vector/plscenes_data_v1.rst b/doc/source/drivers/vector/plscenes_data_v1.rst
index da7cfe97736c..c5dc8cddf89a 100644
--- a/doc/source/drivers/vector/plscenes_data_v1.rst
+++ b/doc/source/drivers/vector/plscenes_data_v1.rst
@@ -133,7 +133,7 @@ The following configuration options are available:
 Attributes
 ----------
 
-The layer field definition is built from the "plscensconf.json" file in
+The layer field definition is built from the "plscenesconf.json" file in
 the GDAL configuration. The links to downloadable products are in
 *asset_XXXXX_location* attributes where XXXXX is the asset category id,
 when they are active. Otherwise they should be activated by sending a
diff --git a/doc/source/drivers/vector/shapefile.rst b/doc/source/drivers/vector/shapefile.rst
index 67cd3abee67f..c978c611612b 100644
--- a/doc/source/drivers/vector/shapefile.rst
+++ b/doc/source/drivers/vector/shapefile.rst
@@ -166,9 +166,7 @@ terminated with an error.
 Note that this can make it very difficult to translate a mixed geometry
 layer from another format into Shapefile format using ogr2ogr, since
 ogr2ogr has no support for separating out geometries from a source
-layer. See the
-`FAQ <http://trac.osgeo.org/gdal/wiki/FAQVector#HowdoItranslateamixedgeometryfiletoshapefileformat>`__
-for a solution.
+layer.
 
 Shapefile feature attributes are stored in an associated .dbf file, and
 so attributes suffer a number of limitations:
@@ -484,5 +482,3 @@ See Also
 --------
 
 -  `Shapelib Page <http://shapelib.maptools.org/>`__
--  `User Notes on OGR Shapefile
-   Driver <http://trac.osgeo.org/gdal/wiki/UserDocs/Shapefiles>`__
diff --git a/doc/source/drivers/vector/topojson.rst b/doc/source/drivers/vector/topojson.rst
index 36879bae6fd3..2604be2aa6c5 100644
--- a/doc/source/drivers/vector/topojson.rst
+++ b/doc/source/drivers/vector/topojson.rst
@@ -33,7 +33,11 @@ The driver accepts three types of sources of data:
 -  Text passed directly and encoded in Topo JSON
 
 Starting with GDAL 2.3, the URL/filename/text might be prefixed with
-TopoJSON: to avoid any ambiguity with other drivers.
+TopoJSON: to avoid any ambiguity with other drivers. Alternatively, starting
+with GDAL 3.10, specifying the ``-if TopoJSON`` option to command line utilities
+accepting it, or ``TopoJSON`` as the only value of the ``papszAllowedDrivers`` of
+:cpp:func:`GDALOpenEx`, also forces the driver to recognize the passed
+URL/filename/text.
 
 See Also
 --------
diff --git a/doc/source/drivers/vector/wfs.rst b/doc/source/drivers/vector/wfs.rst
index 7ceb53e67b10..bc45eddfbdcd 100644
--- a/doc/source/drivers/vector/wfs.rst
+++ b/doc/source/drivers/vector/wfs.rst
@@ -30,6 +30,11 @@ The minimal syntax to open a WFS datasource is :
 *WFS:http://path/to/WFS/service* or
 *http://path/to/WFS/service?SERVICE=WFS*
 
+Starting with GDAL 3.10, specifying the ``-if WFS`` option to command line utilities
+accepting it, or ``WFS`` as the only value of the ``papszAllowedDrivers`` of
+:cpp:func:`GDALOpenEx`, also forces the driver to recognize the passed
+URL without the ``WFS:`` prefix.
+
 Additional optional parameters can be specified such as *TYPENAME*,
 *VERSION*, *MAXFEATURES* (WFS < 2) or *COUNT* (WFS > 2) as specified in WFS specification.
 
diff --git a/doc/source/drivers/vector/xodr.rst b/doc/source/drivers/vector/xodr.rst
new file mode 100644
index 000000000000..e95feb12eb25
--- /dev/null
+++ b/doc/source/drivers/vector/xodr.rst
@@ -0,0 +1,198 @@
+.. _vector.xodr:
+
+XODR -- OpenDRIVE Road Description Format
+=========================================
+
+.. versionadded:: 3.10
+
+.. shortname:: XODR
+
+.. build_dependencies:: libOpenDRIVE >= 0.6.0, GEOS
+
+This driver provides read access to road network elements of ASAM OpenDRIVE datasets.
+
+`ASAM OpenDRIVE <https://www.asam.net/standards/detail/opendrive/>`_ is an open industry format for lane-detailed description of road networks, commonly used in applications of the automotive and transportation systems domains. It bundles polynomial, continuous road geometry modelling with all necessary topological links and semantic information from traffic-regulating infrastructure (signs and traffic lights).
+
+Driver capabilities
+-------------------
+
+.. supports_georeferencing::
+
+Specification version
+---------------------
+
+The currently supported OpenDRIVE version is 1.4 and depends on what is provided by libOpenDRIVE_. 
+
+.. _libOpenDRIVE: https://github.com/pageldev/libOpenDRIVE/
+
+Supported OpenDRIVE elements
+++++++++++++++++++++++++++++
+
+The XODR driver exposes OpenDRIVE's different road elements as separate layers by converting geometric elements into 3-dimensional OGR geometry types. The following _`layer types` are currently implemented:
+
+* *ReferenceLine*: Road reference line (``<planView>``) as :cpp:class:`OGRLineString`.
+* *LaneBorder*: Outer road lane border as :cpp:class:`OGRLineString`.
+* *Lane*: Polygonal surface (TIN) of the lane mesh as :cpp:class:`OGRTriangulatedSurface`.
+* *RoadMark*: Polygonal surface (TIN) of the road mark mesh as :cpp:class:`OGRTriangulatedSurface`.
+* *RoadObject*: Polygonal surface (TIN) of the road object mesh as :cpp:class:`OGRTriangulatedSurface`.
+* *RoadSignal*: Polygonal surface (TIN) of the road signal mesh as :cpp:class:`OGRTriangulatedSurface`.
+
+Spatial reference
+-----------------
+
+By definition, OpenDRIVE geometries are always referenced in a Cartesian coordinate system which defaults to having its origin at ``(0, 0, 0)``. If real-world coordinates are used, the OpenDRIVE header provides a PROJ.4 string with the definition of a projected spatial reference system:
+
+::
+
+  <header ...>
+    <geoReference><![CDATA[+proj=tmerc +lat_0=0 +lon_0=9 +k=0.9996 +x_0=500000 +y_0=0 +datum=WGS84 +units=m +no_defs]]></geoReference>
+  </header>
+
+The XODR driver uses this PROJ definition as spatial reference for creation of all OGR geometry layers. 
+
+Limitations
+-----------
+
+The supported content encoding of OpenDRIVE XML files is limited to what pugixml is able to automatically guess (see `4.6. Encodings <https://pugixml.org/docs/manual.html#loading.encoding>`_). The default fallback encoding is UTF-8.
+
+Open options
+------------
+
+The following open options can be specified
+(typically with the ``-oo name=value`` parameters of :program:`ogrinfo` or :program:`ogr2ogr`):
+
+-  .. oo:: EPSILON
+      :choices: <float>
+      :default: 1.0
+
+      Epsilon value ``> 0.0`` for linear approximation of continuous OpenDRIVE geometries. A smaller value results in a finer sampling. This parameter corresponds to libOpenDRIVE's ``eps`` parameter.
+
+-  .. oo:: DISSOLVE_TIN
+      :choices: YES, NO
+      :default: NO
+
+      Whether to dissolve triangulated surfaces. By setting this option to YES, the TIN layers *Lane* and *RoadMark* of geometry type :cpp:class:`OGRTriangulatedSurface` will be simplified to single, simple :cpp:class:`OGRPolygon` geometries. This performs a :cpp:func:`UnaryUnion` which dissolves boundaries of all touching triangle patches and thus yields a slimmer dataset which often suffices for basic GIS usage. Be aware that this dissolving step increases processing time significantly.
+      Layer *RoadSignal* will be dissolved to a simple :cpp:class:`OGRPoint`.
+
+Examples
+--------
+
+- Translate OpenDRIVE road *ReferenceLine* elements (``<planView>``) to :ref:`Shapefile <vector.shapefile>` using :program:`ogr2ogr`. The desired :ref:`layer type <layer types>` which is to be extracted from the dataset is specified as the last parameter of the function call. 
+
+  ::
+
+    ogr2ogr -f "ESRI Shapefile" CulDeSac.shp CulDeSac.xodr ReferenceLine
+
+- Convert the whole OpenDRIVE dataset with all its different layers into a :ref:`GeoPackage <vector.gpkg>` using:
+
+  ::
+
+    ogr2ogr -f "GPKG" CulDeSac.gpkg CulDeSac.xodr
+
+- Convert the whole OpenDRIVE dataset with custom parameters :oo:`EPSILON` and :oo:`DISSOLVE_TIN` into a :ref:`GeoPackage <vector.gpkg>`:
+
+  ::
+
+    ogr2ogr -f "GPKG" CulDeSac.gpkg CulDeSac.xodr -oo EPSILON=0.9 -oo DISSOLVE_TIN=YES
+
+Convenient usage through docker image 
+-------------------------------------
+
+To use the XODR driver through a docker image, first build the image from the corresponding docker directory 
+    
+  ::
+
+    cd <gdal>/docker/ubuntu-full/
+    docker build -t gdal/xodr -f Dockerfile .
+
+For general usage information refer to `GDAL Docker images <https://github.com/OSGeo/gdal/tree/master/docker#usage>`__. Usage examples:
+
+- Use :program:`ogrinfo` to extract detailed information about a local `xodr` file by mounting your current working directory (`$PWD`) containing the file into the Docker container:
+  
+  ::
+
+    docker run --rm -v ${PWD}:/home -it gdal/xodr ogrinfo /home/<file>.xodr
+
+- Use :program:`ogr2ogr` to convert a local `xodr` file into any other supported OGR output format. The result will be automatically available in your host machine's working directory which is mounted into the container: 
+  
+  ::
+
+    docker run --rm -v ${PWD}:/home -it gdal/xodr ogr2ogr -f "GPKG" /home/<file>.gpkg /home/<file>.xodr
+
+
+Alternatively, you can run a docker container that enables using the XODR driver in an isolated workspace from within the container 
+    
+    ::
+
+      docker run --name <container_name> -it gdal/xodr /bin/bash
+
+
+General building notes
+----------------------
+
+Building of the driver as plugin is tested to work on
+
+* Ubuntu 24.04 using GCC
+* Windows 10 using GCC 13.1.0 (with MCF threads) + MinGW-w64 11.0.0 (MSVCRT runtime), which is obtainable from `WinLibs <https://winlibs.com/>`_.
+
+Ensure to meet the following driver dependencies:
+
+* PROJ
+* GEOS
+* libOpenDRIVE_ as shared library (built with CMake option ``-DBUILD_SHARED_LIBS=ON``)
+
+Then, after checking out GDAL sources with this driver extension, create the build directory:
+
+  ::
+
+    cd <gdal>
+    mkdir build
+    cd build
+
+From the build directory configure CMake to activate our XODR driver as plugin:
+
+  ::
+
+    cmake .. -DOGR_ENABLE_DRIVER_XODR_PLUGIN=TRUE -DOpenDrive_DIR=/path/to/libOpenDRIVE/installdir/cmake/
+
+.. note:: The :file:`cmake/` path is usually automatically created when installing libOpenDRIVE and contains the necessary configuration files for inclusion into other project builds.
+
+Now, build GDAL and install it:
+
+  ::
+
+    cmake --build .
+    cmake --build . --target install
+
+Afterwards you will find a new shared library file :file:`{path/to/GDAL/installdir}/lib/gdalplugins/ogr_XODR`.
+
+Verifying a successful build
+++++++++++++++++++++++++++++
+
+Check if XODR driver is found:
+
+  ::
+    
+    cd <gdal>/build/
+    ./apps/ogrinfo --format XODR
+
+This should print basic capabilities of the driver:
+
+  ::
+
+    Format Details:
+      Short Name: XODR
+      Long Name: OpenDRIVE - Open Dynamic Road Information for Vehicle Environment
+      Supports: Vector
+      Supports: Open() - Open existing dataset.
+    <OpenOptionList>
+      ...
+    </OpenOptionList>
+
+If you are on Linux, depending on your environment, you might experience linker errors like: 
+
+  ::
+
+    ERROR 1: libOpenDrive.so: cannot open shared object file: No such file or directory
+
+In such cases ensure that your environment variable ``LD_LIBRARY_PATH`` points to the corresponding install directories of libOpenDRIVE and GDAL and run ``ldconfig`` afterwards.
diff --git a/doc/source/faq.rst b/doc/source/faq.rst
index d49c2f00bf77..a08d34f79882 100644
--- a/doc/source/faq.rst
+++ b/doc/source/faq.rst
@@ -4,7 +4,7 @@
 FAQ
 ================================================================================
 
-.. TODO maybe migrate the chapters 2 and following of https://trac.osgeo.org/gdal/wiki/FAQ
+.. TODO maybe migrate the chapters 2 and following of http://web.archive.org/web/https://trac.osgeo.org/gdal/wiki/FAQ
 
 .. only:: not latex
 
@@ -92,6 +92,11 @@ Is GDAL thread-safe ?
 
 See :ref:`multithreading`
 
+Does GDAL provide a Section 508 information?
+++++++++++++++++++++++++++++++++++++++++++++
+
+No, GDAL itself is an open-source software and project, not a Vendor. If your organization considers they need a `VPAT or Section 508 <https://www.section508.gov/sell/acr/>`_ form to be able to use GDAL, it is their responsibility to complete the needed steps themselves.
+
 How do I cite GDAL ?
 ++++++++++++++++++++
 
diff --git a/doc/source/gdal_rtd/static/css/gdal.css b/doc/source/gdal_rtd/static/css/gdal.css
index 70f9d653f0a4..964564335f44 100644
--- a/doc/source/gdal_rtd/static/css/gdal.css
+++ b/doc/source/gdal_rtd/static/css/gdal.css
@@ -203,12 +203,6 @@ a.reference.external::after
     text-decoration: none;
 }
 
-/* Override wy-nav colors to match company branding */
-.wy-side-nav-search, .wy-side-nav-search img, .wy-nav .wy-menu-vertical header, .wy-nav-top, .wy-nav-top img
-{
-	  background-color: #28728d;
-}
-
 /* center figures and captions */
 .rst-content div.figure { text-align: center; }
 
@@ -335,3 +329,21 @@ div.horizontal-logos::after {
     clear: both;
     display: table;
 }
+
+.wy-side-nav-search > div.switch-menus > div.version-switch {
+    background: white;
+    color: #343131;
+}
+
+.wy-side-nav-search > div.switch-menus > div.version-switch select {
+    background: white;
+    color: #343131;
+}
+
+.wy-side-nav-search > div.switch-menus > div.version-switch select:active,
+.wy-side-nav-search > div.switch-menus > div.version-switch select:focus,
+.wy-side-nav-search > div.switch-menus > div.version-switch select:hover
+{
+    background: white;
+    color: #343131;
+}
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 6f9973dae077..9048d974ad77 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -4,13 +4,9 @@ GDAL
 
 .. include:: ./about_no_title.rst
 
-This documentation is also available as a `PDF file <gdal.pdf>`_,
-and `a .ZIP of individual HTML pages <https://github.com/OSGeo/gdal-docs/archive/refs/heads/master.zip>`_ for offline browsing. (The .ZIP also includes that .PDF.) The documentation reflects the latest state of the development branch of the software.
-
-
-
 .. toctree::
     :maxdepth: 2
+    :includehidden:
 
     download
     programs/index
@@ -25,8 +21,12 @@ and `a .ZIP of individual HTML pages <https://github.com/OSGeo/gdal-docs/archive
     contributing/index
     faq
     license
+    thanks
 
 Index
 =====
 
 * :ref:`genindex`
+
+.. meta::
+   :google-site-verification: 9rQvEBJEGGlTYi0neT9qNthRNbnxE4LCy_hdZ6WDiK4
diff --git a/doc/source/index_pdf.rst b/doc/source/index_pdf.rst
index 2466c5e73750..a5b61c259df1 100644
--- a/doc/source/index_pdf.rst
+++ b/doc/source/index_pdf.rst
@@ -21,3 +21,4 @@ GDAL
     community/index
     sponsors/index
     contributing/index
+    thanks
diff --git a/doc/source/programs/gdal2tiles.rst b/doc/source/programs/gdal2tiles.rst
index 2e51559bd161..164e478aa9e6 100644
--- a/doc/source/programs/gdal2tiles.rst
+++ b/doc/source/programs/gdal2tiles.rst
@@ -264,7 +264,7 @@ WEBP options
 WEBP tiledriver support is new to GDAL 3.6. It is enabled by using --tiledriver=WEBP.
 
 
-The following configuration options are available to further customize the webp output:
+The following configuration options are available to further customize the WebP output:
 
 .. option:: --webp-quality=<QUALITY>
 
@@ -288,7 +288,7 @@ JPEG tiledriver support is new to GDAL 3.9. It is enabled by using --tiledriver=
 Note that JPEG does not support transparency, hence edge tiles will display black
 pixels in areas not covered by the source raster.
 
-The following configuration options are available to further customize the webp output:
+The following configuration options are available to further customize the JPEG output:
 
 .. option:: ---jpeg-quality=JPEG_QUALITY
 
diff --git a/doc/source/programs/gdal_calc.rst b/doc/source/programs/gdal_calc.rst
index 9e752b1a6f51..98527d1a1ebf 100644
--- a/doc/source/programs/gdal_calc.rst
+++ b/doc/source/programs/gdal_calc.rst
@@ -82,7 +82,7 @@ but no projection checking is performed (unless projectionCheck option is used).
 
     .. note::
 
-       Despite the datatype set using ``--type``, when doing intermediate aritmethic operations using operands of the
+       Despite the datatype set using ``--type``, when doing intermediate arithmetic operations using operands of the
        same type, the operation result will honor the original datatype. This may lead into unexpected results in the final result.
 
     .. note::
diff --git a/doc/source/programs/gdal_contour.rst b/doc/source/programs/gdal_contour.rst
index f07443565ddc..bf3440707c0c 100644
--- a/doc/source/programs/gdal_contour.rst
+++ b/doc/source/programs/gdal_contour.rst
@@ -20,7 +20,7 @@ Synopsis
                  [-3d] [-inodata] [-snodata <n>] [-f <formatname>] [-i <interval>]
                  [-dsco <NAME>=<VALUE>]... [-lco <NAME>=<VALUE>]...
                  [-off <offset>] [-fl <level> <level>...] [-e <exp_base>]
-                 [-nln <outlayername>] [-q] [-p]
+                 [-nln <outlayername>] [-q] [-p] [-gt <n>|unlimited]
                  <src_filename> <dst_filename>
 
 Description
@@ -93,17 +93,19 @@ be on the right, i.e. a line string goes clockwise around a top.
 
 .. option:: -i <interval>
 
-    Elevation interval between contours. Ignored if -fl is used.
+    Elevation interval between contours.
     Must specify either -i or -fl or -e.
 
 .. option:: -off <offset>
 
-    Offset from zero relative to which to interpret intervals. Ignored if -fl is used.
+    Offset from zero relative to which to interpret intervals.
+
+    For example, `-i 100` requests contours at ...-100, 0, 100...
+    Further adding `-off 25` makes that request instead ...-75, 25, 125...
 
 .. option:: -fl <level>
 
     Name one or more "fixed levels" to extract.
-    Must specify either -i or -fl or -e.
 
 .. option:: -e <base>
 
@@ -122,6 +124,15 @@ be on the right, i.e. a line string goes clockwise around a top.
 
     .. versionadded:: 2.4.0
 
+.. option:: -gt <n>
+
+    Group n features per transaction (default 100 000). Increase the value for
+    better performance when writing into DBMS drivers that have transaction
+    support. ``n`` can be set to unlimited to load the data into a single
+    transaction. If set to 0, no explicit transaction is done.
+
+    .. versionadded:: 3.10
+
 .. option:: -q
 
     Be quiet: do not print progress indicators.
diff --git a/doc/source/programs/gdal_edit.rst b/doc/source/programs/gdal_edit.rst
index 983f315c478d..0fa57725523d 100644
--- a/doc/source/programs/gdal_edit.rst
+++ b/doc/source/programs/gdal_edit.rst
@@ -15,14 +15,14 @@ Synopsis
 
 .. code-block::
 
-    gdal_edit [--help] [--help-general] [-ro] [-a_srs <srs_def>] 
+    gdal_edit [--help] [--help-general] [-ro] [-a_srs <srs_def>]
             [-a_ullr <ulx> <uly> <lrx> <lry>] [-a_ulurll <ulx> <uly> <urx> <ury> <llx> <lly>]
             [-tr <xres> <yres>] [-unsetgt] [-unsetrpc] [-a_nodata <value>] [-unsetnodata]
             [-a_coord_epoch <epoch>] [-unsetepoch]
             [-unsetstats] [-stats] [-approx_stats]
             [-setstats <min> <max> <mean> <stddev>]
             [-scale <value>] [-offset <value>] [-units <value>]
-            [-colorinterp_<X> {red|green|blue|alpha|gray|undefined}]...
+            [-colorinterp_<X> {red|green|blue|alpha|gray|undefined|pan|coastal|rededge|nir|swir|mwir|lwir|...}]...
             [-gcp <pixel> <line> <easting> <northing> [<elevation>]]...
             [-unsetmd] [-oo <NAME>=<VALUE>]... [-mo <META-TAG>=<VALUE>]...
             <datasetname>
@@ -172,7 +172,7 @@ It works only with raster formats that support update access to existing dataset
 
     .. versionadded:: 3.1
 
-.. option:: -colorinterp_<X> {red|green|blue|alpha|gray|undefined}
+.. option:: -colorinterp_<X> {red|green|blue|alpha|gray|undefined|pan|coastal|rededge|nir|swir|mwir|lwir|...}
 
     Change the color interpretation of band X (where X is a valid band
     number, starting at 1).
diff --git a/doc/source/programs/gdal_merge.rst b/doc/source/programs/gdal_merge.rst
index d9f04c80c17c..2895eb857818 100644
--- a/doc/source/programs/gdal_merge.rst
+++ b/doc/source/programs/gdal_merge.rst
@@ -71,6 +71,10 @@ target pixel in the resulting raster nor will it overwrite a valid pixel value.
     If not specified the aggregate extents of all input files will be
     used.
 
+.. option:: -q, -quiet
+
+    Suppress progress messages.
+
 .. option:: -v
 
     Generate verbose output of mosaicing operations as they are done.
diff --git a/doc/source/programs/gdal_rasterize.rst b/doc/source/programs/gdal_rasterize.rst
index 43744d1fa967..048703557451 100644
--- a/doc/source/programs/gdal_rasterize.rst
+++ b/doc/source/programs/gdal_rasterize.rst
@@ -68,6 +68,14 @@ raster data is only supported since GDAL 2.1.0.
     polygon is just touching the pixel center). Defaults to disabled for normal
     rendering rules.
 
+    .. note::
+
+        When this option is enabled, the order of the input features (lines or polygons)
+        can affect the results. When two features touch each other, the last one (i.e. topmost)
+        will determine the burned pixel value at the edge.
+        You may wish to use the :option:`-sql` option to reorder the features (ORDER BY)
+        to achieve a more predictable result.
+
 .. option:: -burn <value>
 
     A fixed value to burn into a band for all objects.  A list of :option:`-burn` options
@@ -94,7 +102,7 @@ raster data is only supported since GDAL 2.1.0.
 
     Indicates the layer(s) from the datasource that will be used for input
     features.  May be specified multiple times, but at least one layer name or a
-    :option:`-sql` option must be specified.
+    :option:`-sql` option must be specified (not both).
 
 .. option:: -where <expression>
 
@@ -108,6 +116,10 @@ raster data is only supported since GDAL 2.1.0.
     Starting with GDAL 3.7, the ``@filename`` syntax can be used to indicate
     that the content is in the pointed filename.
 
+    .. note::
+
+        This option will be ignored if the :option:`-l` option has been set as well.
+
 .. option:: -dialect <dialect>
 
     SQL dialect. In some cases can be used to use (unoptimized) OGR SQL instead of
@@ -173,7 +185,9 @@ raster data is only supported since GDAL 2.1.0.
 
 .. option:: -ot <type>
 
-    Force the output bands to be of the indicated data type. Defaults to ``Float64``
+    Force the output bands to be of the indicated data type. Defaults to ``Float64``,
+    unless the attribute field to burn is of type ``Int64``, in which case ``Int64``
+    is used for the output raster data type if the output driver supports it.
 
 .. option:: -optim {AUTO|VECTOR|RASTER}
 
diff --git a/doc/source/programs/gdal_retile.rst b/doc/source/programs/gdal_retile.rst
index d1d8d81a2573..81766aa89c53 100644
--- a/doc/source/programs/gdal_retile.rst
+++ b/doc/source/programs/gdal_retile.rst
@@ -33,6 +33,7 @@ Description
 
 This utility will retile a set of input tile(s). All the input tile(s) must
 be georeferenced in the same coordinate system and have a matching number of bands.
+The geotransform matrix of input tiles must not contain rotation terms.
 
 Optionally pyramid levels are generated. All pyramid levels are generated from the
 input tiles (not from previous levels).
diff --git a/doc/source/programs/gdal_translate.rst b/doc/source/programs/gdal_translate.rst
index 8c13b82d5e56..1b7d9b39041c 100644
--- a/doc/source/programs/gdal_translate.rst
+++ b/doc/source/programs/gdal_translate.rst
@@ -32,8 +32,8 @@ Synopsis
        [-a_gt <gt0> <gt1> <gt2> <gt3> <gt4> <gt5>]
        [-a_scale <value>] [-a_offset <value>]
        [-nogcp] [-gcp <pixel> <line> <easting> <northing> [<elevation>]]...
-       |-colorinterp{_bn} {red|green|blue|alpha|gray|undefined}]
-       |-colorinterp {red|green|blue|alpha|gray|undefined},...]
+       |-colorinterp{_bn} {red|green|blue|alpha|gray|undefined|pan|coastal|rededge|nir|swir|mwir|lwir|...}]
+       |-colorinterp {red|green|blue|alpha|gray|undefined|pan|coastal|rededge|nir|swir|mwir|lwir|...},...]
        [-mo <META-TAG>=<VALUE>]... [-dmo "DOMAIN:META-TAG=VALUE"]... [-q] [-sds]
        [-co <NAME>=<VALUE>]... [-stats] [-norat] [-noxmp]
        [-oo <NAME>=<VALUE>]...
@@ -289,14 +289,14 @@ resampling, and rescaling pixels in the process.
     nodata value, this does not cause pixel values that are equal to that nodata
     value to be changed to the value specified with this option.
 
-.. option:: -colorinterp_X <red|green|blue|alpha|gray|undefined>
+.. option:: -colorinterp_X <red|green|blue|alpha|gray|undefined|pan|coastal|rededge|nir|swir|mwir|lwir|...>
 
     Override the color interpretation of band X (where X is a valid band number,
     starting at 1)
 
     .. versionadded:: 2.3
 
-.. option:: -colorinterp {red|green|blue|alpha|gray|undefined},...
+.. option:: -colorinterp {red|green|blue|alpha|gray|undefined|pan|coastal|rededge|nir|swir|mwir|lwir|...},...
 
     Override the color interpretation of all specified bands. For
     example -colorinterp red,green,blue,alpha for a 4 band output dataset.
diff --git a/doc/source/programs/gdal_viewshed.rst b/doc/source/programs/gdal_viewshed.rst
index 12d121f84a57..26034a29288b 100644
--- a/doc/source/programs/gdal_viewshed.rst
+++ b/doc/source/programs/gdal_viewshed.rst
@@ -23,6 +23,7 @@ Synopsis
                  -ox <observer_x> -oy <observer_y>
                  [-vv <visibility>] [-iv <invisibility>]
                  [-ov <out_of_range>] [-cc <curvature_coef>]
+                 [-os <observer_spacing>] [-j <relative job count>]
                  [-co <NAME>=<VALUE>]...
                  [-q] [-om <output mode>]
                  <src_filename> <dst_filename>
@@ -60,11 +61,15 @@ Byte. With the -mode flag can also return a minimum visible height raster of typ
 
 .. option:: -ox <value>
 
-   The X position of the observer (in SRS units).
+   The X position of the observer (in SRS units).  If the coordinate is outside of the
+   raster, all space between the observer and the raster is assumed not to occlude
+   visibility of the raster. (Not supported in cumulative mode.)
 
 .. option:: -oy <value>
 
-   The Y position of the observer (in SRS units).
+   The Y position of the observer (in SRS units).  If the coordinate is outside of the
+   raster, all space between the observer and the raster is assumed not to occlude
+   visibility of the raster. (Not supported in cumulative mode.)
 
 .. option:: -oz <value>
 
@@ -76,8 +81,9 @@ Byte. With the -mode flag can also return a minimum visible height raster of typ
 
 .. option:: -md <value>
 
-   Maximum distance from observer to compute visibiliy.
+   Maximum distance from observer to compute visibility.
    It is also used to clamp the extent of the output raster.
+   (Not supported in cumulative mode)
 
 .. option:: -cc <value>
 
@@ -124,22 +130,22 @@ Byte. With the -mode flag can also return a minimum visible height raster of typ
 
 .. option:: -iv <value>
 
-   Pixel value to set for invisible areas. Default: 0
+   Pixel value to set for invisible areas. (Not supported in cumulative mode) Default: 0
 
 .. option:: -ov <value>
 
    Pixel value to set for the cells that fall outside of the range specified by
-   the observer location and the maximum distance. Default: 0
+   the observer location and the maximum distance. (Not supported in cumulative mode) Default: 0
 
 .. option:: -vv <value>
 
-   Pixel value to set for visible areas. Default: 255
+   Pixel value to set for visible areas. (Not supported in cumulative mode) Default: 255
 
 .. option:: -om <output mode>
 
   Sets what information the output contains.
 
-  Possible values: NORMAL, DEM, GROUND
+  Possible values: NORMAL, DEM, GROUND, ACCUM
 
   NORMAL returns a raster of type Byte containing visible locations.
 
@@ -147,8 +153,21 @@ Byte. With the -mode flag can also return a minimum visible height raster of typ
   height for target to be visible from the DEM surface or ground level respectively.
   Flags -tz, -iv and -vv will be ignored.
 
+  Cumulative (ACCUM) mode will create an eight bit raster the same size as the input raster
+  where each cell represents the relative observability from a grid of observer points.
+  See the -os option.
+
   Default NORMAL
 
+.. option:: -os <value>
+
+   Cell Spacing between observers (only supported in cumulative mode) Default: 10
+
+.. option:: -j <value>
+
+   Relative number of jobs to run at once. (only supported in cumulative mode) Default: 3
+
+
 C API
 -----
 
diff --git a/doc/source/programs/gdaladdo.rst b/doc/source/programs/gdaladdo.rst
index f9a620cf757a..d24b6d06ea5b 100644
--- a/doc/source/programs/gdaladdo.rst
+++ b/doc/source/programs/gdaladdo.rst
@@ -16,7 +16,7 @@ Synopsis
 .. code-block::
 
     gdaladdo [--help] [--help-general]
-             [-r {nearest|average|rms|gauss|cubic|cubicspline|lanczos|average_mp|average_magphase|mode}]
+             [-r {nearest|average|rms|gauss|bilinear|cubic|cubicspline|lanczos|average_mp|average_magphase|mode}]
              [-ro] [-clean] [-q] [-oo <NAME>=<VALUE>]... [-minsize <val>]
              [--partial-refresh-from-source-timestamp]
              [--partial-refresh-from-projwin <ulx> <uly> <lrx> <lry>]
@@ -33,7 +33,7 @@ most supported file formats with one of several downsampling algorithms.
 
 .. include:: options/help_and_help_general.rst
 
-.. option:: -r {nearest|average|rms|gauss|cubic|cubicspline|lanczos|average_magphase|mode}
+.. option:: -r {nearest|average|rms|gauss|bilinear|cubic|cubicspline|lanczos|average_magphase|mode}
 
     Select a resampling algorithm. The default is ``nearest``, which is generally not
     appropriate if sub-pixel accuracy is desired.
@@ -50,13 +50,13 @@ most supported file formats with one of several downsampling algorithms.
 
     ``rms`` computes the root mean squared / quadratic mean of all non-NODATA contributing pixels (GDAL >= 3.3)
 
-    ``bilinear`` applies a bilinear convolution kernel.
-
     ``gauss`` applies a Gaussian kernel before computing the overview,
     which can lead to better results than simple averaging in e.g case of sharp edges
     with high contrast or noisy patterns. The advised level values should be 2, 4, 8, ...
     so that a 3x3 resampling Gaussian kernel is selected.
 
+    ``bilinear`` applies a bilinear convolution kernel.
+
     ``cubic`` applies a cubic convolution kernel.
 
     ``cubicspline`` applies a B-Spline convolution kernel.
diff --git a/doc/source/programs/gdaldem.rst b/doc/source/programs/gdaldem.rst
index c8b86de2cbdf..f30d63d445c2 100644
--- a/doc/source/programs/gdaldem.rst
+++ b/doc/source/programs/gdaldem.rst
@@ -56,7 +56,7 @@ Generate a color relief map:
                  [-alpha] [-exact_color_entry | -nearest_color_entry]
                  [-b <band>] [-of format] [-co <NAME>=<VALUE>]... [-q]
 
-    where color_text_file contains lines of the format "elevation_value red green blue"
+    where color_text_file contains lines of the format "elevation_value red green blue [alpha]". If alpha column is present it can be enabled for use with '-alpha'.
 
 Generate a Terrain Ruggedness Index (TRI) map:
 
@@ -413,8 +413,8 @@ See also
 
 Documentation of related GRASS utilities:
 
-https://grass.osgeo.org/grass79/manuals/r.slope.aspect.html
+https://grass.osgeo.org/grass84/manuals/r.slope.aspect.html
 
-https://grass.osgeo.org/grass79/manuals/r.relief.html
+https://grass.osgeo.org/grass84/manuals/r.relief.html
 
-https://grass.osgeo.org/grass79/manuals/r.colors.html
+https://grass.osgeo.org/grass84/manuals/r.colors.html
diff --git a/doc/source/programs/gdalinfo.rst b/doc/source/programs/gdalinfo.rst
index 5c55f2920e39..01ef40ad0d97 100644
--- a/doc/source/programs/gdalinfo.rst
+++ b/doc/source/programs/gdalinfo.rst
@@ -17,7 +17,7 @@ Synopsis
 
     gdalinfo [--help] [--help-general]
              [-json] [-mm] [-stats | -approx_stats] [-hist]
-             [-nogcp] [-nomd] [-norat] [-noct] [-nofl]
+             [-nogcp] [-nomd] [-norat] [-noct] [-nofl] [-nonodata] [-nomask]
              [-checksum] [-listmdd] [-mdd <domain>|all]
              [-proj4] [-wkt_format {WKT1|WKT2|<other_format>}]...
              [-sd <subdataset>] [-oo <NAME>=<VALUE>]... [-if <format>]...
@@ -83,6 +83,21 @@ The following command line parameters can appear in any order
 
     Suppress printing of color table.
 
+.. option:: -nonodata
+
+    .. versionadded:: 3.10
+
+    Suppress nodata printing. Implies :option:`-nomask`.
+
+    Can be useful for example when querying a remove GRIB2 dataset that has an
+    index .idx side-car file, together with :option:`-nomd`
+
+.. option:: -nomask
+
+    .. versionadded:: 3.10
+
+    Suppress band mask printing. Is implied if :option:`-nonodata` is specified.
+
 .. option:: -checksum
 
     Force computation of the checksum for each band in the dataset.
diff --git a/doc/source/programs/gdallocationinfo.rst b/doc/source/programs/gdallocationinfo.rst
index 65569e4a31f9..a0188f8f10e0 100644
--- a/doc/source/programs/gdallocationinfo.rst
+++ b/doc/source/programs/gdallocationinfo.rst
@@ -19,6 +19,7 @@ Synopsis
                             [-xml] [-lifonly] [-valonly]
                             [-E] [-field_sep <sep>] [-ignore_extra_input]
                             [-b <band>]... [-overview <overview_level>]
+                            [-r {nearest|bilinear|cubic|cubicspline}]
                             [[-l_srs <srs_def>] | [-geoloc] | [-wgs84]]
                             [-oo <NAME>=<VALUE>]... <srcfile> [<x> <y>]
 
@@ -54,6 +55,22 @@ reporting options are provided.
     Selects a band to query.  Multiple bands can be listed.  By default all
     bands are queried.
 
+.. option:: -r {nearest|bilinear|cubic|cubicspline}
+
+    .. versionadded:: 3.10
+
+    Select a sampling algorithm. The default is ``nearest``.
+
+    The available methods are:
+
+    ``nearest`` applies a nearest neighbour.
+
+    ``bilinear`` applies a bilinear convolution kernel.
+
+    ``cubic`` applies a cubic convolution kernel.
+
+    ``cubicspline`` applies a B-Spline convolution kernel.
+
 .. option:: -overview <overview_level>
 
     Query the (overview_level)th overview (overview_level=1 is the 1st overview),
diff --git a/doc/source/programs/gdalmanage.rst b/doc/source/programs/gdalmanage.rst
index 8c8b995f088c..7929c08c2406 100644
--- a/doc/source/programs/gdalmanage.rst
+++ b/doc/source/programs/gdalmanage.rst
@@ -16,7 +16,7 @@ Synopsis
 .. code-block::
 
     Usage: gdalmanage [--help] [--help-general]
-                      <mode> [-r] [-u] [-f <format>]
+                      <mode> [-r] [-fr] [-u] [-f <format>]
                       <datasetname> [<newdatasetname>]
 
 Description
@@ -31,18 +31,22 @@ data types and deleting, renaming or copying the files.
     Mode of operation
 
     **identify** *<datasetname>*:
-        List data format of file.
+        List data format of file(s).
     **copy** *<datasetname>* *<newdatasetname>*:
         Create a copy of the raster file with a new name.
     **rename** *<datasetname>* *<newdatasetname>*:
         Change the name of the raster file.
     **delete** *<datasetname>*:
-        Delete raster file.
+        Delete raster file(s).
 
 .. option:: -r
 
     Recursively scan files/folders for raster files.
 
+.. option:: -fr
+
+    Recursively scan folders for raster files, forcing recursion in folders recognized as valid formats.
+
 .. option:: -u
 
     Report failures if file type is unidentified.
@@ -54,7 +58,7 @@ data types and deleting, renaming or copying the files.
 
 .. option:: <datasetname>
 
-    Raster file to operate on.
+    Raster file to operate on. With **identify** may be repeated for multiple files.
 
 .. option:: <newdatasetname>
 
diff --git a/doc/source/programs/gdalmdimtranslate.rst b/doc/source/programs/gdalmdimtranslate.rst
index 0cb0bdd2b8a5..fdc37075ab08 100644
--- a/doc/source/programs/gdalmdimtranslate.rst
+++ b/doc/source/programs/gdalmdimtranslate.rst
@@ -118,7 +118,7 @@ The following command line parameters can appear in any order.
 
     Performs a subsetting (trimming or slicing) operation along a dimension,
     provided that it is indexed by a 1D variable of numeric or string data type,
-    and whose values are monotically sorted.
+    and whose values are monotonically sorted.
     <subset_spec> follows exactly the `OGC WCS 2.0 KVP encoding <https://portal.opengeospatial.org/files/09-147r3>`__
     for subsetting.
 
diff --git a/doc/source/programs/gdaltindex.rst b/doc/source/programs/gdaltindex.rst
index 6dd1668c30d2..a9e8a0b8cb87 100644
--- a/doc/source/programs/gdaltindex.rst
+++ b/doc/source/programs/gdaltindex.rst
@@ -330,7 +330,7 @@ Examples
 
 ::
 
-    gdaltindex tile_index.gti.gpkg -datatype Byte -tr 60 60 -colorinterp Red,Green,Blue --optfile my_list.txt
+    gdaltindex tile_index.gti.gpkg -ot Byte -tr 60 60 -colorinterp Red,Green,Blue --optfile my_list.txt
 
 C API
 -----
diff --git a/doc/source/programs/gdaltransform.rst b/doc/source/programs/gdaltransform.rst
index 076bc9f5dd6a..22eb21670c70 100644
--- a/doc/source/programs/gdaltransform.rst
+++ b/doc/source/programs/gdaltransform.rst
@@ -50,7 +50,7 @@ projection,including GCP-based transformations.
     source SRS is a dynamic CRS. Only taken into account if :option:`-s_srs`
     is used.
 
-    Before PROJ 9.4, :option:`-s_coord_epoch` and :option:`-t_coord_epoch` are
+    Before PROJ 9.4, :option:`-s_coord_epoch` and :option:`-t_coord_epoch` were
     mutually exclusive, due to lack of support for transformations between two dynamic CRS.
 
 .. option:: -t_srs <srs_def>
@@ -69,7 +69,7 @@ projection,including GCP-based transformations.
     output SRS is a dynamic CRS. Only taken into account if :option:`-t_srs`
     is used.
 
-    Before PROJ 9.4, :option:`-s_coord_epoch` and :option:`-t_coord_epoch` are
+    Before PROJ 9.4, :option:`-s_coord_epoch` and :option:`-t_coord_epoch` were
     mutually exclusive, due to lack of support for transformations between two dynamic CRS.
 
 .. option:: -ct <string>
diff --git a/doc/source/programs/gdalwarp.rst b/doc/source/programs/gdalwarp.rst
index d21f00e50ece..e3d49f3e0557 100644
--- a/doc/source/programs/gdalwarp.rst
+++ b/doc/source/programs/gdalwarp.rst
@@ -20,7 +20,7 @@ Synopsis
             [-s_srs <srs_def>] [-t_srs <srs_def>]
             [[-srcalpha]|[-nosrcalpha]]
             [-dstalpha] [-tr <xres> <yres>|square] [-ts <width> <height>]
-            [-te <xmin> <ymin> <max> <ymaX]
+            [-te <xmin> <ymin> <xmax> <ymax]
             [-te_srs <srs_def>]
             [-r near|bilinear|cubic|cubicspline|lanczos|average|rms|mode|min|max|med|q1|q3|sum]
             [-ot Byte|Int8|[U]Int{16|32|64}|CInt{16|32}|[C]Float{32|64}]
@@ -33,8 +33,8 @@ Synopsis
             [-order <1|2|3>] [-refine_gcps <tolerance> [<minimum_gcps>]]
             [-to <NAME>=<VALUE>]...
             [-et <err_threshold>] [-wm <memory_in_mb>]
-            [-srcnodata <value>[ <value>...]]
-            [-dstnodata <value>[ <value>...]] [-tap]
+            [-srcnodata "<value>[ <value>]..."]
+            [-dstnodata "<value>[ <value>]..."] [-tap]
             [-wt Byte|Int8|[U]Int{16|32|64}|CInt{16|32}|[C]Float{32|64}]
             [-cutline <datasource>|<WKT>] [-cutline_srs <srs_def>]
             [-cwhere <expression>]
@@ -130,7 +130,7 @@ with control information.
     source SRS is a dynamic CRS. Only taken into account if :option:`-s_srs`
     is used.
 
-    Before PROJ 9.4, :option:`-s_coord_epoch` and :option:`-t_coord_epoch` are
+    Before PROJ 9.4, :option:`-s_coord_epoch` and :option:`-t_coord_epoch` were
     mutually exclusive, due to lack of support for transformations between two dynamic CRS.
 
 .. option:: -t_srs <srs_def>
@@ -151,7 +151,7 @@ with control information.
     target SRS is a dynamic CRS. Only taken into account if :option:`-t_srs`
     is used.
 
-    Before PROJ 9.4, :option:`-s_coord_epoch` and :option:`-t_coord_epoch` are
+    Before PROJ 9.4, :option:`-s_coord_epoch` and :option:`-t_coord_epoch` were
     mutually exclusive, due to lack of support for transformations between two dynamic CRS.
 
 .. option:: -ct <string>
@@ -159,8 +159,13 @@ with control information.
     A PROJ string (single step operation or multiple step string
     starting with +proj=pipeline), a WKT2 string describing a CoordinateOperation,
     or a urn:ogc:def:coordinateOperation:EPSG::XXXX URN overriding the default
-    transformation from the source to the target CRS. It must take into account the
-    axis order of the source and target CRS.
+    transformation from the source to the target CRS.
+
+    It must take into account the axis order of the source and target CRS, that
+    is typically include a ``step proj=axisswap order=2,1`` at the beginning of
+    the pipeline if the source CRS has northing/easting axis order, and/or at
+    the end of the pipeline if the target CRS has northing/easting axis order.
+
     When creating a new output file, using :option:`-t_srs` is still necessary
     to have the target CRS written in the metadata of the output file,
     but the parameters of the CoordinateOperation will override those of the
@@ -209,10 +214,10 @@ with control information.
 
 .. option:: -et <err_threshold>
 
-    Error threshold for transformation approximation (in pixel units -
-    defaults to 0.125, unless, starting with GDAL 2.1, the RPC_DEM transformer
-    option is specified, in which case, an exact transformer, i.e.
-    err_threshold=0, will be used).
+    Error threshold for transformation approximation, expressed as a number of
+    source pixels. Defaults to 0.125 pixels unless the ``RPC_DEM`` transformer
+    option is specified, in which case an exact transformer, i.e.
+    ``err_threshold=0``, will be used.
 
 .. option:: -refine_gcps <tolerance> [<minimum_gcps>]
 
@@ -330,7 +335,7 @@ with control information.
         resolution.
         The resampling method used to create those overviews is generally not the one you
         specify through the :option:`-r` option. Some formats, like JPEG2000, can contain
-        significant outliers due to wavelet compression works. It might thus be useful in
+        significant outliers due to how wavelet compression works. It might thus be useful in
         those situations to use the :option:`-ovr` ``NONE`` option to prevent existing overviews to
         be used.
 
@@ -380,8 +385,13 @@ with control information.
 .. option:: -wm <memory_in_mb>
 
     Set the amount of memory that the
-    warp API is allowed to use for caching. The value is interpreted as being
-    in megabytes if the value is less than 10000. For values >=10000, this is
+    warp API is allowed to use for caching.
+    Defaults to 64 MB.
+    Since GDAL 3.10, the value can be specified either as a fixed amount of
+    memory (e.g., ``-wm 200MB``, ``-wm 1G``) or as a percentage of usable
+    RAM (``-wm 10%``).
+    In earlier versions, or if a unit is not specified, the value is interpreted as being
+    in megabytes if the value is less than 10000. For values >=10000, it is
     interpreted as bytes.
 
     The warper will total up the memory required to hold the input and output
@@ -485,21 +495,60 @@ with control information.
     The destination file name.
 
 
-Mosaicing into an existing output file is supported if the output file
-already exists. The spatial extent of the existing file will not
-be modified to accommodate new data, so you may have to remove it in that case, or
-use the -overwrite option.
+Overview
+--------
 
-Polygon cutlines may be used as a mask to restrict the area of the
-destination file that may be updated, including blending.  If the OGR
-layer containing the cutline features has no explicit SRS, the cutline
-features must be in the SRS of the destination file. When writing to a
-not yet existing target dataset, its extent will be the one of the
-original raster unless -te or -crop_to_cutline are specified.
+:program:`gdalwarp` transforms images between different coordinate reference
+systems and spatial resolutions.
+
+First, :program:`gdalwarp` must determine the extent and resolution of the
+output, if these have not been specified using :option:`-te` and :option:`-tr`.
+These are determined by transforming a sample of points from the source CRS to
+the destination CRS. Details of the procedure can be found in the documentation
+for :cpp:func:`GDALSuggestedWarpOutput`. If multiple inputs are provided to
+:program:`gdalwarp`, the output extent will be calculated to cover all of them,
+at a resolution consistent with the highest-resolution input.
+
+Once the dimensions of the output image have been determined,
+:program:`gdalwarp` divides the output image into chunks that can be processed
+independently within the amount of memory specified by :option:`-wm`.
+:program:`gdalwarp` then iterates over scanlines in these chunks, and for each
+output pixel determines a rectangular region of source pixels that contribute
+to the value of the output pixel. The dimensions of this rectangular region
+are typically determined by estimating the relative scales of the source and
+destination raster, but can be manually specified (see documentation of the
+``XSCALE`` parameter in :cpp:member:`GDALWarpOptions::papszWarpOptions`).
+Because the source region is a simple rectangle, it is not possible for an
+output pixel to be associated with source pixels from both sides of the
+antimeridian or pole (when transforming from geographic coordinates).
+
+The rectangular region of source pixels is then provided to a function that
+performs the resampling algorithm selected with :option:`-r`.  Depending on the
+resampling algorithm and relative scales of the source and destination rasters,
+source pixels may be weighted either according to the approximate fraction of
+the source pixel that is covered by the destination pixel (e.g., "mean" and
+"sum" resampling), or by horizontal and vertical Cartesian distances between
+the center of the source pixel and the center of the target pixel (e.g.,
+bilinear or cubic spline resampling). In the latter case, the relative weight
+of an individual source pixel is determined by the product of the weights
+determined for its row and column; the diagonal Cartesian distance is not
+calculated.
+
+Writing to an existing file
+---------------------------
+
+Mosaicing into an existing output file is supported if the output file already
+exists. The spatial extent of the existing file will not be modified to
+accommodate new data, so you may have to remove it in that case, or use the
+:option:`-overwrite` option.
+
+Polygon cutlines may be used as a mask to restrict the area of the destination
+file that may be updated, including blending.  If the OGR layer containing the
+cutline features has no explicit SRS, the cutline features are assumed to be in
+the SRS of the destination file. When writing to a not yet existing target
+dataset, its extent will be the one of the original raster unless :option:`-te`
+or :option:`-crop_to_cutline` are specified.
 
-Starting with GDAL 3.1, it is possible to use as output format a driver that
-only supports the CreateCopy operation. This may internally imply creation of
-a temporary file.
 
 .. _gdalwarp_nodata:
 
@@ -554,30 +603,34 @@ Approximate transformation
 --------------------------
 
 By default :program:`gdalwarp` uses a linear approximator for the
-transformations with a permitted error of 0.125 pixels. The approximator
-basically transforms three points on a scanline: the start, end and middle.
-Then it compares the linear approximation of the center based on the end points
-to the real thing and checks the error. If the error is less than the error
-threshold then the remaining points are approximated (in two chunks utilizing
-the center point). If the error exceeds the threshold, the scanline is split
-into two sections, and the approximator is recursively applied to each section
-until the error is less than the threshold or all points have been exactly
-computed.
-
-The error threshold (in pixels) can be controlled with the gdalwarp
+transformations with a permitted error of 0.125 pixels in the source dataset.
+The approximator precisely transforms three points per output scanline (the
+start, middle, and end) from a row and column in the output dataset to a
+row and column in the source dataset.
+It then compares a linear approximation of the center point coordinates to the
+precisely transformed value.
+If the sum of the horizontal and vertical errors is less than the error
+threshold then the remaining source points are approximated using linear
+interpolation between the start and middle point, and between the middle and
+end point.
+If the error exceeds the threshold, the scanline is split into two sections and
+the approximator is recursively applied to each section until the error is less
+than the threshold or all points have been exactly computed.
+
+The error threshold (in source dataset pixels) can be controlled with the gdalwarp
 :option:`-et` switch. If you want to compare a true pixel-by-pixel reprojection
 use :option:`-et 0` which disables this approximator entirely.
 
 Vertical transformation
 -----------------------
 
-While gdalwarp can essentially perform coordinate transformations in the 2D
-space, it can perform as well vertical transformations. This is automatically
-enabled when the 2 following conditions are met:
+While gdalwarp is most commonly used to perform coordinate transformations in the 2D
+space, it can also perform vertical transformations. Vertical transformations are
+automatically performed when the following two conditions are met:
 
 - at least one of the source or target CRS has an explicit vertical CRS
-  (as part of a compound CRS) or is a 3D (generally geographic) CRS,
-- and the raster has a single band.
+  (as part of a compound CRS) or is a 3D (generally geographic) CRS, and
+- the raster has a single band
 
 This mode can also be forced by using the :option:`-vshift` (this is
 essentially useful when the CRS involved are not explicitly 3D, but a
@@ -747,15 +800,3 @@ C API
 -----
 
 This utility is also callable from C with :cpp:func:`GDALWarp`.
-
-
-See also
---------
-
-.. only:: not man
-
-    `Wiki page discussing options and behaviours of gdalwarp <https://trac.osgeo.org/gdal/wiki/UserDocs/GdalWarp>`_
-
-.. only:: man
-
-    Wiki page discussing options and behaviours of gdalwarp: https://trac.osgeo.org/gdal/wiki/UserDocs/GdalWarp
diff --git a/doc/source/programs/ogr2ogr.rst b/doc/source/programs/ogr2ogr.rst
index a45c7395a601..abf20038d4de 100644
--- a/doc/source/programs/ogr2ogr.rst
+++ b/doc/source/programs/ogr2ogr.rst
@@ -43,7 +43,8 @@ Synopsis
            [-t_coord_epoch <epoch>] [-ct <pipeline_def>]
            [-spat_srs <srs_def>] [-geomfield <name>]
            [-segmentize <max_dist>] [-simplify <tolerance>]
-           [-makevalid] [-wrapdateline] [-datelineoffset <val_in_degree>]
+           [-makevalid] [-skipinvalid]
+           [-wrapdateline] [-datelineoffset <val_in_degree>]
            [-clipsrc [<xmin> <ymin> <xmax> <ymax>]|<WKT>|<datasource>|spat_extent]
            [-clipsrcsql <sql_statement>] [-clipsrclayer <layername>]
            [-clipsrcwhere <expression>]
@@ -156,7 +157,7 @@ output coordinate system or even reprojecting the features during translation.
 
     SQL statement to execute. The resulting table/layer will be saved to the
     output. Starting with GDAL 2.1, the ``@filename`` syntax can be used to
-    indicate that the content is in the pointed filename.
+    indicate that the content is in the pointed filename. (Cannot be used with :option:`-spat_srs`.)
 
 .. option:: -dialect <dialect>
 
@@ -183,7 +184,7 @@ output coordinate system or even reprojecting the features during translation.
 
 .. option:: -spat_srs <srs_def>
 
-    Override spatial filter SRS.
+    Override spatial filter SRS. (Cannot be used with :option:`-sql`.)
 
 .. option:: -geomfield <field>
 
@@ -270,7 +271,7 @@ output coordinate system or even reprojecting the features during translation.
     output SRS is a dynamic CRS. Only taken into account if :option:`-t_srs`
     is used. It is also mutually exclusive with  :option:`-a_coord_epoch`.
 
-    Before PROJ 9.4, :option:`-s_coord_epoch` and :option:`-t_coord_epoch` are
+    Before PROJ 9.4, :option:`-s_coord_epoch` and :option:`-t_coord_epoch` were
     mutually exclusive, due to lack of support for transformations between two dynamic CRS.
 
 .. option:: -s_srs <srs_def>
@@ -332,7 +333,7 @@ output coordinate system or even reprojecting the features during translation.
     source SRS is a dynamic CRS. Only taken into account if :option:`-s_srs`
     is used.
 
-    Before PROJ 9.4, :option:`-s_coord_epoch` and :option:`-t_coord_epoch` are
+    Before PROJ 9.4, :option:`-s_coord_epoch` and :option:`-t_coord_epoch` were
     mutually exclusive, due to lack of support for transformations between two dynamic CRS.
 
 .. option:: -ct <string>
@@ -340,8 +341,12 @@ output coordinate system or even reprojecting the features during translation.
     A PROJ string (single step operation or multiple step string starting with
     +proj=pipeline), a WKT2 string describing a CoordinateOperation, or a
     urn:ogc:def:coordinateOperation:EPSG::XXXX URN overriding the default
-    transformation from the source to the target CRS. It must take into account
-    the axis order of the source and target CRS.
+    transformation from the source to the target CRS.
+
+    It must take into account the axis order of the source and target CRS, that
+    is typically include a ``step proj=axisswap order=2,1`` at the beginning of
+    the pipeline if the source CRS has northing/easting axis order, and/or at
+    the end of the pipeline if the target CRS has northing/easting axis order.
 
     .. versionadded:: 3.0
 
@@ -453,7 +458,7 @@ output coordinate system or even reprojecting the features during translation.
     The specified value of this option is the tolerance used to merge
     consecutive points of the output geometry using the
     :cpp:func:`OGRGeometry::Simplify` method
-    The unit of the distance is in 
+    The unit of the distance is in
     georeferenced units of the source vector dataset.
     This option is applied before the reprojection implied by :option:`-t_srs`
 
@@ -470,7 +475,16 @@ output coordinate system or even reprojecting the features during translation.
     :cpp:func:`OGRGeometryFactory::removeLowerDimensionSubGeoms`, on geometries
     to ensure they are valid regarding the rules of the Simple Features specification.
 
-    .. versionadded: 3.1 (requires GEOS 3.8 or later)
+    .. versionadded: 3.1 (requires GEOS)
+
+.. option:: -skipinvalid
+
+    Run the :cpp:func:`OGRGeometry::IsValid` operation on geometries to check if
+    they are valid regarding the rules of the Simple Features specification.
+    If they are not, the feature is skipped. This check is done after all other
+    geometry operations.
+
+    .. versionadded: 3.10 (requires GEOS)
 
 .. option:: -fieldTypeToString All|<type1>[,<type2>]...
 
diff --git a/doc/source/programs/ogr_layer_algebra.rst b/doc/source/programs/ogr_layer_algebra.rst
index edc39cd6f93b..20ccefa3d702 100644
--- a/doc/source/programs/ogr_layer_algebra.rst
+++ b/doc/source/programs/ogr_layer_algebra.rst
@@ -31,7 +31,7 @@ Description
 -----------
 
 The :program:`ogr_layer_algebra` provides a command line utility to perform various vector layer algebraic operations. The utility takes a vector
-input source , a method source and generates the output of the operation in the specified output file
+input source and a method source and generates the output of the operation in the specified output file.
 
 .. note::
 
@@ -79,8 +79,8 @@ input source , a method source and generates the output of the operation in the
 
 .. option:: -input_ds <path>
 
-    Input data set path for the operation to be performed.
-    For operations involving 2 datasets, this is one of the dataset.
+    Input dataset path for the operation to be performed.
+    For operations involving two datasets, this is one of the datasets.
 
 .. option:: -input_lyr <name>
 
@@ -98,7 +98,7 @@ input source , a method source and generates the output of the operation in the
 
 .. option:: -output_ds <path>
 
-    Output data set path for writing the result of the operations performed by ogr_layer_algebra
+    Output data set path for writing the result of the operations performed by ``ogr_layer_algebra``.
 
 .. option:: -output_lyr_name <name>
 
@@ -106,11 +106,11 @@ input source , a method source and generates the output of the operation in the
 
 .. option:: -overwrite
 
-    Indicates whether the ``output_ds`` have to be overwritten with the generated result of ogr_layer_algebra
+    Indicates whether the ``output_ds`` have to be overwritten with the generated result of ``ogr_layer_algebra``.
 
 .. option:: -opt <NAME>=<VALUE>
 
-    Attributes for which the operation has to run on ``input_ds`` and ``method_ds``
+    Attributes for which the operation has to run on ``input_ds`` and ``method_ds``.
 
 .. option:: -f <format_name>
 
@@ -120,21 +120,21 @@ input source , a method source and generates the output of the operation in the
 
 .. option:: -dsco <NAME>=<VALUE>
 
-    Dataset creation option (format specific)
+    Dataset creation option (format specific).
 
 .. option:: -lco <NAME>=<VALUE>
 
-    Layer creation option (format specific)
+    Layer creation option (format specific).
 
 .. option:: -input_fields {NONE|ALL|<fld1>,<fl2>,...<fldN>}
 
     Comma-delimited list of fields from input layer to copy to the output layer ,
-    if eligible according to the operation
+    if eligible according to the operation.
 
 .. option:: -method_fields {NONE|ALL|<fld1>,<fl2>,...<fldN>}
 
     Comma-delimited list of fields from method layer to copy to the output layer ,
-    if eligible according to the operation
+    if eligible according to the operation.
 
 .. option:: -nlt <geom_type>
 
diff --git a/doc/source/programs/ogrinfo.rst b/doc/source/programs/ogrinfo.rst
index c47e69ae7b9c..e92f6c65a2de 100644
--- a/doc/source/programs/ogrinfo.rst
+++ b/doc/source/programs/ogrinfo.rst
@@ -17,7 +17,7 @@ Synopsis
 .. code-block::
 
     ogrinfo [--help] [--help-general]
-            [-if <driver_name>] [-json] [-ro] [-q] [-where <restricted_where>|@f<ilename>]
+            [-if <driver_name>] [-json] [-ro] [-q] [-where <restricted_where>|@<filename>]
             [-spat <xmin> <ymin> <xmax> <ymax>] [-geomfield <field>] [-fid <fid>]
             [-sql <statement>|@<filename>] [-dialect <sql_dialect>] [-al] [-rl]
             [-so|-features] [-limit <nb_features>] [-fields={YES|NO}]]
@@ -76,6 +76,8 @@ edit data.
 
     Summary Only: suppress listing of individual features and show only
     summary information like projection, schema, feature count and extents.
+    In JSON output, -so is implicit and listing of features can be enabled
+    with :option:`-features`.
 
 .. option:: -features
 
@@ -108,9 +110,10 @@ edit data.
 
     Example of ``-where`` and quoting:
 
-.. code-block: bash
+    .. code-block:: bash
+
+        -where "\"Corner Point Identifier\" LIKE '%__00_00'"
 
-    -where "\"Corner Point Identifier\" LIKE '%__00_00'"
 
 .. option:: -sql <statement>|@<filename>
 
@@ -528,4 +531,10 @@ Adding a column to an input file:
 
    ogrinfo input.shp -sql "ALTER TABLE input ADD fieldX float"
 
+Sometimes there is no input file involved in a calculation. In such cases one may
+use the ``:memory:`` input file which is a in-memory empty SQLite file (and the SQLite SQL dialect will be implicitly used).
+
+.. code-block:: bash
+
+    ogrinfo :memory: -sql "SELECT ST_Buffer(ST_GeomFromText('POINT(0 0)'), 1)"
 
diff --git a/doc/source/programs/ogrmerge.rst b/doc/source/programs/ogrmerge.rst
index 0f39f5fa09ac..743e1f5d378d 100644
--- a/doc/source/programs/ogrmerge.rst
+++ b/doc/source/programs/ogrmerge.rst
@@ -88,7 +88,7 @@ potential manual editing of it and :program:`ogr2ogr` can be done.
     Name of the output vector layer (in single mode, and the default is
     "merged"), or template to name the output vector layers in default
     mode (the default value is ``{AUTO_NAME}``). The template can be a
-    string with the following variables that will be susbstitued with a
+    string with the following variables that will be substituted with a
     value computed from the input layer being processed:
 
     -  ``{AUTO_NAME}``: equivalent to ``{DS_BASENAME}_{LAYER_NAME}`` if both
diff --git a/doc/source/programs/raster_common_options.rst b/doc/source/programs/raster_common_options.rst
index e976b9a254d6..de42edb5ccf6 100644
--- a/doc/source/programs/raster_common_options.rst
+++ b/doc/source/programs/raster_common_options.rst
@@ -21,6 +21,10 @@ All GDAL command line programs support the following common options.
 
     List detailed information about a single format driver. The format should be the short name reported in the --formats list, such as GTiff.
 
+.. option:: --formats
+
+    List all drivers. Can be combined with ``-json`` switch of :program:`gdalinfo` of since GDAL 3.10
+
 .. _raster_common_options_optfile:
 .. option:: --optfile <filename>
 
diff --git a/doc/source/programs/sozip.rst b/doc/source/programs/sozip.rst
index 0ace8a573167..fd4344226c8f 100644
--- a/doc/source/programs/sozip.rst
+++ b/doc/source/programs/sozip.rst
@@ -79,7 +79,7 @@ The :program:`sozip` utility can be used to:
     Validates a SOZip file. Baseline ZIP validation is done in a light way,
     limited to being able to browse through ZIP records with the InfoZIP-based
     ZIP reader used by GDAL. But validation of the SOZip-specific aspects is
-    done in a more thoroughful way.
+    done in a more thorougful way.
 
 .. option:: -r
 .. option:: --recurse-paths
diff --git a/doc/source/programs/vector_common_options.rst b/doc/source/programs/vector_common_options.rst
index 8e281e088bbc..152f75c3c5dc 100644
--- a/doc/source/programs/vector_common_options.rst
+++ b/doc/source/programs/vector_common_options.rst
@@ -22,6 +22,10 @@ All GDAL OGR command line programs support the following common options.
     The format should be the short name reported in the :option:`--formats`
     list, such as GML.
 
+.. option:: --formats
+
+    List all drivers. Can be combined with ``-json`` switch of :program:`ogrinfo` of since GDAL 3.10
+
 .. option:: --optfile <filename>
 
     Read the named file and substitute the contents into the command line
diff --git a/doc/source/software_using_gdal.rst b/doc/source/software_using_gdal.rst
index f25df05bdb7a..7886d4df8b77 100644
--- a/doc/source/software_using_gdal.rst
+++ b/doc/source/software_using_gdal.rst
@@ -12,6 +12,7 @@ Free and open source
 - `Bluemapia <https://sourceforge.net/projects/bluemapia/>`_ Multi-Map(Google,Microsoft,Open Street Map, NOAA/BSB Charts,self-calibrated raster) location-based GPS app for Windows Mobile. (GPL v2)
 - `BRL-CAD <https://brlcad.org>`_ An open source solid modeling computer-aided design system.
 - `Demeter <http://demeter.sourceforge.net/>`_ Another OpenGL based terrain engine somewhat similar to VTP.
+- `DuckDB Spatial Extension <https://duckdb.org/docs/extensions/spatial>`_: Spatial extension for DuckDB
 - `EOxServer <http://eoxserver.org>`_  OGC-compliant server for Earth Observation (EO) data supporting WMS and WCS with EO application profiles (EOxServer Open License)
 - `exactextract <https://github.com/isciences/exactextract>`_ Fast and accurate raster/vector zonal statistics (Apache 2.0)
 - `Feature Data Objects (FDO)  <http://fdo.osgeo.org>`_  Open source spatial data access libraries (LGPL)
@@ -117,7 +118,6 @@ Proprietary license / Other
 - `TacitView  <https://www.insitu.com/information-delivery/information-processing/tacitview>`_  An imagery visualization and exploitation package for military intelligence.
 - `TatukGIS  <http://www.tatukgis.com>`_  Desktop GIS mapping and data editing application.
 - `Team Awareness Kit <https://tak.gov>`_  Suite of georeferenced imagery and situational awareness tools developed for military planning and execution, now available for civilian use.
-- `TerraGo Technologies  <http://www.terragotech.com>`_  The GeoPDF file format is used to distribute and collaborate geospatial data and uses GDAL for data import/export.
 - `TerrainView  <http://www.viewtec.net>`_  Interactive real-time 3D GIS Software.
 - `TransCAD GIS  <http://www.caliper.com>`_  Desktop Transportation Analysis Software
 - `TravTime  <https://travtime.software.informer.com/download/>`_  .NET Application for visualizing, processing and analyzing GPS data for travel time, speed, and de
diff --git a/doc/source/spelling_wordlist.txt b/doc/source/spelling_wordlist.txt
new file mode 100644
index 000000000000..77d3e4e14e6c
--- /dev/null
+++ b/doc/source/spelling_wordlist.txt
@@ -0,0 +1,3680 @@
+aaa
+aalto
+abc
+abcde
+ABcdE
+ABCDEF
+abcdefgh
+abcdefghij
+abcdefghijk
+abcdefghijkl
+AbstractFeature
+abyBuffer
+accdb
+accessMode
+accessor
+accessors
+Acknowledgements
+acl
+ACL
+actinia
+ActiveX
+addalpha
+addCurve
+addfields
+addGeometry
+AddM
+addPoint
+adf
+adfDstGeoTransform
+adfMinMax
+advertized
+advertizing
+AdviseRead
+advized
+AES
+Affine
+ahArrays
+airphotos
+airsar
+Aitoff
+al
+ala
+Alamos
+Albers
+Alessandro
+alg
+Alibaba
+Alicante
+allCountries
+allocator
+alphanumerics
+Alpina
+altername
+alternance
+altitudemode
+altitudeMode
+Amici
+amongst
+amz
+Amz
+analyse
+Analyse
+analysing
+Analysing
+analytics
+Andrey
+AndreyK
+andsize
+anMapNewAxisToOldAxis
+annd
+Antalya
+antialias
+antimeridian
+ao
+aoDimensions
+aoDims
+api
+Api
+apoNewDims
+apploy
+approximator
+AppVeyor
+APSTILE
+apszPartIds
+ar
+arcgis
+arcsec
+Arévalo
+arg
+argc
+args
+argv
+ari
+arra
+Arrayname
+arrayStartIdx
+ASC
+ascii
+askin
+aspatial
+Aspatial
+assumerolewithwebidentity
+asterix
+Astrogeology
+Astun
+AStyle
+astylename
+async
+atable
+athematic
+Athematic
+Athlon
+atof
+atoi
+atomicity
+atrix
+attr
+Attrbute
+attrib
+attrname
+attrvalue
+atx
+au
+AUnits
+auth
+Auth
+Authalic
+authenticode
+autocommit
+autoconf
+Autoconf
+autocorrelation
+Autodesk
+autodetect
+autodetected
+autodetection
+autodetects
+autogenerated
+autogrow
+Autoincrement
+automake
+autoselect
+autotest
+avc
+Avenza
+Avyav
+avyavkumar
+aws
+axactly
+axisLabels
+axisOrder
+axisswap
+aXYR
+ay
+az
+azavea
+Azimuthal
+backend
+backends
+backmap
+backplanes
+backport
+backported
+backporting
+Backporting
+backports
+backslashed
+bak
+bAllowPromotingToCurves
+bAllowResizeOutptr
+bandblockcache
+BandN
+BandsCount
+bAnglesInPackedDMSFormat
+bAnglesInPackedFormat
+bApprox
+bApproxOK
+barycentric
+BaseDataset
+baseheight
+BaseLayer
+basename
+basenames
+basisu
+Baston
+bathymetric
+Bathymetric
+bathymetry
+Bathymetry
+baw
+baz
+Baz
+Bazel
+bbox
+BBoxOrder
+bc
+bCatchDebug
+bCopy
+bDelete
+bDstToSrc
+bedrijven
+behaviours
+Belge
+Benchmarking
+Bergh
+bExactMatch
+Bezier
+bFlag
+bFloatingPointWindowValidity
+bForce
+bForgiving
+bGCPUseOK
+bidimensional
+bigint
+bil
+bilinear
+Bilinear
+BILINEAR
+BINDIR
+binFunction
+Bing
+bip
+bisectability
+bIsVSIL
+bitmask
+Bitmask
+bitwise
+Bitwise
+blackband
+Blazek
+blockings
+blocksize
+BlockSizeX
+BlockSizeY
+blocky
+bLookForCircular
+bLookForNonLinear
+Blosc
+Blowfish
+blx
+bmp
+bmpw
+bn
+bna
+bNativeOrder
+bnds
+bNotNullable
+bNullable
+bo
+bOnlyBest
+Bonne
+Bool
+boolean
+booleans
+Bootstraping
+boto
+Boto
+bottomfov
+boundedBy
+Bourke
+bourne
+bOverrideEnvVars
+bOwnMask
+bOwnSubtransformer
+bPixelIsPoint
+bpw
+branche
+Brashear
+Bresenham
+bReversed
+Brezenham
+brighest
+Brodin
+Brotli
+Brovey
+Brudka
+Brunsli
+brunslidec
+brunslienc
+bSingleMatch
+bSingleThreadUsage
+bsq
+bStrict
+bSuccess
+bt
+bTakeOwnership
+btfs
+bufferDataType
+bufferStride
+bugfix
+bugfixes
+buildable
+buildbot
+Buildbot
+BuildVRT
+BuildVRTOptions
+bumpmap
+BUnits
+bUnlinkAndSeize
+bUpdate
+burnValues
+butsetting
+bValueIsNull
+byn
+bytecode
+bz
+cadastral
+Cadastral
+Cadastre
+Cadcorp
+Cadorp
+calc
+Calc
+calclulated
+calloc
+capabalities
+capi
+cardinality
+Cardinality
+cartesian
+Carto
+Cartodbifi'ed
+Cascais
+cass
+Cassini
+casted
+cb
+CCache
+ceil
+celldepth
+cellDepth
+centerline
+Centos
+CentOS
+centre
+Centre
+centred
+Centro
+centroid
+Centroid
+centroids
+centry
+ceos
+ceosdataset
+CFB
+cfitsio
+CFloat
+cgi
+Cglobal
+cgm
+cgroups
+chAfter
+Champaign
+changeAttributeValues
+changeGeometryValues
+changelog
+changeset
+charset
+charsets
+Chaundy
+chBefore
+checksums
+Cheeseman
+Christoph
+Chroma
+chs
+chSep
+cid
+CInt
+circularstrings
+ClampRequests
+ClassificationCode
+Clayers
+CleanTimeout
+clearerr
+clib
+clipdst
+clipdstlayer
+clipDstLayer
+clipdstsql
+clipDstSQL
+clipdstwhere
+clipDstWhere
+clipsrc
+clipsrclayer
+clipSrcLayer
+clipsrcsql
+clipSrcSQL
+clipsrcwhere
+clipSrcWhere
+closedir
+Cloudant
+Cloudmade
+clr
+cmake
+Cmake
+CMake
+CMAKE
+CMakeLists
+cmd
+cmt
+cn
+cname
+cnf
+codebase
+codeblock
+Codeblock
+codec
+Codec
+codepage
+codestream
+Codestream
+codestreams
+Codewords
+Coeff
+Coefs
+colname
+colorinterp
+colormap
+colormapped
+colorspace
+colortable
+colortables
+colour
+colourised
+columnname
+columntype
+commandline
+Commandline
+CommitTransaction
+comparator
+comparible
+compilable
+ComplexSource
+compoundcurves
+compressiblity
+compressions
+conceptualhelp
+cond
+conda
+Conda
+conf
+config
+Config
+conformant
+Conformant
+conformities
+connectedness
+const
+constexpr
+contensts
+Contrarty
+conv
+Convair
+conveniency
+Conveniency
+coord
+COORD
+coordinateEpoch
+coordinateOperation
+CoordinatePrecision
+CoordX
+CoordY
+Corder
+Corrigendum
+CoverageCollection
+coverages
+Coverages
+Coverity
+cpg
+CPLAssert
+CPLPushErrorHandlerEx
+CPLSetErrorHandlerEx
+CPLUnescapeString
+CPLVirtualMemGetSize
+cpp
+cppcheck
+CPUs
+CPython
+Cracknell
+creatable
+createad
+CreateCopy
+CreateFieldFromArrowSchema
+createGeometry
+createTopology
+Crnlib
+cron
+crs
+CRS
+Crypto
+cryptographic
+Cryptographic
+cryptopp
+csharp
+CSharp
+csv
+CSV
+csvt
+csy
+CTable
+ctest
+ctor
+CTS
+cubicspline
+CUnits
+cURL
+curvepolygon
+CurvePolygon
+curvepolygons
+CurveToLine
+CustNo
+customly
+cutline
+cutlineDSName
+cutlines
+cutlineWKT
+cvs
+Cxx
+Cygwin
+dall
+DanielM
+danlittle
+dat
+DataArray
+dataAxisToSRSAxisMapping
+DATADIR
+DataElement
+datafile
+dataQualityInfo
+DataRecord
+dataset
+Dataset
+datasets
+Datasets
+datasett
+datasource
+Datasource
+datasources
+Datasources
+datasset
+datastore
+Datastores
+datastream
+datastructures
+DataType
+datatypes
+DataValues
+DataWindow
+dateStamp
+datetime
+dateTime
+Datetime
+DateTime
+datums
+Datums
+dawson
+Daylon
+dBASE
+dbf
+dbfopen
+DBit
+dblbnd
+dbname
+dBZ
+DCMAKE
+de
+De
+deaccess
+deails
+deallocate
+Deallocate
+deallocated
+Deallocates
+deallocating
+deallocation
+deallocator
+decompressor
+Decompressor
+decompressors
+decrementing
+decrypted
+dedeicated
+Deegree
+defacto
+define'ed
+degrib
+dehazing
+Delaunay
+deletefeature
+dem
+DEMProcessing
+DEMProcessingOptions
+demtif
+densification
+densify
+densifying
+der
+dereference
+Dereference
+dereferenced
+Dereferences
+dereferencing
+deregister
+Deregister
+deregistered
+derogations
+des
+DES
+desc
+descendent
+describedby
+deserialization
+deserialize
+deserialized
+deserializing
+desirabled
+dest
+destructor
+Destructor
+destructors
+Destructors
+dev
+DEV
+devel
+dfAccuracy
+dfAzimuth
+dfBurnValue
+dfCellSizeX
+dfCellSizeY
+dfCenterLat
+dfCstX
+dfCstY
+dfCurvCoeff
+dfCutlineBlendDist
+dfCxtX
+dfDistance
+dfErrorThreshold
+dfInvisibleVal
+dfLLX
+dfMax
+dfMaxAngleStepSizeDegrees
+dfMaxDistance
+dfMaxLength
+dfMin
+dfMResolution
+dfMul
+dfNoDataValue
+dfPixErrThreshold
+dfProgressBase
+dfProgressScale
+dfPseudoStdParallel
+dfScale
+dfTargetHeight
+dfTimeout
+dfTolerance
+dfURY
+dfValue
+dfVisibleVal
+dfXOff
+dfXSize
+dfYOff
+dfYSize
+dfZResolution
+dgn
+dht
+di
+diagcross
+dialogs
+differencing
+dimensionality
+dimensioned
+dimensons
+dimN
+DINSTALL
+dir
+directies
+Discoe
+discretization
+discretizing
+disjointness
+distros
+distunits
+divised
+dll
+dlopen
+dlsym
+dm
+Dmitry
+dmorissette
+dnf
+Dnnn
+Dobias
+Dockerfile
+docstring
+docstrings
+Docstrings
+Doenges
+dom
+domainSet
+domainuser
+doo
+doq
+doubtfull
+downcasting
+downsampled
+downsampling
+downscaling
+downswhen
+dox
+doxing
+Doxyfiles
+Doxygen
+dp
+dpecified
+drawOrder
+drv
+ds
+dsco
+DSN
+dsphere
+dst
+Dst
+dstname
+dstSRS
+dstType
+dt
+dT
+DUnits
+dValue
+dve
+dvg
+dwf
+dwg
+dx
+Dx
+dxf
+dy
+dylib
+dzwarg
+eAccess
+earthengine
+eas
+easting
+Easting
+eBufDataType
+eBufType
+Eckert
+Ecologia
+ecw
+ecwp
+eDataType
+EDE
+editings
+eDstType
+eDT
+eedaconf
+eErrClass
+effictively
+eFieldType
+eg
+eGeomType
+eGType
+EHdr
+eightbit
+Elbor
+ElementPath
+ellps
+elpaso
+emptor
+Enablement
+Encodings
+endian
+Endian
+endianness
+Endianness
+endif
+EndPoint
+endptr
+endTime
+Ennn
+enums
+env
+Envisat
+epsg
+EPSG
+equalities
+Equi
+Equirectangular
+Erdas
+eRequestedInputDT
+erer
+eResampleAlg
+erroring
+errorMsg
+ers
+eRWFlag
+eSrcType
+esri
+Esri
+ESRI
+estlayers
+eSuperType
+esUrl
+et
+ETag
+eTargetType
+eTileOrganization
+eType
+eTypeFrom
+eTypeTo
+EUnits
+eur
+eurnasia
+Euromap
+EvenR
+evolutions
+eWkbVariant
+eWorkingDataType
+eXchange
+exe
+executables
+Exif
+explodeCollections
+eXploration
+exportToESRI
+ExportToIsoWkb
+ExportToIsoWkt
+exportToWk
+exportToWkb
+ExportToWKB
+exportToWkt
+ExportToWKT
+expr
+Exte
+extendbeyonddateline
+ExtendBeyondDateLine
+Extensibility
+Extensis
+ExteriorRing
+ExtraQueryParameters
+extrasample
+Fachschema
+facto
+failureReason
+fallbacks
+fallthrough
+Farah
+Faunalia
+favour
+Faza
+fazamhd
+fc
+fclose
+FCourierOblique
+fd
+fdw
+FeatureCollection
+FeatureDefn
+featureMember
+featurestyle
+featuretypes
+feedstock
+Feedstock
+feof
+ferror
+FFFFFF
+fflush
+fft
+fgb
+fgdb
+FHelvetica
+fi
+fid
+FID
+fieds
+FieldDomain
+fieldname
+fieldName
+fieldnameN
+fieldnames
+fieldTypeToString
+FIF
+filegdb
+FileGDB
+filemanager
+filesystem
+filesystems
+fillnodata
+FillValue
+FindFile
+finition
+fiona
+fipszone
+fixup
+flatbuffers
+flatgeobuf
+flattenTo
+fld
+flippmoke
+floodfill
+flurstueck
+Fonseca
+FootprintOptions
+fopen
+FOptions
+forceNullable
+forceTo
+ForceTo
+forceToMultiPolygon
+forecolor
+Foris
+formatters
+formly
+Fortran
+fp
+fpInput
+fpL
+fpOut
+fpRaw
+fpRawL
+fprintf
+fpSource
+fputc
+franca
+france
+FrankW
+Frans
+fread
+free'd
+freetext
+fRequest
+frmsts
+frmt
+frmts
+frontend
+fs
+fSecond
+fseek
+fsiz
+ftell
+FTimesBold
+FTimesRoman
+ftruncate
+ftUS
+fullExtent
+func
+funnyline
+Furieri
+furtherbelow
+Furthermode
+fusiontables
+fwhm
+fwrite
+fx
+fy
+fZ
+garmin
+Garmin
+Garrard
+Gawne
+GBool
+GByte
+gcc
+gcore
+gcp
+GCP
+gcps
+GCPs
+gct
+gdal
+GDAL
+gdalabstractbandblockcache
+gdaladdo
+gdalalljni
+gdalallregister
+gdalarraybandblockcache
+gdalasyncread
+GDALAsyncReader
+gdalattachpct
+gdalautotest
+gdalbarn
+gdalbuildvrt
+gdalcompare
+gdalconst
+gdaldata
+GDALDataset
+gdaldem
+gdaldriver
+gdalenhance
+gdalframework
+gdalgmlcoverage
+GDALGridDataMetricsOptions
+GDALGridInverseDistanceToAPowerNearestNeighborOptions
+GDALGridInverseDistanceToAPowerOptions
+GDALGridLinearOptions
+GDALGridMovingAverageOptions
+GDALGridNearestNeighborOptions
+gdalhashsetbandblockcache
+gdalinfo
+gdaljp
+gdallocationinfo
+gdalmanage
+gdalmdiminfo
+gdalmdimtranslate
+gdalmove
+gdalmultidiminfo
+gdalnodatamaskband
+GDALOpenInfo
+gdalplugins
+gdalrasterband
+GDALRasterBand
+gdalrasterblock
+gdalrc
+gdalsrsinfo
+gdaltest
+GDALThreadLocalDatasetCache
+gdaltindex
+gdaltransform
+gdalvirtualmem
+gdalwarp
+gdalwmscache
+gdb
+gdbtable
+gdriver
+gdrivers
+GDT
+Gelderland
+Gemeente
+Générale
+generatePyramid
+gensql
+geo
+geobrowsers
+Geobuf
+geocode
+geocoded
+geocoding
+Geoconcept
+Geodabases
+geodata
+geodatabase
+Geodatabase
+geodatabases
+Geodatabases
+GeodesicArea
+GeodesicLength
+Geogrid
+geohash
+geohashes
+geoid
+Geoid
+geoidgrids
+GeoJP
+geojson
+GeoJSON
+geojsonl
+geojsons
+geokey
+geoloc
+geolocated
+geolocation
+Geolocation
+Géologiques
+Geomatics
+Geomedia
+geometrycollection
+geometrycolumn
+GeometryElementPath
+geometryProperty
+GeometryType
+geomfield
+GeomPropertyDefn
+geopackage
+Geopackage
+Geopackages
+geopandas
+GeoPandas
+geoprocessing
+Geoprocessing
+geor
+georaster
+georef
+Georef
+georeference
+Georeference
+georeferenced
+georeferencing
+Georeferencing
+georegistration
+geos
+GEOS
+Geoserver
+geoservices
+Geosoft
+geospatial
+geostatistical
+geotiff
+Geotiff
+geotransform
+Geotransform
+geotransformation
+geotransforms
+Geotransforms
+geotransmatrix
+germany
+Gershon
+GetCapabilities
+GetCapabilitiesUrl
+getCoordinateDimension
+GetCoordinatePrecision
+getCurveGeometry
+GetCurveGeometry
+GetDimension
+GetFieldAsDateTime
+GetFieldCount
+GetFieldDefn
+GetFieldSubTypeName
+GetGeomFieldCount
+GetGeomFieldDefn
+GetLayerDefn
+getLinearGeometry
+GetLinearGeometry
+GetMaximum
+GetNameRef
+GetNextFeature
+GetNonLinearGeometriesEnabledFlag
+getNumGeometries
+getNumPoints
+GetProjectionRef
+GetSize
+GetSpatialRef
+getter
+getters
+GetTiledVirtualMem
+GetTileService
+gettings
+GetType
+GetView
+GetVirtualArray
+GetVirtualMem
+getX
+GF
+gff
+gfid
+gfs
+gfsSchemaLocation
+gfw
+GiB
+gif
+Gif
+giflib
+gifw
+giga
+Gilad
+Gillingham
+GInt
+GIS
+gisinternals
+github
+gle
+gltp
+gmac
+gmail
+GmbH
+gml
+GML
+gmlas
+gmlasconf
+gmlcov
+gmljp
+GMLJP
+gmt
+gmtime
+gnm
+gnmanalyse
+GNMGenericLayer
+GNMGenericNetwork
+gnmmanage
+Gnomonic
+gnot
+Gohlke
+Golang
+Golomb
+goog
+googleapis
+gpkg
+gpkgext
+GPL
+gpsbabel
+gpx
+gradians
+Grantor
+graylevel
+grayscale
+Grayscale
+grc
+grd
+greenwich
+grey
+greyscale
+Greyscale
+grf
+gri
+grib
+gridded
+Gridded
+gridding
+Gridding
+gridio
+GridOptions
+gridorigin
+gridspacing
+groupn
+gsingle
+gsoc
+GSoC
+GSpacing
+gsutil
+gtest
+gti
+gtiff
+GTiff
+GTO
+gtrnctr
+gtype
+Guildlines
+Gusev
+gusevmihs
+gxt
+Gxxxxx
+gz
+gzip
+GZip
+gzipped
+Haff
+Halasz
+hana
+hardcoded
+harnass
+hasCurveGeometry
+HasCurveGeometry
+hashset
+hashtable
+hAttr
+Hayford
+hComp
+hCT
+hCutline
+hdbuserstore
+hdf
+HDF
+hdr
+Hdr
+hDriver
+hDS
+hDstDS
+HDU
+heatmaps
+Heckbert
+heic
+heightfield
+Heightfield
+heightfields
+Helmert
+Helvetica
+hether
+hFeat
+hGeom
+hGeomCoordPrec
+hGridDataset
+hGroup
+HH
+hiaspect
+hibase
+hicover
+hidensity
+hiduff
+hiearchical
+Hiearchical
+hieast
+hielev
+hifuel
+hiheight
+hillshade
+hillshading
+hinorth
+hislope
+hiwoody
+hkvdataset
+HMAC
+HMagic
+hMaskBand
+hMutex
+hNewSubGeom
+hObject
+hobu
+hoc
+holded
+Homebrew
+Homolosine
+honour
+honoured
+honouring
+honours
+hookable
+hOptions
+hostname
+hotfix
+hOther
+hOtherFeature
+hotine
+Hotine
+Hough
+howard
+HowardB
+hProximityBand
+hRBMutex
+href
+hrit
+hSourceEDT
+hSrcBand
+hSrcDataset
+hSrcDS
+hST
+hTarget
+hTargetEDT
+hThis
+html
+hTransformArg
+http
+https
+Huddleston
+HUnits
+HV
+Hydrographic
+hydrographical
+hydrologic
+Hydrologic
+Hydrological
+hypercubes
+hyperspectral
+iAxis
+iBand
+iChild
+iconv
+Iconv
+ICurve
+Idan
+identCode
+identificationInfo
+IdentificationTolerance
+identificator
+Identificator
+IDisposable
+Idrisi
+iDriver
+idx
+ie
+ieee
+ifdef
+ifit
+ifndef
+ifv
+igc
+IGeometry
+iGeomField
+ignorable
+igor
+IIP
+ij
+iLayer
+ili
+imag
+imagefile
+ImageFormat
+imagepyramid
+imath
+imd
+img
+impl
+importFromEPSG
+importFromEPSGA
+importFromURN
+importFromWkb
+ImportFromWKB
+ImportFromWKT
+Impots
+imtem
+incrementing
+individualName
+iNewFieldPos
+InfoFormat
+InfoOptions
+Informatisé
+Informix
+InfraRed
+ing
+ini
+init
+Init
+initialExtent
+initiali
+initializer
+inlined
+instantiable
+instantiation
+integratations
+integrations
+integrators
+intentionally
+interconversion
+Interferometric
+Intergraph
+Interlis
+Intermountain
+InternalRing
+interoperable
+interpolator
+intrinsics
+ints
+invalidities
+invdist
+invdistnn
+iOldFieldPos
+iPoint
+IPoint
+IPolygon
+IPR
+IsArrowSchemaSupported
+IsClosed
+isdst
+IsEmpty
+IsNullable
+isspace
+iSubGeom
+ISurface
+itemtypes
+iterable
+itf
+itopen
+iTXt
+iVertex
+IWks
+iZone
+Javadoc
+Javascript
+jdem
+jdemdataset
+JDEMDataset
+jef
+jgw
+Jianjun
+jjimenezshaw
+jml
+jni
+jolma
+Jong
+jorgearevalo
+jp
+jpc
+jpeg
+Jpeg
+jpegw
+jpg
+jpgw
+jpip
+jpipkak
+jpips
+jportiz
+jpp
+jpx
+jratike
+js
+json
+Json
+JSon
+JSON
+Jukka
+JukkaR
+julian
+Julien
+Jupyter
+Jürgen
+Kadaster
+kak
+kakadu
+Kakadu
+Kalberer
+Kartoza
+Kavraisky
+kdu
+kepts
+KEYNAME
+keystore
+Khronos
+Kiselev
+Klokan
+kml
+KML
+kmz
+KOI
+Köln
+Kor
+Kosovo
+kOXKyILrJOgafmkODhRAQ
+Krassovsky
+Krovak
+krs
+KShortest
+kslikebase
+KSpread
+ktx
+Ku
+Kubernetes
+Kumar
+Kuratomi
+KurstS
+KurtS
+labelled
+Labelled
+Laborde
+Lacroix
+lanch
+lanczos
+Lanczos
+Landcare
+landsat
+landuse
+Lantmäteriet
+las
+LatitudeType
+laye
+layername
+lbl
+lco
+lcp
+ld
+ldd
+ldem
+leftfov
+LegalConstraints
+len
+Leveller
+lf
+libaom
+libarchive
+libarrow
+libavif
+libblosc
+libbsd
+libcf
+libcfitsio
+libcrypto
+libcsf
+libcurl
+libCurl
+libdav
+libde
+libdeflate
+libdf
+LIBDIR
+libexpat
+libfreexl
+libgdal
+libgdalutils
+libgeos
+libgeotiff
+libgta
+libhdf
+libhdfs
+libheif
+libiconv
+Libiconv
+libjpeg
+libjson
+libjxl
+libkdu
+libkea
+libkml
+Libkml
+liblerc
+libltidsdk
+liblz
+libmdbodbc
+libNCSCnet
+libNCSEcw
+libNCSEcwC
+libNCSUtil
+libnetcdf
+libopencad
+libOpenDRIVE
+libopenexr
+libopenjp
+libparquet
+libpng
+libpodofo
+libpoppler
+libpq
+libproj
+libpython
+librarified
+librasterlite
+libregis
+librray
+libs
+libspatialite
+libsqlite
+libssl
+libtbb
+libtiff
+libwebp
+libXML
+libxz
+libzstd
+licencing
+Lichun
+lifonly
+linearities
+linearization
+linearized
+linearring
+linestring
+lineString
+LineString
+linestrings
+linetype
+Linetype
+linetypes
+lineweight
+linework
+linga
+linters
+linux
+lis
+listgeo
+listmdd
+listserv
+Lizardtech
+LNK
+lnx
+LoadFileSystemFactories
+LoadLibrary
+loaspect
+lobase
+localhost
+localtime
+locover
+lodensity
+loduff
+loeast
+loelev
+lofuel
+logarithmically
+loheight
+lon
+LongitudeDirection
+longjmp
+longtiudinal
+lonorth
+los
+Loskot
+�oskot
+loslope
+losslessly
+lossy
+Lossy
+LowerRightX
+LowerRightY
+lowoody
+Loximuthal
+lpszDriver
+lpszPathOut
+lrx
+lry
+lsb
+LSB
+lsbf
+Lucena
+Luminance
+Luratech
+Lurawave
+luts
+lvbag
+lwf
+lyr
+macOS
+MacOS
+magellan
+magnetics
+Mahamood
+mainbly
+mainteners
+makefile
+Makefile
+makefiles
+Malin
+malloc
+Manningham
+manpage
+mapbox
+Mapbox
+Maperitive
+mapFieldType
+mapinfo
+Mapinfo
+maplist
+mapml
+MapML
+mapogr
+mappable
+mapsend
+Mapsend
+Mapsheet
+mapsource
+Maptech
+maptools
+Marek
+marshaller
+Matchine
+Mateusz
+MateuszL
+MateuzL
+MaxConnections
+maxdist
+maxdistance
+maxheight
+maximising
+MaximumLong
+maxOccurs
+MaxSize
+maxwidth
+maxx
+maxX
+maxy
+maxY
+MaxZ
+mbtiles
+mbtowc
+MBytes
+mcs
+md
+mdb
+mdbtools
+mdd
+megt
+Melero
+mem
+Mem
+memcpy
+memcpy'ed
+mempreload
+mercator
+metadataConstraints
+metatiles
+Meteosat
+methadata
+metre
+metres
+Miara
+MiB
+Microstation
+mif
+millimetric
+mimetype
+miniconda
+Miniconda
+minidriver
+Minidriver
+minidrivers
+Minidrivers
+Minières
+minilanguage
+minimalistic
+minimising
+Minio
+minixml
+minsize
+minX
+miny
+minY
+MinZ
+Mipmaps
+MiraD
+mis
+mitab
+mkdir
+mktime
+mloskot
+mmap
+mmm
+mnt
+moaw
+mocomp
+modeKnown
+modelisation
+modelled
+modelling
+modis
+MOLA
+Mollweide
+Mongo
+MONGOCXX
+mongocxxv
+monoblock
+Monospace
+Morissette
+mosaiced
+mosaicing
+Mosaicing
+mpi
+mpiexec
+mpp
+mpx
+mremap
+MResolution
+mrsid
+MSB
+msbf
+msbuild
+mscale
+msg
+msi
+msk
+mssql
+mssqlspatial
+MSVC
+MSys
+mtime
+mtimeKnown
+mul
+multiband
+multibeam
+multibyte
+multicurve
+Multidimension
+MultiDimInfo
+MultiDimInfoOptions
+MultiDimTranslate
+MultiDimTranslateOptions
+multidirectional
+multiDirectional
+Multidirectional
+multiline
+multilines
+multilinestring
+multilinestrings
+Multipage
+multipatch
+Multiplatform
+multipoint
+Multipoint
+multipoints
+multipolygon
+MultiPolygon
+multipolygons
+multiproc
+multiprocess
+multireadtest
+multirecords
+multispectral
+multistring
+multisurface
+MultiSurface
+multisurfaces
+Multitenant
+multithread
+multithreaded
+multithreading
+Multithreading
+mundialis
+Mutatie
+mutex
+Mutex
+mutexes
+Mutexes
+mvt
+mW
+mybucket
+mydb
+myfeature
+myFeature
+myfile
+myOptions
+mysoft
+mysql
+mоdelling
+Nadeau
+nadgrids
+nAlignment
+namespace
+namespaced
+namespaces
+Namespaces
+namespacing
+nan
+NaN
+nArgc
+nArray
+nArrays
+NAS
+nat
+nativeData
+natively
+nativeMediaType
+nBand
+nBandCount
+nBandId
+nBands
+nBandSpace
+nBitCount
+nBlocksPerColumn
+nBlocksPerRow
+nBlockXOff
+nBlockXSize
+nBlockYOff
+nBlockYSize
+nBuckets
+nBufferSize
+nBufXSize
+nBufYSize
+nBytes
+nc
+nChar
+nChunkCount
+nCoordDimension
+nCoordinateDimension
+nCount
+nd
+ndarray
+nDataLength
+nDataRead
+ndBeyondDateLine
+nDestSize
+ndims
+nDstAlphaBand
+nDstBufferAllocSize
+nDstOff
+nDstOffset
+nDstStep
+nDstXOff
+nDstXSize
+nDstYOff
+nDstYSize
+nearblack
+Nearblack
+NearblackOptions
+neatline
+Neatline
+neatlines
+neighbour
+neighbourhood
+neighbouring
+neighbours
+nEndVertex
+nEntryCount
+netcdf
+netCDF
+netcore
+Netpbm
+netrc
+networklink
+newaxis
+newcolumnname
+newPath
+nextgis
+NextGIS
+nFacets
+nFID
+nFieldIdx
+nFirstLineToDelete
+nFlagRasterVector
+nFlagsGGT
+nFlagsIn
+nGCPCount
+nghttp
+NGW
+nillable
+nImgOffset
+nInBands
+nIndex
+nIndex'th
+nInputSpectralBands
+nInsertAtLineNo
+nitf
+nLen
+nLength
+Nline
+nLineOffset
+nLines
+nLineSpace
+nln
+nlt
+nm
+nmake
+NMake
+nMarker
+nMaskFlagStop
+nMaxChunkMemory
+nMaxFiles
+nMaxLen
+nmea
+nMinimumMatchConfidence
+nMode
+nMStride
+nMTime
+nn
+nNewSize
+nNumToRemove
+NOAA
+nodata
+noData
+Nodata
+NODATA
+NoDataFromMaskSource
+NoDataValue
+noded
+nOffset
+noindex
+nolock
+nologging
+nomask
+nomd
+noNativeData
+nOpenFlags
+nOptions
+norbit
+normanb
+NormanB
+northing
+Northing
+northup
+Northwood
+notnull
+Noureddine
+nOutAvailableBytes
+nov
+nOverviews
+nows
+np
+nPartIdsCount
+Npix
+nPixelOffset
+nPixels
+nPixelSpace
+nPointCount
+nPolygonCount
+npos
+nptr
+nQuadSegs
+nr
+nRanges
+nRecurseDepth
+nRefCount
+nReqOrder
+nSampleStep
+nScopeFlags
+nSecond
+nSize
+nSrcBufferAllocSize
+nSrcOffset
+nSrcStep
+nSrcXOff
+nSrcXSize
+nSrcYExtraSize
+nSrcYOff
+nSrcYSize
+nStartVertex
+nStepCount
+ntf
+ntfdump
+ntffilereader
+n'th
+nTilesCount
+nTilesPerCol
+nTilesPerRow
+nTileXSize
+nTileYSize
+NTv
+nul
+NUL
+nullability
+nullable
+Nullable
+NullFID
+nullptr
+nulptr
+num
+numaspects
+numbase
+numbins
+Numbins
+numcover
+numdensity
+numduff
+numeast
+numelev
+numfuel
+numheight
+NumInteriorRings
+Nummeraanduiding
+numnorth
+numpy
+Numpy
+numslope
+numwoodies
+nUpdatedFieldsCount
+nUpdatedGeomFieldsCount
+nURLCount
+nv
+nValidateFlags
+nVersionMajor
+nVersionMinor
+nw
+nWordSize
+nXOff
+nXSize
+nXStride
+NXXEYYY
+nyall
+nYOff
+nYSize
+nYStride
+nz
+nZStride
+oauth
+OAuth
+objdir
+objectclasses
+OBJECTID
+objektkoordinaten
+oci
+OCI
+odbc
+odbcinst
+Odbcinst
+ods
+ODsCEmulatedTransactions
+ODsCTransactions
+OFB
+OfflineMode
+ofs
+OFSTBoolean
+OFSTFloat
+OFSTInt
+OFSTNone
+og
+ogc
+OGC
+ogcwkt
+ogr
+OGR
+ogrct
+ogrdatasource
+ogrfeature
+OGRFeature
+OGRFeatureDefn
+ogrfeaturequery
+ogrinfo
+ogrlayer
+ogrlineref
+ogrmerge
+ogrocidrivercore
+ogrpoint
+OGRRawPoint
+ogrsf
+ogrspatialreference
+ogrtindex
+ogrutils
+ogrvrt
+OGRVRTDataSource
+OGRWFSDataSource
+ok
+oldcolumnname
+Oleg
+oMapFieldDomains
+oMDMD
+OMI
+onboarding
+oo
+OOI
+opendir
+openexr
+openfilegdb
+opengis
+openjpeg
+OpenJPEG
+openlayers
+Operationen
+operationg
+opj
+optfile
+optfiles
+optimise
+Optionality
+orderByFields
+or'ed
+Organisation
+organisationName
+ORing
+ortho
+Ortho
+orthocorrection
+orthorectification
+Orthorectified
+orthorectifying
+osAfter
+osBefore
+osgeo
+osGridOptions
+osm
+osName
+osr
+oss
+OSS
+osStartingPath
+osStr
+Ostend
+OSX
+ot
+otherConstraints
+otherfeature
+otherFeature
+othersystems
+outdb
+outDB
+outptr
+outputBounds
+outputer
+outputSchema
+Oversample
+OverviewCount
+ovf
+ovr
+ozi
+pabyData
+pabyDstData
+pabyHeader
+pabyM
+pabySrcData
+pabyValue
+pabyX
+pabyY
+pabyZ
+padfCoeff
+padfDstNoDataImag
+padfDstNoDataReal
+padfGeoTransformOut
+padfGT
+padfLayerBurnValues
+padfM
+padfPrjParams
+padfSrcNoDataImag
+padfSrcNoDataReal
+padfTransform
+padfX
+padfY
+padfZ
+paeSupportedInputDT
+pafScanline
+pahGeometries
+pahInputSpectralBands
+pahLayers
+pahSrcDS
+paletted
+Paletted
+pam
+panBandList
+panBandMap
+pand
+panDstBands
+panHistogram
+panMap
+panOffsets
+panOutputFacetIdx
+panPermutation
+pansharpen
+pansharpend
+pansharpened
+Pansharpened
+pansharpening
+panSizes
+panSrcBands
+panSupportedInputBandCount
+panUnifiedSrcValid
+paoPointsIn
+papabyDstImage
+papabySrcimage
+papabySrcImage
+papanBandSrcValid
+papanUnitifiedSrcValid
+papoBlocks
+papoGeometries
+papoGeomFieldDefn
+papoPolygons
+papszDirFiles
+papszFields
+papszFileList
+papszLayerList
+papszMetadata
+papszOpenOptions
+papszOption
+papszOptions
+papszOverride
+papszSiblingFiles
+papszSrcDSNames
+papszURL
+papszVectorTranslateArguments
+papszWarpOptions
+Paquet
+paradygm
+parallelisation
+parallelising
+parallelize
+param
+parameterisation
+parametrized
+params
+parentIndex
+parsable
+parseable
+Parseable
+parsers
+Parsers
+pasGCPList
+pasMimePart
+Pasotti
+passthrough
+pathname
+PAux
+pauxdataset
+pbf
+pbHasNoData
+pbHasNoDataValue
+pbNonSequentialUploadSupported
+pbNorth
+pBuf
+pBuffer
+pc
+pca
+pCbkUserData
+pcre
+pData
+pdf
+pdfDataPct
+pdfium
+PDFium
+pdfSrcFillRatio
+pdfSrcXExtraSize
+pdfSrcYExtraSize
+pdftoppm
+pds
+PDS
+pDstBuffer
+pDstBufferAllocStart
+pecedence
+pel
+perefix
+performant
+perl
+Petr
+pFct
+pfnCachePage
+pfnCopy
+pfnCopyFiles
+pfnCreate
+pfnCreateCopy
+pfnCreateMultiDimensional
+pfnDelete
+pfnFreeUserData
+pfnFunc
+pfnIdentify
+pfnInit
+pfnOpen
+pfnProcess
+pfnProgress
+pfnRename
+pfnTransform
+pfnTransformer
+pfnUnCachePage
+pfnUnloadDriver
+pfSecond
+pFunc
+pgdump
+pgeo
+PGeo
+pggeometry
+pgm
+pgr
+pgRouting
+pgsql
+pgw
+phGeometry
+Photogrammetric
+photometric
+photooverlay
+Photoshop
+pigz
+pImage
+pInBuffer
+Pirmin
+pixelfunction
+pixelfunctions
+pixelsize
+Pixmap
+pkgconfig
+pkid
+Placemark
+plaintext
+Plessis
+plmosaic
+plscenesconf
+pM
+pnBufferSize
+pnCount
+pnCountOutputArrays
+PND
+pnEntries
+pnEntryCount
+png
+Png
+pngdataset
+pngw
+pnLines
+pnLineSpace
+pnOutBands
+pnOutSize
+pnPixels
+pnPixelSpace
+pnSecond
+pnSize
+pnSrcXOff
+pnSrcXSize
+pnSrcYOff
+pnSrcYSize
+pnt
+pnXSize
+pnYSize
+podaac
+podofo
+PoDoFo
+poDS
+poFeature
+poFeatureDefn
+poFieldDefn
+poFilterGeom
+poGCP
+poGeomFieldDefn
+PointFromColumns
+PointOnSurface
+polarimetric
+Polarimetric
+polarizations
+poLayer
+Polyconic
+Polyface
+polygonization
+polygonize
+Polygonize
+polygonized
+Polygonizes
+polylayer
+polyline
+Polyline
+polylines
+poMask
+ponctual
+poOpenInfo
+poOtherGeom
+poppler
+Poppler
+poRootGroup
+positionName
+posix
+Posix
+posList
+poSrcDS
+poSrcFDefn
+poSrcFeature
+poSRS
+Postel
+postfix
+postfixes
+PostGIS
+Postgres
+Postgresql
+poTargetSRS
+pOutBuffer
+ppabyRet
+ppadfOutNoData
+ppadfPrjParams
+ppanHistogram
+ppanMatchConfidence
+ppapszKeyValues
+ppapszRetStrings
+ppBuffer
+ppd
+ppData
+ppoBelongingLayer
+ppoReturn
+pppppppppppp
+pProgressArg
+ppszAreaName
+ppszDetailedFormat
+ppszDstText
+ppszFailureReason
+ppszGridMappingName
+ppszKey
+ppszMethodAuthName
+ppszMethodCode
+ppszName
+ppszOutputPayload
+ppszProj
+ppszRawXML
+ppszResult
+ppszUnits
+ppWorkingData
+practise
+pre
+Pre
+pread
+prebuild
+prebuilt
+precisions
+precompiled
+precompute
+predefine
+predelete
+prelimenary
+preload
+premultiplication
+Prepar
+preparse
+prepended
+prepending
+preprare
+preprocessing
+prescanning
+preserveFID
+pRet
+prf
+printf
+Printf
+prioritary
+priorly
+Priorly
+priv
+Prizren
+prj
+processings
+processStep
+ProcessStep
+profiler
+programmatically
+Programmatically
+programme
+proj
+PROJ
+projectionCheck
+projinfo
+projjson
+projwin
+projWin
+PropertyDefn
+prounounces
+Provincie
+proximities
+proxyauth
+proxyuserpwd
+prsence
+ps
+psChild
+psDT
+psEnvelope
+pseudocolor
+pseudocolored
+pseudocolour
+pseudocoloured
+psExtent
+psExtraArg
+psField
+psGCP
+psNewSibling
+psNext
+psOlderSibling
+psOlderSiblings
+psOptions
+psOptionsIn
+psql
+pSrcBuffer
+pSrcBufferAllocStart
+psResult
+psRoot
+psv
+pszAccess
+pszAngularUnits
+pszBase
+pszBaseDir
+pszBaseFile
+pszBaseFilename
+pszBuffer
+pszDatasource
+pszDefault
+pszDest
+pszDestDataset
+pszDestFilename
+pszDomain
+pszDstFilename
+pszElement
+pszFile
+pszFilename
+pszFileName
+pszFormat
+pszFormatName
+pszId
+pszInfo
+pszInputFilename
+pszInputPayload
+pszKey
+pszLayerName
+pszName
+pszNativeData
+pszNativeMediaType
+pszNewFilename
+pszNewName
+pszNewString
+pszOldFilename
+pszPath
+pszPreferredAuthority
+pszPrefix
+pszProj
+pszRequest
+pszSource
+pszSrc
+pszSrcFilename
+pszStr
+pszString
+pszTarget
+pszTargetKey
+pszTmpFieldValue
+pszValue
+pszXMLMetadata
+ptr
+pTranslationTable
+pugixml
+Pulkovo
+PUnits
+pUserData
+PushFinderLocation
+px
+pX
+py
+pY
+Py
+pyarrow
+pymod
+pyogrio
+pypi
+pyproj
+pyproject
+pytest
+Pytest
+Pythonic
+pythonX
+pZ
+qGIS
+qix
+qlr
+qml
+qtcreator
+quadkey
+Quadrilateralized
+quadtree
+Quantile
+quantizeCoordinates
+quantized
+Quantized
+quartile
+queryable
+Radarsat
+Radim
+Rahkonen
+rangeSet
+rangeType
+rar
+rasterband
+Rasterband
+rasterbands
+rasterio
+rasterization
+rasterize
+Rasterize
+rasterized
+RasterizeOptions
+rasterizing
+rasterlite
+Rasterlite
+rasterlitedb
+rasters
+Rasters
+rasterXSize
+rasterYSize
+ratvalues
+RawData
+Rawlinson
+rb
+rbz
+rc
+rdb
+rdblib
+rdc
+rdensty
+ReadAsArray
+ReadCompressedData
+readdir
+ReadDir
+ReadRaster
+realloc
+rebased
+Recherches
+recode
+Recode
+recoded
+recoding
+recognise
+recognised
+recognising
+recompressing
+recompression
+recomputation
+recordbatch
+RecordBatch
+RecordBatchAsNumpy
+recurse
+recursionLevel
+redirections
+Redistributable
+reentrancy
+reentrant
+ReferenceSystem
+referenceSystemIdentifier
+referenceSystemInfo
+referer
+Referer
+refererenced
+reflectance
+reflectances
+refSysID
+refSysInfo
+RefSystem
+Regione
+reimplemented
+Reiner
+reinvoked
+Relatedly
+relativeToVRT
+relativizing
+relaxedFieldNameMatch
+relink
+RemoveM
+renderer
+repistory
+repo
+reportings
+reportSrcColumn
+representable
+reproducibility
+reproject
+Reproject
+reprojected
+Reprojected
+reprojecting
+Reprojecting
+reprojection
+Reprojection
+reprojections
+reprojects
+repurpose
+resample
+Resample
+RESAMPLE
+resampled
+resampler
+resampling
+Resampling
+rescale
+Rescale
+rescaling
+rescanning
+ResetReading
+ResponsibleParty
+restartable
+RestrictionCode
+reStructuredText
+resultset
+Resurs
+resx
+resy
+retile
+retiling
+RetrieveNumericColumnsAsDouble
+Retrurns
+rewrap
+rewrapped
+rfc
+rgb
+RGB
+rgba
+rgdal
+rgx
+RHEL
+riegl
+rightfov
+Rijndael
+RIXmLbLbiagYnUd
+rl
+RLE
+RMagic
+rmdir
+RMin
+RMinSize
+rn
+ro
+roadmap
+roff
+RollbackTransaction
+Ronnen
+rorient
+rouault
+rought
+roundCoordinates
+roundoff
+roundtrip
+roundtripping
+Roundtripping
+rowid
+rowset
+rpath
+rpc
+RPF
+rpr
+RRaster
+rrd
+rsiz
+rst
+rsync
+RTD
+rteptid
+rtree
+RTree
+ru
+Ruland
+runtime
+Runtime
+rvalue
+rw
+Rweight
+salestax
+samplelib
+Sandia
+sar
+sbn
+sbx
+scalability
+scalable
+Scalable
+scaleaxes
+scanf
+scanline
+scanlines
+ScanSAR
+scenProc
+schemaLocation
+schemas
+Schemas
+Schreiber
+schwehr
+sd
+sdat
+sdk
+SDK
+sdo
+se
+sean
+SeanG
+SecurityConstraints
+seg
+SEG
+segmentization
+segmentize
+sel
+Selafin
+selectable
+semimajor
+semiminor
+Semykin
+sep
+sequenceRule
+Seraphin
+serializable
+Serializer
+serverless
+ServerUrl
+setAccessControl
+setAccessControlRecursive
+setargv
+setCoordinateDimension
+setfeature
+SetFeature
+SetFieldAsDateTime
+SetFrom
+setlocale
+setMeasured
+SetNonLinearGeometriesEnabledFlag
+setPoint
+setProperties
+severals
+sg
+sgillies
+sgrd
+SHA
+SHACAL
+shapefil
+shapefile
+Shapefile
+shapefiles
+Shapefiles
+shapelib
+Shapelib
+shortname
+shortnames
+shp
+shpopen
+shptree
+shx
+shz
+si
+sig
+Sightlines
+signedness
+significants
+Simmon
+sinc
+sizeBytes
+sizeKnown
+sizeof
+SizeX
+SizeY
+skipfailures
+SKIPJACK
+sl
+slc
+smallint
+SMax
+SMean
+SMin
+smp
+snprintf
+soConnLayerName
+Softchart
+Solaris
+Soldner
+somearray
+sooon
+sosi
+soSrcLayerName
+soTgtLayerName
+Soule
+Sourcepole
+southing
+sozip
+SOZip
+sp
+spacings
+Spack
+Sparc
+spatFilter
+spatialite
+Spatialite
+SpatiaLite
+spatialref
+SpatialReference
+spatialys
+Spatialys
+spatio
+Spatio
+spc
+specialised
+speciffed
+specificaiton
+specificities
+Specifieds
+SpectralBand
+spf
+sprintf
+sprintfs
+spx
+sql
+sqlite
+sqlspecials
+sqrt
+sr
+src
+Src
+SRC
+srcfile
+srcmaskband
+srcnodata
+srcwin
+sRGB
+srs
+SRS
+srsDimension
+srsName
+sscanf
+sss
+sta
+Stacktraces
+Standaard
+Startig
+StartPoint
+startTime
+StartTransaction
+stat'ed
+stateful
+stderr
+stdin
+stdout
+stealInteriorRing
+Steinberg
+stepsize
+stereographic
+Stereographic
+Stereograpic
+Stigter
+sto
+storageCRS
+storageV
+str
+strcasecmp
+strdup
+streamable
+strezen
+strftime
+stricty
+strile
+stringlist
+Stripmap
+strlcat
+strlcpy
+strlen
+strncasecmp
+strncat
+strncpy
+strout
+strstr
+strtod
+strtof
+Struct
+StructArray
+Struve
+styleurl
+styleurls
+su
+subarcs
+subarray
+subbottom
+subClass
+subclassed
+Subclassed
+subclasses
+Subclasses
+subdataset
+Subdataset
+subdatasets
+Subdatasets
+subdirectories
+subdirectory
+Subdirectory
+subdocument
+subelement
+subelements
+Subexpressions
+subfield
+subfields
+subfile
+subfiles
+subfolders
+subgeometries
+subgeometry
+subheader
+sublicense
+subline
+sublines
+submodules
+Submodules
+subnode
+subnodes
+suboptimal
+subpackages
+subpaths
+subportion
+subprocess
+subprocesses
+subregion
+subregions
+subsample
+Subsample
+subsampled
+subsampling
+subsecond
+subsetted
+subsetting
+Subsetting
+subsettings
+substituable
+substring
+subsubgroup
+subtelty
+subtiles
+subtree
+subtype
+Subtype
+subtypes
+Subtypes
+subunits
+subwindow
+sudo
+summarization
+SUnits
+supercompressed
+supercomputing
+supergrid
+supergrids
+Superoverlay
+supportsPagination
+sv
+svn
+swe
+swedish
+swi
+Swif
+swiftclient
+swq
+sym
+symlinked
+syntaxes
+syntaxic
+sys
+sysconfdir
+Szekeres
+szekerest
+Szekerest
+szlib
+szName
+szTempBuffer
+tablename
+Tamas
+TamasS
+tangency
+targetCoordinateSystem
+TargetName
+te
+teardown
+tehre
+Teigha
+tem
+templated
+Terragen
+testblockcache
+testblockcachelimits
+testcondition
+testcopywords
+testCreate
+tfw
+tgt
+tgz
+th
+thebuffer
+themself
+thescale
+thf
+THH
+thish
+Thorne
+thorougful
+threadsafe
+threadsafety
+thresholding
+tiepoint
+tiepoints
+tif
+tiffmedian
+tiffw
+tifw
+tigerpoly
+Tike
+TileByteCounts
+TileCountX
+TileCountY
+tiledb
+TiledGroupName
+tiledriver
+tileindex
+TileIndex
+tileindexed
+TileIndexOptions
+TileLevel
+TileM
+tilematrix
+TileMatrix
+tilematrixset
+TileMatrixSet
+tilename
+TileOffset
+TileOffsets
+tileset
+Tileset
+tilesets
+Tilesets
+tilesize
+tilex
+TileX
+tiley
+TileY
+tim
+timePosition
+timesheet
+TinZ
+tippecanoe
+tm
+tmerc
+tms
+tmscompatible
+TNS
+toc
+TOC
+Tokenize
+tokenizer
+Tokenizes
+tokenizing
+tolower
+toml
+Toolchain
+toolchains
+toolkits
+toolset
+topfov
+topleft
+toplevel
+Topo
+TopoGrid
+topojson
+topologies
+tos
+Toscana
+Toshio
+toupper
+towgs
+tpk
+tpkx
+tps
+trac
+Trac
+Traditionnaly
+Traditonal
+trailaing
+transactional
+Transactional
+transcations
+transcode
+transcoded
+transcoding
+TranslateOptions
+travis
+tre
+TRE
+triaging
+trigonometic
+trksegid
+trksegptid
+ttyS
+Tunesia
+tunings
+Turton
+Twofish
+twopasses
+txt
+TXT
+typedefs
+typeless
+typemaps
+typename
+typenames
+typestr
+tz
+ubyte
+UByte
+ucs
+UCS
+uDefault
+uint
+Uint
+UInt
+ULink
+ullr
+ulx
+uly
+umask
+un
+unallocated
+unary
+uncached
+uncalibrated
+unclamped
+uncoded
+uncomment
+Uncompress
+uncompressing
+underscope
+undirected
+Undirected
+undoubtly
+unencrypted
+unescape
+Unescape
+unescaped
+ungeoreference
+ungeoreferenced
+ungridded
+unicode
+unintentionnaly
+uninvertable
+unioned
+unistd
+unitconvert
+unix
+unixodbc
+unixODBC
+unlabelled
+unlikeley
+unlink
+Unlink
+unlogged
+Unlogged
+unmanagable
+unmanaged
+unmapped
+unoptimized
+unrecognised
+unreferenced
+unregister
+Unregister
+unregistration
+unsafessl
+UnsafeSSL
+unscale
+unscaled
+Unscaled
+unsetDefault
+unsetFid
+unsetnodata
+unsetting
+untiled
+untransformable
+untrusted
+updatable
+updateable
+UpdateFeature
+updateTime
+UpperLeftX
+UpperLeftY
+upsampling
+upsert
+uri
+url
+Url
+usb
+useConstraints
+UseMaskBand
+useragent
+UserAgent
+userfaultfd
+userid
+Userid
+userNote
+USERPROFILE
+UserPwd
+useul
+usgsdemdataset
+ushort
+usr
+utf
+UTF
+utils
+utm
+va
+Vaisala
+valgrind
+Valgrind
+Validify
+valN
+valonly
+valueN
+vapour
+Vapour
+varchar
+variadic
+vasprintf
+Vax
+vc
+vcpkg
+vct
+vcvars
+vdc
+vecror
+VectorInfo
+VectorInfoOptions
+vectorization
+vectorized
+VectorTranslate
+VectorTranslateOptions
+Vectorworks
+vendored
+vendorized
+ver
+Ver
+VerifyAdviseRead
+vetoers
+vetos
+Vexcel
+vfk
+Viersen
+viewshed
+Viewshed
+Viewsheds
+virtualenv
+virtualized
+virtualmem
+visibiliy
+visualisation
+vmaplv
+vnd
+voxel
+vrf
+vrt
+VRT
+VRTDataset
+VRTPansharpenedDataset
+VRTWarpedDataset
+vsgis
+vsi
+vsiadls
+vsiaz
+vsicached
+vsicrypt
+vsicurl
+VSIFOpen
+vsigs
+vsigz
+vsigzip
+vsihdfs
+vsil
+vsimem
+vsioss
+vsipmtiles
+vsiPREFIX
+vsirar
+vsis
+vsisparse
+vsistdin
+vsistdout
+vsisubfile
+vsiswift
+vsitar
+VSIVirtualHandle
+vsiwebhdfs
+vsiXXX
+vsizip
+vsnprintf
+vsprintf
+vv
+VV
+vXYR
+Wallner
+warmerda
+warmerdam
+warper
+Warper
+warpers
+WarpOptions
+WAsP
+watrcrsl
+Waupotitsch
+waypoints
+Waypoints
+wb
+wchar
+wcs
+wctomb
+wday
+webHdfs
+webmercator
+WebP
+WEBP
+webviewer
+wellformedness
+Westervelt
+westing
+wfopen
+wfs
+wgrib
+wgs
+WGS
+whileUnsealing
+whitepoint
+whitespace
+whitespaces
+wildland
+Winkel
+wkb
+WKB
+wkbCircularString
+wkbCompoundCurve
+wkbCurve
+wkbCurvePolygon
+wkbFlatten
+wkbGeometryCollection
+wkbHasZ
+wkbLineString
+wkbLineStrings
+wkbMulti
+wkbMultiCurve
+wkbMultiLineString
+wkbMultiPoint
+wkbMultiPolygon
+wkbMultiSurface
+wkbNDR
+wkbNone
+wkbPoint
+wkbPoints
+wkbPolygon
+wkbPolygons
+wkbPolyhedralSurface
+wkbSetZ
+WkbSize
+wkbSurface
+wkbTIN
+wkbTINZ
+wkbTriangle
+wkbUnknown
+wkbVariant
+wkbVariantIso
+wkbVariantOgc
+wkbVariantOldOgc
+wkbVariantPostGIS
+wkbXDR
+wkbXXXXX
+wkbZ
+wkbzm
+wkt
+WKT
+wld
+wm
+wms
+WMS
+WOptions
+workarounded
+worldfile
+worldfiles
+WriteArray
+WriteArrowBatch
+wwith
+www
+Wx
+xA
+XArray
+xblock
+xCF
+xD
+xDF
+xE
+Xenial
+Xerces
+XercesC
+xF
+xFC
+xFF
+xfs
+xlink
+xlinks
+xlsx
+xm
+xmax
+xmin
+xml
+xmlns
+XMP
+xn
+xN
+xoff
+xOff
+XOR'ed
+Xp
+xpath
+XPath
+XPATH
+XPaths
+xpdf
+XPlane
+XRef
+xres
+XResol
+xs
+xsd
+xsi
+xsize
+XSize
+XTEA
+xtf
+xxxx
+XXXX
+xxxxx
+XXXXX
+xxxxxx
+xy
+XYM
+xyscale
+xyXY
+xyY
+xyz
+XYZ
+yacc
+yblock
+YCbCr
+yday
+Yesson
+yj
+yk
+ym
+ymax
+ymin
+yoff
+yOff
+YOrigin
+Yp
+YRef
+yres
+YResol
+ysize
+YSize
+yyyy
+YYYY
+yyyyddmm
+YYYYMMDDHHmmSSOHH'mm
+YYYYY
+Zarr
+zarray
+zer
+ZeroBlockHttpCodes
+ZeroBlockOnServerException
+Zevenbergen
+zFactors
+zlib
+Zlib
+ZLib
+ZMap
+zmax
+zmetadata
+zmin
+ZoomLevel
+zres
+ZResolution
+zscale
+zstd
+Zstd
+ZStd
+Zuid
+Zwarg
+ZZ
diff --git a/doc/source/sponsors/faq.rst b/doc/source/sponsors/faq.rst
index 397610dd7292..7d4e04835a86 100644
--- a/doc/source/sponsors/faq.rst
+++ b/doc/source/sponsors/faq.rst
@@ -38,7 +38,7 @@ various levels start with the `Sustainable GDAL Sponsorship Prospectus`_.
 If you are interested, need help convincing your key decision-makers, or have
 any questions, don't hesitate to contact gdal-sponsors@osgeo.org.
 
-.. _Sustainable GDAL Sponsorship Prospectus: https://gdal.org/sponsors/Sustainable%20GDAL%20Sponsorship%20Prospectus.pdf
+.. _Sustainable GDAL Sponsorship Prospectus: ../_static/Sustainable%20GDAL%20Sponsorship%20Prospectus.pdf
 
 What is NumFOCUS and why is the project using that foundation rather than using OSGeo for this effort?
 ------------------------------------------------------------------------------------------------------
diff --git a/doc/source/sponsors/index.rst b/doc/source/sponsors/index.rst
index 07bb4a8e1164..cc80b85851fb 100644
--- a/doc/source/sponsors/index.rst
+++ b/doc/source/sponsors/index.rst
@@ -127,6 +127,10 @@ the health of the project:
 
         `Kaplan Open Source Consulting <https://kaplanopensource.co.il/>`__
 
+    .. container:: horizontal-logo
+
+        `Phoenix LiDAR Systems, LLC <https://phoenixlidar.com/>`__
+
     .. container:: horizontal-logo
 
         `PIX4D <https://www.pix4d.com/>`__
@@ -135,6 +139,10 @@ the health of the project:
 
         `Regrid <https://regrid.com>`__
 
+    .. container:: horizontal-logo
+
+        `Route4Me, Inc. <https://route4me.com>`__
+
     .. container:: horizontal-logo
 
         `Satelligence <https://satelligence.com/>`__
@@ -143,6 +151,10 @@ the health of the project:
 
         `Space Intelligence <https://www.space-intelligence.com>`__
 
+    .. container:: horizontal-logo
+
+        `T-Kartor USA <https://www.t-kartorusa.com/>`__
+
     .. container:: horizontal-logo
 
         `Umbra <https://umbra.space/>`__
@@ -235,7 +247,7 @@ Related resources
 
 .. Source of the PDF is at https://docs.google.com/document/d/1yhMWeI_LgEXPUkngqOitqcKfp7ov6WsS41v5ulz-kd0/edit#
 
-.. _Sustainable GDAL Sponsorship Prospectus: https://gdal.org/sponsors/Sustainable%20GDAL%20Sponsorship%20Prospectus.pdf
+.. _Sustainable GDAL Sponsorship Prospectus: ../_static/Sustainable%20GDAL%20Sponsorship%20Prospectus.pdf
 
 ..
     Developer comment: make html includes a hack to hide the table from
@@ -244,5 +256,6 @@ Related resources
 
 .. toctree::
    :maxdepth: 0
+   :hidden:
 
    faq
diff --git a/doc/source/thanks.rst b/doc/source/thanks.rst
new file mode 100644
index 000000000000..1616b3c089aa
--- /dev/null
+++ b/doc/source/thanks.rst
@@ -0,0 +1,205 @@
+.. _thanks:
+
+================================================================================
+Thanks
+================================================================================
+
+As of 2024, GDAL has now a 26 year-long existence, and many individuals, companies,
+and :ref:`sponsors` have contributed to its development and success.
+While it is always difficult to properly acknowledge all contributions, a few
+individuals particularly stand out:
+
+- `Frank Warmerdam <https://github.com/warmerdam>`__, creator of GDAL, initial chair of its Project Steering Committee
+  (PSC) and maintainer from 1998 to 2012, founding member of OSGeo, and currently
+  Principal Engineer at Planet.
+  GDAL would not be what is is without his outstanding work. Support for GeoTIFF,
+  JPEG, PNG, VRT, Shapefile, CSV, PostGIS and dozens of other popular (or niche)
+  formats, as well as gdal_translate, gdalwarp, ogr2ogr and most other utilities
+  are all to be credited to Frank.
+
+- `Howard Butler <https://github.com/hobu>`__, director of Hobu Inc., active on GDAL since 2004, contributor to
+  the Python SWIG bindings, PSC member, founding member of OSGeo.
+  Howard was the coordinator of the fundraising that lead to the advent of
+  GDAL 3 and PROJ 6, and since 2021, he has been instrumental in setting up the
+  GDAL Sponsorship Program and serves as its head, liaising with our sponsors
+  and NumFOCUS, and hosting GDAL contributor monthly meetings.
+
+- `Jukka Rahkonen <https://github.com/jratike80>`__, Chief IT Specialist at the National Land Survey of Finland,
+  power-user and long-time passionate of GDAL, PSC member.
+  Over the last 15 years, Jukka has been tirelessly helping users and triaging
+  reports on the issue tracker and other support forums.
+
+- `Even Rouault <https://github.com/rouault>`__, involved since 2007, main maintainer since 2014, current PSC chair,
+  director of Spatialys.
+  Even has authored dozens of drivers (and happy to have managed to retire
+  a few of them!) and many enhancements. He has also been involved in code
+  modernization, extension of the regression test suite, continuous integration
+  and security efforts.
+
+Among `code contributors <https://github.com/OSGeo/gdal/graphs/contributors>`__,
+we want to acknowledge the key, past or current, documentation or code contributions
+of the following persons:
+
+- `Ben Ahmed Daho Ali <https://github.com/allilou>`__: SXF driver
+- `Jorge Arevalo <https://github.com/jorgeas80>`__: PostGIS Raster driver
+- `Dan Baston <https://github.com/dbaston>`__: modernization of the Python test suite and Python bindings.
+- `Norman Barker <https://github.com/normanb>`__: JPIPKAK and TileDB drivers, PSC member.
+- `Dmitry Baryshnikov <https://github.com/bishopgis>`__: SXF and CAD drivers and the GNM component.
+- `Andrew Bell <https://github.com/abellgithub>`__: gdal_viewshed enhancements.
+- `Pete Bunting <https://github.com/petebunting>`__: KEA driver.
+- `Ragi Yaser Burhum <https://github.com/rburhum>`__: FileGDB driver.
+- Brian Case: LIBKML driver.
+- `Victor Chernetsky <https://github.com/vchernetsky>`__: AmigoCloud driver.
+- Benjamin Collins: SWIG Java bindings.
+- Christopher Condit: OGR to KML conversion.
+- `Nyall Dawson <https://github.com/nyalldawson>`__: GeoPackage, OpenFileGDB, ODBC/PGeo and OGR core enhancements. Past co-maintainer.
+- `Jürgen Fischer <https://github.com/jef-n/>`__: NAS driver.
+- `Alessandro Furieri <https://www.gaia-gis.it/gaia-sins>`__: Spatialite support in SQLite driver, enhancements in GML driver.
+- `Andrea Giudiceandrea <https://github.com/agiudiceandrea>`__: documentation fixes
+- `Ari Jolma <https://github.com/ajolma>`__: Author of (ex) SWIG Perl bindings.
+- `Trent Hare <https://github.com/thareusgs>`__: PDS, ISIS2 and ISIS3 drivers.
+- `Björn Harrtell <https://github.com/bjornharrtell>`__: FlatGeoBuf driver.
+- `Thomas Hirsch <https://github.com/relet>`__: SOSI driver.
+- François Hissel: Selafin driver.
+- `Pirmin Kalberer <https://github.com/pka>`__: Interlis drivers.
+- `Andrey Kiselev <https://github.com/dron>`__: BMP, HDF4, HDF5, L1B, MrSID and RMF support, gdal_grid, past PSC member.
+- `Dan Jacobson <https://github.com/jidanni>`__: documentation enhancements.
+- `Kor de Jong <https://github.com/kordejong>`__: PCRaster driver.
+- `Peter A. Jonsson <https://github.com/pjonsson>`__: Docker scripts enhancements.
+- Chaitanya Kumar CH: past GDAL maintainer.
+- `Martin Lambers <https://github.com/marlam>`__: GTA driver.
+- `Martin Landa <https://github.com/landam>`__: VFK driver.
+- `Kikitte Lee <https://github.com/kikitte>`__: Two-Arm chains edge tracing algorithm of gdal_polygonize.
+- `Alexandr Lisovenko <https://github.com/alisovenko>`__: SXF driver
+- `Mateusz �oskot <https://github.com/mloskot>`__: GeoJSON driver, (ex) Windows CE support, past GDAL maintainer.
+- `Ivan Lucena <https://github.com/IvanLucena>`__: Idrisi, Intergraph and Oracle drivers, (ex) Windows build scripts.
+- `Hugo Mercier <https://github.com/mhugo>`__: marching square algorithm of gdal_contour
+- `Idan Miara <https://github.com/idanmiara>`__: gdal-utils Python package.
+- `Martin Mikita <https://github.com/martinmikita>`__: PDFium backend of the PDF driver.
+- `Hiroshi Miura <https://github.com/miurahr>`__: Initial CMake build system.
+- `Vincent Mora <https://github.com/vmora>`__: WAsP driver
+- `Daniel Morissette <https://github.com/dmorissette>`__: CPL library, MapInfo .mif/.tab and Arc/Info vector coverage (AVC) support, PSC member.
+- Denis Nadeau: netCDF support.
+- `Markus Neteler <https://github.com/neteler>`__: various contributions to GDAL documentation
+- Adam Nowacki: WMS driver.
+- Jens Oberender: KML driver.
+- `Alessandro Pasotti <https://github.com/elpaso>`__: co-maintainer since 2022.
+- `Kai Pastor <https://github.com/dg0yt>`__: contributions to the CMake build system.
+- `Abel Pau <https://github.com/AbelPau>`__: MiraMon driver.
+- `Matthew Perry <https://github.com/perrygeo>`__: gdaldem
+- Mark Phillips: TIGER driver.
+- `Lucian Plesea <https://github.com/lucianpls>`__: ESRIC and MRF drivers.
+- `Petr Pridal <https://github.com/klokan>`__: gdal2tiles utility.
+- `Paul Ramsey <https://github.com/pramsey>`__: GeoPackage and FileGDB drivers.
+- Bas Retsios: MSG driver.
+- Didier Richard: Geoconcept driver.
+- Kevin Ruland: SWIG bindings refactor.
+- `Maxim Rylov <https://github.com/mrylov>`__: Hana driver.
+- `Michael Scholz <https://github.com/michikommader>`__: OpenDRIVE driver.
+- `Kurt Schwehr <https://github.com/schwehr>`__: code linting through the whole codebase, PSC member.
+- `Avyav Kumar Singh <https://github.com/avyavkumar>`__: enhancements in the OGR geometry support, SFCGAL support.
+- `Craig de Stigter <https://github.com/craigds>`__: port of GDAL Python autotest suite to the pytest framework.
+- `Michael Sumner <https://github.com/mdsumner>`__: documentation enhancements, vrt:// enhancements.
+- `Tamas Szekeres <https://github.com/szekerest>`__: SWIG CSharp bindings, gdal_viewshed, PSC member.
+- `Alan Thomas <https://github.com/atlight>`__: major enhancements in the DXF driver.
+- `Etienne Tourigny <https://github.com/etiennesky>`__: major enhancements in the netCDF driver.
+- Philippe Vachon: COASP, GFF, JaxaPalsar, TSX drivers.
+- Stephane Villeneuve: OGR Feature Style support, MapInfo .mif.
+- `Yorick de Wid <https://github.com/yorickdewid>`__: LVBAG driver.
+- Chris Yesson: gdaldem
+
+Graphical contributions:
+
+- Marin Byrne: for producing the current GDAL icon set (based on the earlier version by Martin Daly).
+- Darek Krawczyk: for producing design of the initial GDAL Team Member t-shirt (based on Marin's and Martin's graphics).
+- `Joe Morrison <https://www.linkedin.com/in/joe-morrison>`__: for producing the new `GDAL t-shirt <https://teespring.com/gdal?pid=387&cid=101810>`__
+
+Packaging:
+
+- Alpine Linux: `Holger Jaekel <https://github.com/hjaekel>`__
+- Debian: `Bas Couwenberg <https://github.com/sebastic>`__, `Francesco Paolo Lovergine <https://github.com/fpl>`__
+- Conda-Forge: `Filipe Fernandes <https://github.com/ocefpaf>`__, `Daryl Herzmann <https://github.com/akrherz>`__ and `others <https://github.com/conda-forge/gdal-feedstock/graphs/contributors>`__
+- Fedora: `Sandro Mani <https://github.com/manisandro>`__
+- GISInternals: `Tamas Szekeres <https://github.com/szekerest>`__
+- Homebrew: `GDAL Homebrew maintainers <https://github.com/Homebrew/homebrew-core/commits/master/Formula/g/gdal.rb>`__
+- MS4W: `Jeff McKenna <https://github.com/jmckenna>`__
+- OpenBSD: `Landry Breuil <https://github.com/landryb>`__
+- OSGeo4W: `Jürgen Fischer <https://github.com/jef-n/>`__
+- netBSD: `Greg Troxel <https://github.com/gdt>`__
+- Spack: `Adam J. Stewart <https://github.com/adamjstewart>`__
+- Ubuntu: `Angelos Tzotsos <https://github.com/kalxas>`__
+- vcpkg: `Kai Pastor <https://github.com/dg0yt>`__
+
+You can also consult `Frank Warmerdam's sponsors, acknowledgments and credits <http://web.archive.org/web/20130509110604/http://www.gdal.org/credits.html>`__ for the period 1998-2010.
+
+.. below is an allow-list for spelling checker.
+
+.. spelling:word-list::
+    Daho
+    Arevalo
+    Ragi
+    Yaser
+    Burhum
+    Chernetsky
+    Condit
+    Giudiceandrea
+    Björn
+    Harrtell
+    Hirsch
+    François
+    Hissel
+    Lambers
+    Landa
+    Kikitte
+    Alexandr
+    Lisovenko
+    Mercier
+    Mikita
+    Hiroshi
+    Miura
+    Mora
+    Markus
+    Neteler
+    Nowacki
+    Jens
+    Oberender
+    Passoti
+    Kai
+    Pau
+    Plesea
+    Pridal
+    Bas
+    Retsios
+    Didier
+    Rylov
+    Scholz
+    Etienne
+    Tourigny
+    Vachon
+    Stephane
+    Villeneuve
+    Yorick
+    Wid
+    Byrne
+    Daly
+    Darek
+    Krawczyk
+    Couwenberg
+    Herzmann
+    Filipe
+    Fernandes
+    Sandro
+    Angelos
+    Tzotzos
+    Landry
+    Breuil
+    Holger
+    Jaekel
+    Francesco
+    Paolo
+    Lovergine
+    netBSD
+    Troxel
+    Chaitanya
+    Kumar
+    CH
diff --git a/doc/source/tutorials/index.rst b/doc/source/tutorials/index.rst
index 0542ac9b7626..78b6f6633fbb 100644
--- a/doc/source/tutorials/index.rst
+++ b/doc/source/tutorials/index.rst
@@ -49,3 +49,24 @@ Projections and Spatial Reference Systems tutorial (OSR - OGRSpatialReference)
    :maxdepth: 1
 
    osr_api_tut
+
+Workshops
+---------
+
+- `Raster and vector processing with GDAL <http://download.osgeo.org/gdal/workshop/foss4ge2015/workshop_gdal.html>`__, FOSS4G-Europe 2015, Even Rouault
+
+External tutorials
+------------------
+
+A Gentle Introduction to GDAL, by Robert Simmon
++++++++++++++++++++++++++++++++++++++++++++++++
+
+1. `A Gentle Introduction to GDAL <https://medium.com/planet-stories/a-gentle-introduction-to-gdal-part-1-a3253eb96082>`__
+2. `Map Projections & gdalwarp <https://medium.com/planet-stories/a-gentle-introduction-to-gdal-part-2-map-projections-gdalwarp-e05173bd710a>`__
+3. `Geodesy & Local Map Projections <https://medium.com/@robsimmon/a-gentle-introduction-to-gdal-part-3-geodesy-local-map-projections-794c6ff675ca>`__
+4. `Working with Satellite Data <https://medium.com/planet-stories/a-gentle-introduction-to-gdal-part-4-working-with-satellite-data-d3835b5e2971>`__
+5. `Shaded Relief <https://medium.com/@robsimmon/a-gentle-introduction-to-gdal-part-5-shaded-relief-ec29601db654>`__
+6. `Visualizing Data <https://medium.com/@robsimmon/a-gentle-introduction-to-gdal-part-6-1-visualizing-data-8e6e7d6ef641>`__
+7. `Transforming Data <https://medium.com/@robsimmon/a-gentle-introduction-to-gdal-part-7-transforming-data-178df8640dd2>`__
+8. `Reading Scientific Data Formats <https://medium.com/@robsimmon/a-gentle-introduction-to-gdal-part-8-reading-scientific-data-formats-1a1f70d5388c>`__
+
diff --git a/doc/source/user/configoptions.rst b/doc/source/user/configoptions.rst
index 8c34ba88fcd0..425d0292371a 100644
--- a/doc/source/user/configoptions.rst
+++ b/doc/source/user/configoptions.rst
@@ -147,7 +147,6 @@ Example:
     [.sentinel_s2_l1c]
     path=/vsis3/sentinel-s2-l1c
     AWS_REQUEST_PAYER=requester
-    \endverbatim
 
 
 
@@ -627,6 +626,20 @@ Networking options
       Try to query quietly redirected URLs to Amazon S3 signed URLs during their
       validity period, so as to minimize round-trips.
 
+-  .. config:: CPL_VSIL_CURL_AUTHORIZATION_HEADER_ALLOWED_IF_REDIRECT
+      :choices: YES, NO, IF_SAME_HOST
+      :default: IF_SAME_HOST
+      :since: 3.10
+
+      Determines if the HTTP ``Authorization`` header must be forwarded when
+      redirections are followed:
+
+      - ``NO`` to always disable forwarding of Authorization header
+      - ``YES`` to always enable forwarding of Authorization header (was the
+        default value prior to GDAL 3.10)
+      - ``IF_SAME_HOST`` to enable forwarding of Authorization header only if
+        the redirection is to the same host.
+
 -  .. config:: CPL_VSIL_USE_TEMP_FILE_FOR_RANDOM_WRITE
       :choices: YES, NO
 
@@ -816,14 +829,15 @@ Networking options
 
 -  .. config:: GDAL_HTTP_VERSION
       :since: 2.3
-      :choices: 1.0, 1.1, 2, 2TLS
+      :choices: 1.0, 1.1, 2, 2TLS, 2PRIOR_KNOWLEDGE
 
       Specifies which HTTP version to use. Will default to 1.1 generally (except on
       some controlled environments, like Google Compute Engine VMs, where 2TLS will
       be the default). Support for HTTP/2 requires curl 7.33 or later, built
       against nghttp2. "2TLS" means that HTTP/2 will be attempted for HTTPS
       connections only. Whereas "2" means that HTTP/2 will be attempted for HTTP or
-      HTTPS. The interest of enabling HTTP/2 is the use of HTTP/2 multiplexing when
+      HTTPS. "2PRIOR_KNOWLEDGE" means that the server will be assumed to support
+      HTTP/2. The interest of enabling HTTP/2 is the use of HTTP/2 multiplexing when
       reading GeoTIFFs stored on /vsicurl/ and related virtual file systems.
 
 -  .. config:: GDAL_HTTP_MULTIPLEX
@@ -928,8 +942,9 @@ Networking options
 
 -  .. config:: GDAL_HTTP_USERAGENT
 
-      When set this string will be used to set the ``User-Agent`` header in the http
+      This string will be used to set the ``User-Agent`` header in the HTTP
       request sent to the remote server.
+      Defaults to "GDAL/x.y.z" where x.y.z is the GDAL build version.
 
 -  .. config:: GDAL_HTTP_UNSAFESSL
       :choices: YES, NO
@@ -966,36 +981,41 @@ PROJ options
 
 -  .. config:: CHECK_WITH_INVERT_PROJ
       :since: 1.7.0
+      :default: NO
 
       Used by :source_file:`ogr/ogrct.cpp` and :source_file:`apps/gdalwarp_lib.cpp`.
 
-      This option can be used to control the behavior of gdalwarp when warping global
+      This option can be used to control the behavior of :program:`gdalwarp` when warping global
       datasets or when transforming from/to polar projections, which causes
       coordinate discontinuities. See http://trac.osgeo.org/gdal/ticket/2305.
 
-      The background is that PROJ does not guarantee that converting from src_srs to
-      dst_srs and then from dst_srs to src_srs will yield to the initial coordinates.
+      The background is that PROJ does not guarantee that converting from ``src_srs`` to
+      ``dst_srs`` and then from ``dst_srs`` to ``src_srs`` will yield the initial coordinates.
       This can lead to errors in the computation of the target bounding box of
-      gdalwarp, or to visual artifacts.
+      :program:`gdalwarp`, or to visual artifacts.
 
-      If CHECK_WITH_INVERT_PROJ option is not set, gdalwarp will check that the the
+      If :config:`CHECK_WITH_INVERT_PROJ` option is not set, :program:`gdalwarp` will check that the
       computed coordinates of the edges of the target image are in the validity area
       of the target projection. If they are not, it will retry computing them by
-      setting :config:`CHECK_WITH_INVERT_PROJ=TRUE` that forces ogrct.cpp to check the
-      consistency of each requested projection result with the invert projection.
+      setting :config:`CHECK_WITH_INVERT_PROJ=TRUE` that forces
+      :source_file:`ogr/ogrct.cpp` to check the consistency of each requested
+      projection result with the inverse projection.
 
-      If set to NO, gdalwarp will not attempt to use the invert projection.
+      If set to ``NO``, :program:`gdalwarp` will not attempt to use the inverse projection.
 
 -  .. config:: THRESHOLD
       :since: 1.7.0
+      :default: 0.1 for geographic SRS, 10000 otherwise
 
       Used by :source_file:`ogr/ogrct.cpp`.
 
-      Used in combination with :config:`CHECK_WITH_INVERT_PROJ=TRUE`. Define
-      the acceptable threshold used to check if the roundtrip from src_srs to
-      dst_srs and from dst_srs to srs_srs yield to the initial coordinates. The
-      value must be expressed in the units of the source SRS (typically degrees
-      for a geographic SRS, meters for a projected SRS)
+      Used in combination with :config:`CHECK_WITH_INVERT_PROJ=TRUE`. Defines
+      the acceptable threshold used to check if the round-trip from ``src_srs`` to
+      ``dst_srs`` and from ``dst_srs`` to ``srs_srs`` yields the initial coordinates.
+      The round-trip transformation will be considered successful if the ``x`` and ``y``
+      values are both within :config:`THRESHOLD` of the original values.
+      The value must be expressed in the units of the source SRS (typically degrees
+      for a geographic SRS, meters for a projected SRS).
 
 -  .. config:: OGR_ENABLE_PARTIAL_REPROJECTION
       :since: 1.8.0
diff --git a/doc/source/user/coordinate_epoch.rst b/doc/source/user/coordinate_epoch.rst
index 4e9e852377ae..dfe8e2260fae 100644
--- a/doc/source/user/coordinate_epoch.rst
+++ b/doc/source/user/coordinate_epoch.rst
@@ -169,9 +169,10 @@ from the source SRS when no SRS related options are specified.
 
 :program:`gdalwarp` and :program:`ogr2ogr` have a ``-s_coord_epoch`` option to be used together with ``-s_srs``
 (resp. ``-t_coord_epoch`` option to be used together with ``-t_srs``) to override/set the
-coordinate epoch of the source (resp. target) CRS. ``-s_coord_epoch`` and
-``-t_coord_epoch`` are currently mutually exclusive, due to lack of support for
-transformations between two dynamic CRS.
+coordinate epoch of the source (resp. target) CRS.
+
+Before PROJ 9.4, ``-s_coord_epoch`` and ``-t_coord_epoch`` were mutually exclusive, due to lack
+of support for transformations between two dynamic CRS.
 
 :program:`gdalwarp` preserves the coordinate epoch in the output SRS when appropriate.
 
diff --git a/doc/source/user/index.rst b/doc/source/user/index.rst
index c63c54f5a225..2da8d497352a 100644
--- a/doc/source/user/index.rst
+++ b/doc/source/user/index.rst
@@ -18,3 +18,4 @@ User oriented documentation
    coordinate_epoch
    configoptions
    gdal_python_utilities
+   security
diff --git a/doc/source/user/multidim_raster_data_model.rst b/doc/source/user/multidim_raster_data_model.rst
index 142409d35afb..b42bb3cd3cb6 100644
--- a/doc/source/user/multidim_raster_data_model.rst
+++ b/doc/source/user/multidim_raster_data_model.rst
@@ -108,12 +108,126 @@ a GDALExtendedDataType.
     GDALDataType does. So a driver may decide to expose a GDT\_Cxxxx datatype
     from a HDF5 Compound data type representing a complex value.
 
+Objects lifetime
+----------------
+
+Driver implementations of the multidimensional API are such that instances of
+GDALGroup, GDALMDArray, GDALAttribute and GDALDimension can be used independently
+of the objects from which they have been obtained from. So:
+
+- the GDALGroup instance returned by :cpp:func:`GDALDataset::GetRootGroup()` can
+  be used after the dataset has been closed.
+
+- Sub-groups obtained from :cpp:func:`GDALGroup::OpenGroup()`
+  or arrays obtained from :cpp:func:`GDALGroup::OpenMDArray()` can be used after
+  the owning group has been released.
+
+- Similarly for attributes or dimensions obtained from a group or an array.
+
+
+So the following is perfectly legal:
+
+.. code-block:: c++
+
+    #include "gdal_priv.h"
+
+    std::shared_ptr<GDALMDArray> GetArray()
+    {
+        auto poDataset = std::unique_ptr<GDALDataset>(
+            GDALDataset::Open( "in.nc", GDAL_OF_MULTIDIM_RASTER ));
+        if( !poDataset )
+        {
+            return nullptr:
+        }
+        auto poRootGroup = poDataset->GetRootGroup();
+        if( !poRootGroup )
+        {
+            return nullptr:
+        }
+        auto poVar = poRootGroup->OpenMDArray("temperature");
+        if( !poVar )
+        {
+            return nullptr:
+        }
+        return poVar;
+    }
+
+    int main()
+    {
+        GDALAllRegister();
+        auto poVar = GetArray();
+        if( !poVar )
+        {
+            exit(1);
+        }
+
+        // Do something with poVar
+
+        return 0;
+    }
+
+
+A potential point of attention is that, when creating / editing a dataset, all
+those objects keep alive the underlying file descriptors, so changes are only
+guaranteed to be serialized when all objects related to a dataset have been released.
+
+Example in C++:
+
+.. code-block:: c++
+
+    int main()
+    {
+        GDALAllRegister();
+
+        auto poDataset = std::unique_ptr<GDALDataset>(
+            GetGDALDriverManager()->GetDriverByName("netCDF")->
+                CreateMultiDimensional( "new.nc", nullptr, nullptr ));
+        auto poRootGroup = poDataset->GetRootGroup();
+
+        // Could be closed a bit later too
+        poDataset.reset();
+
+        auto poDim = poRootGroup->CreateDimension(
+            "my_dim", std::string(), std::string(), 10);
+        auto poArray = poRootGroup->CreateMDArray(
+            "my_var", {poDim}, GDALExtendedDataType::Create(GDT_Byte), nullptr);
+
+        // Can be closed in any order
+        poArray.reset();
+        poDim.reset();
+        poRootGroup.reset();
+
+        // new.nc is fully valid just now
+
+        return 0;
+    }
+
+
+Example in Python:
+
+.. code-block:: python
+
+    from osgeo import gdal
+
+    with gdal.GetDriverByName("netCDF").CreateMultiDimensional("new.nc") as ds:
+        rg = ds.GetRootGroup()
+        dim = rg.CreateDimension("my_dim", "", "", 10)
+        array = rg.CreateMDArray("my_var", [dim], gdal.ExtendedDataType.Create(gdal.GDT_Byte))
+
+        del array
+        del dim
+        del rg
+
+    # new.nc is fully valid just now
+
 Differences with the GDAL 2D raster data model
 ----------------------------------------------
 
 - The concept of GDALRasterBand is no longer used for multidimensional.
   This can be modelled as either different GDALMDArray, or using a compound
   data type.
+- There is not yet a standardized concept multi-resolution arrays/overviews in
+  the multidimensional API
 
 Bridges between GDAL 2D classic raster data model and multidimensional data model
 ---------------------------------------------------------------------------------
diff --git a/doc/source/user/multithreading.rst b/doc/source/user/multithreading.rst
index feb16b6f01a1..c4318bada342 100644
--- a/doc/source/user/multithreading.rst
+++ b/doc/source/user/multithreading.rst
@@ -4,8 +4,8 @@
 Multi-threading
 ===============
 
-GDAL API: re-entrant, but not thread-safe
------------------------------------------
+GDAL API: re-entrant, but (generally) not thread-safe
+-----------------------------------------------------
 
 The exact meaning of the terms ``thread-safe`` or ``re-entrant`` is not fully
 standardized. We will use here the `QT definitions <https://doc.qt.io/qt-5/threads-reentrancy.html>`__.
@@ -31,14 +31,42 @@ on different :cpp:class:`GDALRasterBand` instances owned by the same
 :cpp:class:`GDALDataset` instance (each thread should instead manipulate a
 distinct GDALDataset). Similarly for a GDALDataset owning several :cpp:class:`OGRLayer`.
 
+The reason is that most implementations of GDALDataset or GDALRasterBand
+are stateful. A GDALDataset typically owns a file handle,
+and performs seek/read operations on it, thus not allowing concurrent access.
+Block cache related structures for a given GDALDataset are not thread-safe.
+Drivers also often implement lazy initialization strategies to access various
+metadata which are resolved only the first time the method to access them is
+invoked. Drivers may also rely on third-party libraries that expose objects
+that are not thread-safe.
+
 Those restrictions apply to the C and C++ ABI, and all languages bindings (unless
 they would take special precautions to serialize calls)
 
+Thread-safe GDAL dataset instances for raster read-only use cases
+-----------------------------------------------------------------
+
+.. versionadded:: 3.10
+
+RFC 101 adds a new capability to open, or obtain, a thread-safe dataset from
+any dataset, but only for raster read-only use cases.
+
+At open time, this can be done by passing ``GDAL_OF_RASTER | GDAL_OF_THREAD_SAFE``
+to :cpp:func:`GDALOpenEx` / :cpp:func:`GDALDataset::Open`.
+
+Given an existing GDALDataset* instance, :cpp:func:`GDALDataset::IsThreadSafe`
+can be used to determine if it is thread-safe or not. If not,
+:cpp:func:`GDALDataset::GetThreadSafeDataset` can be used.
+
+Note that the generic implementation of this capability involves opening one
+dataset the first time a thread-safe dataset/raster band is accessed by a thread.
+While this is an implementation detail that can be ignored to develop code, it is
+important to note regarding potential performance impacts
+
 GDAL block cache and multi-threading
 ------------------------------------
 
-The current design of the GDAL raster block cache make it appropriate to
-read several datasets from several threads. However performance issues may
+The current design of the GDAL raster block cache allows concurrent reads of several datasets. However performance issues may
 arise when writing several datasets from several threads, due to lock contention
 in the global structures of the block cache mechanism.
 
diff --git a/doc/source/user/ogr_sql_dialect.rst b/doc/source/user/ogr_sql_dialect.rst
index bcf02b195945..605441add76b 100644
--- a/doc/source/user/ogr_sql_dialect.rst
+++ b/doc/source/user/ogr_sql_dialect.rst
@@ -107,16 +107,23 @@ memory may be used for datasets with a large number of distinct values.
 
 There are also several summarization operators that may be applied to columns.
 When a summarization operator is applied to any field, then all fields must
-have summarization operators applied.   The summarization operators are
-COUNT (a count of instances), AVG (numerical average), SUM (numerical sum),
-MIN (lexical or numerical minimum), and MAX (lexical or numerical maximum).
+have summarization operators applied.   The summarization operators are:
+
+- COUNT: count of instances
+- AVG: numerical average:
+- SUM: numerical sum
+- MIN: lexical or numerical minimum
+- MAX: lexical or numerical maximum
+- STDDEV_POP: (GDAL >= 3.10) numerical population standard deviation. Applied on Date/DateTime/Time fields, this returns a value in seconds.
+- STDDEV_SAMP: (GDAL >= 3.10) numerical `sample standard deviation <https://en.wikipedia.org/wiki/Standard_deviation#Sample_standard_deviation>`__.  Applied on Date/DateTime/Time fields, this returns a value in seconds.
+
 This example produces a variety of summarization information on parcel
 property values:
 
 .. code-block::
 
     SELECT MIN(prop_value), MAX(prop_value), AVG(prop_value), SUM(prop_value),
-        COUNT(prop_value) FROM polylayer WHERE prov_name = 'Ontario'
+        COUNT(prop_value), STDDEV_POP(prop_value) FROM polylayer WHERE prov_name = 'Ontario'
 
 It is also possible to apply the COUNT() operator to a DISTINCT SELECT to get
 a count of distinct values, for instance:
@@ -634,6 +641,25 @@ For example we can select the annotation features as:
 
     SELECT * FROM nation WHERE OGR_STYLE LIKE 'LABEL%'
 
+
+It is possible to use the ``OGR_STYLE`` field name as a special field name in
+the field selection as an alternate way of setting the :cpp:func:`OGRFeature::SetStyleString`
+value, typically by aliasing another field or a string literal.
+
+.. code-block::
+
+    SELECT *, 'BRUSH(fc:#01234567)' AS OGR_STYLE FROM source_layer
+
+
+By default, the OGR_STYLE field will still be visible as a regular field. If this
+is undesirable, starting with GDAL 3.10, it can be hidden by adding the HIDDEN
+keyword at the end of the field specification.
+
+.. code-block::
+
+    SELECT * EXCLUDE(my_style_field), my_style_field AS OGR_STYLE HIDDEN FROM source_layer
+
+
 CREATE INDEX
 ------------
 
diff --git a/doc/source/user/raster_data_model.rst b/doc/source/user/raster_data_model.rst
index e8e9d5bba92b..03af38ace48b 100644
--- a/doc/source/user/raster_data_model.rst
+++ b/doc/source/user/raster_data_model.rst
@@ -136,7 +136,7 @@ The value of the _NAME is the string that can be passed to :cpp:func:`GDALOpen`
 
 Drivers which support subdatasets advertise the ``DMD_SUBDATASETS`` capability. This information is reported when the --format and --formats options are passed to the command line utilities.
 
-Currently, drivers which support subdatasets are: ADRG, ECRGTOC, GEORASTER, GTiff, HDF4, HDF5, netCDF, NITF, NTv2, OGDI, PDF, PostGISRaster, Rasterlite, RPFTOC, RS2, TileDB, WCS, and WMS.
+Currently, drivers which support subdatasets are: ADRG, ECRGTOC, GEORASTER, GTiff, HDF4, HDF5, netCDF, NITF, NTv2, OGDI, PDF, PostGISRaster, Rasterlite, RPFTOC, RS2, TileDB, WCS, WMS, and Zarr.
 
 IMAGE_STRUCTURE Domain
 ++++++++++++++++++++++
@@ -189,6 +189,21 @@ For satellite or aerial imagery the IMAGERY Domain may be present. It depends on
 - CLOUDCOVER: Cloud coverage. The value between 0 - 100 or 999 if not available
 - ACQUISITIONDATETIME: The image acquisition date time in UTC
 
+Starting with GDAL 3.10, there also exists a raster band level IMAGERY metadata domain with the following items:
+
+- CENTRAL_WAVELENGTH_UM: Central Wavelength in micrometers.
+- FWHM_UM: Full-width half-maximum (FWHM) in micrometers.
+
+Clients can get (resp. set) these metadata items with :cpp:func:`GDALRasterBand::GetMetadataItem()`
+(resp. :cpp:func:`GDALRasterBand::SetMetadataItem()`).`
+
+They are specifically set by the :ref:`raster.sentinel2` and
+:ref:`raster.envi` drivers (if corresponding metadata items are found in the ENVI header),
+but may also be found in other drivers handling arbitrary GDAL metadata, such as
+the one using the GDAL Persistent Auxiliary Mechanism (PAM / .aux.xml side car files)
+or :ref:`raster.vrt` drivers. The :ref:`raster.gtiff` driver also supports serializing
+and deserializing the band IMAGERY metadata domain in the ``GDAL_METADATA`` TIFF tag.
+
 xml: Domains
 ++++++++++++
 
@@ -228,20 +243,48 @@ A raster band has the following properties:
 - An optional raster unit name. For instance, this might indicate linear units for elevation data.
 - A color interpretation for the band. This is one of:
 
-    * GCI_Undefined: the default, nothing is known.
-    * GCI_GrayIndex: this is an independent gray-scale image
-    * GCI_PaletteIndex: this raster acts as an index into a color table
-    * GCI_RedBand: this raster is the red portion of an RGB or RGBA image
-    * GCI_GreenBand: this raster is the green portion of an RGB or RGBA image
-    * GCI_BlueBand: this raster is the blue portion of an RGB or RGBA image
-    * GCI_AlphaBand: this raster is the alpha portion of an RGBA image
-    * GCI_HueBand: this raster is the hue of an HLS image
-    * GCI_SaturationBand: this raster is the saturation of an HLS image
-    * GCI_LightnessBand: this raster is the hue of an HLS image
-    * GCI_CyanBand: this band is the cyan portion of a CMY or CMYK image
-    * GCI_MagentaBand: this band is the magenta portion of a CMY or CMYK image
-    * GCI_YellowBand: this band is the yellow portion of a CMY or CMYK image
-    * GCI_BlackBand: this band is the black portion of a CMYK image.
+    * GCI_Undefined / "Undefined": default, nothing is known.
+    * GCI_GrayIndex / "Gray": independent gray-scale image
+    * GCI_PaletteIndex / "Palette": this raster acts as an index into a color table
+    * GCI_RedBand / "Red": red portion of an RGB or RGBA image, or red spectral band [0.62 - 0.69 um]
+    * GCI_GreenBand/ "Green": green portion of an RGB or RGBA image, or green spectral band [0.51 - 0.60 um]
+    * GCI_BlueBand / "Blue": blue portion of an RGB or RGBA image, or blue spectral band [0.45 - 0.53 um]
+    * GCI_AlphaBand / "Alpha": alpha portion of an RGBA image
+    * GCI_HueBand / "Hue": hue of a HLS image
+    * GCI_SaturationBand / "Saturation": saturation of a HLS image
+    * GCI_LightnessBand / "Lightness": lightness of a HLS image
+    * GCI_CyanBand / "Cyan": cyan portion of a CMY or CMYK image
+    * GCI_MagentaBand / "Magenta": magenta portion of a CMY or CMYK image
+    * GCI_YellowBand / "Yellow": yellow portion of a CMY or CMYK image, or yellow spectral band [0.58 - 0.62 um]
+    * GCI_BlackBand / "Black": black portion of a CMYK image.
+
+  Below values have been added in GDAL 3.10:
+
+    * GCI_PanBand / "Pan": Panchromatic band [0.40 - 1.00 um]
+    * GCI_CoastalBand / "Coastal": Coastal band [0.40 - 0.45 um]
+    * GCI_RedEdgeBand / "RedEdge": Red-edge band [0.69 - 0.79 um]
+    * GCI_NIRBand / "NIR": Near-InfraRed (NIR) band [0.75 - 1.40 um]
+    * GCI_SWIRBand / "SWIR": Short-Wavelength InfraRed (SWIR) band [1.40 - 3.00 um]
+    * GCI_MWIRBand / "MWIR": Mid-Wavelength InfraRed (MWIR) band [3.00 - 8.00 um]
+    * GCI_LWIRBand / "LWIR": Long-Wavelength InfraRed (LWIR) band [8.00 - 15 um]
+    * GCI_TIRBand / "TIR": Thermal InfraRed (TIR) band (MWIR or LWIR) [3 - 15 um]
+    * GCI_OtherIRBand / "OtherIR": Other infrared band [0.75 - 1000 um]
+    * GCI_SAR_Ka_Band / "SAR_Ka": Synthetic Aperture Radar (SAR) Ka band [0.8 - 1.1 cm / 27 - 40 GHz]
+    * GCI_SAR_K_Band / "SAR_K": Synthetic Aperture Radar (SAR) K band [1.1 - 1.7 cm / 18 - 27 GHz]
+    * GCI_SAR_Ku_Band / "SAR_Ku": Synthetic Aperture Radar (SAR) Ku band [1.7 - 2.4 cm / 12 - 18 GHz]
+    * GCI_SAR_X_Band / "SAR_X": Synthetic Aperture Radar (SAR) X band [2.4 - 3.8 cm / 8 - 12 GHz]
+    * GCI_SAR_C_Band / "SAR_C": Synthetic Aperture Radar (SAR) C band [3.8 - 7.5 cm / 4 - 8 GHz]
+    * GCI_SAR_S_Band / "SAR_S": Synthetic Aperture Radar (SAR) S band [7.5 - 15 cm / 2 - 4 GHz]
+    * GCI_SAR_L_Band / "SAR_L": Synthetic Aperture Radar (SAR) L band [15 - 30 cm / 1 - 2 GHz]
+    * GCI_SAR_P_Band / "SAR_P": Synthetic Aperture Radar (SAR) P band [30 - 100 cm / 0.3 - 1 GHz]
+
+  For spectral bands, the wavelength ranges are indicative only, and may vary
+  depending on sensors. The ``CENTRAL_WAVELENGTH_UM`` and ``FWHM_UM`` metadata
+  items in the band ``IMAGERY`` metadata domain of the raster band, when present, will
+  give more accurate characteristics.
+
+  Values belonging to the IR domain are in the [GCI_IR_Start, GCI_IR_End] range.
+  Values belonging to the SAR domain are in the [GCI_SAR_Start, GCI_SAR_End] range.
 
 - A color table, described in more detail later.
 - Knowledge of reduced resolution overviews (pyramids) if available.
diff --git a/doc/source/user/security.rst b/doc/source/user/security.rst
new file mode 100644
index 000000000000..ae9a6d532b48
--- /dev/null
+++ b/doc/source/user/security.rst
@@ -0,0 +1,222 @@
+.. _security:
+
+================================================================================
+Security considerations
+================================================================================
+
+This page discusses some security issues that users or developers may face while
+using GDAL. It can also serve as a check-list of items to take care of, for
+developers coding new drivers.
+
+While GDAL maintainers take a number of steps to limit the risk of software
+vulnerabilities, GDAL has a large attack surface, because it deals with data in
+a variety of file formats.
+
+.. note::
+
+    This page is not intended to be a comprehensive cook-book for being "safe" in all
+    circumstances, and should be considered as work-in-progress
+    that can benefit from continued feedback of people deploying GDAL.
+    Although they are specialists of the GDAL code base, GDAL maintainers are not
+    security experts.
+
+Classes of potential vulnerabilities
+------------------------------------
+
+- Arbitrary code execution with the privileges of the user running the GDAL
+  process.
+
+- Theft, tampering or destruction of data.
+
+- Denial of Service : abortion of a process, high consumption of CPU, memory,
+  I/O resource.
+
+- Unwanted network access.
+
+Causes
+------
+
+- Software bugs - in GDAL code itself, or in third-party dependencies - related
+  to code that processes user data. Common defects can be:
+
+   * stack or heap buffer overflows, potentially leading to arbitrary code
+     execution.
+
+   * excessive memory allocation
+
+   * infinite, or very long, loops in code
+
+- Software functionalities themselves, depending on the context of use, can
+  be a source of vulnerabilities. Consult :ref:`security_known_issues` below.
+
+Situations at risk
+------------------
+
+The following are examples of situations where a user may process untrusted data
+that has been crafted to trigger a vulnerability:
+
+- web services accepting input files provided by a client,
+
+- desktop use of GDAL where an hostile party manages to convince the victim
+  user to process hostile data.
+
+Mitigation
+----------
+
+- Upgrade to the latest versions of GDAL and its dependencies that might contain
+  bug fixes for some vulnerabilities.
+
+- Build GDAL with the hardening options of compilers, e.g. with -D_FORTIFY_SOURCE=2
+  (some Linux distributions turn on it by default), to minimize the effect of
+  buffer overflows.
+
+- Restrict access to the part of the file system that are only needed. The ``​chroot``
+  mechanism, or other sand-boxing solutions, might be a technical solution for this.
+
+- Compile only the subset of drivers needed. The ``GDAL_ENABLE_DRIVER_{name}``
+  or ``OGR_ENABLE_DRIVER_{name}`` CMake build options can be used for that purpose.
+
+- Disable unneeded drivers at run-time by setting the :config:`GDAL_SKIP`
+  configuration option.
+
+- When network access is not needed, disable Curl at build time with the
+  ``GDAL_USE_CURL=OFF`` CMake option.
+
+- Process untrusted data in a dedicated user account with no access to other
+  local sensitive data (data files, passwords, encryption/signing keys, etc...).
+  Note that the mere act of opening a dataset with the GDAL/OGR API or utilities
+  is a form of processing.
+
+- For automatic services, place restrictions on the CPU time and memory
+  consumption allowed to the process using GDAL. Check the options of your
+  HTTP server.
+
+- Check the raster dimensions and number of bands just after opening a GDAL
+  driver and before processing it. Several GDAL drivers use the
+  :cpp:func:`GDALCheckDatasetDimensions` and :cpp:func:`GDALCheckBandCount`
+  functions to do early sanity checks, but user checks can also be useful.
+  For example, a dataset with huge raster dimensions but with a very small file
+  size might be suspicious (but not always, for example a VRT file, or highly
+  compressed data...)
+
+- Do not allow arbitrary arguments to be passed to command line utilities.
+  In particular ``--config GDAL_DRIVER_PATH xxx`` or ``--config OGR_DRIVER_PATH xxx``
+  could be used to trigger arbitrary code execution for someone with write
+  access to some parts of the file system. Similarly, :config:`GDAL_VRT_ENABLE_PYTHON`
+  or :config:`GDAL_VRT_PYTHON_TRUSTED_MODULES` could be used to trigger hostile
+  Python code execution.
+
+- When possible, avoid using closed-source dependency libraries that cannot be
+  audited for vulnerabilities.
+
+.. _security_known_issues:
+
+Credential related issues
+-------------------------
+
+GDAL network virtual file systems can access credentials needed to grant access
+to remote resources, from the environment or local files. Those secrets are
+stored in RAM using normal mechanisms. Consequently they could potentially be
+recovered by untrusted code that would run in the same process as GDAL code.
+
+The same applies for connection strings to some drivers such as PostgreSQL, MySQL, etc.
+which may include passwords.
+
+Known issues in API
+-------------------
+
+- :cpp:func:`OGRSpatialReference::SetFromUserInput` accepts URLs by default
+
+Known issues in drivers
+-----------------------
+
+General issues
++++++++++++++++
+
+- Drivers do not always use file extensions to determine which file must be
+  handled by which driver (this is a feature in most situations). But,
+  for example, a VRT file might be disguised as a .tif, .png, or .jpg file.
+  So you cannot know which driver will handle a file by just looking at its
+  extension. Using ``gdalmanage identify the.file``
+  (or :cpp:func:`GDALIdentifyDriver`) can be a way to know the
+  driver without attempting a full open of the file, but, drivers not having a
+  specialized implementation of the Identify() method will fall back to the Open()
+  method.
+
+- Drivers depending on third-party libraries whose code has been embedded in GDAL.
+  Binary builds might rely on the internal version, or the external version.
+  If using the internal version, they might use an obsolete version of the
+  third-party library that might contain known vulnerabilities. Potentially
+  concerned drivers are GTiff (libtiff, libgeotiff), PNG (libpng), GIF (giflib),
+  JPEG (libjpeg), PCRaster (libcsf), GeoJSON (libjson-c), MRF (liblerc).
+  An internal version of ZLib is also contained in GDAL sources.
+  Packagers of GDAL are recommended to use the external version of the libraries
+  when possible, so that security upgrades of those dependencies benefit to GDAL.
+
+- Drivers using GDALOpen()/GDALOpenEx()/OGROpen() internally cause other drivers
+  to be used (and their possible flaws exploited), without it being obvious at
+  first sight. VRT, MBTiles, KMLSuperOverlay, RasterLite, PCIDSK, PDF, RPFTOC,
+  RS2, WMS, WCS, WFS, OAPIF, OGCAPI and GTI are examples of drivers with this
+  behavior.
+
+- Drivers depending on downloaded data (HTTP, WMS, WCS, WFS, OAPIF, OGCAPI,
+  STACIT, STACTA, etc.).
+
+- XML based drivers: they might be subject to denial of service by
+  `​billion laugh-like <https://en.wikipedia.org/wiki/Billion_laughs_attack>`__
+  attacks. Existing GDAL XML based drivers are thought to take defensive measures
+  against such patterns (starting with GDAL 3.9.3 for LVBAG and GMLAS drivers)
+
+- SQL injections: services that would accept untrusted SQL requests could trigger
+  SQL injection vulnerabilities in database-based drivers.
+
+
+​GDAL MEM driver
+++++++++++++++++
+
+The opening syntax ``MEM:::DATAPOINTER=<memory_address>,PIXELS=<number>,LINES=<number>``
+can access any memory of the process. Feeding it with a random access can cause
+a crash, or a read of unwanted virtual memory. The MEM driver is used by various algorithms
+and drivers in creation mode (which is not vulnerable to the DATAPOINTER issue),
+so completely disabling the driver might be detrimental to other areas of GDAL.
+It is possible to define the GDAL_NO_OPEN_FOR_MEM_DRIVER *compilation* flag to
+disable the ``MEM:::DATAPOINTER``` syntax only.
+
+​GDAL PDF driver
+++++++++++++++++
+
+The OGR_DATASOURCE creation option accepts a file name. So any OGR datasource,
+and potentially any file (see OGR VRT) could be read through this option, and
+its content embedded in the generated PDF.
+Similarly for the COMPOSITION_FILE creation option.
+
+​GDAL VRT driver
+++++++++++++++++
+
+It can be used to access any valid GDAL dataset. If a hostile party, with
+knowledge of the location on the filesystem of a valid GDAL dataset, convinces
+a user to run gdal_translate a VRT file and give it back the result,
+it might be able to steal data. That could potentially be able for a web service
+accepting data from the user, converting it, and sending back the result.
+
+The VRTRawRasterBand mechanism can read any file (not necessarily a
+valid GDAL dataset) accessible, which can extend the scope of the above
+mentioned issue.
+
+The VRTDerivedRasterBand mechanism can use Pixel functions written in Python,
+directly embedded in a VRT file, or pointing to external Python code. By
+default this mechanism is disabled, to avoid arbitrary code execution.
+Consult :ref:`raster_vrt_security_implications` for more details.
+
+/vsicurl/ (and associated network-capable virtual file systems) filenames can be
+used, thus causing remote data to be downloaded.
+
+​GDAL GTI driver
+++++++++++++++++
+
+Same issues as the GDAL VRT driver.
+
+​OGR VRT driver
++++++++++++++++
+
+Similar issues as the GDAL VRT driver. ``<SrcSQL>`` could be used to modify data.
diff --git a/doc/source/user/sql_sqlite_dialect.rst b/doc/source/user/sql_sqlite_dialect.rst
index 20b18076b250..0c2367495636 100644
--- a/doc/source/user/sql_sqlite_dialect.rst
+++ b/doc/source/user/sql_sqlite_dialect.rst
@@ -88,8 +88,9 @@ In SQLite, the LIKE operator is case insensitive, unless ``PRAGMA case_sensitive
 has been issued.
 
 Starting with GDAL 3.9, GDAL installs a custom LIKE comparison, such that UTF-8
-characters are taken into account by ``LIKE`` and ``ILIKE`` operators.
-For ILIKE case insensitive comparisons, this is restricted to the
+characters are taken into account by ``LIKE`` operator.
+
+For case insensitive comparisons, this is restricted to the
 `ASCII <https://en.wikipedia.org/wiki/Basic_Latin_(Unicode_block)>`__,
 `Latin-1 Supplement <https://en.wikipedia.org/wiki/Latin-1_Supplement_(Unicode_block)>`__,
 `Latin Extended-A <https://en.wikipedia.org/wiki/Latin_Extended-A>`__,
@@ -119,16 +120,14 @@ between double quotes, the internal double quotes must be escaped with \\
 Geometry field
 ++++++++++++++
 
-The ``GEOMETRY`` special field represents the geometry of the feature
-returned by OGRFeature::GetGeometryRef(). It can be explicitly specified
-in the result column list of a SELECT, and is automatically selected if the
-* wildcard is used.
+Geometry fields can be explicitly specified in the result column list of a SELECT,
+or automatically selected if the * wildcard is used.
 
 For OGR layers that have a non-empty geometry column name (generally for RDBMS datasources),
 as returned by OGRLayer::GetGeometryColumn(), the name of the geometry special field
-in the SQL statement will be the name of the geometry column of the underlying OGR layer.
+in the SQL statement must be the name of the geometry column of the underlying OGR layer.
 If the name of the geometry column in the source layer is empty, like with shapefiles etc.,
-the name to use in the SQL statement is always "geometry". Here we'll use it case-insensitively
+the name to use in the SQL statement must be "geometry". Here we'll use it case-insensitively
 (as all field names are in a SELECT statement):
 
 .. code-block::
@@ -168,14 +167,6 @@ so use the name ``rowid``.
 Starting with GDAL 3.8, if the layer has a named FID column
 (:cpp:func:`OGRLayer::GetFIDColumn` != ""), this name may also be used.
 
-The field wildcard expansions will not include the feature id, but it may be
-explicitly included using a syntax like:
-
-.. code-block::
-
-    SELECT ROWID, * FROM nation
-
-
 The field wildcard expansions will not include
 the feature id, but it may be explicitly included using a syntax like:
 
@@ -201,6 +192,25 @@ For example we can select the annotation features as:
 
     SELECT * FROM nation WHERE OGR_STYLE LIKE 'LABEL%'
 
+Statistics functions
+++++++++++++++++++++
+
+In addition to standard COUNT(), SUM(), AVG(), MIN(), MAX(), the following
+aggregate functions are available:
+
+- ``STDDEV_POP(numeric_value)``: (GDAL >= 3.10) numerical population standard deviation.
+- ``STDDEV_SAMP(numeric_value)``: (GDAL >= 3.10) numerical `sample standard deviation <https://en.wikipedia.org/wiki/Standard_deviation#Sample_standard_deviation>`__
+
+Ordered-set aggregate functions
++++++++++++++++++++++++++++++++
+
+The following aggregate functions are available. Note that they require to allocate an amount of memory proportional to the number of selected rows (for ``MEDIAN``, ``PERCENTILE`` and ``PERCENTILE_CONT``) or to the number of values (for ``MODE``).
+
+- ``MEDIAN(numeric_value)``: (GDAL >= 3.10) (continuous) median (equivalent to ``PERCENTILE(numeric_value, 50)``). NULL values are ignored.
+- ``PERCENTILE(numeric_value, percentage)``: (GDAL >= 3.10) (continuous) percentile, with percentage between 0 and 100 (equivalent to ``PERCENTILE_CONT(numeric_value, percentage / 100)``). NULL values are ignored.
+- ``PERCENTILE_CONT(numeric_value, fraction)``: (GDAL >= 3.10) (continuous) percentile, with fraction between 0 and 1. NULL values are ignored.
+- ``MODE(value)``: (GDAL >= 3.10): mode, i.e. most frequent input value (strings and numeric values are supported), arbitrarily choosing the first one if there are multiple equally-frequent results. NULL values are ignored.
+
 Spatialite SQL functions
 ++++++++++++++++++++++++
 
@@ -306,7 +316,7 @@ The ``gdal_get_pixel_value()`` function (added in GDAL 3.7) can be used to extra
 of a pixel in a GDAL dataset. It requires the configuration option OGR_SQLITE_ALLOW_EXTERNAL_ACCESS
 to be set to YES (for security reasons).
 
-It takes 5 arguments:
+It takes 5 or 6 arguments:
 
 * a string with the dataset name
 * a band number (numbering starting at 1)
@@ -315,11 +325,13 @@ It takes 5 arguments:
   pixel space
 * georeferenced X value or column number
 * georeferenced Y value or line number
+* resampling method among ``nearest`` (default), ``bilinear``, ``cubic``, ``cubicspline``. Optional, added in GDAL 3.10
 
 .. code-block::
 
     SELECT gdal_get_pixel_value('../gcore/data/byte.tif', 1, 'georef', 440720, 3751320)
     SELECT gdal_get_pixel_value('../gcore/data/byte.tif', 1, 'pixel', 0, 0)
+    SELECT gdal_get_pixel_value('../gcore/data/byte.tif', 1, 'pixel', 0.5, 0.5, 'bilinear')  -- GDAL >= 3.10
 
 
 OGR geocoding functions
diff --git a/doc/source/user/virtual_file_systems.rst b/doc/source/user/virtual_file_systems.rst
index b4aea9243f10..6f6a29698933 100644
--- a/doc/source/user/virtual_file_systems.rst
+++ b/doc/source/user/virtual_file_systems.rst
@@ -83,6 +83,7 @@ Examples:
     /vsizip/my.zip/my.tif  (relative path to the .zip)
     /vsizip//home/even/my.zip/subdir/my.tif  (absolute path to the .zip)
     /vsizip/c:\users\even\my.zip\subdir\my.tif
+    /vsizip/{/vsizip/my.zip/subdir/subzip.zip}/subdir_in_subzip/my.shp  (alternate syntax for a nested .zip)
 
 .kmz, .ods and .xlsx extensions are also detected as valid extensions for zip-compatible archives.
 
@@ -200,7 +201,7 @@ Examples:
     /vsitar//home/even/my.tar/subdir/my.tif # (absolute path to the .tar)
     /vsitar/c:\users\even\my.tar\subdir\my.tif
 
-Starting with GDAL 2.2, an alternate syntax is available so as to enable chaining and not being dependent on .tar extension, e.g.: :file:`/vsitar/{/path/to/the/archive}/path/inside/the/tar/file`. Note that :file:`/path/to/the/archive` may also itself use this alternate syntax.
+Starting with GDAL 2.2, an alternate syntax is available so as to enable chaining and not being dependent on .tar extension, e.g.: ``/vsitar/{/path/to/the/archive}/path/inside/the/tar/file``. Note that :file:`/path/to/the/archive` may also itself use this alternate syntax.
 
 .. _vsi7z:
 
@@ -227,7 +228,7 @@ Default extensions recognized by this virtual file system are:
 ``mpkx`` and ``ppkx`` (Esri ArcGIS Pro Project Package).
 
 An alternate syntax is available so as to enable chaining and not being
-dependent on those extensions, e.g.: :file:`/vsi7z/{/path/to/the/archive}/path/inside/the/archive`.
+dependent on those extensions, e.g.: ``/vsi7z/{/path/to/the/archive}/path/inside/the/archive``.
 Note that :file:`/path/to/the/archive` may also itself use this alternate syntax.
 
 Note that random seeking within a large compressed file will be inefficient when
@@ -257,7 +258,7 @@ is the relative path to the file inside the archive.`
 The default extension recognized by this virtual file system is: ``rar``
 
 An alternate syntax is available so as to enable chaining and not being
-dependent on those extensions, e.g.: :file:`/vsirar/{/path/to/the/archive}/path/inside/the/archive`.
+dependent on those extensions, e.g.: ``/vsirar/{/path/to/the/archive}/path/inside/the/archive``.
 Note that :file:`/path/to/the/archive` may also itself use this alternate syntax.
 
 Note that random seeking within a large compressed file will be inefficient when
@@ -412,6 +413,11 @@ As an alternative, starting with GDAL 3.6, the
 :config:`GDAL_HTTP_HEADERS` configuration option can also be
 used to specify headers. :config:`CPL_CURL_VERBOSE=YES` allows one to see them and more, when combined with ``--debug``.
 
+Starting with GDAL 3.10, the ``Authorization`` header is no longer automatically
+forwarded when redirections are followed.
+That behavior can be configured by setting the
+:config:`CPL_VSIL_CURL_AUTHORIZATION_HEADER_ALLOWED_IF_REDIRECT` configuration option.
+
 Starting with GDAL 2.3, the :config:`GDAL_HTTP_MAX_RETRY` (number of attempts) and :config:`GDAL_HTTP_RETRY_DELAY` (in seconds) configuration option can be set, so that request retries are done in case of HTTP errors 429, 502, 503 or 504.
 
 Starting with GDAL 3.6, the following configuration options control the TCP keep-alive functionality (cf https://daniel.haxx.se/blog/2020/02/10/curl-ootw-keepalive-time/ for a detailed explanation):
diff --git a/docker/README.md b/docker/README.md
index 2eb423b940de..390cea55b7f7 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -58,8 +58,8 @@ Ubuntu version:
 * Vector drivers: all built-in + XML based ones + SQLite-based ones + network-based ones + PostgreSQL
 * Using internal libtiff and libgeotiff
 * External libraries enabled: libsqlite3, libproj, libcurl, libjpeg, libpng, libwebp,
-  libzstd, libexpat, libxerces-c, libpq, libssl, libgeos, libspatialite
-* GDAL Python (Python 3.8 for Ubuntu 20.04, Python 3.10 for Ubuntu 22.04)
+  libzstd, libdeflate, libexpat, libxerces-c, libpq, libssl, libgeos, libspatialite
+* GDAL Python (Python 3.8 for Ubuntu 20.04, Python 3.10 for Ubuntu 22.04, Python 3.12 for Ubuntu 24.04)
 * Base PROJ grid package (http://download.osgeo.org/proj/proj-datumgrid-1.8.zip)
 * Overall licensing terms of the GDAL build: LGPL + permissive (MIT, BSD style, Apache, etc..)
 
@@ -74,7 +74,7 @@ See [ubuntu-small/Dockerfile](ubuntu-small/Dockerfile)
 * External libraries enabled: small + libnetcdf, libhdf4, libhdf5, libtiledb, libkea,
   mongocxx 3.4, libspatialite, unixodbc, libxml2, libcfitsio, libmysqlclient,
   libkml, libpoppler, pdfium, openexr, libheif, libdeflate, libparquet, libjxl
-* GDAL Python (Python 3.8 for Ubuntu 20.04, Python 3.10 for Ubuntu 22.04)
+* GDAL Python (Python 3.8 for Ubuntu 20.04, Python 3.10 for Ubuntu 22.04, Python 3.12 for Ubuntu 24.04)
 * *All* PROJ grid packages (equivalent of latest of proj-data-X.zip from http://download.osgeo.org/proj/ at time of generation, > 500 MB)
 * Overall licensing terms of the GDAL build: copy-left (GPL) + LGPL + permissive
 
@@ -100,11 +100,11 @@ If you are getting a ``<jemalloc>: arena 0 background thread creation failed (1)
 
 # Images of releases
 
-Tagged images of recent past releases are available. The last ones (at time of writing) are for GDAL 3.9.0 and PROJ 9.4.0, for linux/amd64 and linux/arm64:
-* ghcr.io/osgeo/gdal:alpine-small-3.9.0
-* ghcr.io/osgeo/gdal:alpine-normal-3.9.0
-* ghcr.io/osgeo/gdal:ubuntu-small-3.9.0
-* ghcr.io/osgeo/gdal:ubuntu-full-3.9.0
+Tagged images of recent past releases are available. The last ones (at time of writing) are for GDAL 3.9.3 and PROJ 9.5.0, for linux/amd64 and linux/arm64:
+* ghcr.io/osgeo/gdal:alpine-small-3.9.3
+* ghcr.io/osgeo/gdal:alpine-normal-3.9.3
+* ghcr.io/osgeo/gdal:ubuntu-small-3.9.3
+* ghcr.io/osgeo/gdal:ubuntu-full-3.9.3
 
 ## Multi-arch Images
 
diff --git a/docker/alpine-normal/Dockerfile b/docker/alpine-normal/Dockerfile
index 781a0d392c29..b68d001eef16 100644
--- a/docker/alpine-normal/Dockerfile
+++ b/docker/alpine-normal/Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 ##
 # osgeo/gdal:alpine-normal
 
@@ -6,11 +8,13 @@
 # or licensed under MIT (LICENSE.TXT) Copyright 2019 Even Rouault <even.rouault@spatialys.com>
 
 ARG ALPINE_VERSION=3.20
-FROM alpine:${ALPINE_VERSION} as builder
+FROM alpine:${ALPINE_VERSION} AS builder
 
 # Derived from osgeo/proj by Howard Butler <howard@hobu.co>
 LABEL maintainer="Even Rouault <even.rouault@spatialys.com>"
 
+ENV HOME="/root"
+
 # Setup build env for PROJ
 RUN apk add --no-cache  wget curl unzip cmake make libtool autoconf automake pkgconfig gcc g++ sqlite sqlite-dev tiff-dev
 
@@ -44,6 +48,7 @@ RUN apk add --no-cache \
     lerc-dev \
     libaec-dev \
     libarchive-dev \
+    libavif-dev \
     libdeflate-dev \
     libgeotiff-dev \
     libheif-dev \
@@ -61,6 +66,7 @@ RUN apk add --no-cache \
     make \
     mariadb-connector-c-dev \
     netcdf-dev \
+    ninja-build \
     odbc-cpp-wrapper-dev \
     ogdi-dev \
     openexr-dev \
@@ -76,6 +82,7 @@ RUN apk add --no-cache \
     py3-setuptools \
     python3-dev \
     qhull-dev \
+    rsync \
     sfcgal-dev \
     snappy-dev \
     sqlite-dev \
@@ -89,6 +96,9 @@ RUN apk add --no-cache \
     zstd-dev \
     && mkdir -p /build_thirdparty/usr/lib
 
+# Ninja is not in the default path on Alpine.
+ENV PATH=/usr/lib/ninja-build/bin:$PATH
+
 RUN if test "$(uname -m)" = "x86_64"; then ( \
     apk add --no-cache librasterlite2-dev \
     ); fi
@@ -98,7 +108,7 @@ ARG HDF4_VERSION=4.2.16
 RUN if test "${HDF4_VERSION}" != "" -a "$(uname -m)" = "x86_64"; then ( \
     apk add --no-cache byacc flex portablexdr-dev \
     && mkdir hdf4 \
-    && wget -q https://support.hdfgroup.org/ftp/HDF/releases/HDF${HDF4_VERSION}/src/hdf-${HDF4_VERSION}.tar.gz -O - \
+    && curl -L -fsS https://support.hdfgroup.org/ftp/HDF/releases/HDF${HDF4_VERSION}/src/hdf-${HDF4_VERSION}.tar.gz \
         | tar xz -C hdf4 --strip-components=2 \
     && cd hdf4 \
     && LDFLAGS=-lportablexdr ./configure --prefix=/usr --enable-shared --disable-static \
@@ -113,41 +123,64 @@ RUN if test "${HDF4_VERSION}" != "" -a "$(uname -m)" = "x86_64"; then ( \
     && apk del byacc flex portablexdr-dev \
     ); fi
 
-RUN apk add --no-cache rsync ccache
+# Build libOpenDRIVE
+ARG OPENDRIVE_VERSION=0.6.0-gdal
+RUN if test "${OPENDRIVE_VERSION}" != ""; then ( \
+    curl -LO -fsS https://github.com/DLR-TS/libOpenDRIVE/archive/refs/tags/${OPENDRIVE_VERSION}.tar.gz \
+    && tar xzf ${OPENDRIVE_VERSION}.tar.gz \
+    && rm -f ${OPENDRIVE_VERSION}.tar.gz \
+    && cd libOpenDRIVE-${OPENDRIVE_VERSION} \
+    && cmake . -G Ninja -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr/ \
+    && ninja \
+    && ninja install \
+    && mkdir -p /build_thirdparty/usr/lib \
+    && cp -P /usr/lib/libOpenDrive*.so* /build_thirdparty/usr/lib \
+    && for i in /build_thirdparty/usr/lib/*; do strip -s $i 2>/dev/null || /bin/true; done \
+    && cd .. \
+    && rm -rf libOpenDRIVE-${OPENDRIVE_VERSION} \
+    ); fi
+
 ARG RSYNC_REMOTE
+ARG WITH_CCACHE
 
 # Build PROJ
 ARG PROJ_VERSION=master
-RUN mkdir proj \
-    && wget -q https://github.com/OSGeo/PROJ/archive/${PROJ_VERSION}.tar.gz -O - \
+RUN --mount=type=cache,id=alpine-normal-proj,target=$HOME/.cache \
+    mkdir proj \
+    && curl -L -fsS https://github.com/OSGeo/PROJ/archive/${PROJ_VERSION}.tar.gz \
         | tar xz -C proj --strip-components=1 \
     && cd proj \
     && if test "${RSYNC_REMOTE}" != ""; then \
         echo "Downloading cache..."; \
-        rsync -ra ${RSYNC_REMOTE}/proj/$(uname -m)/ $HOME/; \
+        rsync -ra ${RSYNC_REMOTE}/proj/$(uname -m)/ $HOME/.cache/; \
         echo "Finished"; \
+    fi \
+    && if [ -n "${WITH_CCACHE:-}" ]; then \
         export CC="ccache gcc"; \
         export CXX="ccache g++"; \
-        mkdir -p "$HOME/.ccache"; \
-        export PROJ_DB_CACHE_DIR="$HOME/.ccache"; \
+        export PROJ_DB_CACHE_PARAM="-DPROJ_DB_CACHE_DIR=$HOME/.cache"; \
         ccache -M 100M; \
     fi \
     # IPO disabled since it crashes with gcc 13.2.1
     && cmake . \
+        -G Ninja \
         -DBUILD_SHARED_LIBS=ON \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DENABLE_IPO=OFF \
         -DBUILD_TESTING=OFF \
-    && make -j$(nproc) \
-    && make install \
-    && make install DESTDIR="/build_proj" \
+        $PROJ_DB_CACHE_PARAM \
+    && ninja \
+    && ninja install \
+    && DESTDIR="/build_proj" ninja install \
     && if test "${RSYNC_REMOTE}" != ""; then \
-        ccache -s; \
         echo "Uploading cache..."; \
-        rsync -ra --delete $HOME/.ccache ${RSYNC_REMOTE}/proj/$(uname -m)/; \
+        rsync -ra --delete $HOME/.cache/ ${RSYNC_REMOTE}/proj/$(uname -m)/; \
         echo "Finished"; \
-        rm -rf $HOME/.ccache; \
+    fi \
+    && if [ -n "${WITH_CCACHE:-}" ]; then \
+        ccache -s; \
         unset CC; \
         unset CXX; \
     fi \
@@ -158,30 +191,33 @@ RUN mkdir proj \
 
 # Build spatialite
 ARG SPATIALITE_VERSION=5.1.0
-RUN if test "${SPATIALITE_VERSION}" != "" -a "$(uname -m)" = "x86_64"; then ( \
-    wget -q https://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${SPATIALITE_VERSION}.tar.gz \
+RUN --mount=type=cache,id=alpine-normal-spatialite,target=$HOME/.cache \
+    if test "${SPATIALITE_VERSION}" != "" -a "$(uname -m)" = "x86_64"; then ( \
+    curl -LO -fsS https://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${SPATIALITE_VERSION}.tar.gz \
     && tar xzf libspatialite-${SPATIALITE_VERSION}.tar.gz \
     && rm -f libspatialite-${SPATIALITE_VERSION}.tar.gz \
     && cd libspatialite-${SPATIALITE_VERSION} \
     && apk add --no-cache minizip-dev \
     && if test "${RSYNC_REMOTE}" != ""; then \
         echo "Downloading cache..."; \
-        rsync -ra ${RSYNC_REMOTE}/spatialite/ $HOME/; \
+        rsync -ra ${RSYNC_REMOTE}/spatialite/ $HOME/.cache/; \
         echo "Finished"; \
+    fi \
+    && if [ -n "${WITH_CCACHE:-}" ]; then \
         export CC="ccache gcc"; \
         export CXX="ccache g++"; \
-        mkdir -p "$HOME/.ccache"; \
         ccache -M 100M; \
     fi \
     && ./configure --prefix=/usr --disable-static --disable-rttopo \
     && make -j$(nproc) \
     && make install \
     && if test "${RSYNC_REMOTE}" != ""; then \
-        ccache -s; \
         echo "Uploading cache..."; \
-        rsync -ra --delete $HOME/.ccache ${RSYNC_REMOTE}/spatialite/; \
+        rsync -ra --delete $HOME/.cache/ ${RSYNC_REMOTE}/spatialite/; \
         echo "Finished"; \
-        rm -rf $HOME/.ccache; \
+    fi \
+    && if [ -n "${WITH_CCACHE:-}" ]; then \
+        ccache -s; \
         unset CC; \
         unset CXX; \
     fi \
@@ -200,7 +236,8 @@ ARG GDAL_RELEASE_DATE
 ARG GDAL_BUILD_IS_RELEASE
 ARG GDAL_REPOSITORY=OSGeo/gdal
 
-RUN if test "${GDAL_VERSION}" = "master"; then \
+RUN --mount=type=cache,id=alpine-normal-gdal,target=$HOME/.cache \
+    if test "${GDAL_VERSION}" = "master"; then \
         export GDAL_VERSION=$(curl -Ls https://api.github.com/repos/${GDAL_REPOSITORY}/commits/HEAD -H "Accept: application/vnd.github.VERSION.sha"); \
         export GDAL_RELEASE_DATE=$(date "+%Y%m%d"); \
     fi \
@@ -212,13 +249,15 @@ RUN if test "${GDAL_VERSION}" = "master"; then \
         && export LDFLAGS="-lportablexdr ${LDFLAGS}"; \
     fi \
     && mkdir gdal \
-    && wget -q https://github.com/${GDAL_REPOSITORY}/archive/${GDAL_VERSION}.tar.gz -O - \
+    && curl -L -fsS https://github.com/${GDAL_REPOSITORY}/archive/${GDAL_VERSION}.tar.gz \
         | tar xz -C gdal --strip-components=1 \
     && cd gdal \
     && if test "${RSYNC_REMOTE}" != ""; then \
         echo "Downloading cache..."; \
-        rsync -ra ${RSYNC_REMOTE}/gdal/$(uname -m)/ $HOME/; \
+        rsync -ra ${RSYNC_REMOTE}/gdal/$(uname -m)/ $HOME/.cache/; \
         echo "Finished"; \
+    fi \
+    && if [ -n "${WITH_CCACHE:-}" ]; then \
         # Little trick to avoid issues with Python bindings
         printf "#!/bin/sh\nccache gcc \$*" > ccache_gcc.sh; \
         chmod +x ccache_gcc.sh; \
@@ -226,12 +265,12 @@ RUN if test "${GDAL_VERSION}" = "master"; then \
         chmod +x ccache_g++.sh; \
         export CC=$PWD/ccache_gcc.sh; \
         export CXX=$PWD/ccache_g++.sh; \
-        mkdir -p "$HOME/.ccache"; \
         ccache -M 1G; \
     fi \
     && mkdir build \
     && cd build \
     && cmake .. \
+        -G Ninja \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_BUILD_TYPE=Release \
         -DGDAL_USE_TIFF_INTERNAL=ON \
@@ -239,16 +278,19 @@ RUN if test "${GDAL_VERSION}" = "master"; then \
         -DIconv_INCLUDE_DIR=/usr/include/gnu-libiconv \
         -DIconv_LIBRARY=/usr/lib/libiconv.so \
         -DBUILD_TESTING=OFF \
-    && make -j$(nproc) \
-    && make install DESTDIR="/build" \
-    && (make -j$(nproc) multireadtest && cp apps/multireadtest /build/usr/bin) \
+        -DOpenDrive_DIR=/usr/lib/ \
+        -DOGR_ENABLE_DRIVER_XODR_PLUGIN=TRUE \
+    && ninja \
+    && DESTDIR="/build" ninja install \
+    && (ninja multireadtest && cp apps/multireadtest /build/usr/bin) \
     && cd .. \
     && if test "${RSYNC_REMOTE}" != ""; then \
-        ccache -s; \
         echo "Uploading cache..."; \
-        rsync -ra --delete $HOME/.ccache ${RSYNC_REMOTE}/gdal/$(uname -m)/; \
+        rsync -ra --delete $HOME/.cache/ ${RSYNC_REMOTE}/gdal/$(uname -m)/; \
         echo "Finished"; \
-        rm -rf $HOME/.ccache; \
+    fi \
+    && if [ -n "${WITH_CCACHE:-}" ]; then \
+        ccache -s; \
         unset CC; \
         unset CXX; \
     fi \
@@ -275,7 +317,7 @@ RUN if test "${GDAL_VERSION}" = "master"; then \
        ;do rm $i; done)
 
 # Build final image
-FROM alpine:${ALPINE_VERSION} as runner
+FROM alpine:${ALPINE_VERSION} AS runner
 
 RUN date
 
@@ -301,6 +343,7 @@ RUN apk add --no-cache \
         libarchive \
         libarrow \
         libarrow_dataset \
+        libavif \
         libcrypto3 \
         libcurl \
         libdeflate \
diff --git a/docker/alpine-small/Dockerfile b/docker/alpine-small/Dockerfile
index e4fc732b8d77..1a19574efb44 100644
--- a/docker/alpine-small/Dockerfile
+++ b/docker/alpine-small/Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 ##
 # osgeo/gdal:alpine-small
 
@@ -6,93 +8,103 @@
 # or licensed under MIT (LICENSE.TXT) Copyright 2019 Even Rouault <even.rouault@spatialys.com>
 
 ARG ALPINE_VERSION=3.20
-FROM alpine:${ALPINE_VERSION} as builder
+FROM alpine:${ALPINE_VERSION} AS builder
 
 # Derived from osgeo/proj by Howard Butler <howard@hobu.co>
 LABEL maintainer="Even Rouault <even.rouault@spatialys.com>"
 
+ENV HOME="/root"
+
 # Setup build env for PROJ
 RUN apk add --no-cache wget curl unzip make libtool autoconf automake pkgconfig g++ sqlite sqlite-dev
 
 # For PROJ and GDAL
 RUN apk add --no-cache \
+    ccache \
+    cmake ninja-build \
     linux-headers \
     curl-dev tiff-dev \
     zlib-dev zstd-dev lz4-dev libdeflate-dev libarchive-dev \
-    libjpeg-turbo-dev libpng-dev libwebp-dev expat-dev postgresql-dev openjpeg-dev
+    libjpeg-turbo-dev libpng-dev libwebp-dev expat-dev \
+    postgresql-dev \
+    rsync \
+    openjpeg-dev
+
+# Ninja is not in the default path on Alpine.
+ENV PATH=/usr/lib/ninja-build/bin:$PATH
 
 # Build openjpeg
 #ARG OPENJPEG_VERSION=2.3.1
 RUN if test "${OPENJPEG_VERSION}" != ""; then ( \
-    apk add --no-cache cmake \
-    && wget -q https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz \
+    curl -LO -fsS https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz \
     && tar xzf v${OPENJPEG_VERSION}.tar.gz \
     && rm -f v${OPENJPEG_VERSION}.tar.gz \
     && cd openjpeg-${OPENJPEG_VERSION} \
-    && cmake . -DBUILD_SHARED_LIBS=ON  -DBUILD_STATIC_LIBS=OFF -DCMAKE_BUILD_TYPE=Release \
+    && cmake . -G Ninja -DBUILD_SHARED_LIBS=ON  -DBUILD_STATIC_LIBS=OFF -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr \
-    && make -j$(nproc) \
-    && make install \
+    && ninja \
+    && ninja install \
     && mkdir -p /build_thirdparty/usr/lib \
     && cp -P /usr/lib/libopenjp2*.so* /build_thirdparty/usr/lib \
     && for i in /build_thirdparty/usr/lib/*; do strip -s $i 2>/dev/null || /bin/true; done \
     && cd .. \
     && rm -rf openjpeg-${OPENJPEG_VERSION} \
-    && apk del cmake \
     ); fi
 
-RUN apk add --no-cache rsync ccache
-
 ARG PROJ_DATUMGRID_LATEST_LAST_MODIFIED
 RUN \
     mkdir -p /build_projgrids/usr/share/proj \
-    && curl -LOs http://download.osgeo.org/proj/proj-datumgrid-latest.zip \
+    && curl -LO -fsS http://download.osgeo.org/proj/proj-datumgrid-latest.zip \
     && unzip -q -j -u -o proj-datumgrid-latest.zip  -d /build_projgrids/usr/share/proj \
     && rm -f *.zip
 
 ARG RSYNC_REMOTE
+ARG WITH_CCACHE
 
 # Build PROJ
 ARG PROJ_VERSION=master
-RUN mkdir proj \
-    && apk add --no-cache cmake \
-    && wget -q https://github.com/OSGeo/PROJ/archive/${PROJ_VERSION}.tar.gz -O - \
+RUN --mount=type=cache,id=alpine-small-proj,target=$HOME/.cache \
+    mkdir proj \
+    && curl -L -fsS https://github.com/OSGeo/PROJ/archive/${PROJ_VERSION}.tar.gz \
         | tar xz -C proj --strip-components=1 \
     && cd proj \
     && if test "${RSYNC_REMOTE}" != ""; then \
         echo "Downloading cache..."; \
-        rsync -ra ${RSYNC_REMOTE}/proj/$(uname -m)/ $HOME/; \
+        rsync -ra ${RSYNC_REMOTE}/proj/$(uname -m)/ $HOME/.cache/; \
         echo "Finished"; \
+    fi \
+    && if [ -n "${WITH_CCACHE:-}" ]; then \
         export CC="ccache gcc"; \
         export CXX="ccache g++"; \
-        mkdir -p "$HOME/.ccache"; \
-        export PROJ_DB_CACHE_DIR="$HOME/.ccache"; \
+        export PROJ_DB_CACHE_PARAM="-DPROJ_DB_CACHE_DIR=$HOME/.cache"; \
         ccache -M 100M; \
     fi \
     # IPO disabled since it crashes with gcc 13.2.1
     && cmake . \
+        -G Ninja \
         -DBUILD_SHARED_LIBS=ON \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DENABLE_IPO=OFF \
         -DBUILD_TESTING=OFF \
-    && make -j$(nproc) \
-    && make install \
-    && make install DESTDIR="/build_proj" \
+        $PROJ_DB_CACHE_PARAM \
+    && ninja \
+    && ninja install \
+    && DESTDIR="/build_proj" ninja install \
     && if test "${RSYNC_REMOTE}" != ""; then \
-        ccache -s; \
         echo "Uploading cache..."; \
-        rsync -ra --delete $HOME/.ccache ${RSYNC_REMOTE}/proj/$(uname -m)/; \
+        rsync -ra --delete $HOME/.cache/ ${RSYNC_REMOTE}/proj/$(uname -m)/; \
         echo "Finished"; \
-        rm -rf $HOME/.ccache; \
+    fi \
+    && if [ -n "${WITH_CCACHE:-}" ]; then \
+        ccache -s; \
         unset CC; \
         unset CXX; \
     fi \
     && cd .. \
     && rm -rf proj \
     && for i in /build_proj/usr/lib/*; do strip -s $i 2>/dev/null || /bin/true; done \
-    && for i in /build_proj/usr/bin/*; do strip -s $i 2>/dev/null || /bin/true; done \
-    && apk del cmake
+    && for i in /build_proj/usr/bin/*; do strip -s $i 2>/dev/null || /bin/true; done
 
 # Build GDAL
 ARG GDAL_VERSION=master
@@ -100,44 +112,47 @@ ARG GDAL_RELEASE_DATE
 ARG GDAL_BUILD_IS_RELEASE
 ARG GDAL_REPOSITORY=OSGeo/gdal
 
-RUN if test "${GDAL_VERSION}" = "master"; then \
+RUN --mount=type=cache,id=alpine-small-gdal,target=$HOME/.cache \
+    if test "${GDAL_VERSION}" = "master"; then \
         export GDAL_VERSION=$(curl -Ls https://api.github.com/repos/${GDAL_REPOSITORY}/commits/HEAD -H "Accept: application/vnd.github.VERSION.sha"); \
         export GDAL_RELEASE_DATE=$(date "+%Y%m%d"); \
     fi \
-    && apk add --no-cache cmake \
     && if test "x${GDAL_BUILD_IS_RELEASE}" = "x"; then \
         export GDAL_SHA1SUM=${GDAL_VERSION}; \
     fi \
     && if test "${RSYNC_REMOTE}" != ""; then \
         echo "Downloading cache..."; \
-        rsync -ra ${RSYNC_REMOTE}/gdal/$(uname -m)/ $HOME/; \
+        rsync -ra ${RSYNC_REMOTE}/gdal/$(uname -m)/ $HOME/.cache/; \
         echo "Finished"; \
+    fi \
+    && if [ -n "${WITH_CCACHE:-}" ]; then \
         export CC="ccache gcc"; \
         export CXX="ccache g++"; \
-        mkdir -p "$HOME/.ccache"; \
         ccache -M 1G; \
     fi \
     && mkdir gdal \
-    && wget -q https://github.com/${GDAL_REPOSITORY}/archive/${GDAL_VERSION}.tar.gz -O - \
+    && curl -L -fsS https://github.com/${GDAL_REPOSITORY}/archive/${GDAL_VERSION}.tar.gz \
         | tar xz -C gdal --strip-components=1 \
     && cd gdal \
     && mkdir build \
     && cd build \
     && cmake .. \
+        -G Ninja \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_BUILD_TYPE=Release \
         -DGDAL_USE_TIFF_INTERNAL=ON \
         -DGDAL_USE_GEOTIFF_INTERNAL=ON \
         -DBUILD_TESTING=OFF \
-    && make -j$(nproc) \
-    && make install DESTDIR="/build" \
+    && ninja \
+    && DESTDIR="/build" ninja install \
     && cd .. \
     && if test "${RSYNC_REMOTE}" != ""; then \
-        ccache -s; \
         echo "Uploading cache..."; \
-        rsync -ra --delete $HOME/.ccache ${RSYNC_REMOTE}/gdal/$(uname -m)/; \
+        rsync -ra --delete $HOME/.cache/ ${RSYNC_REMOTE}/gdal/$(uname -m)/; \
         echo "Finished"; \
-        rm -rf $HOME/.ccache; \
+    fi \
+    && if [ -n "${WITH_CCACHE:-}" ]; then \
+        ccache -s; \
         unset CC; \
         unset CXX; \
     fi \
@@ -148,11 +163,10 @@ RUN if test "${GDAL_VERSION}" = "master"; then \
     && mv /build/usr/include/gdal_version.h /build_gdal_version_changing/usr/include \
     && mv /build/usr/bin                    /build_gdal_version_changing/usr \
     && for i in /build_gdal_version_changing/usr/lib/*; do strip -s $i 2>/dev/null || /bin/true; done \
-    && for i in /build_gdal_version_changing/usr/bin/*; do strip -s $i 2>/dev/null || /bin/true; done \
-    && apk del cmake
+    && for i in /build_gdal_version_changing/usr/bin/*; do strip -s $i 2>/dev/null || /bin/true; done
 
 # Build final image
-FROM alpine:${ALPINE_VERSION} as runner
+FROM alpine:${ALPINE_VERSION} AS runner
 
 RUN date
 
diff --git a/docker/ubuntu-full/Dockerfile b/docker/ubuntu-full/Dockerfile
index afe807ac8115..a79a377d36ba 100644
--- a/docker/ubuntu-full/Dockerfile
+++ b/docker/ubuntu-full/Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 ##
 # osgeo/gdal:ubuntu-full
 
@@ -8,19 +10,25 @@
 ARG BASE_IMAGE=ubuntu:24.04
 ARG TARGET_BASE_IMAGE=ubuntu:24.04
 
-FROM $BASE_IMAGE as builder
+FROM $BASE_IMAGE AS builder
 
 # Derived from osgeo/proj by Howard Butler <howard@hobu.co>
 LABEL maintainer="Even Rouault <even.rouault@spatialys.com>"
 
+ENV HOME="/root"
+
 ARG TARGET_ARCH=
 RUN echo ${TARGET_ARCH}
 COPY ./bh-set-envvars.sh /buildscripts/bh-set-envvars.sh
 
-RUN . /buildscripts/bh-set-envvars.sh \
+RUN rm -f /etc/apt/apt.conf.d/docker-clean \
+    && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \
+    && echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80-retries
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+    --mount=type=cache,target=/var/lib/apt,sharing=locked \
+    . /buildscripts/bh-set-envvars.sh \
     && if test "${TARGET_ARCH}" != ""; then \
-    rm -f /etc/apt/sources.list \
-    rm -f /etc/apt/sources.list.d/ubuntu.sources \
+    rm -f /etc/apt/sources.list /etc/apt/sources.list.d/ubuntu.sources \
     && echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ noble main restricted universe" >> /etc/apt/sources.list \
     && echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ noble-updates main restricted universe" >> /etc/apt/sources.list \
     && echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ noble-backports main restricted universe" >> /etc/apt/sources.list \
@@ -32,25 +40,28 @@ RUN . /buildscripts/bh-set-envvars.sh \
     && apt-get update -y \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y g++-13-${GCC_ARCH}-linux-gnu \
     && ln -s ${GCC_ARCH}-linux-gnu-gcc-13 /usr/bin/${GCC_ARCH}-linux-gnu-gcc \
-    && ln -s ${GCC_ARCH}-linux-gnu-g++-13 /usr/bin/${GCC_ARCH}-linux-gnu-g++ \
-    && rm -rf /var/lib/apt/lists/*; \
+    && ln -s ${GCC_ARCH}-linux-gnu-g++-13 /usr/bin/${GCC_ARCH}-linux-gnu-g++; \
     fi
 
-
 # Setup build env for PROJ
 USER root
-RUN . /buildscripts/bh-set-envvars.sh \
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+    --mount=type=cache,target=/var/lib/apt,sharing=locked \
+    . /buildscripts/bh-set-envvars.sh \
     && apt-get update -y \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --fix-missing --no-install-recommends \
-            build-essential ca-certificates \
-            git make cmake wget unzip libtool automake \
+            build-essential ca-certificates ccache\
+            git make ninja-build cmake wget unzip libtool automake \
             zlib1g-dev${APT_ARCH_SUFFIX} libsqlite3-dev${APT_ARCH_SUFFIX} pkg-config sqlite3 libcurl4-openssl-dev${APT_ARCH_SUFFIX} \
             libtiff-dev${APT_ARCH_SUFFIX} \
-    && rm -rf /var/lib/apt/lists/*
+            patchelf \
+            rsync
 
 ARG JAVA_VERSION=17
 # Setup build env for GDAL
-RUN . /buildscripts/bh-set-envvars.sh \
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+    --mount=type=cache,target=/var/lib/apt,sharing=locked \
+    . /buildscripts/bh-set-envvars.sh \
     && apt-get update -y \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --fix-missing --no-install-recommends \
        libopenjp2-7-dev${APT_ARCH_SUFFIX} libcairo2-dev${APT_ARCH_SUFFIX} \
@@ -70,21 +81,41 @@ RUN . /buildscripts/bh-set-envvars.sh \
        libbrotli-dev${APT_ARCH_SUFFIX} \
        libarchive-dev${APT_ARCH_SUFFIX} \
        libaec-dev${APT_ARCH_SUFFIX} \
-    && rm -rf /var/lib/apt/lists/*
+       libavif-dev${APT_ARCH_SUFFIX}
+
+ARG RSYNC_REMOTE
+ARG WITH_CCACHE
 
-# Build likbkea
+# Build libkea
 ARG KEA_VERSION=1.5.2
-RUN . /buildscripts/bh-set-envvars.sh \
+RUN --mount=type=cache,id=ubuntu-full-kealib,target=$HOME/.cache \
+    . /buildscripts/bh-set-envvars.sh \
     && wget -q https://github.com/ubarsc/kealib/archive/kealib-${KEA_VERSION}.zip \
     && unzip -q kealib-${KEA_VERSION}.zip \
     && rm -f kealib-${KEA_VERSION}.zip \
+    && if [ -n "${RSYNC_REMOTE:-}" ]; then \
+        echo "Downloading cache..."; \
+        rsync -ra "${RSYNC_REMOTE}/kealib/${GCC_ARCH}/" "$HOME/.cache/"; \
+        echo "Finished"; \
+    fi \
+    && if [ -n "${WITH_CCACHE:-}" ]; then \
+        ccache -M 100M; \
+    fi \
     && cd kealib-kealib-${KEA_VERSION} \
-    && cmake . -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release \
+    && cmake . -G Ninja $CCACHE_PARAM -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr -DHDF5_INCLUDE_DIR=/usr/include/hdf5/serial \
         -DHDF5_LIB_PATH=/usr/lib/${GCC_ARCH}-linux-gnu/hdf5/serial -DLIBKEA_WITH_GDAL=OFF \
-    && make -j$(nproc) \
-    && make install DESTDIR="/build_thirdparty" \
-    && make install \
+    && ninja \
+    && DESTDIR="/build_thirdparty" ninja install \
+    && ninja install \
+    && if [ -n "${RSYNC_REMOTE:-}" ]; then \
+        echo "Uploading cache..."; \
+        rsync -ra --delete "$HOME/.cache/" "${RSYNC_REMOTE}/kealib/${GCC_ARCH}/"; \
+        echo "Finished"; \
+    fi \
+    && if [ -n "${WITH_CCACHE:-}" ]; then \
+        ccache -s; \
+    fi \
     && cd .. \
     && rm -rf kealib-kealib-${KEA_VERSION} \
     && for i in /build_thirdparty/usr/lib/*; do strip -s $i 2>/dev/null || /bin/true; done \
@@ -92,17 +123,34 @@ RUN . /buildscripts/bh-set-envvars.sh \
 
 # Build mongo-c-driver
 ARG MONGO_C_DRIVER_VERSION=1.24.4
-RUN . /buildscripts/bh-set-envvars.sh \
+RUN --mount=type=cache,id=ubuntu-full-mongo-c-driver,target=$HOME/.cache \
+    . /buildscripts/bh-set-envvars.sh \
     && mkdir mongo-c-driver \
     && wget -q https://github.com/mongodb/mongo-c-driver/releases/download/${MONGO_C_DRIVER_VERSION}/mongo-c-driver-${MONGO_C_DRIVER_VERSION}.tar.gz -O - \
         | tar xz -C mongo-c-driver --strip-components=1 \
+    && if [ -n "${RSYNC_REMOTE:-}" ]; then \
+        echo "Downloading cache..."; \
+        rsync -ra "${RSYNC_REMOTE}/mongo-c-driver/${GCC_ARCH}/" "$HOME/.cache/"; \
+        echo "Finished"; \
+    fi \
+    && if [ -n "${WITH_CCACHE:-}" ]; then \
+        ccache -M 100M; \
+    fi \
     && cd mongo-c-driver \
     && mkdir build_cmake \
     && cd build_cmake \
-    && cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_TESTS=NO -DCMAKE_BUILD_TYPE=Release \
-    && make -j$(nproc) \
-    && make install DESTDIR="/build_thirdparty" \
-    && make install \
+    && cmake .. -G Ninja $CCACHE_PARAM -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_TESTS=NO -DCMAKE_BUILD_TYPE=Release \
+    && ninja \
+    && DESTDIR="/build_thirdparty" ninja install \
+    && ninja install \
+    && if [ -n "${RSYNC_REMOTE:-}" ]; then \
+        echo "Uploading cache..."; \
+        rsync -ra --delete "$HOME/.cache/" "${RSYNC_REMOTE}/mongo-c-driver/${GCC_ARCH}/"; \
+        echo "Finished"; \
+    fi \
+    && if [ -n "${WITH_CCACHE:-}" ]; then \
+        ccache -s; \
+    fi \
     && cd ../.. \
     && rm -rf mongo-c-driver \
     && rm /build_thirdparty/usr/lib/${GCC_ARCH}-linux-gnu/*.a \
@@ -111,17 +159,34 @@ RUN . /buildscripts/bh-set-envvars.sh \
 
 # Build mongocxx
 ARG MONGOCXX_VERSION=3.8.1
-RUN . /buildscripts/bh-set-envvars.sh \
+RUN --mount=type=cache,id=ubuntu-full-mongo-cxx-driver,target=$HOME/.cache \
+    . /buildscripts/bh-set-envvars.sh \
     && mkdir mongocxx \
     && wget -q https://github.com/mongodb/mongo-cxx-driver/archive/r${MONGOCXX_VERSION}.tar.gz -O - \
         | tar xz -C mongocxx --strip-components=1 \
+    && if [ -n "${RSYNC_REMOTE:-}" ]; then \
+        echo "Downloading cache..."; \
+        rsync -ra "${RSYNC_REMOTE}/mongo-cxx-driver/${GCC_ARCH}/" "$HOME/.cache/"; \
+        echo "Finished"; \
+    fi \
+    && if [ -n "${WITH_CCACHE:-}" ]; then \
+        ccache -M 100M; \
+    fi \
     && cd mongocxx \
     && mkdir build_cmake \
     && cd build_cmake \
-    && cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DBSONCXX_POLY_USE_BOOST=ON -DENABLE_TESTS=OFF -DMONGOCXX_ENABLE_SLOW_TESTS=NO -DCMAKE_BUILD_TYPE=Release -DBUILD_VERSION=${MONGOCXX_VERSION} \
-    && make -j$(nproc) \
-    && make install DESTDIR="/build_thirdparty" \
-    && make install \
+    && cmake .. -G Ninja $CCACHE_PARAM -DCMAKE_INSTALL_PREFIX=/usr -DBSONCXX_POLY_USE_BOOST=ON -DENABLE_TESTS=OFF -DMONGOCXX_ENABLE_SLOW_TESTS=NO -DCMAKE_BUILD_TYPE=Release -DBUILD_VERSION=${MONGOCXX_VERSION} \
+    && ninja \
+    && DESTDIR="/build_thirdparty" ninja install \
+    && ninja install \
+    && if [ -n "${RSYNC_REMOTE:-}" ]; then \
+        echo "Uploading cache..."; \
+        rsync -ra --delete "$HOME/.cache/" "${RSYNC_REMOTE}/mongo-cxx-driver/${GCC_ARCH}/"; \
+        echo "Finished"; \
+    fi \
+    && if [ -n "${WITH_CCACHE:-}" ]; then \
+        ccache -s; \
+    fi \
     && cd ../.. \
     && rm -rf mongocxx \
     && for i in /build_thirdparty/usr/lib/${GCC_ARCH}-linux-gnu/*; do strip -s $i 2>/dev/null || /bin/true; done \
@@ -129,48 +194,88 @@ RUN . /buildscripts/bh-set-envvars.sh \
 
 # Build tiledb
 ARG TILEDB_VERSION=2.23.0
-COPY ./tiledb-FindLZ4_EP.cmake.patch /buildscripts/tiledb-FindLZ4_EP.cmake.patch
-COPY ./tiledb-FindOpenSSL_EP.cmake.patch /buildscripts/tiledb-FindOpenSSL_EP.cmake.patch
-RUN . /buildscripts/bh-set-envvars.sh \
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+    --mount=type=cache,target=/var/lib/apt,sharing=locked \
+    . /buildscripts/bh-set-envvars.sh \
     && apt-get update -y \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-        libspdlog-dev${APT_ARCH_SUFFIX} libmagic-dev${APT_ARCH_SUFFIX} \
+        libspdlog-dev${APT_ARCH_SUFFIX} libmagic-dev${APT_ARCH_SUFFIX}
+
+COPY ./tiledb-FindLZ4_EP.cmake.patch /buildscripts/tiledb-FindLZ4_EP.cmake.patch
+COPY ./tiledb-FindOpenSSL_EP.cmake.patch /buildscripts/tiledb-FindOpenSSL_EP.cmake.patch
+# Commit from TileDB 2.27.
+COPY ./tiledb-cmake-ccache.patch /buildscripts/tiledb-cmake-ccache.patch
+RUN --mount=type=cache,id=ubuntu-full-tiledb,target=$HOME/.cache \
+    . /buildscripts/bh-set-envvars.sh \
+    && if [ -n "${RSYNC_REMOTE:-}" ]; then \
+        echo "Downloading cache..."; \
+        rsync -ra "${RSYNC_REMOTE}/tiledb/${GCC_ARCH}/" "$HOME/.cache/"; \
+        echo "Finished"; \
+    fi \
+    && if [ -n "${WITH_CCACHE:-}" ]; then \
+        export CCACHE_PARAM="-DTILEDB_CCACHE=ON"; \
+        ccache -M 100M; \
+    fi \
     && mkdir tiledb \
     && wget -q https://github.com/TileDB-Inc/TileDB/archive/${TILEDB_VERSION}.tar.gz -O - \
         | tar xz -C tiledb --strip-components=1 \
     && cd tiledb \
     && patch -p0 < /buildscripts/tiledb-FindLZ4_EP.cmake.patch \
     && patch -p0 < /buildscripts/tiledb-FindOpenSSL_EP.cmake.patch \
+    && patch -p1 < /buildscripts/tiledb-cmake-ccache.patch \
     && mkdir build_cmake \
     && cd build_cmake \
-    && cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DTILEDB_WERROR=OFF -DTILEDB_SUPERBUILD=OFF  -DTILEDB_TESTS=OFF -DCOMPILER_SUPPORTS_AVX2=FALSE  -DOPENSSL_INCLUDE_DIR=/usr/include -DOPENSSL_CRYPTO_LIBRARY=/usr/lib/${GCC_ARCH}-linux-gnu/libcrypto.so -DOPENSSL_SSL_LIBRARY=/usr/lib/${GCC_ARCH}-linux-gnu/libssl.so \
-    && make -j$(nproc) \
-    && make -j$(nproc) install DESTDIR="/build_thirdparty" \
-    && make -j$(nproc) install \
+    && cmake .. -G Ninja $CCACHE_PARAM -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DTILEDB_WERROR=OFF -DTILEDB_SUPERBUILD=OFF  -DTILEDB_TESTS=OFF -DCOMPILER_SUPPORTS_AVX2=FALSE  -DOPENSSL_INCLUDE_DIR=/usr/include -DOPENSSL_CRYPTO_LIBRARY=/usr/lib/${GCC_ARCH}-linux-gnu/libcrypto.so -DOPENSSL_SSL_LIBRARY=/usr/lib/${GCC_ARCH}-linux-gnu/libssl.so \
+    && ninja \
+    && DESTDIR="/build_thirdparty" ninja install \
+    && ninja install \
+    && if [ -n "${RSYNC_REMOTE:-}" ]; then \
+        echo "Uploading cache..."; \
+        rsync -ra --delete "$HOME/.cache/" "${RSYNC_REMOTE}/tiledb/${GCC_ARCH}/"; \
+        echo "Finished"; \
+    fi \
+    && if [ -n "${WITH_CCACHE:-}" ]; then \
+        ccache -s; \
+    fi \
     && cd ../.. \
     && rm -rf tiledb \
     && for i in /build_thirdparty/usr/lib/${GCC_ARCH}-linux-gnu/*; do strip -s $i 2>/dev/null || /bin/true; done \
     && for i in /build_thirdparty/usr/bin/*; do strip -s $i 2>/dev/null || /bin/true; done
 
-# Build openjpeg
-ARG OPENJPEG_VERSION=
-RUN . /buildscripts/bh-set-envvars.sh \
-    && if test "${OPENJPEG_VERSION}" != ""; then ( \
-    wget -q https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz \
-    && tar xzf v${OPENJPEG_VERSION}.tar.gz \
-    && rm -f v${OPENJPEG_VERSION}.tar.gz \
-    && cd openjpeg-${OPENJPEG_VERSION} \
-    && cmake . -DBUILD_SHARED_LIBS=ON  -DBUILD_STATIC_LIBS=OFF -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-    && make -j$(nproc) \
-    && make install \
-    && mkdir -p /build_thirdparty/usr/lib/${GCC_ARCH}-linux-gnu \
-    && rm -f /usr/lib/${GCC_ARCH}-linux-gnu/libopenjp2.so* \
-    && mv /usr/lib/libopenjp2.so* /usr/lib/${GCC_ARCH}-linux-gnu \
-    && cp -P /usr/lib/${GCC_ARCH}-linux-gnu/libopenjp2.so* /build_thirdparty/usr/lib/${GCC_ARCH}-linux-gnu \
-    && for i in /build_thirdparty/usr/lib/${GCC_ARCH}-linux-gnu/*; do strip -s $i 2>/dev/null || /bin/true; done \
+# Build libOpenDRIVE
+ARG OPENDRIVE_VERSION=0.6.0-gdal
+RUN --mount=type=cache,id=ubuntu-full-libopendrive,target=$HOME/.cache \
+    . /buildscripts/bh-set-envvars.sh \
+    && if test "${OPENDRIVE_VERSION}" != ""; then ( \
+    wget -q https://github.com/DLR-TS/libOpenDRIVE/archive/refs/tags/${OPENDRIVE_VERSION}.tar.gz \
+    && tar xzf ${OPENDRIVE_VERSION}.tar.gz \
+    && rm -f ${OPENDRIVE_VERSION}.tar.gz \
+    && if [ -n "${RSYNC_REMOTE:-}" ]; then \
+        echo "Downloading cache..."; \
+        rsync -ra "${RSYNC_REMOTE}/libopendrive/${GCC_ARCH}/" "$HOME/.cache/"; \
+        echo "Finished"; \
+    fi \
+    && if [ -n "${WITH_CCACHE:-}" ]; then \
+        ccache -M 100M; \
+    fi \
+    && cd libOpenDRIVE-${OPENDRIVE_VERSION} \
+    && cmake . -G Ninja $CCACHE_PARAM -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr/ \
+    && ninja \
+    && ninja install \
+    && if [ -n "${RSYNC_REMOTE:-}" ]; then \
+        echo "Uploading cache..."; \
+        rsync -ra --delete "$HOME/.cache/" "${RSYNC_REMOTE}/libopendrive/${GCC_ARCH}/"; \
+        echo "Finished"; \
+    fi \
+    && if [ -n "${WITH_CCACHE:-}" ]; then \
+        ccache -s; \
+    fi \
+    && mkdir -p /build_thirdparty/usr/lib \
+    && cp -P /usr/lib/libOpenDrive*.so* /build_thirdparty/usr/lib \
+    && for i in /build_thirdparty/usr/lib/*; do strip -s $i 2>/dev/null || /bin/true; done \
     && cd .. \
-    && rm -rf openjpeg-${OPENJPEG_VERSION} \
+    && rm -rf libOpenDRIVE-${OPENDRIVE_VERSION} \
     ); fi
 
 #Build File Geodatabase
@@ -189,57 +294,96 @@ RUN . /buildscripts/bh-set-envvars.sh \
   ) ; fi
 
 # Build libqb3
-RUN . /buildscripts/bh-set-envvars.sh \
+RUN --mount=type=cache,id=ubuntu-full-libqb3,target=$HOME/.cache \
+    . /buildscripts/bh-set-envvars.sh \
     && git clone https://github.com/lucianpls/QB3.git \
+    && if [ -n "${RSYNC_REMOTE:-}" ]; then \
+        echo "Downloading cache..."; \
+        rsync -ra "${RSYNC_REMOTE}/libqb3/${GCC_ARCH}/" "$HOME/.cache/"; \
+        echo "Finished"; \
+    fi \
+    && if [ -n "${WITH_CCACHE:-}" ]; then \
+        ccache -M 100M; \
+    fi \
     && cd QB3/QB3lib \
     && mkdir build \
     && cd build \
-    && cmake .. ${CMAKE_EXTRA_ARGS} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \
-    && make -j$(nproc) \
-    && make -j$(nproc) install \
-    && make install DESTDIR="/build_thirdparty" \
+    && cmake .. -G Ninja $CCACHE_PARAM ${CMAKE_EXTRA_ARGS} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \
+    && ninja \
+    && ninja install \
+    && DESTDIR="/build_thirdparty" ninja install \
+    && if [ -n "${RSYNC_REMOTE:-}" ]; then \
+        echo "Uploading cache..."; \
+        rsync -ra --delete "$HOME/.cache/" "${RSYNC_REMOTE}/libqb3/${GCC_ARCH}/"; \
+        echo "Finished"; \
+    fi \
+    && if [ -n "${WITH_CCACHE:-}" ]; then \
+        ccache -s; \
+    fi \
     && cd ../../.. \
     && rm -rf QB3
 
 ARG WITH_PDFIUM=yes
-RUN if echo "$WITH_PDFIUM" | grep -Eiq "^(y(es)?|1|true)$"  ; then ( \
-  wget -q https://github.com/rouault/pdfium_build_gdal_3_9/releases/download/pdfium_6309_v1/install-ubuntu2004-rev6309.tar.gz \
-  && tar -xzf install-ubuntu2004-rev6309.tar.gz \
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+    --mount=type=cache,target=/var/lib/apt,sharing=locked \
+  if echo "$WITH_PDFIUM" | grep -Eiq "^(y(es)?|1|true)$"  ; then ( \
+  wget -q https://github.com/rouault/pdfium_build_gdal_3_10/releases/download/pdfium_6677_v1/install-ubuntu2004-rev6677.tar.gz \
+  && tar -xzf install-ubuntu2004-rev6677.tar.gz \
   && chown -R root:root install \
   && mv install/lib/* /usr/lib/ \
   && mv install/include/* /usr/include/ \
-  && rm -rf install-ubuntu2004-rev6309.tar.gz install \
+  && rm -rf install-ubuntu2004-rev6677.tar.gz install \
   && apt-get update -y \
   && apt-get install -y --fix-missing --no-install-recommends liblcms2-dev${APT_ARCH_SUFFIX} \
-  && rm -rf /var/lib/apt/lists/* \
   ) ; fi
 
 # Build libjxl
-RUN . /buildscripts/bh-set-envvars.sh \
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+    --mount=type=cache,target=/var/lib/apt,sharing=locked \
+    . /buildscripts/bh-set-envvars.sh \
     && apt-get update -y \
-    && apt-get install -y --fix-missing --no-install-recommends libgflags-dev${APT_ARCH_SUFFIX} \
+    && apt-get install -y --fix-missing --no-install-recommends libgflags-dev${APT_ARCH_SUFFIX}
+RUN --mount=type=cache,id=ubuntu-full-libjxl,target=$HOME/.cache \
+    . /buildscripts/bh-set-envvars.sh \
     && git clone https://github.com/libjxl/libjxl.git --recursive \
+    && if [ -n "${RSYNC_REMOTE:-}" ]; then \
+        echo "Downloading cache..."; \
+        rsync -ra "${RSYNC_REMOTE}/libjxl/${GCC_ARCH}/" "$HOME/.cache/"; \
+        echo "Finished"; \
+    fi \
+    && if [ -n "${WITH_CCACHE:-}" ]; then \
+        ccache -M 100M; \
+    fi \
     && cd libjxl \
     && mkdir build \
     && cd build \
-    && cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF -DBUILD_TESTING=OFF -DJPEGXL_ENABLE_TOOLS=OFF -DJPEGXL_ENABLE_BENCHMARK=OFF .. \
-    && make -j$(nproc) \
-    && make -j$(nproc) install \
-    && make install DESTDIR="/build_thirdparty" \
+    && cmake -G Ninja $CCACHE_PARAM -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF -DBUILD_TESTING=OFF -DJPEGXL_ENABLE_TOOLS=OFF -DJPEGXL_ENABLE_BENCHMARK=OFF .. \
+    && ninja \
+    && ninja install \
+    && DESTDIR="/build_thirdparty" ninja install \
+    && if [ -n "${RSYNC_REMOTE:-}" ]; then \
+        echo "Uploading cache..."; \
+        rsync -ra --delete "$HOME/.cache/" "${RSYNC_REMOTE}/libjxl/${GCC_ARCH}/"; \
+        echo "Finished"; \
+    fi \
+    && if [ -n "${WITH_CCACHE:-}" ]; then \
+        ccache -s; \
+    fi \
     && rm -f /lib/${GCC_ARCH}-linux-gnu/libjxl*.a \
     && rm -f /build_thirdparty/lib/${GCC_ARCH}-linux-gnu/libjxl*.a \
     && cd ../.. \
-    && rm -rf libjxl \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf libjxl
 
 # Install Arrow C++
 ARG ARROW_VERSION=16.1.0-1
 # ARROW_SOVERSION to be updated in the "Build final image" section too
 ARG ARROW_SOVERSION=1600
-RUN . /buildscripts/bh-set-envvars.sh \
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+    --mount=type=cache,target=/var/lib/apt,sharing=locked \
+    . /buildscripts/bh-set-envvars.sh \
     && apt-get update -y \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y -V ca-certificates lsb-release wget \
-    && wget https://apache.jfrog.io/artifactory/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb \
+    && curl -LO -fsS https://apache.jfrog.io/artifactory/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y -V ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb \
     && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y -V libarrow${ARROW_SOVERSION}${APT_ARCH_SUFFIX} \
@@ -249,14 +393,8 @@ RUN . /buildscripts/bh-set-envvars.sh \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y -V libparquet-dev${APT_ARCH_SUFFIX}=${ARROW_VERSION} \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y -V libarrow-acero-dev${APT_ARCH_SUFFIX}=${ARROW_VERSION} \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y -V libarrow-dataset-dev${APT_ARCH_SUFFIX}=${ARROW_VERSION} \
-    && rm -rf /var/lib/apt/lists/* \
     && rm apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb
 
-RUN apt-get update -y \
-    && apt-get install -y --fix-missing --no-install-recommends rsync ccache \
-    && rm -rf /var/lib/apt/lists/*
-ARG RSYNC_REMOTE
-
 ARG WITH_DEBUG_SYMBOLS=no
 
 # Refresh grids
@@ -269,47 +407,50 @@ COPY ./bh-proj.sh /buildscripts/bh-proj.sh
 # We want 2 separate steps for incremental builds where grids are refreshed
 # only when the content of cdn.proj.org has changed, independently if PROJ master
 # itself has changed.
-RUN . /buildscripts/bh-set-envvars.sh \
+RUN --mount=type=cache,id=ubuntu-full-proj,target=$HOME/.cache \
+    . /buildscripts/bh-set-envvars.sh \
     && DESTDIR=/build_tmp_proj /buildscripts/bh-proj.sh \
      && LD_LIBRARY_PATH=/build_tmp_proj/usr/local/lib /build_tmp_proj/usr/local/bin/projsync --target-dir /tmp/proj_grids --all \
      && rm -rf /build_tmp_proj
 
 # Build PROJ
 ARG PROJ_VERSION=master
-RUN . /buildscripts/bh-set-envvars.sh \
+RUN --mount=type=cache,id=ubuntu-full-proj,target=$HOME/.cache \
+    . /buildscripts/bh-set-envvars.sh \
     && /buildscripts/bh-proj.sh
 
+# Build GDAL
 ARG GDAL_VERSION=master
 ARG GDAL_RELEASE_DATE
 ARG GDAL_BUILD_IS_RELEASE
 ARG GDAL_REPOSITORY=OSGeo/gdal
 
-# Build GDAL
-
 COPY ./bh-gdal.sh /buildscripts/bh-gdal.sh
-RUN . /buildscripts/bh-set-envvars.sh \
+RUN --mount=type=cache,id=ubuntu-full-gdal,target=$HOME/.cache \
+    . /buildscripts/bh-set-envvars.sh \
     && /buildscripts/bh-gdal.sh
 
 # Build final image
-FROM $TARGET_BASE_IMAGE as runner
+FROM $TARGET_BASE_IMAGE AS runner
 
 USER root
 RUN date
 ARG JAVA_VERSION=17
 ARG ARROW_SOVERSION=1600
 
-# Update distro
-RUN apt-get update -y && apt-get upgrade -y \
-    && rm -rf /var/lib/apt/lists/*
-
 ARG TARGET_ARCH=
-RUN apt-get update \
-# PROJ dependencies
-    && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+# Update distro
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+    --mount=type=cache,target=/var/lib/apt,sharing=locked \
+    export DEBIAN_FRONTEND=noninteractive \
+    && apt-get update -y \
+    && apt-get upgrade -y \
+    # PROJ dependencies
+    && apt-get install -y \
         libsqlite3-0 libtiff6 libcurl4 \
         wget curl unzip ca-certificates \
-# GDAL dependencies
-    && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+    # GDAL dependencies
+    && apt-get install -y \
         libopenjp2-7 libcairo2 python3-numpy \
         libpng16-16 libjpeg-turbo8 libgif7 liblzma5 libgeos3.12.1 libgeos-c1v5 \
         libxml2 libexpat1 \
@@ -324,23 +465,23 @@ RUN apt-get update \
         libbrotli1 \
         libarchive13 \
         libaec0 \
+        libavif16 \
         libspdlog1.12 libmagic1t64 \
         python-is-python3 \
         # pil for antialias option of gdal2tiles
         python3-pil \
     # Install JRE with --no-install-recommends, otherwise it draws default-jre, which draws systemd, which fails to install when running the arm64v8/ubuntu:24.04 image on a 64bit host
-    && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends openjdk-"$JAVA_VERSION"-jre \
+    && apt-get install -y --no-install-recommends openjdk-"$JAVA_VERSION"-jre \
     # Worksround OGDI packaging bug for Ubuntu 24.04
     && ln -s /usr/lib/$(uname -p)-linux-gnu/ogdi/4.1/libvrf.so /usr/lib/$(uname -p)-linux-gnu \
     # Install Arrow C++
-    && DEBIAN_FRONTEND=noninteractive apt-get install -y -V ca-certificates lsb-release wget \
-    && wget https://apache.jfrog.io/artifactory/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -y -V ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb \
+    && apt-get install -y -V ca-certificates lsb-release wget \
+    && curl -LO -fsS https://apache.jfrog.io/artifactory/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb \
+    && apt-get install -y -V ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb \
     && apt-get update \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -y -V libarrow${ARROW_SOVERSION} \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -y -V libparquet${ARROW_SOVERSION} \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -y -V libarrow-dataset${ARROW_SOVERSION} \
-    && rm -rf /var/lib/apt/lists/*
+    && apt-get install -y -V libarrow${ARROW_SOVERSION} \
+    && apt-get install -y -V libparquet${ARROW_SOVERSION} \
+    && apt-get install -y -V libarrow-dataset${ARROW_SOVERSION}
 
 # Attempt to order layers starting with less frequently varying ones
 
diff --git a/docker/ubuntu-full/bh-gdal.sh b/docker/ubuntu-full/bh-gdal.sh
index 0c5493445441..3c66862a6c73 100755
--- a/docker/ubuntu-full/bh-gdal.sh
+++ b/docker/ubuntu-full/bh-gdal.sh
@@ -23,9 +23,10 @@ wget -q "https://github.com/${GDAL_REPOSITORY}/archive/${GDAL_VERSION}.tar.gz" \
 
     if test "${RSYNC_REMOTE:-}" != ""; then
         echo "Downloading cache..."
-        rsync -ra "${RSYNC_REMOTE}/gdal/${GCC_ARCH}/" "$HOME/"
+        rsync -ra "${RSYNC_REMOTE}/gdal/${GCC_ARCH}/" "$HOME/.cache/"
         echo "Finished"
-
+    fi
+    if [ -n "${WITH_CCACHE:-}" ]; then
         # Little trick to avoid issues with Python bindings
         printf "#!/bin/sh\nccache %s-linux-gnu-gcc \$*" "${GCC_ARCH}" > ccache_gcc.sh
         chmod +x ccache_gcc.sh
@@ -64,6 +65,7 @@ wget -q "https://github.com/${GDAL_REPOSITORY}/archive/${GDAL_VERSION}.tar.gz" \
     fi
     echo "${GDAL_CMAKE_EXTRA_OPTS}"
     cmake .. \
+        -G Ninja \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DGDAL_FIND_PACKAGE_PROJ_MODE=MODULE \
         -DBUILD_TESTING=OFF \
@@ -72,21 +74,22 @@ wget -q "https://github.com/${GDAL_REPOSITORY}/archive/${GDAL_VERSION}.tar.gz" \
         -DGDAL_ENABLE_PLUGINS=ON \
         -DGDAL_USE_TIFF_INTERNAL=ON \
         -DBUILD_PYTHON_BINDINGS=ON \
-        -DGDAL_USE_GEOTIFF_INTERNAL=ON ${GDAL_CMAKE_EXTRA_OPTS}
+        -DGDAL_USE_GEOTIFF_INTERNAL=ON ${GDAL_CMAKE_EXTRA_OPTS} \
+        -DOpenDrive_DIR=/usr/lib/ \
+        -DOGR_ENABLE_DRIVER_XODR_PLUGIN=TRUE \
 
-    make "-j$(nproc)"
-    make install DESTDIR="/build"
+    ninja
+    DESTDIR="/build" ninja install
 
     cd ..
 
     if [ -n "${RSYNC_REMOTE:-}" ]; then
-        ccache -s
-
         echo "Uploading cache..."
-        rsync -ra --delete "$HOME/.cache" "${RSYNC_REMOTE}/gdal/${GCC_ARCH}/"
+        rsync -ra --delete "$HOME/.cache/" "${RSYNC_REMOTE}/gdal/${GCC_ARCH}/"
         echo "Finished"
-
-        rm -rf "$HOME/.cache"
+    fi
+    if [ -n "${WITH_CCACHE:-}" ]; then
+        ccache -s
         unset CC
         unset CXX
     fi
diff --git a/docker/ubuntu-full/bh-proj.sh b/docker/ubuntu-full/bh-proj.sh
index ea82edf6cddc..42ca2ea1c919 100755
--- a/docker/ubuntu-full/bh-proj.sh
+++ b/docker/ubuntu-full/bh-proj.sh
@@ -18,15 +18,17 @@ wget -q "https://github.com/OSGeo/PROJ/archive/${PROJ_VERSION}.tar.gz" \
 
 (
     cd proj
+    export PROJ_DB_CACHE_PARAM=""
 
     if [ -n "${RSYNC_REMOTE:-}" ]; then
         echo "Downloading cache..."
-        rsync -ra "${RSYNC_REMOTE}/proj/${GCC_ARCH}/" "$HOME/"
+        rsync -ra "${RSYNC_REMOTE}/proj/${GCC_ARCH}/" "$HOME/.cache/"
         echo "Finished"
-
+    fi
+    if [ -n "${WITH_CCACHE:-}" ]; then
         export CC="ccache ${GCC_ARCH}-linux-gnu-gcc"
         export CXX="ccache ${GCC_ARCH}-linux-gnu-g++"
-        export PROJ_DB_CACHE_DIR="$HOME/.cache"
+        export PROJ_DB_CACHE_PARAM="-DPROJ_DB_CACHE_DIR=$HOME/.cache"
 
         ccache -M 100M
     fi
@@ -35,21 +37,22 @@ wget -q "https://github.com/OSGeo/PROJ/archive/${PROJ_VERSION}.tar.gz" \
     export CXXFLAGS="-DPROJ_RENAME_SYMBOLS -DPROJ_INTERNAL_CPP_NAMESPACE -O2 -g"
 
     cmake . \
+        -G Ninja \
         -DBUILD_SHARED_LIBS=ON \
         -DCMAKE_INSTALL_PREFIX=${PROJ_INSTALL_PREFIX:-/usr/local} \
-        -DBUILD_TESTING=OFF
+        -DBUILD_TESTING=OFF \
+        $PROJ_DB_CACHE_PARAM
 
-    make "-j$(nproc)"
-    make install DESTDIR="${DESTDIR}"
+    ninja
+    DESTDIR="${DESTDIR}" ninja install
 
     if [ -n "${RSYNC_REMOTE:-}" ]; then
-        ccache -s
-
         echo "Uploading cache..."
-        rsync -ra --delete "$HOME/.cache" "${RSYNC_REMOTE}/proj/${GCC_ARCH}/"
+        rsync -ra --delete "$HOME/.cache/" "${RSYNC_REMOTE}/proj/${GCC_ARCH}/"
         echo "Finished"
-
-        rm -rf "$HOME/.cache"
+    fi
+    if [ -n "${WITH_CCACHE:-}" ]; then
+        ccache -s
         unset CC
         unset CXX
     fi
@@ -97,8 +100,6 @@ else
     done;
 fi
 
-apt-get update -y
-DEBIAN_FRONTEND=noninteractive apt-get install -y patchelf
 patchelf --set-soname libinternalproj.so.${PROJ_SO_FIRST} ${DESTDIR}${PROJ_INSTALL_PREFIX}/lib/libinternalproj.so.${PROJ_SO}
 for i in "${DESTDIR}${PROJ_INSTALL_PREFIX}/bin"/*; do
   patchelf --replace-needed libproj.so.${PROJ_SO_FIRST} libinternalproj.so.${PROJ_SO_FIRST} $i;
diff --git a/docker/ubuntu-full/bh-set-envvars.sh b/docker/ubuntu-full/bh-set-envvars.sh
index e64393454f26..d8633df9511f 100644
--- a/docker/ubuntu-full/bh-set-envvars.sh
+++ b/docker/ubuntu-full/bh-set-envvars.sh
@@ -20,3 +20,10 @@ else
   export GCC_ARCH
   export CMAKE_EXTRA_ARGS=""
 fi
+
+if [ -n "${WITH_CCACHE:-}" ]; then
+    CCACHE_PARAM="-DCMAKE_C_COMPILER_LAUNCHER=ccache"
+    export CCACHE_PARAM="$CCACHE_PARAM -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
+else
+    export CCACHE_PARAM=""
+fi
diff --git a/docker/ubuntu-full/tiledb-cmake-ccache.patch b/docker/ubuntu-full/tiledb-cmake-ccache.patch
new file mode 100644
index 000000000000..76e888e27569
--- /dev/null
+++ b/docker/ubuntu-full/tiledb-cmake-ccache.patch
@@ -0,0 +1,50 @@
+commit 16c3aa25b9e9401b91cd70f2118c7a86f12140b4
+Author: Theodore Tsirpanis <teo@tsirpanis.gr>
+Date:   Thu Oct 10 12:43:05 2024 +0300
+
+    Re-enable `TILEDB_CCACHE` support.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fef5de5ce..d84fb3d6b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -105,6 +105,12 @@ else()
+   set(CMAKE_CXX_EXTENSIONS OFF)
+ endif()
+ 
++if (TILEDB_CCACHE)
++  include(FindCcache)
++  set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE})
++  set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE})
++endif()
++
+ # Set -fvisibility=hidden (or equivalent) flags by default.
+ set(CMAKE_C_VISIBILITY_PRESET hidden)
+ set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+diff --git a/cmake/Modules/FindCcache.cmake b/cmake/Modules/FindCcache.cmake
+index 06be83ea3..c981e9dcf 100644
+--- a/cmake/Modules/FindCcache.cmake
++++ b/cmake/Modules/FindCcache.cmake
+@@ -1,16 +1,9 @@
+ ## cf https://stackoverflow.com/questions/1815688/how-to-use-ccache-with-cmake
+ ## leading to https://invent.kde.org/kde/konsole/merge_requests/26/diffs
+-find_program(CCACHE_FOUND NAMES "sccache" "ccache")
+-set(CCACHE_SUPPORT ON CACHE BOOL "Enable ccache support")
+-if (CCACHE_FOUND AND CCACHE_SUPPORT)
+-  if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" # GNU is GNU GCC
+-      OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+-    # without this compiler messages in `make` backend would be uncolored
+-    set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -fdiagnostics-color=auto")
+-  endif()
+-  set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE_FOUND})
+-  set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE_FOUND})
+-  message(STATUS "Found ccache: ${CCACHE_FOUND}")
+-else()
+-  message(FATAL_ERROR "Unable to find ccache")
++find_program(CCACHE REQUIRED NAMES "sccache" "ccache")
++
++if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" # GNU is GNU GCC
++    OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
++  # without this compiler messages in `make` backend would be uncolored
++  set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -fdiagnostics-color=auto")
+ endif()
diff --git a/docker/ubuntu-small/Dockerfile b/docker/ubuntu-small/Dockerfile
index 9f859eb7866c..524f52b35488 100644
--- a/docker/ubuntu-small/Dockerfile
+++ b/docker/ubuntu-small/Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 ##
 # osgeo/gdal:ubuntu-small
 
@@ -9,19 +11,25 @@ ARG PROJ_INSTALL_PREFIX=/usr/local
 ARG BASE_IMAGE=ubuntu:24.04
 ARG TARGET_BASE_IMAGE=ubuntu:24.04
 
-FROM $BASE_IMAGE as builder
+FROM $BASE_IMAGE AS builder
 
 # Derived from osgeo/proj by Howard Butler <howard@hobu.co>
 LABEL maintainer="Even Rouault <even.rouault@spatialys.com>"
 
+ENV HOME="/root"
+
 ARG TARGET_ARCH=
 RUN echo ${TARGET_ARCH}
 COPY ./bh-set-envvars.sh /buildscripts/bh-set-envvars.sh
 
-RUN . /buildscripts/bh-set-envvars.sh \
+RUN rm -f /etc/apt/apt.conf.d/docker-clean \
+    && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \
+    && echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80-retries
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+    --mount=type=cache,target=/var/lib/apt,sharing=locked \
+    . /buildscripts/bh-set-envvars.sh \
     && if test "${TARGET_ARCH}" != ""; then \
-    rm -f /etc/apt/sources.list \
-    rm -f /etc/apt/sources.list.d/ubuntu.sources \
+    rm -f /etc/apt/sources.list /etc/apt/sources.list.d/ubuntu.sources \
     && echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ noble main restricted universe" >> /etc/apt/sources.list \
     && echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ noble-updates main restricted universe" >> /etc/apt/sources.list \
     && echo "deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ noble-backports main restricted universe" >> /etc/apt/sources.list \
@@ -33,97 +41,87 @@ RUN . /buildscripts/bh-set-envvars.sh \
     && apt-get update -y \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y g++-13-${GCC_ARCH}-linux-gnu \
     && ln -s ${GCC_ARCH}-linux-gnu-gcc-13 /usr/bin/${GCC_ARCH}-linux-gnu-gcc \
-    && ln -s ${GCC_ARCH}-linux-gnu-g++-13 /usr/bin/${GCC_ARCH}-linux-gnu-g++ \
-    && rm -rf /var/lib/apt/lists/*; \
+    && ln -s ${GCC_ARCH}-linux-gnu-g++-13 /usr/bin/${GCC_ARCH}-linux-gnu-g++; \
     fi
 
 # Setup build env for PROJ
 USER root
-RUN . /buildscripts/bh-set-envvars.sh \
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+    --mount=type=cache,target=/var/lib/apt,sharing=locked \
+    . /buildscripts/bh-set-envvars.sh \
     && apt-get update -y \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --fix-missing --no-install-recommends \
-            build-essential ca-certificates \
-            git make cmake wget unzip libtool automake \
-            zlib1g-dev${APT_ARCH_SUFFIX} libsqlite3-dev${APT_ARCH_SUFFIX} pkg-config sqlite3 libcurl4-gnutls-dev${APT_ARCH_SUFFIX} \
-            libtiff5-dev${APT_ARCH_SUFFIX} \
-    && rm -rf /var/lib/apt/lists/*
+            build-essential ca-certificates ccache \
+            git make ninja-build cmake wget unzip libtool automake \
+            zlib1g-dev${APT_ARCH_SUFFIX} libsqlite3-dev${APT_ARCH_SUFFIX} pkg-config sqlite3 libcurl4-openssl-dev${APT_ARCH_SUFFIX} \
+            libtiff-dev${APT_ARCH_SUFFIX} \
+            patchelf \
+            rsync
 
 # Setup build env for GDAL
-RUN . /buildscripts/bh-set-envvars.sh \
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+    --mount=type=cache,target=/var/lib/apt,sharing=locked \
+    . /buildscripts/bh-set-envvars.sh \
     && apt-get update -y \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --fix-missing --no-install-recommends \
        python3-dev${APT_ARCH_SUFFIX} python3-numpy${APT_ARCH_SUFFIX} python3-setuptools${APT_ARCH_SUFFIX} \
        libjpeg-dev${APT_ARCH_SUFFIX} libgeos-dev${APT_ARCH_SUFFIX} \
        libexpat-dev${APT_ARCH_SUFFIX} libxerces-c-dev${APT_ARCH_SUFFIX} \
        libwebp-dev${APT_ARCH_SUFFIX} libpng-dev${APT_ARCH_SUFFIX} \
+       libdeflate-dev${APT_ARCH_SUFFIX} \
        libzstd-dev${APT_ARCH_SUFFIX} bash zip curl \
        libpq-dev${APT_ARCH_SUFFIX} libssl-dev${APT_ARCH_SUFFIX} libopenjp2-7-dev${APT_ARCH_SUFFIX} \
        libspatialite-dev${APT_ARCH_SUFFIX} \
-       autoconf automake sqlite3 bash-completion swig \
-    && rm -rf /var/lib/apt/lists/*
-
-# Build openjpeg
-ARG OPENJPEG_VERSION=
-RUN . /buildscripts/bh-set-envvars.sh \
-    && if test "${OPENJPEG_VERSION}" != ""; then ( \
-    wget -q https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz \
-    && tar xzf v${OPENJPEG_VERSION}.tar.gz \
-    && rm -f v${OPENJPEG_VERSION}.tar.gz \
-    && cd openjpeg-${OPENJPEG_VERSION} \
-    && cmake . -DBUILD_SHARED_LIBS=ON  -DBUILD_STATIC_LIBS=OFF -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-    && make -j$(nproc) \
-    && make install \
-    && mkdir -p /build_thirdparty/usr/lib \
-    && cp -P /usr/lib/libopenjp2*.so* /build_thirdparty/usr/lib \
-    && for i in /build_thirdparty/usr/lib/*; do strip -s $i 2>/dev/null || /bin/true; done \
-    && cd .. \
-    && rm -rf openjpeg-${OPENJPEG_VERSION} \
-    ); fi
+       autoconf automake sqlite3 bash-completion swig
 
 ARG PROJ_INSTALL_PREFIX
 ARG PROJ_DATUMGRID_LATEST_LAST_MODIFIED
 RUN \
     mkdir -p /build_projgrids/${PROJ_INSTALL_PREFIX}/share/proj \
-    && curl -LOs http://download.osgeo.org/proj/proj-datumgrid-latest.zip \
+    && curl -LO -fsS http://download.osgeo.org/proj/proj-datumgrid-latest.zip \
     && unzip -q -j -u -o proj-datumgrid-latest.zip  -d /build_projgrids/${PROJ_INSTALL_PREFIX}/share/proj \
     && rm -f *.zip
 
-RUN apt-get update -y \
-    && apt-get install -y --fix-missing --no-install-recommends rsync ccache \
-    && rm -rf /var/lib/apt/lists/*
 ARG RSYNC_REMOTE
+ARG WITH_CCACHE
 
 # Build PROJ
 ARG PROJ_VERSION=master
-RUN . /buildscripts/bh-set-envvars.sh \
+RUN --mount=type=cache,id=ubuntu-small-proj,target=$HOME/.cache \
+    . /buildscripts/bh-set-envvars.sh \
     && mkdir proj \
     && wget -q https://github.com/OSGeo/PROJ/archive/${PROJ_VERSION}.tar.gz -O - \
         | tar xz -C proj --strip-components=1 \
+    && export PROJ_DB_CACHE_PARAM="" \
     && cd proj \
     && if test "${RSYNC_REMOTE:-}" != ""; then \
         echo "Downloading cache..."; \
-        rsync -ra ${RSYNC_REMOTE}/proj/${GCC_ARCH}/ $HOME/; \
+        rsync -ra ${RSYNC_REMOTE}/proj/${GCC_ARCH}/ $HOME/.cache/; \
         echo "Finished"; \
+    fi \
+    && if [ -n "${WITH_CCACHE:-}" ]; then \
         export CC="ccache ${GCC_ARCH}-linux-gnu-gcc"; \
         export CXX="ccache ${GCC_ARCH}-linux-gnu-g++"; \
-        export PROJ_DB_CACHE_DIR="$HOME/.ccache"; \
+        export PROJ_DB_CACHE_PARAM="-DPROJ_DB_CACHE_DIR=$HOME/.cache"; \
         ccache -M 100M; \
     fi \
     && CFLAGS='-DPROJ_RENAME_SYMBOLS -O2' CXXFLAGS='-DPROJ_RENAME_SYMBOLS -DPROJ_INTERNAL_CPP_NAMESPACE -O2' \
         cmake . \
+	-G Ninja \
         -DBUILD_SHARED_LIBS=ON \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=${PROJ_INSTALL_PREFIX} \
         -DBUILD_TESTING=OFF \
-    && make -j$(nproc) \
-    && make install DESTDIR="/build" \
+        $PROJ_DB_CACHE_PARAM \
+    && ninja \
+    && DESTDIR="/build" ninja install \
     && if test "${RSYNC_REMOTE:-}" != ""; then \
-        ccache -s; \
         echo "Uploading cache..."; \
-        rsync -ra --delete $HOME/.ccache ${RSYNC_REMOTE}/proj/${GCC_ARCH}/; \
+        rsync -ra --delete $HOME/.cache/ ${RSYNC_REMOTE}/proj/${GCC_ARCH}/; \
         echo "Finished"; \
-        rm -rf $HOME/.ccache; \
+    fi \
+    && if [ -n "${WITH_CCACHE:-}" ]; then \
+        ccache -s; \
         unset CC; \
         unset CXX; \
     fi \
@@ -137,8 +135,6 @@ RUN . /buildscripts/bh-set-envvars.sh \
     && rm /build${PROJ_INSTALL_PREFIX}/lib/libproj.*  \
     && ${GCC_ARCH}-linux-gnu-strip -s /build${PROJ_INSTALL_PREFIX}/lib/libinternalproj.so.${PROJ_SO} \
     && for i in /build${PROJ_INSTALL_PREFIX}/bin/*; do ${GCC_ARCH}-linux-gnu-strip -s $i 2>/dev/null || /bin/true; done \
-    && apt-get update -y \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -y patchelf \
     && patchelf --set-soname libinternalproj.so.${PROJ_SO_FIRST} /build${PROJ_INSTALL_PREFIX}/lib/libinternalproj.so.${PROJ_SO} \
     && for i in /build${PROJ_INSTALL_PREFIX}/bin/*; do patchelf --replace-needed libproj.so.${PROJ_SO_FIRST} libinternalproj.so.${PROJ_SO_FIRST} $i; done
 
@@ -148,7 +144,8 @@ ARG GDAL_RELEASE_DATE
 ARG GDAL_BUILD_IS_RELEASE
 ARG GDAL_REPOSITORY=OSGeo/gdal
 
-RUN . /buildscripts/bh-set-envvars.sh \
+RUN --mount=type=cache,id=ubuntu-small-gdal,target=$HOME/.cache \
+    . /buildscripts/bh-set-envvars.sh \
     && if test "${GDAL_VERSION}" = "master"; then \
         export GDAL_VERSION=$(curl -Ls https://api.github.com/repos/${GDAL_REPOSITORY}/commits/HEAD -H "Accept: application/vnd.github.VERSION.sha"); \
         export GDAL_RELEASE_DATE=$(date "+%Y%m%d"); \
@@ -162,8 +159,10 @@ RUN . /buildscripts/bh-set-envvars.sh \
     && cd gdal \
     && if test "${RSYNC_REMOTE:-}" != ""; then \
         echo "Downloading cache..."; \
-        rsync -ra ${RSYNC_REMOTE}/gdal/${GCC_ARCH}/ $HOME/; \
+        rsync -ra ${RSYNC_REMOTE}/gdal/${GCC_ARCH}/ $HOME/.cache/; \
         echo "Finished"; \
+    fi \
+    && if [ -n "${WITH_CCACHE:-}" ]; then \
         # Little trick to avoid issues with Python bindings
         printf "#!/bin/sh\nccache %s-linux-gnu-gcc \$*" "${GCC_ARCH}" > ccache_gcc.sh; \
         chmod +x ccache_gcc.sh; \
@@ -178,6 +177,7 @@ RUN . /buildscripts/bh-set-envvars.sh \
     # -Wno-psabi avoid 'note: parameter passing for argument of type 'std::pair<double, double>' when C++17 is enabled changed to match C++14 in GCC 10.1' on arm64
     && CFLAGS='-DPROJ_RENAME_SYMBOLS -O2' CXXFLAGS='-DPROJ_RENAME_SYMBOLS -DPROJ_INTERNAL_CPP_NAMESPACE -O2 -Wno-psabi' \
        cmake .. \
+        -G Ninja \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DGDAL_FIND_PACKAGE_PROJ_MODE=MODULE \
         -DPROJ_INCLUDE_DIR="/build${PROJ_INSTALL_PREFIX-/usr/local}/include" \
@@ -185,15 +185,16 @@ RUN . /buildscripts/bh-set-envvars.sh \
         -DGDAL_USE_TIFF_INTERNAL=ON \
         -DGDAL_USE_GEOTIFF_INTERNAL=ON \
         -DBUILD_TESTING=OFF \
-    && make -j$(nproc) \
-    && make install DESTDIR="/build" \
+    && ninja \
+    && DESTDIR="/build" ninja install \
     && cd .. \
     && if test "${RSYNC_REMOTE:-}" != ""; then \
-        ccache -s; \
         echo "Uploading cache..."; \
-        rsync -ra --delete $HOME/.ccache ${RSYNC_REMOTE}/gdal/${GCC_ARCH}/; \
+        rsync -ra --delete $HOME/.cache/ ${RSYNC_REMOTE}/gdal/${GCC_ARCH}/; \
         echo "Finished"; \
-        rm -rf $HOME/.ccache; \
+    fi \
+    && if [ -n "${WITH_CCACHE:-}" ]; then \
+        ccache -s; \
         unset CC; \
         unset CXX; \
     fi \
@@ -212,39 +213,33 @@ RUN . /buildscripts/bh-set-envvars.sh \
     && for i in /build_gdal_version_changing/usr/bin/*; do ${GCC_ARCH}-linux-gnu-strip -s $i 2>/dev/null || /bin/true; done
 
 # Build final image
-FROM $TARGET_BASE_IMAGE as runner
+FROM $TARGET_BASE_IMAGE AS runner
 
 USER root
 RUN date
 
 # Update distro
-RUN apt-get update -y && apt-get upgrade -y \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN apt-get update \
-# PROJ dependencies
-    && DEBIAN_FRONTEND=noninteractive apt-get install -y  --no-install-recommends \
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+    --mount=type=cache,target=/var/lib/apt,sharing=locked \
+    export DEBIAN_FRONTEND=noninteractive \
+    && apt-get update -y \
+    && apt-get upgrade -y \
+    # PROJ dependencies
+    && apt-get install -y --no-install-recommends \
         libsqlite3-0 libtiff6 libcurl4 \
         curl unzip ca-certificates \
-    && rm -rf /var/lib/apt/lists/*
-
-# GDAL dependencies
-RUN apt-get update -y \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -y  --no-install-recommends \
+    # GDAL dependencies
+    && apt-get install -y --no-install-recommends \
         python3-numpy libpython3.12 \
         libjpeg-turbo8 libgeos3.12.1 libgeos-c1v5 \
         libexpat1 \
         libxerces-c3.2 \
         libwebp7 libpng16-16 \
+        libdeflate0 \
         libzstd1 bash libpq5 libssl3 libopenjp2-7 libspatialite8 \
         # pil for antialias option of gdal2tiles
         python3-pil \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN apt-get update \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-        python-is-python3 \
-    && rm -rf /var/lib/apt/lists/*
+    && apt-get install -y python-is-python3
 
 # Order layers starting with less frequently varying ones
 # Only used for custom libopenjp2
diff --git a/docker/util.sh b/docker/util.sh
index 42cefda20b66..ad037f937d5a 100755
--- a/docker/util.sh
+++ b/docker/util.sh
@@ -17,7 +17,7 @@ fi
 
 usage()
 {
-    echo "Usage: build.sh [--push] [--docker-repository repo] [--tag name] [--gdal tag|sha1|master] [--gdal-repository repo] [--proj tag|sha1|master] [--release]"
+    echo "Usage: build.sh [--push] [--docker-repository repo] [--tag name] [--gdal tag|sha1|master] [--gdal-repository repo] [--proj tag|sha1|master] [--release] [--docker-cache|--no-docker-cache] [--no-rsync-daemon]"
     # Non-documented: --test-python
     echo ""
     echo "--push: push image to docker repository (defaults to ghcr.io)"
@@ -25,7 +25,9 @@ usage()
     echo "--gdal tag|sha1|master: GDAL version to use. Defaults to master"
     echo "--proj tag|sha1|master: PROJ version to use. Defaults to master"
     echo "--gdal-repository repo: github repository. Defaults to OSGeo/gdal"
-    echo "--release. Whether this is a release build. In which case --gdal tag must be used."
+    echo "--release: Whether this is a release build. In which case --gdal tag must be used."
+    echo "--docker-cache/--no-docker-cache: instruct Docker to build with/without using its cache. Defaults to no cache for release builds."
+    echo "--no-rsync-daemon: do not use the rsync daemon to save build cache in home directory."
     echo "--with-debug-symbols/--without-debug-symbols. Whether to include debug symbols. Only applies to ubuntu-full, default is to include for non-release builds."
     exit 1
 }
@@ -48,7 +50,7 @@ do
             shift
         ;;
 
-        docker-repository)
+        --docker-repository)
             shift
             DOCKER_REPO="$1"
             shift
@@ -100,6 +102,20 @@ do
             shift
         ;;
 
+        --docker-cache)
+            DOCKER_CACHE_PARAM=""
+            shift
+        ;;
+        --no-docker-cache)
+            DOCKER_CACHE_PARAM="--no-cache"
+            shift
+        ;;
+
+        --no-rsync-daemon)
+            NO_RSYNC_DAEMON=1
+            shift
+        ;;
+
         --without-debug-symbols)
             WITH_DEBUG_SYMBOLS=no
             shift
@@ -126,13 +142,6 @@ if test "${DOCKER_BUILDKIT}" = "1" && test "${DOCKER_CLI_EXPERIMENTAL}" = "enabl
   DOCKER_BUILDX_ARGS=("--platform" "${ARCH_PLATFORMS}")
 fi
 
-# Docker 23 uses BuildKit by default on Linux, but BuildKit prevents
-# custom networks using docker build --network, so disable BuildKit for now.
-# https://github.com/moby/buildkit/issues/978
-if test -z "${DOCKER_BUILDKIT}"; then
-  export DOCKER_BUILDKIT=0
-fi
-
 if test "${RELEASE}" = "yes"; then
     if test "${GDAL_VERSION}" = ""; then
         echo "--gdal tag must be specified when --release is used."
@@ -152,6 +161,7 @@ if test "${RELEASE}" = "yes"; then
     if test "${WITH_DEBUG_SYMBOLS}" = ""; then
         WITH_DEBUG_SYMBOLS=no
     fi
+    [ -v DOCKER_CACHE_PARAM ] || DOCKER_CACHE_PARAM="--no-cache"
 else
     if test "${TAG_NAME}" = ""; then
         TAG_NAME=latest
@@ -159,6 +169,7 @@ else
     if test "${WITH_DEBUG_SYMBOLS}" = ""; then
         WITH_DEBUG_SYMBOLS=yes
     fi
+    [ -v DOCKER_CACHE_PARAM ] || DOCKER_CACHE_PARAM=""
 fi
 
 check_image()
@@ -171,76 +182,6 @@ check_image()
     fi
 }
 
-# No longer used
-cleanup_rsync()
-{
-    rm -f "${RSYNC_DAEMON_TEMPFILE}"
-    if test "${RSYNC_PID}" != ""; then
-        kill "${RSYNC_PID}" || true
-    fi
-}
-
-# No longer used
-trap_error_exit()
-{
-    echo "Exit on error... clean up"
-    cleanup_rsync
-    exit 1
-}
-
-# No longer used
-start_rsync_host()
-{
-    # If rsync is available then start it as a temporary daemon
-    if test "${USE_CACHE:-yes}" = "yes" -a -x "$(command -v rsync)"; then
-
-        RSYNC_SERVER_IP=$(ip -4 -o addr show docker0 | awk '{print $4}' | cut -d "/" -f 1)
-        if test "${RSYNC_SERVER_IP}" = ""; then
-            exit 1
-        fi
-
-        RSYNC_DAEMON_TEMPFILE=$(mktemp)
-
-        # Trap exit
-        trap "trap_error_exit" EXIT
-
-        cat <<EOF > "${RSYNC_DAEMON_TEMPFILE}"
-[gdal-docker-cache]
-        path = $HOME/gdal-docker-cache
-        comment = GDAL Docker cache
-        hosts allow = ${RSYNC_SERVER_IP}/24
-        use chroot = false
-        read only = false
-EOF
-        RSYNC_PORT=23985
-        while true; do
-            rsync --port=${RSYNC_PORT} --address="${RSYNC_SERVER_IP}" --config="${RSYNC_DAEMON_TEMPFILE}" --daemon --no-detach &
-            RSYNC_PID=$!
-            sleep 1
-            kill -0 ${RSYNC_PID} 2>/dev/null && break
-            echo "Port ${RSYNC_PORT} is in use. Trying next one"
-            RSYNC_PORT=$((RSYNC_PORT+1))
-        done
-        echo "rsync daemon forked as process ${RSYNC_PID} listening on port ${RSYNC_PORT}"
-
-        RSYNC_REMOTE="rsync://${RSYNC_SERVER_IP}:${RSYNC_PORT}/gdal-docker-cache/${TARGET_IMAGE}"
-        mkdir -p "$HOME/gdal-docker-cache/${TARGET_IMAGE}/proj"
-        mkdir -p "$HOME/gdal-docker-cache/${TARGET_IMAGE}/gdal"
-        mkdir -p "$HOME/gdal-docker-cache/${TARGET_IMAGE}/spatialite"
-    else
-        RSYNC_REMOTE=""
-    fi
-}
-
-# No longer used
-stop_rsync_host()
-{
-    if test "${RSYNC_REMOTE}" != ""; then
-        cleanup_rsync
-        trap - EXIT
-    fi
-}
-
 build_cmd()
 {
     if test "${DOCKER_BUILDX}" = "buildx"; then
@@ -270,17 +211,34 @@ echo "Using GDAL_REPOSITORY=${GDAL_REPOSITORY}"
 
 IMAGE_NAME="${TARGET_IMAGE}-${TAG_NAME}"
 REPO_IMAGE_NAME="${DOCKER_REPO}/${IMAGE_NAME}"
-BUILDER_IMAGE_NAME="${DOCKER_REPO}/${IMAGE_NAME}_builder"
+
+BUILD_ARGS=(
+    "--build-arg" "PROJ_DATUMGRID_LATEST_LAST_MODIFIED=${PROJ_DATUMGRID_LATEST_LAST_MODIFIED}" \
+    "--build-arg" "PROJ_VERSION=${PROJ_VERSION}" \
+    "--build-arg" "GDAL_VERSION=${GDAL_VERSION}" \
+    "--build-arg" "GDAL_REPOSITORY=${GDAL_REPOSITORY}" \
+    "--build-arg" "WITH_DEBUG_SYMBOLS=${WITH_DEBUG_SYMBOLS}" \
+)
+[ -z "${DOCKER_CACHE_PARAM}" ] || BUILD_ARGS+=("${DOCKER_CACHE_PARAM}")
 
 if test "${RELEASE}" = "yes"; then
-    BUILD_ARGS=(
-        "--build-arg" "PROJ_DATUMGRID_LATEST_LAST_MODIFIED=${PROJ_DATUMGRID_LATEST_LAST_MODIFIED}" \
-        "--build-arg" "PROJ_VERSION=${PROJ_VERSION}" \
-        "--build-arg" "GDAL_VERSION=${GDAL_VERSION}" \
-        "--build-arg" "GDAL_REPOSITORY=${GDAL_REPOSITORY}" \
-        "--build-arg" "GDAL_BUILD_IS_RELEASE=YES" \
-        "--build-arg" "WITH_DEBUG_SYMBOLS=${WITH_DEBUG_SYMBOLS}" \
-    )
+    BUILD_ARGS+=("--build-arg" "GDAL_BUILD_IS_RELEASE=YES")
+
+    if [ -z "${SOURCE_DATE_EPOCH}" ]; then
+        # Try to set SOURCE_DATE_EPOCH to the timestamp of the tar.gz for
+        # the release, so repeated builds give similar output.
+        # https://github.com/moby/buildkit/blob/master/docs/build-repro.md#source_date_epoch
+        # Will proceed without setting SOURCE_DATE_EPOCH when failing to get
+        # the timestamp, so "build.sh --gdal HEAD" works.
+        LAST_MODIFIED=$(curl -L -sI "https://github.com/OSGeo/gdal/releases/download/${GDAL_VERSION}/gdal-${GDAL_VERSION#v}.tar.gz" \
+                            | grep -i last-modified | awk -F: '{print $2}')
+        if [ -n "${LAST_MODIFIED}" ]; then
+            MODIFIED_SINCE_EPOCH=$(date -d "${LAST_MODIFIED}" +%s)
+            if [ -n "${MODIFIED_SINCE_EPOCH}" ]; then
+                export SOURCE_DATE_EPOCH="${MODIFIED_SINCE_EPOCH}"
+            fi
+        fi
+    fi
 
     if test "${BASE_IMAGE}" != ""; then
         BUILD_ARGS+=("--build-arg" "BASE_IMAGE=${BASE_IMAGE}")
@@ -302,7 +260,6 @@ if test "${RELEASE}" = "yes"; then
     if test "${DOCKER_BUILDX}" = "buildx" -a "${PUSH_GDAL_DOCKER_IMAGE}" = "yes"; then
         docker $(build_cmd) "${BUILD_ARGS[@]}" "${LABEL_ARGS[@]}" -t "${REPO_IMAGE_NAME}" --push "${SCRIPT_DIR}"
     else
-        docker $(build_cmd) "${BUILD_ARGS[@]}" "${LABEL_ARGS[@]}" --target builder -t "${BUILDER_IMAGE_NAME}" "${SCRIPT_DIR}"
         docker $(build_cmd) "${BUILD_ARGS[@]}" "${LABEL_ARGS[@]}" -t "${REPO_IMAGE_NAME}" "${SCRIPT_DIR}"
 
         if test "${DOCKER_BUILDX}" != "buildx"; then
@@ -315,6 +272,8 @@ if test "${RELEASE}" = "yes"; then
     fi
 
 else
+    BUILD_ARGS+=("--build-arg" "BUILDKIT_INLINE_CACHE=1")
+    BUILD_ARGS+=("--build-arg" "WITH_CCACHE=1")
 
     IMAGE_NAME_WITH_ARCH="${REPO_IMAGE_NAME}"
     if test "${IMAGE_NAME}" = "osgeo/gdal:ubuntu-full-latest" \
@@ -324,33 +283,36 @@ else
         if test "${DOCKER_BUILDX}" != "buildx"; then
           ARCH_PLATFORM_ARCH=$(echo ${ARCH_PLATFORMS} | sed "s/linux\///")
           IMAGE_NAME_WITH_ARCH="${REPO_IMAGE_NAME}-${ARCH_PLATFORM_ARCH}"
-          BUILDER_IMAGE_NAME="${BUILDER_IMAGE_NAME}_${ARCH_PLATFORM_ARCH}"
         fi
     fi
 
-    OLD_BUILDER_ID=$(docker image ls "${BUILDER_IMAGE_NAME}" -q)
     OLD_IMAGE_ID=$(docker image ls "${IMAGE_NAME_WITH_ARCH}" -q)
 
     if test "${GDAL_RELEASE_DATE}" = ""; then
         GDAL_RELEASE_DATE=$(date "+%Y%m%d")
     fi
     echo "Using GDAL_RELEASE_DATE=${GDAL_RELEASE_DATE}"
-
-    RSYNC_DAEMON_CONTAINER=gdal_rsync_daemon
-    BUILD_NETWORK=docker_build_gdal
-    HOST_CACHE_DIR="$HOME/gdal-docker-cache"
-
-    mkdir -p "${HOST_CACHE_DIR}/${TARGET_IMAGE}/proj/x86_64"
-    mkdir -p "${HOST_CACHE_DIR}/${TARGET_IMAGE}/proj/aarch64"
-    mkdir -p "${HOST_CACHE_DIR}/${TARGET_IMAGE}/gdal/x86_64"
-    mkdir -p "${HOST_CACHE_DIR}/${TARGET_IMAGE}/gdal/aarch64"
-    mkdir -p "${HOST_CACHE_DIR}/${TARGET_IMAGE}/spatialite"
-
-    # Start a Docker container that has a rsync daemon, mounting HOST_CACHE_DIR
-    if ! docker ps | grep "${RSYNC_DAEMON_CONTAINER}"; then
-        RSYNC_DAEMON_IMAGE=osgeo/gdal:gdal_rsync_daemon
-        docker rmi "${RSYNC_DAEMON_IMAGE}" 2>/dev/null || true
-        docker $(build_cmd) -t "${RSYNC_DAEMON_IMAGE}" - <<EOF
+    BUILD_ARGS+=("--build-arg" "GDAL_RELEASE_DATE=${GDAL_RELEASE_DATE}")
+
+    if [ ! -v NO_RSYNC_DAEMON ]; then
+        RSYNC_DAEMON_CONTAINER=gdal_rsync_daemon
+        HOST_CACHE_DIR="$HOME/gdal-docker-cache"
+
+        mkdir -p "${HOST_CACHE_DIR}/${TARGET_IMAGE}/proj/"{x86_64,aarch64}
+        mkdir -p "${HOST_CACHE_DIR}/${TARGET_IMAGE}/gdal/"{x86_64,aarch64}
+        mkdir -p "${HOST_CACHE_DIR}/${TARGET_IMAGE}/kealib/"{x86_64,aarch64}
+        mkdir -p "${HOST_CACHE_DIR}/${TARGET_IMAGE}/libjxl/"{x86_64,aarch64}
+        mkdir -p "${HOST_CACHE_DIR}/${TARGET_IMAGE}/libopendrive/"{x86_64,aarch64}
+        mkdir -p "${HOST_CACHE_DIR}/${TARGET_IMAGE}/libqb3/"{x86_64,aarch64}
+        mkdir -p "${HOST_CACHE_DIR}/${TARGET_IMAGE}/"mongo-{c,cxx}-driver/{x86_64,aarch64}
+        mkdir -p "${HOST_CACHE_DIR}/${TARGET_IMAGE}/spatialite"
+        mkdir -p "${HOST_CACHE_DIR}/${TARGET_IMAGE}/tiledb/"{x86_64,aarch64}
+
+        # Start a Docker container that has a rsync daemon, mounting HOST_CACHE_DIR
+        if ! docker ps | grep "${RSYNC_DAEMON_CONTAINER}"; then
+            RSYNC_DAEMON_IMAGE=osgeo/gdal:gdal_rsync_daemon
+            docker rmi "${RSYNC_DAEMON_IMAGE}" 2>/dev/null || true
+            docker $(build_cmd) -t "${RSYNC_DAEMON_IMAGE}" - <<EOF
 FROM alpine
 
 VOLUME /opt/gdal-docker-cache
@@ -368,34 +330,22 @@ CMD rsync --daemon --port 23985 && while sleep 1; do true; done
 
 EOF
 
-        if ! docker network ls | grep "${BUILD_NETWORK}"; then
-            docker network create "${BUILD_NETWORK}"
-        fi
-
-        THE_UID=$(id -u "${USER}")
-        THE_GID=$(id -g "${USER}")
-
-        docker run -d -u "${THE_UID}:${THE_GID}" --rm \
-            -v "${HOST_CACHE_DIR}":/opt/gdal-docker-cache \
-            --name "${RSYNC_DAEMON_CONTAINER}" \
-            --network "${BUILD_NETWORK}" \
-            --network-alias "${RSYNC_DAEMON_CONTAINER}" \
-            "${RSYNC_DAEMON_IMAGE}"
+            THE_UID=$(id -u "${USER}")
+            THE_GID=$(id -g "${USER}")
 
+            docker run -d -u "${THE_UID}:${THE_GID}" --rm \
+                   -v "${HOST_CACHE_DIR}":/opt/gdal-docker-cache \
+                   --name "${RSYNC_DAEMON_CONTAINER}" \
+                   --network host \
+                   "${RSYNC_DAEMON_IMAGE}"
+        fi
+        RSYNC_REMOTE="rsync://127.0.0.1:23985/gdal-docker-cache/${TARGET_IMAGE}"
+        BUILD_ARGS+=(
+            "--build-arg" "RSYNC_REMOTE=${RSYNC_REMOTE}" \
+            "--network" "host" \
+        )
     fi
 
-    RSYNC_REMOTE="rsync://${RSYNC_DAEMON_CONTAINER}:23985/gdal-docker-cache/${TARGET_IMAGE}"
-
-    BUILD_ARGS=(
-        "--build-arg" "PROJ_DATUMGRID_LATEST_LAST_MODIFIED=${PROJ_DATUMGRID_LATEST_LAST_MODIFIED}" \
-        "--build-arg" "PROJ_VERSION=${PROJ_VERSION}" \
-        "--build-arg" "GDAL_VERSION=${GDAL_VERSION}" \
-        "--build-arg" "GDAL_REPOSITORY=${GDAL_REPOSITORY}" \
-        "--build-arg" "GDAL_RELEASE_DATE=${GDAL_RELEASE_DATE}" \
-        "--build-arg" "RSYNC_REMOTE=${RSYNC_REMOTE}" \
-        "--build-arg" "WITH_DEBUG_SYMBOLS=${WITH_DEBUG_SYMBOLS}" \
-    )
-
     if test "${BASE_IMAGE}" != ""; then
         BUILD_ARGS+=("--build-arg" "BASE_IMAGE=${BASE_IMAGE}")
         if test "${IMAGE_NAME}" = "osgeo/gdal:ubuntu-full-latest" -o "${IMAGE_NAME}" = "osgeo/gdal:ubuntu-small-latest"; then
@@ -418,7 +368,7 @@ EOF
           echo "${TARGET_BASE_IMAGE_DIGEST}"
           BUILD_ARGS+=("--build-arg" "TARGET_ARCH=${ARCH_PLATFORM_ARCH}")
           #BUILD_ARGS+=("--build-arg" "TARGET_BASE_IMAGE=${BASE_IMAGE}@${TARGET_BASE_IMAGE_DIGEST}")
-          BUILD_ARGS+=("--build-arg" "TARGET_BASE_IMAGE=${TARGET_BASE_IMAGE_DIGEST}")
+          BUILD_ARGS+=("--build-arg" "TARGET_BASE_IMAGE=arm64v8/${BASE_IMAGE}")
           # echo "${BUILD_ARGS[@]}"
         fi
       elif test "${DOCKER_BUILDX}" != "buildx" -a \( "${IMAGE_NAME}" = "osgeo/gdal:alpine-small-latest" -o "${IMAGE_NAME}" = "osgeo/gdal:alpine-normal-latest" \); then
@@ -435,9 +385,6 @@ EOF
       fi
     fi
 
-    docker $(build_cmd) --network "${BUILD_NETWORK}" "${BUILD_ARGS[@]}" --target builder \
-        -t "${BUILDER_IMAGE_NAME}" "${SCRIPT_DIR}"
-
     docker $(build_cmd) "${BUILD_ARGS[@]}" -t "${IMAGE_NAME_WITH_ARCH}" "${SCRIPT_DIR}"
 
     if test "${DOCKER_BUILDX}" != "buildx"; then
@@ -464,11 +411,7 @@ EOF
     fi
 
     # Cleanup previous images
-    NEW_BUILDER_ID=$(docker image ls "${BUILDER_IMAGE_NAME}" -q)
     NEW_IMAGE_ID=$(docker image ls "${IMAGE_NAME_WITH_ARCH}" -q)
-    if test "${OLD_BUILDER_ID}" != "" -a  "${OLD_BUILDER_ID}" != "${NEW_BUILDER_ID}"; then
-        docker rmi "${OLD_BUILDER_ID}"
-    fi
     if test "${OLD_IMAGE_ID}" != "" -a  "${OLD_IMAGE_ID}" != "${NEW_IMAGE_ID}"; then
         docker rmi "${OLD_IMAGE_ID}"
     fi
diff --git a/frmts/CMakeLists.txt b/frmts/CMakeLists.txt
index fc9787f9580c..26a45cfc5372 100644
--- a/frmts/CMakeLists.txt
+++ b/frmts/CMakeLists.txt
@@ -36,12 +36,42 @@ gdal_dependent_format(jpeg "JPEG image format" "GDAL_USE_JPEG OR GDAL_USE_JPEG_I
 # base driver provide frmt core functions
 gdal_optional_format(raw "Raw formats:EOSAT FAST Format, FARSITE LCP and Vexcel MFF2 Image")
 # JPEG must be defined before GTiff
-gdal_format(gtiff "GeoTIFF image format")
+
+# Exception to the rule: enable the GTiff driver by default, even if
+# GDAL_BUILD_OPTIONAL_DRIVERS=OFF.
+if (NOT DEFINED GDAL_ENABLE_DRIVER_GTIFF AND
+    DEFINED GDAL_BUILD_OPTIONAL_DRIVERS AND
+    NOT GDAL_BUILD_OPTIONAL_DRIVERS AND
+    (GDAL_USE_TIFF OR GDAL_USE_TIFF_INTERNAL) AND
+    (GDAL_USE_GEOTIFF OR GDAL_USE_GEOTIFF_INTERNAL))
+    message(WARNING "Enabling GDAL_ENABLE_DRIVER_GTIFF=ON, despite GDAL_BUILD_OPTIONAL_DRIVERS=OFF. You can of course override this choice by setting GDAL_ENABLE_DRIVER_GTIFF=OFF")
+    option(GDAL_ENABLE_DRIVER_GTIFF "Set ON to build GeoTIFF image format format" ON)
+endif()
+
+gdal_dependent_format(gtiff "GeoTIFF image format" "GDAL_USE_TIFF OR GDAL_USE_TIFF_INTERNAL;GDAL_USE_GEOTIFF OR GDAL_USE_GEOTIFF_INTERNAL")
 set_package_properties(TIFF PROPERTIES PURPOSE "gdal_GTIFF: GeoTIFF image format")
 gdal_format(mem "Read/write data in Memory")
-gdal_format(vrt "Virtual GDAL Datasets")
+
+# Exception to the rule: enable the VRT driver by default, even if
+# GDAL_BUILD_OPTIONAL_DRIVERS=OFF.
+if (NOT DEFINED GDAL_ENABLE_DRIVER_VRT AND
+    DEFINED GDAL_BUILD_OPTIONAL_DRIVERS AND
+    NOT GDAL_BUILD_OPTIONAL_DRIVERS)
+    message(WARNING "Enabling GDAL_ENABLE_DRIVER_VRT=ON, despite GDAL_BUILD_OPTIONAL_DRIVERS=OFF. You can of course override this choice by setting GDAL_ENABLE_DRIVER_VRT=OFF")
+    option(GDAL_ENABLE_DRIVER_VRT "Set ON to build Virtual GDAL Datasets" ON)
+endif()
+
+gdal_optional_format(vrt "Virtual GDAL Datasets")
+if (NOT GDAL_ENABLE_DRIVER_VRT)
+    # Even if we don't enable the driver (Open method), we still need to compile
+    # Most of it
+    add_subdirectory(vrt)
+endif()
+
 # Note: derived is derived of vrt
-add_subdirectory(derived)
+gdal_optional_format(derived "Derived datasets")
+
+gdal_optional_format(gti "GDAL Tile Index")
 
 # default formats
 
@@ -49,7 +79,7 @@ if (CMAKE_BUILD_TYPE MATCHES "Debug" OR GDAL_ENABLE_DRIVER_NULL)
   gdal_optional_format(null "NULL dummy driver")
 endif ()
 
-gdal_format(hfa "Erdas Imagine .img")
+gdal_optional_format(hfa "Erdas Imagine .img")
 gdal_optional_format(sdts "SDTS translator")
 gdal_optional_format(nitf "National Imagery Transmission Format")
 gdal_optional_format(gxf "GXF")
@@ -88,6 +118,7 @@ gdal_optional_format(r "R Object Data Store")
 gdal_optional_format(northwood "NWT_GRD/NWT_GRC -- Northwood/Vertical Mapper File Format")
 gdal_optional_format(saga "SAGA GIS Binary Driver")
 gdal_optional_format(xyz "ASCII Gridded XYZ")
+include(avif/driver_declaration.cmake)
 gdal_dependent_format(heif "HEIF" "GDAL_USE_HEIF")
 gdal_optional_format(esric "ESRI compact cache")
 gdal_optional_format(hf2 "HF2/HFZ heightfield raster")
@@ -108,6 +139,7 @@ gdal_optional_format(grib "WMO General Regularly-distributed Information in Bina
 gdal_optional_format(bmp "Microsoft Windows Device Independent Bitmap")
 gdal_optional_format(tga "TGA")
 gdal_optional_format(stacta "STACTA")
+gdal_optional_format(snap_tiff "SNAP TIFF")
 
 # optional Formats
 gdal_optional_format(bsb "Maptech/NOAA BSB Nautical Chart Format")
@@ -147,9 +179,8 @@ gdal_dependent_format(mbtiles "MBTile" "GDAL_USE_SQLITE3;OGR_ENABLE_DRIVER_GPKG;
 gdal_dependent_format(postgisraster "PostGIS Raster driver" "GDAL_USE_POSTGRESQL")
 gdal_dependent_format(dds "DirectDraw Surface" "GDAL_USE_CRNLIB")
 gdal_dependent_format(kea "Kea" "GDAL_USE_KEA;GDAL_USE_HDF5")
-gdal_dependent_format(openjpeg "JPEG2000 driver based on OpenJPEG library" "GDAL_USE_OPENJPEG" DRIVER_NAME_OPTION
-                      "JP2OpenJPEG")
-gdal_dependent_format(tiledb "TileDB tiledb.io" "GDAL_USE_TILEDB")
+include(openjpeg/driver_declaration.cmake)
+include(tiledb/driver_declaration.cmake)
 gdal_dependent_format(exr "EXR support via OpenEXR library" "GDAL_USE_OPENEXR")
 gdal_dependent_format(pcraster "PCRaster CSF 2.0 raster file driver" "GDAL_USE_LIBCSF OR GDAL_USE_LIBCSF_INTERNAL")
 gdal_dependent_format(rdb "RIEGL RDB Map Pixel (.mpx) driver" "rdb_FOUND")
@@ -158,16 +189,16 @@ gdal_dependent_format(basisu_ktx2 "Basis Universal and KTX2 texture formats" "GD
 
 # ######################################################################################################################
 # driver with proprietary libraries Kakadu software SDK
-gdal_dependent_format(jp2kak "JPEG-2000 (based on Kakadu)" "GDAL_USE_KDU")
+include(jp2kak/driver_declaration.cmake)
 gdal_dependent_format(jpipkak "JPIP Streaming" "GDAL_USE_KDU")
 # Luratech SDK
 gdal_dependent_format(jp2lura "JPEG-2000 (based on Luratech)" "GDAL_USE_LURATECH")
 # ESRI ArcSDE C API SDK
 gdal_dependent_format(sde "ESRI ArcSDE Raster" "HAVE_SDE")
 # LizardTech's decoding software development kit (DSDK)
-gdal_dependent_format(mrsid "Multi-resolution Seamless Image Database" "GDAL_USE_MRSID")
-gdal_dependent_format(georaster "Oracle Spatial GeoRaster" "GDAL_USE_ORACLE" DRIVER_NAME_OPTION GEOR)
-gdal_dependent_format(ecw "ERDAS JPEG2000 (.jp2)" "GDAL_USE_ECW")
+include(mrsid/driver_declaration.cmake)
+include(georaster/driver_declaration.cmake)
+include(ecw/driver_declaration.cmake)
 
 # Register all frmt drivers according to FRMT_<driver> flags
 gdal_standard_includes(gdal_frmts)
diff --git a/frmts/aaigrid/aaigriddataset.cpp b/frmts/aaigrid/aaigriddataset.cpp
index 098a8a47f474..2e2ef751f31c 100644
--- a/frmts/aaigrid/aaigriddataset.cpp
+++ b/frmts/aaigrid/aaigriddataset.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2007-2012, Even Rouault <even dot rouault at spatialys.com>
  * Copyright (c) 2014, Kyle Shannon <kyle at pobox dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 // We need cpl_port as first include to avoid VSIStatBufL being not
@@ -80,7 +64,7 @@ float DoubleToFloatClamp(double dfValue)
 // to be needed for other formats.
 double MapNoDataToFloat(double dfNoDataValue)
 {
-    if (CPLIsInf(dfNoDataValue) || CPLIsNan(dfNoDataValue))
+    if (std::isinf(dfNoDataValue) || std::isnan(dfNoDataValue))
         return dfNoDataValue;
 
     if (dfNoDataValue >= std::numeric_limits<float>::max())
@@ -606,11 +590,12 @@ int AAIGDataset::ParseHeader(const char *pszHeader, const char *pszDataType)
             if (pszDataType == nullptr &&
                 (strchr(pszNoData, '.') != nullptr ||
                  strchr(pszNoData, ',') != nullptr ||
+                 std::isnan(dfNoDataValue) ||
                  std::numeric_limits<int>::min() > dfNoDataValue ||
                  dfNoDataValue > std::numeric_limits<int>::max()))
             {
                 eDataType = GDT_Float32;
-                if (!CPLIsInf(dfNoDataValue) &&
+                if (!std::isinf(dfNoDataValue) &&
                     (fabs(dfNoDataValue) < std::numeric_limits<float>::min() ||
                      fabs(dfNoDataValue) > std::numeric_limits<float>::max()))
                 {
@@ -718,7 +703,7 @@ int GRASSASCIIDataset::ParseHeader(const char *pszHeader,
         dfNoDataValue = CPLAtofM(pszNoData);
         if (pszDataType == nullptr &&
             (strchr(pszNoData, '.') != nullptr ||
-             strchr(pszNoData, ',') != nullptr ||
+             strchr(pszNoData, ',') != nullptr || std::isnan(dfNoDataValue) ||
              std::numeric_limits<int>::min() > dfNoDataValue ||
              dfNoDataValue > std::numeric_limits<int>::max()))
         {
@@ -862,18 +847,37 @@ int ISGDataset::ParseHeader(const char *pszHeader, const char *)
                  "ISG: coord type = %s not supported", osCoordType.c_str());
         return FALSE;
     }
-    if (!osCoordUnits.empty() && osCoordUnits != "deg")
+
+    const auto parseDMS = [](CPLString &str)
     {
-        CPLError(CE_Failure, CPLE_NotSupported,
-                 "ISG: coord units = %s not supported", osCoordUnits.c_str());
-        return FALSE;
+        const std::string degreeSymbol{"\xc2\xb0"};
+        str.replaceAll(degreeSymbol, "D");
+        return CPLDMSToDec(str);
+    };
+
+    bool useDMS = false;
+    if (!osCoordUnits.empty())
+    {
+        if (osCoordUnits == "dms")
+        {
+            // CPLDMSToDec does not support the non ascii char for degree used in ISG.
+            // just replace it with "D" to make it compatible.
+            useDMS = true;
+        }
+        else if (osCoordUnits != "deg")
+        {
+            CPLError(CE_Failure, CPLE_NotSupported,
+                     "ISG: coord units = %s not supported",
+                     osCoordUnits.c_str());
+            return FALSE;
+        }
     }
-    double dfLatMin = CPLAtof(osLatMin);
-    double dfLatMax = CPLAtof(osLatMax);
-    double dfLonMin = CPLAtof(osLonMin);
-    double dfLonMax = CPLAtof(osLonMax);
-    double dfDeltaLon = CPLAtof(osDeltaLon);
-    double dfDeltaLat = CPLAtof(osDeltaLat);
+    double dfLatMin = useDMS ? parseDMS(osLatMin) : CPLAtof(osLatMin);
+    double dfLatMax = useDMS ? parseDMS(osLatMax) : CPLAtof(osLatMax);
+    double dfLonMin = useDMS ? parseDMS(osLonMin) : CPLAtof(osLonMin);
+    double dfLonMax = useDMS ? parseDMS(osLonMax) : CPLAtof(osLonMax);
+    double dfDeltaLon = useDMS ? parseDMS(osDeltaLon) : CPLAtof(osDeltaLon);
+    double dfDeltaLat = useDMS ? parseDMS(osDeltaLat) : CPLAtof(osDeltaLat);
     if (dfVersion >= 2.0)
     {
         dfLatMin -= dfDeltaLat / 2.0;
@@ -1503,8 +1507,8 @@ GDALDataset *AAIGDataset::CreateCopy(const char *pszFilename,
                     {
                         bHasOutputDecimalDot = true;
                     }
-                    else if (!CPLIsInf(padfScanline[iPixel]) &&
-                             !CPLIsNan(padfScanline[iPixel]))
+                    else if (!std::isinf(padfScanline[iPixel]) &&
+                             !std::isnan(padfScanline[iPixel]))
                     {
                         strcat(szHeader, ".0");
                         bHasOutputDecimalDot = true;
diff --git a/frmts/aaigrid/aaigriddataset.h b/frmts/aaigrid/aaigriddataset.h
index fcdb8a7058bd..0cbf4dfdc2fa 100644
--- a/frmts/aaigrid/aaigriddataset.h
+++ b/frmts/aaigrid/aaigriddataset.h
@@ -10,23 +10,7 @@
  * Copyright (c) 2007-2012, Even Rouault <even dot rouault at spatialys.com>
  * Copyright (c) 2014, Kyle Shannon <kyle at pobox dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_FRMTS_AAIGRID_AAIGRIDDATASET_H_INCLUDED
diff --git a/frmts/adrg/adrgdataset.cpp b/frmts/adrg/adrgdataset.cpp
index b64abaa9bb11..ee460adf0653 100644
--- a/frmts/adrg/adrgdataset.cpp
+++ b/frmts/adrg/adrgdataset.cpp
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/frmts/adrg/srpdataset.cpp b/frmts/adrg/srpdataset.cpp
index e507adf25abf..c35346a7ce67 100644
--- a/frmts/adrg/srpdataset.cpp
+++ b/frmts/adrg/srpdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.com>
  * Copyright (c) 2009, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
@@ -824,7 +808,7 @@ bool SRPDataset::GetFromRecord(const char *pszFileName, DDFRecord *record)
     }
     else
     {
-        if (std::abs(ZNA) >= 1 && std::abs(ZNA) <= 60)
+        if (ZNA >= -60 && ZNA <= 60 && ZNA != 0)
         {
             m_oSRS.SetUTM(std::abs(ZNA), ZNA > 0);
             m_oSRS.SetWellKnownGeogCS("WGS84");
diff --git a/frmts/aigrid/aigdataset.cpp b/frmts/aigrid/aigdataset.cpp
index 4c04adc7a8d2..fc363c34d766 100644
--- a/frmts/aigrid/aigdataset.cpp
+++ b/frmts/aigrid/aigdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "aigrid.h"
diff --git a/frmts/aigrid/aigopen.c b/frmts/aigrid/aigopen.c
index 72bcc813b793..c3db7ba6dcf5 100644
--- a/frmts/aigrid/aigopen.c
+++ b/frmts/aigrid/aigopen.c
@@ -9,23 +9,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2009-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "aigrid.h"
diff --git a/frmts/aigrid/aigrid.h b/frmts/aigrid/aigrid.h
index 731bff6226b5..1ef9da9792c9 100644
--- a/frmts/aigrid/aigrid.h
+++ b/frmts/aigrid/aigrid.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef AIGRID_H_INCLUDED
diff --git a/frmts/aigrid/aitest.c b/frmts/aigrid/aitest.c
index 5db09f6253cd..d14fe567205a 100644
--- a/frmts/aigrid/aitest.c
+++ b/frmts/aigrid/aitest.c
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #include "aigrid.h"
diff --git a/frmts/aigrid/gridlib.c b/frmts/aigrid/gridlib.c
index 9118e96fbc35..f35bfcb4a6d0 100644
--- a/frmts/aigrid/gridlib.c
+++ b/frmts/aigrid/gridlib.c
@@ -9,23 +9,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2007-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "aigrid.h"
diff --git a/frmts/airsar/airsardataset.cpp b/frmts/airsar/airsardataset.cpp
index 248564afc3da..8043cf428638 100644
--- a/frmts/airsar/airsardataset.cpp
+++ b/frmts/airsar/airsardataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2009, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/frmts/avif/CMakeLists.txt b/frmts/avif/CMakeLists.txt
new file mode 100644
index 000000000000..ef734f575e31
--- /dev/null
+++ b/frmts/avif/CMakeLists.txt
@@ -0,0 +1,26 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/helpers/GdalCMakeMinimumRequired.cmake")
+cmake_minimum_required(VERSION ${GDAL_CMAKE_VERSION_MIN}...${GDAL_CMAKE_VERSION_MAX})
+
+if(NOT DEFINED PROJECT_SOURCE_DIR)
+    # Standalone plugin building
+    project(gdal_AVIF)
+    set(STRICT_VERSION_CHECK ON)
+    include("${PROJECT_SOURCE_DIR}/../../cmake/helpers/SetupStandalonePlugin.cmake" )
+    include(CheckDependentLibrariesAVIF)
+    standalone_driver_finalize(GDAL_ENABLE_DRIVER_AVIF)
+endif()
+
+add_gdal_driver(TARGET gdal_AVIF
+                SOURCES avifdataset.cpp
+                CORE_SOURCES avifdrivercore.cpp
+                PLUGIN_CAPABLE
+                NO_SHARED_SYMBOL_WITH_CORE
+                STRONG_CXX_WFLAGS)
+
+if(NOT TARGET gdal_AVIF)
+    return()
+endif()
+
+gdal_standard_includes(gdal_AVIF)
+gdal_target_link_libraries(gdal_AVIF PRIVATE AVIF::AVIF)
+target_include_directories(gdal_AVIF PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../mem)
diff --git a/frmts/avif/avifdataset.cpp b/frmts/avif/avifdataset.cpp
new file mode 100644
index 000000000000..6e1ef192cf6f
--- /dev/null
+++ b/frmts/avif/avifdataset.cpp
@@ -0,0 +1,1163 @@
+/******************************************************************************
+ *
+ * Project:  AVIF driver
+ * Author:   Even Rouault <even.rouault at spatialys.com>
+ *
+ ******************************************************************************
+ * Copyright (c) 2024, Even Rouault <even.rouault at spatialys.com>
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#include "gdal_pam.h"
+#include "cpl_minixml.h"
+#include "cpl_vsi_virtual.h"
+
+#include "avifdrivercore.h"
+#include "gdalexif.h"
+#include "memdataset.h"
+
+#include <avif/avif.h>
+
+#include <algorithm>
+#include <cinttypes>
+#include <vector>
+
+constexpr const char *DEFAULT_QUALITY_STR = "60";
+constexpr const char *DEFAULT_QUALITY_ALPHA_STR = "100";
+constexpr const char *DEFAULT_SPEED_STR = "6";
+
+/************************************************************************/
+/*                         GDALAVIFDataset                              */
+/************************************************************************/
+
+class GDALAVIFDataset final : public GDALPamDataset
+{
+    friend class GDALAVIFRasterBand;
+
+    avifDecoder *m_decoder = nullptr;
+    bool m_bDecodedDone = false;
+    bool m_bDecodedOK = false;
+    int m_iPart = 0;
+    avifRGBImage m_rgb{};  // memset()' to 0 in constructor
+
+    bool Init(GDALOpenInfo *poOpenInfo);
+    bool Decode();
+
+    GDALAVIFDataset(const GDALAVIFDataset &) = delete;
+    GDALAVIFDataset &operator=(const GDALAVIFDataset &) = delete;
+
+  public:
+    GDALAVIFDataset()
+    {
+        memset(&m_rgb, 0, sizeof(m_rgb));
+    }
+
+    ~GDALAVIFDataset();
+
+    static GDALPamDataset *OpenStaticPAM(GDALOpenInfo *poOpenInfo);
+
+    static GDALDataset *Open(GDALOpenInfo *poOpenInfo)
+    {
+        return OpenStaticPAM(poOpenInfo);
+    }
+
+    static GDALDataset *CreateCopy(const char *, GDALDataset *, int,
+                                   char **papszOptions,
+                                   GDALProgressFunc pfnProgress,
+                                   void *pProgressData);
+};
+
+/************************************************************************/
+/*                       GDALAVIFRasterBand                             */
+/************************************************************************/
+
+class GDALAVIFRasterBand final : public MEMRasterBand
+{
+  public:
+    GDALAVIFRasterBand(GDALAVIFDataset *poDSIn, int nBandIn,
+                       GDALDataType eDataTypeIn, int nBits);
+
+    GDALColorInterp GetColorInterpretation() override
+    {
+        if (poDS->GetRasterCount() == 1)
+            return GCI_GrayIndex;
+        else if (poDS->GetRasterCount() == 2)
+            return nBand == 1 ? GCI_GrayIndex : GCI_AlphaBand;
+        else
+            return static_cast<GDALColorInterp>(GCI_RedBand + nBand - 1);
+    }
+
+  protected:
+    friend class GDALAVIFDataset;
+
+    CPLErr IReadBlock(int, int, void *) override;
+    CPLErr IRasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff, int nXSize,
+                     int nYSize, void *pData, int nBufXSize, int nBufYSize,
+                     GDALDataType eBufType, GSpacing nPixelSpaceBuf,
+                     GSpacing nLineSpaceBuf,
+                     GDALRasterIOExtraArg *psExtraArg) override;
+
+    void SetData(GByte *pabyDataIn, int nPixelOffsetIn, int nLineOffsetIn);
+};
+
+/************************************************************************/
+/*                           GDALAVIFIO                                 */
+/************************************************************************/
+
+class GDALAVIFIO
+{
+  public:
+    explicit GDALAVIFIO(VSIVirtualHandleUniquePtr fpIn);
+
+  private:
+    avifIO io{};  // memset()' to 0 in constructor
+    VSIVirtualHandleUniquePtr fp{};
+    vsi_l_offset nFileSize = 0;
+    std::vector<GByte> buffer{};
+
+    static void Destroy(struct avifIO *io);
+    static avifResult Read(struct avifIO *io, uint32_t readFlags,
+                           uint64_t offset, size_t size, avifROData *out);
+
+    GDALAVIFIO(const GDALAVIFIO &) = delete;
+    GDALAVIFIO &operator=(const GDALAVIFIO &) = delete;
+};
+
+/************************************************************************/
+/*                         ~GDALAVIFDataset()                           */
+/************************************************************************/
+
+GDALAVIFDataset::~GDALAVIFDataset()
+{
+    if (m_decoder)
+    {
+        avifDecoderDestroy(m_decoder);
+        avifRGBImageFreePixels(&m_rgb);
+    }
+}
+
+/************************************************************************/
+/*                        GDALAVIFDataset::Decode()                     */
+/************************************************************************/
+
+bool GDALAVIFDataset::Decode()
+{
+    if (m_bDecodedDone)
+        return m_bDecodedOK;
+    m_bDecodedDone = true;
+
+    auto avifErr = m_iPart == 0 ? avifDecoderNextImage(m_decoder)
+                                : avifDecoderNthImage(m_decoder, m_iPart);
+    if (avifErr != AVIF_RESULT_OK)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "avifDecoderNextImage() failed with: %s",
+                 avifResultToString(avifErr));
+        return false;
+    }
+
+    avifRGBImageSetDefaults(&m_rgb, m_decoder->image);
+
+    m_rgb.format = (nBands == 1 || nBands == 3) ? AVIF_RGB_FORMAT_RGB
+                                                : AVIF_RGB_FORMAT_RGBA;
+    const int nChannels = m_rgb.format == AVIF_RGB_FORMAT_RGB ? 3 : 4;
+
+#if AVIF_VERSION_MAJOR >= 1
+    avifErr = avifRGBImageAllocatePixels(&m_rgb);
+    if (avifErr != AVIF_RESULT_OK)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "avifRGBImageAllocatePixels() failed with: %s",
+                 avifResultToString(avifErr));
+        return false;
+    }
+#else
+    avifRGBImageAllocatePixels(&m_rgb);
+    if (m_rgb.pixels == nullptr)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "avifRGBImageAllocatePixels() failed");
+        return false;
+    }
+#endif
+
+    avifErr = avifImageYUVToRGB(m_decoder->image, &m_rgb);
+    if (avifErr != AVIF_RESULT_OK)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "avifImageYUVToRGB() failed with: %s",
+                 avifResultToString(avifErr));
+        return false;
+    }
+
+    const auto eDT = papoBands[0]->GetRasterDataType();
+    const int nDTSize = GDALGetDataTypeSizeBytes(eDT);
+    for (int i = 0; i < nBands; ++i)
+    {
+        const int iAVIFChannel = (nBands == 2 && i == 1) ? 3 : i;
+        cpl::down_cast<GDALAVIFRasterBand *>(papoBands[i])
+            ->SetData(m_rgb.pixels + iAVIFChannel * nDTSize,
+                      nDTSize * nChannels, static_cast<int>(m_rgb.rowBytes));
+    }
+
+    m_bDecodedOK = true;
+    return m_bDecodedOK;
+}
+
+/************************************************************************/
+/*                         GDALAVIFRasterBand()                         */
+/************************************************************************/
+
+GDALAVIFRasterBand::GDALAVIFRasterBand(GDALAVIFDataset *poDSIn, int nBandIn,
+                                       GDALDataType eDataTypeIn, int nBits)
+    : MEMRasterBand(poDSIn, nBandIn, nullptr, eDataTypeIn, 0, 0, false)
+{
+    if (nBits != 8 && nBits != 16)
+    {
+        GDALRasterBand::SetMetadataItem("NBITS", CPLSPrintf("%d", nBits),
+                                        "IMAGE_STRUCTURE");
+    }
+}
+
+/************************************************************************/
+/*                               SetData()                              */
+/************************************************************************/
+
+void GDALAVIFRasterBand::SetData(GByte *pabyDataIn, int nPixelOffsetIn,
+                                 int nLineOffsetIn)
+{
+    pabyData = pabyDataIn;
+    nPixelOffset = nPixelOffsetIn;
+    nLineOffset = nLineOffsetIn;
+}
+
+/************************************************************************/
+/*                            IReadBlock()                              */
+/************************************************************************/
+
+CPLErr GDALAVIFRasterBand::IReadBlock(int nBlockXOff, int nBlockYOff,
+                                      void *pImage)
+{
+    GDALAVIFDataset *poGDS = cpl::down_cast<GDALAVIFDataset *>(poDS);
+    if (!poGDS->Decode())
+        return CE_Failure;
+    return MEMRasterBand::IReadBlock(nBlockXOff, nBlockYOff, pImage);
+}
+
+/************************************************************************/
+/*                             IRasterIO()                              */
+/************************************************************************/
+
+CPLErr GDALAVIFRasterBand::IRasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff,
+                                     int nXSize, int nYSize, void *pData,
+                                     int nBufXSize, int nBufYSize,
+                                     GDALDataType eBufType,
+                                     GSpacing nPixelSpaceBuf,
+                                     GSpacing nLineSpaceBuf,
+                                     GDALRasterIOExtraArg *psExtraArg)
+{
+    GDALAVIFDataset *poGDS = cpl::down_cast<GDALAVIFDataset *>(poDS);
+    if (!poGDS->Decode())
+        return CE_Failure;
+    return MEMRasterBand::IRasterIO(eRWFlag, nXOff, nYOff, nXSize, nYSize,
+                                    pData, nBufXSize, nBufYSize, eBufType,
+                                    nPixelSpaceBuf, nLineSpaceBuf, psExtraArg);
+}
+
+/************************************************************************/
+/*                       GDALAVIFIO::GDALAVIFIO()                       */
+/************************************************************************/
+
+GDALAVIFIO::GDALAVIFIO(VSIVirtualHandleUniquePtr fpIn) : fp(std::move(fpIn))
+{
+    memset(&io, 0, sizeof(io));
+    io.destroy = Destroy;
+    io.read = Read;
+
+    fp->Seek(0, SEEK_END);
+    nFileSize = fp->Tell();
+    fp->Seek(0, SEEK_SET);
+
+    io.sizeHint = std::min<uint64_t>(10 * 1024 * 1024, nFileSize);
+}
+
+/************************************************************************/
+/*                       GDALAVIFIO::Destroy()                          */
+/************************************************************************/
+
+/* static */ void GDALAVIFIO::Destroy(struct avifIO *io)
+{
+    GDALAVIFIO *gdalIO = reinterpret_cast<GDALAVIFIO *>(io);
+    delete gdalIO;
+}
+
+/************************************************************************/
+/*                       GDALAVIFIO::Read()                             */
+/************************************************************************/
+
+/* static */ avifResult GDALAVIFIO::Read(struct avifIO *io, uint32_t readFlags,
+                                         uint64_t offset, size_t size,
+                                         avifROData *out)
+{
+    GDALAVIFIO *gdalIO = reinterpret_cast<GDALAVIFIO *>(io);
+    if (readFlags != 0)
+    {
+        // Unsupported readFlags
+        return AVIF_RESULT_IO_ERROR;
+    }
+    if (offset > gdalIO->nFileSize)
+    {
+        return AVIF_RESULT_IO_ERROR;
+    }
+
+    if (offset == gdalIO->nFileSize)
+    {
+        out->data = gdalIO->buffer.data();
+        out->size = 0;
+        return AVIF_RESULT_OK;
+    }
+
+    const uint64_t availableSize = gdalIO->nFileSize - offset;
+    size = static_cast<size_t>(std::min<uint64_t>(size, availableSize));
+    try
+    {
+        gdalIO->buffer.resize(size);
+    }
+    catch (const std::bad_alloc &)
+    {
+        CPLError(CE_Failure, CPLE_OutOfMemory,
+                 "Out of memory in GDALAVIFIO::Read()");
+        return AVIF_RESULT_IO_ERROR;
+    }
+
+    if (gdalIO->fp->Seek(offset, SEEK_SET) != 0 ||
+        gdalIO->fp->Read(gdalIO->buffer.data(), size, 1) != 1)
+    {
+        return AVIF_RESULT_IO_ERROR;
+    }
+
+    out->data = gdalIO->buffer.data();
+    out->size = size;
+    return AVIF_RESULT_OK;
+}
+
+/************************************************************************/
+/*                              Init()                                  */
+/************************************************************************/
+
+bool GDALAVIFDataset::Init(GDALOpenInfo *poOpenInfo)
+{
+    m_decoder = avifDecoderCreate();
+    if (!m_decoder)
+        return false;
+
+    std::string osFilename(poOpenInfo->pszFilename);
+    VSIVirtualHandleUniquePtr fp(poOpenInfo->fpL);
+    poOpenInfo->fpL = nullptr;
+
+    if (STARTS_WITH_CI(poOpenInfo->pszFilename, "AVIF:"))
+    {
+        const char *pszPartPos = poOpenInfo->pszFilename + strlen("AVIF:");
+        const char *pszNextColumn = strchr(pszPartPos, ':');
+        if (pszNextColumn == nullptr)
+            return false;
+        m_iPart = atoi(pszPartPos);
+        if (m_iPart <= 0)
+            return false;
+        osFilename = pszNextColumn + 1;
+        fp.reset(VSIFOpenL(osFilename.c_str(), "rb"));
+        if (fp == nullptr)
+            return false;
+    }
+
+    auto gdalIO = std::make_unique<GDALAVIFIO>(std::move(fp));
+    avifDecoderSetIO(m_decoder, reinterpret_cast<avifIO *>(gdalIO.release()));
+
+    const auto avifErr = avifDecoderParse(m_decoder);
+    if (avifErr != AVIF_RESULT_OK)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "avifDecoderParse() failed with: %s",
+                 avifResultToString(avifErr));
+        return false;
+    }
+
+    // AVIF limit is 65,536 x 65,536 pixels;
+    nRasterXSize = static_cast<int>(m_decoder->image->width);
+    nRasterYSize = static_cast<int>(m_decoder->image->height);
+
+    if (m_decoder->image->depth > 12)
+    {
+        CPLError(CE_Failure, CPLE_NotSupported, "Unsupported AVIF depth: %u",
+                 m_decoder->image->depth);
+        return false;
+    }
+
+    const auto eDataType =
+        (m_decoder->image->depth <= 8) ? GDT_Byte : GDT_UInt16;
+    const int l_nBands = m_decoder->image->yuvFormat == AVIF_PIXEL_FORMAT_YUV400
+                             ? (m_decoder->alphaPresent ? 2 : 1)
+                         : m_decoder->alphaPresent ? 4
+                                                   : 3;
+
+    if (m_decoder->image->yuvFormat == AVIF_PIXEL_FORMAT_YUV444)
+        GDALDataset::SetMetadataItem("YUV_SUBSAMPLING", "444",
+                                     "IMAGE_STRUCTURE");
+    else if (m_decoder->image->yuvFormat == AVIF_PIXEL_FORMAT_YUV422)
+        GDALDataset::SetMetadataItem("YUV_SUBSAMPLING", "422",
+                                     "IMAGE_STRUCTURE");
+    else if (m_decoder->image->yuvFormat == AVIF_PIXEL_FORMAT_YUV420)
+        GDALDataset::SetMetadataItem("YUV_SUBSAMPLING", "420",
+                                     "IMAGE_STRUCTURE");
+
+    for (int i = 0; i < l_nBands; ++i)
+    {
+        SetBand(i + 1, new GDALAVIFRasterBand(
+                           this, i + 1, eDataType,
+                           static_cast<int>(m_decoder->image->depth)));
+    }
+
+    if (m_iPart == 0)
+    {
+        if (m_decoder->imageCount > 1)
+        {
+            CPLStringList aosSubDS;
+            for (int i = 0; i < m_decoder->imageCount; i++)
+            {
+                aosSubDS.SetNameValue(
+                    CPLSPrintf("SUBDATASET_%d_NAME", i + 1),
+                    CPLSPrintf("AVIF:%d:%s", i + 1, poOpenInfo->pszFilename));
+                aosSubDS.SetNameValue(CPLSPrintf("SUBDATASET_%d_DESC", i + 1),
+                                      CPLSPrintf("Subdataset %d", i + 1));
+            }
+            GDALDataset::SetMetadata(aosSubDS.List(), "SUBDATASETS");
+        }
+    }
+    else if (m_iPart > m_decoder->imageCount)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Invalid image part number. Maximum allowed is %d",
+                 m_decoder->imageCount);
+        return false;
+    }
+    else
+    {
+        m_iPart--;
+    }
+
+    if (m_decoder->image->exif.size >= 8)
+    {
+        VSILFILE *fpEXIF =
+            VSIFileFromMemBuffer(nullptr, m_decoder->image->exif.data,
+                                 m_decoder->image->exif.size, false);
+        int nExifOffset = 0;
+        int nInterOffset = 0;
+        int nGPSOffset = 0;
+        char **papszEXIFMetadata = nullptr;
+#ifdef CPL_LSB
+        const bool bSwab = m_decoder->image->exif.data[0] == 0x4d;
+#else
+        const bool bSwab = m_decoder->image->exif.data[0] == 0x49;
+#endif
+        constexpr int nTIFFHEADER = 0;
+        uint32_t nTiffDirStart;
+        memcpy(&nTiffDirStart, m_decoder->image->exif.data + 4,
+               sizeof(uint32_t));
+        if (bSwab)
+        {
+            CPL_LSBPTR32(&nTiffDirStart);
+        }
+        EXIFExtractMetadata(papszEXIFMetadata, fpEXIF, nTiffDirStart, bSwab,
+                            nTIFFHEADER, nExifOffset, nInterOffset, nGPSOffset);
+
+        if (nExifOffset > 0)
+        {
+            EXIFExtractMetadata(papszEXIFMetadata, fpEXIF, nExifOffset, bSwab,
+                                nTIFFHEADER, nExifOffset, nInterOffset,
+                                nGPSOffset);
+        }
+        if (nInterOffset > 0)
+        {
+            EXIFExtractMetadata(papszEXIFMetadata, fpEXIF, nInterOffset, bSwab,
+                                nTIFFHEADER, nExifOffset, nInterOffset,
+                                nGPSOffset);
+        }
+        if (nGPSOffset > 0)
+        {
+            EXIFExtractMetadata(papszEXIFMetadata, fpEXIF, nGPSOffset, bSwab,
+                                nTIFFHEADER, nExifOffset, nInterOffset,
+                                nGPSOffset);
+        }
+        VSIFCloseL(fpEXIF);
+        GDALDataset::SetMetadata(papszEXIFMetadata, "EXIF");
+        CSLDestroy(papszEXIFMetadata);
+    }
+
+    if (m_decoder->image->xmp.size > 0)
+    {
+        const std::string osXMP(
+            reinterpret_cast<const char *>(m_decoder->image->xmp.data),
+            m_decoder->image->xmp.size);
+        const char *const apszMD[] = {osXMP.c_str(), nullptr};
+        GDALDataset::SetMetadata(const_cast<char **>(apszMD), "xml:XMP");
+    }
+
+    if (m_decoder->image->icc.size > 0)
+    {
+        // Escape the profile.
+        char *pszBase64Profile =
+            CPLBase64Encode(static_cast<int>(m_decoder->image->icc.size),
+                            m_decoder->image->icc.data);
+
+        // Set ICC profile metadata.
+        SetMetadataItem("SOURCE_ICC_PROFILE", pszBase64Profile,
+                        "COLOR_PROFILE");
+
+        CPLFree(pszBase64Profile);
+    }
+
+    // Initialize any PAM information.
+    if (m_decoder->imageCount > 1)
+    {
+        SetSubdatasetName(CPLSPrintf("%d", m_iPart + 1));
+        SetPhysicalFilename(osFilename.c_str());
+    }
+    SetDescription(poOpenInfo->pszFilename);
+    TryLoadXML(poOpenInfo->GetSiblingFiles());
+
+    return true;
+}
+
+/************************************************************************/
+/*                          OpenStaticPAM()                             */
+/************************************************************************/
+
+/* static */
+GDALPamDataset *GDALAVIFDataset::OpenStaticPAM(GDALOpenInfo *poOpenInfo)
+{
+    if (!AVIFDriverIdentify(poOpenInfo))
+        return nullptr;
+
+    if (poOpenInfo->eAccess == GA_Update)
+    {
+        CPLError(CE_Failure, CPLE_NotSupported,
+                 "Update of existing AVIF file not supported");
+        return nullptr;
+    }
+
+    auto poDS = std::make_unique<GDALAVIFDataset>();
+    if (!poDS->Init(poOpenInfo))
+        return nullptr;
+
+    return poDS.release();
+}
+
+/************************************************************************/
+/*                             CreateCopy()                             */
+/************************************************************************/
+
+/* static */
+GDALDataset *GDALAVIFDataset::CreateCopy(const char *pszFilename,
+                                         GDALDataset *poSrcDS,
+                                         int /* bStrict */, char **papszOptions,
+                                         GDALProgressFunc pfnProgress,
+                                         void *pProgressData)
+{
+    auto poDrv = GetGDALDriverManager()->GetDriverByName(DRIVER_NAME);
+    if (poDrv && poDrv->GetMetadataItem(GDAL_DMD_CREATIONOPTIONLIST) == nullptr)
+    {
+        CPLError(CE_Failure, CPLE_NotSupported,
+                 "This build of libavif has been done without any AV1 encoder");
+        return nullptr;
+    }
+
+    // Perform various validations on source dataset
+    const int nXSize = poSrcDS->GetRasterXSize();
+    const int nYSize = poSrcDS->GetRasterYSize();
+    const int nBands = poSrcDS->GetRasterCount();
+
+    if (nXSize > 65536 || nYSize > 65536)
+    {
+        CPLError(CE_Failure, CPLE_NotSupported,
+                 "Too big source dataset. Maximum AVIF image dimension is "
+                 "65,536 x 65,536 pixels");
+        return nullptr;
+    }
+    if (nBands != 1 && nBands != 2 && nBands != 3 && nBands != 4)
+    {
+        CPLError(CE_Failure, CPLE_NotSupported,
+                 "Unsupported number of bands: only 1 (Gray), 2 (Graph+Alpha) "
+                 "3 (RGB) or 4 (RGBA) bands are supported");
+        return nullptr;
+    }
+
+    const auto poFirstBand = poSrcDS->GetRasterBand(1);
+    if (poFirstBand->GetColorTable())
+    {
+        CPLError(CE_Failure, CPLE_NotSupported,
+                 "Source dataset with color table unsupported. Use "
+                 "gdal_translate -expand rgb|rgba first");
+        return nullptr;
+    }
+
+    const auto eDT = poFirstBand->GetRasterDataType();
+    if (eDT != GDT_Byte && eDT != GDT_UInt16)
+    {
+        CPLError(
+            CE_Failure, CPLE_NotSupported,
+            "Unsupported data type: only Byte or UInt16 bands are supported");
+        return nullptr;
+    }
+
+    int nBits = eDT == GDT_Byte ? 8 : 12;
+    const char *pszNBITS = CSLFetchNameValue(papszOptions, "NBITS");
+    if (pszNBITS)
+    {
+        nBits = atoi(pszNBITS);
+    }
+    else if (eDT == GDT_UInt16)
+    {
+        pszNBITS = poFirstBand->GetMetadataItem("NBITS", "IMAGE_STRUCTURE");
+        if (pszNBITS)
+        {
+            nBits = atoi(pszNBITS);
+        }
+    }
+    if ((eDT == GDT_Byte && nBits != 8) ||
+        (eDT == GDT_UInt16 && nBits != 10 && nBits != 12))
+    {
+        CPLError(CE_Failure, CPLE_FileIO,
+                 "Invalid/inconsistent bit depth w.r.t data type");
+        return nullptr;
+    }
+
+    const int nQuality =
+        std::clamp(atoi(CSLFetchNameValueDef(papszOptions, "QUALITY",
+                                             DEFAULT_QUALITY_STR)),
+                   0, 100);
+    const int nQualityAlpha =
+        std::clamp(atoi(CSLFetchNameValueDef(papszOptions, "QUALITY_ALPHA",
+                                             DEFAULT_QUALITY_ALPHA_STR)),
+                   0, 100);
+
+    // Create AVIF image.
+    avifPixelFormat ePixelFormat =
+        nBands <= 2 ? AVIF_PIXEL_FORMAT_YUV400 : AVIF_PIXEL_FORMAT_YUV444;
+    if (nBands >= 3)
+    {
+        const char *pszYUV_SUBSAMPLING =
+            CSLFetchNameValueDef(papszOptions, "YUV_SUBSAMPLING", "444");
+        if (EQUAL(pszYUV_SUBSAMPLING, "422"))
+            ePixelFormat = AVIF_PIXEL_FORMAT_YUV422;
+        else if (EQUAL(pszYUV_SUBSAMPLING, "420"))
+            ePixelFormat = AVIF_PIXEL_FORMAT_YUV420;
+
+        if (nQuality == 100 && nQualityAlpha == 100 &&
+            ePixelFormat != AVIF_PIXEL_FORMAT_YUV444)
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                     "Only YUV_SUBSAMPLING=444 is supported for lossless "
+                     "encoding");
+            return nullptr;
+        }
+    }
+
+    // Create empty output file
+    VSIVirtualHandleUniquePtr fp(VSIFOpenL(pszFilename, "wb"));
+    if (!fp)
+    {
+        CPLError(CE_Failure, CPLE_FileIO, "Cannot create file %s", pszFilename);
+        return nullptr;
+    }
+
+    avifImage *image = avifImageCreate(nXSize, nYSize, nBits, ePixelFormat);
+    if (!image)
+    {
+        return nullptr;
+    }
+
+    avifRGBImage rgb;
+    memset(&rgb, 0, sizeof(rgb));
+    avifRGBImageSetDefaults(&rgb, image);
+
+    rgb.format =
+        nBands == 1 || nBands == 3 ? AVIF_RGB_FORMAT_RGB : AVIF_RGB_FORMAT_RGBA;
+
+    avifResult avifErr;
+
+#if AVIF_VERSION_MAJOR >= 1
+    avifErr = avifRGBImageAllocatePixels(&rgb);
+    if (avifErr != AVIF_RESULT_OK)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "avifRGBImageAllocatePixels() failed with: %s",
+                 avifResultToString(avifErr));
+        avifImageDestroy(image);
+        return nullptr;
+    }
+#else
+    avifRGBImageAllocatePixels(&rgb);
+    if (!rgb.pixels)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "avifRGBImageAllocatePixels() failed");
+        avifImageDestroy(image);
+        return nullptr;
+    }
+#endif
+
+    const int nDTSize = GDALGetDataTypeSizeBytes(eDT);
+    GDALRasterIOExtraArg sExtraArg;
+    INIT_RASTERIO_EXTRA_ARG(sExtraArg);
+
+    CPLErr eErr;
+    if (nBands == 1)
+    {
+        int anBands[] = {1, 1, 1};
+        eErr = poSrcDS->RasterIO(GF_Read, 0, 0, nXSize, nYSize, rgb.pixels,
+                                 nXSize, nYSize, eDT, 3, anBands, nDTSize * 3,
+                                 static_cast<int>(rgb.rowBytes), nDTSize,
+                                 &sExtraArg);
+    }
+    else if (nBands == 2)
+    {
+        int anBands[] = {1, 1, 1, 2};
+        eErr = poSrcDS->RasterIO(GF_Read, 0, 0, nXSize, nYSize, rgb.pixels,
+                                 nXSize, nYSize, eDT, 4, anBands, nDTSize * 4,
+                                 static_cast<int>(rgb.rowBytes), nDTSize,
+                                 &sExtraArg);
+    }
+    else
+    {
+        eErr = poSrcDS->RasterIO(
+            GF_Read, 0, 0, nXSize, nYSize, rgb.pixels, nXSize, nYSize, eDT,
+            nBands, nullptr, nDTSize * nBands, static_cast<int>(rgb.rowBytes),
+            nDTSize, &sExtraArg);
+    }
+    if (eErr != CE_None)
+    {
+        avifImageDestroy(image);
+        avifRGBImageFreePixels(&rgb);
+        return nullptr;
+    }
+
+    if (nQuality == 100 && nQualityAlpha == 100)
+    {
+        // Cf https://github.com/AOMediaCodec/libavif/blob/0d3e5e215dffbbd6afbf917ce00c84de599ba410/apps/avifenc.c#L1952
+        image->matrixCoefficients = AVIF_MATRIX_COEFFICIENTS_IDENTITY;
+    }
+    else
+    {
+        // Cf https://github.com/AOMediaCodec/libavif/blob/0d3e5e215dffbbd6afbf917ce00c84de599ba410/apps/avifenc.c#L1434
+        image->matrixCoefficients = AVIF_MATRIX_COEFFICIENTS_BT601;
+    }
+
+    // Cf https://github.com/AOMediaCodec/libavif/blob/0d3e5e215dffbbd6afbf917ce00c84de599ba410/apps/avifenc.c#L2249
+    // The final image has no ICC profile, the user didn't specify any CICP, and the source
+    // image didn't provide any CICP. Explicitly signal SRGB CP/TC here, as 2/2/x will be
+    // interpreted as SRGB anyway.
+    image->colorPrimaries = AVIF_COLOR_PRIMARIES_BT709;
+    image->transferCharacteristics = AVIF_TRANSFER_CHARACTERISTICS_SRGB;
+
+    image->yuvRange = AVIF_RANGE_FULL;
+    image->alphaPremultiplied = 0;
+
+    avifErr = avifImageRGBToYUV(image, &rgb);
+    if (avifErr != AVIF_RESULT_OK)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "avifImageRGBToYUV() failed with: %s",
+                 avifResultToString(avifErr));
+        avifImageDestroy(image);
+        avifRGBImageFreePixels(&rgb);
+        return nullptr;
+    }
+
+    avifEncoder *encoder = avifEncoderCreate();
+    if (!encoder)
+    {
+        avifImageDestroy(image);
+        avifRGBImageFreePixels(&rgb);
+        return nullptr;
+    }
+
+    const char *pszCodec = CSLFetchNameValueDef(papszOptions, "CODEC", "AUTO");
+    if (!EQUAL(pszCodec, "AUTO"))
+    {
+        encoder->codecChoice =
+            avifCodecChoiceFromName(CPLString(pszCodec).tolower().c_str());
+    }
+
+    const char *pszThreads = CSLFetchNameValueDef(
+        papszOptions, "NUM_THREADS",
+        CPLGetConfigOption("GDAL_NUM_THREADS", "ALL_CPUS"));
+    if (pszThreads && !EQUAL(pszThreads, "ALL_CPUS"))
+        encoder->maxThreads = atoi(pszThreads);
+    else
+        encoder->maxThreads = CPLGetNumCPUs();
+
+#if AVIF_VERSION_MAJOR >= 1
+    encoder->quality = nQuality;
+    encoder->qualityAlpha = nQualityAlpha;
+#else
+    // Cf https://github.com/AOMediaCodec/libavif/blob/0d3e5e215dffbbd6afbf917ce00c84de599ba410/src/write.c#L1119
+    const int nQuantizer = ((100 - nQuality) * 63 + 50) / 100;
+    encoder->minQuantizer = nQuantizer;
+    encoder->maxQuantizer = nQuantizer;
+    const int nQuantizerAlpha = ((100 - nQualityAlpha) * 63 + 50) / 100;
+    encoder->minQuantizerAlpha = nQuantizerAlpha;
+    encoder->maxQuantizerAlpha = nQuantizerAlpha;
+#endif
+
+    encoder->speed = std::clamp(
+        atoi(CSLFetchNameValueDef(papszOptions, "SPEED", DEFAULT_SPEED_STR)), 0,
+        10);
+
+    if (CPLTestBool(
+            CSLFetchNameValueDef(papszOptions, "WRITE_EXIF_METADATA", "YES")))
+    {
+        char **papszEXIFMD = poSrcDS->GetMetadata("EXIF");
+        if (papszEXIFMD)
+        {
+            GUInt32 nDataSize = 0;
+            GByte *pabyEXIF =
+                EXIFCreate(papszEXIFMD, nullptr, 0, 0, 0, &nDataSize);
+            if (pabyEXIF)
+            {
+                CPLAssert(nDataSize > 6 &&
+                          memcmp(pabyEXIF, "Exif\0\0", 6) == 0);
+
+#if AVIF_VERSION_MAJOR >= 1
+                CPL_IGNORE_RET_VAL(avifImageSetMetadataExif(image, pabyEXIF + 6,
+                                                            nDataSize - 6));
+#else
+                avifImageSetMetadataExif(image, pabyEXIF + 6, nDataSize - 6);
+#endif
+                CPLFree(pabyEXIF);
+            }
+        }
+    }
+
+    if (CPLTestBool(CSLFetchNameValueDef(papszOptions, "WRITE_XMP", "YES")))
+    {
+        CSLConstList papszXMP = poSrcDS->GetMetadata("xml:XMP");
+        if (papszXMP && papszXMP[0])
+        {
+#if AVIF_VERSION_MAJOR >= 1
+            CPL_IGNORE_RET_VAL(avifImageSetMetadataXMP(
+                image, reinterpret_cast<const uint8_t *>(papszXMP[0]),
+                strlen(papszXMP[0])));
+#else
+            avifImageSetMetadataXMP(
+                image, reinterpret_cast<const uint8_t *>(papszXMP[0]),
+                strlen(papszXMP[0]));
+#endif
+        }
+    }
+
+#if AVIF_VERSION_MAJOR >= 1
+    const char *pszICCProfile =
+        CSLFetchNameValue(papszOptions, "SOURCE_ICC_PROFILE");
+    if (pszICCProfile == nullptr)
+    {
+        pszICCProfile =
+            poSrcDS->GetMetadataItem("SOURCE_ICC_PROFILE", "COLOR_PROFILE");
+    }
+    if (pszICCProfile && pszICCProfile[0] != '\0')
+    {
+        char *pEmbedBuffer = CPLStrdup(pszICCProfile);
+        const GInt32 nEmbedLen =
+            CPLBase64DecodeInPlace(reinterpret_cast<GByte *>(pEmbedBuffer));
+        CPL_IGNORE_RET_VAL(avifImageSetProfileICC(
+            image, reinterpret_cast<const uint8_t *>(pEmbedBuffer), nEmbedLen));
+        CPLFree(pEmbedBuffer);
+    }
+#endif
+
+    avifErr =
+        avifEncoderAddImage(encoder, image, 1, AVIF_ADD_IMAGE_FLAG_SINGLE);
+    if (avifErr != AVIF_RESULT_OK)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "avifEncoderAddImage() failed with: %s",
+                 avifResultToString(avifErr));
+        avifImageDestroy(image);
+        avifEncoderDestroy(encoder);
+        avifRGBImageFreePixels(&rgb);
+        return nullptr;
+    }
+
+    avifRWData avifOutput = AVIF_DATA_EMPTY;
+    avifErr = avifEncoderFinish(encoder, &avifOutput);
+
+    avifEncoderDestroy(encoder);
+    avifImageDestroy(image);
+    avifRGBImageFreePixels(&rgb);
+
+    if (avifErr != AVIF_RESULT_OK)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "avifEncoderFinish() failed with: %s",
+                 avifResultToString(avifErr));
+        return nullptr;
+    }
+
+    const size_t nSize = static_cast<size_t>(avifOutput.size);
+    if (fp->Write(avifOutput.data, 1, nSize) != nSize || fp->Close() != 0)
+    {
+        CPLError(CE_Failure, CPLE_FileIO,
+                 "Could not write %" PRIu64 " bytes into file %s",
+                 static_cast<uint64_t>(nSize), pszFilename);
+        avifRWDataFree(&avifOutput);
+        return nullptr;
+    }
+    avifRWDataFree(&avifOutput);
+
+    fp.reset();
+
+    if (pfnProgress)
+        pfnProgress(1.0, "", pProgressData);
+
+    // Re-open file and clone missing info to PAM
+    GDALOpenInfo oOpenInfo(pszFilename, GA_ReadOnly);
+    auto poDS = OpenStaticPAM(&oOpenInfo);
+    if (poDS)
+    {
+        // Do not create a .aux.xml file just for AREA_OR_POINT=Area
+        const char *pszAreaOfPoint =
+            poSrcDS->GetMetadataItem(GDALMD_AREA_OR_POINT);
+        if (pszAreaOfPoint && EQUAL(pszAreaOfPoint, GDALMD_AOP_AREA))
+        {
+            poDS->SetMetadataItem(GDALMD_AREA_OR_POINT, GDALMD_AOP_AREA);
+            poDS->SetPamFlags(poDS->GetPamFlags() & ~GPF_DIRTY);
+        }
+
+        int nPamMask = GCIF_PAM_DEFAULT;
+        poDS->CloneInfo(poSrcDS, nPamMask);
+    }
+
+    return poDS;
+}
+
+/************************************************************************/
+/*                         GDALAVIFDriver                               */
+/************************************************************************/
+
+class GDALAVIFDriver final : public GDALDriver
+{
+    bool m_bMetadataInitialized = false;
+    void InitMetadata();
+
+  public:
+    const char *GetMetadataItem(const char *pszName,
+                                const char *pszDomain = "") override
+    {
+        if (EQUAL(pszName, GDAL_DMD_CREATIONOPTIONLIST))
+        {
+            InitMetadata();
+        }
+        return GDALDriver::GetMetadataItem(pszName, pszDomain);
+    }
+
+    char **GetMetadata(const char *pszDomain) override
+    {
+        InitMetadata();
+        return GDALDriver::GetMetadata(pszDomain);
+    }
+};
+
+void GDALAVIFDriver::InitMetadata()
+{
+    if (m_bMetadataInitialized)
+        return;
+    m_bMetadataInitialized = true;
+
+    std::vector<std::string> aosCodecNames;
+    for (auto eMethod : {AVIF_CODEC_CHOICE_AUTO, AVIF_CODEC_CHOICE_AOM,
+                         AVIF_CODEC_CHOICE_RAV1E, AVIF_CODEC_CHOICE_SVT})
+    {
+        const char *pszName =
+            avifCodecName(eMethod, AVIF_CODEC_FLAG_CAN_ENCODE);
+        if (pszName)
+        {
+            aosCodecNames.push_back(eMethod == AVIF_CODEC_CHOICE_AUTO
+                                        ? CPLString("AUTO")
+                                        : CPLString(pszName).toupper());
+        }
+    }
+
+    if (aosCodecNames.empty())
+        return;
+
+    CPLXMLTreeCloser oTree(
+        CPLCreateXMLNode(nullptr, CXT_Element, "CreationOptionList"));
+
+    {
+        auto psOption = CPLCreateXMLNode(oTree.get(), CXT_Element, "Option");
+        CPLAddXMLAttributeAndValue(psOption, "name", "CODEC");
+        CPLAddXMLAttributeAndValue(psOption, "type", "string-select");
+        CPLAddXMLAttributeAndValue(psOption, "description",
+                                   "Compression CODEC");
+        CPLAddXMLAttributeAndValue(psOption, "default", "AUTO");
+        for (const std::string &osCodecName : aosCodecNames)
+        {
+            auto poValueNode = CPLCreateXMLNode(psOption, CXT_Element, "Value");
+            CPLCreateXMLNode(poValueNode, CXT_Text, osCodecName.c_str());
+        }
+    }
+
+    {
+        auto psOption = CPLCreateXMLNode(oTree.get(), CXT_Element, "Option");
+        CPLAddXMLAttributeAndValue(psOption, "name", "QUALITY");
+        CPLAddXMLAttributeAndValue(psOption, "type", "int");
+        CPLAddXMLAttributeAndValue(
+            psOption, "description",
+            "Quality for non-alpha channels (0=worst, 100=best/lossless)");
+        CPLAddXMLAttributeAndValue(psOption, "default", DEFAULT_QUALITY_STR);
+        CPLAddXMLAttributeAndValue(psOption, "min", "0");
+        CPLAddXMLAttributeAndValue(psOption, "max", "100");
+    }
+
+    {
+        auto psOption = CPLCreateXMLNode(oTree.get(), CXT_Element, "Option");
+        CPLAddXMLAttributeAndValue(psOption, "name", "QUALITY_ALPHA");
+        CPLAddXMLAttributeAndValue(psOption, "type", "int");
+        CPLAddXMLAttributeAndValue(
+            psOption, "description",
+            "Quality for alpha channel (0=worst, 100=best/lossless)");
+        CPLAddXMLAttributeAndValue(psOption, "default",
+                                   DEFAULT_QUALITY_ALPHA_STR);
+        CPLAddXMLAttributeAndValue(psOption, "min", "0");
+        CPLAddXMLAttributeAndValue(psOption, "max", "100");
+    }
+
+    {
+        auto psOption = CPLCreateXMLNode(oTree.get(), CXT_Element, "Option");
+        CPLAddXMLAttributeAndValue(psOption, "name", "SPEED");
+        CPLAddXMLAttributeAndValue(psOption, "type", "int");
+        CPLAddXMLAttributeAndValue(psOption, "description",
+                                   "Encoder speed (0=slowest, 10=fastest)");
+        CPLAddXMLAttributeAndValue(psOption, "default", DEFAULT_SPEED_STR);
+        CPLAddXMLAttributeAndValue(psOption, "min", "0");
+        CPLAddXMLAttributeAndValue(psOption, "max", "10");
+    }
+
+    {
+        auto psOption = CPLCreateXMLNode(oTree.get(), CXT_Element, "Option");
+        CPLAddXMLAttributeAndValue(psOption, "name", "NUM_THREADS");
+        CPLAddXMLAttributeAndValue(psOption, "type", "string");
+        CPLAddXMLAttributeAndValue(
+            psOption, "description",
+            "Number of worker threads for compression. Can be set to ALL_CPUS");
+        CPLAddXMLAttributeAndValue(psOption, "default", "ALL_CPUS");
+    }
+
+    {
+        auto psOption = CPLCreateXMLNode(oTree.get(), CXT_Element, "Option");
+        CPLAddXMLAttributeAndValue(psOption, "name", "WRITE_EXIF_METADATA");
+        CPLAddXMLAttributeAndValue(psOption, "type", "boolean");
+        CPLAddXMLAttributeAndValue(psOption, "description",
+                                   "Whether to write EXIF metadata");
+        CPLAddXMLAttributeAndValue(psOption, "default", "YES");
+    }
+
+    {
+        auto psOption = CPLCreateXMLNode(oTree.get(), CXT_Element, "Option");
+        CPLAddXMLAttributeAndValue(psOption, "name", "WRITE_XMP");
+        CPLAddXMLAttributeAndValue(psOption, "type", "boolean");
+        CPLAddXMLAttributeAndValue(psOption, "description",
+                                   "Whether to write XMP metadata");
+        CPLAddXMLAttributeAndValue(psOption, "default", "YES");
+    }
+
+#if AVIF_VERSION_MAJOR >= 1
+    {
+        auto psOption = CPLCreateXMLNode(oTree.get(), CXT_Element, "Option");
+        CPLAddXMLAttributeAndValue(psOption, "name", "SOURCE_ICC_PROFILE");
+        CPLAddXMLAttributeAndValue(psOption, "type", "string");
+        CPLAddXMLAttributeAndValue(psOption, "description",
+                                   "ICC profile encoded in Base64");
+    }
+#endif
+
+    {
+        auto psOption = CPLCreateXMLNode(oTree.get(), CXT_Element, "Option");
+        CPLAddXMLAttributeAndValue(psOption, "name", "NBITS");
+        CPLAddXMLAttributeAndValue(psOption, "type", "int");
+        CPLAddXMLAttributeAndValue(psOption, "description",
+                                   "Bit depth. Valid values are 8, 10, 12.");
+    }
+
+    {
+        auto psOption = CPLCreateXMLNode(oTree.get(), CXT_Element, "Option");
+        CPLAddXMLAttributeAndValue(psOption, "name", "YUV_SUBSAMPLING");
+        CPLAddXMLAttributeAndValue(psOption, "type", "string-select");
+        CPLAddXMLAttributeAndValue(
+            psOption, "description",
+            "Subsampling factor for YUV colorspace (for RGB or RGBA)");
+        CPLAddXMLAttributeAndValue(psOption, "default", "444");
+
+        for (const char *pszValue : {"444", "422", "420"})
+        {
+            auto poValueNode = CPLCreateXMLNode(psOption, CXT_Element, "Value");
+            CPLCreateXMLNode(poValueNode, CXT_Text, pszValue);
+        }
+    }
+
+    char *pszXML = CPLSerializeXMLTree(oTree.get());
+    GDALDriver::SetMetadataItem(GDAL_DMD_CREATIONOPTIONLIST, pszXML);
+    CPLFree(pszXML);
+}
+
+/************************************************************************/
+/*                       GDALRegister_AVIF()                            */
+/************************************************************************/
+
+void GDALRegister_AVIF()
+
+{
+    if (!GDAL_CHECK_VERSION("AVIF driver"))
+        return;
+
+    if (GDALGetDriverByName(DRIVER_NAME) != nullptr)
+        return;
+
+    // Check libavif runtime vs compile-time versions
+    const char *pszVersion = avifVersion();
+    const CPLStringList aosVersionTokens(
+        CSLTokenizeString2(pszVersion, ".", 0));
+    if (aosVersionTokens.size() >= 2 &&
+        std::string(aosVersionTokens[0])
+                .append(".")
+                .append(aosVersionTokens[1]) !=
+            CPLSPrintf("%d.%d", AVIF_VERSION_MAJOR, AVIF_VERSION_MINOR))
+    {
+        const std::string osExpectedVersion(
+            CPLSPrintf("%d.%d.%d", AVIF_VERSION_MAJOR, AVIF_VERSION_MINOR,
+                       AVIF_VERSION_PATCH));
+        CPLError(CE_Warning, CPLE_AppDefined,
+                 "GDAL AVIF driver was built against libavif %s but is running "
+                 "against %s. Runtime issues could occur",
+                 osExpectedVersion.c_str(), avifVersion());
+    }
+
+    auto poDriver = std::make_unique<GDALAVIFDriver>();
+    auto poDM = GetGDALDriverManager();
+    bool bMayHaveWriteSupport = true;
+    if (!poDM->IsKnownDriver("AVIF"))
+    {
+        // If we are not built as a deferred plugin, check now if libavif has
+        // write support
+        bMayHaveWriteSupport =
+            poDriver->GetMetadataItem(GDAL_DMD_CREATIONOPTIONLIST) != nullptr;
+    }
+
+    AVIFDriverSetCommonMetadata(poDriver.get(), bMayHaveWriteSupport);
+
+    poDriver->pfnOpen = GDALAVIFDataset::Open;
+    if (bMayHaveWriteSupport)
+        poDriver->pfnCreateCopy = GDALAVIFDataset::CreateCopy;
+
+    poDM->RegisterDriver(poDriver.release());
+}
diff --git a/frmts/avif/avifdrivercore.cpp b/frmts/avif/avifdrivercore.cpp
new file mode 100644
index 000000000000..9a791903e7f1
--- /dev/null
+++ b/frmts/avif/avifdrivercore.cpp
@@ -0,0 +1,76 @@
+/******************************************************************************
+ *
+ * Project:  AVIF Driver
+ * Author:   Even Rouault <even.rouault at spatialys.com>
+ *
+ ******************************************************************************
+ * Copyright (c) 2024, Even Rouault <even.rouault at spatialys.com>
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#include "avifdrivercore.h"
+
+/************************************************************************/
+/*                        AVIFDriverIdentify()                          */
+/************************************************************************/
+
+int AVIFDriverIdentify(GDALOpenInfo *poOpenInfo)
+
+{
+    if (STARTS_WITH_CI(poOpenInfo->pszFilename, "AVIF:"))
+        return true;
+
+    if (poOpenInfo->nHeaderBytes < 12 || poOpenInfo->fpL == nullptr)
+        return false;
+
+    return memcmp(poOpenInfo->pabyHeader + 4, "ftypavif", 8) == 0 ||
+           memcmp(poOpenInfo->pabyHeader + 4, "ftypavis", 8) == 0;
+}
+
+/************************************************************************/
+/*                     AVIFDriverSetCommonMetadata()                    */
+/************************************************************************/
+
+void AVIFDriverSetCommonMetadata(GDALDriver *poDriver,
+                                 bool bMayHaveWriteSupport)
+{
+    poDriver->SetDescription(DRIVER_NAME);
+    poDriver->SetMetadataItem(GDAL_DCAP_RASTER, "YES");
+    poDriver->SetMetadataItem(GDAL_DMD_LONGNAME, "AV1 Image File Format");
+    poDriver->SetMetadataItem(GDAL_DMD_MIMETYPE, "image/avif");
+    poDriver->SetMetadataItem(GDAL_DMD_HELPTOPIC, "drivers/raster/avif.html");
+    poDriver->SetMetadataItem(GDAL_DMD_EXTENSION, "avif");
+    poDriver->SetMetadataItem(GDAL_DCAP_VIRTUALIO, "YES");
+    poDriver->SetMetadataItem(GDAL_DMD_SUBDATASETS, "YES");
+
+    poDriver->pfnIdentify = AVIFDriverIdentify;
+    poDriver->SetMetadataItem(GDAL_DCAP_OPEN, "YES");
+
+    if (bMayHaveWriteSupport)
+    {
+        poDriver->SetMetadataItem(GDAL_DMD_CREATIONDATATYPES, "Byte UInt16");
+        poDriver->SetMetadataItem(GDAL_DCAP_CREATECOPY, "YES");
+    }
+}
+
+/************************************************************************/
+/*                     DeclareDeferredAVIFPlugin()                      */
+/************************************************************************/
+
+#ifdef PLUGIN_FILENAME
+void DeclareDeferredAVIFPlugin()
+{
+    if (GDALGetDriverByName(DRIVER_NAME) != nullptr)
+    {
+        return;
+    }
+    auto poDriver = new GDALPluginDriverProxy(PLUGIN_FILENAME);
+#ifdef PLUGIN_INSTALLATION_MESSAGE
+    poDriver->SetMetadataItem(GDAL_DMD_PLUGIN_INSTALLATION_MESSAGE,
+                              PLUGIN_INSTALLATION_MESSAGE);
+#endif
+    AVIFDriverSetCommonMetadata(poDriver, /* bMayHaveWriteSupport = */ true);
+    GetGDALDriverManager()->DeclareDeferredPluginDriver(poDriver);
+}
+#endif
diff --git a/frmts/avif/avifdrivercore.h b/frmts/avif/avifdrivercore.h
new file mode 100644
index 000000000000..8706df3f0dfd
--- /dev/null
+++ b/frmts/avif/avifdrivercore.h
@@ -0,0 +1,28 @@
+/******************************************************************************
+ *
+ * Project:  AVIF Driver
+ * Author:   Even Rouault <even.rouault at spatialys.com>
+ *
+ ******************************************************************************
+ * Copyright (c) 2024, Even Rouault <even.rouault at spatialys.com>
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#ifndef AVIFDRIVERCORE_H
+#define AVIFDRIVERCORE_H
+
+#include "gdal_priv.h"
+
+constexpr const char *DRIVER_NAME = "AVIF";
+
+#define AVIFDriverIdentify PLUGIN_SYMBOL_NAME(AVIFDriverIdentify)
+#define AVIFDriverSetCommonMetadata                                            \
+    PLUGIN_SYMBOL_NAME(AVIFDriverSetCommonMetadata)
+
+int AVIFDriverIdentify(GDALOpenInfo *poOpenInfo);
+
+void AVIFDriverSetCommonMetadata(GDALDriver *poDriver,
+                                 bool bMayHaveWriteSupport);
+
+#endif
diff --git a/frmts/avif/driver_declaration.cmake b/frmts/avif/driver_declaration.cmake
new file mode 100644
index 000000000000..c69e87ec1399
--- /dev/null
+++ b/frmts/avif/driver_declaration.cmake
@@ -0,0 +1 @@
+gdal_dependent_format(avif "AVIF" "GDAL_USE_AVIF")
diff --git a/frmts/basisu_ktx2/basisudataset.cpp b/frmts/basisu_ktx2/basisudataset.cpp
index 0a78ab1b3bfa..94bda23c3e95 100644
--- a/frmts/basisu_ktx2/basisudataset.cpp
+++ b/frmts/basisu_ktx2/basisudataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_pam.h"
diff --git a/frmts/basisu_ktx2/basisudrivercore.cpp b/frmts/basisu_ktx2/basisudrivercore.cpp
index 7f30e0eec6e8..1f1048e31865 100644
--- a/frmts/basisu_ktx2/basisudrivercore.cpp
+++ b/frmts/basisu_ktx2/basisudrivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "basisudrivercore.h"
diff --git a/frmts/basisu_ktx2/basisudrivercore.h b/frmts/basisu_ktx2/basisudrivercore.h
index 26723f7e45d4..86291583bb44 100644
--- a/frmts/basisu_ktx2/basisudrivercore.h
+++ b/frmts/basisu_ktx2/basisudrivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef BASISUDRIVERCORE_H
diff --git a/frmts/basisu_ktx2/common.cpp b/frmts/basisu_ktx2/common.cpp
index 98a856100bca..91f7b22e39c1 100644
--- a/frmts/basisu_ktx2/common.cpp
+++ b/frmts/basisu_ktx2/common.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_frmts.h"
diff --git a/frmts/basisu_ktx2/common.h b/frmts/basisu_ktx2/common.h
index 651642b94cfa..ee3314a66cce 100644
--- a/frmts/basisu_ktx2/common.h
+++ b/frmts/basisu_ktx2/common.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_priv.h"
diff --git a/frmts/basisu_ktx2/commoncore.cpp b/frmts/basisu_ktx2/commoncore.cpp
index 9707fde8eb03..a59c686dd67e 100644
--- a/frmts/basisu_ktx2/commoncore.cpp
+++ b/frmts/basisu_ktx2/commoncore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "commoncore.h"
diff --git a/frmts/basisu_ktx2/commoncore.h b/frmts/basisu_ktx2/commoncore.h
index 6dc1fa5e0bb5..a96b3f22b643 100644
--- a/frmts/basisu_ktx2/commoncore.h
+++ b/frmts/basisu_ktx2/commoncore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <string>
diff --git a/frmts/basisu_ktx2/include_basisu_sdk.h b/frmts/basisu_ktx2/include_basisu_sdk.h
index a3e726b82d0b..7e317c80bc2c 100644
--- a/frmts/basisu_ktx2/include_basisu_sdk.h
+++ b/frmts/basisu_ktx2/include_basisu_sdk.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/basisu_ktx2/ktx2dataset.cpp b/frmts/basisu_ktx2/ktx2dataset.cpp
index 0f8e46d17d04..ca9f64dfdeaa 100644
--- a/frmts/basisu_ktx2/ktx2dataset.cpp
+++ b/frmts/basisu_ktx2/ktx2dataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_pam.h"
diff --git a/frmts/basisu_ktx2/ktx2drivercore.cpp b/frmts/basisu_ktx2/ktx2drivercore.cpp
index 691c77539490..1c98d03d50e9 100644
--- a/frmts/basisu_ktx2/ktx2drivercore.cpp
+++ b/frmts/basisu_ktx2/ktx2drivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ktx2drivercore.h"
diff --git a/frmts/basisu_ktx2/ktx2drivercore.h b/frmts/basisu_ktx2/ktx2drivercore.h
index 23729a5e0fa8..65bd35fce0ce 100644
--- a/frmts/basisu_ktx2/ktx2drivercore.h
+++ b/frmts/basisu_ktx2/ktx2drivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef KTX2DRIVERCORE_H
diff --git a/frmts/blx/blx.c b/frmts/blx/blx.c
index 25daaff15835..ec0df53ab1d2 100644
--- a/frmts/blx/blx.c
+++ b/frmts/blx/blx.c
@@ -3,26 +3,7 @@
  * Copyright (c) 2008, Henrik Johansson <henrik@johome.net>
  * Copyright (c) 2008-2009, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  */
 
 #include "blx.h"
diff --git a/frmts/blx/blx.h b/frmts/blx/blx.h
index 69e3ee59557a..0a0de2a8ded8 100644
--- a/frmts/blx/blx.h
+++ b/frmts/blx/blx.h
@@ -2,26 +2,7 @@
  *
  * Copyright (c) 2008, Henrik Johansson <henrik@johome.net>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef BLX_H_INCLUDED
diff --git a/frmts/blx/blxdataset.cpp b/frmts/blx/blxdataset.cpp
index 6e51f519c965..9342391baa28 100644
--- a/frmts/blx/blxdataset.cpp
+++ b/frmts/blx/blxdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2006, Henrik Johansson <henrik@johome.net>
  * Copyright (c) 2008-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************
  *
  */
diff --git a/frmts/bmp/bmpdataset.cpp b/frmts/bmp/bmpdataset.cpp
index f420e3de59dc..e2dd0c87196a 100644
--- a/frmts/bmp/bmpdataset.cpp
+++ b/frmts/bmp/bmpdataset.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2002, Andrey Kiselev <dron@remotesensing.org>
  * Copyright (c) 2007-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/frmts/bsb/bsb2raw.c b/frmts/bsb/bsb2raw.c
index c396fc49a7fd..9758b84d4913 100644
--- a/frmts/bsb/bsb2raw.c
+++ b/frmts/bsb/bsb2raw.c
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2001, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_error.h"
diff --git a/frmts/bsb/bsb_read.c b/frmts/bsb/bsb_read.c
index acc3b127cd45..8f437bde0fff 100644
--- a/frmts/bsb/bsb_read.c
+++ b/frmts/bsb/bsb_read.c
@@ -14,23 +14,7 @@
  * Copyright (c) 2001, Frank Warmerdam
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "bsb_read.h"
diff --git a/frmts/bsb/bsb_read.h b/frmts/bsb/bsb_read.h
index 6c314f9829cc..95e191853dfc 100644
--- a/frmts/bsb/bsb_read.h
+++ b/frmts/bsb/bsb_read.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2001, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef BSBREAD_H_INCLUDED
diff --git a/frmts/bsb/bsbdataset.cpp b/frmts/bsb/bsbdataset.cpp
index cf5f6f0f88ea..e2bdb34154ba 100644
--- a/frmts/bsb/bsbdataset.cpp
+++ b/frmts/bsb/bsbdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2001, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "bsb_read.h"
diff --git a/frmts/cals/calsdataset.cpp b/frmts/cals/calsdataset.cpp
index f8267075379f..48ad43ef730f 100644
--- a/frmts/cals/calsdataset.cpp
+++ b/frmts/cals/calsdataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_frmts.h"
@@ -331,7 +315,7 @@ GDALDataset *CALSDataset::Open(GDALOpenInfo *poOpenInfo)
 
     // Create a TIFF header for a single-strip CCITTFAX4 file.
     poDS->osTIFFHeaderFilename =
-        CPLSPrintf("/vsimem/cals/header_%p.tiff", poDS);
+        VSIMemGenerateHiddenFilename("cals_header.tiff");
     VSILFILE *fp = VSIFOpenL(poDS->osTIFFHeaderFilename, "wb");
     const int nTagCount = 10;
     const int nHeaderSize = 4 + 4 + 2 + nTagCount * 12 + 4;
@@ -359,7 +343,7 @@ GDALDataset *CALSDataset::Open(GDALOpenInfo *poOpenInfo)
 
     // Create a /vsisparse/ description file assembling the TIFF header
     // with the FAX4 codestream that starts at offset 2048 of the CALS file.
-    poDS->osSparseFilename = CPLSPrintf("/vsimem/cals/sparse_%p.xml", poDS);
+    poDS->osSparseFilename = VSIMemGenerateHiddenFilename("cals_sparse.xml");
     fp = VSIFOpenL(poDS->osSparseFilename, "wb");
     CPLAssert(fp);
     VSIFPrintfL(fp,
@@ -473,7 +457,8 @@ GDALDataset *CALSDataset::CreateCopy(const char *pszFilename,
 
     // Write a in-memory TIFF with just the TIFF header to figure out
     // how large it will be.
-    CPLString osTmpFilename(CPLSPrintf("/vsimem/cals/tmp_%p", poSrcDS));
+    const CPLString osTmpFilename(
+        VSIMemGenerateHiddenFilename("tmp_tif_header"));
     char **papszOptions = nullptr;
     papszOptions = CSLSetNameValue(papszOptions, "COMPRESS", "CCITTFAX4");
     papszOptions = CSLSetNameValue(papszOptions, "NBITS", "1");
diff --git a/frmts/ceos/ceosdataset.cpp b/frmts/ceos/ceosdataset.cpp
index 96606f63322b..4720dd90b2c7 100644
--- a/frmts/ceos/ceosdataset.cpp
+++ b/frmts/ceos/ceosdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2009-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ceosopen.h"
diff --git a/frmts/ceos/ceosopen.c b/frmts/ceos/ceosopen.c
index f7e6cbd725fb..aa3c83d80d5d 100644
--- a/frmts/ceos/ceosopen.c
+++ b/frmts/ceos/ceosopen.c
@@ -9,23 +9,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2007-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ceosopen.h"
diff --git a/frmts/ceos/ceosopen.h b/frmts/ceos/ceosopen.h
index 1036155c50af..f1c8fde51a7e 100644
--- a/frmts/ceos/ceosopen.h
+++ b/frmts/ceos/ceosopen.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CEOSOPEN_H_INCLUDED
diff --git a/frmts/ceos/ceostest.c b/frmts/ceos/ceostest.c
index 95436d85b063..6ad4726b1bf8 100644
--- a/frmts/ceos/ceostest.c
+++ b/frmts/ceos/ceostest.c
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ceosopen.h"
diff --git a/frmts/ceos2/ceos.c b/frmts/ceos2/ceos.c
index 461a91668fb8..5104882db32f 100644
--- a/frmts/ceos2/ceos.c
+++ b/frmts/ceos2/ceos.c
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2000, Atlantis Scientific Inc
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ceos.h"
diff --git a/frmts/ceos2/ceos.h b/frmts/ceos2/ceos.h
index 64a39b1cba10..54fd760396e8 100644
--- a/frmts/ceos2/ceos.h
+++ b/frmts/ceos2/ceos.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2000, Atlantis Scientific Inc
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CEOS_H
diff --git a/frmts/ceos2/ceosrecipe.c b/frmts/ceos2/ceosrecipe.c
index 352bcaae5758..82a0960f6c12 100644
--- a/frmts/ceos2/ceosrecipe.c
+++ b/frmts/ceos2/ceosrecipe.c
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2000, Atlantis Scientific Inc
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ceos.h"
diff --git a/frmts/ceos2/ceossar.c b/frmts/ceos2/ceossar.c
index 03cd7d31e15c..405147b44089 100644
--- a/frmts/ceos2/ceossar.c
+++ b/frmts/ceos2/ceossar.c
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2000, Atlantis Scientific Inc
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ceos.h"
diff --git a/frmts/ceos2/link.c b/frmts/ceos2/link.c
index 472e4024f66b..769984cb23d6 100644
--- a/frmts/ceos2/link.c
+++ b/frmts/ceos2/link.c
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2000, Atlantis Scientific Inc
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ceos.h"
diff --git a/frmts/ceos2/sar_ceosdataset.cpp b/frmts/ceos2/sar_ceosdataset.cpp
index 545221838aa5..eb5347088eaf 100644
--- a/frmts/ceos2/sar_ceosdataset.cpp
+++ b/frmts/ceos2/sar_ceosdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2000, Atlantis Scientific Inc.
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ceos.h"
diff --git a/frmts/coasp/coasp_dataset.cpp b/frmts/coasp/coasp_dataset.cpp
index 562245774263..3db8b729a0cf 100644
--- a/frmts/coasp/coasp_dataset.cpp
+++ b/frmts/coasp/coasp_dataset.cpp
@@ -13,23 +13,7 @@
  * Copyright (c) 2007, Philippe Vachon
  * Copyright (c) 2009-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/frmts/cosar/cosar_dataset.cpp b/frmts/cosar/cosar_dataset.cpp
index f7494f47b79e..a136dbba39fd 100644
--- a/frmts/cosar/cosar_dataset.cpp
+++ b/frmts/cosar/cosar_dataset.cpp
@@ -1,23 +1,7 @@
 /* TerraSAR-X COSAR Format Driver
  * (C)2007 Philippe P. Vachon <philippe@cowpig.ca>
  * ---------------------------------------------------------------------------
- * 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.
+ * SPDX-License-Identifier: MIT
  */
 
 #include "cpl_conv.h"
diff --git a/frmts/ctg/ctgdataset.cpp b/frmts/ctg/ctgdataset.cpp
index d133cdf4f6e7..000ec386a5bb 100644
--- a/frmts/ctg/ctgdataset.cpp
+++ b/frmts/ctg/ctgdataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_frmts.h"
diff --git a/frmts/daas/daasdataset.cpp b/frmts/daas/daasdataset.cpp
index 3c8c566e66c6..c2d5e6778e2b 100644
--- a/frmts/daas/daasdataset.cpp
+++ b/frmts/daas/daasdataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018-2019, Airbus DS Intelligence
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_http.h"
@@ -1085,7 +1069,7 @@ void GDALDAASDataset::ReadRPCs(const CPLJSONObject &oProperties)
                 continue;
             }
             aoRPC.SetNameValue(asRPCSingleValues[i].pszGDALName,
-                               CPLSPrintf("%.18g", dfRPCVal));
+                               CPLSPrintf("%.17g", dfRPCVal));
         }
 
         const struct
@@ -1110,7 +1094,7 @@ void GDALDAASDataset::ReadRPCs(const CPLJSONObject &oProperties)
                 {
                     if (j > 0)
                         osVal += " ";
-                    osVal += CPLSPrintf("%.18g", oRPCArray[j].ToDouble());
+                    osVal += CPLSPrintf("%.17g", oRPCArray[j].ToDouble());
                 }
                 aoRPC.SetNameValue(asRPCArrayValues[i].pszGDALName,
                                    osVal.c_str());
@@ -2420,7 +2404,7 @@ CPLErr GDALDAASRasterBand::GetBlocks(int nBlockXOff, int nBlockYOff,
     }
     else
     {
-        CPLString osTmpMemFile = CPLSPrintf("/vsimem/daas_%p", this);
+        const CPLString osTmpMemFile = VSIMemGenerateHiddenFilename("daas");
         VSIFCloseL(VSIFileFromMemBuffer(
             osTmpMemFile, psResult->pasMimePart[iDataPart].pabyData,
             psResult->pasMimePart[iDataPart].nDataLen, false));
diff --git a/frmts/dds/crunch_headers.h b/frmts/dds/crunch_headers.h
index 0fef5f224fc4..70511bbf5aa7 100644
--- a/frmts/dds/crunch_headers.h
+++ b/frmts/dds/crunch_headers.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2019, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************
  */
 
diff --git a/frmts/dds/ddsdataset.cpp b/frmts/dds/ddsdataset.cpp
index 5c620f78ff0d..3e3a19e29081 100644
--- a/frmts/dds/ddsdataset.cpp
+++ b/frmts/dds/ddsdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2013, Alan Boudreault
  * Copyright (c) 2013,2019, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************/
 
 #include "crunch_headers.h"
diff --git a/frmts/dds/ddsdrivercore.cpp b/frmts/dds/ddsdrivercore.cpp
index f4a9a4bd3e63..6bbe7d8a0686 100644
--- a/frmts/dds/ddsdrivercore.cpp
+++ b/frmts/dds/ddsdrivercore.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2013, Alan Boudreault
  * Copyright (c) 2013,2019, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************/
 
 #include "ddsdrivercore.h"
diff --git a/frmts/dds/ddsdrivercore.h b/frmts/dds/ddsdrivercore.h
index 31f4274aafa1..fb79cb03ae0c 100644
--- a/frmts/dds/ddsdrivercore.h
+++ b/frmts/dds/ddsdrivercore.h
@@ -8,23 +8,7 @@
  * Copyright (c) 2013, Alan Boudreault
  * Copyright (c) 2013,2019, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************/
 
 #ifndef DDSDRIVERCORE_H
diff --git a/frmts/derived/deriveddataset.cpp b/frmts/derived/deriveddataset.cpp
index f73c2386de7f..bccbf31501db 100644
--- a/frmts/derived/deriveddataset.cpp
+++ b/frmts/derived/deriveddataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2016 Julien Michel <julien dot michel at cnes dot fr>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 #include "../vrt/vrtdataset.h"
 #include "gdal_pam.h"
diff --git a/frmts/derived/derivedlist.c b/frmts/derived/derivedlist.c
index 15f44373ea8a..6f004ef245e3 100644
--- a/frmts/derived/derivedlist.c
+++ b/frmts/derived/derivedlist.c
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2016 Julien Michel <julien dot michel at cnes dot fr>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 #include "derivedlist.h"
 #include "gdal.h"
diff --git a/frmts/derived/derivedlist.h b/frmts/derived/derivedlist.h
index 5c0885ebe9cf..b2de0cd10434 100644
--- a/frmts/derived/derivedlist.h
+++ b/frmts/derived/derivedlist.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2016 Julien Michel <julien dot michel at cnes dot fr>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 #ifndef DERIVEDLIST_H_INCLUDED
 #define DERIVEDLIST_H_INCLUDED
diff --git a/frmts/dimap/dimapdataset.cpp b/frmts/dimap/dimapdataset.cpp
index 9fe68c998b05..3f115d909446 100644
--- a/frmts/dimap/dimapdataset.cpp
+++ b/frmts/dimap/dimapdataset.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_minixml.h"
@@ -826,8 +810,8 @@ int DIMAPDataset::ReadImageInformation()
     /*      Try and open the file.                                          */
     /* -------------------------------------------------------------------- */
 
-    auto poImageDS =
-        std::unique_ptr<GDALDataset>(GDALDataset::Open(osImageFilename));
+    auto poImageDS = std::unique_ptr<GDALDataset>(GDALDataset::Open(
+        osImageFilename, GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR));
     if (poImageDS == nullptr)
     {
         return FALSE;
@@ -1233,8 +1217,8 @@ int DIMAPDataset::ReadImageInformation2()
     /* -------------------------------------------------------------------- */
     /*      Try and open the file.                                          */
     /* -------------------------------------------------------------------- */
-    auto poImageDS =
-        std::unique_ptr<GDALDataset>(GDALDataset::Open(osImageDSFilename));
+    auto poImageDS = std::unique_ptr<GDALDataset>(GDALDataset::Open(
+        osImageDSFilename, GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR));
     if (poImageDS == nullptr)
     {
         return FALSE;
diff --git a/frmts/drivers.ini b/frmts/drivers.ini
index 116fdab02b9d..2b8c78828b7f 100644
--- a/frmts/drivers.ini
+++ b/frmts/drivers.ini
@@ -12,8 +12,9 @@
 
 [order]
 VRT
-GTI
 Derived
+GTI
+SNAP_TIFF
 GTiff
 COG
 NITF
@@ -164,6 +165,7 @@ DAAS
 NULL
 SIGDEM
 EXR
+AVIF
 HEIF
 TGA
 OGCAPI
@@ -263,6 +265,7 @@ GTFS
 PMTiles
 JSONFG
 MiraMonVector
+XODR
 
 # Put TIGER and AVCBIN at end since they need poOpenInfo->GetSiblingFiles()
 Tiger
diff --git a/frmts/dted/dted_api.c b/frmts/dted/dted_api.c
index eadde1c76916..2cbe82c02506 100644
--- a/frmts/dted/dted_api.c
+++ b/frmts/dted/dted_api.c
@@ -9,23 +9,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2007-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "dted_api.h"
@@ -1009,6 +993,16 @@ static void DTEDGetMetadataLocation(DTEDInfo *psDInfo, DTEDMetaDataCode eCode,
             *pnLength = 2;
             break;
 
+        case DTEDMD_SECURITYCONTROL:
+            *ppszLocation = psDInfo->pachDSIRecord + 4;
+            *pnLength = 2;
+            break;
+
+        case DTEDMD_SECURITYHANDLING:
+            *ppszLocation = psDInfo->pachDSIRecord + 6;
+            *pnLength = 27;
+            break;
+
         default:
             *ppszLocation = NULL;
             *pnLength = 0;
diff --git a/frmts/dted/dted_api.h b/frmts/dted/dted_api.h
index 3d0fef89a134..3d7d61793f4a 100644
--- a/frmts/dted/dted_api.h
+++ b/frmts/dted/dted_api.h
@@ -9,23 +9,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2007-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef DTED_API_H_INCLUDED
@@ -194,7 +178,9 @@ typedef enum
     DTEDMD_ORIGINLAT = 21,         /* UHL 13+7 */
     DTEDMD_NIMA_DESIGNATOR = 22,   /* DSI 60 + 5 */
     DTEDMD_PARTIALCELL_DSI = 23,   /* DSI 289 + 2 */
-    DTEDMD_MAX = 23
+    DTEDMD_SECURITYCONTROL = 24,
+    DTEDMD_SECURITYHANDLING = 25,
+    DTEDMD_MAX = 25
 } DTEDMetaDataCode;
 
 char *DTEDGetMetadata(DTEDInfo *, DTEDMetaDataCode);
diff --git a/frmts/dted/dted_create.c b/frmts/dted/dted_create.c
index 288dd00bdd0f..47efd71fbc16 100644
--- a/frmts/dted/dted_create.c
+++ b/frmts/dted/dted_create.c
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2001, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "dted_api.h"
diff --git a/frmts/dted/dted_ptstream.c b/frmts/dted/dted_ptstream.c
index 08161adead73..6dbd11563652 100644
--- a/frmts/dted/dted_ptstream.c
+++ b/frmts/dted/dted_ptstream.c
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2001, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "dted_api.h"
diff --git a/frmts/dted/dted_test.c b/frmts/dted/dted_test.c
index 2508236de3ea..0ee60a4454f2 100644
--- a/frmts/dted/dted_test.c
+++ b/frmts/dted/dted_test.c
@@ -9,23 +9,7 @@
  * Copyright (c) 2001, Frank Warmerdam
  * Copyright (c) 2007, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #include "gdal.h"
diff --git a/frmts/dted/dteddataset.cpp b/frmts/dted/dteddataset.cpp
index 07cbc576f110..47cac394e5e9 100644
--- a/frmts/dted/dteddataset.cpp
+++ b/frmts/dted/dteddataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2007-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "dted_api.h"
@@ -464,6 +448,14 @@ GDALDataset *DTEDDataset::Open(GDALOpenInfo *poOpenInfo)
     poDS->SetMetadataItem("DTED_PartialCellIndicator", pszValue);
     CPLFree(pszValue);
 
+    pszValue = DTEDGetMetadata(psDTED, DTEDMD_SECURITYCONTROL);
+    poDS->SetMetadataItem("DTED_SecurityControl", pszValue);
+    CPLFree(pszValue);
+
+    pszValue = DTEDGetMetadata(psDTED, DTEDMD_SECURITYHANDLING);
+    poDS->SetMetadataItem("DTED_SecurityHandling", pszValue);
+    CPLFree(pszValue);
+
     poDS->SetMetadataItem(GDALMD_AREA_OR_POINT, GDALMD_AOP_POINT);
 
     /* -------------------------------------------------------------------- */
diff --git a/frmts/ecw/CMakeLists.txt b/frmts/ecw/CMakeLists.txt
index 8369bad2452a..97df2c59be75 100644
--- a/frmts/ecw/CMakeLists.txt
+++ b/frmts/ecw/CMakeLists.txt
@@ -1,3 +1,14 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/helpers/GdalCMakeMinimumRequired.cmake")
+cmake_minimum_required(VERSION ${GDAL_CMAKE_VERSION_MIN}...${GDAL_CMAKE_VERSION_MAX})
+
+if(NOT DEFINED PROJECT_SOURCE_DIR)
+    # Standalone plugin building
+    project(gdal_ECW_JP2ECW)
+    include("${PROJECT_SOURCE_DIR}/../../cmake/helpers/SetupStandalonePlugin.cmake" )
+    include(CheckDependentLibrariesECW)
+    standalone_driver_finalize(GDAL_ENABLE_DRIVER_ECW)
+endif()
+
 set(SOURCE ecwdataset.cpp ecwcreatecopy.cpp ecwasyncreader.cpp jp2userbox.cpp)
 add_gdal_driver(
   TARGET gdal_ECW_JP2ECW
diff --git a/frmts/ecw/driver_declaration.cmake b/frmts/ecw/driver_declaration.cmake
new file mode 100644
index 000000000000..6ddccd432f65
--- /dev/null
+++ b/frmts/ecw/driver_declaration.cmake
@@ -0,0 +1 @@
+gdal_dependent_format(ecw "ERDAS JPEG2000 (.jp2)" "GDAL_USE_ECW")
diff --git a/frmts/ecw/ecwasyncreader.cpp b/frmts/ecw/ecwasyncreader.cpp
index 21b9d764e40e..fcca60c4b778 100644
--- a/frmts/ecw/ecwasyncreader.cpp
+++ b/frmts/ecw/ecwasyncreader.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2011, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 // ncsjpcbuffer.h needs the min and max macros.
diff --git a/frmts/ecw/ecwcreatecopy.cpp b/frmts/ecw/ecwcreatecopy.cpp
index 39d91ddaf133..525bb65d9ad6 100644
--- a/frmts/ecw/ecwcreatecopy.cpp
+++ b/frmts/ecw/ecwcreatecopy.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2001, 2004, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 // ncsjpcbuffer.h needs the min and max macros.
@@ -1415,16 +1399,13 @@ static GDALDataset *ECWCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
     oCompressor.pProgressData = pProgressData;
     oCompressor.m_poSrcDS = poSrcDS;
 
-    if (!pfnProgress(0.0, nullptr, pProgressData))
-        return nullptr;
-
-    char **papszBandDescriptions = (char **)CPLMalloc(nBands * sizeof(char *));
+    CPLStringList aosBandDescriptions;
     for (int i = 0; i < nBands; i++)
     {
         /* Make a copy since ECWGetColorInterpretationName() can return a string
          * generated */
         /* by CPLSPrintf(), which has just a few rotating entries. */
-        papszBandDescriptions[i] = CPLStrdup(ECWGetColorInterpretationName(
+        aosBandDescriptions.AddString(ECWGetColorInterpretationName(
             poSrcDS->GetRasterBand(i + 1)->GetColorInterpretation(), i));
     }
 
@@ -1433,29 +1414,27 @@ static GDALDataset *ECWCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
         pszAreaOrPoint != nullptr && EQUAL(pszAreaOrPoint, GDALMD_AOP_POINT);
 
     if (oCompressor.Initialize(pszFilename, papszOptions, nXSize, nYSize,
-                               nBands, papszBandDescriptions, bRGBColorSpace,
-                               eType, poSRS, adfGeoTransform,
+                               nBands, aosBandDescriptions.List(),
+                               bRGBColorSpace, eType, poSRS, adfGeoTransform,
                                poSrcDS->GetGCPCount(), poSrcDS->GetGCPs(),
                                bIsJPEG2000, bPixelIsPoint,
                                poSrcDS->GetMetadata("RPC"), poSrcDS) != CE_None)
     {
-        for (int i = 0; i < nBands; i++)
-            CPLFree(papszBandDescriptions[i]);
-        CPLFree(papszBandDescriptions);
         return nullptr;
     }
 
     /* -------------------------------------------------------------------- */
     /*      Start the compression.                                          */
     /* -------------------------------------------------------------------- */
+
+    if (!pfnProgress(0.0, nullptr, pProgressData))
+        return nullptr;
+
     CNCSError oErr = oCompressor.Write();
 
     if (oErr.GetErrorNumber() != NCS_SUCCESS)
     {
         ECWReportError(oErr);
-        for (int i = 0; i < nBands; i++)
-            CPLFree(papszBandDescriptions[i]);
-        CPLFree(papszBandDescriptions);
         return nullptr;
     }
 
@@ -1463,9 +1442,6 @@ static GDALDataset *ECWCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
     /*      Cleanup, and return read-only handle.                           */
     /* -------------------------------------------------------------------- */
     oCompressor.CloseDown();
-    for (int i = 0; i < nBands; i++)
-        CPLFree(papszBandDescriptions[i]);
-    CPLFree(papszBandDescriptions);
     pfnProgress(1.001, nullptr, pProgressData);
 
     /* -------------------------------------------------------------------- */
diff --git a/frmts/ecw/ecwdataset.cpp b/frmts/ecw/ecwdataset.cpp
index ad52691f3750..3fe05508f654 100644
--- a/frmts/ecw/ecwdataset.cpp
+++ b/frmts/ecw/ecwdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2001, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 // ncsjpcbuffer.h needs the min and max macros.
@@ -40,6 +24,9 @@
 
 #include "ecwdrivercore.h"
 
+#include <algorithm>
+#include <cmath>
+
 #undef NOISY_DEBUG
 
 static CPLMutex *hECWDatasetMutex = nullptr;
@@ -47,7 +34,7 @@ static int bNCSInitialized = FALSE;
 
 void ECWInitialize(void);
 
-#define BLOCK_SIZE 256
+constexpr int DEFAULT_BLOCK_SIZE = 256;
 
 GDALDataset *ECWDatasetOpenJPEG2000(GDALOpenInfo *poOpenInfo);
 
@@ -85,8 +72,39 @@ ECWRasterBand::ECWRasterBand(ECWDataset *poDSIn, int nBandIn, int iOverviewIn,
     nRasterXSize = poDS->GetRasterXSize() / (1 << (iOverview + 1));
     nRasterYSize = poDS->GetRasterYSize() / (1 << (iOverview + 1));
 
-    nBlockXSize = BLOCK_SIZE;
-    nBlockYSize = BLOCK_SIZE;
+#if ECWSDK_VERSION >= 51
+    if (poDSIn->bIsJPEG2000 && poDSIn->poFileView)
+    {
+        UINT32 nTileWidth = 0;
+        poDSIn->poFileView->GetParameter(
+            const_cast<char *>("JPC:DECOMPRESS:TILESIZE:X"), &nTileWidth);
+        if (nTileWidth <= static_cast<UINT32>(INT_MAX))
+        {
+            nBlockXSize = static_cast<int>(nTileWidth);
+        }
+        nBlockXSize = std::min(nBlockXSize, nRasterXSize);
+
+        UINT32 nTileHeight = 0;
+        poDSIn->poFileView->GetParameter(
+            const_cast<char *>("JPC:DECOMPRESS:TILESIZE:Y"), &nTileHeight);
+        if (nTileHeight <= static_cast<UINT32>(INT_MAX))
+        {
+            nBlockYSize = static_cast<int>(nTileHeight);
+        }
+        nBlockYSize = std::min(nBlockYSize, nRasterYSize);
+    }
+#endif
+
+    // Slightly arbitrary value. Too large values would defeat the purpose
+    // of the block concept.
+    constexpr int LIMIT_FOR_BLOCK_SIZE = 2048;
+    if (nBlockXSize <= 0 || nBlockYSize <= 0 ||
+        nBlockXSize > LIMIT_FOR_BLOCK_SIZE ||
+        nBlockYSize > LIMIT_FOR_BLOCK_SIZE)
+    {
+        nBlockXSize = DEFAULT_BLOCK_SIZE;
+        nBlockYSize = DEFAULT_BLOCK_SIZE;
+    }
 
     /* -------------------------------------------------------------------- */
     /*      Work out band color interpretation.                             */
@@ -2848,10 +2866,11 @@ GDALDataset *ECWDataset::Open(GDALOpenInfo *poOpenInfo, int bIsJPEG2000)
 /*      There are issues at least in the 5.x series.                    */
 /* -------------------------------------------------------------------- */
 #if ECWSDK_VERSION >= 40
+    constexpr const char *szDETECT_BUG_FILENAME =
+        "__detect_ecw_uint32_bug__.j2k";
     if (bIsJPEG2000 && poDS->eNCSRequestDataType == NCSCT_UINT32 &&
         CPLTestBool(CPLGetConfigOption("ECW_CHECK_CORRECT_DECODING", "TRUE")) &&
-        !STARTS_WITH_CI(poOpenInfo->pszFilename,
-                        "/vsimem/detect_ecw_uint32_bug"))
+        strstr(poOpenInfo->pszFilename, szDETECT_BUG_FILENAME) == nullptr)
     {
         static bool bUINT32_Ok = false;
         {
@@ -2876,7 +2895,7 @@ GDALDataset *ECWDataset::Open(GDALOpenInfo *poOpenInfo, int bIsJPEG2000)
                     0xDF, 0xFF, 0x7F, 0x5F, 0xFF, 0xD9};
 
                 const std::string osTmpFilename =
-                    CPLSPrintf("/vsimem/detect_ecw_uint32_bug_%p.j2k", poDS);
+                    VSIMemGenerateHiddenFilename(szDETECT_BUG_FILENAME);
                 VSIFCloseL(VSIFileFromMemBuffer(
                     osTmpFilename.c_str(),
                     const_cast<GByte *>(abyTestUInt32ImageData),
@@ -3185,7 +3204,7 @@ GDALDataset *ECWDataset::Open(GDALOpenInfo *poOpenInfo, int bIsJPEG2000)
     /*      Initialize any PAM information.                                 */
     /* -------------------------------------------------------------------- */
     poDS->SetDescription(osFilename);
-    poDS->TryLoadXML();
+    poDS->TryLoadXML(poOpenInfo->GetSiblingFiles());
 
     /* -------------------------------------------------------------------- */
     /*      Vector layers                                                   */
diff --git a/frmts/ecw/ecwdrivercore.cpp b/frmts/ecw/ecwdrivercore.cpp
index 3fa405a82418..ec48d73a8113 100644
--- a/frmts/ecw/ecwdrivercore.cpp
+++ b/frmts/ecw/ecwdrivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault, <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 // ncsjpcbuffer.h needs the min and max macros.
diff --git a/frmts/ecw/ecwdrivercore.h b/frmts/ecw/ecwdrivercore.h
index dedc043a0ac0..eb5d79ff1c46 100644
--- a/frmts/ecw/ecwdrivercore.h
+++ b/frmts/ecw/ecwdrivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault, <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef ECWDRIVERCORE_H
diff --git a/frmts/ecw/ecwsdk_headers.h b/frmts/ecw/ecwsdk_headers.h
index b2218deb36b5..e9e390819dbb 100644
--- a/frmts/ecw/ecwsdk_headers.h
+++ b/frmts/ecw/ecwsdk_headers.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef ECWSDK_HEADERS_H
diff --git a/frmts/ecw/gdal_ecw.h b/frmts/ecw/gdal_ecw.h
index b60aa3ccc314..a6eed743c0bf 100644
--- a/frmts/ecw/gdal_ecw.h
+++ b/frmts/ecw/gdal_ecw.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2001-2011, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_ECW_H_INCLUDED
diff --git a/frmts/ecw/jp2userbox.cpp b/frmts/ecw/jp2userbox.cpp
index 4a2d12a6462d..e5effa0191d4 100644
--- a/frmts/ecw/jp2userbox.cpp
+++ b/frmts/ecw/jp2userbox.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 // ncsjpcbuffer.h needs the min and max macros.
diff --git a/frmts/ecw/lookup.py b/frmts/ecw/lookup.py
index a2710d28fffb..a8a3d1d7693f 100644
--- a/frmts/ecw/lookup.py
+++ b/frmts/ecw/lookup.py
@@ -9,23 +9,7 @@
 # ******************************************************************************
 #  Copyright (c) 2003, Frank Warmerdam
 #
-#  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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import osr
diff --git a/frmts/eeda/CMakeLists.txt b/frmts/eeda/CMakeLists.txt
index 716ae8385688..d531229bb5b6 100644
--- a/frmts/eeda/CMakeLists.txt
+++ b/frmts/eeda/CMakeLists.txt
@@ -8,7 +8,6 @@ add_gdal_driver(
           "NOT GDAL_USE_JSONC_INTERNAL"
           NO_DEPS)
 gdal_standard_includes(gdal_EEDA)
-target_include_directories(gdal_EEDA PRIVATE $<TARGET_PROPERTY:ogr_geojson,SOURCE_DIR>)
 
 set(GDAL_DATA_FILES
     LICENSE.TXT
diff --git a/frmts/eeda/eeda.h b/frmts/eeda/eeda.h
index c2cfcaec55e7..02cc091a1cf5 100644
--- a/frmts/eeda/eeda.h
+++ b/frmts/eeda/eeda.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2017-2018, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef EEDA_H_INCLUDED
diff --git a/frmts/eeda/eedacommon.cpp b/frmts/eeda/eedacommon.cpp
index 0ba2c6a82492..91832dc5fa0b 100644
--- a/frmts/eeda/eedacommon.cpp
+++ b/frmts/eeda/eedacommon.cpp
@@ -7,28 +7,12 @@
  ******************************************************************************
  * Copyright (c) 2017-2018, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_http.h"
 #include "eeda.h"
-#include "ogrgeojsonreader.h"
+#include "ogrlibjsonutils.h"
 
 #include <stdlib.h>
 #include <limits>
@@ -386,8 +370,15 @@ char **GDALEEDABaseDataset::GetBaseHTTPOptions()
                 }
             }
 
-            CPLString osServiceAccountJson(
-                CPLGetConfigOption("GOOGLE_APPLICATION_CREDENTIALS", ""));
+            CPLString osServiceAccountJson;
+            const char *pszVSIPath =
+                CSLFetchNameValue(papszOpenOptions, "VSI_PATH_FOR_AUTH");
+            if (pszVSIPath)
+                osServiceAccountJson = VSIGetPathSpecificOption(
+                    pszVSIPath, "GOOGLE_APPLICATION_CREDENTIALS", "");
+            if (osServiceAccountJson.empty())
+                osServiceAccountJson =
+                    CPLGetConfigOption("GOOGLE_APPLICATION_CREDENTIALS", "");
             if (!osServiceAccountJson.empty())
             {
                 CPLJSONDocument oDoc;
@@ -443,7 +434,8 @@ char **GDALEEDABaseDataset::GetBaseHTTPOptions()
                          "Missing EEDA_BEARER, EEDA_BEARER_FILE or "
                          "GOOGLE_APPLICATION_CREDENTIALS or "
                          "EEDA_PRIVATE_KEY/EEDA_PRIVATE_KEY_FILE + "
-                         "EEDA_CLIENT_EMAIL config option");
+                         "EEDA_CLIENT_EMAIL config option or "
+                         "VSI_PATH_FOR_AUTH open option");
                 CSLDestroy(papszOptions);
                 return nullptr;
             }
diff --git a/frmts/eeda/eedadataset.cpp b/frmts/eeda/eedadataset.cpp
index 2742cbb93f93..2053415bf6c8 100644
--- a/frmts/eeda/eedadataset.cpp
+++ b/frmts/eeda/eedadataset.cpp
@@ -7,30 +7,14 @@
  ******************************************************************************
  * Copyright (c) 2017-2018, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_priv.h"
+#include "ogrsf_frmts.h"
 #include "cpl_http.h"
 #include "cpl_conv.h"
-#include "ogrgeojsonreader.h"
-#include "ogrgeojsonwriter.h"
+#include "ogrlibjsonutils.h"
 #include "ogr_swq.h"
 #include "eeda.h"
 
@@ -799,7 +783,7 @@ CPLString GDALEEDALayer::BuildFilter(swq_expr_node *poNode, bool bIsAndTopLevel)
         else if (poNode->papoSubExpr[1]->field_type == SWQ_FLOAT)
         {
             osFilter +=
-                CPLSPrintf("%.18g", poNode->papoSubExpr[1]->float_value);
+                CPLSPrintf("%.17g", poNode->papoSubExpr[1]->float_value);
         }
         else
         {
@@ -890,7 +874,7 @@ CPLString GDALEEDALayer::BuildFilter(swq_expr_node *poNode, bool bIsAndTopLevel)
             else if (poNode->papoSubExpr[i]->field_type == SWQ_FLOAT)
             {
                 osFilter +=
-                    CPLSPrintf("%.18g", poNode->papoSubExpr[i]->float_value);
+                    CPLSPrintf("%.17g", poNode->papoSubExpr[i]->float_value);
             }
             else
             {
@@ -1245,11 +1229,16 @@ void GDALRegister_EEDA()
     poDriver->SetMetadataItem(GDAL_DMD_LONGNAME, "Earth Engine Data API");
     poDriver->SetMetadataItem(GDAL_DMD_HELPTOPIC, "drivers/vector/eeda.html");
     poDriver->SetMetadataItem(GDAL_DMD_CONNECTION_PREFIX, "EEDA:");
-    poDriver->SetMetadataItem(GDAL_DMD_OPENOPTIONLIST,
-                              "<OpenOptionList>"
-                              "  <Option name='COLLECTION' type='string' "
-                              "description='Collection name'/>"
-                              "</OpenOptionList>");
+    poDriver->SetMetadataItem(
+        GDAL_DMD_OPENOPTIONLIST,
+        "<OpenOptionList>"
+        "  <Option name='COLLECTION' type='string' "
+        "description='Collection name'/>"
+        "  <Option name='VSI_PATH_FOR_AUTH' type='string' "
+        "description='/vsigs/... path onto which a "
+        "GOOGLE_APPLICATION_CREDENTIALS path specific "
+        "option is set'/>"
+        "</OpenOptionList>");
 
     poDriver->pfnOpen = GDALEEDAOpen;
     poDriver->pfnIdentify = GDALEEDAdentify;
diff --git a/frmts/eeda/eedaidataset.cpp b/frmts/eeda/eedaidataset.cpp
index 9a6c41be78b8..23d5ba99d17b 100644
--- a/frmts/eeda/eedaidataset.cpp
+++ b/frmts/eeda/eedaidataset.cpp
@@ -7,30 +7,13 @@
  ******************************************************************************
  * Copyright (c) 2017-2018, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_priv.h"
 #include "cpl_http.h"
 #include "cpl_conv.h"
-#include "ogrgeojsonreader.h"
-#include "ogrgeojsonwriter.h"
+#include "ogrlibjsonutils.h"
 #include "eeda.h"
 
 #include <algorithm>
@@ -433,7 +416,7 @@ bool GDALEEDAIRasterBand::DecodeGDALDataset(const GByte *pabyData, int nDataLen,
 {
     GDALEEDAIDataset *poGDS = reinterpret_cast<GDALEEDAIDataset *>(poDS);
 
-    CPLString osTmpFilename(CPLSPrintf("/vsimem/eeai/%p", this));
+    const CPLString osTmpFilename(VSIMemGenerateHiddenFilename("eedai"));
     VSIFCloseL(VSIFileFromMemBuffer(
         osTmpFilename, const_cast<GByte *>(pabyData), nDataLen, false));
     const char *const apszDrivers[] = {"PNG", "JPEG", "GTIFF", nullptr};
@@ -1558,6 +1541,10 @@ void GDALRegister_EEDAI()
         "   </Option>"
         "  <Option name='BLOCK_SIZE' type='integer' "
         "description='Size of a block' default='256'/>"
+        "  <Option name='VSI_PATH_FOR_AUTH' type='string' "
+        "description='/vsigs/... path onto which a "
+        "GOOGLE_APPLICATION_CREDENTIALS path specific "
+        "option is set'/>"
         "</OpenOptionList>");
     poDriver->SetMetadataItem(GDAL_DMD_SUBDATASETS, "YES");
 
diff --git a/frmts/elas/elasdataset.cpp b/frmts/elas/elasdataset.cpp
index 0fca36bcfa0a..b7b356aca140 100644
--- a/frmts/elas/elasdataset.cpp
+++ b/frmts/elas/elasdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2008-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_frmts.h"
diff --git a/frmts/envisat/EnvisatFile.c b/frmts/envisat/EnvisatFile.c
index 177a4c48518d..f1d5b4de5dc7 100644
--- a/frmts/envisat/EnvisatFile.c
+++ b/frmts/envisat/EnvisatFile.c
@@ -9,23 +9,7 @@
  * Copyright (c) 2001, Atlantis Scientific, Inc.
  * Copyright (c) 2010-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/frmts/envisat/EnvisatFile.h b/frmts/envisat/EnvisatFile.h
index 9bfefa692358..c4797377dc02 100644
--- a/frmts/envisat/EnvisatFile.h
+++ b/frmts/envisat/EnvisatFile.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2001, Atlantis Scientific, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef ENVISAT_FILE_H_
diff --git a/frmts/envisat/adsrange.cpp b/frmts/envisat/adsrange.cpp
index 37d988a6f2e3..1b1dd00f6745 100644
--- a/frmts/envisat/adsrange.cpp
+++ b/frmts/envisat/adsrange.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2013, EOX IT Services, GmbH
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #include "adsrange.hpp"
diff --git a/frmts/envisat/adsrange.hpp b/frmts/envisat/adsrange.hpp
index 68dc47ee6692..9dc8c96b9868 100644
--- a/frmts/envisat/adsrange.hpp
+++ b/frmts/envisat/adsrange.hpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2013, EOX IT Services, GmbH
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef adsrange_hpp
diff --git a/frmts/envisat/dumpgeo.c b/frmts/envisat/dumpgeo.c
index a79df7abbfd3..e89adc345186 100644
--- a/frmts/envisat/dumpgeo.c
+++ b/frmts/envisat/dumpgeo.c
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2001, Atlantis Scientific, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/frmts/envisat/envisat_dump.c b/frmts/envisat/envisat_dump.c
index 29a6799e2993..083fbd575eb6 100644
--- a/frmts/envisat/envisat_dump.c
+++ b/frmts/envisat/envisat_dump.c
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2001, Atlantis Scientific, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/frmts/envisat/envisatdataset.cpp b/frmts/envisat/envisatdataset.cpp
index 8a8f44a7fc24..d0b866b18f82 100644
--- a/frmts/envisat/envisatdataset.cpp
+++ b/frmts/envisat/envisatdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2001, Atlantis Scientific, Inc.
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "adsrange.hpp"
diff --git a/frmts/envisat/records.c b/frmts/envisat/records.c
index 59499ed7115f..e2d50cefbff0 100644
--- a/frmts/envisat/records.c
+++ b/frmts/envisat/records.c
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Antonio Valentino
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/frmts/envisat/records.h b/frmts/envisat/records.h
index 59d630a644f8..3b12745239c9 100644
--- a/frmts/envisat/records.h
+++ b/frmts/envisat/records.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Antonio Valentino
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef RECORDS_H_
diff --git a/frmts/envisat/timedelta.hpp b/frmts/envisat/timedelta.hpp
index 74dd2dae3a83..4ecbc50b48c5 100644
--- a/frmts/envisat/timedelta.hpp
+++ b/frmts/envisat/timedelta.hpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2013, EOX IT Services, GmbH
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef timedelta_hpp
diff --git a/frmts/envisat/unwrapgcps.cpp b/frmts/envisat/unwrapgcps.cpp
index 7cd09a5dfb1d..a01cbc961b60 100644
--- a/frmts/envisat/unwrapgcps.cpp
+++ b/frmts/envisat/unwrapgcps.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2013, EOX IT Services, GmbH
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal.h"
diff --git a/frmts/ers/ersdataset.cpp b/frmts/ers/ersdataset.cpp
index d83ed19b4251..4834e6057486 100644
--- a/frmts/ers/ersdataset.cpp
+++ b/frmts/ers/ersdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/frmts/ers/ershdrnode.cpp b/frmts/ers/ershdrnode.cpp
index 3fe2e6b6de04..81effb3e0f9d 100644
--- a/frmts/ers/ershdrnode.cpp
+++ b/frmts/ers/ershdrnode.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/frmts/esric/esric_dataset.cpp b/frmts/esric/esric_dataset.cpp
index 52880d6875a1..fe76926b5754 100644
--- a/frmts/esric/esric_dataset.cpp
+++ b/frmts/esric/esric_dataset.cpp
@@ -10,23 +10,7 @@
  *
  *  Copyright 2020 Esri
  *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this softwareand 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 noticeand 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #include "gdal_priv.h"
@@ -34,6 +18,8 @@
 #include <vector>
 #include <algorithm>
 #include "cpl_json.h"
+#include "gdal_proxy.h"
+#include "gdal_utils.h"
 
 using namespace std;
 
@@ -200,6 +186,8 @@ class ECDataset final : public GDALDataset
     }
 
     static GDALDataset *Open(GDALOpenInfo *poOpenInfo);
+    static GDALDataset *Open(GDALOpenInfo *poOpenInfo,
+                             const char *pszDescription);
 
   protected:
     double GeoTransform[6];
@@ -216,9 +204,13 @@ class ECDataset final : public GDALDataset
     CPLErr InitializeFromJSON(const CPLJSONObject &oRoot);
     CPLString compression;
     std::vector<double> resolutions;
+    int m_nMinLOD = 0;
     OGRSpatialReference oSRS;
     std::vector<GByte> tilebuffer;  // Last read tile, decompressed
     std::vector<GByte> filebuffer;  // raw tile buffer
+
+    OGREnvelope m_sInitialExtent{};
+    OGREnvelope m_sFullExtent{};
 };
 
 class ECBand final : public GDALRasterBand
@@ -280,6 +272,8 @@ CPLErr ECDataset::Initialize(CPLXMLNode *CacheInfo)
         TSZ = static_cast<int>(CPLAtof(CPLGetXMLValue(TCI, "TileCols", "256")));
         if (TSZ != CPLAtof(CPLGetXMLValue(TCI, "TileRows", "256")))
             throw CPLString("Non-square tiles are not supported");
+        if (TSZ < 0 || TSZ > 8192)
+            throw CPLString("Unsupported TileCols value");
 
         CPLXMLNode *LODInfo = CPLGetXMLNode(TCI, "LODInfos.LODInfo");
         double res = 0;
@@ -352,6 +346,58 @@ CPLErr ECDataset::Initialize(CPLXMLNode *CacheInfo)
     return error;
 }
 
+static std::unique_ptr<OGRSpatialReference>
+CreateSRS(const CPLJSONObject &oSRSRoot)
+{
+    auto poSRS = std::make_unique<OGRSpatialReference>();
+
+    bool bSuccess = false;
+    const int nCode = oSRSRoot.GetInteger("wkid");
+    // The concept of LatestWKID is explained in
+    // https://support.esri.com/en/technical-article/000013950
+    const int nLatestCode = oSRSRoot.GetInteger("latestWkid");
+
+    // Try first with nLatestWKID as there is a higher chance it is a
+    // EPSG code and not an ESRI one.
+    if (nLatestCode > 0)
+    {
+        if (nLatestCode > 32767)
+        {
+            if (poSRS->SetFromUserInput(CPLSPrintf("ESRI:%d", nLatestCode)) ==
+                OGRERR_NONE)
+            {
+                bSuccess = true;
+            }
+        }
+        else if (poSRS->importFromEPSG(nLatestCode) == OGRERR_NONE)
+        {
+            bSuccess = true;
+        }
+    }
+    if (!bSuccess && nCode > 0)
+    {
+        if (nCode > 32767)
+        {
+            if (poSRS->SetFromUserInput(CPLSPrintf("ESRI:%d", nCode)) ==
+                OGRERR_NONE)
+            {
+                bSuccess = true;
+            }
+        }
+        else if (poSRS->importFromEPSG(nCode) == OGRERR_NONE)
+        {
+            bSuccess = true;
+        }
+    }
+    if (!bSuccess)
+    {
+        return nullptr;
+    }
+
+    poSRS->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+    return poSRS;
+}
+
 CPLErr ECDataset::InitializeFromJSON(const CPLJSONObject &oRoot)
 {
     CPLErr error = CE_None;
@@ -367,20 +413,23 @@ CPLErr ECDataset::InitializeFromJSON(const CPLJSONObject &oRoot)
         TSZ = oRoot.GetInteger("tileInfo/rows");
         if (TSZ != oRoot.GetInteger("tileInfo/cols"))
             throw CPLString("Non-square tiles are not supported");
+        if (TSZ < 0 || TSZ > 8192)
+            throw CPLString("Unsupported tileInfo/rows value");
 
-        auto oLODs = oRoot.GetArray("tileInfo/lods");
+        const auto oLODs = oRoot.GetArray("tileInfo/lods");
         double res = 0;
         // we need to skip levels that don't have bundle files
-        int minLOD = oRoot.GetInteger("minLOD");
-        int maxLOD = oRoot.GetInteger("maxLOD");
-        int level = 0;
+        m_nMinLOD = oRoot.GetInteger("minLOD");
+        if (m_nMinLOD < 0 || m_nMinLOD >= 31)
+            throw CPLString("Invalid minLOD");
+        const int maxLOD = std::min(oRoot.GetInteger("maxLOD"), 31);
         for (const auto &oLOD : oLODs)
         {
             res = oLOD.GetDouble("resolution");
             if (!(res > 0))
                 throw CPLString("Can't parse resolution for LOD");
-            level = oLOD.GetInteger("level");
-            if (level >= minLOD && level <= maxLOD)
+            const int level = oLOD.GetInteger("level");
+            if (level >= m_nMinLOD && level <= maxLOD)
             {
                 resolutions.push_back(res);
             }
@@ -389,50 +438,14 @@ CPLErr ECDataset::InitializeFromJSON(const CPLJSONObject &oRoot)
         if (resolutions.empty())
             throw CPLString("Can't parse lods");
 
-        bool bSuccess = false;
-        const int nCode = oRoot.GetInteger("spatialReference/wkid");
-        // The concept of LatestWKID is explained in
-        // https://support.esri.com/en/technical-article/000013950
-        const int nLatestCode = oRoot.GetInteger("spatialReference/latestWkid");
-
-        // Try first with nLatestWKID as there is a higher chance it is a
-        // EPSG code and not an ESRI one.
-        if (nLatestCode > 0)
         {
-            if (nLatestCode > 32767)
+            auto poSRS = CreateSRS(oRoot.GetObj("spatialReference"));
+            if (!poSRS)
             {
-                if (oSRS.SetFromUserInput(CPLSPrintf("ESRI:%d", nLatestCode)) ==
-                    OGRERR_NONE)
-                {
-                    bSuccess = true;
-                }
-            }
-            else if (oSRS.importFromEPSG(nLatestCode) == OGRERR_NONE)
-            {
-                bSuccess = true;
+                throw CPLString("Invalid Spatial Reference");
             }
+            oSRS = std::move(*poSRS);
         }
-        if (!bSuccess && nCode > 0)
-        {
-            if (nCode > 32767)
-            {
-                if (oSRS.SetFromUserInput(CPLSPrintf("ESRI:%d", nCode)) ==
-                    OGRERR_NONE)
-                {
-                    bSuccess = true;
-                }
-            }
-            else if (oSRS.importFromEPSG(nCode) == OGRERR_NONE)
-            {
-                bSuccess = true;
-            }
-        }
-        if (!bSuccess)
-        {
-            throw CPLString("Invalid Spatial Reference");
-        }
-
-        oSRS.SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
 
         // resolution is the smallest figure
         res = resolutions[0];
@@ -460,6 +473,59 @@ CPLErr ECDataset::InitializeFromJSON(const CPLJSONObject &oRoot)
         compression = oRoot.GetString("tileImageInfo/format");
         SetMetadataItem("COMPRESS", compression.c_str(), "IMAGE_STRUCTURE");
 
+        auto oInitialExtent = oRoot.GetObj("initialExtent");
+        if (oInitialExtent.IsValid() &&
+            oInitialExtent.GetType() == CPLJSONObject::Type::Object)
+        {
+            m_sInitialExtent.MinX = oInitialExtent.GetDouble("xmin");
+            m_sInitialExtent.MinY = oInitialExtent.GetDouble("ymin");
+            m_sInitialExtent.MaxX = oInitialExtent.GetDouble("xmax");
+            m_sInitialExtent.MaxY = oInitialExtent.GetDouble("ymax");
+            auto oSRSRoot = oInitialExtent.GetObj("spatialReference");
+            if (oSRSRoot.IsValid())
+            {
+                auto poSRS = CreateSRS(oSRSRoot);
+                if (!poSRS)
+                {
+                    throw CPLString(
+                        "Invalid Spatial Reference in initialExtent");
+                }
+                if (!poSRS->IsSame(&oSRS))
+                {
+                    CPLError(CE_Warning, CPLE_AppDefined,
+                             "Ignoring initialExtent, because its SRS is "
+                             "different from the main one");
+                    m_sInitialExtent = OGREnvelope();
+                }
+            }
+        }
+
+        auto oFullExtent = oRoot.GetObj("fullExtent");
+        if (oFullExtent.IsValid() &&
+            oFullExtent.GetType() == CPLJSONObject::Type::Object)
+        {
+            m_sFullExtent.MinX = oFullExtent.GetDouble("xmin");
+            m_sFullExtent.MinY = oFullExtent.GetDouble("ymin");
+            m_sFullExtent.MaxX = oFullExtent.GetDouble("xmax");
+            m_sFullExtent.MaxY = oFullExtent.GetDouble("ymax");
+            auto oSRSRoot = oFullExtent.GetObj("spatialReference");
+            if (oSRSRoot.IsValid())
+            {
+                auto poSRS = CreateSRS(oSRSRoot);
+                if (!poSRS)
+                {
+                    throw CPLString("Invalid Spatial Reference in fullExtent");
+                }
+                if (!poSRS->IsSame(&oSRS))
+                {
+                    CPLError(CE_Warning, CPLE_AppDefined,
+                             "Ignoring fullExtent, because its SRS is "
+                             "different from the main one");
+                    m_sFullExtent = OGREnvelope();
+                }
+            }
+        }
+
         nBands = EQUAL(compression, "JPEG") ? 3 : 4;
         for (int i = 1; i <= nBands; i++)
         {
@@ -482,7 +548,71 @@ CPLErr ECDataset::InitializeFromJSON(const CPLJSONObject &oRoot)
     return error;
 }
 
+class ESRICProxyRasterBand final : public GDALProxyRasterBand
+{
+  private:
+    GDALRasterBand *m_poUnderlyingBand = nullptr;
+
+  protected:
+    GDALRasterBand *RefUnderlyingRasterBand(bool /*bForceOpen*/) const override
+    {
+        return m_poUnderlyingBand;
+    }
+
+  public:
+    explicit ESRICProxyRasterBand(GDALRasterBand *poUnderlyingBand)
+        : m_poUnderlyingBand(poUnderlyingBand)
+    {
+        nBand = poUnderlyingBand->GetBand();
+        eDataType = poUnderlyingBand->GetRasterDataType();
+        nRasterXSize = poUnderlyingBand->GetXSize();
+        nRasterYSize = poUnderlyingBand->GetYSize();
+        poUnderlyingBand->GetBlockSize(&nBlockXSize, &nBlockYSize);
+    }
+};
+
+class ESRICProxyDataset final : public GDALProxyDataset
+{
+  private:
+    std::unique_ptr<GDALDataset> m_poUnderlyingDS{};
+    CPLStringList m_aosFileList{};
+
+  protected:
+    GDALDataset *RefUnderlyingDataset() const override
+    {
+        return m_poUnderlyingDS.get();
+    }
+
+  public:
+    ESRICProxyDataset(GDALDataset *poUnderlyingDS, const char *pszDescription)
+        : m_poUnderlyingDS(poUnderlyingDS)
+    {
+        nRasterXSize = poUnderlyingDS->GetRasterXSize();
+        nRasterYSize = poUnderlyingDS->GetRasterYSize();
+        for (int i = 0; i < poUnderlyingDS->GetRasterCount(); ++i)
+            SetBand(i + 1, new ESRICProxyRasterBand(
+                               poUnderlyingDS->GetRasterBand(i + 1)));
+        m_aosFileList.AddString(pszDescription);
+    }
+
+    GDALDriver *GetDriver() override
+    {
+        return GDALDriver::FromHandle(GDALGetDriverByName("ESRIC"));
+    }
+
+    char **GetFileList() override
+    {
+        return CSLDuplicate(m_aosFileList.List());
+    }
+};
+
 GDALDataset *ECDataset::Open(GDALOpenInfo *poOpenInfo)
+{
+    return Open(poOpenInfo, poOpenInfo->pszFilename);
+}
+
+GDALDataset *ECDataset::Open(GDALOpenInfo *poOpenInfo,
+                             const char *pszDescription)
 {
     if (IdentifyXML(poOpenInfo))
     {
@@ -523,10 +653,8 @@ GDALDataset *ECDataset::Open(GDALOpenInfo *poOpenInfo)
                                     poOpenInfo->pszFilename + "}/root.json")
                                        .c_str(),
                                    GA_ReadOnly);
-            auto poDS = Open(&oOpenInfo);
-            if (poDS)
-                poDS->SetDescription(poOpenInfo->pszFilename);
-            return poDS;
+            oOpenInfo.papszOpenOptions = poOpenInfo->papszOpenOptions;
+            return Open(&oOpenInfo, pszDescription);
         }
 
         CPLJSONDocument oJSONDocument;
@@ -544,7 +672,7 @@ GDALDataset *ECDataset::Open(GDALOpenInfo *poOpenInfo)
             return nullptr;
         }
 
-        auto ds = new ECDataset();
+        auto ds = std::make_unique<ECDataset>();
         auto tileBundlesPath = oRoot.GetString("tileBundlesPath");
         // Strip leading relative path indicator (if present)
         if (tileBundlesPath.substr(0, 2) == "./")
@@ -557,10 +685,76 @@ GDALDataset *ECDataset::Open(GDALOpenInfo *poOpenInfo)
         CPLErr error = ds->InitializeFromJSON(oRoot);
         if (CE_None != error)
         {
-            delete ds;
-            ds = nullptr;
+            return nullptr;
         }
-        return ds;
+
+        const bool bIsFullExtentValid =
+            (ds->m_sFullExtent.IsInit() &&
+             ds->m_sFullExtent.MinX < ds->m_sFullExtent.MaxX &&
+             ds->m_sFullExtent.MinY < ds->m_sFullExtent.MaxY);
+        const char *pszExtentSource =
+            CSLFetchNameValue(poOpenInfo->papszOpenOptions, "EXTENT_SOURCE");
+
+        CPLStringList aosOptions;
+        if ((!pszExtentSource && bIsFullExtentValid) ||
+            (pszExtentSource && EQUAL(pszExtentSource, "FULL_EXTENT")))
+        {
+            if (!bIsFullExtentValid)
+            {
+                CPLError(CE_Failure, CPLE_AppDefined,
+                         "fullExtent is not valid");
+                return nullptr;
+            }
+            aosOptions.AddString("-projwin");
+            aosOptions.AddString(CPLSPrintf("%.17g", ds->m_sFullExtent.MinX));
+            aosOptions.AddString(CPLSPrintf("%.17g", ds->m_sFullExtent.MaxY));
+            aosOptions.AddString(CPLSPrintf("%.17g", ds->m_sFullExtent.MaxX));
+            aosOptions.AddString(CPLSPrintf("%.17g", ds->m_sFullExtent.MinY));
+        }
+        else if (pszExtentSource && EQUAL(pszExtentSource, "INITIAL_EXTENT"))
+        {
+            const bool bIsInitialExtentValid =
+                (ds->m_sInitialExtent.IsInit() &&
+                 ds->m_sInitialExtent.MinX < ds->m_sInitialExtent.MaxX &&
+                 ds->m_sInitialExtent.MinY < ds->m_sInitialExtent.MaxY);
+            if (!bIsInitialExtentValid)
+            {
+                CPLError(CE_Failure, CPLE_AppDefined,
+                         "initialExtent is not valid");
+                return nullptr;
+            }
+            aosOptions.AddString("-projwin");
+            aosOptions.AddString(
+                CPLSPrintf("%.17g", ds->m_sInitialExtent.MinX));
+            aosOptions.AddString(
+                CPLSPrintf("%.17g", ds->m_sInitialExtent.MaxY));
+            aosOptions.AddString(
+                CPLSPrintf("%.17g", ds->m_sInitialExtent.MaxX));
+            aosOptions.AddString(
+                CPLSPrintf("%.17g", ds->m_sInitialExtent.MinY));
+        }
+
+        if (!aosOptions.empty())
+        {
+            aosOptions.AddString("-of");
+            aosOptions.AddString("VRT");
+            aosOptions.AddString("-co");
+            aosOptions.AddString(CPLSPrintf("BLOCKXSIZE=%d", ds->TSZ));
+            aosOptions.AddString("-co");
+            aosOptions.AddString(CPLSPrintf("BLOCKYSIZE=%d", ds->TSZ));
+            auto psOptions =
+                GDALTranslateOptionsNew(aosOptions.List(), nullptr);
+            auto hDS = GDALTranslate("", GDALDataset::ToHandle(ds.release()),
+                                     psOptions, nullptr);
+            GDALTranslateOptionsFree(psOptions);
+            if (!hDS)
+            {
+                return nullptr;
+            }
+            return new ESRICProxyDataset(GDALDataset::FromHandle(hDS),
+                                         pszDescription);
+        }
+        return ds.release();
     }
     return nullptr;
 }
@@ -612,7 +806,7 @@ ECBand::ECBand(ECDataset *parent, int b, int level)
     double factor = parent->resolutions[0] / parent->resolutions[lvl];
     nRasterXSize = static_cast<int>(parent->nRasterXSize * factor + 0.5);
     nRasterYSize = static_cast<int>(parent->nRasterYSize * factor + 0.5);
-    nBlockXSize = nBlockYSize = 256;
+    nBlockXSize = nBlockYSize = parent->TSZ;
 
     // Default color interpretation
     assert(b - 1 >= 0);
@@ -652,7 +846,8 @@ CPLErr ECBand::IReadBlock(int nBlockXOff, int nBlockYOff, void *pData)
 
     buffer.resize(nBytes * parent->nBands);
 
-    int lxx = static_cast<int>(parent->resolutions.size() - lvl - 1);
+    const int lxx = parent->m_nMinLOD +
+                    static_cast<int>(parent->resolutions.size() - lvl - 1);
     int bx, by;
     bx = (nBlockXOff / BSZ) * BSZ;
     by = (nBlockYOff / BSZ) * BSZ;
@@ -685,9 +880,7 @@ CPLErr ECBand::IReadBlock(int nBlockXOff, int nBlockYOff, void *pData)
                  GUInt64(size), GUInt64(offset));
         return CE_Failure;
     }
-    CPLString magic;
-    // Should use some sort of unique
-    magic.Printf("/vsimem/esric_%p.tmp", this);
+    const CPLString magic(VSIMemGenerateHiddenFilename("esric.tmp"));
     auto mfh = VSIFileFromMemBuffer(magic.c_str(), fbuffer.data(), size, false);
     VSIFCloseL(mfh);
     // Can't open a raster by handle?
@@ -843,6 +1036,17 @@ void CPL_DLL GDALRegister_ESRIC()
 
     poDriver->SetMetadataItem(GDAL_DMD_EXTENSIONS, "json tpkx");
 
+    poDriver->SetMetadataItem(
+        GDAL_DMD_OPENOPTIONLIST,
+        "<OpenOptionList>"
+        "  <Option name='EXTENT_SOURCE' type='string-select' "
+        "description='Which source is used to determine the extent' "
+        "default='FULL_EXTENT'>"
+        "    <Value>FULL_EXTENT</Value>"
+        "    <Value>INITIAL_EXTENT</Value>"
+        "    <Value>TILING_SCHEME</Value>"
+        "  </Option>"
+        "</OpenOptionList>");
     poDriver->pfnIdentify = ESRIC::Identify;
     poDriver->pfnOpen = ESRIC::ECDataset::Open;
     poDriver->pfnDelete = ESRIC::Delete;
diff --git a/frmts/exr/exrdataset.cpp b/frmts/exr/exrdataset.cpp
index ba67c28a0cb1..b4123ff50d24 100644
--- a/frmts/exr/exrdataset.cpp
+++ b/frmts/exr/exrdataset.cpp
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2020, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_pam.h"
diff --git a/frmts/exr/exrdrivercore.cpp b/frmts/exr/exrdrivercore.cpp
index 4674786a856d..edd81273d648 100644
--- a/frmts/exr/exrdrivercore.cpp
+++ b/frmts/exr/exrdrivercore.cpp
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2020, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "exrdrivercore.h"
diff --git a/frmts/exr/exrdrivercore.h b/frmts/exr/exrdrivercore.h
index 3a44264595a7..eb7badbab1c6 100644
--- a/frmts/exr/exrdrivercore.h
+++ b/frmts/exr/exrdrivercore.h
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2020, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef EXRDRIVERCORE_H
diff --git a/frmts/exr/openexr_headers.h b/frmts/exr/openexr_headers.h
index 42463c32132b..4874d3219be7 100644
--- a/frmts/exr/openexr_headers.h
+++ b/frmts/exr/openexr_headers.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2020, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef OPENEXR_HEADERS_H
diff --git a/frmts/fit/fit.cpp b/frmts/fit/fit.cpp
index aea147930a04..c9df027f2bc5 100644
--- a/frmts/fit/fit.cpp
+++ b/frmts/fit/fit.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2001, Keyhole, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <limits.h>
diff --git a/frmts/fit/fit.h b/frmts/fit/fit.h
index 8a6c2870459c..938725f62e3c 100644
--- a/frmts/fit/fit.h
+++ b/frmts/fit/fit.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2001, Keyhole, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef FIT_H_
diff --git a/frmts/fit/fitdataset.cpp b/frmts/fit/fitdataset.cpp
index 167313f4e70e..66281d1467d1 100644
--- a/frmts/fit/fitdataset.cpp
+++ b/frmts/fit/fitdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2001, Keyhole, Inc.
  * Copyright (c) 2007-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/frmts/fit/gstEndian.h b/frmts/fit/gstEndian.h
index e5b6c4242629..15fd3038de16 100644
--- a/frmts/fit/gstEndian.h
+++ b/frmts/fit/gstEndian.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2001, Keyhole, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef gstEndian_h_
diff --git a/frmts/fit/gstTypes.h b/frmts/fit/gstTypes.h
index 7aabb72b9875..02e5f82c30ea 100644
--- a/frmts/fit/gstTypes.h
+++ b/frmts/fit/gstTypes.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2001, Keyhole, Inc.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef gstTypes_h_
diff --git a/frmts/fits/fitsdataset.cpp b/frmts/fits/fitsdataset.cpp
index 50047f8326a9..67209ae32d2e 100644
--- a/frmts/fits/fitsdataset.cpp
+++ b/frmts/fits/fitsdataset.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2008-2020, Even Rouault <even dot rouault at spatialys.com>
  * Copyright (c) 2018, Chiara Marmo <chiara dot marmo at u-psud dot fr>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 // So that OFF_T is 64 bits
@@ -829,7 +813,7 @@ OGRFeature *FITSLayer::GetFeature(GIntBig nFID)
             CPLStringList aosList;
             for (int i = 0; i < nRepeat; ++i)
                 aosList.AddString(
-                    CPLSPrintf("%.18g + %.18gj", x[2 * i + 0], x[2 * i + 1]));
+                    CPLSPrintf("%.17g + %.17gj", x[2 * i + 0], x[2 * i + 1]));
             if (nRepeat == 1)
                 poFeature->SetField(iField, aosList[0]);
             else
@@ -844,7 +828,7 @@ OGRFeature *FITSLayer::GetFeature(GIntBig nFID)
             for (int i = 0; i < nRepeat; ++i)
             {
                 aosList.AddString(
-                    CPLSPrintf("%.18g + %.18gj", x[2 * i + 0], x[2 * i + 1]));
+                    CPLSPrintf("%.17g + %.17gj", x[2 * i + 0], x[2 * i + 1]));
             }
             if (nRepeat == 1)
                 poFeature->SetField(iField, aosList[0]);
diff --git a/frmts/fits/fitsdrivercore.cpp b/frmts/fits/fitsdrivercore.cpp
index 99bb99f28845..f7ff09ce2c7f 100644
--- a/frmts/fits/fitsdrivercore.cpp
+++ b/frmts/fits/fitsdrivercore.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2008-2020, Even Rouault <even dot rouault at spatialys.com>
  * Copyright (c) 2018, Chiara Marmo <chiara dot marmo at u-psud dot fr>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "fitsdrivercore.h"
diff --git a/frmts/fits/fitsdrivercore.h b/frmts/fits/fitsdrivercore.h
index 651f82149631..610620995cd6 100644
--- a/frmts/fits/fitsdrivercore.h
+++ b/frmts/fits/fitsdrivercore.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2008-2020, Even Rouault <even dot rouault at spatialys.com>
  * Copyright (c) 2018, Chiara Marmo <chiara dot marmo at u-psud dot fr>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef FITSDRIVERCORE_H
diff --git a/frmts/gdalallregister.cpp b/frmts/gdalallregister.cpp
index 0e1b73b85fc2..21d90de23ccb 100644
--- a/frmts/gdalallregister.cpp
+++ b/frmts/gdalallregister.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, Frank Warmerdam
  * Copyright (c) 2007-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_priv.h"
@@ -185,6 +169,9 @@ void CPL_STDCALL GDALAllRegister()
 #if defined(DEFERRED_HANA_DRIVER)
     DeclareDeferredOGRHANAPlugin();
 #endif
+#if defined(DEFERRED_AVIF_DRIVER)
+    DeclareDeferredAVIFPlugin();
+#endif
 #if defined(DEFERRED_HEIF_DRIVER)
     DeclareDeferredHEIFPlugin();
 #endif
@@ -314,6 +301,9 @@ void CPL_STDCALL GDALAllRegister()
 #if defined(DEFERRED_ZARR_DRIVER)
     DeclareDeferredZarrPlugin();
 #endif
+#if defined(DEFERRED_XODR_DRIVER)
+    DeclareDeferredOGRXODRPlugin();
+#endif
 
     // AutoLoadDrivers is a no-op if compiled with GDAL_NO_AUTOLOAD defined.
     poDriverManager->AutoLoadDrivers();
@@ -323,10 +313,20 @@ void CPL_STDCALL GDALAllRegister()
 
 #ifdef FRMT_vrt
     GDALRegister_VRT();
-    GDALRegister_GTI();
+#endif
+
+#ifdef FRMT_derived
     GDALRegister_Derived();
 #endif
 
+#ifdef FRMT_gti
+    GDALRegister_GTI();
+#endif
+
+#ifdef FRMT_snap_tiff
+    GDALRegister_SNAP_TIFF();
+#endif
+
 #ifdef FRMT_gtiff
     GDALRegister_GTiff();
     GDALRegister_COG();
@@ -762,6 +762,10 @@ void CPL_STDCALL GDALAllRegister()
     GDALRegister_EXR();
 #endif
 
+#ifdef FRMT_avif
+    GDALRegister_AVIF();
+#endif
+
 #ifdef FRMT_heif
     GDALRegister_HEIF();
 #endif
diff --git a/frmts/georaster/CMakeLists.txt b/frmts/georaster/CMakeLists.txt
index 8f5eaa4a1d6e..df02240b360e 100644
--- a/frmts/georaster/CMakeLists.txt
+++ b/frmts/georaster/CMakeLists.txt
@@ -1,3 +1,22 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/helpers/GdalCMakeMinimumRequired.cmake")
+cmake_minimum_required(VERSION ${GDAL_CMAKE_VERSION_MIN}...${GDAL_CMAKE_VERSION_MAX})
+
+if(NOT DEFINED PROJECT_SOURCE_DIR)
+    # Standalone plugin building
+    project(gdal_GEOR)
+    include("${PROJECT_SOURCE_DIR}/../../cmake/helpers/SetupStandalonePlugin.cmake")
+    include(CheckDependentLibrariesZLIB)
+    include(CheckDependentLibrariesJpeg)
+    include(CheckDependentLibrariesOracle)
+    if (GDAL_USE_ZLIB_INTERNAL)
+        message(FATAL_ERROR "Internal zlib not supported for GeoRaster standalone plugin build")
+    endif()
+    if (GDAL_USE_JPEG_INTERNAL)
+        message(FATAL_ERROR "Internal libjpeg not supported for GeoRaster standalone plugin build")
+    endif()
+    standalone_driver_finalize(GDAL_ENABLE_DRIVER_GEOR)
+endif()
+
 add_gdal_driver(
   TARGET gdal_GEOR
   SOURCES georaster_dataset.cpp georaster_priv.h georaster_rasterband.cpp georaster_wrapper.cpp oci_wrapper.cpp
diff --git a/frmts/georaster/cpl_vsil_ocilob.cpp b/frmts/georaster/cpl_vsil_ocilob.cpp
index f930d1173f18..b124da084a2d 100644
--- a/frmts/georaster/cpl_vsil_ocilob.cpp
+++ b/frmts/georaster/cpl_vsil_ocilob.cpp
@@ -8,23 +8,7 @@
  **********************************************************************
  * Copyright (c) 2015, Ivan Lucena, <ivan dot lucena at oracle dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/georaster/driver_declaration.cmake b/frmts/georaster/driver_declaration.cmake
new file mode 100644
index 000000000000..4c1b60decb26
--- /dev/null
+++ b/frmts/georaster/driver_declaration.cmake
@@ -0,0 +1 @@
+gdal_dependent_format(georaster "Oracle Spatial GeoRaster" "GDAL_USE_ORACLE" DRIVER_NAME_OPTION GEOR)
diff --git a/frmts/georaster/georaster_dataset.cpp b/frmts/georaster/georaster_dataset.cpp
index 682d06442b8a..38b1f3fda982 100644
--- a/frmts/georaster/georaster_dataset.cpp
+++ b/frmts/georaster/georaster_dataset.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2008, Ivan Lucena <ivan dot lucena at oracle dot com>
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #include "cpl_error.h"
diff --git a/frmts/georaster/georaster_priv.h b/frmts/georaster/georaster_priv.h
index 60e4e7dc9f5a..ac69057c2e82 100644
--- a/frmts/georaster/georaster_priv.h
+++ b/frmts/georaster/georaster_priv.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2008, Ivan Lucena
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef GEORASTER_PRIV_H_INCLUDED
diff --git a/frmts/georaster/georaster_rasterband.cpp b/frmts/georaster/georaster_rasterband.cpp
index 907760453be9..b8d7eaaf7c1a 100644
--- a/frmts/georaster/georaster_rasterband.cpp
+++ b/frmts/georaster/georaster_rasterband.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2008, Ivan Lucena
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #include "gdal_priv.h"
@@ -851,7 +835,7 @@ GDALRasterAttributeTable *GeoRasterRasterBand::GetDefaultRAT()
     }
 
     if (!osColumnList.empty())
-        osColumnList.resize(osColumnList.size() - 1);  // remove the last comma
+        osColumnList.pop_back();  // remove the last comma
 
     // ----------------------------------------------------------
     // Read VAT and load RAT
diff --git a/frmts/georaster/georaster_wrapper.cpp b/frmts/georaster/georaster_wrapper.cpp
index cdb9dbd8c9cb..08a2ee091289 100644
--- a/frmts/georaster/georaster_wrapper.cpp
+++ b/frmts/georaster/georaster_wrapper.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2008, Ivan Lucena
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #include <string.h>
@@ -214,10 +198,10 @@ char **GeoRasterWrapper::ParseIdentificator(const char *pszStringID)
 
     char *pszStartPos = (char *)strstr(pszStringID, ":") + 1;
 
-    char **papszParam =
-        CSLTokenizeString2(pszStartPos, ",@",
-                           CSLT_HONOURSTRINGS | CSLT_ALLOWEMPTYTOKENS |
-                               CSLT_STRIPLEADSPACES | CSLT_STRIPENDSPACES);
+    char **papszParam = CSLTokenizeString2(
+        pszStartPos, ",@",
+        CSLT_HONOURSTRINGS | CSLT_ALLOWEMPTYTOKENS | CSLT_STRIPLEADSPACES |
+            CSLT_STRIPENDSPACES | CSLT_PRESERVEQUOTES);
 
     //  -------------------------------------------------------------------
     //  The "/" should not be catch on the previous parser
@@ -4236,13 +4220,13 @@ void GeoRasterWrapper::UncompressJpeg(unsigned long nInSize)
     //  Load JPEG in a virtual file
     //  --------------------------------------------------------------------
 
-    const char *pszMemFile = CPLSPrintf("/vsimem/geor_%p.jpg", pabyBlockBuf);
+    const CPLString osMemFile = VSIMemGenerateHiddenFilename("geor.jpg");
 
-    VSILFILE *fpImage = VSIFOpenL(pszMemFile, "wb");
+    VSILFILE *fpImage = VSIFOpenL(osMemFile, "wb");
     VSIFWriteL(pabyBlockBuf, nInSize, 1, fpImage);
     VSIFCloseL(fpImage);
 
-    fpImage = VSIFOpenL(pszMemFile, "rb");
+    fpImage = VSIFOpenL(osMemFile, "rb");
 
     //  --------------------------------------------------------------------
     //  Initialize decompressor
@@ -4299,7 +4283,7 @@ void GeoRasterWrapper::UncompressJpeg(unsigned long nInSize)
 
     VSIFCloseL(fpImage);
 
-    VSIUnlink(pszMemFile);
+    VSIUnlink(osMemFile);
 }
 
 //  ---------------------------------------------------------------------------
@@ -4312,9 +4296,9 @@ unsigned long GeoRasterWrapper::CompressJpeg(void)
     //  Load JPEG in a virtual file
     //  --------------------------------------------------------------------
 
-    const char *pszMemFile = CPLSPrintf("/vsimem/geor_%p.jpg", pabyBlockBuf);
+    const CPLString osMemFile = VSIMemGenerateHiddenFilename("geor.jpg");
 
-    VSILFILE *fpImage = VSIFOpenL(pszMemFile, "wb");
+    VSILFILE *fpImage = VSIFOpenL(osMemFile, "wb");
 
     bool write_all_tables = TRUE;
 
@@ -4389,11 +4373,11 @@ unsigned long GeoRasterWrapper::CompressJpeg(void)
 
     VSIFCloseL(fpImage);
 
-    fpImage = VSIFOpenL(pszMemFile, "rb");
+    fpImage = VSIFOpenL(osMemFile, "rb");
     size_t nSize = VSIFReadL(pabyCompressBuf, 1, nBlockBytes, fpImage);
     VSIFCloseL(fpImage);
 
-    VSIUnlink(pszMemFile);
+    VSIUnlink(osMemFile);
 
     return (unsigned long)nSize;
 }
diff --git a/frmts/georaster/georasterdrivercore.cpp b/frmts/georaster/georasterdrivercore.cpp
index 206358081f6e..0d2abfe2c3d0 100644
--- a/frmts/georaster/georasterdrivercore.cpp
+++ b/frmts/georaster/georasterdrivercore.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2008, Ivan Lucena <ivan dot lucena at oracle dot com>
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #include "georasterdrivercore.h"
diff --git a/frmts/georaster/georasterdrivercore.h b/frmts/georaster/georasterdrivercore.h
index ced8486dc3ac..1de29f66c6b5 100644
--- a/frmts/georaster/georasterdrivercore.h
+++ b/frmts/georaster/georasterdrivercore.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2008, Ivan Lucena <ivan dot lucena at oracle dot com>
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef GEORASTERDRIVERCORE_H
diff --git a/frmts/georaster/oci_wrapper.cpp b/frmts/georaster/oci_wrapper.cpp
index f8f561781a0b..e3c382d752a4 100644
--- a/frmts/georaster/oci_wrapper.cpp
+++ b/frmts/georaster/oci_wrapper.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2008, Ivan Lucena
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "oci_wrapper.h"
diff --git a/frmts/georaster/oci_wrapper.h b/frmts/georaster/oci_wrapper.h
index 48b1c889a866..52508ba07210 100644
--- a/frmts/georaster/oci_wrapper.h
+++ b/frmts/georaster/oci_wrapper.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2008, Ivan Lucena
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OCI_WRAPPER_H_INCLUDED
diff --git a/frmts/gff/gff_dataset.cpp b/frmts/gff/gff_dataset.cpp
index bed829ac59db..2544a3e365e4 100644
--- a/frmts/gff/gff_dataset.cpp
+++ b/frmts/gff/gff_dataset.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2007, Philippe Vachon
  * Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/frmts/gif/biggifdataset.cpp b/frmts/gif/biggifdataset.cpp
index 05f836c90138..557c1d2deb41 100644
--- a/frmts/gif/biggifdataset.cpp
+++ b/frmts/gif/biggifdataset.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2001-2008, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/frmts/gif/gifabstractdataset.cpp b/frmts/gif/gifabstractdataset.cpp
index 835b1b19daa7..1d781a294709 100644
--- a/frmts/gif/gifabstractdataset.cpp
+++ b/frmts/gif/gifabstractdataset.cpp
@@ -7,23 +7,7 @@
  ****************************************************************************
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gifabstractdataset.h"
@@ -182,13 +166,14 @@ void GIFAbstractDataset::CollectXMPMetadata()
     if (!osXMP.empty())
     {
         /* Avoid setting the PAM dirty bit just for that */
-        int nOldPamFlags = nPamFlags;
+        const int nOldPamFlags = nPamFlags;
 
         char *apszMDList[2];
         apszMDList[0] = (char *)osXMP.c_str();
         apszMDList[1] = nullptr;
         SetMetadata(apszMDList, "xml:XMP");
 
+        // cppcheck-suppress redundantAssignment
         nPamFlags = nOldPamFlags;
     }
 
diff --git a/frmts/gif/gifabstractdataset.h b/frmts/gif/gifabstractdataset.h
index d3410d911000..f8aeeeeaba24 100644
--- a/frmts/gif/gifabstractdataset.h
+++ b/frmts/gif/gifabstractdataset.h
@@ -8,23 +8,7 @@
  ****************************************************************************
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GIFABSTRACTDATASET_H_INCLUDED
diff --git a/frmts/gif/gifdataset.cpp b/frmts/gif/gifdataset.cpp
index 9ff5adc84355..95e66500354e 100644
--- a/frmts/gif/gifdataset.cpp
+++ b/frmts/gif/gifdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2001, Frank Warmerdam
  * Copyright (c) 2007-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gifabstractdataset.h"
diff --git a/frmts/gif/gifdrivercore.cpp b/frmts/gif/gifdrivercore.cpp
index c6beb01fe35b..a33bca4db607 100644
--- a/frmts/gif/gifdrivercore.cpp
+++ b/frmts/gif/gifdrivercore.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2001, Frank Warmerdam
  * Copyright (c) 2007-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gifdrivercore.h"
diff --git a/frmts/gif/gifdrivercore.h b/frmts/gif/gifdrivercore.h
index 419ff379c314..b0ea8457275f 100644
--- a/frmts/gif/gifdrivercore.h
+++ b/frmts/gif/gifdrivercore.h
@@ -8,23 +8,7 @@
  * Copyright (c) 2001, Frank Warmerdam
  * Copyright (c) 2007-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GIFDRIVERCORE_H
diff --git a/frmts/grib/CMakeLists.txt b/frmts/grib/CMakeLists.txt
index 16023f73157a..01f58c263e0a 100644
--- a/frmts/grib/CMakeLists.txt
+++ b/frmts/grib/CMakeLists.txt
@@ -135,6 +135,11 @@ target_include_directories(
   gdal_GRIB PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/degrib/degrib>
                     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/degrib/g2clib> $<TARGET_PROPERTY:gdal_MEM,SOURCE_DIR>)
 target_compile_options(gdal_GRIB PRIVATE ${GDAL_SOFTWARNFLAGS}) # FIXME: only needed for files within degrib/ actually
+
+if (BUILD_APPS)
+  target_compile_definitions(gdal_GRIB PRIVATE -DBUILD_APPS)
+endif()
+
 if (GDAL_USE_PNG_INTERNAL)
   gdal_add_vendored_lib(gdal_GRIB libpng)
   target_compile_definitions(gdal_GRIB PRIVATE -DUSE_PNG)
diff --git a/frmts/grib/degrib/README.TXT b/frmts/grib/degrib/README.TXT
index f041fa15e0e6..58d547b16a81 100644
--- a/frmts/grib/degrib/README.TXT
+++ b/frmts/grib/degrib/README.TXT
@@ -1,4 +1,4 @@
-PROVENANCE
+Provenance
 ----------
 
 This directory contains a *modified* version of degrib 2.14:
diff --git a/frmts/grib/degrib/degrib/clock.c b/frmts/grib/degrib/degrib/clock.c
index 0f1ea08fcdab..a38543c8df45 100644
--- a/frmts/grib/degrib/degrib/clock.c
+++ b/frmts/grib/degrib/degrib/clock.c
@@ -729,6 +729,7 @@ sChar Clock_GetTimeZone ()
 #else
       const struct tm *gmTimePtr = gmtime (&ansTime);
 #endif
+      timeZone = 0;
       if (gmTimePtr)
       {
           timeZone = gmTimePtr->tm_hour;
diff --git a/frmts/grib/degrib/degrib/degrib1.cpp b/frmts/grib/degrib/degrib/degrib1.cpp
index f956815b6752..59bc47d4eb08 100644
--- a/frmts/grib/degrib/degrib/degrib1.cpp
+++ b/frmts/grib/degrib/degrib/degrib1.cpp
@@ -18,6 +18,7 @@
 #include <stdlib.h>
 #include <math.h>
 
+#include <cmath>
 #include <limits>
 
 #include "degrib2.h"
@@ -1680,7 +1681,7 @@ static int ReadGrib1Sect4 (uChar *bds, uInt4 gribLen, uInt4 *curLoc,
    meta->gridAttrib.max = meta->gridAttrib.min;
    meta->gridAttrib.f_maxmin = 1;
    meta->gridAttrib.numMiss = 0;
-   if (refVal >= std::numeric_limits<float>::max() || CPLIsNan(refVal)) {
+   if (refVal >= std::numeric_limits<float>::max() || std::isnan(refVal)) {
       meta->gridAttrib.refVal = std::numeric_limits<float>::max();
    } else if (refVal <= -std::numeric_limits<float>::max()) {
       meta->gridAttrib.refVal = -std::numeric_limits<float>::max();
diff --git a/frmts/grib/degrib/degrib/grib2api.c b/frmts/grib/degrib/degrib/grib2api.c
index dfe37afd6439..5b9af26594e4 100644
--- a/frmts/grib/degrib/degrib/grib2api.c
+++ b/frmts/grib/degrib/degrib/grib2api.c
@@ -85,7 +85,7 @@ extern const struct drstemplate templatesdrs[MAXDRSTEMP];
 static sInt4 FloatToSInt4Clamp(float val) {
    if ((double)val >= (double)INT_MAX) return INT_MAX;
    if ((double)val <= (double)INT_MIN) return INT_MIN;
-   if (CPLIsNan(val)) return 0;
+   if (val != val) return 0;
    return (sInt4)val;
 }
 
diff --git a/frmts/grib/degrib/degrib/inventory.cpp b/frmts/grib/degrib/degrib/inventory.cpp
index fda275e02fb3..2697b31b88a4 100644
--- a/frmts/grib/degrib/degrib/inventory.cpp
+++ b/frmts/grib/degrib/degrib/inventory.cpp
@@ -20,6 +20,7 @@
 #include <math.h>
 
 #include <algorithm>
+#include <cmath>
 #include <limits>
 
 #include "clock.h"
@@ -44,7 +45,7 @@
 static sInt4 DoubleToSInt4Clamp(double val) {
    if (val >= INT_MAX) return INT_MAX;
    if (val <= INT_MIN) return INT_MIN;
-   if (CPLIsNan(val)) return 0;
+   if (std::isnan(val)) return 0;
    return (sInt4)val;
 }
 
diff --git a/frmts/grib/degrib/degrib/metaname.cpp b/frmts/grib/degrib/degrib/metaname.cpp
index a4d169ce14cb..4ab5576c7833 100644
--- a/frmts/grib/degrib/degrib/metaname.cpp
+++ b/frmts/grib/degrib/degrib/metaname.cpp
@@ -25,6 +25,8 @@
 #include "cpl_port.h"
 #include "cpl_csv.h"
 
+#include <cmath>
+
 static const char* GetGRIB2_CSVFilename(const char* pszFilename)
 {
     const char* pszGribTableDirectory = CPLGetConfigOption("GRIB_RESOURCE_DIR", nullptr);
@@ -427,7 +429,7 @@ static void ElemNameProb (uChar mstrVersion, uShort2 center, uShort2 subcenter,
       if (upperProb > tmp ||
           tmp > std::numeric_limits<int>::max() ||
           tmp < std::numeric_limits<int>::min() ||
-          CPLIsNan(tmp) ) {
+          std::isnan(tmp) ) {
          // TODO(schwehr): What is the correct response?
          errSprintf ("ERROR: upperProb out of range.  Setting to 0.\n");
          upperProb = 0.0;
diff --git a/frmts/grib/degrib/g2clib/dec_jpeg2000.cpp b/frmts/grib/degrib/g2clib/dec_jpeg2000.cpp
index a22109e823f8..cf0961c637e8 100644
--- a/frmts/grib/degrib/g2clib/dec_jpeg2000.cpp
+++ b/frmts/grib/degrib/g2clib/dec_jpeg2000.cpp
@@ -52,8 +52,8 @@ int dec_jpeg2000(const void *injpc,g2int bufsize,g2int **outfld,g2int outpixels)
 
 {
     // create "memory file" from buffer
-    CPLString osFileName;
-    osFileName.Printf( "/vsimem/work_grib_%p.jpc", injpc );
+    const CPLString osFileName(
+        VSIMemGenerateHiddenFilename("temp_grib.jpc"));
 
     VSIFCloseL( VSIFileFromMemBuffer(
                     osFileName, (unsigned char*)injpc, bufsize,
diff --git a/frmts/grib/gribcreatecopy.cpp b/frmts/grib/gribcreatecopy.cpp
index 763c98b7114f..6a92261b1bc2 100644
--- a/frmts/grib/gribcreatecopy.cpp
+++ b/frmts/grib/gribcreatecopy.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2017, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************
  *
  */
@@ -37,6 +21,7 @@
 #include "memdataset.h"
 
 #include <algorithm>
+#include <cmath>
 #include <limits>
 
 #include "degrib/degrib/meta.h"
@@ -180,7 +165,7 @@ class GRIB2Section3Writer
     bool WriteMercator1SP();
     bool WriteMercator2SP(OGRSpatialReference *poSRS = nullptr);
     bool WriteTransverseMercator();
-    bool WritePolarSteregraphic();
+    bool WritePolarStereographic();
     bool WriteLCC1SP();
     bool WriteLCC2SPOrAEA(OGRSpatialReference *poSRS = nullptr);
     bool WriteLAEA();
@@ -547,10 +532,10 @@ bool GRIB2Section3Writer::WriteTransverseMercator()
 }
 
 /************************************************************************/
-/*                       WritePolarSteregraphic()                       */
+/*                       WritePolarStereographic()                       */
 /************************************************************************/
 
-bool GRIB2Section3Writer::WritePolarSteregraphic()
+bool GRIB2Section3Writer::WritePolarStereographic()
 {
     WriteUInt16(fp, GS3_POLAR);  // Grid template number
     WriteEllipsoidAndRasterSize();
@@ -803,7 +788,7 @@ bool GRIB2Section3Writer::Write()
     }
     else if (pszProjection && EQUAL(pszProjection, SRS_PT_POLAR_STEREOGRAPHIC))
     {
-        bRet = WritePolarSteregraphic();
+        bRet = WritePolarStereographic();
     }
     else if (pszProjection != nullptr &&
              EQUAL(pszProjection, SRS_PT_LAMBERT_CONFORMAL_CONIC_1SP))
@@ -970,7 +955,7 @@ float *GRIB2Section567Writer::GetFloatData()
                 bHasNoDataValuePoint = true;
             continue;
         }
-        if (!CPLIsFinite(pafData[i]))
+        if (!std::isfinite(pafData[i]))
         {
             CPLError(CE_Failure, CPLE_NotSupported,
                      "Non-finite values not supported for "
@@ -1663,7 +1648,7 @@ bool GRIB2Section567Writer::WritePNG()
     GDALDataset *poMEMDS =
         WrapArrayAsMemDataset(m_nXSize, m_nYSize, eReducedDT, panData);
 
-    CPLString osTmpFile(CPLSPrintf("/vsimem/grib_driver_%p.png", m_poSrcDS));
+    const CPLString osTmpFile(VSIMemGenerateHiddenFilename("grib_driver.png"));
     GDALDataset *poPNGDS = poPNGDriver->CreateCopy(
         osTmpFile, poMEMDS, FALSE, aosPNGOptions.List(), nullptr, nullptr);
     if (poPNGDS == nullptr)
@@ -1849,7 +1834,7 @@ bool GRIB2Section567Writer::WriteJPEG2000(char **papszOptions)
     GDALDataset *poMEMDS =
         WrapArrayAsMemDataset(m_nXSize, m_nYSize, eReducedDT, panData);
 
-    CPLString osTmpFile(CPLSPrintf("/vsimem/grib_driver_%p.j2k", m_poSrcDS));
+    const CPLString osTmpFile(VSIMemGenerateHiddenFilename("grib_driver.j2k"));
     GDALDataset *poJ2KDS = poJ2KDriver->CreateCopy(
         osTmpFile, poMEMDS, FALSE, aosJ2KOptions.List(), nullptr, nullptr);
     if (poJ2KDS == nullptr)
@@ -2249,7 +2234,7 @@ static void WriteAssembledPDS(VSILFILE *fp, const gtemplate *mappds,
         else if (nEltSize == 4)
         {
             GIntBig nBigVal = CPLAtoGIntBig(papszTokens[i]);
-            anVals[anVals.size() - 1] = static_cast<int>(nBigVal);
+            anVals.back() = static_cast<int>(nBigVal);
             if (nBigVal < 0 || nBigVal > static_cast<GIntBig>(UINT_MAX))
             {
                 CPLError(CE_Warning, CPLE_AppDefined,
diff --git a/frmts/grib/gribdataset.cpp b/frmts/grib/gribdataset.cpp
index b4d7867c794e..9e506e379760 100644
--- a/frmts/grib/gribdataset.cpp
+++ b/frmts/grib/gribdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2007, ITC
  * Copyright (c) 2008-2017, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************
  *
  */
@@ -43,6 +27,12 @@
 #include <fcntl.h>
 #endif
 
+#ifndef _WIN32
+#include <unistd.h>  // isatty()
+#else
+#include <io.h>  // _isatty()
+#endif
+
 #include <algorithm>
 #include <set>
 #include <string>
@@ -902,15 +892,71 @@ CPLErr GRIBRasterBand::LoadData()
     return CE_None;
 }
 
+/************************************************************************/
+/*                       IsGdalinfoInteractive()                        */
+/************************************************************************/
+
+#ifdef BUILD_APPS
+static bool IsGdalinfoInteractive()
+{
+    static const bool bIsGdalinfoInteractive = []()
+    {
+#ifndef _WIN32
+        if (isatty(static_cast<int>(fileno(stdout))))
+#else
+        if (_isatty(_fileno(stdout)))
+#endif
+        {
+            std::string osPath;
+            osPath.resize(1024);
+            if (CPLGetExecPath(&osPath[0], static_cast<int>(osPath.size())))
+            {
+                osPath = CPLGetBasename(osPath.c_str());
+            }
+            return osPath == "gdalinfo";
+        }
+        return false;
+    }();
+    return bIsGdalinfoInteractive;
+}
+#endif
+
 /************************************************************************/
 /*                             GetMetaData()                            */
 /************************************************************************/
 char **GRIBRasterBand::GetMetadata(const char *pszDomain)
 {
     FindMetaData();
-    if (m_nGribVersion == 2 &&
+    if ((pszDomain == nullptr || pszDomain[0] == 0) && m_nGribVersion == 2 &&
         CPLTestBool(CPLGetConfigOption("GRIB_PDS_ALL_BANDS", "ON")))
     {
+#ifdef BUILD_APPS
+        // Detect slow execution of e.g.
+        // "gdalinfo /vsis3/noaa-hrrr-bdp-pds/hrrr.20220804/conus/hrrr.t00z.wrfsfcf01.grib2"
+        GRIBDataset *poGDS = static_cast<GRIBDataset *>(poDS);
+        if (poGDS->m_bSideCarIdxUsed && !poGDS->m_bWarnedGdalinfoNomd &&
+            poGDS->GetRasterCount() > 10 &&
+            !VSIIsLocal(poGDS->GetDescription()) && IsGdalinfoInteractive())
+        {
+            if (poGDS->m_nFirstMetadataQueriedTimeStamp)
+            {
+                if (time(nullptr) - poGDS->m_nFirstMetadataQueriedTimeStamp > 2)
+                {
+                    poGDS->m_bWarnedGdalinfoNomd = true;
+
+                    CPLError(
+                        CE_Warning, CPLE_AppDefined,
+                        "If metadata does not matter, faster result could be "
+                        "obtained by adding the -nomd switch to gdalinfo");
+                }
+            }
+            else
+            {
+                poGDS->m_nFirstMetadataQueriedTimeStamp = time(nullptr);
+            }
+        }
+#endif
+
         FindPDSTemplateGRIB2();
     }
     return GDALPamRasterBand::GetMetadata(pszDomain);
@@ -922,11 +968,16 @@ char **GRIBRasterBand::GetMetadata(const char *pszDomain)
 const char *GRIBRasterBand::GetMetadataItem(const char *pszName,
                                             const char *pszDomain)
 {
-    FindMetaData();
-    if (m_nGribVersion == 2 &&
-        CPLTestBool(CPLGetConfigOption("GRIB_PDS_ALL_BANDS", "ON")))
+    if (!((!pszDomain || pszDomain[0] == 0) &&
+          (EQUAL(pszName, "STATISTICS_MINIMUM") ||
+           EQUAL(pszName, "STATISTICS_MAXIMUM"))))
     {
-        FindPDSTemplateGRIB2();
+        FindMetaData();
+        if (m_nGribVersion == 2 &&
+            CPLTestBool(CPLGetConfigOption("GRIB_PDS_ALL_BANDS", "ON")))
+        {
+            FindPDSTemplateGRIB2();
+        }
     }
     return GDALPamRasterBand::GetMetadataItem(pszName, pszDomain);
 }
@@ -1007,6 +1058,34 @@ double GRIBRasterBand::GetNoDataValue(int *pbSuccess)
     if (m_Grib_MetaData == nullptr)
     {
         GRIBDataset *poGDS = static_cast<GRIBDataset *>(poDS);
+
+#ifdef BUILD_APPS
+        // Detect slow execution of e.g.
+        // "gdalinfo /vsis3/noaa-hrrr-bdp-pds/hrrr.20220804/conus/hrrr.t00z.wrfsfcf01.grib2"
+
+        if (poGDS->m_bSideCarIdxUsed && !poGDS->m_bWarnedGdalinfoNonodata &&
+            poGDS->GetRasterCount() > 10 &&
+            !VSIIsLocal(poGDS->GetDescription()) && IsGdalinfoInteractive())
+        {
+            if (poGDS->m_nFirstNodataQueriedTimeStamp)
+            {
+                if (time(nullptr) - poGDS->m_nFirstNodataQueriedTimeStamp > 2)
+                {
+                    poGDS->m_bWarnedGdalinfoNonodata = true;
+
+                    CPLError(CE_Warning, CPLE_AppDefined,
+                             "If nodata value does not matter, faster result "
+                             "could be obtained by adding the -nonodata switch "
+                             "to gdalinfo");
+                }
+            }
+            else
+            {
+                poGDS->m_nFirstNodataQueriedTimeStamp = time(nullptr);
+            }
+        }
+#endif
+
         ReadGribData(poGDS->fp, start, subgNum, nullptr, &m_Grib_MetaData);
         if (m_Grib_MetaData == nullptr)
         {
@@ -1156,7 +1235,8 @@ class InventoryWrapperGrib : public gdal::grib::InventoryWrapper
 class InventoryWrapperSidecar : public gdal::grib::InventoryWrapper
 {
   public:
-    explicit InventoryWrapperSidecar(VSILFILE *fp)
+    explicit InventoryWrapperSidecar(VSILFILE *fp, uint64_t nStartOffset,
+                                     int64_t nSize)
         : gdal::grib::InventoryWrapper()
     {
         result_ = -1;
@@ -1164,26 +1244,25 @@ class InventoryWrapperSidecar : public gdal::grib::InventoryWrapper
         size_t length = static_cast<size_t>(VSIFTellL(fp));
         if (length > 4 * 1024 * 1024)
             return;
-        std::string psSidecar;
-        psSidecar.resize(length);
+        std::string osSidecar;
+        osSidecar.resize(length);
         VSIFSeekL(fp, 0, SEEK_SET);
-        if (VSIFReadL(&psSidecar[0], length, 1, fp) != 1)
+        if (VSIFReadL(&osSidecar[0], length, 1, fp) != 1)
             return;
 
-        CPLStringList aosMsgs(
-            CSLTokenizeString2(psSidecar.c_str(), "\n",
+        const CPLStringList aosMsgs(
+            CSLTokenizeString2(osSidecar.c_str(), "\n",
                                CSLT_PRESERVEQUOTES | CSLT_STRIPLEADSPACES));
-        inv_len_ = aosMsgs.size();
         inv_ = static_cast<inventoryType *>(
-            CPLMalloc(inv_len_ * sizeof(inventoryType)));
+            CPLCalloc(aosMsgs.size(), sizeof(inventoryType)));
 
-        for (size_t i = 0; i < inv_len_; ++i)
+        for (const char *pszMsg : aosMsgs)
         {
             // We are parsing
             // "msgNum[.subgNum]:start:dontcare:name1:name2:name3" For NOMADS:
             // "msgNum[.subgNum]:start:reftime:var:level:time"
-            CPLStringList aosTokens(CSLTokenizeString2(
-                aosMsgs[i], ":", CSLT_PRESERVEQUOTES | CSLT_ALLOWEMPTYTOKENS));
+            const CPLStringList aosTokens(CSLTokenizeString2(
+                pszMsg, ":", CSLT_PRESERVEQUOTES | CSLT_ALLOWEMPTYTOKENS));
             CPLStringList aosNum;
 
             if (aosTokens.size() < 6)
@@ -1200,7 +1279,7 @@ class InventoryWrapperSidecar : public gdal::grib::InventoryWrapper
                 goto err_sidecar;
 
             if (aosNum.size() < 2)
-                inv_[i].subgNum = 0;
+                inv_[inv_len_].subgNum = 0;
             else
             {
                 auto subgNum = strtol(aosNum[1], &endptr, 10);
@@ -1211,21 +1290,29 @@ class InventoryWrapperSidecar : public gdal::grib::InventoryWrapper
                 // .idx file use a 1-based indexing, whereas DEGRIB uses a
                 // 0-based one
                 subgNum--;
-                inv_[i].subgNum = static_cast<unsigned short>(subgNum);
+                inv_[inv_len_].subgNum = static_cast<unsigned short>(subgNum);
             }
 
-            inv_[i].start = strtoll(aosTokens[1], &endptr, 10);
+            inv_[inv_len_].start = strtoll(aosTokens[1], &endptr, 10);
             if (*endptr != 0)
                 goto err_sidecar;
 
-            inv_[i].unitName = nullptr;
-            inv_[i].comment = nullptr;
-            inv_[i].element = nullptr;
-            inv_[i].shortFstLevel = nullptr;
+            if (inv_[inv_len_].start < nStartOffset)
+                continue;
+            if (nSize > 0 && inv_[inv_len_].start >= nStartOffset + nSize)
+                break;
+
+            inv_[inv_len_].start -= nStartOffset;
+
+            inv_[inv_len_].unitName = nullptr;
+            inv_[inv_len_].comment = nullptr;
+            inv_[inv_len_].element = nullptr;
+            inv_[inv_len_].shortFstLevel = nullptr;
             // This is going into the description field ->
             // the only one available before loading the metadata
-            inv_[i].longFstLevel = VSIStrdup(CPLSPrintf(
+            inv_[inv_len_].longFstLevel = VSIStrdup(CPLSPrintf(
                 "%s:%s:%s", aosTokens[3], aosTokens[4], aosTokens[5]));
+            ++inv_len_;
 
             continue;
 
@@ -1233,8 +1320,7 @@ class InventoryWrapperSidecar : public gdal::grib::InventoryWrapper
             CPLDebug("GRIB",
                      "Failed parsing sidecar entry '%s', "
                      "falling back to constructing an inventory",
-                     aosMsgs[i]);
-            inv_len_ = static_cast<unsigned>(i);
+                     pszMsg);
             return;
         }
 
@@ -1304,27 +1390,51 @@ CPLErr GRIBDataset::GetGeoTransform(double *padfTransform)
 /************************************************************************/
 
 std::unique_ptr<gdal::grib::InventoryWrapper>
-GRIBDataset::Inventory(VSILFILE *fp, GDALOpenInfo *poOpenInfo)
+GRIBDataset::Inventory(GDALOpenInfo *poOpenInfo)
 {
     std::unique_ptr<gdal::grib::InventoryWrapper> pInventories;
 
     VSIFSeekL(fp, 0, SEEK_SET);
-    CPLString sSideCarFilename = CPLString(poOpenInfo->pszFilename) + ".idx";
+    std::string osSideCarFilename(poOpenInfo->pszFilename);
+    uint64_t nStartOffset = 0;
+    int64_t nSize = -1;
+    if (STARTS_WITH(poOpenInfo->pszFilename, "/vsisubfile/"))
+    {
+        const char *pszPtr = poOpenInfo->pszFilename + strlen("/vsisubfile/");
+        const char *pszComma = strchr(pszPtr, ',');
+        if (pszComma)
+        {
+            const CPLStringList aosTokens(CSLTokenizeString2(
+                std::string(pszPtr, pszComma - pszPtr).c_str(), "_", 0));
+            if (aosTokens.size() == 2)
+            {
+                nStartOffset = std::strtoull(aosTokens[0], nullptr, 10);
+                nSize = std::strtoll(aosTokens[1], nullptr, 10);
+                osSideCarFilename = pszComma + 1;
+            }
+        }
+    }
+    osSideCarFilename += ".idx";
     VSILFILE *fpSideCar = nullptr;
     if (CPLTestBool(CSLFetchNameValueDef(poOpenInfo->papszOpenOptions,
                                          "USE_IDX", "YES")) &&
-        ((fpSideCar = VSIFOpenL(sSideCarFilename, "rb")) != nullptr))
+        ((fpSideCar = VSIFOpenL(osSideCarFilename.c_str(), "rb")) != nullptr))
     {
         CPLDebug("GRIB", "Reading inventories from sidecar file %s",
-                 sSideCarFilename.c_str());
+                 osSideCarFilename.c_str());
         // Contains an GRIB2 message inventory of the file.
-        pInventories = std::make_unique<InventoryWrapperSidecar>(fpSideCar);
+        pInventories = std::make_unique<InventoryWrapperSidecar>(
+            fpSideCar, nStartOffset, nSize);
         if (pInventories->result() <= 0 || pInventories->length() == 0)
             pInventories = nullptr;
         VSIFCloseL(fpSideCar);
+#ifdef BUILD_APPS
+        m_bSideCarIdxUsed = true;
+#endif
     }
     else
-        CPLDebug("GRIB", "Failed opening sidecar %s", sSideCarFilename.c_str());
+        CPLDebug("GRIB", "Failed opening sidecar %s",
+                 osSideCarFilename.c_str());
 
     if (pInventories == nullptr)
     {
@@ -1363,10 +1473,7 @@ GDALDataset *GRIBDataset::Open(GDALOpenInfo *poOpenInfo)
     // for other thread safe formats
     CPLMutexHolderD(&hGRIBMutex);
 
-    CPLString tmpFilename;
-    tmpFilename.Printf("/vsimem/gribdataset-%p", poOpenInfo);
-
-    VSILFILE *memfp = VSIFileFromMemBuffer(tmpFilename, poOpenInfo->pabyHeader,
+    VSILFILE *memfp = VSIFileFromMemBuffer(nullptr, poOpenInfo->pabyHeader,
                                            poOpenInfo->nHeaderBytes, FALSE);
     if (memfp == nullptr ||
         ReadSECT0(memfp, &buff, &buffLen, -1, sect0, &gribLen, &version) < 0)
@@ -1374,7 +1481,6 @@ GDALDataset *GRIBDataset::Open(GDALOpenInfo *poOpenInfo)
         if (memfp != nullptr)
         {
             VSIFCloseL(memfp);
-            VSIUnlink(tmpFilename);
         }
         free(buff);
         char *errMsg = errSprintf(nullptr);
@@ -1384,7 +1490,6 @@ GDALDataset *GRIBDataset::Open(GDALOpenInfo *poOpenInfo)
         return nullptr;
     }
     VSIFCloseL(memfp);
-    VSIUnlink(tmpFilename);
     free(buff);
 
     // Confirm the requested access is supported.
@@ -1414,7 +1519,7 @@ GDALDataset *GRIBDataset::Open(GDALOpenInfo *poOpenInfo)
     // The band-data that is read is stored into the first RasterBand,
     // simply so that the same portion of the file is not read twice.
 
-    auto pInventories = Inventory(poDS->fp, poOpenInfo);
+    auto pInventories = poDS->Inventory(poOpenInfo);
     if (pInventories->result() <= 0)
     {
         char *errMsg = errSprintf(nullptr);
@@ -1492,11 +1597,10 @@ GDALDataset *GRIBDataset::Open(GDALOpenInfo *poOpenInfo)
     // Release hGRIBMutex otherwise we'll deadlock with GDALDataset own
     // hGRIBMutex.
     CPLReleaseMutex(hGRIBMutex);
-    poDS->TryLoadXML();
+    poDS->TryLoadXML(poOpenInfo->GetSiblingFiles());
 
     // Check for external overviews.
-    poDS->oOvManager.Initialize(poDS, poOpenInfo->pszFilename,
-                                poOpenInfo->GetSiblingFiles());
+    poDS->oOvManager.Initialize(poDS, poOpenInfo);
     CPLAcquireMutex(hGRIBMutex, 1000.0);
 
     return poDS;
@@ -2648,6 +2752,13 @@ void GRIBDataset::SetGribMetaData(grib_MetaData *meta)
             if (rPixelSizeX * nRasterXSize > 360 + rPixelSizeX / 4)
                 CPLDebug("GRIB", "Cannot properly handle GRIB2 files with "
                                  "overlaps and 0-360 longitudes");
+            else if (rMinX == 180)
+            {
+                // Case of https://github.com/OSGeo/gdal/issues/10655
+                CPLDebug("GRIB", "Shifting longitudes from %lf:%lf to %lf:%lf",
+                         rMinX, rMaxX, -180.0, Lon360to180(rMaxX));
+                rMinX = -180;
+            }
             else if (fabs(360 - rPixelSizeX * nRasterXSize) < rPixelSizeX / 4 &&
                      rMinX <= 180 && meta->gds.projType == GS3_LATLON)
             {
diff --git a/frmts/grib/gribdataset.h b/frmts/grib/gribdataset.h
index b33d72f7fb07..0f48cbb14b2e 100644
--- a/frmts/grib/gribdataset.h
+++ b/frmts/grib/gribdataset.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2007, ITC
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************
  *
  */
@@ -44,6 +28,7 @@
 #if HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
+#include <time.h>
 
 #include <algorithm>
 #include <memory>
@@ -114,8 +99,7 @@ class GRIBDataset final : public GDALPamDataset
   private:
     void SetGribMetaData(grib_MetaData *meta);
     static GDALDataset *OpenMultiDim(GDALOpenInfo *);
-    static std::unique_ptr<gdal::grib::InventoryWrapper>
-    Inventory(VSILFILE *, GDALOpenInfo *);
+    std::unique_ptr<gdal::grib::InventoryWrapper> Inventory(GDALOpenInfo *);
 
     VSILFILE *fp;
     // Calculate and store once as GetGeoTransform may be called multiple times.
@@ -135,6 +119,14 @@ class GRIBDataset final : public GDALPamDataset
     std::shared_ptr<OGRSpatialReference> m_poSRS{};
     std::unique_ptr<OGRSpatialReference> m_poLL{};
     std::unique_ptr<OGRCoordinateTransformation> m_poCT{};
+
+#ifdef BUILD_APPS
+    bool m_bSideCarIdxUsed = false;
+    bool m_bWarnedGdalinfoNomd = false;
+    time_t m_nFirstMetadataQueriedTimeStamp = 0;
+    bool m_bWarnedGdalinfoNonodata = false;
+    time_t m_nFirstNodataQueriedTimeStamp = 0;
+#endif
 };
 
 /************************************************************************/
diff --git a/frmts/grib/gribdrivercore.cpp b/frmts/grib/gribdrivercore.cpp
index 708675d64af8..ef340d1f07c3 100644
--- a/frmts/grib/gribdrivercore.cpp
+++ b/frmts/grib/gribdrivercore.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2007, ITC
  * Copyright (c) 2008-2017, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gribdrivercore.h"
diff --git a/frmts/grib/gribdrivercore.h b/frmts/grib/gribdrivercore.h
index d745bd6edc28..1944c25e2498 100644
--- a/frmts/grib/gribdrivercore.h
+++ b/frmts/grib/gribdrivercore.h
@@ -8,23 +8,7 @@
  * Copyright (c) 2007, ITC
  * Copyright (c) 2008-2017, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GRIBDRIVERCORE_H
diff --git a/frmts/gsg/gs7bgdataset.cpp b/frmts/gsg/gs7bgdataset.cpp
index 861ce2bed324..0d839976026c 100644
--- a/frmts/gsg/gs7bgdataset.cpp
+++ b/frmts/gsg/gs7bgdataset.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2007, Adam Guernsey <adam@ctech.com>
  * Copyright (c) 2009-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <cassert>
diff --git a/frmts/gsg/gsagdataset.cpp b/frmts/gsg/gsagdataset.cpp
index 572d6aee27bf..c4b3af4ab895 100644
--- a/frmts/gsg/gsagdataset.cpp
+++ b/frmts/gsg/gsagdataset.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2006, Kevin Locke <kwl7@cornell.edu>
  * Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
@@ -385,6 +369,7 @@ CPLErr GSAGRasterBand::IReadBlock(int nBlockXOff, int nBlockYOff, void *pImage)
             }
             else if (*szStart != '\0')
             {
+                // cppcheck-suppress redundantAssignment
                 szEnd = szStart;
                 while (!isspace((unsigned char)*szEnd) && *szEnd != '\0')
                     szEnd++;
diff --git a/frmts/gsg/gsbgdataset.cpp b/frmts/gsg/gsbgdataset.cpp
index 2a234236fbb8..3440464b359e 100644
--- a/frmts/gsg/gsbgdataset.cpp
+++ b/frmts/gsg/gsbgdataset.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2006, Kevin Locke <kwl7@cornell.edu>
  * Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
@@ -53,7 +37,7 @@ class GSBGDataset final : public GDALPamDataset
     static const float fNODATA_VALUE;
     static const size_t nHEADER_SIZE;
 
-    static CPLErr WriteHeader(VSILFILE *fp, GInt16 nXSize, GInt16 nYSize,
+    static CPLErr WriteHeader(VSILFILE *fp, int nXSize, int nYSize,
                               double dfMinX, double dfMaxX, double dfMinY,
                               double dfMaxY, double dfMinZ, double dfMaxZ);
 
@@ -417,9 +401,9 @@ CPLErr GSBGRasterBand::IWriteBlock(int nBlockXOff, int nBlockYOff, void *pImage)
 
     if (bHeaderNeedsUpdate && dfMaxZ > dfMinZ)
     {
-        CPLErr eErr = poGDS->WriteHeader(poGDS->fp, (GInt16)nRasterXSize,
-                                         (GInt16)nRasterYSize, dfMinX, dfMaxX,
-                                         dfMinY, dfMaxY, dfMinZ, dfMaxZ);
+        CPLErr eErr =
+            poGDS->WriteHeader(poGDS->fp, nRasterXSize, nRasterYSize, dfMinX,
+                               dfMaxX, dfMinY, dfMaxY, dfMinZ, dfMaxZ);
         return eErr;
     }
 
@@ -686,9 +670,9 @@ CPLErr GSBGDataset::SetGeoTransform(double *padfGeoTransform)
         padfGeoTransform[5] * (nRasterYSize - 0.5) + padfGeoTransform[3];
     double dfMaxY = padfGeoTransform[3] + padfGeoTransform[5] / 2;
 
-    CPLErr eErr = WriteHeader(fp, (GInt16)poGRB->nRasterXSize,
-                              (GInt16)poGRB->nRasterYSize, dfMinX, dfMaxX,
-                              dfMinY, dfMaxY, poGRB->dfMinZ, poGRB->dfMaxZ);
+    CPLErr eErr =
+        WriteHeader(fp, poGRB->nRasterXSize, poGRB->nRasterYSize, dfMinX,
+                    dfMaxX, dfMinY, dfMaxY, poGRB->dfMinZ, poGRB->dfMaxZ);
 
     if (eErr == CE_None)
     {
@@ -705,7 +689,7 @@ CPLErr GSBGDataset::SetGeoTransform(double *padfGeoTransform)
 /*                             WriteHeader()                            */
 /************************************************************************/
 
-CPLErr GSBGDataset::WriteHeader(VSILFILE *fp, GInt16 nXSize, GInt16 nYSize,
+CPLErr GSBGDataset::WriteHeader(VSILFILE *fp, int nXSize, int nYSize,
                                 double dfMinX, double dfMaxX, double dfMinY,
                                 double dfMaxY, double dfMinZ, double dfMaxZ)
 
@@ -724,7 +708,8 @@ CPLErr GSBGDataset::WriteHeader(VSILFILE *fp, GInt16 nXSize, GInt16 nYSize,
         return CE_Failure;
     }
 
-    GInt16 nTemp = CPL_LSBWORD16(nXSize);
+    assert(nXSize >= 0 && nXSize <= std::numeric_limits<int16_t>::max());
+    GInt16 nTemp = CPL_LSBWORD16(static_cast<int16_t>(nXSize));
     if (VSIFWriteL((void *)&nTemp, 2, 1, fp) != 1)
     {
         CPLError(CE_Failure, CPLE_FileIO,
@@ -732,7 +717,8 @@ CPLErr GSBGDataset::WriteHeader(VSILFILE *fp, GInt16 nXSize, GInt16 nYSize,
         return CE_Failure;
     }
 
-    nTemp = CPL_LSBWORD16(nYSize);
+    assert(nYSize >= 0 && nYSize <= std::numeric_limits<int16_t>::max());
+    nTemp = CPL_LSBWORD16(static_cast<int16_t>(nYSize));
     if (VSIFWriteL((void *)&nTemp, 2, 1, fp) != 1)
     {
         CPLError(CE_Failure, CPLE_FileIO,
@@ -847,8 +833,8 @@ GDALDataset *GSBGDataset::Create(const char *pszFilename, int nXSize,
         return nullptr;
     }
 
-    CPLErr eErr = WriteHeader(fp, (GInt16)nXSize, (GInt16)nYSize, 0.0, nXSize,
-                              0.0, nYSize, 0.0, 0.0);
+    CPLErr eErr =
+        WriteHeader(fp, nXSize, nYSize, 0.0, nXSize, 0.0, nYSize, 0.0, 0.0);
     if (eErr != CE_None)
     {
         VSIFCloseL(fp);
@@ -941,8 +927,8 @@ GDALDataset *GSBGDataset::CreateCopy(const char *pszFilename,
         return nullptr;
     }
 
-    GInt16 nXSize = (GInt16)poSrcBand->GetXSize();
-    GInt16 nYSize = (GInt16)poSrcBand->GetYSize();
+    const int nXSize = poSrcBand->GetXSize();
+    const int nYSize = poSrcBand->GetYSize();
     double adfGeoTransform[6];
 
     poSrcDS->GetGeoTransform(adfGeoTransform);
@@ -974,7 +960,7 @@ GDALDataset *GSBGDataset::CreateCopy(const char *pszFilename,
     float fSrcNoDataValue = (float)poSrcBand->GetNoDataValue(&bSrcHasNDValue);
     double dfMinZ = std::numeric_limits<double>::max();
     double dfMaxZ = std::numeric_limits<double>::lowest();
-    for (GInt16 iRow = nYSize - 1; iRow >= 0; iRow--)
+    for (int iRow = nYSize - 1; iRow >= 0; iRow--)
     {
         eErr = poSrcBand->RasterIO(GF_Read, 0, iRow, nXSize, 1, pfData, nXSize,
                                    1, GDT_Float32, 0, 0, nullptr);
diff --git a/frmts/gta/gta_headers.h b/frmts/gta/gta_headers.h
index 6e63f9210b4d..bab2b4f4ea66 100644
--- a/frmts/gta/gta_headers.h
+++ b/frmts/gta/gta_headers.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef GTA_HEADERS_H
diff --git a/frmts/gta/gtadataset.cpp b/frmts/gta/gtadataset.cpp
index 7f7cadc4607e..676a73a97438 100644
--- a/frmts/gta/gtadataset.cpp
+++ b/frmts/gta/gtadataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2010, 2011, Martin Lambers <marlam@marlam.de>
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 /*
diff --git a/frmts/gta/gtadrivercore.cpp b/frmts/gta/gtadrivercore.cpp
index e53b299f19f3..d4f0dd5f72f6 100644
--- a/frmts/gta/gtadrivercore.cpp
+++ b/frmts/gta/gtadrivercore.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2010, 2011, Martin Lambers <marlam@marlam.de>
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gtadrivercore.h"
diff --git a/frmts/gta/gtadrivercore.h b/frmts/gta/gtadrivercore.h
index 536fdec9ff83..29d9ad240495 100644
--- a/frmts/gta/gtadrivercore.h
+++ b/frmts/gta/gtadrivercore.h
@@ -8,23 +8,7 @@
  * Copyright (c) 2010, 2011, Martin Lambers <marlam@marlam.de>
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GTADRIVERCORE_H
diff --git a/frmts/gti/CMakeLists.txt b/frmts/gti/CMakeLists.txt
new file mode 100644
index 000000000000..91bc928ea953
--- /dev/null
+++ b/frmts/gti/CMakeLists.txt
@@ -0,0 +1,26 @@
+add_gdal_driver(
+  TARGET gdal_GTI
+  PLUGIN_CAPABLE
+  NO_DEPS
+  SOURCES gdaltileindexdataset.cpp
+          STRONG_CXX_WFLAGS)
+gdal_standard_includes(gdal_GTI)
+target_include_directories(gdal_GTI PRIVATE ${GDAL_RASTER_FORMAT_SOURCE_DIR}/vrt
+                                            $<TARGET_PROPERTY:ogrsf_generic,SOURCE_DIR>)
+
+set(GDAL_DATA_FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/data/gdaltileindex.xsd
+)
+set_property(
+  TARGET ${GDAL_LIB_TARGET_NAME}
+  APPEND
+  PROPERTY RESOURCE "${GDAL_DATA_FILES}")
+
+if (GDAL_USE_GEOS)
+  gdal_target_link_libraries(gdal_GTI PRIVATE ${GEOS_TARGET})
+  target_compile_definitions(gdal_GTI PRIVATE -DHAVE_GEOS=1)
+endif ()
+
+if (GDAL_ENABLE_DRIVER_GTI_PLUGIN)
+    target_compile_definitions(gdal_GTI PRIVATE -DBUILT_AS_PLUGIN)
+endif()
diff --git a/frmts/vrt/data/gdaltileindex.xsd b/frmts/gti/data/gdaltileindex.xsd
similarity index 90%
rename from frmts/vrt/data/gdaltileindex.xsd
rename to frmts/gti/data/gdaltileindex.xsd
index 7e0d38a35599..9aad7a6b28e4 100644
--- a/frmts/vrt/data/gdaltileindex.xsd
+++ b/frmts/gti/data/gdaltileindex.xsd
@@ -10,23 +10,7 @@
  **********************************************************************
  * Copyright (c) 2023, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="1.0">
diff --git a/frmts/vrt/gdaltileindexdataset.cpp b/frmts/gti/gdaltileindexdataset.cpp
similarity index 70%
rename from frmts/vrt/gdaltileindexdataset.cpp
rename to frmts/gti/gdaltileindexdataset.cpp
index d4099ef4ef0d..52b7618537ac 100644
--- a/frmts/vrt/gdaltileindexdataset.cpp
+++ b/frmts/gti/gdaltileindexdataset.cpp
@@ -7,42 +7,34 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 /*! @cond Doxygen_Suppress */
 
 #include <array>
 #include <algorithm>
+#include <atomic>
+#include <cmath>
 #include <limits>
+#include <mutex>
 #include <set>
 #include <tuple>
 #include <utility>
 #include <vector>
 
 #include "cpl_port.h"
+#include "cpl_error_internal.h"
+#include "cpl_json.h"
 #include "cpl_mem_cache.h"
 #include "cpl_minixml.h"
+#include "cpl_quad_tree.h"
 #include "vrtdataset.h"
 #include "vrt_priv.h"
 #include "ogrsf_frmts.h"
+#include "ogrwarpedlayer.h"
 #include "gdal_proxy.h"
+#include "gdal_thread_pool.h"
 #include "gdal_utils.h"
 
 #if defined(__SSE2__) || defined(_M_X64)
@@ -210,6 +202,9 @@ class GDALTileIndexDataset final : public GDALPamDataset
     //! Vector layer with the sources
     OGRLayer *m_poLayer = nullptr;
 
+    //! When the SRS of m_poLayer is not the one we expose
+    std::unique_ptr<OGRLayer> m_poWarpedLayerKeeper{};
+
     //! Geotransform matrix of the tile index
     std::array<double, 6> m_adfGeoTransform{0, 0, 0, 0, 0, 0};
 
@@ -276,6 +271,16 @@ class GDALTileIndexDataset final : public GDALPamDataset
     //! Cache of buffers used by VRTComplexSource to avoid memory reallocation.
     VRTSource::WorkingState m_oWorkingState{};
 
+    //! Used by IRasterIO() when using multi-threading
+    struct QueueWorkingStates
+    {
+        std::mutex oMutex{};
+        std::vector<std::unique_ptr<VRTSource::WorkingState>> oStates{};
+    };
+
+    //! Used by IRasterIO() when using multi-threading
+    QueueWorkingStates m_oQueueWorkingStates{};
+
     //! Structure describing one of the source raster in the tile index.
     struct SourceDesc
     {
@@ -292,7 +297,7 @@ class GDALTileIndexDataset final : public GDALPamDataset
         std::unique_ptr<OGRFeature> poFeature{};
 
         //! Work buffer containing the value of the mask band for the current pixel query.
-        std::vector<GByte> abyMask{};
+        mutable std::vector<GByte> abyMask{};
 
         //! Whether the source covers the whole area of interest of the current pixel query.
         bool bCoversWholeAOI = false;
@@ -313,13 +318,20 @@ class GDALTileIndexDataset final : public GDALPamDataset
     //! Array of sources participating to the current pixel query.
     std::vector<SourceDesc> m_aoSourceDesc{};
 
+    //! Maximum number of threads. Updated by CollectSources().
+    int m_nNumThreads = -1;
+
+    //! Whereas the multi-threading rendering code path must be used. Updated by CollectSources().
+    bool m_bLastMustUseMultiThreading = false;
+
     //! From a source dataset name, return its SourceDesc description structure.
-    bool GetSourceDesc(const std::string &osTileName, SourceDesc &oSourceDesc);
+    bool GetSourceDesc(const std::string &osTileName, SourceDesc &oSourceDesc,
+                       std::mutex *pMutex);
 
     //! Collect sources corresponding to the georeferenced window of interest,
     //! and store them in m_aoSourceDesc[].
     bool CollectSources(double dfXOff, double dfYOff, double dfXSize,
-                        double dfYSize);
+                        double dfYSize, bool bMultiThreadAllowed);
 
     //! Sort sources according to m_nSortFieldIndex.
     void SortSourceDesc();
@@ -334,9 +346,56 @@ class GDALTileIndexDataset final : public GDALPamDataset
                     const int *panBandMap, GSpacing nPixelSpace,
                     GSpacing nLineSpace, GSpacing nBandSpace) const;
 
+    //! Render one source. Used by IRasterIO()
+    CPLErr RenderSource(const SourceDesc &oSourceDesc, bool bNeedInitBuffer,
+                        int nBandNrMax, int nXOff, int nYOff, int nXSize,
+                        int nYSize, double dfXOff, double dfYOff,
+                        double dfXSize, double dfYSize, int nBufXSize,
+                        int nBufYSize, void *pData, GDALDataType eBufType,
+                        int nBandCount, BANDMAP_TYPE panBandMap,
+                        GSpacing nPixelSpace, GSpacing nLineSpace,
+                        GSpacing nBandSpace, GDALRasterIOExtraArg *psExtraArg,
+                        VRTSource::WorkingState &oWorkingState) const;
+
     //! Whether m_poVectorDS supports SetMetadata()/SetMetadataItem()
     bool TileIndexSupportsEditingLayerMetadata() const;
 
+    //! Return number of threads that can be used
+    int GetNumThreads() const;
+
+    /** Structure used to declare a threaded job to satisfy IRasterIO()
+     * on a given source.
+     */
+    struct RasterIOJob
+    {
+        std::atomic<int> *pnCompletedJobs = nullptr;
+        std::atomic<bool> *pbSuccess = nullptr;
+        GDALTileIndexDataset *poDS = nullptr;
+        GDALTileIndexDataset::QueueWorkingStates *poQueueWorkingStates =
+            nullptr;
+        int nBandNrMax = 0;
+        std::string *posErrorMsg = nullptr;
+
+        int nXOff = 0;
+        int nYOff = 0;
+        int nXSize = 0;
+        int nYSize = 0;
+        void *pData = nullptr;
+        int nBufXSize = 0;
+        int nBufYSize = 0;
+        int nBandCount = 0;
+        BANDMAP_TYPE panBandMap = nullptr;
+        GDALDataType eBufType = GDT_Unknown;
+        GSpacing nPixelSpace = 0;
+        GSpacing nLineSpace = 0;
+        GSpacing nBandSpace = 0;
+        GDALRasterIOExtraArg *psExtraArg = nullptr;
+
+        std::string osTileName{};
+
+        static void Func(void *pData);
+    };
+
     CPL_DISALLOW_COPY_ASSIGN(GDALTileIndexDataset)
 };
 
@@ -370,6 +429,9 @@ class GDALTileIndexBand final : public GDALPamRasterBand
                      GSpacing nLineSpace,
                      GDALRasterIOExtraArg *psExtraArg) override;
 
+    int IGetDataCoverageStatus(int nXOff, int nYOff, int nXSize, int nYSize,
+                               int nMaskFlagStop, double *pdfDataPct) override;
+
     int GetMaskFlags() override
     {
         if (m_poDS->m_poMaskBand && m_poDS->m_poMaskBand.get() != this)
@@ -511,6 +573,9 @@ GDALTileIndexDataset::GDALTileIndexDataset()
 static std::string GetAbsoluteFileName(const char *pszTileName,
                                        const char *pszVRTName)
 {
+    if (STARTS_WITH(pszTileName, "https://"))
+        return std::string("/vsicurl/").append(pszTileName);
+
     if (CPLIsFilenameRelative(pszTileName) &&
         !STARTS_WITH(pszTileName, "<VRTDataset") &&
         !STARTS_WITH(pszVRTName, "<GDALTileIndexDataset"))
@@ -825,13 +890,26 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
             return false;
     }
 
+    const OGRFeatureDefn *poLayerDefn = m_poLayer->GetLayerDefn();
+
+    // Is this a https://stac-utils.github.io/stac-geoparquet/latest/spec/stac-geoparquet-spec ?
+    const bool bIsStacGeoParquet =
+        poLayerDefn->GetFieldIndex("assets.image.href") >= 0;
+
     const char *pszLocationFieldName = GetOption(MD_LOCATION_FIELD);
     if (!pszLocationFieldName)
     {
-        constexpr const char *DEFAULT_LOCATION_FIELD_NAME = "location";
-        pszLocationFieldName = DEFAULT_LOCATION_FIELD_NAME;
+        if (bIsStacGeoParquet)
+        {
+            pszLocationFieldName = "assets.image.href";
+        }
+        else
+        {
+            constexpr const char *DEFAULT_LOCATION_FIELD_NAME = "location";
+            pszLocationFieldName = DEFAULT_LOCATION_FIELD_NAME;
+        }
     }
-    auto poLayerDefn = m_poLayer->GetLayerDefn();
+
     m_nLocationFieldIndex = poLayerDefn->GetFieldIndex(pszLocationFieldName);
     if (m_nLocationFieldIndex < 0)
     {
@@ -907,8 +985,8 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
     const char *pszMinY = GetOption(MD_MINY);
     const char *pszMaxX = GetOption(MD_MAXX);
     const char *pszMaxY = GetOption(MD_MAXY);
-    const int nCountMinMaxXY = (pszMinX ? 1 : 0) + (pszMinY ? 1 : 0) +
-                               (pszMaxX ? 1 : 0) + (pszMaxY ? 1 : 0);
+    int nCountMinMaxXY = (pszMinX ? 1 : 0) + (pszMinY ? 1 : 0) +
+                         (pszMaxX ? 1 : 0) + (pszMaxY ? 1 : 0);
     if (nCountMinMaxXY != 0 && nCountMinMaxXY != 4)
     {
         CPLError(CE_Failure, CPLE_AppDefined,
@@ -950,11 +1028,10 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
             return false;
         }
     }
-    else
+    else if (const auto poSRS = m_poLayer->GetSpatialRef())
     {
-        const auto poSRS = m_poLayer->GetSpatialRef();
         // Ignore GPKG "Undefined geographic SRS" and "Undefined Cartesian SRS"
-        if (poSRS && !STARTS_WITH(poSRS->GetName(), "Undefined "))
+        if (!STARTS_WITH(poSRS->GetName(), "Undefined "))
             m_oSRS = *poSRS;
     }
 
@@ -1014,6 +1091,108 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
         }
     }
 
+    // Take into STAC GeoParquet proj:epsg and proj:transform fields
+    std::unique_ptr<OGRFeature> poFeature;
+    std::string osResX, osResY, osMinX, osMinY, osMaxX, osMaxY;
+    int iProjEPSG = -1;
+    int iProjTransform = -1;
+    if (bIsStacGeoParquet && !pszSRS && !pszResX && !pszResY && !pszMinX &&
+        !pszMinY && !pszMaxX && !pszMaxY &&
+        (iProjEPSG = poLayerDefn->GetFieldIndex("proj:epsg")) >= 0 &&
+        (iProjTransform = poLayerDefn->GetFieldIndex("proj:transform")) >= 0)
+    {
+        poFeature.reset(m_poLayer->GetNextFeature());
+        if (poFeature && poFeature->IsFieldSet(iProjEPSG) &&
+            poFeature->IsFieldSet(iProjTransform))
+        {
+            const int nEPSGCode = poFeature->GetFieldAsInteger(iProjEPSG);
+            OGRSpatialReference oSTACSRS;
+            oSTACSRS.SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+            if (nEPSGCode > 0 &&
+                oSTACSRS.importFromEPSG(nEPSGCode) == OGRERR_NONE)
+            {
+                int nTransformCount = 0;
+                const auto padfFeatureTransform =
+                    poFeature->GetFieldAsDoubleList(iProjTransform,
+                                                    &nTransformCount);
+                OGREnvelope sEnvelope;
+                if (nTransformCount >= 6 && m_poLayer->GetSpatialRef() &&
+                    m_poLayer->GetExtent(&sEnvelope, /* bForce = */ true) ==
+                        OGRERR_NONE)
+                {
+                    const double dfResX = padfFeatureTransform[0];
+                    osResX = CPLSPrintf("%.17g", dfResX);
+                    const double dfResY = std::fabs(padfFeatureTransform[4]);
+                    osResY = CPLSPrintf("%.17g", dfResY);
+
+                    auto poCT = std::unique_ptr<OGRCoordinateTransformation>(
+                        OGRCreateCoordinateTransformation(
+                            m_poLayer->GetSpatialRef(), &oSTACSRS));
+                    auto poInvCT = std::unique_ptr<OGRCoordinateTransformation>(
+                        poCT ? poCT->GetInverse() : nullptr);
+                    double dfOutMinX = 0;
+                    double dfOutMinY = 0;
+                    double dfOutMaxX = 0;
+                    double dfOutMaxY = 0;
+                    if (dfResX > 0 && dfResY > 0 && poCT && poInvCT &&
+                        poCT->TransformBounds(sEnvelope.MinX, sEnvelope.MinY,
+                                              sEnvelope.MaxX, sEnvelope.MaxY,
+                                              &dfOutMinX, &dfOutMinY,
+                                              &dfOutMaxX, &dfOutMaxY, 21))
+                    {
+                        constexpr double EPSILON = 1e-3;
+                        const bool bTileAlignedOnRes =
+                            (fmod(std::fabs(padfFeatureTransform[3]), dfResX) <=
+                                 EPSILON * dfResX &&
+                             fmod(std::fabs(padfFeatureTransform[5]), dfResY) <=
+                                 EPSILON * dfResY);
+
+                        osMinX = CPLSPrintf(
+                            "%.17g",
+                            !bTileAlignedOnRes
+                                ? dfOutMinX
+                                : std::floor(dfOutMinX / dfResX) * dfResX);
+                        osMinY = CPLSPrintf(
+                            "%.17g",
+                            !bTileAlignedOnRes
+                                ? dfOutMinY
+                                : std::floor(dfOutMinY / dfResY) * dfResY);
+                        osMaxX = CPLSPrintf(
+                            "%.17g",
+                            !bTileAlignedOnRes
+                                ? dfOutMaxX
+                                : std::ceil(dfOutMaxX / dfResX) * dfResX);
+                        osMaxY = CPLSPrintf(
+                            "%.17g",
+                            !bTileAlignedOnRes
+                                ? dfOutMaxY
+                                : std::ceil(dfOutMaxY / dfResY) * dfResY);
+
+                        m_oSRS = std::move(oSTACSRS);
+                        pszResX = osResX.c_str();
+                        pszResY = osResY.c_str();
+                        pszMinX = osMinX.c_str();
+                        pszMinY = osMinY.c_str();
+                        pszMaxX = osMaxX.c_str();
+                        pszMaxY = osMaxY.c_str();
+                        nCountMinMaxXY = 4;
+
+                        poFeature.reset();
+                        m_poLayer->ResetReading();
+
+                        m_poWarpedLayerKeeper =
+                            std::make_unique<OGRWarpedLayer>(
+                                m_poLayer, /* iGeomField = */ 0,
+                                /* bTakeOwnership = */ false, poCT.release(),
+                                poInvCT.release());
+                        m_poLayer = m_poWarpedLayerKeeper.get();
+                        poLayerDefn = m_poLayer->GetLayerDefn();
+                    }
+                }
+            }
+        }
+    }
+
     bool bHasMaskBand = false;
     if ((!pszBandCount && apoXMLNodeBands.empty()) ||
         (!(pszResX && pszResY) && nCountXSizeYSizeGT == 0))
@@ -1021,8 +1200,8 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
         CPLDebug("VRT", "Inspecting one feature due to missing metadata items");
         m_bScannedOneFeatureAtOpening = true;
 
-        auto poFeature =
-            std::unique_ptr<OGRFeature>(m_poLayer->GetNextFeature());
+        if (!poFeature)
+            poFeature.reset(m_poLayer->GetNextFeature());
         if (!poFeature ||
             !poFeature->IsFieldSetAndNotNull(m_nLocationFieldIndex))
         {
@@ -1546,6 +1725,66 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
         nRasterYSize = static_cast<int>(std::ceil(nRasterYSize / dfOvrFactor));
     }
 
+    std::vector<std::string> aosDescriptions;
+    if (bIsStacGeoParquet && poFeature)
+    {
+        const int nEOBandsIdx =
+            poLayerDefn->GetFieldIndex("assets.image.eo:bands");
+        if (nEOBandsIdx >= 0 &&
+            poLayerDefn->GetFieldDefn(nEOBandsIdx)->GetSubType() == OFSTJSON &&
+            poFeature->IsFieldSet(nEOBandsIdx))
+        {
+            const char *pszStr = poFeature->GetFieldAsString(nEOBandsIdx);
+            CPLJSONDocument oDoc;
+            if (oDoc.LoadMemory(pszStr) &&
+                oDoc.GetRoot().GetType() == CPLJSONObject::Type::Array)
+            {
+                const auto oArray = oDoc.GetRoot().ToArray();
+                if (oArray.Size() == nBandCount)
+                {
+                    int i = 0;
+                    aosDescriptions.resize(nBandCount);
+                    static const std::map<std::string, GDALColorInterp>
+                        oMapCommonName = {
+                            {"red", GCI_RedBand},
+                            {"green", GCI_GreenBand},
+                            {"blue", GCI_BlueBand},
+                            {"alpha", GCI_AlphaBand},
+                        };
+                    for (const auto &oObj : oArray)
+                    {
+                        if (oObj.GetType() == CPLJSONObject::Type::Object)
+                        {
+                            const auto osCommonName =
+                                oObj.GetString("common_name");
+                            const auto oIter =
+                                oMapCommonName.find(osCommonName);
+                            if (oIter != oMapCommonName.end())
+                                aeColorInterp[i] = oIter->second;
+
+                            const auto osName = oObj.GetString("name");
+                            aosDescriptions[i] = osName;
+
+                            const auto osDescription =
+                                oObj.GetString("description");
+                            if (!osDescription.empty())
+                            {
+                                if (aosDescriptions[i].empty())
+                                    aosDescriptions[i] = osDescription;
+                                else
+                                    aosDescriptions[i]
+                                        .append(" (")
+                                        .append(osDescription)
+                                        .append(")");
+                            }
+                        }
+                        ++i;
+                    }
+                }
+            }
+        }
+    }
+
     GDALTileIndexBand *poFirstBand = nullptr;
     for (int i = 0; i < nBandCount; ++i)
     {
@@ -1572,6 +1811,10 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
             m_bSameDataType = false;
         }
 
+        if (!aosDescriptions.empty() && !aosDescriptions[i].empty())
+        {
+            poBand->GDALRasterBand::SetDescription(aosDescriptions[i].c_str());
+        }
         if (!apoXMLNodeBands.empty())
         {
             const char *pszVal = CPLGetXMLValue(
@@ -1738,7 +1981,7 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
         }
         else
         {
-            for (int iOvr = 1;; ++iOvr)
+            for (int iOvr = 0;; ++iOvr)
             {
                 const char *pszOvrDSName =
                     GetOption(CPLSPrintf("OVERVIEW_%d_DATASET", iOvr));
@@ -1749,7 +1992,12 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
                 const char *pszOvrFactor =
                     GetOption(CPLSPrintf("OVERVIEW_%d_FACTOR", iOvr));
                 if (!pszOvrDSName && !pszOvrLayer && !pszOvrFactor)
+                {
+                    // Before GDAL 3.9.2, we started the iteration at 1.
+                    if (iOvr == 0)
+                        continue;
                     break;
+                }
                 m_aoOverviewDescriptor.emplace_back(
                     std::string(pszOvrDSName ? pszOvrDSName : ""),
                     pszOpenOptions ? CPLStringList(CSLTokenizeString2(
@@ -1858,6 +2106,10 @@ const char *GDALTileIndexDataset::GetMetadataItem(const char *pszName,
         {
             return CPLSPrintf("%d", static_cast<int>(m_aoSourceDesc.size()));
         }
+        else if (EQUAL(pszName, "MULTI_THREADED_RASTERIO_LAST_USED"))
+        {
+            return m_bLastMustUseMultiThreading ? "1" : "0";
+        }
     }
     return GDALPamDataset::GetMetadataItem(pszName, pszDomain);
 }
@@ -1965,20 +2217,39 @@ static int GDALTileIndexDatasetIdentify(GDALOpenInfo *poOpenInfo)
 
     if (poOpenInfo->nHeaderBytes >= 100 &&
         STARTS_WITH(reinterpret_cast<const char *>(poOpenInfo->pabyHeader),
-                    "SQLite format 3") &&
-        ENDS_WITH_CI(poOpenInfo->pszFilename, ".gti.gpkg") &&
-        !STARTS_WITH(poOpenInfo->pszFilename, "GPKG:"))
+                    "SQLite format 3"))
     {
-        // Most likely handled by GTI driver, but we can't be sure
-        return GDAL_IDENTIFY_UNKNOWN;
+        if (ENDS_WITH_CI(poOpenInfo->pszFilename, ".gti.gpkg"))
+        {
+            // Most likely handled by GTI driver, but we can't be sure
+            return GDAL_IDENTIFY_UNKNOWN;
+        }
+        else if (poOpenInfo->IsSingleAllowedDriver("GTI") &&
+                 EQUAL(CPLGetExtension(poOpenInfo->pszFilename), "gpkg"))
+        {
+            return true;
+        }
     }
 
-    return poOpenInfo->nHeaderBytes > 0 &&
-           (poOpenInfo->nOpenFlags & GDAL_OF_RASTER) != 0 &&
-           (strstr(reinterpret_cast<const char *>(poOpenInfo->pabyHeader),
+    if (poOpenInfo->nHeaderBytes > 0 &&
+        (poOpenInfo->nOpenFlags & GDAL_OF_RASTER) != 0)
+    {
+        if (strstr(reinterpret_cast<const char *>(poOpenInfo->pabyHeader),
                    "<GDALTileIndexDataset") ||
             ENDS_WITH_CI(poOpenInfo->pszFilename, ".gti.fgb") ||
-            ENDS_WITH_CI(poOpenInfo->pszFilename, ".gti.parquet"));
+            ENDS_WITH_CI(poOpenInfo->pszFilename, ".gti.parquet"))
+        {
+            return true;
+        }
+        else if (poOpenInfo->IsSingleAllowedDriver("GTI") &&
+                 (EQUAL(CPLGetExtension(poOpenInfo->pszFilename), "fgb") ||
+                  EQUAL(CPLGetExtension(poOpenInfo->pszFilename), "parquet")))
+        {
+            return true;
+        }
+    }
+
+    return false;
 }
 
 /************************************************************************/
@@ -2164,7 +2435,7 @@ void GDALTileIndexDataset::LoadOverviews()
             if (dfFactor != 0)
             {
                 aosNewOpenOptions.SetNameValue("@FACTOR",
-                                               CPLSPrintf("%.18g", dfFactor));
+                                               CPLSPrintf("%.17g", dfFactor));
             }
             if (!osLyrName.empty())
             {
@@ -2175,11 +2446,54 @@ void GDALTileIndexDataset::LoadOverviews()
                 !osDSName.empty() ? osDSName.c_str() : GetDescription(),
                 GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR, nullptr,
                 aosNewOpenOptions.List(), nullptr));
-            if (poOvrDS)
+
+            const auto IsSmaller =
+                [](const GDALDataset *a, const GDALDataset *b)
+            {
+                return (a->GetRasterXSize() < b->GetRasterXSize() &&
+                        a->GetRasterYSize() <= b->GetRasterYSize()) ||
+                       (a->GetRasterYSize() < b->GetRasterYSize() &&
+                        a->GetRasterXSize() <= b->GetRasterXSize());
+            };
+
+            if (poOvrDS &&
+                ((m_apoOverviews.empty() && IsSmaller(poOvrDS.get(), this)) ||
+                 ((!m_apoOverviews.empty() &&
+                   IsSmaller(poOvrDS.get(), m_apoOverviews.back().get())))))
             {
                 if (poOvrDS->GetRasterCount() == GetRasterCount())
                 {
                     m_apoOverviews.emplace_back(std::move(poOvrDS));
+                    // Add the overviews of the overview, unless the OVERVIEW_LEVEL
+                    // option option is specified
+                    if (aosOpenOptions.FetchNameValue("OVERVIEW_LEVEL") ==
+                        nullptr)
+                    {
+                        const int nOverviewCount = m_apoOverviews.back()
+                                                       ->GetRasterBand(1)
+                                                       ->GetOverviewCount();
+                        for (int i = 0; i < nOverviewCount; ++i)
+                        {
+                            aosNewOpenOptions.SetNameValue("OVERVIEW_LEVEL",
+                                                           CPLSPrintf("%d", i));
+                            std::unique_ptr<GDALDataset> poOvrOfOvrDS(
+                                GDALDataset::Open(
+                                    !osDSName.empty() ? osDSName.c_str()
+                                                      : GetDescription(),
+                                    GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR,
+                                    nullptr, aosNewOpenOptions.List(),
+                                    nullptr));
+                            if (poOvrOfOvrDS &&
+                                poOvrOfOvrDS->GetRasterCount() ==
+                                    GetRasterCount() &&
+                                IsSmaller(poOvrOfOvrDS.get(),
+                                          m_apoOverviews.back().get()))
+                            {
+                                m_apoOverviews.emplace_back(
+                                    std::move(poOvrOfOvrDS));
+                            }
+                        }
+                    }
                 }
                 else
                 {
@@ -2309,6 +2623,151 @@ CPLErr GDALTileIndexBand::IRasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff,
                              nPixelSpace, nLineSpace, 0, psExtraArg);
 }
 
+/************************************************************************/
+/*                         IGetDataCoverageStatus()                     */
+/************************************************************************/
+
+#ifndef HAVE_GEOS
+int GDALTileIndexBand::IGetDataCoverageStatus(int /* nXOff */, int /* nYOff */,
+                                              int /* nXSize */,
+                                              int /* nYSize */,
+                                              int /* nMaskFlagStop */,
+                                              double *pdfDataPct)
+{
+    if (pdfDataPct != nullptr)
+        *pdfDataPct = -1.0;
+    return GDAL_DATA_COVERAGE_STATUS_UNIMPLEMENTED |
+           GDAL_DATA_COVERAGE_STATUS_DATA;
+}
+#else
+int GDALTileIndexBand::IGetDataCoverageStatus(int nXOff, int nYOff, int nXSize,
+                                              int nYSize, int nMaskFlagStop,
+                                              double *pdfDataPct)
+{
+    if (pdfDataPct != nullptr)
+        *pdfDataPct = -1.0;
+
+    const double dfMinX = m_poDS->m_adfGeoTransform[GT_TOPLEFT_X] +
+                          nXOff * m_poDS->m_adfGeoTransform[GT_WE_RES];
+    const double dfMaxX =
+        dfMinX + nXSize * m_poDS->m_adfGeoTransform[GT_WE_RES];
+    const double dfMaxY = m_poDS->m_adfGeoTransform[GT_TOPLEFT_Y] +
+                          nYOff * m_poDS->m_adfGeoTransform[GT_NS_RES];
+    const double dfMinY =
+        dfMaxY + nYSize * m_poDS->m_adfGeoTransform[GT_NS_RES];
+    m_poDS->m_poLayer->SetSpatialFilterRect(dfMinX, dfMinY, dfMaxX, dfMaxY);
+    m_poDS->m_poLayer->ResetReading();
+
+    int nStatus = 0;
+
+    auto poPolyNonCoveredBySources = std::make_unique<OGRPolygon>();
+    {
+        auto poLR = std::make_unique<OGRLinearRing>();
+        poLR->addPoint(nXOff, nYOff);
+        poLR->addPoint(nXOff, nYOff + nYSize);
+        poLR->addPoint(nXOff + nXSize, nYOff + nYSize);
+        poLR->addPoint(nXOff + nXSize, nYOff);
+        poLR->addPoint(nXOff, nYOff);
+        poPolyNonCoveredBySources->addRingDirectly(poLR.release());
+    }
+    while (true)
+    {
+        auto poFeature =
+            std::unique_ptr<OGRFeature>(m_poDS->m_poLayer->GetNextFeature());
+        if (!poFeature)
+            break;
+        if (!poFeature->IsFieldSetAndNotNull(m_poDS->m_nLocationFieldIndex))
+        {
+            continue;
+        }
+
+        const auto poGeom = poFeature->GetGeometryRef();
+        if (!poGeom || poGeom->IsEmpty())
+            continue;
+
+        OGREnvelope sSourceEnvelope;
+        poGeom->getEnvelope(&sSourceEnvelope);
+
+        const double dfDstXOff =
+            std::max<double>(nXOff, (sSourceEnvelope.MinX -
+                                     m_poDS->m_adfGeoTransform[GT_TOPLEFT_X]) /
+                                        m_poDS->m_adfGeoTransform[GT_WE_RES]);
+        const double dfDstXOff2 = std::min<double>(
+            nXOff + nXSize,
+            (sSourceEnvelope.MaxX - m_poDS->m_adfGeoTransform[GT_TOPLEFT_X]) /
+                m_poDS->m_adfGeoTransform[GT_WE_RES]);
+        const double dfDstYOff =
+            std::max<double>(nYOff, (sSourceEnvelope.MaxY -
+                                     m_poDS->m_adfGeoTransform[GT_TOPLEFT_Y]) /
+                                        m_poDS->m_adfGeoTransform[GT_NS_RES]);
+        const double dfDstYOff2 = std::min<double>(
+            nYOff + nYSize,
+            (sSourceEnvelope.MinY - m_poDS->m_adfGeoTransform[GT_TOPLEFT_Y]) /
+                m_poDS->m_adfGeoTransform[GT_NS_RES]);
+
+        // CPLDebug("GTI", "dfDstXOff=%f, dfDstXOff2=%f, dfDstYOff=%f, dfDstYOff2=%f",
+        //         dfDstXOff, dfDstXOff2, dfDstYOff, dfDstXOff2);
+
+        // Check if the AOI is fully inside the source
+        if (nXOff >= dfDstXOff && nYOff >= dfDstYOff &&
+            nXOff + nXSize <= dfDstXOff2 && nYOff + nYSize <= dfDstYOff2)
+        {
+            if (pdfDataPct)
+                *pdfDataPct = 100.0;
+            return GDAL_DATA_COVERAGE_STATUS_DATA;
+        }
+
+        // Check intersection of bounding boxes.
+        if (dfDstXOff2 > nXOff && dfDstYOff2 > nYOff &&
+            dfDstXOff < nXOff + nXSize && dfDstYOff < nYOff + nYSize)
+        {
+            nStatus |= GDAL_DATA_COVERAGE_STATUS_DATA;
+            if (poPolyNonCoveredBySources)
+            {
+                OGRPolygon oPolySource;
+                auto poLR = std::make_unique<OGRLinearRing>();
+                poLR->addPoint(dfDstXOff, dfDstYOff);
+                poLR->addPoint(dfDstXOff, dfDstYOff2);
+                poLR->addPoint(dfDstXOff2, dfDstYOff2);
+                poLR->addPoint(dfDstXOff2, dfDstYOff);
+                poLR->addPoint(dfDstXOff, dfDstYOff);
+                oPolySource.addRingDirectly(poLR.release());
+                auto poRes = std::unique_ptr<OGRGeometry>(
+                    poPolyNonCoveredBySources->Difference(&oPolySource));
+                if (poRes && poRes->IsEmpty())
+                {
+                    if (pdfDataPct)
+                        *pdfDataPct = 100.0;
+                    return GDAL_DATA_COVERAGE_STATUS_DATA;
+                }
+                else if (poRes && poRes->getGeometryType() == wkbPolygon)
+                {
+                    poPolyNonCoveredBySources.reset(
+                        poRes.release()->toPolygon());
+                }
+                else
+                {
+                    poPolyNonCoveredBySources.reset();
+                }
+            }
+        }
+        if (nMaskFlagStop != 0 && (nStatus & nMaskFlagStop) != 0)
+        {
+            return nStatus;
+        }
+    }
+    if (poPolyNonCoveredBySources)
+    {
+        if (!poPolyNonCoveredBySources->IsEmpty())
+            nStatus |= GDAL_DATA_COVERAGE_STATUS_EMPTY;
+        if (pdfDataPct)
+            *pdfDataPct = 100.0 * (1.0 - poPolyNonCoveredBySources->get_Area() /
+                                             nXSize / nYSize);
+    }
+    return nStatus;
+}
+#endif  // HAVE_GEOS
+
 /************************************************************************/
 /*                      GetMetadataDomainList()                         */
 /************************************************************************/
@@ -2377,7 +2836,8 @@ const char *GDALTileIndexBand::GetMetadataItem(const char *pszName,
             iLine >= GetYSize())
             return nullptr;
 
-        if (!m_poDS->CollectSources(iPixel, iLine, 1, 1))
+        if (!m_poDS->CollectSources(iPixel, iLine, 1, 1,
+                                    /* bMultiThreadAllowed = */ false))
             return nullptr;
 
         // Format into XML.
@@ -2683,10 +3143,18 @@ GDALTileIndexDataset::GetSourcesMoreRecentThan(int64_t mTime)
 /************************************************************************/
 
 bool GDALTileIndexDataset::GetSourceDesc(const std::string &osTileName,
-                                         SourceDesc &oSourceDesc)
+                                         SourceDesc &oSourceDesc,
+                                         std::mutex *pMutex)
 {
     std::shared_ptr<GDALDataset> poTileDS;
-    if (!m_oMapSharedSources.tryGet(osTileName, poTileDS))
+
+    if (pMutex)
+        pMutex->lock();
+    const bool bTileKnown = m_oMapSharedSources.tryGet(osTileName, poTileDS);
+    if (pMutex)
+        pMutex->unlock();
+
+    if (!bTileKnown)
     {
         poTileDS = std::shared_ptr<GDALDataset>(
             GDALProxyPoolDataset::Create(
@@ -2796,14 +3264,14 @@ bool GDALTileIndexDataset::GetSourceDesc(const std::string &osTileName,
                     dfVRTResYAbs;
 
             aosOptions.AddString("-te");
-            aosOptions.AddString(CPLSPrintf("%.18g", dfWarpMinX));
-            aosOptions.AddString(CPLSPrintf("%.18g", dfWarpMinY));
-            aosOptions.AddString(CPLSPrintf("%.18g", dfWarpMaxX));
-            aosOptions.AddString(CPLSPrintf("%.18g", dfWarpMaxY));
+            aosOptions.AddString(CPLSPrintf("%.17g", dfWarpMinX));
+            aosOptions.AddString(CPLSPrintf("%.17g", dfWarpMinY));
+            aosOptions.AddString(CPLSPrintf("%.17g", dfWarpMaxX));
+            aosOptions.AddString(CPLSPrintf("%.17g", dfWarpMaxY));
 
             aosOptions.AddString("-tr");
-            aosOptions.AddString(CPLSPrintf("%.18g", dfVRTResX));
-            aosOptions.AddString(CPLSPrintf("%.18g", dfVRTResYAbs));
+            aosOptions.AddString(CPLSPrintf("%.17g", dfVRTResX));
+            aosOptions.AddString(CPLSPrintf("%.17g", dfVRTResYAbs));
 
             aosOptions.AddString("-dstalpha");
 
@@ -2819,7 +3287,11 @@ bool GDALTileIndexDataset::GetSourceDesc(const std::string &osTileName,
             poTileDS.reset(poWarpDS.release());
         }
 
+        if (pMutex)
+            pMutex->lock();
         m_oMapSharedSources.insert(osTileName, poTileDS);
+        if (pMutex)
+            pMutex->unlock();
     }
 
     double adfGeoTransformTile[6];
@@ -2873,19 +3345,13 @@ bool GDALTileIndexDataset::GetSourceDesc(const std::string &osTileName,
         poSource = std::move(poComplexSource);
     }
 
-    if (!GetSrcDstWin(adfGeoTransformTile, poTileDS->GetRasterXSize(),
-                      poTileDS->GetRasterYSize(), m_adfGeoTransform.data(),
-                      GetRasterXSize(), GetRasterYSize(),
-                      &poSource->m_dfSrcXOff, &poSource->m_dfSrcYOff,
-                      &poSource->m_dfSrcXSize, &poSource->m_dfSrcYSize,
-                      &poSource->m_dfDstXOff, &poSource->m_dfDstYOff,
-                      &poSource->m_dfDstXSize, &poSource->m_dfDstYSize))
-    {
-        // Should not happen on a consistent tile index
-        CPLDebug("VRT", "Tile %s does not actually intersect area of interest",
-                 osTileName.c_str());
-        return false;
-    }
+    GetSrcDstWin(adfGeoTransformTile, poTileDS->GetRasterXSize(),
+                 poTileDS->GetRasterYSize(), m_adfGeoTransform.data(),
+                 GetRasterXSize(), GetRasterYSize(), &poSource->m_dfSrcXOff,
+                 &poSource->m_dfSrcYOff, &poSource->m_dfSrcXSize,
+                 &poSource->m_dfSrcYSize, &poSource->m_dfDstXOff,
+                 &poSource->m_dfDstYOff, &poSource->m_dfDstXSize,
+                 &poSource->m_dfDstYSize);
 
     oSourceDesc.osName = osTileName;
     oSourceDesc.poDS = std::move(poTileDS);
@@ -2898,12 +3364,34 @@ bool GDALTileIndexDataset::GetSourceDesc(const std::string &osTileName,
     return true;
 }
 
+/************************************************************************/
+/*                           GetNumThreads()                            */
+/************************************************************************/
+
+int GDALTileIndexDataset::GetNumThreads() const
+{
+    const char *pszNumThreads =
+        CSLFetchNameValueDef(GetOpenOptions(), "NUM_THREADS", nullptr);
+    if (!pszNumThreads)
+        pszNumThreads = CPLGetConfigOption("GTI_NUM_THREADS", nullptr);
+    if (!pszNumThreads)
+        pszNumThreads = CPLGetConfigOption("GDAL_NUM_THREADS", "ALL_CPUS");
+    if (EQUAL(pszNumThreads, "0") || EQUAL(pszNumThreads, "1"))
+        return atoi(pszNumThreads);
+    const int nMaxPoolSize = GDALGetMaxDatasetPoolSize();
+    const int nLimit = std::min(CPLGetNumCPUs(), nMaxPoolSize);
+    if (EQUAL(pszNumThreads, "ALL_CPUS"))
+        return nLimit;
+    return std::min(atoi(pszNumThreads), nLimit);
+}
+
 /************************************************************************/
 /*                        CollectSources()                              */
 /************************************************************************/
 
 bool GDALTileIndexDataset::CollectSources(double dfXOff, double dfYOff,
-                                          double dfXSize, double dfYSize)
+                                          double dfXSize, double dfYSize,
+                                          bool bMultiThreadAllowed)
 {
     const double dfMinX =
         m_adfGeoTransform[GT_TOPLEFT_X] + dfXOff * m_adfGeoTransform[GT_WE_RES];
@@ -2922,6 +3410,7 @@ bool GDALTileIndexDataset::CollectSources(double dfXOff, double dfYOff,
     m_dfLastMinYFilter = dfMinY;
     m_dfLastMaxXFilter = dfMaxX;
     m_dfLastMaxYFilter = dfMaxY;
+    m_bLastMustUseMultiThreading = false;
 
     m_poLayer->SetSpatialFilterRect(dfMinX, dfMinY, dfMaxX, dfMaxY);
     m_poLayer->ResetReading();
@@ -2952,6 +3441,99 @@ bool GDALTileIndexDataset::CollectSources(double dfXOff, double dfYOff,
         }
     }
 
+    constexpr int MINIMUM_PIXEL_COUNT_FOR_THREADED_IO = 1000 * 1000;
+    if (bMultiThreadAllowed && m_aoSourceDesc.size() > 1 &&
+        dfXSize * dfYSize > MINIMUM_PIXEL_COUNT_FOR_THREADED_IO)
+    {
+        if (m_nNumThreads < 0)
+            m_nNumThreads = GetNumThreads();
+        bMultiThreadAllowed = m_nNumThreads > 1;
+    }
+    else
+    {
+        bMultiThreadAllowed = false;
+    }
+
+    if (bMultiThreadAllowed)
+    {
+        CPLRectObj sGlobalBounds;
+        sGlobalBounds.minx = dfXOff;
+        sGlobalBounds.miny = dfYOff;
+        sGlobalBounds.maxx = dfXOff + dfXSize;
+        sGlobalBounds.maxy = dfYOff + dfYSize;
+        CPLQuadTree *hQuadTree = CPLQuadTreeCreate(&sGlobalBounds, nullptr);
+
+        bool bCompatibleOfMultiThread = true;
+        std::set<std::string> oSetTileNames;
+        for (const auto &oSourceDesc : m_aoSourceDesc)
+        {
+            const char *pszTileName =
+                oSourceDesc.poFeature->GetFieldAsString(m_nLocationFieldIndex);
+            if (oSetTileNames.find(pszTileName) != oSetTileNames.end())
+            {
+                bCompatibleOfMultiThread = false;
+                break;
+            }
+            oSetTileNames.insert(pszTileName);
+
+            const auto poGeom = oSourceDesc.poFeature->GetGeometryRef();
+            if (!poGeom || poGeom->IsEmpty())
+                continue;
+
+            OGREnvelope sEnvelope;
+            poGeom->getEnvelope(&sEnvelope);
+
+            CPLRectObj sSourceBounds;
+            sSourceBounds.minx =
+                (sEnvelope.MinX - m_adfGeoTransform[GT_TOPLEFT_X]) /
+                m_adfGeoTransform[GT_WE_RES];
+            sSourceBounds.maxx =
+                (sEnvelope.MaxX - m_adfGeoTransform[GT_TOPLEFT_X]) /
+                m_adfGeoTransform[GT_WE_RES];
+            // Yes use of MaxY to compute miny is intended given that MaxY is
+            // in georeferenced space whereas miny is in pixel space.
+            sSourceBounds.miny =
+                (sEnvelope.MaxY - m_adfGeoTransform[GT_TOPLEFT_Y]) /
+                m_adfGeoTransform[GT_NS_RES];
+            // Same here for maxy vs Miny
+            sSourceBounds.maxy =
+                (sEnvelope.MinY - m_adfGeoTransform[GT_TOPLEFT_Y]) /
+                m_adfGeoTransform[GT_NS_RES];
+
+            // Clamp to global bounds and some epsilon to avoid adjacent tiles
+            // to be considered as overlapping
+            constexpr double EPSILON = 0.1;
+            sSourceBounds.minx =
+                std::max(sGlobalBounds.minx, sSourceBounds.minx) + EPSILON;
+            sSourceBounds.maxx =
+                std::min(sGlobalBounds.maxx, sSourceBounds.maxx) - EPSILON;
+            sSourceBounds.miny =
+                std::max(sGlobalBounds.miny, sSourceBounds.miny) + EPSILON;
+            sSourceBounds.maxy =
+                std::min(sGlobalBounds.maxy, sSourceBounds.maxy) - EPSILON;
+
+            // Check that the new source doesn't overlap an existing one.
+            if (CPLQuadTreeHasMatch(hQuadTree, &sSourceBounds))
+            {
+                bCompatibleOfMultiThread = false;
+                break;
+            }
+
+            CPLQuadTreeInsertWithBounds(
+                hQuadTree,
+                const_cast<void *>(static_cast<const void *>(&oSourceDesc)),
+                &sSourceBounds);
+        }
+
+        CPLQuadTreeDestroy(hQuadTree);
+
+        if (bCompatibleOfMultiThread)
+        {
+            m_bLastMustUseMultiThreading = true;
+            return true;
+        }
+    }
+
     if (m_aoSourceDesc.size() > 1)
     {
         SortSourceDesc();
@@ -2970,9 +3552,64 @@ bool GDALTileIndexDataset::CollectSources(double dfXOff, double dfYOff,
             GetAbsoluteFileName(pszTileName, GetDescription()));
 
         SourceDesc oSourceDesc;
-        if (!GetSourceDesc(osTileName, oSourceDesc))
+        if (!GetSourceDesc(osTileName, oSourceDesc, nullptr))
             continue;
 
+        // Check consistency of bounding box in tile index vs actual
+        // extent of the tile.
+        double adfTileGT[6];
+        if (oSourceDesc.poDS->GetGeoTransform(adfTileGT) == CE_None &&
+            adfTileGT[GT_ROTATION_PARAM1] == 0 &&
+            adfTileGT[GT_ROTATION_PARAM2] == 0)
+        {
+            OGREnvelope sActualTileExtent;
+            sActualTileExtent.MinX = adfTileGT[GT_TOPLEFT_X];
+            sActualTileExtent.MaxX =
+                sActualTileExtent.MinX +
+                oSourceDesc.poDS->GetRasterXSize() * adfTileGT[GT_WE_RES];
+            sActualTileExtent.MaxY = adfTileGT[GT_TOPLEFT_Y];
+            sActualTileExtent.MinY =
+                sActualTileExtent.MaxY +
+                oSourceDesc.poDS->GetRasterYSize() * adfTileGT[GT_NS_RES];
+            const auto poGeom = poFeature->GetGeometryRef();
+            if (poGeom && !poGeom->IsEmpty())
+            {
+                OGREnvelope sGeomTileExtent;
+                poGeom->getEnvelope(&sGeomTileExtent);
+                sGeomTileExtent.MinX -= m_adfGeoTransform[GT_WE_RES];
+                sGeomTileExtent.MaxX += m_adfGeoTransform[GT_WE_RES];
+                sGeomTileExtent.MinY -= std::fabs(m_adfGeoTransform[GT_NS_RES]);
+                sGeomTileExtent.MaxY += std::fabs(m_adfGeoTransform[GT_NS_RES]);
+                if (!sGeomTileExtent.Contains(sActualTileExtent))
+                {
+                    if (!sGeomTileExtent.Intersects(sActualTileExtent))
+                    {
+                        CPLError(CE_Warning, CPLE_AppDefined,
+                                 "Tile index is out of sync with actual "
+                                 "extent of %s. Bounding box from tile index "
+                                 "is (%g, %g, %g, %g) does not intersect at "
+                                 "all bounding box from tile (%g, %g, %g, %g)",
+                                 osTileName.c_str(), sGeomTileExtent.MinX,
+                                 sGeomTileExtent.MinY, sGeomTileExtent.MaxX,
+                                 sGeomTileExtent.MaxY, sActualTileExtent.MinX,
+                                 sActualTileExtent.MinY, sActualTileExtent.MaxX,
+                                 sActualTileExtent.MaxY);
+                        continue;
+                    }
+                    CPLError(CE_Warning, CPLE_AppDefined,
+                             "Tile index is out of sync with actual extent "
+                             "of %s. Bounding box from tile index is (%g, %g, "
+                             "%g, %g) does not fully contain bounding box from "
+                             "tile (%g, %g, %g, %g)",
+                             osTileName.c_str(), sGeomTileExtent.MinX,
+                             sGeomTileExtent.MinY, sGeomTileExtent.MaxX,
+                             sGeomTileExtent.MaxY, sActualTileExtent.MinX,
+                             sActualTileExtent.MinY, sActualTileExtent.MaxX,
+                             sActualTileExtent.MaxY);
+                }
+            }
+        }
+
         const auto &poSource = oSourceDesc.poSource;
         if (dfXOff >= poSource->m_dfDstXOff + poSource->m_dfDstXSize ||
             dfYOff >= poSource->m_dfDstYOff + poSource->m_dfDstYSize ||
@@ -3313,6 +3950,378 @@ void GDALTileIndexDataset::InitBuffer(void *pData, int nBufXSize, int nBufYSize,
     }
 }
 
+/************************************************************************/
+/*                            RenderSource()                            */
+/************************************************************************/
+
+CPLErr GDALTileIndexDataset::RenderSource(
+    const SourceDesc &oSourceDesc, bool bNeedInitBuffer, int nBandNrMax,
+    int nXOff, int nYOff, int nXSize, int nYSize, double dfXOff, double dfYOff,
+    double dfXSize, double dfYSize, int nBufXSize, int nBufYSize, void *pData,
+    GDALDataType eBufType, int nBandCount, BANDMAP_TYPE panBandMap,
+    GSpacing nPixelSpace, GSpacing nLineSpace, GSpacing nBandSpace,
+    GDALRasterIOExtraArg *psExtraArg,
+    VRTSource::WorkingState &oWorkingState) const
+{
+    auto &poTileDS = oSourceDesc.poDS;
+    auto &poSource = oSourceDesc.poSource;
+    auto poComplexSource = dynamic_cast<VRTComplexSource *>(poSource.get());
+    CPLErr eErr = CE_None;
+
+    if (poTileDS->GetRasterCount() + 1 == nBandNrMax &&
+        papoBands[nBandNrMax - 1]->GetColorInterpretation() == GCI_AlphaBand &&
+        papoBands[nBandNrMax - 1]->GetRasterDataType() == GDT_Byte)
+    {
+        // Special case when there's typically a mix of RGB and RGBA source
+        // datasets and we read a RGB one.
+        for (int iBand = 0; iBand < nBandCount && eErr == CE_None; ++iBand)
+        {
+            const int nBandNr = panBandMap[iBand];
+            if (nBandNr == nBandNrMax)
+            {
+                // The window we will actually request from the source raster band.
+                double dfReqXOff = 0.0;
+                double dfReqYOff = 0.0;
+                double dfReqXSize = 0.0;
+                double dfReqYSize = 0.0;
+                int nReqXOff = 0;
+                int nReqYOff = 0;
+                int nReqXSize = 0;
+                int nReqYSize = 0;
+
+                // The window we will actual set _within_ the pData buffer.
+                int nOutXOff = 0;
+                int nOutYOff = 0;
+                int nOutXSize = 0;
+                int nOutYSize = 0;
+
+                bool bError = false;
+
+                auto poTileBand = poTileDS->GetRasterBand(1);
+                poSource->SetRasterBand(poTileBand, false);
+                if (poSource->GetSrcDstWindow(
+                        dfXOff, dfYOff, dfXSize, dfYSize, nBufXSize, nBufYSize,
+                        &dfReqXOff, &dfReqYOff, &dfReqXSize, &dfReqYSize,
+                        &nReqXOff, &nReqYOff, &nReqXSize, &nReqYSize, &nOutXOff,
+                        &nOutYOff, &nOutXSize, &nOutYSize, bError))
+                {
+                    GByte *pabyOut =
+                        static_cast<GByte *>(pData) +
+                        static_cast<GPtrDiff_t>(iBand * nBandSpace +
+                                                nOutXOff * nPixelSpace +
+                                                nOutYOff * nLineSpace);
+
+                    constexpr GByte n255 = 255;
+                    for (int iY = 0; iY < nOutYSize; iY++)
+                    {
+                        GDALCopyWords(
+                            &n255, GDT_Byte, 0,
+                            pabyOut + static_cast<GPtrDiff_t>(iY * nLineSpace),
+                            eBufType, static_cast<int>(nPixelSpace), nOutXSize);
+                    }
+                }
+            }
+            else
+            {
+                auto poTileBand = poTileDS->GetRasterBand(nBandNr);
+                if (poComplexSource)
+                {
+                    int bHasNoData = false;
+                    const double dfNoDataValue =
+                        poTileBand->GetNoDataValue(&bHasNoData);
+                    poComplexSource->SetNoDataValue(
+                        bHasNoData ? dfNoDataValue : VRT_NODATA_UNSET);
+                }
+                poSource->SetRasterBand(poTileBand, false);
+
+                GDALRasterIOExtraArg sExtraArg;
+                INIT_RASTERIO_EXTRA_ARG(sExtraArg);
+                if (psExtraArg->eResampleAlg != GRIORA_NearestNeighbour)
+                {
+                    // cppcheck-suppress redundantAssignment
+                    sExtraArg.eResampleAlg = psExtraArg->eResampleAlg;
+                }
+                else
+                {
+                    // cppcheck-suppress redundantAssignment
+                    sExtraArg.eResampleAlg = m_eResampling;
+                }
+
+                GByte *pabyBandData =
+                    static_cast<GByte *>(pData) + iBand * nBandSpace;
+                eErr = poSource->RasterIO(
+                    poTileBand->GetRasterDataType(), nXOff, nYOff, nXSize,
+                    nYSize, pabyBandData, nBufXSize, nBufYSize, eBufType,
+                    nPixelSpace, nLineSpace, &sExtraArg, oWorkingState);
+            }
+        }
+        return eErr;
+    }
+    else if (poTileDS->GetRasterCount() < nBandNrMax)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "%s has not enough bands.",
+                 oSourceDesc.osName.c_str());
+        return CE_Failure;
+    }
+
+    if ((oSourceDesc.poMaskBand && bNeedInitBuffer) || nBandNrMax == 0)
+    {
+        // The window we will actually request from the source raster band.
+        double dfReqXOff = 0.0;
+        double dfReqYOff = 0.0;
+        double dfReqXSize = 0.0;
+        double dfReqYSize = 0.0;
+        int nReqXOff = 0;
+        int nReqYOff = 0;
+        int nReqXSize = 0;
+        int nReqYSize = 0;
+
+        // The window we will actual set _within_ the pData buffer.
+        int nOutXOff = 0;
+        int nOutYOff = 0;
+        int nOutXSize = 0;
+        int nOutYSize = 0;
+
+        bool bError = false;
+
+        auto poFirstTileBand = poTileDS->GetRasterBand(1);
+        poSource->SetRasterBand(poFirstTileBand, false);
+        if (poSource->GetSrcDstWindow(
+                dfXOff, dfYOff, dfXSize, dfYSize, nBufXSize, nBufYSize,
+                &dfReqXOff, &dfReqYOff, &dfReqXSize, &dfReqYSize, &nReqXOff,
+                &nReqYOff, &nReqXSize, &nReqYSize, &nOutXOff, &nOutYOff,
+                &nOutXSize, &nOutYSize, bError))
+        {
+            int iMaskBandIdx = -1;
+            if (eBufType == GDT_Byte && nBandNrMax == 0)
+            {
+                // when called from m_poMaskBand
+                iMaskBandIdx = 0;
+            }
+            else if (oSourceDesc.poMaskBand)
+            {
+                // If we request a Byte buffer and the mask band is actually
+                // one of the queried bands of this request, we can save
+                // requesting it separately.
+                const int nMaskBandNr = oSourceDesc.poMaskBand->GetBand();
+                if (eBufType == GDT_Byte && nMaskBandNr >= 1 &&
+                    nMaskBandNr <= poTileDS->GetRasterCount() &&
+                    poTileDS->GetRasterBand(nMaskBandNr) ==
+                        oSourceDesc.poMaskBand)
+                {
+                    for (int iBand = 0; iBand < nBandCount; ++iBand)
+                    {
+                        if (panBandMap[iBand] == nMaskBandNr)
+                        {
+                            iMaskBandIdx = iBand;
+                            break;
+                        }
+                    }
+                }
+            }
+
+            GDALRasterIOExtraArg sExtraArg;
+            INIT_RASTERIO_EXTRA_ARG(sExtraArg);
+            if (psExtraArg->eResampleAlg != GRIORA_NearestNeighbour)
+            {
+                // cppcheck-suppress redundantAssignment
+                sExtraArg.eResampleAlg = psExtraArg->eResampleAlg;
+            }
+            else
+            {
+                // cppcheck-suppress redundantAssignment
+                sExtraArg.eResampleAlg = m_eResampling;
+            }
+            sExtraArg.bFloatingPointWindowValidity = TRUE;
+            sExtraArg.dfXOff = dfReqXOff;
+            sExtraArg.dfYOff = dfReqYOff;
+            sExtraArg.dfXSize = dfReqXSize;
+            sExtraArg.dfYSize = dfReqYSize;
+
+            if (iMaskBandIdx < 0 && oSourceDesc.abyMask.empty() &&
+                oSourceDesc.poMaskBand)
+            {
+                // Fetch the mask band
+                try
+                {
+                    oSourceDesc.abyMask.resize(static_cast<size_t>(nOutXSize) *
+                                               nOutYSize);
+                }
+                catch (const std::bad_alloc &)
+                {
+                    CPLError(CE_Failure, CPLE_OutOfMemory,
+                             "Cannot allocate working buffer for mask");
+                    return CE_Failure;
+                }
+
+                if (oSourceDesc.poMaskBand->RasterIO(
+                        GF_Read, nReqXOff, nReqYOff, nReqXSize, nReqYSize,
+                        oSourceDesc.abyMask.data(), nOutXSize, nOutYSize,
+                        GDT_Byte, 0, 0, &sExtraArg) != CE_None)
+                {
+                    oSourceDesc.abyMask.clear();
+                    return CE_Failure;
+                }
+            }
+
+            // Allocate a temporary contiguous buffer to receive pixel data
+            const int nBufTypeSize = GDALGetDataTypeSizeBytes(eBufType);
+            const size_t nWorkBufferBandSize =
+                static_cast<size_t>(nOutXSize) * nOutYSize * nBufTypeSize;
+            std::vector<GByte> abyWorkBuffer;
+            try
+            {
+                abyWorkBuffer.resize(nBandCount * nWorkBufferBandSize);
+            }
+            catch (const std::bad_alloc &)
+            {
+                CPLError(CE_Failure, CPLE_OutOfMemory,
+                         "Cannot allocate working buffer");
+                return CE_Failure;
+            }
+
+            const GByte *const pabyMask =
+                iMaskBandIdx >= 0
+                    ? abyWorkBuffer.data() + iMaskBandIdx * nWorkBufferBandSize
+                    : oSourceDesc.abyMask.data();
+
+            if (nBandNrMax == 0)
+            {
+                // Special case when called from m_poMaskBand
+                if (poTileDS->GetRasterBand(1)->GetMaskBand()->RasterIO(
+                        GF_Read, nReqXOff, nReqYOff, nReqXSize, nReqYSize,
+                        abyWorkBuffer.data(), nOutXSize, nOutYSize, eBufType, 0,
+                        0, &sExtraArg) != CE_None)
+                {
+                    return CE_Failure;
+                }
+            }
+            else if (poTileDS->RasterIO(GF_Read, nReqXOff, nReqYOff, nReqXSize,
+                                        nReqYSize, abyWorkBuffer.data(),
+                                        nOutXSize, nOutYSize, eBufType,
+                                        nBandCount, panBandMap, 0, 0, 0,
+                                        &sExtraArg) != CE_None)
+            {
+                return CE_Failure;
+            }
+
+            // Compose the temporary contiguous buffer into the target
+            // buffer, taking into account the mask
+            GByte *pabyOut = static_cast<GByte *>(pData) +
+                             static_cast<GPtrDiff_t>(nOutXOff * nPixelSpace +
+                                                     nOutYOff * nLineSpace);
+
+            for (int iBand = 0; iBand < nBandCount && eErr == CE_None; ++iBand)
+            {
+                GByte *pabyDestBand =
+                    pabyOut + static_cast<GPtrDiff_t>(iBand * nBandSpace);
+                const GByte *pabySrc =
+                    abyWorkBuffer.data() + iBand * nWorkBufferBandSize;
+
+                CompositeSrcWithMaskIntoDest(
+                    nOutXSize, nOutYSize, eBufType, nBufTypeSize, nPixelSpace,
+                    nLineSpace, pabySrc, pabyMask, pabyDestBand);
+            }
+        }
+    }
+    else if (m_bSameDataType && !bNeedInitBuffer && oSourceDesc.bHasNoData)
+    {
+        // We create a non-VRTComplexSource SimpleSource copy of poSource
+        // to be able to call DatasetRasterIO()
+        VRTSimpleSource oSimpleSource(poSource.get(), 1.0, 1.0);
+
+        GDALRasterIOExtraArg sExtraArg;
+        INIT_RASTERIO_EXTRA_ARG(sExtraArg);
+        if (psExtraArg->eResampleAlg != GRIORA_NearestNeighbour)
+        {
+            // cppcheck-suppress redundantAssignment
+            sExtraArg.eResampleAlg = psExtraArg->eResampleAlg;
+        }
+        else
+        {
+            // cppcheck-suppress redundantAssignment
+            sExtraArg.eResampleAlg = m_eResampling;
+        }
+
+        auto poTileBand = poTileDS->GetRasterBand(panBandMap[0]);
+        oSimpleSource.SetRasterBand(poTileBand, false);
+        eErr = oSimpleSource.DatasetRasterIO(
+            papoBands[0]->GetRasterDataType(), nXOff, nYOff, nXSize, nYSize,
+            pData, nBufXSize, nBufYSize, eBufType, nBandCount, panBandMap,
+            nPixelSpace, nLineSpace, nBandSpace, &sExtraArg);
+    }
+    else if (m_bSameDataType && !poComplexSource)
+    {
+        auto poTileBand = poTileDS->GetRasterBand(panBandMap[0]);
+        poSource->SetRasterBand(poTileBand, false);
+
+        GDALRasterIOExtraArg sExtraArg;
+        INIT_RASTERIO_EXTRA_ARG(sExtraArg);
+        if (poTileBand->GetColorTable())
+        {
+            // cppcheck-suppress redundantAssignment
+            sExtraArg.eResampleAlg = GRIORA_NearestNeighbour;
+        }
+        else if (psExtraArg->eResampleAlg != GRIORA_NearestNeighbour)
+        {
+            // cppcheck-suppress redundantAssignment
+            sExtraArg.eResampleAlg = psExtraArg->eResampleAlg;
+        }
+        else
+        {
+            // cppcheck-suppress redundantAssignment
+            sExtraArg.eResampleAlg = m_eResampling;
+        }
+
+        eErr = poSource->DatasetRasterIO(
+            papoBands[0]->GetRasterDataType(), nXOff, nYOff, nXSize, nYSize,
+            pData, nBufXSize, nBufYSize, eBufType, nBandCount, panBandMap,
+            nPixelSpace, nLineSpace, nBandSpace, &sExtraArg);
+    }
+    else
+    {
+        for (int i = 0; i < nBandCount && eErr == CE_None; ++i)
+        {
+            const int nBandNr = panBandMap[i];
+            GByte *pabyBandData = static_cast<GByte *>(pData) + i * nBandSpace;
+            auto poTileBand = poTileDS->GetRasterBand(nBandNr);
+            if (poComplexSource)
+            {
+                int bHasNoData = false;
+                const double dfNoDataValue =
+                    poTileBand->GetNoDataValue(&bHasNoData);
+                poComplexSource->SetNoDataValue(bHasNoData ? dfNoDataValue
+                                                           : VRT_NODATA_UNSET);
+            }
+            poSource->SetRasterBand(poTileBand, false);
+
+            GDALRasterIOExtraArg sExtraArg;
+            INIT_RASTERIO_EXTRA_ARG(sExtraArg);
+            if (poTileBand->GetColorTable())
+            {
+                // cppcheck-suppress redundantAssignment
+                sExtraArg.eResampleAlg = GRIORA_NearestNeighbour;
+            }
+            else if (psExtraArg->eResampleAlg != GRIORA_NearestNeighbour)
+            {
+                // cppcheck-suppress redundantAssignment
+                sExtraArg.eResampleAlg = psExtraArg->eResampleAlg;
+            }
+            else
+            {
+                // cppcheck-suppress redundantAssignment
+                sExtraArg.eResampleAlg = m_eResampling;
+            }
+
+            eErr = poSource->RasterIO(
+                papoBands[nBandNr - 1]->GetRasterDataType(), nXOff, nYOff,
+                nXSize, nYSize, pabyBandData, nBufXSize, nBufYSize, eBufType,
+                nPixelSpace, nLineSpace, &sExtraArg, oWorkingState);
+        }
+    }
+    return eErr;
+}
+
 /************************************************************************/
 /*                             IRasterIO()                              */
 /************************************************************************/
@@ -3349,7 +4358,8 @@ CPLErr GDALTileIndexDataset::IRasterIO(
         dfYSize = psExtraArg->dfYSize;
     }
 
-    if (!CollectSources(dfXOff, dfYOff, dfXSize, dfYSize))
+    if (!CollectSources(dfXOff, dfYOff, dfXSize, dfYSize,
+                        /* bMultiThreadAllowed = */ true))
     {
         return CE_Failure;
     }
@@ -3363,364 +4373,232 @@ CPLErr GDALTileIndexDataset::IRasterIO(
         nBandNrMax = std::max(nBandNrMax, nBandNr);
     }
 
-    const bool bNeedInitBuffer = NeedInitBuffer(nBandCount, panBandMap);
+    const bool bNeedInitBuffer =
+        m_bLastMustUseMultiThreading || NeedInitBuffer(nBandCount, panBandMap);
 
-    const auto RenderSource = [this, bNeedInitBuffer, nBandNrMax, nXOff, nYOff,
-                               nXSize, nYSize, dfXOff, dfYOff, dfXSize, dfYSize,
-                               nBufXSize, nBufYSize, pData, eBufType,
-                               nBandCount, panBandMap, nPixelSpace, nLineSpace,
-                               nBandSpace, psExtraArg](SourceDesc &oSourceDesc)
+    if (!bNeedInitBuffer)
+    {
+        return RenderSource(
+            m_aoSourceDesc.back(), bNeedInitBuffer, nBandNrMax, nXOff, nYOff,
+            nXSize, nYSize, dfXOff, dfYOff, dfXSize, dfYSize, nBufXSize,
+            nBufYSize, pData, eBufType, nBandCount, panBandMap, nPixelSpace,
+            nLineSpace, nBandSpace, psExtraArg, m_oWorkingState);
+    }
+    else
     {
-        auto &poTileDS = oSourceDesc.poDS;
-        auto &poSource = oSourceDesc.poSource;
-        auto poComplexSource = dynamic_cast<VRTComplexSource *>(poSource.get());
-        CPLErr eErr = CE_None;
+        InitBuffer(pData, nBufXSize, nBufYSize, eBufType, nBandCount,
+                   panBandMap, nPixelSpace, nLineSpace, nBandSpace);
 
-        if (poTileDS->GetRasterCount() + 1 == nBandNrMax &&
-            GetRasterBand(nBandNrMax)->GetColorInterpretation() ==
-                GCI_AlphaBand &&
-            GetRasterBand(nBandNrMax)->GetRasterDataType() == GDT_Byte)
+        if (m_bLastMustUseMultiThreading)
         {
-            // Special case when there's typically a mix of RGB and RGBA source
-            // datasets and we read a RGB one.
-            for (int iBand = 0; iBand < nBandCount && eErr == CE_None; ++iBand)
+            std::atomic<bool> bSuccess = true;
+            const int nContributingSources =
+                static_cast<int>(m_aoSourceDesc.size());
+            CPLWorkerThreadPool *psThreadPool = GDALGetGlobalThreadPool(
+                std::min(nContributingSources, m_nNumThreads));
+            const int nThreads =
+                std::min(nContributingSources, psThreadPool->GetThreadCount());
+            CPLDebugOnly("GTI",
+                         "IRasterIO(): use optimized "
+                         "multi-threaded code path. "
+                         "Using %d threads",
+                         nThreads);
+
             {
-                const int nBandNr = panBandMap[iBand];
-                if (nBandNr == nBandNrMax)
+                std::lock_guard oLock(m_oQueueWorkingStates.oMutex);
+                if (m_oQueueWorkingStates.oStates.size() <
+                    static_cast<size_t>(nThreads))
                 {
-                    // The window we will actually request from the source raster band.
-                    double dfReqXOff = 0.0;
-                    double dfReqYOff = 0.0;
-                    double dfReqXSize = 0.0;
-                    double dfReqYSize = 0.0;
-                    int nReqXOff = 0;
-                    int nReqYOff = 0;
-                    int nReqXSize = 0;
-                    int nReqYSize = 0;
-
-                    // The window we will actual set _within_ the pData buffer.
-                    int nOutXOff = 0;
-                    int nOutYOff = 0;
-                    int nOutXSize = 0;
-                    int nOutYSize = 0;
-
-                    bool bError = false;
-
-                    auto poTileBand = poTileDS->GetRasterBand(1);
-                    poSource->SetRasterBand(poTileBand, false);
-                    if (poSource->GetSrcDstWindow(
-                            dfXOff, dfYOff, dfXSize, dfYSize, nBufXSize,
-                            nBufYSize, &dfReqXOff, &dfReqYOff, &dfReqXSize,
-                            &dfReqYSize, &nReqXOff, &nReqYOff, &nReqXSize,
-                            &nReqYSize, &nOutXOff, &nOutYOff, &nOutXSize,
-                            &nOutYSize, bError))
-                    {
-                        GByte *pabyOut =
-                            static_cast<GByte *>(pData) +
-                            static_cast<GPtrDiff_t>(iBand * nBandSpace +
-                                                    nOutXOff * nPixelSpace +
-                                                    nOutYOff * nLineSpace);
-
-                        constexpr GByte n255 = 255;
-                        for (int iY = 0; iY < nOutYSize; iY++)
-                        {
-                            GDALCopyWords(&n255, GDT_Byte, 0,
-                                          pabyOut + static_cast<GPtrDiff_t>(
-                                                        iY * nLineSpace),
-                                          eBufType,
-                                          static_cast<int>(nPixelSpace),
-                                          nOutXSize);
-                        }
-                    }
+                    m_oQueueWorkingStates.oStates.resize(nThreads);
                 }
-                else
+                for (int i = 0; i < nThreads; ++i)
                 {
-                    auto poTileBand = poTileDS->GetRasterBand(nBandNr);
-                    if (poComplexSource)
-                    {
-                        int bHasNoData = false;
-                        const double dfNoDataValue =
-                            poTileBand->GetNoDataValue(&bHasNoData);
-                        poComplexSource->SetNoDataValue(
-                            bHasNoData ? dfNoDataValue : VRT_NODATA_UNSET);
-                    }
-                    poSource->SetRasterBand(poTileBand, false);
-
-                    GDALRasterIOExtraArg sExtraArg;
-                    INIT_RASTERIO_EXTRA_ARG(sExtraArg);
-                    if (psExtraArg->eResampleAlg != GRIORA_NearestNeighbour)
-                        sExtraArg.eResampleAlg = psExtraArg->eResampleAlg;
-                    else
-                        sExtraArg.eResampleAlg = m_eResampling;
-
-                    GByte *pabyBandData =
-                        static_cast<GByte *>(pData) + iBand * nBandSpace;
-                    eErr = poSource->RasterIO(
-                        poTileBand->GetRasterDataType(), nXOff, nYOff, nXSize,
-                        nYSize, pabyBandData, nBufXSize, nBufYSize, eBufType,
-                        nPixelSpace, nLineSpace, &sExtraArg, m_oWorkingState);
+                    if (!m_oQueueWorkingStates.oStates[i])
+                        m_oQueueWorkingStates.oStates[i] =
+                            std::make_unique<VRTSource::WorkingState>();
                 }
             }
-            return eErr;
-        }
-        else if (poTileDS->GetRasterCount() < nBandNrMax)
-        {
-            CPLError(CE_Failure, CPLE_AppDefined, "%s has not enough bands.",
-                     oSourceDesc.osName.c_str());
-            return CE_Failure;
-        }
-
-        if ((oSourceDesc.poMaskBand && bNeedInitBuffer) || nBandNrMax == 0)
-        {
-            // The window we will actually request from the source raster band.
-            double dfReqXOff = 0.0;
-            double dfReqYOff = 0.0;
-            double dfReqXSize = 0.0;
-            double dfReqYSize = 0.0;
-            int nReqXOff = 0;
-            int nReqYOff = 0;
-            int nReqXSize = 0;
-            int nReqYSize = 0;
 
-            // The window we will actual set _within_ the pData buffer.
-            int nOutXOff = 0;
-            int nOutYOff = 0;
-            int nOutXSize = 0;
-            int nOutYSize = 0;
-
-            bool bError = false;
-
-            auto poFirstTileBand = poTileDS->GetRasterBand(1);
-            poSource->SetRasterBand(poFirstTileBand, false);
-            if (poSource->GetSrcDstWindow(
-                    dfXOff, dfYOff, dfXSize, dfYSize, nBufXSize, nBufYSize,
-                    &dfReqXOff, &dfReqYOff, &dfReqXSize, &dfReqYSize, &nReqXOff,
-                    &nReqYOff, &nReqXSize, &nReqYSize, &nOutXOff, &nOutYOff,
-                    &nOutXSize, &nOutYSize, bError))
+            auto oQueue = psThreadPool->CreateJobQueue();
+            std::atomic<int> nCompletedJobs = 0;
+            std::string osErrorMsg;
+            for (auto &oSourceDesc : m_aoSourceDesc)
             {
-                int iMaskBandIdx = -1;
-                if (eBufType == GDT_Byte && nBandNrMax == 0)
-                {
-                    // when called from m_poMaskBand
-                    iMaskBandIdx = 0;
-                }
-                else if (oSourceDesc.poMaskBand)
+                auto psJob = new RasterIOJob();
+                psJob->poDS = this;
+                psJob->pbSuccess = &bSuccess;
+                psJob->pnCompletedJobs = &nCompletedJobs;
+                psJob->poQueueWorkingStates = &m_oQueueWorkingStates;
+                psJob->nBandNrMax = nBandNrMax;
+                psJob->posErrorMsg = &osErrorMsg;
+                psJob->nXOff = nXOff;
+                psJob->nYOff = nYOff;
+                psJob->nXSize = nXSize;
+                psJob->nYSize = nYSize;
+                psJob->pData = pData;
+                psJob->nBufXSize = nBufXSize;
+                psJob->nBufYSize = nBufYSize;
+                psJob->eBufType = eBufType;
+                psJob->nBandCount = nBandCount;
+                psJob->panBandMap = panBandMap;
+                psJob->nPixelSpace = nPixelSpace;
+                psJob->nLineSpace = nLineSpace;
+                psJob->nBandSpace = nBandSpace;
+                psJob->psExtraArg = psExtraArg;
+
+                psJob->osTileName = oSourceDesc.poFeature->GetFieldAsString(
+                    m_nLocationFieldIndex);
+
+                if (!oQueue->SubmitJob(RasterIOJob::Func, psJob))
                 {
-                    // If we request a Byte buffer and the mask band is actually
-                    // one of the queried bands of this request, we can save
-                    // requesting it separately.
-                    const int nMaskBandNr = oSourceDesc.poMaskBand->GetBand();
-                    if (eBufType == GDT_Byte && nMaskBandNr >= 1 &&
-                        nMaskBandNr <= poTileDS->GetRasterCount() &&
-                        poTileDS->GetRasterBand(nMaskBandNr) ==
-                            oSourceDesc.poMaskBand)
-                    {
-                        for (int iBand = 0; iBand < nBandCount; ++iBand)
-                        {
-                            if (panBandMap[iBand] == nMaskBandNr)
-                            {
-                                iMaskBandIdx = iBand;
-                                break;
-                            }
-                        }
-                    }
+                    delete psJob;
+                    bSuccess = false;
+                    break;
                 }
+            }
 
-                GDALRasterIOExtraArg sExtraArg;
-                INIT_RASTERIO_EXTRA_ARG(sExtraArg);
-                if (psExtraArg->eResampleAlg != GRIORA_NearestNeighbour)
-                    sExtraArg.eResampleAlg = psExtraArg->eResampleAlg;
-                else
-                    sExtraArg.eResampleAlg = m_eResampling;
-                sExtraArg.bFloatingPointWindowValidity = TRUE;
-                sExtraArg.dfXOff = dfReqXOff;
-                sExtraArg.dfYOff = dfReqYOff;
-                sExtraArg.dfXSize = dfReqXSize;
-                sExtraArg.dfYSize = dfReqYSize;
-
-                if (iMaskBandIdx < 0 && oSourceDesc.abyMask.empty() &&
-                    oSourceDesc.poMaskBand)
+            while (oQueue->WaitEvent())
+            {
+                // Quite rough progress callback. We could do better by counting
+                // the number of contributing pixels.
+                if (psExtraArg->pfnProgress)
                 {
-                    // Fetch the mask band
-                    try
-                    {
-                        oSourceDesc.abyMask.resize(
-                            static_cast<size_t>(nOutXSize) * nOutYSize);
-                    }
-                    catch (const std::bad_alloc &)
-                    {
-                        CPLError(CE_Failure, CPLE_OutOfMemory,
-                                 "Cannot allocate working buffer for mask");
-                        return CE_Failure;
-                    }
-
-                    if (oSourceDesc.poMaskBand->RasterIO(
-                            GF_Read, nReqXOff, nReqYOff, nReqXSize, nReqYSize,
-                            oSourceDesc.abyMask.data(), nOutXSize, nOutYSize,
-                            GDT_Byte, 0, 0, &sExtraArg) != CE_None)
-                    {
-                        oSourceDesc.abyMask.clear();
-                        return CE_Failure;
-                    }
+                    psExtraArg->pfnProgress(double(nCompletedJobs.load()) /
+                                                nContributingSources,
+                                            "", psExtraArg->pProgressData);
                 }
+            }
 
-                // Allocate a temporary contiguous buffer to receive pixel data
-                const int nBufTypeSize = GDALGetDataTypeSizeBytes(eBufType);
-                const size_t nWorkBufferBandSize =
-                    static_cast<size_t>(nOutXSize) * nOutYSize * nBufTypeSize;
-                std::vector<GByte> abyWorkBuffer;
-                try
-                {
-                    abyWorkBuffer.resize(nBandCount * nWorkBufferBandSize);
-                }
-                catch (const std::bad_alloc &)
-                {
-                    CPLError(CE_Failure, CPLE_OutOfMemory,
-                             "Cannot allocate working buffer");
-                    return CE_Failure;
-                }
+            if (!osErrorMsg.empty())
+            {
+                CPLError(CE_Failure, CPLE_AppDefined, "%s", osErrorMsg.c_str());
+            }
 
-                const GByte *const pabyMask =
-                    iMaskBandIdx >= 0 ? abyWorkBuffer.data() +
-                                            iMaskBandIdx * nWorkBufferBandSize
-                                      : oSourceDesc.abyMask.data();
+            if (bSuccess && psExtraArg->pfnProgress)
+            {
+                psExtraArg->pfnProgress(1.0, "", psExtraArg->pProgressData);
+            }
 
-                if (nBandNrMax == 0)
-                {
-                    // Special case when called from m_poMaskBand
-                    if (poTileDS->GetRasterBand(1)->GetMaskBand()->RasterIO(
-                            GF_Read, nReqXOff, nReqYOff, nReqXSize, nReqYSize,
-                            abyWorkBuffer.data(), nOutXSize, nOutYSize,
-                            eBufType, 0, 0, &sExtraArg) != CE_None)
-                    {
-                        return CE_Failure;
-                    }
-                }
-                else if (poTileDS->RasterIO(
-                             GF_Read, nReqXOff, nReqYOff, nReqXSize, nReqYSize,
-                             abyWorkBuffer.data(), nOutXSize, nOutYSize,
-                             eBufType, nBandCount, panBandMap, 0, 0, 0,
-                             &sExtraArg) != CE_None)
-                {
+            return bSuccess ? CE_None : CE_Failure;
+        }
+        else
+        {
+            // Now render from bottom of the stack to top.
+            for (auto &oSourceDesc : m_aoSourceDesc)
+            {
+                if (oSourceDesc.poDS &&
+                    RenderSource(oSourceDesc, bNeedInitBuffer, nBandNrMax,
+                                 nXOff, nYOff, nXSize, nYSize, dfXOff, dfYOff,
+                                 dfXSize, dfYSize, nBufXSize, nBufYSize, pData,
+                                 eBufType, nBandCount, panBandMap, nPixelSpace,
+                                 nLineSpace, nBandSpace, psExtraArg,
+                                 m_oWorkingState) != CE_None)
                     return CE_Failure;
-                }
-
-                // Compose the temporary contiguous buffer into the target
-                // buffer, taking into account the mask
-                GByte *pabyOut =
-                    static_cast<GByte *>(pData) +
-                    static_cast<GPtrDiff_t>(nOutXOff * nPixelSpace +
-                                            nOutYOff * nLineSpace);
+            }
 
-                for (int iBand = 0; iBand < nBandCount && eErr == CE_None;
-                     ++iBand)
-                {
-                    GByte *pabyDestBand =
-                        pabyOut + static_cast<GPtrDiff_t>(iBand * nBandSpace);
-                    const GByte *pabySrc =
-                        abyWorkBuffer.data() + iBand * nWorkBufferBandSize;
-
-                    CompositeSrcWithMaskIntoDest(nOutXSize, nOutYSize, eBufType,
-                                                 nBufTypeSize, nPixelSpace,
-                                                 nLineSpace, pabySrc, pabyMask,
-                                                 pabyDestBand);
-                }
+            if (psExtraArg->pfnProgress)
+            {
+                psExtraArg->pfnProgress(1.0, "", psExtraArg->pProgressData);
             }
+
+            return CE_None;
         }
-        else if (m_bSameDataType && !bNeedInitBuffer && oSourceDesc.bHasNoData)
-        {
-            // We create a non-VRTComplexSource SimpleSource copy of poSource
-            // to be able to call DatasetRasterIO()
-            VRTSimpleSource oSimpleSource(poSource.get(), 1.0, 1.0);
+    }
+}
 
-            GDALRasterIOExtraArg sExtraArg;
-            INIT_RASTERIO_EXTRA_ARG(sExtraArg);
-            if (psExtraArg->eResampleAlg != GRIORA_NearestNeighbour)
-                sExtraArg.eResampleAlg = psExtraArg->eResampleAlg;
-            else
-                sExtraArg.eResampleAlg = m_eResampling;
+/************************************************************************/
+/*                 GDALTileIndexDataset::RasterIOJob::Func()            */
+/************************************************************************/
 
-            auto poTileBand = poTileDS->GetRasterBand(panBandMap[0]);
-            oSimpleSource.SetRasterBand(poTileBand, false);
-            eErr = oSimpleSource.DatasetRasterIO(
-                papoBands[0]->GetRasterDataType(), nXOff, nYOff, nXSize, nYSize,
-                pData, nBufXSize, nBufYSize, eBufType, nBandCount, panBandMap,
-                nPixelSpace, nLineSpace, nBandSpace, &sExtraArg);
-        }
-        else if (m_bSameDataType && !poComplexSource)
-        {
-            auto poTileBand = poTileDS->GetRasterBand(panBandMap[0]);
-            poSource->SetRasterBand(poTileBand, false);
+void GDALTileIndexDataset::RasterIOJob::Func(void *pData)
+{
+    auto psJob =
+        std::unique_ptr<RasterIOJob>(static_cast<RasterIOJob *>(pData));
+    if (*psJob->pbSuccess)
+    {
+        const std::string osTileName(GetAbsoluteFileName(
+            psJob->osTileName.c_str(), psJob->poDS->GetDescription()));
 
-            GDALRasterIOExtraArg sExtraArg;
-            INIT_RASTERIO_EXTRA_ARG(sExtraArg);
-            if (poTileBand->GetColorTable())
-                sExtraArg.eResampleAlg = GRIORA_NearestNeighbour;
-            else if (psExtraArg->eResampleAlg != GRIORA_NearestNeighbour)
-                sExtraArg.eResampleAlg = psExtraArg->eResampleAlg;
-            else
-                sExtraArg.eResampleAlg = m_eResampling;
+        SourceDesc oSourceDesc;
+
+        std::vector<CPLErrorHandlerAccumulatorStruct> aoErrors;
+        CPLInstallErrorHandlerAccumulator(aoErrors);
+        const bool bCanOpenSource =
+            psJob->poDS->GetSourceDesc(osTileName, oSourceDesc,
+                                       &psJob->poQueueWorkingStates->oMutex) &&
+            oSourceDesc.poDS;
+        CPLUninstallErrorHandlerAccumulator();
 
-            eErr = poSource->DatasetRasterIO(
-                papoBands[0]->GetRasterDataType(), nXOff, nYOff, nXSize, nYSize,
-                pData, nBufXSize, nBufYSize, eBufType, nBandCount, panBandMap,
-                nPixelSpace, nLineSpace, nBandSpace, &sExtraArg);
+        if (!bCanOpenSource)
+        {
+            if (!aoErrors.empty())
+            {
+                std::lock_guard oLock(psJob->poQueueWorkingStates->oMutex);
+                if (psJob->posErrorMsg->empty())
+                    *(psJob->posErrorMsg) = aoErrors.back().msg;
+            }
+            *psJob->pbSuccess = false;
         }
         else
         {
-            for (int i = 0; i < nBandCount && eErr == CE_None; ++i)
+            GDALRasterIOExtraArg sArg = *(psJob->psExtraArg);
+            sArg.pfnProgress = nullptr;
+            sArg.pProgressData = nullptr;
+
+            std::unique_ptr<VRTSource::WorkingState> poWorkingState;
             {
-                const int nBandNr = panBandMap[i];
-                GByte *pabyBandData =
-                    static_cast<GByte *>(pData) + i * nBandSpace;
-                auto poTileBand = poTileDS->GetRasterBand(nBandNr);
-                if (poComplexSource)
+                std::lock_guard oLock(psJob->poQueueWorkingStates->oMutex);
+                poWorkingState =
+                    std::move(psJob->poQueueWorkingStates->oStates.back());
+                psJob->poQueueWorkingStates->oStates.pop_back();
+                CPLAssert(poWorkingState.get());
+            }
+
+            double dfXOff = psJob->nXOff;
+            double dfYOff = psJob->nYOff;
+            double dfXSize = psJob->nXSize;
+            double dfYSize = psJob->nYSize;
+            if (psJob->psExtraArg->bFloatingPointWindowValidity)
+            {
+                dfXOff = psJob->psExtraArg->dfXOff;
+                dfYOff = psJob->psExtraArg->dfYOff;
+                dfXSize = psJob->psExtraArg->dfXSize;
+                dfYSize = psJob->psExtraArg->dfYSize;
+            }
+
+            aoErrors.clear();
+            CPLInstallErrorHandlerAccumulator(aoErrors);
+            const bool bRenderOK =
+                psJob->poDS->RenderSource(
+                    oSourceDesc, /*bNeedInitBuffer = */ true, psJob->nBandNrMax,
+                    psJob->nXOff, psJob->nYOff, psJob->nXSize, psJob->nYSize,
+                    dfXOff, dfYOff, dfXSize, dfYSize, psJob->nBufXSize,
+                    psJob->nBufYSize, psJob->pData, psJob->eBufType,
+                    psJob->nBandCount, psJob->panBandMap, psJob->nPixelSpace,
+                    psJob->nLineSpace, psJob->nBandSpace, &sArg,
+                    *(poWorkingState.get())) == CE_None;
+            CPLUninstallErrorHandlerAccumulator();
+
+            if (!bRenderOK)
+            {
+                if (!aoErrors.empty())
                 {
-                    int bHasNoData = false;
-                    const double dfNoDataValue =
-                        poTileBand->GetNoDataValue(&bHasNoData);
-                    poComplexSource->SetNoDataValue(
-                        bHasNoData ? dfNoDataValue : VRT_NODATA_UNSET);
+                    std::lock_guard oLock(psJob->poQueueWorkingStates->oMutex);
+                    if (psJob->posErrorMsg->empty())
+                        *(psJob->posErrorMsg) = aoErrors.back().msg;
                 }
-                poSource->SetRasterBand(poTileBand, false);
-
-                GDALRasterIOExtraArg sExtraArg;
-                INIT_RASTERIO_EXTRA_ARG(sExtraArg);
-                if (poTileBand->GetColorTable())
-                    sExtraArg.eResampleAlg = GRIORA_NearestNeighbour;
-                else if (psExtraArg->eResampleAlg != GRIORA_NearestNeighbour)
-                    sExtraArg.eResampleAlg = psExtraArg->eResampleAlg;
-                else
-                    sExtraArg.eResampleAlg = m_eResampling;
+                *psJob->pbSuccess = false;
+            }
 
-                eErr = poSource->RasterIO(
-                    papoBands[nBandNr - 1]->GetRasterDataType(), nXOff, nYOff,
-                    nXSize, nYSize, pabyBandData, nBufXSize, nBufYSize,
-                    eBufType, nPixelSpace, nLineSpace, &sExtraArg,
-                    m_oWorkingState);
+            {
+                std::lock_guard oLock(psJob->poQueueWorkingStates->oMutex);
+                psJob->poQueueWorkingStates->oStates.push_back(
+                    std::move(poWorkingState));
             }
         }
-        return eErr;
-    };
-
-    if (!bNeedInitBuffer)
-    {
-        return RenderSource(m_aoSourceDesc.back());
     }
-    else
-    {
-        InitBuffer(pData, nBufXSize, nBufYSize, eBufType, nBandCount,
-                   panBandMap, nPixelSpace, nLineSpace, nBandSpace);
 
-        // Now render from bottom of the stack to top.
-        for (auto &oSourceDesc : m_aoSourceDesc)
-        {
-            if (oSourceDesc.poDS && RenderSource(oSourceDesc) != CE_None)
-                return CE_Failure;
-        }
-
-        return CE_None;
-    }
+    ++(*psJob->pnCompletedJobs);
 }
 
 /************************************************************************/
@@ -3732,7 +4610,7 @@ void GDALRegister_GTI()
     if (GDALGetDriverByName("GTI") != nullptr)
         return;
 
-    auto poDriver = std::make_unique<VRTDriver>();
+    auto poDriver = std::make_unique<GDALDriver>();
 
     poDriver->SetDescription("GTI");
     poDriver->SetMetadataItem(GDAL_DCAP_RASTER, "YES");
@@ -3746,22 +4624,29 @@ void GDALRegister_GTI()
 
     poDriver->SetMetadataItem(GDAL_DCAP_VIRTUALIO, "YES");
 
-    poDriver->SetMetadataItem(GDAL_DMD_OPENOPTIONLIST,
-                              "<OpenOptionList>"
-                              "  <Option name='LAYER' type='string'/>"
-                              "  <Option name='LOCATION_FIELD' type='string'/>"
-                              "  <Option name='SORT_FIELD' type='string'/>"
-                              "  <Option name='SORT_FIELD_ASC' type='boolean'/>"
-                              "  <Option name='FILTER' type='string'/>"
-                              "  <Option name='RESX' type='float'/>"
-                              "  <Option name='RESY' type='float'/>"
-                              "  <Option name='MINX' type='float'/>"
-                              "  <Option name='MINY' type='float'/>"
-                              "  <Option name='MAXX' type='float'/>"
-                              "  <Option name='MAXY' type='float'/>"
-                              "</OpenOptionList>");
+    poDriver->SetMetadataItem(
+        GDAL_DMD_OPENOPTIONLIST,
+        "<OpenOptionList>"
+        "  <Option name='LAYER' type='string'/>"
+        "  <Option name='LOCATION_FIELD' type='string'/>"
+        "  <Option name='SORT_FIELD' type='string'/>"
+        "  <Option name='SORT_FIELD_ASC' type='boolean'/>"
+        "  <Option name='FILTER' type='string'/>"
+        "  <Option name='RESX' type='float'/>"
+        "  <Option name='RESY' type='float'/>"
+        "  <Option name='MINX' type='float'/>"
+        "  <Option name='MINY' type='float'/>"
+        "  <Option name='MAXX' type='float'/>"
+        "  <Option name='MAXY' type='float'/>"
+        "<Option name='NUM_THREADS' type='string' description="
+        "'Number of worker threads for reading. Can be set to ALL_CPUS' "
+        "default='ALL_CPUS'/>"
+        "</OpenOptionList>");
+
+#ifdef BUILT_AS_PLUGIN
+    // Used by gdaladdo and test_gdaladdo.py
+    poDriver->SetMetadataItem("IS_PLUGIN", "YES");
+#endif
 
     GetGDALDriverManager()->RegisterDriver(poDriver.release());
 }
-
-/*! @endcond */
diff --git a/frmts/gtiff/cogdriver.cpp b/frmts/gtiff/cogdriver.cpp
index 063742b421d5..69a72ec7488d 100644
--- a/frmts/gtiff/cogdriver.cpp
+++ b/frmts/gtiff/cogdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2019, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -267,13 +251,13 @@ static bool COGGetWarpingCharacteristics(
                 aosOptions.AddString("VRT");
                 aosOptions.AddString("-projwin");
                 aosOptions.AddString(
-                    CPLSPrintf("%.18g", adfSrcGeoTransform[0]));
-                aosOptions.AddString(CPLSPrintf("%.18g", maxLat));
+                    CPLSPrintf("%.17g", adfSrcGeoTransform[0]));
+                aosOptions.AddString(CPLSPrintf("%.17g", maxLat));
                 aosOptions.AddString(
-                    CPLSPrintf("%.18g", adfSrcGeoTransform[0] +
+                    CPLSPrintf("%.17g", adfSrcGeoTransform[0] +
                                             poSrcDS->GetRasterXSize() *
                                                 adfSrcGeoTransform[1]));
-                aosOptions.AddString(CPLSPrintf("%.18g", minLat));
+                aosOptions.AddString(CPLSPrintf("%.17g", minLat));
                 auto psOptions =
                     GDALTranslateOptionsNew(aosOptions.List(), nullptr);
                 poTmpDS.reset(GDALDataset::FromHandle(GDALTranslate(
@@ -615,10 +599,10 @@ static std::unique_ptr<GDALDataset> CreateReprojectedDS(
     papszArg = CSLAddString(papszArg, "-t_srs");
     papszArg = CSLAddString(papszArg, osTargetSRS);
     papszArg = CSLAddString(papszArg, "-te");
-    papszArg = CSLAddString(papszArg, CPLSPrintf("%.18g", dfMinX));
-    papszArg = CSLAddString(papszArg, CPLSPrintf("%.18g", dfMinY));
-    papszArg = CSLAddString(papszArg, CPLSPrintf("%.18g", dfMaxX));
-    papszArg = CSLAddString(papszArg, CPLSPrintf("%.18g", dfMaxY));
+    papszArg = CSLAddString(papszArg, CPLSPrintf("%.17g", dfMinX));
+    papszArg = CSLAddString(papszArg, CPLSPrintf("%.17g", dfMinY));
+    papszArg = CSLAddString(papszArg, CPLSPrintf("%.17g", dfMaxX));
+    papszArg = CSLAddString(papszArg, CPLSPrintf("%.17g", dfMaxY));
     papszArg = CSLAddString(papszArg, "-ts");
     papszArg = CSLAddString(papszArg, CPLSPrintf("%d", nXSize));
     papszArg = CSLAddString(papszArg, CPLSPrintf("%d", nYSize));
@@ -632,8 +616,8 @@ static std::unique_ptr<GDALDataset> CreateReprojectedDS(
     {
         // Try to produce exactly square pixels
         papszArg = CSLAddString(papszArg, "-tr");
-        papszArg = CSLAddString(papszArg, CPLSPrintf("%.18g", dfRes));
-        papszArg = CSLAddString(papszArg, CPLSPrintf("%.18g", dfRes));
+        papszArg = CSLAddString(papszArg, CPLSPrintf("%.17g", dfRes));
+        papszArg = CSLAddString(papszArg, CPLSPrintf("%.17g", dfRes));
     }
     else
     {
@@ -737,19 +721,25 @@ GDALCOGCreator::~GDALCOGCreator()
     // may reference the later
     m_poRGBMaskDS.reset();
 
-    if (m_poReprojectedDS)
-    {
-        CPLString osProjectedDSName(m_poReprojectedDS->GetDescription());
-        m_poReprojectedDS.reset();
-        VSIUnlink(osProjectedDSName);
-    }
-    if (!m_osTmpOverviewFilename.empty())
+    // Config option just for testing purposes
+    const bool bDeleteTempFiles =
+        CPLTestBool(CPLGetConfigOption("COG_DELETE_TEMP_FILES", "YES"));
+    if (bDeleteTempFiles)
     {
-        VSIUnlink(m_osTmpOverviewFilename);
-    }
-    if (!m_osTmpMskOverviewFilename.empty())
-    {
-        VSIUnlink(m_osTmpMskOverviewFilename);
+        if (m_poReprojectedDS)
+        {
+            CPLString osProjectedDSName(m_poReprojectedDS->GetDescription());
+            m_poReprojectedDS.reset();
+            VSIUnlink(osProjectedDSName);
+        }
+        if (!m_osTmpOverviewFilename.empty())
+        {
+            VSIUnlink(m_osTmpOverviewFilename);
+        }
+        if (!m_osTmpMskOverviewFilename.empty())
+        {
+            VSIUnlink(m_osTmpMskOverviewFilename);
+        }
     }
 }
 
diff --git a/frmts/gtiff/cogdriver.h b/frmts/gtiff/cogdriver.h
index 2a82ad325d21..134766396950 100644
--- a/frmts/gtiff/cogdriver.h
+++ b/frmts/gtiff/cogdriver.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2019, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef COGDRIVER_H_INCLUDED
diff --git a/frmts/gtiff/fetchbufferdirectio.h b/frmts/gtiff/fetchbufferdirectio.h
index 62561b1a8950..a027f7958c1b 100644
--- a/frmts/gtiff/fetchbufferdirectio.h
+++ b/frmts/gtiff/fetchbufferdirectio.h
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef FETCHBUFFERDIRECTIO_H_INCLUDED
diff --git a/frmts/gtiff/generate_quant_table_md5sum.cpp b/frmts/gtiff/generate_quant_table_md5sum.cpp
index 2fe937f3fecf..d278c8c97f54 100644
--- a/frmts/gtiff/generate_quant_table_md5sum.cpp
+++ b/frmts/gtiff/generate_quant_table_md5sum.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2021, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <cassert>
diff --git a/frmts/gtiff/geotiff.cpp b/frmts/gtiff/geotiff.cpp
index 7102d1adb2d5..7afa7acefc7d 100644
--- a/frmts/gtiff/geotiff.cpp
+++ b/frmts/gtiff/geotiff.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"  // Must be first.
@@ -40,6 +24,7 @@
 #include "tif_jxl.h"
 #include "xtiffio.h"
 #include <cctype>
+#include <cmath>
 
 // Needed to expose WEBP_LOSSLESS option
 #ifdef WEBP_SUPPORT
@@ -580,10 +565,10 @@ char **GTiffDatasetReadRPCTag(TIFF *hTIFF)
 CPLString GTiffFormatGDALNoDataTagValue(double dfNoData)
 {
     CPLString osVal;
-    if (CPLIsNan(dfNoData))
+    if (std::isnan(dfNoData))
         osVal = "nan";
     else
-        osVal.Printf("%.18g", dfNoData);
+        osVal.Printf("%.17g", dfNoData);
     return osVal;
 }
 
@@ -700,8 +685,8 @@ void GTiffWriteJPEGTables(TIFF *hTIFF, const char *pszPhotometric,
     if (!TIFFGetField(hTIFF, TIFFTAG_BITSPERSAMPLE, &(l_nBitsPerSample)))
         l_nBitsPerSample = 1;
 
-    CPLString osTmpFilenameIn;
-    osTmpFilenameIn.Printf("%s%p", szJPEGGTiffDatasetTmpPrefix, hTIFF);
+    const CPLString osTmpFilenameIn(
+        VSIMemGenerateHiddenFilename("gtiffdataset_jpg_tmp"));
     VSILFILE *fpTmp = nullptr;
     CPLString osTmp;
     char **papszLocalParameters = nullptr;
@@ -722,12 +707,14 @@ void GTiffWriteJPEGTables(TIFF *hTIFF, const char *pszPhotometric,
                                            CPLSPrintf("%u", l_nBitsPerSample));
     papszLocalParameters = CSLSetNameValue(papszLocalParameters,
                                            "JPEGTABLESMODE", pszJPEGTablesMode);
+    papszLocalParameters =
+        CSLSetNameValue(papszLocalParameters, "WRITE_JPEGTABLE_TAG", "NO");
 
     TIFF *hTIFFTmp =
         GTiffDataset::CreateLL(osTmpFilenameIn, nInMemImageWidth,
                                nInMemImageHeight, (nBands <= 4) ? nBands : 1,
                                (l_nBitsPerSample <= 8) ? GDT_Byte : GDT_UInt16,
-                               0.0, papszLocalParameters, &fpTmp, osTmp);
+                               0.0, 0, papszLocalParameters, &fpTmp, osTmp);
     CSLDestroy(papszLocalParameters);
     if (hTIFFTmp)
     {
@@ -1541,6 +1528,14 @@ void GDALRegister_GTiff()
         "       <Value>1.1</Value>"
         "   </Option>"
 #endif
+        "   <Option name='COLOR_TABLE_MULTIPLIER' type='string-select' "
+        "description='Multiplication factor to apply to go from GDAL color "
+        "table to TIFF color table' "
+        "default='257'>"
+        "       <Value>1</Value>"
+        "       <Value>256</Value>"
+        "       <Value>257</Value>"
+        "   </Option>"
         "</CreationOptionList>";
 
     /* -------------------------------------------------------------------- */
@@ -1578,6 +1573,15 @@ void GDALRegister_GTiff()
         "   <Option name='IGNORE_COG_LAYOUT_BREAK' type='boolean' "
         "description='Allow update mode on files with COG structure' "
         "default='FALSE'/>"
+        "   <Option name='COLOR_TABLE_MULTIPLIER' type='string-select' "
+        "description='Multiplication factor to apply to go from GDAL color "
+        "table to TIFF color table' "
+        "default='AUTO'>"
+        "       <Value>AUTO</Value>"
+        "       <Value>1</Value>"
+        "       <Value>256</Value>"
+        "       <Value>257</Value>"
+        "   </Option>"
         "</OpenOptionList>");
     poDriver->SetMetadataItem(GDAL_DMD_SUBDATASETS, "YES");
     poDriver->SetMetadataItem(GDAL_DCAP_VIRTUALIO, "YES");
diff --git a/frmts/gtiff/gt_citation.cpp b/frmts/gtiff/gt_citation.cpp
index 9d8fd0eb9aee..77536ecd78b7 100644
--- a/frmts/gtiff/gt_citation.cpp
+++ b/frmts/gtiff/gt_citation.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2008, Xiuguang Zhou (ESRI)
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -637,9 +621,7 @@ OGRBoolean CheckCitationKeyForStatePlaneUTM(GTIF *hGTIF, GTIFDefn *psDefn,
     if (GDALGTIFKeyGetASCII(hGTIF, GTCitationGeoKey, szCTString,
                             sizeof(szCTString)))
     {
-        CPLString osLCCT = szCTString;
-
-        osLCCT.tolower();
+        const CPLString osLCCT = CPLString(szCTString).tolower();
 
         if (strstr(osLCCT, "us") && strstr(osLCCT, "survey") &&
             (strstr(osLCCT, "feet") || strstr(osLCCT, "foot")))
@@ -675,8 +657,9 @@ OGRBoolean CheckCitationKeyForStatePlaneUTM(GTIF *hGTIF, GTIFDefn *psDefn,
 
                     if (poUnit != nullptr && poUnit->GetChildCount() >= 2)
                     {
-                        CPLString unitName = poUnit->GetChild(0)->GetValue();
-                        unitName.tolower();
+                        const CPLString unitName =
+                            CPLString(poUnit->GetChild(0)->GetValue())
+                                .tolower();
 
                         if (strstr(units, "us_survey_feet"))
                         {
@@ -708,9 +691,8 @@ OGRBoolean CheckCitationKeyForStatePlaneUTM(GTIF *hGTIF, GTIFDefn *psDefn,
         GTIFGetUOMLengthInfo(psDefn->UOMLength, &pszUnitsName, nullptr);
         if (pszUnitsName)
         {
-            CPLString osLCCT = pszUnitsName;
+            const CPLString osLCCT = CPLString(pszUnitsName).tolower();
             GTIFFreeMemory(pszUnitsName);
-            osLCCT.tolower();
 
             if (strstr(osLCCT, "us") && strstr(osLCCT, "survey") &&
                 (strstr(osLCCT, "feet") || strstr(osLCCT, "foot")))
diff --git a/frmts/gtiff/gt_citation.h b/frmts/gtiff/gt_citation.h
index e45829892f85..6dd992fce4f0 100644
--- a/frmts/gtiff/gt_citation.h
+++ b/frmts/gtiff/gt_citation.h
@@ -10,23 +10,7 @@
  * Copyright (c) 2008, Xiuguang Zhou (ESRI)
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GT_CITATION_H_INCLUDED
diff --git a/frmts/gtiff/gt_jpeg_copy.cpp b/frmts/gtiff/gt_jpeg_copy.cpp
index 73262092f210..718623250847 100644
--- a/frmts/gtiff/gt_jpeg_copy.cpp
+++ b/frmts/gtiff/gt_jpeg_copy.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -377,13 +361,10 @@ static void GTIFF_ErrorExitJPEG(j_common_ptr cinfo)
 /************************************************************************/
 
 static void GTIFF_Set_TIFFTAG_JPEGTABLES(TIFF *hTIFF,
-                                         jpeg_decompress_struct &sDInfo,
                                          jpeg_compress_struct &sCInfo)
 {
-    char szTmpFilename[128] = {'\0'};
-    snprintf(szTmpFilename, sizeof(szTmpFilename), "/vsimem/tables_%p",
-             &sDInfo);
-    VSILFILE *fpTABLES = VSIFOpenL(szTmpFilename, "wb+");
+    const std::string osTmpFilename(VSIMemGenerateHiddenFilename("tables"));
+    VSILFILE *fpTABLES = VSIFOpenL(osTmpFilename.c_str(), "wb+");
 
     uint16_t nPhotometric = 0;
     TIFFGetField(hTIFF, TIFFTAG_PHOTOMETRIC, &nPhotometric);
@@ -409,11 +390,11 @@ static void GTIFF_Set_TIFFTAG_JPEGTABLES(TIFF *hTIFF,
 
     vsi_l_offset nSizeTables = 0;
     GByte *pabyJPEGTablesData =
-        VSIGetMemFileBuffer(szTmpFilename, &nSizeTables, FALSE);
+        VSIGetMemFileBuffer(osTmpFilename.c_str(), &nSizeTables, FALSE);
     TIFFSetField(hTIFF, TIFFTAG_JPEGTABLES, static_cast<int>(nSizeTables),
                  pabyJPEGTablesData);
 
-    VSIUnlink(szTmpFilename);
+    VSIUnlink(osTmpFilename.c_str());
 }
 
 /************************************************************************/
@@ -476,7 +457,7 @@ CPLErr GTIFF_CopyFromJPEG_WriteAdditionalTags(TIFF *hTIFF, GDALDataset *poSrcDS)
     jpeg_CreateCompress(&sCInfo, JPEG_LIB_VERSION, sizeof(sCInfo));
     bCallDestroyCompress = true;
     jpeg_copy_critical_parameters(&sDInfo, &sCInfo);
-    GTIFF_Set_TIFFTAG_JPEGTABLES(hTIFF, sDInfo, sCInfo);
+    GTIFF_Set_TIFFTAG_JPEGTABLES(hTIFF, sCInfo);
     bCallDestroyCompress = false;
     jpeg_abort_compress(&sCInfo);
     jpeg_destroy_compress(&sCInfo);
@@ -578,8 +559,9 @@ typedef struct
 
 static CPLErr GTIFF_CopyBlockFromJPEG(GTIFF_CopyBlockFromJPEGArgs *psArgs)
 {
-    CPLString osTmpFilename(CPLSPrintf("/vsimem/%p", psArgs->psDInfo));
-    VSILFILE *fpMEM = VSIFOpenL(osTmpFilename, "wb+");
+    const CPLString osTmpFilename(
+        VSIMemGenerateHiddenFilename("GTIFF_CopyBlockFromJPEG.tif"));
+    VSILFILE *fpMEM = VSIFOpenL(osTmpFilename.c_str(), "wb+");
 
     /* -------------------------------------------------------------------- */
     /*      Initialization of the compressor                                */
@@ -588,7 +570,7 @@ static CPLErr GTIFF_CopyBlockFromJPEG(GTIFF_CopyBlockFromJPEGArgs *psArgs)
     if (setjmp(setjmp_buffer))
     {
         CPL_IGNORE_RET_VAL(VSIFCloseL(fpMEM));
-        VSIUnlink(osTmpFilename);
+        VSIUnlink(osTmpFilename.c_str());
         return CE_Failure;
     }
 
@@ -775,7 +757,8 @@ static CPLErr GTIFF_CopyBlockFromJPEG(GTIFF_CopyBlockFromJPEGArgs *psArgs)
     /*      Write the JPEG content with libtiff raw API                     */
     /* -------------------------------------------------------------------- */
     vsi_l_offset nSize = 0;
-    GByte *pabyJPEGData = VSIGetMemFileBuffer(osTmpFilename, &nSize, FALSE);
+    GByte *pabyJPEGData =
+        VSIGetMemFileBuffer(osTmpFilename.c_str(), &nSize, FALSE);
 
     CPLErr eErr = CE_None;
 
@@ -794,7 +777,7 @@ static CPLErr GTIFF_CopyBlockFromJPEG(GTIFF_CopyBlockFromJPEGArgs *psArgs)
             eErr = CE_Failure;
     }
 
-    VSIUnlink(osTmpFilename);
+    VSIUnlink(osTmpFilename.c_str());
 
     return eErr;
 }
diff --git a/frmts/gtiff/gt_jpeg_copy.h b/frmts/gtiff/gt_jpeg_copy.h
index 52db5a55bf99..7ae3c326caa5 100644
--- a/frmts/gtiff/gt_jpeg_copy.h
+++ b/frmts/gtiff/gt_jpeg_copy.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GT_JPEG_COPY_H_INCLUDED
diff --git a/frmts/gtiff/gt_overview.cpp b/frmts/gtiff/gt_overview.cpp
index 38ca89e434c2..05bfb8b134fb 100644
--- a/frmts/gtiff/gt_overview.cpp
+++ b/frmts/gtiff/gt_overview.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2000, Frank Warmerdam
  * Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -46,6 +30,7 @@
 #include "gdal.h"
 #include "gdal_priv.h"
 #include "gtiff.h"
+#include "gtiffdataset.h"
 #include "tiff.h"
 #include "tiffvers.h"
 #include "tifvsi.h"
@@ -188,8 +173,11 @@ toff_t GTIFFWriteDirectory(TIFF *hTIFF, int nSubfileType, int nXSize,
     }
 
     TIFFWriteDirectory(hTIFF);
-    TIFFSetDirectory(hTIFF,
-                     static_cast<tdir_t>(TIFFNumberOfDirectories(hTIFF) - 1));
+    const tdir_t nNumberOfDirs = TIFFNumberOfDirectories(hTIFF);
+    if (nNumberOfDirs > 0)  // always true, but to please Coverity
+    {
+        TIFFSetDirectory(hTIFF, static_cast<tdir_t>(nNumberOfDirs - 1));
+    }
 
     const toff_t nOffset = TIFFCurrentDirOffset(hTIFF);
 
@@ -203,7 +191,8 @@ toff_t GTIFFWriteDirectory(TIFF *hTIFF, int nSubfileType, int nXSize,
 /************************************************************************/
 
 void GTIFFBuildOverviewMetadata(const char *pszResampling,
-                                GDALDataset *poBaseDS, CPLString &osMetadata)
+                                GDALDataset *poBaseDS, bool bIsForMaskBand,
+                                CPLString &osMetadata)
 
 {
     osMetadata = "<GDALMetadata>";
@@ -216,7 +205,11 @@ void GTIFFBuildOverviewMetadata(const char *pszResampling,
         osMetadata += "</Item>";
     }
 
-    if (poBaseDS->GetMetadataItem("INTERNAL_MASK_FLAGS_1"))
+    if (bIsForMaskBand)
+    {
+        osMetadata += "<Item name=\"INTERNAL_MASK_FLAGS_1\">2</Item>";
+    }
+    else if (poBaseDS->GetMetadataItem("INTERNAL_MASK_FLAGS_1"))
     {
         for (int iBand = 0; iBand < 200; iBand++)
         {
@@ -561,8 +554,19 @@ CPLErr GTIFFBuildOverviewsEx(const char *pszFilename, int nBands,
               papoBandList[0]->GetRasterDataType() == GDT_UInt16) &&
              !STARTS_WITH_CI(pszResampling, "AVERAGE_BIT2"))
     {
+        // Would also apply to other lossy compression scheme, but for JPEG,
+        // this at least avoids a later cryptic error message from libtiff:
+        // "JPEGSetupEncode:PhotometricInterpretation 3 not allowed for JPEG"
+        if (nCompression == COMPRESSION_JPEG)
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                     "Cannot create JPEG compressed overviews on a raster "
+                     "with a color table");
+            return CE_Failure;
+        }
+
         nPhotometric = PHOTOMETRIC_PALETTE;
-        // Should set the colormap up at this point too!
+        // Color map is set up after
     }
     else if (nBands >= 3 &&
              papoBandList[0]->GetColorInterpretation() == GCI_RedBand &&
@@ -749,17 +753,28 @@ CPLErr GTIFFBuildOverviewsEx(const char *pszFilename, int nBands,
         panBlue = static_cast<unsigned short *>(
             CPLCalloc(nColorCount, sizeof(unsigned short)));
 
+        const int nColorTableMultiplier = std::max(
+            1,
+            std::min(
+                257,
+                atoi(CSLFetchNameValueDef(
+                    papszOptions, "COLOR_TABLE_MULTIPLIER",
+                    CPLSPrintf(
+                        "%d",
+                        GTiffDataset::DEFAULT_COLOR_TABLE_MULTIPLIER_257)))));
+
         for (int iColor = 0; iColor < nColorCount; iColor++)
         {
             GDALColorEntry sRGB = {0, 0, 0, 0};
 
             if (poCT->GetColorEntryAsRGB(iColor, &sRGB))
             {
-                // TODO(schwehr): Check for underflow.
-                // Going from signed short to unsigned short.
-                panRed[iColor] = static_cast<unsigned short>(257 * sRGB.c1);
-                panGreen[iColor] = static_cast<unsigned short>(257 * sRGB.c2);
-                panBlue[iColor] = static_cast<unsigned short>(257 * sRGB.c3);
+                panRed[iColor] = GTiffDataset::ClampCTEntry(
+                    iColor, 1, sRGB.c1, nColorTableMultiplier);
+                panGreen[iColor] = GTiffDataset::ClampCTEntry(
+                    iColor, 2, sRGB.c2, nColorTableMultiplier);
+                panBlue[iColor] = GTiffDataset::ClampCTEntry(
+                    iColor, 3, sRGB.c3, nColorTableMultiplier);
             }
         }
     }
@@ -771,7 +786,10 @@ CPLErr GTIFFBuildOverviewsEx(const char *pszFilename, int nBands,
     GDALDataset *poBaseDS = papoBandList[0]->GetDataset();
     if (poBaseDS)
     {
-        GTIFFBuildOverviewMetadata(pszResampling, poBaseDS, osMetadata);
+        const bool bIsForMaskBand =
+            nBands == 1 && papoBandList[0]->IsMaskBand();
+        GTIFFBuildOverviewMetadata(pszResampling, poBaseDS, bIsForMaskBand,
+                                   osMetadata);
     }
 
     if (poBaseDS != nullptr && poBaseDS->GetRasterCount() == nBands)
diff --git a/frmts/gtiff/gt_overview.h b/frmts/gtiff/gt_overview.h
index 9014662e67c7..5baec0358106 100644
--- a/frmts/gtiff/gt_overview.h
+++ b/frmts/gtiff/gt_overview.h
@@ -10,23 +10,7 @@
  * Copyright (c) 2000, Frank Warmerdam
  * Copyright (c) 2008-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GT_OVERVIEW_H_INCLUDED
@@ -53,7 +37,8 @@ toff_t GTIFFWriteDirectory(TIFF *hTIFF, int nSubfileType, int nXSize,
                            bool bDeferStrileArrayWriting);
 
 void GTIFFBuildOverviewMetadata(const char *pszResampling,
-                                GDALDataset *poBaseDS, CPLString &osMetadata);
+                                GDALDataset *poBaseDS, bool bIsForMaskBand,
+                                CPLString &osMetadata);
 
 CPLErr GTIFFBuildOverviewsEx(const char *pszFilename, int nBands,
                              GDALRasterBand *const *papoBandList,
diff --git a/frmts/gtiff/gt_wkt_srs.cpp b/frmts/gtiff/gt_wkt_srs.cpp
index 75662539444a..22eabfcd3850 100644
--- a/frmts/gtiff/gt_wkt_srs.cpp
+++ b/frmts/gtiff/gt_wkt_srs.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -42,7 +26,6 @@
 
 #include "cpl_conv.h"
 #include "cpl_error.h"
-#include "cpl_multiproc.h"
 #include "cpl_string.h"
 #include "cpl_vsi.h"
 #include "gt_citation.h"
@@ -1397,6 +1380,43 @@ OGRSpatialReferenceH GTIFGetOGISDefnAsOSR(GTIF *hGTIF, GTIFDefn *psDefn)
         for (; i < 10; i++)
             adfParam[i] = 0.0;
 
+#if LIBGEOTIFF_VERSION <= 1730
+        // libgeotiff <= 1.7.3 is unfortunately inconsistent. When it synthetizes the
+        // projection parameters from the EPSG ProjectedCRS code, it returns
+        // them normalized in degrees. But when it gets them from
+        // ProjCoordTransGeoKey and other Proj....GeoKey's it return them in
+        // a raw way, that is in the units of GeogAngularUnitSizeGeoKey
+        // The below oSRS.SetXXXXX() methods assume the angular projection
+        // parameters to be in degrees, so convert them to degrees in that later case.
+        // From GDAL 3.0 to 3.9.0, we didn't do that conversion...
+        // And all versions of GDAL <= 3.9.0 when writing those geokeys, wrote
+        // them as degrees, hence this GTIFF_READ_ANGULAR_PARAMS_IN_DEGREE
+        // config option that can be set to YES to avoid that conversion and
+        // assume that the angular parameters have been written as degree.
+        if (GDALGTIFKeyGetSHORT(hGTIF, ProjCoordTransGeoKey, &tmp, 0, 1) &&
+            !CPLTestBool(CPLGetConfigOption(
+                "GTIFF_READ_ANGULAR_PARAMS_IN_DEGREE", "NO")))
+        {
+            adfParam[0] *= psDefn->UOMAngleInDegrees;
+            adfParam[1] *= psDefn->UOMAngleInDegrees;
+            adfParam[2] *= psDefn->UOMAngleInDegrees;
+            adfParam[3] *= psDefn->UOMAngleInDegrees;
+        }
+#else
+        // If GTIFF_READ_ANGULAR_PARAMS_IN_DEGREE=YES (non-nominal case), undo
+        // the conversion to degrees, that has been done by libgeotiff > 1.7.3
+        if (GDALGTIFKeyGetSHORT(hGTIF, ProjCoordTransGeoKey, &tmp, 0, 1) &&
+            psDefn->UOMAngleInDegrees != 0 && psDefn->UOMAngleInDegrees != 1 &&
+            CPLTestBool(CPLGetConfigOption(
+                "GTIFF_READ_ANGULAR_PARAMS_IN_DEGREE", "NO")))
+        {
+            adfParam[0] /= psDefn->UOMAngleInDegrees;
+            adfParam[1] /= psDefn->UOMAngleInDegrees;
+            adfParam[2] /= psDefn->UOMAngleInDegrees;
+            adfParam[3] /= psDefn->UOMAngleInDegrees;
+        }
+#endif
+
         /* --------------------------------------------------------------------
          */
         /*      Translation the fundamental projection. */
@@ -2150,6 +2170,31 @@ int GTIFSetFromOGISDefnEx(GTIF *psGTIF, OGRSpatialReferenceH hSRS,
     }
 #endif
 
+    double dfAngUnitValue = 0;
+    std::string osAngUnitName;
+    if (bHasEllipsoid)
+    {
+        const char *angUnitNameTmp = "";
+        dfAngUnitValue = poSRS->GetAngularUnits(&angUnitNameTmp);
+        osAngUnitName = angUnitNameTmp;
+    }
+
+    // Convert angular projection parameters from its normalized value in degree
+    // to the units of GeogAngularUnitsGeoKey.
+    // Note: for GDAL <= 3.9.0, we always have written them in degrees !
+    // We can set GTIFF_WRITE_ANGULAR_PARAMS_IN_DEGREE=YES to get that
+    // non-conformant behavior...
+    const auto ConvertAngularParam = [dfAngUnitValue](double dfValInDeg)
+    {
+        constexpr double DEG_TO_RAD = M_PI / 180.0;
+        return dfAngUnitValue != 0 &&
+                       std::fabs(dfAngUnitValue - DEG_TO_RAD) > 1e-10 &&
+                       !CPLTestBool(CPLGetConfigOption(
+                           "GTIFF_WRITE_ANGULAR_PARAMS_IN_DEGREE", "NO"))
+                   ? dfValInDeg * DEG_TO_RAD / dfAngUnitValue
+                   : dfValInDeg;
+    };
+
     const char *pszProjection =
         poSRSCompatibleOfWKT1->GetAttrValue("PROJECTION");
     if (nPCS != KvUserDefined)
@@ -2191,20 +2236,20 @@ int GTIFSetFromOGISDefnEx(GTIF *psGTIF, OGRSpatialReferenceH hSRS,
                    CT_AlbersEqualArea);
 
         GTIFKeySet(psGTIF, ProjStdParallelGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_STANDARD_PARALLEL_1, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_STANDARD_PARALLEL_1, 0.0)));
 
         GTIFKeySet(psGTIF, ProjStdParallel2GeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_STANDARD_PARALLEL_2, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_STANDARD_PARALLEL_2, 0.0)));
 
         GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LATITUDE_OF_CENTER, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LATITUDE_OF_CENTER, 0.0)));
 
         GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LONGITUDE_OF_CENTER, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LONGITUDE_OF_CENTER, 0.0)));
 
         GTIFKeySet(
             psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1,
@@ -2267,12 +2312,12 @@ int GTIFSetFromOGISDefnEx(GTIF *psGTIF, OGRSpatialReferenceH hSRS,
                    CT_TransverseMercator);
 
         GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LATITUDE_OF_ORIGIN, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LATITUDE_OF_ORIGIN, 0.0)));
 
         GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_CENTRAL_MERIDIAN, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_CENTRAL_MERIDIAN, 0.0)));
 
         GTIFKeySet(
             psGTIF, ProjScaleAtNatOriginGeoKey, TYPE_DOUBLE, 1,
@@ -2298,12 +2343,12 @@ int GTIFSetFromOGISDefnEx(GTIF *psGTIF, OGRSpatialReferenceH hSRS,
                    CT_TransvMercator_SouthOriented);
 
         GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LATITUDE_OF_ORIGIN, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LATITUDE_OF_ORIGIN, 0.0)));
 
         GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_CENTRAL_MERIDIAN, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_CENTRAL_MERIDIAN, 0.0)));
 
         GTIFKeySet(
             psGTIF, ProjScaleAtNatOriginGeoKey, TYPE_DOUBLE, 1,
@@ -2330,17 +2375,18 @@ int GTIFSetFromOGISDefnEx(GTIF *psGTIF, OGRSpatialReferenceH hSRS,
         GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, CT_Mercator);
 
         GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LATITUDE_OF_ORIGIN, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LATITUDE_OF_ORIGIN, 0.0)));
 
         GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_CENTRAL_MERIDIAN, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_CENTRAL_MERIDIAN, 0.0)));
 
         if (EQUAL(pszProjection, SRS_PT_MERCATOR_2SP))
-            GTIFKeySet(psGTIF, ProjStdParallel1GeoKey, TYPE_DOUBLE, 1,
-                       poSRSCompatibleOfWKT1->GetNormProjParm(
-                           SRS_PP_STANDARD_PARALLEL_1, 0.0));
+            GTIFKeySet(
+                psGTIF, ProjStdParallel1GeoKey, TYPE_DOUBLE, 1,
+                ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                    SRS_PP_STANDARD_PARALLEL_1, 0.0)));
         else
             GTIFKeySet(psGTIF, ProjScaleAtNatOriginGeoKey, TYPE_DOUBLE, 1,
                        poSRSCompatibleOfWKT1->GetNormProjParm(
@@ -2366,12 +2412,12 @@ int GTIFSetFromOGISDefnEx(GTIF *psGTIF, OGRSpatialReferenceH hSRS,
                    CT_ObliqueStereographic);
 
         GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LATITUDE_OF_ORIGIN, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LATITUDE_OF_ORIGIN, 0.0)));
 
         GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_CENTRAL_MERIDIAN, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_CENTRAL_MERIDIAN, 0.0)));
 
         GTIFKeySet(
             psGTIF, ProjScaleAtNatOriginGeoKey, TYPE_DOUBLE, 1,
@@ -2397,12 +2443,12 @@ int GTIFSetFromOGISDefnEx(GTIF *psGTIF, OGRSpatialReferenceH hSRS,
                    CT_Stereographic);
 
         GTIFKeySet(psGTIF, ProjCenterLatGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LATITUDE_OF_ORIGIN, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LATITUDE_OF_ORIGIN, 0.0)));
 
         GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_CENTRAL_MERIDIAN, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_CENTRAL_MERIDIAN, 0.0)));
 
         GTIFKeySet(
             psGTIF, ProjScaleAtNatOriginGeoKey, TYPE_DOUBLE, 1,
@@ -2428,12 +2474,12 @@ int GTIFSetFromOGISDefnEx(GTIF *psGTIF, OGRSpatialReferenceH hSRS,
                    CT_PolarStereographic);
 
         GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LATITUDE_OF_ORIGIN, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LATITUDE_OF_ORIGIN, 0.0)));
 
         GTIFKeySet(psGTIF, ProjStraightVertPoleLongGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_CENTRAL_MERIDIAN, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_CENTRAL_MERIDIAN, 0.0)));
 
         GTIFKeySet(
             psGTIF, ProjScaleAtNatOriginGeoKey, TYPE_DOUBLE, 1,
@@ -2459,19 +2505,19 @@ int GTIFSetFromOGISDefnEx(GTIF *psGTIF, OGRSpatialReferenceH hSRS,
                    CT_ObliqueMercator);
 
         GTIFKeySet(psGTIF, ProjCenterLatGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LATITUDE_OF_CENTER, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LATITUDE_OF_CENTER, 0.0)));
 
         GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LONGITUDE_OF_CENTER, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LONGITUDE_OF_CENTER, 0.0)));
 
         GTIFKeySet(psGTIF, ProjAzimuthAngleGeoKey, TYPE_DOUBLE, 1,
                    poSRSCompatibleOfWKT1->GetNormProjParm(SRS_PP_AZIMUTH, 0.0));
 
         GTIFKeySet(psGTIF, ProjRectifiedGridAngleGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_RECTIFIED_GRID_ANGLE, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_RECTIFIED_GRID_ANGLE, 0.0)));
 
         GTIFKeySet(
             psGTIF, ProjScaleAtCenterGeoKey, TYPE_DOUBLE, 1,
@@ -2498,19 +2544,19 @@ int GTIFSetFromOGISDefnEx(GTIF *psGTIF, OGRSpatialReferenceH hSRS,
                    CT_HotineObliqueMercatorAzimuthCenter);
 
         GTIFKeySet(psGTIF, ProjCenterLatGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LATITUDE_OF_CENTER, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LATITUDE_OF_CENTER, 0.0)));
 
         GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LONGITUDE_OF_CENTER, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LONGITUDE_OF_CENTER, 0.0)));
 
         GTIFKeySet(psGTIF, ProjAzimuthAngleGeoKey, TYPE_DOUBLE, 1,
                    poSRSCompatibleOfWKT1->GetNormProjParm(SRS_PP_AZIMUTH, 0.0));
 
         GTIFKeySet(psGTIF, ProjRectifiedGridAngleGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_RECTIFIED_GRID_ANGLE, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_RECTIFIED_GRID_ANGLE, 0.0)));
 
         GTIFKeySet(
             psGTIF, ProjScaleAtCenterGeoKey, TYPE_DOUBLE, 1,
@@ -2536,12 +2582,12 @@ int GTIFSetFromOGISDefnEx(GTIF *psGTIF, OGRSpatialReferenceH hSRS,
                    CT_ObliqueMercator_Laborde);
 
         GTIFKeySet(psGTIF, ProjCenterLatGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LATITUDE_OF_CENTER, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LATITUDE_OF_CENTER, 0.0)));
 
         GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LONGITUDE_OF_CENTER, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LONGITUDE_OF_CENTER, 0.0)));
 
         GTIFKeySet(psGTIF, ProjAzimuthAngleGeoKey, TYPE_DOUBLE, 1,
                    poSRSCompatibleOfWKT1->GetNormProjParm(SRS_PP_AZIMUTH, 0.0));
@@ -2570,12 +2616,12 @@ int GTIFSetFromOGISDefnEx(GTIF *psGTIF, OGRSpatialReferenceH hSRS,
                    CT_CassiniSoldner);
 
         GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LATITUDE_OF_ORIGIN, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LATITUDE_OF_ORIGIN, 0.0)));
 
         GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_CENTRAL_MERIDIAN, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_CENTRAL_MERIDIAN, 0.0)));
 
         GTIFKeySet(
             psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1,
@@ -2597,20 +2643,20 @@ int GTIFSetFromOGISDefnEx(GTIF *psGTIF, OGRSpatialReferenceH hSRS,
                    CT_EquidistantConic);
 
         GTIFKeySet(psGTIF, ProjStdParallel1GeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_STANDARD_PARALLEL_1, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_STANDARD_PARALLEL_1, 0.0)));
 
         GTIFKeySet(psGTIF, ProjStdParallel2GeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_STANDARD_PARALLEL_2, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_STANDARD_PARALLEL_2, 0.0)));
 
         GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LATITUDE_OF_CENTER, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LATITUDE_OF_CENTER, 0.0)));
 
         GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LONGITUDE_OF_CENTER, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LONGITUDE_OF_CENTER, 0.0)));
 
         GTIFKeySet(
             psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1,
@@ -2662,12 +2708,12 @@ int GTIFSetFromOGISDefnEx(GTIF *psGTIF, OGRSpatialReferenceH hSRS,
                    CT_AzimuthalEquidistant);
 
         GTIFKeySet(psGTIF, ProjCenterLatGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LATITUDE_OF_CENTER, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LATITUDE_OF_CENTER, 0.0)));
 
         GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LONGITUDE_OF_CENTER, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LONGITUDE_OF_CENTER, 0.0)));
 
         GTIFKeySet(
             psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1,
@@ -2689,12 +2735,12 @@ int GTIFSetFromOGISDefnEx(GTIF *psGTIF, OGRSpatialReferenceH hSRS,
                    CT_MillerCylindrical);
 
         GTIFKeySet(psGTIF, ProjCenterLatGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LATITUDE_OF_CENTER, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LATITUDE_OF_CENTER, 0.0)));
 
         GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LONGITUDE_OF_CENTER, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LONGITUDE_OF_CENTER, 0.0)));
 
         GTIFKeySet(
             psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1,
@@ -2716,16 +2762,16 @@ int GTIFSetFromOGISDefnEx(GTIF *psGTIF, OGRSpatialReferenceH hSRS,
                    CT_Equirectangular);
 
         GTIFKeySet(psGTIF, ProjCenterLatGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LATITUDE_OF_ORIGIN, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LATITUDE_OF_ORIGIN, 0.0)));
 
         GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_CENTRAL_MERIDIAN, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_CENTRAL_MERIDIAN, 0.0)));
 
         GTIFKeySet(psGTIF, ProjStdParallel1GeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_STANDARD_PARALLEL_1, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_STANDARD_PARALLEL_1, 0.0)));
 
         GTIFKeySet(
             psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1,
@@ -2746,12 +2792,12 @@ int GTIFSetFromOGISDefnEx(GTIF *psGTIF, OGRSpatialReferenceH hSRS,
         GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, CT_Gnomonic);
 
         GTIFKeySet(psGTIF, ProjCenterLatGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LATITUDE_OF_ORIGIN, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LATITUDE_OF_ORIGIN, 0.0)));
 
         GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_CENTRAL_MERIDIAN, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_CENTRAL_MERIDIAN, 0.0)));
 
         GTIFKeySet(
             psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1,
@@ -2773,12 +2819,12 @@ int GTIFSetFromOGISDefnEx(GTIF *psGTIF, OGRSpatialReferenceH hSRS,
                    CT_LambertAzimEqualArea);
 
         GTIFKeySet(psGTIF, ProjCenterLatGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LATITUDE_OF_CENTER, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LATITUDE_OF_CENTER, 0.0)));
 
         GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LONGITUDE_OF_CENTER, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LONGITUDE_OF_CENTER, 0.0)));
 
         GTIFKeySet(
             psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1,
@@ -2800,12 +2846,12 @@ int GTIFSetFromOGISDefnEx(GTIF *psGTIF, OGRSpatialReferenceH hSRS,
                    CT_Orthographic);
 
         GTIFKeySet(psGTIF, ProjCenterLatGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LATITUDE_OF_ORIGIN, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LATITUDE_OF_ORIGIN, 0.0)));
 
         GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_CENTRAL_MERIDIAN, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_CENTRAL_MERIDIAN, 0.0)));
 
         GTIFKeySet(
             psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1,
@@ -2827,12 +2873,12 @@ int GTIFSetFromOGISDefnEx(GTIF *psGTIF, OGRSpatialReferenceH hSRS,
                    CT_NewZealandMapGrid);
 
         GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LATITUDE_OF_ORIGIN, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LATITUDE_OF_ORIGIN, 0.0)));
 
         GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_CENTRAL_MERIDIAN, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_CENTRAL_MERIDIAN, 0.0)));
 
         GTIFKeySet(
             psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1,
@@ -2853,8 +2899,8 @@ int GTIFSetFromOGISDefnEx(GTIF *psGTIF, OGRSpatialReferenceH hSRS,
         GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, CT_Robinson);
 
         GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LONGITUDE_OF_CENTER, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LONGITUDE_OF_CENTER, 0.0)));
 
         GTIFKeySet(
             psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1,
@@ -2875,8 +2921,8 @@ int GTIFSetFromOGISDefnEx(GTIF *psGTIF, OGRSpatialReferenceH hSRS,
         GTIFKeySet(psGTIF, ProjCoordTransGeoKey, TYPE_SHORT, 1, CT_Sinusoidal);
 
         GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LONGITUDE_OF_CENTER, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LONGITUDE_OF_CENTER, 0.0)));
 
         GTIFKeySet(
             psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1,
@@ -2898,8 +2944,8 @@ int GTIFSetFromOGISDefnEx(GTIF *psGTIF, OGRSpatialReferenceH hSRS,
                    CT_VanDerGrinten);
 
         GTIFKeySet(psGTIF, ProjCenterLongGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_CENTRAL_MERIDIAN, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_CENTRAL_MERIDIAN, 0.0)));
 
         GTIFKeySet(
             psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1,
@@ -2921,20 +2967,20 @@ int GTIFSetFromOGISDefnEx(GTIF *psGTIF, OGRSpatialReferenceH hSRS,
                    CT_LambertConfConic_2SP);
 
         GTIFKeySet(psGTIF, ProjFalseOriginLatGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LATITUDE_OF_ORIGIN, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LATITUDE_OF_ORIGIN, 0.0)));
 
         GTIFKeySet(psGTIF, ProjFalseOriginLongGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_CENTRAL_MERIDIAN, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_CENTRAL_MERIDIAN, 0.0)));
 
         GTIFKeySet(psGTIF, ProjStdParallel1GeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_STANDARD_PARALLEL_1, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_STANDARD_PARALLEL_1, 0.0)));
 
         GTIFKeySet(psGTIF, ProjStdParallel2GeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_STANDARD_PARALLEL_2, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_STANDARD_PARALLEL_2, 0.0)));
 
         GTIFKeySet(
             psGTIF, ProjFalseOriginEastingGeoKey, TYPE_DOUBLE, 1,
@@ -2956,12 +3002,12 @@ int GTIFSetFromOGISDefnEx(GTIF *psGTIF, OGRSpatialReferenceH hSRS,
                    CT_LambertConfConic_1SP);
 
         GTIFKeySet(psGTIF, ProjNatOriginLatGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_LATITUDE_OF_ORIGIN, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_LATITUDE_OF_ORIGIN, 0.0)));
 
         GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_CENTRAL_MERIDIAN, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_CENTRAL_MERIDIAN, 0.0)));
 
         GTIFKeySet(
             psGTIF, ProjScaleAtNatOriginGeoKey, TYPE_DOUBLE, 1,
@@ -2987,12 +3033,12 @@ int GTIFSetFromOGISDefnEx(GTIF *psGTIF, OGRSpatialReferenceH hSRS,
                    CT_CylindricalEqualArea);
 
         GTIFKeySet(psGTIF, ProjNatOriginLongGeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_CENTRAL_MERIDIAN, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_CENTRAL_MERIDIAN, 0.0)));
 
         GTIFKeySet(psGTIF, ProjStdParallel1GeoKey, TYPE_DOUBLE, 1,
-                   poSRSCompatibleOfWKT1->GetNormProjParm(
-                       SRS_PP_STANDARD_PARALLEL_1, 0.0));
+                   ConvertAngularParam(poSRSCompatibleOfWKT1->GetNormProjParm(
+                       SRS_PP_STANDARD_PARALLEL_1, 0.0)));
 
         GTIFKeySet(
             psGTIF, ProjFalseEastingGeoKey, TYPE_DOUBLE, 1,
@@ -3133,38 +3179,36 @@ int GTIFSetFromOGISDefnEx(GTIF *psGTIF, OGRSpatialReferenceH hSRS,
     /*      Write angular units.                                            */
     /* -------------------------------------------------------------------- */
 
-    const char *angUnitName = "";
     if (bHasEllipsoid &&
         (nGCS == KvUserDefined || eVersion == GEOTIFF_VERSION_1_0))
     {
-        double angUnitValue = poSRS->GetAngularUnits(&angUnitName);
-        if (EQUAL(angUnitName, "Degree"))
+        if (EQUAL(osAngUnitName.c_str(), "Degree"))
             GTIFKeySet(psGTIF, GeogAngularUnitsGeoKey, TYPE_SHORT, 1,
                        Angular_Degree);
-        else if (EQUAL(angUnitName, "arc-second"))
+        else if (EQUAL(osAngUnitName.c_str(), "arc-second"))
             GTIFKeySet(psGTIF, GeogAngularUnitsGeoKey, TYPE_SHORT, 1,
                        Angular_Arc_Second);
-        else if (EQUAL(angUnitName, "arc-minute"))
+        else if (EQUAL(osAngUnitName.c_str(), "arc-minute"))
             GTIFKeySet(psGTIF, GeogAngularUnitsGeoKey, TYPE_SHORT, 1,
                        Angular_Arc_Minute);
-        else if (EQUAL(angUnitName, "grad"))
+        else if (EQUAL(osAngUnitName.c_str(), "grad"))
             GTIFKeySet(psGTIF, GeogAngularUnitsGeoKey, TYPE_SHORT, 1,
                        Angular_Grad);
-        else if (EQUAL(angUnitName, "gon"))
+        else if (EQUAL(osAngUnitName.c_str(), "gon"))
             GTIFKeySet(psGTIF, GeogAngularUnitsGeoKey, TYPE_SHORT, 1,
                        Angular_Gon);
-        else if (EQUAL(angUnitName, "radian"))
+        else if (EQUAL(osAngUnitName.c_str(), "radian"))
             GTIFKeySet(psGTIF, GeogAngularUnitsGeoKey, TYPE_SHORT, 1,
                        Angular_Radian);
-        // else if (EQUAL(angUnitName, "microradian"))
+        // else if (EQUAL(osAngUnitName.c_str(), "microradian"))
         //    GTIFKeySet(psGTIF, GeogAngularUnitsGeoKey, TYPE_SHORT, 1,
         //               9109);
         else
         {
             // GeogCitationGeoKey may be rewritten if the gcs is user defined.
-            oMapAsciiKeys[GeogCitationGeoKey] = angUnitName;
+            oMapAsciiKeys[GeogCitationGeoKey] = osAngUnitName;
             GTIFKeySet(psGTIF, GeogAngularUnitSizeGeoKey, TYPE_DOUBLE, 1,
-                       angUnitValue);
+                       dfAngUnitValue);
         }
     }
 
@@ -3204,7 +3248,9 @@ int GTIFSetFromOGISDefnEx(GTIF *psGTIF, OGRSpatialReferenceH hSRS,
     /* -------------------------------------------------------------------- */
     if (nPCS == KvUserDefined)
     {
-        if (nGCS == KvUserDefined)
+        if (nGCS == KvUserDefined && poSRS->IsGeographic() &&
+            std::fabs(poSRS->GetAngularUnits() - CPLAtof(SRS_UA_DEGREE_CONV)) <
+                1e-9)
         {
             if (nDatum == Datum_North_American_Datum_1927)
                 nGCS = GCS_NAD27;
@@ -3275,8 +3321,8 @@ int GTIFSetFromOGISDefnEx(GTIF *psGTIF, OGRSpatialReferenceH hSRS,
             if (nGCS == KvUserDefined &&
                 CPLTestBool(CPLGetConfigOption("GTIFF_ESRI_CITATION", "YES")))
             {
-                SetGeogCSCitation(psGTIF, oMapAsciiKeys, poSRS, angUnitName,
-                                  nDatum, nSpheroid);
+                SetGeogCSCitation(psGTIF, oMapAsciiKeys, poSRS,
+                                  osAngUnitName.c_str(), nDatum, nSpheroid);
             }
         }
     }
@@ -3452,10 +3498,8 @@ CPLErr GTIFWktFromMemBufEx(int nSize, unsigned char *pabyBuffer,
                            char ***ppapszRPCMD)
 
 {
-    char szFilename[100] = {};
-
-    snprintf(szFilename, sizeof(szFilename), "/vsimem/wkt_from_mem_buf_%ld.tif",
-             static_cast<long>(CPLGetPID()));
+    const std::string osFilename(
+        VSIMemGenerateHiddenFilename("wkt_from_mem_buf.tif"));
 
     /* -------------------------------------------------------------------- */
     /*      Initialization of libtiff and libgeotiff.                       */
@@ -3466,20 +3510,21 @@ CPLErr GTIFWktFromMemBufEx(int nSize, unsigned char *pabyBuffer,
     /* -------------------------------------------------------------------- */
     /*      Create a memory file from the buffer.                           */
     /* -------------------------------------------------------------------- */
-    VSILFILE *fp = VSIFileFromMemBuffer(szFilename, pabyBuffer, nSize, FALSE);
+    VSILFILE *fp =
+        VSIFileFromMemBuffer(osFilename.c_str(), pabyBuffer, nSize, FALSE);
     if (fp == nullptr)
         return CE_Failure;
 
     /* -------------------------------------------------------------------- */
     /*      Initialize access to the memory geotiff structure.              */
     /* -------------------------------------------------------------------- */
-    TIFF *hTIFF = VSI_TIFFOpen(szFilename, "rc", fp);
+    TIFF *hTIFF = VSI_TIFFOpen(osFilename.c_str(), "rc", fp);
 
     if (hTIFF == nullptr)
     {
         CPLError(CE_Failure, CPLE_AppDefined,
                  "TIFF/GeoTIFF structure is corrupt.");
-        VSIUnlink(szFilename);
+        VSIUnlink(osFilename.c_str());
         CPL_IGNORE_RET_VAL(VSIFCloseL(fp));
         return CE_Failure;
     }
@@ -3617,7 +3662,7 @@ CPLErr GTIFWktFromMemBufEx(int nSize, unsigned char *pabyBuffer,
     XTIFFClose(hTIFF);
     CPL_IGNORE_RET_VAL(VSIFCloseL(fp));
 
-    VSIUnlink(szFilename);
+    VSIUnlink(osFilename.c_str());
 
     if (phSRS && *phSRS == nullptr)
         return CE_Failure;
@@ -3648,10 +3693,8 @@ CPLErr GTIFMemBufFromSRS(OGRSpatialReferenceH hSRS,
                          char **papszRPCMD)
 
 {
-    char szFilename[100] = {};
-
-    snprintf(szFilename, sizeof(szFilename), "/vsimem/wkt_from_mem_buf_%ld.tif",
-             static_cast<long>(CPLGetPID()));
+    const std::string osFilename(
+        VSIMemGenerateHiddenFilename("wkt_from_mem_buf.tif"));
 
     /* -------------------------------------------------------------------- */
     /*      Initialization of libtiff and libgeotiff.                       */
@@ -3662,17 +3705,18 @@ CPLErr GTIFMemBufFromSRS(OGRSpatialReferenceH hSRS,
     /* -------------------------------------------------------------------- */
     /*      Initialize access to the memory geotiff structure.              */
     /* -------------------------------------------------------------------- */
-    VSILFILE *fpL = VSIFOpenL(szFilename, "w");
+    VSILFILE *fpL = VSIFOpenL(osFilename.c_str(), "w");
     if (fpL == nullptr)
         return CE_Failure;
 
-    TIFF *hTIFF = VSI_TIFFOpen(szFilename, "w", fpL);
+    TIFF *hTIFF = VSI_TIFFOpen(osFilename.c_str(), "w", fpL);
 
     if (hTIFF == nullptr)
     {
         CPLError(CE_Failure, CPLE_AppDefined,
                  "TIFF/GeoTIFF structure is corrupt.");
         CPL_IGNORE_RET_VAL(VSIFCloseL(fpL));
+        VSIUnlink(osFilename.c_str());
         return CE_Failure;
     }
 
@@ -3824,7 +3868,7 @@ CPLErr GTIFMemBufFromSRS(OGRSpatialReferenceH hSRS,
     /* -------------------------------------------------------------------- */
     GUIntBig nBigLength = 0;
 
-    *ppabyBuffer = VSIGetMemFileBuffer(szFilename, &nBigLength, TRUE);
+    *ppabyBuffer = VSIGetMemFileBuffer(osFilename.c_str(), &nBigLength, TRUE);
     *pnSize = static_cast<int>(nBigLength);
 
     return CE_None;
diff --git a/frmts/gtiff/gt_wkt_srs.h b/frmts/gtiff/gt_wkt_srs.h
index 1522ea6b5cb2..a90a15e07629 100644
--- a/frmts/gtiff/gt_wkt_srs.h
+++ b/frmts/gtiff/gt_wkt_srs.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GT_WKT_SRS_H_INCLUDED
diff --git a/frmts/gtiff/gt_wkt_srs_for_gdal.h b/frmts/gtiff/gt_wkt_srs_for_gdal.h
index 4f6ad898305b..28e8dc8ee656 100644
--- a/frmts/gtiff/gt_wkt_srs_for_gdal.h
+++ b/frmts/gtiff/gt_wkt_srs_for_gdal.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2010-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GT_WKT_SRS_FOR_GDAL_H_INCLUDED
diff --git a/frmts/gtiff/gt_wkt_srs_priv.h b/frmts/gtiff/gt_wkt_srs_priv.h
index 21fc6c4bdc58..01183dc1501c 100644
--- a/frmts/gtiff/gt_wkt_srs_priv.h
+++ b/frmts/gtiff/gt_wkt_srs_priv.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GT_WKT_SRS_PRIV_H_INCLUDED
@@ -40,14 +24,14 @@
 
 #else
 
-int GDALGTIFKeyGetASCII(GTIF *hGTIF, geokey_t key, char *szStr,
-                        int szStrMaxLen);
+int CPL_DLL GDALGTIFKeyGetASCII(GTIF *hGTIF, geokey_t key, char *szStr,
+                                int szStrMaxLen);
 
-int GDALGTIFKeyGetSHORT(GTIF *hGTIF, geokey_t key, unsigned short *pnVal,
-                        int nIndex, int nCount);
+int CPL_DLL GDALGTIFKeyGetSHORT(GTIF *hGTIF, geokey_t key,
+                                unsigned short *pnVal, int nIndex, int nCount);
 
-int GDALGTIFKeyGetDOUBLE(GTIF *hGTIF, geokey_t key, double *pdfVal, int nIndex,
-                         int nCount);
+int CPL_DLL GDALGTIFKeyGetDOUBLE(GTIF *hGTIF, geokey_t key, double *pdfVal,
+                                 int nIndex, int nCount);
 
 #endif
 
diff --git a/frmts/gtiff/gtiff.h b/frmts/gtiff/gtiff.h
index 64545248cca8..02fdf07691e5 100644
--- a/frmts/gtiff/gtiff.h
+++ b/frmts/gtiff/gtiff.h
@@ -9,23 +9,7 @@
  * Copyright (c) 1998, 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GTIFF_H_INCLUDED
diff --git a/frmts/gtiff/gtiffbitmapband.cpp b/frmts/gtiff/gtiffbitmapband.cpp
index be368bdff1a9..3f8d09028317 100644
--- a/frmts/gtiff/gtiffbitmapband.cpp
+++ b/frmts/gtiff/gtiffbitmapband.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gtiffbitmapband.h"
diff --git a/frmts/gtiff/gtiffbitmapband.h b/frmts/gtiff/gtiffbitmapband.h
index 131440c94e8d..6c2bd40bee57 100644
--- a/frmts/gtiff/gtiffbitmapband.h
+++ b/frmts/gtiff/gtiffbitmapband.h
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GTIFFBITMAPBAND_H_INCLUDED
diff --git a/frmts/gtiff/gtiffdataset.cpp b/frmts/gtiff/gtiffdataset.cpp
index 40cd55c94bd7..ee65ece7df1e 100644
--- a/frmts/gtiff/gtiffdataset.cpp
+++ b/frmts/gtiff/gtiffdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gtiffdataset.h"
@@ -308,9 +292,7 @@ std::tuple<CPLErr, bool> GTiffDataset::Finalize()
         bDroppedRef = true;
     }
 
-    if (m_poColorTable != nullptr)
-        delete m_poColorTable;
-    m_poColorTable = nullptr;
+    m_poColorTable.reset();
 
     if (m_hTIFF)
     {
@@ -1116,7 +1098,11 @@ void GTiffDataset::ScanDirectories()
                 GTiffDataset *poODS = new GTiffDataset();
                 poODS->ShareLockWithParentDataset(this);
                 poODS->SetStructuralMDFromParent(this);
+                if (m_bHasGotSiblingFiles)
+                    poODS->oOvManager.TransferSiblingFiles(
+                        CSLDuplicate(GetSiblingFiles()));
                 poODS->m_pszFilename = CPLStrdup(m_pszFilename);
+                poODS->m_nColorTableMultiplier = m_nColorTableMultiplier;
                 if (poODS->OpenOffset(VSI_TIFFOpenChild(m_hTIFF), nThisDir,
                                       eAccess) != CE_None ||
                     poODS->GetRasterCount() != GetRasterCount())
diff --git a/frmts/gtiff/gtiffdataset.h b/frmts/gtiff/gtiffdataset.h
index 18b0827caf3b..3bca95d0ad33 100644
--- a/frmts/gtiff/gtiffdataset.h
+++ b/frmts/gtiff/gtiffdataset.h
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GTIFFDATASET_H_INCLUDED
@@ -54,9 +38,6 @@ enum class GTiffProfile : GByte
 // This must be a #define, since it is used in a XSTRINGIFY() macro
 #define DEFAULT_WEBP_LEVEL 75
 
-constexpr const char *const szJPEGGTiffDatasetTmpPrefix =
-    "/vsimem/gtiffdataset_jpg_tmp_";
-
 class GTiffBitmapBand;
 class GTiffDataset;
 class GTiffJPEGOverviewBand;
@@ -155,7 +136,7 @@ class GTiffDataset final : public GDALPamDataset
         m_poMaskExtOvrDS{};  // Used with MASK_OVERVIEW_DATASET open option
     GTiffJPEGOverviewDS **m_papoJPEGOverviewDS = nullptr;
     std::vector<gdal::GCP> m_aoGCPs{};
-    GDALColorTable *m_poColorTable = nullptr;
+    std::unique_ptr<GDALColorTable> m_poColorTable{};
     char **m_papszMetadataFiles = nullptr;
     GByte *m_pabyBlockBuf = nullptr;
     char **m_papszCreationOptions = nullptr;
@@ -205,6 +186,16 @@ class GTiffDataset final : public GDALPamDataset
     int m_nRefBaseMapping = 0;
     int m_nDisableMultiThreadedRead = 0;
 
+  public:
+    static constexpr int DEFAULT_COLOR_TABLE_MULTIPLIER_257 = 257;
+
+  private:
+    //! Multiplication factor to go from GDAL [0,255] color table range to
+    // TIFF [0,65535] color map one.
+    // 0 is not a valid value, and means not specified by user through the
+    // COLOR_TABLE_MULTIPLIER open / creation option.
+    int m_nColorTableMultiplier = 0;
+
     GTIFFKeysFlavorEnum m_eGeoTIFFKeysFlavor = GEOTIFF_KEYS_STANDARD;
     GeoTIFFVersionEnum m_eGeoTIFFVersion = GEOTIFF_VERSION_AUTO;
 
@@ -423,7 +414,7 @@ class GTiffDataset final : public GDALPamDataset
 
     void LoadGeoreferencingAndPamIfNeeded();
 
-    char **GetSiblingFiles();
+    CSLConstList GetSiblingFiles();
 
     void IdentifyAuthorizedGeoreferencingSources();
 
@@ -550,8 +541,8 @@ class GTiffDataset final : public GDALPamDataset
     static TIFF *CreateLL(const char *pszFilename, int nXSize, int nYSize,
                           int nBands, GDALDataType eType,
                           double dfExtraSpaceForOverviews,
-                          char **papszParamList, VSILFILE **pfpL,
-                          CPLString &osTmpFilename);
+                          int nColorTableMultiplier, char **papszParamList,
+                          VSILFILE **pfpL, CPLString &osTmpFilename);
 
     CPLErr WriteEncodedTileOrStrip(uint32_t tile_or_strip, void *data,
                                    int bPreserveDataBuffer);
@@ -560,6 +551,9 @@ class GTiffDataset final : public GDALPamDataset
                                char **papszParamList, uint32_t nBitsPerSample);
 
     static const GTIFFTag *GetTIFFTags();
+
+    static unsigned short ClampCTEntry(int iColor, int iComp, int nCTEntryVal,
+                                       int nMultFactor);
 };
 
 GTIFFKeysFlavorEnum GetGTIFFKeysFlavor(CSLConstList papszOptions);
diff --git a/frmts/gtiff/gtiffdataset_read.cpp b/frmts/gtiff/gtiffdataset_read.cpp
index 5945986daea2..623516edd361 100644
--- a/frmts/gtiff/gtiffdataset_read.cpp
+++ b/frmts/gtiff/gtiffdataset_read.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gtiffdataset.h"
@@ -106,7 +90,8 @@ int GTiffDataset::GetJPEGOverviewCount()
     GByte abyFFD8[] = {0xFF, 0xD8};
     if (TIFFGetField(m_hTIFF, TIFFTAG_JPEGTABLES, &nJPEGTableSize, &pJPEGTable))
     {
-        if (pJPEGTable == nullptr || nJPEGTableSize > INT_MAX ||
+        if (pJPEGTable == nullptr || nJPEGTableSize < 2 ||
+            nJPEGTableSize > INT_MAX ||
             static_cast<GByte *>(pJPEGTable)[nJPEGTableSize - 1] != 0xD9)
         {
             m_nJPEGOverviewCount = 0;
@@ -703,8 +688,8 @@ static void CPL_STDCALL ThreadDecompressionFuncErrorHandler(
     {
         // Generate a dummy in-memory TIFF file that has all the needed tags
         // from the original file
-        CPLString osTmpFilename;
-        osTmpFilename.Printf("/vsimem/decompress_%p.tif", psJob);
+        const CPLString osTmpFilename(
+            VSIMemGenerateHiddenFilename("decompress.tif"));
         VSILFILE *fpTmp = VSIFOpenL(osTmpFilename.c_str(), "wb+");
         TIFF *hTIFFTmp =
             VSI_TIFFOpen(osTmpFilename.c_str(),
@@ -750,11 +735,33 @@ static void CPL_STDCALL ThreadDecompressionFuncErrorHandler(
                              psContext->nYCrbCrSubSampling1);
             }
         }
-        if (psContext->pExtraSamples)
+        if (poDS->m_nPlanarConfig == PLANARCONFIG_CONTIG)
         {
-            TIFFSetField(hTIFFTmp, TIFFTAG_EXTRASAMPLES,
-                         psContext->nExtraSampleCount,
-                         psContext->pExtraSamples);
+            if (psContext->pExtraSamples)
+            {
+                TIFFSetField(hTIFFTmp, TIFFTAG_EXTRASAMPLES,
+                             psContext->nExtraSampleCount,
+                             psContext->pExtraSamples);
+            }
+            else
+            {
+                const int nSamplesAccountedFor =
+                    poDS->m_nPhotometric == PHOTOMETRIC_RGB          ? 3
+                    : poDS->m_nPhotometric == PHOTOMETRIC_MINISBLACK ? 1
+                                                                     : 0;
+                if (nSamplesAccountedFor > 0 &&
+                    poDS->m_nSamplesPerPixel > nSamplesAccountedFor)
+                {
+                    // If the input image is not compliant regarndig ExtraSamples,
+                    // generate a synthetic one to avoid gazillons of warnings
+                    const auto nExtraSampleCount = static_cast<uint16_t>(
+                        poDS->m_nSamplesPerPixel - nSamplesAccountedFor);
+                    std::vector<uint16_t> anExtraSamples(
+                        nExtraSampleCount, EXTRASAMPLE_UNSPECIFIED);
+                    TIFFSetField(hTIFFTmp, TIFFTAG_EXTRASAMPLES,
+                                 nExtraSampleCount, anExtraSamples.data());
+                }
+            }
         }
         TIFFWriteCheck(hTIFFTmp, FALSE, "ThreadDecompressionFunc");
         TIFFWriteDirectory(hTIFFTmp);
@@ -3501,9 +3508,8 @@ static bool GTIFFExtendMemoryFile(const CPLString &osTmpFilename,
 
 static bool GTIFFMakeBufferedStream(GDALOpenInfo *poOpenInfo)
 {
-    CPLString osTmpFilename;
-    static int nCounter = 0;
-    osTmpFilename.Printf("/vsimem/stream_%d.tif", ++nCounter);
+    const CPLString osTmpFilename(
+        VSIMemGenerateHiddenFilename("GTIFFMakeBufferedStream.tif"));
     VSILFILE *fpTemp = VSIFOpenL(osTmpFilename, "wb+");
     if (fpTemp == nullptr)
         return false;
@@ -3939,6 +3945,12 @@ GDALDataset *GTiffDataset::Open(GDALOpenInfo *poOpenInfo)
         poDS->m_bHasGotSiblingFiles = true;
     }
 
+    // Should be capped by 257, to avoid 65535 / m_nColorTableMultiplier to overflow 255
+    poDS->m_nColorTableMultiplier = std::max(
+        0, std::min(257,
+                    atoi(CSLFetchNameValueDef(poOpenInfo->papszOpenOptions,
+                                              "COLOR_TABLE_MULTIPLIER", "0"))));
+
     if (poDS->OpenOffset(l_hTIFF, TIFFCurrentDirOffset(l_hTIFF),
                          poOpenInfo->eAccess, bAllowRGBAInterface,
                          true) != CE_None)
@@ -3980,9 +3992,7 @@ GDALDataset *GTiffDataset::Open(GDALOpenInfo *poOpenInfo)
     /* -------------------------------------------------------------------- */
     /*      Initialize info for external overviews.                         */
     /* -------------------------------------------------------------------- */
-    poDS->oOvManager.Initialize(poDS, pszFilename);
-    if (poOpenInfo->AreSiblingFilesLoaded())
-        poDS->oOvManager.TransferSiblingFiles(poOpenInfo->StealSiblingFiles());
+    poDS->oOvManager.Initialize(poDS, poOpenInfo, pszFilename);
 
     // For backward compatibility, in case GTIFF_POINT_GEO_IGNORE is defined
     // load georeferencing right now so as to not require it to be defined
@@ -4204,7 +4214,7 @@ void GTiffDataset::LookForProjectionFromGeoTIFF()
 
 void GTiffDataset::LookForProjectionFromXML()
 {
-    char **papszSiblingFiles = GetSiblingFiles();
+    CSLConstList papszSiblingFiles = GetSiblingFiles();
 
     if (!GDALCanFileAcceptSidecarFile(m_pszFilename))
         return;
@@ -4541,11 +4551,10 @@ void GTiffDataset::ApplyPamInfo()
 
         if (i == 1)
         {
-            auto poCT = poBand->GDALPamRasterBand::GetColorTable();
+            const auto poCT = poBand->GDALPamRasterBand::GetColorTable();
             if (poCT)
             {
-                delete m_poColorTable;
-                m_poColorTable = poCT->Clone();
+                m_poColorTable.reset(poCT->Clone());
             }
         }
     }
@@ -4738,7 +4747,8 @@ void GTiffDataset::LoadICCProfile()
     {
         if (TIFFGetField(m_hTIFF, TIFFTAG_WHITEPOINT, &pWP))
         {
-            if (!TIFFGetFieldDefaulted(m_hTIFF, TIFFTAG_TRANSFERFUNCTION, &pTFR,
+            if (m_nBitsPerSample > 24 ||
+                !TIFFGetFieldDefaulted(m_hTIFF, TIFFTAG_TRANSFERFUNCTION, &pTFR,
                                        &pTFG, &pTFB) ||
                 pTFR == nullptr || pTFG == nullptr || pTFB == nullptr)
             {
@@ -5187,7 +5197,7 @@ CPLErr GTiffDataset::OpenOffset(TIFF *hTIFFIn, toff_t nDirOffsetIn,
         // data types (per #1882)
         if (m_nBitsPerSample <= 16 && m_nPhotometric == PHOTOMETRIC_MINISWHITE)
         {
-            m_poColorTable = new GDALColorTable();
+            m_poColorTable = std::make_unique<GDALColorTable>();
             const int nColorCount = 1 << m_nBitsPerSample;
 
             for (int iColor = 0; iColor < nColorCount; ++iColor)
@@ -5203,59 +5213,92 @@ CPLErr GTiffDataset::OpenOffset(TIFF *hTIFFIn, toff_t nDirOffsetIn,
         }
         else
         {
-            m_poColorTable = nullptr;
+            m_poColorTable.reset();
         }
     }
     else
     {
-        unsigned short nMaxColor = 0;
-
-        m_poColorTable = new GDALColorTable();
+        m_poColorTable = std::make_unique<GDALColorTable>();
 
         const int nColorCount = 1 << m_nBitsPerSample;
 
+        if (m_nColorTableMultiplier == 0)
+        {
+            // TIFF color maps are in the [0, 65535] range, so some remapping must
+            // be done to get values in the [0, 255] range, but it is not clear
+            // how to do that exactly. Since GDAL 2.3.0 we have standardized on
+            // using a 257 multiplication factor (https://github.com/OSGeo/gdal/commit/eeec5b62e385d53e7f2edaba7b73c7c74bc2af39)
+            // but other software uses 256 (cf https://github.com/OSGeo/gdal/issues/10310)
+            // Do a first pass to check if all values are multiples of 256 or 257.
+            bool bFoundNonZeroEntry = false;
+            bool bAllValuesMultipleOf256 = true;
+            bool bAllValuesMultipleOf257 = true;
+            unsigned short nMaxColor = 0;
+            for (int iColor = 0; iColor < nColorCount; ++iColor)
+            {
+                if (panRed[iColor] > 0 || panGreen[iColor] > 0 ||
+                    panBlue[iColor] > 0)
+                {
+                    bFoundNonZeroEntry = true;
+                }
+                if ((panRed[iColor] % 256) != 0 ||
+                    (panGreen[iColor] % 256) != 0 ||
+                    (panBlue[iColor] % 256) != 0)
+                {
+                    bAllValuesMultipleOf256 = false;
+                }
+                if ((panRed[iColor] % 257) != 0 ||
+                    (panGreen[iColor] % 257) != 0 ||
+                    (panBlue[iColor] % 257) != 0)
+                {
+                    bAllValuesMultipleOf257 = false;
+                }
+
+                nMaxColor = std::max(nMaxColor, panRed[iColor]);
+                nMaxColor = std::max(nMaxColor, panGreen[iColor]);
+                nMaxColor = std::max(nMaxColor, panBlue[iColor]);
+            }
+
+            if (nMaxColor > 0 && nMaxColor < 256)
+            {
+                // Bug 1384 - Some TIFF files are generated with color map entry
+                // values in range 0-255 instead of 0-65535 - try to handle these
+                // gracefully.
+                m_nColorTableMultiplier = 1;
+                CPLDebug("GTiff",
+                         "TIFF ColorTable seems to be improperly scaled with "
+                         "values all in [0,255] range, fixing up.");
+            }
+            else
+            {
+                if (!bAllValuesMultipleOf256 && !bAllValuesMultipleOf257)
+                {
+                    CPLDebug("GTiff",
+                             "The color map contains entries which are not "
+                             "multiple of 256 or 257, so we don't know for "
+                             "sure how to remap them to [0, 255]. Default to "
+                             "using a 257 multiplication factor");
+                }
+                m_nColorTableMultiplier =
+                    (bFoundNonZeroEntry && bAllValuesMultipleOf256)
+                        ? 256
+                        : DEFAULT_COLOR_TABLE_MULTIPLIER_257;
+            }
+        }
+        CPLAssert(m_nColorTableMultiplier > 0);
+        CPLAssert(m_nColorTableMultiplier <= 257);
         for (int iColor = nColorCount - 1; iColor >= 0; iColor--)
         {
-            // TODO(schwehr): Ensure the color entries are never negative?
-            const unsigned short divisor = 257;
             const GDALColorEntry oEntry = {
-                static_cast<short>(panRed[iColor] / divisor),
-                static_cast<short>(panGreen[iColor] / divisor),
-                static_cast<short>(panBlue[iColor] / divisor),
+                static_cast<short>(panRed[iColor] / m_nColorTableMultiplier),
+                static_cast<short>(panGreen[iColor] / m_nColorTableMultiplier),
+                static_cast<short>(panBlue[iColor] / m_nColorTableMultiplier),
                 static_cast<short>(
                     m_bNoDataSet && static_cast<int>(m_dfNoDataValue) == iColor
                         ? 0
                         : 255)};
 
             m_poColorTable->SetColorEntry(iColor, &oEntry);
-
-            nMaxColor = std::max(nMaxColor, panRed[iColor]);
-            nMaxColor = std::max(nMaxColor, panGreen[iColor]);
-            nMaxColor = std::max(nMaxColor, panBlue[iColor]);
-        }
-
-        // Bug 1384 - Some TIFF files are generated with color map entry
-        // values in range 0-255 instead of 0-65535 - try to handle these
-        // gracefully.
-        if (nMaxColor > 0 && nMaxColor < 256)
-        {
-            CPLDebug(
-                "GTiff",
-                "TIFF ColorTable seems to be improperly scaled, fixing up.");
-
-            for (int iColor = nColorCount - 1; iColor >= 0; iColor--)
-            {
-                // TODO(schwehr): Ensure the color entries are never negative?
-                const GDALColorEntry oEntry = {
-                    static_cast<short>(panRed[iColor]),
-                    static_cast<short>(panGreen[iColor]),
-                    static_cast<short>(panBlue[iColor]),
-                    m_bNoDataSet && static_cast<int>(m_dfNoDataValue) == iColor
-                        ? static_cast<short>(0)
-                        : static_cast<short>(255)};
-
-                m_poColorTable->SetColorEntry(iColor, &oEntry);
-            }
         }
     }
 
@@ -5621,8 +5664,19 @@ CPLErr GTiffDataset::OpenOffset(TIFF *hTIFFIn, toff_t nDirOffsetIn,
                     }
                     else if (EQUAL(pszRole, "colorinterp"))
                     {
-                        poBand->m_eBandInterp =
-                            GDALGetColorInterpretationByName(pszUnescapedValue);
+                        if (EQUAL(pszUnescapedValue, "undefined"))
+                            poBand->m_eBandInterp = GCI_Undefined;
+                        else
+                        {
+                            poBand->m_eBandInterp =
+                                GDALGetColorInterpretationByName(
+                                    pszUnescapedValue);
+                            if (poBand->m_eBandInterp == GCI_Undefined)
+                            {
+                                poBand->m_oGTiffMDMD.SetMetadataItem(
+                                    "COLOR_INTERPRETATION", pszUnescapedValue);
+                            }
+                        }
                     }
                     else
                     {
@@ -5759,28 +5813,31 @@ CPLErr GTiffDataset::OpenOffset(TIFF *hTIFFIn, toff_t nDirOffsetIn,
 /*                         GetSiblingFiles()                            */
 /************************************************************************/
 
-char **GTiffDataset::GetSiblingFiles()
+CSLConstList GTiffDataset::GetSiblingFiles()
 {
     if (m_bHasGotSiblingFiles)
     {
         return oOvManager.GetSiblingFiles();
     }
+    if (m_poBaseDS)
+    {
+        return m_poBaseDS->GetSiblingFiles();
+    }
 
     m_bHasGotSiblingFiles = true;
     const int nMaxFiles =
         atoi(CPLGetConfigOption("GDAL_READDIR_LIMIT_ON_OPEN", "1000"));
-    char **papszSiblingFiles =
-        VSIReadDirEx(CPLGetDirname(m_pszFilename), nMaxFiles);
-    if (nMaxFiles > 0 && CSLCount(papszSiblingFiles) > nMaxFiles)
+    CPLStringList aosSiblingFiles(
+        VSIReadDirEx(CPLGetDirname(m_pszFilename), nMaxFiles));
+    if (nMaxFiles > 0 && aosSiblingFiles.size() > nMaxFiles)
     {
         CPLDebug("GTiff", "GDAL_READDIR_LIMIT_ON_OPEN reached on %s",
                  CPLGetDirname(m_pszFilename));
-        CSLDestroy(papszSiblingFiles);
-        papszSiblingFiles = nullptr;
+        aosSiblingFiles.clear();
     }
-    oOvManager.TransferSiblingFiles(papszSiblingFiles);
+    oOvManager.TransferSiblingFiles(aosSiblingFiles.StealList());
 
-    return papszSiblingFiles;
+    return oOvManager.GetSiblingFiles();
 }
 
 /************************************************************************/
@@ -6002,7 +6059,7 @@ void GTiffDataset::LoadGeoreferencingAndPamIfNeeded()
             {
                 char *pszGeorefFilename = nullptr;
 
-                char **papszSiblingFiles = GetSiblingFiles();
+                CSLConstList papszSiblingFiles = GetSiblingFiles();
 
                 // Begin with .tab since it can also have projection info.
                 int nGCPCount = 0;
@@ -6045,7 +6102,7 @@ void GTiffDataset::LoadGeoreferencingAndPamIfNeeded()
             {
                 char *pszGeorefFilename = nullptr;
 
-                char **papszSiblingFiles = GetSiblingFiles();
+                CSLConstList papszSiblingFiles = GetSiblingFiles();
 
                 m_bGeoTransformValid = CPL_TO_BOOL(GDALReadWorldFile2(
                     m_pszFilename, nullptr, m_adfGeoTransform,
@@ -6585,6 +6642,18 @@ void GTiffDataset::LoadMetadata()
         return;
     m_bIMDRPCMetadataLoaded = true;
 
+    if (EQUAL(CPLGetExtension(GetDescription()), "ovr"))
+    {
+        // Do not attempt to retrieve metadata files on .tif.ovr files.
+        // For example the Pleiades metadata reader might wrongly associate a
+        // DIM_xxx.XML file that was meant to be associated with the main
+        // TIFF file. The consequence of that wrong association is that if
+        // one cleans overviews, then the Delete() method would then delete
+        // that DIM_xxx.XML file since it would be reported in the GetFileList()
+        // of the overview dataset.
+        return;
+    }
+
     GDALMDReaderManager mdreadermanager;
     GDALMDReaderBase *mdreader = mdreadermanager.GetReader(
         m_pszFilename, oOvManager.GetSiblingFiles(), MDR_ANY);
diff --git a/frmts/gtiff/gtiffdataset_write.cpp b/frmts/gtiff/gtiffdataset_write.cpp
index aa42084d1e6a..e9ee1ad95219 100644
--- a/frmts/gtiff/gtiffdataset_write.cpp
+++ b/frmts/gtiff/gtiffdataset_write.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gtiffdataset.h"
@@ -35,6 +19,7 @@
 #include <cerrno>
 
 #include <algorithm>
+#include <cmath>
 #include <limits>
 #include <memory>
 #include <mutex>
@@ -73,6 +58,13 @@ static constexpr const char szPROFILE_BASELINE[] = "BASELINE";
 static constexpr const char szPROFILE_GeoTIFF[] = "GeoTIFF";
 static constexpr const char szPROFILE_GDALGeoTIFF[] = "GDALGeoTIFF";
 
+// Due to libgeotiff/xtiff.c declaring TIFFTAG_GEOTIEPOINTS with field_readcount
+// and field_writecount == -1 == TIFF_VARIABLE, we are limited to writing
+// 65535 values in that tag. That could potentially be overcome by changing the tag
+// declaration to using TIFF_VARIABLE2 where the count is a uint32_t.
+constexpr int knMAX_GCP_COUNT =
+    static_cast<int>(std::numeric_limits<uint16_t>::max() / 6);
+
 enum
 {
     ENDIANNESS_NATIVE,
@@ -520,18 +512,18 @@ inline bool GTiffDataset::IsFirstPixelEqualToNoData(const void *pBuffer)
     }
     if (m_nBitsPerSample == 32 && eDT == GDT_Float32)
     {
-        if (CPLIsNan(m_dfNoDataValue))
+        if (std::isnan(m_dfNoDataValue))
             return CPL_TO_BOOL(
-                CPLIsNan(*(static_cast<const float *>(pBuffer))));
+                std::isnan(*(static_cast<const float *>(pBuffer))));
         return GDALIsValueInRange<float>(dfEffectiveNoData) &&
                *(static_cast<const float *>(pBuffer)) ==
                    static_cast<float>(dfEffectiveNoData);
     }
     if (m_nBitsPerSample == 64 && eDT == GDT_Float64)
     {
-        if (CPLIsNan(dfEffectiveNoData))
+        if (std::isnan(dfEffectiveNoData))
             return CPL_TO_BOOL(
-                CPLIsNan(*(static_cast<const double *>(pBuffer))));
+                std::isnan(*(static_cast<const double *>(pBuffer))));
         return *(static_cast<const double *>(pBuffer)) == dfEffectiveNoData;
     }
     return false;
@@ -939,8 +931,8 @@ void GTiffDataset::InitCompressionThreads(bool bUpdateMode,
                          i < static_cast<int>(m_asCompressionJobs.size()); ++i)
                     {
                         m_asCompressionJobs[i].pszTmpFilename =
-                            CPLStrdup(CPLSPrintf("/vsimem/gtiff/thread/job/%p",
-                                                 &m_asCompressionJobs[i]));
+                            CPLStrdup(VSIMemGenerateHiddenFilename(
+                                CPLSPrintf("thread_job_%d.tif", i)));
                         m_asCompressionJobs[i].nStripOrTile = -1;
                     }
 
@@ -1375,7 +1367,7 @@ bool GTiffDataset::SubmitCompressionJob(int nStripOrTile, GByte *pabyData,
             memset(&sJob, 0, sizeof(sJob));
             SetupJob(sJob);
             sJob.pszTmpFilename =
-                CPLStrdup(CPLSPrintf("/vsimem/gtiff/%p", this));
+                CPLStrdup(VSIMemGenerateHiddenFilename("temp.tif"));
 
             ThreadCompressionFunc(&sJob);
 
@@ -1714,10 +1706,7 @@ static void DiscardLsb(GByte *pabyBuffer, GPtrDiff_t nBytes, int iBand,
     if (nBitsPerSample == 8 && nSampleFormat == SAMPLEFORMAT_UINT)
     {
         uint8_t nNoDataValue = 0;
-        if (bHasNoData &&
-            dfNoDataValue >= std::numeric_limits<uint8_t>::min() &&
-            dfNoDataValue <= std::numeric_limits<uint8_t>::max() &&
-            dfNoDataValue == static_cast<uint8_t>(dfNoDataValue))
+        if (bHasNoData && GDALIsValueExactAs<uint8_t>(dfNoDataValue))
         {
             nNoDataValue = static_cast<uint8_t>(dfNoDataValue);
         }
@@ -1799,9 +1788,7 @@ static void DiscardLsb(GByte *pabyBuffer, GPtrDiff_t nBytes, int iBand,
     else if (nBitsPerSample == 8 && nSampleFormat == SAMPLEFORMAT_INT)
     {
         int8_t nNoDataValue = 0;
-        if (bHasNoData && dfNoDataValue >= std::numeric_limits<int8_t>::min() &&
-            dfNoDataValue <= std::numeric_limits<int8_t>::max() &&
-            dfNoDataValue == static_cast<int8_t>(dfNoDataValue))
+        if (bHasNoData && GDALIsValueExactAs<int8_t>(dfNoDataValue))
         {
             nNoDataValue = static_cast<int8_t>(dfNoDataValue);
         }
@@ -1816,10 +1803,7 @@ static void DiscardLsb(GByte *pabyBuffer, GPtrDiff_t nBytes, int iBand,
     else if (nBitsPerSample == 16 && nSampleFormat == SAMPLEFORMAT_INT)
     {
         int16_t nNoDataValue = 0;
-        if (bHasNoData &&
-            dfNoDataValue >= std::numeric_limits<int16_t>::min() &&
-            dfNoDataValue <= std::numeric_limits<int16_t>::max() &&
-            dfNoDataValue == static_cast<int16_t>(dfNoDataValue))
+        if (bHasNoData && GDALIsValueExactAs<int16_t>(dfNoDataValue))
         {
             nNoDataValue = static_cast<int16_t>(dfNoDataValue);
         }
@@ -1834,10 +1818,7 @@ static void DiscardLsb(GByte *pabyBuffer, GPtrDiff_t nBytes, int iBand,
     else if (nBitsPerSample == 16 && nSampleFormat == SAMPLEFORMAT_UINT)
     {
         uint16_t nNoDataValue = 0;
-        if (bHasNoData &&
-            dfNoDataValue >= std::numeric_limits<uint16_t>::min() &&
-            dfNoDataValue <= std::numeric_limits<uint16_t>::max() &&
-            dfNoDataValue == static_cast<uint16_t>(dfNoDataValue))
+        if (bHasNoData && GDALIsValueExactAs<uint16_t>(dfNoDataValue))
         {
             nNoDataValue = static_cast<uint16_t>(dfNoDataValue);
         }
@@ -1852,10 +1833,7 @@ static void DiscardLsb(GByte *pabyBuffer, GPtrDiff_t nBytes, int iBand,
     else if (nBitsPerSample == 32 && nSampleFormat == SAMPLEFORMAT_INT)
     {
         int32_t nNoDataValue = 0;
-        if (bHasNoData &&
-            dfNoDataValue >= std::numeric_limits<int32_t>::min() &&
-            dfNoDataValue <= std::numeric_limits<int32_t>::max() &&
-            dfNoDataValue == static_cast<int32_t>(dfNoDataValue))
+        if (bHasNoData && GDALIsValueExactAs<int32_t>(dfNoDataValue))
         {
             nNoDataValue = static_cast<int32_t>(dfNoDataValue);
         }
@@ -1870,10 +1848,7 @@ static void DiscardLsb(GByte *pabyBuffer, GPtrDiff_t nBytes, int iBand,
     else if (nBitsPerSample == 32 && nSampleFormat == SAMPLEFORMAT_UINT)
     {
         uint32_t nNoDataValue = 0;
-        if (bHasNoData &&
-            dfNoDataValue >= std::numeric_limits<uint32_t>::min() &&
-            dfNoDataValue <= std::numeric_limits<uint32_t>::max() &&
-            dfNoDataValue == static_cast<uint32_t>(dfNoDataValue))
+        if (bHasNoData && GDALIsValueExactAs<uint32_t>(dfNoDataValue))
         {
             nNoDataValue = static_cast<uint32_t>(dfNoDataValue);
         }
@@ -1890,13 +1865,7 @@ static void DiscardLsb(GByte *pabyBuffer, GPtrDiff_t nBytes, int iBand,
         // FIXME: we should not rely on dfNoDataValue when we support native
         // data type for nodata
         int64_t nNoDataValue = 0;
-        if (bHasNoData &&
-            dfNoDataValue >=
-                static_cast<double>(std::numeric_limits<int64_t>::min()) &&
-            dfNoDataValue <=
-                static_cast<double>(std::numeric_limits<int64_t>::max()) &&
-            dfNoDataValue ==
-                static_cast<double>(static_cast<int64_t>(dfNoDataValue)))
+        if (bHasNoData && GDALIsValueExactAs<int64_t>(dfNoDataValue))
         {
             nNoDataValue = static_cast<int64_t>(dfNoDataValue);
         }
@@ -1913,13 +1882,7 @@ static void DiscardLsb(GByte *pabyBuffer, GPtrDiff_t nBytes, int iBand,
         // FIXME: we should not rely on dfNoDataValue when we support native
         // data type for nodata
         uint64_t nNoDataValue = 0;
-        if (bHasNoData &&
-            dfNoDataValue >=
-                static_cast<double>(std::numeric_limits<uint64_t>::min()) &&
-            dfNoDataValue <=
-                static_cast<double>(std::numeric_limits<uint64_t>::max()) &&
-            dfNoDataValue ==
-                static_cast<double>(static_cast<uint64_t>(dfNoDataValue)))
+        if (bHasNoData && GDALIsValueExactAs<uint64_t>(dfNoDataValue))
         {
             nNoDataValue = static_cast<uint64_t>(dfNoDataValue);
         }
@@ -2139,8 +2102,11 @@ void GTiffDataset::Crystalize()
     }
     else
     {
-        TIFFSetDirectory(
-            m_hTIFF, static_cast<tdir_t>(TIFFNumberOfDirectories(m_hTIFF) - 1));
+        const tdir_t nNumberOfDirs = TIFFNumberOfDirectories(m_hTIFF);
+        if (nNumberOfDirs > 0)
+        {
+            TIFFSetDirectory(m_hTIFF, static_cast<tdir_t>(nNumberOfDirs - 1));
+        }
     }
 
     RestoreVolatileParameters(m_hTIFF);
@@ -2601,13 +2567,11 @@ CPLErr GTiffDataset::RegisterNewOverviewDataset(toff_t nOverviewOffset,
 /*                     CreateTIFFColorTable()                           */
 /************************************************************************/
 
-static void CreateTIFFColorTable(GDALColorTable *poColorTable, int nBits,
-                                 std::vector<unsigned short> &anTRed,
-                                 std::vector<unsigned short> &anTGreen,
-                                 std::vector<unsigned short> &anTBlue,
-                                 unsigned short *&panRed,
-                                 unsigned short *&panGreen,
-                                 unsigned short *&panBlue)
+static void CreateTIFFColorTable(
+    GDALColorTable *poColorTable, int nBits, int nColorTableMultiplier,
+    std::vector<unsigned short> &anTRed, std::vector<unsigned short> &anTGreen,
+    std::vector<unsigned short> &anTBlue, unsigned short *&panRed,
+    unsigned short *&panGreen, unsigned short *&panBlue)
 {
     int nColors;
 
@@ -2630,9 +2594,12 @@ static void CreateTIFFColorTable(GDALColorTable *poColorTable, int nBits,
 
             poColorTable->GetColorEntryAsRGB(iColor, &sRGB);
 
-            anTRed[iColor] = static_cast<unsigned short>(257 * sRGB.c1);
-            anTGreen[iColor] = static_cast<unsigned short>(257 * sRGB.c2);
-            anTBlue[iColor] = static_cast<unsigned short>(257 * sRGB.c3);
+            anTRed[iColor] = GTiffDataset::ClampCTEntry(iColor, 1, sRGB.c1,
+                                                        nColorTableMultiplier);
+            anTGreen[iColor] = GTiffDataset::ClampCTEntry(
+                iColor, 2, sRGB.c2, nColorTableMultiplier);
+            anTBlue[iColor] = GTiffDataset::ClampCTEntry(iColor, 3, sRGB.c3,
+                                                         nColorTableMultiplier);
         }
         else
         {
@@ -2821,7 +2788,7 @@ CPLErr GTiffDataset::CreateOverviewsFromSrcOverviews(GDALDataset *poSrcDS,
     /* -------------------------------------------------------------------- */
     CPLString osMetadata;
 
-    GTIFFBuildOverviewMetadata("NONE", this, osMetadata);
+    GTIFFBuildOverviewMetadata("NONE", this, false, osMetadata);
 
     int nCompression;
     uint16_t nPlanarConfig;
@@ -2851,8 +2818,12 @@ CPLErr GTiffDataset::CreateOverviewsFromSrcOverviews(GDALDataset *poSrcDS,
 
     if (nPhotometric == PHOTOMETRIC_PALETTE && m_poColorTable != nullptr)
     {
-        CreateTIFFColorTable(m_poColorTable, nOvBitsPerSample, anTRed, anTGreen,
-                             anTBlue, panRed, panGreen, panBlue);
+        if (m_nColorTableMultiplier == 0)
+            m_nColorTableMultiplier = DEFAULT_COLOR_TABLE_MULTIPLIER_257;
+
+        CreateTIFFColorTable(m_poColorTable.get(), nOvBitsPerSample,
+                             m_nColorTableMultiplier, anTRed, anTGreen, anTBlue,
+                             panRed, panGreen, panBlue);
     }
 
     int nOvrBlockXSize = 0;
@@ -3108,7 +3079,8 @@ CPLErr GTiffDataset::IBuildOverviews(const char *pszResampling, int nOverviews,
     /* -------------------------------------------------------------------- */
     CPLString osMetadata;
 
-    GTIFFBuildOverviewMetadata(pszResampling, this, osMetadata);
+    const bool bIsForMaskBand = nBands == 1 && GetRasterBand(1)->IsMaskBand();
+    GTIFFBuildOverviewMetadata(pszResampling, this, bIsForMaskBand, osMetadata);
 
     int nCompression;
     uint16_t nPlanarConfig;
@@ -3138,8 +3110,12 @@ CPLErr GTiffDataset::IBuildOverviews(const char *pszResampling, int nOverviews,
 
     if (nPhotometric == PHOTOMETRIC_PALETTE && m_poColorTable != nullptr)
     {
-        CreateTIFFColorTable(m_poColorTable, nOvBitsPerSample, anTRed, anTGreen,
-                             anTBlue, panRed, panGreen, panBlue);
+        if (m_nColorTableMultiplier == 0)
+            m_nColorTableMultiplier = DEFAULT_COLOR_TABLE_MULTIPLIER_257;
+
+        CreateTIFFColorTable(m_poColorTable.get(), nOvBitsPerSample,
+                             m_nColorTableMultiplier, anTRed, anTGreen, anTBlue,
+                             panRed, panGreen, panBlue);
     }
 
     /* -------------------------------------------------------------------- */
@@ -3695,7 +3671,8 @@ void GTiffDataset::WriteGeoTIFFInfo()
         else if (CPLFetchBool(m_papszCreationOptions, "WORLDFILE", false))
             GDALWriteWorldFile(m_pszFilename, "wld", m_adfGeoTransform);
     }
-    else if (GetGCPCount() > 0)
+    else if (GetGCPCount() > 0 && GetGCPCount() <= knMAX_GCP_COUNT &&
+             m_eProfile != GTiffProfile::BASELINE)
     {
         m_bNeedsRewrite = true;
 
@@ -3719,9 +3696,8 @@ void GTiffDataset::WriteGeoTIFFInfo()
             }
         }
 
-        if (m_eProfile != GTiffProfile::BASELINE)
-            TIFFSetField(m_hTIFF, TIFFTAG_GEOTIEPOINTS, 6 * GetGCPCount(),
-                         padfTiePoints);
+        TIFFSetField(m_hTIFF, TIFFTAG_GEOTIEPOINTS, 6 * GetGCPCount(),
+                     padfTiePoints);
         CPLFree(padfTiePoints);
     }
 
@@ -3841,7 +3817,7 @@ static void WriteMDMetadata(GDALMultiDomainMetadata *poMDMD, TIFF *hTIFF,
     for (int iDomain = 0; papszDomainList && papszDomainList[iDomain];
          ++iDomain)
     {
-        char **papszMD = poMDMD->GetMetadata(papszDomainList[iDomain]);
+        CSLConstList papszMD = poMDMD->GetMetadata(papszDomainList[iDomain]);
         bool bIsXML = false;
 
         if (EQUAL(papszDomainList[iDomain], "IMAGE_STRUCTURE") ||
@@ -4073,6 +4049,11 @@ bool GTiffDataset::WriteMetadata(GDALDataset *poSrcDS, TIFF *l_hTIFF,
     CPLXMLNode *psRoot = nullptr;
     CPLXMLNode *psTail = nullptr;
 
+    const char *pszCopySrcMDD =
+        CSLFetchNameValueDef(papszCreationOptions, "COPY_SRC_MDD", "AUTO");
+    char **papszSrcMDD =
+        CSLFetchNameValueMultiple(papszCreationOptions, "SRC_MDD");
+
     if (bSrcIsGeoTIFF)
     {
         GTiffDataset *poSrcDSGTiff = cpl::down_cast<GTiffDataset *>(poSrcDS);
@@ -4082,15 +4063,11 @@ bool GTiffDataset::WriteMetadata(GDALDataset *poSrcDS, TIFF *l_hTIFF,
     }
     else
     {
-        const char *pszCopySrcMDD =
-            CSLFetchNameValueDef(papszCreationOptions, "COPY_SRC_MDD", "AUTO");
-        char **papszSrcMDD =
-            CSLFetchNameValueMultiple(papszCreationOptions, "SRC_MDD");
         if (EQUAL(pszCopySrcMDD, "AUTO") || CPLTestBool(pszCopySrcMDD) ||
             papszSrcMDD)
         {
             GDALMultiDomainMetadata l_oMDMD;
-            char **papszMD = poSrcDS->GetMetadata();
+            CSLConstList papszMD = poSrcDS->GetMetadata();
             if (CSLCount(papszMD) > 0 &&
                 (!papszSrcMDD || CSLFindString(papszSrcMDD, "") >= 0 ||
                  CSLFindString(papszSrcMDD, "_DEFAULT_") >= 0))
@@ -4102,7 +4079,7 @@ bool GTiffDataset::WriteMetadata(GDALDataset *poSrcDS, TIFF *l_hTIFF,
                 papszSrcMDD)
             {
                 char **papszDomainList = poSrcDS->GetMetadataDomainList();
-                for (char **papszIter = papszDomainList;
+                for (CSLConstList papszIter = papszDomainList;
                      papszIter && *papszIter; ++papszIter)
                 {
                     const char *pszDomain = *papszIter;
@@ -4119,7 +4096,6 @@ bool GTiffDataset::WriteMetadata(GDALDataset *poSrcDS, TIFF *l_hTIFF,
 
             WriteMDMetadata(&l_oMDMD, l_hTIFF, &psRoot, &psTail, 0, eProfile);
         }
-        CSLDestroy(papszSrcMDD);
     }
 
     if (!bExcludeRPBandIMGFileWriting)
@@ -4164,13 +4140,44 @@ bool GTiffDataset::WriteMetadata(GDALDataset *poSrcDS, TIFF *l_hTIFF,
         }
         else
         {
-            char **papszMD = poBand->GetMetadata();
+            GDALMultiDomainMetadata l_oMDMD;
+            bool bOMDMDSet = false;
 
-            if (CSLCount(papszMD) > 0)
+            if (EQUAL(pszCopySrcMDD, "AUTO") && !papszSrcMDD)
             {
-                GDALMultiDomainMetadata l_oMDMD;
-                l_oMDMD.SetMetadata(papszMD);
+                for (const char *pszDomain : {"", "IMAGERY"})
+                {
+                    if (CSLConstList papszMD = poBand->GetMetadata(pszDomain))
+                    {
+                        if (papszMD[0])
+                        {
+                            bOMDMDSet = true;
+                            l_oMDMD.SetMetadata(papszMD, pszDomain);
+                        }
+                    }
+                }
+            }
+            else if (CPLTestBool(pszCopySrcMDD) || papszSrcMDD)
+            {
+                char **papszDomainList = poBand->GetMetadataDomainList();
+                for (const char *pszDomain :
+                     cpl::Iterate(CSLConstList(papszDomainList)))
+                {
+                    if (pszDomain[0] != 0 &&
+                        !EQUAL(pszDomain, "IMAGE_STRUCTURE") &&
+                        (!papszSrcMDD ||
+                         CSLFindString(papszSrcMDD, pszDomain) >= 0))
+                    {
+                        bOMDMDSet = true;
+                        l_oMDMD.SetMetadata(poBand->GetMetadata(pszDomain),
+                                            pszDomain);
+                    }
+                }
+                CSLDestroy(papszDomainList);
+            }
 
+            if (bOMDMDSet)
+            {
                 WriteMDMetadata(&l_oMDMD, l_hTIFF, &psRoot, &psTail, nBand,
                                 eProfile);
             }
@@ -4194,10 +4201,10 @@ bool GTiffDataset::WriteMetadata(GDALDataset *poSrcDS, TIFF *l_hTIFF,
         {
             char szValue[128] = {};
 
-            CPLsnprintf(szValue, sizeof(szValue), "%.18g", dfOffset);
+            CPLsnprintf(szValue, sizeof(szValue), "%.17g", dfOffset);
             AppendMetadataItem(&psRoot, &psTail, "OFFSET", szValue, nBand,
                                "offset", "");
-            CPLsnprintf(szValue, sizeof(szValue), "%.18g", dfScale);
+            CPLsnprintf(szValue, sizeof(szValue), "%.17g", dfScale);
             AppendMetadataItem(&psRoot, &psTail, "SCALE", szValue, nBand,
                                "scale", "");
         }
@@ -4242,6 +4249,8 @@ bool GTiffDataset::WriteMetadata(GDALDataset *poSrcDS, TIFF *l_hTIFF,
         }
     }
 
+    CSLDestroy(papszSrcMDD);
+
     const char *pszTilingSchemeName =
         CSLFetchNameValue(papszCreationOptions, "@TILING_SCHEME_NAME");
     if (pszTilingSchemeName)
@@ -5024,8 +5033,8 @@ static GTiffProfile GetProfile(const char *pszProfile)
 TIFF *GTiffDataset::CreateLL(const char *pszFilename, int nXSize, int nYSize,
                              int l_nBands, GDALDataType eType,
                              double dfExtraSpaceForOverviews,
-                             char **papszParamList, VSILFILE **pfpL,
-                             CPLString &l_osTmpFilename)
+                             int nColorTableMultiplier, char **papszParamList,
+                             VSILFILE **pfpL, CPLString &l_osTmpFilename)
 
 {
     GTiffOneTimeInit();
@@ -5130,6 +5139,55 @@ TIFF *GTiffDataset::CreateLL(const char *pszFilename, int nXSize, int nYSize,
             return nullptr;
     }
 
+    constexpr int JPEG_MAX_DIMENSION = 65500;  // Defined in jpeglib.h
+    constexpr int WEBP_MAX_DIMENSION = 16383;
+
+    const struct
+    {
+        int nCodecID;
+        const char *pszCodecName;
+        int nMaxDim;
+    } asLimitations[] = {
+        {COMPRESSION_JPEG, "JPEG", JPEG_MAX_DIMENSION},
+        {COMPRESSION_WEBP, "WEBP", WEBP_MAX_DIMENSION},
+    };
+
+    for (const auto &sLimitation : asLimitations)
+    {
+        if (l_nCompression == sLimitation.nCodecID && !bTiled &&
+            nXSize > sLimitation.nMaxDim)
+        {
+            ReportError(
+                pszFilename, CE_Failure, CPLE_IllegalArg,
+                "COMPRESS=%s is only compatible of un-tiled images whose "
+                "width is lesser or equal to %d pixels. "
+                "To overcome this limitation, set the TILED=YES creation "
+                "option.",
+                sLimitation.pszCodecName, sLimitation.nMaxDim);
+            return nullptr;
+        }
+        else if (l_nCompression == sLimitation.nCodecID && bTiled &&
+                 l_nBlockXSize > sLimitation.nMaxDim)
+        {
+            ReportError(pszFilename, CE_Failure, CPLE_IllegalArg,
+                        "COMPRESS=%s is only compatible of tiled images whose "
+                        "BLOCKXSIZE is lesser or equal to %d pixels.",
+                        sLimitation.pszCodecName, sLimitation.nMaxDim);
+            return nullptr;
+        }
+        else if (l_nCompression == sLimitation.nCodecID &&
+                 l_nBlockYSize > sLimitation.nMaxDim)
+        {
+            ReportError(pszFilename, CE_Failure, CPLE_IllegalArg,
+                        "COMPRESS=%s is only compatible of images whose "
+                        "BLOCKYSIZE is lesser or equal to %d pixels. "
+                        "To overcome this limitation, set the TILED=YES "
+                        "creation option",
+                        sLimitation.pszCodecName, sLimitation.nMaxDim);
+            return nullptr;
+        }
+    }
+
     /* -------------------------------------------------------------------- */
     /*      How many bits per sample?  We have a special case if NBITS      */
     /*      specified for GDT_Byte, GDT_UInt16, GDT_UInt32.                 */
@@ -5352,8 +5410,7 @@ TIFF *GTiffDataset::CreateLL(const char *pszFilename, int nXSize, int nYSize,
     }
     if (bStreaming)
     {
-        static int nCounter = 0;
-        l_osTmpFilename = CPLSPrintf("/vsimem/vsistdout_%d.tif", ++nCounter);
+        l_osTmpFilename = VSIMemGenerateHiddenFilename("vsistdout.tif");
         pszFilename = l_osTmpFilename.c_str();
     }
 
@@ -5855,9 +5912,12 @@ TIFF *GTiffDataset::CreateLL(const char *pszFilename, int nXSize, int nYSize,
         {
             if (eType == GDT_Byte)
             {
-                panTRed[iColor] = static_cast<unsigned short>(257 * iColor);
-                panTGreen[iColor] = static_cast<unsigned short>(257 * iColor);
-                panTBlue[iColor] = static_cast<unsigned short>(257 * iColor);
+                panTRed[iColor] = GTiffDataset::ClampCTEntry(
+                    iColor, 1, iColor, nColorTableMultiplier);
+                panTGreen[iColor] = GTiffDataset::ClampCTEntry(
+                    iColor, 2, iColor, nColorTableMultiplier);
+                panTBlue[iColor] = GTiffDataset::ClampCTEntry(
+                    iColor, 3, iColor, nColorTableMultiplier);
             }
             else
             {
@@ -5880,7 +5940,6 @@ TIFF *GTiffDataset::CreateLL(const char *pszFilename, int nXSize, int nYSize,
     // strip/tile writing, which is too late, since we have already crystalized
     // the directory. This way we avoid a directory rewriting.
     if (l_nCompression == COMPRESSION_JPEG &&
-        !STARTS_WITH(pszFilename, szJPEGGTiffDatasetTmpPrefix) &&
         CPLTestBool(
             CSLFetchNameValueDef(papszParamList, "WRITE_JPEGTABLE_TAG", "YES")))
     {
@@ -6073,9 +6132,8 @@ int GTiffDataset::GuessJPEGQuality(bool &bOutHasQuantizationTable,
         papszLocalParameters =
             CSLSetNameValue(papszLocalParameters, "NBITS", "12");
 
-    CPLString osTmpFilenameIn;
-    osTmpFilenameIn.Printf("/vsimem/gtiffdataset_guess_jpeg_quality_tmp_%p",
-                           this);
+    const CPLString osTmpFilenameIn(
+        VSIMemGenerateHiddenFilename("gtiffdataset_guess_jpeg_quality_tmp"));
 
     int nRet = -1;
     for (int nQuality = 0; nQuality <= 100 && nRet < 0; ++nQuality)
@@ -6093,7 +6151,7 @@ int GTiffDataset::GuessJPEGQuality(bool &bOutHasQuantizationTable,
         CPLString osTmp;
         TIFF *hTIFFTmp =
             CreateLL(osTmpFilenameIn, 16, 16, (nBands <= 4) ? nBands : 1,
-                     GetRasterBand(1)->GetRasterDataType(), 0.0,
+                     GetRasterBand(1)->GetRasterDataType(), 0.0, 0,
                      papszLocalParameters, &fpTmp, osTmp);
         CPLPopErrorHandler();
         if (!hTIFFTmp)
@@ -6243,11 +6301,19 @@ GDALDataset *GTiffDataset::Create(const char *pszFilename, int nXSize,
     VSILFILE *l_fpL = nullptr;
     CPLString l_osTmpFilename;
 
+    const int nColorTableMultiplier = std::max(
+        1,
+        std::min(257,
+                 atoi(CSLFetchNameValueDef(
+                     papszParamList, "COLOR_TABLE_MULTIPLIER",
+                     CPLSPrintf("%d", DEFAULT_COLOR_TABLE_MULTIPLIER_257)))));
+
     /* -------------------------------------------------------------------- */
     /*      Create the underlying TIFF file.                                */
     /* -------------------------------------------------------------------- */
     TIFF *l_hTIFF = CreateLL(pszFilename, nXSize, nYSize, l_nBands, eType, 0,
-                             papszParamList, &l_fpL, l_osTmpFilename);
+                             nColorTableMultiplier, papszParamList, &l_fpL,
+                             l_osTmpFilename);
     const bool bStreaming = !l_osTmpFilename.empty();
 
     if (l_hTIFF == nullptr)
@@ -6274,6 +6340,9 @@ GDALDataset *GTiffDataset::Create(const char *pszFilename, int nXSize,
     poDS->nRasterXSize = nXSize;
     poDS->nRasterYSize = nYSize;
     poDS->eAccess = GA_Update;
+
+    poDS->m_nColorTableMultiplier = nColorTableMultiplier;
+
     poDS->m_bCrystalized = false;
     poDS->m_nSamplesPerPixel = static_cast<uint16_t>(l_nBands);
     poDS->m_pszFilename = CPLStrdup(pszFilename);
@@ -6360,17 +6429,16 @@ GDALDataset *GTiffDataset::Create(const char *pszFilename, int nXSize,
         TIFFGetField(l_hTIFF, TIFFTAG_COLORMAP, &panRed, &panGreen, &panBlue))
     {
 
-        poDS->m_poColorTable = new GDALColorTable();
+        poDS->m_poColorTable = std::make_unique<GDALColorTable>();
 
         const int nColorCount = 1 << poDS->m_nBitsPerSample;
 
         for (int iColor = nColorCount - 1; iColor >= 0; iColor--)
         {
-            const unsigned short divisor = 257;
             const GDALColorEntry oEntry = {
-                static_cast<short>(panRed[iColor] / divisor),
-                static_cast<short>(panGreen[iColor] / divisor),
-                static_cast<short>(panBlue[iColor] / divisor),
+                static_cast<short>(panRed[iColor] / nColorTableMultiplier),
+                static_cast<short>(panGreen[iColor] / nColorTableMultiplier),
+                static_cast<short>(panBlue[iColor] / nColorTableMultiplier),
                 static_cast<short>(255)};
 
             poDS->m_poColorTable->SetColorEntry(iColor, &oEntry);
@@ -6941,9 +7009,17 @@ GDALDataset *GTiffDataset::CreateCopy(const char *pszFilename,
 
     const int nXSize = poSrcDS->GetRasterXSize();
     const int nYSize = poSrcDS->GetRasterYSize();
+
+    const int nColorTableMultiplier = std::max(
+        1,
+        std::min(257,
+                 atoi(CSLFetchNameValueDef(
+                     papszOptions, "COLOR_TABLE_MULTIPLIER",
+                     CPLSPrintf("%d", DEFAULT_COLOR_TABLE_MULTIPLIER_257)))));
+
     TIFF *l_hTIFF = CreateLL(pszFilename, nXSize, nYSize, l_nBands, eType,
-                             dfExtraSpaceForOverviews, papszCreateOptions,
-                             &l_fpL, l_osTmpFilename);
+                             dfExtraSpaceForOverviews, nColorTableMultiplier,
+                             papszCreateOptions, &l_fpL, l_osTmpFilename);
     const bool bStreaming = !l_osTmpFilename.empty();
 
     CSLDestroy(papszCreateOptions);
@@ -7046,9 +7122,12 @@ GDALDataset *GTiffDataset::CreateCopy(const char *pszFilename,
 
                 poCT->GetColorEntryAsRGB(iColor, &sRGB);
 
-                anTRed[iColor] = static_cast<unsigned short>(257 * sRGB.c1);
-                anTGreen[iColor] = static_cast<unsigned short>(257 * sRGB.c2);
-                anTBlue[iColor] = static_cast<unsigned short>(257 * sRGB.c3);
+                anTRed[iColor] = GTiffDataset::ClampCTEntry(
+                    iColor, 1, sRGB.c1, nColorTableMultiplier);
+                anTGreen[iColor] = GTiffDataset::ClampCTEntry(
+                    iColor, 2, sRGB.c2, nColorTableMultiplier);
+                anTBlue[iColor] = GTiffDataset::ClampCTEntry(
+                    iColor, 3, sRGB.c3, nColorTableMultiplier);
             }
             else
             {
@@ -7083,9 +7162,12 @@ GDALDataset *GTiffDataset::CreateCopy(const char *pszFilename,
 
                 poCT->GetColorEntryAsRGB(iColor, &sRGB);
 
-                panTRed[iColor] = static_cast<unsigned short>(257 * sRGB.c1);
-                panTGreen[iColor] = static_cast<unsigned short>(257 * sRGB.c2);
-                panTBlue[iColor] = static_cast<unsigned short>(257 * sRGB.c3);
+                panTRed[iColor] = GTiffDataset::ClampCTEntry(
+                    iColor, 1, sRGB.c1, nColorTableMultiplier);
+                panTGreen[iColor] = GTiffDataset::ClampCTEntry(
+                    iColor, 2, sRGB.c2, nColorTableMultiplier);
+                panTBlue[iColor] = GTiffDataset::ClampCTEntry(
+                    iColor, 3, sRGB.c3, nColorTableMultiplier);
             }
             else
             {
@@ -7507,6 +7589,7 @@ GDALDataset *GTiffDataset::CreateCopy(const char *pszFilename,
     poDS->m_pszFilename = CPLStrdup(pszFilename);
     poDS->m_fpL = l_fpL;
     poDS->m_bIMDRPCMetadataLoaded = true;
+    poDS->m_nColorTableMultiplier = nColorTableMultiplier;
 
     const bool bAppend = CPLFetchBool(papszOptions, "APPEND_SUBDATASET", false);
     if (poDS->OpenOffset(l_hTIFF,
@@ -8468,7 +8551,6 @@ CPLErr GTiffDataset::SetGCPs(int nGCPCountIn, const GDAL_GCP *pasGCPListIn,
             m_bGeoTransformValid = false;
             m_bForceUnsetGTOrGCPs = true;
         }
-
         if ((m_eProfile == GTiffProfile::BASELINE) &&
             (GetPamFlags() & GPF_DISABLED) == 0)
         {
@@ -8476,7 +8558,21 @@ CPLErr GTiffDataset::SetGCPs(int nGCPCountIn, const GDAL_GCP *pasGCPListIn,
         }
         else
         {
-            if (GDALPamDataset::GetGCPCount() > 0)
+            if (nGCPCountIn > knMAX_GCP_COUNT)
+            {
+                if (GDALPamDataset::GetGCPCount() == 0 && !m_aoGCPs.empty())
+                {
+                    m_bForceUnsetGTOrGCPs = true;
+                }
+                ReportError(CE_Warning, CPLE_AppDefined,
+                            "Trying to write %d GCPs, whereas the maximum "
+                            "supported in GeoTIFF tag is %d. "
+                            "Falling back to writing them to PAM",
+                            nGCPCountIn, knMAX_GCP_COUNT);
+                eErr = GDALPamDataset::SetGCPs(nGCPCountIn, pasGCPListIn,
+                                               poGCPSRS);
+            }
+            else if (GDALPamDataset::GetGCPCount() > 0)
             {
                 // Cancel any existing GCPs from PAM file.
                 GDALPamDataset::SetGCPs(
@@ -8794,3 +8890,29 @@ CPLErr GTiffRasterBand::CreateMaskBand(int nFlagsIn)
 
     return GDALPamRasterBand::CreateMaskBand(nFlagsIn);
 }
+
+/************************************************************************/
+/*                          ClampCTEntry()                              */
+/************************************************************************/
+
+/* static */ unsigned short GTiffDataset::ClampCTEntry(int iColor, int iComp,
+                                                       int nCTEntryVal,
+                                                       int nMultFactor)
+{
+    const int nVal = nCTEntryVal * nMultFactor;
+    if (nVal < 0)
+    {
+        CPLError(CE_Warning, CPLE_AppDefined,
+                 "Color table entry [%d][%d] = %d, clamped to 0", iColor, iComp,
+                 nCTEntryVal);
+        return 0;
+    }
+    if (nVal > 65535)
+    {
+        CPLError(CE_Warning, CPLE_AppDefined,
+                 "Color table entry [%d][%d] = %d, clamped to 65535", iColor,
+                 iComp, nCTEntryVal);
+        return 65535;
+    }
+    return static_cast<unsigned short>(nVal);
+}
diff --git a/frmts/gtiff/gtiffjpegoverviewds.cpp b/frmts/gtiff/gtiffjpegoverviewds.cpp
index cc3ca61e3db6..4b6660e2e0ec 100644
--- a/frmts/gtiff/gtiffjpegoverviewds.cpp
+++ b/frmts/gtiff/gtiffjpegoverviewds.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gtiffjpegoverviewds.h"
@@ -71,7 +55,7 @@ GTiffJPEGOverviewDS::GTiffJPEGOverviewDS(GTiffDataset *poParentDSIn,
 {
     ShareLockWithParentDataset(poParentDSIn);
 
-    m_osTmpFilenameJPEGTable.Printf("/vsimem/jpegtable_%p", this);
+    m_osTmpFilenameJPEGTable = VSIMemGenerateHiddenFilename("jpegtable");
 
     const GByte abyAdobeAPP14RGB[] = {0xFF, 0xEE, 0x00, 0x0E, 0x41, 0x64,
                                       0x6F, 0x62, 0x65, 0x00, 0x64, 0x00,
@@ -221,7 +205,7 @@ CPLErr GTiffJPEGOverviewBand::IReadBlock(int nBlockXOff, int nBlockYOff,
         nByteCount -= 2;
 
         CPLString osFileToOpen;
-        m_poGDS->m_osTmpFilename.Printf("/vsimem/sparse_%p", m_poGDS);
+        m_poGDS->m_osTmpFilename = VSIMemGenerateHiddenFilename("sparse");
         VSILFILE *fp = VSIFOpenL(m_poGDS->m_osTmpFilename, "wb+");
 
         // If the size of the JPEG strip/tile is small enough, we will
diff --git a/frmts/gtiff/gtiffjpegoverviewds.h b/frmts/gtiff/gtiffjpegoverviewds.h
index 7f2f55004671..60333b853140 100644
--- a/frmts/gtiff/gtiffjpegoverviewds.h
+++ b/frmts/gtiff/gtiffjpegoverviewds.h
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GTIFFJPEGOVERVIEWDS_H_INCLUDED
diff --git a/frmts/gtiff/gtiffoddbitsband.cpp b/frmts/gtiff/gtiffoddbitsband.cpp
index 933fd8435a57..dc69116704d3 100644
--- a/frmts/gtiff/gtiffoddbitsband.cpp
+++ b/frmts/gtiff/gtiffoddbitsband.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gtiffoddbitsband.h"
diff --git a/frmts/gtiff/gtiffoddbitsband.h b/frmts/gtiff/gtiffoddbitsband.h
index 3f057ed0f1ae..71194d73a6ac 100644
--- a/frmts/gtiff/gtiffoddbitsband.h
+++ b/frmts/gtiff/gtiffoddbitsband.h
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GTIFFODDBITSBAND_H_INCLUDED
diff --git a/frmts/gtiff/gtiffrasterband.cpp b/frmts/gtiff/gtiffrasterband.cpp
index 45eda68e84cb..cee100297af9 100644
--- a/frmts/gtiff/gtiffrasterband.cpp
+++ b/frmts/gtiff/gtiffrasterband.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gtiffrasterband.h"
diff --git a/frmts/gtiff/gtiffrasterband.h b/frmts/gtiff/gtiffrasterband.h
index a172af2e2e21..4543b651ecb0 100644
--- a/frmts/gtiff/gtiffrasterband.h
+++ b/frmts/gtiff/gtiffrasterband.h
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GTIFFRASTERBAND_H_INCLUDED
diff --git a/frmts/gtiff/gtiffrasterband_read.cpp b/frmts/gtiff/gtiffrasterband_read.cpp
index b16d57b4436a..b888dace5a2c 100644
--- a/frmts/gtiff/gtiffrasterband_read.cpp
+++ b/frmts/gtiff/gtiffrasterband_read.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gtiffrasterband.h"
@@ -32,6 +16,7 @@
 #include "gtiffjpegoverviewds.h"
 
 #include <algorithm>
+#include <cassert>
 #include <limits>
 #include <map>
 #include <set>
@@ -509,6 +494,9 @@ CPLVirtualMem *GTiffRasterBand::GetVirtualMemAutoInternal(GDALRWFlag eRWFlag,
             CPLAssert(panByteCounts[0] == static_cast<toff_t>(nBlockSize));
 
             // Now simulate the writing of other blocks.
+            assert(nBlocks > 0);
+            assert(static_cast<vsi_l_offset>(nBlockSize) <
+                   std::numeric_limits<vsi_l_offset>::max() / nBlocks);
             const vsi_l_offset nDataSize =
                 static_cast<vsi_l_offset>(nBlockSize) * nBlocks;
             if (VSIFTruncateL(fp, nBaseOffset + nDataSize) != 0)
@@ -1633,7 +1621,7 @@ GDALColorTable *GTiffRasterBand::GetColorTable()
     m_poGDS->LoadGeoreferencingAndPamIfNeeded();
 
     if (nBand == 1)
-        return m_poGDS->m_poColorTable;
+        return m_poGDS->m_poColorTable.get();
 
     return nullptr;
 }
diff --git a/frmts/gtiff/gtiffrasterband_write.cpp b/frmts/gtiff/gtiffrasterband_write.cpp
index de8d09e6934e..3d616c35a631 100644
--- a/frmts/gtiff/gtiffrasterband_write.cpp
+++ b/frmts/gtiff/gtiffrasterband_write.cpp
@@ -8,32 +8,18 @@
  * Copyright (c) 1998, 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gtiffrasterband.h"
 #include "gtiffdataset.h"
 
 #include <algorithm>
+#include <cmath>
 #include <limits>
 
 #include "cpl_vsi_virtual.h"
+#include "gdal_priv_templates.hpp"
 #include "gtiff.h"
 #include "tifvsi.h"
 
@@ -624,11 +610,7 @@ CPLErr GTiffRasterBand::SetColorTable(GDALColorTable *poCT)
             TIFFUnsetField(m_poGDS->m_hTIFF, TIFFTAG_COLORMAP);
         }
 
-        if (m_poGDS->m_poColorTable)
-        {
-            delete m_poGDS->m_poColorTable;
-            m_poGDS->m_poColorTable = nullptr;
-        }
+        m_poGDS->m_poColorTable.reset();
 
         return CE_None;
     }
@@ -651,6 +633,10 @@ CPLErr GTiffRasterBand::SetColorTable(GDALColorTable *poCT)
         unsigned short *panTBlue = static_cast<unsigned short *>(
             CPLMalloc(sizeof(unsigned short) * nColors));
 
+        if (m_poGDS->m_nColorTableMultiplier == 0)
+            m_poGDS->m_nColorTableMultiplier =
+                GTiffDataset::DEFAULT_COLOR_TABLE_MULTIPLIER_257;
+
         for (int iColor = 0; iColor < nColors; ++iColor)
         {
             if (iColor < poCT->GetColorEntryCount())
@@ -658,9 +644,12 @@ CPLErr GTiffRasterBand::SetColorTable(GDALColorTable *poCT)
                 GDALColorEntry sRGB;
                 poCT->GetColorEntryAsRGB(iColor, &sRGB);
 
-                panTRed[iColor] = static_cast<unsigned short>(257 * sRGB.c1);
-                panTGreen[iColor] = static_cast<unsigned short>(257 * sRGB.c2);
-                panTBlue[iColor] = static_cast<unsigned short>(257 * sRGB.c3);
+                panTRed[iColor] = GTiffDataset::ClampCTEntry(
+                    iColor, 1, sRGB.c1, m_poGDS->m_nColorTableMultiplier);
+                panTGreen[iColor] = GTiffDataset::ClampCTEntry(
+                    iColor, 2, sRGB.c2, m_poGDS->m_nColorTableMultiplier);
+                panTBlue[iColor] = GTiffDataset::ClampCTEntry(
+                    iColor, 3, sRGB.c3, m_poGDS->m_nColorTableMultiplier);
             }
             else
             {
@@ -689,10 +678,7 @@ CPLErr GTiffRasterBand::SetColorTable(GDALColorTable *poCT)
         eErr = GDALPamRasterBand::SetColorTable(poCT);
     }
 
-    if (m_poGDS->m_poColorTable)
-        delete m_poGDS->m_poColorTable;
-
-    m_poGDS->m_poColorTable = poCT->Clone();
+    m_poGDS->m_poColorTable.reset(poCT->Clone());
     m_eBandInterp = GCI_PaletteIndex;
 
     return eErr;
@@ -705,6 +691,33 @@ CPLErr GTiffRasterBand::SetColorTable(GDALColorTable *poCT)
 CPLErr GTiffRasterBand::SetNoDataValue(double dfNoData)
 
 {
+    const auto SetNoDataMembers = [this, dfNoData]()
+    {
+        m_bNoDataSet = true;
+        m_dfNoDataValue = dfNoData;
+
+        m_poGDS->m_bNoDataSet = true;
+        m_poGDS->m_dfNoDataValue = dfNoData;
+
+        if (eDataType == GDT_Int64 && GDALIsValueExactAs<int64_t>(dfNoData))
+        {
+            m_bNoDataSetAsInt64 = true;
+            m_nNoDataValueInt64 = static_cast<int64_t>(dfNoData);
+
+            m_poGDS->m_bNoDataSetAsInt64 = true;
+            m_poGDS->m_nNoDataValueInt64 = static_cast<int64_t>(dfNoData);
+        }
+        else if (eDataType == GDT_UInt64 &&
+                 GDALIsValueExactAs<uint64_t>(dfNoData))
+        {
+            m_bNoDataSetAsUInt64 = true;
+            m_nNoDataValueUInt64 = static_cast<uint64_t>(dfNoData);
+
+            m_poGDS->m_bNoDataSetAsUInt64 = true;
+            m_poGDS->m_nNoDataValueUInt64 = static_cast<uint64_t>(dfNoData);
+        }
+    };
+
     m_poGDS->LoadGeoreferencingAndPamIfNeeded();
 
     if (m_poGDS->m_bNoDataSet &&
@@ -713,8 +726,7 @@ CPLErr GTiffRasterBand::SetNoDataValue(double dfNoData)
     {
         ResetNoDataValues(false);
 
-        m_bNoDataSet = true;
-        m_dfNoDataValue = dfNoData;
+        SetNoDataMembers();
 
         return CE_None;
     }
@@ -729,9 +741,9 @@ CPLErr GTiffRasterBand::SetNoDataValue(double dfNoData)
         {
             ReportError(
                 CE_Warning, CPLE_AppDefined,
-                "Setting nodata to %.18g on band %d, but band %d has nodata "
-                "at %.18g. The TIFFTAG_GDAL_NODATA only support one value "
-                "per dataset. This value of %.18g will be used for all bands "
+                "Setting nodata to %.17g on band %d, but band %d has nodata "
+                "at %.17g. The TIFFTAG_GDAL_NODATA only support one value "
+                "per dataset. This value of %.17g will be used for all bands "
                 "on re-opening",
                 dfNoData, nBand, nOtherBand, dfOtherNoData, dfNoData);
         }
@@ -767,11 +779,7 @@ CPLErr GTiffRasterBand::SetNoDataValue(double dfNoData)
     {
         ResetNoDataValues(true);
 
-        m_poGDS->m_bNoDataSet = true;
-        m_poGDS->m_dfNoDataValue = dfNoData;
-
-        m_bNoDataSet = true;
-        m_dfNoDataValue = dfNoData;
+        SetNoDataMembers();
     }
 
     return eErr;
diff --git a/frmts/gtiff/gtiffrgbaband.cpp b/frmts/gtiff/gtiffrgbaband.cpp
index a6d6badb76b2..d527cfd50de6 100644
--- a/frmts/gtiff/gtiffrgbaband.cpp
+++ b/frmts/gtiff/gtiffrgbaband.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gtiffrgbaband.h"
diff --git a/frmts/gtiff/gtiffrgbaband.h b/frmts/gtiff/gtiffrgbaband.h
index 902862f8399f..bf822e9b360e 100644
--- a/frmts/gtiff/gtiffrgbaband.h
+++ b/frmts/gtiff/gtiffrgbaband.h
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GTIFFRGBABAND_H_INCLUDED
diff --git a/frmts/gtiff/gtiffsplitband.cpp b/frmts/gtiff/gtiffsplitband.cpp
index 5d65a3a33310..607016d3ae9d 100644
--- a/frmts/gtiff/gtiffsplitband.cpp
+++ b/frmts/gtiff/gtiffsplitband.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gtiffsplitband.h"
diff --git a/frmts/gtiff/gtiffsplitband.h b/frmts/gtiff/gtiffsplitband.h
index eec24ca1425a..0a18a724e1f5 100644
--- a/frmts/gtiff/gtiffsplitband.h
+++ b/frmts/gtiff/gtiffsplitband.h
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GTIFFSPLITBAND_H_INCLUDED
diff --git a/frmts/gtiff/gtiffsplitbitmapband.cpp b/frmts/gtiff/gtiffsplitbitmapband.cpp
index 21fecb38a4e8..0deafe5ebd48 100644
--- a/frmts/gtiff/gtiffsplitbitmapband.cpp
+++ b/frmts/gtiff/gtiffsplitbitmapband.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gtiffsplitbitmapband.h"
diff --git a/frmts/gtiff/gtiffsplitbitmapband.h b/frmts/gtiff/gtiffsplitbitmapband.h
index 0adaa045c719..a5654f6ceb01 100644
--- a/frmts/gtiff/gtiffsplitbitmapband.h
+++ b/frmts/gtiff/gtiffsplitbitmapband.h
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GTIFFSPLITBITMAPBAND_H_INCLUDED
diff --git a/frmts/gtiff/libgeotiff/cpl_serv.h b/frmts/gtiff/libgeotiff/cpl_serv.h
index 0eabd51cd77c..ef65437e576d 100644
--- a/frmts/gtiff/libgeotiff/cpl_serv.h
+++ b/frmts/gtiff/libgeotiff/cpl_serv.h
@@ -1,23 +1,7 @@
 /******************************************************************************
  * Copyright (c) 1998, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************
  *
  * cpl_serv.h
diff --git a/frmts/gtiff/libgeotiff/geo_extra.c b/frmts/gtiff/libgeotiff/geo_extra.c
index cf1345124f7e..924e4810de7c 100644
--- a/frmts/gtiff/libgeotiff/geo_extra.c
+++ b/frmts/gtiff/libgeotiff/geo_extra.c
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #include <stddef.h>
diff --git a/frmts/gtiff/libgeotiff/geo_normalize.c b/frmts/gtiff/libgeotiff/geo_normalize.c
index 11517462c761..8c2703ea11d0 100644
--- a/frmts/gtiff/libgeotiff/geo_normalize.c
+++ b/frmts/gtiff/libgeotiff/geo_normalize.c
@@ -9,23 +9,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2018, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #include <assert.h>
@@ -2241,15 +2225,16 @@ static void GTIFFetchProjParms( GTIF * psGTIF, GTIFDefn * psDefn )
         break;
     }
 
+    for( int iParam = 0; iParam < psDefn->nParms; iParam++ )
+    {
+        switch( psDefn->ProjParmId[iParam] )
+        {
+
 /* -------------------------------------------------------------------- */
 /*      Normalize any linear parameters into meters.  In GeoTIFF        */
 /*      the linear projection parameter tags are normally in the        */
 /*      units of the coordinate system described.                       */
 /* -------------------------------------------------------------------- */
-    for( int iParam = 0; iParam < psDefn->nParms; iParam++ )
-    {
-        switch( psDefn->ProjParmId[iParam] )
-        {
           case ProjFalseEastingGeoKey:
           case ProjFalseNorthingGeoKey:
           case ProjFalseOriginEastingGeoKey:
@@ -2263,6 +2248,30 @@ static void GTIFFetchProjParms( GTIF * psGTIF, GTIFDefn * psDefn )
             }
             break;
 
+/* -------------------------------------------------------------------- */
+/*      Normalize any angular parameters into degrees.  In GeoTIFF      */
+/*      the angular projection parameter tags are normally in the       */
+/*      units of GeogAngularUnit. Note: this conversion is only done    */
+/*      since libgeotiff 1.7.4                                          */
+/* -------------------------------------------------------------------- */
+
+          case ProjStdParallel1GeoKey:
+          case ProjStdParallel2GeoKey:
+          case ProjNatOriginLongGeoKey:
+          case ProjNatOriginLatGeoKey:
+          case ProjFalseOriginLongGeoKey:
+          case ProjFalseOriginLatGeoKey:
+          case ProjCenterLongGeoKey:
+          case ProjCenterLatGeoKey:
+          case ProjStraightVertPoleLongGeoKey:
+          case ProjRectifiedGridAngleGeoKey:
+            if( psDefn->UOMAngleInDegrees != 0
+                && psDefn->UOMAngleInDegrees != 1.0 )
+            {
+                psDefn->ProjParm[iParam] *= psDefn->UOMAngleInDegrees;
+            }
+            break;
+
           default:
             break;
         }
diff --git a/frmts/gtiff/libgeotiff/geo_normalize.h b/frmts/gtiff/libgeotiff/geo_normalize.h
index 87dd22c7e7df..da70c4e5dbf9 100644
--- a/frmts/gtiff/libgeotiff/geo_normalize.h
+++ b/frmts/gtiff/libgeotiff/geo_normalize.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef GEO_NORMALIZE_H_INCLUDED
@@ -121,9 +105,15 @@ typedef struct {
     int		nParms;
 
     /** Projection parameter value.  The identify of this parameter
-        is established from the corresponding entry in ProjParmId.  The
-        value will be measured in meters, or decimal degrees if it is a
-        linear or angular measure. */
+        is established from the corresponding entry in ProjParmId.
+        In GeoTIFF keys, the values of the projection parameters are expressed
+        in the units of ProjLinearUnitsGeoKey (for linear measures) or
+        GeogAngularUnitsGeoKey (for angular measures).
+        However, the value returned in ProjParam[] will be normalized to meters
+        or decimal degrees.
+        Note: until libgeotiff 1.7.3, the conversion to degrees for angular
+        measures was *not* done when ProjCoordTransGeoKey is present.
+     */
     double	ProjParm[MAX_GTIF_PROJPARMS];
 
     /** Projection parameter identifier.  For example ProjFalseEastingGeoKey.
diff --git a/frmts/gtiff/libgeotiff/geo_simpletags.c b/frmts/gtiff/libgeotiff/geo_simpletags.c
index 3250a7fcb410..68fc436626f2 100644
--- a/frmts/gtiff/libgeotiff/geo_simpletags.c
+++ b/frmts/gtiff/libgeotiff/geo_simpletags.c
@@ -1,23 +1,7 @@
 /******************************************************************************
  * Copyright (c) 2008, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************
  *
  *  geo_simpletags.c  TIFF Interface module that just keeps track of the
diff --git a/frmts/gtiff/libgeotiff/geo_simpletags.h b/frmts/gtiff/libgeotiff/geo_simpletags.h
index 21327fcca318..0aeef963cf1d 100644
--- a/frmts/gtiff/libgeotiff/geo_simpletags.h
+++ b/frmts/gtiff/libgeotiff/geo_simpletags.h
@@ -1,23 +1,7 @@
 /******************************************************************************
  * Copyright (c) 2008, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************
  *
  *  geo_simpletags.h
diff --git a/frmts/gtiff/libgeotiff/geo_trans.c b/frmts/gtiff/libgeotiff/geo_trans.c
index fa10e9d0b1b4..0e8208f3199c 100644
--- a/frmts/gtiff/libgeotiff/geo_trans.c
+++ b/frmts/gtiff/libgeotiff/geo_trans.c
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #include <math.h>
diff --git a/frmts/gtiff/libgeotiff/geotiff.h b/frmts/gtiff/libgeotiff/geotiff.h
index 29f22917f4c4..75de593c8a0e 100644
--- a/frmts/gtiff/libgeotiff/geotiff.h
+++ b/frmts/gtiff/libgeotiff/geotiff.h
@@ -47,7 +47,7 @@
 #define GEOTIFF_SPEC_1_1_MINOR_REVISION 1
 
 /* Library version */
-#define LIBGEOTIFF_VERSION 1710
+#define LIBGEOTIFF_VERSION 1740
 
 #include "geo_config.h"
 #include "geokeys.h"
diff --git a/frmts/gtiff/libgeotiff/geotiff_proj4.c b/frmts/gtiff/libgeotiff/geotiff_proj4.c
index 9d25a7c1a7fc..77041bcdaab7 100644
--- a/frmts/gtiff/libgeotiff/geotiff_proj4.c
+++ b/frmts/gtiff/libgeotiff/geotiff_proj4.c
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************
  */
 
diff --git a/frmts/gtiff/libtiff/tif_color.c b/frmts/gtiff/libtiff/tif_color.c
index 2d7dcac6fe68..a52fdacba59c 100644
--- a/frmts/gtiff/libtiff/tif_color.c
+++ b/frmts/gtiff/libtiff/tif_color.c
@@ -89,7 +89,7 @@ void TIFFCIELab16ToXYZ(TIFFCIELabToRGB *cielab, uint32_t l, int32_t a,
 void TIFFXYZToRGB(TIFFCIELabToRGB *cielab, float X, float Y, float Z,
                   uint32_t *r, uint32_t *g, uint32_t *b)
 {
-    int i;
+    size_t i;
     float Yr, Yg, Yb;
     float *matrix = &cielab->display.d_mat[0][0];
 
@@ -109,16 +109,16 @@ void TIFFXYZToRGB(TIFFCIELabToRGB *cielab, float X, float Y, float Z,
     Yb = TIFFmin(Yb, cielab->display.d_YCB);
 
     /* Turn luminosity to colour value. */
-    i = (int)((Yr - cielab->display.d_Y0R) / cielab->rstep);
-    i = TIFFmin(cielab->range, i);
+    i = (size_t)((Yr - cielab->display.d_Y0R) / cielab->rstep);
+    i = TIFFmin((size_t)cielab->range, i);
     *r = RINT(cielab->Yr2r[i]);
 
-    i = (int)((Yg - cielab->display.d_Y0G) / cielab->gstep);
-    i = TIFFmin(cielab->range, i);
+    i = (size_t)((Yg - cielab->display.d_Y0G) / cielab->gstep);
+    i = TIFFmin((size_t)cielab->range, i);
     *g = RINT(cielab->Yg2g[i]);
 
-    i = (int)((Yb - cielab->display.d_Y0B) / cielab->bstep);
-    i = TIFFmin(cielab->range, i);
+    i = (size_t)((Yb - cielab->display.d_Y0B) / cielab->bstep);
+    i = TIFFmin((size_t)cielab->range, i);
     *b = RINT(cielab->Yb2b[i]);
 
     /* Clip output. */
@@ -135,7 +135,7 @@ void TIFFXYZToRGB(TIFFCIELabToRGB *cielab, float X, float Y, float Z,
 int TIFFCIELabToRGBInit(TIFFCIELabToRGB *cielab, const TIFFDisplay *display,
                         float *refWhite)
 {
-    int i;
+    size_t i;
     double dfGamma;
 
     cielab->range = CIELABTORGB_TABLE_RANGE;
@@ -146,7 +146,7 @@ int TIFFCIELabToRGBInit(TIFFCIELabToRGB *cielab, const TIFFDisplay *display,
     dfGamma = 1.0 / cielab->display.d_gammaR;
     cielab->rstep =
         (cielab->display.d_YCR - cielab->display.d_Y0R) / cielab->range;
-    for (i = 0; i <= cielab->range; i++)
+    for (i = 0; i <= (size_t)cielab->range; i++)
     {
         cielab->Yr2r[i] = cielab->display.d_Vrwr *
                           ((float)pow((double)i / cielab->range, dfGamma));
@@ -156,7 +156,7 @@ int TIFFCIELabToRGBInit(TIFFCIELabToRGB *cielab, const TIFFDisplay *display,
     dfGamma = 1.0 / cielab->display.d_gammaG;
     cielab->gstep =
         (cielab->display.d_YCR - cielab->display.d_Y0R) / cielab->range;
-    for (i = 0; i <= cielab->range; i++)
+    for (i = 0; i <= (size_t)cielab->range; i++)
     {
         cielab->Yg2g[i] = cielab->display.d_Vrwg *
                           ((float)pow((double)i / cielab->range, dfGamma));
@@ -166,7 +166,7 @@ int TIFFCIELabToRGBInit(TIFFCIELabToRGB *cielab, const TIFFDisplay *display,
     dfGamma = 1.0 / cielab->display.d_gammaB;
     cielab->bstep =
         (cielab->display.d_YCR - cielab->display.d_Y0R) / cielab->range;
-    for (i = 0; i <= cielab->range; i++)
+    for (i = 0; i <= (size_t)cielab->range; i++)
     {
         cielab->Yb2b[i] = cielab->display.d_Vrwb *
                           ((float)pow((double)i / cielab->range, dfGamma));
diff --git a/frmts/gtiff/libtiff/tif_dir.c b/frmts/gtiff/libtiff/tif_dir.c
index de246d413c21..459f9696fd3e 100644
--- a/frmts/gtiff/libtiff/tif_dir.c
+++ b/frmts/gtiff/libtiff/tif_dir.c
@@ -1662,6 +1662,7 @@ void TIFFFreeDirectory(TIFF *tif)
         tif->tif_dir.td_dirdatasize_offsets = NULL;
         tif->tif_dir.td_dirdatasize_Noffsets = 0;
     }
+    tif->tif_dir.td_iswrittentofile = FALSE;
 }
 #undef CleanupField
 
@@ -1694,6 +1695,7 @@ int TIFFCreateDirectory(TIFF *tif)
     tif->tif_curoff = 0;
     tif->tif_row = (uint32_t)-1;
     tif->tif_curstrip = (uint32_t)-1;
+    tif->tif_dir.td_iswrittentofile = FALSE;
 
     return 0;
 }
@@ -1862,7 +1864,9 @@ static int TIFFAdvanceDirectory(TIFF *tif, uint64_t *nextdiroff, uint64_t *off,
             if (((uint64_t)poffa != poff) || (poffb < poffa) ||
                 (poffb < (tmsize_t)sizeof(uint16_t)) || (poffb > tif->tif_size))
             {
-                TIFFErrorExtR(tif, module, "Error fetching directory count");
+                TIFFErrorExtR(tif, module,
+                              "%s:%d: %s: Error fetching directory count",
+                              __FILE__, __LINE__, tif->tif_name);
                 *nextdiroff = 0;
                 return (0);
             }
@@ -1891,14 +1895,18 @@ static int TIFFAdvanceDirectory(TIFF *tif, uint64_t *nextdiroff, uint64_t *off,
             uint16_t dircount16;
             if (poff > (uint64_t)TIFF_TMSIZE_T_MAX - sizeof(uint64_t))
             {
-                TIFFErrorExtR(tif, module, "Error fetching directory count");
+                TIFFErrorExtR(tif, module,
+                              "%s:%d: %s: Error fetching directory count",
+                              __FILE__, __LINE__, tif->tif_name);
                 return (0);
             }
             poffa = (tmsize_t)poff;
             poffb = poffa + sizeof(uint64_t);
             if (poffb > tif->tif_size)
             {
-                TIFFErrorExtR(tif, module, "Error fetching directory count");
+                TIFFErrorExtR(tif, module,
+                              "%s:%d: %s: Error fetching directory count",
+                              __FILE__, __LINE__, tif->tif_name);
                 return (0);
             }
             _TIFFmemcpy(&dircount64, tif->tif_base + poffa, sizeof(uint64_t));
@@ -1940,8 +1948,9 @@ static int TIFFAdvanceDirectory(TIFF *tif, uint64_t *nextdiroff, uint64_t *off,
             if (!SeekOK(tif, *nextdiroff) ||
                 !ReadOK(tif, &dircount, sizeof(uint16_t)))
             {
-                TIFFErrorExtR(tif, module, "%s: Error fetching directory count",
-                              tif->tif_name);
+                TIFFErrorExtR(tif, module,
+                              "%s:%d: %s: Error fetching directory count",
+                              __FILE__, __LINE__, tif->tif_name);
                 return (0);
             }
             if (tif->tif_flags & TIFF_SWAB)
@@ -1967,15 +1976,18 @@ static int TIFFAdvanceDirectory(TIFF *tif, uint64_t *nextdiroff, uint64_t *off,
             if (!SeekOK(tif, *nextdiroff) ||
                 !ReadOK(tif, &dircount64, sizeof(uint64_t)))
             {
-                TIFFErrorExtR(tif, module, "%s: Error fetching directory count",
-                              tif->tif_name);
+                TIFFErrorExtR(tif, module,
+                              "%s:%d: %s: Error fetching directory count",
+                              __FILE__, __LINE__, tif->tif_name);
                 return (0);
             }
             if (tif->tif_flags & TIFF_SWAB)
                 TIFFSwabLong8(&dircount64);
             if (dircount64 > 0xFFFF)
             {
-                TIFFErrorExtR(tif, module, "Error fetching directory count");
+                TIFFErrorExtR(tif, module,
+                              "%s:%d: %s: Error fetching directory count",
+                              __FILE__, __LINE__, tif->tif_name);
                 return (0);
             }
             dircount16 = (uint16_t)dircount64;
@@ -2032,6 +2044,8 @@ tdir_t TIFFNumberOfDirectories(TIFF *tif)
     {
         ++n;
     }
+    /* Update number of main-IFDs in file. */
+    tif->tif_curdircount = n;
     return (n);
 }
 
@@ -2114,7 +2128,19 @@ int TIFFSetDirectory(TIFF *tif, tdir_t dirn)
         tif->tif_curdir = TIFF_NON_EXISTENT_DIR_NUMBER;
     else
         tif->tif_curdir--;
-    return (TIFFReadDirectory(tif));
+
+    tdir_t curdir = tif->tif_curdir;
+
+    int retval = TIFFReadDirectory(tif);
+
+    if (!retval && tif->tif_curdir == curdir)
+    {
+        /* If tif_curdir has not be incremented, TIFFFetchDirectory() in
+         * TIFFReadDirectory() has failed and tif_curdir shall be set
+         * specifically. */
+        tif->tif_curdir = TIFF_NON_EXISTENT_DIR_NUMBER;
+    }
+    return (retval);
 }
 
 /*
@@ -2139,8 +2165,11 @@ int TIFFSetSubDirectory(TIFF *tif, uint64_t diroff)
     int8_t probablySubIFD = 0;
     if (diroff == 0)
     {
-        /* Special case to invalidate the tif_lastdiroff member. */
+        /* Special case to set tif_diroff=0, which is done in
+         * TIFFReadDirectory() below to indicate that the currently read IFD is
+         * treated as a new, fresh IFD. */
         tif->tif_curdir = TIFF_NON_EXISTENT_DIR_NUMBER;
+        tif->tif_dir.td_iswrittentofile = FALSE;
     }
     else
     {
@@ -2150,27 +2179,30 @@ int TIFFSetSubDirectory(TIFF *tif, uint64_t diroff)
             probablySubIFD = 1;
         }
         /* -1 because TIFFReadDirectory() will increment tif_curdir. */
-        tif->tif_curdir =
-            curdir == 0 ? TIFF_NON_EXISTENT_DIR_NUMBER : curdir - 1;
+        if (curdir >= 1)
+            tif->tif_curdir = curdir - 1;
+        else
+            tif->tif_curdir = TIFF_NON_EXISTENT_DIR_NUMBER;
     }
+    curdir = tif->tif_curdir;
 
     tif->tif_nextdiroff = diroff;
     retval = TIFFReadDirectory(tif);
-    /* If failed, curdir was not incremented in TIFFReadDirectory(), so set it
-     * back, but leave it for diroff==0. */
-    if (!retval && diroff != 0)
+
+    /* tif_curdir is incremented in TIFFReadDirectory(), but if it has not been
+     * incremented, TIFFFetchDirectory() has failed there and tif_curdir shall
+     * be set specifically. */
+    if (!retval && diroff != 0 && tif->tif_curdir == curdir)
     {
-        if (tif->tif_curdir == TIFF_NON_EXISTENT_DIR_NUMBER)
-            tif->tif_curdir = 0;
-        else
-            tif->tif_curdir++;
+        tif->tif_curdir = TIFF_NON_EXISTENT_DIR_NUMBER;
     }
+
     if (probablySubIFD)
     {
         if (retval)
         {
             /* Reset IFD list to start new one for SubIFD chain and also start
-             * SubIFD chain with tif_curdir=0. */
+             * SubIFD chain with tif_curdir=0 for IFD loop checking. */
             /* invalidate IFD loop lists */
             _TIFFCleanupIFDOffsetAndNumberMaps(tif);
             tif->tif_curdir = 0; /* first directory of new chain */
@@ -2324,6 +2356,10 @@ int TIFFUnlinkDirectory(TIFF *tif, tdir_t dirn)
     tif->tif_row = (uint32_t)-1;
     tif->tif_curstrip = (uint32_t)-1;
     tif->tif_curdir = TIFF_NON_EXISTENT_DIR_NUMBER;
+    if (tif->tif_curdircount > 0)
+        tif->tif_curdircount--;
+    else
+        tif->tif_curdircount = TIFF_NON_EXISTENT_DIR_NUMBER;
     _TIFFCleanupIFDOffsetAndNumberMaps(tif); /* invalidate IFD loop lists */
     return (1);
 }
diff --git a/frmts/gtiff/libtiff/tif_dir.h b/frmts/gtiff/libtiff/tif_dir.h
index f9558b623703..ffad085e02ed 100644
--- a/frmts/gtiff/libtiff/tif_dir.h
+++ b/frmts/gtiff/libtiff/tif_dir.h
@@ -145,6 +145,9 @@ typedef struct
     unsigned char
         td_deferstrilearraywriting; /* see TIFFDeferStrileArrayWriting() */
 
+    unsigned char
+        td_iswrittentofile; /* indicates if current IFD is present on file */
+
     /* LibTIFF writes all data that does not fit into the IFD entries directly
      * after the IFD tag entry part. When reading, only the IFD data directly
      * and continuously behind the IFD tags is taken into account for the IFD
@@ -332,11 +335,10 @@ extern "C"
         TIFFDataType field_type; /* type of associated data */
         uint32_t
             field_anonymous; /* if true, this is a unknown / anonymous tag */
-        TIFFSetGetFieldType
-            set_field_type; /* type to be passed to TIFFSetField */
-        TIFFSetGetFieldType
-            get_field_type;              /* type to be passed to TIFFGetField */
-        unsigned short field_bit;        /* bit in fieldsset bit vector */
+        TIFFSetGetFieldType set_field_type; /* type to be passed to TIFFSetField
+                                               and TIFFGetField*/
+        TIFFSetGetFieldType get_field_type; /* not used */
+        unsigned short field_bit;           /* bit in fieldsset bit vector */
         unsigned char field_oktochange;  /* if true, can change while writing */
         unsigned char field_passcount;   /* if true, pass dir count on set */
         char *field_name;                /* ASCII name */
diff --git a/frmts/gtiff/libtiff/tif_dirread.c b/frmts/gtiff/libtiff/tif_dirread.c
index 4305a512d1d0..3d94ea7d4f37 100644
--- a/frmts/gtiff/libtiff/tif_dirread.c
+++ b/frmts/gtiff/libtiff/tif_dirread.c
@@ -4281,7 +4281,6 @@ int TIFFReadDirectory(TIFF *tif)
         tif->tif_curdir = 0;
     else
         tif->tif_curdir++;
-    (*tif->tif_cleanup)(tif); /* cleanup any previous compression state */
 
     TIFFReadDirectoryCheckOrder(tif, dir, dircount);
 
@@ -4311,9 +4310,15 @@ int TIFFReadDirectory(TIFF *tif)
     tif->tif_flags &= ~TIFF_CHOPPEDUPARRAYS;
 
     /* free any old stuff and reinit */
+    (*tif->tif_cleanup)(tif); /* cleanup any previous compression state */
     TIFFFreeDirectory(tif);
     TIFFDefaultDirectory(tif);
 
+    /* After setup a fresh directory indicate that now active IFD is also
+     * present on file, even if its entries could not be read successfully
+     * below.  */
+    tif->tif_dir.td_iswrittentofile = TRUE;
+
     /* Allocate arrays for offset values outside IFD entry for IFD data size
      * checking. Note: Counter are reset within TIFFFreeDirectory(). */
     tif->tif_dir.td_dirdatasize_offsets =
@@ -5191,7 +5196,7 @@ int TIFFReadDirectory(TIFF *tif)
     if (dir)
         _TIFFfreeExt(tif, dir);
     return (0);
-}
+} /*-- TIFFReadDirectory() --*/
 
 static void TIFFReadDirectoryCheckOrder(TIFF *tif, TIFFDirEntry *dir,
                                         uint16_t dircount)
@@ -5275,8 +5280,7 @@ int TIFFReadCustomDirectory(TIFF *tif, toff_t diroff,
     uint16_t di;
     const TIFFField *fip;
     uint32_t fii;
-    (*tif->tif_cleanup)(tif); /* cleanup any previous compression state */
-    _TIFFSetupFields(tif, infoarray);
+
     dircount = TIFFFetchDirectory(tif, diroff, &dir, NULL);
     if (!dircount)
     {
@@ -5285,9 +5289,41 @@ int TIFFReadCustomDirectory(TIFF *tif, toff_t diroff,
                       diroff);
         return 0;
     }
-    TIFFFreeDirectory(tif);
-    _TIFFmemset(&tif->tif_dir, 0, sizeof(TIFFDirectory));
     TIFFReadDirectoryCheckOrder(tif, dir, dircount);
+
+    /*
+     * Mark duplicates of any tag to be ignored (bugzilla 1994)
+     * to avoid certain pathological problems.
+     */
+    {
+        TIFFDirEntry *ma;
+        uint16_t mb;
+        for (ma = dir, mb = 0; mb < dircount; ma++, mb++)
+        {
+            TIFFDirEntry *na;
+            uint16_t nb;
+            for (na = ma + 1, nb = mb + 1; nb < dircount; na++, nb++)
+            {
+                if (ma->tdir_tag == na->tdir_tag)
+                {
+                    na->tdir_ignore = TRUE;
+                }
+            }
+        }
+    }
+
+    /* Free any old stuff and reinit. */
+    (*tif->tif_cleanup)(tif); /* cleanup any previous compression state */
+    TIFFFreeDirectory(tif);
+    /* Even if custom directories do not need the default settings of a standard
+     * IFD, the pointer to the TIFFSetField() and TIFFGetField() (i.e.
+     * tif->tif_tagmethods.vsetfield and tif->tif_tagmethods.vgetfield) need to
+     * be initialized, which is done in TIFFDefaultDirectory().
+     * After that, the field array for the custom tags needs to be setup again.
+     */
+    TIFFDefaultDirectory(tif);
+    _TIFFSetupFields(tif, infoarray);
+
     /* Allocate arrays for offset values outside IFD entry for IFD data size
      * checking. Note: Counter are reset within TIFFFreeDirectory(). */
     tif->tif_dir.td_dirdatasize_offsets =
diff --git a/frmts/gtiff/libtiff/tif_dirwrite.c b/frmts/gtiff/libtiff/tif_dirwrite.c
index d7781fc86b10..facdeaf7b161 100644
--- a/frmts/gtiff/libtiff/tif_dirwrite.c
+++ b/frmts/gtiff/libtiff/tif_dirwrite.c
@@ -869,7 +869,7 @@ static int TIFFWriteDirectorySec(TIFF *tif, int isimage, int imagedone,
                     if ((o->field_bit >= FIELD_CODEC) &&
                         (TIFFFieldSet(tif, o->field_bit)))
                     {
-                        switch (o->get_field_type)
+                        switch (o->set_field_type)
                         {
                             case TIFF_SETGET_ASCII:
                             {
@@ -1185,17 +1185,12 @@ static int TIFFWriteDirectorySec(TIFF *tif, int isimage, int imagedone,
         }
         if (tif->tif_dataoff & 1)
             tif->tif_dataoff++;
-        if (isimage)
-        {
-            if (tif->tif_curdir == TIFF_NON_EXISTENT_DIR_NUMBER)
-                tif->tif_curdir = 0;
-            else
-                tif->tif_curdir++;
-        }
     } /* while() */
     if (isimage)
     {
-        /* For SubIFDs remember offset of SubIFD tag within main IFD. */
+        /* For SubIFDs remember offset of SubIFD tag within main IFD.
+         * However, might be already done in TIFFWriteDirectoryTagSubifd() if
+         * there are more than one SubIFD. */
         if (TIFFFieldSet(tif, FIELD_SUBIFD) && (tif->tif_subifdoff == 0))
         {
             uint32_t na;
@@ -1297,7 +1292,8 @@ static int TIFFWriteDirectorySec(TIFF *tif, int isimage, int imagedone,
     dir = NULL;
     if (!SeekOK(tif, tif->tif_diroff))
     {
-        TIFFErrorExtR(tif, module, "IO error writing directory");
+        TIFFErrorExtR(tif, module,
+                      "IO error writing directory at seek to offset");
         goto bad;
     }
     if (!WriteOK(tif, dirmem, (tmsize_t)dirsize))
@@ -1306,6 +1302,68 @@ static int TIFFWriteDirectorySec(TIFF *tif, int isimage, int imagedone,
         goto bad;
     }
     _TIFFfreeExt(tif, dirmem);
+
+    /* Increment tif_curdir if IFD wasn't already written to file and no error
+     * occurred during IFD writing above. */
+    if (isimage && !tif->tif_dir.td_iswrittentofile)
+    {
+        if (!((tif->tif_flags & TIFF_INSUBIFD) &&
+              !(TIFFFieldSet(tif, FIELD_SUBIFD))))
+        {
+            /*-- Normal main-IFD case --*/
+            if (tif->tif_curdircount != TIFF_NON_EXISTENT_DIR_NUMBER)
+            {
+                tif->tif_curdir = tif->tif_curdircount;
+            }
+            else
+            {
+                /*ToDo SU: NEW_IFD_CURDIR_INCREMENTING:  Delete this
+                 * unexpected case after some testing time. */
+                /* Attention: tif->tif_curdircount is already set within
+                 * TIFFNumberOfDirectories() */
+                tif->tif_curdircount = TIFFNumberOfDirectories(tif);
+                tif->tif_curdir = tif->tif_curdircount;
+                TIFFErrorExtR(
+                    tif, module,
+                    "tif_curdircount is TIFF_NON_EXISTENT_DIR_NUMBER, "
+                    "not expected !! Line %d",
+                    __LINE__);
+                goto bad;
+            }
+        }
+        else
+        {
+            /*-- SubIFD case -- */
+            /* tif_curdir is always set to 0 for all SubIFDs. */
+            tif->tif_curdir = 0;
+        }
+    }
+    /* Increment tif_curdircount only if main-IFD of an image was not already
+     * present on file. */
+    /* Check in combination with (... && !(TIFFFieldSet(tif, FIELD_SUBIFD)))
+     * is necessary here because TIFF_INSUBIFD was already set above for the
+     * next SubIFD when this main-IFD (with FIELD_SUBIFD) is currently being
+     * written. */
+    if (isimage && !tif->tif_dir.td_iswrittentofile &&
+        !((tif->tif_flags & TIFF_INSUBIFD) &&
+          !(TIFFFieldSet(tif, FIELD_SUBIFD))))
+        tif->tif_curdircount++;
+
+    tif->tif_dir.td_iswrittentofile = TRUE;
+
+    /* Reset SubIFD writing stage after last SubIFD has been written. */
+    if (imagedone && (tif->tif_flags & TIFF_INSUBIFD) && tif->tif_nsubifd == 0)
+        tif->tif_flags &= ~TIFF_INSUBIFD;
+
+    /* Add or update this directory to the IFD list. */
+    if (!_TIFFCheckDirNumberAndOffset(tif, tif->tif_curdir, tif->tif_diroff))
+    {
+        TIFFErrorExtR(tif, module,
+                      "Starting directory %u at offset 0x%" PRIx64 " (%" PRIu64
+                      ") might cause an IFD loop",
+                      tif->tif_curdir, tif->tif_diroff, tif->tif_diroff);
+    }
+
     if (imagedone)
     {
         TIFFFreeDirectory(tif);
@@ -1317,9 +1375,8 @@ static int TIFFWriteDirectorySec(TIFF *tif, int isimage, int imagedone,
     }
     else
     {
-        /* IFD is only checkpointed to file, thus set IFD data size written to
-         * file.
-         */
+        /* IFD is only checkpointed to file (or a custom IFD like EXIF is
+         * written), thus set IFD data size written to file. */
         tif->tif_dir.td_dirdatasize_read = tif->tif_dir.td_dirdatasize_write;
     }
     return (1);
@@ -2017,7 +2074,7 @@ static void EvaluateIFDdatasizeWrite(TIFF *tif, uint32_t count,
     uint64_t datalength = (uint64_t)count * typesize;
     if (datalength > ((tif->tif_flags & TIFF_BIGTIFF) ? 0x8U : 0x4U))
     {
-        /* LibTIFF increments write address to an even offset, thus datalenght
+        /* LibTIFF increments write address to an even offset, thus datalength
          * written is also incremented. */
         if (datalength & 1)
             datalength++;
@@ -3073,15 +3130,15 @@ static int TIFFLinkDirectory(TIFF *tif)
                               "Error writing SubIFD directory link");
                 return (0);
             }
+
             /*
              * Advance to the next SubIFD or, if this is
-             * the last one configured, revert back to the
-             * normal directory linkage.
+             * the last one configured, reverting back to the
+             * normal directory linkage is done in TIFFWriteDirectorySec()
+             * by tif->tif_flags &= ~TIFF_INSUBIFD;.
              */
             if (--tif->tif_nsubifd)
                 tif->tif_subifdoff += 4;
-            else
-                tif->tif_flags &= ~TIFF_INSUBIFD;
             return (1);
         }
         else
@@ -3097,19 +3154,23 @@ static int TIFFLinkDirectory(TIFF *tif)
                               "Error writing SubIFD directory link");
                 return (0);
             }
+
             /*
              * Advance to the next SubIFD or, if this is
-             * the last one configured, revert back to the
-             * normal directory linkage.
+             * the last one configured, reverting back to the
+             * normal directory linkage is done in TIFFWriteDirectorySec()
+             * by tif->tif_flags &= ~TIFF_INSUBIFD;.
              */
             if (--tif->tif_nsubifd)
                 tif->tif_subifdoff += 8;
-            else
-                tif->tif_flags &= ~TIFF_INSUBIFD;
             return (1);
         }
     }
 
+    /*
+     * Handle main-IFDs
+     */
+    tdir_t ndir = 1; /* count current number of main-IFDs */
     if (!(tif->tif_flags & TIFF_BIGTIFF))
     {
         uint32_t m;
@@ -3130,18 +3191,26 @@ static int TIFFLinkDirectory(TIFF *tif)
                 TIFFErrorExtR(tif, tif->tif_name, "Error writing TIFF header");
                 return (0);
             }
+            if (!tif->tif_dir.td_iswrittentofile)
+                tif->tif_curdircount = 0;
             return (1);
         }
         /*
          * Not the first directory, search to the last and append.
          */
-        if (tif->tif_lastdiroff != 0)
+        tdir_t dirn = 0;
+        if (tif->tif_lastdiroff != 0 &&
+            _TIFFGetDirNumberFromOffset(tif, tif->tif_lastdiroff, &dirn))
         {
+            /* Start searching from the lastely written IFD. Thus get its IFD
+             * number. */
             nextdir = (uint32_t)tif->tif_lastdiroff;
+            ndir = dirn + 1;
         }
         else
         {
             nextdir = tif->tif_header.classic.tiff_diroff;
+            ndir = 1; /* start searching from the first IFD */
         }
 
         while (1)
@@ -3176,10 +3245,12 @@ static int TIFFLinkDirectory(TIFF *tif)
                 break;
             }
             nextdir = nextnextdir;
+            ndir++;
         }
     }
     else
     {
+        /*- BigTIFF -*/
         uint64_t m;
         uint64_t nextdir;
         m = tif->tif_diroff;
@@ -3198,18 +3269,26 @@ static int TIFFLinkDirectory(TIFF *tif)
                 TIFFErrorExtR(tif, tif->tif_name, "Error writing TIFF header");
                 return (0);
             }
+            if (!tif->tif_dir.td_iswrittentofile)
+                tif->tif_curdircount = 0;
             return (1);
         }
         /*
          * Not the first directory, search to the last and append.
          */
-        if (tif->tif_lastdiroff != 0)
+        tdir_t dirn = 0;
+        if (tif->tif_lastdiroff != 0 &&
+            _TIFFGetDirNumberFromOffset(tif, tif->tif_lastdiroff, &dirn))
         {
+            /* Start searching from the lastely written IFD. Thus get its IFD
+             * number. */
             nextdir = tif->tif_lastdiroff;
+            ndir = dirn + 1;
         }
         else
         {
             nextdir = tif->tif_header.big.tiff_diroff;
+            ndir = 1; /* start searching from the first IFD */
         }
         while (1)
         {
@@ -3252,8 +3331,20 @@ static int TIFFLinkDirectory(TIFF *tif)
                 break;
             }
             nextdir = nextnextdir;
+            ndir++;
         }
     }
+    /* Offset of next IFD is written to file.
+     * Update number of main-IFDs in file.
+     * However, tif_curdircount shall count only newly written main-IFDs with
+     * entries and not only number of linked offsets! Thus, tif_curdircount is
+     * incremented at the end of TIFFWriteDirectorySec().
+     * TIFF_NON_EXISTENT_DIR_NUMBER means 'dont know number of IFDs'
+     * 0 means 'empty file opened for writing, but no IFD written yet' */
+    if (!tif->tif_dir.td_iswrittentofile && !(tif->tif_flags & TIFF_INSUBIFD))
+    {
+        tif->tif_curdircount = ndir;
+    }
     return (1);
 }
 
diff --git a/frmts/gtiff/libtiff/tif_fax3.c b/frmts/gtiff/libtiff/tif_fax3.c
index 668e96a33073..01a784730bdc 100644
--- a/frmts/gtiff/libtiff/tif_fax3.c
+++ b/frmts/gtiff/libtiff/tif_fax3.c
@@ -569,7 +569,11 @@ static int Fax3SetupState(TIFF *tif)
 
       TIFFroundup and TIFFSafeMultiply return zero on integer overflow
     */
-    dsp->runs = (uint32_t *)NULL;
+    if (dsp->runs != NULL)
+    {
+        _TIFFfreeExt(tif, dsp->runs);
+        dsp->runs = (uint32_t *)NULL;
+    }
     dsp->nruns = TIFFroundup_32(rowpixels + 1, 32);
     if (needsRefLine)
     {
@@ -611,6 +615,10 @@ static int Fax3SetupState(TIFF *tif)
          * is referenced.  The reference line must
          * be initialized to be ``white'' (done elsewhere).
          */
+        if (esp->refline != NULL)
+        {
+            _TIFFfreeExt(tif, esp->refline);
+        }
         esp->refline = (unsigned char *)_TIFFmallocExt(tif, rowbytes);
         if (esp->refline == NULL)
         {
@@ -1556,6 +1564,7 @@ static int Fax4Decode(TIFF *tif, uint8_t *buf, tmsize_t occ, uint16_t s)
         return (-1);
     }
     CACHE_STATE(tif, sp);
+    int start = sp->line;
     while (occ > 0)
     {
         a0 = 0;
@@ -1604,7 +1613,9 @@ static int Fax4Decode(TIFF *tif, uint8_t *buf, tmsize_t occ, uint16_t s)
         }
         (*sp->fill)(buf, thisrun, pa, lastx);
         UNCACHE_STATE(tif, sp);
-        return (sp->line ? 1 : -1); /* don't error on badly-terminated strips */
+        return (sp->line != start
+                    ? 1
+                    : -1); /* don't error on badly-terminated strips */
     }
     UNCACHE_STATE(tif, sp);
     return (1);
diff --git a/frmts/gtiff/libtiff/tif_getimage.c b/frmts/gtiff/libtiff/tif_getimage.c
index 0ada2697259c..6c7b5031a193 100644
--- a/frmts/gtiff/libtiff/tif_getimage.c
+++ b/frmts/gtiff/libtiff/tif_getimage.c
@@ -766,7 +766,6 @@ static int gtTileContig(TIFFRGBAImage *img, uint32_t *raster, uint32_t w,
         return (0);
     }
 
-
     /*
      *	Leftmost tile is clipped on left side if col_offset > 0.
      */
@@ -1111,7 +1110,6 @@ static int gtStripContig(TIFFRGBAImage *img, uint32_t *raster, uint32_t w,
         return (0);
     }
 
-
     scanline = TIFFScanlineSize(tif);
     fromskew = (w < imagewidth ? imagewidth - w : 0);
     for (row = 0; row < h; row += nrow)
@@ -3323,7 +3321,8 @@ int TIFFReadRGBATileExt(TIFF *tif, uint32_t col, uint32_t row, uint32_t *raster,
     TIFFGetFieldDefaulted(tif, TIFFTAG_TILELENGTH, &tile_ysize);
     if (tile_xsize == 0 || tile_ysize == 0)
     {
-        TIFFErrorExtR(tif, TIFFFileName(tif), "tile_xsize or tile_ysize is zero");
+        TIFFErrorExtR(tif, TIFFFileName(tif),
+                      "tile_xsize or tile_ysize is zero");
         return (0);
     }
 
diff --git a/frmts/gtiff/libtiff/tif_hash_set.c b/frmts/gtiff/libtiff/tif_hash_set.c
index 81dea3fcf26a..d024fcb5eb90 100644
--- a/frmts/gtiff/libtiff/tif_hash_set.c
+++ b/frmts/gtiff/libtiff/tif_hash_set.c
@@ -7,23 +7,7 @@
  **********************************************************************
  * Copyright (c) 2008-2009, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "tif_config.h"
diff --git a/frmts/gtiff/libtiff/tif_hash_set.h b/frmts/gtiff/libtiff/tif_hash_set.h
index f60e2c675e53..fd0323a98094 100644
--- a/frmts/gtiff/libtiff/tif_hash_set.h
+++ b/frmts/gtiff/libtiff/tif_hash_set.h
@@ -9,23 +9,7 @@
  **********************************************************************
  * Copyright (c) 2008-2009, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef TIFF_HASH_SET_H_INCLUDED
diff --git a/frmts/gtiff/libtiff/tif_jpeg.c b/frmts/gtiff/libtiff/tif_jpeg.c
index d80bbc6f012d..c14ca522fe94 100644
--- a/frmts/gtiff/libtiff/tif_jpeg.c
+++ b/frmts/gtiff/libtiff/tif_jpeg.c
@@ -88,18 +88,18 @@ int TIFFJPEGIsFullStripRequired_12(TIFF *tif);
  * 16bit value?
  */
 
-/* HAVE_JPEGTURBO_DUAL_MODE_8_12 is defined for libjpeg-turbo >= 2.2 which
+/* HAVE_JPEGTURBO_DUAL_MODE_8_12 is defined for libjpeg-turbo >= 3.0 which
  * adds a dual-mode 8/12 bit API in the same library.
  */
 
 #if defined(HAVE_JPEGTURBO_DUAL_MODE_8_12)
 #define JPEG_DUAL_MODE_8_12
 /* Start by undefining BITS_IN_JSAMPLE which is always set to 8 in libjpeg-turbo
- * >= 2.2 Cf
+ * >= 3.0 Cf
  * https://github.com/libjpeg-turbo/libjpeg-turbo/commit/8b9bc4b9635a2a047fb23ebe70c9acd728d3f99b
  */
 #undef BITS_IN_JSAMPLE
-/* libjpeg-turbo >= 2.2 adds J12xxxx datatypes for the 12-bit mode. */
+/* libjpeg-turbo >= 3.0 adds J12xxxx datatypes for the 12-bit mode. */
 #if defined(FROM_TIF_JPEG_12)
 #define BITS_IN_JSAMPLE 12
 #define TIFF_JSAMPLE J12SAMPLE
@@ -1451,7 +1451,10 @@ static int JPEGDecode(TIFF *tif, uint8_t *buf, tmsize_t cc, uint16_t s)
     sp->src.bytes_in_buffer = (size_t)tif->tif_rawcc;
 
     if (sp->bytesperline == 0)
+    {
+        memset(buf, 0, (size_t)cc);
         return 0;
+    }
 
     nrows = cc / sp->bytesperline;
     if (cc % sp->bytesperline)
@@ -1472,7 +1475,10 @@ static int JPEGDecode(TIFF *tif, uint8_t *buf, tmsize_t cc, uint16_t s)
             JSAMPROW bufptr = (JSAMPROW)buf;
 
             if (TIFFjpeg_read_scanlines(sp, &bufptr, 1) != 1)
+            {
+                memset(buf, 0, (size_t)cc);
                 return (0);
+            }
 
             ++tif->tif_row;
             buf += sp->bytesperline;
@@ -1506,7 +1512,10 @@ static int JPEGDecode(TIFF *tif, uint8_t *buf, tmsize_t cc, uint16_t s)
     sp->src.bytes_in_buffer = (size_t)tif->tif_rawcc;
 
     if (sp->bytesperline == 0)
+    {
+        memset(buf, 0, (size_t)cc);
         return 0;
+    }
 
     nrows = cc / sp->bytesperline;
     if (cc % sp->bytesperline)
@@ -1542,7 +1551,10 @@ static int JPEGDecode(TIFF *tif, uint8_t *buf, tmsize_t cc, uint16_t s)
                  * for 12bit data, which we need to repack.
                  */
                 if (TIFFjpeg_read_scanlines(sp, &line_work_buf, 1) != 1)
+                {
+                    memset(buf, 0, (size_t)cc);
                     return (0);
+                }
 
                 if (sp->cinfo.d.data_precision == 12)
                 {
@@ -2179,9 +2191,12 @@ static int JPEGPreEncode(TIFF *tif, uint16_t s)
         segment_width = TIFFhowmany_32(segment_width, sp->h_sampling);
         segment_height = TIFFhowmany_32(segment_height, sp->v_sampling);
     }
-    if (segment_width > 65535 || segment_height > 65535)
+    if (segment_width > (uint32_t)JPEG_MAX_DIMENSION ||
+        segment_height > (uint32_t)JPEG_MAX_DIMENSION)
     {
-        TIFFErrorExtR(tif, module, "Strip/tile too large for JPEG");
+        TIFFErrorExtR(tif, module,
+                      "Strip/tile too large for JPEG. Maximum dimension is %d",
+                      (int)JPEG_MAX_DIMENSION);
         return (0);
     }
     sp->cinfo.c.image_width = segment_width;
diff --git a/frmts/gtiff/libtiff/tif_lerc.c b/frmts/gtiff/libtiff/tif_lerc.c
index d9d8d3342eb3..d57b1d253de5 100644
--- a/frmts/gtiff/libtiff/tif_lerc.c
+++ b/frmts/gtiff/libtiff/tif_lerc.c
@@ -754,6 +754,7 @@ static int LERCDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
 
     if (sp->uncompressed_buffer == 0)
     {
+        memset(op, 0, (size_t)occ);
         TIFFErrorExtR(tif, module, "Uncompressed buffer not allocated");
         return 0;
     }
@@ -761,6 +762,7 @@ static int LERCDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
     if ((uint64_t)sp->uncompressed_offset + (uint64_t)occ >
         sp->uncompressed_size)
     {
+        memset(op, 0, (size_t)occ);
         TIFFErrorExtR(tif, module, "Too many bytes read");
         return 0;
     }
diff --git a/frmts/gtiff/libtiff/tif_luv.c b/frmts/gtiff/libtiff/tif_luv.c
index 021756d5d6dd..d19653550c6b 100644
--- a/frmts/gtiff/libtiff/tif_luv.c
+++ b/frmts/gtiff/libtiff/tif_luv.c
@@ -951,7 +951,8 @@ static
     int
     uv_encode(double u, double v, int em) /* encode (u',v') coordinates */
 {
-    register int vi, ui;
+    unsigned int vi;
+    int ui;
 
     /* check for NaN */
     if (u != u || v != v)
@@ -980,8 +981,9 @@ static
     int
     uv_decode(double *up, double *vp, int c) /* decode (u',v') index */
 {
-    int upper, lower;
-    register int ui, vi;
+    unsigned int upper, lower;
+    int ui;
+    unsigned int vi;
 
     if (c < 0 || c >= UV_NDIVS)
         return (-1);
diff --git a/frmts/gtiff/libtiff/tif_lzma.c b/frmts/gtiff/libtiff/tif_lzma.c
index 6fdc92802627..db1c8b6829ff 100644
--- a/frmts/gtiff/libtiff/tif_lzma.c
+++ b/frmts/gtiff/libtiff/tif_lzma.c
@@ -44,6 +44,8 @@
 typedef struct
 {
     TIFFPredictorState predict;
+    int read_error; /* whether a read error has occurred, and which should cause
+                       further reads in the same strip/tile to be aborted */
     lzma_stream stream;
     lzma_filter filters[LZMA_FILTERS_MAX + 1];
     lzma_options_delta opt_delta; /* delta filter options */
@@ -156,6 +158,9 @@ static int LZMAPreDecode(TIFF *tif, uint16_t s)
                       LZMAStrerror(ret));
         return 0;
     }
+
+    sp->read_error = 0;
+
     return 1;
 }
 
@@ -168,6 +173,16 @@ static int LZMADecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
     assert(sp != NULL);
     assert(sp->state == LSTATE_INIT_DECODE);
 
+    if (sp->read_error)
+    {
+        memset(op, 0, (size_t)occ);
+        TIFFErrorExtR(tif, module,
+                      "LZMADecode: Scanline %" PRIu32 " cannot be read due to "
+                      "previous error",
+                      tif->tif_row);
+        return 0;
+    }
+
     sp->stream.next_in = tif->tif_rawcp;
     sp->stream.avail_in = (size_t)tif->tif_rawcc;
 
@@ -175,6 +190,9 @@ static int LZMADecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
     sp->stream.avail_out = (size_t)occ;
     if ((tmsize_t)sp->stream.avail_out != occ)
     {
+        // read_error not set here as this is a usage issue that can be
+        // recovered in a following call.
+        memset(op, 0, (size_t)occ);
         TIFFErrorExtR(tif, module,
                       "Liblzma cannot deal with buffers this size");
         return 0;
@@ -198,6 +216,8 @@ static int LZMADecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
                 lzma_stream_decoder(&sp->stream, lzma_memusage(&sp->stream), 0);
             if (r != LZMA_OK)
             {
+                sp->read_error = 1;
+                memset(op, 0, (size_t)occ);
                 TIFFErrorExtR(tif, module,
                               "Error initializing the stream decoder, %s",
                               LZMAStrerror(r));
@@ -217,6 +237,8 @@ static int LZMADecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
     } while (sp->stream.avail_out > 0);
     if (sp->stream.avail_out != 0)
     {
+        sp->read_error = 1;
+        memset(sp->stream.next_out, 0, sp->stream.avail_out);
         TIFFErrorExtR(tif, module,
                       "Not enough data at scanline %" PRIu32
                       " (short %" TIFF_SIZE_FORMAT " bytes)",
diff --git a/frmts/gtiff/libtiff/tif_lzw.c b/frmts/gtiff/libtiff/tif_lzw.c
index 05ac8aa1abe7..4baf78e50b20 100644
--- a/frmts/gtiff/libtiff/tif_lzw.c
+++ b/frmts/gtiff/libtiff/tif_lzw.c
@@ -417,6 +417,7 @@ static int LZWDecode(TIFF *tif, uint8_t *op0, tmsize_t occ0, uint16_t s)
 
     if (sp->read_error)
     {
+        memset(op, 0, (size_t)occ);
         TIFFErrorExtR(tif, module,
                       "LZWDecode: Scanline %" PRIu32 " cannot be read due to "
                       "previous error",
@@ -731,6 +732,7 @@ static int LZWDecode(TIFF *tif, uint8_t *op0, tmsize_t occ0, uint16_t s)
 
     if (occ > 0)
     {
+        memset(op, 0, (size_t)occ);
         TIFFErrorExtR(tif, module,
                       "Not enough data at scanline %" PRIu32 " (short %" PRIu64
                       " bytes)",
@@ -740,12 +742,14 @@ static int LZWDecode(TIFF *tif, uint8_t *op0, tmsize_t occ0, uint16_t s)
     return (1);
 
 no_eoi:
+    memset(op, 0, (size_t)occ);
     sp->read_error = 1;
     TIFFErrorExtR(tif, module,
                   "LZWDecode: Strip %" PRIu32 " not terminated with EOI code",
                   tif->tif_curstrip);
     return 0;
 error_code:
+    memset(op, 0, (size_t)occ);
     sp->read_error = 1;
     TIFFErrorExtR(tif, tif->tif_name, "Using code not yet in table");
     return 0;
diff --git a/frmts/gtiff/libtiff/tif_ojpeg.c b/frmts/gtiff/libtiff/tif_ojpeg.c
index e4547cf09137..f94d2a4e45f7 100644
--- a/frmts/gtiff/libtiff/tif_ojpeg.c
+++ b/frmts/gtiff/libtiff/tif_ojpeg.c
@@ -755,6 +755,9 @@ static int OJPEGPreDecode(TIFF *tif, uint16_t s)
         if (OJPEGWriteHeaderInfo(tif) == 0)
             return (0);
     }
+
+    sp->subsampling_convert_state = 0;
+
     while (sp->write_curstrile < m)
     {
         if (sp->libjpeg_jpeg_query_style == 0)
@@ -840,12 +843,14 @@ static int OJPEGDecode(TIFF *tif, uint8_t *buf, tmsize_t cc, uint16_t s)
     (void)s;
     if (!sp->decoder_ok)
     {
+        memset(buf, 0, (size_t)cc);
         TIFFErrorExtR(tif, module,
                       "Cannot decode: decoder not correctly initialized");
         return 0;
     }
     if (sp->libjpeg_session_active == 0)
     {
+        memset(buf, 0, (size_t)cc);
         /* This should normally not happen, except that it does when */
         /* using TIFFReadScanline() which calls OJPEGPostDecode() for */
         /* each scanline, which assumes that a whole strile was read */
@@ -859,17 +864,24 @@ static int OJPEGDecode(TIFF *tif, uint8_t *buf, tmsize_t cc, uint16_t s)
     }
     if (sp->error_in_raw_data_decoding)
     {
+        memset(buf, 0, (size_t)cc);
         return 0;
     }
     if (sp->libjpeg_jpeg_query_style == 0)
     {
         if (OJPEGDecodeRaw(tif, buf, cc) == 0)
+        {
+            memset(buf, 0, (size_t)cc);
             return (0);
+        }
     }
     else
     {
         if (OJPEGDecodeScanlines(tif, buf, cc) == 0)
+        {
+            memset(buf, 0, (size_t)cc);
             return (0);
+        }
     }
     return (1);
 }
diff --git a/frmts/gtiff/libtiff/tif_open.c b/frmts/gtiff/libtiff/tif_open.c
index b18e8948a734..59a07bee0232 100644
--- a/frmts/gtiff/libtiff/tif_open.c
+++ b/frmts/gtiff/libtiff/tif_open.c
@@ -366,6 +366,7 @@ TIFF *TIFFClientOpenExt(const char *name, const char *mode,
     strcpy(tif->tif_name, name);
     tif->tif_mode = m & ~(O_CREAT | O_TRUNC);
     tif->tif_curdir = TIFF_NON_EXISTENT_DIR_NUMBER; /* non-existent directory */
+    tif->tif_curdircount = TIFF_NON_EXISTENT_DIR_NUMBER;
     tif->tif_curoff = 0;
     tif->tif_curstrip = (uint32_t)-1; /* invalid strip */
     tif->tif_row = (uint32_t)-1;      /* read/write pre-increment */
@@ -607,6 +608,9 @@ TIFF *TIFFClientOpenExt(const char *name, const char *mode,
         tif->tif_diroff = 0;
         tif->tif_lastdiroff = 0;
         tif->tif_setdirectory_force_absolute = FALSE;
+        /* tif_curdircount = 0 means 'empty file opened for writing, but no IFD
+         * written yet' */
+        tif->tif_curdircount = 0;
         return (tif);
     }
 
@@ -737,9 +741,17 @@ TIFF *TIFFClientOpenExt(const char *name, const char *mode,
              * example, it may be broken) and want to proceed to other
              * directories. I this case we use the TIFF_HEADERONLY flag to open
              * file and return immediately after reading TIFF header.
+             * However, the pointer to TIFFSetField() and TIFFGetField()
+             * (i.e. tif->tif_tagmethods.vsetfield and
+             * tif->tif_tagmethods.vgetfield) need to be initialized, which is
+             * done in TIFFDefaultDirectory().
              */
             if (tif->tif_flags & TIFF_HEADERONLY)
+            {
+                if (!TIFFDefaultDirectory(tif))
+                    goto bad;
                 return (tif);
+            }
 
             /*
              * Setup initial directory.
diff --git a/frmts/gtiff/libtiff/tif_packbits.c b/frmts/gtiff/libtiff/tif_packbits.c
index 62849f8f3c16..1ae50cbd47ce 100644
--- a/frmts/gtiff/libtiff/tif_packbits.c
+++ b/frmts/gtiff/libtiff/tif_packbits.c
@@ -300,6 +300,7 @@ static int PackBitsDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
     tif->tif_rawcc = cc;
     if (occ > 0)
     {
+        memset(op, 0, (size_t)occ);
         TIFFErrorExtR(tif, module, "Not enough data for scanline %" PRIu32,
                       tif->tif_row);
         return (0);
diff --git a/frmts/gtiff/libtiff/tif_pixarlog.c b/frmts/gtiff/libtiff/tif_pixarlog.c
index 5ed921eb3004..56cf416a7f6b 100644
--- a/frmts/gtiff/libtiff/tif_pixarlog.c
+++ b/frmts/gtiff/libtiff/tif_pixarlog.c
@@ -859,6 +859,7 @@ static int PixarLogDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
             TIFFErrorExtR(tif, module,
                           "%" PRIu16 " bit input not supported in PixarLog",
                           td->td_bitspersample);
+            memset(op, 0, (size_t)occ);
             return 0;
     }
 
@@ -879,12 +880,14 @@ static int PixarLogDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
     if (sp->stream.avail_out != nsamples * sizeof(uint16_t))
     {
         TIFFErrorExtR(tif, module, "ZLib cannot deal with buffers this size");
+        memset(op, 0, (size_t)occ);
         return (0);
     }
     /* Check that we will not fill more than what was allocated */
     if ((tmsize_t)sp->stream.avail_out > sp->tbuf_size)
     {
         TIFFErrorExtR(tif, module, "sp->stream.avail_out > sp->tbuf_size");
+        memset(op, 0, (size_t)occ);
         return (0);
     }
     do
@@ -899,12 +902,14 @@ static int PixarLogDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
             TIFFErrorExtR(
                 tif, module, "Decoding error at scanline %" PRIu32 ", %s",
                 tif->tif_row, sp->stream.msg ? sp->stream.msg : "(null)");
+            memset(op, 0, (size_t)occ);
             return (0);
         }
         if (state != Z_OK)
         {
             TIFFErrorExtR(tif, module, "ZLib error: %s",
                           sp->stream.msg ? sp->stream.msg : "(null)");
+            memset(op, 0, (size_t)occ);
             return (0);
         }
     } while (sp->stream.avail_out > 0);
@@ -916,6 +921,7 @@ static int PixarLogDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
                       "Not enough data at scanline %" PRIu32
                       " (short %u bytes)",
                       tif->tif_row, sp->stream.avail_out);
+        memset(op, 0, (size_t)occ);
         return (0);
     }
 
@@ -977,6 +983,7 @@ static int PixarLogDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
             default:
                 TIFFErrorExtR(tif, module, "Unsupported bits/sample: %" PRIu16,
                               td->td_bitspersample);
+                memset(op, 0, (size_t)occ);
                 return (0);
         }
     }
diff --git a/frmts/gtiff/libtiff/tif_read.c b/frmts/gtiff/libtiff/tif_read.c
index df4bac69253c..7efab59c6a38 100644
--- a/frmts/gtiff/libtiff/tif_read.c
+++ b/frmts/gtiff/libtiff/tif_read.c
@@ -464,6 +464,10 @@ int TIFFReadScanline(TIFF *tif, void *buf, uint32_t row, uint16_t sample)
         if (e)
             (*tif->tif_postdecode)(tif, (uint8_t *)buf, tif->tif_scanlinesize);
     }
+    else
+    {
+        memset(buf, 0, (size_t)tif->tif_scanlinesize);
+    }
     return (e > 0 ? 1 : -1);
 }
 
@@ -549,7 +553,10 @@ tmsize_t TIFFReadEncodedStrip(TIFF *tif, uint32_t strip, void *buf,
     if ((size != (tmsize_t)(-1)) && (size < stripsize))
         stripsize = size;
     if (!TIFFFillStrip(tif, strip))
+    {
+        memset(buf, 0, (size_t)stripsize);
         return ((tmsize_t)(-1));
+    }
     if ((*tif->tif_decodestrip)(tif, buf, stripsize, plane) <= 0)
         return ((tmsize_t)(-1));
     (*tif->tif_postdecode)(tif, buf, stripsize);
@@ -967,9 +974,13 @@ tmsize_t TIFFReadEncodedTile(TIFF *tif, uint32_t tile, void *buf, tmsize_t size)
         size = tilesize;
     else if (size > tilesize)
         size = tilesize;
-    if (TIFFFillTile(tif, tile) &&
-        (*tif->tif_decodetile)(tif, (uint8_t *)buf, size,
-                               (uint16_t)(tile / td->td_stripsperimage)))
+    if (!TIFFFillTile(tif, tile))
+    {
+        memset(buf, 0, (size_t)size);
+        return ((tmsize_t)(-1));
+    }
+    else if ((*tif->tif_decodetile)(tif, (uint8_t *)buf, size,
+                                    (uint16_t)(tile / td->td_stripsperimage)))
     {
         (*tif->tif_postdecode)(tif, (uint8_t *)buf, size);
         return (size);
@@ -1555,9 +1566,14 @@ int TIFFReadFromUserBuffer(TIFF *tif, uint32_t strile, void *inbuf,
 
     if (TIFFIsTiled(tif))
     {
-        if (!TIFFStartTile(tif, strile) ||
-            !(*tif->tif_decodetile)(tif, (uint8_t *)outbuf, outsize,
-                                    (uint16_t)(strile / td->td_stripsperimage)))
+        if (!TIFFStartTile(tif, strile))
+        {
+            ret = 0;
+            memset(outbuf, 0, (size_t)outsize);
+        }
+        else if (!(*tif->tif_decodetile)(
+                     tif, (uint8_t *)outbuf, outsize,
+                     (uint16_t)(strile / td->td_stripsperimage)))
         {
             ret = 0;
         }
@@ -1577,9 +1593,14 @@ int TIFFReadFromUserBuffer(TIFF *tif, uint32_t strile, void *inbuf,
         {
             stripsperplane =
                 TIFFhowmany_32_maxuint_compat(td->td_imagelength, rowsperstrip);
-            if (!TIFFStartStrip(tif, strile) ||
-                !(*tif->tif_decodestrip)(tif, (uint8_t *)outbuf, outsize,
-                                         (uint16_t)(strile / stripsperplane)))
+            if (!TIFFStartStrip(tif, strile))
+            {
+                ret = 0;
+                memset(outbuf, 0, (size_t)outsize);
+            }
+            else if (!(*tif->tif_decodestrip)(
+                         tif, (uint8_t *)outbuf, outsize,
+                         (uint16_t)(strile / stripsperplane)))
             {
                 ret = 0;
             }
diff --git a/frmts/gtiff/libtiff/tif_strip.c b/frmts/gtiff/libtiff/tif_strip.c
index ee31892af269..4dbcf37e48b2 100644
--- a/frmts/gtiff/libtiff/tif_strip.c
+++ b/frmts/gtiff/libtiff/tif_strip.c
@@ -38,6 +38,11 @@ uint32_t TIFFComputeStrip(TIFF *tif, uint32_t row, uint16_t sample)
     TIFFDirectory *td = &tif->tif_dir;
     uint32_t strip;
 
+    if (td->td_rowsperstrip == 0)
+    {
+        TIFFErrorExtR(tif, module, "Cannot compute strip: RowsPerStrip is zero");
+        return 0;
+    }
     strip = row / td->td_rowsperstrip;
     if (td->td_planarconfig == PLANARCONFIG_SEPARATE)
     {
@@ -294,7 +299,25 @@ uint64_t TIFFScanlineSize64(TIFF *tif)
         else
         {
             uint64_t scanline_samples;
-            scanline_samples = _TIFFMultiply64(tif, td->td_imagewidth,
+            uint32_t scanline_width = td->td_imagewidth;
+
+#if 0
+            // Tries to fix https://gitlab.com/libtiff/libtiff/-/merge_requests/564
+            // but causes regression when decoding legit files with tiffcp -c none
+            // Cf https://gitlab.com/libtiff/libtiff/-/merge_requests/644
+            if (td->td_photometric == PHOTOMETRIC_YCBCR)
+            {
+                uint16_t subsampling_hor;
+                uint16_t ignored;
+                TIFFGetFieldDefaulted(tif, TIFFTAG_YCBCRSUBSAMPLING,
+                                      &subsampling_hor, &ignored);
+                if (subsampling_hor > 1) // roundup width for YCbCr
+                    scanline_width =
+                        TIFFroundup_32(scanline_width, subsampling_hor);
+            }
+#endif
+
+            scanline_samples = _TIFFMultiply64(tif, scanline_width,
                                                td->td_samplesperpixel, module);
             scanline_size =
                 TIFFhowmany_64(_TIFFMultiply64(tif, scanline_samples,
diff --git a/frmts/gtiff/libtiff/tif_thunder.c b/frmts/gtiff/libtiff/tif_thunder.c
index 1f97362ca39d..bac0607dbe54 100644
--- a/frmts/gtiff/libtiff/tif_thunder.c
+++ b/frmts/gtiff/libtiff/tif_thunder.c
@@ -82,13 +82,14 @@ static int ThunderSetupDecode(TIFF *tif)
     return (1);
 }
 
-static int ThunderDecode(TIFF *tif, uint8_t *op, tmsize_t maxpixels)
+static int ThunderDecode(TIFF *tif, uint8_t *op0, tmsize_t maxpixels)
 {
     static const char module[] = "ThunderDecode";
     register unsigned char *bp;
     register tmsize_t cc;
     unsigned int lastpixel;
     tmsize_t npixels;
+    uint8_t *op = op0;
 
     bp = (unsigned char *)tif->tif_rawcp;
     cc = tif->tif_rawcc;
@@ -107,6 +108,8 @@ static int ThunderDecode(TIFF *tif, uint8_t *op, tmsize_t maxpixels)
                  * Replicate the last pixel n times,
                  * where n is the lower-order 6 bits.
                  */
+                if (n == 0)
+                    break;
                 if (npixels & 1)
                 {
                     op[0] |= lastpixel;
@@ -117,11 +120,10 @@ static int ThunderDecode(TIFF *tif, uint8_t *op, tmsize_t maxpixels)
                 else
                     lastpixel |= lastpixel << 4;
                 npixels += n;
-                if (npixels < maxpixels)
-                {
-                    for (; n > 0; n -= 2)
-                        *op++ = (uint8_t)lastpixel;
-                }
+                if (npixels > maxpixels)
+                    break;
+                for (; n > 0; n -= 2)
+                    *op++ = (uint8_t)lastpixel;
                 if (n == -1)
                     *--op &= 0xf0;
                 lastpixel &= 0xf;
@@ -154,6 +156,8 @@ static int ThunderDecode(TIFF *tif, uint8_t *op, tmsize_t maxpixels)
     tif->tif_rawcc = cc;
     if (npixels != maxpixels)
     {
+        uint8_t *op_end = op0 + (maxpixels + 1) / 2;
+        memset(op, 0, (size_t)(op_end - op));
         TIFFErrorExtR(tif, module,
                       "%s data at scanline %lu (%" PRIu64 " != %" PRIu64 ")",
                       npixels < maxpixels ? "Not enough" : "Too much",
diff --git a/frmts/gtiff/libtiff/tif_vsi.c b/frmts/gtiff/libtiff/tif_vsi.c
index 1f1403acbd18..71e41a6b7669 100644
--- a/frmts/gtiff/libtiff/tif_vsi.c
+++ b/frmts/gtiff/libtiff/tif_vsi.c
@@ -10,23 +10,7 @@
  ******************************************************************************
  * Copyright (c) 2000, Frank Warmerdam, warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 /*
diff --git a/frmts/gtiff/libtiff/tif_webp.c b/frmts/gtiff/libtiff/tif_webp.c
index bf9d77eb9beb..ccffef070377 100644
--- a/frmts/gtiff/libtiff/tif_webp.c
+++ b/frmts/gtiff/libtiff/tif_webp.c
@@ -47,7 +47,9 @@ typedef struct
 {
     uint16_t nSamples; /* number of samples per pixel */
 
-    int lossless;         /* lossy/lossless compression */
+    int read_error; /* whether a read error has occurred, and which should cause
+                       further reads in the same strip/tile to be aborted */
+    int lossless;   /* lossy/lossless compression */
     int lossless_exact;   /* lossless exact mode. If TRUE, R,G,B values in areas
                              with alpha = 0 will be preserved */
     int quality_level;    /* compression level */
@@ -133,6 +135,16 @@ static int TWebPDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
     assert(sp != NULL);
     assert(sp->state == LSTATE_INIT_DECODE);
 
+    if (sp->read_error)
+    {
+        memset(op, 0, (size_t)occ);
+        TIFFErrorExtR(tif, module,
+                      "ZIPDecode: Scanline %" PRIu32 " cannot be read due to "
+                      "previous error",
+                      tif->tif_row);
+        return 0;
+    }
+
     if (sp->psDecoder == NULL)
     {
         TIFFDirectory *td = &tif->tif_dir;
@@ -158,12 +170,16 @@ static int TWebPDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
                              : (uint32_t)tif->tif_rawcc,
                          &webp_width, &webp_height))
         {
+            memset(op, 0, (size_t)occ);
+            sp->read_error = 1;
             TIFFErrorExtR(tif, module, "WebPGetInfo() failed");
             return 0;
         }
         if ((uint32_t)webp_width != segment_width ||
             (uint32_t)webp_height != segment_height)
         {
+            memset(op, 0, (size_t)occ);
+            sp->read_error = 1;
             TIFFErrorExtR(
                 tif, module, "WebP blob dimension is %dx%d. Expected %ux%u",
                 webp_width, webp_height, segment_width, segment_height);
@@ -174,6 +190,8 @@ static int TWebPDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
         WebPDecoderConfig config;
         if (!WebPInitDecoderConfig(&config))
         {
+            memset(op, 0, (size_t)occ);
+            sp->read_error = 1;
             TIFFErrorExtR(tif, module, "WebPInitDecoderConfig() failed");
             return 0;
         }
@@ -189,6 +207,8 @@ static int TWebPDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
 
         if (!bWebPGetFeaturesOK)
         {
+            memset(op, 0, (size_t)occ);
+            sp->read_error = 1;
             TIFFErrorExtR(tif, module, "WebPInitDecoderConfig() failed");
             return 0;
         }
@@ -202,6 +222,8 @@ static int TWebPDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
              */
             !(webp_bands == 3 && sp->nSamples == 4))
         {
+            memset(op, 0, (size_t)occ);
+            sp->read_error = 1;
             TIFFErrorExtR(tif, module,
                           "WebP blob band count is %d. Expected %d", webp_bands,
                           sp->nSamples);
@@ -228,6 +250,8 @@ static int TWebPDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
             if (!sp->pBuffer)
             {
                 TIFFErrorExtR(tif, module, "Cannot allocate buffer");
+                memset(op, 0, (size_t)occ);
+                sp->read_error = 1;
                 return 0;
             }
             sp->buffer_size = buffer_size;
@@ -257,6 +281,8 @@ static int TWebPDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
 
         if (sp->psDecoder == NULL)
         {
+            memset(op, 0, (size_t)occ);
+            sp->read_error = 1;
             TIFFErrorExtR(tif, module, "Unable to allocate WebP decoder.");
             return 0;
         }
@@ -264,6 +290,10 @@ static int TWebPDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
 
     if (occ % sp->sDecBuffer.u.RGBA.stride)
     {
+        // read_error not set here as this is a usage issue that can be
+        // recovered in a following call.
+        memset(op, 0, (size_t)occ);
+        /* Do not set read_error as could potentially be recovered */
         TIFFErrorExtR(tif, module, "Fractional scanlines cannot be read");
         return 0;
     }
@@ -284,6 +314,8 @@ static int TWebPDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
         {
             TIFFErrorExtR(tif, module, "Unrecognized error.");
         }
+        memset(op, 0, (size_t)occ);
+        sp->read_error = 1;
         return 0;
     }
     else
@@ -303,6 +335,8 @@ static int TWebPDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
             {
                 if (current_y != numberOfExpectedLines)
                 {
+                    memset(op, 0, (size_t)occ);
+                    sp->read_error = 1;
                     TIFFErrorExtR(tif, module,
                                   "Unable to decode WebP data: less lines than "
                                   "expected.");
@@ -332,6 +366,8 @@ static int TWebPDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
         }
         else
         {
+            memset(op, 0, (size_t)occ);
+            sp->read_error = 1;
             TIFFErrorExtR(tif, module, "Unable to decode WebP data.");
             return 0;
         }
@@ -451,6 +487,8 @@ static int TWebPPreDecode(TIFF *tif, uint16_t s)
         sp->psDecoder = NULL;
     }
 
+    sp->read_error = 0;
+
     return 1;
 }
 
diff --git a/frmts/gtiff/libtiff/tif_zip.c b/frmts/gtiff/libtiff/tif_zip.c
index a351ba5649fc..2a2a1d787f69 100644
--- a/frmts/gtiff/libtiff/tif_zip.c
+++ b/frmts/gtiff/libtiff/tif_zip.c
@@ -67,6 +67,8 @@ typedef struct
 {
     TIFFPredictorState predict;
     z_stream stream;
+    int read_error; /* whether a read error has occurred, and which should cause
+                       further reads in the same strip/tile to be aborted */
     int zipquality; /* compression level */
     int state;      /* state flags */
     int subcodec;   /* DEFLATE_SUBCODEC_ZLIB or DEFLATE_SUBCODEC_LIBDEFLATE */
@@ -150,7 +152,12 @@ static int ZIPPreDecode(TIFF *tif, uint16_t s)
     sp->stream.avail_in = (uint64_t)tif->tif_rawcc < 0xFFFFFFFFU
                               ? (uInt)tif->tif_rawcc
                               : 0xFFFFFFFFU;
-    return (inflateReset(&sp->stream) == Z_OK);
+    if (inflateReset(&sp->stream) == Z_OK)
+    {
+        sp->read_error = 0;
+        return 1;
+    }
+    return 0;
 }
 
 static int ZIPDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
@@ -162,6 +169,16 @@ static int ZIPDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
     assert(sp != NULL);
     assert(sp->state == ZSTATE_INIT_DECODE);
 
+    if (sp->read_error)
+    {
+        memset(op, 0, (size_t)occ);
+        TIFFErrorExtR(tif, module,
+                      "ZIPDecode: Scanline %" PRIu32 " cannot be read due to "
+                      "previous error",
+                      tif->tif_row);
+        return 0;
+    }
+
 #if LIBDEFLATE_SUPPORT
     if (sp->libdeflate_state == 1)
         return 0;
@@ -227,8 +244,10 @@ static int ZIPDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
             if (res != LIBDEFLATE_SUCCESS &&
                 res != LIBDEFLATE_INSUFFICIENT_SPACE)
             {
+                memset(op, 0, (size_t)occ);
                 TIFFErrorExtR(tif, module, "Decoding error at scanline %lu",
                               (unsigned long)tif->tif_row);
+                sp->read_error = 1;
                 return 0;
             }
 
@@ -263,13 +282,17 @@ static int ZIPDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
             break;
         if (state == Z_DATA_ERROR)
         {
+            memset(sp->stream.next_out, 0, sp->stream.avail_out);
             TIFFErrorExtR(tif, module, "Decoding error at scanline %lu, %s",
                           (unsigned long)tif->tif_row, SAFE_MSG(sp));
+            sp->read_error = 1;
             return (0);
         }
         if (state != Z_OK)
         {
+            memset(sp->stream.next_out, 0, sp->stream.avail_out);
             TIFFErrorExtR(tif, module, "ZLib error: %s", SAFE_MSG(sp));
+            sp->read_error = 1;
             return (0);
         }
     } while (occ > 0);
@@ -279,6 +302,8 @@ static int ZIPDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
                       "Not enough data at scanline %lu (short %" PRIu64
                       " bytes)",
                       (unsigned long)tif->tif_row, (uint64_t)occ);
+        memset(sp->stream.next_out, 0, sp->stream.avail_out);
+        sp->read_error = 1;
         return (0);
     }
 
diff --git a/frmts/gtiff/libtiff/tif_zstd.c b/frmts/gtiff/libtiff/tif_zstd.c
index 5aaf4c44bb3a..fc73ce9cf53e 100644
--- a/frmts/gtiff/libtiff/tif_zstd.c
+++ b/frmts/gtiff/libtiff/tif_zstd.c
@@ -146,6 +146,7 @@ static int ZSTDDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
         zstd_ret = ZSTD_decompressStream(sp->dstream, &out_buffer, &in_buffer);
         if (ZSTD_isError(zstd_ret))
         {
+            memset(op + out_buffer.pos, 0, out_buffer.size - out_buffer.pos);
             TIFFErrorExtR(tif, module, "Error in ZSTD_decompressStream(): %s",
                           ZSTD_getErrorName(zstd_ret));
             return 0;
@@ -155,6 +156,7 @@ static int ZSTDDecode(TIFF *tif, uint8_t *op, tmsize_t occ, uint16_t s)
 
     if (out_buffer.pos < (size_t)occ)
     {
+        memset(op + out_buffer.pos, 0, out_buffer.size - out_buffer.pos);
         TIFFErrorExtR(tif, module,
                       "Not enough data at scanline %lu (short %lu bytes)",
                       (unsigned long)tif->tif_row,
diff --git a/frmts/gtiff/libtiff/tiffiop.h b/frmts/gtiff/libtiff/tiffiop.h
index 803ca98ce851..c4348206df56 100644
--- a/frmts/gtiff/libtiff/tiffiop.h
+++ b/frmts/gtiff/libtiff/tiffiop.h
@@ -163,12 +163,32 @@ struct tiff
     TIFFHeaderUnion tif_header; /* file's header block Classic/BigTIFF union */
     uint16_t tif_header_size;   /* file's header block and its length */
     uint32_t tif_row;           /* current scanline */
-    tdir_t tif_curdir;          /* current directory (index) */
-    uint32_t tif_curstrip;      /* current strip for read/write */
-    uint64_t tif_curoff;        /* current offset for read/write */
-    uint64_t tif_lastvalidoff;  /* last valid offset allowed for rewrite in
-                                   place. Used only by TIFFAppendToStrip() */
-    uint64_t tif_dataoff;       /* current offset for writing dir (IFD) */
+
+    /* There are IFDs in the file and an "active" IFD in memory,
+     * from which fields are "set" and "get".
+     * tif_curdir is set to:
+     *   a) TIFF_NON_EXISTENT_DIR_NUMBER if there is no IFD in the file
+     *      or the state is unknown,
+     *      or the last read (i.e. TIFFFetchDirectory()) failed,
+     *      or a custom directory was written.
+     *   b) IFD index of last IFD written in the file. In this case the
+     *      active IFD is a new (empty) one and tif_diroff is zero.
+     *      If writing fails, tif_curdir is not changed.
+     *   c) IFD index of IFD read from file into memory (=active IFD),
+     *      even if IFD is corrupt and TIFFReadDirectory() returns 0.
+     *      Then tif_diroff contains the offset of the IFD in the file.
+     *   d) IFD index 0, whenever a custom directory or an unchained SubIFD
+     *      was read. */
+    tdir_t tif_curdir; /* current directory (index) */
+    /* tif_curdircount: number of directories (main-IFDs) in file:
+     * - TIFF_NON_EXISTENT_DIR_NUMBER means 'dont know number of IFDs'.
+     * - 0 means 'empty file opened for writing, but no IFD written yet' */
+    tdir_t tif_curdircount;
+    uint32_t tif_curstrip;     /* current strip for read/write */
+    uint64_t tif_curoff;       /* current offset for read/write */
+    uint64_t tif_lastvalidoff; /* last valid offset allowed for rewrite in
+                                  place. Used only by TIFFAppendToStrip() */
+    uint64_t tif_dataoff;      /* current offset for writing dir (IFD) */
     /* SubIFD support */
     uint16_t tif_nsubifd;   /* remaining subifds to write */
     uint64_t tif_subifdoff; /* offset for patching SubIFD link */
diff --git a/frmts/gtiff/tifvsi.cpp b/frmts/gtiff/tifvsi.cpp
index a1f106d257c0..00333d2e72e9 100644
--- a/frmts/gtiff/tifvsi.cpp
+++ b/frmts/gtiff/tifvsi.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2005, Frank Warmerdam, warmerdam@pobox.com
  * Copyright (c) 2010-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 // TIFF Library UNIX-specific Routines.
diff --git a/frmts/gtiff/tifvsi.h b/frmts/gtiff/tifvsi.h
index fb94a7cbebd8..023bd5335e6e 100644
--- a/frmts/gtiff/tifvsi.h
+++ b/frmts/gtiff/tifvsi.h
@@ -11,23 +11,7 @@
  * Copyright (c) 2005, Frank Warmerdam, warmerdam@pobox.com
  * Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef TIFVSI_H_INCLUDED
diff --git a/frmts/gxf/gxf_ogcwkt.c b/frmts/gxf/gxf_ogcwkt.c
index e788545961f2..1cd589492f40 100644
--- a/frmts/gxf/gxf_ogcwkt.c
+++ b/frmts/gxf/gxf_ogcwkt.c
@@ -9,23 +9,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2009-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gxfopen.h"
diff --git a/frmts/gxf/gxf_proj4.c b/frmts/gxf/gxf_proj4.c
index a93661470185..6499e8f1291d 100644
--- a/frmts/gxf/gxf_proj4.c
+++ b/frmts/gxf/gxf_proj4.c
@@ -9,23 +9,7 @@
  * Copyright (c) 1998, Global Geomatics
  * Copyright (c) 1998, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gxfopen.h"
diff --git a/frmts/gxf/gxfdataset.cpp b/frmts/gxf/gxfdataset.cpp
index da1fac6afc8a..67a8c18af5f2 100644
--- a/frmts/gxf/gxfdataset.cpp
+++ b/frmts/gxf/gxfdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, Frank Warmerdam
  * Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_frmts.h"
diff --git a/frmts/gxf/gxfopen.c b/frmts/gxf/gxfopen.c
index e53b0c054ae3..abb131481071 100644
--- a/frmts/gxf/gxfopen.c
+++ b/frmts/gxf/gxfopen.c
@@ -10,23 +10,7 @@
  * Copyright (c) 1998, Frank Warmerdam
  * Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/gxf/gxfopen.h b/frmts/gxf/gxfopen.h
index 9a89f365c4f1..7e591bce170e 100644
--- a/frmts/gxf/gxfopen.h
+++ b/frmts/gxf/gxfopen.h
@@ -9,23 +9,7 @@
  * Copyright (c) 1998, Global Geomatics
  * Copyright (c) 1998, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GXFOPEN_H_INCLUDED
diff --git a/frmts/hdf4/hdf-eos/gctp_wrap.c b/frmts/hdf4/hdf-eos/gctp_wrap.c
index 9b2301218a63..a3795f6a129c 100644
--- a/frmts/hdf4/hdf-eos/gctp_wrap.c
+++ b/frmts/hdf4/hdf-eos/gctp_wrap.c
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2004, Andrey Kiselev <dron@ak4719.spb.edu>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_srs_api.h"
diff --git a/frmts/hdf4/hdf4compat.h b/frmts/hdf4/hdf4compat.h
index 99c235ddc803..135dd5c06f5c 100644
--- a/frmts/hdf4/hdf4compat.h
+++ b/frmts/hdf4/hdf4compat.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Andrey Kiselev <dron@ak4719.spb.edu>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef HDF4COMPAT_H_INCLUDED_
diff --git a/frmts/hdf4/hdf4dataset.cpp b/frmts/hdf4/hdf4dataset.cpp
index 511ce177a88f..623fc76081cf 100644
--- a/frmts/hdf4/hdf4dataset.cpp
+++ b/frmts/hdf4/hdf4dataset.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2002, Andrey Kiselev <dron@ak4719.spb.edu>
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_multiproc.h"
diff --git a/frmts/hdf4/hdf4dataset.h b/frmts/hdf4/hdf4dataset.h
index 689657c23372..9660f36f7190 100644
--- a/frmts/hdf4/hdf4dataset.h
+++ b/frmts/hdf4/hdf4dataset.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Andrey Kiselev <dron@ak4719.spb.edu>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef HDF4DATASET_H_INCLUDED_
diff --git a/frmts/hdf4/hdf4drivercore.cpp b/frmts/hdf4/hdf4drivercore.cpp
index f6b7bc947734..75f9ce682925 100644
--- a/frmts/hdf4/hdf4drivercore.cpp
+++ b/frmts/hdf4/hdf4drivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault, <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "hdf4drivercore.h"
diff --git a/frmts/hdf4/hdf4drivercore.h b/frmts/hdf4/hdf4drivercore.h
index eb99e6fdfd5e..0337708b3a22 100644
--- a/frmts/hdf4/hdf4drivercore.h
+++ b/frmts/hdf4/hdf4drivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault, <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef HDF4DRIVERCORE_H
diff --git a/frmts/hdf4/hdf4imagedataset.cpp b/frmts/hdf4/hdf4imagedataset.cpp
index 7e77eabf617a..e5a6084feed8 100644
--- a/frmts/hdf4/hdf4imagedataset.cpp
+++ b/frmts/hdf4/hdf4imagedataset.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2002, Andrey Kiselev <dron@ak4719.spb.edu>
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #if defined(_WIN32) && !defined(NOMINMAX)
diff --git a/frmts/hdf4/hdf4multidim.cpp b/frmts/hdf4/hdf4multidim.cpp
index 2daa4bb6e0cd..c725e660c482 100644
--- a/frmts/hdf4/hdf4multidim.cpp
+++ b/frmts/hdf4/hdf4multidim.cpp
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2019, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "hdf4dataset.h"
diff --git a/frmts/hdf5/bagdataset.cpp b/frmts/hdf5/bagdataset.cpp
index 7fceddf017ca..acabb44bbe41 100644
--- a/frmts/hdf5/bagdataset.cpp
+++ b/frmts/hdf5/bagdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2009, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2018, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -47,6 +31,7 @@
 #include "rat.h"
 
 #include <cassert>
+#include <cmath>
 #include <algorithm>
 #include <limits>
 #include <map>
@@ -2248,7 +2233,7 @@ CPLErr BAGGeorefMDBandBase::IReadBlockFromElevBand(int nBlockXOff,
         {
             pbyImage[y * nBlockXSize + x] =
                 (afData[y * nBlockXSize + x] == fNoDataValue ||
-                 CPLIsNan(afData[y * nBlockXSize + x]))
+                 std::isnan(afData[y * nBlockXSize + x]))
                     ? 0
                     : 1;
         }
@@ -5277,11 +5262,11 @@ CPLString BAGCreator::GenerateMetadata(int nXSize, int nYSize,
     }
 
     osOptions.SetNameValue("VAR_RESX",
-                           CPLSPrintf("%.18g", padfGeoTransform[1]));
+                           CPLSPrintf("%.17g", padfGeoTransform[1]));
     osOptions.SetNameValue("VAR_RESY",
-                           CPLSPrintf("%.18g", fabs(padfGeoTransform[5])));
+                           CPLSPrintf("%.17g", fabs(padfGeoTransform[5])));
     osOptions.SetNameValue(
-        "VAR_RES", CPLSPrintf("%.18g", std::max(padfGeoTransform[1],
+        "VAR_RES", CPLSPrintf("%.17g", std::max(padfGeoTransform[1],
                                                 fabs(padfGeoTransform[5]))));
 
     char *pszProjection = nullptr;
@@ -5345,7 +5330,7 @@ CPLString BAGCreator::GenerateMetadata(int nXSize, int nYSize,
     }
     osOptions.SetNameValue(
         "VAR_CORNER_POINTS",
-        CPLSPrintf("%.18g,%.18g %.18g,%.18g", dfMinX, dfMinY, dfMaxX, dfMaxY));
+        CPLSPrintf("%.17g,%.17g %.17g,%.17g", dfMinX, dfMinY, dfMaxX, dfMaxY));
 
     double adfCornerX[4] = {dfMinX, dfMinX, dfMaxX, dfMaxX};
     double adfCornerY[4] = {dfMinY, dfMaxY, dfMaxY, dfMinY};
@@ -5372,10 +5357,10 @@ CPLString BAGCreator::GenerateMetadata(int nXSize, int nYSize,
                              std::max(adfCornerX[2], adfCornerX[3]));
     double dfNorth = std::max(std::max(adfCornerY[0], adfCornerY[1]),
                               std::max(adfCornerY[2], adfCornerY[3]));
-    osOptions.SetNameValue("VAR_WEST_LONGITUDE", CPLSPrintf("%.18g", dfWest));
-    osOptions.SetNameValue("VAR_SOUTH_LATITUDE", CPLSPrintf("%.18g", dfSouth));
-    osOptions.SetNameValue("VAR_EAST_LONGITUDE", CPLSPrintf("%.18g", dfEast));
-    osOptions.SetNameValue("VAR_NORTH_LATITUDE", CPLSPrintf("%.18g", dfNorth));
+    osOptions.SetNameValue("VAR_WEST_LONGITUDE", CPLSPrintf("%.17g", dfWest));
+    osOptions.SetNameValue("VAR_SOUTH_LATITUDE", CPLSPrintf("%.17g", dfSouth));
+    osOptions.SetNameValue("VAR_EAST_LONGITUDE", CPLSPrintf("%.17g", dfEast));
+    osOptions.SetNameValue("VAR_NORTH_LATITUDE", CPLSPrintf("%.17g", dfNorth));
 
     if (!SubstituteVariables(psMain, osOptions.List()))
     {
diff --git a/frmts/hdf5/gh5_convenience.cpp b/frmts/hdf5/gh5_convenience.cpp
index 304032e08e3f..229d86846435 100644
--- a/frmts/hdf5/gh5_convenience.cpp
+++ b/frmts/hdf5/gh5_convenience.cpp
@@ -7,25 +7,10 @@
  ******************************************************************************
  * Copyright (c) 2009, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
+#include "cpl_float.h"
 #include "gh5_convenience.h"
 
 /************************************************************************/
@@ -193,7 +178,7 @@ bool GH5_FetchAttribute(hid_t loc_id, const char *pszAttrName, double &dfResult,
         {
             CPLDebug("HDF5",
                      "Loss of accuracy when reading attribute %s. "
-                     "Value " CPL_FRMT_GIB " will be read as %.18g",
+                     "Value " CPL_FRMT_GIB " will be read as %.17g",
                      pszAttrName, static_cast<GIntBig>(nVal), dfResult);
         }
     }
@@ -205,10 +190,20 @@ bool GH5_FetchAttribute(hid_t loc_id, const char *pszAttrName, double &dfResult,
         {
             CPLDebug("HDF5",
                      "Loss of accuracy when reading attribute %s. "
-                     "Value " CPL_FRMT_GUIB " will be read as %.18g",
+                     "Value " CPL_FRMT_GUIB " will be read as %.17g",
                      pszAttrName, static_cast<GUIntBig>(nVal), dfResult);
         }
     }
+#ifdef HDF5_HAVE_FLOAT16
+    else if (H5Tequal(H5T_NATIVE_FLOAT16, hAttrNativeType))
+    {
+        const uint16_t nVal16 = *((uint16_t *)buf);
+        const uint32_t nVal32 = CPLHalfToFloat(nVal16);
+        float fVal;
+        memcpy(&fVal, &nVal32, sizeof(fVal));
+        dfResult = fVal;
+    }
+#endif
     else if (H5Tequal(H5T_NATIVE_FLOAT, hAttrNativeType))
         dfResult = *((float *)buf);
     else if (H5Tequal(H5T_NATIVE_DOUBLE, hAttrNativeType))
diff --git a/frmts/hdf5/gh5_convenience.h b/frmts/hdf5/gh5_convenience.h
index 1a536a52acd4..026b113c13b2 100644
--- a/frmts/hdf5/gh5_convenience.h
+++ b/frmts/hdf5/gh5_convenience.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2009, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GH5_CONVENIENCE_H_INCLUDED_
diff --git a/frmts/hdf5/hdf5_api.h b/frmts/hdf5/hdf5_api.h
index 013534310488..7cd02c4df293 100644
--- a/frmts/hdf5/hdf5_api.h
+++ b/frmts/hdf5/hdf5_api.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2018, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef HDF5_API_H
@@ -46,6 +30,10 @@
 
 #include "hdf5.h"
 
+#if defined(H5T_NATIVE_FLOAT16) && defined(H5_HAVE__FLOAT16)
+#define HDF5_HAVE_FLOAT16
+#endif
+
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
diff --git a/frmts/hdf5/hdf5dataset.cpp b/frmts/hdf5/hdf5dataset.cpp
index 499b8a86c877..7371aebb5e06 100644
--- a/frmts/hdf5/hdf5dataset.cpp
+++ b/frmts/hdf5/hdf5dataset.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2018, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -44,6 +28,7 @@
 
 #include "cpl_conv.h"
 #include "cpl_error.h"
+#include "cpl_float.h"
 #include "cpl_string.h"
 #include "gdal.h"
 #include "gdal_frmts.h"
@@ -201,6 +186,10 @@ GDALDataType HDF5Dataset::GetDataType(hid_t TypeID)
             return GDT_Unknown;
 #endif
         }
+#ifdef HDF5_HAVE_FLOAT16
+        else if (H5Tequal(H5T_NATIVE_FLOAT16, TypeID))
+            return GDT_Float32;
+#endif
         else if (H5Tequal(H5T_NATIVE_FLOAT, TypeID))
             return GDT_Float32;
         else if (H5Tequal(H5T_NATIVE_DOUBLE, TypeID))
@@ -258,6 +247,10 @@ GDALDataType HDF5Dataset::GetDataType(hid_t TypeID)
             eDataType = GDT_Unknown;
 #endif
         }
+#ifdef HDF5_HAVE_FLOAT16
+        else if (H5Tequal(H5T_NATIVE_FLOAT16, ElemTypeID))
+            eDataType = GDT_CFloat32;
+#endif
         else if (H5Tequal(H5T_NATIVE_FLOAT, ElemTypeID))
             eDataType = GDT_CFloat32;
         else if (H5Tequal(H5T_NATIVE_DOUBLE, ElemTypeID))
@@ -272,6 +265,32 @@ GDALDataType HDF5Dataset::GetDataType(hid_t TypeID)
     return GDT_Unknown;
 }
 
+/************************************************************************/
+/*                          IsNativeCFloat16()                          */
+/************************************************************************/
+
+/* static*/ bool HDF5Dataset::IsNativeCFloat16(hid_t hDataType)
+{
+#ifdef HDF5_HAVE_FLOAT16
+    // For complex the compound type must contain 2 elements
+    if (H5Tget_class(hDataType) != H5T_COMPOUND ||
+        H5Tget_nmembers(hDataType) != 2)
+        return false;
+
+    // For complex the native types of both elements should be the same
+    hid_t ElemTypeID = H5Tget_member_type(hDataType, 0);
+    hid_t Elem2TypeID = H5Tget_member_type(hDataType, 1);
+    const bool bRet = H5Tequal(ElemTypeID, H5T_NATIVE_FLOAT16) > 0 &&
+                      H5Tequal(Elem2TypeID, H5T_NATIVE_FLOAT16) > 0;
+    H5Tclose(ElemTypeID);
+    H5Tclose(Elem2TypeID);
+    return bRet;
+#else
+    CPL_IGNORE_RET_VAL(hDataType);
+    return false;
+#endif
+}
+
 /************************************************************************/
 /*                          GetDataTypeName()                           */
 /*                                                                      */
@@ -304,6 +323,10 @@ const char *HDF5Dataset::GetDataTypeName(hid_t TypeID)
             return "32/64-bit integer";
         else if (H5Tequal(H5T_NATIVE_ULONG, TypeID))
             return "32/64-bit unsigned integer";
+#ifdef HDF5_HAVE_FLOAT16
+        else if (H5Tequal(H5T_NATIVE_FLOAT16, TypeID))
+            return "16-bit floating-point";
+#endif
         else if (H5Tequal(H5T_NATIVE_FLOAT, TypeID))
             return "32-bit floating-point";
         else if (H5Tequal(H5T_NATIVE_DOUBLE, TypeID))
@@ -348,6 +371,13 @@ const char *HDF5Dataset::GetDataTypeName(hid_t TypeID)
             H5Tclose(ElemTypeID);
             return "complex, 32/64-bit integer";
         }
+#ifdef HDF5_HAVE_FLOAT16
+        else if (H5Tequal(H5T_NATIVE_FLOAT16, ElemTypeID))
+        {
+            H5Tclose(ElemTypeID);
+            return "complex, 16-bit floating-point";
+        }
+#endif
         else if (H5Tequal(H5T_NATIVE_FLOAT, ElemTypeID))
         {
             H5Tclose(ElemTypeID);
@@ -1132,6 +1162,28 @@ static herr_t HDF5AttrIterate(hid_t hH5ObjID, const char *pszAttrName,
                 psContext->m_osValue += szData;
             }
         }
+#ifdef HDF5_HAVE_FLOAT16
+        else if (H5Tequal(H5T_NATIVE_FLOAT16, hAttrNativeType) > 0)
+        {
+            for (hsize_t i = 0; i < nAttrElmts; i++)
+            {
+                const uint16_t nVal16 = static_cast<uint16_t *>(buf)[i];
+                const uint32_t nVal32 = CPLHalfToFloat(nVal16);
+                float fVal;
+                memcpy(&fVal, &nVal32, sizeof(fVal));
+                CPLsnprintf(szData, nDataLen, "%.8g", fVal);
+                if (psContext->m_osValue.size() > MAX_METADATA_LEN)
+                {
+                    CPLError(CE_Warning, CPLE_OutOfMemory,
+                             "Header data too long. Truncated");
+                    break;
+                }
+                if (i > 0)
+                    psContext->m_osValue += ' ';
+                psContext->m_osValue += szData;
+            }
+        }
+#endif
         else if (H5Tequal(H5T_NATIVE_FLOAT, hAttrNativeType) > 0)
         {
             for (hsize_t i = 0; i < nAttrElmts; i++)
diff --git a/frmts/hdf5/hdf5dataset.h b/frmts/hdf5/hdf5dataset.h
index dc9245b4ca31..cf271945ac83 100644
--- a/frmts/hdf5/hdf5dataset.h
+++ b/frmts/hdf5/hdf5dataset.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef HDF5DATASET_H_INCLUDED_
@@ -240,8 +224,6 @@ class HDF5Dataset CPL_NON_FINAL : public GDALPamDataset
     char *CreatePath(HDF5GroupObjects *);
     static void DestroyH5Objects(HDF5GroupObjects *);
 
-    static const char *GetDataTypeName(hid_t);
-
     /**
      * Reads an array of double attributes from the HDF5 metadata.
      * It reads the attributes directly on its binary form directly,
@@ -275,6 +257,8 @@ class HDF5Dataset CPL_NON_FINAL : public GDALPamDataset
     static std::shared_ptr<GDALGroup> OpenGroup(
         const std::shared_ptr<GDAL::HDF5SharedResources> &poSharedResources);
 
+    static bool IsNativeCFloat16(hid_t hDataType);
+    static const char *GetDataTypeName(hid_t);
     static GDALDataType GetDataType(hid_t);
 };
 
diff --git a/frmts/hdf5/hdf5drivercore.cpp b/frmts/hdf5/hdf5drivercore.cpp
index fc5086281e51..41d23084cca5 100644
--- a/frmts/hdf5/hdf5drivercore.cpp
+++ b/frmts/hdf5/hdf5drivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault, <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "hdf5drivercore.h"
@@ -59,17 +43,12 @@ int HDF5DatasetIdentify(GDALOpenInfo *poOpenInfo)
             GDALGetDriverByName("netCDF") != nullptr)
         {
             const char *const apszAllowedDriver[] = {"netCDF", nullptr};
-            CPLPushErrorHandler(CPLQuietErrorHandler);
-            GDALDatasetH hDS = GDALOpenEx(
-                poOpenInfo->pszFilename,
-                GDAL_OF_RASTER | GDAL_OF_MULTIDIM_RASTER | GDAL_OF_VECTOR,
-                apszAllowedDriver, nullptr, nullptr);
-            CPLPopErrorHandler();
-            if (hDS)
-            {
-                GDALClose(hDS);
-                return true;
-            }
+            CPLErrorStateBackuper oErrorStateBackuper(CPLQuietErrorHandler);
+            return std::unique_ptr<GDALDataset>(GDALDataset::Open(
+                       poOpenInfo->pszFilename,
+                       GDAL_OF_RASTER | GDAL_OF_MULTIDIM_RASTER |
+                           GDAL_OF_VECTOR,
+                       apszAllowedDriver, nullptr, nullptr)) != nullptr;
         }
         return false;
     };
@@ -78,6 +57,11 @@ int HDF5DatasetIdentify(GDALOpenInfo *poOpenInfo)
         (poOpenInfo->nHeaderBytes > 512 + 8 &&
          memcmp(poOpenInfo->pabyHeader + 512, achSignature, 8) == 0))
     {
+        if (poOpenInfo->IsSingleAllowedDriver("HDF5"))
+        {
+            return TRUE;
+        }
+
         // The tests to avoid opening KEA and BAG drivers are not
         // necessary when drivers are built in the core lib, as they
         // are registered after HDF5, but in the case of plugins, we
@@ -113,7 +97,8 @@ int HDF5DatasetIdentify(GDALOpenInfo *poOpenInfo)
     // The HDF5 signature can be at offsets 512, 1024, 2048, etc.
     if (poOpenInfo->fpL != nullptr &&
         (EQUAL(osExt, "h5") || EQUAL(osExt, "hdf5") || EQUAL(osExt, "nc") ||
-         EQUAL(osExt, "cdf") || EQUAL(osExt, "nc4")))
+         EQUAL(osExt, "cdf") || EQUAL(osExt, "nc4") ||
+         poOpenInfo->IsSingleAllowedDriver("HDF5")))
     {
         vsi_l_offset nOffset = 512;
         for (int i = 0; i < 64; i++)
@@ -126,6 +111,10 @@ int HDF5DatasetIdentify(GDALOpenInfo *poOpenInfo)
             }
             if (memcmp(abyBuf, achSignature, 8) == 0)
             {
+                if (poOpenInfo->IsSingleAllowedDriver("HDF5"))
+                {
+                    return TRUE;
+                }
                 // Avoid opening NC files if the netCDF driver is available and
                 // they are recognized by it.
                 if (IsRecognizedByNetCDFDriver())
@@ -247,9 +236,14 @@ static GDALSubdatasetInfo *HDF5DriverGetSubdatasetInfo(const char *pszFileName)
 /*                         IdentifySxx()                                */
 /************************************************************************/
 
-static bool IdentifySxx(GDALOpenInfo *poOpenInfo, const char *pszConfigOption,
+static bool IdentifySxx(GDALOpenInfo *poOpenInfo, const char *pszDriverName,
+                        const char *pszConfigOption,
                         const char *pszMainGroupName)
 {
+    if (STARTS_WITH(poOpenInfo->pszFilename, pszDriverName) &&
+        poOpenInfo->pszFilename[strlen(pszDriverName)] == ':')
+        return TRUE;
+
     // Is it an HDF5 file?
     static const char achSignature[] = "\211HDF\r\n\032\n";
 
@@ -257,6 +251,11 @@ static bool IdentifySxx(GDALOpenInfo *poOpenInfo, const char *pszConfigOption,
         memcmp(poOpenInfo->pabyHeader, achSignature, 8) != 0)
         return FALSE;
 
+    if (poOpenInfo->IsSingleAllowedDriver(pszDriverName))
+    {
+        return TRUE;
+    }
+
     // GDAL_Sxxx_IDENTIFY can be set to NO only for tests, to test that
     // HDF5Dataset::Open() can redirect to Sxxx if the below logic fails
     if (CPLTestBool(CPLGetConfigOption(pszConfigOption, "YES")))
@@ -303,10 +302,8 @@ static bool IdentifySxx(GDALOpenInfo *poOpenInfo, const char *pszConfigOption,
 int S102DatasetIdentify(GDALOpenInfo *poOpenInfo)
 
 {
-    if (STARTS_WITH(poOpenInfo->pszFilename, "S102:"))
-        return TRUE;
-
-    return IdentifySxx(poOpenInfo, "GDAL_S102_IDENTIFY", "BathymetryCoverage");
+    return IdentifySxx(poOpenInfo, "S102", "GDAL_S102_IDENTIFY",
+                       "BathymetryCoverage");
 }
 
 /************************************************************************/
@@ -316,10 +313,7 @@ int S102DatasetIdentify(GDALOpenInfo *poOpenInfo)
 int S104DatasetIdentify(GDALOpenInfo *poOpenInfo)
 
 {
-    if (STARTS_WITH(poOpenInfo->pszFilename, "S104:"))
-        return TRUE;
-
-    return IdentifySxx(poOpenInfo, "GDAL_S104_IDENTIFY", "WaterLevel");
+    return IdentifySxx(poOpenInfo, "S104", "GDAL_S104_IDENTIFY", "WaterLevel");
 }
 
 /************************************************************************/
@@ -329,10 +323,8 @@ int S104DatasetIdentify(GDALOpenInfo *poOpenInfo)
 int S111DatasetIdentify(GDALOpenInfo *poOpenInfo)
 
 {
-    if (STARTS_WITH(poOpenInfo->pszFilename, "S111:"))
-        return TRUE;
-
-    return IdentifySxx(poOpenInfo, "GDAL_S111_IDENTIFY", "SurfaceCurrent");
+    return IdentifySxx(poOpenInfo, "S111", "GDAL_S111_IDENTIFY",
+                       "SurfaceCurrent");
 }
 
 /************************************************************************/
@@ -354,7 +346,13 @@ int BAGDatasetIdentify(GDALOpenInfo *poOpenInfo)
 
     // Does it have the extension .bag?
     if (!EQUAL(CPLGetExtension(poOpenInfo->pszFilename), "bag"))
+    {
+        if (poOpenInfo->IsSingleAllowedDriver("BAG"))
+        {
+            return TRUE;
+        }
         return FALSE;
+    }
 
     return TRUE;
 }
diff --git a/frmts/hdf5/hdf5drivercore.h b/frmts/hdf5/hdf5drivercore.h
index f779ba1544ce..bf4909dae611 100644
--- a/frmts/hdf5/hdf5drivercore.h
+++ b/frmts/hdf5/hdf5drivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault, <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef HDF5DRIVERCORE_H
diff --git a/frmts/hdf5/hdf5eosparser.cpp b/frmts/hdf5/hdf5eosparser.cpp
index 04b14df5d060..5fecc7f6dcbc 100644
--- a/frmts/hdf5/hdf5eosparser.cpp
+++ b/frmts/hdf5/hdf5eosparser.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_error.h"
diff --git a/frmts/hdf5/hdf5eosparser.h b/frmts/hdf5/hdf5eosparser.h
index fb4217845e40..1ccb3f3e5c4a 100644
--- a/frmts/hdf5/hdf5eosparser.h
+++ b/frmts/hdf5/hdf5eosparser.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef HDF5EOSPARSER_H_INCLUDED
diff --git a/frmts/hdf5/hdf5imagedataset.cpp b/frmts/hdf5/hdf5imagedataset.cpp
index 64a2c33917ea..73d7a2e92bb7 100644
--- a/frmts/hdf5/hdf5imagedataset.cpp
+++ b/frmts/hdf5/hdf5imagedataset.cpp
@@ -8,27 +8,12 @@
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "hdf5_api.h"
 
+#include "cpl_float.h"
 #include "cpl_string.h"
 #include "gdal_frmts.h"
 #include "gdal_pam.h"
@@ -72,9 +57,10 @@ class HDF5ImageDataset final : public HDF5Dataset
     int dimensions;
     hid_t dataset_id;
     hid_t dataspace_id;
-    hsize_t size;
-    hid_t datatype;
     hid_t native;
+#ifdef HDF5_HAVE_FLOAT16
+    bool m_bConvertFromFloat16 = false;
+#endif
     Hdf5ProductType iSubdatasetType;
     HDF5CSKProductEnum iCSKProductType;
     double adfGeoTransform[6];
@@ -209,9 +195,9 @@ class HDF5ImageDataset final : public HDF5Dataset
 /************************************************************************/
 HDF5ImageDataset::HDF5ImageDataset()
     : dims(nullptr), maxdims(nullptr), poH5Objects(nullptr), ndims(0),
-      dimensions(0), dataset_id(-1), dataspace_id(-1), size(0), datatype(-1),
-      native(-1), iSubdatasetType(UNKNOWN_PRODUCT),
-      iCSKProductType(PROD_UNKNOWN), bHasGeoTransform(false)
+      dimensions(0), dataset_id(-1), dataspace_id(-1), native(-1),
+      iSubdatasetType(UNKNOWN_PRODUCT), iCSKProductType(PROD_UNKNOWN),
+      bHasGeoTransform(false)
 {
     m_oSRS.SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
     m_oGCPSRS.SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
@@ -236,8 +222,6 @@ HDF5ImageDataset::~HDF5ImageDataset()
         H5Dclose(dataset_id);
     if (dataspace_id > 0)
         H5Sclose(dataspace_id);
-    if (datatype > 0)
-        H5Tclose(datatype);
     if (native > 0)
         H5Tclose(native);
 
@@ -465,6 +449,42 @@ CPLErr HDF5ImageRasterBand::IReadBlock(int nBlockXOff, int nBlockYOff,
         return CE_Failure;
     }
 
+#ifdef HDF5_HAVE_FLOAT16
+    if (eDataType == GDT_Float32 && poGDS->m_bConvertFromFloat16)
+    {
+        for (size_t i = static_cast<size_t>(nBlockXSize) * nBlockYSize; i > 0;
+             /* do nothing */)
+        {
+            --i;
+            uint16_t nVal16;
+            memcpy(&nVal16, static_cast<uint16_t *>(pImage) + i,
+                   sizeof(nVal16));
+            const uint32_t nVal32 = CPLHalfToFloat(nVal16);
+            float fVal;
+            memcpy(&fVal, &nVal32, sizeof(fVal));
+            *(static_cast<float *>(pImage) + i) = fVal;
+        }
+    }
+    else if (eDataType == GDT_CFloat32 && poGDS->m_bConvertFromFloat16)
+    {
+        for (size_t i = static_cast<size_t>(nBlockXSize) * nBlockYSize; i > 0;
+             /* do nothing */)
+        {
+            --i;
+            for (int j = 1; j >= 0; --j)
+            {
+                uint16_t nVal16;
+                memcpy(&nVal16, static_cast<uint16_t *>(pImage) + 2 * i + j,
+                       sizeof(nVal16));
+                const uint32_t nVal32 = CPLHalfToFloat(nVal16);
+                float fVal;
+                memcpy(&fVal, &nVal32, sizeof(fVal));
+                *(static_cast<float *>(pImage) + 2 * i + j) = fVal;
+            }
+        }
+    }
+#endif
+
     return CE_None;
 }
 
@@ -482,6 +502,15 @@ CPLErr HDF5ImageRasterBand::IRasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff,
 {
     HDF5ImageDataset *poGDS = static_cast<HDF5ImageDataset *>(poDS);
 
+#ifdef HDF5_HAVE_FLOAT16
+    if (poGDS->m_bConvertFromFloat16)
+    {
+        return GDALPamRasterBand::IRasterIO(
+            eRWFlag, nXOff, nYOff, nXSize, nYSize, pData, nBufXSize, nBufYSize,
+            eBufType, nPixelSpace, nLineSpace, psExtraArg);
+    }
+#endif
+
     const bool bIsBandInterleavedData =
         poGDS->ndims == 3 && poGDS->m_nOtherDimIndex == 0 &&
         poGDS->GetYIndex() == 1 && poGDS->GetXIndex() == 2;
@@ -761,6 +790,16 @@ CPLErr HDF5ImageDataset::IRasterIO(
     GSpacing nLineSpace, GSpacing nBandSpace, GDALRasterIOExtraArg *psExtraArg)
 
 {
+#ifdef HDF5_HAVE_FLOAT16
+    if (m_bConvertFromFloat16)
+    {
+        return HDF5Dataset::IRasterIO(eRWFlag, nXOff, nYOff, nXSize, nYSize,
+                                      pData, nBufXSize, nBufYSize, eBufType,
+                                      nBandCount, panBandMap, nPixelSpace,
+                                      nLineSpace, nBandSpace, psExtraArg);
+    }
+#endif
+
     const auto IsConsecutiveBands = [](const int *panVals, int nCount)
     {
         for (int i = 1; i < nCount; ++i)
@@ -1021,9 +1060,25 @@ GDALDataset *HDF5ImageDataset::Open(GDALOpenInfo *poOpenInfo)
         static_cast<hsize_t *>(CPLCalloc(poDS->ndims, sizeof(hsize_t)));
     poDS->dimensions = H5Sget_simple_extent_dims(poDS->dataspace_id, poDS->dims,
                                                  poDS->maxdims);
-    poDS->datatype = H5Dget_type(poDS->dataset_id);
-    poDS->size = H5Tget_size(poDS->datatype);
-    poDS->native = H5Tget_native_type(poDS->datatype, H5T_DIR_ASCEND);
+    auto datatype = H5Dget_type(poDS->dataset_id);
+    poDS->native = H5Tget_native_type(datatype, H5T_DIR_ASCEND);
+    H5Tclose(datatype);
+
+    const auto eGDALDataType = poDS->GetDataType(poDS->native);
+    if (eGDALDataType == GDT_Unknown)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Unhandled HDF5 data type");
+        delete poDS;
+        return nullptr;
+    }
+
+#ifdef HDF5_HAVE_FLOAT16
+    if (H5Tequal(H5T_NATIVE_FLOAT16, poDS->native) ||
+        IsNativeCFloat16(poDS->native))
+    {
+        poDS->m_bConvertFromFloat16 = true;
+    }
+#endif
 
     // CSK code in IdentifyProductType() and CreateProjections()
     // uses dataset metadata.
@@ -1153,34 +1208,53 @@ GDALDataset *HDF5ImageDataset::Open(GDALOpenInfo *poOpenInfo)
     {
         HDF5Dataset::CreateMetadata(poDS->m_hHDF5, poDS->poH5Objects,
                                     H5G_DATASET, false, aosMetadata);
-        if (nBands > 1)
+        if (nBands > 1 && poDS->nRasterXSize != nBands &&
+            poDS->nRasterYSize != nBands)
         {
-            // Logic specific of Planet data cubes with per-band metadata items
-            static const struct
-            {
-                const char *pszSrcName;
-                const char *pszDstName;
-            } asItems[] = {
-                {"calibration_coefficients", "calibration_coefficient"},
-                {"center_wavelengths", "center_wavelength"},
-                {"fwhm", "fwhm"},
-                {"bad_band_list", "bad_band"},
-            };
-
-            for (const auto &sItem : asItems)
+            // Heuristics to detect non-scalar attributes, that are intended
+            // to be attached to a specific band.
+            const CPLStringList aosMetadataDup(aosMetadata);
+            for (const auto &[pszKey, pszValue] :
+                 cpl::IterateNameValue(aosMetadataDup))
             {
-                const char *pszVal =
-                    aosMetadata.FetchNameValue(sItem.pszSrcName);
-                if (pszVal)
+                const hid_t hAttrID = H5Aopen_name(poDS->dataset_id, pszKey);
+                const hid_t hAttrSpace = H5Aget_space(hAttrID);
+                if (H5Sget_simple_extent_ndims(hAttrSpace) == 1 &&
+                    H5Sget_simple_extent_npoints(hAttrSpace) == nBands)
                 {
-                    CPLStringList aosTokens(CSLTokenizeString2(pszVal, " ", 0));
+                    CPLStringList aosTokens(
+                        CSLTokenizeString2(pszValue, " ", 0));
                     if (aosTokens.size() == nBands)
                     {
-                        oMapBandSpecificMetadata[sItem.pszDstName] =
+                        std::string osAttrName(pszKey);
+                        if (osAttrName.size() > strlen("_coefficients") &&
+                            osAttrName.substr(osAttrName.size() -
+                                              strlen("_coefficients")) ==
+                                "_coefficients")
+                        {
+                            osAttrName.pop_back();
+                        }
+                        else if (osAttrName.size() > strlen("_wavelengths") &&
+                                 osAttrName.substr(osAttrName.size() -
+                                                   strlen("_wavelengths")) ==
+                                     "_wavelengths")
+                        {
+                            osAttrName.pop_back();
+                        }
+                        else if (osAttrName.size() > strlen("_list") &&
+                                 osAttrName.substr(osAttrName.size() -
+                                                   strlen("_list")) == "_list")
+                        {
+                            osAttrName.resize(osAttrName.size() -
+                                              strlen("_list"));
+                        }
+                        oMapBandSpecificMetadata[osAttrName] =
                             std::move(aosTokens);
-                        aosMetadata.SetNameValue(sItem.pszSrcName, nullptr);
+                        aosMetadata.SetNameValue(pszKey, nullptr);
                     }
                 }
+                H5Sclose(hAttrSpace);
+                H5Aclose(hAttrID);
             }
         }
     }
@@ -1239,8 +1313,8 @@ GDALDataset *HDF5ImageDataset::Open(GDALOpenInfo *poOpenInfo)
 
     for (int i = 0; i < nBands; i++)
     {
-        HDF5ImageRasterBand *const poBand = new HDF5ImageRasterBand(
-            poDS, i + 1, poDS->GetDataType(poDS->native));
+        HDF5ImageRasterBand *const poBand =
+            new HDF5ImageRasterBand(poDS, i + 1, eGDALDataType);
 
         poDS->SetBand(i + 1, poBand);
 
diff --git a/frmts/hdf5/hdf5multidim.cpp b/frmts/hdf5/hdf5multidim.cpp
index fa27ff79a051..9706d920e46e 100644
--- a/frmts/hdf5/hdf5multidim.cpp
+++ b/frmts/hdf5/hdf5multidim.cpp
@@ -6,29 +6,15 @@
  ******************************************************************************
  * Copyright (c) 2019, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "hdf5dataset.h"
 #include "hdf5eosparser.h"
 #include "s100.h"
 
+#include "cpl_float.h"
+
 #include <algorithm>
 #include <set>
 #include <utility>
@@ -159,7 +145,16 @@ BuildDataType(hid_t hDataType, bool &bHasString, bool &bNonNativeDataType,
     const auto klass = H5Tget_class(hDataType);
     GDALDataType eDT = ::HDF5Dataset::GetDataType(hDataType);
     if (eDT != GDT_Unknown)
+    {
+#ifdef HDF5_HAVE_FLOAT16
+        if (H5Tequal(hDataType, H5T_NATIVE_FLOAT16) ||
+            HDF5Dataset::IsNativeCFloat16(hDataType))
+        {
+            bNonNativeDataType = true;
+        }
+#endif
         return GDALExtendedDataType::Create(eDT);
+    }
     else if (klass == H5T_STRING)
     {
         bHasString = true;
@@ -1059,17 +1054,28 @@ HDF5Array::HDF5Array(const std::string &osParentName, const std::string &osName,
     }
 
     // Special case for S102 QualityOfSurvey nodata value that is typically at 0
-    if (GetFullName() ==
-            "/QualityOfSurvey/QualityOfSurvey.01/Group_001/values" &&
-        m_dt.GetClass() == GEDTC_NUMERIC &&
-        m_dt.GetNumericDataType() == GDT_UInt32)
+    const bool bIsQualityOfSurvey =
+        (GetFullName() ==
+         "/QualityOfSurvey/QualityOfSurvey.01/Group_001/values");
+    const bool bIsQualityOfBathymetryCoverage =
+        (GetFullName() == "/QualityOfBathymetryCoverage/"
+                          "QualityOfBathymetryCoverage.01/Group_001/values");
+    if ((bIsQualityOfSurvey || bIsQualityOfBathymetryCoverage) &&
+        ((m_dt.GetClass() == GEDTC_NUMERIC &&
+          m_dt.GetNumericDataType() == GDT_UInt32) ||
+         (m_dt.GetClass() == GEDTC_COMPOUND &&
+          m_dt.GetComponents().size() == 1 &&
+          m_dt.GetComponents()[0]->GetType().GetClass() == GEDTC_NUMERIC &&
+          m_dt.GetComponents()[0]->GetType().GetNumericDataType() ==
+              GDT_UInt32)))
     {
         if (auto poRootGroup = HDF5Array::GetRootGroup())
         {
             if (const auto poGroupF = poRootGroup->OpenGroup("Group_F"))
             {
-                const auto poGroupFArray =
-                    poGroupF->OpenMDArray("QualityOfSurvey");
+                const auto poGroupFArray = poGroupF->OpenMDArray(
+                    bIsQualityOfSurvey ? "QualityOfSurvey"
+                                       : "QualityOfBathymetryCoverage");
                 if (poGroupFArray &&
                     poGroupFArray->GetDataType().GetClass() == GEDTC_COMPOUND &&
                     poGroupFArray->GetDataType().GetComponents().size() == 8 &&
@@ -2326,9 +2332,44 @@ static void CopyValue(const GByte *pabySrcBuffer, hid_t hSrcDataType,
     {
         if (dstDataType.GetClass() != GEDTC_COMPOUND)
         {
+            const auto eSrcDataType = ::HDF5Dataset::GetDataType(hSrcDataType);
             // Typically source is complex data type
-            auto srcDataType(GDALExtendedDataType::Create(
-                ::HDF5Dataset::GetDataType(hSrcDataType)));
+#ifdef HDF5_HAVE_FLOAT16
+            if (eSrcDataType == GDT_CFloat32 &&
+                ::HDF5Dataset::IsNativeCFloat16(hSrcDataType))
+            {
+                if (dstDataType.GetNumericDataType() == GDT_CFloat32)
+                {
+                    for (int j = 0; j <= 1; ++j)
+                    {
+                        uint16_t nVal16;
+                        memcpy(&nVal16, pabySrcBuffer + j * sizeof(nVal16),
+                               sizeof(nVal16));
+                        const uint32_t nVal32 = CPLHalfToFloat(nVal16);
+                        memcpy(pabyDstBuffer + j * sizeof(float), &nVal32,
+                               sizeof(nVal32));
+                    }
+                }
+                else if (dstDataType.GetNumericDataType() == GDT_CFloat64)
+                {
+                    for (int j = 0; j <= 1; ++j)
+                    {
+                        uint16_t nVal16;
+                        memcpy(&nVal16, pabySrcBuffer + j * sizeof(nVal16),
+                               sizeof(nVal16));
+                        const uint32_t nVal32 = CPLHalfToFloat(nVal16);
+                        float fVal;
+                        memcpy(&fVal, &nVal32, sizeof(fVal));
+                        double dfVal = fVal;
+                        memcpy(pabyDstBuffer + j * sizeof(double), &dfVal,
+                               sizeof(dfVal));
+                    }
+                }
+                return;
+            }
+
+#endif
+            auto srcDataType(GDALExtendedDataType::Create(eSrcDataType));
             if (srcDataType.GetClass() == GEDTC_NUMERIC &&
                 srcDataType.GetNumericDataType() != GDT_Unknown)
             {
@@ -2364,6 +2405,19 @@ static void CopyValue(const GByte *pabySrcBuffer, hid_t hSrcDataType,
         CopyValue(pabySrcBuffer, hParent, pabyDstBuffer, dstDataType, {});
         H5Tclose(hParent);
     }
+#ifdef HDF5_HAVE_FLOAT16
+    else if (H5Tequal(hSrcDataType, H5T_NATIVE_FLOAT16))
+    {
+        uint16_t nVal16;
+        memcpy(&nVal16, pabySrcBuffer, sizeof(nVal16));
+        const uint32_t nVal32 = CPLHalfToFloat(nVal16);
+        float fVal;
+        memcpy(&fVal, &nVal32, sizeof(fVal));
+        GDALExtendedDataType::CopyValue(
+            &fVal, GDALExtendedDataType::Create(GDT_Float32), pabyDstBuffer,
+            dstDataType);
+    }
+#endif
     else
     {
         GDALDataType eDT = ::HDF5Dataset::GetDataType(hSrcDataType);
diff --git a/frmts/hdf5/hdf5vfl.h b/frmts/hdf5/hdf5vfl.h
index d43b21b8c132..3c226481b54b 100644
--- a/frmts/hdf5/hdf5vfl.h
+++ b/frmts/hdf5/hdf5vfl.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2008-2018, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 // This file contains the Virtual File Layer implementation that calls through
diff --git a/frmts/hdf5/iso19115_srs.cpp b/frmts/hdf5/iso19115_srs.cpp
index 743289b9a537..e6c3476c252f 100644
--- a/frmts/hdf5/iso19115_srs.cpp
+++ b/frmts/hdf5/iso19115_srs.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2009, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/hdf5/iso19115_srs.h b/frmts/hdf5/iso19115_srs.h
index fd9be64e5739..81e9835bafb5 100644
--- a/frmts/hdf5/iso19115_srs.h
+++ b/frmts/hdf5/iso19115_srs.h
@@ -11,23 +11,7 @@
  * Copyright (c) 2009, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef ISO19155_SRS_H_INCLUDED_
diff --git a/frmts/hdf5/rat.cpp b/frmts/hdf5/rat.cpp
index af5f75b73f35..4e23e848d32b 100644
--- a/frmts/hdf5/rat.cpp
+++ b/frmts/hdf5/rat.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "rat.h"
diff --git a/frmts/hdf5/rat.h b/frmts/hdf5/rat.h
index 38959cfb7f4f..8c554001a61b 100644
--- a/frmts/hdf5/rat.h
+++ b/frmts/hdf5/rat.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef RAT_H_INCLUDED
diff --git a/frmts/hdf5/s100.cpp b/frmts/hdf5/s100.cpp
index 1e6eda433b18..86762b3a921d 100644
--- a/frmts/hdf5/s100.cpp
+++ b/frmts/hdf5/s100.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "s100.h"
diff --git a/frmts/hdf5/s100.h b/frmts/hdf5/s100.h
index fa4959a40434..551faca12abb 100644
--- a/frmts/hdf5/s100.h
+++ b/frmts/hdf5/s100.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef S100_H
diff --git a/frmts/hdf5/s102dataset.cpp b/frmts/hdf5/s102dataset.cpp
index f062d354b0e8..12d10b998949 100644
--- a/frmts/hdf5/s102dataset.cpp
+++ b/frmts/hdf5/s102dataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -37,6 +21,7 @@
 #include "gdal_proxy.h"
 #include "gdal_rat.h"
 
+#include <cmath>
 #include <limits>
 
 /************************************************************************/
@@ -45,8 +30,8 @@
 
 class S102Dataset final : public S100BaseDataset
 {
-    bool OpenQualityOfSurvey(GDALOpenInfo *poOpenInfo,
-                             const std::shared_ptr<GDALGroup> &poRootGroup);
+    bool OpenQuality(GDALOpenInfo *poOpenInfo,
+                     const std::shared_ptr<GDALGroup> &poRootGroup);
 
   public:
     explicit S102Dataset(const std::string &osFilename)
@@ -168,7 +153,7 @@ GDALDataset *S102Dataset::Open(GDALOpenInfo *poOpenInfo)
 
     std::string osFilename(poOpenInfo->pszFilename);
     bool bIsSubdataset = false;
-    bool bIsQualityOfSurvey = false;
+    bool bIsQuality = false;
     if (STARTS_WITH(poOpenInfo->pszFilename, "S102:"))
     {
         const CPLStringList aosTokens(
@@ -187,9 +172,10 @@ GDALDataset *S102Dataset::Open(GDALOpenInfo *poOpenInfo)
             {
                 // Default dataset
             }
-            else if (EQUAL(aosTokens[2], "QualityOfSurvey"))
+            else if (EQUAL(aosTokens[2], "QualityOfSurvey") ||  // < v3
+                     EQUAL(aosTokens[2], "QualityOfBathymetryCoverage"))  // v3
             {
-                bIsQualityOfSurvey = true;
+                bIsQuality = true;
             }
             else
             {
@@ -219,9 +205,9 @@ GDALDataset *S102Dataset::Open(GDALOpenInfo *poOpenInfo)
     const bool bNorthUp = CPLTestBool(
         CSLFetchNameValueDef(poOpenInfo->papszOpenOptions, "NORTH_UP", "YES"));
 
-    if (bIsQualityOfSurvey)
+    if (bIsQuality)
     {
-        if (!poDS->OpenQualityOfSurvey(poOpenInfo, poRootGroup))
+        if (!poDS->OpenQuality(poOpenInfo, poRootGroup))
             return nullptr;
 
         // Setup/check for pam .aux.xml.
@@ -375,12 +361,21 @@ GDALDataset *S102Dataset::Open(GDALOpenInfo *poOpenInfo)
 
     poDS->GDALDataset::SetMetadataItem(GDALMD_AREA_OR_POINT, GDALMD_AOP_POINT);
 
-    auto poGroupQualityOfSurvey = poRootGroup->OpenGroup("QualityOfSurvey");
-    if (!bIsSubdataset && poGroupQualityOfSurvey)
+    auto poGroupQuality = poRootGroup->OpenGroup("QualityOfSurvey");
+    const bool bIsNamedQualityOfSurvey = poGroupQuality != nullptr;
+    if (!bIsNamedQualityOfSurvey)
     {
-        auto poGroupQualityOfSurvey01 =
-            poGroupQualityOfSurvey->OpenGroup("QualityOfSurvey.01");
-        if (poGroupQualityOfSurvey01)
+        // S102 v3 now uses QualityOfBathymetryCoverage instead of QualityOfSurvey
+        poGroupQuality = poRootGroup->OpenGroup("QualityOfBathymetryCoverage");
+    }
+    if (!bIsSubdataset && poGroupQuality)
+    {
+        const char *pszNameOfQualityGroup = bIsNamedQualityOfSurvey
+                                                ? "QualityOfSurvey"
+                                                : "QualityOfBathymetryCoverage";
+        auto poGroupQuality01 = poGroupQuality->OpenGroup(
+            CPLSPrintf("%s.01", pszNameOfQualityGroup));
+        if (poGroupQuality01)
         {
             poDS->GDALDataset::SetMetadataItem(
                 "SUBDATASET_1_NAME",
@@ -392,10 +387,12 @@ GDALDataset *S102Dataset::Open(GDALOpenInfo *poOpenInfo)
 
             poDS->GDALDataset::SetMetadataItem(
                 "SUBDATASET_2_NAME",
-                CPLSPrintf("S102:\"%s\":QualityOfSurvey", osFilename.c_str()),
+                CPLSPrintf("S102:\"%s\":%s", osFilename.c_str(),
+                           pszNameOfQualityGroup),
                 "SUBDATASETS");
             poDS->GDALDataset::SetMetadataItem(
-                "SUBDATASET_2_DESC", "Georeferenced metadata QualityOfSurvey",
+                "SUBDATASET_2_DESC",
+                CPLSPrintf("Georeferenced metadata %s", pszNameOfQualityGroup),
                 "SUBDATASETS");
         }
     }
@@ -411,34 +408,45 @@ GDALDataset *S102Dataset::Open(GDALOpenInfo *poOpenInfo)
 }
 
 /************************************************************************/
-/*                       OpenQualityOfSurvey()                          */
+/*                       OpenQuality()                          */
 /************************************************************************/
 
-bool S102Dataset::OpenQualityOfSurvey(
-    GDALOpenInfo *poOpenInfo, const std::shared_ptr<GDALGroup> &poRootGroup)
+bool S102Dataset::OpenQuality(GDALOpenInfo *poOpenInfo,
+                              const std::shared_ptr<GDALGroup> &poRootGroup)
 {
     const bool bNorthUp = CPLTestBool(
         CSLFetchNameValueDef(poOpenInfo->papszOpenOptions, "NORTH_UP", "YES"));
 
-    auto poGroupQualityOfSurvey = poRootGroup->OpenGroup("QualityOfSurvey");
-    if (!poGroupQualityOfSurvey)
+    const char *pszNameOfQualityGroup = "QualityOfSurvey";
+    auto poGroupQuality = poRootGroup->OpenGroup(pszNameOfQualityGroup);
+    if (!poGroupQuality)
     {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "Cannot find group /QualityOfSurvey");
-        return false;
+        pszNameOfQualityGroup = "QualityOfBathymetryCoverage";
+        poGroupQuality = poRootGroup->OpenGroup(pszNameOfQualityGroup);
+        if (!poGroupQuality)
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                     "Cannot find group /QualityOfSurvey or "
+                     "/QualityOfBathymetryCoverage");
+            return false;
+        }
     }
 
-    auto poGroupQualityOfSurvey01 =
-        poGroupQualityOfSurvey->OpenGroup("QualityOfSurvey.01");
-    if (!poGroupQualityOfSurvey01)
+    const std::string osQuality01Name =
+        std::string(pszNameOfQualityGroup).append(".01");
+    const std::string osQuality01FullName = std::string("/")
+                                                .append(pszNameOfQualityGroup)
+                                                .append("/")
+                                                .append(osQuality01Name);
+    auto poGroupQuality01 = poGroupQuality->OpenGroup(osQuality01Name);
+    if (!poGroupQuality01)
     {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "Cannot find group /QualityOfSurvey/QualityOfSurvey.01");
+        CPLError(CE_Failure, CPLE_AppDefined, "Cannot find group %s",
+                 osQuality01FullName.c_str());
         return false;
     }
 
-    if (auto poStartSequence =
-            poGroupQualityOfSurvey01->GetAttribute("startSequence"))
+    if (auto poStartSequence = poGroupQuality01->GetAttribute("startSequence"))
     {
         const char *pszStartSequence = poStartSequence->ReadAsString();
         if (pszStartSequence && !EQUAL(pszStartSequence, "0,0"))
@@ -451,15 +459,14 @@ bool S102Dataset::OpenQualityOfSurvey(
     }
 
     // Compute geotransform
-    m_bHasGT = S100GetGeoTransform(poGroupQualityOfSurvey01.get(),
-                                   m_adfGeoTransform, bNorthUp);
+    m_bHasGT = S100GetGeoTransform(poGroupQuality01.get(), m_adfGeoTransform,
+                                   bNorthUp);
 
-    auto poGroup001 = poGroupQualityOfSurvey01->OpenGroup("Group_001");
+    auto poGroup001 = poGroupQuality01->OpenGroup("Group_001");
     if (!poGroup001)
     {
-        CPLError(
-            CE_Failure, CPLE_AppDefined,
-            "Cannot find group /QualityOfSurvey/QualityOfSurvey.01/Group_001");
+        CPLError(CE_Failure, CPLE_AppDefined, "Cannot find group %s/Group_001",
+                 osQuality01FullName.c_str());
         return false;
     }
 
@@ -468,14 +475,41 @@ bool S102Dataset::OpenQualityOfSurvey(
     {
         CPLError(CE_Failure, CPLE_AppDefined,
                  "Cannot find array "
-                 "/QualityOfSurvey/QualityOfSurvey.01/Group_001/values");
+                 "%s/Group_001/values",
+                 osQuality01FullName.c_str());
         return false;
     }
 
     {
         const auto &oType = poValuesArray->GetDataType();
-        if (oType.GetClass() != GEDTC_NUMERIC &&
-            oType.GetNumericDataType() != GDT_UInt32)
+        if (oType.GetClass() == GEDTC_NUMERIC &&
+            oType.GetNumericDataType() == GDT_UInt32)
+        {
+            // ok
+        }
+        else if (oType.GetClass() == GEDTC_COMPOUND &&
+                 oType.GetComponents().size() == 1 &&
+                 oType.GetComponents()[0]->GetType().GetClass() ==
+                     GEDTC_NUMERIC &&
+                 oType.GetComponents()[0]->GetType().GetNumericDataType() ==
+                     GDT_UInt32)
+        {
+            // seen in a S102 v3 product (102DE00CA22_UNC_MD.H5), although
+            // I believe this is non-conformant.
+
+            // Escape potentials single-quote and double-quote with back-slash
+            CPLString osEscapedCompName(oType.GetComponents()[0]->GetName());
+            osEscapedCompName.replaceAll("\\", "\\\\")
+                .replaceAll("'", "\\'")
+                .replaceAll("\"", "\\\"");
+
+            // Gets a view with that single component extracted.
+            poValuesArray = poValuesArray->GetView(
+                std::string("['").append(osEscapedCompName).append("']"));
+            if (!poValuesArray)
+                return false;
+        }
+        else
         {
             CPLError(CE_Failure, CPLE_NotSupported,
                      "Unsupported data type for %s",
@@ -493,11 +527,12 @@ bool S102Dataset::OpenQualityOfSurvey(
     }
 
     auto poFeatureAttributeTable =
-        poGroupQualityOfSurvey->OpenMDArray("featureAttributeTable");
+        poGroupQuality->OpenMDArray("featureAttributeTable");
     if (!poFeatureAttributeTable)
     {
         CPLError(CE_Failure, CPLE_AppDefined,
-                 "Cannot find array /QualityOfSurvey/featureAttributeTable");
+                 "Cannot find array /%s/featureAttributeTable",
+                 pszNameOfQualityGroup);
         return false;
     }
 
@@ -526,6 +561,8 @@ bool S102Dataset::OpenQualityOfSurvey(
 
     auto poDS =
         std::unique_ptr<GDALDataset>(poValuesArray->AsClassicDataset(1, 0));
+    if (!poDS)
+        return false;
 
     nRasterXSize = poDS->GetRasterXSize();
     nRasterYSize = poDS->GetRasterYSize();
diff --git a/frmts/hdf5/s104dataset.cpp b/frmts/hdf5/s104dataset.cpp
index 4a9e1ecec9b5..14b58c76a916 100644
--- a/frmts/hdf5/s104dataset.cpp
+++ b/frmts/hdf5/s104dataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/hdf5/s111dataset.cpp b/frmts/hdf5/s111dataset.cpp
index 78b8b9e4d28d..b21a5ec8720a 100644
--- a/frmts/hdf5/s111dataset.cpp
+++ b/frmts/hdf5/s111dataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/heif/heifdataset.cpp b/frmts/heif/heifdataset.cpp
index 0c0bc3a6d18a..3155334838a8 100644
--- a/frmts/heif/heifdataset.cpp
+++ b/frmts/heif/heifdataset.cpp
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2020, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_pam.h"
@@ -76,7 +60,10 @@ class GDALHEIFDataset final : public GDALPamDataset
     GDALHEIFDataset();
     ~GDALHEIFDataset();
 
-    static GDALDataset *Open(GDALOpenInfo *poOpenInfo);
+    static GDALDataset *OpenHEIF(GDALOpenInfo *poOpenInfo);
+#if LIBHEIF_NUMERIC_VERSION >= BUILD_LIBHEIF_VERSION(1, 12, 0)
+    static GDALDataset *OpenAVIF(GDALOpenInfo *poOpenInfo);
+#endif
 };
 
 /************************************************************************/
@@ -164,7 +151,7 @@ int64_t GDALHEIFDataset::GetPositionCbk(void *userdata)
 int GDALHEIFDataset::ReadCbk(void *data, size_t size, void *userdata)
 {
     GDALHEIFDataset *poThis = static_cast<GDALHEIFDataset *>(userdata);
-    return VSIFReadL(data, size, 1, poThis->m_fpL) == 1 ? 0 : -1;
+    return VSIFReadL(data, 1, size, poThis->m_fpL) == size ? 0 : -1;
 }
 
 /************************************************************************/
@@ -314,7 +301,18 @@ bool GDALHEIFDataset::Init(GDALOpenInfo *poOpenInfo)
 
     OpenThumbnails();
 
+    if (poOpenInfo->nHeaderBytes > 12 &&
+        memcmp(poOpenInfo->pabyHeader + 4, "ftypavif", 8) == 0)
+    {
+        poDriver = GetGDALDriverManager()->GetDriverByName("AVIF_HEIF");
+    }
+
     // Initialize any PAM information.
+    if (nSubdatasets > 1)
+    {
+        SetSubdatasetName(CPLSPrintf("%d", iPart + 1));
+        SetPhysicalFilename(osFilename.c_str());
+    }
     SetDescription(poOpenInfo->pszFilename);
     TryLoadXML(poOpenInfo->GetSiblingFiles());
 
@@ -378,8 +376,8 @@ void GDALHEIFDataset::ReadMetadata()
                 }
             }
 
-            CPLString osTempFile;
-            osTempFile.Printf("/vsimem/heif_exif_%p.tif", this);
+            const CPLString osTempFile(
+                VSIMemGenerateHiddenFilename("heif_exif.tif"));
             VSILFILE *fpTemp =
                 VSIFileFromMemBuffer(osTempFile, &data[nTIFFFileOffset],
                                      nCount - nTIFFFileOffset, FALSE);
@@ -512,6 +510,7 @@ static int HEIFDriverIdentify(GDALOpenInfo *poOpenInfo)
 
     if (poOpenInfo->nHeaderBytes < 12 || poOpenInfo->fpL == nullptr)
         return false;
+
 #if LIBHEIF_NUMERIC_VERSION >= BUILD_LIBHEIF_VERSION(1, 4, 0)
     const auto res =
         heif_check_filetype(poOpenInfo->pabyHeader, poOpenInfo->nHeaderBytes);
@@ -556,10 +555,10 @@ static int HEIFDriverIdentify(GDALOpenInfo *poOpenInfo)
 }
 
 /************************************************************************/
-/*                              Open()                                  */
+/*                            OpenHEIF()                                */
 /************************************************************************/
 
-GDALDataset *GDALHEIFDataset::Open(GDALOpenInfo *poOpenInfo)
+GDALDataset *GDALHEIFDataset::OpenHEIF(GDALOpenInfo *poOpenInfo)
 {
     if (!HEIFDriverIdentify(poOpenInfo))
         return nullptr;
@@ -577,6 +576,44 @@ GDALDataset *GDALHEIFDataset::Open(GDALOpenInfo *poOpenInfo)
     return poDS.release();
 }
 
+#if LIBHEIF_NUMERIC_VERSION >= BUILD_LIBHEIF_VERSION(1, 12, 0)
+
+/************************************************************************/
+/*                     HEIFIdentifyOnlyAVIF()                           */
+/************************************************************************/
+
+static int HEIFIdentifyOnlyAVIF(GDALOpenInfo *poOpenInfo)
+{
+    if (poOpenInfo->nHeaderBytes < 12 || poOpenInfo->fpL == nullptr)
+        return false;
+    if (memcmp(poOpenInfo->pabyHeader + 4, "ftypavif", 8) == 0)
+        return true;
+    return false;
+}
+
+/************************************************************************/
+/*                              OpenAVIF()                              */
+/************************************************************************/
+
+GDALDataset *GDALHEIFDataset::OpenAVIF(GDALOpenInfo *poOpenInfo)
+{
+    if (!HEIFIdentifyOnlyAVIF(poOpenInfo))
+        return nullptr;
+    if (poOpenInfo->eAccess == GA_Update)
+    {
+        CPLError(CE_Failure, CPLE_NotSupported,
+                 "Update of existing AVIF file not supported");
+        return nullptr;
+    }
+
+    auto poDS = std::make_unique<GDALHEIFDataset>();
+    if (!poDS->Init(poOpenInfo))
+        return nullptr;
+
+    return poDS.release();
+}
+#endif
+
 /************************************************************************/
 /*                          GDALHEIFRasterBand()                        */
 /************************************************************************/
@@ -695,10 +732,45 @@ void GDALRegister_HEIF()
     if (GDALGetDriverByName(DRIVER_NAME) != nullptr)
         return;
 
-    GDALDriver *poDriver = new GDALDriver();
-    HEIFDriverSetCommonMetadata(poDriver);
+    auto poDM = GetGDALDriverManager();
+    {
+        GDALDriver *poDriver = new GDALDriver();
+        HEIFDriverSetCommonMetadata(poDriver);
 
-    poDriver->pfnOpen = GDALHEIFDataset::Open;
+#if LIBHEIF_NUMERIC_VERSION >= BUILD_LIBHEIF_VERSION(1, 12, 0)
+        // If the AVIF dedicated driver is not available, register an AVIF driver,
+        // called AVIF_HEIF, based on libheif, if it has AV1 decoding capabilities.
+        if (heif_have_decoder_for_format(heif_compression_AV1))
+        {
+            poDriver->SetMetadataItem("SUPPORTS_AVIF", "YES", "HEIF");
+        }
+#endif
 
-    GetGDALDriverManager()->RegisterDriver(poDriver);
+        poDriver->pfnOpen = GDALHEIFDataset::OpenHEIF;
+        poDM->RegisterDriver(poDriver);
+    }
+
+#if LIBHEIF_NUMERIC_VERSION >= BUILD_LIBHEIF_VERSION(1, 12, 0)
+    // If the AVIF dedicated driver is not available, register an AVIF driver,
+    // called AVIF_HEIF, based on libheif, if it has AV1 decoding capabilities.
+    if (heif_have_decoder_for_format(heif_compression_AV1) &&
+        !poDM->IsKnownDriver("AVIF") && !poDM->IsKnownDriver("AVIF_HEIF"))
+    {
+        GDALDriver *poAVIF_HEIFDriver = new GDALDriver();
+        poAVIF_HEIFDriver->SetMetadataItem(GDAL_DCAP_RASTER, "YES");
+        poAVIF_HEIFDriver->SetDescription("AVIF_HEIF");
+        poAVIF_HEIFDriver->SetMetadataItem(
+            GDAL_DMD_LONGNAME, "AV1 Image File Format (using libheif)");
+        poAVIF_HEIFDriver->SetMetadataItem(GDAL_DMD_MIMETYPE, "image/avif");
+        poAVIF_HEIFDriver->SetMetadataItem(GDAL_DMD_HELPTOPIC,
+                                           "drivers/raster/heif.html");
+        poAVIF_HEIFDriver->SetMetadataItem(GDAL_DMD_EXTENSION, "avif");
+        poAVIF_HEIFDriver->SetMetadataItem(GDAL_DCAP_VIRTUALIO, "YES");
+
+        poAVIF_HEIFDriver->pfnOpen = GDALHEIFDataset::OpenAVIF;
+        poAVIF_HEIFDriver->pfnIdentify = HEIFIdentifyOnlyAVIF;
+
+        poDM->RegisterDriver(poAVIF_HEIFDriver);
+    }
+#endif
 }
diff --git a/frmts/heif/heifdrivercore.cpp b/frmts/heif/heifdrivercore.cpp
index 24e424c3b2f3..012646d0860c 100644
--- a/frmts/heif/heifdrivercore.cpp
+++ b/frmts/heif/heifdrivercore.cpp
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2020, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "include_libheif.h"
@@ -33,42 +17,51 @@
 /*                    HEIFDriverIdentifySimplified()                    */
 /************************************************************************/
 
-int HEIFDriverIdentifySimplified(GDALOpenInfo *poOpenInfo)
+static const GByte FTYP_4CC[] = {'f', 't', 'y', 'p'};
+static const GByte supportedBrands[][4]{
+    {'a', 'v', 'i', 'f'}, {'h', 'e', 'i', 'c'}, {'h', 'e', 'i', 'x'},
+    {'j', '2', 'k', 'i'}, {'j', 'p', 'e', 'g'}, {'m', 'i', 'a', 'f'},
+    {'m', 'i', 'f', '1'}, {'m', 'i', 'f', '2'}};
 
+int HEIFDriverIdentifySimplified(GDALOpenInfo *poOpenInfo)
 {
     if (STARTS_WITH_CI(poOpenInfo->pszFilename, "HEIF:"))
+    {
         return true;
-
-    if (poOpenInfo->nHeaderBytes < 12 || poOpenInfo->fpL == nullptr)
+    }
+    if (poOpenInfo->nHeaderBytes < 16 || poOpenInfo->fpL == nullptr)
+    {
         return false;
-
-    // Simplistic test...
-    const unsigned char abySig1[] = "\x00"
-                                    "\x00"
-                                    "\x00"
-                                    "\x20"
-                                    "ftypheic";
-    const unsigned char abySig2[] = "\x00"
-                                    "\x00"
-                                    "\x00"
-                                    "\x18"
-                                    "ftypheic";
-    const unsigned char abySig3[] = "\x00"
-                                    "\x00"
-                                    "\x00"
-                                    "\x18"
-                                    "ftypmif1"
-                                    "\x00"
-                                    "\x00"
-                                    "\x00"
-                                    "\x00"
-                                    "mif1heic";
-    return (poOpenInfo->nHeaderBytes >= static_cast<int>(sizeof(abySig1)) &&
-            memcmp(poOpenInfo->pabyHeader, abySig1, sizeof(abySig1)) == 0) ||
-           (poOpenInfo->nHeaderBytes >= static_cast<int>(sizeof(abySig2)) &&
-            memcmp(poOpenInfo->pabyHeader, abySig2, sizeof(abySig2)) == 0) ||
-           (poOpenInfo->nHeaderBytes >= static_cast<int>(sizeof(abySig3)) &&
-            memcmp(poOpenInfo->pabyHeader, abySig3, sizeof(abySig3)) == 0);
+    }
+    if (memcmp(poOpenInfo->pabyHeader + 4, FTYP_4CC, sizeof(FTYP_4CC)) != 0)
+    {
+        return false;
+    }
+    uint32_t lengthBigEndian;
+    memcpy(&lengthBigEndian, poOpenInfo->pabyHeader, sizeof(uint32_t));
+    uint32_t lengthHostEndian = CPL_MSBWORD32(lengthBigEndian);
+    if (lengthHostEndian > static_cast<uint32_t>(poOpenInfo->nHeaderBytes))
+    {
+        lengthHostEndian = static_cast<uint32_t>(poOpenInfo->nHeaderBytes);
+    }
+    for (const GByte *supportedBrand : supportedBrands)
+    {
+        if (memcmp(poOpenInfo->pabyHeader + 8, supportedBrand, 4) == 0)
+        {
+            return true;
+        }
+    }
+    for (uint32_t offset = 16; offset + 4 <= lengthHostEndian; offset += 4)
+    {
+        for (const GByte *supportedBrand : supportedBrands)
+        {
+            if (memcmp(poOpenInfo->pabyHeader + offset, supportedBrand, 4) == 0)
+            {
+                return true;
+            }
+        }
+    }
+    return false;
 }
 
 /************************************************************************/
diff --git a/frmts/heif/heifdrivercore.h b/frmts/heif/heifdrivercore.h
index 1e1a8d437a0f..3a4abcb2f240 100644
--- a/frmts/heif/heifdrivercore.h
+++ b/frmts/heif/heifdrivercore.h
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2020, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef HEIFDRIVERCORE_H
diff --git a/frmts/heif/include_libheif.h b/frmts/heif/include_libheif.h
index 6e3801969946..ed7626808744 100644
--- a/frmts/heif/include_libheif.h
+++ b/frmts/heif/include_libheif.h
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2020, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef INCLUDE_LIBHEIF_DEFINED
diff --git a/frmts/hf2/hf2dataset.cpp b/frmts/hf2/hf2dataset.cpp
index 1a4adcd58f6a..9732af4c1878 100644
--- a/frmts/hf2/hf2dataset.cpp
+++ b/frmts/hf2/hf2dataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
@@ -1061,7 +1045,7 @@ GDALDataset *HF2Dataset::CreateCopy(const char *pszFilename,
                 for (int k = 1; k < nReqYSize * nReqXSize; k++)
                 {
                     float fVal = ((float *)pTileBuffer)[k];
-                    if (CPLIsNan(fVal))
+                    if (std::isnan(fVal))
                     {
                         CPLError(CE_Failure, CPLE_NotSupported,
                                  "NaN value found");
diff --git a/frmts/hfa/CMakeLists.txt b/frmts/hfa/CMakeLists.txt
index 5dc45eefb311..ec8a720e7eaa 100644
--- a/frmts/hfa/CMakeLists.txt
+++ b/frmts/hfa/CMakeLists.txt
@@ -13,11 +13,15 @@ add_gdal_driver(
           hfaopen.cpp
           hfatype.cpp
           hfa_overviews.cpp
-  BUILTIN)
+  PLUGIN_CAPABLE
+  NO_DEPS
+)
 gdal_standard_includes(gdal_HFA)
-target_include_directories(gdal_HFA PRIVATE $<TARGET_PROPERTY:PROJ::proj,INTERFACE_INCLUDE_DIRECTORIES>)
-target_compile_definitions(gdal_HFA PRIVATE $<TARGET_PROPERTY:PROJ::proj,INTERFACE_COMPILE_DEFINITIONS>)
 
-add_executable(hfatest EXCLUDE_FROM_ALL hfatest.cpp ../../ogr/ogr_proj_p.cpp)
-gdal_standard_includes(hfatest)
-target_link_libraries(hfatest PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> gdal_HFA PROJ::proj)
+gdal_target_link_libraries(gdal_HFA PRIVATE PROJ::proj)
+
+if (NOT GDAL_ENABLE_DRIVER_HFA_PLUGIN)
+    add_executable(hfatest EXCLUDE_FROM_ALL hfatest.cpp ../../ogr/ogr_proj_p.cpp)
+    gdal_standard_includes(hfatest)
+    target_link_libraries(hfatest PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> gdal_HFA PROJ::proj)
+endif()
diff --git a/frmts/hfa/hfa.h b/frmts/hfa/hfa.h
index 60e3c0c10efd..eaa66790cc2e 100644
--- a/frmts/hfa/hfa.h
+++ b/frmts/hfa/hfa.h
@@ -10,23 +10,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Intergraph Corporation
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef HFAOPEN_H_INCLUDED
diff --git a/frmts/hfa/hfa_overviews.cpp b/frmts/hfa/hfa_overviews.cpp
index 7c658affc788..1537071d2f20 100644
--- a/frmts/hfa/hfa_overviews.cpp
+++ b/frmts/hfa/hfa_overviews.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2005, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/hfa/hfa_p.h b/frmts/hfa/hfa_p.h
index 7c5e0f019a9f..c1adec5e09d6 100644
--- a/frmts/hfa/hfa_p.h
+++ b/frmts/hfa/hfa_p.h
@@ -10,23 +10,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Intergraph Corporation
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef HFA_P_H_INCLUDED
diff --git a/frmts/hfa/hfaband.cpp b/frmts/hfa/hfaband.cpp
index f6395d28fd32..76115be0fa90 100644
--- a/frmts/hfa/hfaband.cpp
+++ b/frmts/hfa/hfaband.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Intergraph Corporation
  * Copyright (c) 2007-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/hfa/hfacompress.cpp b/frmts/hfa/hfacompress.cpp
index f3f2cc19b3e3..8b0f6c465444 100644
--- a/frmts/hfa/hfacompress.cpp
+++ b/frmts/hfa/hfacompress.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2005, Sam Gillingham
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/hfa/hfadataset.cpp b/frmts/hfa/hfadataset.cpp
index d4ae113c0a65..e0f12c1b4485 100644
--- a/frmts/hfa/hfadataset.cpp
+++ b/frmts/hfa/hfadataset.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -2058,7 +2042,7 @@ void HFARasterBand::ReadHistogramMetadata()
                     static_cast<double>(std::numeric_limits<GUIntBig>::max()) ||
                 dfNumber <
                     static_cast<double>(std::numeric_limits<GUIntBig>::min()) ||
-                CPLIsNan(dfNumber))
+                std::isnan(dfNumber))
             {
                 CPLError(CE_Failure, CPLE_FileIO, "Out of range hist vals.");
                 CPLFree(panHistValues);
@@ -3184,16 +3168,18 @@ CPLErr HFADataset::WriteProjection()
 
         if (nGCS == 4326)
             sDatum.datumname = const_cast<char *>("WGS 84");
-        if (nGCS == 4322)
+        else if (nGCS == 4322)
             sDatum.datumname = const_cast<char *>("WGS 1972");
-        if (nGCS == 4267)
+        else if (nGCS == 4267)
             sDatum.datumname = const_cast<char *>("NAD27");
-        if (nGCS == 4269)
+        else if (nGCS == 4269)
             sDatum.datumname = const_cast<char *>("NAD83");
-        if (nGCS == 4283)
+        else if (nGCS == 4283)
             sDatum.datumname = const_cast<char *>("GDA94");
-        if (nGCS == 6284)
+        else if (nGCS == 4284)
             sDatum.datumname = const_cast<char *>("Pulkovo 1942");
+        else if (nGCS == 4272)
+            sDatum.datumname = const_cast<char *>("Geodetic Datum 1949");
 
         if (poGeogSRS->GetTOWGS84(sDatum.params) == OGRERR_NONE)
         {
diff --git a/frmts/hfa/hfadataset.h b/frmts/hfa/hfadataset.h
index 8cac039113fa..17e684ac6a54 100644
--- a/frmts/hfa/hfadataset.h
+++ b/frmts/hfa/hfadataset.h
@@ -9,23 +9,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef HFADATASET_H_INCLUDED
diff --git a/frmts/hfa/hfadictionary.cpp b/frmts/hfa/hfadictionary.cpp
index e06b3c04071f..92a34a5e9617 100644
--- a/frmts/hfa/hfadictionary.cpp
+++ b/frmts/hfa/hfadictionary.cpp
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Intergraph Corporation
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/hfa/hfaentry.cpp b/frmts/hfa/hfaentry.cpp
index caba37d9036d..d298a306213d 100644
--- a/frmts/hfa/hfaentry.cpp
+++ b/frmts/hfa/hfaentry.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 1999, Intergraph Corporation
  * Copyright (c) 2008-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************
  *
  * hfaentry.cpp
diff --git a/frmts/hfa/hfafield.cpp b/frmts/hfa/hfafield.cpp
index 42ab23c57524..3f17833bb384 100644
--- a/frmts/hfa/hfafield.cpp
+++ b/frmts/hfa/hfafield.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 1999, Intergraph Corporation
  * Copyright (c) 2009-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -40,6 +24,7 @@
 #include <fcntl.h>
 #endif
 #include <algorithm>
+#include <cmath>
 #include <limits>
 #include <vector>
 
@@ -55,7 +40,7 @@ namespace
 
 int FloatToIntClamp(float fValue)
 {
-    if (CPLIsNan(fValue))
+    if (std::isnan(fValue))
         return 0;
     if (fValue >= static_cast<float>(std::numeric_limits<int>::max()))
         return std::numeric_limits<int>::max();
@@ -1011,7 +996,7 @@ bool HFAField::ExtractInstValue(const char *pszField, int nIndexValue,
                     std::numeric_limits<int>::max() ||
                 static_cast<double>(fNumber) <
                     std::numeric_limits<int>::min() ||
-                CPLIsNan(fNumber))
+                std::isnan(fNumber))
             {
                 CPLError(CE_Failure, CPLE_AppDefined, "Too large for int: %f",
                          fNumber);
@@ -1035,7 +1020,7 @@ bool HFAField::ExtractInstValue(const char *pszField, int nIndexValue,
             dfDoubleRet = dfNumber;
             if (dfNumber > std::numeric_limits<int>::max() ||
                 dfNumber < std::numeric_limits<int>::min() ||
-                CPLIsNan(dfNumber))
+                std::isnan(dfNumber))
             {
                 CPLError(CE_Failure, CPLE_AppDefined, "Too large for int: %f",
                          dfNumber);
@@ -1247,7 +1232,7 @@ bool HFAField::ExtractInstValue(const char *pszField, int nIndexValue,
                 {
                     nIntRet = nMin;
                 }
-                else if (CPLIsNan(dfDoubleRet))
+                else if (std::isnan(dfDoubleRet))
                 {
                     CPLError(CE_Warning, CPLE_AppDefined,
                              "NaN converted to INT_MAX.");
diff --git a/frmts/hfa/hfaopen.cpp b/frmts/hfa/hfaopen.cpp
index f8ee8fecdd2c..3e13ddd03001 100644
--- a/frmts/hfa/hfaopen.cpp
+++ b/frmts/hfa/hfaopen.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 1999, Intergraph Corporation
  * Copyright (c) 2007-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************
  *
  * hfaopen.cpp
@@ -3926,13 +3910,22 @@ static int ESRIToUSGSZone(int nESRIZone)
 
 static const char *const apszDatumMap[] = {
     // Imagine name, WKT name.
-    "NAD27",        "North_American_Datum_1927",
-    "NAD83",        "North_American_Datum_1983",
-    "WGS 84",       "WGS_1984",
-    "WGS 1972",     "WGS_1972",
-    "GDA94",        "Geocentric_Datum_of_Australia_1994",
-    "Pulkovo 1942", "Pulkovo_1942",
-    nullptr,        nullptr};
+    "NAD27",
+    "North_American_Datum_1927",
+    "NAD83",
+    "North_American_Datum_1983",
+    "WGS 84",
+    "WGS_1984",
+    "WGS 1972",
+    "WGS_1972",
+    "GDA94",
+    "Geocentric_Datum_of_Australia_1994",
+    "Pulkovo 1942",
+    "Pulkovo_1942",
+    "Geodetic Datum 1949",
+    "New_Zealand_Geodetic_Datum_1949",
+    nullptr,
+    nullptr};
 
 const char *const *HFAGetDatumMap()
 {
@@ -4730,6 +4723,7 @@ HFAPCSStructToOSR(const Eprj_Datum *psDatum, const Eprj_ProParameters *psPro,
                                   -psDatum->params[4] * RAD2ARCSEC,
                                   -psDatum->params[5] * RAD2ARCSEC,
                                   psDatum->params[6] * 1e+6);
+                poSRS->StripTOWGS84IfKnownDatumAndAllowed();
             }
         }
     }
@@ -4737,5 +4731,11 @@ HFAPCSStructToOSR(const Eprj_Datum *psDatum, const Eprj_ProParameters *psPro,
     // Try to insert authority information if possible.
     poSRS->AutoIdentifyEPSG();
 
+    auto poSRSBestMatch = poSRS->FindBestMatch(90, nullptr, nullptr);
+    if (poSRSBestMatch)
+    {
+        poSRS.reset(poSRSBestMatch);
+    }
+
     return poSRS;
 }
diff --git a/frmts/hfa/hfatest.cpp b/frmts/hfa/hfatest.cpp
index 314c0ee2bff2..035585b2da45 100644
--- a/frmts/hfa/hfatest.cpp
+++ b/frmts/hfa/hfatest.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Intergraph Corporation
  * Copyright (c) 2009-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "hfa_p.h"
diff --git a/frmts/hfa/hfatype.cpp b/frmts/hfa/hfatype.cpp
index 244c4ff0e6ff..8939444b129e 100644
--- a/frmts/hfa/hfatype.cpp
+++ b/frmts/hfa/hfatype.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 1999, Intergraph Corporation
  * Copyright (c) 2009-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/http/httpdriver.cpp b/frmts/http/httpdriver.cpp
index 075030090d63..a7563c9063dc 100644
--- a/frmts/http/httpdriver.cpp
+++ b/frmts/http/httpdriver.cpp
@@ -8,36 +8,31 @@
  * Copyright (c) 2007, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
 #include "cpl_http.h"
-#include "cpl_atomic_ops.h"
 #include "gdal_frmts.h"
 #include "gdal_pam.h"
 
+static std::string SanitizeDispositionFilename(const std::string &osVal)
+{
+    std::string osRet(osVal);
+    if (!osRet.empty() && osRet[0] == '"')
+    {
+        const auto nEnd = osRet.find('"', 1);
+        if (nEnd != std::string::npos)
+            return osRet.substr(1, nEnd - 1);
+    }
+    return osRet;
+}
+
 /************************************************************************/
 /*               HTTPFetchContentDispositionFilename()                 */
 /************************************************************************/
 
-static const char *HTTPFetchContentDispositionFilename(char **papszHeaders)
+static std::string HTTPFetchContentDispositionFilename(char **papszHeaders)
 {
     char **papszIter = papszHeaders;
     while (papszIter && *papszIter)
@@ -47,25 +42,25 @@ static const char *HTTPFetchContentDispositionFilename(char **papszHeaders)
         if (STARTS_WITH(*papszIter,
                         "Content-Disposition: attachment; filename="))
         {
-            return *papszIter + 42;
+            return SanitizeDispositionFilename(*papszIter + 42);
         }
         /* For single part, the headers are in KEY=VAL format, but with e-o-l
          * ... */
         else if (STARTS_WITH(*papszIter,
                              "Content-Disposition=attachment; filename="))
         {
-            char *pszVal = (char *)(*papszIter + 41);
+            char *pszVal = (*papszIter + 41);
             char *pszEOL = strchr(pszVal, '\r');
             if (pszEOL)
                 *pszEOL = 0;
             pszEOL = strchr(pszVal, '\n');
             if (pszEOL)
                 *pszEOL = 0;
-            return pszVal;
+            return SanitizeDispositionFilename(pszVal);
         }
         papszIter++;
     }
-    return nullptr;
+    return std::string();
 }
 
 /************************************************************************/
@@ -75,8 +70,6 @@ static const char *HTTPFetchContentDispositionFilename(char **papszHeaders)
 static GDALDataset *HTTPOpen(GDALOpenInfo *poOpenInfo)
 
 {
-    static volatile int nCounter = 0;
-
     if (poOpenInfo->nHeaderBytes != 0)
         return nullptr;
 
@@ -104,21 +97,19 @@ static GDALDataset *HTTPOpen(GDALOpenInfo *poOpenInfo)
     /* -------------------------------------------------------------------- */
     /*      Create a memory file from the result.                           */
     /* -------------------------------------------------------------------- */
-    CPLString osResultFilename;
-
-    int nNewCounter = CPLAtomicInc(&nCounter);
-
-    const char *pszFilename =
+    std::string osFilename =
         HTTPFetchContentDispositionFilename(psResult->papszHeaders);
-    if (pszFilename == nullptr)
+    if (osFilename.empty())
     {
-        pszFilename = CPLGetFilename(poOpenInfo->pszFilename);
+        osFilename = CPLGetFilename(poOpenInfo->pszFilename);
         /* If we have special characters, let's default to a fixed name */
-        if (strchr(pszFilename, '?') || strchr(pszFilename, '&'))
-            pszFilename = "file.dat";
+        if (strchr(osFilename.c_str(), '?') || strchr(osFilename.c_str(), '&'))
+            osFilename = "file.dat";
     }
 
-    osResultFilename.Printf("/vsimem/http_%d/%s", nNewCounter, pszFilename);
+    // If changing the _gdal_http_ marker, change jpgdataset.cpp that tests for it
+    const CPLString osResultFilename = VSIMemGenerateHiddenFilename(
+        std::string("_gdal_http_").append(osFilename).c_str());
 
     VSILFILE *fp = VSIFileFromMemBuffer(osResultFilename, psResult->pabyData,
                                         psResult->nDataLen, TRUE);
diff --git a/frmts/idrisi/IdrisiDataset.cpp b/frmts/idrisi/IdrisiDataset.cpp
index 7e5b4d370b25..c5e3db0cf50a 100644
--- a/frmts/idrisi/IdrisiDataset.cpp
+++ b/frmts/idrisi/IdrisiDataset.cpp
@@ -12,23 +12,7 @@
  * Copyright( c ) 2006, Ivan Lucena
  * Copyright (c) 2007-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/frmts/idrisi/idrisi.h b/frmts/idrisi/idrisi.h
index e4db439d2dce..c79b41fd4b9f 100644
--- a/frmts/idrisi/idrisi.h
+++ b/frmts/idrisi/idrisi.h
@@ -9,23 +9,7 @@
  * Copyright( c ) 2006, Ivan Lucena
  * Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef IDRISI_H_INCLUDED
diff --git a/frmts/ilwis/ilwiscoordinatesystem.cpp b/frmts/ilwis/ilwiscoordinatesystem.cpp
index 12139d9bc2ca..56f4aa95bddf 100644
--- a/frmts/ilwis/ilwiscoordinatesystem.cpp
+++ b/frmts/ilwis/ilwiscoordinatesystem.cpp
@@ -7,23 +7,7 @@
  * Copyright (c) 2004, ITC
  * Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #include "cpl_conv.h"
 #include "ilwisdataset.h"
diff --git a/frmts/ilwis/ilwisdataset.cpp b/frmts/ilwis/ilwisdataset.cpp
index c2f84f907f22..324fd840e795 100644
--- a/frmts/ilwis/ilwisdataset.cpp
+++ b/frmts/ilwis/ilwisdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2004, ITC
  * Copyright (c) 2008-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ilwisdataset.h"
@@ -32,6 +16,7 @@
 #include <climits>
 
 #include <algorithm>
+#include <cmath>
 #include <limits>
 #include <memory>
 #include <string>
@@ -1194,8 +1179,8 @@ GDALDataset *ILWISDataset::CreateCopy(const char *pszFilename,
         adfMinMax[1] = poBand->GetMaximum(&bGotMax);
         if (!(bGotMin && bGotMax))
             GDALComputeRasterMinMax((GDALRasterBandH)poBand, FALSE, adfMinMax);
-        if ((!CPLIsNan(adfMinMax[0])) && CPLIsFinite(adfMinMax[0]) &&
-            (!CPLIsNan(adfMinMax[1])) && CPLIsFinite(adfMinMax[1]))
+        if ((!std::isnan(adfMinMax[0])) && std::isfinite(adfMinMax[0]) &&
+            (!std::isnan(adfMinMax[1])) && std::isfinite(adfMinMax[1]))
         {
             // only write a range if we got a correct one from the source
             // dataset (otherwise ILWIS can't show the map properly)
@@ -1260,13 +1245,13 @@ GDALDataset *ILWISDataset::CreateCopy(const char *pszFilename,
                         else if (EQUAL(sStoreType.c_str(), "float"))
                         {
                             if ((((float *)pData)[iCol] == dNoDataValue) ||
-                                (CPLIsNan(((float *)pData)[iCol])))
+                                (std::isnan(((float *)pData)[iCol])))
                                 ((float *)pData)[iCol] = flUNDEF;
                         }
                         else if (EQUAL(sStoreType.c_str(), "Real"))
                         {
                             if ((((double *)pData)[iCol] == dNoDataValue) ||
-                                (CPLIsNan(((double *)pData)[iCol])))
+                                (std::isnan(((double *)pData)[iCol])))
                                 ((double *)pData)[iCol] = rUNDEF;
                         }
                     }
diff --git a/frmts/ilwis/ilwisdataset.h b/frmts/ilwis/ilwisdataset.h
index 9a3edf72a15b..4a00de6e8f87 100644
--- a/frmts/ilwis/ilwisdataset.h
+++ b/frmts/ilwis/ilwisdataset.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2004, ITC
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef ILWISDATASET_H_INCLUDED
diff --git a/frmts/iris/irisdataset.cpp b/frmts/iris/irisdataset.cpp
index 9b1a167a1b35..b30c953d6e96 100644
--- a/frmts/iris/irisdataset.cpp
+++ b/frmts/iris/irisdataset.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2012, Roger Veciana <rveciana@gmail.com>
  * Copyright (c) 2012-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/iso8211/8211createfromxml.cpp b/frmts/iso8211/8211createfromxml.cpp
index 3cbb8f54fcb7..598a116b92e1 100644
--- a/frmts/iso8211/8211createfromxml.cpp
+++ b/frmts/iso8211/8211createfromxml.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/frmts/iso8211/8211dump.cpp b/frmts/iso8211/8211dump.cpp
index 2a463cf1d780..895cbf3618d9 100644
--- a/frmts/iso8211/8211dump.cpp
+++ b/frmts/iso8211/8211dump.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <stdio.h>
diff --git a/frmts/iso8211/8211view.cpp b/frmts/iso8211/8211view.cpp
index b5b853af88cf..8d7d176234f3 100644
--- a/frmts/iso8211/8211view.cpp
+++ b/frmts/iso8211/8211view.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <stdio.h>
diff --git a/frmts/iso8211/ddffield.cpp b/frmts/iso8211/ddffield.cpp
index fe870e200d0b..3a30e7753ce2 100644
--- a/frmts/iso8211/ddffield.cpp
+++ b/frmts/iso8211/ddffield.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/iso8211/ddffielddefn.cpp b/frmts/iso8211/ddffielddefn.cpp
index 6e0840a1b353..a6cb43b931be 100644
--- a/frmts/iso8211/ddffielddefn.cpp
+++ b/frmts/iso8211/ddffielddefn.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/iso8211/ddfmodule.cpp b/frmts/iso8211/ddfmodule.cpp
index 1bc39ddd548c..9ee228b29a3c 100644
--- a/frmts/iso8211/ddfmodule.cpp
+++ b/frmts/iso8211/ddfmodule.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/iso8211/ddfrecord.cpp b/frmts/iso8211/ddfrecord.cpp
index 8d4215d5065a..de07a4c0487b 100644
--- a/frmts/iso8211/ddfrecord.cpp
+++ b/frmts/iso8211/ddfrecord.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/iso8211/ddfsubfielddefn.cpp b/frmts/iso8211/ddfsubfielddefn.cpp
index aa38eb68a804..41425a101b7e 100644
--- a/frmts/iso8211/ddfsubfielddefn.cpp
+++ b/frmts/iso8211/ddfsubfielddefn.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/iso8211/ddfutils.cpp b/frmts/iso8211/ddfutils.cpp
index 5fa8f6174cf7..18ded9e18e23 100644
--- a/frmts/iso8211/ddfutils.cpp
+++ b/frmts/iso8211/ddfutils.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/iso8211/iso8211.h b/frmts/iso8211/iso8211.h
index 2835039c8750..8d59e4da0266 100644
--- a/frmts/iso8211/iso8211.h
+++ b/frmts/iso8211/iso8211.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef ISO8211_H_INCLUDED
diff --git a/frmts/iso8211/mkcatalog.cpp b/frmts/iso8211/mkcatalog.cpp
index b93b60f447d7..d76ee11897fb 100644
--- a/frmts/iso8211/mkcatalog.cpp
+++ b/frmts/iso8211/mkcatalog.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "iso8211.h"
diff --git a/frmts/iso8211/timetest.cpp b/frmts/iso8211/timetest.cpp
index a6b7df72285b..55b4fadad734 100644
--- a/frmts/iso8211/timetest.cpp
+++ b/frmts/iso8211/timetest.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <stdio.h>
diff --git a/frmts/jaxapalsar/jaxapalsardataset.cpp b/frmts/jaxapalsar/jaxapalsardataset.cpp
index 4b063197bf77..a7b7480a137e 100644
--- a/frmts/jaxapalsar/jaxapalsardataset.cpp
+++ b/frmts/jaxapalsar/jaxapalsardataset.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2007, Philippe P. Vachon <philippe@cowpig.ca>
  * Copyright (c) 2008-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_frmts.h"
diff --git a/frmts/jdem/jdemdataset.cpp b/frmts/jdem/jdemdataset.cpp
index 58aec9ad3151..a630e1ae103e 100644
--- a/frmts/jdem/jdemdataset.cpp
+++ b/frmts/jdem/jdemdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2000, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/jp2kak/CMakeLists.txt b/frmts/jp2kak/CMakeLists.txt
index fa95a832ab21..2b69665baab7 100644
--- a/frmts/jp2kak/CMakeLists.txt
+++ b/frmts/jp2kak/CMakeLists.txt
@@ -1,3 +1,14 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/helpers/GdalCMakeMinimumRequired.cmake")
+cmake_minimum_required(VERSION ${GDAL_CMAKE_VERSION_MIN}...${GDAL_CMAKE_VERSION_MAX})
+
+if(NOT DEFINED PROJECT_SOURCE_DIR)
+    # Standalone plugin building
+    project(gdal_JP2KAK)
+    include("${PROJECT_SOURCE_DIR}/../../cmake/helpers/SetupStandalonePlugin.cmake" )
+    include(CheckDependentLibrariesKakadu)
+    standalone_driver_finalize(GDAL_ENABLE_DRIVER_JP2KAK)
+endif()
+
 add_gdal_driver(TARGET gdal_JP2KAK
                 SOURCES jp2kakdataset.cpp
                         jp2kak_headers.h
diff --git a/frmts/jp2kak/driver_declaration.cmake b/frmts/jp2kak/driver_declaration.cmake
new file mode 100644
index 000000000000..118d43fd80b5
--- /dev/null
+++ b/frmts/jp2kak/driver_declaration.cmake
@@ -0,0 +1 @@
+gdal_dependent_format(jp2kak "JPEG-2000 (based on Kakadu)" "GDAL_USE_KDU")
diff --git a/frmts/jp2kak/jp2kak_headers.h b/frmts/jp2kak/jp2kak_headers.h
index 572fb9c98153..d9503d9e9375 100644
--- a/frmts/jp2kak/jp2kak_headers.h
+++ b/frmts/jp2kak/jp2kak_headers.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef JP2KAK_HEADERS_H
diff --git a/frmts/jp2kak/jp2kakdataset.cpp b/frmts/jp2kak/jp2kakdataset.cpp
index d1870c247ad9..eabe52ef4099 100644
--- a/frmts/jp2kak/jp2kakdataset.cpp
+++ b/frmts/jp2kak/jp2kakdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -1150,12 +1134,13 @@ GDALDataset *JP2KAKDataset::Open(GDALOpenInfo *poOpenInfo)
          */
         poDS->SetDescription(poOpenInfo->pszFilename);
         if (!bIsSubfile)
-            poDS->TryLoadXML();
+            poDS->TryLoadXML(poOpenInfo->GetSiblingFiles());
         else
             poDS->nPamFlags |= GPF_NOSAVE;
 
         // Check for external overviews.
-        poDS->oOvManager.Initialize(poDS, osPhysicalFilename);
+        poDS->oOvManager.Initialize(poDS, poOpenInfo,
+                                    osPhysicalFilename.c_str());
 
         // Confirm the requested access is supported.
         if (poOpenInfo->eAccess == GA_Update)
@@ -2471,7 +2456,6 @@ static GDALDataset *JP2KAKCreateCopy(const char *pszFilename,
     // Set some particular parameters.
     oCodeStream.access_siz()->parse_string(
         CPLString().Printf("Clayers=%d", layer_count).c_str());
-    oCodeStream.access_siz()->parse_string("Cycc=no");
     if (eType == GDT_Int16 || eType == GDT_UInt16)
         oCodeStream.access_siz()->parse_string(
             "Qstep=0.0000152588");  // 1. / (1 << 16)
@@ -2486,6 +2470,8 @@ static GDALDataset *JP2KAKCreateCopy(const char *pszFilename,
 
     // Set some user-overridable parameters.
     const char *const apszParams[] = {
+        "Cycc",
+        "yes",
         "Corder",
         "PCRL",
         "Cprecincts",
@@ -2902,7 +2888,9 @@ static GDALDataset *JP2KAKCreateCopy(const char *pszFilename,
         std::vector<int> precisions(num_components);
         for (int i = 0; i < num_components; ++i)
         {
-            stripe_bufs[i] = pBuffer + nXSize * nDataTypeSizeBytes * i;
+            stripe_bufs[i] = pBuffer + static_cast<size_t>(nXSize) *
+                                           nDataTypeSizeBytes * i *
+                                           stripe_height;
             is_signed[i] = CPL_TO_BOOL(GDALDataTypeIsSigned(eType));
             precisions[i] = nBits;
         }
@@ -2917,6 +2905,9 @@ static GDALDataset *JP2KAKCreateCopy(const char *pszFilename,
                 for (int i = 0; i < num_components; ++i)
                 {
                     stripe_heights[i] = nHeight;
+                    stripe_bufs[i] = pBuffer + static_cast<size_t>(nXSize) *
+                                                   nDataTypeSizeBytes * i *
+                                                   nHeight;
                 }
             }
             if (poSrcDS->RasterIO(GF_Read, 0, iY, nXSize, nHeight, pBuffer,
diff --git a/frmts/jp2kak/jp2kakdataset.h b/frmts/jp2kak/jp2kakdataset.h
index 11b5c2f4d91a..3c6c366c787a 100644
--- a/frmts/jp2kak/jp2kakdataset.h
+++ b/frmts/jp2kak/jp2kakdataset.h
@@ -8,23 +8,7 @@
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 // $Id$
diff --git a/frmts/jp2kak/jp2kakdrivercore.cpp b/frmts/jp2kak/jp2kakdrivercore.cpp
index c2d69ba7c5bf..62bc7bf40207 100644
--- a/frmts/jp2kak/jp2kakdrivercore.cpp
+++ b/frmts/jp2kak/jp2kakdrivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault, <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "jp2kakdrivercore.h"
@@ -96,6 +80,7 @@ void JP2KAKDriverSetCommonMetadata(GDALDriver *poDriver)
         "   <Option name='Cprecincts' type='string'/>"
         "   <Option name='Cmodes' type='string'/>"
         "   <Option name='Clevels' type='string'/>"
+        "   <Option name='Cycc' type='boolean' default='YES'/>"
         "   <Option name='ORGgen_plt' type='string'/>"
         "   <Option name='ORGgen_tlm' type='string'/>"
         "   <Option name='ORGtparts' type='string'/>"
diff --git a/frmts/jp2kak/jp2kakdrivercore.h b/frmts/jp2kak/jp2kakdrivercore.h
index 79d6f2adb000..88a914262c48 100644
--- a/frmts/jp2kak/jp2kakdrivercore.h
+++ b/frmts/jp2kak/jp2kakdrivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault, <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef JP2KAKDRIVERCORE_H
diff --git a/frmts/jp2kak/subfile_source.h b/frmts/jp2kak/subfile_source.h
index 1ca43b2b126e..7f41eb5f13e5 100644
--- a/frmts/jp2kak/subfile_source.h
+++ b/frmts/jp2kak/subfile_source.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef JP2KAK_SUBFILE_SOURCE_H
diff --git a/frmts/jp2kak/vsil_target.h b/frmts/jp2kak/vsil_target.h
index 1f0446d29025..30e7a3486e05 100644
--- a/frmts/jp2kak/vsil_target.h
+++ b/frmts/jp2kak/vsil_target.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2008, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef VSIL_TARGET_H
diff --git a/frmts/jp2lura/jp2luracallbacks.cpp b/frmts/jp2lura/jp2luracallbacks.cpp
index 58d9845da9d3..cc054086152b 100644
--- a/frmts/jp2lura/jp2luracallbacks.cpp
+++ b/frmts/jp2lura/jp2luracallbacks.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2016, SatCen - European Union Satellite Centre
  * Copyright (c) 2016, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/jp2lura/jp2luracallbacks.h b/frmts/jp2lura/jp2luracallbacks.h
index dd0dce94c306..9568cfe1474e 100644
--- a/frmts/jp2lura/jp2luracallbacks.h
+++ b/frmts/jp2lura/jp2luracallbacks.h
@@ -8,23 +8,7 @@
  * Copyright (c) 2016, SatCen - European Union Satellite Centre
  * Copyright (c) 2016, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef JP2LURACALLBACKS_H_INCLUDED
diff --git a/frmts/jp2lura/jp2luradataset.cpp b/frmts/jp2lura/jp2luradataset.cpp
index 31bae40d0391..f179103b9d64 100644
--- a/frmts/jp2lura/jp2luradataset.cpp
+++ b/frmts/jp2lura/jp2luradataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2016, SatCen - European Union Satellite Centre
  * Copyright (c) 2014-2016, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/jp2lura/jp2luradataset.h b/frmts/jp2lura/jp2luradataset.h
index 7a884e00fe78..58531c0aabfc 100644
--- a/frmts/jp2lura/jp2luradataset.h
+++ b/frmts/jp2lura/jp2luradataset.h
@@ -8,23 +8,7 @@
  * Copyright (c) 2016, SatCen - European Union Satellite Centre
  * Copyright (c) 2016, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef JP2LURADATASET_H_INCLUDED
diff --git a/frmts/jp2lura/jp2luradrivercore.cpp b/frmts/jp2lura/jp2luradrivercore.cpp
index ced8f129376a..0ceba183deee 100644
--- a/frmts/jp2lura/jp2luradrivercore.cpp
+++ b/frmts/jp2lura/jp2luradrivercore.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2016, SatCen - European Union Satellite Centre
  * Copyright (c) 2014-2016, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "jp2luradrivercore.h"
diff --git a/frmts/jp2lura/jp2luradrivercore.h b/frmts/jp2lura/jp2luradrivercore.h
index bbe19452cfa7..f2238b86a505 100644
--- a/frmts/jp2lura/jp2luradrivercore.h
+++ b/frmts/jp2lura/jp2luradrivercore.h
@@ -8,23 +8,7 @@
  * Copyright (c) 2016, SatCen - European Union Satellite Centre
  * Copyright (c) 2014-2016, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef JP2LURADRIVERCORE_H
diff --git a/frmts/jp2lura/jp2lurarasterband.cpp b/frmts/jp2lura/jp2lurarasterband.cpp
index 95be3c74c689..e392bfd09202 100644
--- a/frmts/jp2lura/jp2lurarasterband.cpp
+++ b/frmts/jp2lura/jp2lurarasterband.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2016, SatCen - European Union Satellite Centre
  * Copyright (c) 2016, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "jp2lurarasterband.h"
@@ -58,19 +42,11 @@ JP2LuraRasterBand::JP2LuraRasterBand(JP2LuraDataset *poDSIn, int nBandIn,
         {
             nBlockXSize = 2048;
         }
-        else
-        {
-            nBlockXSize = nRasterXSize;
-        }
 
         if (nRasterYSize >= 128)
         {
             nBlockYSize = 128;
         }
-        else
-        {
-            nBlockYSize = nRasterYSize;
-        }
     }
 
     if ((nBits % 8) != 0)
diff --git a/frmts/jp2lura/jp2lurarasterband.h b/frmts/jp2lura/jp2lurarasterband.h
index f014343ac352..1aacc69f990a 100644
--- a/frmts/jp2lura/jp2lurarasterband.h
+++ b/frmts/jp2lura/jp2lurarasterband.h
@@ -8,23 +8,7 @@
  * Copyright (c) 2016, SatCen - European Union Satellite Centre
  * Copyright (c) 2016, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef JP2LURARASTERBAND_H_INCLUDED
diff --git a/frmts/jpeg/jpegdrivercore.cpp b/frmts/jpeg/jpegdrivercore.cpp
index f8a6d43cc3b1..b2f325b316e5 100644
--- a/frmts/jpeg/jpegdrivercore.cpp
+++ b/frmts/jpeg/jpegdrivercore.cpp
@@ -11,23 +11,7 @@
  * Portions Copyright (c) Her majesty the Queen in right of Canada as
  * represented by the Minister of National Defence, 2006.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "jpegdrivercore.h"
diff --git a/frmts/jpeg/jpegdrivercore.h b/frmts/jpeg/jpegdrivercore.h
index 0dc3ccba000a..3017371f8d87 100644
--- a/frmts/jpeg/jpegdrivercore.h
+++ b/frmts/jpeg/jpegdrivercore.h
@@ -11,23 +11,7 @@
  * Portions Copyright (c) Her majesty the Queen in right of Canada as
  * represented by the Minister of National Defence, 2006.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef JPEGDRIVERCORE_H
diff --git a/frmts/jpeg/jpgdataset.cpp b/frmts/jpeg/jpgdataset.cpp
index 2be97a6bdba8..a8425a65b39a 100644
--- a/frmts/jpeg/jpgdataset.cpp
+++ b/frmts/jpeg/jpgdataset.cpp
@@ -11,23 +11,7 @@
  * Portions Copyright (c) Her majesty the Queen in right of Canada as
  * represented by the Minister of National Defence, 2006.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -54,6 +38,7 @@
 #include "cpl_conv.h"
 #include "cpl_error.h"
 #include "cpl_md5.h"
+#include "cpl_minixml.h"
 #include "quant_table_md5sum.h"
 #include "quant_table_md5sum_jpeg9e.h"
 #include "cpl_progress.h"
@@ -261,6 +246,39 @@ void JPGDatasetCommon::ReadEXIFMetadata()
                                 nGPSOffset);
         }
 
+        // Pix4D Mapper files have both DNG_CameraSerialNumber and EXIF_BodySerialNumber
+        // set at the same value. Only expose the later in that situation.
+        if (const char *pszDNG_CameraSerialNumber =
+                CSLFetchNameValue(papszMetadata, "DNG_CameraSerialNumber"))
+        {
+            const char *pszEXIF_BodySerialNumber =
+                CSLFetchNameValue(papszMetadata, "EXIF_BodySerialNumber");
+            if (pszEXIF_BodySerialNumber &&
+                EQUAL(pszDNG_CameraSerialNumber, pszEXIF_BodySerialNumber))
+            {
+                CPLDebug("JPEG", "Unsetting DNG_CameraSerialNumber as it has "
+                                 "the same value as EXIF_BodySerialNumber");
+                papszMetadata = CSLSetNameValue(
+                    papszMetadata, "DNG_CameraSerialNumber", nullptr);
+            }
+        }
+
+        // Pix4D Mapper files have both DNG_UniqueCameraModel and EXIF_Model
+        // set at the same value. Only expose the later in that situation.
+        if (const char *pszDNG_UniqueCameraModel =
+                CSLFetchNameValue(papszMetadata, "DNG_UniqueCameraModel"))
+        {
+            const char *pszEXIF_Model =
+                CSLFetchNameValue(papszMetadata, "EXIF_Model");
+            if (pszEXIF_Model && EQUAL(pszDNG_UniqueCameraModel, pszEXIF_Model))
+            {
+                CPLDebug("JPEG", "Unsetting DNG_UniqueCameraModel as it has "
+                                 "the same value as EXIF_Model");
+                papszMetadata = CSLSetNameValue(
+                    papszMetadata, "DNG_UniqueCameraModel", nullptr);
+            }
+        }
+
         // Avoid setting the PAM dirty bit just for that.
         const int nOldPamFlags = nPamFlags;
 
@@ -331,7 +349,7 @@ void JPGDatasetCommon::ReadXMPMetadata()
 
         // Not a marker
         if (abyChunkHeader[0] != 0xFF)
-            continue;
+            break;
 
         // Stop on Start of Scan
         if (abyChunkHeader[1] == 0xDA)
@@ -365,6 +383,7 @@ void JPGDatasetCommon::ReadXMPMetadata()
                     char *apszMDList[2] = {pszXMP, nullptr};
                     SetMetadata(apszMDList, "xml:XMP");
 
+                    // cppcheck-suppress redundantAssignment
                     nPamFlags = nOldPamFlags;
                 }
                 VSIFree(pszXMP);
@@ -406,17 +425,18 @@ void JPGDatasetCommon::ReadFLIRMetadata()
             1)
             break;
 
+        const int nMarkerLength =
+            abyChunkHeader[2] * 256 + abyChunkHeader[3] - 2;
+        nChunkLoc += 4 + nMarkerLength;
+
         // Not a marker
         if (abyChunkHeader[0] != 0xFF)
-            continue;
+            break;
 
         // Stop on Start of Scan
         if (abyChunkHeader[1] == 0xDA)
             break;
 
-        int nMarkerLength = abyChunkHeader[2] * 256 + abyChunkHeader[3] - 2;
-        nChunkLoc += 4 + nMarkerLength;
-
         if (abyChunkHeader[1] == 0xe1 &&
             memcmp(abyChunkHeader + 4, "FLIR\0", 5) == 0)
         {
@@ -2547,6 +2567,94 @@ const GDAL_GCP *JPGDatasetCommon::GetGCPs()
     return gdal::GCP::c_ptr(m_aoGCPs);
 }
 
+/************************************************************************/
+/*                           GetSpatialRef()                            */
+/************************************************************************/
+
+const OGRSpatialReference *JPGDatasetCommon::GetSpatialRef() const
+
+{
+    const auto poSRS = GDALPamDataset::GetSpatialRef();
+    if (poSRS)
+        return poSRS;
+
+    auto poThis = const_cast<JPGDatasetCommon *>(this);
+    if (poThis->GetGCPCount() == 0)
+    {
+        if (!m_oSRS.IsEmpty())
+            return &m_oSRS;
+
+        if (!bHasReadXMPMetadata)
+            poThis->ReadXMPMetadata();
+        CSLConstList papszXMP = poThis->GetMetadata("xml:XMP");
+        if (papszXMP && papszXMP[0])
+        {
+            CPLXMLTreeCloser poXML(CPLParseXMLString(papszXMP[0]));
+            if (poXML)
+            {
+                const auto psRDF =
+                    CPLGetXMLNode(poXML.get(), "=x:xmpmeta.rdf:RDF");
+                if (psRDF)
+                {
+                    for (const CPLXMLNode *psIter = psRDF->psChild; psIter;
+                         psIter = psIter->psNext)
+                    {
+                        if (psIter->eType == CXT_Element &&
+                            EQUAL(psIter->pszValue, "rdf:Description") &&
+                            EQUAL(CPLGetXMLValue(psIter, "xmlns:Camera", ""),
+                                  "http://pix4d.com/camera/1.0/"))
+                        {
+                            if (const char *pszHorizCS = CPLGetXMLValue(
+                                    psIter, "Camera:HorizCS", nullptr))
+                            {
+                                if (m_oSRS.SetFromUserInput(
+                                        pszHorizCS,
+                                        OGRSpatialReference::
+                                            SET_FROM_USER_INPUT_LIMITATIONS_get()) ==
+                                    OGRERR_NONE)
+                                {
+                                    if (const char *pszVertCS = CPLGetXMLValue(
+                                            psIter, "Camera:VertCS", nullptr))
+                                    {
+                                        if (EQUAL(pszVertCS, "ellipsoidal"))
+                                            m_oSRS.PromoteTo3D(nullptr);
+                                        else
+                                        {
+                                            OGRSpatialReference oVertCRS;
+                                            if (oVertCRS.SetFromUserInput(
+                                                    pszVertCS,
+                                                    OGRSpatialReference::
+                                                        SET_FROM_USER_INPUT_LIMITATIONS_get()) ==
+                                                OGRERR_NONE)
+                                            {
+                                                OGRSpatialReference oTmpCRS;
+                                                oTmpCRS.SetCompoundCS(
+                                                    std::string(
+                                                        m_oSRS.GetName())
+                                                        .append(" + ")
+                                                        .append(
+                                                            oVertCRS.GetName())
+                                                        .c_str(),
+                                                    &m_oSRS, &oVertCRS);
+                                                m_oSRS = std::move(oTmpCRS);
+                                            }
+                                        }
+                                    }
+                                    m_oSRS.SetAxisMappingStrategy(
+                                        OAMS_TRADITIONAL_GIS_ORDER);
+                                    return &m_oSRS;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    return nullptr;
+}
+
 /************************************************************************/
 /*                             IRasterIO()                              */
 /*                                                                      */
@@ -2736,7 +2844,8 @@ GDALDataset *JPGDatasetCommon::OpenFLIRRawThermalImage()
 
     GByte *pabyData =
         static_cast<GByte *>(CPLMalloc(m_abyRawThermalImage.size()));
-    const std::string osTmpFilename(CPLSPrintf("/vsimem/jpeg/%p", pabyData));
+    const std::string osTmpFilename(
+        VSIMemGenerateHiddenFilename("jpeg_flir_raw"));
     memcpy(pabyData, m_abyRawThermalImage.data(), m_abyRawThermalImage.size());
     VSILFILE *fpRaw = VSIFileFromMemBuffer(osTmpFilename.c_str(), pabyData,
                                            m_abyRawThermalImage.size(), true);
@@ -2850,7 +2959,7 @@ JPGDatasetCommon *JPGDataset::OpenStage2(JPGDatasetOpenArgs *psArgs,
 
     const char *pszFilename = psArgs->pszFilename;
     VSILFILE *fpLin = psArgs->fpLin;
-    char **papszSiblingFiles = psArgs->papszSiblingFiles;
+    CSLConstList papszSiblingFiles = psArgs->papszSiblingFiles;
     const int nScaleFactor = psArgs->nScaleFactor;
     const bool bDoPAMInitialize = psArgs->bDoPAMInitialize;
     const bool bUseInternalOverviews = psArgs->bUseInternalOverviews;
@@ -2928,7 +3037,7 @@ JPGDatasetCommon *JPGDataset::OpenStage2(JPGDatasetOpenArgs *psArgs,
     // Open the file using the large file api if necessary.
     VSILFILE *fpImage = fpLin;
 
-    if (fpImage == nullptr)
+    if (!fpImage)
     {
         fpImage = VSIFOpenL(real_filename, "rb");
 
@@ -2941,10 +3050,6 @@ JPGDatasetCommon *JPGDataset::OpenStage2(JPGDatasetOpenArgs *psArgs,
             return nullptr;
         }
     }
-    else
-    {
-        fpImage = fpLin;
-    }
 
     // Create a corresponding GDALDataset.
     poDS->nQLevel = nQLevel;
@@ -3112,7 +3217,8 @@ JPGDatasetCommon *JPGDataset::OpenStage2(JPGDatasetOpenArgs *psArgs,
         // will unlink the temporary /vsimem file just after GDALOpen(), so
         // later VSIFOpenL() when reading internal overviews would fail.
         // Initialize them now.
-        if (STARTS_WITH(real_filename, "/vsimem/http_"))
+        if (STARTS_WITH(real_filename, "/vsimem/") &&
+            strstr(real_filename, "_gdal_http_"))
         {
             poDS->InitInternalOverviews();
         }
@@ -3621,7 +3727,7 @@ void JPGDataset::EmitMessage(j_common_ptr cinfo, int msg_level)
                              buffer);
                 }
             }
-            else if (pszVal == nullptr || CPLTestBool(pszVal))
+            else if (pszVal == nullptr || !CPLTestBool(pszVal))
             {
                 if (pszVal == nullptr)
                 {
@@ -3974,7 +4080,7 @@ void JPGAddEXIF(GDALDataType eWorkDT, GDALDataset *poSrcDS, char **papszOptions,
             return;
         }
 
-        CPLString osTmpFile(CPLSPrintf("/vsimem/ovrjpg%p", poMemDS));
+        const CPLString osTmpFile(VSIMemGenerateHiddenFilename("ovrjpg"));
         GDALDataset *poOutDS = pCreateCopy(osTmpFile, poMemDS, 0, nullptr,
                                            GDALDummyProgress, nullptr);
         const bool bExifOverviewSuccess = poOutDS != nullptr;
diff --git a/frmts/jpeg/jpgdataset.h b/frmts/jpeg/jpgdataset.h
index cfb9e3506710..13fe8411f15b 100644
--- a/frmts/jpeg/jpgdataset.h
+++ b/frmts/jpeg/jpgdataset.h
@@ -12,23 +12,7 @@
  * Portions Copyright (c) Her majesty the Queen in right of Canada as
  * represented by the Minister of National Defence, 2006.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -89,7 +73,7 @@ struct JPGDatasetOpenArgs
 {
     const char *pszFilename = nullptr;
     VSILFILE *fpLin = nullptr;
-    char **papszSiblingFiles = nullptr;
+    CSLConstList papszSiblingFiles = nullptr;
     int nScaleFactor = 1;
     bool bDoPAMInitialize = false;
     bool bUseInternalOverviews = false;
@@ -170,7 +154,7 @@ class JPGDatasetCommon CPL_NON_FINAL : public GDALPamDataset
     void InitInternalOverviews();
     GDALDataset *InitEXIFOverview();
 
-    OGRSpatialReference m_oSRS{};
+    mutable OGRSpatialReference m_oSRS{};
     bool bGeoTransformValid;
     double adfGeoTransform[6];
     std::vector<gdal::GCP> m_aoGCPs{};
@@ -265,6 +249,8 @@ class JPGDatasetCommon CPL_NON_FINAL : public GDALPamDataset
     const OGRSpatialReference *GetGCPSpatialRef() const override;
     virtual const GDAL_GCP *GetGCPs() override;
 
+    const OGRSpatialReference *GetSpatialRef() const override;
+
     virtual char **GetMetadataDomainList() override;
     virtual char **GetMetadata(const char *pszDomain = "") override;
     virtual const char *GetMetadataItem(const char *pszName,
diff --git a/frmts/jpeg/jpgdataset_12.cpp b/frmts/jpeg/jpgdataset_12.cpp
index d875e9cad9a9..76d0c1183708 100644
--- a/frmts/jpeg/jpgdataset_12.cpp
+++ b/frmts/jpeg/jpgdataset_12.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #if defined(JPEG_DUAL_MODE_8_12)
diff --git a/frmts/jpeg/vsidataio.cpp b/frmts/jpeg/vsidataio.cpp
index 98bbef16d89c..c63a3fa52763 100644
--- a/frmts/jpeg/vsidataio.cpp
+++ b/frmts/jpeg/vsidataio.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/jpeg/vsidataio.h b/frmts/jpeg/vsidataio.h
index 9977ce5b66ee..bb5d4a6d892b 100644
--- a/frmts/jpeg/vsidataio.h
+++ b/frmts/jpeg/vsidataio.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef VSIDATAIO_H_INCLUDED
diff --git a/frmts/jpeg/vsidataio_12.cpp b/frmts/jpeg/vsidataio_12.cpp
index 0d823ff870a8..e7c1ecfd6bec 100644
--- a/frmts/jpeg/vsidataio_12.cpp
+++ b/frmts/jpeg/vsidataio_12.cpp
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #if defined(JPEG_DUAL_MODE_8_12)
diff --git a/frmts/jpegxl/jpegxl.cpp b/frmts/jpegxl/jpegxl.cpp
index b160978da7fc..0ac0f3e1925d 100644
--- a/frmts/jpegxl/jpegxl.cpp
+++ b/frmts/jpegxl/jpegxl.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_error.h"
@@ -358,11 +342,9 @@ bool JPEGXLDataset::Open(GDALOpenInfo *poOpenInfo)
                 {
                     CPL_LSBPTR32(&nTiffDirStart);
                 }
-                const std::string osTmpFilename =
-                    CPLSPrintf("/vsimem/jxl/%p", this);
-                VSILFILE *fpEXIF = VSIFileFromMemBuffer(
-                    osTmpFilename.c_str(), abyBoxBuffer.data() + 4,
-                    abyBoxBuffer.size() - 4, false);
+                VSILFILE *fpEXIF =
+                    VSIFileFromMemBuffer(nullptr, abyBoxBuffer.data() + 4,
+                                         abyBoxBuffer.size() - 4, false);
                 int nExifOffset = 0;
                 int nInterOffset = 0;
                 int nGPSOffset = 0;
@@ -1838,7 +1820,8 @@ GDALDataset *JPEGXLDataset::CreateCopy(const char *pszFilename,
                                    nJPEGXLContent);
 
                 size_t nInsertPos = 0;
-                if (abyData[0] == 0xff && abyData[1] == 0x0a)
+                if (abyData.size() >= 2 && abyData[0] == 0xff &&
+                    abyData[1] == 0x0a)
                 {
                     // If we get a "naked" codestream, insert it into a
                     // ISOBMFF-based container
diff --git a/frmts/jpegxl/jpegxldrivercore.cpp b/frmts/jpegxl/jpegxldrivercore.cpp
index 80bc67436895..8ce943e54576 100644
--- a/frmts/jpegxl/jpegxldrivercore.cpp
+++ b/frmts/jpegxl/jpegxldrivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault, <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "jpegxldrivercore.h"
diff --git a/frmts/jpegxl/jpegxldrivercore.h b/frmts/jpegxl/jpegxldrivercore.h
index b45543ae26d1..9ee6736ad786 100644
--- a/frmts/jpegxl/jpegxldrivercore.h
+++ b/frmts/jpegxl/jpegxldrivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault, <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef JPEGXLDRIVERCORE_H
diff --git a/frmts/jpegxl/jxl_headers.h b/frmts/jpegxl/jxl_headers.h
index 0507159839de..c65be79196f8 100644
--- a/frmts/jpegxl/jxl_headers.h
+++ b/frmts/jpegxl/jxl_headers.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #if defined(__GNUC__)
diff --git a/frmts/jpipkak/jpipkak_headers.h b/frmts/jpipkak/jpipkak_headers.h
index 40671b1f29dc..2a01ee8c2389 100644
--- a/frmts/jpipkak/jpipkak_headers.h
+++ b/frmts/jpipkak/jpipkak_headers.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef JPIPKAK_HEADERS_H
diff --git a/frmts/jpipkak/jpipkakdataset.cpp b/frmts/jpipkak/jpipkakdataset.cpp
index 9057a3f7e198..231c42701ef8 100644
--- a/frmts/jpipkak/jpipkakdataset.cpp
+++ b/frmts/jpipkak/jpipkakdataset.cpp
@@ -10,22 +10,7 @@
  *
  * Copyright (c) 2000-2007, ITT Visual Information Solutions
  *
- * 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.
+ * SPDX-License-Identifier: MIT
 **/
 
 #include "gdal_frmts.h"
@@ -749,8 +734,7 @@ int JPIPKAKDataset::Initialize(const char *pszDatasetName, int bReinitializing)
     }
 
     // create in memory file using vsimem
-    CPLString osFileBoxName;
-    osFileBoxName.Printf("/vsimem/jpip/%s.dat", pszCid);
+    const CPLString osFileBoxName(VSIMemGenerateHiddenFilename("jpip"));
     VSILFILE *fpLL = VSIFOpenL(osFileBoxName.c_str(), "w+");
     poCache->set_read_scope(KDU_META_DATABIN, nCodestream, 0);
     kdu_byte *pabyBuffer = (kdu_byte *)CPLMalloc(nLen);
diff --git a/frmts/jpipkak/jpipkakdataset.h b/frmts/jpipkak/jpipkakdataset.h
index ce3fca3ae85d..ab177f958dc0 100644
--- a/frmts/jpipkak/jpipkakdataset.h
+++ b/frmts/jpipkak/jpipkakdataset.h
@@ -11,22 +11,7 @@ following license:
  *
  * Copyright (c) 2000-2007, ITT Visual Information Solutions
  *
- * 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.
+ * SPDX-License-Identifier: MIT
 **/
 
 #include "gdal_pam.h"
diff --git a/frmts/jpipkak/jpipkakdrivercore.cpp b/frmts/jpipkak/jpipkakdrivercore.cpp
index 36ea4d980729..ac0d37ec1e74 100644
--- a/frmts/jpipkak/jpipkakdrivercore.cpp
+++ b/frmts/jpipkak/jpipkakdrivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault, <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "jpipkakdrivercore.h"
diff --git a/frmts/jpipkak/jpipkakdrivercore.h b/frmts/jpipkak/jpipkakdrivercore.h
index 4e8d71ae3e16..e3fc0cdb61be 100644
--- a/frmts/jpipkak/jpipkakdrivercore.h
+++ b/frmts/jpipkak/jpipkakdrivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault, <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef JPIPKAKDRIVERCORE_H
diff --git a/frmts/kea/keaband.cpp b/frmts/kea/keaband.cpp
index 905ec37d03c3..e2215db2e40e 100644
--- a/frmts/kea/keaband.cpp
+++ b/frmts/kea/keaband.cpp
@@ -6,24 +6,7 @@
  *
  *  This file is part of LibKEA.
  *
- *  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.
+ * SPDX-License-Identifier: MIT
  *
  */
 
@@ -399,7 +382,7 @@ void KEARasterBand::SetDescription(const char *pszDescription)
     try
     {
         this->m_pImageIO->setImageBandDescription(this->nBand, pszDescription);
-        GDALPamRasterBand::SetDescription(pszDescription);
+        GDALRasterBand::SetDescription(pszDescription);
     }
     catch (const kealib::KEAIOException &)
     {
@@ -721,9 +704,9 @@ CPLErr KEARasterBand::GetDefaultHistogram(double *pdfMin, double *pdfMax,
 {
     if (bForce)
     {
-        return GDALPamRasterBand::GetDefaultHistogram(pdfMin, pdfMax, pnBuckets,
-                                                      ppanHistogram, bForce, fn,
-                                                      pProgressData);
+        return GDALRasterBand::GetDefaultHistogram(pdfMin, pdfMax, pnBuckets,
+                                                   ppanHistogram, bForce, fn,
+                                                   pProgressData);
     }
     else
     {
@@ -1379,7 +1362,7 @@ GDALRasterBand *KEARasterBand::GetMaskBand()
             {
                 // use the base class implementation - GDAL will delete
                 // fprintf( stderr, "returning base GetMaskBand()\n" );
-                m_pMaskBand = GDALPamRasterBand::GetMaskBand();
+                m_pMaskBand = GDALRasterBand::GetMaskBand();
             }
         }
         catch (const kealib::KEAException &)
@@ -1399,7 +1382,7 @@ int KEARasterBand::GetMaskFlags()
             // need to return the base class one since we are using
             // the base class implementation of GetMaskBand()
             // fprintf( stderr, "returning base GetMaskFlags()\n" );
-            return GDALPamRasterBand::GetMaskFlags();
+            return GDALRasterBand::GetMaskFlags();
         }
     }
     catch (const kealib::KEAException &)
diff --git a/frmts/kea/keaband.h b/frmts/kea/keaband.h
index 9ae18b5b30d7..5d4ba590b9cf 100644
--- a/frmts/kea/keaband.h
+++ b/frmts/kea/keaband.h
@@ -7,38 +7,21 @@
  *
  *  This file is part of LibKEA.
  *
- *  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.
+ * SPDX-License-Identifier: MIT
  *
  */
 
 #ifndef KEABAND_H
 #define KEABAND_H
 
-#include "gdal_pam.h"
+#include "gdal_priv.h"
 #include "keadataset.h"
 
 class KEAOverview;
 class KEAMaskBand;
 
 // Provides the implementation of a GDAL raster band
-class KEARasterBand CPL_NON_FINAL : public GDALPamRasterBand
+class KEARasterBand CPL_NON_FINAL : public GDALRasterBand
 {
   private:
     LockedRefCount *m_pRefCount = nullptr;  // reference count of m_pImageIO
diff --git a/frmts/kea/keacopy.cpp b/frmts/kea/keacopy.cpp
index fd748c83bdb5..bab8945a14d5 100644
--- a/frmts/kea/keacopy.cpp
+++ b/frmts/kea/keacopy.cpp
@@ -6,24 +6,7 @@
  *
  *  This file is part of LibKEA.
  *
- *  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.
+ * SPDX-License-Identifier: MIT
  *
  */
 
diff --git a/frmts/kea/keacopy.h b/frmts/kea/keacopy.h
index b050bc01dbd3..5042789795a9 100644
--- a/frmts/kea/keacopy.h
+++ b/frmts/kea/keacopy.h
@@ -7,24 +7,7 @@
  *
  *  This file is part of LibKEA.
  *
- *  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.
+ * SPDX-License-Identifier: MIT
  *
  */
 
diff --git a/frmts/kea/keadataset.cpp b/frmts/kea/keadataset.cpp
index 3fc9939ca441..633156edad8f 100644
--- a/frmts/kea/keadataset.cpp
+++ b/frmts/kea/keadataset.cpp
@@ -6,24 +6,7 @@
  *
  *  This file is part of LibKEA.
  *
- *  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.
+ * SPDX-License-Identifier: MIT
  *
  */
 
diff --git a/frmts/kea/keadataset.h b/frmts/kea/keadataset.h
index 63505b1826e5..c517ecf99356 100644
--- a/frmts/kea/keadataset.h
+++ b/frmts/kea/keadataset.h
@@ -7,38 +7,21 @@
  *
  *  This file is part of LibKEA.
  *
- *  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.
+ * SPDX-License-Identifier: MIT
  *
  */
 
 #ifndef KEADATASET_H
 #define KEADATASET_H
 
-#include "gdal_pam.h"
+#include "gdal_priv.h"
 #include "cpl_multiproc.h"
 #include "libkea_headers.h"
 
 class LockedRefCount;
 
 // class that implements a GDAL dataset
-class KEADataset final : public GDALPamDataset
+class KEADataset final : public GDALDataset
 {
     static H5::H5File *CreateLL(const char *pszFilename, int nXSize, int nYSize,
                                 int nBands, GDALDataType eType,
diff --git a/frmts/kea/keadriver.cpp b/frmts/kea/keadriver.cpp
index 7bb55841f0ae..f51033c181ae 100644
--- a/frmts/kea/keadriver.cpp
+++ b/frmts/kea/keadriver.cpp
@@ -6,24 +6,7 @@
  *
  *  This file is part of LibKEA.
  *
- *  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.
+ * SPDX-License-Identifier: MIT
  *
  */
 
diff --git a/frmts/kea/keadrivercore.cpp b/frmts/kea/keadrivercore.cpp
index d9971e233303..a466898f2dc0 100644
--- a/frmts/kea/keadrivercore.cpp
+++ b/frmts/kea/keadrivercore.cpp
@@ -3,24 +3,7 @@
  *
  *  Copyright 2012 LibKEA. 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.
+ * SPDX-License-Identifier: MIT
  *
  */
 
diff --git a/frmts/kea/keadrivercore.h b/frmts/kea/keadrivercore.h
index fc208ff30eb2..f316c7eaa734 100644
--- a/frmts/kea/keadrivercore.h
+++ b/frmts/kea/keadrivercore.h
@@ -3,24 +3,7 @@
  *
  *  Copyright 2012 LibKEA. 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.
+ * SPDX-License-Identifier: MIT
  *
  */
 
diff --git a/frmts/kea/keamaskband.cpp b/frmts/kea/keamaskband.cpp
index c308ad77d4b0..04a079503db5 100644
--- a/frmts/kea/keamaskband.cpp
+++ b/frmts/kea/keamaskband.cpp
@@ -6,24 +6,7 @@
  *
  *  This file is part of LibKEA.
  *
- *  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.
+ * SPDX-License-Identifier: MIT
  *
  */
 
diff --git a/frmts/kea/keamaskband.h b/frmts/kea/keamaskband.h
index ae8f11068e66..657a83c7fbaa 100644
--- a/frmts/kea/keamaskband.h
+++ b/frmts/kea/keamaskband.h
@@ -7,24 +7,7 @@
  *
  *  This file is part of LibKEA.
  *
- *  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.
+ * SPDX-License-Identifier: MIT
  *
  */
 
diff --git a/frmts/kea/keaoverview.cpp b/frmts/kea/keaoverview.cpp
index 69184045e6cb..9ea7c69eb47c 100644
--- a/frmts/kea/keaoverview.cpp
+++ b/frmts/kea/keaoverview.cpp
@@ -6,24 +6,7 @@
  *
  *  This file is part of LibKEA.
  *
- *  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.
+ * SPDX-License-Identifier: MIT
  *
  */
 
@@ -48,6 +31,9 @@ KEAOverview::KEAOverview(KEADataset *pDataset, int nSrcBand,
 
 KEAOverview::~KEAOverview()
 {
+    // according to the docs, this is required
+    // otherwise not all tiles will be written.
+    this->FlushCache();
 }
 
 // overridden implementation - calls readFromOverview instead
diff --git a/frmts/kea/keaoverview.h b/frmts/kea/keaoverview.h
index 4ba4e91e6208..d81165dcf5a3 100644
--- a/frmts/kea/keaoverview.h
+++ b/frmts/kea/keaoverview.h
@@ -7,24 +7,7 @@
  *
  *  This file is part of LibKEA.
  *
- *  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.
+ * SPDX-License-Identifier: MIT
  *
  */
 
diff --git a/frmts/kea/kearat.cpp b/frmts/kea/kearat.cpp
index 24d92ff39b98..c1ae4fcb129d 100644
--- a/frmts/kea/kearat.cpp
+++ b/frmts/kea/kearat.cpp
@@ -6,24 +6,7 @@
  *
  *  This file is part of LibKEA.
  *
- *  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.
+ * SPDX-License-Identifier: MIT
  *
  */
 
diff --git a/frmts/kea/kearat.h b/frmts/kea/kearat.h
index cf2cbadb1195..19a970544d67 100644
--- a/frmts/kea/kearat.h
+++ b/frmts/kea/kearat.h
@@ -7,24 +7,7 @@
  *
  *  This file is part of LibKEA.
  *
- *  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.
+ * SPDX-License-Identifier: MIT
  *
  */
 
diff --git a/frmts/kea/libkea_headers.h b/frmts/kea/libkea_headers.h
index 9e5e5db21601..0faaad767082 100644
--- a/frmts/kea/libkea_headers.h
+++ b/frmts/kea/libkea_headers.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef GDAL_LIBKEA_HEADERS_H
diff --git a/frmts/kmlsuperoverlay/CMakeLists.txt b/frmts/kmlsuperoverlay/CMakeLists.txt
index c722194a58eb..4f31c26e66c1 100644
--- a/frmts/kmlsuperoverlay/CMakeLists.txt
+++ b/frmts/kmlsuperoverlay/CMakeLists.txt
@@ -1,3 +1,7 @@
-add_gdal_driver(TARGET gdal_KMLSUPEROVERLAY SOURCES kmlsuperoverlaydataset.cpp kmlsuperoverlaydataset.h PLUGIN_CAPABLE
-                                                    NO_DEPS)
+add_gdal_driver(TARGET gdal_KMLSUPEROVERLAY
+                SOURCES kmlsuperoverlaydataset.cpp
+                        kmlsuperoverlaydataset.h
+                PLUGIN_CAPABLE
+                NO_DEPS
+                STRONG_CXX_WFLAGS)
 gdal_standard_includes(gdal_KMLSUPEROVERLAY)
diff --git a/frmts/kmlsuperoverlay/kmlsuperoverlaydataset.cpp b/frmts/kmlsuperoverlay/kmlsuperoverlaydataset.cpp
index e966a404523f..bd3f94f4360e 100644
--- a/frmts/kmlsuperoverlay/kmlsuperoverlaydataset.cpp
+++ b/frmts/kmlsuperoverlay/kmlsuperoverlaydataset.cpp
@@ -8,28 +8,13 @@
  * Copyright (c) 2010, SPADAC Inc. <harsh.govind@spadac.com>
  * Copyright (c) 2010-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
 #include "kmlsuperoverlaydataset.h"
 
+#include <array>
 #include <cmath>
 #include <cstring>
 #include <algorithm>
@@ -46,8 +31,6 @@
 #include "../vrt/gdal_vrt.h"
 #include "../vrt/vrtdataset.h"
 
-using namespace std;
-
 /************************************************************************/
 /*                           GenerateTiles()                            */
 /************************************************************************/
@@ -58,17 +41,16 @@ static void GenerateTiles(const std::string &filename, CPL_UNUSED int zoom,
                           GDALDriver *poOutputTileDriver,
                           GDALDriver *poMemDriver, bool isJpegDriver)
 {
-    GDALDataset *poTmpDataset = nullptr;
     GDALRasterBand *alphaBand = nullptr;
 
-    GByte *pabyScanline = new GByte[dxsize];
-    bool *hadnoData = new bool[dxsize];
+    std::vector<GByte> abyScanline(dxsize);
+    std::vector<bool> hadnoData(dxsize);
 
     if (isJpegDriver && bands == 4)
         bands = 3;
 
-    poTmpDataset =
-        poMemDriver->Create("", dxsize, dysize, bands, GDT_Byte, nullptr);
+    auto poTmpDataset = std::unique_ptr<GDALDataset>(
+        poMemDriver->Create("", dxsize, dysize, bands, GDT_Byte, nullptr));
 
     if (!isJpegDriver)  // Jpeg dataset only has one or three bands
     {
@@ -100,9 +82,9 @@ static void GenerateTiles(const std::string &filename, CPL_UNUSED int zoom,
             const double noDataValue = poBand->GetNoDataValue(&hasNoData);
 
             int yOffset = ry + row * rowOffset;
-            CPLErr errTest = poBand->RasterIO(GF_Read, rx, yOffset, rxsize,
-                                              rowOffset, pabyScanline, dxsize,
-                                              1, GDT_Byte, 0, 0, nullptr);
+            CPLErr errTest = poBand->RasterIO(
+                GF_Read, rx, yOffset, rxsize, rowOffset, abyScanline.data(),
+                dxsize, 1, GDT_Byte, 0, 0, nullptr);
 
             const bool bReadFailed = (errTest == CE_Failure);
             if (bReadFailed)
@@ -118,7 +100,7 @@ static void GenerateTiles(const std::string &filename, CPL_UNUSED int zoom,
                 {
                     for (int j = 0; j < dxsize; j++)
                     {
-                        double v = pabyScanline[j];
+                        double v = abyScanline[j];
                         if (v == noDataValue || bReadFailed)
                         {
                             hadnoData[j] = true;
@@ -131,7 +113,7 @@ static void GenerateTiles(const std::string &filename, CPL_UNUSED int zoom,
             {
                 GDALRasterBand *poBandtmp = poTmpDataset->GetRasterBand(band);
                 CPL_IGNORE_RET_VAL(poBandtmp->RasterIO(
-                    GF_Write, 0, row, dxsize, 1, pabyScanline, dxsize, 1,
+                    GF_Write, 0, row, dxsize, 1, abyScanline.data(), dxsize, 1,
                     GDT_Byte, 0, 0, nullptr));
             }
         }
@@ -145,39 +127,28 @@ static void GenerateTiles(const std::string &filename, CPL_UNUSED int zoom,
                 {
                     if (hadnoData[i])
                     {
-                        pabyScanline[i] = 0;
+                        abyScanline[i] = 0;
                     }
                     else
                     {
-                        pabyScanline[i] = 255;
+                        abyScanline[i] = 255;
                     }
                 }
 
                 CPL_IGNORE_RET_VAL(alphaBand->RasterIO(
-                    GF_Write, 0, row, dxsize, 1, pabyScanline, dxsize, 1,
+                    GF_Write, 0, row, dxsize, 1, abyScanline.data(), dxsize, 1,
                     GDT_Byte, 0, 0, nullptr));
             }
         }
     }
 
-    delete[] pabyScanline;
-    delete[] hadnoData;
-
-    CPLString osOpenAfterCopy = CPLGetConfigOption("GDAL_OPEN_AFTER_COPY", "");
-    CPLSetThreadLocalConfigOption("GDAL_OPEN_AFTER_COPY", "NO");
+    CPLConfigOptionSetter oSetter("GDAL_OPEN_AFTER_COPY", "NO", false);
     /* to prevent CreateCopy() from calling QuietDelete() */
-    char **papszOptions =
-        CSLAddNameValue(nullptr, "@QUIET_DELETE_ON_CREATE_COPY", "NO");
-    GDALDataset *outDs = poOutputTileDriver->CreateCopy(
-        filename.c_str(), poTmpDataset, FALSE, papszOptions, nullptr, nullptr);
-    CSLDestroy(papszOptions);
-    CPLSetThreadLocalConfigOption(
-        "GDAL_OPEN_AFTER_COPY",
-        !osOpenAfterCopy.empty() ? osOpenAfterCopy.c_str() : nullptr);
-
-    GDALClose(poTmpDataset);
-    if (outDs)
-        GDALClose(outDs);
+    const char *const apszOptions[] = {"@QUIET_DELETE_ON_CREATE_COPY=NO",
+                                       nullptr};
+    std::unique_ptr<GDALDataset>(
+        poOutputTileDriver->CreateCopy(filename.c_str(), poTmpDataset.get(),
+                                       FALSE, apszOptions, nullptr, nullptr));
 }
 
 /************************************************************************/
@@ -322,14 +293,14 @@ static int GenerateChildKml(
         double zareasize1 = pow(2.0, (maxzoom - zoom - 1)) * dysize;
         xchildren.push_back(ix * 2);
         int tmp = ix * 2 + 1;
-        int tmp1 = (int)ceil(xsize / zareasize);
+        int tmp1 = static_cast<int>(ceil(xsize / zareasize));
         if (tmp < tmp1)
         {
             xchildren.push_back(ix * 2 + 1);
         }
         ychildern.push_back(iy * 2);
         tmp = iy * 2 + 1;
-        tmp1 = (int)ceil(ysize / zareasize1);
+        tmp1 = static_cast<int>(ceil(ysize / zareasize1));
         if (tmp < tmp1)
         {
             ychildern.push_back(iy * 2 + 1);
@@ -499,7 +470,7 @@ int KmlSuperOverlayReadDataset::DetectTransparency(int rxsize, int rysize,
     int rowOffset = rysize / dysize;
     int loopCount = rysize / rowOffset;
     int hasNoData = 0;
-    GByte *pabyScanline = new GByte[dxsize];
+    std::vector<GByte> abyScanline(dxsize);
 
     int flags = 0;
     for (int band = 1; band <= bands; band++)
@@ -513,11 +484,11 @@ int KmlSuperOverlayReadDataset::DetectTransparency(int rxsize, int rysize,
             {
                 int yOffset = ry + row * rowOffset;
                 CPL_IGNORE_RET_VAL(poBand->RasterIO(
-                    GF_Read, rx, yOffset, rxsize, rowOffset, pabyScanline,
+                    GF_Read, rx, yOffset, rxsize, rowOffset, abyScanline.data(),
                     dxsize, 1, GDT_Byte, 0, 0, nullptr));
                 for (int i = 0; i < dxsize; i++)
                 {
-                    if (pabyScanline[i] == noDataValue)
+                    if (abyScanline[i] == noDataValue)
                     {
                         flags |= KMLSO_ContainsTransparentPixels;
                     }
@@ -542,15 +513,15 @@ int KmlSuperOverlayReadDataset::DetectTransparency(int rxsize, int rysize,
             {
                 int yOffset = ry + row * rowOffset;
                 CPL_IGNORE_RET_VAL(poBand->RasterIO(
-                    GF_Read, rx, yOffset, rxsize, rowOffset, pabyScanline,
+                    GF_Read, rx, yOffset, rxsize, rowOffset, abyScanline.data(),
                     dxsize, 1, GDT_Byte, 0, 0, nullptr));
                 for (int i = 0; i < dxsize; i++)
                 {
-                    if (pabyScanline[i] == 255)
+                    if (abyScanline[i] == 255)
                     {
                         flags |= KMLSO_ContainsOpaquePixels;
                     }
-                    else if (pabyScanline[i] == 0)
+                    else if (abyScanline[i] == 0)
                     {
                         flags |= KMLSO_ContainsTransparentPixels;
                     }
@@ -562,7 +533,6 @@ int KmlSuperOverlayReadDataset::DetectTransparency(int rxsize, int rysize,
             }
         }
     }
-    delete[] pabyScanline;
     return flags;
 }
 
@@ -573,9 +543,7 @@ int KmlSuperOverlayReadDataset::DetectTransparency(int rxsize, int rysize,
 class KmlSuperOverlayDummyDataset final : public GDALDataset
 {
   public:
-    KmlSuperOverlayDummyDataset()
-    {
-    }
+    KmlSuperOverlayDummyDataset() = default;
 };
 
 static GDALDataset *
@@ -696,7 +664,7 @@ KmlSuperOverlayCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
         west = adfGeoTransform[0];
     }
 
-    OGRCoordinateTransformation *poTransform = nullptr;
+    std::unique_ptr<OGRCoordinateTransformation> poTransform;
     const auto poSrcSRS = poSrcDS->GetSpatialRef();
     if (poSrcSRS && poSrcSRS->IsProjected())
     {
@@ -704,7 +672,8 @@ KmlSuperOverlayCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
         poLatLong.SetWellKnownGeogCS("WGS84");
         poLatLong.SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
 
-        poTransform = OGRCreateCoordinateTransformation(poSrcSRS, &poLatLong);
+        poTransform.reset(
+            OGRCreateCoordinateTransformation(poSrcSRS, &poLatLong));
         if (poTransform != nullptr)
         {
             poTransform->Transform(1, &west, &south);
@@ -732,8 +701,8 @@ KmlSuperOverlayCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
             dtilexsize = dtilexsize / 2;
             maxzoom++;
         }
-        tilexsize = (int)dtilexsize;
-        tileysize = (int)((double)(dtilexsize * ysize) / xsize);
+        tilexsize = static_cast<int>(dtilexsize);
+        tileysize = static_cast<int>(dtilexsize * ysize / xsize);
     }
     else
     {
@@ -744,8 +713,8 @@ KmlSuperOverlayCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
             maxzoom++;
         }
 
-        tileysize = (int)dtileysize;
-        tilexsize = (int)((double)(dtileysize * xsize) / ysize);
+        tileysize = static_cast<int>(dtileysize);
+        tilexsize = static_cast<int>(dtileysize * xsize / ysize);
     }
 
     std::vector<double> zoomxpixels;
@@ -771,20 +740,19 @@ KmlSuperOverlayCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
     {
         tmpFileName = CPLFormFilename(outDir, "doc.kml", nullptr);
         nRet = GenerateRootKml(tmpFileName.c_str(), pszFilename, north, south,
-                               east, west, (int)tilexsize, pszOverlayName,
-                               pszOverlayDescription);
+                               east, west, static_cast<int>(tilexsize),
+                               pszOverlayName, pszOverlayDescription);
         fileVector.push_back(tmpFileName);
     }
     else
     {
         nRet = GenerateRootKml(pszFilename, pszFilename, north, south, east,
-                               west, (int)tilexsize, pszOverlayName,
-                               pszOverlayDescription);
+                               west, static_cast<int>(tilexsize),
+                               pszOverlayName, pszOverlayDescription);
     }
 
     if (nRet == FALSE)
     {
-        OGRCoordinateTransformation::DestroyCT(poTransform);
         if (zipHandle != nullptr)
         {
             VSIFCloseL(zipHandle);
@@ -835,11 +803,11 @@ KmlSuperOverlayCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
 
     for (zoom = maxzoom; zoom >= 0; --zoom)
     {
-        int rmaxxsize = tilexsize * (1 << (maxzoom - zoom));
-        int rmaxysize = tileysize * (1 << (maxzoom - zoom));
+        const int rmaxxsize = tilexsize * (1 << (maxzoom - zoom));
+        const int rmaxysize = tileysize * (1 << (maxzoom - zoom));
 
-        int xloop = (int)xsize / rmaxxsize;
-        int yloop = (int)ysize / rmaxysize;
+        const int xloop = std::max(1, static_cast<int>(xsize / rmaxxsize));
+        const int yloop = std::max(1, static_cast<int>(ysize / rmaxysize));
         nTotalTiles += xloop * yloop;
     }
 
@@ -854,14 +822,11 @@ KmlSuperOverlayCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
     std::pair<int, int> parentXYKey;
     for (zoom = maxzoom; zoom >= 0; --zoom)
     {
-        int rmaxxsize = tilexsize * (1 << (maxzoom - zoom));
-        int rmaxysize = tileysize * (1 << (maxzoom - zoom));
-
-        int xloop = (int)xsize / rmaxxsize;
-        int yloop = (int)ysize / rmaxysize;
+        const int rmaxxsize = tilexsize * (1 << (maxzoom - zoom));
+        const int rmaxysize = tileysize * (1 << (maxzoom - zoom));
 
-        xloop = xloop > 0 ? xloop : 1;
-        yloop = yloop > 0 ? yloop : 1;
+        const int xloop = std::max(1, static_cast<int>(xsize / rmaxxsize));
+        const int yloop = std::max(1, static_cast<int>(ysize / rmaxysize));
 
         std::stringstream zoomStr;
         zoomStr << zoom;
@@ -872,9 +837,9 @@ KmlSuperOverlayCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
 
         for (int ix = 0; ix < xloop; ix++)
         {
-            int rxsize = (int)(rmaxxsize);
-            int rx = (int)(ix * rmaxxsize);
-            int dxsize = (int)(rxsize / rmaxxsize * tilexsize);
+            int rxsize = static_cast<int>(rmaxxsize);
+            int rx = static_cast<int>(ix * rmaxxsize);
+            int dxsize = static_cast<int>(rxsize / rmaxxsize * tilexsize);
 
             std::stringstream ixStr;
             ixStr << ix;
@@ -886,9 +851,9 @@ KmlSuperOverlayCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
 
             for (int iy = 0; iy < yloop; iy++)
             {
-                int rysize = (int)(rmaxysize);
-                int ry = (int)(ysize - (iy * rmaxysize)) - rysize;
-                int dysize = (int)(rysize / rmaxysize * tileysize);
+                int rysize = static_cast<int>(rmaxysize);
+                int ry = static_cast<int>(ysize - (iy * rmaxysize)) - rysize;
+                int dysize = static_cast<int>(rysize / rmaxysize * tileysize);
 
                 std::stringstream iyStr;
                 iyStr << iy;
@@ -969,9 +934,9 @@ KmlSuperOverlayCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
                     std::make_pair(std::make_pair(ix, iy), hasChildKML));
                 GenerateChildKml(childKmlfile, zoom, ix, iy, zoomxpix, zoomypix,
                                  dxsize, dysize, tmpSouth, adfGeoTransform[0],
-                                 xsize, ysize, maxzoom, poTransform, fileExt,
-                                 fixAntiMeridian, pszAltitude, pszAltitudeMode,
-                                 childTiles[childXYKey]);
+                                 xsize, ysize, maxzoom, poTransform.get(),
+                                 fileExt, fixAntiMeridian, pszAltitude,
+                                 pszAltitudeMode, childTiles[childXYKey]);
 
                 nTileCount++;
                 pfnProgress(1.0 * nTileCount / nTotalTiles, "", pProgressData);
@@ -981,19 +946,17 @@ KmlSuperOverlayCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
         currentTiles.clear();
     }
 
-    OGRCoordinateTransformation::DestroyCT(poTransform);
-    poTransform = nullptr;
-
     if (zipHandle != nullptr)
     {
         VSIFCloseL(zipHandle);
     }
 
     GDALOpenInfo oOpenInfo(pszFilename, GA_ReadOnly);
-    GDALDataset *poDS = KmlSuperOverlayReadDataset::Open(&oOpenInfo);
-    if (poDS == nullptr)
-        poDS = new KmlSuperOverlayDummyDataset();
-    return poDS;
+    auto poDS = std::unique_ptr<GDALDataset>(
+        KmlSuperOverlayReadDataset::Open(&oOpenInfo));
+    if (!poDS)
+        poDS = std::make_unique<KmlSuperOverlayDummyDataset>();
+    return poDS.release();
 }
 
 /************************************************************************/
@@ -1028,9 +991,6 @@ static CPLString KMLRemoveSlash(const char *pszPathIn)
 /************************************************************************/
 
 KmlSuperOverlayReadDataset::KmlSuperOverlayReadDataset()
-    : nFactor(1), psRoot(nullptr), psDocument(nullptr), poDSIcon(nullptr),
-      nOverviewCount(0), papoOverviewDS(nullptr), bIsOvr(FALSE),
-      poParent(nullptr), psFirstLink(nullptr), psLastLink(nullptr)
 {
     m_oSRS.SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
     m_oSRS.importFromWkt(SRS_WKT_WGS84_LAT_LONG);
@@ -1061,12 +1021,11 @@ KmlSuperOverlayReadDataset::~KmlSuperOverlayReadDataset()
 int KmlSuperOverlayReadDataset::CloseDependentDatasets()
 {
     int bRet = FALSE;
-    if (poDSIcon != nullptr)
+    if (poDSIcon)
     {
         CPLString l_osFilename(poDSIcon->GetDescription());
-        delete poDSIcon;
+        poDSIcon.reset();
         VSIUnlink(l_osFilename);
-        poDSIcon = nullptr;
         bRet = TRUE;
     }
 
@@ -1087,14 +1046,10 @@ int KmlSuperOverlayReadDataset::CloseDependentDatasets()
         psCur = psNext;
     }
 
-    if (nOverviewCount > 0)
+    if (!m_apoOverviewDS.empty())
     {
         bRet = TRUE;
-        for (int i = 0; i < nOverviewCount; i++)
-            delete papoOverviewDS[i];
-        CPLFree(papoOverviewDS);
-        nOverviewCount = 0;
-        papoOverviewDS = nullptr;
+        m_apoOverviewDS.clear();
     }
 
     return bRet;
@@ -1116,7 +1071,7 @@ const OGRSpatialReference *KmlSuperOverlayReadDataset::GetSpatialRef() const
 
 CPLErr KmlSuperOverlayReadDataset::GetGeoTransform(double *padfGeoTransform)
 {
-    memcpy(padfGeoTransform, adfGeoTransform, 6 * sizeof(double));
+    memcpy(padfGeoTransform, adfGeoTransform.data(), 6 * sizeof(double));
     return CE_None;
 }
 
@@ -1163,7 +1118,7 @@ CPLErr KmlSuperOverlayRasterBand::IReadBlock(int nBlockXOff, int nBlockYOff,
 
 GDALColorInterp KmlSuperOverlayRasterBand::GetColorInterpretation()
 {
-    return (GDALColorInterp)(GCI_RedBand + nBand - 1);
+    return static_cast<GDALColorInterp>(GCI_RedBand + nBand - 1);
 }
 
 /************************************************************************/
@@ -1175,7 +1130,8 @@ CPLErr KmlSuperOverlayRasterBand::IRasterIO(
     void *pData, int nBufXSize, int nBufYSize, GDALDataType eBufType,
     GSpacing nPixelSpace, GSpacing nLineSpace, GDALRasterIOExtraArg *psExtraArg)
 {
-    KmlSuperOverlayReadDataset *poGDS = (KmlSuperOverlayReadDataset *)poDS;
+    KmlSuperOverlayReadDataset *poGDS =
+        cpl::down_cast<KmlSuperOverlayReadDataset *>(poDS);
 
     return poGDS->IRasterIO(eRWFlag, nXOff, nYOff, nXSize, nYSize, pData,
                             nBufXSize, nBufYSize, eBufType, 1, &nBand,
@@ -1188,9 +1144,10 @@ CPLErr KmlSuperOverlayRasterBand::IRasterIO(
 
 int KmlSuperOverlayRasterBand::GetOverviewCount()
 {
-    KmlSuperOverlayReadDataset *poGDS = (KmlSuperOverlayReadDataset *)poDS;
+    KmlSuperOverlayReadDataset *poGDS =
+        cpl::down_cast<KmlSuperOverlayReadDataset *>(poDS);
 
-    return poGDS->nOverviewCount;
+    return static_cast<int>(poGDS->m_apoOverviewDS.size());
 }
 
 /************************************************************************/
@@ -1199,39 +1156,76 @@ int KmlSuperOverlayRasterBand::GetOverviewCount()
 
 GDALRasterBand *KmlSuperOverlayRasterBand::GetOverview(int iOvr)
 {
-    KmlSuperOverlayReadDataset *poGDS = (KmlSuperOverlayReadDataset *)poDS;
+    KmlSuperOverlayReadDataset *poGDS =
+        cpl::down_cast<KmlSuperOverlayReadDataset *>(poDS);
 
-    if (iOvr < 0 || iOvr >= poGDS->nOverviewCount)
+    if (iOvr < 0 || iOvr >= static_cast<int>(poGDS->m_apoOverviewDS.size()))
         return nullptr;
 
-    return poGDS->papoOverviewDS[iOvr]->GetRasterBand(nBand);
+    return poGDS->m_apoOverviewDS[iOvr]->GetRasterBand(nBand);
 }
 
 /************************************************************************/
 /*                     KmlSuperOverlayGetBoundingBox()                  */
 /************************************************************************/
 
-static int KmlSuperOverlayGetBoundingBox(CPLXMLNode *psNode, double *adfExtents)
+static bool KmlSuperOverlayGetBoundingBox(const CPLXMLNode *psNode,
+                                          std::array<double, 4> &adfExtents)
 {
-    CPLXMLNode *psBox = CPLGetXMLNode(psNode, "LatLonBox");
-    if (psBox == nullptr)
+    const CPLXMLNode *psBox = CPLGetXMLNode(psNode, "LatLonBox");
+    if (!psBox)
         psBox = CPLGetXMLNode(psNode, "LatLonAltBox");
-    if (psBox == nullptr)
-        return FALSE;
+    if (psBox)
+    {
+        const char *pszNorth = CPLGetXMLValue(psBox, "north", nullptr);
+        const char *pszSouth = CPLGetXMLValue(psBox, "south", nullptr);
+        const char *pszEast = CPLGetXMLValue(psBox, "east", nullptr);
+        const char *pszWest = CPLGetXMLValue(psBox, "west", nullptr);
+        if (pszNorth && pszSouth && pszEast && pszWest)
+        {
+            adfExtents[0] = CPLAtof(pszWest);
+            adfExtents[1] = CPLAtof(pszSouth);
+            adfExtents[2] = CPLAtof(pszEast);
+            adfExtents[3] = CPLAtof(pszNorth);
 
-    const char *pszNorth = CPLGetXMLValue(psBox, "north", nullptr);
-    const char *pszSouth = CPLGetXMLValue(psBox, "south", nullptr);
-    const char *pszEast = CPLGetXMLValue(psBox, "east", nullptr);
-    const char *pszWest = CPLGetXMLValue(psBox, "west", nullptr);
-    if (pszNorth == nullptr || pszSouth == nullptr || pszEast == nullptr ||
-        pszWest == nullptr)
-        return FALSE;
+            return true;
+        }
+    }
+    else
+    {
+        const CPLXMLNode *psLatLonQuad = CPLGetXMLNode(psNode, "gx:LatLonQuad");
+        if (psLatLonQuad)
+        {
+            const CPLStringList aosTuples(CSLTokenizeString2(
+                CPLGetXMLValue(psLatLonQuad, "coordinates", ""), " \t\n\r", 0));
+            if (aosTuples.size() == 4)
+            {
+                const CPLStringList aosLL(
+                    CSLTokenizeString2(aosTuples[0], ",", 0));
+                const CPLStringList aosLR(
+                    CSLTokenizeString2(aosTuples[1], ",", 0));
+                const CPLStringList aosUR(
+                    CSLTokenizeString2(aosTuples[2], ",", 0));
+                const CPLStringList aosUL(
+                    CSLTokenizeString2(aosTuples[3], ",", 0));
+                if (aosLL.size() >= 2 && aosLR.size() >= 2 &&
+                    aosUR.size() >= 2 && aosUL.size() >= 2 &&
+                    strcmp(aosLL[0], aosUL[0]) == 0 &&
+                    strcmp(aosLL[1], aosLR[1]) == 0 &&
+                    strcmp(aosLR[0], aosUR[0]) == 0 &&
+                    strcmp(aosUR[1], aosUL[1]) == 0)
+                {
+                    adfExtents[0] = CPLAtof(aosLL[0]);
+                    adfExtents[1] = CPLAtof(aosLL[1]);
+                    adfExtents[2] = CPLAtof(aosUR[0]);
+                    adfExtents[3] = CPLAtof(aosUR[1]);
+                    return true;
+                }
+            }
+        }
+    }
 
-    adfExtents[0] = CPLAtof(pszWest);
-    adfExtents[1] = CPLAtof(pszSouth);
-    adfExtents[2] = CPLAtof(pszEast);
-    adfExtents[3] = CPLAtof(pszNorth);
-    return TRUE;
+    return false;
 }
 
 /************************************************************************/
@@ -1241,8 +1235,8 @@ static int KmlSuperOverlayGetBoundingBox(CPLXMLNode *psNode, double *adfExtents)
 class SubImageDesc
 {
   public:
-    GDALDataset *poDS;
-    double adfExtents[4];
+    GDALDataset *poDS = nullptr;
+    std::array<double, 4> adfExtents = {0, 0, 0, 0};
 };
 
 CPLErr KmlSuperOverlayReadDataset::IRasterIO(
@@ -1282,25 +1276,27 @@ CPLErr KmlSuperOverlayReadDataset::IRasterIO(
 
     if (nBufXSize > dfXSize || nBufYSize > dfYSize)
     {
-        double dfRequestXMin = adfGeoTransform[0] + nXOff * adfGeoTransform[1];
-        double dfRequestXMax =
+        const double dfRequestXMin =
+            adfGeoTransform[0] + nXOff * adfGeoTransform[1];
+        const double dfRequestXMax =
             adfGeoTransform[0] + (nXOff + nXSize) * adfGeoTransform[1];
-        double dfRequestYMin =
+        const double dfRequestYMin =
             adfGeoTransform[3] + (nYOff + nYSize) * adfGeoTransform[5];
-        double dfRequestYMax = adfGeoTransform[3] + nYOff * adfGeoTransform[5];
+        const double dfRequestYMax =
+            adfGeoTransform[3] + nYOff * adfGeoTransform[5];
 
-        CPLXMLNode *psIter = psDocument->psChild;
-        std::vector<SubImageDesc> aosImages;
-        double dfXRes = adfGeoTransform[1] * nFactor;
-        double dfYRes = -adfGeoTransform[5] * nFactor;
+        const CPLXMLNode *psIter = psDocument->psChild;
+        std::vector<SubImageDesc> aoImages;
+        const double dfXRes = adfGeoTransform[1] * nFactor;
+        const double dfYRes = -adfGeoTransform[5] * nFactor;
         double dfNewXRes = dfXRes;
         double dfNewYRes = dfYRes;
 
         while (psIter != nullptr)
         {
-            CPLXMLNode *psRegion = nullptr;
-            CPLXMLNode *psLink = nullptr;
-            double adfExtents[4];
+            const CPLXMLNode *psRegion = nullptr;
+            const CPLXMLNode *psLink = nullptr;
+            std::array<double, 4> adfExtents = {0, 0, 0, 0};
             const char *pszHref = nullptr;
             if (psIter->eType == CXT_Element &&
                 strcmp(psIter->pszValue, "NetworkLink") == 0 &&
@@ -1369,9 +1365,10 @@ CPLErr KmlSuperOverlayReadDataset::IRasterIO(
                                 psLinkDS = new LinkedDataset();
 
                             poRoot->oMapChildren[osSubFilename] = psLinkDS;
-                            poSubImageDS = (KmlSuperOverlayReadDataset *)
-                                KmlSuperOverlayReadDataset::Open(osSubFilename,
-                                                                 poRoot);
+                            poSubImageDS =
+                                cpl::down_cast<KmlSuperOverlayReadDataset *>(
+                                    KmlSuperOverlayReadDataset::Open(
+                                        osSubFilename, poRoot));
                             if (poSubImageDS)
                                 poSubImageDS->MarkAsShared();
                             else
@@ -1439,9 +1436,8 @@ CPLErr KmlSuperOverlayReadDataset::IRasterIO(
                         SubImageDesc oImageDesc;
                         oImageDesc.poDS = poSubImageDS;
                         poSubImageDS->Reference();
-                        memcpy(oImageDesc.adfExtents, adfExtents,
-                               4 * sizeof(double));
-                        aosImages.push_back(oImageDesc);
+                        oImageDesc.adfExtents = adfExtents;
+                        aoImages.push_back(oImageDesc);
                     }
                     CPL_IGNORE_RET_VAL(osSubFilename);
                 }
@@ -1451,96 +1447,84 @@ CPLErr KmlSuperOverlayReadDataset::IRasterIO(
 
         if (dfNewXRes < dfXRes || dfNewYRes < dfYRes)
         {
-            int i;
-            double dfXFactor = dfXRes / dfNewXRes;
-            double dfYFactor = dfYRes / dfNewYRes;
-            VRTDataset *poVRTDS =
-                new VRTDataset((int)(nRasterXSize * dfXFactor + 0.5),
-                               (int)(nRasterYSize * dfYFactor + 0.5));
+            const double dfXFactor = dfXRes / dfNewXRes;
+            const double dfYFactor = dfYRes / dfNewYRes;
+            auto poVRTDS = std::make_unique<VRTDataset>(
+                static_cast<int>(nRasterXSize * dfXFactor + 0.5),
+                static_cast<int>(nRasterYSize * dfYFactor + 0.5));
 
             for (int iBandIdx = 0; iBandIdx < 4; iBandIdx++)
             {
-                VRTAddBand((VRTDatasetH)poVRTDS, GDT_Byte, nullptr);
+                poVRTDS->AddBand(GDT_Byte, nullptr);
 
-                int nBand = iBandIdx + 1;
+                auto poVRTBand = static_cast<VRTSourcedRasterBand *>(
+                    poVRTDS->GetRasterBand(iBandIdx + 1));
+                const int nBand = iBandIdx + 1;
                 if (nBand <= nIconCount || (nIconCount == 1 && nBand != 4))
                 {
-                    VRTAddSimpleSource(
-                        (VRTSourcedRasterBandH)poVRTDS->GetRasterBand(iBandIdx +
-                                                                      1),
-                        (GDALRasterBandH)poDSIcon->GetRasterBand(
-                            nBand <= nIconCount ? nBand : 1),
+                    poVRTBand->AddSimpleSource(
+                        poDSIcon->GetRasterBand(nBand <= nIconCount ? nBand
+                                                                    : 1),
                         0, 0, nRasterXSize, nRasterYSize, 0, 0,
                         poVRTDS->GetRasterXSize(), poVRTDS->GetRasterYSize(),
                         nullptr, VRT_NODATA_UNSET);
                 }
                 else
                 {
-                    VRTAddComplexSource(
-                        (VRTSourcedRasterBandH)poVRTDS->GetRasterBand(iBandIdx +
-                                                                      1),
-                        (GDALRasterBandH)poDSIcon->GetRasterBand(1), 0, 0,
-                        nRasterXSize, nRasterYSize, 0, 0,
-                        poVRTDS->GetRasterXSize(), poVRTDS->GetRasterYSize(),
-                        VRT_NODATA_UNSET, 0, 255);
+                    poVRTBand->AddComplexSource(
+                        poDSIcon->GetRasterBand(1), 0, 0, nRasterXSize,
+                        nRasterYSize, 0, 0, poVRTDS->GetRasterXSize(),
+                        poVRTDS->GetRasterYSize(), VRT_NODATA_UNSET, 0, 255);
                 }
             }
 
-            for (i = 0; i < (int)aosImages.size(); i++)
+            for (const auto &oImage : aoImages)
             {
-                int nDstXOff =
-                    (int)((aosImages[i].adfExtents[0] - adfGeoTransform[0]) /
-                              dfNewXRes +
-                          0.5);
-                int nDstYOff =
-                    (int)((adfGeoTransform[3] - aosImages[i].adfExtents[3]) /
-                              dfNewYRes +
-                          0.5);
-                int nDstXSize = (int)((aosImages[i].adfExtents[2] -
-                                       aosImages[i].adfExtents[0]) /
-                                          dfNewXRes +
-                                      0.5);
-                int nDstYSize = (int)((aosImages[i].adfExtents[3] -
-                                       aosImages[i].adfExtents[1]) /
-                                          dfNewYRes +
-                                      0.5);
-
-                int nSrcBandCount = aosImages[i].poDS->GetRasterCount();
+                const int nDstXOff = static_cast<int>(
+                    (oImage.adfExtents[0] - adfGeoTransform[0]) / dfNewXRes +
+                    0.5);
+                const int nDstYOff = static_cast<int>(
+                    (adfGeoTransform[3] - oImage.adfExtents[3]) / dfNewYRes +
+                    0.5);
+                const int nDstXSize = static_cast<int>(
+                    (oImage.adfExtents[2] - oImage.adfExtents[0]) / dfNewXRes +
+                    0.5);
+                const int nDstYSize = static_cast<int>(
+                    (oImage.adfExtents[3] - oImage.adfExtents[1]) / dfNewYRes +
+                    0.5);
+
+                const int nSrcBandCount = oImage.poDS->GetRasterCount();
                 for (int iBandIdx = 0; iBandIdx < 4; iBandIdx++)
                 {
-                    int nBand = iBandIdx + 1;
+                    const int nBand = iBandIdx + 1;
+                    auto poVRTBand = static_cast<VRTSourcedRasterBand *>(
+                        poVRTDS->GetRasterBand(iBandIdx + 1));
+
                     if (nBand <= nSrcBandCount ||
                         (nSrcBandCount == 1 && nBand != 4))
                     {
-                        VRTAddSimpleSource(
-                            (VRTSourcedRasterBandH)poVRTDS->GetRasterBand(
-                                iBandIdx + 1),
-                            (GDALRasterBandH)aosImages[i].poDS->GetRasterBand(
+                        poVRTBand->AddSimpleSource(
+                            oImage.poDS->GetRasterBand(
                                 nBand <= nSrcBandCount ? nBand : 1),
-                            0, 0, aosImages[i].poDS->GetRasterXSize(),
-                            aosImages[i].poDS->GetRasterYSize(), nDstXOff,
-                            nDstYOff, nDstXSize, nDstYSize, nullptr,
-                            VRT_NODATA_UNSET);
+                            0, 0, oImage.poDS->GetRasterXSize(),
+                            oImage.poDS->GetRasterYSize(), nDstXOff, nDstYOff,
+                            nDstXSize, nDstYSize, nullptr, VRT_NODATA_UNSET);
                     }
                     else
                     {
-                        VRTAddComplexSource(
-                            (VRTSourcedRasterBandH)poVRTDS->GetRasterBand(
-                                iBandIdx + 1),
-                            (GDALRasterBandH)aosImages[i].poDS->GetRasterBand(
-                                1),
-                            0, 0, aosImages[i].poDS->GetRasterXSize(),
-                            aosImages[i].poDS->GetRasterYSize(), nDstXOff,
-                            nDstYOff, nDstXSize, nDstYSize, VRT_NODATA_UNSET, 0,
-                            255);
+                        poVRTBand->AddComplexSource(
+                            oImage.poDS->GetRasterBand(1), 0, 0,
+                            oImage.poDS->GetRasterXSize(),
+                            oImage.poDS->GetRasterYSize(), nDstXOff, nDstYOff,
+                            nDstXSize, nDstYSize, VRT_NODATA_UNSET, 0, 255);
                     }
                 }
             }
 
-            int nReqXOff = (int)(dfXOff * dfXFactor + 0.5);
-            int nReqYOff = (int)(dfYOff * dfYFactor + 0.5);
-            int nReqXSize = (int)(dfXSize * dfXFactor + 0.5);
-            int nReqYSize = (int)(dfYSize * dfYFactor + 0.5);
+            int nReqXOff = static_cast<int>(dfXOff * dfXFactor + 0.5);
+            int nReqYOff = static_cast<int>(dfYOff * dfYFactor + 0.5);
+            int nReqXSize = static_cast<int>(dfXSize * dfXFactor + 0.5);
+            int nReqYSize = static_cast<int>(dfYSize * dfYFactor + 0.5);
             if (nReqXOff + nReqXSize > poVRTDS->GetRasterXSize())
                 nReqXSize = poVRTDS->GetRasterXSize() - nReqXOff;
             if (nReqYOff + nReqYSize > poVRTDS->GetRasterYSize())
@@ -1555,13 +1539,11 @@ CPLErr KmlSuperOverlayReadDataset::IRasterIO(
                 nBufXSize, nBufYSize, eBufType, nBandCount, panBandMap,
                 nPixelSpace, nLineSpace, nBandSpace, &sExtraArgs);
 
-            for (i = 0; i < (int)aosImages.size(); i++)
+            for (auto &oImage : aoImages)
             {
-                aosImages[i].poDS->Dereference();
+                oImage.poDS->Dereference();
             }
 
-            delete poVRTDS;
-
             return eErr;
         }
     }
@@ -1579,20 +1561,21 @@ CPLErr KmlSuperOverlayReadDataset::IRasterIO(
             GByte nVal = (nBand == 4) ? 255 : 0;
             for (int j = 0; j < nBufYSize; j++)
             {
-                GDALCopyWords(
-                    &nVal, GDT_Byte, 0,
-                    ((GByte *)pData) + j * nLineSpace + iBandIdx * nBandSpace,
-                    eBufType, static_cast<int>(nPixelSpace), nBufXSize);
+                GDALCopyWords(&nVal, GDT_Byte, 0,
+                              static_cast<GByte *>(pData) + j * nLineSpace +
+                                  iBandIdx * nBandSpace,
+                              eBufType, static_cast<int>(nPixelSpace),
+                              nBufXSize);
             }
             continue;
         }
 
         int nIconBand = (nIconCount == 1) ? 1 : nBand;
 
-        int nReqXOff = (int)(dfXOff + 0.5);
-        int nReqYOff = (int)(dfYOff + 0.5);
-        int nReqXSize = (int)(dfXSize + 0.5);
-        int nReqYSize = (int)(dfYSize + 0.5);
+        int nReqXOff = static_cast<int>(dfXOff + 0.5);
+        int nReqYOff = static_cast<int>(dfYOff + 0.5);
+        int nReqXSize = static_cast<int>(dfXSize + 0.5);
+        int nReqYSize = static_cast<int>(dfYSize + 0.5);
         if (nReqXOff + nReqXSize > poDSIcon->GetRasterXSize())
             nReqXSize = poDSIcon->GetRasterXSize() - nReqXOff;
         if (nReqYOff + nReqYSize > poDSIcon->GetRasterYSize())
@@ -1609,8 +1592,8 @@ CPLErr KmlSuperOverlayReadDataset::IRasterIO(
 
         eErr = poDSIcon->GetRasterBand(nIconBand)->RasterIO(
             eRWFlag, nReqXOff, nReqYOff, nReqXSize, nReqYSize,
-            ((GByte *)pData) + nBandSpace * iBandIdx, nBufXSize, nBufYSize,
-            eBufType, nPixelSpace, nLineSpace, &sExtraArgs);
+            static_cast<GByte *>(pData) + nBandSpace * iBandIdx, nBufXSize,
+            nBufYSize, eBufType, nPixelSpace, nLineSpace, &sExtraArgs);
 
         GDALDestroyScaledProgress(sExtraArgs.pProgressData);
     }
@@ -1707,32 +1690,31 @@ int KmlSuperOverlayReadDataset::Identify(GDALOpenInfo *poOpenInfo)
 #ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
         !EQUAL(pszExt, "kml") ||
 #endif
-        strstr((const char *)poOpenInfo->pabyHeader, "<kml") == nullptr)
+        strstr(reinterpret_cast<const char *>(poOpenInfo->pabyHeader),
+               "<kml") == nullptr)
         return FALSE;
 
     for (int i = 0; i < 2; i++)
     {
-        if (strstr((const char *)poOpenInfo->pabyHeader, "<NetworkLink>") !=
-                nullptr &&
-            strstr((const char *)poOpenInfo->pabyHeader, "<Region>") !=
-                nullptr &&
-            strstr((const char *)poOpenInfo->pabyHeader, "<Link>") != nullptr)
+        // Leave below variable here as the TryToIngest() at end might
+        // invalidate it
+        const char *pszText =
+            reinterpret_cast<const char *>(poOpenInfo->pabyHeader);
+        if (strstr(pszText, "<NetworkLink>") != nullptr &&
+            strstr(pszText, "<Region>") != nullptr &&
+            strstr(pszText, "<Link>") != nullptr)
             return TRUE;
 
-        if (strstr((const char *)poOpenInfo->pabyHeader, "<Document>") !=
-                nullptr &&
-            strstr((const char *)poOpenInfo->pabyHeader, "<Region>") !=
-                nullptr &&
-            strstr((const char *)poOpenInfo->pabyHeader, "<GroundOverlay>") !=
-                nullptr)
+        if (strstr(pszText, "<Document>") != nullptr &&
+            strstr(pszText, "<Region>") != nullptr &&
+            strstr(pszText, "<GroundOverlay>") != nullptr)
             return TRUE;
 
-        if (strstr((const char *)poOpenInfo->pabyHeader, "<GroundOverlay>") !=
-                nullptr &&
-            strstr((const char *)poOpenInfo->pabyHeader, "<Icon>") != nullptr &&
-            strstr((const char *)poOpenInfo->pabyHeader, "<href>") != nullptr &&
-            strstr((const char *)poOpenInfo->pabyHeader, "<LatLonBox>") !=
-                nullptr)
+        if (strstr(pszText, "<GroundOverlay>") != nullptr &&
+            strstr(pszText, "<Icon>") != nullptr &&
+            strstr(pszText, "<href>") != nullptr &&
+            (strstr(pszText, "<LatLonBox>") != nullptr ||
+             strstr(pszText, "<gx:LatLonQuad>") != nullptr))
             return TRUE;
 
         if (i == 0 && !poOpenInfo->TryToIngest(1024 * 10))
@@ -1761,8 +1743,8 @@ GDALDataset *KmlSuperOverlayReadDataset::Open(GDALOpenInfo *poOpenInfo)
 
 #define BUFFER_SIZE 20000000
 
-static GDALDataset *KmlSuperOverlayLoadIcon(const char *pszBaseFilename,
-                                            const char *pszIcon)
+static std::unique_ptr<GDALDataset>
+KmlSuperOverlayLoadIcon(const char *pszBaseFilename, const char *pszIcon)
 {
     const char *pszExt = CPLGetExtension(pszIcon);
     if (!EQUAL(pszExt, "png") && !EQUAL(pszExt, "jpg") &&
@@ -1786,13 +1768,13 @@ static GDALDataset *KmlSuperOverlayLoadIcon(const char *pszBaseFilename,
     {
         return nullptr;
     }
-    GByte *pabyBuffer = (GByte *)VSIMalloc(BUFFER_SIZE);
+    GByte *pabyBuffer = static_cast<GByte *>(VSIMalloc(BUFFER_SIZE));
     if (pabyBuffer == nullptr)
     {
         VSIFCloseL(fp);
         return nullptr;
     }
-    int nRead = (int)VSIFReadL(pabyBuffer, 1, BUFFER_SIZE, fp);
+    const size_t nRead = VSIFReadL(pabyBuffer, 1, BUFFER_SIZE, fp);
     VSIFCloseL(fp);
     if (nRead == BUFFER_SIZE)
     {
@@ -1800,13 +1782,12 @@ static GDALDataset *KmlSuperOverlayLoadIcon(const char *pszBaseFilename,
         return nullptr;
     }
 
-    static int nInc = 0;
-    osSubFilename =
-        CPLSPrintf("/vsimem/kmlsuperoverlay/%d_%p", nInc++, pszBaseFilename);
+    osSubFilename = VSIMemGenerateHiddenFilename("kmlsuperoverlay");
     VSIFCloseL(VSIFileFromMemBuffer(osSubFilename, pabyBuffer, nRead, TRUE));
 
-    GDALDataset *poDSIcon = (GDALDataset *)GDALOpen(osSubFilename, GA_ReadOnly);
-    if (poDSIcon == nullptr)
+    auto poDSIcon = std::unique_ptr<GDALDataset>(GDALDataset::Open(
+        osSubFilename, GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR));
+    if (!poDSIcon)
     {
         VSIUnlink(osSubFilename);
         return nullptr;
@@ -1848,14 +1829,15 @@ static bool KmlSuperOverlayComputeDepth(const std::string &osFilename,
                 VSILFILE *fp = VSIFOpenL(osSubFilename, "rb");
                 if (fp != nullptr)
                 {
-                    char *pszBuffer =
-                        (char *)VSI_MALLOC_VERBOSE(BUFFER_SIZE + 1);
+                    char *pszBuffer = static_cast<char *>(
+                        VSI_MALLOC_VERBOSE(BUFFER_SIZE + 1));
                     if (pszBuffer == nullptr)
                     {
                         VSIFCloseL(fp);
                         return false;
                     }
-                    int nRead = (int)VSIFReadL(pszBuffer, 1, BUFFER_SIZE, fp);
+                    const size_t nRead =
+                        VSIFReadL(pszBuffer, 1, BUFFER_SIZE, fp);
                     pszBuffer[nRead] = '\0';
                     VSIFCloseL(fp);
                     if (nRead == BUFFER_SIZE)
@@ -1917,17 +1899,17 @@ class KmlSingleDocRasterDataset final : public GDALDataset
 {
     friend class KmlSingleDocRasterRasterBand;
     OGRSpatialReference m_oSRS{};
-    CPLString osDirname;
-    CPLString osNominalExt;
-    GDALDataset *poCurTileDS;
-    double adfGlobalExtents[4];
-    double adfGeoTransform[6];
-    std::vector<KmlSingleDocRasterDataset *> apoOverviews;
-    std::vector<KmlSingleDocRasterTilesDesc> aosDescs;
-    int nLevel;
-    int nTileSize;
-    int bHasBuiltOverviews;
-    int bLockOtherBands;
+    CPLString osDirname{};
+    CPLString osNominalExt{};
+    std::unique_ptr<GDALDataset> poCurTileDS{};
+    std::array<double, 4> adfGlobalExtents = {0, 0, 0, 0};
+    std::array<double, 6> adfGeoTransform = {0, 0, 0, 0, 0, 0};
+    std::vector<std::unique_ptr<KmlSingleDocRasterDataset>> m_apoOverviews{};
+    std::vector<KmlSingleDocRasterTilesDesc> aosDescs{};
+    int nLevel = 0;
+    int nTileSize = 0;
+    bool bHasBuiltOverviews = false;
+    bool bLockOtherBands = false;
 
   protected:
     virtual int CloseDependentDatasets() override;
@@ -1938,7 +1920,7 @@ class KmlSingleDocRasterDataset final : public GDALDataset
 
     virtual CPLErr GetGeoTransform(double *padfGeoTransform) override
     {
-        memcpy(padfGeoTransform, adfGeoTransform, 6 * sizeof(double));
+        memcpy(padfGeoTransform, adfGeoTransform.data(), 6 * sizeof(double));
         return CE_None;
     }
 
@@ -1977,13 +1959,6 @@ KmlSingleDocRasterDataset::KmlSingleDocRasterDataset()
 {
     m_oSRS.SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
     m_oSRS.importFromWkt(SRS_WKT_WGS84_LAT_LONG);
-    poCurTileDS = nullptr;
-    nLevel = 0;
-    nTileSize = 0;
-    bHasBuiltOverviews = FALSE;
-    bLockOtherBands = FALSE;
-    memset(adfGlobalExtents, 0, sizeof(adfGlobalExtents));
-    memset(adfGeoTransform, 0, sizeof(adfGeoTransform));
 }
 
 /************************************************************************/
@@ -2003,18 +1978,15 @@ int KmlSingleDocRasterDataset::CloseDependentDatasets()
 {
     int bRet = FALSE;
 
-    if (poCurTileDS != nullptr)
+    if (poCurTileDS)
     {
         bRet = TRUE;
-        GDALClose((GDALDatasetH)poCurTileDS);
-        poCurTileDS = nullptr;
+        poCurTileDS.reset();
     }
-    if (!apoOverviews.empty())
+    if (!m_apoOverviews.empty())
     {
         bRet = TRUE;
-        for (size_t i = 0; i < apoOverviews.size(); i++)
-            delete apoOverviews[i];
-        apoOverviews.resize(0);
+        m_apoOverviews.clear();
     }
 
     return bRet;
@@ -2024,20 +1996,20 @@ int KmlSingleDocRasterDataset::CloseDependentDatasets()
 /*                     KmlSingleDocGetDimensions()                      */
 /************************************************************************/
 
-static int KmlSingleDocGetDimensions(const CPLString &osDirname,
-                                     const KmlSingleDocRasterTilesDesc &oDesc,
-                                     int nLevel, int nTileSize, int &nXSize,
-                                     int &nYSize, int &nBands, int &bHasCT)
+static bool KmlSingleDocGetDimensions(const CPLString &osDirname,
+                                      const KmlSingleDocRasterTilesDesc &oDesc,
+                                      int nLevel, int nTileSize, int &nXSize,
+                                      int &nYSize, int &nBands, int &bHasCT)
 {
     const char *pszImageFilename = CPLFormFilename(
         osDirname,
         CPLSPrintf("kml_image_L%d_%d_%d", nLevel, oDesc.nMaxJ_j, oDesc.nMaxJ_i),
         oDesc.szExtJ);
-    GDALDataset *poImageDS =
-        (GDALDataset *)GDALOpen(pszImageFilename, GA_ReadOnly);
-    if (poImageDS == nullptr)
+    auto poImageDS = std::unique_ptr<GDALDataset>(GDALDataset::Open(
+        pszImageFilename, GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR));
+    if (!poImageDS)
     {
-        return FALSE;
+        return false;
     }
     int nRightXSize;
     int nBottomYSize = poImageDS->GetRasterYSize();
@@ -2050,20 +2022,19 @@ static int KmlSingleDocGetDimensions(const CPLString &osDirname,
     }
     else
     {
-        GDALClose((GDALDatasetH)poImageDS);
         pszImageFilename =
             CPLFormFilename(osDirname,
                             CPLSPrintf("kml_image_L%d_%d_%d", nLevel,
                                        oDesc.nMaxI_j, oDesc.nMaxI_i),
                             oDesc.szExtI);
-        poImageDS = (GDALDataset *)GDALOpen(pszImageFilename, GA_ReadOnly);
-        if (poImageDS == nullptr)
+        poImageDS.reset(GDALDataset::Open(
+            pszImageFilename, GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR));
+        if (!poImageDS)
         {
-            return FALSE;
+            return false;
         }
         nRightXSize = poImageDS->GetRasterXSize();
     }
-    GDALClose((GDALDatasetH)poImageDS);
 
     nXSize = nRightXSize + oDesc.nMaxI_i * nTileSize;
     nYSize = nBottomYSize + oDesc.nMaxJ_j * nTileSize;
@@ -2080,7 +2051,7 @@ void KmlSingleDocRasterDataset::BuildOverviews()
         return;
     bHasBuiltOverviews = TRUE;
 
-    for (int k = 2; k <= (int)aosDescs.size(); k++)
+    for (int k = 2; k <= static_cast<int>(aosDescs.size()); k++)
     {
         const KmlSingleDocRasterTilesDesc &oDesc =
             aosDescs[aosDescs.size() - k];
@@ -2088,17 +2059,17 @@ void KmlSingleDocRasterDataset::BuildOverviews()
         int nYSize = 0;
         int nTileBands = 0;
         int bHasCT = FALSE;
-        if (!KmlSingleDocGetDimensions(osDirname, oDesc,
-                                       (int)aosDescs.size() - k + 1, nTileSize,
-                                       nXSize, nYSize, nTileBands, bHasCT))
+        if (!KmlSingleDocGetDimensions(
+                osDirname, oDesc, static_cast<int>(aosDescs.size()) - k + 1,
+                nTileSize, nXSize, nYSize, nTileBands, bHasCT))
         {
             break;
         }
 
-        KmlSingleDocRasterDataset *poOvrDS = new KmlSingleDocRasterDataset();
+        auto poOvrDS = std::make_unique<KmlSingleDocRasterDataset>();
         poOvrDS->nRasterXSize = nXSize;
         poOvrDS->nRasterYSize = nYSize;
-        poOvrDS->nLevel = (int)aosDescs.size() - k + 1;
+        poOvrDS->nLevel = static_cast<int>(aosDescs.size()) - k + 1;
         poOvrDS->nTileSize = nTileSize;
         poOvrDS->osDirname = osDirname;
         poOvrDS->osNominalExt = oDesc.szExtI;
@@ -2113,10 +2084,11 @@ void KmlSingleDocRasterDataset::BuildOverviews()
             poOvrDS->nRasterXSize;
         for (int iBand = 1; iBand <= nBands; iBand++)
             poOvrDS->SetBand(iBand,
-                             new KmlSingleDocRasterRasterBand(poOvrDS, iBand));
+                             std::make_unique<KmlSingleDocRasterRasterBand>(
+                                 poOvrDS.get(), iBand));
         poOvrDS->SetMetadataItem("INTERLEAVE", "PIXEL", "IMAGE_STRUCTURE");
 
-        apoOverviews.push_back(poOvrDS);
+        m_apoOverviews.push_back(std::move(poOvrDS));
     }
 }
 
@@ -2141,7 +2113,8 @@ KmlSingleDocRasterRasterBand::KmlSingleDocRasterRasterBand(
 CPLErr KmlSingleDocRasterRasterBand::IReadBlock(int nBlockXOff, int nBlockYOff,
                                                 void *pImage)
 {
-    KmlSingleDocRasterDataset *poGDS = (KmlSingleDocRasterDataset *)poDS;
+    KmlSingleDocRasterDataset *poGDS =
+        cpl::down_cast<KmlSingleDocRasterDataset *>(poDS);
     const char *pszImageFilename =
         CPLFormFilename(poGDS->osDirname,
                         CPLSPrintf("kml_image_L%d_%d_%d", poGDS->nLevel,
@@ -2151,14 +2124,11 @@ CPLErr KmlSingleDocRasterRasterBand::IReadBlock(int nBlockXOff, int nBlockYOff,
         strcmp(CPLGetFilename(poGDS->poCurTileDS->GetDescription()),
                CPLGetFilename(pszImageFilename)) != 0)
     {
-        if (poGDS->poCurTileDS != nullptr)
-            GDALClose((GDALDatasetH)poGDS->poCurTileDS);
-        CPLPushErrorHandler(CPLQuietErrorHandler);
-        poGDS->poCurTileDS =
-            (GDALDataset *)GDALOpen(pszImageFilename, GA_ReadOnly);
-        CPLPopErrorHandler();
+        CPLErrorHandlerPusher oErrorHandler(CPLQuietErrorHandler);
+        poGDS->poCurTileDS.reset(
+            GDALDataset::Open(pszImageFilename, GDAL_OF_RASTER));
     }
-    GDALDataset *poImageDS = poGDS->poCurTileDS;
+    GDALDataset *poImageDS = poGDS->poCurTileDS.get();
     if (poImageDS == nullptr)
     {
         memset(pImage, 0, static_cast<size_t>(nBlockXSize) * nBlockYSize);
@@ -2201,27 +2171,28 @@ CPLErr KmlSingleDocRasterRasterBand::IReadBlock(int nBlockXOff, int nBlockYOff,
             /* Expand color table */
             if (eErr == CE_None && poColorTable != nullptr)
             {
+                GByte *pabyImage = static_cast<GByte *>(pImage);
                 int j, i;
                 for (j = 0; j < nReqYSize; j++)
                 {
                     for (i = 0; i < nReqXSize; i++)
                     {
-                        GByte nVal = ((GByte *)pImage)[j * nBlockXSize + i];
+                        GByte nVal = pabyImage[j * nBlockXSize + i];
                         const GDALColorEntry *poEntry =
                             poColorTable->GetColorEntry(nVal);
                         if (poEntry != nullptr)
                         {
                             if (nBand == 1)
-                                ((GByte *)pImage)[j * nBlockXSize + i] =
+                                pabyImage[j * nBlockXSize + i] =
                                     static_cast<GByte>(poEntry->c1);
                             else if (nBand == 2)
-                                ((GByte *)pImage)[j * nBlockXSize + i] =
+                                pabyImage[j * nBlockXSize + i] =
                                     static_cast<GByte>(poEntry->c2);
                             else if (nBand == 3)
-                                ((GByte *)pImage)[j * nBlockXSize + i] =
+                                pabyImage[j * nBlockXSize + i] =
                                     static_cast<GByte>(poEntry->c3);
                             else
-                                ((GByte *)pImage)[j * nBlockXSize + i] =
+                                pabyImage[j * nBlockXSize + i] =
                                     static_cast<GByte>(poEntry->c4);
                         }
                     }
@@ -2251,7 +2222,8 @@ CPLErr KmlSingleDocRasterRasterBand::IReadBlock(int nBlockXOff, int nBlockYOff,
             if (iBand != nBand)
             {
                 KmlSingleDocRasterRasterBand *poOtherBand =
-                    (KmlSingleDocRasterRasterBand *)poGDS->GetRasterBand(iBand);
+                    static_cast<KmlSingleDocRasterRasterBand *>(
+                        poGDS->GetRasterBand(iBand));
                 GDALRasterBlock *poBlock =
                     poOtherBand->GetLockedBlockRef(nBlockXOff, nBlockYOff);
                 if (poBlock == nullptr)
@@ -2271,7 +2243,7 @@ CPLErr KmlSingleDocRasterRasterBand::IReadBlock(int nBlockXOff, int nBlockYOff,
 
 GDALColorInterp KmlSingleDocRasterRasterBand::GetColorInterpretation()
 {
-    return (GDALColorInterp)(GCI_RedBand + nBand - 1);
+    return static_cast<GDALColorInterp>(GCI_RedBand + nBand - 1);
 }
 
 /************************************************************************/
@@ -2280,10 +2252,11 @@ GDALColorInterp KmlSingleDocRasterRasterBand::GetColorInterpretation()
 
 int KmlSingleDocRasterRasterBand::GetOverviewCount()
 {
-    KmlSingleDocRasterDataset *poGDS = (KmlSingleDocRasterDataset *)poDS;
+    KmlSingleDocRasterDataset *poGDS =
+        cpl::down_cast<KmlSingleDocRasterDataset *>(poDS);
     poGDS->BuildOverviews();
 
-    return (int)poGDS->apoOverviews.size();
+    return static_cast<int>(poGDS->m_apoOverviews.size());
 }
 
 /************************************************************************/
@@ -2292,13 +2265,14 @@ int KmlSingleDocRasterRasterBand::GetOverviewCount()
 
 GDALRasterBand *KmlSingleDocRasterRasterBand::GetOverview(int iOvr)
 {
-    KmlSingleDocRasterDataset *poGDS = (KmlSingleDocRasterDataset *)poDS;
+    KmlSingleDocRasterDataset *poGDS =
+        cpl::down_cast<KmlSingleDocRasterDataset *>(poDS);
     poGDS->BuildOverviews();
 
-    if (iOvr < 0 || iOvr >= (int)poGDS->apoOverviews.size())
+    if (iOvr < 0 || iOvr >= static_cast<int>(poGDS->m_apoOverviews.size()))
         return nullptr;
 
-    return poGDS->apoOverviews[iOvr]->GetRasterBand(nBand);
+    return poGDS->m_apoOverviews[iOvr]->GetRasterBand(nBand);
 }
 
 /************************************************************************/
@@ -2322,10 +2296,10 @@ KmlSingleDocCollectTiles(CPLXMLNode *psNode,
         if (sscanf(CPLGetFilename(pszHref), "kml_image_L%d_%d_%d.%3s", &level,
                    &j, &i, szExt) == 4)
         {
-            if (level > (int)aosDescs.size())
+            if (level > static_cast<int>(aosDescs.size()))
             {
                 KmlSingleDocRasterTilesDesc sDesc;
-                while (level > (int)aosDescs.size() + 1)
+                while (level > static_cast<int>(aosDescs.size()) + 1)
                 {
                     sDesc.nMaxJ_i = -1;
                     sDesc.nMaxJ_j = -1;
@@ -2400,7 +2374,7 @@ GDALDataset *KmlSingleDocRasterDataset::Open(const char *pszFilename,
     if (strcmp(pszRootFolderName, "kml_image_L1_0_0") != 0)
         return nullptr;
 
-    double adfGlobalExtents[4];
+    std::array<double, 4> adfGlobalExtents = {0, 0, 0, 0};
     CPLXMLNode *psRegion = CPLGetXMLNode(psRootFolder, "Region");
     if (psRegion == nullptr)
         return nullptr;
@@ -2412,19 +2386,19 @@ GDALDataset *KmlSingleDocRasterDataset::Open(const char *pszFilename,
     KmlSingleDocCollectTiles(psRootFolder, aosDescs, osDirname);
     if (aosDescs.empty())
         return nullptr;
-    int k;
-    for (k = 0; k < (int)aosDescs.size(); k++)
+    for (const auto &oDesc : aosDescs)
     {
-        if (aosDescs[k].nMaxJ_i < 0)
+        if (oDesc.nMaxJ_i < 0)
             return nullptr;
     }
 
-    const char *pszImageFilename = CPLFormFilename(
-        osDirname,
-        CPLSPrintf("kml_image_L%d_%d_%d", (int)aosDescs.size(), 0, 0),
-        aosDescs.back().szExtI);
-    GDALDataset *poImageDS =
-        (GDALDataset *)GDALOpen(pszImageFilename, GA_ReadOnly);
+    const char *pszImageFilename =
+        CPLFormFilename(osDirname,
+                        CPLSPrintf("kml_image_L%d_%d_%d",
+                                   static_cast<int>(aosDescs.size()), 0, 0),
+                        aosDescs.back().szExtI);
+    auto poImageDS = std::unique_ptr<GDALDataset>(GDALDataset::Open(
+        pszImageFilename, GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR));
     if (poImageDS == nullptr)
     {
         return nullptr;
@@ -2434,27 +2408,27 @@ GDALDataset *KmlSingleDocRasterDataset::Open(const char *pszFilename,
     {
         nTileSize = 1024;
     }
-    GDALClose((GDALDatasetH)poImageDS);
 
     const KmlSingleDocRasterTilesDesc &oDesc = aosDescs.back();
     int nXSize = 0;
     int nYSize = 0;
     int nBands = 0;
     int bHasCT = FALSE;
-    if (!KmlSingleDocGetDimensions(osDirname, oDesc, (int)aosDescs.size(),
-                                   nTileSize, nXSize, nYSize, nBands, bHasCT))
+    if (!KmlSingleDocGetDimensions(osDirname, oDesc,
+                                   static_cast<int>(aosDescs.size()), nTileSize,
+                                   nXSize, nYSize, nBands, bHasCT))
     {
         return nullptr;
     }
 
-    KmlSingleDocRasterDataset *poDS = new KmlSingleDocRasterDataset();
+    auto poDS = std::make_unique<KmlSingleDocRasterDataset>();
     poDS->nRasterXSize = nXSize;
     poDS->nRasterYSize = nYSize;
-    poDS->nLevel = (int)aosDescs.size();
+    poDS->nLevel = static_cast<int>(aosDescs.size());
     poDS->nTileSize = nTileSize;
     poDS->osDirname = std::move(osDirname);
     poDS->osNominalExt = oDesc.szExtI;
-    memcpy(poDS->adfGlobalExtents, adfGlobalExtents, 4 * sizeof(double));
+    poDS->adfGlobalExtents = adfGlobalExtents;
     poDS->adfGeoTransform[0] = adfGlobalExtents[0];
     poDS->adfGeoTransform[1] =
         (adfGlobalExtents[2] - adfGlobalExtents[0]) / poDS->nRasterXSize;
@@ -2466,12 +2440,13 @@ GDALDataset *KmlSingleDocRasterDataset::Open(const char *pszFilename,
     if (nBands == 1 && bHasCT)
         nBands = 4;
     for (int iBand = 1; iBand <= nBands; iBand++)
-        poDS->SetBand(iBand, new KmlSingleDocRasterRasterBand(poDS, iBand));
+        poDS->SetBand(iBand, std::make_unique<KmlSingleDocRasterRasterBand>(
+                                 poDS.get(), iBand));
     poDS->SetDescription(pszFilename);
     poDS->SetMetadataItem("INTERLEAVE", "PIXEL", "IMAGE_STRUCTURE");
     poDS->aosDescs = std::move(aosDescs);
 
-    return poDS;
+    return poDS.release();
 }
 
 /************************************************************************/
@@ -2546,7 +2521,7 @@ GDALDataset *KmlSingleOverlayRasterDataset::Open(const char *pszFilename,
     const char *pszHref = CPLGetXMLValue(psGO, "Icon.href", nullptr);
     if (pszHref == nullptr)
         return nullptr;
-    double adfExtents[4] = {0};
+    std::array<double, 4> adfExtents = {0, 0, 0, 0};
     if (!KmlSuperOverlayGetBoundingBox(psGO, adfExtents))
         return nullptr;
     const char *pszImageFilename =
@@ -2556,25 +2531,26 @@ GDALDataset *KmlSingleOverlayRasterDataset::Open(const char *pszFilename,
     if (poImageDS == nullptr)
         return nullptr;
 
-    KmlSingleOverlayRasterDataset *poDS = new KmlSingleOverlayRasterDataset(
+    auto poDS = std::make_unique<KmlSingleOverlayRasterDataset>(
         poImageDS->GetRasterXSize(), poImageDS->GetRasterYSize());
     for (int i = 1; i <= poImageDS->GetRasterCount(); ++i)
     {
-        VRTAddBand(reinterpret_cast<VRTDatasetH>(poDS), GDT_Byte, nullptr);
+        poDS->AddBand(GDT_Byte, nullptr);
 
-        VRTAddSimpleSource(
-            reinterpret_cast<VRTSourcedRasterBandH>(poDS->GetRasterBand(i)),
-            reinterpret_cast<GDALRasterBandH>(poImageDS->GetRasterBand(i)), 0,
-            0, poImageDS->GetRasterXSize(), poImageDS->GetRasterYSize(), 0, 0,
-            poImageDS->GetRasterXSize(), poImageDS->GetRasterYSize(), nullptr,
-            VRT_NODATA_UNSET);
+        auto poImageBand = poImageDS->GetRasterBand(i);
+        auto poVRTBand =
+            static_cast<VRTSourcedRasterBand *>(poDS->GetRasterBand(i));
+        poVRTBand->AddSimpleSource(
+            poImageBand, 0, 0, poImageDS->GetRasterXSize(),
+            poImageDS->GetRasterYSize(), 0, 0, poImageDS->GetRasterXSize(),
+            poImageDS->GetRasterYSize(), nullptr, VRT_NODATA_UNSET);
 
-        poDS->GetRasterBand(i)->SetColorInterpretation(
-            poImageDS->GetRasterBand(i)->GetColorInterpretation());
+        poVRTBand->SetColorInterpretation(
+            poImageBand->GetColorInterpretation());
 
-        auto poCT = poImageDS->GetRasterBand(i)->GetColorTable();
+        const auto poCT = poImageBand->GetColorTable();
         if (poCT)
-            poDS->GetRasterBand(i)->SetColorTable(poCT);
+            poVRTBand->SetColorTable(poCT);
     }
     poImageDS->Dereference();
     double adfGeoTransform[6] = {
@@ -2589,7 +2565,7 @@ GDALDataset *KmlSingleOverlayRasterDataset::Open(const char *pszFilename,
     poDS->SetWritable(false);
     poDS->SetDescription(pszFilename);
 
-    return poDS;
+    return poDS.release();
 }
 
 /************************************************************************/
@@ -2628,13 +2604,13 @@ KmlSuperOverlayReadDataset::Open(const char *pszFilename,
     VSILFILE *fp = VSIFOpenL(osFilename, "rb");
     if (fp == nullptr)
         return nullptr;
-    char *pszBuffer = (char *)VSI_MALLOC_VERBOSE(BUFFER_SIZE + 1);
+    char *pszBuffer = static_cast<char *>(VSI_MALLOC_VERBOSE(BUFFER_SIZE + 1));
     if (pszBuffer == nullptr)
     {
         VSIFCloseL(fp);
         return nullptr;
     }
-    int nRead = (int)VSIFReadL(pszBuffer, 1, BUFFER_SIZE, fp);
+    const size_t nRead = VSIFReadL(pszBuffer, 1, BUFFER_SIZE, fp);
     pszBuffer[nRead] = '\0';
     VSIFCloseL(fp);
     if (nRead == BUFFER_SIZE)
@@ -2736,7 +2712,7 @@ KmlSuperOverlayReadDataset::Open(const char *pszFilename,
     CPLAssert(psGroundOverlay != nullptr);
     CPLAssert(psRegion != nullptr);
 
-    double adfExtents[4];
+    std::array<double, 4> adfExtents = {0, 0, 0, 0};
     if (!KmlSuperOverlayGetBoundingBox(psGroundOverlay, adfExtents))
     {
         CPLDestroyXMLNode(psNode);
@@ -2749,7 +2725,7 @@ KmlSuperOverlayReadDataset::Open(const char *pszFilename,
         CPLDestroyXMLNode(psNode);
         return nullptr;
     }
-    GDALDataset *poDSIcon = KmlSuperOverlayLoadIcon(pszFilename, pszIcon);
+    auto poDSIcon = KmlSuperOverlayLoadIcon(pszFilename, pszIcon);
     if (poDSIcon == nullptr)
     {
         CPLDestroyXMLNode(psNode);
@@ -2770,11 +2746,10 @@ KmlSuperOverlayReadDataset::Open(const char *pszFilename,
         nFactor = 1 << nDepth;
     }
 
-    KmlSuperOverlayReadDataset *poDS = new KmlSuperOverlayReadDataset();
+    auto poDS = std::make_unique<KmlSuperOverlayReadDataset>();
     poDS->osFilename = pszFilename;
     poDS->psRoot = psNode;
     poDS->psDocument = psDocument;
-    poDS->poDSIcon = poDSIcon;
     poDS->poParent = poParent;
     poDS->nFactor = nFactor;
     poDS->nRasterXSize = nFactor * poDSIcon->GetRasterXSize();
@@ -2787,7 +2762,8 @@ KmlSuperOverlayReadDataset::Open(const char *pszFilename,
         -(adfExtents[3] - adfExtents[1]) / poDS->nRasterYSize;
     poDS->nBands = 4;
     for (int i = 0; i < 4; i++)
-        poDS->SetBand(i + 1, new KmlSuperOverlayRasterBand(poDS, i + 1));
+        poDS->SetBand(i + 1, std::make_unique<KmlSuperOverlayRasterBand>(
+                                 poDS.get(), i + 1));
     poDS->SetDescription(pszFilename);
     poDS->SetMetadataItem("INTERLEAVE", "PIXEL", "IMAGE_STRUCTURE");
 
@@ -2795,15 +2771,13 @@ KmlSuperOverlayReadDataset::Open(const char *pszFilename,
     {
         nFactor /= 2;
 
-        KmlSuperOverlayReadDataset *poOvrDS = new KmlSuperOverlayReadDataset();
+        auto poOvrDS = std::make_unique<KmlSuperOverlayReadDataset>();
 
-        poDS->papoOverviewDS = (KmlSuperOverlayReadDataset **)CPLRealloc(
-            poDS->papoOverviewDS,
-            (poDS->nOverviewCount + 1) * sizeof(KmlSuperOverlayReadDataset *));
-        poDS->papoOverviewDS[poDS->nOverviewCount++] = poOvrDS;
-
-        poOvrDS->bIsOvr = TRUE;
-        poOvrDS->poParent = poDS;
+        poOvrDS->bIsOvr = true;
+        // The life-time of objects is such that poOvrDS is destroyed when
+        // poDS is destroyed.
+        // coverity[escape]
+        poOvrDS->poParent = poDS.get();
         poOvrDS->nFactor = nFactor;
         poOvrDS->nRasterXSize = nFactor * poDSIcon->GetRasterXSize();
         poOvrDS->nRasterYSize = nFactor * poDSIcon->GetRasterYSize();
@@ -2815,13 +2789,16 @@ KmlSuperOverlayReadDataset::Open(const char *pszFilename,
             -(adfExtents[3] - adfExtents[1]) / poOvrDS->nRasterYSize;
         poOvrDS->nBands = 4;
         for (int i = 0; i < 4; i++)
-            poOvrDS->SetBand(i + 1,
-                             new KmlSuperOverlayRasterBand(poOvrDS, i + 1));
+            poOvrDS->SetBand(i + 1, std::make_unique<KmlSuperOverlayRasterBand>(
+                                        poOvrDS.get(), i + 1));
         poOvrDS->SetDescription(pszFilename);
         poOvrDS->SetMetadataItem("INTERLEAVE", "PIXEL", "IMAGE_STRUCTURE");
+
+        poDS->m_apoOverviewDS.push_back(std::move(poOvrDS));
     }
+    poDS->poDSIcon = std::move(poDSIcon);
 
-    return poDS;
+    return poDS.release();
 }
 
 /************************************************************************/
diff --git a/frmts/kmlsuperoverlay/kmlsuperoverlaydataset.h b/frmts/kmlsuperoverlay/kmlsuperoverlaydataset.h
index 214d9ef938fe..e2d241a6d6b3 100644
--- a/frmts/kmlsuperoverlay/kmlsuperoverlaydataset.h
+++ b/frmts/kmlsuperoverlay/kmlsuperoverlaydataset.h
@@ -9,28 +9,13 @@
  * Copyright (c) 2010, SPADAC Inc. <harsh.govind@spadac.com>
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef KMLSUPEROVERLAYDATASET_H_INCLUDED
 #define KMLSUPEROVERLAYDATASET_H_INCLUDED
 
+#include <array>
 #include <map>
 
 #include "cpl_minixml.h"
@@ -48,10 +33,16 @@ class LinkedDataset;
 class LinkedDataset
 {
   public:
-    KmlSuperOverlayReadDataset *poDS;
-    LinkedDataset *psPrev;
-    LinkedDataset *psNext;
-    CPLString osSubFilename;
+    KmlSuperOverlayReadDataset *poDS = nullptr;
+    LinkedDataset *psPrev = nullptr;
+    LinkedDataset *psNext = nullptr;
+    CPLString osSubFilename{};
+
+    LinkedDataset() = default;
+
+  private:
+    LinkedDataset(const LinkedDataset &) = delete;
+    LinkedDataset &operator=(const LinkedDataset &) = delete;
 };
 
 class KmlSuperOverlayReadDataset final : public GDALDataset
@@ -59,22 +50,25 @@ class KmlSuperOverlayReadDataset final : public GDALDataset
     friend class KmlSuperOverlayRasterBand;
 
     OGRSpatialReference m_oSRS{};
-    int nFactor;
-    CPLString osFilename;
-    CPLXMLNode *psRoot;
-    CPLXMLNode *psDocument;
-    GDALDataset *poDSIcon;
-    double adfGeoTransform[6];
-
-    int nOverviewCount;
-    KmlSuperOverlayReadDataset **papoOverviewDS;
-    int bIsOvr;
-
-    KmlSuperOverlayReadDataset *poParent;
-
-    std::map<CPLString, LinkedDataset *> oMapChildren;
-    LinkedDataset *psFirstLink;
-    LinkedDataset *psLastLink;
+    int nFactor = 1;
+    CPLString osFilename{};
+    CPLXMLNode *psRoot = nullptr;
+    CPLXMLNode *psDocument = nullptr;
+    std::unique_ptr<GDALDataset> poDSIcon{};
+    std::array<double, 6> adfGeoTransform = {0, 0, 0, 0, 0, 0};
+
+    std::vector<std::unique_ptr<KmlSuperOverlayReadDataset>> m_apoOverviewDS{};
+    bool bIsOvr = false;
+
+    KmlSuperOverlayReadDataset *poParent = nullptr;
+
+    std::map<CPLString, LinkedDataset *> oMapChildren{};
+    LinkedDataset *psFirstLink = nullptr;
+    LinkedDataset *psLastLink = nullptr;
+
+    KmlSuperOverlayReadDataset(const KmlSuperOverlayReadDataset &) = delete;
+    KmlSuperOverlayReadDataset &
+    operator=(const KmlSuperOverlayReadDataset &) = delete;
 
   protected:
     virtual int CloseDependentDatasets() override;
diff --git a/frmts/l1b/l1bdataset.cpp b/frmts/l1b/l1bdataset.cpp
index 1c256eaad9cc..76702fb8c2d4 100644
--- a/frmts/l1b/l1bdataset.cpp
+++ b/frmts/l1b/l1bdataset.cpp
@@ -14,23 +14,7 @@
  * Lagrange interpolation suitable for NOAA level 1B file formats.
  * Submitted by Andrew Brooks <arb@sat.dundee.ac.uk>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
@@ -3310,7 +3294,7 @@ GDALDataset *L1BDataset::Open(GDALOpenInfo *poOpenInfo)
             pszFilename++;
         osFilename = pszFilename;
         if (!osFilename.empty() && osFilename.back() == '"')
-            osFilename.resize(osFilename.size() - 1);
+            osFilename.pop_back();
         fp = VSIFOpenL(osFilename, "rb");
         if (!fp)
         {
diff --git a/frmts/leveller/levellerdataset.cpp b/frmts/leveller/levellerdataset.cpp
index 7c552095e974..cdae53e6da07 100644
--- a/frmts/leveller/levellerdataset.cpp
+++ b/frmts/leveller/levellerdataset.cpp
@@ -12,23 +12,7 @@
  * Copyright (c) 2005-2007 Daylon Graphics Ltd.
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_frmts.h"
diff --git a/frmts/map/mapdataset.cpp b/frmts/map/mapdataset.cpp
index fb206b46fd45..8b85e91cd34b 100644
--- a/frmts/map/mapdataset.cpp
+++ b/frmts/map/mapdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2012, Jean-Claude Repetto
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_frmts.h"
diff --git a/frmts/mbtiles/CMakeLists.txt b/frmts/mbtiles/CMakeLists.txt
index 856a030fd6e2..f1850f94c2b7 100644
--- a/frmts/mbtiles/CMakeLists.txt
+++ b/frmts/mbtiles/CMakeLists.txt
@@ -26,5 +26,5 @@ if (NOT GDAL_USE_JSONC_INTERNAL)
   gdal_target_link_libraries(gdal_MBTiles PRIVATE ${JSONC_TARGET})
 endif ()
 target_include_directories(
-  gdal_MBTiles PRIVATE ${GDAL_VECTOR_FORMAT_SOURCE_DIR}/geojson ${GDAL_VECTOR_FORMAT_SOURCE_DIR}/gpkg
+  gdal_MBTiles PRIVATE ${GDAL_VECTOR_FORMAT_SOURCE_DIR}/gpkg
                        ${GDAL_VECTOR_FORMAT_SOURCE_DIR}/sqlite)
diff --git a/frmts/mbtiles/mbtilesdataset.cpp b/frmts/mbtiles/mbtilesdataset.cpp
index 6a8249a16f9d..1326c3142baf 100644
--- a/frmts/mbtiles/mbtilesdataset.cpp
+++ b/frmts/mbtiles/mbtilesdataset.cpp
@@ -7,23 +7,7 @@
  **********************************************************************
  * Copyright (c) 2012-2016, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #if defined(HAVE_SQLITE) && defined(HAVE_GEOS)
@@ -44,7 +28,7 @@
 #include "ogrsqlitebase.h"
 
 #include "zlib.h"
-#include "ogrgeojsonreader.h"
+#include "ogrlibjsonutils.h"
 
 #include <math.h>
 #include <algorithm>
@@ -91,15 +75,14 @@ class MBTilesBand;
 /*                         MBTILESOpenSQLiteDB()                        */
 /************************************************************************/
 
-static OGRDataSourceH MBTILESOpenSQLiteDB(const char *pszFilename,
-                                          GDALAccess eAccess)
+static GDALDatasetH MBTILESOpenSQLiteDB(const char *pszFilename,
+                                        GDALAccess eAccess)
 {
     const char *l_apszAllowedDrivers[] = {"SQLITE", nullptr};
-    return (OGRDataSourceH)GDALOpenEx(
-        (CPLString("SQLITE:") + pszFilename).c_str(),
-        GDAL_OF_VECTOR | GDAL_OF_INTERNAL |
-            ((eAccess == GA_Update) ? GDAL_OF_UPDATE : 0),
-        l_apszAllowedDrivers, nullptr, nullptr);
+    return GDALOpenEx((CPLString("SQLITE:") + pszFilename).c_str(),
+                      GDAL_OF_VECTOR | GDAL_OF_INTERNAL |
+                          ((eAccess == GA_Update) ? GDAL_OF_UPDATE : 0),
+                      l_apszAllowedDrivers, nullptr, nullptr);
 }
 
 /************************************************************************/
@@ -172,7 +155,7 @@ class MBTilesDataset final : public GDALPamDataset,
     int m_nOverviewCount;
     MBTilesDataset **m_papoOverviewDS;
 
-    OGRDataSourceH hDS;
+    GDALDatasetH hDS;
     sqlite3 *hDB;
 
     sqlite3_vfs *pMyVFS;
@@ -443,12 +426,12 @@ bool MBTilesDataset::HasNonEmptyGrids()
 
     nHasNonEmptyGrids = false;
 
-    if (OGR_DS_GetLayerByName(hDS, "grids") == nullptr)
+    if (GDALDatasetGetLayerByName(hDS, "grids") == nullptr)
         return false;
 
     const char *pszSQL = "SELECT type FROM sqlite_master WHERE name = 'grids'";
     CPLDebug("MBTILES", "%s", pszSQL);
-    hSQLLyr = OGR_DS_ExecuteSQL(hDS, pszSQL, nullptr, nullptr);
+    hSQLLyr = GDALDatasetExecuteSQL(hDS, pszSQL, nullptr, nullptr);
     if (hSQLLyr == nullptr)
         return false;
 
@@ -456,14 +439,14 @@ bool MBTilesDataset::HasNonEmptyGrids()
     if (hFeat == nullptr || !OGR_F_IsFieldSetAndNotNull(hFeat, 0))
     {
         OGR_F_Destroy(hFeat);
-        OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+        GDALDatasetReleaseResultSet(hDS, hSQLLyr);
         return false;
     }
 
     bool bGridsIsView = strcmp(OGR_F_GetFieldAsString(hFeat, 0), "view") == 0;
 
     OGR_F_Destroy(hFeat);
-    OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+    GDALDatasetReleaseResultSet(hDS, hSQLLyr);
 
     nHasNonEmptyGrids = TRUE;
 
@@ -475,7 +458,7 @@ bool MBTilesDataset::HasNonEmptyGrids()
     if (bGridsIsView)
     {
         OGRLayerH hGridUTFGridLyr;
-        hGridUTFGridLyr = OGR_DS_GetLayerByName(hDS, "grid_utfgrid");
+        hGridUTFGridLyr = GDALDatasetGetLayerByName(hDS, "grid_utfgrid");
         if (hGridUTFGridLyr != nullptr)
         {
             OGR_L_ResetReading(hGridUTFGridLyr);
@@ -531,7 +514,7 @@ char *MBTilesDataset::FindKey(int iPixel, int iLine)
                    "zoom_level = %d AND tile_column = %d AND tile_row = %d",
                    m_nZoomLevel, nTileColumn, nTileRow);
     CPLDebug("MBTILES", "%s", pszSQL);
-    hSQLLyr = OGR_DS_ExecuteSQL(hDS, pszSQL, nullptr, nullptr);
+    hSQLLyr = GDALDatasetExecuteSQL(hDS, pszSQL, nullptr, nullptr);
     if (hSQLLyr == nullptr)
         return nullptr;
 
@@ -539,7 +522,7 @@ char *MBTilesDataset::FindKey(int iPixel, int iLine)
     if (hFeat == nullptr || !OGR_F_IsFieldSetAndNotNull(hFeat, 0))
     {
         OGR_F_Destroy(hFeat);
-        OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+        GDALDatasetReleaseResultSet(hDS, hSQLLyr);
         return nullptr;
     }
 
@@ -551,7 +534,7 @@ char *MBTilesDataset::FindKey(int iPixel, int iLine)
     if (pabyUncompressed == nullptr)
     {
         OGR_F_Destroy(hFeat);
-        OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+        GDALDatasetReleaseResultSet(hDS, hSQLLyr);
         return nullptr;
     }
 
@@ -560,7 +543,7 @@ char *MBTilesDataset::FindKey(int iPixel, int iLine)
     if (inflateInit(&sStream) != Z_OK)
     {
         OGR_F_Destroy(hFeat);
-        OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+        GDALDatasetReleaseResultSet(hDS, hSQLLyr);
         CPLFree(pabyUncompressed);
         return nullptr;
     }
@@ -694,7 +677,7 @@ char *MBTilesDataset::FindKey(int iPixel, int iLine)
     if (hFeat)
         OGR_F_Destroy(hFeat);
     if (hSQLLyr)
-        OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+        GDALDatasetReleaseResultSet(hDS, hSQLLyr);
 
     return pszKey;
 }
@@ -790,7 +773,7 @@ const char *MBTilesBand::GetMetadataItem(const char *pszName,
             CPLFree(pszXMLEscaped);
             osLocationInfo += "</Key>";
 
-            if (OGR_DS_GetLayerByName(poGDS->hDS, "grid_data") != nullptr &&
+            if (GDALDatasetGetLayerByName(poGDS->hDS, "grid_data") != nullptr &&
                 strchr(pszKey, '\'') == nullptr)
             {
                 OGRLayerH hSQLLyr;
@@ -802,7 +785,7 @@ const char *MBTilesBand::GetMetadataItem(const char *pszName,
                                pszKey);
                 CPLDebug("MBTILES", "%s", pszSQL);
                 hSQLLyr =
-                    OGR_DS_ExecuteSQL(poGDS->hDS, pszSQL, nullptr, nullptr);
+                    GDALDatasetExecuteSQL(poGDS->hDS, pszSQL, nullptr, nullptr);
                 if (hSQLLyr)
                 {
                     hFeat = OGR_L_GetNextFeature(hSQLLyr);
@@ -825,7 +808,7 @@ const char *MBTilesBand::GetMetadataItem(const char *pszName,
                     }
                     OGR_F_Destroy(hFeat);
                 }
-                OGR_DS_ReleaseResultSet(poGDS->hDS, hSQLLyr);
+                GDALDatasetReleaseResultSet(poGDS->hDS, hSQLLyr);
             }
 
             osLocationInfo += "</LocationInfo>";
@@ -931,7 +914,7 @@ MBTilesDataset::~MBTilesDataset()
 
         if (hDS != nullptr)
         {
-            OGRReleaseDataSource(hDS);
+            GDALClose(hDS);
             hDB = nullptr;
         }
         if (hDB != nullptr)
@@ -1135,7 +1118,7 @@ CPLErr MBTilesDataset::SetGeoTransform(double *padfGeoTransform)
             if (miny < -ok_maxy)
                 miny = -ok_maxy;
 
-            osBounds.Printf("%.18g,%.18g,%.18g,%.18g", minx, miny, maxx, maxy);
+            osBounds.Printf("%.17g,%.17g,%.17g,%.17g", minx, miny, maxx, maxy);
         }
 
         char *pszSQL = sqlite3_mprintf(
@@ -1390,7 +1373,7 @@ char **MBTilesDataset::GetMetadata(const char *pszDomain)
     bFetchedMetadata = true;
     aosList = CPLStringList(GDALPamDataset::GetMetadata(), FALSE);
 
-    OGRLayerH hSQLLyr = OGR_DS_ExecuteSQL(
+    OGRLayerH hSQLLyr = GDALDatasetExecuteSQL(
         hDS, "SELECT name, value FROM metadata WHERE name != 'json' LIMIT 1000",
         nullptr, nullptr);
     if (hSQLLyr == nullptr)
@@ -1398,7 +1381,7 @@ char **MBTilesDataset::GetMetadata(const char *pszDomain)
 
     if (OGR_FD_GetFieldCount(OGR_L_GetLayerDefn(hSQLLyr)) != 2)
     {
-        OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+        GDALDatasetReleaseResultSet(hDS, hSQLLyr);
         return nullptr;
     }
 
@@ -1421,7 +1404,7 @@ char **MBTilesDataset::GetMetadata(const char *pszDomain)
         }
         OGR_F_Destroy(hFeat);
     }
-    OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+    GDALDatasetReleaseResultSet(hDS, hSQLLyr);
 
     return aosList.List();
 }
@@ -1529,7 +1512,7 @@ MBTilesVectorLayer::~MBTilesVectorLayer()
 {
     m_poFeatureDefn->Release();
     if (m_hTileIteratorLyr)
-        OGR_DS_ReleaseResultSet(m_poDS->hDS, m_hTileIteratorLyr);
+        GDALDatasetReleaseResultSet(m_poDS->hDS, m_hTileIteratorLyr);
     if (!m_osTmpFilename.empty())
     {
         VSIUnlink(m_osTmpFilename);
@@ -1573,7 +1556,7 @@ void MBTilesVectorLayer::ResetReading()
     m_hTileDS = nullptr;
     m_bEOF = false;
     if (m_hTileIteratorLyr)
-        OGR_DS_ReleaseResultSet(m_poDS->hDS, m_hTileIteratorLyr);
+        GDALDatasetReleaseResultSet(m_poDS->hDS, m_hTileIteratorLyr);
     CPLString osSQL;
     osSQL.Printf("SELECT tile_column, tile_row, tile_data FROM tiles "
                  "WHERE zoom_level = %d "
@@ -1582,7 +1565,7 @@ void MBTilesVectorLayer::ResetReading()
                  m_nZoomLevel, m_nFilterMinX, m_nFilterMaxX, m_nFilterMinY,
                  m_nFilterMaxY);
     m_hTileIteratorLyr =
-        OGR_DS_ExecuteSQL(m_poDS->hDS, osSQL.c_str(), nullptr, nullptr);
+        GDALDatasetExecuteSQL(m_poDS->hDS, osSQL.c_str(), nullptr, nullptr);
 }
 
 /************************************************************************/
@@ -1710,8 +1693,8 @@ GIntBig MBTilesVectorLayer::GetFeatureCount(int bForce)
                 {
                     VSIUnlink(m_osTmpFilename);
                 }
-                m_osTmpFilename =
-                    CPLSPrintf("/vsimem/mvt_%p_%d_%d.pbf", this, m_nX, m_nY);
+                m_osTmpFilename = VSIMemGenerateHiddenFilename(
+                    CPLSPrintf("mvt_%d_%d.pbf", m_nX, m_nY));
                 VSIFCloseL(VSIFileFromMemBuffer(m_osTmpFilename, pabyDataDup,
                                                 nDataSize, true));
 
@@ -1794,8 +1777,8 @@ OGRFeature *MBTilesVectorLayer::GetNextSrcFeature()
             {
                 VSIUnlink(m_osTmpFilename);
             }
-            m_osTmpFilename =
-                CPLSPrintf("/vsimem/mvt_%p_%d_%d.pbf", this, m_nX, m_nY);
+            m_osTmpFilename = VSIMemGenerateHiddenFilename(
+                CPLSPrintf("mvt_%d_%d.pbf", m_nX, m_nY));
             VSIFCloseL(VSIFileFromMemBuffer(m_osTmpFilename, pabyDataDup,
                                             nDataSize, true));
 
@@ -1887,13 +1870,13 @@ OGRFeature *MBTilesVectorLayer::GetFeature(GIntBig nFID)
                  "tile_column = %d AND tile_row = %d",
                  m_nZoomLevel, nX, (1 << nZ) - 1 - nY);
     auto hSQLLyr =
-        OGR_DS_ExecuteSQL(m_poDS->hDS, osSQL.c_str(), nullptr, nullptr);
+        GDALDatasetExecuteSQL(m_poDS->hDS, osSQL.c_str(), nullptr, nullptr);
     if (hSQLLyr == nullptr)
         return nullptr;
     auto hFeat = OGR_L_GetNextFeature(hSQLLyr);
     if (hFeat == nullptr)
     {
-        OGR_DS_ReleaseResultSet(m_poDS->hDS, hSQLLyr);
+        GDALDatasetReleaseResultSet(m_poDS->hDS, hSQLLyr);
         return nullptr;
     }
     int nDataSize = 0;
@@ -1901,10 +1884,10 @@ OGRFeature *MBTilesVectorLayer::GetFeature(GIntBig nFID)
     GByte *pabyDataDup = static_cast<GByte *>(CPLMalloc(nDataSize));
     memcpy(pabyDataDup, pabyData, nDataSize);
     OGR_F_Destroy(hFeat);
-    OGR_DS_ReleaseResultSet(m_poDS->hDS, hSQLLyr);
+    GDALDatasetReleaseResultSet(m_poDS->hDS, hSQLLyr);
 
-    CPLString osTmpFilename =
-        CPLSPrintf("/vsimem/mvt_getfeature_%p_%d_%d.pbf", this, nX, nY);
+    const CPLString osTmpFilename = VSIMemGenerateHiddenFilename(
+        CPLSPrintf("mvt_get_feature_%d_%d.pbf", m_nX, m_nY));
     VSIFCloseL(
         VSIFileFromMemBuffer(osTmpFilename, pabyDataDup, nDataSize, true));
 
@@ -1964,7 +1947,7 @@ void MBTilesDataset::InitVector(double dfMinX, double dfMinY, double dfMaxX,
     CPLDebug("MBTILES", "%s", pszSQL);
     CPLJSONDocument oJsonDoc;
     CPLJSONDocument oDoc;
-    auto hSQLLyr = OGR_DS_ExecuteSQL(hDS, pszSQL, nullptr, nullptr);
+    auto hSQLLyr = GDALDatasetExecuteSQL(hDS, pszSQL, nullptr, nullptr);
     if (hSQLLyr)
     {
         auto hFeat = OGR_L_GetNextFeature(hSQLLyr);
@@ -1976,10 +1959,11 @@ void MBTilesDataset::InitVector(double dfMinX, double dfMinY, double dfMaxX,
                 oJsonDoc.LoadMemory(reinterpret_cast<const GByte *>(pszJson)));
             OGR_F_Destroy(hFeat);
         }
-        OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+        GDALDatasetReleaseResultSet(hDS, hSQLLyr);
     }
 
-    m_osMetadataMemFilename = CPLSPrintf("/vsimem/%p_metadata.json", this);
+    m_osMetadataMemFilename =
+        VSIMemGenerateHiddenFilename("mbtiles_metadata.json");
     oDoc.Save(m_osMetadataMemFilename);
 
     CPLJSONArray oVectorLayers;
@@ -2048,7 +2032,7 @@ int MBTilesDataset::Identify(GDALOpenInfo *poOpenInfo)
 /*                        MBTilesGetMinMaxZoomLevel()                   */
 /************************************************************************/
 
-static int MBTilesGetMinMaxZoomLevel(OGRDataSourceH hDS, int bHasMap,
+static int MBTilesGetMinMaxZoomLevel(GDALDatasetH hDS, int bHasMap,
                                      int &nMinLevel, int &nMaxLevel)
 {
     OGRLayerH hSQLLyr;
@@ -2059,7 +2043,7 @@ static int MBTilesGetMinMaxZoomLevel(OGRDataSourceH hDS, int bHasMap,
         "SELECT value FROM metadata WHERE name = 'minzoom' UNION ALL "
         "SELECT value FROM metadata WHERE name = 'maxzoom'";
     CPLDebug("MBTILES", "%s", pszSQL);
-    hSQLLyr = OGR_DS_ExecuteSQL(hDS, pszSQL, nullptr, nullptr);
+    hSQLLyr = GDALDatasetExecuteSQL(hDS, pszSQL, nullptr, nullptr);
     if (hSQLLyr)
     {
         hFeat = OGR_L_GetNextFeature(hSQLLyr);
@@ -2088,7 +2072,7 @@ static int MBTilesGetMinMaxZoomLevel(OGRDataSourceH hDS, int bHasMap,
             }
         }
 
-        OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+        GDALDatasetReleaseResultSet(hDS, hSQLLyr);
     }
 
     if (!bHasMinMaxLevel)
@@ -2102,7 +2086,7 @@ static int MBTilesGetMinMaxZoomLevel(OGRDataSourceH hDS, int bHasMap,
                 "SELECT zoom_level FROM %s WHERE zoom_level = %d LIMIT 1",
                 (bHasMap) ? "map" : "tiles", iLevel);
             CPLDebug("MBTILES", "%s", pszSQL);
-            hSQLLyr = OGR_DS_ExecuteSQL(hDS, pszSQL, nullptr, nullptr);
+            hSQLLyr = GDALDatasetExecuteSQL(hDS, pszSQL, nullptr, nullptr);
             if (hSQLLyr)
             {
                 hFeat = OGR_L_GetNextFeature(hSQLLyr);
@@ -2111,7 +2095,7 @@ static int MBTilesGetMinMaxZoomLevel(OGRDataSourceH hDS, int bHasMap,
                     nMinLevel = iLevel;
                     OGR_F_Destroy(hFeat);
                 }
-                OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+                GDALDatasetReleaseResultSet(hDS, hSQLLyr);
             }
         }
 
@@ -2124,7 +2108,7 @@ static int MBTilesGetMinMaxZoomLevel(OGRDataSourceH hDS, int bHasMap,
                 "SELECT zoom_level FROM %s WHERE zoom_level = %d LIMIT 1",
                 (bHasMap) ? "map" : "tiles", iLevel);
             CPLDebug("MBTILES", "%s", pszSQL);
-            hSQLLyr = OGR_DS_ExecuteSQL(hDS, pszSQL, nullptr, nullptr);
+            hSQLLyr = GDALDatasetExecuteSQL(hDS, pszSQL, nullptr, nullptr);
             if (hSQLLyr)
             {
                 hFeat = OGR_L_GetNextFeature(hSQLLyr);
@@ -2134,13 +2118,13 @@ static int MBTilesGetMinMaxZoomLevel(OGRDataSourceH hDS, int bHasMap,
                     bHasMinMaxLevel = TRUE;
                     OGR_F_Destroy(hFeat);
                 }
-                OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+                GDALDatasetReleaseResultSet(hDS, hSQLLyr);
             }
         }
 #else
         pszSQL = "SELECT min(zoom_level), max(zoom_level) FROM tiles";
         CPLDebug("MBTILES", "%s", pszSQL);
-        hSQLLyr = OGR_DS_ExecuteSQL(hDS, pszSQL, NULL, nullptr);
+        hSQLLyr = GDALDatasetExecuteSQL(hDS, pszSQL, NULL, nullptr);
         if (hSQLLyr == NULL)
         {
             return FALSE;
@@ -2149,7 +2133,7 @@ static int MBTilesGetMinMaxZoomLevel(OGRDataSourceH hDS, int bHasMap,
         hFeat = OGR_L_GetNextFeature(hSQLLyr);
         if (hFeat == NULL)
         {
-            OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+            GDALDatasetReleaseResultSet(hDS, hSQLLyr);
             return FALSE;
         }
 
@@ -2162,7 +2146,7 @@ static int MBTilesGetMinMaxZoomLevel(OGRDataSourceH hDS, int bHasMap,
         }
 
         OGR_F_Destroy(hFeat);
-        OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+        GDALDatasetReleaseResultSet(hDS, hSQLLyr);
 #endif
     }
 
@@ -2191,7 +2175,7 @@ static double MBTilesWorldCoordToTileCoord(double dfWorldCoord, int nZoomLevel)
 /*                           MBTilesGetBounds()                         */
 /************************************************************************/
 
-static bool MBTilesGetBounds(OGRDataSourceH hDS, bool bUseBounds, int nMaxLevel,
+static bool MBTilesGetBounds(GDALDatasetH hDS, bool bUseBounds, int nMaxLevel,
                              double &minX, double &minY, double &maxX,
                              double &maxY)
 {
@@ -2203,7 +2187,7 @@ static bool MBTilesGetBounds(OGRDataSourceH hDS, bool bUseBounds, int nMaxLevel,
     {
         const char *pszSQL = "SELECT value FROM metadata WHERE name = 'bounds'";
         CPLDebug("MBTILES", "%s", pszSQL);
-        hSQLLyr = OGR_DS_ExecuteSQL(hDS, pszSQL, nullptr, nullptr);
+        hSQLLyr = GDALDatasetExecuteSQL(hDS, pszSQL, nullptr, nullptr);
         if (hSQLLyr)
         {
             hFeat = OGR_L_GetNextFeature(hSQLLyr);
@@ -2245,7 +2229,7 @@ static bool MBTilesGetBounds(OGRDataSourceH hDS, bool bUseBounds, int nMaxLevel,
 
                 OGR_F_Destroy(hFeat);
             }
-            OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+            GDALDatasetReleaseResultSet(hDS, hSQLLyr);
         }
     }
 
@@ -2257,7 +2241,7 @@ static bool MBTilesGetBounds(OGRDataSourceH hDS, bool bUseBounds, int nMaxLevel,
                        "WHERE zoom_level = %d",
                        nMaxLevel);
         CPLDebug("MBTILES", "%s", pszSQL);
-        hSQLLyr = OGR_DS_ExecuteSQL(hDS, pszSQL, nullptr, nullptr);
+        hSQLLyr = GDALDatasetExecuteSQL(hDS, pszSQL, nullptr, nullptr);
         if (hSQLLyr == nullptr)
         {
             return false;
@@ -2266,7 +2250,7 @@ static bool MBTilesGetBounds(OGRDataSourceH hDS, bool bUseBounds, int nMaxLevel,
         hFeat = OGR_L_GetNextFeature(hSQLLyr);
         if (hFeat == nullptr)
         {
-            OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+            GDALDatasetReleaseResultSet(hDS, hSQLLyr);
             return false;
         }
 
@@ -2290,7 +2274,7 @@ static bool MBTilesGetBounds(OGRDataSourceH hDS, bool bUseBounds, int nMaxLevel,
         }
 
         OGR_F_Destroy(hFeat);
-        OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+        GDALDatasetReleaseResultSet(hDS, hSQLLyr);
     }
 
     return bHasBounds;
@@ -2442,7 +2426,7 @@ static int MBTilesCurlReadCbk(CPL_UNUSED VSILFILE *fp, void *pabyBuffer,
 /*                  MBTilesGetBandCountAndTileSize()                    */
 /************************************************************************/
 
-static int MBTilesGetBandCountAndTileSize(bool bIsVSICURL, OGRDataSourceH &hDS,
+static int MBTilesGetBandCountAndTileSize(bool bIsVSICURL, GDALDatasetH &hDS,
                                           int nMaxLevel, int nMinTileRow,
                                           int nMaxTileRow, int nMinTileCol,
                                           int nMaxTileCol, int &nTileSize)
@@ -2456,7 +2440,7 @@ static int MBTilesGetBandCountAndTileSize(bool bIsVSICURL, OGRDataSourceH &hDS,
     nTileSize = 0;
 
     /* Get the VSILFILE associated with the OGR SQLite DB */
-    CPLString osDSName(OGR_DS_GetName(hDS));
+    CPLString osDSName(GDALGetDescription(hDS));
     if (bIsVSICURL)
     {
         auto poDS = dynamic_cast<OGRSQLiteBaseDataSource *>(
@@ -2490,7 +2474,7 @@ static int MBTilesGetBandCountAndTileSize(bool bIsVSICURL, OGRDataSourceH &hDS,
 
         CPLErrorReset();
         CPLPushErrorHandler(CPLQuietErrorHandler);
-        hSQLLyr = OGR_DS_ExecuteSQL(hDS, pszSQL, nullptr, nullptr);
+        hSQLLyr = GDALDatasetExecuteSQL(hDS, pszSQL, nullptr, nullptr);
         CPLPopErrorHandler();
 
         VSICurlUninstallReadCbk(fpCURLOGR);
@@ -2501,14 +2485,14 @@ static int MBTilesGetBandCountAndTileSize(bool bIsVSICURL, OGRDataSourceH &hDS,
         {
             CPLErrorReset();
 
-            OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+            GDALDatasetReleaseResultSet(hDS, hSQLLyr);
             hSQLLyr = nullptr;
 
             // Re-open OGR SQLite DB, because with our spy we have simulated an
             // I/O error that SQLite will have difficulties to recover within
             // the existing connection.  This will be fast because
             // the /vsicurl/ cache has cached the already read blocks.
-            OGRReleaseDataSource(hDS);
+            GDALClose(hDS);
             hDS = MBTILESOpenSQLiteDB(osDSName.c_str(), GA_ReadOnly);
             if (hDS == nullptr)
                 return -1;
@@ -2527,7 +2511,7 @@ static int MBTilesGetBandCountAndTileSize(bool bIsVSICURL, OGRDataSourceH &hDS,
     }
     else
     {
-        hSQLLyr = OGR_DS_ExecuteSQL(hDS, pszSQL, nullptr, nullptr);
+        hSQLLyr = GDALDatasetExecuteSQL(hDS, pszSQL, nullptr, nullptr);
     }
 
     while (true)
@@ -2539,7 +2523,7 @@ static int MBTilesGetBandCountAndTileSize(bool bIsVSICURL, OGRDataSourceH &hDS,
                                 "zoom_level = %d LIMIT 1",
                                 nMaxLevel);
             CPLDebug("MBTILES", "%s", pszSQL);
-            hSQLLyr = OGR_DS_ExecuteSQL(hDS, pszSQL, nullptr, nullptr);
+            hSQLLyr = GDALDatasetExecuteSQL(hDS, pszSQL, nullptr, nullptr);
             if (hSQLLyr == nullptr)
                 return -1;
         }
@@ -2547,7 +2531,7 @@ static int MBTilesGetBandCountAndTileSize(bool bIsVSICURL, OGRDataSourceH &hDS,
         hFeat = OGR_L_GetNextFeature(hSQLLyr);
         if (hFeat == nullptr)
         {
-            OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+            GDALDatasetReleaseResultSet(hDS, hSQLLyr);
             hSQLLyr = nullptr;
             if (!bFirstSelect)
                 return -1;
@@ -2556,8 +2540,7 @@ static int MBTilesGetBandCountAndTileSize(bool bIsVSICURL, OGRDataSourceH &hDS,
             break;
     }
 
-    CPLString osMemFileName;
-    osMemFileName.Printf("/vsimem/%p", hSQLLyr);
+    const CPLString osMemFileName(VSIMemGenerateHiddenFilename("mvt_temp.db"));
 
     int nDataSize = 0;
     GByte *pabyData = OGR_F_GetFieldAsBinary(hFeat, 0, &nDataSize);
@@ -2571,7 +2554,7 @@ static int MBTilesGetBandCountAndTileSize(bool bIsVSICURL, OGRDataSourceH &hDS,
     {
         VSIUnlink(osMemFileName.c_str());
         OGR_F_Destroy(hFeat);
-        OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+        GDALDatasetReleaseResultSet(hDS, hSQLLyr);
         return -1;
     }
 
@@ -2586,7 +2569,7 @@ static int MBTilesGetBandCountAndTileSize(bool bIsVSICURL, OGRDataSourceH &hDS,
         GDALClose(hDSTile);
         VSIUnlink(osMemFileName.c_str());
         OGR_F_Destroy(hFeat);
-        OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+        GDALDatasetReleaseResultSet(hDS, hSQLLyr);
         return -1;
     }
 
@@ -2608,7 +2591,7 @@ static int MBTilesGetBandCountAndTileSize(bool bIsVSICURL, OGRDataSourceH &hDS,
     GDALClose(hDSTile);
     VSIUnlink(osMemFileName.c_str());
     OGR_F_Destroy(hFeat);
-    OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+    GDALDatasetReleaseResultSet(hDS, hSQLLyr);
 
     return nBands;
 }
@@ -2636,7 +2619,7 @@ GDALDataset *MBTilesDataset::Open(GDALOpenInfo *poOpenInfo)
     /*      Open underlying OGR DB                                          */
     /* -------------------------------------------------------------------- */
 
-    OGRDataSourceH hDS =
+    GDALDatasetH hDS =
         MBTILESOpenSQLiteDB(poOpenInfo->pszFilename, poOpenInfo->eAccess);
 
     MBTilesDataset *poDS = nullptr;
@@ -2661,22 +2644,23 @@ GDALDataset *MBTilesDataset::Open(GDALOpenInfo *poOpenInfo)
 
         osMetadataTableName = "metadata";
 
-        hMetadataLyr = OGR_DS_GetLayerByName(hDS, osMetadataTableName.c_str());
+        hMetadataLyr =
+            GDALDatasetGetLayerByName(hDS, osMetadataTableName.c_str());
         if (hMetadataLyr == nullptr)
             goto end;
 
         osRasterTableName += "tiles";
 
-        hRasterLyr = OGR_DS_GetLayerByName(hDS, osRasterTableName.c_str());
+        hRasterLyr = GDALDatasetGetLayerByName(hDS, osRasterTableName.c_str());
         if (hRasterLyr == nullptr)
             goto end;
 
-        bHasMap = OGR_DS_GetLayerByName(hDS, "map") != nullptr;
+        bHasMap = GDALDatasetGetLayerByName(hDS, "map") != nullptr;
         if (bHasMap)
         {
             bHasMap = FALSE;
 
-            hSQLLyr = OGR_DS_ExecuteSQL(
+            hSQLLyr = GDALDatasetExecuteSQL(
                 hDS, "SELECT type FROM sqlite_master WHERE name = 'tiles'",
                 nullptr, nullptr);
             if (hSQLLyr != nullptr)
@@ -2696,7 +2680,7 @@ GDALDataset *MBTilesDataset::Open(GDALOpenInfo *poOpenInfo)
                     }
                     OGR_F_Destroy(hFeat);
                 }
-                OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+                GDALDatasetReleaseResultSet(hDS, hSQLLyr);
             }
         }
 
@@ -2951,7 +2935,7 @@ GDALDataset *MBTilesDataset::Open(GDALOpenInfo *poOpenInfo)
 
 end:
     if (hDS)
-        OGRReleaseDataSource(hDS);
+        GDALClose(hDS);
 
     return poDS;
 }
@@ -3208,13 +3192,13 @@ GDALDataset *MBTilesDataset::CreateCopy(const char *pszFilename,
                 aosOptions.AddString("VRT");
                 aosOptions.AddString("-projwin");
                 aosOptions.AddString(
-                    CPLSPrintf("%.18g", adfSrcGeoTransform[0]));
-                aosOptions.AddString(CPLSPrintf("%.18g", maxLat));
+                    CPLSPrintf("%.17g", adfSrcGeoTransform[0]));
+                aosOptions.AddString(CPLSPrintf("%.17g", maxLat));
                 aosOptions.AddString(
-                    CPLSPrintf("%.18g", adfSrcGeoTransform[0] +
+                    CPLSPrintf("%.17g", adfSrcGeoTransform[0] +
                                             poSrcDS->GetRasterXSize() *
                                                 adfSrcGeoTransform[1]));
-                aosOptions.AddString(CPLSPrintf("%.18g", minLat));
+                aosOptions.AddString(CPLSPrintf("%.17g", minLat));
                 auto psOptions =
                     GDALTranslateOptionsNew(aosOptions.List(), nullptr);
                 poTmpDS.reset(GDALDataset::FromHandle(GDALTranslate(
diff --git a/frmts/mem/memdataset.cpp b/frmts/mem/memdataset.cpp
index 2d624dafeab4..d265626f2e35 100644
--- a/frmts/mem/memdataset.cpp
+++ b/frmts/mem/memdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2000, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -89,10 +73,10 @@ GDALRasterBandH MEMCreateRasterBandEx(GDALDataset *poDS, int nBand,
 /************************************************************************/
 
 MEMRasterBand::MEMRasterBand(GByte *pabyDataIn, GDALDataType eTypeIn,
-                             int nXSizeIn, int nYSizeIn)
+                             int nXSizeIn, int nYSizeIn, bool bOwnDataIn)
     : GDALPamRasterBand(FALSE), pabyData(pabyDataIn),
       nPixelOffset(GDALGetDataTypeSizeBytes(eTypeIn)), nLineOffset(0),
-      bOwnData(true)
+      bOwnData(bOwnDataIn)
 {
     eAccess = GA_Update;
     eDataType = eTypeIn;
@@ -463,7 +447,7 @@ int MEMRasterBand::GetOverviewCount()
     MEMDataset *poMemDS = dynamic_cast<MEMDataset *>(poDS);
     if (poMemDS == nullptr)
         return 0;
-    return poMemDS->m_nOverviewDSCount;
+    return static_cast<int>(poMemDS->m_apoOverviewDS.size());
 }
 
 /************************************************************************/
@@ -476,9 +460,9 @@ GDALRasterBand *MEMRasterBand::GetOverview(int i)
     MEMDataset *poMemDS = dynamic_cast<MEMDataset *>(poDS);
     if (poMemDS == nullptr)
         return nullptr;
-    if (i < 0 || i >= poMemDS->m_nOverviewDSCount)
+    if (i < 0 || i >= static_cast<int>(poMemDS->m_apoOverviewDS.size()))
         return nullptr;
-    return poMemDS->m_papoOverviewDS[i]->GetRasterBand(nBand);
+    return poMemDS->m_apoOverviewDS[i]->GetRasterBand(nBand);
 }
 
 /************************************************************************/
@@ -504,8 +488,8 @@ CPLErr MEMRasterBand::CreateMaskBand(int nFlagsIn)
         return CE_Failure;
 
     nMaskFlags = nFlagsIn;
-    auto poMemMaskBand =
-        new MEMRasterBand(pabyMaskData, GDT_Byte, nRasterXSize, nRasterYSize);
+    auto poMemMaskBand = new MEMRasterBand(pabyMaskData, GDT_Byte, nRasterXSize,
+                                           nRasterYSize, /* bOwnData= */ true);
     poMemMaskBand->m_bIsMask = true;
     poMask.reset(poMemMaskBand, true);
     if ((nFlagsIn & GMF_PER_DATASET) != 0 && nBand == 1 && poMemDS != nullptr)
@@ -542,8 +526,7 @@ bool MEMRasterBand::IsMaskBand() const
 /************************************************************************/
 
 MEMDataset::MEMDataset()
-    : GDALDataset(FALSE), bGeoTransformSet(FALSE), m_nOverviewDSCount(0),
-      m_papoOverviewDS(nullptr), m_poPrivate(new Private())
+    : GDALDataset(FALSE), bGeoTransformSet(FALSE), m_poPrivate(new Private())
 {
     adfGeoTransform[0] = 0.0;
     adfGeoTransform[1] = 1.0;
@@ -565,10 +548,6 @@ MEMDataset::~MEMDataset()
     bSuppressOnClose = true;
     FlushCache(true);
     bSuppressOnClose = bSuppressOnCloseBackup;
-
-    for (int i = 0; i < m_nOverviewDSCount; ++i)
-        delete m_papoOverviewDS[i];
-    CPLFree(m_papoOverviewDS);
 }
 
 #if 0
@@ -824,11 +803,7 @@ CPLErr MEMDataset::IBuildOverviews(const char *pszResampling, int nOverviews,
     if (nOverviews == 0)
     {
         // Cleanup existing overviews
-        for (int i = 0; i < m_nOverviewDSCount; ++i)
-            delete m_papoOverviewDS[i];
-        CPLFree(m_papoOverviewDS);
-        m_nOverviewDSCount = 0;
-        m_papoOverviewDS = nullptr;
+        m_apoOverviewDS.clear();
         return CE_None;
     }
 
@@ -901,7 +876,7 @@ CPLErr MEMDataset::IBuildOverviews(const char *pszResampling, int nOverviews,
         // Create new overview dataset if needed.
         if (!bExisting)
         {
-            MEMDataset *poOvrDS = new MEMDataset();
+            auto poOvrDS = std::make_unique<MEMDataset>();
             poOvrDS->eAccess = GA_Update;
             poOvrDS->nRasterXSize =
                 (nRasterXSize + panOverviewList[i] - 1) / panOverviewList[i];
@@ -913,14 +888,10 @@ CPLErr MEMDataset::IBuildOverviews(const char *pszResampling, int nOverviews,
                     GetRasterBand(iBand + 1)->GetRasterDataType();
                 if (poOvrDS->AddBand(eDT, nullptr) != CE_None)
                 {
-                    delete poOvrDS;
                     return CE_Failure;
                 }
             }
-            m_nOverviewDSCount++;
-            m_papoOverviewDS = (GDALDataset **)CPLRealloc(
-                m_papoOverviewDS, sizeof(GDALDataset *) * m_nOverviewDSCount);
-            m_papoOverviewDS[m_nOverviewDSCount - 1] = poOvrDS;
+            m_apoOverviewDS.emplace_back(std::move(poOvrDS));
         }
     }
 
@@ -1053,6 +1024,106 @@ CPLErr MEMDataset::CreateMaskBand(int nFlagsIn)
     return poFirstBand->CreateMaskBand(nFlagsIn | GMF_PER_DATASET);
 }
 
+/************************************************************************/
+/*                           CanBeCloned()                              */
+/************************************************************************/
+
+/** Implements GDALDataset::CanBeCloned()
+ *
+ * This method is called by GDALThreadSafeDataset::Create() to determine if
+ * it is possible to create a thread-safe wrapper for a dataset, which involves
+ * the ability to Clone() it.
+ *
+ * The implementation of this method must be thread-safe.
+ */
+bool MEMDataset::CanBeCloned(int nScopeFlags, bool bCanShareState) const
+{
+    return nScopeFlags == GDAL_OF_RASTER && bCanShareState &&
+           typeid(this) == typeid(const MEMDataset *);
+}
+
+/************************************************************************/
+/*                              Clone()                                 */
+/************************************************************************/
+
+/** Implements GDALDataset::Clone()
+ *
+ * This method returns a new instance, identical to "this", but which shares the
+ * same memory buffer as "this".
+ *
+ * The implementation of this method must be thread-safe.
+ */
+std::unique_ptr<GDALDataset> MEMDataset::Clone(int nScopeFlags,
+                                               bool bCanShareState) const
+{
+    if (MEMDataset::CanBeCloned(nScopeFlags, bCanShareState))
+    {
+        auto poNewDS = std::make_unique<MEMDataset>();
+        poNewDS->poDriver = poDriver;
+        poNewDS->nRasterXSize = nRasterXSize;
+        poNewDS->nRasterYSize = nRasterYSize;
+        poNewDS->bGeoTransformSet = bGeoTransformSet;
+        memcpy(poNewDS->adfGeoTransform, adfGeoTransform,
+               sizeof(adfGeoTransform));
+        poNewDS->m_oSRS = m_oSRS;
+        poNewDS->m_aoGCPs = m_aoGCPs;
+        poNewDS->m_oGCPSRS = m_oGCPSRS;
+        for (const auto &poOvrDS : m_apoOverviewDS)
+        {
+            poNewDS->m_apoOverviewDS.emplace_back(
+                poOvrDS->Clone(nScopeFlags, bCanShareState));
+        }
+
+        poNewDS->SetDescription(GetDescription());
+        poNewDS->oMDMD = oMDMD;
+
+        // Clone bands
+        for (int i = 1; i <= nBands; ++i)
+        {
+            auto poSrcMEMBand =
+                dynamic_cast<const MEMRasterBand *>(papoBands[i - 1]);
+            CPLAssert(poSrcMEMBand);
+            auto poNewBand = std::make_unique<MEMRasterBand>(
+                poNewDS.get(), i, poSrcMEMBand->pabyData,
+                poSrcMEMBand->GetRasterDataType(), poSrcMEMBand->nPixelOffset,
+                poSrcMEMBand->nLineOffset,
+                /* bAssumeOwnership = */ false);
+
+            poNewBand->SetDescription(poSrcMEMBand->GetDescription());
+            poNewBand->oMDMD = poSrcMEMBand->oMDMD;
+
+            if (poSrcMEMBand->psPam)
+            {
+                poNewBand->PamInitialize();
+                CPLAssert(poNewBand->psPam);
+                poNewBand->psPam->CopyFrom(*(poSrcMEMBand->psPam));
+            }
+
+            // Instantiates a mask band when needed.
+            if ((poSrcMEMBand->nMaskFlags &
+                 (GMF_ALL_VALID | GMF_ALPHA | GMF_NODATA)) == 0)
+            {
+                auto poSrcMaskBand = dynamic_cast<const MEMRasterBand *>(
+                    poSrcMEMBand->poMask.get());
+                if (poSrcMaskBand)
+                {
+                    auto poMaskBand = new MEMRasterBand(
+                        poSrcMaskBand->pabyData, GDT_Byte, nRasterXSize,
+                        nRasterYSize, /* bOwnData = */ false);
+                    poMaskBand->m_bIsMask = true;
+                    poNewBand->poMask.reset(poMaskBand, true);
+                    poNewBand->nMaskFlags = poSrcMaskBand->nMaskFlags;
+                }
+            }
+
+            poNewDS->SetBand(i, std::move(poNewBand));
+        }
+
+        return poNewDS;
+    }
+    return GDALDataset::Clone(nScopeFlags, bCanShareState);
+}
+
 /************************************************************************/
 /*                                Open()                                */
 /************************************************************************/
@@ -1068,6 +1139,20 @@ GDALDataset *MEMDataset::Open(GDALOpenInfo *poOpenInfo)
         poOpenInfo->fpL != nullptr)
         return nullptr;
 
+#ifndef GDAL_MEM_ENABLE_OPEN
+    if (!CPLTestBool(CPLGetConfigOption("GDAL_MEM_ENABLE_OPEN", "NO")))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Opening a MEM dataset with the MEM:::DATAPOINTER= syntax "
+                 "is no longer supported by default for security reasons. "
+                 "If you want to allow it, define the "
+                 "GDAL_MEM_ENABLE_OPEN "
+                 "configuration option to YES, or build GDAL with the "
+                 "GDAL_MEM_ENABLE_OPEN compilation definition");
+        return nullptr;
+    }
+#endif
+
     char **papszOptions =
         CSLTokenizeStringComplex(poOpenInfo->pszFilename + 6, ",", TRUE, FALSE);
 
diff --git a/frmts/mem/memdataset.h b/frmts/mem/memdataset.h
index f2843cbf78dd..3ffac7fd60d7 100644
--- a/frmts/mem/memdataset.h
+++ b/frmts/mem/memdataset.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2000, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef MEMDATASET_H_INCLUDED
@@ -66,8 +50,7 @@ class CPL_DLL MEMDataset CPL_NON_FINAL : public GDALDataset
     std::vector<gdal::GCP> m_aoGCPs{};
     OGRSpatialReference m_oGCPSRS{};
 
-    int m_nOverviewDSCount;
-    GDALDataset **m_papoOverviewDS;
+    std::vector<std::unique_ptr<GDALDataset>> m_apoOverviewDS{};
 
     struct Private;
     std::unique_ptr<Private> m_poPrivate;
@@ -85,6 +68,12 @@ class CPL_DLL MEMDataset CPL_NON_FINAL : public GDALDataset
                                    int nYSize, int nBands, GDALDataType eType,
                                    char **papszParamList);
 
+  protected:
+    bool CanBeCloned(int nScopeFlags, bool bCanShareState) const override;
+
+    std::unique_ptr<GDALDataset> Clone(int nScopeFlags,
+                                       bool bCanShareState) const override;
+
   public:
     MEMDataset();
     virtual ~MEMDataset();
@@ -141,9 +130,6 @@ class CPL_DLL MEMDataset CPL_NON_FINAL : public GDALDataset
 class CPL_DLL MEMRasterBand CPL_NON_FINAL : public GDALPamRasterBand
 {
   private:
-    MEMRasterBand(GByte *pabyDataIn, GDALDataType eTypeIn, int nXSizeIn,
-                  int nYSizeIn);
-
     CPL_DISALLOW_COPY_ASSIGN(MEMRasterBand)
 
   protected:
@@ -156,6 +142,9 @@ class CPL_DLL MEMRasterBand CPL_NON_FINAL : public GDALPamRasterBand
 
     bool m_bIsMask = false;
 
+    MEMRasterBand(GByte *pabyDataIn, GDALDataType eTypeIn, int nXSizeIn,
+                  int nYSizeIn, bool bOwnDataIn);
+
   public:
     MEMRasterBand(GDALDataset *poDS, int nBand, GByte *pabyData,
                   GDALDataType eType, GSpacing nPixelOffset,
diff --git a/frmts/mem/memmultidim.h b/frmts/mem/memmultidim.h
index f1fff57569c0..c87f99f26f22 100644
--- a/frmts/mem/memmultidim.h
+++ b/frmts/mem/memmultidim.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2021, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef MEMMULTIDIM_H
diff --git a/frmts/mrf/LERCV1/Lerc1Image.cpp b/frmts/mrf/LERCV1/Lerc1Image.cpp
index 89a274819de6..ec44b0885765 100644
--- a/frmts/mrf/LERCV1/Lerc1Image.cpp
+++ b/frmts/mrf/LERCV1/Lerc1Image.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright 2015 - 2021 Esri
+Copyright 2015 - 2024 Esri
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ Contributors:  Thomas Maurer
 #include <cstdint>
 #include <cmath>
 #include <cfloat>
+#include <climits>
 #include <string>
 #include <algorithm>
 
@@ -58,6 +59,7 @@ bool BitMaskV1::RLEdecompress(const Byte *src, size_t n)
         count = *src++;                                                        \
         count += (*src++ << 8);                                                \
     }
+
     while (sz > 0)
     {  // One sequence per loop
         READ_COUNT;
@@ -203,68 +205,17 @@ static int numBytesUInt(unsigned int k)
     return (k <= 0xff) ? 1 : (k <= 0xffff) ? 2 : 4;
 }
 
-// Bits required to store v
+// Index of top set bit, counting from 1
 static int nBits(unsigned int v)
 {
-    int n = 0;
-    while (v >> n)
-        n++;
-    return n;
-}
-
-// see the old stream IO functions below on how to call.
-// if you change write(...) / read(...), don't forget to update
-// computeNumBytesNeeded(...).
-static bool blockwrite(Byte **ppByte, const std::vector<unsigned int> &d)
-{
-    if (!ppByte || d.empty())
-        return false;
-
-    unsigned int maxElem = *std::max_element(d.begin(), d.end());
-    unsigned int numElements = (unsigned int)d.size();
-    int n = numBytesUInt(numElements);
-    int numBits = nBits(maxElem);  // 0 to 28
-
-    // use bits67 to encode the type used for numElements: Byte, ushort, or uint
-    // n is in {1, 2, 4}
-    // 0xc0 is invalid, will trigger an error
-    **ppByte = static_cast<Byte>(numBits | bits67[n - 1]);
-    (*ppByte)++;
-    memcpy(*ppByte, &numElements, n);
-    *ppByte += n;
-    if (numBits == 0)
-        return true;
-
-    int bits = 32;         // Available
-    unsigned int acc = 0;  // Accumulator
-    for (unsigned int val : d)
-    {
-        if (bits >= numBits)
-        {  // no accumulator overflow
-            acc |= val << (bits - numBits);
-            bits -= numBits;
-        }
-        else
-        {  // accum overflowing
-            acc |= val >> (numBits - bits);
-            memcpy(*ppByte, &acc, sizeof(acc));
-            *ppByte += sizeof(acc);
-            bits += 32 - numBits;  // under 32
-            acc = val << bits;
-        }
-    }
-
-    // There are between 1 and 4 bytes left to write
-    int nbytes = 4;
-    while (bits >= 8)
-    {
-        acc >>= 8;
-        bits -= 8;
-        nbytes--;
-    }
-    memcpy(*ppByte, &acc, nbytes);
-    *ppByte += nbytes;
-    return true;
+    int r = int(0 != (v >> 16)) << 4;
+    v >>= r;
+    int t = int(0 != (v >> 8)) << 3;
+    v >>= t;
+    r += t;
+    t = int(0 != (v >> 4)) << 2;
+    v = (v >> t) << 1;
+    return 1 + r + t + int((0xffffaa50ul >> v) & 0x3);
 }
 
 static bool blockread(Byte **ppByte, size_t &size, std::vector<unsigned int> &d)
@@ -355,28 +306,27 @@ unsigned int
 Lerc1Image::computeNumBytesNeededToWrite(double maxZError, bool onlyZPart,
                                          InfoFromComputeNumBytes *info) const
 {
-    int numBytesOpt;
     unsigned int sz =
-        (unsigned int)sCntZImage.size() + 4 * sizeof(int) + sizeof(double);
+        (unsigned int)(sCntZImage.size() + 4 * sizeof(int) + sizeof(double));
     if (!onlyZPart)
     {
-        float cntMin, cntMax;
-        computeCntStats(cntMin, cntMax);
-
-        numBytesOpt = 0;
-        if (cntMin != cntMax)
-            numBytesOpt = mask.RLEsize();
-
+        auto m = mask.IsValid(0);
         info->numTilesVertCnt = 0;
         info->numTilesHoriCnt = 0;
-        info->numBytesCnt = numBytesOpt;
-        info->maxCntInImg = cntMax;
-
-        sz += 3 * sizeof(int) + sizeof(float) + numBytesOpt;
+        info->maxCntInImg = m;
+        info->numBytesCnt = 0;
+        for (int i = 0; i < getSize(); i++)
+            if (m != mask.IsValid(i))
+            {
+                info->numBytesCnt = mask.RLEsize();
+                info->maxCntInImg = 1;
+                break;
+            }
+        sz += 3 * sizeof(int) + sizeof(float) + info->numBytesCnt;
     }
 
     // z part
-    int numTilesVert, numTilesHori;
+    int numTilesVert, numTilesHori, numBytesOpt;
     float maxValInImg;
     if (!findTiling(maxZError, numTilesVert, numTilesHori, numBytesOpt,
                     maxValInImg))
@@ -478,6 +428,7 @@ bool Lerc1Image::read(Byte **ppByte, size_t &nRemainingBytes, double maxZError,
 #define RDVAR(PTR, VAR)                                                        \
     memcpy(&(VAR), (PTR), sizeof(VAR));                                        \
     (PTR) += sizeof(VAR)
+
     size_t len = sCntZImage.length();
     if (nRemainingBytes < len)
         return false;
@@ -655,9 +606,11 @@ static Byte *writeFlt(Byte *ptr, float z, int n)
 // Only small, exact integer values return 1 or 2, otherwise 4
 static int numBytesFlt(float z)
 {
-    float s = static_cast<float>(static_cast<signed short>(z));
-    float c = static_cast<float>(static_cast<signed char>(z));
-    return (c == z) ? 1 : (s == z) ? 2 : 4;
+    if (!std::isfinite(z) || z > SHRT_MAX || z < SHRT_MIN || z != int16_t(z))
+        return 4;
+    if (z > SCHAR_MAX || z < SCHAR_MIN)
+        return 2;
+    return 1;
 }
 
 static int numBytesZTile(int nValues, float zMin, float zMax, double maxZError)
@@ -685,12 +638,10 @@ bool Lerc1Image::writeTiles(double maxZError, int numTilesV, int numTilesH,
     maxValInImg = -FLT_MAX;
     int tileHeight = static_cast<int>(getHeight() / numTilesV);
     int tileWidth = static_cast<int>(getWidth() / numTilesH);
-    int v0 = 0;
-    while (v0 < getHeight())
+    for (int v0 = 0; v0 < getHeight(); v0 += tileHeight)
     {
         int v1 = std::min(getHeight(), v0 + tileHeight);
-        int h0 = 0;
-        while (h0 < getWidth())
+        for (int h0 = 0; h0 < getWidth(); h0 += tileWidth)
         {
             int h1 = std::min(getWidth(), h0 + tileWidth);
             float zMin = 0, zMax = 0;
@@ -712,9 +663,8 @@ bool Lerc1Image::writeTiles(double maxZError, int numTilesV, int numTilesH,
                 {
                     numBytesNeeded =
                         numBytesZTile(numValidPixel, zMin, zMax, maxZError);
-                    // Try moving zMin up by maxZError, it may require fewer
-                    // bytes A bit less than maxZError, to avoid quantization
-                    // underflow
+                    // Try moving zMin up by almost maxZError,
+                    // it may require fewer bytes
                     float zm = static_cast<float>(zMin + 0.999999 * maxZError);
                     if (numFinite == numValidPixel && zm <= zMax)
                     {
@@ -761,9 +711,7 @@ bool Lerc1Image::writeTiles(double maxZError, int numTilesV, int numTilesH,
                 if (numBytesWritten != numBytesNeeded)
                     return false;
             }
-            h0 = h1;
         }
-        v0 = v1;
     }
     return true;
 }
@@ -778,34 +726,20 @@ bool Lerc1Image::readTiles(double maxZErrorInFile, int numTilesV, int numTilesH,
     int tileWidth = static_cast<int>(getWidth() / numTilesH);
     if (tileWidth <= 0 || tileHeight <= 0)  // Prevent infinite loop
         return false;
-    int r0 = 0;
-    while (r0 < getHeight())
+    for (int r0 = 0; r0 < getHeight(); r0 += tileHeight)
     {
         int r1 = std::min(getHeight(), r0 + tileHeight);
-        int c0 = 0;
-        while (c0 < getWidth())
+        for (int c0 = 0; c0 < getWidth(); c0 += tileWidth)
         {
             int c1 = std::min(getWidth(), c0 + tileWidth);
             if (!readZTile(&bArr, nRemainingBytes, r0, r1, c0, c1,
                            maxZErrorInFile, maxValInImg))
                 return false;
-            c0 = c1;
         }
-        r0 = r1;
     }
     return true;
 }
 
-void Lerc1Image::computeCntStats(float &cntMin, float &cntMax) const
-{
-    cntMin = cntMax = static_cast<float>(mask.IsValid(0) ? 1.0f : 0.0f);
-    for (int k = 0; k < getSize() && cntMin == cntMax; k++)
-        if (mask.IsValid(k))
-            cntMax = 1.0f;
-        else
-            cntMin = 0.0f;
-}
-
 bool Lerc1Image::computeZStats(int r0, int r1, int c0, int c1, float &zMin,
                                float &zMax, int &numValidPixel,
                                int &numFinite) const
@@ -822,10 +756,10 @@ bool Lerc1Image::computeZStats(int r0, int r1, int c0, int c1, float &zMin,
             {
                 numValidPixel++;
                 float val = (*this)(row, col);
-                if (!std::isfinite(val))
-                    zMin = NAN;  // Serves as a flag, this block will be stored
-                else
+                if (std::isfinite(val))
                     numFinite++;
+                else
+                    zMin = NAN;  // Serves as a flag, this block will be stored
                 if (val < zMin)
                     zMin = val;
                 if (val > zMax)
@@ -859,17 +793,15 @@ bool Lerc1Image::writeZTile(Byte **ppByte, int &numBytes, int r0, int r1,
     Byte *ptr = *ppByte;
     int cntPixel = 0;
     if (numValidPixel == 0 || (zMin == 0 && zMax == 0))
-    {  // special cases
-        *(*ppByte)++ =
-            2;  // set compression flag to 2 to mark tile as constant 0
+    {
+        *(*ppByte)++ = 2;  // mark tile as constant 0
         numBytes = 1;
         return true;
     }
     if (maxZError == 0 || !std::isfinite(zMin) || !std::isfinite(zMax) ||
         ((double)zMax - zMin) / (2 * maxZError) > MAXQ)
-    {  // we'd need > 28 bit
-        // write z's as flt arr uncompressed
-        *ptr++ = 0;  // flag
+    {  // store valid pixels as floating point
+        *ptr++ = 0;
         for (int row = r0; row < r1; row++)
             for (int col = c0; col < c1; col++)
                 if (IsValid(row, col))
@@ -882,34 +814,69 @@ bool Lerc1Image::writeZTile(Byte **ppByte, int &numBytes, int r0, int r1,
             return false;
     }
     else
-    {  // write z's as int arr bit stuffed
-        Byte flag = 1;
-        unsigned int maxElem =
-            (unsigned int)(((double)zMax - zMin) / (2 * maxZError) + 0.5);
+    {
+        Byte flag = 1;               // bitstuffed int array
+        double f = 0.5 / maxZError;  // conversion to int multiplier
+        unsigned int maxElem = (unsigned int)(((double)zMax - zMin) * f + 0.5);
         if (maxElem == 0)
-            flag =
-                3;  // set compression flag to 3 to mark tile as constant zMin
+            flag = 3;               // mark tile as constant zMin
         int n = numBytesFlt(zMin);  // n in { 1, 2, 4 }
         *ptr++ = (flag | bits67[n - 1]);
         ptr = writeFlt(ptr, zMin, n);
         if (maxElem > 0)
         {
-            std::vector<unsigned int> odataVec;
+            int numBits = nBits(maxElem);
+            n = numBytesUInt(numValidPixel);
+            // use bits67 to encode the type used for numElements: Byte, ushort, or uint
+            // n is in {1, 2, 4}
+            // 0xc0 is invalid, will trigger an error
+            *ptr++ = static_cast<Byte>(numBits | bits67[n - 1]);
+            memcpy(ptr, &numValidPixel, n);
+            ptr += n;
+
+            unsigned int acc = 0;  // Accumulator
+            int bits = 32;         // Available
+
             for (int row = r0; row < r1; row++)
                 for (int col = c0; col < c1; col++)
                     if (IsValid(row, col))
-                        odataVec.push_back(
-                            (unsigned int)(((double)(*this)(row, col) - zMin) /
-                                               (2 * maxZError) +
-                                           0.5));
-            if (odataVec.size() != static_cast<size_t>(numValidPixel))
-                return false;
-            if (!blockwrite(&ptr, odataVec))
+                    {
+                        cntPixel++;
+                        auto val = static_cast<unsigned int>(
+                            ((double)(*this)(row, col) - zMin) * f + 0.5);
+
+                        if (bits >= numBits)
+                        {  // no accumulator overflow
+                            acc |= val << (bits - numBits);
+                            bits -= numBits;
+                        }
+                        else
+                        {  // accum overflowing
+                            acc |= val >> (numBits - bits);
+                            memcpy(ptr, &acc, sizeof(acc));
+                            ptr += sizeof(acc);
+                            bits += 32 - numBits;  // under 32
+                            acc = val << bits;
+                        }
+                    }
+
+            if (cntPixel != numValidPixel)
                 return false;
+
+            // There are between 1 and 4 bytes left in the accumulator
+            int nbytes = 4;
+            while (bits >= 8)
+            {
+                acc >>= 8;
+                bits -= 8;
+                nbytes--;
+            }
+            memcpy(ptr, &acc, nbytes);
+            ptr += nbytes;
         }
     }
 
-    numBytes = (int)(ptr - *ppByte);
+    numBytes = static_cast<int>(ptr - *ppByte);
     *ppByte = ptr;
     return true;
 }
@@ -977,7 +944,7 @@ bool Lerc1Image::readZTile(Byte **ppByte, size_t &nRemainingBytes, int r0,
 
     if (nRemainingBytes < n)
         return false;
-    float bminval = readFlt(ptr, n);
+    float minval = readFlt(ptr, n);
     ptr += n;
     nRemainingBytes -= n;
 
@@ -985,27 +952,29 @@ bool Lerc1Image::readZTile(Byte **ppByte, size_t &nRemainingBytes, int r0,
     {  // all min val, regardless of mask
         for (int row = r0; row < r1; row++)
             for (int col = c0; col < c1; col++)
-                (*this)(row, col) = bminval;
+                (*this)(row, col) = minval;
         *ppByte = ptr;
         return true;
     }
 
-    idataVec.resize((r1 - r0) * (c1 - c0));  // max size
+    idataVec.resize((r1 - r0) * (c1 - c0));  // max size, gets adjusted
     if (!blockread(&ptr, nRemainingBytes, idataVec))
         return false;
 
-    size_t nDataVecIdx = 0;
+    size_t numValid = idataVec.size();
+    size_t i = 0;
+    double q = maxZErrorInFile * 2;  // quanta
     for (int row = r0; row < r1; row++)
         for (int col = c0; col < c1; col++)
             if (IsValid(row, col))
             {
-                if (nDataVecIdx >= idataVec.size())
+                if (i >= numValid)
                     return false;
                 (*this)(row, col) = std::min(
-                    maxZInImg,
-                    static_cast<float>(bminval + maxZErrorInFile * 2 *
-                                                     idataVec[nDataVecIdx++]));
+                    maxZInImg, static_cast<float>(minval + q * idataVec[i++]));
             }
+    if (i != numValid)
+        return false;
 
     *ppByte = ptr;
     return true;
diff --git a/frmts/mrf/LERCV1/Lerc1Image.h b/frmts/mrf/LERCV1/Lerc1Image.h
index 1d4f6e9aeed4..6396119cf957 100644
--- a/frmts/mrf/LERCV1/Lerc1Image.h
+++ b/frmts/mrf/LERCV1/Lerc1Image.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2015 - 2021 Esri
+Copyright 2015 - 2024 Esri
 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
@@ -185,8 +185,6 @@ class Lerc1Image : public TImage<float>
     bool readTiles(double maxZErrorInFile, int numTilesVert, int numTilesHori,
                    float maxValInImg, Byte *bArr, size_t nRemainingBytes);
 
-    void computeCntStats(float &cntMin, float &cntMax)
-        const;  // Across the whole image, always works
     bool computeZStats(int r0, int r1, int c0, int c1, float &zMin, float &zMax,
                        int &numValidPixel, int &numFinite) const;
 
@@ -205,8 +203,7 @@ class Lerc1Image : public TImage<float>
     computeNumBytesNeededToWrite(double maxZError, bool onlyZPart,
                                  InfoFromComputeNumBytes *info) const;
 
-    std::vector<unsigned int>
-        idataVec;  // temporary buffer, reused in readZTile
+    std::vector<unsigned int> idataVec;  // temporary buffer
     BitMaskV1 mask;
 
   public:
diff --git a/frmts/mrf/LERC_band.cpp b/frmts/mrf/LERC_band.cpp
index aba3d549b0c1..84c661a6f242 100644
--- a/frmts/mrf/LERC_band.cpp
+++ b/frmts/mrf/LERC_band.cpp
@@ -24,6 +24,8 @@ Authors:  Lucian Plesea
 #include <vector>
 #include "LERCV1/Lerc1Image.h"
 
+#include "gdal_priv_templates.hpp"
+
 // Requires lerc at least 2v4, where the c_api changed, but there is no good way
 // to check
 #include <Lerc_c_api.h>
@@ -189,7 +191,10 @@ template <typename T>
 static bool Lerc1ImgUFill(Lerc1Image &zImg, T *dst, const ILImage &img,
                           GInt32 stride)
 {
-    const T ndv = static_cast<T>(img.hasNoData ? img.NoDataValue : 0);
+    const T ndv =
+        static_cast<T>(img.hasNoData && GDALIsValueInRange<T>(img.NoDataValue)
+                           ? img.NoDataValue
+                           : 0);
     if (img.pagesize.y != zImg.getHeight() || img.pagesize.x != zImg.getWidth())
         return false;
     int w = img.pagesize.x;
@@ -303,6 +308,9 @@ static CPLErr DecompressLERC1(buf_mgr &dst, const buf_mgr &src,
             case GDT_Byte:
                 UFILL(GByte);
                 break;
+            case GDT_Int8:
+                UFILL(GInt8);
+                break;
             case GDT_UInt16:
                 UFILL(GUInt16);
                 break;
@@ -361,8 +369,11 @@ static GDALDataType L2toGDT(L2NS::DataType L2type)
         case L2NS::DataType::dt_double:
             dt = GDT_Float64;
             break;
-        default:
-            dt = GDT_Byte;  // GDAL doesn't have a signed char type
+        case L2NS::DataType::dt_char:
+            dt = GDT_Int8;
+            break;
+        default:  // Unsigned byte
+            dt = GDT_Byte;
     }
     return dt;
 }
@@ -707,6 +718,14 @@ CPLXMLNode *LERC_Band::GetMRFConfig(GDALOpenInfo *poOpenInfo)
 LERC_Band::LERC_Band(MRFDataset *pDS, const ILImage &image, int b, int level)
     : MRFRasterBand(pDS, image, b, level)
 {
+    // Lerc doesn't handle 64bit int types
+    if (image.dt == GDT_UInt64 || image.dt == GDT_Int64)
+    {
+        CPLError(CE_Failure, CPLE_NotSupported,
+                 "Lerc compression of 64 bit integers is not supported");
+        return;
+    }
+
     // Pick 1/1000 for floats and 0.5 losless for integers.
     if (eDataType == GDT_Float32 || eDataType == GDT_Float64)
         precision = strtod(GetOptionValue("LERC_PREC", ".001"), nullptr);
diff --git a/frmts/mrf/PNG_band.cpp b/frmts/mrf/PNG_band.cpp
index b868e6324232..b0582f346a95 100644
--- a/frmts/mrf/PNG_band.cpp
+++ b/frmts/mrf/PNG_band.cpp
@@ -153,7 +153,7 @@ CPLErr PNG_Codec::DecompressPNG(buf_mgr &dst, buf_mgr &src)
     {
         // Use the PNG driver for decompression of 8-bit images, as it
         // has optimizations for whole image decompression.
-        CPLString osTmpFilename(CPLSPrintf("/vsimem/mrf/%p.png", &dst));
+        const CPLString osTmpFilename(VSIMemGenerateHiddenFilename("mrf.png"));
         VSIFCloseL(VSIFileFromMemBuffer(
             osTmpFilename.c_str(), reinterpret_cast<GByte *>(src_ori.buffer),
             src_ori.size, false));
diff --git a/frmts/mrf/QB3_band.cpp b/frmts/mrf/QB3_band.cpp
index 338779572a61..c751234a5da4 100644
--- a/frmts/mrf/QB3_band.cpp
+++ b/frmts/mrf/QB3_band.cpp
@@ -43,6 +43,12 @@ CPLErr QB3_Band::Compress(buf_mgr &dst, buf_mgr &src)
         case (GDT_UInt32):
             pQB3 = CREATE_QB3(QB3_U32);
             break;
+        case (GDT_Int64):
+            pQB3 = CREATE_QB3(QB3_I64);
+            break;
+        case (GDT_UInt64):
+            pQB3 = CREATE_QB3(QB3_U64);
+            break;
         default:
             CPLError(CE_Failure, CPLE_AssertionFailed,
                      "MRF:QB3 Data type not supported");
@@ -78,6 +84,12 @@ CPLErr QB3_Band::Compress(buf_mgr &dst, buf_mgr &src)
         // Quality of 90 and above trigger the better encoding
         qb3_set_encoder_mode(pQB3, (img.quality > 90) ? QB3M_BEST : QB3M_BASE);
 
+#if defined(QB3_HAS_FTL)
+        // Quality below 5 triggers the faster encoding, when available
+        if (img.quality < 5)
+            qb3_set_encoder_mode(pQB3, QB3M_FTL);
+#endif
+
         dst.size = qb3_encode(pQB3, src.buffer, dst.buffer);
         if (0 == dst.size)
         {
@@ -174,7 +186,8 @@ QB3_Band::QB3_Band(MRFDataset *pDS, const ILImage &image, int b, int level)
 
     if (image.dt != GDT_Byte && image.dt != GDT_Int16 &&
         image.dt != GDT_UInt16 && image.dt != GDT_Int32 &&
-        image.dt != GDT_UInt32)
+        image.dt != GDT_UInt32 && image.dt != GDT_Int64 &&
+        image.dt != GDT_UInt64)
     {
         CPLError(CE_Failure, CPLE_NotSupported,
                  "Data type not supported by QB3 compression");
diff --git a/frmts/mrf/Tif_band.cpp b/frmts/mrf/Tif_band.cpp
index c54f5bd2b06c..04a22bc15920 100644
--- a/frmts/mrf/Tif_band.cpp
+++ b/frmts/mrf/Tif_band.cpp
@@ -51,9 +51,7 @@
 #include "marfa.h"
 NAMESPACE_MRF_START
 
-// Returns a string in /vsimem/ + prefix + count that doesn't exist when this
-// function gets called It is not thread safe, open the result as soon as
-// possible
+// Returns a unique filename
 static CPLString uniq_memfname(const char *prefix)
 {
     // Define MRF_LOCAL_TMP to use local files instead of RAM
@@ -61,14 +59,7 @@ static CPLString uniq_memfname(const char *prefix)
 #if defined(MRF_LOCAL_TMP)
     return CPLGenerateTempFilename(prefix);
 #else
-    CPLString fname;
-    VSIStatBufL statb;
-    static unsigned int cnt = 0;
-    do
-    {
-        fname.Printf("/vsimem/%s_%08x", prefix, cnt++);
-    } while (!VSIStatL(fname, &statb));
-    return fname;
+    return VSIMemGenerateHiddenFilename(prefix);
 #endif
 }
 
@@ -242,6 +233,8 @@ TIF_Band::TIF_Band(MRFDataset *pDS, const ILImage &image, int b, int level)
     // ZLEVEL 8, which is fine.
     if (q > 2)
         q -= 2;
+    if (q == 0)  // TIF does not accept ZLEVEL of zero
+        q = 6;
     papszOptions = CSLAddNameValue(papszOptions, "ZLEVEL", CPLOPrintf("%d", q));
 }
 
diff --git a/frmts/mrf/marfa.h b/frmts/mrf/marfa.h
index 6e0cff3171d2..0ec8c11dc667 100644
--- a/frmts/mrf/marfa.h
+++ b/frmts/mrf/marfa.h
@@ -292,6 +292,7 @@ ILOrder OrderToken(const char *, ILOrder def = IL_ERR_ORD);
 CPLString getFname(CPLXMLNode *, const char *, const CPLString &, const char *);
 CPLString getFname(const CPLString &, const char *);
 double getXMLNum(CPLXMLNode *, const char *, double);
+// Offset of index, pos is in pages
 GIntBig IdxOffset(const ILSize &, const ILImage &);
 double logbase(double val, double base);
 int IsPower(double value, double base);
@@ -344,9 +345,6 @@ typedef struct
     GDALRWFlag acc;
 } VF;
 
-// Offset of index, pos is in pages
-GIntBig IdxOffset(const ILSize &pos, const ILImage &img);
-
 enum
 {
     SAMPLING_ERR,
@@ -556,6 +554,7 @@ class MRFDataset final : public GDALPamDataset
 
     // MRF file name
     CPLString fname;
+    CPLString publicname;
 
     // The source to be cached in this MRF
     CPLString source;
@@ -966,11 +965,11 @@ class LERC_Band final : public MRFRasterBand
   protected:
     virtual CPLErr Decompress(buf_mgr &dst, buf_mgr &src) override;
     virtual CPLErr Compress(buf_mgr &dst, buf_mgr &src) override;
-    double precision;
+    double precision = 0;
     // L1 or L2
-    int version;
+    int version = 0;
     // L2 version
-    int l2ver;
+    int l2ver = 0;
     // Build a MRF header for a single LERC tile
     static CPLXMLNode *GetMRFConfig(GDALOpenInfo *poOpenInfo);
 
diff --git a/frmts/mrf/marfa_dataset.cpp b/frmts/mrf/marfa_dataset.cpp
index 04f6e27854fc..6af454ae1702 100644
--- a/frmts/mrf/marfa_dataset.cpp
+++ b/frmts/mrf/marfa_dataset.cpp
@@ -87,7 +87,7 @@ MRFDataset::MRFDataset()
       pzscctx(nullptr), pzsdctx(nullptr), read_timer(), write_timer(0)
 {
     m_oSRS.SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
-    //                X0   Xx   Xy  Y0    Yx   Yy
+    //               X0   Xx   Xy  Y0    Yx   Yy
     double gt[6] = {0.0, 1.0, 0.0, 0.0, 0.0, 1.0};
 
     memcpy(GeoTransform, gt, sizeof(gt));
@@ -603,15 +603,26 @@ GDALDataset *MRFDataset::Open(GDALOpenInfo *poOpenInfo)
     int level = -1;   // All levels
     int version = 0;  // Current
     int zslice = 0;
-    string fn;  // Used to parse and adjust the file name
+    string fn;        // Used to parse and adjust the file name
+    string insidefn;  // inside tar file name
 
     // Different ways to open an MRF
     if (poOpenInfo->nHeaderBytes >= 10)
     {
         const char *pszHeader =
             reinterpret_cast<char *>(poOpenInfo->pabyHeader);
+        fn.assign(pszHeader, poOpenInfo->nHeaderBytes);
         if (STARTS_WITH(pszHeader, "<MRF_META>"))  // Regular file name
             config = CPLParseXMLFile(pszFileName);
+        else if (poOpenInfo->eAccess == GA_ReadOnly && fn.size() > 600 &&
+                 (fn[262] == 0 || fn[262] == 32) &&
+                 STARTS_WITH(fn.c_str() + 257, "ustar") &&
+                 strlen(CPLGetPath(fn.c_str())) == 0 &&
+                 STARTS_WITH(fn.c_str() + 512, "<MRF_META>"))
+        {  // An MRF inside a tar
+            insidefn = string("/vsitar/") + pszFileName + "/" + pszHeader;
+            config = CPLParseXMLFile(insidefn.c_str());
+        }
 #if defined(LERC)
         else
             config = LERC_Band::GetMRFConfig(poOpenInfo);
@@ -644,6 +655,11 @@ GDALDataset *MRFDataset::Open(GDALOpenInfo *poOpenInfo)
 
     MRFDataset *ds = new MRFDataset();
     ds->fname = pszFileName;
+    if (!insidefn.empty())
+    {
+        ds->publicname = pszFileName;
+        ds->fname = insidefn;
+    }
     ds->eAccess = poOpenInfo->eAccess;
     ds->level = level;
     ds->zslice = zslice;
@@ -657,7 +673,7 @@ GDALDataset *MRFDataset::Open(GDALOpenInfo *poOpenInfo)
     {
         // Open the whole dataset, then pick one level
         ds->cds = new MRFDataset();
-        ds->cds->fname = pszFileName;
+        ds->cds->fname = ds->fname;
         ds->cds->eAccess = ds->eAccess;
         ds->zslice = zslice;
         ret = ds->cds->Initialize(config);
@@ -683,7 +699,7 @@ GDALDataset *MRFDataset::Open(GDALOpenInfo *poOpenInfo)
     }
 
     // Tell PAM what our real file name is, to help it find the aux.xml
-    ds->SetPhysicalFilename(pszFileName);
+    ds->SetPhysicalFilename(ds->fname);
     // Don't mess with metadata after this, otherwise PAM will re-write the
     // aux.xml
     ds->TryLoadXML();
@@ -691,7 +707,7 @@ GDALDataset *MRFDataset::Open(GDALOpenInfo *poOpenInfo)
     /* -------------------------------------------------------------------- */
     /*      Open external overviews.                                        */
     /* -------------------------------------------------------------------- */
-    ds->oOvManager.Initialize(ds, pszFileName);
+    ds->oOvManager.Initialize(ds, ds->fname);
 
     return ds;
 }
@@ -1012,10 +1028,13 @@ char **MRFDataset::GetFileList()
 {
     char **papszFileList = nullptr;
 
+    string usename = fname;
+    if (!publicname.empty())
+        usename = publicname;
     // Add the header file name if it is real
     VSIStatBufL sStat;
-    if (VSIStatExL(fname, &sStat, VSI_STAT_EXISTS_FLAG) == 0)
-        papszFileList = CSLAddString(papszFileList, fname);
+    if (VSIStatExL(usename.c_str(), &sStat, VSI_STAT_EXISTS_FLAG) == 0)
+        papszFileList = CSLAddString(papszFileList, usename.c_str());
 
     // These two should be real
     // We don't really want to add these files, since they will be erased when
@@ -1370,7 +1389,7 @@ CPLXMLNode *MRFDataset::BuildConfig()
             options += optlist[i];
             options += ' ';
         }
-        options.resize(options.size() - 1);
+        options.pop_back();
         CPLCreateXMLElementAndValue(config, "Options", options);
     }
 
@@ -1676,15 +1695,14 @@ GIntBig MRFDataset::AddOverviews(int scaleIn)
 
         // And adjust the offset again, within next level
         img.idxoffset += sizeof(ILIdx) * img.pagecount.l / img.size.z * zslice;
-
+        int l = static_cast<int>(img.size.l);
         // Create and register the overviews for each band
         for (int i = 1; i <= nBands; i++)
         {
             MRFRasterBand *b =
                 reinterpret_cast<MRFRasterBand *>(GetRasterBand(i));
-            if (!(b->GetOverview(static_cast<int>(img.size.l) - 1)))
-                b->AddOverview(newMRFRasterBand(this, img, i,
-                                                static_cast<int>(img.size.l)));
+            if (!(b->GetOverview(l - 1)))
+                b->AddOverview(newMRFRasterBand(this, img, i, l));
         }
     }
 
diff --git a/frmts/mrf/mrf_band.cpp b/frmts/mrf/mrf_band.cpp
index 3bb645355b91..cdc51d9be3ef 100644
--- a/frmts/mrf/mrf_band.cpp
+++ b/frmts/mrf/mrf_band.cpp
@@ -129,10 +129,13 @@ static int isAllVal(GDALDataType gt, void *b, size_t bytecount, double ndv)
     switch (gt)
     {
         TEST_T(GDT_Byte, GByte);
+        TEST_T(GDT_Int8, GInt8);
         TEST_T(GDT_UInt16, GUInt16);
         TEST_T(GDT_Int16, GInt16);
         TEST_T(GDT_UInt32, GUInt32);
         TEST_T(GDT_Int32, GInt32);
+        TEST_T(GDT_UInt64, GUInt64);
+        TEST_T(GDT_Int64, GInt64);
         TEST_T(GDT_Float32, float);
         TEST_T(GDT_Float64, double);
         default:
@@ -573,7 +576,7 @@ CPLErr MRFRasterBand::FillBlock(void *buffer)
     size_t bsb = blockSizeBytes();
 
     // use memset for speed for bytes, or if nodata is zeros
-    if (eDataType == GDT_Byte || 0.0L == ndv)
+    if (0.0 == ndv || eDataType == GDT_Byte || eDataType == GDT_Int8)
     {
         memset(buffer, int(ndv), bsb);
         return CE_None;
@@ -590,6 +593,10 @@ CPLErr MRFRasterBand::FillBlock(void *buffer)
             return bf(GUInt32);
         case GDT_Int32:
             return bf(GInt32);
+        case GDT_UInt64:
+            return bf(GUInt64);
+        case GDT_Int64:
+            return bf(GInt64);
         case GDT_Float32:
             return bf(float);
         case GDT_Float64:
diff --git a/frmts/mrf/mrf_overview.cpp b/frmts/mrf/mrf_overview.cpp
index ff03e2726191..8055cf5be1f6 100644
--- a/frmts/mrf/mrf_overview.cpp
+++ b/frmts/mrf/mrf_overview.cpp
@@ -479,6 +479,8 @@ CPLErr MRFDataset::PatchOverview(int BlockX, int BlockY, int Width, int Height,
                     {
                         case GDT_Byte:
                             resample(GByte);
+                        case GDT_Int8:
+                            resample(GInt8);
                         case GDT_UInt16:
                             resample(GUInt16);
                         case GDT_Int16:
@@ -487,6 +489,10 @@ CPLErr MRFDataset::PatchOverview(int BlockX, int BlockY, int Width, int Height,
                             resample(GUInt32);
                         case GDT_Int32:
                             resample(GInt32);
+                        case GDT_UInt64:
+                            resample(GUInt64);
+                        case GDT_Int64:
+                            resample(GInt64);
                         case GDT_Float32:
                             resample(float);
                         case GDT_Float64:
@@ -516,6 +522,8 @@ CPLErr MRFDataset::PatchOverview(int BlockX, int BlockY, int Width, int Height,
                     {
                         case GDT_Byte:
                             resample(GByte);
+                        case GDT_Int8:
+                            resample(GInt8);
                         case GDT_UInt16:
                             resample(GUInt16);
                         case GDT_Int16:
@@ -524,6 +532,10 @@ CPLErr MRFDataset::PatchOverview(int BlockX, int BlockY, int Width, int Height,
                             resample(GUInt32);
                         case GDT_Int32:
                             resample(GInt32);
+                        case GDT_UInt64:
+                            resample(GUInt64);
+                        case GDT_Int64:
+                            resample(GInt64);
                         case GDT_Float32:
                             resample(float);
                         case GDT_Float64:
diff --git a/frmts/mrf/mrf_util.cpp b/frmts/mrf/mrf_util.cpp
index 8601505680ac..40fc2aebe3d2 100644
--- a/frmts/mrf/mrf_util.cpp
+++ b/frmts/mrf/mrf_util.cpp
@@ -537,7 +537,7 @@ void XMLSetAttributeVal(CPLXMLNode *parent, const char *pszName,
             single_val = false;
         value.append(PrintDouble(values[i]) + " ");
     }
-    value.resize(value.size() - 1);  // Cut the last space
+    value.pop_back();  // Cut the last space
     if (single_val)
         value = PrintDouble(values[0]);
     CPLCreateXMLNode(parent, CXT_Attribute, pszName);
diff --git a/frmts/mrf/mrfdrivercore.cpp b/frmts/mrf/mrfdrivercore.cpp
index a8527ff64ef8..dcfdad5ade58 100644
--- a/frmts/mrf/mrfdrivercore.cpp
+++ b/frmts/mrf/mrfdrivercore.cpp
@@ -97,6 +97,14 @@ int MRFDriverIdentify(GDALOpenInfo *poOpenInfo)
         return TRUE;
 #endif
 
+    // accept a tar file if the first file has no folder look like an MRF
+    if (poOpenInfo->eAccess == GA_ReadOnly && fn.size() > 600 &&
+        (fn[262] == 0 || fn[262] == 32) && STARTS_WITH(fn + 257, "ustar") &&
+        strlen(CPLGetPath(fn)) == 0 && STARTS_WITH(fn + 512, "<MRF_META>"))
+    {
+        return TRUE;
+    }
+
     return FALSE;
 }
 
@@ -123,8 +131,9 @@ void MRFDriverSetCommonMetadata(GDALDriver *poDriver)
         "</OpenOptionList>");
 
     // These will need to be revisited, do we support complex data types too?
-    poDriver->SetMetadataItem(GDAL_DMD_CREATIONDATATYPES,
-                              "Byte UInt16 Int16 Int32 UInt32 Float32 Float64");
+    poDriver->SetMetadataItem(
+        GDAL_DMD_CREATIONDATATYPES,
+        "Byte Int8 Int16 UInt16 Int32 UInt32 Int64 UInt64 Float32 Float64");
 
     poDriver->pfnIdentify = MRFDriverIdentify;
     poDriver->SetMetadataItem(GDAL_DCAP_OPEN, "YES");
diff --git a/frmts/mrsid/CMakeLists.txt b/frmts/mrsid/CMakeLists.txt
index c91ab9d269ed..fa112278d7ba 100644
--- a/frmts/mrsid/CMakeLists.txt
+++ b/frmts/mrsid/CMakeLists.txt
@@ -1,3 +1,18 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/helpers/GdalCMakeMinimumRequired.cmake")
+cmake_minimum_required(VERSION ${GDAL_CMAKE_VERSION_MIN}...${GDAL_CMAKE_VERSION_MAX})
+
+if(NOT DEFINED PROJECT_SOURCE_DIR)
+    # Standalone plugin building
+    project(gdal_MrSID)
+    include("${PROJECT_SOURCE_DIR}/../../cmake/helpers/SetupStandalonePlugin.cmake" )
+    include(CheckDependentLibrariesGeoTIFF)
+    include(CheckDependentLibrariesMrSID)
+    if (GDAL_USE_GEOTIFF_INTERNAL)
+        message(FATAL_ERROR "Internal libgeotiff not supported for MrSID standalone plugin build")
+    endif()
+    standalone_driver_finalize(GDAL_ENABLE_DRIVER_MRSID)
+endif()
+
 option(GDAL_ENABLE_DRIVER_JP2MRSID "Whether to enable JPEG2000 support with MrSID SDK" OFF)
 
 add_gdal_driver(TARGET gdal_MrSID
diff --git a/frmts/mrsid/driver_declaration.cmake b/frmts/mrsid/driver_declaration.cmake
new file mode 100644
index 000000000000..77e25982830e
--- /dev/null
+++ b/frmts/mrsid/driver_declaration.cmake
@@ -0,0 +1 @@
+gdal_dependent_format(mrsid "Multi-resolution Seamless Image Database" "GDAL_USE_MRSID;GDAL_USE_GEOTIFF OR GDAL_USE_GEOTIFF_INTERNAL")
diff --git a/frmts/mrsid/mrsiddataset.cpp b/frmts/mrsid/mrsiddataset.cpp
index fc622cfb146f..f91b0bd34b67 100644
--- a/frmts/mrsid/mrsiddataset.cpp
+++ b/frmts/mrsid/mrsiddataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2003, Andrey Kiselev <dron@ak4719.spb.edu>
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #define NO_DELETE
@@ -254,6 +238,8 @@ class MrSIDDataset final : public GDALJP2AbstractDataset
     void GetGTIFDefn();
     char *GetOGISDefn(GTIFDefn *);
 
+    int m_nInRasterIO = 0;  // Prevent infinite recursion in IRasterIO()
+
     virtual CPLErr IRasterIO(GDALRWFlag, int, int, int, int, void *, int, int,
                              GDALDataType, int, BANDMAP_TYPE,
                              GSpacing nPixelSpace, GSpacing nLineSpace,
@@ -860,11 +846,17 @@ CPLErr MrSIDDataset::IRasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff,
     if (CPLTestBool(CPLGetConfigOption("GDAL_ONE_BIG_READ", "NO")))
         bUseBlockedIO = FALSE;
 
-    if (bUseBlockedIO)
-        return GDALDataset::BlockBasedRasterIO(
+    if (bUseBlockedIO && !m_nInRasterIO)
+    {
+        ++m_nInRasterIO;
+        const CPLErr eErr = GDALDataset::BlockBasedRasterIO(
             eRWFlag, nXOff, nYOff, nXSize, nYSize, pData, nBufXSize, nBufYSize,
             eBufType, nBandCount, panBandMap, nPixelSpace, nLineSpace,
             nBandSpace, psExtraArg);
+        --m_nInRasterIO;
+        return eErr;
+    }
+
     CPLDebug("MrSID", "RasterIO() - using optimized dataset level IO.");
 
     /* -------------------------------------------------------------------- */
diff --git a/frmts/mrsid/mrsiddataset_headers_include.h b/frmts/mrsid/mrsiddataset_headers_include.h
index e97e89690be2..24a579e8d894 100644
--- a/frmts/mrsid/mrsiddataset_headers_include.h
+++ b/frmts/mrsid/mrsiddataset_headers_include.h
@@ -8,23 +8,7 @@
  * Copyright (c) 2003, Andrey Kiselev <dron@ak4719.spb.edu>
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef MRSIDDATASET_HEADERS_INCLUDE_H
diff --git a/frmts/mrsid/mrsiddrivercore.cpp b/frmts/mrsid/mrsiddrivercore.cpp
index 9398995d01d1..ae34bf7cd4e1 100644
--- a/frmts/mrsid/mrsiddrivercore.cpp
+++ b/frmts/mrsid/mrsiddrivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault, <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "mrsiddrivercore.h"
diff --git a/frmts/mrsid/mrsiddrivercore.h b/frmts/mrsid/mrsiddrivercore.h
index 10b5e7e8dad6..c2c754e344b1 100644
--- a/frmts/mrsid/mrsiddrivercore.h
+++ b/frmts/mrsid/mrsiddrivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault, <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef MrSIDDRIVERCORE_H
diff --git a/frmts/mrsid/mrsidstream.cpp b/frmts/mrsid/mrsidstream.cpp
index 51d84909f65b..b441adc321ec 100644
--- a/frmts/mrsid/mrsidstream.cpp
+++ b/frmts/mrsid/mrsidstream.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2008, Andrey Kiselev <dron@ak4719.spb.edu>
  * Copyright (c) 2008-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_error.h"
diff --git a/frmts/mrsid/mrsidstream.h b/frmts/mrsid/mrsidstream.h
index d37b14856b06..799a6848d9ea 100644
--- a/frmts/mrsid/mrsidstream.h
+++ b/frmts/mrsid/mrsidstream.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2008, Andrey Kiselev <dron@ak4719.spb.edu>
  * Copyright (c) 2008-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef MRSIDSTREAM_H_INCLUDED
diff --git a/frmts/mrsid/mrsidstream_headers_include.h b/frmts/mrsid/mrsidstream_headers_include.h
index d2074a3749c2..d1e4a3e0fac4 100644
--- a/frmts/mrsid/mrsidstream_headers_include.h
+++ b/frmts/mrsid/mrsidstream_headers_include.h
@@ -8,23 +8,7 @@
  * Copyright (c) 2003, Andrey Kiselev <dron@ak4719.spb.edu>
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef MRSIDSTREAM_HEADERS_INCLUDE_H
diff --git a/frmts/msg/PublicDecompWTMakefiles.zip b/frmts/msg/PublicDecompWTMakefiles.zip
deleted file mode 100644
index 63d40cd4316f..000000000000
Binary files a/frmts/msg/PublicDecompWTMakefiles.zip and /dev/null differ
diff --git a/frmts/msg/PublicDecompWT_headers.h b/frmts/msg/PublicDecompWT_headers.h
index c53d10d2e59e..bc7e706e7171 100644
--- a/frmts/msg/PublicDecompWT_headers.h
+++ b/frmts/msg/PublicDecompWT_headers.h
@@ -5,6 +5,8 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
+// '<=': signed/unsigned mismatch
+#pragma warning(disable : 4018)
 //conversion from 'int' to 'WORD', possible loss of data
 #pragma warning(disable : 4244)
 // '=': conversion from 'size_t' to 'int', possible loss of data
diff --git a/frmts/msg/generate_PublicDecompWT_all.h.cmake b/frmts/msg/generate_PublicDecompWT_all.h.cmake
index adc244472cf5..686ef7a18b95 100644
--- a/frmts/msg/generate_PublicDecompWT_all.h.cmake
+++ b/frmts/msg/generate_PublicDecompWT_all.h.cmake
@@ -6,6 +6,12 @@ set(PUBLIC_DECOMPTWT_ALL_H "// This is a generated file. Do not edit !
 #if ((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) && !defined(_MSC_VER))
 #pragma GCC system_header
 #endif
+
+#ifdef _MSC_VER
+#pragma warning(push)
+// '<=': signed/unsigned mismatch
+#pragma warning(disable : 4018)
+#endif
 ")
 foreach(_f IN LISTS PUBLIC_DECOMP_WT_SRC)
   if (NOT("${IS_WIN32}" AND (${_f} MATCHES "TimeSpan.cpp" OR ${_f} MATCHES "UTCTime.cpp")))
@@ -13,4 +19,11 @@ foreach(_f IN LISTS PUBLIC_DECOMP_WT_SRC)
 ")
   endif()
 endforeach()
+
+string(APPEND PUBLIC_DECOMPTWT_ALL_H "
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+")
+
 file(WRITE "${BINARY_DIR}/PublicDecompWT_all.h" "${PUBLIC_DECOMPTWT_ALL_H}")
diff --git a/frmts/msg/msgcommand.cpp b/frmts/msg/msgcommand.cpp
index 45f8ac25093d..b223cffd48b1 100644
--- a/frmts/msg/msgcommand.cpp
+++ b/frmts/msg/msgcommand.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2004, ITC
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************/
 
 #include "cpl_port.h"  // Must be first.
diff --git a/frmts/msg/msgcommand.h b/frmts/msg/msgcommand.h
index f4f6425f822d..51bb48b27f84 100644
--- a/frmts/msg/msgcommand.h
+++ b/frmts/msg/msgcommand.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2004, ITC
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************/
 
 #ifndef GDAL_MSG_MSGCOMMAND_H_INCLUDED
diff --git a/frmts/msg/msgdataset.cpp b/frmts/msg/msgdataset.cpp
index 0b692f70f952..43dde5ce0f8e 100644
--- a/frmts/msg/msgdataset.cpp
+++ b/frmts/msg/msgdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2004, ITC
  * Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************/
 #include "cpl_port.h"  // Must be first.
 
diff --git a/frmts/msg/msgdataset.h b/frmts/msg/msgdataset.h
index 4c252a0bb9e4..53571c20b44e 100644
--- a/frmts/msg/msgdataset.h
+++ b/frmts/msg/msgdataset.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2004, ITC
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************/
 
 #include "gdal_priv.h"
diff --git a/frmts/msg/msgdrivercore.cpp b/frmts/msg/msgdrivercore.cpp
index eba0458865c5..46af4dadbfa7 100644
--- a/frmts/msg/msgdrivercore.cpp
+++ b/frmts/msg/msgdrivercore.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2004, ITC
  * Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************/
 
 #include "msgdrivercore.h"
diff --git a/frmts/msg/msgdrivercore.h b/frmts/msg/msgdrivercore.h
index f4e1ab1cca2f..054b92f4396d 100644
--- a/frmts/msg/msgdrivercore.h
+++ b/frmts/msg/msgdrivercore.h
@@ -8,23 +8,7 @@
  * Copyright (c) 2004, ITC
  * Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************/
 
 #ifndef MSGDRIVERCORE_H
diff --git a/frmts/msg/prologue.cpp b/frmts/msg/prologue.cpp
index d596b57377d8..96dca0957704 100644
--- a/frmts/msg/prologue.cpp
+++ b/frmts/msg/prologue.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2004, ITC
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************/
 
 #include "cpl_port.h"  // Must be first.
diff --git a/frmts/msg/prologue.h b/frmts/msg/prologue.h
index 9f138d1c56d2..0b1ac917a960 100644
--- a/frmts/msg/prologue.h
+++ b/frmts/msg/prologue.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2004, ITC
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************/
 
 #if !defined(AFX_PROLOGUE_H__777B5B86_04F4_4A01_86F6_24615DCD8446__INCLUDED_)
diff --git a/frmts/msg/reflectancecalculator.cpp b/frmts/msg/reflectancecalculator.cpp
index 323713587042..e037cba6883f 100644
--- a/frmts/msg/reflectancecalculator.cpp
+++ b/frmts/msg/reflectancecalculator.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2004, ITC
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************/
 
 #include "cpl_port.h"  // Must be first.
diff --git a/frmts/msg/reflectancecalculator.h b/frmts/msg/reflectancecalculator.h
index 83967297f6ef..fed4fbc5d104 100644
--- a/frmts/msg/reflectancecalculator.h
+++ b/frmts/msg/reflectancecalculator.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2004, ITC
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************/
 
 #if !defined(                                                                  \
diff --git a/frmts/msg/xritheaderparser.cpp b/frmts/msg/xritheaderparser.cpp
index 942d9d43202f..dbbceccab700 100644
--- a/frmts/msg/xritheaderparser.cpp
+++ b/frmts/msg/xritheaderparser.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2007, ITC
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************/
 
 #include "cpl_port.h"  // Must be first.
diff --git a/frmts/msg/xritheaderparser.h b/frmts/msg/xritheaderparser.h
index bfe5082837a9..ea375552405e 100644
--- a/frmts/msg/xritheaderparser.h
+++ b/frmts/msg/xritheaderparser.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2007, ITC
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************/
 
 #if !defined(                                                                  \
diff --git a/frmts/msgn/msg_basic_types.cpp b/frmts/msgn/msg_basic_types.cpp
index 71935541ab89..7f3f64ff47f5 100644
--- a/frmts/msgn/msg_basic_types.cpp
+++ b/frmts/msgn/msg_basic_types.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2005, Frans van den Bergh <fvdbergh@csir.co.za>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/msgn/msg_basic_types.h b/frmts/msgn/msg_basic_types.h
index 2e1476ba1d9d..451c0b15f6ee 100644
--- a/frmts/msgn/msg_basic_types.h
+++ b/frmts/msgn/msg_basic_types.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2005, Frans van den Bergh <fvdbergh@csir.co.za>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef MSG_BASIC_TYPES
diff --git a/frmts/msgn/msg_reader_core.cpp b/frmts/msgn/msg_reader_core.cpp
index fa2e40182178..78efe852f736 100644
--- a/frmts/msgn/msg_reader_core.cpp
+++ b/frmts/msgn/msg_reader_core.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2005, Frans van den Bergh <fvdbergh@csir.co.za>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/msgn/msg_reader_core.h b/frmts/msgn/msg_reader_core.h
index 2243402b7759..13d234e3751b 100644
--- a/frmts/msgn/msg_reader_core.h
+++ b/frmts/msgn/msg_reader_core.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2005, Frans van den Bergh <fvdbergh@csir.co.za>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef MSG_READER_CORE_H
diff --git a/frmts/msgn/msgndataset.cpp b/frmts/msgn/msgndataset.cpp
index 7735fef72f67..16df86fbddb2 100644
--- a/frmts/msgn/msgndataset.cpp
+++ b/frmts/msgn/msgndataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2005, Frans van den Bergh <fvdbergh@csir.co.za>
  * Copyright (c) 2008-2009, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #include "cpl_port.h"
 #include "cpl_error.h"
diff --git a/frmts/netcdf/CMakeLists.txt b/frmts/netcdf/CMakeLists.txt
index 506d905fd860..699e24547bd1 100644
--- a/frmts/netcdf/CMakeLists.txt
+++ b/frmts/netcdf/CMakeLists.txt
@@ -45,12 +45,6 @@ endif ()
 if (HAVE_USERFAULTFD_H)
   declare_def(-DENABLE_UFFD)
 endif ()
-if (HAVE_HDF4)
-  declare_def(-DHAVE_HDF4)
-endif ()
-if (HAVE_HDF5)
-  declare_def(-DHAVE_HDF5)
-endif ()
 
 if(NOT TARGET gdal_netCDF)
     return()
diff --git a/frmts/netcdf/data/netcdf_config.xsd b/frmts/netcdf/data/netcdf_config.xsd
index 5d6acc2aafdb..b4c333efe95e 100644
--- a/frmts/netcdf/data/netcdf_config.xsd
+++ b/frmts/netcdf/data/netcdf_config.xsd
@@ -10,23 +10,7 @@
  **********************************************************************
  * Copyright (c) 2016, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
diff --git a/frmts/netcdf/netcdf_cf_constants.h b/frmts/netcdf/netcdf_cf_constants.h
index 34a4937d3f93..cb5f53598a80 100644
--- a/frmts/netcdf/netcdf_cf_constants.h
+++ b/frmts/netcdf/netcdf_cf_constants.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2004, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef NETCDF_CF_CONSTANTS_H_INCLUDED_
diff --git a/frmts/netcdf/netcdf_sentinel3_sral_mwr.cpp b/frmts/netcdf/netcdf_sentinel3_sral_mwr.cpp
index a81ee65214f0..76fe2e80332c 100644
--- a/frmts/netcdf/netcdf_sentinel3_sral_mwr.cpp
+++ b/frmts/netcdf/netcdf_sentinel3_sral_mwr.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2019, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 // Example product:
diff --git a/frmts/netcdf/netcdfdataset.cpp b/frmts/netcdf/netcdfdataset.cpp
index 69e030de649c..5619568c1864 100644
--- a/frmts/netcdf/netcdfdataset.cpp
+++ b/frmts/netcdf/netcdfdataset.cpp
@@ -11,23 +11,7 @@
  * Copyright (c) 2010, Kyle Shannon <kyle at pobox dot com>
  * Copyright (c) 2021, CLS
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -70,6 +54,7 @@
 #include "cpl_time.h"
 #include "gdal.h"
 #include "gdal_frmts.h"
+#include "gdal_priv_templates.hpp"
 #include "ogr_core.h"
 #include "ogr_srs_api.h"
 
@@ -451,10 +436,10 @@ netCDFRasterBand::netCDFRasterBand(const netCDFRasterBand::CONSTRUCTOR_OPEN &,
     const char *pszNoValueName = nullptr;
 
     // Find attribute name, either _FillValue or missing_value.
-    int status = nc_inq_att(cdfid, nZId, _FillValue, &atttype, &attlen);
+    int status = nc_inq_att(cdfid, nZId, NCDF_FillValue, &atttype, &attlen);
     if (status == NC_NOERR)
     {
-        pszNoValueName = _FillValue;
+        pszNoValueName = NCDF_FillValue;
     }
     else
     {
@@ -759,22 +744,12 @@ netCDFRasterBand::netCDFRasterBand(const netCDFRasterBand::CONSTRUCTOR_OPEN &,
 #ifdef NCDF_DEBUG
             CPLDebug("GDAL_netCDF", "SetNoDataValue(%f) read", dfNoData);
 #endif
-            if (eDataType == GDT_Int64 &&
-                dfNoData >=
-                    static_cast<double>(std::numeric_limits<int64_t>::min()) &&
-                dfNoData <=
-                    static_cast<double>(std::numeric_limits<int64_t>::max()) &&
-                dfNoData == static_cast<double>(static_cast<int64_t>(dfNoData)))
+            if (eDataType == GDT_Int64 && GDALIsValueExactAs<int64_t>(dfNoData))
             {
                 SetNoDataValueNoUpdate(static_cast<int64_t>(dfNoData));
             }
             else if (eDataType == GDT_UInt64 &&
-                     dfNoData >= static_cast<double>(
-                                     std::numeric_limits<uint64_t>::min()) &&
-                     dfNoData <= static_cast<double>(
-                                     std::numeric_limits<uint64_t>::max()) &&
-                     dfNoData ==
-                         static_cast<double>(static_cast<uint64_t>(dfNoData)))
+                     GDALIsValueExactAs<uint64_t>(dfNoData))
             {
                 SetNoDataValueNoUpdate(static_cast<uint64_t>(dfNoData));
             }
@@ -1180,8 +1155,8 @@ CPLErr netCDFRasterBand::SetMetadataItem(const char *pszName,
         // Same logic as in CopyMetadata()
 
         const char *const papszIgnoreBand[] = {
-            CF_ADD_OFFSET, CF_SCALE_FACTOR, "valid_range", "_Unsigned",
-            _FillValue,    "coordinates",   nullptr};
+            CF_ADD_OFFSET,  CF_SCALE_FACTOR, "valid_range", "_Unsigned",
+            NCDF_FillValue, "coordinates",   nullptr};
         // Do not copy varname, stats, NETCDF_DIM_*, nodata
         // and items in papszIgnoreBand.
         if (STARTS_WITH(pszName, "NETCDF_VARNAME") ||
@@ -1478,7 +1453,7 @@ CPLErr netCDFRasterBand::SetNoDataValue(double dfNoData)
             !reinterpret_cast<netCDFDataset *>(poDS)->GetDefineMode())
         {
             CPLDebug("GDAL_netCDF",
-                     "Setting NoDataValue to %.18g (previously set to %.18g) "
+                     "Setting NoDataValue to %.17g (previously set to %.17g) "
                      "but file is no longer in define mode (id #%d, band #%d)",
                      dfNoData, m_dfNoDataValue, cdfid, nBand);
         }
@@ -1486,7 +1461,7 @@ CPLErr netCDFRasterBand::SetNoDataValue(double dfNoData)
         else
         {
             CPLDebug("GDAL_netCDF",
-                     "Setting NoDataValue to %.18g (id #%d, band #%d)",
+                     "Setting NoDataValue to %.17g (id #%d, band #%d)",
                      dfNoData, cdfid, nBand);
         }
 #endif
@@ -1499,34 +1474,34 @@ CPLErr netCDFRasterBand::SetNoDataValue(double dfNoData)
             if (bSignedData)
             {
                 signed char cNoDataValue = static_cast<signed char>(dfNoData);
-                status = nc_put_att_schar(cdfid, nZId, _FillValue, nc_datatype,
-                                          1, &cNoDataValue);
+                status = nc_put_att_schar(cdfid, nZId, NCDF_FillValue,
+                                          nc_datatype, 1, &cNoDataValue);
             }
             else
             {
                 const unsigned char ucNoDataValue =
                     static_cast<unsigned char>(dfNoData);
-                status = nc_put_att_uchar(cdfid, nZId, _FillValue, nc_datatype,
-                                          1, &ucNoDataValue);
+                status = nc_put_att_uchar(cdfid, nZId, NCDF_FillValue,
+                                          nc_datatype, 1, &ucNoDataValue);
             }
         }
         else if (eDataType == GDT_Int16)
         {
             short nsNoDataValue = static_cast<short>(dfNoData);
-            status = nc_put_att_short(cdfid, nZId, _FillValue, nc_datatype, 1,
-                                      &nsNoDataValue);
+            status = nc_put_att_short(cdfid, nZId, NCDF_FillValue, nc_datatype,
+                                      1, &nsNoDataValue);
         }
         else if (eDataType == GDT_Int32)
         {
             int nNoDataValue = static_cast<int>(dfNoData);
-            status = nc_put_att_int(cdfid, nZId, _FillValue, nc_datatype, 1,
+            status = nc_put_att_int(cdfid, nZId, NCDF_FillValue, nc_datatype, 1,
                                     &nNoDataValue);
         }
         else if (eDataType == GDT_Float32)
         {
             float fNoDataValue = static_cast<float>(dfNoData);
-            status = nc_put_att_float(cdfid, nZId, _FillValue, nc_datatype, 1,
-                                      &fNoDataValue);
+            status = nc_put_att_float(cdfid, nZId, NCDF_FillValue, nc_datatype,
+                                      1, &fNoDataValue);
         }
         else if (eDataType == GDT_UInt16 &&
                  reinterpret_cast<netCDFDataset *>(poDS)->eFormat ==
@@ -1534,21 +1509,21 @@ CPLErr netCDFRasterBand::SetNoDataValue(double dfNoData)
         {
             unsigned short usNoDataValue =
                 static_cast<unsigned short>(dfNoData);
-            status = nc_put_att_ushort(cdfid, nZId, _FillValue, nc_datatype, 1,
-                                       &usNoDataValue);
+            status = nc_put_att_ushort(cdfid, nZId, NCDF_FillValue, nc_datatype,
+                                       1, &usNoDataValue);
         }
         else if (eDataType == GDT_UInt32 &&
                  reinterpret_cast<netCDFDataset *>(poDS)->eFormat ==
                      NCDF_FORMAT_NC4)
         {
             unsigned int unNoDataValue = static_cast<unsigned int>(dfNoData);
-            status = nc_put_att_uint(cdfid, nZId, _FillValue, nc_datatype, 1,
-                                     &unNoDataValue);
+            status = nc_put_att_uint(cdfid, nZId, NCDF_FillValue, nc_datatype,
+                                     1, &unNoDataValue);
         }
         else
         {
-            status = nc_put_att_double(cdfid, nZId, _FillValue, nc_datatype, 1,
-                                       &dfNoData);
+            status = nc_put_att_double(cdfid, nZId, NCDF_FillValue, nc_datatype,
+                                       1, &dfNoData);
         }
 
         NCDF_ERR(status);
@@ -1595,7 +1570,7 @@ CPLErr netCDFRasterBand::SetNoDataValueAsInt64(int64_t nNoData)
     // Write value if in update mode.
     if (poDS->GetAccess() == GA_Update)
     {
-        // netcdf-4 does not allow to set _FillValue after leaving define mode,
+        // netcdf-4 does not allow to set NCDF_FillValue after leaving define mode,
         // but it is ok if variable has not been written to, so only print
         // debug. See bug #4484.
         if (m_bNoDataSetAsInt64 &&
@@ -1625,14 +1600,14 @@ CPLErr netCDFRasterBand::SetNoDataValueAsInt64(int64_t nNoData)
             reinterpret_cast<netCDFDataset *>(poDS)->eFormat == NCDF_FORMAT_NC4)
         {
             long long tmp = static_cast<long long>(nNoData);
-            status = nc_put_att_longlong(cdfid, nZId, _FillValue, nc_datatype,
-                                         1, &tmp);
+            status = nc_put_att_longlong(cdfid, nZId, NCDF_FillValue,
+                                         nc_datatype, 1, &tmp);
         }
         else
         {
             double dfNoData = static_cast<double>(nNoData);
-            status = nc_put_att_double(cdfid, nZId, _FillValue, nc_datatype, 1,
-                                       &dfNoData);
+            status = nc_put_att_double(cdfid, nZId, NCDF_FillValue, nc_datatype,
+                                       1, &dfNoData);
         }
 
         NCDF_ERR(status);
@@ -1709,14 +1684,14 @@ CPLErr netCDFRasterBand::SetNoDataValueAsUInt64(uint64_t nNoData)
             reinterpret_cast<netCDFDataset *>(poDS)->eFormat == NCDF_FORMAT_NC4)
         {
             unsigned long long tmp = static_cast<long long>(nNoData);
-            status = nc_put_att_ulonglong(cdfid, nZId, _FillValue, nc_datatype,
-                                          1, &tmp);
+            status = nc_put_att_ulonglong(cdfid, nZId, NCDF_FillValue,
+                                          nc_datatype, 1, &tmp);
         }
         else
         {
             double dfNoData = static_cast<double>(nNoData);
-            status = nc_put_att_double(cdfid, nZId, _FillValue, nc_datatype, 1,
-                                       &dfNoData);
+            status = nc_put_att_double(cdfid, nZId, NCDF_FillValue, nc_datatype,
+                                       1, &dfNoData);
         }
 
         NCDF_ERR(status);
@@ -1766,7 +1741,7 @@ CPLErr netCDFRasterBand::DeleteNoDataValue()
         // Make sure we are in define mode.
         static_cast<netCDFDataset *>(poDS)->SetDefineMode(true);
 
-        status = nc_del_att(cdfid, nZId, _FillValue);
+        status = nc_del_att(cdfid, nZId, NCDF_FillValue);
 
         NCDF_ERR(status);
 
@@ -1931,7 +1906,7 @@ void netCDFRasterBand::CreateMetadataFromAttributes()
 
     // Get attribute metadata.
     int nAtt = 0;
-    nc_inq_varnatts(cdfid, nZId, &nAtt);
+    NCDF_ERR(nc_inq_varnatts(cdfid, nZId, &nAtt));
 
     for (int i = 0; i < nAtt; i++)
     {
@@ -1974,6 +1949,7 @@ void netCDFRasterBand::CreateMetadataFromOtherVars()
     m_bCreateMetadataFromOtherVarsDone = true;
 
     netCDFDataset *l_poDS = reinterpret_cast<netCDFDataset *>(poDS);
+    const int nPamFlagsBackup = l_poDS->nPamFlags;
 
     // Compute all dimensions from Band number and save in Metadata.
     int nd = 0;
@@ -2143,6 +2119,8 @@ void netCDFRasterBand::CreateMetadataFromOtherVars()
 
         Taken += result * Sum;
     }  // End loop non-spatial dimensions.
+
+    l_poDS->nPamFlags = nPamFlagsBackup;
 }
 
 /************************************************************************/
@@ -2182,7 +2160,7 @@ void netCDFRasterBand::CheckData(void *pImage, void *pImageNC,
                 // Check for nodata and nan.
                 if (CPLIsEqual((double)ptrImage[k], m_dfNoDataValue))
                     continue;
-                if (bCheckIsNan && CPLIsNan((double)ptrImage[k]))
+                if (bCheckIsNan && std::isnan((double)ptrImage[k]))
                 {
                     ptrImage[k] = (T)m_dfNoDataValue;
                     continue;
@@ -2267,7 +2245,7 @@ void netCDFRasterBand::CheckDataCpx(void *pImage, void *pImageNC,
                 // Check for nodata and nan.
                 if (CPLIsEqual((double)ptrImage[k], m_dfNoDataValue))
                     continue;
-                if (bCheckIsNan && CPLIsNan((double)ptrImage[k]))
+                if (bCheckIsNan && std::isnan((double)ptrImage[k]))
                 {
                     ptrImage[k] = (T)m_dfNoDataValue;
                     continue;
@@ -2842,7 +2820,7 @@ netCDFDataset::netCDFDataset()
       papszMetadata(nullptr), bBottomUp(true), eFormat(NCDF_FORMAT_NONE),
       bIsGdalFile(false), bIsGdalCfFile(false), pszCFProjection(nullptr),
       pszCFCoordinates(nullptr), nCFVersion(1.6), bSGSupport(false),
-      eMultipleLayerBehavior(SINGLE_LAYER), logCount(0), vcdf(cdfid),
+      eMultipleLayerBehavior(SINGLE_LAYER), logCount(0), vcdf(this, cdfid),
       GeometryScribe(vcdf, this->generateLogName()),
       FieldScribe(vcdf, this->generateLogName()),
       bufManager(CPLGetUsablePhysicalRAM() / 5),
@@ -2916,7 +2894,7 @@ CPLErr netCDFDataset::Close()
         if (netCDFDataset::FlushCache(true) != CE_None)
             eErr = CE_Failure;
 
-        if (!SGCommitPendingTransaction())
+        if (GetAccess() == GA_Update && !SGCommitPendingTransaction())
             eErr = CE_Failure;
 
         for (size_t i = 0; i < apoVectorDatasets.size(); i++)
@@ -3042,6 +3020,7 @@ CPLErr netCDFDataset::SetMetadataItem(const char *pszName, const char *pszValue,
             strchr(osName.c_str(), '#') != nullptr)
         {
             // do nothing
+            return CE_None;
         }
         else
         {
@@ -3074,6 +3053,7 @@ CPLErr netCDFDataset::SetMetadata(char **papszMD, const char *pszDomain)
                 SetMetadataItem(pszName, pszValue);
             CPLFree(pszName);
         }
+        return CE_None;
     }
     return GDALPamDataset::SetMetadata(papszMD, pszDomain);
 }
@@ -3090,47 +3070,6 @@ const OGRSpatialReference *netCDFDataset::GetSpatialRef() const
     return GDALPamDataset::GetSpatialRef();
 }
 
-/************************************************************************/
-/*                           SerializeToXML()                           */
-/************************************************************************/
-
-CPLXMLNode *netCDFDataset::SerializeToXML(const char *pszUnused)
-
-{
-    // Overridden from GDALPamDataset to add only band histogram
-    // and statistics. See bug #4244.
-
-    if (psPam == nullptr)
-        return nullptr;
-
-    // Setup root node and attributes.
-    CPLXMLNode *psDSTree = CPLCreateXMLNode(nullptr, CXT_Element, "PAMDataset");
-
-    // Process bands.
-    for (int iBand = 0; iBand < GetRasterCount(); iBand++)
-    {
-        netCDFRasterBand *poBand =
-            static_cast<netCDFRasterBand *>(GetRasterBand(iBand + 1));
-
-        if (poBand == nullptr || !(poBand->GetMOFlags() & GMO_PAM_CLASS))
-            continue;
-
-        CPLXMLNode *psBandTree = poBand->SerializeToXML(pszUnused);
-
-        if (psBandTree != nullptr)
-            CPLAddXMLChild(psDSTree, psBandTree);
-    }
-
-    // We don't want to return anything if we had no metadata to attach.
-    if (psDSTree->psChild == nullptr)
-    {
-        CPLDestroyXMLNode(psDSTree);
-        psDSTree = nullptr;
-    }
-
-    return psDSTree;
-}
-
 /************************************************************************/
 /*                           FetchCopyParam()                            */
 /************************************************************************/
@@ -3531,6 +3470,12 @@ void netCDFDataset::SetProjectionFromVar(
     {
         const char *pszUnitsX = FetchAttr(nGroupDimXID, nVarDimXID, "units");
         const char *pszUnitsY = FetchAttr(nGroupDimYID, nVarDimYID, "units");
+        // Normalize degrees_east/degrees_north to degrees
+        // Cf https://github.com/OSGeo/gdal/issues/11009
+        if (pszUnitsX && EQUAL(pszUnitsX, "degrees_east"))
+            pszUnitsX = "degrees";
+        if (pszUnitsY && EQUAL(pszUnitsY, "degrees_north"))
+            pszUnitsY = "degrees";
 
         if (pszUnitsX && pszUnitsY)
         {
@@ -3901,6 +3846,56 @@ void netCDFDataset::SetProjectionFromVar(
             double xMinMax[2] = {0.0, 0.0};
             double yMinMax[2] = {0.0, 0.0};
 
+            const auto RoundMinMaxForFloatVals =
+                [](double &dfMin, double &dfMax, int nIntervals)
+            {
+                // Helps for a case where longitudes range from
+                // -179.99 to 180.0 with a 0.01 degree spacing.
+                // However as this is encoded in a float array,
+                // -179.99 is actually read as -179.99000549316406 as
+                // a double. Try to detect that and correct the rounding
+
+                const auto IsAlmostInteger = [](double dfVal)
+                {
+                    constexpr double THRESHOLD_INTEGER = 1e-3;
+                    return std::fabs(dfVal - std::round(dfVal)) <=
+                           THRESHOLD_INTEGER;
+                };
+
+                const double dfSpacing = (dfMax - dfMin) / nIntervals;
+                if (dfSpacing > 0)
+                {
+                    const double dfInvSpacing = 1.0 / dfSpacing;
+                    if (IsAlmostInteger(dfInvSpacing))
+                    {
+                        const double dfRoundedSpacing =
+                            1.0 / std::round(dfInvSpacing);
+                        const double dfMinDivRoundedSpacing =
+                            dfMin / dfRoundedSpacing;
+                        const double dfMaxDivRoundedSpacing =
+                            dfMax / dfRoundedSpacing;
+                        if (IsAlmostInteger(dfMinDivRoundedSpacing) &&
+                            IsAlmostInteger(dfMaxDivRoundedSpacing))
+                        {
+                            const double dfRoundedMin =
+                                std::round(dfMinDivRoundedSpacing) *
+                                dfRoundedSpacing;
+                            const double dfRoundedMax =
+                                std::round(dfMaxDivRoundedSpacing) *
+                                dfRoundedSpacing;
+                            if (static_cast<float>(dfMin) ==
+                                    static_cast<float>(dfRoundedMin) &&
+                                static_cast<float>(dfMax) ==
+                                    static_cast<float>(dfRoundedMax))
+                            {
+                                dfMin = dfRoundedMin;
+                                dfMax = dfRoundedMax;
+                            }
+                        }
+                    }
+                }
+            };
+
             if (!nc_get_att_double(nGroupDimXID, nVarDimXID, "actual_range",
                                    adfActualRange))
             {
@@ -3920,6 +3915,12 @@ void netCDFDataset::SetProjectionFromVar(
                 xMinMax[0] = pdfXCoord[0];
                 xMinMax[1] = pdfXCoord[xdim - 1];
                 node_offset = 0;
+
+                if (nc_var_dimx_datatype == NC_FLOAT)
+                {
+                    RoundMinMaxForFloatVals(xMinMax[0], xMinMax[1],
+                                            poDS->nRasterXSize - 1);
+                }
             }
 
             if (!nc_get_att_double(nGroupDimYID, nVarDimYID, "actual_range",
@@ -3941,6 +3942,12 @@ void netCDFDataset::SetProjectionFromVar(
                 yMinMax[0] = pdfYCoord[0];
                 yMinMax[1] = pdfYCoord[ydim - 1];
                 node_offset = 0;
+
+                if (nc_var_dimy_datatype == NC_FLOAT)
+                {
+                    RoundMinMaxForFloatVals(yMinMax[0], yMinMax[1],
+                                            poDS->nRasterYSize - 1);
+                }
             }
 
             double dfCoordOffset = 0.0;
@@ -6434,7 +6441,7 @@ void netCDFDataset::CreateSubDatasetList(int nGroupId)
             nc_type nVarType;
             nc_inq_vartype(nGroupId, nVar, &nVarType);
             // Get rid of the last "x" character.
-            osDim.resize(osDim.size() - 1);
+            osDim.pop_back();
             const char *pszType = "";
             switch (nVarType)
             {
@@ -6990,7 +6997,9 @@ bool netCDFDataset::CloneGrp(int nOldGrpId, int nNewGrpId, bool bIsNC4,
     int nDimCount = -1;
     int status = nc_inq_ndims(nOldGrpId, &nDimCount);
     NCDF_ERR(status);
-    int *panDimIds = static_cast<int *>(CPLMalloc(sizeof(int) * nDimCount));
+    if (nDimCount < 0 || nDimCount > NC_MAX_DIMS)
+        return false;
+    int anDimIds[NC_MAX_DIMS];
     int nUnlimiDimID = -1;
     status = nc_inq_unlimdim(nOldGrpId, &nUnlimiDimID);
     NCDF_ERR(status);
@@ -6999,21 +7008,21 @@ bool netCDFDataset::CloneGrp(int nOldGrpId, int nNewGrpId, bool bIsNC4,
         // In NC4, the dimension ids of a group are not necessarily in
         // [0,nDimCount-1] range
         int nDimCount2 = -1;
-        status = nc_inq_dimids(nOldGrpId, &nDimCount2, panDimIds, FALSE);
+        status = nc_inq_dimids(nOldGrpId, &nDimCount2, anDimIds, FALSE);
         NCDF_ERR(status);
         CPLAssert(nDimCount == nDimCount2);
     }
     else
     {
         for (int i = 0; i < nDimCount; i++)
-            panDimIds[i] = i;
+            anDimIds[i] = i;
     }
     for (int i = 0; i < nDimCount; i++)
     {
         char szDimName[NC_MAX_NAME + 1];
         szDimName[0] = 0;
         size_t nLen = 0;
-        const int nDimId = panDimIds[i];
+        const int nDimId = anDimIds[i];
         status = nc_inq_dim(nOldGrpId, nDimId, szDimName, &nLen);
         NCDF_ERR(status);
         if (NCDFIsUnlimitedDim(bIsNC4, nOldGrpId, nDimId))
@@ -7026,11 +7035,9 @@ bool netCDFDataset::CloneGrp(int nOldGrpId, int nNewGrpId, bool bIsNC4,
         CPLAssert(nDimId == nNewDimId);
         if (status != NC_NOERR)
         {
-            CPLFree(panDimIds);
             return false;
         }
     }
-    CPLFree(panDimIds);
 
     // Clone main attributes
     if (!CloneAttributes(nOldGrpId, nNewGrpId, NC_GLOBAL, NC_GLOBAL))
@@ -7055,7 +7062,6 @@ bool netCDFDataset::CloneGrp(int nOldGrpId, int nNewGrpId, bool bIsNC4,
         int nVarDimCount = -1;
         status = nc_inq_varndims(nOldGrpId, i, &nVarDimCount);
         NCDF_ERR(status);
-        int anDimIds[NC_MAX_DIMS];
         status = nc_inq_vardimid(nOldGrpId, i, anDimIds);
         NCDF_ERR(status);
         int nNewVarId = -1;
@@ -7158,7 +7164,7 @@ bool netCDFDataset::GrowDim(int nLayerId, int nDimIdToGrow, size_t nNewSize)
         {
             char szGroupName[NC_MAX_NAME + 1];
             szGroupName[0] = 0;
-            nc_inq_grpname(panGroupIds[i], szGroupName);
+            NCDF_ERR(nc_inq_grpname(panGroupIds[i], szGroupName));
             int nNewGrpId = -1;
             status = nc_def_grp(new_cdfid, szGroupName, &nNewGrpId);
             NCDF_ERR(status);
@@ -7633,11 +7639,11 @@ bool netCDFDatasetCreateTempFile(NetCDFFormatEnum eFormat,
                     {
                         if (osVal.back() == ';' || osVal.back() == ' ')
                         {
-                            osVal.resize(osVal.size() - 1);
+                            osVal.pop_back();
                         }
                         else if (osVal.back() == '"')
                         {
-                            osVal.resize(osVal.size() - 1);
+                            osVal.pop_back();
                             break;
                         }
                         else
@@ -7656,7 +7662,7 @@ bool netCDFDatasetCreateTempFile(NetCDFFormatEnum eFormat,
                     {
                         if (osVal.back() == ';' || osVal.back() == ' ')
                         {
-                            osVal.resize(osVal.size() - 1);
+                            osVal.pop_back();
                         }
                         else
                         {
@@ -7667,12 +7673,12 @@ bool netCDFDatasetCreateTempFile(NetCDFFormatEnum eFormat,
                     if (!osVal.empty() && osVal.back() == 'b')
                     {
                         nc_datatype = NC_BYTE;
-                        osVal.resize(osVal.size() - 1);
+                        osVal.pop_back();
                     }
                     else if (!osVal.empty() && osVal.back() == 's')
                     {
                         nc_datatype = NC_SHORT;
-                        osVal.resize(osVal.size() - 1);
+                        osVal.pop_back();
                     }
                     if (CPLGetValueType(osVal) == CPL_VALUE_INTEGER)
                     {
@@ -7766,7 +7772,7 @@ bool netCDFDatasetCreateTempFile(NetCDFFormatEnum eFormat,
                 }
                 if (pszLine == nullptr)
                     break;
-                osAccVal.resize(osAccVal.size() - 1);
+                osAccVal.pop_back();
 
                 const std::vector<int> aoDimIds =
                     oMapVarIdToVectorOfDimId[nVarId];
@@ -7946,9 +7952,20 @@ GDALDataset *netCDFDataset::Open(GDALOpenInfo *poOpenInfo)
 #endif
         // Note: not calling Identify() directly, because we want the file type.
         // Only support NCDF_FORMAT* formats.
-        if (!(NCDF_FORMAT_NC == eTmpFormat || NCDF_FORMAT_NC2 == eTmpFormat ||
-              NCDF_FORMAT_NC4 == eTmpFormat || NCDF_FORMAT_NC4C == eTmpFormat))
+        if (NCDF_FORMAT_NC == eTmpFormat || NCDF_FORMAT_NC2 == eTmpFormat ||
+            NCDF_FORMAT_NC4 == eTmpFormat || NCDF_FORMAT_NC4C == eTmpFormat)
+        {
+            // ok
+        }
+        else if (eTmpFormat == NCDF_FORMAT_HDF4 &&
+                 poOpenInfo->IsSingleAllowedDriver("netCDF"))
+        {
+            // ok
+        }
+        else
+        {
             return nullptr;
+        }
     }
     else
     {
@@ -8310,13 +8327,12 @@ GDALDataset *netCDFDataset::Open(GDALOpenInfo *poOpenInfo)
     bool bHasSimpleGeometries = false;  // but not necessarily valid
     if (poDS->nCFVersion >= 1.8)
     {
-        poDS->bSGSupport = true;
         bHasSimpleGeometries = poDS->DetectAndFillSGLayers(cdfid);
-        poDS->vcdf.enableFullVirtualMode();
-    }
-    else
-    {
-        poDS->bSGSupport = false;
+        if (bHasSimpleGeometries)
+        {
+            poDS->bSGSupport = true;
+            poDS->vcdf.enableFullVirtualMode();
+        }
     }
 
     char szConventions[NC_MAX_NAME + 1];
@@ -8926,8 +8942,8 @@ static void CopyMetadata(GDALDataset *poSrcDS, GDALRasterBand *poSrcBand,
 {
     // Remove the following band meta but set them later from band data.
     const char *const papszIgnoreBand[] = {
-        CF_ADD_OFFSET, CF_SCALE_FACTOR, "valid_range", "_Unsigned",
-        _FillValue,    "coordinates",   nullptr};
+        CF_ADD_OFFSET,  CF_SCALE_FACTOR, "valid_range", "_Unsigned",
+        NCDF_FillValue, "coordinates",   nullptr};
     const char *const papszIgnoreGlobal[] = {"NETCDF_DIM_EXTRA", nullptr};
 
     CSLConstList papszMetadata = nullptr;
@@ -9285,9 +9301,12 @@ GDALDataset *netCDFDataset::Create(const char *pszFilename, int nXSize,
     // Add Conventions, GDAL info and history.
     if (poDS->cdfid >= 0)
     {
-        const char *CF_Vector_Conv = poDS->bSGSupport
-                                         ? NCDF_CONVENTIONS_CF_V1_8
-                                         : NCDF_CONVENTIONS_CF_V1_6;
+        const char *CF_Vector_Conv =
+            poDS->bSGSupport ||
+                    // Use of variable length strings require CF-1.8
+                    EQUAL(aosOptions.FetchNameValueDef("FORMAT", ""), "NC4")
+                ? NCDF_CONVENTIONS_CF_V1_8
+                : NCDF_CONVENTIONS_CF_V1_6;
         poDS->bWriteGDALVersion = CPLTestBool(
             CSLFetchNameValueDef(papszOptions, "WRITE_GDAL_VERSION", "YES"));
         poDS->bWriteGDALHistory = CPLTestBool(
@@ -9418,6 +9437,24 @@ netCDFDataset::CreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
         }
     }
 
+    CPLStringList aosBandNames;
+    if (const char *pszBandNames =
+            CSLFetchNameValue(papszOptions, "BAND_NAMES"))
+    {
+        aosBandNames =
+            CSLTokenizeString2(pszBandNames, ",", CSLT_HONOURSTRINGS);
+
+        if (aosBandNames.Count() != nBands)
+        {
+            CPLError(CE_Failure, CPLE_OpenFailed,
+                     "Attempted to create netCDF with %d bands but %d names "
+                     "provided in BAND_NAMES.",
+                     nBands, aosBandNames.Count());
+
+            return nullptr;
+        }
+    }
+
     if (!pfnProgress(0.0, nullptr, pProgressData))
         return nullptr;
 
@@ -9573,11 +9610,6 @@ netCDFDataset::CreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
         pScaledProgress =
             GDALCreateScaledProgress(0.1, 0.25, pfnProgress, pProgressData);
         poDS->AddProjectionVars(false, GDALScaledProgress, pScaledProgress);
-        // Save X,Y dim positions.
-        panDimIds[nDim - 1] = poDS->nXDimID;
-        panBandDimPos[0] = nDim - 1;
-        panDimIds[nDim - 2] = poDS->nYDimID;
-        panBandDimPos[1] = nDim - 2;
         GDALDestroyScaledProgress(pScaledProgress);
     }
     else
@@ -9591,6 +9623,12 @@ netCDFDataset::CreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
         }
     }
 
+    // Save X,Y dim positions.
+    panDimIds[nDim - 1] = poDS->nXDimID;
+    panBandDimPos[0] = nDim - 1;
+    panDimIds[nDim - 2] = poDS->nYDimID;
+    panBandDimPos[1] = nDim - 2;
+
     // Write extra dim values - after projection for optimization.
     if (nDim > 2)
     {
@@ -9627,7 +9665,12 @@ netCDFDataset::CreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
         const char *pszNETCDF_VARNAME =
             poSrcBand->GetMetadataItem("NETCDF_VARNAME");
         char szBandName[NC_MAX_NAME + 1];
-        if (pszNETCDF_VARNAME)
+        if (!aosBandNames.empty())
+        {
+            snprintf(szBandName, sizeof(szBandName), "%s",
+                     aosBandNames[iBand - 1]);
+        }
+        else if (pszNETCDF_VARNAME)
         {
             if (nBands > 1 && papszExtraDimNames == nullptr)
                 snprintf(szBandName, sizeof(szBandName), "%s%d",
@@ -10313,7 +10356,7 @@ static CPLErr NCDFGetAttr1(int nCdfId, int nVarId, const char *pszAttrName,
         NCDFSafeStrcat(&pszAttrValue, "{", &nAttrValueSize);
 
     double dfValue = 0.0;
-    size_t m;
+    size_t m = 0;
     char szTemp[256];
     bool bSetDoubleFromStr = false;
 
@@ -10332,10 +10375,13 @@ static CPLErr NCDFGetAttr1(int nCdfId, int nVarId, const char *pszAttrName,
                 CPLCalloc(nAttrLen, sizeof(signed char)));
             nc_get_att_schar(nCdfId, nVarId, pszAttrName, pscTemp);
             dfValue = static_cast<double>(pscTemp[0]);
-            for (m = 0; m < nAttrLen - 1; m++)
+            if (nAttrLen > 1)
             {
-                snprintf(szTemp, sizeof(szTemp), "%d,", pscTemp[m]);
-                NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
+                for (m = 0; m < nAttrLen - 1; m++)
+                {
+                    snprintf(szTemp, sizeof(szTemp), "%d,", pscTemp[m]);
+                    NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
+                }
             }
             snprintf(szTemp, sizeof(szTemp), "%d", pscTemp[m]);
             NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
@@ -10348,10 +10394,13 @@ static CPLErr NCDFGetAttr1(int nCdfId, int nVarId, const char *pszAttrName,
                 static_cast<short *>(CPLCalloc(nAttrLen, sizeof(short)));
             nc_get_att_short(nCdfId, nVarId, pszAttrName, psTemp);
             dfValue = static_cast<double>(psTemp[0]);
-            for (m = 0; m < nAttrLen - 1; m++)
+            if (nAttrLen > 1)
             {
-                snprintf(szTemp, sizeof(szTemp), "%d,", psTemp[m]);
-                NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
+                for (m = 0; m < nAttrLen - 1; m++)
+                {
+                    snprintf(szTemp, sizeof(szTemp), "%d,", psTemp[m]);
+                    NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
+                }
             }
             snprintf(szTemp, sizeof(szTemp), "%d", psTemp[m]);
             NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
@@ -10363,10 +10412,13 @@ static CPLErr NCDFGetAttr1(int nCdfId, int nVarId, const char *pszAttrName,
             int *pnTemp = static_cast<int *>(CPLCalloc(nAttrLen, sizeof(int)));
             nc_get_att_int(nCdfId, nVarId, pszAttrName, pnTemp);
             dfValue = static_cast<double>(pnTemp[0]);
-            for (m = 0; m < nAttrLen - 1; m++)
+            if (nAttrLen > 1)
             {
-                snprintf(szTemp, sizeof(szTemp), "%d,", pnTemp[m]);
-                NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
+                for (m = 0; m < nAttrLen - 1; m++)
+                {
+                    snprintf(szTemp, sizeof(szTemp), "%d,", pnTemp[m]);
+                    NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
+                }
             }
             snprintf(szTemp, sizeof(szTemp), "%d", pnTemp[m]);
             NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
@@ -10379,10 +10431,13 @@ static CPLErr NCDFGetAttr1(int nCdfId, int nVarId, const char *pszAttrName,
                 static_cast<float *>(CPLCalloc(nAttrLen, sizeof(float)));
             nc_get_att_float(nCdfId, nVarId, pszAttrName, pfTemp);
             dfValue = static_cast<double>(pfTemp[0]);
-            for (m = 0; m < nAttrLen - 1; m++)
+            if (nAttrLen > 1)
             {
-                CPLsnprintf(szTemp, sizeof(szTemp), "%.8g,", pfTemp[m]);
-                NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
+                for (m = 0; m < nAttrLen - 1; m++)
+                {
+                    CPLsnprintf(szTemp, sizeof(szTemp), "%.8g,", pfTemp[m]);
+                    NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
+                }
             }
             CPLsnprintf(szTemp, sizeof(szTemp), "%.8g", pfTemp[m]);
             NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
@@ -10395,10 +10450,13 @@ static CPLErr NCDFGetAttr1(int nCdfId, int nVarId, const char *pszAttrName,
                 static_cast<double *>(CPLCalloc(nAttrLen, sizeof(double)));
             nc_get_att_double(nCdfId, nVarId, pszAttrName, pdfTemp);
             dfValue = pdfTemp[0];
-            for (m = 0; m < nAttrLen - 1; m++)
+            if (nAttrLen > 1)
             {
-                CPLsnprintf(szTemp, sizeof(szTemp), "%.16g,", pdfTemp[m]);
-                NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
+                for (m = 0; m < nAttrLen - 1; m++)
+                {
+                    CPLsnprintf(szTemp, sizeof(szTemp), "%.16g,", pdfTemp[m]);
+                    NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
+                }
             }
             CPLsnprintf(szTemp, sizeof(szTemp), "%.16g", pdfTemp[m]);
             NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
@@ -10412,12 +10470,15 @@ static CPLErr NCDFGetAttr1(int nCdfId, int nVarId, const char *pszAttrName,
             nc_get_att_string(nCdfId, nVarId, pszAttrName, ppszTemp);
             bSetDoubleFromStr = true;
             dfValue = 0.0;
-            for (m = 0; m < nAttrLen - 1; m++)
+            if (nAttrLen > 1)
             {
-                NCDFSafeStrcat(&pszAttrValue,
-                               ppszTemp[m] ? ppszTemp[m] : "{NULL}",
-                               &nAttrValueSize);
-                NCDFSafeStrcat(&pszAttrValue, ",", &nAttrValueSize);
+                for (m = 0; m < nAttrLen - 1; m++)
+                {
+                    NCDFSafeStrcat(&pszAttrValue,
+                                   ppszTemp[m] ? ppszTemp[m] : "{NULL}",
+                                   &nAttrValueSize);
+                    NCDFSafeStrcat(&pszAttrValue, ",", &nAttrValueSize);
+                }
             }
             NCDFSafeStrcat(&pszAttrValue, ppszTemp[m] ? ppszTemp[m] : "{NULL}",
                            &nAttrValueSize);
@@ -10431,10 +10492,13 @@ static CPLErr NCDFGetAttr1(int nCdfId, int nVarId, const char *pszAttrName,
                 CPLCalloc(nAttrLen, sizeof(unsigned char)));
             nc_get_att_uchar(nCdfId, nVarId, pszAttrName, pucTemp);
             dfValue = static_cast<double>(pucTemp[0]);
-            for (m = 0; m < nAttrLen - 1; m++)
+            if (nAttrLen > 1)
             {
-                CPLsnprintf(szTemp, sizeof(szTemp), "%u,", pucTemp[m]);
-                NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
+                for (m = 0; m < nAttrLen - 1; m++)
+                {
+                    CPLsnprintf(szTemp, sizeof(szTemp), "%u,", pucTemp[m]);
+                    NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
+                }
             }
             CPLsnprintf(szTemp, sizeof(szTemp), "%u", pucTemp[m]);
             NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
@@ -10448,10 +10512,13 @@ static CPLErr NCDFGetAttr1(int nCdfId, int nVarId, const char *pszAttrName,
                 CPLCalloc(nAttrLen, sizeof(unsigned short)));
             nc_get_att_ushort(nCdfId, nVarId, pszAttrName, pusTemp);
             dfValue = static_cast<double>(pusTemp[0]);
-            for (m = 0; m < nAttrLen - 1; m++)
+            if (nAttrLen > 1)
             {
-                CPLsnprintf(szTemp, sizeof(szTemp), "%u,", pusTemp[m]);
-                NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
+                for (m = 0; m < nAttrLen - 1; m++)
+                {
+                    CPLsnprintf(szTemp, sizeof(szTemp), "%u,", pusTemp[m]);
+                    NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
+                }
             }
             CPLsnprintf(szTemp, sizeof(szTemp), "%u", pusTemp[m]);
             NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
@@ -10464,10 +10531,13 @@ static CPLErr NCDFGetAttr1(int nCdfId, int nVarId, const char *pszAttrName,
                 static_cast<unsigned int *>(CPLCalloc(nAttrLen, sizeof(int)));
             nc_get_att_uint(nCdfId, nVarId, pszAttrName, punTemp);
             dfValue = static_cast<double>(punTemp[0]);
-            for (m = 0; m < nAttrLen - 1; m++)
+            if (nAttrLen > 1)
             {
-                CPLsnprintf(szTemp, sizeof(szTemp), "%u,", punTemp[m]);
-                NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
+                for (m = 0; m < nAttrLen - 1; m++)
+                {
+                    CPLsnprintf(szTemp, sizeof(szTemp), "%u,", punTemp[m]);
+                    NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
+                }
             }
             CPLsnprintf(szTemp, sizeof(szTemp), "%u", punTemp[m]);
             NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
@@ -10480,11 +10550,14 @@ static CPLErr NCDFGetAttr1(int nCdfId, int nVarId, const char *pszAttrName,
                 static_cast<GIntBig *>(CPLCalloc(nAttrLen, sizeof(GIntBig)));
             nc_get_att_longlong(nCdfId, nVarId, pszAttrName, panTemp);
             dfValue = static_cast<double>(panTemp[0]);
-            for (m = 0; m < nAttrLen - 1; m++)
+            if (nAttrLen > 1)
             {
-                CPLsnprintf(szTemp, sizeof(szTemp), CPL_FRMT_GIB ",",
-                            panTemp[m]);
-                NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
+                for (m = 0; m < nAttrLen - 1; m++)
+                {
+                    CPLsnprintf(szTemp, sizeof(szTemp), CPL_FRMT_GIB ",",
+                                panTemp[m]);
+                    NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
+                }
             }
             CPLsnprintf(szTemp, sizeof(szTemp), CPL_FRMT_GIB, panTemp[m]);
             NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
@@ -10497,11 +10570,14 @@ static CPLErr NCDFGetAttr1(int nCdfId, int nVarId, const char *pszAttrName,
                 static_cast<GUIntBig *>(CPLCalloc(nAttrLen, sizeof(GUIntBig)));
             nc_get_att_ulonglong(nCdfId, nVarId, pszAttrName, panTemp);
             dfValue = static_cast<double>(panTemp[0]);
-            for (m = 0; m < nAttrLen - 1; m++)
+            if (nAttrLen > 1)
             {
-                CPLsnprintf(szTemp, sizeof(szTemp), CPL_FRMT_GUIB ",",
-                            panTemp[m]);
-                NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
+                for (m = 0; m < nAttrLen - 1; m++)
+                {
+                    CPLsnprintf(szTemp, sizeof(szTemp), CPL_FRMT_GUIB ",",
+                                panTemp[m]);
+                    NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
+                }
             }
             CPLsnprintf(szTemp, sizeof(szTemp), CPL_FRMT_GUIB, panTemp[m]);
             NCDFSafeStrcat(&pszAttrValue, szTemp, &nAttrValueSize);
diff --git a/frmts/netcdf/netcdfdataset.h b/frmts/netcdf/netcdfdataset.h
index 8f14bf4b882c..cfbf3ba1336a 100644
--- a/frmts/netcdf/netcdfdataset.h
+++ b/frmts/netcdf/netcdfdataset.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2004, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef NETCDFDATASET_H_INCLUDED_
@@ -144,9 +128,9 @@ static const int NCDF_DEFLATE_LEVEL = 1; /* best time/size ratio */
         if (NCDF_ERR_status_ != NC_NOERR)                                      \
         {                                                                      \
             CPLError(CE_Failure, CPLE_AppDefined,                              \
-                     "netcdf error #%d : %s .\nat (%s,%s,%d)\n", status,       \
-                     nc_strerror(NCDF_ERR_status_), __FILE__, __FUNCTION__,    \
-                     __LINE__);                                                \
+                     "netcdf error #%d : %s .\nat (%s,%s,%d)\n",               \
+                     NCDF_ERR_status_, nc_strerror(NCDF_ERR_status_),          \
+                     __FILE__, __FUNCTION__, __LINE__);                        \
         }                                                                      \
     } while (0)
 
@@ -181,6 +165,28 @@ static const int NCDF_DEFLATE_LEVEL = 1; /* best time/size ratio */
 /* Some additional metadata */
 #define OGR_SG_ORIGINAL_LAYERNAME "ogr_layer_name"
 
+/*
+ * Starting `c26f7ea`, netcdf-c exposes the `NC_FillValue`[1] macro instead of
+ * `_FillValue` to avoid collisions with C++ standard library[2]. However, the
+ * previous macro, `_FillValue`, was fully removed causing netcdf-c consumers,
+ * including GDAL, fail to build.
+ *
+ * It's unlikely that this naming change will be backported to the previous
+ * netcdf-c releases, so we have to account for both macros variants. We do so
+ * by introducing our own macro, `NCDF_FillValue`, and using that in places
+ * where `_FillValue` was previously used. If `NC_FillValue` is defined by
+ * `netcdf.h`, `NCDF_FillValue` expands to it and, if it's not, to `_FillValue`.
+ *
+ * References:
+ * 1. https://github.com/Unidata/netcdf-c/commit/c26f7eabf4a1cd25353f22734f439505fe636a45
+ * 2. https://github.com/Unidata/netcdf-c/issues/2858
+ */
+#if defined(NC_FillValue)
+#define NCDF_FillValue NC_FillValue
+#elif defined(_FillValue)
+#define NCDF_FillValue _FillValue
+#endif
+
 /* -------------------------------------------------------------------- */
 /*         CF-1 Coordinate Type Naming (Chapter 4.  Coordinate Types )  */
 /* -------------------------------------------------------------------- */
@@ -336,6 +342,7 @@ class netCDFDataset final : public GDALPamDataset
     friend class netCDFRasterBand;  // TMP
     friend class netCDFLayer;
     friend class netCDFVariable;
+    friend class nccfdriver::netCDFVID;
 
     typedef enum
     {
@@ -543,8 +550,6 @@ class netCDFDataset final : public GDALPamDataset
     void SetSpatialRefNoUpdate(const OGRSpatialReference *);
 
   protected:
-    CPLXMLNode *SerializeToXML(const char *pszVRTPath) override;
-
     OGRLayer *ICreateLayer(const char *pszName,
                            const OGRGeomFieldDefn *poGeomFieldDefn,
                            CSLConstList papszOptions) override;
diff --git a/frmts/netcdf/netcdfdrivercore.cpp b/frmts/netcdf/netcdfdrivercore.cpp
index bb339c6ad85b..50581dae3f4c 100644
--- a/frmts/netcdf/netcdfdrivercore.cpp
+++ b/frmts/netcdf/netcdfdrivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault, <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
@@ -87,33 +71,6 @@ NetCDFFormatEnum netCDFIdentifyFormat(GDALOpenInfo *poOpenInfo, bool bCheckExt)
 
     if (STARTS_WITH_CI(pszHeader, "CDF\001"))
     {
-        // In case the netCDF driver is registered before the GMT driver,
-        // avoid opening GMT files.
-        if (GDALGetDriverByName("GMT") != nullptr)
-        {
-            bool bFoundZ = false;
-            bool bFoundDimension = false;
-            constexpr const char *DIMENSION = "dimension";
-            constexpr int DIMENSION_LEN =
-                int(std::char_traits<char>::length(DIMENSION));
-            static_assert(DIMENSION_LEN == 9);
-            const std::string_view header(pszHeader, poOpenInfo->nHeaderBytes);
-            for (int i = 0;
-                 i < static_cast<int>(header.size()) - (1 + DIMENSION_LEN + 1);
-                 i++)
-            {
-                if (header[i] == 1 && header[i + 1] == 'z' &&
-                    header[i + 2] == 0)
-                    bFoundZ = true;
-                else if (header[i] == DIMENSION_LEN &&
-                         header.substr(i + 1, DIMENSION_LEN) == DIMENSION &&
-                         header[i + DIMENSION_LEN + 1] == 0)
-                    bFoundDimension = true;
-            }
-            if (bFoundZ && bFoundDimension)
-                return NCDF_FORMAT_UNKNOWN;
-        }
-
         return NCDF_FORMAT_NC;
     }
 
@@ -132,14 +89,19 @@ NetCDFFormatEnum netCDFIdentifyFormat(GDALOpenInfo *poOpenInfo, bool bCheckExt)
          memcmp(pszHeader + HDF5_SIG_OFFSET, HDF5_SIG, HDF5_SIG_LEN) == 0))
     {
         // Requires netCDF-4/HDF5 support in libnetcdf (not just libnetcdf-v4).
-        // If HDF5 is not supported in GDAL, this driver will try to open the
-        // file Else, make sure this driver does not try to open HDF5 files If
-        // user really wants to open with this driver, use NETCDF:file.h5
-        // format.  This check should be relaxed, but there is no clear way to
-        // make a difference.
-
-// Check for HDF5 support in GDAL.
-#ifdef HAVE_HDF5
+
+        // If only the netCDF driver is allowed, immediately recognize the file
+        if (poOpenInfo->IsSingleAllowedDriver("netCDF"))
+        {
+            return NCDF_FORMAT_NC4;
+        }
+
+        // If there is a HDF5 GDAL driver available, delegate to it.
+        // Otherwise open it with this driver.
+        // If the user really wants to open with this driver, use NETCDF:file.h5
+        // format.
+
+        // Check for HDF5 driver availability.
         if (bCheckExt)
         {
             // Check by default.
@@ -155,32 +117,38 @@ NetCDFFormatEnum netCDFIdentifyFormat(GDALOpenInfo *poOpenInfo, bool bCheckExt)
                 }
             }
         }
-#endif
 
         return NCDF_FORMAT_NC4;
     }
     else if (STARTS_WITH_CI(pszHeader, "\016\003\023\001"))
     {
-        // Requires HDF4 support in libnetcdf, but if HF4 is supported by GDAL
-        // don't try to open.
-        // If user really wants to open with this driver, use NETCDF:file.hdf
-        // syntax.
+#ifdef NETCDF_HAS_HDF4
+        // There is HDF4 support in libnetcdf and only the netCDF driver is
+        // allowed ==> immediately recognize the file.
+        if (poOpenInfo->IsSingleAllowedDriver("netCDF"))
+        {
+            return NCDF_FORMAT_HDF4;
+        }
+#endif
+
+        // If there is a HDF4 GDAL driver available, delegate to it.
+        // Otherwise open it with this driver.
+        // If the user really wants to open with this driver, use NETCDF:file.hdf
+        // format.
 
-// Check for HDF4 support in GDAL.
-#ifdef HAVE_HDF4
+        // Check for HDF4 driver availability.
         if (bCheckExt && GDALGetDriverByName("HDF4") != nullptr)
         {
             // Check by default.
             // Always treat as HDF4 file.
             return NCDF_FORMAT_HDF4;
         }
-#endif
 
-// Check for HDF4 support in libnetcdf.
 #ifdef NETCDF_HAS_HDF4
-        return NCDF_FORMAT_NC4;
-#else
+        // There is HDF4 support in libnetcdf.
         return NCDF_FORMAT_HDF4;
+#else
+        return NCDF_FORMAT_NONE;
 #endif
     }
 
@@ -189,7 +157,8 @@ NetCDFFormatEnum netCDFIdentifyFormat(GDALOpenInfo *poOpenInfo, bool bCheckExt)
     const char *pszExtension = CPLGetExtension(poOpenInfo->pszFilename);
     if (poOpenInfo->fpL != nullptr &&
         (!bCheckExt || EQUAL(pszExtension, "nc") ||
-         EQUAL(pszExtension, "cdf") || EQUAL(pszExtension, "nc4")))
+         EQUAL(pszExtension, "cdf") || EQUAL(pszExtension, "nc4") ||
+         poOpenInfo->IsSingleAllowedDriver("netCDF")))
     {
         vsi_l_offset nOffset = HDF5_SIG_OFFSET;
         for (int i = 0; i < 64; i++)
@@ -229,6 +198,11 @@ static int netCDFDatasetIdentify(GDALOpenInfo *poOpenInfo)
     if (NCDF_FORMAT_NC == eTmpFormat || NCDF_FORMAT_NC2 == eTmpFormat ||
         NCDF_FORMAT_NC4 == eTmpFormat || NCDF_FORMAT_NC4C == eTmpFormat)
         return TRUE;
+    if (eTmpFormat == NCDF_FORMAT_HDF4 &&
+        poOpenInfo->IsSingleAllowedDriver("netCDF"))
+    {
+        return TRUE;
+    }
 
     return FALSE;
 }
@@ -499,12 +473,7 @@ void netCDFDriverSetCommonMetadata(GDALDriver *poDriver)
 #ifdef NETCDF_HAS_HDF4
     poDriver->SetMetadataItem("NETCDF_HAS_HDF4", "YES");
 #endif
-#ifdef HAVE_HDF4
-    poDriver->SetMetadataItem("GDAL_HAS_HDF4", "YES");
-#endif
-#ifdef HAVE_HDF5
-    poDriver->SetMetadataItem("GDAL_HAS_HDF5", "YES");
-#endif
+
     poDriver->SetMetadataItem("NETCDF_HAS_NETCDF_MEM", "YES");
 
 #ifdef ENABLE_NCDUMP
@@ -561,6 +530,17 @@ void netCDFDriverSetCommonMetadata(GDALDriver *poDriver)
         "   <Option name='USE_DEFAULT_FILL_AS_NODATA' type='boolean' "
         "description='Whether the default fill value should be used as nodata "
         "when there is no _FillValue or missing_value attribute' default='NO'/>"
+        "   <Option name='RAW_DATA_CHUNK_CACHE_SIZE' type='integer' "
+        "description='The total size of the libnetcdf raw data chunk cache, "
+        "in bytes. Only for netCDF4/HDF5 files'/>"
+        "   <Option name='CHUNK_SLOTS' type='integer' "
+        "description='The number of chunk slots in the libnetcdf raw data "
+        "chunk cache. "
+        "Only for netCDF4/HDF5 files'/>"
+        "   <Option name='PREEMPTION' type='float' min='0' max='1' "
+        "description='Indicates how much chunks from libnetcdf chunk cache "
+        "that have been fully read are favored for preemption. "
+        "Only for netCDF4/HDF5 files'/>"
         "</MultiDimArrayOpenOptionList>");
 
     poDriver->SetMetadataItem(GDAL_DMD_MULTIDIM_ATTRIBUTE_CREATIONOPTIONLIST,
diff --git a/frmts/netcdf/netcdfdrivercore.h b/frmts/netcdf/netcdfdrivercore.h
index b2f4cbd519c4..ad406fe7d5ca 100644
--- a/frmts/netcdf/netcdfdrivercore.h
+++ b/frmts/netcdf/netcdfdrivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault, <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef NETCDFDRIVERCORE_H
diff --git a/frmts/netcdf/netcdfformatenum.h b/frmts/netcdf/netcdfformatenum.h
index d8849f6558fb..35c6165e005a 100644
--- a/frmts/netcdf/netcdfformatenum.h
+++ b/frmts/netcdf/netcdfformatenum.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault, <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef NETCDFFORMATENUM_H
diff --git a/frmts/netcdf/netcdflayer.cpp b/frmts/netcdf/netcdflayer.cpp
index 2603f8847d25..8a633981ced7 100644
--- a/frmts/netcdf/netcdflayer.cpp
+++ b/frmts/netcdf/netcdflayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "netcdfdataset.h"
@@ -51,7 +35,7 @@ netCDFLayer::netCDFLayer(netCDFDataset *poDS, int nLayerCDFId,
       m_bProfileVarUnlimited(false), m_nParentIndexVarID(-1),
       layerVID_alloc(poDS->cdfid == m_nLayerCDFId
                          ? nullptr
-                         : new nccfdriver::netCDFVID(m_nLayerCDFId)),
+                         : new nccfdriver::netCDFVID(poDS, m_nLayerCDFId)),
       layerVID(layerVID_alloc.get() == nullptr ? poDS->vcdf : *layerVID_alloc),
       m_SGeometryFeatInd(0), m_poLayerConfig(nullptr),
       m_layerSGDefn(poDS->cdfid, nccfdriver::OGRtoRaw(eGeomType), poDS->vcdf,
@@ -647,14 +631,15 @@ void netCDFLayer::SetRecordDimID(int nRecordDimID)
 
 CPLErr netCDFLayer::GetFillValue(int nVarId, char **ppszValue)
 {
-    if (NCDFGetAttr(m_nLayerCDFId, nVarId, _FillValue, ppszValue) == CE_None)
+    if (NCDFGetAttr(m_nLayerCDFId, nVarId, NCDF_FillValue, ppszValue) ==
+        CE_None)
         return CE_None;
     return NCDFGetAttr(m_nLayerCDFId, nVarId, "missing_value", ppszValue);
 }
 
 CPLErr netCDFLayer::GetFillValue(int nVarId, double *pdfValue)
 {
-    if (NCDFGetAttr(m_nLayerCDFId, nVarId, _FillValue, pdfValue) == CE_None)
+    if (NCDFGetAttr(m_nLayerCDFId, nVarId, NCDF_FillValue, pdfValue) == CE_None)
         return CE_None;
     return NCDFGetAttr(m_nLayerCDFId, nVarId, "missing_value", pdfValue);
 }
diff --git a/frmts/netcdf/netcdflayersg.cpp b/frmts/netcdf/netcdflayersg.cpp
index 2fd772fbd881..e1fda6024423 100644
--- a/frmts/netcdf/netcdflayersg.cpp
+++ b/frmts/netcdf/netcdflayersg.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2019, Winor Chen <wchen329 at wisc.edu>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #include "netcdfsg.h"
 #include "netcdfdataset.h"
diff --git a/frmts/netcdf/netcdflayersg.h b/frmts/netcdf/netcdflayersg.h
index 065e203f4286..fc9847391d2d 100644
--- a/frmts/netcdf/netcdflayersg.h
+++ b/frmts/netcdf/netcdflayersg.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2019, Winor Chen <wchen329 at wisc.edu>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef __NETCDFLAYERSG_H__
 #define __NETCDFLAYERSG_H__
diff --git a/frmts/netcdf/netcdfmultidim.cpp b/frmts/netcdf/netcdfmultidim.cpp
index 5b0f26f274fe..2bd4a95dead5 100644
--- a/frmts/netcdf/netcdfmultidim.cpp
+++ b/frmts/netcdf/netcdfmultidim.cpp
@@ -6,26 +6,11 @@
  ******************************************************************************
  * Copyright (c) 2019, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <algorithm>
+#include <cinttypes>
 #include <limits>
 #include <map>
 
@@ -765,7 +750,7 @@ netCDFGroup::netCDFGroup(const std::shared_ptr<netCDFSharedResources> &poShared,
     if (m_gid == m_poShared->GetCDFId())
     {
         int nFormat = 0;
-        nc_inq_format(m_gid, &nFormat);
+        NCDF_ERR(nc_inq_format(m_gid, &nFormat));
         if (nFormat == NC_FORMAT_CLASSIC)
         {
             m_aosStructuralInfo.SetNameValue("NC_FORMAT", "CLASSIC");
@@ -1530,10 +1515,11 @@ netCDFGroup::OpenMDArray(const std::string &osName,
     int nVarId = 0;
     if (nc_inq_varid(m_gid, osName.c_str(), &nVarId) != NC_NOERR)
         return nullptr;
+
     auto poVar = netCDFVariable::Create(
         m_poShared, std::dynamic_pointer_cast<netCDFGroup>(m_pSelf.lock()),
-        m_gid, nVarId, std::vector<std::shared_ptr<GDALDimension>>(), nullptr,
-        false);
+        m_gid, nVarId, std::vector<std::shared_ptr<GDALDimension>>(),
+        papszOptions, false);
     if (poVar)
     {
         poVar->SetUseDefaultFillAsNoData(CPLTestBool(CSLFetchNameValueDef(
@@ -2081,6 +2067,49 @@ netCDFVariable::netCDFVariable(
                      poShared->GetPAM()),
       m_poShared(poShared), m_gid(gid), m_varid(varid), m_dims(dims)
 {
+    {
+        // Cf https://docs.unidata.ucar.edu/netcdf-c/current/group__variables.html#gae6b59e92d1140b5fec56481b0f41b610
+        size_t nRawDataChunkCacheSize = 0;
+        size_t nChunkSlots = 0;
+        float fPreemption = 0.0f;
+        int ret =
+            nc_get_var_chunk_cache(m_gid, m_varid, &nRawDataChunkCacheSize,
+                                   &nChunkSlots, &fPreemption);
+        if (ret == NC_NOERR)
+        {
+            if (const char *pszVar = CSLFetchNameValue(
+                    papszOptions, "RAW_DATA_CHUNK_CACHE_SIZE"))
+            {
+                nRawDataChunkCacheSize =
+                    static_cast<size_t>(std::min<unsigned long long>(
+                        std::strtoull(pszVar, nullptr, 10),
+                        std::numeric_limits<size_t>::max()));
+            }
+            if (const char *pszVar =
+                    CSLFetchNameValue(papszOptions, "CHUNK_SLOTS"))
+            {
+                nChunkSlots = static_cast<size_t>(std::min<unsigned long long>(
+                    std::strtoull(pszVar, nullptr, 10),
+                    std::numeric_limits<size_t>::max()));
+            }
+            if (const char *pszVar =
+                    CSLFetchNameValue(papszOptions, "PREEMPTION"))
+            {
+                fPreemption = std::max(
+                    0.0f, std::min(1.0f, static_cast<float>(CPLAtof(pszVar))));
+            }
+            NCDF_ERR(nc_set_var_chunk_cache(m_gid, m_varid,
+                                            nRawDataChunkCacheSize, nChunkSlots,
+                                            fPreemption));
+        }
+        else if (ret != NC_ENOTNC4)
+        {
+            CPLError(CE_Warning, CPLE_AppDefined,
+                     "netcdf error #%d : %s .\nat (%s,%s,%d)\n", ret,
+                     nc_strerror(ret), __FILE__, __FUNCTION__, __LINE__);
+        }
+    }
+
     NCDF_ERR(nc_inq_varndims(m_gid, m_varid, &m_nDims));
     NCDF_ERR(nc_inq_vartype(m_gid, m_varid, &m_nVarType));
     if (m_nDims == 2 && m_nVarType == NC_CHAR)
@@ -2119,6 +2148,27 @@ netCDFVariable::netCDFVariable(
     }
     m_bWriteGDALTags = CPLTestBool(
         CSLFetchNameValueDef(papszOptions, "WRITE_GDAL_TAGS", "YES"));
+
+    // Non-documented option. Only used for test purposes.
+    if (CPLTestBool(CSLFetchNameValueDef(
+            papszOptions, "INCLUDE_CHUNK_CACHE_PARAMETERS_IN_STRUCTURAL_INFO",
+            "NO")))
+    {
+        size_t nRawDataChunkCacheSize = 0;
+        size_t nChunkSlots = 0;
+        float fPreemption = 0.0f;
+        NCDF_ERR(nc_get_var_chunk_cache(m_gid, m_varid, &nRawDataChunkCacheSize,
+                                        &nChunkSlots, &fPreemption));
+        m_aosStructuralInfo.SetNameValue(
+            "RAW_DATA_CHUNK_CACHE_SIZE",
+            CPLSPrintf("%" PRIu64,
+                       static_cast<uint64_t>(nRawDataChunkCacheSize)));
+        m_aosStructuralInfo.SetNameValue(
+            "CHUNK_SLOTS",
+            CPLSPrintf("%" PRIu64, static_cast<uint64_t>(nChunkSlots)));
+        m_aosStructuralInfo.SetNameValue("PREEMPTION",
+                                         CPLSPrintf("%f", fPreemption));
+    }
 }
 
 /************************************************************************/
@@ -3403,9 +3453,9 @@ bool netCDFVariable::ReadOneElement(const GDALExtendedDataType &src_datatype,
         NCDF_ERR(ret);
         if (ret != NC_NOERR)
             return false;
-        nc_free_string(1, &pszStr);
         GDALExtendedDataType::CopyValue(&pszStr, src_datatype, pDstBuffer,
                                         bufferDataType);
+        nc_free_string(1, &pszStr);
         return true;
     }
 
@@ -3687,7 +3737,7 @@ const void *netCDFVariable::GetRawNoDataValue() const
 
     m_bGetRawNoDataValueHasRun = true;
 
-    const char *pszAttrName = _FillValue;
+    const char *pszAttrName = NCDF_FillValue;
     auto poAttr = GetAttribute(pszAttrName);
     if (!poAttr)
     {
@@ -3812,9 +3862,9 @@ bool netCDFVariable::SetRawNoDataValue(const void *pNoData)
         m_abyNoData.clear();
         nc_type atttype = NC_NAT;
         size_t attlen = 0;
-        if (nc_inq_att(m_gid, m_varid, _FillValue, &atttype, &attlen) ==
+        if (nc_inq_att(m_gid, m_varid, NCDF_FillValue, &atttype, &attlen) ==
             NC_NOERR)
-            ret = nc_del_att(m_gid, m_varid, _FillValue);
+            ret = nc_del_att(m_gid, m_varid, NCDF_FillValue);
         else
             ret = NC_NOERR;
         if (nc_inq_att(m_gid, m_varid, "missing_value", &atttype, &attlen) ==
@@ -3846,7 +3896,7 @@ bool netCDFVariable::SetRawNoDataValue(const void *pNoData)
         if (nc_inq_att(m_gid, m_varid, "missing_value", &atttype, &attlen) ==
             NC_NOERR)
         {
-            if (nc_inq_att(m_gid, m_varid, _FillValue, &atttype, &attlen) ==
+            if (nc_inq_att(m_gid, m_varid, NCDF_FillValue, &atttype, &attlen) ==
                 NC_NOERR)
             {
                 CPLError(CE_Failure, CPLE_NotSupported,
@@ -3859,7 +3909,7 @@ bool netCDFVariable::SetRawNoDataValue(const void *pNoData)
         }
         else
         {
-            ret = nc_put_att(m_gid, m_varid, _FillValue, m_nVarType, 1,
+            ret = nc_put_att(m_gid, m_varid, NCDF_FillValue, m_nVarType, 1,
                              &abyTmp[0]);
         }
     }
@@ -4010,7 +4060,7 @@ netCDFVariable::GetAttributes(CSLConstList papszOptions) const
         char szAttrName[NC_MAX_NAME + 1];
         szAttrName[0] = 0;
         NCDF_ERR(nc_inq_attname(m_gid, m_varid, i, szAttrName));
-        if (bShowAll || (!EQUAL(szAttrName, _FillValue) &&
+        if (bShowAll || (!EQUAL(szAttrName, NCDF_FillValue) &&
                          !EQUAL(szAttrName, "missing_value") &&
                          !EQUAL(szAttrName, CF_UNITS) &&
                          !EQUAL(szAttrName, CF_SCALE_FACTOR) &&
@@ -4671,17 +4721,18 @@ bool netCDFAttribute::IWrite(const GUInt64 *arrayStartIdx, const size_t *count,
 
     m_poShared->SetDefineMode(true);
 
+    const auto &dt(GetDataType());
     if (m_nAttType == NC_STRING)
     {
-        CPLAssert(GetDataType().GetClass() == GEDTC_STRING);
+        CPLAssert(dt.GetClass() == GEDTC_STRING);
         if (m_dims.empty())
         {
             char *pszStr = nullptr;
             const char *pszStrConst;
-            if (bufferDataType != GetDataType())
+            if (bufferDataType != dt)
             {
                 GDALExtendedDataType::CopyValue(pSrcBuffer, bufferDataType,
-                                                &pszStr, GetDataType());
+                                                &pszStr, dt);
                 pszStrConst = pszStr;
             }
             else
@@ -4698,15 +4749,16 @@ bool netCDFAttribute::IWrite(const GUInt64 *arrayStartIdx, const size_t *count,
         }
 
         int ret;
-        if (bufferDataType != GetDataType())
+        if (bufferDataType != dt)
         {
             std::vector<char *> apszStrings(count[0]);
-            const char **ppszStr;
-            memcpy(&ppszStr, &pSrcBuffer, sizeof(const char **));
+            const auto nInputDTSize = bufferDataType.GetSize();
+            const GByte *pabySrcBuffer = static_cast<const GByte *>(pSrcBuffer);
             for (size_t i = 0; i < count[0]; i++)
             {
-                GDALExtendedDataType::CopyValue(&ppszStr[i], bufferDataType,
-                                                &apszStrings[i], GetDataType());
+                GDALExtendedDataType::CopyValue(pabySrcBuffer, bufferDataType,
+                                                &apszStrings[i], dt);
+                pabySrcBuffer += nInputDTSize * bufferStride[0];
             }
             ret = nc_put_att_string(m_gid, m_varid, GetName().c_str(), count[0],
                                     const_cast<const char **>(&apszStrings[0]));
@@ -4730,14 +4782,14 @@ bool netCDFAttribute::IWrite(const GUInt64 *arrayStartIdx, const size_t *count,
 
     if (m_nAttType == NC_CHAR)
     {
-        CPLAssert(GetDataType().GetClass() == GEDTC_STRING);
+        CPLAssert(dt.GetClass() == GEDTC_STRING);
         CPLAssert(m_dims.empty());
         char *pszStr = nullptr;
         const char *pszStrConst;
-        if (bufferDataType != GetDataType())
+        if (bufferDataType != dt)
         {
             GDALExtendedDataType::CopyValue(pSrcBuffer, bufferDataType, &pszStr,
-                                            GetDataType());
+                                            dt);
             pszStrConst = pszStr;
         }
         else
@@ -4754,7 +4806,6 @@ bool netCDFAttribute::IWrite(const GUInt64 *arrayStartIdx, const size_t *count,
         return true;
     }
 
-    const auto &dt(GetDataType());
     if (dt.GetClass() == GEDTC_NUMERIC &&
         dt.GetNumericDataType() == GDT_Unknown)
     {
diff --git a/frmts/netcdf/netcdfsg.cpp b/frmts/netcdf/netcdfsg.cpp
index 5a9242e009f3..7458d73dc049 100644
--- a/frmts/netcdf/netcdfsg.cpp
+++ b/frmts/netcdf/netcdfsg.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2019, Winor Chen <wchen329 at wisc.edu>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #include <cstdio>
 #include <cstring>
diff --git a/frmts/netcdf/netcdfsg.h b/frmts/netcdf/netcdfsg.h
index 4e0aad19cecb..181e5fdce2ef 100644
--- a/frmts/netcdf/netcdfsg.h
+++ b/frmts/netcdf/netcdfsg.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2019, Winor Chen <wchen329 at wisc.edu>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef __NETCDFSG_H__
 #define __NETCDFSG_H__
diff --git a/frmts/netcdf/netcdfsgwriterutil.cpp b/frmts/netcdf/netcdfsgwriterutil.cpp
index 2863d4214d57..1cf917f45f28 100644
--- a/frmts/netcdf/netcdfsgwriterutil.cpp
+++ b/frmts/netcdf/netcdfsgwriterutil.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2019, Winor Chen <wchen329 at wisc.edu>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #include "netcdfsgwriterutil.h"
 #include "netcdfdataset.h"
diff --git a/frmts/netcdf/netcdfsgwriterutil.h b/frmts/netcdf/netcdfsgwriterutil.h
index 1cb56f54eb99..91e404947582 100644
--- a/frmts/netcdf/netcdfsgwriterutil.h
+++ b/frmts/netcdf/netcdfsgwriterutil.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2019, Winor Chen <wchen329 at wisc.edu>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef __NETCDFSGWRITERUTIL_H__
 #define __NETCDFSGWRITERUTIL_H__
diff --git a/frmts/netcdf/netcdfuffd.h b/frmts/netcdf/netcdfuffd.h
index 201a6c1b2eaf..a236b8df5c06 100644
--- a/frmts/netcdf/netcdfuffd.h
+++ b/frmts/netcdf/netcdfuffd.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018, Dr. James McClain <james.mcclain@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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifdef ENABLE_UFFD
diff --git a/frmts/netcdf/netcdfvirtual.cpp b/frmts/netcdf/netcdfvirtual.cpp
index eec057e54275..0094ea239fe8 100644
--- a/frmts/netcdf/netcdfvirtual.cpp
+++ b/frmts/netcdf/netcdfvirtual.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2019, Winor Chen <wchen329 at wisc.edu>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #include "netcdfdataset.h"
 #include "netcdfvirtual.h"
@@ -154,12 +138,12 @@ void netCDFVID::nc_resize_vdim(int dimid, size_t dimlen)
 
 void netCDFVID::nc_set_define_mode()
 {
-    nc_redef(ncid);
+    m_poDS->SetDefineMode(true);
 }
 
 void netCDFVID::nc_set_data_mode()
 {
-    nc_enddef(ncid);
+    m_poDS->SetDefineMode(false);
 }
 
 void netCDFVID::nc_vmap()
@@ -168,7 +152,7 @@ void netCDFVID::nc_vmap()
 
     for (size_t itr_d = 0; itr_d < dimList.size(); itr_d++)
     {
-        int realDimID;
+        int realDimID = -1;
         netCDFVDimension &dim = dimList[itr_d];
 
         if (!dim.isValid())
@@ -176,13 +160,14 @@ void netCDFVID::nc_vmap()
             continue;  // don't do anywork if variable is invalid
         }
 
-        nc_def_dim(ncid, dim.getName().c_str(), dim.getLen(), &realDimID);
+        NCDF_ERR(
+            nc_def_dim(ncid, dim.getName().c_str(), dim.getLen(), &realDimID));
         dimList[itr_d].setRealID(realDimID);
     }
 
     for (size_t itr_v = 0; itr_v < varList.size(); itr_v++)
     {
-        int realVarID;
+        int realVarID = -1;
         netCDFVVariable &var = varList[itr_v];
 
         if (!var.isValid())
@@ -199,8 +184,8 @@ void netCDFVID::nc_vmap()
                 virtualDIDToDim(var.getDimIds()[dimct]).getRealID();
         }
 
-        nc_def_var(ncid, var.getName().c_str(), var.getType(),
-                   var.getDimCount(), newdims.get(), &realVarID);
+        NCDF_ERR(nc_def_var(ncid, var.getName().c_str(), var.getType(),
+                            var.getDimCount(), newdims.get(), &realVarID));
         var.setRealID(realVarID);
 
         // Now write each of its attributes
diff --git a/frmts/netcdf/netcdfvirtual.h b/frmts/netcdf/netcdfvirtual.h
index bad04850d344..233c0b05cd61 100644
--- a/frmts/netcdf/netcdfvirtual.h
+++ b/frmts/netcdf/netcdfvirtual.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2019, Winor Chen <wchen329 at wisc.edu>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef __NETCDFVIRTUAL_H__
 #define __NETCDFVIRTUAL_H__
@@ -34,6 +18,8 @@
 #include "netcdfsg.h"
 #include "netcdf.h"
 
+class netCDFDataset;
+
 // netCDF Virtual
 // Provides a layer of "virtual ncID"
 // that can be mapped to a real netCDF ID
@@ -320,6 +306,7 @@ class netCDFVVariable
  */
 class netCDFVID
 {
+    netCDFDataset *m_poDS = nullptr;
     int &ncid;  // ncid REF. which tracks ncID changes that may be made upstream
     int dimTicket = 0;
     int varTicket = 0;
@@ -476,7 +463,8 @@ class netCDFVID
     }
 
     // Constructor
-    explicit netCDFVID(int &ncid_in) : ncid(ncid_in)
+    explicit netCDFVID(netCDFDataset *poDS, int &ncid_in)
+        : m_poDS(poDS), ncid(ncid_in)
     {
     }
 };
diff --git a/frmts/netcdf/netcdfwriterconfig.cpp b/frmts/netcdf/netcdfwriterconfig.cpp
index 1c900925b42d..c8baf3429484 100644
--- a/frmts/netcdf/netcdfwriterconfig.cpp
+++ b/frmts/netcdf/netcdfwriterconfig.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "netcdfdataset.h"
diff --git a/frmts/ngsgeoid/ngsgeoiddataset.cpp b/frmts/ngsgeoid/ngsgeoiddataset.cpp
index 965b3173a34e..f530eb9b81bc 100644
--- a/frmts/ngsgeoid/ngsgeoiddataset.cpp
+++ b/frmts/ngsgeoid/ngsgeoiddataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
@@ -391,8 +375,8 @@ const OGRSpatialReference *NGSGEOIDDataset::GetSpatialRef() const
         return &m_oSRS;
     }
 
-    CPLString osFilename(CPLGetBasename(GetDescription()));
-    osFilename.tolower();
+    const CPLString osFilename =
+        CPLString(CPLGetBasename(GetDescription())).tolower();
 
     // See https://www.ngs.noaa.gov/GEOID/GEOID12B/faq_2012B.shtml
 
diff --git a/frmts/nitf/CMakeLists.txt b/frmts/nitf/CMakeLists.txt
index 9e4cc0727706..9bed18a5a221 100644
--- a/frmts/nitf/CMakeLists.txt
+++ b/frmts/nitf/CMakeLists.txt
@@ -8,7 +8,6 @@ add_gdal_driver(
           nitffile.c
           nitfimage.c
           nitfaridpcm.cpp
-          nitfbilevel.cpp
           rpftocfile.cpp
           nitfdes.c
           nitf_gcprpc.cpp
@@ -42,6 +41,16 @@ target_include_directories(gdal_NITF PRIVATE ${GDAL_RASTER_FORMAT_SOURCE_DIR}/gt
 
 set_property(SOURCE nitfwritejpeg.cpp nitfwritejpeg_12.cpp PROPERTY SKIP_UNITY_BUILD_INCLUSION ON)
 
+# When build as plugin, initialize all drivers from GDALRegister_NITF
+if (GDAL_ENABLE_DRIVER_NITF_PLUGIN)
+  target_compile_definitions(gdal_NITF PRIVATE -DNITF_PLUGIN)
+endif ()
+
+if (GDAL_ENABLE_DRIVER_GTIFF)
+  target_sources(gdal_NITF PRIVATE nitfbilevel.cpp)
+  target_compile_definitions(gdal_NITF PRIVATE -DHAVE_TIFF)
+endif()
+
 if (GDAL_USE_TIFF_INTERNAL)
   gdal_add_vendored_lib(gdal_NITF libtiff)
 endif()
@@ -66,11 +75,11 @@ if (GDAL_ENABLE_DRIVER_JPEG)
   endif ()
 endif()
 
-if (NOT GDAL_USE_TIFF_INTERNAL)
+if (GDAL_USE_TIFF AND NOT GDAL_USE_TIFF_INTERNAL)
   gdal_target_link_libraries(gdal_NITF PRIVATE TIFF::TIFF)
 endif ()
 
-add_executable(nitfdump EXCLUDE_FROM_ALL nitfdump.c nitffile.c nitfimage.c rpftocfile.cpp nitfbilevel.cpp nitfaridpcm.cpp mgrs.c)
+add_executable(nitfdump EXCLUDE_FROM_ALL nitfdump.c nitffile.c nitfimage.c rpftocfile.cpp nitfaridpcm.cpp mgrs.c nitfdes.c)
 if (GDAL_USE_TIFF_INTERNAL)
   target_sources(nitfdump PRIVATE $<TARGET_OBJECTS:libtiff>)
   gdal_add_vendored_lib(nitfdump libtiff)
@@ -110,8 +119,15 @@ if (GDAL_USE_TIFF_INTERNAL)
   if (GDAL_USE_LERC_INTERNAL)
     target_sources(nitfdump PRIVATE $<TARGET_OBJECTS:lerc>)
   endif ()
-else()
+elseif(GDAL_USE_TIFF AND GDAL_ENABLE_DRIVER_GTIFF)
   target_link_libraries(nitfdump PRIVATE TIFF::TIFF)
 endif()
-target_include_directories(nitfdump PRIVATE $<TARGET_PROPERTY:gdal_NITF,SOURCE_DIR> $<TARGET_PROPERTY:gdal_GTIFF,SOURCE_DIR>)
+target_include_directories(nitfdump PRIVATE $<TARGET_PROPERTY:gdal_NITF,SOURCE_DIR>)
 target_link_libraries(nitfdump PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}>)
+
+if (GDAL_ENABLE_DRIVER_GTIFF)
+  target_sources(nitfdump PRIVATE nitfbilevel.cpp)
+  target_include_directories(nitfdump PRIVATE $<TARGET_PROPERTY:gdal_GTIFF,SOURCE_DIR>)
+  target_compile_definitions(nitfdump PRIVATE -DHAVE_TIFF)
+endif()
+
diff --git a/frmts/nitf/data/nitf_spec.xml b/frmts/nitf/data/nitf_spec.xml
index 4e14414eb26f..4250c8cd5f2b 100644
--- a/frmts/nitf/data/nitf_spec.xml
+++ b/frmts/nitf/data/nitf_spec.xml
@@ -10,23 +10,7 @@
  **********************************************************************
  * Copyright (c) 2011, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 -->
 
diff --git a/frmts/nitf/data/nitf_spec.xsd b/frmts/nitf/data/nitf_spec.xsd
index 384efe288ede..a47e24c647c6 100644
--- a/frmts/nitf/data/nitf_spec.xsd
+++ b/frmts/nitf/data/nitf_spec.xsd
@@ -10,23 +10,7 @@
  **********************************************************************
  * Copyright (c) 2011, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
diff --git a/frmts/nitf/ecrgtocdataset.cpp b/frmts/nitf/ecrgtocdataset.cpp
index 3671363ed6ed..d4d1e19c126a 100644
--- a/frmts/nitf/ecrgtocdataset.cpp
+++ b/frmts/nitf/ecrgtocdataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 // g++ -g -Wall -fPIC frmts/nitf/ecrgtocdataset.cpp -shared -o gdal_ECRGTOC.so
@@ -52,6 +36,7 @@
 #include "gdal_proxy.h"
 #include "ogr_srs_api.h"
 #include "vrtdataset.h"
+#include "nitfdrivercore.h"
 
 /** Overview of used classes :
    - ECRGTOCDataset : lists the different subdatasets, listed in the .xml,
@@ -128,7 +113,6 @@ class ECRGTOCDataset final : public GDALPamDataset
                               const std::string &osScale,
                               const char *pszFilename);
 
-    static int Identify(GDALOpenInfo *poOpenInfo);
     static GDALDataset *Open(GDALOpenInfo *poOpenInfo);
 };
 
@@ -969,40 +953,6 @@ GDALDataset *ECRGTOCDataset::Build(const char *pszTOCFilename,
     return poDS;
 }
 
-/************************************************************************/
-/*                              Identify()                              */
-/************************************************************************/
-
-int ECRGTOCDataset::Identify(GDALOpenInfo *poOpenInfo)
-
-{
-    const char *pszFilename = poOpenInfo->pszFilename;
-
-    /* -------------------------------------------------------------------- */
-    /*      Is this a sub-dataset selector? If so, it is obviously ECRGTOC. */
-    /* -------------------------------------------------------------------- */
-    if (STARTS_WITH_CI(pszFilename, "ECRG_TOC_ENTRY:"))
-        return TRUE;
-
-    /* -------------------------------------------------------------------- */
-    /*  First we check to see if the file has the expected header           */
-    /*  bytes.                                                              */
-    /* -------------------------------------------------------------------- */
-    const char *pabyHeader =
-        reinterpret_cast<const char *>(poOpenInfo->pabyHeader);
-    if (pabyHeader == nullptr)
-        return FALSE;
-
-    if (strstr(pabyHeader, "<Table_of_Contents") != nullptr &&
-        strstr(pabyHeader, "<file_header ") != nullptr)
-        return TRUE;
-
-    if (strstr(pabyHeader, "<!DOCTYPE Table_of_Contents [") != nullptr)
-        return TRUE;
-
-    return FALSE;
-}
-
 /************************************************************************/
 /*                                Open()                                */
 /************************************************************************/
@@ -1010,7 +960,7 @@ int ECRGTOCDataset::Identify(GDALOpenInfo *poOpenInfo)
 GDALDataset *ECRGTOCDataset::Open(GDALOpenInfo *poOpenInfo)
 
 {
-    if (!Identify(poOpenInfo))
+    if (!ECRGTOCDriverIdentify(poOpenInfo))
         return nullptr;
 
     const char *pszFilename = poOpenInfo->pszFilename;
@@ -1101,23 +1051,13 @@ GDALDataset *ECRGTOCDataset::Open(GDALOpenInfo *poOpenInfo)
 void GDALRegister_ECRGTOC()
 
 {
-    if (GDALGetDriverByName("ECRGTOC") != nullptr)
+    if (GDALGetDriverByName(ECRGTOC_DRIVER_NAME) != nullptr)
         return;
 
     GDALDriver *poDriver = new GDALDriver();
+    ECRGTOCDriverSetCommonMetadata(poDriver);
 
-    poDriver->SetDescription("ECRGTOC");
-    poDriver->SetMetadataItem(GDAL_DCAP_RASTER, "YES");
-    poDriver->SetMetadataItem(GDAL_DMD_LONGNAME, "ECRG TOC format");
-
-    poDriver->pfnIdentify = ECRGTOCDataset::Identify;
     poDriver->pfnOpen = ECRGTOCDataset::Open;
 
-    poDriver->SetMetadataItem(GDAL_DMD_HELPTOPIC,
-                              "drivers/raster/ecrgtoc.html");
-    poDriver->SetMetadataItem(GDAL_DMD_EXTENSION, "xml");
-    poDriver->SetMetadataItem(GDAL_DCAP_VIRTUALIO, "YES");
-    poDriver->SetMetadataItem(GDAL_DMD_SUBDATASETS, "YES");
-
     GetGDALDriverManager()->RegisterDriver(poDriver);
 }
diff --git a/frmts/nitf/nitf_gcprpc.cpp b/frmts/nitf/nitf_gcprpc.cpp
index 7ce36b1104ce..c381b09ede8a 100644
--- a/frmts/nitf/nitf_gcprpc.cpp
+++ b/frmts/nitf/nitf_gcprpc.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010, ESRI
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/nitf/nitfaridpcm.cpp b/frmts/nitf/nitfaridpcm.cpp
index 7c19a40410e7..0ac0b5d063f3 100644
--- a/frmts/nitf/nitfaridpcm.cpp
+++ b/frmts/nitf/nitfaridpcm.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2007, Frank Warmerdam
  * Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/nitf/nitfbilevel.cpp b/frmts/nitf/nitfbilevel.cpp
index 879dbad39582..1734fcdfa792 100644
--- a/frmts/nitf/nitfbilevel.cpp
+++ b/frmts/nitf/nitfbilevel.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2007, Frank Warmerdam
  * Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -33,7 +17,6 @@
 #include <cstring>
 
 #include "cpl_conv.h"
-#include "cpl_multiproc.h"
 #include "cpl_string.h"
 #include "cpl_vsi.h"
 #include "gdal.h"
@@ -57,10 +40,8 @@ int NITFUncompressBILEVEL(NITFImage *psImage, GByte *pabyInputData,
     const int nOutputBytes =
         (psImage->nBlockWidth * psImage->nBlockHeight + 7) / 8;
 
-    CPLString osFilename;
-
-    osFilename.Printf("/vsimem/nitf-wrk-%ld.tif", (long)CPLGetPID());
-
+    const CPLString osFilename(
+        VSIMemGenerateHiddenFilename("nitf_bilevel.tif"));
     VSILFILE *fpL = VSIFOpenL(osFilename, "w+");
     if (fpL == nullptr)
         return FALSE;
diff --git a/frmts/nitf/nitfdataset.cpp b/frmts/nitf/nitfdataset.cpp
index 48fd13f314d2..3a18bb50aefb 100644
--- a/frmts/nitf/nitfdataset.cpp
+++ b/frmts/nitf/nitfdataset.cpp
@@ -11,23 +11,7 @@
  * Portions Copyright (c) Her majesty the Queen in right of Canada as
  * represented by the Minister of National Defence, 2006.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -3366,7 +3350,7 @@ int NITFDataset::CheckForRSets(const char *pszNITFFilename,
         if (isR0File)
         {
             osTarget = pszNITFFilename;
-            osTarget[osTarget.size() - 1] = static_cast<char>('0' + i);
+            osTarget.back() = static_cast<char>('0' + i);
         }
         else
             osTarget.Printf("%s.r%d", pszNITFFilename, i);
@@ -3982,7 +3966,7 @@ static char **NITFJP2ECWOptions(char **papszOptions)
 /*      NITF creation options.                                          */
 /************************************************************************/
 
-static char **NITFJP2KAKOptions(char **papszOptions)
+static char **NITFJP2KAKOptions(char **papszOptions, int nABPP)
 
 {
     char **papszJP2Options = CSLAddString(nullptr, "CODEC=J2K");
@@ -3999,6 +3983,9 @@ static char **NITFJP2KAKOptions(char **papszOptions)
         }
     }
 
+    papszJP2Options =
+        CSLSetNameValue(papszJP2Options, "NBITS", CPLSPrintf("%d", nABPP));
+
     return papszJP2Options;
 }
 
@@ -4010,13 +3997,20 @@ static char **NITFJP2KAKOptions(char **papszOptions)
 /************************************************************************/
 
 static char **NITFJP2OPENJPEGOptions(GDALDriver *poJ2KDriver,
-                                     CSLConstList papszOptions)
+                                     CSLConstList papszOptions, int nABPP)
 
 {
     char **papszJP2Options = CSLAddString(nullptr, "CODEC=J2K");
 
-    double dfQuality =
-        CPLAtof(CSLFetchNameValueDef(papszOptions, "QUALITY", "0"));
+    const char *pszQuality = CSLFetchNameValue(papszOptions, "QUALITY");
+    double dfQuality = 0;
+    if (pszQuality)
+    {
+        for (const char *pszVal :
+             CPLStringList(CSLTokenizeString2(pszQuality, ",", 0)))
+            dfQuality = std::max(dfQuality, CPLAtof(pszVal));
+    }
+
     double dfTarget =
         CPLAtof(CSLFetchNameValueDef(papszOptions, "TARGET", "0"));
 
@@ -4033,10 +4027,10 @@ static char **NITFJP2OPENJPEGOptions(GDALDriver *poJ2KDriver,
     }
 
     // Set it now before the NPJE profiles have a chance to override it
-    if (dfQuality > 0)
+    if (pszQuality)
     {
-        papszJP2Options = CSLSetNameValue(papszJP2Options, "QUALITY",
-                                          CPLSPrintf("%f", dfQuality));
+        papszJP2Options =
+            CSLSetNameValue(papszJP2Options, "QUALITY", pszQuality);
     }
 
     const char *pszProfile = CSLFetchNameValueDef(papszOptions, "PROFILE", "");
@@ -4047,6 +4041,14 @@ static char **NITFJP2OPENJPEGOptions(GDALDriver *poJ2KDriver,
         // (https://nsgreg.nga.mil/doc/view?i=2031&month=3&day=22&year=2021),
         // for NPJE (Appendix D ) profile
 
+        if (pszQuality && strchr(pszQuality, ','))
+        {
+            CPLError(CE_Warning, CPLE_AppDefined,
+                     "Only largest value of QUALITY used when PROFILE=%s "
+                     "is specified",
+                     pszProfile);
+        }
+
         papszJP2Options =
             CSLAddString(papszJP2Options, "@BLOCKSIZE_STRICT=YES");
 
@@ -4117,6 +4119,9 @@ static char **NITFJP2OPENJPEGOptions(GDALDriver *poJ2KDriver,
         papszJP2Options = CSLAddString(papszJP2Options, "PROFILE=UNRESTRICTED");
     }
 
+    papszJP2Options =
+        CSLSetNameValue(papszJP2Options, "NBITS", CPLSPrintf("%d", nABPP));
+
     return papszJP2Options;
 }
 
@@ -4290,6 +4295,11 @@ GDALDataset *NITFDataset::NITFDatasetCreate(const char *pszFilename, int nXSize,
             CSLSetNameValue(papszFullOptions, "BLOCKYSIZE", pszBlockSize);
     }
 
+    if (const char *pszNBITS = CSLFetchNameValue(papszFullOptions, "NBITS"))
+    {
+        papszFullOptions = CSLSetNameValue(papszFullOptions, "ABPP", pszNBITS);
+    }
+
     /* -------------------------------------------------------------------- */
     /*      Create the file.                                                */
     /* -------------------------------------------------------------------- */
@@ -4582,7 +4592,6 @@ GDALDataset *NITFDataset::NITFCreateCopy(const char *pszFilename,
     {
         if (((poSrcDS->GetRasterCount() == 3 && bJPEG) ||
              (poSrcDS->GetRasterCount() >= 3 && !bJPEG)) &&
-            eType == GDT_Byte &&
             poSrcDS->GetRasterBand(1)->GetColorInterpretation() ==
                 GCI_RedBand &&
             poSrcDS->GetRasterBand(2)->GetColorInterpretation() ==
@@ -4596,6 +4605,23 @@ GDALDataset *NITFDataset::NITFCreateCopy(const char *pszFilename,
                 papszFullOptions =
                     CSLSetNameValue(papszFullOptions, "IREP", "RGB");
         }
+        else if (poSrcDS->GetRasterCount() >= 3 && !bJPEG &&
+                 poSrcDS->GetRasterBand(1)->GetColorInterpretation() ==
+                     GCI_BlueBand &&
+                 poSrcDS->GetRasterBand(2)->GetColorInterpretation() ==
+                     GCI_GreenBand &&
+                 poSrcDS->GetRasterBand(3)->GetColorInterpretation() ==
+                     GCI_RedBand &&
+                 CSLFetchNameValue(papszFullOptions, "IREPBAND") == nullptr)
+        {
+            papszFullOptions =
+                CSLSetNameValue(papszFullOptions, "IREP", "MULTI");
+            std::string osIREPBAND = "B,G,R";
+            for (int i = 4; i <= poSrcDS->GetRasterCount(); ++i)
+                osIREPBAND += ",M";
+            papszFullOptions = CSLSetNameValue(papszFullOptions, "IREPBAND",
+                                               osIREPBAND.c_str());
+        }
         else if (poSrcDS->GetRasterCount() == 1 && eType == GDT_Byte &&
                  poBand1->GetColorTable() != nullptr)
         {
@@ -5018,6 +5044,19 @@ GDALDataset *NITFDataset::NITFCreateCopy(const char *pszFilename,
         return nullptr;
     }
 
+    int nABPP = GDALGetDataTypeSize(eType);
+    if (const char *pszABPP = CSLFetchNameValue(papszFullOptions, "ABPP"))
+    {
+        nABPP = atoi(pszABPP);
+    }
+    else if (const char *pszNBITS = CSLFetchNameValueDef(
+                 papszFullOptions, "NBITS",
+                 poBand1->GetMetadataItem("NBITS", "IMAGE_STRUCTURE")))
+    {
+        papszFullOptions = CSLSetNameValue(papszFullOptions, "ABPP", pszNBITS);
+        nABPP = atoi(pszNBITS);
+    }
+
     if (poJ2KDriver != nullptr &&
         EQUAL(poJ2KDriver->GetDescription(), "JP2ECW"))
     {
@@ -5102,10 +5141,6 @@ GDALDataset *NITFDataset::NITFCreateCopy(const char *pszFilename,
                 0.03125, 0.0625, 0.125, 0.25, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0,
                 1.1,     1.2,    1.3,   1.5,  1.7, 2.0, 2.3, 3.5, 3.9};
 
-            const int nABPP = atoi(CSLFetchNameValueDef(
-                papszFullOptions, "ABPP",
-                CPLSPrintf("%d", GDALGetDataTypeSize(eType))));
-
             if (EQUAL(pszProfile, "NPJE") ||
                 EQUAL(pszProfile, "NPJE_NUMERICALLY_LOSSLESS"))
             {
@@ -5188,7 +5223,7 @@ GDALDataset *NITFDataset::NITFCreateCopy(const char *pszFilename,
         }
         else if (EQUAL(poJ2KDriver->GetDescription(), "JP2KAK"))
         {
-            char **papszJP2Options = NITFJP2KAKOptions(papszFullOptions);
+            char **papszJP2Options = NITFJP2KAKOptions(papszFullOptions, nABPP);
             poJ2KDataset = poJ2KDriver->CreateCopy(osDSName, poSrcDS, FALSE,
                                                    papszJP2Options, pfnProgress,
                                                    pProgressData);
@@ -5197,7 +5232,7 @@ GDALDataset *NITFDataset::NITFCreateCopy(const char *pszFilename,
         else if (EQUAL(poJ2KDriver->GetDescription(), "JP2OPENJPEG"))
         {
             char **papszJP2Options =
-                NITFJP2OPENJPEGOptions(poJ2KDriver, papszFullOptions);
+                NITFJP2OPENJPEGOptions(poJ2KDriver, papszFullOptions, nABPP);
             poJ2KDataset = poJ2KDriver->CreateCopy(osDSName, poSrcDS, FALSE,
                                                    papszJP2Options, pfnProgress,
                                                    pProgressData);
@@ -7015,11 +7050,21 @@ void NITFDriver::InitCreationOptionList()
     if (bHasJPEG2000Drivers)
         osCreationOptions += "       <Value>C8</Value>";
 
-    osCreationOptions +=
-        "   </Option>"
+    osCreationOptions += "   </Option>";
+
+#if !defined(JPEG_SUPPORTED)
+    if (bHasJPEG2000Drivers)
+#endif
+    {
+        osCreationOptions +=
+            "   <Option name='QUALITY' type='string' "
+            "description='JPEG (10-100) or JPEG2000 quality, possibly as a"
+            "separated list of values for JPEG2000_DRIVER=JP2OPENJPEG' "
+            "default='75'/>";
+    }
+
 #ifdef JPEG_SUPPORTED
-        "   <Option name='QUALITY' type='int' description='JPEG quality "
-        "10-100' default='75'/>"
+    osCreationOptions +=
         "   <Option name='PROGRESSIVE' type='boolean' description='JPEG "
         "progressive mode'/>"
         "   <Option name='RESTART_INTERVAL' type='int' description='Restart "
@@ -7114,11 +7159,25 @@ void NITFDriver::InitCreationOptionList()
     for (unsigned int i = 0;
          i < sizeof(asFieldDescription) / sizeof(asFieldDescription[0]); i++)
     {
-        osCreationOptions += CPLString().Printf(
-            "   <Option name='%s' type='string' description='%s' "
-            "maxsize='%d'/>",
-            asFieldDescription[i].pszName, asFieldDescription[i].pszDescription,
-            asFieldDescription[i].nMaxLen);
+        if (EQUAL(asFieldDescription[i].pszName, "ABPP"))
+        {
+            osCreationOptions +=
+                CPLString().Printf("   <Option name='%s' alias='NBITS' "
+                                   "type='string' description='%s' "
+                                   "maxsize='%d'/>",
+                                   asFieldDescription[i].pszName,
+                                   asFieldDescription[i].pszDescription,
+                                   asFieldDescription[i].nMaxLen);
+        }
+        else
+        {
+            osCreationOptions += CPLString().Printf(
+                "   <Option name='%s' type='string' description='%s' "
+                "maxsize='%d'/>",
+                asFieldDescription[i].pszName,
+                asFieldDescription[i].pszDescription,
+                asFieldDescription[i].nMaxLen);
+        }
     }
 
     osCreationOptions +=
@@ -7160,7 +7219,7 @@ void NITFDriver::InitCreationOptionList()
 void GDALRegister_NITF()
 
 {
-    if (GDALGetDriverByName(DRIVER_NAME) != nullptr)
+    if (GDALGetDriverByName(NITF_DRIVER_NAME) != nullptr)
         return;
 
     GDALDriver *poDriver = new NITFDriver();
@@ -7171,4 +7230,9 @@ void GDALRegister_NITF()
     poDriver->pfnCreateCopy = NITFDataset::NITFCreateCopy;
 
     GetGDALDriverManager()->RegisterDriver(poDriver);
+
+#ifdef NITF_PLUGIN
+    GDALRegister_RPFTOC();
+    GDALRegister_ECRGTOC();
+#endif
 }
diff --git a/frmts/nitf/nitfdataset.h b/frmts/nitf/nitfdataset.h
index 8a020d0068c2..f24b1e00e3ad 100644
--- a/frmts/nitf/nitfdataset.h
+++ b/frmts/nitf/nitfdataset.h
@@ -12,23 +12,7 @@
  * Portions Copyright (c) Her majesty the Queen in right of Canada as
  * represented by the Minister of National Defence, 2006.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef NITF_DATASET_H_INCLUDED
diff --git a/frmts/nitf/nitfdes.c b/frmts/nitf/nitfdes.c
index 1dce51c66156..6c37dd16b953 100644
--- a/frmts/nitf/nitfdes.c
+++ b/frmts/nitf/nitfdes.c
@@ -8,23 +8,7 @@
  **********************************************************************
  * Copyright (c) 2010-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal.h"
diff --git a/frmts/nitf/nitfdrivercore.cpp b/frmts/nitf/nitfdrivercore.cpp
index f3bc71f5c8c2..9fbdeeefdee0 100644
--- a/frmts/nitf/nitfdrivercore.cpp
+++ b/frmts/nitf/nitfdrivercore.cpp
@@ -11,23 +11,7 @@
  * Portions Copyright (c) Her majesty the Queen in right of Canada as
  * represented by the Minister of National Defence, 2006.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "nitfdrivercore.h"
@@ -87,7 +71,7 @@ int NITFDriverIdentify(GDALOpenInfo *poOpenInfo)
 
 void NITFDriverSetCommonMetadata(GDALDriver *poDriver)
 {
-    poDriver->SetDescription(DRIVER_NAME);
+    poDriver->SetDescription(NITF_DRIVER_NAME);
     poDriver->SetMetadataItem(GDAL_DCAP_RASTER, "YES");
     poDriver->SetMetadataItem(GDAL_DMD_LONGNAME,
                               "National Imagery Transmission Format");
@@ -116,6 +100,150 @@ void NITFDriverSetCommonMetadata(GDALDriver *poDriver)
     poDriver->SetMetadataItem(GDAL_DCAP_CREATECOPY, "YES");
 }
 
+/************************************************************************/
+/*                     RPFTOCDriverIdentify()                           */
+/************************************************************************/
+
+int RPFTOCDriverIdentify(GDALOpenInfo *poOpenInfo)
+
+{
+    const char *pszFilename = poOpenInfo->pszFilename;
+
+    /* -------------------------------------------------------------------- */
+    /*      Is this a sub-dataset selector? If so, it is obviously RPFTOC.  */
+    /* -------------------------------------------------------------------- */
+
+    if (STARTS_WITH_CI(pszFilename, "NITF_TOC_ENTRY:"))
+        return TRUE;
+
+    /* -------------------------------------------------------------------- */
+    /*      First we check to see if the file has the expected header       */
+    /*      bytes.                                                          */
+    /* -------------------------------------------------------------------- */
+    if (poOpenInfo->nHeaderBytes < 48)
+        return FALSE;
+
+    if (RPFTOCIsNonNITFFileTOC(poOpenInfo, pszFilename))
+        return TRUE;
+
+    if (!STARTS_WITH_CI((char *)poOpenInfo->pabyHeader, "NITF") &&
+        !STARTS_WITH_CI((char *)poOpenInfo->pabyHeader, "NSIF") &&
+        !STARTS_WITH_CI((char *)poOpenInfo->pabyHeader, "NITF"))
+        return FALSE;
+
+    /* If it is a NITF A.TOC file, it must contain A.TOC in its header */
+    for (int i = 0; i < static_cast<int>(poOpenInfo->nHeaderBytes) -
+                            static_cast<int>(strlen("A.TOC"));
+         i++)
+    {
+        if (STARTS_WITH_CI((const char *)poOpenInfo->pabyHeader + i, "A.TOC"))
+            return TRUE;
+    }
+
+    return FALSE;
+}
+
+/************************************************************************/
+/*                          IsNonNITFFileTOC()                          */
+/************************************************************************/
+
+/* Check whether the file is a TOC file without NITF header */
+int RPFTOCIsNonNITFFileTOC(GDALOpenInfo *poOpenInfo, const char *pszFilename)
+{
+    const char pattern[] = {0,   0,   '0', ' ', ' ', ' ', ' ', ' ',
+                            ' ', ' ', 'A', '.', 'T', 'O', 'C'};
+    if (poOpenInfo)
+    {
+        if (poOpenInfo->nHeaderBytes < 48)
+            return FALSE;
+        return memcmp(pattern, poOpenInfo->pabyHeader, 15) == 0;
+    }
+    else
+    {
+        VSILFILE *fp = VSIFOpenL(pszFilename, "rb");
+        if (fp == nullptr)
+        {
+            return FALSE;
+        }
+
+        char buffer[48];
+        int ret = (VSIFReadL(buffer, 1, 48, fp) == 48) &&
+                  memcmp(pattern, buffer, 15) == 0;
+        CPL_IGNORE_RET_VAL(VSIFCloseL(fp));
+        return ret;
+    }
+}
+
+/************************************************************************/
+/*                     RPFTOCDriverSetCommonMetadata()                  */
+/************************************************************************/
+
+void RPFTOCDriverSetCommonMetadata(GDALDriver *poDriver)
+{
+    poDriver->SetDescription(RPFTOC_DRIVER_NAME);
+    poDriver->SetMetadataItem(GDAL_DCAP_RASTER, "YES");
+    poDriver->SetMetadataItem(GDAL_DMD_LONGNAME,
+                              "Raster Product Format TOC format");
+    poDriver->SetMetadataItem(GDAL_DMD_HELPTOPIC, "drivers/raster/rpftoc.html");
+    poDriver->SetMetadataItem(GDAL_DMD_EXTENSION, "toc");
+    poDriver->SetMetadataItem(GDAL_DCAP_VIRTUALIO, "YES");
+    poDriver->SetMetadataItem(GDAL_DMD_SUBDATASETS, "YES");
+    poDriver->SetMetadataItem(GDAL_DCAP_OPEN, "YES");
+    poDriver->pfnIdentify = RPFTOCDriverIdentify;
+}
+
+/************************************************************************/
+/*                     ECRGTOCDriverIdentify()                          */
+/************************************************************************/
+
+int ECRGTOCDriverIdentify(GDALOpenInfo *poOpenInfo)
+
+{
+    const char *pszFilename = poOpenInfo->pszFilename;
+
+    /* -------------------------------------------------------------------- */
+    /*      Is this a sub-dataset selector? If so, it is obviously ECRGTOC. */
+    /* -------------------------------------------------------------------- */
+    if (STARTS_WITH_CI(pszFilename, "ECRG_TOC_ENTRY:"))
+        return TRUE;
+
+    /* -------------------------------------------------------------------- */
+    /*  First we check to see if the file has the expected header           */
+    /*  bytes.                                                              */
+    /* -------------------------------------------------------------------- */
+    const char *pabyHeader =
+        reinterpret_cast<const char *>(poOpenInfo->pabyHeader);
+    if (pabyHeader == nullptr)
+        return FALSE;
+
+    if (strstr(pabyHeader, "<Table_of_Contents") != nullptr &&
+        strstr(pabyHeader, "<file_header ") != nullptr)
+        return TRUE;
+
+    if (strstr(pabyHeader, "<!DOCTYPE Table_of_Contents [") != nullptr)
+        return TRUE;
+
+    return FALSE;
+}
+
+/************************************************************************/
+/*                     ECRGTOCDriverSetCommonMetadata()                 */
+/************************************************************************/
+
+void ECRGTOCDriverSetCommonMetadata(GDALDriver *poDriver)
+{
+    poDriver->SetDescription(ECRGTOC_DRIVER_NAME);
+    poDriver->SetMetadataItem(GDAL_DCAP_RASTER, "YES");
+    poDriver->SetMetadataItem(GDAL_DMD_LONGNAME, "ECRG TOC format");
+    poDriver->SetMetadataItem(GDAL_DMD_HELPTOPIC,
+                              "drivers/raster/ecrgtoc.html");
+    poDriver->SetMetadataItem(GDAL_DMD_EXTENSION, "xml");
+    poDriver->SetMetadataItem(GDAL_DCAP_VIRTUALIO, "YES");
+    poDriver->SetMetadataItem(GDAL_DMD_SUBDATASETS, "YES");
+    poDriver->SetMetadataItem(GDAL_DCAP_OPEN, "YES");
+    poDriver->pfnIdentify = ECRGTOCDriverIdentify;
+}
+
 /************************************************************************/
 /*                    DeclareDeferredNITFPlugin()                       */
 /************************************************************************/
@@ -123,16 +251,39 @@ void NITFDriverSetCommonMetadata(GDALDriver *poDriver)
 #ifdef PLUGIN_FILENAME
 void DeclareDeferredNITFPlugin()
 {
-    if (GDALGetDriverByName(DRIVER_NAME) != nullptr)
+    if (GDALGetDriverByName(NITF_DRIVER_NAME) != nullptr)
     {
         return;
     }
-    auto poDriver = new GDALPluginDriverProxy(PLUGIN_FILENAME);
+
+    {
+        auto poDriver = new GDALPluginDriverProxy(PLUGIN_FILENAME);
+#ifdef PLUGIN_INSTALLATION_MESSAGE
+        poDriver->SetMetadataItem(GDAL_DMD_PLUGIN_INSTALLATION_MESSAGE,
+                                  PLUGIN_INSTALLATION_MESSAGE);
+#endif
+        NITFDriverSetCommonMetadata(poDriver);
+        GetGDALDriverManager()->DeclareDeferredPluginDriver(poDriver);
+    }
+
+    {
+        auto poDriver = new GDALPluginDriverProxy(PLUGIN_FILENAME);
 #ifdef PLUGIN_INSTALLATION_MESSAGE
-    poDriver->SetMetadataItem(GDAL_DMD_PLUGIN_INSTALLATION_MESSAGE,
-                              PLUGIN_INSTALLATION_MESSAGE);
+        poDriver->SetMetadataItem(GDAL_DMD_PLUGIN_INSTALLATION_MESSAGE,
+                                  PLUGIN_INSTALLATION_MESSAGE);
 #endif
-    NITFDriverSetCommonMetadata(poDriver);
-    GetGDALDriverManager()->DeclareDeferredPluginDriver(poDriver);
+        RPFTOCDriverSetCommonMetadata(poDriver);
+        GetGDALDriverManager()->DeclareDeferredPluginDriver(poDriver);
+    }
+
+    {
+        auto poDriver = new GDALPluginDriverProxy(PLUGIN_FILENAME);
+#ifdef PLUGIN_INSTALLATION_MESSAGE
+        poDriver->SetMetadataItem(GDAL_DMD_PLUGIN_INSTALLATION_MESSAGE,
+                                  PLUGIN_INSTALLATION_MESSAGE);
+#endif
+        ECRGTOCDriverSetCommonMetadata(poDriver);
+        GetGDALDriverManager()->DeclareDeferredPluginDriver(poDriver);
+    }
 }
 #endif
diff --git a/frmts/nitf/nitfdrivercore.h b/frmts/nitf/nitfdrivercore.h
index 5fdd3f481499..4e01f03f2e01 100644
--- a/frmts/nitf/nitfdrivercore.h
+++ b/frmts/nitf/nitfdrivercore.h
@@ -11,23 +11,7 @@
  * Portions Copyright (c) Her majesty the Queen in right of Canada as
  * represented by the Minister of National Defence, 2006.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef NITFDRIVERCORE_H
@@ -35,7 +19,7 @@
 
 #include "gdal_priv.h"
 
-constexpr const char *DRIVER_NAME = "NITF";
+constexpr const char *NITF_DRIVER_NAME = "NITF";
 
 #define NITFDriverIdentify PLUGIN_SYMBOL_NAME(NITFDriverIdentify)
 #define NITFDriverSetCommonMetadata                                            \
@@ -45,4 +29,27 @@ int NITFDriverIdentify(GDALOpenInfo *poOpenInfo);
 
 void NITFDriverSetCommonMetadata(GDALDriver *poDriver);
 
+constexpr const char *RPFTOC_DRIVER_NAME = "RPFTOC";
+
+#define RPFTOCDriverIdentify PLUGIN_SYMBOL_NAME(RPFTOCDriverIdentify)
+#define RPFTOCDriverSetCommonMetadata                                          \
+    PLUGIN_SYMBOL_NAME(RPFTOCDriverSetCommonMetadata)
+#define RPFTOCIsNonNITFFileTOC PLUGIN_SYMBOL_NAME(RPFTOCIsNonNITFFileTOC)
+
+int RPFTOCDriverIdentify(GDALOpenInfo *poOpenInfo);
+
+void RPFTOCDriverSetCommonMetadata(GDALDriver *poDriver);
+
+int RPFTOCIsNonNITFFileTOC(GDALOpenInfo *poOpenInfo, const char *pszFilename);
+
+constexpr const char *ECRGTOC_DRIVER_NAME = "ECRGTOC";
+
+#define ECRGTOCDriverIdentify PLUGIN_SYMBOL_NAME(ECRGTOCDriverIdentify)
+#define ECRGTOCDriverSetCommonMetadata                                         \
+    PLUGIN_SYMBOL_NAME(ECRGTOCDriverSetCommonMetadata)
+
+int ECRGTOCDriverIdentify(GDALOpenInfo *poOpenInfo);
+
+void ECRGTOCDriverSetCommonMetadata(GDALDriver *poDriver);
+
 #endif
diff --git a/frmts/nitf/nitfdump.c b/frmts/nitf/nitfdump.c
index 6d8934490893..99d593ef96d4 100644
--- a/frmts/nitf/nitfdump.c
+++ b/frmts/nitf/nitfdump.c
@@ -9,23 +9,7 @@
  * Copyright (c) 2002, Frank Warmerdam
  * Copyright (c) 2009-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "nitflib.h"
@@ -628,24 +612,26 @@ int main(int nArgc, char **papszArgv)
                 EQUAL(CSLFetchNameValueDef(psDES->papszMetadata, "DESID", ""),
                       "CSSHPA DES"))
             {
-                char szFilename[40];
-                char szRadix[32];
+                char szFilename[512];
+                char szRadix[256];
                 if (bExtractSHPInMem)
-                    snprintf(szRadix, sizeof(szRadix),
-                             "/vsimem/nitf_segment_%d", iSegment + 1);
+                    snprintf(szRadix, sizeof(szRadix), "%s",
+                             VSIMemGenerateHiddenFilename(
+                                 CPLSPrintf("nitf_segment_%d", iSegment + 1)));
                 else
                     snprintf(szRadix, sizeof(szRadix), "nitf_segment_%d",
                              iSegment + 1);
 
                 if (NITFDESExtractShapefile(psDES, szRadix))
                 {
-                    OGRDataSourceH hDS;
+                    GDALDatasetH hDS;
                     snprintf(szFilename, sizeof(szFilename), "%s.SHP", szRadix);
-                    hDS = OGROpen(szFilename, FALSE, NULL);
+                    hDS = GDALOpenEx(szFilename, GDAL_OF_VECTOR, NULL, NULL,
+                                     NULL);
                     if (hDS)
                     {
                         int nGeom = 0;
-                        OGRLayerH hLayer = OGR_DS_GetLayer(hDS, 0);
+                        OGRLayerH hLayer = GDALDatasetGetLayer(hDS, 0);
                         if (hLayer)
                         {
                             OGRFeatureH hFeat;
@@ -667,7 +653,7 @@ int main(int nArgc, char **papszArgv)
                                 OGR_F_Destroy(hFeat);
                             }
                         }
-                        OGR_DS_Destroy(hDS);
+                        GDALClose(hDS);
                     }
                 }
 
diff --git a/frmts/nitf/nitffile.c b/frmts/nitf/nitffile.c
index fceed2cda289..40753c1d55af 100644
--- a/frmts/nitf/nitffile.c
+++ b/frmts/nitf/nitffile.c
@@ -10,23 +10,7 @@
  * Copyright (c) 2002, Frank Warmerdam
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "nitflib.h"
@@ -1056,7 +1040,12 @@ int NITFCreateEx(const char *pszFilename, int nPixels, int nLines, int nBands,
         PLACE(nCur + 349, PVTYPE, pszPVType);
         PLACE(nCur + 352, IREP, pszIREP);
         OVR(8, nCur + 360, ICAT, "VIS");
-        OVR(2, nCur + 368, ABPP, CPLSPrintf("%02d", nBitsPerSample));
+        {
+            const char *pszParamValue = CSLFetchNameValue(papszOptions, "ABPP");
+            PLACE(nCur + 368, ABPP,
+                  CPLSPrintf("%02d", pszParamValue ? atoi(pszParamValue)
+                                                   : nBitsPerSample));
+        }
         OVR(1, nCur + 370, PJUST, "R");
         OVR(1, nCur + 371, ICORDS, " ");
 
@@ -2472,6 +2461,9 @@ static const char *NITFFindValRecursive(char **papszMD, int nMDSize,
             pszLastUnderscore = strrchr(pszMDPrefixShortened, '_');
         }
         CPLFree(pszMDPrefixShortened);
+
+        if (!pszCondVal)
+            pszCondVal = NITFFindValFromEnd(papszMD, nMDSize, pszVar, NULL);
     }
     CPLFree(pszMDItemName);
 
diff --git a/frmts/nitf/nitfimage.c b/frmts/nitf/nitfimage.c
index 185127fc48fd..2ea3abad1eb7 100644
--- a/frmts/nitf/nitfimage.c
+++ b/frmts/nitf/nitfimage.c
@@ -10,23 +10,7 @@
  * Copyright (c) 2002, Frank Warmerdam
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal.h"
@@ -1605,6 +1589,7 @@ int NITFReadImageBlock(NITFImage *psImage, int nBlockX, int nBlockY, int nBand,
     /* -------------------------------------------------------------------- */
     else if (EQUAL(psImage->szIC, "C1") || EQUAL(psImage->szIC, "M1"))
     {
+#ifdef HAVE_TIFF
         GIntBig nSignedRawBytes;
         size_t nRawBytes;
         NITFSegmentInfo *psSegInfo;
@@ -1669,6 +1654,12 @@ int NITFReadImageBlock(NITFImage *psImage, int nBlockX, int nBlockY, int nBand,
             return BLKREAD_OK;
         else
             return BLKREAD_FAIL;
+#else
+        CPLError(CE_Failure, CPLE_NotSupported,
+                 "BILEVEL compression not supported because of lack of "
+                 "TIFF support");
+        return BLKREAD_FAIL;
+#endif
     }
 
     /* -------------------------------------------------------------------- */
@@ -3847,7 +3838,7 @@ static void NITFLoadLocationTable(NITFImage *psImage)
     GUInt32 nHeaderOffset = 0;
     int i;
     int nTRESize;
-    char szTempFileName[32];
+    char szTempFileName[256];
     VSILFILE *fpTemp;
 
     pszTRE =
@@ -3855,7 +3846,8 @@ static void NITFLoadLocationTable(NITFImage *psImage)
     if (pszTRE == NULL)
         return;
 
-    snprintf(szTempFileName, sizeof(szTempFileName), "/vsimem/%p", pszTRE);
+    snprintf(szTempFileName, sizeof(szTempFileName), "%s",
+             VSIMemGenerateHiddenFilename("nitf_tre"));
     fpTemp =
         VSIFileFromMemBuffer(szTempFileName, (GByte *)pszTRE, nTRESize, FALSE);
     psImage->pasLocations =
diff --git a/frmts/nitf/nitflib.h b/frmts/nitf/nitflib.h
index d4cf5ebdfdde..60cce7b2e72f 100644
--- a/frmts/nitf/nitflib.h
+++ b/frmts/nitf/nitflib.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2002, Frank Warmerdam
  * Copyright (c) 2007-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef NITFLIB_H_INCLUDED
@@ -66,7 +50,7 @@ typedef struct
     int nCCS_C;
 } NITFSegmentInfo;
 
-typedef struct
+typedef struct NITFFile
 {
     VSILFILE *fp;
 
diff --git a/frmts/nitf/nitfrasterband.cpp b/frmts/nitf/nitfrasterband.cpp
index 9391871d2210..e03543cefd7e 100644
--- a/frmts/nitf/nitfrasterband.cpp
+++ b/frmts/nitf/nitfrasterband.cpp
@@ -11,23 +11,7 @@
  * Portions Copyright (c) Her majesty the Queen in right of Canada as
  * represented by the Minister of National Defence, 2006.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -459,12 +443,12 @@ NITFRasterBand::NITFRasterBand(NITFDataset *poDSIn, int nBandIn)
     /* -------------------------------------------------------------------- */
     poColorTable = NITFMakeColorTable(psImage, psBandInfo);
 
-    if (psImage->nBitsPerSample == 1 || psImage->nBitsPerSample == 3 ||
-        psImage->nBitsPerSample == 5 || psImage->nBitsPerSample == 6 ||
-        psImage->nBitsPerSample == 7 || psImage->nBitsPerSample == 12)
-        SetMetadataItem("NBITS",
-                        CPLString().Printf("%d", psImage->nBitsPerSample),
+    if (psImage->nABPP != 8 && psImage->nABPP != 16 && psImage->nABPP != 32 &&
+        psImage->nABPP != 64)
+    {
+        SetMetadataItem("NBITS", CPLString().Printf("%d", psImage->nABPP),
                         "IMAGE_STRUCTURE");
+    }
 
     if (psImage->nBitsPerSample == 3 || psImage->nBitsPerSample == 5 ||
         psImage->nBitsPerSample == 6 || psImage->nBitsPerSample == 7)
diff --git a/frmts/nitf/nitfwritejpeg.cpp b/frmts/nitf/nitfwritejpeg.cpp
index ab4053a4edb0..2a70c522d4f7 100644
--- a/frmts/nitf/nitfwritejpeg.cpp
+++ b/frmts/nitf/nitfwritejpeg.cpp
@@ -11,23 +11,7 @@
  * Portions Copyright (c) Her majesty the Queen in right of Canada as
  * represented by the Minister of National Defence, 2006.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifdef JPEG_SUPPORTED
@@ -218,7 +202,7 @@ int NITFWriteJPEGBlock(GDALDataset *poSrcDS, VSILFILE *fp, int nBlockXOff,
     const int nXSize = poSrcDS->GetRasterXSize();
     const int nYSize = poSrcDS->GetRasterYSize();
 
-    const double nTotalPixels = static_cast<double>(nXSize * nYSize);
+    const double nTotalPixels = static_cast<double>(nXSize) * nYSize;
 
     int nBlockXSizeToRead = nBlockXSize;
     if (nBlockXSize * nBlockXOff + nBlockXSize > nXSize)
@@ -248,22 +232,38 @@ int NITFWriteJPEGBlock(GDALDataset *poSrcDS, VSILFILE *fp, int nBlockXOff,
                 static_cast<GSpacing>(nBands) * nWorkDTSize * nBlockXSize,
                 nWorkDTSize, nullptr);
 
-#if !defined(JPEG_LIB_MK1_OR_12BIT)
             /* Repeat the last pixel till the end of the line */
             /* to minimize discontinuity */
             if (nBlockXSizeToRead < nBlockXSize)
             {
                 for (int iBand = 0; iBand < nBands; iBand++)
                 {
-                    GByte bVal =
-                        pabyScanline[nBands * (nBlockXSizeToRead - 1) + iBand];
-                    for (int iX = nBlockXSizeToRead; iX < nBlockXSize; iX++)
+#if defined(JPEG_LIB_MK1_OR_12BIT)
+                    if (eWorkDT == GDT_UInt16)
                     {
-                        pabyScanline[nBands * iX + iBand] = bVal;
+                        GUInt16 *panScanline =
+                            reinterpret_cast<GUInt16 *>(pabyScanline);
+                        const GUInt16 nVal =
+                            panScanline[nBands * (nBlockXSizeToRead - 1) +
+                                        iBand];
+                        for (int iX = nBlockXSizeToRead; iX < nBlockXSize; iX++)
+                        {
+                            panScanline[nBands * iX + iBand] = nVal;
+                        }
+                    }
+                    else
+#endif
+                    {
+                        GByte bVal =
+                            pabyScanline[nBands * (nBlockXSizeToRead - 1) +
+                                         iBand];
+                        for (int iX = nBlockXSizeToRead; iX < nBlockXSize; iX++)
+                        {
+                            pabyScanline[nBands * iX + iBand] = bVal;
+                        }
                     }
                 }
             }
-#endif
         }
 
 #if defined(JPEG_LIB_MK1_OR_12BIT)
@@ -272,7 +272,7 @@ int NITFWriteJPEGBlock(GDALDataset *poSrcDS, VSILFILE *fp, int nBlockXOff,
         {
             GUInt16 *panScanline = reinterpret_cast<GUInt16 *>(pabyScanline);
 
-            for (int iPixel = 0; iPixel < nXSize * nBands; iPixel++)
+            for (int iPixel = 0; iPixel < nBlockXSize * nBands; iPixel++)
             {
                 if (panScanline[iPixel] > 4095)
                 {
diff --git a/frmts/nitf/rpftocdataset.cpp b/frmts/nitf/rpftocdataset.cpp
index 6f2bd3340631..e762bde31187 100644
--- a/frmts/nitf/rpftocdataset.cpp
+++ b/frmts/nitf/rpftocdataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2007-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -46,6 +30,7 @@
 #include "ogr_spatialref.h"
 #include "nitflib.h"
 #include "vrtdataset.h"
+#include "nitfdrivercore.h"
 
 constexpr int GEOTRSFRM_TOPLEFT_X = 0;
 constexpr int GEOTRSFRM_WE_RES = 1;
@@ -140,13 +125,10 @@ class RPFTOCDataset final : public GDALPamDataset
     }
 
     static int IsNITFFileTOC(NITFFile *psFile);
-    static int IsNonNITFFileTOC(GDALOpenInfo *poOpenInfo,
-                                const char *pszFilename);
     static GDALDataset *OpenFileTOC(NITFFile *psFile, const char *pszFilename,
                                     const char *entryName,
                                     const char *openInformationName);
 
-    static int Identify(GDALOpenInfo *poOpenInfo);
     static GDALDataset *Open(GDALOpenInfo *poOpenInfo);
 };
 
@@ -1076,38 +1058,6 @@ GDALDataset *RPFTOCSubDataset::CreateDataSetFromTocEntry(
     return poVirtualDS;
 }
 
-/************************************************************************/
-/*                          IsNonNITFFileTOC()                          */
-/************************************************************************/
-
-/* Check whether the file is a TOC file without NITF header */
-int RPFTOCDataset::IsNonNITFFileTOC(GDALOpenInfo *poOpenInfo,
-                                    const char *pszFilename)
-{
-    const char pattern[] = {0,   0,   '0', ' ', ' ', ' ', ' ', ' ',
-                            ' ', ' ', 'A', '.', 'T', 'O', 'C'};
-    if (poOpenInfo)
-    {
-        if (poOpenInfo->nHeaderBytes < 48)
-            return FALSE;
-        return memcmp(pattern, poOpenInfo->pabyHeader, 15) == 0;
-    }
-    else
-    {
-        VSILFILE *fp = VSIFOpenL(pszFilename, "rb");
-        if (fp == nullptr)
-        {
-            return FALSE;
-        }
-
-        char buffer[48];
-        int ret = (VSIFReadL(buffer, 1, 48, fp) == 48) &&
-                  memcmp(pattern, buffer, 15) == 0;
-        CPL_IGNORE_RET_VAL(VSIFCloseL(fp));
-        return ret;
-    }
-}
-
 /************************************************************************/
 /*                             IsNITFFileTOC()                          */
 /************************************************************************/
@@ -1294,49 +1244,6 @@ GDALDataset *RPFTOCDataset::OpenFileTOC(NITFFile *psFile,
     return nullptr;
 }
 
-/************************************************************************/
-/*                              Identify()                              */
-/************************************************************************/
-
-int RPFTOCDataset::Identify(GDALOpenInfo *poOpenInfo)
-
-{
-    const char *pszFilename = poOpenInfo->pszFilename;
-
-    /* -------------------------------------------------------------------- */
-    /*      Is this a sub-dataset selector? If so, it is obviously RPFTOC.  */
-    /* -------------------------------------------------------------------- */
-
-    if (STARTS_WITH_CI(pszFilename, "NITF_TOC_ENTRY:"))
-        return TRUE;
-
-    /* -------------------------------------------------------------------- */
-    /*      First we check to see if the file has the expected header       */
-    /*      bytes.                                                          */
-    /* -------------------------------------------------------------------- */
-    if (poOpenInfo->nHeaderBytes < 48)
-        return FALSE;
-
-    if (IsNonNITFFileTOC(poOpenInfo, pszFilename))
-        return TRUE;
-
-    if (!STARTS_WITH_CI((char *)poOpenInfo->pabyHeader, "NITF") &&
-        !STARTS_WITH_CI((char *)poOpenInfo->pabyHeader, "NSIF") &&
-        !STARTS_WITH_CI((char *)poOpenInfo->pabyHeader, "NITF"))
-        return FALSE;
-
-    /* If it is a NITF A.TOC file, it must contain A.TOC in its header */
-    for (int i = 0; i < static_cast<int>(poOpenInfo->nHeaderBytes) -
-                            static_cast<int>(strlen("A.TOC"));
-         i++)
-    {
-        if (STARTS_WITH_CI((const char *)poOpenInfo->pabyHeader + i, "A.TOC"))
-            return TRUE;
-    }
-
-    return FALSE;
-}
-
 /************************************************************************/
 /*                                Open()                                */
 /************************************************************************/
@@ -1344,7 +1251,7 @@ int RPFTOCDataset::Identify(GDALOpenInfo *poOpenInfo)
 GDALDataset *RPFTOCDataset::Open(GDALOpenInfo *poOpenInfo)
 
 {
-    if (!Identify(poOpenInfo))
+    if (!RPFTOCDriverIdentify(poOpenInfo))
         return nullptr;
 
     const char *pszFilename = poOpenInfo->pszFilename;
@@ -1369,8 +1276,8 @@ GDALDataset *RPFTOCDataset::Open(GDALOpenInfo *poOpenInfo)
         pszFilename++;
     }
 
-    if (IsNonNITFFileTOC((entryName != nullptr) ? nullptr : poOpenInfo,
-                         pszFilename))
+    if (RPFTOCIsNonNITFFileTOC((entryName != nullptr) ? nullptr : poOpenInfo,
+                               pszFilename))
     {
         GDALDataset *poDS = OpenFileTOC(nullptr, pszFilename, entryName,
                                         poOpenInfo->pszFilename);
@@ -1435,23 +1342,13 @@ GDALDataset *RPFTOCDataset::Open(GDALOpenInfo *poOpenInfo)
 void GDALRegister_RPFTOC()
 
 {
-    if (GDALGetDriverByName("RPFTOC") != nullptr)
+    if (GDALGetDriverByName(RPFTOC_DRIVER_NAME) != nullptr)
         return;
 
     GDALDriver *poDriver = new GDALDriver();
+    RPFTOCDriverSetCommonMetadata(poDriver);
 
-    poDriver->SetDescription("RPFTOC");
-    poDriver->SetMetadataItem(GDAL_DCAP_RASTER, "YES");
-    poDriver->SetMetadataItem(GDAL_DMD_LONGNAME,
-                              "Raster Product Format TOC format");
-
-    poDriver->pfnIdentify = RPFTOCDataset::Identify;
     poDriver->pfnOpen = RPFTOCDataset::Open;
 
-    poDriver->SetMetadataItem(GDAL_DMD_HELPTOPIC, "drivers/raster/rpftoc.html");
-    poDriver->SetMetadataItem(GDAL_DMD_EXTENSION, "toc");
-    poDriver->SetMetadataItem(GDAL_DCAP_VIRTUALIO, "YES");
-    poDriver->SetMetadataItem(GDAL_DMD_SUBDATASETS, "YES");
-
     GetGDALDriverManager()->RegisterDriver(poDriver);
 }
diff --git a/frmts/nitf/rpftocfile.cpp b/frmts/nitf/rpftocfile.cpp
index 4abe10da8588..d3ca6b2f0718 100644
--- a/frmts/nitf/rpftocfile.cpp
+++ b/frmts/nitf/rpftocfile.cpp
@@ -8,23 +8,7 @@
  **********************************************************************
  * Copyright (c) 2007-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 /* Portions of code are placed under the following copyright : */
@@ -47,6 +31,7 @@
 #include "rpftoclib.h"
 
 #include <climits>
+#include <cmath>
 #include <cstring>
 #if HAVE_FCNTL_H
 #include <fcntl.h>
@@ -320,9 +305,9 @@ RPFToc *RPFTOCReadFromBuffer(const char *pszFilename, VSILFILE *fp,
 
         // do some basic plausibility checks for all entries
         if (toc->entries[i].vertInterval <= 1e-10 ||
-            !CPLIsFinite(toc->entries[i].vertInterval) ||
+            !std::isfinite(toc->entries[i].vertInterval) ||
             toc->entries[i].horizInterval <= 1e-10 ||
-            !CPLIsFinite(toc->entries[i].horizInterval) ||
+            !std::isfinite(toc->entries[i].horizInterval) ||
             toc->entries[i].nHorizFrames == 0 ||
             toc->entries[i].nVertFrames == 0 ||
             toc->entries[i].nHorizFrames >
diff --git a/frmts/nitf/rpftoclib.h b/frmts/nitf/rpftoclib.h
index ad3df32d4ee4..392929d7f2f4 100644
--- a/frmts/nitf/rpftoclib.h
+++ b/frmts/nitf/rpftoclib.h
@@ -8,23 +8,7 @@
  **********************************************************************
  * Copyright (c) 2007-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef RPFTOCLIB_H_INCLUDED
diff --git a/frmts/northwood/CMakeLists.txt b/frmts/northwood/CMakeLists.txt
index 5d89d7d9d6c7..1e5e23fc6d3c 100644
--- a/frmts/northwood/CMakeLists.txt
+++ b/frmts/northwood/CMakeLists.txt
@@ -5,3 +5,7 @@ add_gdal_driver(
   SOURCES grddataset.cpp grcdataset.cpp northwood.cpp northwood.h
   BUILTIN STRONG_CXX_WFLAGS)
 gdal_standard_includes(gdal_northwood)
+
+if (NOT OGR_ENABLE_DRIVER_TAB OR OGR_ENABLE_DRIVER_TAB_PLUGIN)
+  target_compile_definitions(gdal_northwood PRIVATE -DNO_MITAB_SUPPORT)
+endif()
diff --git a/frmts/northwood/grcdataset.cpp b/frmts/northwood/grcdataset.cpp
index 27b0008da439..e7a6c4b378d6 100644
--- a/frmts/northwood/grcdataset.cpp
+++ b/frmts/northwood/grcdataset.cpp
@@ -8,34 +8,13 @@
  * Copyright (c) 2007, Waypoint Information Technology
  * Copyright (c) 2009-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_frmts.h"
 #include "gdal_pam.h"
 #include "northwood.h"
-
-#ifdef MSVC
-#include "..\..\ogr\ogrsf_frmts\mitab\mitab.h"
-#else
-#include "../../ogr/ogrsf_frmts/mitab/mitab.h"
-#endif
+#include "ogrmitabspatialref.h"
 
 /************************************************************************/
 /* ==================================================================== */
diff --git a/frmts/northwood/grddataset.cpp b/frmts/northwood/grddataset.cpp
index 44249cb174f1..2c48e99eaf29 100644
--- a/frmts/northwood/grddataset.cpp
+++ b/frmts/northwood/grddataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2006, Waypoint Information Technology
  * Copyright (c) 2009-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <string>
@@ -34,12 +18,15 @@
 #include "gdal_frmts.h"
 #include "gdal_pam.h"
 #include "northwood.h"
+#include "ogrmitabspatialref.h"
 
+#ifndef NO_MITAB_SUPPORT
 #ifdef MSVC
 #include "..\..\ogr\ogrsf_frmts\mitab\mitab.h"
 #else
 #include "../../ogr/ogrsf_frmts/mitab/mitab.h"
 #endif
+#endif
 
 constexpr float NODATA = -1.e37f;
 constexpr double SCALE16BIT = 65534.0;
@@ -79,9 +66,11 @@ class NWT_GRDDataset final : public GDALPamDataset
     bool bUpdateHeader;
     mutable OGRSpatialReference *m_poSRS = nullptr;
 
+#ifndef NO_MITAB_SUPPORT
     // Update the header data with latest changes
     int UpdateHeader();
     int WriteTab();
+#endif
 
     NWT_GRDDataset(const NWT_GRDDataset &) = delete;
     NWT_GRDDataset &operator=(const NWT_GRDDataset &) = delete;
@@ -92,6 +81,8 @@ class NWT_GRDDataset final : public GDALPamDataset
 
     static GDALDataset *Open(GDALOpenInfo *);
     static int Identify(GDALOpenInfo *);
+
+#ifndef NO_MITAB_SUPPORT
     static GDALDataset *Create(const char *pszFilename, int nXSize, int nYSize,
                                int nBandsIn, GDALDataType eType,
                                char **papszParamList);
@@ -100,13 +91,17 @@ class NWT_GRDDataset final : public GDALPamDataset
                                    char **papszOptions,
                                    GDALProgressFunc pfnProgress,
                                    void *pProgressData);
+#endif
 
     CPLErr GetGeoTransform(double *padfTransform) override;
     CPLErr SetGeoTransform(double *padfTransform) override;
     CPLErr FlushCache(bool bAtClosing) override;
 
     const OGRSpatialReference *GetSpatialRef() const override;
+
+#ifndef NO_MITAB_SUPPORT
     CPLErr SetSpatialRef(const OGRSpatialReference *poSRS) override;
+#endif
 };
 
 /************************************************************************/
@@ -468,7 +463,9 @@ CPLErr NWT_GRDDataset::FlushCache(bool bAtClosing)
     // Ensure the header and TAB file are up to date
     if (bUpdateHeader)
     {
+#ifndef NO_MITAB_SUPPORT
         UpdateHeader();
+#endif
     }
 
     // Call the parent method
@@ -540,9 +537,11 @@ const OGRSpatialReference *NWT_GRDDataset::GetSpatialRef() const
     OGRSpatialReference *poSpatialRef =
         MITABCoordSys2SpatialRef(pGrd->cMICoordSys);
     m_poSRS = poSpatialRef;
+
     return m_poSRS;
 }
 
+#ifndef NO_MITAB_SUPPORT
 /************************************************************************/
 /*                            SetSpatialRef()                           */
 /************************************************************************/
@@ -563,6 +562,7 @@ CPLErr NWT_GRDDataset::SetSpatialRef(const OGRSpatialReference *poSRS)
 
     return CE_None;
 }
+#endif
 
 /************************************************************************/
 /*                              Identify()                              */
@@ -671,6 +671,7 @@ GDALDataset *NWT_GRDDataset::Open(GDALOpenInfo *poOpenInfo)
     return poDS;
 }
 
+#ifndef NO_MITAB_SUPPORT
 /************************************************************************/
 /*                                UpdateHeader()                        */
 /************************************************************************/
@@ -1124,6 +1125,7 @@ GDALDataset *NWT_GRDDataset::CreateCopy(const char *pszFilename,
 
     return poDstDS;
 }
+#endif  // NO_MITAB_SUPPORT
 
 /************************************************************************/
 /*                          GDALRegister_GRD()                          */
@@ -1142,7 +1144,6 @@ void GDALRegister_NWT_GRD()
     poDriver->SetMetadataItem(GDAL_DMD_HELPTOPIC, "drivers/raster/nwtgrd.html");
     poDriver->SetMetadataItem(GDAL_DMD_EXTENSION, "grd");
     poDriver->SetMetadataItem(GDAL_DCAP_VIRTUALIO, "YES");
-    poDriver->SetMetadataItem(GDAL_DMD_CREATIONDATATYPES, "Float32");
 
     poDriver->SetMetadataItem(
         GDAL_DMD_OPENOPTIONLIST,
@@ -1151,6 +1152,12 @@ void GDALRegister_NWT_GRD()
         "(RGBZ). Only used in read-only mode' default='4'/>"
         "</OpenOptionList>");
 
+    poDriver->pfnOpen = NWT_GRDDataset::Open;
+    poDriver->pfnIdentify = NWT_GRDDataset::Identify;
+
+#ifndef NO_MITAB_SUPPORT
+
+    poDriver->SetMetadataItem(GDAL_DMD_CREATIONDATATYPES, "Float32");
     poDriver->SetMetadataItem(
         GDAL_DMD_CREATIONOPTIONLIST,
         "<CreationOptionList>"
@@ -1172,10 +1179,9 @@ void GDALRegister_NWT_GRD()
         "MapInfo' default='0'/>"
         "</CreationOptionList>");
 
-    poDriver->pfnOpen = NWT_GRDDataset::Open;
-    poDriver->pfnIdentify = NWT_GRDDataset::Identify;
     poDriver->pfnCreate = NWT_GRDDataset::Create;
     poDriver->pfnCreateCopy = NWT_GRDDataset::CreateCopy;
+#endif
 
     GetGDALDriverManager()->RegisterDriver(poDriver);
 }
diff --git a/frmts/northwood/northwood.cpp b/frmts/northwood/northwood.cpp
index 1917e154f2fd..12cac62e8e89 100644
--- a/frmts/northwood/northwood.cpp
+++ b/frmts/northwood/northwood.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2007, Waypoint Information Technology
  * Copyright (c) 2009-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_pam.h"
@@ -32,6 +16,7 @@
 #include "northwood.h"
 
 #include <algorithm>
+#include <cassert>
 #include <limits>
 #include <string>
 
@@ -79,6 +64,7 @@ int nwt_ParseHeader(NWT_GRID *pGrd, const unsigned char *nwtHeader)
     memcpy(&pGrd->dfMaxY, &nwtHeader[37], sizeof(pGrd->dfMaxY));
     CPL_LSBPTR64(&pGrd->dfMaxY);
 
+    assert(pGrd->nXSide > 1);
     pGrd->dfStepSize = (pGrd->dfMaxX - pGrd->dfMinX) / (pGrd->nXSide - 1);
     /* dfTmp = (pGrd->dfMaxY - pGrd->dfMinY) / (pGrd->nYSide - 1); */
 
diff --git a/frmts/northwood/northwood.h b/frmts/northwood/northwood.h
index 6aeab6dcec14..d6a10466f1d1 100644
--- a/frmts/northwood/northwood.h
+++ b/frmts/northwood/northwood.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2007, Waypoint Information Technology
  * Copyright (c) 2009-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef NORTHWOOD_H_INCLUDED
diff --git a/frmts/null/nulldataset.cpp b/frmts/null/nulldataset.cpp
index da5828e8015d..690fb0163fc5 100644
--- a/frmts/null/nulldataset.cpp
+++ b/frmts/null/nulldataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2012-2017, Even Rouault, <even dot rouault at spatialys dot
  *org>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_priv.h"
diff --git a/frmts/ogcapi/CMakeLists.txt b/frmts/ogcapi/CMakeLists.txt
index c6300dd3167c..864520f22614 100644
--- a/frmts/ogcapi/CMakeLists.txt
+++ b/frmts/ogcapi/CMakeLists.txt
@@ -1,9 +1,3 @@
 add_gdal_driver(TARGET gdal_OGCAPI SOURCES gdalogcapidataset.cpp PLUGIN_CAPABLE NO_DEPS)
 gdal_standard_includes(gdal_OGCAPI)
-if(NOT DEFINED OGR_ENABLE_DRIVER_GML)
-    message(FATAL_ERROR "OGR_ENABLE_DRIVER_GML is not defined")
-endif()
-if(OGR_ENABLE_DRIVER_GML)
-    target_include_directories(gdal_OGCAPI PRIVATE ${GDAL_VECTOR_FORMAT_SOURCE_DIR}/gml)
-    target_compile_definitions(gdal_OGCAPI PRIVATE -DOGR_ENABLE_DRIVER_GML)
-endif()
+target_include_directories(gdal_OGCAPI PRIVATE ${GDAL_VECTOR_FORMAT_SOURCE_DIR}/gmlutils)
diff --git a/frmts/ogcapi/gdalogcapidataset.cpp b/frmts/ogcapi/gdalogcapidataset.cpp
index 6ae821e623b1..d532c5476325 100644
--- a/frmts/ogcapi/gdalogcapidataset.cpp
+++ b/frmts/ogcapi/gdalogcapidataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2020, Even Rouault, <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_error.h"
@@ -35,9 +19,7 @@
 #include "ogrsf_frmts.h"
 #include "ogr_spatialref.h"
 
-#ifdef OGR_ENABLE_DRIVER_GML
 #include "parsexsd.h"
-#endif
 
 #include <algorithm>
 #include <memory>
@@ -511,10 +493,15 @@ bool OGCAPIDataset::Download(const CPLString &osURL, const char *pszPostContent,
 
     if (psResult->pszErrBuf != nullptr)
     {
-        CPLError(CE_Failure, CPLE_AppDefined, "%s",
-                 psResult->pabyData
-                     ? reinterpret_cast<const char *>(psResult->pabyData)
-                     : psResult->pszErrBuf);
+        std::string osErrorMsg(psResult->pszErrBuf);
+        const char *pszData =
+            reinterpret_cast<const char *>(psResult->pabyData);
+        if (pszData)
+        {
+            osErrorMsg += ", ";
+            osErrorMsg.append(pszData, CPLStrnlen(pszData, 1000));
+        }
+        CPLError(CE_Failure, CPLE_AppDefined, "%s", osErrorMsg.c_str());
         CPLHTTPDestroyResult(psResult);
         return false;
     }
@@ -633,8 +620,7 @@ OGCAPIDataset::OpenTile(const CPLString &osURLPattern, int nMatrix, int nColumn,
     if (bEmptyContent)
         return nullptr;
 
-    CPLString osTempFile;
-    osTempFile.Printf("/vsimem/ogcapi/%p", this);
+    const CPLString osTempFile(VSIMemGenerateHiddenFilename("ogcapi"));
     VSIFCloseL(VSIFileFromMemBuffer(osTempFile.c_str(),
                                     reinterpret_cast<GByte *>(&m_osTileData[0]),
                                     m_osTileData.size(), false));
@@ -664,6 +650,10 @@ int OGCAPIDataset::Identify(GDALOpenInfo *poOpenInfo)
         return TRUE;
     if (EQUAL(CPLGetExtension(poOpenInfo->pszFilename), "moaw"))
         return TRUE;
+    if (poOpenInfo->IsSingleAllowedDriver("OGCAPI"))
+    {
+        return TRUE;
+    }
     return FALSE;
 }
 
@@ -828,16 +818,16 @@ bool OGCAPIDataset::InitFromCollection(GDALOpenInfo *poOpenInfo,
         CSLFetchNameValue(poOpenInfo->papszOpenOptions, "MINX") == nullptr;
     const double dfXMin =
         CPLAtof(CSLFetchNameValueDef(poOpenInfo->papszOpenOptions, "MINX",
-                                     CPLSPrintf("%.18g", oBbox[0].ToDouble())));
+                                     CPLSPrintf("%.17g", oBbox[0].ToDouble())));
     const double dfYMin =
         CPLAtof(CSLFetchNameValueDef(poOpenInfo->papszOpenOptions, "MINY",
-                                     CPLSPrintf("%.18g", oBbox[1].ToDouble())));
+                                     CPLSPrintf("%.17g", oBbox[1].ToDouble())));
     const double dfXMax =
         CPLAtof(CSLFetchNameValueDef(poOpenInfo->papszOpenOptions, "MAXX",
-                                     CPLSPrintf("%.18g", oBbox[2].ToDouble())));
+                                     CPLSPrintf("%.17g", oBbox[2].ToDouble())));
     const double dfYMax =
         CPLAtof(CSLFetchNameValueDef(poOpenInfo->papszOpenOptions, "MAXY",
-                                     CPLSPrintf("%.18g", oBbox[3].ToDouble())));
+                                     CPLSPrintf("%.17g", oBbox[3].ToDouble())));
 
     auto oScaleDenominator = oRoot["scaleDenominator"];
 
@@ -999,9 +989,12 @@ bool OGCAPIDataset::InitFromCollection(GDALOpenInfo *poOpenInfo,
 
 bool OGCAPIDataset::InitFromURL(GDALOpenInfo *poOpenInfo)
 {
-    CPLAssert(STARTS_WITH_CI(poOpenInfo->pszFilename, "OGCAPI:"));
+    const char *pszInitialURL =
+        STARTS_WITH_CI(poOpenInfo->pszFilename, "OGCAPI:")
+            ? poOpenInfo->pszFilename + strlen("OGCAPI:")
+            : poOpenInfo->pszFilename;
     CPLJSONDocument oDoc;
-    CPLString osURL(poOpenInfo->pszFilename + strlen("OGCAPI:"));
+    CPLString osURL(pszInitialURL);
     if (!DownloadJSon(osURL, oDoc))
         return false;
 
@@ -1156,9 +1149,12 @@ SelectImageURL(const char *const *papszOptionOptions,
         }
     }
 
-    CPLError(CE_Failure, CPLE_AppDefined,
-             "Server does not support specified IMAGE_FORMAT: %s",
-             osFormat.c_str());
+    if (osFormat != "AUTO")
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Server does not support specified IMAGE_FORMAT: %s",
+                 osFormat.c_str());
+    }
     return std::pair<std::string, CPLString>();
 }
 
@@ -1250,10 +1246,10 @@ bool OGCAPIDataset::InitWithMapAPI(GDALOpenInfo *poOpenInfo,
                      "        <ServerUrl>%s</ServerUrl>"
                      "    </Service>"
                      "    <DataWindow>"
-                     "        <UpperLeftX>%.18g</UpperLeftX>"
-                     "        <UpperLeftY>%.18g</UpperLeftY>"
-                     "        <LowerRightX>%.18g</LowerRightX>"
-                     "        <LowerRightY>%.18g</LowerRightY>"
+                     "        <UpperLeftX>%.17g</UpperLeftX>"
+                     "        <UpperLeftY>%.17g</UpperLeftY>"
+                     "        <LowerRightX>%.17g</LowerRightX>"
+                     "        <LowerRightY>%.17g</LowerRightY>"
                      "        <SizeX>%d</SizeX>"
                      "        <SizeY>%d</SizeY>"
                      "    </DataWindow>"
@@ -1342,8 +1338,16 @@ bool OGCAPIDataset::InitWithCoverageAPI(GDALOpenInfo *poOpenInfo,
         if (oField.IsValid())
         {
             l_nBands = oField.Size();
-            const auto osDefinition = oField[0].GetString("definition");
-            static const std::map<CPLString, GDALDataType> oMapTypes = {
+            // Such as in https://maps.gnosis.earth/ogcapi/collections/NaturalEarth:raster:HYP_HR_SR_OB_DR/coverage/rangetype?f=json
+            // https://github.com/opengeospatial/coverage-implementation-schema/blob/main/standard/schemas/1.1/json/examples/generalGrid/2D_regular.json
+            std::string osDataType =
+                oField[0].GetString("encodingInfo/dataType");
+            if (osDataType.empty())
+            {
+                // Older way?
+                osDataType = oField[0].GetString("definition");
+            }
+            static const std::map<std::string, GDALDataType> oMapTypes = {
                 // https://edc-oapi.dev.hub.eox.at/oapi/collections/S2L2A
                 {"UINT8", GDT_Byte},
                 {"INT16", GDT_Int16},
@@ -1365,8 +1369,8 @@ bool OGCAPIDataset::InitWithCoverageAPI(GDALOpenInfo *poOpenInfo,
             // 08-094r1_SWE_Common_Data_Model_2.0_Submission_Package.pdf page
             // 112
             auto oIter = oMapTypes.find(
-                CPLString(osDefinition)
-                    .replaceAll("http://www.opengis.net/ def/dataType/OGC/0/",
+                CPLString(osDataType)
+                    .replaceAll("http://www.opengis.net/def/dataType/OGC/0/",
                                 "ogcType:"));
             if (oIter != oMapTypes.end())
             {
@@ -1374,8 +1378,8 @@ bool OGCAPIDataset::InitWithCoverageAPI(GDALOpenInfo *poOpenInfo,
             }
             else
             {
-                CPLDebug("OGCAPI", "Unhandled field definition: %s",
-                         osDefinition.c_str());
+                CPLDebug("OGCAPI", "Unhandled data type: %s",
+                         osDataType.c_str());
             }
         }
     }
@@ -1513,10 +1517,10 @@ bool OGCAPIDataset::InitWithCoverageAPI(GDALOpenInfo *poOpenInfo,
                      "        <ServerUrl>%s</ServerUrl>"
                      "    </Service>"
                      "    <DataWindow>"
-                     "        <UpperLeftX>%.18g</UpperLeftX>"
-                     "        <UpperLeftY>%.18g</UpperLeftY>"
-                     "        <LowerRightX>%.18g</LowerRightX>"
-                     "        <LowerRightY>%.18g</LowerRightY>"
+                     "        <UpperLeftX>%.17g</UpperLeftX>"
+                     "        <UpperLeftY>%.17g</UpperLeftY>"
+                     "        <LowerRightX>%.17g</LowerRightX>"
+                     "        <LowerRightY>%.17g</LowerRightY>"
                      "        <SizeX>%d</SizeX>"
                      "        <SizeY>%d</SizeY>"
                      "    </DataWindow>"
@@ -1627,7 +1631,6 @@ GDALColorInterp OGCAPIMapWrapperBand::GetColorInterpretation()
 /*                           ParseXMLSchema()                           */
 /************************************************************************/
 
-#ifdef OGR_ENABLE_DRIVER_GML
 static bool
 ParseXMLSchema(const std::string &osURL,
                std::vector<std::unique_ptr<OGRFieldDefn>> &apoFields,
@@ -1637,7 +1640,9 @@ ParseXMLSchema(const std::string &osURL,
 
     std::vector<GMLFeatureClass *> apoClasses;
     bool bFullyUnderstood = false;
-    bool bHaveSchema = GMLParseXSD(osURL.c_str(), apoClasses, bFullyUnderstood);
+    bool bUseSchemaImports = false;
+    bool bHaveSchema = GMLParseXSD(osURL.c_str(), bUseSchemaImports, apoClasses,
+                                   bFullyUnderstood);
     if (bHaveSchema && apoClasses.size() == 1)
     {
         auto poGMLFeatureClass = apoClasses[0];
@@ -1670,7 +1675,6 @@ ParseXMLSchema(const std::string &osURL,
 
     return false;
 }
-#endif
 
 /************************************************************************/
 /*                         InitWithTilesAPI()                           */
@@ -1942,14 +1946,12 @@ bool OGCAPIDataset::InitWithTilesAPI(GDALOpenInfo *poOpenInfo,
             }
         }
 
-#ifdef OGR_ENABLE_DRIVER_GML
         std::vector<std::unique_ptr<OGRFieldDefn>> apoFields;
         bool bGotSchema = false;
         if (!osXMLSchemaURL.empty())
         {
             bGotSchema = ParseXMLSchema(osXMLSchemaURL, apoFields, eGeomType);
         }
-#endif
 
         for (const auto &tileMatrix : tms->tileMatrixList())
         {
@@ -1997,10 +1999,8 @@ bool OGCAPIDataset::InitWithTilesAPI(GDALOpenInfo *poOpenInfo,
                     tileMatrix, eGeomType));
             poLayer->SetMinMaxXY(minCol, minRow, maxCol, maxRow);
             poLayer->SetExtent(dfXMin, dfYMin, dfXMax, dfYMax);
-#ifdef OGR_ENABLE_DRIVER_GML
             if (bGotSchema)
                 poLayer->SetFields(apoFields);
-#endif
             m_apoLayers.emplace_back(std::move(poLayer));
         }
 
@@ -2100,10 +2100,10 @@ bool OGCAPIDataset::InitWithTilesAPI(GDALOpenInfo *poOpenInfo,
                     "        <TileXMultiplier>%d</TileXMultiplier>"
                     "    </Service>"
                     "    <DataWindow>"
-                    "        <UpperLeftX>%.18g</UpperLeftX>"
-                    "        <UpperLeftY>%.18g</UpperLeftY>"
-                    "        <LowerRightX>%.18g</LowerRightX>"
-                    "        <LowerRightY>%.18g</LowerRightY>"
+                    "        <UpperLeftX>%.17g</UpperLeftX>"
+                    "        <UpperLeftY>%.17g</UpperLeftY>"
+                    "        <LowerRightX>%.17g</LowerRightX>"
+                    "        <LowerRightY>%.17g</LowerRightY>"
                     "        <TileLevel>0</TileLevel>"
                     "        <TileY>%d</TileY>"
                     "        <SizeX>%d</SizeX>"
@@ -2233,10 +2233,10 @@ bool OGCAPIDataset::InitWithTilesAPI(GDALOpenInfo *poOpenInfo,
             argv.AddString("-of");
             argv.AddString("VRT");
             argv.AddString("-projwin");
-            argv.AddString(CPLSPrintf("%.18g", dfXMin));
-            argv.AddString(CPLSPrintf("%.18g", dfYMax));
-            argv.AddString(CPLSPrintf("%.18g", dfXMax));
-            argv.AddString(CPLSPrintf("%.18g", dfYMin));
+            argv.AddString(CPLSPrintf("%.17g", dfXMin));
+            argv.AddString(CPLSPrintf("%.17g", dfYMax));
+            argv.AddString(CPLSPrintf("%.17g", dfXMax));
+            argv.AddString(CPLSPrintf("%.17g", dfYMin));
             GDALTranslateOptions *psOptions =
                 GDALTranslateOptionsNew(argv.List(), nullptr);
             GDALDatasetH hCroppedDS = GDALTranslate(
@@ -2504,19 +2504,19 @@ GDALDataset *OGCAPITiledLayer::OpenTile(int nX, int nY, bool &bEmptyContent)
             m_bInvertAxis ? m_oTileMatrix.mTopLeftX : m_oTileMatrix.mTopLeftY;
         aosOpenOptions.SetNameValue(
             "@GEOREF_TOPX",
-            CPLSPrintf("%.18g", dfOriX + nX * m_oTileMatrix.mResX *
+            CPLSPrintf("%.17g", dfOriX + nX * m_oTileMatrix.mResX *
                                              m_oTileMatrix.mTileWidth));
         aosOpenOptions.SetNameValue(
             "@GEOREF_TOPY",
-            CPLSPrintf("%.18g", dfOriY - nY * m_oTileMatrix.mResY *
+            CPLSPrintf("%.17g", dfOriY - nY * m_oTileMatrix.mResY *
                                              m_oTileMatrix.mTileHeight));
         aosOpenOptions.SetNameValue(
             "@GEOREF_TILEDIMX",
-            CPLSPrintf("%.18g", nCoalesce * m_oTileMatrix.mResX *
+            CPLSPrintf("%.17g", nCoalesce * m_oTileMatrix.mResX *
                                     m_oTileMatrix.mTileWidth));
         aosOpenOptions.SetNameValue(
             "@GEOREF_TILEDIMY",
-            CPLSPrintf("%.18g",
+            CPLSPrintf("%.17g",
                        m_oTileMatrix.mResY * m_oTileMatrix.mTileWidth));
 
         papszOpenOptions = aosOpenOptions.List();
@@ -2881,7 +2881,9 @@ GDALDataset *OGCAPIDataset::Open(GDALOpenInfo *poOpenInfo)
     if (!Identify(poOpenInfo))
         return nullptr;
     auto poDS = std::make_unique<OGCAPIDataset>();
-    if (STARTS_WITH_CI(poOpenInfo->pszFilename, "OGCAPI:"))
+    if (STARTS_WITH_CI(poOpenInfo->pszFilename, "OGCAPI:") ||
+        STARTS_WITH(poOpenInfo->pszFilename, "http://") ||
+        STARTS_WITH(poOpenInfo->pszFilename, "https://"))
     {
         if (!poDS->InitFromURL(poOpenInfo))
             return nullptr;
diff --git a/frmts/openjpeg/CMakeLists.txt b/frmts/openjpeg/CMakeLists.txt
index 61e81f474fc4..03e5fd0470e0 100644
--- a/frmts/openjpeg/CMakeLists.txt
+++ b/frmts/openjpeg/CMakeLists.txt
@@ -1,3 +1,17 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/helpers/GdalCMakeMinimumRequired.cmake")
+cmake_minimum_required(VERSION ${GDAL_CMAKE_VERSION_MIN}...${GDAL_CMAKE_VERSION_MAX})
+
+if(NOT DEFINED PROJECT_SOURCE_DIR)
+    # Standalone plugin building
+    project(gdal_JP2OpenJPEG)
+    # The driver depends on some non exported headers. Make sure the version we
+    # build against against is the same as this source tree.
+    set(STRICT_VERSION_CHECK ON)
+    include("${PROJECT_SOURCE_DIR}/../../cmake/helpers/SetupStandalonePlugin.cmake" )
+    include(CheckDependentLibrariesOpenJPEG)
+    standalone_driver_finalize(GDAL_ENABLE_DRIVER_JP2OPENJPEG)
+endif()
+
 add_gdal_driver(
   TARGET gdal_JP2OpenJPEG
   SOURCES openjpegdataset.cpp
@@ -15,5 +29,10 @@ if(NOT TARGET gdal_JP2OpenJPEG)
 endif()
 
 gdal_standard_includes(gdal_JP2OpenJPEG)
+if (STANDALONE)
+target_include_directories(gdal_JP2OpenJPEG PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../port
+                                                    ${CMAKE_CURRENT_SOURCE_DIR}/..
+)
+endif()
 target_include_directories(gdal_JP2OpenJPEG PRIVATE ../opjlike)
 gdal_target_link_libraries(gdal_JP2OpenJPEG PRIVATE ${OpenJPEG_TARGET})
diff --git a/frmts/openjpeg/driver_declaration.cmake b/frmts/openjpeg/driver_declaration.cmake
new file mode 100644
index 000000000000..8b8f3990663e
--- /dev/null
+++ b/frmts/openjpeg/driver_declaration.cmake
@@ -0,0 +1,2 @@
+gdal_dependent_format(openjpeg "JPEG2000 driver based on OpenJPEG library" "GDAL_USE_OPENJPEG" DRIVER_NAME_OPTION
+                      "JP2OpenJPEG")
diff --git a/frmts/openjpeg/openjpegdataset.cpp b/frmts/openjpeg/openjpegdataset.cpp
index 83d841babf52..95534ac618af 100644
--- a/frmts/openjpeg/openjpegdataset.cpp
+++ b/frmts/openjpeg/openjpegdataset.cpp
@@ -5,23 +5,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Grok Image Compression Inc.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "jp2opjlikedataset.h"
diff --git a/frmts/openjpeg/openjpegdrivercore.cpp b/frmts/openjpeg/openjpegdrivercore.cpp
index ce37a0b5add1..5a9d592b7f09 100644
--- a/frmts/openjpeg/openjpegdrivercore.cpp
+++ b/frmts/openjpeg/openjpegdrivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault, <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "openjpegdrivercore.h"
diff --git a/frmts/openjpeg/openjpegdrivercore.h b/frmts/openjpeg/openjpegdrivercore.h
index 9f0fbcbb218d..d18bc9e2922a 100644
--- a/frmts/openjpeg/openjpegdrivercore.h
+++ b/frmts/openjpeg/openjpegdrivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault, <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OPENJPEGDRIVERCORE_H
diff --git a/frmts/openjpeg/opjdatasetbase.h b/frmts/openjpeg/opjdatasetbase.h
index ac7ed417eabe..d99fd97f1cf6 100644
--- a/frmts/openjpeg/opjdatasetbase.h
+++ b/frmts/openjpeg/opjdatasetbase.h
@@ -7,23 +7,7 @@
  * Copyright (c) 2015, European Union (European Environment Agency)
  * Copyright (c) 2023, Grok Image Compression Inc.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #pragma once
 
diff --git a/frmts/opjlike/jp2opjlikedataset.cpp b/frmts/opjlike/jp2opjlikedataset.cpp
index 2ee4d797c7a2..973fc334b2df 100644
--- a/frmts/opjlike/jp2opjlikedataset.cpp
+++ b/frmts/opjlike/jp2opjlikedataset.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2015, European Union (European Environment Agency)
  * Copyright (c) 2023, Grok Image Compression Inc.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <cassert>
@@ -1870,12 +1854,12 @@ GDALDataset *JP2OPJLikeDataset<CODEC, BASE>::Open(GDALOpenInfo *poOpenInfo)
     /*      Initialize any PAM information.                                 */
     /* -------------------------------------------------------------------- */
     poDS->SetDescription(poOpenInfo->pszFilename);
-    poDS->TryLoadXML();
+    poDS->TryLoadXML(poOpenInfo->GetSiblingFiles());
 
     /* -------------------------------------------------------------------- */
     /*      Check for overviews.                                            */
     /* -------------------------------------------------------------------- */
-    poDS->oOvManager.Initialize(poDS, poOpenInfo->pszFilename);
+    poDS->oOvManager.Initialize(poDS, poOpenInfo);
 
     return poDS;
 }
diff --git a/frmts/opjlike/jp2opjlikedataset.h b/frmts/opjlike/jp2opjlikedataset.h
index 309b1245680a..5d4426821170 100644
--- a/frmts/opjlike/jp2opjlikedataset.h
+++ b/frmts/opjlike/jp2opjlikedataset.h
@@ -10,23 +10,7 @@
  * Copyright (c) 2015, European Union (European Environment Agency)
  * Copyright (c) 2023, Grok Image Compression Inc.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #pragma once
diff --git a/frmts/ozi/ozidataset.cpp b/frmts/ozi/ozidataset.cpp
index ff8503ab1805..b617677965a1 100644
--- a/frmts/ozi/ozidataset.cpp
+++ b/frmts/ozi/ozidataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_frmts.h"
diff --git a/frmts/pcidsk/gdal_edb.cpp b/frmts/pcidsk/gdal_edb.cpp
index 37bc284e9299..fd97d7aec87f 100644
--- a/frmts/pcidsk/gdal_edb.cpp
+++ b/frmts/pcidsk/gdal_edb.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/frmts/pcidsk/ogrpcidsklayer.cpp b/frmts/pcidsk/ogrpcidsklayer.cpp
index b712d981766d..77b1c6d14fac 100644
--- a/frmts/pcidsk/ogrpcidsklayer.cpp
+++ b/frmts/pcidsk/ogrpcidsklayer.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2009, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidskdataset2.h"
diff --git a/frmts/pcidsk/pcidskdataset2.cpp b/frmts/pcidsk/pcidskdataset2.cpp
index 3c065636031f..c278bb909314 100644
--- a/frmts/pcidsk/pcidskdataset2.cpp
+++ b/frmts/pcidsk/pcidskdataset2.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2009, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_frmts.h"
diff --git a/frmts/pcidsk/pcidskdataset2.h b/frmts/pcidsk/pcidskdataset2.h
index e4c2534b5c10..cc5af3e98498 100644
--- a/frmts/pcidsk/pcidskdataset2.h
+++ b/frmts/pcidsk/pcidskdataset2.h
@@ -10,23 +10,7 @@
  * Copyright (c) 2009, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef PCIDSKDATASET2_H_INCLUDED
diff --git a/frmts/pcidsk/pcidskdrivercore.cpp b/frmts/pcidsk/pcidskdrivercore.cpp
index 8c646b100be6..e1e8eaca0e9b 100644
--- a/frmts/pcidsk/pcidskdrivercore.cpp
+++ b/frmts/pcidsk/pcidskdrivercore.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2009, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidskdrivercore.h"
diff --git a/frmts/pcidsk/pcidskdrivercore.h b/frmts/pcidsk/pcidskdrivercore.h
index 3a1d57484fdc..6288cc21737e 100644
--- a/frmts/pcidsk/pcidskdrivercore.h
+++ b/frmts/pcidsk/pcidskdrivercore.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2009, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef PCIDSKDRIVERCORE_H
diff --git a/frmts/pcidsk/sdk/blockdir/asciitiledir.cpp b/frmts/pcidsk/sdk/blockdir/asciitiledir.cpp
index a8b15c63f821..a54894d05979 100644
--- a/frmts/pcidsk/sdk/blockdir/asciitiledir.cpp
+++ b/frmts/pcidsk/sdk/blockdir/asciitiledir.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2011
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "blockdir/asciitiledir.h"
diff --git a/frmts/pcidsk/sdk/blockdir/asciitiledir.h b/frmts/pcidsk/sdk/blockdir/asciitiledir.h
index ee62cc64c0b3..b7c4cc7b6a51 100644
--- a/frmts/pcidsk/sdk/blockdir/asciitiledir.h
+++ b/frmts/pcidsk/sdk/blockdir/asciitiledir.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2011
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef PCIDSK_ASCII_TILE_DIR_H
diff --git a/frmts/pcidsk/sdk/blockdir/asciitilelayer.cpp b/frmts/pcidsk/sdk/blockdir/asciitilelayer.cpp
index 154b1fba933d..9a69bb881007 100644
--- a/frmts/pcidsk/sdk/blockdir/asciitilelayer.cpp
+++ b/frmts/pcidsk/sdk/blockdir/asciitilelayer.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2011
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "blockdir/asciitilelayer.h"
diff --git a/frmts/pcidsk/sdk/blockdir/asciitilelayer.h b/frmts/pcidsk/sdk/blockdir/asciitilelayer.h
index 5e77561394c7..9ab0ca265990 100644
--- a/frmts/pcidsk/sdk/blockdir/asciitilelayer.h
+++ b/frmts/pcidsk/sdk/blockdir/asciitilelayer.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2011
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef PCIDSK_ASCII_TILE_LAYER_H
diff --git a/frmts/pcidsk/sdk/blockdir/binarytiledir.cpp b/frmts/pcidsk/sdk/blockdir/binarytiledir.cpp
index 1117d6813d70..1ef73553c3ef 100644
--- a/frmts/pcidsk/sdk/blockdir/binarytiledir.cpp
+++ b/frmts/pcidsk/sdk/blockdir/binarytiledir.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2011
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "blockdir/binarytiledir.h"
diff --git a/frmts/pcidsk/sdk/blockdir/binarytiledir.h b/frmts/pcidsk/sdk/blockdir/binarytiledir.h
index ea74c4f874c5..7da6c4c643ba 100644
--- a/frmts/pcidsk/sdk/blockdir/binarytiledir.h
+++ b/frmts/pcidsk/sdk/blockdir/binarytiledir.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2011
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef PCIDSK_BINARY_TILE_DIR_H
diff --git a/frmts/pcidsk/sdk/blockdir/binarytilelayer.cpp b/frmts/pcidsk/sdk/blockdir/binarytilelayer.cpp
index 520225624979..0ccd95d09a88 100644
--- a/frmts/pcidsk/sdk/blockdir/binarytilelayer.cpp
+++ b/frmts/pcidsk/sdk/blockdir/binarytilelayer.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2011
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "blockdir/binarytilelayer.h"
diff --git a/frmts/pcidsk/sdk/blockdir/binarytilelayer.h b/frmts/pcidsk/sdk/blockdir/binarytilelayer.h
index 9622174e0346..ec4b5be27073 100644
--- a/frmts/pcidsk/sdk/blockdir/binarytilelayer.h
+++ b/frmts/pcidsk/sdk/blockdir/binarytilelayer.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2011
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef PCIDSK_BINARY_TILE_LAYER_H
diff --git a/frmts/pcidsk/sdk/blockdir/blockdir.cpp b/frmts/pcidsk/sdk/blockdir/blockdir.cpp
index e353857dd8c0..8748e376f34b 100644
--- a/frmts/pcidsk/sdk/blockdir/blockdir.cpp
+++ b/frmts/pcidsk/sdk/blockdir/blockdir.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2011
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "blockdir/blockdir.h"
diff --git a/frmts/pcidsk/sdk/blockdir/blockdir.h b/frmts/pcidsk/sdk/blockdir/blockdir.h
index 2f9fedf20691..31dd9c139aac 100644
--- a/frmts/pcidsk/sdk/blockdir/blockdir.h
+++ b/frmts/pcidsk/sdk/blockdir/blockdir.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2011
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef PCIDSK_BLOCK_DIR_H
diff --git a/frmts/pcidsk/sdk/blockdir/blockfile.cpp b/frmts/pcidsk/sdk/blockdir/blockfile.cpp
index 7da1d91f5150..1082bcaf9bc2 100644
--- a/frmts/pcidsk/sdk/blockdir/blockfile.cpp
+++ b/frmts/pcidsk/sdk/blockdir/blockfile.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2011
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "blockdir/blockfile.h"
diff --git a/frmts/pcidsk/sdk/blockdir/blockfile.h b/frmts/pcidsk/sdk/blockdir/blockfile.h
index c62d8523ea9d..9cfafcfae145 100644
--- a/frmts/pcidsk/sdk/blockdir/blockfile.h
+++ b/frmts/pcidsk/sdk/blockdir/blockfile.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2011
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef PCIDSK_BLOCK_FILE_H
diff --git a/frmts/pcidsk/sdk/blockdir/blocklayer.cpp b/frmts/pcidsk/sdk/blockdir/blocklayer.cpp
index 4f9e53b3d3d4..94c5fab15ad3 100644
--- a/frmts/pcidsk/sdk/blockdir/blocklayer.cpp
+++ b/frmts/pcidsk/sdk/blockdir/blocklayer.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2011
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "blockdir/blocklayer.h"
diff --git a/frmts/pcidsk/sdk/blockdir/blocklayer.h b/frmts/pcidsk/sdk/blockdir/blocklayer.h
index 633f5ce98750..b80fed5863f2 100644
--- a/frmts/pcidsk/sdk/blockdir/blocklayer.h
+++ b/frmts/pcidsk/sdk/blockdir/blocklayer.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2011
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef PCIDSK_BLOCK_LAYER_H
diff --git a/frmts/pcidsk/sdk/blockdir/blocktiledir.cpp b/frmts/pcidsk/sdk/blockdir/blocktiledir.cpp
index 03fe81a27340..c5a34a18a58d 100644
--- a/frmts/pcidsk/sdk/blockdir/blocktiledir.cpp
+++ b/frmts/pcidsk/sdk/blockdir/blocktiledir.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2011
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "blockdir/blocktiledir.h"
diff --git a/frmts/pcidsk/sdk/blockdir/blocktiledir.h b/frmts/pcidsk/sdk/blockdir/blocktiledir.h
index f8cb1dba11ea..b6b6665626b0 100644
--- a/frmts/pcidsk/sdk/blockdir/blocktiledir.h
+++ b/frmts/pcidsk/sdk/blockdir/blocktiledir.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2011
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef PCIDSK_BLOCK_TILE_DIR_H
diff --git a/frmts/pcidsk/sdk/blockdir/blocktilelayer.cpp b/frmts/pcidsk/sdk/blockdir/blocktilelayer.cpp
index 76a3924b0596..14925f1b161b 100644
--- a/frmts/pcidsk/sdk/blockdir/blocktilelayer.cpp
+++ b/frmts/pcidsk/sdk/blockdir/blocktilelayer.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2011
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "blockdir/blocktilelayer.h"
diff --git a/frmts/pcidsk/sdk/blockdir/blocktilelayer.h b/frmts/pcidsk/sdk/blockdir/blocktilelayer.h
index 6a05548875b4..b9c22d3da85d 100644
--- a/frmts/pcidsk/sdk/blockdir/blocktilelayer.h
+++ b/frmts/pcidsk/sdk/blockdir/blocktilelayer.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2011
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef PCIDSK_BLOCK_TILE_LAYER_H
diff --git a/frmts/pcidsk/sdk/channel/cbandinterleavedchannel.cpp b/frmts/pcidsk/sdk/channel/cbandinterleavedchannel.cpp
index 6611d903944d..211d8e4d4f7c 100644
--- a/frmts/pcidsk/sdk/channel/cbandinterleavedchannel.cpp
+++ b/frmts/pcidsk/sdk/channel/cbandinterleavedchannel.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk_config.h"
diff --git a/frmts/pcidsk/sdk/channel/cbandinterleavedchannel.h b/frmts/pcidsk/sdk/channel/cbandinterleavedchannel.h
index 9c9daeb878ef..6222cf23864e 100644
--- a/frmts/pcidsk/sdk/channel/cbandinterleavedchannel.h
+++ b/frmts/pcidsk/sdk/channel/cbandinterleavedchannel.h
@@ -10,23 +10,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_CHANNEL_CBANDINTERLEAVEDCHANNEL_H
 #define INCLUDE_CHANNEL_CBANDINTERLEAVEDCHANNEL_H
diff --git a/frmts/pcidsk/sdk/channel/cexternalchannel.cpp b/frmts/pcidsk/sdk/channel/cexternalchannel.cpp
index 3124e1ddb02f..ee9c2927b0a6 100644
--- a/frmts/pcidsk/sdk/channel/cexternalchannel.cpp
+++ b/frmts/pcidsk/sdk/channel/cexternalchannel.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2010
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk_config.h"
diff --git a/frmts/pcidsk/sdk/channel/cexternalchannel.h b/frmts/pcidsk/sdk/channel/cexternalchannel.h
index a99b2d17a177..1df3125a2edd 100644
--- a/frmts/pcidsk/sdk/channel/cexternalchannel.h
+++ b/frmts/pcidsk/sdk/channel/cexternalchannel.h
@@ -10,23 +10,7 @@
  * Copyright (c) 2010
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef INCLUDE_CHANNEL_CEXTERNALCHANNEL_H
diff --git a/frmts/pcidsk/sdk/channel/cpcidskchannel.cpp b/frmts/pcidsk/sdk/channel/cpcidskchannel.cpp
index af0819f8d397..b4fed7fad690 100644
--- a/frmts/pcidsk/sdk/channel/cpcidskchannel.cpp
+++ b/frmts/pcidsk/sdk/channel/cpcidskchannel.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk_config.h"
diff --git a/frmts/pcidsk/sdk/channel/cpcidskchannel.h b/frmts/pcidsk/sdk/channel/cpcidskchannel.h
index bf44e908f010..68ee9e33d4cd 100644
--- a/frmts/pcidsk/sdk/channel/cpcidskchannel.h
+++ b/frmts/pcidsk/sdk/channel/cpcidskchannel.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_CHANNEL_CPCIDSKCHANNEL_H
 #define INCLUDE_CHANNEL_CPCIDSKCHANNEL_H
diff --git a/frmts/pcidsk/sdk/channel/cpixelinterleavedchannel.cpp b/frmts/pcidsk/sdk/channel/cpixelinterleavedchannel.cpp
index b6edb7049956..75c776e6cd81 100644
--- a/frmts/pcidsk/sdk/channel/cpixelinterleavedchannel.cpp
+++ b/frmts/pcidsk/sdk/channel/cpixelinterleavedchannel.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk_exception.h"
diff --git a/frmts/pcidsk/sdk/channel/cpixelinterleavedchannel.h b/frmts/pcidsk/sdk/channel/cpixelinterleavedchannel.h
index 0a719c0176d7..eb50fcc12974 100644
--- a/frmts/pcidsk/sdk/channel/cpixelinterleavedchannel.h
+++ b/frmts/pcidsk/sdk/channel/cpixelinterleavedchannel.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_CHANNEL_CPIXELINTERLEAVEDCHANNEL_H
 #define INCLUDE_CHANNEL_CPIXELINTERLEAVEDCHANNEL_H
diff --git a/frmts/pcidsk/sdk/channel/ctiledchannel.cpp b/frmts/pcidsk/sdk/channel/ctiledchannel.cpp
index 60a7684feccc..d0aefbaee124 100644
--- a/frmts/pcidsk/sdk/channel/ctiledchannel.cpp
+++ b/frmts/pcidsk/sdk/channel/ctiledchannel.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk_config.h"
diff --git a/frmts/pcidsk/sdk/channel/ctiledchannel.h b/frmts/pcidsk/sdk/channel/ctiledchannel.h
index 97b63259fa4c..1a5cf9611da1 100644
--- a/frmts/pcidsk/sdk/channel/ctiledchannel.h
+++ b/frmts/pcidsk/sdk/channel/ctiledchannel.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_CHANNEL_CTILEDCHANNEL_H
 #define INCLUDE_CHANNEL_CTILEDCHANNEL_H
diff --git a/frmts/pcidsk/sdk/core/clinksegment.cpp b/frmts/pcidsk/sdk/core/clinksegment.cpp
index 5bd9f380ede2..9fcfafd7bf56 100644
--- a/frmts/pcidsk/sdk/core/clinksegment.cpp
+++ b/frmts/pcidsk/sdk/core/clinksegment.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "core/clinksegment.h"
diff --git a/frmts/pcidsk/sdk/core/clinksegment.h b/frmts/pcidsk/sdk/core/clinksegment.h
index 7d57bb45d648..b6eb89cc5ebb 100644
--- a/frmts/pcidsk/sdk/core/clinksegment.h
+++ b/frmts/pcidsk/sdk/core/clinksegment.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PCIDSK_SEGMENT_CLINKSEGMENT_H
 #define INCLUDE_PCIDSK_SEGMENT_CLINKSEGMENT_H
diff --git a/frmts/pcidsk/sdk/core/cpcidskblockfile.cpp b/frmts/pcidsk/sdk/core/cpcidskblockfile.cpp
index 273c5f08198b..b9e6577d51fc 100644
--- a/frmts/pcidsk/sdk/core/cpcidskblockfile.cpp
+++ b/frmts/pcidsk/sdk/core/cpcidskblockfile.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2011
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "core/cpcidskblockfile.h"
diff --git a/frmts/pcidsk/sdk/core/cpcidskblockfile.h b/frmts/pcidsk/sdk/core/cpcidskblockfile.h
index 40aaa9b7293a..7527747ab587 100644
--- a/frmts/pcidsk/sdk/core/cpcidskblockfile.h
+++ b/frmts/pcidsk/sdk/core/cpcidskblockfile.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2011
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPCIDSK_BLOCK_FILE_H
diff --git a/frmts/pcidsk/sdk/core/cpcidskfile.cpp b/frmts/pcidsk/sdk/core/cpcidskfile.cpp
index cf299c97e27f..0dbccdbacfa9 100644
--- a/frmts/pcidsk/sdk/core/cpcidskfile.cpp
+++ b/frmts/pcidsk/sdk/core/cpcidskfile.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #include "pcidsk_file.h"
 #include "pcidsk_exception.h"
diff --git a/frmts/pcidsk/sdk/core/cpcidskfile.h b/frmts/pcidsk/sdk/core/cpcidskfile.h
index c3ead995b01d..272b2d8a4c5d 100644
--- a/frmts/pcidsk/sdk/core/cpcidskfile.h
+++ b/frmts/pcidsk/sdk/core/cpcidskfile.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PRIV_CPCIDSKFILE_H
 #define INCLUDE_PRIV_CPCIDSKFILE_H
diff --git a/frmts/pcidsk/sdk/core/edb_pcidsk.cpp b/frmts/pcidsk/sdk/core/edb_pcidsk.cpp
index 81b4c35abd7e..6db3b44c1cac 100644
--- a/frmts/pcidsk/sdk/core/edb_pcidsk.cpp
+++ b/frmts/pcidsk/sdk/core/edb_pcidsk.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2010
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk_config.h"
diff --git a/frmts/pcidsk/sdk/core/libjpeg_io.cpp b/frmts/pcidsk/sdk/core/libjpeg_io.cpp
index b9f20f59272b..dcef15d35662 100644
--- a/frmts/pcidsk/sdk/core/libjpeg_io.cpp
+++ b/frmts/pcidsk/sdk/core/libjpeg_io.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk_config.h"
diff --git a/frmts/pcidsk/sdk/core/metadataset.h b/frmts/pcidsk/sdk/core/metadataset.h
index 5bbbcb3b3ccb..ebe5e2488540 100644
--- a/frmts/pcidsk/sdk/core/metadataset.h
+++ b/frmts/pcidsk/sdk/core/metadataset.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PRIV_METADATASET_H
 #define INCLUDE_PRIV_METADATASET_H
diff --git a/frmts/pcidsk/sdk/core/metadataset_p.cpp b/frmts/pcidsk/sdk/core/metadataset_p.cpp
index 5949460c7fdb..e4b860638780 100644
--- a/frmts/pcidsk/sdk/core/metadataset_p.cpp
+++ b/frmts/pcidsk/sdk/core/metadataset_p.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk_exception.h"
diff --git a/frmts/pcidsk/sdk/core/mutexholder.h b/frmts/pcidsk/sdk/core/mutexholder.h
index 86c34b4879d8..771ccb80cf5b 100644
--- a/frmts/pcidsk/sdk/core/mutexholder.h
+++ b/frmts/pcidsk/sdk/core/mutexholder.h
@@ -7,23 +7,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_CORE_MUTEXHOLDER_H
 #define INCLUDE_CORE_MUTEXHOLDER_H
diff --git a/frmts/pcidsk/sdk/core/pcidsk_pubutils.cpp b/frmts/pcidsk/sdk/core/pcidsk_pubutils.cpp
index 6215afc5e9a9..f92e3f8739aa 100644
--- a/frmts/pcidsk/sdk/core/pcidsk_pubutils.cpp
+++ b/frmts/pcidsk/sdk/core/pcidsk_pubutils.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #include "pcidsk_config.h"
 #include "pcidsk_types.h"
diff --git a/frmts/pcidsk/sdk/core/pcidsk_raster.cpp b/frmts/pcidsk/sdk/core/pcidsk_raster.cpp
index 165dd99b0acc..89460fef084d 100644
--- a/frmts/pcidsk/sdk/core/pcidsk_raster.cpp
+++ b/frmts/pcidsk/sdk/core/pcidsk_raster.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2020
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk_raster.h"
diff --git a/frmts/pcidsk/sdk/core/pcidsk_raster.h b/frmts/pcidsk/sdk/core/pcidsk_raster.h
index c0360925315d..bfe16fe8d6de 100644
--- a/frmts/pcidsk/sdk/core/pcidsk_raster.h
+++ b/frmts/pcidsk/sdk/core/pcidsk_raster.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2020
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef INCLUDE_PCIDSK_RASTER_H
diff --git a/frmts/pcidsk/sdk/core/pcidsk_scanint.cpp b/frmts/pcidsk/sdk/core/pcidsk_scanint.cpp
index 909f12ee8576..09165e675105 100644
--- a/frmts/pcidsk/sdk/core/pcidsk_scanint.cpp
+++ b/frmts/pcidsk/sdk/core/pcidsk_scanint.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2011
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "core/pcidsk_scanint.h"
diff --git a/frmts/pcidsk/sdk/core/pcidsk_scanint.h b/frmts/pcidsk/sdk/core/pcidsk_scanint.h
index 323816550de1..0676accb62c8 100644
--- a/frmts/pcidsk/sdk/core/pcidsk_scanint.h
+++ b/frmts/pcidsk/sdk/core/pcidsk_scanint.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2011
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef PCIDSK_SCANINT_H
diff --git a/frmts/pcidsk/sdk/core/pcidsk_utils.cpp b/frmts/pcidsk/sdk/core/pcidsk_utils.cpp
index 45c1dbd7f256..da8550b1b613 100644
--- a/frmts/pcidsk/sdk/core/pcidsk_utils.cpp
+++ b/frmts/pcidsk/sdk/core/pcidsk_utils.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk_config.h"
diff --git a/frmts/pcidsk/sdk/core/pcidsk_utils.h b/frmts/pcidsk/sdk/core/pcidsk_utils.h
index d4dc34244edc..a9d3e38767ef 100644
--- a/frmts/pcidsk/sdk/core/pcidsk_utils.h
+++ b/frmts/pcidsk/sdk/core/pcidsk_utils.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_CORE_PCIDSK_UTILS_H
 #define INCLUDE_CORE_PCIDSK_UTILS_H
diff --git a/frmts/pcidsk/sdk/core/pcidskbuffer.cpp b/frmts/pcidsk/sdk/core/pcidskbuffer.cpp
index bce0084e7197..1c2cb8b202a6 100644
--- a/frmts/pcidsk/sdk/core/pcidskbuffer.cpp
+++ b/frmts/pcidsk/sdk/core/pcidskbuffer.cpp
@@ -7,23 +7,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk_config.h"
diff --git a/frmts/pcidsk/sdk/core/pcidskcreate.cpp b/frmts/pcidsk/sdk/core/pcidskcreate.cpp
index 90b5fc3d7079..5c97d01a2119 100644
--- a/frmts/pcidsk/sdk/core/pcidskcreate.cpp
+++ b/frmts/pcidsk/sdk/core/pcidskcreate.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #include "pcidsk.h"
 #include "pcidsk_config.h"
diff --git a/frmts/pcidsk/sdk/core/pcidskexception.cpp b/frmts/pcidsk/sdk/core/pcidskexception.cpp
index 7a6640da7f49..66f950dea2eb 100644
--- a/frmts/pcidsk/sdk/core/pcidskexception.cpp
+++ b/frmts/pcidsk/sdk/core/pcidskexception.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk_config.h"
diff --git a/frmts/pcidsk/sdk/core/pcidskinterfaces.cpp b/frmts/pcidsk/sdk/core/pcidskinterfaces.cpp
index 043e385f0ce6..040762d9b895 100644
--- a/frmts/pcidsk/sdk/core/pcidskinterfaces.cpp
+++ b/frmts/pcidsk/sdk/core/pcidskinterfaces.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk_config.h"
diff --git a/frmts/pcidsk/sdk/core/pcidskopen.cpp b/frmts/pcidsk/sdk/core/pcidskopen.cpp
index c2e4b70d167f..26ef31cd0819 100644
--- a/frmts/pcidsk/sdk/core/pcidskopen.cpp
+++ b/frmts/pcidsk/sdk/core/pcidskopen.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #include "pcidsk.h"
 #include "pcidsk_config.h"
diff --git a/frmts/pcidsk/sdk/core/protectedfile.h b/frmts/pcidsk/sdk/core/protectedfile.h
index cc8303535f61..96376549c27b 100644
--- a/frmts/pcidsk/sdk/core/protectedfile.h
+++ b/frmts/pcidsk/sdk/core/protectedfile.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_CORE_PROTECTEDFILE_H
 #define INCLUDE_CORE_PROTECTEDFILE_H
diff --git a/frmts/pcidsk/sdk/pcidsk.h b/frmts/pcidsk/sdk/pcidsk.h
index 262b7ee978d2..328b14b8bb4d 100644
--- a/frmts/pcidsk/sdk/pcidsk.h
+++ b/frmts/pcidsk/sdk/pcidsk.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 /**
diff --git a/frmts/pcidsk/sdk/pcidsk_array.h b/frmts/pcidsk/sdk/pcidsk_array.h
index 4b3191cd993b..1d033622a420 100644
--- a/frmts/pcidsk/sdk/pcidsk_array.h
+++ b/frmts/pcidsk/sdk/pcidsk_array.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2010
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PCIDSK_ARRAY_H
 #define INCLUDE_PCIDSK_ARRAY_H
diff --git a/frmts/pcidsk/sdk/pcidsk_binary.h b/frmts/pcidsk/sdk/pcidsk_binary.h
index ed8f54608754..28a2db272ee8 100644
--- a/frmts/pcidsk/sdk/pcidsk_binary.h
+++ b/frmts/pcidsk/sdk/pcidsk_binary.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2010
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PCIDSK_PCIDSK_BINARY_H
 #define INCLUDE_PCIDSK_PCIDSK_BINARY_H
diff --git a/frmts/pcidsk/sdk/pcidsk_blut.h b/frmts/pcidsk/sdk/pcidsk_blut.h
index 9df834cad9ff..eadcb8db876f 100644
--- a/frmts/pcidsk/sdk/pcidsk_blut.h
+++ b/frmts/pcidsk/sdk/pcidsk_blut.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2015
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PCIDSK_BLUT_H
 #define INCLUDE_PCIDSK_BLUT_H
diff --git a/frmts/pcidsk/sdk/pcidsk_bpct.h b/frmts/pcidsk/sdk/pcidsk_bpct.h
index f70557d94bf7..3f47ae3dc8aa 100644
--- a/frmts/pcidsk/sdk/pcidsk_bpct.h
+++ b/frmts/pcidsk/sdk/pcidsk_bpct.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2015
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PCIDSK_BPCT_H
 #define INCLUDE_PCIDSK_BPCT_H
diff --git a/frmts/pcidsk/sdk/pcidsk_buffer.h b/frmts/pcidsk/sdk/pcidsk_buffer.h
index 8bda5e822f7e..51a8c56280c8 100644
--- a/frmts/pcidsk/sdk/pcidsk_buffer.h
+++ b/frmts/pcidsk/sdk/pcidsk_buffer.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PCIDSKBUFFER_H
 #define INCLUDE_PCIDSKBUFFER_H
diff --git a/frmts/pcidsk/sdk/pcidsk_channel.h b/frmts/pcidsk/sdk/pcidsk_channel.h
index 612dd2be5c98..d9466f1e2c6b 100644
--- a/frmts/pcidsk/sdk/pcidsk_channel.h
+++ b/frmts/pcidsk/sdk/pcidsk_channel.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PCIDSK_CHANNEL_H
 #define INCLUDE_PCIDSK_CHANNEL_H
diff --git a/frmts/pcidsk/sdk/pcidsk_config.h b/frmts/pcidsk/sdk/pcidsk_config.h
index 5400aac1d8f8..216b5d88e2da 100644
--- a/frmts/pcidsk/sdk/pcidsk_config.h
+++ b/frmts/pcidsk/sdk/pcidsk_config.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef PCIDSK_CONFIG_H_INCLUDED
diff --git a/frmts/pcidsk/sdk/pcidsk_edb.h b/frmts/pcidsk/sdk/pcidsk_edb.h
index 4eaad25f82c8..f8869ff3199e 100644
--- a/frmts/pcidsk/sdk/pcidsk_edb.h
+++ b/frmts/pcidsk/sdk/pcidsk_edb.h
@@ -7,23 +7,7 @@
  * Copyright (c) 2010
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PCIDSK_EDB_H
 #define INCLUDE_PCIDSK_EDB_H
diff --git a/frmts/pcidsk/sdk/pcidsk_ephemeris.h b/frmts/pcidsk/sdk/pcidsk_ephemeris.h
index 1b52d6dc021d..3ac752301eda 100644
--- a/frmts/pcidsk/sdk/pcidsk_ephemeris.h
+++ b/frmts/pcidsk/sdk/pcidsk_ephemeris.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PCIDSK_PCIDSK_EPHEMERIS_H
 #define INCLUDE_PCIDSK_PCIDSK_EPHEMERIS_H
diff --git a/frmts/pcidsk/sdk/pcidsk_exception.h b/frmts/pcidsk/sdk/pcidsk_exception.h
index 4884965397b2..2a51e3b7f346 100644
--- a/frmts/pcidsk/sdk/pcidsk_exception.h
+++ b/frmts/pcidsk/sdk/pcidsk_exception.h
@@ -7,23 +7,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PCIDSK_EXCEPTION_H
 #define INCLUDE_PCIDSK_EXCEPTION_H
diff --git a/frmts/pcidsk/sdk/pcidsk_file.h b/frmts/pcidsk/sdk/pcidsk_file.h
index 3373fc48d382..1bb4fa3bf1b0 100644
--- a/frmts/pcidsk/sdk/pcidsk_file.h
+++ b/frmts/pcidsk/sdk/pcidsk_file.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PCIDSK_FILE_H
 #define INCLUDE_PCIDSK_FILE_H
diff --git a/frmts/pcidsk/sdk/pcidsk_gcp.h b/frmts/pcidsk/sdk/pcidsk_gcp.h
index b7bc7bcef3b8..9afe0a11330d 100644
--- a/frmts/pcidsk/sdk/pcidsk_gcp.h
+++ b/frmts/pcidsk/sdk/pcidsk_gcp.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef INCLUDE_PCIDSK_SRC_GCP_H
diff --git a/frmts/pcidsk/sdk/pcidsk_gcpsegment.h b/frmts/pcidsk/sdk/pcidsk_gcpsegment.h
index 5c3d4f3ea4c0..0cdf598d43d7 100644
--- a/frmts/pcidsk/sdk/pcidsk_gcpsegment.h
+++ b/frmts/pcidsk/sdk/pcidsk_gcpsegment.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PCIDSK_PCIDSK_GCPSEGMENT_H
 #define INCLUDE_PCIDSK_PCIDSK_GCPSEGMENT_H
diff --git a/frmts/pcidsk/sdk/pcidsk_georef.h b/frmts/pcidsk/sdk/pcidsk_georef.h
index 2ed20c96153f..5ceb9df9166f 100644
--- a/frmts/pcidsk/sdk/pcidsk_georef.h
+++ b/frmts/pcidsk/sdk/pcidsk_georef.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PCIDSK_GEOREF_H
 #define INCLUDE_PCIDSK_GEOREF_H
diff --git a/frmts/pcidsk/sdk/pcidsk_interfaces.h b/frmts/pcidsk/sdk/pcidsk_interfaces.h
index b913dcf9d461..fb79f05dfb24 100644
--- a/frmts/pcidsk/sdk/pcidsk_interfaces.h
+++ b/frmts/pcidsk/sdk/pcidsk_interfaces.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef INCLUDE_PCIDSK_INTERFACES_H
diff --git a/frmts/pcidsk/sdk/pcidsk_io.h b/frmts/pcidsk/sdk/pcidsk_io.h
index 0e017d200daa..ec6cdfe084de 100644
--- a/frmts/pcidsk/sdk/pcidsk_io.h
+++ b/frmts/pcidsk/sdk/pcidsk_io.h
@@ -7,23 +7,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PCIDSK_IO_H
 #define INCLUDE_PCIDSK_IO_H
diff --git a/frmts/pcidsk/sdk/pcidsk_lut.h b/frmts/pcidsk/sdk/pcidsk_lut.h
index 5f7b7a2bde35..4bb2e40ee9ef 100644
--- a/frmts/pcidsk/sdk/pcidsk_lut.h
+++ b/frmts/pcidsk/sdk/pcidsk_lut.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2015
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PCIDSK_LUT_H
 #define INCLUDE_PCIDSK_LUT_H
diff --git a/frmts/pcidsk/sdk/pcidsk_mutex.h b/frmts/pcidsk/sdk/pcidsk_mutex.h
index f1646b7bdc00..a7d6b0e1c259 100644
--- a/frmts/pcidsk/sdk/pcidsk_mutex.h
+++ b/frmts/pcidsk/sdk/pcidsk_mutex.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PCIDSK_MUTEX_H
 #define INCLUDE_PCIDSK_MUTEX_H
diff --git a/frmts/pcidsk/sdk/pcidsk_pct.h b/frmts/pcidsk/sdk/pcidsk_pct.h
index f21f05e89ab7..879bf6832825 100644
--- a/frmts/pcidsk/sdk/pcidsk_pct.h
+++ b/frmts/pcidsk/sdk/pcidsk_pct.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PCIDSK_PCT_H
 #define INCLUDE_PCIDSK_PCT_H
diff --git a/frmts/pcidsk/sdk/pcidsk_poly.h b/frmts/pcidsk/sdk/pcidsk_poly.h
index 8ce0daab1d29..967843bbbbd7 100644
--- a/frmts/pcidsk/sdk/pcidsk_poly.h
+++ b/frmts/pcidsk/sdk/pcidsk_poly.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PCIDSK_PCIDSK_POLY_H
 #define INCLUDE_PCIDSK_PCIDSK_POLY_H
diff --git a/frmts/pcidsk/sdk/pcidsk_rpc.h b/frmts/pcidsk/sdk/pcidsk_rpc.h
index 9fa3fa5810d8..bcf99a70e495 100644
--- a/frmts/pcidsk/sdk/pcidsk_rpc.h
+++ b/frmts/pcidsk/sdk/pcidsk_rpc.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PCIDSK_PCIDSK_RPC_H
 #define INCLUDE_PCIDSK_PCIDSK_RPC_H
diff --git a/frmts/pcidsk/sdk/pcidsk_segment.h b/frmts/pcidsk/sdk/pcidsk_segment.h
index 6c2795a4ffd8..7d4fdc0ee3f4 100644
--- a/frmts/pcidsk/sdk/pcidsk_segment.h
+++ b/frmts/pcidsk/sdk/pcidsk_segment.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef INCLUDE_PCIDSKSEGMENT_H
diff --git a/frmts/pcidsk/sdk/pcidsk_shape.h b/frmts/pcidsk/sdk/pcidsk_shape.h
index 2380401e29b0..3860be470e7e 100644
--- a/frmts/pcidsk/sdk/pcidsk_shape.h
+++ b/frmts/pcidsk/sdk/pcidsk_shape.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef INCLUDE_PCIDSK_SHAPE_H
diff --git a/frmts/pcidsk/sdk/pcidsk_tex.h b/frmts/pcidsk/sdk/pcidsk_tex.h
index b82df5906b05..bc982ed913ad 100644
--- a/frmts/pcidsk/sdk/pcidsk_tex.h
+++ b/frmts/pcidsk/sdk/pcidsk_tex.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2010
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PCIDSK_TEX_H
 #define INCLUDE_PCIDSK_TEX_H
diff --git a/frmts/pcidsk/sdk/pcidsk_toutin.h b/frmts/pcidsk/sdk/pcidsk_toutin.h
index 2c1e3c75ac59..a2c9665fb691 100644
--- a/frmts/pcidsk/sdk/pcidsk_toutin.h
+++ b/frmts/pcidsk/sdk/pcidsk_toutin.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PCIDSK_PCIDSK_TOUTIN_H
 #define INCLUDE_PCIDSK_PCIDSK_TOUTIN_H
diff --git a/frmts/pcidsk/sdk/pcidsk_types.h b/frmts/pcidsk/sdk/pcidsk_types.h
index 896d3038eb09..81d6068d9278 100644
--- a/frmts/pcidsk/sdk/pcidsk_types.h
+++ b/frmts/pcidsk/sdk/pcidsk_types.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PCIDSK_TYPES_H
 #define INCLUDE_PCIDSK_TYPES_H
diff --git a/frmts/pcidsk/sdk/pcidsk_vectorsegment.h b/frmts/pcidsk/sdk/pcidsk_vectorsegment.h
index e254d85c47e5..6ec928224e5e 100644
--- a/frmts/pcidsk/sdk/pcidsk_vectorsegment.h
+++ b/frmts/pcidsk/sdk/pcidsk_vectorsegment.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef INCLUDE_PCIDSK_VECTORSEGMENT_H
diff --git a/frmts/pcidsk/sdk/pcidskchannel.dox b/frmts/pcidsk/sdk/pcidskchannel.dox
index 77579d7f573c..fcc51e7cd8e8 100644
--- a/frmts/pcidsk/sdk/pcidskchannel.dox
+++ b/frmts/pcidsk/sdk/pcidskchannel.dox
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 50 West Wilmot Street, Richmond Hill, Ont, Canada
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 /** 
diff --git a/frmts/pcidsk/sdk/pcidskfile.dox b/frmts/pcidsk/sdk/pcidskfile.dox
index d28947d09989..74acb0816c17 100644
--- a/frmts/pcidsk/sdk/pcidskfile.dox
+++ b/frmts/pcidsk/sdk/pcidskfile.dox
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 50 West Wilmot Street, Richmond Hill, Ont, Canada
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 /** 
diff --git a/frmts/pcidsk/sdk/pcidskmutex.dox b/frmts/pcidsk/sdk/pcidskmutex.dox
index 53cfb3143c1e..b50ae20f4be3 100644
--- a/frmts/pcidsk/sdk/pcidskmutex.dox
+++ b/frmts/pcidsk/sdk/pcidskmutex.dox
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 50 West Wilmot Street, Richmond Hill, Ont, Canada
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 /** 
diff --git a/frmts/pcidsk/sdk/pcidsksegment.dox b/frmts/pcidsk/sdk/pcidsksegment.dox
index ea3a9a82fe85..7c459de35cbf 100644
--- a/frmts/pcidsk/sdk/pcidsksegment.dox
+++ b/frmts/pcidsk/sdk/pcidsksegment.dox
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 50 West Wilmot Street, Richmond Hill, Ont, Canada
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 /** 
diff --git a/frmts/pcidsk/sdk/port/io_stdio.cpp b/frmts/pcidsk/sdk/port/io_stdio.cpp
index 25721141a7ef..7ed6be02efac 100644
--- a/frmts/pcidsk/sdk/port/io_stdio.cpp
+++ b/frmts/pcidsk/sdk/port/io_stdio.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk_io.h"
diff --git a/frmts/pcidsk/sdk/port/io_win32.cpp b/frmts/pcidsk/sdk/port/io_win32.cpp
index c3b51072f3dd..d176be446aae 100644
--- a/frmts/pcidsk/sdk/port/io_win32.cpp
+++ b/frmts/pcidsk/sdk/port/io_win32.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifdef TRACK_DISKIO
diff --git a/frmts/pcidsk/sdk/port/pthread_mutex.cpp b/frmts/pcidsk/sdk/port/pthread_mutex.cpp
index d719a1df8dc2..cba2b75b04da 100644
--- a/frmts/pcidsk/sdk/port/pthread_mutex.cpp
+++ b/frmts/pcidsk/sdk/port/pthread_mutex.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk_mutex.h"
diff --git a/frmts/pcidsk/sdk/port/win32_mutex.cpp b/frmts/pcidsk/sdk/port/win32_mutex.cpp
index 1f53e9f77c40..8bb4f74d940c 100644
--- a/frmts/pcidsk/sdk/port/win32_mutex.cpp
+++ b/frmts/pcidsk/sdk/port/win32_mutex.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk_mutex.h"
diff --git a/frmts/pcidsk/sdk/raster/rasterconfig.h b/frmts/pcidsk/sdk/raster/rasterconfig.h
index 1e0f46b8cc5a..3c75b23a02d6 100644
--- a/frmts/pcidsk/sdk/raster/rasterconfig.h
+++ b/frmts/pcidsk/sdk/raster/rasterconfig.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef RASTER_CONFIG_H
diff --git a/frmts/pcidsk/sdk/raster/rastertypes.hh b/frmts/pcidsk/sdk/raster/rastertypes.hh
index ddf89c7fa06e..c43e3982bd38 100644
--- a/frmts/pcidsk/sdk/raster/rastertypes.hh
+++ b/frmts/pcidsk/sdk/raster/rastertypes.hh
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef RASTER_TYPES_HH
diff --git a/frmts/pcidsk/sdk/segment/cpcidsk_array.cpp b/frmts/pcidsk/sdk/segment/cpcidsk_array.cpp
index 395cf1ef19dc..1b19fd6f6147 100644
--- a/frmts/pcidsk/sdk/segment/cpcidsk_array.cpp
+++ b/frmts/pcidsk/sdk/segment/cpcidsk_array.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2010
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk_exception.h"
diff --git a/frmts/pcidsk/sdk/segment/cpcidsk_array.h b/frmts/pcidsk/sdk/segment/cpcidsk_array.h
index eb1817edb42b..8a057ac0b3e5 100644
--- a/frmts/pcidsk/sdk/segment/cpcidsk_array.h
+++ b/frmts/pcidsk/sdk/segment/cpcidsk_array.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2010
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_SEGMENT_PCIDSK_ARRAY_H
 #define INCLUDE_SEGMENT_PCIDSK_ARRAY_H
diff --git a/frmts/pcidsk/sdk/segment/cpcidsk_tex.cpp b/frmts/pcidsk/sdk/segment/cpcidsk_tex.cpp
index fe45e0bae692..fbfb659493b5 100644
--- a/frmts/pcidsk/sdk/segment/cpcidsk_tex.cpp
+++ b/frmts/pcidsk/sdk/segment/cpcidsk_tex.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2010
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk_exception.h"
diff --git a/frmts/pcidsk/sdk/segment/cpcidsk_tex.h b/frmts/pcidsk/sdk/segment/cpcidsk_tex.h
index e532f31c3bf8..4b61e5909c6f 100644
--- a/frmts/pcidsk/sdk/segment/cpcidsk_tex.h
+++ b/frmts/pcidsk/sdk/segment/cpcidsk_tex.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2010
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_SEGMENT_PCIDSK_TEX_H
 #define INCLUDE_SEGMENT_PCIDSK_TEX_H
diff --git a/frmts/pcidsk/sdk/segment/cpcidskbinarysegment.cpp b/frmts/pcidsk/sdk/segment/cpcidskbinarysegment.cpp
index 5e352ff6ef95..5e4d21694f9b 100644
--- a/frmts/pcidsk/sdk/segment/cpcidskbinarysegment.cpp
+++ b/frmts/pcidsk/sdk/segment/cpcidskbinarysegment.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2010
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "segment/cpcidskbinarysegment.h"
diff --git a/frmts/pcidsk/sdk/segment/cpcidskbinarysegment.h b/frmts/pcidsk/sdk/segment/cpcidskbinarysegment.h
index e877bfd46184..eb20f302e5ed 100644
--- a/frmts/pcidsk/sdk/segment/cpcidskbinarysegment.h
+++ b/frmts/pcidsk/sdk/segment/cpcidskbinarysegment.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2010
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PCIDSK_SEGMENT_PCIDSKBINARY_SEG_H
 #define INCLUDE_PCIDSK_SEGMENT_PCIDSKBINARY_SEG_H
diff --git a/frmts/pcidsk/sdk/segment/cpcidskbitmap.cpp b/frmts/pcidsk/sdk/segment/cpcidskbitmap.cpp
index e8fcd93e64c3..16cdf776ebbe 100644
--- a/frmts/pcidsk/sdk/segment/cpcidskbitmap.cpp
+++ b/frmts/pcidsk/sdk/segment/cpcidskbitmap.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2010
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk_exception.h"
diff --git a/frmts/pcidsk/sdk/segment/cpcidskbitmap.h b/frmts/pcidsk/sdk/segment/cpcidskbitmap.h
index 3220b095ef45..1ede7dc844fa 100644
--- a/frmts/pcidsk/sdk/segment/cpcidskbitmap.h
+++ b/frmts/pcidsk/sdk/segment/cpcidskbitmap.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2010
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef INCLUDE_SEGMENT_PCIDSKBITMAP_H
diff --git a/frmts/pcidsk/sdk/segment/cpcidskblut.cpp b/frmts/pcidsk/sdk/segment/cpcidskblut.cpp
index 001ad6e7c08f..af707981562b 100644
--- a/frmts/pcidsk/sdk/segment/cpcidskblut.cpp
+++ b/frmts/pcidsk/sdk/segment/cpcidskblut.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2015
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk_exception.h"
diff --git a/frmts/pcidsk/sdk/segment/cpcidskblut.h b/frmts/pcidsk/sdk/segment/cpcidskblut.h
index 61bdaa41e745..da4b1b241849 100644
--- a/frmts/pcidsk/sdk/segment/cpcidskblut.h
+++ b/frmts/pcidsk/sdk/segment/cpcidskblut.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2015
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_SEGMENT_PCIDSK_BLUT_H
 #define INCLUDE_SEGMENT_PCIDSK_BLUT_H
diff --git a/frmts/pcidsk/sdk/segment/cpcidskbpct.cpp b/frmts/pcidsk/sdk/segment/cpcidskbpct.cpp
index a6f478b81501..b382ce013479 100644
--- a/frmts/pcidsk/sdk/segment/cpcidskbpct.cpp
+++ b/frmts/pcidsk/sdk/segment/cpcidskbpct.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2015
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
 *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk_exception.h"
diff --git a/frmts/pcidsk/sdk/segment/cpcidskbpct.h b/frmts/pcidsk/sdk/segment/cpcidskbpct.h
index 4c49e2d8ca58..0f7ff2b24f88 100644
--- a/frmts/pcidsk/sdk/segment/cpcidskbpct.h
+++ b/frmts/pcidsk/sdk/segment/cpcidskbpct.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2015
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_SEGMENT_PCIDSK_BPCT_H
 #define INCLUDE_SEGMENT_PCIDSK_BPCT_H
diff --git a/frmts/pcidsk/sdk/segment/cpcidskephemerissegment.cpp b/frmts/pcidsk/sdk/segment/cpcidskephemerissegment.cpp
index c7fffb381ac4..7a62e26339b0 100644
--- a/frmts/pcidsk/sdk/segment/cpcidskephemerissegment.cpp
+++ b/frmts/pcidsk/sdk/segment/cpcidskephemerissegment.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "segment/cpcidsksegment.h"
diff --git a/frmts/pcidsk/sdk/segment/cpcidskephemerissegment.h b/frmts/pcidsk/sdk/segment/cpcidskephemerissegment.h
index 75e60a2731fd..00c6bafa2e10 100644
--- a/frmts/pcidsk/sdk/segment/cpcidskephemerissegment.h
+++ b/frmts/pcidsk/sdk/segment/cpcidskephemerissegment.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PCIDSK_SEGMENT_PCIDSKEPHEMERIS_SEG_H
 #define INCLUDE_PCIDSK_SEGMENT_PCIDSKEPHEMERIS_SEG_H
diff --git a/frmts/pcidsk/sdk/segment/cpcidskgcp2segment.cpp b/frmts/pcidsk/sdk/segment/cpcidskgcp2segment.cpp
index 715d284e72dc..04e29845641a 100644
--- a/frmts/pcidsk/sdk/segment/cpcidskgcp2segment.cpp
+++ b/frmts/pcidsk/sdk/segment/cpcidskgcp2segment.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #include "segment/cpcidskgcp2segment.h"
 
diff --git a/frmts/pcidsk/sdk/segment/cpcidskgcp2segment.h b/frmts/pcidsk/sdk/segment/cpcidskgcp2segment.h
index b8c64000b48e..719b6dd7b821 100644
--- a/frmts/pcidsk/sdk/segment/cpcidskgcp2segment.h
+++ b/frmts/pcidsk/sdk/segment/cpcidskgcp2segment.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_SEGMENT_CPCIDSKGCP2SEGMENT_H
 #define INCLUDE_SEGMENT_CPCIDSKGCP2SEGMENT_H
diff --git a/frmts/pcidsk/sdk/segment/cpcidskgeoref.cpp b/frmts/pcidsk/sdk/segment/cpcidskgeoref.cpp
index fccacbcb6f11..bf3be253f404 100644
--- a/frmts/pcidsk/sdk/segment/cpcidskgeoref.cpp
+++ b/frmts/pcidsk/sdk/segment/cpcidskgeoref.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk_exception.h"
diff --git a/frmts/pcidsk/sdk/segment/cpcidskgeoref.h b/frmts/pcidsk/sdk/segment/cpcidskgeoref.h
index 813708ae8cb8..79bfe02f2b83 100644
--- a/frmts/pcidsk/sdk/segment/cpcidskgeoref.h
+++ b/frmts/pcidsk/sdk/segment/cpcidskgeoref.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_SEGMENT_PCIDSKGEOREF_H
 #define INCLUDE_SEGMENT_PCIDSKGEOREF_H
diff --git a/frmts/pcidsk/sdk/segment/cpcidsklut.cpp b/frmts/pcidsk/sdk/segment/cpcidsklut.cpp
index fbda4ef4164b..dd84777b1fc1 100644
--- a/frmts/pcidsk/sdk/segment/cpcidsklut.cpp
+++ b/frmts/pcidsk/sdk/segment/cpcidsklut.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2015
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk_exception.h"
diff --git a/frmts/pcidsk/sdk/segment/cpcidsklut.h b/frmts/pcidsk/sdk/segment/cpcidsklut.h
index 7661a5f7eb38..c84c0277d0f0 100644
--- a/frmts/pcidsk/sdk/segment/cpcidsklut.h
+++ b/frmts/pcidsk/sdk/segment/cpcidsklut.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2015
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_SEGMENT_PCIDSK_LUT_H
 #define INCLUDE_SEGMENT_PCIDSK_LUT_H
diff --git a/frmts/pcidsk/sdk/segment/cpcidskpct.cpp b/frmts/pcidsk/sdk/segment/cpcidskpct.cpp
index ae0321fd4313..d2fd3219cf1b 100644
--- a/frmts/pcidsk/sdk/segment/cpcidskpct.cpp
+++ b/frmts/pcidsk/sdk/segment/cpcidskpct.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk_exception.h"
diff --git a/frmts/pcidsk/sdk/segment/cpcidskpct.h b/frmts/pcidsk/sdk/segment/cpcidskpct.h
index d3b203b5706a..8e102cc662dd 100644
--- a/frmts/pcidsk/sdk/segment/cpcidskpct.h
+++ b/frmts/pcidsk/sdk/segment/cpcidskpct.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_SEGMENT_PCIDSK_PCT_H
 #define INCLUDE_SEGMENT_PCIDSK_PCT_H
diff --git a/frmts/pcidsk/sdk/segment/cpcidskpolymodel.cpp b/frmts/pcidsk/sdk/segment/cpcidskpolymodel.cpp
index 2bd54b81e670..cfbab642173c 100644
--- a/frmts/pcidsk/sdk/segment/cpcidskpolymodel.cpp
+++ b/frmts/pcidsk/sdk/segment/cpcidskpolymodel.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk_poly.h"
diff --git a/frmts/pcidsk/sdk/segment/cpcidskpolymodel.h b/frmts/pcidsk/sdk/segment/cpcidskpolymodel.h
index 93f356f8f981..3b3e1d351b3b 100644
--- a/frmts/pcidsk/sdk/segment/cpcidskpolymodel.h
+++ b/frmts/pcidsk/sdk/segment/cpcidskpolymodel.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PCIDSK_SEGMENT_PCIDSKPOLYMODEL_H
 #define INCLUDE_PCIDSK_SEGMENT_PCIDSKPOLYMODEL_H
diff --git a/frmts/pcidsk/sdk/segment/cpcidskrpcmodel.cpp b/frmts/pcidsk/sdk/segment/cpcidskrpcmodel.cpp
index 0ab52175d59f..af80b41afd85 100644
--- a/frmts/pcidsk/sdk/segment/cpcidskrpcmodel.cpp
+++ b/frmts/pcidsk/sdk/segment/cpcidskrpcmodel.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk_rpc.h"
diff --git a/frmts/pcidsk/sdk/segment/cpcidskrpcmodel.h b/frmts/pcidsk/sdk/segment/cpcidskrpcmodel.h
index 01ad727167fc..91421fd5c405 100644
--- a/frmts/pcidsk/sdk/segment/cpcidskrpcmodel.h
+++ b/frmts/pcidsk/sdk/segment/cpcidskrpcmodel.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PCIDSK_SEGMENT_PCIDSKRPCMODEL_H
 #define INCLUDE_PCIDSK_SEGMENT_PCIDSKRPCMODEL_H
diff --git a/frmts/pcidsk/sdk/segment/cpcidsksegment.cpp b/frmts/pcidsk/sdk/segment/cpcidsksegment.cpp
index fa59539532fd..13602d1cf736 100644
--- a/frmts/pcidsk/sdk/segment/cpcidsksegment.cpp
+++ b/frmts/pcidsk/sdk/segment/cpcidsksegment.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "segment/cpcidsksegment.h"
diff --git a/frmts/pcidsk/sdk/segment/cpcidsksegment.h b/frmts/pcidsk/sdk/segment/cpcidsksegment.h
index 8d120d02086b..a6c4112264bf 100644
--- a/frmts/pcidsk/sdk/segment/cpcidsksegment.h
+++ b/frmts/pcidsk/sdk/segment/cpcidsksegment.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef INCLUDE_SEGMENT_PCIDSKSEGMENT_H
diff --git a/frmts/pcidsk/sdk/segment/cpcidsktoutinmodel.cpp b/frmts/pcidsk/sdk/segment/cpcidsktoutinmodel.cpp
index 83f73a7169c8..91f498368da9 100644
--- a/frmts/pcidsk/sdk/segment/cpcidsktoutinmodel.cpp
+++ b/frmts/pcidsk/sdk/segment/cpcidsktoutinmodel.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "segment/cpcidsksegment.h"
diff --git a/frmts/pcidsk/sdk/segment/cpcidsktoutinmodel.h b/frmts/pcidsk/sdk/segment/cpcidsktoutinmodel.h
index 5a7ae6b447b8..4ee60e52d6dc 100644
--- a/frmts/pcidsk/sdk/segment/cpcidsktoutinmodel.h
+++ b/frmts/pcidsk/sdk/segment/cpcidsktoutinmodel.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PCIDSK_SEGMENT_PCIDSKTOUTINMODEL_H
 #define INCLUDE_PCIDSK_SEGMENT_PCIDSKTOUTINMODEL_H
diff --git a/frmts/pcidsk/sdk/segment/cpcidskvectorsegment.cpp b/frmts/pcidsk/sdk/segment/cpcidskvectorsegment.cpp
index 22e59ae4696c..810df4c0f30f 100644
--- a/frmts/pcidsk/sdk/segment/cpcidskvectorsegment.cpp
+++ b/frmts/pcidsk/sdk/segment/cpcidskvectorsegment.cpp
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk_file.h"
diff --git a/frmts/pcidsk/sdk/segment/cpcidskvectorsegment.h b/frmts/pcidsk/sdk/segment/cpcidskvectorsegment.h
index 488dc5db4c27..8dcaf5da893b 100644
--- a/frmts/pcidsk/sdk/segment/cpcidskvectorsegment.h
+++ b/frmts/pcidsk/sdk/segment/cpcidskvectorsegment.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_SEGMENT_PCIDSKVECTORSEGMENT_H
 #define INCLUDE_SEGMENT_PCIDSKVECTORSEGMENT_H
diff --git a/frmts/pcidsk/sdk/segment/cpcidskvectorsegment_consistencycheck.cpp b/frmts/pcidsk/sdk/segment/cpcidskvectorsegment_consistencycheck.cpp
index af7f8d869e2b..37e7d0236148 100644
--- a/frmts/pcidsk/sdk/segment/cpcidskvectorsegment_consistencycheck.cpp
+++ b/frmts/pcidsk/sdk/segment/cpcidskvectorsegment_consistencycheck.cpp
@@ -7,23 +7,7 @@
  * Copyright (c) 2010
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk_file.h"
diff --git a/frmts/pcidsk/sdk/segment/metadatasegment.h b/frmts/pcidsk/sdk/segment/metadatasegment.h
index 5e2ce95956eb..d6981e89ff35 100644
--- a/frmts/pcidsk/sdk/segment/metadatasegment.h
+++ b/frmts/pcidsk/sdk/segment/metadatasegment.h
@@ -11,23 +11,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef INCLUDE_SEGMENT_METADATASEGMENT_H
diff --git a/frmts/pcidsk/sdk/segment/metadatasegment_p.cpp b/frmts/pcidsk/sdk/segment/metadatasegment_p.cpp
index 7caee9814fe0..0d226021d888 100644
--- a/frmts/pcidsk/sdk/segment/metadatasegment_p.cpp
+++ b/frmts/pcidsk/sdk/segment/metadatasegment_p.cpp
@@ -11,23 +11,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk_exception.h"
diff --git a/frmts/pcidsk/sdk/segment/orbitstructures.h b/frmts/pcidsk/sdk/segment/orbitstructures.h
index 8c30463ece15..498ec0a942e3 100644
--- a/frmts/pcidsk/sdk/segment/orbitstructures.h
+++ b/frmts/pcidsk/sdk/segment/orbitstructures.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PCIDSK_ORBIT_INFORMATION_H
 #define INCLUDE_PCIDSK_ORBIT_INFORMATION_H
diff --git a/frmts/pcidsk/sdk/segment/pcidsksegmentbuilder.h b/frmts/pcidsk/sdk/segment/pcidsksegmentbuilder.h
index f066d15efcaf..f87891c34344 100644
--- a/frmts/pcidsk/sdk/segment/pcidsksegmentbuilder.h
+++ b/frmts/pcidsk/sdk/segment/pcidsksegmentbuilder.h
@@ -7,23 +7,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef INCLUDE_SEGMENT_PCIDSKSEGMENTBUILDER_H
diff --git a/frmts/pcidsk/sdk/segment/systiledir.cpp b/frmts/pcidsk/sdk/segment/systiledir.cpp
index 98d54007ef00..a7fcdf610bfe 100644
--- a/frmts/pcidsk/sdk/segment/systiledir.cpp
+++ b/frmts/pcidsk/sdk/segment/systiledir.cpp
@@ -13,23 +13,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "segment/systiledir.h"
diff --git a/frmts/pcidsk/sdk/segment/systiledir.h b/frmts/pcidsk/sdk/segment/systiledir.h
index 37a6fff934b1..d36e48049177 100644
--- a/frmts/pcidsk/sdk/segment/systiledir.h
+++ b/frmts/pcidsk/sdk/segment/systiledir.h
@@ -13,23 +13,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef PCIDSK_SEGMENT_SYSTEM_TILE_DIRECTORY_H
diff --git a/frmts/pcidsk/sdk/segment/toutinstructures.h b/frmts/pcidsk/sdk/segment/toutinstructures.h
index be84bba593d4..9aad9310480b 100644
--- a/frmts/pcidsk/sdk/segment/toutinstructures.h
+++ b/frmts/pcidsk/sdk/segment/toutinstructures.h
@@ -6,23 +6,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_PCIDSK_TOUTIN_INFORMATION_H
 #define INCLUDE_PCIDSK_TOUTIN_INFORMATION_H
diff --git a/frmts/pcidsk/sdk/segment/vecsegdataindex.cpp b/frmts/pcidsk/sdk/segment/vecsegdataindex.cpp
index 79eb207bc044..f66028b95656 100644
--- a/frmts/pcidsk/sdk/segment/vecsegdataindex.cpp
+++ b/frmts/pcidsk/sdk/segment/vecsegdataindex.cpp
@@ -11,23 +11,7 @@
  * Copyright (c) 2010
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk.h"
diff --git a/frmts/pcidsk/sdk/segment/vecsegdataindex.h b/frmts/pcidsk/sdk/segment/vecsegdataindex.h
index fe41d9cf9a5d..4dbd48eecac9 100644
--- a/frmts/pcidsk/sdk/segment/vecsegdataindex.h
+++ b/frmts/pcidsk/sdk/segment/vecsegdataindex.h
@@ -11,23 +11,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef INCLUDE_SEGMENT_VECSEGDATAINDEX_H
diff --git a/frmts/pcidsk/sdk/segment/vecsegheader.cpp b/frmts/pcidsk/sdk/segment/vecsegheader.cpp
index 21a62ba4dfa9..5d774426ffb8 100644
--- a/frmts/pcidsk/sdk/segment/vecsegheader.cpp
+++ b/frmts/pcidsk/sdk/segment/vecsegheader.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2010
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcidsk.h"
diff --git a/frmts/pcidsk/sdk/segment/vecsegheader.h b/frmts/pcidsk/sdk/segment/vecsegheader.h
index 744317d227ff..f2379bf1b481 100644
--- a/frmts/pcidsk/sdk/segment/vecsegheader.h
+++ b/frmts/pcidsk/sdk/segment/vecsegheader.h
@@ -10,23 +10,7 @@
  * Copyright (c) 2009
  * PCI Geomatics, 90 Allstate Parkway, Markham, Ontario, Canada.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef INCLUDE_SEGMENT_VECSEGHEADER_H
 #define INCLUDE_SEGMENT_VECSEGHEADER_H
diff --git a/frmts/pcidsk/vsi_pcidsk_io.cpp b/frmts/pcidsk/vsi_pcidsk_io.cpp
index 89ebfccddff3..e1f78020a2bc 100644
--- a/frmts/pcidsk/vsi_pcidsk_io.cpp
+++ b/frmts/pcidsk/vsi_pcidsk_io.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2009, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/frmts/pcraster/pcrasterdataset.cpp b/frmts/pcraster/pcrasterdataset.cpp
index 11b31b641656..52d3958c7587 100644
--- a/frmts/pcraster/pcrasterdataset.cpp
+++ b/frmts/pcraster/pcrasterdataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) PCRaster owners
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/frmts/pcraster/pcrasterdataset.h b/frmts/pcraster/pcrasterdataset.h
index f2d4fd0d286b..a75b380a22cb 100644
--- a/frmts/pcraster/pcrasterdataset.h
+++ b/frmts/pcraster/pcrasterdataset.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) PCRaster owners
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef INCLUDED_PCRASTERDATASET
diff --git a/frmts/pcraster/pcrasterdrivercore.cpp b/frmts/pcraster/pcrasterdrivercore.cpp
index d17ad036c4f8..1e106105c125 100644
--- a/frmts/pcraster/pcrasterdrivercore.cpp
+++ b/frmts/pcraster/pcrasterdrivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) PCRaster owners
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pcrasterdrivercore.h"
diff --git a/frmts/pcraster/pcrasterdrivercore.h b/frmts/pcraster/pcrasterdrivercore.h
index 34a2cce362d7..9dcf1bb09626 100644
--- a/frmts/pcraster/pcrasterdrivercore.h
+++ b/frmts/pcraster/pcrasterdrivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) PCRaster owners
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef PCRASTERDRIVERCORE_H
diff --git a/frmts/pcraster/pcrastermisc.cpp b/frmts/pcraster/pcrastermisc.cpp
index 929430523be4..6e8976e88bf8 100644
--- a/frmts/pcraster/pcrastermisc.cpp
+++ b/frmts/pcraster/pcrastermisc.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) PCRaster owners
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_frmts.h"
diff --git a/frmts/pcraster/pcrasterrasterband.cpp b/frmts/pcraster/pcrasterrasterband.cpp
index 23384b2c7bc1..05dbcf4647bb 100644
--- a/frmts/pcraster/pcrasterrasterband.cpp
+++ b/frmts/pcraster/pcrasterrasterband.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) PCRaster owners
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "csf.h"
diff --git a/frmts/pcraster/pcrasterrasterband.h b/frmts/pcraster/pcrasterrasterband.h
index 7de3198c4753..5072155620ea 100644
--- a/frmts/pcraster/pcrasterrasterband.h
+++ b/frmts/pcraster/pcrasterrasterband.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) PCRaster owners
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef INCLUDED_PCRASTERRASTERBAND
diff --git a/frmts/pcraster/pcrasterutil.cpp b/frmts/pcraster/pcrasterutil.cpp
index a424278308b2..2ef95dc6ab9f 100644
--- a/frmts/pcraster/pcrasterutil.cpp
+++ b/frmts/pcraster/pcrasterutil.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) PCRaster owners
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <cfloat>
@@ -393,8 +377,6 @@ CSF_CR GDALType2CellRepresentation(GDALDataType type, bool exact)
 /*!
   \param     cellRepresentation Cell representation of the data.
   \return    Missing value.
-  \exception .
-  \sa        .
 */
 double missingValue(CSF_CR cellRepresentation)
 {
@@ -468,9 +450,6 @@ double missingValue(CSF_CR cellRepresentation)
 /*!
   \param     filename Filename of raster to open.
   \return    Pointer to CSF MAP structure.
-  \exception .
-  \warning   .
-  \sa        .
 */
 MAP *mapOpen(std::string const &filename, MOPEN_PERM mode)
 {
diff --git a/frmts/pcraster/pcrasterutil.h b/frmts/pcraster/pcrasterutil.h
index 9683d227f148..50bfc1e75edc 100644
--- a/frmts/pcraster/pcrasterutil.h
+++ b/frmts/pcraster/pcrasterutil.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) PCRaster owners
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef INCLUDED_PCRASTERUTIL
diff --git a/frmts/pdf/CMakeLists.txt b/frmts/pdf/CMakeLists.txt
index 957304165b21..587b8bbc5ae3 100644
--- a/frmts/pdf/CMakeLists.txt
+++ b/frmts/pdf/CMakeLists.txt
@@ -19,6 +19,7 @@ add_gdal_driver(
           pdfwritabledataset.cpp
           pdfcreatefromcomposition.cpp
   CORE_SOURCES pdfdrivercore.cpp
+  STRONG_CXX_WFLAGS
   PLUGIN_CAPABLE
   NO_SHARED_SYMBOL_WITH_CORE)
 
@@ -76,7 +77,13 @@ if (GDAL_USE_PDFIUM)
   target_compile_definitions(gdal_PDF PRIVATE -DHAVE_PDFIUM)
   gdal_target_link_libraries(gdal_PDF PRIVATE PDFIUM::PDFIUM)
   if (UNIX)
+    find_package(JPEG REQUIRED)
+    find_package(PNG REQUIRED)
+    find_package(OpenJPEG REQUIRED)
     find_library(LCMS2_LIBRARY NAMES lcms2)
+    if(NOT LCMS2_LIBRARY)
+      message(FATAL_ERROR "LCMS2 library not found. Please install liblcms2-dev.")
+    endif()
 
     # Rather hacky... Related how we build pdfium in https://github.com/rouault/pdfium_build_gdal_3_4
     gdal_target_link_libraries(
diff --git a/frmts/pdf/data/pdfcomposition.xsd b/frmts/pdf/data/pdfcomposition.xsd
index 5d1bf92da433..940bdf526c1d 100644
--- a/frmts/pdf/data/pdfcomposition.xsd
+++ b/frmts/pdf/data/pdfcomposition.xsd
@@ -10,23 +10,7 @@
  **********************************************************************
  * Copyright (c) 2019, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="1.0">
diff --git a/frmts/pdf/gdal_pdf.h b/frmts/pdf/gdal_pdf.h
index d46ef09e96c9..04f7243b13fc 100644
--- a/frmts/pdf/gdal_pdf.h
+++ b/frmts/pdf/gdal_pdf.h
@@ -15,23 +15,7 @@
  ******************************************************************************
  * Copyright (c) 2010-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_PDF_H_INCLUDED
@@ -83,6 +67,8 @@ class OGRPDFLayer final : public OGRMemLayer
     int bGeomTypeSet;
     int bGeomTypeMixed;
 
+    CPL_DISALLOW_COPY_ASSIGN(OGRPDFLayer)
+
   public:
     OGRPDFLayer(PDFDataset *poDS, const char *pszName,
                 OGRSpatialReference *poSRS, OGRwkbGeometryType eGeomType);
@@ -106,6 +92,8 @@ class OGRPDFWritableLayer final : public OGRMemLayer
 {
     PDFWritableVectorDataset *poDS;
 
+    CPL_DISALLOW_COPY_ASSIGN(OGRPDFWritableLayer)
+
   public:
     OGRPDFWritableLayer(PDFWritableVectorDataset *poDS, const char *pszName,
                         OGRSpatialReference *poSRS,
@@ -161,13 +149,13 @@ typedef std::map<int, TPdfiumPageStruct *> TMapPdfiumPages;
 /************************************************************************/
 
 // Structure for Mutex on File
-typedef struct
+struct TPdfiumDocumentStruct
 {
-    char *filename;
-    CPDF_Document *doc;
-    TMapPdfiumPages pages;
-    FPDF_FILEACCESS *psFileAccess;
-} TPdfiumDocumentStruct;
+    char *filename = nullptr;
+    CPDF_Document *doc = nullptr;
+    TMapPdfiumPages pages{};
+    FPDF_FILEACCESS *psFileAccess = nullptr;
+};
 
 #endif  // ~ HAVE_PDFIUM
 
@@ -266,6 +254,8 @@ class PDFDataset final : public GDALPamDataset
     void FindXMP(GDALPDFObject *poObj);
     void ParseInfo(GDALPDFObject *poObj);
 
+    CPL_DISALLOW_COPY_ASSIGN(PDFDataset)
+
 #ifdef HAVE_POPPLER
     std::unique_ptr<Object> m_poCatalogObjectPoppler{};
 #endif
@@ -536,6 +526,8 @@ class PDFWritableVectorDataset final : public GDALDataset
 
     int bModified;
 
+    CPL_DISALLOW_COPY_ASSIGN(PDFWritableVectorDataset)
+
   public:
     PDFWritableVectorDataset();
     virtual ~PDFWritableVectorDataset();
diff --git a/frmts/pdf/ogrpdflayer.cpp b/frmts/pdf/ogrpdflayer.cpp
index 40f6a94bfec3..84af43e78e43 100644
--- a/frmts/pdf/ogrpdflayer.cpp
+++ b/frmts/pdf/ogrpdflayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_pdf.h"
diff --git a/frmts/pdf/pdfcreatecopy.cpp b/frmts/pdf/pdfcreatecopy.cpp
index 462c2b158bc6..3dd8c18627aa 100644
--- a/frmts/pdf/pdfcreatecopy.cpp
+++ b/frmts/pdf/pdfcreatecopy.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2012-2019, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_pdf.h"
@@ -195,7 +179,7 @@ int GDALPDFUpdateWriter::ParseTrailerAndXRef()
 
     /* Find startxref section */
     VSIFSeekL(m_fp, nOffset, SEEK_SET);
-    int nRead = (int)VSIFReadL(szBuf, 1, 128, m_fp);
+    int nRead = static_cast<int>(VSIFReadL(szBuf, 1, 128, m_fp));
     szBuf[nRead] = 0;
     if (nRead < 9)
         return FALSE;
@@ -244,7 +228,7 @@ int GDALPDFUpdateWriter::ParseTrailerAndXRef()
     }
 
     /* Read trailer content */
-    nRead = (int)VSIFReadL(szBuf, 1, 1024, m_fp);
+    nRead = static_cast<int>(VSIFReadL(szBuf, 1, 1024, m_fp));
     szBuf[nRead] = 0;
 
     /* Find XRef size */
@@ -325,7 +309,7 @@ void GDALPDFUpdateWriter::UpdateProj(GDALDataset *poSrcDS, double dfDPI,
                                      int nPageGen)
 {
     m_bUpdateNeeded = true;
-    if ((int)m_asXRefEntries.size() < m_nLastXRefSize - 1)
+    if (static_cast<int>(m_asXRefEntries.size()) < m_nLastXRefSize - 1)
         m_asXRefEntries.resize(m_nLastXRefSize - 1);
 
     GDALPDFObjectNum nViewportId;
@@ -387,7 +371,7 @@ void GDALPDFUpdateWriter::UpdateProj(GDALDataset *poSrcDS, double dfDPI,
 void GDALPDFUpdateWriter::UpdateInfo(GDALDataset *poSrcDS)
 {
     m_bUpdateNeeded = true;
-    if ((int)m_asXRefEntries.size() < m_nLastXRefSize - 1)
+    if (static_cast<int>(m_asXRefEntries.size()) < m_nLastXRefSize - 1)
         m_asXRefEntries.resize(m_nLastXRefSize - 1);
 
     auto nNewInfoId = SetInfo(poSrcDS, nullptr);
@@ -414,7 +398,7 @@ void GDALPDFUpdateWriter::UpdateXMP(GDALDataset *poSrcDS,
                                     GDALPDFDictionaryRW *poCatalogDict)
 {
     m_bUpdateNeeded = true;
-    if ((int)m_asXRefEntries.size() < m_nLastXRefSize - 1)
+    if (static_cast<int>(m_asXRefEntries.size()) < m_nLastXRefSize - 1)
         m_asXRefEntries.resize(m_nLastXRefSize - 1);
 
     CPLAssert(m_nCatalogId.toBool());
@@ -483,7 +467,8 @@ void GDALPDFBaseWriter::WriteXRefTableAndTrailer(bool bUpdate,
                         m_asXRefEntries[i + nCount].bFree))
                     nCount++;
 
-                VSIFPrintfL(m_fp, "%d %d\n", (int)i + 1, (int)nCount);
+                VSIFPrintfL(m_fp, "%d %d\n", static_cast<int>(i) + 1,
+                            static_cast<int>(nCount));
                 size_t iEnd = i + nCount;
                 for (; i < iEnd; i++)
                 {
@@ -503,7 +488,8 @@ void GDALPDFBaseWriter::WriteXRefTableAndTrailer(bool bUpdate,
     }
     else
     {
-        VSIFPrintfL(m_fp, "%d %d\n", 0, (int)m_asXRefEntries.size() + 1);
+        VSIFPrintfL(m_fp, "%d %d\n", 0,
+                    static_cast<int>(m_asXRefEntries.size()) + 1);
         VSIFPrintfL(m_fp, "0000000000 65535 f \n");
         for (size_t i = 0; i < m_asXRefEntries.size(); i++)
         {
@@ -516,12 +502,12 @@ void GDALPDFBaseWriter::WriteXRefTableAndTrailer(bool bUpdate,
 
     VSIFPrintfL(m_fp, "trailer\n");
     GDALPDFDictionaryRW oDict;
-    oDict.Add("Size", (int)m_asXRefEntries.size() + 1)
+    oDict.Add("Size", static_cast<int>(m_asXRefEntries.size()) + 1)
         .Add("Root", m_nCatalogId, m_nCatalogGen);
     if (m_nInfoId.toBool())
         oDict.Add("Info", m_nInfoId, m_nInfoGen);
     if (nLastStartXRef)
-        oDict.Add("Prev", (double)nLastStartXRef);
+        oDict.Add("Prev", static_cast<double>(nLastStartXRef));
     VSIFPrintfL(m_fp, "%s\n", oDict.Serialize().c_str());
 
     VSIFPrintfL(m_fp,
@@ -537,7 +523,7 @@ void GDALPDFBaseWriter::WriteXRefTableAndTrailer(bool bUpdate,
 void GDALPDFBaseWriter::StartObj(const GDALPDFObjectNum &nObjectId, int nGen)
 {
     CPLAssert(!m_bInWriteObj);
-    CPLAssert(nObjectId.toInt() - 1 < (int)m_asXRefEntries.size());
+    CPLAssert(nObjectId.toInt() - 1 < static_cast<int>(m_asXRefEntries.size()));
     CPLAssert(m_asXRefEntries[nObjectId.toInt() - 1].nOffset == 0);
     m_asXRefEntries[nObjectId.toInt() - 1].nOffset = VSIFTellL(m_fp);
     m_asXRefEntries[nObjectId.toInt() - 1].nGen = nGen;
@@ -1702,7 +1688,7 @@ GDALPDFObjectNum GDALPDFBaseWriter::SetXMP(GDALDataset *poSrcDS,
     GDALPDFDictionaryRW oDict;
     oDict.Add("Type", GDALPDFObjectRW::CreateName("Metadata"))
         .Add("Subtype", GDALPDFObjectRW::CreateName("XML"))
-        .Add("Length", (int)strlen(pszXMP));
+        .Add("Length", static_cast<int>(strlen(pszXMP)));
     VSIFPrintfL(m_fp, "%s\n", oDict.Serialize().c_str());
     VSIFPrintfL(m_fp, "stream\n");
     VSIFPrintfL(m_fp, "%s\n", pszXMP);
@@ -1882,9 +1868,9 @@ GDALPDFObjectNum GDALPDFBaseWriter::WriteColorTable(GDALDataset *poSrcDS)
         for (int i = 0; i < nColors; i++)
         {
             const GDALColorEntry *poEntry = poCT->GetColorEntry(i);
-            pabyLookup[3 * i + 0] = (GByte)poEntry->c1;
-            pabyLookup[3 * i + 1] = (GByte)poEntry->c2;
-            pabyLookup[3 * i + 2] = (GByte)poEntry->c3;
+            pabyLookup[3 * i + 0] = static_cast<GByte>(poEntry->c1);
+            pabyLookup[3 * i + 1] = static_cast<GByte>(poEntry->c2);
+            pabyLookup[3 * i + 2] = static_cast<GByte>(poEntry->c3);
         }
         VSIFWriteL(pabyLookup, 3 * nColors, 1, m_fp);
         VSIFPrintfL(m_fp, "\n");
@@ -1936,7 +1922,7 @@ bool GDALPDFWriter::WriteImagery(GDALDataset *poDS, const char *pszLayerName,
             int iImage = nBlockYOff * nXBlocks + nBlockXOff;
 
             void *pScaledData = GDALCreateScaledProgress(
-                iImage / (double)nBlocks, (iImage + 1) / (double)nBlocks,
+                iImage / double(nBlocks), (iImage + 1) / double(nBlocks),
                 pfnProgress, pProgressData);
             int nX = nBlockXOff * nBlockXSize;
             int nY = nBlockYOff * nBlockYSize;
@@ -2038,7 +2024,7 @@ bool GDALPDFWriter::WriteClippedImagery(
             int iImage = nBlockYOff * nXBlocks + nBlockXOff;
 
             void *pScaledData = GDALCreateScaledProgress(
-                iImage / (double)nBlocks, (iImage + 1) / (double)nBlocks,
+                iImage / double(nBlocks), (iImage + 1) / double(nBlocks),
                 pfnProgress, pProgressData);
 
             int nX = nBlockXOff * nBlockXSize;
@@ -2073,31 +2059,33 @@ bool GDALPDFWriter::WriteClippedImagery(
                 /* Re-compute (x,y,width,height) subwindow of current raster
                  * from */
                 /* the extent of the clipped block */
-                nX = (int)((dfIntersectMinX - dfRasterMinX) /
-                               adfGeoTransform[1] +
-                           0.5);
+                nX = static_cast<int>((dfIntersectMinX - dfRasterMinX) /
+                                          adfGeoTransform[1] +
+                                      0.5);
                 if (adfGeoTransform[5] < 0)
-                    nY = (int)((dfRasterMaxY - dfIntersectMaxY) /
-                                   (-adfGeoTransform[5]) +
-                               0.5);
+                    nY = static_cast<int>((dfRasterMaxY - dfIntersectMaxY) /
+                                              (-adfGeoTransform[5]) +
+                                          0.5);
                 else
-                    nY = (int)((dfIntersectMinY - dfRasterMinY) /
-                                   adfGeoTransform[5] +
-                               0.5);
-                nReqWidth = (int)((dfIntersectMaxX - dfRasterMinX) /
-                                      adfGeoTransform[1] +
-                                  0.5) -
+                    nY = static_cast<int>((dfIntersectMinY - dfRasterMinY) /
+                                              adfGeoTransform[5] +
+                                          0.5);
+                nReqWidth = static_cast<int>((dfIntersectMaxX - dfRasterMinX) /
+                                                 adfGeoTransform[1] +
+                                             0.5) -
                             nX;
                 if (adfGeoTransform[5] < 0)
-                    nReqHeight = (int)((dfRasterMaxY - dfIntersectMinY) /
-                                           (-adfGeoTransform[5]) +
-                                       0.5) -
-                                 nY;
+                    nReqHeight =
+                        static_cast<int>((dfRasterMaxY - dfIntersectMinY) /
+                                             (-adfGeoTransform[5]) +
+                                         0.5) -
+                        nY;
                 else
-                    nReqHeight = (int)((dfIntersectMaxY - dfRasterMinY) /
-                                           adfGeoTransform[5] +
-                                       0.5) -
-                                 nY;
+                    nReqHeight =
+                        static_cast<int>((dfIntersectMaxY - dfRasterMinY) /
+                                             adfGeoTransform[5] +
+                                         0.5) -
+                        nY;
 
                 if (nReqWidth > 0 && nReqHeight > 0)
                 {
@@ -2178,13 +2166,15 @@ bool GDALPDFWriter::WriteOGRDataSource(const char *pszOGRDataSource,
                                        const char *pszOGRLinkField,
                                        int bWriteOGRAttributes)
 {
-    OGRDataSourceH hDS = OGROpen(pszOGRDataSource, 0, nullptr);
+    GDALDatasetH hDS =
+        GDALOpenEx(pszOGRDataSource, GDAL_OF_VECTOR | GDAL_OF_VERBOSE_ERROR,
+                   nullptr, nullptr, nullptr);
     if (hDS == nullptr)
         return false;
 
     int iObj = 0;
 
-    int nLayers = OGR_DS_GetLayerCount(hDS);
+    int nLayers = GDALDatasetGetLayerCount(hDS);
 
     char **papszLayerNames =
         CSLTokenizeString2(pszOGRDisplayLayerNames, ",", 0);
@@ -2193,7 +2183,7 @@ bool GDALPDFWriter::WriteOGRDataSource(const char *pszOGRDataSource,
     {
         CPLString osLayerName;
         if (CSLCount(papszLayerNames) < nLayers)
-            osLayerName = OGR_L_GetName(OGR_DS_GetLayer(hDS, iLayer));
+            osLayerName = OGR_L_GetName(GDALDatasetGetLayer(hDS, iLayer));
         else
             osLayerName = papszLayerNames[iLayer];
 
@@ -2201,7 +2191,7 @@ bool GDALPDFWriter::WriteOGRDataSource(const char *pszOGRDataSource,
                       osLayerName, bWriteOGRAttributes, iObj);
     }
 
-    OGRReleaseDataSource(hDS);
+    GDALClose(hDS);
 
     CSLDestroy(papszLayerNames);
 
@@ -2249,9 +2239,9 @@ void GDALPDFWriter::EndOGRLayer(GDALPDFLayerDesc &osVectorDesc)
         GDALPDFArrayRW *poArray = new GDALPDFArrayRW();
         oDict.Add("K", poArray);
 
-        for (int i = 0; i < (int)osVectorDesc.aUserPropertiesIds.size(); i++)
+        for (const auto &prop : osVectorDesc.aUserPropertiesIds)
         {
-            poArray->Add(osVectorDesc.aUserPropertiesIds[i], 0);
+            poArray->Add(prop, 0);
         }
 
         if (!m_nStructTreeRootId.toBool())
@@ -2273,7 +2263,7 @@ void GDALPDFWriter::EndOGRLayer(GDALPDFLayerDesc &osVectorDesc)
 /*                           WriteOGRLayer()                            */
 /************************************************************************/
 
-int GDALPDFWriter::WriteOGRLayer(OGRDataSourceH hDS, int iLayer,
+int GDALPDFWriter::WriteOGRLayer(GDALDatasetH hDS, int iLayer,
                                  const char *pszOGRDisplayField,
                                  const char *pszOGRLinkField,
                                  const std::string &osLayerName,
@@ -2286,7 +2276,7 @@ int GDALPDFWriter::WriteOGRLayer(OGRDataSourceH hDS, int iLayer,
 
     GDALPDFLayerDesc osVectorDesc =
         StartOGRLayer(osLayerName, bWriteOGRAttributes);
-    OGRLayerH hLyr = OGR_DS_GetLayer(hDS, iLayer);
+    OGRLayerH hLyr = GDALDatasetGetLayer(hDS, iLayer);
 
     const auto poLayerDefn = OGRLayer::FromHandle(hLyr)->GetLayerDefn();
     for (int i = 0; i < poLayerDefn->GetFieldCount(); i++)
@@ -2771,8 +2761,8 @@ void GDALPDFBaseWriter::GetObjectStyle(
                             const GDALPDFImageDesc &oDesc =
                                 oMapSymbolFilenameToDesc[os.osSymbolId];
                             os.nImageSymbolId = oDesc.nImageId;
-                            os.nImageWidth = (int)oDesc.dfXSize;
-                            os.nImageHeight = (int)oDesc.dfYSize;
+                            os.nImageWidth = static_cast<int>(oDesc.dfXSize);
+                            os.nImageHeight = static_cast<int>(oDesc.dfYSize);
                         }
                     }
                 }
@@ -2846,14 +2836,14 @@ void GDALPDFBaseWriter::ComputeIntBBox(
             (os.nImageWidth >= os.nImageHeight)
                 ? dfRadius * os.nImageHeight / os.nImageWidth
                 : dfRadius;
-        bboxXMin = (int)floor(sEnvelope.MinX * adfMatrix[1] + adfMatrix[0] -
-                              dfSemiWidth);
-        bboxYMin = (int)floor(sEnvelope.MinY * adfMatrix[3] + adfMatrix[2] -
-                              dfSemiHeight);
-        bboxXMax = (int)ceil(sEnvelope.MaxX * adfMatrix[1] + adfMatrix[0] +
-                             dfSemiWidth);
-        bboxYMax = (int)ceil(sEnvelope.MaxY * adfMatrix[3] + adfMatrix[2] +
-                             dfSemiHeight);
+        bboxXMin = static_cast<int>(
+            floor(sEnvelope.MinX * adfMatrix[1] + adfMatrix[0] - dfSemiWidth));
+        bboxYMin = static_cast<int>(
+            floor(sEnvelope.MinY * adfMatrix[3] + adfMatrix[2] - dfSemiHeight));
+        bboxXMax = static_cast<int>(
+            ceil(sEnvelope.MaxX * adfMatrix[1] + adfMatrix[0] + dfSemiWidth));
+        bboxYMax = static_cast<int>(
+            ceil(sEnvelope.MaxY * adfMatrix[3] + adfMatrix[2] + dfSemiHeight));
     }
     else
     {
@@ -2868,14 +2858,14 @@ void GDALPDFBaseWriter::ComputeIntBBox(
             else
                 dfMargin += dfRadius;
         }
-        bboxXMin =
-            (int)floor(sEnvelope.MinX * adfMatrix[1] + adfMatrix[0] - dfMargin);
-        bboxYMin =
-            (int)floor(sEnvelope.MinY * adfMatrix[3] + adfMatrix[2] - dfMargin);
-        bboxXMax =
-            (int)ceil(sEnvelope.MaxX * adfMatrix[1] + adfMatrix[0] + dfMargin);
-        bboxYMax =
-            (int)ceil(sEnvelope.MaxY * adfMatrix[3] + adfMatrix[2] + dfMargin);
+        bboxXMin = static_cast<int>(
+            floor(sEnvelope.MinX * adfMatrix[1] + adfMatrix[0] - dfMargin));
+        bboxYMin = static_cast<int>(
+            floor(sEnvelope.MinY * adfMatrix[3] + adfMatrix[2] - dfMargin));
+        bboxXMax = static_cast<int>(
+            ceil(sEnvelope.MaxX * adfMatrix[1] + adfMatrix[0] + dfMargin));
+        bboxYMax = static_cast<int>(
+            ceil(sEnvelope.MaxY * adfMatrix[3] + adfMatrix[2] + dfMargin));
     }
 }
 
@@ -3579,12 +3569,13 @@ int GDALPDFWriter::EndPage(const char *pszExtraImages,
                 pszLinkVal = papszExtraImagesTokens[i] + 5;
                 i++;
             }
-            GDALDataset *poImageDS =
-                (GDALDataset *)GDALOpen(pszImageFilename, GA_ReadOnly);
+            auto poImageDS = std::unique_ptr<GDALDataset>(GDALDataset::Open(
+                pszImageFilename, GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR,
+                nullptr, nullptr, nullptr));
             if (poImageDS)
             {
                 auto nImageId = WriteBlock(
-                    poImageDS, 0, 0, poImageDS->GetRasterXSize(),
+                    poImageDS.get(), 0, 0, poImageDS->GetRasterXSize(),
                     poImageDS->GetRasterYSize(), GDALPDFObjectNum(),
                     COMPRESS_DEFAULT, 0, -1, nullptr, nullptr, nullptr);
 
@@ -3643,8 +3634,6 @@ int GDALPDFWriter::EndPage(const char *pszExtraImages,
                         EndObj();
                     }
                 }
-
-                GDALClose(poImageDS);
             }
         }
         CSLDestroy(papszExtraImagesTokens);
@@ -3769,7 +3758,7 @@ int GDALPDFWriter::EndPage(const char *pszExtraImages,
             VSIFPrintfL(m_fp, "EMC\n");
         }
         else
-            iObj += (int)oLayerDesc.aIds.size();
+            iObj += static_cast<int>(oLayerDesc.aIds.size());
     }
 
     /* -------------------------------------------------------------- */
@@ -4018,7 +4007,7 @@ GDALPDFObjectNum GDALPDFBaseWriter::WriteMask(GDALDataset *poSrcDS, int nXOff,
                                               PDFCompressMethod eCompressMethod)
 {
     int nMaskSize = nReqXSize * nReqYSize;
-    GByte *pabyMask = (GByte *)VSIMalloc(nMaskSize);
+    GByte *pabyMask = static_cast<GByte *>(VSIMalloc(nMaskSize));
     if (pabyMask == nullptr)
         return GDALPDFObjectNum();
 
@@ -4063,7 +4052,8 @@ GDALPDFObjectNum GDALPDFBaseWriter::WriteMask(GDALDataset *poSrcDS, int nXOff,
     {
         /* Translate to 1 bit */
         int nReqXSize1 = (nReqXSize + 7) / 8;
-        GByte *pabyMask1 = (GByte *)VSICalloc(nReqXSize1, nReqYSize);
+        GByte *pabyMask1 =
+            static_cast<GByte *>(VSICalloc(nReqXSize1, nReqYSize));
         if (pabyMask1 == nullptr)
         {
             CPLFree(pabyMask);
@@ -4131,10 +4121,8 @@ GDALPDFObjectNum GDALPDFBaseWriter::WriteBlock(
 
         /* Test if we can directly copy original JPEG content */
         /* if available */
-        if (poSrcDS->GetDriver() != nullptr &&
-            poSrcDS->GetDriver() == GDALGetDriverByName("VRT"))
+        if (VRTDataset *poVRTDS = dynamic_cast<VRTDataset *>(poSrcDS))
         {
-            VRTDataset *poVRTDS = (VRTDataset *)poSrcDS;
             poSrcDSToTest = poVRTDS->GetSingleSimpleSource();
         }
 
@@ -4150,7 +4138,7 @@ GDALPDFObjectNum GDALPDFBaseWriter::WriteBlock(
                 CPLDebug("PDF", "Copying directly original JPEG file");
 
                 VSIFSeekL(fpSrc, 0, SEEK_END);
-                int nLength = (int)VSIFTellL(fpSrc);
+                const int nLength = static_cast<int>(VSIFTellL(fpSrc));
                 VSIFSeekL(fpSrc, 0, SEEK_SET);
 
                 auto nImageId = AllocNewObject();
@@ -4175,16 +4163,16 @@ GDALPDFObjectNum GDALPDFBaseWriter::WriteBlock(
                 GByte abyBuffer[1024];
                 for (int i = 0; i < nLength; i += 1024)
                 {
-                    int nRead = (int)VSIFReadL(abyBuffer, 1, 1024, fpSrc);
-                    if ((int)VSIFWriteL(abyBuffer, 1, nRead, m_fp) != nRead)
+                    const auto nRead = VSIFReadL(abyBuffer, 1, 1024, fpSrc);
+                    if (VSIFWriteL(abyBuffer, 1, nRead, m_fp) != nRead)
                     {
                         eErr = CE_Failure;
                         break;
                     }
 
                     if (eErr == CE_None && pfnProgress != nullptr &&
-                        !pfnProgress((i + nRead) / (double)nLength, nullptr,
-                                     pProgressData))
+                        !pfnProgress(double(i + nRead) / double(nLength),
+                                     nullptr, pProgressData))
                     {
                         CPLError(CE_Failure, CPLE_UserInterrupt,
                                  "User terminated CreateCopy()");
@@ -4226,7 +4214,8 @@ GDALPDFObjectNum GDALPDFBaseWriter::WriteBlock(
         poMEMDS.reset(
             MEMDataset::Create("", nReqXSize, nReqYSize, 0, GDT_Byte, nullptr));
 
-        pabyMEMDSBuffer = (GByte *)VSIMalloc3(nReqXSize, nReqYSize, nBands);
+        pabyMEMDSBuffer =
+            static_cast<GByte *>(VSIMalloc3(nReqXSize, nReqYSize, nBands));
         if (pabyMEMDSBuffer == nullptr)
         {
             return GDALPDFObjectNum();
@@ -4311,29 +4300,31 @@ GDALPDFObjectNum GDALPDFBaseWriter::WriteBlock(
         eCompressMethod == COMPRESS_JPEG2000)
     {
         GDALDriver *poJPEGDriver = nullptr;
-        char szTmp[64];
+        std::string osTmpfilename;
         char **papszOptions = nullptr;
 
         bool bEcwEncodeKeyRequiredButNotFound = false;
         if (eCompressMethod == COMPRESS_JPEG)
         {
-            poJPEGDriver = (GDALDriver *)GDALGetDriverByName("JPEG");
+            poJPEGDriver = GetGDALDriverManager()->GetDriverByName("JPEG");
             if (poJPEGDriver != nullptr && nJPEGQuality > 0)
                 papszOptions = CSLAddString(
                     papszOptions, CPLSPrintf("QUALITY=%d", nJPEGQuality));
-            snprintf(szTmp, sizeof(szTmp), "/vsimem/pdftemp/%p.jpg", this);
+            osTmpfilename = VSIMemGenerateHiddenFilename("pdf_temp.jpg");
         }
         else
         {
             if (pszJPEG2000_DRIVER == nullptr ||
                 EQUAL(pszJPEG2000_DRIVER, "JP2KAK"))
-                poJPEGDriver = (GDALDriver *)GDALGetDriverByName("JP2KAK");
+                poJPEGDriver =
+                    GetGDALDriverManager()->GetDriverByName("JP2KAK");
             if (poJPEGDriver == nullptr)
             {
                 if (pszJPEG2000_DRIVER == nullptr ||
                     EQUAL(pszJPEG2000_DRIVER, "JP2ECW"))
                 {
-                    poJPEGDriver = (GDALDriver *)GDALGetDriverByName("JP2ECW");
+                    poJPEGDriver =
+                        GetGDALDriverManager()->GetDriverByName("JP2ECW");
                     if (poJPEGDriver &&
                         poJPEGDriver->GetMetadataItem(
                             GDAL_DMD_CREATIONDATATYPES) == nullptr)
@@ -4367,14 +4358,14 @@ GDALPDFObjectNum GDALPDFBaseWriter::WriteBlock(
                 if (pszJPEG2000_DRIVER == nullptr ||
                     EQUAL(pszJPEG2000_DRIVER, "JP2OpenJPEG"))
                     poJPEGDriver =
-                        (GDALDriver *)GDALGetDriverByName("JP2OpenJPEG");
+                        GetGDALDriverManager()->GetDriverByName("JP2OpenJPEG");
                 if (poJPEGDriver)
                 {
                     papszOptions = CSLAddString(papszOptions, "GeoJP2=OFF");
                     papszOptions = CSLAddString(papszOptions, "GMLJP2=OFF");
                 }
             }
-            snprintf(szTmp, sizeof(szTmp), "/vsimem/pdftemp/%p.jp2", this);
+            osTmpfilename = VSIMemGenerateHiddenFilename("pdf_temp.jp2");
         }
 
         if (poJPEGDriver == nullptr)
@@ -4396,8 +4387,8 @@ GDALPDFObjectNum GDALPDFBaseWriter::WriteBlock(
         }
 
         GDALDataset *poJPEGDS =
-            poJPEGDriver->CreateCopy(szTmp, poBlockSrcDS, FALSE, papszOptions,
-                                     pfnProgress, pProgressData);
+            poJPEGDriver->CreateCopy(osTmpfilename.c_str(), poBlockSrcDS, FALSE,
+                                     papszOptions, pfnProgress, pProgressData);
 
         CSLDestroy(papszOptions);
         if (poJPEGDS == nullptr)
@@ -4409,14 +4400,15 @@ GDALPDFObjectNum GDALPDFBaseWriter::WriteBlock(
         GDALClose(poJPEGDS);
 
         vsi_l_offset nJPEGDataSize = 0;
-        GByte *pabyJPEGData = VSIGetMemFileBuffer(szTmp, &nJPEGDataSize, TRUE);
+        GByte *pabyJPEGData =
+            VSIGetMemFileBuffer(osTmpfilename.c_str(), &nJPEGDataSize, TRUE);
         VSIFWriteL(pabyJPEGData, static_cast<size_t>(nJPEGDataSize), 1, m_fp);
         CPLFree(pabyJPEGData);
     }
     else
     {
-        GByte *pabyLine =
-            (GByte *)CPLMalloc(static_cast<size_t>(nReqXSize) * nBands);
+        GByte *pabyLine = static_cast<GByte *>(
+            CPLMalloc(static_cast<size_t>(nReqXSize) * nBands));
         for (int iLine = 0; iLine < nReqYSize; iLine++)
         {
             /* Get pixel interleaved data */
@@ -4435,7 +4427,8 @@ GDALPDFObjectNum GDALPDFBaseWriter::WriteBlock(
                     for (int iPixel = 1; iPixel < nReqXSize; iPixel++)
                     {
                         int nCurValue = pabyLine[iPixel];
-                        pabyLine[iPixel] = (GByte)(nCurValue - nPrevValue);
+                        pabyLine[iPixel] =
+                            static_cast<GByte>(nCurValue - nPrevValue);
                         nPrevValue = nCurValue;
                     }
                 }
@@ -4450,11 +4443,11 @@ GDALPDFObjectNum GDALPDFBaseWriter::WriteBlock(
                         int nCurValueG = pabyLine[3 * iPixel + 1];
                         int nCurValueB = pabyLine[3 * iPixel + 2];
                         pabyLine[3 * iPixel + 0] =
-                            (GByte)(nCurValueR - nPrevValueR);
+                            static_cast<GByte>(nCurValueR - nPrevValueR);
                         pabyLine[3 * iPixel + 1] =
-                            (GByte)(nCurValueG - nPrevValueG);
+                            static_cast<GByte>(nCurValueG - nPrevValueG);
                         pabyLine[3 * iPixel + 2] =
-                            (GByte)(nCurValueB - nPrevValueB);
+                            static_cast<GByte>(nCurValueB - nPrevValueB);
                         nPrevValueR = nCurValueR;
                         nPrevValueG = nCurValueG;
                         nPrevValueB = nCurValueB;
@@ -4470,7 +4463,7 @@ GDALPDFObjectNum GDALPDFBaseWriter::WriteBlock(
             }
 
             if (pfnProgress != nullptr &&
-                !pfnProgress((iLine + 1) / (double)nReqYSize, nullptr,
+                !pfnProgress((iLine + 1) / double(nReqYSize), nullptr,
                              pProgressData))
             {
                 CPLError(CE_Failure, CPLE_UserInterrupt,
@@ -4549,11 +4542,12 @@ GDALPDFObjectNum
 GDALPDFWriter::WriteJavascriptFile(const char *pszJavascriptFile)
 {
     GDALPDFObjectNum nId;
-    char *pszJavascriptToFree = (char *)CPLMalloc(65536);
+    char *pszJavascriptToFree = static_cast<char *>(CPLMalloc(65536));
     VSILFILE *fpJS = VSIFOpenL(pszJavascriptFile, "rb");
     if (fpJS != nullptr)
     {
-        int nRead = (int)VSIFReadL(pszJavascriptToFree, 1, 65536, fpJS);
+        const int nRead =
+            static_cast<int>(VSIFReadL(pszJavascriptToFree, 1, 65536, fpJS));
         if (nRead < 65536)
         {
             pszJavascriptToFree[nRead] = '\0';
@@ -4576,7 +4570,7 @@ void GDALPDFWriter::WritePages()
         GDALPDFDictionaryRW oDict;
         GDALPDFArrayRW *poKids = new GDALPDFArrayRW();
         oDict.Add("Type", GDALPDFObjectRW::CreateName("Pages"))
-            .Add("Count", (int)m_asPageId.size())
+            .Add("Count", static_cast<int>(m_asPageId.size()))
             .Add("Kids", poKids);
 
         for (size_t i = 0; i < m_asPageId.size(); i++)
@@ -4749,9 +4743,11 @@ static int GDALPDFGetJPEGQuality(char **papszOptions)
 
 class GDALPDFClippingDataset final : public GDALDataset
 {
-    GDALDataset *poSrcDS;
+    GDALDataset *poSrcDS = nullptr;
     double adfGeoTransform[6];
 
+    CPL_DISALLOW_COPY_ASSIGN(GDALPDFClippingDataset)
+
   public:
     GDALPDFClippingDataset(GDALDataset *poSrcDSIn, double adfClippingExtent[4])
         : poSrcDS(poSrcDSIn)
@@ -4765,9 +4761,11 @@ class GDALPDFClippingDataset final : public GDALDataset
                                                        : adfClippingExtent[1];
         adfGeoTransform[4] = 0.0;
         adfGeoTransform[5] = adfSrcGeoTransform[5];
-        nRasterXSize = (int)((adfClippingExtent[2] - adfClippingExtent[0]) /
+        nRasterXSize =
+            static_cast<int>((adfClippingExtent[2] - adfClippingExtent[0]) /
                              adfSrcGeoTransform[1]);
-        nRasterYSize = (int)((adfClippingExtent[3] - adfClippingExtent[1]) /
+        nRasterYSize =
+            static_cast<int>((adfClippingExtent[3] - adfClippingExtent[1]) /
                              fabs(adfSrcGeoTransform[5]));
     }
 
@@ -5006,14 +5004,14 @@ GDALDataset *GDALPDFCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
             {
                 if (dfWidthInUserUnit >= dfHeightInUserUnit)
                 {
-                    dfDPI = ceil((double)nWidth /
+                    dfDPI = ceil(double(nWidth) /
                                  (MAXIMUM_SIZE_IN_UNITS -
                                   (sMargins.nLeft + sMargins.nRight)) /
                                  USER_UNIT_IN_INCH);
                 }
                 else
                 {
-                    dfDPI = ceil((double)nHeight /
+                    dfDPI = ceil(double(nHeight) /
                                  (MAXIMUM_SIZE_IN_UNITS -
                                   (sMargins.nBottom + sMargins.nTop)) /
                                  USER_UNIT_IN_INCH);
@@ -5021,7 +5019,7 @@ GDALDataset *GDALPDFCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
                 CPLDebug("PDF",
                          "Adjusting DPI to %d so that page dimension in "
                          "user units remain in what is accepted by Acrobat",
-                         (int)dfDPI);
+                         static_cast<int>(dfDPI));
             }
         }
         else
@@ -5029,9 +5027,9 @@ GDALDataset *GDALPDFCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
             CPLError(CE_Warning, CPLE_AppDefined,
                      "The page dimension in user units is %d x %d whereas the "
                      "maximum allowed by Acrobat is %d x %d",
-                     (int)(dfWidthInUserUnit + 0.5),
-                     (int)(dfHeightInUserUnit + 0.5), MAXIMUM_SIZE_IN_UNITS,
-                     MAXIMUM_SIZE_IN_UNITS);
+                     static_cast<int>(dfWidthInUserUnit + 0.5),
+                     static_cast<int>(dfHeightInUserUnit + 0.5),
+                     MAXIMUM_SIZE_IN_UNITS, MAXIMUM_SIZE_IN_UNITS);
         }
     }
 
@@ -5203,8 +5201,9 @@ GDALDataset *GDALPDFCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
     for (int i = 0; bRet && bUseExtraRasters && papszExtraRasters[i] != nullptr;
          i++)
     {
-        GDALDataset *poDS =
-            (GDALDataset *)GDALOpen(papszExtraRasters[i], GA_ReadOnly);
+        auto poDS = std::unique_ptr<GDALDataset>(GDALDataset::Open(
+            papszExtraRasters[i], GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR,
+            nullptr, nullptr, nullptr));
         if (poDS != nullptr)
         {
             double adfGeoTransform[6];
@@ -5261,15 +5260,13 @@ GDALDataset *GDALPDFCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
             if (bUseRaster)
             {
                 bRet = oWriter.WriteClippedImagery(
-                    poDS,
+                    poDS.get(),
                     bUseExtraRastersLayerName ? papszExtraRastersLayerName[i]
                                               : nullptr,
                     eCompressMethod, nPredictor, nJPEGQuality,
                     pszJPEG2000_DRIVER, nBlockXSize, nBlockYSize, nullptr,
                     nullptr);
             }
-
-            GDALClose(poDS);
         }
     }
 
diff --git a/frmts/pdf/pdfcreatecopy.h b/frmts/pdf/pdfcreatecopy.h
index a4e4cfc2eb55..7a4309e9bd00 100644
--- a/frmts/pdf/pdfcreatecopy.h
+++ b/frmts/pdf/pdfcreatecopy.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2012-2019, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef PDFCREATECOPY_H_INCLUDED
@@ -304,6 +288,9 @@ class GDALPDFBaseWriter
                              const char *pszSUBJECT, const char *pszTITLE,
                              const char *pszKEYWORDS);
     GDALPDFObjectNum SetXMP(GDALDataset *poSrcDS, const char *pszXMP);
+
+  private:
+    CPL_DISALLOW_COPY_ASSIGN(GDALPDFBaseWriter)
 };
 
 class GDALPDFUpdateWriter final : public GDALPDFBaseWriter
@@ -377,7 +364,7 @@ class GDALPDFWriter final : public GDALPDFBaseWriter
                                    int bWriteOGRAttributes);
     void EndOGRLayer(GDALPDFLayerDesc &osVectorDesc);
 
-    int WriteOGRLayer(OGRDataSourceH hDS, int iLayer,
+    int WriteOGRLayer(GDALDatasetH hDS, int iLayer,
                       const char *pszOGRDisplayField,
                       const char *pszOGRLinkField,
                       const std::string &osLayerName, int bWriteOGRAttributes,
diff --git a/frmts/pdf/pdfcreatefromcomposition.cpp b/frmts/pdf/pdfcreatefromcomposition.cpp
index 1e31cca481a7..6b6144d8d95e 100644
--- a/frmts/pdf/pdfcreatefromcomposition.cpp
+++ b/frmts/pdf/pdfcreatefromcomposition.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2019, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_pdf.h"
@@ -121,7 +105,7 @@ void GDALPDFComposerWriter::WritePages()
         GDALPDFDictionaryRW oDict;
         GDALPDFArrayRW *poKids = new GDALPDFArrayRW();
         oDict.Add("Type", GDALPDFObjectRW::CreateName("Pages"))
-            .Add("Count", (int)m_asPageId.size())
+            .Add("Count", static_cast<int>(m_asPageId.size()))
             .Add("Kids", poKids);
 
         for (size_t i = 0; i < m_asPageId.size(); i++)
@@ -648,13 +632,13 @@ bool GDALPDFComposerWriter::GenerateGeoreferencing(
     if (psBoundingBox)
     {
         bboxX1 = CPLAtof(
-            CPLGetXMLValue(psBoundingBox, "x1", CPLSPrintf("%.18g", bboxX1)));
+            CPLGetXMLValue(psBoundingBox, "x1", CPLSPrintf("%.17g", bboxX1)));
         bboxY1 = CPLAtof(
-            CPLGetXMLValue(psBoundingBox, "y1", CPLSPrintf("%.18g", bboxY1)));
+            CPLGetXMLValue(psBoundingBox, "y1", CPLSPrintf("%.17g", bboxY1)));
         bboxX2 = CPLAtof(
-            CPLGetXMLValue(psBoundingBox, "x2", CPLSPrintf("%.18g", bboxX2)));
+            CPLGetXMLValue(psBoundingBox, "x2", CPLSPrintf("%.17g", bboxX2)));
         bboxY2 = CPLAtof(
-            CPLGetXMLValue(psBoundingBox, "y2", CPLSPrintf("%.18g", bboxY2)));
+            CPLGetXMLValue(psBoundingBox, "y2", CPLSPrintf("%.17g", bboxY2)));
         if (bboxX2 <= bboxX1 || bboxY2 <= bboxY1)
         {
             CPLError(CE_Failure, CPLE_AppDefined, "Invalid BoundingBox");
@@ -1350,9 +1334,9 @@ bool GDALPDFComposerWriter::WriteRaster(const CPLXMLNode *psNode,
     double dfX1 = CPLAtof(CPLGetXMLValue(psNode, "x1", "0"));
     double dfY1 = CPLAtof(CPLGetXMLValue(psNode, "y1", "0"));
     double dfX2 = CPLAtof(CPLGetXMLValue(
-        psNode, "x2", CPLSPrintf("%.18g", oPageContext.m_dfWidthInUserUnit)));
+        psNode, "x2", CPLSPrintf("%.17g", oPageContext.m_dfWidthInUserUnit)));
     double dfY2 = CPLAtof(CPLGetXMLValue(
-        psNode, "y2", CPLSPrintf("%.18g", oPageContext.m_dfHeightInUserUnit)));
+        psNode, "y2", CPLSPrintf("%.17g", oPageContext.m_dfHeightInUserUnit)));
     if (dfX2 <= dfX1 || dfY2 <= dfY1)
     {
         CPLError(CE_Failure, CPLE_AppDefined, "Invalid x1,y1,x2,y2");
@@ -1498,20 +1482,22 @@ bool GDALPDFComposerWriter::WriteRaster(const CPLXMLNode *psNode,
                     /* Re-compute (x,y,width,height) subwindow of current raster
                      * from */
                     /* the extent of the clipped block */
-                    nX = (int)((dfIntersectMinX - dfRasterMinX) /
-                                   adfRasterGT[1] +
-                               0.5);
-                    nY = (int)((dfRasterMaxY - dfIntersectMaxY) /
-                                   (-adfRasterGT[5]) +
-                               0.5);
-                    nReqWidth = (int)((dfIntersectMaxX - dfRasterMinX) /
-                                          adfRasterGT[1] +
-                                      0.5) -
-                                nX;
-                    nReqHeight = (int)((dfRasterMaxY - dfIntersectMinY) /
-                                           (-adfRasterGT[5]) +
-                                       0.5) -
-                                 nY;
+                    nX = static_cast<int>((dfIntersectMinX - dfRasterMinX) /
+                                              adfRasterGT[1] +
+                                          0.5);
+                    nY = static_cast<int>((dfRasterMaxY - dfIntersectMaxY) /
+                                              (-adfRasterGT[5]) +
+                                          0.5);
+                    nReqWidth =
+                        static_cast<int>((dfIntersectMaxX - dfRasterMinX) /
+                                             adfRasterGT[1] +
+                                         0.5) -
+                        nX;
+                    nReqHeight =
+                        static_cast<int>((dfRasterMaxY - dfIntersectMinY) /
+                                             (-adfRasterGT[5]) +
+                                         0.5) -
+                        nY;
 
                     if (nReqWidth > 0 && nReqHeight > 0)
                     {
diff --git a/frmts/pdf/pdfcreatefromcomposition.h b/frmts/pdf/pdfcreatefromcomposition.h
index 7cf0af9d6fe2..04fd7da9a90c 100644
--- a/frmts/pdf/pdfcreatefromcomposition.h
+++ b/frmts/pdf/pdfcreatefromcomposition.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2019, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef PDFCREATEFROMCOMPOSITION_H_INCLUDED
@@ -79,16 +63,16 @@ class GDALPDFComposerWriter final : public GDALPDFBaseWriter
         double m_adfGT[6]{0, 1, 0, 0, 0, 1};
     };
 
-    std::vector<GDALPDFObjectNum> m_anParentElements;
-    std::vector<GDALPDFObjectNum> m_anFeatureLayerId;
-    std::map<CPLString, GDALPDFObjectNum> m_oMapPageIdToObjectNum;
+    std::vector<GDALPDFObjectNum> m_anParentElements{};
+    std::vector<GDALPDFObjectNum> m_anFeatureLayerId{};
+    std::map<CPLString, GDALPDFObjectNum> m_oMapPageIdToObjectNum{};
 
     struct PageContext
     {
         double m_dfWidthInUserUnit = 0;
         double m_dfHeightInUserUnit = 0;
         CPLString m_osDrawingStream{};
-        std::vector<GDALPDFObjectNum> m_anFeatureUserProperties;
+        std::vector<GDALPDFObjectNum> m_anFeatureUserProperties{};
         int m_nMCID = 0;
         PDFCompressMethod m_eStreamCompressMethod = COMPRESS_DEFLATE;
         std::map<CPLString, GDALPDFObjectNum> m_oXObjects{};
diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
index 33bc89b0f49d..91b0317bcd2b 100644
--- a/frmts/pdf/pdfdataset.cpp
+++ b/frmts/pdf/pdfdataset.cpp
@@ -14,23 +14,7 @@
  ******************************************************************************
  * Copyright (c) 2010-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_pdf.h"
@@ -53,6 +37,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <limits>
 #include <set>
 
 #ifdef HAVE_PDFIUM
@@ -282,20 +267,21 @@ class GDALPDFOutputDev : public SplashOutputDev
 class GDALPDFDumper
 {
   private:
-    FILE *f;
-    int nDepthLimit;
-    std::set<int> aoSetObjectExplored;
-    int bDumpParent;
+    FILE *f = nullptr;
+    const int nDepthLimit;
+    std::set<int> aoSetObjectExplored{};
+    const bool bDumpParent;
 
     void DumpSimplified(GDALPDFObject *poObj);
 
+    CPL_DISALLOW_COPY_ASSIGN(GDALPDFDumper)
+
   public:
     GDALPDFDumper(const char *pszFilename, const char *pszDumpFile,
                   int nDepthLimitIn = -1)
-        : nDepthLimit(nDepthLimitIn)
+        : nDepthLimit(nDepthLimitIn),
+          bDumpParent(CPLGetConfigOption("PDF_DUMP_PARENT", "FALSE"))
     {
-        bDumpParent =
-            CPLTestBool(CPLGetConfigOption("PDF_DUMP_PARENT", "FALSE"));
         if (strcmp(pszDumpFile, "stderr") == 0)
             f = stderr;
         else if (EQUAL(pszDumpFile, "YES"))
@@ -601,11 +587,11 @@ void PDFDataset::InitOverviews()
 
 GDALColorInterp PDFRasterBand::GetColorInterpretation()
 {
-    PDFDataset *poGDS = (PDFDataset *)poDS;
+    PDFDataset *poGDS = cpl::down_cast<PDFDataset *>(poDS);
     if (poGDS->nBands == 1)
         return GCI_GrayIndex;
     else
-        return (GDALColorInterp)(GCI_RedBand + (nBand - 1));
+        return static_cast<GDALColorInterp>(GCI_RedBand + (nBand - 1));
 }
 
 /************************************************************************/
@@ -660,7 +646,7 @@ CPLErr PDFRasterBand::IReadBlockFromTile(int nBlockXOff, int nBlockYOff,
                                          void *pImage)
 
 {
-    PDFDataset *poGDS = (PDFDataset *)poDS;
+    PDFDataset *poGDS = cpl::down_cast<PDFDataset *>(poDS);
 
     int nReqXSize = nBlockXSize;
     int nReqYSize = nBlockYSize;
@@ -693,14 +679,14 @@ CPLErr PDFRasterBand::IReadBlockFromTile(int nBlockXOff, int nBlockYOff,
             GDALPDFObject *poColorSpace = poSMaskDict->Get("ColorSpace");
             GDALPDFObject *poBitsPerComponent =
                 poSMaskDict->Get("BitsPerComponent");
-            int nBits = 0;
+            double dfBits = 0;
             if (poBitsPerComponent)
-                nBits = (int)Get(poBitsPerComponent);
+                dfBits = Get(poBitsPerComponent);
             if (poWidth && Get(poWidth) == nReqXSize && poHeight &&
                 Get(poHeight) == nReqYSize && poColorSpace &&
                 poColorSpace->GetType() == PDFObjectType_Name &&
                 poColorSpace->GetName() == "DeviceGray" &&
-                (nBits == 1 || nBits == 8))
+                (dfBits == 1 || dfBits == 8))
             {
                 GDALPDFStream *poStream = poSMask->GetStream();
                 GByte *pabyStream = nullptr;
@@ -708,15 +694,15 @@ CPLErr PDFRasterBand::IReadBlockFromTile(int nBlockXOff, int nBlockYOff,
                 if (poStream == nullptr)
                     return CE_Failure;
 
-                pabyStream = (GByte *)poStream->GetBytes();
+                pabyStream = reinterpret_cast<GByte *>(poStream->GetBytes());
                 if (pabyStream == nullptr)
                     return CE_Failure;
 
                 const int nReqXSize1 = (nReqXSize + 7) / 8;
-                if ((nBits == 8 &&
+                if ((dfBits == 8 &&
                      static_cast<size_t>(poStream->GetLength()) !=
                          static_cast<size_t>(nReqXSize) * nReqYSize) ||
-                    (nBits == 1 &&
+                    (dfBits == 1 &&
                      static_cast<size_t>(poStream->GetLength()) !=
                          static_cast<size_t>(nReqXSize1) * nReqYSize))
                 {
@@ -724,14 +710,14 @@ CPLErr PDFRasterBand::IReadBlockFromTile(int nBlockXOff, int nBlockYOff,
                     return CE_Failure;
                 }
 
-                GByte *pabyData = (GByte *)pImage;
+                GByte *pabyData = static_cast<GByte *>(pImage);
                 if (nReqXSize != nBlockXSize || nReqYSize != nBlockYSize)
                 {
                     memset(pabyData, 0,
                            static_cast<size_t>(nBlockXSize) * nBlockYSize);
                 }
 
-                if (nBits == 8)
+                if (dfBits == 8)
                 {
                     for (int j = 0; j < nReqYSize; j++)
                     {
@@ -781,7 +767,7 @@ CPLErr PDFRasterBand::IReadBlockFromTile(int nBlockXOff, int nBlockYOff,
         {
             poGDS->m_bTried = true;
             poGDS->m_pabyCachedData =
-                (GByte *)VSIMalloc3(3, nBlockXSize, nBlockYSize);
+                static_cast<GByte *>(VSIMalloc3(3, nBlockXSize, nBlockYSize));
         }
         if (poGDS->m_pabyCachedData == nullptr)
             return CE_Failure;
@@ -792,7 +778,7 @@ CPLErr PDFRasterBand::IReadBlockFromTile(int nBlockXOff, int nBlockYOff,
         if (poStream == nullptr)
             return CE_Failure;
 
-        pabyStream = (GByte *)poStream->GetBytes();
+        pabyStream = reinterpret_cast<GByte *>(poStream->GetBytes());
         if (pabyStream == nullptr)
             return CE_Failure;
 
@@ -810,7 +796,7 @@ CPLErr PDFRasterBand::IReadBlockFromTile(int nBlockXOff, int nBlockYOff,
         poGDS->m_nLastBlockYOff = nBlockYOff;
     }
 
-    GByte *pabyData = (GByte *)pImage;
+    GByte *pabyData = static_cast<GByte *>(pImage);
     if (nBand != 4 && (nReqXSize != nBlockXSize || nReqYSize != nBlockYSize))
     {
         memset(pabyData, 0, static_cast<size_t>(nBlockXSize) * nBlockYSize);
@@ -863,7 +849,7 @@ PDFRasterBand::GetSuggestedBlockAccessPattern() const
 CPLErr PDFRasterBand::IReadBlock(int nBlockXOff, int nBlockYOff, void *pImage)
 
 {
-    PDFDataset *poGDS = (PDFDataset *)poDS;
+    PDFDataset *poGDS = cpl::down_cast<PDFDataset *>(poDS);
 
     if (!poGDS->m_aiTiles.empty())
     {
@@ -1044,13 +1030,14 @@ struct cmp_str
 static int GDALPdfiumGetBlock(void *param, unsigned long position,
                               unsigned char *pBuf, unsigned long size)
 {
-    VSILFILE *fp = (VSILFILE *)param;
+    VSILFILE *fp = static_cast<VSILFILE *>(param);
     VSIFSeekL(fp, position, SEEK_SET);
     return VSIFReadL(pBuf, size, 1, fp) == 1;
 }
 
 // List of all PDF datasets
-typedef std::map<char *, TPdfiumDocumentStruct *, cmp_str> TMapPdfiumDatasets;
+typedef std::map<const char *, TPdfiumDocumentStruct *, cmp_str>
+    TMapPdfiumDatasets;
 static TMapPdfiumDatasets g_mPdfiumDatasets;
 
 /**
@@ -1084,7 +1071,7 @@ static int LoadPdfiumDocumentPage(const char *pszFilename,
     }
 
     TMapPdfiumDatasets::iterator it;
-    it = g_mPdfiumDatasets.find((char *)pszFilename);
+    it = g_mPdfiumDatasets.find(pszFilename);
     TPdfiumDocumentStruct *poDoc = nullptr;
     // Load new document if missing
     if (it == g_mPdfiumDatasets.end())
@@ -1098,17 +1085,20 @@ static int LoadPdfiumDocumentPage(const char *pszFilename,
             return FALSE;
         }
         VSIFSeekL(fp, 0, SEEK_END);
-        unsigned long nFileLen = (unsigned long)VSIFTellL(fp);
-        if (nFileLen != VSIFTellL(fp))
+        const auto nFileLen64 = VSIFTellL(fp);
+        if constexpr (LONG_MAX < std::numeric_limits<vsi_l_offset>::max())
         {
-            VSIFCloseL(fp);
-            CPLReleaseMutex(g_oPdfiumLoadDocMutex);
-            return FALSE;
+            if (nFileLen64 > LONG_MAX)
+            {
+                VSIFCloseL(fp);
+                CPLReleaseMutex(g_oPdfiumLoadDocMutex);
+                return FALSE;
+            }
         }
 
         FPDF_FILEACCESS *psFileAccess = new FPDF_FILEACCESS;
         psFileAccess->m_Param = fp;
-        psFileAccess->m_FileLen = nFileLen;
+        psFileAccess->m_FileLen = static_cast<unsigned long>(nFileLen64);
         psFileAccess->m_GetBlock = GDALPdfiumGetBlock;
         CPDF_Document *docPdfium = CPDFDocumentFromFPDFDocument(
             FPDF_LoadCustomDocument(psFileAccess, nullptr));
@@ -1330,7 +1320,7 @@ static int UnloadPdfiumDocumentPage(TPdfiumDocumentStruct **doc,
     FPDF_CloseDocument(FPDFDocumentFromCPDFDocument(pDoc->doc));
     g_mPdfiumDatasets.erase(pDoc->filename);
     CPLFree(pDoc->filename);
-    VSIFCloseL((VSILFILE *)pDoc->psFileAccess->m_Param);
+    VSIFCloseL(static_cast<VSILFILE *>(pDoc->psFileAccess->m_Param));
     delete pDoc->psFileAccess;
     delete pDoc;
     pDoc = nullptr;
@@ -1420,6 +1410,8 @@ class GDALPDFiumOCContext : public CPDF_OCContextInterface
     PDFDataset *m_poDS;
     RetainPtr<CPDF_OCContext> m_DefaultOCContext;
 
+    CPL_DISALLOW_COPY_ASSIGN(GDALPDFiumOCContext)
+
   public:
     GDALPDFiumOCContext(PDFDataset *poDS, CPDF_Document *pDoc,
                         CPDF_OCContext::UsageType usage)
@@ -1458,6 +1450,8 @@ class GDALPDFiumRenderDeviceDriver : public RenderDeviceDriverIface
     int bEnableBitmap;
     int bTemporaryEnableVectorForTextStroking;
 
+    CPL_DISALLOW_COPY_ASSIGN(GDALPDFiumRenderDeviceDriver)
+
   public:
     GDALPDFiumRenderDeviceDriver(
         std::unique_ptr<RenderDeviceDriverIface> &&poParent,
@@ -1559,18 +1553,18 @@ class GDALPDFiumRenderDeviceDriver : public RenderDeviceDriverIface
                                             blend_typeL);
     }
 
-    virtual bool GetClipBox(FX_RECT *pRect) override
+    virtual FX_RECT GetClipBox() const override
     {
-        return m_poParent->GetClipBox(pRect);
+        return m_poParent->GetClipBox();
     }
 
-    virtual bool GetDIBits(const RetainPtr<CFX_DIBitmap> &pBitmap, int left,
-                           int top) override
+    virtual bool GetDIBits(RetainPtr<CFX_DIBitmap> bitmap, int left,
+                           int top) const override
     {
-        return m_poParent->GetDIBits(pBitmap, left, top);
+        return m_poParent->GetDIBits(std::move(bitmap), left, top);
     }
 
-    virtual RetainPtr<CFX_DIBitmap> GetBackDrop() override
+    virtual RetainPtr<const CFX_DIBitmap> GetBackDrop() const override
     {
         return m_poParent->GetBackDrop();
     }
@@ -1599,19 +1593,19 @@ class GDALPDFiumRenderDeviceDriver : public RenderDeviceDriverIface
                                          pClipRect, options, blend_type);
     }
 
-    virtual bool StartDIBits(RetainPtr<const CFX_DIBBase> bitmap, float alpha,
-                             uint32_t color, const CFX_Matrix &matrix,
-                             const FXDIB_ResampleOptions &options,
-                             std::unique_ptr<CFX_ImageRenderer> *handle,
-                             BlendMode blend_type) override
+    virtual StartResult StartDIBits(RetainPtr<const CFX_DIBBase> bitmap,
+                                    float alpha, uint32_t color,
+                                    const CFX_Matrix &matrix,
+                                    const FXDIB_ResampleOptions &options,
+                                    BlendMode blend_type) override
     {
         if (!bEnableBitmap && !bTemporaryEnableVectorForTextStroking)
-            return true;
+            return StartResult(Result::kSuccess, nullptr);
         return m_poParent->StartDIBits(std::move(bitmap), alpha, color, matrix,
-                                       options, handle, blend_type);
+                                       options, blend_type);
     }
 
-    virtual bool ContinueDIBits(CFX_ImageRenderer *handle,
+    virtual bool ContinueDIBits(CFX_AggImageRenderer *handle,
                                 PauseIndicatorIface *pPause) override
     {
         return m_poParent->ContinueDIBits(handle, pPause);
@@ -1646,16 +1640,16 @@ class GDALPDFiumRenderDeviceDriver : public RenderDeviceDriverIface
         return m_poParent->GetDriverType();
     }
 
-    virtual bool DrawShading(const CPDF_ShadingPattern *pPattern,
-                             const CFX_Matrix *pMatrix,
-                             const FX_RECT &clip_rect, int alpha,
-                             bool bAlphaMode) override
+#if defined(_SKIA_SUPPORT_)
+    virtual bool DrawShading(const CPDF_ShadingPattern &pattern,
+                             const CFX_Matrix &matrix, const FX_RECT &clip_rect,
+                             int alpha) override
     {
         if (!bEnableBitmap && !bTemporaryEnableVectorForTextStroking)
             return true;
-        return m_poParent->DrawShading(pPattern, pMatrix, clip_rect, alpha,
-                                       bAlphaMode);
+        return m_poParent->DrawShading(pattern, matrix, clip_rect, alpha);
     }
+#endif
 
     bool MultiplyAlpha(float alpha) override
     {
@@ -1675,8 +1669,8 @@ class GDALPDFiumRenderDeviceDriver : public RenderDeviceDriverIface
     {
         if (!bEnableBitmap && !bTemporaryEnableVectorForTextStroking)
             return true;
-        return m_poParent->SetBitsWithMask(bitmap, mask, left, top, alpha,
-                                           blend_type);
+        return m_poParent->SetBitsWithMask(std::move(bitmap), std::move(mask),
+                                           left, top, alpha, blend_type);
     }
 
     virtual void SetGroupKnockout(bool group_knockout) override
@@ -1696,10 +1690,10 @@ class GDALPDFiumRenderDeviceDriver : public RenderDeviceDriverIface
 /*                         PDFiumRenderPageBitmap()                     */
 /************************************************************************/
 
-/* This method is a customization of FPDF_RenderPageBitmap()
-   from pdfium/fpdfsdk/fpdf_view.cpp to allow selection of which OGC/layer are
+/* This method is a customization of RenderPageImpl()
+   from pdfium/fpdfsdk/cpdfsdk_renderpage.cpp to allow selection of which OGC/layer are
    active. Thus it inherits the following license */
-// Copyright 2014 PDFium Authors. All rights reserved.
+// Copyright 2014-2020 PDFium Authors. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -1781,8 +1775,7 @@ static void myRenderPageImpl(PDFDataset *poDS, CPDF_PageRenderContext *pContext,
 
         // TODO(https://crbug.com/pdfium/993) - maybe pass true here.
         const bool bShowWidget = false;
-        pList->DisplayAnnots(pPage, pContext->m_pDevice.get(),
-                             pContext->m_pContext.get(), bPrinting, matrix,
+        pList->DisplayAnnots(pContext->m_pContext.get(), bPrinting, matrix,
                              bShowWidget);
     }
 
@@ -2022,7 +2015,8 @@ CPLErr PDFDataset::ReadPixels(int nReqXOff, int nReqYOff, int nReqXSize,
         GByte *pabyDataB = pabyData + 2 * nBandSpace;
         GByte *pabyDataA = pabyData + 3 * nBandSpace;
         GByte *pabySrc = poBitmap->getDataPtr();
-        GByte *pabyAlphaSrc = (GByte *)poBitmap->getAlphaPtr();
+        GByte *pabyAlphaSrc =
+            reinterpret_cast<GByte *>(poBitmap->getAlphaPtr());
         int i, j;
         for (j = 0; j < nReqYSize; j++)
         {
@@ -2121,7 +2115,7 @@ CPLErr PDFDataset::ReadPixels(int nReqXOff, int nReqYOff, int nReqXSize,
             }
             papszArgs = CSLAddString(papszArgs, m_osFilename.c_str());
 
-            osTmpFilename = CPLSPrintf("/vsimem/pdf/temp_%p.ppm", this);
+            osTmpFilename = VSIMemGenerateHiddenFilename("pdf_temp.ppm");
             VSILFILE *fpOut = VSIFOpenL(osTmpFilename, "wb");
             if (fpOut != nullptr)
             {
@@ -2136,8 +2130,8 @@ CPLErr PDFDataset::ReadPixels(int nReqXOff, int nReqYOff, int nReqXSize,
 
         if (nRet == 0)
         {
-            GDALDataset *poDS =
-                (GDALDataset *)GDALOpen(osTmpFilename, GA_ReadOnly);
+            auto poDS = std::unique_ptr<GDALDataset>(GDALDataset::Open(
+                osTmpFilename, GDAL_OF_RASTER, nullptr, nullptr, nullptr));
             if (poDS)
             {
                 if (poDS->GetRasterCount() == 3)
@@ -2147,7 +2141,6 @@ CPLErr PDFDataset::ReadPixels(int nReqXOff, int nReqYOff, int nReqXSize,
                                           GDT_Byte, 3, nullptr, nPixelSpace,
                                           nLineSpace, nBandSpace, nullptr);
                 }
-                delete poDS;
             }
         }
         else
@@ -2244,7 +2237,8 @@ CPLErr PDFDataset::ReadPixels(int nReqXOff, int nReqYOff, int nReqXSize,
         CPLDebug("PDF",
                  "PDFDataset::ReadPixels(%d, %d, %d, %d, scaleFactor=%d)",
                  nReqXOff, nReqYOff, nReqXSize, nReqYSize,
-                 1 << ((PDFRasterBand *)GetRasterBand(1))->nResolutionLevel);
+                 1 << cpl::down_cast<PDFRasterBand *>(GetRasterBand(1))
+                          ->nResolutionLevel);
 
         CPLDebug("PDF", "FPDF_RenderPageBitmap(%d, %d, %d, %d)", -nReqXOff,
                  -nReqYOff, nRasterXSize, nRasterYSize);
@@ -2326,10 +2320,10 @@ PDFImageRasterBand::PDFImageRasterBand(PDFDataset *poDSIn, int nBandIn)
 /*                             IReadBlock()                             */
 /************************************************************************/
 
-CPLErr PDFImageRasterBand::IReadBlock(int CPL_UNUSED nBlockXOff, int nBlockYOff,
+CPLErr PDFImageRasterBand::IReadBlock(int /* nBlockXOff */, int nBlockYOff,
                                       void *pImage)
 {
-    PDFDataset *poGDS = (PDFDataset *)poDS;
+    PDFDataset *poGDS = cpl::down_cast<PDFDataset *>(poDS);
     CPLAssert(poGDS->m_poImageObj != nullptr);
 
     if (!poGDS->m_bTried)
@@ -2338,8 +2332,8 @@ CPLErr PDFImageRasterBand::IReadBlock(int CPL_UNUSED nBlockXOff, int nBlockYOff,
         poGDS->m_bTried = true;
         if (nBands == 3)
         {
-            poGDS->m_pabyCachedData =
-                (GByte *)VSIMalloc3(nBands, nRasterXSize, nRasterYSize);
+            poGDS->m_pabyCachedData = static_cast<GByte *>(
+                VSIMalloc3(nBands, nRasterXSize, nRasterYSize));
             if (poGDS->m_pabyCachedData == nullptr)
                 return CE_Failure;
         }
@@ -2350,7 +2344,8 @@ CPLErr PDFImageRasterBand::IReadBlock(int CPL_UNUSED nBlockXOff, int nBlockYOff,
         if (poStream == nullptr ||
             static_cast<size_t>(poStream->GetLength()) !=
                 static_cast<size_t>(nBands) * nRasterXSize * nRasterYSize ||
-            (pabyStream = (GByte *)poStream->GetBytes()) == nullptr)
+            (pabyStream = reinterpret_cast<GByte *>(poStream->GetBytes())) ==
+                nullptr)
         {
             VSIFree(poGDS->m_pabyCachedData);
             poGDS->m_pabyCachedData = nullptr;
@@ -2480,7 +2475,7 @@ GDALPDFObject *PDFDataset::GetCatalog()
         return m_poCatalogObject;
 
 #ifdef HAVE_POPPLER
-    if (m_bUseLib.test(PDFLIB_POPPLER))
+    if (m_bUseLib.test(PDFLIB_POPPLER) && m_poDocPoppler)
     {
         m_poCatalogObjectPoppler =
             std::make_unique<Object>(m_poDocPoppler->getXRef()->getCatalog());
@@ -2491,7 +2486,7 @@ GDALPDFObject *PDFDataset::GetCatalog()
 #endif
 
 #ifdef HAVE_PODOFO
-    if (m_bUseLib.test(PDFLIB_PODOFO))
+    if (m_bUseLib.test(PDFLIB_PODOFO) && m_poDocPodofo)
     {
         int nCatalogNum = 0;
         int nCatalogGen = 0;
@@ -2517,7 +2512,7 @@ GDALPDFObject *PDFDataset::GetCatalog()
 #endif
 
 #ifdef HAVE_PDFIUM
-    if (m_bUseLib.test(PDFLIB_PDFIUM))
+    if (m_bUseLib.test(PDFLIB_PDFIUM) && m_poDocPdfium)
     {
         const CPDF_Dictionary *catalog = m_poDocPdfium->doc->GetRoot();
         if (catalog)
@@ -2707,7 +2702,7 @@ CPLErr PDFDataset::IRasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff,
 
     if (bReadPixels)
         return ReadPixels(nXOff, nYOff, nXSize, nYSize, nPixelSpace, nLineSpace,
-                          nBandSpace, (GByte *)pData);
+                          nBandSpace, static_cast<GByte *>(pData));
 
     if (nBufXSize != nXSize || nBufYSize != nYSize || eBufType != GDT_Byte)
     {
@@ -2732,7 +2727,7 @@ CPLErr PDFRasterBand::IRasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff,
                                 GSpacing nLineSpace,
                                 GDALRasterIOExtraArg *psExtraArg)
 {
-    PDFDataset *poGDS = (PDFDataset *)poDS;
+    PDFDataset *poGDS = cpl::down_cast<PDFDataset *>(poDS);
 
     // Try to pass the request to the most appropriate overview dataset.
     if (nBufXSize < nXSize && nBufYSize < nYSize)
@@ -3015,9 +3010,9 @@ static int GDALPDFParseStreamContent(const char *pszContent,
                                         INT_MAX &&
                                     dfHeight / dfScaleY * DEFAULT_DPI < INT_MAX)
                                 {
-                                    double dfDPI_X = ROUND_TO_INT_IF_CLOSE(
+                                    double dfDPI_X = ROUND_IF_CLOSE(
                                         dfWidth / dfScaleX * DEFAULT_DPI, 1e-3);
-                                    double dfDPI_Y = ROUND_TO_INT_IF_CLOSE(
+                                    double dfDPI_Y = ROUND_IF_CLOSE(
                                         dfHeight / dfScaleY * DEFAULT_DPI,
                                         1e-3);
                                     // CPLDebug("PDF", "Image %s, width = %.16g,
@@ -3080,10 +3075,10 @@ int PDFDataset::CheckTiledRaster()
         double dfDrawHeight = m_asTiles[i].adfCM[3] * dfUserUnit;
         double dfX = m_asTiles[i].adfCM[4] * dfUserUnit;
         double dfY = m_asTiles[i].adfCM[5] * dfUserUnit;
-        int nX = (int)(dfX + 0.1);
-        int nY = (int)(dfY + 0.1);
-        int nWidth = (int)(m_asTiles[i].dfWidth + 1e-8);
-        int nHeight = (int)(m_asTiles[i].dfHeight + 1e-8);
+        int nX = static_cast<int>(dfX + 0.1);
+        int nY = static_cast<int>(dfY + 0.1);
+        int nWidth = static_cast<int>(m_asTiles[i].dfWidth + 1e-8);
+        int nHeight = static_cast<int>(m_asTiles[i].dfHeight + 1e-8);
 
         GDALPDFDictionary *poImageDict = m_asTiles[i].poImage->GetDictionary();
         GDALPDFObject *poBitsPerComponent =
@@ -3097,7 +3092,7 @@ int PDFDataset::CheckTiledRaster()
             poFilter->GetName() == "JPXDecode")
         {
             CPLDebug("PDF", "Tile %d : Incompatible image for tiled reading",
-                     (int)i);
+                     static_cast<int>(i));
             return FALSE;
         }
 
@@ -3108,7 +3103,7 @@ int PDFDataset::CheckTiledRaster()
              poColorSpace->GetName() != "DeviceGray"))
         {
             CPLDebug("PDF", "Tile %d : Incompatible image for tiled reading",
-                     (int)i);
+                     static_cast<int>(i));
             return FALSE;
         }
 
@@ -3119,8 +3114,8 @@ int PDFDataset::CheckTiledRaster()
             fabs(nX - dfX) > 1e-1 || fabs(nY - dfY) > 1e-1 || nX < 0 ||
             nY < 0 || nX + nWidth > nRasterXSize || nY >= nRasterYSize)
         {
-            CPLDebug("PDF", "Tile %d : %f %f %f %f %f %f", (int)i, dfX, dfY,
-                     dfDrawWidth, dfDrawHeight, m_asTiles[i].dfWidth,
+            CPLDebug("PDF", "Tile %d : %f %f %f %f %f %f", static_cast<int>(i),
+                     dfX, dfY, dfDrawWidth, dfDrawHeight, m_asTiles[i].dfWidth,
                      m_asTiles[i].dfHeight);
             return FALSE;
         }
@@ -3143,10 +3138,10 @@ int PDFDataset::CheckTiledRaster()
     {
         double dfX = m_asTiles[i].adfCM[4] * dfUserUnit;
         double dfY = m_asTiles[i].adfCM[5] * dfUserUnit;
-        int nX = (int)(dfX + 0.1);
-        int nY = (int)(dfY + 0.1);
-        int nWidth = (int)(m_asTiles[i].dfWidth + 1e-8);
-        int nHeight = (int)(m_asTiles[i].dfHeight + 1e-8);
+        int nX = static_cast<int>(dfX + 0.1);
+        int nY = static_cast<int>(dfY + 0.1);
+        int nWidth = static_cast<int>(m_asTiles[i].dfWidth + 1e-8);
+        int nHeight = static_cast<int>(m_asTiles[i].dfHeight + 1e-8);
         int bOK = TRUE;
         int nBlockXOff = nX / l_nBlockXSize;
         if ((nX % l_nBlockXSize) != 0)
@@ -3163,8 +3158,8 @@ int PDFDataset::CheckTiledRaster()
 
         if (!bOK)
         {
-            CPLDebug("PDF", "Tile %d : %d %d %d %d", (int)i, nX, nY, nWidth,
-                     nHeight);
+            CPLDebug("PDF", "Tile %d : %d %d %d %d", static_cast<int>(i), nX,
+                     nY, nWidth, nHeight);
             return FALSE;
         }
     }
@@ -3175,12 +3170,12 @@ int PDFDataset::CheckTiledRaster()
     {
         double dfX = m_asTiles[i].adfCM[4] * dfUserUnit;
         double dfY = m_asTiles[i].adfCM[5] * dfUserUnit;
-        int nHeight = (int)(m_asTiles[i].dfHeight + 1e-8);
-        int nX = (int)(dfX + 0.1);
-        int nY = nRasterYSize - ((int)(dfY + 0.1) + nHeight);
+        int nHeight = static_cast<int>(m_asTiles[i].dfHeight + 1e-8);
+        int nX = static_cast<int>(dfX + 0.1);
+        int nY = nRasterYSize - (static_cast<int>(dfY + 0.1) + nHeight);
         int nBlockXOff = nX / l_nBlockXSize;
         int nBlockYOff = nY / l_nBlockYSize;
-        m_aiTiles[nBlockYOff * nXBlocks + nBlockXOff] = (int)i;
+        m_aiTiles[nBlockYOff * nXBlocks + nBlockXOff] = static_cast<int>(i);
     }
 
     this->m_nBlockXSize = l_nBlockXSize;
@@ -3452,8 +3447,7 @@ void PDFDataset::GuessDPI(GDALPDFDictionary *poPageDict, int *pnBands)
             (poUserUnit->GetType() == PDFObjectType_Int ||
              poUserUnit->GetType() == PDFObjectType_Real))
         {
-            m_dfDPI =
-                ROUND_TO_INT_IF_CLOSE(Get(poUserUnit) * DEFAULT_DPI, 1e-5);
+            m_dfDPI = ROUND_IF_CLOSE(Get(poUserUnit) * DEFAULT_DPI, 1e-5);
             CPLDebug("PDF", "Found UserUnit in Page --> DPI = %.16g", m_dfDPI);
             SetMetadataItem("DPI", CPLSPrintf("%.16g", m_dfDPI));
         }
@@ -3800,7 +3794,7 @@ void PDFDataset::FindLayersPoppler(int iPageOfInterest)
             if (ocg != nullptr && ocg->getName() != nullptr)
             {
                 const char *pszLayerName =
-                    (const char *)ocg->getName()->c_str();
+                    reinterpret_cast<const char *>(ocg->getName()->c_str());
                 AddLayer(pszLayerName, 0);
                 m_oLayerOCGListPoppler.push_back(
                     std::make_pair(CPLString(pszLayerName), ocg));
@@ -4783,9 +4777,8 @@ PDFDataset *PDFDataset::Open(GDALOpenInfo *poOpenInfo)
         Ref *poPageRef = poCatalogPoppler->getPageRef(iPage);
         if (poPageRef != nullptr)
         {
-            ((GDALPDFObjectPoppler *)poPageObj)
-                ->SetRefNumAndGen(GDALPDFObjectNum(poPageRef->num),
-                                  poPageRef->gen);
+            cpl::down_cast<GDALPDFObjectPoppler *>(poPageObj)->SetRefNumAndGen(
+                GDALPDFObjectNum(poPageRef->num), poPageRef->gen);
         }
     }
 #endif  // ~ HAVE_POPPLER
@@ -4957,11 +4950,11 @@ PDFDataset *PDFDataset::Open(GDALOpenInfo *poOpenInfo)
             return nullptr;
         }
         poPageObj = GDALPDFObjectPdfium::Build(pageObj);
-        if (poPageObj == nullptr)
-            return nullptr;
     }
 #endif  // ~ HAVE_PDFIUM
 
+    if (poPageObj == nullptr)
+        return nullptr;
     GDALPDFDictionary *poPageDict = poPageObj->GetDictionary();
     if (poPageDict == nullptr)
     {
@@ -5032,7 +5025,9 @@ PDFDataset *PDFDataset::Open(GDALOpenInfo *poOpenInfo)
     if (pszDumpCatalog != nullptr)
     {
         GDALPDFDumper oDumper(pszFilename, pszDumpCatalog);
-        oDumper.Dump(poDS->GetCatalog());
+        auto poCatalog = poDS->GetCatalog();
+        if (poCatalog)
+            oDumper.Dump(poCatalog);
     }
 
     int nBandsGuessed = 0;
@@ -5090,6 +5085,7 @@ PDFDataset *PDFDataset::Open(GDALOpenInfo *poOpenInfo)
 #ifdef HAVE_PDFIUM
     if (bUseLib.test(PDFLIB_PDFIUM))
     {
+        CPLAssert(poPagePdfium);
         CFX_FloatRect rect = poPagePdfium->page->GetBBox();
         dfX1 = rect.left;
         dfX2 = rect.right;
@@ -5103,8 +5099,16 @@ PDFDataset *PDFDataset::Open(GDALOpenInfo *poOpenInfo)
     poDS->m_dfPageHeight = dfY2 - dfY1;
     // CPLDebug("PDF", "left=%f right=%f bottom=%f top=%f", dfX1, dfX2, dfY1,
     // dfY2);
-    poDS->nRasterXSize = (int)floor((dfX2 - dfX1) * dfUserUnit + 0.5);
-    poDS->nRasterYSize = (int)floor((dfY2 - dfY1) * dfUserUnit + 0.5);
+    const double dfXSize = floor((dfX2 - dfX1) * dfUserUnit + 0.5);
+    const double dfYSize = floor((dfY2 - dfY1) * dfUserUnit + 0.5);
+    if (!(dfXSize >= 0 && dfXSize <= INT_MAX && dfYSize >= 0 &&
+          dfYSize <= INT_MAX))
+    {
+        delete poDS;
+        return nullptr;
+    }
+    poDS->nRasterXSize = static_cast<int>(dfXSize);
+    poDS->nRasterYSize = static_cast<int>(dfYSize);
 
     if (!GDALCheckDatasetDimensions(poDS->nRasterXSize, poDS->nRasterYSize))
     {
@@ -5134,6 +5138,7 @@ PDFDataset *PDFDataset::Open(GDALOpenInfo *poOpenInfo)
 #ifdef HAVE_PDFIUM
     if (bUseLib.test(PDFLIB_PDFIUM))
     {
+        CPLAssert(poPagePdfium);
         dfRotation = poPagePdfium->page->GetPageRotation() * 90;
     }
 #endif
@@ -5377,13 +5382,11 @@ PDFDataset *PDFDataset::Open(GDALOpenInfo *poOpenInfo)
                        ? 1e-5
                        : 1e-8;
     poDS->m_adfGeoTransform[0] =
-        ROUND_TO_INT_IF_CLOSE(poDS->m_adfGeoTransform[0], dfEps);
-    poDS->m_adfGeoTransform[1] =
-        ROUND_TO_INT_IF_CLOSE(poDS->m_adfGeoTransform[1]);
+        ROUND_IF_CLOSE(poDS->m_adfGeoTransform[0], dfEps);
+    poDS->m_adfGeoTransform[1] = ROUND_IF_CLOSE(poDS->m_adfGeoTransform[1]);
     poDS->m_adfGeoTransform[3] =
-        ROUND_TO_INT_IF_CLOSE(poDS->m_adfGeoTransform[3], dfEps);
-    poDS->m_adfGeoTransform[5] =
-        ROUND_TO_INT_IF_CLOSE(poDS->m_adfGeoTransform[5]);
+        ROUND_IF_CLOSE(poDS->m_adfGeoTransform[3], dfEps);
+    poDS->m_adfGeoTransform[5] = ROUND_IF_CLOSE(poDS->m_adfGeoTransform[5]);
 
     if (bUseLib.test(PDFLIB_PDFIUM))
     {
@@ -5392,22 +5395,22 @@ PDFDataset *PDFDataset::Open(GDALOpenInfo *poOpenInfo)
         if ((fabs(poDS->m_adfGeoTransform[0]) > 1e5 ||
              fabs(poDS->m_adfGeoTransform[3]) > 1e5) &&
             fabs(poDS->m_adfGeoTransform[0] -
-                 (int)floor(poDS->m_adfGeoTransform[0] + 0.5)) <
+                 std::round(poDS->m_adfGeoTransform[0])) <
                 1e-6 * fabs(poDS->m_adfGeoTransform[0]) &&
             fabs(poDS->m_adfGeoTransform[1] -
-                 (int)floor(poDS->m_adfGeoTransform[1] + 0.5)) <
+                 std::round(poDS->m_adfGeoTransform[1])) <
                 1e-3 * fabs(poDS->m_adfGeoTransform[1]) &&
             fabs(poDS->m_adfGeoTransform[3] -
-                 (int)floor(poDS->m_adfGeoTransform[3] + 0.5)) <
+                 std::round(poDS->m_adfGeoTransform[3])) <
                 1e-6 * fabs(poDS->m_adfGeoTransform[3]) &&
             fabs(poDS->m_adfGeoTransform[5] -
-                 (int)floor(poDS->m_adfGeoTransform[5] + 0.5)) <
+                 std::round(poDS->m_adfGeoTransform[5])) <
                 1e-3 * fabs(poDS->m_adfGeoTransform[5]))
         {
             for (int i = 0; i < 6; i++)
             {
                 poDS->m_adfGeoTransform[i] =
-                    (int)floor(poDS->m_adfGeoTransform[i] + 0.5);
+                    std::round(poDS->m_adfGeoTransform[i]);
             }
         }
     }
@@ -5948,6 +5951,7 @@ int PDFDataset::ParseLGIDictDictFirstPass(GDALPDFDictionary *poLGIDict,
                 poRing->addPoint(dfX, dfY);
             }
         }
+        poRing->closeRings();
         m_poNeatLine->addRingDirectly(poRing);
     }
 
@@ -6013,7 +6017,8 @@ int PDFDataset::ParseLGIDictDictSecondPass(GDALPDFDictionary *poLGIDict)
             CPLTestBool(CPLGetConfigOption("PDF_REPORT_GCPS", "NO")))
         {
             m_nGCPCount = 0;
-            m_pasGCPList = (GDAL_GCP *)CPLCalloc(sizeof(GDAL_GCP), nLength);
+            m_pasGCPList =
+                static_cast<GDAL_GCP *>(CPLCalloc(sizeof(GDAL_GCP), nLength));
 
             for (i = 0; i < nLength; i++)
             {
@@ -6356,12 +6361,16 @@ int PDFDataset::ParseProjDict(GDALPDFDictionary *poProjDict)
 
     else if (EQUAL(osProjectionType, "UT")) /* UTM */
     {
-        int nZone = (int)Get(poProjDict, "Zone");
-        int bNorth = EQUAL(osHemisphere, "N");
-        if (bIsWGS84)
-            oSRS.importFromEPSG(((bNorth) ? 32600 : 32700) + nZone);
-        else
-            oSRS.SetUTM(nZone, bNorth);
+        const double dfZone = Get(poProjDict, "Zone");
+        if (dfZone >= 1 && dfZone <= 60)
+        {
+            int nZone = static_cast<int>(dfZone);
+            int bNorth = EQUAL(osHemisphere, "N");
+            if (bIsWGS84)
+                oSRS.importFromEPSG(((bNorth) ? 32600 : 32700) + nZone);
+            else
+                oSRS.SetUTM(nZone, bNorth);
+        }
     }
 
     else if (EQUAL(osProjectionType,
@@ -6376,8 +6385,12 @@ int PDFDataset::ParseProjDict(GDALPDFDictionary *poProjDict)
 
     else if (EQUAL(osProjectionType, "SPCS")) /* State Plane */
     {
-        int nZone = (int)Get(poProjDict, "Zone");
-        oSRS.SetStatePlane(nZone, bIsNAD83);
+        const double dfZone = Get(poProjDict, "Zone");
+        if (dfZone >= 0 && dfZone <= INT_MAX)
+        {
+            int nZone = static_cast<int>(dfZone);
+            oSRS.SetStatePlane(nZone, bIsNAD83);
+        }
     }
 
     else if (EQUAL(osProjectionType, "AC")) /* Albers Equal Area Conic */
@@ -6610,11 +6623,12 @@ int PDFDataset::ParseProjDict(GDALPDFDictionary *poProjDict)
         double dfScale = Get(poProjDict, "ScaleFactor");
         double dfFalseEasting = Get(poProjDict, "FalseEasting");
         double dfFalseNorthing = Get(poProjDict, "FalseNorthing");
-        if (dfCenterLat == 0.0 && dfScale == 0.9996 &&
-            dfFalseEasting == 500000 &&
+        if (dfCenterLat == 0.0 && dfScale == 0.9996 && dfCenterLong >= -180 &&
+            dfCenterLong <= 180 && dfFalseEasting == 500000 &&
             (dfFalseNorthing == 0.0 || dfFalseNorthing == 10000000.0))
         {
-            int nZone = (int)floor((dfCenterLong + 180.0) / 6.0) + 1;
+            const int nZone =
+                static_cast<int>(floor((dfCenterLong + 180.0) / 6.0) + 1);
             int bNorth = dfFalseNorthing == 0;
             if (bIsWGS84)
                 oSRS.importFromEPSG(((bNorth) ? 32600 : 32700) + nZone);
@@ -7177,8 +7191,8 @@ int PDFDataset::ParseMeasure(GDALPDFObject *poMeasure, double dfMediaBoxWidth,
             }
         }
 
-        x = ROUND_TO_INT_IF_CLOSE(x);
-        y = ROUND_TO_INT_IF_CLOSE(y);
+        x = ROUND_IF_CLOSE(x);
+        y = ROUND_IF_CLOSE(y);
 
         asGCPS[i].dfGCPX = x;
         asGCPS[i].dfGCPY = y;
@@ -7628,7 +7642,7 @@ static void GDALPDFUnloadDriver(CPL_UNUSED GDALDriver *poDriver)
 
             FPDF_CloseDocument(FPDFDocumentFromCPDFDocument(pDoc->doc));
             CPLFree(pDoc->filename);
-            VSIFCloseL((VSILFILE *)pDoc->psFileAccess->m_Param);
+            VSIFCloseL(static_cast<VSILFILE *>(pDoc->psFileAccess->m_Param));
             delete pDoc->psFileAccess;
             pDoc->pages.clear();
 
diff --git a/frmts/pdf/pdfdrivercore.cpp b/frmts/pdf/pdfdrivercore.cpp
index 8f8e1ac054ef..1ad744359c62 100644
--- a/frmts/pdf/pdfdrivercore.cpp
+++ b/frmts/pdf/pdfdrivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault, <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pdfdrivercore.h"
@@ -103,7 +87,7 @@ int PDFDatasetIdentify(GDALOpenInfo *poOpenInfo)
     if (poOpenInfo->nHeaderBytes < 128)
         return FALSE;
 
-    return STARTS_WITH((const char *)poOpenInfo->pabyHeader, "%PDF");
+    return memcmp(poOpenInfo->pabyHeader, "%PDF", 4) == 0;
 }
 
 /************************************************************************/
diff --git a/frmts/pdf/pdfdrivercore.h b/frmts/pdf/pdfdrivercore.h
index cde92418c68f..dfae55720692 100644
--- a/frmts/pdf/pdfdrivercore.h
+++ b/frmts/pdf/pdfdrivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault, <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef PDFDRIVERCORE_H
diff --git a/frmts/pdf/pdfio.cpp b/frmts/pdf/pdfio.cpp
index f4e2cf4023f6..bb5a5da2c8d4 100644
--- a/frmts/pdf/pdfio.cpp
+++ b/frmts/pdf/pdfio.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_pdf.h"
@@ -48,10 +32,9 @@ static vsi_l_offset VSIPDFFileStreamGetSize(VSILFILE *f)
 
 VSIPDFFileStream::VSIPDFFileStream(VSILFILE *fIn, const char *pszFilename,
                                    Object &&dictA)
-    : BaseStream(std::move(dictA), (Goffset)VSIPDFFileStreamGetSize(fIn)),
-      poParent(nullptr), poFilename(new GooString(pszFilename)), f(fIn),
-      nStart(0), bLimited(false), nLength(0), nCurrentPos(VSI_L_OFFSET_MAX),
-      bHasSavedPos(FALSE), nSavedPos(0), nPosInBuffer(-1), nBufferLength(-1)
+    : BaseStream(std::move(dictA),
+                 static_cast<Goffset>(VSIPDFFileStreamGetSize(fIn))),
+      poParent(nullptr), poFilename(new GooString(pszFilename)), f(fIn)
 {
 }
 
@@ -62,10 +45,9 @@ VSIPDFFileStream::VSIPDFFileStream(VSILFILE *fIn, const char *pszFilename,
 VSIPDFFileStream::VSIPDFFileStream(VSIPDFFileStream *poParentIn,
                                    vsi_l_offset startA, bool limitedA,
                                    vsi_l_offset lengthA, Object &&dictA)
-    : BaseStream(std::move(dictA), (Goffset)lengthA), poParent(poParentIn),
-      poFilename(poParentIn->poFilename), f(poParentIn->f), nStart(startA),
-      bLimited(limitedA), nLength(lengthA), nCurrentPos(VSI_L_OFFSET_MAX),
-      bHasSavedPos(FALSE), nSavedPos(0), nPosInBuffer(-1), nBufferLength(-1)
+    : BaseStream(std::move(dictA), static_cast<Goffset>(lengthA)),
+      poParent(poParentIn), poFilename(poParentIn->poFilename),
+      f(poParentIn->f), nStart(startA), bLimited(limitedA), nLength(lengthA)
 {
 }
 
@@ -117,7 +99,7 @@ Goffset VSIPDFFileStream::getPos()
 
 Goffset VSIPDFFileStream::getStart()
 {
-    return (Goffset)nStart;
+    return static_cast<Goffset>(nStart);
 }
 
 /************************************************************************/
@@ -154,12 +136,12 @@ int VSIPDFFileStream::FillBuffer()
     if (!bLimited)
         nToRead = BUFFER_SIZE;
     else if (nCurrentPos + BUFFER_SIZE > nStart + nLength)
-        nToRead = (int)(nStart + nLength - nCurrentPos);
+        nToRead = static_cast<int>(nStart + nLength - nCurrentPos);
     else
         nToRead = BUFFER_SIZE;
     if (nToRead < 0)
         return FALSE;
-    nBufferLength = (int)VSIFReadL(abyBuffer, 1, nToRead, f);
+    nBufferLength = static_cast<int>(VSIFReadL(abyBuffer, 1, nToRead, f));
     if (nBufferLength == 0)
         return FALSE;
 
@@ -173,7 +155,8 @@ int VSIPDFFileStream::FillBuffer()
     // with allocation and liberation of VSIPDFFileStream as PDFDoc::str member.
     if (nCurrentPos == 0 || nCurrentPos == VSI_L_OFFSET_MAX)
     {
-        for (int i = 0; i < nBufferLength - (int)strlen("/Linearized "); i++)
+        for (int i = 0;
+             i < nBufferLength - static_cast<int>(strlen("/Linearized ")); i++)
         {
             if (memcmp(abyBuffer + i, "/Linearized ", strlen("/Linearized ")) ==
                 0)
@@ -279,7 +262,10 @@ void VSIPDFFileStream::unfilteredReset()
 void VSIPDFFileStream::close()
 {
     if (bHasSavedPos)
-        VSIFSeekL(f, nCurrentPos = nSavedPos, SEEK_SET);
+    {
+        nCurrentPos = nSavedPos;
+        VSIFSeekL(f, nCurrentPos, SEEK_SET);
+    }
     bHasSavedPos = FALSE;
     nSavedPos = 0;
 }
@@ -305,7 +291,7 @@ void VSIPDFFileStream::setPos(Goffset pos, int dir)
             VSIFSeekL(f, nStart + nLength, SEEK_SET);
         }
         vsi_l_offset size = VSIFTellL(f);
-        vsi_l_offset newpos = (vsi_l_offset)pos;
+        vsi_l_offset newpos = static_cast<vsi_l_offset>(pos);
         if (newpos > size)
             newpos = size;
         VSIFSeekL(f, nCurrentPos = size - newpos, SEEK_SET);
@@ -321,7 +307,8 @@ void VSIPDFFileStream::setPos(Goffset pos, int dir)
 void VSIPDFFileStream::moveStart(Goffset delta)
 {
     nStart += delta;
-    VSIFSeekL(f, nCurrentPos = nStart, SEEK_SET);
+    nCurrentPos = nStart;
+    VSIFSeekL(f, nCurrentPos, SEEK_SET);
     nPosInBuffer = -1;
     nBufferLength = -1;
 }
@@ -349,7 +336,8 @@ int VSIPDFFileStream::getChars(int nChars, unsigned char *buffer)
         {
             if (!bLimited && nToRead > BUFFER_SIZE)
             {
-                int nJustRead = (int)VSIFReadL(buffer + nRead, 1, nToRead, f);
+                int nJustRead =
+                    static_cast<int>(VSIFReadL(buffer + nRead, 1, nToRead, f));
                 nPosInBuffer = -1;
                 nBufferLength = -1;
                 nCurrentPos += nJustRead;
diff --git a/frmts/pdf/pdfio.h b/frmts/pdf/pdfio.h
index 61feb88d5fe9..d942b4162641 100644
--- a/frmts/pdf/pdfio.h
+++ b/frmts/pdf/pdfio.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef PDFIO_H_INCLUDED
@@ -77,24 +61,26 @@ class VSIPDFFileStream final : public BaseStream
     virtual bool hasGetChars() override;
     virtual int getChars(int nChars, unsigned char *buffer) override;
 
-    VSIPDFFileStream *poParent;
-    GooString *poFilename;
-    VSILFILE *f;
-    vsi_l_offset nStart;
-    bool bLimited;
-    vsi_l_offset nLength;
+    VSIPDFFileStream *poParent = nullptr;
+    GooString *poFilename = nullptr;
+    VSILFILE *f = nullptr;
+    vsi_l_offset nStart = 0;
+    bool bLimited = false;
+    vsi_l_offset nLength = 0;
 
-    vsi_l_offset nCurrentPos;
-    int bHasSavedPos;
-    vsi_l_offset nSavedPos;
+    vsi_l_offset nCurrentPos = VSI_L_OFFSET_MAX;
+    int bHasSavedPos = FALSE;
+    vsi_l_offset nSavedPos = 0;
 
     GByte abyBuffer[BUFFER_SIZE];
-    int nPosInBuffer;
-    int nBufferLength;
+    int nPosInBuffer = -1;
+    int nBufferLength = -1;
 
     bool bFoundLinearizedHint = false;
 
     int FillBuffer();
+
+    CPL_DISALLOW_COPY_ASSIGN(VSIPDFFileStream)
 };
 
 #endif  // PDFIO_H_INCLUDED
diff --git a/frmts/pdf/pdfobject.cpp b/frmts/pdf/pdfobject.cpp
index 40a5cd76606b..8607700f86d5 100644
--- a/frmts/pdf/pdfobject.cpp
+++ b/frmts/pdf/pdfobject.cpp
@@ -14,23 +14,7 @@
  ******************************************************************************
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_pdf.h"
@@ -40,16 +24,16 @@
 #include "pdfobject.h"
 
 /************************************************************************/
-/*                        ROUND_TO_INT_IF_CLOSE()                       */
+/*                        ROUND_IF_CLOSE()                       */
 /************************************************************************/
 
-double ROUND_TO_INT_IF_CLOSE(double x, double eps)
+double ROUND_IF_CLOSE(double x, double eps)
 {
     if (eps == 0.0)
         eps = fabs(x) < 1 ? 1e-10 : 1e-8;
-    int nClosestInt = (int)floor(x + 0.5);
-    if (fabs(x - nClosestInt) < eps)
-        return nClosestInt;
+    const double dfRounded = std::round(x);
+    if (fabs(x - dfRounded) < eps)
+        return dfRounded;
     else
         return x;
 }
@@ -60,10 +44,9 @@ double ROUND_TO_INT_IF_CLOSE(double x, double eps)
 
 static CPLString GDALPDFGetPDFString(const char *pszStr)
 {
-    GByte *pabyData = (GByte *)pszStr;
-    size_t i;
+    const GByte *pabyData = reinterpret_cast<const GByte *>(pszStr);
     GByte ch;
-    for (i = 0; (ch = pabyData[i]) != '\0'; i++)
+    for (size_t i = 0; (ch = pabyData[i]) != '\0'; i++)
     {
         if (ch < 32 || ch > 127 || ch == '(' || ch == ')' || ch == '\\' ||
             ch == '%' || ch == '#')
@@ -80,7 +63,7 @@ static CPLString GDALPDFGetPDFString(const char *pszStr)
 
     wchar_t *pwszDest = CPLRecodeToWChar(pszStr, CPL_ENC_UTF8, CPL_ENC_UCS2);
     osStr = "<FEFF";
-    for (i = 0; pwszDest[i] != 0; i++)
+    for (size_t i = 0; pwszDest[i] != 0; i++)
     {
 #ifndef _WIN32
         if (pwszDest[i] >= 0x10000 /* && pwszDest[i] <= 0x10FFFF */)
@@ -97,8 +80,9 @@ static CPLString GDALPDFGetPDFString(const char *pszStr)
         else
 #endif
         {
-            osStr += CPLSPrintf("%02X", (int)(pwszDest[i] >> 8) & 0xff);
-            osStr += CPLSPrintf("%02X", (int)(pwszDest[i]) & 0xff);
+            osStr +=
+                CPLSPrintf("%02X", static_cast<int>(pwszDest[i] >> 8) & 0xff);
+            osStr += CPLSPrintf("%02X", static_cast<int>(pwszDest[i]) & 0xff);
         }
     }
     osStr += ">";
@@ -132,7 +116,7 @@ static std::string GDALPDFGetUTF8StringFromBytes(const GByte *pabySrc,
                      "GDALPDFGetUTF8StringFromBytes(): %s", e.what());
             return osStr;
         }
-        osStr.assign((const char *)pabySrc, nLen);
+        osStr.assign(reinterpret_cast<const char *>(pabySrc), nLen);
         const char *pszStr = osStr.c_str();
         if (CPLIsUTF8(pszStr, -1))
             return osStr;
@@ -297,9 +281,16 @@ void GDALPDFObject::Serialize(CPLString &osStr, bool bEmitRef)
         {
             char szReal[512];
             double dfRealNonRounded = GetReal();
-            double dfReal = ROUND_TO_INT_IF_CLOSE(dfRealNonRounded);
-            if (dfReal == (double)(GIntBig)dfReal)
-                snprintf(szReal, sizeof(szReal), CPL_FRMT_GIB, (GIntBig)dfReal);
+            double dfReal = ROUND_IF_CLOSE(dfRealNonRounded);
+            if (dfReal >=
+                    static_cast<double>(std::numeric_limits<GIntBig>::min()) &&
+                dfReal <=
+                    static_cast<double>(std::numeric_limits<GIntBig>::max()) &&
+                dfReal == static_cast<double>(static_cast<GIntBig>(dfReal)))
+            {
+                snprintf(szReal, sizeof(szReal), CPL_FRMT_GIB,
+                         static_cast<GIntBig>(dfReal));
+            }
             else if (CanRepresentRealAsString())
             {
                 /* Used for OGC BP numeric values */
@@ -315,8 +306,8 @@ void GDALPDFObject::Serialize(CPLString &osStr, bool bEmitRef)
                 char *pszDot = strchr(szReal, '.');
                 if (pszDot)
                 {
-                    int iDot = (int)(pszDot - szReal);
-                    int nLen = (int)strlen(szReal);
+                    int iDot = static_cast<int>(pszDot - szReal);
+                    int nLen = static_cast<int>(strlen(szReal));
                     for (int i = nLen - 1; i > iDot; i--)
                     {
                         if (szReal[i] == '0')
@@ -548,9 +539,7 @@ GDALPDFArrayRW *GDALPDFArray::Clone()
 /*                           ~GDALPDFStream()                           */
 /************************************************************************/
 
-GDALPDFStream::~GDALPDFStream()
-{
-}
+GDALPDFStream::~GDALPDFStream() = default;
 
 /************************************************************************/
 /* ==================================================================== */
@@ -562,11 +551,7 @@ GDALPDFStream::~GDALPDFStream()
 /*                           GDALPDFObjectRW()                          */
 /************************************************************************/
 
-GDALPDFObjectRW::GDALPDFObjectRW(GDALPDFObjectType eType)
-    : m_eType(eType), m_nVal(0), m_dfVal(0.0),
-      // m_osVal
-      m_poDict(nullptr), m_poArray(nullptr), m_nNum(0), m_nGen(0),
-      m_bCanRepresentRealAsString(FALSE)
+GDALPDFObjectRW::GDALPDFObjectRW(GDALPDFObjectType eType) : m_eType(eType)
 {
 }
 
@@ -821,9 +806,7 @@ int GDALPDFObjectRW::GetRefGen()
 /*                           GDALPDFDictionaryRW()                      */
 /************************************************************************/
 
-GDALPDFDictionaryRW::GDALPDFDictionaryRW()
-{
-}
+GDALPDFDictionaryRW::GDALPDFDictionaryRW() = default;
 
 /************************************************************************/
 /*                          ~GDALPDFDictionaryRW()                      */
@@ -972,7 +955,9 @@ class GDALPDFDictionaryPoppler : public GDALPDFDictionary
 {
   private:
     Dict *m_poDict;
-    std::map<CPLString, GDALPDFObject *> m_map;
+    std::map<CPLString, GDALPDFObject *> m_map{};
+
+    CPL_DISALLOW_COPY_ASSIGN(GDALPDFDictionaryPoppler)
 
   public:
     GDALPDFDictionaryPoppler(Dict *poDict) : m_poDict(poDict)
@@ -995,7 +980,9 @@ class GDALPDFArrayPoppler : public GDALPDFArray
 {
   private:
     Array *m_poArray;
-    std::vector<std::unique_ptr<GDALPDFObject>> m_v;
+    std::vector<std::unique_ptr<GDALPDFObject>> m_v{};
+
+    CPL_DISALLOW_COPY_ASSIGN(GDALPDFArrayPoppler)
 
   public:
     GDALPDFArrayPoppler(Array *poArray) : m_poArray(poArray)
@@ -1019,15 +1006,13 @@ class GDALPDFStreamPoppler : public GDALPDFStream
     Stream *m_poStream;
     int64_t m_nRawLength = -1;
 
+    CPL_DISALLOW_COPY_ASSIGN(GDALPDFStreamPoppler)
+
   public:
     GDALPDFStreamPoppler(Stream *poStream) : m_poStream(poStream)
     {
     }
 
-    virtual ~GDALPDFStreamPoppler()
-    {
-    }
-
     virtual int64_t GetLength(int64_t nMaxSize = 0) override;
     virtual char *GetBytes() override;
 
@@ -1292,7 +1277,7 @@ GDALPDFObject *GDALPDFDictionaryPoppler::Get(const char *pszKey)
     if (oIter != m_map.end())
         return oIter->second;
 
-    auto &&o(m_poDict->lookupNF(((char *)pszKey)));
+    auto &&o(m_poDict->lookupNF(pszKey));
     if (!o.isNull())
     {
         GDALPDFObjectNum nRefNum;
@@ -1301,7 +1286,7 @@ GDALPDFObject *GDALPDFDictionaryPoppler::Get(const char *pszKey)
         {
             nRefNum = o.getRefNum();
             nRefGen = o.getRefGen();
-            Object o2(m_poDict->lookup((char *)pszKey));
+            Object o2(m_poDict->lookup(pszKey));
             if (!o2.isNull())
             {
                 GDALPDFObjectPoppler *poObj =
@@ -1333,7 +1318,7 @@ std::map<CPLString, GDALPDFObject *> &GDALPDFDictionaryPoppler::GetValues()
     int nLength = m_poDict->getLength();
     for (i = 0; i < nLength; i++)
     {
-        const char *pszKey = (const char *)m_poDict->getKey(i);
+        const char *pszKey = m_poDict->getKey(i);
         Get(pszKey);
     }
     return m_map;
@@ -1449,7 +1434,7 @@ static char *GooStringToCharStart(GooString &gstr)
     auto nLength = gstr.getLength();
     if (nLength)
     {
-        char *pszContent = (char *)VSI_MALLOC_VERBOSE(nLength + 1);
+        char *pszContent = static_cast<char *>(VSI_MALLOC_VERBOSE(nLength + 1));
         if (pszContent)
         {
             const char *srcStr = gstr.c_str();
@@ -1536,7 +1521,9 @@ class GDALPDFDictionaryPodofo : public GDALPDFDictionary
   private:
     const PoDoFo::PdfDictionary *m_poDict;
     const PoDoFo::PdfVecObjects &m_poObjects;
-    std::map<CPLString, GDALPDFObject *> m_map;
+    std::map<CPLString, GDALPDFObject *> m_map{};
+
+    CPL_DISALLOW_COPY_ASSIGN(GDALPDFDictionaryPodofo)
 
   public:
     GDALPDFDictionaryPodofo(const PoDoFo::PdfDictionary *poDict,
@@ -1562,7 +1549,9 @@ class GDALPDFArrayPodofo : public GDALPDFArray
   private:
     const PoDoFo::PdfArray *m_poArray;
     const PoDoFo::PdfVecObjects &m_poObjects;
-    std::vector<std::unique_ptr<GDALPDFObject>> m_v;
+    std::vector<std::unique_ptr<GDALPDFObject>> m_v{};
+
+    CPL_DISALLOW_COPY_ASSIGN(GDALPDFArrayPodofo)
 
   public:
     GDALPDFArrayPodofo(const PoDoFo::PdfArray *poArray,
@@ -1591,6 +1580,8 @@ class GDALPDFStreamPodofo : public GDALPDFStream
     const PoDoFo::PdfStream *m_pStream;
 #endif
 
+    CPL_DISALLOW_COPY_ASSIGN(GDALPDFStreamPodofo)
+
   public:
     GDALPDFStreamPodofo(
 #if PODOFO_VERSION_MAJOR > 0 ||                                                \
@@ -1627,8 +1618,7 @@ class GDALPDFStreamPodofo : public GDALPDFStream
 
 GDALPDFObjectPodofo::GDALPDFObjectPodofo(const PoDoFo::PdfObject *po,
                                          const PoDoFo::PdfVecObjects &poObjects)
-    : m_po(po), m_poObjects(poObjects), m_poDict(nullptr), m_poArray(nullptr),
-      m_poStream(nullptr)
+    : m_po(po), m_poObjects(poObjects)
 {
     try
     {
@@ -2076,7 +2066,7 @@ char *GDALPDFStreamPodofo::GetBytes()
                  e.what());
         return nullptr;
     }
-    char *pszContent = (char *)VSI_MALLOC_VERBOSE(str.size() + 1);
+    char *pszContent = static_cast<char *>(VSI_MALLOC_VERBOSE(str.size() + 1));
     if (!pszContent)
     {
         return nullptr;
@@ -2095,7 +2085,7 @@ char *GDALPDFStreamPodofo::GetBytes()
     {
         return nullptr;
     }
-    char *pszContent = (char *)VSI_MALLOC_VERBOSE(nLen + 1);
+    char *pszContent = static_cast<char *>(VSI_MALLOC_VERBOSE(nLen + 1));
     if (!pszContent)
     {
         PoDoFo::podofo_free(pBuffer);
@@ -2157,7 +2147,7 @@ char *GDALPDFStreamPodofo::GetRawBytes()
                  e.what());
         return nullptr;
     }
-    char *pszContent = (char *)VSI_MALLOC_VERBOSE(str.size() + 1);
+    char *pszContent = static_cast<char *>(VSI_MALLOC_VERBOSE(str.size() + 1));
     if (!pszContent)
     {
         return nullptr;
@@ -2176,7 +2166,7 @@ char *GDALPDFStreamPodofo::GetRawBytes()
     {
         return nullptr;
     }
-    char *pszContent = (char *)VSI_MALLOC_VERBOSE(nLen + 1);
+    char *pszContent = static_cast<char *>(VSI_MALLOC_VERBOSE(nLen + 1));
     if (!pszContent)
     {
         PoDoFo::podofo_free(pBuffer);
@@ -2203,7 +2193,7 @@ class GDALPDFDictionaryPdfium : public GDALPDFDictionary
 {
   private:
     RetainPtr<const CPDF_Dictionary> m_poDict;
-    std::map<CPLString, GDALPDFObject *> m_map;
+    std::map<CPLString, GDALPDFObject *> m_map{};
 
   public:
     GDALPDFDictionaryPdfium(RetainPtr<const CPDF_Dictionary> poDict)
@@ -2227,7 +2217,9 @@ class GDALPDFArrayPdfium : public GDALPDFArray
 {
   private:
     const CPDF_Array *m_poArray;
-    std::vector<std::unique_ptr<GDALPDFObject>> m_v;
+    std::vector<std::unique_ptr<GDALPDFObject>> m_v{};
+
+    CPL_DISALLOW_COPY_ASSIGN(GDALPDFArrayPdfium)
 
   public:
     GDALPDFArrayPdfium(const CPDF_Array *poArray) : m_poArray(poArray)
@@ -2262,10 +2254,6 @@ class GDALPDFStreamPdfium : public GDALPDFStream
     {
     }
 
-    virtual ~GDALPDFStreamPdfium()
-    {
-    }
-
     virtual int64_t GetLength(int64_t nMaxSize = 0) override;
     virtual char *GetBytes() override;
 
@@ -2284,8 +2272,7 @@ class GDALPDFStreamPdfium : public GDALPDFStream
 /************************************************************************/
 
 GDALPDFObjectPdfium::GDALPDFObjectPdfium(RetainPtr<const CPDF_Object> obj)
-    : m_obj(std::move(obj)), m_poDict(nullptr), m_poArray(nullptr),
-      m_poStream(nullptr)
+    : m_obj(std::move(obj))
 {
     CPLAssert(m_obj != nullptr);
 }
@@ -2401,7 +2388,7 @@ int GDALPDFObjectPdfium::GetInt()
 
 static double CPLRoundToMoreLikelyDouble(float f)
 {
-    if ((float)(int)f == f)
+    if (std::round(f) == f)
         return f;
 
     char szBuffer[80];
@@ -2417,7 +2404,7 @@ static double CPLRoundToMoreLikelyDouble(float f)
     {
         pszDot[2] = 0;
         double d2 = CPLAtof(szBuffer) + 0.01;
-        float f2 = (float)d2;
+        float f2 = static_cast<float>(d2);
         if (f == f2 || nextafterf(f, f + 1.0f) == f2 ||
             nextafterf(f, f - 1.0f) == f2)
             d = d2;
@@ -2426,7 +2413,7 @@ static double CPLRoundToMoreLikelyDouble(float f)
     {
         pszDot[2] = 0;
         double d2 = CPLAtof(szBuffer);
-        float f2 = (float)d2;
+        float f2 = static_cast<float>(d2);
         if (f == f2 || nextafterf(f, f + 1.0f) == f2 ||
             nextafterf(f, f - 1.0f) == f2)
             d = d2;
@@ -2456,7 +2443,7 @@ const std::string &GDALPDFObjectPdfium::GetString()
         if (bs.IsEmpty())
             return (osStr = "");
         return (osStr = GDALPDFGetUTF8StringFromBytes(
-                    static_cast<const GByte *>(bs.raw_str()),
+                    reinterpret_cast<const GByte *>(bs.c_str()),
                     static_cast<int>(bs.GetLength())));
     }
     else
@@ -2701,7 +2688,7 @@ char *GDALPDFStreamPdfium::GetBytes()
     size_t nLength = static_cast<size_t>(GetLength());
     if (nLength == 0)
         return nullptr;
-    char *pszContent = (char *)VSI_MALLOC_VERBOSE(sizeof(char) * (nLength + 1));
+    char *pszContent = static_cast<char *>(VSI_MALLOC_VERBOSE(nLength + 1));
     if (!pszContent)
         return nullptr;
     memcpy(pszContent, m_pData.get(), nLength);
@@ -2756,7 +2743,8 @@ char *GDALPDFStreamPdfium::GetRawBytes()
     size_t nLength = static_cast<size_t>(GetRawLength());
     if (nLength == 0)
         return nullptr;
-    char *pszContent = (char *)VSI_MALLOC_VERBOSE(sizeof(char) * (nLength + 1));
+    char *pszContent =
+        static_cast<char *>(VSI_MALLOC_VERBOSE(sizeof(char) * (nLength + 1)));
     if (!pszContent)
         return nullptr;
     memcpy(pszContent, m_pRawData.get(), nLength);
diff --git a/frmts/pdf/pdfobject.h b/frmts/pdf/pdfobject.h
index 362eed4e1b06..73c3a277409a 100644
--- a/frmts/pdf/pdfobject.h
+++ b/frmts/pdf/pdfobject.h
@@ -15,23 +15,7 @@
  ******************************************************************************
  * Copyright (c) 2011-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef PDFOBJECT_H_INCLUDED
@@ -46,7 +30,7 @@
 #define DEFAULT_DPI (72.0)
 #define USER_UNIT_IN_INCH (1.0 / DEFAULT_DPI)
 
-double ROUND_TO_INT_IF_CLOSE(double x, double eps = 0);
+double ROUND_IF_CLOSE(double x, double eps = 0);
 
 typedef enum
 {
@@ -214,19 +198,21 @@ class GDALPDFStream
 class GDALPDFObjectRW : public GDALPDFObject
 {
   private:
-    GDALPDFObjectType m_eType;
-    int m_nVal;
-    double m_dfVal;
-    CPLString m_osVal;
-    GDALPDFDictionaryRW *m_poDict;
-    GDALPDFArrayRW *m_poArray;
-    GDALPDFObjectNum m_nNum;
-    int m_nGen;
-    int m_bCanRepresentRealAsString;
+    const GDALPDFObjectType m_eType;
+    int m_nVal = 0;
+    double m_dfVal = 0;
+    CPLString m_osVal{};
+    GDALPDFDictionaryRW *m_poDict = nullptr;
+    GDALPDFArrayRW *m_poArray = nullptr;
+    GDALPDFObjectNum m_nNum{};
+    int m_nGen = 0;
+    int m_bCanRepresentRealAsString = FALSE;
     int m_nPrecision = 16;
 
     explicit GDALPDFObjectRW(GDALPDFObjectType eType);
 
+    CPL_DISALLOW_COPY_ASSIGN(GDALPDFObjectRW)
+
   protected:
     virtual const char *GetTypeNameNative() override;
 
@@ -273,7 +259,9 @@ class GDALPDFObjectRW : public GDALPDFObject
 class GDALPDFDictionaryRW : public GDALPDFDictionary
 {
   private:
-    std::map<CPLString, GDALPDFObject *> m_map;
+    std::map<CPLString, GDALPDFObject *> m_map{};
+
+    CPL_DISALLOW_COPY_ASSIGN(GDALPDFDictionaryRW)
 
   public:
     GDALPDFDictionaryRW();
@@ -322,7 +310,9 @@ class GDALPDFDictionaryRW : public GDALPDFDictionary
 class GDALPDFArrayRW : public GDALPDFArray
 {
   private:
-    std::vector<GDALPDFObject *> m_array;
+    std::vector<GDALPDFObject *> m_array{};
+
+    CPL_DISALLOW_COPY_ASSIGN(GDALPDFArrayRW)
 
   public:
     GDALPDFArrayRW();
@@ -379,21 +369,22 @@ class GDALPDFObjectPoppler : public GDALPDFObject
 {
   private:
     Object *m_po;
-    int m_bDestroy;
-    GDALPDFDictionary *m_poDict;
-    GDALPDFArray *m_poArray;
-    GDALPDFStream *m_poStream;
-    std::string osStr;
-    GDALPDFObjectNum m_nRefNum;
-    int m_nRefGen;
+    const bool m_bDestroy;
+    GDALPDFDictionary *m_poDict = nullptr;
+    GDALPDFArray *m_poArray = nullptr;
+    GDALPDFStream *m_poStream = nullptr;
+    std::string osStr{};
+    GDALPDFObjectNum m_nRefNum{};
+    int m_nRefGen = 0;
+
+    CPL_DISALLOW_COPY_ASSIGN(GDALPDFObjectPoppler)
 
   protected:
     virtual const char *GetTypeNameNative() override;
 
   public:
-    GDALPDFObjectPoppler(Object *po, int bDestroy)
-        : m_po(po), m_bDestroy(bDestroy), m_poDict(nullptr), m_poArray(nullptr),
-          m_poStream(nullptr), m_nRefNum(0), m_nRefGen(0)
+    GDALPDFObjectPoppler(Object *po, bool bDestroy)
+        : m_po(po), m_bDestroy(bDestroy)
     {
     }
 
@@ -425,10 +416,12 @@ class GDALPDFObjectPodofo : public GDALPDFObject
   private:
     const PoDoFo::PdfObject *m_po;
     const PoDoFo::PdfVecObjects &m_poObjects;
-    GDALPDFDictionary *m_poDict;
-    GDALPDFArray *m_poArray;
-    GDALPDFStream *m_poStream;
-    std::string osStr;
+    GDALPDFDictionary *m_poDict = nullptr;
+    GDALPDFArray *m_poArray = nullptr;
+    GDALPDFStream *m_poStream = nullptr;
+    std::string osStr{};
+
+    CPL_DISALLOW_COPY_ASSIGN(GDALPDFObjectPodofo)
 
   protected:
     virtual const char *GetTypeNameNative() override;
@@ -460,13 +453,15 @@ class GDALPDFObjectPdfium : public GDALPDFObject
 {
   private:
     RetainPtr<const CPDF_Object> m_obj;
-    GDALPDFDictionary *m_poDict;
-    GDALPDFArray *m_poArray;
-    GDALPDFStream *m_poStream;
-    std::string osStr;
+    GDALPDFDictionary *m_poDict = nullptr;
+    GDALPDFArray *m_poArray = nullptr;
+    GDALPDFStream *m_poStream = nullptr;
+    std::string osStr{};
 
     GDALPDFObjectPdfium(RetainPtr<const CPDF_Object> obj);
 
+    CPL_DISALLOW_COPY_ASSIGN(GDALPDFObjectPdfium)
+
   protected:
     virtual const char *GetTypeNameNative() override;
 
diff --git a/frmts/pdf/pdfreadvectors.cpp b/frmts/pdf/pdfreadvectors.cpp
index 83eedece4df3..4613d374f486 100644
--- a/frmts/pdf/pdfreadvectors.cpp
+++ b/frmts/pdf/pdfreadvectors.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_pdf.h"
@@ -461,10 +445,10 @@ void PDFDataset::PDFCoordsToSRSCoords(double x, double y, double &X, double &Y)
     Y = m_adfGeoTransform[3] + x * m_adfGeoTransform[4] +
         y * m_adfGeoTransform[5];
 
-    if (fabs(X - (int)floor(X + 0.5)) < 1e-8)
-        X = (int)floor(X + 0.5);
-    if (fabs(Y - (int)floor(Y + 0.5)) < 1e-8)
-        Y = (int)floor(Y + 0.5);
+    if (fabs(X - std::round(X)) < 1e-8)
+        X = std::round(X);
+    if (fabs(Y - std::round(Y)) < 1e-8)
+        Y = std::round(Y);
 }
 
 /************************************************************************/
@@ -1500,9 +1484,12 @@ OGRGeometry *PDFDataset::ParseContent(
                             {
                                 poFeature->SetStyleString(CPLSPrintf(
                                     "PEN(c:#%02X%02X%02X)",
-                                    (int)(oGS.adfStrokeColor[0] * 255 + 0.5),
-                                    (int)(oGS.adfStrokeColor[1] * 255 + 0.5),
-                                    (int)(oGS.adfStrokeColor[2] * 255 + 0.5)));
+                                    static_cast<int>(
+                                        oGS.adfStrokeColor[0] * 255 + 0.5),
+                                    static_cast<int>(
+                                        oGS.adfStrokeColor[1] * 255 + 0.5),
+                                    static_cast<int>(
+                                        oGS.adfStrokeColor[2] * 255 + 0.5)));
                             }
                             else if (eType == wkbPolygon ||
                                      eType == wkbMultiPolygon)
@@ -1510,12 +1497,18 @@ OGRGeometry *PDFDataset::ParseContent(
                                 poFeature->SetStyleString(CPLSPrintf(
                                     "PEN(c:#%02X%02X%02X);BRUSH(fc:#%02X%02X%"
                                     "02X)",
-                                    (int)(oGS.adfStrokeColor[0] * 255 + 0.5),
-                                    (int)(oGS.adfStrokeColor[1] * 255 + 0.5),
-                                    (int)(oGS.adfStrokeColor[2] * 255 + 0.5),
-                                    (int)(oGS.adfFillColor[0] * 255 + 0.5),
-                                    (int)(oGS.adfFillColor[1] * 255 + 0.5),
-                                    (int)(oGS.adfFillColor[2] * 255 + 0.5)));
+                                    static_cast<int>(
+                                        oGS.adfStrokeColor[0] * 255 + 0.5),
+                                    static_cast<int>(
+                                        oGS.adfStrokeColor[1] * 255 + 0.5),
+                                    static_cast<int>(
+                                        oGS.adfStrokeColor[2] * 255 + 0.5),
+                                    static_cast<int>(oGS.adfFillColor[0] * 255 +
+                                                     0.5),
+                                    static_cast<int>(oGS.adfFillColor[1] * 255 +
+                                                     0.5),
+                                    static_cast<int>(oGS.adfFillColor[2] * 255 +
+                                                     0.5)));
                             }
                         }
                         poGeom->assignSpatialReference(
@@ -1712,8 +1705,8 @@ OGRGeometry *PDFDataset::BuildGeometry(std::vector<double> &oCoords,
                     poPoly->addRingDirectly(poLS);
                     poLS = nullptr;
 
-                    papoPoly = (OGRGeometry **)CPLRealloc(
-                        papoPoly, (nPolys + 1) * sizeof(OGRGeometry *));
+                    papoPoly = static_cast<OGRGeometry **>(CPLRealloc(
+                        papoPoly, (nPolys + 1) * sizeof(OGRGeometry *)));
                     papoPoly[nPolys++] = poPoly;
                 }
                 delete poLS;
@@ -1783,8 +1776,8 @@ OGRGeometry *PDFDataset::BuildGeometry(std::vector<double> &oCoords,
                         poPoly->addRingDirectly(poLS);
                         poLS = nullptr;
 
-                        papoPoly = (OGRGeometry **)CPLRealloc(
-                            papoPoly, (nPolys + 1) * sizeof(OGRGeometry *));
+                        papoPoly = static_cast<OGRGeometry **>(CPLRealloc(
+                            papoPoly, (nPolys + 1) * sizeof(OGRGeometry *)));
                         papoPoly[nPolys++] = poPoly;
                     }
                     else
@@ -1900,7 +1893,7 @@ void PDFDataset::ExploreContents(GDALPDFObject *poObj,
     if (!pszStr)
         return;
 
-    const char *pszMCID = (const char *)pszStr;
+    const char *pszMCID = pszStr;
     while ((pszMCID = strstr(pszMCID, "/MCID")) != nullptr)
     {
         const char *pszBDC = strstr(pszMCID, "BDC");
@@ -1964,7 +1957,7 @@ void PDFDataset::ExploreContentsNonStructuredInternal(
     {
         GDALPDFArray *poArray = poContents->GetArray();
         char *pszConcatStr = nullptr;
-        int nConcatLen = 0;
+        size_t nConcatLen = 0;
         for (int i = 0; i < poArray->GetLength(); i++)
         {
             GDALPDFObject *poObj = poArray->Get(i);
@@ -1977,9 +1970,9 @@ void PDFDataset::ExploreContentsNonStructuredInternal(
             char *pszStr = poStream->GetBytes();
             if (!pszStr)
                 break;
-            int nLen = (int)strlen(pszStr);
-            char *pszConcatStrNew =
-                (char *)CPLRealloc(pszConcatStr, nConcatLen + nLen + 1);
+            const size_t nLen = strlen(pszStr);
+            char *pszConcatStrNew = static_cast<char *>(
+                CPLRealloc(pszConcatStr, nConcatLen + nLen + 1));
             if (pszConcatStrNew == nullptr)
             {
                 CPLFree(pszStr);
diff --git a/frmts/pdf/pdfsdk_headers_all.h b/frmts/pdf/pdfsdk_headers_all.h
index 5b1a363e7712..d05098c6f9ec 100644
--- a/frmts/pdf/pdfsdk_headers_all.h
+++ b/frmts/pdf/pdfsdk_headers_all.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef PDFSDK_HEADERS_ALL_H
diff --git a/frmts/pdf/pdfsdk_headers_pdfium.h b/frmts/pdf/pdfsdk_headers_pdfium.h
index f2b271560c95..659a51798aed 100644
--- a/frmts/pdf/pdfsdk_headers_pdfium.h
+++ b/frmts/pdf/pdfsdk_headers_pdfium.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef PDFSDK_HEADERS_PDFIUM_H
@@ -74,7 +58,8 @@
 #include "core/fxge/cfx_defaultrenderdevice.h"
 #include "core/fxge/dib/cfx_dibitmap.h"
 #include "core/fxge/cfx_renderdevice.h"
-#include "core/fxge/agg/fx_agg_driver.h"
+#include "core/fxge/agg/cfx_agg_devicedriver.h"
+#include "core/fxge/agg/cfx_agg_imagerenderer.h"
 #include "core/fxge/renderdevicedriver_iface.h"
 #include "fpdfsdk/cpdfsdk_helpers.h"
 #include "fpdfsdk/cpdfsdk_pauseadapter.h"
diff --git a/frmts/pdf/pdfsdk_headers_podofo.h b/frmts/pdf/pdfsdk_headers_podofo.h
index 9f52b838c46e..aff0345742a6 100644
--- a/frmts/pdf/pdfsdk_headers_podofo.h
+++ b/frmts/pdf/pdfsdk_headers_podofo.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef PDFSDK_HEADERS_PODOFO_H
diff --git a/frmts/pdf/pdfsdk_headers_poppler.h b/frmts/pdf/pdfsdk_headers_poppler.h
index 2705c4ee89d7..00cc4067fe5b 100644
--- a/frmts/pdf/pdfsdk_headers_poppler.h
+++ b/frmts/pdf/pdfsdk_headers_poppler.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef PDFSDK_HEADERS_POPPLER_H
diff --git a/frmts/pdf/pdfwritabledataset.cpp b/frmts/pdf/pdfwritabledataset.cpp
index 6c9ec9cff973..37413b123d6e 100644
--- a/frmts/pdf/pdfwritabledataset.cpp
+++ b/frmts/pdf/pdfwritabledataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_pdf.h"
@@ -31,6 +15,8 @@
 #include "memdataset.h"
 #include "pdfcreatefromcomposition.h"
 
+#include <cmath>
+
 /************************************************************************/
 /*                      PDFWritableVectorDataset()                      */
 /************************************************************************/
@@ -121,8 +107,8 @@ PDFWritableVectorDataset::ICreateLayer(const char *pszLayerName,
     if (poSRSClone)
         poSRSClone->Release();
 
-    papoLayers =
-        (OGRLayer **)CPLRealloc(papoLayers, (nLayers + 1) * sizeof(OGRLayer *));
+    papoLayers = static_cast<OGRLayer **>(
+        CPLRealloc(papoLayers, (nLayers + 1) * sizeof(OGRLayer *)));
     papoLayers[nLayers] = poLayer;
     nLayers++;
 
@@ -203,7 +189,7 @@ OGRErr PDFWritableVectorDataset::SyncToDisk()
     {
         nWidth = 1024;
         const double dfHeight = nWidth * dfRatio;
-        if (dfHeight < 1 || dfHeight > INT_MAX || CPLIsNan(dfHeight))
+        if (dfHeight < 1 || dfHeight > INT_MAX || std::isnan(dfHeight))
         {
             CPLError(CE_Failure, CPLE_AppDefined, "Invalid image dimensions");
             return OGRERR_FAILURE;
@@ -214,7 +200,7 @@ OGRErr PDFWritableVectorDataset::SyncToDisk()
     {
         nHeight = 1024;
         const double dfWidth = nHeight / dfRatio;
-        if (dfWidth < 1 || dfWidth > INT_MAX || CPLIsNan(dfWidth))
+        if (dfWidth < 1 || dfWidth > INT_MAX || std::isnan(dfWidth))
         {
             CPLError(CE_Failure, CPLE_AppDefined, "Invalid image dimensions");
             return OGRERR_FAILURE;
@@ -377,9 +363,9 @@ OGRErr PDFWritableVectorDataset::SyncToDisk()
         else
             osLayerName = papszLayerNames[i];
 
-        oWriter.WriteOGRLayer((OGRDataSourceH)this, i, pszOGRDisplayField,
-                              pszOGRLinkField, osLayerName, bWriteOGRAttributes,
-                              iObj);
+        oWriter.WriteOGRLayer(GDALDataset::ToHandle(this), i,
+                              pszOGRDisplayField, pszOGRLinkField, osLayerName,
+                              bWriteOGRAttributes, iObj);
     }
 
     CSLDestroy(papszLayerNames);
diff --git a/frmts/pds/CMakeLists.txt b/frmts/pds/CMakeLists.txt
index c9d96d83f8ab..ac46b0ede91f 100644
--- a/frmts/pds/CMakeLists.txt
+++ b/frmts/pds/CMakeLists.txt
@@ -45,20 +45,24 @@ if (GDAL_USE_JSONC_INTERNAL)
 endif ()
 if (GDAL_USE_GEOTIFF_INTERNAL)
   gdal_add_vendored_lib(gdal_PDS geotiff)
+  target_compile_definitions(gdal_PDS PRIVATE -DHAVE_GEOTIFF)
 endif ()
 if (GDAL_USE_TIFF_INTERNAL)
   gdal_add_vendored_lib(gdal_PDS libtiff)
+  target_compile_definitions(gdal_PDS PRIVATE -DHAVE_TIFF)
 endif ()
 
 # External libs next
 if (NOT GDAL_USE_JSONC_INTERNAL)
   gdal_target_link_libraries(gdal_PDS PRIVATE ${JSONC_TARGET})
 endif ()
-if (NOT GDAL_USE_GEOTIFF_INTERNAL)
+if (GDAL_USE_GEOTIFF AND NOT GDAL_USE_GEOTIFF_INTERNAL)
   gdal_target_link_libraries(gdal_PDS PRIVATE ${GeoTIFF_TARGET})
+  target_compile_definitions(gdal_PDS PRIVATE -DHAVE_GEOTIFF)
 endif ()
-if (NOT GDAL_USE_TIFF_INTERNAL)
+if (GDAL_USE_TIFF AND NOT GDAL_USE_TIFF_INTERNAL)
   gdal_target_link_libraries(gdal_PDS PRIVATE TIFF::TIFF)
+  target_compile_definitions(gdal_PDS PRIVATE -DHAVE_TIFF)
 endif ()
 
 if (CMAKE_SYSTEM_NAME MATCHES "Windows")
diff --git a/frmts/pds/isis2dataset.cpp b/frmts/pds/isis2dataset.cpp
index 588c29353e47..b7b42beb50a6 100644
--- a/frmts/pds/isis2dataset.cpp
+++ b/frmts/pds/isis2dataset.cpp
@@ -15,23 +15,7 @@
  * Copyright (c) 2006, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 constexpr int NULL1 = 0;
diff --git a/frmts/pds/isis3dataset.cpp b/frmts/pds/isis3dataset.cpp
index 714f1b5fecbf..f22e76d43b7e 100644
--- a/frmts/pds/isis3dataset.cpp
+++ b/frmts/pds/isis3dataset.cpp
@@ -17,23 +17,7 @@
  * Copyright (c) 2017, Dmitry Baryshnikov <polimax@mail.ru>
  * Copyright (c) 2017, NextGIS <info@nextgis.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_json.h"
@@ -1956,8 +1940,8 @@ GDALDataset *ISIS3Dataset::Open(GDALOpenInfo *poOpenInfo)
         // acknowledged in
         // https://pds-imaging.jpl.nasa.gov/documentation/Cassini_BIDRSIS.PDF in
         // the middle of page 10
-        oProj4String.Printf("+proj=ob_tran +o_proj=eqc +o_lon_p=%.18g "
-                            "+o_lat_p=%.18g +lon_0=%.18g",
+        oProj4String.Printf("+proj=ob_tran +o_proj=eqc +o_lon_p=%.17g "
+                            "+o_lat_p=%.17g +lon_0=%.17g",
                             -poleRotation, 180 - poleLatitude, poleLongitude);
         oSRS.SetFromUserInput(oProj4String);
     }
@@ -3618,8 +3602,7 @@ void ISIS3Dataset::WriteLabel()
 
 CPLString ISIS3Dataset::SerializeAsPDL(const CPLJSONObject &oObj)
 {
-    CPLString osTmpFile(
-        CPLSPrintf("/vsimem/isis3_%p", oObj.GetInternalHandle()));
+    const CPLString osTmpFile(VSIMemGenerateHiddenFilename("isis3_pdl"));
     VSILFILE *fpTmp = VSIFOpenL(osTmpFile, "wb+");
     SerializeAsPDL(fpTmp, oObj);
     VSIFCloseL(fpTmp);
@@ -3762,7 +3745,7 @@ void ISIS3Dataset::SerializeAsPDL(VSILFILE *fp, const CPLJSONObject &oObj,
                         }
                         else
                         {
-                            VSIFPrintfL(fp, "%s%s%s = %.18g <%s>\n",
+                            VSIFPrintfL(fp, "%s%s%s = %.17g <%s>\n",
                                         osIndentation.c_str(), osKey.c_str(),
                                         osPadding.c_str(), dfVal,
                                         osUnit.c_str());
@@ -3839,7 +3822,7 @@ void ISIS3Dataset::SerializeAsPDL(VSILFILE *fp, const CPLJSONObject &oObj,
             }
             else
             {
-                VSIFPrintfL(fp, "%s%s%s = %.18g\n", osIndentation.c_str(),
+                VSIFPrintfL(fp, "%s%s%s = %.17g\n", osIndentation.c_str(),
                             osKey.c_str(), osPadding.c_str(), dfVal);
             }
         }
@@ -3933,7 +3916,7 @@ void ISIS3Dataset::SerializeAsPDL(VSILFILE *fp, const CPLJSONObject &oObj,
                     }
                     else
                     {
-                        osVal = CPLSPrintf("%.18g", dfVal);
+                        osVal = CPLSPrintf("%.17g", dfVal);
                     }
                     const size_t nValLen = osVal.size();
                     if (nFirstPos < WIDTH && idx > 0 &&
diff --git a/frmts/pds/pds4dataset.cpp b/frmts/pds/pds4dataset.cpp
index 559868b77975..bf559e071bc9 100644
--- a/frmts/pds/pds4dataset.cpp
+++ b/frmts/pds/pds4dataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2017, Hobu Inc
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_vsi_error.h"
@@ -1171,8 +1155,8 @@ void PDS4Dataset::ReadGeoreferencing(CPLXMLNode *psProduct)
 
                 CPLString oProj4String;
                 // Cf isis3dataset.cpp comments for ObliqueCylindrical
-                oProj4String.Printf("+proj=ob_tran +o_proj=eqc +o_lon_p=%.18g "
-                                    "+o_lat_p=%.18g +lon_0=%.18g",
+                oProj4String.Printf("+proj=ob_tran +o_proj=eqc +o_lon_p=%.17g "
+                                    "+o_lat_p=%.17g +lon_0=%.17g",
                                     -poleRotation, 180 - poleLatitude,
                                     poleLongitude);
                 oSRS.SetFromUserInput(oProj4String);
@@ -1584,6 +1568,13 @@ PDS4Dataset *PDS4Dataset::OpenInternal(GDALOpenInfo *poOpenInfo)
         "");
     const bool bBottomToTop = EQUAL(pszVertDir, "Bottom to Top");
 
+    const char *pszHorizDir = CPLGetXMLValue(
+        psProduct,
+        "Observation_Area.Discipline_Area.Display_Settings.Display_Direction."
+        "horizontal_display_direction",
+        "");
+    const bool bRightToLeft = EQUAL(pszHorizDir, "Right to Left");
+
     auto poDS = std::make_unique<PDS4Dataset>();
     poDS->m_osXMLFilename = osXMLFilename;
     poDS->eAccess = eAccess;
@@ -1999,14 +1990,21 @@ PDS4Dataset *PDS4Dataset::OpenInternal(GDALOpenInfo *poOpenInfo)
 
             for (int i = 0; i < l_nBands; i++)
             {
+                vsi_l_offset nThisBandOffset = nOffset + nBandOffset * i;
+                if (bBottomToTop)
+                {
+                    nThisBandOffset +=
+                        static_cast<vsi_l_offset>(nLines - 1) * nLineOffset;
+                }
+                if (bRightToLeft)
+                {
+                    nThisBandOffset +=
+                        static_cast<vsi_l_offset>(nSamples - 1) * nPixelOffset;
+                }
                 auto poBand = std::make_unique<PDS4RawRasterBand>(
-                    poDS.get(), i + 1, poDS->m_fpImage,
-                    (bBottomToTop) ? nOffset + nBandOffset * i +
-                                         static_cast<vsi_l_offset>(nLines - 1) *
-                                             nLineOffset
-                                   : nOffset + nBandOffset * i,
-                    nPixelOffset, (bBottomToTop) ? -nLineOffset : nLineOffset,
-                    eDT,
+                    poDS.get(), i + 1, poDS->m_fpImage, nThisBandOffset,
+                    bRightToLeft ? -nPixelOffset : nPixelOffset,
+                    bBottomToTop ? -nLineOffset : nLineOffset, eDT,
                     bLSBOrder ? RawRasterBand::ByteOrder::ORDER_LITTLE_ENDIAN
                               : RawRasterBand::ByteOrder::ORDER_BIG_ENDIAN);
                 if (!poBand->IsValid())
@@ -2247,22 +2245,22 @@ void PDS4Dataset::WriteGeoreferencing(CPLXMLNode *psCart,
     CPLAddXMLAttributeAndValue(
         CPLCreateXMLElementAndValue(
             psBC, (osPrefix + "west_bounding_coordinate").c_str(),
-            CPLSPrintf("%.18g", dfWest)),
+            CPLSPrintf("%.17g", dfWest)),
         "unit", "deg");
     CPLAddXMLAttributeAndValue(
         CPLCreateXMLElementAndValue(
             psBC, (osPrefix + "east_bounding_coordinate").c_str(),
-            CPLSPrintf("%.18g", dfEast)),
+            CPLSPrintf("%.17g", dfEast)),
         "unit", "deg");
     CPLAddXMLAttributeAndValue(
         CPLCreateXMLElementAndValue(
             psBC, (osPrefix + "north_bounding_coordinate").c_str(),
-            CPLSPrintf("%.18g", dfNorth)),
+            CPLSPrintf("%.17g", dfNorth)),
         "unit", "deg");
     CPLAddXMLAttributeAndValue(
         CPLCreateXMLElementAndValue(
             psBC, (osPrefix + "south_bounding_coordinate").c_str(),
-            CPLSPrintf("%.18g", dfSouth)),
+            CPLSPrintf("%.17g", dfSouth)),
         "unit", "deg");
 
     CPLXMLNode *psSRI =
@@ -2591,7 +2589,7 @@ void PDS4Dataset::WriteGeoreferencing(CPLXMLNode *psCart,
         {
             CPLXMLNode *psParam = CPLCreateXMLElementAndValue(
                 psProj, (osPrefix + aoProjParams[i].first).c_str(),
-                CPLSPrintf("%.18g", aoProjParams[i].second));
+                CPLSPrintf("%.17g", aoProjParams[i].second));
             if (!STARTS_WITH(aoProjParams[i].first, "scale_factor"))
             {
                 CPLAddXMLAttributeAndValue(psParam, "unit", "deg");
@@ -2607,7 +2605,7 @@ void PDS4Dataset::WriteGeoreferencing(CPLXMLNode *psCart,
             CPLAddXMLAttributeAndValue(
                 CPLCreateXMLElementAndValue(
                     psOLA, (osPrefix + "azimuthal_angle").c_str(),
-                    CPLSPrintf("%.18g",
+                    CPLSPrintf("%.17g",
                                m_oSRS.GetNormProjParm(SRS_PP_AZIMUTH, 0.0))),
                 "unit", "deg");
             ;
@@ -2616,7 +2614,7 @@ void PDS4Dataset::WriteGeoreferencing(CPLXMLNode *psCart,
                 CPLCreateXMLElementAndValue(
                     psOLA,
                     (osPrefix + "azimuth_measure_point_longitude").c_str(),
-                    CPLSPrintf("%.18g", FixLong(m_oSRS.GetNormProjParm(
+                    CPLSPrintf("%.17g", FixLong(m_oSRS.GetNormProjParm(
                                             SRS_PP_CENTRAL_MERIDIAN, 0.0)))),
                 "unit", "deg");
 
@@ -2636,7 +2634,7 @@ void PDS4Dataset::WriteGeoreferencing(CPLXMLNode *psCart,
                 if (dfScaleFactor != 1.0)
                 {
                     CPLError(CE_Warning, CPLE_NotSupported,
-                             "Scale factor on initial support = %.18g cannot "
+                             "Scale factor on initial support = %.17g cannot "
                              "be encoded in PDS4",
                              dfScaleFactor);
                 }
@@ -2646,7 +2644,7 @@ void PDS4Dataset::WriteGeoreferencing(CPLXMLNode *psCart,
                 CPLCreateXMLElementAndValue(
                     psProj,
                     (osPrefix + "scale_factor_at_projection_origin").c_str(),
-                    CPLSPrintf("%.18g", m_oSRS.GetNormProjParm(
+                    CPLSPrintf("%.17g", m_oSRS.GetNormProjParm(
                                             SRS_PP_SCALE_FACTOR, 0.0)));
 
                 CPLAddXMLChild(psProj, psOLA);
@@ -2656,7 +2654,7 @@ void PDS4Dataset::WriteGeoreferencing(CPLXMLNode *psCart,
                 CPLCreateXMLElementAndValue(
                     psProj,
                     (osPrefix + "latitude_of_projection_origin").c_str(),
-                    CPLSPrintf("%.18g", m_oSRS.GetNormProjParm(
+                    CPLSPrintf("%.17g", m_oSRS.GetNormProjParm(
                                             SRS_PP_LATITUDE_OF_ORIGIN, 0.0))),
                 "unit", "deg");
         }
@@ -2671,7 +2669,7 @@ void PDS4Dataset::WriteGeoreferencing(CPLXMLNode *psCart,
                 if (dfScaleFactor != 1.0)
                 {
                     CPLError(CE_Warning, CPLE_NotSupported,
-                             "Scale factor on initial support = %.18g cannot "
+                             "Scale factor on initial support = %.17g cannot "
                              "be encoded in PDS4",
                              dfScaleFactor);
                 }
@@ -2681,7 +2679,7 @@ void PDS4Dataset::WriteGeoreferencing(CPLXMLNode *psCart,
                 CPLCreateXMLElementAndValue(
                     psProj,
                     (osPrefix + "scale_factor_at_projection_origin").c_str(),
-                    CPLSPrintf("%.18g", m_oSRS.GetNormProjParm(
+                    CPLSPrintf("%.17g", m_oSRS.GetNormProjParm(
                                             SRS_PP_SCALE_FACTOR, 0.0)));
             }
 
@@ -2693,13 +2691,13 @@ void PDS4Dataset::WriteGeoreferencing(CPLXMLNode *psCart,
             CPLAddXMLAttributeAndValue(
                 CPLCreateXMLElementAndValue(
                     psOLPG1, (osPrefix + "oblique_line_latitude").c_str(),
-                    CPLSPrintf("%.18g", m_oSRS.GetNormProjParm(
+                    CPLSPrintf("%.17g", m_oSRS.GetNormProjParm(
                                             SRS_PP_LATITUDE_OF_POINT_1, 0.0))),
                 "unit", "deg");
             CPLAddXMLAttributeAndValue(
                 CPLCreateXMLElementAndValue(
                     psOLPG1, (osPrefix + "oblique_line_longitude").c_str(),
-                    CPLSPrintf("%.18g",
+                    CPLSPrintf("%.17g",
                                FixLong(m_oSRS.GetNormProjParm(
                                    SRS_PP_LONGITUDE_OF_POINT_1, 0.0)))),
                 "unit", "deg");
@@ -2709,13 +2707,13 @@ void PDS4Dataset::WriteGeoreferencing(CPLXMLNode *psCart,
             CPLAddXMLAttributeAndValue(
                 CPLCreateXMLElementAndValue(
                     psOLPG2, (osPrefix + "oblique_line_latitude").c_str(),
-                    CPLSPrintf("%.18g", m_oSRS.GetNormProjParm(
+                    CPLSPrintf("%.17g", m_oSRS.GetNormProjParm(
                                             SRS_PP_LATITUDE_OF_POINT_2, 0.0))),
                 "unit", "deg");
             CPLAddXMLAttributeAndValue(
                 CPLCreateXMLElementAndValue(
                     psOLPG2, (osPrefix + "oblique_line_longitude").c_str(),
-                    CPLSPrintf("%.18g", m_oSRS.GetNormProjParm(
+                    CPLSPrintf("%.17g", m_oSRS.GetNormProjParm(
                                             SRS_PP_LONGITUDE_OF_POINT_2, 0.0))),
                 "unit", "deg");
 
@@ -2733,7 +2731,7 @@ void PDS4Dataset::WriteGeoreferencing(CPLXMLNode *psCart,
                 CPLCreateXMLElementAndValue(
                     psProj,
                     (osPrefix + "latitude_of_projection_origin").c_str(),
-                    CPLSPrintf("%.18g", FixLong(m_oSRS.GetNormProjParm(
+                    CPLSPrintf("%.17g", FixLong(m_oSRS.GetNormProjParm(
                                             SRS_PP_LATITUDE_OF_ORIGIN, 0.0)))),
                 "unit", "deg");
         }
@@ -2782,22 +2780,22 @@ void PDS4Dataset::WriteGeoreferencing(CPLXMLNode *psCart,
             CPLAddXMLAttributeAndValue(
                 CPLCreateXMLElementAndValue(
                     psCR, (osPrefix + "pixel_resolution_x").c_str(),
-                    CPLSPrintf("%.18g", dfUnrotatedResX * dfDegToMeter)),
+                    CPLSPrintf("%.17g", dfUnrotatedResX * dfDegToMeter)),
                 "unit", "m/pixel");
             CPLAddXMLAttributeAndValue(
                 CPLCreateXMLElementAndValue(
                     psCR, (osPrefix + "pixel_resolution_y").c_str(),
-                    CPLSPrintf("%.18g", -dfUnrotatedResY * dfDegToMeter)),
+                    CPLSPrintf("%.17g", -dfUnrotatedResY * dfDegToMeter)),
                 "unit", "m/pixel");
             CPLAddXMLAttributeAndValue(
                 CPLCreateXMLElementAndValue(
                     psCR, (osPrefix + "pixel_scale_x").c_str(),
-                    CPLSPrintf("%.18g", 1.0 / (dfUnrotatedResX))),
+                    CPLSPrintf("%.17g", 1.0 / (dfUnrotatedResX))),
                 "unit", "pixel/deg");
             CPLAddXMLAttributeAndValue(
                 CPLCreateXMLElementAndValue(
                     psCR, (osPrefix + "pixel_scale_y").c_str(),
-                    CPLSPrintf("%.18g", 1.0 / (-dfUnrotatedResY))),
+                    CPLSPrintf("%.17g", 1.0 / (-dfUnrotatedResY))),
                 "unit", "pixel/deg");
         }
         else if (m_oSRS.IsProjected())
@@ -2805,23 +2803,23 @@ void PDS4Dataset::WriteGeoreferencing(CPLXMLNode *psCart,
             CPLAddXMLAttributeAndValue(
                 CPLCreateXMLElementAndValue(
                     psCR, (osPrefix + "pixel_resolution_x").c_str(),
-                    CPLSPrintf("%.18g", dfUnrotatedResX * dfLinearUnits)),
+                    CPLSPrintf("%.17g", dfUnrotatedResX * dfLinearUnits)),
                 "unit", "m/pixel");
             CPLAddXMLAttributeAndValue(
                 CPLCreateXMLElementAndValue(
                     psCR, (osPrefix + "pixel_resolution_y").c_str(),
-                    CPLSPrintf("%.18g", -dfUnrotatedResY * dfLinearUnits)),
+                    CPLSPrintf("%.17g", -dfUnrotatedResY * dfLinearUnits)),
                 "unit", "m/pixel");
             CPLAddXMLAttributeAndValue(
                 CPLCreateXMLElementAndValue(
                     psCR, (osPrefix + "pixel_scale_x").c_str(),
-                    CPLSPrintf("%.18g", dfDegToMeter /
+                    CPLSPrintf("%.17g", dfDegToMeter /
                                             (dfUnrotatedResX * dfLinearUnits))),
                 "unit", "pixel/deg");
             CPLAddXMLAttributeAndValue(
                 CPLCreateXMLElementAndValue(
                     psCR, (osPrefix + "pixel_scale_y").c_str(),
-                    CPLSPrintf("%.18g", dfDegToMeter / (-dfUnrotatedResY *
+                    CPLSPrintf("%.17g", dfDegToMeter / (-dfUnrotatedResY *
                                                         dfLinearUnits))),
                 "unit", "pixel/deg");
         }
@@ -2842,12 +2840,12 @@ void PDS4Dataset::WriteGeoreferencing(CPLXMLNode *psCart,
                 CPLAddXMLAttributeAndValue(
                     CPLCreateXMLElementAndValue(
                         psGT, (osPrefix + "upperleft_corner_x").c_str(),
-                        CPLSPrintf("%.18g", dfULX * dfDegToMeter)),
+                        CPLSPrintf("%.17g", dfULX * dfDegToMeter)),
                     "unit", "m");
                 CPLAddXMLAttributeAndValue(
                     CPLCreateXMLElementAndValue(
                         psGT, (osPrefix + "upperleft_corner_y").c_str(),
-                        CPLSPrintf("%.18g", dfULY * dfDegToMeter)),
+                        CPLSPrintf("%.17g", dfULY * dfDegToMeter)),
                     "unit", "m");
             }
             else if (m_oSRS.IsProjected())
@@ -2855,12 +2853,12 @@ void PDS4Dataset::WriteGeoreferencing(CPLXMLNode *psCart,
                 CPLAddXMLAttributeAndValue(
                     CPLCreateXMLElementAndValue(
                         psGT, (osPrefix + "upperleft_corner_x").c_str(),
-                        CPLSPrintf("%.18g", dfULX * dfLinearUnits)),
+                        CPLSPrintf("%.17g", dfULX * dfLinearUnits)),
                     "unit", "m");
                 CPLAddXMLAttributeAndValue(
                     CPLCreateXMLElementAndValue(
                         psGT, (osPrefix + "upperleft_corner_y").c_str(),
-                        CPLSPrintf("%.18g", dfULY * dfLinearUnits)),
+                        CPLSPrintf("%.17g", dfULY * dfLinearUnits)),
                     "unit", "m");
             }
         }
@@ -2931,7 +2929,7 @@ void PDS4Dataset::WriteGeoreferencing(CPLXMLNode *psCart,
             (osPrefix +
              (bUseLDD1930RadiusNames ? "a_axis_radius" : "semi_major_radius"))
                 .c_str(),
-            CPLSPrintf("%.18g", dfSemiMajor)),
+            CPLSPrintf("%.17g", dfSemiMajor)),
         "unit", "m");
     // No, this is not a bug. The PDS4  b_axis_radius/semi_minor_radius is the
     // minor radius on the equatorial plane. Which in WKT doesn't really exist,
@@ -2942,7 +2940,7 @@ void PDS4Dataset::WriteGeoreferencing(CPLXMLNode *psCart,
             (osPrefix +
              (bUseLDD1930RadiusNames ? "b_axis_radius" : "semi_minor_radius"))
                 .c_str(),
-            CPLSPrintf("%.18g", dfSemiMajor)),
+            CPLSPrintf("%.17g", dfSemiMajor)),
         "unit", "m");
     CPLAddXMLAttributeAndValue(
         CPLCreateXMLElementAndValue(
@@ -2950,7 +2948,7 @@ void PDS4Dataset::WriteGeoreferencing(CPLXMLNode *psCart,
             (osPrefix +
              (bUseLDD1930RadiusNames ? "c_axis_radius" : "polar_radius"))
                 .c_str(),
-            CPLSPrintf("%.18g", dfSemiMinor)),
+            CPLSPrintf("%.17g", dfSemiMinor)),
         "unit", "m");
 
     // Fix case
@@ -3347,7 +3345,7 @@ void PDS4Dataset::WriteArray(const CPLString &osPrefix, CPLXMLNode *psFAO,
     {
         CPLCreateXMLElementAndValue(psElementArray,
                                     (osPrefix + "scaling_factor").c_str(),
-                                    CPLSPrintf("%.18g", dfScale));
+                                    CPLSPrintf("%.17g", dfScale));
     }
 
     int bHasOffset = FALSE;
@@ -3356,7 +3354,7 @@ void PDS4Dataset::WriteArray(const CPLString &osPrefix, CPLXMLNode *psFAO,
     {
         CPLCreateXMLElementAndValue(psElementArray,
                                     (osPrefix + "value_offset").c_str(),
-                                    CPLSPrintf("%.18g", dfOffset));
+                                    CPLSPrintf("%.17g", dfOffset));
     }
 
     // Axis definitions
@@ -3429,7 +3427,7 @@ void PDS4Dataset::WriteArray(const CPLString &osPrefix, CPLXMLNode *psFAO,
                 {
                     CPLFree(psMC->psChild->pszValue);
                     psMC->psChild->pszValue =
-                        CPLStrdup(CPLSPrintf("%.18g", dfNoData));
+                        CPLStrdup(CPLSPrintf("%.17g", dfNoData));
                 }
             }
             else
@@ -3439,7 +3437,7 @@ void PDS4Dataset::WriteArray(const CPLString &osPrefix, CPLXMLNode *psFAO,
                                   (osPrefix + "saturated_constant").c_str());
                 psMC = CPLCreateXMLElementAndValue(
                     nullptr, (osPrefix + "missing_constant").c_str(),
-                    CPLSPrintf("%.18g", dfNoData));
+                    CPLSPrintf("%.17g", dfNoData));
                 CPLXMLNode *psNext;
                 if (psSaturatedConstant)
                 {
@@ -3461,7 +3459,7 @@ void PDS4Dataset::WriteArray(const CPLString &osPrefix, CPLXMLNode *psFAO,
             psArray, CXT_Element, (osPrefix + "Special_Constants").c_str());
         CPLCreateXMLElementAndValue(psSC,
                                     (osPrefix + "missing_constant").c_str(),
-                                    CPLSPrintf("%.18g", dfNoData));
+                                    CPLSPrintf("%.17g", dfNoData));
     }
 }
 
diff --git a/frmts/pds/pds4dataset.h b/frmts/pds/pds4dataset.h
index f244b6eac42d..642ae580ec26 100644
--- a/frmts/pds/pds4dataset.h
+++ b/frmts/pds/pds4dataset.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2019, Hobu Inc
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #pragma once
diff --git a/frmts/pds/pds4vector.cpp b/frmts/pds/pds4vector.cpp
index 307de7f9b28c..4228b391921e 100644
--- a/frmts/pds/pds4vector.cpp
+++ b/frmts/pds/pds4vector.cpp
@@ -7,27 +7,11 @@
  ******************************************************************************
  * Copyright (c) 2019, Hobu Inc
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pds4dataset.h"
-#include "ogr_vrt.h"
+#include "ogrvrtgeometrytypes.h"
 
 #include "ogr_p.h"
 
diff --git a/frmts/pds/pdsdataset.cpp b/frmts/pds/pdsdataset.cpp
index 43c11261fcb8..74dde9c539fa 100644
--- a/frmts/pds/pdsdataset.cpp
+++ b/frmts/pds/pdsdataset.cpp
@@ -13,23 +13,7 @@
  * Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 // Set up PDS NULL values
@@ -592,8 +576,8 @@ void PDSDataset::ParseSRS()
         // acknowledged in
         // https://pds-imaging.jpl.nasa.gov/documentation/Cassini_BIDRSIS.PDF in
         // the middle of page 10
-        oProj4String.Printf("+proj=ob_tran +o_proj=eqc +o_lon_p=%.18g "
-                            "+o_lat_p=%.18g +lon_0=%.18g",
+        oProj4String.Printf("+proj=ob_tran +o_proj=eqc +o_lon_p=%.17g "
+                            "+o_lat_p=%.17g +lon_0=%.17g",
                             -poleRotation, 180 - poleLatitude, poleLongitude);
         oSRS.SetFromUserInput(oProj4String);
     }
diff --git a/frmts/pds/pdsdrivercore.cpp b/frmts/pds/pdsdrivercore.cpp
index fa1bea070932..1c036758f427 100644
--- a/frmts/pds/pdsdrivercore.cpp
+++ b/frmts/pds/pdsdrivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "pdsdrivercore.h"
@@ -493,11 +477,20 @@ void ISIS3DriverSetCommonMetadata(GDALDriver *poDriver)
 /*                     VICARGetLabelOffset()                            */
 /************************************************************************/
 
-int VICARGetLabelOffset(GDALOpenInfo *poOpenInfo)
+vsi_l_offset VICARGetLabelOffset(GDALOpenInfo *poOpenInfo)
 
 {
     if (poOpenInfo->pabyHeader == nullptr || poOpenInfo->fpL == nullptr)
-        return -1;
+        return static_cast<vsi_l_offset>(-1);
+
+    const auto HasFoundVICARKeywords = [](const char *pszHeader)
+    {
+        return strstr(pszHeader, "LBLSIZE") != nullptr &&
+               strstr(pszHeader, "FORMAT") != nullptr &&
+               strstr(pszHeader, "NL") != nullptr &&
+               strstr(pszHeader, "NS") != nullptr &&
+               strstr(pszHeader, "NB") != nullptr;
+    };
 
     std::string osHeader;
     const char *pszHeader =
@@ -506,10 +499,11 @@ int VICARGetLabelOffset(GDALOpenInfo *poOpenInfo)
     // If the user sets GDAL_TRY_PDS3_WITH_VICAR=YES, then we will gracefully
     // hand over the file to the VICAR dataset.
     vsi_l_offset nOffset = 0;
-    if (CPLTestBool(CPLGetConfigOption("GDAL_TRY_PDS3_WITH_VICAR", "NO")) &&
-        !STARTS_WITH(poOpenInfo->pszFilename, "/vsisubfile/") &&
-        (nOffset = GetVICARLabelOffsetFromPDS3(pszHeader, poOpenInfo->fpL,
-                                               osHeader)) > 0)
+    const bool bTryPDS3WithVicar =
+        CPLTestBool(CPLGetConfigOption("GDAL_TRY_PDS3_WITH_VICAR", "NO")) &&
+        !STARTS_WITH(poOpenInfo->pszFilename, "/vsisubfile/");
+    if (bTryPDS3WithVicar && (nOffset = GetVICARLabelOffsetFromPDS3(
+                                  pszHeader, poOpenInfo->fpL, osHeader)) > 0)
     {
         pszHeader = osHeader.c_str();
     }
@@ -520,22 +514,36 @@ int VICARGetLabelOffset(GDALOpenInfo *poOpenInfo)
         // If opening in vector-only mode, then check when have NBB != 0
         const char *pszNBB = strstr(pszHeader, "NBB");
         if (pszNBB == nullptr)
-            return -1;
+            return static_cast<vsi_l_offset>(-1);
         const char *pszEqualSign = strchr(pszNBB, '=');
         if (pszEqualSign == nullptr)
-            return -1;
+            return static_cast<vsi_l_offset>(-1);
         if (atoi(pszEqualSign + 1) == 0)
-            return -1;
+            return static_cast<vsi_l_offset>(-1);
     }
-    if (strstr(pszHeader, "LBLSIZE") != nullptr &&
-        strstr(pszHeader, "FORMAT") != nullptr &&
-        strstr(pszHeader, "NL") != nullptr &&
-        strstr(pszHeader, "NS") != nullptr &&
-        strstr(pszHeader, "NB") != nullptr)
+
+    if (HasFoundVICARKeywords(pszHeader))
     {
-        return static_cast<int>(nOffset);
+        // If we find VICAR keywords, but the file starts with PDS_VERSION_ID,
+        // it might be a PDS3 image that includes a VICAR header. Check if
+        // this is the case.
+        if (nOffset == 0 && STARTS_WITH(pszHeader, "PDS_VERSION_ID"))
+        {
+            if (!bTryPDS3WithVicar &&
+                (!GDALGetDriverByName("PDS") ||
+                 poOpenInfo->IsSingleAllowedDriver("VICAR")))
+            {
+                const auto nOffset2 = GetVICARLabelOffsetFromPDS3(
+                    pszHeader, poOpenInfo->fpL, osHeader);
+                if (nOffset2 > 0 && HasFoundVICARKeywords(osHeader.c_str()))
+                {
+                    return nOffset2;
+                }
+            }
+        }
+        return nOffset;
     }
-    return -1;
+    return static_cast<vsi_l_offset>(-1);
 }
 
 /************************************************************************/
@@ -544,7 +552,7 @@ int VICARGetLabelOffset(GDALOpenInfo *poOpenInfo)
 
 static int VICARDriverIdentify(GDALOpenInfo *poOpenInfo)
 {
-    return VICARGetLabelOffset(poOpenInfo) >= 0;
+    return VICARGetLabelOffset(poOpenInfo) != static_cast<vsi_l_offset>(-1);
 }
 
 /************************************************************************/
diff --git a/frmts/pds/pdsdrivercore.h b/frmts/pds/pdsdrivercore.h
index 44c2031d91c6..193533564766 100644
--- a/frmts/pds/pdsdrivercore.h
+++ b/frmts/pds/pdsdrivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef PDSDRIVERCORE_H
@@ -82,7 +66,7 @@ constexpr const char *VICAR_DRIVER_NAME = "VICAR";
 #define VICARDriverSetCommonMetadata                                           \
     PLUGIN_SYMBOL_NAME(VICARDriverSetCommonMetadata)
 
-int VICARGetLabelOffset(GDALOpenInfo *poOpenInfo);
+vsi_l_offset VICARGetLabelOffset(GDALOpenInfo *poOpenInfo);
 
 void VICARDriverSetCommonMetadata(GDALDriver *poDriver);
 
diff --git a/frmts/pds/vicardataset.cpp b/frmts/pds/vicardataset.cpp
index 62dc0cbffa29..0fe1be702b8a 100644
--- a/frmts/pds/vicardataset.cpp
+++ b/frmts/pds/vicardataset.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2014, Sebastian Walter <sebastian dot walter at fu-berlin dot
  *de>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 constexpr int VICAR_NULL1 = 0;
@@ -44,16 +28,19 @@ constexpr double VICAR_NULL3 = -32768.0;
 #include "pdsdrivercore.h"
 #include "json_utils.h"
 
+#if defined(HAVE_TIFF) && defined(HAVE_GEOTIFF)
 #include "gtiff.h"
 #include "geotiff.h"
 #include "tifvsi.h"
 #include "xtiffio.h"
 #include "gt_wkt_srs_priv.h"
+#endif
 
 #include <exception>
 #include <limits>
 #include <string>
 
+#if defined(HAVE_TIFF) && defined(HAVE_GEOTIFF)
 /* GeoTIFF 1.0 geokeys */
 
 static const geokey_t GTiffAsciiKeys[] = {GTCitationGeoKey, GeogCitationGeoKey,
@@ -84,6 +71,7 @@ static const geokey_t GTiffShortKeys[] = {
     ProjectionGeoKey,       GeogPrimeMeridianGeoKey, GeogLinearUnitsGeoKey,
     GeogAzimuthUnitsGeoKey, VerticalCSTypeGeoKey,    VerticalDatumGeoKey,
     VerticalUnitsGeoKey};
+#endif
 
 /************************************************************************/
 /*                     OGRVICARBinaryPrefixesLayer                      */
@@ -945,27 +933,38 @@ CPLErr VICARBASICRasterBand::IReadBlock(int /*nXBlock*/, int nYBlock,
         CPLAssert(poGDS->m_anRecordOffsets[poGDS->m_nLastRecordOffset + 1] ==
                   0);
 
+        int nRet;
         if (poGDS->m_eCompress == VICARDataset::COMPRESS_BASIC)
         {
-            VSIFSeekL(poGDS->fpImage,
-                      poGDS->m_anRecordOffsets[poGDS->m_nLastRecordOffset] -
-                          sizeof(GUInt32),
-                      SEEK_SET);
+            nRet =
+                VSIFSeekL(poGDS->fpImage,
+                          poGDS->m_anRecordOffsets[poGDS->m_nLastRecordOffset] -
+                              sizeof(GUInt32),
+                          SEEK_SET);
         }
         else
         {
-            VSIFSeekL(poGDS->fpImage,
-                      poGDS->m_nImageOffsetWithoutNBB +
-                          static_cast<vsi_l_offset>(sizeof(GUInt32)) *
-                              poGDS->m_nLastRecordOffset,
-                      SEEK_SET);
+            nRet = VSIFSeekL(poGDS->fpImage,
+                             poGDS->m_nImageOffsetWithoutNBB +
+                                 static_cast<vsi_l_offset>(sizeof(GUInt32)) *
+                                     poGDS->m_nLastRecordOffset,
+                             SEEK_SET);
         }
         GUInt32 nSize;
-        VSIFReadL(&nSize, 1, sizeof(nSize), poGDS->fpImage);
+        if (nRet != 0 ||
+            VSIFReadL(&nSize, sizeof(nSize), 1, poGDS->fpImage) != 1)
+        {
+            CPLError(CE_Failure, CPLE_AppDefined, "Cannot read record %d size",
+                     poGDS->m_nLastRecordOffset);
+            return CE_Failure;
+        }
         CPL_LSBPTR32(&nSize);
         if ((poGDS->m_eCompress == VICARDataset::COMPRESS_BASIC &&
              nSize <= sizeof(GUInt32)) ||
-            (poGDS->m_eCompress == VICARDataset::COMPRESS_BASIC2 && nSize == 0))
+            (poGDS->m_eCompress == VICARDataset::COMPRESS_BASIC2 &&
+             nSize == 0) ||
+            poGDS->m_anRecordOffsets[poGDS->m_nLastRecordOffset] >
+                std::numeric_limits<uint64_t>::max() - nSize)
         {
             CPLError(CE_Failure, CPLE_AppDefined, "Wrong size at record %d",
                      poGDS->m_nLastRecordOffset);
@@ -1371,7 +1370,7 @@ static void WriteLabelItemValue(std::string &osLabel, const CPLJSONObject &obj)
     else if (eType == CPLJSONObject::Type::Long)
     {
         std::string osVal(
-            CPLSPrintf("%.18g", static_cast<double>(obj.ToLong())));
+            CPLSPrintf("%.17g", static_cast<double>(obj.ToLong())));
         if (osVal.find('.') == std::string::npos)
             osVal += ".0";
         osLabel += osVal;
@@ -1383,7 +1382,7 @@ static void WriteLabelItemValue(std::string &osLabel, const CPLJSONObject &obj)
             dfVal <= static_cast<double>(std::numeric_limits<GIntBig>::max()) &&
             static_cast<double>(static_cast<GIntBig>(dfVal)) == dfVal)
         {
-            std::string osVal(CPLSPrintf("%.18g", dfVal));
+            std::string osVal(CPLSPrintf("%.17g", dfVal));
             if (osVal.find('.') == std::string::npos)
                 osVal += ".0";
             osLabel += osVal;
@@ -1751,7 +1750,9 @@ void VICARDataset::BuildLabel()
         }
         if (!m_oSRS.IsEmpty())
         {
+#if defined(HAVE_TIFF) && defined(HAVE_GEOTIFF)
             BuildLabelPropertyGeoTIFF(oLabel);
+#endif
         }
     }
 
@@ -1889,6 +1890,7 @@ void VICARDataset::BuildLabelPropertyMap(CPLJSONObject &oLabel)
 /*                    BuildLabelPropertyGeoTIFF()                       */
 /************************************************************************/
 
+#if defined(HAVE_TIFF) && defined(HAVE_GEOTIFF)
 void VICARDataset::BuildLabelPropertyGeoTIFF(CPLJSONObject &oLabel)
 {
     auto oProperty = GetOrCreateJSONObject(oLabel, "PROPERTY");
@@ -1902,8 +1904,8 @@ void VICARDataset::BuildLabelPropertyGeoTIFF(CPLJSONObject &oLabel)
 
     // Create a in-memory GeoTIFF file
 
-    char szFilename[100] = {};
-    snprintf(szFilename, sizeof(szFilename), "/vsimem/vicar_tmp_%p.tif", this);
+    const std::string osTmpFilename(
+        VSIMemGenerateHiddenFilename("vicar_tmp.tif"));
     GDALDriver *poGTiffDriver =
         GDALDriver::FromHandle(GDALGetDriverByName("GTiff"));
     if (poGTiffDriver == nullptr)
@@ -1912,8 +1914,8 @@ void VICARDataset::BuildLabelPropertyGeoTIFF(CPLJSONObject &oLabel)
         return;
     }
     const char *const apszOptions[] = {"GEOTIFF_VERSION=1.0", nullptr};
-    auto poDS = std::unique_ptr<GDALDataset>(
-        poGTiffDriver->Create(szFilename, 1, 1, 1, GDT_Byte, apszOptions));
+    auto poDS = std::unique_ptr<GDALDataset>(poGTiffDriver->Create(
+        osTmpFilename.c_str(), 1, 1, 1, GDT_Byte, apszOptions));
     if (!poDS)
         return;
     poDS->SetSpatialRef(&m_oSRS);
@@ -1924,14 +1926,14 @@ void VICARDataset::BuildLabelPropertyGeoTIFF(CPLJSONObject &oLabel)
     poDS.reset();
 
     // Open it with libtiff/libgeotiff
-    VSILFILE *fpL = VSIFOpenL(szFilename, "r");
+    VSILFILE *fpL = VSIFOpenL(osTmpFilename.c_str(), "r");
     if (fpL == nullptr)
     {
-        VSIUnlink(szFilename);
+        VSIUnlink(osTmpFilename.c_str());
         return;
     }
 
-    TIFF *hTIFF = VSI_TIFFOpen(szFilename, "r", fpL);
+    TIFF *hTIFF = VSI_TIFFOpen(osTmpFilename.c_str(), "r", fpL);
     CPLAssert(hTIFF);
 
     GTIF *hGTIF = GTIFNew(hTIFF);
@@ -1955,7 +1957,7 @@ void VICARDataset::BuildLabelPropertyGeoTIFF(CPLJSONObject &oLabel)
         if (GDALGTIFKeyGetDOUBLE(hGTIF, gkey, &val, 0, 1))
         {
             oGeoTIFF.Add(CPLString(GTIFKeyName(gkey)).toupper(),
-                         CPLSPrintf("%.18g", val));
+                         CPLSPrintf("%.17g", val));
         }
     }
 
@@ -1988,7 +1990,7 @@ void VICARDataset::BuildLabelPropertyGeoTIFF(CPLJSONObject &oLabel)
             {
                 if (i > 0)
                     osVal += ',';
-                osVal += CPLSPrintf("%.18g", padfValues[i]);
+                osVal += CPLSPrintf("%.17g", padfValues[i]);
             }
             osVal += ')';
             oGeoTIFF.Add(kv.second, osVal);
@@ -1997,8 +1999,9 @@ void VICARDataset::BuildLabelPropertyGeoTIFF(CPLJSONObject &oLabel)
 
     XTIFFClose(hTIFF);
     CPL_IGNORE_RET_VAL(VSIFCloseL(fpL));
-    VSIUnlink(szFilename);
+    VSIUnlink(osTmpFilename.c_str());
 }
+#endif
 
 /************************************************************************/
 /*                       ReadProjectionFromMapGroup()                   */
@@ -2302,6 +2305,7 @@ void VICARDataset::ReadProjectionFromMapGroup()
 /*                    ReadProjectionFromGeoTIFFGroup()                  */
 /************************************************************************/
 
+#if defined(HAVE_TIFF) && defined(HAVE_GEOTIFF)
 void VICARDataset::ReadProjectionFromGeoTIFFGroup()
 {
     m_bGeoRefFormatIsMIPL = true;
@@ -2309,8 +2313,8 @@ void VICARDataset::ReadProjectionFromGeoTIFFGroup()
     // We will build a in-memory temporary GeoTIFF file from the VICAR GEOTIFF
     // metadata items.
 
-    char szFilename[100] = {};
-    snprintf(szFilename, sizeof(szFilename), "/vsimem/vicar_tmp_%p.tif", this);
+    const std::string osTmpFilename(
+        VSIMemGenerateHiddenFilename("vicar_tmp.tif"));
 
     /* -------------------------------------------------------------------- */
     /*      Initialization of libtiff and libgeotiff.                       */
@@ -2321,11 +2325,11 @@ void VICARDataset::ReadProjectionFromGeoTIFFGroup()
     /* -------------------------------------------------------------------- */
     /*      Initialize access to the memory geotiff structure.              */
     /* -------------------------------------------------------------------- */
-    VSILFILE *fpL = VSIFOpenL(szFilename, "w");
+    VSILFILE *fpL = VSIFOpenL(osTmpFilename.c_str(), "w");
     if (fpL == nullptr)
         return;
 
-    TIFF *hTIFF = VSI_TIFFOpen(szFilename, "w", fpL);
+    TIFF *hTIFF = VSI_TIFFOpen(osTmpFilename.c_str(), "w", fpL);
 
     if (hTIFF == nullptr)
     {
@@ -2440,7 +2444,7 @@ void VICARDataset::ReadProjectionFromGeoTIFFGroup()
     /*      Get georeferencing from file.                                   */
     /* -------------------------------------------------------------------- */
     auto poGTiffDS =
-        std::unique_ptr<GDALDataset>(GDALDataset::Open(szFilename));
+        std::unique_ptr<GDALDataset>(GDALDataset::Open(osTmpFilename.c_str()));
     if (poGTiffDS)
     {
         auto poSRS = poGTiffDS->GetSpatialRef();
@@ -2458,8 +2462,9 @@ void VICARDataset::ReadProjectionFromGeoTIFFGroup()
             GDALDataset::SetMetadataItem(GDALMD_AREA_OR_POINT, pszAreaOrPoint);
     }
 
-    VSIUnlink(szFilename);
+    VSIUnlink(osTmpFilename.c_str());
 }
+#endif
 
 /************************************************************************/
 /*                                Open()                                */
@@ -2470,13 +2475,14 @@ GDALDataset *VICARDataset::Open(GDALOpenInfo *poOpenInfo)
     /* -------------------------------------------------------------------- */
     /*      Does this look like a VICAR dataset?                            */
     /* -------------------------------------------------------------------- */
-    const int nLabelOffset = VICARGetLabelOffset(poOpenInfo);
-    if (nLabelOffset < 0)
+    const vsi_l_offset nLabelOffset = VICARGetLabelOffset(poOpenInfo);
+    if (nLabelOffset == static_cast<vsi_l_offset>(-1))
         return nullptr;
     if (nLabelOffset > 0)
     {
         CPLString osSubFilename;
-        osSubFilename.Printf("/vsisubfile/%d,%s", nLabelOffset,
+        osSubFilename.Printf("/vsisubfile/" CPL_FRMT_GUIB ",%s",
+                             static_cast<GUIntBig>(nLabelOffset),
                              poOpenInfo->pszFilename);
         GDALOpenInfo oOpenInfo(osSubFilename.c_str(), poOpenInfo->eAccess);
         return Open(&oOpenInfo);
@@ -2600,11 +2606,13 @@ GDALDataset *VICARDataset::Open(GDALOpenInfo *poOpenInfo)
     {
         poDS->ReadProjectionFromMapGroup();
     }
+#if defined(HAVE_TIFF) && defined(HAVE_GEOTIFF)
     else if (poDS->GetKeyword("GEOTIFF.GTMODELTYPEGEOKEY")[0] != '\0' ||
              poDS->GetKeyword("GEOTIFF.MODELTIEPOINTTAG")[0] != '\0')
     {
         poDS->ReadProjectionFromGeoTIFFGroup();
     }
+#endif
 
     if (!poDS->m_bGotTransform)
         poDS->m_bGotTransform = CPL_TO_BOOL(GDALReadWorldFile(
diff --git a/frmts/pds/vicardataset.h b/frmts/pds/vicardataset.h
index 828591da30aa..b152266fda3f 100644
--- a/frmts/pds/vicardataset.h
+++ b/frmts/pds/vicardataset.h
@@ -8,23 +8,7 @@
  * Copyright (c) 2014, Sebastian Walter <sebastian dot walter at fu-berlin dot
  *de> Copyright (c) 2019, Even Rouault, <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef VICARDATASET_H
@@ -102,9 +86,11 @@ class VICARDataset final : public RawDataset
                                         char **papszOptions);
 
     void ReadProjectionFromMapGroup();
-    void ReadProjectionFromGeoTIFFGroup();
     void BuildLabelPropertyMap(CPLJSONObject &oLabel);
+#if defined(HAVE_TIFF) && defined(HAVE_GEOTIFF)
+    void ReadProjectionFromGeoTIFFGroup();
     void BuildLabelPropertyGeoTIFF(CPLJSONObject &oLabel);
+#endif
 
     CPLErr Close() override;
 
diff --git a/frmts/pds/vicarkeywordhandler.cpp b/frmts/pds/vicarkeywordhandler.cpp
index b9e4c51b34bb..af4468f53cd8 100644
--- a/frmts/pds/vicarkeywordhandler.cpp
+++ b/frmts/pds/vicarkeywordhandler.cpp
@@ -11,23 +11,7 @@
  * Copyright (c) 2014, Sebastian Walter <sebastian dot walter at fu-berlin dot
  *de>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/frmts/pds/vicarkeywordhandler.h b/frmts/pds/vicarkeywordhandler.h
index 402d94314b04..e85153a5b688 100644
--- a/frmts/pds/vicarkeywordhandler.h
+++ b/frmts/pds/vicarkeywordhandler.h
@@ -11,23 +11,7 @@
  * Copyright (c) 2014, Sebastian Walter <sebastian dot walter at fu-berlin dot
  *de>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef VICARKEYWORDHANDLER_H
diff --git a/frmts/plmosaic/CMakeLists.txt b/frmts/plmosaic/CMakeLists.txt
index d2ac81f9a4e0..ff7ca47643d1 100644
--- a/frmts/plmosaic/CMakeLists.txt
+++ b/frmts/plmosaic/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_gdal_driver(TARGET gdal_PLMOSAIC SOURCES plmosaicdataset.cpp PLUGIN_CAPABLE_IF "NOT GDAL_USE_JSONC_INTERNAL"
                                              NO_DEPS)
 gdal_standard_includes(gdal_PLMOSAIC)
-target_include_directories(gdal_PLMOSAIC PRIVATE ${GDAL_VECTOR_FORMAT_SOURCE_DIR}/geojson)
+
 if (GDAL_USE_JSONC_INTERNAL)
   gdal_add_vendored_lib(gdal_PLMOSAIC libjson)
 else ()
diff --git a/frmts/plmosaic/plmosaicdataset.cpp b/frmts/plmosaic/plmosaicdataset.cpp
index fe38f0fc793a..3026e35d986b 100644
--- a/frmts/plmosaic/plmosaicdataset.cpp
+++ b/frmts/plmosaic/plmosaicdataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015-2018, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_http.h"
@@ -34,8 +18,7 @@
 #include "ogr_spatialref.h"
 #include "ogrsf_frmts.h"
 #include "../vrt/gdal_vrt.h"
-
-#include "ogrgeojsonreader.h"
+#include "ogrlibjsonutils.h"
 
 #include <algorithm>
 
@@ -450,7 +433,7 @@ CPLHTTPResult *PLMosaicDataset::Download(const char *pszURL, int bQuiet404Error)
         vsi_l_offset nDataLength = 0;
         CPLString osURL(pszURL);
         if (osURL.back() == '/')
-            osURL.resize(osURL.size() - 1);
+            osURL.pop_back();
         GByte *pabyBuf = VSIGetMemFileBuffer(osURL, &nDataLength, FALSE);
         if (pabyBuf)
         {
@@ -1329,6 +1312,7 @@ GDALDataset *PLMosaicDataset::GetMetaTile(int tile_x, int tile_y)
 
         CreateMosaicCachePathIfNecessary();
 
+        bool bUnlink = false;
         VSILFILE *fp =
             osCachePathRoot.size() ? VSIFOpenL(osTmpFilename, "wb") : nullptr;
         if (fp)
@@ -1349,9 +1333,10 @@ GDALDataset *PLMosaicDataset::GetMetaTile(int tile_x, int tile_y)
                 FlushDatasetsCache();
                 nCacheMaxSize = 1;
             }
-            osTmpFilename =
-                CPLSPrintf("/vsimem/single_tile_plmosaic_cache/%s/%d_%d.tif",
-                           osMosaic.c_str(), tile_x, tile_y);
+            bUnlink = true;
+            osTmpFilename = VSIMemGenerateHiddenFilename(
+                CPLSPrintf("single_tile_plmosaic_cache_%s_%d_%d.tif",
+                           osMosaic.c_str(), tile_x, tile_y));
             fp = VSIFOpenL(osTmpFilename, "wb");
             if (fp)
             {
@@ -1362,7 +1347,7 @@ GDALDataset *PLMosaicDataset::GetMetaTile(int tile_x, int tile_y)
         CPLHTTPDestroyResult(psResult);
         GDALDataset *poDS = OpenAndInsertNewDataset(osTmpFilename, osTilename);
 
-        if (STARTS_WITH(osTmpFilename, "/vsimem/single_tile_plmosaic_cache/"))
+        if (bUnlink)
             VSIUnlink(osTilename);
 
         return poDS;
diff --git a/frmts/png/libpng/LICENSE b/frmts/png/libpng/LICENSE
index e0c5b531cf54..25f298f0fcfd 100644
--- a/frmts/png/libpng/LICENSE
+++ b/frmts/png/libpng/LICENSE
@@ -4,8 +4,8 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
 PNG Reference Library License version 2
 ---------------------------------------
 
- * Copyright (c) 1995-2019 The PNG Reference Library Authors.
- * Copyright (c) 2018-2019 Cosmin Truta.
+ * Copyright (c) 1995-2024 The PNG Reference Library Authors.
+ * Copyright (c) 2018-2024 Cosmin Truta.
  * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
  * Copyright (c) 1996-1997 Andreas Dilger.
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
diff --git a/frmts/png/libpng/README b/frmts/png/libpng/README
index 24b6b4ea4253..a50d402d511e 100644
--- a/frmts/png/libpng/README
+++ b/frmts/png/libpng/README
@@ -1,12 +1,10 @@
-$Id$
-
 *** IMPORTANT ***
 Updating libpng in GDAL tree should follow update of zlib library in frmts/zlib.
 *****************
 
-libpng 1.6.37 is the official PNG reference library.
+libpng 1.6.43 is the official PNG reference library.
 It supports almost all PNG features, is extensible,
-and has been extensively tested for over 15 years.
+and has been extensively tested for over 20 years.
 
 http://www.libpng.org
 
@@ -15,10 +13,4 @@ GDAL changes
 ------------
 
 * Make screwy MSPaint "zero chunks" only a warning, not error. See r18808 and #3416 (stored in libpng_gdal.patch)
-* Modification of pnglibconf.h to allow rename symbols (sorted in pnglibconf.h.patch)
-
-Other changes
--------------
-
-* Fix for https://bugs.launchpad.net/ubuntu/+source/libpng1.6/+bug/1960326 / https://github.com/glennrp/libpng/commit/eb6767273a4eb5d6f4ad528370d7262cf7aa220c: png_handle_eXIf_memleak_fix.patch
-
+* Modification of pnglibconf.h to allow rename symbols (stored in pnglibconf.h.patch)
diff --git a/frmts/png/libpng/png.c b/frmts/png/libpng/png.c
index 757c755f97c9..9ed315700924 100644
--- a/frmts/png/libpng/png.c
+++ b/frmts/png/libpng/png.c
@@ -1,7 +1,7 @@
 
 /* png.c - location for general purpose libpng functions
  *
- * Copyright (c) 2018-2019 Cosmin Truta
+ * Copyright (c) 2018-2024 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -14,27 +14,7 @@
 #include "pngpriv.h"
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_6_37 Your_png_h_is_not_version_1_6_37;
-
-#ifdef __GNUC__
-/* The version tests may need to be added to, but the problem warning has
- * consistently been fixed in GCC versions which obtain wide-spread release.
- * The problem is that many versions of GCC rearrange comparison expressions in
- * the optimizer in such a way that the results of the comparison will change
- * if signed integer overflow occurs.  Such comparisons are not permitted in
- * ANSI C90, however GCC isn't clever enough to work out that that do not occur
- * below in png_ascii_from_fp and png_muldiv, so it produces a warning with
- * -Wextra.  Unfortunately this is highly dependent on the optimizer and the
- * machine architecture so the warning comes and goes unpredictably and is
- * impossible to "fix", even were that a good idea.
- */
-#if __GNUC__ == 7 && __GNUC_MINOR__ == 1
-#define GCC_STRICT_OVERFLOW 1
-#endif /* GNU 7.1.x */
-#endif /* GNU */
-#ifndef GCC_STRICT_OVERFLOW
-#define GCC_STRICT_OVERFLOW 0
-#endif
+typedef png_libpng_version_1_6_43 Your_png_h_is_not_version_1_6_43;
 
 /* Tells libpng that we have already handled the first "num_bytes" bytes
  * of the PNG file signature.  If the PNG data is embedded into another
@@ -73,21 +53,21 @@ png_set_sig_bytes(png_structrp png_ptr, int num_bytes)
 int PNGAPI
 png_sig_cmp(png_const_bytep sig, size_t start, size_t num_to_check)
 {
-   png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};
+   static const png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};
 
    if (num_to_check > 8)
       num_to_check = 8;
 
    else if (num_to_check < 1)
-      return (-1);
+      return -1;
 
    if (start > 7)
-      return (-1);
+      return -1;
 
    if (start + num_to_check > 8)
       num_to_check = 8 - start;
 
-   return ((int)(memcmp(&sig[start], &png_signature[start], num_to_check)));
+   return memcmp(&sig[start], &png_signature[start], num_to_check);
 }
 
 #endif /* READ */
@@ -447,7 +427,6 @@ png_info_init_3,(png_infopp ptr_ptr, size_t png_info_struct_size),
    memset(info_ptr, 0, (sizeof *info_ptr));
 }
 
-/* The following API is not called internally */
 void PNGAPI
 png_data_freer(png_const_structrp png_ptr, png_inforp info_ptr,
     int freer, png_uint_32 mask)
@@ -686,9 +665,9 @@ png_voidp PNGAPI
 png_get_io_ptr(png_const_structrp png_ptr)
 {
    if (png_ptr == NULL)
-      return (NULL);
+      return NULL;
 
-   return (png_ptr->io_ptr);
+   return png_ptr->io_ptr;
 }
 
 #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
@@ -720,7 +699,7 @@ png_init_io(png_structrp png_ptr, png_FILE_p fp)
  *
  * Where UNSIGNED_MAX is the appropriate maximum unsigned value, so when the
  * negative integral value is added the result will be an unsigned value
- * correspnding to the 2's complement representation.
+ * corresponding to the 2's complement representation.
  */
 void PNGAPI
 png_save_int_32(png_bytep buf, png_int_32 i)
@@ -752,7 +731,7 @@ png_convert_to_rfc1123_buffer(char out[29], png_const_timep ptime)
 
    {
       size_t pos = 0;
-      char number_buf[5]; /* enough for a four-digit year */
+      char number_buf[5] = {0, 0, 0, 0, 0}; /* enough for a four-digit year */
 
 #     define APPEND_STRING(string) pos = png_safecat(out, 29, pos, (string))
 #     define APPEND_NUMBER(format, value)\
@@ -815,8 +794,8 @@ png_get_copyright(png_const_structrp png_ptr)
    return PNG_STRING_COPYRIGHT
 #else
    return PNG_STRING_NEWLINE \
-      "libpng version 1.6.37" PNG_STRING_NEWLINE \
-      "Copyright (c) 2018-2019 Cosmin Truta" PNG_STRING_NEWLINE \
+      "libpng version 1.6.43" PNG_STRING_NEWLINE \
+      "Copyright (c) 2018-2024 Cosmin Truta" PNG_STRING_NEWLINE \
       "Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson" \
       PNG_STRING_NEWLINE \
       "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
@@ -977,7 +956,7 @@ png_reset_zstream(png_structrp png_ptr)
       return Z_STREAM_ERROR;
 
    /* WARNING: this resets the window bits to the maximum! */
-   return (inflateReset(&png_ptr->zstream));
+   return inflateReset(&png_ptr->zstream);
 }
 #endif /* READ */
 
@@ -986,7 +965,7 @@ png_uint_32 PNGAPI
 png_access_version_number(void)
 {
    /* Version of *.c files used when building libpng */
-   return((png_uint_32)PNG_LIBPNG_VER);
+   return (png_uint_32)PNG_LIBPNG_VER;
 }
 
 #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
@@ -1842,14 +1821,14 @@ png_icc_profile_error(png_const_structrp png_ptr, png_colorspacerp colorspace,
    }
 #  ifdef PNG_WARNINGS_SUPPORTED
    else
-      {
-         char number[PNG_NUMBER_BUFFER_SIZE]; /* +24 = 114*/
+   {
+      char number[PNG_NUMBER_BUFFER_SIZE]; /* +24 = 114 */
 
-         pos = png_safecat(message, (sizeof message), pos,
-             png_format_number(number, number+(sizeof number),
-             PNG_NUMBER_FORMAT_x, value));
-         pos = png_safecat(message, (sizeof message), pos, "h: "); /*+2 = 116*/
-      }
+      pos = png_safecat(message, (sizeof message), pos,
+          png_format_number(number, number+(sizeof number),
+          PNG_NUMBER_FORMAT_x, value));
+      pos = png_safecat(message, (sizeof message), pos, "h: "); /* +2 = 116 */
+   }
 #  endif
    /* The 'reason' is an arbitrary message, allow +79 maximum 195 */
    pos = png_safecat(message, (sizeof message), pos, reason);
@@ -2532,17 +2511,6 @@ png_colorspace_set_rgb_coefficients(png_structrp png_ptr)
 
 #endif /* COLORSPACE */
 
-#ifdef __GNUC__
-/* This exists solely to work round a warning from GNU C. */
-static int /* PRIVATE */
-png_gt(size_t a, size_t b)
-{
-   return a > b;
-}
-#else
-#   define png_gt(a,b) ((a) > (b))
-#endif
-
 void /* PRIVATE */
 png_check_IHDR(png_const_structrp png_ptr,
     png_uint_32 width, png_uint_32 height, int bit_depth,
@@ -2564,8 +2532,16 @@ png_check_IHDR(png_const_structrp png_ptr,
       error = 1;
    }
 
-   if (png_gt(((width + 7) & (~7U)),
-       ((PNG_SIZE_MAX
+   /* The bit mask on the first line below must be at least as big as a
+    * png_uint_32.  "~7U" is not adequate on 16-bit systems because it will
+    * be an unsigned 16-bit value.  Casting to (png_alloc_size_t) makes the
+    * type of the result at least as bit (in bits) as the RHS of the > operator
+    * which also avoids a common warning on 64-bit systems that the comparison
+    * of (png_uint_32) against the constant value on the RHS will always be
+    * false.
+    */
+   if (((width + 7) & ~(png_alloc_size_t)7) >
+       (((PNG_SIZE_MAX
            - 48        /* big_row_buf hack */
            - 1)        /* filter byte */
            / 8)        /* 8-byte RGBA pixels */
@@ -2710,7 +2686,7 @@ png_check_IHDR(png_const_structrp png_ptr,
 
 int /* PRIVATE */
 png_check_fp_number(png_const_charp string, size_t size, int *statep,
-    png_size_tp whereami)
+    size_t *whereami)
 {
    int state = *statep;
    size_t i = *whereami;
@@ -2891,14 +2867,6 @@ png_pow10(int power)
 /* Function to format a floating point value in ASCII with a given
  * precision.
  */
-#if GCC_STRICT_OVERFLOW
-#pragma GCC diagnostic push
-/* The problem arises below with exp_b10, which can never overflow because it
- * comes, originally, from frexp and is therefore limited to a range which is
- * typically +/-710 (log2(DBL_MAX)/log2(DBL_MIN)).
- */
-#pragma GCC diagnostic warning "-Wstrict-overflow=2"
-#endif /* GCC_STRICT_OVERFLOW */
 void /* PRIVATE */
 png_ascii_from_fp(png_const_structrp png_ptr, png_charp ascii, size_t size,
     double fp, unsigned int precision)
@@ -3220,10 +3188,6 @@ png_ascii_from_fp(png_const_structrp png_ptr, png_charp ascii, size_t size,
    /* Here on buffer too small. */
    png_error(png_ptr, "ASCII conversion buffer too small");
 }
-#if GCC_STRICT_OVERFLOW
-#pragma GCC diagnostic pop
-#endif /* GCC_STRICT_OVERFLOW */
-
 #  endif /* FLOATING_POINT */
 
 #  ifdef PNG_FIXED_POINT_SUPPORTED
@@ -3251,7 +3215,7 @@ png_ascii_from_fixed(png_const_structrp png_ptr, png_charp ascii,
       if (num <= 0x80000000) /* else overflowed */
       {
          unsigned int ndigits = 0, first = 16 /* flag value */;
-         char digits[10];
+         char digits[10] = {0};
 
          while (num)
          {
@@ -3336,15 +3300,6 @@ png_fixed(png_const_structrp png_ptr, double fp, png_const_charp text)
  * the nearest .00001).  Overflow and divide by zero are signalled in
  * the result, a boolean - true on success, false on overflow.
  */
-#if GCC_STRICT_OVERFLOW /* from above */
-/* It is not obvious which comparison below gets optimized in such a way that
- * signed overflow would change the result; looking through the code does not
- * reveal any tests which have the form GCC complains about, so presumably the
- * optimizer is moving an add or subtract into the 'if' somewhere.
- */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic warning "-Wstrict-overflow=2"
-#endif /* GCC_STRICT_OVERFLOW */
 int
 png_muldiv(png_fixed_point_p res, png_fixed_point a, png_int_32 times,
     png_int_32 divisor)
@@ -3459,9 +3414,6 @@ png_muldiv(png_fixed_point_p res, png_fixed_point a, png_int_32 times,
 
    return 0;
 }
-#if GCC_STRICT_OVERFLOW
-#pragma GCC diagnostic pop
-#endif /* GCC_STRICT_OVERFLOW */
 #endif /* READ_GAMMA || INCH_CONVERSIONS */
 
 #if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_INCH_CONVERSIONS_SUPPORTED)
diff --git a/frmts/png/libpng/png.h b/frmts/png/libpng/png.h
index 4b062edf35e6..83d390312606 100644
--- a/frmts/png/libpng/png.h
+++ b/frmts/png/libpng/png.h
@@ -1,9 +1,9 @@
 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.6.37 - April 14, 2019
+ * libpng version 1.6.43
  *
- * Copyright (c) 2018-2019 Cosmin Truta
+ * Copyright (c) 2018-2024 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -15,7 +15,7 @@
  *   libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
  *   libpng versions 0.97, January 1998, through 1.6.35, July 2018:
  *     Glenn Randers-Pehrson
- *   libpng versions 1.6.36, December 2018, through 1.6.37, April 2019:
+ *   libpng versions 1.6.36, December 2018, through 1.6.43, February 2024:
  *     Cosmin Truta
  *   See also "Contributing Authors", below.
  */
@@ -27,8 +27,8 @@
  * PNG Reference Library License version 2
  * ---------------------------------------
  *
- *  * Copyright (c) 1995-2019 The PNG Reference Library Authors.
- *  * Copyright (c) 2018-2019 Cosmin Truta.
+ *  * Copyright (c) 1995-2024 The PNG Reference Library Authors.
+ *  * Copyright (c) 2018-2024 Cosmin Truta.
  *  * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
  *  * Copyright (c) 1996-1997 Andreas Dilger.
  *  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -239,7 +239,7 @@
  *    ...
  *    1.5.30                  15    10530  15.so.15.30[.0]
  *    ...
- *    1.6.37                  16    10637  16.so.16.37[.0]
+ *    1.6.43                  16    10643  16.so.16.43[.0]
  *
  *    Henceforth the source version will match the shared-library major and
  *    minor numbers; the shared-library major version number will be used for
@@ -255,9 +255,6 @@
  *    to the info_ptr or png_ptr members through png.h, and the compiled
  *    application is loaded with a different version of the library.
  *
- *    DLLNUM will change each time there are forward or backward changes
- *    in binary compatibility (e.g., when a new feature is added).
- *
  * See libpng.txt or libpng.3 for more information.  The PNG specification
  * is available as a W3C Recommendation and as an ISO/IEC Standard; see
  * <https://www.w3.org/TR/2003/REC-PNG-20031110/>
@@ -278,19 +275,21 @@
  */
 
 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.6.37"
-#define PNG_HEADER_VERSION_STRING " libpng version 1.6.37 - April 14, 2019\n"
+#define PNG_LIBPNG_VER_STRING "1.6.43"
+#define PNG_HEADER_VERSION_STRING " libpng version " PNG_LIBPNG_VER_STRING "\n"
 
-#define PNG_LIBPNG_VER_SONUM   16
-#define PNG_LIBPNG_VER_DLLNUM  16
+/* The versions of shared library builds should stay in sync, going forward */
+#define PNG_LIBPNG_VER_SHAREDLIB 16
+#define PNG_LIBPNG_VER_SONUM     PNG_LIBPNG_VER_SHAREDLIB /* [Deprecated] */
+#define PNG_LIBPNG_VER_DLLNUM    PNG_LIBPNG_VER_SHAREDLIB /* [Deprecated] */
 
 /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
 #define PNG_LIBPNG_VER_MAJOR   1
 #define PNG_LIBPNG_VER_MINOR   6
-#define PNG_LIBPNG_VER_RELEASE 37
+#define PNG_LIBPNG_VER_RELEASE 43
 
 /* This should be zero for a public release, or non-zero for a
- * development version.  [Deprecated]
+ * development version.
  */
 #define PNG_LIBPNG_VER_BUILD  0
 
@@ -318,7 +317,7 @@
  * From version 1.0.1 it is:
  * XXYYZZ, where XX=major, YY=minor, ZZ=release
  */
-#define PNG_LIBPNG_VER 10637 /* 1.6.37 */
+#define PNG_LIBPNG_VER 10643 /* 1.6.43 */
 
 /* Library configuration: these options cannot be changed after
  * the library has been built.
@@ -428,7 +427,7 @@ extern "C" {
 /* This triggers a compiler error in png.c, if png.c and png.h
  * do not agree upon the version number.
  */
-typedef char* png_libpng_version_1_6_37;
+typedef char* png_libpng_version_1_6_43;
 
 /* Basic control structions.  Read libpng-manual.txt or libpng.3 for more info.
  *
@@ -849,7 +848,7 @@ PNG_FUNCTION(void, (PNGCAPI *png_longjmp_ptr), PNGARG((jmp_buf, int)), typedef);
 #define PNG_TRANSFORM_GRAY_TO_RGB   0x2000      /* read only */
 /* Added to libpng-1.5.4 */
 #define PNG_TRANSFORM_EXPAND_16     0x4000      /* read only */
-#if INT_MAX >= 0x8000 /* else this might break */
+#if ~0U > 0xffffU /* or else this might break on a 16-bit machine */
 #define PNG_TRANSFORM_SCALE_16      0x8000      /* read only */
 #endif
 
@@ -908,15 +907,15 @@ PNG_EXPORT(2, void, png_set_sig_bytes, (png_structrp png_ptr, int num_bytes));
 /* Check sig[start] through sig[start + num_to_check - 1] to see if it's a
  * PNG file.  Returns zero if the supplied bytes match the 8-byte PNG
  * signature, and non-zero otherwise.  Having num_to_check == 0 or
- * start > 7 will always fail (ie return non-zero).
+ * start > 7 will always fail (i.e. return non-zero).
  */
 PNG_EXPORT(3, int, png_sig_cmp, (png_const_bytep sig, size_t start,
     size_t num_to_check));
 
 /* Simple signature checking function.  This is the same as calling
- * png_check_sig(sig, n) := !png_sig_cmp(sig, 0, n).
+ * png_check_sig(sig, n) := (png_sig_cmp(sig, 0, n) == 0).
  */
-#define png_check_sig(sig, n) !png_sig_cmp((sig), 0, (n))
+#define png_check_sig(sig, n) (png_sig_cmp((sig), 0, (n)) == 0) /* DEPRECATED */
 
 /* Allocate and initialize png_ptr struct for reading, and any other memory. */
 PNG_EXPORTA(4, png_structp, png_create_read_struct,
@@ -1389,7 +1388,7 @@ PNG_EXPORT(58, void, png_write_row, (png_structrp png_ptr,
     png_const_bytep row));
 
 /* Write a few rows of image data: (*row) is not written; however, the type
- * is declared as writable to maintain compatibility with previous versions
+ * is declared as writeable to maintain compatibility with previous versions
  * of libpng and to allow the 'display_row' array from read_rows to be passed
  * unchanged to write_rows.
  */
@@ -1446,7 +1445,7 @@ PNG_EXPORT(66, void, png_set_crc_action, (png_structrp png_ptr, int crit_action,
  * mainly useful for testing, as the defaults should work with most users.
  * Those users who are tight on memory or want faster performance at the
  * expense of compression can modify them.  See the compression library
- * header file (zlib.h) for an explination of the compression functions.
+ * header file (zlib.h) for an explanation of the compression functions.
  */
 
 /* Set the filtering method(s) used by libpng.  Currently, the only valid
@@ -1501,7 +1500,7 @@ PNG_FIXED_EXPORT(209, void, png_set_filter_heuristics_fixed,
  * 0 - 9, corresponding directly to the zlib compression levels 0 - 9
  * (0 - no compression, 9 - "maximal" compression).  Note that tests have
  * shown that zlib compression levels 3-6 usually perform as well as level 9
- * for PNG images, and do considerably fewer caclulations.  In the future,
+ * for PNG images, and do considerably fewer calculations.  In the future,
  * these values may not correspond directly to the zlib compression levels.
  */
 #ifdef PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED
@@ -1730,12 +1729,9 @@ PNG_EXPORT(97, void, png_free, (png_const_structrp png_ptr, png_voidp ptr));
 PNG_EXPORT(98, void, png_free_data, (png_const_structrp png_ptr,
     png_inforp info_ptr, png_uint_32 free_me, int num));
 
-/* Reassign responsibility for freeing existing data, whether allocated
+/* Reassign the responsibility for freeing existing data, whether allocated
  * by libpng or by the application; this works on the png_info structure passed
- * in, it does not change the state for other png_info structures.
- *
- * It is unlikely that this function works correctly as of 1.6.0 and using it
- * may result either in memory leaks or double free of allocated data.
+ * in, without changing the state for other png_info structures.
  */
 PNG_EXPORT(99, void, png_data_freer, (png_const_structrp png_ptr,
     png_inforp info_ptr, int freer, png_uint_32 mask));
@@ -3095,7 +3091,7 @@ PNG_EXPORT(245, int, png_image_write_to_memory, (png_imagep image, void *memory,
     * stored in *memory_bytes.  On failure *memory_bytes will contain 0.
     *
     * If 'memory' is not NULL it must point to memory[*memory_bytes] of
-    * writable memory.
+    * writeable memory.
     *
     * If the function returns success memory[*memory_bytes] (if 'memory' is not
     * NULL) contains the written PNG data.  *memory_bytes will always be less
@@ -3207,11 +3203,18 @@ PNG_EXPORT(245, int, png_image_write_to_memory, (png_imagep image, void *memory,
 #ifdef PNG_MIPS_MSA_API_SUPPORTED
 #  define PNG_MIPS_MSA   6 /* HARDWARE: MIPS Msa SIMD instructions supported */
 #endif
-#define PNG_IGNORE_ADLER32 8
+#ifdef PNG_DISABLE_ADLER32_CHECK_SUPPORTED
+#  define PNG_IGNORE_ADLER32 8 /* SOFTWARE: disable Adler32 check on IDAT */
+#endif
 #ifdef PNG_POWERPC_VSX_API_SUPPORTED
-#  define PNG_POWERPC_VSX   10 /* HARDWARE: PowerPC VSX SIMD instructions supported */
+#  define PNG_POWERPC_VSX   10 /* HARDWARE: PowerPC VSX SIMD instructions
+                                * supported */
 #endif
-#define PNG_OPTION_NEXT  12 /* Next option - numbers must be even */
+#ifdef PNG_MIPS_MMI_API_SUPPORTED
+#  define PNG_MIPS_MMI   12 /* HARDWARE: MIPS MMI SIMD instructions supported */
+#endif
+
+#define PNG_OPTION_NEXT  14 /* Next option - numbers must be even */
 
 /* Return values: NOTE: there are four values and 'off' is *not* zero */
 #define PNG_OPTION_UNSET   0 /* Unset - defaults to off */
diff --git a/frmts/png/libpng/pngconf.h b/frmts/png/libpng/pngconf.h
index 0fa2242b6de6..000d7b1a8a6e 100644
--- a/frmts/png/libpng/pngconf.h
+++ b/frmts/png/libpng/pngconf.h
@@ -1,9 +1,9 @@
 
 /* pngconf.h - machine-configurable file for libpng
  *
- * libpng version 1.6.37
+ * libpng version 1.6.43
  *
- * Copyright (c) 2018-2019 Cosmin Truta
+ * Copyright (c) 2018-2024 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -180,8 +180,8 @@
  * compiler-specific macros to the values required to change the calling
  * conventions of the various functions.
  */
-#if defined(_Windows) || defined(_WINDOWS) || defined(_WIN32) ||\
-    defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#if defined(_WIN32) || defined(__WIN32__) || defined(__NT__) || \
+    defined(__CYGWIN__)
   /* Windows system (DOS doesn't support DLLs).  Includes builds under Cygwin or
    * MinGW on any architecture currently supported by Windows.  Also includes
    * Watcom builds but these need special treatment because they are not
diff --git a/frmts/png/libpng/pngerror.c b/frmts/png/libpng/pngerror.c
index ec3a709b9d2c..29ebda794377 100644
--- a/frmts/png/libpng/pngerror.c
+++ b/frmts/png/libpng/pngerror.c
@@ -1,7 +1,7 @@
 
 /* pngerror.c - stub functions for i/o and memory allocation
  *
- * Copyright (c) 2018 Cosmin Truta
+ * Copyright (c) 2018-2024 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -255,7 +255,7 @@ void
 png_warning_parameter_unsigned(png_warning_parameters p, int number, int format,
     png_alloc_size_t value)
 {
-   char buffer[PNG_NUMBER_BUFFER_SIZE];
+   char buffer[PNG_NUMBER_BUFFER_SIZE] = {0};
    png_warning_parameter(p, number, PNG_FORMAT_NUMBER(buffer, format, value));
 }
 
@@ -265,7 +265,7 @@ png_warning_parameter_signed(png_warning_parameters p, int number, int format,
 {
    png_alloc_size_t u;
    png_charp str;
-   char buffer[PNG_NUMBER_BUFFER_SIZE];
+   char buffer[PNG_NUMBER_BUFFER_SIZE] = {0};
 
    /* Avoid overflow by doing the negate in a png_alloc_size_t: */
    u = (png_alloc_size_t)value;
@@ -858,7 +858,7 @@ png_get_error_ptr(png_const_structrp png_ptr)
    if (png_ptr == NULL)
       return NULL;
 
-   return ((png_voidp)png_ptr->error_ptr);
+   return (png_voidp)png_ptr->error_ptr;
 }
 
 
@@ -933,31 +933,25 @@ png_safe_warning(png_structp png_nonconst_ptr, png_const_charp warning_message)
 #endif
 
 int /* PRIVATE */
-png_safe_execute(png_imagep image_in, int (*function)(png_voidp), png_voidp arg)
+png_safe_execute(png_imagep image, int (*function)(png_voidp), png_voidp arg)
 {
-   volatile png_imagep image = image_in;
-   volatile int result;
-   volatile png_voidp saved_error_buf;
+   png_voidp saved_error_buf = image->opaque->error_buf;
    jmp_buf safe_jmpbuf;
+   int result;
 
-   /* Safely execute function(arg) with png_error returning to this function. */
-   saved_error_buf = image->opaque->error_buf;
-   result = setjmp(safe_jmpbuf) == 0;
-
-   if (result != 0)
+   /* Safely execute function(arg), with png_error returning back here. */
+   if (setjmp(safe_jmpbuf) == 0)
    {
-
       image->opaque->error_buf = safe_jmpbuf;
       result = function(arg);
+      image->opaque->error_buf = saved_error_buf;
+      return result;
    }
 
+   /* On png_error, return via longjmp, pop the jmpbuf, and free the image. */
    image->opaque->error_buf = saved_error_buf;
-
-   /* And do the cleanup prior to any failure return. */
-   if (result == 0)
-      png_image_free(image);
-
-   return result;
+   png_image_free(image);
+   return 0;
 }
 #endif /* SIMPLIFIED READ || SIMPLIFIED_WRITE */
 #endif /* READ || WRITE */
diff --git a/frmts/png/libpng/pngget.c b/frmts/png/libpng/pngget.c
index 5abf1efd9f73..1084b268ff90 100644
--- a/frmts/png/libpng/pngget.c
+++ b/frmts/png/libpng/pngget.c
@@ -1,7 +1,7 @@
 
 /* pngget.c - retrieval of values from info struct
  *
- * Copyright (c) 2018 Cosmin Truta
+ * Copyright (c) 2018-2024 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -21,18 +21,29 @@ png_get_valid(png_const_structrp png_ptr, png_const_inforp info_ptr,
     png_uint_32 flag)
 {
    if (png_ptr != NULL && info_ptr != NULL)
-      return(info_ptr->valid & flag);
+   {
+#ifdef PNG_READ_tRNS_SUPPORTED
+      /* png_handle_PLTE() may have canceled a valid tRNS chunk but left the
+       * 'valid' flag for the detection of duplicate chunks. Do not report a
+       * valid tRNS chunk in this case.
+       */
+      if (flag == PNG_INFO_tRNS && png_ptr->num_trans == 0)
+         return 0;
+#endif
 
-   return(0);
+      return info_ptr->valid & flag;
+   }
+
+   return 0;
 }
 
 size_t PNGAPI
 png_get_rowbytes(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
-      return(info_ptr->rowbytes);
+      return info_ptr->rowbytes;
 
-   return(0);
+   return 0;
 }
 
 #ifdef PNG_INFO_IMAGE_SUPPORTED
@@ -40,9 +51,9 @@ png_bytepp PNGAPI
 png_get_rows(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
-      return(info_ptr->row_pointers);
+      return info_ptr->row_pointers;
 
-   return(0);
+   return 0;
 }
 #endif
 
@@ -54,7 +65,7 @@ png_get_image_width(png_const_structrp png_ptr, png_const_inforp info_ptr)
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->width;
 
-   return (0);
+   return 0;
 }
 
 png_uint_32 PNGAPI
@@ -63,7 +74,7 @@ png_get_image_height(png_const_structrp png_ptr, png_const_inforp info_ptr)
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->height;
 
-   return (0);
+   return 0;
 }
 
 png_byte PNGAPI
@@ -72,7 +83,7 @@ png_get_bit_depth(png_const_structrp png_ptr, png_const_inforp info_ptr)
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->bit_depth;
 
-   return (0);
+   return 0;
 }
 
 png_byte PNGAPI
@@ -81,7 +92,7 @@ png_get_color_type(png_const_structrp png_ptr, png_const_inforp info_ptr)
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->color_type;
 
-   return (0);
+   return 0;
 }
 
 png_byte PNGAPI
@@ -90,7 +101,7 @@ png_get_filter_type(png_const_structrp png_ptr, png_const_inforp info_ptr)
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->filter_type;
 
-   return (0);
+   return 0;
 }
 
 png_byte PNGAPI
@@ -99,7 +110,7 @@ png_get_interlace_type(png_const_structrp png_ptr, png_const_inforp info_ptr)
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->interlace_type;
 
-   return (0);
+   return 0;
 }
 
 png_byte PNGAPI
@@ -108,7 +119,7 @@ png_get_compression_type(png_const_structrp png_ptr, png_const_inforp info_ptr)
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->compression_type;
 
-   return (0);
+   return 0;
 }
 
 png_uint_32 PNGAPI
@@ -116,21 +127,20 @@ png_get_x_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp
    info_ptr)
 {
 #ifdef PNG_pHYs_SUPPORTED
+   png_debug(1, "in png_get_x_pixels_per_meter");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_pHYs) != 0)
-      {
-         png_debug1(1, "in %s retrieval function",
-             "png_get_x_pixels_per_meter");
-
-         if (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)
-            return (info_ptr->x_pixels_per_unit);
-      }
+   {
+      if (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)
+         return info_ptr->x_pixels_per_unit;
+   }
 #else
    PNG_UNUSED(png_ptr)
    PNG_UNUSED(info_ptr)
 #endif
 
-   return (0);
+   return 0;
 }
 
 png_uint_32 PNGAPI
@@ -138,42 +148,41 @@ png_get_y_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp
     info_ptr)
 {
 #ifdef PNG_pHYs_SUPPORTED
+   png_debug(1, "in png_get_y_pixels_per_meter");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_pHYs) != 0)
    {
-      png_debug1(1, "in %s retrieval function",
-          "png_get_y_pixels_per_meter");
-
       if (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)
-         return (info_ptr->y_pixels_per_unit);
+         return info_ptr->y_pixels_per_unit;
    }
 #else
    PNG_UNUSED(png_ptr)
    PNG_UNUSED(info_ptr)
 #endif
 
-   return (0);
+   return 0;
 }
 
 png_uint_32 PNGAPI
 png_get_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
 #ifdef PNG_pHYs_SUPPORTED
+   png_debug(1, "in png_get_pixels_per_meter");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_pHYs) != 0)
    {
-      png_debug1(1, "in %s retrieval function", "png_get_pixels_per_meter");
-
       if (info_ptr->phys_unit_type == PNG_RESOLUTION_METER &&
           info_ptr->x_pixels_per_unit == info_ptr->y_pixels_per_unit)
-         return (info_ptr->x_pixels_per_unit);
+         return info_ptr->x_pixels_per_unit;
    }
 #else
    PNG_UNUSED(png_ptr)
    PNG_UNUSED(info_ptr)
 #endif
 
-   return (0);
+   return 0;
 }
 
 #ifdef PNG_FLOATING_POINT_SUPPORTED
@@ -182,21 +191,21 @@ png_get_pixel_aspect_ratio(png_const_structrp png_ptr, png_const_inforp
    info_ptr)
 {
 #ifdef PNG_READ_pHYs_SUPPORTED
+   png_debug(1, "in png_get_pixel_aspect_ratio");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_pHYs) != 0)
    {
-      png_debug1(1, "in %s retrieval function", "png_get_aspect_ratio");
-
       if (info_ptr->x_pixels_per_unit != 0)
-         return ((float)((float)info_ptr->y_pixels_per_unit
-             /(float)info_ptr->x_pixels_per_unit));
+         return (float)info_ptr->y_pixels_per_unit
+              / (float)info_ptr->x_pixels_per_unit;
    }
 #else
    PNG_UNUSED(png_ptr)
    PNG_UNUSED(info_ptr)
 #endif
 
-   return ((float)0.0);
+   return (float)0.0;
 }
 #endif
 
@@ -206,6 +215,8 @@ png_get_pixel_aspect_ratio_fixed(png_const_structrp png_ptr,
     png_const_inforp info_ptr)
 {
 #ifdef PNG_READ_pHYs_SUPPORTED
+   png_debug(1, "in png_get_pixel_aspect_ratio_fixed");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_pHYs) != 0 &&
        info_ptr->x_pixels_per_unit > 0 && info_ptr->y_pixels_per_unit > 0 &&
@@ -214,8 +225,6 @@ png_get_pixel_aspect_ratio_fixed(png_const_structrp png_ptr,
    {
       png_fixed_point res;
 
-      png_debug1(1, "in %s retrieval function", "png_get_aspect_ratio_fixed");
-
       /* The following casts work because a PNG 4 byte integer only has a valid
        * range of 0..2^31-1; otherwise the cast might overflow.
        */
@@ -236,80 +245,80 @@ png_int_32 PNGAPI
 png_get_x_offset_microns(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
 #ifdef PNG_oFFs_SUPPORTED
+   png_debug(1, "in png_get_x_offset_microns");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_oFFs) != 0)
    {
-      png_debug1(1, "in %s retrieval function", "png_get_x_offset_microns");
-
       if (info_ptr->offset_unit_type == PNG_OFFSET_MICROMETER)
-         return (info_ptr->x_offset);
+         return info_ptr->x_offset;
    }
 #else
    PNG_UNUSED(png_ptr)
    PNG_UNUSED(info_ptr)
 #endif
 
-   return (0);
+   return 0;
 }
 
 png_int_32 PNGAPI
 png_get_y_offset_microns(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
 #ifdef PNG_oFFs_SUPPORTED
+   png_debug(1, "in png_get_y_offset_microns");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_oFFs) != 0)
    {
-      png_debug1(1, "in %s retrieval function", "png_get_y_offset_microns");
-
       if (info_ptr->offset_unit_type == PNG_OFFSET_MICROMETER)
-         return (info_ptr->y_offset);
+         return info_ptr->y_offset;
    }
 #else
    PNG_UNUSED(png_ptr)
    PNG_UNUSED(info_ptr)
 #endif
 
-   return (0);
+   return 0;
 }
 
 png_int_32 PNGAPI
 png_get_x_offset_pixels(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
 #ifdef PNG_oFFs_SUPPORTED
+   png_debug(1, "in png_get_x_offset_pixels");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_oFFs) != 0)
    {
-      png_debug1(1, "in %s retrieval function", "png_get_x_offset_pixels");
-
       if (info_ptr->offset_unit_type == PNG_OFFSET_PIXEL)
-         return (info_ptr->x_offset);
+         return info_ptr->x_offset;
    }
 #else
    PNG_UNUSED(png_ptr)
    PNG_UNUSED(info_ptr)
 #endif
 
-   return (0);
+   return 0;
 }
 
 png_int_32 PNGAPI
 png_get_y_offset_pixels(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
 #ifdef PNG_oFFs_SUPPORTED
+   png_debug(1, "in png_get_y_offset_pixels");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_oFFs) != 0)
    {
-      png_debug1(1, "in %s retrieval function", "png_get_y_offset_pixels");
-
       if (info_ptr->offset_unit_type == PNG_OFFSET_PIXEL)
-         return (info_ptr->y_offset);
+         return info_ptr->y_offset;
    }
 #else
    PNG_UNUSED(png_ptr)
    PNG_UNUSED(info_ptr)
 #endif
 
-   return (0);
+   return 0;
 }
 
 #ifdef PNG_INCH_CONVERSIONS_SUPPORTED
@@ -423,11 +432,11 @@ png_get_pHYs_dpi(png_const_structrp png_ptr, png_const_inforp info_ptr,
 {
    png_uint_32 retval = 0;
 
+   png_debug1(1, "in %s retrieval function", "pHYs");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_pHYs) != 0)
    {
-      png_debug1(1, "in %s retrieval function", "pHYs");
-
       if (res_x != NULL)
       {
          *res_x = info_ptr->x_pixels_per_unit;
@@ -453,7 +462,7 @@ png_get_pHYs_dpi(png_const_structrp png_ptr, png_const_inforp info_ptr,
       }
    }
 
-   return (retval);
+   return retval;
 }
 #endif /* pHYs */
 #endif /* INCH_CONVERSIONS */
@@ -467,9 +476,9 @@ png_byte PNGAPI
 png_get_channels(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
-      return(info_ptr->channels);
+      return info_ptr->channels;
 
-   return (0);
+   return 0;
 }
 
 #ifdef PNG_READ_SUPPORTED
@@ -477,9 +486,9 @@ png_const_bytep PNGAPI
 png_get_signature(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
-      return(info_ptr->signature);
+      return info_ptr->signature;
 
-   return (NULL);
+   return NULL;
 }
 #endif
 
@@ -488,17 +497,17 @@ png_uint_32 PNGAPI
 png_get_bKGD(png_const_structrp png_ptr, png_inforp info_ptr,
     png_color_16p *background)
 {
+   png_debug1(1, "in %s retrieval function", "bKGD");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_bKGD) != 0 &&
        background != NULL)
    {
-      png_debug1(1, "in %s retrieval function", "bKGD");
-
       *background = &(info_ptr->background);
-      return (PNG_INFO_bKGD);
+      return PNG_INFO_bKGD;
    }
 
-   return (0);
+   return 0;
 }
 #endif
 
@@ -513,6 +522,8 @@ png_get_cHRM(png_const_structrp png_ptr, png_const_inforp info_ptr,
     double *white_x, double *white_y, double *red_x, double *red_y,
     double *green_x, double *green_y, double *blue_x, double *blue_y)
 {
+   png_debug1(1, "in %s retrieval function", "cHRM");
+
    /* Quiet API change: this code used to only return the end points if a cHRM
     * chunk was present, but the end points can also come from iCCP or sRGB
     * chunks, so in 1.6.0 the png_get_ APIs return the end points regardless and
@@ -522,8 +533,6 @@ png_get_cHRM(png_const_structrp png_ptr, png_const_inforp info_ptr,
    if (png_ptr != NULL && info_ptr != NULL &&
       (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
    {
-      png_debug1(1, "in %s retrieval function", "cHRM");
-
       if (white_x != NULL)
          *white_x = png_float(png_ptr,
              info_ptr->colorspace.end_points_xy.whitex, "cHRM white X");
@@ -548,10 +557,10 @@ png_get_cHRM(png_const_structrp png_ptr, png_const_inforp info_ptr,
       if (blue_y != NULL)
          *blue_y = png_float(png_ptr, info_ptr->colorspace.end_points_xy.bluey,
              "cHRM blue Y");
-      return (PNG_INFO_cHRM);
+      return PNG_INFO_cHRM;
    }
 
-   return (0);
+   return 0;
 }
 
 png_uint_32 PNGAPI
@@ -560,11 +569,11 @@ png_get_cHRM_XYZ(png_const_structrp png_ptr, png_const_inforp info_ptr,
     double *green_Y, double *green_Z, double *blue_X, double *blue_Y,
     double *blue_Z)
 {
+   png_debug1(1, "in %s retrieval function", "cHRM_XYZ(float)");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
    {
-      png_debug1(1, "in %s retrieval function", "cHRM_XYZ(float)");
-
       if (red_X != NULL)
          *red_X = png_float(png_ptr, info_ptr->colorspace.end_points_XYZ.red_X,
              "cHRM red X");
@@ -592,10 +601,10 @@ png_get_cHRM_XYZ(png_const_structrp png_ptr, png_const_inforp info_ptr,
       if (blue_Z != NULL)
          *blue_Z = png_float(png_ptr,
              info_ptr->colorspace.end_points_XYZ.blue_Z, "cHRM blue Z");
-      return (PNG_INFO_cHRM);
+      return PNG_INFO_cHRM;
    }
 
-   return (0);
+   return 0;
 }
 #  endif
 
@@ -608,11 +617,11 @@ png_get_cHRM_XYZ_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
     png_fixed_point *int_blue_X, png_fixed_point *int_blue_Y,
     png_fixed_point *int_blue_Z)
 {
+   png_debug1(1, "in %s retrieval function", "cHRM_XYZ");
+
    if (png_ptr != NULL && info_ptr != NULL &&
       (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
    {
-      png_debug1(1, "in %s retrieval function", "cHRM_XYZ");
-
       if (int_red_X != NULL)
          *int_red_X = info_ptr->colorspace.end_points_XYZ.red_X;
       if (int_red_Y != NULL)
@@ -631,10 +640,10 @@ png_get_cHRM_XYZ_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
          *int_blue_Y = info_ptr->colorspace.end_points_XYZ.blue_Y;
       if (int_blue_Z != NULL)
          *int_blue_Z = info_ptr->colorspace.end_points_XYZ.blue_Z;
-      return (PNG_INFO_cHRM);
+      return PNG_INFO_cHRM;
    }
 
-   return (0);
+   return 0;
 }
 
 png_uint_32 PNGAPI
@@ -664,10 +673,10 @@ png_get_cHRM_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
          *blue_x = info_ptr->colorspace.end_points_xy.bluex;
       if (blue_y != NULL)
          *blue_y = info_ptr->colorspace.end_points_xy.bluey;
-      return (PNG_INFO_cHRM);
+      return PNG_INFO_cHRM;
    }
 
-   return (0);
+   return 0;
 }
 #  endif
 #endif
@@ -685,10 +694,10 @@ png_get_gAMA_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
        file_gamma != NULL)
    {
       *file_gamma = info_ptr->colorspace.gamma;
-      return (PNG_INFO_gAMA);
+      return PNG_INFO_gAMA;
    }
 
-   return (0);
+   return 0;
 }
 #  endif
 
@@ -705,10 +714,10 @@ png_get_gAMA(png_const_structrp png_ptr, png_const_inforp info_ptr,
    {
       *file_gamma = png_float(png_ptr, info_ptr->colorspace.gamma,
           "png_get_gAMA");
-      return (PNG_INFO_gAMA);
+      return PNG_INFO_gAMA;
    }
 
-   return (0);
+   return 0;
 }
 #  endif
 #endif
@@ -724,10 +733,10 @@ png_get_sRGB(png_const_structrp png_ptr, png_const_inforp info_ptr,
       (info_ptr->valid & PNG_INFO_sRGB) != 0 && file_srgb_intent != NULL)
    {
       *file_srgb_intent = info_ptr->colorspace.rendering_intent;
-      return (PNG_INFO_sRGB);
+      return PNG_INFO_sRGB;
    }
 
-   return (0);
+   return 0;
 }
 #endif
 
@@ -751,10 +760,10 @@ png_get_iCCP(png_const_structrp png_ptr, png_inforp info_ptr,
        */
       if (compression_type != NULL)
          *compression_type = PNG_COMPRESSION_TYPE_BASE;
-      return (PNG_INFO_iCCP);
+      return PNG_INFO_iCCP;
    }
 
-   return (0);
+   return 0;
 
 }
 #endif
@@ -764,13 +773,15 @@ int PNGAPI
 png_get_sPLT(png_const_structrp png_ptr, png_inforp info_ptr,
     png_sPLT_tpp spalettes)
 {
+   png_debug1(1, "in %s retrieval function", "sPLT");
+
    if (png_ptr != NULL && info_ptr != NULL && spalettes != NULL)
    {
       *spalettes = info_ptr->splt_palettes;
       return info_ptr->splt_palettes_num;
    }
 
-   return (0);
+   return 0;
 }
 #endif
 
@@ -796,10 +807,10 @@ png_get_eXIf_1(png_const_structrp png_ptr, png_const_inforp info_ptr,
    {
       *num_exif = info_ptr->num_exif;
       *exif = info_ptr->exif;
-      return (PNG_INFO_eXIf);
+      return PNG_INFO_eXIf;
    }
 
-   return (0);
+   return 0;
 }
 #endif
 
@@ -814,10 +825,10 @@ png_get_hIST(png_const_structrp png_ptr, png_inforp info_ptr,
        (info_ptr->valid & PNG_INFO_hIST) != 0 && hist != NULL)
    {
       *hist = info_ptr->hist;
-      return (PNG_INFO_hIST);
+      return PNG_INFO_hIST;
    }
 
-   return (0);
+   return 0;
 }
 #endif
 
@@ -830,7 +841,7 @@ png_get_IHDR(png_const_structrp png_ptr, png_const_inforp info_ptr,
    png_debug1(1, "in %s retrieval function", "IHDR");
 
    if (png_ptr == NULL || info_ptr == NULL)
-      return (0);
+      return 0;
 
    if (width != NULL)
        *width = info_ptr->width;
@@ -862,7 +873,7 @@ png_get_IHDR(png_const_structrp png_ptr, png_const_inforp info_ptr,
        info_ptr->bit_depth, info_ptr->color_type, info_ptr->interlace_type,
        info_ptr->compression_type, info_ptr->filter_type);
 
-   return (1);
+   return 1;
 }
 
 #ifdef PNG_oFFs_SUPPORTED
@@ -879,10 +890,10 @@ png_get_oFFs(png_const_structrp png_ptr, png_const_inforp info_ptr,
       *offset_x = info_ptr->x_offset;
       *offset_y = info_ptr->y_offset;
       *unit_type = (int)info_ptr->offset_unit_type;
-      return (PNG_INFO_oFFs);
+      return PNG_INFO_oFFs;
    }
 
-   return (0);
+   return 0;
 }
 #endif
 
@@ -906,10 +917,10 @@ png_get_pCAL(png_const_structrp png_ptr, png_inforp info_ptr,
       *nparams = (int)info_ptr->pcal_nparams;
       *units = info_ptr->pcal_units;
       *params = info_ptr->pcal_params;
-      return (PNG_INFO_pCAL);
+      return PNG_INFO_pCAL;
    }
 
-   return (0);
+   return 0;
 }
 #endif
 
@@ -921,6 +932,8 @@ png_uint_32 PNGAPI
 png_get_sCAL_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
     int *unit, png_fixed_point *width, png_fixed_point *height)
 {
+   png_debug1(1, "in %s retrieval function", "sCAL");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_sCAL) != 0)
    {
@@ -932,10 +945,10 @@ png_get_sCAL_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
       *width = png_fixed(png_ptr, atof(info_ptr->scal_s_width), "sCAL width");
       *height = png_fixed(png_ptr, atof(info_ptr->scal_s_height),
           "sCAL height");
-      return (PNG_INFO_sCAL);
+      return PNG_INFO_sCAL;
    }
 
-   return(0);
+   return 0;
 }
 #    endif /* FLOATING_ARITHMETIC */
 #  endif /* FIXED_POINT */
@@ -944,32 +957,36 @@ png_uint_32 PNGAPI
 png_get_sCAL(png_const_structrp png_ptr, png_const_inforp info_ptr,
     int *unit, double *width, double *height)
 {
+   png_debug1(1, "in %s retrieval function", "sCAL(float)");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_sCAL) != 0)
    {
       *unit = info_ptr->scal_unit;
       *width = atof(info_ptr->scal_s_width);
       *height = atof(info_ptr->scal_s_height);
-      return (PNG_INFO_sCAL);
+      return PNG_INFO_sCAL;
    }
 
-   return(0);
+   return 0;
 }
 #  endif /* FLOATING POINT */
 png_uint_32 PNGAPI
 png_get_sCAL_s(png_const_structrp png_ptr, png_const_inforp info_ptr,
     int *unit, png_charpp width, png_charpp height)
 {
+   png_debug1(1, "in %s retrieval function", "sCAL(str)");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_sCAL) != 0)
    {
       *unit = info_ptr->scal_unit;
       *width = info_ptr->scal_s_width;
       *height = info_ptr->scal_s_height;
-      return (PNG_INFO_sCAL);
+      return PNG_INFO_sCAL;
    }
 
-   return(0);
+   return 0;
 }
 #endif /* sCAL */
 
@@ -1004,7 +1021,7 @@ png_get_pHYs(png_const_structrp png_ptr, png_const_inforp info_ptr,
       }
    }
 
-   return (retval);
+   return retval;
 }
 #endif /* pHYs */
 
@@ -1020,10 +1037,10 @@ png_get_PLTE(png_const_structrp png_ptr, png_inforp info_ptr,
       *palette = info_ptr->palette;
       *num_palette = info_ptr->num_palette;
       png_debug1(3, "num_palette = %d", *num_palette);
-      return (PNG_INFO_PLTE);
+      return PNG_INFO_PLTE;
    }
 
-   return (0);
+   return 0;
 }
 
 #ifdef PNG_sBIT_SUPPORTED
@@ -1037,10 +1054,10 @@ png_get_sBIT(png_const_structrp png_ptr, png_inforp info_ptr,
        (info_ptr->valid & PNG_INFO_sBIT) != 0 && sig_bit != NULL)
    {
       *sig_bit = &(info_ptr->sig_bit);
-      return (PNG_INFO_sBIT);
+      return PNG_INFO_sBIT;
    }
 
-   return (0);
+   return 0;
 }
 #endif
 
@@ -1051,7 +1068,7 @@ png_get_text(png_const_structrp png_ptr, png_inforp info_ptr,
 {
    if (png_ptr != NULL && info_ptr != NULL && info_ptr->num_text > 0)
    {
-      png_debug1(1, "in 0x%lx retrieval function",
+      png_debug1(1, "in text retrieval function, chunk typeid = 0x%lx",
          (unsigned long)png_ptr->chunk_name);
 
       if (text_ptr != NULL)
@@ -1066,7 +1083,7 @@ png_get_text(png_const_structrp png_ptr, png_inforp info_ptr,
    if (num_text != NULL)
       *num_text = 0;
 
-   return(0);
+   return 0;
 }
 #endif
 
@@ -1081,10 +1098,10 @@ png_get_tIME(png_const_structrp png_ptr, png_inforp info_ptr,
        (info_ptr->valid & PNG_INFO_tIME) != 0 && mod_time != NULL)
    {
       *mod_time = &(info_ptr->mod_time);
-      return (PNG_INFO_tIME);
+      return PNG_INFO_tIME;
    }
 
-   return (0);
+   return 0;
 }
 #endif
 
@@ -1094,11 +1111,12 @@ png_get_tRNS(png_const_structrp png_ptr, png_inforp info_ptr,
     png_bytep *trans_alpha, int *num_trans, png_color_16p *trans_color)
 {
    png_uint_32 retval = 0;
+
+   png_debug1(1, "in %s retrieval function", "tRNS");
+
    if (png_ptr != NULL && info_ptr != NULL &&
        (info_ptr->valid & PNG_INFO_tRNS) != 0)
    {
-      png_debug1(1, "in %s retrieval function", "tRNS");
-
       if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
       {
          if (trans_alpha != NULL)
@@ -1130,7 +1148,7 @@ png_get_tRNS(png_const_structrp png_ptr, png_inforp info_ptr,
       }
    }
 
-   return (retval);
+   return retval;
 }
 #endif
 
@@ -1145,13 +1163,13 @@ png_get_unknown_chunks(png_const_structrp png_ptr, png_inforp info_ptr,
       return info_ptr->unknown_chunks_num;
    }
 
-   return (0);
+   return 0;
 }
 #endif
 
 #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
 png_byte PNGAPI
-png_get_rgb_to_gray_status (png_const_structrp png_ptr)
+png_get_rgb_to_gray_status(png_const_structrp png_ptr)
 {
    return (png_byte)(png_ptr ? png_ptr->rgb_to_gray_status : 0);
 }
@@ -1192,27 +1210,27 @@ png_get_compression_buffer_size(png_const_structrp png_ptr)
 /* These functions were added to libpng 1.2.6 and were enabled
  * by default in libpng-1.4.0 */
 png_uint_32 PNGAPI
-png_get_user_width_max (png_const_structrp png_ptr)
+png_get_user_width_max(png_const_structrp png_ptr)
 {
    return (png_ptr ? png_ptr->user_width_max : 0);
 }
 
 png_uint_32 PNGAPI
-png_get_user_height_max (png_const_structrp png_ptr)
+png_get_user_height_max(png_const_structrp png_ptr)
 {
    return (png_ptr ? png_ptr->user_height_max : 0);
 }
 
 /* This function was added to libpng 1.4.0 */
 png_uint_32 PNGAPI
-png_get_chunk_cache_max (png_const_structrp png_ptr)
+png_get_chunk_cache_max(png_const_structrp png_ptr)
 {
    return (png_ptr ? png_ptr->user_chunk_cache_max : 0);
 }
 
 /* This function was added to libpng 1.4.1 */
 png_alloc_size_t PNGAPI
-png_get_chunk_malloc_max (png_const_structrp png_ptr)
+png_get_chunk_malloc_max(png_const_structrp png_ptr)
 {
    return (png_ptr ? png_ptr->user_chunk_malloc_max : 0);
 }
@@ -1221,13 +1239,13 @@ png_get_chunk_malloc_max (png_const_structrp png_ptr)
 /* These functions were added to libpng 1.4.0 */
 #ifdef PNG_IO_STATE_SUPPORTED
 png_uint_32 PNGAPI
-png_get_io_state (png_const_structrp png_ptr)
+png_get_io_state(png_const_structrp png_ptr)
 {
    return png_ptr->io_state;
 }
 
 png_uint_32 PNGAPI
-png_get_io_chunk_type (png_const_structrp png_ptr)
+png_get_io_chunk_type(png_const_structrp png_ptr)
 {
    return png_ptr->chunk_name;
 }
@@ -1241,7 +1259,7 @@ png_get_palette_max(png_const_structp png_ptr, png_const_infop info_ptr)
    if (png_ptr != NULL && info_ptr != NULL)
       return png_ptr->num_palette_max;
 
-   return (-1);
+   return -1;
 }
 #  endif
 #endif
diff --git a/frmts/png/libpng/pngpread.c b/frmts/png/libpng/pngpread.c
index e283627b77cd..ffab19c08c06 100644
--- a/frmts/png/libpng/pngpread.c
+++ b/frmts/png/libpng/pngpread.c
@@ -1,7 +1,7 @@
 
 /* pngpread.c - read a png file in push mode
  *
- * Copyright (c) 2018 Cosmin Truta
+ * Copyright (c) 2018-2024 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -145,10 +145,10 @@ png_push_read_sig(png_structrp png_ptr, png_inforp info_ptr)
        num_to_check);
    png_ptr->sig_bytes = (png_byte)(png_ptr->sig_bytes + num_to_check);
 
-   if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))
+   if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check) != 0)
    {
       if (num_checked < 4 &&
-          png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))
+          png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4) != 0)
          png_error(png_ptr, "Not a PNG file");
 
       else
@@ -294,6 +294,14 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr)
       png_handle_cHRM(png_ptr, info_ptr, png_ptr->push_length);
    }
 
+#endif
+#ifdef PNG_READ_eXIf_SUPPORTED
+   else if (png_ptr->chunk_name == png_eXIf)
+   {
+      PNG_PUSH_SAVE_BUFFER_IF_FULL
+      png_handle_eXIf(png_ptr, info_ptr, png_ptr->push_length);
+   }
+
 #endif
 #ifdef PNG_READ_sRGB_SUPPORTED
    else if (chunk_name == png_sRGB)
@@ -1089,7 +1097,7 @@ png_voidp PNGAPI
 png_get_progressive_ptr(png_const_structrp png_ptr)
 {
    if (png_ptr == NULL)
-      return (NULL);
+      return NULL;
 
    return png_ptr->io_ptr;
 }
diff --git a/frmts/png/libpng/pngpriv.h b/frmts/png/libpng/pngpriv.h
index daabadc5b7a7..9bfdb7134218 100644
--- a/frmts/png/libpng/pngpriv.h
+++ b/frmts/png/libpng/pngpriv.h
@@ -1,7 +1,7 @@
 
 /* pngpriv.h - private declarations for use inside libpng
  *
- * Copyright (c) 2018-2019 Cosmin Truta
+ * Copyright (c) 2018-2024 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -36,7 +36,7 @@
  * still required (as of 2011-05-02.)
  */
 #ifndef _POSIX_SOURCE
-# define _POSIX_SOURCE 1 /* Just the POSIX 1003.1 and C89 APIs */
+#  define _POSIX_SOURCE 1 /* Just the POSIX 1003.1 and C89 APIs */
 #endif
 
 #ifndef PNG_VERSION_INFO_ONLY
@@ -45,8 +45,6 @@
 #  include <string.h>
 #endif
 
-#include <stdint.h>
-
 #define PNGLIB_BUILD /*libpng is being built, not used*/
 
 /* If HAVE_CONFIG_H is defined during the build then the build system must
@@ -176,7 +174,7 @@
 #     else /* !defined __ARM_NEON__ */
          /* The 'intrinsics' code simply won't compile without this -mfpu=neon:
           */
-#        if !defined(__aarch64__)
+#        if !defined(__aarch64__) && !defined(_M_ARM64)
             /* The assembler code currently does not work on ARM64 */
 #          define PNG_ARM_NEON_IMPLEMENTATION 2
 #        endif /* __aarch64__ */
@@ -187,16 +185,32 @@
       /* Use the intrinsics code by default. */
 #     define PNG_ARM_NEON_IMPLEMENTATION 1
 #  endif
+#else /* PNG_ARM_NEON_OPT == 0 */
+#     define PNG_ARM_NEON_IMPLEMENTATION 0
 #endif /* PNG_ARM_NEON_OPT > 0 */
 
 #ifndef PNG_MIPS_MSA_OPT
-#  if defined(__mips_msa) && (__mips_isa_rev >= 5) && defined(PNG_ALIGNED_MEMORY_SUPPORTED)
+#  if defined(__mips_msa) && (__mips_isa_rev >= 5) && \
+   defined(PNG_ALIGNED_MEMORY_SUPPORTED)
 #     define PNG_MIPS_MSA_OPT 2
 #  else
 #     define PNG_MIPS_MSA_OPT 0
 #  endif
 #endif
 
+#ifndef PNG_MIPS_MMI_OPT
+#  ifdef PNG_MIPS_MMI
+#    if defined(__mips_loongson_mmi) && (_MIPS_SIM == _ABI64) && \
+     defined(PNG_ALIGNED_MEMORY_SUPPORTED)
+#       define PNG_MIPS_MMI_OPT 1
+#    else
+#       define PNG_MIPS_MMI_OPT 0
+#    endif
+#  else
+#    define PNG_MIPS_MMI_OPT 0
+#  endif
+#endif
+
 #ifndef PNG_POWERPC_VSX_OPT
 #  if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__)
 #     define PNG_POWERPC_VSX_OPT 2
@@ -205,13 +219,21 @@
 #  endif
 #endif
 
+#ifndef PNG_LOONGARCH_LSX_OPT
+#  if defined(__loongarch_sx)
+#     define PNG_LOONGARCH_LSX_OPT 1
+#  else
+#     define PNG_LOONGARCH_LSX_OPT 0
+#  endif
+#endif
+
 #ifndef PNG_INTEL_SSE_OPT
 #   ifdef PNG_INTEL_SSE
       /* Only check for SSE if the build configuration has been modified to
        * enable SSE optimizations.  This means that these optimizations will
        * be off by default.  See contrib/intel for more details.
        */
-#     if defined(__SSE4_1__) || defined(__AVX__) || defined(__SSSE3__) || \
+#      if defined(__SSE4_1__) || defined(__AVX__) || defined(__SSSE3__) || \
        defined(__SSE2__) || defined(_M_X64) || defined(_M_AMD64) || \
        (defined(_M_IX86_FP) && _M_IX86_FP >= 2)
 #         define PNG_INTEL_SSE_OPT 1
@@ -248,7 +270,6 @@
 #endif
 
 #if PNG_MIPS_MSA_OPT > 0
-#  define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_msa
 #  ifndef PNG_MIPS_MSA_IMPLEMENTATION
 #     if defined(__mips_msa)
 #        if defined(__clang__)
@@ -264,14 +285,41 @@
 
 #  ifndef PNG_MIPS_MSA_IMPLEMENTATION
 #     define PNG_MIPS_MSA_IMPLEMENTATION 1
+#     define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_mips
 #  endif
+#else
+#  define PNG_MIPS_MSA_IMPLEMENTATION 0
 #endif /* PNG_MIPS_MSA_OPT > 0 */
 
+#if PNG_MIPS_MMI_OPT > 0
+#  ifndef PNG_MIPS_MMI_IMPLEMENTATION
+#     if defined(__mips_loongson_mmi) && (_MIPS_SIM == _ABI64)
+#        define PNG_MIPS_MMI_IMPLEMENTATION 2
+#     else /* !defined __mips_loongson_mmi  || _MIPS_SIM != _ABI64 */
+#        define PNG_MIPS_MMI_IMPLEMENTATION 0
+#     endif /* __mips_loongson_mmi  && _MIPS_SIM == _ABI64 */
+#  endif /* !PNG_MIPS_MMI_IMPLEMENTATION */
+
+#   if PNG_MIPS_MMI_IMPLEMENTATION > 0
+#      define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_mips
+#   endif
+#else
+#   define PNG_MIPS_MMI_IMPLEMENTATION 0
+#endif /* PNG_MIPS_MMI_OPT > 0 */
+
 #if PNG_POWERPC_VSX_OPT > 0
 #  define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_vsx
 #  define PNG_POWERPC_VSX_IMPLEMENTATION 1
+#else
+#  define PNG_POWERPC_VSX_IMPLEMENTATION 0
 #endif
 
+#if PNG_LOONGARCH_LSX_OPT > 0
+#   define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_lsx
+#   define PNG_LOONGARCH_LSX_IMPLEMENTATION 1
+#else
+#   define PNG_LOONGARCH_LSX_IMPLEMENTATION 0
+#endif
 
 /* Is this a build of a DLL where compilation of the object modules requires
  * different preprocessor settings to those required for a simple library?  If
@@ -494,18 +542,7 @@
    static_cast<type>(static_cast<const void*>(value))
 #else
 #  define png_voidcast(type, value) (value)
-#  ifdef __UINTPTR_TYPE__
-      typedef __UINTPTR_TYPE__ png_ptruint;
-#  elif defined(_WIN64)
-#     ifdef __GNUC__
-         typedef unsigned long long png_ptruint;
-#     else
-         typedef unsigned __int64 png_ptruint;
-#     endif
-#  else
-      typedef unsigned long png_ptruint;
-#  endif
-#  define png_constcast(type, value) ((type)(png_ptruint)(const void*)(value))
+#  define png_constcast(type, value) ((type)(void*)(const void*)(value))
 #  define png_aligncast(type, value) ((void*)(value))
 #  define png_aligncastconst(type, value) ((const void*)(value))
 #endif /* __cplusplus */
@@ -521,18 +558,8 @@
     */
 #  include <float.h>
 
-#  if (defined(__MWERKS__) && defined(macintosh)) || defined(applec) || \
-    defined(THINK_C) || defined(__SC__) || defined(TARGET_OS_MAC)
-   /* We need to check that <math.h> hasn't already been included earlier
-    * as it seems it doesn't agree with <fp.h>, yet we should really use
-    * <fp.h> if possible.
-    */
-#    if !defined(__MATH_H__) && !defined(__MATH_H) && !defined(__cmath__)
-#      include <fp.h>
-#    endif
-#  else
-#    include <math.h>
-#  endif
+#  include <math.h>
+
 #  if defined(_AMIGA) && defined(__SASC) && defined(_M68881)
    /* Amiga SAS/C: We must include builtin FPU functions when compiling using
     * MATH=68881
@@ -547,9 +574,8 @@
 #  include <alloc.h>
 #endif
 
-#if defined(_WIN32) || defined(_Windows) || defined(_WINDOWS) || \
-    defined(_WIN32) || defined(__WIN32__)
-#  include <windows.h>  /* defines _WINDOWS_ macro */
+#if defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
+#  include <windows.h>
 #endif
 #endif /* PNG_VERSION_INFO_ONLY */
 
@@ -558,24 +584,20 @@
  * functions that are passed far data must be model-independent.
  */
 
-/* Memory model/platform independent fns */
+/* Platform-independent functions */
 #ifndef PNG_ABORT
-#  ifdef _WINDOWS_
-#    define PNG_ABORT() ExitProcess(0)
-#  else
-#    define PNG_ABORT() abort()
-#  endif
+#  define PNG_ABORT() abort()
 #endif
 
 /* These macros may need to be architecture dependent. */
-#define PNG_ALIGN_NONE   0 /* do not use data alignment */
-#define PNG_ALIGN_ALWAYS 1 /* assume unaligned accesses are OK */
+#define PNG_ALIGN_NONE      0 /* do not use data alignment */
+#define PNG_ALIGN_ALWAYS    1 /* assume unaligned accesses are OK */
 #ifdef offsetof
-#  define PNG_ALIGN_OFFSET 2 /* use offsetof to determine alignment */
+#  define PNG_ALIGN_OFFSET  2 /* use offsetof to determine alignment */
 #else
 #  define PNG_ALIGN_OFFSET -1 /* prevent the use of this */
 #endif
-#define PNG_ALIGN_SIZE   3 /* use sizeof to determine alignment */
+#define PNG_ALIGN_SIZE      3 /* use sizeof to determine alignment */
 
 #ifndef PNG_ALIGN_TYPE
    /* Default to using aligned access optimizations and requiring alignment to a
@@ -589,26 +611,25 @@
    /* This is used because in some compiler implementations non-aligned
     * structure members are supported, so the offsetof approach below fails.
     * Set PNG_ALIGN_SIZE=0 for compiler combinations where unaligned access
-    * is good for performance.  Do not do this unless you have tested the result
-    * and understand it.
+    * is good for performance.  Do not do this unless you have tested the
+    * result and understand it.
     */
-#  define png_alignof(type) (sizeof (type))
+#  define png_alignof(type) (sizeof(type))
 #else
 #  if PNG_ALIGN_TYPE == PNG_ALIGN_OFFSET
-#     define png_alignof(type) offsetof(struct{char c; type t;}, t)
+#    define png_alignof(type) offsetof(struct{char c; type t;}, t)
 #  else
-#     if PNG_ALIGN_TYPE == PNG_ALIGN_ALWAYS
-#        define png_alignof(type) (1)
-#     endif
-      /* Else leave png_alignof undefined to prevent use thereof */
+#    if PNG_ALIGN_TYPE == PNG_ALIGN_ALWAYS
+#      define png_alignof(type) 1
+#    endif
+     /* Else leave png_alignof undefined to prevent use thereof */
 #  endif
 #endif
 
-/* This implicitly assumes alignment is always to a power of 2. */
+/* This implicitly assumes alignment is always a multiple of 2. */
 #ifdef png_alignof
-#  define png_isaligned(ptr, type)\
-   (((type)((uintptr_t)ptr) & \
-   (type)(png_alignof(type)-1)) == 0)
+#  define png_isaligned(ptr, type) \
+   (((type)(size_t)((const void*)(ptr)) & (type)(png_alignof(type)-1)) == 0)
 #else
 #  define png_isaligned(ptr, type) 0
 #endif
@@ -639,7 +660,7 @@
 #define PNG_BACKGROUND_IS_GRAY     0x800U
 #define PNG_HAVE_PNG_SIGNATURE    0x1000U
 #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000U /* Have another chunk after IDAT */
-                   /*             0x4000U (unused) */
+#define PNG_WROTE_eXIf            0x4000U
 #define PNG_IS_READ_STRUCT        0x8000U /* Else is a write struct */
 
 /* Flags for the transformations the PNG library does on the image data */
@@ -1319,7 +1340,7 @@ PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_neon,(png_row_infop
     row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
 #endif
 
-#if PNG_MIPS_MSA_OPT > 0
+#if PNG_MIPS_MSA_IMPLEMENTATION == 1
 PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_msa,(png_row_infop row_info,
     png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
 PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_msa,(png_row_infop
@@ -1336,6 +1357,23 @@ PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_msa,(png_row_infop
     row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
 #endif
 
+#if PNG_MIPS_MMI_IMPLEMENTATION > 0
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_mmi,(png_row_infop row_info,
+    png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_mmi,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_mmi,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg3_mmi,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_mmi,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_mmi,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_mmi,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+#endif
+
 #if PNG_POWERPC_VSX_OPT > 0
 PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_vsx,(png_row_infop row_info,
     png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
@@ -1368,6 +1406,23 @@ PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_sse2,(png_row_infop
     row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
 #endif
 
+#if PNG_LOONGARCH_LSX_IMPLEMENTATION == 1
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_lsx,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_lsx,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_lsx,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg3_lsx,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_lsx,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_lsx,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_lsx,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+#endif
+
 /* Choose the best filter to use and filter the row data */
 PNG_INTERNAL_FUNCTION(void,png_write_find_filter,(png_structrp png_ptr,
     png_row_infop row_info),PNG_EMPTY);
@@ -1923,7 +1978,7 @@ PNG_INTERNAL_FUNCTION(void,png_ascii_from_fixed,(png_const_structrp png_ptr,
  */
 #define PNG_FP_INVALID  512  /* Available for callers as a distinct value */
 
-/* Result codes for the parser (boolean - true meants ok, false means
+/* Result codes for the parser (boolean - true means ok, false means
  * not ok yet.)
  */
 #define PNG_FP_MAYBE      0  /* The number may be valid in the future */
@@ -1959,7 +2014,7 @@ PNG_INTERNAL_FUNCTION(void,png_ascii_from_fixed,(png_const_structrp png_ptr,
  * the problem character.)  This has not been tested within libpng.
  */
 PNG_INTERNAL_FUNCTION(int,png_check_fp_number,(png_const_charp string,
-   size_t size, int *statep, png_size_tp whereami),PNG_EMPTY);
+   size_t size, int *statep, size_t *whereami),PNG_EMPTY);
 
 /* This is the same but it checks a complete string and returns true
  * only if it just contains a floating point number.  As of 1.5.4 this
@@ -2107,17 +2162,27 @@ PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_neon,
    (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
 #endif
 
-#if PNG_MIPS_MSA_OPT > 0
-PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_msa,
+#if PNG_MIPS_MSA_IMPLEMENTATION == 1
+PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_mips,
    (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
 #endif
 
+#  if PNG_MIPS_MMI_IMPLEMENTATION > 0
+PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_mips,
+   (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
+#  endif
+
 #  if PNG_INTEL_SSE_IMPLEMENTATION > 0
 PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_sse2,
    (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
 #  endif
 #endif
 
+#if PNG_LOONGARCH_LSX_OPT > 0
+PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_lsx,
+    (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
+#endif
+
 PNG_INTERNAL_FUNCTION(png_uint_32, png_check_keyword, (png_structrp png_ptr,
    png_const_charp key, png_bytep new_key), PNG_EMPTY);
 
diff --git a/frmts/png/libpng/pngread.c b/frmts/png/libpng/pngread.c
index 96996ced5ba9..07a39df6e2e3 100644
--- a/frmts/png/libpng/pngread.c
+++ b/frmts/png/libpng/pngread.c
@@ -1,7 +1,7 @@
 
 /* pngread.c - read a PNG file
  *
- * Copyright (c) 2018-2019 Cosmin Truta
+ * Copyright (c) 2018-2024 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -568,7 +568,11 @@ png_read_row(png_structrp png_ptr, png_bytep row, png_bytep dsp_row)
 #endif
 
 #ifdef PNG_READ_TRANSFORMS_SUPPORTED
-   if (png_ptr->transformations)
+   if (png_ptr->transformations
+#     ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
+         || png_ptr->num_palette_max >= 0
+#     endif
+      )
       png_do_read_transformations(png_ptr, &row_info);
 #endif
 
@@ -785,7 +789,7 @@ png_read_end(png_structrp png_ptr, png_inforp info_ptr)
 #ifdef PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
    /* Report invalid palette index; added at libng-1.5.10 */
    if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-       png_ptr->num_palette_max > png_ptr->num_palette)
+       png_ptr->num_palette_max >= png_ptr->num_palette)
       png_benign_error(png_ptr, "Read palette index exceeding num_palette");
 #endif
 
@@ -1049,6 +1053,8 @@ void PNGAPI
 png_read_png(png_structrp png_ptr, png_inforp info_ptr,
     int transforms, voidp params)
 {
+   png_debug(1, "in png_read_png");
+
    if (png_ptr == NULL || info_ptr == NULL)
       return;
 
diff --git a/frmts/png/libpng/pngrtran.c b/frmts/png/libpng/pngrtran.c
index 3b8323980fa0..1526123e025c 100644
--- a/frmts/png/libpng/pngrtran.c
+++ b/frmts/png/libpng/pngrtran.c
@@ -1,7 +1,7 @@
 
 /* pngrtran.c - transforms the data in a row for PNG readers
  *
- * Copyright (c) 2018-2019 Cosmin Truta
+ * Copyright (c) 2018-2024 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -21,7 +21,7 @@
 #ifdef PNG_ARM_NEON_IMPLEMENTATION
 #  if PNG_ARM_NEON_IMPLEMENTATION == 1
 #    define PNG_ARM_NEON_INTRINSICS_AVAILABLE
-#    if defined(_MSC_VER) && defined(_M_ARM64)
+#    if defined(_MSC_VER) && !defined(__clang__) && defined(_M_ARM64)
 #      include <arm64_neon.h>
 #    else
 #      include <arm_neon.h>
@@ -290,21 +290,20 @@ png_set_alpha_mode_fixed(png_structrp png_ptr, int mode,
    int compose = 0;
    png_fixed_point file_gamma;
 
-   png_debug(1, "in png_set_alpha_mode");
+   png_debug(1, "in png_set_alpha_mode_fixed");
 
    if (png_rtran_ok(png_ptr, 0) == 0)
       return;
 
    output_gamma = translate_gamma_flags(png_ptr, output_gamma, 1/*screen*/);
 
-   /* Validate the value to ensure it is in a reasonable range. The value
+   /* Validate the value to ensure it is in a reasonable range.  The value
     * is expected to be 1 or greater, but this range test allows for some
-    * viewing correction values.  The intent is to weed out users of this API
-    * who use the inverse of the gamma value accidentally!  Since some of these
-    * values are reasonable this may have to be changed:
+    * viewing correction values.  The intent is to weed out the API users
+    * who might use the inverse of the gamma value accidentally!
     *
-    * 1.6.x: changed from 0.07..3 to 0.01..100 (to accommodate the optimal 16-bit
-    * gamma of 36, and its reciprocal.)
+    * In libpng 1.6.0, we changed from 0.07..3 to 0.01..100, to accommodate
+    * the optimal 16-bit gamma of 36 and its reciprocal.
     */
    if (output_gamma < 1000 || output_gamma > 10000000)
       png_error(png_ptr, "output gamma out of expected range");
@@ -441,7 +440,7 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
       int i;
 
       png_ptr->quantize_index = (png_bytep)png_malloc(png_ptr,
-          (png_alloc_size_t)((png_uint_32)num_palette * (sizeof (png_byte))));
+          (png_alloc_size_t)num_palette);
       for (i = 0; i < num_palette; i++)
          png_ptr->quantize_index[i] = (png_byte)i;
    }
@@ -458,7 +457,7 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
 
          /* Initialize an array to sort colors */
          png_ptr->quantize_sort = (png_bytep)png_malloc(png_ptr,
-             (png_alloc_size_t)((png_uint_32)num_palette * (sizeof (png_byte))));
+             (png_alloc_size_t)num_palette);
 
          /* Initialize the quantize_sort array */
          for (i = 0; i < num_palette; i++)
@@ -592,11 +591,9 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
 
          /* Initialize palette index arrays */
          png_ptr->index_to_palette = (png_bytep)png_malloc(png_ptr,
-             (png_alloc_size_t)((png_uint_32)num_palette *
-             (sizeof (png_byte))));
+             (png_alloc_size_t)num_palette);
          png_ptr->palette_to_index = (png_bytep)png_malloc(png_ptr,
-             (png_alloc_size_t)((png_uint_32)num_palette *
-             (sizeof (png_byte))));
+             (png_alloc_size_t)num_palette);
 
          /* Initialize the sort array */
          for (i = 0; i < num_palette; i++)
@@ -761,12 +758,11 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
       size_t num_entries = ((size_t)1 << total_bits);
 
       png_ptr->palette_lookup = (png_bytep)png_calloc(png_ptr,
-          (png_alloc_size_t)(num_entries * (sizeof (png_byte))));
+          (png_alloc_size_t)(num_entries));
 
-      distance = (png_bytep)png_malloc(png_ptr, (png_alloc_size_t)(num_entries *
-          (sizeof (png_byte))));
+      distance = (png_bytep)png_malloc(png_ptr, (png_alloc_size_t)num_entries);
 
-      memset(distance, 0xff, num_entries * (sizeof (png_byte)));
+      memset(distance, 0xff, num_entries);
 
       for (i = 0; i < num_palette; i++)
       {
@@ -970,7 +966,7 @@ void PNGFAPI
 png_set_rgb_to_gray_fixed(png_structrp png_ptr, int error_action,
     png_fixed_point red, png_fixed_point green)
 {
-   png_debug(1, "in png_set_rgb_to_gray");
+   png_debug(1, "in png_set_rgb_to_gray_fixed");
 
    /* Need the IHDR here because of the check on color_type below. */
    /* TODO: fix this */
@@ -1168,7 +1164,7 @@ png_init_palette_transformations(png_structrp png_ptr)
     */
 
    /* The following code cannot be entered in the alpha pre-multiplication case
-    * because PNG_BACKGROUND_EXPAND is canceled below.
+    * because PNG_BACKGROUND_EXPAND is cancelled below.
     */
    if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) != 0 &&
        (png_ptr->transformations & PNG_EXPAND) != 0)
@@ -1235,7 +1231,7 @@ png_init_rgb_transformations(png_structrp png_ptr)
     */
 
    /* The following code cannot be entered in the alpha pre-multiplication case
-    * because PNG_BACKGROUND_EXPAND is canceled below.
+    * because PNG_BACKGROUND_EXPAND is cancelled below.
     */
    if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) != 0 &&
        (png_ptr->transformations & PNG_EXPAND) != 0 &&
@@ -1562,7 +1558,7 @@ png_init_read_transformations(png_structrp png_ptr)
     * built when it would be quicker to just calculate the correct value for
     * each palette entry directly.  Also, the test is too tricky - why check
     * PNG_RGB_TO_GRAY if PNG_GAMMA is not set?  The answer seems to be that
-    * PNG_GAMMA is canceled even if the gamma is known?  The test excludes the
+    * PNG_GAMMA is cancelled even if the gamma is known?  The test excludes the
     * PNG_COMPOSE case, so apparently if there is no *overall* gamma correction
     * the gamma tables will not be built even if composition is required on a
     * gamma encoded value.
diff --git a/frmts/png/libpng/pngrutil.c b/frmts/png/libpng/pngrutil.c
index 590166973639..959438711f9c 100644
--- a/frmts/png/libpng/pngrutil.c
+++ b/frmts/png/libpng/pngrutil.c
@@ -1,7 +1,7 @@
 
 /* pngrutil.c - utilities to read a PNG file
  *
- * Copyright (c) 2018 Cosmin Truta
+ * Copyright (c) 2018-2024 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -26,7 +26,7 @@ png_get_uint_31(png_const_structrp png_ptr, png_const_bytep buf)
    if (uval > PNG_UINT_31_MAX)
       png_error(png_ptr, "PNG unsigned integer out of range");
 
-   return (uval);
+   return uval;
 }
 
 #if defined(PNG_READ_gAMA_SUPPORTED) || defined(PNG_READ_cHRM_SUPPORTED)
@@ -140,7 +140,7 @@ png_read_sig(png_structrp png_ptr, png_inforp info_ptr)
    if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check) != 0)
    {
       if (num_checked < 4 &&
-          png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))
+          png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4) != 0)
          png_error(png_ptr, "Not a PNG file");
       else
          png_error(png_ptr, "PNG file corrupted by ASCII conversion");
@@ -171,7 +171,7 @@ png_read_chunk_header(png_structrp png_ptr)
    /* Put the chunk name into png_ptr->chunk_name. */
    png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(buf+4);
 
-   png_debug2(0, "Reading %lx chunk, length = %lu",
+   png_debug2(0, "Reading chunk typeid = 0x%lx, length = %lu",
        (unsigned long)png_ptr->chunk_name, (unsigned long)length);
 
    /* Reset the crc and run it over the chunk name. */
@@ -238,10 +238,10 @@ png_crc_finish(png_structrp png_ptr, png_uint_32 skip)
       else
          png_chunk_error(png_ptr, "CRC error");
 
-      return (1);
+      return 1;
    }
 
-   return (0);
+   return 0;
 }
 
 /* Compare the CRC stored in the PNG file with that calculated by libpng from
@@ -277,11 +277,11 @@ png_crc_error(png_structrp png_ptr)
    if (need_crc != 0)
    {
       crc = png_get_uint_32(crc_bytes);
-      return ((int)(crc != png_ptr->crc));
+      return crc != png_ptr->crc;
    }
 
    else
-      return (0);
+      return 0;
 }
 
 #if defined(PNG_READ_iCCP_SUPPORTED) || defined(PNG_READ_iTXt_SUPPORTED) ||\
@@ -301,7 +301,6 @@ png_read_buffer(png_structrp png_ptr, png_alloc_size_t new_size, int warn)
 
    if (buffer != NULL && new_size > png_ptr->read_buffer_size)
    {
-      png_ptr->read_buffer = NULL;
       png_ptr->read_buffer = NULL;
       png_ptr->read_buffer_size = 0;
       png_free(png_ptr, buffer);
@@ -422,8 +421,7 @@ png_inflate_claim(png_structrp png_ptr, png_uint_32 owner)
             png_ptr->flags |= PNG_FLAG_ZSTREAM_INITIALIZED;
       }
 
-#if ZLIB_VERNUM >= 0x1290 && \
-   defined(PNG_SET_OPTION_SUPPORTED) && defined(PNG_IGNORE_ADLER32)
+#ifdef PNG_DISABLE_ADLER32_CHECK_SUPPORTED
       if (((png_ptr->options >> PNG_IGNORE_ADLER32) & 3) == PNG_OPTION_ON)
          /* Turn off validation of the ADLER32 checksum in IDAT chunks */
          ret = inflateValidate(&png_ptr->zstream, 0);
@@ -2076,14 +2074,17 @@ png_handle_eXIf(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
       png_byte buf[1];
       png_crc_read(png_ptr, buf, 1);
       info_ptr->eXIf_buf[i] = buf[0];
-      if (i == 1 && buf[0] != 'M' && buf[0] != 'I'
-                 && info_ptr->eXIf_buf[0] != buf[0])
+      if (i == 1)
       {
-         png_crc_finish(png_ptr, length);
-         png_chunk_benign_error(png_ptr, "incorrect byte-order specifier");
-         png_free(png_ptr, info_ptr->eXIf_buf);
-         info_ptr->eXIf_buf = NULL;
-         return;
+         if ((buf[0] != 'M' && buf[0] != 'I') ||
+             (info_ptr->eXIf_buf[0] != buf[0]))
+         {
+            png_crc_finish(png_ptr, length - 2);
+            png_chunk_benign_error(png_ptr, "incorrect byte-order specifier");
+            png_free(png_ptr, info_ptr->eXIf_buf);
+            info_ptr->eXIf_buf = NULL;
+            return;
+         }
       }
    }
 
@@ -2124,8 +2125,9 @@ png_handle_hIST(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 
    num = length / 2 ;
 
-   if (num != (unsigned int) png_ptr->num_palette ||
-       num > (unsigned int) PNG_MAX_PALETTE_LENGTH)
+   if (length != num * 2 ||
+       num != (unsigned int)png_ptr->num_palette ||
+       num > (unsigned int)PNG_MAX_PALETTE_LENGTH)
    {
       png_crc_finish(png_ptr, length);
       png_chunk_benign_error(png_ptr, "invalid");
@@ -3185,7 +3187,7 @@ png_check_chunk_length(png_const_structrp png_ptr, png_uint_32 length)
    {
       png_debug2(0," length = %lu, limit = %lu",
          (unsigned long)length,(unsigned long)limit);
-      png_chunk_error(png_ptr, "chunk data is too large");
+      png_benign_error(png_ptr, "chunk data is too large");
    }
 }
 
@@ -4621,14 +4623,13 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
        */
       {
          png_bytep temp = png_ptr->big_row_buf + 32;
-         int extra = (int)(((uintptr_t)temp) & 0x0f);
+         size_t extra = (size_t)temp & 0x0f;
          png_ptr->row_buf = temp - extra - 1/*filter byte*/;
 
          temp = png_ptr->big_prev_row + 32;
-         extra = (int)(((uintptr_t)temp) & 0x0f);
+         extra = (size_t)temp & 0x0f;
          png_ptr->prev_row = temp - extra - 1/*filter byte*/;
       }
-
 #else
       /* Use 31 bytes of padding before and 17 bytes after row_buf. */
       png_ptr->row_buf = png_ptr->big_row_buf + 31;
diff --git a/frmts/png/libpng/pngset.c b/frmts/png/libpng/pngset.c
index ec75dbe36903..eb1c8c7a35af 100644
--- a/frmts/png/libpng/pngset.c
+++ b/frmts/png/libpng/pngset.c
@@ -1,7 +1,7 @@
 
 /* pngset.c - storage of image information into info struct
  *
- * Copyright (c) 2018 Cosmin Truta
+ * Copyright (c) 2018-2024 Cosmin Truta
  * Copyright (c) 1998-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -137,46 +137,40 @@ png_set_cHRM_XYZ(png_const_structrp png_ptr, png_inforp info_ptr, double red_X,
 #ifdef PNG_eXIf_SUPPORTED
 void PNGAPI
 png_set_eXIf(png_const_structrp png_ptr, png_inforp info_ptr,
-    png_bytep eXIf_buf)
+    png_bytep exif)
 {
   png_warning(png_ptr, "png_set_eXIf does not work; use png_set_eXIf_1");
   PNG_UNUSED(info_ptr)
-  PNG_UNUSED(eXIf_buf)
+  PNG_UNUSED(exif)
 }
 
 void PNGAPI
 png_set_eXIf_1(png_const_structrp png_ptr, png_inforp info_ptr,
-    png_uint_32 num_exif, png_bytep eXIf_buf)
+    png_uint_32 num_exif, png_bytep exif)
 {
-   int i;
+   png_bytep new_exif;
 
    png_debug1(1, "in %s storage function", "eXIf");
 
-   if (png_ptr == NULL || info_ptr == NULL)
+   if (png_ptr == NULL || info_ptr == NULL ||
+       (png_ptr->mode & PNG_WROTE_eXIf) != 0)
       return;
 
-   if (info_ptr->exif)
-   {
-      png_free(png_ptr, info_ptr->exif);
-      info_ptr->exif = NULL;
-   }
-
-   info_ptr->num_exif = num_exif;
-
-   info_ptr->exif = png_voidcast(png_bytep, png_malloc_warn(png_ptr,
-       info_ptr->num_exif));
+   new_exif = png_voidcast(png_bytep, png_malloc_warn(png_ptr, num_exif));
 
-   if (info_ptr->exif == NULL)
+   if (new_exif == NULL)
    {
       png_warning(png_ptr, "Insufficient memory for eXIf chunk data");
       return;
    }
 
-   info_ptr->free_me |= PNG_FREE_EXIF;
+   memcpy(new_exif, exif, (size_t)num_exif);
 
-   for (i = 0; i < (int) info_ptr->num_exif; i++)
-      info_ptr->exif[i] = eXIf_buf[i];
+   png_free_data(png_ptr, info_ptr, PNG_FREE_EXIF, 0);
 
+   info_ptr->num_exif = num_exif;
+   info_ptr->exif = new_exif;
+   info_ptr->free_me |= PNG_FREE_EXIF;
    info_ptr->valid |= PNG_INFO_eXIf;
 }
 #endif /* eXIf */
@@ -237,15 +231,13 @@ png_set_hIST(png_const_structrp png_ptr, png_inforp info_ptr,
    if (info_ptr->hist == NULL)
    {
       png_warning(png_ptr, "Insufficient memory for hIST chunk data");
-
       return;
    }
 
-   info_ptr->free_me |= PNG_FREE_HIST;
-
    for (i = 0; i < info_ptr->num_palette; i++)
       info_ptr->hist[i] = hist[i];
 
+   info_ptr->free_me |= PNG_FREE_HIST;
    info_ptr->valid |= PNG_INFO_hIST;
 }
 #endif
@@ -367,6 +359,8 @@ png_set_pCAL(png_const_structrp png_ptr, png_inforp info_ptr,
 
    memcpy(info_ptr->pcal_purpose, purpose, length);
 
+   info_ptr->free_me |= PNG_FREE_PCAL;
+
    png_debug(3, "storing X0, X1, type, and nparams in info");
    info_ptr->pcal_X0 = X0;
    info_ptr->pcal_X1 = X1;
@@ -383,7 +377,6 @@ png_set_pCAL(png_const_structrp png_ptr, png_inforp info_ptr,
    if (info_ptr->pcal_units == NULL)
    {
       png_warning(png_ptr, "Insufficient memory for pCAL units");
-
       return;
    }
 
@@ -395,7 +388,6 @@ png_set_pCAL(png_const_structrp png_ptr, png_inforp info_ptr,
    if (info_ptr->pcal_params == NULL)
    {
       png_warning(png_ptr, "Insufficient memory for pCAL params");
-
       return;
    }
 
@@ -413,7 +405,6 @@ png_set_pCAL(png_const_structrp png_ptr, png_inforp info_ptr,
       if (info_ptr->pcal_params[i] == NULL)
       {
          png_warning(png_ptr, "Insufficient memory for pCAL parameter");
-
          return;
       }
 
@@ -421,7 +412,6 @@ png_set_pCAL(png_const_structrp png_ptr, png_inforp info_ptr,
    }
 
    info_ptr->valid |= PNG_INFO_pCAL;
-   info_ptr->free_me |= PNG_FREE_PCAL;
 }
 #endif
 
@@ -478,18 +468,17 @@ png_set_sCAL_s(png_const_structrp png_ptr, png_inforp info_ptr,
 
    if (info_ptr->scal_s_height == NULL)
    {
-      png_free (png_ptr, info_ptr->scal_s_width);
+      png_free(png_ptr, info_ptr->scal_s_width);
       info_ptr->scal_s_width = NULL;
 
       png_warning(png_ptr, "Memory allocation failed while processing sCAL");
-
       return;
    }
 
    memcpy(info_ptr->scal_s_height, sheight, lengthh);
 
-   info_ptr->valid |= PNG_INFO_sCAL;
    info_ptr->free_me |= PNG_FREE_SCAL;
+   info_ptr->valid |= PNG_INFO_sCAL;
 }
 
 #  ifdef PNG_FLOATING_POINT_SUPPORTED
@@ -625,11 +614,10 @@ png_set_PLTE(png_structrp png_ptr, png_inforp info_ptr,
    if (num_palette > 0)
       memcpy(png_ptr->palette, palette, (unsigned int)num_palette *
           (sizeof (png_color)));
+
    info_ptr->palette = png_ptr->palette;
    info_ptr->num_palette = png_ptr->num_palette = (png_uint_16)num_palette;
-
    info_ptr->free_me |= PNG_FREE_PLTE;
-
    info_ptr->valid |= PNG_INFO_PLTE;
 }
 
@@ -775,11 +763,11 @@ png_set_text_2(png_const_structrp png_ptr, png_inforp info_ptr,
 {
    int i;
 
-   png_debug1(1, "in %lx storage function", png_ptr == NULL ? 0xabadca11U :
-      (unsigned long)png_ptr->chunk_name);
+   png_debug1(1, "in text storage function, chunk typeid = 0x%lx",
+      png_ptr == NULL ? 0xabadca11UL : (unsigned long)png_ptr->chunk_name);
 
    if (png_ptr == NULL || info_ptr == NULL || num_text <= 0 || text_ptr == NULL)
-      return(0);
+      return 0;
 
    /* Make sure we have enough space in the "text" array in info_struct
     * to hold all of the incoming text_ptr objects.  This compare can't overflow
@@ -959,7 +947,7 @@ png_set_text_2(png_const_structrp png_ptr, png_inforp info_ptr,
       png_debug1(3, "transferred text chunk %d", info_ptr->num_text);
    }
 
-   return(0);
+   return 0;
 }
 #endif
 
@@ -1019,6 +1007,9 @@ png_set_tRNS(png_structrp png_ptr, png_inforp info_ptr,
           info_ptr->trans_alpha = png_voidcast(png_bytep,
               png_malloc(png_ptr, PNG_MAX_PALETTE_LENGTH));
           memcpy(info_ptr->trans_alpha, trans_alpha, (size_t)num_trans);
+
+          info_ptr->free_me |= PNG_FREE_TRNS;
+          info_ptr->valid |= PNG_INFO_tRNS;
        }
        png_ptr->trans_alpha = info_ptr->trans_alpha;
    }
@@ -1051,8 +1042,8 @@ png_set_tRNS(png_structrp png_ptr, png_inforp info_ptr,
 
    if (num_trans != 0)
    {
-      info_ptr->valid |= PNG_INFO_tRNS;
       info_ptr->free_me |= PNG_FREE_TRNS;
+      info_ptr->valid |= PNG_INFO_tRNS;
    }
 }
 #endif
@@ -1072,6 +1063,8 @@ png_set_sPLT(png_const_structrp png_ptr,
 {
    png_sPLT_tp np;
 
+   png_debug1(1, "in %s storage function", "sPLT");
+
    if (png_ptr == NULL || info_ptr == NULL || nentries <= 0 || entries == NULL)
       return;
 
@@ -1086,11 +1079,11 @@ png_set_sPLT(png_const_structrp png_ptr,
    {
       /* Out of memory or too many chunks */
       png_chunk_report(png_ptr, "too many sPLT chunks", PNG_CHUNK_WRITE_ERROR);
-
       return;
    }
 
    png_free(png_ptr, info_ptr->splt_palettes);
+
    info_ptr->splt_palettes = np;
    info_ptr->free_me |= PNG_FREE_SPLT;
 
@@ -1244,11 +1237,11 @@ png_set_unknown_chunks(png_const_structrp png_ptr,
    {
       png_chunk_report(png_ptr, "too many unknown chunks",
           PNG_CHUNK_WRITE_ERROR);
-
       return;
    }
 
    png_free(png_ptr, info_ptr->unknown_chunks);
+
    info_ptr->unknown_chunks = np; /* safe because it is initialized */
    info_ptr->free_me |= PNG_FREE_UNKN;
 
@@ -1326,7 +1319,7 @@ png_set_unknown_chunk_location(png_const_structrp png_ptr, png_inforp info_ptr,
 
 #ifdef PNG_MNG_FEATURES_SUPPORTED
 png_uint_32 PNGAPI
-png_permit_mng_features (png_structrp png_ptr, png_uint_32 mng_features)
+png_permit_mng_features(png_structrp png_ptr, png_uint_32 mng_features)
 {
    png_debug(1, "in png_permit_mng_features");
 
@@ -1546,7 +1539,7 @@ void PNGAPI
 png_set_rows(png_const_structrp png_ptr, png_inforp info_ptr,
     png_bytepp row_pointers)
 {
-   png_debug1(1, "in %s storage function", "rows");
+   png_debug(1, "in png_set_rows");
 
    if (png_ptr == NULL || info_ptr == NULL)
       return;
@@ -1565,6 +1558,8 @@ png_set_rows(png_const_structrp png_ptr, png_inforp info_ptr,
 void PNGAPI
 png_set_compression_buffer_size(png_structrp png_ptr, size_t size)
 {
+   png_debug(1, "in png_set_compression_buffer_size");
+
    if (png_ptr == NULL)
       return;
 
@@ -1633,9 +1628,11 @@ png_set_invalid(png_const_structrp png_ptr, png_inforp info_ptr, int mask)
 #ifdef PNG_SET_USER_LIMITS_SUPPORTED
 /* This function was added to libpng 1.2.6 */
 void PNGAPI
-png_set_user_limits (png_structrp png_ptr, png_uint_32 user_width_max,
+png_set_user_limits(png_structrp png_ptr, png_uint_32 user_width_max,
     png_uint_32 user_height_max)
 {
+   png_debug(1, "in png_set_user_limits");
+
    /* Images with dimensions larger than these limits will be
     * rejected by png_set_IHDR().  To accept any PNG datastream
     * regardless of dimensions, set both limits to 0x7fffffff.
@@ -1649,17 +1646,21 @@ png_set_user_limits (png_structrp png_ptr, png_uint_32 user_width_max,
 
 /* This function was added to libpng 1.4.0 */
 void PNGAPI
-png_set_chunk_cache_max (png_structrp png_ptr, png_uint_32 user_chunk_cache_max)
+png_set_chunk_cache_max(png_structrp png_ptr, png_uint_32 user_chunk_cache_max)
 {
+   png_debug(1, "in png_set_chunk_cache_max");
+
    if (png_ptr != NULL)
       png_ptr->user_chunk_cache_max = user_chunk_cache_max;
 }
 
 /* This function was added to libpng 1.4.1 */
 void PNGAPI
-png_set_chunk_malloc_max (png_structrp png_ptr,
+png_set_chunk_malloc_max(png_structrp png_ptr,
     png_alloc_size_t user_chunk_malloc_max)
 {
+   png_debug(1, "in png_set_chunk_malloc_max");
+
    if (png_ptr != NULL)
       png_ptr->user_chunk_malloc_max = user_chunk_malloc_max;
 }
diff --git a/frmts/png/libpng/pngstruct.h b/frmts/png/libpng/pngstruct.h
index 8bdc7ce46dbb..e591d94d5870 100644
--- a/frmts/png/libpng/pngstruct.h
+++ b/frmts/png/libpng/pngstruct.h
@@ -1,7 +1,7 @@
 
 /* pngstruct.h - header file for PNG reference library
  *
- * Copyright (c) 2018-2019 Cosmin Truta
+ * Copyright (c) 2018-2022 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -334,18 +334,8 @@ struct png_struct_def
    size_t current_buffer_size;       /* amount of data now in current_buffer */
    int process_mode;                 /* what push library is currently doing */
    int cur_palette;                  /* current push library palette index */
-
 #endif /* PROGRESSIVE_READ */
 
-#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
-/* For the Borland special 64K segment handler */
-   png_bytepp offset_table_ptr;
-   png_bytep offset_table;
-   png_uint_16 offset_table_number;
-   png_uint_16 offset_table_count;
-   png_uint_16 offset_table_count_free;
-#endif
-
 #ifdef PNG_READ_QUANTIZE_SUPPORTED
    png_bytep palette_lookup; /* lookup table for quantizing */
    png_bytep quantize_index; /* index translation for palette files */
diff --git a/frmts/png/libpng/pngtrans.c b/frmts/png/libpng/pngtrans.c
index 1100f46ebec2..62cb21edf1f5 100644
--- a/frmts/png/libpng/pngtrans.c
+++ b/frmts/png/libpng/pngtrans.c
@@ -1,7 +1,7 @@
 
 /* pngtrans.c - transforms the data in a row (used by both readers and writers)
  *
- * Copyright (c) 2018 Cosmin Truta
+ * Copyright (c) 2018-2024 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -103,10 +103,10 @@ png_set_interlace_handling(png_structrp png_ptr)
    if (png_ptr != 0 && png_ptr->interlaced != 0)
    {
       png_ptr->transformations |= PNG_INTERLACE;
-      return (7);
+      return 7;
    }
 
-   return (1);
+   return 1;
 }
 #endif
 
@@ -498,6 +498,8 @@ png_do_strip_channel(png_row_infop row_info, png_bytep row, int at_start)
    png_bytep dp = row; /* destination pointer */
    png_bytep ep = row + row_info->rowbytes; /* One beyond end of row */
 
+   png_debug(1, "in png_do_strip_channel");
+
    /* At the start sp will point to the first byte to copy and dp to where
     * it is copied to.  ep always points just beyond the end of the row, so
     * the loop simply copies (channels-1) channels until sp reaches ep.
@@ -698,6 +700,8 @@ png_do_bgr(png_row_infop row_info, png_bytep row)
 void /* PRIVATE */
 png_do_check_palette_indexes(png_structrp png_ptr, png_row_infop row_info)
 {
+   png_debug(1, "in png_do_check_palette_indexes");
+
    if (png_ptr->num_palette < (1 << row_info->bit_depth) &&
       png_ptr->num_palette > 0) /* num_palette can be 0 in MNG files */
    {
@@ -708,7 +712,7 @@ png_do_check_palette_indexes(png_structrp png_ptr, png_row_infop row_info)
        * forms produced on either GCC or MSVC.
        */
       int padding = PNG_PADBITS(row_info->pixel_depth, row_info->width);
-      png_bytep rp = png_ptr->row_buf + row_info->rowbytes - 1;
+      png_bytep rp = png_ptr->row_buf + row_info->rowbytes;
 
       switch (row_info->bit_depth)
       {
@@ -833,7 +837,7 @@ png_voidp PNGAPI
 png_get_user_transform_ptr(png_const_structrp png_ptr)
 {
    if (png_ptr == NULL)
-      return (NULL);
+      return NULL;
 
    return png_ptr->user_transform_ptr;
 }
diff --git a/frmts/png/libpng/pngwrite.c b/frmts/png/libpng/pngwrite.c
index 59377a4ddea2..77e412f43d58 100644
--- a/frmts/png/libpng/pngwrite.c
+++ b/frmts/png/libpng/pngwrite.c
@@ -1,7 +1,7 @@
 
 /* pngwrite.c - general routines to write a PNG file
  *
- * Copyright (c) 2018-2019 Cosmin Truta
+ * Copyright (c) 2018-2024 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -75,10 +75,10 @@ write_unknown_chunks(png_structrp png_ptr, png_const_inforp info_ptr,
  * library.  If you have a new chunk to add, make a function to write it,
  * and put it in the correct location here.  If you want the chunk written
  * after the image data, put it in png_write_end().  I strongly encourage
- * you to supply a PNG_INFO_ flag, and check info_ptr->valid before writing
- * the chunk, as that will keep the code from breaking if you want to just
- * write a plain PNG file.  If you have long comments, I suggest writing
- * them in png_write_end(), and compressing them.
+ * you to supply a PNG_INFO_<chunk> flag, and check info_ptr->valid before
+ * writing the chunk, as that will keep the code from breaking if you want
+ * to just write a plain PNG file.  If you have long comments, I suggest
+ * writing them in png_write_end(), and compressing them.
  */
 void PNGAPI
 png_write_info_before_PLTE(png_structrp png_ptr, png_const_inforp info_ptr)
@@ -239,7 +239,10 @@ png_write_info(png_structrp png_ptr, png_const_inforp info_ptr)
 
 #ifdef PNG_WRITE_eXIf_SUPPORTED
    if ((info_ptr->valid & PNG_INFO_eXIf) != 0)
+   {
       png_write_eXIf(png_ptr, info_ptr->exif, info_ptr->num_exif);
+      png_ptr->mode |= PNG_WROTE_eXIf;
+   }
 #endif
 
 #ifdef PNG_WRITE_hIST_SUPPORTED
@@ -366,7 +369,8 @@ png_write_end(png_structrp png_ptr, png_inforp info_ptr)
       png_error(png_ptr, "No IDATs written into file");
 
 #ifdef PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED
-   if (png_ptr->num_palette_max > png_ptr->num_palette)
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
+       png_ptr->num_palette_max >= png_ptr->num_palette)
       png_benign_error(png_ptr, "Wrote palette index exceeding num_palette");
 #endif
 
@@ -439,8 +443,9 @@ png_write_end(png_structrp png_ptr, png_inforp info_ptr)
 #endif
 
 #ifdef PNG_WRITE_eXIf_SUPPORTED
-   if ((info_ptr->valid & PNG_INFO_eXIf) != 0)
-      png_write_eXIf(png_ptr, info_ptr->exif, info_ptr->num_exif);
+      if ((info_ptr->valid & PNG_INFO_eXIf) != 0 &&
+          (png_ptr->mode & PNG_WROTE_eXIf) == 0)
+         png_write_eXIf(png_ptr, info_ptr->exif, info_ptr->num_exif);
 #endif
 
 #ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
@@ -489,6 +494,16 @@ png_convert_from_time_t(png_timep ptime, time_t ttime)
    png_debug(1, "in png_convert_from_time_t");
 
    tbuf = gmtime(&ttime);
+   if (tbuf == NULL)
+   {
+      /* TODO: add a safe function which takes a png_ptr argument and raises
+       * a png_error if the ttime argument is invalid and the call to gmtime
+       * fails as a consequence.
+       */
+      memset(ptime, 0, sizeof(*ptime));
+      return;
+   }
+
    png_convert_from_struct_tm(ptime, tbuf);
 }
 #endif
@@ -700,12 +715,12 @@ png_write_row(png_structrp png_ptr, png_const_bytep row)
    /* 1.5.6: moved from png_struct to be a local structure: */
    png_row_info row_info;
 
-   if (png_ptr == NULL)
-      return;
-
    png_debug2(1, "in png_write_row (row %u, pass %d)",
        png_ptr->row_number, png_ptr->pass);
 
+   if (png_ptr == NULL)
+      return;
+
    /* Initialize transformations and other stuff if first time */
    if (png_ptr->row_number == 0 && png_ptr->pass == 0)
    {
@@ -1196,6 +1211,8 @@ png_set_compression_strategy(png_structrp png_ptr, int strategy)
 void PNGAPI
 png_set_compression_window_bits(png_structrp png_ptr, int window_bits)
 {
+   png_debug(1, "in png_set_compression_window_bits");
+
    if (png_ptr == NULL)
       return;
 
@@ -1279,6 +1296,8 @@ png_set_text_compression_strategy(png_structrp png_ptr, int strategy)
 void PNGAPI
 png_set_text_compression_window_bits(png_structrp png_ptr, int window_bits)
 {
+   png_debug(1, "in png_set_text_compression_window_bits");
+
    if (png_ptr == NULL)
       return;
 
@@ -1316,6 +1335,8 @@ png_set_text_compression_method(png_structrp png_ptr, int method)
 void PNGAPI
 png_set_write_status_fn(png_structrp png_ptr, png_write_status_ptr write_row_fn)
 {
+   png_debug(1, "in png_set_write_status_fn");
+
    if (png_ptr == NULL)
       return;
 
@@ -1343,6 +1364,8 @@ void PNGAPI
 png_write_png(png_structrp png_ptr, png_inforp info_ptr,
     int transforms, voidp params)
 {
+   png_debug(1, "in png_write_png");
+
    if (png_ptr == NULL || info_ptr == NULL)
       return;
 
diff --git a/frmts/png/libpng/pngwutil.c b/frmts/png/libpng/pngwutil.c
index 16345e4c0baa..14cc4ce367fc 100644
--- a/frmts/png/libpng/pngwutil.c
+++ b/frmts/png/libpng/pngwutil.c
@@ -1,7 +1,7 @@
 
 /* pngwutil.c - utilities to write a PNG file
  *
- * Copyright (c) 2018 Cosmin Truta
+ * Copyright (c) 2018-2024 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -1747,7 +1747,7 @@ png_write_pCAL(png_structrp png_ptr, png_charp purpose, png_int_32 X0,
 {
    png_uint_32 purpose_len;
    size_t units_len, total_len;
-   png_size_tp params_len;
+   size_t *params_len;
    png_byte buf[10];
    png_byte new_purpose[80];
    int i;
@@ -1769,7 +1769,7 @@ png_write_pCAL(png_structrp png_ptr, png_charp purpose, png_int_32 X0,
    png_debug1(3, "pCAL units length = %d", (int)units_len);
    total_len = purpose_len + units_len + 10;
 
-   params_len = (png_size_tp)png_malloc(png_ptr,
+   params_len = (size_t *)png_malloc(png_ptr,
        (png_alloc_size_t)((png_alloc_size_t)nparams * (sizeof (size_t))));
 
    /* Find the length of each parameter, making sure we don't count the
@@ -2311,7 +2311,7 @@ png_setup_sub_row(png_structrp png_ptr, png_uint_32 bpp,
         break;
    }
 
-   return (sum);
+   return sum;
 }
 
 static void /* PRIVATE */
@@ -2361,7 +2361,7 @@ png_setup_up_row(png_structrp png_ptr, size_t row_bytes, size_t lmins)
         break;
    }
 
-   return (sum);
+   return sum;
 }
 static void /* PRIVATE */
 png_setup_up_row_only(png_structrp png_ptr, size_t row_bytes)
@@ -2417,7 +2417,7 @@ png_setup_avg_row(png_structrp png_ptr, png_uint_32 bpp,
         break;
    }
 
-   return (sum);
+   return sum;
 }
 static void /* PRIVATE */
 png_setup_avg_row_only(png_structrp png_ptr, png_uint_32 bpp,
@@ -2500,7 +2500,7 @@ png_setup_paeth_row(png_structrp png_ptr, png_uint_32 bpp,
         break;
    }
 
-   return (sum);
+   return sum;
 }
 static void /* PRIVATE */
 png_setup_paeth_row_only(png_structrp png_ptr, png_uint_32 bpp,
diff --git a/frmts/png/pngdataset.cpp b/frmts/png/pngdataset.cpp
index 2b6620d5cfef..5d49a9026392 100644
--- a/frmts/png/pngdataset.cpp
+++ b/frmts/png/pngdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2000, Frank Warmerdam
  * Copyright (c) 2007-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************
  *
  * ISSUES:
@@ -1604,11 +1588,12 @@ void PNGDataset::CollectXMPMetadata()
             if (memcmp(pszContent, "XML:com.adobe.xmp\0\0\0\0\0", 22) == 0)
             {
                 // Avoid setting the PAM dirty bit just for that.
-                int nOldPamFlags = nPamFlags;
+                const int nOldPamFlags = nPamFlags;
 
                 char *apszMDList[2] = {pszContent + 22, nullptr};
                 SetMetadata(apszMDList, "xml:XMP");
 
+                // cppcheck-suppress redundantAssignment
                 nPamFlags = nOldPamFlags;
 
                 VSIFree(pszContent);
@@ -1977,8 +1962,7 @@ GDALDataset *PNGDataset::OpenStage2(GDALOpenInfo *poOpenInfo, PNGDataset *&poDS)
     poDS->TryLoadXML(poOpenInfo->GetSiblingFiles());
 
     // Open overviews.
-    poDS->oOvManager.Initialize(poDS, poOpenInfo->pszFilename,
-                                poOpenInfo->GetSiblingFiles());
+    poDS->oOvManager.Initialize(poDS, poOpenInfo);
 
     return poDS;
 }
diff --git a/frmts/png/pngdataset.h b/frmts/png/pngdataset.h
index b6d2453749f7..19b726011b53 100644
--- a/frmts/png/pngdataset.h
+++ b/frmts/png/pngdataset.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2000, Frank Warmerdam
  * Copyright (c) 2007-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************
  *
  * ISSUES:
diff --git a/frmts/png/pngdrivercore.cpp b/frmts/png/pngdrivercore.cpp
index e73bd098d6ea..470ac833e705 100644
--- a/frmts/png/pngdrivercore.cpp
+++ b/frmts/png/pngdrivercore.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2000, Frank Warmerdam
  * Copyright (c) 2007-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************/
 
 #include "pngdrivercore.h"
diff --git a/frmts/png/pngdrivercore.h b/frmts/png/pngdrivercore.h
index 93c5e75f1290..a37d9611f5c3 100644
--- a/frmts/png/pngdrivercore.h
+++ b/frmts/png/pngdrivercore.h
@@ -8,23 +8,7 @@
  * Copyright (c) 2000, Frank Warmerdam
  * Copyright (c) 2007-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************/
 
 #ifndef PNGDRIVERCORE_H
diff --git a/frmts/postgisraster/postgisraster.h b/frmts/postgisraster/postgisraster.h
index 1208824e9852..5e21eb147938 100644
--- a/frmts/postgisraster/postgisraster.h
+++ b/frmts/postgisraster/postgisraster.h
@@ -13,25 +13,7 @@
  * Copyright (c) 2009 - 2013, Jorge Arevalo, David Zwarg
  * Copyright (c) 2013, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #ifndef POSTGISRASTER_H_INCLUDED
diff --git a/frmts/postgisraster/postgisrasterdataset.cpp b/frmts/postgisraster/postgisrasterdataset.cpp
index b9f246ccef38..25fa88210afa 100644
--- a/frmts/postgisraster/postgisrasterdataset.cpp
+++ b/frmts/postgisraster/postgisrasterdataset.cpp
@@ -13,25 +13,7 @@
  * Copyright (c) 2009 - 2013, Jorge Arevalo, David Zwarg
  * Copyright (c) 2013-2018, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "gdal_frmts.h"
diff --git a/frmts/postgisraster/postgisrasterdriver.cpp b/frmts/postgisraster/postgisrasterdriver.cpp
index f50ac1676819..2a2e3175eaa2 100644
--- a/frmts/postgisraster/postgisrasterdriver.cpp
+++ b/frmts/postgisraster/postgisrasterdriver.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2010, Jorge Arevalo, jorge.arevalo@deimos-space.com
  * Copyright (c) 2013, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************/
 #include "postgisraster.h"
 #include "cpl_multiproc.h"
diff --git a/frmts/postgisraster/postgisrasterdrivercore.cpp b/frmts/postgisraster/postgisrasterdrivercore.cpp
index ffd1d19c96b7..81a64d076d1a 100644
--- a/frmts/postgisraster/postgisrasterdrivercore.cpp
+++ b/frmts/postgisraster/postgisrasterdrivercore.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2010, Jorge Arevalo, jorge.arevalo@deimos-space.com
  * Copyright (c) 2013, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************/
 
 #include <stdexcept>
diff --git a/frmts/postgisraster/postgisrasterdrivercore.h b/frmts/postgisraster/postgisrasterdrivercore.h
index fecc7eddde5a..102d7242d0b6 100644
--- a/frmts/postgisraster/postgisrasterdrivercore.h
+++ b/frmts/postgisraster/postgisrasterdrivercore.h
@@ -10,23 +10,7 @@
  * Copyright (c) 2010, Jorge Arevalo, jorge.arevalo@deimos-space.com
  * Copyright (c) 2013, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************/
 
 #ifndef POSTGISRASTERDRIVERCORE_H
diff --git a/frmts/postgisraster/postgisrasterrasterband.cpp b/frmts/postgisraster/postgisrasterrasterband.cpp
index 149ea4cada3e..17d2e05bc7d3 100644
--- a/frmts/postgisraster/postgisrasterrasterband.cpp
+++ b/frmts/postgisraster/postgisrasterrasterband.cpp
@@ -13,25 +13,7 @@
  * Copyright (c) 2009 - 2013, Jorge Arevalo, David Zwarg
  * Copyright (c) 2013-2018, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 #include "postgisraster.h"
 
diff --git a/frmts/postgisraster/postgisrastertiledataset.cpp b/frmts/postgisraster/postgisrastertiledataset.cpp
index 08d85afbc221..82490d5d83cb 100644
--- a/frmts/postgisraster/postgisrastertiledataset.cpp
+++ b/frmts/postgisraster/postgisrastertiledataset.cpp
@@ -11,25 +11,7 @@
  * Copyright (c) 2013, Jorge Arevalo
  * Copyright (c) 2013, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ************************************************************************/
 #include "postgisraster.h"
 
diff --git a/frmts/postgisraster/postgisrastertilerasterband.cpp b/frmts/postgisraster/postgisrastertilerasterband.cpp
index 66ca757231db..4d74a96afce8 100644
--- a/frmts/postgisraster/postgisrastertilerasterband.cpp
+++ b/frmts/postgisraster/postgisrastertilerasterband.cpp
@@ -11,25 +11,7 @@
  * Copyright (c) 2009 - 2013, Jorge Arevalo
  * Copyright (c) 2013-2018, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 #include "postgisraster.h"
 #include <memory>
diff --git a/frmts/postgisraster/postgisrastertools.cpp b/frmts/postgisraster/postgisrastertools.cpp
index 47fc0ad44567..3c4de4e78671 100644
--- a/frmts/postgisraster/postgisrastertools.cpp
+++ b/frmts/postgisraster/postgisrastertools.cpp
@@ -12,25 +12,7 @@
  ***********************************************************************
  * Copyright (c) 2009 - 2013, Jorge Arevalo, David Zwarg
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 #include "postgisraster.h"
 
diff --git a/frmts/prf/phprfdataset.cpp b/frmts/prf/phprfdataset.cpp
index 836d26cb5a38..05665f297415 100644
--- a/frmts/prf/phprfdataset.cpp
+++ b/frmts/prf/phprfdataset.cpp
@@ -4,23 +4,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Andrew Sudorgin
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_minixml.h"
diff --git a/frmts/r/rcreatecopy.cpp b/frmts/r/rcreatecopy.cpp
index f84f0f3ff368..54ff8dbada78 100644
--- a/frmts/r/rcreatecopy.cpp
+++ b/frmts/r/rcreatecopy.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2009, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/r/rdataset.cpp b/frmts/r/rdataset.cpp
index 072645b77daa..e239a6c8a54c 100644
--- a/frmts/r/rdataset.cpp
+++ b/frmts/r/rdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2009, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/r/rdataset.h b/frmts/r/rdataset.h
index 9242697aa9b7..d3ed41cf1d53 100644
--- a/frmts/r/rdataset.h
+++ b/frmts/r/rdataset.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2009, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef RDATASET_H_INCLUDED
diff --git a/frmts/rasterlite/rasterlitecreatecopy.cpp b/frmts/rasterlite/rasterlitecreatecopy.cpp
index fba77104823c..70f424cbc0e9 100644
--- a/frmts/rasterlite/rasterlitecreatecopy.cpp
+++ b/frmts/rasterlite/rasterlitecreatecopy.cpp
@@ -7,23 +7,7 @@
  **********************************************************************
  * Copyright (c) 2009-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
@@ -101,7 +85,7 @@ char **RasterliteGetTileDriverOptions(CSLConstList papszOptions)
 /*                      RasterliteInsertSRID ()                         */
 /************************************************************************/
 
-static int RasterliteInsertSRID(OGRDataSourceH hDS, const char *pszWKT)
+static int RasterliteInsertSRID(GDALDatasetH hDS, const char *pszWKT)
 {
     int nAuthorityCode = 0;
     CPLString osAuthorityName, osProjCS, osProj4;
@@ -143,7 +127,7 @@ static int RasterliteInsertSRID(OGRDataSourceH hDS, const char *pszWKT)
         osSQL.Printf("SELECT srid FROM spatial_ref_sys WHERE auth_srid = %d",
                      nAuthorityCode);
         OGRLayerH hLyr =
-            OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
+            GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
         if (hLyr == nullptr)
         {
             nSRSId = nAuthorityCode;
@@ -162,7 +146,7 @@ static int RasterliteInsertSRID(OGRDataSourceH hDS, const char *pszWKT)
                              nSRSId, osAuthorityName.c_str(), nAuthorityCode,
                              osProj4.c_str());
 
-            OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
+            GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
         }
         else
         {
@@ -172,7 +156,7 @@ static int RasterliteInsertSRID(OGRDataSourceH hDS, const char *pszWKT)
                 nSRSId = OGR_F_GetFieldAsInteger(hFeat, 0);
                 OGR_F_Destroy(hFeat);
             }
-            OGR_DS_ReleaseResultSet(hDS, hLyr);
+            GDALDatasetReleaseResultSet(hDS, hLyr);
         }
     }
 
@@ -183,13 +167,13 @@ static int RasterliteInsertSRID(OGRDataSourceH hDS, const char *pszWKT)
 /*                     RasterliteCreateTables ()                        */
 /************************************************************************/
 
-static OGRDataSourceH RasterliteCreateTables(OGRDataSourceH hDS,
-                                             const char *pszTableName,
-                                             int nSRSId, int bWipeExistingData)
+static GDALDatasetH RasterliteCreateTables(GDALDatasetH hDS,
+                                           const char *pszTableName, int nSRSId,
+                                           int bWipeExistingData)
 {
     CPLString osSQL;
 
-    const CPLString osDBName = OGR_DS_GetName(hDS);
+    const CPLString osDBName = GDALGetDescription(hDS);
 
     CPLString osRasterLayer;
     osRasterLayer.Printf("%s_rasters", pszTableName);
@@ -199,7 +183,7 @@ static OGRDataSourceH RasterliteCreateTables(OGRDataSourceH hDS,
 
     OGRLayerH hLyr;
 
-    if (OGR_DS_GetLayerByName(hDS, osRasterLayer.c_str()) == nullptr)
+    if (GDALDatasetGetLayerByName(hDS, osRasterLayer.c_str()) == nullptr)
     {
         /* --------------------------------------------------------------------
          */
@@ -212,7 +196,7 @@ static OGRDataSourceH RasterliteCreateTables(OGRDataSourceH hDS,
                      "id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,"
                      "raster BLOB NOT NULL)",
                      osRasterLayer.c_str());
-        OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
+        GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
 
         /* Create _metadata table */
         osSQL.Printf("CREATE TABLE \"%s\" ("
@@ -224,42 +208,42 @@ static OGRDataSourceH RasterliteCreateTables(OGRDataSourceH hDS,
                      "pixel_x_size DOUBLE NOT NULL,"
                      "pixel_y_size DOUBLE NOT NULL)",
                      osMetadataLayer.c_str());
-        OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
+        GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
 
         /* Add geometry column to _metadata table */
         osSQL.Printf(
             "SELECT AddGeometryColumn('%s', 'geometry', %d, 'POLYGON', 2)",
             osMetadataLayer.c_str(), nSRSId);
-        if ((hLyr = OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr)) ==
-            nullptr)
+        if ((hLyr = GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr,
+                                          nullptr)) == nullptr)
         {
             CPLError(CE_Failure, CPLE_AppDefined,
                      "Check that the OGR SQLite driver has Spatialite support");
-            OGRReleaseDataSource(hDS);
+            GDALClose(hDS);
             return nullptr;
         }
-        OGR_DS_ReleaseResultSet(hDS, hLyr);
+        GDALDatasetReleaseResultSet(hDS, hLyr);
 
         /* Create spatial index on _metadata table */
         osSQL.Printf("SELECT CreateSpatialIndex('%s', 'geometry')",
                      osMetadataLayer.c_str());
-        if ((hLyr = OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr)) ==
-            nullptr)
+        if ((hLyr = GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr,
+                                          nullptr)) == nullptr)
         {
-            OGRReleaseDataSource(hDS);
+            GDALClose(hDS);
             return nullptr;
         }
-        OGR_DS_ReleaseResultSet(hDS, hLyr);
+        GDALDatasetReleaseResultSet(hDS, hLyr);
 
         /* Create statistics tables */
         osSQL.Printf("SELECT UpdateLayerStatistics()");
         CPLPushErrorHandler(CPLQuietErrorHandler);
-        hLyr = OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
+        hLyr = GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
         CPLPopErrorHandler();
-        OGR_DS_ReleaseResultSet(hDS, hLyr);
+        GDALDatasetReleaseResultSet(hDS, hLyr);
 
         /* Re-open the DB to take into account the new tables*/
-        OGRReleaseDataSource(hDS);
+        GDALClose(hDS);
 
         hDS = RasterliteOpenSQLiteDB(osDBName.c_str(), GA_Update);
     }
@@ -270,7 +254,7 @@ static OGRDataSourceH RasterliteCreateTables(OGRDataSourceH hDS,
         osSQL.Printf(
             "SELECT srid FROM geometry_columns WHERE f_table_name = '%s'",
             osMetadataLayer.c_str());
-        hLyr = OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
+        hLyr = GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
         if (hLyr)
         {
             int nExistingSRID = -1;
@@ -280,7 +264,7 @@ static OGRDataSourceH RasterliteCreateTables(OGRDataSourceH hDS,
                 nExistingSRID = OGR_F_GetFieldAsInteger(hFeat, 0);
                 OGR_F_Destroy(hFeat);
             }
-            OGR_DS_ReleaseResultSet(hDS, hLyr);
+            GDALDatasetReleaseResultSet(hDS, hLyr);
 
             if (nExistingSRID != nSRSId)
             {
@@ -289,10 +273,10 @@ static OGRDataSourceH RasterliteCreateTables(OGRDataSourceH hDS,
                     osSQL.Printf("UPDATE geometry_columns SET srid = %d "
                                  "WHERE f_table_name = \"%s\"",
                                  nSRSId, osMetadataLayer.c_str());
-                    OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
+                    GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
 
                     /* Re-open the DB to take into account the change of SRS */
-                    OGRReleaseDataSource(hDS);
+                    GDALClose(hDS);
 
                     hDS = RasterliteOpenSQLiteDB(osDBName.c_str(), GA_Update);
                 }
@@ -300,7 +284,7 @@ static OGRDataSourceH RasterliteCreateTables(OGRDataSourceH hDS,
                 {
                     CPLError(CE_Failure, CPLE_NotSupported,
                              "New data has not the same SRS as existing data");
-                    OGRReleaseDataSource(hDS);
+                    GDALClose(hDS);
                     return nullptr;
                 }
             }
@@ -309,10 +293,10 @@ static OGRDataSourceH RasterliteCreateTables(OGRDataSourceH hDS,
         if (bWipeExistingData)
         {
             osSQL.Printf("DELETE FROM \"%s\"", osRasterLayer.c_str());
-            OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
+            GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
 
             osSQL.Printf("DELETE FROM \"%s\"", osMetadataLayer.c_str());
-            OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
+            GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
         }
     }
 
@@ -468,20 +452,20 @@ GDALDataset *RasterliteCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
     /*      Create or open the SQLite DB                                    */
     /* -------------------------------------------------------------------- */
 
-    OGRSFDriverH hSQLiteDriver = OGRGetDriverByName("SQLite");
+    GDALDriverH hSQLiteDriver = GDALGetDriverByName("SQLite");
     if (hSQLiteDriver == nullptr)
     {
         CPLError(CE_Failure, CPLE_AppDefined, "Cannot load OGR SQLite driver");
         return nullptr;
     }
 
-    OGRDataSourceH hDS;
+    GDALDatasetH hDS;
 
     if (!bExists)
     {
         char **papszOGROptions = CSLAddString(nullptr, "SPATIALITE=YES");
-        hDS = OGR_Dr_CreateDataSource(hSQLiteDriver, osDBName.c_str(),
-                                      papszOGROptions);
+        hDS = GDALCreate(hSQLiteDriver, osDBName.c_str(), 0, 0, 0, GDT_Unknown,
+                         papszOGROptions);
         CSLDestroy(papszOGROptions);
     }
     else
@@ -514,14 +498,15 @@ GDALDataset *RasterliteCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
     if (hDS == nullptr)
         return nullptr;
 
-    OGRLayerH hRasterLayer = OGR_DS_GetLayerByName(hDS, osRasterLayer.c_str());
+    OGRLayerH hRasterLayer =
+        GDALDatasetGetLayerByName(hDS, osRasterLayer.c_str());
     OGRLayerH hMetadataLayer =
-        OGR_DS_GetLayerByName(hDS, osMetadataLayer.c_str());
+        GDALDatasetGetLayerByName(hDS, osMetadataLayer.c_str());
     if (hRasterLayer == nullptr || hMetadataLayer == nullptr)
     {
         CPLError(CE_Failure, CPLE_AppDefined,
                  "Cannot find metadata and/or raster tables");
-        OGRReleaseDataSource(hDS);
+        GDALClose(hDS);
         return nullptr;
     }
 
@@ -545,7 +530,7 @@ GDALDataset *RasterliteCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
 
     int nOverlappingGeoms = 0;
     OGRLayerH hCountLyr =
-        OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
+        GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
     if (hCountLyr)
     {
         OGRFeatureH hFeat = OGR_L_GetNextFeature(hCountLyr);
@@ -554,7 +539,7 @@ GDALDataset *RasterliteCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
             nOverlappingGeoms = OGR_F_GetFieldAsInteger(hFeat, 0);
             OGR_F_Destroy(hFeat);
         }
-        OGR_DS_ReleaseResultSet(hDS, hCountLyr);
+        GDALDatasetReleaseResultSet(hDS, hCountLyr);
     }
 
     if (nOverlappingGeoms != 0)
@@ -577,12 +562,12 @@ GDALDataset *RasterliteCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
         nBlockXSize, nBlockYSize, cpl::fits_on<int>(nBands * nDataTypeSize)));
     if (pabyMEMDSBuffer == nullptr)
     {
-        OGRReleaseDataSource(hDS);
+        GDALClose(hDS);
         return nullptr;
     }
 
-    CPLString osTempFileName;
-    osTempFileName.Printf("/vsimem/%p", hDS);
+    const CPLString osTempFileName(
+        VSIMemGenerateHiddenFilename("rasterlite_tile"));
 
     int nTileId = 0;
     int nBlocks = 0;
@@ -591,7 +576,7 @@ GDALDataset *RasterliteCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
     char **papszTileDriverOptions =
         RasterliteGetTileDriverOptions(papszOptions);
 
-    OGR_DS_ExecuteSQL(hDS, "BEGIN", nullptr, nullptr);
+    GDALDatasetExecuteSQL(hDS, "BEGIN", nullptr, nullptr);
 
     CPLErr eErr = CE_None;
     for (int nBlockYOff = 0; eErr == CE_None && nBlockYOff < nYBlocks;
@@ -718,15 +703,15 @@ GDALDataset *RasterliteCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
     VSIUnlink((osTempFileName + ".aux.xml").c_str());
 
     if (eErr == CE_None)
-        OGR_DS_ExecuteSQL(hDS, "COMMIT", nullptr, nullptr);
+        GDALDatasetExecuteSQL(hDS, "COMMIT", nullptr, nullptr);
     else
-        OGR_DS_ExecuteSQL(hDS, "ROLLBACK", nullptr, nullptr);
+        GDALDatasetExecuteSQL(hDS, "ROLLBACK", nullptr, nullptr);
 
     CSLDestroy(papszTileDriverOptions);
 
     VSIFree(pabyMEMDSBuffer);
 
-    OGRReleaseDataSource(hDS);
+    GDALClose(hDS);
 
     if (eErr == CE_Failure)
         return nullptr;
diff --git a/frmts/rasterlite/rasterlitedataset.cpp b/frmts/rasterlite/rasterlitedataset.cpp
index a85cf6fafa4a..6709c2da0cb9 100644
--- a/frmts/rasterlite/rasterlitedataset.cpp
+++ b/frmts/rasterlite/rasterlitedataset.cpp
@@ -7,23 +7,7 @@
  **********************************************************************
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
@@ -41,14 +25,13 @@
 /*                        RasterliteOpenSQLiteDB()                      */
 /************************************************************************/
 
-OGRDataSourceH RasterliteOpenSQLiteDB(const char *pszFilename,
-                                      GDALAccess eAccess)
+GDALDatasetH RasterliteOpenSQLiteDB(const char *pszFilename, GDALAccess eAccess)
 {
     const char *const apszAllowedDrivers[] = {"SQLITE", nullptr};
-    return reinterpret_cast<OGRDataSourceH>(GDALOpenEx(
-        pszFilename,
-        GDAL_OF_VECTOR | ((eAccess == GA_Update) ? GDAL_OF_UPDATE : 0),
-        apszAllowedDrivers, nullptr, nullptr));
+    return GDALOpenEx(pszFilename,
+                      GDAL_OF_VECTOR |
+                          ((eAccess == GA_Update) ? GDAL_OF_UPDATE : 0),
+                      apszAllowedDrivers, nullptr, nullptr);
 }
 
 /************************************************************************/
@@ -148,7 +131,7 @@ CPLErr RasterliteBand::IReadBlock(int nBlockXOff, int nBlockYOff, void *pImage)
                      .c_str());
 
     OGRLayerH hSQLLyr =
-        OGR_DS_ExecuteSQL(poGDS->hDS, osSQL.c_str(), nullptr, nullptr);
+        GDALDatasetExecuteSQL(poGDS->hDS, osSQL.c_str(), nullptr, nullptr);
     if (hSQLLyr == nullptr)
     {
         memset(pImage, 0,
@@ -156,8 +139,8 @@ CPLErr RasterliteBand::IReadBlock(int nBlockXOff, int nBlockYOff, void *pImage)
         return CE_None;
     }
 
-    CPLString osMemFileName;
-    osMemFileName.Printf("/vsimem/%p", this);
+    const CPLString osMemFileName(
+        VSIMemGenerateHiddenFilename("rasterlite_tile"));
 
 #ifdef RASTERLITE_DEBUG
     if (nBand == 1)
@@ -180,7 +163,7 @@ CPLErr RasterliteBand::IReadBlock(int nBlockXOff, int nBlockYOff, void *pImage)
         {
             CPLError(CE_Failure, CPLE_AppDefined, "null geometry found");
             OGR_F_Destroy(hFeat);
-            OGR_DS_ReleaseResultSet(poGDS->hDS, hSQLLyr);
+            GDALDatasetReleaseResultSet(poGDS->hDS, hSQLLyr);
             memset(pImage, 0,
                    static_cast<size_t>(nBlockXSize) * nBlockYSize *
                        nDataTypeSize);
@@ -204,7 +187,7 @@ CPLErr RasterliteBand::IReadBlock(int nBlockXOff, int nBlockYOff, void *pImage)
         {
             CPLError(CE_Failure, CPLE_AppDefined, "invalid tile size");
             OGR_F_Destroy(hFeat);
-            OGR_DS_ReleaseResultSet(poGDS->hDS, hSQLLyr);
+            GDALDatasetReleaseResultSet(poGDS->hDS, hSQLLyr);
             memset(pImage, 0,
                    static_cast<size_t>(nBlockXSize) * nBlockYSize *
                        nDataTypeSize);
@@ -221,7 +204,7 @@ CPLErr RasterliteBand::IReadBlock(int nBlockXOff, int nBlockYOff, void *pImage)
         {
             CPLError(CE_Failure, CPLE_AppDefined, "invalid geometry");
             OGR_F_Destroy(hFeat);
-            OGR_DS_ReleaseResultSet(poGDS->hDS, hSQLLyr);
+            GDALDatasetReleaseResultSet(poGDS->hDS, hSQLLyr);
             memset(pImage, 0,
                    static_cast<size_t>(nBlockXSize) * nBlockYSize *
                        nDataTypeSize);
@@ -554,7 +537,7 @@ CPLErr RasterliteBand::IReadBlock(int nBlockXOff, int nBlockYOff, void *pImage)
                static_cast<size_t>(nBlockXSize) * nBlockYSize * nDataTypeSize);
     }
 
-    OGR_DS_ReleaseResultSet(poGDS->hDS, hSQLLyr);
+    GDALDatasetReleaseResultSet(poGDS->hDS, hSQLLyr);
 
 #ifdef RASTERLITE_DEBUG
     if (nBand == 1)
@@ -741,7 +724,7 @@ int RasterliteDataset::CloseDependentDatasets()
         }
 
         if (hDS != nullptr)
-            OGRReleaseDataSource(hDS);
+            GDALClose(hDS);
         hDS = nullptr;
 
         CPLFree(padfXResolutions);
@@ -884,7 +867,8 @@ int RasterliteDataset::GetBlockParams(OGRLayerH hRasterLyr, int nLevelIn,
                                             padfYResolutions[nLevelIn], "m.")
                      .c_str());
 
-    OGRLayerH hSQLLyr = OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
+    OGRLayerH hSQLLyr =
+        GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
     if (hSQLLyr == nullptr)
     {
         return FALSE;
@@ -893,7 +877,7 @@ int RasterliteDataset::GetBlockParams(OGRLayerH hRasterLyr, int nLevelIn,
     OGRFeatureH hFeat = OGR_L_GetNextFeature(hRasterLyr);
     if (hFeat == nullptr)
     {
-        OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+        GDALDatasetReleaseResultSet(hDS, hSQLLyr);
         return FALSE;
     }
 
@@ -908,12 +892,12 @@ int RasterliteDataset::GetBlockParams(OGRLayerH hRasterLyr, int nLevelIn,
                  "Rasterlite driver no longer support WAVELET compressed "
                  "images");
         OGR_F_Destroy(hFeat);
-        OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+        GDALDatasetReleaseResultSet(hDS, hSQLLyr);
         return FALSE;
     }
 
-    CPLString osMemFileName;
-    osMemFileName.Printf("/vsimem/%p", this);
+    const CPLString osMemFileName(
+        VSIMemGenerateHiddenFilename("rasterlite_tile"));
     VSILFILE *fp =
         VSIFileFromMemBuffer(osMemFileName.c_str(), pabyData, nDataSize, FALSE);
     VSIFCloseL(fp);
@@ -985,7 +969,7 @@ int RasterliteDataset::GetBlockParams(OGRLayerH hRasterLyr, int nLevelIn,
 
     OGR_F_Destroy(hFeat);
 
-    OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+    GDALDatasetReleaseResultSet(hDS, hSQLLyr);
 
     return hDSTile != nullptr;
 }
@@ -1085,7 +1069,7 @@ GDALDataset *RasterliteDataset::Open(GDALOpenInfo *poOpenInfo)
     /*      Open underlying OGR DB                                          */
     /* -------------------------------------------------------------------- */
 
-    OGRDataSourceH hDS =
+    GDALDatasetH hDS =
         RasterliteOpenSQLiteDB(osFileName.c_str(), poOpenInfo->eAccess);
     CPLDebug("RASTERLITE", "SQLite DB Open");
 
@@ -1097,7 +1081,7 @@ GDALDataset *RasterliteDataset::Open(GDALOpenInfo *poOpenInfo)
     if (osTableName.empty())
     {
         int nCountSubdataset = 0;
-        const int nLayers = OGR_DS_GetLayerCount(hDS);
+        const int nLayers = GDALDatasetGetLayerCount(hDS);
         /* --------------------------------------------------------------------
          */
         /*      Add raster layers as subdatasets */
@@ -1105,7 +1089,7 @@ GDALDataset *RasterliteDataset::Open(GDALOpenInfo *poOpenInfo)
          */
         for (int i = 0; i < nLayers; i++)
         {
-            OGRLayerH hLyr = OGR_DS_GetLayer(hDS, i);
+            OGRLayerH hLyr = GDALDatasetGetLayer(hDS, i);
             const std::string osLayerName = OGR_L_GetName(hLyr);
             const auto nPosMetadata = osLayerName.find("_metadata");
             if (nPosMetadata != std::string::npos)
@@ -1116,7 +1100,7 @@ GDALDataset *RasterliteDataset::Open(GDALOpenInfo *poOpenInfo)
                 const std::string osRasterTableName =
                     std::string(osShortName).append("_rasters");
 
-                if (OGR_DS_GetLayerByName(hDS, osRasterTableName.c_str()) !=
+                if (GDALDatasetGetLayerByName(hDS, osRasterTableName.c_str()) !=
                     nullptr)
                 {
                     if (poDS == nullptr)
@@ -1166,14 +1150,14 @@ GDALDataset *RasterliteDataset::Open(GDALOpenInfo *poOpenInfo)
         const CPLString osMetadataTableName = osTableName + "_metadata";
 
         OGRLayerH hMetadataLyr =
-            OGR_DS_GetLayerByName(hDS, osMetadataTableName.c_str());
+            GDALDatasetGetLayerByName(hDS, osMetadataTableName.c_str());
         if (hMetadataLyr == nullptr)
             goto end;
 
         const CPLString osRasterTableName = osTableName + "_rasters";
 
         OGRLayerH hRasterLyr =
-            OGR_DS_GetLayerByName(hDS, osRasterTableName.c_str());
+            GDALDatasetGetLayerByName(hDS, osRasterTableName.c_str());
         if (hRasterLyr == nullptr)
             goto end;
 
@@ -1187,7 +1171,7 @@ GDALDataset *RasterliteDataset::Open(GDALOpenInfo *poOpenInfo)
         int nResolutions = 0;
 
         OGRLayerH hRasterPyramidsLyr =
-            OGR_DS_GetLayerByName(hDS, "raster_pyramids");
+            GDALDatasetGetLayerByName(hDS, "raster_pyramids");
         if (hRasterPyramidsLyr)
         {
             osSQL.Printf("SELECT pixel_x_size, pixel_y_size "
@@ -1195,14 +1179,15 @@ GDALDataset *RasterliteDataset::Open(GDALOpenInfo *poOpenInfo)
                          "ORDER BY pixel_x_size ASC",
                          osTableName.c_str());
 
-            hSQLLyr = OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
+            hSQLLyr =
+                GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
             if (hSQLLyr != nullptr)
             {
                 nResolutions =
                     static_cast<int>(OGR_L_GetFeatureCount(hSQLLyr, TRUE));
                 if (nResolutions == 0)
                 {
-                    OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+                    GDALDatasetReleaseResultSet(hDS, hSQLLyr);
                     hSQLLyr = nullptr;
                 }
             }
@@ -1217,7 +1202,8 @@ GDALDataset *RasterliteDataset::Open(GDALOpenInfo *poOpenInfo)
                          "ORDER BY pixel_x_size ASC",
                          osTableName.c_str());
 
-            hSQLLyr = OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
+            hSQLLyr =
+                GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
             if (hSQLLyr == nullptr)
                 goto end;
 
@@ -1226,7 +1212,7 @@ GDALDataset *RasterliteDataset::Open(GDALOpenInfo *poOpenInfo)
 
             if (nResolutions == 0)
             {
-                OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+                GDALDatasetReleaseResultSet(hDS, hSQLLyr);
                 goto end;
             }
         }
@@ -1304,7 +1290,7 @@ GDALDataset *RasterliteDataset::Open(GDALOpenInfo *poOpenInfo)
                              "res=%d, xres=%.15f, yres=%.15f", i,
                              poDS->padfXResolutions[i],
                              poDS->padfYResolutions[i]);
-                    OGR_DS_ReleaseResultSet(poDS->hDS, hSQLLyr);
+                    GDALDatasetReleaseResultSet(poDS->hDS, hSQLLyr);
                     delete poDS;
                     poDS = nullptr;
                     goto end;
@@ -1313,7 +1299,7 @@ GDALDataset *RasterliteDataset::Open(GDALOpenInfo *poOpenInfo)
             }
         }
 
-        OGR_DS_ReleaseResultSet(poDS->hDS, hSQLLyr);
+        GDALDatasetReleaseResultSet(poDS->hDS, hSQLLyr);
         hSQLLyr = nullptr;
 
         /* --------------------------------------------------------------------
@@ -1481,7 +1467,7 @@ GDALDataset *RasterliteDataset::Open(GDALOpenInfo *poOpenInfo)
 
 end:
     if (hDS)
-        OGRReleaseDataSource(hDS);
+        GDALClose(hDS);
 
     return poDS;
 }
diff --git a/frmts/rasterlite/rasterlitedataset.h b/frmts/rasterlite/rasterlitedataset.h
index 48b7c1354945..227c549f5a46 100644
--- a/frmts/rasterlite/rasterlitedataset.h
+++ b/frmts/rasterlite/rasterlitedataset.h
@@ -8,23 +8,7 @@
  **********************************************************************
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef RASTERLITE_DATASET_INCLUDED
@@ -35,8 +19,8 @@
 
 char **RasterliteGetTileDriverOptions(CSLConstList papszOptions);
 
-OGRDataSourceH RasterliteOpenSQLiteDB(const char *pszFilename,
-                                      GDALAccess eAccess);
+GDALDatasetH RasterliteOpenSQLiteDB(const char *pszFilename,
+                                    GDALAccess eAccess);
 CPLString RasterliteGetPixelSizeCond(double dfPixelXSize, double dfPixelYSize,
                                      const char *pszTablePrefixWithDot = "");
 CPLString RasterliteGetSpatialFilterCond(double minx, double miny, double maxx,
@@ -109,7 +93,7 @@ class RasterliteDataset final : public GDALPamDataset
     int bCheckForExistingOverview;
     CPLString osOvrFileName;
 
-    OGRDataSourceH hDS;
+    GDALDatasetH hDS;
 
     int m_nLastBadTileId = -1;
 
diff --git a/frmts/rasterlite/rasterlitedrivercore.cpp b/frmts/rasterlite/rasterlitedrivercore.cpp
index 8bf27b536b89..89f049bfeda9 100644
--- a/frmts/rasterlite/rasterlitedrivercore.cpp
+++ b/frmts/rasterlite/rasterlitedrivercore.cpp
@@ -7,23 +7,7 @@
  **********************************************************************
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "rasterlitedrivercore.h"
diff --git a/frmts/rasterlite/rasterlitedrivercore.h b/frmts/rasterlite/rasterlitedrivercore.h
index ebf2585aa1c5..9433130ed389 100644
--- a/frmts/rasterlite/rasterlitedrivercore.h
+++ b/frmts/rasterlite/rasterlitedrivercore.h
@@ -7,23 +7,7 @@
  **********************************************************************
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef RASTERLITEDRIVERCORE_H
diff --git a/frmts/rasterlite/rasterliteoverviews.cpp b/frmts/rasterlite/rasterliteoverviews.cpp
index bc6599d9fb0c..62707d8b1ed7 100644
--- a/frmts/rasterlite/rasterliteoverviews.cpp
+++ b/frmts/rasterlite/rasterliteoverviews.cpp
@@ -7,23 +7,7 @@
  **********************************************************************
  * Copyright (c) 2009-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
@@ -48,7 +32,7 @@ CPLErr RasterliteDataset::ReloadOverviews()
 
     CPLString osSQL;
     OGRLayerH hRasterPyramidsLyr =
-        OGR_DS_GetLayerByName(hDS, "raster_pyramids");
+        GDALDatasetGetLayerByName(hDS, "raster_pyramids");
     if (hRasterPyramidsLyr)
     {
         osSQL.Printf("SELECT pixel_x_size, pixel_y_size "
@@ -64,7 +48,8 @@ CPLErr RasterliteDataset::ReloadOverviews()
                      osTableName.c_str());
     }
 
-    OGRLayerH hSQLLyr = OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
+    OGRLayerH hSQLLyr =
+        GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
     if (hSQLLyr == nullptr)
     {
         if (hRasterPyramidsLyr == nullptr)
@@ -75,7 +60,7 @@ CPLErr RasterliteDataset::ReloadOverviews()
                      "ORDER BY pixel_x_size ASC",
                      osTableName.c_str());
 
-        hSQLLyr = OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
+        hSQLLyr = GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
         if (hSQLLyr == nullptr)
             return CE_Failure;
     }
@@ -118,7 +103,7 @@ CPLErr RasterliteDataset::ReloadOverviews()
         }
     }
 
-    OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+    GDALDatasetReleaseResultSet(hDS, hSQLLyr);
     hSQLLyr = nullptr;
 
     /* -------------------------------------------------------------------- */
@@ -130,7 +115,7 @@ CPLErr RasterliteDataset::ReloadOverviews()
         osRasterTableName += "_rasters";
 
         OGRLayerH hRasterLyr =
-            OGR_DS_GetLayerByName(hDS, osRasterTableName.c_str());
+            GDALDatasetGetLayerByName(hDS, osRasterTableName.c_str());
 
         papoOverviews = reinterpret_cast<RasterliteDataset **>(
             CPLCalloc(nResolutions - 1, sizeof(RasterliteDataset *)));
@@ -178,7 +163,7 @@ CPLErr RasterliteDataset::CleanOverviews()
         return CE_Failure;
 
     CPLString osSQL("BEGIN");
-    OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
+    GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
 
     const CPLString osResolutionCond =
         "NOT " +
@@ -188,24 +173,24 @@ CPLErr RasterliteDataset::CleanOverviews()
                  "IN(SELECT id FROM \"%s_metadata\" WHERE %s)",
                  osTableName.c_str(), osTableName.c_str(),
                  osResolutionCond.c_str());
-    OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
+    GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
 
     osSQL.Printf("DELETE FROM \"%s_metadata\" WHERE %s", osTableName.c_str(),
                  osResolutionCond.c_str());
-    OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
+    GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
 
     OGRLayerH hRasterPyramidsLyr =
-        OGR_DS_GetLayerByName(hDS, "raster_pyramids");
+        GDALDatasetGetLayerByName(hDS, "raster_pyramids");
     if (hRasterPyramidsLyr)
     {
         osSQL.Printf(
             "DELETE FROM raster_pyramids WHERE table_prefix = '%s' AND %s",
             osTableName.c_str(), osResolutionCond.c_str());
-        OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
+        GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
     }
 
     osSQL = "COMMIT";
-    OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
+    GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
 
     for (int i = 1; i < nResolutions; i++)
         delete papoOverviews[i - 1];
@@ -246,7 +231,7 @@ CPLErr RasterliteDataset::CleanOverviewLevel(int nOvrFactor)
     /* -------------------------------------------------------------------- */
 
     CPLString osSQL("BEGIN");
-    OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
+    GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
 
     CPLString osResolutionCond = RasterliteGetPixelSizeCond(
         padfXResolutions[iLev], padfYResolutions[iLev]);
@@ -255,24 +240,24 @@ CPLErr RasterliteDataset::CleanOverviewLevel(int nOvrFactor)
                  "IN(SELECT id FROM \"%s_metadata\" WHERE %s)",
                  osTableName.c_str(), osTableName.c_str(),
                  osResolutionCond.c_str());
-    OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
+    GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
 
     osSQL.Printf("DELETE FROM \"%s_metadata\" WHERE %s", osTableName.c_str(),
                  osResolutionCond.c_str());
-    OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
+    GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
 
     OGRLayerH hRasterPyramidsLyr =
-        OGR_DS_GetLayerByName(hDS, "raster_pyramids");
+        GDALDatasetGetLayerByName(hDS, "raster_pyramids");
     if (hRasterPyramidsLyr)
     {
         osSQL.Printf(
             "DELETE FROM raster_pyramids WHERE table_prefix = '%s' AND %s",
             osTableName.c_str(), osResolutionCond.c_str());
-        OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
+        GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
     }
 
     osSQL = "COMMIT";
-    OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
+    GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
 
     return CE_None;
 }
@@ -350,8 +335,8 @@ CPLErr RasterliteDataset::CreateOverviewLevel(const char *pszResampling,
         return CE_Failure;
     }
 
-    CPLString osTempFileName;
-    osTempFileName.Printf("/vsimem/%p", hDS);
+    const CPLString osTempFileName(
+        VSIMemGenerateHiddenFilename("rasterlite_tile"));
 
     int nTileId = 0;
     int nBlocks = 0;
@@ -366,9 +351,10 @@ CPLErr RasterliteDataset::CreateOverviewLevel(const char *pszResampling,
     CPLString osMetatadataLayer;
     osMetatadataLayer.Printf("%s_metadata", osTableName.c_str());
 
-    OGRLayerH hRasterLayer = OGR_DS_GetLayerByName(hDS, osRasterLayer.c_str());
+    OGRLayerH hRasterLayer =
+        GDALDatasetGetLayerByName(hDS, osRasterLayer.c_str());
     OGRLayerH hMetadataLayer =
-        OGR_DS_GetLayerByName(hDS, osMetatadataLayer.c_str());
+        GDALDatasetGetLayerByName(hDS, osMetatadataLayer.c_str());
 
     CPLString osSourceName = "unknown";
 
@@ -382,7 +368,8 @@ CPLErr RasterliteDataset::CreateOverviewLevel(const char *pszResampling,
         osMetatadataLayer.c_str(),
         RasterliteGetPixelSizeCond(padfXResolutions[0], padfYResolutions[0])
             .c_str());
-    OGRLayerH hSQLLyr = OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
+    OGRLayerH hSQLLyr =
+        GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
     if (hSQLLyr)
     {
         OGRFeatureH hFeat = OGR_L_GetNextFeature(hSQLLyr);
@@ -393,7 +380,7 @@ CPLErr RasterliteDataset::CreateOverviewLevel(const char *pszResampling,
                 osSourceName = pszVal;
             OGR_F_Destroy(hFeat);
         }
-        OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+        GDALDatasetReleaseResultSet(hDS, hSQLLyr);
     }
 
     /* -------------------------------------------------------------------- */
@@ -448,7 +435,7 @@ CPLErr RasterliteDataset::CreateOverviewLevel(const char *pszResampling,
     char **papszTileDriverOptions =
         RasterliteGetTileDriverOptions(papszOptions);
 
-    OGR_DS_ExecuteSQL(hDS, "BEGIN", nullptr, nullptr);
+    GDALDatasetExecuteSQL(hDS, "BEGIN", nullptr, nullptr);
 
     CPLErr eErr = CE_None;
     for (int nBlockYOff = 0; eErr == CE_None && nBlockYOff < nYBlocks;
@@ -642,9 +629,9 @@ CPLErr RasterliteDataset::CreateOverviewLevel(const char *pszResampling,
     VSIUnlink((osTempFileName + ".aux.xml").c_str());
 
     if (eErr == CE_None)
-        OGR_DS_ExecuteSQL(hDS, "COMMIT", nullptr, nullptr);
+        GDALDatasetExecuteSQL(hDS, "COMMIT", nullptr, nullptr);
     else
-        OGR_DS_ExecuteSQL(hDS, "ROLLBACK", nullptr, nullptr);
+        GDALDatasetExecuteSQL(hDS, "ROLLBACK", nullptr, nullptr);
 
     VSIFree(pabyMEMDSBuffer);
     VSIFree(pabyPrevOvrMEMDSBuffer);
@@ -659,7 +646,7 @@ CPLErr RasterliteDataset::CreateOverviewLevel(const char *pszResampling,
         return eErr;
 
     OGRLayerH hRasterPyramidsLyr =
-        OGR_DS_GetLayerByName(hDS, "raster_pyramids");
+        GDALDatasetGetLayerByName(hDS, "raster_pyramids");
     if (hRasterPyramidsLyr == nullptr)
     {
         osSQL.Printf("CREATE TABLE raster_pyramids ("
@@ -667,14 +654,14 @@ CPLErr RasterliteDataset::CreateOverviewLevel(const char *pszResampling,
                      "pixel_x_size DOUBLE NOT NULL,"
                      "pixel_y_size DOUBLE NOT NULL,"
                      "tile_count INTEGER NOT NULL)");
-        OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
+        GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
 
         /* Re-open the DB to take into account the new tables*/
-        OGRReleaseDataSource(hDS);
+        GDALClose(hDS);
 
         hDS = RasterliteOpenSQLiteDB(osFileName.c_str(), GA_Update);
 
-        hRasterPyramidsLyr = OGR_DS_GetLayerByName(hDS, "raster_pyramids");
+        hRasterPyramidsLyr = GDALDatasetGetLayerByName(hDS, "raster_pyramids");
         if (hRasterPyramidsLyr == nullptr)
             return CE_Failure;
     }
@@ -688,7 +675,7 @@ CPLErr RasterliteDataset::CreateOverviewLevel(const char *pszResampling,
         osTableName.c_str(),
         RasterliteGetPixelSizeCond(padfXResolutions[0], padfYResolutions[0])
             .c_str());
-    hSQLLyr = OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
+    hSQLLyr = GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
     if (hSQLLyr)
     {
         OGRFeatureH hFeat = OGR_L_GetNextFeature(hSQLLyr);
@@ -697,7 +684,7 @@ CPLErr RasterliteDataset::CreateOverviewLevel(const char *pszResampling,
             bHasBaseResolution = true;
             OGR_F_Destroy(hFeat);
         }
-        OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+        GDALDatasetReleaseResultSet(hDS, hSQLLyr);
     }
 
     if (!bHasBaseResolution)
@@ -709,7 +696,7 @@ CPLErr RasterliteDataset::CreateOverviewLevel(const char *pszResampling,
 
         int nBlocksMainRes = 0;
 
-        hSQLLyr = OGR_DS_ExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
+        hSQLLyr = GDALDatasetExecuteSQL(hDS, osSQL.c_str(), nullptr, nullptr);
         if (hSQLLyr)
         {
             OGRFeatureH hFeat = OGR_L_GetNextFeature(hSQLLyr);
@@ -718,7 +705,7 @@ CPLErr RasterliteDataset::CreateOverviewLevel(const char *pszResampling,
                 nBlocksMainRes = OGR_F_GetFieldAsInteger(hFeat, 0);
                 OGR_F_Destroy(hFeat);
             }
-            OGR_DS_ReleaseResultSet(hDS, hSQLLyr);
+            GDALDatasetReleaseResultSet(hDS, hSQLLyr);
         }
 
         OGRFeatureH hFeat = OGR_F_Create(hFDefn);
diff --git a/frmts/raw/ace2dataset.cpp b/frmts/raw/ace2dataset.cpp
index 56c4ee3625bf..9feabc42f4e3 100644
--- a/frmts/raw/ace2dataset.cpp
+++ b/frmts/raw/ace2dataset.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2011-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_frmts.h"
diff --git a/frmts/raw/atlsci_spheroid.cpp b/frmts/raw/atlsci_spheroid.cpp
index 85f02b08c091..40a4abcb045e 100644
--- a/frmts/raw/atlsci_spheroid.cpp
+++ b/frmts/raw/atlsci_spheroid.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "atlsci_spheroid.h"
diff --git a/frmts/raw/atlsci_spheroid.h b/frmts/raw/atlsci_spheroid.h
index 0782af597298..8549d8479336 100644
--- a/frmts/raw/atlsci_spheroid.h
+++ b/frmts/raw/atlsci_spheroid.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/raw/btdataset.cpp b/frmts/raw/btdataset.cpp
index 400cd3d6fc94..48d765c15a44 100644
--- a/frmts/raw/btdataset.cpp
+++ b/frmts/raw/btdataset.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2003, Frank Warmerdam
  * Copyright (c) 2007-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_frmts.h"
diff --git a/frmts/raw/byndataset.cpp b/frmts/raw/byndataset.cpp
index 811920a08731..e36432527bd3 100644
--- a/frmts/raw/byndataset.cpp
+++ b/frmts/raw/byndataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2018, Ivan Lucena
  * Copyright (c) 2018, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/raw/byndataset.h b/frmts/raw/byndataset.h
index 481de12f5020..ef2ecf8eaf71 100644
--- a/frmts/raw/byndataset.h
+++ b/frmts/raw/byndataset.h
@@ -8,23 +8,7 @@
  * Copyright (c) 2018, Ivan Lucena
  * Copyright (c) 2018, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_FRMTS_RAW_BYNDATASET_H_INCLUDED
diff --git a/frmts/raw/cpgdataset.cpp b/frmts/raw/cpgdataset.cpp
index e8585d35c2d8..ce8425181c99 100644
--- a/frmts/raw/cpgdataset.cpp
+++ b/frmts/raw/cpgdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/frmts/raw/ctable2dataset.cpp b/frmts/raw/ctable2dataset.cpp
index b6cc30b2bf80..f1e1250751e4 100644
--- a/frmts/raw/ctable2dataset.cpp
+++ b/frmts/raw/ctable2dataset.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2012, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/frmts/raw/dipxdataset.cpp b/frmts/raw/dipxdataset.cpp
index 05936fd14553..5b9fdcddff8d 100644
--- a/frmts/raw/dipxdataset.cpp
+++ b/frmts/raw/dipxdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2006, Frank Warmerdam
  * Copyright (c) 2008-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/frmts/raw/doq1dataset.cpp b/frmts/raw/doq1dataset.cpp
index ad6a2bbecf6b..44c9571d397a 100644
--- a/frmts/raw/doq1dataset.cpp
+++ b/frmts/raw/doq1dataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2009-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_frmts.h"
@@ -32,6 +16,7 @@
 #include "rawdataset.h"
 
 #include <algorithm>
+#include <cmath>
 
 #ifndef UTM_FORMAT_defined
 #define UTM_FORMAT_defined
@@ -231,10 +216,10 @@ GDALDataset *DOQ1Dataset::Open(GDALOpenInfo *poOpenInfo)
     /*      Do these values look coherent for a DOQ file?  It would be      */
     /*      nice to do a more comprehensive test than this!                 */
     /* -------------------------------------------------------------------- */
-    if (dfWidth < 500 || dfWidth > 25000 || CPLIsNan(dfWidth) ||
-        dfHeight < 500 || dfHeight > 25000 || CPLIsNan(dfHeight) ||
-        dfBandStorage < 0 || dfBandStorage > 4 || CPLIsNan(dfBandStorage) ||
-        dfBandTypes < 1 || dfBandTypes > 9 || CPLIsNan(dfBandTypes))
+    if (dfWidth < 500 || dfWidth > 25000 || std::isnan(dfWidth) ||
+        dfHeight < 500 || dfHeight > 25000 || std::isnan(dfHeight) ||
+        dfBandStorage < 0 || dfBandStorage > 4 || std::isnan(dfBandStorage) ||
+        dfBandTypes < 1 || dfBandTypes > 9 || std::isnan(dfBandTypes))
         return nullptr;
 
     const int nWidth = static_cast<int>(dfWidth);
diff --git a/frmts/raw/doq2dataset.cpp b/frmts/raw/doq2dataset.cpp
index 86ac7be5caa3..007521e6a403 100644
--- a/frmts/raw/doq2dataset.cpp
+++ b/frmts/raw/doq2dataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2000, Derrick J Brashear
  * Copyright (c) 2009-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/frmts/raw/ehdrdataset.cpp b/frmts/raw/ehdrdataset.cpp
index a73dd367a912..70205eace122 100644
--- a/frmts/raw/ehdrdataset.cpp
+++ b/frmts/raw/ehdrdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/raw/ehdrdataset.h b/frmts/raw/ehdrdataset.h
index 9c9679615979..a2d36a3d06b7 100644
--- a/frmts/raw/ehdrdataset.h
+++ b/frmts/raw/ehdrdataset.h
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_FRMTS_RAW_EHDRDATASET_H_INCLUDED
diff --git a/frmts/raw/eirdataset.cpp b/frmts/raw/eirdataset.cpp
index 5cba2263bc0b..4184644049a9 100644
--- a/frmts/raw/eirdataset.cpp
+++ b/frmts/raw/eirdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/frmts/raw/envidataset.cpp b/frmts/raw/envidataset.cpp
index 26b924e3b19a..f2955ab2832f 100644
--- a/frmts/raw/envidataset.cpp
+++ b/frmts/raw/envidataset.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2002, Frank Warmerdam
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -341,7 +325,7 @@ CPLErr ENVIDataset::FlushCache(bool bAtClosing)
     if (bHasNoData)
     {
         bOK &=
-            VSIFPrintfL(fp, "data ignore value = %.18g\n", dfNoDataValue) >= 0;
+            VSIFPrintfL(fp, "data ignore value = %.17g\n", dfNoDataValue) >= 0;
     }
 
     // Write "data offset values", if needed
@@ -363,7 +347,7 @@ CPLErr ENVIDataset::FlushCache(bool bAtClosing)
                 double dfValue = GetRasterBand(i)->GetOffset(&bHasValue);
                 if (!bHasValue)
                     dfValue = 0;
-                bOK &= VSIFPrintfL(fp, "%.18g", dfValue) >= 0;
+                bOK &= VSIFPrintfL(fp, "%.17g", dfValue) >= 0;
                 if (i != nBands)
                     bOK &= VSIFPrintfL(fp, ", ") >= 0;
             }
@@ -390,7 +374,7 @@ CPLErr ENVIDataset::FlushCache(bool bAtClosing)
                 double dfValue = GetRasterBand(i)->GetScale(&bHasValue);
                 if (!bHasValue)
                     dfValue = 1;
-                bOK &= VSIFPrintfL(fp, "%.18g", dfValue) >= 0;
+                bOK &= VSIFPrintfL(fp, "%.17g", dfValue) >= 0;
                 if (i != nBands)
                     bOK &= VSIFPrintfL(fp, ", ") >= 0;
             }
@@ -2401,9 +2385,12 @@ ENVIDataset *ENVIDataset::Open(GDALOpenInfo *poOpenInfo, bool bFileSizeCheck)
     {
         char **papszBandNames = poDS->SplitList(pszBandNames);
         char **papszWL = poDS->SplitList(pszWaveLength);
+        const char *pszFWHM = poDS->m_aosHeader["fwhm"];
+        char **papszFWHM = pszFWHM ? poDS->SplitList(pszFWHM) : nullptr;
 
         const char *pszWLUnits = nullptr;
         const int nWLCount = CSLCount(papszWL);
+        const int nFWHMCount = CSLCount(papszFWHM);
         if (papszWL)
         {
             // If WL information is present, process wavelength units.
@@ -2460,6 +2447,29 @@ ENVIDataset *ENVIDataset::Open(GDALOpenInfo *poOpenInfo, bool bFileSizeCheck)
             CPLString osBandId = CPLSPrintf("Band_%i", i + 1);
             poDS->SetMetadataItem(osBandId, osBandName.c_str());
 
+            const auto ConvertWaveLength =
+                [pszWLUnits](double dfVal) -> const char *
+            {
+                if (EQUAL(pszWLUnits, "Micrometers") || EQUAL(pszWLUnits, "um"))
+                {
+                    return CPLSPrintf("%.3f", dfVal);
+                }
+                else if (EQUAL(pszWLUnits, "Nanometers") ||
+                         EQUAL(pszWLUnits, "nm"))
+                {
+                    return CPLSPrintf("%.3f", dfVal / 1000);
+                }
+                else if (EQUAL(pszWLUnits, "Millimeters") ||
+                         EQUAL(pszWLUnits, "mm"))
+                {
+                    return CPLSPrintf("%.3f", dfVal * 1000);
+                }
+                else
+                {
+                    return nullptr;
+                }
+            };
+
             // Set wavelength metadata to band.
             if (papszWL && nWLCount > i)
             {
@@ -2470,11 +2480,29 @@ ENVIDataset *ENVIDataset::Open(GDALOpenInfo *poOpenInfo, bool bFileSizeCheck)
                 {
                     poDS->GetRasterBand(i + 1)->SetMetadataItem(
                         "wavelength_units", pszWLUnits);
+
+                    if (const char *pszVal =
+                            ConvertWaveLength(CPLAtof(papszWL[i])))
+                    {
+                        poDS->GetRasterBand(i + 1)->SetMetadataItem(
+                            "CENTRAL_WAVELENGTH_UM", pszVal, "IMAGERY");
+                    }
+                }
+            }
+
+            if (papszFWHM && nFWHMCount > i && pszWLUnits)
+            {
+                if (const char *pszVal =
+                        ConvertWaveLength(CPLAtof(papszFWHM[i])))
+                {
+                    poDS->GetRasterBand(i + 1)->SetMetadataItem(
+                        "FWHM_UM", pszVal, "IMAGERY");
                 }
             }
         }
         CSLDestroy(papszWL);
         CSLDestroy(papszBandNames);
+        CSLDestroy(papszFWHM);
     }
 
     // Apply "default bands" if we have it to set RGB color interpretation.
@@ -2838,8 +2866,8 @@ CPLErr ENVIRasterBand::SetNoDataValue(double dfNoDataValue)
             dfOtherBandNoData != dfNoDataValue)
         {
             CPLError(CE_Warning, CPLE_AppDefined,
-                     "Nodata value of band %d (%.18g) is different from nodata "
-                     "value from band %d (%.18g). Only the later will be "
+                     "Nodata value of band %d (%.17g) is different from nodata "
+                     "value from band %d (%.17g). Only the later will be "
                      "written in the ENVI header as the \"data ignore value\"",
                      nBand, dfNoDataValue, nOtherBand, dfOtherBandNoData);
         }
diff --git a/frmts/raw/envidataset.h b/frmts/raw/envidataset.h
index 7814e6993947..0001a7f1b566 100644
--- a/frmts/raw/envidataset.h
+++ b/frmts/raw/envidataset.h
@@ -10,23 +10,7 @@
  * Copyright (c) 2002, Frank Warmerdam
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_FRMTS_RAW_ENVIDATASET_H_INCLUDED
diff --git a/frmts/raw/fastdataset.cpp b/frmts/raw/fastdataset.cpp
index 389081d54061..619d3f65e7b6 100644
--- a/frmts/raw/fastdataset.cpp
+++ b/frmts/raw/fastdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2002, Andrey Kiselev <dron@ak4719.spb.edu>
  * Copyright (c) 2007-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #include "cpl_conv.h"
 #include "cpl_string.h"
diff --git a/frmts/raw/genbindataset.cpp b/frmts/raw/genbindataset.cpp
index 9c923217e077..c9fff1fc92f0 100644
--- a/frmts/raw/genbindataset.cpp
+++ b/frmts/raw/genbindataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/frmts/raw/gscdataset.cpp b/frmts/raw/gscdataset.cpp
index 6be446b916af..0fa1458eb566 100644
--- a/frmts/raw/gscdataset.cpp
+++ b/frmts/raw/gscdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/frmts/raw/gtxdataset.cpp b/frmts/raw/gtxdataset.cpp
index 54fde25f96fe..3f38ac16561a 100644
--- a/frmts/raw/gtxdataset.cpp
+++ b/frmts/raw/gtxdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2010, Frank Warmerdam
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/frmts/raw/hkvdataset.cpp b/frmts/raw/hkvdataset.cpp
index 858e6986c4d0..7adb93fe4e47 100644
--- a/frmts/raw/hkvdataset.cpp
+++ b/frmts/raw/hkvdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2000, Frank Warmerdam
  * Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <ctype.h>
diff --git a/frmts/raw/iscedataset.cpp b/frmts/raw/iscedataset.cpp
index 34a2f1b104fc..9f9fe873d2bd 100644
--- a/frmts/raw/iscedataset.cpp
+++ b/frmts/raw/iscedataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Matthieu Volat <matthieu.volat@ujf-grenoble.fr>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_frmts.h"
diff --git a/frmts/raw/krodataset.cpp b/frmts/raw/krodataset.cpp
index d686db5a6e4f..5183c669df68 100644
--- a/frmts/raw/krodataset.cpp
+++ b/frmts/raw/krodataset.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/frmts/raw/landataset.cpp b/frmts/raw/landataset.cpp
index 4aba9f0e8263..44b30a18122a 100644
--- a/frmts/raw/landataset.cpp
+++ b/frmts/raw/landataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2004, Frank Warmerdam
  * Copyright (c) 2008-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/frmts/raw/lcpdataset.cpp b/frmts/raw/lcpdataset.cpp
index fd2ac490a7c0..34294b7bc348 100644
--- a/frmts/raw/lcpdataset.cpp
+++ b/frmts/raw/lcpdataset.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2008-2011, Even Rouault <even dot rouault at spatialys.com>
  * Copyright (c) 2013, Kyle Shannon <kyle at pobox dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/raw/loslasdataset.cpp b/frmts/raw/loslasdataset.cpp
index 6fedc7ddc5dd..1bcab248cb86 100644
--- a/frmts/raw/loslasdataset.cpp
+++ b/frmts/raw/loslasdataset.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/frmts/raw/mffdataset.cpp b/frmts/raw/mffdataset.cpp
index 5c5de4aef0db..30b5f4471e70 100644
--- a/frmts/raw/mffdataset.cpp
+++ b/frmts/raw/mffdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2000, Frank Warmerdam
  * Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "atlsci_spheroid.h"
diff --git a/frmts/raw/ndfdataset.cpp b/frmts/raw/ndfdataset.cpp
index db73bfeba4d0..ec5559fdbf63 100644
--- a/frmts/raw/ndfdataset.cpp
+++ b/frmts/raw/ndfdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2005, Frank Warmerdam
  * Copyright (c) 2008-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/frmts/raw/noaabdataset.cpp b/frmts/raw/noaabdataset.cpp
index ddecd5ca7304..1e39b75a92bd 100644
--- a/frmts/raw/noaabdataset.cpp
+++ b/frmts/raw/noaabdataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/frmts/raw/nsidcbindataset.cpp b/frmts/raw/nsidcbindataset.cpp
index de8dd28e1b62..164a66625cc3 100644
--- a/frmts/raw/nsidcbindataset.cpp
+++ b/frmts/raw/nsidcbindataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Michael Sumner
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/frmts/raw/ntv2dataset.cpp b/frmts/raw/ntv2dataset.cpp
index dd1e989e5495..811405761195 100644
--- a/frmts/raw/ntv2dataset.cpp
+++ b/frmts/raw/ntv2dataset.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2010, Frank Warmerdam
  * Copyright (c) 2010-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 // TODO(schwehr): There are a lot of magic numbers in this driver that should
diff --git a/frmts/raw/pauxdataset.cpp b/frmts/raw/pauxdataset.cpp
index 8bb4ce395ebd..11fd271d727e 100644
--- a/frmts/raw/pauxdataset.cpp
+++ b/frmts/raw/pauxdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2008-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/frmts/raw/pnmdataset.cpp b/frmts/raw/pnmdataset.cpp
index e291e6c62eca..70241d02e9a7 100644
--- a/frmts/raw/pnmdataset.cpp
+++ b/frmts/raw/pnmdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2001, Frank Warmerdam
  * Copyright (c) 2008-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/frmts/raw/roipacdataset.cpp b/frmts/raw/roipacdataset.cpp
index c1cabd998657..1943cb38a480 100644
--- a/frmts/raw/roipacdataset.cpp
+++ b/frmts/raw/roipacdataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Matthieu Volat <matthieu.volat@ujf-grenoble.fr>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_frmts.h"
diff --git a/frmts/raw/rrasterdataset.cpp b/frmts/raw/rrasterdataset.cpp
index 778799aa857b..ef5c26f368da 100644
--- a/frmts/raw/rrasterdataset.cpp
+++ b/frmts/raw/rrasterdataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault, <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -36,6 +20,7 @@
 #include "ogr_spatialref.h"
 
 #include <algorithm>
+#include <cmath>
 #include <limits>
 #include <memory>
 
@@ -330,7 +315,7 @@ static void GetMinMax(const T *buffer, int nBufXSize, int nBufYSize,
         for (int iX = 0; iX < nBufXSize; iX++)
         {
             const double dfVal = buffer[iY * nLineSpace + iX * nPixelSpace];
-            if (dfVal != dfNoDataValue && !CPLIsNan(dfVal))
+            if (dfVal != dfNoDataValue && !std::isnan(dfVal))
             {
                 dfMin = std::min(dfMin, dfVal);
                 dfMax = std::max(dfMax, dfVal);
@@ -548,7 +533,7 @@ void RRASTERDataset::RewriteHeader()
     int bGotNoDataValue = false;
     double dfNoDataValue = GetRasterBand(1)->GetNoDataValue(&bGotNoDataValue);
     if (bGotNoDataValue)
-        VSIFPrintfL(fp, "nodatavalue=%.18g\n", dfNoDataValue);
+        VSIFPrintfL(fp, "nodatavalue=%.17g\n", dfNoDataValue);
 
 #if CPL_IS_LSB
     VSIFPrintfL(fp, "byteorder=%s\n", m_bNativeOrder ? "little" : "big");
@@ -573,8 +558,8 @@ void RRASTERDataset::RewriteHeader()
             osMinValue.clear();
             break;
         }
-        osMinValue += CPLSPrintf("%.18g", poBand->m_dfMin);
-        osMaxValue += CPLSPrintf("%.18g", poBand->m_dfMax);
+        osMinValue += CPLSPrintf("%.17g", poBand->m_dfMin);
+        osMaxValue += CPLSPrintf("%.17g", poBand->m_dfMax);
     }
     if (!osMinValue.empty())
     {
@@ -636,7 +621,7 @@ void RRASTERDataset::RewriteHeader()
                     else if (eColType == GFT_Real)
                     {
                         osRatValues +=
-                            CPLSPrintf("%.18g", poRAT->GetValueAsDouble(j, i));
+                            CPLSPrintf("%.17g", poRAT->GetValueAsDouble(j, i));
                     }
                     else
                     {
@@ -769,12 +754,12 @@ void RRASTERDataset::RewriteHeader()
     VSIFPrintfL(fp, "nrows=%d\n", nRasterYSize);
     VSIFPrintfL(fp, "ncols=%d\n", nRasterXSize);
 
-    VSIFPrintfL(fp, "xmin=%.18g\n", m_adfGeoTransform[0]);
-    VSIFPrintfL(fp, "ymin=%.18g\n",
+    VSIFPrintfL(fp, "xmin=%.17g\n", m_adfGeoTransform[0]);
+    VSIFPrintfL(fp, "ymin=%.17g\n",
                 m_adfGeoTransform[3] + nRasterYSize * m_adfGeoTransform[5]);
-    VSIFPrintfL(fp, "xmax=%.18g\n",
+    VSIFPrintfL(fp, "xmax=%.17g\n",
                 m_adfGeoTransform[0] + nRasterXSize * m_adfGeoTransform[1]);
-    VSIFPrintfL(fp, "ymax=%.18g\n", m_adfGeoTransform[3]);
+    VSIFPrintfL(fp, "ymax=%.17g\n", m_adfGeoTransform[3]);
 
     if (!m_oSRS.IsEmpty())
     {
@@ -1025,7 +1010,7 @@ bool RRASTERDataset::ComputeSpacings(const CPLString &osBandOrder, int nCols,
 
 static float CastToFloat(double dfVal)
 {
-    if (CPLIsInf(dfVal) || CPLIsNan(dfVal) ||
+    if (std::isinf(dfVal) || std::isnan(dfVal) ||
         (dfVal >= -std::numeric_limits<float>::max() &&
          dfVal <= std::numeric_limits<float>::max()))
     {
diff --git a/frmts/raw/snodasdataset.cpp b/frmts/raw/snodasdataset.cpp
index 1bb1fbff0812..08d5d1904af6 100644
--- a/frmts/raw/snodasdataset.cpp
+++ b/frmts/raw/snodasdataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/frmts/rdb/rdbdataset.cpp b/frmts/rdb/rdbdataset.cpp
index 2650efb64a25..17db35c4d0fb 100644
--- a/frmts/rdb/rdbdataset.cpp
+++ b/frmts/rdb/rdbdataset.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2019, RIEGL Laser Measurement Systems GmbH (support@riegl.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrgeojsonreader.h"
diff --git a/frmts/rdb/rdbdataset.hpp b/frmts/rdb/rdbdataset.hpp
index d4368e761c65..48756efdcb20 100644
--- a/frmts/rdb/rdbdataset.hpp
+++ b/frmts/rdb/rdbdataset.hpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2019, RIEGL Laser Measurement Systems GmbH (support@riegl.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef RDB_DATASET_INCLUDED
diff --git a/frmts/rik/rikdataset.cpp b/frmts/rik/rikdataset.cpp
index f669e972f2d3..9f50b6e4eb75 100644
--- a/frmts/rik/rikdataset.cpp
+++ b/frmts/rik/rikdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2005, Daniel Wallner <daniel.wallner@bredband.net>
  * Copyright (c) 2008-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <cfloat>
@@ -32,6 +16,8 @@
 #include "gdal_frmts.h"
 #include "gdal_pam.h"
 
+#include <cmath>
+
 #define RIK_HEADER_DEBUG 0
 #define RIK_CLEAR_DEBUG 0
 #define RIK_PIXEL_DEBUG 0
@@ -901,8 +887,8 @@ GDALDataset *RIKDataset::Open(GDALOpenInfo *poOpenInfo)
         CPL_SWAP32PTR(&header.iMPPNum);
 #endif
 
-        if (!CPLIsFinite(header.fSouth) || !CPLIsFinite(header.fWest) ||
-            !CPLIsFinite(header.fNorth) || !CPLIsFinite(header.fEast) ||
+        if (!std::isfinite(header.fSouth) || !std::isfinite(header.fWest) ||
+            !std::isfinite(header.fNorth) || !std::isfinite(header.fEast) ||
             header.iMPPNum == 0)
         {
             return nullptr;
diff --git a/frmts/rmf/rmfdataset.cpp b/frmts/rmf/rmfdataset.cpp
index 7d5b810a23fa..ffdeeebb7c36 100644
--- a/frmts/rmf/rmfdataset.cpp
+++ b/frmts/rmf/rmfdataset.cpp
@@ -10,22 +10,7 @@
  * Copyright (c) 2007-2012, Even Rouault <even dot rouault at spatialys.com>
  * Copyright (c) 2023, NextGIS <info@nextgis.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
- * DEALINGS IN THE SOFTWARE.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #include <algorithm>
 #include <limits>
diff --git a/frmts/rmf/rmfdataset.h b/frmts/rmf/rmfdataset.h
index 24bd301613ad..10b7c02965f4 100644
--- a/frmts/rmf/rmfdataset.h
+++ b/frmts/rmf/rmfdataset.h
@@ -10,23 +10,7 @@
  * Copyright (c) 2007, Andrey Kiselev <dron@ak4719.spb.edu>
  * Copyright (c) 2023, NextGIS <info@nextgis.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef RMFDATASET_H_INCLUDED
diff --git a/frmts/rmf/rmfdem.cpp b/frmts/rmf/rmfdem.cpp
index 28a662ab8b4e..ff9438502d6f 100644
--- a/frmts/rmf/rmfdem.cpp
+++ b/frmts/rmf/rmfdem.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2009, Andrey Kiselev <dron@ak4719.spb.edu>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/frmts/rmf/rmfjpeg.cpp b/frmts/rmf/rmfjpeg.cpp
index 8c4b7fd78f73..16c24895135c 100644
--- a/frmts/rmf/rmfjpeg.cpp
+++ b/frmts/rmf/rmfjpeg.cpp
@@ -8,29 +8,14 @@
  ******************************************************************************
  * Copyright (c) 2018, Andrew Sudorgin
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifdef HAVE_LIBJPEG
 
 #include <algorithm>
 #include "cpl_conv.h"
+#include "cpl_vsi.h"
 #include "rmfdataset.h"
 #include "../mem/memdataset.h"
 
@@ -46,13 +31,10 @@ size_t RMFDataset::JPEGDecompress(const GByte *pabyIn, GUInt32 nSizeIn,
         nSizeIn < 2)
         return 0;
 
-    CPLString osTmpFilename;
-    VSILFILE *fp;
-
-    osTmpFilename.Printf("/vsimem/rmfjpeg/%p.jpg", pabyIn);
+    const CPLString osTmpFilename(VSIMemGenerateHiddenFilename("rmfjpeg.jpg"));
 
-    fp = VSIFileFromMemBuffer(osTmpFilename, const_cast<GByte *>(pabyIn),
-                              nSizeIn, FALSE);
+    VSILFILE *fp = VSIFileFromMemBuffer(
+        osTmpFilename, const_cast<GByte *>(pabyIn), nSizeIn, FALSE);
 
     if (fp == nullptr)
     {
@@ -165,8 +147,7 @@ size_t RMFDataset::JPEGCompress(const GByte *pabyIn, GUInt32 nSizeIn,
         poMemDS->AddMEMBand(hBand);
     }
 
-    CPLString osTmpFilename;
-    osTmpFilename.Printf("/vsimem/rmfjpeg/%p.jpg", pabyIn);
+    const CPLString osTmpFilename(VSIMemGenerateHiddenFilename("rmfjpeg.jpg"));
 
     char szQuality[32] = {};
     if (poDS != nullptr && poDS->sHeader.iJpegQuality > 0)
diff --git a/frmts/rmf/rmflzw.cpp b/frmts/rmf/rmflzw.cpp
index 5428b0ff551c..85a2f4cb831b 100644
--- a/frmts/rmf/rmflzw.cpp
+++ b/frmts/rmf/rmflzw.cpp
@@ -10,23 +10,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Andrey Kiselev <dron@ak4719.spb.edu>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************
  * COPYRIGHT NOTICE FROM THE INITIAL IMPLEMENTATION:
  *
diff --git a/frmts/rs2/rs2dataset.cpp b/frmts/rs2/rs2dataset.cpp
index fcf4f43737ca..87c6de6dbfcf 100644
--- a/frmts/rs2/rs2dataset.cpp
+++ b/frmts/rs2/rs2dataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_minixml.h"
diff --git a/frmts/safe/safedataset.cpp b/frmts/safe/safedataset.cpp
index 268cfb63ca5d..6e5ebce7f325 100644
--- a/frmts/safe/safedataset.cpp
+++ b/frmts/safe/safedataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Delfim Rego <delfimrego@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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "safedataset.h"
@@ -636,7 +620,6 @@ SAFEDataset::~SAFEDataset()
 {
     SAFEDataset::FlushCache(true);
 
-    CPLDestroyXMLNode(psManifest);
     if (nGCPCount > 0)
     {
         GDALDeinitGCPs(nGCPCount, pasGCPList);
@@ -673,13 +656,14 @@ int SAFEDataset::CloseDependentDatasets()
 /*                      GetMetaDataObject()                             */
 /************************************************************************/
 
-CPLXMLNode *SAFEDataset::GetMetaDataObject(CPLXMLNode *psMetaDataObjects,
-                                           const char *metadataObjectId)
+const CPLXMLNode *
+SAFEDataset::GetMetaDataObject(const CPLXMLNode *psMetaDataObjects,
+                               const char *metadataObjectId)
 {
     /* -------------------------------------------------------------------- */
     /*      Look for DataObject Element by ID.                              */
     /* -------------------------------------------------------------------- */
-    for (CPLXMLNode *psMDO = psMetaDataObjects->psChild; psMDO != nullptr;
+    for (const CPLXMLNode *psMDO = psMetaDataObjects->psChild; psMDO != nullptr;
          psMDO = psMDO->psNext)
     {
         if (psMDO->eType != CXT_Element ||
@@ -706,13 +690,13 @@ CPLXMLNode *SAFEDataset::GetMetaDataObject(CPLXMLNode *psMetaDataObjects,
 /*                      GetDataObject()                                 */
 /************************************************************************/
 
-CPLXMLNode *SAFEDataset::GetDataObject(CPLXMLNode *psDataObjects,
-                                       const char *dataObjectId)
+const CPLXMLNode *SAFEDataset::GetDataObject(const CPLXMLNode *psDataObjects,
+                                             const char *dataObjectId)
 {
     /* -------------------------------------------------------------------- */
     /*      Look for DataObject Element by ID.                              */
     /* -------------------------------------------------------------------- */
-    for (CPLXMLNode *psDO = psDataObjects->psChild; psDO != nullptr;
+    for (const CPLXMLNode *psDO = psDataObjects->psChild; psDO != nullptr;
          psDO = psDO->psNext)
     {
         if (psDO->eType != CXT_Element ||
@@ -735,14 +719,15 @@ CPLXMLNode *SAFEDataset::GetDataObject(CPLXMLNode *psDataObjects,
     return nullptr;
 }
 
-CPLXMLNode *SAFEDataset::GetDataObject(CPLXMLNode *psMetaDataObjects,
-                                       CPLXMLNode *psDataObjects,
-                                       const char *metadataObjectId)
+const CPLXMLNode *
+SAFEDataset::GetDataObject(const CPLXMLNode *psMetaDataObjects,
+                           const CPLXMLNode *psDataObjects,
+                           const char *metadataObjectId)
 {
     /* -------------------------------------------------------------------- */
     /*      Look for MetadataObject Element by ID.                          */
     /* -------------------------------------------------------------------- */
-    CPLXMLNode *psMDO =
+    const CPLXMLNode *psMDO =
         SAFEDataset::GetMetaDataObject(psMetaDataObjects, metadataObjectId);
 
     if (psMDO != nullptr)
@@ -1005,7 +990,7 @@ GDALDataset *SAFEDataset::Open(GDALOpenInfo *poOpenInfo)
     /*      Ingest the manifest.safe file.                                  */
     /* -------------------------------------------------------------------- */
 
-    CPLXMLNode *psManifest = CPLParseXMLFile(osMDFilename);
+    auto psManifest = CPLXMLTreeCloser(CPLParseXMLFile(osMDFilename));
     if (psManifest == nullptr)
         return nullptr;
 
@@ -1016,7 +1001,6 @@ GDALDataset *SAFEDataset::Open(GDALOpenInfo *poOpenInfo)
     /* -------------------------------------------------------------------- */
     if (poOpenInfo->eAccess == GA_Update)
     {
-        CPLDestroyXMLNode(psManifest);
         CPLError(CE_Failure, CPLE_NotSupported,
                  "The SAFE driver does not support update access to existing"
                  " datasets.\n");
@@ -1026,11 +1010,10 @@ GDALDataset *SAFEDataset::Open(GDALOpenInfo *poOpenInfo)
     /* -------------------------------------------------------------------- */
     /*      Get contentUnit parent element.                                 */
     /* -------------------------------------------------------------------- */
-    CPLXMLNode *psContentUnits = CPLGetXMLNode(
-        psManifest, "=xfdu:XFDU.informationPackageMap.xfdu:contentUnit");
+    const CPLXMLNode *psContentUnits = CPLGetXMLNode(
+        psManifest.get(), "=xfdu:XFDU.informationPackageMap.xfdu:contentUnit");
     if (psContentUnits == nullptr)
     {
-        CPLDestroyXMLNode(psManifest);
         CPLError(CE_Failure, CPLE_OpenFailed,
                  "Failed to find <xfdu:XFDU><informationPackageMap>"
                  "<xfdu:contentUnit> in manifest file.");
@@ -1040,11 +1023,10 @@ GDALDataset *SAFEDataset::Open(GDALOpenInfo *poOpenInfo)
     /* -------------------------------------------------------------------- */
     /*      Get Metadata Objects element.                                   */
     /* -------------------------------------------------------------------- */
-    CPLXMLNode *psMetaDataObjects =
-        CPLGetXMLNode(psManifest, "=xfdu:XFDU.metadataSection");
+    const CPLXMLNode *psMetaDataObjects =
+        CPLGetXMLNode(psManifest.get(), "=xfdu:XFDU.metadataSection");
     if (psMetaDataObjects == nullptr)
     {
-        CPLDestroyXMLNode(psManifest);
         CPLError(CE_Failure, CPLE_OpenFailed,
                  "Failed to find <xfdu:XFDU><metadataSection>"
                  "in manifest file.");
@@ -1054,11 +1036,10 @@ GDALDataset *SAFEDataset::Open(GDALOpenInfo *poOpenInfo)
     /* -------------------------------------------------------------------- */
     /*      Get Data Objects element.                                       */
     /* -------------------------------------------------------------------- */
-    CPLXMLNode *psDataObjects =
-        CPLGetXMLNode(psManifest, "=xfdu:XFDU.dataObjectSection");
+    const CPLXMLNode *psDataObjects =
+        CPLGetXMLNode(psManifest.get(), "=xfdu:XFDU.dataObjectSection");
     if (psDataObjects == nullptr)
     {
-        CPLDestroyXMLNode(psManifest);
         CPLError(CE_Failure, CPLE_OpenFailed,
                  "Failed to find <xfdu:XFDU><dataObjectSection> in document.");
         return nullptr;
@@ -1069,7 +1050,7 @@ GDALDataset *SAFEDataset::Open(GDALOpenInfo *poOpenInfo)
     /* -------------------------------------------------------------------- */
     auto poDS = std::make_unique<SAFEDataset>();
 
-    poDS->psManifest = psManifest;
+    poDS->psManifest = std::move(psManifest);
 
     /* -------------------------------------------------------------------- */
     /*      Look for "Measurement Data Unit" contentUnit elements.          */
@@ -1103,7 +1084,7 @@ GDALDataset *SAFEDataset::Open(GDALOpenInfo *poOpenInfo)
             if (*pszDataObjectID == '\0' || *pszDmdID == '\0')
                 continue;
 
-            CPLXMLNode *psDataObject =
+            const CPLXMLNode *psDataObject =
                 SAFEDataset::GetDataObject(psDataObjects, pszDataObjectID);
 
             const char *pszRepId = CPLGetXMLValue(psDataObject, "repID", "");
@@ -1127,7 +1108,7 @@ GDALDataset *SAFEDataset::Open(GDALOpenInfo *poOpenInfo)
                     continue;
 
                 // Map the metadata ID to the object element
-                CPLXMLNode *psDO = SAFEDataset::GetDataObject(
+                const CPLXMLNode *psDO = SAFEDataset::GetDataObject(
                     psMetaDataObjects, psDataObjects, pszId);
                 if (psDO == nullptr)
                     continue;
@@ -1315,8 +1296,11 @@ GDALDataset *SAFEDataset::Open(GDALOpenInfo *poOpenInfo)
             /*      Try and open the file. */
             /* --------------------------------------------------------------------
              */
+            CPLTurnFailureIntoWarning(true);
             auto poBandFile = std::unique_ptr<GDALDataset>(
-                GDALDataset::Open(osFullFilename.c_str()));
+                GDALDataset::Open(osFullFilename.c_str(),
+                                  GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR));
+            CPLTurnFailureIntoWarning(false);
             if (poBandFile == nullptr)
             {
                 // NOP
@@ -1744,7 +1728,7 @@ GDALDataset *SAFEDataset::Open(GDALOpenInfo *poOpenInfo)
     /* -------------------------------------------------------------------- */
     /*      Platform information                                            */
     /* -------------------------------------------------------------------- */
-    CPLXMLNode *psPlatformAttrs =
+    const CPLXMLNode *psPlatformAttrs =
         SAFEDataset::GetMetaDataObject(psMetaDataObjects, "platform");
 
     if (psPlatformAttrs != nullptr)
@@ -1781,7 +1765,7 @@ GDALDataset *SAFEDataset::Open(GDALOpenInfo *poOpenInfo)
     /* -------------------------------------------------------------------- */
     /*      Acquisition Period information                                  */
     /* -------------------------------------------------------------------- */
-    CPLXMLNode *psAcquisitionAttrs =
+    const CPLXMLNode *psAcquisitionAttrs =
         SAFEDataset::GetMetaDataObject(psMetaDataObjects, "acquisitionPeriod");
 
     if (psAcquisitionAttrs != nullptr)
@@ -1802,7 +1786,7 @@ GDALDataset *SAFEDataset::Open(GDALOpenInfo *poOpenInfo)
     /* -------------------------------------------------------------------- */
     /*      Processing information                                          */
     /* -------------------------------------------------------------------- */
-    CPLXMLNode *psProcessingAttrs =
+    const CPLXMLNode *psProcessingAttrs =
         SAFEDataset::GetMetaDataObject(psMetaDataObjects, "processing");
 
     if (psProcessingAttrs != nullptr)
@@ -1816,7 +1800,7 @@ GDALDataset *SAFEDataset::Open(GDALOpenInfo *poOpenInfo)
     /* -------------------------------------------------------------------- */
     /*      Measurement Orbit Reference information                         */
     /* -------------------------------------------------------------------- */
-    CPLXMLNode *psOrbitAttrs = SAFEDataset::GetMetaDataObject(
+    const CPLXMLNode *psOrbitAttrs = SAFEDataset::GetMetaDataObject(
         psMetaDataObjects, "measurementOrbitReference");
 
     if (psOrbitAttrs != nullptr)
@@ -1834,6 +1818,46 @@ GDALDataset *SAFEDataset::Open(GDALOpenInfo *poOpenInfo)
         poDS->SetMetadataItem("ORBIT_DIRECTION", pszItem);
     }
 
+    /* -------------------------------------------------------------------- */
+    /*      Footprint                                                       */
+    /* -------------------------------------------------------------------- */
+    const CPLXMLNode *psFrameSet = SAFEDataset::GetMetaDataObject(
+        psMetaDataObjects, "measurementFrameSet");
+
+    if (psFrameSet)
+    {
+        const auto psFootPrint = CPLGetXMLNode(psFrameSet, "metadataWrap."
+                                                           "xmlData."
+                                                           "safe:frameSet."
+                                                           "safe:frame."
+                                                           "safe:footPrint");
+        if (psFootPrint)
+        {
+            const char *pszSRSName =
+                CPLGetXMLValue(psFootPrint, "srsName", nullptr);
+            const char *pszCoordinates =
+                CPLGetXMLValue(psFootPrint, "gml:coordinates", nullptr);
+            if (pszSRSName &&
+                EQUAL(pszSRSName,
+                      "http://www.opengis.net/gml/srs/epsg.xml#4326") &&
+                pszCoordinates)
+            {
+                const CPLStringList aosValues(
+                    CSLTokenizeString2(pszCoordinates, " ,", 0));
+                if (aosValues.size() == 8)
+                {
+                    poDS->SetMetadataItem(
+                        "FOOTPRINT",
+                        CPLSPrintf("POLYGON((%s %s,%s %s,%s %s,%s %s, %s %s))",
+                                   aosValues[1], aosValues[0], aosValues[3],
+                                   aosValues[2], aosValues[5], aosValues[4],
+                                   aosValues[7], aosValues[6], aosValues[1],
+                                   aosValues[0]));
+                }
+            }
+        }
+    }
+
     /* -------------------------------------------------------------------- */
     /*      Initialize any PAM information.                                 */
     /* -------------------------------------------------------------------- */
diff --git a/frmts/safe/safedataset.h b/frmts/safe/safedataset.h
index 0cb787a291da..94b86a2ef638 100644
--- a/frmts/safe/safedataset.h
+++ b/frmts/safe/safedataset.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Delfim Rego <delfimrego@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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef SAFEDATASET_H_INCLUDED
@@ -50,7 +34,7 @@
 
 class SAFEDataset final : public GDALPamDataset
 {
-    CPLXMLNode *psManifest = nullptr;
+    CPLXMLTreeCloser psManifest{nullptr};
 
     int nGCPCount = 0;
     GDAL_GCP *pasGCPList = nullptr;
@@ -64,10 +48,12 @@ class SAFEDataset final : public GDALPamDataset
   protected:
     virtual int CloseDependentDatasets() override;
 
-    static CPLXMLNode *GetMetaDataObject(CPLXMLNode *, const char *);
+    static const CPLXMLNode *GetMetaDataObject(const CPLXMLNode *,
+                                               const char *);
 
-    static CPLXMLNode *GetDataObject(CPLXMLNode *, const char *);
-    static CPLXMLNode *GetDataObject(CPLXMLNode *, CPLXMLNode *, const char *);
+    static const CPLXMLNode *GetDataObject(const CPLXMLNode *, const char *);
+    static const CPLXMLNode *GetDataObject(const CPLXMLNode *,
+                                           const CPLXMLNode *, const char *);
 
     void AddSubDataset(const CPLString &osName, const CPLString &osDesc);
 
@@ -89,9 +75,9 @@ class SAFEDataset final : public GDALPamDataset
     static GDALDataset *Open(GDALOpenInfo *);
     static int Identify(GDALOpenInfo *);
 
-    CPLXMLNode *GetManifest()
+    const CPLXMLNode *GetManifest()
     {
-        return psManifest;
+        return psManifest.get();
     }
 };
 
diff --git a/frmts/saga/sagadataset.cpp b/frmts/saga/sagadataset.cpp
index 15223575a85f..843501e2c3e2 100644
--- a/frmts/saga/sagadataset.cpp
+++ b/frmts/saga/sagadataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2009, Volker Wichmann <wichmann@laserdata.at>
  * Copyright (c) 2009-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/frmts/sdts/sdts2shp.cpp b/frmts/sdts/sdts2shp.cpp
index 228e674dfe43..570308f9517e 100644
--- a/frmts/sdts/sdts2shp.cpp
+++ b/frmts/sdts/sdts2shp.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "sdts_al.h"
diff --git a/frmts/sdts/sdts_al.h b/frmts/sdts/sdts_al.h
index 01a06912bbf0..db1b50f78838 100644
--- a/frmts/sdts/sdts_al.h
+++ b/frmts/sdts/sdts_al.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef SDTS_AL_H_INCLUDED
diff --git a/frmts/sdts/sdtsattrreader.cpp b/frmts/sdts/sdtsattrreader.cpp
index d5f8a9c151f8..5faaa6d94712 100644
--- a/frmts/sdts/sdtsattrreader.cpp
+++ b/frmts/sdts/sdtsattrreader.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "sdts_al.h"
diff --git a/frmts/sdts/sdtscatd.cpp b/frmts/sdts/sdtscatd.cpp
index 26bbea57d33e..a7b6a90d1c60 100644
--- a/frmts/sdts/sdtscatd.cpp
+++ b/frmts/sdts/sdtscatd.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "sdts_al.h"
diff --git a/frmts/sdts/sdtsdataset.cpp b/frmts/sdts/sdtsdataset.cpp
index d4af7e5bcebd..29714be1a1f8 100644
--- a/frmts/sdts/sdtsdataset.cpp
+++ b/frmts/sdts/sdtsdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2008-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_frmts.h"
diff --git a/frmts/sdts/sdtsindexedreader.cpp b/frmts/sdts/sdtsindexedreader.cpp
index 2a909c63c6ae..c652ab251efe 100644
--- a/frmts/sdts/sdtsindexedreader.cpp
+++ b/frmts/sdts/sdtsindexedreader.cpp
@@ -10,23 +10,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "sdts_al.h"
diff --git a/frmts/sdts/sdtsiref.cpp b/frmts/sdts/sdtsiref.cpp
index 78dbf106490f..0e6990258cc5 100644
--- a/frmts/sdts/sdtsiref.cpp
+++ b/frmts/sdts/sdtsiref.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "sdts_al.h"
diff --git a/frmts/sdts/sdtslib.cpp b/frmts/sdts/sdtslib.cpp
index 9491114f4497..e57ce31a5f74 100644
--- a/frmts/sdts/sdtslib.cpp
+++ b/frmts/sdts/sdtslib.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "sdts_al.h"
diff --git a/frmts/sdts/sdtslinereader.cpp b/frmts/sdts/sdtslinereader.cpp
index fb34ca3b6050..73defe33befa 100644
--- a/frmts/sdts/sdtslinereader.cpp
+++ b/frmts/sdts/sdtslinereader.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "sdts_al.h"
diff --git a/frmts/sdts/sdtspointreader.cpp b/frmts/sdts/sdtspointreader.cpp
index 6499adffbcd2..6b3319c723cf 100644
--- a/frmts/sdts/sdtspointreader.cpp
+++ b/frmts/sdts/sdtspointreader.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "sdts_al.h"
diff --git a/frmts/sdts/sdtspolygonreader.cpp b/frmts/sdts/sdtspolygonreader.cpp
index 9acc8e9ab3e9..01cea6efc248 100644
--- a/frmts/sdts/sdtspolygonreader.cpp
+++ b/frmts/sdts/sdtspolygonreader.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "sdts_al.h"
diff --git a/frmts/sdts/sdtsrasterreader.cpp b/frmts/sdts/sdtsrasterreader.cpp
index 57858f1551d0..bcb9d4bd32bc 100644
--- a/frmts/sdts/sdtsrasterreader.cpp
+++ b/frmts/sdts/sdtsrasterreader.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "sdts_al.h"
diff --git a/frmts/sdts/sdtstransfer.cpp b/frmts/sdts/sdtstransfer.cpp
index 233ec3420dc8..fc629e13da4e 100644
--- a/frmts/sdts/sdtstransfer.cpp
+++ b/frmts/sdts/sdtstransfer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "sdts_al.h"
diff --git a/frmts/sdts/sdtsxref.cpp b/frmts/sdts/sdtsxref.cpp
index 992e94ed4bd7..1d3eede06e1d 100644
--- a/frmts/sdts/sdtsxref.cpp
+++ b/frmts/sdts/sdtsxref.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "sdts_al.h"
diff --git a/frmts/sentinel2/sentinel2dataset.cpp b/frmts/sentinel2/sentinel2dataset.cpp
index 2de45ee872f2..2d97eb187405 100644
--- a/frmts/sentinel2/sentinel2dataset.cpp
+++ b/frmts/sentinel2/sentinel2dataset.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault, <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_minixml.h"
@@ -78,15 +62,23 @@ typedef struct
     GDALColorInterp eColorInterp;
 } SENTINEL2BandDescription;
 
+/* clang-format off */
 static const SENTINEL2BandDescription asBandDesc[] = {
-    {"B1", 60, 443, 20, GCI_Undefined},    {"B2", 10, 490, 65, GCI_BlueBand},
-    {"B3", 10, 560, 35, GCI_GreenBand},    {"B4", 10, 665, 30, GCI_RedBand},
-    {"B5", 20, 705, 15, GCI_Undefined},    {"B6", 20, 740, 15, GCI_Undefined},
-    {"B7", 20, 783, 20, GCI_Undefined},    {"B8", 10, 842, 115, GCI_Undefined},
-    {"B8A", 20, 865, 20, GCI_Undefined},   {"B9", 60, 945, 20, GCI_Undefined},
-    {"B10", 60, 1375, 30, GCI_Undefined},  {"B11", 20, 1610, 90, GCI_Undefined},
-    {"B12", 20, 2190, 180, GCI_Undefined},
+    {"B1", 60, 443, 20, GCI_CoastalBand},
+    {"B2", 10, 490, 65, GCI_BlueBand},
+    {"B3", 10, 560, 35, GCI_GreenBand},
+    {"B4", 10, 665, 30, GCI_RedBand},
+    {"B5", 20, 705, 15, GCI_RedEdgeBand},   // rededge071
+    {"B6", 20, 740, 15, GCI_RedEdgeBand},   // rededge075
+    {"B7", 20, 783, 20, GCI_RedEdgeBand},   // rededge078
+    {"B8", 10, 842, 115, GCI_NIRBand},      // nir
+    {"B8A", 20, 865, 20, GCI_NIRBand},      // nir08
+    {"B9", 60, 945, 20, GCI_NIRBand},       // nir09
+    {"B10", 60, 1375, 30, GCI_OtherIRBand}, // cirrus
+    {"B11", 20, 1610, 90, GCI_SWIRBand},    // swir16
+    {"B12", 20, 2190, 180, GCI_SWIRBand},   // swir11
 };
+/* clang-format on */
 
 #define NB_BANDS (sizeof(asBandDesc) / sizeof(asBandDesc[0]))
 
@@ -1971,6 +1963,15 @@ static void SENTINEL2SetBandMetadata(GDALRasterBand *poBand,
         poBand->SetMetadataItem("WAVELENGTH",
                                 CPLSPrintf("%d", psBandDesc->nWaveLength));
         poBand->SetMetadataItem("WAVELENGTH_UNIT", "nm");
+
+        poBand->SetMetadataItem(
+            "CENTRAL_WAVELENGTH_UM",
+            CPLSPrintf("%.3f", double(psBandDesc->nWaveLength) / 1000),
+            "IMAGERY");
+        poBand->SetMetadataItem(
+            "FWHM_UM",
+            CPLSPrintf("%.3f", double(psBandDesc->nBandWidth) / 1000),
+            "IMAGERY");
     }
     else
     {
diff --git a/frmts/sgi/sgidataset.cpp b/frmts/sgi/sgidataset.cpp
index 88caa12f28a7..7837e3d18ab1 100644
--- a/frmts/sgi/sgidataset.cpp
+++ b/frmts/sgi/sgidataset.cpp
@@ -12,23 +12,7 @@
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/sigdem/sigdemdataset.cpp b/frmts/sigdem/sigdemdataset.cpp
index 89edc213fb64..17d45cdff3d3 100644
--- a/frmts/sigdem/sigdemdataset.cpp
+++ b/frmts/sigdem/sigdemdataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018, Paul Austin <paul.austin@revolsys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "sigdemdataset.h"
diff --git a/frmts/sigdem/sigdemdataset.h b/frmts/sigdem/sigdemdataset.h
index 518adc6fb77d..7a9c27f2694d 100644
--- a/frmts/sigdem/sigdemdataset.h
+++ b/frmts/sigdem/sigdemdataset.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018, Paul Austin <paul.austin@revolsys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_FRMTS_SIGDEMDATASET_H_INCLUDED
diff --git a/frmts/snap_tiff/CMakeLists.txt b/frmts/snap_tiff/CMakeLists.txt
new file mode 100644
index 000000000000..53d10df635f0
--- /dev/null
+++ b/frmts/snap_tiff/CMakeLists.txt
@@ -0,0 +1,9 @@
+add_gdal_driver(
+  TARGET gdal_SNAP_TIFF
+  SOURCES snaptiffdriver.cpp
+  PLUGIN_CAPABLE
+  NO_DEPS
+  STRONG_CXX_FLAGS
+)
+
+gdal_standard_includes(gdal_SNAP_TIFF)
diff --git a/frmts/snap_tiff/snaptiffdriver.cpp b/frmts/snap_tiff/snaptiffdriver.cpp
new file mode 100644
index 000000000000..e5e491187d9a
--- /dev/null
+++ b/frmts/snap_tiff/snaptiffdriver.cpp
@@ -0,0 +1,727 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "cpl_port.h"
+#include "cpl_minixml.h"
+#include "cpl_vsi_virtual.h"
+#include "gdal_pam.h"
+#include "rawdataset.h"
+
+#define LIBERTIFF_NS GDAL_libertiff
+#include "../../third_party/libertiff/libertiff.hpp"
+
+#include <algorithm>
+#include <cmath>
+
+constexpr const char *SNAP_TIFF_PREFIX = "SNAP_TIFF:";
+
+// Non-standard TIFF tag holding DIMAP XML for SNAP TIFF products
+constexpr uint16_t DIMAP_TAG = 65000;
+
+// Number of values per GCP in the GeoTIFFTiePoints tag
+constexpr int VALUES_PER_GCP = 6;
+
+constexpr int GCP_PIXEL = 0;
+constexpr int GCP_LINE = 1;
+// constexpr int GCP_DEPTH = 2;
+constexpr int GCP_X = 3;
+constexpr int GCP_Y = 4;
+constexpr int GCP_Z = 5;
+
+/************************************************************************/
+/*                            SNAPTIFFDataset                           */
+/************************************************************************/
+
+class SNAPTIFFDataset final : public GDALPamDataset
+{
+  public:
+    SNAPTIFFDataset() = default;
+
+    static int Identify(GDALOpenInfo *poOpenInfo);
+    static GDALDataset *Open(GDALOpenInfo *poOpenInfo);
+
+    char **GetMetadataDomainList() override;
+    char **GetMetadata(const char *pszDomain = "") override;
+    const char *GetMetadataItem(const char *pszName,
+                                const char *pszDomain = "") override;
+
+    const OGRSpatialReference *GetGCPSpatialRef() const override
+    {
+        return m_oSRS.IsEmpty() ? nullptr : &m_oSRS;
+    }
+
+    int GetGCPCount() override
+    {
+        return int(m_asGCPs.size());
+    }
+
+    const GDAL_GCP *GetGCPs() override
+    {
+        return gdal::GCP::c_ptr(m_asGCPs);
+    }
+
+  private:
+    VSIVirtualHandleUniquePtr m_poFile{};
+    std::unique_ptr<const LIBERTIFF_NS::Image> m_poImage{};
+
+    //! Whether this dataset is actually the geolocation array
+    bool m_bIsGeolocArray = false;
+
+    //! Content of "xml:DIMAP" metadata domain
+    CPLStringList m_aosDIMAPMetadata{};
+
+    CPLStringList m_aosGEOLOCATION{};
+    int m_nGeolocArrayWidth = 0;
+    int m_nGeolocArrayHeight = 0;
+
+    CPLStringList m_aosSUBDATASETS{};
+
+    std::vector<gdal::GCP> m_asGCPs{};
+    OGRSpatialReference m_oSRS{};
+
+    bool GetGeolocationMetadata();
+
+    void ReadSRS();
+};
+
+/************************************************************************/
+/*                              Identify()                              */
+/************************************************************************/
+
+int SNAPTIFFDataset::Identify(GDALOpenInfo *poOpenInfo)
+{
+    if (STARTS_WITH(poOpenInfo->pszFilename, SNAP_TIFF_PREFIX))
+        return true;
+
+    if (poOpenInfo->fpL == nullptr || poOpenInfo->nHeaderBytes < 16 ||
+        // BigEndian classic TIFF
+        memcmp(poOpenInfo->pabyHeader, "\x4D\x4D\x00\x2A", 4) != 0)
+    {
+        return false;
+    }
+
+    struct MyFileReader final : public LIBERTIFF_NS::FileReader
+    {
+        const GDALOpenInfo *m_poOpenInfo;
+
+        explicit MyFileReader(const GDALOpenInfo *poOpenInfoIn)
+            : m_poOpenInfo(poOpenInfoIn)
+        {
+        }
+
+        uint64_t size() const override
+        {
+            return m_poOpenInfo->nHeaderBytes;
+        }
+
+        size_t read(uint64_t offset, size_t count, void *buffer) const override
+        {
+            if (offset + count >
+                static_cast<uint64_t>(m_poOpenInfo->nHeaderBytes))
+                return 0;
+            memcpy(buffer,
+                   m_poOpenInfo->pabyHeader + static_cast<size_t>(offset),
+                   count);
+            return count;
+        }
+
+        CPL_DISALLOW_COPY_ASSIGN(MyFileReader)
+    };
+
+    auto f = std::make_shared<const MyFileReader>(poOpenInfo);
+#ifdef DEBUG
+    // Just to increase coverage testing
+    CPLAssert(f->size() == uint64_t(poOpenInfo->nHeaderBytes));
+    char dummy;
+    CPLAssert(f->read(poOpenInfo->nHeaderBytes, 1, &dummy) == 0);
+#endif
+    auto image = LIBERTIFF_NS::open</*acceptBigTIFF = */ false>(std::move(f));
+    // Checks that it is a single-band Float32 uncompressed dataset, made
+    // of a single strip.
+    if (!image || image->nextImageOffset() != 0 ||
+        image->compression() != LIBERTIFF_NS::Compression::None ||
+        image->sampleFormat() != LIBERTIFF_NS::SampleFormat::IEEEFP ||
+        image->samplesPerPixel() != 1 || image->bitsPerSample() != 32 ||
+        image->isTiled() || image->strileCount() != 1 || image->width() == 0 ||
+        image->width() > INT_MAX / sizeof(float) || image->height() == 0 ||
+        image->height() > INT_MAX || image->rowsPerStrip() != image->height() ||
+        !image->tag(LIBERTIFF_NS::TagCode::GeoTIFFPixelScale) ||
+        !image->tag(LIBERTIFF_NS::TagCode::GeoTIFFTiePoints) ||
+        !image->tag(LIBERTIFF_NS::TagCode::GeoTIFFGeoKeyDirectory) ||
+        !image->tag(DIMAP_TAG))
+    {
+        return false;
+    }
+
+    return true;
+}
+
+/************************************************************************/
+/*                               Open()                                 */
+/************************************************************************/
+
+GDALDataset *SNAPTIFFDataset::Open(GDALOpenInfo *poOpenInfo)
+{
+    if (poOpenInfo->eAccess == GA_Update || !Identify(poOpenInfo))
+        return nullptr;
+
+    bool bIsGeolocation = false;
+    // Check if it is SNAP_TIFF:"filename":{subdataset_component} syntax
+    if (STARTS_WITH(poOpenInfo->pszFilename, SNAP_TIFF_PREFIX))
+    {
+        const CPLStringList aosTokens(CSLTokenizeString2(
+            poOpenInfo->pszFilename, ":", CSLT_HONOURSTRINGS));
+        if (aosTokens.size() != 3)
+            return nullptr;
+        bIsGeolocation = EQUAL(aosTokens[2], "GEOLOCATION");
+        if (!bIsGeolocation && !EQUAL(aosTokens[2], "MAIN"))
+            return nullptr;
+        GDALOpenInfo oOpenInfo(aosTokens[1], GA_ReadOnly);
+        if (!Identify(&oOpenInfo))
+            return nullptr;
+        std::swap(poOpenInfo->fpL, oOpenInfo.fpL);
+        if (!poOpenInfo->fpL)
+            return nullptr;
+    }
+
+    struct MyFileReader final : public LIBERTIFF_NS::FileReader
+    {
+        VSILFILE *m_fp;
+        mutable uint64_t m_nFileSize = 0;
+
+        explicit MyFileReader(VSILFILE *fp) : m_fp(fp)
+        {
+        }
+
+        uint64_t size() const override
+        {
+            if (m_nFileSize == 0)
+            {
+                m_fp->Seek(0, SEEK_END);
+                m_nFileSize = m_fp->Tell();
+            }
+            return m_nFileSize;
+        }
+
+        size_t read(uint64_t offset, size_t count, void *buffer) const override
+        {
+            return m_fp->Seek(offset, SEEK_SET) == 0
+                       ? m_fp->Read(buffer, 1, count)
+                       : 0;
+        }
+
+        CPL_DISALLOW_COPY_ASSIGN(MyFileReader)
+    };
+
+    auto f = std::make_shared<const MyFileReader>(poOpenInfo->fpL);
+#ifdef DEBUG
+    // Just to increase coverage testing
+    char dummy;
+    CPLAssert(f->read(f->size(), 1, &dummy) == 0);
+#endif
+
+    auto poDS = std::make_unique<SNAPTIFFDataset>();
+
+    poDS->m_poImage = LIBERTIFF_NS::open(std::move(f));
+    if (!poDS->m_poImage)
+        return nullptr;
+    poDS->m_poFile.reset(poOpenInfo->fpL);
+    poOpenInfo->fpL = nullptr;
+
+    poDS->nRasterXSize = static_cast<int>(poDS->m_poImage->width());
+    poDS->nRasterYSize = static_cast<int>(poDS->m_poImage->height());
+    poDS->SetDescription(poOpenInfo->pszFilename);
+
+    if (bIsGeolocation)
+    {
+        poDS->m_bIsGeolocArray = true;
+        if (!poDS->GetGeolocationMetadata())
+        {
+            return nullptr;
+        }
+        poDS->nRasterXSize = poDS->m_nGeolocArrayWidth;
+        poDS->nRasterYSize = poDS->m_nGeolocArrayHeight;
+
+        const auto *psTag =
+            poDS->m_poImage->tag(LIBERTIFF_NS::TagCode::GeoTIFFTiePoints);
+
+        for (int iBand = 1; iBand <= 2; ++iBand)
+        {
+            auto poBand = std::make_unique<RawRasterBand>(
+                poDS->m_poFile.get(),
+                psTag->value_offset +
+                    (iBand == 1 ? GCP_X : GCP_Y) * sizeof(double),
+                int(sizeof(double)) * VALUES_PER_GCP,
+                int(sizeof(double)) * VALUES_PER_GCP * poDS->nRasterXSize,
+                GDT_Float64, !poDS->m_poImage->mustByteSwap(),
+                poDS->nRasterXSize, poDS->nRasterYSize,
+                RawRasterBand::OwnFP::NO);
+            if (!poBand->IsValid())
+                return nullptr;
+            if (iBand == 1)
+                poBand->SetDescription("Longitude");
+            else
+                poBand->SetDescription("Latitude");
+            poDS->SetBand(iBand, std::move(poBand));
+        }
+
+        return poDS.release();
+    }
+
+    poDS->ReadSRS();
+    poDS->GetGeolocationMetadata();
+
+    {
+        bool okStrileOffset = false;
+        auto poBand = std::make_unique<RawRasterBand>(
+            poDS->m_poFile.get(),
+            poDS->m_poImage->strileOffset(0, okStrileOffset),
+            int(sizeof(float)), int(sizeof(float)) * poDS->nRasterXSize,
+            GDT_Float32, !poDS->m_poImage->mustByteSwap(), poDS->nRasterXSize,
+            poDS->nRasterYSize, RawRasterBand::OwnFP::NO);
+        if (!poBand->IsValid())
+            return nullptr;
+        poDS->SetBand(1, std::move(poBand));
+    }
+    auto poBand = poDS->papoBands[0];
+
+    const auto &psImageDescription =
+        poDS->m_poImage->tag(LIBERTIFF_NS::TagCode::ImageDescription);
+    if (psImageDescription &&
+        psImageDescription->type == LIBERTIFF_NS::TagType::ASCII &&
+        !psImageDescription->invalid_value_offset &&
+        // Sanity check
+        psImageDescription->count < 100 * 1000)
+    {
+        bool ok = true;
+        const std::string s =
+            poDS->m_poImage->readTagAsString(*psImageDescription, ok);
+        if (ok)
+        {
+            poDS->GDALDataset::SetMetadataItem("IMAGE_DESCRIPTION", s.c_str());
+        }
+    }
+
+    const auto *psDimapTag = poDS->m_poImage->tag(DIMAP_TAG);
+    if (psDimapTag && psDimapTag->type == LIBERTIFF_NS::TagType::ASCII &&
+        !psDimapTag->invalid_value_offset)
+    {
+        try
+        {
+            bool ok = true;
+            // Just read the first 10 kB max to fetch essential band metadata
+            const std::string s = poDS->m_poImage->readContext()->readString(
+                psDimapTag->value_offset,
+                static_cast<size_t>(
+                    std::min<uint64_t>(psDimapTag->count, 10000)),
+                ok);
+            const auto posStart = s.find("<Spectral_Band_Info>");
+            if (posStart != std::string::npos)
+            {
+                const char *markerEnd = "</Spectral_Band_Info>";
+                const auto posEnd = s.find(markerEnd, posStart);
+                if (posEnd != std::string::npos)
+                {
+                    const std::string osSubstr = s.substr(
+                        posStart, posEnd - posStart + strlen(markerEnd));
+                    CPLXMLTreeCloser oRoot(CPLParseXMLString(osSubstr.c_str()));
+                    if (oRoot)
+                    {
+                        const char *pszNoDataValueUsed = CPLGetXMLValue(
+                            oRoot.get(), "NO_DATA_VALUE_USED", nullptr);
+                        const char *pszNoDataValue = CPLGetXMLValue(
+                            oRoot.get(), "NO_DATA_VALUE", nullptr);
+                        if (pszNoDataValueUsed && pszNoDataValue &&
+                            CPLTestBool(pszNoDataValueUsed))
+                        {
+                            poBand->SetNoDataValue(CPLAtof(pszNoDataValue));
+                        }
+
+                        if (const char *pszScalingFactor = CPLGetXMLValue(
+                                oRoot.get(), "SCALING_FACTOR", nullptr))
+                        {
+                            poBand->SetScale(CPLAtof(pszScalingFactor));
+                        }
+
+                        if (const char *pszScalingOffset = CPLGetXMLValue(
+                                oRoot.get(), "SCALING_OFFSET", nullptr))
+                        {
+                            poBand->SetOffset(CPLAtof(pszScalingOffset));
+                        }
+
+                        if (const char *pszBandName = CPLGetXMLValue(
+                                oRoot.get(), "BAND_NAME", nullptr))
+                        {
+                            poBand->SetDescription(pszBandName);
+                        }
+
+                        if (const char *pszUnit = CPLGetXMLValue(
+                                oRoot.get(), "PHYSICAL_UNIT", nullptr))
+                        {
+                            poBand->SetUnitType(pszUnit);
+                        }
+                    }
+                }
+            }
+        }
+        catch (const std::exception &)
+        {
+        }
+    }
+
+    // Initialize PAM
+    poDS->SetDescription(poOpenInfo->pszFilename);
+    poDS->TryLoadXML();
+
+    // Check for overviews.
+    poDS->oOvManager.Initialize(poDS.get(), poOpenInfo->pszFilename);
+
+    return poDS.release();
+}
+
+/************************************************************************/
+/*                      GetMetadataDomainList()                         */
+/************************************************************************/
+
+char **SNAPTIFFDataset::GetMetadataDomainList()
+{
+    return BuildMetadataDomainList(GDALPamDataset::GetMetadataDomainList(),
+                                   TRUE, "GEOLOCATION", "SUBDATASETS",
+                                   "xml:DIMAP", nullptr);
+}
+
+/************************************************************************/
+/*                      GetGeolocationMetadata()                        */
+/************************************************************************/
+
+// (Partially) read the content of the GeoTIFFTiePoints tag to check if the
+// tie points form a regular geolocation array, and extract the width, height,
+// and spacing of that geolocation array. Also fills the m_aosGEOLOCATION
+// metadata domain
+bool SNAPTIFFDataset::GetGeolocationMetadata()
+{
+    const auto *psTag = m_poImage->tag(LIBERTIFF_NS::TagCode::GeoTIFFTiePoints);
+    if (psTag && psTag->type == LIBERTIFF_NS::TagType::Double &&
+        !psTag->invalid_value_offset && (psTag->count % VALUES_PER_GCP) == 0 &&
+        // Sanity check
+        psTag->count <= uint64_t(nRasterXSize) * nRasterYSize * VALUES_PER_GCP)
+    {
+        const int numGCPs = int(psTag->count / VALUES_PER_GCP);
+
+        // Assume that the geolocation array has the same proportion as the
+        // main array
+        const double dfGCPArrayWidth =
+            sqrt(double(nRasterXSize) * numGCPs / nRasterYSize);
+        const double dfGCPArrayHeight =
+            sqrt(double(nRasterYSize) * numGCPs / nRasterXSize);
+        if (dfGCPArrayWidth > INT_MAX || dfGCPArrayHeight > INT_MAX)
+        {
+            return false;
+        }
+
+        const int nGCPArrayWidth = int(std::round(dfGCPArrayWidth));
+        const int nGCPArrayHeight = int(std::round(dfGCPArrayHeight));
+        constexpr int NUM_LINES = 3;
+        if (nGCPArrayWidth * nGCPArrayHeight != numGCPs ||
+            nGCPArrayHeight < NUM_LINES)
+        {
+            return false;
+        }
+
+        bool ok = true;
+        // Just read the first 3 lines of the geolocation array
+        const auto numValuesPerLine = nGCPArrayWidth * VALUES_PER_GCP;
+        const auto values = m_poImage->readContext()->readArray<double>(
+            psTag->value_offset, numValuesPerLine * NUM_LINES, ok);
+        if (!ok || values.empty())
+            return false;
+
+        if (values[GCP_LINE] != 0.5 && values[GCP_PIXEL] != 0.5)
+            return false;
+
+        constexpr double RELATIVE_TOLERANCE = 1e-5;
+        constexpr double PIXEL_TOLERANCE = 1e-3;
+
+        // Check that pixel spacing is constant on all three first lines
+        const double pixelSpacing =
+            values[VALUES_PER_GCP + GCP_PIXEL] - values[GCP_PIXEL];
+        if (!(pixelSpacing >= 1))
+            return false;
+        if (std::fabs(pixelSpacing * (nGCPArrayWidth - 1) -
+                      (nRasterXSize - 1)) > PIXEL_TOLERANCE)
+            return false;
+
+        double adfY[NUM_LINES];
+        for (int iLine = 0; iLine < NUM_LINES; ++iLine)
+        {
+            adfY[iLine] = values[iLine * numValuesPerLine + GCP_LINE];
+            for (int i = iLine * numValuesPerLine + VALUES_PER_GCP;
+                 i < (iLine + 1) * numValuesPerLine; i += VALUES_PER_GCP)
+            {
+                if (values[i + GCP_LINE] !=
+                    values[i - VALUES_PER_GCP + GCP_LINE])
+                {
+                    return false;
+                }
+                const double pixelSpacingNew =
+                    values[i + GCP_PIXEL] -
+                    values[i - VALUES_PER_GCP + GCP_PIXEL];
+                if (std::fabs(pixelSpacingNew - pixelSpacing) >
+                    RELATIVE_TOLERANCE * std::fabs(pixelSpacing))
+                {
+                    return false;
+                }
+            }
+        }
+
+        // Check that line spacing is constant on the three first lines
+        const double lineSpacing = adfY[1] - adfY[0];
+        if (!(lineSpacing >= 1))
+            return false;
+        if (std::fabs(lineSpacing * (nGCPArrayHeight - 1) -
+                      (nRasterYSize - 1)) > PIXEL_TOLERANCE)
+            return false;
+
+        for (int iLine = 1; iLine + 1 < NUM_LINES; ++iLine)
+        {
+            const double lineSpacingNew = adfY[iLine + 1] - adfY[iLine];
+            if (std::fabs(lineSpacingNew - lineSpacing) >
+                RELATIVE_TOLERANCE * std::fabs(lineSpacing))
+            {
+                return false;
+            }
+        }
+
+        // Read last line
+        const auto lastLineValue = m_poImage->readContext()->readArray<double>(
+            psTag->value_offset + uint64_t(nGCPArrayHeight - 1) *
+                                      numValuesPerLine * sizeof(double),
+            numValuesPerLine, ok);
+        if (!ok)
+            return false;
+
+        if (!m_bIsGeolocArray)
+        {
+            // Expose the 4 corner GCPs for rough georeferencing.
+
+            const uint32_t nShift = numValuesPerLine - VALUES_PER_GCP;
+            m_asGCPs.emplace_back("TL", "Top Left", values[GCP_PIXEL],
+                                  values[GCP_LINE], values[GCP_X],
+                                  values[GCP_Y], values[GCP_Z]);
+            m_asGCPs.emplace_back(
+                "TR", "Top Right", values[nShift + GCP_PIXEL],
+                values[nShift + GCP_LINE], values[nShift + GCP_X],
+                values[nShift + GCP_Y], values[nShift + GCP_Z]);
+            m_asGCPs.emplace_back("BL", "Bottom Left", lastLineValue[GCP_PIXEL],
+                                  lastLineValue[GCP_LINE], lastLineValue[GCP_X],
+                                  lastLineValue[GCP_Y], lastLineValue[GCP_Z]);
+            m_asGCPs.emplace_back(
+                "BR", "Bottom Right", lastLineValue[nShift + GCP_PIXEL],
+                lastLineValue[nShift + GCP_LINE], lastLineValue[nShift + GCP_X],
+                lastLineValue[nShift + GCP_Y], lastLineValue[nShift + GCP_Z]);
+        }
+
+        m_nGeolocArrayWidth = nGCPArrayWidth;
+        m_nGeolocArrayHeight = nGCPArrayHeight;
+
+        if (!m_bIsGeolocArray)
+        {
+            if (!m_oSRS.IsEmpty())
+            {
+                char *pszWKT = nullptr;
+                m_oSRS.exportToWkt(&pszWKT);
+                m_aosGEOLOCATION.SetNameValue("SRS", pszWKT);
+                CPLFree(pszWKT);
+            }
+
+            m_aosGEOLOCATION.SetNameValue(
+                "X_DATASET", CPLSPrintf("%s\"%s\":GEOLOCATION",
+                                        SNAP_TIFF_PREFIX, GetDescription()));
+            m_aosGEOLOCATION.SetNameValue("X_BAND", "1");
+            m_aosGEOLOCATION.SetNameValue(
+                "Y_DATASET", CPLSPrintf("%s\"%s\":GEOLOCATION",
+                                        SNAP_TIFF_PREFIX, GetDescription()));
+            m_aosGEOLOCATION.SetNameValue("Y_BAND", "2");
+            m_aosGEOLOCATION.SetNameValue("PIXEL_OFFSET", "0");
+            m_aosGEOLOCATION.SetNameValue("PIXEL_STEP",
+                                          CPLSPrintf("%.17g", pixelSpacing));
+            m_aosGEOLOCATION.SetNameValue("LINE_OFFSET", "0");
+            m_aosGEOLOCATION.SetNameValue("LINE_STEP",
+                                          CPLSPrintf("%.17g", lineSpacing));
+        }
+
+        return true;
+    }
+    return false;
+}
+
+/************************************************************************/
+/*                             ReadSRS()                                */
+/************************************************************************/
+
+// Simplified GeoTIFF SRS reader, assuming the SRS is encoded as a EPSG code
+void SNAPTIFFDataset::ReadSRS()
+{
+    const auto &psGeoKeysTag =
+        m_poImage->tag(LIBERTIFF_NS::TagCode::GeoTIFFGeoKeyDirectory);
+    constexpr int VALUES_PER_GEOKEY = 4;
+    if (psGeoKeysTag && psGeoKeysTag->type == LIBERTIFF_NS::TagType::Short &&
+        !psGeoKeysTag->invalid_value_offset &&
+        psGeoKeysTag->count >= VALUES_PER_GEOKEY &&
+        (psGeoKeysTag->count % VALUES_PER_GEOKEY) == 0 &&
+        // Sanity check
+        psGeoKeysTag->count < 1000)
+    {
+        bool ok = true;
+        const auto values =
+            m_poImage->readTagAsVector<uint16_t>(*psGeoKeysTag, ok);
+        if (values.size() >= 4)
+        {
+            const uint16_t geokeysCount = values[3];
+            constexpr uint16_t GEOTIFF_KEY_DIRECTORY_VERSION_V1 = 1;
+            constexpr uint16_t GEOTIFF_KEY_VERSION_MAJOR_V1 = 1;
+            if (values[0] == GEOTIFF_KEY_DIRECTORY_VERSION_V1 &&
+                // GeoTIFF 1.x
+                values[1] == GEOTIFF_KEY_VERSION_MAJOR_V1 &&
+                geokeysCount == psGeoKeysTag->count / VALUES_PER_GEOKEY - 1)
+            {
+                constexpr uint16_t GeoTIFFTypeShort = 0;
+                constexpr uint16_t GeodeticCRSGeoKey = 2048;
+                constexpr uint16_t ProjectedCRSGeoKey = 3072;
+                uint16_t nEPSGCode = 0;
+                for (uint32_t i = 1; i <= geokeysCount; ++i)
+                {
+                    const auto geokey = values[VALUES_PER_GEOKEY * i];
+                    const auto geokeyType = values[VALUES_PER_GEOKEY * i + 1];
+                    const auto geokeyCount = values[VALUES_PER_GEOKEY * i + 2];
+                    const auto geokeyValue = values[VALUES_PER_GEOKEY * i + 3];
+                    if ((geokey == GeodeticCRSGeoKey ||
+                         geokey == ProjectedCRSGeoKey) &&
+                        geokeyType == GeoTIFFTypeShort && geokeyCount == 1 &&
+                        geokeyValue > 0)
+                    {
+                        nEPSGCode = geokeyValue;
+                        if (geokey == ProjectedCRSGeoKey)
+                            break;
+                    }
+                }
+                if (nEPSGCode > 0)
+                {
+                    m_oSRS.SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+                    m_oSRS.importFromEPSG(nEPSGCode);
+                }
+            }
+        }
+    }
+}
+
+/************************************************************************/
+/*                            GetMetadata()                             */
+/************************************************************************/
+
+char **SNAPTIFFDataset::GetMetadata(const char *pszDomain)
+{
+    if (!m_bIsGeolocArray)
+    {
+        if (pszDomain && EQUAL(pszDomain, "xml:DIMAP"))
+        {
+            if (m_aosDIMAPMetadata.empty())
+            {
+                const auto *psDimapTag = m_poImage->tag(DIMAP_TAG);
+                if (psDimapTag &&
+                    psDimapTag->type == LIBERTIFF_NS::TagType::ASCII &&
+                    !psDimapTag->invalid_value_offset &&
+                    // Sanity check
+                    psDimapTag->count < 100 * 1000 * 1000)
+                {
+                    try
+                    {
+                        bool ok = true;
+                        const std::string s =
+                            m_poImage->readTagAsString(*psDimapTag, ok);
+                        if (ok)
+                        {
+                            m_aosDIMAPMetadata.AddString(s.c_str());
+                        }
+                    }
+                    catch (const std::exception &)
+                    {
+                        CPLError(CE_Failure, CPLE_OutOfMemory,
+                                 "Out of memory in GetMetadata()");
+                    }
+                }
+            }
+            return m_aosDIMAPMetadata.List();
+        }
+        else if (pszDomain && EQUAL(pszDomain, "GEOLOCATION"))
+        {
+            return m_aosGEOLOCATION.List();
+        }
+        else if (pszDomain && EQUAL(pszDomain, "SUBDATASETS"))
+        {
+            if (m_aosSUBDATASETS.empty() && GetGeolocationMetadata())
+            {
+                m_aosSUBDATASETS.SetNameValue("SUBDATASET_1_NAME",
+                                              CPLSPrintf("%s\"%s\":MAIN",
+                                                         SNAP_TIFF_PREFIX,
+                                                         GetDescription()));
+                m_aosSUBDATASETS.SetNameValue("SUBDATASET_1_DESC",
+                                              std::string("Main content of ")
+                                                  .append(GetDescription())
+                                                  .c_str());
+
+                m_aosSUBDATASETS.SetNameValue(
+                    "SUBDATASET_2_NAME",
+                    m_aosGEOLOCATION.FetchNameValue("X_DATASET"));
+                m_aosSUBDATASETS.SetNameValue(
+                    "SUBDATASET_2_DESC", std::string("Geolocation array of ")
+                                             .append(GetDescription())
+                                             .c_str());
+            }
+            return m_aosSUBDATASETS.List();
+        }
+    }
+
+    return GDALPamDataset::GetMetadata(pszDomain);
+}
+
+/************************************************************************/
+/*                         GetMetadataItem()                            */
+/************************************************************************/
+
+const char *SNAPTIFFDataset::GetMetadataItem(const char *pszName,
+                                             const char *pszDomain)
+{
+    if (!m_bIsGeolocArray && pszDomain &&
+        (EQUAL(pszDomain, "GEOLOCATION") || EQUAL(pszDomain, "SUBDATASETS")))
+    {
+        return CSLFetchNameValue(GetMetadata(pszDomain), pszName);
+    }
+    return GDALPamDataset::GetMetadataItem(pszName, pszDomain);
+}
+
+/************************************************************************/
+/*                     GDALRegister_SNAP_TIFF()                         */
+/************************************************************************/
+
+void GDALRegister_SNAP_TIFF()
+{
+    if (GDALGetDriverByName("SNAP_TIFF") != nullptr)
+        return;
+
+    GDALDriver *poDriver = new GDALDriver();
+    poDriver->SetDescription("SNAP_TIFF");
+    poDriver->SetMetadataItem(GDAL_DCAP_RASTER, "YES");
+    poDriver->SetMetadataItem(GDAL_DMD_LONGNAME,
+                              "Sentinel Application Processing GeoTIFF");
+    poDriver->SetMetadataItem(GDAL_DMD_HELPTOPIC,
+                              "drivers/raster/snap_tiff.html");
+    poDriver->SetMetadataItem(GDAL_DMD_MIMETYPE, "image/tiff");
+    poDriver->SetMetadataItem(GDAL_DMD_EXTENSIONS, "tif tiff");
+    poDriver->SetMetadataItem(GDAL_DCAP_VIRTUALIO, "YES");
+
+    poDriver->pfnOpen = SNAPTIFFDataset::Open;
+    poDriver->pfnIdentify = SNAPTIFFDataset::Identify;
+
+    GetGDALDriverManager()->RegisterDriver(poDriver);
+}
diff --git a/frmts/srtmhgt/srtmhgtdataset.cpp b/frmts/srtmhgt/srtmhgtdataset.cpp
index 367ef23af841..cfba2c36c39c 100644
--- a/frmts/srtmhgt/srtmhgtdataset.cpp
+++ b/frmts/srtmhgt/srtmhgtdataset.cpp
@@ -11,23 +11,7 @@
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -57,6 +41,8 @@ class SRTMHGTDataset final : public GDALPamDataset
     GByte *pabyBuffer = nullptr;
     OGRSpatialReference m_oSRS{};
 
+    static GDALPamDataset *OpenPAM(GDALOpenInfo *);
+
   public:
     SRTMHGTDataset();
     virtual ~SRTMHGTDataset();
@@ -344,11 +330,12 @@ int SRTMHGTDataset::Identify(GDALOpenInfo *poOpenInfo)
 
     if (VSIStatL(poOpenInfo->pszFilename, &fileStat) != 0)
         return FALSE;
-    if (fileStat.st_size != 3601 * 3601 &&
+    if (fileStat.st_size != 1201 * 1201 * 2 &&
+        fileStat.st_size != 1801 * 3601 * 2 &&
+        fileStat.st_size != 3601 * 3601 &&
         fileStat.st_size != 3601 * 3601 * 2 &&
         fileStat.st_size != 3601 * 3601 * 4 &&  // .hgts
-        fileStat.st_size != 1801 * 3601 * 2 &&
-        fileStat.st_size != 1201 * 1201 * 2)
+        fileStat.st_size != 7201 * 7201 * 2)
         return FALSE;
 
     return TRUE;
@@ -359,6 +346,15 @@ int SRTMHGTDataset::Identify(GDALOpenInfo *poOpenInfo)
 /************************************************************************/
 
 GDALDataset *SRTMHGTDataset::Open(GDALOpenInfo *poOpenInfo)
+{
+    return OpenPAM(poOpenInfo);
+}
+
+/************************************************************************/
+/*                              OpenPAM()                               */
+/************************************************************************/
+
+GDALPamDataset *SRTMHGTDataset::OpenPAM(GDALOpenInfo *poOpenInfo)
 {
     if (!Identify(poOpenInfo))
         return nullptr;
@@ -373,7 +369,7 @@ GDALDataset *SRTMHGTDataset::Open(GDALOpenInfo *poOpenInfo)
         osFilename += CPLString(fileName).substr(0, 7);
         osFilename += ".hgt";
         GDALOpenInfo oOpenInfo(osFilename, poOpenInfo->eAccess);
-        GDALDataset *poDS = Open(&oOpenInfo);
+        auto poDS = OpenPAM(&oOpenInfo);
         if (poDS != nullptr)
         {
             // override description with the main one
@@ -391,7 +387,7 @@ GDALDataset *SRTMHGTDataset::Open(GDALOpenInfo *poOpenInfo)
         osFilename += CPLString(fileName).substr(0, 7);
         osFilename += ".raw";
         GDALOpenInfo oOpenInfo(osFilename, poOpenInfo->eAccess);
-        GDALDataset *poDS = Open(&oOpenInfo);
+        auto poDS = OpenPAM(&oOpenInfo);
         if (poDS != nullptr)
         {
             // override description with the main one
@@ -426,7 +422,7 @@ GDALDataset *SRTMHGTDataset::Open(GDALOpenInfo *poOpenInfo)
     /* -------------------------------------------------------------------- */
     /*      Create a corresponding GDALDataset.                             */
     /* -------------------------------------------------------------------- */
-    SRTMHGTDataset *poDS = new SRTMHGTDataset();
+    auto poDS = std::make_unique<SRTMHGTDataset>();
 
     poDS->fpImage = poOpenInfo->fpL;
     poOpenInfo->fpL = nullptr;
@@ -434,7 +430,6 @@ GDALDataset *SRTMHGTDataset::Open(GDALOpenInfo *poOpenInfo)
     VSIStatBufL fileStat;
     if (VSIStatL(poOpenInfo->pszFilename, &fileStat) != 0)
     {
-        delete poDS;
         return nullptr;
     }
 
@@ -443,6 +438,13 @@ GDALDataset *SRTMHGTDataset::Open(GDALOpenInfo *poOpenInfo)
     GDALDataType eDT = GDT_Int16;
     switch (fileStat.st_size)
     {
+        case 1201 * 1201 * 2:
+            numPixels_x = numPixels_y = 1201;
+            break;
+        case 1801 * 3601 * 2:
+            numPixels_x = 1801;
+            numPixels_y = 3601;
+            break;
         case 3601 * 3601:
             numPixels_x = numPixels_y = 3601;
             eDT = GDT_Byte;
@@ -454,12 +456,8 @@ GDALDataset *SRTMHGTDataset::Open(GDALOpenInfo *poOpenInfo)
             numPixels_x = numPixels_y = 3601;
             eDT = GDT_Float32;
             break;
-        case 1801 * 3601 * 2:
-            numPixels_x = 1801;
-            numPixels_y = 3601;
-            break;
-        case 1201 * 1201 * 2:
-            numPixels_x = numPixels_y = 1201;
+        case 7201 * 7201 * 2:
+            numPixels_x = numPixels_y = 7201;
             break;
         default:
             numPixels_x = numPixels_y = 0;
@@ -494,7 +492,7 @@ GDALDataset *SRTMHGTDataset::Open(GDALOpenInfo *poOpenInfo)
     /* -------------------------------------------------------------------- */
     /*      Create band information object.                                 */
     /* -------------------------------------------------------------------- */
-    SRTMHGTRasterBand *tmpBand = new SRTMHGTRasterBand(poDS, 1, eDT);
+    SRTMHGTRasterBand *tmpBand = new SRTMHGTRasterBand(poDS.get(), 1, eDT);
     poDS->SetBand(1, tmpBand);
 
     /* -------------------------------------------------------------------- */
@@ -506,9 +504,9 @@ GDALDataset *SRTMHGTDataset::Open(GDALOpenInfo *poOpenInfo)
     /* -------------------------------------------------------------------- */
     /*      Support overviews.                                              */
     /* -------------------------------------------------------------------- */
-    poDS->oOvManager.Initialize(poDS, poOpenInfo->pszFilename);
+    poDS->oOvManager.Initialize(poDS.get(), poOpenInfo->pszFilename);
 
-    return poDS;
+    return poDS.release();
 }
 
 /************************************************************************/
@@ -593,12 +591,13 @@ GDALDataset *SRTMHGTDataset::CreateCopy(const char *pszFilename,
     const int nYSize = poSrcDS->GetRasterYSize();
 
     if (!((nXSize == 1201 && nYSize == 1201) ||
+          (nXSize == 1801 && nYSize == 3601) ||
           (nXSize == 3601 && nYSize == 3601) ||
-          (nXSize == 1801 && nYSize == 3601)))
+          (nXSize == 7201 && nYSize == 7201)))
     {
-        CPLError(
-            CE_Failure, CPLE_AppDefined,
-            "Image dimensions should be 1201x1201, 3601x3601 or 1801x3601.");
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Image dimensions should be 1201x1201, 1801x3601, 3601x3601 "
+                 "or 7201x7201.");
         return nullptr;
     }
 
@@ -687,8 +686,8 @@ GDALDataset *SRTMHGTDataset::CreateCopy(const char *pszFilename,
     /* -------------------------------------------------------------------- */
     /*      Reopen and copy missing information into a PAM file.            */
     /* -------------------------------------------------------------------- */
-    GDALPamDataset *poDS =
-        reinterpret_cast<GDALPamDataset *>(GDALOpen(pszFilename, GA_ReadOnly));
+    GDALOpenInfo oOpenInfo(pszFilename, GA_ReadOnly);
+    auto poDS = OpenPAM(&oOpenInfo);
 
     if (poDS)
         poDS->CloneInfo(poSrcDS, GCIF_PAM_DEFAULT);
diff --git a/frmts/stacit/stacitdataset.cpp b/frmts/stacit/stacitdataset.cpp
index 58f3f10c1f24..67890135c26f 100644
--- a/frmts/stacit/stacitdataset.cpp
+++ b/frmts/stacit/stacitdataset.cpp
@@ -7,26 +7,11 @@
  ******************************************************************************
  * Copyright (c) 2021, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_json.h"
+#include "cpl_http.h"
 #include "vrtdataset.h"
 #include "ogr_spatialref.h"
 
@@ -97,6 +82,7 @@ class STACITDataset final : public VRTDataset
 
 STACITDataset::STACITDataset() : VRTDataset(0, 0)
 {
+    poDriver = nullptr;  // cancel what the VRTDataset did
     SetWritable(false);
 }
 
@@ -111,6 +97,13 @@ int STACITDataset::Identify(GDALOpenInfo *poOpenInfo)
         return true;
     }
 
+    const bool bIsSingleDriver = poOpenInfo->IsSingleAllowedDriver("STACIT");
+    if (bIsSingleDriver && (STARTS_WITH(poOpenInfo->pszFilename, "http://") ||
+                            STARTS_WITH(poOpenInfo->pszFilename, "https://")))
+    {
+        return true;
+    }
+
     if (poOpenInfo->nHeaderBytes == 0)
     {
         return false;
@@ -122,6 +115,14 @@ int STACITDataset::Identify(GDALOpenInfo *poOpenInfo)
         // before the loop.
         const char *pszHeader =
             reinterpret_cast<const char *>(poOpenInfo->pabyHeader);
+        while (*pszHeader != 0 &&
+               std::isspace(static_cast<unsigned char>(*pszHeader)))
+            ++pszHeader;
+        if (bIsSingleDriver)
+        {
+            return pszHeader[0] == '{';
+        }
+
         if (strstr(pszHeader, "\"stac_version\"") != nullptr &&
             strstr(pszHeader, "\"proj:transform\"") != nullptr)
         {
@@ -161,7 +162,7 @@ static std::string SanitizeCRSValue(const std::string &v)
         }
     }
     if (!ret.empty() && ret.back() == '_')
-        ret.resize(ret.size() - 1);
+        ret.pop_back();
     return ret;
 }
 
@@ -585,17 +586,13 @@ bool STACITDataset::SetupDataset(
             if (!osBandName.empty())
                 poVRTBand->SetDescription(osBandName.c_str());
 
-            if (eInterp != GCI_Undefined)
+            const auto osCommonName = eoBand["common_name"].ToString();
+            if (!osCommonName.empty())
             {
-                const auto osCommonName = eoBand["common_name"].ToString();
-                if (osCommonName == "red")
-                    poVRTBand->SetColorInterpretation(GCI_RedBand);
-                else if (osCommonName == "green")
-                    poVRTBand->SetColorInterpretation(GCI_GreenBand);
-                else if (osCommonName == "blue")
-                    poVRTBand->SetColorInterpretation(GCI_BlueBand);
-                else if (osCommonName == "alpha")
-                    poVRTBand->SetColorInterpretation(GCI_AlphaBand);
+                const auto eInterpFromCommonName =
+                    GDALGetColorInterpFromSTACCommonName(osCommonName.c_str());
+                if (eInterpFromCommonName != GCI_Undefined)
+                    poVRTBand->SetColorInterpretation(eInterpFromCommonName);
             }
 
             for (const auto &eoBandChild : eoBand.GetChildren())
@@ -747,7 +744,9 @@ bool STACITDataset::Open(GDALOpenInfo *poOpenInfo)
     GIntBig nMaxItems = CPLAtoGIntBig(CSLFetchNameValueDef(
         poOpenInfo->papszOpenOptions, "MAX_ITEMS", "1000"));
 
-    if (CSLFetchNameValue(poOpenInfo->papszOpenOptions, "MAX_ITEMS") == nullptr)
+    const bool bMaxItemsSpecified =
+        CSLFetchNameValue(poOpenInfo->papszOpenOptions, "MAX_ITEMS") != nullptr;
+    if (!bMaxItemsSpecified)
     {
         // If the URL includes a limit parameter, and it's larger than our
         // default MAX_ITEMS value, then increase the later to the former.
@@ -761,13 +760,70 @@ bool STACITDataset::Open(GDALOpenInfo *poOpenInfo)
     }
 
     auto osCurFilename = osFilename;
+    std::string osMethod = "GET";
+    CPLJSONObject oHeaders;
+    CPLJSONObject oBody;
+    bool bMerge = false;
+    int nLoops = 0;
     do
     {
+        ++nLoops;
+        if (nMaxItems > 0 && nLoops > nMaxItems)
+        {
+            break;
+        }
+
         CPLJSONDocument oDoc;
+
         if (STARTS_WITH(osCurFilename, "http://") ||
             STARTS_WITH(osCurFilename, "https://"))
         {
-            if (!oDoc.LoadUrl(osCurFilename, nullptr))
+            // Cf // Cf https://github.com/radiantearth/stac-api-spec/tree/release/v1.0.0/item-search#pagination
+            CPLStringList aosOptions;
+            if (oBody.IsValid() &&
+                oBody.GetType() == CPLJSONObject::Type::Object)
+            {
+                if (bMerge)
+                    CPLDebug("STACIT",
+                             "Ignoring 'merge' attribute from next link");
+                const std::string osPostContent =
+                    oBody.Format(CPLJSONObject::PrettyFormat::Pretty);
+                aosOptions.SetNameValue("POSTFIELDS", osPostContent.c_str());
+            }
+            aosOptions.SetNameValue("CUSTOMREQUEST", osMethod.c_str());
+            CPLString osHeaders;
+            if (!oHeaders.IsValid() ||
+                oHeaders.GetType() != CPLJSONObject::Type::Object ||
+                oHeaders["Content-Type"].ToString().empty())
+            {
+                osHeaders = "Content-Type: application/json";
+            }
+            if (oHeaders.IsValid() &&
+                oHeaders.GetType() == CPLJSONObject::Type::Object)
+            {
+                for (const auto &obj : oHeaders.GetChildren())
+                {
+                    osHeaders += "\r\n";
+                    osHeaders += obj.GetName();
+                    osHeaders += ": ";
+                    osHeaders += obj.ToString();
+                }
+            }
+            aosOptions.SetNameValue("HEADERS", osHeaders.c_str());
+            CPLHTTPResult *psResult =
+                CPLHTTPFetch(osCurFilename.c_str(), aosOptions.List());
+            if (!psResult)
+                return false;
+            if (!psResult->pabyData)
+            {
+                CPLHTTPDestroyResult(psResult);
+                return false;
+            }
+            const bool bOK = oDoc.LoadMemory(
+                reinterpret_cast<const char *>(psResult->pabyData));
+            // CPLDebug("STACIT", "Response: %s", reinterpret_cast<const char*>(psResult->pabyData));
+            CPLHTTPDestroyResult(psResult);
+            if (!bOK)
                 return false;
         }
         else
@@ -776,16 +832,24 @@ bool STACITDataset::Open(GDALOpenInfo *poOpenInfo)
                 return false;
         }
         const auto oRoot = oDoc.GetRoot();
-        const auto oFeatures = oRoot.GetArray("features");
+        auto oFeatures = oRoot.GetArray("features");
         if (!oFeatures.IsValid())
         {
-            CPLError(CE_Failure, CPLE_AppDefined, "Missing features");
-            return false;
+            if (oRoot.GetString("type") == "Feature")
+            {
+                oFeatures = CPLJSONArray();
+                oFeatures.Add(oRoot);
+            }
+            else
+            {
+                CPLError(CE_Failure, CPLE_AppDefined, "Missing features");
+                return false;
+            }
         }
         for (const auto &oFeature : oFeatures)
         {
             nItemIter++;
-            if (nItemIter > nMaxItems)
+            if (nMaxItems > 0 && nItemIter > nMaxItems)
             {
                 break;
             }
@@ -849,10 +913,9 @@ bool STACITDataset::Open(GDALOpenInfo *poOpenInfo)
                            oMapCollection);
             }
         }
-        if (nItemIter >= nMaxItems)
+        if (nMaxItems > 0 && nItemIter >= nMaxItems)
         {
-            if (CSLFetchNameValue(poOpenInfo->papszOpenOptions, "MAX_ITEMS") ==
-                nullptr)
+            if (!bMaxItemsSpecified)
             {
                 CPLError(CE_Warning, CPLE_AppDefined,
                          "Maximum number of items (" CPL_FRMT_GIB
@@ -870,20 +933,35 @@ bool STACITDataset::Open(GDALOpenInfo *poOpenInfo)
         }
 
         // Follow next link
+        // Cf https://github.com/radiantearth/stac-api-spec/tree/release/v1.0.0/item-search#pagination
         const auto oLinks = oRoot.GetArray("links");
         if (!oLinks.IsValid())
             break;
         std::string osNewFilename;
         for (const auto &oLink : oLinks)
         {
-            if (oLink["rel"].ToString() == "next")
+            const auto osType = oLink["type"].ToString();
+            if (oLink["rel"].ToString() == "next" &&
+                (osType.empty() || osType == "application/geo+json"))
             {
+                osMethod = oLink.GetString("method", "GET");
                 osNewFilename = oLink["href"].ToString();
-                break;
+                oHeaders = oLink["headers"];
+                oBody = oLink["body"];
+                bMerge = oLink.GetBool("merge", false);
+                if (osType == "application/geo+json")
+                {
+                    break;
+                }
             }
         }
-        if (!osNewFilename.empty() && osNewFilename != osCurFilename)
+        if (!osNewFilename.empty() &&
+            (osNewFilename != osCurFilename ||
+             (oBody.IsValid() &&
+              oBody.GetType() == CPLJSONObject::Type::Object)))
+        {
             osCurFilename = osNewFilename;
+        }
         else
             osCurFilename.clear();
     } while (!osCurFilename.empty());
diff --git a/frmts/stacta/stactadataset.cpp b/frmts/stacta/stactadataset.cpp
index 0383e1a785a4..9173a2426fa4 100644
--- a/frmts/stacta/stactadataset.cpp
+++ b/frmts/stacta/stactadataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2020, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_json.h"
@@ -489,8 +473,13 @@ CPLErr STACTARawDataset::IRasterIO(
                             return CE_Failure;
                         }
                         VSIFCloseL(fp);
-                        const CPLString osMEMFilename("/vsimem/stacta/" +
-                                                      osURL);
+                        const CPLString osMEMFilename(
+                            VSIMemGenerateHiddenFilename(
+                                std::string("stacta_")
+                                    .append(CPLString(osURL)
+                                                .replaceAll("/", "_")
+                                                .replaceAll("\\", "_"))
+                                    .c_str()));
                         VSIFCloseL(VSIFileFromMemBuffer(osMEMFilename, pabyBuf,
                                                         nSize, TRUE));
                         poTileDS = std::unique_ptr<GDALDataset>(
@@ -650,9 +639,17 @@ int STACTADataset::Identify(GDALOpenInfo *poOpenInfo)
         return true;
     }
 
+    const bool bIsSingleDriver = poOpenInfo->IsSingleAllowedDriver("STACTA");
+    if (bIsSingleDriver && (STARTS_WITH(poOpenInfo->pszFilename, "http://") ||
+                            STARTS_WITH(poOpenInfo->pszFilename, "https://")))
+    {
+        return true;
+    }
+
     if (
 #ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
-        !EQUAL(CPLGetExtension(poOpenInfo->pszFilename), "json") ||
+        (!bIsSingleDriver &&
+         !EQUAL(CPLGetExtension(poOpenInfo->pszFilename), "json")) ||
 #endif
         poOpenInfo->nHeaderBytes == 0)
     {
@@ -665,6 +662,14 @@ int STACTADataset::Identify(GDALOpenInfo *poOpenInfo)
         // before the loop.
         const char *pszHeader =
             reinterpret_cast<const char *>(poOpenInfo->pabyHeader);
+        while (*pszHeader != 0 &&
+               std::isspace(static_cast<unsigned char>(*pszHeader)))
+            ++pszHeader;
+        if (bIsSingleDriver)
+        {
+            return pszHeader[0] == '{';
+        }
+
         if (strstr(pszHeader, "\"stac_extensions\"") != nullptr &&
             (strstr(pszHeader, "\"tiled-assets\"") != nullptr ||
              strstr(pszHeader,
@@ -1154,10 +1159,10 @@ bool STACTADataset::Open(GDALOpenInfo *poOpenInfo)
                 aosOptions.AddString("-of");
                 aosOptions.AddString("VRT");
                 aosOptions.AddString("-projwin");
-                aosOptions.AddString(CPLSPrintf("%.18g", dfMinX));
-                aosOptions.AddString(CPLSPrintf("%.18g", dfMaxY));
-                aosOptions.AddString(CPLSPrintf("%.18g", dfMaxX));
-                aosOptions.AddString(CPLSPrintf("%.18g", dfMinY));
+                aosOptions.AddString(CPLSPrintf("%.17g", dfMinX));
+                aosOptions.AddString(CPLSPrintf("%.17g", dfMaxY));
+                aosOptions.AddString(CPLSPrintf("%.17g", dfMaxX));
+                aosOptions.AddString(CPLSPrintf("%.17g", dfMinY));
                 auto psOptions =
                     GDALTranslateOptionsNew(aosOptions.List(), nullptr);
                 auto hDS =
diff --git a/frmts/stacta/stactadataset.h b/frmts/stacta/stactadataset.h
index 8347b37a9d78..d87c843c23c9 100644
--- a/frmts/stacta/stactadataset.h
+++ b/frmts/stacta/stactadataset.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2020, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef STACTADATASET_H
diff --git a/frmts/terragen/terragendataset.cpp b/frmts/terragen/terragendataset.cpp
index 63ce04ab8047..6643e333d591 100644
--- a/frmts/terragen/terragendataset.cpp
+++ b/frmts/terragen/terragendataset.cpp
@@ -20,23 +20,7 @@
  ******************************************************************************
  * Copyright (c) 2006-2007 Daylon Graphics Ltd.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************
  */
 
diff --git a/frmts/tga/tgadataset.cpp b/frmts/tga/tgadataset.cpp
index cda777088682..08e5fe617f9a 100644
--- a/frmts/tga/tgadataset.cpp
+++ b/frmts/tga/tgadataset.cpp
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2020, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_pam.h"
@@ -622,7 +606,7 @@ GDALDataset *GDALTGADataset::Open(GDALOpenInfo *poOpenInfo)
                         while (!osAuthorName.empty() &&
                                osAuthorName.back() == ' ')
                         {
-                            osAuthorName.resize(osAuthorName.size() - 1);
+                            osAuthorName.pop_back();
                         }
                         poDS->GDALDataset::SetMetadataItem(
                             "AUTHOR_NAME", osAuthorName.c_str());
@@ -645,7 +629,7 @@ GDALDataset *GDALTGADataset::Open(GDALOpenInfo *poOpenInfo)
                             osLine.resize(strlen(osLine.c_str()));
                             while (!osLine.empty() && osLine.back() == ' ')
                             {
-                                osLine.resize(osLine.size() - 1);
+                                osLine.pop_back();
                             }
                             if (i > 0)
                                 osComments += '\n';
diff --git a/frmts/til/tildataset.cpp b/frmts/til/tildataset.cpp
index ed27200d37e0..846bf516892f 100644
--- a/frmts/til/tildataset.cpp
+++ b/frmts/til/tildataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2009, Frank Warmerdam
  * Copyright (c) 2009-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_multiproc.h"
diff --git a/frmts/tiledb/CMakeLists.txt b/frmts/tiledb/CMakeLists.txt
index 883baa401c9b..df033eff760f 100644
--- a/frmts/tiledb/CMakeLists.txt
+++ b/frmts/tiledb/CMakeLists.txt
@@ -1,3 +1,17 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/helpers/GdalCMakeMinimumRequired.cmake")
+cmake_minimum_required(VERSION ${GDAL_CMAKE_VERSION_MIN}...${GDAL_CMAKE_VERSION_MAX})
+
+if(NOT DEFINED PROJECT_SOURCE_DIR)
+    # Standalone plugin building
+    project(gdal_TileDB)
+    # The driver depends on some non exported headers. Make sure the version we
+    # build against against is the same as this source tree.
+    set(STRICT_VERSION_CHECK ON)
+    include("${PROJECT_SOURCE_DIR}/../../cmake/helpers/SetupStandalonePlugin.cmake" )
+    include(CheckDependentLibrariesTileDB)
+    standalone_driver_finalize(GDAL_ENABLE_DRIVER_TILEDB)
+endif()
+
 add_gdal_driver(TARGET gdal_TileDB SOURCES
                 tiledbcommon.cpp
                 tiledbdense.cpp
@@ -16,7 +30,6 @@ if(TARGET gdal_TileDB_core)
     target_include_directories(gdal_TileDB_core PRIVATE $<TARGET_PROPERTY:TileDB::tiledb_shared,INTERFACE_INCLUDE_DIRECTORIES>)
     target_compile_definitions(gdal_TileDB_core PRIVATE $<TARGET_PROPERTY:TileDB::tiledb_shared,INTERFACE_COMPILE_DEFINITIONS>)
     target_compile_definitions(gdal_TileDB_core PRIVATE -DTILEDB_DEPRECATED=)
-    target_compile_features(gdal_TileDB_core PRIVATE cxx_std_17)
 endif()
 
 if(NOT TARGET gdal_TileDB)
@@ -24,6 +37,12 @@ if(NOT TARGET gdal_TileDB)
 endif()
 
 gdal_standard_includes(gdal_TileDB)
+if (STANDALONE)
+target_include_directories(gdal_TileDB PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../gcore
+                                               ${CMAKE_CURRENT_SOURCE_DIR}/../mem
+)
+else()
 target_include_directories(gdal_TileDB PRIVATE
                            ${GDAL_RASTER_FORMAT_SOURCE_DIR}/mem)
+endif()
 gdal_target_link_libraries(gdal_TileDB PRIVATE TileDB::tiledb_shared)
diff --git a/frmts/tiledb/driver_declaration.cmake b/frmts/tiledb/driver_declaration.cmake
new file mode 100644
index 000000000000..8c471dbe2967
--- /dev/null
+++ b/frmts/tiledb/driver_declaration.cmake
@@ -0,0 +1 @@
+gdal_dependent_format(tiledb "TileDB tiledb.io" "GDAL_USE_TILEDB")
diff --git a/frmts/tiledb/include_tiledb.h b/frmts/tiledb/include_tiledb.h
index abd5b72530d8..6ea5d57c3d54 100644
--- a/frmts/tiledb/include_tiledb.h
+++ b/frmts/tiledb/include_tiledb.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2019, TileDB, Inc
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef INCLUDE_TILEDB_H
diff --git a/frmts/tiledb/tiledbcommon.cpp b/frmts/tiledb/tiledbcommon.cpp
index 5cee01eaab64..4bce16ea7860 100644
--- a/frmts/tiledb/tiledbcommon.cpp
+++ b/frmts/tiledb/tiledbcommon.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, TileDB, Inc
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "tiledbheaders.h"
@@ -118,49 +102,24 @@ CPLErr TileDBDataset::AddFilter(tiledb::Context &ctx,
 int TileDBDataset::Identify(GDALOpenInfo *poOpenInfo)
 
 {
-    if (STARTS_WITH_CI(poOpenInfo->pszFilename, "TILEDB:"))
+    int nRet = TileDBDriverIdentifySimplified(poOpenInfo);
+    if (nRet == GDAL_IDENTIFY_UNKNOWN)
     {
-        return TRUE;
-    }
-
-    try
-    {
-        const char *pszConfig =
-            CSLFetchNameValue(poOpenInfo->papszOpenOptions, "TILEDB_CONFIG");
-
-        if (pszConfig != nullptr)
-        {
-            return TRUE;
-        }
-
-        const bool bIsS3OrGS =
-            STARTS_WITH_CI(poOpenInfo->pszFilename, "/VSIS3/") ||
-            STARTS_WITH_CI(poOpenInfo->pszFilename, "/VSIGS/");
-        // If this is a /vsi virtual file systems, bail out, except if it is S3 or GS.
-        if (!bIsS3OrGS && STARTS_WITH(poOpenInfo->pszFilename, "/vsi"))
-        {
-            return false;
-        }
-
-        if (poOpenInfo->bIsDirectory ||
-            (bIsS3OrGS &&
-             !EQUAL(CPLGetExtension(poOpenInfo->pszFilename), "tif")))
+        try
         {
             tiledb::Context ctx;
             CPLString osArrayPath =
                 TileDBDataset::VSI_to_tiledb_uri(poOpenInfo->pszFilename);
             const auto eType = tiledb::Object::object(ctx, osArrayPath).type();
-            if (eType == tiledb::Object::Type::Array ||
-                eType == tiledb::Object::Type::Group)
-                return true;
+            nRet = (eType == tiledb::Object::Type::Array ||
+                    eType == tiledb::Object::Type::Group);
+        }
+        catch (...)
+        {
+            nRet = FALSE;
         }
-
-        return FALSE;
-    }
-    catch (...)
-    {
-        return FALSE;
     }
+    return nRet;
 }
 
 /************************************************************************/
diff --git a/frmts/tiledb/tiledbdense.cpp b/frmts/tiledb/tiledbdense.cpp
index 8960ede77598..59df61a96bea 100644
--- a/frmts/tiledb/tiledbdense.cpp
+++ b/frmts/tiledb/tiledbdense.cpp
@@ -7,26 +7,11 @@
  ******************************************************************************
  * Copyright (c) 2019, TileDB, Inc
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <cassert>
+#include <cmath>
 #include <cinttypes>
 #include <limits>
 
@@ -1109,7 +1094,7 @@ CPLErr TileDBRasterDataset::TrySaveXML()
 /*                           TryLoadXML()                               */
 /************************************************************************/
 
-CPLErr TileDBRasterDataset::TryLoadXML(char **papszSiblingFiles)
+CPLErr TileDBRasterDataset::TryLoadXML(CSLConstList papszSiblingFiles)
 
 {
     return TryLoadCachedXML(papszSiblingFiles, true);
@@ -1119,7 +1104,7 @@ CPLErr TileDBRasterDataset::TryLoadXML(char **papszSiblingFiles)
 /*                           TryLoadCachedXML()                               */
 /************************************************************************/
 
-CPLErr TileDBRasterDataset::TryLoadCachedXML(char ** /*papszSiblingFiles*/,
+CPLErr TileDBRasterDataset::TryLoadCachedXML(CSLConstList /*papszSiblingFiles*/,
                                              bool bReload)
 
 {
@@ -2946,7 +2931,7 @@ CPLErr TileDBRasterDataset::IBuildOverviews(
         {
             try
             {
-                poODS->Close();
+                CPL_IGNORE_RET_VAL(poODS->Close());
                 tiledb::Array::delete_array(*m_ctx, poODS->GetDescription());
                 vfs.remove_dir(poODS->GetDescription());
             }
diff --git a/frmts/tiledb/tiledbdrivercore.cpp b/frmts/tiledb/tiledbdrivercore.cpp
index 8e5d234d6e34..8aae2445faf1 100644
--- a/frmts/tiledb/tiledbdrivercore.cpp
+++ b/frmts/tiledb/tiledbdrivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, TileDB, Inc
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #define INCLUDE_ONLY_TILEDB_VERSION
@@ -35,7 +19,7 @@
 /*                 TileDBDriverIdentifySimplified()                     */
 /************************************************************************/
 
-static int TileDBDriverIdentifySimplified(GDALOpenInfo *poOpenInfo)
+int TileDBDriverIdentifySimplified(GDALOpenInfo *poOpenInfo)
 
 {
     if (STARTS_WITH_CI(poOpenInfo->pszFilename, "TILEDB:"))
@@ -43,6 +27,11 @@ static int TileDBDriverIdentifySimplified(GDALOpenInfo *poOpenInfo)
         return TRUE;
     }
 
+    if (poOpenInfo->IsSingleAllowedDriver("TileDB"))
+    {
+        return TRUE;
+    }
+
     const char *pszConfig =
         CSLFetchNameValue(poOpenInfo->papszOpenOptions, "TILEDB_CONFIG");
 
@@ -51,6 +40,11 @@ static int TileDBDriverIdentifySimplified(GDALOpenInfo *poOpenInfo)
         return TRUE;
     }
 
+    if (!poOpenInfo->bIsDirectory)
+    {
+        return false;
+    }
+
     const bool bIsS3OrGS = STARTS_WITH_CI(poOpenInfo->pszFilename, "/VSIS3/") ||
                            STARTS_WITH_CI(poOpenInfo->pszFilename, "/VSIGS/");
     // If this is a /vsi virtual file systems, bail out, except if it is S3 or GS.
@@ -59,17 +53,7 @@ static int TileDBDriverIdentifySimplified(GDALOpenInfo *poOpenInfo)
         return false;
     }
 
-    if (poOpenInfo->bIsDirectory)
-    {
-        return GDAL_IDENTIFY_UNKNOWN;
-    }
-
-    if (bIsS3OrGS && !EQUAL(CPLGetExtension(poOpenInfo->pszFilename), "tif"))
-    {
-        return GDAL_IDENTIFY_UNKNOWN;
-    }
-
-    return FALSE;
+    return GDAL_IDENTIFY_UNKNOWN;
 }
 
 /************************************************************************/
diff --git a/frmts/tiledb/tiledbdrivercore.h b/frmts/tiledb/tiledbdrivercore.h
index 26e0e16aea83..c4ba6cad9949 100644
--- a/frmts/tiledb/tiledbdrivercore.h
+++ b/frmts/tiledb/tiledbdrivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, TileDB, Inc
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef TILEDBDRIVERCORE_H
@@ -36,6 +20,8 @@ constexpr const char *DRIVER_NAME = "TileDB";
 #define TileDBDriverSetCommonMetadata                                          \
     PLUGIN_SYMBOL_NAME(TileDBDriverSetCommonMetadata)
 
+int TileDBDriverIdentifySimplified(GDALOpenInfo *poOpenInfo);
+
 void TileDBDriverSetCommonMetadata(GDALDriver *poDriver);
 
 #endif
diff --git a/frmts/tiledb/tiledbheaders.h b/frmts/tiledb/tiledbheaders.h
index 163318a9c2be..46c271ba380f 100644
--- a/frmts/tiledb/tiledbheaders.h
+++ b/frmts/tiledb/tiledbheaders.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2019, TileDB, Inc
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef TILEDB_HEADERS_H
@@ -277,9 +261,9 @@ class TileDBRasterDataset final : public TileDBDataset
 
   public:
     ~TileDBRasterDataset();
-    CPLErr TryLoadCachedXML(char **papszSiblingFiles = nullptr,
+    CPLErr TryLoadCachedXML(CSLConstList papszSiblingFiles = nullptr,
                             bool bReload = true);
-    CPLErr TryLoadXML(char **papszSiblingFiles = nullptr) override;
+    CPLErr TryLoadXML(CSLConstList papszSiblingFiles = nullptr) override;
     CPLErr TrySaveXML() override;
     char **GetMetadata(const char *pszDomain) override;
     CPLErr Close() override;
diff --git a/frmts/tiledb/tiledbmultidim.cpp b/frmts/tiledb/tiledbmultidim.cpp
index b2841eed50d6..568d0c124ff5 100644
--- a/frmts/tiledb/tiledbmultidim.cpp
+++ b/frmts/tiledb/tiledbmultidim.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, TileDB, Inc
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "tiledbmultidim.h"
diff --git a/frmts/tiledb/tiledbmultidim.h b/frmts/tiledb/tiledbmultidim.h
index 6d4d88752bea..b634d1089ae6 100644
--- a/frmts/tiledb/tiledbmultidim.h
+++ b/frmts/tiledb/tiledbmultidim.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, TileDB, Inc
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef TILEDBMULTIDIM_H_INCLUDED
diff --git a/frmts/tiledb/tiledbmultidimarray.cpp b/frmts/tiledb/tiledbmultidimarray.cpp
index 2d3d5f6ab847..09afa8e868b9 100644
--- a/frmts/tiledb/tiledbmultidimarray.cpp
+++ b/frmts/tiledb/tiledbmultidimarray.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, TileDB, Inc
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "tiledbmultidim.h"
@@ -741,7 +725,7 @@ std::shared_ptr<TileDBArray> TileDBArray::OpenFromDisk(
                             {
                                 if (!osVal.empty())
                                     osVal += ',';
-                                osVal += CPLSPrintf("%.18g", dfVal);
+                                osVal += CPLSPrintf("%.17g", dfVal);
                             }
                             aosGridMappingKeyValues.AddNameValue(osKey.c_str(),
                                                                  osVal.c_str());
diff --git a/frmts/tiledb/tiledbmultidimattribute.cpp b/frmts/tiledb/tiledbmultidimattribute.cpp
index f84125ab6e3e..dc62d2304e15 100644
--- a/frmts/tiledb/tiledbmultidimattribute.cpp
+++ b/frmts/tiledb/tiledbmultidimattribute.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, TileDB, Inc
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "tiledbmultidim.h"
diff --git a/frmts/tiledb/tiledbmultidimattributeholder.cpp b/frmts/tiledb/tiledbmultidimattributeholder.cpp
index 71dfbbcafe96..db2063f62ee1 100644
--- a/frmts/tiledb/tiledbmultidimattributeholder.cpp
+++ b/frmts/tiledb/tiledbmultidimattributeholder.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, TileDB, Inc
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "tiledbmultidim.h"
diff --git a/frmts/tiledb/tiledbmultidimgroup.cpp b/frmts/tiledb/tiledbmultidimgroup.cpp
index e9ebd8890be5..f2035dd61fa1 100644
--- a/frmts/tiledb/tiledbmultidimgroup.cpp
+++ b/frmts/tiledb/tiledbmultidimgroup.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, TileDB, Inc
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "tiledbmultidim.h"
diff --git a/frmts/tiledb/tiledbsparse.cpp b/frmts/tiledb/tiledbsparse.cpp
index eebb5b2b7851..e4ede677f9e2 100644
--- a/frmts/tiledb/tiledbsparse.cpp
+++ b/frmts/tiledb/tiledbsparse.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, TileDB, Inc
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "tiledbheaders.h"
diff --git a/frmts/tsx/tsxdataset.cpp b/frmts/tsx/tsxdataset.cpp
index 57b4f2aa74a2..114708a7d92c 100644
--- a/frmts/tsx/tsxdataset.cpp
+++ b/frmts/tsx/tsxdataset.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2007, Philippe Vachon <philippe@cowpig.ca>
  * Copyright (c) 2009-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_minixml.h"
diff --git a/frmts/usgsdem/usgsdem_create.cpp b/frmts/usgsdem/usgsdem_create.cpp
index 2e6d4f8706e0..91b865f991f5 100644
--- a/frmts/usgsdem/usgsdem_create.cpp
+++ b/frmts/usgsdem/usgsdem_create.cpp
@@ -11,23 +11,7 @@
  * Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_csv.h"
diff --git a/frmts/usgsdem/usgsdemdataset.cpp b/frmts/usgsdem/usgsdemdataset.cpp
index 0638bb2a4895..ebc88a45f180 100644
--- a/frmts/usgsdem/usgsdemdataset.cpp
+++ b/frmts/usgsdem/usgsdemdataset.cpp
@@ -11,23 +11,7 @@
  * Copyright (c) 2001, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_frmts.h"
@@ -35,6 +19,7 @@
 #include "ogr_spatialref.h"
 
 #include <algorithm>
+#include <cmath>
 
 typedef struct
 {
@@ -452,7 +437,7 @@ CPLErr USGSDEMRasterBand::IReadBlock(CPL_UNUSED int nBlockXOff,
             dyStart = dyStart / 3600.0;
 
         double dygap = (dfYMin - dyStart) / poGDS->adfGeoTransform[5] + 0.5;
-        if (dygap <= INT_MIN || dygap >= INT_MAX || !CPLIsFinite(dygap))
+        if (dygap <= INT_MIN || dygap >= INT_MAX || !std::isfinite(dygap))
         {
             CPLFree(sBuffer.buffer);
             return CE_Failure;
diff --git a/frmts/vrt/CMakeLists.txt b/frmts/vrt/CMakeLists.txt
index 447d48eaedbe..8e423afd6d3a 100644
--- a/frmts/vrt/CMakeLists.txt
+++ b/frmts/vrt/CMakeLists.txt
@@ -17,14 +17,13 @@ add_gdal_driver(
           vrtprocesseddataset.cpp
           vrtprocesseddatasetfunctions.cpp
           vrtmultidim.cpp
-          gdaltileindexdataset.cpp
           STRONG_CXX_WFLAGS)
 gdal_standard_includes(gdal_vrt)
-target_include_directories(gdal_vrt PRIVATE ${GDAL_RASTER_FORMAT_SOURCE_DIR}/raw)
+target_include_directories(gdal_vrt PRIVATE ${GDAL_RASTER_FORMAT_SOURCE_DIR}/raw
+                                            $<TARGET_PROPERTY:ogrsf_generic,SOURCE_DIR>)
 
 set(GDAL_DATA_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/data/gdalvrt.xsd
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/gdaltileindex.xsd
 )
 set_property(
   TARGET ${GDAL_LIB_TARGET_NAME}
@@ -41,3 +40,7 @@ target_public_header(TARGET gdal HEADERS vrtdataset.h gdal_vrt.h)
 
 # because of use of GDALOpenVerticalShiftGrid
 set_property(SOURCE vrtwarped.cpp PROPERTY SKIP_UNITY_BUILD_INCLUSION ON)
+
+if (NOT GDAL_ENABLE_DRIVER_VRT)
+    target_compile_definitions(gdal_vrt PRIVATE -DNO_OPEN)
+endif()
diff --git a/frmts/vrt/data/gdalvrt.xsd b/frmts/vrt/data/gdalvrt.xsd
index 9f9a91d7be63..dbf0af54f740 100644
--- a/frmts/vrt/data/gdalvrt.xsd
+++ b/frmts/vrt/data/gdalvrt.xsd
@@ -10,23 +10,7 @@
  **********************************************************************
  * Copyright (c) 2015, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="1.0">
@@ -442,6 +426,23 @@
             <xs:enumeration value="YCbCr_Cb"/>
             <xs:enumeration value="YCbCr_Cr"/>
             <xs:enumeration value="Undefined"/>
+            <xs:enumeration value="Pan"/> <!-- 3.10 addition -->
+            <xs:enumeration value="Coastal"/> <!-- 3.10 addition -->
+            <xs:enumeration value="RedEdge"/> <!-- 3.10 addition -->
+            <xs:enumeration value="NIR"/> <!-- 3.10 addition -->
+            <xs:enumeration value="SWIR"/> <!-- 3.10 addition -->
+            <xs:enumeration value="MWIR"/> <!-- 3.10 addition -->
+            <xs:enumeration value="LWIR"/> <!-- 3.10 addition -->
+            <xs:enumeration value="TIR"/> <!-- 3.10 addition -->
+            <xs:enumeration value="OtherIR"/> <!-- 3.10 addition -->
+            <xs:enumeration value="SAR_Ka"/> <!-- 3.10 addition -->
+            <xs:enumeration value="SAR_K"/> <!-- 3.10 addition -->
+            <xs:enumeration value="SAR_Ku"/> <!-- 3.10 addition -->
+            <xs:enumeration value="SAR_X"/> <!-- 3.10 addition -->
+            <xs:enumeration value="SAR_C"/> <!-- 3.10 addition -->
+            <xs:enumeration value="SAR_S"/> <!-- 3.10 addition -->
+            <xs:enumeration value="SAR_L"/> <!-- 3.10 addition -->
+            <xs:enumeration value="SAR_P"/> <!-- 3.10 addition -->
         </xs:restriction>
     </xs:simpleType>
 
diff --git a/frmts/vrt/gdal_vrt.h b/frmts/vrt/gdal_vrt.h
index ad08967f7649..6f0f36dbd723 100644
--- a/frmts/vrt/gdal_vrt.h
+++ b/frmts/vrt/gdal_vrt.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Andrey Kiselev <dron@ak4719.spb.edu>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_VRT_H_INCLUDED
diff --git a/frmts/vrt/pixelfunctions.cpp b/frmts/vrt/pixelfunctions.cpp
index 6e79fc151edc..e7a4bc519b65 100644
--- a/frmts/vrt/pixelfunctions.cpp
+++ b/frmts/vrt/pixelfunctions.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2008-2014,2022 Antonio Valentino <antonio.valentino@tiscali.it>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #include <cmath>
diff --git a/frmts/vrt/vrt_priv.h b/frmts/vrt/vrt_priv.h
index ca2af63383fb..beb7752b8198 100644
--- a/frmts/vrt/vrt_priv.h
+++ b/frmts/vrt/vrt_priv.h
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef VRT_PRIV_H_INCLUDED
@@ -52,10 +36,10 @@ GDALTileIndexDataset CPL_DLL *GDALDatasetCastToGTIDataset(GDALDataset *poDS);
 std::vector<GTISourceDesc> CPL_DLL
 GTIGetSourcesMoreRecentThan(GDALTileIndexDataset *poDS, int64_t mTime);
 
-CPLStringList VRTParseCategoryNames(const CPLXMLNode *psCategoryNames);
+CPLStringList CPL_DLL VRTParseCategoryNames(const CPLXMLNode *psCategoryNames);
 
 std::unique_ptr<GDALColorTable>
-VRTParseColorTable(const CPLXMLNode *psColorTable);
+    CPL_DLL VRTParseColorTable(const CPLXMLNode *psColorTable);
 
 #endif
 
diff --git a/frmts/vrt/vrtdataset.cpp b/frmts/vrt/vrtdataset.cpp
index 7d45c1dd1fe0..eb24e903c069 100644
--- a/frmts/vrt/vrtdataset.cpp
+++ b/frmts/vrt/vrtdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2001, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "vrtdataset.h"
@@ -33,9 +17,11 @@
 #include "cpl_string.h"
 #include "gdal_frmts.h"
 #include "ogr_spatialref.h"
+#include "gdal_thread_pool.h"
 #include "gdal_utils.h"
 
 #include <algorithm>
+#include <cassert>
 #include <cmath>
 #include <set>
 #include <typeinfo>
@@ -216,6 +202,22 @@ char **VRTDataset::GetMetadata(const char *pszDomain)
     return GDALDataset::GetMetadata(pszDomain);
 }
 
+/************************************************************************/
+/*                          GetMetadataItem()                           */
+/************************************************************************/
+
+const char *VRTDataset::GetMetadataItem(const char *pszName,
+                                        const char *pszDomain)
+
+{
+    if (pszName && pszDomain && EQUAL(pszDomain, "__DEBUG__"))
+    {
+        if (EQUAL(pszName, "MULTI_THREADED_RASTERIO_LAST_USED"))
+            return m_bMultiThreadedRasterIOLastUsed ? "1" : "0";
+    }
+    return GDALDataset::GetMetadataItem(pszName, pszDomain);
+}
+
 /*! @endcond */
 
 /************************************************************************/
@@ -285,7 +287,7 @@ CPLXMLNode *VRTDataset::SerializeToXML(const char *pszVRTPathIn)
             if (osCoordinateEpoch.find('.') != std::string::npos)
             {
                 while (osCoordinateEpoch.back() == '0')
-                    osCoordinateEpoch.resize(osCoordinateEpoch.size() - 1);
+                    osCoordinateEpoch.pop_back();
             }
             CPLAddXMLAttributeAndValue(psSRSNode, "coordinateEpoch",
                                        osCoordinateEpoch.c_str());
@@ -1035,8 +1037,9 @@ GDALDataset *VRTDataset::OpenVRTProtocol(const char *pszSpec)
     // http://.jp2 file with the JP2OpenJPEG driver through the HTTP driver,
     // which returns a /vsimem/ file
     auto poSrcDS = std::unique_ptr<GDALDataset, GDALDatasetUniquePtrReleaser>(
-        GDALDataset::Open(osFilename, GDAL_OF_RASTER, aosAllowedDrivers.List(),
-                          aosOpenOptions.List(), nullptr));
+        GDALDataset::Open(osFilename, GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR,
+                          aosAllowedDrivers.List(), aosOpenOptions.List(),
+                          nullptr));
     if (poSrcDS == nullptr)
     {
         return nullptr;
@@ -1085,7 +1088,8 @@ GDALDataset *VRTDataset::OpenVRTProtocol(const char *pszSpec)
                     if (bFound)
                     {
                         poSrcDS.reset(GDALDataset::Open(
-                            osSubdatasetSource.c_str(), GDAL_OF_RASTER,
+                            osSubdatasetSource.c_str(),
+                            GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR,
                             aosAllowedDrivers.List(), aosOpenOptions.List(),
                             nullptr));
                         if (poSrcDS == nullptr)
@@ -1140,7 +1144,8 @@ GDALDataset *VRTDataset::OpenVRTProtocol(const char *pszSpec)
                 }
 
                 poSrcDS.reset(GDALDataset::Open(
-                    osSubdatasetSource.c_str(), GDAL_OF_RASTER,
+                    osSubdatasetSource.c_str(),
+                    GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR,
                     aosAllowedDrivers.List(), aosOpenOptions.List(), nullptr));
                 if (poSrcDS == nullptr)
                 {
@@ -1995,29 +2000,32 @@ int VRTDataset::CloseDependentDatasets()
 /* the band number of each source is the band number of the */
 /* VRTSourcedRasterBand. */
 
-int VRTDataset::CheckCompatibleForDatasetIO()
+bool VRTDataset::CheckCompatibleForDatasetIO() const
 {
     int nSources = 0;
     VRTSource **papoSources = nullptr;
     CPLString osResampling;
 
-    if (m_bCompatibleForDatasetIO >= 0)
+    if (m_nCompatibleForDatasetIO >= 0)
     {
-        return m_bCompatibleForDatasetIO;
+        return CPL_TO_BOOL(m_nCompatibleForDatasetIO);
     }
 
+    m_nCompatibleForDatasetIO = false;
+
     for (int iBand = 0; iBand < nBands; iBand++)
     {
-        if (!static_cast<VRTRasterBand *>(papoBands[iBand])
-                 ->IsSourcedRasterBand())
-            return FALSE;
+        auto poVRTBand = static_cast<VRTRasterBand *>(papoBands[iBand]);
+        assert(poVRTBand);
+        if (!poVRTBand->IsSourcedRasterBand())
+            return false;
 
-        VRTSourcedRasterBand *poBand =
-            static_cast<VRTSourcedRasterBand *>(papoBands[iBand]);
+        const VRTSourcedRasterBand *poBand =
+            static_cast<const VRTSourcedRasterBand *>(poVRTBand);
 
         // Do not allow VRTDerivedRasterBand for example
         if (typeid(*poBand) != typeid(VRTSourcedRasterBand))
-            return FALSE;
+            return false;
 
         if (iBand == 0)
         {
@@ -2026,48 +2034,50 @@ int VRTDataset::CheckCompatibleForDatasetIO()
             for (int iSource = 0; iSource < nSources; iSource++)
             {
                 if (!papoSources[iSource]->IsSimpleSource())
-                    return FALSE;
+                    return false;
 
-                VRTSimpleSource *poSource =
-                    static_cast<VRTSimpleSource *>(papoSources[iSource]);
-                if (!EQUAL(poSource->GetType(), "SimpleSource"))
-                    return FALSE;
+                const VRTSimpleSource *poSource =
+                    static_cast<const VRTSimpleSource *>(papoSources[iSource]);
+                if (poSource->GetType() != VRTSimpleSource::GetTypeStatic())
+                    return false;
 
                 if (poSource->m_nBand != iBand + 1 ||
                     poSource->m_bGetMaskBand || poSource->m_osSrcDSName.empty())
-                    return FALSE;
+                    return false;
                 osResampling = poSource->GetResampling();
             }
         }
         else if (nSources != poBand->nSources)
         {
-            return FALSE;
+            return false;
         }
         else
         {
             for (int iSource = 0; iSource < nSources; iSource++)
             {
                 if (!poBand->papoSources[iSource]->IsSimpleSource())
-                    return FALSE;
-                VRTSimpleSource *poRefSource =
-                    static_cast<VRTSimpleSource *>(papoSources[iSource]);
-
-                VRTSimpleSource *poSource = static_cast<VRTSimpleSource *>(
-                    poBand->papoSources[iSource]);
-                if (!EQUAL(poSource->GetType(), "SimpleSource"))
-                    return FALSE;
+                    return false;
+                const VRTSimpleSource *poRefSource =
+                    static_cast<const VRTSimpleSource *>(papoSources[iSource]);
+
+                const VRTSimpleSource *poSource =
+                    static_cast<const VRTSimpleSource *>(
+                        poBand->papoSources[iSource]);
+                if (poSource->GetType() != VRTSimpleSource::GetTypeStatic())
+                    return false;
                 if (poSource->m_nBand != iBand + 1 ||
                     poSource->m_bGetMaskBand || poSource->m_osSrcDSName.empty())
-                    return FALSE;
+                    return false;
                 if (!poSource->IsSameExceptBandNumber(poRefSource))
-                    return FALSE;
+                    return false;
                 if (osResampling.compare(poSource->GetResampling()) != 0)
-                    return FALSE;
+                    return false;
             }
         }
     }
 
-    return nSources != 0;
+    m_nCompatibleForDatasetIO = nSources != 0;
+    return CPL_TO_BOOL(m_nCompatibleForDatasetIO);
 }
 
 /************************************************************************/
@@ -2191,6 +2201,29 @@ CPLErr VRTDataset::AdviseRead(int nXOff, int nYOff, int nXSize, int nYSize,
                                panBandList, papszOptions);
 }
 
+/************************************************************************/
+/*                           GetNumThreads()                            */
+/************************************************************************/
+
+/* static */ int VRTDataset::GetNumThreads(GDALDataset *poDS)
+{
+    const char *pszNumThreads = nullptr;
+    if (poDS)
+        pszNumThreads = CSLFetchNameValueDef(poDS->GetOpenOptions(),
+                                             "NUM_THREADS", nullptr);
+    if (!pszNumThreads)
+        pszNumThreads = CPLGetConfigOption("VRT_NUM_THREADS", nullptr);
+    if (!pszNumThreads)
+        pszNumThreads = CPLGetConfigOption("GDAL_NUM_THREADS", "ALL_CPUS");
+    if (EQUAL(pszNumThreads, "0") || EQUAL(pszNumThreads, "1"))
+        return atoi(pszNumThreads);
+    const int nMaxPoolSize = GDALGetMaxDatasetPoolSize();
+    const int nLimit = std::min(CPLGetNumCPUs(), nMaxPoolSize);
+    if (EQUAL(pszNumThreads, "ALL_CPUS"))
+        return nLimit;
+    return std::min(atoi(pszNumThreads), nLimit);
+}
+
 /************************************************************************/
 /*                              IRasterIO()                             */
 /************************************************************************/
@@ -2203,6 +2236,20 @@ CPLErr VRTDataset::IRasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff,
                              GSpacing nBandSpace,
                              GDALRasterIOExtraArg *psExtraArg)
 {
+    m_bMultiThreadedRasterIOLastUsed = false;
+
+    if (nBands == 1 && nBandCount == 1)
+    {
+        VRTSourcedRasterBand *poBand =
+            dynamic_cast<VRTSourcedRasterBand *>(papoBands[0]);
+        if (poBand)
+        {
+            return poBand->IRasterIO(eRWFlag, nXOff, nYOff, nXSize, nYSize,
+                                     pData, nBufXSize, nBufYSize, eBufType,
+                                     nPixelSpace, nLineSpace, psExtraArg);
+        }
+    }
+
     bool bLocalCompatibleForDatasetIO =
         CPL_TO_BOOL(CheckCompatibleForDatasetIO());
     if (bLocalCompatibleForDatasetIO && eRWFlag == GF_Read &&
@@ -2270,6 +2317,9 @@ CPLErr VRTDataset::IRasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff,
             const int nSavedSources = poBand->nSources;
             poBand->nSources = 0;
 
+            GDALProgressFunc pfnProgressGlobal = psExtraArg->pfnProgress;
+            psExtraArg->pfnProgress = nullptr;
+
             GByte *pabyBandData =
                 static_cast<GByte *>(pData) + iBandIndex * nBandSpace;
 
@@ -2277,39 +2327,145 @@ CPLErr VRTDataset::IRasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff,
                               pabyBandData, nBufXSize, nBufYSize, eBufType,
                               nPixelSpace, nLineSpace, psExtraArg);
 
+            psExtraArg->pfnProgress = pfnProgressGlobal;
+
             poBand->nSources = nSavedSources;
         }
 
         CPLErr eErr = CE_None;
-        GDALProgressFunc pfnProgressGlobal = psExtraArg->pfnProgress;
-        void *pProgressDataGlobal = psExtraArg->pProgressData;
 
         // Use the last band, because when sources reference a GDALProxyDataset,
         // they don't necessary instantiate all underlying rasterbands.
         VRTSourcedRasterBand *poBand =
             static_cast<VRTSourcedRasterBand *>(papoBands[nBands - 1]);
-        for (int iSource = 0; eErr == CE_None && iSource < poBand->nSources;
-             iSource++)
+
+        double dfXOff = nXOff;
+        double dfYOff = nYOff;
+        double dfXSize = nXSize;
+        double dfYSize = nYSize;
+        if (psExtraArg->bFloatingPointWindowValidity)
+        {
+            dfXOff = psExtraArg->dfXOff;
+            dfYOff = psExtraArg->dfYOff;
+            dfXSize = psExtraArg->dfXSize;
+            dfYSize = psExtraArg->dfYSize;
+        }
+
+        int nContributingSources = 0;
+        int nMaxThreads = 0;
+        constexpr int MINIMUM_PIXEL_COUNT_FOR_THREADED_IO = 1000 * 1000;
+        if ((static_cast<int64_t>(nBufXSize) * nBufYSize >=
+                 MINIMUM_PIXEL_COUNT_FOR_THREADED_IO ||
+             static_cast<int64_t>(nXSize) * nYSize >=
+                 MINIMUM_PIXEL_COUNT_FOR_THREADED_IO) &&
+            poBand->CanMultiThreadRasterIO(dfXOff, dfYOff, dfXSize, dfYSize,
+                                           nContributingSources) &&
+            nContributingSources > 1 &&
+            (nMaxThreads = VRTDataset::GetNumThreads(this)) > 1)
+        {
+            m_bMultiThreadedRasterIOLastUsed = true;
+            m_oMapSharedSources.InitMutex();
+
+            std::atomic<bool> bSuccess = true;
+            CPLWorkerThreadPool *psThreadPool = GDALGetGlobalThreadPool(
+                std::min(nContributingSources, nMaxThreads));
+
+            CPLDebugOnly(
+                "VRT",
+                "IRasterIO(): use optimized "
+                "multi-threaded code path for mosaic. "
+                "Using %d threads",
+                std::min(nContributingSources, psThreadPool->GetThreadCount()));
+
+            auto oQueue = psThreadPool->CreateJobQueue();
+            std::atomic<int> nCompletedJobs = 0;
+            for (int iSource = 0; iSource < poBand->nSources; iSource++)
+            {
+                auto poSource = poBand->papoSources[iSource];
+                if (!poSource->IsSimpleSource())
+                    continue;
+                auto poSimpleSource =
+                    cpl::down_cast<VRTSimpleSource *>(poSource);
+                if (poSimpleSource->DstWindowIntersects(dfXOff, dfYOff, dfXSize,
+                                                        dfYSize))
+                {
+                    auto psJob = new RasterIOJob();
+                    psJob->pbSuccess = &bSuccess;
+                    psJob->pnCompletedJobs = &nCompletedJobs;
+                    psJob->eVRTBandDataType = poBand->GetRasterDataType();
+                    psJob->nXOff = nXOff;
+                    psJob->nYOff = nYOff;
+                    psJob->nXSize = nXSize;
+                    psJob->nYSize = nYSize;
+                    psJob->pData = pData;
+                    psJob->nBufXSize = nBufXSize;
+                    psJob->nBufYSize = nBufYSize;
+                    psJob->eBufType = eBufType;
+                    psJob->nBandCount = nBandCount;
+                    psJob->panBandMap = panBandMap;
+                    psJob->nPixelSpace = nPixelSpace;
+                    psJob->nLineSpace = nLineSpace;
+                    psJob->nBandSpace = nBandSpace;
+                    psJob->psExtraArg = psExtraArg;
+                    psJob->poSource = poSimpleSource;
+
+                    if (!oQueue->SubmitJob(RasterIOJob::Func, psJob))
+                    {
+                        delete psJob;
+                        bSuccess = false;
+                        break;
+                    }
+                }
+            }
+
+            while (oQueue->WaitEvent())
+            {
+                // Quite rough progress callback. We could do better by counting
+                // the number of contributing pixels.
+                if (psExtraArg->pfnProgress)
+                {
+                    psExtraArg->pfnProgress(double(nCompletedJobs.load()) /
+                                                nContributingSources,
+                                            "", psExtraArg->pProgressData);
+                }
+            }
+
+            eErr = bSuccess ? CE_None : CE_Failure;
+        }
+        else
         {
-            psExtraArg->pfnProgress = GDALScaledProgress;
-            psExtraArg->pProgressData = GDALCreateScaledProgress(
-                1.0 * iSource / poBand->nSources,
-                1.0 * (iSource + 1) / poBand->nSources, pfnProgressGlobal,
-                pProgressDataGlobal);
+            GDALProgressFunc pfnProgressGlobal = psExtraArg->pfnProgress;
+            void *pProgressDataGlobal = psExtraArg->pProgressData;
 
-            VRTSimpleSource *poSource =
-                static_cast<VRTSimpleSource *>(poBand->papoSources[iSource]);
+            for (int iSource = 0; eErr == CE_None && iSource < poBand->nSources;
+                 iSource++)
+            {
+                psExtraArg->pfnProgress = GDALScaledProgress;
+                psExtraArg->pProgressData = GDALCreateScaledProgress(
+                    1.0 * iSource / poBand->nSources,
+                    1.0 * (iSource + 1) / poBand->nSources, pfnProgressGlobal,
+                    pProgressDataGlobal);
+
+                VRTSimpleSource *poSource = static_cast<VRTSimpleSource *>(
+                    poBand->papoSources[iSource]);
+
+                eErr = poSource->DatasetRasterIO(
+                    poBand->GetRasterDataType(), nXOff, nYOff, nXSize, nYSize,
+                    pData, nBufXSize, nBufYSize, eBufType, nBandCount,
+                    panBandMap, nPixelSpace, nLineSpace, nBandSpace,
+                    psExtraArg);
 
-            eErr = poSource->DatasetRasterIO(
-                poBand->GetRasterDataType(), nXOff, nYOff, nXSize, nYSize,
-                pData, nBufXSize, nBufYSize, eBufType, nBandCount, panBandMap,
-                nPixelSpace, nLineSpace, nBandSpace, psExtraArg);
+                GDALDestroyScaledProgress(psExtraArg->pProgressData);
+            }
 
-            GDALDestroyScaledProgress(psExtraArg->pProgressData);
+            psExtraArg->pfnProgress = pfnProgressGlobal;
+            psExtraArg->pProgressData = pProgressDataGlobal;
         }
 
-        psExtraArg->pfnProgress = pfnProgressGlobal;
-        psExtraArg->pProgressData = pProgressDataGlobal;
+        if (eErr == CE_None && psExtraArg->pfnProgress)
+        {
+            psExtraArg->pfnProgress(1.0, "", psExtraArg->pProgressData);
+        }
 
         return eErr;
     }
@@ -2337,6 +2493,34 @@ CPLErr VRTDataset::IRasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff,
     return eErr;
 }
 
+/************************************************************************/
+/*                    VRTDataset::RasterIOJob::Func()                   */
+/************************************************************************/
+
+void VRTDataset::RasterIOJob::Func(void *pData)
+{
+    auto psJob =
+        std::unique_ptr<RasterIOJob>(static_cast<RasterIOJob *>(pData));
+    if (*psJob->pbSuccess)
+    {
+        GDALRasterIOExtraArg sArg = *(psJob->psExtraArg);
+        sArg.pfnProgress = nullptr;
+        sArg.pProgressData = nullptr;
+
+        if (psJob->poSource->DatasetRasterIO(
+                psJob->eVRTBandDataType, psJob->nXOff, psJob->nYOff,
+                psJob->nXSize, psJob->nYSize, psJob->pData, psJob->nBufXSize,
+                psJob->nBufYSize, psJob->eBufType, psJob->nBandCount,
+                psJob->panBandMap, psJob->nPixelSpace, psJob->nLineSpace,
+                psJob->nBandSpace, &sArg) != CE_None)
+        {
+            *psJob->pbSuccess = false;
+        }
+    }
+
+    ++(*psJob->pnCompletedJobs);
+}
+
 /************************************************************************/
 /*                  UnsetPreservedRelativeFilenames()                   */
 /************************************************************************/
@@ -2386,9 +2570,12 @@ static bool CheckBandForOverview(GDALRasterBand *poBand,
 
     VRTSimpleSource *poSource =
         cpl::down_cast<VRTSimpleSource *>(poVRTBand->papoSources[0]);
-    if (!EQUAL(poSource->GetType(), "SimpleSource") &&
-        !EQUAL(poSource->GetType(), "ComplexSource"))
+    const char *pszType = poSource->GetType();
+    if (pszType != VRTSimpleSource::GetTypeStatic() &&
+        pszType != VRTComplexSource::GetTypeStatic())
+    {
         return false;
+    }
     GDALRasterBand *poSrcBand = poBand->GetBand() == 0
                                     ? poSource->GetMaskBandMainBand()
                                     : poSource->GetRasterBand();
@@ -2515,12 +2702,13 @@ void VRTDataset::BuildVirtualOverviews()
             VRTSimpleSource *poSrcSource =
                 cpl::down_cast<VRTSimpleSource *>(poVRTBand->papoSources[0]);
             VRTSimpleSource *poNewSource = nullptr;
-            if (EQUAL(poSrcSource->GetType(), "SimpleSource"))
+            const char *pszType = poSrcSource->GetType();
+            if (pszType == VRTSimpleSource::GetTypeStatic())
             {
                 poNewSource =
                     new VRTSimpleSource(poSrcSource, dfXRatio, dfYRatio);
             }
-            else if (EQUAL(poSrcSource->GetType(), "ComplexSource"))
+            else if (pszType == VRTComplexSource::GetTypeStatic())
             {
                 poNewSource = new VRTComplexSource(
                     cpl::down_cast<VRTComplexSource *>(poSrcSource), dfXRatio,
@@ -2594,7 +2782,7 @@ bool VRTDataset::AddVirtualOverview(int nOvFactor, const char *pszResampling)
     GDALDatasetH hOverviewDS =
         GDALTranslate("", GDALDataset::ToHandle(this), psOptions, nullptr);
     m_bCanTakeRef = true;
-    m_apoOverviews.resize(m_apoOverviews.size() - 1);
+    m_apoOverviews.pop_back();
 
     GDALTranslateOptionsFree(psOptions);
     if (hOverviewDS == nullptr)
@@ -2895,4 +3083,43 @@ std::string VRTDataset::BuildSourceFilename(const char *pszFilename,
     return osSrcDSName;
 }
 
+/************************************************************************/
+/*                   VRTMapSharedResources::Get()                       */
+/************************************************************************/
+
+GDALDataset *VRTMapSharedResources::Get(const std::string &osKey) const
+{
+    if (poMutex)
+        poMutex->lock();
+    auto oIter = oMap.find(osKey);
+    GDALDataset *poRet = nullptr;
+    if (oIter != oMap.end())
+        poRet = oIter->second;
+    if (poMutex)
+        poMutex->unlock();
+    return poRet;
+}
+
+/************************************************************************/
+/*                   VRTMapSharedResources::Get()                       */
+/************************************************************************/
+
+void VRTMapSharedResources::Insert(const std::string &osKey, GDALDataset *poDS)
+{
+    if (poMutex)
+        poMutex->lock();
+    oMap[osKey] = poDS;
+    if (poMutex)
+        poMutex->unlock();
+}
+
+/************************************************************************/
+/*                   VRTMapSharedResources::InitMutex()                 */
+/************************************************************************/
+
+void VRTMapSharedResources::InitMutex()
+{
+    poMutex = &oMutex;
+}
+
 /*! @endcond */
diff --git a/frmts/vrt/vrtdataset.h b/frmts/vrt/vrtdataset.h
index bbc0d60bbc46..5d32b0661048 100644
--- a/frmts/vrt/vrtdataset.h
+++ b/frmts/vrt/vrtdataset.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2001, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef VIRTUALDATASET_H_INCLUDED
@@ -41,15 +25,18 @@
 #include "gdal_vrt.h"
 #include "gdal_rat.h"
 
+#include <atomic>
+#include <deque>
 #include <functional>
 #include <map>
 #include <memory>
+#include <mutex>
 #include <vector>
 
 CPLErr GDALRegisterDefaultPixelFunc();
 void GDALVRTRegisterDefaultProcessedDatasetFuncs();
-CPLString VRTSerializeNoData(double dfVal, GDALDataType eDataType,
-                             int nPrecision);
+CPLString CPL_DLL VRTSerializeNoData(double dfVal, GDALDataType eDataType,
+                                     int nPrecision);
 
 #if 0
 int VRTWarpedOverviewTransform( void *pTransformArg, int bDstToSrc,
@@ -103,6 +90,37 @@ class VRTOverviewInfo
     }
 };
 
+/************************************************************************/
+/*                            VRTMapSharedResources                     */
+/************************************************************************/
+
+/** Map of shared datasets */
+class CPL_DLL VRTMapSharedResources
+{
+  public:
+    VRTMapSharedResources() = default;
+
+    /** Return a dataset from its key */
+    GDALDataset *Get(const std::string &osKey) const;
+
+    /** Inserts a dataset. It must be kept alive while this
+     * VRTMapSharedResources is alive.
+     */
+    void Insert(const std::string &osKey, GDALDataset *poDS);
+
+    /** To be called before any attempt at using this instance in a
+     * multi-threaded context.
+     */
+    void InitMutex();
+
+  private:
+    std::mutex oMutex{};
+    std::mutex *poMutex = nullptr;
+    std::map<std::string, GDALDataset *> oMap{};
+
+    CPL_DISALLOW_COPY_ASSIGN(VRTMapSharedResources)
+};
+
 /************************************************************************/
 /*                              VRTSource                               */
 /************************************************************************/
@@ -159,36 +177,40 @@ class CPL_DLL VRTSource
                                 void *pProgressData) = 0;
 
     virtual CPLErr XMLInit(const CPLXMLNode *psTree, const char *,
-                           std::map<CPLString, GDALDataset *> &) = 0;
+                           VRTMapSharedResources &) = 0;
     virtual CPLXMLNode *SerializeToXML(const char *pszVRTPath) = 0;
 
     virtual void GetFileList(char ***ppapszFileList, int *pnSize,
                              int *pnMaxSize, CPLHashSet *hSetFiles);
 
-    virtual int IsSimpleSource()
+    /** Returns whether this instance can be cast to a VRTSimpleSource
+     * (and its subclasses).
+     */
+    virtual bool IsSimpleSource() const
     {
-        return FALSE;
+        return false;
     }
 
+    /** Returns a string with the VRTSource class type.
+     * This method must be implemented in all subclasses
+     */
+    virtual const char *GetType() const = 0;
+
     virtual CPLErr FlushCache(bool /*bAtClosing*/)
     {
         return CE_None;
     }
 };
 
-typedef VRTSource *(*VRTSourceParser)(
-    const CPLXMLNode *, const char *,
-    std::map<CPLString, GDALDataset *> &oMapSharedSources);
+typedef VRTSource *(*VRTSourceParser)(const CPLXMLNode *, const char *,
+                                      VRTMapSharedResources &oMapSharedSources);
 
-VRTSource *
-VRTParseCoreSources(const CPLXMLNode *psTree, const char *,
-                    std::map<CPLString, GDALDataset *> &oMapSharedSources);
-VRTSource *
-VRTParseFilterSources(const CPLXMLNode *psTree, const char *,
-                      std::map<CPLString, GDALDataset *> &oMapSharedSources);
-VRTSource *
-VRTParseArraySource(const CPLXMLNode *psTree, const char *,
-                    std::map<CPLString, GDALDataset *> &oMapSharedSources);
+VRTSource *VRTParseCoreSources(const CPLXMLNode *psTree, const char *,
+                               VRTMapSharedResources &oMapSharedSources);
+VRTSource *VRTParseFilterSources(const CPLXMLNode *psTree, const char *,
+                                 VRTMapSharedResources &oMapSharedSources);
+VRTSource *VRTParseArraySource(const CPLXMLNode *psTree, const char *,
+                               VRTMapSharedResources &oMapSharedSources);
 
 /************************************************************************/
 /*                              VRTDataset                              */
@@ -205,6 +227,7 @@ class VRTWarpedDataset;
 class VRTPansharpenedDataset;
 class VRTProcessedDataset;
 class VRTGroup;
+class VRTSimpleSource;
 
 class CPL_DLL VRTDataset CPL_NON_FINAL : public GDALDataset
 {
@@ -229,8 +252,8 @@ class CPL_DLL VRTDataset CPL_NON_FINAL : public GDALDataset
 
     VRTRasterBand *m_poMaskBand = nullptr;
 
-    int m_bCompatibleForDatasetIO = -1;
-    int CheckCompatibleForDatasetIO();
+    mutable int m_nCompatibleForDatasetIO = -1;
+    bool CheckCompatibleForDatasetIO() const;
 
     // Virtual (ie not materialized) overviews, created either implicitly
     // when it is cheap to do it, or explicitly.
@@ -242,11 +265,23 @@ class CPL_DLL VRTDataset CPL_NON_FINAL : public GDALDataset
 
     char **m_papszXMLVRTMetadata = nullptr;
 
-    std::map<CPLString, GDALDataset *> m_oMapSharedSources{};
+    VRTMapSharedResources m_oMapSharedSources{};
     std::shared_ptr<VRTGroup> m_poRootGroup{};
 
+    // Used by VRTSourcedRasterBand::IRasterIO() in single-threaded situations
     VRTSource::WorkingState m_oWorkingState{};
 
+    // Used by VRTSourcedRasterBand::IRasterIO() when using multi-threading
+    struct QueueWorkingStates
+    {
+        std::mutex oMutex{};
+        std::vector<std::unique_ptr<VRTSource::WorkingState>> oStates{};
+    };
+
+    QueueWorkingStates m_oQueueWorkingStates{};
+
+    bool m_bMultiThreadedRasterIOLastUsed = false;
+
     static constexpr const char *const apszSpecialSyntax[] = {
         "NITF_IM:{ANY}:{FILENAME}", "PDF:{ANY}:{FILENAME}",
         "RASTERLITE:{FILENAME},{ANY}", "TILEDB:\"{FILENAME}\":{ANY}",
@@ -261,6 +296,34 @@ class CPL_DLL VRTDataset CPL_NON_FINAL : public GDALDataset
                            GDALDataset *&poSrcDataset, int &nSrcXOff,
                            int &nSrcYOff);
 
+    /** Structure used to declare a threaded job to satisfy IRasterIO()
+     * on a given source.
+     */
+    struct RasterIOJob
+    {
+        std::atomic<int> *pnCompletedJobs = nullptr;
+        std::atomic<bool> *pbSuccess = nullptr;
+
+        GDALDataType eVRTBandDataType = GDT_Unknown;
+        int nXOff = 0;
+        int nYOff = 0;
+        int nXSize = 0;
+        int nYSize = 0;
+        void *pData = nullptr;
+        int nBufXSize = 0;
+        int nBufYSize = 0;
+        int nBandCount = 0;
+        BANDMAP_TYPE panBandMap = nullptr;
+        GDALDataType eBufType = GDT_Unknown;
+        GSpacing nPixelSpace = 0;
+        GSpacing nLineSpace = 0;
+        GSpacing nBandSpace = 0;
+        GDALRasterIOExtraArg *psExtraArg = nullptr;
+        VRTSimpleSource *poSource = nullptr;
+
+        static void Func(void *pData);
+    };
+
     CPL_DISALLOW_COPY_ASSIGN(VRTDataset)
 
   protected:
@@ -311,6 +374,8 @@ class CPL_DLL VRTDataset CPL_NON_FINAL : public GDALDataset
                                    const char *pszDomain = "") override;
 
     virtual char **GetMetadata(const char *pszDomain = "") override;
+    virtual const char *GetMetadataItem(const char *pszName,
+                                        const char *pszDomain = "") override;
 
     virtual int GetGCPCount() override;
 
@@ -362,6 +427,12 @@ class CPL_DLL VRTDataset CPL_NON_FINAL : public GDALDataset
 
     void ClearStatistics() override;
 
+    /** To be called when a new source is added, to invalidate cached states. */
+    void SourceAdded()
+    {
+        m_nCompatibleForDatasetIO = -1;
+    }
+
     /* Used by PDF driver for example */
     GDALDataset *GetSingleSimpleSource();
     void BuildVirtualOverviews();
@@ -399,6 +470,8 @@ class CPL_DLL VRTDataset CPL_NON_FINAL : public GDALDataset
     static std::string BuildSourceFilename(const char *pszFilename,
                                            const char *pszVRTPath,
                                            bool bRelativeToVRT);
+
+    static int GetNumThreads(GDALDataset *poDS);
 };
 
 /************************************************************************/
@@ -412,10 +485,16 @@ class CPL_DLL VRTWarpedDataset final : public VRTDataset
 {
     GDALWarpOperation *m_poWarper;
 
-    int m_nOverviewCount;
-    VRTWarpedDataset **m_papoOverviews;
+    bool m_bIsOverview = false;
+    std::vector<VRTWarpedDataset *> m_apoOverviews{};
     int m_nSrcOvrLevel;
 
+    bool GetOverviewSize(GDALDataset *poSrcDS, int iOvr, int iSrcOvr,
+                         int &nOvrXSize, int &nOvrYSize, double &dfSrcRatioX,
+                         double &dfSrcRatioY) const;
+    int GetOverviewCount() const;
+    int GetSrcOverviewLevel(int iOvr, bool &bThisLevelOnlyOut) const;
+    VRTWarpedDataset *CreateImplicitOverview(int iOvr) const;
     void CreateImplicitOverviews();
 
     friend class VRTWarpedRasterBand;
@@ -725,7 +804,7 @@ class CPL_DLL VRTRasterBand CPL_NON_FINAL : public GDALRasterBand
     virtual ~VRTRasterBand();
 
     virtual CPLErr XMLInit(const CPLXMLNode *, const char *,
-                           std::map<CPLString, GDALDataset *> &);
+                           VRTMapSharedResources &);
     virtual CPLXMLNode *SerializeToXML(const char *pszVRTPath,
                                        bool &bHasWarnedAboutRAMUsage,
                                        size_t &nAccRAMUsage);
@@ -831,6 +910,32 @@ class CPL_DLL VRTSourcedRasterBand CPL_NON_FINAL : public VRTRasterBand
     bool IsMosaicOfNonOverlappingSimpleSourcesOfFullRasterNoResAndTypeChange(
         bool bAllowMaxValAdjustment) const;
 
+    /** Structure used to declare a threaded job to satisfy IRasterIO()
+     * on a given source.
+     */
+    struct RasterIOJob
+    {
+        std::atomic<int> *pnCompletedJobs = nullptr;
+        std::atomic<bool> *pbSuccess = nullptr;
+        VRTDataset::QueueWorkingStates *poQueueWorkingStates = nullptr;
+
+        GDALDataType eVRTBandDataType = GDT_Unknown;
+        int nXOff = 0;
+        int nYOff = 0;
+        int nXSize = 0;
+        int nYSize = 0;
+        void *pData = nullptr;
+        int nBufXSize = 0;
+        int nBufYSize = 0;
+        GDALDataType eBufType = GDT_Unknown;
+        GSpacing nPixelSpace = 0;
+        GSpacing nLineSpace = 0;
+        GDALRasterIOExtraArg *psExtraArg = nullptr;
+        VRTSimpleSource *poSource = nullptr;
+
+        static void Func(void *pData);
+    };
+
     CPL_DISALLOW_COPY_ASSIGN(VRTSourcedRasterBand)
 
   protected:
@@ -868,7 +973,7 @@ class CPL_DLL VRTSourcedRasterBand CPL_NON_FINAL : public VRTRasterBand
                                    const char *pszDomain = "") override;
 
     virtual CPLErr XMLInit(const CPLXMLNode *, const char *,
-                           std::map<CPLString, GDALDataset *> &) override;
+                           VRTMapSharedResources &) override;
     virtual CPLXMLNode *SerializeToXML(const char *pszVRTPath,
                                        bool &bHasWarnedAboutRAMUsage,
                                        size_t &nAccRAMUsage) override;
@@ -944,6 +1049,10 @@ class CPL_DLL VRTSourcedRasterBand CPL_NON_FINAL : public VRTRasterBand
         GDALRWFlag eRWFlag, int nXOff, int nYOff, int nXSize, int nYSize,
         int nBufXSize, int nBufYSize, GDALRasterIOExtraArg *psExtraArg) const;
 
+    bool CanMultiThreadRasterIO(double dfXOff, double dfYOff, double dfXSize,
+                                double dfYSize,
+                                int &nContributingSources) const;
+
     virtual CPLErr IReadBlock(int, int, void *) override;
 
     virtual void GetFileList(char ***ppapszFileList, int *pnSize,
@@ -989,6 +1098,10 @@ class CPL_DLL VRTWarpedRasterBand final : public VRTRasterBand
   private:
     int m_nIRasterIOCounter =
         0;  //! Protects against infinite recursion inside IRasterIO()
+
+    int GetBestOverviewLevel(int &nXOff, int &nYOff, int &nXSize, int &nYSize,
+                             int nBufXSize, int nBufYSize,
+                             GDALRasterIOExtraArg *psExtraArg) const;
 };
 
 /************************************************************************/
@@ -1107,7 +1220,7 @@ class CPL_DLL VRTDerivedRasterBand CPL_NON_FINAL : public VRTSourcedRasterBand
     void SetPixelFunctionLanguage(const char *pszLanguage);
 
     virtual CPLErr XMLInit(const CPLXMLNode *, const char *,
-                           std::map<CPLString, GDALDataset *> &) override;
+                           VRTMapSharedResources &) override;
     virtual CPLXMLNode *SerializeToXML(const char *pszVRTPath,
                                        bool &bHasWarnedAboutRAMUsage,
                                        size_t &nAccRAMUsage) override;
@@ -1150,7 +1263,7 @@ class CPL_DLL VRTRawRasterBand CPL_NON_FINAL : public VRTRasterBand
     virtual ~VRTRawRasterBand();
 
     virtual CPLErr XMLInit(const CPLXMLNode *, const char *,
-                           std::map<CPLString, GDALDataset *> &) override;
+                           VRTMapSharedResources &) override;
     virtual CPLXMLNode *SerializeToXML(const char *pszVRTPath,
                                        bool &bHasWarnedAboutRAMUsage,
                                        size_t &nAccRAMUsage) override;
@@ -1199,9 +1312,8 @@ class VRTDriver final : public GDALDriver
     virtual CPLErr SetMetadata(char **papszMetadata,
                                const char *pszDomain = "") override;
 
-    VRTSource *
-    ParseSource(const CPLXMLNode *psSrc, const char *pszVRTPath,
-                std::map<CPLString, GDALDataset *> &oMapSharedSources);
+    VRTSource *ParseSource(const CPLXMLNode *psSrc, const char *pszVRTPath,
+                           VRTMapSharedResources &oMapSharedSources);
     void AddSourceParser(const char *pszElementName, VRTSourceParser pfnParser);
 };
 
@@ -1215,7 +1327,7 @@ class CPL_DLL VRTSimpleSource CPL_NON_FINAL : public VRTSource
 
   private:
     // Owned by the VRTDataset
-    std::map<CPLString, GDALDataset *> *m_poMapSharedSources = nullptr;
+    VRTMapSharedResources *m_poMapSharedSources = nullptr;
 
     mutable GDALRasterBand *m_poRasterBand = nullptr;
 
@@ -1236,15 +1348,21 @@ class CPL_DLL VRTSimpleSource CPL_NON_FINAL : public VRTSource
     int m_nBand = 0;
     bool m_bGetMaskBand = false;
 
-    double m_dfSrcXOff = 0;
-    double m_dfSrcYOff = 0;
-    double m_dfSrcXSize = 0;
-    double m_dfSrcYSize = 0;
+    /* Value for uninitialized source or destination window. It is chosen such
+     * that SrcToDst() and DstToSrc() are no-ops if both source and destination
+     * windows are unset.
+     */
+    static constexpr double UNINIT_WINDOW = -1.0;
 
-    double m_dfDstXOff = 0;
-    double m_dfDstYOff = 0;
-    double m_dfDstXSize = 0;
-    double m_dfDstYSize = 0;
+    double m_dfSrcXOff = UNINIT_WINDOW;
+    double m_dfSrcYOff = UNINIT_WINDOW;
+    double m_dfSrcXSize = UNINIT_WINDOW;
+    double m_dfSrcYSize = UNINIT_WINDOW;
+
+    double m_dfDstXOff = UNINIT_WINDOW;
+    double m_dfDstYOff = UNINIT_WINDOW;
+    double m_dfDstXSize = UNINIT_WINDOW;
+    double m_dfDstYSize = UNINIT_WINDOW;
 
     CPLString m_osResampling{};
 
@@ -1275,6 +1393,20 @@ class CPL_DLL VRTSimpleSource CPL_NON_FINAL : public VRTSource
         return true;
     }
 
+    /** Returns whether the source window is set */
+    bool IsSrcWinSet() const
+    {
+        return m_dfSrcXOff != UNINIT_WINDOW || m_dfSrcYOff != UNINIT_WINDOW ||
+               m_dfSrcXSize != UNINIT_WINDOW || m_dfSrcYSize != UNINIT_WINDOW;
+    }
+
+    /** Returns whether the destination window is set */
+    bool IsDstWinSet() const
+    {
+        return m_dfDstXOff != UNINIT_WINDOW || m_dfDstYOff != UNINIT_WINDOW ||
+               m_dfDstXSize != UNINIT_WINDOW || m_dfDstYSize != UNINIT_WINDOW;
+    }
+
   public:
     VRTSimpleSource();
     VRTSimpleSource(const VRTSimpleSource *poSrcSource, double dfXDstRatio,
@@ -1282,7 +1414,7 @@ class CPL_DLL VRTSimpleSource CPL_NON_FINAL : public VRTSource
     virtual ~VRTSimpleSource();
 
     virtual CPLErr XMLInit(const CPLXMLNode *psTree, const char *,
-                           std::map<CPLString, GDALDataset *> &) override;
+                           VRTMapSharedResources &) override;
     virtual CPLXMLNode *SerializeToXML(const char *pszVRTPath) override;
 
     CPLErr ParseSrcRectAndDstRect(const CPLXMLNode *psSrc);
@@ -1292,7 +1424,9 @@ class CPL_DLL VRTSimpleSource CPL_NON_FINAL : public VRTSource
     void SetSrcMaskBand(GDALRasterBand *);
     void SetSrcWindow(double, double, double, double);
     void SetDstWindow(double, double, double, double);
-    void GetDstWindow(double &, double &, double &, double &);
+    void GetDstWindow(double &, double &, double &, double &) const;
+    bool DstWindowIntersects(double dfXOff, double dfYOff, double dfXSize,
+                             double dfYSize) const;
 
     const std::string &GetSourceDatasetName() const
     {
@@ -1333,21 +1467,23 @@ class CPL_DLL VRTSimpleSource CPL_NON_FINAL : public VRTSource
     virtual void GetFileList(char ***ppapszFileList, int *pnSize,
                              int *pnMaxSize, CPLHashSet *hSetFiles) override;
 
-    virtual int IsSimpleSource() override
+    bool IsSimpleSource() const override
     {
-        return TRUE;
+        return true;
     }
 
-    virtual const char *GetType()
-    {
-        return "SimpleSource";
-    }
+    /** Returns the same value as GetType() called on objects that are exactly
+     * instances of VRTSimpleSource.
+     */
+    static const char *GetTypeStatic();
+
+    const char *GetType() const override;
 
     virtual CPLErr FlushCache(bool bAtClosing) override;
 
     GDALRasterBand *GetRasterBand() const;
     GDALRasterBand *GetMaskBandMainBand();
-    int IsSameExceptBandNumber(VRTSimpleSource *poOtherSource);
+    bool IsSameExceptBandNumber(const VRTSimpleSource *poOtherSource) const;
     CPLErr DatasetRasterIO(GDALDataType eVRTBandDataType, int nXOff, int nYOff,
                            int nXSize, int nYSize, void *pData, int nBufXSize,
                            int nBufYSize, GDALDataType eBufType, int nBandCount,
@@ -1395,10 +1531,12 @@ class VRTAveragedSource final : public VRTSimpleSource
 
     virtual CPLXMLNode *SerializeToXML(const char *pszVRTPath) override;
 
-    virtual const char *GetType() override
-    {
-        return "AveragedSource";
-    }
+    /** Returns the same value as GetType() called on objects that are exactly
+     * instances of VRTAveragedSource.
+     */
+    static const char *GetTypeStatic();
+
+    const char *GetType() const override;
 };
 
 /************************************************************************/
@@ -1437,13 +1575,15 @@ class VRTNoDataFromMaskSource final : public VRTSimpleSource
                        double dfRemappedValue);
 
     virtual CPLErr XMLInit(const CPLXMLNode *psTree, const char *,
-                           std::map<CPLString, GDALDataset *> &) override;
+                           VRTMapSharedResources &) override;
     virtual CPLXMLNode *SerializeToXML(const char *pszVRTPath) override;
 
-    virtual const char *GetType() override
-    {
-        return "VRTNoDataFromMaskSource";
-    }
+    /** Returns the same value as GetType() called on objects that are exactly
+     * instances of VRTNoDataFromMaskSource.
+     */
+    static const char *GetTypeStatic();
+
+    const char *GetType() const override;
 };
 
 /************************************************************************/
@@ -1530,12 +1670,14 @@ class CPL_DLL VRTComplexSource CPL_NON_FINAL : public VRTSimpleSource
 
     virtual CPLXMLNode *SerializeToXML(const char *pszVRTPath) override;
     virtual CPLErr XMLInit(const CPLXMLNode *, const char *,
-                           std::map<CPLString, GDALDataset *> &) override;
+                           VRTMapSharedResources &) override;
 
-    virtual const char *GetType() override
-    {
-        return "ComplexSource";
-    }
+    /** Returns the same value as GetType() called on objects that are exactly
+     * instances of VRTComplexSource.
+     */
+    static const char *GetTypeStatic();
+
+    const char *GetType() const override;
 
     bool AreValuesUnchanged() const;
 
@@ -1578,6 +1720,8 @@ class VRTFilteredSource CPL_NON_FINAL : public VRTComplexSource
     VRTFilteredSource();
     virtual ~VRTFilteredSource();
 
+    const char *GetType() const override = 0;
+
     void SetExtraEdgePixels(int);
     void SetFilteringDataTypesSupported(int, GDALDataType *);
 
@@ -1601,27 +1745,27 @@ class VRTKernelFilteredSource CPL_NON_FINAL : public VRTFilteredSource
     CPL_DISALLOW_COPY_ASSIGN(VRTKernelFilteredSource)
 
   protected:
-    int m_nKernelSize;
-
-    bool m_bSeparable;
-
-    double *m_padfKernelCoefs;
-
-    int m_bNormalized;
+    int m_nKernelSize = 0;
+    bool m_bSeparable = false;
+    // m_nKernelSize elements if m_bSeparable, m_nKernelSize * m_nKernelSize otherwise
+    std::vector<double> m_adfKernelCoefs{};
+    bool m_bNormalized = false;
 
   public:
     VRTKernelFilteredSource();
-    virtual ~VRTKernelFilteredSource();
+
+    const char *GetType() const override;
 
     virtual CPLErr XMLInit(const CPLXMLNode *psTree, const char *,
-                           std::map<CPLString, GDALDataset *> &) override;
+                           VRTMapSharedResources &) override;
     virtual CPLXMLNode *SerializeToXML(const char *pszVRTPath) override;
 
     virtual CPLErr FilterData(int nXSize, int nYSize, GDALDataType eType,
                               GByte *pabySrcData, GByte *pabyDstData) override;
 
-    CPLErr SetKernel(int nKernelSize, bool bSeparable, double *padfCoefs);
-    void SetNormalized(int);
+    CPLErr SetKernel(int nKernelSize, bool bSeparable,
+                     const std::vector<double> &adfNewCoefs);
+    void SetNormalized(bool);
 };
 
 /************************************************************************/
@@ -1636,8 +1780,10 @@ class VRTAverageFilteredSource final : public VRTKernelFilteredSource
     explicit VRTAverageFilteredSource(int nKernelSize);
     virtual ~VRTAverageFilteredSource();
 
+    const char *GetType() const override;
+
     virtual CPLErr XMLInit(const CPLXMLNode *psTree, const char *,
-                           std::map<CPLString, GDALDataset *> &) override;
+                           VRTMapSharedResources &) override;
     virtual CPLXMLNode *SerializeToXML(const char *pszVRTPath) override;
 };
 
@@ -1653,7 +1799,7 @@ class VRTFuncSource final : public VRTSource
     virtual ~VRTFuncSource();
 
     virtual CPLErr XMLInit(const CPLXMLNode *, const char *,
-                           std::map<CPLString, GDALDataset *> &) override
+                           VRTMapSharedResources &) override
     {
         return CE_Failure;
     }
@@ -1675,6 +1821,8 @@ class VRTFuncSource final : public VRTSource
                                 int bApproxOK, GDALProgressFunc pfnProgress,
                                 void *pProgressData) override;
 
+    const char *GetType() const override;
+
     VRTImageReadFunc pfnReadFunc;
     void *pCBData;
     GDALDataType eType;
diff --git a/frmts/vrt/vrtderivedrasterband.cpp b/frmts/vrt/vrtderivedrasterband.cpp
index cf340548966b..4c58ce962ee1 100644
--- a/frmts/vrt/vrtderivedrasterband.cpp
+++ b/frmts/vrt/vrtderivedrasterband.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2005 Vexcel Corp.
  * Copyright (c) 2008-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #include "cpl_minixml.h"
@@ -720,7 +704,7 @@ bool VRTDerivedRasterBand::InitializePython()
             CPLString osException = GetPyExceptionString();
             if (!osException.empty() && osException.back() == '\n')
             {
-                osException.resize(osException.size() - 1);
+                osException.pop_back();
             }
             if (osException.find("ModuleNotFoundError") == 0)
             {
@@ -828,10 +812,10 @@ CPLErr VRTDerivedRasterBand::GetPixelFunctionArguments(
                     }
 
                     oAdditionalArgs.push_back(std::pair<CPLString, CPLString>(
-                        osValue, CPLSPrintf("%.18g", dfVal)));
+                        osValue, CPLSPrintf("%.17g", dfVal)));
                     CPLDebug("VRT",
                              "Added builtin pixel function argument %s = %s",
-                             osValue.c_str(), CPLSPrintf("%.18g", dfVal));
+                             osValue.c_str(), CPLSPrintf("%.17g", dfVal));
                 }
             }
         }
@@ -1416,9 +1400,9 @@ int VRTDerivedRasterBand::IGetDataCoverageStatus(
 /*                              XMLInit()                               */
 /************************************************************************/
 
-CPLErr VRTDerivedRasterBand::XMLInit(
-    const CPLXMLNode *psTree, const char *pszVRTPath,
-    std::map<CPLString, GDALDataset *> &oMapSharedSources)
+CPLErr VRTDerivedRasterBand::XMLInit(const CPLXMLNode *psTree,
+                                     const char *pszVRTPath,
+                                     VRTMapSharedResources &oMapSharedSources)
 
 {
     const CPLErr eErr =
diff --git a/frmts/vrt/vrtdriver.cpp b/frmts/vrt/vrtdriver.cpp
index 5e69096de56a..14db8591e6fe 100644
--- a/frmts/vrt/vrtdriver.cpp
+++ b/frmts/vrt/vrtdriver.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "vrtdataset.h"
@@ -137,9 +121,9 @@ void VRTDriver::AddSourceParser(const char *pszElementName,
 /*                            ParseSource()                             */
 /************************************************************************/
 
-VRTSource *
-VRTDriver::ParseSource(const CPLXMLNode *psSrc, const char *pszVRTPath,
-                       std::map<CPLString, GDALDataset *> &oMapSharedSources)
+VRTSource *VRTDriver::ParseSource(const CPLXMLNode *psSrc,
+                                  const char *pszVRTPath,
+                                  VRTMapSharedResources &oMapSharedSources)
 
 {
 
@@ -542,10 +526,12 @@ void GDALRegister_VRT()
         "   <Option name='BLOCKYSIZE' type='int' description='Block height'/>\n"
         "</CreationOptionList>\n");
 
-    poDriver->pfnOpen = VRTDataset::Open;
     poDriver->pfnCreateCopy = VRTCreateCopy;
     poDriver->pfnCreate = VRTDataset::Create;
     poDriver->pfnCreateMultiDimensional = VRTDataset::CreateMultiDimensional;
+
+#ifndef NO_OPEN
+    poDriver->pfnOpen = VRTDataset::Open;
     poDriver->pfnIdentify = VRTDataset::Identify;
     poDriver->pfnDelete = VRTDataset::Delete;
 
@@ -557,7 +543,11 @@ void GDALRegister_VRT()
         "relative paths inside the VRT. Mainly useful for inlined VRT, or "
         "in-memory "
         "VRT, where their own directory does not make sense'/>"
+        "<Option name='NUM_THREADS' type='string' description="
+        "'Number of worker threads for reading. Can be set to ALL_CPUS' "
+        "default='ALL_CPUS'/>"
         "</OpenOptionList>");
+#endif
 
     poDriver->SetMetadataItem(GDAL_DCAP_VIRTUALIO, "YES");
     poDriver->SetMetadataItem(GDAL_DCAP_COORDINATE_EPOCH, "YES");
diff --git a/frmts/vrt/vrtfilters.cpp b/frmts/vrt/vrtfilters.cpp
index 3350afeff354..50e06346ba1e 100644
--- a/frmts/vrt/vrtfilters.cpp
+++ b/frmts/vrt/vrtfilters.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -420,28 +404,26 @@ CPLErr VRTFilteredSource::RasterIO(GDALDataType eVRTBandDataType, int nXOff,
 /************************************************************************/
 
 VRTKernelFilteredSource::VRTKernelFilteredSource()
-    : m_nKernelSize(0), m_bSeparable(FALSE), m_padfKernelCoefs(nullptr),
-      m_bNormalized(FALSE)
 {
     GDALDataType aeSupTypes[] = {GDT_Float32};
     SetFilteringDataTypesSupported(1, aeSupTypes);
 }
 
 /************************************************************************/
-/*                      ~VRTKernelFilteredSource()                      */
+/*                            GetType()                                 */
 /************************************************************************/
 
-VRTKernelFilteredSource::~VRTKernelFilteredSource()
-
+const char *VRTKernelFilteredSource::GetType() const
 {
-    CPLFree(m_padfKernelCoefs);
+    static const char *TYPE = "KernelFilteredSource";
+    return TYPE;
 }
 
 /************************************************************************/
 /*                           SetNormalized()                            */
 /************************************************************************/
 
-void VRTKernelFilteredSource::SetNormalized(int bNormalizedIn)
+void VRTKernelFilteredSource::SetNormalized(bool bNormalizedIn)
 
 {
     m_bNormalized = bNormalizedIn;
@@ -451,8 +433,9 @@ void VRTKernelFilteredSource::SetNormalized(int bNormalizedIn)
 /*                             SetKernel()                              */
 /************************************************************************/
 
-CPLErr VRTKernelFilteredSource::SetKernel(int nNewKernelSize, bool bSeparable,
-                                          double *padfNewCoefs)
+CPLErr
+VRTKernelFilteredSource::SetKernel(int nNewKernelSize, bool bSeparable,
+                                   const std::vector<double> &adfNewCoefs)
 
 {
     if (nNewKernelSize < 1 || (nNewKernelSize % 2) != 1)
@@ -463,16 +446,17 @@ CPLErr VRTKernelFilteredSource::SetKernel(int nNewKernelSize, bool bSeparable,
                  nNewKernelSize);
         return CE_Failure;
     }
+    if (adfNewCoefs.size() !=
+        static_cast<size_t>(nNewKernelSize) * (bSeparable ? 1 : nNewKernelSize))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "adfNewCoefs[] is not of expected size");
+        return CE_Failure;
+    }
 
-    CPLFree(m_padfKernelCoefs);
     m_nKernelSize = nNewKernelSize;
     m_bSeparable = bSeparable;
-
-    int nKernelBufferSize = m_nKernelSize * (m_bSeparable ? 1 : m_nKernelSize);
-
-    m_padfKernelCoefs =
-        static_cast<double *>(CPLMalloc(sizeof(double) * nKernelBufferSize));
-    memcpy(m_padfKernelCoefs, padfNewCoefs, sizeof(double) * nKernelBufferSize);
+    m_adfKernelCoefs = adfNewCoefs;
 
     SetExtraEdgePixels((nNewKernelSize - 1) / 2);
 
@@ -565,8 +549,8 @@ CPLErr VRTKernelFilteredSource::FilterData(int nXSize, int nYSize,
                                                   iJJ * nJStride;
                             if (bHasNoData && *pfData == fNoData)
                                 continue;
-                            dfSum += *pfData * m_padfKernelCoefs[iK];
-                            dfKernSum += m_padfKernelCoefs[iK];
+                            dfSum += *pfData * m_adfKernelCoefs[iK];
+                            dfKernSum += m_adfKernelCoefs[iK];
                         }
                     }
 
@@ -591,9 +575,10 @@ CPLErr VRTKernelFilteredSource::FilterData(int nXSize, int nYSize,
 /*                              XMLInit()                               */
 /************************************************************************/
 
-CPLErr VRTKernelFilteredSource::XMLInit(
-    const CPLXMLNode *psTree, const char *pszVRTPath,
-    std::map<CPLString, GDALDataset *> &oMapSharedSources)
+CPLErr
+VRTKernelFilteredSource::XMLInit(const CPLXMLNode *psTree,
+                                 const char *pszVRTPath,
+                                 VRTMapSharedResources &oMapSharedSources)
 
 {
     {
@@ -618,17 +603,16 @@ CPLErr VRTKernelFilteredSource::XMLInit(
         return CE_Failure;
     }
 
-    char **papszCoefItems =
-        CSLTokenizeString(CPLGetXMLValue(psTree, "Kernel.Coefs", ""));
+    const CPLStringList aosCoefItems(
+        CSLTokenizeString(CPLGetXMLValue(psTree, "Kernel.Coefs", "")));
 
-    const int nCoefs = CSLCount(papszCoefItems);
+    const int nCoefs = aosCoefItems.size();
 
     const bool bSquare = nCoefs == nNewKernelSize * nNewKernelSize;
     const bool bSeparable = nCoefs == nNewKernelSize && nCoefs != 1;
 
     if (!bSquare && !bSeparable)
     {
-        CSLDestroy(papszCoefItems);
         CPLError(CE_Failure, CPLE_AppDefined,
                  "Got wrong number of filter kernel coefficients (%s).  "
                  "Expected %d or %d, got %d.",
@@ -637,19 +621,17 @@ CPLErr VRTKernelFilteredSource::XMLInit(
         return CE_Failure;
     }
 
-    double *padfNewCoefs =
-        static_cast<double *>(CPLMalloc(sizeof(double) * nCoefs));
-
+    std::vector<double> adfNewCoefs;
+    adfNewCoefs.reserve(nCoefs);
     for (int i = 0; i < nCoefs; i++)
-        padfNewCoefs[i] = CPLAtof(papszCoefItems[i]);
-
-    const CPLErr eErr = SetKernel(nNewKernelSize, bSeparable, padfNewCoefs);
-
-    CPLFree(padfNewCoefs);
-    CSLDestroy(papszCoefItems);
-
-    SetNormalized(atoi(CPLGetXMLValue(psTree, "Kernel.normalized", "0")));
+        adfNewCoefs.push_back(CPLAtof(aosCoefItems[i]));
 
+    const CPLErr eErr = SetKernel(nNewKernelSize, bSeparable, adfNewCoefs);
+    if (eErr == CE_None)
+    {
+        SetNormalized(atoi(CPLGetXMLValue(psTree, "Kernel.normalized", "0")) !=
+                      0);
+    }
     return eErr;
 }
 
@@ -673,29 +655,19 @@ CPLXMLNode *VRTKernelFilteredSource::SerializeToXML(const char *pszVRTPath)
 
     CPLXMLNode *psKernel = CPLCreateXMLNode(psSrc, CXT_Element, "Kernel");
 
-    if (m_bNormalized)
-        CPLCreateXMLNode(
-            CPLCreateXMLNode(psKernel, CXT_Attribute, "normalized"), CXT_Text,
-            "1");
-    else
-        CPLCreateXMLNode(
-            CPLCreateXMLNode(psKernel, CXT_Attribute, "normalized"), CXT_Text,
-            "0");
-
-    const int nCoefCount = m_nKernelSize * m_nKernelSize;
-    const size_t nBufLen = nCoefCount * 32;
-    char *pszKernelCoefs = static_cast<char *>(CPLMalloc(nBufLen));
-
-    strcpy(pszKernelCoefs, "");
-    for (int iCoef = 0; iCoef < nCoefCount; iCoef++)
-        CPLsnprintf(pszKernelCoefs + strlen(pszKernelCoefs),
-                    nBufLen - strlen(pszKernelCoefs), "%.8g ",
-                    m_padfKernelCoefs[iCoef]);
+    CPLCreateXMLNode(CPLCreateXMLNode(psKernel, CXT_Attribute, "normalized"),
+                     CXT_Text, m_bNormalized ? "1" : "0");
 
-    CPLSetXMLValue(psKernel, "Size", CPLSPrintf("%d", m_nKernelSize));
-    CPLSetXMLValue(psKernel, "Coefs", pszKernelCoefs);
+    std::string osCoefs;
+    for (auto dfVal : m_adfKernelCoefs)
+    {
+        if (!osCoefs.empty())
+            osCoefs += ' ';
+        osCoefs += CPLSPrintf("%.8g", dfVal);
+    }
 
-    CPLFree(pszKernelCoefs);
+    CPLSetXMLValue(psKernel, "Size", CPLSPrintf("%d", m_nKernelSize));
+    CPLSetXMLValue(psKernel, "Coefs", osCoefs.c_str());
 
     return psSrc;
 }
@@ -704,9 +676,9 @@ CPLXMLNode *VRTKernelFilteredSource::SerializeToXML(const char *pszVRTPath)
 /*                       VRTParseFilterSources()                        */
 /************************************************************************/
 
-VRTSource *
-VRTParseFilterSources(const CPLXMLNode *psChild, const char *pszVRTPath,
-                      std::map<CPLString, GDALDataset *> &oMapSharedSources)
+VRTSource *VRTParseFilterSources(const CPLXMLNode *psChild,
+                                 const char *pszVRTPath,
+                                 VRTMapSharedResources &oMapSharedSources)
 
 {
     if (EQUAL(psChild->pszValue, "KernelFilteredSource"))
diff --git a/frmts/vrt/vrtmultidim.cpp b/frmts/vrt/vrtmultidim.cpp
index d4706b081659..203420d97cdb 100644
--- a/frmts/vrt/vrtmultidim.cpp
+++ b/frmts/vrt/vrtmultidim.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2019, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 /*! @cond Doxygen_Suppress */
@@ -407,7 +391,7 @@ VRTGroup::GetDimensionFromFullName(const std::string &name,
                 return nullptr;
             }
         }
-        auto poDim(curGroup->GetDimension(aosTokens[aosTokens.size() - 1]));
+        auto poDim(curGroup->GetDimension(aosTokens.back()));
         if (!poDim)
         {
             if (bEmitError)
@@ -1172,9 +1156,9 @@ void VRTMDArraySourceRegularlySpaced::Serialize(CPLXMLNode *psParent,
     CPLXMLNode *psSource =
         CPLCreateXMLNode(psParent, CXT_Element, "RegularlySpacedValues");
     CPLAddXMLAttributeAndValue(psSource, "start",
-                               CPLSPrintf("%.18g", m_dfStart));
+                               CPLSPrintf("%.17g", m_dfStart));
     CPLAddXMLAttributeAndValue(psSource, "increment",
-                               CPLSPrintf("%.18g", m_dfIncrement));
+                               CPLSPrintf("%.17g", m_dfIncrement));
 }
 
 /************************************************************************/
@@ -2566,13 +2550,13 @@ void VRTMDArray::Serialize(CPLXMLNode *psParent, const char *pszVRTPath) const
     if (m_bHasOffset)
     {
         CPLCreateXMLElementAndValue(psArray, "Offset",
-                                    CPLSPrintf("%.18g", m_dfOffset));
+                                    CPLSPrintf("%.17g", m_dfOffset));
     }
 
     if (m_bHasScale)
     {
         CPLCreateXMLElementAndValue(psArray, "Scale",
-                                    CPLSPrintf("%.18g", m_dfScale));
+                                    CPLSPrintf("%.17g", m_dfScale));
     }
 
     for (const auto &poSource : m_sources)
@@ -2626,9 +2610,13 @@ class VRTArraySource : public VRTSource
             bIncludeOutOfRange, bApproxOK, pfnProgress, pProgressData);
     }
 
-    CPLErr
-    XMLInit(const CPLXMLNode *psTree, const char *pszVRTPath,
-            std::map<CPLString, GDALDataset *> &oMapSharedSources) override;
+    const char *GetType() const override
+    {
+        return "ArraySource";
+    }
+
+    CPLErr XMLInit(const CPLXMLNode *psTree, const char *pszVRTPath,
+                   VRTMapSharedResources &oMapSharedSources) override;
     CPLXMLNode *SerializeToXML(const char *pszVRTPath) override;
 };
 
@@ -2705,9 +2693,8 @@ ParseSingleSourceArray(const CPLXMLNode *psSingleSourceArray,
 /*                              XMLInit()                               */
 /************************************************************************/
 
-CPLErr VRTArraySource::XMLInit(
-    const CPLXMLNode *psTree, const char *pszVRTPath,
-    std::map<CPLString, GDALDataset *> & /*oMapSharedSources*/)
+CPLErr VRTArraySource::XMLInit(const CPLXMLNode *psTree, const char *pszVRTPath,
+                               VRTMapSharedResources & /*oMapSharedSources*/)
 {
     const auto poArray = ParseArray(psTree, pszVRTPath, "ArraySource");
     if (!poArray)
@@ -2977,9 +2964,9 @@ static std::shared_ptr<GDALMDArray> ParseArray(const CPLXMLNode *psTree,
 /*                       VRTParseArraySource()                          */
 /************************************************************************/
 
-VRTSource *
-VRTParseArraySource(const CPLXMLNode *psChild, const char *pszVRTPath,
-                    std::map<CPLString, GDALDataset *> &oMapSharedSources)
+VRTSource *VRTParseArraySource(const CPLXMLNode *psChild,
+                               const char *pszVRTPath,
+                               VRTMapSharedResources &oMapSharedSources)
 {
     VRTSource *poSource = nullptr;
 
diff --git a/frmts/vrt/vrtpansharpened.cpp b/frmts/vrt/vrtpansharpened.cpp
index bc70ddf70fd7..a265369efded 100644
--- a/frmts/vrt/vrtpansharpened.cpp
+++ b/frmts/vrt/vrtpansharpened.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -355,12 +339,11 @@ CPLErr VRTPansharpenedDataset::XMLInit(const CPLXMLNode *psTree,
         const CPLStringList aosOpenOptions(
             GDALDeserializeOpenOptionsFromXML(psPanchroBand));
 
-        poPanDataset = GDALDataset::Open(osSourceFilename, GDAL_OF_RASTER,
+        poPanDataset = GDALDataset::Open(osSourceFilename,
+                                         GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR,
                                          nullptr, aosOpenOptions.List());
         if (poPanDataset == nullptr)
         {
-            CPLError(CE_Failure, CPLE_AppDefined, "%s not a valid dataset",
-                     osSourceFilename.c_str());
             return CE_Failure;
         }
         poPanDatasetToClose = poPanDataset;
@@ -559,13 +542,11 @@ CPLErr VRTPansharpenedDataset::XMLInit(const CPLXMLNode *psTree,
                 const CPLStringList aosOpenOptions(
                     GDALDeserializeOpenOptionsFromXML(psIter));
 
-                poDataset = GDALDataset::Open(osSourceFilename, GDAL_OF_RASTER,
-                                              nullptr, aosOpenOptions.List());
+                poDataset = GDALDataset::Open(
+                    osSourceFilename, GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR,
+                    nullptr, aosOpenOptions.List());
                 if (poDataset == nullptr)
                 {
-                    CPLError(CE_Failure, CPLE_AppDefined,
-                             "%s not a valid dataset",
-                             osSourceFilename.c_str());
                     goto error;
                 }
                 oMapNamesToDataset[osSourceFilename] = poDataset;
diff --git a/frmts/vrt/vrtprocesseddataset.cpp b/frmts/vrt/vrtprocesseddataset.cpp
index 8a3fa27a0258..b8cd27b76915 100644
--- a/frmts/vrt/vrtprocesseddataset.cpp
+++ b/frmts/vrt/vrtprocesseddataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2024, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_minixml.h"
@@ -573,7 +557,7 @@ bool VRTProcessedDataset::ParseStep(const CPLXMLNode *psStep, bool bIsFinalStep,
         if (bHasVal)
         {
             oStep.aosArguments.AddNameValue("nodata",
-                                            CPLSPrintf("%.18g", dfVal));
+                                            CPLSPrintf("%.17g", dfVal));
         }
     }
 
@@ -586,7 +570,7 @@ bool VRTProcessedDataset::ParseStep(const CPLXMLNode *psStep, bool bIsFinalStep,
             const double dfVal = GetRasterBand(i)->GetOffset(&bHasVal);
             oStep.aosArguments.AddNameValue(
                 CPLSPrintf("offset_%d", i),
-                CPLSPrintf("%.18g", bHasVal ? dfVal : 0.0));
+                CPLSPrintf("%.17g", bHasVal ? dfVal : 0.0));
         }
     }
 
@@ -599,7 +583,7 @@ bool VRTProcessedDataset::ParseStep(const CPLXMLNode *psStep, bool bIsFinalStep,
             const double dfVal = GetRasterBand(i)->GetScale(&bHasVal);
             oStep.aosArguments.AddNameValue(
                 CPLSPrintf("scale_%d", i),
-                CPLSPrintf("%.18g", bHasVal ? dfVal : 1.0));
+                CPLSPrintf("%.17g", bHasVal ? dfVal : 1.0));
         }
     }
 
diff --git a/frmts/vrt/vrtprocesseddatasetfunctions.cpp b/frmts/vrt/vrtprocesseddatasetfunctions.cpp
index a34aca2919b9..f6fb184fb1f6 100644
--- a/frmts/vrt/vrtprocesseddatasetfunctions.cpp
+++ b/frmts/vrt/vrtprocesseddatasetfunctions.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2024, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_minixml.h"
@@ -963,8 +947,10 @@ static bool LoadAuxData(double dfULX, double dfULY, double dfLRX, double dfLRY,
         return false;
     }
 
-    const int nAuxXOff = std::max(0, static_cast<int>(std::round(dfULPixel)));
-    const int nAuxYOff = std::max(0, static_cast<int>(std::round(dfULLine)));
+    const int nAuxXOff = std::clamp(static_cast<int>(std::round(dfULPixel)), 0,
+                                    poAuxBand->GetXSize() - 1);
+    const int nAuxYOff = std::clamp(static_cast<int>(std::round(dfULLine)), 0,
+                                    poAuxBand->GetYSize() - 1);
     const int nAuxX2Off = std::min(poAuxBand->GetXSize(),
                                    static_cast<int>(std::round(dfLRPixel)));
     const int nAuxY2Off =
diff --git a/frmts/vrt/vrtrasterband.cpp b/frmts/vrt/vrtrasterband.cpp
index 81ffd6c47089..2698926b777c 100644
--- a/frmts/vrt/vrtrasterband.cpp
+++ b/frmts/vrt/vrtrasterband.cpp
@@ -8,28 +8,13 @@
  * Copyright (c) 2001, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
 #include "vrtdataset.h"
 
+#include <cmath>
 #include <cstdlib>
 #include <cstring>
 #include <algorithm>
@@ -342,9 +327,8 @@ VRTParseColorTable(const CPLXMLNode *psColorTable)
 /*                              XMLInit()                               */
 /************************************************************************/
 
-CPLErr
-VRTRasterBand::XMLInit(const CPLXMLNode *psTree, const char *pszVRTPath,
-                       std::map<CPLString, GDALDataset *> &oMapSharedSources)
+CPLErr VRTRasterBand::XMLInit(const CPLXMLNode *psTree, const char *pszVRTPath,
+                              VRTMapSharedResources &oMapSharedSources)
 
 {
     /* -------------------------------------------------------------------- */
@@ -617,7 +601,7 @@ VRTRasterBand::XMLInit(const CPLXMLNode *psTree, const char *pszVRTPath,
 CPLString VRTSerializeNoData(double dfVal, GDALDataType eDataType,
                              int nPrecision)
 {
-    if (CPLIsNan(dfVal))
+    if (std::isnan(dfVal))
     {
         return "nan";
     }
diff --git a/frmts/vrt/vrtrawrasterband.cpp b/frmts/vrt/vrtrawrasterband.cpp
index e5c25753a518..3bbfb668a664 100644
--- a/frmts/vrt/vrtrawrasterband.cpp
+++ b/frmts/vrt/vrtrawrasterband.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -343,9 +327,9 @@ CPLVirtualMem *VRTRawRasterBand::GetVirtualMemAuto(GDALRWFlag eRWFlag,
 /*                              XMLInit()                               */
 /************************************************************************/
 
-CPLErr
-VRTRawRasterBand::XMLInit(const CPLXMLNode *psTree, const char *pszVRTPath,
-                          std::map<CPLString, GDALDataset *> &oMapSharedSources)
+CPLErr VRTRawRasterBand::XMLInit(const CPLXMLNode *psTree,
+                                 const char *pszVRTPath,
+                                 VRTMapSharedResources &oMapSharedSources)
 
 {
     const CPLErr eErr =
diff --git a/frmts/vrt/vrtsourcedrasterband.cpp b/frmts/vrt/vrtsourcedrasterband.cpp
index 8b73263e3dcf..cc3c0e6f6698 100644
--- a/frmts/vrt/vrtsourcedrasterband.cpp
+++ b/frmts/vrt/vrtsourcedrasterband.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2001, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -239,6 +223,106 @@ bool VRTSourcedRasterBand::CanIRasterIOBeForwardedToEachSource(
     return true;
 }
 
+/************************************************************************/
+/*                      CanMultiThreadRasterIO()                        */
+/************************************************************************/
+
+bool VRTSourcedRasterBand::CanMultiThreadRasterIO(
+    double dfXOff, double dfYOff, double dfXSize, double dfYSize,
+    int &nContributingSources) const
+{
+    int iLastSource = 0;
+    CPLRectObj sSourceBounds;
+    CPLQuadTree *hQuadTree = nullptr;
+    bool bRet = true;
+    std::set<std::string> oSetDSName;
+
+    nContributingSources = 0;
+    for (int iSource = 0; iSource < nSources; iSource++)
+    {
+        const auto poSource = papoSources[iSource];
+        if (!poSource->IsSimpleSource())
+        {
+            bRet = false;
+            break;
+        }
+        const auto poSimpleSource = cpl::down_cast<VRTSimpleSource *>(poSource);
+        if (poSimpleSource->DstWindowIntersects(dfXOff, dfYOff, dfXSize,
+                                                dfYSize))
+        {
+            // Only build hQuadTree if there are 2 or more sources
+            if (nContributingSources == 1)
+            {
+                std::string &oFirstSrcDSName =
+                    cpl::down_cast<VRTSimpleSource *>(papoSources[iLastSource])
+                        ->m_osSrcDSName;
+                oSetDSName.insert(oFirstSrcDSName);
+
+                CPLRectObj sGlobalBounds;
+                sGlobalBounds.minx = dfXOff;
+                sGlobalBounds.miny = dfYOff;
+                sGlobalBounds.maxx = dfXOff + dfXSize;
+                sGlobalBounds.maxy = dfYOff + dfYSize;
+                hQuadTree = CPLQuadTreeCreate(&sGlobalBounds, nullptr);
+
+                CPLQuadTreeInsertWithBounds(
+                    hQuadTree,
+                    reinterpret_cast<void *>(
+                        static_cast<uintptr_t>(iLastSource)),
+                    &sSourceBounds);
+            }
+
+            // Check there are not several sources with the same name, to avoid
+            // the same GDALDataset* to be used from multiple threads. We may
+            // be a bit too pessimistic, for example if working with unnamed
+            // Memory datasets, but that would involve comparing
+            // poSource->GetRasterBandNoOpen()->GetDataset()
+            if (oSetDSName.find(poSimpleSource->m_osSrcDSName) !=
+                oSetDSName.end())
+            {
+                bRet = false;
+                break;
+            }
+            oSetDSName.insert(poSimpleSource->m_osSrcDSName);
+
+            double dfSourceXOff;
+            double dfSourceYOff;
+            double dfSourceXSize;
+            double dfSourceYSize;
+            poSimpleSource->GetDstWindow(dfSourceXOff, dfSourceYOff,
+                                         dfSourceXSize, dfSourceYSize);
+            constexpr double EPSILON = 1e-1;
+            sSourceBounds.minx = dfSourceXOff + EPSILON;
+            sSourceBounds.miny = dfSourceYOff + EPSILON;
+            sSourceBounds.maxx = dfSourceXOff + dfSourceXSize - EPSILON;
+            sSourceBounds.maxy = dfSourceYOff + dfSourceYSize - EPSILON;
+            iLastSource = iSource;
+
+            if (hQuadTree)
+            {
+                // Check that the new source doesn't overlap an existing one.
+                if (CPLQuadTreeHasMatch(hQuadTree, &sSourceBounds))
+                {
+                    bRet = false;
+                    break;
+                }
+
+                CPLQuadTreeInsertWithBounds(
+                    hQuadTree,
+                    reinterpret_cast<void *>(static_cast<uintptr_t>(iSource)),
+                    &sSourceBounds);
+            }
+
+            ++nContributingSources;
+        }
+    }
+
+    if (hQuadTree)
+        CPLQuadTreeDestroy(hQuadTree);
+
+    return bRet;
+}
+
 /************************************************************************/
 /*                             IRasterIO()                              */
 /************************************************************************/
@@ -320,7 +404,9 @@ CPLErr VRTSourcedRasterBand::IRasterIO(
         // Do nothing
     }
     else if (nPixelSpace == GDALGetDataTypeSizeBytes(eBufType) &&
-             (!m_bNoDataValueSet || m_dfNoDataValue == 0.0))
+             !(m_bNoDataValueSet && m_dfNoDataValue != 0.0) &&
+             !(m_bNoDataSetAsInt64 && m_nNoDataValueInt64 != 0) &&
+             !(m_bNoDataSetAsUInt64 && m_nNoDataValueUInt64 != 0))
     {
         if (nLineSpace == nBufXSize * nPixelSpace)
         {
@@ -336,6 +422,26 @@ CPLErr VRTSourcedRasterBand::IRasterIO(
             }
         }
     }
+    else if (m_bNoDataSetAsInt64)
+    {
+        for (int iLine = 0; iLine < nBufYSize; iLine++)
+        {
+            GDALCopyWords(&m_nNoDataValueInt64, GDT_Int64, 0,
+                          static_cast<GByte *>(pData) +
+                              static_cast<GIntBig>(nLineSpace) * iLine,
+                          eBufType, static_cast<int>(nPixelSpace), nBufXSize);
+        }
+    }
+    else if (m_bNoDataSetAsUInt64)
+    {
+        for (int iLine = 0; iLine < nBufYSize; iLine++)
+        {
+            GDALCopyWords(&m_nNoDataValueUInt64, GDT_UInt64, 0,
+                          static_cast<GByte *>(pData) +
+                              static_cast<GIntBig>(nLineSpace) * iLine,
+                          eBufType, static_cast<int>(nPixelSpace), nBufXSize);
+        }
+    }
     else
     {
         double dfWriteValue = 0.0;
@@ -351,76 +457,275 @@ CPLErr VRTSourcedRasterBand::IRasterIO(
         }
     }
 
-    GDALProgressFunc const pfnProgressGlobal = psExtraArg->pfnProgress;
-    void *const pProgressDataGlobal = psExtraArg->pProgressData;
-
     /* -------------------------------------------------------------------- */
     /*      Overlay each source in turn over top this.                      */
     /* -------------------------------------------------------------------- */
     CPLErr eErr = CE_None;
-    VRTSource::WorkingState oWorkingState;
-    for (int iSource = 0; eErr == CE_None && iSource < nSources; iSource++)
+
+    double dfXOff = nXOff;
+    double dfYOff = nYOff;
+    double dfXSize = nXSize;
+    double dfYSize = nYSize;
+    if (psExtraArg->bFloatingPointWindowValidity)
+    {
+        dfXOff = psExtraArg->dfXOff;
+        dfYOff = psExtraArg->dfYOff;
+        dfXSize = psExtraArg->dfXSize;
+        dfYSize = psExtraArg->dfYSize;
+    }
+
+    if (l_poDS)
+        l_poDS->m_bMultiThreadedRasterIOLastUsed = false;
+
+    int nContributingSources = 0;
+    int nMaxThreads = 0;
+    constexpr int MINIMUM_PIXEL_COUNT_FOR_THREADED_IO = 1000 * 1000;
+    if (l_poDS &&
+        (static_cast<int64_t>(nBufXSize) * nBufYSize >=
+             MINIMUM_PIXEL_COUNT_FOR_THREADED_IO ||
+         static_cast<int64_t>(nXSize) * nYSize >=
+             MINIMUM_PIXEL_COUNT_FOR_THREADED_IO) &&
+        CanMultiThreadRasterIO(dfXOff, dfYOff, dfXSize, dfYSize,
+                               nContributingSources) &&
+        nContributingSources > 1 &&
+        (nMaxThreads = VRTDataset::GetNumThreads(l_poDS)) > 1)
+    {
+        l_poDS->m_bMultiThreadedRasterIOLastUsed = true;
+        l_poDS->m_oMapSharedSources.InitMutex();
+
+        std::atomic<bool> bSuccess = true;
+        CPLWorkerThreadPool *psThreadPool = GDALGetGlobalThreadPool(
+            std::min(nContributingSources, nMaxThreads));
+        const int nThreads =
+            std::min(nContributingSources, psThreadPool->GetThreadCount());
+        CPLDebugOnly("VRT",
+                     "IRasterIO(): use optimized "
+                     "multi-threaded code path for mosaic. "
+                     "Using %d threads",
+                     nThreads);
+
+        {
+            std::lock_guard oLock(l_poDS->m_oQueueWorkingStates.oMutex);
+            if (l_poDS->m_oQueueWorkingStates.oStates.size() <
+                static_cast<size_t>(nThreads))
+            {
+                l_poDS->m_oQueueWorkingStates.oStates.resize(nThreads);
+            }
+            for (int i = 0; i < nThreads; ++i)
+            {
+                if (!l_poDS->m_oQueueWorkingStates.oStates[i])
+                    l_poDS->m_oQueueWorkingStates.oStates[i] =
+                        std::make_unique<VRTSource::WorkingState>();
+            }
+        }
+
+        auto oQueue = psThreadPool->CreateJobQueue();
+        std::atomic<int> nCompletedJobs = 0;
+        for (int iSource = 0; iSource < nSources; iSource++)
+        {
+            auto poSource = papoSources[iSource];
+            if (!poSource->IsSimpleSource())
+                continue;
+            auto poSimpleSource = cpl::down_cast<VRTSimpleSource *>(poSource);
+            if (poSimpleSource->DstWindowIntersects(dfXOff, dfYOff, dfXSize,
+                                                    dfYSize))
+            {
+                auto psJob = new RasterIOJob();
+                psJob->pbSuccess = &bSuccess;
+                psJob->pnCompletedJobs = &nCompletedJobs;
+                psJob->poQueueWorkingStates = &(l_poDS->m_oQueueWorkingStates);
+                psJob->eVRTBandDataType = eDataType;
+                psJob->nXOff = nXOff;
+                psJob->nYOff = nYOff;
+                psJob->nXSize = nXSize;
+                psJob->nYSize = nYSize;
+                psJob->pData = pData;
+                psJob->nBufXSize = nBufXSize;
+                psJob->nBufYSize = nBufYSize;
+                psJob->eBufType = eBufType;
+                psJob->nPixelSpace = nPixelSpace;
+                psJob->nLineSpace = nLineSpace;
+                psJob->psExtraArg = psExtraArg;
+                psJob->poSource = poSimpleSource;
+
+                if (!oQueue->SubmitJob(RasterIOJob::Func, psJob))
+                {
+                    delete psJob;
+                    bSuccess = false;
+                    break;
+                }
+            }
+        }
+
+        while (oQueue->WaitEvent())
+        {
+            // Quite rough progress callback. We could do better by counting
+            // the number of contributing pixels.
+            if (psExtraArg->pfnProgress)
+            {
+                psExtraArg->pfnProgress(double(nCompletedJobs.load()) /
+                                            nContributingSources,
+                                        "", psExtraArg->pProgressData);
+            }
+        }
+
+        eErr = bSuccess ? CE_None : CE_Failure;
+    }
+    else
     {
-        psExtraArg->pfnProgress = GDALScaledProgress;
-        psExtraArg->pProgressData = GDALCreateScaledProgress(
-            1.0 * iSource / nSources, 1.0 * (iSource + 1) / nSources,
-            pfnProgressGlobal, pProgressDataGlobal);
-        if (psExtraArg->pProgressData == nullptr)
-            psExtraArg->pfnProgress = nullptr;
+        GDALProgressFunc const pfnProgressGlobal = psExtraArg->pfnProgress;
+        void *const pProgressDataGlobal = psExtraArg->pProgressData;
+
+        VRTSource::WorkingState oWorkingState;
+        for (int iSource = 0; eErr == CE_None && iSource < nSources; iSource++)
+        {
+            psExtraArg->pfnProgress = GDALScaledProgress;
+            psExtraArg->pProgressData = GDALCreateScaledProgress(
+                1.0 * iSource / nSources, 1.0 * (iSource + 1) / nSources,
+                pfnProgressGlobal, pProgressDataGlobal);
+            if (psExtraArg->pProgressData == nullptr)
+                psExtraArg->pfnProgress = nullptr;
+
+            eErr = papoSources[iSource]->RasterIO(
+                eDataType, nXOff, nYOff, nXSize, nYSize, pData, nBufXSize,
+                nBufYSize, eBufType, nPixelSpace, nLineSpace, psExtraArg,
+                l_poDS ? l_poDS->m_oWorkingState : oWorkingState);
 
-        eErr = papoSources[iSource]->RasterIO(
-            eDataType, nXOff, nYOff, nXSize, nYSize, pData, nBufXSize,
-            nBufYSize, eBufType, nPixelSpace, nLineSpace, psExtraArg,
-            l_poDS ? l_poDS->m_oWorkingState : oWorkingState);
+            GDALDestroyScaledProgress(psExtraArg->pProgressData);
+        }
 
-        GDALDestroyScaledProgress(psExtraArg->pProgressData);
+        psExtraArg->pfnProgress = pfnProgressGlobal;
+        psExtraArg->pProgressData = pProgressDataGlobal;
     }
 
-    psExtraArg->pfnProgress = pfnProgressGlobal;
-    psExtraArg->pProgressData = pProgressDataGlobal;
+    if (eErr == CE_None && psExtraArg->pfnProgress)
+    {
+        psExtraArg->pfnProgress(1.0, "", psExtraArg->pProgressData);
+    }
 
     return eErr;
 }
 
 /************************************************************************/
-/*                         IGetDataCoverageStatus()                     */
+/*                 VRTSourcedRasterBand::RasterIOJob::Func()            */
 /************************************************************************/
 
-#ifndef HAVE_GEOS
-int VRTSourcedRasterBand::IGetDataCoverageStatus(
-    int /* nXOff */, int /* nYOff */, int /* nXSize */, int /* nYSize */,
-    int /* nMaskFlagStop */, double *pdfDataPct)
+void VRTSourcedRasterBand::RasterIOJob::Func(void *pData)
 {
-    // TODO(rouault): Should this set pdfDataPct?
-    if (pdfDataPct != nullptr)
-        *pdfDataPct = -1.0;
-    return GDAL_DATA_COVERAGE_STATUS_UNIMPLEMENTED |
-           GDAL_DATA_COVERAGE_STATUS_DATA;
+    auto psJob =
+        std::unique_ptr<RasterIOJob>(static_cast<RasterIOJob *>(pData));
+    if (*psJob->pbSuccess)
+    {
+        GDALRasterIOExtraArg sArg = *(psJob->psExtraArg);
+        sArg.pfnProgress = nullptr;
+        sArg.pProgressData = nullptr;
+
+        std::unique_ptr<VRTSource::WorkingState> poWorkingState;
+        {
+            std::lock_guard oLock(psJob->poQueueWorkingStates->oMutex);
+            poWorkingState =
+                std::move(psJob->poQueueWorkingStates->oStates.back());
+            psJob->poQueueWorkingStates->oStates.pop_back();
+            CPLAssert(poWorkingState.get());
+        }
+
+        if (psJob->poSource->RasterIO(
+                psJob->eVRTBandDataType, psJob->nXOff, psJob->nYOff,
+                psJob->nXSize, psJob->nYSize, psJob->pData, psJob->nBufXSize,
+                psJob->nBufYSize, psJob->eBufType, psJob->nPixelSpace,
+                psJob->nLineSpace, &sArg, *(poWorkingState.get())) != CE_None)
+        {
+            *psJob->pbSuccess = false;
+        }
+
+        {
+            std::lock_guard oLock(psJob->poQueueWorkingStates->oMutex);
+            psJob->poQueueWorkingStates->oStates.push_back(
+                std::move(poWorkingState));
+        }
+    }
+
+    ++(*psJob->pnCompletedJobs);
 }
-#else
+
+/************************************************************************/
+/*                         IGetDataCoverageStatus()                     */
+/************************************************************************/
+
 int VRTSourcedRasterBand::IGetDataCoverageStatus(int nXOff, int nYOff,
                                                  int nXSize, int nYSize,
                                                  int nMaskFlagStop,
                                                  double *pdfDataPct)
 {
-    if (pdfDataPct != nullptr)
+    if (pdfDataPct)
         *pdfDataPct = -1.0;
+
+    // Particular case for a single simple source covering the whole dataset
+    if (nSources == 1 && papoSources[0]->IsSimpleSource() &&
+        papoSources[0]->GetType() == VRTSimpleSource::GetTypeStatic())
+    {
+        VRTSimpleSource *poSource =
+            static_cast<VRTSimpleSource *>(papoSources[0]);
+
+        GDALRasterBand *poBand = poSource->GetRasterBand();
+        if (!poBand)
+            poBand = poSource->GetMaskBandMainBand();
+        if (!poBand)
+        {
+            return GDAL_DATA_COVERAGE_STATUS_UNIMPLEMENTED |
+                   GDAL_DATA_COVERAGE_STATUS_DATA;
+        }
+
+        /* Check that it uses the full source dataset */
+        double dfReqXOff = 0.0;
+        double dfReqYOff = 0.0;
+        double dfReqXSize = 0.0;
+        double dfReqYSize = 0.0;
+        int nReqXOff = 0;
+        int nReqYOff = 0;
+        int nReqXSize = 0;
+        int nReqYSize = 0;
+        int nOutXOff = 0;
+        int nOutYOff = 0;
+        int nOutXSize = 0;
+        int nOutYSize = 0;
+        bool bError = false;
+        if (poSource->GetSrcDstWindow(
+                0, 0, GetXSize(), GetYSize(), GetXSize(), GetYSize(),
+                &dfReqXOff, &dfReqYOff, &dfReqXSize, &dfReqYSize, &nReqXOff,
+                &nReqYOff, &nReqXSize, &nReqYSize, &nOutXOff, &nOutYOff,
+                &nOutXSize, &nOutYSize, bError) &&
+            nReqXOff == 0 && nReqYOff == 0 && nReqXSize == GetXSize() &&
+            nReqXSize == poBand->GetXSize() && nReqYSize == GetYSize() &&
+            nReqYSize == poBand->GetYSize() && nOutXOff == 0 && nOutYOff == 0 &&
+            nOutXSize == GetXSize() && nOutYSize == GetYSize())
+        {
+            return poBand->GetDataCoverageStatus(nXOff, nYOff, nXSize, nYSize,
+                                                 nMaskFlagStop, pdfDataPct);
+        }
+    }
+
+#ifndef HAVE_GEOS
+    return GDAL_DATA_COVERAGE_STATUS_UNIMPLEMENTED |
+           GDAL_DATA_COVERAGE_STATUS_DATA;
+#else
     int nStatus = 0;
 
-    OGRPolygon *poPolyNonCoveredBySources = new OGRPolygon();
-    OGRLinearRing *poLR = new OGRLinearRing();
-    poLR->addPoint(nXOff, nYOff);
-    poLR->addPoint(nXOff, nYOff + nYSize);
-    poLR->addPoint(nXOff + nXSize, nYOff + nYSize);
-    poLR->addPoint(nXOff + nXSize, nYOff);
-    poLR->addPoint(nXOff, nYOff);
-    poPolyNonCoveredBySources->addRingDirectly(poLR);
+    auto poPolyNonCoveredBySources = std::make_unique<OGRPolygon>();
+    {
+        auto poLR = std::make_unique<OGRLinearRing>();
+        poLR->addPoint(nXOff, nYOff);
+        poLR->addPoint(nXOff, nYOff + nYSize);
+        poLR->addPoint(nXOff + nXSize, nYOff + nYSize);
+        poLR->addPoint(nXOff + nXSize, nYOff);
+        poLR->addPoint(nXOff, nYOff);
+        poPolyNonCoveredBySources->addRingDirectly(poLR.release());
+    }
 
     for (int iSource = 0; iSource < nSources; iSource++)
     {
         if (!papoSources[iSource]->IsSimpleSource())
         {
-            delete poPolyNonCoveredBySources;
             return GDAL_DATA_COVERAGE_STATUS_UNIMPLEMENTED |
                    GDAL_DATA_COVERAGE_STATUS_DATA;
         }
@@ -445,7 +750,6 @@ int VRTSourcedRasterBand::IGetDataCoverageStatus(int nXOff, int nYOff,
         {
             if (pdfDataPct)
                 *pdfDataPct = 100.0;
-            delete poPolyNonCoveredBySources;
             return GDAL_DATA_COVERAGE_STATUS_DATA;
         }
         // Check intersection of bounding boxes.
@@ -453,58 +757,51 @@ int VRTSourcedRasterBand::IGetDataCoverageStatus(int nXOff, int nYOff,
             dfDstXOff < nXOff + nXSize && dfDstYOff < nYOff + nYSize)
         {
             nStatus |= GDAL_DATA_COVERAGE_STATUS_DATA;
-            if (poPolyNonCoveredBySources != nullptr)
+            if (poPolyNonCoveredBySources)
             {
                 OGRPolygon oPolySource;
-                poLR = new OGRLinearRing();
+                auto poLR = std::make_unique<OGRLinearRing>();
                 poLR->addPoint(dfDstXOff, dfDstYOff);
                 poLR->addPoint(dfDstXOff, dfDstYOff + dfDstYSize);
                 poLR->addPoint(dfDstXOff + dfDstXSize, dfDstYOff + dfDstYSize);
                 poLR->addPoint(dfDstXOff + dfDstXSize, dfDstYOff);
                 poLR->addPoint(dfDstXOff, dfDstYOff);
-                oPolySource.addRingDirectly(poLR);
-                OGRGeometry *poRes =
-                    poPolyNonCoveredBySources->Difference(&oPolySource);
-                if (poRes != nullptr && poRes->IsEmpty())
+                oPolySource.addRingDirectly(poLR.release());
+                auto poRes = std::unique_ptr<OGRGeometry>(
+                    poPolyNonCoveredBySources->Difference(&oPolySource));
+                if (poRes && poRes->IsEmpty())
                 {
-                    delete poRes;
                     if (pdfDataPct)
                         *pdfDataPct = 100.0;
-                    delete poPolyNonCoveredBySources;
                     return GDAL_DATA_COVERAGE_STATUS_DATA;
                 }
-                else if (poRes != nullptr &&
-                         poRes->getGeometryType() == wkbPolygon)
+                else if (poRes && poRes->getGeometryType() == wkbPolygon)
                 {
-                    delete poPolyNonCoveredBySources;
-                    poPolyNonCoveredBySources = poRes->toPolygon();
+                    poPolyNonCoveredBySources.reset(
+                        poRes.release()->toPolygon());
                 }
                 else
                 {
-                    delete poRes;
-                    delete poPolyNonCoveredBySources;
-                    poPolyNonCoveredBySources = nullptr;
+                    poPolyNonCoveredBySources.reset();
                 }
             }
         }
         if (nMaskFlagStop != 0 && (nStatus & nMaskFlagStop) != 0)
         {
-            delete poPolyNonCoveredBySources;
             return nStatus;
         }
     }
-    if (poPolyNonCoveredBySources != nullptr)
+    if (poPolyNonCoveredBySources)
     {
         if (!poPolyNonCoveredBySources->IsEmpty())
             nStatus |= GDAL_DATA_COVERAGE_STATUS_EMPTY;
-        if (pdfDataPct != nullptr)
+        if (pdfDataPct)
             *pdfDataPct = 100.0 * (1.0 - poPolyNonCoveredBySources->get_Area() /
                                              nXSize / nYSize);
     }
-    delete poPolyNonCoveredBySources;
     return nStatus;
-}
 #endif  // HAVE_GEOS
+}
 
 /************************************************************************/
 /*                             IReadBlock()                             */
@@ -816,11 +1113,16 @@ bool VRTSourcedRasterBand::
         }
 
         auto poSimpleSource = cpl::down_cast<VRTSimpleSource *>(papoSources[i]);
-        auto poComplexSource = dynamic_cast<VRTComplexSource *>(papoSources[i]);
-        if (poComplexSource)
+        const char *pszType = poSimpleSource->GetType();
+        if (pszType == VRTSimpleSource::GetTypeStatic())
         {
-            if (!EQUAL(poComplexSource->GetType(), "ComplexSource") ||
-                !poComplexSource->AreValuesUnchanged())
+            // ok
+        }
+        else if (pszType == VRTComplexSource::GetTypeStatic())
+        {
+            auto poComplexSource =
+                cpl::down_cast<VRTComplexSource *>(papoSources[i]);
+            if (!poComplexSource->AreValuesUnchanged())
             {
                 bRet = false;
                 break;
@@ -828,11 +1130,8 @@ bool VRTSourcedRasterBand::
         }
         else
         {
-            if (!EQUAL(poSimpleSource->GetType(), "SimpleSource"))
-            {
-                bRet = false;
-                break;
-            }
+            bRet = false;
+            break;
         }
 
         if (!bAllowMaxValAdjustment && poSimpleSource->NeedMaxValAdjustment())
@@ -885,10 +1184,7 @@ bool VRTSourcedRasterBand::
         sBounds.maxy = nOutYOff + nOutYSize - EPSILON;
 
         // Check that the new source doesn't overlap an existing one.
-        int nFeatureCount = 0;
-        void **pahRet = CPLQuadTreeSearch(hQuadTree, &sBounds, &nFeatureCount);
-        CPLFree(pahRet);
-        if (nFeatureCount != 0)
+        if (CPLQuadTreeHasMatch(hQuadTree, &sBounds))
         {
             bRet = false;
             break;
@@ -1450,63 +1746,60 @@ CPLErr VRTSourcedRasterBand::ComputeStatistics(int bApproxOK, double *pdfMin,
         };
 
         CPLWorkerThreadPool *poThreadPool = nullptr;
-        const char *pszValue = CPLGetConfigOption("GDAL_NUM_THREADS", nullptr);
-        if (pszValue)
-        {
-            int nThreads =
-                EQUAL(pszValue, "ALL_CPUS") ? CPLGetNumCPUs() : atoi(pszValue);
-            if (nThreads > 1024)
-                nThreads = 1024;  // to please Coverity
-            if (nThreads > 1)
+        int nThreads =
+            nSources > 1
+                ? VRTDataset::GetNumThreads(dynamic_cast<VRTDataset *>(poDS))
+                : 0;
+        if (nThreads > 1024)
+            nThreads = 1024;  // to please Coverity
+        if (nThreads > 1)
+        {
+            // Check that all sources refer to different datasets
+            // before allowing multithreaded access
+            // If the datasets belong to the MEM driver, check GDALDataset*
+            // pointer values. Otherwise use dataset name.
+            std::set<std::string> oSetDatasetNames;
+            std::set<GDALDataset *> oSetDatasetPointers;
+            for (int i = 0; i < nSources; ++i)
             {
-                // Check that all sources refer to different datasets
-                // before allowing multithreaded access
-                // If the datasets belong to the MEM driver, check GDALDataset*
-                // pointer values. Otherwise use dataset name.
-                std::set<std::string> oSetDatasetNames;
-                std::set<GDALDataset *> oSetDatasetPointers;
-                for (int i = 0; i < nSources; ++i)
+                auto poSimpleSource =
+                    cpl::down_cast<VRTSimpleSource *>(papoSources[i]);
+                assert(poSimpleSource);
+                auto poSimpleSourceBand = poSimpleSource->GetRasterBand();
+                assert(poSimpleSourceBand);
+                auto poSourceDataset = poSimpleSourceBand->GetDataset();
+                if (poSourceDataset == nullptr)
+                {
+                    nThreads = 0;
+                    break;
+                }
+                auto poDriver = poSourceDataset->GetDriver();
+                if (poDriver && EQUAL(poDriver->GetDescription(), "MEM"))
                 {
-                    auto poSimpleSource =
-                        cpl::down_cast<VRTSimpleSource *>(papoSources[i]);
-                    assert(poSimpleSource);
-                    auto poSimpleSourceBand = poSimpleSource->GetRasterBand();
-                    assert(poSimpleSourceBand);
-                    auto poSourceDataset = poSimpleSourceBand->GetDataset();
-                    if (poSourceDataset == nullptr)
+                    if (oSetDatasetPointers.find(poSourceDataset) !=
+                        oSetDatasetPointers.end())
                     {
                         nThreads = 0;
                         break;
                     }
-                    auto poDriver = poSourceDataset->GetDriver();
-                    if (poDriver && EQUAL(poDriver->GetDescription(), "MEM"))
-                    {
-                        if (oSetDatasetPointers.find(poSourceDataset) !=
-                            oSetDatasetPointers.end())
-                        {
-                            nThreads = 0;
-                            break;
-                        }
-                        oSetDatasetPointers.insert(poSourceDataset);
-                    }
-                    else
-                    {
-                        if (oSetDatasetNames.find(
-                                poSourceDataset->GetDescription()) !=
-                            oSetDatasetNames.end())
-                        {
-                            nThreads = 0;
-                            break;
-                        }
-                        oSetDatasetNames.insert(
-                            poSourceDataset->GetDescription());
-                    }
+                    oSetDatasetPointers.insert(poSourceDataset);
                 }
-                if (nThreads > 1)
+                else
                 {
-                    poThreadPool = GDALGetGlobalThreadPool(nThreads);
+                    if (oSetDatasetNames.find(
+                            poSourceDataset->GetDescription()) !=
+                        oSetDatasetNames.end())
+                    {
+                        nThreads = 0;
+                        break;
+                    }
+                    oSetDatasetNames.insert(poSourceDataset->GetDescription());
                 }
             }
+            if (nThreads > 1)
+            {
+                poThreadPool = GDALGetGlobalThreadPool(nThreads);
+            }
         }
 
         // Compute total number of pixels of sources
@@ -1767,7 +2060,9 @@ CPLErr VRTSourcedRasterBand::AddSource(VRTSource *poNewSource)
         CPLRealloc(papoSources, sizeof(void *) * nSources));
     papoSources[nSources - 1] = poNewSource;
 
-    static_cast<VRTDataset *>(poDS)->SetNeedsFlush();
+    auto l_poDS = static_cast<VRTDataset *>(poDS);
+    l_poDS->SetNeedsFlush();
+    l_poDS->SourceAdded();
 
     if (poNewSource->IsSimpleSource())
     {
@@ -1810,9 +2105,9 @@ CPLErr CPL_STDCALL VRTAddSource(VRTSourcedRasterBandH hVRTBand,
 /*                              XMLInit()                               */
 /************************************************************************/
 
-CPLErr VRTSourcedRasterBand::XMLInit(
-    const CPLXMLNode *psTree, const char *pszVRTPath,
-    std::map<CPLString, GDALDataset *> &oMapSharedSources)
+CPLErr VRTSourcedRasterBand::XMLInit(const CPLXMLNode *psTree,
+                                     const char *pszVRTPath,
+                                     VRTMapSharedResources &oMapSharedSources)
 
 {
     {
@@ -1936,7 +2231,7 @@ bool VRTSourcedRasterBand::SkipBufferInitialization()
         return false;
     }
     VRTSimpleSource *poSS = static_cast<VRTSimpleSource *>(papoSources[0]);
-    if (strcmp(poSS->GetType(), "SimpleSource") == 0)
+    if (poSS->GetType() == VRTSimpleSource::GetTypeStatic())
     {
         auto l_poBand = poSS->GetRasterBand();
         if (l_poBand != nullptr && poSS->m_dfSrcXOff >= 0.0 &&
diff --git a/frmts/vrt/vrtsources.cpp b/frmts/vrt/vrtsources.cpp
index ecb411fdc085..1e3fc80aa469 100644
--- a/frmts/vrt/vrtsources.cpp
+++ b/frmts/vrt/vrtsources.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2001, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_vrt.h"
@@ -114,15 +98,34 @@ VRTSimpleSource::VRTSimpleSource(const VRTSimpleSource *poSrcSource,
       m_dfSrcYOff(poSrcSource->m_dfSrcYOff),
       m_dfSrcXSize(poSrcSource->m_dfSrcXSize),
       m_dfSrcYSize(poSrcSource->m_dfSrcYSize),
-      m_dfDstXOff(poSrcSource->m_dfDstXOff * dfXDstRatio),
-      m_dfDstYOff(poSrcSource->m_dfDstYOff * dfYDstRatio),
-      m_dfDstXSize(poSrcSource->m_dfDstXSize * dfXDstRatio),
-      m_dfDstYSize(poSrcSource->m_dfDstYSize * dfYDstRatio),
       m_nMaxValue(poSrcSource->m_nMaxValue), m_bRelativeToVRTOri(-1),
       m_nExplicitSharedStatus(poSrcSource->m_nExplicitSharedStatus),
       m_osSrcDSName(poSrcSource->m_osSrcDSName),
       m_bDropRefOnSrcBand(poSrcSource->m_bDropRefOnSrcBand)
 {
+    if (!poSrcSource->IsSrcWinSet() && !poSrcSource->IsDstWinSet() &&
+        (dfXDstRatio != 1.0 || dfYDstRatio != 1.0))
+    {
+        auto l_band = GetRasterBand();
+        if (l_band)
+        {
+            m_dfSrcXOff = 0;
+            m_dfSrcYOff = 0;
+            m_dfSrcXSize = l_band->GetXSize();
+            m_dfSrcYSize = l_band->GetYSize();
+            m_dfDstXOff = 0;
+            m_dfDstYOff = 0;
+            m_dfDstXSize = l_band->GetXSize() * dfXDstRatio;
+            m_dfDstYSize = l_band->GetYSize() * dfYDstRatio;
+        }
+    }
+    else if (poSrcSource->IsDstWinSet())
+    {
+        m_dfDstXOff = poSrcSource->m_dfDstXOff * dfXDstRatio;
+        m_dfDstYOff = poSrcSource->m_dfDstYOff * dfYDstRatio;
+        m_dfDstXSize = poSrcSource->m_dfDstXSize * dfXDstRatio;
+        m_dfDstYSize = poSrcSource->m_dfDstYSize * dfYDstRatio;
+    }
 }
 
 /************************************************************************/
@@ -149,6 +152,25 @@ VRTSimpleSource::~VRTSimpleSource()
     }
 }
 
+/************************************************************************/
+/*                           GetTypeStatic()                            */
+/************************************************************************/
+
+const char *VRTSimpleSource::GetTypeStatic()
+{
+    static const char *TYPE = "SimpleSource";
+    return TYPE;
+}
+
+/************************************************************************/
+/*                            GetType()                                 */
+/************************************************************************/
+
+const char *VRTSimpleSource::GetType() const
+{
+    return GetTypeStatic();
+}
+
 /************************************************************************/
 /*                           FlushCache()                               */
 /************************************************************************/
@@ -273,7 +295,7 @@ void VRTSimpleSource::SetDstWindow(double dfNewXOff, double dfNewYOff,
 /************************************************************************/
 
 void VRTSimpleSource::GetDstWindow(double &dfDstXOff, double &dfDstYOff,
-                                   double &dfDstXSize, double &dfDstYSize)
+                                   double &dfDstXSize, double &dfDstYSize) const
 {
     dfDstXOff = m_dfDstXOff;
     dfDstYOff = m_dfDstYOff;
@@ -281,6 +303,18 @@ void VRTSimpleSource::GetDstWindow(double &dfDstXOff, double &dfDstYOff,
     dfDstYSize = m_dfDstYSize;
 }
 
+/************************************************************************/
+/*                        DstWindowIntersects()                         */
+/************************************************************************/
+
+bool VRTSimpleSource::DstWindowIntersects(double dfXOff, double dfYOff,
+                                          double dfXSize, double dfYSize) const
+{
+    return IsDstWinSet() && m_dfDstXOff + m_dfDstXSize > dfXOff &&
+           m_dfDstYOff + m_dfDstYSize > dfYOff &&
+           m_dfDstXOff < dfXOff + dfXSize && m_dfDstYOff < dfYOff + dfYSize;
+}
+
 /************************************************************************/
 /*                           SerializeToXML()                           */
 /************************************************************************/
@@ -297,7 +331,7 @@ CPLXMLNode *VRTSimpleSource::SerializeToXML(const char *pszVRTPath)
 
 {
     CPLXMLNode *const psSrc =
-        CPLCreateXMLNode(nullptr, CXT_Element, "SimpleSource");
+        CPLCreateXMLNode(nullptr, CXT_Element, GetTypeStatic());
 
     if (!m_osResampling.empty())
     {
@@ -470,8 +504,7 @@ CPLXMLNode *VRTSimpleSource::SerializeToXML(const char *pszVRTPath)
                        CPLSPrintf("%d", nBlockYSize));
     }
 
-    if (m_dfSrcXOff != -1 || m_dfSrcYOff != -1 || m_dfSrcXSize != -1 ||
-        m_dfSrcYSize != -1)
+    if (IsSrcWinSet())
     {
         CPLSetXMLValue(psSrc, "SrcRect.#xOff",
                        CPLSPrintf("%.15g", m_dfSrcXOff));
@@ -483,8 +516,7 @@ CPLXMLNode *VRTSimpleSource::SerializeToXML(const char *pszVRTPath)
                        CPLSPrintf("%.15g", m_dfSrcYSize));
     }
 
-    if (m_dfDstXOff != -1 || m_dfDstYOff != -1 || m_dfDstXSize != -1 ||
-        m_dfDstYSize != -1)
+    if (IsDstWinSet())
     {
         CPLSetXMLValue(psSrc, "DstRect.#xOff",
                        CPLSPrintf("%.15g", m_dfDstXOff));
@@ -503,9 +535,8 @@ CPLXMLNode *VRTSimpleSource::SerializeToXML(const char *pszVRTPath)
 /*                              XMLInit()                               */
 /************************************************************************/
 
-CPLErr
-VRTSimpleSource::XMLInit(const CPLXMLNode *psSrc, const char *pszVRTPath,
-                         std::map<CPLString, GDALDataset *> &oMapSharedSources)
+CPLErr VRTSimpleSource::XMLInit(const CPLXMLNode *psSrc, const char *pszVRTPath,
+                                VRTMapSharedResources &oMapSharedSources)
 
 {
     m_poMapSharedSources = &oMapSharedSources;
@@ -581,21 +612,30 @@ VRTSimpleSource::XMLInit(const CPLXMLNode *psSrc, const char *pszVRTPath,
 
 CPLErr VRTSimpleSource::ParseSrcRectAndDstRect(const CPLXMLNode *psSrc)
 {
+    const auto GetAttrValue = [](const CPLXMLNode *psNode,
+                                 const char *pszAttrName, double dfDefaultVal)
+    {
+        if (const char *pszVal = CPLGetXMLValue(psNode, pszAttrName, nullptr))
+            return CPLAtof(pszVal);
+        else
+            return dfDefaultVal;
+    };
+
     /* -------------------------------------------------------------------- */
     /*      Set characteristics.                                            */
     /* -------------------------------------------------------------------- */
     const CPLXMLNode *const psSrcRect = CPLGetXMLNode(psSrc, "SrcRect");
     if (psSrcRect)
     {
-        double xOff = CPLAtof(CPLGetXMLValue(psSrcRect, "xOff", "-1"));
-        double yOff = CPLAtof(CPLGetXMLValue(psSrcRect, "yOff", "-1"));
-        double xSize = CPLAtof(CPLGetXMLValue(psSrcRect, "xSize", "-1"));
-        double ySize = CPLAtof(CPLGetXMLValue(psSrcRect, "ySize", "-1"));
+        double xOff = GetAttrValue(psSrcRect, "xOff", UNINIT_WINDOW);
+        double yOff = GetAttrValue(psSrcRect, "yOff", UNINIT_WINDOW);
+        double xSize = GetAttrValue(psSrcRect, "xSize", UNINIT_WINDOW);
+        double ySize = GetAttrValue(psSrcRect, "ySize", UNINIT_WINDOW);
         // Test written that way to catch NaN values
         if (!(xOff >= INT_MIN && xOff <= INT_MAX) ||
             !(yOff >= INT_MIN && yOff <= INT_MAX) ||
-            !(xSize > 0 || xSize == -1) || xSize > INT_MAX ||
-            !(ySize > 0 || ySize == -1) || ySize > INT_MAX)
+            !(xSize > 0 || xSize == UNINIT_WINDOW) || xSize > INT_MAX ||
+            !(ySize > 0 || ySize == UNINIT_WINDOW) || ySize > INT_MAX)
         {
             CPLError(CE_Failure, CPLE_AppDefined, "Wrong values in SrcRect");
             return CE_Failure;
@@ -604,24 +644,26 @@ CPLErr VRTSimpleSource::ParseSrcRectAndDstRect(const CPLXMLNode *psSrc)
     }
     else
     {
-        m_dfSrcXOff = -1;
-        m_dfSrcYOff = -1;
-        m_dfSrcXSize = -1;
-        m_dfSrcYSize = -1;
+        m_dfSrcXOff = UNINIT_WINDOW;
+        m_dfSrcYOff = UNINIT_WINDOW;
+        m_dfSrcXSize = UNINIT_WINDOW;
+        m_dfSrcYSize = UNINIT_WINDOW;
     }
 
     const CPLXMLNode *const psDstRect = CPLGetXMLNode(psSrc, "DstRect");
     if (psDstRect)
     {
-        double xOff = CPLAtof(CPLGetXMLValue(psDstRect, "xOff", "-1"));
-        double yOff = CPLAtof(CPLGetXMLValue(psDstRect, "yOff", "-1"));
-        double xSize = CPLAtof(CPLGetXMLValue(psDstRect, "xSize", "-1"));
-        double ySize = CPLAtof(CPLGetXMLValue(psDstRect, "ySize", "-1"));
+        double xOff = GetAttrValue(psDstRect, "xOff", UNINIT_WINDOW);
+        ;
+        double yOff = GetAttrValue(psDstRect, "yOff", UNINIT_WINDOW);
+        double xSize = GetAttrValue(psDstRect, "xSize", UNINIT_WINDOW);
+        ;
+        double ySize = GetAttrValue(psDstRect, "ySize", UNINIT_WINDOW);
         // Test written that way to catch NaN values
         if (!(xOff >= INT_MIN && xOff <= INT_MAX) ||
             !(yOff >= INT_MIN && yOff <= INT_MAX) ||
-            !(xSize > 0 || xSize == -1) || xSize > INT_MAX ||
-            !(ySize > 0 || ySize == -1) || ySize > INT_MAX)
+            !(xSize > 0 || xSize == UNINIT_WINDOW) || xSize > INT_MAX ||
+            !(ySize > 0 || ySize == UNINIT_WINDOW) || ySize > INT_MAX)
         {
             CPLError(CE_Failure, CPLE_AppDefined, "Wrong values in DstRect");
             return CE_Failure;
@@ -630,10 +672,10 @@ CPLErr VRTSimpleSource::ParseSrcRectAndDstRect(const CPLXMLNode *psSrc)
     }
     else
     {
-        m_dfDstXOff = -1;
-        m_dfDstYOff = -1;
-        m_dfDstXSize = -1;
-        m_dfDstYSize = -1;
+        m_dfDstXOff = UNINIT_WINDOW;
+        m_dfDstYOff = UNINIT_WINDOW;
+        m_dfDstXSize = UNINIT_WINDOW;
+        m_dfDstYSize = UNINIT_WINDOW;
     }
 
     return CE_None;
@@ -705,9 +747,8 @@ void VRTSimpleSource::OpenSource() const
             osKeyMapSharedSources += m_aosOpenOptions[i];
         }
 
-        auto oIter = m_poMapSharedSources->find(osKeyMapSharedSources);
-        if (oIter != m_poMapSharedSources->end())
-            proxyDS = cpl::down_cast<GDALProxyPoolDataset *>(oIter->second);
+        proxyDS = cpl::down_cast<GDALProxyPoolDataset *>(
+            m_poMapSharedSources->Get(osKeyMapSharedSources));
     }
 
     if (proxyDS == nullptr)
@@ -760,7 +801,7 @@ void VRTSimpleSource::OpenSource() const
 
     if (m_poMapSharedSources)
     {
-        (*m_poMapSharedSources)[osKeyMapSharedSources] = proxyDS;
+        m_poMapSharedSources->Insert(osKeyMapSharedSources, proxyDS);
     }
 }
 
@@ -790,7 +831,8 @@ GDALRasterBand *VRTSimpleSource::GetMaskBandMainBand()
 /*                       IsSameExceptBandNumber()                       */
 /************************************************************************/
 
-int VRTSimpleSource::IsSameExceptBandNumber(VRTSimpleSource *poOtherSource)
+bool VRTSimpleSource::IsSameExceptBandNumber(
+    const VRTSimpleSource *poOtherSource) const
 {
     return m_dfSrcXOff == poOtherSource->m_dfSrcXOff &&
            m_dfSrcYOff == poOtherSource->m_dfSrcYOff &&
@@ -807,7 +849,7 @@ int VRTSimpleSource::IsSameExceptBandNumber(VRTSimpleSource *poOtherSource)
 /************************************************************************/
 /*                              SrcToDst()                              */
 /*                                                                      */
-/*      Note: this is a no-op if the dst window is -1,-1,-1,-1.         */
+/*      Note: this is a no-op if the both src and dst windows are unset */
 /************************************************************************/
 
 void VRTSimpleSource::SrcToDst(double dfX, double dfY, double &dfXOut,
@@ -821,7 +863,7 @@ void VRTSimpleSource::SrcToDst(double dfX, double dfY, double &dfXOut,
 /************************************************************************/
 /*                              DstToSrc()                              */
 /*                                                                      */
-/*      Note: this is a no-op if the dst window is -1,-1,-1,-1.         */
+/*      Note: this is a no-op if the both src and dst windows are unset */
 /************************************************************************/
 
 void VRTSimpleSource::DstToSrc(double dfX, double dfY, double &dfXOut,
@@ -852,12 +894,10 @@ int VRTSimpleSource::GetSrcDstWindow(
         return FALSE;
     }
 
-    const bool bDstWinSet = m_dfDstXOff != -1 || m_dfDstXSize != -1 ||
-                            m_dfDstYOff != -1 || m_dfDstYSize != -1;
+    const bool bDstWinSet = IsDstWinSet();
 
 #ifdef DEBUG
-    const bool bSrcWinSet = m_dfSrcXOff != -1 || m_dfSrcXSize != -1 ||
-                            m_dfSrcYOff != -1 || m_dfSrcYSize != -1;
+    const bool bSrcWinSet = IsSrcWinSet();
 
     if (bSrcWinSet != bDstWinSet)
     {
@@ -938,8 +978,8 @@ int VRTSimpleSource::GetSrcDstWindow(
     *pdfReqXSize = dfRXSize * dfScaleX;
     *pdfReqYSize = dfRYSize * dfScaleY;
 
-    if (!CPLIsFinite(*pdfReqXOff) || !CPLIsFinite(*pdfReqYOff) ||
-        !CPLIsFinite(*pdfReqXSize) || !CPLIsFinite(*pdfReqYSize) ||
+    if (!std::isfinite(*pdfReqXOff) || !std::isfinite(*pdfReqYOff) ||
+        !std::isfinite(*pdfReqXSize) || !std::isfinite(*pdfReqYSize) ||
         *pdfReqXOff > INT_MAX || *pdfReqYOff > INT_MAX || *pdfReqXSize < 0 ||
         *pdfReqYSize < 0)
     {
@@ -1267,6 +1307,11 @@ CPLErr VRTSimpleSource::RasterIO(GDALDataType eVRTBandDataType, int nXOff,
     psExtraArg->dfYOff = dfReqYOff;
     psExtraArg->dfXSize = dfReqXSize;
     psExtraArg->dfYSize = dfReqYSize;
+    if (psExtraArgIn)
+    {
+        psExtraArg->pfnProgress = psExtraArgIn->pfnProgress;
+        psExtraArg->pProgressData = psExtraArgIn->pProgressData;
+    }
 
     GByte *pabyOut = static_cast<unsigned char *>(pData) +
                      nOutXOff * nPixelSpace +
@@ -1328,6 +1373,9 @@ CPLErr VRTSimpleSource::RasterIO(GDALDataType eVRTBandDataType, int nXOff,
         }
     }
 
+    if (psExtraArg->pfnProgress)
+        psExtraArg->pfnProgress(1.0, "", psExtraArg->pProgressData);
+
     return eErr;
 }
 
@@ -1471,7 +1519,7 @@ CPLErr VRTSimpleSource::DatasetRasterIO(
     GSpacing nLineSpace, GSpacing nBandSpace,
     GDALRasterIOExtraArg *psExtraArgIn)
 {
-    if (!EQUAL(GetType(), "SimpleSource"))
+    if (GetType() != VRTSimpleSource::GetTypeStatic())
     {
         CPLError(CE_Failure, CPLE_NotSupported,
                  "DatasetRasterIO() not implemented for %s", GetType());
@@ -1540,6 +1588,11 @@ CPLErr VRTSimpleSource::DatasetRasterIO(
     psExtraArg->dfYOff = dfReqYOff;
     psExtraArg->dfXSize = dfReqXSize;
     psExtraArg->dfYSize = dfReqYSize;
+    if (psExtraArgIn)
+    {
+        psExtraArg->pfnProgress = psExtraArgIn->pfnProgress;
+        psExtraArg->pProgressData = psExtraArgIn->pProgressData;
+    }
 
     GByte *pabyOut = static_cast<unsigned char *>(pData) +
                      nOutXOff * nPixelSpace +
@@ -1615,6 +1668,9 @@ CPLErr VRTSimpleSource::DatasetRasterIO(
         }
     }
 
+    if (psExtraArg->pfnProgress)
+        psExtraArg->pfnProgress(1.0, "", psExtraArg->pProgressData);
+
     return eErr;
 }
 
@@ -1641,6 +1697,25 @@ VRTAveragedSource::VRTAveragedSource()
 {
 }
 
+/************************************************************************/
+/*                           GetTypeStatic()                            */
+/************************************************************************/
+
+const char *VRTAveragedSource::GetTypeStatic()
+{
+    static const char *TYPE = "AveragedSource";
+    return TYPE;
+}
+
+/************************************************************************/
+/*                            GetType()                                 */
+/************************************************************************/
+
+const char *VRTAveragedSource::GetType() const
+{
+    return GetTypeStatic();
+}
+
 /************************************************************************/
 /*                           SerializeToXML()                           */
 /************************************************************************/
@@ -1654,7 +1729,7 @@ CPLXMLNode *VRTAveragedSource::SerializeToXML(const char *pszVRTPath)
         return nullptr;
 
     CPLFree(psSrc->pszValue);
-    psSrc->pszValue = CPLStrdup("AveragedSource");
+    psSrc->pszValue = CPLStrdup(GetTypeStatic());
 
     return psSrc;
 }
@@ -1763,6 +1838,11 @@ CPLErr VRTAveragedSource::RasterIO(GDALDataType /*eVRTBandDataType*/, int nXOff,
     psExtraArg->dfYOff = dfReqYOff;
     psExtraArg->dfXSize = dfReqXSize;
     psExtraArg->dfYSize = dfReqYSize;
+    if (psExtraArgIn)
+    {
+        psExtraArg->pfnProgress = psExtraArgIn->pfnProgress;
+        psExtraArg->pProgressData = psExtraArgIn->pProgressData;
+    }
 
     const CPLErr eErr = l_band->RasterIO(
         GF_Read, nReqXOff, nReqYOff, nReqXSize, nReqYSize, pafSrc, nReqXSize,
@@ -1842,7 +1922,7 @@ CPLErr VRTAveragedSource::RasterIO(GDALDataType /*eVRTBandDataType*/, int nXOff,
 
                     const float fSampledValue =
                         pafSrc[iX + static_cast<size_t>(iY) * nReqXSize];
-                    if (CPLIsNan(fSampledValue))
+                    if (std::isnan(fSampledValue))
                         continue;
 
                     if (m_bNoDataSet &&
@@ -1878,6 +1958,9 @@ CPLErr VRTAveragedSource::RasterIO(GDALDataType /*eVRTBandDataType*/, int nXOff,
 
     VSIFree(pafSrc);
 
+    if (psExtraArg->pfnProgress)
+        psExtraArg->pfnProgress(1.0, "", psExtraArg->pProgressData);
+
     return CE_None;
 }
 
@@ -1934,9 +2017,10 @@ VRTNoDataFromMaskSource::VRTNoDataFromMaskSource()
 /*                              XMLInit()                               */
 /************************************************************************/
 
-CPLErr VRTNoDataFromMaskSource::XMLInit(
-    const CPLXMLNode *psSrc, const char *pszVRTPath,
-    std::map<CPLString, GDALDataset *> &oMapSharedSources)
+CPLErr
+VRTNoDataFromMaskSource::XMLInit(const CPLXMLNode *psSrc,
+                                 const char *pszVRTPath,
+                                 VRTMapSharedResources &oMapSharedSources)
 
 {
     /* -------------------------------------------------------------------- */
@@ -1968,6 +2052,25 @@ CPLErr VRTNoDataFromMaskSource::XMLInit(
     return CE_None;
 }
 
+/************************************************************************/
+/*                           GetTypeStatic()                            */
+/************************************************************************/
+
+const char *VRTNoDataFromMaskSource::GetTypeStatic()
+{
+    static const char *TYPE = "NoDataFromMaskSource";
+    return TYPE;
+}
+
+/************************************************************************/
+/*                            GetType()                                 */
+/************************************************************************/
+
+const char *VRTNoDataFromMaskSource::GetType() const
+{
+    return GetTypeStatic();
+}
+
 /************************************************************************/
 /*                           SerializeToXML()                           */
 /************************************************************************/
@@ -1981,12 +2084,12 @@ CPLXMLNode *VRTNoDataFromMaskSource::SerializeToXML(const char *pszVRTPath)
         return nullptr;
 
     CPLFree(psSrc->pszValue);
-    psSrc->pszValue = CPLStrdup("NoDataFromMaskSource");
+    psSrc->pszValue = CPLStrdup(GetTypeStatic());
 
     if (m_bNoDataSet)
     {
         CPLSetXMLValue(psSrc, "MaskValueThreshold",
-                       CPLSPrintf("%.18g", m_dfMaskValueThreshold));
+                       CPLSPrintf("%.17g", m_dfMaskValueThreshold));
 
         GDALDataType eBandDT = GDT_Unknown;
         double dfNoDataValue = m_dfNoDataValue;
@@ -2012,7 +2115,7 @@ CPLXMLNode *VRTNoDataFromMaskSource::SerializeToXML(const char *pszVRTPath)
     if (m_bHasRemappedValue)
     {
         CPLSetXMLValue(psSrc, "RemappedValue",
-                       CPLSPrintf("%.18g", m_dfRemappedValue));
+                       CPLSPrintf("%.17g", m_dfRemappedValue));
     }
 
     return psSrc;
@@ -2211,6 +2314,11 @@ CPLErr VRTNoDataFromMaskSource::RasterIO(
     psExtraArg->dfYOff = dfReqYOff;
     psExtraArg->dfXSize = dfReqXSize;
     psExtraArg->dfYSize = dfReqYSize;
+    if (psExtraArgIn)
+    {
+        psExtraArg->pfnProgress = psExtraArgIn->pfnProgress;
+        psExtraArg->pProgressData = psExtraArgIn->pProgressData;
+    }
 
     if (l_band->RasterIO(GF_Read, nReqXOff, nReqYOff, nReqXSize, nReqYSize,
                          pabyWrkBuffer, nOutXSize, nOutYSize, eSrcBandDT, 0, 0,
@@ -2327,6 +2435,9 @@ CPLErr VRTNoDataFromMaskSource::RasterIO(
         }
     }
 
+    if (psExtraArg->pfnProgress)
+        psExtraArg->pfnProgress(1.0, "", psExtraArg->pProgressData);
+
     return CE_None;
 }
 
@@ -2393,6 +2504,25 @@ VRTComplexSource::VRTComplexSource(const VRTComplexSource *poSrcSource,
 {
 }
 
+/************************************************************************/
+/*                           GetTypeStatic()                            */
+/************************************************************************/
+
+const char *VRTComplexSource::GetTypeStatic()
+{
+    static const char *TYPE = "ComplexSource";
+    return TYPE;
+}
+
+/************************************************************************/
+/*                            GetType()                                 */
+/************************************************************************/
+
+const char *VRTComplexSource::GetType() const
+{
+    return GetTypeStatic();
+}
+
 /************************************************************************/
 /*                           SetNoDataValue()                           */
 /************************************************************************/
@@ -2441,7 +2571,7 @@ CPLXMLNode *VRTComplexSource::SerializeToXML(const char *pszVRTPath)
         return nullptr;
 
     CPLFree(psSrc->pszValue);
-    psSrc->pszValue = CPLStrdup("ComplexSource");
+    psSrc->pszValue = CPLStrdup(GetTypeStatic());
 
     if ((m_nProcessingFlags & PROCESSING_FLAG_USE_MASK_BAND) != 0)
     {
@@ -2501,7 +2631,7 @@ CPLXMLNode *VRTComplexSource::SerializeToXML(const char *pszVRTPath)
             CPLString().Printf("%g", m_adfLUTInputs[0]) ==
                 CPLString().Printf("%g", m_adfLUTInputs[1]))
         {
-            osLUT = CPLString().Printf("%.18g:%g", m_adfLUTInputs[0],
+            osLUT = CPLString().Printf("%.17g:%g", m_adfLUTInputs[0],
                                        m_adfLUTOutputs[0]);
         }
         else
@@ -2520,7 +2650,7 @@ CPLXMLNode *VRTComplexSource::SerializeToXML(const char *pszVRTPath)
                 // TODO(schwehr): An explanation of the 18 would be helpful.
                 // Can someone distill the issue down to a quick comment?
                 // https://trac.osgeo.org/gdal/ticket/6422
-                osLUT += CPLString().Printf(",%.18g:%g", m_adfLUTInputs[i],
+                osLUT += CPLString().Printf(",%.17g:%g", m_adfLUTInputs[i],
                                             m_adfLUTOutputs[i]);
             }
             else
@@ -2545,9 +2675,9 @@ CPLXMLNode *VRTComplexSource::SerializeToXML(const char *pszVRTPath)
 /*                              XMLInit()                               */
 /************************************************************************/
 
-CPLErr
-VRTComplexSource::XMLInit(const CPLXMLNode *psSrc, const char *pszVRTPath,
-                          std::map<CPLString, GDALDataset *> &oMapSharedSources)
+CPLErr VRTComplexSource::XMLInit(const CPLXMLNode *psSrc,
+                                 const char *pszVRTPath,
+                                 VRTMapSharedResources &oMapSharedSources)
 
 {
     /* -------------------------------------------------------------------- */
@@ -2633,9 +2763,21 @@ VRTComplexSource::XMLInit(const CPLXMLNode *psSrc, const char *pszVRTPath,
 
             // Enforce the requirement that the LUT input array is
             // monotonically non-decreasing.
-            if (nIndex > 0 &&
-                m_adfLUTInputs[nIndex] < m_adfLUTInputs[nIndex - 1])
+            if (std::isnan(m_adfLUTInputs[nIndex]) && nIndex != 0)
             {
+                CPLError(CE_Failure, CPLE_AppDefined,
+                         "A Not-A-Number (NaN) source value should be the "
+                         "first one of the LUT.");
+                m_adfLUTInputs.clear();
+                m_adfLUTOutputs.clear();
+                return CE_Failure;
+            }
+            else if (nIndex > 0 &&
+                     m_adfLUTInputs[nIndex] < m_adfLUTInputs[nIndex - 1])
+            {
+                CPLError(CE_Failure, CPLE_AppDefined,
+                         "Source values of the LUT are not listed in a "
+                         "monotonically non-decreasing order");
                 m_adfLUTInputs.clear();
                 m_adfLUTOutputs.clear();
                 return CE_Failure;
@@ -2662,20 +2804,29 @@ VRTComplexSource::XMLInit(const CPLXMLNode *psSrc, const char *pszVRTPath,
 
 double VRTComplexSource::LookupValue(double dfInput)
 {
+    auto beginIter = m_adfLUTInputs.begin();
+    auto endIter = m_adfLUTInputs.end();
+    size_t offset = 0;
+    if (std::isnan(m_adfLUTInputs[0]))
+    {
+        if (std::isnan(dfInput) || m_adfLUTInputs.size() == 1)
+            return m_adfLUTOutputs[0];
+        ++beginIter;
+        offset = 1;
+    }
+
     // Find the index of the first element in the LUT input array that
     // is not smaller than the input value.
-    int i = static_cast<int>(
-        std::lower_bound(m_adfLUTInputs.data(),
-                         m_adfLUTInputs.data() + m_adfLUTInputs.size(),
-                         dfInput) -
-        m_adfLUTInputs.data());
+    const size_t i =
+        offset +
+        std::distance(beginIter, std::lower_bound(beginIter, endIter, dfInput));
 
-    if (i == 0)
-        return m_adfLUTOutputs[0];
+    if (i == offset)
+        return m_adfLUTOutputs[offset];
 
     // If the index is beyond the end of the LUT input array, the input
     // value is larger than all the values in the array.
-    if (i == static_cast<int>(m_adfLUTInputs.size()))
+    if (i == m_adfLUTInputs.size())
         return m_adfLUTOutputs.back();
 
     if (m_adfLUTInputs[i] == dfInput)
@@ -2810,14 +2961,19 @@ CPLErr VRTComplexSource::RasterIO(GDALDataType eVRTBandDataType, int nXOff,
     psExtraArg->dfYOff = dfReqYOff;
     psExtraArg->dfXSize = dfReqXSize;
     psExtraArg->dfYSize = dfReqYSize;
+    if (psExtraArgIn)
+    {
+        psExtraArg->pfnProgress = psExtraArgIn->pfnProgress;
+        psExtraArg->pProgressData = psExtraArgIn->pProgressData;
+    }
 
     GByte *const pabyOut = static_cast<GByte *>(pData) +
                            nPixelSpace * nOutXOff +
                            static_cast<GPtrDiff_t>(nLineSpace) * nOutYOff;
+    const auto eSourceType = poSourceBand->GetRasterDataType();
     if (m_nProcessingFlags == PROCESSING_FLAG_NODATA)
     {
         // Optimization if doing only nodata processing
-        const auto eSourceType = poSourceBand->GetRasterDataType();
         if (eSourceType == GDT_Byte)
         {
             if (!GDALIsValueInRange<GByte>(m_dfNoDataValue))
@@ -2871,7 +3027,10 @@ CPLErr VRTComplexSource::RasterIO(GDALDataType eVRTBandDataType, int nXOff,
     // For Int32, float32 isn't sufficiently precise as working data type
     if (eVRTBandDataType == GDT_CInt32 || eVRTBandDataType == GDT_CFloat64 ||
         eVRTBandDataType == GDT_Int32 || eVRTBandDataType == GDT_UInt32 ||
-        eVRTBandDataType == GDT_Float64)
+        eVRTBandDataType == GDT_Int64 || eVRTBandDataType == GDT_UInt64 ||
+        eVRTBandDataType == GDT_Float64 || eSourceType == GDT_Int32 ||
+        eSourceType == GDT_UInt32 || eSourceType == GDT_Int64 ||
+        eSourceType == GDT_UInt64)
     {
         eErr = RasterIOInternal<double>(
             poSourceBand, eVRTBandDataType, nReqXOff, nReqYOff, nReqXSize,
@@ -2888,6 +3047,9 @@ CPLErr VRTComplexSource::RasterIO(GDALDataType eVRTBandDataType, int nXOff,
             oWorkingState);
     }
 
+    if (psExtraArg->pfnProgress)
+        psExtraArg->pfnProgress(1.0, "", psExtraArg->pProgressData);
+
     return eErr;
 }
 
@@ -2902,6 +3064,52 @@ static inline bool hasZeroByte(uint32_t v)
     return (((v)-0x01010101U) & ~(v)&0x80808080U) != 0;
 }
 
+/************************************************************************/
+/*                                CopyWord()                            */
+/************************************************************************/
+
+template <class SrcType>
+static void CopyWord(const SrcType *pSrcVal, GDALDataType eSrcType,
+                     void *pDstVal, GDALDataType eDstType)
+{
+    switch (eDstType)
+    {
+        case GDT_Byte:
+            GDALCopyWord(*pSrcVal, *static_cast<uint8_t *>(pDstVal));
+            break;
+        case GDT_Int8:
+            GDALCopyWord(*pSrcVal, *static_cast<int8_t *>(pDstVal));
+            break;
+        case GDT_UInt16:
+            GDALCopyWord(*pSrcVal, *static_cast<uint16_t *>(pDstVal));
+            break;
+        case GDT_Int16:
+            GDALCopyWord(*pSrcVal, *static_cast<int16_t *>(pDstVal));
+            break;
+        case GDT_UInt32:
+            GDALCopyWord(*pSrcVal, *static_cast<uint32_t *>(pDstVal));
+            break;
+        case GDT_Int32:
+            GDALCopyWord(*pSrcVal, *static_cast<int32_t *>(pDstVal));
+            break;
+        case GDT_UInt64:
+            GDALCopyWord(*pSrcVal, *static_cast<uint64_t *>(pDstVal));
+            break;
+        case GDT_Int64:
+            GDALCopyWord(*pSrcVal, *static_cast<int64_t *>(pDstVal));
+            break;
+        case GDT_Float32:
+            GDALCopyWord(*pSrcVal, *static_cast<float *>(pDstVal));
+            break;
+        case GDT_Float64:
+            GDALCopyWord(*pSrcVal, *static_cast<double *>(pDstVal));
+            break;
+        default:
+            GDALCopyWords(pSrcVal, eSrcType, 0, pDstVal, eDstType, 0, 1);
+            break;
+    }
+}
+
 /************************************************************************/
 /*                       RasterIOProcessNoData()                        */
 /************************************************************************/
@@ -3057,8 +3265,8 @@ CPLErr VRTComplexSource::RasterIOProcessNoData(
             {
                 if (paSrcData[idxBuffer] != nNoDataValue)
                 {
-                    GDALCopyWords(&paSrcData[idxBuffer], eSourceType, 0,
-                                  pDstLocation, eBufType, 0, 1);
+                    CopyWord(&paSrcData[idxBuffer], eSourceType, pDstLocation,
+                             eBufType);
                 }
             }
         }
@@ -3078,8 +3286,8 @@ CPLErr VRTComplexSource::RasterIOProcessNoData(
                 {
                     // Convert first to the VRTRasterBand data type
                     // to get its clamping, before outputting to buffer data type
-                    GDALCopyWords(&paSrcData[idxBuffer], eSourceType, 0,
-                                  abyTemp, eVRTBandDataType, 0, 1);
+                    CopyWord(&paSrcData[idxBuffer], eSourceType, abyTemp,
+                             eVRTBandDataType);
                     GDALCopyWords(abyTemp, eVRTBandDataType, 0, pDstLocation,
                                   eBufType, 0, 1);
                 }
@@ -3120,9 +3328,9 @@ CPLErr VRTComplexSource::RasterIOInternal(
         dfNoDataValue = poSourceBand->GetNoDataValue(&bNoDataSet);
     }
 
-    const bool bNoDataSetIsNan = bNoDataSet && CPLIsNan(dfNoDataValue);
+    const bool bNoDataSetIsNan = bNoDataSet && std::isnan(dfNoDataValue);
     const bool bNoDataSetAndNotNan =
-        bNoDataSet && !CPLIsNan(dfNoDataValue) &&
+        bNoDataSet && !std::isnan(dfNoDataValue) &&
         GDALIsValueInRange<WorkingDT>(dfNoDataValue);
     const auto fWorkingDataTypeNoData = static_cast<WorkingDT>(dfNoDataValue);
 
@@ -3237,6 +3445,12 @@ CPLErr VRTComplexSource::RasterIOInternal(
     /*      Selectively copy into output buffer with nodata masking,        */
     /*      and/or scaling.                                                 */
     /* -------------------------------------------------------------------- */
+
+    const bool bTwoStepDataTypeConversion =
+        CPL_TO_BOOL(
+            GDALDataTypeIsConversionLossy(eWrkDataType, eVRTBandDataType)) &&
+        !CPL_TO_BOOL(GDALDataTypeIsConversionLossy(eVRTBandDataType, eBufType));
+
     size_t idxBuffer = 0;
     for (int iY = 0; iY < nOutYSize; iY++)
     {
@@ -3250,7 +3464,7 @@ CPLErr VRTComplexSource::RasterIOInternal(
             if (pafData && !bIsComplex)
             {
                 WorkingDT fResult = pafData[idxBuffer];
-                if (bNoDataSetIsNan && CPLIsNan(fResult))
+                if (bNoDataSetIsNan && std::isnan(fResult))
                     continue;
                 if (bNoDataSetAndNotNan &&
                     ARE_REAL_EQUAL(fResult, fWorkingDataTypeNoData))
@@ -3373,18 +3587,28 @@ CPLErr VRTComplexSource::RasterIOInternal(
                     255.0f,
                     std::max(0.0f, static_cast<float>(afResult[0]) + 0.5f)));
             }
-            else if (eBufType == eVRTBandDataType)
+            else if (!bTwoStepDataTypeConversion)
+            {
+                CopyWord<WorkingDT>(afResult, eWrkDataType, pDstLocation,
+                                    eBufType);
+            }
+            else if (eVRTBandDataType == GDT_Float32 && eBufType == GDT_Float64)
             {
-                GDALCopyWords(afResult, eWrkDataType, 0, pDstLocation, eBufType,
-                              0, 1);
+                // Particular case of the below 2-step conversion.
+                // Helps a bit for some geolocation based warping with Sentinel3
+                // data where the longitude/latitude arrays are Int32 bands,
+                // rescaled in VRT as Float32 and requested as Float64
+                float fVal;
+                GDALCopyWord(afResult[0], fVal);
+                *reinterpret_cast<double *>(pDstLocation) = fVal;
             }
             else
             {
                 GByte abyTemp[2 * sizeof(double)];
                 // Convert first to the VRTRasterBand data type
                 // to get its clamping, before outputting to buffer data type
-                GDALCopyWords(afResult, eWrkDataType, 0, abyTemp,
-                              eVRTBandDataType, 0, 1);
+                CopyWord<WorkingDT>(afResult, eWrkDataType, abyTemp,
+                                    eVRTBandDataType);
                 GDALCopyWords(abyTemp, eVRTBandDataType, 0, pDstLocation,
                               eBufType, 0, 1);
             }
@@ -3488,6 +3712,16 @@ VRTFuncSource::~VRTFuncSource()
 {
 }
 
+/************************************************************************/
+/*                            GetType()                                 */
+/************************************************************************/
+
+const char *VRTFuncSource::GetType() const
+{
+    static const char *TYPE = "FuncSource";
+    return TYPE;
+}
+
 /************************************************************************/
 /*                           SerializeToXML()                           */
 /************************************************************************/
@@ -3569,29 +3803,29 @@ CPLErr VRTFuncSource::GetHistogram(
 /*                        VRTParseCoreSources()                         */
 /************************************************************************/
 
-VRTSource *
-VRTParseCoreSources(const CPLXMLNode *psChild, const char *pszVRTPath,
-                    std::map<CPLString, GDALDataset *> &oMapSharedSources)
+VRTSource *VRTParseCoreSources(const CPLXMLNode *psChild,
+                               const char *pszVRTPath,
+                               VRTMapSharedResources &oMapSharedSources)
 
 {
     VRTSource *poSource = nullptr;
 
-    if (EQUAL(psChild->pszValue, "AveragedSource") ||
-        (EQUAL(psChild->pszValue, "SimpleSource") &&
+    if (EQUAL(psChild->pszValue, VRTAveragedSource::GetTypeStatic()) ||
+        (EQUAL(psChild->pszValue, VRTSimpleSource::GetTypeStatic()) &&
          STARTS_WITH_CI(CPLGetXMLValue(psChild, "Resampling", "Nearest"),
                         "Aver")))
     {
         poSource = new VRTAveragedSource();
     }
-    else if (EQUAL(psChild->pszValue, "SimpleSource"))
+    else if (EQUAL(psChild->pszValue, VRTSimpleSource::GetTypeStatic()))
     {
         poSource = new VRTSimpleSource();
     }
-    else if (EQUAL(psChild->pszValue, "ComplexSource"))
+    else if (EQUAL(psChild->pszValue, VRTComplexSource::GetTypeStatic()))
     {
         poSource = new VRTComplexSource();
     }
-    else if (EQUAL(psChild->pszValue, "NoDataFromMaskSource"))
+    else if (EQUAL(psChild->pszValue, VRTNoDataFromMaskSource::GetTypeStatic()))
     {
         poSource = new VRTNoDataFromMaskSource();
     }
diff --git a/frmts/vrt/vrtwarped.cpp b/frmts/vrt/vrtwarped.cpp
index b96cd5071183..432758767e53 100644
--- a/frmts/vrt/vrtwarped.cpp
+++ b/frmts/vrt/vrtwarped.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -180,6 +164,9 @@ GDALDatasetH CPL_STDCALL GDALAutoCreateWarpedVRTEx(
     if (psWO->padfSrcNoDataReal == nullptr &&
         psWO->padfDstNoDataReal == nullptr && psWO->nSrcAlphaBand == 0)
     {
+        // If none of the provided input nodata values can be represented in the
+        // data type of the corresponding source band, ignore them.
+        int nCountInvalidSrcNoDataReal = 0;
         for (int i = 0; i < psWO->nBandCount; i++)
         {
             GDALRasterBandH rasterBand =
@@ -189,22 +176,42 @@ GDALDatasetH CPL_STDCALL GDALAutoCreateWarpedVRTEx(
             double noDataValue =
                 GDALGetRasterNoDataValue(rasterBand, &hasNoDataValue);
 
-            if (hasNoDataValue)
+            if (hasNoDataValue &&
+                !GDALIsValueExactAs(noDataValue,
+                                    GDALGetRasterDataType(rasterBand)))
             {
-                // Check if the nodata value is out of range
-                int bClamped = FALSE;
-                int bRounded = FALSE;
-                CPL_IGNORE_RET_VAL(GDALAdjustValueToDataType(
-                    GDALGetRasterDataType(rasterBand), noDataValue, &bClamped,
-                    &bRounded));
-                if (!bClamped)
+                nCountInvalidSrcNoDataReal++;
+            }
+        }
+
+        if (nCountInvalidSrcNoDataReal != psWO->nBandCount)
+        {
+            for (int i = 0; i < psWO->nBandCount; i++)
+            {
+                GDALRasterBandH rasterBand =
+                    GDALGetRasterBand(psWO->hSrcDS, psWO->panSrcBands[i]);
+
+                int hasNoDataValue;
+                double noDataValue =
+                    GDALGetRasterNoDataValue(rasterBand, &hasNoDataValue);
+
+                if (hasNoDataValue)
                 {
-                    GDALWarpInitNoDataReal(psWO, -1e10);
-                    if (psWO->padfSrcNoDataReal != nullptr &&
-                        psWO->padfDstNoDataReal != nullptr)
+                    // Check if the nodata value is out of range
+                    int bClamped = FALSE;
+                    int bRounded = FALSE;
+                    CPL_IGNORE_RET_VAL(GDALAdjustValueToDataType(
+                        GDALGetRasterDataType(rasterBand), noDataValue,
+                        &bClamped, &bRounded));
+                    if (!bClamped)
                     {
-                        psWO->padfSrcNoDataReal[i] = noDataValue;
-                        psWO->padfDstNoDataReal[i] = noDataValue;
+                        GDALWarpInitNoDataReal(psWO, -1e10);
+                        if (psWO->padfSrcNoDataReal != nullptr &&
+                            psWO->padfDstNoDataReal != nullptr)
+                        {
+                            psWO->padfSrcNoDataReal[i] = noDataValue;
+                            psWO->padfDstNoDataReal[i] = noDataValue;
+                        }
                     }
                 }
             }
@@ -439,8 +446,7 @@ VRTWarpedDataset::VRTWarpedDataset(int nXSize, int nYSize, int nBlockXSize,
     : VRTDataset(nXSize, nYSize,
                  nBlockXSize > 0 ? nBlockXSize : std::min(nXSize, 512),
                  nBlockYSize > 0 ? nBlockYSize : std::min(nYSize, 128)),
-      m_poWarper(nullptr), m_nOverviewCount(0), m_papoOverviews(nullptr),
-      m_nSrcOvrLevel(-2)
+      m_poWarper(nullptr), m_nSrcOvrLevel(-2)
 {
     eAccess = GA_Update;
     DisableReadWriteMutex();
@@ -468,19 +474,15 @@ int VRTWarpedDataset::CloseDependentDatasets()
     /* -------------------------------------------------------------------- */
     /*      Cleanup overviews.                                              */
     /* -------------------------------------------------------------------- */
-    for (int iOverview = 0; iOverview < m_nOverviewCount; iOverview++)
+    for (auto &poDS : m_apoOverviews)
     {
-        GDALDatasetH hDS = m_papoOverviews[iOverview];
-
-        if (GDALReleaseDataset(hDS))
+        if (poDS && poDS->Release())
         {
             bHasDroppedRef = true;
         }
     }
 
-    CPLFree(m_papoOverviews);
-    m_nOverviewCount = 0;
-    m_papoOverviews = nullptr;
+    m_apoOverviews.clear();
 
     /* -------------------------------------------------------------------- */
     /*      Cleanup warper if one is in effect.                             */
@@ -682,168 +684,231 @@ class GDALWarpCoordRescaler : public OGRCoordinateTransformation
 
 static void RescaleDstGeoTransform(double adfDstGeoTransform[6],
                                    int nRasterXSize, int nDstPixels,
-                                   int nRasterYSize, int nDstLines,
-                                   double dfTargetRatio)
+                                   int nRasterYSize, int nDstLines)
 {
-    if (adfDstGeoTransform[2] == 0.0 && adfDstGeoTransform[4] == 0.0)
+    adfDstGeoTransform[1] *= static_cast<double>(nRasterXSize) / nDstPixels;
+    adfDstGeoTransform[2] *= static_cast<double>(nRasterXSize) / nDstPixels;
+    adfDstGeoTransform[4] *= static_cast<double>(nRasterYSize) / nDstLines;
+    adfDstGeoTransform[5] *= static_cast<double>(nRasterYSize) / nDstLines;
+}
+
+/************************************************************************/
+/*                        GetSrcOverviewLevel()                         */
+/************************************************************************/
+
+int VRTWarpedDataset::GetSrcOverviewLevel(int iOvr,
+                                          bool &bThisLevelOnlyOut) const
+{
+    bThisLevelOnlyOut = false;
+    if (m_nSrcOvrLevel < -2)
+    {
+        if (iOvr + m_nSrcOvrLevel + 2 >= 0)
+        {
+            return iOvr + m_nSrcOvrLevel + 2;
+        }
+    }
+    else if (m_nSrcOvrLevel == -2)
     {
-        adfDstGeoTransform[1] *= static_cast<double>(nRasterXSize) / nDstPixels;
-        adfDstGeoTransform[5] *= static_cast<double>(nRasterYSize) / nDstLines;
+        return iOvr;
     }
-    else
+    else if (m_nSrcOvrLevel >= 0)
     {
-        adfDstGeoTransform[1] *= dfTargetRatio;
-        adfDstGeoTransform[2] *= dfTargetRatio;
-        adfDstGeoTransform[4] *= dfTargetRatio;
-        adfDstGeoTransform[5] *= dfTargetRatio;
+        bThisLevelOnlyOut = true;
+        return m_nSrcOvrLevel;
     }
+    return -1;
 }
 
 /************************************************************************/
-/*                        CreateImplicitOverviews()                     */
-/*                                                                      */
-/*      For each overview of the source dataset, create an overview     */
-/*      in the warped VRT dataset.                                      */
+/*                            GetOverviewSize()                         */
 /************************************************************************/
 
-void VRTWarpedDataset::CreateImplicitOverviews()
+bool VRTWarpedDataset::GetOverviewSize(GDALDataset *poSrcDS, int iOvr,
+                                       int iSrcOvr, int &nOvrXSize,
+                                       int &nOvrYSize, double &dfSrcRatioX,
+                                       double &dfSrcRatioY) const
 {
-    if (m_poWarper == nullptr || m_nOverviewCount != 0)
-        return;
-
-    const GDALWarpOptions *psWO = m_poWarper->GetOptions();
+    auto poSrcOvrBand = iSrcOvr >= 0
+                            ? poSrcDS->GetRasterBand(1)->GetOverview(iSrcOvr)
+                            : poSrcDS->GetRasterBand(1);
+    if (!poSrcOvrBand)
+    {
+        return false;
+    }
+    dfSrcRatioX = static_cast<double>(poSrcDS->GetRasterXSize()) /
+                  poSrcOvrBand->GetXSize();
+    dfSrcRatioY = static_cast<double>(poSrcDS->GetRasterYSize()) /
+                  poSrcOvrBand->GetYSize();
+    const double dfTargetRatio =
+        static_cast<double>(poSrcDS->GetRasterXSize()) /
+        poSrcDS->GetRasterBand(1)->GetOverview(iOvr)->GetXSize();
+
+    nOvrXSize = static_cast<int>(nRasterXSize / dfTargetRatio + 0.5);
+    nOvrYSize = static_cast<int>(nRasterYSize / dfTargetRatio + 0.5);
+    return nOvrXSize >= 1 && nOvrYSize >= 1;
+}
 
-    if (psWO->hSrcDS == nullptr || GDALGetRasterCount(psWO->hSrcDS) == 0)
-        return;
+/************************************************************************/
+/*                        CreateImplicitOverview()                      */
+/************************************************************************/
 
-    GDALDataset *poSrcDS = static_cast<GDALDataset *>(psWO->hSrcDS);
-    const int nOvrCount = poSrcDS->GetRasterBand(1)->GetOverviewCount();
-    for (int iOvr = 0; iOvr < nOvrCount; iOvr++)
+VRTWarpedDataset *VRTWarpedDataset::CreateImplicitOverview(int iOvr) const
+{
+    if (!m_poWarper)
+        return nullptr;
+    const GDALWarpOptions *psWO = m_poWarper->GetOptions();
+    if (!psWO->hSrcDS || GDALGetRasterCount(psWO->hSrcDS) == 0)
+        return nullptr;
+    GDALDataset *poSrcDS = GDALDataset::FromHandle(psWO->hSrcDS);
+    GDALDataset *poSrcOvrDS = poSrcDS;
+    bool bThisLevelOnly = false;
+    const int iSrcOvr = GetSrcOverviewLevel(iOvr, bThisLevelOnly);
+    if (iSrcOvr >= 0)
     {
-        GDALDataset *poSrcOvrDS = poSrcDS;
-        if (m_nSrcOvrLevel < -2)
-        {
-            if (iOvr + m_nSrcOvrLevel + 2 >= 0)
-            {
-                poSrcOvrDS = GDALCreateOverviewDataset(
-                    poSrcDS, iOvr + m_nSrcOvrLevel + 2,
-                    /* bThisLevelOnly = */ false);
-            }
-        }
-        else if (m_nSrcOvrLevel == -2)
-        {
-            poSrcOvrDS =
-                GDALCreateOverviewDataset(poSrcDS, iOvr,
-                                          /* bThisLevelOnly = */ false);
-        }
-        else if (m_nSrcOvrLevel >= 0)
-        {
-            poSrcOvrDS = GDALCreateOverviewDataset(poSrcDS, m_nSrcOvrLevel,
-                                                   /* bThisLevelOnly = */ true);
-        }
-        if (poSrcOvrDS == nullptr)
-            break;
-        if (poSrcOvrDS == poSrcDS)
-            poSrcOvrDS->Reference();
-
-        const double dfSrcRatioX =
-            static_cast<double>(poSrcDS->GetRasterXSize()) /
-            poSrcOvrDS->GetRasterXSize();
-        const double dfSrcRatioY =
-            static_cast<double>(poSrcDS->GetRasterYSize()) /
-            poSrcOvrDS->GetRasterYSize();
-        const double dfTargetRatio =
-            static_cast<double>(poSrcDS->GetRasterXSize()) /
-            poSrcDS->GetRasterBand(1)->GetOverview(iOvr)->GetXSize();
+        poSrcOvrDS =
+            GDALCreateOverviewDataset(poSrcDS, iSrcOvr, bThisLevelOnly);
+    }
+    if (poSrcOvrDS == nullptr)
+        return nullptr;
+    if (poSrcOvrDS == poSrcDS)
+        poSrcOvrDS->Reference();
 
-        /* --------------------------------------------------------------------
-         */
-        /*      Figure out the desired output bounds and resolution. */
-        /* --------------------------------------------------------------------
-         */
-        const int nDstPixels =
-            static_cast<int>(nRasterXSize / dfTargetRatio + 0.5);
-        const int nDstLines =
-            static_cast<int>(nRasterYSize / dfTargetRatio + 0.5);
+    int nDstPixels = 0;
+    int nDstLines = 0;
+    double dfSrcRatioX = 0;
+    double dfSrcRatioY = 0;
+    // Figure out the desired output bounds and resolution.
+    if (!GetOverviewSize(poSrcDS, iOvr, iSrcOvr, nDstPixels, nDstLines,
+                         dfSrcRatioX, dfSrcRatioY))
+    {
+        poSrcOvrDS->ReleaseRef();
+        return nullptr;
+    }
 
-        double adfDstGeoTransform[6] = {0.0};
-        GetGeoTransform(adfDstGeoTransform);
-        RescaleDstGeoTransform(adfDstGeoTransform, nRasterXSize, nDstPixels,
-                               nRasterYSize, nDstLines, dfTargetRatio);
+    /* --------------------------------------------------------------------
+     */
+    /*      Create transformer and warping options. */
+    /* --------------------------------------------------------------------
+     */
+    void *pTransformerArg = GDALCreateSimilarTransformer(
+        psWO->pTransformerArg, dfSrcRatioX, dfSrcRatioY);
+    if (pTransformerArg == nullptr)
+    {
+        poSrcOvrDS->ReleaseRef();
+        return nullptr;
+    }
 
-        if (nDstPixels < 1 || nDstLines < 1)
-        {
-            poSrcOvrDS->ReleaseRef();
-            break;
-        }
+    GDALWarpOptions *psWOOvr = GDALCloneWarpOptions(psWO);
+    psWOOvr->hSrcDS = poSrcOvrDS;
+    psWOOvr->pfnTransformer = psWO->pfnTransformer;
+    psWOOvr->pTransformerArg = pTransformerArg;
 
-        /* --------------------------------------------------------------------
-         */
-        /*      Create transformer and warping options. */
-        /* --------------------------------------------------------------------
-         */
-        void *pTransformerArg = GDALCreateSimilarTransformer(
-            psWO->pTransformerArg, dfSrcRatioX, dfSrcRatioY);
-        if (pTransformerArg == nullptr)
-        {
-            poSrcOvrDS->ReleaseRef();
-            break;
-        }
+    /* --------------------------------------------------------------------
+     */
+    /*      We need to rescale the potential CUTLINE */
+    /* --------------------------------------------------------------------
+     */
+    if (psWOOvr->hCutline)
+    {
+        GDALWarpCoordRescaler oRescaler(1.0 / dfSrcRatioX, 1.0 / dfSrcRatioY);
+        static_cast<OGRGeometry *>(psWOOvr->hCutline)->transform(&oRescaler);
+    }
 
-        GDALWarpOptions *psWOOvr = GDALCloneWarpOptions(psWO);
-        psWOOvr->hSrcDS = poSrcOvrDS;
-        psWOOvr->pfnTransformer = psWO->pfnTransformer;
-        psWOOvr->pTransformerArg = pTransformerArg;
+    /* --------------------------------------------------------------------
+     */
+    /*      Rescale the output geotransform on the transformer. */
+    /* --------------------------------------------------------------------
+     */
+    double adfDstGeoTransform[6] = {0.0};
+    GDALGetTransformerDstGeoTransform(psWOOvr->pTransformerArg,
+                                      adfDstGeoTransform);
+    RescaleDstGeoTransform(adfDstGeoTransform, nRasterXSize, nDstPixels,
+                           nRasterYSize, nDstLines);
+    GDALSetTransformerDstGeoTransform(psWOOvr->pTransformerArg,
+                                      adfDstGeoTransform);
+
+    /* --------------------------------------------------------------------
+     */
+    /*      Create the VRT file. */
+    /* --------------------------------------------------------------------
+     */
+    GDALDatasetH hDstDS = GDALCreateWarpedVRT(poSrcOvrDS, nDstPixels, nDstLines,
+                                              adfDstGeoTransform, psWOOvr);
 
-        /* --------------------------------------------------------------------
-         */
-        /*      We need to rescale the potential CUTLINE */
-        /* --------------------------------------------------------------------
-         */
-        if (psWOOvr->hCutline)
-        {
-            GDALWarpCoordRescaler oRescaler(1.0 / dfSrcRatioX,
-                                            1.0 / dfSrcRatioY);
-            static_cast<OGRGeometry *>(psWOOvr->hCutline)
-                ->transform(&oRescaler);
-        }
+    poSrcOvrDS->ReleaseRef();
 
-        /* --------------------------------------------------------------------
-         */
-        /*      Rescale the output geotransform on the transformer. */
-        /* --------------------------------------------------------------------
-         */
-        GDALGetTransformerDstGeoTransform(psWOOvr->pTransformerArg,
-                                          adfDstGeoTransform);
-        RescaleDstGeoTransform(adfDstGeoTransform, nRasterXSize, nDstPixels,
-                               nRasterYSize, nDstLines, dfTargetRatio);
-        GDALSetTransformerDstGeoTransform(psWOOvr->pTransformerArg,
-                                          adfDstGeoTransform);
+    GDALDestroyWarpOptions(psWOOvr);
 
-        /* --------------------------------------------------------------------
-         */
-        /*      Create the VRT file. */
-        /* --------------------------------------------------------------------
-         */
-        GDALDatasetH hDstDS = GDALCreateWarpedVRT(
-            poSrcOvrDS, nDstPixels, nDstLines, adfDstGeoTransform, psWOOvr);
+    if (hDstDS == nullptr)
+    {
+        GDALDestroyTransformer(pTransformerArg);
+        return nullptr;
+    }
 
-        poSrcOvrDS->ReleaseRef();
+    auto poOvrDS = static_cast<VRTWarpedDataset *>(hDstDS);
+    poOvrDS->m_bIsOverview = true;
+    return poOvrDS;
+}
 
-        GDALDestroyWarpOptions(psWOOvr);
+/************************************************************************/
+/*                           GetOverviewCount()                         */
+/************************************************************************/
 
-        if (hDstDS == nullptr)
+int VRTWarpedDataset::GetOverviewCount() const
+{
+    if (m_poWarper)
+    {
+        const GDALWarpOptions *psWO = m_poWarper->GetOptions();
+        if (!m_bIsOverview && psWO->hSrcDS && GDALGetRasterCount(psWO->hSrcDS))
         {
-            GDALDestroyTransformer(pTransformerArg);
-            break;
+            GDALDataset *poSrcDS = GDALDataset::FromHandle(psWO->hSrcDS);
+            int nSrcOverviewCount =
+                poSrcDS->GetRasterBand(1)->GetOverviewCount();
+            int nCount = 0;
+            for (int i = 0; i < nSrcOverviewCount; ++i)
+            {
+                bool bThisLevelOnly = false;
+                const int iSrcOvr = GetSrcOverviewLevel(i, bThisLevelOnly);
+                if (iSrcOvr >= 0)
+                {
+                    int nDstPixels = 0;
+                    int nDstLines = 0;
+                    double dfSrcRatioX = 0;
+                    double dfSrcRatioY = 0;
+                    if (!GetOverviewSize(poSrcDS, i, iSrcOvr, nDstPixels,
+                                         nDstLines, dfSrcRatioX, dfSrcRatioY))
+                    {
+                        break;
+                    }
+                }
+                ++nCount;
+            }
+            return nCount;
         }
+    }
+    return 0;
+}
 
-        m_nOverviewCount++;
-        m_papoOverviews = static_cast<VRTWarpedDataset **>(
-            CPLRealloc(m_papoOverviews, sizeof(void *) * m_nOverviewCount));
+/************************************************************************/
+/*                        CreateImplicitOverviews()                     */
+/*                                                                      */
+/*      For each overview of the source dataset, create an overview     */
+/*      in the warped VRT dataset.                                      */
+/************************************************************************/
 
-        m_papoOverviews[m_nOverviewCount - 1] =
-            static_cast<VRTWarpedDataset *>(hDstDS);
+void VRTWarpedDataset::CreateImplicitOverviews()
+{
+    if (m_bIsOverview)
+        return;
+    const int nOvrCount = GetOverviewCount();
+    if (m_apoOverviews.empty())
+        m_apoOverviews.resize(nOvrCount);
+    for (int iOvr = 0; iOvr < nOvrCount; iOvr++)
+    {
+        if (!m_apoOverviews[iOvr])
+        {
+            m_apoOverviews[iOvr] = CreateImplicitOverview(iOvr);
+        }
     }
 }
 
@@ -1090,7 +1155,7 @@ CPLErr VRTWarpedDataset::IBuildOverviews(
     const int * /* panBandList */, GDALProgressFunc pfnProgress,
     void *pProgressData, CSLConstList /*papszOptions*/)
 {
-    if (m_poWarper == nullptr)
+    if (m_poWarper == nullptr || m_bIsOverview)
         return CE_Failure;
 
     /* -------------------------------------------------------------------- */
@@ -1102,6 +1167,8 @@ CPLErr VRTWarpedDataset::IBuildOverviews(
         return CE_Failure;
     }
 
+    CreateImplicitOverviews();
+
     /* -------------------------------------------------------------------- */
     /*      Establish which of the overview levels we already have, and     */
     /*      which are new.                                                  */
@@ -1112,19 +1179,20 @@ CPLErr VRTWarpedDataset::IBuildOverviews(
     std::vector<bool> abFoundOverviewFactor(nOverviews);
     for (int i = 0; i < nOverviews; i++)
     {
-        for (int j = 0; j < m_nOverviewCount; j++)
+        for (GDALDataset *const poOverview : m_apoOverviews)
         {
-            GDALDataset *const poOverview = m_papoOverviews[j];
-
-            const int nOvFactor = GDALComputeOvFactor(
-                poOverview->GetRasterXSize(), GetRasterXSize(),
-                poOverview->GetRasterYSize(), GetRasterYSize());
-
-            if (nOvFactor == panOverviewList[i] ||
-                nOvFactor == GDALOvLevelAdjust2(panOverviewList[i],
-                                                GetRasterXSize(),
-                                                GetRasterYSize()))
-                abFoundOverviewFactor[i] = true;
+            if (poOverview)
+            {
+                const int nOvFactor = GDALComputeOvFactor(
+                    poOverview->GetRasterXSize(), GetRasterXSize(),
+                    poOverview->GetRasterYSize(), GetRasterYSize());
+
+                if (nOvFactor == panOverviewList[i] ||
+                    nOvFactor == GDALOvLevelAdjust2(panOverviewList[i],
+                                                    GetRasterXSize(),
+                                                    GetRasterYSize()))
+                    abFoundOverviewFactor[i] = true;
+            }
         }
 
         if (!abFoundOverviewFactor[i])
@@ -1162,15 +1230,14 @@ CPLErr VRTWarpedDataset::IBuildOverviews(
         /* --------------------------------------------------------------------
          */
         VRTWarpedDataset *poBaseDataset = this;
-        for (int j = 0; j < m_nOverviewCount; j++)
+        for (auto *poOverview : m_apoOverviews)
         {
-            if (m_papoOverviews[j]->GetRasterXSize() > nOXSize &&
-                m_papoOverviews[j]->m_poWarper->GetOptions()->pfnTransformer !=
+            if (poOverview && poOverview->GetRasterXSize() > nOXSize &&
+                poOverview->m_poWarper->GetOptions()->pfnTransformer !=
                     VRTWarpedOverviewTransform &&
-                m_papoOverviews[j]->GetRasterXSize() <
-                    poBaseDataset->GetRasterXSize())
+                poOverview->GetRasterXSize() < poBaseDataset->GetRasterXSize())
             {
-                poBaseDataset = m_papoOverviews[j];
+                poBaseDataset = poOverview;
             }
         }
 
@@ -1226,11 +1293,7 @@ CPLErr VRTWarpedDataset::IBuildOverviews(
             break;
         }
 
-        m_nOverviewCount++;
-        m_papoOverviews = static_cast<VRTWarpedDataset **>(
-            CPLRealloc(m_papoOverviews, sizeof(void *) * m_nOverviewCount));
-
-        m_papoOverviews[m_nOverviewCount - 1] = poOverviewDS;
+        m_apoOverviews.push_back(poOverviewDS);
     }
 
     CPLFree(panNewOverviewList);
@@ -1515,18 +1578,16 @@ CPLErr VRTWarpedDataset::XMLInit(const CPLXMLNode *psTree,
     /*      Generate overviews, if appropriate.                             */
     /* -------------------------------------------------------------------- */
 
-    CreateImplicitOverviews();
-
     // OverviewList is historical, and quite inefficient, since it uses
     // the full resolution source dataset, so only build it afterwards.
-    char **papszTokens =
-        CSLTokenizeString(CPLGetXMLValue(psTree, "OverviewList", ""));
+    const CPLStringList aosOverviews(
+        CSLTokenizeString(CPLGetXMLValue(psTree, "OverviewList", "")));
+    if (!aosOverviews.empty())
+        CreateImplicitOverviews();
 
-    for (int iOverview = 0;
-         papszTokens != nullptr && papszTokens[iOverview] != nullptr;
-         iOverview++)
+    for (int iOverview = 0; iOverview < aosOverviews.size(); ++iOverview)
     {
-        int nOvFactor = atoi(papszTokens[iOverview]);
+        int nOvFactor = atoi(aosOverviews[iOverview]);
 
         if (nOvFactor > 0)
             BuildOverviews("NEAREST", 1, &nOvFactor, 0, nullptr, nullptr,
@@ -1535,11 +1596,9 @@ CPLErr VRTWarpedDataset::XMLInit(const CPLXMLNode *psTree,
         else
             CPLError(CE_Failure, CPLE_AppDefined,
                      "Bad value for overview factor : %s",
-                     papszTokens[iOverview]);
+                     aosOverviews[iOverview]);
     }
 
-    CSLDestroy(papszTokens);
-
     return eErr;
 }
 
@@ -1572,7 +1631,7 @@ CPLXMLNode *VRTWarpedDataset::SerializeToXML(const char *pszVRTPathIn)
     /* -------------------------------------------------------------------- */
     /*      Serialize the overview list (only for non implicit overviews)   */
     /* -------------------------------------------------------------------- */
-    if (m_nOverviewCount > 0)
+    if (!m_apoOverviews.empty())
     {
         int nSrcDSOvrCount = 0;
         if (m_poWarper != nullptr && m_poWarper->GetOptions() != nullptr &&
@@ -1585,21 +1644,23 @@ CPLXMLNode *VRTWarpedDataset::SerializeToXML(const char *pszVRTPathIn)
                     ->GetOverviewCount();
         }
 
-        if (m_nOverviewCount != nSrcDSOvrCount)
+        if (static_cast<int>(m_apoOverviews.size()) != nSrcDSOvrCount)
         {
-            const size_t nLen = m_nOverviewCount * 8 + 10;
+            const size_t nLen = m_apoOverviews.size() * 8 + 10;
             char *pszOverviewList = static_cast<char *>(CPLMalloc(nLen));
             pszOverviewList[0] = '\0';
-            for (int iOverview = 0; iOverview < m_nOverviewCount; iOverview++)
+            for (auto *poOverviewDS : m_apoOverviews)
             {
-                const int nOvFactor = static_cast<int>(
-                    0.5 +
-                    GetRasterXSize() /
-                        static_cast<double>(
-                            m_papoOverviews[iOverview]->GetRasterXSize()));
-
-                snprintf(pszOverviewList + strlen(pszOverviewList),
-                         nLen - strlen(pszOverviewList), "%d ", nOvFactor);
+                if (poOverviewDS)
+                {
+                    const int nOvFactor = static_cast<int>(
+                        0.5 +
+                        GetRasterXSize() / static_cast<double>(
+                                               poOverviewDS->GetRasterXSize()));
+
+                    snprintf(pszOverviewList + strlen(pszOverviewList),
+                             nLen - strlen(pszOverviewList), "%d ", nOvFactor);
+                }
             }
 
             CPLCreateXMLElementAndValue(psTree, "OverviewList",
@@ -1826,10 +1887,14 @@ CPLErr VRTWarpedDataset::IRasterIO(
     int nBandCount, BANDMAP_TYPE panBandMap, GSpacing nPixelSpace,
     GSpacing nLineSpace, GSpacing nBandSpace, GDALRasterIOExtraArg *psExtraArg)
 {
+    const bool bWholeImage = nXOff == 0 && nYOff == 0 &&
+                             nXSize == nRasterXSize && nYSize == nRasterYSize;
+
     if (eRWFlag == GF_Write ||
         // For too small request fall back to the block-based approach to
         // benefit from caching
-        nBufXSize <= m_nBlockXSize || nBufYSize <= m_nBlockYSize ||
+        (!bWholeImage &&
+         (nBufXSize <= m_nBlockXSize || nBufYSize <= m_nBlockYSize)) ||
         // Or if we don't request all bands at once
         nBandCount < nBands ||
         !CPLTestBool(
@@ -1856,27 +1921,89 @@ CPLErr VRTWarpedDataset::IRasterIO(
         }
     }
 
-    // Fallback to default block-based implementation when not requesting at
-    // the nominal resolution (in theory we could construct a warper taking
-    // into account that, like we do for virtual warped overviews, but that
-    // would be a complication).
-    if (nBufXSize != nXSize || nBufYSize != nYSize)
-    {
-        return GDALDataset::IRasterIO(eRWFlag, nXOff, nYOff, nXSize, nYSize,
-                                      pData, nBufXSize, nBufYSize, eBufType,
-                                      nBandCount, panBandMap, nPixelSpace,
-                                      nLineSpace, nBandSpace, psExtraArg);
-    }
-
     if (m_poWarper == nullptr)
         return CE_Failure;
 
     const GDALWarpOptions *psWO = m_poWarper->GetOptions();
 
+    if (nBufXSize != nXSize || nBufYSize != nYSize)
+    {
+        if (!bWholeImage || !GDALTransformHasFastClone(psWO->pTransformerArg))
+        {
+            return GDALDataset::IRasterIO(eRWFlag, nXOff, nYOff, nXSize, nYSize,
+                                          pData, nBufXSize, nBufYSize, eBufType,
+                                          nBandCount, panBandMap, nPixelSpace,
+                                          nLineSpace, nBandSpace, psExtraArg);
+        }
+
+        // Build a temporary dataset taking into account the rescaling
+        void *pTransformerArg = GDALCloneTransformer(psWO->pTransformerArg);
+        if (pTransformerArg == nullptr)
+        {
+            return GDALDataset::IRasterIO(eRWFlag, nXOff, nYOff, nXSize, nYSize,
+                                          pData, nBufXSize, nBufYSize, eBufType,
+                                          nBandCount, panBandMap, nPixelSpace,
+                                          nLineSpace, nBandSpace, psExtraArg);
+        }
+
+        GDALWarpOptions *psRescaledWO = GDALCloneWarpOptions(psWO);
+        psRescaledWO->hSrcDS = psWO->hSrcDS;
+        psRescaledWO->pfnTransformer = psWO->pfnTransformer;
+        psRescaledWO->pTransformerArg = pTransformerArg;
+
+        // Rescale the output geotransform on the transformer.
+        double adfDstGeoTransform[6] = {0.0};
+        GDALGetTransformerDstGeoTransform(psRescaledWO->pTransformerArg,
+                                          adfDstGeoTransform);
+        RescaleDstGeoTransform(adfDstGeoTransform, nRasterXSize, nBufXSize,
+                               nRasterYSize, nBufYSize);
+        GDALSetTransformerDstGeoTransform(psRescaledWO->pTransformerArg,
+                                          adfDstGeoTransform);
+
+        GDALDatasetH hDstDS =
+            GDALCreateWarpedVRT(psWO->hSrcDS, nBufXSize, nBufYSize,
+                                adfDstGeoTransform, psRescaledWO);
+
+        GDALDestroyWarpOptions(psRescaledWO);
+
+        if (hDstDS == nullptr)
+        {
+            // Not supposed to happen in nominal circumstances. Could perhaps
+            // happen if some memory allocation error occurred in code called
+            // by GDALCreateWarpedVRT()
+            GDALDestroyTransformer(pTransformerArg);
+            return GDALDataset::IRasterIO(eRWFlag, nXOff, nYOff, nXSize, nYSize,
+                                          pData, nBufXSize, nBufYSize, eBufType,
+                                          nBandCount, panBandMap, nPixelSpace,
+                                          nLineSpace, nBandSpace, psExtraArg);
+        }
+
+        auto poOvrDS = static_cast<VRTWarpedDataset *>(hDstDS);
+        poOvrDS->m_bIsOverview = true;
+
+        GDALRasterIOExtraArg sExtraArg;
+        INIT_RASTERIO_EXTRA_ARG(sExtraArg);
+        CPLErr eErr = poOvrDS->IRasterIO(GF_Read, 0, 0, nBufXSize, nBufYSize,
+                                         pData, nBufXSize, nBufYSize, eBufType,
+                                         nBandCount, panBandMap, nPixelSpace,
+                                         nLineSpace, nBandSpace, &sExtraArg);
+
+        poOvrDS->ReleaseRef();
+        return eErr;
+    }
+
     // Build a map from warped output bands to their index
     std::map<int, int> oMapBandToWarpingBandIndex;
+    bool bAllBandsIncreasingOrder =
+        (psWO->nBandCount == nBands && nBands == nBandCount);
     for (int i = 0; i < psWO->nBandCount; ++i)
+    {
         oMapBandToWarpingBandIndex[psWO->panDstBands[i]] = i;
+        if (psWO->panDstBands[i] != i + 1 || panBandMap[i] != i + 1)
+        {
+            bAllBandsIncreasingOrder = false;
+        }
+    }
 
     // Check that all requested bands are actually warped output bands.
     for (int i = 0; i < nBandCount; ++i)
@@ -1961,51 +2088,72 @@ CPLErr VRTWarpedDataset::IRasterIO(
     CPLDebugOnly("VRT",
                  "Using optimized VRTWarpedDataset::IRasterIO() code path");
 
-    // Allocate a warping destination buffer
-    // Note: we could potentially use the pData target buffer argument of this
-    // function in some circumstances... but probably not worth the complication
-    GByte *pabyWarpBuffer = static_cast<GByte *>(
-        m_poWarper->CreateDestinationBuffer(nXSize, nYSize));
-
-    if (pabyWarpBuffer == nullptr)
+    // Allocate a warping destination buffer if needed.
+    // We can use directly the output buffer pData if:
+    // - we request exactly all warped bands, and that there are as many
+    //   warped bands as dataset bands (no alpha)
+    // - the output buffer data atype is the warping working data type
+    // - the output buffer has a band-sequential layout.
+    GByte *pabyWarpBuffer;
+
+    if (bAllBandsIncreasingOrder && psWO->eWorkingDataType == eBufType &&
+        nPixelSpace == GDALGetDataTypeSizeBytes(eBufType) &&
+        nLineSpace == nPixelSpace * nXSize &&
+        (nBands == 1 || nBandSpace == nLineSpace * nYSize))
     {
-        return CE_Failure;
+        pabyWarpBuffer = static_cast<GByte *>(pData);
+        m_poWarper->InitializeDestinationBuffer(pabyWarpBuffer, nXSize, nYSize);
+    }
+    else
+    {
+        pabyWarpBuffer = static_cast<GByte *>(
+            m_poWarper->CreateDestinationBuffer(nXSize, nYSize));
+
+        if (pabyWarpBuffer == nullptr)
+        {
+            return CE_Failure;
+        }
     }
 
     const CPLErr eErr = m_poWarper->WarpRegionToBuffer(
         nXOff, nYOff, nXSize, nYSize, pabyWarpBuffer, psWO->eWorkingDataType,
         nSrcXOff, nSrcYOff, nSrcXSize, nSrcYSize, dfSrcXExtraSize,
         dfSrcYExtraSize);
-    if (eErr == CE_None)
+
+    if (pabyWarpBuffer != pData)
     {
-        // Copy warping buffer into user destination buffer
-        for (int i = 0; i < nBandCount; i++)
+        if (eErr == CE_None)
         {
-            const int nRasterIOBand = panBandMap[i];
-            const auto oIterToWarpingBandIndex =
-                oMapBandToWarpingBandIndex.find(nRasterIOBand);
-            // cannot happen due to earlier check
-            CPLAssert(oIterToWarpingBandIndex !=
-                      oMapBandToWarpingBandIndex.end());
-
-            const GByte *const pabyWarpBandBuffer =
-                pabyWarpBuffer +
-                static_cast<GPtrDiff_t>(oIterToWarpingBandIndex->second) *
-                    nXSize * nYSize * nWarpDTSize;
-            GByte *const pabyDstBand = pabyDst + i * nBandSpace;
-
-            for (int iY = 0; iY < nYSize; iY++)
+            // Copy warping buffer into user destination buffer
+            for (int i = 0; i < nBandCount; i++)
             {
-                GDALCopyWords(pabyWarpBandBuffer + static_cast<GPtrDiff_t>(iY) *
-                                                       nXSize * nWarpDTSize,
-                              psWO->eWorkingDataType, nWarpDTSize,
-                              pabyDstBand + iY * nLineSpace, eBufType,
-                              static_cast<int>(nPixelSpace), nXSize);
+                const int nRasterIOBand = panBandMap[i];
+                const auto oIterToWarpingBandIndex =
+                    oMapBandToWarpingBandIndex.find(nRasterIOBand);
+                // cannot happen due to earlier check
+                CPLAssert(oIterToWarpingBandIndex !=
+                          oMapBandToWarpingBandIndex.end());
+
+                const GByte *const pabyWarpBandBuffer =
+                    pabyWarpBuffer +
+                    static_cast<GPtrDiff_t>(oIterToWarpingBandIndex->second) *
+                        nXSize * nYSize * nWarpDTSize;
+                GByte *const pabyDstBand = pabyDst + i * nBandSpace;
+
+                for (int iY = 0; iY < nYSize; iY++)
+                {
+                    GDALCopyWords(pabyWarpBandBuffer +
+                                      static_cast<GPtrDiff_t>(iY) * nXSize *
+                                          nWarpDTSize,
+                                  psWO->eWorkingDataType, nWarpDTSize,
+                                  pabyDstBand + iY * nLineSpace, eBufType,
+                                  static_cast<int>(nPixelSpace), nXSize);
+                }
             }
         }
-    }
 
-    m_poWarper->DestroyDestinationBuffer(pabyWarpBuffer);
+        m_poWarper->DestroyDestinationBuffer(pabyWarpBuffer);
+    }
 
     return eErr;
 }
@@ -2130,6 +2278,166 @@ CPLErr VRTWarpedRasterBand::IWriteBlock(int nBlockXOff, int nBlockYOff,
     return CE_None;
 }
 
+/************************************************************************/
+/*                       GetBestOverviewLevel()                         */
+/************************************************************************/
+
+int VRTWarpedRasterBand::GetBestOverviewLevel(
+    int &nXOff, int &nYOff, int &nXSize, int &nYSize, int nBufXSize,
+    int nBufYSize, GDALRasterIOExtraArg *psExtraArg) const
+{
+    VRTWarpedDataset *poWDS = static_cast<VRTWarpedDataset *>(poDS);
+
+    /* -------------------------------------------------------------------- */
+    /*      Compute the desired downsampling factor.  It is                 */
+    /*      based on the least reduced axis, and represents the number      */
+    /*      of source pixels to one destination pixel.                      */
+    /* -------------------------------------------------------------------- */
+    const double dfDesiredDownsamplingFactor =
+        ((nXSize / static_cast<double>(nBufXSize)) <
+             (nYSize / static_cast<double>(nBufYSize)) ||
+         nBufYSize == 1)
+            ? nXSize / static_cast<double>(nBufXSize)
+            : nYSize / static_cast<double>(nBufYSize);
+
+    /* -------------------------------------------------------------------- */
+    /*      Find the overview level that largest downsampling factor (most  */
+    /*      downsampled) that is still less than (or only a little more)    */
+    /*      downsampled than the request.                                   */
+    /* -------------------------------------------------------------------- */
+    const GDALWarpOptions *psWO = poWDS->m_poWarper->GetOptions();
+    GDALDataset *poSrcDS = GDALDataset::FromHandle(psWO->hSrcDS);
+    const int nOverviewCount = poSrcDS->GetRasterBand(1)->GetOverviewCount();
+
+    int nBestOverviewXSize = 1;
+    int nBestOverviewYSize = 1;
+    double dfBestDownsamplingFactor = 0;
+    int nBestOverviewLevel = -1;
+
+    const char *pszOversampligThreshold =
+        CPLGetConfigOption("GDAL_OVERVIEW_OVERSAMPLING_THRESHOLD", nullptr);
+
+    // Cf https://github.com/OSGeo/gdal/pull/9040#issuecomment-1898524693
+    // Do not exactly use a oversampling threshold of 1.0 because of numerical
+    // instability.
+    const auto AdjustThreshold = [](double x)
+    {
+        constexpr double EPS = 1e-2;
+        return x == 1.0 ? x + EPS : x;
+    };
+    const double dfOversamplingThreshold = AdjustThreshold(
+        pszOversampligThreshold ? CPLAtof(pszOversampligThreshold)
+        : psExtraArg && psExtraArg->eResampleAlg != GRIORA_NearestNeighbour
+            ? 1.0
+            : 1.2);
+    for (int iOverview = 0; iOverview < nOverviewCount; iOverview++)
+    {
+        const GDALRasterBand *poSrcOvrBand = this;
+        bool bThisLevelOnly = false;
+        const int iSrcOvr =
+            poWDS->GetSrcOverviewLevel(iOverview, bThisLevelOnly);
+        if (iSrcOvr >= 0)
+        {
+            poSrcOvrBand = poSrcDS->GetRasterBand(1)->GetOverview(iSrcOvr);
+        }
+        if (poSrcOvrBand == nullptr)
+            break;
+
+        int nDstPixels = 0;
+        int nDstLines = 0;
+        double dfSrcRatioX = 0;
+        double dfSrcRatioY = 0;
+        if (!poWDS->GetOverviewSize(poSrcDS, iOverview, iSrcOvr, nDstPixels,
+                                    nDstLines, dfSrcRatioX, dfSrcRatioY))
+        {
+            break;
+        }
+
+        // Compute downsampling factor of this overview
+        const double dfDownsamplingFactor =
+            std::min(nRasterXSize / static_cast<double>(nDstPixels),
+                     nRasterYSize / static_cast<double>(nDstLines));
+
+        // Is it nearly the requested factor and better (lower) than
+        // the current best factor?
+        if (dfDownsamplingFactor >=
+                dfDesiredDownsamplingFactor * dfOversamplingThreshold ||
+            dfDownsamplingFactor <= dfBestDownsamplingFactor)
+        {
+            continue;
+        }
+
+        // Ignore AVERAGE_BIT2GRAYSCALE overviews for RasterIO purposes.
+        const char *pszResampling = const_cast<GDALRasterBand *>(poSrcOvrBand)
+                                        ->GetMetadataItem("RESAMPLING");
+
+        if (pszResampling != nullptr &&
+            STARTS_WITH_CI(pszResampling, "AVERAGE_BIT2"))
+            continue;
+
+        // OK, this is our new best overview.
+        nBestOverviewXSize = nDstPixels;
+        nBestOverviewYSize = nDstLines;
+        nBestOverviewLevel = iOverview;
+        dfBestDownsamplingFactor = dfDownsamplingFactor;
+    }
+
+    /* -------------------------------------------------------------------- */
+    /*      If we didn't find an overview that helps us, just return        */
+    /*      indicating failure and the full resolution image will be used.  */
+    /* -------------------------------------------------------------------- */
+    if (nBestOverviewLevel < 0)
+        return -1;
+
+    /* -------------------------------------------------------------------- */
+    /*      Recompute the source window in terms of the selected            */
+    /*      overview.                                                       */
+    /* -------------------------------------------------------------------- */
+    const double dfXFactor =
+        nRasterXSize / static_cast<double>(nBestOverviewXSize);
+    const double dfYFactor =
+        nRasterYSize / static_cast<double>(nBestOverviewYSize);
+    CPLDebug("GDAL", "Selecting overview %d x %d", nBestOverviewXSize,
+             nBestOverviewYSize);
+
+    const int nOXOff = std::min(nBestOverviewXSize - 1,
+                                static_cast<int>(nXOff / dfXFactor + 0.5));
+    const int nOYOff = std::min(nBestOverviewYSize - 1,
+                                static_cast<int>(nYOff / dfYFactor + 0.5));
+    int nOXSize = std::max(1, static_cast<int>(nXSize / dfXFactor + 0.5));
+    int nOYSize = std::max(1, static_cast<int>(nYSize / dfYFactor + 0.5));
+    if (nOXOff + nOXSize > nBestOverviewXSize)
+        nOXSize = nBestOverviewXSize - nOXOff;
+    if (nOYOff + nOYSize > nBestOverviewYSize)
+        nOYSize = nBestOverviewYSize - nOYOff;
+
+    if (psExtraArg)
+    {
+        if (psExtraArg->bFloatingPointWindowValidity)
+        {
+            psExtraArg->dfXOff /= dfXFactor;
+            psExtraArg->dfXSize /= dfXFactor;
+            psExtraArg->dfYOff /= dfYFactor;
+            psExtraArg->dfYSize /= dfYFactor;
+        }
+        else if (psExtraArg->eResampleAlg != GRIORA_NearestNeighbour)
+        {
+            psExtraArg->bFloatingPointWindowValidity = true;
+            psExtraArg->dfXOff = nXOff / dfXFactor;
+            psExtraArg->dfXSize = nXSize / dfXFactor;
+            psExtraArg->dfYOff = nYOff / dfYFactor;
+            psExtraArg->dfYSize = nYSize / dfYFactor;
+        }
+    }
+
+    nXOff = nOXOff;
+    nYOff = nOYOff;
+    nXSize = nOXSize;
+    nYSize = nOYSize;
+
+    return nBestOverviewLevel;
+}
+
 /************************************************************************/
 /*                              IRasterIO()                             */
 /************************************************************************/
@@ -2153,6 +2461,30 @@ CPLErr VRTWarpedRasterBand::IRasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff,
         return eErr;
     }
 
+    /* ==================================================================== */
+    /*      Do we have overviews that would be appropriate to satisfy       */
+    /*      this request?                                                   */
+    /* ==================================================================== */
+    if ((nBufXSize < nXSize || nBufYSize < nYSize) && GetOverviewCount() &&
+        eRWFlag == GF_Read)
+    {
+        GDALRasterIOExtraArg sExtraArg;
+        GDALCopyRasterIOExtraArg(&sExtraArg, psExtraArg);
+
+        const int nOverview = GetBestOverviewLevel(
+            nXOff, nYOff, nXSize, nYSize, nBufXSize, nBufYSize, &sExtraArg);
+        if (nOverview >= 0)
+        {
+            auto poOvrBand = GetOverview(nOverview);
+            if (!poOvrBand)
+                return CE_Failure;
+
+            return poOvrBand->RasterIO(eRWFlag, nXOff, nYOff, nXSize, nYSize,
+                                       pData, nBufXSize, nBufYSize, eBufType,
+                                       nPixelSpace, nLineSpace, &sExtraArg);
+        }
+    }
+
     return GDALRasterBand::IRasterIO(eRWFlag, nXOff, nYOff, nXSize, nYSize,
                                      pData, nBufXSize, nBufYSize, eBufType,
                                      nPixelSpace, nLineSpace, psExtraArg);
@@ -2187,10 +2519,15 @@ int VRTWarpedRasterBand::GetOverviewCount()
 
 {
     VRTWarpedDataset *const poWDS = static_cast<VRTWarpedDataset *>(poDS);
+    if (poWDS->m_bIsOverview)
+        return 0;
 
-    poWDS->CreateImplicitOverviews();
+    if (poWDS->m_apoOverviews.empty())
+    {
+        return poWDS->GetOverviewCount();
+    }
 
-    return poWDS->m_nOverviewCount;
+    return static_cast<int>(poWDS->m_apoOverviews.size());
 }
 
 /************************************************************************/
@@ -2202,10 +2539,18 @@ GDALRasterBand *VRTWarpedRasterBand::GetOverview(int iOverview)
 {
     VRTWarpedDataset *const poWDS = static_cast<VRTWarpedDataset *>(poDS);
 
-    if (iOverview < 0 || iOverview >= GetOverviewCount())
+    const int nOvrCount = GetOverviewCount();
+    if (iOverview < 0 || iOverview >= nOvrCount)
         return nullptr;
 
-    return poWDS->m_papoOverviews[iOverview]->GetRasterBand(nBand);
+    if (poWDS->m_apoOverviews.empty())
+        poWDS->m_apoOverviews.resize(nOvrCount);
+    if (!poWDS->m_apoOverviews[iOverview])
+        poWDS->m_apoOverviews[iOverview] =
+            poWDS->CreateImplicitOverview(iOverview);
+    if (!poWDS->m_apoOverviews[iOverview])
+        return nullptr;
+    return poWDS->m_apoOverviews[iOverview]->GetRasterBand(nBand);
 }
 
 /*! @endcond */
diff --git a/frmts/wcs/CMakeLists.txt b/frmts/wcs/CMakeLists.txt
index 15dcc77801c1..b1d0d3275d4e 100644
--- a/frmts/wcs/CMakeLists.txt
+++ b/frmts/wcs/CMakeLists.txt
@@ -20,4 +20,4 @@ if(NOT TARGET gdal_WCS)
 endif()
 
 gdal_standard_includes(gdal_WCS)
-target_include_directories(gdal_WCS PRIVATE ${GDAL_VECTOR_FORMAT_SOURCE_DIR}/gml)
+target_include_directories(gdal_WCS PRIVATE ${GDAL_VECTOR_FORMAT_SOURCE_DIR}/gmlutils)
diff --git a/frmts/wcs/README.md b/frmts/wcs/README.md
new file mode 100644
index 000000000000..2dd8345c6bc1
--- /dev/null
+++ b/frmts/wcs/README.md
@@ -0,0 +1 @@
+WCS Basics and GDAL: http://web.archive.org/web/20240413133419/https://trac.osgeo.org/gdal/wiki/WCS%2Binteroperability
diff --git a/frmts/wcs/gmlcoverage.cpp b/frmts/wcs/gmlcoverage.cpp
index ad3cf63c7a13..815a6510cd95 100644
--- a/frmts/wcs/gmlcoverage.cpp
+++ b/frmts/wcs/gmlcoverage.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2006, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/frmts/wcs/gmlcoverage.h b/frmts/wcs/gmlcoverage.h
index 9469239ae1cd..2c01d73a5e65 100644
--- a/frmts/wcs/gmlcoverage.h
+++ b/frmts/wcs/gmlcoverage.h
@@ -8,23 +8,7 @@
  * Copyright (c) 2006, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 CPLErr WCSParseGMLCoverage(CPLXMLNode *psTree, int *pnXSize, int *pnYSize,
diff --git a/frmts/wcs/wcsdataset.cpp b/frmts/wcs/wcsdataset.cpp
index 009b035fcfd5..86be887f42b0 100644
--- a/frmts/wcs/wcsdataset.cpp
+++ b/frmts/wcs/wcsdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2006, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
@@ -720,7 +704,7 @@ GDALDataset *WCSDataset::GDALOpenResult(CPLHTTPResult *psResult)
 #endif
     // Eventually we should be looking at mime info and stuff to figure
     // out an optimal filename, but for now we just use a fixed one.
-    osResultFilename = CPLString().Printf("/vsimem/wcs/%p/wcsresult.dat", this);
+    osResultFilename = VSIMemGenerateHiddenFilename("wcsresult.dat");
 
     VSILFILE *fp = VSIFileFromMemBuffer(osResultFilename.c_str(), pabyData,
                                         nDataLen, FALSE);
diff --git a/frmts/wcs/wcsdataset.h b/frmts/wcs/wcsdataset.h
index b001d212229c..de0066d08c0d 100644
--- a/frmts/wcs/wcsdataset.h
+++ b/frmts/wcs/wcsdataset.h
@@ -10,23 +10,7 @@
  * Copyright (c) 2017, Ari Jolma
  * Copyright (c) 2017, Finnish Environment Institute
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef WCSDATASET_H_INCLUDED
diff --git a/frmts/wcs/wcsdataset100.cpp b/frmts/wcs/wcsdataset100.cpp
index bab8df830b09..261f17599940 100644
--- a/frmts/wcs/wcsdataset100.cpp
+++ b/frmts/wcs/wcsdataset100.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2017, Ari Jolma
  * Copyright (c) 2017, Finnish Environment Institute
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/frmts/wcs/wcsdataset110.cpp b/frmts/wcs/wcsdataset110.cpp
index d722a2ff9270..ff52f7399702 100644
--- a/frmts/wcs/wcsdataset110.cpp
+++ b/frmts/wcs/wcsdataset110.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2017, Ari Jolma
  * Copyright (c) 2017, Finnish Environment Institute
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/frmts/wcs/wcsdataset201.cpp b/frmts/wcs/wcsdataset201.cpp
index 139c6a66faf5..f0389c1ecef6 100644
--- a/frmts/wcs/wcsdataset201.cpp
+++ b/frmts/wcs/wcsdataset201.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2017, Ari Jolma
  * Copyright (c) 2017, Finnish Environment Institute
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/frmts/wcs/wcsdrivercore.cpp b/frmts/wcs/wcsdrivercore.cpp
index 5e11784d36bf..da44f68b091b 100644
--- a/frmts/wcs/wcsdrivercore.cpp
+++ b/frmts/wcs/wcsdrivercore.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2006, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "wcsdrivercore.h"
diff --git a/frmts/wcs/wcsdrivercore.h b/frmts/wcs/wcsdrivercore.h
index be7649ce0561..5018f2c7408e 100644
--- a/frmts/wcs/wcsdrivercore.h
+++ b/frmts/wcs/wcsdrivercore.h
@@ -8,23 +8,7 @@
  * Copyright (c) 2006, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef WCSDRIVERCORE_H
diff --git a/frmts/wcs/wcsrasterband.cpp b/frmts/wcs/wcsrasterband.cpp
index df6d2197edc5..5423a928df7e 100644
--- a/frmts/wcs/wcsrasterband.cpp
+++ b/frmts/wcs/wcsrasterband.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2006, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_http.h"
diff --git a/frmts/wcs/wcsrasterband.h b/frmts/wcs/wcsrasterband.h
index 6312ab10b1e7..eb31b8d435de 100644
--- a/frmts/wcs/wcsrasterband.h
+++ b/frmts/wcs/wcsrasterband.h
@@ -8,23 +8,7 @@
  * Copyright (c) 2006, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef WCSRASTERBAND_H_INCLUDED
diff --git a/frmts/wcs/wcsutils.cpp b/frmts/wcs/wcsutils.cpp
index 517e7da53846..912e7c3ef78c 100644
--- a/frmts/wcs/wcsutils.cpp
+++ b/frmts/wcs/wcsutils.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2017, Ari Jolma
  * Copyright (c) 2017, Finnish Environment Institute
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_spatialref.h"
diff --git a/frmts/wcs/wcsutils.h b/frmts/wcs/wcsutils.h
index ab667780bb65..a7029f37da00 100644
--- a/frmts/wcs/wcsutils.h
+++ b/frmts/wcs/wcsutils.h
@@ -10,23 +10,7 @@
  * Copyright (c) 2017, Ari Jolma
  * Copyright (c) 2017, Finnish Environment Institute
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef WCSUTILS_H_INCLUDED
diff --git a/frmts/webp/webp_headers.h b/frmts/webp/webp_headers.h
index 5ad4b8be9ae3..cb8a8503d340 100644
--- a/frmts/webp/webp_headers.h
+++ b/frmts/webp/webp_headers.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef GDAL_LIBWEBP_HEADERS_H
diff --git a/frmts/webp/webpdataset.cpp b/frmts/webp/webpdataset.cpp
index 203a1e1b3da2..56516a8e812a 100644
--- a/frmts/webp/webpdataset.cpp
+++ b/frmts/webp/webpdataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
@@ -263,6 +247,7 @@ char **WEBPDataset::GetMetadata(const char *pszDomain)
                 char *apszMDList[2] = {pszXMP, nullptr};
                 SetMetadata(apszMDList, "xml:XMP");
 
+                // cppcheck-suppress redundantAssignment
                 nPamFlags = nOldPamFlags;
 
                 VSIFree(pszXMP);
diff --git a/frmts/webp/webpdrivercore.cpp b/frmts/webp/webpdrivercore.cpp
index 7f3c3774e9b8..1f56cb8ef035 100644
--- a/frmts/webp/webpdrivercore.cpp
+++ b/frmts/webp/webpdrivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "webp_headers.h"
diff --git a/frmts/webp/webpdrivercore.h b/frmts/webp/webpdrivercore.h
index 9eff2a6f5f81..22d49abc0fa1 100644
--- a/frmts/webp/webpdrivercore.h
+++ b/frmts/webp/webpdrivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef WEBPDRIVERCORE_H
diff --git a/frmts/wms/gdalhttp.cpp b/frmts/wms/gdalhttp.cpp
index 47d929a32693..8d8b3c35e43f 100644
--- a/frmts/wms/gdalhttp.cpp
+++ b/frmts/wms/gdalhttp.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.com>
  * Copyright (c) 2016, Lucian Plesea
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "wmsdriver.h"
diff --git a/frmts/wms/gdalhttp.h b/frmts/wms/gdalhttp.h
index 9aa573e57ae1..254fcfcf75bc 100644
--- a/frmts/wms/gdalhttp.h
+++ b/frmts/wms/gdalhttp.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Adam Nowacki
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDALHTTP_H
diff --git a/frmts/wms/gdalwmscache.cpp b/frmts/wms/gdalwmscache.cpp
index 91665bee17a9..f9b7bcedc3e2 100644
--- a/frmts/wms/gdalwmscache.cpp
+++ b/frmts/wms/gdalwmscache.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2017, Dmitry Baryshnikov, <polimax@mail.ru>
  * Copyright (c) 2017, NextGIS, <info@nextgis.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_md5.h"
diff --git a/frmts/wms/gdalwmsdataset.cpp b/frmts/wms/gdalwmsdataset.cpp
index fa979676be94..077bcf02bc6f 100644
--- a/frmts/wms/gdalwmsdataset.cpp
+++ b/frmts/wms/gdalwmsdataset.cpp
@@ -11,23 +11,7 @@
  * Copyright (c) 2017, Dmitry Baryshnikov, <polimax@mail.ru>
  * Copyright (c) 2017, NextGIS, <info@nextgis.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************
  *
  * dataset.cpp:
diff --git a/frmts/wms/gdalwmsrasterband.cpp b/frmts/wms/gdalwmsrasterband.cpp
index 0b42011e0453..dfa58f6b3430 100644
--- a/frmts/wms/gdalwmsrasterband.cpp
+++ b/frmts/wms/gdalwmsrasterband.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2017, Dmitry Baryshnikov, <polimax@mail.ru>
  * Copyright (c) 2017, NextGIS, <info@nextgis.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "wmsdriver.h"
diff --git a/frmts/wms/minidriver.cpp b/frmts/wms/minidriver.cpp
index 609e9d1cde88..4321be063a44 100644
--- a/frmts/wms/minidriver.cpp
+++ b/frmts/wms/minidriver.cpp
@@ -13,23 +13,7 @@
  *possible types of WMS minidrivers.  Minidriver object factories get registered
  *in wmsdriver.cpp, during the WMS driver registration with GDAL
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "wmsdriver.h"
diff --git a/frmts/wms/minidriver_arcgis_server.cpp b/frmts/wms/minidriver_arcgis_server.cpp
index 7d8fc8bbbd98..56c606c48cbb 100644
--- a/frmts/wms/minidriver_arcgis_server.cpp
+++ b/frmts/wms/minidriver_arcgis_server.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2014-2020, NextGIS <info@nextgis.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "wmsdriver.h"
@@ -84,8 +68,8 @@ CPLErr WMSMiniDriver_AGS::Initialize(CPLXMLNode *config,
 
     m_image_format = CPLGetXMLValue(config, "ImageFormat", "png");
     m_time_range = CPLGetXMLValue(config, "TimeRange", "");
-    m_transparent = CPLGetXMLValue(config, "Transparent", "");
-    m_transparent.tolower();
+    m_transparent =
+        CPLString(CPLGetXMLValue(config, "Transparent", "")).tolower();
     m_layers = CPLGetXMLValue(config, "Layers", "");
 
     const char *irs = CPLGetXMLValue(config, "SRS", "102100");
diff --git a/frmts/wms/minidriver_arcgis_server.h b/frmts/wms/minidriver_arcgis_server.h
index 8c30354568c1..e093e2fab59a 100644
--- a/frmts/wms/minidriver_arcgis_server.h
+++ b/frmts/wms/minidriver_arcgis_server.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2014-2015, NextGIS <info@nextgis.ru>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef MINIDRIVER_AGS_H_INCLUDED
diff --git a/frmts/wms/minidriver_iip.cpp b/frmts/wms/minidriver_iip.cpp
index 994f2508da45..a62a49c23779 100644
--- a/frmts/wms/minidriver_iip.cpp
+++ b/frmts/wms/minidriver_iip.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "wmsdriver.h"
diff --git a/frmts/wms/minidriver_iip.h b/frmts/wms/minidriver_iip.h
index 610fb77b8c28..a9af3a7fe710 100644
--- a/frmts/wms/minidriver_iip.h
+++ b/frmts/wms/minidriver_iip.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef MINIDRIVER_IIP_H_INCLUDED
diff --git a/frmts/wms/minidriver_mrf.cpp b/frmts/wms/minidriver_mrf.cpp
index 6200e9478f01..f66e4e4926ea 100644
--- a/frmts/wms/minidriver_mrf.cpp
+++ b/frmts/wms/minidriver_mrf.cpp
@@ -160,7 +160,7 @@ void *SectorCache::data(size_t address)
     // If this is the last sector, it could be a new sector with invalid data,
     // so we remove it Otherwise, the previous content is still good
     if (target == &store.back())
-        store.resize(store.size() - 1);
+        store.pop_back();
     // Signal invalid request
     return nullptr;
 }
diff --git a/frmts/wms/minidriver_mrf.h b/frmts/wms/minidriver_mrf.h
index de27fbbbf4fb..42e362d9c03b 100644
--- a/frmts/wms/minidriver_mrf.h
+++ b/frmts/wms/minidriver_mrf.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Lucian Plesea
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef MINIDRIVER_MRF_H_INCLUDED
diff --git a/frmts/wms/minidriver_ogcapicoverage.cpp b/frmts/wms/minidriver_ogcapicoverage.cpp
index 0f54d8299d05..0d76b054e9f4 100644
--- a/frmts/wms/minidriver_ogcapicoverage.cpp
+++ b/frmts/wms/minidriver_ogcapicoverage.cpp
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2020, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "wmsdriver.h"
@@ -61,16 +45,16 @@ CPLErr WMSMiniDriver_OGCAPICoverage::TiledImageRequest(
 
     URLSearchAndReplace(&url, "${width}", "%d", iri.m_sx);
     URLSearchAndReplace(&url, "${height}", "%d", iri.m_sy);
-    URLSearchAndReplace(&url, "${minx}", "%.18g", iri.m_x0);
-    URLSearchAndReplace(&url, "${miny}", "%.18g", iri.m_y1);
-    URLSearchAndReplace(&url, "${maxx}", "%.18g", iri.m_x1);
-    URLSearchAndReplace(&url, "${maxy}", "%.18g", iri.m_y0);
-    /*URLSearchAndReplace(&url, "${minx_centerpixel}", "%.18g", iri.m_x0 + 0.5 *
+    URLSearchAndReplace(&url, "${minx}", "%.17g", iri.m_x0);
+    URLSearchAndReplace(&url, "${miny}", "%.17g", iri.m_y1);
+    URLSearchAndReplace(&url, "${maxx}", "%.17g", iri.m_x1);
+    URLSearchAndReplace(&url, "${maxy}", "%.17g", iri.m_y0);
+    /*URLSearchAndReplace(&url, "${minx_centerpixel}", "%.17g", iri.m_x0 + 0.5 *
     (iri.m_x1 - iri.m_x0) / iri.m_sx); URLSearchAndReplace(&url,
-    "${miny_centerpixel}", "%.18g", iri.m_y1 - 0.5 * (iri.m_y1 - iri.m_y0) /
-    iri.m_sy); URLSearchAndReplace(&url, "${maxx_centerpixel}", "%.18g",
+    "${miny_centerpixel}", "%.17g", iri.m_y1 - 0.5 * (iri.m_y1 - iri.m_y0) /
+    iri.m_sy); URLSearchAndReplace(&url, "${maxx_centerpixel}", "%.17g",
     iri.m_x1 - 0.5 * (iri.m_x1 - iri.m_x0) / iri.m_sx);
-    URLSearchAndReplace(&url, "${maxy_centerpixel}", "%.18g", iri.m_y0 + 0.5 *
+    URLSearchAndReplace(&url, "${maxy_centerpixel}", "%.17g", iri.m_y0 + 0.5 *
     (iri.m_y1 - iri.m_y0) / iri.m_sy);*/
 
     return CE_None;
diff --git a/frmts/wms/minidriver_ogcapicoverage.h b/frmts/wms/minidriver_ogcapicoverage.h
index f54ad3bb0479..0fc9832c995e 100644
--- a/frmts/wms/minidriver_ogcapicoverage.h
+++ b/frmts/wms/minidriver_ogcapicoverage.h
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2020, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef MINIDRIVER_OGCAPICOVERAGE_H_INCLUDED
diff --git a/frmts/wms/minidriver_ogcapimaps.cpp b/frmts/wms/minidriver_ogcapimaps.cpp
index 02710be25b5d..6f4e6fc7ef38 100644
--- a/frmts/wms/minidriver_ogcapimaps.cpp
+++ b/frmts/wms/minidriver_ogcapimaps.cpp
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2020, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "wmsdriver.h"
@@ -60,7 +44,7 @@ CPLErr WMSMiniDriver_OGCAPIMaps::TiledImageRequest(
 
     URLPrepare(url);
     url +=
-        CPLOPrintf("width=%d&height=%d&bbox=%.18g,%.18g,%.18g,%.18g", iri.m_sx,
+        CPLOPrintf("width=%d&height=%d&bbox=%.17g,%.17g,%.17g,%.17g", iri.m_sx,
                    iri.m_sy, iri.m_x0, iri.m_y1, iri.m_x1, iri.m_y0);
 
     return CE_None;
diff --git a/frmts/wms/minidriver_ogcapimaps.h b/frmts/wms/minidriver_ogcapimaps.h
index eb171f140e72..e72734b2930d 100644
--- a/frmts/wms/minidriver_ogcapimaps.h
+++ b/frmts/wms/minidriver_ogcapimaps.h
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2020, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef MINIDRIVER_OGCAPIMAPS_H_INCLUDED
diff --git a/frmts/wms/minidriver_tiled_wms.cpp b/frmts/wms/minidriver_tiled_wms.cpp
index f15674fb8467..c93b6adf430d 100644
--- a/frmts/wms/minidriver_tiled_wms.cpp
+++ b/frmts/wms/minidriver_tiled_wms.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2007, Adam Nowacki
  * Copyright (c) 2011-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 //
diff --git a/frmts/wms/minidriver_tiled_wms.h b/frmts/wms/minidriver_tiled_wms.h
index 5e7a30748b0e..4497a5d5e02b 100644
--- a/frmts/wms/minidriver_tiled_wms.h
+++ b/frmts/wms/minidriver_tiled_wms.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Adam Nowacki
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef MINIDRIVER_TILED_WMS_H_INCLUDED
diff --git a/frmts/wms/minidriver_tileservice.cpp b/frmts/wms/minidriver_tileservice.cpp
index 1f4b00070233..6cae4be28c20 100644
--- a/frmts/wms/minidriver_tileservice.cpp
+++ b/frmts/wms/minidriver_tileservice.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Adam Nowacki
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "wmsdriver.h"
diff --git a/frmts/wms/minidriver_tileservice.h b/frmts/wms/minidriver_tileservice.h
index e662c9990beb..8cc95c98bdaa 100644
--- a/frmts/wms/minidriver_tileservice.h
+++ b/frmts/wms/minidriver_tileservice.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Adam Nowacki
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef MINIDRIVER_TILESERVICE_H_INCLUDED
diff --git a/frmts/wms/minidriver_tms.cpp b/frmts/wms/minidriver_tms.cpp
index 9af51af46135..b1618ddb26eb 100644
--- a/frmts/wms/minidriver_tms.cpp
+++ b/frmts/wms/minidriver_tms.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Chris Schmidt
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "wmsdriver.h"
diff --git a/frmts/wms/minidriver_tms.h b/frmts/wms/minidriver_tms.h
index 255fadb50dbd..ab3fd9c9e897 100644
--- a/frmts/wms/minidriver_tms.h
+++ b/frmts/wms/minidriver_tms.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Chris Schmidt
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef MINIDRIVER_TMS_H_INCLUDED
diff --git a/frmts/wms/minidriver_virtualearth.cpp b/frmts/wms/minidriver_virtualearth.cpp
index 038eb3b9ee06..b89fa898c146 100644
--- a/frmts/wms/minidriver_virtualearth.cpp
+++ b/frmts/wms/minidriver_virtualearth.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "wmsdriver.h"
diff --git a/frmts/wms/minidriver_virtualearth.h b/frmts/wms/minidriver_virtualearth.h
index 114b49d4a00c..03775de7ff66 100644
--- a/frmts/wms/minidriver_virtualearth.h
+++ b/frmts/wms/minidriver_virtualearth.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef MINIDRIVER_VE_H_INCLUDED
diff --git a/frmts/wms/minidriver_wms.cpp b/frmts/wms/minidriver_wms.cpp
index 4d2bba5e2b91..ec9057a8a930 100644
--- a/frmts/wms/minidriver_wms.cpp
+++ b/frmts/wms/minidriver_wms.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2007, Adam Nowacki
  * Copyright (c) 2007-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "wmsdriver.h"
diff --git a/frmts/wms/minidriver_wms.h b/frmts/wms/minidriver_wms.h
index ad5520f12fb7..927c5748c8df 100644
--- a/frmts/wms/minidriver_wms.h
+++ b/frmts/wms/minidriver_wms.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Adam Nowacki
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef MINIDRIVER_WMS_H_INCLUDED
diff --git a/frmts/wms/minidriver_worldwind.cpp b/frmts/wms/minidriver_worldwind.cpp
index 2e9d73e63d58..09cb22cbc05f 100644
--- a/frmts/wms/minidriver_worldwind.cpp
+++ b/frmts/wms/minidriver_worldwind.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Adam Nowacki
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "wmsdriver.h"
diff --git a/frmts/wms/minidriver_worldwind.h b/frmts/wms/minidriver_worldwind.h
index 3d3d5a51150c..11643d082176 100644
--- a/frmts/wms/minidriver_worldwind.h
+++ b/frmts/wms/minidriver_worldwind.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Adam Nowacki
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef MINIDRIVER_WORLDWIND_H_INCLUDED
diff --git a/frmts/wms/wmsdriver.cpp b/frmts/wms/wmsdriver.cpp
index 6dd0f93965dc..2ac5e72f9fb3 100644
--- a/frmts/wms/wmsdriver.cpp
+++ b/frmts/wms/wmsdriver.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2007, Adam Nowacki
  * Copyright (c) 2009-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_frmts.h"
@@ -66,7 +50,7 @@ static CPLXMLNode *GDALWMSDatasetGetConfigFromURL(GDALOpenInfo *poOpenInfo)
 {
     const char *pszBaseURL = poOpenInfo->pszFilename;
     if (STARTS_WITH_CI(pszBaseURL, "WMS:"))
-        pszBaseURL += 4;
+        pszBaseURL += strlen("WMS:");
 
     const CPLString osLayer = CPLURLGetValue(pszBaseURL, "LAYERS");
     CPLString osVersion = CPLURLGetValue(pszBaseURL, "VERSION");
@@ -118,7 +102,7 @@ static CPLXMLNode *GDALWMSDatasetGetConfigFromURL(GDALOpenInfo *poOpenInfo)
     osBaseURL = CPLURLAddKVP(osBaseURL, "BBOXORDER", nullptr);
 
     if (!osBaseURL.empty() && osBaseURL.back() == '&')
-        osBaseURL.resize(osBaseURL.size() - 1);
+        osBaseURL.pop_back();
 
     if (osVersion.empty())
         osVersion = "1.1.1";
@@ -771,7 +755,11 @@ GDALDataset *GDALWMSDataset::Open(GDALOpenInfo *poOpenInfo)
 
     else if (poOpenInfo->nHeaderBytes == 0 &&
              (STARTS_WITH_CI(pszFilename, "WMS:") ||
-              CPLString(pszFilename).ifind("SERVICE=WMS") != std::string::npos))
+              CPLString(pszFilename).ifind("SERVICE=WMS") !=
+                  std::string::npos ||
+              (poOpenInfo->IsSingleAllowedDriver("WMS") &&
+               (STARTS_WITH(poOpenInfo->pszFilename, "http://") ||
+                STARTS_WITH(poOpenInfo->pszFilename, "https://")))))
     {
         CPLString osLayers = CPLURLGetValue(pszFilename, "LAYERS");
         CPLString osRequest = CPLURLGetValue(pszFilename, "REQUEST");
diff --git a/frmts/wms/wmsdriver.h b/frmts/wms/wmsdriver.h
index a76de066224f..71c7344a140d 100644
--- a/frmts/wms/wmsdriver.h
+++ b/frmts/wms/wmsdriver.h
@@ -12,23 +12,7 @@
  * Copyright (c) 2017, Dmitry Baryshnikov, <polimax@mail.ru>
  * Copyright (c) 2017, NextGIS, <info@nextgis.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef WMSDRIVER_H_INCLUDED
diff --git a/frmts/wms/wmsdrivercore.cpp b/frmts/wms/wmsdrivercore.cpp
index 72a4c5090c5a..c91176683b51 100644
--- a/frmts/wms/wmsdrivercore.cpp
+++ b/frmts/wms/wmsdrivercore.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2007, Adam Nowacki
  * Copyright (c) 2009-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "wmsdrivercore.h"
@@ -55,6 +39,13 @@ int WMSDriverIdentify(GDALOpenInfo *poOpenInfo)
     {
         return TRUE;
     }
+    else if (poOpenInfo->nHeaderBytes == 0 &&
+             poOpenInfo->IsSingleAllowedDriver("WMS") &&
+             (STARTS_WITH(poOpenInfo->pszFilename, "http://") ||
+              STARTS_WITH(poOpenInfo->pszFilename, "https://")))
+    {
+        return true;
+    }
     else if (poOpenInfo->nHeaderBytes != 0 &&
              (strstr(pabyHeader, "<WMT_MS_Capabilities") != nullptr ||
               strstr(pabyHeader, "<WMS_Capabilities") != nullptr ||
diff --git a/frmts/wms/wmsdrivercore.h b/frmts/wms/wmsdrivercore.h
index 01f9e56792f0..5bab676babfd 100644
--- a/frmts/wms/wmsdrivercore.h
+++ b/frmts/wms/wmsdrivercore.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2007, Adam Nowacki
  * Copyright (c) 2009-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef WMSDRIVERCORE_H
diff --git a/frmts/wms/wmsmetadataset.cpp b/frmts/wms/wmsmetadataset.cpp
index 58f358f53871..8ca083a01bec 100644
--- a/frmts/wms/wmsmetadataset.cpp
+++ b/frmts/wms/wmsmetadataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "wmsmetadataset.h"
@@ -380,10 +364,34 @@ void GDALWMSMetaDataset::ExploreLayer(CPLXMLNode *psXML,
     const char *pszMaxXLocal = nullptr;
     const char *pszMaxYLocal = nullptr;
 
-    const char *pszSRSTagName =
-        VersionStringToInt(osVersion.c_str()) >= VersionStringToInt("1.3.0")
-            ? "CRS"
-            : "SRS";
+    const bool bIsWMS130 =
+        VersionStringToInt(osVersion.c_str()) >= VersionStringToInt("1.3.0");
+
+    const auto GetCRS = [bIsWMS130](const CPLXMLNode *psNode)
+    {
+        const char *pszVal =
+            CPLGetXMLValue(psNode, bIsWMS130 ? "CRS" : "SRS", nullptr);
+        if (!pszVal && !bIsWMS130)
+        {
+            // Some WMS servers have a non-conformant WMS 1.1.1 implementation
+            // that use "CRS" instead of "SRS"
+            // like https://mapy.geoportal.gov.pl/wss/service/PZGIK/BDOO/WMS/aktualne?service=wms&request=getcapabilities
+            pszVal = CPLGetXMLValue(psNode, "CRS", nullptr);
+            if (pszVal)
+            {
+                static bool bWarned = false;
+                if (!bWarned)
+                {
+                    bWarned = true;
+                    CPLError(CE_Warning, CPLE_AppDefined,
+                             "WMS server uses non-standard CRS attribute for "
+                             "WMS 1.1.0. Things might mis-behave. Perhaps try "
+                             "using VERSION=1.3.0");
+                }
+            }
+        }
+        return pszVal;
+    };
 
     /* Use local bounding box if available, otherwise use the one */
     /* that comes from an upper layer */
@@ -395,7 +403,7 @@ void GDALWMSMetaDataset::ExploreLayer(CPLXMLNode *psXML,
             strcmp(psIter->pszValue, "BoundingBox") == 0)
         {
             psSRS = psIter;
-            pszSRSLocal = CPLGetXMLValue(psSRS, pszSRSTagName, nullptr);
+            pszSRSLocal = GetCRS(psSRS);
             if (osPreferredSRS.empty() || pszSRSLocal == nullptr)
                 break;
             if (EQUAL(osPreferredSRS, pszSRSLocal))
@@ -409,7 +417,7 @@ void GDALWMSMetaDataset::ExploreLayer(CPLXMLNode *psXML,
     if (psSRS == nullptr)
     {
         psSRS = CPLGetXMLNode(psXML, "LatLonBoundingBox");
-        pszSRSLocal = CPLGetXMLValue(psXML, pszSRSTagName, nullptr);
+        pszSRSLocal = GetCRS(psSRS);
         if (pszSRSLocal == nullptr)
             pszSRSLocal = "EPSG:4326";
     }
diff --git a/frmts/wms/wmsmetadataset.h b/frmts/wms/wmsmetadataset.h
index de306f3c9e30..1b5d55392316 100644
--- a/frmts/wms/wmsmetadataset.h
+++ b/frmts/wms/wmsmetadataset.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef WMS_METADATASET_H_INCLUDED
diff --git a/frmts/wms/wmsutils.cpp b/frmts/wms/wmsutils.cpp
index 75ddddc6598a..1b57e7557928 100644
--- a/frmts/wms/wmsutils.cpp
+++ b/frmts/wms/wmsutils.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Adam Nowacki
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "wmsdriver.h"
@@ -70,9 +54,7 @@ void URLPrepare(CPLString &url)
 
 CPLString BufferToVSIFile(GByte *buffer, size_t size)
 {
-    CPLString file_name;
-
-    file_name.Printf("/vsimem/wms/%p/wmsresult.dat", buffer);
+    const CPLString file_name(VSIMemGenerateHiddenFilename("wmsresult.dat"));
     VSILFILE *f = VSIFileFromMemBuffer(file_name.c_str(), buffer, size, false);
     if (f == nullptr)
         return CPLString();
diff --git a/frmts/wmts/wmtsdataset.cpp b/frmts/wmts/wmtsdataset.cpp
index da70c514e316..09affe85072b 100644
--- a/frmts/wmts/wmtsdataset.cpp
+++ b/frmts/wmts/wmtsdataset.cpp
@@ -8,23 +8,7 @@
  **********************************************************************
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_http.h"
@@ -78,6 +62,16 @@ class WMTSTileMatrix
     int nTileHeight;
     int nMatrixWidth;
     int nMatrixHeight;
+
+    OGREnvelope GetExtent() const
+    {
+        OGREnvelope sExtent;
+        sExtent.MinX = dfTLX;
+        sExtent.MaxX = dfTLX + nMatrixWidth * dfPixelSize * nTileWidth;
+        sExtent.MaxY = dfTLY;
+        sExtent.MinY = dfTLY - nMatrixHeight * dfPixelSize * nTileHeight;
+        return sExtent;
+    }
 };
 
 /************************************************************************/
@@ -94,6 +88,18 @@ class WMTSTileMatrixLimits
     int nMaxTileRow;
     int nMinTileCol;
     int nMaxTileCol;
+
+    OGREnvelope GetExtent(const WMTSTileMatrix &oTM) const
+    {
+        OGREnvelope sExtent;
+        const double dfTileWidthUnits = oTM.dfPixelSize * oTM.nTileWidth;
+        const double dfTileHeightUnits = oTM.dfPixelSize * oTM.nTileHeight;
+        sExtent.MinX = oTM.dfTLX + nMinTileCol * dfTileWidthUnits;
+        sExtent.MaxY = oTM.dfTLY - nMinTileRow * dfTileHeightUnits;
+        sExtent.MaxX = oTM.dfTLX + (nMaxTileCol + 1) * dfTileWidthUnits;
+        sExtent.MinY = oTM.dfTLY - (nMaxTileRow + 1) * dfTileHeightUnits;
+        return sExtent;
+    }
 };
 
 /************************************************************************/
@@ -133,7 +139,7 @@ class WMTSDataset final : public GDALPamDataset
     CPLString osURLFeatureInfoTemplate;
     WMTSTileMatrixSet oTMS;
 
-    char **papszHTTPOptions;
+    CPLStringList m_aosHTTPOptions{};
 
     std::vector<GDALDataset *> apoDatasets;
     OGRSpatialReference m_oSRS{};
@@ -142,9 +148,9 @@ class WMTSDataset final : public GDALPamDataset
     CPLString osLastGetFeatureInfoURL;
     CPLString osMetadataItemGetFeatureInfo;
 
-    static char **BuildHTTPRequestOpts(CPLString osOtherXML);
+    static CPLStringList BuildHTTPRequestOpts(CPLString osOtherXML);
     static CPLXMLNode *GetCapabilitiesResponse(const CPLString &osFilename,
-                                               char **papszHTTPOptions);
+                                               CSLConstList papszHTTPOptions);
     static CPLString FixCRSName(const char *pszCRS);
     static CPLString Replace(const CPLString &osStr, const char *pszOld,
                              const char *pszNew);
@@ -371,7 +377,7 @@ const char *WMTSBand::GetMetadataItem(const char *pszName,
             poGDS->osMetadataItemGetFeatureInfo = "";
             char *pszRes = nullptr;
             CPLHTTPResult *psResult =
-                CPLHTTPFetch(osURL, poGDS->papszHTTPOptions);
+                CPLHTTPFetch(osURL, poGDS->m_aosHTTPOptions.List());
             if (psResult && psResult->nStatus == 0 && psResult->pabyData)
                 pszRes = CPLStrdup((const char *)psResult->pabyData);
             CPLHTTPDestroyResult(psResult);
@@ -422,7 +428,7 @@ const char *WMTSBand::GetMetadataItem(const char *pszName,
 /*                          WMTSDataset()                               */
 /************************************************************************/
 
-WMTSDataset::WMTSDataset() : papszHTTPOptions(nullptr)
+WMTSDataset::WMTSDataset()
 {
     m_oSRS.SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
     adfGT[0] = 0;
@@ -440,7 +446,6 @@ WMTSDataset::WMTSDataset() : papszHTTPOptions(nullptr)
 WMTSDataset::~WMTSDataset()
 {
     WMTSDataset::CloseDependentDatasets();
-    CSLDestroy(papszHTTPOptions);
 }
 
 /************************************************************************/
@@ -583,7 +588,7 @@ CPLString WMTSDataset::FixCRSName(const char *pszCRS)
     while (osRet.size() && (osRet.back() == ' ' || osRet.back() == '\r' ||
                             osRet.back() == '\n'))
     {
-        osRet.resize(osRet.size() - 1);
+        osRet.pop_back();
     }
     return osRet;
 }
@@ -883,7 +888,7 @@ CPLString WMTSDataset::Replace(const CPLString &osStr, const char *pszOld,
 /************************************************************************/
 
 CPLXMLNode *WMTSDataset::GetCapabilitiesResponse(const CPLString &osFilename,
-                                                 char **papszHTTPOptions)
+                                                 CSLConstList papszHTTPOptions)
 {
     CPLXMLNode *psXML;
     VSIStatBufL sStat;
@@ -965,42 +970,34 @@ CPLString WMTSDataset::GetOperationKVPURL(CPLXMLNode *psXML,
 /*                           BuildHTTPRequestOpts()                     */
 /************************************************************************/
 
-char **WMTSDataset::BuildHTTPRequestOpts(CPLString osOtherXML)
+CPLStringList WMTSDataset::BuildHTTPRequestOpts(CPLString osOtherXML)
 {
     osOtherXML = "<Root>" + osOtherXML + "</Root>";
     CPLXMLNode *psXML = CPLParseXMLString(osOtherXML);
-    char **http_request_opts = nullptr;
+    CPLStringList opts;
     if (CPLGetXMLValue(psXML, "Timeout", nullptr))
     {
-        CPLString optstr;
-        optstr.Printf("TIMEOUT=%s", CPLGetXMLValue(psXML, "Timeout", nullptr));
-        http_request_opts = CSLAddString(http_request_opts, optstr.c_str());
+        opts.SetNameValue("TIMEOUT", CPLGetXMLValue(psXML, "Timeout", nullptr));
     }
     if (CPLGetXMLValue(psXML, "UserAgent", nullptr))
     {
-        CPLString optstr;
-        optstr.Printf("USERAGENT=%s",
-                      CPLGetXMLValue(psXML, "UserAgent", nullptr));
-        http_request_opts = CSLAddString(http_request_opts, optstr.c_str());
+        opts.SetNameValue("USERAGENT",
+                          CPLGetXMLValue(psXML, "UserAgent", nullptr));
     }
     if (CPLGetXMLValue(psXML, "Referer", nullptr))
     {
-        CPLString optstr;
-        optstr.Printf("REFERER=%s", CPLGetXMLValue(psXML, "Referer", nullptr));
-        http_request_opts = CSLAddString(http_request_opts, optstr.c_str());
+        opts.SetNameValue("REFERER", CPLGetXMLValue(psXML, "Referer", nullptr));
     }
     if (CPLTestBool(CPLGetXMLValue(psXML, "UnsafeSSL", "false")))
     {
-        http_request_opts = CSLAddString(http_request_opts, "UNSAFESSL=1");
+        opts.SetNameValue("UNSAFESSL", "1");
     }
     if (CPLGetXMLValue(psXML, "UserPwd", nullptr))
     {
-        CPLString optstr;
-        optstr.Printf("USERPWD=%s", CPLGetXMLValue(psXML, "UserPwd", nullptr));
-        http_request_opts = CSLAddString(http_request_opts, optstr.c_str());
+        opts.SetNameValue("USERPWD", CPLGetXMLValue(psXML, "UserPwd", nullptr));
     }
     CPLDestroyXMLNode(psXML);
-    return http_request_opts;
+    return opts;
 }
 
 /************************************************************************/
@@ -1074,9 +1071,17 @@ GDALDataset *WMTSDataset::Open(GDALOpenInfo *poOpenInfo)
         }
         CSLDestroy(papszTokens);
 
-        char **papszHTTPOptions = BuildHTTPRequestOpts(osOtherXML);
-        psXML = GetCapabilitiesResponse(osGetCapabilitiesURL, papszHTTPOptions);
-        CSLDestroy(papszHTTPOptions);
+        const CPLStringList aosHTTPOptions(BuildHTTPRequestOpts(osOtherXML));
+        psXML = GetCapabilitiesResponse(osGetCapabilitiesURL,
+                                        aosHTTPOptions.List());
+    }
+    else if (poOpenInfo->IsSingleAllowedDriver("WMTS") &&
+             (STARTS_WITH(poOpenInfo->pszFilename, "http://") ||
+              STARTS_WITH(poOpenInfo->pszFilename, "https://")))
+    {
+        const CPLStringList aosHTTPOptions(BuildHTTPRequestOpts(osOtherXML));
+        psXML = GetCapabilitiesResponse(poOpenInfo->pszFilename,
+                                        aosHTTPOptions.List());
     }
 
     int bHasAOI = FALSE;
@@ -1179,11 +1184,13 @@ GDALDataset *WMTSDataset::Open(GDALOpenInfo *poOpenInfo)
         CPLDestroyXMLNode(psGDALWMTS);
 
         CPLDestroyXMLNode(psXML);
-        char **papszHTTPOptions = BuildHTTPRequestOpts(osOtherXML);
-        psXML = GetCapabilitiesResponse(osGetCapabilitiesURL, papszHTTPOptions);
-        CSLDestroy(papszHTTPOptions);
+        const CPLStringList aosHTTPOptions(BuildHTTPRequestOpts(osOtherXML));
+        psXML = GetCapabilitiesResponse(osGetCapabilitiesURL,
+                                        aosHTTPOptions.List());
     }
-    else if (!STARTS_WITH_CI(poOpenInfo->pszFilename, "WMTS:"))
+    else if (!STARTS_WITH_CI(poOpenInfo->pszFilename, "WMTS:") &&
+             !STARTS_WITH(poOpenInfo->pszFilename, "http://") &&
+             !STARTS_WITH(poOpenInfo->pszFilename, "https://"))
     {
         osGetCapabilitiesURL = poOpenInfo->pszFilename;
         psXML = CPLParseXMLFile(poOpenInfo->pszFilename);
@@ -1203,20 +1210,21 @@ GDALDataset *WMTSDataset::Open(GDALOpenInfo *poOpenInfo)
 
     if (STARTS_WITH(osGetCapabilitiesURL, "/vsimem/"))
     {
-        const char *pszHref = CPLGetXMLValue(
-            psXML, "=Capabilities.ServiceMetadataURL.href", nullptr);
-        if (pszHref)
-            osGetCapabilitiesURL = pszHref;
+        osGetCapabilitiesURL = GetOperationKVPURL(psXML, "GetCapabilities");
+        if (osGetCapabilitiesURL.empty())
+        {
+            // (ERO) I'm not even sure this is correct at all...
+            const char *pszHref = CPLGetXMLValue(
+                psXML, "=Capabilities.ServiceMetadataURL.href", nullptr);
+            if (pszHref)
+                osGetCapabilitiesURL = pszHref;
+        }
         else
         {
-            osGetCapabilitiesURL = GetOperationKVPURL(psXML, "GetCapabilities");
-            if (!osGetCapabilitiesURL.empty())
-            {
-                osGetCapabilitiesURL =
-                    CPLURLAddKVP(osGetCapabilitiesURL, "service", "WMTS");
-                osGetCapabilitiesURL = CPLURLAddKVP(
-                    osGetCapabilitiesURL, "request", "GetCapabilities");
-            }
+            osGetCapabilitiesURL =
+                CPLURLAddKVP(osGetCapabilitiesURL, "service", "WMTS");
+            osGetCapabilitiesURL = CPLURLAddKVP(osGetCapabilitiesURL, "request",
+                                                "GetCapabilities");
         }
     }
     CPLString osCapabilitiesFilename(osGetCapabilitiesURL);
@@ -1554,7 +1562,7 @@ GDALDataset *WMTSDataset::Open(GDALOpenInfo *poOpenInfo)
         if (!osSelectLayerAbstract.empty())
             poDS->SetMetadataItem("ABSTRACT", osSelectLayerAbstract);
 
-        poDS->papszHTTPOptions = BuildHTTPRequestOpts(osOtherXML);
+        poDS->m_aosHTTPOptions = BuildHTTPRequestOpts(osOtherXML);
         poDS->osLayer = osSelectLayer;
         poDS->osTMS = osSelectTMS;
 
@@ -1762,15 +1770,11 @@ GDALDataset *WMTSDataset::Open(GDALOpenInfo *poOpenInfo)
                         }
                         if (poRevCT != nullptr)
                         {
-                            const double dfX0 = oTM.dfTLX;
-                            const double dfY1 = oTM.dfTLY;
-                            const double dfX1 =
-                                oTM.dfTLX + oTM.nMatrixWidth * oTM.dfPixelSize *
-                                                oTM.nTileWidth;
-                            const double dfY0 =
-                                oTM.dfTLY - oTM.nMatrixHeight *
-                                                oTM.dfPixelSize *
-                                                oTM.nTileHeight;
+                            const auto sTMExtent = oTM.GetExtent();
+                            const double dfX0 = sTMExtent.MinX;
+                            const double dfY1 = sTMExtent.MaxY;
+                            const double dfX1 = sTMExtent.MaxX;
+                            const double dfY0 = sTMExtent.MinY;
                             double dfXMin =
                                 std::numeric_limits<double>::infinity();
                             double dfYMin =
@@ -1909,6 +1913,21 @@ GDALDataset *WMTSDataset::Open(GDALOpenInfo *poOpenInfo)
             }
         }
 
+        // Clip the computed AOI with the union of the extent of the tile
+        // matrices
+        if (bHasAOI && !bExtendBeyondDateLine)
+        {
+            OGREnvelope sUnionTM;
+            for (const WMTSTileMatrix &oTM : oTMS.aoTM)
+            {
+                if (!sUnionTM.IsInit())
+                    sUnionTM = oTM.GetExtent();
+                else
+                    sUnionTM.Merge(oTM.GetExtent());
+            }
+            sAOI.Intersect(sUnionTM);
+        }
+
         // Otherwise default to BoundingBox of the TMS
         if (!bHasAOI && oTMS.bBoundingBoxValid &&
             (eExtentMethod == AUTO || eExtentMethod == TILE_MATRIX_SET))
@@ -1926,12 +1945,7 @@ GDALDataset *WMTSDataset::Open(GDALOpenInfo *poOpenInfo)
             CPLDebug("WMTS", "Using TM level %s bounding box as layer extent",
                      oTM.osIdentifier.c_str());
 
-            sAOI.MinX = oTM.dfTLX;
-            sAOI.MaxY = oTM.dfTLY;
-            sAOI.MaxX =
-                oTM.dfTLX + oTM.nMatrixWidth * oTM.dfPixelSize * oTM.nTileWidth;
-            sAOI.MinY = oTM.dfTLY -
-                        oTM.nMatrixHeight * oTM.dfPixelSize * oTM.nTileHeight;
+            sAOI = oTM.GetExtent();
             bHasAOI = TRUE;
         }
 
@@ -1952,6 +1966,7 @@ GDALDataset *WMTSDataset::Open(GDALOpenInfo *poOpenInfo)
             // Clip with implied BoundingBox of the most precise TM
             // Useful for http://tileserver.maptiler.com/wmts
             const WMTSTileMatrix &oTM = oTMS.aoTM.back();
+            const OGREnvelope sTMExtent = oTM.GetExtent();
             OGREnvelope sAOINew(sAOI);
 
             // For
@@ -1961,15 +1976,11 @@ GDALDataset *WMTSDataset::Open(GDALOpenInfo *poOpenInfo)
             // initial coding. So do X clipping in default mode.
             if (!bExtendBeyondDateLine)
             {
-                sAOINew.MinX = std::max(sAOI.MinX, oTM.dfTLX);
-                sAOINew.MaxX = std::min(
-                    sAOI.MaxX, oTM.dfTLX + oTM.nMatrixWidth * oTM.dfPixelSize *
-                                               oTM.nTileWidth);
+                sAOINew.MinX = std::max(sAOI.MinX, sTMExtent.MinX);
+                sAOINew.MaxX = std::min(sAOI.MaxX, sTMExtent.MaxX);
             }
-            sAOINew.MaxY = std::min(sAOI.MaxY, oTM.dfTLY);
-            sAOINew.MinY = std::max(sAOI.MinY, oTM.dfTLY - oTM.nMatrixHeight *
-                                                               oTM.dfPixelSize *
-                                                               oTM.nTileHeight);
+            sAOINew.MaxY = std::min(sAOI.MaxY, sTMExtent.MaxY);
+            sAOINew.MinY = std::max(sAOI.MinY, sTMExtent.MinY);
             if (sAOI != sAOINew)
             {
                 CPLDebug(
@@ -2000,20 +2011,8 @@ GDALDataset *WMTSDataset::Open(GDALOpenInfo *poOpenInfo)
 
                 const WMTSTileMatrixLimits &oTMLimits =
                     aoMapTileMatrixLimits[oTM.osIdentifier];
-                double dfTileWidthUnits = oTM.dfPixelSize * oTM.nTileWidth;
-                double dfTileHeightUnits = oTM.dfPixelSize * oTM.nTileHeight;
-                sAOINew.MinX =
-                    std::max(sAOI.MinX, oTM.dfTLX + oTMLimits.nMinTileCol *
-                                                        dfTileWidthUnits);
-                sAOINew.MaxY =
-                    std::min(sAOI.MaxY, oTM.dfTLY - oTMLimits.nMinTileRow *
-                                                        dfTileHeightUnits);
-                sAOINew.MaxX = std::min(
-                    sAOI.MaxX,
-                    oTM.dfTLX + (oTMLimits.nMaxTileCol + 1) * dfTileWidthUnits);
-                sAOINew.MinY = std::max(
-                    sAOI.MinY, oTM.dfTLY - (oTMLimits.nMaxTileRow + 1) *
-                                               dfTileHeightUnits);
+                const OGREnvelope sTMLimitsExtent = oTMLimits.GetExtent(oTM);
+                sAOINew.Intersect(sTMLimitsExtent);
 
                 if (sAOI != sAOINew)
                 {
@@ -2194,10 +2193,10 @@ GDALDataset *WMTSDataset::Open(GDALOpenInfo *poOpenInfo)
                     int(0.5 + (poDS->adfGT[3] - sAOI.MinY) / oTM.dfPixelSize);
             }
 
-            int nRasterXSize = int(0.5 + poDS->nRasterXSize / oTM.dfPixelSize *
-                                             poDS->adfGT[1]);
-            int nRasterYSize = int(0.5 + poDS->nRasterYSize / oTM.dfPixelSize *
-                                             poDS->adfGT[1]);
+            const int nRasterXSize = int(
+                0.5 + poDS->nRasterXSize / oTM.dfPixelSize * poDS->adfGT[1]);
+            const int nRasterYSize = int(
+                0.5 + poDS->nRasterYSize / oTM.dfPixelSize * poDS->adfGT[1]);
             if (!poDS->apoDatasets.empty() &&
                 (nRasterXSize < 128 || nRasterYSize < 128))
             {
@@ -2206,14 +2205,28 @@ GDALDataset *WMTSDataset::Open(GDALOpenInfo *poOpenInfo)
             CPLString osURL(
                 Replace(osURLTileTemplate, "{TileMatrix}", oTM.osIdentifier));
 
-            double dfTileWidthUnits = oTM.dfPixelSize * oTM.nTileWidth;
-            double dfTileHeightUnits = oTM.dfPixelSize * oTM.nTileHeight;
+            const double dfTileWidthUnits = oTM.dfPixelSize * oTM.nTileWidth;
+            const double dfTileHeightUnits = oTM.dfPixelSize * oTM.nTileHeight;
+
+            // Get bounds of this tile matrix / tile matrix limits
+            auto sTMExtent = oTM.GetExtent();
+            if (aoMapTileMatrixLimits.find(oTM.osIdentifier) !=
+                aoMapTileMatrixLimits.end())
+            {
+                const WMTSTileMatrixLimits &oTMLimits =
+                    aoMapTileMatrixLimits[oTM.osIdentifier];
+                sTMExtent.Intersect(oTMLimits.GetExtent(oTM));
+            }
 
             // Compute the shift in terms of tiles between AOI and TM origin
-            int nTileX = (int)(floor(poDS->adfGT[0] - oTM.dfTLX + 1e-10) /
-                               dfTileWidthUnits);
-            int nTileY = (int)(floor(oTM.dfTLY - poDS->adfGT[3] + 1e-10) /
-                               dfTileHeightUnits);
+            const int nTileX = static_cast<int>(
+                floor(std::max(sTMExtent.MinX, poDS->adfGT[0]) - oTM.dfTLX +
+                      1e-10) /
+                dfTileWidthUnits);
+            const int nTileY = static_cast<int>(
+                floor(oTM.dfTLY - std::min(poDS->adfGT[3], sTMExtent.MaxY) +
+                      1e-10) /
+                dfTileHeightUnits);
 
             // Compute extent of this zoom level slightly larger than the AOI
             // and aligned on tile boundaries at this TM
@@ -2226,8 +2239,13 @@ GDALDataset *WMTSDataset::Open(GDALOpenInfo *poOpenInfo)
             dfLRY = dfULY + floor((dfLRY - dfULY) / dfTileHeightUnits + 1e-10) *
                                 dfTileHeightUnits;
 
-            double dfSizeX = 0.5 + (dfLRX - dfULX) / oTM.dfPixelSize;
-            double dfSizeY = 0.5 + (dfULY - dfLRY) / oTM.dfPixelSize;
+            // Clip TMS extent to the one of this TM
+            if (!bExtendBeyondDateLine)
+                dfLRX = std::min(dfLRX, sTMExtent.MaxX);
+            dfLRY = std::max(dfLRY, sTMExtent.MinY);
+
+            const double dfSizeX = 0.5 + (dfLRX - dfULX) / oTM.dfPixelSize;
+            const double dfSizeY = 0.5 + (dfULY - dfLRY) / oTM.dfPixelSize;
             if (dfSizeX > INT_MAX || dfSizeY > INT_MAX)
             {
                 continue;
@@ -2240,13 +2258,15 @@ GDALDataset *WMTSDataset::Open(GDALOpenInfo *poOpenInfo)
                 poDS->oTMS = oTMS;
             }
 
-            int nSizeX = static_cast<int>(dfSizeX);
-            int nSizeY = static_cast<int>(dfSizeY);
+            const int nSizeX = static_cast<int>(dfSizeX);
+            const int nSizeY = static_cast<int>(dfSizeY);
 
-            double dfDateLineX =
+            const double dfDateLineX =
                 oTM.dfTLX + oTM.nMatrixWidth * dfTileWidthUnits;
-            int nSizeX1 = int(0.5 + (dfDateLineX - dfULX) / oTM.dfPixelSize);
-            int nSizeX2 = int(0.5 + (dfLRX - dfDateLineX) / oTM.dfPixelSize);
+            const int nSizeX1 =
+                int(0.5 + (dfDateLineX - dfULX) / oTM.dfPixelSize);
+            const int nSizeX2 =
+                int(0.5 + (dfLRX - dfDateLineX) / oTM.dfPixelSize);
             if (bExtendBeyondDateLine && dfDateLineX > dfLRX)
             {
                 CPLDebug("WMTS", "ExtendBeyondDateLine ignored in that case");
diff --git a/frmts/wmts/wmtsdrivercore.cpp b/frmts/wmts/wmtsdrivercore.cpp
index cc4275cf5b4a..93511e0bfc28 100644
--- a/frmts/wmts/wmtsdrivercore.cpp
+++ b/frmts/wmts/wmtsdrivercore.cpp
@@ -8,23 +8,7 @@
  **********************************************************************
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "wmtsdrivercore.h"
@@ -42,18 +26,35 @@ int WMTSDriverIdentify(GDALOpenInfo *poOpenInfo)
     if (STARTS_WITH_CI(poOpenInfo->pszFilename, "<GDAL_WMTS"))
         return TRUE;
 
+    const bool bIsSingleDriver = poOpenInfo->IsSingleAllowedDriver("WMTS");
+    if (bIsSingleDriver && (STARTS_WITH(poOpenInfo->pszFilename, "http://") ||
+                            STARTS_WITH(poOpenInfo->pszFilename, "https://")))
+    {
+        return true;
+    }
+
     if (poOpenInfo->nHeaderBytes == 0)
         return FALSE;
 
-    if (strstr((const char *)poOpenInfo->pabyHeader, "<GDAL_WMTS"))
+    const char *pszHeader =
+        reinterpret_cast<const char *>(poOpenInfo->pabyHeader);
+    if (strstr(pszHeader, "<GDAL_WMTS") ||
+        ((strstr(pszHeader, "<Capabilities") ||
+          strstr(pszHeader, "<wmts:Capabilities")) &&
+         strstr(pszHeader, "http://www.opengis.net/wmts/1.0")))
+    {
         return TRUE;
+    }
+
+    if (bIsSingleDriver)
+    {
+        while (*pszHeader != 0 &&
+               std::isspace(static_cast<unsigned char>(*pszHeader)))
+            ++pszHeader;
+        return *pszHeader == '<';
+    }
 
-    return (strstr((const char *)poOpenInfo->pabyHeader, "<Capabilities") !=
-                nullptr ||
-            strstr((const char *)poOpenInfo->pabyHeader,
-                   "<wmts:Capabilities") != nullptr) &&
-           strstr((const char *)poOpenInfo->pabyHeader,
-                  "http://www.opengis.net/wmts/1.0") != nullptr;
+    return FALSE;
 }
 
 /************************************************************************/
diff --git a/frmts/wmts/wmtsdrivercore.h b/frmts/wmts/wmtsdrivercore.h
index 0e2198c93282..a1bed346a058 100644
--- a/frmts/wmts/wmtsdrivercore.h
+++ b/frmts/wmts/wmtsdrivercore.h
@@ -8,23 +8,7 @@
  **********************************************************************
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef WMTSDRIVERCORE_H
diff --git a/frmts/xpm/xpmdataset.cpp b/frmts/xpm/xpmdataset.cpp
index c2012f851c84..55168688f4d0 100644
--- a/frmts/xpm/xpmdataset.cpp
+++ b/frmts/xpm/xpmdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2002, Frank Warmerdam
  * Copyright (c) 2008-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_pam.h"
diff --git a/frmts/xyz/xyzdataset.cpp b/frmts/xyz/xyzdataset.cpp
index 645f4e832f02..c6df2d7a7120 100644
--- a/frmts/xyz/xyzdataset.cpp
+++ b/frmts/xyz/xyzdataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
@@ -723,13 +707,14 @@ int XYZDataset::IdentifyEx(GDALOpenInfo *poOpenInfo, int &bHasHeaderLine,
     nCommentLineCount = 0;
 
     CPLString osFilename(poOpenInfo->pszFilename);
-    if (EQUAL(CPLGetExtension(osFilename), "GRA"))
+    if (EQUAL(CPLGetExtension(osFilename), "GRA") &&
+        !poOpenInfo->IsSingleAllowedDriver("XYZ"))
     {
         // IGNFHeightASCIIGRID .GRA
         return FALSE;
     }
 
-    GDALOpenInfo *poOpenInfoToDelete = nullptr;
+    std::unique_ptr<GDALOpenInfo> poOpenInfoToDelete;  // keep in this scope
     /*  GZipped .xyz files are common, so automagically open them */
     /*  if the /vsigzip/ has not been explicitly passed */
     if (strlen(poOpenInfo->pszFilename) > 6 &&
@@ -739,13 +724,13 @@ int XYZDataset::IdentifyEx(GDALOpenInfo *poOpenInfo, int &bHasHeaderLine,
     {
         osFilename = "/vsigzip/";
         osFilename += poOpenInfo->pszFilename;
-        poOpenInfo = poOpenInfoToDelete = new GDALOpenInfo(
+        poOpenInfoToDelete = std::make_unique<GDALOpenInfo>(
             osFilename.c_str(), GA_ReadOnly, poOpenInfo->GetSiblingFiles());
+        poOpenInfo = poOpenInfoToDelete.get();
     }
 
     if (poOpenInfo->nHeaderBytes == 0)
     {
-        delete poOpenInfoToDelete;
         return FALSE;
     }
 
@@ -755,10 +740,10 @@ int XYZDataset::IdentifyEx(GDALOpenInfo *poOpenInfo, int &bHasHeaderLine,
     const char *pszData =
         reinterpret_cast<const char *>(poOpenInfo->pabyHeader);
 
-    if (poOpenInfo->nHeaderBytes >= 4 && STARTS_WITH(pszData, "DSAA"))
+    if (poOpenInfo->nHeaderBytes >= 4 && STARTS_WITH(pszData, "DSAA") &&
+        !poOpenInfo->IsSingleAllowedDriver("XYZ"))
     {
         // Do not match GSAG datasets
-        delete poOpenInfoToDelete;
         return FALSE;
     }
 
@@ -806,7 +791,6 @@ int XYZDataset::IdentifyEx(GDALOpenInfo *poOpenInfo, int &bHasHeaderLine,
             bHasHeaderLine = TRUE;
         else
         {
-            delete poOpenInfoToDelete;
             return FALSE;
         }
     }
@@ -814,6 +798,31 @@ int XYZDataset::IdentifyEx(GDALOpenInfo *poOpenInfo, int &bHasHeaderLine,
     nXIndex = -1;
     nYIndex = -1;
     nZIndex = -1;
+    const char *pszColumnOrder = CSLFetchNameValueDef(
+        poOpenInfo->papszOpenOptions, "COLUMN_ORDER", "AUTO");
+    if (EQUAL(pszColumnOrder, "XYZ"))
+    {
+        nXIndex = 0;
+        nYIndex = 1;
+        nZIndex = 2;
+        return TRUE;
+    }
+    else if (EQUAL(pszColumnOrder, "YXZ"))
+    {
+        nXIndex = 1;
+        nYIndex = 0;
+        nZIndex = 2;
+        return TRUE;
+    }
+    else if (!EQUAL(pszColumnOrder, "AUTO"))
+    {
+        CPLError(CE_Failure, CPLE_IllegalArg,
+                 "Option COLUMN_ORDER can only be XYZ, YXZ and AUTO."
+                 "%s is not valid",
+                 pszColumnOrder);
+        return FALSE;
+    }
+
     if (bHasHeaderLine)
     {
         CPLString osHeaderLine;
@@ -837,7 +846,6 @@ int XYZDataset::IdentifyEx(GDALOpenInfo *poOpenInfo, int &bHasHeaderLine,
         CSLDestroy(papszTokens);
         if (nXIndex >= 0 && nYIndex >= 0 && nZIndex >= 0)
         {
-            delete poOpenInfoToDelete;
             return TRUE;
         }
     }
@@ -878,12 +886,10 @@ int XYZDataset::IdentifyEx(GDALOpenInfo *poOpenInfo, int &bHasHeaderLine,
         }
         else
         {
-            delete poOpenInfoToDelete;
             return FALSE;
         }
     }
 
-    delete poOpenInfoToDelete;
     return bHasFoundNewLine && nMaxCols >= 3;
 }
 
@@ -960,15 +966,14 @@ GDALDataset *XYZDataset::Open(GDALOpenInfo *poOpenInfo)
             nYIndex = 1;
             nZIndex = 2;
         }
-        nMinTokens = 1 + std::max(std::max(nXIndex, nYIndex), nZIndex);
     }
-    else
+    else if (nXIndex < 0 || nYIndex < 0 || nZIndex < 0)
     {
         nXIndex = 0;
         nYIndex = 1;
         nZIndex = 2;
-        nMinTokens = 3;
     }
+    nMinTokens = 1 + std::max(std::max(nXIndex, nYIndex), nZIndex);
 
     /* -------------------------------------------------------------------- */
     /*      Parse data lines                                                */
@@ -1656,9 +1661,9 @@ GDALDataset *XYZDataset::CreateCopy(const char *pszFilename,
     /* -------------------------------------------------------------------- */
     char szFormat[50] = {'\0'};
     if (eReqDT == GDT_Int32)
-        strcpy(szFormat, "%.18g%c%.18g%c%d\n");
+        strcpy(szFormat, "%.17g%c%.17g%c%d\n");
     else
-        strcpy(szFormat, "%.18g%c%.18g%c%.18g\n");
+        strcpy(szFormat, "%.17g%c%.17g%c%.17g\n");
     const char *pszDecimalPrecision =
         CSLFetchNameValue(papszOptions, "DECIMAL_PRECISION");
     const char *pszSignificantDigits =
@@ -1821,6 +1826,17 @@ void GDALRegister_XYZ()
         "   <Option name='DECIMAL_PRECISION' type='int' description='Number of "
         "decimal places when writing floating-point numbers (%f format).'/>\n"
         "</CreationOptionList>");
+    poDriver->SetMetadataItem(
+        GDAL_DMD_OPENOPTIONLIST,
+        "<OpenOptionList>"
+        "   <Option name='COLUMN_ORDER' type='string-select' default='AUTO' "
+        "description='Specifies the order of the columns. It overrides the "
+        "header.'>"
+        "       <Value>AUTO</Value>"
+        "       <Value>XYZ</Value>"
+        "       <Value>YXZ</Value>"
+        "   </Option>"
+        "</OpenOptionList>");
 
     poDriver->SetMetadataItem(GDAL_DCAP_VIRTUALIO, "YES");
 
diff --git a/frmts/zarr/zarr.h b/frmts/zarr/zarr.h
index f9d6bf39e1a4..8cd675b46dd1 100644
--- a/frmts/zarr/zarr.h
+++ b/frmts/zarr/zarr.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2021, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef ZARR_H
diff --git a/frmts/zarr/zarr_array.cpp b/frmts/zarr/zarr_array.cpp
index a8df5696947a..6d12705201f5 100644
--- a/frmts/zarr/zarr_array.cpp
+++ b/frmts/zarr/zarr_array.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2021, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "zarr.h"
@@ -35,6 +19,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <cmath>
 #include <cstdlib>
 #include <limits>
 #include <map>
@@ -557,20 +542,7 @@ void ZarrArray::SerializeNumericNoData(CPLJSONObject &oRoot) const
     else if (m_oType.GetNumericDataType() == GDT_UInt64)
     {
         const auto nVal = GetNoDataValueAsUInt64();
-        if (nVal <= static_cast<uint64_t>(std::numeric_limits<int64_t>::max()))
-        {
-            oRoot.Add("fill_value", static_cast<GInt64>(nVal));
-        }
-        else if (nVal == static_cast<uint64_t>(static_cast<double>(nVal)))
-        {
-            oRoot.Add("fill_value", static_cast<double>(nVal));
-        }
-        else
-        {
-            // not really compliant...
-            oRoot.Add("fill_value",
-                      CPLSPrintf(CPL_FRMT_GUIB, static_cast<GUIntBig>(nVal)));
-        }
+        oRoot.Add("fill_value", static_cast<uint64_t>(nVal));
     }
     else
     {
@@ -2791,7 +2763,7 @@ void ZarrArray::ParseSpecialAttributes(
                         {
                             if (!osVal.empty())
                                 osVal += ',';
-                            osVal += CPLSPrintf("%.18g", val);
+                            osVal += CPLSPrintf("%.17g", val);
                         }
                         aosKeyValues.SetNameValue(poAttr->GetName().c_str(),
                                                   osVal.c_str());
diff --git a/frmts/zarr/zarr_attribute.cpp b/frmts/zarr/zarr_attribute.cpp
index bdde645b8ad4..69bc0a51f53e 100644
--- a/frmts/zarr/zarr_attribute.cpp
+++ b/frmts/zarr/zarr_attribute.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2021, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "zarr.h"
@@ -64,142 +48,213 @@ void ZarrAttributeGroup::Init(const CPLJSONObject &obj, bool bUpdatable)
         const auto itemType = item.GetType();
         bool bDone = false;
         std::shared_ptr<GDALAttribute> poAttr;
-        if (itemType == CPLJSONObject::Type::String)
+        switch (itemType)
         {
-            bDone = true;
-            poAttr = m_poGroup->CreateAttribute(
-                item.GetName(), {}, GDALExtendedDataType::CreateString(),
-                nullptr);
-            if (poAttr)
+            case CPLJSONObject::Type::String:
             {
-                const GUInt64 arrayStartIdx = 0;
-                const size_t count = 1;
-                const GInt64 arrayStep = 0;
-                const GPtrDiff_t bufferStride = 0;
-                const std::string str = item.ToString();
-                const char *c_str = str.c_str();
-                poAttr->Write(&arrayStartIdx, &count, &arrayStep, &bufferStride,
-                              poAttr->GetDataType(), &c_str);
+                bDone = true;
+                poAttr = m_poGroup->CreateAttribute(
+                    item.GetName(), {}, GDALExtendedDataType::CreateString(),
+                    nullptr);
+                if (poAttr)
+                {
+                    const GUInt64 arrayStartIdx = 0;
+                    const size_t count = 1;
+                    const GInt64 arrayStep = 0;
+                    const GPtrDiff_t bufferStride = 0;
+                    const std::string str = item.ToString();
+                    const char *c_str = str.c_str();
+                    poAttr->Write(&arrayStartIdx, &count, &arrayStep,
+                                  &bufferStride, poAttr->GetDataType(), &c_str);
+                }
+                break;
             }
-        }
-        else if (itemType == CPLJSONObject::Type::Integer ||
-                 itemType == CPLJSONObject::Type::Long ||
-                 itemType == CPLJSONObject::Type::Double)
-        {
-            bDone = true;
-            poAttr = m_poGroup->CreateAttribute(
-                item.GetName(), {},
-                GDALExtendedDataType::Create(
-                    itemType == CPLJSONObject::Type::Integer ? GDT_Int32
-                                                             : GDT_Float64),
-                nullptr);
-            if (poAttr)
+            case CPLJSONObject::Type::Integer:
             {
-                const GUInt64 arrayStartIdx = 0;
-                const size_t count = 1;
-                const GInt64 arrayStep = 0;
-                const GPtrDiff_t bufferStride = 0;
-                const double val = item.ToDouble();
-                poAttr->Write(&arrayStartIdx, &count, &arrayStep, &bufferStride,
-                              GDALExtendedDataType::Create(GDT_Float64), &val);
+                bDone = true;
+                poAttr = m_poGroup->CreateAttribute(
+                    item.GetName(), {}, GDALExtendedDataType::Create(GDT_Int32),
+                    nullptr);
+                if (poAttr)
+                {
+                    const GUInt64 arrayStartIdx = 0;
+                    const size_t count = 1;
+                    const GInt64 arrayStep = 0;
+                    const GPtrDiff_t bufferStride = 0;
+                    const int val = item.ToInteger();
+                    poAttr->Write(
+                        &arrayStartIdx, &count, &arrayStep, &bufferStride,
+                        GDALExtendedDataType::Create(GDT_Int32), &val);
+                }
+                break;
             }
-        }
-        else if (itemType == CPLJSONObject::Type::Array)
-        {
-            const auto array = item.ToArray();
-            bool isFirst = true;
-            bool isString = false;
-            bool isNumeric = false;
-            bool foundInt64 = false;
-            bool foundDouble = false;
-            bool mixedType = false;
-            size_t countItems = 0;
-            for (const auto &subItem : array)
+            case CPLJSONObject::Type::Long:
             {
-                const auto subItemType = subItem.GetType();
-                if (subItemType == CPLJSONObject::Type::String)
+                bDone = true;
+                poAttr = m_poGroup->CreateAttribute(
+                    item.GetName(), {}, GDALExtendedDataType::Create(GDT_Int64),
+                    nullptr);
+                if (poAttr)
                 {
-                    if (isFirst)
-                    {
-                        isString = true;
-                    }
-                    else if (!isString)
-                    {
-                        mixedType = true;
-                        break;
-                    }
-                    countItems++;
+                    const GUInt64 arrayStartIdx = 0;
+                    const size_t count = 1;
+                    const GInt64 arrayStep = 0;
+                    const GPtrDiff_t bufferStride = 0;
+                    const int64_t val = item.ToLong();
+                    poAttr->Write(
+                        &arrayStartIdx, &count, &arrayStep, &bufferStride,
+                        GDALExtendedDataType::Create(GDT_Int64), &val);
                 }
-                else if (subItemType == CPLJSONObject::Type::Integer ||
-                         subItemType == CPLJSONObject::Type::Long ||
-                         subItemType == CPLJSONObject::Type::Double)
+                break;
+            }
+            case CPLJSONObject::Type::Double:
+            {
+                bDone = true;
+                poAttr = m_poGroup->CreateAttribute(
+                    item.GetName(), {},
+                    GDALExtendedDataType::Create(GDT_Float64), nullptr);
+                if (poAttr)
                 {
-                    if (isFirst)
+                    const GUInt64 arrayStartIdx = 0;
+                    const size_t count = 1;
+                    const GInt64 arrayStep = 0;
+                    const GPtrDiff_t bufferStride = 0;
+                    const double val = item.ToDouble();
+                    poAttr->Write(
+                        &arrayStartIdx, &count, &arrayStep, &bufferStride,
+                        GDALExtendedDataType::Create(GDT_Float64), &val);
+                }
+                break;
+            }
+            case CPLJSONObject::Type::Array:
+            {
+                const auto array = item.ToArray();
+                bool isFirst = true;
+                bool isString = false;
+                bool isNumeric = false;
+                bool foundInt64 = false;
+                bool foundDouble = false;
+                bool mixedType = false;
+                size_t countItems = 0;
+                for (const auto &subItem : array)
+                {
+                    const auto subItemType = subItem.GetType();
+                    if (subItemType == CPLJSONObject::Type::String)
                     {
-                        isNumeric = true;
+                        if (isFirst)
+                        {
+                            isString = true;
+                        }
+                        else if (!isString)
+                        {
+                            mixedType = true;
+                            break;
+                        }
+                        countItems++;
+                    }
+                    else if (subItemType == CPLJSONObject::Type::Integer ||
+                             subItemType == CPLJSONObject::Type::Long ||
+                             subItemType == CPLJSONObject::Type::Double)
+                    {
+                        if (isFirst)
+                        {
+                            isNumeric = true;
+                        }
+                        else if (!isNumeric)
+                        {
+                            mixedType = true;
+                            break;
+                        }
+                        if (subItemType == CPLJSONObject::Type::Double)
+                            foundDouble = true;
+                        else if (subItemType == CPLJSONObject::Type::Long)
+                            foundInt64 = true;
+                        countItems++;
                     }
-                    else if (!isNumeric)
+                    else
                     {
                         mixedType = true;
                         break;
                     }
-                    if (subItemType == CPLJSONObject::Type::Double)
-                        foundDouble = true;
-                    else if (subItemType == CPLJSONObject::Type::Long)
-                        foundInt64 = true;
-                    countItems++;
+                    isFirst = false;
                 }
-                else
-                {
-                    mixedType = true;
-                    break;
-                }
-                isFirst = false;
-            }
 
-            if (!mixedType && !isFirst)
-            {
-                bDone = true;
-                poAttr = m_poGroup->CreateAttribute(
-                    item.GetName(), {countItems},
-                    isString ? GDALExtendedDataType::CreateString()
-                             : GDALExtendedDataType::Create(
-                                   (foundDouble || foundInt64) ? GDT_Float64
-                                                               : GDT_Int32),
-                    nullptr);
-                if (poAttr)
+                if (!mixedType && !isFirst)
                 {
-                    size_t idx = 0;
-                    for (const auto &subItem : array)
+                    bDone = true;
+                    poAttr = m_poGroup->CreateAttribute(
+                        item.GetName(), {countItems},
+                        isString ? GDALExtendedDataType::CreateString()
+                                 : GDALExtendedDataType::Create(
+                                       foundDouble  ? GDT_Float64
+                                       : foundInt64 ? GDT_Int64
+                                                    : GDT_Int32),
+                        nullptr);
+                    if (poAttr)
                     {
-                        const GUInt64 arrayStartIdx = idx;
-                        const size_t count = 1;
-                        const GInt64 arrayStep = 0;
-                        const GPtrDiff_t bufferStride = 0;
-                        const auto subItemType = subItem.GetType();
-                        if (subItemType == CPLJSONObject::Type::String)
-                        {
-                            const std::string str = subItem.ToString();
-                            const char *c_str = str.c_str();
-                            poAttr->Write(&arrayStartIdx, &count, &arrayStep,
-                                          &bufferStride, poAttr->GetDataType(),
-                                          &c_str);
-                        }
-                        else if (subItemType == CPLJSONObject::Type::Integer ||
-                                 subItemType == CPLJSONObject::Type::Long ||
-                                 subItemType == CPLJSONObject::Type::Double)
+                        size_t idx = 0;
+                        for (const auto &subItem : array)
                         {
-                            const double val = subItem.ToDouble();
-                            poAttr->Write(
-                                &arrayStartIdx, &count, &arrayStep,
-                                &bufferStride,
-                                GDALExtendedDataType::Create(GDT_Float64),
-                                &val);
+                            const GUInt64 arrayStartIdx = idx;
+                            const size_t count = 1;
+                            const GInt64 arrayStep = 0;
+                            const GPtrDiff_t bufferStride = 0;
+                            const auto subItemType = subItem.GetType();
+                            switch (subItemType)
+                            {
+                                case CPLJSONObject::Type::String:
+                                {
+                                    const std::string str = subItem.ToString();
+                                    const char *c_str = str.c_str();
+                                    poAttr->Write(&arrayStartIdx, &count,
+                                                  &arrayStep, &bufferStride,
+                                                  poAttr->GetDataType(),
+                                                  &c_str);
+                                    break;
+                                }
+                                case CPLJSONObject::Type::Integer:
+                                {
+                                    const int val = subItem.ToInteger();
+                                    poAttr->Write(
+                                        &arrayStartIdx, &count, &arrayStep,
+                                        &bufferStride,
+                                        GDALExtendedDataType::Create(GDT_Int32),
+                                        &val);
+                                    break;
+                                }
+                                case CPLJSONObject::Type::Long:
+                                {
+                                    const int64_t val = subItem.ToLong();
+                                    poAttr->Write(
+                                        &arrayStartIdx, &count, &arrayStep,
+                                        &bufferStride,
+                                        GDALExtendedDataType::Create(GDT_Int64),
+                                        &val);
+                                    break;
+                                }
+                                case CPLJSONObject::Type::Double:
+                                {
+                                    const double val = subItem.ToDouble();
+                                    poAttr->Write(&arrayStartIdx, &count,
+                                                  &arrayStep, &bufferStride,
+                                                  GDALExtendedDataType::Create(
+                                                      GDT_Float64),
+                                                  &val);
+                                    break;
+                                }
+                                default:
+                                    // Ignore other JSON object types
+                                    break;
+                            }
+                            ++idx;
                         }
-                        ++idx;
                     }
                 }
+                break;
             }
+            default:
+                // Ignore other JSON object types
+                break;
         }
 
         if (!bDone)
@@ -288,30 +343,49 @@ CPLJSONObject ZarrAttributeGroup::Serialize() const
             const auto eDT = oType.GetNumericDataType();
             if (anDims.size() == 0)
             {
-                const double dfVal = attr->ReadAsDouble();
-                if (eDT == GDT_Byte || eDT == GDT_UInt16 || eDT == GDT_UInt32 ||
-                    eDT == GDT_Int16 || eDT == GDT_Int32)
+                if (eDT == GDT_Int8 || eDT == GDT_Int16 || eDT == GDT_Int32 ||
+                    eDT == GDT_Int64)
                 {
-                    o.Add(attr->GetName(), static_cast<GInt64>(dfVal));
+                    const int64_t nVal = attr->ReadAsInt64();
+                    o.Add(attr->GetName(), static_cast<GInt64>(nVal));
+                }
+                else if (eDT == GDT_Byte || eDT == GDT_UInt16 ||
+                         eDT == GDT_UInt32 || eDT == GDT_UInt64)
+                {
+                    const int64_t nVal = attr->ReadAsInt64();
+                    o.Add(attr->GetName(), static_cast<uint64_t>(nVal));
                 }
                 else
                 {
+                    const double dfVal = attr->ReadAsDouble();
                     o.Add(attr->GetName(), dfVal);
                 }
             }
             else if (anDims.size() == 1)
             {
-                const auto list = attr->ReadAsDoubleArray();
                 CPLJSONArray arr;
-                for (const auto dfVal : list)
+                if (eDT == GDT_Int8 || eDT == GDT_Int16 || eDT == GDT_Int32 ||
+                    eDT == GDT_Int64)
                 {
-                    if (eDT == GDT_Byte || eDT == GDT_UInt16 ||
-                        eDT == GDT_UInt32 || eDT == GDT_Int16 ||
-                        eDT == GDT_Int32)
+                    const auto list = attr->ReadAsInt64Array();
+                    for (const auto nVal : list)
                     {
-                        arr.Add(static_cast<GInt64>(dfVal));
+                        arr.Add(static_cast<GInt64>(nVal));
                     }
-                    else
+                }
+                else if (eDT == GDT_Byte || eDT == GDT_UInt16 ||
+                         eDT == GDT_UInt32 || eDT == GDT_UInt64)
+                {
+                    const auto list = attr->ReadAsInt64Array();
+                    for (const auto nVal : list)
+                    {
+                        arr.Add(static_cast<uint64_t>(nVal));
+                    }
+                }
+                else
+                {
+                    const auto list = attr->ReadAsDoubleArray();
+                    for (const auto dfVal : list)
                     {
                         arr.Add(dfVal);
                     }
diff --git a/frmts/zarr/zarr_dimension.cpp b/frmts/zarr/zarr_dimension.cpp
index 73aed9d0d4e7..a3a4db10c9e6 100644
--- a/frmts/zarr/zarr_dimension.cpp
+++ b/frmts/zarr/zarr_dimension.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2021, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "zarr.h"
diff --git a/frmts/zarr/zarr_group.cpp b/frmts/zarr/zarr_group.cpp
index 926463d1e7b8..18dfec79bf26 100644
--- a/frmts/zarr/zarr_group.cpp
+++ b/frmts/zarr/zarr_group.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2021, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "zarr.h"
diff --git a/frmts/zarr/zarr_sharedresource.cpp b/frmts/zarr/zarr_sharedresource.cpp
index b0daddf2b608..76bed033c08f 100644
--- a/frmts/zarr/zarr_sharedresource.cpp
+++ b/frmts/zarr/zarr_sharedresource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2021, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "zarr.h"
@@ -44,7 +28,7 @@ ZarrSharedResource::ZarrSharedResource(const std::string &osRootDirectoryName,
     m_osRootDirectoryName = osRootDirectoryName;
     if (!m_osRootDirectoryName.empty() && m_osRootDirectoryName.back() == '/')
     {
-        m_osRootDirectoryName.resize(m_osRootDirectoryName.size() - 1);
+        m_osRootDirectoryName.pop_back();
     }
     m_poPAM = std::make_shared<GDALPamMultiDim>(
         CPLFormFilename(m_osRootDirectoryName.c_str(), "pam", nullptr));
diff --git a/frmts/zarr/zarr_v2_array.cpp b/frmts/zarr/zarr_v2_array.cpp
index 7e7b149acb4b..42042344897e 100644
--- a/frmts/zarr/zarr_v2_array.cpp
+++ b/frmts/zarr/zarr_v2_array.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2021, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_vsi_virtual.h"
diff --git a/frmts/zarr/zarr_v2_group.cpp b/frmts/zarr/zarr_v2_group.cpp
index 04c117935f2b..bef685a6bfb4 100644
--- a/frmts/zarr/zarr_v2_group.cpp
+++ b/frmts/zarr/zarr_v2_group.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2021, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "zarr.h"
@@ -887,7 +871,7 @@ std::shared_ptr<GDALMDArray> ZarrV2Group::CreateMDArray(
     if (!EQUAL(pszCompressor, "NONE"))
     {
         psCompressor = CPLGetCompressor(pszCompressor);
-        psDecompressor = CPLGetCompressor(pszCompressor);
+        psDecompressor = CPLGetDecompressor(pszCompressor);
         if (psCompressor == nullptr || psDecompressor == nullptr)
         {
             CPLError(CE_Failure, CPLE_NotSupported,
diff --git a/frmts/zarr/zarr_v3_array.cpp b/frmts/zarr/zarr_v3_array.cpp
index 442c3ec58957..c81543a8255e 100644
--- a/frmts/zarr/zarr_v3_array.cpp
+++ b/frmts/zarr/zarr_v3_array.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2021, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_vsi_virtual.h"
@@ -32,6 +16,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <cmath>
 #include <cstdlib>
 #include <limits>
 #include <map>
diff --git a/frmts/zarr/zarr_v3_codec.cpp b/frmts/zarr/zarr_v3_codec.cpp
index b184a209df37..739d623da555 100644
--- a/frmts/zarr/zarr_v3_codec.cpp
+++ b/frmts/zarr/zarr_v3_codec.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "zarr.h"
diff --git a/frmts/zarr/zarr_v3_group.cpp b/frmts/zarr/zarr_v3_group.cpp
index bfa88cf1a8ea..629138915b22 100644
--- a/frmts/zarr/zarr_v3_group.cpp
+++ b/frmts/zarr/zarr_v3_group.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2021, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "zarr.h"
diff --git a/frmts/zarr/zarrdriver.cpp b/frmts/zarr/zarrdriver.cpp
index 6d399f312e6d..bca6571856f9 100644
--- a/frmts/zarr/zarrdriver.cpp
+++ b/frmts/zarr/zarrdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2021, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "zarr.h"
@@ -58,7 +42,7 @@ GDALDataset *ZarrDataset::OpenMultidim(const char *pszFilename,
 {
     CPLString osFilename(pszFilename);
     if (osFilename.back() == '/')
-        osFilename.resize(osFilename.size() - 1);
+        osFilename.pop_back();
 
     auto poSharedResource = ZarrSharedResource::Create(osFilename, bUpdateMode);
     poSharedResource->SetOpenOptions(papszOpenOptionsIn);
diff --git a/frmts/zarr/zarrdrivercore.cpp b/frmts/zarr/zarrdrivercore.cpp
index 778321a1cda0..26edfd935ca5 100644
--- a/frmts/zarr/zarrdrivercore.cpp
+++ b/frmts/zarr/zarrdrivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2021, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "zarrdrivercore.h"
diff --git a/frmts/zarr/zarrdrivercore.h b/frmts/zarr/zarrdrivercore.h
index a91d134eabf4..59d815b96ad0 100644
--- a/frmts/zarr/zarrdrivercore.h
+++ b/frmts/zarr/zarrdrivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2021, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef ZARRDRIVERCORE_H
diff --git a/frmts/zlib/README b/frmts/zlib/README
index 024b79d3d8c8..c5f917540b6f 100644
--- a/frmts/zlib/README
+++ b/frmts/zlib/README
@@ -1,6 +1,6 @@
 ZLIB DATA COMPRESSION LIBRARY
 
-zlib 1.2.12 is a general purpose data compression library.  All the code is
+zlib 1.3.1 is a general purpose data compression library.  All the code is
 thread safe.  The data format used by the zlib library is described by RFCs
 (Request for Comments) 1950 to 1952 in the files
 http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
@@ -29,18 +29,17 @@ PLEASE read the zlib FAQ http://zlib.net/zlib_faq.html before asking for help.
 
 Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan.  1997
 issue of Dr.  Dobb's Journal; a copy of the article is available at
-http://marknelson.us/1997/01/01/zlib-engine/ .
+https://marknelson.us/posts/1997/01/01/zlib-engine.html .
 
-The changes made in version 1.2.12 are documented in the file ChangeLog.
+The changes made in version 1.3.1 are documented in the file ChangeLog.
 
 Unsupported third party contributions are provided in directory contrib/ .
 
-zlib is available in Java using the java.util.zip package, documented at
-http://java.sun.com/developer/technicalArticles/Programming/compression/ .
+zlib is available in Java using the java.util.zip package. Follow the API
+Documentation link at: https://docs.oracle.com/search/?q=java.util.zip .
 
-A Perl interface to zlib written by Paul Marquess <pmqs@cpan.org> is available
-at CPAN (Comprehensive Perl Archive Network) sites, including
-http://search.cpan.org/~pmqs/IO-Compress-Zlib/ .
+A Perl interface to zlib and bzip2 written by Paul Marquess <pmqs@cpan.org>
+can be found at https://github.com/pmqs/IO-Compress .
 
 A Python interface to zlib written by A.M. Kuchling <amk@amk.ca> is
 available in Python 1.5 and later versions, see
@@ -64,7 +63,7 @@ Notes for some targets:
 - zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works
   when compiled with cc.
 
-- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is
+- On Digital Unix 4.0D (formerly OSF/1) on AlphaServer, the cc option -std1 is
   necessary to get gzprintf working correctly. This is done by configure.
 
 - zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with
@@ -84,7 +83,7 @@ Acknowledgments:
 
 Copyright notice:
 
- (C) 1995-2022 Jean-loup Gailly and Mark Adler
+ (C) 1995-2024 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
diff --git a/frmts/zlib/README_GDAL b/frmts/zlib/README_GDAL
new file mode 100644
index 000000000000..e68ad41b3133
--- /dev/null
+++ b/frmts/zlib/README_GDAL
@@ -0,0 +1 @@
+zlib 1.3.1 with gdal.patch applied
diff --git a/frmts/zlib/adler32.c b/frmts/zlib/adler32.c
index 7ad5fba64a69..04b81d29bad1 100644
--- a/frmts/zlib/adler32.c
+++ b/frmts/zlib/adler32.c
@@ -7,8 +7,6 @@
 
 #include "zutil.h"
 
-local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
-
 #define BASE 65521U     /* largest prime smaller than 65536 */
 #define NMAX 5552
 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
@@ -60,8 +58,7 @@ local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
 #endif
 
 /* ========================================================================= */
-uLong ZEXPORT adler32_z(uLong adler, const Bytef *buf, z_size_t len)
-{
+uLong ZEXPORT adler32_z(uLong adler, const Bytef *buf, z_size_t len) {
     unsigned long sum2;
     unsigned n;
 
@@ -128,14 +125,12 @@ uLong ZEXPORT adler32_z(uLong adler, const Bytef *buf, z_size_t len)
 }
 
 /* ========================================================================= */
-uLong ZEXPORT adler32(uLong adler, const Bytef *buf, uInt len)
-{
+uLong ZEXPORT adler32(uLong adler, const Bytef *buf, uInt len) {
     return adler32_z(adler, buf, len);
 }
 
 /* ========================================================================= */
-local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2)
-{
+local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2) {
     unsigned long sum1;
     unsigned long sum2;
     unsigned rem;
@@ -160,12 +155,10 @@ local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2)
 }
 
 /* ========================================================================= */
-uLong ZEXPORT adler32_combine(uLong adler1, uLong adler2, z_off_t len2)
-{
+uLong ZEXPORT adler32_combine(uLong adler1, uLong adler2, z_off_t len2) {
     return adler32_combine_(adler1, adler2, len2);
 }
 
-uLong ZEXPORT adler32_combine64(uLong adler1, uLong adler2, z_off64_t len2)
-{
+uLong ZEXPORT adler32_combine64(uLong adler1, uLong adler2, z_off64_t len2) {
     return adler32_combine_(adler1, adler2, len2);
 }
diff --git a/frmts/zlib/compress.c b/frmts/zlib/compress.c
index 2c84074316b0..f43bacf7ab97 100644
--- a/frmts/zlib/compress.c
+++ b/frmts/zlib/compress.c
@@ -19,8 +19,8 @@
    memory, Z_BUF_ERROR if there was not enough room in the output buffer,
    Z_STREAM_ERROR if the level parameter is invalid.
 */
-int ZEXPORT compress2 (Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen, int level)
-{
+int ZEXPORT compress2(Bytef *dest, uLongf *destLen, const Bytef *source,
+                      uLong sourceLen, int level) {
     z_stream stream;
     int err;
     const uInt max = (uInt)-1;
@@ -60,8 +60,8 @@ int ZEXPORT compress2 (Bytef *dest, uLongf *destLen, const Bytef *source, uLong
 
 /* ===========================================================================
  */
-int ZEXPORT compress (Bytef * dest, uLongf *destLen, const Bytef *source, uLong sourceLen)
-{
+int ZEXPORT compress(Bytef *dest, uLongf *destLen, const Bytef *source,
+                     uLong sourceLen) {
     return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
 }
 
@@ -69,8 +69,7 @@ int ZEXPORT compress (Bytef * dest, uLongf *destLen, const Bytef *source, uLong
      If the default memLevel or windowBits for deflateInit() is changed, then
    this function needs to be updated.
  */
-uLong ZEXPORT compressBound (uLong sourceLen)
-{
+uLong ZEXPORT compressBound(uLong sourceLen) {
     return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
            (sourceLen >> 25) + 13;
 }
diff --git a/frmts/zlib/crc32.c b/frmts/zlib/crc32.c
index c4dd6e550597..6c38f5c04c6a 100644
--- a/frmts/zlib/crc32.c
+++ b/frmts/zlib/crc32.c
@@ -98,10 +98,6 @@
 #  endif
 #endif
 
-/* Local functions. */
-local z_crc_t multmodp OF((z_crc_t a, z_crc_t b));
-local z_crc_t x2nmodp OF((z_off64_t n, unsigned k));
-
 /* If available, use the ARM processor CRC32 instruction. */
 #if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32) && W == 8
 #  define ARMCRC32
@@ -114,8 +110,7 @@ local z_crc_t x2nmodp OF((z_off64_t n, unsigned k));
   instruction, if one is available. This assumes that word_t is either 32 bits
   or 64 bits.
  */
-local z_word_t byte_swap(z_word_t word)
-{
+local z_word_t byte_swap(z_word_t word) {
 #  if W == 8
     return
         (word & 0xff00000000000000) >> 56 |
@@ -136,24 +131,77 @@ local z_word_t byte_swap(z_word_t word)
 }
 #endif
 
+#ifdef DYNAMIC_CRC_TABLE
+/* =========================================================================
+ * Table of powers of x for combining CRC-32s, filled in by make_crc_table()
+ * below.
+ */
+   local z_crc_t FAR x2n_table[32];
+#else
+/* =========================================================================
+ * Tables for byte-wise and braided CRC-32 calculations, and a table of powers
+ * of x for combining CRC-32s, all made by make_crc_table().
+ */
+#  include "crc32.h"
+#endif
+
 /* CRC polynomial. */
 #define POLY 0xedb88320         /* p(x) reflected, with x^32 implied */
 
-#ifdef DYNAMIC_CRC_TABLE
+/*
+  Return a(x) multiplied by b(x) modulo p(x), where p(x) is the CRC polynomial,
+  reflected. For speed, this requires that a not be zero.
+ */
+local z_crc_t multmodp(z_crc_t a, z_crc_t b) {
+    z_crc_t m, p;
+
+    m = (z_crc_t)1 << 31;
+    p = 0;
+    for (;;) {
+        if (a & m) {
+            p ^= b;
+            if ((a & (m - 1)) == 0)
+                break;
+        }
+        m >>= 1;
+        b = b & 1 ? (b >> 1) ^ POLY : b >> 1;
+    }
+    return p;
+}
+
+/*
+  Return x^(n * 2^k) modulo p(x). Requires that x2n_table[] has been
+  initialized.
+ */
+local z_crc_t x2nmodp(z_off64_t n, unsigned k) {
+    z_crc_t p;
+
+    p = (z_crc_t)1 << 31;           /* x^0 == 1 */
+    while (n) {
+        if (n & 1)
+            p = multmodp(x2n_table[k & 31], p);
+        n >>= 1;
+        k++;
+    }
+    return p;
+}
 
+#ifdef DYNAMIC_CRC_TABLE
+/* =========================================================================
+ * Build the tables for byte-wise and braided CRC-32 calculations, and a table
+ * of powers of x for combining CRC-32s.
+ */
 local z_crc_t FAR crc_table[256];
-local z_crc_t FAR x2n_table[32];
-local void make_crc_table OF((void));
 #ifdef W
    local z_word_t FAR crc_big_table[256];
    local z_crc_t FAR crc_braid_table[W][256];
    local z_word_t FAR crc_braid_big_table[W][256];
-   local void braid OF((z_crc_t [][256], z_word_t [][256], int, int));
+   local void braid(z_crc_t [][256], z_word_t [][256], int, int);
 #endif
 #ifdef MAKECRCH
-   local void write_table OF((FILE *, const z_crc_t FAR *, int));
-   local void write_table32hi OF((FILE *, const z_word_t FAR *, int));
-   local void write_table64 OF((FILE *, const z_word_t FAR *, int));
+   local void write_table(FILE *, const z_crc_t FAR *, int);
+   local void write_table32hi(FILE *, const z_word_t FAR *, int);
+   local void write_table64(FILE *, const z_word_t FAR *, int);
 #endif /* MAKECRCH */
 
 /*
@@ -166,7 +214,6 @@ local void make_crc_table OF((void));
 
 /* Definition of once functionality. */
 typedef struct once_s once_t;
-local void once OF((once_t *, void (*)(void)));
 
 /* Check for the availability of atomics. */
 #if defined(__STDC__) && __STDC_VERSION__ >= 201112L && \
@@ -186,10 +233,7 @@ struct once_s {
   invoke once() at the same time. The state must be a once_t initialized with
   ONCE_INIT.
  */
-local void once(state, init)
-    once_t *state;
-    void (*init)(void);
-{
+local void once(once_t *state, void (*init)(void)) {
     if (!atomic_load(&state->done)) {
         if (atomic_flag_test_and_set(&state->begun))
             while (!atomic_load(&state->done))
@@ -212,10 +256,7 @@ struct once_s {
 
 /* Test and set. Alas, not atomic, but tries to minimize the period of
    vulnerability. */
-local int test_and_set OF((int volatile *));
-local int test_and_set(flag)
-    int volatile *flag;
-{
+local int test_and_set(int volatile *flag) {
     int was;
 
     was = *flag;
@@ -224,10 +265,7 @@ local int test_and_set(flag)
 }
 
 /* Run the provided init() function once. This is not thread-safe. */
-local void once(state, init)
-    once_t *state;
-    void (*init)(void);
-{
+local void once(once_t *state, void (*init)(void)) {
     if (!state->done) {
         if (test_and_set(&state->begun))
             while (!state->done)
@@ -269,8 +307,7 @@ local once_t made = ONCE_INIT;
   combinations of CRC register values and incoming bytes.
  */
 
-local void make_crc_table()
-{
+local void make_crc_table(void) {
     unsigned i, j, n;
     z_crc_t p;
 
@@ -437,11 +474,7 @@ local void make_crc_table()
    Write the 32-bit values in table[0..k-1] to out, five per line in
    hexadecimal separated by commas.
  */
-local void write_table(out, table, k)
-    FILE *out;
-    const z_crc_t FAR *table;
-    int k;
-{
+local void write_table(FILE *out, const z_crc_t FAR *table, int k) {
     int n;
 
     for (n = 0; n < k; n++)
@@ -454,11 +487,7 @@ local void write_table(out, table, k)
    Write the high 32-bits of each value in table[0..k-1] to out, five per line
    in hexadecimal separated by commas.
  */
-local void write_table32hi(out, table, k)
-FILE *out;
-const z_word_t FAR *table;
-int k;
-{
+local void write_table32hi(FILE *out, const z_word_t FAR *table, int k) {
     int n;
 
     for (n = 0; n < k; n++)
@@ -474,11 +503,7 @@ int k;
   bits. If not, then the type cast and format string can be adjusted
   accordingly.
  */
-local void write_table64(out, table, k)
-    FILE *out;
-    const z_word_t FAR *table;
-    int k;
-{
+local void write_table64(FILE *out, const z_word_t FAR *table, int k) {
     int n;
 
     for (n = 0; n < k; n++)
@@ -488,8 +513,7 @@ local void write_table64(out, table, k)
 }
 
 /* Actually do the deed. */
-int main()
-{
+int main(void) {
     make_crc_table();
     return 0;
 }
@@ -501,12 +525,7 @@ int main()
   Generate the little and big-endian braid tables for the given n and z_word_t
   size w. Each array must have room for w blocks of 256 elements.
  */
-local void braid(ltl, big, n, w)
-    z_crc_t ltl[][256];
-    z_word_t big[][256];
-    int n;
-    int w;
-{
+local void braid(z_crc_t ltl[][256], z_word_t big[][256], int n, int w) {
     int k;
     z_crc_t i, p, q;
     for (k = 0; k < w; k++) {
@@ -521,65 +540,13 @@ local void braid(ltl, big, n, w)
 }
 #endif
 
-#else /* !DYNAMIC_CRC_TABLE */
-/* ========================================================================
- * Tables for byte-wise and braided CRC-32 calculations, and a table of powers
- * of x for combining CRC-32s, all made by make_crc_table().
- */
-#include "crc32.h"
 #endif /* DYNAMIC_CRC_TABLE */
 
-/* ========================================================================
- * Routines used for CRC calculation. Some are also required for the table
- * generation above.
- */
-
-/*
-  Return a(x) multiplied by b(x) modulo p(x), where p(x) is the CRC polynomial,
-  reflected. For speed, this requires that a not be zero.
- */
-local z_crc_t multmodp(z_crc_t a, z_crc_t b)
-{
-    z_crc_t m, p;
-
-    m = (z_crc_t)1 << 31;
-    p = 0;
-    for (;;) {
-        if (a & m) {
-            p ^= b;
-            if ((a & (m - 1)) == 0)
-                break;
-        }
-        m >>= 1;
-        b = b & 1 ? (b >> 1) ^ POLY : b >> 1;
-    }
-    return p;
-}
-
-/*
-  Return x^(n * 2^k) modulo p(x). Requires that x2n_table[] has been
-  initialized.
- */
-local z_crc_t x2nmodp(z_off64_t n, unsigned k)
-{
-    z_crc_t p;
-
-    p = (z_crc_t)1 << 31;           /* x^0 == 1 */
-    while (n) {
-        if (n & 1)
-            p = multmodp(x2n_table[k & 31], p);
-        n >>= 1;
-        k++;
-    }
-    return p;
-}
-
 /* =========================================================================
  * This function can be used by asm versions of crc32(), and to force the
  * generation of the CRC tables in a threaded application.
  */
-const z_crc_t FAR * ZEXPORT get_crc_table()
-{
+const z_crc_t FAR * ZEXPORT get_crc_table(void) {
 #ifdef DYNAMIC_CRC_TABLE
     once(&made, make_crc_table);
 #endif /* DYNAMIC_CRC_TABLE */
@@ -605,11 +572,8 @@ const z_crc_t FAR * ZEXPORT get_crc_table()
 #define Z_BATCH_ZEROS 0xa10d3d0c    /* computed from Z_BATCH = 3990 */
 #define Z_BATCH_MIN 800             /* fewest words in a final batch */
 
-unsigned long ZEXPORT crc32_z(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    z_size_t len;
-{
+unsigned long ZEXPORT crc32_z(unsigned long crc, const unsigned char FAR *buf,
+                              z_size_t len) {
     z_crc_t val;
     z_word_t crc1, crc2;
     const z_word_t *word;
@@ -625,7 +589,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
 #endif /* DYNAMIC_CRC_TABLE */
 
     /* Pre-condition the CRC */
-    crc ^= 0xffffffff;
+    crc = (~crc) & 0xffffffff;
 
     /* Compute the CRC up to a word boundary. */
     while (len && ((z_size_t)buf & 7) != 0) {
@@ -640,8 +604,8 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
     len &= 7;
 
     /* Do three interleaved CRCs to realize the throughput of one crc32x
-       instruction per cycle. Each CRC is calcuated on Z_BATCH words. The three
-       CRCs are combined into a single CRC after each set of batches. */
+       instruction per cycle. Each CRC is calculated on Z_BATCH words. The
+       three CRCs are combined into a single CRC after each set of batches. */
     while (num >= 3 * Z_BATCH) {
         crc1 = 0;
         crc2 = 0;
@@ -709,16 +673,14 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
   least-significant byte of the word as the first byte of data, without any pre
   or post conditioning. This is used to combine the CRCs of each braid.
  */
-local z_crc_t crc_word(z_word_t data)
-{
+local z_crc_t crc_word(z_word_t data) {
     int k;
     for (k = 0; k < W; k++)
         data = (data >> 8) ^ crc_table[data & 0xff];
     return (z_crc_t)data;
 }
 
-local z_word_t crc_word_big(z_word_t data)
-{
+local z_word_t crc_word_big(z_word_t data) {
     int k;
     for (k = 0; k < W; k++)
         data = (data << 8) ^
@@ -729,8 +691,8 @@ local z_word_t crc_word_big(z_word_t data)
 #endif
 
 /* ========================================================================= */
-unsigned long ZEXPORT crc32_z(unsigned long  crc, const unsigned char FAR *buf, z_size_t len)
-{
+unsigned long ZEXPORT crc32_z(unsigned long crc, const unsigned char FAR *buf,
+                              z_size_t len) {
     /* Return initial CRC, if requested. */
     if (buf == Z_NULL) return 0;
 
@@ -739,7 +701,7 @@ unsigned long ZEXPORT crc32_z(unsigned long  crc, const unsigned char FAR *buf,
 #endif /* DYNAMIC_CRC_TABLE */
 
     /* Pre-condition the CRC */
-    crc ^= 0xffffffff;
+    crc = (~crc) & 0xffffffff;
 
 #ifdef W
 
@@ -793,7 +755,7 @@ unsigned long ZEXPORT crc32_z(unsigned long  crc, const unsigned char FAR *buf,
 #endif
 
             /* Initialize the CRC for each braid. */
-            crc0 = (z_crc_t)crc;
+            crc0 = crc;
 #if N > 1
             crc1 = 0;
 #if N > 2
@@ -1050,29 +1012,26 @@ unsigned long ZEXPORT crc32_z(unsigned long  crc, const unsigned char FAR *buf,
 #endif
 
 /* ========================================================================= */
-unsigned long ZEXPORT crc32(unsigned long crc, const unsigned char FAR *buf, uInt len)
-{
+unsigned long ZEXPORT crc32(unsigned long crc, const unsigned char FAR *buf,
+                            uInt len) {
     return crc32_z(crc, buf, len);
 }
 
 /* ========================================================================= */
-uLong ZEXPORT crc32_combine64(uLong crc1, uLong crc2, z_off64_t len2)
-{
+uLong ZEXPORT crc32_combine64(uLong crc1, uLong crc2, z_off64_t len2) {
 #ifdef DYNAMIC_CRC_TABLE
     once(&made, make_crc_table);
 #endif /* DYNAMIC_CRC_TABLE */
-    return multmodp(x2nmodp(len2, 3), crc1) ^ crc2;
+    return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0xffffffff);
 }
 
 /* ========================================================================= */
-uLong ZEXPORT crc32_combine(uLong crc1, uLong crc2, z_off_t len2)
-{
-    return crc32_combine64(crc1, crc2, len2);
+uLong ZEXPORT crc32_combine(uLong crc1, uLong crc2, z_off_t len2) {
+    return crc32_combine64(crc1, crc2, (z_off64_t)len2);
 }
 
 /* ========================================================================= */
-uLong crc32_combine_gen64(z_off64_t len2)
-{
+uLong ZEXPORT crc32_combine_gen64(z_off64_t len2) {
 #ifdef DYNAMIC_CRC_TABLE
     once(&made, make_crc_table);
 #endif /* DYNAMIC_CRC_TABLE */
@@ -1080,13 +1039,11 @@ uLong crc32_combine_gen64(z_off64_t len2)
 }
 
 /* ========================================================================= */
-uLong ZEXPORT crc32_combine_gen(z_off_t len2)
-{
-    return crc32_combine_gen64(len2);
+uLong ZEXPORT crc32_combine_gen(z_off_t len2) {
+    return crc32_combine_gen64((z_off64_t)len2);
 }
 
 /* ========================================================================= */
-uLong crc32_combine_op(uLong crc1, uLong crc2, uLong op)
-{
-    return multmodp(op, crc1) ^ crc2;
+uLong ZEXPORT crc32_combine_op(uLong crc1, uLong crc2, uLong op) {
+    return multmodp(op, crc1) ^ (crc2 & 0xffffffff);
 }
diff --git a/frmts/zlib/deflate.c b/frmts/zlib/deflate.c
index a6535affa593..012ea8148e8d 100644
--- a/frmts/zlib/deflate.c
+++ b/frmts/zlib/deflate.c
@@ -1,5 +1,5 @@
 /* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
+ * Copyright (C) 1995-2024 Jean-loup Gailly and Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -52,7 +52,7 @@
 #include "deflate.h"
 
 const char deflate_copyright[] =
-   " deflate 1.2.12 Copyright 1995-2022 Jean-loup Gailly and Mark Adler ";
+   " deflate 1.3.1 Copyright 1995-2024 Jean-loup Gailly and Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -60,9 +60,6 @@ const char deflate_copyright[] =
   copyright string in the executable of your product.
  */
 
-/* ===========================================================================
- *  Function prototypes.
- */
 typedef enum {
     need_more,      /* block not completed, need more input or more output */
     block_done,     /* block flush performed */
@@ -70,35 +67,16 @@ typedef enum {
     finish_done     /* finish done, accept no more input or output */
 } block_state;
 
-typedef block_state (*compress_func) OF((deflate_state *s, int flush));
+typedef block_state (*compress_func)(deflate_state *s, int flush);
 /* Compression function. Returns the block state after the call. */
 
-local int deflateStateCheck      OF((z_streamp strm));
-local void slide_hash     OF((deflate_state *s));
-local void fill_window    OF((deflate_state *s));
-local block_state deflate_stored OF((deflate_state *s, int flush));
-local block_state deflate_fast   OF((deflate_state *s, int flush));
+local block_state deflate_stored(deflate_state *s, int flush);
+local block_state deflate_fast(deflate_state *s, int flush);
 #ifndef FASTEST
-local block_state deflate_slow   OF((deflate_state *s, int flush));
-#endif
-local block_state deflate_rle    OF((deflate_state *s, int flush));
-local block_state deflate_huff   OF((deflate_state *s, int flush));
-local void lm_init        OF((deflate_state *s));
-local void putShortMSB    OF((deflate_state *s, uInt b));
-local void flush_pending  OF((z_streamp strm));
-local unsigned read_buf   OF((z_streamp strm, Bytef *buf, unsigned size));
-#ifdef ASMV
-#  pragma message("Assembler code may have bugs -- use at your own risk")
-      void match_init OF((void)); /* asm code initialization */
-      uInt longest_match  OF((deflate_state *s, IPos cur_match));
-#else
-local uInt longest_match  OF((deflate_state *s, IPos cur_match));
-#endif
-
-#ifdef ZLIB_DEBUG
-local  void check_match OF((deflate_state *s, IPos start, IPos match,
-                            int length));
+local block_state deflate_slow(deflate_state *s, int flush);
 #endif
+local block_state deflate_rle(deflate_state *s, int flush);
+local block_state deflate_huff(deflate_state *s, int flush);
 
 /* ===========================================================================
  * Local data
@@ -160,7 +138,7 @@ local const config configuration_table[10] = {
  *    characters, so that a running hash key can be computed from the previous
  *    key instead of complete recalculation each time.
  */
-#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
+#define UPDATE_HASH(s,h,c) (h = (((h) << s->hash_shift) ^ (c)) & s->hash_mask)
 
 
 /* ===========================================================================
@@ -191,9 +169,9 @@ local const config configuration_table[10] = {
  */
 #define CLEAR_HASH(s) \
     do { \
-        s->head[s->hash_size-1] = NIL; \
+        s->head[s->hash_size - 1] = NIL; \
         zmemzero((Bytef *)s->head, \
-                 (unsigned)(s->hash_size-1)*sizeof(*s->head)); \
+                 (unsigned)(s->hash_size - 1)*sizeof(*s->head)); \
     } while (0)
 
 /* ===========================================================================
@@ -201,8 +179,12 @@ local const config configuration_table[10] = {
  * bit values at the expense of memory usage). We slide even when level == 0 to
  * keep the hash table consistent if we switch back to level > 0 later.
  */
-local void slide_hash(deflate_state *s)
-{
+#if defined(__has_feature)
+#  if __has_feature(memory_sanitizer)
+     __attribute__((no_sanitize("memory")))
+#  endif
+#endif
+local void slide_hash(deflate_state *s) {
     unsigned n, m;
     Posf *p;
     uInt wsize = s->w_size;
@@ -226,18 +208,177 @@ local void slide_hash(deflate_state *s)
 #endif
 }
 
+/* ===========================================================================
+ * Read a new buffer from the current input stream, update the adler32
+ * and total number of bytes read.  All deflate() input goes through
+ * this function so some applications may wish to modify it to avoid
+ * allocating a large strm->next_in buffer and copying from it.
+ * (See also flush_pending()).
+ */
+local unsigned read_buf(z_streamp strm, Bytef *buf, unsigned size) {
+    unsigned len = strm->avail_in;
+
+    if (len > size) len = size;
+    if (len == 0) return 0;
+
+    strm->avail_in  -= len;
+
+    zmemcpy(buf, strm->next_in, len);
+    if (strm->state->wrap == 1) {
+        strm->adler = adler32(strm->adler, buf, len);
+    }
+#ifdef GZIP
+    else if (strm->state->wrap == 2) {
+        strm->adler = crc32(strm->adler, buf, len);
+    }
+#endif
+    strm->next_in  += len;
+    strm->total_in += len;
+
+    return len;
+}
+
+/* ===========================================================================
+ * Fill the window when the lookahead becomes insufficient.
+ * Updates strstart and lookahead.
+ *
+ * IN assertion: lookahead < MIN_LOOKAHEAD
+ * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
+ *    At least one byte has been read, or avail_in == 0; reads are
+ *    performed for at least two bytes (required for the zip translate_eol
+ *    option -- not supported here).
+ */
+local void fill_window(deflate_state *s) {
+    unsigned n;
+    unsigned more;    /* Amount of free space at the end of the window. */
+    uInt wsize = s->w_size;
+
+    Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
+
+    do {
+        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
+
+        /* Deal with !@#$% 64K limit: */
+        if (sizeof(int) <= 2) {
+            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
+                more = wsize;
+
+            } else if (more == (unsigned)(-1)) {
+                /* Very unlikely, but possible on 16 bit machine if
+                 * strstart == 0 && lookahead == 1 (input done a byte at time)
+                 */
+                more--;
+            }
+        }
+
+        /* If the window is almost full and there is insufficient lookahead,
+         * move the upper half to the lower one to make room in the upper half.
+         */
+        if (s->strstart >= wsize + MAX_DIST(s)) {
+
+            zmemcpy(s->window, s->window + wsize, (unsigned)wsize - more);
+            s->match_start -= wsize;
+            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
+            s->block_start -= (long) wsize;
+            if (s->insert > s->strstart)
+                s->insert = s->strstart;
+            slide_hash(s);
+            more += wsize;
+        }
+        if (s->strm->avail_in == 0) break;
+
+        /* If there was no sliding:
+         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
+         *    more == window_size - lookahead - strstart
+         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
+         * => more >= window_size - 2*WSIZE + 2
+         * In the BIG_MEM or MMAP case (not yet supported),
+         *   window_size == input_size + MIN_LOOKAHEAD  &&
+         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
+         * Otherwise, window_size == 2*WSIZE so more >= 2.
+         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
+         */
+        Assert(more >= 2, "more < 2");
+
+        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
+        s->lookahead += n;
+
+        /* Initialize the hash value now that we have some input: */
+        if (s->lookahead + s->insert >= MIN_MATCH) {
+            uInt str = s->strstart - s->insert;
+            s->ins_h = s->window[str];
+            UPDATE_HASH(s, s->ins_h, s->window[str + 1]);
+#if MIN_MATCH != 3
+            Call UPDATE_HASH() MIN_MATCH-3 more times
+#endif
+            while (s->insert) {
+                UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
+#ifndef FASTEST
+                s->prev[str & s->w_mask] = s->head[s->ins_h];
+#endif
+                s->head[s->ins_h] = (Pos)str;
+                str++;
+                s->insert--;
+                if (s->lookahead + s->insert < MIN_MATCH)
+                    break;
+            }
+        }
+        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
+         * but this is not important since only literal bytes will be emitted.
+         */
+
+    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
+
+    /* If the WIN_INIT bytes after the end of the current data have never been
+     * written, then zero those bytes in order to avoid memory check reports of
+     * the use of uninitialized (or uninitialised as Julian writes) bytes by
+     * the longest match routines.  Update the high water mark for the next
+     * time through here.  WIN_INIT is set to MAX_MATCH since the longest match
+     * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.
+     */
+    if (s->high_water < s->window_size) {
+        ulg curr = s->strstart + (ulg)(s->lookahead);
+        ulg init;
+
+        if (s->high_water < curr) {
+            /* Previous high water mark below current data -- zero WIN_INIT
+             * bytes or up to end of window, whichever is less.
+             */
+            init = s->window_size - curr;
+            if (init > WIN_INIT)
+                init = WIN_INIT;
+            zmemzero(s->window + curr, (unsigned)init);
+            s->high_water = curr + init;
+        }
+        else if (s->high_water < (ulg)curr + WIN_INIT) {
+            /* High water mark at or above current data, but below current data
+             * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
+             * to end of window, whichever is less.
+             */
+            init = (ulg)curr + WIN_INIT - s->high_water;
+            if (init > s->window_size - s->high_water)
+                init = s->window_size - s->high_water;
+            zmemzero(s->window + s->high_water, (unsigned)init);
+            s->high_water += init;
+        }
+    }
+
+    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
+           "not enough room for search");
+}
+
 /* ========================================================================= */
-int ZEXPORT deflateInit_(z_streamp strm, int level, const char *version, int stream_size)
-{
+int ZEXPORT deflateInit_(z_streamp strm, int level, const char *version,
+                         int stream_size) {
     return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,
                          Z_DEFAULT_STRATEGY, version, stream_size);
     /* To do: ignore strm->next_in if we use it as window */
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateInit2_(z_streamp strm, int level, int method, int windowBits, int memLevel, int strategy,
-                  const char *version, int stream_size)
-{
+int ZEXPORT deflateInit2_(z_streamp strm, int level, int method,
+                          int windowBits, int memLevel, int strategy,
+                          const char *version, int stream_size) {
     deflate_state *s;
     int wrap = 1;
     static const char my_version[] = ZLIB_VERSION;
@@ -272,6 +413,8 @@ int ZEXPORT deflateInit2_(z_streamp strm, int level, int method, int windowBits,
 
     if (windowBits < 0) { /* suppress zlib wrapper */
         wrap = 0;
+        if (windowBits < -15)
+            return Z_STREAM_ERROR;
         windowBits = -windowBits;
     }
 #ifdef GZIP
@@ -301,7 +444,7 @@ int ZEXPORT deflateInit2_(z_streamp strm, int level, int method, int windowBits,
     s->hash_bits = (uInt)memLevel + 7;
     s->hash_size = 1 << s->hash_bits;
     s->hash_mask = s->hash_size - 1;
-    s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
+    s->hash_shift =  ((s->hash_bits + MIN_MATCH-1) / MIN_MATCH);
 
     s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
     s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
@@ -327,11 +470,11 @@ int ZEXPORT deflateInit2_(z_streamp strm, int level, int method, int windowBits,
      * sym_buf value to read moves forward three bytes. From that symbol, up to
      * 31 bits are written to pending_buf. The closest the written pending_buf
      * bits gets to the next sym_buf symbol to read is just before the last
-     * code is written. At that time, 31*(n-2) bits have been written, just
-     * after 24*(n-2) bits have been consumed from sym_buf. sym_buf starts at
-     * 8*n bits into pending_buf. (Note that the symbol buffer fills when n-1
+     * code is written. At that time, 31*(n - 2) bits have been written, just
+     * after 24*(n - 2) bits have been consumed from sym_buf. sym_buf starts at
+     * 8*n bits into pending_buf. (Note that the symbol buffer fills when n - 1
      * symbols are written.) The closest the writing gets to what is unread is
-     * then n+14 bits. Here n is lit_bufsize, which is 16384 by default, and
+     * then n + 14 bits. Here n is lit_bufsize, which is 16384 by default, and
      * can range from 128 to 32768.
      *
      * Therefore, at a minimum, there are 142 bits of space between what is
@@ -350,7 +493,7 @@ int ZEXPORT deflateInit2_(z_streamp strm, int level, int method, int windowBits,
      * symbols from which it is being constructed.
      */
 
-    s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 4);
+    s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, LIT_BUFS);
     s->pending_buf_size = (ulg)s->lit_bufsize * 4;
 
     if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
@@ -360,8 +503,14 @@ int ZEXPORT deflateInit2_(z_streamp strm, int level, int method, int windowBits,
         deflateEnd (strm);
         return Z_MEM_ERROR;
     }
+#ifdef LIT_MEM
+    s->d_buf = (ushf *)(s->pending_buf + (s->lit_bufsize << 1));
+    s->l_buf = s->pending_buf + (s->lit_bufsize << 2);
+    s->sym_end = s->lit_bufsize - 1;
+#else
     s->sym_buf = s->pending_buf + s->lit_bufsize;
     s->sym_end = (s->lit_bufsize - 1) * 3;
+#endif
     /* We avoid equality with lit_bufsize*3 because of wraparound at 64K
      * on 16 bit machines and because stored blocks are restricted to
      * 64K-1 bytes.
@@ -377,8 +526,7 @@ int ZEXPORT deflateInit2_(z_streamp strm, int level, int method, int windowBits,
 /* =========================================================================
  * Check for a valid deflate stream state. Return 0 if ok, 1 if not.
  */
-local int deflateStateCheck (z_streamp strm)
-{
+local int deflateStateCheck(z_streamp strm) {
     deflate_state *s;
     if (strm == Z_NULL ||
         strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0)
@@ -399,8 +547,8 @@ local int deflateStateCheck (z_streamp strm)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateSetDictionary (z_streamp strm, const Bytef *dictionary, uInt dictLength)
-{
+int ZEXPORT deflateSetDictionary(z_streamp strm, const Bytef *dictionary,
+                                 uInt  dictLength) {
     deflate_state *s;
     uInt str, n;
     int wrap;
@@ -465,8 +613,8 @@ int ZEXPORT deflateSetDictionary (z_streamp strm, const Bytef *dictionary, uInt
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateGetDictionary (z_streamp strm, Bytef *dictionary, uInt *dictLength)
-{
+int ZEXPORT deflateGetDictionary(z_streamp strm, Bytef *dictionary,
+                                 uInt *dictLength) {
     deflate_state *s;
     uInt len;
 
@@ -484,8 +632,7 @@ int ZEXPORT deflateGetDictionary (z_streamp strm, Bytef *dictionary, uInt *dictL
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateResetKeep (z_streamp strm)
-{
+int ZEXPORT deflateResetKeep(z_streamp strm) {
     deflate_state *s;
 
     if (deflateStateCheck(strm)) {
@@ -520,9 +667,32 @@ int ZEXPORT deflateResetKeep (z_streamp strm)
     return Z_OK;
 }
 
+/* ===========================================================================
+ * Initialize the "longest match" routines for a new zlib stream
+ */
+local void lm_init(deflate_state *s) {
+    s->window_size = (ulg)2L*s->w_size;
+
+    CLEAR_HASH(s);
+
+    /* Set the default configuration parameters:
+     */
+    s->max_lazy_match   = configuration_table[s->level].max_lazy;
+    s->good_match       = configuration_table[s->level].good_length;
+    s->nice_match       = configuration_table[s->level].nice_length;
+    s->max_chain_length = configuration_table[s->level].max_chain;
+
+    s->strstart = 0;
+    s->block_start = 0L;
+    s->lookahead = 0;
+    s->insert = 0;
+    s->match_length = s->prev_length = MIN_MATCH-1;
+    s->match_available = 0;
+    s->ins_h = 0;
+}
+
 /* ========================================================================= */
-int ZEXPORT deflateReset (z_streamp strm)
-{
+int ZEXPORT deflateReset(z_streamp strm) {
     int ret;
 
     ret = deflateResetKeep(strm);
@@ -532,8 +702,7 @@ int ZEXPORT deflateReset (z_streamp strm)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateSetHeader (z_streamp strm, gz_headerp head)
-{
+int ZEXPORT deflateSetHeader(z_streamp strm, gz_headerp head) {
     if (deflateStateCheck(strm) || strm->state->wrap != 2)
         return Z_STREAM_ERROR;
     strm->state->gzhead = head;
@@ -541,27 +710,31 @@ int ZEXPORT deflateSetHeader (z_streamp strm, gz_headerp head)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflatePending (z_streamp strm, unsigned *pending, int *bits)
-{
+int ZEXPORT deflatePending(z_streamp strm, unsigned *pending, int *bits) {
     if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
     if (pending != Z_NULL)
-        *pending = (unsigned)strm->state->pending;
+        *pending = strm->state->pending;
     if (bits != Z_NULL)
         *bits = strm->state->bi_valid;
     return Z_OK;
 }
 
 /* ========================================================================= */
-int ZEXPORT deflatePrime (z_streamp strm, int bits, int value)
-{
+int ZEXPORT deflatePrime(z_streamp strm, int bits, int value) {
     deflate_state *s;
     int put;
 
     if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
     s = strm->state;
+#ifdef LIT_MEM
+    if (bits < 0 || bits > 16 ||
+        (uchf *)s->d_buf < s->pending_out + ((Buf_size + 7) >> 3))
+        return Z_BUF_ERROR;
+#else
     if (bits < 0 || bits > 16 ||
         s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3))
         return Z_BUF_ERROR;
+#endif
     do {
         put = Buf_size - s->bi_valid;
         if (put > bits)
@@ -576,8 +749,7 @@ int ZEXPORT deflatePrime (z_streamp strm, int bits, int value)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateParams(z_streamp strm, int level, int strategy)
-{
+int ZEXPORT deflateParams(z_streamp strm, int level, int strategy) {
     deflate_state *s;
     compress_func func;
 
@@ -622,8 +794,8 @@ int ZEXPORT deflateParams(z_streamp strm, int level, int strategy)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateTune(z_streamp strm, int good_length, int max_lazy, int nice_length, int max_chain)
-{
+int ZEXPORT deflateTune(z_streamp strm, int good_length, int max_lazy,
+                        int nice_length, int max_chain) {
     deflate_state *s;
 
     if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
@@ -636,34 +808,47 @@ int ZEXPORT deflateTune(z_streamp strm, int good_length, int max_lazy, int nice_
 }
 
 /* =========================================================================
- * For the default windowBits of 15 and memLevel of 8, this function returns
- * a close to exact, as well as small, upper bound on the compressed size.
- * They are coded as constants here for a reason--if the #define's are
- * changed, then this function needs to be changed as well.  The return
- * value for 15 and 8 only works for those exact settings.
+ * For the default windowBits of 15 and memLevel of 8, this function returns a
+ * close to exact, as well as small, upper bound on the compressed size. This
+ * is an expansion of ~0.03%, plus a small constant.
  *
- * For any setting other than those defaults for windowBits and memLevel,
- * the value returned is a conservative worst case for the maximum expansion
- * resulting from using fixed blocks instead of stored blocks, which deflate
- * can emit on compressed data for some combinations of the parameters.
+ * For any setting other than those defaults for windowBits and memLevel, one
+ * of two worst case bounds is returned. This is at most an expansion of ~4% or
+ * ~13%, plus a small constant.
  *
- * This function could be more sophisticated to provide closer upper bounds for
- * every combination of windowBits and memLevel.  But even the conservative
- * upper bound of about 14% expansion does not seem onerous for output buffer
- * allocation.
+ * Both the 0.03% and 4% derive from the overhead of stored blocks. The first
+ * one is for stored blocks of 16383 bytes (memLevel == 8), whereas the second
+ * is for stored blocks of 127 bytes (the worst case memLevel == 1). The
+ * expansion results from five bytes of header for each stored block.
+ *
+ * The larger expansion of 13% results from a window size less than or equal to
+ * the symbols buffer size (windowBits <= memLevel + 7). In that case some of
+ * the data being compressed may have slid out of the sliding window, impeding
+ * a stored block from being emitted. Then the only choice is a fixed or
+ * dynamic block, where a fixed block limits the maximum expansion to 9 bits
+ * per 8-bit byte, plus 10 bits for every block. The smallest block size for
+ * which this can occur is 255 (memLevel == 2).
+ *
+ * Shifts are used to approximate divisions, for speed.
  */
-uLong ZEXPORT deflateBound(z_streamp strm, uLong sourceLen)
-{
+uLong ZEXPORT deflateBound(z_streamp strm, uLong sourceLen) {
     deflate_state *s;
-    uLong complen, wraplen;
+    uLong fixedlen, storelen, wraplen;
+
+    /* upper bound for fixed blocks with 9-bit literals and length 255
+       (memLevel == 2, which is the lowest that may not use stored blocks) --
+       ~13% overhead plus a small constant */
+    fixedlen = sourceLen + (sourceLen >> 3) + (sourceLen >> 8) +
+               (sourceLen >> 9) + 4;
 
-    /* conservative upper bound for compressed data */
-    complen = sourceLen +
-              ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5;
+    /* upper bound for stored blocks with length 127 (memLevel == 1) --
+       ~4% overhead plus a small constant */
+    storelen = sourceLen + (sourceLen >> 5) + (sourceLen >> 7) +
+               (sourceLen >> 11) + 7;
 
-    /* if can't get parameters, return conservative bound plus zlib wrapper */
+    /* if can't get parameters, return larger bound plus a zlib wrapper */
     if (deflateStateCheck(strm))
-        return complen + 6;
+        return (fixedlen > storelen ? fixedlen : storelen) + 6;
 
     /* compute wrapper length */
     s = strm->state;
@@ -700,11 +885,13 @@ uLong ZEXPORT deflateBound(z_streamp strm, uLong sourceLen)
         wraplen = 6;
     }
 
-    /* if not default parameters, return conservative bound */
+    /* if not default parameters, return one of the conservative bounds */
     if (s->w_bits != 15 || s->hash_bits != 8 + 7)
-        return complen + wraplen;
+        return (s->w_bits <= s->hash_bits && s->level ? fixedlen : storelen) +
+               wraplen;
 
-    /* default settings: return tight bound for that case */
+    /* default settings: return tight bound for that case -- ~0.03% overhead
+       plus a small constant */
     return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
            (sourceLen >> 25) + 13 - 6 + wraplen;
 }
@@ -714,8 +901,7 @@ uLong ZEXPORT deflateBound(z_streamp strm, uLong sourceLen)
  * IN assertion: the stream state is correct and there is enough room in
  * pending_buf.
  */
-local void putShortMSB (deflate_state *s, uInt b)
-{
+local void putShortMSB(deflate_state *s, uInt b) {
     put_byte(s, (Byte)(b >> 8));
     put_byte(s, (Byte)(b & 0xff));
 }
@@ -726,13 +912,12 @@ local void putShortMSB (deflate_state *s, uInt b)
  * applications may wish to modify it to avoid allocating a large
  * strm->next_out buffer and copying into it. (See also read_buf()).
  */
-local void flush_pending(z_streamp strm)
-{
+local void flush_pending(z_streamp strm) {
     unsigned len;
     deflate_state *s = strm->state;
 
     _tr_flush_bits(s);
-    len = (unsigned)s->pending;
+    len = s->pending;
     if (len > strm->avail_out) len = strm->avail_out;
     if (len == 0) return;
 
@@ -758,8 +943,7 @@ local void flush_pending(z_streamp strm)
     } while (0)
 
 /* ========================================================================= */
-int ZEXPORT deflate (z_streamp strm, int flush)
-{
+int ZEXPORT deflate(z_streamp strm, int flush) {
     int old_flush; /* value of flush param for previous deflate call */
     deflate_state *s;
 
@@ -811,7 +995,7 @@ int ZEXPORT deflate (z_streamp strm, int flush)
         s->status = BUSY_STATE;
     if (s->status == INIT_STATE) {
         /* zlib header */
-        uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
+        uInt header = (Z_DEFLATED + ((s->w_bits - 8) << 4)) << 8;
         uInt level_flags;
 
         if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
@@ -898,9 +1082,9 @@ int ZEXPORT deflate (z_streamp strm, int flush)
     if (s->status == EXTRA_STATE) {
         if (s->gzhead->extra != Z_NULL) {
             ulg beg = s->pending;   /* start of bytes to update crc */
-            uInt left = (uInt)((s->gzhead->extra_len & 0xffff) - s->gzindex);
+            uInt left = (s->gzhead->extra_len & 0xffff) - s->gzindex;
             while (s->pending + left > s->pending_buf_size) {
-                uInt copy = (uInt)(s->pending_buf_size - s->pending);
+                uInt copy = s->pending_buf_size - s->pending;
                 zmemcpy(s->pending_buf + s->pending,
                         s->gzhead->extra + s->gzindex, copy);
                 s->pending = s->pending_buf_size;
@@ -1071,8 +1255,7 @@ int ZEXPORT deflate (z_streamp strm, int flush)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateEnd (z_streamp strm)
-{
+int ZEXPORT deflateEnd(z_streamp strm) {
     int status;
 
     if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
@@ -1096,9 +1279,10 @@ int ZEXPORT deflateEnd (z_streamp strm)
  * To simplify the source, this is not supported for 16-bit MSDOS (which
  * doesn't have enough memory anyway to duplicate compression states).
  */
-int ZEXPORT deflateCopy (z_streamp dest, z_streamp source)
-{
+int ZEXPORT deflateCopy(z_streamp dest, z_streamp source) {
 #ifdef MAXSEG_64K
+    (void)dest;
+    (void)source;
     return Z_STREAM_ERROR;
 #else
     deflate_state *ds;
@@ -1122,7 +1306,7 @@ int ZEXPORT deflateCopy (z_streamp dest, z_streamp source)
     ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
     ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
     ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
-    ds->pending_buf = (uchf *) ZALLOC(dest, ds->lit_bufsize, 4);
+    ds->pending_buf = (uchf *) ZALLOC(dest, ds->lit_bufsize, LIT_BUFS);
 
     if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
         ds->pending_buf == Z_NULL) {
@@ -1133,10 +1317,15 @@ int ZEXPORT deflateCopy (z_streamp dest, z_streamp source)
     zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
     zmemcpy((voidpf)ds->prev, (voidpf)ss->prev, ds->w_size * sizeof(Pos));
     zmemcpy((voidpf)ds->head, (voidpf)ss->head, ds->hash_size * sizeof(Pos));
-    zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
+    zmemcpy(ds->pending_buf, ss->pending_buf, ds->lit_bufsize * LIT_BUFS);
 
     ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
+#ifdef LIT_MEM
+    ds->d_buf = (ushf *)(ds->pending_buf + (ds->lit_bufsize << 1));
+    ds->l_buf = ds->pending_buf + (ds->lit_bufsize << 2);
+#else
     ds->sym_buf = ds->pending_buf + ds->lit_bufsize;
+#endif
 
     ds->l_desc.dyn_tree = ds->dyn_ltree;
     ds->d_desc.dyn_tree = ds->dyn_dtree;
@@ -1146,67 +1335,6 @@ int ZEXPORT deflateCopy (z_streamp dest, z_streamp source)
 #endif /* MAXSEG_64K */
 }
 
-/* ===========================================================================
- * Read a new buffer from the current input stream, update the adler32
- * and total number of bytes read.  All deflate() input goes through
- * this function so some applications may wish to modify it to avoid
- * allocating a large strm->next_in buffer and copying from it.
- * (See also flush_pending()).
- */
-local unsigned read_buf(z_streamp strm, Byte *buf, unsigned size)
-{
-    unsigned len = strm->avail_in;
-
-    if (len > size) len = size;
-    if (len == 0) return 0;
-
-    strm->avail_in  -= len;
-
-    zmemcpy(buf, strm->next_in, len);
-    if (strm->state->wrap == 1) {
-        strm->adler = adler32(strm->adler, buf, len);
-    }
-#ifdef GZIP
-    else if (strm->state->wrap == 2) {
-        strm->adler = crc32(strm->adler, buf, len);
-    }
-#endif
-    strm->next_in  += len;
-    strm->total_in += len;
-
-    return len;
-}
-
-/* ===========================================================================
- * Initialize the "longest match" routines for a new zlib stream
- */
-local void lm_init (deflate_state *s)
-{
-    s->window_size = (ulg)2L*s->w_size;
-
-    CLEAR_HASH(s);
-
-    /* Set the default configuration parameters:
-     */
-    s->max_lazy_match   = configuration_table[s->level].max_lazy;
-    s->good_match       = configuration_table[s->level].good_length;
-    s->nice_match       = configuration_table[s->level].nice_length;
-    s->max_chain_length = configuration_table[s->level].max_chain;
-
-    s->strstart = 0;
-    s->block_start = 0L;
-    s->lookahead = 0;
-    s->insert = 0;
-    s->match_length = s->prev_length = MIN_MATCH-1;
-    s->match_available = 0;
-    s->ins_h = 0;
-#ifndef FASTEST
-#ifdef ASMV
-    match_init(); /* initialize the asm code */
-#endif
-#endif
-}
-
 #ifndef FASTEST
 /* ===========================================================================
  * Set match_start to the longest match starting at the given string and
@@ -1217,12 +1345,7 @@ local void lm_init (deflate_state *s)
  *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
  * OUT assertion: the match length is not greater than s->lookahead.
  */
-#ifndef ASMV
-/* For 80x86 and 680x0, an optimized version will be provided in match.asm or
- * match.S. The code will be functionally equivalent.
- */
-local uInt longest_match(deflate_state *s, IPos cur_match)
-{
+local uInt longest_match(deflate_state *s, IPos cur_match) {
     unsigned chain_length = s->max_chain_length;/* max hash chain length */
     register Bytef *scan = s->window + s->strstart; /* current string */
     register Bytef *match;                      /* matched string */
@@ -1243,10 +1366,10 @@ local uInt longest_match(deflate_state *s, IPos cur_match)
      */
     register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
     register ush scan_start = *(ushf*)scan;
-    register ush scan_end   = *(ushf*)(scan+best_len-1);
+    register ush scan_end   = *(ushf*)(scan + best_len - 1);
 #else
     register Bytef *strend = s->window + s->strstart + MAX_MATCH;
-    register Byte scan_end1  = scan[best_len-1];
+    register Byte scan_end1  = scan[best_len - 1];
     register Byte scan_end   = scan[best_len];
 #endif
 
@@ -1264,7 +1387,8 @@ local uInt longest_match(deflate_state *s, IPos cur_match)
      */
     if ((uInt)nice_match > s->lookahead) nice_match = (int)s->lookahead;
 
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
+           "need lookahead");
 
     do {
         Assert(cur_match < s->strstart, "no future");
@@ -1282,54 +1406,54 @@ local uInt longest_match(deflate_state *s, IPos cur_match)
         /* This code assumes sizeof(unsigned short) == 2. Do not use
          * UNALIGNED_OK if your compiler uses a different size.
          */
-        if (*(ushf*)(match+best_len-1) != scan_end ||
+        if (*(ushf*)(match + best_len - 1) != scan_end ||
             *(ushf*)match != scan_start) continue;
 
         /* It is not necessary to compare scan[2] and match[2] since they are
          * always equal when the other bytes match, given that the hash keys
          * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
-         * strstart+3, +5, ... up to strstart+257. We check for insufficient
+         * strstart + 3, + 5, up to strstart + 257. We check for insufficient
          * lookahead only every 4th comparison; the 128th check will be made
-         * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
+         * at strstart + 257. If MAX_MATCH-2 is not a multiple of 8, it is
          * necessary to put more guard bytes at the end of the window, or
          * to check more often for insufficient lookahead.
          */
         Assert(scan[2] == match[2], "scan[2]?");
         scan++, match++;
         do {
-        } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+        } while (*(ushf*)(scan += 2) == *(ushf*)(match += 2) &&
+                 *(ushf*)(scan += 2) == *(ushf*)(match += 2) &&
+                 *(ushf*)(scan += 2) == *(ushf*)(match += 2) &&
+                 *(ushf*)(scan += 2) == *(ushf*)(match += 2) &&
                  scan < strend);
         /* The funny "do {}" generates better code on most compilers */
 
-        /* Here, scan <= window+strstart+257 */
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+        /* Here, scan <= window + strstart + 257 */
+        Assert(scan <= s->window + (unsigned)(s->window_size - 1),
+               "wild scan");
         if (*scan == *match) scan++;
 
-        len = (MAX_MATCH - 1) - (int)(strend-scan);
+        len = (MAX_MATCH - 1) - (int)(strend - scan);
         scan = strend - (MAX_MATCH-1);
 
 #else /* UNALIGNED_OK */
 
-        if (match[best_len]   != scan_end  ||
-            match[best_len-1] != scan_end1 ||
-            *match            != *scan     ||
-            *++match          != scan[1])      continue;
+        if (match[best_len]     != scan_end  ||
+            match[best_len - 1] != scan_end1 ||
+            *match              != *scan     ||
+            *++match            != scan[1])      continue;
 
-        /* The check at best_len-1 can be removed because it will be made
+        /* The check at best_len - 1 can be removed because it will be made
          * again later. (This heuristic is not always a win.)
          * It is not necessary to compare scan[2] and match[2] since they
          * are always equal when the other bytes match, given that
          * the hash keys are equal and that HASH_BITS >= 8.
          */
-        scan += 2;
-        match++;
+        scan += 2, match++;
         Assert(*scan == *match, "match[2]?");
 
         /* We check for insufficient lookahead only every 8th comparison;
-         * the 256th check will be made at strstart+258.
+         * the 256th check will be made at strstart + 258.
          */
         do {
         } while (*++scan == *++match && *++scan == *++match &&
@@ -1338,7 +1462,8 @@ local uInt longest_match(deflate_state *s, IPos cur_match)
                  *++scan == *++match && *++scan == *++match &&
                  scan < strend);
 
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+        Assert(scan <= s->window + (unsigned)(s->window_size - 1),
+               "wild scan");
 
         len = MAX_MATCH - (int)(strend - scan);
         scan = strend - MAX_MATCH;
@@ -1350,9 +1475,9 @@ local uInt longest_match(deflate_state *s, IPos cur_match)
             best_len = len;
             if (len >= nice_match) break;
 #ifdef UNALIGNED_OK
-            scan_end = *(ushf*)(scan+best_len-1);
+            scan_end = *(ushf*)(scan + best_len - 1);
 #else
-            scan_end1  = scan[best_len-1];
+            scan_end1  = scan[best_len - 1];
             scan_end   = scan[best_len];
 #endif
         }
@@ -1362,17 +1487,13 @@ local uInt longest_match(deflate_state *s, IPos cur_match)
     if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
     return s->lookahead;
 }
-#endif /* ASMV */
 
 #else /* FASTEST */
 
 /* ---------------------------------------------------------------------------
  * Optimized version for FASTEST only
  */
-local uInt longest_match(s, cur_match)
-    deflate_state *s;
-    IPos cur_match;                             /* current match */
-{
+local uInt longest_match(deflate_state *s, IPos cur_match) {
     register Bytef *scan = s->window + s->strstart; /* current string */
     register Bytef *match;                       /* matched string */
     register int len;                           /* length of current match */
@@ -1383,7 +1504,8 @@ local uInt longest_match(s, cur_match)
      */
     Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
 
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
+           "need lookahead");
 
     Assert(cur_match < s->strstart, "no future");
 
@@ -1393,7 +1515,7 @@ local uInt longest_match(s, cur_match)
      */
     if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;
 
-    /* The check at best_len-1 can be removed because it will be made
+    /* The check at best_len - 1 can be removed because it will be made
      * again later. (This heuristic is not always a win.)
      * It is not necessary to compare scan[2] and match[2] since they
      * are always equal when the other bytes match, given that
@@ -1403,7 +1525,7 @@ local uInt longest_match(s, cur_match)
     Assert(*scan == *match, "match[2]?");
 
     /* We check for insufficient lookahead only every 8th comparison;
-     * the 256th check will be made at strstart+258.
+     * the 256th check will be made at strstart + 258.
      */
     do {
     } while (*++scan == *++match && *++scan == *++match &&
@@ -1412,7 +1534,7 @@ local uInt longest_match(s, cur_match)
              *++scan == *++match && *++scan == *++match &&
              scan < strend);
 
-    Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+    Assert(scan <= s->window + (unsigned)(s->window_size - 1), "wild scan");
 
     len = MAX_MATCH - (int)(strend - scan);
 
@@ -1432,23 +1554,27 @@ local uInt longest_match(s, cur_match)
 /* ===========================================================================
  * Check that the match at match_start is indeed a match.
  */
-local void check_match(s, start, match, length)
-    deflate_state *s;
-    IPos start, match;
-    int length;
-{
+local void check_match(deflate_state *s, IPos start, IPos match, int length) {
     /* check that the match is indeed a match */
-    if (zmemcmp(s->window + match,
-                s->window + start, length) != EQUAL) {
-        fprintf(stderr, " start %u, match %u, length %d\n",
-                start, match, length);
+    Bytef *back = s->window + (int)match, *here = s->window + start;
+    IPos len = length;
+    if (match == (IPos)-1) {
+        /* match starts one byte before the current window -- just compare the
+           subsequent length-1 bytes */
+        back++;
+        here++;
+        len--;
+    }
+    if (zmemcmp(back, here, len) != EQUAL) {
+        fprintf(stderr, " start %u, match %d, length %d\n",
+                start, (int)match, length);
         do {
-            fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);
-        } while (--length != 0);
+            fprintf(stderr, "(%02x %02x)", *back++, *here++);
+        } while (--len != 0);
         z_error("invalid match");
     }
     if (z_verbose > 1) {
-        fprintf(stderr,"\\[%d,%d]", start-match, length);
+        fprintf(stderr,"\\[%d,%d]", start - match, length);
         do { putc(s->window[start++], stderr); } while (--length != 0);
     }
 }
@@ -1456,136 +1582,6 @@ local void check_match(s, start, match, length)
 #  define check_match(s, start, match, length)
 #endif /* ZLIB_DEBUG */
 
-/* ===========================================================================
- * Fill the window when the lookahead becomes insufficient.
- * Updates strstart and lookahead.
- *
- * IN assertion: lookahead < MIN_LOOKAHEAD
- * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
- *    At least one byte has been read, or avail_in == 0; reads are
- *    performed for at least two bytes (required for the zip translate_eol
- *    option -- not supported here).
- */
-local void fill_window(deflate_state *s)
-{
-    unsigned n;
-    unsigned more;    /* Amount of free space at the end of the window. */
-    uInt wsize = s->w_size;
-
-    Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
-
-    do {
-        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
-
-        /* Deal with !@#$% 64K limit: */
-        if (sizeof(int) <= 2) {
-            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
-                more = wsize;
-
-            } else if (more == (unsigned)(-1)) {
-                /* Very unlikely, but possible on 16 bit machine if
-                 * strstart == 0 && lookahead == 1 (input done a byte at time)
-                 */
-                more--;
-            }
-        }
-
-        /* If the window is almost full and there is insufficient lookahead,
-         * move the upper half to the lower one to make room in the upper half.
-         */
-        if (s->strstart >= wsize+MAX_DIST(s)) {
-
-            zmemcpy(s->window, s->window+wsize, (unsigned)wsize - more);
-            s->match_start -= wsize;
-            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
-            s->block_start -= (long) wsize;
-            if (s->insert > s->strstart)
-                s->insert = s->strstart;
-            slide_hash(s);
-            more += wsize;
-        }
-        if (s->strm->avail_in == 0) break;
-
-        /* If there was no sliding:
-         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
-         *    more == window_size - lookahead - strstart
-         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
-         * => more >= window_size - 2*WSIZE + 2
-         * In the BIG_MEM or MMAP case (not yet supported),
-         *   window_size == input_size + MIN_LOOKAHEAD  &&
-         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
-         * Otherwise, window_size == 2*WSIZE so more >= 2.
-         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
-         */
-        Assert(more >= 2, "more < 2");
-
-        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
-        s->lookahead += n;
-
-        /* Initialize the hash value now that we have some input: */
-        if (s->lookahead + s->insert >= MIN_MATCH) {
-            uInt str = s->strstart - s->insert;
-            s->ins_h = s->window[str];
-            UPDATE_HASH(s, s->ins_h, s->window[str + 1]);
-#if MIN_MATCH != 3
-            Call UPDATE_HASH() MIN_MATCH-3 more times
-#endif
-            while (s->insert) {
-                UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
-#ifndef FASTEST
-                s->prev[str & s->w_mask] = s->head[s->ins_h];
-#endif
-                s->head[s->ins_h] = (Pos)str;
-                str++;
-                s->insert--;
-                if (s->lookahead + s->insert < MIN_MATCH)
-                    break;
-            }
-        }
-        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
-         * but this is not important since only literal bytes will be emitted.
-         */
-
-    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
-
-    /* If the WIN_INIT bytes after the end of the current data have never been
-     * written, then zero those bytes in order to avoid memory check reports of
-     * the use of uninitialized (or uninitialised as Julian writes) bytes by
-     * the longest match routines.  Update the high water mark for the next
-     * time through here.  WIN_INIT is set to MAX_MATCH since the longest match
-     * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.
-     */
-    if (s->high_water < s->window_size) {
-        ulg curr = s->strstart + (ulg)(s->lookahead);
-        ulg init;
-
-        if (s->high_water < curr) {
-            /* Previous high water mark below current data -- zero WIN_INIT
-             * bytes or up to end of window, whichever is less.
-             */
-            init = s->window_size - curr;
-            if (init > WIN_INIT)
-                init = WIN_INIT;
-            zmemzero(s->window + curr, (unsigned)init);
-            s->high_water = curr + init;
-        }
-        else if (s->high_water < (ulg)curr + WIN_INIT) {
-            /* High water mark at or above current data, but below current data
-             * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
-             * to end of window, whichever is less.
-             */
-            init = (ulg)curr + WIN_INIT - s->high_water;
-            if (init > s->window_size - s->high_water)
-                init = s->window_size - s->high_water;
-            zmemzero(s->window + s->high_water, (unsigned)init);
-            s->high_water += init;
-        }
-    }
-
-    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
-           "not enough room for search");
-}
-
 /* ===========================================================================
  * Flush the current block, with given end-of-file flag.
  * IN assertion: strstart is set to the end of the current match.
@@ -1626,15 +1622,14 @@ local void fill_window(deflate_state *s)
  *
  * deflate_stored() is written to minimize the number of times an input byte is
  * copied. It is most efficient with large input and output buffers, which
- * maximizes the opportunites to have a single copy from next_in to next_out.
+ * maximizes the opportunities to have a single copy from next_in to next_out.
  */
-local block_state deflate_stored(deflate_state *s, int flush)
-{
+local block_state deflate_stored(deflate_state *s, int flush) {
     /* Smallest worthy block size when not flushing or finishing. By default
      * this is 32K. This can be as small as 507 bytes for memLevel == 1. For
      * large input and output buffers, the stored block size will be larger.
      */
-    unsigned min_block = (unsigned)MIN(s->pending_buf_size - 5, s->w_size);
+    unsigned min_block = MIN(s->pending_buf_size - 5, s->w_size);
 
     /* Copy as many min_block or larger stored blocks directly to next_out as
      * possible. If flushing, copy the remaining available input to next_out as
@@ -1653,7 +1648,7 @@ local block_state deflate_stored(deflate_state *s, int flush)
             break;
             /* maximum stored block length that will fit in avail_out: */
         have = s->strm->avail_out - have;
-        left = (unsigned)(s->strstart - s->block_start);    /* bytes left in window */
+        left = s->strstart - s->block_start;    /* bytes left in window */
         if (len > (ulg)left + s->strm->avail_in)
             len = left + s->strm->avail_in;     /* limit len to the input */
         if (len > have)
@@ -1759,7 +1754,7 @@ local block_state deflate_stored(deflate_state *s, int flush)
         return block_done;
 
     /* Fill the window with any remaining input. */
-    have = (unsigned)(s->window_size - s->strstart);
+    have = s->window_size - s->strstart;
     if (s->strm->avail_in > have && s->block_start >= (long)s->w_size) {
         /* Slide the window down. */
         s->block_start -= s->w_size;
@@ -1788,9 +1783,9 @@ local block_state deflate_stored(deflate_state *s, int flush)
      */
     have = (s->bi_valid + 42) >> 3;         /* number of header bytes */
         /* maximum stored block length that will fit in pending: */
-    have = (unsigned)MIN(s->pending_buf_size - have, MAX_STORED);
+    have = MIN(s->pending_buf_size - have, MAX_STORED);
     min_block = MIN(have, s->w_size);
-    left = (unsigned)(s->strstart - s->block_start);
+    left = s->strstart - s->block_start;
     if (left >= min_block ||
         ((left || flush == Z_FINISH) && flush != Z_NO_FLUSH &&
          s->strm->avail_in == 0 && left <= have)) {
@@ -1813,8 +1808,7 @@ local block_state deflate_stored(deflate_state *s, int flush)
  * new strings in the dictionary only for unmatched strings or for short
  * matches. It is used only for the fast compression options.
  */
-local block_state deflate_fast(deflate_state *s, int flush)
-{
+local block_state deflate_fast(deflate_state *s, int flush) {
     IPos hash_head;       /* head of the hash chain */
     int bflush;           /* set if current block must be flushed */
 
@@ -1832,7 +1826,7 @@ local block_state deflate_fast(deflate_state *s, int flush)
             if (s->lookahead == 0) break; /* flush the current block */
         }
 
-        /* Insert the string window[strstart .. strstart+2] in the
+        /* Insert the string window[strstart .. strstart + 2] in the
          * dictionary, and set hash_head to the head of the hash chain:
          */
         hash_head = NIL;
@@ -1880,7 +1874,7 @@ local block_state deflate_fast(deflate_state *s, int flush)
                 s->strstart += s->match_length;
                 s->match_length = 0;
                 s->ins_h = s->window[s->strstart];
-                UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
+                UPDATE_HASH(s, s->ins_h, s->window[s->strstart + 1]);
 #if MIN_MATCH != 3
                 Call UPDATE_HASH() MIN_MATCH-3 more times
 #endif
@@ -1891,7 +1885,7 @@ local block_state deflate_fast(deflate_state *s, int flush)
         } else {
             /* No match, output a literal byte */
             Tracevv((stderr,"%c", s->window[s->strstart]));
-            _tr_tally_lit (s, s->window[s->strstart], bflush);
+            _tr_tally_lit(s, s->window[s->strstart], bflush);
             s->lookahead--;
             s->strstart++;
         }
@@ -1913,8 +1907,7 @@ local block_state deflate_fast(deflate_state *s, int flush)
  * evaluation for matches: a match is finally adopted only if there is
  * no better match at the next window position.
  */
-local block_state deflate_slow(deflate_state *s, int flush)
-{
+local block_state deflate_slow(deflate_state *s, int flush) {
     IPos hash_head;          /* head of hash chain */
     int bflush;              /* set if current block must be flushed */
 
@@ -1933,7 +1926,7 @@ local block_state deflate_slow(deflate_state *s, int flush)
             if (s->lookahead == 0) break; /* flush the current block */
         }
 
-        /* Insert the string window[strstart .. strstart+2] in the
+        /* Insert the string window[strstart .. strstart + 2] in the
          * dictionary, and set hash_head to the head of the hash chain:
          */
         hash_head = NIL;
@@ -1943,8 +1936,7 @@ local block_state deflate_slow(deflate_state *s, int flush)
 
         /* Find the longest match, discarding those <= prev_length.
          */
-        s->prev_length = s->match_length;
-        s->prev_match = s->match_start;
+        s->prev_length = s->match_length, s->prev_match = s->match_start;
         s->match_length = MIN_MATCH-1;
 
         if (hash_head != NIL && s->prev_length < s->max_lazy_match &&
@@ -1976,17 +1968,17 @@ local block_state deflate_slow(deflate_state *s, int flush)
             uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
             /* Do not insert strings in hash table beyond this. */
 
-            check_match(s, s->strstart-1, s->prev_match, s->prev_length);
+            check_match(s, s->strstart - 1, s->prev_match, s->prev_length);
 
-            _tr_tally_dist(s, s->strstart -1 - s->prev_match,
+            _tr_tally_dist(s, s->strstart - 1 - s->prev_match,
                            s->prev_length - MIN_MATCH, bflush);
 
             /* Insert in hash table all strings up to the end of the match.
-             * strstart-1 and strstart are already inserted. If there is not
+             * strstart - 1 and strstart are already inserted. If there is not
              * enough lookahead, the last two strings are not inserted in
              * the hash table.
              */
-            s->lookahead -= s->prev_length-1;
+            s->lookahead -= s->prev_length - 1;
             s->prev_length -= 2;
             do {
                 if (++s->strstart <= max_insert) {
@@ -2004,8 +1996,8 @@ local block_state deflate_slow(deflate_state *s, int flush)
              * single literal. If there was a match but the current match
              * is longer, truncate the previous match to a single literal.
              */
-            Tracevv((stderr,"%c", s->window[s->strstart-1]));
-            _tr_tally_lit(s, s->window[s->strstart-1], bflush);
+            Tracevv((stderr,"%c", s->window[s->strstart - 1]));
+            _tr_tally_lit(s, s->window[s->strstart - 1], bflush);
             if (bflush) {
                 FLUSH_BLOCK_ONLY(s, 0);
             }
@@ -2023,8 +2015,8 @@ local block_state deflate_slow(deflate_state *s, int flush)
     }
     Assert (flush != Z_NO_FLUSH, "no flush?");
     if (s->match_available) {
-        Tracevv((stderr,"%c", s->window[s->strstart-1]));
-        _tr_tally_lit(s, s->window[s->strstart-1], bflush);
+        Tracevv((stderr,"%c", s->window[s->strstart - 1]));
+        _tr_tally_lit(s, s->window[s->strstart - 1], bflush);
         s->match_available = 0;
     }
     s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
@@ -2043,8 +2035,7 @@ local block_state deflate_slow(deflate_state *s, int flush)
  * one.  Do not maintain a hash table.  (It will be regenerated if this run of
  * deflate switches away from Z_RLE.)
  */
-local block_state deflate_rle(deflate_state *s, int flush)
-{
+local block_state deflate_rle(deflate_state *s, int flush) {
     int bflush;             /* set if current block must be flushed */
     uInt prev;              /* byte at distance one to match */
     Bytef *scan, *strend;   /* scan goes up to strend for length of run */
@@ -2079,7 +2070,8 @@ local block_state deflate_rle(deflate_state *s, int flush)
                 if (s->match_length > s->lookahead)
                     s->match_length = s->lookahead;
             }
-            Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan");
+            Assert(scan <= s->window + (uInt)(s->window_size - 1),
+                   "wild scan");
         }
 
         /* Emit match if have run of MIN_MATCH or longer, else emit literal */
@@ -2094,7 +2086,7 @@ local block_state deflate_rle(deflate_state *s, int flush)
         } else {
             /* No match, output a literal byte */
             Tracevv((stderr,"%c", s->window[s->strstart]));
-            _tr_tally_lit (s, s->window[s->strstart], bflush);
+            _tr_tally_lit(s, s->window[s->strstart], bflush);
             s->lookahead--;
             s->strstart++;
         }
@@ -2114,8 +2106,7 @@ local block_state deflate_rle(deflate_state *s, int flush)
  * For Z_HUFFMAN_ONLY, do not look for matches.  Do not maintain a hash table.
  * (It will be regenerated if this run of deflate switches away from Huffman.)
  */
-local block_state deflate_huff(deflate_state *s, int flush)
-{
+local block_state deflate_huff(deflate_state *s, int flush) {
     int bflush;             /* set if current block must be flushed */
 
     for (;;) {
@@ -2132,7 +2123,7 @@ local block_state deflate_huff(deflate_state *s, int flush)
         /* Output a literal byte */
         s->match_length = 0;
         Tracevv((stderr,"%c", s->window[s->strstart]));
-        _tr_tally_lit (s, s->window[s->strstart], bflush);
+        _tr_tally_lit(s, s->window[s->strstart], bflush);
         s->lookahead--;
         s->strstart++;
         if (bflush) FLUSH_BLOCK(s, 0);
diff --git a/frmts/zlib/deflate.h b/frmts/zlib/deflate.h
index 17c226113b08..300c6ada62b8 100644
--- a/frmts/zlib/deflate.h
+++ b/frmts/zlib/deflate.h
@@ -1,5 +1,5 @@
 /* deflate.h -- internal compression state
- * Copyright (C) 1995-2018 Jean-loup Gailly
+ * Copyright (C) 1995-2024 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -23,6 +23,10 @@
 #  define GZIP
 #endif
 
+/* define LIT_MEM to slightly increase the speed of deflate (order 1% to 2%) at
+   the cost of a larger memory footprint */
+/* #define LIT_MEM */
+
 /* ===========================================================================
  * Internal compression state.
  */
@@ -217,7 +221,14 @@ typedef struct internal_state {
     /* Depth of each subtree used as tie breaker for trees of equal frequency
      */
 
+#ifdef LIT_MEM
+#   define LIT_BUFS 5
+    ushf *d_buf;          /* buffer for distances */
+    uchf *l_buf;          /* buffer for literals/lengths */
+#else
+#   define LIT_BUFS 4
     uchf *sym_buf;        /* buffer for distances and literals/lengths */
+#endif
 
     uInt  lit_bufsize;
     /* Size of match buffer for literals/lengths.  There are 4 reasons for
@@ -239,7 +250,7 @@ typedef struct internal_state {
      *   - I can't count above 4
      */
 
-    uInt sym_next;      /* running index in sym_buf */
+    uInt sym_next;      /* running index in symbol buffer */
     uInt sym_end;       /* symbol table full when sym_next reaches this */
 
     ulg opt_len;        /* bit length of current block with optimal trees */
@@ -291,14 +302,14 @@ typedef struct internal_state {
    memory checker errors from longest match routines */
 
         /* in trees.c */
-void ZLIB_INTERNAL _tr_init OF((deflate_state *s));
-int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
-void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,
-                        ulg stored_len, int last));
-void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state *s));
-void ZLIB_INTERNAL _tr_align OF((deflate_state *s));
-void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
-                        ulg stored_len, int last));
+void ZLIB_INTERNAL _tr_init(deflate_state *s);
+int ZLIB_INTERNAL _tr_tally(deflate_state *s, unsigned dist, unsigned lc);
+void ZLIB_INTERNAL _tr_flush_block(deflate_state *s, charf *buf,
+                                   ulg stored_len, int last);
+void ZLIB_INTERNAL _tr_flush_bits(deflate_state *s);
+void ZLIB_INTERNAL _tr_align(deflate_state *s);
+void ZLIB_INTERNAL _tr_stored_block(deflate_state *s, charf *buf,
+                                    ulg stored_len, int last);
 
 #define d_code(dist) \
    ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
@@ -318,6 +329,25 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
   extern const uch ZLIB_INTERNAL _dist_code[];
 #endif
 
+#ifdef LIT_MEM
+# define _tr_tally_lit(s, c, flush) \
+  { uch cc = (c); \
+    s->d_buf[s->sym_next] = 0; \
+    s->l_buf[s->sym_next++] = cc; \
+    s->dyn_ltree[cc].Freq++; \
+    flush = (s->sym_next == s->sym_end); \
+   }
+# define _tr_tally_dist(s, distance, length, flush) \
+  { uch len = (uch)(length); \
+    ush dist = (ush)(distance); \
+    s->d_buf[s->sym_next] = dist; \
+    s->l_buf[s->sym_next++] = len; \
+    dist--; \
+    s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
+    s->dyn_dtree[d_code(dist)].Freq++; \
+    flush = (s->sym_next == s->sym_end); \
+  }
+#else
 # define _tr_tally_lit(s, c, flush) \
   { uch cc = (c); \
     s->sym_buf[s->sym_next++] = 0; \
@@ -329,14 +359,15 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
 # define _tr_tally_dist(s, distance, length, flush) \
   { uch len = (uch)(length); \
     ush dist = (ush)(distance); \
-    s->sym_buf[s->sym_next++] = dist; \
-    s->sym_buf[s->sym_next++] = dist >> 8; \
+    s->sym_buf[s->sym_next++] = (uch)dist; \
+    s->sym_buf[s->sym_next++] = (uch)(dist >> 8); \
     s->sym_buf[s->sym_next++] = len; \
     dist--; \
     s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
     s->dyn_dtree[d_code(dist)].Freq++; \
     flush = (s->sym_next == s->sym_end); \
   }
+#endif
 #else
 # define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
 # define _tr_tally_dist(s, distance, length, flush) \
diff --git a/frmts/zlib/gdal.patch b/frmts/zlib/gdal.patch
new file mode 100644
index 000000000000..c4487bdbe637
--- /dev/null
+++ b/frmts/zlib/gdal.patch
@@ -0,0 +1,30 @@
+diff --git a/frmts/zlib/zconf.h b/frmts/zlib/zconf.h
+index ede3c82e3e..d53268ade1 100644
+--- a/frmts/zlib/zconf.h
++++ b/frmts/zlib/zconf.h
+@@ -433,11 +433,13 @@ typedef uLong FAR uLongf;
+    typedef unsigned long z_crc_t;
+ #endif
+ 
+-#if 1    /* was set to #if 1 by ./configure */
++/* Patched by GDAL */
++#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
+ #  define Z_HAVE_UNISTD_H
+ #endif
+ 
+-#if 1    /* was set to #if 1 by ./configure */
++/* Patched by GDAL */
++#ifdef HAVE_STDARG_H
+ #  define Z_HAVE_STDARG_H
+ #endif
+ 
+@@ -540,4 +542,9 @@ typedef uLong FAR uLongf;
+   #pragma map(inflate_copyright,"INCOPY")
+ #endif
+ 
++/* Patched by GDAL */
++#ifdef RENAME_INTERNAL_ZLIB_SYMBOLS
++#include "gdal_zlib_symbol_rename.h"
++#endif
++
+ #endif /* ZCONF_H */
diff --git a/frmts/zlib/gzguts.h b/frmts/zlib/gzguts.h
index 57faf37165a3..eba72085bb75 100644
--- a/frmts/zlib/gzguts.h
+++ b/frmts/zlib/gzguts.h
@@ -1,5 +1,5 @@
 /* gzguts.h -- zlib internal header definitions for gz* operations
- * Copyright (C) 2004-2019 Mark Adler
+ * Copyright (C) 2004-2024 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -7,9 +7,8 @@
 #  ifndef _LARGEFILE_SOURCE
 #    define _LARGEFILE_SOURCE 1
 #  endif
-#  ifdef _FILE_OFFSET_BITS
-#    undef _FILE_OFFSET_BITS
-#  endif
+#  undef _FILE_OFFSET_BITS
+#  undef _TIME_BITS
 #endif
 
 #ifdef HAVE_HIDDEN
@@ -119,8 +118,8 @@
 
 /* gz* functions always use library allocation functions */
 #ifndef STDC
-  extern voidp  malloc OF((uInt size));
-  extern void   free   OF((voidpf ptr));
+  extern voidp  malloc(uInt size);
+  extern void   free(voidpf ptr);
 #endif
 
 /* get errno and strerror definition */
@@ -138,10 +137,10 @@
 
 /* provide prototypes for these when building zlib without LFS */
 #if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0
-    ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-    ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
-    ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
-    ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
+    ZEXTERN gzFile ZEXPORT gzopen64(const char *, const char *);
+    ZEXTERN z_off64_t ZEXPORT gzseek64(gzFile, z_off64_t, int);
+    ZEXTERN z_off64_t ZEXPORT gztell64(gzFile);
+    ZEXTERN z_off64_t ZEXPORT gzoffset64(gzFile);
 #endif
 
 /* default memLevel */
@@ -203,17 +202,13 @@ typedef struct {
 typedef gz_state FAR *gz_statep;
 
 /* shared functions */
-void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *));
+void ZLIB_INTERNAL gz_error(gz_statep, int, const char *);
 #if defined UNDER_CE
-char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error));
+char ZLIB_INTERNAL *gz_strwinerror(DWORD error);
 #endif
 
 /* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t
    value -- needed when comparing unsigned to z_off64_t, which is signed
    (possible z_off64_t types off_t, off64_t, and long are all signed) */
-#ifdef INT_MAX
-#  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX)
-#else
-unsigned ZLIB_INTERNAL gz_intmax OF((void));
-#  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())
-#endif
+unsigned ZLIB_INTERNAL gz_intmax(void);
+#define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())
diff --git a/frmts/zlib/infback.c b/frmts/zlib/infback.c
index 689213194f01..e7b25b307a30 100644
--- a/frmts/zlib/infback.c
+++ b/frmts/zlib/infback.c
@@ -15,9 +15,6 @@
 #include "inflate.h"
 #include "inffast.h"
 
-/* function prototypes */
-local void fixedtables OF((struct inflate_state FAR *state));
-
 /*
    strm provides memory allocation functions in zalloc and zfree, or
    Z_NULL to use the library memory allocation functions.
@@ -25,8 +22,9 @@ local void fixedtables OF((struct inflate_state FAR *state));
    windowBits is in the range 8..15, and window is a user-supplied
    window and output buffer that is 2**windowBits bytes.
  */
-int ZEXPORT inflateBackInit_(z_streamp strm, int windowBits, unsigned char FAR *window, const char *version, int stream_size)
-{
+int ZEXPORT inflateBackInit_(z_streamp strm, int windowBits,
+                             unsigned char FAR *window, const char *version,
+                             int stream_size) {
     struct inflate_state FAR *state;
 
     if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
@@ -61,6 +59,7 @@ int ZEXPORT inflateBackInit_(z_streamp strm, int windowBits, unsigned char FAR *
     state->window = window;
     state->wnext = 0;
     state->whave = 0;
+    state->sane = 1;
     return Z_OK;
 }
 
@@ -74,8 +73,7 @@ int ZEXPORT inflateBackInit_(z_streamp strm, int windowBits, unsigned char FAR *
    used for threaded applications, since the rewriting of the tables and virgin
    may not be thread-safe.
  */
-local void fixedtables(struct inflate_state FAR *state)
-{
+local void fixedtables(struct inflate_state FAR *state) {
 #ifdef BUILDFIXED
     static int virgin = 1;
     static code *lenfix, *distfix;
@@ -241,8 +239,8 @@ local void fixedtables(struct inflate_state FAR *state)
    inflateBack() can also return Z_STREAM_ERROR if the input parameters
    are not correct, i.e. strm is Z_NULL or the state was not initialized.
  */
-int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc, out_func out, void FAR *out_desc)
-{
+int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc,
+                        out_func out, void FAR *out_desc) {
     struct inflate_state FAR *state;
     z_const unsigned char FAR *next;    /* next input */
     unsigned char FAR *put;     /* next output */
@@ -594,32 +592,33 @@ int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc, out_func
             break;
 
         case DONE:
-            /* inflate stream terminated properly -- write leftover output */
+            /* inflate stream terminated properly */
             ret = Z_STREAM_END;
-            if (left < state->wsize) {
-                if (out(out_desc, state->window, state->wsize - left))
-                    ret = Z_BUF_ERROR;
-            }
             goto inf_leave;
 
         case BAD:
             ret = Z_DATA_ERROR;
             goto inf_leave;
 
-        default:                /* can't happen, but makes compilers happy */
+        default:
+            /* can't happen, but makes compilers happy */
             ret = Z_STREAM_ERROR;
             goto inf_leave;
         }
 
-    /* Return unused input */
+    /* Write leftover output and return unused input */
   inf_leave:
+    if (left < state->wsize) {
+        if (out(out_desc, state->window, state->wsize - left) &&
+            ret == Z_STREAM_END)
+            ret = Z_BUF_ERROR;
+    }
     strm->next_in = next;
     strm->avail_in = have;
     return ret;
 }
 
-int ZEXPORT inflateBackEnd(z_streamp strm)
-{
+int ZEXPORT inflateBackEnd(z_streamp strm) {
     if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
         return Z_STREAM_ERROR;
     ZFREE(strm, strm->state);
diff --git a/frmts/zlib/inffast.c b/frmts/zlib/inffast.c
index 5b58524a4315..9354676e786e 100644
--- a/frmts/zlib/inffast.c
+++ b/frmts/zlib/inffast.c
@@ -47,9 +47,7 @@
       requires strm->avail_out >= 258 for each loop to avoid checking for
       output space.
  */
-void ZLIB_INTERNAL inflate_fast(z_streamp strm, unsigned start)
-/* start: inflate()'s starting value for strm->avail_out */
-{
+void ZLIB_INTERNAL inflate_fast(z_streamp strm, unsigned start) {
     struct inflate_state FAR *state;
     z_const unsigned char FAR *in;      /* local strm->next_in */
     z_const unsigned char FAR *last;    /* have enough input while in < last */
diff --git a/frmts/zlib/inffast.h b/frmts/zlib/inffast.h
index e5c1aa4ca8cd..49c6d156c5c6 100644
--- a/frmts/zlib/inffast.h
+++ b/frmts/zlib/inffast.h
@@ -8,4 +8,4 @@
    subject to change. Applications should only use zlib.h.
  */
 
-void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start));
+void ZLIB_INTERNAL inflate_fast(z_streamp strm, unsigned start);
diff --git a/frmts/zlib/inflate.c b/frmts/zlib/inflate.c
index 81baca0a2cd3..94ecff015a9b 100644
--- a/frmts/zlib/inflate.c
+++ b/frmts/zlib/inflate.c
@@ -91,19 +91,7 @@
 #  endif
 #endif
 
-/* function prototypes */
-local int inflateStateCheck OF((z_streamp strm));
-local void fixedtables OF((struct inflate_state FAR *state));
-local int updatewindow OF((z_streamp strm, const unsigned char FAR *end,
-                           unsigned copy));
-#ifdef BUILDFIXED
-   void makefixed OF((void));
-#endif
-local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf,
-                              unsigned len));
-
-local int inflateStateCheck(z_streamp strm)
-{
+local int inflateStateCheck(z_streamp strm) {
     struct inflate_state FAR *state;
     if (strm == Z_NULL ||
         strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0)
@@ -115,8 +103,7 @@ local int inflateStateCheck(z_streamp strm)
     return 0;
 }
 
-int ZEXPORT inflateResetKeep(z_streamp strm)
-{
+int ZEXPORT inflateResetKeep(z_streamp strm) {
     struct inflate_state FAR *state;
 
     if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
@@ -140,8 +127,7 @@ int ZEXPORT inflateResetKeep(z_streamp strm)
     return Z_OK;
 }
 
-int ZEXPORT inflateReset(z_streamp strm)
-{
+int ZEXPORT inflateReset(z_streamp strm) {
     struct inflate_state FAR *state;
 
     if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
@@ -152,8 +138,7 @@ int ZEXPORT inflateReset(z_streamp strm)
     return inflateResetKeep(strm);
 }
 
-int ZEXPORT inflateReset2(z_streamp strm, int windowBits)
-{
+int ZEXPORT inflateReset2(z_streamp strm, int windowBits) {
     int wrap;
     struct inflate_state FAR *state;
 
@@ -163,6 +148,8 @@ int ZEXPORT inflateReset2(z_streamp strm, int windowBits)
 
     /* extract wrap request from windowBits parameter */
     if (windowBits < 0) {
+        if (windowBits < -15)
+            return Z_STREAM_ERROR;
         wrap = 0;
         windowBits = -windowBits;
     }
@@ -188,8 +175,8 @@ int ZEXPORT inflateReset2(z_streamp strm, int windowBits)
     return inflateReset(strm);
 }
 
-int ZEXPORT inflateInit2_(z_streamp strm, int windowBits, const char *version, int stream_size)
-{
+int ZEXPORT inflateInit2_(z_streamp strm, int windowBits,
+                          const char *version, int stream_size) {
     int ret;
     struct inflate_state FAR *state;
 
@@ -228,16 +215,17 @@ int ZEXPORT inflateInit2_(z_streamp strm, int windowBits, const char *version, i
     return ret;
 }
 
-int ZEXPORT inflateInit_(z_streamp strm, const char *version, int stream_size)
-{
+int ZEXPORT inflateInit_(z_streamp strm, const char *version,
+                         int stream_size) {
     return inflateInit2_(strm, DEF_WBITS, version, stream_size);
 }
 
-int ZEXPORT inflatePrime(z_streamp strm, int bits, int value)
-{
+int ZEXPORT inflatePrime(z_streamp strm, int bits, int value) {
     struct inflate_state FAR *state;
 
     if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    if (bits == 0)
+        return Z_OK;
     state = (struct inflate_state FAR *)strm->state;
     if (bits < 0) {
         state->hold = 0;
@@ -261,8 +249,7 @@ int ZEXPORT inflatePrime(z_streamp strm, int bits, int value)
    used for threaded applications, since the rewriting of the tables and virgin
    may not be thread-safe.
  */
-local void fixedtables(struct inflate_state FAR *state)
-{
+local void fixedtables(struct inflate_state FAR *state) {
 #ifdef BUILDFIXED
     static int virgin = 1;
     static code *lenfix, *distfix;
@@ -324,7 +311,7 @@ local void fixedtables(struct inflate_state FAR *state)
 
     a.out > inffixed.h
  */
-void makefixed()
+void makefixed(void)
 {
     unsigned low, size;
     struct inflate_state state;
@@ -378,8 +365,7 @@ void makefixed()
    output will fall in the output data, making match copies simpler and faster.
    The advantage may be dependent on the size of the processor's data caches.
  */
-local int updatewindow(z_streamp strm, const Bytef *end, unsigned copy)
-{
+local int updatewindow(z_streamp strm, const Bytef *end, unsigned copy) {
     struct inflate_state FAR *state;
     unsigned dist;
 
@@ -601,8 +587,7 @@ local int updatewindow(z_streamp strm, const Bytef *end, unsigned copy)
    will return Z_BUF_ERROR if it has not reached the end of the stream.
  */
 
-int ZEXPORT inflate(z_streamp strm, int flush)
-{
+int ZEXPORT inflate(z_streamp strm, int flush) {
     struct inflate_state FAR *state;
     z_const unsigned char FAR *next;    /* next input */
     unsigned char FAR *put;     /* next output */
@@ -743,8 +728,9 @@ int ZEXPORT inflate(z_streamp strm, int flush)
                 if (copy > have) copy = have;
                 if (copy) {
                     if (state->head != Z_NULL &&
-                        state->head->extra != Z_NULL) {
-                        len = state->head->extra_len - state->length;
+                        state->head->extra != Z_NULL &&
+                        (len = state->head->extra_len - state->length) <
+                            state->head->extra_max) {
                         zmemcpy(state->head->extra + len, next,
                                 len + copy > state->head->extra_max ?
                                 state->head->extra_max - len : copy);
@@ -1277,8 +1263,7 @@ int ZEXPORT inflate(z_streamp strm, int flush)
     return ret;
 }
 
-int ZEXPORT inflateEnd(z_streamp strm)
-{
+int ZEXPORT inflateEnd(z_streamp strm) {
     struct inflate_state FAR *state;
     if (inflateStateCheck(strm))
         return Z_STREAM_ERROR;
@@ -1290,8 +1275,8 @@ int ZEXPORT inflateEnd(z_streamp strm)
     return Z_OK;
 }
 
-int ZEXPORT inflateGetDictionary(z_streamp strm, Bytef *dictionary, uInt *dictLength)
-{
+int ZEXPORT inflateGetDictionary(z_streamp strm, Bytef *dictionary,
+                                 uInt *dictLength) {
     struct inflate_state FAR *state;
 
     /* check state */
@@ -1310,8 +1295,8 @@ int ZEXPORT inflateGetDictionary(z_streamp strm, Bytef *dictionary, uInt *dictLe
     return Z_OK;
 }
 
-int ZEXPORT inflateSetDictionary(z_streamp strm, const Bytef *dictionary, uInt dictLength)
-{
+int ZEXPORT inflateSetDictionary(z_streamp strm, const Bytef *dictionary,
+                                 uInt dictLength) {
     struct inflate_state FAR *state;
     unsigned long dictid;
     int ret;
@@ -1342,8 +1327,7 @@ int ZEXPORT inflateSetDictionary(z_streamp strm, const Bytef *dictionary, uInt d
     return Z_OK;
 }
 
-int ZEXPORT inflateGetHeader(z_streamp strm, gz_headerp head)
-{
+int ZEXPORT inflateGetHeader(z_streamp strm, gz_headerp head) {
     struct inflate_state FAR *state;
 
     /* check state */
@@ -1368,8 +1352,8 @@ int ZEXPORT inflateGetHeader(z_streamp strm, gz_headerp head)
    called again with more data and the *have state.  *have is initialized to
    zero for the first call.
  */
-local unsigned syncsearch(unsigned FAR * have, const unsigned char FAR *buf, unsigned len)
-{
+local unsigned syncsearch(unsigned FAR *have, const unsigned char FAR *buf,
+                          unsigned len) {
     unsigned got;
     unsigned next;
 
@@ -1388,8 +1372,7 @@ local unsigned syncsearch(unsigned FAR * have, const unsigned char FAR *buf, uns
     return next;
 }
 
-int ZEXPORT inflateSync(z_streamp strm)
-{
+int ZEXPORT inflateSync(z_streamp strm) {
     unsigned len;               /* number of bytes to look at or looked at */
     int flags;                  /* temporary to save header status */
     unsigned long in, out;      /* temporary to save total_in and total_out */
@@ -1404,7 +1387,7 @@ int ZEXPORT inflateSync(z_streamp strm)
     /* if first time, start search in bit buffer */
     if (state->mode != SYNC) {
         state->mode = SYNC;
-        state->hold <<= state->bits & 7;
+        state->hold >>= state->bits & 7;
         state->bits -= state->bits & 7;
         len = 0;
         while (state->bits >= 8) {
@@ -1445,8 +1428,7 @@ int ZEXPORT inflateSync(z_streamp strm)
    block. When decompressing, PPP checks that at the end of input packet,
    inflate is waiting for these length bytes.
  */
-int ZEXPORT inflateSyncPoint(z_streamp strm)
-{
+int ZEXPORT inflateSyncPoint(z_streamp strm) {
     struct inflate_state FAR *state;
 
     if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
@@ -1454,8 +1436,7 @@ int ZEXPORT inflateSyncPoint(z_streamp strm)
     return state->mode == STORED && state->bits == 0;
 }
 
-int ZEXPORT inflateCopy(z_streamp dest, z_streamp source)
-{
+int ZEXPORT inflateCopy(z_streamp dest, z_streamp source) {
     struct inflate_state FAR *state;
     struct inflate_state FAR *copy;
     unsigned char FAR *window;
@@ -1499,8 +1480,7 @@ int ZEXPORT inflateCopy(z_streamp dest, z_streamp source)
     return Z_OK;
 }
 
-int ZEXPORT inflateUndermine(z_streamp strm, int subvert)
-{
+int ZEXPORT inflateUndermine(z_streamp strm, int subvert) {
     struct inflate_state FAR *state;
 
     if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
@@ -1515,8 +1495,7 @@ int ZEXPORT inflateUndermine(z_streamp strm, int subvert)
 #endif
 }
 
-int ZEXPORT inflateValidate(z_streamp strm, int check)
-{
+int ZEXPORT inflateValidate(z_streamp strm, int check) {
     struct inflate_state FAR *state;
 
     if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
@@ -1528,8 +1507,7 @@ int ZEXPORT inflateValidate(z_streamp strm, int check)
     return Z_OK;
 }
 
-long ZEXPORT inflateMark(z_streamp strm)
-{
+long ZEXPORT inflateMark(z_streamp strm) {
     struct inflate_state FAR *state;
 
     if (inflateStateCheck(strm))
@@ -1540,8 +1518,7 @@ long ZEXPORT inflateMark(z_streamp strm)
             (state->mode == MATCH ? state->was - state->length : 0));
 }
 
-unsigned long ZEXPORT inflateCodesUsed(z_streamp strm)
-{
+unsigned long ZEXPORT inflateCodesUsed(z_streamp strm) {
     struct inflate_state FAR *state;
     if (inflateStateCheck(strm)) return (unsigned long)-1;
     state = (struct inflate_state FAR *)strm->state;
diff --git a/frmts/zlib/inftrees.c b/frmts/zlib/inftrees.c
index 6ea6c75a7c93..98cfe164458c 100644
--- a/frmts/zlib/inftrees.c
+++ b/frmts/zlib/inftrees.c
@@ -1,5 +1,5 @@
 /* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2022 Mark Adler
+ * Copyright (C) 1995-2024 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -9,7 +9,7 @@
 #define MAXBITS 15
 
 const char inflate_copyright[] =
-   " inflate 1.2.12 Copyright 1995-2022 Mark Adler ";
+   " inflate 1.3.1 Copyright 1995-2024 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -29,8 +29,9 @@ const char inflate_copyright[] =
    table index bits.  It will differ if the request is greater than the
    longest code or if it is less than the shortest code.
  */
-int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens, unsigned codes, code FAR * FAR *table, unsigned FAR *bits, unsigned short FAR * work)
-{
+int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
+                                unsigned codes, code FAR * FAR *table,
+                                unsigned FAR *bits, unsigned short FAR *work) {
     unsigned len;               /* a code's length in bits */
     unsigned sym;               /* index of code symbols */
     unsigned min, max;          /* minimum and maximum code lengths */
@@ -56,7 +57,7 @@ int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens, unsigne
         35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
     static const unsigned short lext[31] = { /* Length codes 257..285 extra */
         16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 199, 202};
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 203, 77};
     static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
         257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
diff --git a/frmts/zlib/inftrees.h b/frmts/zlib/inftrees.h
index baa53a0b1a19..396f74b5da79 100644
--- a/frmts/zlib/inftrees.h
+++ b/frmts/zlib/inftrees.h
@@ -38,11 +38,11 @@ typedef struct {
 /* Maximum size of the dynamic table.  The maximum number of code structures is
    1444, which is the sum of 852 for literal/length codes and 592 for distance
    codes.  These values were found by exhaustive searches using the program
-   examples/enough.c found in the zlib distribtution.  The arguments to that
+   examples/enough.c found in the zlib distribution.  The arguments to that
    program are the number of symbols, the initial root table size, and the
    maximum bit length of a code.  "enough 286 9 15" for literal/length codes
-   returns returns 852, and "enough 30 6 15" for distance codes returns 592.
-   The initial root table size (9 or 6) is found in the fifth argument of the
+   returns 852, and "enough 30 6 15" for distance codes returns 592. The
+   initial root table size (9 or 6) is found in the fifth argument of the
    inflate_table() calls in inflate.c and infback.c.  If the root table size is
    changed, then these maximum sizes would be need to be recalculated and
    updated. */
@@ -57,6 +57,6 @@ typedef enum {
     DISTS
 } codetype;
 
-int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens,
-                             unsigned codes, code FAR * FAR *table,
-                             unsigned FAR *bits, unsigned short FAR *work));
+int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
+                                unsigned codes, code FAR * FAR *table,
+                                unsigned FAR *bits, unsigned short FAR *work);
diff --git a/frmts/zlib/trees.c b/frmts/zlib/trees.c
index 3473980ac553..6a523ef34e3c 100644
--- a/frmts/zlib/trees.c
+++ b/frmts/zlib/trees.c
@@ -1,5 +1,5 @@
 /* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-2021 Jean-loup Gailly
+ * Copyright (C) 1995-2024 Jean-loup Gailly
  * detect_data_type() function provided freely by Cosmin Truta, 2006
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
@@ -122,39 +122,116 @@ struct static_tree_desc_s {
     int     max_length;          /* max bit length for the codes */
 };
 
-local const static_tree_desc  static_l_desc =
+#ifdef NO_INIT_GLOBAL_POINTERS
+#  define TCONST
+#else
+#  define TCONST const
+#endif
+
+local TCONST static_tree_desc static_l_desc =
 {static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};
 
-local const static_tree_desc  static_d_desc =
+local TCONST static_tree_desc static_d_desc =
 {static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};
 
-local const static_tree_desc  static_bl_desc =
+local TCONST static_tree_desc static_bl_desc =
 {(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS};
 
 /* ===========================================================================
- * Local (static) routines in this file.
+ * Output a short LSB first on the stream.
+ * IN assertion: there is enough room in pendingBuf.
+ */
+#define put_short(s, w) { \
+    put_byte(s, (uch)((w) & 0xff)); \
+    put_byte(s, (uch)((ush)(w) >> 8)); \
+}
+
+/* ===========================================================================
+ * Reverse the first len bits of a code, using straightforward code (a faster
+ * method would use a table)
+ * IN assertion: 1 <= len <= 15
  */
+local unsigned bi_reverse(unsigned code, int len) {
+    register unsigned res = 0;
+    do {
+        res |= code & 1;
+        code >>= 1, res <<= 1;
+    } while (--len > 0);
+    return res >> 1;
+}
 
-local void tr_static_init OF((void));
-local void init_block     OF((deflate_state *s));
-local void pqdownheap     OF((deflate_state *s, ct_data *tree, int k));
-local void gen_bitlen     OF((deflate_state *s, tree_desc *desc));
-local void gen_codes      OF((ct_data *tree, int max_code, ushf *bl_count));
-local void build_tree     OF((deflate_state *s, tree_desc *desc));
-local void scan_tree      OF((deflate_state *s, ct_data *tree, int max_code));
-local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));
-local int  build_bl_tree  OF((deflate_state *s));
-local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
-                              int blcodes));
-local void compress_block OF((deflate_state *s, const ct_data *ltree,
-                              const ct_data *dtree));
-local int  detect_data_type OF((deflate_state *s));
-local unsigned bi_reverse OF((unsigned code, int len));
-local void bi_windup      OF((deflate_state *s));
-local void bi_flush       OF((deflate_state *s));
+/* ===========================================================================
+ * Flush the bit buffer, keeping at most 7 bits in it.
+ */
+local void bi_flush(deflate_state *s) {
+    if (s->bi_valid == 16) {
+        put_short(s, s->bi_buf);
+        s->bi_buf = 0;
+        s->bi_valid = 0;
+    } else if (s->bi_valid >= 8) {
+        put_byte(s, (Byte)s->bi_buf);
+        s->bi_buf >>= 8;
+        s->bi_valid -= 8;
+    }
+}
+
+/* ===========================================================================
+ * Flush the bit buffer and align the output on a byte boundary
+ */
+local void bi_windup(deflate_state *s) {
+    if (s->bi_valid > 8) {
+        put_short(s, s->bi_buf);
+    } else if (s->bi_valid > 0) {
+        put_byte(s, (Byte)s->bi_buf);
+    }
+    s->bi_buf = 0;
+    s->bi_valid = 0;
+#ifdef ZLIB_DEBUG
+    s->bits_sent = (s->bits_sent + 7) & ~7;
+#endif
+}
+
+/* ===========================================================================
+ * Generate the codes for a given tree and bit counts (which need not be
+ * optimal).
+ * IN assertion: the array bl_count contains the bit length statistics for
+ * the given tree and the field len is set for all tree elements.
+ * OUT assertion: the field code is set for all tree elements of non
+ *     zero code length.
+ */
+local void gen_codes(ct_data *tree, int max_code, ushf *bl_count) {
+    ush next_code[MAX_BITS+1]; /* next code value for each bit length */
+    unsigned code = 0;         /* running code value */
+    int bits;                  /* bit index */
+    int n;                     /* code index */
+
+    /* The distribution counts are first used to generate the code values
+     * without bit reversal.
+     */
+    for (bits = 1; bits <= MAX_BITS; bits++) {
+        code = (code + bl_count[bits - 1]) << 1;
+        next_code[bits] = (ush)code;
+    }
+    /* Check that the bit counts in bl_count are consistent. The last code
+     * must be all ones.
+     */
+    Assert (code + bl_count[MAX_BITS] - 1 == (1 << MAX_BITS) - 1,
+            "inconsistent bit counts");
+    Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
+
+    for (n = 0;  n <= max_code; n++) {
+        int len = tree[n].Len;
+        if (len == 0) continue;
+        /* Now reverse the bits */
+        tree[n].Code = (ush)bi_reverse(next_code[len]++, len);
+
+        Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
+            n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len] - 1));
+    }
+}
 
 #ifdef GEN_TREES_H
-local void gen_trees_header OF((void));
+local void gen_trees_header(void);
 #endif
 
 #ifndef ZLIB_DEBUG
@@ -167,33 +244,18 @@ local void gen_trees_header OF((void));
        send_bits(s, tree[c].Code, tree[c].Len); }
 #endif
 
-/* ===========================================================================
- * Output a short LSB first on the stream.
- * IN assertion: there is enough room in pendingBuf.
- */
-#define put_short(s, w) { \
-    put_byte(s, (uch)((w) & 0xff)); \
-    put_byte(s, (uch)((ush)(w) >> 8)); \
-}
-
 /* ===========================================================================
  * Send a value on a given number of bits.
  * IN assertion: length <= 16 and value fits in length bits.
  */
 #ifdef ZLIB_DEBUG
-local void send_bits      OF((deflate_state *s, int value, int length));
-
-local void send_bits(s, value, length)
-    deflate_state *s;
-    int value;  /* value to send */
-    int length; /* number of bits */
-{
+local void send_bits(deflate_state *s, int value, int length) {
     Tracevv((stderr," l %2d v %4x ", length, value));
     Assert(length > 0 && length <= 15, "invalid length");
     s->bits_sent += (ulg)length;
 
     /* If not enough room in bi_buf, use (valid) bits from bi_buf and
-     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
+     * (16 - bi_valid) bits from value, leaving (width - (16 - bi_valid))
      * unused bits in value.
      */
     if (s->bi_valid > (int)Buf_size - length) {
@@ -229,8 +291,7 @@ local void send_bits(s, value, length)
 /* ===========================================================================
  * Initialize the various 'constant' tables.
  */
-local void tr_static_init()
-{
+local void tr_static_init(void) {
 #if defined(GEN_TREES_H) || !defined(STDC)
     static int static_init_done = 0;
     int n;        /* iterates over tree elements */
@@ -256,7 +317,7 @@ local void tr_static_init()
     length = 0;
     for (code = 0; code < LENGTH_CODES-1; code++) {
         base_length[code] = length;
-        for (n = 0; n < (1<<extra_lbits[code]); n++) {
+        for (n = 0; n < (1 << extra_lbits[code]); n++) {
             _length_code[length++] = (uch)code;
         }
     }
@@ -265,13 +326,13 @@ local void tr_static_init()
      * in two different ways: code 284 + 5 bits or code 285, so we
      * overwrite length_code[255] to use the best encoding:
      */
-    _length_code[length-1] = (uch)code;
+    _length_code[length - 1] = (uch)code;
 
     /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
     dist = 0;
     for (code = 0 ; code < 16; code++) {
         base_dist[code] = dist;
-        for (n = 0; n < (1<<extra_dbits[code]); n++) {
+        for (n = 0; n < (1 << extra_dbits[code]); n++) {
             _dist_code[dist++] = (uch)code;
         }
     }
@@ -279,11 +340,11 @@ local void tr_static_init()
     dist >>= 7; /* from now on, all distances are divided by 128 */
     for ( ; code < D_CODES; code++) {
         base_dist[code] = dist << 7;
-        for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
+        for (n = 0; n < (1 << (extra_dbits[code] - 7)); n++) {
             _dist_code[256 + dist++] = (uch)code;
         }
     }
-    Assert (dist == 256, "tr_static_init: 256+dist != 512");
+    Assert (dist == 256, "tr_static_init: 256 + dist != 512");
 
     /* Construct the codes of the static literal tree */
     for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
@@ -312,7 +373,7 @@ local void tr_static_init()
 }
 
 /* ===========================================================================
- * Genererate the file trees.h describing the static trees.
+ * Generate the file trees.h describing the static trees.
  */
 #ifdef GEN_TREES_H
 #  ifndef ZLIB_DEBUG
@@ -321,10 +382,9 @@ local void tr_static_init()
 
 #  define SEPARATOR(i, last, width) \
       ((i) == (last)? "\n};\n\n" :    \
-       ((i) % (width) == (width)-1 ? ",\n" : ", "))
+       ((i) % (width) == (width) - 1 ? ",\n" : ", "))
 
-void gen_trees_header()
-{
+void gen_trees_header(void) {
     FILE *header = fopen("trees.h", "w");
     int i;
 
@@ -373,11 +433,26 @@ void gen_trees_header()
 }
 #endif /* GEN_TREES_H */
 
+/* ===========================================================================
+ * Initialize a new block.
+ */
+local void init_block(deflate_state *s) {
+    int n; /* iterates over tree elements */
+
+    /* Initialize the trees. */
+    for (n = 0; n < L_CODES;  n++) s->dyn_ltree[n].Freq = 0;
+    for (n = 0; n < D_CODES;  n++) s->dyn_dtree[n].Freq = 0;
+    for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0;
+
+    s->dyn_ltree[END_BLOCK].Freq = 1;
+    s->opt_len = s->static_len = 0L;
+    s->sym_next = s->matches = 0;
+}
+
 /* ===========================================================================
  * Initialize the tree data structures for a new zlib stream.
  */
-void ZLIB_INTERNAL _tr_init(deflate_state *s)
-{
+void ZLIB_INTERNAL _tr_init(deflate_state *s) {
     tr_static_init();
 
     s->l_desc.dyn_tree = s->dyn_ltree;
@@ -400,23 +475,6 @@ void ZLIB_INTERNAL _tr_init(deflate_state *s)
     init_block(s);
 }
 
-/* ===========================================================================
- * Initialize a new block.
- */
-local void init_block(deflate_state *s)
-{
-    int n; /* iterates over tree elements */
-
-    /* Initialize the trees. */
-    for (n = 0; n < L_CODES;  n++) s->dyn_ltree[n].Freq = 0;
-    for (n = 0; n < D_CODES;  n++) s->dyn_dtree[n].Freq = 0;
-    for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0;
-
-    s->dyn_ltree[END_BLOCK].Freq = 1;
-    s->opt_len = s->static_len = 0L;
-    s->sym_next = s->matches = 0;
-}
-
 #define SMALLEST 1
 /* Index within the heap array of least frequent node in the Huffman tree */
 
@@ -446,18 +504,13 @@ local void init_block(deflate_state *s)
  * when the heap property is re-established (each father smaller than its
  * two sons).
  */
-local void pqdownheap(deflate_state *s, ct_data *tree, int k)
-#if 0
-    ct_data *tree;  /* the tree to restore */
-    int k;               /* node to move down */
-#endif
-{
+local void pqdownheap(deflate_state *s, ct_data *tree, int k) {
     int v = s->heap[k];
     int j = k << 1;  /* left son of k */
     while (j <= s->heap_len) {
         /* Set j to the smallest of the two sons: */
         if (j < s->heap_len &&
-            smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {
+            smaller(tree, s->heap[j + 1], s->heap[j], s->depth)) {
             j++;
         }
         /* Exit if v is smaller than both sons */
@@ -482,8 +535,7 @@ local void pqdownheap(deflate_state *s, ct_data *tree, int k)
  *     The length opt_len is updated; static_len is also updated if stree is
  *     not null.
  */
-local void gen_bitlen(deflate_state *s, tree_desc *desc)
-{
+local void gen_bitlen(deflate_state *s, tree_desc *desc) {
     ct_data *tree        = desc->dyn_tree;
     int max_code         = desc->max_code;
     const ct_data *stree = desc->stat_desc->static_tree;
@@ -504,10 +556,10 @@ local void gen_bitlen(deflate_state *s, tree_desc *desc)
      */
     tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */
 
-    for (h = s->heap_max+1; h < HEAP_SIZE; h++) {
+    for (h = s->heap_max + 1; h < HEAP_SIZE; h++) {
         n = s->heap[h];
         bits = tree[tree[n].Dad].Len + 1;
-        if (bits > max_length) { bits = max_length; overflow++; }
+        if (bits > max_length) bits = max_length, overflow++;
         tree[n].Len = (ush)bits;
         /* We overwrite tree[n].Dad which is no longer needed */
 
@@ -515,7 +567,7 @@ local void gen_bitlen(deflate_state *s, tree_desc *desc)
 
         s->bl_count[bits]++;
         xbits = 0;
-        if (n >= base) xbits = extra[n-base];
+        if (n >= base) xbits = extra[n - base];
         f = tree[n].Freq;
         s->opt_len += (ulg)f * (unsigned)(bits + xbits);
         if (stree) s->static_len += (ulg)f * (unsigned)(stree[n].Len + xbits);
@@ -527,10 +579,10 @@ local void gen_bitlen(deflate_state *s, tree_desc *desc)
 
     /* Find the first bit length which could increase: */
     do {
-        bits = max_length-1;
+        bits = max_length - 1;
         while (s->bl_count[bits] == 0) bits--;
-        s->bl_count[bits]--;      /* move one leaf down the tree */
-        s->bl_count[bits+1] += 2; /* move one overflow item as its brother */
+        s->bl_count[bits]--;        /* move one leaf down the tree */
+        s->bl_count[bits + 1] += 2; /* move one overflow item as its brother */
         s->bl_count[max_length]--;
         /* The brother of the overflow item also moves one step up,
          * but this does not affect bl_count[max_length]
@@ -558,50 +610,9 @@ local void gen_bitlen(deflate_state *s, tree_desc *desc)
     }
 }
 
-/* ===========================================================================
- * Generate the codes for a given tree and bit counts (which need not be
- * optimal).
- * IN assertion: the array bl_count contains the bit length statistics for
- * the given tree and the field len is set for all tree elements.
- * OUT assertion: the field code is set for all tree elements of non
- *     zero code length.
- */
-local void gen_codes (ct_data *tree, int max_code, ushf *bl_count)
-#if 0
-    ct_data *tree;             /* the tree to decorate */
-    int max_code;              /* largest code with non zero frequency */
-    ushf *bl_count;            /* number of codes at each bit length */
+#ifdef DUMP_BL_TREE
+#  include <stdio.h>
 #endif
-{
-    ush next_code[MAX_BITS+1]; /* next code value for each bit length */
-    unsigned code = 0;         /* running code value */
-    int bits;                  /* bit index */
-    int n;                     /* code index */
-
-    /* The distribution counts are first used to generate the code values
-     * without bit reversal.
-     */
-    for (bits = 1; bits <= MAX_BITS; bits++) {
-        code = (code + bl_count[bits-1]) << 1;
-        next_code[bits] = (ush)code;
-    }
-    /* Check that the bit counts in bl_count are consistent. The last code
-     * must be all ones.
-     */
-    Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
-            "inconsistent bit counts");
-    Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
-
-    for (n = 0;  n <= max_code; n++) {
-        int len = tree[n].Len;
-        if (len == 0) continue;
-        /* Now reverse the bits */
-        tree[n].Code = (ush)bi_reverse(next_code[len]++, len);
-
-        Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
-             n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
-    }
-}
 
 /* ===========================================================================
  * Construct one Huffman tree and assigns the code bit strings and lengths.
@@ -611,8 +622,7 @@ local void gen_codes (ct_data *tree, int max_code, ushf *bl_count)
  *     and corresponding code. The length opt_len is updated; static_len is
  *     also updated if stree is not null. The field max_code is set.
  */
-local void build_tree(deflate_state *s, tree_desc *desc)
-{
+local void build_tree(deflate_state *s, tree_desc *desc) {
     ct_data *tree         = desc->dyn_tree;
     const ct_data *stree  = desc->stat_desc->static_tree;
     int elems             = desc->stat_desc->elems;
@@ -621,11 +631,10 @@ local void build_tree(deflate_state *s, tree_desc *desc)
     int node;          /* new node being created */
 
     /* Construct the initial heap, with least frequent element in
-     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
+     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n + 1].
      * heap[0] is not used.
      */
-    s->heap_len = 0;
-    s->heap_max = HEAP_SIZE;
+    s->heap_len = 0, s->heap_max = HEAP_SIZE;
 
     for (n = 0; n < elems; n++) {
         if (tree[n].Freq != 0) {
@@ -650,7 +659,7 @@ local void build_tree(deflate_state *s, tree_desc *desc)
     }
     desc->max_code = max_code;
 
-    /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
+    /* The elements heap[heap_len/2 + 1 .. heap_len] are leaves of the tree,
      * establish sub-heaps of increasing lengths:
      */
     for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n);
@@ -698,12 +707,7 @@ local void build_tree(deflate_state *s, tree_desc *desc)
  * Scan a literal or distance tree to determine the frequencies of the codes
  * in the bit length tree.
  */
-local void scan_tree (deflate_state *s, ct_data *tree, int max_code)
-#if 0
-    ct_data *tree;   /* the tree to be scanned */
-    int max_code;    /* and its largest code of non zero frequency */
-#endif
-{
+local void scan_tree(deflate_state *s, ct_data *tree, int max_code) {
     int n;                     /* iterates over all tree elements */
     int prevlen = -1;          /* last emitted length */
     int curlen;                /* length of current code */
@@ -712,11 +716,11 @@ local void scan_tree (deflate_state *s, ct_data *tree, int max_code)
     int max_count = 7;         /* max repeat count */
     int min_count = 4;         /* min repeat count */
 
-    if (nextlen == 0) { max_count = 138; min_count = 3; }
-    tree[max_code+1].Len = (ush)0xffff; /* guard */
+    if (nextlen == 0) max_count = 138, min_count = 3;
+    tree[max_code + 1].Len = (ush)0xffff; /* guard */
 
     for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
+        curlen = nextlen; nextlen = tree[n + 1].Len;
         if (++count < max_count && curlen == nextlen) {
             continue;
         } else if (count < min_count) {
@@ -731,14 +735,11 @@ local void scan_tree (deflate_state *s, ct_data *tree, int max_code)
         }
         count = 0; prevlen = curlen;
         if (nextlen == 0) {
-            max_count = 138;
-            min_count = 3;
+            max_count = 138, min_count = 3;
         } else if (curlen == nextlen) {
-            max_count = 6;
-            min_count = 3;
+            max_count = 6, min_count = 3;
         } else {
-            max_count = 7;
-            min_count = 4;
+            max_count = 7, min_count = 4;
         }
     }
 }
@@ -747,12 +748,7 @@ local void scan_tree (deflate_state *s, ct_data *tree, int max_code)
  * Send a literal or distance tree in compressed form, using the codes in
  * bl_tree.
  */
-local void send_tree (deflate_state *s, ct_data *tree, int max_code)
-#if 0
-    ct_data *tree; /* the tree to be scanned */
-    int max_code;       /* and its largest code of non zero frequency */
-#endif
-{
+local void send_tree(deflate_state *s, ct_data *tree, int max_code) {
     int n;                     /* iterates over all tree elements */
     int prevlen = -1;          /* last emitted length */
     int curlen;                /* length of current code */
@@ -761,11 +757,11 @@ local void send_tree (deflate_state *s, ct_data *tree, int max_code)
     int max_count = 7;         /* max repeat count */
     int min_count = 4;         /* min repeat count */
 
-    /* tree[max_code+1].Len = -1; */  /* guard already set */
-    if (nextlen == 0) { max_count = 138; min_count = 3; }
+    /* tree[max_code + 1].Len = -1; */  /* guard already set */
+    if (nextlen == 0) max_count = 138, min_count = 3;
 
     for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
+        curlen = nextlen; nextlen = tree[n + 1].Len;
         if (++count < max_count && curlen == nextlen) {
             continue;
         } else if (count < min_count) {
@@ -776,24 +772,21 @@ local void send_tree (deflate_state *s, ct_data *tree, int max_code)
                 send_code(s, curlen, s->bl_tree); count--;
             }
             Assert(count >= 3 && count <= 6, " 3_6?");
-            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2);
+            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count - 3, 2);
 
         } else if (count <= 10) {
-            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3);
+            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count - 3, 3);
 
         } else {
-            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7);
+            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count - 11, 7);
         }
         count = 0; prevlen = curlen;
         if (nextlen == 0) {
-            max_count = 138;
-            min_count = 3;
+            max_count = 138, min_count = 3;
         } else if (curlen == nextlen) {
-            max_count = 6;
-            min_count = 3;
+            max_count = 6, min_count = 3;
         } else {
-            max_count = 7;
-            min_count = 4;
+            max_count = 7, min_count = 4;
         }
     }
 }
@@ -802,8 +795,7 @@ local void send_tree (deflate_state *s, ct_data *tree, int max_code)
  * Construct the Huffman tree for the bit lengths and return the index in
  * bl_order of the last bit length code to send.
  */
-local int build_bl_tree(deflate_state *s)
-{
+local int build_bl_tree(deflate_state *s) {
     int max_blindex;  /* index of last bit length code of non zero freq */
 
     /* Determine the bit length frequencies for literal and distance trees */
@@ -812,8 +804,8 @@ local int build_bl_tree(deflate_state *s)
 
     /* Build the bit length tree: */
     build_tree(s, (tree_desc *)(&(s->bl_desc)));
-    /* opt_len now includes the length of the tree representations, except
-     * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
+    /* opt_len now includes the length of the tree representations, except the
+     * lengths of the bit lengths codes and the 5 + 5 + 4 bits for the counts.
      */
 
     /* Determine the number of bit length codes to send. The pkzip format
@@ -824,7 +816,7 @@ local int build_bl_tree(deflate_state *s)
         if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;
     }
     /* Update opt_len to include the bit length tree and counts */
-    s->opt_len += 3*((ulg)max_blindex+1) + 5+5+4;
+    s->opt_len += 3*((ulg)max_blindex + 1) + 5 + 5 + 4;
     Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
             s->opt_len, s->static_len));
 
@@ -836,44 +828,36 @@ local int build_bl_tree(deflate_state *s)
  * lengths of the bit length codes, the literal tree and the distance tree.
  * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
  */
-local void send_all_trees(deflate_state *s, int lcodes, int dcodes, int blcodes)
-#if 0
-    int lcodes, dcodes, blcodes; /* number of codes for each tree */
-#endif
-{
+local void send_all_trees(deflate_state *s, int lcodes, int dcodes,
+                          int blcodes) {
     int rank;                    /* index in bl_order */
 
     Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
     Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
             "too many codes");
     Tracev((stderr, "\nbl counts: "));
-    send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */
-    send_bits(s, dcodes-1,   5);
-    send_bits(s, blcodes-4,  4); /* not -3 as stated in appnote.txt */
+    send_bits(s, lcodes - 257, 5);  /* not +255 as stated in appnote.txt */
+    send_bits(s, dcodes - 1,   5);
+    send_bits(s, blcodes - 4,  4);  /* not -3 as stated in appnote.txt */
     for (rank = 0; rank < blcodes; rank++) {
         Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
         send_bits(s, s->bl_tree[bl_order[rank]].Len, 3);
     }
     Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
 
-    send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */
+    send_tree(s, (ct_data *)s->dyn_ltree, lcodes - 1);  /* literal tree */
     Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
 
-    send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */
+    send_tree(s, (ct_data *)s->dyn_dtree, dcodes - 1);  /* distance tree */
     Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
 }
 
 /* ===========================================================================
  * Send a stored block
  */
-void ZLIB_INTERNAL _tr_stored_block(deflate_state *s, charf *buf, ulg stored_len, int last)
-#if 0
-    charf *buf;       /* input block */
-    ulg stored_len;   /* length of input block */
-    int last;         /* one if this is the last block for a file */
-#endif
-{
-    send_bits(s, (STORED_BLOCK<<1)+last, 3);    /* send block type */
+void ZLIB_INTERNAL _tr_stored_block(deflate_state *s, charf *buf,
+                                    ulg stored_len, int last) {
+    send_bits(s, (STORED_BLOCK<<1) + last, 3);  /* send block type */
     bi_windup(s);        /* align on byte boundary */
     put_short(s, (ush)stored_len);
     put_short(s, (ush)~stored_len);
@@ -884,15 +868,14 @@ void ZLIB_INTERNAL _tr_stored_block(deflate_state *s, charf *buf, ulg stored_len
     s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
     s->compressed_len += (stored_len + 4) << 3;
     s->bits_sent += 2*16;
-    s->bits_sent += stored_len<<3;
+    s->bits_sent += stored_len << 3;
 #endif
 }
 
 /* ===========================================================================
  * Flush the bits in the bit buffer to pending output (leaves at most 7 bits)
  */
-void ZLIB_INTERNAL _tr_flush_bits(deflate_state *s)
-{
+void ZLIB_INTERNAL _tr_flush_bits(deflate_state *s) {
     bi_flush(s);
 }
 
@@ -900,8 +883,7 @@ void ZLIB_INTERNAL _tr_flush_bits(deflate_state *s)
  * Send one empty static block to give enough lookahead for inflate.
  * This takes 10 bits, of which 7 may remain in the bit buffer.
  */
-void ZLIB_INTERNAL _tr_align(deflate_state *s)
-{
+void ZLIB_INTERNAL _tr_align(deflate_state *s) {
     send_bits(s, STATIC_TREES<<1, 3);
     send_code(s, END_BLOCK, static_ltree);
 #ifdef ZLIB_DEBUG
@@ -910,17 +892,108 @@ void ZLIB_INTERNAL _tr_align(deflate_state *s)
     bi_flush(s);
 }
 
+/* ===========================================================================
+ * Send the block data compressed using the given Huffman trees
+ */
+local void compress_block(deflate_state *s, const ct_data *ltree,
+                          const ct_data *dtree) {
+    unsigned dist;      /* distance of matched string */
+    int lc;             /* match length or unmatched char (if dist == 0) */
+    unsigned sx = 0;    /* running index in symbol buffers */
+    unsigned code;      /* the code to send */
+    int extra;          /* number of extra bits to send */
+
+    if (s->sym_next != 0) do {
+#ifdef LIT_MEM
+        dist = s->d_buf[sx];
+        lc = s->l_buf[sx++];
+#else
+        dist = s->sym_buf[sx++] & 0xff;
+        dist += (unsigned)(s->sym_buf[sx++] & 0xff) << 8;
+        lc = s->sym_buf[sx++];
+#endif
+        if (dist == 0) {
+            send_code(s, lc, ltree); /* send a literal byte */
+            Tracecv(isgraph(lc), (stderr," '%c' ", lc));
+        } else {
+            /* Here, lc is the match length - MIN_MATCH */
+            code = _length_code[lc];
+            send_code(s, code + LITERALS + 1, ltree);   /* send length code */
+            extra = extra_lbits[code];
+            if (extra != 0) {
+                lc -= base_length[code];
+                send_bits(s, lc, extra);       /* send the extra length bits */
+            }
+            dist--; /* dist is now the match distance - 1 */
+            code = d_code(dist);
+            Assert (code < D_CODES, "bad d_code");
+
+            send_code(s, code, dtree);       /* send the distance code */
+            extra = extra_dbits[code];
+            if (extra != 0) {
+                dist -= (unsigned)base_dist[code];
+                send_bits(s, dist, extra);   /* send the extra distance bits */
+            }
+        } /* literal or match pair ? */
+
+        /* Check for no overlay of pending_buf on needed symbols */
+#ifdef LIT_MEM
+        Assert(s->pending < 2 * (s->lit_bufsize + sx), "pendingBuf overflow");
+#else
+        Assert(s->pending < s->lit_bufsize + sx, "pendingBuf overflow");
+#endif
+
+    } while (sx < s->sym_next);
+
+    send_code(s, END_BLOCK, ltree);
+}
+
+/* ===========================================================================
+ * Check if the data type is TEXT or BINARY, using the following algorithm:
+ * - TEXT if the two conditions below are satisfied:
+ *    a) There are no non-portable control characters belonging to the
+ *       "block list" (0..6, 14..25, 28..31).
+ *    b) There is at least one printable character belonging to the
+ *       "allow list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255).
+ * - BINARY otherwise.
+ * - The following partially-portable control characters form a
+ *   "gray list" that is ignored in this detection algorithm:
+ *   (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}).
+ * IN assertion: the fields Freq of dyn_ltree are set.
+ */
+local int detect_data_type(deflate_state *s) {
+    /* block_mask is the bit mask of block-listed bytes
+     * set bits 0..6, 14..25, and 28..31
+     * 0xf3ffc07f = binary 11110011111111111100000001111111
+     */
+    unsigned long block_mask = 0xf3ffc07fUL;
+    int n;
+
+    /* Check for non-textual ("block-listed") bytes. */
+    for (n = 0; n <= 31; n++, block_mask >>= 1)
+        if ((block_mask & 1) && (s->dyn_ltree[n].Freq != 0))
+            return Z_BINARY;
+
+    /* Check for textual ("allow-listed") bytes. */
+    if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0
+            || s->dyn_ltree[13].Freq != 0)
+        return Z_TEXT;
+    for (n = 32; n < LITERALS; n++)
+        if (s->dyn_ltree[n].Freq != 0)
+            return Z_TEXT;
+
+    /* There are no "block-listed" or "allow-listed" bytes:
+     * this stream either is empty or has tolerated ("gray-listed") bytes only.
+     */
+    return Z_BINARY;
+}
+
 /* ===========================================================================
  * Determine the best encoding for the current block: dynamic trees, static
  * trees or store, and write out the encoded block.
  */
-void ZLIB_INTERNAL _tr_flush_block(deflate_state *s, charf *buf, ulg stored_len, int last)
-#if 0
-    charf *buf;       /* input block, or NULL if too old */
-    ulg stored_len;   /* length of input block */
-    int last;         /* one if this is the last block for a file */
-#endif
-{
+void ZLIB_INTERNAL _tr_flush_block(deflate_state *s, charf *buf,
+                                   ulg stored_len, int last) {
     ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
     int max_blindex = 0;  /* index of last bit length code of non zero freq */
 
@@ -949,14 +1022,17 @@ void ZLIB_INTERNAL _tr_flush_block(deflate_state *s, charf *buf, ulg stored_len,
         max_blindex = build_bl_tree(s);
 
         /* Determine the best encoding. Compute the block lengths in bytes. */
-        opt_lenb = (s->opt_len+3+7)>>3;
-        static_lenb = (s->static_len+3+7)>>3;
+        opt_lenb = (s->opt_len + 3 + 7) >> 3;
+        static_lenb = (s->static_len + 3 + 7) >> 3;
 
         Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
                 opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
                 s->sym_next / 3));
 
-        if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
+#ifndef FORCE_STATIC
+        if (static_lenb <= opt_lenb || s->strategy == Z_FIXED)
+#endif
+            opt_lenb = static_lenb;
 
     } else {
         Assert(buf != (char*)0, "lost buf");
@@ -966,7 +1042,7 @@ void ZLIB_INTERNAL _tr_flush_block(deflate_state *s, charf *buf, ulg stored_len,
 #ifdef FORCE_STORED
     if (buf != (char*)0) { /* force stored block */
 #else
-    if (stored_len+4 <= opt_lenb && buf != (char*)0) {
+    if (stored_len + 4 <= opt_lenb && buf != (char*)0) {
                        /* 4: two words for the lengths */
 #endif
         /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
@@ -977,21 +1053,17 @@ void ZLIB_INTERNAL _tr_flush_block(deflate_state *s, charf *buf, ulg stored_len,
          */
         _tr_stored_block(s, buf, stored_len, last);
 
-#ifdef FORCE_STATIC
-    } else if (static_lenb >= 0) { /* force static trees */
-#else
-    } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {
-#endif
-        send_bits(s, (STATIC_TREES<<1)+last, 3);
+    } else if (static_lenb == opt_lenb) {
+        send_bits(s, (STATIC_TREES<<1) + last, 3);
         compress_block(s, (const ct_data *)static_ltree,
                        (const ct_data *)static_dtree);
 #ifdef ZLIB_DEBUG
         s->compressed_len += 3 + s->static_len;
 #endif
     } else {
-        send_bits(s, (DYN_TREES<<1)+last, 3);
-        send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
-                       max_blindex+1);
+        send_bits(s, (DYN_TREES<<1) + last, 3);
+        send_all_trees(s, s->l_desc.max_code + 1, s->d_desc.max_code + 1,
+                       max_blindex + 1);
         compress_block(s, (const ct_data *)s->dyn_ltree,
                        (const ct_data *)s->dyn_dtree);
 #ifdef ZLIB_DEBUG
@@ -1010,23 +1082,23 @@ void ZLIB_INTERNAL _tr_flush_block(deflate_state *s, charf *buf, ulg stored_len,
         s->compressed_len += 7;  /* align on byte boundary */
 #endif
     }
-    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
-           s->compressed_len-7*last));
+    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len >> 3,
+           s->compressed_len - 7*last));
 }
 
 /* ===========================================================================
  * Save the match info and tally the frequency counts. Return true if
  * the current block must be flushed.
  */
-int ZLIB_INTERNAL _tr_tally (deflate_state *s, unsigned dist, unsigned lc)
-#if 0
-    unsigned dist;  /* distance of matched string */
-    unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
+int ZLIB_INTERNAL _tr_tally(deflate_state *s, unsigned dist, unsigned lc) {
+#ifdef LIT_MEM
+    s->d_buf[s->sym_next] = (ush)dist;
+    s->l_buf[s->sym_next++] = (uch)lc;
+#else
+    s->sym_buf[s->sym_next++] = (uch)dist;
+    s->sym_buf[s->sym_next++] = (uch)(dist >> 8);
+    s->sym_buf[s->sym_next++] = (uch)lc;
 #endif
-{
-    s->sym_buf[s->sym_next++] = dist;
-    s->sym_buf[s->sym_next++] = dist >> 8;
-    s->sym_buf[s->sym_next++] = lc;
     if (dist == 0) {
         /* lc is the unmatched char */
         s->dyn_ltree[lc].Freq++;
@@ -1038,153 +1110,8 @@ int ZLIB_INTERNAL _tr_tally (deflate_state *s, unsigned dist, unsigned lc)
                (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
                (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");
 
-        s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
+        s->dyn_ltree[_length_code[lc] + LITERALS + 1].Freq++;
         s->dyn_dtree[d_code(dist)].Freq++;
     }
     return (s->sym_next == s->sym_end);
 }
-
-/* ===========================================================================
- * Send the block data compressed using the given Huffman trees
- */
-local void compress_block(deflate_state *s, const ct_data *ltree, const ct_data *dtree)
-#if 0
-    const ct_data *ltree; /* literal tree */
-    const ct_data *dtree; /* distance tree */
-#endif
-{
-    unsigned dist;      /* distance of matched string */
-    int lc;             /* match length or unmatched char (if dist == 0) */
-    unsigned sx = 0;    /* running index in sym_buf */
-    unsigned code;      /* the code to send */
-    int extra;          /* number of extra bits to send */
-
-    if (s->sym_next != 0) do {
-        dist = s->sym_buf[sx++] & 0xff;
-        dist += (unsigned)(s->sym_buf[sx++] & 0xff) << 8;
-        lc = s->sym_buf[sx++];
-        if (dist == 0) {
-            send_code(s, lc, ltree); /* send a literal byte */
-            Tracecv(isgraph(lc), (stderr," '%c' ", lc));
-        } else {
-            /* Here, lc is the match length - MIN_MATCH */
-            code = _length_code[lc];
-            send_code(s, code+LITERALS+1, ltree); /* send the length code */
-            extra = extra_lbits[code];
-            if (extra != 0) {
-                lc -= base_length[code];
-                send_bits(s, lc, extra);       /* send the extra length bits */
-            }
-            dist--; /* dist is now the match distance - 1 */
-            code = d_code(dist);
-            Assert (code < D_CODES, "bad d_code");
-
-            send_code(s, code, dtree);       /* send the distance code */
-            extra = extra_dbits[code];
-            if (extra != 0) {
-                dist -= (unsigned)base_dist[code];
-                send_bits(s, dist, extra);   /* send the extra distance bits */
-            }
-        } /* literal or match pair ? */
-
-        /* Check that the overlay between pending_buf and sym_buf is ok: */
-        Assert(s->pending < s->lit_bufsize + sx, "pendingBuf overflow");
-
-    } while (sx < s->sym_next);
-
-    send_code(s, END_BLOCK, ltree);
-}
-
-/* ===========================================================================
- * Check if the data type is TEXT or BINARY, using the following algorithm:
- * - TEXT if the two conditions below are satisfied:
- *    a) There are no non-portable control characters belonging to the
- *       "block list" (0..6, 14..25, 28..31).
- *    b) There is at least one printable character belonging to the
- *       "allow list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255).
- * - BINARY otherwise.
- * - The following partially-portable control characters form a
- *   "gray list" that is ignored in this detection algorithm:
- *   (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}).
- * IN assertion: the fields Freq of dyn_ltree are set.
- */
-local int detect_data_type(deflate_state *s)
-{
-    /* block_mask is the bit mask of block-listed bytes
-     * set bits 0..6, 14..25, and 28..31
-     * 0xf3ffc07f = binary 11110011111111111100000001111111
-     */
-    unsigned long block_mask = 0xf3ffc07fUL;
-    int n;
-
-    /* Check for non-textual ("block-listed") bytes. */
-    for (n = 0; n <= 31; n++, block_mask >>= 1)
-        if ((block_mask & 1) && (s->dyn_ltree[n].Freq != 0))
-            return Z_BINARY;
-
-    /* Check for textual ("allow-listed") bytes. */
-    if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0
-            || s->dyn_ltree[13].Freq != 0)
-        return Z_TEXT;
-    for (n = 32; n < LITERALS; n++)
-        if (s->dyn_ltree[n].Freq != 0)
-            return Z_TEXT;
-
-    /* There are no "block-listed" or "allow-listed" bytes:
-     * this stream either is empty or has tolerated ("gray-listed") bytes only.
-     */
-    return Z_BINARY;
-}
-
-/* ===========================================================================
- * Reverse the first len bits of a code, using straightforward code (a faster
- * method would use a table)
- * IN assertion: 1 <= len <= 15
- */
-local unsigned bi_reverse(unsigned code, int len)
-#if 0
-    unsigned code; /* the value to invert */
-    int len;       /* its bit length */
-#endif
-{
-    register unsigned res = 0;
-    do {
-        res |= code & 1;
-        code >>= 1;
-        res <<= 1;
-    } while (--len > 0);
-    return res >> 1;
-}
-
-/* ===========================================================================
- * Flush the bit buffer, keeping at most 7 bits in it.
- */
-local void bi_flush(deflate_state *s)
-{
-    if (s->bi_valid == 16) {
-        put_short(s, s->bi_buf);
-        s->bi_buf = 0;
-        s->bi_valid = 0;
-    } else if (s->bi_valid >= 8) {
-        put_byte(s, (Byte)s->bi_buf);
-        s->bi_buf >>= 8;
-        s->bi_valid -= 8;
-    }
-}
-
-/* ===========================================================================
- * Flush the bit buffer and align the output on a byte boundary
- */
-local void bi_windup(deflate_state *s)
-{
-    if (s->bi_valid > 8) {
-        put_short(s, s->bi_buf);
-    } else if (s->bi_valid > 0) {
-        put_byte(s, (Byte)s->bi_buf);
-    }
-    s->bi_buf = 0;
-    s->bi_valid = 0;
-#ifdef ZLIB_DEBUG
-    s->bits_sent = (s->bits_sent+7) & ~7;
-#endif
-}
diff --git a/frmts/zlib/uncompr.c b/frmts/zlib/uncompr.c
index 8014d89a9133..5e256663b451 100644
--- a/frmts/zlib/uncompr.c
+++ b/frmts/zlib/uncompr.c
@@ -24,8 +24,8 @@
    Z_DATA_ERROR if the input data was corrupted, including if the input data is
    an incomplete zlib stream.
 */
-int ZEXPORT uncompress2 (Bytef *dest, uLongf *destLen, const Bytef *source, uLong *sourceLen)
-{
+int ZEXPORT uncompress2(Bytef *dest, uLongf *destLen, const Bytef *source,
+                        uLong *sourceLen) {
     z_stream stream;
     int err;
     const uInt max = (uInt)-1;
@@ -79,7 +79,7 @@ int ZEXPORT uncompress2 (Bytef *dest, uLongf *destLen, const Bytef *source, uLon
            err;
 }
 
-int ZEXPORT uncompress (Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen)
-{
+int ZEXPORT uncompress(Bytef *dest, uLongf *destLen, const Bytef *source,
+                       uLong sourceLen) {
     return uncompress2(dest, destLen, source, &sourceLen);
 }
diff --git a/frmts/zlib/zconf.h b/frmts/zlib/zconf.h
index da51dd3b31df..d53268ade1eb 100644
--- a/frmts/zlib/zconf.h
+++ b/frmts/zlib/zconf.h
@@ -1,5 +1,5 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
+ * Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -8,10 +8,6 @@
 #ifndef ZCONF_H
 #define ZCONF_H
 
-#if defined(__GNUC__)
-#pragma GCC system_header
-#endif
-
 /*
  * If you *really* need a unique prefix for all types and library functions,
  * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
@@ -42,6 +38,9 @@
 #  define crc32                 z_crc32
 #  define crc32_combine         z_crc32_combine
 #  define crc32_combine64       z_crc32_combine64
+#  define crc32_combine_gen     z_crc32_combine_gen
+#  define crc32_combine_gen64   z_crc32_combine_gen64
+#  define crc32_combine_op      z_crc32_combine_op
 #  define crc32_z               z_crc32_z
 #  define deflate               z_deflate
 #  define deflateBound          z_deflateBound
@@ -183,7 +182,7 @@
 #    define WIN32
 #  endif
 #endif
-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(_WIN32)
+#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
 #  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
 #    ifndef SYS16BIT
 #      define SYS16BIT
@@ -218,7 +217,7 @@
 #if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
 #  define STDC
 #endif
-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(_WIN32))
+#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
 #  define STDC
 #endif
 #if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
@@ -242,7 +241,11 @@
 #endif
 
 #ifdef Z_SOLO
-   typedef unsigned long z_size_t;
+#  ifdef _WIN64
+     typedef unsigned long long z_size_t;
+#  else
+     typedef unsigned long z_size_t;
+#  endif
 #else
 #  define z_longlong long long
 #  if defined(NO_SIZE_T)
@@ -297,14 +300,6 @@
 #  endif
 #endif
 
-#ifndef Z_ARG /* function prototypes for stdarg */
-#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#    define Z_ARG(args)  args
-#  else
-#    define Z_ARG(args)  ()
-#  endif
-#endif
-
 /* The following definitions for FAR are needed only for MSDOS mixed
  * model programming (small or medium model with some far allocations).
  * This was tested only with MSC; for other MSDOS compilers you may have
@@ -332,12 +327,12 @@
 #  endif
 #endif
 
-#if defined(WINDOWS) || defined(_WIN32)
+#if defined(WINDOWS) || defined(WIN32)
    /* If building or using zlib as a DLL, define ZLIB_DLL.
     * This is not mandatory, but it offers a little performance increase.
     */
 #  ifdef ZLIB_DLL
-#    if defined(_WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
+#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
 #      ifdef ZLIB_INTERNAL
 #        define ZEXTERN extern __declspec(dllexport)
 #      else
@@ -353,6 +348,9 @@
 #    ifdef FAR
 #      undef FAR
 #    endif
+#    ifndef WIN32_LEAN_AND_MEAN
+#      define WIN32_LEAN_AND_MEAN
+#    endif
 #    include <windows.h>
      /* No need for _export, use ZLIB.DEF instead. */
      /* For complete Windows compatibility, use WINAPI, not __stdcall. */
@@ -435,11 +433,13 @@ typedef uLong FAR uLongf;
    typedef unsigned long z_crc_t;
 #endif
 
+/* Patched by GDAL */
 #ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
 #  define Z_HAVE_UNISTD_H
 #endif
 
-#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
+/* Patched by GDAL */
+#ifdef HAVE_STDARG_H
 #  define Z_HAVE_STDARG_H
 #endif
 
@@ -471,11 +471,18 @@ typedef uLong FAR uLongf;
 #  undef _LARGEFILE64_SOURCE
 #endif
 
-#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
-#  define Z_HAVE_UNISTD_H
+#ifndef Z_HAVE_UNISTD_H
+#  ifdef __WATCOMC__
+#    define Z_HAVE_UNISTD_H
+#  endif
+#endif
+#ifndef Z_HAVE_UNISTD_H
+#  if defined(_LARGEFILE64_SOURCE) && !defined(_WIN32)
+#    define Z_HAVE_UNISTD_H
+#  endif
 #endif
 #ifndef Z_SOLO
-#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
+#  if defined(Z_HAVE_UNISTD_H)
 #    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
 #    ifdef VMS
 #      include <unixio.h>       /* for off_t */
@@ -511,7 +518,7 @@ typedef uLong FAR uLongf;
 #if !defined(_WIN32) && defined(Z_LARGE64)
 #  define z_off64_t off64_t
 #else
-#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
+#  if defined(_WIN32) && !defined(__GNUC__)
 #    define z_off64_t __int64
 #  else
 #    define z_off64_t z_off_t
@@ -535,6 +542,7 @@ typedef uLong FAR uLongf;
   #pragma map(inflate_copyright,"INCOPY")
 #endif
 
+/* Patched by GDAL */
 #ifdef RENAME_INTERNAL_ZLIB_SYMBOLS
 #include "gdal_zlib_symbol_rename.h"
 #endif
diff --git a/frmts/zlib/zlib.h b/frmts/zlib/zlib.h
index 8e825f5c2013..8d4b932eaf6a 100644
--- a/frmts/zlib/zlib.h
+++ b/frmts/zlib/zlib.h
@@ -1,7 +1,7 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.12, March 11th, 2022
+  version 1.3.1, January 22nd, 2024
 
-  Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-2024 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -37,11 +37,11 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.2.12"
-#define ZLIB_VERNUM 0x12c0
+#define ZLIB_VERSION "1.3.1"
+#define ZLIB_VERNUM 0x1310
 #define ZLIB_VER_MAJOR 1
-#define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 12
+#define ZLIB_VER_MINOR 3
+#define ZLIB_VER_REVISION 1
 #define ZLIB_VER_SUBREVISION 0
 
 /*
@@ -78,8 +78,8 @@ extern "C" {
   even in the case of corrupted input.
 */
 
-typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
-typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
+typedef voidpf (*alloc_func)(voidpf opaque, uInt items, uInt size);
+typedef void   (*free_func)(voidpf opaque, voidpf address);
 
 struct internal_state;
 
@@ -217,7 +217,7 @@ typedef gz_header FAR *gz_headerp;
 
                         /* basic functions */
 
-ZEXTERN const char * ZEXPORT zlibVersion OF((void));
+ZEXTERN const char * ZEXPORT zlibVersion(void);
 /* The application can compare zlibVersion and ZLIB_VERSION for consistency.
    If the first character differs, the library code actually used is not
    compatible with the zlib.h header file used by the application.  This check
@@ -225,12 +225,12 @@ ZEXTERN const char * ZEXPORT zlibVersion OF((void));
  */
 
 /*
-ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
+ZEXTERN int ZEXPORT deflateInit(z_streamp strm, int level);
 
      Initializes the internal stream state for compression.  The fields
    zalloc, zfree and opaque must be initialized before by the caller.  If
    zalloc and zfree are set to Z_NULL, deflateInit updates them to use default
-   allocation functions.
+   allocation functions.  total_in, total_out, adler, and msg are initialized.
 
      The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
    1 gives best speed, 9 gives best compression, 0 gives no compression at all
@@ -247,7 +247,7 @@ ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
 */
 
 
-ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
+ZEXTERN int ZEXPORT deflate(z_streamp strm, int flush);
 /*
     deflate compresses as much data as possible, and stops when the input
   buffer becomes empty or the output buffer becomes full.  It may introduce
@@ -276,7 +276,7 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
   == 0), or after each call of deflate().  If deflate returns Z_OK and with
   zero avail_out, it must be called again after making room in the output
   buffer because there might be more output pending. See deflatePending(),
-  which can be used if desired to determine whether or not there is more ouput
+  which can be used if desired to determine whether or not there is more output
   in that case.
 
     Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
@@ -320,8 +320,8 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
   with the same value of the flush parameter and more output space (updated
   avail_out), until the flush is complete (deflate returns with non-zero
   avail_out).  In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
-  avail_out is greater than six to avoid repeated flush markers due to
-  avail_out == 0 on return.
+  avail_out is greater than six when the flush marker begins, in order to avoid
+  repeated flush markers upon calling deflate() again when avail_out == 0.
 
     If the parameter flush is set to Z_FINISH, pending input is processed,
   pending output is flushed and deflate returns with Z_STREAM_END if there was
@@ -360,7 +360,7 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
 */
 
 
-ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
+ZEXTERN int ZEXPORT deflateEnd(z_streamp strm);
 /*
      All dynamically allocated data structures for this stream are freed.
    This function discards any unprocessed input and does not flush any pending
@@ -375,7 +375,7 @@ ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
 
 
 /*
-ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
+ZEXTERN int ZEXPORT inflateInit(z_streamp strm);
 
      Initializes the internal stream state for decompression.  The fields
    next_in, avail_in, zalloc, zfree and opaque must be initialized before by
@@ -383,7 +383,8 @@ ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
    read or consumed.  The allocation of a sliding window will be deferred to
    the first call of inflate (if the decompression does not complete on the
    first call).  If zalloc and zfree are set to Z_NULL, inflateInit updates
-   them to use default allocation functions.
+   them to use default allocation functions.  total_in, total_out, adler, and
+   msg are initialized.
 
      inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
@@ -397,7 +398,7 @@ ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
 */
 
 
-ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
+ZEXTERN int ZEXPORT inflate(z_streamp strm, int flush);
 /*
     inflate decompresses as much data as possible, and stops when the input
   buffer becomes empty or the output buffer becomes full.  It may introduce
@@ -517,7 +518,7 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
 */
 
 
-ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
+ZEXTERN int ZEXPORT inflateEnd(z_streamp strm);
 /*
      All dynamically allocated data structures for this stream are freed.
    This function discards any unprocessed input and does not flush any pending
@@ -535,12 +536,12 @@ ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
 */
 
 /*
-ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
-                                     int  level,
-                                     int  method,
-                                     int  windowBits,
-                                     int  memLevel,
-                                     int  strategy));
+ZEXTERN int ZEXPORT deflateInit2(z_streamp strm,
+                                 int level,
+                                 int method,
+                                 int windowBits,
+                                 int memLevel,
+                                 int strategy);
 
      This is another version of deflateInit with more compression options.  The
    fields zalloc, zfree and opaque must be initialized before by the caller.
@@ -607,9 +608,9 @@ ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
    compression: this will be done by deflate().
 */
 
-ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
+ZEXTERN int ZEXPORT deflateSetDictionary(z_streamp strm,
+                                         const Bytef *dictionary,
+                                         uInt  dictLength);
 /*
      Initializes the compression dictionary from the given byte sequence
    without producing any compressed output.  When using the zlib format, this
@@ -651,16 +652,16 @@ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
    not perform any compression: this will be done by deflate().
 */
 
-ZEXTERN int ZEXPORT deflateGetDictionary OF((z_streamp strm,
-                                             Bytef *dictionary,
-                                             uInt  *dictLength));
+ZEXTERN int ZEXPORT deflateGetDictionary(z_streamp strm,
+                                         Bytef *dictionary,
+                                         uInt  *dictLength);
 /*
      Returns the sliding dictionary being maintained by deflate.  dictLength is
    set to the number of bytes in the dictionary, and that many bytes are copied
    to dictionary.  dictionary must have enough space, where 32768 bytes is
    always enough.  If deflateGetDictionary() is called with dictionary equal to
    Z_NULL, then only the dictionary length is returned, and nothing is copied.
-   Similary, if dictLength is Z_NULL, then it is not set.
+   Similarly, if dictLength is Z_NULL, then it is not set.
 
      deflateGetDictionary() may return a length less than the window size, even
    when more than the window size in input has been provided. It may return up
@@ -673,8 +674,8 @@ ZEXTERN int ZEXPORT deflateGetDictionary OF((z_streamp strm,
    stream state is inconsistent.
 */
 
-ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
-                                    z_streamp source));
+ZEXTERN int ZEXPORT deflateCopy(z_streamp dest,
+                                z_streamp source);
 /*
      Sets the destination stream as a complete copy of the source stream.
 
@@ -691,20 +692,20 @@ ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
    destination.
 */
 
-ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
+ZEXTERN int ZEXPORT deflateReset(z_streamp strm);
 /*
      This function is equivalent to deflateEnd followed by deflateInit, but
    does not free and reallocate the internal compression state.  The stream
    will leave the compression level and any other attributes that may have been
-   set unchanged.
+   set unchanged.  total_in, total_out, adler, and msg are initialized.
 
      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
    stream state was inconsistent (such as zalloc or state being Z_NULL).
 */
 
-ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
-                                      int level,
-                                      int strategy));
+ZEXTERN int ZEXPORT deflateParams(z_streamp strm,
+                                  int level,
+                                  int strategy);
 /*
      Dynamically update the compression level and compression strategy.  The
    interpretation of level and strategy is as in deflateInit2().  This can be
@@ -729,7 +730,7 @@ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
    Then no more input data should be provided before the deflateParams() call.
    If this is done, the old level and strategy will be applied to the data
    compressed before deflateParams(), and the new level and strategy will be
-   applied to the the data compressed after deflateParams().
+   applied to the data compressed after deflateParams().
 
      deflateParams returns Z_OK on success, Z_STREAM_ERROR if the source stream
    state was inconsistent or if a parameter was invalid, or Z_BUF_ERROR if
@@ -740,11 +741,11 @@ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
    retried with more output space.
 */
 
-ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
-                                    int good_length,
-                                    int max_lazy,
-                                    int nice_length,
-                                    int max_chain));
+ZEXTERN int ZEXPORT deflateTune(z_streamp strm,
+                                int good_length,
+                                int max_lazy,
+                                int nice_length,
+                                int max_chain);
 /*
      Fine tune deflate's internal compression parameters.  This should only be
    used by someone who understands the algorithm used by zlib's deflate for
@@ -757,8 +758,8 @@ ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
    returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
  */
 
-ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
-                                       uLong sourceLen));
+ZEXTERN uLong ZEXPORT deflateBound(z_streamp strm,
+                                   uLong sourceLen);
 /*
      deflateBound() returns an upper bound on the compressed size after
    deflation of sourceLen bytes.  It must be called after deflateInit() or
@@ -772,9 +773,9 @@ ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
    than Z_FINISH or Z_NO_FLUSH are used.
 */
 
-ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm,
-                                       unsigned *pending,
-                                       int *bits));
+ZEXTERN int ZEXPORT deflatePending(z_streamp strm,
+                                   unsigned *pending,
+                                   int *bits);
 /*
      deflatePending() returns the number of bytes and bits of output that have
    been generated, but not yet provided in the available output.  The bytes not
@@ -787,9 +788,9 @@ ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm,
    stream state was inconsistent.
  */
 
-ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
+ZEXTERN int ZEXPORT deflatePrime(z_streamp strm,
+                                 int bits,
+                                 int value);
 /*
      deflatePrime() inserts bits in the deflate output stream.  The intent
    is that this function is used to start off the deflate output with the bits
@@ -804,8 +805,8 @@ ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
    source stream state was inconsistent.
 */
 
-ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
-                                         gz_headerp head));
+ZEXTERN int ZEXPORT deflateSetHeader(z_streamp strm,
+                                     gz_headerp head);
 /*
      deflateSetHeader() provides gzip header information for when a gzip
    stream is requested by deflateInit2().  deflateSetHeader() may be called
@@ -821,16 +822,17 @@ ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
    gzip file" and give up.
 
      If deflateSetHeader is not used, the default gzip header has text false,
-   the time set to zero, and os set to 255, with no extra, name, or comment
-   fields.  The gzip header is returned to the default state by deflateReset().
+   the time set to zero, and os set to the current operating system, with no
+   extra, name, or comment fields.  The gzip header is returned to the default
+   state by deflateReset().
 
      deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
    stream state was inconsistent.
 */
 
 /*
-ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
-                                     int  windowBits));
+ZEXTERN int ZEXPORT inflateInit2(z_streamp strm,
+                                 int windowBits);
 
      This is another version of inflateInit with an extra parameter.  The
    fields next_in, avail_in, zalloc, zfree and opaque must be initialized
@@ -883,9 +885,9 @@ ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
    deferred until inflate() is called.
 */
 
-ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
+ZEXTERN int ZEXPORT inflateSetDictionary(z_streamp strm,
+                                         const Bytef *dictionary,
+                                         uInt  dictLength);
 /*
      Initializes the decompression dictionary from the given uncompressed byte
    sequence.  This function must be called immediately after a call of inflate,
@@ -906,22 +908,22 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
    inflate().
 */
 
-ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm,
-                                             Bytef *dictionary,
-                                             uInt  *dictLength));
+ZEXTERN int ZEXPORT inflateGetDictionary(z_streamp strm,
+                                         Bytef *dictionary,
+                                         uInt  *dictLength);
 /*
      Returns the sliding dictionary being maintained by inflate.  dictLength is
    set to the number of bytes in the dictionary, and that many bytes are copied
    to dictionary.  dictionary must have enough space, where 32768 bytes is
    always enough.  If inflateGetDictionary() is called with dictionary equal to
    Z_NULL, then only the dictionary length is returned, and nothing is copied.
-   Similary, if dictLength is Z_NULL, then it is not set.
+   Similarly, if dictLength is Z_NULL, then it is not set.
 
      inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
    stream state is inconsistent.
 */
 
-ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
+ZEXTERN int ZEXPORT inflateSync(z_streamp strm);
 /*
      Skips invalid compressed data until a possible full flush point (see above
    for the description of deflate with Z_FULL_FLUSH) can be found, or until all
@@ -934,14 +936,14 @@ ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
      inflateSync returns Z_OK if a possible full flush point has been found,
    Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
    has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
-   In the success case, the application may save the current current value of
-   total_in which indicates where valid compressed data was found.  In the
-   error case, the application may repeatedly call inflateSync, providing more
-   input each time, until success or end of the input data.
+   In the success case, the application may save the current value of total_in
+   which indicates where valid compressed data was found.  In the error case,
+   the application may repeatedly call inflateSync, providing more input each
+   time, until success or end of the input data.
 */
 
-ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
-                                    z_streamp source));
+ZEXTERN int ZEXPORT inflateCopy(z_streamp dest,
+                                z_streamp source);
 /*
      Sets the destination stream as a complete copy of the source stream.
 
@@ -956,18 +958,19 @@ ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
    destination.
 */
 
-ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
+ZEXTERN int ZEXPORT inflateReset(z_streamp strm);
 /*
      This function is equivalent to inflateEnd followed by inflateInit,
    but does not free and reallocate the internal decompression state.  The
    stream will keep attributes that may have been set by inflateInit2.
+   total_in, total_out, adler, and msg are initialized.
 
      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
    stream state was inconsistent (such as zalloc or state being Z_NULL).
 */
 
-ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,
-                                      int windowBits));
+ZEXTERN int ZEXPORT inflateReset2(z_streamp strm,
+                                  int windowBits);
 /*
      This function is the same as inflateReset, but it also permits changing
    the wrap and window size requests.  The windowBits parameter is interpreted
@@ -980,9 +983,9 @@ ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,
    the windowBits parameter is invalid.
 */
 
-ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
+ZEXTERN int ZEXPORT inflatePrime(z_streamp strm,
+                                 int bits,
+                                 int value);
 /*
      This function inserts bits in the inflate input stream.  The intent is
    that this function is used to start inflating at a bit position in the
@@ -1001,7 +1004,7 @@ ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
    stream state was inconsistent.
 */
 
-ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
+ZEXTERN long ZEXPORT inflateMark(z_streamp strm);
 /*
      This function returns two values, one in the lower 16 bits of the return
    value, and the other in the remaining upper bits, obtained by shifting the
@@ -1029,8 +1032,8 @@ ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
    source stream state was inconsistent.
 */
 
-ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
-                                         gz_headerp head));
+ZEXTERN int ZEXPORT inflateGetHeader(z_streamp strm,
+                                     gz_headerp head);
 /*
      inflateGetHeader() requests that gzip header information be stored in the
    provided gz_header structure.  inflateGetHeader() may be called after
@@ -1070,8 +1073,8 @@ ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
 */
 
 /*
-ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
-                                        unsigned char FAR *window));
+ZEXTERN int ZEXPORT inflateBackInit(z_streamp strm, int windowBits,
+                                    unsigned char FAR *window);
 
      Initialize the internal stream state for decompression using inflateBack()
    calls.  The fields zalloc, zfree and opaque in strm must be initialized
@@ -1091,13 +1094,13 @@ ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
    the version of the header file.
 */
 
-typedef unsigned (*in_func) OF((void FAR *,
-                                z_const unsigned char FAR * FAR *));
-typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
+typedef unsigned (*in_func)(void FAR *,
+                            z_const unsigned char FAR * FAR *);
+typedef int (*out_func)(void FAR *, unsigned char FAR *, unsigned);
 
-ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
-                                    in_func in, void FAR *in_desc,
-                                    out_func out, void FAR *out_desc));
+ZEXTERN int ZEXPORT inflateBack(z_streamp strm,
+                                in_func in, void FAR *in_desc,
+                                out_func out, void FAR *out_desc);
 /*
      inflateBack() does a raw inflate with a single call using a call-back
    interface for input and output.  This is potentially more efficient than
@@ -1165,7 +1168,7 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
    cannot return Z_OK.
 */
 
-ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
+ZEXTERN int ZEXPORT inflateBackEnd(z_streamp strm);
 /*
      All memory allocated by inflateBackInit() is freed.
 
@@ -1173,7 +1176,7 @@ ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
    state was inconsistent.
 */
 
-ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
+ZEXTERN uLong ZEXPORT zlibCompileFlags(void);
 /* Return flags indicating compile-time options.
 
     Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
@@ -1226,8 +1229,8 @@ ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
    you need special options.
 */
 
-ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
-                                 const Bytef *source, uLong sourceLen));
+ZEXTERN int ZEXPORT compress(Bytef *dest,   uLongf *destLen,
+                             const Bytef *source, uLong sourceLen);
 /*
      Compresses the source buffer into the destination buffer.  sourceLen is
    the byte length of the source buffer.  Upon entry, destLen is the total size
@@ -1241,9 +1244,9 @@ ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
    buffer.
 */
 
-ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
-                                  const Bytef *source, uLong sourceLen,
-                                  int level));
+ZEXTERN int ZEXPORT compress2(Bytef *dest,   uLongf *destLen,
+                              const Bytef *source, uLong sourceLen,
+                              int level);
 /*
      Compresses the source buffer into the destination buffer.  The level
    parameter has the same meaning as in deflateInit.  sourceLen is the byte
@@ -1257,15 +1260,15 @@ ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
    Z_STREAM_ERROR if the level parameter is invalid.
 */
 
-ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
+ZEXTERN uLong ZEXPORT compressBound(uLong sourceLen);
 /*
      compressBound() returns an upper bound on the compressed size after
    compress() or compress2() on sourceLen bytes.  It would be used before a
    compress() or compress2() call to allocate the destination buffer.
 */
 
-ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
-                                   const Bytef *source, uLong sourceLen));
+ZEXTERN int ZEXPORT uncompress(Bytef *dest,   uLongf *destLen,
+                               const Bytef *source, uLong sourceLen);
 /*
      Decompresses the source buffer into the destination buffer.  sourceLen is
    the byte length of the source buffer.  Upon entry, destLen is the total size
@@ -1282,8 +1285,8 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
    buffer with the uncompressed data up to that point.
 */
 
-ZEXTERN int ZEXPORT uncompress2 OF((Bytef *dest,   uLongf *destLen,
-                                    const Bytef *source, uLong *sourceLen));
+ZEXTERN int ZEXPORT uncompress2(Bytef *dest,   uLongf *destLen,
+                                const Bytef *source, uLong *sourceLen);
 /*
      Same as uncompress, except that sourceLen is a pointer, where the
    length of the source is *sourceLen.  On return, *sourceLen is the number of
@@ -1302,7 +1305,7 @@ ZEXTERN int ZEXPORT uncompress2 OF((Bytef *dest,   uLongf *destLen,
 typedef struct gzFile_s *gzFile;    /* semi-opaque gzip file descriptor */
 
 /*
-ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
+ZEXTERN gzFile ZEXPORT gzopen(const char *path, const char *mode);
 
      Open the gzip (.gz) file at path for reading and decompressing, or
    compressing and writing.  The mode parameter is as in fopen ("rb" or "wb")
@@ -1339,7 +1342,7 @@ ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
    file could not be opened.
 */
 
-ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
+ZEXTERN gzFile ZEXPORT gzdopen(int fd, const char *mode);
 /*
      Associate a gzFile with the file descriptor fd.  File descriptors are
    obtained from calls like open, dup, creat, pipe or fileno (if the file has
@@ -1362,7 +1365,7 @@ ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
    will not detect if fd is invalid (unless fd is -1).
 */
 
-ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
+ZEXTERN int ZEXPORT gzbuffer(gzFile file, unsigned size);
 /*
      Set the internal buffer size used by this library's functions for file to
    size.  The default buffer size is 8192 bytes.  This function must be called
@@ -1378,7 +1381,7 @@ ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
    too late.
 */
 
-ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
+ZEXTERN int ZEXPORT gzsetparams(gzFile file, int level, int strategy);
 /*
      Dynamically update the compression level and strategy for file.  See the
    description of deflateInit2 for the meaning of these parameters. Previously
@@ -1389,7 +1392,7 @@ ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
    or Z_MEM_ERROR if there is a memory allocation error.
 */
 
-ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
+ZEXTERN int ZEXPORT gzread(gzFile file, voidp buf, unsigned len);
 /*
      Read and decompress up to len uncompressed bytes from file into buf.  If
    the input file is not in gzip format, gzread copies the given number of
@@ -1419,8 +1422,8 @@ ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
    Z_STREAM_ERROR.
 */
 
-ZEXTERN z_size_t ZEXPORT gzfread OF((voidp buf, z_size_t size, z_size_t nitems,
-                                     gzFile file));
+ZEXTERN z_size_t ZEXPORT gzfread(voidp buf, z_size_t size, z_size_t nitems,
+                                 gzFile file);
 /*
      Read and decompress up to nitems items of size size from file into buf,
    otherwise operating as gzread() does.  This duplicates the interface of
@@ -1437,22 +1440,22 @@ ZEXTERN z_size_t ZEXPORT gzfread OF((voidp buf, z_size_t size, z_size_t nitems,
 
      In the event that the end of file is reached and only a partial item is
    available at the end, i.e. the remaining uncompressed data length is not a
-   multiple of size, then the final partial item is nevetheless read into buf
+   multiple of size, then the final partial item is nevertheless read into buf
    and the end-of-file flag is set.  The length of the partial item read is not
    provided, but could be inferred from the result of gztell().  This behavior
    is the same as the behavior of fread() implementations in common libraries,
    but it prevents the direct use of gzfread() to read a concurrently written
-   file, reseting and retrying on end-of-file, when size is not 1.
+   file, resetting and retrying on end-of-file, when size is not 1.
 */
 
-ZEXTERN int ZEXPORT gzwrite OF((gzFile file, voidpc buf, unsigned len));
+ZEXTERN int ZEXPORT gzwrite(gzFile file, voidpc buf, unsigned len);
 /*
      Compress and write the len uncompressed bytes at buf to file. gzwrite
    returns the number of uncompressed bytes written or 0 in case of error.
 */
 
-ZEXTERN z_size_t ZEXPORT gzfwrite OF((voidpc buf, z_size_t size,
-                                      z_size_t nitems, gzFile file));
+ZEXTERN z_size_t ZEXPORT gzfwrite(voidpc buf, z_size_t size,
+                                  z_size_t nitems, gzFile file);
 /*
      Compress and write nitems items of size size from buf to file, duplicating
    the interface of stdio's fwrite(), with size_t request and return types.  If
@@ -1465,7 +1468,7 @@ ZEXTERN z_size_t ZEXPORT gzfwrite OF((voidpc buf, z_size_t size,
    is returned, and the error state is set to Z_STREAM_ERROR.
 */
 
-ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
+ZEXTERN int ZEXPORTVA gzprintf(gzFile file, const char *format, ...);
 /*
      Convert, format, compress, and write the arguments (...) to file under
    control of the string format, as in fprintf.  gzprintf returns the number of
@@ -1480,7 +1483,7 @@ ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
    This can be determined using zlibCompileFlags().
 */
 
-ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
+ZEXTERN int ZEXPORT gzputs(gzFile file, const char *s);
 /*
      Compress and write the given null-terminated string s to file, excluding
    the terminating null character.
@@ -1488,7 +1491,7 @@ ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
      gzputs returns the number of characters written, or -1 in case of error.
 */
 
-ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
+ZEXTERN char * ZEXPORT gzgets(gzFile file, char *buf, int len);
 /*
      Read and decompress bytes from file into buf, until len-1 characters are
    read, or until a newline character is read and transferred to buf, or an
@@ -1502,13 +1505,13 @@ ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
    buf are indeterminate.
 */
 
-ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
+ZEXTERN int ZEXPORT gzputc(gzFile file, int c);
 /*
      Compress and write c, converted to an unsigned char, into file.  gzputc
    returns the value that was written, or -1 in case of error.
 */
 
-ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
+ZEXTERN int ZEXPORT gzgetc(gzFile file);
 /*
      Read and decompress one byte from file.  gzgetc returns this byte or -1
    in case of end of file or error.  This is implemented as a macro for speed.
@@ -1517,7 +1520,7 @@ ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
    points to has been clobbered or not.
 */
 
-ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
+ZEXTERN int ZEXPORT gzungetc(int c, gzFile file);
 /*
      Push c back onto the stream for file to be read as the first character on
    the next read.  At least one character of push-back is always allowed.
@@ -1529,7 +1532,7 @@ ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
    gzseek() or gzrewind().
 */
 
-ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
+ZEXTERN int ZEXPORT gzflush(gzFile file, int flush);
 /*
      Flush all pending output to file.  The parameter flush is as in the
    deflate() function.  The return value is the zlib error number (see function
@@ -1545,8 +1548,8 @@ ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
 */
 
 /*
-ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
-                                   z_off_t offset, int whence));
+ZEXTERN z_off_t ZEXPORT gzseek(gzFile file,
+                               z_off_t offset, int whence);
 
      Set the starting position to offset relative to whence for the next gzread
    or gzwrite on file.  The offset represents a number of bytes in the
@@ -1564,7 +1567,7 @@ ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
    would be before the current position.
 */
 
-ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
+ZEXTERN int ZEXPORT    gzrewind(gzFile file);
 /*
      Rewind file. This function is supported only for reading.
 
@@ -1572,7 +1575,7 @@ ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
 */
 
 /*
-ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
+ZEXTERN z_off_t ZEXPORT    gztell(gzFile file);
 
      Return the starting position for the next gzread or gzwrite on file.
    This position represents a number of bytes in the uncompressed data stream,
@@ -1583,7 +1586,7 @@ ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
 */
 
 /*
-ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file));
+ZEXTERN z_off_t ZEXPORT gzoffset(gzFile file);
 
      Return the current compressed (actual) read or write offset of file.  This
    offset includes the count of bytes that precede the gzip stream, for example
@@ -1592,7 +1595,7 @@ ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file));
    be used for a progress indicator.  On error, gzoffset() returns -1.
 */
 
-ZEXTERN int ZEXPORT gzeof OF((gzFile file));
+ZEXTERN int ZEXPORT gzeof(gzFile file);
 /*
      Return true (1) if the end-of-file indicator for file has been set while
    reading, false (0) otherwise.  Note that the end-of-file indicator is set
@@ -1607,7 +1610,7 @@ ZEXTERN int ZEXPORT gzeof OF((gzFile file));
    has grown since the previous end of file was detected.
 */
 
-ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
+ZEXTERN int ZEXPORT gzdirect(gzFile file);
 /*
      Return true (1) if file is being copied directly while reading, or false
    (0) if file is a gzip stream being decompressed.
@@ -1628,7 +1631,7 @@ ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
    gzip file reading and decompression, which may not be desired.)
 */
 
-ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
+ZEXTERN int ZEXPORT    gzclose(gzFile file);
 /*
      Flush all pending output for file, if necessary, close file and
    deallocate the (de)compression state.  Note that once file is closed, you
@@ -1641,8 +1644,8 @@ ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
    last read ended in the middle of a gzip stream, or Z_OK on success.
 */
 
-ZEXTERN int ZEXPORT gzclose_r OF((gzFile file));
-ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));
+ZEXTERN int ZEXPORT gzclose_r(gzFile file);
+ZEXTERN int ZEXPORT gzclose_w(gzFile file);
 /*
      Same as gzclose(), but gzclose_r() is only for use when reading, and
    gzclose_w() is only for use when writing or appending.  The advantage to
@@ -1653,7 +1656,7 @@ ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));
    zlib library.
 */
 
-ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
+ZEXTERN const char * ZEXPORT gzerror(gzFile file, int *errnum);
 /*
      Return the error message for the last error which occurred on file.
    errnum is set to zlib error number.  If an error occurred in the file system
@@ -1669,7 +1672,7 @@ ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
    functions above that do not distinguish those cases in their return values.
 */
 
-ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
+ZEXTERN void ZEXPORT gzclearerr(gzFile file);
 /*
      Clear the error and end-of-file flags for file.  This is analogous to the
    clearerr() function in stdio.  This is useful for continuing to read a gzip
@@ -1686,7 +1689,7 @@ ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
    library.
 */
 
-ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
+ZEXTERN uLong ZEXPORT adler32(uLong adler, const Bytef *buf, uInt len);
 /*
      Update a running Adler-32 checksum with the bytes buf[0..len-1] and
    return the updated checksum. An Adler-32 value is in the range of a 32-bit
@@ -1706,15 +1709,15 @@ ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
      if (adler != original_adler) error();
 */
 
-ZEXTERN uLong ZEXPORT adler32_z OF((uLong adler, const Bytef *buf,
-                                    z_size_t len));
+ZEXTERN uLong ZEXPORT adler32_z(uLong adler, const Bytef *buf,
+                                z_size_t len);
 /*
      Same as adler32(), but with a size_t length.
 */
 
 /*
-ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
-                                          z_off_t len2));
+ZEXTERN uLong ZEXPORT adler32_combine(uLong adler1, uLong adler2,
+                                      z_off_t len2);
 
      Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
    and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
@@ -1724,7 +1727,7 @@ ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
    negative, the result has no meaning or utility.
 */
 
-ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len));
+ZEXTERN uLong ZEXPORT crc32(uLong crc, const Bytef *buf, uInt len);
 /*
      Update a running CRC-32 with the bytes buf[0..len-1] and return the
    updated CRC-32. A CRC-32 value is in the range of a 32-bit unsigned integer.
@@ -1742,30 +1745,30 @@ ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len));
      if (crc != original_crc) error();
 */
 
-ZEXTERN uLong ZEXPORT crc32_z OF((uLong crc, const Bytef *buf,
-                                  z_size_t len));
+ZEXTERN uLong ZEXPORT crc32_z(uLong crc, const Bytef *buf,
+                              z_size_t len);
 /*
      Same as crc32(), but with a size_t length.
 */
 
 /*
-ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
+ZEXTERN uLong ZEXPORT crc32_combine(uLong crc1, uLong crc2, z_off_t len2);
 
      Combine two CRC-32 check values into one.  For two sequences of bytes,
    seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
    calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
    check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
-   len2.
+   len2. len2 must be non-negative.
 */
 
 /*
-ZEXTERN uLong ZEXPORT crc32_combine_gen OF((z_off_t len2));
+ZEXTERN uLong ZEXPORT crc32_combine_gen(z_off_t len2);
 
      Return the operator corresponding to length len2, to be used with
-   crc32_combine_op().
+   crc32_combine_op(). len2 must be non-negative.
 */
 
-ZEXTERN uLong ZEXPORT crc32_combine_op OF((uLong crc1, uLong crc2, uLong op));
+ZEXTERN uLong ZEXPORT crc32_combine_op(uLong crc1, uLong crc2, uLong op);
 /*
      Give the same result as crc32_combine(), using op in place of len2. op is
    is generated from len2 by crc32_combine_gen(). This will be faster than
@@ -1778,20 +1781,20 @@ ZEXTERN uLong ZEXPORT crc32_combine_op OF((uLong crc1, uLong crc2, uLong op));
 /* deflateInit and inflateInit are macros to allow checking the zlib version
  * and the compiler's view of z_stream:
  */
-ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
-                                      int windowBits, int memLevel,
-                                      int strategy, const char *version,
-                                      int stream_size));
-ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
-                                      const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
-                                         unsigned char FAR *window,
-                                         const char *version,
-                                         int stream_size));
+ZEXTERN int ZEXPORT deflateInit_(z_streamp strm, int level,
+                                 const char *version, int stream_size);
+ZEXTERN int ZEXPORT inflateInit_(z_streamp strm,
+                                 const char *version, int stream_size);
+ZEXTERN int ZEXPORT deflateInit2_(z_streamp strm, int  level, int  method,
+                                  int windowBits, int memLevel,
+                                  int strategy, const char *version,
+                                  int stream_size);
+ZEXTERN int ZEXPORT inflateInit2_(z_streamp strm, int  windowBits,
+                                  const char *version, int stream_size);
+ZEXTERN int ZEXPORT inflateBackInit_(z_streamp strm, int windowBits,
+                                     unsigned char FAR *window,
+                                     const char *version,
+                                     int stream_size);
 #ifdef Z_PREFIX_SET
 #  define z_deflateInit(strm, level) \
           deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
@@ -1807,26 +1810,19 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
           inflateBackInit_((strm), (windowBits), (window), \
                            ZLIB_VERSION, (int)sizeof(z_stream))
 #else
-
-#ifdef __cplusplus
-#define STATIC_CAST(type,val) static_cast<type>(val)
-#else
-#define STATIC_CAST(type,val) (type)(val)
-#endif
-
 #  define deflateInit(strm, level) \
-          deflateInit_((strm), (level), ZLIB_VERSION, STATIC_CAST(int, sizeof(z_stream)))
+          deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
 #  define inflateInit(strm) \
-          inflateInit_((strm), ZLIB_VERSION, STATIC_CAST(int, sizeof(z_stream)))
+          inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
 #  define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
           deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                        (strategy), ZLIB_VERSION, STATIC_CAST(int, sizeof(z_stream)))
+                        (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
 #  define inflateInit2(strm, windowBits) \
           inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
-                        STATIC_CAST(int, sizeof(z_stream)))
+                        (int)sizeof(z_stream))
 #  define inflateBackInit(strm, windowBits, window) \
           inflateBackInit_((strm), (windowBits), (window), \
-                           ZLIB_VERSION, STATIC_CAST(int, sizeof(z_stream)))
+                           ZLIB_VERSION, (int)sizeof(z_stream))
 #endif
 
 #ifndef Z_SOLO
@@ -1843,7 +1839,7 @@ struct gzFile_s {
     unsigned char *next;
     z_off64_t pos;
 };
-ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
+ZEXTERN int ZEXPORT gzgetc_(gzFile file);       /* backward compatibility */
 #ifdef Z_PREFIX_SET
 #  undef z_gzgetc
 #  define z_gzgetc(g) \
@@ -1860,16 +1856,15 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
  * without large file support, _LFS64_LARGEFILE must also be true
  */
 #ifdef Z_LARGE64
-   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-   ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
-   ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
-   ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
+   ZEXTERN gzFile ZEXPORT gzopen64(const char *, const char *);
+   ZEXTERN z_off64_t ZEXPORT gzseek64(gzFile, z_off64_t, int);
+   ZEXTERN z_off64_t ZEXPORT gztell64(gzFile);
+   ZEXTERN z_off64_t ZEXPORT gzoffset64(gzFile);
+   ZEXTERN uLong ZEXPORT adler32_combine64(uLong, uLong, z_off64_t);
+   ZEXTERN uLong ZEXPORT crc32_combine64(uLong, uLong, z_off64_t);
+   ZEXTERN uLong ZEXPORT crc32_combine_gen64(z_off64_t);
 #endif
 
-ZEXTERN uLong adler32_combine64 OF((uLong, uLong, z_off64_t));
-ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
-ZEXTERN uLong ZEXPORT crc32_combine_gen64 OF((z_off64_t));
-
 #if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
 #  ifdef Z_PREFIX_SET
 #    define z_gzopen z_gzopen64
@@ -1889,50 +1884,50 @@ ZEXTERN uLong ZEXPORT crc32_combine_gen64 OF((z_off64_t));
 #    define crc32_combine_gen crc32_combine_gen64
 #  endif
 #  ifndef Z_LARGE64
-     ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
-     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
-     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
-     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
-     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
-     ZEXTERN uLong ZEXPORT crc32_combine_gen64 OF((z_off_t));
+     ZEXTERN gzFile ZEXPORT gzopen64(const char *, const char *);
+     ZEXTERN z_off_t ZEXPORT gzseek64(gzFile, z_off_t, int);
+     ZEXTERN z_off_t ZEXPORT gztell64(gzFile);
+     ZEXTERN z_off_t ZEXPORT gzoffset64(gzFile);
+     ZEXTERN uLong ZEXPORT adler32_combine64(uLong, uLong, z_off_t);
+     ZEXTERN uLong ZEXPORT crc32_combine64(uLong, uLong, z_off_t);
+     ZEXTERN uLong ZEXPORT crc32_combine_gen64(z_off_t);
 #  endif
 #else
-   ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
-   ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
-   ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
-   ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
-   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
-   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
-   ZEXTERN uLong ZEXPORT crc32_combine_gen OF((z_off_t));
+   ZEXTERN gzFile ZEXPORT gzopen(const char *, const char *);
+   ZEXTERN z_off_t ZEXPORT gzseek(gzFile, z_off_t, int);
+   ZEXTERN z_off_t ZEXPORT gztell(gzFile);
+   ZEXTERN z_off_t ZEXPORT gzoffset(gzFile);
+   ZEXTERN uLong ZEXPORT adler32_combine(uLong, uLong, z_off_t);
+   ZEXTERN uLong ZEXPORT crc32_combine(uLong, uLong, z_off_t);
+   ZEXTERN uLong ZEXPORT crc32_combine_gen(z_off_t);
 #endif
 
 #else /* Z_SOLO */
 
-   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
-   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
-   ZEXTERN uLong ZEXPORT crc32_combine_gen OF((z_off_t));
+   ZEXTERN uLong ZEXPORT adler32_combine(uLong, uLong, z_off_t);
+   ZEXTERN uLong ZEXPORT crc32_combine(uLong, uLong, z_off_t);
+   ZEXTERN uLong ZEXPORT crc32_combine_gen(z_off_t);
 
 #endif /* !Z_SOLO */
 
 /* undocumented functions */
-ZEXTERN const char   * ZEXPORT zError           OF((int));
-ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
-ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
-ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
-ZEXTERN int            ZEXPORT inflateValidate OF((z_streamp, int));
-ZEXTERN unsigned long  ZEXPORT inflateCodesUsed OF ((z_streamp));
-ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
-ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
+ZEXTERN const char   * ZEXPORT zError(int);
+ZEXTERN int            ZEXPORT inflateSyncPoint(z_streamp);
+ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table(void);
+ZEXTERN int            ZEXPORT inflateUndermine(z_streamp, int);
+ZEXTERN int            ZEXPORT inflateValidate(z_streamp, int);
+ZEXTERN unsigned long  ZEXPORT inflateCodesUsed(z_streamp);
+ZEXTERN int            ZEXPORT inflateResetKeep(z_streamp);
+ZEXTERN int            ZEXPORT deflateResetKeep(z_streamp);
 #if defined(_WIN32) && !defined(Z_SOLO)
-ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
-                                            const char *mode));
+ZEXTERN gzFile         ZEXPORT gzopen_w(const wchar_t *path,
+                                        const char *mode);
 #endif
 #if defined(STDC) || defined(Z_HAVE_STDARG_H)
 #  ifndef Z_SOLO
-ZEXTERN int            ZEXPORTVA gzvprintf Z_ARG((gzFile file,
-                                                  const char *format,
-                                                  va_list va));
+ZEXTERN int            ZEXPORTVA gzvprintf(gzFile file,
+                                           const char *format,
+                                           va_list va);
 #  endif
 #endif
 
diff --git a/frmts/zlib/zutil.c b/frmts/zlib/zutil.c
index 15c1002cd598..b1c5d2d3c6da 100644
--- a/frmts/zlib/zutil.c
+++ b/frmts/zlib/zutil.c
@@ -24,13 +24,11 @@ z_const char * const z_errmsg[10] = {
 };
 
 
-const char * ZEXPORT zlibVersion()
-{
+const char * ZEXPORT zlibVersion(void) {
     return ZLIB_VERSION;
 }
 
-uLong ZEXPORT zlibCompileFlags()
-{
+uLong ZEXPORT zlibCompileFlags(void) {
     uLong flags;
 
     flags = 0;
@@ -61,9 +59,11 @@ uLong ZEXPORT zlibCompileFlags()
 #ifdef ZLIB_DEBUG
     flags += 1 << 8;
 #endif
+    /*
 #if defined(ASMV) || defined(ASMINF)
     flags += 1 << 9;
 #endif
+     */
 #ifdef ZLIB_WINAPI
     flags += 1 << 10;
 #endif
@@ -119,9 +119,7 @@ uLong ZEXPORT zlibCompileFlags()
 #  endif
 int ZLIB_INTERNAL z_verbose = verbose;
 
-void ZLIB_INTERNAL z_error (m)
-    char *m;
-{
+void ZLIB_INTERNAL z_error(char *m) {
     fprintf(stderr, "%s\n", m);
     exit(1);
 }
@@ -130,8 +128,7 @@ void ZLIB_INTERNAL z_error (m)
 /* exported to allow conversion of error code to string for compress() and
  * uncompress()
  */
-const char * ZEXPORT zError(int err)
-{
+const char * ZEXPORT zError(int err) {
     return ERR_MSG(err);
 }
 
@@ -145,22 +142,14 @@ const char * ZEXPORT zError(int err)
 
 #ifndef HAVE_MEMCPY
 
-void ZLIB_INTERNAL zmemcpy(dest, source, len)
-    Bytef* dest;
-    const Bytef* source;
-    uInt  len;
-{
+void ZLIB_INTERNAL zmemcpy(Bytef* dest, const Bytef* source, uInt len) {
     if (len == 0) return;
     do {
         *dest++ = *source++; /* ??? to be unrolled */
     } while (--len != 0);
 }
 
-int ZLIB_INTERNAL zmemcmp(s1, s2, len)
-    const Bytef* s1;
-    const Bytef* s2;
-    uInt  len;
-{
+int ZLIB_INTERNAL zmemcmp(const Bytef* s1, const Bytef* s2, uInt len) {
     uInt j;
 
     for (j = 0; j < len; j++) {
@@ -169,10 +158,7 @@ int ZLIB_INTERNAL zmemcmp(s1, s2, len)
     return 0;
 }
 
-void ZLIB_INTERNAL zmemzero(dest, len)
-    Bytef* dest;
-    uInt  len;
-{
+void ZLIB_INTERNAL zmemzero(Bytef* dest, uInt len) {
     if (len == 0) return;
     do {
         *dest++ = 0;  /* ??? to be unrolled */
@@ -213,8 +199,7 @@ local ptr_table table[MAX_PTR];
  * a protected system like OS/2. Use Microsoft C instead.
  */
 
-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
-{
+voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size) {
     voidpf buf;
     ulg bsize = (ulg)items*size;
 
@@ -239,8 +224,7 @@ voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
     return buf;
 }
 
-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
-{
+void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr) {
     int n;
 
     (void)opaque;
@@ -276,14 +260,12 @@ void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
 #  define _hfree   hfree
 #endif
 
-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)
-{
+voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, uInt items, uInt size) {
     (void)opaque;
     return _halloc((long)items, size);
 }
 
-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
-{
+void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr) {
     (void)opaque;
     _hfree(ptr);
 }
@@ -296,20 +278,18 @@ void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
 #ifndef MY_ZCALLOC /* Any system without a special alloc function */
 
 #ifndef STDC
-extern voidp  malloc OF((uInt size));
-extern voidp  calloc OF((uInt items, uInt size));
-extern void   free   OF((voidpf ptr));
+extern voidp malloc(uInt size);
+extern voidp calloc(uInt items, uInt size);
+extern void free(voidpf ptr);
 #endif
 
-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
-{
+voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size) {
     (void)opaque;
     return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
                               (voidpf)calloc(items, size);
 }
 
-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
-{
+void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr) {
     (void)opaque;
     free(ptr);
 }
diff --git a/frmts/zlib/zutil.h b/frmts/zlib/zutil.h
index c4917bb27b68..48dd7febae65 100644
--- a/frmts/zlib/zutil.h
+++ b/frmts/zlib/zutil.h
@@ -1,5 +1,5 @@
 /* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2022 Jean-loup Gailly, Mark Adler
+ * Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -56,7 +56,7 @@ typedef unsigned long  ulg;
 extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 /* (size given to avoid silly warnings with Visual C++) */
 
-#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
+#define ERR_MSG(err) z_errmsg[(err) < -6 || (err) > 2 ? 9 : 2 - (err)]
 
 #define ERR_RETURN(strm,err) \
   return (strm->msg = ERR_MSG(err), (err))
@@ -89,7 +89,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 
         /* target dependencies */
 
-#if defined(MSDOS) || (defined(WINDOWS) && !defined(_WIN32))
+#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
 #  define OS_CODE  0x00
 #  ifndef Z_SOLO
 #    if defined(__TURBOC__) || defined(__BORLANDC__)
@@ -137,24 +137,15 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  endif
 #endif
 
-#if defined(MACOS) || defined(TARGET_OS_MAC)
+#if defined(MACOS)
 #  define OS_CODE  7
-#  ifndef Z_SOLO
-#    if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
-#      include <unix.h> /* for fdopen */
-#    else
-#      ifndef fdopen
-#        define fdopen(fd,mode) NULL /* No fdopen() */
-#      endif
-#    endif
-#  endif
 #endif
 
 #ifdef __acorn
 #  define OS_CODE 13
 #endif
 
-#if defined(_WIN32) && !defined(__CYGWIN__)
+#if defined(WIN32) && !defined(__CYGWIN__)
 #  define OS_CODE  10
 #endif
 
@@ -170,18 +161,6 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  define OS_CODE 19
 #endif
 
-#if defined(_BEOS_) || defined(RISCOS)
-#  define fdopen(fd,mode) NULL /* No fdopen() */
-#endif
-
-#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
-#  if defined(_WIN32_WCE)
-#    define fdopen(fd,mode) NULL /* No fdopen() */
-#  else
-#    define fdopen(fd,type)  _fdopen(fd,type)
-#  endif
-#endif
-
 #if defined(__BORLANDC__) && !defined(MSDOS)
   #pragma warn -8004
   #pragma warn -8008
@@ -191,8 +170,9 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 /* provide prototypes for these when building zlib without LFS */
 #if !defined(_WIN32) && \
     (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
-    ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
-    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+    ZEXTERN uLong ZEXPORT adler32_combine64(uLong, uLong, z_off_t);
+    ZEXTERN uLong ZEXPORT crc32_combine64(uLong, uLong, z_off_t);
+    ZEXTERN uLong ZEXPORT crc32_combine_gen64(z_off_t);
 #endif
 
         /* common defaults */
@@ -231,16 +211,16 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #    define zmemzero(dest, len) memset(dest, 0, len)
 #  endif
 #else
-   void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
-   int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
-   void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));
+   void ZLIB_INTERNAL zmemcpy(Bytef* dest, const Bytef* source, uInt len);
+   int ZLIB_INTERNAL zmemcmp(const Bytef* s1, const Bytef* s2, uInt len);
+   void ZLIB_INTERNAL zmemzero(Bytef* dest, uInt len);
 #endif
 
 /* Diagnostic functions */
 #ifdef ZLIB_DEBUG
 #  include <stdio.h>
    extern int ZLIB_INTERNAL z_verbose;
-   extern void ZLIB_INTERNAL z_error OF((char *m));
+   extern void ZLIB_INTERNAL z_error(char *m);
 #  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
 #  define Trace(x) {if (z_verbose>=0) fprintf x ;}
 #  define Tracev(x) {if (z_verbose>0) fprintf x ;}
@@ -257,9 +237,9 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #endif
 
 #ifndef Z_SOLO
-   voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
-                                    unsigned size));
-   void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));
+   voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items,
+                                unsigned size);
+   void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr);
 #endif
 
 #define ZALLOC(strm, items, size) \
diff --git a/frmts/zmap/zmapdataset.cpp b/frmts/zmap/zmapdataset.cpp
index 3cbb017b488e..08523a19e121 100644
--- a/frmts/zmap/zmapdataset.cpp
+++ b/frmts/zmap/zmapdataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_string.h"
diff --git a/fuzzers/build.sh b/fuzzers/build.sh
index a704d4b2f7b2..529f3c24b4e7 100755
--- a/fuzzers/build.sh
+++ b/fuzzers/build.sh
@@ -145,7 +145,12 @@ curl -L https://download.savannah.gnu.org/releases/freetype/freetype-2.13.2.tar.
     rm freetype-2.13.2.tar.xz
 
 rm -rf poppler
-git clone --depth 1 https://anongit.freedesktop.org/git/poppler/poppler.git poppler
+# Poppler git server is too unreliable. Use a snapshot of a given version
+#git clone --depth 1 https://anongit.freedesktop.org/git/poppler/poppler.git poppler
+curl -L https://poppler.freedesktop.org/poppler-24.09.0.tar.xz > poppler-24.09.0.tar.xz && \
+    tar xJf poppler-24.09.0.tar.xz && \
+    mv poppler-24.09.0 poppler && \
+    rm poppler-24.09.0.tar.xz
 
 # Build xerces-c from source to avoid upstream bugs
 rm -rf xerces-c
@@ -157,7 +162,7 @@ git clone --depth 1 https://github.com/sqlite/sqlite sqlite
 
 # libxerces-c-dev${ARCH_SUFFIX}
 # libsqlite3-dev${ARCH_SUFFIX}
-PACKAGES="zlib1g-dev${ARCH_SUFFIX} libexpat-dev${ARCH_SUFFIX} liblzma-dev${ARCH_SUFFIX} \
+PACKAGES="tcl-dev${ARCH_SUFFIX} zlib1g-dev${ARCH_SUFFIX} libexpat-dev${ARCH_SUFFIX} liblzma-dev${ARCH_SUFFIX} \
           libpng-dev${ARCH_SUFFIX} libgif-dev${ARCH_SUFFIX} \
           libjpeg-dev${ARCH_SUFFIX} \
           libwebp-dev${ARCH_SUFFIX} \
@@ -181,7 +186,7 @@ NON_FUZZING_CXXFLAGS="$NON_FUZZING_CFLAGS -stdlib=libc++"
 
 # build sqlite
 cd sqlite
-CFLAGS="$NON_FUZZING_CFLAGS -DSQLITE_ENABLE_COLUMN_METADATA" ./configure --prefix=$SRC/install --enable-rtree --disable-tcl
+CFLAGS="$NON_FUZZING_CFLAGS -DSQLITE_ENABLE_COLUMN_METADATA" ./configure --prefix=$SRC/install --enable-rtree --with-tcl=/usr/lib/$ARCHITECTURE-linux-gnu/tcl8.6
 make clean -s
 make -j$(nproc) -s
 make install
diff --git a/gcore/CMakeLists.txt b/gcore/CMakeLists.txt
index f8258bbdec4c..a61970e9e1f5 100644
--- a/gcore/CMakeLists.txt
+++ b/gcore/CMakeLists.txt
@@ -40,12 +40,14 @@ add_library(
   gdalrelationship.cpp
   gdalsubdatasetinfo.cpp
   gdalorienteddataset.cpp
+  gdalthreadsafedataset.cpp
   overview.cpp
   rasterio.cpp
   rawdataset.cpp
   gdalmultidim.cpp
   gdalmultidim_gridded.cpp
   gdalmultidim_gltorthorectification.cpp
+  gdalmultidim_meshgrid.cpp
   gdalmultidim_subsetdimension.cpp
   gdalmultidim_rat.cpp
   gdalpython.cpp
@@ -67,11 +69,15 @@ add_dependencies(gcore generate_gdal_version_h)
 target_compile_options(gcore PRIVATE ${GDAL_CXX_WARNING_FLAGS} ${WFLAG_OLD_STYLE_CAST} ${WFLAG_EFFCXX})
 target_include_directories(
   gcore
-  PRIVATE $<TARGET_PROPERTY:ogrsf_generic,SOURCE_DIR> $<TARGET_PROPERTY:ogr_geojson,SOURCE_DIR>
-          $<TARGET_PROPERTY:gdal_GTIFF,SOURCE_DIR> $<TARGET_PROPERTY:gdal_MEM,SOURCE_DIR>
+  PRIVATE $<TARGET_PROPERTY:ogrsf_generic,SOURCE_DIR> $<TARGET_PROPERTY:gdal_MEM,SOURCE_DIR>
           $<TARGET_PROPERTY:gdal_vrt,SOURCE_DIR>)
 set_property(TARGET gcore PROPERTY POSITION_INDEPENDENT_CODE ${GDAL_OBJECT_LIBRARIES_POSITION_INDEPENDENT_CODE})
 
+if (GDAL_ENABLE_DRIVER_GTIFF)
+  target_include_directories(gcore PRIVATE $<TARGET_PROPERTY:gdal_GTIFF,SOURCE_DIR>)
+  target_compile_definitions(gcore PRIVATE -DHAVE_TIFF)
+endif()
+
 if (NOT DEFINED GDAL_RESOURCE_PATH)
   message(FATAL_ERROR "GDAL_RESOURCE_PATH not set")
 endif ()
@@ -116,6 +122,14 @@ if (ENABLE_PAM)
   target_compile_definitions(gcore PRIVATE -DPAM_ENABLED)
 endif ()
 
+if (NOT GDAL_ENABLE_DRIVER_DERIVED)
+  target_compile_definitions(gcore PRIVATE -DWITHOUT_DERIVED)
+endif ()
+
+if (NOT GDAL_ENABLE_DRIVER_HFA OR GDAL_ENABLE_DRIVER_HFA_PLUGIN)
+  target_compile_definitions(gcore PRIVATE -DNO_HFA_SUPPORT)
+endif()
+
 add_subdirectory(mdreader)
 
 # External libs now
diff --git a/gcore/gdal.h b/gcore/gdal.h
index 12d67ef53964..f7a411c393cb 100644
--- a/gcore/gdal.h
+++ b/gcore/gdal.h
@@ -9,23 +9,7 @@
  * Copyright (c) 1998, 2002 Frank Warmerdam
  * Copyright (c) 2007-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_H_INCLUDED
@@ -100,6 +84,7 @@ GDALDataType CPL_DLL CPL_STDCALL GDALFindDataTypeForValue(double dValue,
                                                           int bComplex);
 double CPL_DLL GDALAdjustValueToDataType(GDALDataType eDT, double dfValue,
                                          int *pbClamped, int *pbRounded);
+bool CPL_DLL GDALIsValueExactAs(double dfValue, GDALDataType eDT);
 GDALDataType CPL_DLL CPL_STDCALL GDALGetNonComplexDataType(GDALDataType);
 int CPL_DLL CPL_STDCALL GDALDataTypeIsConversionLossy(GDALDataType eTypeFrom,
                                                       GDALDataType eTypeTo);
@@ -222,27 +207,127 @@ typedef struct
         (s).bFloatingPointWindowValidity = FALSE;                              \
     } while (0)
 
-/*! Types of color interpretation for raster bands. */
+/** Value indicating the start of the range for color interpretations belonging
+ * to the InfraRed (IR) domain. All constants of the GDALColorInterp enumeration
+ * in the IR domain are in the [GCI_IR_Start, GCI_IR_End] range.
+ *
+ * @since 3.10
+ */
+#define GCI_IR_Start 20
+
+/** Value indicating the end of the range for color interpretations belonging
+ * to the InfraRed (IR) domain. All constants of the GDALColorInterp enumeration
+ * in the IR domain are in the [GCI_IR_Start, GCI_IR_End] range.
+ *
+ * @since 3.10
+ */
+#define GCI_IR_End 29
+
+/** Value indicating the start of the range for color interpretations belonging
+ * to the Synthetic Aperture Radar (SAR) domain.
+ * All constants of the GDALColorInterp enumeration
+ * in the SAR domain are in the [GCI_SAR_Start, GCI_SAR_End] range.
+ *
+ * @since 3.10
+ */
+#define GCI_SAR_Start 30
+
+/** Value indicating the end of the range for color interpretations belonging
+ * to the Synthetic Aperture Radar (SAR) domain.
+ * All constants of the GDALColorInterp enumeration
+ * in the SAR domain are in the [GCI_SAR_Start, GCI_SAR_End] range.
+ *
+ * @since 3.10
+ */
+#define GCI_SAR_End 39
+
+/** Types of color interpretation for raster bands.
+ *
+ * For spectral bands, the wavelength ranges are indicative only, and may vary
+ * depending on sensors. The CENTRAL_WAVELENGTH_UM and FWHM_UM metadata
+ * items in the IMAGERY metadata domain of the raster band, when present, will
+ * give more accurate characteristics.
+ *
+ * Values belonging to the IR domain are in the [GCI_IR_Start, GCI_IR_End] range.
+ * Values belonging to the SAR domain are in the [GCI_SAR_Start, GCI_SAR_End] range.
+ *
+ * Values between GCI_PanBand to GCI_SAR_Reserved_2 have been added in GDAL 3.10.
+ */
 typedef enum
 {
     /*! Undefined */ GCI_Undefined = 0,
     /*! Greyscale */ GCI_GrayIndex = 1,
     /*! Paletted (see associated color table) */ GCI_PaletteIndex = 2,
-    /*! Red band of RGBA image */ GCI_RedBand = 3,
-    /*! Green band of RGBA image */ GCI_GreenBand = 4,
-    /*! Blue band of RGBA image */ GCI_BlueBand = 5,
+    /*! Red band of RGBA image, or red spectral band [0.62 - 0.69 um]*/
+    GCI_RedBand = 3,
+    /*! Green band of RGBA image, or green spectral band [0.51 - 0.60 um]*/
+    GCI_GreenBand = 4,
+    /*! Blue band of RGBA image, or blue spectral band [0.45 - 0.53 um] */
+    GCI_BlueBand = 5,
     /*! Alpha (0=transparent, 255=opaque) */ GCI_AlphaBand = 6,
     /*! Hue band of HLS image */ GCI_HueBand = 7,
     /*! Saturation band of HLS image */ GCI_SaturationBand = 8,
     /*! Lightness band of HLS image */ GCI_LightnessBand = 9,
     /*! Cyan band of CMYK image */ GCI_CyanBand = 10,
     /*! Magenta band of CMYK image */ GCI_MagentaBand = 11,
-    /*! Yellow band of CMYK image */ GCI_YellowBand = 12,
+    /*! Yellow band of CMYK image, or yellow spectral band [0.58 - 0.62 um] */
+    GCI_YellowBand = 12,
     /*! Black band of CMYK image */ GCI_BlackBand = 13,
     /*! Y Luminance */ GCI_YCbCr_YBand = 14,
     /*! Cb Chroma */ GCI_YCbCr_CbBand = 15,
     /*! Cr Chroma */ GCI_YCbCr_CrBand = 16,
-    /*! Max current value (equals to GCI_YCbCr_CrBand currently) */ GCI_Max = 16
+
+    /* GDAL 3.10 addition: begin */
+    /*! Panchromatic band [0.40 - 1.00 um] */ GCI_PanBand = 17,
+    /*! Coastal band [0.40 - 0.45 um] */ GCI_CoastalBand = 18,
+    /*! Red-edge band [0.69 - 0.79 um] */ GCI_RedEdgeBand = 19,
+
+    /*! Near-InfraRed (NIR) band [0.75 - 1.40 um] */ GCI_NIRBand =
+        GCI_IR_Start + 0,
+    /*! Short-Wavelength InfraRed (SWIR) band [1.40 - 3.00 um] */ GCI_SWIRBand =
+        GCI_IR_Start + 1,
+    /*! Mid-Wavelength InfraRed (MWIR) band [3.00 - 8.00 um] */ GCI_MWIRBand =
+        GCI_IR_Start + 2,
+    /*! Long-Wavelength InfraRed (LWIR) band [8.00 - 15 um] */ GCI_LWIRBand =
+        GCI_IR_Start + 3,
+    /*! Thermal InfraRed (TIR) band (MWIR or LWIR) [3 - 15 um] */ GCI_TIRBand =
+        GCI_IR_Start + 4,
+    /*! Other infrared band [0.75 - 1000 um] */ GCI_OtherIRBand =
+        GCI_IR_Start + 5,
+    /*! Reserved value. Do not set it ! */
+    GCI_IR_Reserved_1 = GCI_IR_Start + 6,
+    /*! Reserved value. Do not set it ! */
+    GCI_IR_Reserved_2 = GCI_IR_Start + 7,
+    /*! Reserved value. Do not set it ! */
+    GCI_IR_Reserved_3 = GCI_IR_Start + 8,
+    /*! Reserved value. Do not set it ! */
+    GCI_IR_Reserved_4 = GCI_IR_Start + 9,
+
+    /*! Synthetic Aperture Radar (SAR) Ka band [0.8 - 1.1 cm / 27 - 40 GHz] */
+    GCI_SAR_Ka_Band = GCI_SAR_Start + 0,
+    /*! Synthetic Aperture Radar (SAR) K band [1.1 - 1.7 cm / 18 - 27 GHz] */
+    GCI_SAR_K_Band = GCI_SAR_Start + 1,
+    /*! Synthetic Aperture Radar (SAR) Ku band [1.7 - 2.4 cm / 12 - 18 GHz] */
+    GCI_SAR_Ku_Band = GCI_SAR_Start + 2,
+    /*! Synthetic Aperture Radar (SAR) X band [2.4 - 3.8 cm / 8 - 12 GHz] */
+    GCI_SAR_X_Band = GCI_SAR_Start + 3,
+    /*! Synthetic Aperture Radar (SAR) C band [3.8 - 7.5 cm / 4 - 8 GHz] */
+    GCI_SAR_C_Band = GCI_SAR_Start + 4,
+    /*! Synthetic Aperture Radar (SAR) S band [7.5 - 15 cm / 2 - 4 GHz] */
+    GCI_SAR_S_Band = GCI_SAR_Start + 5,
+    /*! Synthetic Aperture Radar (SAR) L band [15 - 30 cm / 1 - 2 GHz] */
+    GCI_SAR_L_Band = GCI_SAR_Start + 6,
+    /*! Synthetic Aperture Radar (SAR) P band [30 - 100 cm / 0.3 - 1 GHz] */
+    GCI_SAR_P_Band = GCI_SAR_Start + 7,
+    /*! Reserved value. Do not set it ! */
+    GCI_SAR_Reserved_1 = GCI_SAR_Start + 8,
+    /*! Reserved value. Do not set it ! */
+    GCI_SAR_Reserved_2 = GCI_SAR_Start + 9,
+
+    /* GDAL 3.10 addition: end */
+
+    /*! Max current value (equals to GCI_SAR_Reserved_2 currently) */ GCI_Max =
+        GCI_SAR_Reserved_2
 } GDALColorInterp;
 
 const char CPL_DLL *GDALGetColorInterpretationName(GDALColorInterp);
@@ -502,7 +587,7 @@ typedef struct GDALDimensionHS *GDALDimensionH;
  */
 #define GDAL_DCAP_CREATE "DCAP_CREATE"
 
-/** Capability set by a driver that implements the CreateMultidimensional() API.
+/** Capability set by a driver that implements the CreateMultiDimensional() API.
  *
  * @since GDAL 3.1
  */
@@ -1030,6 +1115,14 @@ GDALDatasetH CPL_DLL CPL_STDCALL GDALOpenShared(const char *, GDALAccess)
 #define GDAL_OF_FROM_GDALOPEN 0x400
 #endif
 
+/** Open in thread-safe mode. Not compatible with
+ * GDAL_OF_VECTOR, GDAL_OF_MULTIDIM_RASTER or GDAL_OF_UPDATE
+ *
+ * Used by GDALOpenEx().
+ * @since GDAL 3.10
+ */
+#define GDAL_OF_THREAD_SAFE 0x800
+
 GDALDatasetH CPL_DLL CPL_STDCALL GDALOpenEx(
     const char *pszFilename, unsigned int nOpenFlags,
     const char *const *papszAllowedDrivers, const char *const *papszOpenOptions,
@@ -1140,6 +1233,11 @@ int CPL_DLL CPL_STDCALL GDALGetRasterYSize(GDALDatasetH);
 int CPL_DLL CPL_STDCALL GDALGetRasterCount(GDALDatasetH);
 GDALRasterBandH CPL_DLL CPL_STDCALL GDALGetRasterBand(GDALDatasetH, int);
 
+bool CPL_DLL GDALDatasetIsThreadSafe(GDALDatasetH, int nScopeFlags,
+                                     CSLConstList papszOptions);
+GDALDatasetH CPL_DLL GDALGetThreadSafeDataset(GDALDatasetH, int nScopeFlags,
+                                              CSLConstList papszOptions);
+
 CPLErr CPL_DLL CPL_STDCALL GDALAddBand(GDALDatasetH hDS, GDALDataType eType,
                                        CSLConstList papszOptions);
 
@@ -1638,6 +1736,12 @@ CPLErr CPL_DLL CPL_STDCALL GDALAddDerivedBandPixelFuncWithArgs(
     const char *pszName, GDALDerivedPixelFuncWithArgs pfnPixelFunc,
     const char *pszMetadata);
 
+CPLErr CPL_DLL GDALRasterInterpolateAtPoint(GDALRasterBandH hBand,
+                                            double dfPixel, double dfLine,
+                                            GDALRIOResampleAlg eInterpolation,
+                                            double *pdfRealValue,
+                                            double *pdfImagValue);
+
 /** Generic pointer for the working structure of VRTProcessedDataset
  * function. */
 typedef void *VRTPDWorkingDataPtr;
@@ -2488,6 +2592,12 @@ GDALMDArrayH CPL_DLL GDALMDArrayGetGridded(
 GDALMDArrayH CPL_DLL *
 GDALMDArrayGetCoordinateVariables(GDALMDArrayH hArray,
                                   size_t *pnCount) CPL_WARN_UNUSED_RESULT;
+
+GDALMDArrayH CPL_DLL *
+GDALMDArrayGetMeshGrid(const GDALMDArrayH *pahInputArrays,
+                       size_t nCountInputArrays, size_t *pnCountOutputArrays,
+                       CSLConstList papszOptions) CPL_WARN_UNUSED_RESULT;
+
 void CPL_DLL GDALReleaseArrays(GDALMDArrayH *arrays, size_t nCount);
 int CPL_DLL GDALMDArrayCache(GDALMDArrayH hArray, CSLConstList papszOptions);
 bool CPL_DLL GDALMDArrayRename(GDALMDArrayH hArray, const char *pszNewName);
@@ -2513,11 +2623,15 @@ void CPL_DLL GDALAttributeFreeRawResult(GDALAttributeH hAttr, GByte *raw,
                                         size_t nSize);
 const char CPL_DLL *GDALAttributeReadAsString(GDALAttributeH hAttr);
 int CPL_DLL GDALAttributeReadAsInt(GDALAttributeH hAttr);
+int64_t CPL_DLL GDALAttributeReadAsInt64(GDALAttributeH hAttr);
 double CPL_DLL GDALAttributeReadAsDouble(GDALAttributeH hAttr);
 char CPL_DLL **
 GDALAttributeReadAsStringArray(GDALAttributeH hAttr) CPL_WARN_UNUSED_RESULT;
 int CPL_DLL *GDALAttributeReadAsIntArray(GDALAttributeH hAttr, size_t *pnCount)
     CPL_WARN_UNUSED_RESULT;
+int64_t CPL_DLL *
+GDALAttributeReadAsInt64Array(GDALAttributeH hAttr,
+                              size_t *pnCount) CPL_WARN_UNUSED_RESULT;
 double CPL_DLL *
 GDALAttributeReadAsDoubleArray(GDALAttributeH hAttr,
                                size_t *pnCount) CPL_WARN_UNUSED_RESULT;
@@ -2525,6 +2639,11 @@ int CPL_DLL GDALAttributeWriteRaw(GDALAttributeH hAttr, const void *, size_t);
 int CPL_DLL GDALAttributeWriteString(GDALAttributeH hAttr, const char *);
 int CPL_DLL GDALAttributeWriteStringArray(GDALAttributeH hAttr, CSLConstList);
 int CPL_DLL GDALAttributeWriteInt(GDALAttributeH hAttr, int);
+int CPL_DLL GDALAttributeWriteIntArray(GDALAttributeH hAttr, const int *,
+                                       size_t);
+int CPL_DLL GDALAttributeWriteInt64(GDALAttributeH hAttr, int64_t);
+int CPL_DLL GDALAttributeWriteInt64Array(GDALAttributeH hAttr, const int64_t *,
+                                         size_t);
 int CPL_DLL GDALAttributeWriteDouble(GDALAttributeH hAttr, double);
 int CPL_DLL GDALAttributeWriteDoubleArray(GDALAttributeH hAttr, const double *,
                                           size_t);
diff --git a/gcore/gdal_avx2_emulation.hpp b/gcore/gdal_avx2_emulation.hpp
index 8f1548524529..46a8c57b5f7a 100644
--- a/gcore/gdal_avx2_emulation.hpp
+++ b/gcore/gdal_avx2_emulation.hpp
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_AVX2_EMULATION_H_INCLUDED
diff --git a/gcore/gdal_frmts.h b/gcore/gdal_frmts.h
index 129845bbe006..d965ea1a5e0f 100644
--- a/gcore/gdal_frmts.h
+++ b/gcore/gdal_frmts.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2001, Frank Warmerdam
  * Copyright (c) 2007-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_FRMTS_H_INCLUDED
@@ -228,6 +212,8 @@ void CPL_DLL GDALRegister_COG(void);
 void CPL_DLL GDALRegister_RDB(void);
 void CPL_DLL GDALRegister_EXR(void);
 void DeclareDeferredEXRPlugin(void);
+void CPL_DLL GDALRegister_AVIF(void);
+void DeclareDeferredAVIFPlugin(void);
 void CPL_DLL GDALRegister_HEIF(void);
 void DeclareDeferredHEIFPlugin(void);
 void CPL_DLL GDALRegister_TGA(void);
@@ -244,6 +230,7 @@ void CPL_DLL GDALRegister_BASISU_KTX2(void);
 void DeclareDeferredBASISU_KTX2Plugin(void);
 void CPL_DLL GDALRegister_NOAA_B(void);
 void CPL_DLL GDALRegister_NSIDCbin(void);
+void CPL_DLL GDALRegister_SNAP_TIFF(void);
 CPL_C_END
 
 #endif /* ndef GDAL_FRMTS_H_INCLUDED */
diff --git a/gcore/gdal_mdreader.cpp b/gcore/gdal_mdreader.cpp
index 18684e492c9e..42aa5a2569cd 100644
--- a/gcore/gdal_mdreader.cpp
+++ b/gcore/gdal_mdreader.cpp
@@ -11,23 +11,7 @@
  * as represented by the Canadian Nuclear Safety Commission
  * Copyright (c) 2014-2015, NextGIS info@nextgis.ru
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/gcore/gdal_mdreader.h b/gcore/gdal_mdreader.h
index 202c980539cb..1065d5969513 100644
--- a/gcore/gdal_mdreader.h
+++ b/gcore/gdal_mdreader.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2014-2015, NextGIS info@nextgis.ru
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_MDREADER_H_INCLUDED
diff --git a/gcore/gdal_misc.cpp b/gcore/gdal_misc.cpp
index bedc056a4e8c..047a789993ed 100644
--- a/gcore/gdal_misc.cpp
+++ b/gcore/gdal_misc.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -46,6 +30,7 @@
 
 #include "cpl_conv.h"
 #include "cpl_error.h"
+#include "cpl_json.h"
 #include "cpl_minixml.h"
 #include "cpl_multiproc.h"
 #include "cpl_string.h"
@@ -140,6 +125,11 @@ GDALDataType CPL_STDCALL GDALDataTypeUnion(GDALDataType eType1,
                                            GDALDataType eType2)
 
 {
+    if (eType1 == GDT_Unknown)
+        return eType2;
+    if (eType2 == GDT_Unknown)
+        return eType1;
+
     const int panBits[] = {GetDataTypeElementSizeBits(eType1),
                            GetDataTypeElementSizeBits(eType2)};
 
@@ -169,19 +159,89 @@ GDALDataType CPL_STDCALL GDALDataTypeUnion(GDALDataType eType1,
  * \brief Union a data type with the one found for a value
  *
  * @param eDT the first data type
- * @param dValue the value for which to find a data type and union with eDT
+ * @param dfValue the value for which to find a data type and union with eDT
  * @param bComplex if the value is complex
  *
- * @return a data type able to express eDT and dValue.
+ * @return a data type able to express eDT and dfValue.
  * @since GDAL 2.3
  */
 GDALDataType CPL_STDCALL GDALDataTypeUnionWithValue(GDALDataType eDT,
-                                                    double dValue, int bComplex)
+                                                    double dfValue,
+                                                    int bComplex)
 {
-    if (eDT == GDT_Float32 && !bComplex && static_cast<float>(dValue) == dValue)
-        return eDT;
+    if (!bComplex && !GDALDataTypeIsComplex(eDT))
+    {
+        switch (eDT)
+        {
+            case GDT_Byte:
+            {
+                if (GDALIsValueExactAs<uint8_t>(dfValue))
+                    return eDT;
+                break;
+            }
+            case GDT_Int8:
+            {
+                if (GDALIsValueExactAs<int8_t>(dfValue))
+                    return eDT;
+                break;
+            }
+            case GDT_UInt16:
+            {
+                if (GDALIsValueExactAs<uint16_t>(dfValue))
+                    return eDT;
+                break;
+            }
+            case GDT_Int16:
+            {
+                if (GDALIsValueExactAs<int16_t>(dfValue))
+                    return eDT;
+                break;
+            }
+            case GDT_UInt32:
+            {
+                if (GDALIsValueExactAs<uint32_t>(dfValue))
+                    return eDT;
+                break;
+            }
+            case GDT_Int32:
+            {
+                if (GDALIsValueExactAs<int32_t>(dfValue))
+                    return eDT;
+                break;
+            }
+            case GDT_UInt64:
+            {
+                if (GDALIsValueExactAs<uint64_t>(dfValue))
+                    return eDT;
+                break;
+            }
+            case GDT_Int64:
+            {
+                if (GDALIsValueExactAs<int64_t>(dfValue))
+                    return eDT;
+                break;
+            }
+            case GDT_Float32:
+            {
+                if (GDALIsValueExactAs<float>(dfValue))
+                    return eDT;
+                break;
+            }
+            case GDT_Float64:
+            {
+                return eDT;
+            }
+            case GDT_Unknown:
+            case GDT_CInt16:
+            case GDT_CInt32:
+            case GDT_CFloat32:
+            case GDT_CFloat64:
+            case GDT_TypeCount:
+                break;
+        }
+    }
 
-    const GDALDataType eDT2 = GDALFindDataTypeForValue(dValue, bComplex);
+    const GDALDataType eDT2 = GDALFindDataTypeForValue(dfValue, bComplex);
     return GDALDataTypeUnion(eDT, eDT2);
 }
 
@@ -313,7 +373,12 @@ GDALDataType CPL_STDCALL GDALFindDataType(int nBits, int bSigned, int bFloating,
  */
 GDALDataType CPL_STDCALL GDALFindDataTypeForValue(double dValue, int bComplex)
 {
-    const bool bFloating = round(dValue) != dValue;
+    const bool bFloating =
+        round(dValue) != dValue ||
+        dValue >
+            static_cast<double>(std::numeric_limits<std::uint64_t>::max()) ||
+        dValue <
+            static_cast<double>(std::numeric_limits<std::int64_t>::lowest());
     const bool bSigned = bFloating || dValue < 0;
     const int nBits = GetMinBitsForValue(dValue);
 
@@ -826,7 +891,7 @@ double GDALAdjustValueToDataType(GDALDataType eDT, double dfValue,
             break;
         case GDT_Float32:
         {
-            if (!CPLIsFinite(dfValue))
+            if (!std::isfinite(dfValue))
                 break;
 
             // TODO(schwehr): ::min() versus ::lowest.
@@ -868,6 +933,58 @@ double GDALAdjustValueToDataType(GDALDataType eDT, double dfValue,
     return dfValue;
 }
 
+/************************************************************************/
+/*                         GDALIsValueExactAs()                         */
+/************************************************************************/
+
+/**
+ * \brief Check whether the provided value can be exactly represented in a
+ * data type.
+ *
+ * Only implemented for non-complex data types
+ *
+ * @param dfValue value to check.
+ * @param eDT target data type.
+ *
+ * @return true if the provided value can be exactly represented in the
+ * data type.
+ * @since GDAL 3.10
+ */
+bool GDALIsValueExactAs(double dfValue, GDALDataType eDT)
+{
+    switch (eDT)
+    {
+        case GDT_Byte:
+            return GDALIsValueExactAs<uint8_t>(dfValue);
+        case GDT_Int8:
+            return GDALIsValueExactAs<int8_t>(dfValue);
+        case GDT_UInt16:
+            return GDALIsValueExactAs<uint16_t>(dfValue);
+        case GDT_Int16:
+            return GDALIsValueExactAs<int16_t>(dfValue);
+        case GDT_UInt32:
+            return GDALIsValueExactAs<uint32_t>(dfValue);
+        case GDT_Int32:
+            return GDALIsValueExactAs<int32_t>(dfValue);
+        case GDT_UInt64:
+            return GDALIsValueExactAs<uint64_t>(dfValue);
+        case GDT_Int64:
+            return GDALIsValueExactAs<int64_t>(dfValue);
+        case GDT_Float32:
+            return GDALIsValueExactAs<float>(dfValue);
+        case GDT_Float64:
+            return true;
+        case GDT_Unknown:
+        case GDT_CInt16:
+        case GDT_CInt32:
+        case GDT_CFloat32:
+        case GDT_CFloat64:
+        case GDT_TypeCount:
+            break;
+    }
+    return true;
+}
+
 /************************************************************************/
 /*                        GDALGetNonComplexDataType()                */
 /************************************************************************/
@@ -1046,10 +1163,15 @@ const char *GDALGetPaletteInterpretationName(GDALPaletteInterp eInterp)
 const char *GDALGetColorInterpretationName(GDALColorInterp eInterp)
 
 {
+    static_assert(GCI_IR_Start == GCI_RedEdgeBand + 1);
+    static_assert(GCI_NIRBand == GCI_IR_Start);
+    static_assert(GCI_SAR_Start == GCI_IR_End + 1);
+    static_assert(GCI_Max == GCI_SAR_End);
+
     switch (eInterp)
     {
         case GCI_Undefined:
-            return "Undefined";
+            break;
 
         case GCI_GrayIndex:
             return "Gray";
@@ -1099,9 +1221,76 @@ const char *GDALGetColorInterpretationName(GDALColorInterp eInterp)
         case GCI_YCbCr_CrBand:
             return "YCbCr_Cr";
 
-        default:
-            return "Unknown";
+        case GCI_PanBand:
+            return "Pan";
+
+        case GCI_CoastalBand:
+            return "Coastal";
+
+        case GCI_RedEdgeBand:
+            return "RedEdge";
+
+        case GCI_NIRBand:
+            return "NIR";
+
+        case GCI_SWIRBand:
+            return "SWIR";
+
+        case GCI_MWIRBand:
+            return "MWIR";
+
+        case GCI_LWIRBand:
+            return "LWIR";
+
+        case GCI_TIRBand:
+            return "TIR";
+
+        case GCI_OtherIRBand:
+            return "OtherIR";
+
+        case GCI_IR_Reserved_1:
+            return "IR_Reserved_1";
+
+        case GCI_IR_Reserved_2:
+            return "IR_Reserved_2";
+
+        case GCI_IR_Reserved_3:
+            return "IR_Reserved_3";
+
+        case GCI_IR_Reserved_4:
+            return "IR_Reserved_4";
+
+        case GCI_SAR_Ka_Band:
+            return "SAR_Ka";
+
+        case GCI_SAR_K_Band:
+            return "SAR_K";
+
+        case GCI_SAR_Ku_Band:
+            return "SAR_Ku";
+
+        case GCI_SAR_X_Band:
+            return "SAR_X";
+
+        case GCI_SAR_C_Band:
+            return "SAR_C";
+
+        case GCI_SAR_S_Band:
+            return "SAR_S";
+
+        case GCI_SAR_L_Band:
+            return "SAR_L";
+
+        case GCI_SAR_P_Band:
+            return "SAR_P";
+
+        case GCI_SAR_Reserved_1:
+            return "SAR_Reserved_1";
+
+        case GCI_SAR_Reserved_2:
+            return "SAR_Reserved_2";
     }
+    return "Undefined";
 }
 
 /************************************************************************/
@@ -1138,9 +1327,85 @@ GDALColorInterp GDALGetColorInterpretationByName(const char *pszName)
         }
     }
 
+    // Accept British English spelling
+    if (EQUAL(pszName, "grey"))
+        return GCI_GrayIndex;
+
     return GCI_Undefined;
 }
 
+/************************************************************************/
+/*                  GDALGetColorInterpFromSTACCommonName()              */
+/************************************************************************/
+
+static const struct
+{
+    const char *pszName;
+    GDALColorInterp eInterp;
+} asSTACCommonNames[] = {
+    {"pan", GCI_PanBand},
+    {"coastal", GCI_CoastalBand},
+    {"blue", GCI_BlueBand},
+    {"green", GCI_GreenBand},
+    {"green05", GCI_GreenBand},  // no exact match
+    {"yellow", GCI_YellowBand},
+    {"red", GCI_RedBand},
+    {"rededge", GCI_RedEdgeBand},
+    {"rededge071", GCI_RedEdgeBand},  // no exact match
+    {"rededge075", GCI_RedEdgeBand},  // no exact match
+    {"rededge078", GCI_RedEdgeBand},  // no exact match
+    {"nir", GCI_NIRBand},
+    {"nir08", GCI_NIRBand},   // no exact match
+    {"nir09", GCI_NIRBand},   // no exact match
+    {"cirrus", GCI_NIRBand},  // no exact match
+    {nullptr,
+     GCI_SWIRBand},  // so that GDALGetSTACCommonNameFromColorInterp returns null on GCI_SWIRBand
+    {"swir16", GCI_SWIRBand},  // no exact match
+    {"swir22", GCI_SWIRBand},  // no exact match
+    {"lwir", GCI_LWIRBand},
+    {"lwir11", GCI_LWIRBand},  // no exact match
+    {"lwir12", GCI_LWIRBand},  // no exact match
+};
+
+/** Get color interpreetation from STAC eo:common_name
+ *
+ * Cf https://github.com/stac-extensions/eo?tab=readme-ov-file#common-band-names
+ *
+ * @since GDAL 3.10
+ */
+GDALColorInterp GDALGetColorInterpFromSTACCommonName(const char *pszName)
+{
+
+    for (const auto &sAssoc : asSTACCommonNames)
+    {
+        if (sAssoc.pszName && EQUAL(pszName, sAssoc.pszName))
+            return sAssoc.eInterp;
+    }
+    return GCI_Undefined;
+}
+
+/************************************************************************/
+/*                  GDALGetSTACCommonNameFromColorInterp()              */
+/************************************************************************/
+
+/** Get STAC eo:common_name from GDAL color interpretation
+ *
+ * Cf https://github.com/stac-extensions/eo?tab=readme-ov-file#common-band-names
+ *
+ * @return nullptr if there is no match
+ *
+ * @since GDAL 3.10
+ */
+const char *GDALGetSTACCommonNameFromColorInterp(GDALColorInterp eInterp)
+{
+    for (const auto &sAssoc : asSTACCommonNames)
+    {
+        if (eInterp == sAssoc.eInterp)
+            return sAssoc.pszName;
+    }
+    return nullptr;
+}
+
 /************************************************************************/
 /*                     GDALGetRandomRasterSample()                      */
 /************************************************************************/
@@ -1180,8 +1445,10 @@ int CPL_STDCALL GDALGetRandomRasterSample(GDALRasterBandH hBand, int nSamples,
     const int nBlocksPerColumn =
         (poBand->GetYSize() + nBlockYSize - 1) / nBlockYSize;
 
-    const int nBlockPixels = nBlockXSize * nBlockYSize;
-    const int nBlockCount = nBlocksPerRow * nBlocksPerColumn;
+    const GIntBig nBlockPixels =
+        static_cast<GIntBig>(nBlockXSize) * nBlockYSize;
+    const GIntBig nBlockCount =
+        static_cast<GIntBig>(nBlocksPerRow) * nBlocksPerColumn;
 
     if (nBlocksPerRow == 0 || nBlocksPerColumn == 0 || nBlockPixels == 0 ||
         nBlockCount == 0)
@@ -1206,18 +1473,18 @@ int CPL_STDCALL GDALGetRandomRasterSample(GDALRasterBandH hBand, int nSamples,
     int nBlockSampleRate = 1;
 
     if ((nSamples / ((nBlockCount - 1) / nSampleRate + 1)) != 0)
-        nBlockSampleRate =
-            std::max(1, nBlockPixels /
-                            (nSamples / ((nBlockCount - 1) / nSampleRate + 1)));
+        nBlockSampleRate = static_cast<int>(std::max<GIntBig>(
+            1,
+            nBlockPixels / (nSamples / ((nBlockCount - 1) / nSampleRate + 1))));
 
     int nActualSamples = 0;
 
-    for (int iSampleBlock = 0; iSampleBlock < nBlockCount;
+    for (GIntBig iSampleBlock = 0; iSampleBlock < nBlockCount;
          iSampleBlock += nSampleRate)
     {
 
-        const int iYBlock = iSampleBlock / nBlocksPerRow;
-        const int iXBlock = iSampleBlock - nBlocksPerRow * iYBlock;
+        const int iYBlock = static_cast<int>(iSampleBlock / nBlocksPerRow);
+        const int iXBlock = static_cast<int>(iSampleBlock % nBlocksPerRow);
 
         GDALRasterBlock *const poBlock =
             poBand->GetLockedBlockRef(iXBlock, iYBlock);
@@ -1602,9 +1869,9 @@ CPLString GDALFindAssociatedFile(const char *pszBaseFilename,
             CPLString osAltExt = pszExt;
 
             if (islower(static_cast<unsigned char>(pszExt[0])))
-                osAltExt.toupper();
+                osAltExt = osAltExt.toupper();
             else
-                osAltExt.tolower();
+                osAltExt = osAltExt.tolower();
 
             osTarget = CPLResetExtension(pszBaseFilename, osAltExt);
 
@@ -2055,7 +2322,7 @@ int CPL_STDCALL GDALReadTabFile(const char *pszBaseFilename,
 
 int GDALReadTabFile2(const char *pszBaseFilename, double *padfGeoTransform,
                      char **ppszWKT, int *pnGCPCount, GDAL_GCP **ppasGCPs,
-                     char **papszSiblingFiles, char **ppszTabFileNameOut)
+                     CSLConstList papszSiblingFiles, char **ppszTabFileNameOut)
 {
     if (ppszTabFileNameOut)
         *ppszTabFileNameOut = nullptr;
@@ -2253,7 +2520,7 @@ int CPL_STDCALL GDALReadWorldFile(const char *pszBaseFilename,
 }
 
 int GDALReadWorldFile2(const char *pszBaseFilename, const char *pszExtension,
-                       double *padfGeoTransform, char **papszSiblingFiles,
+                       double *padfGeoTransform, CSLConstList papszSiblingFiles,
                        char **ppszWorldFileNameOut)
 {
     VALIDATE_POINTER1(pszBaseFilename, "GDALReadWorldFile", FALSE);
@@ -3143,7 +3410,7 @@ static void StripIrrelevantOptions(CPLXMLNode *psCOL, int nOptions)
  *  --version: report version of GDAL in use.
  *  --build: report build info about GDAL in use.
  *  --license: report GDAL license info.
- *  --formats: report all format drivers configured.
+ *  --formats: report all format drivers configured. Can be used with -json since 3.10
  *  --format [format]: report details of one format driver.
  *  --optfile filename: expand an option file into the argument list.
  *  --config key value: set system configuration option.
@@ -3434,6 +3701,88 @@ int CPL_STDCALL GDALGeneralCmdLineProcessor(int nArgc, char ***ppapszArgv,
             if (nOptions == 0)
                 nOptions = GDAL_OF_RASTER;
 
+            bool bJSON = false;
+            for (int i = 1; i < nArgc; i++)
+            {
+                if (strcmp(papszArgv[i], "-json") == 0)
+                {
+                    bJSON = true;
+                    break;
+                }
+            }
+
+            if (bJSON)
+            {
+                auto poDM = GetGDALDriverManager();
+                CPLJSONArray oArray;
+                const int nDriverCount = poDM->GetDriverCount();
+                for (int iDr = 0; iDr < nDriverCount; ++iDr)
+                {
+                    auto poDriver = poDM->GetDriver(iDr);
+                    CSLConstList papszMD = poDriver->GetMetadata();
+
+                    if (nOptions == GDAL_OF_RASTER &&
+                        !CPLFetchBool(papszMD, GDAL_DCAP_RASTER, false))
+                        continue;
+                    if (nOptions == GDAL_OF_VECTOR &&
+                        !CPLFetchBool(papszMD, GDAL_DCAP_VECTOR, false))
+                        continue;
+                    if (nOptions == GDAL_OF_GNM &&
+                        !CPLFetchBool(papszMD, GDAL_DCAP_GNM, false))
+                        continue;
+                    if (nOptions == GDAL_OF_MULTIDIM_RASTER &&
+                        !CPLFetchBool(papszMD, GDAL_DCAP_MULTIDIM_RASTER,
+                                      false))
+                        continue;
+
+                    CPLJSONObject oJDriver;
+                    oJDriver.Set("short_name", poDriver->GetDescription());
+                    if (const char *pszLongName =
+                            CSLFetchNameValue(papszMD, GDAL_DMD_LONGNAME))
+                        oJDriver.Set("long_name", pszLongName);
+                    CPLJSONArray oJScopes;
+                    if (CPLFetchBool(papszMD, GDAL_DCAP_RASTER, false))
+                        oJScopes.Add("raster");
+                    if (CPLFetchBool(papszMD, GDAL_DCAP_MULTIDIM_RASTER, false))
+                        oJScopes.Add("multidimensional_raster");
+                    if (CPLFetchBool(papszMD, GDAL_DCAP_VECTOR, false))
+                        oJScopes.Add("vector");
+                    oJDriver.Add("scopes", oJScopes);
+                    CPLJSONArray oJCaps;
+                    if (CPLFetchBool(papszMD, GDAL_DCAP_OPEN, false))
+                        oJCaps.Add("open");
+                    if (CPLFetchBool(papszMD, GDAL_DCAP_CREATE, false))
+                        oJCaps.Add("create");
+                    if (CPLFetchBool(papszMD, GDAL_DCAP_CREATECOPY, false))
+                        oJCaps.Add("create_copy");
+                    if (CPLFetchBool(papszMD, GDAL_DCAP_VIRTUALIO, false))
+                        oJCaps.Add("virtual_io");
+                    oJDriver.Add("capabilities", oJCaps);
+
+                    if (const char *pszExtensions = CSLFetchNameValueDef(
+                            papszMD, GDAL_DMD_EXTENSIONS,
+                            CSLFetchNameValue(papszMD, GDAL_DMD_EXTENSION)))
+                    {
+                        const CPLStringList aosExt(
+                            CSLTokenizeString2(pszExtensions, " ", 0));
+                        CPLJSONArray oJExts;
+                        for (int i = 0; i < aosExt.size(); ++i)
+                        {
+                            oJExts.Add(aosExt[i]);
+                        }
+                        oJDriver.Add("file_extensions", oJExts);
+                    }
+
+                    oArray.Add(oJDriver);
+                }
+                printf(/*ok*/
+                       "%s\n",
+                       oArray.Format(CPLJSONObject::PrettyFormat::Pretty)
+                           .c_str());
+
+                return 0;
+            }
+
             printf(/*ok*/
                    "Supported Formats: (ro:read-only, rw:read-write, +:update, "
                    "v:virtual-I/O s:subdatasets)\n");
@@ -3443,7 +3792,7 @@ int CPL_STDCALL GDALGeneralCmdLineProcessor(int nArgc, char ***ppapszArgv,
 
                 const char *pszRFlag = "", *pszWFlag, *pszVirtualIO,
                            *pszSubdatasets;
-                char **papszMD = GDALGetMetadata(hDriver, nullptr);
+                CSLConstList papszMD = GDALGetMetadata(hDriver, nullptr);
 
                 if (nOptions == GDAL_OF_RASTER &&
                     !CPLFetchBool(papszMD, GDAL_DCAP_RASTER, false))
@@ -4372,7 +4721,7 @@ void GDALDeserializeGCPListFromXML(const CPLXMLNode *psGCPList,
 /************************************************************************/
 
 void GDALSerializeOpenOptionsToXML(CPLXMLNode *psParentNode,
-                                   char **papszOpenOptions)
+                                   CSLConstList papszOpenOptions)
 {
     if (papszOpenOptions != nullptr)
     {
@@ -4380,7 +4729,7 @@ void GDALSerializeOpenOptionsToXML(CPLXMLNode *psParentNode,
             CPLCreateXMLNode(psParentNode, CXT_Element, "OpenOptions");
         CPLXMLNode *psLastChild = nullptr;
 
-        for (char **papszIter = papszOpenOptions; *papszIter != nullptr;
+        for (CSLConstList papszIter = papszOpenOptions; *papszIter != nullptr;
              papszIter++)
         {
             const char *pszRawValue;
diff --git a/gcore/gdal_pam.h b/gcore/gdal_pam.h
index 0b5784e4e25f..1bfaf2355919 100644
--- a/gcore/gdal_pam.h
+++ b/gcore/gdal_pam.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_PAM_H_INCLUDED
@@ -34,6 +18,7 @@
 
 #include "cpl_minixml.h"
 #include "gdal_priv.h"
+#include <array>
 #include <limits>
 #include <map>
 #include <vector>
@@ -53,6 +38,7 @@ class GDALPamRasterBand;
 #define GCIF_SCALEOFFSET 0x008000
 #define GCIF_UNITTYPE 0x010000
 #define GCIF_COLORTABLE 0x020000
+/* Same value as GCIF_COLORTABLE */
 #define GCIF_COLORINTERP 0x020000
 #define GCIF_BAND_METADATA 0x040000
 #define GCIF_RAT 0x080000
@@ -65,8 +51,8 @@ class GDALPamRasterBand;
 #define GCIF_PAM_DEFAULT                                                       \
     (GCIF_GEOTRANSFORM | GCIF_PROJECTION | GCIF_METADATA | GCIF_GCPS |         \
      GCIF_NODATA | GCIF_CATEGORYNAMES | GCIF_MINMAX | GCIF_SCALEOFFSET |       \
-     GCIF_UNITTYPE | GCIF_COLORTABLE | GCIF_COLORINTERP | GCIF_BAND_METADATA | \
-     GCIF_RAT | GCIF_MASK | GCIF_ONLY_IF_MISSING | GCIF_PROCESS_BANDS |        \
+     GCIF_UNITTYPE | GCIF_COLORTABLE | GCIF_BAND_METADATA | GCIF_RAT |         \
+     GCIF_MASK | GCIF_ONLY_IF_MISSING | GCIF_PROCESS_BANDS |                   \
      GCIF_BAND_DESCRIPTION)
 
 /* GDAL PAM Flags */
@@ -95,7 +81,7 @@ class GDALDatasetPamInfo
     OGRSpatialReference *poSRS = nullptr;
 
     int bHaveGeoTransform = false;
-    double adfGeoTransform[6]{0, 0, 0, 0, 0, 0};
+    std::array<double, 6> adfGeoTransform{};
 
     std::vector<gdal::GCP> asGCPs{};
     OGRSpatialReference *poGCP_SRS = nullptr;
@@ -131,10 +117,10 @@ class CPL_DLL GDALPamDataset : public GDALDataset
     virtual CPLXMLNode *SerializeToXML(const char *);
     virtual CPLErr XMLInit(const CPLXMLNode *, const char *);
 
-    virtual CPLErr TryLoadXML(char **papszSiblingFiles = nullptr);
+    virtual CPLErr TryLoadXML(CSLConstList papszSiblingFiles = nullptr);
     virtual CPLErr TrySaveXML();
 
-    CPLErr TryLoadAux(char **papszSiblingFiles = nullptr);
+    CPLErr TryLoadAux(CSLConstList papszSiblingFiles = nullptr);
     CPLErr TrySaveAux();
 
     virtual const char *BuildPamFilename();
@@ -268,6 +254,8 @@ struct GDALRasterBandPamInfo
 
     bool bOffsetSet = false;
     bool bScaleSet = false;
+
+    void CopyFrom(const GDALRasterBandPamInfo &sOther);
 };
 
 //! @endcond
diff --git a/gcore/gdal_priv.h b/gcore/gdal_priv.h
index c8349917cc82..20dcc3734cf3 100644
--- a/gcore/gdal_priv.h
+++ b/gcore/gdal_priv.h
@@ -10,23 +10,7 @@
  * Copyright (c) 1998, Frank Warmerdam
  * Copyright (c) 2007-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_PRIV_H_INCLUDED
@@ -71,12 +55,16 @@ class GDALRelationship;
 #include <stdarg.h>
 
 #include <cmath>
+#include <complex>
 #include <cstdint>
 #include <iterator>
 #include <limits>
 #include <map>
 #include <memory>
 #include <set>
+#if __cplusplus >= 202002L
+#include <span>
+#endif
 #include <vector>
 
 #include "ogr_core.h"
@@ -137,9 +125,6 @@ class CPL_DLL GDALMultiDomainMetadata
     {
         Clear();
     }
-
-  private:
-    CPL_DISALLOW_COPY_ASSIGN(GDALMultiDomainMetadata)
 };
 
 //! @endcond
@@ -207,6 +192,8 @@ class CPL_DLL GDALMajorObject
 /* ******************************************************************** */
 
 //! @cond Doxygen_Suppress
+class GDALOpenInfo;
+
 class CPL_DLL GDALDefaultOverviews
 {
     friend class GDALDataset;
@@ -238,7 +225,12 @@ class CPL_DLL GDALDefaultOverviews
     ~GDALDefaultOverviews();
 
     void Initialize(GDALDataset *poDSIn, const char *pszName = nullptr,
-                    char **papszSiblingFiles = nullptr, int bNameIsOVR = FALSE);
+                    CSLConstList papszSiblingFiles = nullptr,
+                    bool bNameIsOVR = false);
+
+    void Initialize(GDALDataset *poDSIn, GDALOpenInfo *poOpenInfo,
+                    const char *pszName = nullptr,
+                    bool bTransferSiblingFilesIfLoaded = true);
 
     void TransferSiblingFiles(char **papszSiblingFiles);
 
@@ -339,6 +331,8 @@ class CPL_DLL GDALOpenInfo
     char **StealSiblingFiles();
     bool AreSiblingFilesLoaded() const;
 
+    bool IsSingleAllowedDriver(const char *pszDriverName) const;
+
   private:
     CPL_DISALLOW_COPY_ASSIGN(GDALOpenInfo)
 };
@@ -566,7 +560,8 @@ class CPL_DLL GDALDataset : public GDALMajorObject
               GSpacing nLineSpace, GSpacing nBandSpace,
               GDALRasterIOExtraArg *psExtraArg) CPL_WARN_UNUSED_RESULT;
 
-    CPLErr
+    /* This method should only be be overloaded by GDALProxyDataset */
+    virtual CPLErr
     BlockBasedRasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff, int nXSize,
                        int nYSize, void *pData, int nBufXSize, int nBufYSize,
                        GDALDataType eBufType, int nBandCount,
@@ -606,6 +601,15 @@ class CPL_DLL GDALDataset : public GDALMajorObject
 
     void ShareLockWithParentDataset(GDALDataset *poParentDataset);
 
+    bool m_bCanBeReopened = false;
+
+    virtual bool CanBeCloned(int nScopeFlags, bool bCanShareState) const;
+
+    friend class GDALThreadSafeDataset;
+    friend class MEMDataset;
+    virtual std::unique_ptr<GDALDataset> Clone(int nScopeFlags,
+                                               bool bCanShareState) const;
+
     //! @endcond
 
     void CleanupPostFileClosing();
@@ -817,7 +821,7 @@ class CPL_DLL GDALDataset : public GDALMajorObject
     /** Return MarkSuppressOnClose flag.
     * @return MarkSuppressOnClose flag.
     */
-    bool IsMarkedSuppressOnClose()
+    bool IsMarkedSuppressOnClose() const
     {
         return bSuppressOnClose;
     }
@@ -830,6 +834,18 @@ class CPL_DLL GDALDataset : public GDALMajorObject
         return papszOpenOptions;
     }
 
+    bool IsThreadSafe(int nScopeFlags) const;
+
+#ifndef DOXYGEN_SKIP
+    /** Return open options.
+     * @return open options.
+     */
+    CSLConstList GetOpenOptions() const
+    {
+        return papszOpenOptions;
+    }
+#endif
+
     static GDALDataset **GetOpenDatasets(int *pnDatasetCount);
 
 #ifndef DOXYGEN_SKIP
@@ -1467,6 +1483,7 @@ GDALHashSetBandBlockCacheCreate(GDALRasterBand *poBand);
 /* ******************************************************************** */
 
 class GDALMDArray;
+class GDALDoublePointsCache;
 
 /** Range of values found in a mask band */
 typedef enum
@@ -1558,6 +1575,11 @@ class CPL_DLL GDALRasterBand : public GDALMajorObject
             m_poBandRef = bOwned ? nullptr : poBand;
         }
 
+        const GDALRasterBand *get() const
+        {
+            return static_cast<const GDALRasterBand *>(*this);
+        }
+
         GDALRasterBand *get()
         {
             return static_cast<GDALRasterBand *>(*this);
@@ -1568,6 +1590,11 @@ class CPL_DLL GDALRasterBand : public GDALMajorObject
             return m_poBandOwned != nullptr;
         }
 
+        operator const GDALRasterBand *() const
+        {
+            return m_poBandOwned ? m_poBandOwned.get() : m_poBandRef;
+        }
+
         operator GDALRasterBand *()
         {
             return m_poBandOwned ? m_poBandOwned.get() : m_poBandRef;
@@ -1601,6 +1628,8 @@ class CPL_DLL GDALRasterBand : public GDALMajorObject
     void InitRWLock();
     void SetValidPercent(GUIntBig nSampleCount, GUIntBig nValidCount);
 
+    mutable GDALDoublePointsCache *m_poPointsCache = nullptr;
+
     //! @endcond
 
   protected:
@@ -1653,15 +1682,15 @@ class CPL_DLL GDALRasterBand : public GDALMajorObject
 
     ~GDALRasterBand() override;
 
-    int GetXSize();
-    int GetYSize();
-    int GetBand();
-    GDALDataset *GetDataset();
+    int GetXSize() const;
+    int GetYSize() const;
+    int GetBand() const;
+    GDALDataset *GetDataset() const;
 
-    GDALDataType GetRasterDataType(void);
-    void GetBlockSize(int *pnXSize, int *pnYSize);
+    GDALDataType GetRasterDataType(void) const;
+    void GetBlockSize(int *pnXSize, int *pnYSize) const;
     CPLErr GetActualBlockSize(int nXBlockOff, int nYBlockOff, int *pnXValid,
-                              int *pnYValid);
+                              int *pnYValid) const;
 
     virtual GDALSuggestedBlockAccessPattern
     GetSuggestedBlockAccessPattern() const;
@@ -1682,19 +1711,61 @@ class CPL_DLL GDALRasterBand : public GDALMajorObject
                     GSpacing nLineSpace,
                     GDALRasterIOExtraArg *psExtraArg) CPL_WARN_UNUSED_RESULT;
 #endif
+
+    template <class T>
+    CPLErr ReadRaster(T *pData, size_t nArrayEltCount = 0, double dfXOff = 0,
+                      double dfYOff = 0, double dfXSize = 0, double dfYSize = 0,
+                      size_t nBufXSize = 0, size_t nBufYSize = 0,
+                      GDALRIOResampleAlg eResampleAlg = GRIORA_NearestNeighbour,
+                      GDALProgressFunc pfnProgress = nullptr,
+                      void *pProgressData = nullptr) const;
+
+    template <class T>
+    CPLErr ReadRaster(std::vector<T> &vData, double dfXOff = 0,
+                      double dfYOff = 0, double dfXSize = 0, double dfYSize = 0,
+                      size_t nBufXSize = 0, size_t nBufYSize = 0,
+                      GDALRIOResampleAlg eResampleAlg = GRIORA_NearestNeighbour,
+                      GDALProgressFunc pfnProgress = nullptr,
+                      void *pProgressData = nullptr) const;
+
+#if __cplusplus >= 202002L
+    //! @cond Doxygen_Suppress
+    template <class T>
+    inline CPLErr
+    ReadRaster(std::span<T> pData, double dfXOff = 0, double dfYOff = 0,
+               double dfXSize = 0, double dfYSize = 0, size_t nBufXSize = 0,
+               size_t nBufYSize = 0,
+               GDALRIOResampleAlg eResampleAlg = GRIORA_NearestNeighbour,
+               GDALProgressFunc pfnProgress = nullptr,
+               void *pProgressData = nullptr) const
+    {
+        return ReadRaster(pData.data(), pData.size(), dfXOff, dfYOff, dfXSize,
+                          dfYSize, nBufXSize, nBufYSize, eResampleAlg,
+                          pfnProgress, pProgressData);
+    }
+
+    //! @endcond
+#endif
+
     CPLErr ReadBlock(int nXBlockOff, int nYBlockOff,
                      void *pImage) CPL_WARN_UNUSED_RESULT;
 
     CPLErr WriteBlock(int nXBlockOff, int nYBlockOff,
                       void *pImage) CPL_WARN_UNUSED_RESULT;
 
-    GDALRasterBlock *
+    // This method should only be overloaded by GDALProxyRasterBand
+    virtual GDALRasterBlock *
     GetLockedBlockRef(int nXBlockOff, int nYBlockOff,
                       int bJustInitialize = FALSE) CPL_WARN_UNUSED_RESULT;
-    GDALRasterBlock *TryGetLockedBlockRef(int nXBlockOff, int nYBlockYOff)
-        CPL_WARN_UNUSED_RESULT;
-    CPLErr FlushBlock(int nXBlockOff, int nYBlockOff,
-                      int bWriteDirtyBlock = TRUE);
+
+    // This method should only be overloaded by GDALProxyRasterBand
+    virtual GDALRasterBlock *
+    TryGetLockedBlockRef(int nXBlockOff,
+                         int nYBlockYOff) CPL_WARN_UNUSED_RESULT;
+
+    // This method should only be overloaded by GDALProxyRasterBand
+    virtual CPLErr FlushBlock(int nXBlockOff, int nYBlockOff,
+                              int bWriteDirtyBlock = TRUE);
 
     unsigned char *
     GetIndexColorTranslationTo(/* const */ GDALRasterBand *poReferenceBand,
@@ -1795,9 +1866,14 @@ class CPL_DLL GDALRasterBand : public GDALMajorObject
 
     std::shared_ptr<GDALMDArray> AsMDArray() const;
 
+    virtual CPLErr InterpolateAtPoint(double dfPixel, double dfLine,
+                                      GDALRIOResampleAlg eInterpolation,
+                                      double *pdfRealValue,
+                                      double *pdfImagValue = nullptr) const;
+
 #ifndef DOXYGEN_XML
-    void ReportError(CPLErr eErrClass, CPLErrorNum err_no, const char *fmt, ...)
-        CPL_PRINT_FUNC_FORMAT(4, 5);
+    void ReportError(CPLErr eErrClass, CPLErrorNum err_no, const char *fmt,
+                     ...) const CPL_PRINT_FUNC_FORMAT(4, 5);
 #endif
 
     /** Convert a GDALRasterBand* to a GDALRasterBandH.
@@ -1819,7 +1895,7 @@ class CPL_DLL GDALRasterBand : public GDALMajorObject
     //! @cond Doxygen_Suppress
     // Remove me in GDAL 4.0. See GetMetadataItem() implementation
     // Internal use in GDAL only !
-    void EnablePixelTypeSignedByteWarning(bool b)
+    virtual void EnablePixelTypeSignedByteWarning(bool b)
 #ifndef GDAL_COMPILATION
         CPL_WARN_DEPRECATED("Do not use that method outside of GDAL!")
 #endif
@@ -1831,6 +1907,55 @@ class CPL_DLL GDALRasterBand : public GDALMajorObject
     CPL_DISALLOW_COPY_ASSIGN(GDALRasterBand)
 };
 
+//! @cond Doxygen_Suppress
+#define GDAL_EXTERN_TEMPLATE_READ_RASTER(T)                                    \
+    extern template CPLErr GDALRasterBand::ReadRaster<T>(                      \
+        T * pData, size_t nArrayEltCount, double dfXOff, double dfYOff,        \
+        double dfXSize, double dfYSize, size_t nBufXSize, size_t nBufYSize,    \
+        GDALRIOResampleAlg eResampleAlg, GDALProgressFunc pfnProgress,         \
+        void *pProgressData) const;
+
+GDAL_EXTERN_TEMPLATE_READ_RASTER(uint8_t)
+GDAL_EXTERN_TEMPLATE_READ_RASTER(int8_t)
+GDAL_EXTERN_TEMPLATE_READ_RASTER(uint16_t)
+GDAL_EXTERN_TEMPLATE_READ_RASTER(int16_t)
+GDAL_EXTERN_TEMPLATE_READ_RASTER(uint32_t)
+GDAL_EXTERN_TEMPLATE_READ_RASTER(int32_t)
+GDAL_EXTERN_TEMPLATE_READ_RASTER(uint64_t)
+GDAL_EXTERN_TEMPLATE_READ_RASTER(int64_t)
+GDAL_EXTERN_TEMPLATE_READ_RASTER(float)
+GDAL_EXTERN_TEMPLATE_READ_RASTER(double)
+// Not allowed by C++ standard
+// GDAL_EXTERN_TEMPLATE_READ_RASTER(std::complex<int16_t>)
+// GDAL_EXTERN_TEMPLATE_READ_RASTER(std::complex<int32_t>)
+GDAL_EXTERN_TEMPLATE_READ_RASTER(std::complex<float>)
+GDAL_EXTERN_TEMPLATE_READ_RASTER(std::complex<double>)
+
+#define GDAL_EXTERN_TEMPLATE_READ_RASTER_VECTOR(T)                             \
+    extern template CPLErr GDALRasterBand::ReadRaster<T>(                      \
+        std::vector<T> & vData, double dfXOff, double dfYOff, double dfXSize,  \
+        double dfYSize, size_t nBufXSize, size_t nBufYSize,                    \
+        GDALRIOResampleAlg eResampleAlg, GDALProgressFunc pfnProgress,         \
+        void *pProgressData) const;
+
+GDAL_EXTERN_TEMPLATE_READ_RASTER_VECTOR(uint8_t)
+GDAL_EXTERN_TEMPLATE_READ_RASTER_VECTOR(int8_t)
+GDAL_EXTERN_TEMPLATE_READ_RASTER_VECTOR(uint16_t)
+GDAL_EXTERN_TEMPLATE_READ_RASTER_VECTOR(int16_t)
+GDAL_EXTERN_TEMPLATE_READ_RASTER_VECTOR(uint32_t)
+GDAL_EXTERN_TEMPLATE_READ_RASTER_VECTOR(int32_t)
+GDAL_EXTERN_TEMPLATE_READ_RASTER_VECTOR(uint64_t)
+GDAL_EXTERN_TEMPLATE_READ_RASTER_VECTOR(int64_t)
+GDAL_EXTERN_TEMPLATE_READ_RASTER_VECTOR(float)
+GDAL_EXTERN_TEMPLATE_READ_RASTER_VECTOR(double)
+// Not allowed by C++ standard
+// GDAL_EXTERN_TEMPLATE_READ_RASTER_VECTOR(std::complex<int16_t>)
+// GDAL_EXTERN_TEMPLATE_READ_RASTER_VECTOR(std::complex<int32_t>)
+GDAL_EXTERN_TEMPLATE_READ_RASTER_VECTOR(std::complex<float>)
+GDAL_EXTERN_TEMPLATE_READ_RASTER_VECTOR(std::complex<double>)
+
+//! @endcond
+
 //! @cond Doxygen_Suppress
 /* ******************************************************************** */
 /*                         GDALAllValidMaskBand                         */
@@ -2272,6 +2397,7 @@ class CPL_DLL GDALDriver : public GDALMajorObject
  * @since 3.9
  */
 // clang-format on
+
 class GDALPluginDriverProxy : public GDALDriver
 {
     const std::string m_osPluginFileName;
@@ -2408,6 +2534,7 @@ class CPL_DLL GDALDriverManager : public GDALMajorObject
     //! @cond Doxygen_Suppress
     int GetDriverCount(bool bIncludeHidden) const;
     GDALDriver *GetDriver(int iDriver, bool bIncludeHidden);
+    bool IsKnownDriver(const char *pszDriverName) const;
     //! @endcond
 };
 
@@ -3234,17 +3361,22 @@ class CPL_DLL GDALAttribute : virtual public GDALAbstractMDArray
     GDALRawResult ReadAsRaw() const;
     const char *ReadAsString() const;
     int ReadAsInt() const;
+    int64_t ReadAsInt64() const;
     double ReadAsDouble() const;
     CPLStringList ReadAsStringArray() const;
     std::vector<int> ReadAsIntArray() const;
+    std::vector<int64_t> ReadAsInt64Array() const;
     std::vector<double> ReadAsDoubleArray() const;
 
     using GDALAbstractMDArray::Write;
     bool Write(const void *pabyValue, size_t nLen);
     bool Write(const char *);
     bool WriteInt(int);
+    bool WriteInt64(int64_t);
     bool Write(double);
     bool Write(CSLConstList);
+    bool Write(const int *, size_t);
+    bool Write(const int64_t *, size_t);
     bool Write(const double *, size_t);
 
     //! @cond Doxygen_Suppress
@@ -3408,12 +3540,12 @@ class CPL_DLL GDALMDArray : virtual public GDALAbstractMDArray,
                                   const GDALExtendedDataType &bufferDataType,
                                   void *pDstBuffer) const;
 
-    static std::shared_ptr<GDALMDArray>
-    CreateGLTOrthorectified(const std::shared_ptr<GDALMDArray> &poParent,
-                            const std::shared_ptr<GDALMDArray> &poGLTX,
-                            const std::shared_ptr<GDALMDArray> &poGLTY,
-                            int nGLTIndexOffset,
-                            const std::vector<double> &adfGeoTransform);
+    static std::shared_ptr<GDALMDArray> CreateGLTOrthorectified(
+        const std::shared_ptr<GDALMDArray> &poParent,
+        const std::shared_ptr<GDALGroup> &poRootGroup,
+        const std::shared_ptr<GDALMDArray> &poGLTX,
+        const std::shared_ptr<GDALMDArray> &poGLTY, int nGLTIndexOffset,
+        const std::vector<double> &adfGeoTransform, CSLConstList papszOptions);
 
     //! @endcond
 
@@ -3536,6 +3668,10 @@ class CPL_DLL GDALMDArray : virtual public GDALAbstractMDArray,
                const std::shared_ptr<GDALMDArray> &poYArray = nullptr,
                CSLConstList papszOptions = nullptr) const;
 
+    static std::vector<std::shared_ptr<GDALMDArray>>
+    GetMeshGrid(const std::vector<std::shared_ptr<GDALMDArray>> &apoArrays,
+                CSLConstList papszOptions = nullptr);
+
     virtual GDALDataset *
     AsClassicDataset(size_t iXDim, size_t iYDim,
                      const std::shared_ptr<GDALGroup> &poRootGroup = nullptr,
@@ -4199,15 +4335,72 @@ CPLErr CPL_DLL GDALRegenerateOverviewsMultiBand(
     const char *pszResampling, GDALProgressFunc pfnProgress,
     void *pProgressData, CSLConstList papszOptions);
 
-typedef CPLErr (*GDALResampleFunction)(
-    double dfXRatioDstToSrc, double dfYRatioDstToSrc, double dfSrcXDelta,
-    double dfSrcYDelta, GDALDataType eWrkDataType, const void *pChunk,
-    const GByte *pabyChunkNodataMask, int nChunkXOff, int nChunkXSize,
-    int nChunkYOff, int nChunkYSize, int nDstXOff, int nDstXOff2, int nDstYOff,
-    int nDstYOff2, GDALRasterBand *poOverview, void **ppDstBuffer,
-    GDALDataType *peDstBufferDataType, const char *pszResampling,
-    bool bHasNoData, double dfNoDataValue, GDALColorTable *poColorTable,
-    GDALDataType eSrcDataType, bool bPropagateNoData);
+/************************************************************************/
+/*                       GDALOverviewResampleArgs                       */
+/************************************************************************/
+
+/** Arguments for overview resampling function. */
+// Should not contain any dataset/rasterband object, as this might be
+// read in a worker thread.
+struct GDALOverviewResampleArgs
+{
+    //! Datatype of the source band argument
+    GDALDataType eSrcDataType = GDT_Unknown;
+    //! Datatype of the destination/overview band
+    GDALDataType eOvrDataType = GDT_Unknown;
+    //! Width in pixel of the destination/overview band
+    int nOvrXSize = 0;
+    //! Height in pixel of the destination/overview band
+    int nOvrYSize = 0;
+    //! NBITS value of the destination/overview band (or 0 if not set)
+    int nOvrNBITS = 0;
+    //! Factor to convert from destination X to source X
+    // (source width divided by destination width)
+    double dfXRatioDstToSrc = 0;
+    //! Factor to convert from destination Y to source Y
+    // (source height divided by destination height)
+    double dfYRatioDstToSrc = 0;
+    //! Sub-pixel delta to add to get source X
+    double dfSrcXDelta = 0;
+    //! Sub-pixel delta to add to get source Y
+    double dfSrcYDelta = 0;
+    //! Working data type (data type of the pChunk argument)
+    GDALDataType eWrkDataType = GDT_Unknown;
+    //! Array of nChunkXSize * nChunkYSize values of mask, or nullptr
+    const GByte *pabyChunkNodataMask = nullptr;
+    //! X offset of the source chunk in the source band
+    int nChunkXOff = 0;
+    //! Width in pixel of the source chunk in the source band
+    int nChunkXSize = 0;
+    //! Y offset of the source chunk in the source band
+    int nChunkYOff = 0;
+    //! Height in pixel of the source chunk in the source band
+    int nChunkYSize = 0;
+    //! X Offset of the destination chunk in the destination band
+    int nDstXOff = 0;
+    //! X Offset of the end (not included) of the destination chunk in the destination band
+    int nDstXOff2 = 0;
+    //! Y Offset of the destination chunk in the destination band
+    int nDstYOff = 0;
+    //! Y Offset of the end (not included) of the destination chunk in the destination band
+    int nDstYOff2 = 0;
+    //! Resampling method
+    const char *pszResampling = nullptr;
+    //! Whether the source band has a nodata value
+    bool bHasNoData = false;
+    //! Source band nodata value
+    double dfNoDataValue = 0;
+    //! Source color table
+    const GDALColorTable *poColorTable = nullptr;
+    //! Whether a single contributing source pixel at nodata should result
+    // in the target pixel to be at nodata too (only taken into account by
+    // average resampling)
+    bool bPropagateNoData = false;
+};
+
+typedef CPLErr (*GDALResampleFunction)(const GDALOverviewResampleArgs &args,
+                                       const void *pChunk, void **ppDstBuffer,
+                                       GDALDataType *peDstBufferDataType);
 
 GDALResampleFunction GDALGetResampleFunction(const char *pszResampling,
                                              int *pnRadius);
@@ -4267,12 +4460,12 @@ int CPL_DLL GDALCheckBandCount(int nBands, int bIsZeroAllowed);
 int CPL_DLL GDALReadWorldFile2(const char *pszBaseFilename,
                                const char *pszExtension,
                                double *padfGeoTransform,
-                               char **papszSiblingFiles,
+                               CSLConstList papszSiblingFiles,
                                char **ppszWorldFileNameOut);
 int CPL_DLL GDALReadTabFile2(const char *pszBaseFilename,
                              double *padfGeoTransform, char **ppszWKT,
                              int *pnGCPCount, GDAL_GCP **ppasGCPs,
-                             char **papszSiblingFiles,
+                             CSLConstList papszSiblingFiles,
                              char **ppszTabFileNameOut);
 
 void CPL_DLL GDALCopyRasterIOExtraArg(GDALRasterIOExtraArg *psDestArg,
@@ -4280,6 +4473,12 @@ void CPL_DLL GDALCopyRasterIOExtraArg(GDALRasterIOExtraArg *psDestArg,
 
 CPL_C_END
 
+std::unique_ptr<GDALDataset> CPL_DLL
+GDALGetThreadSafeDataset(std::unique_ptr<GDALDataset> poDS, int nScopeFlags);
+
+GDALDataset CPL_DLL *GDALGetThreadSafeDataset(GDALDataset *poDS,
+                                              int nScopeFlags);
+
 void GDALNullifyOpenDatasetsList();
 CPLMutex **GDALGetphDMMutex();
 CPLMutex **GDALGetphDLMutex();
@@ -4302,7 +4501,8 @@ int GDALValidateOptions(const char *pszOptionList,
                         const char *pszErrorMessageOptionType,
                         const char *pszErrorMessageContainerName);
 
-GDALRIOResampleAlg GDALRasterIOGetResampleAlg(const char *pszResampling);
+GDALRIOResampleAlg CPL_DLL
+GDALRasterIOGetResampleAlg(const char *pszResampling);
 const char *GDALRasterIOGetResampleAlg(GDALRIOResampleAlg eResampleAlg);
 
 void GDALRasterIOExtraArgSetResampleAlg(GDALRasterIOExtraArg *psExtraArg,
@@ -4338,8 +4538,9 @@ void GDALDeserializeGCPListFromXML(const CPLXMLNode *psGCPList,
                                    OGRSpatialReference **ppoGCP_SRS);
 
 void GDALSerializeOpenOptionsToXML(CPLXMLNode *psParentNode,
-                                   char **papszOpenOptions);
-char **GDALDeserializeOpenOptionsFromXML(const CPLXMLNode *psParentNode);
+                                   CSLConstList papszOpenOptions);
+char CPL_DLL **
+GDALDeserializeOpenOptionsFromXML(const CPLXMLNode *psParentNode);
 
 int GDALCanFileAcceptSidecarFile(const char *pszFilename);
 
@@ -4379,6 +4580,11 @@ GDALRasterAttributeTable CPL_DLL *GDALCreateRasterAttributeTableFromMDArrays(
     const std::vector<std::shared_ptr<GDALMDArray>> &apoArrays,
     const std::vector<GDALRATFieldUsage> &aeUsages);
 
+GDALColorInterp CPL_DLL
+GDALGetColorInterpFromSTACCommonName(const char *pszName);
+const char CPL_DLL *
+GDALGetSTACCommonNameFromColorInterp(GDALColorInterp eInterp);
+
 // Macro used so that Identify and driver metadata methods in drivers built
 // as plugin can be duplicated in libgdal core and in the driver under different
 // names
diff --git a/gcore/gdal_priv_templates.hpp b/gcore/gdal_priv_templates.hpp
index 3d928c256d76..3c20c055687b 100644
--- a/gcore/gdal_priv_templates.hpp
+++ b/gcore/gdal_priv_templates.hpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2009, Phil Vachon, <philippe at cowpig.ca>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_PRIV_TEMPLATES_HPP_INCLUDED
@@ -32,6 +16,7 @@
 
 #include "cpl_port.h"
 
+#include <cmath>
 #include <cstdint>
 #include <limits>
 
@@ -148,16 +133,67 @@ template <class T> inline bool GDALIsValueInRange(double dfValue)
 
 template <> inline bool GDALIsValueInRange<double>(double dfValue)
 {
-    return !CPLIsNan(dfValue);
+    return !std::isnan(dfValue);
 }
 
 template <> inline bool GDALIsValueInRange<float>(double dfValue)
 {
-    return CPLIsInf(dfValue) ||
+    return std::isinf(dfValue) ||
            (dfValue >= -std::numeric_limits<float>::max() &&
             dfValue <= std::numeric_limits<float>::max());
 }
 
+template <> inline bool GDALIsValueInRange<int64_t>(double dfValue)
+{
+    // Values in the range [INT64_MAX - 1023, INT64_MAX - 1]
+    // get converted to a double that once cast to int64_t is
+    // INT64_MAX + 1, hence the < strict comparison.
+    return dfValue >=
+               static_cast<double>(std::numeric_limits<int64_t>::min()) &&
+           dfValue < static_cast<double>(std::numeric_limits<int64_t>::max());
+}
+
+template <> inline bool GDALIsValueInRange<uint64_t>(double dfValue)
+{
+    // Values in the range [UINT64_MAX - 2047, UINT64_MAX - 1]
+    // get converted to a double that once cast to uint64_t is
+    // UINT64_MAX + 1, hence the < strict comparison.
+    return dfValue >= 0 &&
+           dfValue < static_cast<double>(std::numeric_limits<uint64_t>::max());
+}
+
+/************************************************************************/
+/*                         GDALIsValueExactAs()                         */
+/************************************************************************/
+/**
+ * Returns whether a value can be exactly represented on type T.
+ *
+ * That is static_cast\<double\>(static_cast\<T\>(dfValue)) is legal and is
+ * equal to dfValue.
+ *
+ * Note: for T=float or double, a NaN input leads to true
+ *
+ * @param dfValue the value
+ * @return whether the value can be exactly represented on type T.
+ */
+template <class T> inline bool GDALIsValueExactAs(double dfValue)
+{
+    return GDALIsValueInRange<T>(dfValue) &&
+           static_cast<double>(static_cast<T>(dfValue)) == dfValue;
+}
+
+template <> inline bool GDALIsValueExactAs<float>(double dfValue)
+{
+    return std::isnan(dfValue) ||
+           (GDALIsValueInRange<float>(dfValue) &&
+            static_cast<double>(static_cast<float>(dfValue)) == dfValue);
+}
+
+template <> inline bool GDALIsValueExactAs<double>(double)
+{
+    return true;
+}
+
 /************************************************************************/
 /*                          GDALCopyWord()                              */
 /************************************************************************/
@@ -236,7 +272,7 @@ template <class Tout> struct sGDALCopyWord<float, Tout>
 {
     static inline void f(const float fValueIn, Tout &tValueOut)
     {
-        if (CPLIsNan(fValueIn))
+        if (std::isnan(fValueIn))
         {
             tValueOut = 0;
             return;
@@ -252,7 +288,7 @@ template <> struct sGDALCopyWord<float, short>
 {
     static inline void f(const float fValueIn, short &nValueOut)
     {
-        if (CPLIsNan(fValueIn))
+        if (std::isnan(fValueIn))
         {
             nValueOut = 0;
             return;
@@ -269,7 +305,7 @@ template <> struct sGDALCopyWord<float, signed char>
 {
     static inline void f(const float fValueIn, signed char &nValueOut)
     {
-        if (CPLIsNan(fValueIn))
+        if (std::isnan(fValueIn))
         {
             nValueOut = 0;
             return;
@@ -286,7 +322,7 @@ template <class Tout> struct sGDALCopyWord<double, Tout>
 {
     static inline void f(const double dfValueIn, Tout &tValueOut)
     {
-        if (CPLIsNan(dfValueIn))
+        if (std::isnan(dfValueIn))
         {
             tValueOut = 0;
             return;
@@ -302,7 +338,7 @@ template <> struct sGDALCopyWord<double, int>
 {
     static inline void f(const double dfValueIn, int &nValueOut)
     {
-        if (CPLIsNan(dfValueIn))
+        if (std::isnan(dfValueIn))
         {
             nValueOut = 0;
             return;
@@ -319,16 +355,45 @@ template <> struct sGDALCopyWord<double, std::int64_t>
 {
     static inline void f(const double dfValueIn, std::int64_t &nValueOut)
     {
-        if (CPLIsNan(dfValueIn))
+        if (std::isnan(dfValueIn))
         {
             nValueOut = 0;
-            return;
         }
-        double dfMaxVal, dfMinVal;
-        GDALGetDataLimits<double, std::int64_t>(dfMaxVal, dfMinVal);
-        double dfValue = dfValueIn >= 0.0 ? dfValueIn + 0.5 : dfValueIn - 0.5;
-        nValueOut = static_cast<std::int64_t>(
-            GDALClampValue(dfValue, dfMaxVal, dfMinVal));
+        else if (dfValueIn >=
+                 static_cast<double>(std::numeric_limits<std::int64_t>::max()))
+        {
+            nValueOut = std::numeric_limits<std::int64_t>::max();
+        }
+        else if (dfValueIn <=
+                 static_cast<double>(std::numeric_limits<std::int64_t>::min()))
+        {
+            nValueOut = std::numeric_limits<std::int64_t>::min();
+        }
+        else
+        {
+            nValueOut = static_cast<std::int64_t>(
+                dfValueIn > 0.0f ? dfValueIn + 0.5f : dfValueIn - 0.5f);
+        }
+    }
+};
+
+template <> struct sGDALCopyWord<double, std::uint64_t>
+{
+    static inline void f(const double dfValueIn, std::uint64_t &nValueOut)
+    {
+        if (!(dfValueIn > 0))
+        {
+            nValueOut = 0;
+        }
+        else if (dfValueIn >
+                 static_cast<double>(std::numeric_limits<uint64_t>::max()))
+        {
+            nValueOut = std::numeric_limits<uint64_t>::max();
+        }
+        else
+        {
+            nValueOut = static_cast<std::uint64_t>(dfValueIn + 0.5);
+        }
     }
 };
 
@@ -336,7 +401,7 @@ template <> struct sGDALCopyWord<double, short>
 {
     static inline void f(const double dfValueIn, short &nValueOut)
     {
-        if (CPLIsNan(dfValueIn))
+        if (std::isnan(dfValueIn))
         {
             nValueOut = 0;
             return;
@@ -353,7 +418,7 @@ template <> struct sGDALCopyWord<double, signed char>
 {
     static inline void f(const double dfValueIn, signed char &nValueOut)
     {
-        if (CPLIsNan(dfValueIn))
+        if (std::isnan(dfValueIn))
         {
             nValueOut = 0;
             return;
@@ -372,7 +437,12 @@ template <> struct sGDALCopyWord<float, int>
 {
     static inline void f(const float fValueIn, int &nValueOut)
     {
-        if (fValueIn >= static_cast<float>(std::numeric_limits<int>::max()))
+        if (std::isnan(fValueIn))
+        {
+            nValueOut = 0;
+        }
+        else if (fValueIn >=
+                 static_cast<float>(std::numeric_limits<int>::max()))
         {
             nValueOut = std::numeric_limits<int>::max();
         }
@@ -395,15 +465,14 @@ template <> struct sGDALCopyWord<float, unsigned int>
 {
     static inline void f(const float fValueIn, unsigned int &nValueOut)
     {
-        if (fValueIn >=
-            static_cast<float>(std::numeric_limits<unsigned int>::max()))
+        if (!(fValueIn > 0))
         {
-            nValueOut = std::numeric_limits<unsigned int>::max();
+            nValueOut = 0;
         }
-        else if (fValueIn <=
-                 static_cast<float>(std::numeric_limits<unsigned int>::min()))
+        else if (fValueIn >=
+                 static_cast<float>(std::numeric_limits<unsigned int>::max()))
         {
-            nValueOut = std::numeric_limits<unsigned int>::min();
+            nValueOut = std::numeric_limits<unsigned int>::max();
         }
         else
         {
@@ -418,8 +487,12 @@ template <> struct sGDALCopyWord<float, std::int64_t>
 {
     static inline void f(const float fValueIn, std::int64_t &nValueOut)
     {
-        if (fValueIn >=
-            static_cast<float>(std::numeric_limits<std::int64_t>::max()))
+        if (std::isnan(fValueIn))
+        {
+            nValueOut = 0;
+        }
+        else if (fValueIn >=
+                 static_cast<float>(std::numeric_limits<std::int64_t>::max()))
         {
             nValueOut = std::numeric_limits<std::int64_t>::max();
         }
@@ -442,15 +515,14 @@ template <> struct sGDALCopyWord<float, std::uint64_t>
 {
     static inline void f(const float fValueIn, std::uint64_t &nValueOut)
     {
-        if (fValueIn >=
-            static_cast<float>(std::numeric_limits<std::uint64_t>::max()))
+        if (!(fValueIn > 0))
         {
-            nValueOut = std::numeric_limits<std::uint64_t>::max();
+            nValueOut = 0;
         }
-        else if (fValueIn <=
-                 static_cast<float>(std::numeric_limits<std::uint64_t>::min()))
+        else if (fValueIn >=
+                 static_cast<float>(std::numeric_limits<std::uint64_t>::max()))
         {
-            nValueOut = std::numeric_limits<std::uint64_t>::min();
+            nValueOut = std::numeric_limits<std::uint64_t>::max();
         }
         else
         {
diff --git a/gcore/gdal_proxy.h b/gcore/gdal_proxy.h
index 40a0495f47ee..1fb5b5deae75 100644
--- a/gcore/gdal_proxy.h
+++ b/gcore/gdal_proxy.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_PROXY_H_INCLUDED
@@ -59,6 +43,13 @@ class CPL_DLL GDALProxyDataset : public GDALDataset
     CPLErr IRasterIO(GDALRWFlag, int, int, int, int, void *, int, int,
                      GDALDataType, int, BANDMAP_TYPE, GSpacing, GSpacing,
                      GSpacing, GDALRasterIOExtraArg *psExtraArg) override;
+    CPLErr BlockBasedRasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff,
+                              int nXSize, int nYSize, void *pData,
+                              int nBufXSize, int nBufYSize,
+                              GDALDataType eBufType, int nBandCount,
+                              const int *panBandMap, GSpacing nPixelSpace,
+                              GSpacing nLineSpace, GSpacing nBandSpace,
+                              GDALRasterIOExtraArg *psExtraArg) override;
 
   public:
     char **GetMetadataDomainList() override;
@@ -129,6 +120,9 @@ class CPL_DLL GDALProxyRasterBand : public GDALRasterBand
                      GDALDataType, GSpacing, GSpacing,
                      GDALRasterIOExtraArg *psExtraArg) override;
 
+    int IGetDataCoverageStatus(int nXOff, int nYOff, int nXSize, int nYSize,
+                               int nMaskFlagStop, double *pdfDataPct) override;
+
   public:
     char **GetMetadataDomainList() override;
     char **GetMetadata(const char *pszDomain) override;
@@ -137,6 +131,16 @@ class CPL_DLL GDALProxyRasterBand : public GDALRasterBand
                                 const char *pszDomain) override;
     CPLErr SetMetadataItem(const char *pszName, const char *pszValue,
                            const char *pszDomain) override;
+
+    GDALRasterBlock *GetLockedBlockRef(int nXBlockOff, int nYBlockOff,
+                                       int bJustInitialize) override;
+
+    GDALRasterBlock *TryGetLockedBlockRef(int nXBlockOff,
+                                          int nYBlockYOff) override;
+
+    CPLErr FlushBlock(int nXBlockOff, int nYBlockOff,
+                      int bWriteDirtyBlock) override;
+
     CPLErr FlushCache(bool bAtClosing) override;
     char **GetCategoryNames() override;
     double GetNoDataValue(int *pbSuccess = nullptr) override;
@@ -203,6 +207,13 @@ class CPL_DLL GDALProxyRasterBand : public GDALRasterBand
                                      GIntBig *pnLineSpace,
                                      char **papszOptions) override;
 
+    CPLErr InterpolateAtPoint(double dfPixel, double dfLine,
+                              GDALRIOResampleAlg eInterpolation,
+                              double *pdfRealValue,
+                              double *pdfImagValue) const override;
+
+    void EnablePixelTypeSignedByteWarning(bool b) override;
+
   private:
     CPL_DISALLOW_COPY_ASSIGN(GDALProxyRasterBand)
 };
@@ -450,6 +461,8 @@ void CPL_DLL GDALProxyPoolDatasetAddSrcBandDescription(
     GDALProxyPoolDatasetH hProxyPoolDataset, GDALDataType eDataType,
     int nBlockXSize, int nBlockYSize);
 
+int CPL_DLL GDALGetMaxDatasetPoolSize(void);
+
 CPL_C_END
 
 #endif /* #ifndef DOXYGEN_SKIP */
diff --git a/gcore/gdal_rat.cpp b/gcore/gdal_rat.cpp
index a9e8a5cdaaa5..5378a28ec824 100644
--- a/gcore/gdal_rat.cpp
+++ b/gcore/gdal_rat.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2005, Frank Warmerdam
  * Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -54,7 +38,7 @@
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif
-#include "ogrgeojsonwriter.h"
+#include "ogrlibjsonutils.h"
 
 /**
  * \class GDALRasterAttributeTable
diff --git a/gcore/gdal_rat.h b/gcore/gdal_rat.h
index 93a62bb389c2..9aae5163ecf4 100644
--- a/gcore/gdal_rat.h
+++ b/gcore/gdal_rat.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_RAT_H_INCLUDED
diff --git a/gcore/gdal_thread_pool.cpp b/gcore/gdal_thread_pool.cpp
index 85bc49c7f00e..cd86de03ab68 100644
--- a/gcore/gdal_thread_pool.cpp
+++ b/gcore/gdal_thread_pool.cpp
@@ -7,23 +7,7 @@
  **********************************************************************
  * Copyright (c) 2020, Even Rouault, <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_thread_pool.h"
diff --git a/gcore/gdal_thread_pool.h b/gcore/gdal_thread_pool.h
index b692f0587c52..53d75e372d03 100644
--- a/gcore/gdal_thread_pool.h
+++ b/gcore/gdal_thread_pool.h
@@ -7,23 +7,7 @@
  **********************************************************************
  * Copyright (c) 2020, Even Rouault, <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_THREAD_POOL_H
diff --git a/gcore/gdal_version.h.in b/gcore/gdal_version.h.in
index d7b4c9fd9e90..059d28cc4bcc 100644
--- a/gcore/gdal_version.h.in
+++ b/gcore/gdal_version.h.in
@@ -6,7 +6,7 @@
 
 #ifndef GDAL_VERSION_MAJOR
 #  define GDAL_VERSION_MAJOR    3
-#  define GDAL_VERSION_MINOR    10
+#  define GDAL_VERSION_MINOR    11
 #  define GDAL_VERSION_REV      0
 #  define GDAL_VERSION_BUILD    0
 #endif
@@ -24,9 +24,9 @@
 
 #if !defined(DO_NOT_DEFINE_GDAL_DATE_NAME)
 #ifndef GDAL_RELEASE_DATE
-#  define GDAL_RELEASE_DATE     20249999
+#  define GDAL_RELEASE_DATE     20259999
 #endif
 #ifndef GDAL_RELEASE_NAME
-#  define GDAL_RELEASE_NAME     "3.10.0dev"
+#  define GDAL_RELEASE_NAME     "3.11.0dev"
 #endif
 #endif
diff --git a/gcore/gdalabstractbandblockcache.cpp b/gcore/gdalabstractbandblockcache.cpp
index 93dfbb851dfe..42ea3114bd0d 100644
--- a/gcore/gdalabstractbandblockcache.cpp
+++ b/gcore/gdalabstractbandblockcache.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot org>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/gcore/gdalallvalidmaskband.cpp b/gcore/gdalallvalidmaskband.cpp
index ab2b4677c19b..cc44b5045de7 100644
--- a/gcore/gdalallvalidmaskband.cpp
+++ b/gcore/gdalallvalidmaskband.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/gcore/gdalarraybandblockcache.cpp b/gcore/gdalarraybandblockcache.cpp
index 8faa0794a76d..3171adf0601e 100644
--- a/gcore/gdalarraybandblockcache.cpp
+++ b/gcore/gdalarraybandblockcache.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, Frank Warmerdam
  * Copyright (c) 2007-2015, Even Rouault <even dot rouault at spatialys dot org>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/gcore/gdalcachedpixelaccessor.h b/gcore/gdalcachedpixelaccessor.h
index 332a91cb8f61..a629a02a8336 100644
--- a/gcore/gdalcachedpixelaccessor.h
+++ b/gcore/gdalcachedpixelaccessor.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_CACHED_PIXEL_ACCESSOR_INCLUDED
diff --git a/gcore/gdalcolortable.cpp b/gcore/gdalcolortable.cpp
index 6ba11f5bd6cb..cd73addd9434 100644
--- a/gcore/gdalcolortable.cpp
+++ b/gcore/gdalcolortable.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2000, Frank Warmerdam
  * Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/gcore/gdaldataset.cpp b/gcore/gdaldataset.cpp
index ebabfe8c583e..f52217e1efd1 100644
--- a/gcore/gdaldataset.cpp
+++ b/gcore/gdaldataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, 2003, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -38,6 +22,7 @@
 #include <cstring>
 #include <algorithm>
 #include <map>
+#include <mutex>
 #include <new>
 #include <set>
 #include <string>
@@ -114,6 +99,8 @@ class GDALDataset::Private
     GIntBig nTotalFeatures = TOTAL_FEATURES_NOT_INIT;
     OGRLayer *poCurrentLayer = nullptr;
 
+    std::mutex m_oMutexWKT{};
+
     char *m_pszWKTCached = nullptr;
     OGRSpatialReference *m_poSRSCached = nullptr;
     char *m_pszWKTGCPCached = nullptr;
@@ -373,11 +360,13 @@ GDALDataset::~GDALDataset()
         if (m_poPrivate->hMutex != nullptr)
             CPLDestroyMutex(m_poPrivate->hMutex);
 
+        // coverity[missing_lock]
         CPLFree(m_poPrivate->m_pszWKTCached);
         if (m_poPrivate->m_poSRSCached)
         {
             m_poPrivate->m_poSRSCached->Release();
         }
+        // coverity[missing_lock]
         CPLFree(m_poPrivate->m_pszWKTGCPCached);
         if (m_poPrivate->m_poSRSGCPCached)
         {
@@ -544,7 +533,7 @@ void GDALDataset::AddToDatasetOpenList()
  *
  * The default implementation of this method just calls the FlushCache() method
  * on each of the raster bands and the SyncToDisk() method
- * on each of the layers.  Conceptionally, calling FlushCache() on a dataset
+ * on each of the layers.  Conceptually, calling FlushCache() on a dataset
  * should include any work that might be accomplished by calling SyncToDisk()
  * on layers in that dataset.
  *
@@ -748,9 +737,7 @@ CPLErr GDALDataset::BlockBasedFlushCache(bool bAtClosing)
         {
             for (int iBand = 0; iBand < nBands; ++iBand)
             {
-                GDALRasterBand *poBand = GetRasterBand(iBand + 1);
-
-                const CPLErr eErr = poBand->FlushBlock(iX, iY);
+                const CPLErr eErr = papoBands[iBand]->FlushBlock(iX, iY);
 
                 if (eErr != CE_None)
                     return CE_Failure;
@@ -873,6 +860,15 @@ void GDALDataset::SetBand(int nNewBand, GDALRasterBand *poBand)
             papoBands[i] = nullptr;
 
         nBands = std::max(nBands, nNewBand);
+
+        if (m_poPrivate)
+        {
+            for (int i = static_cast<int>(m_poPrivate->m_anBandMap.size());
+                 i < nBands; ++i)
+            {
+                m_poPrivate->m_anBandMap.push_back(i + 1);
+            }
+        }
     }
 
     /* -------------------------------------------------------------------- */
@@ -1159,6 +1155,11 @@ const char *GDALDataset::GetProjectionRef() const
     {
         return "";
     }
+
+    // If called on a thread-safe dataset, we might be called by several
+    // threads, so make sure our accesses to m_pszWKTCached are protected
+    // by a mutex.
+    std::lock_guard oLock(m_poPrivate->m_oMutexWKT);
     if (m_poPrivate->m_pszWKTCached &&
         strcmp(pszWKT, m_poPrivate->m_pszWKTCached) == 0)
     {
@@ -1824,6 +1825,11 @@ const char *GDALDataset::GetGCPProjection()
     {
         return "";
     }
+
+    // If called on a thread-safe dataset, we might be called by several
+    // threads, so make sure our accesses to m_pszWKTCached are protected
+    // by a mutex.
+    std::lock_guard oLock(m_poPrivate->m_oMutexWKT);
     if (m_poPrivate->m_pszWKTGCPCached &&
         strcmp(pszWKT, m_poPrivate->m_pszWKTGCPCached) == 0)
     {
@@ -2589,6 +2595,12 @@ CPLErr GDALDataset::ValidateRasterIOOrAdviseReadParameters(
  * buffer size (nBufXSize x nBufYSize) is different than the size of the
  * region being accessed (nXSize x nYSize).
  *
+ * The window of interest expressed by (nXOff, nYOff, nXSize, nYSize) should be
+ * fully within the raster space, that is nXOff >= 0, nYOff >= 0,
+ * nXOff + nXSize <= GetRasterXSize() and nYOff + nYSize <= GetRasterYSize().
+ * If reads larger than the raster space are wished, GDALTranslate() might be used.
+ * Or use nLineSpace and a possibly shifted pData value.
+ *
  * The nPixelSpace, nLineSpace and nBandSpace parameters allow reading into or
  * writing from various organization of buffers.
  *
@@ -2781,13 +2793,7 @@ CPLErr GDALDataset::RasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff,
     {
         if (!m_poPrivate)
             return CE_Failure;
-        const int nOldBandMapSize =
-            static_cast<int>(m_poPrivate->m_anBandMap.size());
-        if (nOldBandMapSize < nBandCount)
-        {
-            for (int i = nOldBandMapSize; i < nBandCount; ++i)
-                m_poPrivate->m_anBandMap.push_back(i + 1);
-        }
+        CPLAssert(static_cast<int>(m_poPrivate->m_anBandMap.size()) == nBands);
         panBandMap = m_poPrivate->m_anBandMap.data();
     }
 
@@ -3232,7 +3238,7 @@ char **GDALDataset::GetFileList()
     const GDALAntiRecursionStruct::DatasetContext datasetCtxt(osMainFilename, 0,
                                                               std::string());
     auto &aosDatasetList = sAntiRecursion.aosDatasetNamesWithFlags;
-    if (aosDatasetList.find(datasetCtxt) != aosDatasetList.end())
+    if (cpl::contains(aosDatasetList, datasetCtxt))
         return nullptr;
 
     /* -------------------------------------------------------------------- */
@@ -3524,18 +3530,29 @@ static GDALDataset *GetSharedDS(const char *pszFilename,
  *     <li>GDAL_OF_VECTOR for vector drivers,</li>
  *     <li>GDAL_OF_GNM for Geographic Network Model drivers.</li>
  *    </ul>
- *    GDAL_OF_RASTER and GDAL_OF_MULTIDIM_RASTER are generally mutually
+ * GDAL_OF_RASTER and GDAL_OF_MULTIDIM_RASTER are generally mutually
  * exclusive. If none of the value is specified, GDAL_OF_RASTER | GDAL_OF_VECTOR
- * | GDAL_OF_GNM is implied.</li> <li>Access mode: GDAL_OF_READONLY
- * (exclusive)or GDAL_OF_UPDATE.</li> <li>Shared mode: GDAL_OF_SHARED. If set,
+ * | GDAL_OF_GNM is implied.
+ * </li>
+ * <li>Access mode: GDAL_OF_READONLY (exclusive)or GDAL_OF_UPDATE.
+ * </li>
+ * <li>Shared mode: GDAL_OF_SHARED. If set,
  * it allows the sharing of GDALDataset handles for a dataset with other callers
  * that have set GDAL_OF_SHARED. In particular, GDALOpenEx() will first consult
  * its list of currently open and shared GDALDataset's, and if the
  * GetDescription() name for one exactly matches the pszFilename passed to
  * GDALOpenEx() it will be referenced and returned, if GDALOpenEx() is called
- * from the same thread.</li> <li>Verbose error: GDAL_OF_VERBOSE_ERROR. If set,
+ * from the same thread.
+ * </li>
+ * <li>Thread safe mode: GDAL_OF_THREAD_SAFE (added in 3.10).
+ * This must be use in combination with GDAL_OF_RASTER, and is mutually
+ * exclusive with GDAL_OF_UPDATE, GDAL_OF_VECTOR, GDAL_OF_MULTIDIM_RASTER or
+ * GDAL_OF_GNM.
+ * </li>
+ * <li>Verbose error: GDAL_OF_VERBOSE_ERROR. If set,
  * a failed attempt to open the file will lead to an error message to be
- * reported.</li>
+ * reported.
+ * </li>
  * </ul>
  *
  * @param papszAllowedDrivers NULL to consider all candidate drivers, or a NULL
@@ -3574,6 +3591,33 @@ GDALDatasetH CPL_STDCALL GDALOpenEx(const char *pszFilename,
 {
     VALIDATE_POINTER1(pszFilename, "GDALOpen", nullptr);
 
+    // Do some sanity checks on incompatible flags with thread-safe mode.
+    if ((nOpenFlags & GDAL_OF_THREAD_SAFE) != 0)
+    {
+        const struct
+        {
+            int nFlag;
+            const char *pszFlagName;
+        } asFlags[] = {
+            {GDAL_OF_UPDATE, "GDAL_OF_UPDATE"},
+            {GDAL_OF_VECTOR, "GDAL_OF_VECTOR"},
+            {GDAL_OF_MULTIDIM_RASTER, "GDAL_OF_MULTIDIM_RASTER"},
+            {GDAL_OF_GNM, "GDAL_OF_GNM"},
+        };
+
+        for (const auto &asFlag : asFlags)
+        {
+            if ((nOpenFlags & asFlag.nFlag) != 0)
+            {
+                CPLError(CE_Failure, CPLE_IllegalArg,
+                         "GDAL_OF_THREAD_SAFE and %s are mutually "
+                         "exclusive",
+                         asFlag.pszFlagName);
+                return nullptr;
+            }
+        }
+    }
+
     // If no driver kind is specified, assume all are to be probed.
     if ((nOpenFlags & GDAL_OF_KIND_MASK) == 0)
         nOpenFlags |= GDAL_OF_KIND_MASK & ~GDAL_OF_MULTIDIM_RASTER;
@@ -3626,8 +3670,7 @@ GDALDatasetH CPL_STDCALL GDALOpenEx(const char *pszFilename,
         osAllowedDrivers += pszDriverName;
     auto dsCtxt = GDALAntiRecursionStruct::DatasetContext(
         std::string(pszFilename), nOpenFlags, osAllowedDrivers);
-    if (sAntiRecursion.aosDatasetNamesWithFlags.find(dsCtxt) !=
-        sAntiRecursion.aosDatasetNamesWithFlags.end())
+    if (cpl::contains(sAntiRecursion.aosDatasetNamesWithFlags, dsCtxt))
     {
         CPLError(CE_Failure, CPLE_AppDefined,
                  "GDALOpen() called on %s recursively", pszFilename);
@@ -3866,7 +3909,12 @@ GDALDatasetH CPL_STDCALL GDALOpenEx(const char *pszFilename,
                 }
                 else
                 {
-                    if (!(nOpenFlags & GDAL_OF_INTERNAL))
+                    // For thread-safe opening, currently poDS is what will be
+                    // the "master" dataset owned by the thread-safe dataset
+                    // returned to the user, hence we do not register it as a
+                    // visible one in the open dataset list, or mark it as shared.
+                    if (!(nOpenFlags & GDAL_OF_INTERNAL) &&
+                        !(nOpenFlags & GDAL_OF_THREAD_SAFE))
                     {
                         poDS->AddToDatasetOpenList();
                     }
@@ -3875,7 +3923,8 @@ GDALDatasetH CPL_STDCALL GDALOpenEx(const char *pszFilename,
                         CSLDestroy(poDS->papszOpenOptions);
                         poDS->papszOpenOptions = CSLDuplicate(papszOpenOptions);
                         poDS->nOpenFlags = nOpenFlags;
-                        poDS->MarkAsShared();
+                        if (!(nOpenFlags & GDAL_OF_THREAD_SAFE))
+                            poDS->MarkAsShared();
                     }
                 }
             }
@@ -3889,8 +3938,11 @@ GDALDatasetH CPL_STDCALL GDALOpenEx(const char *pszFilename,
                              "and description (%s)",
                              pszFilename, poDS->GetDescription());
                 }
-                else
+                else if (!(nOpenFlags & GDAL_OF_THREAD_SAFE))
                 {
+                    // For thread-safe opening, currently poDS is what will be
+                    // the "master" dataset owned by the thread-safe dataset
+                    // returned to the user, hence we do not or mark it as shared.
                     poDS->MarkAsShared();
                 }
             }
@@ -3908,6 +3960,29 @@ GDALDatasetH CPL_STDCALL GDALOpenEx(const char *pszFilename,
             }
 #endif
 
+            if (poDS)
+            {
+                poDS->m_bCanBeReopened = true;
+
+                if ((nOpenFlags & GDAL_OF_THREAD_SAFE) != 0)
+                {
+                    poDS =
+                        GDALGetThreadSafeDataset(
+                            std::unique_ptr<GDALDataset>(poDS), GDAL_OF_RASTER)
+                            .release();
+                    if (poDS)
+                    {
+                        poDS->m_bCanBeReopened = true;
+                        poDS->poDriver = poDriver;
+                        poDS->nOpenFlags = nOpenFlags;
+                        if (!(nOpenFlags & GDAL_OF_INTERNAL))
+                            poDS->AddToDatasetOpenList();
+                        if (nOpenFlags & GDAL_OF_SHARED)
+                            poDS->MarkAsShared();
+                    }
+                }
+            }
+
             return poDS;
         }
 
@@ -4592,6 +4667,7 @@ void GDALDataset::ReportErrorV(const char *pszDSName, CPLErr eErrClass,
 /************************************************************************/
 char **GDALDataset::GetMetadata(const char *pszDomain)
 {
+#ifndef WITHOUT_DERIVED
     if (pszDomain != nullptr && EQUAL(pszDomain, "DERIVED_SUBDATASETS"))
     {
         oDerivedMetadataList.Clear();
@@ -4644,6 +4720,7 @@ char **GDALDataset::GetMetadata(const char *pszDomain)
         }
         return oDerivedMetadataList.List();
     }
+#endif
 
     return GDALMajorObject::GetMetadata(pszDomain);
 }
@@ -8174,7 +8251,8 @@ bool GDALDataset::SetQueryLoggerFunc(CPL_UNUSED GDALQueryLoggerFunc callback,
 
 int GDALDataset::EnterReadWrite(GDALRWFlag eRWFlag)
 {
-    if (m_poPrivate == nullptr)
+    if (m_poPrivate == nullptr ||
+        IsThreadSafe(GDAL_OF_RASTER | (nOpenFlags & GDAL_OF_UPDATE)))
         return FALSE;
 
     if (m_poPrivate->poParentDataset)
@@ -10130,3 +10208,75 @@ CPLErr GDALDatasetReadCompressedData(GDALDatasetH hDS, const char *pszFormat,
         pszFormat, nXOff, nYOff, nXSize, nYSize, nBandCount, panBandList,
         ppBuffer, pnBufferSize, ppszDetailedFormat);
 }
+
+/************************************************************************/
+/*                           CanBeCloned()                              */
+/************************************************************************/
+
+//! @cond Doxygen_Suppress
+
+/** This method is called by GDALThreadSafeDataset::Create() to determine if
+ * it is possible to create a thread-safe wrapper for a dataset, which involves
+ * the ability to Clone() it.
+ *
+ * Implementations of this method must be thread-safe.
+ *
+ * @param nScopeFlags Combination of GDAL_OF_RASTER, GDAL_OF_VECTOR, etc. flags,
+ *                    expressing the intended use for thread-safety.
+ *                    Currently, the only valid scope is in the base
+ *                    implementation is GDAL_OF_RASTER.
+ * @param bCanShareState Determines if cloned datasets are allowed to share
+ *                       state with the dataset they have been cloned from.
+ *                       If set to true, the dataset from which they have been
+ *                       cloned from must remain opened during the lifetime of
+ *                       its clones.
+ * @return true if the Clone() method is expected to succeed with the same values
+ *         of nScopeFlags and bCanShareState.
+ */
+bool GDALDataset::CanBeCloned(int nScopeFlags,
+                              [[maybe_unused]] bool bCanShareState) const
+{
+    return m_bCanBeReopened && nScopeFlags == GDAL_OF_RASTER;
+}
+
+//! @endcond
+
+/************************************************************************/
+/*                               Clone()                                */
+/************************************************************************/
+
+//! @cond Doxygen_Suppress
+
+/** This method "clones" the current dataset, that is it returns a new instance
+ * that is opened on the same underlying "file".
+ *
+ * The base implementation uses GDALDataset::Open() to re-open the dataset.
+ * The MEM driver has a specialized implementation that returns a new instance,
+ * but which shares the same memory buffer as this.
+ *
+ * Implementations of this method must be thread-safe.
+ *
+ * @param nScopeFlags Combination of GDAL_OF_RASTER, GDAL_OF_VECTOR, etc. flags,
+ *                    expressing the intended use for thread-safety.
+ *                    Currently, the only valid scope is in the base
+ *                    implementation is GDAL_OF_RASTER.
+ * @param bCanShareState Determines if cloned datasets are allowed to share
+ *                       state with the dataset they have been cloned from.
+ *                       If set to true, the dataset from which they have been
+ *                       cloned from must remain opened during the lifetime of
+ *                       its clones.
+ * @return a new instance, or nullptr in case of error.
+ */
+std::unique_ptr<GDALDataset>
+GDALDataset::Clone(int nScopeFlags, [[maybe_unused]] bool bCanShareState) const
+{
+    CPLStringList aosAllowedDrivers;
+    if (poDriver)
+        aosAllowedDrivers.AddString(poDriver->GetDescription());
+    return std::unique_ptr<GDALDataset>(GDALDataset::Open(
+        GetDescription(),
+        nScopeFlags | GDAL_OF_INTERNAL | GDAL_OF_VERBOSE_ERROR,
+        aosAllowedDrivers.List(), papszOpenOptions));
+}
+
+//! @endcond
diff --git a/gcore/gdaldefaultasync.cpp b/gcore/gdaldefaultasync.cpp
index 09666760d254..05876b4cd14b 100644
--- a/gcore/gdaldefaultasync.cpp
+++ b/gcore/gdaldefaultasync.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/gcore/gdaldefaultoverviews.cpp b/gcore/gdaldefaultoverviews.cpp
index 4cefd3a73b1c..3860f0d32a6f 100644
--- a/gcore/gdaldefaultoverviews.cpp
+++ b/gcore/gdaldefaultoverviews.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2000, 2007, Frank Warmerdam
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -121,7 +105,8 @@ int GDALDefaultOverviews::IsInitialized()
 
 void GDALDefaultOverviews::Initialize(GDALDataset *poDSIn,
                                       const char *pszBasename,
-                                      char **papszSiblingFiles, int bNameIsOVR)
+                                      CSLConstList papszSiblingFiles,
+                                      bool bNameIsOVR)
 
 {
     poDS = poDSIn;
@@ -149,7 +134,7 @@ void GDALDefaultOverviews::Initialize(GDALDataset *poDSIn,
     pszInitName = nullptr;
     if (pszBasename != nullptr)
         pszInitName = CPLStrdup(pszBasename);
-    bInitNameIsOVR = CPL_TO_BOOL(bNameIsOVR);
+    bInitNameIsOVR = bNameIsOVR;
 
     CSLDestroy(papszInitSiblingFiles);
     papszInitSiblingFiles = nullptr;
@@ -157,6 +142,33 @@ void GDALDefaultOverviews::Initialize(GDALDataset *poDSIn,
         papszInitSiblingFiles = CSLDuplicate(papszSiblingFiles);
 }
 
+/************************************************************************/
+/*                             Initialize()                             */
+/************************************************************************/
+
+/** Initialize the GDALDefaultOverviews instance.
+ *
+ * @param poDSIn Base dataset.
+ * @param poOpenInfo Open info instance. Must not be NULL.
+ * @param pszName Base dataset name. If set to NULL, poOpenInfo->pszFilename is
+ *                used.
+ * @param bTransferSiblingFilesIfLoaded Whether sibling files of poOpenInfo
+ *                                      should be transferred to this
+ *                                      GDALDefaultOverviews instance, if they
+ *                                      have bean already loaded.
+ * @since 3.10
+ */
+void GDALDefaultOverviews::Initialize(GDALDataset *poDSIn,
+                                      GDALOpenInfo *poOpenInfo,
+                                      const char *pszName,
+                                      bool bTransferSiblingFilesIfLoaded)
+{
+    Initialize(poDSIn, pszName ? pszName : poOpenInfo->pszFilename);
+
+    if (bTransferSiblingFilesIfLoaded && poOpenInfo->AreSiblingFilesLoaded())
+        TransferSiblingFiles(poOpenInfo->StealSiblingFiles());
+}
+
 /************************************************************************/
 /*                         TransferSiblingFiles()                       */
 /*                                                                      */
@@ -823,6 +835,11 @@ CPLErr GDALDefaultOverviews::BuildOverviews(
         pScaledOverviewWithoutMask);
     if (bOvrIsAux)
     {
+#ifdef NO_HFA_SUPPORT
+        CPLError(CE_Failure, CPLE_NotSupported,
+                 "This build does not support creating .aux overviews");
+        eErr = CE_Failure;
+#else
         if (nNewOverviews == 0)
         {
             /* if we call HFAAuxBuildOverviews() with nNewOverviews == 0 */
@@ -845,6 +862,7 @@ CPLErr GDALDefaultOverviews::BuildOverviews(
             if (abValidLevel[j])
                 abRequireRefresh[j] = true;
         }
+#endif
     }
 
     /* -------------------------------------------------------------------- */
@@ -859,6 +877,7 @@ CPLErr GDALDefaultOverviews::BuildOverviews(
             poODS = nullptr;
         }
 
+#ifdef HAVE_TIFF
         eErr = GTIFFBuildOverviews(
             osOvrFilename, nBands, pahBands, nNewOverviews, panNewOverviewList,
             pszResampling, GDALScaledProgress, pScaledProgress, papszOptions);
@@ -886,6 +905,11 @@ CPLErr GDALDefaultOverviews::BuildOverviews(
             if (poODS == nullptr)
                 eErr = CE_Failure;
         }
+#else
+        CPLError(CE_Failure, CPLE_NotSupported,
+                 "Cannot build TIFF overviews due to GeoTIFF driver missing");
+        eErr = CE_Failure;
+#endif
     }
 
     GDALDestroyScaledProgress(pScaledProgress);
diff --git a/gcore/gdaldllmain.cpp b/gcore/gdaldllmain.cpp
index 3b14aeeeab5a..0678f7213996 100644
--- a/gcore/gdaldllmain.cpp
+++ b/gcore/gdaldllmain.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2010, Mateusz Loskot <mateusz@loskot.net>
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/gcore/gdaldriver.cpp b/gcore/gdaldriver.cpp
index e44cdeae2904..728ded9e90e1 100644
--- a/gcore/gdaldriver.cpp
+++ b/gcore/gdaldriver.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, 2000, Frank Warmerdam
  * Copyright (c) 2007-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -123,7 +107,13 @@ GDALDataset *GDALDriver::Open(GDALOpenInfo *poOpenInfo, bool bSetOpenOptions)
 
     if (poDS)
     {
-        poDS->nOpenFlags = poOpenInfo->nOpenFlags & ~GDAL_OF_FROM_GDALOPEN;
+        // Only set GDAL_OF_THREAD_SAFE if the driver itself has set it in
+        // poDS->nOpenFlags
+        int nOpenFlags = poOpenInfo->nOpenFlags &
+                         ~(GDAL_OF_FROM_GDALOPEN | GDAL_OF_THREAD_SAFE);
+        if (poDS->nOpenFlags & GDAL_OF_THREAD_SAFE)
+            nOpenFlags |= GDAL_OF_THREAD_SAFE;
+        poDS->nOpenFlags = nOpenFlags;
 
         if (strlen(poDS->GetDescription()) == 0)
             poDS->SetDescription(poOpenInfo->pszFilename);
@@ -851,8 +841,16 @@ GDALDataset *GDALDriver::DefaultCreateCopy(const char *pszFilename,
     /*      Copy image data.                                                */
     /* -------------------------------------------------------------------- */
     if (eErr == CE_None && nDstBands > 0)
-        eErr = GDALDatasetCopyWholeRaster(poSrcDS, poDstDS, nullptr,
-                                          pfnProgress, pProgressData);
+    {
+        const char *const apszCopyRasterOptionsSkipHoles[] = {"SKIP_HOLES=YES",
+                                                              nullptr};
+        const bool bSkipHoles = CPLTestBool(
+            CSLFetchNameValueDef(papszOptions, "SKIP_HOLES", "FALSE"));
+        eErr = GDALDatasetCopyWholeRaster(
+            poSrcDS, poDstDS,
+            bSkipHoles ? apszCopyRasterOptionsSkipHoles : nullptr, pfnProgress,
+            pProgressData);
+    }
 
     /* -------------------------------------------------------------------- */
     /*      Should we copy some masks over?                                 */
@@ -1018,7 +1016,7 @@ CPLErr GDALDriver::QuietDeleteForCreateCopy(const char *pszFilename,
          */
         std::set<std::string> oSetExistingDestFiles;
         {
-            CPLPushErrorHandler(CPLQuietErrorHandler);
+            CPLErrorStateBackuper oErrorStateBackuper(CPLQuietErrorHandler);
             const char *const apszAllowedDrivers[] = {GetDescription(),
                                                       nullptr};
             auto poExistingOutputDS =
@@ -1033,7 +1031,6 @@ CPLErr GDALDriver::QuietDeleteForCreateCopy(const char *pszFilename,
                         CPLString(pszFileInList).replaceAll('\\', '/'));
                 }
             }
-            CPLPopErrorHandler();
         }
 
         /* --------------------------------------------------------------------
@@ -1045,7 +1042,7 @@ CPLErr GDALDriver::QuietDeleteForCreateCopy(const char *pszFilename,
         std::set<std::string> oSetExistingDestFilesFoundInSource;
         if (!oSetExistingDestFiles.empty())
         {
-            CPLPushErrorHandler(CPLQuietErrorHandler);
+            CPLErrorStateBackuper oErrorStateBackuper(CPLQuietErrorHandler);
             // We need to reopen in a temporary dataset for the particular
             // case of overwritten a .tif.ovr file from a .tif
             // If we probe the file list of the .tif, it will then open the
@@ -1064,14 +1061,12 @@ CPLErr GDALDriver::QuietDeleteForCreateCopy(const char *pszFilename,
                 {
                     CPLString osFilename(pszFileInList);
                     osFilename.replaceAll('\\', '/');
-                    if (oSetExistingDestFiles.find(osFilename) !=
-                        oSetExistingDestFiles.end())
+                    if (cpl::contains(oSetExistingDestFiles, osFilename))
                     {
                         oSetExistingDestFilesFoundInSource.insert(osFilename);
                     }
                 }
             }
-            CPLPopErrorHandler();
         }
 
         // If the source file(s) and the dest one share some files in
@@ -1080,8 +1075,8 @@ CPLErr GDALDriver::QuietDeleteForCreateCopy(const char *pszFilename,
         {
             for (const std::string &osFilename : oSetExistingDestFiles)
             {
-                if (oSetExistingDestFilesFoundInSource.find(osFilename) ==
-                    oSetExistingDestFilesFoundInSource.end())
+                if (!cpl::contains(oSetExistingDestFilesFoundInSource,
+                                   osFilename))
                 {
                     VSIUnlink(osFilename.c_str());
                 }
@@ -1466,7 +1461,7 @@ bool GDALDriver::CanVectorTranslateFrom(
     if (!ppapszFailureReasons)
     {
         for (const char *pszReason :
-             cpl::Iterate(CSLConstList(papszFailureReasons)))
+             cpl::Iterate(static_cast<CSLConstList>(papszFailureReasons)))
         {
             CPLDebug("GDAL", "%s", pszReason);
         }
@@ -2127,10 +2122,11 @@ int CPL_STDCALL GDALValidateCreationOptions(GDALDriverH hDriver,
     osDriver.Printf("driver %s",
                     GDALDriver::FromHandle(hDriver)->GetDescription());
     bool bFoundOptionToRemove = false;
+    constexpr const char *const apszExcludedOptions[] = {
+        "APPEND_SUBDATASET", "COPY_SRC_MDD", "SRC_MDD", "SKIP_HOLES"};
     for (const char *pszCO : cpl::Iterate(papszCreationOptions))
     {
-        for (const char *pszExcludedOptions :
-             {"APPEND_SUBDATASET", "COPY_SRC_MDD", "SRC_MDD"})
+        for (const char *pszExcludedOptions : apszExcludedOptions)
         {
             if (STARTS_WITH_CI(pszCO, pszExcludedOptions) &&
                 pszCO[strlen(pszExcludedOptions)] == '=')
@@ -2149,8 +2145,7 @@ int CPL_STDCALL GDALValidateCreationOptions(GDALDriverH hDriver,
         for (const char *pszCO : cpl::Iterate(papszCreationOptions))
         {
             bool bMatch = false;
-            for (const char *pszExcludedOptions :
-                 {"APPEND_SUBDATASET", "COPY_SRC_MDD", "SRC_MDD"})
+            for (const char *pszExcludedOptions : apszExcludedOptions)
             {
                 if (STARTS_WITH_CI(pszCO, pszExcludedOptions) &&
                     pszCO[strlen(pszExcludedOptions)] == '=')
diff --git a/gcore/gdaldrivermanager.cpp b/gcore/gdaldrivermanager.cpp
index 9fa1b97e6669..5c6a9c0fe457 100644
--- a/gcore/gdaldrivermanager.cpp
+++ b/gcore/gdaldrivermanager.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, Frank Warmerdam
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -367,6 +351,26 @@ int GDALDriverManager::GetDriverCount(bool bIncludeHidden) const
 
 //! @endcond
 
+/************************************************************************/
+/*                            IsKnownDriver()                           */
+/************************************************************************/
+
+//! @cond Doxygen_Suppress
+bool GDALDriverManager::IsKnownDriver(const char *pszDriverName) const
+{
+    CPLMutexHolderD(&hDMMutex);
+    if (cpl::contains(oMapNameToDrivers, CPLString(pszDriverName).toupper()))
+        return true;
+    for (const auto &poDriver : m_aoHiddenDrivers)
+    {
+        if (EQUAL(poDriver->GetDescription(), pszDriverName))
+            return true;
+    }
+    return false;
+}
+
+//! @endcond
+
 /************************************************************************/
 /*                         GDALGetDriverCount()                         */
 /************************************************************************/
@@ -525,10 +529,11 @@ int GDALDriverManager::RegisterDriver(GDALDriver *poDriver, bool bHidden)
     if (poDriver->pfnVectorTranslateFrom != nullptr)
         poDriver->SetMetadataItem(GDAL_DCAP_VECTOR_TRANSLATE_FROM, "YES");
 
-    if (m_bInDeferredDriverLoading)
+    if (m_bInDeferredDriverLoading &&
+        cpl::contains(oMapNameToDrivers,
+                      CPLString(poDriver->GetDescription()).toupper()))
     {
-        if (m_oMapRealDrivers.find(poDriver->GetDescription()) !=
-            m_oMapRealDrivers.end())
+        if (cpl::contains(m_oMapRealDrivers, poDriver->GetDescription()))
         {
             CPLError(
                 CE_Failure, CPLE_AppDefined,
@@ -1032,8 +1037,7 @@ void GDALDriverManager::AutoLoadDrivers()
                 continue;
             }
 
-            if (m_oSetPluginFileNames.find(papszFiles[iFile]) !=
-                m_oSetPluginFileNames.end())
+            if (cpl::contains(m_oSetPluginFileNames, papszFiles[iFile]))
             {
                 continue;
             }
@@ -1157,14 +1161,12 @@ void GDALDriverManager::ReorderDrivers()
         {
             CPLString osUCDriverName(pszLine);
             osUCDriverName.toupper();
-            if (oSetOrderedDrivers.find(osUCDriverName) !=
-                oSetOrderedDrivers.end())
+            if (cpl::contains(oSetOrderedDrivers, osUCDriverName))
             {
                 CPLError(CE_Warning, CPLE_AppDefined,
                          "Duplicated name %s in [order] section", pszLine);
             }
-            else if (oMapNameToDrivers.find(osUCDriverName) !=
-                     oMapNameToDrivers.end())
+            else if (cpl::contains(oMapNameToDrivers, osUCDriverName))
             {
                 aosOrderedDrivers.emplace_back(pszLine);
                 oSetOrderedDrivers.insert(osUCDriverName);
@@ -1189,8 +1191,7 @@ void GDALDriverManager::ReorderDrivers()
     for (int i = 0; i < nDrivers; ++i)
     {
         const char *pszName = papoDrivers[i]->GetDescription();
-        if (oSetOrderedDrivers.find(CPLString(pszName).toupper()) ==
-            oSetOrderedDrivers.end())
+        if (!cpl::contains(oSetOrderedDrivers, CPLString(pszName).toupper()))
         {
             // Could happen for a private plugin
             CPLDebug("GDAL",
@@ -1342,7 +1343,7 @@ const char *GDALPluginDriverProxy::GetMetadataItem(const char *pszName,
             }
             return pszValue;
         }
-        else if (m_oSetMetadataItems.find(pszName) != m_oSetMetadataItems.end())
+        else if (cpl::contains(m_oSetMetadataItems, pszName))
         {
             return GDALDriver::GetMetadataItem(pszName, pszDomain);
         }
diff --git a/gcore/gdalexif.cpp b/gcore/gdalexif.cpp
index ac8b543f1bee..e4dd9fef210e 100644
--- a/gcore/gdalexif.cpp
+++ b/gcore/gdalexif.cpp
@@ -11,23 +11,7 @@
  * Portions Copyright (c) Her majesty the Queen in right of Canada as
  * represented by the Minister of National Defence, 2006.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -35,6 +19,7 @@
 #include "gdalexif.h"
 
 #include <climits>
+#include <cmath>
 #include <cstddef>
 #include <cstdio>
 #include <cstring>
@@ -266,6 +251,11 @@ static const struct intr_tag
     {0x1002, "EXIF_Related_Image_Length"},
     {0x0000, ""}};
 
+static const EXIFTagDesc IFD0Tags[] = {
+    {0xC614, TIFF_ASCII, 0, "DNG_UniqueCameraModel", COND_OPTIONAL},
+    {0xC62F, TIFF_ASCII, 0, "DNG_CameraSerialNumber", COND_OPTIONAL},
+    {0x0000, TIFF_NOTYPE, 0, "", COND_NOT_ALLOWED}};
+
 /************************************************************************/
 /*                         EXIFPrintData()                              */
 /************************************************************************/
@@ -311,6 +301,10 @@ static void EXIFPrintData(char *pszData, GUInt16 type, GUInt32 count,
 
         case TIFF_ASCII:
             memcpy(pszData, data, count);
+            // Strip trailing spaces or nul characters
+            while (count > 0 &&
+                   (pszData[count - 1] == ' ' || pszData[count - 1] == 0))
+                --count;
             pszData[count] = '\0';
             break;
 
@@ -597,6 +591,20 @@ CPLErr EXIFExtractMetadata(char **&papszMetadata, void *fpInL, int nOffset,
             }
         }
 
+        if (szName[0] == 0)
+        {
+            for (const EXIFTagDesc *poTag = IFD0Tags; poTag->tag; poTag++)
+            {
+                if (poTag->tag == poTIFFDirEntry->tdir_tag)
+                {
+                    CPLAssert(nullptr != poTag->name);
+
+                    CPLStrlcpy(szName, poTag->name, sizeof(szName));
+                    break;
+                }
+            }
+        }
+
         if (nOffset == nGPSOffset)
         {
             for (const EXIFTagDesc *poGPSTags = gpstags;
@@ -638,24 +646,31 @@ CPLErr EXIFExtractMetadata(char **&papszMetadata, void *fpInL, int nOffset,
         if (poTIFFDirEntry->tdir_offset < INT_MAX)
         {
             if (poTIFFDirEntry->tdir_tag == EXIFOFFSETTAG)
+            {
                 nExifOffset = poTIFFDirEntry->tdir_offset;
+                continue;
+            }
             else if (poTIFFDirEntry->tdir_tag == INTEROPERABILITYOFFSET)
+            {
                 nInterOffset = poTIFFDirEntry->tdir_offset;
+                continue;
+            }
             else if (poTIFFDirEntry->tdir_tag == GPSOFFSETTAG)
+            {
                 nGPSOffset = poTIFFDirEntry->tdir_offset;
+                continue;
+            }
         }
 
-        /* --------------------------------------------------------------------
-         */
-        /*      If we didn't recognise the tag just ignore it.  To see all */
-        /*      tags comment out the continue. */
-        /* --------------------------------------------------------------------
-         */
+        /* ----------------------------------------------------------------- */
+        /*      If we didn't recognise the tag, report it as CPLDebug()      */
+        /* ----------------------------------------------------------------- */
+        bool bUnknownTag = false;
         if (szName[0] == '\0')
         {
             snprintf(szName, sizeof(szName), "EXIF_%u",
                      poTIFFDirEntry->tdir_tag);
-            continue;
+            bUnknownTag = true;
         }
 
         vsi_l_offset nTagValueOffset = poTIFFDirEntry->tdir_offset;
@@ -841,7 +856,10 @@ CPLErr EXIFExtractMetadata(char **&papszMetadata, void *fpInL, int nOffset,
                      static_cast<long>(space));
         }
 
-        papszMetadata = CSLSetNameValue(papszMetadata, szName, szTemp);
+        if (bUnknownTag)
+            CPLDebug("EXIF", "Ignoring %s=%s", szName, szTemp);
+        else
+            papszMetadata = CSLSetNameValue(papszMetadata, szName, szTemp);
     }
     CPLFree(poTIFFDir);
 
@@ -983,7 +1001,7 @@ static bool GetNumDenomFromDouble(GDALEXIFTIFFDataType datatype, double dfVal,
 {
     nNum = 0;
     nDenom = 1;
-    if (CPLIsNan(dfVal))
+    if (std::isnan(dfVal))
     {
         return false;
     }
diff --git a/gcore/gdalexif.h b/gcore/gdalexif.h
index 45c853d8eb60..4ee676c77999 100644
--- a/gcore/gdalexif.h
+++ b/gcore/gdalexif.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2000, Frank Warmerdam
  * Copyright (c) 2017, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 //! @cond Doxygen_Suppress
diff --git a/gcore/gdalgeorefpamdataset.cpp b/gcore/gdalgeorefpamdataset.cpp
index f09a6e9c94de..5d5054ee1257 100644
--- a/gcore/gdalgeorefpamdataset.cpp
+++ b/gcore/gdalgeorefpamdataset.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdalgeorefpamdataset.h"
@@ -139,7 +123,7 @@ const char *GDALGeorefPamDataset::GetMetadataItem(const char *pszName,
 /*                           TryLoadXML()                              */
 /************************************************************************/
 
-CPLErr GDALGeorefPamDataset::TryLoadXML(char **papszSiblingFiles)
+CPLErr GDALGeorefPamDataset::TryLoadXML(CSLConstList papszSiblingFiles)
 {
     m_bPAMLoaded = true;
     CPLErr eErr = GDALPamDataset::TryLoadXML(papszSiblingFiles);
diff --git a/gcore/gdalgeorefpamdataset.h b/gcore/gdalgeorefpamdataset.h
index 4911f4c57e8b..c25aa95b73dc 100644
--- a/gcore/gdalgeorefpamdataset.h
+++ b/gcore/gdalgeorefpamdataset.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_GEOREF_PAM_DATASET_H_INCLUDED
@@ -65,7 +49,7 @@ class CPL_DLL GDALGeorefPamDataset : public GDALPamDataset
     GDALGeorefPamDataset();
     ~GDALGeorefPamDataset() override;
 
-    CPLErr TryLoadXML(char **papszSiblingFiles = nullptr) override;
+    CPLErr TryLoadXML(CSLConstList papszSiblingFiles = nullptr) override;
 
     CPLErr GetGeoTransform(double *) override;
 
diff --git a/gcore/gdalhashsetbandblockcache.cpp b/gcore/gdalhashsetbandblockcache.cpp
index 6216eff40789..af321c876d51 100644
--- a/gcore/gdalhashsetbandblockcache.cpp
+++ b/gcore/gdalhashsetbandblockcache.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2010, Tamas Szekeres
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot org>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/gcore/gdaljp2abstractdataset.cpp b/gcore/gdaljp2abstractdataset.cpp
index fc63d9e28578..7e6923db73eb 100644
--- a/gcore/gdaljp2abstractdataset.cpp
+++ b/gcore/gdaljp2abstractdataset.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -224,8 +208,8 @@ void GDALJP2AbstractDataset::LoadJP2Metadata(GDALOpenInfo *poOpenInfo,
             GDALMultiDomainMetadata oLocalMDMD;
             oLocalMDMD.XMLInit(psXMLNode, FALSE);
             GDALDataset::SetMetadata(oLocalMDMD.GetMetadata());
-            for (const char *pszDomain :
-                 cpl::Iterate(CSLConstList(oLocalMDMD.GetDomainList())))
+            for (const char *pszDomain : cpl::Iterate(
+                     static_cast<CSLConstList>(oLocalMDMD.GetDomainList())))
             {
                 if (!EQUAL(pszDomain, "") &&
                     !EQUAL(pszDomain, "IMAGE_STRUCTURE"))
@@ -368,6 +352,8 @@ void GDALJP2AbstractDataset::LoadVectorLayers(int bOpenRemoteResources)
         return;
     }
 
+    const std::string osTmpDir = VSIMemGenerateHiddenFilename("gmljp2");
+
     // Find feature collections.
     int nLayersAtCC = 0;
     int nLayersAtGC = 0;
@@ -451,7 +437,8 @@ void GDALJP2AbstractDataset::LoadVectorLayers(int bOpenRemoteResources)
 
             if (psFC != nullptr)
             {
-                osGMLTmpFile = CPLSPrintf("/vsimem/gmljp2_%p/my.gml", this);
+                osGMLTmpFile =
+                    CPLFormFilename(osTmpDir.c_str(), "my.gml", nullptr);
                 // Create temporary .gml file.
                 CPLSerializeXMLTreeToFile(psFC, osGMLTmpFile);
             }
@@ -486,8 +473,8 @@ void GDALJP2AbstractDataset::LoadVectorLayers(int bOpenRemoteResources)
                                     CPLSPrintf("xml:%s", pszBoxName));
                                 if (papszBoxData != nullptr)
                                 {
-                                    osXSDTmpFile = CPLSPrintf(
-                                        "/vsimem/gmljp2_%p/my.xsd", this);
+                                    osXSDTmpFile = CPLFormFilename(
+                                        osTmpDir.c_str(), "my.xsd", nullptr);
                                     CPL_IGNORE_RET_VAL(
                                         VSIFCloseL(VSIFileFromMemBuffer(
                                             osXSDTmpFile,
@@ -551,7 +538,7 @@ void GDALJP2AbstractDataset::LoadVectorLayers(int bOpenRemoteResources)
                          "No GML driver found to read feature collection");
             }
 
-            VSIRmdirRecursive(CPLSPrintf("/vsimem/gmljp2_%p", this));
+            VSIRmdirRecursive(osTmpDir.c_str());
         }
     }
 
@@ -589,8 +576,8 @@ void GDALJP2AbstractDataset::LoadVectorLayers(int bOpenRemoteResources)
 
             // Create temporary .kml file.
             CPLXMLNode *const psKML = psGCorGMLJP2FeaturesChildIter->psChild;
-            CPLString osKMLTmpFile(
-                CPLSPrintf("/vsimem/gmljp2_%p_my.kml", this));
+            const CPLString osKMLTmpFile(
+                VSIMemGenerateHiddenFilename("my.kml"));
             CPLSerializeXMLTreeToFile(psKML, osKMLTmpFile);
 
             GDALDatasetUniquePtr poTmpDS(GDALDataset::Open(
diff --git a/gcore/gdaljp2abstractdataset.h b/gcore/gdaljp2abstractdataset.h
index ff4391ca39e7..c59d2089fef0 100644
--- a/gcore/gdaljp2abstractdataset.h
+++ b/gcore/gdaljp2abstractdataset.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_JP2_ABSTRACT_DATASET_H_INCLUDED
diff --git a/gcore/gdaljp2box.cpp b/gcore/gdaljp2box.cpp
index fea752437d5f..d4495cce3746 100644
--- a/gcore/gdaljp2box.cpp
+++ b/gcore/gdaljp2box.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2010-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/gcore/gdaljp2metadata.cpp b/gcore/gdaljp2metadata.cpp
index 139c6940c27b..e3f6442b2caa 100644
--- a/gcore/gdaljp2metadata.cpp
+++ b/gcore/gdaljp2metadata.cpp
@@ -11,23 +11,7 @@
  * Copyright (c) 2010-2015, Even Rouault <even dot rouault at spatialys dot com>
  * Copyright (c) 2015, European Union Satellite Centre
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -52,12 +36,14 @@
 #include "cpl_string.h"
 #include "cpl_minixml.h"
 #include "gdaljp2metadatagenerator.h"
+#ifdef HAVE_TIFF
 #include "gt_wkt_srs_for_gdal.h"
+#endif
 #include "ogr_api.h"
 #include "ogr_core.h"
 #include "ogr_geometry.h"
 #include "ogr_spatialref.h"
-#include "ogrgeojsonreader.h"
+#include "ogrlibjsonutils.h"
 
 /*! @cond Doxygen_Suppress */
 
@@ -185,10 +171,8 @@ int GDALJP2Metadata::ReadAndParse(VSILFILE *fpLL, int nGEOJP2Index,
         aoSetPriorities.insert(nGMLJP2Index);
     if (nMSIGIndex >= 0)
         aoSetPriorities.insert(nMSIGIndex);
-    std::set<int>::iterator oIter = aoSetPriorities.begin();
-    for (; oIter != aoSetPriorities.end(); ++oIter)
+    for (const int nIndex : aoSetPriorities)
     {
-        int nIndex = *oIter;
         if ((nIndex == nGEOJP2Index && ParseJP2GeoTIFF()) ||
             (nIndex == nGMLJP2Index && ParseGMLCoverageDesc()) ||
             (nIndex == nMSIGIndex && ParseMSIG()))
@@ -582,6 +566,7 @@ int GDALJP2Metadata::ReadBoxes(VSILFILE *fpVSIL)
 int GDALJP2Metadata::ParseJP2GeoTIFF()
 
 {
+#ifdef HAVE_TIFF
     if (!CPLTestBool(CPLGetConfigOption("GDAL_USE_GEOJP2", "TRUE")))
         return FALSE;
 
@@ -693,6 +678,9 @@ int GDALJP2Metadata::ParseJP2GeoTIFF()
     }
 
     return iBestIndex >= 0;
+#else
+    return false;
+#endif
 }
 
 /************************************************************************/
@@ -1225,6 +1213,7 @@ void GDALJP2Metadata::SetRPCMD(char **papszRPCMDIn)
 GDALJP2Box *GDALJP2Metadata::CreateJP2GeoTIFF()
 
 {
+#ifdef HAVE_TIFF
     /* -------------------------------------------------------------------- */
     /*      Prepare the memory buffer containing the degenerate GeoTIFF     */
     /*      file.                                                           */
@@ -1250,6 +1239,9 @@ GDALJP2Box *GDALJP2Metadata::CreateJP2GeoTIFF()
     CPLFree(pabyGTBuf);
 
     return poBox;
+#else
+    return nullptr;
+#endif
 }
 
 /************************************************************************/
@@ -2595,6 +2587,8 @@ GDALJP2Box *GDALJP2Metadata::CreateGMLJP2V2(int nXSize, int nYSize,
         "</gmljp2:GMLJP2CoverageCollection>\n",
         osRootGMLId.c_str(), osGridCoverage.c_str());
 
+    const std::string osTmpDir = VSIMemGenerateHiddenFilename("gmljp2");
+
     /* -------------------------------------------------------------------- */
     /*      Process metadata, annotations and features collections.         */
     /* -------------------------------------------------------------------- */
@@ -2758,7 +2752,7 @@ GDALJP2Box *GDALJP2Metadata::CreateGMLJP2V2(int nXSize, int nYSize,
                     if (hSrcDS)
                     {
                         CPLString osTmpFile =
-                            CPLSPrintf("/vsimem/gmljp2_%p/%d/%s.gml", this, i,
+                            CPLSPrintf("%s/%d/%s.gml", osTmpDir.c_str(), i,
                                        CPLGetBasename(aoGMLFiles[i].osFile));
                         char **papszOptions = nullptr;
                         papszOptions =
@@ -2866,7 +2860,7 @@ GDALJP2Box *GDALJP2Metadata::CreateGMLJP2V2(int nXSize, int nYSize,
                     !aoGMLFiles[i].osRemoteResource.empty())
                 {
                     osTmpFile =
-                        CPLSPrintf("/vsimem/gmljp2_%p/%d/%s.gml", this, i,
+                        CPLSPrintf("%s/%d/%s.gml", osTmpDir.c_str(), i,
                                    CPLGetBasename(aoGMLFiles[i].osFile));
 
                     GMLJP2V2BoxDesc oDesc;
@@ -3046,7 +3040,7 @@ GDALJP2Box *GDALJP2Metadata::CreateGMLJP2V2(int nXSize, int nYSize,
                 if (hSrcDS)
                 {
                     CPLString osTmpFile =
-                        CPLSPrintf("/vsimem/gmljp2_%p/%d/%s.kml", this, i,
+                        CPLSPrintf("%s/%d/%s.kml", osTmpDir.c_str(), i,
                                    CPLGetBasename(aoAnnotations[i].osFile));
                     char **papszOptions = nullptr;
                     if (aoAnnotations.size() > 1)
@@ -3262,7 +3256,7 @@ GDALJP2Box *GDALJP2Metadata::CreateGMLJP2V2(int nXSize, int nYSize,
     for (auto &poGMLBox : apoGMLBoxes)
         delete poGMLBox;
 
-    VSIRmdirRecursive(CPLSPrintf("/vsimem/gmljp2_%p", this));
+    VSIRmdirRecursive(osTmpDir.c_str());
 
     return poGMLData;
 }
diff --git a/gcore/gdaljp2metadata.h b/gcore/gdaljp2metadata.h
index f25635ca2998..26c287f5d466 100644
--- a/gcore/gdaljp2metadata.h
+++ b/gcore/gdaljp2metadata.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_JP2READER_H_INCLUDED
diff --git a/gcore/gdaljp2metadatagenerator.cpp b/gcore/gdaljp2metadatagenerator.cpp
index ed447a3c0eac..3534381adcd0 100644
--- a/gcore/gdaljp2metadatagenerator.cpp
+++ b/gcore/gdaljp2metadatagenerator.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015, European Union Satellite Centre
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/gcore/gdaljp2metadatagenerator.h b/gcore/gdaljp2metadatagenerator.h
index d005f91b6247..dfb6368f1206 100644
--- a/gcore/gdaljp2metadatagenerator.h
+++ b/gcore/gdaljp2metadatagenerator.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2015, European Union Satellite Centre
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_JP2METADATA_GENERATOR_H_INCLUDED
diff --git a/gcore/gdaljp2structure.cpp b/gcore/gdaljp2structure.cpp
index b3ae58eba05f..44a338f649f9 100644
--- a/gcore/gdaljp2structure.cpp
+++ b/gcore/gdaljp2structure.cpp
@@ -7,28 +7,13 @@
  ******************************************************************************
  * Copyright (c) 2015, European Union (European Environment Agency)
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
 #include "gdaljp2metadata.h"
 
+#include <algorithm>
 #include <cmath>
 #include <cstring>
 #if HAVE_FCNTL_H
@@ -250,8 +235,7 @@ static void DumpGeoTIFFBox(CPLXMLNode *psBox, GDALJP2Box &oBox,
         static_cast<GDALDriver *>(GDALGetDriverByName("VRT"));
     if (pabyBoxData && poVRTDriver)
     {
-        CPLString osTmpFilename(
-            CPLSPrintf("/vsimem/tmp_%p.tif", oBox.GetFILE()));
+        const CPLString osTmpFilename(VSIMemGenerateHiddenFilename("tmp.tif"));
         CPL_IGNORE_RET_VAL(VSIFCloseL(VSIFileFromMemBuffer(
             osTmpFilename, pabyBoxData, nBoxDataLength, FALSE)));
         CPLPushErrorHandler(CPLQuietErrorHandler);
@@ -266,15 +250,12 @@ static void DumpGeoTIFFBox(CPLXMLNode *psBox, GDALJP2Box &oBox,
         }
         if (poDS)
         {
-            CPLString osTmpVRTFilename(
-                CPLSPrintf("/vsimem/tmp_%p.vrt", oBox.GetFILE()));
+            const CPLString osTmpVRTFilename(
+                CPLResetExtension(osTmpFilename.c_str(), "vrt"));
             GDALDataset *poVRTDS = poVRTDriver->CreateCopy(
                 osTmpVRTFilename, poDS, FALSE, nullptr, nullptr, nullptr);
             GDALClose(poVRTDS);
-            GByte *pabyXML =
-                VSIGetMemFileBuffer(osTmpVRTFilename, nullptr, FALSE);
-            CPLXMLNode *psXMLVRT =
-                CPLParseXMLString(reinterpret_cast<const char *>(pabyXML));
+            CPLXMLNode *psXMLVRT = CPLParseXMLFile(osTmpVRTFilename.c_str());
             if (psXMLVRT)
             {
                 ++psDumpContext->nCurLineCount;
@@ -2177,7 +2158,8 @@ static void GDALGetJPEG2000StructureInternal(CPLXMLNode *psParent, VSILFILE *fp,
                     CPLXMLNode *psBinaryContent =
                         CPLCreateXMLNode(nullptr, CXT_Element, "BinaryContent");
                     GByte *pabyBoxData = oBox.ReadBoxData();
-                    int nBoxLength = static_cast<int>(nBoxDataLength);
+                    const int nBoxLength = static_cast<int>(
+                        std::min<GIntBig>(nBoxDataLength, INT_MAX / 2 - 1));
                     char *pszBinaryContent =
                         static_cast<char *>(VSIMalloc(2 * nBoxLength + 1));
                     if (pabyBoxData && pszBinaryContent)
diff --git a/gcore/gdalmajorobject.cpp b/gcore/gdalmajorobject.cpp
index 8b893d5d1e28..b075f16ddbce 100644
--- a/gcore/gdalmajorobject.cpp
+++ b/gcore/gdalmajorobject.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2000, Frank Warmerdam
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/gcore/gdalmultidim.cpp b/gcore/gdalmultidim.cpp
index 3f9aa4275608..5e14ba03939b 100644
--- a/gcore/gdalmultidim.cpp
+++ b/gcore/gdalmultidim.cpp
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2019, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <assert.h>
@@ -36,6 +20,7 @@
 #include <utility>
 #include <time.h>
 
+#include <cmath>
 #include <ctype.h>  // isalnum
 
 #include "cpl_error_internal.h"
@@ -770,7 +755,7 @@ GUInt64 GDALGroup::GetTotalCopyCost() const
  * @param poSrcDS    Source dataset. Might be nullptr (but for correct behavior
  *                   of some output drivers this is not recommended)
  * @param poSrcGroup Source group. Must NOT be nullptr.
- * @param bStrict Whether to enable stict mode. In strict mode, any error will
+ * @param bStrict Whether to enable strict mode. In strict mode, any error will
  *                stop the copy. In relaxed mode, the copy will be attempted to
  *                be pursued.
  * @param nCurCost  Should be provided as a variable initially set to 0.
@@ -892,8 +877,8 @@ bool GDALGroup::CopyFrom(const std::shared_ptr<GDALGroup> &poDstRootGroup,
                                                          '_' + dim->GetName());
                             newDimName = newDimNamePrefix;
                             int nIterCount = 2;
-                            while (mapExistingDstDims.find(newDimName) !=
-                                   mapExistingDstDims.end())
+                            while (
+                                cpl::contains(mapExistingDstDims, newDimName))
                             {
                                 newDimName = newDimNamePrefix +
                                              CPLSPrintf("_%d", nIterCount);
@@ -1148,9 +1133,8 @@ bool GDALGroup::CopyFrom(const std::shared_ptr<GDALGroup> &poDstRootGroup,
             auto srcArray = poSrcGroup->OpenMDArray(name);
             EXIT_OR_CONTINUE_IF_NULL(srcArray);
 
-            const auto oIterDimName =
-                mapSrcVariableNameToIndexedDimName.find(srcArray->GetName());
-            if (oIterDimName != mapSrcVariableNameToIndexedDimName.end())
+            if (cpl::contains(mapSrcVariableNameToIndexedDimName,
+                              srcArray->GetName()))
             {
                 if (!CopyArray(srcArray))
                     return false;
@@ -1163,9 +1147,8 @@ bool GDALGroup::CopyFrom(const std::shared_ptr<GDALGroup> &poDstRootGroup,
             auto srcArray = poSrcGroup->OpenMDArray(name);
             EXIT_OR_CONTINUE_IF_NULL(srcArray);
 
-            const auto oIterDimName =
-                mapSrcVariableNameToIndexedDimName.find(srcArray->GetName());
-            if (oIterDimName == mapSrcVariableNameToIndexedDimName.end())
+            if (!cpl::contains(mapSrcVariableNameToIndexedDimName,
+                               srcArray->GetName()))
             {
                 if (!CopyArray(srcArray))
                     return false;
@@ -1308,8 +1291,8 @@ GDALGroup::ResolveMDArray(const std::string &osName,
                 GetInnerMostGroup(osPath, curGroupHolder, osLastPart);
             if (poGroupPtr)
                 poGroup = poGroupPtr->OpenGroup(osLastPart);
-            if (poGroup && oSetAlreadyVisited.find(poGroup->GetFullName()) ==
-                               oSetAlreadyVisited.end())
+            if (poGroup &&
+                !cpl::contains(oSetAlreadyVisited, poGroup->GetFullName()))
             {
                 oQueue.push(poGroup);
                 goOn = true;
@@ -1340,9 +1323,8 @@ GDALGroup::ResolveMDArray(const std::string &osName,
                 for (const auto &osGroupName : aosGroupNames)
                 {
                     auto poSubGroup = groupPtr->OpenGroup(osGroupName);
-                    if (poSubGroup &&
-                        oSetAlreadyVisited.find(poSubGroup->GetFullName()) ==
-                            oSetAlreadyVisited.end())
+                    if (poSubGroup && !cpl::contains(oSetAlreadyVisited,
+                                                     poSubGroup->GetFullName()))
                     {
                         oQueue.push(poSubGroup);
                         oSetAlreadyVisited.insert(poSubGroup->GetFullName());
@@ -1696,7 +1678,7 @@ bool GDALExtendedDataType::CopyValue(const void *pSrc,
                 str = CPLSPrintf("%.9g", *static_cast<const float *>(pSrc));
                 break;
             case GDT_Float64:
-                str = CPLSPrintf("%.18g", *static_cast<const double *>(pSrc));
+                str = CPLSPrintf("%.17g", *static_cast<const double *>(pSrc));
                 break;
             case GDT_CInt16:
             {
@@ -1719,7 +1701,7 @@ bool GDALExtendedDataType::CopyValue(const void *pSrc,
             case GDT_CFloat64:
             {
                 const double *src = static_cast<const double *>(pSrc);
-                str = CPLSPrintf("%.18g+%.18gj", src[0], src[1]);
+                str = CPLSPrintf("%.17g+%.17gj", src[0], src[1]);
                 break;
             }
             case GDT_TypeCount:
@@ -1782,7 +1764,7 @@ bool GDALExtendedDataType::CopyValue(const void *pSrc,
                     pabyDst + dstComp->GetOffset(), dstComp->GetType()))
             {
                 return false;
-            };
+            }
         }
         return true;
     }
@@ -1853,7 +1835,7 @@ bool GDALAbstractMDArray::CheckReadWriteParams(
         CPLError(CE_Failure, CPLE_AppDefined,
                  "Not all elements pointed by buffer will fit in "
                  "[buffer_alloc_start, "
-                 "buffer_alloc_start + buffer_alloc_size[");
+                 "buffer_alloc_start + buffer_alloc_size]");
     };
 
     const auto &dims = GetDimensions();
@@ -2123,7 +2105,7 @@ bool GDALAbstractMDArray::CheckReadWriteParams(
  * count[] and with the spacing of bufferStride[].
  *
  * @param pDstBufferAllocStart Optional pointer that can be used to validate the
- *                             validty of pDstBuffer. pDstBufferAllocStart
+ *                             validity of pDstBuffer. pDstBufferAllocStart
  * should be the pointer returned by the malloc() or equivalent call used to
  * allocate the buffer. It will generally be equal to pDstBuffer (when
  * bufferStride[] values are all positive), but not necessarily. If specified,
@@ -2131,7 +2113,7 @@ bool GDALAbstractMDArray::CheckReadWriteParams(
  * validation is needed, nullptr can be passed.
  *
  * @param nDstBufferAllocSize  Optional buffer size, that can be used to
- * validate the validty of pDstBuffer. This is the size of the buffer starting
+ * validate the validity of pDstBuffer. This is the size of the buffer starting
  * at pDstBufferAllocStart. If specified, pDstBufferAllocStart should be also
  *                             set to the appropriate value.
  *                             If no validation is needed, 0 can be passed.
@@ -2227,7 +2209,7 @@ bool GDALAbstractMDArray::IWrite(const GUInt64 *, const size_t *,
  * count[] and with the spacing of bufferStride[].
  *
  * @param pSrcBufferAllocStart Optional pointer that can be used to validate the
- *                             validty of pSrcBuffer. pSrcBufferAllocStart
+ *                             validity of pSrcBuffer. pSrcBufferAllocStart
  * should be the pointer returned by the malloc() or equivalent call used to
  * allocate the buffer. It will generally be equal to pSrcBuffer (when
  * bufferStride[] values are all positive), but not necessarily. If specified,
@@ -2235,7 +2217,7 @@ bool GDALAbstractMDArray::IWrite(const GUInt64 *, const size_t *,
  * validation is needed, nullptr can be passed.
  *
  * @param nSrcBufferAllocSize  Optional buffer size, that can be used to
- * validate the validty of pSrcBuffer. This is the size of the buffer starting
+ * validate the validity of pSrcBuffer. This is the size of the buffer starting
  * at pSrcBufferAllocStart. If specified, pDstBufferAllocStart should be also
  *                             set to the appropriate value.
  *                             If no validation is needed, 0 can be passed.
@@ -3116,6 +3098,7 @@ bool GDALAbstractMDArray::ProcessPerChunk(const GUInt64 *arrayStartIdx,
             goto end;
     }
 
+    assert(dimIdx > 0);
     dimIdx--;
     // cppcheck-suppress negativeContainerIndex
     switch (stack[dimIdx].return_point)
@@ -3335,7 +3318,7 @@ const char *GDALAttribute::ReadAsString() const
  *
  * This function will only return the first element if there are several.
  *
- * It can fail if its value can be converted to integer.
+ * It can fail if its value can not be converted to integer.
  *
  * This is the same as the C function GDALAttributeReadAsInt()
  *
@@ -3352,6 +3335,31 @@ int GDALAttribute::ReadAsInt() const
     return nRet;
 }
 
+/************************************************************************/
+/*                            ReadAsInt64()                             */
+/************************************************************************/
+
+/** Return the value of an attribute as an int64_t.
+ *
+ * This function will only return the first element if there are several.
+ *
+ * It can fail if its value can not be converted to long.
+ *
+ * This is the same as the C function GDALAttributeReadAsInt64()
+ *
+ * @return an int64_t, or INT64_MIN in case of error.
+ */
+int64_t GDALAttribute::ReadAsInt64() const
+{
+    const auto nDims = GetDimensionCount();
+    std::vector<GUInt64> startIdx(1 + nDims, 0);
+    std::vector<size_t> count(1 + nDims, 1);
+    int64_t nRet = INT64_MIN;
+    Read(startIdx.data(), count.data(), nullptr, nullptr,
+         GDALExtendedDataType::Create(GDT_Int64), &nRet, &nRet, sizeof(nRet));
+    return nRet;
+}
+
 /************************************************************************/
 /*                            ReadAsDouble()                            */
 /************************************************************************/
@@ -3360,7 +3368,7 @@ int GDALAttribute::ReadAsInt() const
  *
  * This function will only return the first element if there are several.
  *
- * It can fail if its value can be converted to double.
+ * It can fail if its value can not be converted to double.
  *
  * This is the same as the C function GDALAttributeReadAsInt()
  *
@@ -3442,6 +3450,36 @@ std::vector<int> GDALAttribute::ReadAsIntArray() const
     return res;
 }
 
+/************************************************************************/
+/*                          ReadAsInt64Array()                          */
+/************************************************************************/
+
+/** Return the value of an attribute as an array of int64_t.
+ *
+ * This is the same as the C function GDALAttributeReadAsInt64Array().
+ */
+std::vector<int64_t> GDALAttribute::ReadAsInt64Array() const
+{
+    const auto nElts = GetTotalElementsCount();
+#if SIZEOF_VOIDP == 4
+    if (nElts > static_cast<size_t>(nElts))
+        return {};
+#endif
+    std::vector<int64_t> res(static_cast<size_t>(nElts));
+    const auto &dims = GetDimensions();
+    const auto nDims = GetDimensionCount();
+    std::vector<GUInt64> startIdx(1 + nDims, 0);
+    std::vector<size_t> count(1 + nDims);
+    for (size_t i = 0; i < nDims; i++)
+    {
+        count[i] = static_cast<size_t>(dims[i]->GetSize());
+    }
+    Read(startIdx.data(), count.data(), nullptr, nullptr,
+         GDALExtendedDataType::Create(GDT_Int64), &res[0], res.data(),
+         res.size() * sizeof(res[0]));
+    return res;
+}
+
 /************************************************************************/
 /*                         ReadAsDoubleArray()                          */
 /************************************************************************/
@@ -3557,6 +3595,30 @@ bool GDALAttribute::WriteInt(int nVal)
                  sizeof(nVal));
 }
 
+/************************************************************************/
+/*                              WriteInt64()                             */
+/************************************************************************/
+
+/** Write an attribute from an int64_t value.
+ *
+ * Type conversion will be performed if needed. If the attribute contains
+ * multiple values, only the first one will be updated.
+ *
+ * This is the same as the C function GDALAttributeWriteInt().
+ *
+ * @param nVal Value.
+ * @return true in case of success.
+ */
+bool GDALAttribute::WriteInt64(int64_t nVal)
+{
+    const auto nDims = GetDimensionCount();
+    std::vector<GUInt64> startIdx(1 + nDims, 0);
+    std::vector<size_t> count(1 + nDims, 1);
+    return Write(startIdx.data(), count.data(), nullptr, nullptr,
+                 GDALExtendedDataType::Create(GDT_Int64), &nVal, &nVal,
+                 sizeof(nVal));
+}
+
 /************************************************************************/
 /*                                Write()                               */
 /************************************************************************/
@@ -3618,6 +3680,75 @@ bool GDALAttribute::Write(CSLConstList vals)
 /*                                Write()                               */
 /************************************************************************/
 
+/** Write an attribute from an array of int.
+ *
+ * Type conversion will be performed if needed.
+ *
+ * Exactly GetTotalElementsCount() strings must be provided
+ *
+ * This is the same as the C function GDALAttributeWriteIntArray()
+ *
+ * @param vals Array of int.
+ * @param nVals Should be equal to GetTotalElementsCount().
+ * @return true in case of success.
+ */
+bool GDALAttribute::Write(const int *vals, size_t nVals)
+{
+    if (nVals != GetTotalElementsCount())
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Invalid number of input values");
+        return false;
+    }
+    const auto nDims = GetDimensionCount();
+    std::vector<GUInt64> startIdx(1 + nDims, 0);
+    std::vector<size_t> count(1 + nDims);
+    const auto &dims = GetDimensions();
+    for (size_t i = 0; i < nDims; i++)
+        count[i] = static_cast<size_t>(dims[i]->GetSize());
+    return Write(startIdx.data(), count.data(), nullptr, nullptr,
+                 GDALExtendedDataType::Create(GDT_Int32), vals, vals,
+                 static_cast<size_t>(GetTotalElementsCount()) * sizeof(GInt32));
+}
+
+/************************************************************************/
+/*                                Write()                               */
+/************************************************************************/
+
+/** Write an attribute from an array of int64_t.
+ *
+ * Type conversion will be performed if needed.
+ *
+ * Exactly GetTotalElementsCount() strings must be provided
+ *
+ * This is the same as the C function GDALAttributeWriteLongArray()
+ *
+ * @param vals Array of int64_t.
+ * @param nVals Should be equal to GetTotalElementsCount().
+ * @return true in case of success.
+ */
+bool GDALAttribute::Write(const int64_t *vals, size_t nVals)
+{
+    if (nVals != GetTotalElementsCount())
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Invalid number of input values");
+        return false;
+    }
+    const auto nDims = GetDimensionCount();
+    std::vector<GUInt64> startIdx(1 + nDims, 0);
+    std::vector<size_t> count(1 + nDims);
+    const auto &dims = GetDimensions();
+    for (size_t i = 0; i < nDims; i++)
+        count[i] = static_cast<size_t>(dims[i]->GetSize());
+    return Write(startIdx.data(), count.data(), nullptr, nullptr,
+                 GDALExtendedDataType::Create(GDT_Int64), vals, vals,
+                 static_cast<size_t>(GetTotalElementsCount()) *
+                     sizeof(int64_t));
+}
+
+/************************************************************************/
+/*                                Write()                               */
+/************************************************************************/
+
 /** Write an attribute from an array of double.
  *
  * Type conversion will be performed if needed.
@@ -3778,7 +3909,7 @@ bool GDALMDArray::CopyFromAllExceptValues(const GDALMDArray *poSrcArray,
  * @param poSrcDS    Source dataset. Might be nullptr (but for correct behavior
  *                   of some output drivers this is not recommended)
  * @param poSrcArray Source array. Should NOT be nullptr.
- * @param bStrict Whether to enable stict mode. In strict mode, any error will
+ * @param bStrict Whether to enable strict mode. In strict mode, any error will
  *                stop the copy. In relaxed mode, the copy will be attempted to
  *                be pursued.
  * @param nCurCost  Should be provided as a variable initially set to 0.
@@ -4097,6 +4228,17 @@ GDALMDArray::GetCacheRootGroup(bool bCanCreate,
     }
 
     osCacheFilenameOut = osFilename + ".gmac";
+    if (STARTS_WITH(osFilename.c_str(), "/vsicurl/http"))
+    {
+        const auto nPosQuestionMark = osFilename.find('?');
+        if (nPosQuestionMark != std::string::npos)
+        {
+            osCacheFilenameOut =
+                osFilename.substr(0, nPosQuestionMark)
+                    .append(".gmac")
+                    .append(osFilename.substr(nPosQuestionMark));
+        }
+    }
     const char *pszProxy = PamGetProxy(osCacheFilenameOut.c_str());
     if (pszProxy != nullptr)
         osCacheFilenameOut = pszProxy;
@@ -5540,7 +5682,7 @@ CreateFieldNameExtractArray(const std::shared_ptr<GDALMDArray> &self,
  * array, with the values in first dimension reversed. That is
  * [[4,5,6,7],[0,1,2,3]].</li>
  * <li>GetView("[newaxis,...]"): returns a
- * 3-dimensional array, with an addditional dimension of size 1 put at the
+ * 3-dimensional array, with an additional dimension of size 1 put at the
  * beginning. That is [[[0,1,2,3],[4,5,6,7]]].</li>
  * </ul>
  *
@@ -5572,6 +5714,7 @@ CreateFieldNameExtractArray(const std::shared_ptr<GDALMDArray> &self,
  * a view of it (not a copy), or nullptr in case of error.
  */
 // clang-format on
+
 std::shared_ptr<GDALMDArray>
 GDALMDArray::GetView(const std::string &viewExpr) const
 {
@@ -6819,7 +6962,8 @@ bool GDALMDArrayMask::IRead(const GUInt64 *arrayStartIdx, const size_t *count,
         m_poParent->GetRawNoDataValue() == nullptr &&
         GDALDataTypeIsInteger(m_poParent->GetDataType().GetNumericDataType()))
     {
-        if (bufferDataType == m_dt)  // Byte case
+        const bool bBufferDataTypeIsByte = bufferDataType == m_dt;
+        if (bBufferDataTypeIsByte)  // Byte case
         {
             bool bContiguous = true;
             for (size_t i = 0; i < nDims; i++)
@@ -6856,7 +7000,6 @@ bool GDALMDArrayMask::IRead(const GUInt64 *arrayStartIdx, const size_t *count,
 
         size_t dimIdx = 0;
         const size_t nDimsMinus1 = nDims > 0 ? nDims - 1 : 0;
-        const bool bBufferDataTypeIsByte = bufferDataType == m_dt;
         GByte abyOne[16];  // 16 is sizeof GDT_CFloat64
         CPLAssert(nBufferDTSize <= 16);
         const GByte flag = 1;
@@ -6872,6 +7015,7 @@ bool GDALMDArrayMask::IRead(const GUInt64 *arrayStartIdx, const size_t *count,
 
             while (true)
             {
+                // cppcheck-suppress knownConditionTrueFalse
                 if (bBufferDataTypeIsByte)
                 {
                     *dst_ptr = flag;
@@ -8028,10 +8172,10 @@ std::shared_ptr<GDALMDArray> GDALMDArrayResampled::Create(
                          "Setting geolocation array from variables %s and %s",
                          poLongVar->GetName().c_str(),
                          poLatVar->GetName().c_str());
-                std::string osFilenameLong =
-                    CPLSPrintf("/vsimem/%p/longitude.tif", poParent.get());
-                std::string osFilenameLat =
-                    CPLSPrintf("/vsimem/%p/latitude.tif", poParent.get());
+                const std::string osFilenameLong =
+                    VSIMemGenerateHiddenFilename("longitude.tif");
+                const std::string osFilenameLat =
+                    VSIMemGenerateHiddenFilename("latitude.tif");
                 std::unique_ptr<GDALDataset> poTmpLongDS(
                     longDimCount == 1
                         ? poLongVar->AsClassicDataset(0, 0)
@@ -8097,10 +8241,10 @@ std::shared_ptr<GDALMDArray> GDALMDArrayResampled::Create(
         const double dfYMin =
             dfYMax + dfYSpacing * static_cast<double>(poNewDimY->GetSize());
         aosArgv.AddString("-te");
-        aosArgv.AddString(CPLSPrintf("%.18g", dfXMin));
-        aosArgv.AddString(CPLSPrintf("%.18g", dfYMin));
-        aosArgv.AddString(CPLSPrintf("%.18g", dfXMax));
-        aosArgv.AddString(CPLSPrintf("%.18g", dfYMax));
+        aosArgv.AddString(CPLSPrintf("%.17g", dfXMin));
+        aosArgv.AddString(CPLSPrintf("%.17g", dfYMin));
+        aosArgv.AddString(CPLSPrintf("%.17g", dfXMax));
+        aosArgv.AddString(CPLSPrintf("%.17g", dfYMax));
     }
 
     if (poNewDimX && poNewDimY)
@@ -8291,7 +8435,18 @@ bool GDALMDArrayResampled::IRead(const GUInt64 *arrayStartIdx,
  * orthorectifying a NASA EMIT dataset.
  *
  * For NASA EMIT datasets, if apoNewDims[] and poTargetSRS is NULL, the
- * geometry lookup table (GLT) is used for fast orthorectification.
+ * geometry lookup table (GLT) is used by default for fast orthorectification.
+ *
+ * Options available are:
+ * <ul>
+ * <li>EMIT_ORTHORECTIFICATION=YES/NO: defaults to YES for a NASA EMIT dataset.
+ * Can be set to NO to use generic reprojection method.
+ * </li>
+ * <li>USE_GOOD_WAVELENGTHS=YES/NO: defaults to YES. Only used for EMIT
+ * orthorectification to take into account the value of the
+ * /sensor_band_parameters/good_wavelengths array to decide if slices of the
+ * current array along the band dimension are valid.</li>
+ * </ul>
  *
  * @param apoNewDims New dimensions. Its size should be GetDimensionCount().
  *                   apoNewDims[i] can be NULL to let the method automatically
@@ -8361,9 +8516,9 @@ std::shared_ptr<GDALMDArray> GDALMDArray::GetResampled(
                     poGLT_Y->GetDimensions()[1]->GetName() == "ortho_x")
                 {
                     return CreateGLTOrthorectified(
-                        self, poGLT_X, poGLT_Y,
+                        self, poRootGroup, poGLT_X, poGLT_Y,
                         /* nGLTIndexOffset = */ -1,
-                        poAttrGeotransform->ReadAsDoubleArray());
+                        poAttrGeotransform->ReadAsDoubleArray(), papszOptions);
                 }
             }
         }
@@ -9330,6 +9485,13 @@ GDALDatasetFromArray *GDALDatasetFromArray::Create(
         }
         poDS->SetDerivedDatasetName(osDerivedDatasetName.c_str());
         poDS->TryLoadXML();
+
+        for (const auto &[pszKey, pszValue] :
+             cpl::IterateNameValue(static_cast<CSLConstList>(
+                 poDS->GDALPamDataset::GetMetadata())))
+        {
+            poDS->m_oMDD.SetMetadataItem(pszKey, pszValue);
+        }
     }
 
     return poDS.release();
@@ -12460,6 +12622,81 @@ GDALMDArrayH GDALMDArrayGetGridded(GDALMDArrayH hArray,
     return new GDALMDArrayHS(gridded);
 }
 
+/************************************************************************/
+/*                      GDALMDArrayGetMeshGrid()                        */
+/************************************************************************/
+
+/** Return a list of multidimensional arrays from a list of one-dimensional
+ * arrays.
+ *
+ * This is typically used to transform one-dimensional longitude, latitude
+ * arrays into 2D ones.
+ *
+ * More formally, for one-dimensional arrays x1, x2,..., xn with lengths
+ * Ni=len(xi), returns (N1, N2, ..., Nn) shaped arrays if indexing="ij" or
+ * (N2, N1, ..., Nn) shaped arrays if indexing="xy" with the elements of xi
+ * repeated to fill the matrix along the first dimension for x1, the second
+ * for x2 and so on.
+ *
+ * For example, if x = [1, 2], and y = [3, 4, 5],
+ * GetMeshGrid([x, y], ["INDEXING=xy"]) will return [xm, ym] such that
+ * xm=[[1, 2],[1, 2],[1, 2]] and ym=[[3, 3],[4, 4],[5, 5]],
+ * or more generally xm[any index][i] = x[i] and ym[i][any index]=y[i]
+ *
+ * and
+ * GetMeshGrid([x, y], ["INDEXING=ij"]) will return [xm, ym] such that
+ * xm=[[1, 1, 1],[2, 2, 2]] and ym=[[3, 4, 5],[3, 4, 5]],
+ * or more generally xm[i][any index] = x[i] and ym[any index][i]=y[i]
+ *
+ * The currently supported options are:
+ * <ul>
+ * <li>INDEXING=xy/ij: Cartesian ("xy", default) or matrix ("ij") indexing of
+ * output.
+ * </li>
+ * </ul>
+ *
+ * This is the same as
+ * <a href="https://numpy.org/doc/stable/reference/generated/numpy.meshgrid.html">numpy.meshgrid()</a>
+ * function.
+ *
+ * The returned array (of arrays) must be freed with GDALReleaseArrays().
+ * If only the array itself needs to be freed, CPLFree() should be called
+ * (and GDALMDArrayRelease() on individual array members).
+ *
+ * This is the same as the C++ method GDALMDArray::GetMeshGrid()
+ *
+ * @param pahInputArrays Input arrays
+ * @param nCountInputArrays Number of input arrays
+ * @param pnCountOutputArrays Pointer to the number of values returned. Must NOT be NULL.
+ * @param papszOptions NULL, or NULL terminated list of options.
+ *
+ * @return an array of *pnCountOutputArrays arrays.
+ * @since 3.10
+ */
+GDALMDArrayH *GDALMDArrayGetMeshGrid(const GDALMDArrayH *pahInputArrays,
+                                     size_t nCountInputArrays,
+                                     size_t *pnCountOutputArrays,
+                                     CSLConstList papszOptions)
+{
+    VALIDATE_POINTER1(pahInputArrays, __func__, nullptr);
+    VALIDATE_POINTER1(pnCountOutputArrays, __func__, nullptr);
+
+    std::vector<std::shared_ptr<GDALMDArray>> apoInputArrays;
+    for (size_t i = 0; i < nCountInputArrays; ++i)
+        apoInputArrays.push_back(pahInputArrays[i]->m_poImpl);
+
+    const auto apoOutputArrays =
+        GDALMDArray::GetMeshGrid(apoInputArrays, papszOptions);
+    auto ret = static_cast<GDALMDArrayH *>(
+        CPLMalloc(sizeof(GDALMDArrayH) * apoOutputArrays.size()));
+    for (size_t i = 0; i < apoOutputArrays.size(); i++)
+    {
+        ret[i] = new GDALMDArrayHS(apoOutputArrays[i]);
+    }
+    *pnCountOutputArrays = apoOutputArrays.size();
+    return ret;
+}
+
 /************************************************************************/
 /*                        GDALReleaseArrays()                           */
 /************************************************************************/
@@ -12721,7 +12958,7 @@ const char *GDALAttributeReadAsString(GDALAttributeH hAttr)
  *
  * This function will only return the first element if there are several.
  *
- * It can fail if its value can be converted to integer.
+ * It can fail if its value can not be converted to integer.
  *
  * This is the same as the C++ method GDALAttribute::ReadAsInt()
  *
@@ -12733,6 +12970,26 @@ int GDALAttributeReadAsInt(GDALAttributeH hAttr)
     return hAttr->m_poImpl->ReadAsInt();
 }
 
+/************************************************************************/
+/*                      GDALAttributeReadAsInt64()                      */
+/************************************************************************/
+
+/** Return the value of an attribute as a int64_t.
+ *
+ * This function will only return the first element if there are several.
+ *
+ * It can fail if its value can not be converted to integer.
+ *
+ * This is the same as the C++ method GDALAttribute::ReadAsInt64()
+ *
+ * @return an int64_t, or INT64_MIN in case of error.
+ */
+int64_t GDALAttributeReadAsInt64(GDALAttributeH hAttr)
+{
+    VALIDATE_POINTER1(hAttr, __func__, 0);
+    return hAttr->m_poImpl->ReadAsInt64();
+}
+
 /************************************************************************/
 /*                       GDALAttributeReadAsDouble()                    */
 /************************************************************************/
@@ -12741,7 +12998,7 @@ int GDALAttributeReadAsInt(GDALAttributeH hAttr)
  *
  * This function will only return the first element if there are several.
  *
- * It can fail if its value can be converted to double.
+ * It can fail if its value can not be converted to double.
  *
  * This is the same as the C++ method GDALAttribute::ReadAsDouble()
  *
@@ -12797,6 +13054,35 @@ int *GDALAttributeReadAsIntArray(GDALAttributeH hAttr, size_t *pnCount)
     return ret;
 }
 
+/************************************************************************/
+/*                     GDALAttributeReadAsInt64Array()                  */
+/************************************************************************/
+
+/** Return the value of an attribute as an array of int64_t.
+ *
+ * This is the same as the C++ method GDALAttribute::ReadAsInt64Array()
+ *
+ * @param hAttr Attribute
+ * @param pnCount Pointer to the number of values returned. Must NOT be NULL.
+ * @return array to be freed with CPLFree(), or nullptr.
+ */
+int64_t *GDALAttributeReadAsInt64Array(GDALAttributeH hAttr, size_t *pnCount)
+{
+    VALIDATE_POINTER1(hAttr, __func__, nullptr);
+    VALIDATE_POINTER1(pnCount, __func__, nullptr);
+    *pnCount = 0;
+    auto tmp(hAttr->m_poImpl->ReadAsInt64Array());
+    if (tmp.empty())
+        return nullptr;
+    auto ret = static_cast<int64_t *>(
+        VSI_MALLOC2_VERBOSE(tmp.size(), sizeof(int64_t)));
+    if (!ret)
+        return nullptr;
+    memcpy(ret, tmp.data(), tmp.size() * sizeof(int64_t));
+    *pnCount = tmp.size();
+    return ret;
+}
+
 /************************************************************************/
 /*                     GDALAttributeReadAsDoubleArray()                 */
 /************************************************************************/
@@ -12893,6 +13179,27 @@ int GDALAttributeWriteInt(GDALAttributeH hAttr, int nVal)
     return hAttr->m_poImpl->WriteInt(nVal);
 }
 
+/************************************************************************/
+/*                        GDALAttributeWriteInt64()                     */
+/************************************************************************/
+
+/** Write an attribute from an int64_t value.
+ *
+ * Type conversion will be performed if needed. If the attribute contains
+ * multiple values, only the first one will be updated.
+ *
+ * This is the same as the C++ method GDALAttribute::WriteLong()
+ *
+ * @param hAttr Attribute
+ * @param nVal Value.
+ * @return TRUE in case of success.
+ */
+int GDALAttributeWriteInt64(GDALAttributeH hAttr, int64_t nVal)
+{
+    VALIDATE_POINTER1(hAttr, __func__, FALSE);
+    return hAttr->m_poImpl->WriteInt64(nVal);
+}
+
 /************************************************************************/
 /*                        GDALAttributeWriteDouble()                    */
 /************************************************************************/
@@ -12938,6 +13245,56 @@ int GDALAttributeWriteStringArray(GDALAttributeH hAttr,
     return hAttr->m_poImpl->Write(papszValues);
 }
 
+/************************************************************************/
+/*                       GDALAttributeWriteIntArray()                */
+/************************************************************************/
+
+/** Write an attribute from an array of int.
+ *
+ * Type conversion will be performed if needed.
+ *
+ * Exactly GetTotalElementsCount() strings must be provided
+ *
+ * This is the same as the C++ method GDALAttribute::Write(const int *,
+ * size_t)
+ *
+ * @param hAttr Attribute
+ * @param panValues Array of int.
+ * @param nCount Should be equal to GetTotalElementsCount().
+ * @return TRUE in case of success.
+ */
+int GDALAttributeWriteIntArray(GDALAttributeH hAttr, const int *panValues,
+                               size_t nCount)
+{
+    VALIDATE_POINTER1(hAttr, __func__, FALSE);
+    return hAttr->m_poImpl->Write(panValues, nCount);
+}
+
+/************************************************************************/
+/*                       GDALAttributeWriteInt64Array()                 */
+/************************************************************************/
+
+/** Write an attribute from an array of int64_t.
+ *
+ * Type conversion will be performed if needed.
+ *
+ * Exactly GetTotalElementsCount() strings must be provided
+ *
+ * This is the same as the C++ method GDALAttribute::Write(const int64_t *,
+ * size_t)
+ *
+ * @param hAttr Attribute
+ * @param panValues Array of int64_t.
+ * @param nCount Should be equal to GetTotalElementsCount().
+ * @return TRUE in case of success.
+ */
+int GDALAttributeWriteInt64Array(GDALAttributeH hAttr, const int64_t *panValues,
+                                 size_t nCount)
+{
+    VALIDATE_POINTER1(hAttr, __func__, FALSE);
+    return hAttr->m_poImpl->Write(panValues, nCount);
+}
+
 /************************************************************************/
 /*                       GDALAttributeWriteDoubleArray()                */
 /************************************************************************/
@@ -13681,15 +14038,15 @@ void GDALPamMultiDim::Save()
                                                                      : "0");
             CPLCreateXMLElementAndValue(
                 psMDArray, "Minimum",
-                CPLSPrintf("%.18g", kv.second.stats.dfMin));
+                CPLSPrintf("%.17g", kv.second.stats.dfMin));
             CPLCreateXMLElementAndValue(
                 psMDArray, "Maximum",
-                CPLSPrintf("%.18g", kv.second.stats.dfMax));
+                CPLSPrintf("%.17g", kv.second.stats.dfMax));
             CPLCreateXMLElementAndValue(
-                psMDArray, "Mean", CPLSPrintf("%.18g", kv.second.stats.dfMean));
+                psMDArray, "Mean", CPLSPrintf("%.17g", kv.second.stats.dfMean));
             CPLCreateXMLElementAndValue(
                 psMDArray, "StdDev",
-                CPLSPrintf("%.18g", kv.second.stats.dfStdDev));
+                CPLSPrintf("%.17g", kv.second.stats.dfStdDev));
             CPLCreateXMLElementAndValue(
                 psMDArray, "ValidSampleCount",
                 CPLSPrintf(CPL_FRMT_GUIB, kv.second.stats.nValidCount));
diff --git a/gcore/gdalmultidim_gltorthorectification.cpp b/gcore/gdalmultidim_gltorthorectification.cpp
index 62e6446528aa..e1183b5bb2fe 100644
--- a/gcore/gdalmultidim_gltorthorectification.cpp
+++ b/gcore/gdalmultidim_gltorthorectification.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_priv.h"
@@ -49,6 +33,7 @@ class GLTOrthoRectifiedArray final : public GDALPamMDArray
     std::shared_ptr<GDALMDArray> m_poGLTX{};
     std::shared_ptr<GDALMDArray> m_poGLTY{};
     int m_nGLTIndexOffset = 0;
+    std::vector<GByte> m_abyBandValidity{};
 
   protected:
     GLTOrthoRectifiedArray(
@@ -76,9 +61,11 @@ class GLTOrthoRectifiedArray final : public GDALPamMDArray
   public:
     static std::shared_ptr<GDALMDArray>
     Create(const std::shared_ptr<GDALMDArray> &poParent,
+           const std::shared_ptr<GDALGroup> &poRootGroup,
            const std::shared_ptr<GDALMDArray> &poGLTX,
            const std::shared_ptr<GDALMDArray> &poGLTY, int nGLTIndexOffset,
-           const std::vector<double> &adfGeoTransform)
+           const std::vector<double> &adfGeoTransform,
+           CSLConstList papszOptions)
     {
         std::vector<std::shared_ptr<GDALDimension>> apoNewDims;
 
@@ -124,6 +111,32 @@ class GLTOrthoRectifiedArray final : public GDALPamMDArray
         newAr->m_poSRS.reset(oSRS.Clone());
         newAr->m_poSRS->SetDataAxisToSRSAxisMapping(
             {/*latIdx = */ 1, /* lonIdx = */ 2});
+        if (CPLTestBool(CSLFetchNameValueDef(papszOptions,
+                                             "USE_GOOD_WAVELENGTHS", "YES")) &&
+            newAr->m_poParent->GetDimensionCount() == 3)
+        {
+            const auto poGoodWaveLengths = poRootGroup->OpenMDArrayFromFullname(
+                "/sensor_band_parameters/good_wavelengths");
+            if (poGoodWaveLengths &&
+                poGoodWaveLengths->GetDimensionCount() == 1 &&
+                poGoodWaveLengths->GetDimensions()[0]->GetSize() ==
+                    newAr->m_poParent->GetDimensions()[2]->GetSize() &&
+                poGoodWaveLengths->GetDimensions()[0]->GetSize() <
+                    1000 * 1000 &&
+                poGoodWaveLengths->GetDataType().GetClass() == GEDTC_NUMERIC)
+            {
+                const GUInt64 arrayStartIdx[] = {0};
+                const size_t count[] = {static_cast<size_t>(
+                    poGoodWaveLengths->GetDimensions()[0]->GetSize())};
+                const GInt64 arrayStep[] = {1};
+                const GPtrDiff_t bufferStride[] = {1};
+                newAr->m_abyBandValidity.resize(count[0], 1);
+                CPL_IGNORE_RET_VAL(poGoodWaveLengths->Read(
+                    arrayStartIdx, count, arrayStep, bufferStride,
+                    GDALExtendedDataType::Create(GDT_Byte),
+                    newAr->m_abyBandValidity.data()));
+            }
+        }
         return newAr;
     }
 
@@ -206,6 +219,59 @@ bool GLTOrthoRectifiedArray::IRead(const GUInt64 *arrayStartIdx,
     if (bufferDataType.GetClass() != GEDTC_NUMERIC)
         return false;
 
+    const auto eBufferDT = bufferDataType.GetNumericDataType();
+    auto pRawNoDataValue = GetRawNoDataValue();
+    std::vector<GByte> abyNoData(16);
+    if (pRawNoDataValue)
+        GDALCopyWords(pRawNoDataValue, GetDataType().GetNumericDataType(), 0,
+                      abyNoData.data(), eBufferDT, 0, 1);
+
+    const auto nBufferDTSize = bufferDataType.GetSize();
+    const int nCopyWordsDstStride =
+        m_apoDims.size() == 3
+            ? static_cast<int>(bufferStride[2] * nBufferDTSize)
+            : 0;
+    const int nCopyWordsCount =
+        m_apoDims.size() == 3 ? static_cast<int>(count[2]) : 1;
+
+    const auto FillBufferWithNodata =
+        [count, bufferStride, pDstBuffer, nBufferDTSize, &eBufferDT,
+         nCopyWordsDstStride, nCopyWordsCount, &abyNoData]()
+    {
+        for (size_t iY = 0; iY < count[0]; ++iY)
+        {
+            for (size_t iX = 0; iX < count[1]; ++iX)
+            {
+                GByte *pabyDstBuffer =
+                    static_cast<GByte *>(pDstBuffer) +
+                    (iY * bufferStride[0] + iX * bufferStride[1]) *
+                        static_cast<int>(nBufferDTSize);
+                GDALCopyWords(abyNoData.data(), eBufferDT, 0, pabyDstBuffer,
+                              eBufferDT, nCopyWordsDstStride, nCopyWordsCount);
+            }
+        }
+    };
+
+    bool bSomeBandInvalids = false;
+    if (!m_abyBandValidity.empty())
+    {
+        size_t nCountInvalid = 0;
+        for (size_t i = 0; i < count[2]; ++i)
+        {
+            const size_t iBand =
+                static_cast<size_t>(arrayStartIdx[2] + i * arrayStep[2]);
+            CPLAssert(iBand < m_abyBandValidity.size());
+            if (!m_abyBandValidity[iBand])
+                nCountInvalid++;
+        }
+        if (nCountInvalid == count[2])
+        {
+            FillBufferWithNodata();
+            return true;
+        }
+        bSomeBandInvalids = true;
+    }
+
     const size_t nXYValsCount = count[0] * count[1];
     const auto eInt32DT = GDALExtendedDataType::Create(GDT_Int32);
     std::vector<int32_t> anGLTX;
@@ -263,34 +329,9 @@ bool GLTOrthoRectifiedArray::IRead(const GUInt64 *arrayStartIdx,
         }
     }
 
-    const auto eBufferDT = bufferDataType.GetNumericDataType();
-    auto pRawNoDataValue = GetRawNoDataValue();
-    std::vector<GByte> abyNoData(16);
-    if (pRawNoDataValue)
-        GDALCopyWords(pRawNoDataValue, GetDataType().GetNumericDataType(), 0,
-                      abyNoData.data(), eBufferDT, 0, 1);
-
-    const auto nBufferDTSize = bufferDataType.GetSize();
-    const int nCopyWordsDstStride =
-        m_apoDims.size() == 3
-            ? static_cast<int>(bufferStride[2] * nBufferDTSize)
-            : 0;
-    const int nCopyWordsCount =
-        m_apoDims.size() == 3 ? static_cast<int>(count[2]) : 1;
     if (nMinX > nMaxX || nMinY > nMaxY)
     {
-        for (size_t iY = 0; iY < count[0]; ++iY)
-        {
-            for (size_t iX = 0; iX < count[1]; ++iX)
-            {
-                GByte *pabyDstBuffer =
-                    static_cast<GByte *>(pDstBuffer) +
-                    (iY * bufferStride[0] + iX * bufferStride[1]) *
-                        static_cast<int>(nBufferDTSize);
-                GDALCopyWords(abyNoData.data(), eBufferDT, 0, pabyDstBuffer,
-                              eBufferDT, nCopyWordsDstStride, nCopyWordsCount);
-            }
-        }
+        FillBufferWithNodata();
         return true;
     }
 
@@ -363,6 +404,21 @@ bool GLTOrthoRectifiedArray::IRead(const GUInt64 *arrayStartIdx,
                 GDALCopyWords(pabySrcBuffer, eBufferDT,
                               static_cast<int>(nBufferDTSize), pabyDstBuffer,
                               eBufferDT, nCopyWordsDstStride, nCopyWordsCount);
+                if (bSomeBandInvalids)
+                {
+                    for (size_t i = 0; i < count[2]; ++i)
+                    {
+                        const size_t iBand = static_cast<size_t>(
+                            arrayStartIdx[2] + i * arrayStep[2]);
+                        if (!m_abyBandValidity[iBand])
+                        {
+                            GDALCopyWords(abyNoData.data(), eBufferDT, 0,
+                                          pabyDstBuffer +
+                                              i * nCopyWordsDstStride,
+                                          eBufferDT, 0, 1);
+                        }
+                    }
+                }
             }
             else
             {
@@ -383,12 +439,14 @@ bool GLTOrthoRectifiedArray::IRead(const GUInt64 *arrayStartIdx,
 
 /* static */ std::shared_ptr<GDALMDArray> GDALMDArray::CreateGLTOrthorectified(
     const std::shared_ptr<GDALMDArray> &poParent,
+    const std::shared_ptr<GDALGroup> &poRootGroup,
     const std::shared_ptr<GDALMDArray> &poGLTX,
     const std::shared_ptr<GDALMDArray> &poGLTY, int nGLTIndexOffset,
-    const std::vector<double> &adfGeoTransform)
+    const std::vector<double> &adfGeoTransform, CSLConstList papszOptions)
 {
-    return GLTOrthoRectifiedArray::Create(poParent, poGLTX, poGLTY,
-                                          nGLTIndexOffset, adfGeoTransform);
+    return GLTOrthoRectifiedArray::Create(poParent, poRootGroup, poGLTX, poGLTY,
+                                          nGLTIndexOffset, adfGeoTransform,
+                                          papszOptions);
 }
 
 //! @endcond
diff --git a/gcore/gdalmultidim_gridded.cpp b/gcore/gdalmultidim_gridded.cpp
index 4a0741a903c7..dfd6d2d9d27a 100644
--- a/gcore/gdalmultidim_gridded.cpp
+++ b/gcore/gdalmultidim_gridded.cpp
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_alg.h"
@@ -665,9 +649,8 @@ GDALMDArray::GetGridded(const std::string &osGridOptions,
     }
 
     // Create a in-memory vector layer with (X,Y) points
-    CPLString osTmpFilename;
-    osTmpFilename.Printf("/vsimem/GDALMDArray::GetGridded_%p_%p.%s", this,
-                         pOptions, pszExt);
+    const std::string osTmpFilename(VSIMemGenerateHiddenFilename(
+        std::string("tmp.").append(pszExt).c_str()));
     auto poDS = std::unique_ptr<GDALDataset>(
         poDrv->Create(osTmpFilename.c_str(), 0, 0, 0, GDT_Unknown, nullptr));
     if (!poDS)
diff --git a/gcore/gdalmultidim_meshgrid.cpp b/gcore/gdalmultidim_meshgrid.cpp
new file mode 100644
index 000000000000..9064ffc50a16
--- /dev/null
+++ b/gcore/gdalmultidim_meshgrid.cpp
@@ -0,0 +1,324 @@
+/******************************************************************************
+ * Name:     gdalmultiDim_meshgrid.cpp
+ * Project:  GDAL Core
+ * Purpose:  Return a vector of coordinate matrices from coordinate vectors.
+ * Author:   Even Rouault <even.rouault at spatialys.com>
+ *
+ ******************************************************************************
+ * Copyright (c) 2024, Even Rouault <even.rouault at spatialys.com>
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#include "gdal_priv.h"
+
+#include <algorithm>
+#include <limits>
+
+/************************************************************************/
+/*                       GetConcatenatedNames()                         */
+/************************************************************************/
+
+static std::string
+GetConcatenatedNames(const std::vector<std::shared_ptr<GDALMDArray>> &apoArrays)
+{
+    std::string ret;
+    for (const auto &poArray : apoArrays)
+    {
+        if (!ret.empty())
+            ret += ", ";
+        ret += poArray->GetFullName();
+    }
+    return ret;
+}
+
+/************************************************************************/
+/*                         GDALMDArrayMeshGrid                          */
+/************************************************************************/
+
+class GDALMDArrayMeshGrid final : public GDALMDArray
+{
+    const std::vector<std::shared_ptr<GDALMDArray>> m_apoArrays;
+    std::vector<std::shared_ptr<GDALDimension>> m_apoDims{};
+    const size_t m_iDim;
+    const bool m_bIJIndexing;
+
+  protected:
+    explicit GDALMDArrayMeshGrid(
+        const std::vector<std::shared_ptr<GDALMDArray>> &apoArrays,
+        const std::vector<std::shared_ptr<GDALDimension>> &apoDims, size_t iDim,
+        bool bIJIndexing)
+        : GDALAbstractMDArray(std::string(),
+                              "Mesh grid view of " +
+                                  GetConcatenatedNames(apoArrays)),
+          GDALMDArray(std::string(),
+                      "Mesh grid view of " + GetConcatenatedNames(apoArrays)),
+          m_apoArrays(apoArrays), m_apoDims(apoDims), m_iDim(iDim),
+          m_bIJIndexing(bIJIndexing)
+    {
+    }
+
+    bool IRead(const GUInt64 *arrayStartIdx, const size_t *count,
+               const GInt64 *arrayStep, const GPtrDiff_t *bufferStride,
+               const GDALExtendedDataType &bufferDataType,
+               void *pDstBuffer) const override;
+
+  public:
+    static std::shared_ptr<GDALMDArrayMeshGrid>
+    Create(const std::vector<std::shared_ptr<GDALMDArray>> &apoArrays,
+           size_t iDim, bool bIJIndexing)
+    {
+        std::vector<std::shared_ptr<GDALDimension>> apoDims;
+        for (size_t i = 0; i < apoArrays.size(); ++i)
+        {
+            const size_t iTranslatedDim = (!bIJIndexing && i <= 1) ? 1 - i : i;
+            apoDims.push_back(apoArrays[iTranslatedDim]->GetDimensions()[0]);
+        }
+        auto newAr(std::shared_ptr<GDALMDArrayMeshGrid>(
+            new GDALMDArrayMeshGrid(apoArrays, apoDims, iDim, bIJIndexing)));
+        newAr->SetSelf(newAr);
+        return newAr;
+    }
+
+    bool IsWritable() const override
+    {
+        return false;
+    }
+
+    const std::string &GetFilename() const override
+    {
+        return m_apoArrays[m_iDim]->GetFilename();
+    }
+
+    const std::vector<std::shared_ptr<GDALDimension>> &
+    GetDimensions() const override
+    {
+        return m_apoDims;
+    }
+
+    const GDALExtendedDataType &GetDataType() const override
+    {
+        return m_apoArrays[m_iDim]->GetDataType();
+    }
+
+    std::shared_ptr<GDALAttribute>
+    GetAttribute(const std::string &osName) const override
+    {
+        return m_apoArrays[m_iDim]->GetAttribute(osName);
+    }
+
+    std::vector<std::shared_ptr<GDALAttribute>>
+    GetAttributes(CSLConstList papszOptions = nullptr) const override
+    {
+        return m_apoArrays[m_iDim]->GetAttributes(papszOptions);
+    }
+
+    const std::string &GetUnit() const override
+    {
+        return m_apoArrays[m_iDim]->GetUnit();
+    }
+
+    const void *GetRawNoDataValue() const override
+    {
+        return m_apoArrays[m_iDim]->GetRawNoDataValue();
+    }
+
+    double GetOffset(bool *pbHasOffset,
+                     GDALDataType *peStorageType) const override
+    {
+        return m_apoArrays[m_iDim]->GetOffset(pbHasOffset, peStorageType);
+    }
+
+    double GetScale(bool *pbHasScale,
+                    GDALDataType *peStorageType) const override
+    {
+        return m_apoArrays[m_iDim]->GetScale(pbHasScale, peStorageType);
+    }
+};
+
+/************************************************************************/
+/*                             IRead()                                  */
+/************************************************************************/
+
+bool GDALMDArrayMeshGrid::IRead(const GUInt64 *arrayStartIdx,
+                                const size_t *count, const GInt64 *arrayStep,
+                                const GPtrDiff_t *bufferStride,
+                                const GDALExtendedDataType &bufferDataType,
+                                void *pDstBuffer) const
+{
+    const size_t nBufferDTSize = bufferDataType.GetSize();
+    const size_t iTranslatedDim =
+        (!m_bIJIndexing && m_iDim <= 1) ? 1 - m_iDim : m_iDim;
+    std::vector<GByte> abyTmpData(nBufferDTSize * count[iTranslatedDim]);
+    const GPtrDiff_t strideOne[] = {1};
+    if (!m_apoArrays[m_iDim]->Read(&arrayStartIdx[iTranslatedDim],
+                                   &count[iTranslatedDim],
+                                   &arrayStep[iTranslatedDim], strideOne,
+                                   bufferDataType, abyTmpData.data()))
+        return false;
+
+    const auto nDims = GetDimensionCount();
+
+    struct Stack
+    {
+        size_t nIters = 0;
+        GByte *dst_ptr = nullptr;
+        GPtrDiff_t dst_inc_offset = 0;
+    };
+
+    // +1 to avoid -Werror=null-dereference
+    std::vector<Stack> stack(nDims + 1);
+    for (size_t i = 0; i < nDims; i++)
+    {
+        stack[i].dst_inc_offset =
+            static_cast<GPtrDiff_t>(bufferStride[i] * nBufferDTSize);
+    }
+    stack[0].dst_ptr = static_cast<GByte *>(pDstBuffer);
+    size_t dimIdx = 0;
+    size_t valIdx = 0;
+
+lbl_next_depth:
+    if (dimIdx == nDims - 1)
+    {
+        auto nIters = count[dimIdx];
+        GByte *dst_ptr = stack[dimIdx].dst_ptr;
+        if (dimIdx == iTranslatedDim)
+        {
+            valIdx = 0;
+            while (true)
+            {
+                GDALExtendedDataType::CopyValue(
+                    &abyTmpData[nBufferDTSize * valIdx], bufferDataType,
+                    dst_ptr, bufferDataType);
+                if ((--nIters) == 0)
+                    break;
+                ++valIdx;
+                dst_ptr += stack[dimIdx].dst_inc_offset;
+            }
+        }
+        else
+        {
+            while (true)
+            {
+                GDALExtendedDataType::CopyValue(
+                    &abyTmpData[nBufferDTSize * valIdx], bufferDataType,
+                    dst_ptr, bufferDataType);
+                if ((--nIters) == 0)
+                    break;
+                dst_ptr += stack[dimIdx].dst_inc_offset;
+            }
+        }
+    }
+    else
+    {
+        if (dimIdx == iTranslatedDim)
+            valIdx = 0;
+        stack[dimIdx].nIters = count[dimIdx];
+        while (true)
+        {
+            dimIdx++;
+            stack[dimIdx].dst_ptr = stack[dimIdx - 1].dst_ptr;
+            goto lbl_next_depth;
+        lbl_return_to_caller:
+            dimIdx--;
+            if ((--stack[dimIdx].nIters) == 0)
+                break;
+            if (dimIdx == iTranslatedDim)
+                ++valIdx;
+            stack[dimIdx].dst_ptr += stack[dimIdx].dst_inc_offset;
+        }
+    }
+    if (dimIdx > 0)
+    {
+        goto lbl_return_to_caller;
+    }
+
+    if (bufferDataType.NeedsFreeDynamicMemory())
+    {
+        for (size_t i = 0; i < count[iTranslatedDim]; ++i)
+        {
+            bufferDataType.FreeDynamicMemory(&abyTmpData[i * nBufferDTSize]);
+        }
+    }
+
+    return true;
+}
+
+/************************************************************************/
+/*                      GDALMDArrayGetMeshGrid()                        */
+/************************************************************************/
+
+/** Return a list of multidimensional arrays from a list of one-dimensional
+ * arrays.
+ *
+ * This is typically used to transform one-dimensional longitude, latitude
+ * arrays into 2D ones.
+ *
+ * More formally, for one-dimensional arrays x1, x2,..., xn with lengths
+ * Ni=len(xi), returns (N1, N2, ..., Nn) shaped arrays if indexing="ij" or
+ * (N2, N1, ..., Nn) shaped arrays if indexing="xy" with the elements of xi
+ * repeated to fill the matrix along the first dimension for x1, the second
+ * for x2 and so on.
+ *
+ * For example, if x = [1, 2], and y = [3, 4, 5],
+ * GetMeshGrid([x, y], ["INDEXING=xy"]) will return [xm, ym] such that
+ * xm=[[1, 2],[1, 2],[1, 2]] and ym=[[3, 3],[4, 4],[5, 5]],
+ * or more generally xm[any index][i] = x[i] and ym[i][any index]=y[i]
+ *
+ * and
+ * GetMeshGrid([x, y], ["INDEXING=ij"]) will return [xm, ym] such that
+ * xm=[[1, 1, 1],[2, 2, 2]] and ym=[[3, 4, 5],[3, 4, 5]],
+ * or more generally xm[i][any index] = x[i] and ym[any index][i]=y[i]
+ *
+ * The currently supported options are:
+ * <ul>
+ * <li>INDEXING=xy/ij: Cartesian ("xy", default) or matrix ("ij") indexing of
+ * output.
+ * </li>
+ * </ul>
+ *
+ * This is the same as
+ * <a href="https://numpy.org/doc/stable/reference/generated/numpy.meshgrid.html">numpy.meshgrid()</a>
+ * function.
+ *
+ * This is the same as the C function GDALMDArrayGetMeshGrid()
+ *
+ * @param apoArrays Input arrays
+ * @param papszOptions NULL, or NULL terminated list of options.
+ *
+ * @return an array of coordinate matrices
+ * @since 3.10
+ */
+
+/* static */ std::vector<std::shared_ptr<GDALMDArray>> GDALMDArray::GetMeshGrid(
+    const std::vector<std::shared_ptr<GDALMDArray>> &apoArrays,
+    CSLConstList papszOptions)
+{
+    std::vector<std::shared_ptr<GDALMDArray>> ret;
+    for (const auto &poArray : apoArrays)
+    {
+        if (poArray->GetDimensionCount() != 1)
+        {
+            CPLError(CE_Failure, CPLE_NotSupported,
+                     "Only 1-D input arrays are accepted");
+            return ret;
+        }
+    }
+
+    const char *pszIndexing =
+        CSLFetchNameValueDef(papszOptions, "INDEXING", "xy");
+    if (!EQUAL(pszIndexing, "xy") && !EQUAL(pszIndexing, "ij"))
+    {
+        CPLError(CE_Failure, CPLE_NotSupported,
+                 "Only INDEXING=xy or ij is accepted");
+        return ret;
+    }
+    const bool bIJIndexing = EQUAL(pszIndexing, "ij");
+
+    for (size_t i = 0; i < apoArrays.size(); ++i)
+    {
+        ret.push_back(GDALMDArrayMeshGrid::Create(apoArrays, i, bIJIndexing));
+    }
+
+    return ret;
+}
diff --git a/gcore/gdalmultidim_priv.h b/gcore/gdalmultidim_priv.h
index fe1a4e71c212..6a87f121f538 100644
--- a/gcore/gdalmultidim_priv.h
+++ b/gcore/gdalmultidim_priv.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDALMULTIDIM_PRIV_INCLUDED
diff --git a/gcore/gdalmultidim_rat.cpp b/gcore/gdalmultidim_rat.cpp
index 6494ece2a0e8..b05cab584eba 100644
--- a/gcore/gdalmultidim_rat.cpp
+++ b/gcore/gdalmultidim_rat.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_priv.h"
diff --git a/gcore/gdalmultidim_subsetdimension.cpp b/gcore/gdalmultidim_subsetdimension.cpp
index a67e5a564ac4..0daa5b0a1533 100644
--- a/gcore/gdalmultidim_subsetdimension.cpp
+++ b/gcore/gdalmultidim_subsetdimension.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_priv.h"
diff --git a/gcore/gdalmultidomainmetadata.cpp b/gcore/gdalmultidomainmetadata.cpp
index 8068a3eff4f8..92a02ae7513b 100644
--- a/gcore/gdalmultidomainmetadata.cpp
+++ b/gcore/gdalmultidomainmetadata.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/gcore/gdalnodatamaskband.cpp b/gcore/gdalnodatamaskband.cpp
index cb2e5eb10c17..75a391dc1f58 100644
--- a/gcore/gdalnodatamaskband.cpp
+++ b/gcore/gdalnodatamaskband.cpp
@@ -9,29 +9,14 @@
  * Copyright (c) 2007, Frank Warmerdam
  * Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
 #include "gdal_priv.h"
 
 #include <algorithm>
+#include <cmath>
 #include <cstring>
 #include <utility>
 
@@ -146,7 +131,8 @@ static GDALDataType GetWorkDataType(GDALDataType eDataType)
             eWrkDT = eDataType;
             break;
 
-        default:
+        case GDT_Unknown:
+        case GDT_TypeCount:
             CPLAssert(false);
             eWrkDT = GDT_Float64;
             break;
@@ -200,7 +186,7 @@ bool GDALNoDataMaskBand::IsNoDataInRange(double dfNoDataValue,
 
         case GDT_Float32:
         {
-            return CPLIsNan(dfNoDataValue) || CPLIsInf(dfNoDataValue) ||
+            return std::isnan(dfNoDataValue) || std::isinf(dfNoDataValue) ||
                    GDALIsValueInRange<float>(dfNoDataValue);
         }
 
@@ -417,7 +403,7 @@ CPLErr GDALNoDataMaskBand::IRasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff,
             return eErr;
         }
 
-        const bool bIsNoDataNan = CPLIsNan(m_dfNoDataValue) != 0;
+        const bool bIsNoDataNan = std::isnan(m_dfNoDataValue) != 0;
         GByte *pabyDest = static_cast<GByte *>(pData);
 
         /* --------------------------------------------------------------------
@@ -475,7 +461,7 @@ CPLErr GDALNoDataMaskBand::IRasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff,
                     for (int iX = 0; iX < nBufXSize; iX++)
                     {
                         const float fVal = pafSrc[i];
-                        if (bIsNoDataNan && CPLIsNan(fVal))
+                        if (bIsNoDataNan && std::isnan(fVal))
                             *pabyLineDest = 0;
                         else if (ARE_REAL_EQUAL(fVal, fNoData))
                             *pabyLineDest = 0;
@@ -499,7 +485,7 @@ CPLErr GDALNoDataMaskBand::IRasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff,
                     for (int iX = 0; iX < nBufXSize; iX++)
                     {
                         const double dfVal = padfSrc[i];
-                        if (bIsNoDataNan && CPLIsNan(dfVal))
+                        if (bIsNoDataNan && std::isnan(dfVal))
                             *pabyLineDest = 0;
                         else if (ARE_REAL_EQUAL(dfVal, m_dfNoDataValue))
                             *pabyLineDest = 0;
diff --git a/gcore/gdalnodatavaluesmaskband.cpp b/gcore/gdalnodatavaluesmaskband.cpp
index 85f4eb631844..bf3eb0421c12 100644
--- a/gcore/gdalnodatavaluesmaskband.cpp
+++ b/gcore/gdalnodatavaluesmaskband.cpp
@@ -10,23 +10,7 @@
  ******************************************************************************
  * Copyright (c) 2008-2009, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/gcore/gdalopeninfo.cpp b/gcore/gdalopeninfo.cpp
index a93d52eebbed..d9d757783eb3 100644
--- a/gcore/gdalopeninfo.cpp
+++ b/gcore/gdalopeninfo.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2002, Frank Warmerdam
  * Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_priv.h"  // Must be included first for mingw VSIStatBufL.
@@ -404,7 +388,12 @@ GDALOpenInfo::~GDALOpenInfo()
 /************************************************************************/
 
 /** Return sibling files.
- * @return sibling files. Ownership below to the object.
+ *
+ * If the list of sibling files has not already been established, it will be,
+ * unless the GDAL_DISABLE_READDIR_ON_OPEN configuration option has been set to
+ * YES or EMPTY_DIR when this instance was constructed.
+ *
+ * @return sibling files. Ownership belongs to "this".
  */
 char **GDALOpenInfo::GetSiblingFiles()
 {
@@ -487,3 +476,22 @@ int GDALOpenInfo::TryToIngest(int nBytes)
 
     return TRUE;
 }
+
+/************************************************************************/
+/*                       IsSingleAllowedDriver()                        */
+/************************************************************************/
+
+/** Returns true if the driver name is the single in the list of allowed
+ * drivers.
+ *
+ * @param pszDriverName Driver name to test.
+ * @return true if the driver name is the single in the list of allowed
+ * drivers.
+ * @since GDAL 3.10
+ */
+bool GDALOpenInfo::IsSingleAllowedDriver(const char *pszDriverName) const
+{
+    return papszAllowedDrivers && papszAllowedDrivers[0] &&
+           !papszAllowedDrivers[1] &&
+           EQUAL(papszAllowedDrivers[0], pszDriverName);
+}
diff --git a/gcore/gdalorienteddataset.cpp b/gcore/gdalorienteddataset.cpp
index 11e49b4ebcd7..689f500cb0ac 100644
--- a/gcore/gdalorienteddataset.cpp
+++ b/gcore/gdalorienteddataset.cpp
@@ -7,23 +7,7 @@
  **********************************************************************
  * Copyright (c) 2022, Even Rouault, <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdalorienteddataset.h"
@@ -149,8 +133,7 @@ CPLErr GDALOrientedRasterBand::IReadBlock(int nBlockXOff, int nBlockYOff,
             }
             else
             {
-                osTmpName =
-                    CPLSPrintf("/vsimem/_gdalorienteddataset/%p.tif", this);
+                osTmpName = VSIMemGenerateHiddenFilename(nullptr);
             }
         }
         GDALTranslateOptions *psOptions =
diff --git a/gcore/gdalorienteddataset.h b/gcore/gdalorienteddataset.h
index 2c6248b6a811..dd38a98c9ebc 100644
--- a/gcore/gdalorienteddataset.h
+++ b/gcore/gdalorienteddataset.h
@@ -7,23 +7,7 @@
  **********************************************************************
  * Copyright (c) 2022, Even Rouault, <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_ORIENTED_DATASET_H
diff --git a/gcore/gdaloverviewdataset.cpp b/gcore/gdaloverviewdataset.cpp
index 16b8b8927666..a46799176b0b 100644
--- a/gcore/gdaloverviewdataset.cpp
+++ b/gcore/gdaloverviewdataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Even Rouault, <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -71,7 +55,8 @@ class GDALOverviewDataset final : public GDALDataset
     GDALOverviewBand *m_poMaskBand = nullptr;
 
     static void Rescale(char **&papszMD, const char *pszItem, double dfRatio,
-                        double dfDefaultVal);
+                        double dfDefaultVal, double dfPreShift = 0,
+                        double dfPostShift = 0);
 
   protected:
     CPLErr IRasterIO(GDALRWFlag, int, int, int, int, void *, int, int,
@@ -455,13 +440,18 @@ const GDAL_GCP *GDALOverviewDataset::GetGCPs()
 /*                             Rescale()                                */
 /************************************************************************/
 
+/* static */
 void GDALOverviewDataset::Rescale(char **&papszMD, const char *pszItem,
-                                  double dfRatio, double dfDefaultVal)
+                                  double dfRatio, double dfDefaultVal,
+                                  double dfPreShift /*= 0*/,
+                                  double dfPostShift /*= 0*/)
 {
     double dfVal = CPLAtofM(CSLFetchNameValueDef(
-        papszMD, pszItem, CPLSPrintf("%.18g", dfDefaultVal)));
+        papszMD, pszItem, CPLSPrintf("%.17g", dfDefaultVal)));
+    dfVal += dfPreShift;
     dfVal *= dfRatio;
-    papszMD = CSLSetNameValue(papszMD, pszItem, CPLSPrintf("%.18g", dfVal));
+    dfVal += dfPostShift;
+    papszMD = CSLSetNameValue(papszMD, pszItem, CPLSPrintf("%.17g", dfVal));
 }
 
 /************************************************************************/
@@ -487,18 +477,20 @@ char **GDALOverviewDataset::GetMetadata(const char *pszDomain)
             return papszMD_RPC;
         papszMD_RPC = CSLDuplicate(papszMD);
 
-        Rescale(papszMD_RPC, RPC_LINE_OFF,
-                static_cast<double>(nRasterYSize) / poMainDS->GetRasterYSize(),
-                0.0);
-        Rescale(papszMD_RPC, RPC_LINE_SCALE,
-                static_cast<double>(nRasterYSize) / poMainDS->GetRasterYSize(),
-                1.0);
-        Rescale(papszMD_RPC, RPC_SAMP_OFF,
-                static_cast<double>(nRasterXSize) / poMainDS->GetRasterXSize(),
-                0.0);
-        Rescale(papszMD_RPC, RPC_SAMP_SCALE,
-                static_cast<double>(nRasterXSize) / poMainDS->GetRasterXSize(),
-                1.0);
+        const double dfXRatio =
+            static_cast<double>(nRasterXSize) / poMainDS->GetRasterXSize();
+        const double dfYRatio =
+            static_cast<double>(nRasterYSize) / poMainDS->GetRasterYSize();
+
+        // For line offset and pixel offset, we need to convert from RPC
+        // pixel center registration convention to GDAL pixel top-left corner
+        // registration convention by adding an initial 0.5 shift, and un-apply
+        // it after scaling.
+
+        Rescale(papszMD_RPC, RPC_LINE_OFF, dfYRatio, 0.0, 0.5, -0.5);
+        Rescale(papszMD_RPC, RPC_LINE_SCALE, dfYRatio, 1.0);
+        Rescale(papszMD_RPC, RPC_SAMP_OFF, dfXRatio, 0.0, 0.5, -0.5);
+        Rescale(papszMD_RPC, RPC_SAMP_SCALE, dfXRatio, 1.0);
 
         papszMD = papszMD_RPC;
     }
diff --git a/gcore/gdalpamdataset.cpp b/gcore/gdalpamdataset.cpp
index acc2a96b616b..19bff652e651 100644
--- a/gcore/gdalpamdataset.cpp
+++ b/gcore/gdalpamdataset.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -702,7 +686,9 @@ CPLErr GDALPamDataset::XMLInit(const CPLXMLNode *psTree, const char *pszUnused)
          psIter = psIter->psNext)
     {
         if (psIter->eType == CXT_Element &&
-            strcmp(psIter->pszValue, "Array") == 0)
+            (strcmp(psIter->pszValue, "Array") == 0 ||
+             (psPam->osDerivedDatasetName.empty() &&
+              strcmp(psIter->pszValue, "DerivedDataset") == 0)))
         {
             CPLXMLNode sArrayTmp = *psIter;
             sArrayTmp.psNext = nullptr;
@@ -865,7 +851,7 @@ int GDALPamDataset::IsPamFilenameAPotentialSiblingFile()
 /*                             TryLoadXML()                             */
 /************************************************************************/
 
-CPLErr GDALPamDataset::TryLoadXML(char **papszSiblingFiles)
+CPLErr GDALPamDataset::TryLoadXML(CSLConstList papszSiblingFiles)
 
 {
     PamInitialize();
@@ -1401,7 +1387,8 @@ CPLErr GDALPamDataset::GetGeoTransform(double *padfTransform)
 {
     if (psPam && psPam->bHaveGeoTransform)
     {
-        memcpy(padfTransform, psPam->adfGeoTransform, sizeof(double) * 6);
+        memcpy(padfTransform, psPam->adfGeoTransform.data(),
+               sizeof(psPam->adfGeoTransform));
         return CE_None;
     }
 
@@ -1421,7 +1408,8 @@ CPLErr GDALPamDataset::SetGeoTransform(double *padfTransform)
     {
         MarkPamDirty();
         psPam->bHaveGeoTransform = TRUE;
-        memcpy(psPam->adfGeoTransform, padfTransform, sizeof(double) * 6);
+        memcpy(psPam->adfGeoTransform.data(), padfTransform,
+               sizeof(psPam->adfGeoTransform));
         return (CE_None);
     }
 
@@ -1628,7 +1616,7 @@ char **GDALPamDataset::GetMetadata(const char *pszDomain)
 /************************************************************************/
 
 //! @cond Doxygen_Suppress
-CPLErr GDALPamDataset::TryLoadAux(char **papszSiblingFiles)
+CPLErr GDALPamDataset::TryLoadAux(CSLConstList papszSiblingFiles)
 
 {
     /* -------------------------------------------------------------------- */
@@ -1687,7 +1675,7 @@ CPLErr GDALPamDataset::TryLoadAux(char **papszSiblingFiles)
     /* -------------------------------------------------------------------- */
     /*      Geotransform.                                                   */
     /* -------------------------------------------------------------------- */
-    if (poAuxDS->GetGeoTransform(psPam->adfGeoTransform) == CE_None)
+    if (poAuxDS->GetGeoTransform(psPam->adfGeoTransform.data()) == CE_None)
         psPam->bHaveGeoTransform = TRUE;
 
     /* -------------------------------------------------------------------- */
@@ -1802,7 +1790,7 @@ void GDALPamDataset::ClearStatistics()
         GDALRasterBand *poBand = GetRasterBand(i);
         CPLStringList aosNewMD;
         for (const char *pszStr :
-             cpl::Iterate(CSLConstList(poBand->GetMetadata())))
+             cpl::Iterate(static_cast<CSLConstList>(poBand->GetMetadata())))
         {
             if (STARTS_WITH_CI(pszStr, "STATISTICS_"))
             {
diff --git a/gcore/gdalpamproxydb.cpp b/gcore/gdalpamproxydb.cpp
index fdcc2e654dd4..14b4cc260613 100644
--- a/gcore/gdalpamproxydb.cpp
+++ b/gcore/gdalpamproxydb.cpp
@@ -10,23 +10,7 @@
  ******************************************************************************
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -295,6 +279,7 @@ static void InitProxyDB()
     {
         CPLMutexHolderD(&hProxyDBLock);
         // cppcheck-suppress identicalInnerCondition
+        // cppcheck-suppress knownConditionTrueFalse
         if (!bProxyDBInitialized)
         {
             const char *pszProxyDir =
diff --git a/gcore/gdalpamrasterband.cpp b/gcore/gdalpamrasterband.cpp
index b168ee81f319..69f3a1752b4f 100644
--- a/gcore/gdalpamrasterband.cpp
+++ b/gcore/gdalpamrasterband.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -50,6 +34,61 @@
 #include "gdal_priv.h"
 #include "gdal_rat.h"
 
+/************************************************************************/
+/*                           CopyFrom()                                 */
+/************************************************************************/
+
+//! @cond Doxygen_Suppress
+
+void GDALRasterBandPamInfo::CopyFrom(const GDALRasterBandPamInfo &sOther)
+{
+    bNoDataValueSet = sOther.bNoDataValueSet;
+    bNoDataValueSetAsInt64 = sOther.bNoDataValueSetAsInt64;
+    bNoDataValueSetAsUInt64 = sOther.bNoDataValueSetAsUInt64;
+
+    dfNoDataValue = sOther.dfNoDataValue;
+    nNoDataValueInt64 = sOther.nNoDataValueInt64;
+    nNoDataValueUInt64 = sOther.nNoDataValueUInt64;
+
+    delete poColorTable;
+    poColorTable = sOther.poColorTable
+                       ? new GDALColorTable(*(sOther.poColorTable))
+                       : nullptr;
+
+    eColorInterp = sOther.eColorInterp;
+
+    CPLFree(pszUnitType);
+    pszUnitType = sOther.pszUnitType ? CPLStrdup(sOther.pszUnitType) : nullptr;
+
+    CSLDestroy(papszCategoryNames);
+    papszCategoryNames = CSLDuplicate(sOther.papszCategoryNames);
+
+    dfOffset = sOther.dfOffset;
+    dfScale = sOther.dfScale;
+
+    bHaveMinMax = sOther.bHaveMinMax;
+    dfMin = sOther.dfMin;
+    dfMax = sOther.dfMax;
+
+    bHaveStats = sOther.bHaveStats;
+    dfMean = sOther.dfMean;
+    dfStdDev = sOther.dfStdDev;
+
+    if (psSavedHistograms)
+        CPLDestroyXMLNode(psSavedHistograms);
+    psSavedHistograms = sOther.psSavedHistograms
+                            ? CPLCloneXMLTree(sOther.psSavedHistograms)
+                            : nullptr;
+
+    delete poDefaultRAT;
+    poDefaultRAT = sOther.poDefaultRAT ? sOther.poDefaultRAT->Clone() : nullptr;
+
+    bOffsetSet = sOther.bOffsetSet;
+    bScaleSet = sOther.bScaleSet;
+}
+
+//! @endcond
+
 /************************************************************************/
 /*                         GDALPamRasterBand()                          */
 /************************************************************************/
@@ -111,7 +150,7 @@ CPLXMLNode *GDALPamRasterBand::SerializeToXML(const char * /* pszUnused */)
 
     if (psPam->bNoDataValueSet)
     {
-        if (CPLIsNan(psPam->dfNoDataValue))
+        if (std::isnan(psPam->dfNoDataValue))
             CPLSetXMLValue(psTree, "NoDataValue", "nan");
         else
             CPLSetXMLValue(psTree, "NoDataValue",
diff --git a/gcore/gdalproxydataset.cpp b/gcore/gdalproxydataset.cpp
index 4209c8aad2da..b34c178e9931 100644
--- a/gcore/gdalproxydataset.cpp
+++ b/gcore/gdalproxydataset.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -137,6 +121,17 @@ CPLErr GDALProxyDataset::IRasterIO(
     return ret;
 }
 
+D_PROXY_METHOD_WITH_RET(CPLErr, CE_Failure, BlockBasedRasterIO,
+                        (GDALRWFlag eRWFlag, int nXOff, int nYOff, int nXSize,
+                         int nYSize, void *pData, int nBufXSize, int nBufYSize,
+                         GDALDataType eBufType, int nBandCount,
+                         const int *panBandMap, GSpacing nPixelSpace,
+                         GSpacing nLineSpace, GSpacing nBandSpace,
+                         GDALRasterIOExtraArg *psExtraArg),
+                        (eRWFlag, nXOff, nYOff, nXSize, nYSize, pData,
+                         nBufXSize, nBufYSize, eBufType, nBandCount, panBandMap,
+                         nPixelSpace, nLineSpace, nBandSpace, psExtraArg))
+
 D_PROXY_METHOD_WITH_RET(CPLErr, CE_Failure, IBuildOverviews,
                         (const char *pszResampling, int nOverviews,
                          const int *panOverviewList, int nListBands,
@@ -159,17 +154,8 @@ D_PROXY_METHOD_WITH_RET(CPLErr, CE_Failure, ReadCompressedData,
                          panBandList, ppBuffer, pnBufferSize,
                          ppszDetailedFormat))
 
-CPLErr GDALProxyDataset::FlushCache(bool bAtClosing)
-{
-    CPLErr eErr = CE_None;
-    GDALDataset *poUnderlyingDataset = RefUnderlyingDataset();
-    if (poUnderlyingDataset)
-    {
-        eErr = poUnderlyingDataset->FlushCache(bAtClosing);
-        UnrefUnderlyingDataset(poUnderlyingDataset);
-    }
-    return eErr;
-}
+D_PROXY_METHOD_WITH_RET(CPLErr, CE_None, FlushCache, (bool bAtClosing),
+                        (bAtClosing))
 
 D_PROXY_METHOD_WITH_RET(char **, nullptr, GetMetadataDomainList, (), ())
 D_PROXY_METHOD_WITH_RET(char **, nullptr, GetMetadata, (const char *pszDomain),
@@ -339,6 +325,25 @@ CPLErr GDALProxyRasterBand::IRasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff,
     return ret;
 }
 
+int GDALProxyRasterBand::IGetDataCoverageStatus(int nXOff, int nYOff,
+                                                int nXSize, int nYSize,
+                                                int nMaskFlagStop,
+                                                double *pdfDataPct)
+{
+    if (pdfDataPct)
+        *pdfDataPct = 0.0;
+    int ret = GDAL_DATA_COVERAGE_STATUS_UNIMPLEMENTED |
+              GDAL_DATA_COVERAGE_STATUS_EMPTY;
+    GDALRasterBand *poSrcBand = RefUnderlyingRasterBand();
+    if (poSrcBand)
+    {
+        ret = poSrcBand->GetDataCoverageStatus(nXOff, nYOff, nXSize, nYSize,
+                                               nMaskFlagStop, pdfDataPct);
+        UnrefUnderlyingRasterBand(poSrcBand);
+    }
+    return ret;
+}
+
 RB_PROXY_METHOD_WITH_RET(char **, nullptr, GetMetadataDomainList, (), ())
 RB_PROXY_METHOD_WITH_RET(char **, nullptr, GetMetadata, (const char *pszDomain),
                          (pszDomain))
@@ -367,6 +372,18 @@ RB_PROXY_METHOD_WITH_RET(CPLErr, CE_Failure, SetMetadataItem,
                           const char *pszDomain),
                          (pszName, pszValue, pszDomain))
 
+RB_PROXY_METHOD_WITH_RET(GDALRasterBlock *, nullptr, GetLockedBlockRef,
+                         (int nXBlockOff, int nYBlockOff, int bJustInitialize),
+                         (nXBlockOff, nYBlockOff, bJustInitialize))
+
+RB_PROXY_METHOD_WITH_RET(GDALRasterBlock *, nullptr, TryGetLockedBlockRef,
+                         (int nXBlockOff, int nYBlockOff),
+                         (nXBlockOff, nYBlockOff))
+
+RB_PROXY_METHOD_WITH_RET(CPLErr, CE_Failure, FlushBlock,
+                         (int nXBlockOff, int nYBlockOff, int bWriteDirtyBlock),
+                         (nXBlockOff, nYBlockOff, bWriteDirtyBlock))
+
 CPLErr GDALProxyRasterBand::FlushCache(bool bAtClosing)
 {
     // We need to make sure that all cached bocks at the proxy level are
@@ -493,6 +510,22 @@ RB_PROXY_METHOD_WITH_RET(CPLVirtualMem *, nullptr, GetVirtualMemAuto,
                           GIntBig *pnLineSpace, char **papszOptions),
                          (eRWFlag, pnPixelSpace, pnLineSpace, papszOptions))
 
+RB_PROXY_METHOD_WITH_RET(
+    CPLErr, CE_Failure, InterpolateAtPoint,
+    (double dfPixel, double dfLine, GDALRIOResampleAlg eInterpolation,
+     double *pdfRealValue, double *pdfImagValue = nullptr) const,
+    (dfPixel, dfLine, eInterpolation, pdfRealValue, pdfImagValue))
+
+void GDALProxyRasterBand::EnablePixelTypeSignedByteWarning(bool b)
+{
+    GDALRasterBand *poSrcBand = RefUnderlyingRasterBand();
+    if (poSrcBand)
+    {
+        poSrcBand->EnablePixelTypeSignedByteWarning(b);
+        UnrefUnderlyingRasterBand(poSrcBand);
+    }
+}
+
 /************************************************************************/
 /*                 UnrefUnderlyingRasterBand()                        */
 /************************************************************************/
diff --git a/gcore/gdalproxypool.cpp b/gcore/gdalproxypool.cpp
index 1aea549f9017..b3fc6929c00f 100644
--- a/gcore/gdalproxypool.cpp
+++ b/gcore/gdalproxypool.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -80,6 +64,17 @@ struct _GDALProxyPoolCacheEntry
     GDALProxyPoolCacheEntry *next;
 };
 
+// This variable prevents a dataset that is going to be opened in
+// GDALDatasetPool::_RefDataset from increasing refCount if, during its
+// opening, it creates a GDALProxyPoolDataset.
+// We increment it before opening or closing a cached dataset and decrement
+// it afterwards
+// The typical use case is a VRT made of simple sources that are VRT
+// We don't want the "inner" VRT to take a reference on the pool, otherwise
+// there is a high chance that this reference will not be dropped and the pool
+// remain ghost.
+static thread_local int refCountOfDisabledRefCount = 0;
+
 class GDALDatasetPool
 {
   private:
@@ -88,7 +83,7 @@ class GDALDatasetPool
     /* Ref count of the pool singleton */
     /* Taken by "toplevel" GDALProxyPoolDataset in its constructor and released
      */
-    /* in its destructor. See also refCountOfDisableRefCount for the difference
+    /* in its destructor. See also refCountOfDisabledRefCount for the difference
      */
     /* between toplevel and inner GDALProxyPoolDataset */
     int refCount = 0;
@@ -100,19 +95,6 @@ class GDALDatasetPool
     GDALProxyPoolCacheEntry *firstEntry = nullptr;
     GDALProxyPoolCacheEntry *lastEntry = nullptr;
 
-    /* This variable prevents a dataset that is going to be opened in
-     * GDALDatasetPool::_RefDataset */
-    /* from increasing refCount if, during its opening, it creates a
-     * GDALProxyPoolDataset */
-    /* We increment it before opening or closing a cached dataset and decrement
-     * it afterwards */
-    /* The typical use case is a VRT made of simple sources that are VRT */
-    /* We don't want the "inner" VRT to take a reference on the pool, otherwise
-     * there is */
-    /* a high chance that this reference will not be dropped and the pool remain
-     * ghost */
-    int refCountOfDisableRefCount = 0;
-
     /* Caution : to be sure that we don't run out of entries, size must be at */
     /* least greater or equal than the maximum number of threads */
     explicit GDALDatasetPool(int maxSize, int64_t nMaxRAMUsage);
@@ -256,6 +238,9 @@ GDALDatasetPool::_RefDataset(const char *pszFileName, GDALAccess eAccess,
                              CSLConstList papszOpenOptions, int bShared,
                              bool bForceOpen, const char *pszOwner)
 {
+    CPLMutex **pMutex = GDALGetphDLMutex();
+    CPLMutexHolderD(pMutex);
+
     if (bInDestruction)
         return nullptr;
 
@@ -293,9 +278,9 @@ GDALDatasetPool::_RefDataset(const char *pszFileName, GDALAccess eAccess,
             /* dataset */
             GDALSetResponsiblePIDForCurrentThread(candidate->responsiblePID);
 
-            refCountOfDisableRefCount++;
+            refCountOfDisabledRefCount++;
             GDALClose(candidate->poDS);
-            refCountOfDisableRefCount--;
+            refCountOfDisabledRefCount--;
 
             candidate->poDS = nullptr;
             GDALSetResponsiblePIDForCurrentThread(responsiblePID);
@@ -340,7 +325,7 @@ GDALDatasetPool::_RefDataset(const char *pszFileName, GDALAccess eAccess,
     {
         GDALProxyPoolCacheEntry *next = cur->next;
 
-        if (cur->pszFileNameAndOpenOptions &&
+        if (cur->refCount >= 0 && cur->pszFileNameAndOpenOptions &&
             osFilenameAndOO == cur->pszFileNameAndOpenOptions &&
             ((bShared && cur->responsiblePID == responsiblePID &&
               ((cur->pszOwner == nullptr && pszOwner == nullptr) ||
@@ -414,16 +399,25 @@ GDALDatasetPool::_RefDataset(const char *pszFileName, GDALAccess eAccess,
     cur->pszFileNameAndOpenOptions = CPLStrdup(osFilenameAndOO.c_str());
     cur->pszOwner = (pszOwner) ? CPLStrdup(pszOwner) : nullptr;
     cur->responsiblePID = responsiblePID;
-    cur->refCount = 1;
+    cur->refCount = -1;  // to mark loading of dataset in progress
     cur->nRAMUsage = 0;
 
-    refCountOfDisableRefCount++;
-    int nFlag = ((eAccess == GA_Update) ? GDAL_OF_UPDATE : GDAL_OF_READONLY) |
-                GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR;
+    refCountOfDisabledRefCount++;
+    const int nFlag =
+        ((eAccess == GA_Update) ? GDAL_OF_UPDATE : GDAL_OF_READONLY) |
+        GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR;
     CPLConfigOptionSetter oSetter("CPL_ALLOW_VSISTDIN", "NO", true);
-    cur->poDS = GDALDataset::Open(pszFileName, nFlag, nullptr, papszOpenOptions,
+
+    // Release mutex while opening dataset to avoid lock contention.
+    CPLReleaseMutex(*pMutex);
+    auto poDS = GDALDataset::Open(pszFileName, nFlag, nullptr, papszOpenOptions,
                                   nullptr);
-    refCountOfDisableRefCount--;
+    CPLAcquireMutex(*pMutex, 1000.0);
+
+    cur->poDS = poDS;
+    cur->refCount = 1;
+
+    refCountOfDisabledRefCount--;
 
     if (cur->poDS)
     {
@@ -489,9 +483,9 @@ void GDALDatasetPool::_CloseDatasetIfZeroRefCount(const char *pszFileName,
             CPLFree(cur->pszOwner);
             cur->pszOwner = nullptr;
 
-            refCountOfDisableRefCount++;
+            refCountOfDisabledRefCount++;
             GDALClose(poDS);
-            refCountOfDisableRefCount--;
+            refCountOfDisabledRefCount--;
 
             GDALSetResponsiblePIDForCurrentThread(responsiblePID);
             break;
@@ -501,6 +495,23 @@ void GDALDatasetPool::_CloseDatasetIfZeroRefCount(const char *pszFileName,
     }
 }
 
+/************************************************************************/
+/*                       GDALGetMaxDatasetPoolSize()                    */
+/************************************************************************/
+
+/** Return the maximum number of datasets simultaneously opened in the
+ * dataset pool.
+ */
+int GDALGetMaxDatasetPoolSize()
+{
+    int nSize = atoi(CPLGetConfigOption("GDAL_MAX_DATASET_POOL_SIZE", "100"));
+    if (nSize < 2)
+        nSize = 2;
+    else if (nSize > 1000)
+        nSize = 1000;
+    return nSize;
+}
+
 /************************************************************************/
 /*                                 Ref()                                */
 /************************************************************************/
@@ -510,12 +521,6 @@ void GDALDatasetPool::Ref()
     CPLMutexHolderD(GDALGetphDLMutex());
     if (singleton == nullptr)
     {
-        int l_maxSize =
-            atoi(CPLGetConfigOption("GDAL_MAX_DATASET_POOL_SIZE", "100"));
-        if (l_maxSize < 2)
-            l_maxSize = 2;
-        else if (l_maxSize > 1000)
-            l_maxSize = 1000;
 
         // Try to not consume more than 25% of the usable RAM
         GIntBig l_nMaxRAMUsage =
@@ -531,9 +536,10 @@ void GDALDatasetPool::Ref()
                 l_nMaxRAMUsage *= 1024 * 1024 * 1024;
         }
 
-        singleton = new GDALDatasetPool(l_maxSize, l_nMaxRAMUsage);
+        singleton =
+            new GDALDatasetPool(GDALGetMaxDatasetPoolSize(), l_nMaxRAMUsage);
     }
-    if (singleton->refCountOfDisableRefCount == 0)
+    if (refCountOfDisabledRefCount == 0)
         singleton->refCount++;
 }
 
@@ -543,7 +549,7 @@ void GDALDatasetPool::PreventDestroy()
     CPLMutexHolderD(GDALGetphDLMutex());
     if (!singleton)
         return;
-    singleton->refCountOfDisableRefCount++;
+    refCountOfDisabledRefCount++;
 }
 
 /* keep that in sync with gdaldrivermanager.cpp */
@@ -566,7 +572,7 @@ void GDALDatasetPool::Unref()
         CPLAssert(false);
         return;
     }
-    if (singleton->refCountOfDisableRefCount == 0)
+    if (refCountOfDisabledRefCount == 0)
     {
         singleton->refCount--;
         if (singleton->refCount == 0)
@@ -583,8 +589,8 @@ void GDALDatasetPool::ForceDestroy()
     CPLMutexHolderD(GDALGetphDLMutex());
     if (!singleton)
         return;
-    singleton->refCountOfDisableRefCount--;
-    CPLAssert(singleton->refCountOfDisableRefCount == 0);
+    refCountOfDisabledRefCount--;
+    CPLAssert(refCountOfDisabledRefCount == 0);
     singleton->refCount = 0;
     delete singleton;
     singleton = nullptr;
@@ -607,7 +613,6 @@ GDALDatasetPool::RefDataset(const char *pszFileName, GDALAccess eAccess,
                             char **papszOpenOptions, int bShared,
                             bool bForceOpen, const char *pszOwner)
 {
-    CPLMutexHolderD(GDALGetphDLMutex());
     return singleton->_RefDataset(pszFileName, eAccess, papszOpenOptions,
                                   bShared, bForceOpen, pszOwner);
 }
@@ -1171,7 +1176,7 @@ GDALProxyPoolDatasetH GDALProxyPoolDatasetCreate(
 /*                       GDALProxyPoolDatasetDelete()                   */
 /************************************************************************/
 
-void CPL_DLL GDALProxyPoolDatasetDelete(GDALProxyPoolDatasetH hProxyPoolDataset)
+void GDALProxyPoolDatasetDelete(GDALProxyPoolDatasetH hProxyPoolDataset)
 {
     delete reinterpret_cast<GDALProxyPoolDataset *>(hProxyPoolDataset);
 }
diff --git a/gcore/gdalpython.cpp b/gcore/gdalpython.cpp
index a70756c55e33..9e52bd1d1c55 100644
--- a/gcore/gdalpython.cpp
+++ b/gcore/gdalpython.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2017-2019, Even Rouault, <even dot rouault at spatialys dot
  *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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
@@ -378,7 +362,7 @@ static bool LoadPythonAPI()
                                                         "-c", pszPrintVersion,
                                                         nullptr};
                         const CPLString osTmpFilename(
-                            "/vsimem/LoadPythonAPI/out.txt");
+                            VSIMemGenerateHiddenFilename("out.txt"));
                         VSILFILE *fout = VSIFOpenL(osTmpFilename, "wb+");
                         if (CPLSpawn(apszArgv, nullptr, fout, FALSE) == 0)
                         {
@@ -428,10 +412,10 @@ static bool LoadPythonAPI()
         const char *const apszPythonSO[] = {
             "libpython3.8." SO_EXT,  "libpython3.9." SO_EXT,
             "libpython3.10." SO_EXT, "libpython3.11." SO_EXT,
-            "libpython3.12." SO_EXT, "libpython3.7m." SO_EXT,
-            "libpython3.6m." SO_EXT, "libpython3.5m." SO_EXT,
-            "libpython3.4m." SO_EXT, "libpython3.3." SO_EXT,
-            "libpython3.2." SO_EXT};
+            "libpython3.12." SO_EXT, "libpython3.13." SO_EXT,
+            "libpython3.7m." SO_EXT, "libpython3.6m." SO_EXT,
+            "libpython3.5m." SO_EXT, "libpython3.4m." SO_EXT,
+            "libpython3.3." SO_EXT,  "libpython3.2." SO_EXT};
         for (size_t i = 0;
              libHandle == nullptr && i < CPL_ARRAYSIZE(apszPythonSO); ++i)
         {
@@ -623,9 +607,9 @@ static bool LoadPythonAPI()
     if (libHandle == nullptr)
     {
         const char *const apszPythonSO[] = {
-            "python38.dll",  "python39.dll", "python310.dll", "python311.dll",
-            "python312.dll", "python37.dll", "python36.dll",  "python35.dll",
-            "python34.dll",  "python33.dll", "python32.dll"};
+            "python38.dll",  "python39.dll",  "python310.dll", "python311.dll",
+            "python312.dll", "python313.dll", "python37.dll",  "python36.dll",
+            "python35.dll",  "python34.dll",  "python33.dll",  "python32.dll"};
         UINT uOldErrorMode;
         uOldErrorMode =
             SetErrorMode(SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS);
diff --git a/gcore/gdalpython.h b/gcore/gdalpython.h
index ac82fe841cdd..6398b73bca83 100644
--- a/gcore/gdalpython.h
+++ b/gcore/gdalpython.h
@@ -8,23 +8,7 @@
  * Copyright (c) 2017-2019, Even Rouault, <even dot rouault at spatialys dot
  *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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDALPYTHON_H_INCLUDED
diff --git a/gcore/gdalpythondriverloader.cpp b/gcore/gdalpythondriverloader.cpp
index e76c5d1326f1..3ac054b5fee3 100644
--- a/gcore/gdalpythondriverloader.cpp
+++ b/gcore/gdalpythondriverloader.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2017-2019, Even Rouault, <even dot rouault at spatialys dot
  *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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/gcore/gdalrasterband.cpp b/gcore/gdalrasterband.cpp
index d971f38f8dac..bf2da7a2893f 100644
--- a/gcore/gdalrasterband.cpp
+++ b/gcore/gdalrasterband.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 1998, Frank Warmerdam
  * Copyright (c) 2007-2016, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -53,6 +37,7 @@
 #include "gdal.h"
 #include "gdal_rat.h"
 #include "gdal_priv_templates.hpp"
+#include "gdal_interpolateatpoint.h"
 
 /************************************************************************/
 /*                           GDALRasterBand()                           */
@@ -98,13 +83,16 @@ GDALRasterBand::~GDALRasterBand()
             static_cast<GIntBig>(nBlocksPerRow) * nBlocksPerColumn &&
         nBand == 1 && poDS != nullptr)
     {
-        CPLDebug("GDAL", "%d block reads on %d block band 1 of %s.",
-                 nBlockReads, nBlocksPerRow * nBlocksPerColumn,
-                 poDS->GetDescription());
+        CPLDebug(
+            "GDAL", "%d block reads on " CPL_FRMT_GIB " block band 1 of %s.",
+            nBlockReads, static_cast<GIntBig>(nBlocksPerRow) * nBlocksPerColumn,
+            poDS->GetDescription());
     }
 
     InvalidateMaskBand();
     nBand = -nBand;
+
+    delete m_poPointsCache;
 }
 
 /************************************************************************/
@@ -129,6 +117,12 @@ GDALRasterBand::~GDALRasterBand()
  * buffer size (nBufXSize x nBufYSize) is different than the size of the
  * region being accessed (nXSize x nYSize).
  *
+ * The window of interest expressed by (nXOff, nYOff, nXSize, nYSize) should be
+ * fully within the raster space, that is nXOff >= 0, nYOff >= 0,
+ * nXOff + nXSize <= GetXSize() and nYOff + nYSize <= GetYSize().
+ * If reads larger than the raster space are wished, GDALTranslate() might be used.
+ * Or use nLineSpace and a possibly shifted pData value.
+ *
  * The nPixelSpace and nLineSpace parameters allow reading into or
  * writing from unusually organized buffers. This is primarily used
  * for buffers containing more than one bands raster data in interleaved
@@ -230,6 +224,12 @@ GDALRasterBand::~GDALRasterBand()
  * buffer size (nBufXSize x nBufYSize) is different than the size of the
  * region being accessed (nXSize x nYSize).
  *
+ * The window of interest expressed by (nXOff, nYOff, nXSize, nYSize) should be
+ * fully within the raster space, that is nXOff >= 0, nYOff >= 0,
+ * nXOff + nXSize <= GetXSize() and nYOff + nYSize <= GetYSize().
+ * If reads larger than the raster space are wished, GDALTranslate() might be used.
+ * Or use nLineSpace and a possibly shifted pData value.
+ *
  * The nPixelSpace and nLineSpace parameters allow reading into or
  * writing from unusually organized buffers. This is primarily used
  * for buffers containing more than one bands raster data in interleaved
@@ -261,6 +261,13 @@ GDALRasterBand::~GDALRasterBand()
  * This method is the same as the C GDALRasterIO() or GDALRasterIOEx()
  * functions.
  *
+ * Starting with GDAL 3.10, the GDALRasterBand::ReadRaster() methods may be
+ * more convenient to use for most common use cases.
+ *
+ * As nearly all GDAL methods, this method is *NOT* thread-safe, that is it cannot
+ * be called on the same GDALRasterBand instance (or another GDALRasterBand
+ * instance of this dataset) concurrently from several threads.
+ *
  * @param eRWFlag Either GF_Read to read a region of data, or GF_Write to
  * write a region of data.
  *
@@ -305,6 +312,8 @@ GDALRasterBand::~GDALRasterBand()
  * to one of BILINEAR, CUBIC, CUBICSPLINE, LANCZOS, AVERAGE or MODE.
  *
  * @return CE_Failure if the access fails, otherwise CE_None.
+ *
+ * @see GDALRasterBand::ReadRaster()
  */
 
 CPLErr GDALRasterBand::RasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff,
@@ -489,6 +498,502 @@ CPLErr CPL_STDCALL GDALRasterIOEx(GDALRasterBandH hBand, GDALRWFlag eRWFlag,
                              nLineSpace, psExtraArg));
 }
 
+/************************************************************************/
+/*                           GetGDTFromCppType()                        */
+/************************************************************************/
+
+namespace
+{
+template <class T> struct GetGDTFromCppType;
+
+#define DEFINE_GetGDTFromCppType(T, eDT)                                       \
+    template <> struct GetGDTFromCppType<T>                                    \
+    {                                                                          \
+        static constexpr GDALDataType GDT = eDT;                               \
+    }
+
+DEFINE_GetGDTFromCppType(uint8_t, GDT_Byte);
+DEFINE_GetGDTFromCppType(int8_t, GDT_Int8);
+DEFINE_GetGDTFromCppType(uint16_t, GDT_UInt16);
+DEFINE_GetGDTFromCppType(int16_t, GDT_Int16);
+DEFINE_GetGDTFromCppType(uint32_t, GDT_UInt32);
+DEFINE_GetGDTFromCppType(int32_t, GDT_Int32);
+DEFINE_GetGDTFromCppType(uint64_t, GDT_UInt64);
+DEFINE_GetGDTFromCppType(int64_t, GDT_Int64);
+DEFINE_GetGDTFromCppType(float, GDT_Float32);
+DEFINE_GetGDTFromCppType(double, GDT_Float64);
+// Not allowed by C++ standard
+//DEFINE_GetGDTFromCppType(std::complex<int16_t>, GDT_CInt16);
+//DEFINE_GetGDTFromCppType(std::complex<int32_t>, GDT_CInt32);
+DEFINE_GetGDTFromCppType(std::complex<float>, GDT_CFloat32);
+DEFINE_GetGDTFromCppType(std::complex<double>, GDT_CFloat64);
+}  // namespace
+
+/************************************************************************/
+/*                           ReadRaster()                               */
+/************************************************************************/
+
+// clang-format off
+/** Read a region of image data for this band.
+ *
+ * This is a slightly more convenient alternative to GDALRasterBand::RasterIO()
+ * for common use cases, like reading a whole band.
+ * It infers the GDAL data type of the buffer from the C/C++ type of the buffer.
+ * This template is instantiated for the following types: [u?]int[8|16|32|64]_t,
+ * float, double, std::complex<float|double>.
+ *
+ * When possible prefer the ReadRaster(std::vector<T>& vData, double dfXOff, double dfYOff, double dfXSize, double dfYSize, size_t nBufXSize, size_t nBufYSize, GDALRIOResampleAlg eResampleAlg, GDALProgressFunc pfnProgress, void *pProgressData) const variant that takes a std::vector<T>&,
+ * and can allocate memory automatically.
+ *
+ * To read a whole band (assuming it fits into memory), as an array of double:
+ *
+\code{.cpp}
+ double* myArray = static_cast<double*>(
+     VSI_MALLOC3_VERBOSE(sizeof(double), poBand->GetXSize(), poBand->GetYSize()));
+ // TODO: check here that myArray != nullptr
+ const size_t nArrayEltCount =
+     static_cast<size_t>(poBand->GetXSize()) * poBand->GetYSize());
+ if (poBand->ReadRaster(myArray, nArrayEltCount) == CE_None)
+ {
+     // do something
+ }
+ VSIFree(myArray)
+\endcode
+ *
+ * To read 128x128 pixels starting at (col=12, line=24) as an array of double:
+ *
+\code{.cpp}
+ double* myArray = static_cast<double*>(
+     VSI_MALLOC3_VERBOSE(sizeof(double), 128, 128));
+ // TODO: check here that myArray != nullptr
+ const size_t nArrayEltCount = 128 * 128;
+ if (poBand->ReadRaster(myArray, nArrayEltCount, 12, 24, 128, 128) == CE_None)
+ {
+     // do something
+ }
+ VSIFree(myArray)
+\endcode
+ *
+ * As nearly all GDAL methods, this method is *NOT* thread-safe, that is it cannot
+ * be called on the same GDALRasterBand instance (or another GDALRasterBand
+ * instance of this dataset) concurrently from several threads.
+ *
+ * The window of interest expressed by (dfXOff, dfYOff, dfXSize, dfYSize) should be
+ * fully within the raster space, that is dfXOff >= 0, dfYOff >= 0,
+ * dfXOff + dfXSize <= GetXSize() and dfYOff + dfYSize <= GetYSize().
+ * If reads larger than the raster space are wished, GDALTranslate() might be used.
+ * Or use nLineSpace and a possibly shifted pData value.
+ *
+ * @param[out] pData The buffer into which the data should be written.
+ * This buffer must contain at least nBufXSize *
+ * nBufYSize words of type T. It is organized in left to right,
+ * top to bottom pixel order, and fully packed.
+ * The type of the buffer does not need to be the one of GetDataType(). The
+ * method will perform data type translation (with potential rounding, clamping)
+ * if needed.
+ *
+ * @param nArrayEltCount Number of values of pData. If non zero, the method will
+ * check that it is at least greater or equal to nBufXSize * nBufYSize, and
+ * return in error if it is not. If set to zero, then pData is trusted to be
+ * large enough.
+ *
+ * @param dfXOff The pixel offset to the top left corner of the region
+ * of the band to be accessed. This would be zero to start from the left side.
+ * Defaults to 0.
+ *
+ * @param dfYOff The line offset to the top left corner of the region
+ * of the band to be accessed. This would be zero to start from the top.
+ * Defaults to 0.
+ *
+ * @param dfXSize The width of the region of the band to be accessed in pixels.
+ * If all of dfXOff, dfYOff, dfXSize and dfYSize are left to their zero default value,
+ * dfXSize is set to the band width.
+ *
+ * @param dfYSize The height of the region of the band to be accessed in lines.
+ * If all of dfXOff, dfYOff, dfXSize and dfYSize are left to their zero default value,
+ * dfYSize is set to the band height.
+ *
+ * @param nBufXSize the width of the buffer image into which the desired region
+ * is to be read. If set to zero, and both dfXSize and dfYSize are integer values,
+ * then nBufXSize is initialized with dfXSize.
+ *
+ * @param nBufYSize the height of the buffer image into which the desired region
+ * is to be read. If set to zero, and both dfXSize and dfYSize are integer values,
+ * then nBufYSize is initialized with dfYSize.
+ *
+ * @param eResampleAlg Resampling algorithm. Defaults to GRIORA_NearestNeighbour.
+ *
+ * @param pfnProgress Progress function. May be nullptr.
+ *
+ * @param pProgressData User data of pfnProgress. May be nullptr.
+ *
+ * @return CE_Failure if the access fails, otherwise CE_None.
+ *
+ * @see GDALRasterBand::RasterIO()
+ * @since GDAL 3.10
+ */
+// clang-format on
+
+template <class T>
+CPLErr GDALRasterBand::ReadRaster(T *pData, size_t nArrayEltCount,
+                                  double dfXOff, double dfYOff, double dfXSize,
+                                  double dfYSize, size_t nBufXSize,
+                                  size_t nBufYSize,
+                                  GDALRIOResampleAlg eResampleAlg,
+                                  GDALProgressFunc pfnProgress,
+                                  void *pProgressData) const
+{
+    if (((nBufXSize | nBufYSize) >> 31) != 0)
+    {
+        return CE_Failure;
+    }
+
+    if (dfXOff == 0 && dfYOff == 0 && dfXSize == 0 && dfYSize == 0)
+    {
+        dfXSize = nRasterXSize;
+        dfYSize = nRasterYSize;
+    }
+    else if (!(dfXOff >= 0 && dfXOff <= INT_MAX) ||
+             !(dfYOff >= 0 && dfYOff <= INT_MAX) || !(dfXSize >= 0) ||
+             !(dfYSize >= 0) || dfXOff + dfXSize > INT_MAX ||
+             dfYOff + dfYSize > INT_MAX)
+    {
+        return CE_Failure;
+    }
+
+    GDALRasterIOExtraArg sExtraArg;
+    sExtraArg.nVersion = 1;
+    sExtraArg.eResampleAlg = eResampleAlg;
+    sExtraArg.pfnProgress = pfnProgress;
+    sExtraArg.pProgressData = pProgressData;
+    sExtraArg.bFloatingPointWindowValidity = true;
+    sExtraArg.dfXOff = dfXOff;
+    sExtraArg.dfYOff = dfYOff;
+    sExtraArg.dfXSize = dfXSize;
+    sExtraArg.dfYSize = dfYSize;
+    const int nXOff = static_cast<int>(dfXOff);
+    const int nYOff = static_cast<int>(dfYOff);
+    const int nXSize = std::max(1, static_cast<int>(dfXSize + 0.5));
+    const int nYSize = std::max(1, static_cast<int>(dfYSize + 0.5));
+    if (nBufXSize == 0 && nBufYSize == 0)
+    {
+        if (static_cast<int>(dfXSize) == dfXSize &&
+            static_cast<int>(dfYSize) == dfYSize)
+        {
+            nBufXSize = static_cast<int>(dfXSize);
+            nBufYSize = static_cast<int>(dfYSize);
+        }
+        else
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                     "nBufXSize and nBufYSize must be provided if dfXSize or "
+                     "dfYSize is not an integer value");
+            return CE_Failure;
+        }
+    }
+    if (nBufXSize == 0 || nBufYSize == 0)
+    {
+        CPLDebug("GDAL",
+                 "RasterIO() skipped for odd window or buffer size.\n"
+                 "  Window = (%d,%d)x%dx%d\n"
+                 "  Buffer = %dx%d\n",
+                 nXOff, nYOff, nXSize, nYSize, static_cast<int>(nBufXSize),
+                 static_cast<int>(nBufYSize));
+
+        return CE_None;
+    }
+
+    if (nArrayEltCount > 0 && nBufXSize > nArrayEltCount / nBufYSize)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Provided array is not large enough");
+        return CE_Failure;
+    }
+
+    constexpr GSpacing nPixelSpace = sizeof(T);
+    const GSpacing nLineSpace = nPixelSpace * nBufXSize;
+    constexpr GDALDataType eBufType = GetGDTFromCppType<T>::GDT;
+
+    GDALRasterBand *pThis = const_cast<GDALRasterBand *>(this);
+
+    const bool bCallLeaveReadWrite =
+        CPL_TO_BOOL(pThis->EnterReadWrite(GF_Read));
+    CPLErr eErr;
+    // coverity[identical_branches]
+    if (bForceCachedIO)
+        eErr = pThis->GDALRasterBand::IRasterIO(
+            GF_Read, nXOff, nYOff, nXSize, nYSize, pData,
+            static_cast<int>(nBufXSize), static_cast<int>(nBufYSize), eBufType,
+            nPixelSpace, nLineSpace, &sExtraArg);
+    else
+        eErr = pThis->IRasterIO(GF_Read, nXOff, nYOff, nXSize, nYSize, pData,
+                                static_cast<int>(nBufXSize),
+                                static_cast<int>(nBufYSize), eBufType,
+                                nPixelSpace, nLineSpace, &sExtraArg);
+
+    if (bCallLeaveReadWrite)
+        pThis->LeaveReadWrite();
+
+    return eErr;
+}
+
+//! @cond Doxygen_Suppress
+
+#define INSTANTIATE_READ_RASTER(T)                                             \
+    template CPLErr CPL_DLL GDALRasterBand::ReadRaster(                        \
+        T *vData, size_t nArrayEltCount, double dfXOff, double dfYOff,         \
+        double dfXSize, double dfYSize, size_t nBufXSize, size_t nBufYSize,    \
+        GDALRIOResampleAlg eResampleAlg, GDALProgressFunc pfnProgress,         \
+        void *pProgressData) const;
+
+INSTANTIATE_READ_RASTER(uint8_t)
+INSTANTIATE_READ_RASTER(int8_t)
+INSTANTIATE_READ_RASTER(uint16_t)
+INSTANTIATE_READ_RASTER(int16_t)
+INSTANTIATE_READ_RASTER(uint32_t)
+INSTANTIATE_READ_RASTER(int32_t)
+INSTANTIATE_READ_RASTER(uint64_t)
+INSTANTIATE_READ_RASTER(int64_t)
+INSTANTIATE_READ_RASTER(float)
+INSTANTIATE_READ_RASTER(double)
+// Not allowed by C++ standard
+// INSTANTIATE_READ_RASTER(std::complex<int16_t>)
+// INSTANTIATE_READ_RASTER(std::complex<int32_t>)
+INSTANTIATE_READ_RASTER(std::complex<float>)
+INSTANTIATE_READ_RASTER(std::complex<double>)
+
+//! @endcond
+
+/************************************************************************/
+/*                           ReadRaster()                               */
+/************************************************************************/
+
+/** Read a region of image data for this band.
+ *
+ * This is a slightly more convenient alternative to GDALRasterBand::RasterIO()
+ * for common use cases, like reading a whole band.
+ * It infers the GDAL data type of the buffer from the C/C++ type of the buffer.
+ * This template is instantiated for the following types: [u?]int[8|16|32|64]_t,
+ * float, double, std::complex<float|double>.
+ *
+ * To read a whole band (assuming it fits into memory), as a vector of double:
+ *
+\code
+ std::vector<double> myArray;
+ if (poBand->ReadRaster(myArray) == CE_None)
+ {
+     // do something
+ }
+\endcode
+ *
+ * To read 128x128 pixels starting at (col=12, line=24) as a vector of double:
+ *
+\code{.cpp}
+ std::vector<double> myArray;
+ if (poBand->ReadRaster(myArray, 12, 24, 128, 128) == CE_None)
+ {
+     // do something
+ }
+\endcode
+ *
+ * As nearly all GDAL methods, this method is *NOT* thread-safe, that is it cannot
+ * be called on the same GDALRasterBand instance (or another GDALRasterBand
+ * instance of this dataset) concurrently from several threads.
+ *
+ * The window of interest expressed by (dfXOff, dfYOff, dfXSize, dfYSize) should be
+ * fully within the raster space, that is dfXOff >= 0, dfYOff >= 0,
+ * dfXOff + dfXSize <= GetXSize() and dfYOff + dfYSize <= GetYSize().
+ * If reads larger than the raster space are wished, GDALTranslate() might be used.
+ * Or use nLineSpace and a possibly shifted pData value.
+ *
+ * @param[out] vData The vector into which the data should be written.
+ * The vector will be resized, if needed, to contain at least nBufXSize *
+ * nBufYSize values. The values in the vector are organized in left to right,
+ * top to bottom pixel order, and fully packed.
+ * The type of the vector does not need to be the one of GetDataType(). The
+ * method will perform data type translation (with potential rounding, clamping)
+ * if needed.
+ *
+ * @param dfXOff The pixel offset to the top left corner of the region
+ * of the band to be accessed. This would be zero to start from the left side.
+ * Defaults to 0.
+ *
+ * @param dfYOff The line offset to the top left corner of the region
+ * of the band to be accessed. This would be zero to start from the top.
+ * Defaults to 0.
+ *
+ * @param dfXSize The width of the region of the band to be accessed in pixels.
+ * If all of dfXOff, dfYOff, dfXSize and dfYSize are left to their zero default value,
+ * dfXSize is set to the band width.
+ *
+ * @param dfYSize The height of the region of the band to be accessed in lines.
+ * If all of dfXOff, dfYOff, dfXSize and dfYSize are left to their zero default value,
+ * dfYSize is set to the band height.
+ *
+ * @param nBufXSize the width of the buffer image into which the desired region
+ * is to be read. If set to zero, and both dfXSize and dfYSize are integer values,
+ * then nBufXSize is initialized with dfXSize.
+ *
+ * @param nBufYSize the height of the buffer image into which the desired region
+ * is to be read. If set to zero, and both dfXSize and dfYSize are integer values,
+ * then nBufYSize is initialized with dfYSize.
+ *
+ * @param eResampleAlg Resampling algorithm. Defaults to GRIORA_NearestNeighbour.
+ *
+ * @param pfnProgress Progress function. May be nullptr.
+ *
+ * @param pProgressData User data of pfnProgress. May be nullptr.
+ *
+ * @return CE_Failure if the access fails, otherwise CE_None.
+ *
+ * @see GDALRasterBand::RasterIO()
+ * @since GDAL 3.10
+ */
+template <class T>
+CPLErr GDALRasterBand::ReadRaster(std::vector<T> &vData, double dfXOff,
+                                  double dfYOff, double dfXSize, double dfYSize,
+                                  size_t nBufXSize, size_t nBufYSize,
+                                  GDALRIOResampleAlg eResampleAlg,
+                                  GDALProgressFunc pfnProgress,
+                                  void *pProgressData) const
+{
+    if (((nBufXSize | nBufYSize) >> 31) != 0)
+    {
+        return CE_Failure;
+    }
+
+    if (dfXOff == 0 && dfYOff == 0 && dfXSize == 0 && dfYSize == 0)
+    {
+        dfXSize = nRasterXSize;
+        dfYSize = nRasterYSize;
+    }
+    else if (!(dfXOff >= 0 && dfXOff <= INT_MAX) ||
+             !(dfYOff >= 0 && dfYOff <= INT_MAX) || !(dfXSize >= 0) ||
+             !(dfYSize >= 0) || dfXOff + dfXSize > INT_MAX ||
+             dfYOff + dfYSize > INT_MAX)
+    {
+        return CE_Failure;
+    }
+
+    GDALRasterIOExtraArg sExtraArg;
+    sExtraArg.nVersion = 1;
+    sExtraArg.eResampleAlg = eResampleAlg;
+    sExtraArg.pfnProgress = pfnProgress;
+    sExtraArg.pProgressData = pProgressData;
+    sExtraArg.bFloatingPointWindowValidity = true;
+    sExtraArg.dfXOff = dfXOff;
+    sExtraArg.dfYOff = dfYOff;
+    sExtraArg.dfXSize = dfXSize;
+    sExtraArg.dfYSize = dfYSize;
+    const int nXOff = static_cast<int>(dfXOff);
+    const int nYOff = static_cast<int>(dfYOff);
+    const int nXSize = std::max(1, static_cast<int>(dfXSize + 0.5));
+    const int nYSize = std::max(1, static_cast<int>(dfYSize + 0.5));
+    if (nBufXSize == 0 && nBufYSize == 0)
+    {
+        if (static_cast<int>(dfXSize) == dfXSize &&
+            static_cast<int>(dfYSize) == dfYSize)
+        {
+            nBufXSize = static_cast<int>(dfXSize);
+            nBufYSize = static_cast<int>(dfYSize);
+        }
+        else
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                     "nBufXSize and nBufYSize must be provided if "
+                     "dfXSize or dfYSize is not an integer value");
+            return CE_Failure;
+        }
+    }
+    if (nBufXSize == 0 || nBufYSize == 0)
+    {
+        CPLDebug("GDAL",
+                 "RasterIO() skipped for odd window or buffer size.\n"
+                 "  Window = (%d,%d)x%dx%d\n"
+                 "  Buffer = %dx%d\n",
+                 nXOff, nYOff, nXSize, nYSize, static_cast<int>(nBufXSize),
+                 static_cast<int>(nBufYSize));
+
+        return CE_None;
+    }
+
+    if constexpr (SIZEOF_VOIDP < 8)
+    {
+        if (nBufXSize > std::numeric_limits<size_t>::max() / nBufYSize)
+        {
+            CPLError(CE_Failure, CPLE_OutOfMemory, "Too large buffer");
+            return CE_Failure;
+        }
+    }
+
+    if (vData.size() < nBufXSize * nBufYSize)
+    {
+        try
+        {
+            vData.resize(nBufXSize * nBufYSize);
+        }
+        catch (const std::exception &)
+        {
+            CPLError(CE_Failure, CPLE_OutOfMemory, "Cannot resize array");
+            return CE_Failure;
+        }
+    }
+
+    constexpr GSpacing nPixelSpace = sizeof(T);
+    const GSpacing nLineSpace = nPixelSpace * nBufXSize;
+    constexpr GDALDataType eBufType = GetGDTFromCppType<T>::GDT;
+
+    GDALRasterBand *pThis = const_cast<GDALRasterBand *>(this);
+
+    const bool bCallLeaveReadWrite =
+        CPL_TO_BOOL(pThis->EnterReadWrite(GF_Read));
+
+    CPLErr eErr;
+    // coverity[identical_branches]
+    if (bForceCachedIO)
+        eErr = pThis->GDALRasterBand::IRasterIO(
+            GF_Read, nXOff, nYOff, nXSize, nYSize, vData.data(),
+            static_cast<int>(nBufXSize), static_cast<int>(nBufYSize), eBufType,
+            nPixelSpace, nLineSpace, &sExtraArg);
+    else
+        eErr = pThis->IRasterIO(GF_Read, nXOff, nYOff, nXSize, nYSize,
+                                vData.data(), static_cast<int>(nBufXSize),
+                                static_cast<int>(nBufYSize), eBufType,
+                                nPixelSpace, nLineSpace, &sExtraArg);
+
+    if (bCallLeaveReadWrite)
+        pThis->LeaveReadWrite();
+
+    return eErr;
+}
+
+//! @cond Doxygen_Suppress
+
+#define INSTANTIATE_READ_RASTER_VECTOR(T)                                      \
+    template CPLErr CPL_DLL GDALRasterBand::ReadRaster(                        \
+        std::vector<T> &vData, double dfXOff, double dfYOff, double dfXSize,   \
+        double dfYSize, size_t nBufXSize, size_t nBufYSize,                    \
+        GDALRIOResampleAlg eResampleAlg, GDALProgressFunc pfnProgress,         \
+        void *pProgressData) const;
+
+INSTANTIATE_READ_RASTER_VECTOR(uint8_t)
+INSTANTIATE_READ_RASTER_VECTOR(int8_t)
+INSTANTIATE_READ_RASTER_VECTOR(uint16_t)
+INSTANTIATE_READ_RASTER_VECTOR(int16_t)
+INSTANTIATE_READ_RASTER_VECTOR(uint32_t)
+INSTANTIATE_READ_RASTER_VECTOR(int32_t)
+INSTANTIATE_READ_RASTER_VECTOR(uint64_t)
+INSTANTIATE_READ_RASTER_VECTOR(int64_t)
+INSTANTIATE_READ_RASTER_VECTOR(float)
+INSTANTIATE_READ_RASTER_VECTOR(double)
+// Not allowed by C++ standard
+// INSTANTIATE_READ_RASTER_VECTOR(std::complex<int16_t>)
+// INSTANTIATE_READ_RASTER_VECTOR(std::complex<int32_t>)
+INSTANTIATE_READ_RASTER_VECTOR(std::complex<float>)
+INSTANTIATE_READ_RASTER_VECTOR(std::complex<double>)
+
+//! @endcond
+
 /************************************************************************/
 /*                             ReadBlock()                              */
 /************************************************************************/
@@ -811,7 +1316,7 @@ CPLErr CPL_STDCALL GDALWriteBlock(GDALRasterBandH hBand, int nXOff, int nYOff,
  * @since GDAL 2.2
  */
 CPLErr GDALRasterBand::GetActualBlockSize(int nXBlockOff, int nYBlockOff,
-                                          int *pnXValid, int *pnYValid)
+                                          int *pnXValid, int *pnYValid) const
 {
     if (nXBlockOff < 0 || nBlockXSize == 0 ||
         nXBlockOff >= DIV_ROUND_UP(nRasterXSize, nBlockXSize) ||
@@ -913,7 +1418,7 @@ GDALRasterBand::GetSuggestedBlockAccessPattern() const
  * @return the data type of pixels for this band.
  */
 
-GDALDataType GDALRasterBand::GetRasterDataType()
+GDALDataType GDALRasterBand::GetRasterDataType() const
 
 {
     return eDataType;
@@ -964,7 +1469,7 @@ GDALDataType CPL_STDCALL GDALGetRasterDataType(GDALRasterBandH hBand)
  * @param pnYSize integer to put the Y block size into or NULL.
  */
 
-void GDALRasterBand::GetBlockSize(int *pnXSize, int *pnYSize)
+void GDALRasterBand::GetBlockSize(int *pnXSize, int *pnYSize) const
 
 {
     if (nBlockXSize <= 0 || nBlockYSize <= 0)
@@ -2856,12 +3361,10 @@ GDALGetRasterSampleOverviewEx(GDALRasterBandH hBand, GUIntBig nDesiredSamples)
  * CE_Failure is returned, and CPLGetLastErrorNo() will return
  * CPLE_NotSupported.
  *
- * WARNING:  It is not possible to build overviews for a single band in
- * TIFF format, and thus this method does not work for TIFF format, or any
- * formats that use the default overview building in TIFF format.  Instead
- * it is necessary to build overviews on the dataset as a whole using
- * GDALDataset::BuildOverviews().  That makes this method pretty useless
- * from a practical point of view.
+ * WARNING: Most formats don't support per-band overview computation, but
+ * require that overviews are computed for all bands of a dataset, using
+ * GDALDataset::BuildOverviews(). The only exception for official GDAL drivers
+ * is the HFA driver which supports this method.
  *
  * @param pszResampling one of "NEAREST", "GAUSS", "CUBIC", "AVERAGE", "MODE",
  * "AVERAGE_MAGPHASE" "RMS" or "NONE" controlling the downsampling method
@@ -3213,7 +3716,7 @@ CPLErr CPL_STDCALL GDALSetRasterUnitType(GDALRasterBandH hBand,
  * @return the width in pixels of this band.
  */
 
-int GDALRasterBand::GetXSize()
+int GDALRasterBand::GetXSize() const
 
 {
     return nRasterXSize;
@@ -3250,7 +3753,7 @@ int CPL_STDCALL GDALGetRasterBandXSize(GDALRasterBandH hBand)
  * @return the height in pixels of this band.
  */
 
-int GDALRasterBand::GetYSize()
+int GDALRasterBand::GetYSize() const
 
 {
     return nRasterYSize;
@@ -3292,7 +3795,7 @@ int CPL_STDCALL GDALGetRasterBandYSize(GDALRasterBandH hBand)
  * @return band number (1+) or 0 if the band number isn't known.
  */
 
-int GDALRasterBand::GetBand()
+int GDALRasterBand::GetBand() const
 
 {
     return nBand;
@@ -3333,7 +3836,7 @@ int CPL_STDCALL GDALGetBandNumber(GDALRasterBandH hBand)
  * NULL if this cannot be determined.
  */
 
-GDALDataset *GDALRasterBand::GetDataset()
+GDALDataset *GDALRasterBand::GetDataset() const
 
 {
     return poDS;
@@ -3485,7 +3988,7 @@ CPLErr GDALRasterBand::GetHistogram(double dfMin, double dfMax, int nBuckets,
 
     int bGotNoDataValue = FALSE;
     const double dfNoDataValue = GetNoDataValue(&bGotNoDataValue);
-    bGotNoDataValue = bGotNoDataValue && !CPLIsNan(dfNoDataValue);
+    bGotNoDataValue = bGotNoDataValue && !std::isnan(dfNoDataValue);
     bool bGotFloatNoDataValue = false;
     float fNoDataValue = 0.0f;
     ComputeFloatNoDataValue(eDataType, dfNoDataValue, bGotNoDataValue,
@@ -3622,7 +4125,7 @@ CPLErr GDALRasterBand::GetHistogram(double dfMin, double dfMax, int nBuckets,
                     {
                         const float fValue =
                             static_cast<float *>(pData)[iOffset];
-                        if (CPLIsNan(fValue) ||
+                        if (std::isnan(fValue) ||
                             (bGotFloatNoDataValue &&
                              ARE_REAL_EQUAL(fValue, fNoDataValue)))
                             continue;
@@ -3631,7 +4134,7 @@ CPLErr GDALRasterBand::GetHistogram(double dfMin, double dfMax, int nBuckets,
                     }
                     case GDT_Float64:
                         dfValue = static_cast<double *>(pData)[iOffset];
-                        if (CPLIsNan(dfValue))
+                        if (std::isnan(dfValue))
                             continue;
                         break;
                     case GDT_CInt16:
@@ -3640,7 +4143,7 @@ CPLErr GDALRasterBand::GetHistogram(double dfMin, double dfMax, int nBuckets,
                             static_cast<GInt16 *>(pData)[iOffset * 2];
                         const double dfImag =
                             static_cast<GInt16 *>(pData)[iOffset * 2 + 1];
-                        if (CPLIsNan(dfReal) || CPLIsNan(dfImag))
+                        if (std::isnan(dfReal) || std::isnan(dfImag))
                             continue;
                         dfValue = sqrt(dfReal * dfReal + dfImag * dfImag);
                     }
@@ -3651,7 +4154,7 @@ CPLErr GDALRasterBand::GetHistogram(double dfMin, double dfMax, int nBuckets,
                             static_cast<GInt32 *>(pData)[iOffset * 2];
                         const double dfImag =
                             static_cast<GInt32 *>(pData)[iOffset * 2 + 1];
-                        if (CPLIsNan(dfReal) || CPLIsNan(dfImag))
+                        if (std::isnan(dfReal) || std::isnan(dfImag))
                             continue;
                         dfValue = sqrt(dfReal * dfReal + dfImag * dfImag);
                     }
@@ -3662,7 +4165,7 @@ CPLErr GDALRasterBand::GetHistogram(double dfMin, double dfMax, int nBuckets,
                             static_cast<float *>(pData)[iOffset * 2];
                         const double dfImag =
                             static_cast<float *>(pData)[iOffset * 2 + 1];
-                        if (CPLIsNan(dfReal) || CPLIsNan(dfImag))
+                        if (std::isnan(dfReal) || std::isnan(dfImag))
                             continue;
                         dfValue = sqrt(dfReal * dfReal + dfImag * dfImag);
                     }
@@ -3673,7 +4176,7 @@ CPLErr GDALRasterBand::GetHistogram(double dfMin, double dfMax, int nBuckets,
                             static_cast<double *>(pData)[iOffset * 2];
                         const double dfImag =
                             static_cast<double *>(pData)[iOffset * 2 + 1];
-                        if (CPLIsNan(dfReal) || CPLIsNan(dfImag))
+                        if (std::isnan(dfReal) || std::isnan(dfImag))
                             continue;
                         dfValue = sqrt(dfReal * dfReal + dfImag * dfImag);
                     }
@@ -3752,12 +4255,13 @@ CPLErr GDALRasterBand::GetHistogram(double dfMin, double dfMax, int nBuckets,
         /*      Read the blocks, and add to histogram. */
         /* --------------------------------------------------------------------
          */
-        for (int iSampleBlock = 0;
-             iSampleBlock < nBlocksPerRow * nBlocksPerColumn;
+        for (GIntBig iSampleBlock = 0;
+             iSampleBlock <
+             static_cast<GIntBig>(nBlocksPerRow) * nBlocksPerColumn;
              iSampleBlock += nSampleRate)
         {
             if (!pfnProgress(
-                    iSampleBlock /
+                    static_cast<double>(iSampleBlock) /
                         (static_cast<double>(nBlocksPerRow) * nBlocksPerColumn),
                     "Compute Histogram", pProgressData))
             {
@@ -3765,8 +4269,8 @@ CPLErr GDALRasterBand::GetHistogram(double dfMin, double dfMax, int nBuckets,
                 return CE_Failure;
             }
 
-            const int iYBlock = iSampleBlock / nBlocksPerRow;
-            const int iXBlock = iSampleBlock - nBlocksPerRow * iYBlock;
+            const int iYBlock = static_cast<int>(iSampleBlock / nBlocksPerRow);
+            const int iXBlock = static_cast<int>(iSampleBlock % nBlocksPerRow);
 
             GDALRasterBlock *poBlock = GetLockedBlockRef(iXBlock, iYBlock);
             if (poBlock == nullptr)
@@ -3866,7 +4370,7 @@ CPLErr GDALRasterBand::GetHistogram(double dfMin, double dfMax, int nBuckets,
                         {
                             const float fValue =
                                 static_cast<float *>(pData)[iOffset];
-                            if (CPLIsNan(fValue) ||
+                            if (std::isnan(fValue) ||
                                 (bGotFloatNoDataValue &&
                                  ARE_REAL_EQUAL(fValue, fNoDataValue)))
                                 continue;
@@ -3875,7 +4379,7 @@ CPLErr GDALRasterBand::GetHistogram(double dfMin, double dfMax, int nBuckets,
                         }
                         case GDT_Float64:
                             dfValue = static_cast<double *>(pData)[iOffset];
-                            if (CPLIsNan(dfValue))
+                            if (std::isnan(dfValue))
                                 continue;
                             break;
                         case GDT_CInt16:
@@ -3902,7 +4406,7 @@ CPLErr GDALRasterBand::GetHistogram(double dfMin, double dfMax, int nBuckets,
                                 static_cast<float *>(pData)[iOffset * 2];
                             double dfImag =
                                 static_cast<float *>(pData)[iOffset * 2 + 1];
-                            if (CPLIsNan(dfReal) || CPLIsNan(dfImag))
+                            if (std::isnan(dfReal) || std::isnan(dfImag))
                                 continue;
                             dfValue = sqrt(dfReal * dfReal + dfImag * dfImag);
                         }
@@ -3913,7 +4417,7 @@ CPLErr GDALRasterBand::GetHistogram(double dfMin, double dfMax, int nBuckets,
                                 static_cast<double *>(pData)[iOffset * 2];
                             double dfImag =
                                 static_cast<double *>(pData)[iOffset * 2 + 1];
-                            if (CPLIsNan(dfReal) || CPLIsNan(dfImag))
+                            if (std::isnan(dfReal) || std::isnan(dfImag))
                                 continue;
                             dfValue = sqrt(dfReal * dfReal + dfImag * dfImag);
                         }
@@ -5558,7 +6062,7 @@ static inline double GetPixelValue(GDALDataType eDataType, bool bSignedByte,
         case GDT_Float32:
         {
             const float fValue = static_cast<const float *>(pData)[iOffset];
-            if (CPLIsNan(fValue) ||
+            if (std::isnan(fValue) ||
                 (bGotFloatNoDataValue && ARE_REAL_EQUAL(fValue, fNoDataValue)))
             {
                 bValid = false;
@@ -5569,7 +6073,7 @@ static inline double GetPixelValue(GDALDataType eDataType, bool bSignedByte,
         }
         case GDT_Float64:
             dfValue = static_cast<const double *>(pData)[iOffset];
-            if (CPLIsNan(dfValue))
+            if (std::isnan(dfValue))
             {
                 bValid = false;
                 return 0.0;
@@ -5583,7 +6087,7 @@ static inline double GetPixelValue(GDALDataType eDataType, bool bSignedByte,
             break;
         case GDT_CFloat32:
             dfValue = static_cast<const float *>(pData)[iOffset * 2];
-            if (CPLIsNan(dfValue))
+            if (std::isnan(dfValue))
             {
                 bValid = false;
                 return 0.0;
@@ -5591,7 +6095,7 @@ static inline double GetPixelValue(GDALDataType eDataType, bool bSignedByte,
             break;
         case GDT_CFloat64:
             dfValue = static_cast<const double *>(pData)[iOffset * 2];
-            if (CPLIsNan(dfValue))
+            if (std::isnan(dfValue))
             {
                 bValid = false;
                 return 0.0;
@@ -5770,7 +6274,7 @@ CPLErr GDALRasterBand::ComputeStatistics(int bApproxOK, double *pdfMin,
 
     int bGotNoDataValue = FALSE;
     const double dfNoDataValue = GetNoDataValue(&bGotNoDataValue);
-    bGotNoDataValue = bGotNoDataValue && !CPLIsNan(dfNoDataValue);
+    bGotNoDataValue = bGotNoDataValue && !std::isnan(dfNoDataValue);
     bool bGotFloatNoDataValue = false;
     float fNoDataValue = 0.0f;
     ComputeFloatNoDataValue(eDataType, dfNoDataValue, bGotNoDataValue,
@@ -5951,12 +6455,15 @@ CPLErr GDALRasterBand::ComputeStatistics(int bApproxOK, double *pdfMin,
                     ? static_cast<GUInt32>(dfNoDataValue + 1e-10)
                     : nMaxValueType + 1;
 
-            for (int iSampleBlock = 0;
-                 iSampleBlock < nBlocksPerRow * nBlocksPerColumn;
+            for (GIntBig iSampleBlock = 0;
+                 iSampleBlock <
+                 static_cast<GIntBig>(nBlocksPerRow) * nBlocksPerColumn;
                  iSampleBlock += nSampleRate)
             {
-                const int iYBlock = iSampleBlock / nBlocksPerRow;
-                const int iXBlock = iSampleBlock - nBlocksPerRow * iYBlock;
+                const int iYBlock =
+                    static_cast<int>(iSampleBlock / nBlocksPerRow);
+                const int iXBlock =
+                    static_cast<int>(iSampleBlock % nBlocksPerRow);
 
                 GDALRasterBlock *const poBlock =
                     GetLockedBlockRef(iXBlock, iYBlock);
@@ -5989,9 +6496,9 @@ CPLErr GDALRasterBand::ComputeStatistics(int bApproxOK, double *pdfMin,
 
                 poBlock->DropLock();
 
-                if (!pfnProgress(iSampleBlock /
-                                     static_cast<double>(nBlocksPerRow *
-                                                         nBlocksPerColumn),
+                if (!pfnProgress(static_cast<double>(iSampleBlock) /
+                                     (static_cast<double>(nBlocksPerRow) *
+                                      nBlocksPerColumn),
                                  "Compute Statistics", pProgressData))
                 {
                     ReportError(CE_Failure, CPLE_UserInterrupt,
@@ -6077,12 +6584,13 @@ CPLErr GDALRasterBand::ComputeStatistics(int bApproxOK, double *pdfMin,
             }
         }
 
-        for (int iSampleBlock = 0;
-             iSampleBlock < nBlocksPerRow * nBlocksPerColumn;
+        for (GIntBig iSampleBlock = 0;
+             iSampleBlock <
+             static_cast<GIntBig>(nBlocksPerRow) * nBlocksPerColumn;
              iSampleBlock += nSampleRate)
         {
-            const int iYBlock = iSampleBlock / nBlocksPerRow;
-            const int iXBlock = iSampleBlock - nBlocksPerRow * iYBlock;
+            const int iYBlock = static_cast<int>(iSampleBlock / nBlocksPerRow);
+            const int iXBlock = static_cast<int>(iSampleBlock % nBlocksPerRow);
 
             GDALRasterBlock *const poBlock =
                 GetLockedBlockRef(iXBlock, iYBlock);
@@ -6142,8 +6650,8 @@ CPLErr GDALRasterBand::ComputeStatistics(int bApproxOK, double *pdfMin,
             poBlock->DropLock();
 
             if (!pfnProgress(
-                    iSampleBlock /
-                        static_cast<double>(nBlocksPerRow * nBlocksPerColumn),
+                    static_cast<double>(iSampleBlock) /
+                        (static_cast<double>(nBlocksPerRow) * nBlocksPerColumn),
                     "Compute Statistics", pProgressData))
             {
                 ReportError(CE_Failure, CPLE_UserInterrupt, "User terminated");
@@ -6480,9 +6988,10 @@ static void ComputeMinMaxGeneric(const void *pData, GDALDataType eDataType,
 
 static bool ComputeMinMaxGenericIterBlocks(
     GDALRasterBand *poBand, GDALDataType eDataType, bool bSignedByte,
-    int nTotalBlocks, int nSampleRate, int nBlocksPerRow, bool bGotNoDataValue,
-    double dfNoDataValue, bool bGotFloatNoDataValue, float fNoDataValue,
-    GDALRasterBand *poMaskBand, double &dfMin, double &dfMax)
+    GIntBig nTotalBlocks, int nSampleRate, int nBlocksPerRow,
+    bool bGotNoDataValue, double dfNoDataValue, bool bGotFloatNoDataValue,
+    float fNoDataValue, GDALRasterBand *poMaskBand, double &dfMin,
+    double &dfMax)
 
 {
     GByte *pabyMaskData = nullptr;
@@ -6499,11 +7008,11 @@ static bool ComputeMinMaxGenericIterBlocks(
         }
     }
 
-    for (int iSampleBlock = 0; iSampleBlock < nTotalBlocks;
+    for (GIntBig iSampleBlock = 0; iSampleBlock < nTotalBlocks;
          iSampleBlock += nSampleRate)
     {
-        const int iYBlock = iSampleBlock / nBlocksPerRow;
-        const int iXBlock = iSampleBlock - nBlocksPerRow * iYBlock;
+        const int iYBlock = static_cast<int>(iSampleBlock / nBlocksPerRow);
+        const int iXBlock = static_cast<int>(iSampleBlock % nBlocksPerRow);
 
         GDALRasterBlock *poBlock = poBand->GetLockedBlockRef(iXBlock, iYBlock);
         if (poBlock == nullptr)
@@ -6600,7 +7109,7 @@ CPLErr GDALRasterBand::ComputeRasterMinMax(int bApproxOK, double *adfMinMax)
     /* -------------------------------------------------------------------- */
     int bGotNoDataValue = FALSE;
     const double dfNoDataValue = GetNoDataValue(&bGotNoDataValue);
-    bGotNoDataValue = bGotNoDataValue && !CPLIsNan(dfNoDataValue);
+    bGotNoDataValue = bGotNoDataValue && !std::isnan(dfNoDataValue);
     bool bGotFloatNoDataValue = false;
     float fNoDataValue = 0.0f;
     ComputeFloatNoDataValue(eDataType, dfNoDataValue, bGotNoDataValue,
@@ -6811,12 +7320,15 @@ CPLErr GDALRasterBand::ComputeRasterMinMax(int bApproxOK, double *adfMinMax)
 
         if (bUseOptimizedPath)
         {
-            for (int iSampleBlock = 0;
-                 iSampleBlock < nBlocksPerRow * nBlocksPerColumn;
+            for (GIntBig iSampleBlock = 0;
+                 iSampleBlock <
+                 static_cast<GIntBig>(nBlocksPerRow) * nBlocksPerColumn;
                  iSampleBlock += nSampleRate)
             {
-                const int iYBlock = iSampleBlock / nBlocksPerRow;
-                const int iXBlock = iSampleBlock - nBlocksPerRow * iYBlock;
+                const int iYBlock =
+                    static_cast<int>(iSampleBlock / nBlocksPerRow);
+                const int iXBlock =
+                    static_cast<int>(iSampleBlock % nBlocksPerRow);
 
                 GDALRasterBlock *poBlock = GetLockedBlockRef(iXBlock, iYBlock);
                 if (poBlock == nullptr)
@@ -6838,7 +7350,8 @@ CPLErr GDALRasterBand::ComputeRasterMinMax(int bApproxOK, double *adfMinMax)
         }
         else
         {
-            const int nTotalBlocks = nBlocksPerRow * nBlocksPerColumn;
+            const GIntBig nTotalBlocks =
+                static_cast<GIntBig>(nBlocksPerRow) * nBlocksPerColumn;
             if (!ComputeMinMaxGenericIterBlocks(
                     this, eDataType, bSignedByte, nTotalBlocks, nSampleRate,
                     nBlocksPerRow, CPL_TO_BOOL(bGotNoDataValue), dfNoDataValue,
@@ -7908,7 +8421,7 @@ void GDALRasterBand::IncDirtyBlocks(int nInc)
  */
 
 void GDALRasterBand::ReportError(CPLErr eErrClass, CPLErrorNum err_no,
-                                 const char *fmt, ...)
+                                 const char *fmt, ...) const
 {
     va_list args;
 
@@ -8858,3 +9371,73 @@ std::shared_ptr<GDALMDArray> GDALRasterBand::AsMDArray() const
     return GDALMDArrayFromRasterBand::Create(
         poDS, const_cast<GDALRasterBand *>(this));
 }
+
+/************************************************************************/
+/*                             InterpolateAtPoint()                     */
+/************************************************************************/
+
+/**
+ * \brief Interpolates the value between pixels using
+ * a resampling algorithm
+ *
+ * @param dfPixel pixel coordinate as a double, where interpolation should be done.
+ * @param dfLine line coordinate as a double, where interpolation should be done.
+ * @param eInterpolation interpolation type. Only near, bilinear, cubic and cubicspline are allowed.
+ * @param pdfRealValue pointer to real part of interpolated value
+ * @param pdfImagValue pointer to imaginary part of interpolated value (may be null if not needed)
+ *
+ * @return CE_None on success, or an error code on failure.
+ * @since GDAL 3.10
+ */
+
+CPLErr GDALRasterBand::InterpolateAtPoint(double dfPixel, double dfLine,
+                                          GDALRIOResampleAlg eInterpolation,
+                                          double *pdfRealValue,
+                                          double *pdfImagValue) const
+{
+    if (eInterpolation != GRIORA_NearestNeighbour &&
+        eInterpolation != GRIORA_Bilinear && eInterpolation != GRIORA_Cubic &&
+        eInterpolation != GRIORA_CubicSpline)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Only nearest, bilinear, cubic and cubicspline interpolation "
+                 "methods "
+                 "allowed");
+
+        return CE_Failure;
+    }
+
+    GDALRasterBand *pBand = const_cast<GDALRasterBand *>(this);
+    if (!m_poPointsCache)
+        m_poPointsCache = new GDALDoublePointsCache();
+
+    const bool res =
+        GDALInterpolateAtPoint(pBand, eInterpolation, m_poPointsCache->cache,
+                               dfPixel, dfLine, pdfRealValue, pdfImagValue);
+
+    return res ? CE_None : CE_Failure;
+}
+
+/************************************************************************/
+/*                        GDALRasterInterpolateAtPoint()                */
+/************************************************************************/
+
+/**
+ * \brief Interpolates the value between pixels using
+ * a resampling algorithm
+ *
+ * @see GDALRasterBand::InterpolateAtPoint()
+ * @since GDAL 3.10
+ */
+
+CPLErr GDALRasterInterpolateAtPoint(GDALRasterBandH hBand, double dfPixel,
+                                    double dfLine,
+                                    GDALRIOResampleAlg eInterpolation,
+                                    double *pdfRealValue, double *pdfImagValue)
+{
+    VALIDATE_POINTER1(hBand, "GDALRasterInterpolateAtPoint", CE_Failure);
+
+    GDALRasterBand *poBand = GDALRasterBand::FromHandle(hBand);
+    return poBand->InterpolateAtPoint(dfPixel, dfLine, eInterpolation,
+                                      pdfRealValue, pdfImagValue);
+}
diff --git a/gcore/gdalrasterblock.cpp b/gcore/gdalrasterblock.cpp
index 2f977f885696..cbb0415e6f44 100644
--- a/gcore/gdalrasterblock.cpp
+++ b/gcore/gdalrasterblock.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 1998, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/gcore/gdalrelationship.cpp b/gcore/gdalrelationship.cpp
index fedac09bc906..b8a1d2d779c1 100644
--- a/gcore/gdalrelationship.cpp
+++ b/gcore/gdalrelationship.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Nyall Dawson <nyall dot dawson at gmail dot comg>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/gcore/gdalrescaledalphaband.cpp b/gcore/gdalrescaledalphaband.cpp
index 48b8cd4134f6..4351cc66465e 100644
--- a/gcore/gdalrescaledalphaband.cpp
+++ b/gcore/gdalrescaledalphaband.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/gcore/gdalsse_priv.h b/gcore/gdalsse_priv.h
index 27d8284d3d02..3c7ec7ba8cdd 100644
--- a/gcore/gdalsse_priv.h
+++ b/gcore/gdalsse_priv.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDALSSE_PRIV_H_INCLUDED
diff --git a/gcore/gdalsubdatasetinfo.cpp b/gcore/gdalsubdatasetinfo.cpp
index e1df65811615..7fbd1ae47eb4 100644
--- a/gcore/gdalsubdatasetinfo.cpp
+++ b/gcore/gdalsubdatasetinfo.cpp
@@ -7,23 +7,7 @@
  email                : elpaso@itopen.it
  ***************************************************************************
  *                                                                         *
- * 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.
+ * SPDX-License-Identifier: MIT
  *                                                                         *
  ***************************************************************************/
 #include "gdalsubdatasetinfo.h"
diff --git a/gcore/gdalsubdatasetinfo.h b/gcore/gdalsubdatasetinfo.h
index dc29b7759fe3..dbe501ab60e3 100644
--- a/gcore/gdalsubdatasetinfo.h
+++ b/gcore/gdalsubdatasetinfo.h
@@ -7,23 +7,7 @@
  email                : elpaso@itopen.it
  ***************************************************************************
  *                                                                         *
- * 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.
+ * SPDX-License-Identifier: MIT
  *                                                                         *
  ***************************************************************************/
 #ifndef GDALSUBDATASETINFO_H
diff --git a/gcore/gdalthreadsafedataset.cpp b/gcore/gdalthreadsafedataset.cpp
new file mode 100644
index 000000000000..38823dfabf13
--- /dev/null
+++ b/gcore/gdalthreadsafedataset.cpp
@@ -0,0 +1,1270 @@
+/******************************************************************************
+ *
+ * Project:  GDAL Core
+ * Purpose:  Base class for thread safe dataset
+ * Author:   Even Rouault <even dot rouault at spatialys.com>
+ *
+ ******************************************************************************
+ * Copyright (c) 2024, Even Rouault <even dot rouault at spatialys.com>
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#ifndef DOXYGEN_SKIP
+
+#include "cpl_mem_cache.h"
+#include "gdal_proxy.h"
+#include "gdal_rat.h"
+#include "gdal_priv.h"
+
+#include <map>
+#include <memory>
+#include <mutex>
+#include <thread>
+#include <vector>
+
+/** Design notes of this file.
+ *
+ * This file is at the core of the "RFC 101 - Raster dataset read-only thread-safety".
+ * Please consult it for high level understanding.
+ *
+ * 3 classes are involved:
+ * - GDALThreadSafeDataset whose instances are returned to the user, and can
+ *   use them in a thread-safe way.
+ * - GDALThreadSafeRasterBand whose instances are created (and owned) by a
+ *   GDALThreadSafeDataset instance, and returned to the user, which can use
+ *   them in a thread-safe way.
+ * - GDALThreadLocalDatasetCache which is an internal class, which holds the
+ *   thread-local datasets.
+ */
+
+/************************************************************************/
+/*                     GDALThreadLocalDatasetCache                      */
+/************************************************************************/
+
+class GDALThreadSafeDataset;
+
+/** This class is instantiated once per thread that uses a
+ * GDALThreadSafeDataset instance. It holds mostly a cache that maps a
+ * GDALThreadSafeDataset* pointer to the corresponding per-thread dataset.
+ */
+class GDALThreadLocalDatasetCache
+{
+  private:
+    /** Least-recently-used based cache that maps a GDALThreadSafeDataset*
+     * instance to the corresponding per-thread dataset.
+     * It should be noted as this a LRU cache, entries might get evicted when
+     * its capacity is reached (64 datasets), which might be undesirable.
+     * Hence it is doubled with m_oMapReferencedDS for datasets that are in
+     * active used by a thread.
+     *
+     * This cache is created as a unique_ptr, and not a standard object, for
+     * delicate reasons related to application termination, where we might
+     * want to leak the memory associated to it, to avoid the dataset it
+     * references from being closed, after GDAL has been "closed" (typically
+     * GDALDestroyDriverManager() has been called), which would otherwise lead
+     * to crashes.
+     */
+    std::unique_ptr<lru11::Cache<const GDALThreadSafeDataset *,
+                                 std::shared_ptr<GDALDataset>>>
+        m_poCache{};
+
+    GDALThreadLocalDatasetCache(const GDALThreadLocalDatasetCache &) = delete;
+    GDALThreadLocalDatasetCache &
+    operator=(const GDALThreadLocalDatasetCache &) = delete;
+
+  public:
+    GDALThreadLocalDatasetCache();
+    ~GDALThreadLocalDatasetCache();
+
+    /** Thread-id of the thread that instantiated this object. Used only for
+     * CPLDebug() purposes
+     */
+    GIntBig m_nThreadID = 0;
+
+    /** Mutex that protects access to m_oCache. There is "competition" around
+     * access to m_oCache since the destructor of a GDALThreadSafeDataset
+     * instance needs to evict entries corresponding to itself from all
+     * GDALThreadLocalDatasetCache instances.
+     */
+    std::mutex m_oMutex{};
+
+    /** This is a reference to *(m_poCache.get()).
+     */
+    lru11::Cache<const GDALThreadSafeDataset *, std::shared_ptr<GDALDataset>>
+        &m_oCache;
+
+    /** Pair of shared_ptr<GDALDataset> with associated thread-local config
+     * options that were valid in the calling thread at the time
+     * GDALThreadLocalDatasetCache::RefUnderlyingDataset() was called, so they
+     * can be restored at UnrefUnderlyingDataset() time.
+     */
+    struct SharedPtrDatasetThreadLocalConfigOptionsPair
+    {
+        std::shared_ptr<GDALDataset> poDS;
+        CPLStringList aosTLConfigOptions;
+
+        SharedPtrDatasetThreadLocalConfigOptionsPair(
+            const std::shared_ptr<GDALDataset> &poDSIn,
+            CPLStringList &&aosTLConfigOptionsIn)
+            : poDS(poDSIn), aosTLConfigOptions(std::move(aosTLConfigOptionsIn))
+        {
+        }
+    };
+
+    /** Maps a GDALThreadSafeDataset*
+     * instance to the corresponding per-thread dataset. Insertion into this
+     * map is done by GDALThreadLocalDatasetCache::RefUnderlyingDataset() and
+     * removal by UnrefUnderlyingDataset(). In most all use cases, the size of
+     * this map should be 0 or 1 (not clear if it could be more, that would
+     * involve RefUnderlyingDataset() being called in nested ways by the same
+     * thread, but it doesn't hurt from being robust to that potential situation)
+     */
+    std::map<const GDALThreadSafeDataset *,
+             SharedPtrDatasetThreadLocalConfigOptionsPair>
+        m_oMapReferencedDS{};
+
+    /** Maps a GDALRasterBand* returned by GDALThreadSafeRasterBand::RefUnderlyingDataset()
+     * to the (thread-local) dataset that owns it (that is a dataset returned
+     * by RefUnderlyingDataset(). The size of his map should be 0 or 1 in
+     * most cases.
+     */
+    std::map<GDALRasterBand *, GDALDataset *> m_oMapReferencedDSFromBand{};
+};
+
+/************************************************************************/
+/*                      GDALThreadSafeDataset                           */
+/************************************************************************/
+
+/** Global variable used to determine if the singleton of GlobalCache
+ * owned by GDALThreadSafeDataset is valid.
+ * This is needed to avoid issues at process termination where the order
+ * of destruction between static global instances and TLS instances can be
+ * tricky.
+ */
+static bool bGlobalCacheValid = false;
+
+/** Thread-safe GDALDataset class.
+ *
+ * That class delegates all calls to its members to per-thread GDALDataset
+ * instances.
+ */
+class GDALThreadSafeDataset final : public GDALProxyDataset
+{
+  public:
+    GDALThreadSafeDataset(std::unique_ptr<GDALDataset> poPrototypeDSUniquePtr,
+                          GDALDataset *poPrototypeDS);
+    ~GDALThreadSafeDataset() override;
+
+    static std::unique_ptr<GDALDataset>
+    Create(std::unique_ptr<GDALDataset> poPrototypeDS, int nScopeFlags);
+
+    static GDALDataset *Create(GDALDataset *poPrototypeDS, int nScopeFlags);
+
+    /* All below public methods override GDALDataset methods, and instead of
+     * forwarding to a thread-local dataset, they act on the prototype dataset,
+     * because they return a non-trivial type, that could be invalidated
+     * otherwise if the thread-local dataset is evicted from the LRU cache.
+     */
+    const OGRSpatialReference *GetSpatialRef() const override
+    {
+        std::lock_guard oGuard(m_oPrototypeDSMutex);
+        if (m_oSRS.IsEmpty())
+        {
+            auto poSRS = m_poPrototypeDS->GetSpatialRef();
+            if (poSRS)
+            {
+                m_oSRS.AssignAndSetThreadSafe(*poSRS);
+            }
+        }
+        return m_oSRS.IsEmpty() ? nullptr : &m_oSRS;
+    }
+
+    const OGRSpatialReference *GetGCPSpatialRef() const override
+    {
+        std::lock_guard oGuard(m_oPrototypeDSMutex);
+        if (m_oGCPSRS.IsEmpty())
+        {
+            auto poSRS = m_poPrototypeDS->GetGCPSpatialRef();
+            if (poSRS)
+            {
+                m_oGCPSRS.AssignAndSetThreadSafe(*poSRS);
+            }
+        }
+        return m_oGCPSRS.IsEmpty() ? nullptr : &m_oGCPSRS;
+    }
+
+    const GDAL_GCP *GetGCPs() override
+    {
+        std::lock_guard oGuard(m_oPrototypeDSMutex);
+        return const_cast<GDALDataset *>(m_poPrototypeDS)->GetGCPs();
+    }
+
+    const char *GetMetadataItem(const char *pszName,
+                                const char *pszDomain = "") override
+    {
+        std::lock_guard oGuard(m_oPrototypeDSMutex);
+        return const_cast<GDALDataset *>(m_poPrototypeDS)
+            ->GetMetadataItem(pszName, pszDomain);
+    }
+
+    char **GetMetadata(const char *pszDomain = "") override
+    {
+        std::lock_guard oGuard(m_oPrototypeDSMutex);
+        return const_cast<GDALDataset *>(m_poPrototypeDS)
+            ->GetMetadata(pszDomain);
+    }
+
+    /* End of methods that forward on the prototype dataset */
+
+    GDALAsyncReader *BeginAsyncReader(int, int, int, int, void *, int, int,
+                                      GDALDataType, int, int *, int, int, int,
+                                      char **) override
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "GDALThreadSafeDataset::BeginAsyncReader() not supported");
+        return nullptr;
+    }
+
+  protected:
+    GDALDataset *RefUnderlyingDataset() const override;
+
+    void
+    UnrefUnderlyingDataset(GDALDataset *poUnderlyingDataset) const override;
+
+    int CloseDependentDatasets() override;
+
+  private:
+    friend class GDALThreadSafeRasterBand;
+    friend class GDALThreadLocalDatasetCache;
+
+    /** Mutex that protects accesses to m_poPrototypeDS */
+    mutable std::mutex m_oPrototypeDSMutex{};
+
+    /** "Prototype" dataset, that is the dataset that was passed to the
+     * GDALThreadSafeDataset constructor. All calls on to it should be on
+     * const methods, and should be protected by m_oPrototypeDSMutex (except
+     * during GDALThreadSafeDataset instance construction)
+     */
+    const GDALDataset *m_poPrototypeDS = nullptr;
+
+    /** Unique pointer for m_poPrototypeDS in the cases where GDALThreadSafeDataset
+     * has been passed a unique pointer */
+    std::unique_ptr<GDALDataset> m_poPrototypeDSUniquePtr{};
+
+    /** Thread-local config options at the time where GDALThreadSafeDataset
+     * has been constructed.
+     */
+    const CPLStringList m_aosThreadLocalConfigOptions{};
+
+    /** Cached value returned by GetSpatialRef() */
+    mutable OGRSpatialReference m_oSRS{};
+
+    /** Cached value returned by GetGCPSpatialRef() */
+    mutable OGRSpatialReference m_oGCPSRS{};
+
+    /** Structure that references all GDALThreadLocalDatasetCache* instances.
+     */
+    struct GlobalCache
+    {
+        /** Mutex that protect access to oSetOfCache */
+        std::mutex oMutex{};
+
+        /** Set of GDALThreadLocalDatasetCache* instances. That is it has
+         * one entry per thread that has used at least once a
+         * GDALThreadLocalDatasetCache/GDALThreadSafeRasterBand
+         */
+        std::set<GDALThreadLocalDatasetCache *> oSetOfCache{};
+
+        GlobalCache()
+        {
+            bGlobalCacheValid = true;
+        }
+
+        ~GlobalCache()
+        {
+            bGlobalCacheValid = false;
+        }
+    };
+
+    /** Returns a singleton for a GlobalCache instance that references all
+     * GDALThreadLocalDatasetCache* instances.
+     */
+    static GlobalCache &GetSetOfCache()
+    {
+        static GlobalCache cache;
+        return cache;
+    }
+
+    /** Thread-local dataset cache. */
+    static thread_local std::unique_ptr<GDALThreadLocalDatasetCache> tl_poCache;
+
+    void UnrefUnderlyingDataset(GDALDataset *poUnderlyingDataset,
+                                GDALThreadLocalDatasetCache *poCache) const;
+
+    GDALThreadSafeDataset(const GDALThreadSafeDataset &) = delete;
+    GDALThreadSafeDataset &operator=(const GDALThreadSafeDataset &) = delete;
+};
+
+/************************************************************************/
+/*                     GDALThreadSafeRasterBand                         */
+/************************************************************************/
+
+/** Thread-safe GDALRasterBand class.
+ *
+ * That class delegates all calls to its members to per-thread GDALDataset
+ * instances.
+ */
+class GDALThreadSafeRasterBand final : public GDALProxyRasterBand
+{
+  public:
+    GDALThreadSafeRasterBand(GDALThreadSafeDataset *poTSDS,
+                             GDALDataset *poParentDS, int nBandIn,
+                             GDALRasterBand *poPrototypeBand,
+                             int nBaseBandOfMaskBand, int nOvrIdx);
+
+    GDALRasterBand *GetMaskBand() override;
+    int GetOverviewCount() override;
+    GDALRasterBand *GetOverview(int idx) override;
+    GDALRasterBand *GetRasterSampleOverview(GUIntBig nDesiredSamples) override;
+
+    GDALRasterAttributeTable *GetDefaultRAT() override;
+
+    /* All below public methods override GDALRasterBand methods, and instead of
+     * forwarding to a thread-local dataset, they act on the prototype band,
+     * because they return a non-trivial type, that could be invalidated
+     * otherwise if the thread-local dataset is evicted from the LRU cache.
+     */
+    const char *GetMetadataItem(const char *pszName,
+                                const char *pszDomain = "") override
+    {
+        std::lock_guard oGuard(m_poTSDS->m_oPrototypeDSMutex);
+        return const_cast<GDALRasterBand *>(m_poPrototypeBand)
+            ->GetMetadataItem(pszName, pszDomain);
+    }
+
+    char **GetMetadata(const char *pszDomain = "") override
+    {
+        std::lock_guard oGuard(m_poTSDS->m_oPrototypeDSMutex);
+        return const_cast<GDALRasterBand *>(m_poPrototypeBand)
+            ->GetMetadata(pszDomain);
+    }
+
+    const char *GetUnitType() override
+    {
+        std::lock_guard oGuard(m_poTSDS->m_oPrototypeDSMutex);
+        return const_cast<GDALRasterBand *>(m_poPrototypeBand)->GetUnitType();
+    }
+
+    GDALColorTable *GetColorTable() override
+    {
+        std::lock_guard oGuard(m_poTSDS->m_oPrototypeDSMutex);
+        return const_cast<GDALRasterBand *>(m_poPrototypeBand)->GetColorTable();
+    }
+
+    /* End of methods that forward on the prototype band */
+
+    CPLVirtualMem *GetVirtualMemAuto(GDALRWFlag, int *, GIntBig *,
+                                     char **) override
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "GDALThreadSafeRasterBand::GetVirtualMemAuto() not supported");
+        return nullptr;
+    }
+
+  protected:
+    GDALRasterBand *RefUnderlyingRasterBand(bool bForceOpen) const override;
+    void UnrefUnderlyingRasterBand(
+        GDALRasterBand *poUnderlyingRasterBand) const override;
+
+  private:
+    /** Pointer to the thread-safe dataset from which this band has been
+     *created */
+    GDALThreadSafeDataset *m_poTSDS = nullptr;
+
+    /** Pointer to the "prototype" raster band that corresponds to us.
+     * All calls to m_poPrototypeBand should be protected by
+     * GDALThreadSafeDataset:m_oPrototypeDSMutex.
+     */
+    const GDALRasterBand *m_poPrototypeBand = nullptr;
+
+    /** 0 for standard bands, otherwise > 0 value that indicates that this
+     * band is a mask band and m_nBaseBandOfMaskBand is then the number
+     * of the band that is the parent of the mask band.
+     */
+    const int m_nBaseBandOfMaskBand;
+
+    /** 0 for standard bands, otherwise >= 0 value that indicates that this
+     * band is an overview band and m_nOvrIdx is then the index of the overview.
+     */
+    const int m_nOvrIdx;
+
+    /** Mask band associated with this band. */
+    std::unique_ptr<GDALRasterBand> m_poMaskBand{};
+
+    /** List of overviews associated with this band. */
+    std::vector<std::unique_ptr<GDALRasterBand>> m_apoOverviews{};
+
+    GDALThreadSafeRasterBand(const GDALThreadSafeRasterBand &) = delete;
+    GDALThreadSafeRasterBand &
+    operator=(const GDALThreadSafeRasterBand &) = delete;
+};
+
+/************************************************************************/
+/*                  Global variables initialization.                    */
+/************************************************************************/
+
+/** Instantiation of the TLS cache of datasets */
+thread_local std::unique_ptr<GDALThreadLocalDatasetCache>
+    GDALThreadSafeDataset::tl_poCache;
+
+/************************************************************************/
+/*                    GDALThreadLocalDatasetCache()                     */
+/************************************************************************/
+
+/** Constructor of GDALThreadLocalDatasetCache. This is called implicitly
+ * when GDALThreadSafeDataset::tl_poCache is called the first time by a
+ * thread.
+ */
+GDALThreadLocalDatasetCache::GDALThreadLocalDatasetCache()
+    : m_poCache(std::make_unique<lru11::Cache<const GDALThreadSafeDataset *,
+                                              std::shared_ptr<GDALDataset>>>()),
+      m_nThreadID(CPLGetPID()), m_oCache(*m_poCache.get())
+{
+    CPLDebug("GDAL",
+             "Registering thread-safe dataset cache for thread " CPL_FRMT_GIB,
+             m_nThreadID);
+
+    // We reference ourselves to the GDALThreadSafeDataset set-of-cache singleton
+    auto &oSetOfCache = GDALThreadSafeDataset::GetSetOfCache();
+    std::lock_guard oLock(oSetOfCache.oMutex);
+    oSetOfCache.oSetOfCache.insert(this);
+}
+
+/************************************************************************/
+/*                   ~GDALThreadLocalDatasetCache()                     */
+/************************************************************************/
+
+/** Destructor of GDALThreadLocalDatasetCache. This is called implicitly when a
+ * thread is terminated.
+ */
+GDALThreadLocalDatasetCache::~GDALThreadLocalDatasetCache()
+{
+    // If GDAL has been de-initialized explicitly (ie GDALDestroyDriverManager()
+    // has been called), or we are during process termination, do not try to
+    // free m_poCache at all, which would cause the datasets its owned to be
+    // destroyed, which will generally lead to crashes in those situations where
+    // GDAL has been de-initialized.
+    const bool bDriverManagerDestroyed = *GDALGetphDMMutex() == nullptr;
+    if (bDriverManagerDestroyed || !bGlobalCacheValid)
+    {
+        // Leak datasets when GDAL has been de-initialized
+        if (!m_poCache->empty())
+        {
+            // coverity[leaked_storage]
+            CPL_IGNORE_RET_VAL(m_poCache.release());
+        }
+        return;
+    }
+
+    // Unreference ourselves from the GDALThreadSafeDataset set-of-cache singleton
+    CPLDebug("GDAL",
+             "Unregistering thread-safe dataset cache for thread " CPL_FRMT_GIB,
+             m_nThreadID);
+    {
+        auto &oSetOfCache = GDALThreadSafeDataset::GetSetOfCache();
+        std::lock_guard oLock(oSetOfCache.oMutex);
+        oSetOfCache.oSetOfCache.erase(this);
+    }
+
+    // Below code is just for debugging purposes and show which internal
+    // thread-local datasets are released at thread termination.
+    const auto lambda =
+        [this](const lru11::KeyValuePair<const GDALThreadSafeDataset *,
+                                         std::shared_ptr<GDALDataset>> &kv)
+    {
+        CPLDebug("GDAL",
+                 "~GDALThreadLocalDatasetCache(): GDALClose(%s, this=%p) "
+                 "for thread " CPL_FRMT_GIB,
+                 kv.value->GetDescription(), kv.value.get(), m_nThreadID);
+    };
+    m_oCache.cwalk(lambda);
+}
+
+/************************************************************************/
+/*                     GDALThreadSafeDataset()                          */
+/************************************************************************/
+
+/** Constructor of GDALThreadSafeDataset.
+ * It may be called with poPrototypeDSUniquePtr set to null, in the situations
+ * where GDALThreadSafeDataset doesn't own the prototype dataset.
+ * poPrototypeDS should always be not-null, and if poPrototypeDSUniquePtr is
+ * not null, then poPrototypeDS should be equal to poPrototypeDSUniquePtr.get()
+ */
+GDALThreadSafeDataset::GDALThreadSafeDataset(
+    std::unique_ptr<GDALDataset> poPrototypeDSUniquePtr,
+    GDALDataset *poPrototypeDS)
+    : m_poPrototypeDS(poPrototypeDS),
+      m_aosThreadLocalConfigOptions(CPLGetThreadLocalConfigOptions())
+{
+    CPLAssert(poPrototypeDS != nullptr);
+    if (poPrototypeDSUniquePtr)
+    {
+        CPLAssert(poPrototypeDS == poPrototypeDSUniquePtr.get());
+    }
+
+    // Replicate the characteristics of the prototype dataset onto ourselves
+    nRasterXSize = poPrototypeDS->GetRasterXSize();
+    nRasterYSize = poPrototypeDS->GetRasterYSize();
+    for (int i = 1; i <= poPrototypeDS->GetRasterCount(); ++i)
+    {
+        SetBand(i, std::make_unique<GDALThreadSafeRasterBand>(
+                       this, this, i, poPrototypeDS->GetRasterBand(i), 0, -1));
+    }
+    nOpenFlags = GDAL_OF_RASTER | GDAL_OF_THREAD_SAFE;
+    SetDescription(poPrototypeDS->GetDescription());
+    papszOpenOptions = CSLDuplicate(poPrototypeDS->GetOpenOptions());
+
+    m_poPrototypeDSUniquePtr = std::move(poPrototypeDSUniquePtr);
+
+    // In the case where we are constructed without owning the prototype
+    // dataset, let's increase its reference counter though.
+    if (!m_poPrototypeDSUniquePtr)
+        const_cast<GDALDataset *>(m_poPrototypeDS)->Reference();
+}
+
+/************************************************************************/
+/*                             Create()                                 */
+/************************************************************************/
+
+/** Utility method used by GDALGetThreadSafeDataset() to construct a
+ * GDALThreadSafeDataset instance in the case where the GDALThreadSafeDataset
+ * instance owns the prototype dataset.
+ */
+
+/* static */ std::unique_ptr<GDALDataset>
+GDALThreadSafeDataset::Create(std::unique_ptr<GDALDataset> poPrototypeDS,
+                              int nScopeFlags)
+{
+    if (nScopeFlags != GDAL_OF_RASTER)
+    {
+        CPLError(CE_Failure, CPLE_NotSupported,
+                 "GDALGetThreadSafeDataset(): Only nScopeFlags == "
+                 "GDAL_OF_RASTER is supported");
+        return nullptr;
+    }
+    if (poPrototypeDS->IsThreadSafe(nScopeFlags))
+    {
+        return poPrototypeDS;
+    }
+    if (!poPrototypeDS->CanBeCloned(nScopeFlags, /* bCanShareState = */ true))
+    {
+        CPLError(CE_Failure, CPLE_NotSupported,
+                 "GDALGetThreadSafeDataset(): Source dataset cannot be "
+                 "cloned");
+        return nullptr;
+    }
+    auto poPrototypeDSRaw = poPrototypeDS.get();
+    return std::make_unique<GDALThreadSafeDataset>(std::move(poPrototypeDS),
+                                                   poPrototypeDSRaw);
+}
+
+/************************************************************************/
+/*                             Create()                                 */
+/************************************************************************/
+
+/** Utility method used by GDALGetThreadSafeDataset() to construct a
+ * GDALThreadSafeDataset instance in the case where the GDALThreadSafeDataset
+ * instance does not own the prototype dataset.
+ */
+
+/* static */ GDALDataset *
+GDALThreadSafeDataset::Create(GDALDataset *poPrototypeDS, int nScopeFlags)
+{
+    if (nScopeFlags != GDAL_OF_RASTER)
+    {
+        CPLError(CE_Failure, CPLE_NotSupported,
+                 "GDALGetThreadSafeDataset(): Only nScopeFlags == "
+                 "GDAL_OF_RASTER is supported");
+        return nullptr;
+    }
+    if (poPrototypeDS->IsThreadSafe(nScopeFlags))
+    {
+        poPrototypeDS->Reference();
+        return poPrototypeDS;
+    }
+    if (!poPrototypeDS->CanBeCloned(nScopeFlags, /* bCanShareState = */ true))
+    {
+        CPLError(CE_Failure, CPLE_NotSupported,
+                 "GDALGetThreadSafeDataset(): Source dataset cannot be "
+                 "cloned");
+        return nullptr;
+    }
+    return std::make_unique<GDALThreadSafeDataset>(nullptr, poPrototypeDS)
+        .release();
+}
+
+/************************************************************************/
+/*                    ~GDALThreadSafeDataset()                          */
+/************************************************************************/
+
+GDALThreadSafeDataset::~GDALThreadSafeDataset()
+{
+    // Collect TLS datasets in a vector, and free them after releasing
+    // g_nInDestructorCounter to limit contention
+    std::vector<std::pair<std::shared_ptr<GDALDataset>, GIntBig>> aoDSToFree;
+    {
+        auto &oSetOfCache = GetSetOfCache();
+        std::lock_guard oLock(oSetOfCache.oMutex);
+        for (auto *poCache : oSetOfCache.oSetOfCache)
+        {
+            std::unique_lock oLockCache(poCache->m_oMutex);
+            std::shared_ptr<GDALDataset> poDS;
+            if (poCache->m_oCache.tryGet(this, poDS))
+            {
+                aoDSToFree.emplace_back(std::move(poDS), poCache->m_nThreadID);
+                poCache->m_oCache.remove(this);
+            }
+        }
+    }
+
+    for (const auto &oEntry : aoDSToFree)
+    {
+        CPLDebug("GDAL",
+                 "~GDALThreadSafeDataset(): GDALClose(%s, this=%p) for "
+                 "thread " CPL_FRMT_GIB,
+                 GetDescription(), oEntry.first.get(), oEntry.second);
+    }
+    // Actually release TLS datasets
+    aoDSToFree.clear();
+
+    GDALThreadSafeDataset::CloseDependentDatasets();
+}
+
+/************************************************************************/
+/*                      CloseDependentDatasets()                        */
+/************************************************************************/
+
+/** Implements GDALDataset::CloseDependentDatasets()
+ *
+ * Takes care of releasing the prototype dataset.
+ *
+ * As implied by the contract of CloseDependentDatasets(), returns true if
+ * the prototype dataset has actually been released (or false if
+ * CloseDependentDatasets() has already been closed)
+ */
+int GDALThreadSafeDataset::CloseDependentDatasets()
+{
+    int bRet = false;
+    if (m_poPrototypeDSUniquePtr)
+    {
+        bRet = true;
+    }
+    else if (m_poPrototypeDS)
+    {
+        if (const_cast<GDALDataset *>(m_poPrototypeDS)->ReleaseRef())
+        {
+            bRet = true;
+        }
+    }
+
+    m_poPrototypeDSUniquePtr.reset();
+    m_poPrototypeDS = nullptr;
+
+    return bRet;
+}
+
+/************************************************************************/
+/*                       RefUnderlyingDataset()                         */
+/************************************************************************/
+
+/** Implements GDALProxyDataset::RefUnderlyingDataset.
+ *
+ * This method is called by all virtual methods of GDALDataset overridden by
+ * RefUnderlyingDataset() when it delegates the calls to the underlying
+ * dataset.
+ *
+ * Our implementation takes care of opening a thread-local dataset, on the
+ * same underlying dataset of m_poPrototypeDS, if needed, and to insert it
+ * into a cache for fast later uses by the same thread.
+ */
+GDALDataset *GDALThreadSafeDataset::RefUnderlyingDataset() const
+{
+    // Back-up thread-local config options at the time we are called
+    CPLStringList aosTLConfigOptionsBackup(CPLGetThreadLocalConfigOptions());
+
+    // Now merge the thread-local config options at the time where this
+    // instance has been created with the current ones.
+    const CPLStringList aosMerged(
+        CSLMerge(CSLDuplicate(m_aosThreadLocalConfigOptions.List()),
+                 aosTLConfigOptionsBackup.List()));
+
+    // And make that merged list active
+    CPLSetThreadLocalConfigOptions(aosMerged.List());
+
+    std::shared_ptr<GDALDataset> poTLSDS;
+
+    // Get the thread-local dataset cache for this thread.
+    GDALThreadLocalDatasetCache *poCache = tl_poCache.get();
+    if (!poCache)
+    {
+        auto poCacheUniquePtr = std::make_unique<GDALThreadLocalDatasetCache>();
+        poCache = poCacheUniquePtr.get();
+        tl_poCache = std::move(poCacheUniquePtr);
+    }
+
+    // Check if there's an entry in this cache for our current GDALThreadSafeDataset
+    // instance.
+    std::unique_lock oLock(poCache->m_oMutex);
+    if (poCache->m_oCache.tryGet(this, poTLSDS))
+    {
+        // If so, return it, but before returning, make sure to creates a
+        // "hard" reference to the thread-local dataset, in case it would
+        // get evicted from poCache->m_oCache (by other threads that would
+        // access lots of datasets in between)
+        CPLAssert(!cpl::contains(poCache->m_oMapReferencedDS, this));
+        auto poDSRet = poTLSDS.get();
+        poCache->m_oMapReferencedDS.insert(
+            {this, GDALThreadLocalDatasetCache::
+                       SharedPtrDatasetThreadLocalConfigOptionsPair(
+                           poTLSDS, std::move(aosTLConfigOptionsBackup))});
+        return poDSRet;
+    }
+
+    // "Clone" the prototype dataset, which in 99% of the cases, involves
+    // doing a GDALDataset::Open() call to re-open it. Do that by temporarily
+    // dropping the lock that protects poCache->m_oCache.
+    // coverity[uninit_use_in_call]
+    oLock.unlock();
+    poTLSDS = m_poPrototypeDS->Clone(GDAL_OF_RASTER, /* bCanShareState=*/true);
+    if (poTLSDS)
+    {
+        CPLDebug("GDAL", "GDALOpen(%s, this=%p) for thread " CPL_FRMT_GIB,
+                 GetDescription(), poTLSDS.get(), CPLGetPID());
+
+        // Check that the re-openeded dataset has the same characteristics
+        // as "this" / m_poPrototypeDS
+        if (poTLSDS->GetRasterXSize() != nRasterXSize ||
+            poTLSDS->GetRasterYSize() != nRasterYSize ||
+            poTLSDS->GetRasterCount() != nBands)
+        {
+            poTLSDS.reset();
+            CPLError(CE_Failure, CPLE_AppDefined,
+                     "Re-opened dataset for %s does not share the same "
+                     "characteristics has the master dataset",
+                     GetDescription());
+        }
+    }
+
+    // Re-acquire the lok
+    oLock.lock();
+
+    // In case of failed closing, restore the thread-local config options that
+    // were valid at the beginning of this method, and return in error.
+    if (!poTLSDS)
+    {
+        CPLSetThreadLocalConfigOptions(aosTLConfigOptionsBackup.List());
+        return nullptr;
+    }
+
+    // We have managed to get a thread-local dataset. Insert it into the
+    // LRU cache and the m_oMapReferencedDS map that holds strong references.
+    auto poDSRet = poTLSDS.get();
+    {
+        poCache->m_oCache.insert(this, poTLSDS);
+        CPLAssert(!cpl::contains(poCache->m_oMapReferencedDS, this));
+        poCache->m_oMapReferencedDS.insert(
+            {this, GDALThreadLocalDatasetCache::
+                       SharedPtrDatasetThreadLocalConfigOptionsPair(
+                           poTLSDS, std::move(aosTLConfigOptionsBackup))});
+    }
+    return poDSRet;
+}
+
+/************************************************************************/
+/*                      UnrefUnderlyingDataset()                        */
+/************************************************************************/
+
+/** Implements GDALProxyDataset::UnrefUnderlyingDataset.
+ *
+ * This is called by GDALProxyDataset overridden methods of GDALDataset, when
+ * they no longer need to access the underlying dataset.
+ *
+ * This method actually delegates most of the work to the other
+ * UnrefUnderlyingDataset() method that takes an explicit GDALThreadLocalDatasetCache*
+ * instance.
+ */
+void GDALThreadSafeDataset::UnrefUnderlyingDataset(
+    GDALDataset *poUnderlyingDataset) const
+{
+    GDALThreadLocalDatasetCache *poCache = tl_poCache.get();
+    CPLAssert(poCache);
+    std::unique_lock oLock(poCache->m_oMutex);
+    UnrefUnderlyingDataset(poUnderlyingDataset, poCache);
+}
+
+/************************************************************************/
+/*                      UnrefUnderlyingDataset()                        */
+/************************************************************************/
+
+/** Takes care of removing the strong reference to a thread-local dataset
+ * from the TLS cache of datasets.
+ */
+void GDALThreadSafeDataset::UnrefUnderlyingDataset(
+    [[maybe_unused]] GDALDataset *poUnderlyingDataset,
+    GDALThreadLocalDatasetCache *poCache) const
+{
+    auto oIter = poCache->m_oMapReferencedDS.find(this);
+    CPLAssert(oIter != poCache->m_oMapReferencedDS.end());
+    CPLAssert(oIter->second.poDS.get() == poUnderlyingDataset);
+    CPLSetThreadLocalConfigOptions(oIter->second.aosTLConfigOptions.List());
+    poCache->m_oMapReferencedDS.erase(oIter);
+}
+
+/************************************************************************/
+/*                      GDALThreadSafeRasterBand()                      */
+/************************************************************************/
+
+GDALThreadSafeRasterBand::GDALThreadSafeRasterBand(
+    GDALThreadSafeDataset *poTSDS, GDALDataset *poParentDS, int nBandIn,
+    GDALRasterBand *poPrototypeBand, int nBaseBandOfMaskBand, int nOvrIdx)
+    : m_poTSDS(poTSDS), m_poPrototypeBand(poPrototypeBand),
+      m_nBaseBandOfMaskBand(nBaseBandOfMaskBand), m_nOvrIdx(nOvrIdx)
+{
+    // Replicates characteristics of the prototype band.
+    poDS = poParentDS;
+    nBand = nBandIn;
+    eDataType = poPrototypeBand->GetRasterDataType();
+    nRasterXSize = poPrototypeBand->GetXSize();
+    nRasterYSize = poPrototypeBand->GetYSize();
+    poPrototypeBand->GetBlockSize(&nBlockXSize, &nBlockYSize);
+
+    if (nBandIn > 0)
+    {
+        // For regular bands instantiates a (thread-safe) mask band and
+        // as many overviews as needed.
+
+        m_poMaskBand = std::make_unique<GDALThreadSafeRasterBand>(
+            poTSDS, nullptr, 0, poPrototypeBand->GetMaskBand(), nBandIn,
+            nOvrIdx);
+        if (nOvrIdx < 0)
+        {
+            const int nOvrCount = poPrototypeBand->GetOverviewCount();
+            for (int iOvrIdx = 0; iOvrIdx < nOvrCount; ++iOvrIdx)
+            {
+                m_apoOverviews.emplace_back(
+                    std::make_unique<GDALThreadSafeRasterBand>(
+                        poTSDS, nullptr, nBandIn,
+                        poPrototypeBand->GetOverview(iOvrIdx),
+                        nBaseBandOfMaskBand, iOvrIdx));
+            }
+        }
+    }
+    else if (nBaseBandOfMaskBand > 0)
+    {
+        // If we are a mask band, nstanciates a (thread-safe) mask band of
+        // ourselves, but with the trick of negating nBaseBandOfMaskBand to
+        // avoid infinite recursion...
+        m_poMaskBand = std::make_unique<GDALThreadSafeRasterBand>(
+            poTSDS, nullptr, 0, poPrototypeBand->GetMaskBand(),
+            -nBaseBandOfMaskBand, nOvrIdx);
+    }
+}
+
+/************************************************************************/
+/*                      RefUnderlyingRasterBand()                       */
+/************************************************************************/
+
+/** Implements GDALProxyRasterBand::RefUnderlyingDataset.
+ *
+ * This method is called by all virtual methods of GDALRasterBand overridden by
+ * RefUnderlyingRasterBand() when it delegates the calls to the underlying
+ * band.
+ */
+GDALRasterBand *
+GDALThreadSafeRasterBand::RefUnderlyingRasterBand(bool /*bForceOpen*/) const
+{
+    // Get a thread-local dataset
+    auto poTLDS = m_poTSDS->RefUnderlyingDataset();
+    if (!poTLDS)
+        return nullptr;
+
+    // Get corresponding thread-local band. If m_nBaseBandOfMaskBand is not
+    // zero, then the base band is indicated into it, otherwise use nBand.
+    const int nTLSBandIdx =
+        m_nBaseBandOfMaskBand ? std::abs(m_nBaseBandOfMaskBand) : nBand;
+    auto poTLRasterBand = poTLDS->GetRasterBand(nTLSBandIdx);
+    if (!poTLRasterBand)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "GDALThreadSafeRasterBand::RefUnderlyingRasterBand(): "
+                 "GetRasterBand(%d) failed",
+                 nTLSBandIdx);
+        m_poTSDS->UnrefUnderlyingDataset(poTLDS);
+        return nullptr;
+    }
+
+    // Get the overview level if needed.
+    if (m_nOvrIdx >= 0)
+    {
+        poTLRasterBand = poTLRasterBand->GetOverview(m_nOvrIdx);
+        if (!poTLRasterBand)
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                     "GDALThreadSafeRasterBand::RefUnderlyingRasterBand(): "
+                     "GetOverview(%d) failed",
+                     m_nOvrIdx);
+            m_poTSDS->UnrefUnderlyingDataset(poTLDS);
+            return nullptr;
+        }
+    }
+
+    // Get the mask band (or the mask band of the mask band) if needed.
+    if (m_nBaseBandOfMaskBand)
+    {
+        poTLRasterBand = poTLRasterBand->GetMaskBand();
+        if (m_nBaseBandOfMaskBand < 0)
+            poTLRasterBand = poTLRasterBand->GetMaskBand();
+    }
+
+    // Check that the thread-local band characteristics are identical to the
+    // ones of the prototype band.
+    if (m_poPrototypeBand->GetXSize() != poTLRasterBand->GetXSize() ||
+        m_poPrototypeBand->GetYSize() != poTLRasterBand->GetYSize() ||
+        m_poPrototypeBand->GetRasterDataType() !=
+            poTLRasterBand->GetRasterDataType()
+        // m_poPrototypeBand->GetMaskFlags() is not thread-safe
+        // || m_poPrototypeBand->GetMaskFlags() != poTLRasterBand->GetMaskFlags()
+    )
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "GDALThreadSafeRasterBand::RefUnderlyingRasterBand(): TLS "
+                 "band has not expected characteristics");
+        m_poTSDS->UnrefUnderlyingDataset(poTLDS);
+        return nullptr;
+    }
+    int nThisBlockXSize;
+    int nThisBlockYSize;
+    int nTLSBlockXSize;
+    int nTLSBlockYSize;
+    m_poPrototypeBand->GetBlockSize(&nThisBlockXSize, &nThisBlockYSize);
+    poTLRasterBand->GetBlockSize(&nTLSBlockXSize, &nTLSBlockYSize);
+    if (nThisBlockXSize != nTLSBlockXSize || nThisBlockYSize != nTLSBlockYSize)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "GDALThreadSafeRasterBand::RefUnderlyingRasterBand(): TLS "
+                 "band has not expected characteristics");
+        m_poTSDS->UnrefUnderlyingDataset(poTLDS);
+        return nullptr;
+    }
+
+    // Registers the association between the thread-local band and the
+    // thread-local dataset
+    {
+        GDALThreadLocalDatasetCache *poCache =
+            GDALThreadSafeDataset::tl_poCache.get();
+        CPLAssert(poCache);
+        std::unique_lock oLock(poCache->m_oMutex);
+        CPLAssert(!cpl::contains(poCache->m_oMapReferencedDSFromBand,
+                                 poTLRasterBand));
+        poCache->m_oMapReferencedDSFromBand[poTLRasterBand] = poTLDS;
+    }
+    // CPLDebug("GDAL", "%p->RefUnderlyingRasterBand() return %p", this, poTLRasterBand);
+    return poTLRasterBand;
+}
+
+/************************************************************************/
+/*                      UnrefUnderlyingRasterBand()                     */
+/************************************************************************/
+
+/** Implements GDALProxyRasterBand::UnrefUnderlyingRasterBand.
+ *
+ * This is called by GDALProxyRasterBand overridden methods of GDALRasterBand,
+ * when they no longer need to access the underlying dataset.
+ */
+void GDALThreadSafeRasterBand::UnrefUnderlyingRasterBand(
+    GDALRasterBand *poUnderlyingRasterBand) const
+{
+    // CPLDebug("GDAL", "%p->UnrefUnderlyingRasterBand(%p)", this, poUnderlyingRasterBand);
+
+    // Unregisters the association between the thread-local band and the
+    // thread-local dataset
+    {
+        GDALThreadLocalDatasetCache *poCache =
+            GDALThreadSafeDataset::tl_poCache.get();
+        CPLAssert(poCache);
+        std::unique_lock oLock(poCache->m_oMutex);
+        auto oIter =
+            poCache->m_oMapReferencedDSFromBand.find(poUnderlyingRasterBand);
+        CPLAssert(oIter != poCache->m_oMapReferencedDSFromBand.end());
+
+        m_poTSDS->UnrefUnderlyingDataset(oIter->second, poCache);
+        poCache->m_oMapReferencedDSFromBand.erase(oIter);
+    }
+}
+
+/************************************************************************/
+/*                           GetMaskBand()                              */
+/************************************************************************/
+
+/** Implements GDALRasterBand::GetMaskBand
+ */
+GDALRasterBand *GDALThreadSafeRasterBand::GetMaskBand()
+{
+    return m_poMaskBand ? m_poMaskBand.get() : this;
+}
+
+/************************************************************************/
+/*                         GetOverviewCount()                           */
+/************************************************************************/
+
+/** Implements GDALRasterBand::GetOverviewCount
+ */
+int GDALThreadSafeRasterBand::GetOverviewCount()
+{
+    return static_cast<int>(m_apoOverviews.size());
+}
+
+/************************************************************************/
+/*                           GetOverview()                              */
+/************************************************************************/
+
+/** Implements GDALRasterBand::GetOverview
+ */
+GDALRasterBand *GDALThreadSafeRasterBand::GetOverview(int nIdx)
+{
+    if (nIdx < 0 || nIdx >= static_cast<int>(m_apoOverviews.size()))
+        return nullptr;
+    return m_apoOverviews[nIdx].get();
+}
+
+/************************************************************************/
+/*                      GetRasterSampleOverview()                       */
+/************************************************************************/
+
+/** Implements GDALRasterBand::GetRasterSampleOverview
+ */
+GDALRasterBand *
+GDALThreadSafeRasterBand::GetRasterSampleOverview(GUIntBig nDesiredSamples)
+
+{
+    // Call the base implementation, and do not forward to proxy
+    return GDALRasterBand::GetRasterSampleOverview(nDesiredSamples);
+}
+
+/************************************************************************/
+/*                             GetDefaultRAT()                          */
+/************************************************************************/
+
+/** Implements GDALRasterBand::GetDefaultRAT
+ *
+ * This is a bit tricky to do as GDALRasterAttributeTable has virtual methods
+ * with potential (non thread-safe) side-effects. The clean solution would be
+ * to implement a GDALThreadSafeRAT wrapper class, but this is a bit too much
+ * effort. So for now, we check if the RAT returned by the prototype band is
+ * an instance of GDALDefaultRasterAttributeTable. If it is, given that this
+ * class has thread-safe getters, we can directly return it.
+ * Otherwise return in error.
+ */
+GDALRasterAttributeTable *GDALThreadSafeRasterBand::GetDefaultRAT()
+{
+    std::lock_guard oGuard(m_poTSDS->m_oPrototypeDSMutex);
+    const auto poRAT =
+        const_cast<GDALRasterBand *>(m_poPrototypeBand)->GetDefaultRAT();
+    if (!poRAT)
+        return nullptr;
+
+    if (dynamic_cast<GDALDefaultRasterAttributeTable *>(poRAT))
+        return poRAT;
+
+    CPLError(CE_Failure, CPLE_AppDefined,
+             "GDALThreadSafeRasterBand::GetDefaultRAT() not supporting a "
+             "non-GDALDefaultRasterAttributeTable implementation");
+    return nullptr;
+}
+
+#endif  // DOXYGEN_SKIP
+
+/************************************************************************/
+/*                    GDALDataset::IsThreadSafe()                       */
+/************************************************************************/
+
+/** Return whether this dataset, and its related objects (typically raster
+ * bands), can be called for the intended scope.
+ *
+ * Note that in the current implementation, nScopeFlags should be set to
+ * GDAL_OF_RASTER, as thread-safety is limited to read-only operations and
+ * excludes operations on vector layers (OGRLayer) or multidimensional API
+ * (GDALGroup, GDALMDArray, etc.)
+ *
+ * This is the same as the C function GDALDatasetIsThreadSafe().
+ *
+ * @since 3.10
+ */
+bool GDALDataset::IsThreadSafe(int nScopeFlags) const
+{
+    return (nOpenFlags & GDAL_OF_THREAD_SAFE) != 0 &&
+           nScopeFlags == GDAL_OF_RASTER && (nOpenFlags & GDAL_OF_RASTER) != 0;
+}
+
+/************************************************************************/
+/*                     GDALDatasetIsThreadSafe()                        */
+/************************************************************************/
+
+/** Return whether this dataset, and its related objects (typically raster
+ * bands), can be called for the intended scope.
+ *
+ * Note that in the current implementation, nScopeFlags should be set to
+ * GDAL_OF_RASTER, as thread-safety is limited to read-only operations and
+ * excludes operations on vector layers (OGRLayer) or multidimensional API
+ * (GDALGroup, GDALMDArray, etc.)
+ *
+ * This is the same as the C++ method GDALDataset::IsThreadSafe().
+ *
+ * @param hDS Source dataset
+ * @param nScopeFlags Intended scope of use.
+ * Only GDAL_OF_RASTER is supported currently.
+ * @param papszOptions Options. None currently.
+ *
+ * @since 3.10
+ */
+bool GDALDatasetIsThreadSafe(GDALDatasetH hDS, int nScopeFlags,
+                             CSLConstList papszOptions)
+{
+    VALIDATE_POINTER1(hDS, __func__, false);
+
+    CPL_IGNORE_RET_VAL(papszOptions);
+
+    return GDALDataset::FromHandle(hDS)->IsThreadSafe(nScopeFlags);
+}
+
+/************************************************************************/
+/*                       GDALGetThreadSafeDataset()                     */
+/************************************************************************/
+
+/** Return a thread-safe dataset.
+ *
+ * In the general case, this thread-safe dataset will open a
+ * behind-the-scenes per-thread dataset (re-using the name and open options of poDS),
+ * the first time a thread calls a method on the thread-safe dataset, and will
+ * transparently redirect calls from the calling thread to this behind-the-scenes
+ * per-thread dataset. Hence there is an initial setup cost per thread.
+ * Datasets of the MEM driver cannot be opened by name, but this function will
+ * take care of "cloning" them, using the same backing memory, when needed.
+ *
+ * Ownership of the passed dataset is transferred to the thread-safe dataset.
+ *
+ * The function may also return the passed dataset if it is already thread-safe.
+ *
+ * @param poDS Source dataset
+ * @param nScopeFlags Intended scope of use.
+ * Only GDAL_OF_RASTER is supported currently.
+ *
+ * @return a new thread-safe dataset, or nullptr in case of error.
+ *
+ * @since 3.10
+ */
+std::unique_ptr<GDALDataset>
+GDALGetThreadSafeDataset(std::unique_ptr<GDALDataset> poDS, int nScopeFlags)
+{
+    return GDALThreadSafeDataset::Create(std::move(poDS), nScopeFlags);
+}
+
+/************************************************************************/
+/*                       GDALGetThreadSafeDataset()                     */
+/************************************************************************/
+
+/** Return a thread-safe dataset.
+ *
+ * In the general case, this thread-safe dataset will open a
+ * behind-the-scenes per-thread dataset (re-using the name and open options of poDS),
+ * the first time a thread calls a method on the thread-safe dataset, and will
+ * transparently redirect calls from the calling thread to this behind-the-scenes
+ * per-thread dataset. Hence there is an initial setup cost per thread.
+ * Datasets of the MEM driver cannot be opened by name, but this function will
+ * take care of "cloning" them, using the same backing memory, when needed.
+ *
+ * The life-time of the passed dataset must be longer than the one of
+ * the returned thread-safe dataset.
+ *
+ * Note that this function does increase the reference count on poDS while
+ * it is being used
+ *
+ * The function may also return the passed dataset if it is already thread-safe.
+ * A non-nullptr returned dataset must be released with ReleaseRef().
+ *
+ * Patterns like the following one are valid:
+ * \code{.cpp}
+ * auto poDS = GDALDataset::Open(...);
+ * auto poThreadSafeDS = GDALGetThreadSafeDataset(poDS, GDAL_OF_RASTER | GDAL_OF_THREAD_SAFE);
+ * poDS->ReleaseRef();
+ * if (poThreadSafeDS )
+ * {
+ *     // ... do something with poThreadSafeDS ...
+ *     poThreadSafeDS->ReleaseRef();
+ * }
+ * \endcode
+ *
+ * @param poDS Source dataset
+ * @param nScopeFlags Intended scope of use.
+ * Only GDAL_OF_RASTER is supported currently.
+ *
+ * @return a new thread-safe dataset or poDS, or nullptr in case of error.
+
+ * @since 3.10
+ */
+GDALDataset *GDALGetThreadSafeDataset(GDALDataset *poDS, int nScopeFlags)
+{
+    return GDALThreadSafeDataset::Create(poDS, nScopeFlags);
+}
+
+/************************************************************************/
+/*                       GDALGetThreadSafeDataset()                     */
+/************************************************************************/
+
+/** Return a thread-safe dataset.
+ *
+ * In the general case, this thread-safe dataset will open a
+ * behind-the-scenes per-thread dataset (re-using the name and open options of hDS),
+ * the first time a thread calls a method on the thread-safe dataset, and will
+ * transparently redirect calls from the calling thread to this behind-the-scenes
+ * per-thread dataset. Hence there is an initial setup cost per thread.
+ * Datasets of the MEM driver cannot be opened by name, but this function will
+ * take care of "cloning" them, using the same backing memory, when needed.
+ *
+ * The life-time of the passed dataset must be longer than the one of
+ * the returned thread-safe dataset.
+ *
+ * Note that this function does increase the reference count on poDS while
+ * it is being used
+ *
+ * The function may also return the passed dataset if it is already thread-safe.
+ * A non-nullptr returned dataset must be released with GDALReleaseDataset().
+ *
+ * \code{.cpp}
+ * hDS = GDALOpenEx(...);
+ * hThreadSafeDS = GDALGetThreadSafeDataset(hDS, GDAL_OF_RASTER | GDAL_OF_THREAD_SAFE, NULL);
+ * GDALReleaseDataset(hDS);
+ * if( hThreadSafeDS )
+ * {
+ *     // ... do something with hThreadSafeDS ...
+ *     GDALReleaseDataset(hThreadSafeDS);
+ * }
+ * \endcode
+ *
+ * @param hDS Source dataset
+ * @param nScopeFlags Intended scope of use.
+ * Only GDAL_OF_RASTER is supported currently.
+ * @param papszOptions Options. None currently.
+ *
+ * @since 3.10
+ */
+GDALDatasetH GDALGetThreadSafeDataset(GDALDatasetH hDS, int nScopeFlags,
+                                      CSLConstList papszOptions)
+{
+    VALIDATE_POINTER1(hDS, __func__, nullptr);
+
+    CPL_IGNORE_RET_VAL(papszOptions);
+    return GDALDataset::ToHandle(
+        GDALGetThreadSafeDataset(GDALDataset::FromHandle(hDS), nScopeFlags));
+}
diff --git a/gcore/gdalvirtualmem.cpp b/gcore/gdalvirtualmem.cpp
index 585504c7986f..8c4593e00742 100644
--- a/gcore/gdalvirtualmem.cpp
+++ b/gcore/gdalvirtualmem.cpp
@@ -8,23 +8,7 @@
  **********************************************************************
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/gcore/mdreader/reader_alos.cpp b/gcore/mdreader/reader_alos.cpp
index b3194605cf16..a9c2a6b67238 100644
--- a/gcore/mdreader/reader_alos.cpp
+++ b/gcore/mdreader/reader_alos.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2014-2015 NextGIS <info@nextgis.ru>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "reader_alos.h"
diff --git a/gcore/mdreader/reader_alos.h b/gcore/mdreader/reader_alos.h
index 2dbcf7e13af2..c6d968a51fd3 100644
--- a/gcore/mdreader/reader_alos.h
+++ b/gcore/mdreader/reader_alos.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2014-2015 NextGIS <info@nextgis.ru>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef READER_ALOS_H_INCLUDED
diff --git a/gcore/mdreader/reader_digital_globe.cpp b/gcore/mdreader/reader_digital_globe.cpp
index 0f6d3ad04ad3..e879ceb314f8 100644
--- a/gcore/mdreader/reader_digital_globe.cpp
+++ b/gcore/mdreader/reader_digital_globe.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2014-2015, NextGIS info@nextgis.ru
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/gcore/mdreader/reader_digital_globe.h b/gcore/mdreader/reader_digital_globe.h
index e90205b04b55..ab31320ffcbd 100644
--- a/gcore/mdreader/reader_digital_globe.h
+++ b/gcore/mdreader/reader_digital_globe.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2014-2015, NextGIS info@nextgis.ru
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef READER_DIGITAL_GLOBE_H_INCLUDED
diff --git a/gcore/mdreader/reader_eros.cpp b/gcore/mdreader/reader_eros.cpp
index 966bc2eef877..e2874ed5bc49 100644
--- a/gcore/mdreader/reader_eros.cpp
+++ b/gcore/mdreader/reader_eros.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2014-2015, NextGIS info@nextgis.ru
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/gcore/mdreader/reader_eros.h b/gcore/mdreader/reader_eros.h
index 6aed9a1b08a5..19a05f35bbbf 100644
--- a/gcore/mdreader/reader_eros.h
+++ b/gcore/mdreader/reader_eros.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2014-2015, NextGIS info@nextgis.ru
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef READER_EROS_H_INCLUDED
diff --git a/gcore/mdreader/reader_geo_eye.cpp b/gcore/mdreader/reader_geo_eye.cpp
index 8f224b887b3e..b03e5647217e 100644
--- a/gcore/mdreader/reader_geo_eye.cpp
+++ b/gcore/mdreader/reader_geo_eye.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2014-2015, NextGIS info@nextgis.ru
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/gcore/mdreader/reader_geo_eye.h b/gcore/mdreader/reader_geo_eye.h
index e412dfa5c183..81d204f6fbd9 100644
--- a/gcore/mdreader/reader_geo_eye.h
+++ b/gcore/mdreader/reader_geo_eye.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2014-2015, NextGIS info@nextgis.ru
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef READER_GEO_EYE_H_INCLUDED
diff --git a/gcore/mdreader/reader_kompsat.cpp b/gcore/mdreader/reader_kompsat.cpp
index 31799331af04..6c83efed5708 100644
--- a/gcore/mdreader/reader_kompsat.cpp
+++ b/gcore/mdreader/reader_kompsat.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2014-2015 NextGIS <info@nextgis.ru>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/gcore/mdreader/reader_kompsat.h b/gcore/mdreader/reader_kompsat.h
index ce95c2d89c3e..f83529d1a223 100644
--- a/gcore/mdreader/reader_kompsat.h
+++ b/gcore/mdreader/reader_kompsat.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2014-2015 NextGIS <info@nextgis.ru>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef READER_KOMPSAT_H_INCLUDED
diff --git a/gcore/mdreader/reader_landsat.cpp b/gcore/mdreader/reader_landsat.cpp
index 947ce6de368f..08d378f7efca 100644
--- a/gcore/mdreader/reader_landsat.cpp
+++ b/gcore/mdreader/reader_landsat.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2014-2015 NextGIS <info@nextgis.ru>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/gcore/mdreader/reader_landsat.h b/gcore/mdreader/reader_landsat.h
index 0b46c60f711c..7b35a01b2e3a 100644
--- a/gcore/mdreader/reader_landsat.h
+++ b/gcore/mdreader/reader_landsat.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2014-2015 NextGIS <info@nextgis.ru>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef READER_LANDSAT_H_INCLUDED
diff --git a/gcore/mdreader/reader_orb_view.cpp b/gcore/mdreader/reader_orb_view.cpp
index 4383604a274b..256d88fa810c 100644
--- a/gcore/mdreader/reader_orb_view.cpp
+++ b/gcore/mdreader/reader_orb_view.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2014-2015 NextGIS <info@nextgis.ru>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/gcore/mdreader/reader_orb_view.h b/gcore/mdreader/reader_orb_view.h
index f15ed460363e..e0471b01ec3c 100644
--- a/gcore/mdreader/reader_orb_view.h
+++ b/gcore/mdreader/reader_orb_view.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2014-2015 NextGIS <info@nextgis.ru>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef READER_ORB_VIEW_H_INCLUDED
diff --git a/gcore/mdreader/reader_pleiades.cpp b/gcore/mdreader/reader_pleiades.cpp
index b455b6482550..e933713d6f5a 100644
--- a/gcore/mdreader/reader_pleiades.cpp
+++ b/gcore/mdreader/reader_pleiades.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2014-2018 NextGIS <info@nextgis.ru>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/gcore/mdreader/reader_pleiades.h b/gcore/mdreader/reader_pleiades.h
index 7734fbcae922..52f764e3247f 100644
--- a/gcore/mdreader/reader_pleiades.h
+++ b/gcore/mdreader/reader_pleiades.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2014-2015 NextGIS <info@nextgis.ru>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef READER_PLEIADES_H_INCLUDED
diff --git a/gcore/mdreader/reader_rapid_eye.cpp b/gcore/mdreader/reader_rapid_eye.cpp
index b6178a42fefc..53e67fb710a8 100644
--- a/gcore/mdreader/reader_rapid_eye.cpp
+++ b/gcore/mdreader/reader_rapid_eye.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2014-2015 NextGIS <info@nextgis.ru>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "reader_rapid_eye.h"
diff --git a/gcore/mdreader/reader_rapid_eye.h b/gcore/mdreader/reader_rapid_eye.h
index 79174cc2c083..ae87b9d2ecae 100644
--- a/gcore/mdreader/reader_rapid_eye.h
+++ b/gcore/mdreader/reader_rapid_eye.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2014-2015 NextGIS <info@nextgis.ru>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef READER_RAPID_EYE_H_INCLUDED
diff --git a/gcore/mdreader/reader_rdk1.cpp b/gcore/mdreader/reader_rdk1.cpp
index 30fbd72d1f8a..8241f627a061 100644
--- a/gcore/mdreader/reader_rdk1.cpp
+++ b/gcore/mdreader/reader_rdk1.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2014-2015 NextGIS <info@nextgis.ru>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/gcore/mdreader/reader_rdk1.h b/gcore/mdreader/reader_rdk1.h
index bcfc8e9c1020..6786b3c4b027 100644
--- a/gcore/mdreader/reader_rdk1.h
+++ b/gcore/mdreader/reader_rdk1.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2014-2015 NextGIS <info@nextgis.ru>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef READER_RDK1_H_INCLUDED
diff --git a/gcore/mdreader/reader_spot.cpp b/gcore/mdreader/reader_spot.cpp
index f6b715deb5ea..9afea82598cb 100644
--- a/gcore/mdreader/reader_spot.cpp
+++ b/gcore/mdreader/reader_spot.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2014-2015 NextGIS <info@nextgis.ru>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/gcore/mdreader/reader_spot.h b/gcore/mdreader/reader_spot.h
index cd6f675e2888..7858b1a3724d 100644
--- a/gcore/mdreader/reader_spot.h
+++ b/gcore/mdreader/reader_spot.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2014-2015 NextGIS <info@nextgis.ru>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef READER_SPOT_H_INCLUDED
diff --git a/gcore/nasakeywordhandler.cpp b/gcore/nasakeywordhandler.cpp
index 5656f26f6618..3c93d992e9cf 100644
--- a/gcore/nasakeywordhandler.cpp
+++ b/gcore/nasakeywordhandler.cpp
@@ -12,23 +12,7 @@
  * Copyright (c) 2017, Dmitry Baryshnikov <polimax@mail.ru>
  * Copyright (c) 2017, NextGIS <info@nextgis.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************
  * Object Description Language (ODL) is used to encode data labels for PDS
  * and other NASA data systems. Refer to Chapter 12 of "PDS Standards
@@ -53,7 +37,7 @@
  ****************************************************************************/
 
 #include "nasakeywordhandler.h"
-#include "ogrgeojsonreader.h"
+#include "ogrlibjsonutils.h"
 #include <vector>
 
 //! @cond Doxygen_Suppress
diff --git a/gcore/nasakeywordhandler.h b/gcore/nasakeywordhandler.h
index 8eef37ee4978..20455e1cc38a 100644
--- a/gcore/nasakeywordhandler.h
+++ b/gcore/nasakeywordhandler.h
@@ -12,23 +12,7 @@
  * Copyright (c) 2017, Dmitry Baryshnikov <polimax@mail.ru>
  * Copyright (c) 2017, NextGIS <info@nextgis.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef NASAKEYWORDHANDLER_H
diff --git a/gcore/overview.cpp b/gcore/overview.cpp
index 098b0eae4b21..5867ac11b04f 100644
--- a/gcore/overview.cpp
+++ b/gcore/overview.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2000, Frank Warmerdam
  * Copyright (c) 2007-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -83,12 +67,20 @@
 /************************************************************************/
 
 template <class T>
-static CPLErr GDALResampleChunk_NearT(
-    double dfXRatioDstToSrc, double dfYRatioDstToSrc, GDALDataType eWrkDataType,
-    const T *pChunk, int nChunkXOff, int nChunkXSize, int nChunkYOff,
-    int nDstXOff, int nDstXOff2, int nDstYOff, int nDstYOff2, T **ppDstBuffer)
+static CPLErr GDALResampleChunk_NearT(const GDALOverviewResampleArgs &args,
+                                      const T *pChunk, T **ppDstBuffer)
 
 {
+    const double dfXRatioDstToSrc = args.dfXRatioDstToSrc;
+    const double dfYRatioDstToSrc = args.dfYRatioDstToSrc;
+    const GDALDataType eWrkDataType = args.eWrkDataType;
+    const int nChunkXOff = args.nChunkXOff;
+    const int nChunkXSize = args.nChunkXSize;
+    const int nChunkYOff = args.nChunkYOff;
+    const int nDstXOff = args.nDstXOff;
+    const int nDstXOff2 = args.nDstXOff2;
+    const int nDstYOff = args.nDstYOff;
+    const int nDstYOff2 = args.nDstYOff2;
     const int nDstXWidth = nDstXOff2 - nDstXOff;
 
     /* -------------------------------------------------------------------- */
@@ -155,44 +147,67 @@ static CPLErr GDALResampleChunk_NearT(
     return CE_None;
 }
 
-static CPLErr GDALResampleChunk_Near(
-    double dfXRatioDstToSrc, double dfYRatioDstToSrc, double /* dfSrcXDelta */,
-    double /* dfSrcYDelta */, GDALDataType eWrkDataType, const void *pChunk,
-    const GByte * /* pabyChunkNodataMask_unused */, int nChunkXOff,
-    int nChunkXSize, int nChunkYOff, int /* nChunkYSize */, int nDstXOff,
-    int nDstXOff2, int nDstYOff, int nDstYOff2, GDALRasterBand * /*poOverview*/,
-    void **ppDstBuffer, GDALDataType *peDstBufferDataType,
-    const char * /* pszResampling_unused */, bool /* bHasNoData_unused */,
-    double /* fNoDataValue_unused */,
-    GDALColorTable * /* poColorTable_unused */, GDALDataType /* eSrcDataType */,
-    bool /* bPropagateNoData */)
+static CPLErr GDALResampleChunk_Near(const GDALOverviewResampleArgs &args,
+                                     const void *pChunk, void **ppDstBuffer,
+                                     GDALDataType *peDstBufferDataType)
 {
-    *peDstBufferDataType = eWrkDataType;
-    if (eWrkDataType == GDT_Byte)
-        return GDALResampleChunk_NearT(
-            dfXRatioDstToSrc, dfYRatioDstToSrc, eWrkDataType,
-            static_cast<const GByte *>(pChunk), nChunkXOff, nChunkXSize,
-            nChunkYOff, nDstXOff, nDstXOff2, nDstYOff, nDstYOff2,
-            reinterpret_cast<GByte **>(ppDstBuffer));
-    else if (eWrkDataType == GDT_UInt16)
-        return GDALResampleChunk_NearT(
-            dfXRatioDstToSrc, dfYRatioDstToSrc, eWrkDataType,
-            static_cast<const GInt16 *>(pChunk), nChunkXOff, nChunkXSize,
-            nChunkYOff, nDstXOff, nDstXOff2, nDstYOff, nDstYOff2,
-            reinterpret_cast<GInt16 **>(ppDstBuffer));
-    else if (eWrkDataType == GDT_Float32)
-        return GDALResampleChunk_NearT(
-            dfXRatioDstToSrc, dfYRatioDstToSrc, eWrkDataType,
-            static_cast<const float *>(pChunk), nChunkXOff, nChunkXSize,
-            nChunkYOff, nDstXOff, nDstXOff2, nDstYOff, nDstYOff2,
-            reinterpret_cast<float **>(ppDstBuffer));
-    else if (eWrkDataType == GDT_Float64)
-        return GDALResampleChunk_NearT(
-            dfXRatioDstToSrc, dfYRatioDstToSrc, eWrkDataType,
-            static_cast<const double *>(pChunk), nChunkXOff, nChunkXSize,
-            nChunkYOff, nDstXOff, nDstXOff2, nDstYOff, nDstYOff2,
-            reinterpret_cast<double **>(ppDstBuffer));
+    *peDstBufferDataType = args.eWrkDataType;
+    switch (args.eWrkDataType)
+    {
+        // For nearest resampling, as no computation is done, only the
+        // size of the data type matters.
+        case GDT_Byte:
+        case GDT_Int8:
+        {
+            CPLAssert(GDALGetDataTypeSizeBytes(args.eWrkDataType) == 1);
+            return GDALResampleChunk_NearT(
+                args, static_cast<const uint8_t *>(pChunk),
+                reinterpret_cast<uint8_t **>(ppDstBuffer));
+        }
+
+        case GDT_Int16:
+        case GDT_UInt16:
+        {
+            CPLAssert(GDALGetDataTypeSizeBytes(args.eWrkDataType) == 2);
+            return GDALResampleChunk_NearT(
+                args, static_cast<const uint16_t *>(pChunk),
+                reinterpret_cast<uint16_t **>(ppDstBuffer));
+        }
+
+        case GDT_CInt16:
+        case GDT_Int32:
+        case GDT_UInt32:
+        case GDT_Float32:
+        {
+            CPLAssert(GDALGetDataTypeSizeBytes(args.eWrkDataType) == 4);
+            return GDALResampleChunk_NearT(
+                args, static_cast<const uint32_t *>(pChunk),
+                reinterpret_cast<uint32_t **>(ppDstBuffer));
+        }
+
+        case GDT_CInt32:
+        case GDT_CFloat32:
+        case GDT_Int64:
+        case GDT_UInt64:
+        case GDT_Float64:
+        {
+            CPLAssert(GDALGetDataTypeSizeBytes(args.eWrkDataType) == 8);
+            return GDALResampleChunk_NearT(
+                args, static_cast<const uint64_t *>(pChunk),
+                reinterpret_cast<uint64_t **>(ppDstBuffer));
+        }
 
+        case GDT_CFloat64:
+        {
+            return GDALResampleChunk_NearT(
+                args, static_cast<const std::complex<double> *>(pChunk),
+                reinterpret_cast<std::complex<double> **>(ppDstBuffer));
+        }
+
+        case GDT_Unknown:
+        case GDT_TypeCount:
+            break;
+    }
     CPLAssert(false);
     return CE_Failure;
 }
@@ -1110,15 +1125,29 @@ static int AverageFloatSSE2(int nDstXWidth, int nChunkXSize,
 /************************************************************************/
 
 template <class T, class Tsum, GDALDataType eWrkDataType>
-static CPLErr GDALResampleChunk_AverageOrRMS_T(
-    double dfXRatioDstToSrc, double dfYRatioDstToSrc, double dfSrcXDelta,
-    double dfSrcYDelta, const T *pChunk, const GByte *pabyChunkNodataMask,
-    int nChunkXOff, int nChunkXSize, int nChunkYOff, int nChunkYSize,
-    int nDstXOff, int nDstXOff2, int nDstYOff, int nDstYOff2,
-    GDALRasterBand *poOverview, void **ppDstBuffer, const char *pszResampling,
-    bool bHasNoData, double dfNoDataValue, GDALColorTable *poColorTable,
-    bool bPropagateNoData)
+static CPLErr
+GDALResampleChunk_AverageOrRMS_T(const GDALOverviewResampleArgs &args,
+                                 const T *pChunk, void **ppDstBuffer)
 {
+    const double dfXRatioDstToSrc = args.dfXRatioDstToSrc;
+    const double dfYRatioDstToSrc = args.dfYRatioDstToSrc;
+    const double dfSrcXDelta = args.dfSrcXDelta;
+    const double dfSrcYDelta = args.dfSrcYDelta;
+    const GByte *pabyChunkNodataMask = args.pabyChunkNodataMask;
+    const int nChunkXOff = args.nChunkXOff;
+    const int nChunkYOff = args.nChunkYOff;
+    const int nChunkXSize = args.nChunkXSize;
+    const int nChunkYSize = args.nChunkYSize;
+    const int nDstXOff = args.nDstXOff;
+    const int nDstXOff2 = args.nDstXOff2;
+    const int nDstYOff = args.nDstYOff;
+    const int nDstYOff2 = args.nDstYOff2;
+    const char *pszResampling = args.pszResampling;
+    bool bHasNoData = args.bHasNoData;
+    const double dfNoDataValue = args.dfNoDataValue;
+    const GDALColorTable *poColorTable = args.poColorTable;
+    const bool bPropagateNoData = args.bPropagateNoData;
+
     // AVERAGE_BIT2GRAYSCALE
     const bool bBit2Grayscale =
         CPL_TO_BOOL(STARTS_WITH_CI(pszResampling, "AVERAGE_BIT2G"));
@@ -1133,7 +1162,7 @@ static CPLErr GDALResampleChunk_AverageOrRMS_T(
         tNoDataValue = static_cast<T>(dfNoDataValue);
     const T tReplacementVal =
         bHasNoData ? static_cast<T>(GDALGetNoDataReplacementValue(
-                         poOverview->GetRasterDataType(), dfNoDataValue))
+                         args.eOvrDataType, dfNoDataValue))
                    : 0;
 
     int nChunkRightXOff = nChunkXOff + nChunkXSize;
@@ -1185,7 +1214,7 @@ static CPLErr GDALResampleChunk_AverageOrRMS_T(
     // transparent, consider it as the nodata value
     else if (!bHasNoData && nTransparentIdx >= 0)
     {
-        bHasNoData = TRUE;
+        bHasNoData = true;
         tNoDataValue = static_cast<T>(nTransparentIdx);
     }
 
@@ -1708,73 +1737,52 @@ static CPLErr GDALResampleChunk_AverageOrRMS_T(
     return CE_None;
 }
 
-static CPLErr GDALResampleChunk_AverageOrRMS(
-    double dfXRatioDstToSrc, double dfYRatioDstToSrc, double dfSrcXDelta,
-    double dfSrcYDelta, GDALDataType eWrkDataType, const void *pChunk,
-    const GByte *pabyChunkNodataMask, int nChunkXOff, int nChunkXSize,
-    int nChunkYOff, int nChunkYSize, int nDstXOff, int nDstXOff2, int nDstYOff,
-    int nDstYOff2, GDALRasterBand *poOverview, void **ppDstBuffer,
-    GDALDataType *peDstBufferDataType, const char *pszResampling,
-    bool bHasNoData, double dfNoDataValue, GDALColorTable *poColorTable,
-    GDALDataType /* eSrcDataType */, bool bPropagateNoData)
+static CPLErr
+GDALResampleChunk_AverageOrRMS(const GDALOverviewResampleArgs &args,
+                               const void *pChunk, void **ppDstBuffer,
+                               GDALDataType *peDstBufferDataType)
 {
-    if (eWrkDataType == GDT_Byte)
-    {
-        *peDstBufferDataType = eWrkDataType;
-        return GDALResampleChunk_AverageOrRMS_T<GByte, int, GDT_Byte>(
-            dfXRatioDstToSrc, dfYRatioDstToSrc, dfSrcXDelta, dfSrcYDelta,
-            static_cast<const GByte *>(pChunk), pabyChunkNodataMask, nChunkXOff,
-            nChunkXSize, nChunkYOff, nChunkYSize, nDstXOff, nDstXOff2, nDstYOff,
-            nDstYOff2, poOverview, ppDstBuffer, pszResampling, bHasNoData,
-            dfNoDataValue, poColorTable, bPropagateNoData);
-    }
-    else if (eWrkDataType == GDT_UInt16)
+    *peDstBufferDataType = args.eWrkDataType;
+    switch (args.eWrkDataType)
     {
-        *peDstBufferDataType = eWrkDataType;
-        if (EQUAL(pszResampling, "RMS"))
+        case GDT_Byte:
         {
-            // Use double as accumulation type, because UInt32 could overflow
-            return GDALResampleChunk_AverageOrRMS_T<GUInt16, double,
-                                                    GDT_UInt16>(
-                dfXRatioDstToSrc, dfYRatioDstToSrc, dfSrcXDelta, dfSrcYDelta,
-                static_cast<const GUInt16 *>(pChunk), pabyChunkNodataMask,
-                nChunkXOff, nChunkXSize, nChunkYOff, nChunkYSize, nDstXOff,
-                nDstXOff2, nDstYOff, nDstYOff2, poOverview, ppDstBuffer,
-                pszResampling, bHasNoData, dfNoDataValue, poColorTable,
-                bPropagateNoData);
+            return GDALResampleChunk_AverageOrRMS_T<GByte, int, GDT_Byte>(
+                args, static_cast<const GByte *>(pChunk), ppDstBuffer);
         }
-        else
+
+        case GDT_UInt16:
+        {
+            if (EQUAL(args.pszResampling, "RMS"))
+            {
+                // Use double as accumulation type, because UInt32 could overflow
+                return GDALResampleChunk_AverageOrRMS_T<GUInt16, double,
+                                                        GDT_UInt16>(
+                    args, static_cast<const GUInt16 *>(pChunk), ppDstBuffer);
+            }
+            else
+            {
+                return GDALResampleChunk_AverageOrRMS_T<GUInt16, GUInt32,
+                                                        GDT_UInt16>(
+                    args, static_cast<const GUInt16 *>(pChunk), ppDstBuffer);
+            }
+        }
+
+        case GDT_Float32:
         {
-            return GDALResampleChunk_AverageOrRMS_T<GUInt16, GUInt32,
-                                                    GDT_UInt16>(
-                dfXRatioDstToSrc, dfYRatioDstToSrc, dfSrcXDelta, dfSrcYDelta,
-                static_cast<const GUInt16 *>(pChunk), pabyChunkNodataMask,
-                nChunkXOff, nChunkXSize, nChunkYOff, nChunkYSize, nDstXOff,
-                nDstXOff2, nDstYOff, nDstYOff2, poOverview, ppDstBuffer,
-                pszResampling, bHasNoData, dfNoDataValue, poColorTable,
-                bPropagateNoData);
+            return GDALResampleChunk_AverageOrRMS_T<float, double, GDT_Float32>(
+                args, static_cast<const float *>(pChunk), ppDstBuffer);
         }
-    }
-    else if (eWrkDataType == GDT_Float32)
-    {
-        *peDstBufferDataType = eWrkDataType;
-        return GDALResampleChunk_AverageOrRMS_T<float, double, GDT_Float32>(
-            dfXRatioDstToSrc, dfYRatioDstToSrc, dfSrcXDelta, dfSrcYDelta,
-            static_cast<const float *>(pChunk), pabyChunkNodataMask, nChunkXOff,
-            nChunkXSize, nChunkYOff, nChunkYSize, nDstXOff, nDstXOff2, nDstYOff,
-            nDstYOff2, poOverview, ppDstBuffer, pszResampling, bHasNoData,
-            dfNoDataValue, poColorTable, bPropagateNoData);
-    }
-    else if (eWrkDataType == GDT_Float64)
-    {
-        *peDstBufferDataType = eWrkDataType;
-        return GDALResampleChunk_AverageOrRMS_T<double, double, GDT_Float64>(
-            dfXRatioDstToSrc, dfYRatioDstToSrc, dfSrcXDelta, dfSrcYDelta,
-            static_cast<const double *>(pChunk), pabyChunkNodataMask,
-            nChunkXOff, nChunkXSize, nChunkYOff, nChunkYSize, nDstXOff,
-            nDstXOff2, nDstYOff, nDstYOff2, poOverview, ppDstBuffer,
-            pszResampling, bHasNoData, dfNoDataValue, poColorTable,
-            bPropagateNoData);
+
+        case GDT_Float64:
+        {
+            return GDALResampleChunk_AverageOrRMS_T<double, double,
+                                                    GDT_Float64>(
+                args, static_cast<const double *>(pChunk), ppDstBuffer);
+        }
+
+        default:
+            break;
     }
 
     CPLAssert(false);
@@ -1785,18 +1793,26 @@ static CPLErr GDALResampleChunk_AverageOrRMS(
 /*                     GDALResampleChunk_Gauss()                        */
 /************************************************************************/
 
-static CPLErr GDALResampleChunk_Gauss(
-    double dfXRatioDstToSrc, double dfYRatioDstToSrc, double /* dfSrcXDelta */,
-    double /* dfSrcYDelta */, GDALDataType /* eWrkDataType */,
-    const void *pChunk, const GByte *pabyChunkNodataMask, int nChunkXOff,
-    int nChunkXSize, int nChunkYOff, int nChunkYSize, int nDstXOff,
-    int nDstXOff2, int nDstYOff, int nDstYOff2, GDALRasterBand *poOverview,
-    void **ppDstBuffer, GDALDataType *peDstBufferDataType,
-    const char * /* pszResampling */, bool bHasNoData, double dfNoDataValue,
-    GDALColorTable *poColorTable, GDALDataType /* eSrcDataType */,
-    bool /* bPropagateNoData */)
+static CPLErr GDALResampleChunk_Gauss(const GDALOverviewResampleArgs &args,
+                                      const void *pChunk, void **ppDstBuffer,
+                                      GDALDataType *peDstBufferDataType)
 
 {
+    const double dfXRatioDstToSrc = args.dfXRatioDstToSrc;
+    const double dfYRatioDstToSrc = args.dfYRatioDstToSrc;
+    const GByte *pabyChunkNodataMask = args.pabyChunkNodataMask;
+    const int nChunkXOff = args.nChunkXOff;
+    const int nChunkXSize = args.nChunkXSize;
+    const int nChunkYOff = args.nChunkYOff;
+    const int nChunkYSize = args.nChunkYSize;
+    const int nDstXOff = args.nDstXOff;
+    const int nDstXOff2 = args.nDstXOff2;
+    const int nDstYOff = args.nDstYOff;
+    const int nDstYOff2 = args.nDstYOff2;
+    const bool bHasNoData = args.bHasNoData;
+    double dfNoDataValue = args.dfNoDataValue;
+    const GDALColorTable *poColorTable = args.poColorTable;
+
     const double *const padfChunk = static_cast<const double *>(pChunk);
 
     *ppDstBuffer =
@@ -1824,8 +1840,8 @@ static CPLErr GDALResampleChunk_Gauss(
         120, 20, 15, 90,  225, 300, 225, 90, 15, 6,   36,  90,  120,
         90,  36, 6,  1,   6,   15,  20,  15, 6,  1};
 
-    const int nOXSize = poOverview->GetXSize();
-    const int nOYSize = poOverview->GetYSize();
+    const int nOXSize = args.nOvrXSize;
+    const int nOYSize = args.nOvrYSize;
     const int nResYFactor = static_cast<int>(0.5 + dfYRatioDstToSrc);
 
     // matrix for gauss filter
@@ -2067,26 +2083,74 @@ static CPLErr GDALResampleChunk_Gauss(
 /*                      GDALResampleChunk_Mode()                        */
 /************************************************************************/
 
+template <class T> static inline bool IsSame(T a, T b)
+{
+    return a == b;
+}
+
+template <> bool IsSame<float>(float a, float b)
+{
+    return a == b || (std::isnan(a) && std::isnan(b));
+}
+
+template <> bool IsSame<double>(double a, double b)
+{
+    return a == b || (std::isnan(a) && std::isnan(b));
+}
+
+template <>
+bool IsSame<std::complex<float>>(std::complex<float> a, std::complex<float> b)
+{
+    return a == b || (std::isnan(a.real()) && std::isnan(a.imag()) &&
+                      std::isnan(b.real()) && std::isnan(b.imag()));
+}
+
+template <>
+bool IsSame<std::complex<double>>(std::complex<double> a,
+                                  std::complex<double> b)
+{
+    return a == b || (std::isnan(a.real()) && std::isnan(a.imag()) &&
+                      std::isnan(b.real()) && std::isnan(b.imag()));
+}
+
 template <class T>
-static CPLErr GDALResampleChunk_Mode_T(
-    double dfXRatioDstToSrc, double dfYRatioDstToSrc, double dfSrcXDelta,
-    double dfSrcYDelta, const T *pChunk, const GByte *pabyChunkNodataMask,
-    int nChunkXOff, int nChunkXSize, int nChunkYOff, int nChunkYSize,
-    int nDstXOff, int nDstXOff2, int nDstYOff, int nDstYOff2,
-    T *const pDstBuffer, bool bHasNoData, double dfNoDataValue,
-    GDALColorTable *poColorTable, GDALDataType eSrcDataType)
+static CPLErr GDALResampleChunk_ModeT(const GDALOverviewResampleArgs &args,
+                                      const T *pChunk, T *const pDstBuffer)
 
 {
+    const double dfXRatioDstToSrc = args.dfXRatioDstToSrc;
+    const double dfYRatioDstToSrc = args.dfYRatioDstToSrc;
+    const double dfSrcXDelta = args.dfSrcXDelta;
+    const double dfSrcYDelta = args.dfSrcYDelta;
+    const GByte *pabyChunkNodataMask = args.pabyChunkNodataMask;
+    const int nChunkXOff = args.nChunkXOff;
+    const int nChunkXSize = args.nChunkXSize;
+    const int nChunkYOff = args.nChunkYOff;
+    const int nChunkYSize = args.nChunkYSize;
+    const int nDstXOff = args.nDstXOff;
+    const int nDstXOff2 = args.nDstXOff2;
+    const int nDstYOff = args.nDstYOff;
+    const int nDstYOff2 = args.nDstYOff2;
+    const bool bHasNoData = args.bHasNoData;
+    const GDALColorTable *poColorTable = args.poColorTable;
     const int nDstXSize = nDstXOff2 - nDstXOff;
 
     T tNoDataValue;
-    if (!bHasNoData || !GDALIsValueInRange<T>(dfNoDataValue))
+    if constexpr (std::is_same<T, std::complex<float>>::value ||
+                  std::is_same<T, std::complex<double>>::value)
+    {
+        using BaseT = typename T::value_type;
+        tNoDataValue =
+            std::complex<BaseT>(std::numeric_limits<BaseT>::quiet_NaN(),
+                                std::numeric_limits<BaseT>::quiet_NaN());
+    }
+    else if (!bHasNoData || !GDALIsValueInRange<T>(args.dfNoDataValue))
         tNoDataValue = 0;
     else
-        tNoDataValue = static_cast<T>(dfNoDataValue);
+        tNoDataValue = static_cast<T>(args.dfNoDataValue);
 
     size_t nMaxNumPx = 0;
-    T *padfVals = nullptr;
+    T *paVals = nullptr;
     int *panSums = nullptr;
 
     const int nChunkRightXOff = nChunkXOff + nChunkXSize;
@@ -2169,8 +2233,13 @@ static CPLErr GDALResampleChunk_Mode_T(
             if (nSrcXOff2 > nChunkRightXOff)
                 nSrcXOff2 = nChunkRightXOff;
 
-            if (eSrcDataType != GDT_Byte ||
-                (poColorTable && poColorTable->GetColorEntryCount() > 256))
+            bool bRegularProcessing = false;
+            if constexpr (!std::is_same<T, GByte>::value)
+                bRegularProcessing = true;
+            else if (poColorTable && poColorTable->GetColorEntryCount() > 256)
+                bRegularProcessing = true;
+
+            if (bRegularProcessing)
             {
                 // Not sure how much sense it makes to run a majority
                 // filter on floating point data, but here it is for the sake
@@ -2185,7 +2254,7 @@ static CPLErr GDALResampleChunk_Mode_T(
                 {
                     CPLError(CE_Failure, CPLE_NotSupported,
                              "Too big downsampling factor");
-                    CPLFree(padfVals);
+                    CPLFree(paVals);
                     CPLFree(panSums);
                     return CE_Failure;
                 }
@@ -2196,19 +2265,19 @@ static CPLErr GDALResampleChunk_Mode_T(
                 size_t iMaxVal = 0;
                 bool biMaxValdValid = false;
 
-                if (padfVals == nullptr || nNumPx > nMaxNumPx)
+                if (paVals == nullptr || nNumPx > nMaxNumPx)
                 {
-                    T *padfValsNew = static_cast<T *>(
-                        VSI_REALLOC_VERBOSE(padfVals, nNumPx * sizeof(T)));
+                    T *paValsNew = static_cast<T *>(
+                        VSI_REALLOC_VERBOSE(paVals, nNumPx * sizeof(T)));
                     int *panSumsNew = static_cast<int *>(
                         VSI_REALLOC_VERBOSE(panSums, nNumPx * sizeof(int)));
-                    if (padfValsNew != nullptr)
-                        padfVals = padfValsNew;
+                    if (paValsNew != nullptr)
+                        paVals = paValsNew;
                     if (panSumsNew != nullptr)
                         panSums = panSumsNew;
-                    if (padfValsNew == nullptr || panSumsNew == nullptr)
+                    if (paValsNew == nullptr || panSumsNew == nullptr)
                     {
-                        CPLFree(padfVals);
+                        CPLFree(paVals);
                         CPLFree(panSums);
                         return CE_Failure;
                     }
@@ -2225,12 +2294,12 @@ static CPLErr GDALResampleChunk_Mode_T(
                         if (pabySrcScanlineNodataMask == nullptr ||
                             pabySrcScanlineNodataMask[iX + iTotYOff])
                         {
-                            const T dfVal = paSrcScanline[iX + iTotYOff];
+                            const T val = paSrcScanline[iX + iTotYOff];
                             size_t i = 0;  // Used after for.
 
                             // Check array for existing entry.
                             for (; i < iMaxInd; ++i)
-                                if (padfVals[i] == dfVal &&
+                                if (IsSame(paVals[i], val) &&
                                     ++panSums[i] > panSums[iMaxVal])
                                 {
                                     iMaxVal = i;
@@ -2241,7 +2310,7 @@ static CPLErr GDALResampleChunk_Mode_T(
                             // Add to arr if entry not already there.
                             if (i == iMaxInd)
                             {
-                                padfVals[iMaxInd] = dfVal;
+                                paVals[iMaxInd] = val;
                                 panSums[iMaxInd] = 1;
 
                                 if (!biMaxValdValid)
@@ -2259,9 +2328,10 @@ static CPLErr GDALResampleChunk_Mode_T(
                 if (!biMaxValdValid)
                     paDstScanline[iDstPixel - nDstXOff] = tNoDataValue;
                 else
-                    paDstScanline[iDstPixel - nDstXOff] = padfVals[iMaxVal];
+                    paDstScanline[iDstPixel - nDstXOff] = paVals[iMaxVal];
             }
-            else  // if( eSrcDataType == GDT_Byte && nEntryCount < 256 )
+            else if constexpr (std::is_same<T, GByte>::value)
+            // ( eSrcDataType == GDT_Byte && nEntryCount < 256 )
             {
                 // So we go here for a paletted or non-paletted byte band.
                 // The input values are then between 0 and 255.
@@ -2304,67 +2374,108 @@ static CPLErr GDALResampleChunk_Mode_T(
         }
     }
 
-    CPLFree(padfVals);
+    CPLFree(paVals);
     CPLFree(panSums);
 
     return CE_None;
 }
 
-static CPLErr GDALResampleChunk_Mode(
-    double dfXRatioDstToSrc, double dfYRatioDstToSrc, double dfSrcXDelta,
-    double dfSrcYDelta, GDALDataType eWrkDataType, const void *pChunk,
-    const GByte *pabyChunkNodataMask, int nChunkXOff, int nChunkXSize,
-    int nChunkYOff, int nChunkYSize, int nDstXOff, int nDstXOff2, int nDstYOff,
-    int nDstYOff2, GDALRasterBand * /*poOverview*/, void **ppDstBuffer,
-    GDALDataType *peDstBufferDataType, const char * /* pszResampling */,
-    bool bHasNoData, double dfNoDataValue, GDALColorTable *poColorTable,
-    GDALDataType eSrcDataType, bool /*bPropagateNoData*/)
+static CPLErr GDALResampleChunk_Mode(const GDALOverviewResampleArgs &args,
+                                     const void *pChunk, void **ppDstBuffer,
+                                     GDALDataType *peDstBufferDataType)
 {
-    *ppDstBuffer =
-        VSI_MALLOC3_VERBOSE(nDstXOff2 - nDstXOff, nDstYOff2 - nDstYOff,
-                            GDALGetDataTypeSizeBytes(eWrkDataType));
+    *ppDstBuffer = VSI_MALLOC3_VERBOSE(
+        args.nDstXOff2 - args.nDstXOff, args.nDstYOff2 - args.nDstYOff,
+        GDALGetDataTypeSizeBytes(args.eWrkDataType));
     if (*ppDstBuffer == nullptr)
     {
         return CE_Failure;
     }
 
-    *peDstBufferDataType = eWrkDataType;
-    if (eWrkDataType == GDT_Byte)
-    {
-        return GDALResampleChunk_Mode_T<GByte>(
-            dfXRatioDstToSrc, dfYRatioDstToSrc, dfSrcXDelta, dfSrcYDelta,
-            static_cast<const GByte *>(pChunk), pabyChunkNodataMask, nChunkXOff,
-            nChunkXSize, nChunkYOff, nChunkYSize, nDstXOff, nDstXOff2, nDstYOff,
-            nDstYOff2, static_cast<GByte *>(*ppDstBuffer), bHasNoData,
-            dfNoDataValue, poColorTable, eSrcDataType);
-    }
-    else if (eWrkDataType == GDT_UInt16)
-    {
-        return GDALResampleChunk_Mode_T<GUInt16>(
-            dfXRatioDstToSrc, dfYRatioDstToSrc, dfSrcXDelta, dfSrcYDelta,
-            static_cast<const GUInt16 *>(pChunk), pabyChunkNodataMask,
-            nChunkXOff, nChunkXSize, nChunkYOff, nChunkYSize, nDstXOff,
-            nDstXOff2, nDstYOff, nDstYOff2,
-            static_cast<GUInt16 *>(*ppDstBuffer), bHasNoData, dfNoDataValue,
-            poColorTable, eSrcDataType);
-    }
-    else if (eWrkDataType == GDT_Float32)
-    {
-        return GDALResampleChunk_Mode_T<float>(
-            dfXRatioDstToSrc, dfYRatioDstToSrc, dfSrcXDelta, dfSrcYDelta,
-            static_cast<const float *>(pChunk), pabyChunkNodataMask, nChunkXOff,
-            nChunkXSize, nChunkYOff, nChunkYSize, nDstXOff, nDstXOff2, nDstYOff,
-            nDstYOff2, static_cast<float *>(*ppDstBuffer), bHasNoData,
-            dfNoDataValue, poColorTable, eSrcDataType);
-    }
-    else if (eWrkDataType == GDT_Float64)
+    CPLAssert(args.eSrcDataType == args.eWrkDataType);
+
+    *peDstBufferDataType = args.eWrkDataType;
+    switch (args.eWrkDataType)
     {
-        return GDALResampleChunk_Mode_T<double>(
-            dfXRatioDstToSrc, dfYRatioDstToSrc, dfSrcXDelta, dfSrcYDelta,
-            static_cast<const double *>(pChunk), pabyChunkNodataMask,
-            nChunkXOff, nChunkXSize, nChunkYOff, nChunkYSize, nDstXOff,
-            nDstXOff2, nDstYOff, nDstYOff2, static_cast<double *>(*ppDstBuffer),
-            bHasNoData, dfNoDataValue, poColorTable, eSrcDataType);
+        // For mode resampling, as no computation is done, only the
+        // size of the data type matters... except for Byte where we have
+        // special processing. And for floating point values
+        case GDT_Byte:
+        {
+            return GDALResampleChunk_ModeT(args,
+                                           static_cast<const GByte *>(pChunk),
+                                           static_cast<GByte *>(*ppDstBuffer));
+        }
+
+        case GDT_Int8:
+        {
+            return GDALResampleChunk_ModeT(args,
+                                           static_cast<const int8_t *>(pChunk),
+                                           static_cast<int8_t *>(*ppDstBuffer));
+        }
+
+        case GDT_Int16:
+        case GDT_UInt16:
+        {
+            CPLAssert(GDALGetDataTypeSizeBytes(args.eWrkDataType) == 2);
+            return GDALResampleChunk_ModeT(
+                args, static_cast<const uint16_t *>(pChunk),
+                static_cast<uint16_t *>(*ppDstBuffer));
+        }
+
+        case GDT_CInt16:
+        case GDT_Int32:
+        case GDT_UInt32:
+        {
+            CPLAssert(GDALGetDataTypeSizeBytes(args.eWrkDataType) == 4);
+            return GDALResampleChunk_ModeT(
+                args, static_cast<const uint32_t *>(pChunk),
+                static_cast<uint32_t *>(*ppDstBuffer));
+        }
+
+        case GDT_Float32:
+        {
+            CPLAssert(GDALGetDataTypeSizeBytes(args.eWrkDataType) == 4);
+            return GDALResampleChunk_ModeT(args,
+                                           static_cast<const float *>(pChunk),
+                                           static_cast<float *>(*ppDstBuffer));
+        }
+
+        case GDT_CInt32:
+        case GDT_Int64:
+        case GDT_UInt64:
+        {
+            CPLAssert(GDALGetDataTypeSizeBytes(args.eWrkDataType) == 8);
+            return GDALResampleChunk_ModeT(
+                args, static_cast<const uint64_t *>(pChunk),
+                static_cast<uint64_t *>(*ppDstBuffer));
+        }
+
+        case GDT_Float64:
+        {
+            CPLAssert(GDALGetDataTypeSizeBytes(args.eWrkDataType) == 8);
+            return GDALResampleChunk_ModeT(args,
+                                           static_cast<const double *>(pChunk),
+                                           static_cast<double *>(*ppDstBuffer));
+        }
+
+        case GDT_CFloat32:
+        {
+            return GDALResampleChunk_ModeT(
+                args, static_cast<const std::complex<float> *>(pChunk),
+                static_cast<std::complex<float> *>(*ppDstBuffer));
+        }
+
+        case GDT_CFloat64:
+        {
+            return GDALResampleChunk_ModeT(
+                args, static_cast<const std::complex<double> *>(pChunk),
+                static_cast<std::complex<double> *>(*ppDstBuffer));
+        }
+
+        case GDT_Unknown:
+        case GDT_TypeCount:
+            break;
     }
 
     CPLAssert(false);
@@ -2989,19 +3100,31 @@ inline void GDALResampleConvolutionHorizontalPixelCount4_3rows<GUInt16>(
 
 template <class T, class Twork, GDALDataType eWrkDataType>
 static CPLErr GDALResampleChunk_ConvolutionT(
-    double dfXRatioDstToSrc, double dfYRatioDstToSrc, double dfSrcXDelta,
-    double dfSrcYDelta, const T *pChunk, int nBands,
-    const GByte *pabyChunkNodataMask, int nChunkXOff, int nChunkXSize,
-    int nChunkYOff, int nChunkYSize, int nDstXOff, int nDstXOff2, int nDstYOff,
-    int nDstYOff2, GDALRasterBand *poDstBand, void *pDstBuffer, bool bHasNoData,
-    double dfNoDataValue, FilterFuncType pfnFilterFunc,
-    FilterFunc4ValuesType pfnFilterFunc4Values, int nKernelRadius,
-    bool bKernelWithNegativeWeights, float fMaxVal)
+    const GDALOverviewResampleArgs &args, const T *pChunk, void *pDstBuffer,
+    FilterFuncType pfnFilterFunc, FilterFunc4ValuesType pfnFilterFunc4Values,
+    int nKernelRadius, bool bKernelWithNegativeWeights, float fMaxVal)
 
 {
+    const double dfXRatioDstToSrc = args.dfXRatioDstToSrc;
+    const double dfYRatioDstToSrc = args.dfYRatioDstToSrc;
+    const double dfSrcXDelta = args.dfSrcXDelta;
+    const double dfSrcYDelta = args.dfSrcYDelta;
+    constexpr int nBands = 1;
+    const GByte *pabyChunkNodataMask = args.pabyChunkNodataMask;
+    const int nChunkXOff = args.nChunkXOff;
+    const int nChunkXSize = args.nChunkXSize;
+    const int nChunkYOff = args.nChunkYOff;
+    const int nChunkYSize = args.nChunkYSize;
+    const int nDstXOff = args.nDstXOff;
+    const int nDstXOff2 = args.nDstXOff2;
+    const int nDstYOff = args.nDstYOff;
+    const int nDstYOff2 = args.nDstYOff2;
+    const bool bHasNoData = args.bHasNoData;
+    double dfNoDataValue = args.dfNoDataValue;
+
     if (!bHasNoData)
         dfNoDataValue = 0.0;
-    const auto dstDataType = poDstBand->GetRasterDataType();
+    const auto dstDataType = args.eOvrDataType;
     const int nDstDataTypeSize = GDALGetDataTypeSizeBytes(dstDataType);
     const double dfReplacementVal =
         bHasNoData ? GDALGetNoDataReplacementValue(dstDataType, dfNoDataValue)
@@ -3009,6 +3132,7 @@ static CPLErr GDALResampleChunk_ConvolutionT(
     // cppcheck-suppress unreadVariable
     const int isIntegerDT = GDALDataTypeIsInteger(dstDataType);
     const auto nNodataValueInt64 = static_cast<GInt64>(dfNoDataValue);
+    constexpr int nWrkDataTypeSize = static_cast<int>(sizeof(Twork));
 
     // TODO: we should have some generic function to do this.
     Twork fDstMin = -std::numeric_limits<Twork>::max();
@@ -3045,6 +3169,20 @@ static CPLErr GDALResampleChunk_ConvolutionT(
         // cppcheck-suppress unreadVariable
         fDstMax = static_cast<Twork>(std::numeric_limits<GInt32>::max());
     }
+    else if (dstDataType == GDT_UInt64)
+    {
+        // cppcheck-suppress unreadVariable
+        fDstMin = static_cast<Twork>(std::numeric_limits<uint64_t>::min());
+        // cppcheck-suppress unreadVariable
+        fDstMax = static_cast<Twork>(std::numeric_limits<uint64_t>::max());
+    }
+    else if (dstDataType == GDT_Int64)
+    {
+        // cppcheck-suppress unreadVariable
+        fDstMin = static_cast<Twork>(std::numeric_limits<int64_t>::min());
+        // cppcheck-suppress unreadVariable
+        fDstMax = static_cast<Twork>(std::numeric_limits<int64_t>::max());
+    }
 
     auto replaceValIfNodata = [bHasNoData, isIntegerDT, fDstMin, fDstMax,
                                nNodataValueInt64, dfNoDataValue,
@@ -3562,7 +3700,7 @@ static CPLErr GDALResampleChunk_ConvolutionT(
 
         if (pafWrkScanline)
         {
-            GDALCopyWords(pafWrkScanline, eWrkDataType, 4,
+            GDALCopyWords(pafWrkScanline, eWrkDataType, nWrkDataTypeSize,
                           static_cast<GByte *>(pDstBuffer) +
                               static_cast<size_t>(iDstLine - nDstYOff) *
                                   nDstXSize * nDstDataTypeSize,
@@ -3578,29 +3716,23 @@ static CPLErr GDALResampleChunk_ConvolutionT(
     return CE_None;
 }
 
-static CPLErr GDALResampleChunk_Convolution(
-    double dfXRatioDstToSrc, double dfYRatioDstToSrc, double dfSrcXDelta,
-    double dfSrcYDelta, GDALDataType eWrkDataType, const void *pChunk,
-    const GByte *pabyChunkNodataMask, int nChunkXOff, int nChunkXSize,
-    int nChunkYOff, int nChunkYSize, int nDstXOff, int nDstXOff2, int nDstYOff,
-    int nDstYOff2, GDALRasterBand *poOverview, void **ppDstBuffer,
-    GDALDataType *peDstBufferDataType, const char *pszResampling,
-    bool bHasNoData, double dfNoDataValue,
-    GDALColorTable * /* poColorTable_unused */, GDALDataType /* eSrcDataType */,
-    bool /* bPropagateNoData */)
+static CPLErr
+GDALResampleChunk_Convolution(const GDALOverviewResampleArgs &args,
+                              const void *pChunk, void **ppDstBuffer,
+                              GDALDataType *peDstBufferDataType)
 {
     GDALResampleAlg eResample;
     bool bKernelWithNegativeWeights = false;
-    if (EQUAL(pszResampling, "BILINEAR"))
+    if (EQUAL(args.pszResampling, "BILINEAR"))
         eResample = GRA_Bilinear;
-    else if (EQUAL(pszResampling, "CUBIC"))
+    else if (EQUAL(args.pszResampling, "CUBIC"))
     {
         eResample = GRA_Cubic;
         bKernelWithNegativeWeights = true;
     }
-    else if (EQUAL(pszResampling, "CUBICSPLINE"))
+    else if (EQUAL(args.pszResampling, "CUBICSPLINE"))
         eResample = GRA_CubicSpline;
-    else if (EQUAL(pszResampling, "LANCZOS"))
+    else if (EQUAL(args.pszResampling, "LANCZOS"))
     {
         eResample = GRA_Lanczos;
         bKernelWithNegativeWeights = true;
@@ -3618,60 +3750,63 @@ static CPLErr GDALResampleChunk_Convolution(
     float fMaxVal = 0.f;
     // Cubic, etc... can have overshoots, so make sure we clamp values to the
     // maximum value if NBITS is set.
-    const char *pszNBITS =
-        poOverview->GetMetadataItem("NBITS", "IMAGE_STRUCTURE");
-    GDALDataType eBandDT = poOverview->GetRasterDataType();
-    if (eResample != GRA_Bilinear && pszNBITS != nullptr &&
-        (eBandDT == GDT_Byte || eBandDT == GDT_UInt16 || eBandDT == GDT_UInt32))
+    if (eResample != GRA_Bilinear && args.nOvrNBITS > 0 &&
+        (args.eOvrDataType == GDT_Byte || args.eOvrDataType == GDT_UInt16 ||
+         args.eOvrDataType == GDT_UInt32))
     {
-        int nBits = atoi(pszNBITS);
-        if (nBits == GDALGetDataTypeSize(eBandDT))
+        int nBits = args.nOvrNBITS;
+        if (nBits == GDALGetDataTypeSize(args.eOvrDataType))
             nBits = 0;
         if (nBits > 0 && nBits < 32)
             fMaxVal = static_cast<float>((1U << nBits) - 1);
     }
 
-    *ppDstBuffer =
-        VSI_MALLOC3_VERBOSE(nDstXOff2 - nDstXOff, nDstYOff2 - nDstYOff,
-                            GDALGetDataTypeSizeBytes(eBandDT));
+    *ppDstBuffer = VSI_MALLOC3_VERBOSE(
+        args.nDstXOff2 - args.nDstXOff, args.nDstYOff2 - args.nDstYOff,
+        GDALGetDataTypeSizeBytes(args.eOvrDataType));
     if (*ppDstBuffer == nullptr)
     {
         return CE_Failure;
     }
-    *peDstBufferDataType = eBandDT;
-
-    if (eWrkDataType == GDT_Byte)
-        return GDALResampleChunk_ConvolutionT<GByte, float, GDT_Float32>(
-            dfXRatioDstToSrc, dfYRatioDstToSrc, dfSrcXDelta, dfSrcYDelta,
-            static_cast<const GByte *>(pChunk), 1, pabyChunkNodataMask,
-            nChunkXOff, nChunkXSize, nChunkYOff, nChunkYSize, nDstXOff,
-            nDstXOff2, nDstYOff, nDstYOff2, poOverview, *ppDstBuffer,
-            bHasNoData, dfNoDataValue, pfnFilterFunc, pfnFilterFunc4Values,
-            nKernelRadius, bKernelWithNegativeWeights, fMaxVal);
-    else if (eWrkDataType == GDT_UInt16)
-        return GDALResampleChunk_ConvolutionT<GUInt16, float, GDT_Float32>(
-            dfXRatioDstToSrc, dfYRatioDstToSrc, dfSrcXDelta, dfSrcYDelta,
-            static_cast<const GUInt16 *>(pChunk), 1, pabyChunkNodataMask,
-            nChunkXOff, nChunkXSize, nChunkYOff, nChunkYSize, nDstXOff,
-            nDstXOff2, nDstYOff, nDstYOff2, poOverview, *ppDstBuffer,
-            bHasNoData, dfNoDataValue, pfnFilterFunc, pfnFilterFunc4Values,
-            nKernelRadius, bKernelWithNegativeWeights, fMaxVal);
-    else if (eWrkDataType == GDT_Float32)
-        return GDALResampleChunk_ConvolutionT<float, float, GDT_Float32>(
-            dfXRatioDstToSrc, dfYRatioDstToSrc, dfSrcXDelta, dfSrcYDelta,
-            static_cast<const float *>(pChunk), 1, pabyChunkNodataMask,
-            nChunkXOff, nChunkXSize, nChunkYOff, nChunkYSize, nDstXOff,
-            nDstXOff2, nDstYOff, nDstYOff2, poOverview, *ppDstBuffer,
-            bHasNoData, dfNoDataValue, pfnFilterFunc, pfnFilterFunc4Values,
-            nKernelRadius, bKernelWithNegativeWeights, fMaxVal);
-    else if (eWrkDataType == GDT_Float64)
-        return GDALResampleChunk_ConvolutionT<double, double, GDT_Float64>(
-            dfXRatioDstToSrc, dfYRatioDstToSrc, dfSrcXDelta, dfSrcYDelta,
-            static_cast<const double *>(pChunk), 1, pabyChunkNodataMask,
-            nChunkXOff, nChunkXSize, nChunkYOff, nChunkYSize, nDstXOff,
-            nDstXOff2, nDstYOff, nDstYOff2, poOverview, *ppDstBuffer,
-            bHasNoData, dfNoDataValue, pfnFilterFunc, pfnFilterFunc4Values,
-            nKernelRadius, bKernelWithNegativeWeights, fMaxVal);
+    *peDstBufferDataType = args.eOvrDataType;
+
+    switch (args.eWrkDataType)
+    {
+        case GDT_Byte:
+        {
+            return GDALResampleChunk_ConvolutionT<GByte, float, GDT_Float32>(
+                args, static_cast<const GByte *>(pChunk), *ppDstBuffer,
+                pfnFilterFunc, pfnFilterFunc4Values, nKernelRadius,
+                bKernelWithNegativeWeights, fMaxVal);
+        }
+
+        case GDT_UInt16:
+        {
+            return GDALResampleChunk_ConvolutionT<GUInt16, float, GDT_Float32>(
+                args, static_cast<const GUInt16 *>(pChunk), *ppDstBuffer,
+                pfnFilterFunc, pfnFilterFunc4Values, nKernelRadius,
+                bKernelWithNegativeWeights, fMaxVal);
+        }
+
+        case GDT_Float32:
+        {
+            return GDALResampleChunk_ConvolutionT<float, float, GDT_Float32>(
+                args, static_cast<const float *>(pChunk), *ppDstBuffer,
+                pfnFilterFunc, pfnFilterFunc4Values, nKernelRadius,
+                bKernelWithNegativeWeights, fMaxVal);
+        }
+
+        case GDT_Float64:
+        {
+            return GDALResampleChunk_ConvolutionT<double, double, GDT_Float64>(
+                args, static_cast<const double *>(pChunk), *ppDstBuffer,
+                pfnFilterFunc, pfnFilterFunc4Values, nKernelRadius,
+                bKernelWithNegativeWeights, fMaxVal);
+        }
+
+        default:
+            break;
+    }
 
     CPLAssert(false);
     return CE_Failure;
@@ -3681,11 +3816,11 @@ static CPLErr GDALResampleChunk_Convolution(
 /*                       GDALResampleChunkC32R()                        */
 /************************************************************************/
 
-static CPLErr GDALResampleChunkC32R(int nSrcWidth, int nSrcHeight,
-                                    const float *pafChunk, int nChunkYOff,
-                                    int nChunkYSize, int nDstYOff,
-                                    int nDstYOff2, GDALRasterBand *poOverview,
-                                    void **ppDstBuffer,
+static CPLErr GDALResampleChunkC32R(const int nSrcWidth, const int nSrcHeight,
+                                    const float *pafChunk, const int nChunkYOff,
+                                    const int nChunkYSize, const int nDstYOff,
+                                    const int nDstYOff2, const int nOvrXSize,
+                                    const int nOvrYSize, void **ppDstBuffer,
                                     GDALDataType *peDstBufferDataType,
                                     const char *pszResampling)
 
@@ -3725,7 +3860,7 @@ static CPLErr GDALResampleChunkC32R(int nSrcWidth, int nSrcHeight,
         return CE_Failure;
     }
 
-    const int nOXSize = poOverview->GetXSize();
+    const int nOXSize = nOvrXSize;
     *ppDstBuffer = VSI_MALLOC3_VERBOSE(nOXSize, nDstYOff2 - nDstYOff,
                                        GDALGetDataTypeSizeBytes(GDT_CFloat32));
     if (*ppDstBuffer == nullptr)
@@ -3735,7 +3870,7 @@ static CPLErr GDALResampleChunkC32R(int nSrcWidth, int nSrcHeight,
     float *const pafDstBuffer = static_cast<float *>(*ppDstBuffer);
     *peDstBufferDataType = GDT_CFloat32;
 
-    const int nOYSize = poOverview->GetYSize();
+    const int nOYSize = nOvrYSize;
     const double dfXRatioDstToSrc = static_cast<double>(nSrcWidth) / nOXSize;
     const double dfYRatioDstToSrc = static_cast<double>(nSrcHeight) / nOYSize;
 
@@ -4081,33 +4216,38 @@ GDALResampleFunction GDALGetResampleFunction(const char *pszResampling,
 GDALDataType GDALGetOvrWorkDataType(const char *pszResampling,
                                     GDALDataType eSrcDataType)
 {
-    if ((STARTS_WITH_CI(pszResampling, "NEAR") ||
-         STARTS_WITH_CI(pszResampling, "AVER") || EQUAL(pszResampling, "RMS") ||
-         EQUAL(pszResampling, "CUBIC") || EQUAL(pszResampling, "CUBICSPLINE") ||
-         EQUAL(pszResampling, "LANCZOS") || EQUAL(pszResampling, "BILINEAR") ||
-         EQUAL(pszResampling, "MODE")) &&
-        eSrcDataType == GDT_Byte)
+    if (STARTS_WITH_CI(pszResampling, "NEAR") || EQUAL(pszResampling, "MODE"))
+    {
+        return eSrcDataType;
+    }
+    else if (eSrcDataType == GDT_Byte &&
+             (STARTS_WITH_CI(pszResampling, "AVER") ||
+              EQUAL(pszResampling, "RMS") || EQUAL(pszResampling, "CUBIC") ||
+              EQUAL(pszResampling, "CUBICSPLINE") ||
+              EQUAL(pszResampling, "LANCZOS") ||
+              EQUAL(pszResampling, "BILINEAR") || EQUAL(pszResampling, "MODE")))
     {
         return GDT_Byte;
     }
-    else if ((STARTS_WITH_CI(pszResampling, "NEAR") ||
-              STARTS_WITH_CI(pszResampling, "AVER") ||
+    else if (eSrcDataType == GDT_UInt16 &&
+             (STARTS_WITH_CI(pszResampling, "AVER") ||
               EQUAL(pszResampling, "RMS") || EQUAL(pszResampling, "CUBIC") ||
               EQUAL(pszResampling, "CUBICSPLINE") ||
               EQUAL(pszResampling, "LANCZOS") ||
-              EQUAL(pszResampling, "BILINEAR") ||
-              EQUAL(pszResampling, "MODE")) &&
-             eSrcDataType == GDT_UInt16)
+              EQUAL(pszResampling, "BILINEAR") || EQUAL(pszResampling, "MODE")))
     {
         return GDT_UInt16;
     }
     else if (EQUAL(pszResampling, "GAUSS"))
         return GDT_Float64;
 
-    if (eSrcDataType == GDT_Float64)
-        return GDT_Float64;
-
-    return GDT_Float32;
+    if (eSrcDataType == GDT_Byte || eSrcDataType == GDT_Int8 ||
+        eSrcDataType == GDT_UInt16 || eSrcDataType == GDT_Int16 ||
+        eSrcDataType == GDT_Float32)
+    {
+        return GDT_Float32;
+    }
+    return GDT_Float64;
 }
 
 namespace
@@ -4340,10 +4480,13 @@ CPLErr GDALRegenerateOverviewsEx(GDALRasterBandH hSrcBand, int nOverviewCount,
     poSrcBand->GetBlockSize(&nFRXBlockSize, &nFRYBlockSize);
 
     const GDALDataType eSrcDataType = poSrcBand->GetRasterDataType();
+    const bool bUseGenericResampleFn = STARTS_WITH_CI(pszResampling, "NEAR") ||
+                                       EQUAL(pszResampling, "MODE") ||
+                                       !GDALDataTypeIsComplex(eSrcDataType);
     const GDALDataType eWrkDataType =
-        GDALDataTypeIsComplex(eSrcDataType)
-            ? GDT_CFloat32
-            : GDALGetOvrWorkDataType(pszResampling, eSrcDataType);
+        bUseGenericResampleFn
+            ? GDALGetOvrWorkDataType(pszResampling, eSrcDataType)
+            : GDT_CFloat32;
 
     const int nWidth = poSrcBand->GetXSize();
     const int nHeight = poSrcBand->GetYSize();
@@ -4436,27 +4579,16 @@ CPLErr GDALRegenerateOverviewsEx(GDALRasterBandH hSrcBand, int nOverviewCount,
         std::shared_ptr<PointerHolder> oSrcBufferHolder{};
         std::unique_ptr<PointerHolder> oDstBufferHolder{};
 
+        GDALRasterBand *poDstBand = nullptr;
+
         // Input parameters of pfnResampleFn
         GDALResampleFunction pfnResampleFn = nullptr;
-        double dfXRatioDstToSrc{};
-        double dfYRatioDstToSrc{};
-        GDALDataType eWrkDataType = GDT_Unknown;
-        const void *pChunk = nullptr;
-        const GByte *pabyChunkNodataMask = nullptr;
-        int nWidth = 0;
-        int nHeight = 0;
-        int nChunkYOff = 0;
-        int nChunkYSize = 0;
+        int nSrcWidth = 0;
+        int nSrcHeight = 0;
         int nDstWidth = 0;
-        int nDstYOff = 0;
-        int nDstYOff2 = 0;
-        GDALRasterBand *poDstBand = nullptr;
-        const char *pszResampling = nullptr;
-        bool bHasNoData = false;
-        double dfNoDataValue = 0.0;
-        GDALColorTable *poColorTable = nullptr;
-        GDALDataType eSrcDataType = GDT_Unknown;
-        bool bPropagateNoData = false;
+        GDALOverviewResampleArgs args{};
+        const void *pChunk = nullptr;
+        bool bUseGenericResampleFn = false;
 
         // Output values of resampling function
         CPLErr eErr = CE_Failure;
@@ -4486,26 +4618,22 @@ CPLErr GDALRegenerateOverviewsEx(GDALRasterBandH hSrcBand, int nOverviewCount,
     {
         OvrJob *poJob = static_cast<OvrJob *>(pData);
 
-        if (poJob->eWrkDataType != GDT_CFloat32)
+        if (poJob->bUseGenericResampleFn)
         {
-            poJob->eErr = poJob->pfnResampleFn(
-                poJob->dfXRatioDstToSrc, poJob->dfYRatioDstToSrc, 0.0, 0.0,
-                poJob->eWrkDataType, poJob->pChunk, poJob->pabyChunkNodataMask,
-                0, poJob->nWidth, poJob->nChunkYOff, poJob->nChunkYSize, 0,
-                poJob->nDstWidth, poJob->nDstYOff, poJob->nDstYOff2,
-                poJob->poDstBand, &(poJob->pDstBuffer),
-                &(poJob->eDstBufferDataType), poJob->pszResampling,
-                poJob->bHasNoData, poJob->dfNoDataValue, poJob->poColorTable,
-                poJob->eSrcDataType, poJob->bPropagateNoData);
+            poJob->eErr = poJob->pfnResampleFn(poJob->args, poJob->pChunk,
+                                               &(poJob->pDstBuffer),
+                                               &(poJob->eDstBufferDataType));
         }
         else
         {
             poJob->eErr = GDALResampleChunkC32R(
-                poJob->nWidth, poJob->nHeight,
-                static_cast<const float *>(poJob->pChunk), poJob->nChunkYOff,
-                poJob->nChunkYSize, poJob->nDstYOff, poJob->nDstYOff2,
-                poJob->poDstBand, &(poJob->pDstBuffer),
-                &(poJob->eDstBufferDataType), poJob->pszResampling);
+                poJob->nSrcWidth, poJob->nSrcHeight,
+                static_cast<const float *>(poJob->pChunk),
+                poJob->args.nChunkYOff, poJob->args.nChunkYSize,
+                poJob->args.nDstYOff, poJob->args.nDstYOff2,
+                poJob->args.nOvrXSize, poJob->args.nOvrYSize,
+                &(poJob->pDstBuffer), &(poJob->eDstBufferDataType),
+                poJob->args.pszResampling);
         }
 
         poJob->oDstBufferHolder =
@@ -4522,9 +4650,9 @@ CPLErr GDALRegenerateOverviewsEx(GDALRasterBandH hSrcBand, int nOverviewCount,
     const auto WriteJobData = [](const OvrJob *poJob)
     {
         return poJob->poDstBand->RasterIO(
-            GF_Write, 0, poJob->nDstYOff, poJob->nDstWidth,
-            poJob->nDstYOff2 - poJob->nDstYOff, poJob->pDstBuffer,
-            poJob->nDstWidth, poJob->nDstYOff2 - poJob->nDstYOff,
+            GF_Write, 0, poJob->args.nDstYOff, poJob->nDstWidth,
+            poJob->args.nDstYOff2 - poJob->args.nDstYOff, poJob->pDstBuffer,
+            poJob->nDstWidth, poJob->args.nDstYOff2 - poJob->args.nDstYOff,
             poJob->eDstBufferDataType, 0, 0, nullptr);
     };
 
@@ -4812,27 +4940,38 @@ CPLErr GDALRegenerateOverviewsEx(GDALRasterBandH hSrcBand, int nOverviewCount,
                      nDstWidth, nDstYOff2 - nDstYOff);
 #endif
 
-            auto poJob = std::unique_ptr<OvrJob>(new OvrJob());
+            auto poJob = std::make_unique<OvrJob>();
             poJob->pfnResampleFn = pfnResampleFn;
-            poJob->dfXRatioDstToSrc = dfXRatioDstToSrc;
-            poJob->dfYRatioDstToSrc = dfYRatioDstToSrc;
-            poJob->eWrkDataType = eWrkDataType;
+            poJob->bUseGenericResampleFn = bUseGenericResampleFn;
+            poJob->args.eOvrDataType = poDstBand->GetRasterDataType();
+            poJob->args.nOvrXSize = poDstBand->GetXSize();
+            poJob->args.nOvrYSize = poDstBand->GetYSize();
+            const char *pszNBITS =
+                poDstBand->GetMetadataItem("NBITS", "IMAGE_STRUCTURE");
+            poJob->args.nOvrNBITS = pszNBITS ? atoi(pszNBITS) : 0;
+            poJob->args.dfXRatioDstToSrc = dfXRatioDstToSrc;
+            poJob->args.dfYRatioDstToSrc = dfYRatioDstToSrc;
+            poJob->args.eWrkDataType = eWrkDataType;
             poJob->pChunk = pChunk;
-            poJob->pabyChunkNodataMask = pabyChunkNodataMask;
-            poJob->nWidth = nWidth;
-            poJob->nHeight = nHeight;
-            poJob->nChunkYOff = nChunkYOffQueried;
-            poJob->nChunkYSize = nChunkYSizeQueried;
+            poJob->args.pabyChunkNodataMask = pabyChunkNodataMask;
+            poJob->nSrcWidth = nWidth;
+            poJob->nSrcHeight = nHeight;
+            poJob->args.nChunkXOff = 0;
+            poJob->args.nChunkXSize = nWidth;
+            poJob->args.nChunkYOff = nChunkYOff;
+            poJob->args.nChunkYSize = nChunkYSizeQueried;
             poJob->nDstWidth = nDstWidth;
-            poJob->nDstYOff = nDstYOff;
-            poJob->nDstYOff2 = nDstYOff2;
+            poJob->args.nDstXOff = 0;
+            poJob->args.nDstXOff2 = nDstWidth;
+            poJob->args.nDstYOff = nDstYOff;
+            poJob->args.nDstYOff2 = nDstYOff2;
             poJob->poDstBand = poDstBand;
-            poJob->pszResampling = pszResampling;
-            poJob->bHasNoData = bHasNoData;
-            poJob->dfNoDataValue = dfNoDataValue;
-            poJob->poColorTable = poColorTable;
-            poJob->eSrcDataType = eSrcDataType;
-            poJob->bPropagateNoData = bPropagateNoData;
+            poJob->args.pszResampling = pszResampling;
+            poJob->args.bHasNoData = bHasNoData;
+            poJob->args.dfNoDataValue = dfNoDataValue;
+            poJob->args.poColorTable = poColorTable;
+            poJob->args.eSrcDataType = eSrcDataType;
+            poJob->args.bPropagateNoData = bPropagateNoData;
 
             if (poJobQueue)
             {
@@ -5017,13 +5156,14 @@ CPLErr GDALRegenerateOverviewsMultiBand(
 
     for (int iOverview = 0; iOverview < nOverviews; ++iOverview)
     {
-        const int nDstWidth = papapoOverviewBands[0][iOverview]->GetXSize();
-        const int nDstHeight = papapoOverviewBands[0][iOverview]->GetYSize();
+        const auto poOvrFirstBand = papapoOverviewBands[0][iOverview];
+        const int nDstWidth = poOvrFirstBand->GetXSize();
+        const int nDstHeight = poOvrFirstBand->GetYSize();
         for (int iBand = 1; iBand < nBands; ++iBand)
         {
-            if (papapoOverviewBands[iBand][iOverview]->GetXSize() !=
-                    nDstWidth ||
-                papapoOverviewBands[iBand][iOverview]->GetYSize() != nDstHeight)
+            const auto poOvrBand = papapoOverviewBands[iBand][iOverview];
+            if (poOvrBand->GetXSize() != nDstWidth ||
+                poOvrBand->GetYSize() != nDstHeight)
             {
                 CPLError(
                     CE_Failure, CPLE_NotSupported,
@@ -5031,8 +5171,7 @@ CPLErr GDALRegenerateOverviewsMultiBand(
                     "of the same level must have the same dimensions");
                 return CE_Failure;
             }
-            if (papapoOverviewBands[iBand][iOverview]->GetRasterDataType() !=
-                eDataType)
+            if (poOvrBand->GetRasterDataType() != eDataType)
             {
                 CPLError(
                     CE_Failure, CPLE_NotSupported,
@@ -5062,6 +5201,7 @@ CPLErr GDALRegenerateOverviewsMultiBand(
 
     const GDALDataType eWrkDataType =
         GDALGetOvrWorkDataType(pszResampling, eDataType);
+    const int nWrkDataTypeSize = GDALGetDataTypeSizeBytes(eWrkDataType);
 
     const bool bIsMask = papoSrcBands[0]->IsMaskBand();
 
@@ -5102,8 +5242,8 @@ CPLErr GDALRegenerateOverviewsMultiBand(
                                    : std::unique_ptr<CPLJobQueue>(nullptr);
 
     // Only configurable for debug / testing
-    const int nChunkMaxSize =
-        atoi(CPLGetConfigOption("GDAL_OVR_CHUNK_MAX_SIZE", "10485760"));
+    const int nChunkMaxSize = std::max(
+        100, atoi(CPLGetConfigOption("GDAL_OVR_CHUNK_MAX_SIZE", "10485760")));
 
     // Second pass to do the real job.
     double dfCurPixelCount = 0;
@@ -5113,11 +5253,6 @@ CPLErr GDALRegenerateOverviewsMultiBand(
     {
         int iSrcOverview = -1;  // -1 means the source bands.
 
-        int nDstChunkXSize = 0;
-        int nDstChunkYSize = 0;
-        papapoOverviewBands[0][iOverview]->GetBlockSize(&nDstChunkXSize,
-                                                        &nDstChunkYSize);
-
         const int nDstTotalWidth =
             papapoOverviewBands[0][iOverview]->GetXSize();
         const int nDstTotalHeight =
@@ -5168,6 +5303,23 @@ CPLErr GDALRegenerateOverviewsMultiBand(
         if (nOvrFactor == 0)
             nOvrFactor = 1;
 
+        int nDstChunkXSize = 0;
+        int nDstChunkYSize = 0;
+        papapoOverviewBands[0][iOverview]->GetBlockSize(&nDstChunkXSize,
+                                                        &nDstChunkYSize);
+
+        const char *pszDST_CHUNK_X_SIZE =
+            CSLFetchNameValue(papszOptions, "DST_CHUNK_X_SIZE");
+        const char *pszDST_CHUNK_Y_SIZE =
+            CSLFetchNameValue(papszOptions, "DST_CHUNK_Y_SIZE");
+        if (pszDST_CHUNK_X_SIZE && pszDST_CHUNK_Y_SIZE)
+        {
+            nDstChunkXSize = std::max(1, atoi(pszDST_CHUNK_X_SIZE));
+            nDstChunkYSize = std::max(1, atoi(pszDST_CHUNK_Y_SIZE));
+            CPLDebug("GDAL", "Using dst chunk size %d x %d", nDstChunkXSize,
+                     nDstChunkYSize);
+        }
+
         // Try to extend the chunk size so that the memory needed to acquire
         // source pixels goes up to 10 MB.
         // This can help for drivers that support multi-threaded reading
@@ -5184,8 +5336,7 @@ CPLErr GDALRegenerateOverviewsMultiBand(
                 nFullResXChunk + 2 * nKernelRadius * nOvrFactor;
 
             if (static_cast<GIntBig>(nFullResXChunkQueried) *
-                    nFullResYChunkQueried * nBands *
-                    GDALGetDataTypeSizeBytes(eWrkDataType) >
+                    nFullResYChunkQueried * nBands * nWrkDataTypeSize >
                 nChunkMaxSize)
             {
                 break;
@@ -5200,6 +5351,199 @@ CPLErr GDALRegenerateOverviewsMultiBand(
         const int nFullResXChunkQueried =
             nFullResXChunk + 2 * nKernelRadius * nOvrFactor;
 
+        // Make sure that the RAM requirements to acquire the source data does
+        // not exceed nChunkMaxSize
+        // If so, reduce the destination chunk size, generate overviews in a
+        // temporary dataset, and copy that temporary dataset over the target
+        // overview bands (to avoid issues with lossy compression)
+        const auto nMemRequirement =
+            static_cast<GIntBig>(nFullResXChunkQueried) *
+            nFullResYChunkQueried * nBands * nWrkDataTypeSize;
+        if (nMemRequirement > nChunkMaxSize &&
+            !(pszDST_CHUNK_X_SIZE && pszDST_CHUNK_Y_SIZE))
+        {
+            // Compute a smaller destination chunk size
+            const auto nOverShootFactor = nMemRequirement / nChunkMaxSize;
+            const auto nSqrtOverShootFactor = std::max<GIntBig>(
+                4, static_cast<GIntBig>(std::ceil(
+                       std::sqrt(static_cast<double>(nOverShootFactor)))));
+            const int nReducedDstChunkXSize = std::max(
+                1, static_cast<int>(nDstChunkXSize / nSqrtOverShootFactor));
+            const int nReducedDstChunkYSize = std::max(
+                1, static_cast<int>(nDstChunkYSize / nSqrtOverShootFactor));
+            if (nReducedDstChunkXSize < nDstChunkXSize ||
+                nReducedDstChunkYSize < nDstChunkYSize)
+            {
+                CPLStringList aosOptions(papszOptions);
+                aosOptions.SetNameValue(
+                    "DST_CHUNK_X_SIZE",
+                    CPLSPrintf("%d", nReducedDstChunkXSize));
+                aosOptions.SetNameValue(
+                    "DST_CHUNK_Y_SIZE",
+                    CPLSPrintf("%d", nReducedDstChunkYSize));
+
+                const auto nTmpDSMemRequirement =
+                    static_cast<GIntBig>(nDstTotalWidth) * nDstTotalHeight *
+                    nBands * GDALGetDataTypeSizeBytes(eDataType);
+                std::unique_ptr<GDALDataset> poTmpDS;
+                // Config option mostly/only for autotest purposes
+                const char *pszGDAL_OVR_TEMP_DRIVER =
+                    CPLGetConfigOption("GDAL_OVR_TEMP_DRIVER", "");
+                if ((nTmpDSMemRequirement <= nChunkMaxSize &&
+                     !EQUAL(pszGDAL_OVR_TEMP_DRIVER, "GTIFF")) ||
+                    EQUAL(pszGDAL_OVR_TEMP_DRIVER, "MEM"))
+                {
+                    auto poTmpDrv =
+                        GetGDALDriverManager()->GetDriverByName("MEM");
+                    if (!poTmpDrv)
+                    {
+                        eErr = CE_Failure;
+                        break;
+                    }
+                    poTmpDS.reset(poTmpDrv->Create("", nDstTotalWidth,
+                                                   nDstTotalHeight, nBands,
+                                                   eDataType, nullptr));
+                }
+                else
+                {
+                    auto poTmpDrv =
+                        GetGDALDriverManager()->GetDriverByName("GTiff");
+                    if (!poTmpDrv)
+                    {
+                        eErr = CE_Failure;
+                        break;
+                    }
+                    std::string osTmpFilename;
+                    auto poDstDS = papapoOverviewBands[0][0]->GetDataset();
+                    if (poDstDS)
+                    {
+                        osTmpFilename = poDstDS->GetDescription();
+                        VSIStatBufL sStatBuf;
+                        if (!osTmpFilename.empty() &&
+                            VSIStatL(osTmpFilename.c_str(), &sStatBuf) == 0)
+                            osTmpFilename += "_tmp_ovr.tif";
+                    }
+                    if (osTmpFilename.empty())
+                    {
+                        osTmpFilename = CPLGenerateTempFilename(nullptr);
+                        osTmpFilename += ".tif";
+                    }
+                    CPLDebug("GDAL",
+                             "Creating temporary file %s of %d x %d x %d",
+                             osTmpFilename.c_str(), nDstTotalWidth,
+                             nDstTotalHeight, nBands);
+                    CPLStringList aosCO;
+                    poTmpDS.reset(poTmpDrv->Create(
+                        osTmpFilename.c_str(), nDstTotalWidth, nDstTotalHeight,
+                        nBands, eDataType, aosCO.List()));
+                    if (poTmpDS)
+                    {
+                        poTmpDS->MarkSuppressOnClose();
+                        VSIUnlink(osTmpFilename.c_str());
+                    }
+                }
+                if (!poTmpDS)
+                {
+                    eErr = CE_Failure;
+                    break;
+                }
+
+                std::vector<GDALRasterBand **> apapoOverviewBands(nBands);
+                for (int i = 0; i < nBands; ++i)
+                {
+                    apapoOverviewBands[i] = static_cast<GDALRasterBand **>(
+                        CPLMalloc(sizeof(GDALRasterBand *)));
+                    apapoOverviewBands[i][0] = poTmpDS->GetRasterBand(i + 1);
+                }
+
+                const double dfExtraPixels =
+                    static_cast<double>(nSrcXSize) / nToplevelSrcWidth *
+                    papapoOverviewBands[0][iOverview]->GetXSize() *
+                    static_cast<double>(nSrcYSize) / nToplevelSrcHeight *
+                    papapoOverviewBands[0][iOverview]->GetYSize();
+
+                void *pScaledProgressData = GDALCreateScaledProgress(
+                    dfCurPixelCount / dfTotalPixelCount,
+                    (dfCurPixelCount + dfExtraPixels) / dfTotalPixelCount,
+                    pfnProgress, pProgressData);
+
+                // Generate overviews in temporary dataset
+                eErr = GDALRegenerateOverviewsMultiBand(
+                    nBands, papoSrcBands, 1, apapoOverviewBands.data(),
+                    pszResampling, GDALScaledProgress, pScaledProgressData,
+                    aosOptions.List());
+
+                GDALDestroyScaledProgress(pScaledProgressData);
+
+                dfCurPixelCount += dfExtraPixels;
+
+                for (int i = 0; i < nBands; ++i)
+                {
+                    CPLFree(apapoOverviewBands[i]);
+                }
+
+                // Copy temporary dataset to destination overview bands
+
+                if (eErr == CE_None)
+                {
+                    // Check if all papapoOverviewBands[][iOverview] bands point
+                    // to the same dataset. If so, we can use
+                    // GDALDatasetCopyWholeRaster()
+                    GDALDataset *poDstOvrBandDS =
+                        papapoOverviewBands[0][iOverview]->GetDataset();
+                    if (poDstOvrBandDS)
+                    {
+                        if (poDstOvrBandDS->GetRasterCount() != nBands ||
+                            poDstOvrBandDS->GetRasterBand(1) !=
+                                papapoOverviewBands[0][iOverview])
+                        {
+                            poDstOvrBandDS = nullptr;
+                        }
+                        else
+                        {
+                            for (int i = 1; poDstOvrBandDS && i < nBands; ++i)
+                            {
+                                GDALDataset *poThisDstOvrBandDS =
+                                    papapoOverviewBands[i][iOverview]
+                                        ->GetDataset();
+                                if (poThisDstOvrBandDS == nullptr ||
+                                    poThisDstOvrBandDS != poDstOvrBandDS ||
+                                    poThisDstOvrBandDS->GetRasterBand(i + 1) !=
+                                        papapoOverviewBands[i][iOverview])
+                                {
+                                    poDstOvrBandDS = nullptr;
+                                }
+                            }
+                        }
+                    }
+                    if (poDstOvrBandDS)
+                    {
+                        eErr = GDALDatasetCopyWholeRaster(
+                            GDALDataset::ToHandle(poTmpDS.get()),
+                            GDALDataset::ToHandle(poDstOvrBandDS), nullptr,
+                            nullptr, nullptr);
+                    }
+                    else
+                    {
+                        for (int i = 0; eErr == CE_None && i < nBands; ++i)
+                        {
+                            eErr = GDALRasterBandCopyWholeRaster(
+                                GDALRasterBand::ToHandle(
+                                    poTmpDS->GetRasterBand(i + 1)),
+                                GDALRasterBand::ToHandle(
+                                    papapoOverviewBands[i][iOverview]),
+                                nullptr, nullptr, nullptr);
+                        }
+                    }
+                }
+
+                if (eErr != CE_None)
+                    break;
+
+                continue;
+            }
+        }
+
         // Structure describing a resampling job
         struct OvrJob
         {
@@ -5208,27 +5552,12 @@ CPLErr GDALRegenerateOverviewsMultiBand(
             std::unique_ptr<PointerHolder> oSrcBufferHolder{};
             std::unique_ptr<PointerHolder> oDstBufferHolder{};
 
+            GDALRasterBand *poDstBand = nullptr;
+
             // Input parameters of pfnResampleFn
             GDALResampleFunction pfnResampleFn = nullptr;
-            double dfXRatioDstToSrc{};
-            double dfYRatioDstToSrc{};
-            GDALDataType eWrkDataType = GDT_Unknown;
+            GDALOverviewResampleArgs args{};
             const void *pChunk = nullptr;
-            const GByte *pabyChunkNodataMask = nullptr;
-            int nChunkXOff = 0;
-            int nChunkXSize = 0;
-            int nChunkYOff = 0;
-            int nChunkYSize = 0;
-            int nDstXOff = 0;
-            int nDstXOff2 = 0;
-            int nDstYOff = 0;
-            int nDstYOff2 = 0;
-            GDALRasterBand *poOverview = nullptr;
-            const char *pszResampling = nullptr;
-            bool bHasNoData = false;
-            double dfNoDataValue = 0.0;
-            GDALDataType eSrcDataType = GDT_Unknown;
-            bool bPropagateNoData = false;
 
             // Output values of resampling function
             CPLErr eErr = CE_Failure;
@@ -5246,15 +5575,9 @@ CPLErr GDALRegenerateOverviewsMultiBand(
         {
             OvrJob *poJob = static_cast<OvrJob *>(pData);
 
-            poJob->eErr = poJob->pfnResampleFn(
-                poJob->dfXRatioDstToSrc, poJob->dfYRatioDstToSrc, 0.0, 0.0,
-                poJob->eWrkDataType, poJob->pChunk, poJob->pabyChunkNodataMask,
-                poJob->nChunkXOff, poJob->nChunkXSize, poJob->nChunkYOff,
-                poJob->nChunkYSize, poJob->nDstXOff, poJob->nDstXOff2,
-                poJob->nDstYOff, poJob->nDstYOff2, poJob->poOverview,
-                &(poJob->pDstBuffer), &(poJob->eDstBufferDataType),
-                poJob->pszResampling, poJob->bHasNoData, poJob->dfNoDataValue,
-                nullptr, poJob->eSrcDataType, poJob->bPropagateNoData);
+            poJob->eErr = poJob->pfnResampleFn(poJob->args, poJob->pChunk,
+                                               &(poJob->pDstBuffer),
+                                               &(poJob->eDstBufferDataType));
 
             poJob->oDstBufferHolder.reset(new PointerHolder(poJob->pDstBuffer));
 
@@ -5268,13 +5591,13 @@ CPLErr GDALRegenerateOverviewsMultiBand(
         // Function to write resample data to target band
         const auto WriteJobData = [](const OvrJob *poJob)
         {
-            return poJob->poOverview->RasterIO(
-                GF_Write, poJob->nDstXOff, poJob->nDstYOff,
-                poJob->nDstXOff2 - poJob->nDstXOff,
-                poJob->nDstYOff2 - poJob->nDstYOff, poJob->pDstBuffer,
-                poJob->nDstXOff2 - poJob->nDstXOff,
-                poJob->nDstYOff2 - poJob->nDstYOff, poJob->eDstBufferDataType,
-                0, 0, nullptr);
+            return poJob->poDstBand->RasterIO(
+                GF_Write, poJob->args.nDstXOff, poJob->args.nDstYOff,
+                poJob->args.nDstXOff2 - poJob->args.nDstXOff,
+                poJob->args.nDstYOff2 - poJob->args.nDstYOff, poJob->pDstBuffer,
+                poJob->args.nDstXOff2 - poJob->args.nDstXOff,
+                poJob->args.nDstYOff2 - poJob->args.nDstYOff,
+                poJob->eDstBufferDataType, 0, 0, nullptr);
         };
 
         // Wait for completion of oldest job and serialize it
@@ -5422,7 +5745,7 @@ CPLErr GDALRegenerateOverviewsMultiBand(
                     {
                         apaChunk[iBand] = VSI_MALLOC3_VERBOSE(
                             nFullResXChunkQueried, nFullResYChunkQueried,
-                            GDALGetDataTypeSizeBytes(eWrkDataType));
+                            nWrkDataTypeSize);
                         if (apaChunk[iBand] == nullptr)
                         {
                             eErr = CE_Failure;
@@ -5471,27 +5794,35 @@ CPLErr GDALRegenerateOverviewsMultiBand(
                 // Compute the resulting overview block.
                 for (int iBand = 0; iBand < nBands && eErr == CE_None; ++iBand)
                 {
-                    auto poJob = std::unique_ptr<OvrJob>(new OvrJob());
+                    auto poJob = std::make_unique<OvrJob>();
                     poJob->pfnResampleFn = pfnResampleFn;
-                    poJob->dfXRatioDstToSrc = dfXRatioDstToSrc;
-                    poJob->dfYRatioDstToSrc = dfYRatioDstToSrc;
-                    poJob->eWrkDataType = eWrkDataType;
+                    poJob->poDstBand = papapoOverviewBands[iBand][iOverview];
+                    poJob->args.eOvrDataType =
+                        poJob->poDstBand->GetRasterDataType();
+                    poJob->args.nOvrXSize = poJob->poDstBand->GetXSize();
+                    poJob->args.nOvrYSize = poJob->poDstBand->GetYSize();
+                    const char *pszNBITS = poJob->poDstBand->GetMetadataItem(
+                        "NBITS", "IMAGE_STRUCTURE");
+                    poJob->args.nOvrNBITS = pszNBITS ? atoi(pszNBITS) : 0;
+                    poJob->args.dfXRatioDstToSrc = dfXRatioDstToSrc;
+                    poJob->args.dfYRatioDstToSrc = dfYRatioDstToSrc;
+                    poJob->args.eWrkDataType = eWrkDataType;
                     poJob->pChunk = apaChunk[iBand];
-                    poJob->pabyChunkNodataMask = apabyChunkNoDataMask[iBand];
-                    poJob->nChunkXOff = nChunkXOffQueried;
-                    poJob->nChunkXSize = nChunkXSizeQueried;
-                    poJob->nChunkYOff = nChunkYOffQueried;
-                    poJob->nChunkYSize = nChunkYSizeQueried;
-                    poJob->nDstXOff = nDstXOff;
-                    poJob->nDstXOff2 = nDstXOff + nDstXCount;
-                    poJob->nDstYOff = nDstYOff;
-                    poJob->nDstYOff2 = nDstYOff + nDstYCount;
-                    poJob->poOverview = papapoOverviewBands[iBand][iOverview];
-                    poJob->pszResampling = pszResampling;
-                    poJob->bHasNoData = pabHasNoData[iBand];
-                    poJob->dfNoDataValue = padfNoDataValue[iBand];
-                    poJob->eSrcDataType = eDataType;
-                    poJob->bPropagateNoData = bPropagateNoData;
+                    poJob->args.pabyChunkNodataMask =
+                        apabyChunkNoDataMask[iBand];
+                    poJob->args.nChunkXOff = nChunkXOffQueried;
+                    poJob->args.nChunkXSize = nChunkXSizeQueried;
+                    poJob->args.nChunkYOff = nChunkYOffQueried;
+                    poJob->args.nChunkYSize = nChunkYSizeQueried;
+                    poJob->args.nDstXOff = nDstXOff;
+                    poJob->args.nDstXOff2 = nDstXOff + nDstXCount;
+                    poJob->args.nDstYOff = nDstYOff;
+                    poJob->args.nDstYOff2 = nDstYOff + nDstYCount;
+                    poJob->args.pszResampling = pszResampling;
+                    poJob->args.bHasNoData = pabHasNoData[iBand];
+                    poJob->args.dfNoDataValue = padfNoDataValue[iBand];
+                    poJob->args.eSrcDataType = eDataType;
+                    poJob->args.bPropagateNoData = bPropagateNoData;
 
                     if (poJobQueue)
                     {
diff --git a/gcore/rasterio.cpp b/gcore/rasterio.cpp
index 77f3d5ec4a5d..880e851204b9 100644
--- a/gcore/rasterio.cpp
+++ b/gcore/rasterio.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 1998, Frank Warmerdam
  * Copyright (c) 2007-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -454,6 +438,7 @@ CPLErr GDALRasterBand::IRasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff,
                     nXOff <= nLBlockX * nBlockXSize &&
                     nYOff <= nLBlockY * nBlockYSize &&
                     (nXOff + nXSize >= nXRight ||
+                     // cppcheck-suppress knownConditionTrueFalse
                      (nXOff + nXSize == GetXSize() && nXRight > GetXSize())) &&
                     (nYOff + nYSize - nBlockYSize >= nLBlockY * nBlockYSize ||
                      (nYOff + nYSize == GetYSize() &&
@@ -1005,9 +990,10 @@ CPLErr GDALRasterBand::RasterIOResampled(
     GSpacing nPixelSpace, GSpacing nLineSpace, GDALRasterIOExtraArg *psExtraArg)
 {
     // Determine if we use warping resampling or overview resampling
-    bool bUseWarp = false;
-    if (GDALDataTypeIsComplex(eDataType))
-        bUseWarp = true;
+    const bool bUseWarp =
+        (GDALDataTypeIsComplex(eDataType) &&
+         psExtraArg->eResampleAlg != GRIORA_NearestNeighbour &&
+         psExtraArg->eResampleAlg != GRIORA_Mode);
 
     double dfXOff = nXOff;
     double dfYOff = nYOff;
@@ -1077,8 +1063,9 @@ CPLErr GDALRasterBand::RasterIOResampled(
     poMEMDS->SetBand(1, GDALRasterBand::FromHandle(hMEMBand));
 
     const char *pszNBITS = GetMetadataItem("NBITS", "IMAGE_STRUCTURE");
+    const int nNBITS = pszNBITS ? atoi(pszNBITS) : 0;
     if (pszNBITS)
-        reinterpret_cast<GDALRasterBand *>(hMEMBand)->SetMetadataItem(
+        GDALRasterBand::FromHandle(hMEMBand)->SetMetadataItem(
             "NBITS", pszNBITS, "IMAGE_STRUCTURE");
 
     CPLErr eErr = CE_None;
@@ -1417,22 +1404,38 @@ CPLErr GDALRasterBand::RasterIOResampled(
                     GDALDataType eDstBufferDataType = GDT_Unknown;
                     GDALRasterBand *poMEMBand =
                         GDALRasterBand::FromHandle(hMEMBand);
-                    eErr = pfnResampleFunc(
-                        dfXRatioDstToSrc, dfYRatioDstToSrc,
-                        dfXOff - nXOff, /* == 0 if bHasXOffVirtual */
-                        dfYOff - nYOff, /* == 0 if bHasYOffVirtual */
-                        eWrkDataType, pChunk,
-                        bNoDataMaskFullyOpaque ? nullptr : pabyChunkNoDataMask,
-                        nChunkXOffQueried - (bHasXOffVirtual ? 0 : nXOff),
-                        nChunkXSizeQueried,
-                        nChunkYOffQueried - (bHasYOffVirtual ? 0 : nYOff),
-                        nChunkYSizeQueried, nDstXOff + nDestXOffVirtual,
-                        nDstXOff + nDestXOffVirtual + nDstXCount,
-                        nDstYOff + nDestYOffVirtual,
-                        nDstYOff + nDestYOffVirtual + nDstYCount, poMEMBand,
-                        &pDstBuffer, &eDstBufferDataType, pszResampling,
-                        bHasNoData, dfNoDataValue, GetColorTable(), eDataType,
-                        bPropagateNoData);
+                    GDALOverviewResampleArgs args;
+                    args.eSrcDataType = eDataType;
+                    args.eOvrDataType = poMEMBand->GetRasterDataType();
+                    args.nOvrXSize = poMEMBand->GetXSize();
+                    args.nOvrYSize = poMEMBand->GetYSize();
+                    args.nOvrNBITS = nNBITS;
+                    args.dfXRatioDstToSrc = dfXRatioDstToSrc;
+                    args.dfYRatioDstToSrc = dfYRatioDstToSrc;
+                    args.dfSrcXDelta =
+                        dfXOff - nXOff; /* == 0 if bHasXOffVirtual */
+                    args.dfSrcYDelta =
+                        dfYOff - nYOff; /* == 0 if bHasYOffVirtual */
+                    args.eWrkDataType = eWrkDataType;
+                    args.pabyChunkNodataMask =
+                        bNoDataMaskFullyOpaque ? nullptr : pabyChunkNoDataMask;
+                    args.nChunkXOff =
+                        nChunkXOffQueried - (bHasXOffVirtual ? 0 : nXOff);
+                    args.nChunkXSize = nChunkXSizeQueried;
+                    args.nChunkYOff =
+                        nChunkYOffQueried - (bHasYOffVirtual ? 0 : nYOff);
+                    args.nChunkYSize = nChunkYSizeQueried;
+                    args.nDstXOff = nDstXOff + nDestXOffVirtual;
+                    args.nDstXOff2 = nDstXOff + nDestXOffVirtual + nDstXCount;
+                    args.nDstYOff = nDstYOff + nDestYOffVirtual;
+                    args.nDstYOff2 = nDstYOff + nDestYOffVirtual + nDstYCount;
+                    args.pszResampling = pszResampling;
+                    args.bHasNoData = bHasNoData;
+                    args.dfNoDataValue = dfNoDataValue;
+                    args.poColorTable = GetColorTable();
+                    args.bPropagateNoData = bPropagateNoData;
+                    eErr = pfnResampleFunc(args, pChunk, &pDstBuffer,
+                                           &eDstBufferDataType);
                     if (eErr == CE_None)
                     {
                         eErr = poMEMBand->RasterIO(
@@ -1534,6 +1537,7 @@ CPLErr GDALDataset::RasterIOResampled(
                            nDestYOffVirtual + nBufYSize, 0, eBufType, nullptr);
     GDALRasterBand **papoDstBands = static_cast<GDALRasterBand **>(
         CPLMalloc(nBandCount * sizeof(GDALRasterBand *)));
+    int nNBITS = 0;
     for (int i = 0; i < nBandCount; i++)
     {
         char szBuffer[32] = {'\0'};
@@ -1564,8 +1568,11 @@ CPLErr GDALDataset::RasterIOResampled(
         const char *pszNBITS =
             poSrcBand->GetMetadataItem("NBITS", "IMAGE_STRUCTURE");
         if (pszNBITS)
+        {
+            nNBITS = atoi(pszNBITS);
             poMEMDS->GetRasterBand(i + 1)->SetMetadataItem("NBITS", pszNBITS,
                                                            "IMAGE_STRUCTURE");
+        }
     }
 
     CPLErr eErr = CE_None;
@@ -1903,26 +1910,45 @@ CPLErr GDALDataset::RasterIOResampled(
                         GDALDataType eDstBufferDataType = GDT_Unknown;
                         GDALRasterBand *poMEMBand =
                             poMEMDS->GetRasterBand(i + 1);
-                        eErr = pfnResampleFunc(
-                            dfXRatioDstToSrc, dfYRatioDstToSrc,
-                            dfXOff - nXOff, /* == 0 if bHasXOffVirtual */
-                            dfYOff - nYOff, /* == 0 if bHasYOffVirtual */
-                            eWrkDataType,
-                            reinterpret_cast<GByte *>(pChunk) +
-                                i * nChunkBandOffset,
-                            bNoDataMaskFullyOpaque ? nullptr
-                                                   : pabyChunkNoDataMask,
-                            nChunkXOffQueried - (bHasXOffVirtual ? 0 : nXOff),
-                            nChunkXSizeQueried,
-                            nChunkYOffQueried - (bHasYOffVirtual ? 0 : nYOff),
-                            nChunkYSizeQueried, nDstXOff + nDestXOffVirtual,
-                            nDstXOff + nDestXOffVirtual + nDstXCount,
-                            nDstYOff + nDestYOffVirtual,
-                            nDstYOff + nDestYOffVirtual + nDstYCount, poMEMBand,
-                            &pDstBuffer, &eDstBufferDataType, pszResampling,
-                            false /*bHasNoData*/, 0.0 /* dfNoDataValue */,
-                            nullptr /* color table*/, eDataType,
-                            bPropagateNoData);
+                        GDALOverviewResampleArgs args;
+                        args.eSrcDataType = eDataType;
+                        args.eOvrDataType = poMEMBand->GetRasterDataType();
+                        args.nOvrXSize = poMEMBand->GetXSize();
+                        args.nOvrYSize = poMEMBand->GetYSize();
+                        args.nOvrNBITS = nNBITS;
+                        args.dfXRatioDstToSrc = dfXRatioDstToSrc;
+                        args.dfYRatioDstToSrc = dfYRatioDstToSrc;
+                        args.dfSrcXDelta =
+                            dfXOff - nXOff; /* == 0 if bHasXOffVirtual */
+                        args.dfSrcYDelta =
+                            dfYOff - nYOff; /* == 0 if bHasYOffVirtual */
+                        args.eWrkDataType = eWrkDataType;
+                        args.pabyChunkNodataMask = bNoDataMaskFullyOpaque
+                                                       ? nullptr
+                                                       : pabyChunkNoDataMask;
+                        args.nChunkXOff =
+                            nChunkXOffQueried - (bHasXOffVirtual ? 0 : nXOff);
+                        args.nChunkXSize = nChunkXSizeQueried;
+                        args.nChunkYOff =
+                            nChunkYOffQueried - (bHasYOffVirtual ? 0 : nYOff);
+                        args.nChunkYSize = nChunkYSizeQueried;
+                        args.nDstXOff = nDstXOff + nDestXOffVirtual;
+                        args.nDstXOff2 =
+                            nDstXOff + nDestXOffVirtual + nDstXCount;
+                        args.nDstYOff = nDstYOff + nDestYOffVirtual;
+                        args.nDstYOff2 =
+                            nDstYOff + nDestYOffVirtual + nDstYCount;
+                        args.pszResampling = pszResampling;
+                        args.bHasNoData = false;
+                        args.dfNoDataValue = 0.0;
+                        args.poColorTable = nullptr;
+                        args.bPropagateNoData = bPropagateNoData;
+
+                        eErr =
+                            pfnResampleFunc(args,
+                                            reinterpret_cast<GByte *>(pChunk) +
+                                                i * nChunkBandOffset,
+                                            &pDstBuffer, &eDstBufferDataType);
                         if (eErr == CE_None)
                         {
                             eErr = poMEMBand->RasterIO(
@@ -3614,19 +3640,14 @@ int GDALBandGetBestOverviewLevel2(GDALRasterBand *poBand, int &nXOff,
     const char *pszOversampligThreshold =
         CPLGetConfigOption("GDAL_OVERVIEW_OVERSAMPLING_THRESHOLD", nullptr);
 
+    // Note: keep this logic for overview selection in sync between
+    // gdalwarp_lib.cpp and rasterio.cpp
     // Cf https://github.com/OSGeo/gdal/pull/9040#issuecomment-1898524693
-    // Do not exactly use a oversampling threshold of 1.0 because of numerical
-    // instability.
-    const auto AdjustThreshold = [](double x)
-    {
-        constexpr double EPS = 1e-2;
-        return x == 1.0 ? x + EPS : x;
-    };
-    const double dfOversamplingThreshold = AdjustThreshold(
+    const double dfOversamplingThreshold =
         pszOversampligThreshold ? CPLAtof(pszOversampligThreshold)
         : psExtraArg && psExtraArg->eResampleAlg != GRIORA_NearestNeighbour
             ? 1.0
-            : 1.2);
+            : 1.2;
     for (int iOverview = 0; iOverview < nOverviewCount; iOverview++)
     {
         GDALRasterBand *poOverview = poBand->GetOverview(iOverview);
@@ -3644,8 +3665,11 @@ int GDALBandGetBestOverviewLevel2(GDALRasterBand *poBand, int &nXOff,
 
         // Is it nearly the requested factor and better (lower) than
         // the current best factor?
+        // Use an epsilon because of numerical instability.
+        constexpr double EPSILON = 1e-1;
         if (dfDownsamplingFactor >=
-                dfDesiredDownsamplingFactor * dfOversamplingThreshold ||
+                dfDesiredDownsamplingFactor * dfOversamplingThreshold +
+                    EPSILON ||
             dfDownsamplingFactor <= dfBestDownsamplingFactor)
         {
             continue;
@@ -3662,6 +3686,12 @@ int GDALBandGetBestOverviewLevel2(GDALRasterBand *poBand, int &nXOff,
         poBestOverview = poOverview;
         nBestOverviewLevel = iOverview;
         dfBestDownsamplingFactor = dfDownsamplingFactor;
+
+        if (std::abs(dfDesiredDownsamplingFactor - dfDownsamplingFactor) <
+            EPSILON)
+        {
+            break;
+        }
     }
 
     /* -------------------------------------------------------------------- */
@@ -4048,7 +4078,7 @@ CPLErr GDALDataset::BlockBasedRasterIO(
                 {
                     GDALRasterBand *poBand = GetRasterBand(panBandMap[iBand]);
 
-                    eErr = poBand->GDALRasterBand::IRasterIO(
+                    eErr = poBand->IRasterIO(
                         eRWFlag, nChunkXOff, nChunkYOff, nChunkXSize,
                         nChunkYSize,
                         pabyChunkData +
@@ -4824,6 +4854,7 @@ CPLErr CPL_STDCALL GDALDatasetCopyWholeRaster(GDALDatasetH hSrcDS,
                 int nStatus = GDAL_DATA_COVERAGE_STATUS_DATA;
                 if (bCheckHoles)
                 {
+                    nStatus = 0;
                     for (int iBand = 0; iBand < nBandCount; iBand++)
                     {
                         nStatus |= poSrcDS->GetRasterBand(iBand + 1)
diff --git a/gcore/rasterio_ssse3.cpp b/gcore/rasterio_ssse3.cpp
index ebe6f456753a..7b770f6030b5 100644
--- a/gcore/rasterio_ssse3.cpp
+++ b/gcore/rasterio_ssse3.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/gcore/rasterio_ssse3.h b/gcore/rasterio_ssse3.h
index 72fa8adf519c..57f5d556fd10 100644
--- a/gcore/rasterio_ssse3.h
+++ b/gcore/rasterio_ssse3.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef RASTERIO_SSSE3_H_INCLUDED
diff --git a/gcore/rawdataset.cpp b/gcore/rawdataset.cpp
index f4f4eff04ccf..79b68f29edc7 100644
--- a/gcore/rawdataset.cpp
+++ b/gcore/rawdataset.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2007-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/gcore/rawdataset.h b/gcore/rawdataset.h
index 3b50941a9d1c..5b5bfe84fe59 100644
--- a/gcore/rawdataset.h
+++ b/gcore/rawdataset.h
@@ -10,23 +10,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_FRMTS_RAW_RAWDATASET_H_INCLUDED
diff --git a/gcore/tilematrixset.cpp b/gcore/tilematrixset.cpp
index 64ccf1021a56..21cd649543e6 100644
--- a/gcore/tilematrixset.cpp
+++ b/gcore/tilematrixset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2020, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_json.h"
@@ -213,13 +197,46 @@ std::unique_ptr<TileMatrixSet> TileMatrixSet::parse(const char *fileOrDef)
         return nullptr;
     }
 
+    const auto GetCRS = [](const CPLJSONObject &j)
+    {
+        if (j.IsValid())
+        {
+            if (j.GetType() == CPLJSONObject::Type::String)
+                return j.ToString();
+
+            else if (j.GetType() == CPLJSONObject::Type::Object)
+            {
+                const std::string osURI = j.GetString("uri");
+                if (!osURI.empty())
+                    return osURI;
+
+                // Quite a bit of confusion around wkt.
+                // See https://github.com/opengeospatial/ogcapi-tiles/issues/170
+                const auto jWKT = j.GetObj("wkt");
+                if (jWKT.GetType() == CPLJSONObject::Type::String)
+                {
+                    const std::string osWKT = jWKT.ToString();
+                    if (!osWKT.empty())
+                        return osWKT;
+                }
+                else if (jWKT.GetType() == CPLJSONObject::Type::Object)
+                {
+                    const std::string osWKT = jWKT.ToString();
+                    if (!osWKT.empty())
+                        return osWKT;
+                }
+            }
+        }
+        return std::string();
+    };
+
     poTMS->mIdentifier = oRoot.GetString(bIsTMSv2 ? "id" : "identifier");
     poTMS->mTitle = oRoot.GetString("title");
     poTMS->mAbstract = oRoot.GetString(bIsTMSv2 ? "description" : "abstract");
     const auto oBbox = oRoot.GetObj("boundingBox");
     if (oBbox.IsValid())
     {
-        poTMS->mBbox.mCrs = oBbox.GetString("crs");
+        poTMS->mBbox.mCrs = GetCRS(oBbox.GetObj("crs"));
         const auto oLowerCorner = oBbox.GetArray("lowerCorner");
         if (oLowerCorner.IsValid() && oLowerCorner.Size() == 2)
         {
@@ -233,7 +250,7 @@ std::unique_ptr<TileMatrixSet> TileMatrixSet::parse(const char *fileOrDef)
             poTMS->mBbox.mUpperCornerY = oUpperCorner[1].ToDouble(NaN);
         }
     }
-    poTMS->mCrs = oRoot.GetString(bIsTMSv2 ? "crs" : "supportedCRS");
+    poTMS->mCrs = GetCRS(oRoot.GetObj(bIsTMSv2 ? "crs" : "supportedCRS"));
     poTMS->mWellKnownScaleSet = oRoot.GetString("wellKnownScaleSet");
 
     OGRSpatialReference oCrs;
diff --git a/gcore/tilematrixset.hpp b/gcore/tilematrixset.hpp
index 8751f8784a1f..431767885e46 100644
--- a/gcore/tilematrixset.hpp
+++ b/gcore/tilematrixset.hpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2020, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef TILEMATRIXSET_HPP_INCLUDED
@@ -65,7 +49,7 @@ class CPL_DLL TileMatrixSet
 
     struct CPL_DLL BoundingBox
     {
-        std::string mCrs{};
+        std::string mCrs{};  //! Can be a URL, a URI, a WKT or PROJJSON string.
         double mLowerCornerX{NaN};
         double mLowerCornerY{NaN};
         double mUpperCornerX{NaN};
@@ -77,6 +61,7 @@ class CPL_DLL TileMatrixSet
         return mBbox;
     }
 
+    //! Can be a URL, a URI, a WKT or PROJJSON string.
     const std::string &crs() const
     {
         return mCrs;
diff --git a/gdal.cmake b/gdal.cmake
index e390f8e41041..029eedda484d 100644
--- a/gdal.cmake
+++ b/gdal.cmake
@@ -6,8 +6,8 @@
 # a new member or virtual function in a public C++ class, etc.
 # This will typically happen for each GDAL feature release (change of X or Y in
 # a X.Y.Z numbering scheme), but should not happen for a bugfix release (change of Z)
-# Previous value: 35 for GDAL 3.9
-set(GDAL_SOVERSION 35)
+# Previous value: 36 for GDAL 3.10
+set(GDAL_SOVERSION 36)
 
 # Switches to control build targets(cached)
 option(ENABLE_GNM "Build GNM (Geography Network Model) component" ON)
@@ -44,199 +44,7 @@ option(CSHARP_MONO "Whether to force the C# compiler to be Mono" OFF)
 # this file is populated only be scripts/install_bash_completions.cmake.in
 install(CODE "file(REMOVE \"${PROJECT_BINARY_DIR}/install_manifest_extra.txt\")")
 
-# ######################################################################################################################
-# Detect available warning flags
-
-# Do that check now, since we need the result of HAVE_GCC_WARNING_ZERO_AS_NULL_POINTER_CONSTANT for cpl_config.h
-
-set(GDAL_C_WARNING_FLAGS)
-set(GDAL_CXX_WARNING_FLAGS)
-
-if (MSVC)
-  # 1. conditional expression is constant
-  # 2. 'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2'
-  # 3. non DLL-interface classkey 'identifier' used as base for DLL-interface classkey 'identifier'
-  # 4. ??????????
-  # 5. 'identifier' : unreferenced formal parameter
-  # 6. 'conversion' : conversion from 'type1' to 'type2', signed/unsigned mismatch
-  # 7. nonstandard extension used : translation unit is empty (only applies to C source code)
-  # 8. new behavior: elements of array 'array' will be default initialized (needed for
-  #    https://trac.osgeo.org/gdal/changeset/35593)
-  # 9. interaction between '_setjmp' and C++ object destruction is non-portable
-  #
-  set(GDAL_C_WARNING_FLAGS
-      /W4
-      /wd4127
-      /wd4251
-      /wd4275
-      /wd4786
-      /wd4100
-      /wd4245
-      /wd4206
-      /wd4351
-      /wd4611)
-  set(GDAL_CXX_WARNING_FLAGS ${GDAL_C_WARNING_FLAGS})
-  add_compile_options(/EHsc)
-
-  # The following are extra disables that can be applied to external source not under our control that we wish to use
-  # less stringent warnings with.
-  set(GDAL_SOFTWARNFLAGS
-      /wd4244
-      /wd4702
-      /wd4701
-      /wd4013
-      /wd4706
-      /wd4057
-      /wd4210
-      /wd4305)
-
-else ()
-
-  set(GDAL_SOFTWARNFLAGS "")
-
-  macro (detect_and_set_c_warning_flag flag_name)
-    string(TOUPPER ${flag_name} flag_name_upper)
-    string(REPLACE "-" "_" flag_name_upper "${flag_name_upper}")
-    string(REPLACE "=" "_" flag_name_upper "${flag_name_upper}")
-    check_c_compiler_flag(-W${flag_name} "HAVE_WFLAG_${flag_name_upper}")
-    if (HAVE_WFLAG_${flag_name_upper})
-      set(GDAL_C_WARNING_FLAGS ${GDAL_C_WARNING_FLAGS} -W${flag_name})
-    endif ()
-  endmacro ()
-
-  macro (detect_and_set_cxx_warning_flag flag_name)
-    string(TOUPPER ${flag_name} flag_name_upper)
-    string(REPLACE "-" "_" flag_name_upper "${flag_name_upper}")
-    string(REPLACE "=" "_" flag_name_upper "${flag_name_upper}")
-    check_cxx_compiler_flag(-W${flag_name} "HAVE_WFLAG_${flag_name_upper}")
-    if (HAVE_WFLAG_${flag_name_upper})
-      set(GDAL_CXX_WARNING_FLAGS ${GDAL_CXX_WARNING_FLAGS} -W${flag_name})
-    endif ()
-  endmacro ()
-
-  macro (detect_and_set_c_and_cxx_warning_flag flag_name)
-    string(TOUPPER ${flag_name} flag_name_upper)
-    string(REPLACE "-" "_" flag_name_upper "${flag_name_upper}")
-    string(REPLACE "=" "_" flag_name_upper "${flag_name_upper}")
-    check_c_compiler_flag(-W${flag_name} "HAVE_WFLAG_${flag_name_upper}")
-    if (HAVE_WFLAG_${flag_name_upper})
-      set(GDAL_C_WARNING_FLAGS ${GDAL_C_WARNING_FLAGS} -W${flag_name})
-      set(GDAL_CXX_WARNING_FLAGS ${GDAL_CXX_WARNING_FLAGS} -W${flag_name})
-    endif ()
-  endmacro ()
-
-  detect_and_set_c_and_cxx_warning_flag(all)
-  detect_and_set_c_and_cxx_warning_flag(extra)
-  detect_and_set_c_and_cxx_warning_flag(init-self)
-  detect_and_set_c_and_cxx_warning_flag(unused-parameter)
-  detect_and_set_c_warning_flag(missing-prototypes)
-  detect_and_set_c_and_cxx_warning_flag(missing-declarations)
-  detect_and_set_c_and_cxx_warning_flag(shorten-64-to-32)
-  detect_and_set_c_and_cxx_warning_flag(logical-op)
-  detect_and_set_c_and_cxx_warning_flag(shadow)
-  detect_and_set_cxx_warning_flag(shadow-field) # CLang only for now
-  detect_and_set_c_and_cxx_warning_flag(missing-include-dirs)
-  check_c_compiler_flag("-Wformat -Werror=format-security -Wno-format-nonliteral" HAVE_WFLAG_FORMAT_SECURITY)
-  if (HAVE_WFLAG_FORMAT_SECURITY)
-    set(GDAL_C_WARNING_FLAGS ${GDAL_C_WARNING_FLAGS} -Wformat -Werror=format-security -Wno-format-nonliteral)
-    set(GDAL_CXX_WARNING_FLAGS ${GDAL_CXX_WARNING_FLAGS} -Wformat -Werror=format-security -Wno-format-nonliteral)
-  else ()
-    detect_and_set_c_and_cxx_warning_flag(format)
-  endif ()
-  detect_and_set_c_and_cxx_warning_flag(error=vla)
-  detect_and_set_c_and_cxx_warning_flag(no-clobbered)
-  detect_and_set_c_and_cxx_warning_flag(date-time)
-  detect_and_set_c_and_cxx_warning_flag(null-dereference)
-  detect_and_set_c_and_cxx_warning_flag(duplicate-cond)
-  detect_and_set_cxx_warning_flag(extra-semi)
-  detect_and_set_c_and_cxx_warning_flag(comma)
-  detect_and_set_c_and_cxx_warning_flag(float-conversion)
-  check_c_compiler_flag("-Wdocumentation -Wno-documentation-deprecated-sync" HAVE_WFLAG_DOCUMENTATION_AND_NO_DEPRECATED)
-  if (HAVE_WFLAG_DOCUMENTATION_AND_NO_DEPRECATED)
-    set(GDAL_C_WARNING_FLAGS ${GDAL_C_WARNING_FLAGS} -Wdocumentation -Wno-documentation-deprecated-sync)
-    set(GDAL_CXX_WARNING_FLAGS ${GDAL_CXX_WARNING_FLAGS} -Wdocumentation -Wno-documentation-deprecated-sync)
-  endif ()
-  detect_and_set_cxx_warning_flag(unused-private-field)
-  detect_and_set_cxx_warning_flag(non-virtual-dtor)
-  detect_and_set_cxx_warning_flag(overloaded-virtual)
-  detect_and_set_cxx_warning_flag(suggest-override)
-
-  check_cxx_compiler_flag(-fno-operator-names HAVE_FLAG_NO_OPERATOR_NAMES)
-  if (HAVE_FLAG_NO_OPERATOR_NAMES)
-    set(GDAL_CXX_WARNING_FLAGS ${GDAL_CXX_WARNING_FLAGS} -fno-operator-names)
-  endif ()
-
-  check_cxx_compiler_flag(-Wzero-as-null-pointer-constant HAVE_GCC_WARNING_ZERO_AS_NULL_POINTER_CONSTANT)
-  if (HAVE_GCC_WARNING_ZERO_AS_NULL_POINTER_CONSTANT)
-    set(GDAL_CXX_WARNING_FLAGS ${GDAL_CXX_WARNING_FLAGS} -Wzero-as-null-pointer-constant)
-  endif ()
-
-  # Detect -Wold-style-cast but do not add it by default, as not all targets support it
-  check_cxx_compiler_flag(-Wold-style-cast HAVE_WFLAG_OLD_STYLE_CAST)
-  if (HAVE_WFLAG_OLD_STYLE_CAST)
-    set(WFLAG_OLD_STYLE_CAST -Wold-style-cast)
-  endif ()
-
-  # Detect Weffc++ but do not add it by default, as not all targets support it
-  check_cxx_compiler_flag(-Weffc++ HAVE_WFLAG_EFFCXX)
-  if (HAVE_WFLAG_EFFCXX)
-    set(WFLAG_EFFCXX -Weffc++)
-  endif ()
-
-  if (CMAKE_BUILD_TYPE MATCHES Debug)
-    check_c_compiler_flag(-ftrapv HAVE_FTRAPV)
-    if (HAVE_FTRAPV)
-      set(GDAL_C_WARNING_FLAGS ${GDAL_C_WARNING_FLAGS} -ftrapv)
-      set(GDAL_CXX_WARNING_FLAGS ${GDAL_CXX_WARNING_FLAGS} -ftrapv)
-    endif ()
-  endif ()
-
-endif ()
-
-add_compile_definitions($<$<CONFIG:DEBUG>:DEBUG>)
-
-# message(STATUS "GDAL_C_WARNING_FLAGS: ${GDAL_C_WARNING_FLAGS}") message(STATUS "GDAL_CXX_WARNING_FLAGS: ${GDAL_CXX_WARNING_FLAGS}")
-
-if (CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-  check_cxx_compiler_flag(-fno-finite-math-only HAVE_FLAG_NO_FINITE_MATH_ONLY)
-  if (HAVE_FLAG_NO_FINITE_MATH_ONLY)
-    # Intel CXX compiler based on clang defaults to -ffinite-math-only, which breaks std::isinf(), std::isnan(), etc.
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-finite-math-only")
-  endif ()
-
-  set(TEST_LINK_STDCPP_SOURCE_CODE
-      "#include <string>
-    int main(){
-      std::string s;
-      s += \"x\";
-      return 0;
-    }")
-  check_cxx_source_compiles("${TEST_LINK_STDCPP_SOURCE_CODE}" _TEST_LINK_STDCPP)
-  if( NOT _TEST_LINK_STDCPP )
-      message(WARNING "Cannot link code using standard C++ library. Automatically adding -lstdc++ to CMAKE_EXE_LINKER_FLAGS, CMAKE_SHARED_LINKER_FLAGS and CMAKE_MODULE_LINKER_FLAGS")
-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lstdc++")
-      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -lstdc++")
-      set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -lstdc++")
-
-      check_cxx_source_compiles("${TEST_LINK_STDCPP_SOURCE_CODE}" _TEST_LINK_STDCPP_AGAIN)
-      if( NOT _TEST_LINK_STDCPP_AGAIN )
-          message(FATAL_ERROR "Cannot link C++ program")
-      endif()
-  endif()
-
-  check_c_compiler_flag(-wd188 HAVE_WD188) # enumerated type mixed with another type
-  if( HAVE_WD188 )
-    set(GDAL_C_WARNING_FLAGS ${GDAL_C_WARNING_FLAGS} -wd188)
-  endif()
-  check_c_compiler_flag(-wd2259 HAVE_WD2259) # non-pointer conversion from ... may lose significant bits
-  if( HAVE_WD2259 )
-    set(GDAL_C_WARNING_FLAGS ${GDAL_C_WARNING_FLAGS} -wd2259)
-  endif()
-  check_c_compiler_flag(-wd2312 HAVE_WD2312) # pointer cast involving 64-bit pointed-to type
-  if( HAVE_WD2259 )
-    set(GDAL_C_WARNING_FLAGS ${GDAL_C_WARNING_FLAGS} -wd2312)
-  endif()
-endif ()
+include(GdalCompilationFlags)
 
 # ######################################################################################################################
 # generate ${CMAKE_CURRENT_BINARY_DIR}/port/cpl_config.h
@@ -325,9 +133,6 @@ if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" ST
       CACHE INTERNAL "Previous value of USE_ALTERNATE_LINKER")
 endif()
 
-# Default definitions during build
-add_definitions(-DGDAL_COMPILATION)
-
 if (ENABLE_IPO)
     include(CheckIPOSupported)
     check_ipo_supported(RESULT result)
@@ -384,20 +189,6 @@ if (MINGW AND BUILD_SHARED_LIBS)
     set_target_properties(${GDAL_LIB_TARGET_NAME} PROPERTIES SUFFIX "-${GDAL_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
 endif ()
 
-if (MINGW)
-  if (TARGET_CPU MATCHES "x86_64")
-    add_definitions(-m64)
-  endif ()
-  # Workaround for export too large error - force problematic large file to be optimized to prevent string table
-  # overflow error Used -Os instead of -O2 as previous issues had mentioned, since -Os is roughly speaking -O2,
-  # excluding any optimizations that take up extra space. Given that the issue is a string table overflowing, -Os seemed
-  # appropriate. Solves issue of https://github.com/OSGeo/gdal/issues/4706 with for example x86_64-w64-mingw32-gcc-posix
-  # (GCC) 9.3-posix 20200320
-  if (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE STREQUAL "")
-    add_compile_options(-Os)
-  endif ()
-endif ()
-
 # Install properties
 if (GDAL_ENABLE_MACOSX_FRAMEWORK)
   set(FRAMEWORK_VERSION ${GDAL_VERSION_MAJOR}.${GDAL_VERSION_MINOR})
@@ -523,6 +314,16 @@ if (GDAL_USE_SHAPELIB_INTERNAL)
   mark_as_advanced(RENAME_INTERNAL_SHAPELIB_SYMBOLS)
 endif ()
 
+# Must be set before including ogr
+option(OGR_ENABLE_DRIVER_TAB
+       "Set ON to build MapInfo TAB and MIF/MID driver (required by Northwoord driver, and Shapefile attribute indexing)"
+       ${OGR_BUILD_OPTIONAL_DRIVERS})
+if(OGR_ENABLE_DRIVER_TAB AND
+   NOT DEFINED OGR_ENABLE_DRIVER_TAB_PLUGIN AND
+   GDAL_ENABLE_PLUGINS_NO_DEPS)
+    option(OGR_ENABLE_DRIVER_TAB_PLUGIN "Set ON to build OGR MapInfo TAB and MIF/MID driver as plugin" ON)
+endif()
+
 # Core components
 add_subdirectory(alg)
 add_subdirectory(ogr)
diff --git a/gnm/gnmgraph.cpp b/gnm/gnmgraph.cpp
index e96371ade466..9f77e2918f44 100644
--- a/gnm/gnmgraph.cpp
+++ b/gnm/gnmgraph.cpp
@@ -571,7 +571,6 @@ void GNMGraph::TraceTargets(std::queue<GNMGFID> &vertexQueue,
                             std::set<GNMGFID> &markedVertIds,
                             GNMPATH &connectedIds)
 {
-    GNMCONSTVECTOR::const_iterator it;
     std::queue<GNMGFID> neighbours_queue;
 
     // See all given vertices except thouse that have been already seen.
@@ -591,11 +590,8 @@ void GNMGraph::TraceTargets(std::queue<GNMGFID> &vertexQueue,
             LPGNMCONSTVECTOR panOutcomeEdgeIDs = GetOutEdges(nCurVertID);
             if (nullptr != panOutcomeEdgeIDs)
             {
-                for (it = panOutcomeEdgeIDs->begin();
-                     it != panOutcomeEdgeIDs->end(); ++it)
+                for (const GNMGFID nCurEdgeID : *panOutcomeEdgeIDs)
                 {
-                    GNMGFID nCurEdgeID = *it;
-
                     // ISSUE: think about to return a sequence of vertices and
                     // edges (which is more universal), as now we are going to
                     // return only sequence of edges.
diff --git a/ogr/CMakeLists.txt b/ogr/CMakeLists.txt
index 258564dfc9d7..ce665225dfd6 100644
--- a/ogr/CMakeLists.txt
+++ b/ogr/CMakeLists.txt
@@ -61,7 +61,16 @@ add_library(
   ogr_xerces.cpp
   ogr_geo_utils.cpp
   ogr_proj_p.cpp
-  ogr_wkb.cpp)
+  ogr_wkb.cpp
+  ogrvrtgeometrytypes.cpp
+  ogr2kmlgeometry.cpp
+  ogrlibjsonutils.cpp
+  ogrgeojsongeometry.cpp
+  ogrgeojsonwriter.cpp
+  ogresrijsongeometry.cpp
+  ogrmitabspatialref.cpp
+  mitab_bounds.cpp
+)
 add_dependencies(ogr generate_gdal_version_h)
 
 set(GDAL_DATA_FILES
@@ -84,7 +93,7 @@ set_property(
 include(GdalStandardIncludes)
 gdal_standard_includes(ogr)
 target_compile_options(ogr PRIVATE ${GDAL_CXX_WARNING_FLAGS} ${WFLAG_OLD_STYLE_CAST} ${WFLAG_EFFCXX})
-target_include_directories(ogr PRIVATE $<TARGET_PROPERTY:ogr_geojson,SOURCE_DIR> $<TARGET_PROPERTY:ogr_MEM,SOURCE_DIR>)
+target_include_directories(ogr PRIVATE $<TARGET_PROPERTY:ogr_MEM,SOURCE_DIR>)
 set_property(TARGET ogr PROPERTY POSITION_INDEPENDENT_CODE ${GDAL_OBJECT_LIBRARIES_POSITION_INDEPENDENT_CODE})
 target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:ogr>)
 
@@ -96,8 +105,6 @@ if (GDAL_USE_JSONC_INTERNAL)
   gdal_add_vendored_lib(ogr libjson)
 endif ()
 
-target_compile_definitions(ogr PRIVATE HAVE_MITAB)
-
 gdal_target_link_libraries(ogr PRIVATE PROJ::proj)
 
 # External libs then
@@ -180,7 +187,7 @@ add_custom_target(check_swq_parser_md5 ALL
                   COMMAND ${CMAKE_COMMAND}
                       "-DIN_FILE=swq_parser.y"
                       "-DTARGET=generate_swq_parser"
-                      "-DEXPECTED_MD5SUM=f7faffefe55128fc8951556909523ef7"
+                      "-DEXPECTED_MD5SUM=47b674ecca1fc71a50bc81d7d0bfa29d   "
                       "-DFILENAME_CMAKE=${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt"
                       -P "${PROJECT_SOURCE_DIR}/cmake/helpers/check_md5sum.cmake"
                   WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
diff --git a/ogr/generate_encoding_table.c b/ogr/generate_encoding_table.c
index 44098ef7b199..4817ace3cc7e 100644
--- a/ogr/generate_encoding_table.c
+++ b/ogr/generate_encoding_table.c
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <errno.h>
diff --git a/ogr/gml2ogrgeometry.cpp b/ogr/gml2ogrgeometry.cpp
index 1b5714777939..8568faee2d23 100644
--- a/ogr/gml2ogrgeometry.cpp
+++ b/ogr/gml2ogrgeometry.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2002, Frank Warmerdam
  * Copyright (c) 2009-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************
  *
  * Independent Security Audit 2003/04/17 Andrey Kiselev:
@@ -851,6 +835,20 @@ static double GetDistanceInMetre(double dfDistance, const char *pszUnits)
     return -1;
 }
 
+/************************************************************************/
+/*                            GetSemiMajor()                            */
+/************************************************************************/
+
+static double GetSemiMajor(const OGRSpatialReference *poSRS)
+{
+    double dfSemiMajor = poSRS->GetSemiMajor();
+    // Standardize on OGR_GREATCIRCLE_DEFAULT_RADIUS for Earth ellipsoids.
+    if (std::fabs(dfSemiMajor - OGR_GREATCIRCLE_DEFAULT_RADIUS) <
+        0.05 * OGR_GREATCIRCLE_DEFAULT_RADIUS)
+        dfSemiMajor = OGR_GREATCIRCLE_DEFAULT_RADIUS;
+    return dfSemiMajor;
+}
+
 /************************************************************************/
 /*                      GML2OGRGeometry_XMLNode()                       */
 /*                                                                      */
@@ -1155,7 +1153,8 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
     const auto storeArcByCenterPointParameters =
         [](const CPLXMLNode *psChild, const char *l_pszSRSName,
            bool &bIsApproximateArc, double &dfLastCurveApproximateArcRadius,
-           bool &bLastCurveWasApproximateArcInvertedAxisOrder)
+           bool &bLastCurveWasApproximateArcInvertedAxisOrder,
+           double &dfSemiMajor)
     {
         const CPLXMLNode *psRadius = FindBareXMLChild(psChild, "radius");
         if (psRadius && psRadius->eType == CXT_Element)
@@ -1173,6 +1172,7 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
                     {
                         bInvertedAxisOrder =
                             CPL_TO_BOOL(oSRS.EPSGTreatsAsLatLong());
+                        dfSemiMajor = GetSemiMajor(&oSRS);
                         bSRSUnitIsDegree =
                             fabs(oSRS.GetAngularUnits(nullptr) -
                                  CPLAtof(SRS_UA_DEGREE_CONV)) < 1e-8;
@@ -1194,7 +1194,8 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
         [](OGRGeometry *poGeom, OGRCompoundCurve *poCC,
            const bool bIsApproximateArc, const bool bLastCurveWasApproximateArc,
            const double dfLastCurveApproximateArcRadius,
-           const bool bLastCurveWasApproximateArcInvertedAxisOrder)
+           const bool bLastCurveWasApproximateArcInvertedAxisOrder,
+           const double dfSemiMajor)
     {
         if (bIsApproximateArc)
         {
@@ -1213,10 +1214,12 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
                     double dfDistance = 0.0;
                     if (bLastCurveWasApproximateArcInvertedAxisOrder)
                         dfDistance = OGR_GreatCircle_Distance(
-                            p.getX(), p.getY(), p2.getX(), p2.getY());
+                            p.getX(), p.getY(), p2.getX(), p2.getY(),
+                            dfSemiMajor);
                     else
                         dfDistance = OGR_GreatCircle_Distance(
-                            p.getY(), p.getX(), p2.getY(), p2.getX());
+                            p.getY(), p.getX(), p2.getY(), p2.getX(),
+                            dfSemiMajor);
                     // CPLDebug("OGR", "%f %f",
                     //          dfDistance,
                     //          dfLastCurveApproximateArcRadius
@@ -1249,10 +1252,12 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
                     double dfDistance = 0.0;
                     if (bLastCurveWasApproximateArcInvertedAxisOrder)
                         dfDistance = OGR_GreatCircle_Distance(
-                            p.getX(), p.getY(), p2.getX(), p2.getY());
+                            p.getX(), p.getY(), p2.getX(), p2.getY(),
+                            dfSemiMajor);
                     else
                         dfDistance = OGR_GreatCircle_Distance(
-                            p.getY(), p.getX(), p2.getY(), p2.getX());
+                            p.getY(), p.getX(), p2.getY(), p2.getX(),
+                            dfSemiMajor);
                     // CPLDebug(
                     //    "OGR", "%f %f",
                     //    dfDistance,
@@ -1290,6 +1295,8 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
         double dfFirstChildApproximateArcRadius = 0.0;
         bool bFirstChildWasApproximateArcInvertedAxisOrder = false;
 
+        double dfSemiMajor = OGR_GREATCIRCLE_DEFAULT_RADIUS;
+
         for (const CPLXMLNode *psChild = psNode->psChild; psChild != nullptr;
              psChild = psChild->psNext)
         {
@@ -1352,7 +1359,8 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
                     storeArcByCenterPointParameters(
                         psChild3, pszSRSName, bIsApproximateArc,
                         dfLastCurveApproximateArcRadius,
-                        bLastCurveWasApproximateArcInvertedAxisOrder);
+                        bLastCurveWasApproximateArcInvertedAxisOrder,
+                        dfSemiMajor);
                     if (bIsFirstChild && bIsApproximateArc)
                     {
                         bFirstChildIsApproximateArc = true;
@@ -1390,7 +1398,8 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
                         poGeom.get(), poCC.get(), bIsApproximateArc,
                         bLastCurveWasApproximateArc,
                         dfLastCurveApproximateArcRadius,
-                        bLastCurveWasApproximateArcInvertedAxisOrder);
+                        bLastCurveWasApproximateArcInvertedAxisOrder,
+                        dfSemiMajor);
 
                     auto poCurve =
                         std::unique_ptr<OGRCurve>(poGeom.release()->toCurve());
@@ -1448,7 +1457,8 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
                                     psChild2, pszSRSName,
                                     bLastChildIsApproximateArc,
                                     dfLastCurveApproximateArcRadius,
-                                    bLastCurveWasApproximateArcInvertedAxisOrder);
+                                    bLastCurveWasApproximateArcInvertedAxisOrder,
+                                    dfSemiMajor);
                             }
                             else
                             {
@@ -1486,11 +1496,11 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
                 poLS->EndPoint(&p2);
                 double dfDistance = 0.0;
                 if (bFirstChildWasApproximateArcInvertedAxisOrder)
-                    dfDistance = OGR_GreatCircle_Distance(p.getX(), p.getY(),
-                                                          p2.getX(), p2.getY());
+                    dfDistance = OGR_GreatCircle_Distance(
+                        p.getX(), p.getY(), p2.getX(), p2.getY(), dfSemiMajor);
                 else
-                    dfDistance = OGR_GreatCircle_Distance(p.getY(), p.getX(),
-                                                          p2.getY(), p2.getX());
+                    dfDistance = OGR_GreatCircle_Distance(
+                        p.getY(), p.getX(), p2.getY(), p2.getX(), dfSemiMajor);
                 if (dfDistance < dfFirstChildApproximateArcRadius / 5.0)
                 {
                     CPLDebug("OGR", "Moving approximate start of "
@@ -1511,11 +1521,11 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
                 poLS->EndPoint(&p2);
                 double dfDistance = 0.0;
                 if (bLastCurveWasApproximateArcInvertedAxisOrder)
-                    dfDistance = OGR_GreatCircle_Distance(p.getX(), p.getY(),
-                                                          p2.getX(), p2.getY());
+                    dfDistance = OGR_GreatCircle_Distance(
+                        p.getX(), p.getY(), p2.getX(), p2.getY(), dfSemiMajor);
                 else
-                    dfDistance = OGR_GreatCircle_Distance(p.getY(), p.getX(),
-                                                          p2.getY(), p2.getX());
+                    dfDistance = OGR_GreatCircle_Distance(
+                        p.getY(), p.getX(), p2.getY(), p2.getX(), dfSemiMajor);
                 if (dfDistance < dfLastCurveApproximateArcRadius / 5.0)
                 {
                     CPLDebug("OGR", "Moving approximate end of "
@@ -1778,6 +1788,7 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
 
         bool bSRSUnitIsDegree = false;
         bool bInvertedAxisOrder = false;
+        double dfSemiMajor = OGR_GREATCIRCLE_DEFAULT_RADIUS;
         if (pszSRSName != nullptr)
         {
             OGRSpatialReference oSRS;
@@ -1785,6 +1796,7 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
             {
                 if (oSRS.IsGeographic())
                 {
+                    dfSemiMajor = GetSemiMajor(&oSRS);
                     bInvertedAxisOrder =
                         CPL_TO_BOOL(oSRS.EPSGTreatsAsLatLong());
                     bSRSUnitIsDegree = fabs(oSRS.GetAngularUnits(nullptr) -
@@ -1792,6 +1804,7 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
                 }
                 else if (oSRS.IsProjected())
                 {
+                    dfSemiMajor = GetSemiMajor(&oSRS);
                     bInvertedAxisOrder =
                         CPL_TO_BOOL(oSRS.EPSGTreatsAsNorthingEasting());
                 }
@@ -1822,15 +1835,15 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
                         dfCenterX, dfCenterY, dfDistance,
                         // See
                         // https://ext.eurocontrol.int/aixm_confluence/display/ACG/ArcByCenterPoint+Interpretation+Summary
-                        dfAngle, &dfLat, &dfLong);
+                        dfAngle, dfSemiMajor, &dfLat, &dfLong);
                     p.setX(dfLat);  // yes, external code will do the swap later
                     p.setY(dfLong);
                 }
                 else
                 {
-                    OGR_GreatCircle_ExtendPosition(dfCenterY, dfCenterX,
-                                                   dfDistance, 90 - dfAngle,
-                                                   &dfLat, &dfLong);
+                    OGR_GreatCircle_ExtendPosition(
+                        dfCenterY, dfCenterX, dfDistance, 90 - dfAngle,
+                        dfSemiMajor, &dfLat, &dfLong);
                     p.setX(dfLong);
                     p.setY(dfLat);
                 }
@@ -1842,15 +1855,16 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
             if (bInvertedAxisOrder)
             {
                 OGR_GreatCircle_ExtendPosition(dfCenterX, dfCenterY, dfDistance,
-                                               dfEndAngle, &dfLat, &dfLong);
+                                               dfEndAngle, dfSemiMajor, &dfLat,
+                                               &dfLong);
                 p.setX(dfLat);  // yes, external code will do the swap later
                 p.setY(dfLong);
             }
             else
             {
                 OGR_GreatCircle_ExtendPosition(dfCenterY, dfCenterX, dfDistance,
-                                               90 - dfEndAngle, &dfLat,
-                                               &dfLong);
+                                               90 - dfEndAngle, dfSemiMajor,
+                                               &dfLat, &dfLong);
                 p.setX(dfLong);
                 p.setY(dfLat);
             }
@@ -1902,6 +1916,7 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
 
         bool bSRSUnitIsDegree = false;
         bool bInvertedAxisOrder = false;
+        double dfSemiMajor = OGR_GREATCIRCLE_DEFAULT_RADIUS;
         if (pszSRSName != nullptr)
         {
             OGRSpatialReference oSRS;
@@ -1909,6 +1924,7 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
             {
                 if (oSRS.IsGeographic())
                 {
+                    dfSemiMajor = GetSemiMajor(&oSRS);
                     bInvertedAxisOrder =
                         CPL_TO_BOOL(oSRS.EPSGTreatsAsLatLong());
                     bSRSUnitIsDegree = fabs(oSRS.GetAngularUnits(nullptr) -
@@ -1916,6 +1932,7 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
                 }
                 else if (oSRS.IsProjected())
                 {
+                    dfSemiMajor = GetSemiMajor(&oSRS);
                     bInvertedAxisOrder =
                         CPL_TO_BOOL(oSRS.EPSGTreatsAsNorthingEasting());
                 }
@@ -1938,17 +1955,17 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
                 double dfLat = 0.0;
                 if (bInvertedAxisOrder)
                 {
-                    OGR_GreatCircle_ExtendPosition(dfCenterX, dfCenterY,
-                                                   dfDistance, dfAngle, &dfLat,
-                                                   &dfLong);
+                    OGR_GreatCircle_ExtendPosition(
+                        dfCenterX, dfCenterY, dfDistance, dfAngle, dfSemiMajor,
+                        &dfLat, &dfLong);
                     p.setX(dfLat);  // yes, external code will do the swap later
                     p.setY(dfLong);
                 }
                 else
                 {
-                    OGR_GreatCircle_ExtendPosition(dfCenterY, dfCenterX,
-                                                   dfDistance, dfAngle, &dfLat,
-                                                   &dfLong);
+                    OGR_GreatCircle_ExtendPosition(
+                        dfCenterY, dfCenterX, dfDistance, dfAngle, dfSemiMajor,
+                        &dfLat, &dfLong);
                     p.setX(dfLong);
                     p.setY(dfLat);
                 }
@@ -2547,6 +2564,7 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
         bool bLastCurveWasApproximateArc = false;
         bool bLastCurveWasApproximateArcInvertedAxisOrder = false;
         double dfLastCurveApproximateArcRadius = 0.0;
+        double dfSemiMajor = OGR_GREATCIRCLE_DEFAULT_RADIUS;
 
         for (const CPLXMLNode *psChild = psNode->psChild; psChild != nullptr;
              psChild = psChild->psNext)
@@ -2583,7 +2601,8 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
                     storeArcByCenterPointParameters(
                         psChild, pszSRSName, bIsApproximateArc,
                         dfLastCurveApproximateArcRadius,
-                        bLastCurveWasApproximateArcInvertedAxisOrder);
+                        bLastCurveWasApproximateArcInvertedAxisOrder,
+                        dfSemiMajor);
                 }
 
                 if (wkbFlatten(poGeom->getGeometryType()) != wkbLineString)
@@ -2609,7 +2628,8 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
                         poGeom.get(), poCC.get(), bIsApproximateArc,
                         bLastCurveWasApproximateArc,
                         dfLastCurveApproximateArcRadius,
-                        bLastCurveWasApproximateArcInvertedAxisOrder);
+                        bLastCurveWasApproximateArcInvertedAxisOrder,
+                        dfSemiMajor);
 
                     auto poAsCurve =
                         std::unique_ptr<OGRCurve>(poGeom.release()->toCurve());
@@ -2898,19 +2918,7 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
         // correct orientation of the line string
         if (bEdgeOrientation != bOrientation)
         {
-            int iStartCoord = 0;
-            int iEndCoord = poLineString->getNumPoints() - 1;
-            OGRPoint oTempStartPoint;
-            OGRPoint oTempEndPoint;
-            while (iStartCoord < iEndCoord)
-            {
-                poLineString->getPoint(iStartCoord, &oTempStartPoint);
-                poLineString->getPoint(iEndCoord, &oTempEndPoint);
-                poLineString->setPoint(iStartCoord, &oTempEndPoint);
-                poLineString->setPoint(iEndCoord, &oTempStartPoint);
-                iStartCoord++;
-                iEndCoord--;
-            }
+            poLineString->reversePoints();
         }
         return poLineString;
     }
@@ -3642,6 +3650,38 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
         return poGeom;
     }
 
+    /* -------------------------------------------------------------------- */
+    /*      OrientableCurve                                                 */
+    /* -------------------------------------------------------------------- */
+    if (EQUAL(pszBaseGeometry, "OrientableCurve"))
+    {
+        // Find baseCurve.
+        const CPLXMLNode *psChild = FindBareXMLChild(psNode, "baseCurve");
+
+        psChild = GetChildElement(psChild);
+        if (psChild == nullptr)
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                     "Missing <baseCurve> for OrientableCurve.");
+            return nullptr;
+        }
+
+        auto poGeom = GML2OGRGeometry_XMLNode_Internal(
+            psChild, nPseudoBoolGetSecondaryGeometryOption, nRecLevel + 1,
+            nSRSDimension, pszSRSName);
+        if (!poGeom || !OGR_GT_IsCurve(poGeom->getGeometryType()))
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                     "baseCurve of OrientableCurve is not a curve.");
+            return nullptr;
+        }
+        if (!GetElementOrientation(psNode))
+        {
+            poGeom->toCurve()->reversePoints();
+        }
+        return poGeom;
+    }
+
     /* -------------------------------------------------------------------- */
     /*      OrientableSurface                                               */
     /* -------------------------------------------------------------------- */
diff --git a/ogr/ogrsf_frmts/mitab/mitab_bounds.cpp b/ogr/mitab_bounds.cpp
similarity index 99%
rename from ogr/ogrsf_frmts/mitab/mitab_bounds.cpp
rename to ogr/mitab_bounds.cpp
index 5101f04fc6da..e7f7cdbe8462 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_bounds.cpp
+++ b/ogr/mitab_bounds.cpp
@@ -9,28 +9,11 @@
  **********************************************************************
  * Copyright (c) 2001, Daniel Morissette
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "cpl_port.h"
-#include "mitab.h"
-#include "mitab_priv.h"
+#include "ogrmitabspatialref.h"
 
 #include <cmath>
 #include <cstring>
@@ -20553,13 +20536,3 @@ void MITABFreeCoordSysTable()
     gpasExtBoundsList = nullptr;
     nExtBoundsListCount = -1;
 }
-
-/**********************************************************************
- *                     MITABCoordSysTableLoaded()
- *
- * Returns TRUE if a coordsys table was loaded, FALSE otherwise.
- **********************************************************************/
-bool MITABCoordSysTableLoaded()
-{
-    return nExtBoundsListCount >= 0;
-}
diff --git a/ogr/ogr2gmlgeometry.cpp b/ogr/ogr2gmlgeometry.cpp
index adf90a9999a5..97a6e75d3089 100644
--- a/ogr/ogr2gmlgeometry.cpp
+++ b/ogr/ogr2gmlgeometry.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************
  *
  * Independent Security Audit 2003/04/17 Andrey Kiselev:
diff --git a/ogr/ogrsf_frmts/kml/ogr2kmlgeometry.cpp b/ogr/ogr2kmlgeometry.cpp
similarity index 94%
rename from ogr/ogrsf_frmts/kml/ogr2kmlgeometry.cpp
rename to ogr/ogr2kmlgeometry.cpp
index cdf44f9a97bb..71b7f9debf6a 100644
--- a/ogr/ogrsf_frmts/kml/ogr2kmlgeometry.cpp
+++ b/ogr/ogr2kmlgeometry.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2006, Christopher Condit
  * Copyright (c) 2007-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -34,6 +18,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <algorithm>
+#include <cmath>
 
 #include "cpl_conv.h"
 #include "cpl_error.h"
@@ -42,8 +27,6 @@
 #include "ogr_geometry.h"
 #include "ogr_p.h"
 
-constexpr double EPSILON = 1e-8;
-
 /************************************************************************/
 /*                        MakeKMLCoordinate()                           */
 /************************************************************************/
@@ -52,6 +35,8 @@ static void MakeKMLCoordinate(char *pszTarget, size_t nTargetLen, double x,
                               double y, double z, bool b3D)
 
 {
+    constexpr double EPSILON = 1e-8;
+
     if (y < -90 || y > 90)
     {
         if (y > 90 && y < 90 + EPSILON)
@@ -100,7 +85,7 @@ static void MakeKMLCoordinate(char *pszTarget, size_t nTargetLen, double x,
             }
 
             // Trash drastically non-sensical values.
-            if (x > 1.0e6 || x < -1.0e6 || CPLIsNan(x))
+            if (x > 1.0e6 || x < -1.0e6 || std::isnan(x))
             {
                 static bool bFirstWarning2 = true;
                 if (bFirstWarning2)
diff --git a/ogr/ogr_api.cpp b/ogr/ogr_api.cpp
index 4b74fa2094ba..2150660c779e 100644
--- a/ogr/ogr_api.cpp
+++ b/ogr/ogr_api.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2002, Frank Warmerdam
  * Copyright (c) 2009-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -1604,6 +1588,8 @@ OGRErr OGR_G_RemoveGeometry(OGRGeometryH hGeom, int iGeom, int bDelete)
  * \brief Compute length of a geometry.
  *
  * Computes the length for OGRCurve or MultiCurve objects.
+ * For surfaces, compute the sum of the lengths of their exterior
+ * and interior rings (since 3.10).
  * Undefined for all other geometry types (returns zero).
  *
  * This function utilizes the C++ get_Length() method.
@@ -1612,6 +1598,9 @@ OGRErr OGR_G_RemoveGeometry(OGRGeometryH hGeom, int iGeom, int bDelete)
  * @return the length or 0.0 for unsupported geometry types.
  *
  * @since OGR 1.8.0
+ *
+ * @see OGR_G_GeodesicLength() for an alternative method returning lengths
+ * computed on the ellipsoid, and in meters.
  */
 
 double OGR_G_Length(OGRGeometryH hGeom)
@@ -1622,14 +1611,16 @@ double OGR_G_Length(OGRGeometryH hGeom)
     double dfLength = 0.0;
 
     const auto poGeom = ToPointer(hGeom);
-    const OGRwkbGeometryType eType =
-        wkbFlatten(ToPointer(hGeom)->getGeometryType());
+    const OGRwkbGeometryType eType = wkbFlatten(poGeom->getGeometryType());
     if (OGR_GT_IsCurve(eType))
     {
         dfLength = poGeom->toCurve()->get_Length();
     }
-    else if (OGR_GT_IsSubClassOf(eType, wkbMultiCurve) ||
-             eType == wkbGeometryCollection)
+    else if (OGR_GT_IsSurface(eType))
+    {
+        dfLength = poGeom->toSurface()->get_Length();
+    }
+    else if (OGR_GT_IsSubClassOf(eType, wkbGeometryCollection))
     {
         dfLength = poGeom->toGeometryCollection()->get_Length();
     }
@@ -1643,6 +1634,67 @@ double OGR_G_Length(OGRGeometryH hGeom)
     return dfLength;
 }
 
+/************************************************************************/
+/*                      OGR_G_GeodesicLength()                          */
+/************************************************************************/
+
+/**
+ * \brief Get the length of the curve, considered as a geodesic line on the
+ * underlying ellipsoid of the SRS attached to the geometry.
+ *
+ * The returned length will always be in meters.
+ *
+ * <a href="https://geographiclib.sourceforge.io/html/python/geodesics.html">Geodesics</a>
+ * follow the shortest route on the surface of the ellipsoid.
+ *
+ * If the geometry' SRS is not a geographic one, geometries are reprojected to
+ * the underlying geographic SRS of the geometry' SRS.
+ * OGRSpatialReference::GetDataAxisToSRSAxisMapping() is honored.
+ *
+ * Note that geometries with circular arcs will be linearized in their original
+ * coordinate space first, so the resulting geodesic length will be an
+ * approximation.
+ *
+ * This function utilizes the C++ get_GeodesicLength() method.
+ *
+ * @param hGeom the geometry to operate on.
+ * @return the length or a negative value for unsupported geometry types.
+ *
+ * @since OGR 3.10
+ */
+
+double OGR_G_GeodesicLength(OGRGeometryH hGeom)
+
+{
+    VALIDATE_POINTER1(hGeom, "OGR_G_GeodesicLength", -1);
+
+    double dfLength = 0.0;
+
+    const auto poGeom = ToPointer(hGeom);
+    const OGRwkbGeometryType eType = wkbFlatten(poGeom->getGeometryType());
+    if (OGR_GT_IsCurve(eType))
+    {
+        dfLength = poGeom->toCurve()->get_GeodesicLength();
+    }
+    else if (OGR_GT_IsSurface(eType))
+    {
+        dfLength = poGeom->toSurface()->get_GeodesicLength();
+    }
+    else if (OGR_GT_IsSubClassOf(eType, wkbGeometryCollection))
+    {
+        dfLength = poGeom->toGeometryCollection()->get_GeodesicLength();
+    }
+    else
+    {
+        CPLError(
+            CE_Failure, CPLE_AppDefined,
+            "OGR_G_GeodesicLength() called against a non-curve geometry type.");
+        dfLength = -1.0;
+    }
+
+    return dfLength;
+}
+
 /************************************************************************/
 /*                           OGR_G_Area()                               */
 /************************************************************************/
@@ -1664,7 +1716,7 @@ double OGR_G_Length(OGRGeometryH hGeom)
  * system in use, or 0.0 for unsupported geometry types.
 
  * @see OGR_G_GeodesicArea() for an alternative function returning areas
- * computed on the ellipsoid, an in square meters.
+ * computed on the ellipsoid, and in square meters.
  *
  * @since OGR 1.8.0
  */
@@ -1686,8 +1738,7 @@ double OGR_G_Area(OGRGeometryH hGeom)
     {
         dfArea = poGeom->toCurve()->get_Area();
     }
-    else if (OGR_GT_IsSubClassOf(eType, wkbMultiSurface) ||
-             eType == wkbGeometryCollection)
+    else if (OGR_GT_IsSubClassOf(eType, wkbGeometryCollection))
     {
         dfArea = poGeom->toGeometryCollection()->get_Area();
     }
@@ -1725,6 +1776,9 @@ double OGR_G_GetArea(OGRGeometryH hGeom)
  * The returned area will always be in square meters, and assumes that
  * polygon edges describe geodesic lines on the ellipsoid.
  *
+ * <a href="https://geographiclib.sourceforge.io/html/python/geodesics.html">Geodesics</a>
+ * follow the shortest route on the surface of the ellipsoid.
+ *
  * If the geometry' SRS is not a geographic one, geometries are reprojected to
  * the underlying geographic SRS of the geometry' SRS.
  * OGRSpatialReference::GetDataAxisToSRSAxisMapping() is honored.
@@ -1765,8 +1819,7 @@ double OGR_G_GeodesicArea(OGRGeometryH hGeom)
     {
         dfArea = poGeom->toCurve()->get_GeodesicArea();
     }
-    else if (OGR_GT_IsSubClassOf(eType, wkbMultiSurface) ||
-             eType == wkbGeometryCollection)
+    else if (OGR_GT_IsSubClassOf(eType, wkbGeometryCollection))
     {
         dfArea = poGeom->toGeometryCollection()->get_GeodesicArea();
     }
diff --git a/ogr/ogr_api.h b/ogr/ogr_api.h
index 4de0433f91ce..d17fd9028d35 100644
--- a/ogr/ogr_api.h
+++ b/ogr/ogr_api.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2002, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_API_H_INCLUDED
@@ -281,6 +265,7 @@ OGRGeometryH CPL_DLL OGR_G_SymDifference(OGRGeometryH,
 double CPL_DLL OGR_G_Distance(OGRGeometryH, OGRGeometryH);
 double CPL_DLL OGR_G_Distance3D(OGRGeometryH, OGRGeometryH);
 double CPL_DLL OGR_G_Length(OGRGeometryH);
+double CPL_DLL OGR_G_GeodesicLength(OGRGeometryH);
 double CPL_DLL OGR_G_Area(OGRGeometryH);
 double CPL_DLL OGR_G_GeodesicArea(OGRGeometryH);
 bool CPL_DLL OGR_G_IsClockwise(OGRGeometryH hGeom);
diff --git a/ogr/ogr_capi_test.c b/ogr/ogr_capi_test.c
deleted file mode 100644
index e5297bf2db3c..000000000000
--- a/ogr/ogr_capi_test.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/**********************************************************************
- * $Id$
- **********************************************************************
- * Copyright (c) 2003, Daniel Morissette
- *
- * 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.
- ******************************************************************************
- *
- *
- * Test the OGR C API (ogr_api.h)
- *
- * Compile using:
- *
- * gcc -g ogr_capi_test.c `gdal-config --libs` `gdal-config --cflags` \
- *     -o ogr_capi_test
- *
- ****************************************************************************/
-
-#include "ogr_api.h"
-
-int OGRCDump(const char *pszFname);
-int OGRCCreate(const char *pszFname);
-
-/**********************************************************************
- *                      main()
- **********************************************************************/
-int main(int argc, char *argv[])
-{
-
-    if (argc == 3 && EQUAL(argv[1], "dump"))
-    {
-        return OGRCDump(argv[2]);
-    }
-    else if (argc == 3 && EQUAL(argv[1], "create"))
-    {
-        return OGRCCreate(argv[2]);
-    }
-    else
-    {
-        printf("Usage: ogr_capi_test <command> <filename>\n");
-    }
-
-    return 0;
-}
-
-/**********************************************************************
- *                      OGRCDump()
- *
- * Open a dataset using OGR and dump all its layers.
- *
- **********************************************************************/
-
-int OGRCDump(const char *pszFname)
-{
-    OGRDataSourceH datasource;
-    int i, numLayers;
-
-    /* Register all OGR drivers */
-    OGRRegisterAll();
-
-    /* Open data source */
-    datasource = OGROpen(pszFname, 0 /* bUpdate */, NULL);
-
-    if (datasource == NULL)
-    {
-        printf("Unable to open %s\n", pszFname);
-        return -1;
-    }
-
-    /* Loop through layers and dump their contents */
-
-    numLayers = OGR_DS_GetLayerCount(datasource);
-    for (i = 0; i < numLayers; i++)
-    {
-        OGRLayerH layer;
-        int j, numFields;
-        OGRFeatureH feature;
-        OGRFeatureDefnH layerDefn;
-
-        layer = OGR_DS_GetLayer(datasource, i);
-
-        /* Dump info about this layer */
-        layerDefn = OGR_L_GetLayerDefn(layer);
-        numFields = OGR_FD_GetFieldCount(layerDefn);
-
-        printf("\n===================\n");
-        printf("Layer %d: '%s'\n\n", i, OGR_FD_GetName(layerDefn));
-
-        for (j = 0; j < numFields; j++)
-        {
-            OGRFieldDefnH fieldDefn;
-
-            fieldDefn = OGR_FD_GetFieldDefn(layerDefn, j);
-            printf(" Field %d: %s (%s)\n", j, OGR_Fld_GetNameRef(fieldDefn),
-                   OGR_GetFieldTypeName(OGR_Fld_GetType(fieldDefn)));
-        }
-        printf("\n");
-
-        /* And dump each feature individually */
-        while ((feature = OGR_L_GetNextFeature(layer)) != NULL)
-        {
-            OGR_F_DumpReadable(feature, stdout);
-            OGR_F_Destroy(feature);
-        }
-
-        /* No need to free layer handle, it belongs to the datasource */
-    }
-
-    /* Close data source */
-    OGR_DS_Destroy(datasource);
-
-    return 0;
-}
-
-/**********************************************************************
- *                      OGRCCreate()
- *
- * Create a new dataset using OGR C API with a few features in it.
- *
- **********************************************************************/
-
-int OGRCCreate(const char *pszFname)
-{
-    OGRSFDriverH driver;
-    int i, numDrivers;
-    OGRDataSourceH datasource;
-    OGRLayerH layer;
-    OGRFeatureDefnH layerDefn;
-    OGRFieldDefnH fieldDefn;
-    OGRFeatureH feature;
-    OGRGeometryH geometry, ring;
-
-    /* Register all OGR drivers */
-    OGRRegisterAll();
-
-    /* Fetch MITAB driver - we want to create a TAB file */
-    numDrivers = OGRGetDriverCount();
-    for (i = 0; i < numDrivers; i++)
-    {
-        driver = OGRGetDriver(i);
-        if (EQUAL("MapInfo File", OGR_Dr_GetName(driver)))
-            break; /* Found it! */
-        driver = NULL;
-    }
-
-    if (!driver)
-    {
-        printf("Driver not found!\n");
-        return -1;
-    }
-
-    /* Create new file using this driver */
-    datasource = OGR_Dr_CreateDataSource(driver, pszFname, NULL);
-
-    if (datasource == NULL)
-    {
-        printf("Unable to create %s\n", pszFname);
-        return -1;
-    }
-
-    /* MapInfo data sources are created with one empty layer.
-       Fetch the layer handle */
-    layer = OGR_DS_GetLayer(datasource, 0);
-
-    if (layer == NULL)
-    {
-        printf("Unable to create new layer in %s\n", pszFname);
-        return -1;
-    }
-
-    /* Add a few fields to the layer defn */
-    fieldDefn = OGR_Fld_Create("id", OFTInteger);
-    OGR_L_CreateField(layer, fieldDefn, 0);
-
-    fieldDefn = OGR_Fld_Create("area", OFTReal);
-    OGR_L_CreateField(layer, fieldDefn, 0);
-
-    fieldDefn = OGR_Fld_Create("name", OFTString);
-    OGR_L_CreateField(layer, fieldDefn, 0);
-
-    /* We'll need the layerDefn handle to create new features in this layer */
-    layerDefn = OGR_L_GetLayerDefn(layer);
-
-    /* Create a new point */
-    feature = OGR_F_Create(layerDefn);
-    OGR_F_SetFieldInteger(feature, 0, 1);
-    OGR_F_SetFieldDouble(feature, 1, 123.45);
-    OGR_F_SetFieldString(feature, 2, "Feature #1");
-
-    geometry = OGR_G_CreateGeometry(wkbPoint);
-    OGR_G_SetPoint(geometry, 0, 123.45, 456.78, 0);
-
-    OGR_F_SetGeometryDirectly(feature, geometry);
-
-    OGR_L_CreateFeature(layer, feature);
-
-    /* Create a new line */
-    feature = OGR_F_Create(layerDefn);
-    OGR_F_SetFieldInteger(feature, 0, 2);
-    OGR_F_SetFieldDouble(feature, 1, 42.45);
-    OGR_F_SetFieldString(feature, 2, "Feature #2");
-
-    geometry = OGR_G_CreateGeometry(wkbLineString);
-    OGR_G_AddPoint(geometry, 123.45, 456.78, 0);
-    OGR_G_AddPoint(geometry, 12.34, 45.67, 0);
-
-    OGR_F_SetGeometryDirectly(feature, geometry);
-
-    OGR_L_CreateFeature(layer, feature);
-
-    /* Create a new polygon (square) */
-    feature = OGR_F_Create(layerDefn);
-    OGR_F_SetFieldInteger(feature, 0, 3);
-    OGR_F_SetFieldDouble(feature, 1, 49.71);
-    OGR_F_SetFieldString(feature, 2, "Feature #3");
-
-    geometry = OGR_G_CreateGeometry(wkbPolygon);
-    ring = OGR_G_CreateGeometry(wkbLinearRing);
-    OGR_G_AddPoint(ring, 123.45, 456.78, 0);
-    OGR_G_AddPoint(ring, 12.34, 456.78, 0);
-    OGR_G_AddPoint(ring, 12.34, 45.67, 0);
-    OGR_G_AddPoint(ring, 123.45, 45.67, 0);
-    OGR_G_AddPoint(ring, 123.45, 456.78, 0);
-    OGR_G_AddGeometryDirectly(geometry, ring);
-
-    OGR_F_SetGeometryDirectly(feature, geometry);
-
-    OGR_L_CreateFeature(layer, feature);
-
-    /* Close data source */
-    OGR_DS_Destroy(datasource);
-
-    return 0;
-}
diff --git a/ogr/ogr_core.h b/ogr/ogr_core.h
index 590be6ba6ceb..f64ecc40d6de 100644
--- a/ogr/ogr_core.h
+++ b/ogr/ogr_core.h
@@ -9,23 +9,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2007-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_CORE_H_INCLUDED
@@ -791,8 +775,8 @@ typedef enum
 
 typedef enum
 {
-    /** Simple 32bit integer */ OFTInteger = 0,
-    /** List of 32bit integers */ OFTIntegerList = 1,
+    /** Single signed 32bit integer */ OFTInteger = 0,
+    /** List of signed 32bit integers */ OFTIntegerList = 1,
     /** Double Precision floating point */ OFTReal = 2,
     /** List of doubles */ OFTRealList = 3,
     /** String of ASCII chars */ OFTString = 4,
@@ -803,8 +787,8 @@ typedef enum
     /** Date */ OFTDate = 9,
     /** Time */ OFTTime = 10,
     /** Date and Time */ OFTDateTime = 11,
-    /** Single 64bit integer */ OFTInteger64 = 12,
-    /** List of 64bit integers */ OFTInteger64List = 13,
+    /** Single signed 64bit integer */ OFTInteger64 = 12,
+    /** List of signed 64bit integers */ OFTInteger64List = 13,
     OFTMaxType = 13
 } OGRFieldType;
 
@@ -968,20 +952,8 @@ typedef union
     /*! @endcond */
 } OGRField;
 
-#ifdef __cplusplus
 /** Return the number of milliseconds from a datetime with decimal seconds */
-inline int OGR_GET_MS(float fSec)
-{
-    if (CPLIsNan(fSec))
-        return 0;
-    if (fSec >= 999)
-        return 999;
-    if (fSec <= 0)
-        return 0;
-    const float fValue = (fSec - static_cast<int>(fSec)) * 1000 + 0.5f;
-    return static_cast<int>(fValue);
-}
-#endif  // __cplusplus
+int CPL_DLL OGR_GET_MS(float fSec);
 
 /** Option for OGRParseDate() to ask for lax checks on the input format */
 #define OGRPARSEDATE_OPTION_LAX 1
diff --git a/ogr/ogr_expat.cpp b/ogr/ogr_expat.cpp
index c7cea5a7f045..ad2a51f30c80 100644
--- a/ogr/ogr_expat.cpp
+++ b/ogr/ogr_expat.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2009-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifdef HAVE_EXPAT
diff --git a/ogr/ogr_expat.h b/ogr/ogr_expat.h
index 5e0f0c83ee7e..fa6c672181be 100644
--- a/ogr/ogr_expat.h
+++ b/ogr/ogr_expat.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_EXPATH_INCLUDED
diff --git a/ogr/ogr_feature.h b/ogr/ogr_feature.h
index f1fee83030df..b19421f6fdb7 100644
--- a/ogr/ogr_feature.h
+++ b/ogr/ogr_feature.h
@@ -9,23 +9,7 @@
  * Copyright (c) 1999,  Les Technologies SoftMap Inc.
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_FEATURE_H_INCLUDED
diff --git a/ogr/ogr_featurestyle.h b/ogr/ogr_featurestyle.h
index 5e832875d9dc..ba21b6043dbe 100644
--- a/ogr/ogr_featurestyle.h
+++ b/ogr/ogr_featurestyle.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_FEATURESTYLE_INCLUDE
diff --git a/ogr/ogr_fromepsg.cpp b/ogr/ogr_fromepsg.cpp
index dc65ce0dc188..8d632f543984 100644
--- a/ogr/ogr_fromepsg.cpp
+++ b/ogr/ogr_fromepsg.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2000, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogr_geo_utils.cpp b/ogr/ogr_geo_utils.cpp
index 1d43a585df9a..742fbd072581 100644
--- a/ogr/ogr_geo_utils.cpp
+++ b/ogr/ogr_geo_utils.cpp
@@ -7,32 +7,13 @@
  ******************************************************************************
  * Copyright (c) 2008-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_geo_utils.h"
 #include "cpl_port.h"
 #include "cpl_error.h"
 
-constexpr double RAD2METER = (180.0 / M_PI) * 60.0 * 1852.0;
-constexpr double METER2RAD = 1.0 / RAD2METER;
-
 constexpr double DEG2RAD = M_PI / 180.0;
 constexpr double RAD2DEG = 1.0 / DEG2RAD;
 
@@ -50,7 +31,8 @@ static double OGR_Safe_acos(double x)
 /************************************************************************/
 
 double OGR_GreatCircle_Distance(double LatA_deg, double LonA_deg,
-                                double LatB_deg, double LonB_deg)
+                                double LatB_deg, double LonB_deg,
+                                double dfRadius)
 {
     const double cosP = cos((LonB_deg - LonA_deg) * DEG2RAD);
     const double LatA_rad = LatA_deg * DEG2RAD;
@@ -60,7 +42,7 @@ double OGR_GreatCircle_Distance(double LatA_deg, double LonA_deg,
     const double cosb = cos(LatB_rad);
     const double sinb = sin(LatB_rad);
     const double cos_angle = sina * sinb + cosa * cosb * cosP;
-    return OGR_Safe_acos(cos_angle) * RAD2METER;
+    return OGR_Safe_acos(cos_angle) * dfRadius;
 }
 
 /************************************************************************/
@@ -131,13 +113,14 @@ double OGR_GreatCircle_InitialHeading(double LatA_deg, double LonA_deg,
 
 int OGR_GreatCircle_ExtendPosition(double dfLatA_deg, double dfLonA_deg,
                                    double dfDistance, double dfHeadingInA,
-                                   double *pdfLatB_deg, double *pdfLonB_deg)
+                                   double dfRadius, double *pdfLatB_deg,
+                                   double *pdfLonB_deg)
 {
     const double dfHeadingRad = dfHeadingInA * DEG2RAD;
     const double cos_Heading = cos(dfHeadingRad);
     const double sin_Heading = sin(dfHeadingRad);
 
-    const double dfDistanceRad = dfDistance * METER2RAD;
+    const double dfDistanceRad = dfDistance / dfRadius;
     const double cos_Distance = cos(dfDistanceRad);
     const double sin_Distance = sin(dfDistanceRad);
 
diff --git a/ogr/ogr_geo_utils.h b/ogr/ogr_geo_utils.h
index 47e7fb7e11fb..4efc3ab6e15b 100644
--- a/ogr/ogr_geo_utils.h
+++ b/ogr/ogr_geo_utils.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2008, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_GEO_UTILS_H_INCLUDED
@@ -41,8 +25,13 @@
  * for an airport runway, from its extreme points, track and length.
  */
 
+// Such that OGR_GREATCIRCLE_DEFAULT_RADIUS * M_PI * 2 == 360 * 60.0 * 1852.0
+// that is that one degree == 60 nautical miles
+constexpr double OGR_GREATCIRCLE_DEFAULT_RADIUS = 6366707.01949370746;
+
 double OGR_GreatCircle_Distance(double dfLatA_deg, double dfLonA_deg,
-                                double dfLatB_deg, double dfLonB_deg);
+                                double dfLatB_deg, double dfLonB_deg,
+                                double dfRadius);
 
 double OGR_GreatCircle_InitialHeading(double dfLatA_deg, double dfLonA_deg,
                                       double dfLatB_deg, double dfLonB_deg);
@@ -50,7 +39,7 @@ double OGR_GreatCircle_InitialHeading(double dfLatA_deg, double dfLonA_deg,
 /* such as ExtendPosition(A, Distance(A,B), InitialHeading(A,B)) ~= B */
 int CPL_DLL OGR_GreatCircle_ExtendPosition(double dfLatA_deg, double dfLonA_deg,
                                            double dfDistance,
-                                           double dfHeadingInA,
+                                           double dfHeadingInA, double dfRadius,
                                            double *pdfLatB_deg,
                                            double *pdfLonB_deg);
 
diff --git a/ogr/ogr_geocoding.cpp b/ogr/ogr_geocoding.cpp
index 412d7d7557c1..0f99efb033c6 100644
--- a/ogr/ogr_geocoding.cpp
+++ b/ogr/ogr_geocoding.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2012-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -100,7 +84,7 @@ struct _OGRGeocodingSessionHS
     bool bReadCache;
     bool bWriteCache;
     double dfDelayBetweenQueries;
-    OGRDataSource *poDS;
+    GDALDataset *poDS;
 };
 
 static CPLMutex *hOGRGeocodingMutex = nullptr;
@@ -397,7 +381,7 @@ void OGRGeocodeDestroySession(OGRGeocodingSessionH hSession)
     CPLFree(hSession->pszQueryTemplate);
     CPLFree(hSession->pszReverseQueryTemplate);
     if (hSession->poDS)
-        OGRReleaseDataSource(reinterpret_cast<OGRDataSourceH>(hSession->poDS));
+        delete hSession->poDS;
     CPLFree(hSession);
 }
 
@@ -409,13 +393,13 @@ static OGRLayer *OGRGeocodeGetCacheLayer(OGRGeocodingSessionH hSession,
                                          bool bCreateIfNecessary,
                                          int *pnIdxBlob)
 {
-    OGRDataSource *poDS = hSession->poDS;
+    GDALDataset *poDS = hSession->poDS;
     CPLString osExt = CPLGetExtension(hSession->pszCacheFilename);
 
     if (poDS == nullptr)
     {
-        if (OGRGetDriverCount() == 0)
-            OGRRegisterAll();
+        if (GDALGetDriverCount() == 0)
+            GDALAllRegister();
 
         const bool bHadValue =
             CPLGetConfigOption("OGR_SQLITE_SYNCHRONOUS", nullptr) != nullptr;
@@ -423,13 +407,15 @@ static OGRLayer *OGRGeocodeGetCacheLayer(OGRGeocodingSessionH hSession,
 
         CPLSetThreadLocalConfigOption("OGR_SQLITE_SYNCHRONOUS", "OFF");
 
-        poDS = reinterpret_cast<OGRDataSource *>(
-            OGROpen(hSession->pszCacheFilename, TRUE, nullptr));
+        poDS = GDALDataset::Open(hSession->pszCacheFilename,
+                                 GDAL_OF_VECTOR | GDAL_OF_UPDATE, nullptr,
+                                 nullptr, nullptr);
         if (poDS == nullptr &&
             EQUAL(hSession->pszCacheFilename, DEFAULT_CACHE_SQLITE))
         {
-            poDS = reinterpret_cast<OGRDataSource *>(
-                OGROpen(DEFAULT_CACHE_CSV, TRUE, nullptr));
+            poDS = GDALDataset::Open(DEFAULT_CACHE_CSV,
+                                     GDAL_OF_VECTOR | GDAL_OF_UPDATE, nullptr,
+                                     nullptr, nullptr);
             if (poDS != nullptr)
             {
                 CPLFree(hSession->pszCacheFilename);
@@ -443,8 +429,8 @@ static OGRLayer *OGRGeocodeGetCacheLayer(OGRGeocodingSessionH hSession,
         if (bCreateIfNecessary && poDS == nullptr &&
             !STARTS_WITH_CI(hSession->pszCacheFilename, "PG:"))
         {
-            OGRSFDriverH hDriver = OGRGetDriverByName(osExt);
-            if (hDriver == nullptr &&
+            auto poDriver = GetGDALDriverManager()->GetDriverByName(osExt);
+            if (poDriver == nullptr &&
                 EQUAL(hSession->pszCacheFilename, DEFAULT_CACHE_SQLITE))
             {
                 CPLFree(hSession->pszCacheFilename);
@@ -452,9 +438,9 @@ static OGRLayer *OGRGeocodeGetCacheLayer(OGRGeocodingSessionH hSession,
                 CPLDebug("OGR", "Switch geocode cache file to %s",
                          hSession->pszCacheFilename);
                 osExt = "csv";
-                hDriver = OGRGetDriverByName(osExt);
+                poDriver = GetGDALDriverManager()->GetDriverByName(osExt);
             }
-            if (hDriver != nullptr)
+            if (poDriver != nullptr)
             {
                 char **papszOptions = nullptr;
                 if (EQUAL(osExt, "SQLITE"))
@@ -463,21 +449,20 @@ static OGRLayer *OGRGeocodeGetCacheLayer(OGRGeocodingSessionH hSession,
                         CSLAddNameValue(papszOptions, "METADATA", "FALSE");
                 }
 
-                poDS =
-                    reinterpret_cast<OGRDataSource *>(OGR_Dr_CreateDataSource(
-                        hDriver, hSession->pszCacheFilename, papszOptions));
+                poDS = poDriver->Create(hSession->pszCacheFilename, 0, 0, 0,
+                                        GDT_Unknown, papszOptions);
 
                 if (poDS == nullptr &&
                     (EQUAL(osExt, "SQLITE") || EQUAL(osExt, "CSV")))
                 {
                     CPLFree(hSession->pszCacheFilename);
-                    hSession->pszCacheFilename = CPLStrdup(CPLSPrintf(
-                        "/vsimem/%s.%s", CACHE_LAYER_NAME, osExt.c_str()));
+                    hSession->pszCacheFilename =
+                        CPLStrdup(VSIMemGenerateHiddenFilename(CPLSPrintf(
+                            "%s.%s", CACHE_LAYER_NAME, osExt.c_str())));
                     CPLDebug("OGR", "Switch geocode cache file to %s",
                              hSession->pszCacheFilename);
-                    poDS = reinterpret_cast<OGRDataSource *>(
-                        OGR_Dr_CreateDataSource(
-                            hDriver, hSession->pszCacheFilename, papszOptions));
+                    poDS = poDriver->Create(hSession->pszCacheFilename, 0, 0, 0,
+                                            GDT_Unknown, papszOptions);
                 }
 
                 CSLDestroy(papszOptions);
diff --git a/ogr/ogr_geocoding.h b/ogr/ogr_geocoding.h
index 6d17fb9eeb4a..9f29e63370d8 100644
--- a/ogr/ogr_geocoding.h
+++ b/ogr/ogr_geocoding.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_GEOCODING_H_INCLUDED
diff --git a/ogr/ogr_geomcoordinateprecision.h b/ogr/ogr_geomcoordinateprecision.h
index 7194f90455e2..4eab6844c1a4 100644
--- a/ogr/ogr_geomcoordinateprecision.h
+++ b/ogr/ogr_geomcoordinateprecision.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2024, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_GEOMCOORDINATEPRECISION_H
diff --git a/ogr/ogr_geometry.h b/ogr/ogr_geometry.h
index 73bc05f71678..abd66ace0e8f 100644
--- a/ogr/ogr_geometry.h
+++ b/ogr/ogr_geometry.h
@@ -10,23 +10,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_GEOMETRY_H_INCLUDED
@@ -523,8 +507,9 @@ class CPL_DLL OGRGeometry
 
     static GEOSContextHandle_t createGEOSContext();
     static void freeGEOSContext(GEOSContextHandle_t hGEOSCtxt);
-    virtual GEOSGeom
-    exportToGEOS(GEOSContextHandle_t hGEOSCtxt) const CPL_WARN_UNUSED_RESULT;
+    GEOSGeom
+    exportToGEOS(GEOSContextHandle_t hGEOSCtxt,
+                 bool bRemoveEmptyParts = false) const CPL_WARN_UNUSED_RESULT;
     virtual OGRBoolean hasCurveGeometry(int bLookForNonLinear = FALSE) const;
     virtual OGRGeometry *getCurveGeometry(
         const char *const *papszOptions = nullptr) const CPL_WARN_UNUSED_RESULT;
@@ -543,9 +528,9 @@ class CPL_DLL OGRGeometry
     //! @endcond
     virtual void closeRings();
 
-    virtual void setCoordinateDimension(int nDimension);
-    virtual void set3D(OGRBoolean bIs3D);
-    virtual void setMeasured(OGRBoolean bIsMeasured);
+    virtual bool setCoordinateDimension(int nDimension);
+    virtual bool set3D(OGRBoolean bIs3D);
+    virtual bool setMeasured(OGRBoolean bIsMeasured);
 
     virtual void assignSpatialReference(const OGRSpatialReference *poSR);
 
@@ -557,7 +542,7 @@ class CPL_DLL OGRGeometry
     virtual OGRErr transform(OGRCoordinateTransformation *poCT) = 0;
     OGRErr transformTo(const OGRSpatialReference *poSR);
 
-    virtual void segmentize(double dfMaxLength);
+    virtual bool segmentize(double dfMaxLength);
 
     // ISpatialRelation
     virtual OGRBoolean Intersects(const OGRGeometry *) const;
@@ -608,6 +593,9 @@ class CPL_DLL OGRGeometry
 
     OGRGeometry *SetPrecision(double dfGridSize, int nFlags) const;
 
+    virtual bool hasEmptyParts() const;
+    virtual void removeEmptyParts();
+
     //! @cond Doxygen_Suppress
     // backward compatibility to non-standard method names.
     OGRBoolean Intersect(OGRGeometry *) const
@@ -1157,7 +1145,6 @@ class CPL_DLL OGRPoint : public OGRGeometry
     OGRPoint(double x, double y, double z, double m);
     OGRPoint(const OGRPoint &other);
     static OGRPoint *createXYM(double x, double y, double m);
-    ~OGRPoint() override;
 
     OGRPoint &operator=(const OGRPoint &other);
 
@@ -1223,7 +1210,7 @@ class CPL_DLL OGRPoint : public OGRGeometry
     }
 
     // Non standard
-    virtual void setCoordinateDimension(int nDimension) override;
+    virtual bool setCoordinateDimension(int nDimension) override;
 
     /** Set x
      * @param xIn x
@@ -1328,8 +1315,8 @@ class CPL_DLL OGRCurve : public OGRGeometry
 {
   protected:
     //! @cond Doxygen_Suppress
-    OGRCurve();
-    OGRCurve(const OGRCurve &other);
+    OGRCurve() = default;
+    OGRCurve(const OGRCurve &other) = default;
 
     virtual OGRCurveCasterToLineString GetCasterToLineString() const = 0;
     virtual OGRCurveCasterToLinearRing GetCasterToLinearRing() const = 0;
@@ -1361,8 +1348,6 @@ class CPL_DLL OGRCurve : public OGRGeometry
     friend inline ConstIterator end(const OGRCurve *);
 
   public:
-    ~OGRCurve() override;
-
     //! @cond Doxygen_Suppress
     OGRCurve &operator=(const OGRCurve &other);
     //! @endcond
@@ -1403,7 +1388,10 @@ class CPL_DLL OGRCurve : public OGRGeometry
     virtual double get_Area() const = 0;
     virtual double get_GeodesicArea(
         const OGRSpatialReference *poSRSOverride = nullptr) const = 0;
+    virtual double get_GeodesicLength(
+        const OGRSpatialReference *poSRSOverride = nullptr) const = 0;
     virtual int isClockwise() const;
+    virtual void reversePoints() = 0;
 
     /** Down-cast to OGRSimpleCurve*.
      * Implies prior checking that wkbFlatten(getGeometryType()) ==
@@ -1521,16 +1509,16 @@ class CPL_DLL OGRSimpleCurve : public OGRCurve
     //! @cond Doxygen_Suppress
     friend class OGRGeometry;
 
-    int nPointCount;
+    int nPointCount = 0;
     int m_nPointCapacity = 0;
-    OGRRawPoint *paoPoints;
-    double *padfZ;
-    double *padfM;
+    OGRRawPoint *paoPoints = nullptr;
+    double *padfZ = nullptr;
+    double *padfM = nullptr;
 
-    void Make3D();
+    bool Make3D();
     void Make2D();
     void RemoveM();
-    void AddM();
+    bool AddM();
 
     OGRErr importFromWKTListOnly(const char **ppszInput, int bHasZ, int bHasM,
                                  OGRRawPoint *&paoPointsIn, int &nMaxPoints,
@@ -1539,7 +1527,9 @@ class CPL_DLL OGRSimpleCurve : public OGRCurve
 
     virtual double get_LinearArea() const;
 
-    OGRSimpleCurve();
+    /** Constructor */
+    OGRSimpleCurve() = default;
+
     OGRSimpleCurve(const OGRSimpleCurve &other);
 
   private:
@@ -1677,31 +1667,31 @@ class CPL_DLL OGRSimpleCurve : public OGRCurve
     virtual OGRBoolean Equals(const OGRGeometry *) const override;
 
     // non standard.
-    virtual void setCoordinateDimension(int nDimension) override;
-    virtual void set3D(OGRBoolean bIs3D) override;
-    virtual void setMeasured(OGRBoolean bIsMeasured) override;
-    void setNumPoints(int nNewPointCount, int bZeroizeNewContent = TRUE);
-    void setPoint(int, OGRPoint *);
-    void setPoint(int, double, double);
-    void setZ(int, double);
-    void setM(int, double);
-    void setPoint(int, double, double, double);
-    void setPointM(int, double, double, double);
-    void setPoint(int, double, double, double, double);
-    void setPoints(int, const OGRRawPoint *, const double * = nullptr);
-    void setPointsM(int, const OGRRawPoint *, const double *);
-    void setPoints(int, const OGRRawPoint *, const double *, const double *);
-    void setPoints(int, const double *padfX, const double *padfY,
+    virtual bool setCoordinateDimension(int nDimension) override;
+    virtual bool set3D(OGRBoolean bIs3D) override;
+    virtual bool setMeasured(OGRBoolean bIsMeasured) override;
+    bool setNumPoints(int nNewPointCount, int bZeroizeNewContent = TRUE);
+    bool setPoint(int, OGRPoint *);
+    bool setPoint(int, double, double);
+    bool setZ(int, double);
+    bool setM(int, double);
+    bool setPoint(int, double, double, double);
+    bool setPointM(int, double, double, double);
+    bool setPoint(int, double, double, double, double);
+    bool setPoints(int, const OGRRawPoint *, const double * = nullptr);
+    bool setPointsM(int, const OGRRawPoint *, const double *);
+    bool setPoints(int, const OGRRawPoint *, const double *, const double *);
+    bool setPoints(int, const double *padfX, const double *padfY,
                    const double *padfZIn = nullptr);
-    void setPointsM(int, const double *padfX, const double *padfY,
+    bool setPointsM(int, const double *padfX, const double *padfY,
                     const double *padfMIn = nullptr);
-    void setPoints(int, const double *padfX, const double *padfY,
+    bool setPoints(int, const double *padfX, const double *padfY,
                    const double *padfZIn, const double *padfMIn);
-    void addPoint(const OGRPoint *);
-    void addPoint(double, double);
-    void addPoint(double, double, double);
-    void addPointM(double, double, double);
-    void addPoint(double, double, double, double);
+    bool addPoint(const OGRPoint *);
+    bool addPoint(double, double);
+    bool addPoint(double, double, double);
+    bool addPointM(double, double, double);
+    bool addPoint(double, double, double, double);
 
     bool removePoint(int);
 
@@ -1712,13 +1702,13 @@ class CPL_DLL OGRSimpleCurve : public OGRCurve
 
     void addSubLineString(const OGRLineString *, int nStartVertex = 0,
                           int nEndVertex = -1);
-    void reversePoints(void);
+    void reversePoints() override;
     virtual OGRPointIterator *getPointIterator() const override;
 
     // non-standard from OGRGeometry
     virtual OGRErr transform(OGRCoordinateTransformation *poCT) override;
     virtual void flattenTo2D() override;
-    virtual void segmentize(double dfMaxLength) override;
+    virtual bool segmentize(double dfMaxLength) override;
 
     virtual void swapXY() override;
 
@@ -1783,9 +1773,9 @@ class CPL_DLL OGRLineString : public OGRSimpleCurve
     static OGRLinearRing *CastToLinearRing(OGRLineString *poLS);
 
   public:
-    OGRLineString();
+    /** Create an empty line string. */
+    OGRLineString() = default;
     OGRLineString(const OGRLineString &other);
-    ~OGRLineString() override;
 
     OGRLineString &operator=(const OGRLineString &other);
 
@@ -1798,6 +1788,8 @@ class CPL_DLL OGRLineString : public OGRSimpleCurve
     virtual double get_Area() const override;
     virtual double get_GeodesicArea(
         const OGRSpatialReference *poSRSOverride = nullptr) const override;
+    virtual double get_GeodesicLength(
+        const OGRSpatialReference *poSRSOverride = nullptr) const override;
 
     // Non-standard from OGRGeometry.
     virtual OGRwkbGeometryType getGeometryType() const override;
@@ -1887,17 +1879,22 @@ class CPL_DLL OGRLinearRing : public OGRLineString
     static OGRLineString *CastToLineString(OGRLinearRing *poLR);
 
   public:
-    OGRLinearRing();
+    /** Constructor */
+    OGRLinearRing() = default;
     OGRLinearRing(const OGRLinearRing &other);
-    explicit OGRLinearRing(OGRLinearRing *);
-    ~OGRLinearRing() override;
+    explicit OGRLinearRing(const OGRLinearRing *);
 
     OGRLinearRing &operator=(const OGRLinearRing &other);
 
     // Non standard.
     virtual const char *getGeometryName() const override;
     virtual OGRLinearRing *clone() const override;
-    virtual void reverseWindingOrder();
+
+    //! @cond Doxygen_Suppress
+    void reverseWindingOrder()
+        CPL_WARN_DEPRECATED("Use reversePoints() instead");
+    //! @endcond
+
     virtual void closeRings() override;
     OGRBoolean isPointInRing(const OGRPoint *pt,
                              int bTestEnvelope = TRUE) const;
@@ -1964,9 +1961,10 @@ class CPL_DLL OGRCircularString : public OGRSimpleCurve
     //! @endcond
 
   public:
-    OGRCircularString();
+    /** Create an empty circular string. */
+    OGRCircularString() = default;
+
     OGRCircularString(const OGRCircularString &other);
-    ~OGRCircularString() override;
 
     OGRCircularString &operator=(const OGRCircularString &other);
 
@@ -2008,11 +2006,13 @@ class CPL_DLL OGRCircularString : public OGRSimpleCurve
     virtual double get_Area() const override;
     virtual double get_GeodesicArea(
         const OGRSpatialReference *poSRSOverride = nullptr) const override;
+    virtual double get_GeodesicLength(
+        const OGRSpatialReference *poSRSOverride = nullptr) const override;
 
     // Non-standard from OGRGeometry.
     virtual OGRwkbGeometryType getGeometryType() const override;
     virtual const char *getGeometryName() const override;
-    virtual void segmentize(double dfMaxLength) override;
+    virtual bool segmentize(double dfMaxLength) override;
     virtual OGRBoolean
     hasCurveGeometry(int bLookForNonLinear = FALSE) const override;
     virtual OGRGeometry *
@@ -2072,7 +2072,7 @@ class CPL_DLL OGRCurveCollection
     OGRCurve **papoCurves = nullptr;
 
   public:
-    OGRCurveCollection();
+    OGRCurveCollection() = default;
     OGRCurveCollection(const OGRCurveCollection &other);
     ~OGRCurveCollection();
 
@@ -2134,9 +2134,9 @@ class CPL_DLL OGRCurveCollection
     OGRErr exportToWkb(const OGRGeometry *poGeom, unsigned char *,
                        const OGRwkbExportOptions * = nullptr) const;
     OGRBoolean Equals(const OGRCurveCollection *poOCC) const;
-    void setCoordinateDimension(OGRGeometry *poGeom, int nNewDimension);
-    void set3D(OGRGeometry *poGeom, OGRBoolean bIs3D);
-    void setMeasured(OGRGeometry *poGeom, OGRBoolean bIsMeasured);
+    bool setCoordinateDimension(OGRGeometry *poGeom, int nNewDimension);
+    bool set3D(OGRGeometry *poGeom, OGRBoolean bIs3D);
+    bool setMeasured(OGRGeometry *poGeom, OGRBoolean bIsMeasured);
     void assignSpatialReference(OGRGeometry *poGeom,
                                 const OGRSpatialReference *poSR);
     int getNumCurves() const;
@@ -2146,9 +2146,14 @@ class CPL_DLL OGRCurveCollection
 
     OGRErr removeCurve(int iIndex, bool bDelete = true);
 
+    bool hasEmptyParts() const;
+    void removeEmptyParts();
+
+    void reversePoints();
+
     OGRErr transform(OGRGeometry *poGeom, OGRCoordinateTransformation *poCT);
     void flattenTo2D(OGRGeometry *poGeom);
-    void segmentize(double dfMaxLength);
+    bool segmentize(double dfMaxLength);
     void swapXY();
     OGRBoolean hasCurveGeometry(int bLookForNonLinear) const;
 };
@@ -2198,9 +2203,10 @@ class CPL_DLL OGRCompoundCurve : public OGRCurve
     //! @endcond
 
   public:
-    OGRCompoundCurve();
+    /** Create an empty compound curve. */
+    OGRCompoundCurve() = default;
+
     OGRCompoundCurve(const OGRCompoundCurve &other);
-    ~OGRCompoundCurve() override;
 
     OGRCompoundCurve &operator=(const OGRCompoundCurve &other);
 
@@ -2280,6 +2286,8 @@ class CPL_DLL OGRCompoundCurve : public OGRCurve
     virtual double get_Area() const override;
     virtual double get_GeodesicArea(
         const OGRSpatialReference *poSRSOverride = nullptr) const override;
+    virtual double get_GeodesicLength(
+        const OGRSpatialReference *poSRSOverride = nullptr) const override;
 
     // ISpatialRelation.
     virtual OGRBoolean Equals(const OGRGeometry *) const override;
@@ -2290,9 +2298,9 @@ class CPL_DLL OGRCompoundCurve : public OGRCurve
     const OGRCurve *getCurve(int) const;
 
     // Non-standard.
-    virtual void setCoordinateDimension(int nDimension) override;
-    virtual void set3D(OGRBoolean bIs3D) override;
-    virtual void setMeasured(OGRBoolean bIsMeasured) override;
+    virtual bool setCoordinateDimension(int nDimension) override;
+    virtual bool set3D(OGRBoolean bIs3D) override;
+    virtual bool setMeasured(OGRBoolean bIsMeasured) override;
 
     virtual void
     assignSpatialReference(const OGRSpatialReference *poSR) override;
@@ -2310,13 +2318,14 @@ class CPL_DLL OGRCompoundCurve : public OGRCurve
                     double dfToleranceEps = DEFAULT_TOLERANCE_EPSILON);
     OGRCurve *stealCurve(int);
     virtual OGRPointIterator *getPointIterator() const override;
+    void reversePoints() override;
 
     // Non-standard from OGRGeometry.
     virtual OGRwkbGeometryType getGeometryType() const override;
     virtual const char *getGeometryName() const override;
     virtual OGRErr transform(OGRCoordinateTransformation *poCT) override;
     virtual void flattenTo2D() override;
-    virtual void segmentize(double dfMaxLength) override;
+    virtual bool segmentize(double dfMaxLength) override;
     virtual OGRBoolean
     hasCurveGeometry(int bLookForNonLinear = FALSE) const override;
     virtual OGRGeometry *
@@ -2335,6 +2344,9 @@ class CPL_DLL OGRCompoundCurve : public OGRCurve
 
     virtual void swapXY() override;
 
+    bool hasEmptyParts() const override;
+    void removeEmptyParts() override;
+
     OGR_ALLOW_UPCAST_TO(Curve)
     OGR_ALLOW_CAST_TO_THIS(CompoundCurve)
 };
@@ -2389,6 +2401,9 @@ class CPL_DLL OGRSurface : public OGRGeometry
     virtual double get_Area() const = 0;
     virtual double get_GeodesicArea(
         const OGRSpatialReference *poSRSOverride = nullptr) const = 0;
+    virtual double get_Length() const = 0;
+    virtual double get_GeodesicLength(
+        const OGRSpatialReference *poSRSOverride = nullptr) const = 0;
 
     virtual OGRErr PointOnSurface(OGRPoint *poPoint) const
     {
@@ -2432,7 +2447,10 @@ class CPL_DLL OGRCurvePolygon : public OGRSurface
   private:
     OGRBoolean IntersectsPoint(const OGRPoint *p) const;
     OGRBoolean ContainsPoint(const OGRPoint *p) const;
-    virtual int checkRing(OGRCurve *poNewRing) const;
+
+    virtual bool isRingCorrectType(const OGRCurve *poRing) const;
+
+    virtual bool checkRing(const OGRCurve *poNewRing) const;
     OGRErr addRingDirectlyInternal(OGRCurve *poCurve, int bNeedRealloc);
     static OGRErr addCurveDirectlyFromWkt(OGRGeometry *poSelf,
                                           OGRCurve *poCurve);
@@ -2454,9 +2472,10 @@ class CPL_DLL OGRCurvePolygon : public OGRSurface
     static OGRPolygon *CastToPolygon(OGRCurvePolygon *poCP);
 
   public:
-    OGRCurvePolygon();
+    /** Create an empty curve polygon. */
+    OGRCurvePolygon() = default;
+
     OGRCurvePolygon(const OGRCurvePolygon &);
-    ~OGRCurvePolygon() override;
 
     OGRCurvePolygon &operator=(const OGRCurvePolygon &other);
 
@@ -2499,7 +2518,7 @@ class CPL_DLL OGRCurvePolygon : public OGRSurface
     virtual OGRErr transform(OGRCoordinateTransformation *poCT) override;
     virtual void flattenTo2D() override;
     virtual OGRBoolean IsEmpty() const override;
-    virtual void segmentize(double dfMaxLength) override;
+    virtual bool segmentize(double dfMaxLength) override;
     virtual OGRBoolean
     hasCurveGeometry(int bLookForNonLinear = FALSE) const override;
     virtual OGRGeometry *
@@ -2507,10 +2526,14 @@ class CPL_DLL OGRCurvePolygon : public OGRSurface
                       const char *const *papszOptions = nullptr) const override;
     virtual double get_GeodesicArea(
         const OGRSpatialReference *poSRSOverride = nullptr) const override;
+    virtual double get_GeodesicLength(
+        const OGRSpatialReference *poSRSOverride = nullptr) const override;
 
     // ISurface Interface
     virtual double get_Area() const override;
 
+    virtual double get_Length() const override;
+
     // IWks Interface
     virtual size_t WkbSize() const override;
     virtual OGRErr importFromWkb(const unsigned char *, size_t, OGRwkbVariant,
@@ -2551,14 +2574,14 @@ class CPL_DLL OGRCurvePolygon : public OGRSurface
     virtual OGRBoolean Contains(const OGRGeometry *) const override;
 
     // Non standard
-    virtual void setCoordinateDimension(int nDimension) override;
-    virtual void set3D(OGRBoolean bIs3D) override;
-    virtual void setMeasured(OGRBoolean bIsMeasured) override;
+    virtual bool setCoordinateDimension(int nDimension) override;
+    virtual bool set3D(OGRBoolean bIs3D) override;
+    virtual bool setMeasured(OGRBoolean bIsMeasured) override;
 
     virtual void
     assignSpatialReference(const OGRSpatialReference *poSR) override;
 
-    virtual OGRErr addRing(OGRCurve *);
+    virtual OGRErr addRing(const OGRCurve *);
     virtual OGRErr addRingDirectly(OGRCurve *);
     OGRErr addRing(std::unique_ptr<OGRCurve>);
 
@@ -2584,6 +2607,9 @@ class CPL_DLL OGRCurvePolygon : public OGRSurface
 
     virtual void swapXY() override;
 
+    bool hasEmptyParts() const override;
+    void removeEmptyParts() override;
+
     OGR_ALLOW_UPCAST_TO(Surface)
     OGR_ALLOW_CAST_TO_THIS(CurvePolygon)
 };
@@ -2640,7 +2666,9 @@ class CPL_DLL OGRPolygon : public OGRCurvePolygon
     friend class OGRPolyhedralSurface;
     friend class OGRTriangulatedSurface;
 
-    virtual int checkRing(OGRCurve *poNewRing) const override;
+    virtual bool isRingCorrectType(const OGRCurve *poRing) const override;
+
+    virtual bool checkRing(const OGRCurve *poNewRing) const override;
     virtual OGRErr importFromWKTListOnly(const char **ppszInput, int bHasZ,
                                          int bHasM, OGRRawPoint *&paoPoints,
                                          int &nMaxPoints, double *&padfZ);
@@ -2653,9 +2681,10 @@ class CPL_DLL OGRPolygon : public OGRCurvePolygon
     //! @endcond
 
   public:
-    OGRPolygon();
+    /** Create an empty polygon. */
+    OGRPolygon() = default;
+
     OGRPolygon(const OGRPolygon &other);
-    ~OGRPolygon() override;
 
     OGRPolygon &operator=(const OGRPolygon &other);
 
@@ -2823,12 +2852,13 @@ class CPL_DLL OGRTriangle : public OGRPolygon
     //! @endcond
 
   public:
-    OGRTriangle();
+    /** Constructor. */
+    OGRTriangle() = default;
     OGRTriangle(const OGRPoint &p, const OGRPoint &q, const OGRPoint &r);
     OGRTriangle(const OGRTriangle &other);
     OGRTriangle(const OGRPolygon &other, OGRErr &eErr);
     OGRTriangle &operator=(const OGRTriangle &other);
-    ~OGRTriangle() override;
+
     virtual const char *getGeometryName() const override;
     virtual OGRwkbGeometryType getGeometryType() const override;
     virtual OGRTriangle *clone() const override;
@@ -2904,7 +2934,9 @@ class CPL_DLL OGRGeometryCollection : public OGRGeometry
     virtual OGRBoolean isCompatibleSubType(OGRwkbGeometryType) const;
 
   public:
-    OGRGeometryCollection();
+    /** Create an empty geometry collection. */
+    OGRGeometryCollection() = default;
+
     OGRGeometryCollection(const OGRGeometryCollection &other);
     ~OGRGeometryCollection() override;
 
@@ -2949,7 +2981,7 @@ class CPL_DLL OGRGeometryCollection : public OGRGeometry
     virtual OGRErr transform(OGRCoordinateTransformation *poCT) override;
     virtual void flattenTo2D() override;
     virtual OGRBoolean IsEmpty() const override;
-    virtual void segmentize(double dfMaxLength) override;
+    virtual bool segmentize(double dfMaxLength) override;
     virtual OGRBoolean
     hasCurveGeometry(int bLookForNonLinear = FALSE) const override;
     virtual OGRGeometry *
@@ -2959,6 +2991,8 @@ class CPL_DLL OGRGeometryCollection : public OGRGeometry
                       const char *const *papszOptions = nullptr) const override;
     virtual double
     get_GeodesicArea(const OGRSpatialReference *poSRSOverride = nullptr) const;
+    virtual double get_GeodesicLength(
+        const OGRSpatialReference *poSRSOverride = nullptr) const;
 
     // IWks Interface
     virtual size_t WkbSize() const override;
@@ -3001,13 +3035,17 @@ class CPL_DLL OGRGeometryCollection : public OGRGeometry
     virtual OGRBoolean Equals(const OGRGeometry *) const override;
 
     // Non standard
-    virtual void setCoordinateDimension(int nDimension) override;
-    virtual void set3D(OGRBoolean bIs3D) override;
-    virtual void setMeasured(OGRBoolean bIsMeasured) override;
+    virtual bool setCoordinateDimension(int nDimension) override;
+    virtual bool set3D(OGRBoolean bIs3D) override;
+    virtual bool setMeasured(OGRBoolean bIsMeasured) override;
     virtual OGRErr addGeometry(const OGRGeometry *);
     virtual OGRErr addGeometryDirectly(OGRGeometry *);
     OGRErr addGeometry(std::unique_ptr<OGRGeometry> geom);
     virtual OGRErr removeGeometry(int iIndex, int bDelete = TRUE);
+    std::unique_ptr<OGRGeometry> stealGeometry(int iIndex);
+
+    bool hasEmptyParts() const override;
+    void removeEmptyParts() override;
 
     virtual void
     assignSpatialReference(const OGRSpatialReference *poSR) override;
@@ -3080,9 +3118,10 @@ class CPL_DLL OGRMultiSurface : public OGRGeometryCollection
     virtual OGRBoolean isCompatibleSubType(OGRwkbGeometryType) const override;
 
   public:
-    OGRMultiSurface();
+    /** Create an empty multi surface collection. */
+    OGRMultiSurface() = default;
+
     OGRMultiSurface(const OGRMultiSurface &other);
-    ~OGRMultiSurface() override;
 
     OGRMultiSurface &operator=(const OGRMultiSurface &other);
 
@@ -3247,9 +3286,10 @@ class CPL_DLL OGRMultiPolygon : public OGRMultiSurface
     //! @endcond
 
   public:
-    OGRMultiPolygon();
+    /** Create an empty multi polygon collection. */
+    OGRMultiPolygon() = default;
+
     OGRMultiPolygon(const OGRMultiPolygon &other);
-    ~OGRMultiPolygon() override;
 
     OGRMultiPolygon &operator=(const OGRMultiPolygon &other);
 
@@ -3409,9 +3449,11 @@ class CPL_DLL OGRPolyhedralSurface : public OGRSurface
     //! @endcond
 
   public:
-    OGRPolyhedralSurface();
+    /** Create an empty PolyhedralSurface */
+    OGRPolyhedralSurface() = default;
+
     OGRPolyhedralSurface(const OGRPolyhedralSurface &poGeom);
-    ~OGRPolyhedralSurface() override;
+
     OGRPolyhedralSurface &operator=(const OGRPolyhedralSurface &other);
 
     /** Type of child elements. */
@@ -3486,6 +3528,10 @@ class CPL_DLL OGRPolyhedralSurface : public OGRSurface
     virtual double get_Area() const override;
     virtual double get_GeodesicArea(
         const OGRSpatialReference *poSRSOverride = nullptr) const override;
+    virtual double get_Length() const override;
+    virtual double get_GeodesicLength(
+        const OGRSpatialReference *poSRSOverride = nullptr) const override;
+
     virtual OGRErr PointOnSurface(OGRPoint *) const override;
 
     static OGRMultiPolygon *CastToMultiPolygon(OGRPolyhedralSurface *poPS);
@@ -3500,12 +3546,15 @@ class CPL_DLL OGRPolyhedralSurface : public OGRSurface
     const OGRPolygon *getGeometryRef(int i) const;
 
     virtual OGRBoolean IsEmpty() const override;
-    virtual void setCoordinateDimension(int nDimension) override;
-    virtual void set3D(OGRBoolean bIs3D) override;
-    virtual void setMeasured(OGRBoolean bIsMeasured) override;
+    virtual bool setCoordinateDimension(int nDimension) override;
+    virtual bool set3D(OGRBoolean bIs3D) override;
+    virtual bool setMeasured(OGRBoolean bIsMeasured) override;
     virtual void swapXY() override;
     OGRErr removeGeometry(int iIndex, int bDelete = TRUE);
 
+    bool hasEmptyParts() const override;
+    void removeEmptyParts() override;
+
     virtual void accept(IOGRGeometryVisitor *visitor) override
     {
         visitor->visit(this);
@@ -3576,9 +3625,10 @@ class CPL_DLL OGRTriangulatedSurface : public OGRPolyhedralSurface
     //! @endcond
 
   public:
-    OGRTriangulatedSurface();
+    /** Constructor */
+    OGRTriangulatedSurface() = default;
+
     OGRTriangulatedSurface(const OGRTriangulatedSurface &other);
-    ~OGRTriangulatedSurface();
 
     /** Type of child elements. */
     typedef OGRTriangle ChildType;
@@ -3710,9 +3760,10 @@ class CPL_DLL OGRMultiPoint : public OGRGeometryCollection
     virtual OGRBoolean isCompatibleSubType(OGRwkbGeometryType) const override;
 
   public:
-    OGRMultiPoint();
+    /** Create an empty multi point collection. */
+    OGRMultiPoint() = default;
+
     OGRMultiPoint(const OGRMultiPoint &other);
-    ~OGRMultiPoint() override;
 
     OGRMultiPoint &operator=(const OGRMultiPoint &other);
 
@@ -3867,9 +3918,10 @@ class CPL_DLL OGRMultiCurve : public OGRGeometryCollection
     virtual OGRBoolean isCompatibleSubType(OGRwkbGeometryType) const override;
 
   public:
-    OGRMultiCurve();
+    /** Create an empty multi curve collection. */
+    OGRMultiCurve() = default;
+
     OGRMultiCurve(const OGRMultiCurve &other);
-    ~OGRMultiCurve() override;
 
     OGRMultiCurve &operator=(const OGRMultiCurve &other);
 
@@ -4019,9 +4071,10 @@ class CPL_DLL OGRMultiLineString : public OGRMultiCurve
     virtual OGRBoolean isCompatibleSubType(OGRwkbGeometryType) const override;
 
   public:
-    OGRMultiLineString();
+    /** Create an empty multi line string collection. */
+    OGRMultiLineString() = default;
+
     OGRMultiLineString(const OGRMultiLineString &other);
-    ~OGRMultiLineString() override;
 
     OGRMultiLineString &operator=(const OGRMultiLineString &other);
 
@@ -4235,6 +4288,12 @@ class CPL_DLL OGRGeometryFactory
         ~TransformWithOptionsCache();
     };
 
+    //! @cond Doxygen_Suppress
+    static bool isTransformWithOptionsRegularTransform(
+        const OGRSpatialReference *poSourceCRS,
+        const OGRSpatialReference *poTargetCRS, CSLConstList papszOptions);
+    //! @endcond
+
     static OGRGeometry *transformWithOptions(
         const OGRGeometry *poSrcGeom, OGRCoordinateTransformation *poCT,
         char **papszOptions,
diff --git a/ogr/ogr_geos.h b/ogr/ogr_geos.h
index 68590427b0b8..091c1bfbf54b 100644
--- a/ogr/ogr_geos.h
+++ b/ogr/ogr_geos.h
@@ -10,23 +10,7 @@
  ******************************************************************************
  * Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_GEOS_H_INCLUDED
diff --git a/ogr/ogr_libs.h b/ogr/ogr_libs.h
index 2ec59ff617da..c3424c3eb020 100644
--- a/ogr/ogr_libs.h
+++ b/ogr/ogr_libs.h
@@ -10,23 +10,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Avyav Kumar Singh <avyavkumar at gmail dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef HAVE_GEOS
diff --git a/ogr/ogr_p.h b/ogr/ogr_p.h
index 6fde155e9c1f..aab1b8a3be9c 100644
--- a/ogr/ogr_p.h
+++ b/ogr/ogr_p.h
@@ -9,23 +9,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_P_H_INCLUDED
@@ -200,12 +184,10 @@ OGRErr CPL_DLL OGRCheckPermutation(const int *panPermutation, int nSize);
 
 /* GML related */
 
-OGRGeometry *GML2OGRGeometry_XMLNode(const CPLXMLNode *psNode,
-                                     int nPseudoBoolGetSecondaryGeometryOption,
-                                     int nRecLevel = 0, int nSRSDimension = 0,
-                                     bool bIgnoreGSG = false,
-                                     bool bOrientation = true,
-                                     bool bFaceHoleNegative = false);
+OGRGeometry CPL_DLL *GML2OGRGeometry_XMLNode(
+    const CPLXMLNode *psNode, int nPseudoBoolGetSecondaryGeometryOption,
+    int nRecLevel = 0, int nSRSDimension = 0, bool bIgnoreGSG = false,
+    bool bOrientation = true, bool bFaceHoleNegative = false);
 
 /************************************************************************/
 /*                        PostGIS EWKB encoding                         */
@@ -276,7 +258,8 @@ inline uint64_t OGRRoundValueIEEE754(uint64_t nVal, int nBitsPrecision)
         return nVal;
     if (nNullifiedBits >= MANTISSA_SIZE)
         nNullifiedBits = MANTISSA_SIZE;
-    nVal &= std::numeric_limits<uint64_t>::max() << nNullifiedBits;
+    nVal >>= nNullifiedBits;
+    nVal <<= nNullifiedBits;
     return nVal;
 }
 
diff --git a/ogr/ogr_proj_p.cpp b/ogr/ogr_proj_p.cpp
index 0f7ae69f5c74..9ee654c097f4 100644
--- a/ogr/ogr_proj_p.cpp
+++ b/ogr/ogr_proj_p.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_error.h"
diff --git a/ogr/ogr_proj_p.h b/ogr/ogr_proj_p.h
index 52870f83dd6a..cef6d7ca4829 100644
--- a/ogr/ogr_proj_p.h
+++ b/ogr/ogr_proj_p.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_PROJ_P_H_INCLUDED
@@ -39,7 +23,7 @@
 
 /*! @cond Doxygen_Suppress */
 
-PJ_CONTEXT *OSRGetProjTLSContext();
+PJ_CONTEXT CPL_DLL *OSRGetProjTLSContext();
 void OSRCleanupTLSContext();
 
 class OSRProjTLSCache
diff --git a/ogr/ogr_recordbatch.h b/ogr/ogr_recordbatch.h
index 50a5685884e3..6fcde1405b65 100644
--- a/ogr/ogr_recordbatch.h
+++ b/ogr/ogr_recordbatch.h
@@ -25,11 +25,16 @@
 
 #include <stdint.h>
 
+// Spec and documentation: https://arrow.apache.org/docs/format/CDataInterface.html
+
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
+#ifndef ARROW_C_DATA_INTERFACE
+#define ARROW_C_DATA_INTERFACE
+
 #define ARROW_FLAG_DICTIONARY_ORDERED 1
 #define ARROW_FLAG_NULLABLE 2
 #define ARROW_FLAG_MAP_KEYS_SORTED 4
@@ -69,28 +74,27 @@ extern "C"
         void *private_data;
     };
 
-    // EXPERIMENTAL: C stream interface
+#endif  // ARROW_C_DATA_INTERFACE
+
+#ifndef ARROW_C_STREAM_INTERFACE
+#define ARROW_C_STREAM_INTERFACE
 
     struct ArrowArrayStream
     {
         // Callback to get the stream type
         // (will be the same for all arrays in the stream).
         //
-        // Return value: 0 if successful, an `errno`-compatible error code
-        // otherwise.
+        // Return value: 0 if successful, an `errno`-compatible error code otherwise.
         //
-        // If successful, the ArrowSchema must be released independently from
-        // the stream.
+        // If successful, the ArrowSchema must be released independently from the stream.
         int (*get_schema)(struct ArrowArrayStream *, struct ArrowSchema *out);
 
         // Callback to get the next array
         // (if no error and the array is released, the stream has ended)
         //
-        // Return value: 0 if successful, an `errno`-compatible error code
-        // otherwise.
+        // Return value: 0 if successful, an `errno`-compatible error code otherwise.
         //
-        // If successful, the ArrowArray must be released independently from the
-        // stream.
+        // If successful, the ArrowArray must be released independently from the stream.
         int (*get_next)(struct ArrowArrayStream *, struct ArrowArray *out);
 
         // Callback to get optional detailed error information.
@@ -100,19 +104,20 @@ extern "C"
         // Return value: pointer to a null-terminated character array describing
         // the last error, or NULL if no description is available.
         //
-        // The returned pointer is only valid until the next operation on this
-        // stream (including release).
+        // The returned pointer is only valid until the next operation on this stream
+        // (including release).
         const char *(*get_last_error)(struct ArrowArrayStream *);
 
         // Release callback: release the stream's own resources.
-        // Note that arrays returned by `get_next` must be individually
-        // released.
+        // Note that arrays returned by `get_next` must be individually released.
         void (*release)(struct ArrowArrayStream *);
 
         // Opaque producer-specific data
         void *private_data;
     };
 
+#endif  // ARROW_C_STREAM_INTERFACE
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/ogr/ogr_sfcgal.h b/ogr/ogr_sfcgal.h
index 1e66c237300e..47cee24155f1 100644
--- a/ogr/ogr_sfcgal.h
+++ b/ogr/ogr_sfcgal.h
@@ -10,23 +10,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Avyav Kumar Singh <avyavkumar at gmail dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifdef HAVE_SFCGAL
diff --git a/ogr/ogr_spatialref.h b/ogr/ogr_spatialref.h
index 588c6e350854..87e82572df68 100644
--- a/ogr/ogr_spatialref.h
+++ b/ogr/ogr_spatialref.h
@@ -10,23 +10,7 @@
  * Copyright (c) 1999,  Les Technologies SoftMap Inc.
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_SPATIALREF_H_INCLUDED
@@ -194,6 +178,8 @@ class CPL_DLL OGRSpatialReference
     OGRSpatialReference &operator=(const OGRSpatialReference &);
     OGRSpatialReference &operator=(OGRSpatialReference &&);
 
+    OGRSpatialReference &AssignAndSetThreadSafe(const OGRSpatialReference &);
+
     int Reference();
     int Dereference();
     int GetReferenceCount() const;
@@ -545,7 +531,7 @@ class CPL_DLL OGRSpatialReference
     /** Interrupted Goode Homolosine */
     OGRErr SetIGH();
 
-    /** Gall Stereograpic */
+    /** Gall Stereographic */
     OGRErr SetGS(double dfCentralMeridian, double dfFalseEasting,
                  double dfFalseNorthing);
 
diff --git a/ogr/ogr_srs_api.h b/ogr/ogr_srs_api.h
index a92d40237be0..bc55ff3149c7 100644
--- a/ogr/ogr_srs_api.h
+++ b/ogr/ogr_srs_api.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2000, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_SRS_API_H_INCLUDED
diff --git a/ogr/ogr_srs_cf1.cpp b/ogr/ogr_srs_cf1.cpp
index 8add4d7a6d3b..5f211f4a5947 100644
--- a/ogr/ogr_srs_cf1.cpp
+++ b/ogr/ogr_srs_cf1.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2004, Frank Warmerdam
  * Copyright (c) 2007-2024, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_core.h"
@@ -1305,8 +1289,7 @@ NCDFGetProjAttribs(const OGR_SRSNode *poPROJCS, const char *pszProjection)
                     // Default is to not write as it is not CF-1.
                     bWriteVal = false;
                     // Test if there is no standard_parallel1.
-                    if (oValMap.find(std::string(CF_PP_STD_PARALLEL_1)) ==
-                        oValMap.end())
+                    if (!cpl::contains(oValMap, CF_PP_STD_PARALLEL_1))
                     {
                         // If scale factor != 1.0, write value for GDAL, but
                         // this is not supported by CF-1.
@@ -1362,7 +1345,7 @@ NCDFGetProjAttribs(const OGR_SRSNode *poPROJCS, const char *pszProjection)
             const auto &osGDALAtt = oValIter.first;
             const double dfValue = oValIter.second;
 
-            const auto &oAttIter = oAttMap.find(osGDALAtt);
+            const auto oAttIter = oAttMap.find(osGDALAtt);
 
             if (oAttIter != oAttMap.end())
             {
@@ -1695,7 +1678,7 @@ OGRSpatialReference::exportToCF1(char **ppszGridMappingName,
                     {
                         if (!osVal.empty())
                             osVal += ',';
-                        osVal += CPLSPrintf("%.18g", dfVal);
+                        osVal += CPLSPrintf("%.17g", dfVal);
                     }
                     aosKeyValues.AddNameValue(param.key.c_str(), osVal.c_str());
                 }
diff --git a/ogr/ogr_srs_cf1.h b/ogr/ogr_srs_cf1.h
index f3cb11ce76cb..bcbfcb372fe0 100644
--- a/ogr/ogr_srs_cf1.h
+++ b/ogr/ogr_srs_cf1.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2004, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_SRS_CF1_INCLUDED
diff --git a/ogr/ogr_srs_dict.cpp b/ogr/ogr_srs_dict.cpp
index dd58389fead2..203ab9a41250 100644
--- a/ogr/ogr_srs_dict.cpp
+++ b/ogr/ogr_srs_dict.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2004, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogr_srs_erm.cpp b/ogr/ogr_srs_erm.cpp
index 27c09433142a..c792ae55707d 100644
--- a/ogr/ogr_srs_erm.cpp
+++ b/ogr/ogr_srs_erm.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -120,7 +104,7 @@ OGRErr OGRSpatialReference::importFromERM(const char *pszProj,
         }
 
         // Remove trailing ]
-        osProjWKT.resize(osProjWKT.size() - 1);
+        osProjWKT.pop_back();
 
         // Remove any UNIT
         auto nPos = osProjWKT.find(",UNIT");
diff --git a/ogr/ogr_srs_esri.cpp b/ogr/ogr_srs_esri.cpp
index df0180b48b0b..f539d261d851 100644
--- a/ogr/ogr_srs_esri.cpp
+++ b/ogr/ogr_srs_esri.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.com>
  * Copyright (c) 2013, Kyle Shannon <kyle at pobox dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -349,7 +333,7 @@ OGRErr OGRSpatialReference::importFromESRI(char **papszPrj)
         const double dfZone = OSR_GDV(papszPrj, "zone", 0.0);
 
         if (dfZone < std::numeric_limits<int>::min() ||
-            dfZone > std::numeric_limits<int>::max() || CPLIsNan(dfZone))
+            dfZone > std::numeric_limits<int>::max() || std::isnan(dfZone))
         {
             CPLError(CE_Failure, CPLE_AppDefined, "zone out of range: %f",
                      dfZone);
@@ -366,7 +350,7 @@ OGRErr OGRSpatialReference::importFromESRI(char **papszPrj)
 
             if (dfFipszone < std::numeric_limits<int>::min() ||
                 dfFipszone > std::numeric_limits<int>::max() ||
-                CPLIsNan(dfFipszone))
+                std::isnan(dfFipszone))
             {
                 CPLError(CE_Failure, CPLE_AppDefined,
                          "fipszone out of range: %f", dfFipszone);
@@ -468,7 +452,7 @@ OGRErr OGRSpatialReference::importFromESRI(char **papszPrj)
         const double dfStdPCount = OSR_GDV(papszPrj, "PARAM_1", 0.0);
         // TODO(schwehr): What is a reasonable range for StdPCount?
         if (dfStdPCount < 0 || dfStdPCount > std::numeric_limits<int>::max() ||
-            CPLIsNan(dfStdPCount))
+            std::isnan(dfStdPCount))
         {
             CPLError(CE_Failure, CPLE_AppDefined, "StdPCount out of range: %lf",
                      dfStdPCount);
diff --git a/ogr/ogr_srs_ozi.cpp b/ogr/ogr_srs_ozi.cpp
index 100d4c69212c..b7bdf628a8dc 100644
--- a/ogr/ogr_srs_ozi.cpp
+++ b/ogr/ogr_srs_ozi.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2009, Andrey Kiselev <dron@ak4719.spb.edu>
  * Copyright (c) 2009-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogr_srs_panorama.cpp b/ogr/ogr_srs_panorama.cpp
index 55de322b42a4..a8d25423f06e 100644
--- a/ogr/ogr_srs_panorama.cpp
+++ b/ogr/ogr_srs_panorama.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.com>
  * Copyright (c) 2020-2022, Dmitry Baryshnikov <polimax@mail.ru>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_spatialref.h"
diff --git a/ogr/ogr_srs_pci.cpp b/ogr/ogr_srs_pci.cpp
index 67f650a61a81..60732537b40b 100644
--- a/ogr/ogr_srs_pci.cpp
+++ b/ogr/ogr_srs_pci.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2003, Andrey Kiselev <dron@ak4719.spb.edu>
  * Copyright (c) 2009-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogr_srs_usgs.cpp b/ogr/ogr_srs_usgs.cpp
index 97ddf2619f7f..11d1bc3265f9 100644
--- a/ogr/ogr_srs_usgs.cpp
+++ b/ogr/ogr_srs_usgs.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2004, Andrey Kiselev <dron@ak4719.spb.edu>
  * Copyright (c) 2008-2009, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -732,9 +716,14 @@ OGRErr OGRSpatialReference::importFromUSGS(long iProjSys, long iZone,
         }
         else if (iDatum < NUMBER_OF_USGS_ELLIPSOIDS && aoEllipsUSGS[iDatum])
         {
-            if (OSRGetEllipsoidInfo(aoEllipsUSGS[iDatum], &pszName,
-                                    &dfSemiMajor,
-                                    &dfInvFlattening) == OGRERR_NONE)
+            if (aoEllipsUSGS[iDatum] == 7030)  // WGS 84 ellipsoid
+            {
+                // Assume a WGS 84 datum
+                SetWellKnownGeogCS("WGS84");
+            }
+            else if (OSRGetEllipsoidInfo(aoEllipsUSGS[iDatum], &pszName,
+                                         &dfSemiMajor,
+                                         &dfInvFlattening) == OGRERR_NONE)
             {
                 SetGeogCS(
                     CPLString().Printf(
@@ -772,6 +761,18 @@ OGRErr OGRSpatialReference::importFromUSGS(long iProjSys, long iZone,
     if (IsLocal() || IsProjected())
         SetLinearUnits(SRS_UL_METER, 1.0);
 
+    if (iDatum >= 0 && iDatum < NUMBER_OF_USGS_ELLIPSOIDS &&
+        aoEllipsUSGS[iDatum] == 7030)
+    {
+        if (AutoIdentifyEPSG() == OGRERR_NONE)
+        {
+            const char *pszAuthName = GetAuthorityName(nullptr);
+            const char *pszAuthCode = GetAuthorityCode(nullptr);
+            if (pszAuthName && pszAuthCode && EQUAL(pszAuthName, "EPSG"))
+                CPL_IGNORE_RET_VAL(importFromEPSG(atoi(pszAuthCode)));
+        }
+    }
+
     return OGRERR_NONE;
 }
 
diff --git a/ogr/ogr_srs_xml.cpp b/ogr/ogr_srs_xml.cpp
index aecc723d8e24..feefa001d791 100644
--- a/ogr/ogr_srs_xml.cpp
+++ b/ogr/ogr_srs_xml.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2001, Frank Warmerdam (warmerdam@pobox.com)
  * Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogr_srsnode.cpp b/ogr/ogr_srsnode.cpp
index 9e0c4f541c74..ffe9ccc04f16 100644
--- a/ogr/ogr_srsnode.cpp
+++ b/ogr/ogr_srsnode.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999,  Les Technologies SoftMap Inc.
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogr_swq.h b/ogr/ogr_swq.h
index 208b98b69013..71f4f45e6b6b 100644
--- a/ogr/ogr_swq.h
+++ b/ogr/ogr_swq.h
@@ -63,11 +63,17 @@ typedef enum
     SWQ_CONCAT,
     SWQ_SUBSTR,
     SWQ_HSTORE_GET_VALUE,
+
     SWQ_AVG,
+    SWQ_AGGREGATE_BEGIN = SWQ_AVG,
     SWQ_MIN,
     SWQ_MAX,
     SWQ_COUNT,
     SWQ_SUM,
+    SWQ_STDDEV_POP,
+    SWQ_STDDEV_SAMP,
+    SWQ_AGGREGATE_END = SWQ_STDDEV_SAMP,
+
     SWQ_CAST,
     SWQ_CUSTOM_FUNC,  /* only if parsing done in bAcceptCustomFuncs mode */
     SWQ_ARGUMENT_LIST /* temporary value only set during parsing and replaced by
@@ -186,6 +192,10 @@ class CPL_UNSTABLE_API swq_expr_node
     /* nOperation == SWQ_CUSTOM_FUNC */
     char *string_value = nullptr; /* column name when SNT_COLUMN */
 
+    // May be transiently used by swq_parser.h, but should not be relied upon
+    // after parsing. swq_col_def.bHidden captures it afterwards.
+    bool bHidden = false;
+
     static CPLString QuoteIfNecessary(const CPLString &, char chQuote = '\'');
     static CPLString Quote(const CPLString &, char chQuote = '\'');
 };
@@ -314,6 +324,8 @@ typedef enum
     SWQCF_MAX = SWQ_MAX,
     SWQCF_COUNT = SWQ_COUNT,
     SWQCF_SUM = SWQ_SUM,
+    SWQCF_STDDEV_POP = SWQ_STDDEV_POP,
+    SWQCF_STDDEV_SAMP = SWQ_STDDEV_SAMP,
     SWQCF_CUSTOM
 } swq_col_func;
 
@@ -331,6 +343,7 @@ typedef struct
     int field_length;
     int field_precision;
     int distinct_flag;
+    bool bHidden;
     OGRwkbGeometryType eGeomType;
     int nSRID;
     swq_expr_node *expr;
@@ -351,13 +364,30 @@ class CPL_UNSTABLE_API swq_summary
         bool operator()(const CPLString &, const CPLString &) const;
     };
 
+    //! Return the sum, using Kahan-Babuska-Neumaier algorithm.
+    // Cf cf KahanBabushkaNeumaierSum of https://en.wikipedia.org/wiki/Kahan_summation_algorithm#Further_enhancements
+    double sum() const
+    {
+        return sum_only_finite_terms ? sum_acc + sum_correction : sum_acc;
+    }
+
     GIntBig count = 0;
 
     std::vector<CPLString> oVectorDistinctValues{};
     std::set<CPLString, Comparator> oSetDistinctValues{};
-    double sum = 0.0;
+    bool sum_only_finite_terms = true;
+    // Sum accumulator. To get the accurate sum, use the sum() method
+    double sum_acc = 0.0;
+    // Sum correction term.
+    double sum_correction = 0.0;
     double min = 0.0;
     double max = 0.0;
+
+    // Welford's online algorithm for variance:
+    // https://en.wikipedia.org/wiki/Algorithms_for_calculating_variance#Welford's_online_algorithm
+    double mean_for_variance = 0.0;
+    double sq_dist_from_mean_acc = 0.0;  // "M2"
+
     CPLString osMin{};
     CPLString osMax{};
 };
@@ -412,8 +442,8 @@ class CPL_UNSTABLE_API swq_select
 
     char *raw_select = nullptr;
 
-    int PushField(swq_expr_node *poExpr, const char *pszAlias = nullptr,
-                  int distinct_flag = FALSE);
+    int PushField(swq_expr_node *poExpr, const char *pszAlias,
+                  bool distinct_flag, bool bHidden);
 
     int PushExcludeField(swq_expr_node *poExpr);
 
@@ -471,9 +501,15 @@ class CPL_UNSTABLE_API swq_select
     std::map<int, std::list<swq_col_def>> m_exclude_fields{};
 };
 
+/* This method should generally be invoked with pszValue set, except when
+ * called on a non-DISTINCT column definition of numeric type (SWQ_BOOLEAN,
+ * SWQ_INTEGER, SWQ_INTEGER64, SWQ_FLOAT), in which case pdfValue should
+ * rather be set.
+ */
 const char CPL_UNSTABLE_API *swq_select_summarize(swq_select *select_info,
                                                   int dest_column,
-                                                  const char *value);
+                                                  const char *pszValue,
+                                                  const double *pdfValue);
 
 int CPL_UNSTABLE_API swq_is_reserved_keyword(const char *pszStr);
 
diff --git a/ogr/ogr_wkb.cpp b/ogr/ogr_wkb.cpp
index 0f98f0766971..05a1c204def0 100644
--- a/ogr/ogr_wkb.cpp
+++ b/ogr/ogr_wkb.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_error.h"
@@ -828,8 +812,6 @@ bool OGRWKBIntersectsPessimistic(const GByte *pabyWkb, size_t nWKBSize,
 /*                            epsilonEqual()                            */
 /************************************************************************/
 
-constexpr double EPSILON = 1.0E-5;
-
 static inline bool epsilonEqual(double a, double b, double eps)
 {
     return ::fabs(a - b) < eps;
@@ -864,6 +846,8 @@ static inline double GetY(const GByte *data, uint32_t i, int nDim,
 static bool OGRWKBIsClockwiseRing(const GByte *data, const uint32_t nPoints,
                                   const int nDim, const bool bNeedSwap)
 {
+    constexpr double EPSILON = 1.0E-5;
+
     // WARNING: keep in sync OGRLineString::isClockwise(),
     // OGRCurve::isClockwise() and OGRWKBIsClockwiseRing()
 
@@ -891,7 +875,7 @@ static bool OGRWKBIsClockwiseRing(const GByte *data, const uint32_t nPoints,
             {
                 v = i;
                 vX = x;
-                vY = y;
+                // vY = y;
                 bUseFallback = false;
             }
             else if (x == vX)
@@ -1072,6 +1056,357 @@ void OGRWKBFixupCounterClockWiseExternalRing(GByte *pabyWkb, size_t nWKBSize)
         pabyWkb, nWKBSize, iOffsetInOut, /* nRec = */ 0);
 }
 
+/************************************************************************/
+/*                        OGRWKBPointUpdater()                          */
+/************************************************************************/
+
+OGRWKBPointUpdater::OGRWKBPointUpdater() = default;
+
+/************************************************************************/
+/*              OGRWKBIntersectsPointSequencePessimistic()              */
+/************************************************************************/
+
+static bool OGRWKBUpdatePointsSequence(uint8_t *data, const size_t size,
+                                       OGRWKBPointUpdater &oUpdater,
+                                       const OGRwkbByteOrder eByteOrder,
+                                       const int nDim, const bool bHasZ,
+                                       const bool bHasM, size_t &iOffsetInOut)
+{
+    const uint32_t nPoints =
+        OGRWKBReadUInt32AtOffset(data, eByteOrder, iOffsetInOut);
+    if (nPoints > (size - iOffsetInOut) / (nDim * sizeof(double)))
+    {
+        return false;
+    }
+    const bool bNeedSwap = OGR_SWAP(eByteOrder);
+    for (uint32_t j = 0; j < nPoints; j++)
+    {
+        void *pdfX = data + iOffsetInOut;
+        void *pdfY = data + iOffsetInOut + sizeof(double);
+        void *pdfZ = bHasZ ? data + iOffsetInOut + 2 * sizeof(double) : nullptr;
+        void *pdfM =
+            bHasM ? data + iOffsetInOut + (bHasZ ? 3 : 2) * sizeof(double)
+                  : nullptr;
+        if (!oUpdater.update(bNeedSwap, pdfX, pdfY, pdfZ, pdfM))
+            return false;
+
+        iOffsetInOut += nDim * sizeof(double);
+    }
+
+    return true;
+}
+
+/************************************************************************/
+/*                        OGRWKBVisitRingSequence()                     */
+/************************************************************************/
+
+static bool OGRWKBVisitRingSequence(uint8_t *data, const size_t size,
+                                    OGRWKBPointUpdater &oUpdater,
+                                    const OGRwkbByteOrder eByteOrder,
+                                    const int nDim, const bool bHasZ,
+                                    const bool bHasM, size_t &iOffsetInOut)
+{
+    const uint32_t nRings =
+        OGRWKBReadUInt32AtOffset(data, eByteOrder, iOffsetInOut);
+    if (nRings > (size - iOffsetInOut) / sizeof(uint32_t))
+    {
+        return false;
+    }
+
+    for (uint32_t i = 0; i < nRings; ++i)
+    {
+        if (iOffsetInOut + sizeof(uint32_t) > size)
+        {
+            return false;
+        }
+        if (!OGRWKBUpdatePointsSequence(data, size, oUpdater, eByteOrder, nDim,
+                                        bHasZ, bHasM, iOffsetInOut))
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+/************************************************************************/
+/*                      OGRWKBUpdatePoints()                             */
+/************************************************************************/
+
+static bool OGRWKBUpdatePoints(uint8_t *data, const size_t size,
+                               OGRWKBPointUpdater &oUpdater,
+                               size_t &iOffsetInOut, const int nRec)
+{
+    if (size - iOffsetInOut < MIN_WKB_SIZE)
+    {
+        return false;
+    }
+    const int nByteOrder = DB2_V72_FIX_BYTE_ORDER(data[iOffsetInOut]);
+    if (!(nByteOrder == wkbXDR || nByteOrder == wkbNDR))
+    {
+        return false;
+    }
+    const OGRwkbByteOrder eByteOrder = static_cast<OGRwkbByteOrder>(nByteOrder);
+
+    OGRwkbGeometryType eGeometryType = wkbUnknown;
+    OGRReadWKBGeometryType(data + iOffsetInOut, wkbVariantIso, &eGeometryType);
+    iOffsetInOut += 5;
+    const auto eFlatType = wkbFlatten(eGeometryType);
+
+    if (eFlatType == wkbGeometryCollection || eFlatType == wkbCompoundCurve ||
+        eFlatType == wkbCurvePolygon || eFlatType == wkbMultiPoint ||
+        eFlatType == wkbMultiLineString || eFlatType == wkbMultiPolygon ||
+        eFlatType == wkbMultiCurve || eFlatType == wkbMultiSurface ||
+        eFlatType == wkbPolyhedralSurface || eFlatType == wkbTIN)
+    {
+        if (nRec == 128)
+            return false;
+
+        const uint32_t nParts =
+            OGRWKBReadUInt32AtOffset(data, eByteOrder, iOffsetInOut);
+        if (nParts > (size - iOffsetInOut) / MIN_WKB_SIZE)
+        {
+            return false;
+        }
+        for (uint32_t k = 0; k < nParts; k++)
+        {
+            if (!OGRWKBUpdatePoints(data, size, oUpdater, iOffsetInOut,
+                                    nRec + 1))
+                return false;
+        }
+        return true;
+    }
+
+    const bool bHasZ = OGR_GT_HasZ(eGeometryType);
+    const bool bHasM = OGR_GT_HasM(eGeometryType);
+    const int nDim = 2 + (bHasZ ? 1 : 0) + (bHasM ? 1 : 0);
+
+    if (eFlatType == wkbPoint)
+    {
+        if (size - iOffsetInOut < nDim * sizeof(double))
+            return false;
+        void *pdfX = data + iOffsetInOut;
+        void *pdfY = data + iOffsetInOut + sizeof(double);
+        void *pdfZ = bHasZ ? data + iOffsetInOut + 2 * sizeof(double) : nullptr;
+        void *pdfM =
+            bHasM ? data + iOffsetInOut + (bHasZ ? 3 : 2) * sizeof(double)
+                  : nullptr;
+        const bool bNeedSwap = OGR_SWAP(eByteOrder);
+        if (!oUpdater.update(bNeedSwap, pdfX, pdfY, pdfZ, pdfM))
+            return false;
+        iOffsetInOut += nDim * sizeof(double);
+        return true;
+    }
+
+    if (eFlatType == wkbLineString || eFlatType == wkbCircularString)
+    {
+        return OGRWKBUpdatePointsSequence(data, size, oUpdater, eByteOrder,
+                                          nDim, bHasZ, bHasM, iOffsetInOut);
+    }
+
+    if (eFlatType == wkbPolygon || eFlatType == wkbTriangle)
+    {
+        return OGRWKBVisitRingSequence(data, size, oUpdater, eByteOrder, nDim,
+                                       bHasZ, bHasM, iOffsetInOut);
+    }
+
+    CPLDebug("OGR", "Unknown WKB geometry type");
+    return false;
+}
+
+/** Visit all points of a WKB geometry to update them.
+ */
+bool OGRWKBUpdatePoints(GByte *pabyWkb, size_t nWKBSize,
+                        OGRWKBPointUpdater &oUpdater)
+{
+    size_t iOffsetInOut = 0;
+    return OGRWKBUpdatePoints(pabyWkb, nWKBSize, oUpdater, iOffsetInOut,
+                              /* nRec = */ 0);
+}
+
+/************************************************************************/
+/*                    OGRWKBTransformCache::clear()                     */
+/************************************************************************/
+
+#ifdef OGR_WKB_TRANSFORM_ALL_AT_ONCE
+void OGRWKBTransformCache::clear()
+{
+    abNeedSwap.clear();
+    abIsEmpty.clear();
+    apdfX.clear();
+    apdfY.clear();
+    apdfZ.clear();
+    apdfM.clear();
+    adfX.clear();
+    adfY.clear();
+    adfZ.clear();
+    adfM.clear();
+    anErrorCodes.clear();
+}
+#endif
+
+/************************************************************************/
+/*                         OGRWKBTransform()                            */
+/************************************************************************/
+
+/** Visit all points of a WKB geometry to transform them.
+ */
+bool OGRWKBTransform(GByte *pabyWkb, size_t nWKBSize,
+                     OGRCoordinateTransformation *poCT,
+                     [[maybe_unused]] OGRWKBTransformCache &oCache,
+                     OGREnvelope3D &sEnvelope)
+{
+#ifndef OGR_WKB_TRANSFORM_ALL_AT_ONCE
+    struct OGRWKBPointUpdaterReproj final : public OGRWKBPointUpdater
+    {
+        OGRCoordinateTransformation *m_poCT;
+        OGREnvelope3D &m_sEnvelope;
+
+        explicit OGRWKBPointUpdaterReproj(OGRCoordinateTransformation *poCTIn,
+                                          OGREnvelope3D &sEnvelopeIn)
+            : m_poCT(poCTIn), m_sEnvelope(sEnvelopeIn)
+        {
+        }
+
+        bool update(bool bNeedSwap, void *x, void *y, void *z,
+                    void * /* m */) override
+        {
+            double dfX, dfY, dfZ;
+            memcpy(&dfX, x, sizeof(double));
+            memcpy(&dfY, y, sizeof(double));
+            if (bNeedSwap)
+            {
+                CPL_SWAP64PTR(&dfX);
+                CPL_SWAP64PTR(&dfY);
+            }
+            if (!(std::isnan(dfX) && std::isnan(dfY)))
+            {
+                if (z)
+                {
+                    memcpy(&dfZ, z, sizeof(double));
+                    if (bNeedSwap)
+                    {
+                        CPL_SWAP64PTR(&dfZ);
+                    }
+                }
+                else
+                    dfZ = 0;
+                int nErrorCode = 0;
+                m_poCT->TransformWithErrorCodes(1, &dfX, &dfY, &dfZ, nullptr,
+                                                &nErrorCode);
+                if (nErrorCode)
+                    return false;
+                m_sEnvelope.Merge(dfX, dfY, dfZ);
+                if (bNeedSwap)
+                {
+                    CPL_SWAP64PTR(&dfX);
+                    CPL_SWAP64PTR(&dfY);
+                    CPL_SWAP64PTR(&dfZ);
+                }
+                memcpy(x, &dfX, sizeof(double));
+                memcpy(y, &dfY, sizeof(double));
+                if (z)
+                    memcpy(z, &dfZ, sizeof(double));
+            }
+            return true;
+        }
+
+      private:
+        OGRWKBPointUpdaterReproj(const OGRWKBPointUpdaterReproj &) = delete;
+        OGRWKBPointUpdaterReproj &
+        operator=(const OGRWKBPointUpdaterReproj &) = delete;
+    };
+
+    sEnvelope = OGREnvelope3D();
+    OGRWKBPointUpdaterReproj oUpdater(poCT, sEnvelope);
+    return OGRWKBUpdatePoints(pabyWkb, nWKBSize, oUpdater);
+
+#else
+    struct OGRWKBPointUpdaterReproj final : public OGRWKBPointUpdater
+    {
+        OGRWKBTransformCache &m_oCache;
+
+        explicit OGRWKBPointUpdaterReproj(OGRWKBTransformCache &oCacheIn)
+            : m_oCache(oCacheIn)
+        {
+        }
+
+        bool update(bool bNeedSwap, void *x, void *y, void *z,
+                    void * /* m */) override
+        {
+            m_oCache.abNeedSwap.push_back(bNeedSwap);
+            m_oCache.apdfX.push_back(x);
+            m_oCache.apdfY.push_back(y);
+            m_oCache.apdfZ.push_back(z);
+            return true;
+        }
+    };
+
+    oCache.clear();
+    OGRWKBPointUpdaterReproj oUpdater(oCache);
+    if (!OGRWKBUpdatePoints(pabyWkb, nWKBSize, oUpdater))
+        return false;
+
+    oCache.adfX.resize(oCache.apdfX.size());
+    oCache.adfY.resize(oCache.apdfX.size());
+    oCache.adfZ.resize(oCache.apdfX.size());
+
+    for (size_t i = 0; i < oCache.apdfX.size(); ++i)
+    {
+        memcpy(&oCache.adfX[i], oCache.apdfX[i], sizeof(double));
+        memcpy(&oCache.adfY[i], oCache.apdfY[i], sizeof(double));
+        if (oCache.apdfZ[i])
+            memcpy(&oCache.adfZ[i], oCache.apdfZ[i], sizeof(double));
+        if (oCache.abNeedSwap[i])
+        {
+            CPL_SWAP64PTR(&oCache.adfX[i]);
+            CPL_SWAP64PTR(&oCache.adfY[i]);
+            CPL_SWAP64PTR(&oCache.adfZ[i]);
+        }
+        oCache.abIsEmpty.push_back(std::isnan(oCache.adfX[i]) &&
+                                   std::isnan(oCache.adfY[i]));
+    }
+
+    oCache.anErrorCodes.resize(oCache.apdfX.size());
+    poCT->TransformWithErrorCodes(static_cast<int>(oCache.apdfX.size()),
+                                  oCache.adfX.data(), oCache.adfY.data(),
+                                  oCache.adfZ.data(), nullptr,
+                                  oCache.anErrorCodes.data());
+
+    for (size_t i = 0; i < oCache.apdfX.size(); ++i)
+    {
+        if (!oCache.abIsEmpty[i] && oCache.anErrorCodes[i])
+            return false;
+    }
+
+    sEnvelope = OGREnvelope3D();
+    for (size_t i = 0; i < oCache.apdfX.size(); ++i)
+    {
+        if (oCache.abIsEmpty[i])
+        {
+            oCache.adfX[i] = std::numeric_limits<double>::quiet_NaN();
+            oCache.adfY[i] = std::numeric_limits<double>::quiet_NaN();
+            oCache.adfZ[i] = std::numeric_limits<double>::quiet_NaN();
+        }
+        else
+        {
+            sEnvelope.Merge(oCache.adfX[i], oCache.adfY[i], oCache.adfZ[i]);
+        }
+        if (oCache.abNeedSwap[i])
+        {
+            CPL_SWAP64PTR(&oCache.adfX[i]);
+            CPL_SWAP64PTR(&oCache.adfY[i]);
+            CPL_SWAP64PTR(&oCache.adfZ[i]);
+        }
+        memcpy(oCache.apdfX[i], &oCache.adfX[i], sizeof(double));
+        memcpy(oCache.apdfY[i], &oCache.adfY[i], sizeof(double));
+        if (oCache.apdfZ[i])
+            memcpy(oCache.apdfZ[i], &oCache.adfZ[i], sizeof(double));
+    }
+
+    return true;
+#endif
+}
+
 /************************************************************************/
 /*                         OGRAppendBuffer()                            */
 /************************************************************************/
diff --git a/ogr/ogr_wkb.h b/ogr/ogr_wkb.h
index 2c3a9770dc89..cfdbaa3b3a35 100644
--- a/ogr/ogr_wkb.h
+++ b/ogr/ogr_wkb.h
@@ -7,31 +7,19 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_WKB_H_INCLUDED
 #define OGR_WKB_H_INCLUDED
 
+#include <cstdint>
+
 #include "cpl_port.h"
 #include "ogr_core.h"
 
+#include <vector>
+
 bool CPL_DLL OGRWKBGetGeomType(const GByte *pabyWkb, size_t nWKBSize,
                                bool &bNeedSwap, uint32_t &nType);
 bool OGRWKBPolygonGetArea(const GByte *&pabyWkb, size_t &nWKBSize,
@@ -62,6 +50,46 @@ void CPL_DLL OGRWKBFixupCounterClockWiseExternalRing(GByte *pabyWkb,
 const GByte CPL_DLL *WKBFromEWKB(GByte *pabyEWKB, size_t nEWKBSize,
                                  size_t &nWKBSizeOut, int *pnSRIDOut);
 
+/** Object to update point coordinates in a WKB geometry */
+class CPL_DLL OGRWKBPointUpdater
+{
+  public:
+    OGRWKBPointUpdater();
+    virtual ~OGRWKBPointUpdater() = default;
+
+    /** Update method */
+    virtual bool update(bool bNeedSwap, void *x, void *y, void *z, void *m) = 0;
+};
+
+bool CPL_DLL OGRWKBUpdatePoints(GByte *pabyWkb, size_t nWKBSize,
+                                OGRWKBPointUpdater &oUpdater);
+
+/** Transformation cache */
+struct CPL_DLL OGRWKBTransformCache
+{
+#ifdef OGR_WKB_TRANSFORM_ALL_AT_ONCE
+    std::vector<bool> abNeedSwap{};
+    std::vector<bool> abIsEmpty{};
+    std::vector<void *> apdfX{};
+    std::vector<void *> apdfY{};
+    std::vector<void *> apdfZ{};
+    std::vector<void *> apdfM{};
+    std::vector<double> adfX{};
+    std::vector<double> adfY{};
+    std::vector<double> adfZ{};
+    std::vector<double> adfM{};
+    std::vector<int> anErrorCodes{};
+
+    void clear();
+#endif
+};
+
+class OGRCoordinateTransformation;
+bool CPL_DLL OGRWKBTransform(GByte *pabyWkb, size_t nWKBSize,
+                             OGRCoordinateTransformation *poCT,
+                             OGRWKBTransformCache &oCache,
+                             OGREnvelope3D &sEnvelope);
+
 /************************************************************************/
 /*                       OGRAppendBuffer                                */
 /************************************************************************/
diff --git a/ogr/ogr_xerces.cpp b/ogr/ogr_xerces.cpp
index 06f1bbc4d4c4..a579464f4fff 100644
--- a/ogr/ogr_xerces.cpp
+++ b/ogr/ogr_xerces.cpp
@@ -13,23 +13,7 @@
  * Copyright (c) 2002, Frank Warmerdam
  * Copyright (c) 2016, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_xerces.h"
diff --git a/ogr/ogr_xerces.h b/ogr/ogr_xerces.h
index 9e91122ef52c..6d720b39ba23 100644
--- a/ogr/ogr_xerces.h
+++ b/ogr/ogr_xerces.h
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_XERCES_INCLUDED
diff --git a/ogr/ogr_xerces_headers.h b/ogr/ogr_xerces_headers.h
index dde4fe6a08e1..e1bb512891b3 100644
--- a/ogr/ogr_xerces_headers.h
+++ b/ogr/ogr_xerces_headers.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef OGR_XERCES_HEADERS_H
diff --git a/ogr/ograpispy.cpp b/ogr/ograpispy.cpp
index dc8436c8b10d..87c214872302 100644
--- a/ogr/ograpispy.cpp
+++ b/ogr/ograpispy.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ograpispy.h b/ogr/ograpispy.h
index c6cbe2bbe0d8..70d98b5ea16f 100644
--- a/ogr/ograpispy.h
+++ b/ogr/ograpispy.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRAPISPY_H_INCLUDED
diff --git a/ogr/ograssemblepolygon.cpp b/ogr/ograssemblepolygon.cpp
index 6c66e455efe4..00c2d4734f2a 100644
--- a/ogr/ograssemblepolygon.cpp
+++ b/ogr/ograssemblepolygon.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2009-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrcircularstring.cpp b/ogr/ogrcircularstring.cpp
index b25a04bf42de..2df237fd4d66 100644
--- a/ogr/ogrcircularstring.cpp
+++ b/ogr/ogrcircularstring.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2010, 2014, Even Rouault <even dot rouault at spatialys dot
  *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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -47,16 +31,6 @@ static inline double dist(double x0, double y0, double x1, double y1)
     return std::sqrt((x1 - x0) * (x1 - x0) + (y1 - y0) * (y1 - y0));
 }
 
-/************************************************************************/
-/*                         OGRCircularString()                          */
-/************************************************************************/
-
-/**
- * \brief Create an empty circular string.
- */
-
-OGRCircularString::OGRCircularString() = default;
-
 /************************************************************************/
 /*              OGRCircularString( const OGRCircularString& )           */
 /************************************************************************/
@@ -72,12 +46,6 @@ OGRCircularString::OGRCircularString() = default;
 
 OGRCircularString::OGRCircularString(const OGRCircularString &) = default;
 
-/************************************************************************/
-/*                        ~OGRCircularString()                          */
-/************************************************************************/
-
-OGRCircularString::~OGRCircularString() = default;
-
 /************************************************************************/
 /*                  operator=( const OGRCircularString& )               */
 /************************************************************************/
@@ -294,7 +262,7 @@ void OGRCircularString::ExtendEnvelopeWithCircular(
         if (OGRGeometryFactory::GetCurveParameters(
                 x0, y0, x1, y1, x2, y2, R, cx, cy, alpha0, alpha1, alpha2))
         {
-            if (CPLIsNan(alpha0) || CPLIsNan(alpha2))
+            if (std::isnan(alpha0) || std::isnan(alpha2))
             {
                 CPLError(CE_Failure, CPLE_AppDefined,
                          "GetCurveParameters returned NaN");
@@ -359,10 +327,12 @@ void OGRCircularString::getEnvelope(OGREnvelope3D *psEnvelope) const
 /*                     OGRCircularString::segmentize()                  */
 /************************************************************************/
 
-void OGRCircularString::segmentize(double dfMaxLength)
+bool OGRCircularString::segmentize(double dfMaxLength)
 {
-    if (!IsValidFast() || nPointCount == 0)
-        return;
+    if (!IsValidFast())
+        return false;
+    if (nPointCount == 0)
+        return true;
 
     // So as to make sure that the same line followed in both directions
     // result in the same segmentized line.
@@ -371,12 +341,14 @@ void OGRCircularString::segmentize(double dfMaxLength)
          paoPoints[0].y < paoPoints[nPointCount - 1].y))
     {
         reversePoints();
-        segmentize(dfMaxLength);
+        const bool bRet = segmentize(dfMaxLength);
         reversePoints();
+        return bRet;
     }
 
     std::vector<OGRRawPoint> aoRawPoint;
     std::vector<double> adfZ;
+    bool bRet = true;
     for (int i = 0; i < nPointCount - 2; i += 2)
     {
         const double x0 = paoPoints[i].x;
@@ -411,11 +383,12 @@ void OGRCircularString::segmentize(double dfMaxLength)
                 const double dfVal =
                     1 + 2 * std::floor(dfSegmentLength1 / dfMaxLength / 2.0);
                 if (dfVal >= std::numeric_limits<int>::max() || dfVal < 0.0 ||
-                    CPLIsNan(dfVal))
+                    std::isnan(dfVal))
                 {
                     CPLError(CE_Failure, CPLE_AppDefined,
                              "segmentize nIntermediatePoints invalid: %lf",
                              dfVal);
+                    bRet = false;
                     break;
                 }
                 const int nIntermediatePoints = static_cast<int>(dfVal);
@@ -446,11 +419,12 @@ void OGRCircularString::segmentize(double dfMaxLength)
                 const double dfVal =
                     1 + 2 * std::floor(dfSegmentLength2 / dfMaxLength / 2.0);
                 if (dfVal >= std::numeric_limits<int>::max() || dfVal < 0.0 ||
-                    CPLIsNan(dfVal))
+                    std::isnan(dfVal))
                 {
                     CPLError(CE_Failure, CPLE_AppDefined,
                              "segmentize nIntermediatePoints invalid 2: %lf",
                              dfVal);
+                    bRet = false;
                     break;
                 }
                 int nIntermediatePoints = static_cast<int>(dfVal);
@@ -484,11 +458,12 @@ void OGRCircularString::segmentize(double dfMaxLength)
                 const double dfVal =
                     1 + 2 * std::ceil(dfSegmentLength1 / dfMaxLength / 2.0);
                 if (dfVal >= std::numeric_limits<int>::max() || dfVal < 0.0 ||
-                    CPLIsNan(dfVal))
+                    std::isnan(dfVal))
                 {
                     CPLError(CE_Failure, CPLE_AppDefined,
                              "segmentize nIntermediatePoints invalid 2: %lf",
                              dfVal);
+                    bRet = false;
                     break;
                 }
                 int nIntermediatePoints = static_cast<int>(dfVal);
@@ -514,11 +489,12 @@ void OGRCircularString::segmentize(double dfMaxLength)
                 const double dfVal =
                     1 + 2 * std::ceil(dfSegmentLength2 / dfMaxLength / 2.0);
                 if (dfVal >= std::numeric_limits<int>::max() || dfVal < 0.0 ||
-                    CPLIsNan(dfVal))
+                    std::isnan(dfVal))
                 {
                     CPLError(CE_Failure, CPLE_AppDefined,
                              "segmentize nIntermediatePoints invalid 3: %lf",
                              dfVal);
+                    bRet = false;
                     break;
                 }
                 const int nIntermediatePoints = static_cast<int>(dfVal);
@@ -561,6 +537,7 @@ void OGRCircularString::segmentize(double dfMaxLength)
             memcpy(padfZ, &adfZ[0], sizeof(double) * nPointCount);
         }
     }
+    return bRet;
 }
 
 /************************************************************************/
@@ -918,11 +895,25 @@ double OGRCircularString::get_GeodesicArea(
     if (!poSRSOverride)
         poSRSOverride = getSpatialReference();
 
-    OGRLineString *poLS = CurveToLine();
-    const double dfArea = poLS->get_GeodesicArea(poSRSOverride);
-    delete poLS;
+    auto poLS = std::unique_ptr<OGRLineString>(CurveToLine());
+    return poLS->get_GeodesicArea(poSRSOverride);
+}
 
-    return dfArea;
+/************************************************************************/
+/*                        get_GeodesicLength()                          */
+/************************************************************************/
+
+double OGRCircularString::get_GeodesicLength(
+    const OGRSpatialReference *poSRSOverride) const
+{
+    if (IsEmpty())
+        return 0;
+
+    if (!poSRSOverride)
+        poSRSOverride = getSpatialReference();
+
+    auto poLS = std::unique_ptr<OGRLineString>(CurveToLine());
+    return poLS->get_GeodesicLength(poSRSOverride);
 }
 
 //! @cond Doxygen_Suppress
diff --git a/ogr/ogrcompoundcurve.cpp b/ogr/ogrcompoundcurve.cpp
index 00a63bca6f05..54f0fc0c74db 100644
--- a/ogr/ogrcompoundcurve.cpp
+++ b/ogr/ogrcompoundcurve.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -38,16 +22,6 @@
 #include "ogr_p.h"
 #include "ogr_spatialref.h"
 
-/************************************************************************/
-/*                         OGRCompoundCurve()                           */
-/************************************************************************/
-
-/**
- * \brief Create an empty compound curve.
- */
-
-OGRCompoundCurve::OGRCompoundCurve() = default;
-
 /************************************************************************/
 /*             OGRCompoundCurve( const OGRCompoundCurve& )              */
 /************************************************************************/
@@ -63,12 +37,6 @@ OGRCompoundCurve::OGRCompoundCurve() = default;
 
 OGRCompoundCurve::OGRCompoundCurve(const OGRCompoundCurve &) = default;
 
-/************************************************************************/
-/*                         ~OGRCompoundCurve()                          */
-/************************************************************************/
-
-OGRCompoundCurve::~OGRCompoundCurve() = default;
-
 /************************************************************************/
 /*                 operator=( const OGRCompoundCurve&)                  */
 /************************************************************************/
@@ -380,19 +348,19 @@ OGRBoolean OGRCompoundCurve::Equals(const OGRGeometry *poOther) const
 /*                       setCoordinateDimension()                       */
 /************************************************************************/
 
-void OGRCompoundCurve::setCoordinateDimension(int nNewDimension)
+bool OGRCompoundCurve::setCoordinateDimension(int nNewDimension)
 {
-    oCC.setCoordinateDimension(this, nNewDimension);
+    return oCC.setCoordinateDimension(this, nNewDimension);
 }
 
-void OGRCompoundCurve::set3D(OGRBoolean bIs3D)
+bool OGRCompoundCurve::set3D(OGRBoolean bIs3D)
 {
-    oCC.set3D(this, bIs3D);
+    return oCC.set3D(this, bIs3D);
 }
 
-void OGRCompoundCurve::setMeasured(OGRBoolean bIsMeasured)
+bool OGRCompoundCurve::setMeasured(OGRBoolean bIsMeasured)
 {
-    oCC.setMeasured(this, bIsMeasured);
+    return oCC.setMeasured(this, bIsMeasured);
 }
 
 /************************************************************************/
@@ -667,9 +635,9 @@ void OGRCompoundCurve::flattenTo2D()
 /*                              segmentize()                            */
 /************************************************************************/
 
-void OGRCompoundCurve::segmentize(double dfMaxLength)
+bool OGRCompoundCurve::segmentize(double dfMaxLength)
 {
-    oCC.segmentize(dfMaxLength);
+    return oCC.segmentize(dfMaxLength);
 }
 
 /************************************************************************/
@@ -946,11 +914,25 @@ double OGRCompoundCurve::get_GeodesicArea(
     if (!poSRSOverride)
         poSRSOverride = getSpatialReference();
 
-    OGRLineString *poLS = CurveToLine();
-    const double dfArea = poLS->get_GeodesicArea(poSRSOverride);
-    delete poLS;
+    auto poLS = std::unique_ptr<OGRLineString>(CurveToLine());
+    return poLS->get_GeodesicArea(poSRSOverride);
+}
 
-    return dfArea;
+/************************************************************************/
+/*                        get_GeodesicLength()                          */
+/************************************************************************/
+
+double OGRCompoundCurve::get_GeodesicLength(
+    const OGRSpatialReference *poSRSOverride) const
+{
+    if (IsEmpty())
+        return 0;
+
+    if (!poSRSOverride)
+        poSRSOverride = getSpatialReference();
+
+    auto poLS = std::unique_ptr<OGRLineString>(CurveToLine());
+    return poLS->get_GeodesicLength(poSRSOverride);
 }
 
 /************************************************************************/
@@ -970,3 +952,39 @@ double OGRCompoundCurve::get_AreaOfCurveSegments() const
     }
     return dfArea;
 }
+
+/************************************************************************/
+/*                           hasEmptyParts()                            */
+/************************************************************************/
+
+bool OGRCompoundCurve::hasEmptyParts() const
+{
+    return oCC.hasEmptyParts();
+}
+
+/************************************************************************/
+/*                          removeEmptyParts()                          */
+/************************************************************************/
+
+void OGRCompoundCurve::removeEmptyParts()
+{
+    oCC.removeEmptyParts();
+}
+
+/************************************************************************/
+/*                           reversePoints()                            */
+/************************************************************************/
+
+/**
+ * \brief Reverse point order.
+ *
+ * This method updates the points in this curve in place
+ * reversing the point ordering (first for last, etc) and component ordering.
+ *
+ * @since 3.10
+ */
+void OGRCompoundCurve::reversePoints()
+
+{
+    oCC.reversePoints();
+}
diff --git a/ogr/ogrct.cpp b/ogr/ogrct.cpp
index e1fd09e67a4b..621a2f69f607 100644
--- a/ogr/ogrct.cpp
+++ b/ogr/ogrct.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2000, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -37,6 +21,7 @@
 #include <limits>
 #include <list>
 #include <mutex>
+#include <thread>
 
 #include "cpl_conv.h"
 #include "cpl_error.h"
@@ -765,6 +750,9 @@ class OGRProjCT : public OGRCoordinateTransformation
 
     double dfThreshold = 0.0;
 
+    PJ_CONTEXT *m_psLastContext = nullptr;
+    std::thread::id m_nLastContextThreadId{};
+
     PjPtr m_pj{};
     bool m_bReversePj = false;
 
@@ -1277,9 +1265,10 @@ OGRProjCT::OGRProjCT(const OGRProjCT &other)
       m_osTargetSRS(other.m_osTargetSRS),
       bWebMercatorToWGS84LongLat(other.bWebMercatorToWGS84LongLat),
       nErrorCount(other.nErrorCount), dfThreshold(other.dfThreshold),
-      m_pj(other.m_pj), m_bReversePj(other.m_bReversePj),
-      m_bEmitErrors(other.m_bEmitErrors), bNoTransform(other.bNoTransform),
-      m_eStrategy(other.m_eStrategy),
+      m_psLastContext(nullptr),
+      m_nLastContextThreadId(std::this_thread::get_id()), m_pj(other.m_pj),
+      m_bReversePj(other.m_bReversePj), m_bEmitErrors(other.m_bEmitErrors),
+      bNoTransform(other.bNoTransform), m_eStrategy(other.m_eStrategy),
       m_oTransformations(other.m_oTransformations),
       m_iCurTransformation(other.m_iCurTransformation),
       m_options(other.m_options)
@@ -1684,7 +1673,7 @@ int OGRProjCT::Initialize(const OGRSpatialReference *poSourceIn,
             CPLStringList aosOptions;
             if (options.d->dfAccuracy >= 0)
                 aosOptions.SetNameValue(
-                    "ACCURACY", CPLSPrintf("%.18g", options.d->dfAccuracy));
+                    "ACCURACY", CPLSPrintf("%.17g", options.d->dfAccuracy));
             if (!options.d->bAllowBallpark)
                 aosOptions.SetNameValue("ALLOW_BALLPARK", "NO");
 #if PROJ_VERSION_MAJOR > 9 ||                                                  \
@@ -2232,6 +2221,18 @@ int OGRCoordinateTransformation::TransformWithErrorCodes(size_t nCount,
                                                          int *panErrorCodes)
 
 {
+    if (nCount == 1)
+    {
+        int nSuccess = 0;
+        const bool bOverallSuccess =
+            CPL_TO_BOOL(Transform(nCount, x, y, z, t, &nSuccess));
+        if (panErrorCodes)
+        {
+            panErrorCodes[0] = nSuccess ? 0 : -1;
+        }
+        return bOverallSuccess;
+    }
+
     std::vector<int> abSuccess;
     try
     {
@@ -2532,7 +2533,15 @@ int OGRProjCT::TransformWithErrorCodes(size_t nCount, double *x, double *y,
     /*      Select dynamically the best transformation for the data, if     */
     /*      needed.                                                         */
     /* -------------------------------------------------------------------- */
-    auto ctx = OSRGetProjTLSContext();
+    PJ_CONTEXT *ctx = m_psLastContext;
+    const auto nThisThreadId = std::this_thread::get_id();
+    if (!ctx || nThisThreadId != m_nLastContextThreadId)
+    {
+        m_nLastContextThreadId = nThisThreadId;
+        m_psLastContext = OSRGetProjTLSContext();
+        ctx = m_psLastContext;
+    }
+
     PJ *pj = m_pj;
     if (!bTransformDone && !pj)
     {
@@ -2705,6 +2714,13 @@ int OGRProjCT::TransformWithErrorCodes(size_t nCount, double *x, double *y,
             coord.xyzt.t = t ? t[i] : dfDefaultTime;
             proj_errno_reset(pj);
             coord = proj_trans(pj, m_bReversePj ? PJ_INV : PJ_FWD, coord);
+#if 0
+            CPLDebug("OGRCT",
+                     "Transforming (x=%f,y=%f,z=%f,time=%f) to "
+                     "(x=%f,y=%f,z=%f,time=%f)",
+                     x[i], y[i], z ? z[i] : 0, t ? t[i] : dfDefaultTime,
+                     coord.xyzt.x, coord.xyzt.y, coord.xyzt.z, coord.xyzt.t);
+#endif
             x[i] = coord.xyzt.x;
             y[i] = coord.xyzt.y;
             if (z)
diff --git a/ogr/ogrcurve.cpp b/ogr/ogrcurve.cpp
index b12b146cec1b..4e8b7d77f255 100644
--- a/ogr/ogrcurve.cpp
+++ b/ogr/ogrcurve.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_geometry.h"
@@ -31,24 +15,6 @@
 
 //! @cond Doxygen_Suppress
 
-/************************************************************************/
-/*                                OGRCurve()                            */
-/************************************************************************/
-
-OGRCurve::OGRCurve() = default;
-
-/************************************************************************/
-/*                               ~OGRCurve()                            */
-/************************************************************************/
-
-OGRCurve::~OGRCurve() = default;
-
-/************************************************************************/
-/*                       OGRCurve( const OGRCurve& )                    */
-/************************************************************************/
-
-OGRCurve::OGRCurve(const OGRCurve &) = default;
-
 /************************************************************************/
 /*                       operator=( const OGRCurve& )                   */
 /************************************************************************/
@@ -140,6 +106,38 @@ int OGRCurve::get_IsClosed() const
  *
  * @return the length of the curve, zero if the curve hasn't been
  * initialized.
+ *
+ * @see get_GeodesicLength() for an alternative method returning lengths
+ * computed on the ellipsoid, and in meters.
+ */
+
+/**
+ * \fn double OGRCurve::get_GeodesicLength(const OGRSpatialReference* poSRSOverride = nullptr) const;
+ *
+ * \brief Get the length of the curve, considered as a geodesic line on the
+ * underlying ellipsoid of the SRS attached to the geometry.
+ *
+ * The returned length will always be in meters.
+ *
+ * <a href="https://geographiclib.sourceforge.io/html/python/geodesics.html">Geodesics</a>
+ * follow the shortest route on the surface of the ellipsoid.
+ *
+ * If the geometry' SRS is not a geographic one, geometries are reprojected to
+ * the underlying geographic SRS of the geometry' SRS.
+ * OGRSpatialReference::GetDataAxisToSRSAxisMapping() is honored.
+ *
+ * Note that geometries with circular arcs will be linearized in their original
+ * coordinate space first, so the resulting geodesic length will be an
+ * approximation.
+ *
+ * @param poSRSOverride If not null, overrides OGRGeometry::getSpatialReference()
+ * @return the length of the geometry in meters, or a negative value in case
+ * of error.
+ *
+ * @see get_Length() for an alternative method returning areas computed in
+ * 2D Cartesian space.
+ *
+ * @since GDAL 3.10
  */
 
 /**
@@ -248,7 +246,7 @@ int OGRCurve::get_IsClosed() const
  * system in use.
  *
  * @see get_GeodesicArea() for an alternative method returning areas
- * computed on the ellipsoid, an in square meters.
+ * computed on the ellipsoid, and in square meters.
  *
  * @since GDAL 2.0
  */
@@ -264,6 +262,13 @@ int OGRCurve::get_IsClosed() const
  * The returned area will always be in square meters, and assumes that
  * polygon edges describe geodesic lines on the ellipsoid.
  *
+ * <a href="https://geographiclib.sourceforge.io/html/python/geodesics.html">Geodesics</a>
+ * follow the shortest route on the surface of the ellipsoid.
+ *
+ * If the geometry' SRS is not a geographic one, geometries are reprojected to
+ * the underlying geographic SRS of the geometry' SRS.
+ * OGRSpatialReference::GetDataAxisToSRSAxisMapping() is honored.
+ *
  * Note that geometries with circular arcs will be linearized in their original
  * coordinate space first, so the resulting geodesic area will be an
  * approximation.
@@ -854,3 +859,15 @@ int OGRCurve::isClockwise() const
 
     return dfSum < 0;
 }
+
+/**
+ * \fn void OGRCurve::reversePoints();
+ *
+ * \brief Reverse point order.
+ *
+ * This method updates the points in this curve in place
+ * reversing the point ordering (first for last, etc) and component ordering
+ * for a compound curve.
+ *
+ * @since 3.10
+ */
diff --git a/ogr/ogrcurvecollection.cpp b/ogr/ogrcurvecollection.cpp
index 9a3bd3f6dcc8..83f3ae2e063a 100644
--- a/ogr/ogrcurvecollection.cpp
+++ b/ogr/ogrcurvecollection.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -31,6 +15,7 @@
 
 #include <cstddef>
 #include <cstring>
+#include <limits>
 #include <new>
 
 #include "ogr_core.h"
@@ -43,12 +28,6 @@
 
 //! @cond Doxygen_Suppress
 
-/************************************************************************/
-/*                         OGRCurveCollection()                         */
-/************************************************************************/
-
-OGRCurveCollection::OGRCurveCollection() = default;
-
 /************************************************************************/
 /*             OGRCurveCollection( const OGRCurveCollection& )          */
 /************************************************************************/
@@ -155,6 +134,21 @@ OGRErr OGRCurveCollection::addCurveDirectly(OGRGeometry *poGeom,
 
     if (bNeedRealloc)
     {
+#if SIZEOF_VOIDP < 8
+        if (nCurveCount == std::numeric_limits<int>::max() /
+                               static_cast<int>(sizeof(OGRCurve *)))
+        {
+            CPLError(CE_Failure, CPLE_OutOfMemory, "Too many subgeometries");
+            return OGRERR_FAILURE;
+        }
+#else
+        if (nCurveCount == std::numeric_limits<int>::max())
+        {
+            CPLError(CE_Failure, CPLE_AppDefined, "Too many subgeometries");
+            return OGRERR_FAILURE;
+        }
+#endif
+
         OGRCurve **papoNewCurves = static_cast<OGRCurve **>(VSI_REALLOC_VERBOSE(
             papoCurves, sizeof(OGRCurve *) * (nCurveCount + 1)));
         if (papoNewCurves == nullptr)
@@ -526,36 +520,39 @@ OGRBoolean OGRCurveCollection::Equals(const OGRCurveCollection *poOCC) const
 /*                       setCoordinateDimension()                       */
 /************************************************************************/
 
-void OGRCurveCollection::setCoordinateDimension(OGRGeometry *poGeom,
+bool OGRCurveCollection::setCoordinateDimension(OGRGeometry *poGeom,
                                                 int nNewDimension)
 {
     for (auto &&poSubGeom : *this)
     {
-        poSubGeom->setCoordinateDimension(nNewDimension);
+        if (!poSubGeom->setCoordinateDimension(nNewDimension))
+            return false;
     }
 
-    poGeom->OGRGeometry::setCoordinateDimension(nNewDimension);
+    return poGeom->OGRGeometry::setCoordinateDimension(nNewDimension);
 }
 
-void OGRCurveCollection::set3D(OGRGeometry *poGeom, OGRBoolean bIs3D)
+bool OGRCurveCollection::set3D(OGRGeometry *poGeom, OGRBoolean bIs3D)
 {
     for (auto &&poSubGeom : *this)
     {
-        poSubGeom->set3D(bIs3D);
+        if (!poSubGeom->set3D(bIs3D))
+            return false;
     }
 
-    poGeom->OGRGeometry::set3D(bIs3D);
+    return poGeom->OGRGeometry::set3D(bIs3D);
 }
 
-void OGRCurveCollection::setMeasured(OGRGeometry *poGeom,
+bool OGRCurveCollection::setMeasured(OGRGeometry *poGeom,
                                      OGRBoolean bIsMeasured)
 {
     for (auto &&poSubGeom : *this)
     {
-        poSubGeom->setMeasured(bIsMeasured);
+        if (!poSubGeom->setMeasured(bIsMeasured))
+            return false;
     }
 
-    poGeom->OGRGeometry::setMeasured(bIsMeasured);
+    return poGeom->OGRGeometry::setMeasured(bIsMeasured);
 }
 
 /************************************************************************/
@@ -669,12 +666,14 @@ void OGRCurveCollection::flattenTo2D(OGRGeometry *poGeom)
 /*                              segmentize()                            */
 /************************************************************************/
 
-void OGRCurveCollection::segmentize(double dfMaxLength)
+bool OGRCurveCollection::segmentize(double dfMaxLength)
 {
     for (auto &&poSubGeom : *this)
     {
-        poSubGeom->segmentize(dfMaxLength);
+        if (!poSubGeom->segmentize(dfMaxLength))
+            return false;
     }
+    return true;
 }
 
 /************************************************************************/
@@ -749,4 +748,71 @@ OGRErr OGRCurveCollection::removeCurve(int iIndex, bool bDelete)
     return OGRERR_NONE;
 }
 
+/************************************************************************/
+/*                           hasEmptyParts()                            */
+/************************************************************************/
+
+/**
+ * \brief Returns whether a geometry has empty parts/rings.
+ *
+ * Returns true if removeEmptyParts() will modify the geometry.
+ *
+ * This is different from IsEmpty().
+ *
+ * @since GDAL 3.10
+ */
+bool OGRCurveCollection::hasEmptyParts() const
+{
+    for (int i = 0; i < nCurveCount; ++i)
+    {
+        if (papoCurves[i]->IsEmpty() || papoCurves[i]->hasEmptyParts())
+            return true;
+    }
+    return false;
+}
+
+/************************************************************************/
+/*                          removeEmptyParts()                          */
+/************************************************************************/
+
+/**
+ * \brief Remove empty parts/rings from this geometry.
+ *
+ * @since GDAL 3.10
+ */
+void OGRCurveCollection::removeEmptyParts()
+{
+    for (int i = nCurveCount - 1; i >= 0; --i)
+    {
+        papoCurves[i]->removeEmptyParts();
+        if (papoCurves[i]->IsEmpty())
+            removeCurve(i, true);
+    }
+}
+
+/************************************************************************/
+/*                           reversePoints()                            */
+/************************************************************************/
+
+/**
+ * \brief Reverse point order.
+ *
+ * This method updates the points in this curve in place
+ * reversing the point ordering (first for last, etc) and component ordering.
+ *
+ * @since 3.10
+ */
+void OGRCurveCollection::reversePoints()
+
+{
+    for (int i = 0; i < nCurveCount / 2; ++i)
+    {
+        std::swap(papoCurves[i], papoCurves[nCurveCount - 1 - i]);
+    }
+    for (int i = 0; i < nCurveCount; ++i)
+    {
+        papoCurves[i]->reversePoints();
+    }
+}
+
 //! @endcond
diff --git a/ogr/ogrcurvepolygon.cpp b/ogr/ogrcurvepolygon.cpp
index 4f67d20196c7..c88956d1e1c4 100644
--- a/ogr/ogrcurvepolygon.cpp
+++ b/ogr/ogrcurvepolygon.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -39,16 +23,6 @@
 #include "ogr_p.h"
 #include "ogr_spatialref.h"
 
-/************************************************************************/
-/*                            OGRCurvePolygon()                         */
-/************************************************************************/
-
-/**
- * \brief Create an empty curve polygon.
- */
-
-OGRCurvePolygon::OGRCurvePolygon() = default;
-
 /************************************************************************/
 /*               OGRCurvePolygon( const OGRCurvePolygon& )              */
 /************************************************************************/
@@ -64,12 +38,6 @@ OGRCurvePolygon::OGRCurvePolygon() = default;
 
 OGRCurvePolygon::OGRCurvePolygon(const OGRCurvePolygon &) = default;
 
-/************************************************************************/
-/*                           ~OGRCurvePolygon()                         */
-/************************************************************************/
-
-OGRCurvePolygon::~OGRCurvePolygon() = default;
-
 /************************************************************************/
 /*                 operator=( const OGRCurvePolygon&)                  */
 /************************************************************************/
@@ -89,6 +57,17 @@ OGRCurvePolygon &OGRCurvePolygon::operator=(const OGRCurvePolygon &other)
     {
         OGRSurface::operator=(other);
 
+        for (const auto *poRing : other.oCC)
+        {
+            if (!isRingCorrectType(poRing))
+            {
+                CPLError(CE_Failure, CPLE_AppDefined,
+                         "Illegal use of OGRCurvePolygon::operator=(): "
+                         "trying to assign an incompatible sub-geometry");
+                return *this;
+            }
+        }
+
         oCC = other.oCC;
     }
     return *this;
@@ -342,7 +321,7 @@ OGRErr OGRCurvePolygon::removeRing(int iIndex, bool bDelete)
  * @return OGRERR_NONE in case of success
  */
 
-OGRErr OGRCurvePolygon::addRing(OGRCurve *poNewRing)
+OGRErr OGRCurvePolygon::addRing(const OGRCurve *poNewRing)
 
 {
     OGRCurve *poNewRingCloned = poNewRing->clone();
@@ -352,12 +331,26 @@ OGRErr OGRCurvePolygon::addRing(OGRCurve *poNewRing)
     return eErr;
 }
 
+/************************************************************************/
+/*                            isRingCorrectType()                       */
+/************************************************************************/
+bool OGRCurvePolygon::isRingCorrectType(const OGRCurve *poRing) const
+{
+    return poRing && !EQUAL(poRing->getGeometryName(), "LINEARRING");
+}
+
 /************************************************************************/
 /*                            checkRing()                               */
 /************************************************************************/
 
-int OGRCurvePolygon::checkRing(OGRCurve *poNewRing) const
+bool OGRCurvePolygon::checkRing(const OGRCurve *poNewRing) const
 {
+    if (!isRingCorrectType(poNewRing))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Linearring not allowed.");
+        return false;
+    }
+
     if (!poNewRing->IsEmpty() && !poNewRing->get_IsClosed())
     {
         // This configuration option name must be the same as in
@@ -367,7 +360,7 @@ int OGRCurvePolygon::checkRing(OGRCurve *poNewRing) const
         if (pszEnvVar != nullptr && !CPLTestBool(pszEnvVar))
         {
             CPLError(CE_Failure, CPLE_AppDefined, "Non closed ring detected.");
-            return FALSE;
+            return false;
         }
         else
         {
@@ -384,17 +377,11 @@ int OGRCurvePolygon::checkRing(OGRCurve *poNewRing) const
     {
         if (poNewRing->getNumPoints() < 4)
         {
-            return FALSE;
-        }
-
-        if (EQUAL(poNewRing->getGeometryName(), "LINEARRING"))
-        {
-            CPLError(CE_Failure, CPLE_AppDefined, "Linearring not allowed.");
-            return FALSE;
+            return false;
         }
     }
 
-    return TRUE;
+    return true;
 }
 
 /************************************************************************/
@@ -683,6 +670,45 @@ OGRErr OGRCurvePolygon::transform(OGRCoordinateTransformation *poCT)
     return oCC.transform(this, poCT);
 }
 
+/************************************************************************/
+/*                              get_Length()                            */
+/************************************************************************/
+
+double OGRCurvePolygon::get_Length() const
+
+{
+    double dfLength = 0.0;
+    for (const auto &poCurve : *this)
+    {
+        dfLength += poCurve->get_Length();
+    }
+
+    return dfLength;
+}
+
+/************************************************************************/
+/*                        get_GeodesicLength()                          */
+/************************************************************************/
+
+double OGRCurvePolygon::get_GeodesicLength(
+    const OGRSpatialReference *poSRSOverride) const
+
+{
+    if (!poSRSOverride)
+        poSRSOverride = getSpatialReference();
+
+    double dfLength = 0.0;
+    for (const auto &poCurve : *this)
+    {
+        const double dfLocalLength = poCurve->get_GeodesicLength(poSRSOverride);
+        if (dfLocalLength < 0)
+            return dfLocalLength;
+        dfLength += dfLocalLength;
+    }
+
+    return dfLength;
+}
+
 /************************************************************************/
 /*                              get_Area()                              */
 /************************************************************************/
@@ -734,20 +760,20 @@ double OGRCurvePolygon::get_GeodesicArea(
 /*                       setCoordinateDimension()                       */
 /************************************************************************/
 
-void OGRCurvePolygon::setCoordinateDimension(int nNewDimension)
+bool OGRCurvePolygon::setCoordinateDimension(int nNewDimension)
 
 {
-    oCC.setCoordinateDimension(this, nNewDimension);
+    return oCC.setCoordinateDimension(this, nNewDimension);
 }
 
-void OGRCurvePolygon::set3D(OGRBoolean bIs3D)
+bool OGRCurvePolygon::set3D(OGRBoolean bIs3D)
 {
-    oCC.set3D(this, bIs3D);
+    return oCC.set3D(this, bIs3D);
 }
 
-void OGRCurvePolygon::setMeasured(OGRBoolean bIsMeasured)
+bool OGRCurvePolygon::setMeasured(OGRBoolean bIsMeasured)
 {
-    oCC.setMeasured(this, bIsMeasured);
+    return oCC.setMeasured(this, bIsMeasured);
 }
 
 /************************************************************************/
@@ -772,15 +798,15 @@ OGRBoolean OGRCurvePolygon::IsEmpty() const
 /*                              segmentize()                            */
 /************************************************************************/
 
-void OGRCurvePolygon::segmentize(double dfMaxLength)
+bool OGRCurvePolygon::segmentize(double dfMaxLength)
 {
     if (EQUAL(getGeometryName(), "TRIANGLE"))
     {
         CPLError(CE_Failure, CPLE_NotSupported,
                  "segmentize() is not valid for Triangle");
-        return;
+        return false;
     }
-    oCC.segmentize(dfMaxLength);
+    return oCC.segmentize(dfMaxLength);
 }
 
 /************************************************************************/
@@ -929,3 +955,25 @@ OGRSurfaceCasterToCurvePolygon OGRCurvePolygon::GetCasterToCurvePolygon() const
 }
 
 //! @endcond
+
+/************************************************************************/
+/*                           hasEmptyParts()                            */
+/************************************************************************/
+
+bool OGRCurvePolygon::hasEmptyParts() const
+{
+    return oCC.hasEmptyParts();
+}
+
+/************************************************************************/
+/*                          removeEmptyParts()                          */
+/************************************************************************/
+
+void OGRCurvePolygon::removeEmptyParts()
+{
+    auto poExteriorRing = getExteriorRingCurve();
+    if (poExteriorRing && poExteriorRing->IsEmpty())
+        empty();
+    else
+        oCC.removeEmptyParts();
+}
diff --git a/ogr/ogresrijsongeometry.cpp b/ogr/ogresrijsongeometry.cpp
new file mode 100644
index 000000000000..099acdce841d
--- /dev/null
+++ b/ogr/ogresrijsongeometry.cpp
@@ -0,0 +1,649 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+/*! @cond Doxygen_Suppress */
+
+#include "ogresrijsongeometry.h"
+
+#include "ogrlibjsonutils.h"
+
+#include "ogr_geometry.h"
+#include "ogr_spatialref.h"
+
+static OGRPoint *OGRESRIJSONReadPoint(json_object *poObj);
+static OGRGeometry *OGRESRIJSONReadLineString(json_object *poObj);
+static OGRGeometry *OGRESRIJSONReadPolygon(json_object *poObj);
+static OGRMultiPoint *OGRESRIJSONReadMultiPoint(json_object *poObj);
+
+/************************************************************************/
+/*                       OGRESRIJSONReadGeometry()                      */
+/************************************************************************/
+
+OGRGeometry *OGRESRIJSONReadGeometry(json_object *poObj)
+{
+    OGRGeometry *poGeometry = nullptr;
+
+    if (OGRGeoJSONFindMemberByName(poObj, "x"))
+        poGeometry = OGRESRIJSONReadPoint(poObj);
+    else if (OGRGeoJSONFindMemberByName(poObj, "paths"))
+        poGeometry = OGRESRIJSONReadLineString(poObj);
+    else if (OGRGeoJSONFindMemberByName(poObj, "rings"))
+        poGeometry = OGRESRIJSONReadPolygon(poObj);
+    else if (OGRGeoJSONFindMemberByName(poObj, "points"))
+        poGeometry = OGRESRIJSONReadMultiPoint(poObj);
+
+    return poGeometry;
+}
+
+/************************************************************************/
+/*                     OGR_G_CreateGeometryFromEsriJson()               */
+/************************************************************************/
+
+/** Create a OGR geometry from a ESRIJson geometry object */
+OGRGeometryH OGR_G_CreateGeometryFromEsriJson(const char *pszJson)
+{
+    if (nullptr == pszJson)
+    {
+        // Translation failed.
+        return nullptr;
+    }
+
+    json_object *poObj = nullptr;
+    if (!OGRJSonParse(pszJson, &poObj))
+        return nullptr;
+
+    OGRGeometry *poGeometry = OGRESRIJSONReadGeometry(poObj);
+
+    // Release JSON tree.
+    json_object_put(poObj);
+
+    return OGRGeometry::ToHandle(poGeometry);
+}
+
+/************************************************************************/
+/*                        OGRESRIJSONGetType()                          */
+/************************************************************************/
+
+OGRwkbGeometryType OGRESRIJSONGetGeometryType(json_object *poObj)
+{
+    if (nullptr == poObj)
+        return wkbUnknown;
+
+    json_object *poObjType = OGRGeoJSONFindMemberByName(poObj, "geometryType");
+    if (nullptr == poObjType)
+    {
+        return wkbNone;
+    }
+
+    const char *name = json_object_get_string(poObjType);
+    if (EQUAL(name, "esriGeometryPoint"))
+        return wkbPoint;
+    else if (EQUAL(name, "esriGeometryPolyline"))
+        return wkbLineString;
+    else if (EQUAL(name, "esriGeometryPolygon"))
+        return wkbPolygon;
+    else if (EQUAL(name, "esriGeometryMultiPoint"))
+        return wkbMultiPoint;
+    else
+        return wkbUnknown;
+}
+
+/************************************************************************/
+/*                     OGRESRIJSONGetCoordinateToDouble()               */
+/************************************************************************/
+
+static double OGRESRIJSONGetCoordinateToDouble(json_object *poObjCoord,
+                                               const char *pszCoordName,
+                                               bool &bValid)
+{
+    const int iType = json_object_get_type(poObjCoord);
+    if (json_type_double != iType && json_type_int != iType)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Invalid '%s' coordinate. "
+                 "Type is not double or integer for \'%s\'.",
+                 pszCoordName, json_object_to_json_string(poObjCoord));
+        bValid = false;
+        return 0.0;
+    }
+
+    return json_object_get_double(poObjCoord);
+}
+
+/************************************************************************/
+/*                       OGRESRIJSONGetCoordinate()                     */
+/************************************************************************/
+
+static double OGRESRIJSONGetCoordinate(json_object *poObj,
+                                       const char *pszCoordName, bool &bValid)
+{
+    json_object *poObjCoord = OGRGeoJSONFindMemberByName(poObj, pszCoordName);
+    if (nullptr == poObjCoord)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Invalid Point object. "
+                 "Missing '%s' member.",
+                 pszCoordName);
+        bValid = false;
+        return 0.0;
+    }
+
+    return OGRESRIJSONGetCoordinateToDouble(poObjCoord, pszCoordName, bValid);
+}
+
+/************************************************************************/
+/*                          OGRESRIJSONReadPoint()                      */
+/************************************************************************/
+
+OGRPoint *OGRESRIJSONReadPoint(json_object *poObj)
+{
+    CPLAssert(nullptr != poObj);
+
+    bool bValid = true;
+    const double dfX = OGRESRIJSONGetCoordinate(poObj, "x", bValid);
+    const double dfY = OGRESRIJSONGetCoordinate(poObj, "y", bValid);
+    if (!bValid)
+        return nullptr;
+
+    json_object *poObjZ = OGRGeoJSONFindMemberByName(poObj, "z");
+    if (nullptr == poObjZ)
+        return new OGRPoint(dfX, dfY);
+
+    const double dfZ = OGRESRIJSONGetCoordinateToDouble(poObjZ, "z", bValid);
+    if (!bValid)
+        return nullptr;
+    return new OGRPoint(dfX, dfY, dfZ);
+}
+
+/************************************************************************/
+/*                     OGRESRIJSONReaderParseZM()                      */
+/************************************************************************/
+
+static void OGRESRIJSONReaderParseZM(json_object *poObj, bool *bHasZ,
+                                     bool *bHasM)
+{
+    CPLAssert(nullptr != poObj);
+    // The ESRI geojson spec states that geometries other than point can
+    // have the attributes hasZ and hasM.  A geometry that has a z value
+    // implies the 3rd number in the tuple is z.  if hasM is true, but hasZ
+    // is not, it is the M value.
+    bool bZ = false;
+    json_object *poObjHasZ = OGRGeoJSONFindMemberByName(poObj, "hasZ");
+    if (poObjHasZ != nullptr)
+    {
+        if (json_object_get_type(poObjHasZ) == json_type_boolean)
+        {
+            bZ = CPL_TO_BOOL(json_object_get_boolean(poObjHasZ));
+        }
+    }
+
+    bool bM = false;
+    json_object *poObjHasM = OGRGeoJSONFindMemberByName(poObj, "hasM");
+    if (poObjHasM != nullptr)
+    {
+        if (json_object_get_type(poObjHasM) == json_type_boolean)
+        {
+            bM = CPL_TO_BOOL(json_object_get_boolean(poObjHasM));
+        }
+    }
+    if (bHasZ != nullptr)
+        *bHasZ = bZ;
+    if (bHasM != nullptr)
+        *bHasM = bM;
+}
+
+/************************************************************************/
+/*                     OGRESRIJSONReaderParseXYZMArray()                  */
+/************************************************************************/
+
+static bool OGRESRIJSONReaderParseXYZMArray(json_object *poObjCoords,
+                                            bool /*bHasZ*/, bool bHasM,
+                                            double *pdfX, double *pdfY,
+                                            double *pdfZ, double *pdfM,
+                                            int *pnNumCoords)
+{
+    if (poObjCoords == nullptr)
+    {
+        CPLDebug("ESRIJSON",
+                 "OGRESRIJSONReaderParseXYZMArray: got null object.");
+        return false;
+    }
+
+    if (json_type_array != json_object_get_type(poObjCoords))
+    {
+        CPLDebug("ESRIJSON",
+                 "OGRESRIJSONReaderParseXYZMArray: got non-array object.");
+        return false;
+    }
+
+    const auto coordDimension = json_object_array_length(poObjCoords);
+
+    // Allow 4 coordinates if M is present, but it is eventually ignored.
+    if (coordDimension < 2 || coordDimension > 4)
+    {
+        CPLDebug("ESRIJSON",
+                 "OGRESRIJSONReaderParseXYZMArray: got an unexpected "
+                 "array object.");
+        return false;
+    }
+
+    // Read X coordinate.
+    json_object *poObjCoord = json_object_array_get_idx(poObjCoords, 0);
+    if (poObjCoord == nullptr)
+    {
+        CPLDebug("ESRIJSON",
+                 "OGRESRIJSONReaderParseXYZMArray: got null object.");
+        return false;
+    }
+
+    bool bValid = true;
+    const double dfX =
+        OGRESRIJSONGetCoordinateToDouble(poObjCoord, "x", bValid);
+
+    // Read Y coordinate.
+    poObjCoord = json_object_array_get_idx(poObjCoords, 1);
+    if (poObjCoord == nullptr)
+    {
+        CPLDebug("ESRIJSON",
+                 "OGRESRIJSONReaderParseXYZMArray: got null object.");
+        return false;
+    }
+
+    const double dfY =
+        OGRESRIJSONGetCoordinateToDouble(poObjCoord, "y", bValid);
+    if (!bValid)
+        return false;
+
+    // Read Z or M or Z and M coordinates.
+    if (coordDimension > 2)
+    {
+        poObjCoord = json_object_array_get_idx(poObjCoords, 2);
+        if (poObjCoord == nullptr)
+        {
+            CPLDebug("ESRIJSON",
+                     "OGRESRIJSONReaderParseXYZMArray: got null object.");
+            return false;
+        }
+
+        const double dfZorM = OGRESRIJSONGetCoordinateToDouble(
+            poObjCoord, (coordDimension > 3 || !bHasM) ? "z" : "m", bValid);
+        if (!bValid)
+            return false;
+        if (pdfZ != nullptr)
+        {
+            if (coordDimension > 3 || !bHasM)
+                *pdfZ = dfZorM;
+            else
+                *pdfZ = 0.0;
+        }
+        if (pdfM != nullptr && coordDimension == 3)
+        {
+            if (bHasM)
+                *pdfM = dfZorM;
+            else
+                *pdfM = 0.0;
+        }
+        if (coordDimension == 4)
+        {
+            poObjCoord = json_object_array_get_idx(poObjCoords, 3);
+            if (poObjCoord == nullptr)
+            {
+                CPLDebug("ESRIJSON",
+                         "OGRESRIJSONReaderParseXYZMArray: got null object.");
+                return false;
+            }
+
+            const double dfM =
+                OGRESRIJSONGetCoordinateToDouble(poObjCoord, "m", bValid);
+            if (!bValid)
+                return false;
+            if (pdfM != nullptr)
+                *pdfM = dfM;
+        }
+    }
+    else
+    {
+        if (pdfZ != nullptr)
+            *pdfZ = 0.0;
+        if (pdfM != nullptr)
+            *pdfM = 0.0;
+    }
+
+    if (pnNumCoords != nullptr)
+        *pnNumCoords = static_cast<int>(coordDimension);
+    if (pdfX != nullptr)
+        *pdfX = dfX;
+    if (pdfY != nullptr)
+        *pdfY = dfY;
+
+    return true;
+}
+
+/************************************************************************/
+/*                        OGRESRIJSONReadLineString()                   */
+/************************************************************************/
+
+OGRGeometry *OGRESRIJSONReadLineString(json_object *poObj)
+{
+    CPLAssert(nullptr != poObj);
+
+    bool bHasZ = false;
+    bool bHasM = false;
+
+    OGRESRIJSONReaderParseZM(poObj, &bHasZ, &bHasM);
+
+    json_object *poObjPaths = OGRGeoJSONFindMemberByName(poObj, "paths");
+    if (nullptr == poObjPaths)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Invalid LineString object. "
+                 "Missing \'paths\' member.");
+        return nullptr;
+    }
+
+    if (json_type_array != json_object_get_type(poObjPaths))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Invalid LineString object. "
+                 "Invalid \'paths\' member.");
+        return nullptr;
+    }
+
+    OGRMultiLineString *poMLS = nullptr;
+    OGRGeometry *poRet = nullptr;
+    const auto nPaths = json_object_array_length(poObjPaths);
+    for (auto iPath = decltype(nPaths){0}; iPath < nPaths; iPath++)
+    {
+        json_object *poObjPath = json_object_array_get_idx(poObjPaths, iPath);
+        if (poObjPath == nullptr ||
+            json_type_array != json_object_get_type(poObjPath))
+        {
+            delete poRet;
+            CPLDebug("ESRIJSON", "LineString: got non-array object.");
+            return nullptr;
+        }
+
+        OGRLineString *poLine = new OGRLineString();
+        if (nPaths > 1)
+        {
+            if (iPath == 0)
+            {
+                poMLS = new OGRMultiLineString();
+                poRet = poMLS;
+            }
+            poMLS->addGeometryDirectly(poLine);
+        }
+        else
+        {
+            poRet = poLine;
+        }
+        const auto nPoints = json_object_array_length(poObjPath);
+        for (auto i = decltype(nPoints){0}; i < nPoints; i++)
+        {
+            int nNumCoords = 2;
+            json_object *poObjCoords = json_object_array_get_idx(poObjPath, i);
+            double dfX = 0.0;
+            double dfY = 0.0;
+            double dfZ = 0.0;
+            double dfM = 0.0;
+            if (!OGRESRIJSONReaderParseXYZMArray(poObjCoords, bHasZ, bHasM,
+                                                 &dfX, &dfY, &dfZ, &dfM,
+                                                 &nNumCoords))
+            {
+                delete poRet;
+                return nullptr;
+            }
+
+            if (nNumCoords == 3 && !bHasM)
+            {
+                poLine->addPoint(dfX, dfY, dfZ);
+            }
+            else if (nNumCoords == 3)
+            {
+                poLine->addPointM(dfX, dfY, dfM);
+            }
+            else if (nNumCoords == 4)
+            {
+                poLine->addPoint(dfX, dfY, dfZ, dfM);
+            }
+            else
+            {
+                poLine->addPoint(dfX, dfY);
+            }
+        }
+    }
+
+    if (poRet == nullptr)
+        poRet = new OGRLineString();
+
+    return poRet;
+}
+
+/************************************************************************/
+/*                          OGRESRIJSONReadPolygon()                    */
+/************************************************************************/
+
+OGRGeometry *OGRESRIJSONReadPolygon(json_object *poObj)
+{
+    CPLAssert(nullptr != poObj);
+
+    bool bHasZ = false;
+    bool bHasM = false;
+
+    OGRESRIJSONReaderParseZM(poObj, &bHasZ, &bHasM);
+
+    json_object *poObjRings = OGRGeoJSONFindMemberByName(poObj, "rings");
+    if (nullptr == poObjRings)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Invalid Polygon object. "
+                 "Missing \'rings\' member.");
+        return nullptr;
+    }
+
+    if (json_type_array != json_object_get_type(poObjRings))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Invalid Polygon object. "
+                 "Invalid \'rings\' member.");
+        return nullptr;
+    }
+
+    const auto nRings = json_object_array_length(poObjRings);
+    OGRGeometry **papoGeoms = new OGRGeometry *[nRings];
+    for (auto iRing = decltype(nRings){0}; iRing < nRings; iRing++)
+    {
+        json_object *poObjRing = json_object_array_get_idx(poObjRings, iRing);
+        if (poObjRing == nullptr ||
+            json_type_array != json_object_get_type(poObjRing))
+        {
+            for (auto j = decltype(iRing){0}; j < iRing; j++)
+                delete papoGeoms[j];
+            delete[] papoGeoms;
+            CPLDebug("ESRIJSON", "Polygon: got non-array object.");
+            return nullptr;
+        }
+
+        OGRPolygon *poPoly = new OGRPolygon();
+        auto poLine = std::make_unique<OGRLinearRing>();
+        papoGeoms[iRing] = poPoly;
+
+        const auto nPoints = json_object_array_length(poObjRing);
+        for (auto i = decltype(nPoints){0}; i < nPoints; i++)
+        {
+            int nNumCoords = 2;
+            json_object *poObjCoords = json_object_array_get_idx(poObjRing, i);
+            double dfX = 0.0;
+            double dfY = 0.0;
+            double dfZ = 0.0;
+            double dfM = 0.0;
+            if (!OGRESRIJSONReaderParseXYZMArray(poObjCoords, bHasZ, bHasM,
+                                                 &dfX, &dfY, &dfZ, &dfM,
+                                                 &nNumCoords))
+            {
+                for (auto j = decltype(iRing){0}; j <= iRing; j++)
+                    delete papoGeoms[j];
+                delete[] papoGeoms;
+                return nullptr;
+            }
+
+            if (nNumCoords == 3 && !bHasM)
+            {
+                poLine->addPoint(dfX, dfY, dfZ);
+            }
+            else if (nNumCoords == 3)
+            {
+                poLine->addPointM(dfX, dfY, dfM);
+            }
+            else if (nNumCoords == 4)
+            {
+                poLine->addPoint(dfX, dfY, dfZ, dfM);
+            }
+            else
+            {
+                poLine->addPoint(dfX, dfY);
+            }
+        }
+        poPoly->addRingDirectly(poLine.release());
+    }
+
+    OGRGeometry *poRet = OGRGeometryFactory::organizePolygons(
+        papoGeoms, static_cast<int>(nRings), nullptr, nullptr);
+    delete[] papoGeoms;
+
+    return poRet;
+}
+
+/************************************************************************/
+/*                        OGRESRIJSONReadMultiPoint()                   */
+/************************************************************************/
+
+OGRMultiPoint *OGRESRIJSONReadMultiPoint(json_object *poObj)
+{
+    CPLAssert(nullptr != poObj);
+
+    bool bHasZ = false;
+    bool bHasM = false;
+
+    OGRESRIJSONReaderParseZM(poObj, &bHasZ, &bHasM);
+
+    json_object *poObjPoints = OGRGeoJSONFindMemberByName(poObj, "points");
+    if (nullptr == poObjPoints)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Invalid MultiPoint object. "
+                 "Missing \'points\' member.");
+        return nullptr;
+    }
+
+    if (json_type_array != json_object_get_type(poObjPoints))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Invalid MultiPoint object. "
+                 "Invalid \'points\' member.");
+        return nullptr;
+    }
+
+    OGRMultiPoint *poMulti = new OGRMultiPoint();
+
+    const auto nPoints = json_object_array_length(poObjPoints);
+    for (auto i = decltype(nPoints){0}; i < nPoints; i++)
+    {
+        int nNumCoords = 2;
+        json_object *poObjCoords = json_object_array_get_idx(poObjPoints, i);
+        double dfX = 0.0;
+        double dfY = 0.0;
+        double dfZ = 0.0;
+        double dfM = 0.0;
+        if (!OGRESRIJSONReaderParseXYZMArray(poObjCoords, bHasZ, bHasM, &dfX,
+                                             &dfY, &dfZ, &dfM, &nNumCoords))
+        {
+            delete poMulti;
+            return nullptr;
+        }
+
+        if (nNumCoords == 3 && !bHasM)
+        {
+            poMulti->addGeometryDirectly(new OGRPoint(dfX, dfY, dfZ));
+        }
+        else if (nNumCoords == 3)
+        {
+            OGRPoint *poPoint = new OGRPoint(dfX, dfY);
+            poPoint->setM(dfM);
+            poMulti->addGeometryDirectly(poPoint);
+        }
+        else if (nNumCoords == 4)
+        {
+            poMulti->addGeometryDirectly(new OGRPoint(dfX, dfY, dfZ, dfM));
+        }
+        else
+        {
+            poMulti->addGeometryDirectly(new OGRPoint(dfX, dfY));
+        }
+    }
+
+    return poMulti;
+}
+
+/************************************************************************/
+/*                    OGRESRIJSONReadSpatialReference()                 */
+/************************************************************************/
+
+OGRSpatialReference *OGRESRIJSONReadSpatialReference(json_object *poObj)
+{
+    /* -------------------------------------------------------------------- */
+    /*      Read spatial reference definition.                              */
+    /* -------------------------------------------------------------------- */
+    OGRSpatialReference *poSRS = nullptr;
+
+    json_object *poObjSrs =
+        OGRGeoJSONFindMemberByName(poObj, "spatialReference");
+    if (nullptr != poObjSrs)
+    {
+        json_object *poObjWkid =
+            OGRGeoJSONFindMemberByName(poObjSrs, "latestWkid");
+        if (poObjWkid == nullptr)
+            poObjWkid = OGRGeoJSONFindMemberByName(poObjSrs, "wkid");
+        if (poObjWkid == nullptr)
+        {
+            json_object *poObjWkt = OGRGeoJSONFindMemberByName(poObjSrs, "wkt");
+            if (poObjWkt == nullptr)
+                return nullptr;
+
+            const char *pszWKT = json_object_get_string(poObjWkt);
+            poSRS = new OGRSpatialReference();
+            poSRS->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+            if (OGRERR_NONE != poSRS->importFromWkt(pszWKT))
+            {
+                delete poSRS;
+                poSRS = nullptr;
+            }
+            else
+            {
+                auto poSRSMatch = poSRS->FindBestMatch(70);
+                if (poSRSMatch)
+                {
+                    poSRS->Release();
+                    poSRS = poSRSMatch;
+                    poSRS->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+                }
+            }
+
+            return poSRS;
+        }
+
+        const int nEPSG = json_object_get_int(poObjWkid);
+
+        poSRS = new OGRSpatialReference();
+        poSRS->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+        if (OGRERR_NONE != poSRS->importFromEPSG(nEPSG))
+        {
+            delete poSRS;
+            poSRS = nullptr;
+        }
+    }
+
+    return poSRS;
+}
+
+/*! @endcond */
diff --git a/ogr/ogresrijsongeometry.h b/ogr/ogresrijsongeometry.h
new file mode 100644
index 000000000000..0468f9db4aa5
--- /dev/null
+++ b/ogr/ogresrijsongeometry.h
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#ifndef OGRESRIJSONGEOMETRY_H_INCLUDED
+#define OGRESRIJSONGEOMETRY_H_INCLUDED
+
+/*! @cond Doxygen_Suppress */
+
+#include "cpl_port.h"
+#include "cpl_json_header.h"
+
+#include "ogr_api.h"
+
+class OGRGeometry;
+class OGRPoint;
+class OGRMultiPoint;
+class OGRSpatialReference;
+
+OGRGeometry CPL_DLL *OGRESRIJSONReadGeometry(json_object *poObj);
+OGRSpatialReference CPL_DLL *
+OGRESRIJSONReadSpatialReference(json_object *poObj);
+OGRwkbGeometryType CPL_DLL OGRESRIJSONGetGeometryType(json_object *poObj);
+
+/*! @endcond */
+
+#endif
diff --git a/ogr/ogrfeature.cpp b/ogr/ogrfeature.cpp
index 7f8fd5d588cf..426e9b398600 100644
--- a/ogr/ogrfeature.cpp
+++ b/ogr/ogrfeature.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999,  Les Technologies SoftMap Inc.
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -32,6 +16,7 @@
 #include "ogr_feature.h"
 
 #include <cerrno>
+#include <cinttypes>
 #include <climits>
 #include <cstdio>
 #include <cstdlib>
@@ -54,7 +39,7 @@
 #include "ogr_featurestyle.h"
 #include "ogr_geometry.h"
 #include "ogr_p.h"
-#include "ogrgeojsonreader.h"
+#include "ogrlibjsonutils.h"
 
 #include "cpl_json_header.h"
 
@@ -146,10 +131,12 @@ OGRFeature::~OGRFeature()
 {
     if (pauFields != nullptr)
     {
-        const int nFieldcount = poDefn->GetFieldCount();
+        // We can call GetFieldCountUnsafe() as the constructor has called
+        // the regular GetFieldCount()
+        const int nFieldcount = poDefn->GetFieldCountUnsafe();
         for (int i = 0; i < nFieldcount; i++)
         {
-            OGRFieldDefn *poFDefn = poDefn->GetFieldDefn(i);
+            const OGRFieldDefn *poFDefn = poDefn->GetFieldDefnUnsafe(i);
 
             if (!IsFieldSetAndNotNullUnsafe(i))
                 continue;
@@ -254,7 +241,8 @@ OGRFeature *OGRFeature::CreateFeature(OGRFeatureDefn *poDefn)
     if (poFeature == nullptr)
         return nullptr;
 
-    if ((poFeature->pauFields == nullptr && poDefn->GetFieldCount() != 0) ||
+    if ((poFeature->pauFields == nullptr &&
+         poDefn->GetFieldCountUnsafe() != 0) ||
         (poFeature->papoGeometries == nullptr &&
          poDefn->GetGeomFieldCount() != 0))
     {
@@ -311,7 +299,7 @@ void OGRFeature::Reset()
             if (!IsFieldSetAndNotNullUnsafe(i))
                 continue;
 
-            OGRFieldDefn *poFDefn = poDefn->GetFieldDefn(i);
+            const OGRFieldDefn *poFDefn = poDefn->GetFieldDefnUnsafe(i);
             switch (poFDefn->GetType())
             {
                 case OFTString:
@@ -1139,7 +1127,8 @@ OGRFeatureH OGR_F_Clone(OGRFeatureH hFeat)
 
 bool OGRFeature::CopySelfTo(OGRFeature *poNew) const
 {
-    for (int i = 0; i < poDefn->GetFieldCount(); i++)
+    const int nFieldCount = poDefn->GetFieldCountUnsafe();
+    for (int i = 0; i < nFieldCount; i++)
     {
         if (!poNew->SetFieldInternal(i, pauFields + i))
         {
@@ -1505,7 +1494,7 @@ int OGR_F_GetGeomFieldIndex(OGRFeatureH hFeat, const char *pszName)
 int OGRFeature::IsFieldSet(int iField) const
 
 {
-    const int iSpecialField = iField - poDefn->GetFieldCount();
+    const int iSpecialField = iField - poDefn->GetFieldCountUnsafe();
     if (iSpecialField >= 0)
     {
         // Special field value accessors.
@@ -1658,7 +1647,7 @@ void OGR_F_UnsetField(OGRFeatureH hFeat, int iField)
 bool OGRFeature::IsFieldNull(int iField) const
 
 {
-    const int iSpecialField = iField - poDefn->GetFieldCount();
+    const int iSpecialField = iField - poDefn->GetFieldCountUnsafe();
     if (iSpecialField >= 0)
     {
         // FIXME?
@@ -1721,7 +1710,7 @@ int OGR_F_IsFieldNull(OGRFeatureH hFeat, int iField)
 bool OGRFeature::IsFieldSetAndNotNull(int iField) const
 
 {
-    const int iSpecialField = iField - poDefn->GetFieldCount();
+    const int iSpecialField = iField - poDefn->GetFieldCountUnsafe();
     if (iSpecialField >= 0)
     {
         return CPL_TO_BOOL(IsFieldSet(iField));
@@ -1997,7 +1986,7 @@ OGRField *OGR_F_GetRawFieldRef(OGRFeatureH hFeat, int iField)
 int OGRFeature::GetFieldAsInteger(int iField) const
 
 {
-    int iSpecialField = iField - poDefn->GetFieldCount();
+    int iSpecialField = iField - poDefn->GetFieldCountUnsafe();
     if (iSpecialField >= 0)
     {
         // Special field value accessors.
@@ -2009,12 +1998,13 @@ int OGRFeature::GetFieldAsInteger(int iField) const
                                  : nFID < INT_MIN ? INT_MIN
                                                   : static_cast<int>(nFID);
 
-                if (static_cast<GIntBig>(nVal) != nFID)
+                if (nVal != nFID)
                 {
-                    CPLError(
-                        CE_Warning, CPLE_AppDefined,
-                        "Integer overflow occurred when trying to return "
-                        "64bit integer. Use GetFieldAsInteger64() instead");
+                    CPLError(CE_Warning, CPLE_AppDefined,
+                             "Field %s.FID: Integer overflow occurred when "
+                             "trying to return 64 bit integer %" PRId64
+                             ". Use GetFieldAsInteger64() instead",
+                             poDefn->GetName(), static_cast<int64_t>(nVal));
                 }
                 return nVal;
             }
@@ -2030,7 +2020,7 @@ int OGRFeature::GetFieldAsInteger(int iField) const
         }
     }
 
-    OGRFieldDefn *poFDefn = poDefn->GetFieldDefn(iField);
+    const OGRFieldDefn *poFDefn = poDefn->GetFieldDefn(iField);
 
     if (poFDefn == nullptr)
         return 0;
@@ -2050,11 +2040,14 @@ int OGRFeature::GetFieldAsInteger(int iField) const
                          : nVal64 < INT_MIN ? INT_MIN
                                             : static_cast<int>(nVal64);
 
-        if (static_cast<GIntBig>(nVal) != nVal64)
+        if (nVal != nVal64)
         {
             CPLError(CE_Warning, CPLE_AppDefined,
-                     "Integer overflow occurred when trying to return 64bit "
-                     "integer. Use GetFieldAsInteger64() instead");
+                     "Field %s.%s: Integer overflow occurred when trying to "
+                     "return 64 bit integer %" PRId64
+                     ". Use GetFieldAsInteger64() instead",
+                     poDefn->GetName(), poFDefn->GetNameRef(),
+                     static_cast<int64_t>(nVal64));
         }
         return nVal;
     }
@@ -2137,7 +2130,7 @@ int OGR_F_GetFieldAsInteger(OGRFeatureH hFeat, int iField)
 GIntBig OGRFeature::GetFieldAsInteger64(int iField) const
 
 {
-    const int iSpecialField = iField - poDefn->GetFieldCount();
+    const int iSpecialField = iField - poDefn->GetFieldCountUnsafe();
     if (iSpecialField >= 0)
     {
         // Special field value accessors.
@@ -2255,7 +2248,7 @@ GIntBig OGR_F_GetFieldAsInteger64(OGRFeatureH hFeat, int iField)
 double OGRFeature::GetFieldAsDouble(int iField) const
 
 {
-    const int iSpecialField = iField - poDefn->GetFieldCount();
+    const int iSpecialField = iField - poDefn->GetFieldCountUnsafe();
     if (iSpecialField >= 0)
     {
         // Special field value accessors.
@@ -2348,7 +2341,7 @@ static void OGRFeatureFormatDateTimeBuffer(char *szTempBuffer, size_t nMaxSize,
                     nYear, nMonth, nDay, nHour, nMinute, fSecond);
     else  // Default format.
     {
-        if (CPLIsNan(fSecond) || fSecond < 0.0 || fSecond > 62.0)
+        if (std::isnan(fSecond) || fSecond < 0.0 || fSecond > 62.0)
         {
             fSecond = 0.0;
             CPLError(CE_Failure, CPLE_NotSupported,
@@ -2442,7 +2435,7 @@ const char *OGRFeature::GetFieldAsString(int iField) const
     CPLFree(m_pszTmpFieldValue);
     m_pszTmpFieldValue = nullptr;
 
-    const int iSpecialField = iField - poDefn->GetFieldCount();
+    const int iSpecialField = iField - poDefn->GetFieldCountUnsafe();
     if (iSpecialField >= 0)
     {
         // Special field value accessors.
@@ -2598,7 +2591,7 @@ const char *OGRFeature::GetFieldAsString(int iField) const
         constexpr size_t MAX_SIZE = 12 + EXTRA_SPACE_TO_MAKE_GCC_HAPPY + 1;
         m_pszTmpFieldValue = static_cast<char *>(CPLMalloc(MAX_SIZE));
         const int ms = OGR_GET_MS(pauFields[iField].Date.Second);
-        if (ms != 0 || CPLIsNan(pauFields[iField].Date.Second))
+        if (ms != 0 || std::isnan(pauFields[iField].Date.Second))
             snprintf(m_pszTmpFieldValue, MAX_SIZE, "%02d:%02d:%06.3f",
                      pauFields[iField].Date.Hour, pauFields[iField].Date.Minute,
                      pauFields[iField].Date.Second);
@@ -2810,7 +2803,7 @@ const char *OGRFeature::GetFieldAsISO8601DateTime(
     CPLFree(m_pszTmpFieldValue);
     m_pszTmpFieldValue = nullptr;
 
-    const int iSpecialField = iField - poDefn->GetFieldCount();
+    const int iSpecialField = iField - poDefn->GetFieldCountUnsafe();
     if (iSpecialField >= 0)
     {
         return "";
@@ -2912,7 +2905,7 @@ const char *OGR_F_GetFieldAsISO8601DateTime(OGRFeatureH hFeat, int iField,
 const int *OGRFeature::GetFieldAsIntegerList(int iField, int *pnCount) const
 
 {
-    OGRFieldDefn *poFDefn = poDefn->GetFieldDefn(iField);
+    const OGRFieldDefn *poFDefn = poDefn->GetFieldDefn(iField);
 
     if (poFDefn != nullptr && IsFieldSetAndNotNullUnsafe(iField) &&
         poFDefn->GetType() == OFTIntegerList)
@@ -3468,13 +3461,15 @@ int OGR_F_GetFieldAsDateTimeEx(OGRFeatureH hFeat, int iField, int *pnYear,
 /*                        OGRFeatureGetIntegerValue()                   */
 /************************************************************************/
 
-static int OGRFeatureGetIntegerValue(OGRFieldDefn *poFDefn, int nValue)
+static int OGRFeatureGetIntegerValue(const OGRFeatureDefn *poDefn,
+                                     const OGRFieldDefn *poFDefn, int nValue)
 {
     if (poFDefn->GetSubType() == OFSTBoolean && nValue != 0 && nValue != 1)
     {
         CPLError(CE_Warning, CPLE_AppDefined,
-                 "Only 0 or 1 should be passed for a OFSTBoolean subtype. "
-                 "Considering this non-zero value as 1.");
+                 "Field %s.%s: Only 0 or 1 should be passed for a OFSTBoolean "
+                 "subtype. Considering non-zero value %d as 1.",
+                 poDefn->GetName(), poFDefn->GetNameRef(), nValue);
         nValue = 1;
     }
     else if (poFDefn->GetSubType() == OFSTInt16)
@@ -3482,15 +3477,17 @@ static int OGRFeatureGetIntegerValue(OGRFieldDefn *poFDefn, int nValue)
         if (nValue < -32768)
         {
             CPLError(CE_Warning, CPLE_AppDefined,
-                     "Out-of-range value for a OFSTInt16 subtype. "
-                     "Considering this value as -32768.");
+                     "Field %s.%s: Out-of-range value for a OFSTInt16 subtype. "
+                     "Considering value %d as -32768.",
+                     poDefn->GetName(), poFDefn->GetNameRef(), nValue);
             nValue = -32768;
         }
         else if (nValue > 32767)
         {
             CPLError(CE_Warning, CPLE_AppDefined,
-                     "Out-of-range value for a OFSTInt16 subtype. "
-                     "Considering this value as 32767.");
+                     "Field %s.%s: Out-of-range value for a OFSTInt16 subtype. "
+                     "Considering value %d as 32767.",
+                     poDefn->GetName(), poFDefn->GetNameRef(), nValue);
             nValue = 32767;
         }
     }
@@ -3516,7 +3513,7 @@ static int OGRFeatureGetIntegerValue(OGRFieldDefn *poFDefn, int nValue)
 char *OGRFeature::GetFieldAsSerializedJSon(int iField) const
 
 {
-    const int iSpecialField = iField - poDefn->GetFieldCount();
+    const int iSpecialField = iField - poDefn->GetFieldCountUnsafe();
     if (iSpecialField >= 0)
     {
         return nullptr;
@@ -3665,7 +3662,7 @@ char *OGRFeature::GetFieldAsSerializedJSon(int iField) const
 void OGRFeature::SetField(int iField, int nValue)
 
 {
-    OGRFieldDefn *poFDefn = poDefn->GetFieldDefn(iField);
+    const OGRFieldDefn *poFDefn = poDefn->GetFieldDefn(iField);
 
     if (poFDefn == nullptr)
         return;
@@ -3673,14 +3670,15 @@ void OGRFeature::SetField(int iField, int nValue)
     OGRFieldType eType = poFDefn->GetType();
     if (eType == OFTInteger)
     {
-        pauFields[iField].Integer = OGRFeatureGetIntegerValue(poFDefn, nValue);
+        pauFields[iField].Integer =
+            OGRFeatureGetIntegerValue(poDefn, poFDefn, nValue);
         pauFields[iField].Set.nMarker2 = 0;
         pauFields[iField].Set.nMarker3 = 0;
     }
     else if (eType == OFTInteger64)
     {
         pauFields[iField].Integer64 =
-            OGRFeatureGetIntegerValue(poFDefn, nValue);
+            OGRFeatureGetIntegerValue(poDefn, poFDefn, nValue);
     }
     else if (eType == OFTReal)
     {
@@ -3805,7 +3803,7 @@ void OGR_F_SetFieldInteger(OGRFeatureH hFeat, int iField, int nValue)
 void OGRFeature::SetField(int iField, GIntBig nValue)
 
 {
-    OGRFieldDefn *poFDefn = poDefn->GetFieldDefn(iField);
+    const OGRFieldDefn *poFDefn = poDefn->GetFieldDefn(iField);
 
     if (poFDefn == nullptr)
         return;
@@ -3817,11 +3815,14 @@ void OGRFeature::SetField(int iField, GIntBig nValue)
                            : nValue > INT_MAX ? INT_MAX
                                               : static_cast<int>(nValue);
 
-        if (static_cast<GIntBig>(nVal32) != nValue)
+        if (nVal32 != nValue)
         {
-            CPLError(CE_Warning, CPLE_AppDefined,
-                     "Integer overflow occurred when trying to set "
-                     "32bit field.");
+            CPLError(
+                CE_Warning, CPLE_AppDefined,
+                "Field %s.%s: integer overflow occurred when trying to set "
+                "%" PRId64 "as 32 bit integer.",
+                poDefn->GetName(), poFDefn->GetNameRef(),
+                static_cast<int64_t>(nValue));
         }
         SetField(iField, nVal32);
     }
@@ -3832,11 +3833,19 @@ void OGRFeature::SetField(int iField, GIntBig nValue)
     else if (eType == OFTReal)
     {
         pauFields[iField].Real = static_cast<double>(nValue);
-        if (static_cast<GIntBig>(pauFields[iField].Real) != nValue)
+        // Values in the range [INT64_MAX - 1023, INT64_MAX - 1]
+        // get converted to a double that once cast to int64_t is
+        // INT64_MAX + 1 ...
+        if (pauFields[iField].Real >=
+                static_cast<double>(std::numeric_limits<int64_t>::max()) ||
+            static_cast<GIntBig>(pauFields[iField].Real) != nValue)
         {
-            CPLError(CE_Warning, CPLE_AppDefined,
-                     "Lossy conversion occurred when trying to set "
-                     "a real field from a 64 bit integer value.");
+            CPLError(
+                CE_Warning, CPLE_AppDefined,
+                "Field %s.%s: Lossy conversion occurred when trying to set "
+                "a real field from 64 bit integer value %" PRId64 ".",
+                poDefn->GetName(), poFDefn->GetNameRef(),
+                static_cast<int64_t>(nValue));
         }
     }
     else if (eType == OFTIntegerList)
@@ -3845,11 +3854,14 @@ void OGRFeature::SetField(int iField, GIntBig nValue)
                      : nValue > INT_MAX ? INT_MAX
                                         : static_cast<int>(nValue);
 
-        if (static_cast<GIntBig>(nVal32) != nValue)
+        if (nVal32 != nValue)
         {
-            CPLError(CE_Warning, CPLE_AppDefined,
-                     "Integer overflow occurred when trying to set "
-                     "32bit field.");
+            CPLError(
+                CE_Warning, CPLE_AppDefined,
+                "Field %s.%s: Integer overflow occurred when trying to set "
+                "%" PRId64 " as 32 bit value.",
+                poDefn->GetName(), poFDefn->GetNameRef(),
+                static_cast<int64_t>(nValue));
         }
         SetField(iField, 1, &nVal32);
     }
@@ -3968,7 +3980,7 @@ void OGR_F_SetFieldInteger64(OGRFeatureH hFeat, int iField, GIntBig nValue)
 void OGRFeature::SetField(int iField, double dfValue)
 
 {
-    OGRFieldDefn *poFDefn = poDefn->GetFieldDefn(iField);
+    const OGRFieldDefn *poFDefn = poDefn->GetFieldDefn(iField);
 
     if (poFDefn == nullptr)
         return;
@@ -3988,39 +4000,64 @@ void OGRFeature::SetField(int iField, double dfValue)
     }
     else if (eType == OFTInteger)
     {
-        const int nMin = std::numeric_limits<int>::min();
-        const int nMax = std::numeric_limits<int>::max();
-        const int nVal = dfValue < nMin   ? nMin
-                         : dfValue > nMax ? nMax
-                                          : static_cast<int>(dfValue);
-        pauFields[iField].Integer = OGRFeatureGetIntegerValue(poFDefn, nVal);
-        if (!(nVal == dfValue))
+        constexpr int nMin = std::numeric_limits<int>::min();
+        if (std::isnan(dfValue))
         {
-            if (std::isnan(dfValue))
-                pauFields[iField].Integer = nMin;
-            CPLError(CE_Warning, CPLE_AppDefined,
-                     "Lossy conversion occurred when trying to set "
-                     "32 bit integer field from a real value.");
+            pauFields[iField].Integer = nMin;
+            CPLError(
+                CE_Warning, CPLE_AppDefined,
+                "Field %s.%s: Lossy conversion occurred when trying to set "
+                "32 bit integer field from real value %.17g.",
+                poDefn->GetName(), poFDefn->GetNameRef(), dfValue);
+        }
+        else
+        {
+            constexpr int nMax = std::numeric_limits<int>::max();
+            const int nVal = dfValue < nMin   ? nMin
+                             : dfValue > nMax ? nMax
+                                              : static_cast<int>(dfValue);
+            pauFields[iField].Integer =
+                OGRFeatureGetIntegerValue(poDefn, poFDefn, nVal);
+            if (!(nVal == dfValue))
+            {
+                CPLError(
+                    CE_Warning, CPLE_AppDefined,
+                    "Field %s.%s: Lossy conversion occurred when trying to set "
+                    "32 bit integer field from real value %.17g.",
+                    poDefn->GetName(), poFDefn->GetNameRef(), dfValue);
+            }
         }
         pauFields[iField].Set.nMarker2 = 0;
         pauFields[iField].Set.nMarker3 = 0;
     }
     else if (eType == OFTInteger64)
     {
-        const auto nMin = std::numeric_limits<GIntBig>::min();
-        const auto nMax = std::numeric_limits<GIntBig>::max();
-        const auto nVal = dfValue < static_cast<double>(nMin) ? nMin
-                          : dfValue > static_cast<double>(nMax)
-                              ? nMax
-                              : static_cast<GIntBig>(dfValue);
-        pauFields[iField].Integer64 = nVal;
-        if (!(static_cast<double>(nVal) == dfValue))
+        constexpr auto nMin = std::numeric_limits<GIntBig>::min();
+        if (std::isnan(dfValue))
         {
-            if (std::isnan(dfValue))
-                pauFields[iField].Integer64 = nMin;
-            CPLError(CE_Warning, CPLE_AppDefined,
-                     "Lossy conversion occurred when trying to set "
-                     "64 bit integer field from a real value.");
+            pauFields[iField].Integer64 = nMin;
+            CPLError(
+                CE_Warning, CPLE_AppDefined,
+                "Field %s.%s: Lossy conversion occurred when trying to set "
+                "64 bit integer field from real value %.17g.",
+                poDefn->GetName(), poFDefn->GetNameRef(), dfValue);
+        }
+        else
+        {
+            constexpr auto nMax = std::numeric_limits<GIntBig>::max();
+            const auto nVal = dfValue < static_cast<double>(nMin) ? nMin
+                              : dfValue > static_cast<double>(nMax)
+                                  ? nMax
+                                  : static_cast<GIntBig>(dfValue);
+            pauFields[iField].Integer64 = nVal;
+            if (!(static_cast<double>(nVal) == dfValue))
+            {
+                CPLError(
+                    CE_Warning, CPLE_AppDefined,
+                    "Field %s.%s: Lossy conversion occurred when trying to set "
+                    "64 bit integer field from real value %.17g.",
+                    poDefn->GetName(), poFDefn->GetNameRef(), dfValue);
+            }
         }
         pauFields[iField].Set.nMarker3 = 0;
     }
@@ -4148,7 +4185,7 @@ void OGRFeature::SetField(int iField, const char *pszValue)
         bWarn = CPLTestBool(
             CPLGetConfigOption("OGR_SETFIELD_NUMERIC_WARNING", "YES"));
 
-    OGRFieldDefn *poFDefn = poDefn->GetFieldDefn(iField);
+    const OGRFieldDefn *poFDefn = poDefn->GetFieldDefn(iField);
     if (poFDefn == nullptr)
         return;
 
@@ -4223,7 +4260,7 @@ void OGRFeature::SetField(int iField, const char *pszValue)
                          : nVal64 < INT_MIN ? INT_MIN
                                             : static_cast<int>(nVal64);
             pauFields[iField].Integer =
-                OGRFeatureGetIntegerValue(poFDefn, nVal32);
+                OGRFeatureGetIntegerValue(poDefn, poFDefn, nVal32);
             if (bWarn && pauFields[iField].Integer == nVal32 &&
                 (errno == ERANGE || nVal32 != nVal64 || !pszLast || *pszLast))
                 CPLError(CE_Warning, CPLE_AppDefined,
@@ -4331,7 +4368,9 @@ void OGRFeature::SetField(int iField, const char *pszValue)
                         {
                             CPLError(
                                 CE_Warning, CPLE_AppDefined,
-                                "32 bit integer overflow when converting %s",
+                                "Field %s.%s: 32 bit integer overflow when "
+                                "converting %s",
+                                poDefn->GetName(), poFDefn->GetNameRef(),
                                 pszValue);
                         }
                         anValues.push_back(nVal);
@@ -4414,8 +4453,8 @@ void OGRFeature::SetField(int iField, const char *pszValue)
             }
             else
             {
-                const char *papszValues[2] = {pszValue, nullptr};
-                SetField(iField, const_cast<char **>(papszValues));
+                const char *const papszValues[2] = {pszValue, nullptr};
+                SetField(iField, papszValues);
             }
         }
     }
@@ -4499,7 +4538,7 @@ void OGR_F_SetFieldString(OGRFeatureH hFeat, int iField, const char *pszValue)
 void OGRFeature::SetField(int iField, int nCount, const int *panValues)
 
 {
-    OGRFieldDefn *poFDefn = poDefn->GetFieldDefn(iField);
+    const OGRFieldDefn *poFDefn = poDefn->GetFieldDefn(iField);
 
     if (poFDefn == nullptr)
         return;
@@ -4515,7 +4554,8 @@ void OGRFeature::SetField(int iField, int nCount, const int *panValues)
         {
             for (int i = 0; i < nCount; i++)
             {
-                int nVal = OGRFeatureGetIntegerValue(poFDefn, panValues[i]);
+                int nVal =
+                    OGRFeatureGetIntegerValue(poDefn, poFDefn, panValues[i]);
                 if (panValues[i] != nVal)
                 {
                     if (panValuesMod == nullptr)
@@ -4656,7 +4696,7 @@ void OGR_F_SetFieldIntegerList(OGRFeatureH hFeat, int iField, int nCount,
 void OGRFeature::SetField(int iField, int nCount, const GIntBig *panValues)
 
 {
-    OGRFieldDefn *poFDefn = poDefn->GetFieldDefn(iField);
+    const OGRFieldDefn *poFDefn = poDefn->GetFieldDefn(iField);
 
     if (poFDefn == nullptr)
         return;
@@ -4673,11 +4713,14 @@ void OGRFeature::SetField(int iField, int nCount, const GIntBig *panValues)
                                : nValue > INT_MAX ? INT_MAX
                                                   : static_cast<int>(nValue);
 
-            if (static_cast<GIntBig>(nVal32) != nValue)
+            if (nVal32 != nValue)
             {
-                CPLError(CE_Warning, CPLE_AppDefined,
-                         "Integer overflow occurred when trying to set "
-                         "32bit field.");
+                CPLError(
+                    CE_Warning, CPLE_AppDefined,
+                    "Field %s.%s: Integer overflow occurred when trying to "
+                    "set %" PRId64 " as 32 bit value.",
+                    poDefn->GetName(), poFDefn->GetNameRef(),
+                    static_cast<int64_t>(nValue));
             }
             anValues.push_back(nVal32);
         }
@@ -4965,9 +5008,10 @@ void OGRFeature::SetField(int iField, const char *const *papszValues)
             int nVal = atoi(papszValues[i]);
             if (errno == ERANGE)
             {
-                CPLError(CE_Warning, CPLE_AppDefined,
-                         "32 bit integer overflow when converting %s",
-                         papszValues[i]);
+                CPLError(
+                    CE_Warning, CPLE_AppDefined,
+                    "Field %s.%s: 32 bit integer overflow when converting %s",
+                    poDefn->GetName(), poFDefn->GetNameRef(), papszValues[i]);
                 if (papszValues[i][0] == '-')
                     nVal = INT_MIN;
                 else
@@ -5036,8 +5080,7 @@ void OGR_F_SetFieldStringList(OGRFeatureH hFeat, int iField,
 {
     VALIDATE_POINTER0(hFeat, "OGR_F_SetFieldStringList");
 
-    OGRFeature::FromHandle(hFeat)->SetField(
-        iField, const_cast<const char *const *>(papszValues));
+    OGRFeature::FromHandle(hFeat)->SetField(iField, papszValues);
 }
 
 /************************************************************************/
@@ -5635,11 +5678,12 @@ std::string OGRFeature::DumpReadableAsString(CSLConstList papszOptions) const
         CSLFetchNameValue(papszOptions, "DISPLAY_FIELDS");
     if (pszDisplayFields == nullptr || CPLTestBool(pszDisplayFields))
     {
-        for (int iField = 0; iField < GetFieldCount(); iField++)
+        const int nFieldCount = GetFieldCount();
+        for (int iField = 0; iField < nFieldCount; iField++)
         {
             if (!IsFieldSet(iField))
                 continue;
-            OGRFieldDefn *poFDefn = poDefn->GetFieldDefn(iField);
+            const OGRFieldDefn *poFDefn = poDefn->GetFieldDefnUnsafe(iField);
 
             const char *pszType =
                 (poFDefn->GetSubType() != OFSTNone)
@@ -5904,7 +5948,7 @@ OGRBoolean OGRFeature::Equal(const OGRFeature *poFeature) const
     if (GetDefnRef() != poFeature->GetDefnRef())
         return FALSE;
 
-    const int nFields = GetDefnRef()->GetFieldCount();
+    const int nFields = GetDefnRef()->GetFieldCountUnsafe();
     for (int i = 0; i < nFields; i++)
     {
         if (IsFieldSet(i) != poFeature->IsFieldSet(i))
@@ -5914,7 +5958,7 @@ OGRBoolean OGRFeature::Equal(const OGRFeature *poFeature) const
         if (!IsFieldSetAndNotNullUnsafe(i))
             continue;
 
-        switch (GetDefnRef()->GetFieldDefn(i)->GetType())
+        switch (GetDefnRef()->GetFieldDefnUnsafe(i)->GetType())
         {
             case OFTInteger:
                 if (GetFieldAsInteger(i) != poFeature->GetFieldAsInteger(i))
@@ -6549,9 +6593,7 @@ OGRErr OGRFeature::SetFieldsFrom(const OGRFeature *poSrcFeature,
                 if (eDstType == OFTDate || eDstType == OFTTime ||
                     eDstType == OFTDateTime)
                 {
-                    SetField(iDstField,
-                             const_cast<OGRField *>(
-                                 poSrcFeature->GetRawFieldRef(iField)));
+                    SetField(iDstField, poSrcFeature->GetRawFieldRef(iField));
                 }
                 else if (eDstType == OFTString || eDstType == OFTStringList)
                 {
@@ -6571,9 +6613,7 @@ OGRErr OGRFeature::SetFieldsFrom(const OGRFeature *poSrcFeature,
             {
                 if (eSrcType == eDstType)
                 {
-                    SetField(iDstField,
-                             const_cast<OGRField *>(
-                                 poSrcFeature->GetRawFieldRef(iField)));
+                    SetField(iDstField, poSrcFeature->GetRawFieldRef(iField));
                 }
                 else if (eDstType == OFTString || eDstType == OFTStringList)
                 {
@@ -6784,10 +6824,12 @@ OGRErr OGRFeature::RemapFields(OGRFeatureDefn *poNewDefn,
     if (poNewDefn == nullptr)
         poNewDefn = poDefn;
 
-    OGRField *pauNewFields = static_cast<OGRField *>(
-        CPLCalloc(poNewDefn->GetFieldCount(), sizeof(OGRField)));
+    const int nNewFieldCount = poNewDefn->GetFieldCount();
+    OGRField *pauNewFields =
+        static_cast<OGRField *>(CPLCalloc(nNewFieldCount, sizeof(OGRField)));
 
-    for (int iDstField = 0; iDstField < poDefn->GetFieldCount(); iDstField++)
+    const int nFieldCount = poDefn->GetFieldCount();
+    for (int iDstField = 0; iDstField < nFieldCount; iDstField++)
     {
         if (panRemapSource[iDstField] == -1)
         {
@@ -6824,7 +6866,7 @@ OGRErr OGRFeature::RemapFields(OGRFeatureDefn *poNewDefn,
 
 void OGRFeature::AppendField()
 {
-    int nFieldCount = poDefn->GetFieldCount();
+    const int nFieldCount = poDefn->GetFieldCountUnsafe();
     pauFields = static_cast<OGRField *>(
         CPLRealloc(pauFields, nFieldCount * sizeof(OGRField)));
     OGR_RawField_SetUnset(&pauFields[nFieldCount - 1]);
@@ -6980,7 +7022,7 @@ void OGRFeature::FillUnsetWithDefault(int bNotNullableOnly,
                      pszDefault[strlen(pszDefault) - 1] == '\'')
             {
                 CPLString osDefault(pszDefault + 1);
-                osDefault.resize(osDefault.size() - 1);
+                osDefault.pop_back();
                 char *pszTmp = CPLUnescapeString(osDefault, nullptr, CPLES_SQL);
                 SetField(i, pszTmp);
                 CPLFree(pszTmp);
@@ -7108,7 +7150,8 @@ int OGRFeature::Validate(int nValidateFlags, int bEmitError) const
             if (bEmitError)
             {
                 CPLError(CE_Failure, CPLE_AppDefined,
-                         "Field %s has a NULL content which is not allowed",
+                         "Field %s.%s has a NULL content which is not allowed",
+                         poDefn->GetName(),
                          poDefn->GetFieldDefn(i)->GetNameRef());
             }
         }
@@ -7123,8 +7166,9 @@ int OGRFeature::Validate(int nValidateFlags, int bEmitError) const
             if (bEmitError)
             {
                 CPLError(CE_Failure, CPLE_AppDefined,
-                         "Field %s has a %d UTF-8 characters whereas "
+                         "Field %s.%s has a %d UTF-8 characters whereas "
                          "a maximum of %d is allowed",
+                         poDefn->GetName(),
                          poDefn->GetFieldDefn(i)->GetNameRef(),
                          CPLStrlenUTF8(GetFieldAsString(i)),
                          poDefn->GetFieldDefn(i)->GetWidth());
diff --git a/ogr/ogrfeaturedefn.cpp b/ogr/ogrfeaturedefn.cpp
index 08d8fcb1ea1c..4a779428287d 100644
--- a/ogr/ogrfeaturedefn.cpp
+++ b/ogr/ogrfeaturedefn.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999,  Les Technologies SoftMap Inc.
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -170,6 +154,7 @@ void OGR_FD_Release(OGRFeatureDefnH hDefn)
  * \brief Create a copy of this feature definition.
  *
  * Creates a deep copy of the feature definition.
+ * The reference counter of the copy is initialized at 0.
  *
  * @return the copy.
  */
diff --git a/ogr/ogrfeaturequery.cpp b/ogr/ogrfeaturequery.cpp
index 4cc77749d7f8..9ceb422e0ad4 100644
--- a/ogr/ogrfeaturequery.cpp
+++ b/ogr/ogrfeaturequery.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2001, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -33,7 +17,6 @@
 #include "ogr_swq.h"
 
 #include <cstddef>
-#include <cstdlib>
 #include <algorithm>
 
 #include "cpl_conv.h"
@@ -407,18 +390,6 @@ int OGRFeatureQuery::CanUseIndex(const swq_expr_node *psExpr, OGRLayer *poLayer)
 /*      multi-part queries with ranges.                                 */
 /************************************************************************/
 
-static int CompareGIntBig(const void *pa, const void *pb)
-{
-    const GIntBig a = *(reinterpret_cast<const GIntBig *>(pa));
-    const GIntBig b = *(reinterpret_cast<const GIntBig *>(pb));
-    if (a < b)
-        return -1;
-    else if (a > b)
-        return 1;
-    else
-        return 0;
-}
-
 GIntBig *OGRFeatureQuery::EvaluateAgainstIndices(OGRLayer *poLayer,
                                                  OGRErr *peErr)
 
@@ -668,8 +639,7 @@ GIntBig *OGRFeatureQuery::EvaluateAgainstIndices(const swq_expr_node *psExpr,
         if (nFIDCount > 1)
         {
             // The returned FIDs are expected to be in sorted order.
-            qsort(panFIDs, static_cast<size_t>(nFIDCount), sizeof(GIntBig),
-                  CompareGIntBig);
+            std::sort(panFIDs, panFIDs + nFIDCount);
         }
         return panFIDs;
     }
@@ -712,9 +682,7 @@ GIntBig *OGRFeatureQuery::EvaluateAgainstIndices(const swq_expr_node *psExpr,
     if (nFIDCount > 1)
     {
         // The returned FIDs are expected to be sorted.
-        // TODO(schwehr): Use std::sort.
-        qsort(panFIDs, static_cast<size_t>(nFIDCount), sizeof(GIntBig),
-              CompareGIntBig);
+        std::sort(panFIDs, panFIDs + nFIDCount);
     }
     return panFIDs;
 }
diff --git a/ogr/ogrfeaturestyle.cpp b/ogr/ogrfeaturestyle.cpp
index ac7395df884e..839d13d42f95 100644
--- a/ogr/ogrfeaturestyle.cpp
+++ b/ogr/ogrfeaturestyle.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2000-2001, Stephane Villeneuve
  * Copyright (c) 2008-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrfielddefn.cpp b/ogr/ogrfielddefn.cpp
index 6809b9e285c5..699486be12db 100644
--- a/ogr/ogrfielddefn.cpp
+++ b/ogr/ogrfielddefn.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999,  Les Technologies SoftMap Inc.
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -2331,6 +2315,7 @@ OGRCodedFieldDomain::~OGRCodedFieldDomain()
 /*                       OGRRangeFieldDomain()                          */
 /************************************************************************/
 
+// cppcheck-suppress uninitMemberVar
 OGRRangeFieldDomain::OGRRangeFieldDomain(
     const std::string &osName, const std::string &osDescription,
     OGRFieldType eFieldType, OGRFieldSubType eFieldSubType,
diff --git a/ogr/ogrgeojsongeometry.cpp b/ogr/ogrgeojsongeometry.cpp
new file mode 100644
index 000000000000..cde200e83692
--- /dev/null
+++ b/ogr/ogrgeojsongeometry.cpp
@@ -0,0 +1,861 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2007, Mateusz Loskot
+// Copyright 2008-2024, Even Rouault <even.rouault at spatialys.com>
+
+/*! @cond Doxygen_Suppress */
+
+#include "ogrgeojsongeometry.h"
+#include "ogrlibjsonutils.h"
+
+#include "ogr_geometry.h"
+#include "ogr_spatialref.h"
+
+static OGRPoint *OGRGeoJSONReadPoint(json_object *poObj);
+static OGRMultiPoint *OGRGeoJSONReadMultiPoint(json_object *poObj);
+static OGRLineString *OGRGeoJSONReadLineString(json_object *poObj,
+                                               bool bRaw = false);
+static OGRMultiLineString *OGRGeoJSONReadMultiLineString(json_object *poObj);
+static OGRLinearRing *OGRGeoJSONReadLinearRing(json_object *poObj);
+static OGRMultiPolygon *OGRGeoJSONReadMultiPolygon(json_object *poObj);
+static OGRGeometryCollection *
+OGRGeoJSONReadGeometryCollection(json_object *poObj,
+                                 OGRSpatialReference *poSRS = nullptr);
+
+/************************************************************************/
+/*                           OGRGeoJSONGetType                          */
+/************************************************************************/
+
+GeoJSONObject::Type OGRGeoJSONGetType(json_object *poObj)
+{
+    if (nullptr == poObj)
+        return GeoJSONObject::eUnknown;
+
+    json_object *poObjType = OGRGeoJSONFindMemberByName(poObj, "type");
+    if (nullptr == poObjType)
+        return GeoJSONObject::eUnknown;
+
+    const char *name = json_object_get_string(poObjType);
+    if (EQUAL(name, "Point"))
+        return GeoJSONObject::ePoint;
+    else if (EQUAL(name, "LineString"))
+        return GeoJSONObject::eLineString;
+    else if (EQUAL(name, "Polygon"))
+        return GeoJSONObject::ePolygon;
+    else if (EQUAL(name, "MultiPoint"))
+        return GeoJSONObject::eMultiPoint;
+    else if (EQUAL(name, "MultiLineString"))
+        return GeoJSONObject::eMultiLineString;
+    else if (EQUAL(name, "MultiPolygon"))
+        return GeoJSONObject::eMultiPolygon;
+    else if (EQUAL(name, "GeometryCollection"))
+        return GeoJSONObject::eGeometryCollection;
+    else if (EQUAL(name, "Feature"))
+        return GeoJSONObject::eFeature;
+    else if (EQUAL(name, "FeatureCollection"))
+        return GeoJSONObject::eFeatureCollection;
+    else
+        return GeoJSONObject::eUnknown;
+}
+
+/************************************************************************/
+/*                   OGRGeoJSONGetOGRGeometryType()                     */
+/************************************************************************/
+
+OGRwkbGeometryType OGRGeoJSONGetOGRGeometryType(json_object *poObj)
+{
+    if (nullptr == poObj)
+        return wkbUnknown;
+
+    json_object *poObjType = CPL_json_object_object_get(poObj, "type");
+    if (nullptr == poObjType)
+        return wkbUnknown;
+
+    OGRwkbGeometryType eType = wkbUnknown;
+    const char *name = json_object_get_string(poObjType);
+    if (EQUAL(name, "Point"))
+        eType = wkbPoint;
+    else if (EQUAL(name, "LineString"))
+        eType = wkbLineString;
+    else if (EQUAL(name, "Polygon"))
+        eType = wkbPolygon;
+    else if (EQUAL(name, "MultiPoint"))
+        eType = wkbMultiPoint;
+    else if (EQUAL(name, "MultiLineString"))
+        eType = wkbMultiLineString;
+    else if (EQUAL(name, "MultiPolygon"))
+        eType = wkbMultiPolygon;
+    else if (EQUAL(name, "GeometryCollection"))
+        eType = wkbGeometryCollection;
+    else
+        return wkbUnknown;
+
+    json_object *poCoordinates;
+    if (eType == wkbGeometryCollection)
+    {
+        json_object *poGeometries =
+            CPL_json_object_object_get(poObj, "geometries");
+        if (poGeometries &&
+            json_object_get_type(poGeometries) == json_type_array &&
+            json_object_array_length(poGeometries) > 0)
+        {
+            if (OGR_GT_HasZ(OGRGeoJSONGetOGRGeometryType(
+                    json_object_array_get_idx(poGeometries, 0))))
+                eType = OGR_GT_SetZ(eType);
+        }
+    }
+    else
+    {
+        poCoordinates = CPL_json_object_object_get(poObj, "coordinates");
+        if (poCoordinates &&
+            json_object_get_type(poCoordinates) == json_type_array &&
+            json_object_array_length(poCoordinates) > 0)
+        {
+            while (true)
+            {
+                auto poChild = json_object_array_get_idx(poCoordinates, 0);
+                if (!(poChild &&
+                      json_object_get_type(poChild) == json_type_array &&
+                      json_object_array_length(poChild) > 0))
+                {
+                    if (json_object_array_length(poCoordinates) == 3)
+                        eType = OGR_GT_SetZ(eType);
+                    break;
+                }
+                poCoordinates = poChild;
+            }
+        }
+    }
+
+    return eType;
+}
+
+/************************************************************************/
+/*                           OGRGeoJSONReadGeometry                     */
+/************************************************************************/
+
+OGRGeometry *OGRGeoJSONReadGeometry(json_object *poObj,
+                                    OGRSpatialReference *poParentSRS)
+{
+
+    OGRGeometry *poGeometry = nullptr;
+    OGRSpatialReference *poSRS = nullptr;
+    lh_entry *entry = OGRGeoJSONFindMemberEntryByName(poObj, "crs");
+    if (entry != nullptr)
+    {
+        json_object *poObjSrs =
+            static_cast<json_object *>(const_cast<void *>(entry->v));
+        if (poObjSrs != nullptr)
+        {
+            poSRS = OGRGeoJSONReadSpatialReference(poObj);
+        }
+    }
+
+    OGRSpatialReference *poSRSToAssign = nullptr;
+    if (entry != nullptr)
+    {
+        poSRSToAssign = poSRS;
+    }
+    else if (poParentSRS)
+    {
+        poSRSToAssign = poParentSRS;
+    }
+    else
+    {
+        // Assign WGS84 if no CRS defined on geometry.
+        poSRSToAssign = OGRSpatialReference::GetWGS84SRS();
+    }
+
+    GeoJSONObject::Type objType = OGRGeoJSONGetType(poObj);
+    if (GeoJSONObject::ePoint == objType)
+        poGeometry = OGRGeoJSONReadPoint(poObj);
+    else if (GeoJSONObject::eMultiPoint == objType)
+        poGeometry = OGRGeoJSONReadMultiPoint(poObj);
+    else if (GeoJSONObject::eLineString == objType)
+        poGeometry = OGRGeoJSONReadLineString(poObj);
+    else if (GeoJSONObject::eMultiLineString == objType)
+        poGeometry = OGRGeoJSONReadMultiLineString(poObj);
+    else if (GeoJSONObject::ePolygon == objType)
+        poGeometry = OGRGeoJSONReadPolygon(poObj);
+    else if (GeoJSONObject::eMultiPolygon == objType)
+        poGeometry = OGRGeoJSONReadMultiPolygon(poObj);
+    else if (GeoJSONObject::eGeometryCollection == objType)
+        poGeometry = OGRGeoJSONReadGeometryCollection(poObj, poSRSToAssign);
+    else
+    {
+        CPLDebug("GeoJSON", "Unsupported geometry type detected. "
+                            "Feature gets NULL geometry assigned.");
+    }
+
+    if (poGeometry && GeoJSONObject::eGeometryCollection != objType)
+        poGeometry->assignSpatialReference(poSRSToAssign);
+
+    if (poSRS)
+        poSRS->Release();
+
+    return poGeometry;
+}
+
+/************************************************************************/
+/*                        OGRGeoJSONGetCoordinate()                     */
+/************************************************************************/
+
+static double OGRGeoJSONGetCoordinate(json_object *poObj,
+                                      const char *pszCoordName, int nIndex,
+                                      bool &bValid)
+{
+    json_object *poObjCoord = json_object_array_get_idx(poObj, nIndex);
+    if (nullptr == poObjCoord)
+    {
+        CPLDebug("GeoJSON", "Point: got null object for %s.", pszCoordName);
+        bValid = false;
+        return 0.0;
+    }
+
+    const int iType = json_object_get_type(poObjCoord);
+    if (json_type_double != iType && json_type_int != iType)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Invalid '%s' coordinate. "
+                 "Type is not double or integer for \'%s\'.",
+                 pszCoordName, json_object_to_json_string(poObjCoord));
+        bValid = false;
+        return 0.0;
+    }
+
+    return json_object_get_double(poObjCoord);
+}
+
+/************************************************************************/
+/*                           OGRGeoJSONReadRawPoint                     */
+/************************************************************************/
+
+static bool OGRGeoJSONReadRawPoint(json_object *poObj, OGRPoint &point)
+{
+    CPLAssert(nullptr != poObj);
+
+    if (json_type_array == json_object_get_type(poObj))
+    {
+        const auto nSize = json_object_array_length(poObj);
+
+        if (nSize < GeoJSONObject::eMinCoordinateDimension)
+        {
+            CPLDebug("GeoJSON", "Invalid coord dimension. "
+                                "At least 2 dimensions must be present.");
+            return false;
+        }
+
+        bool bValid = true;
+        const double dfX = OGRGeoJSONGetCoordinate(poObj, "x", 0, bValid);
+        const double dfY = OGRGeoJSONGetCoordinate(poObj, "y", 1, bValid);
+        point.setX(dfX);
+        point.setY(dfY);
+
+        // Read Z coordinate.
+        if (nSize >= GeoJSONObject::eMaxCoordinateDimension)
+        {
+            // Don't *expect* mixed-dimension geometries, although the
+            // spec doesn't explicitly forbid this.
+            const double dfZ = OGRGeoJSONGetCoordinate(poObj, "z", 2, bValid);
+            point.setZ(dfZ);
+        }
+        else
+        {
+            point.flattenTo2D();
+        }
+        return bValid;
+    }
+
+    return false;
+}
+
+/************************************************************************/
+/*                           OGRGeoJSONReadPoint                        */
+/************************************************************************/
+
+OGRPoint *OGRGeoJSONReadPoint(json_object *poObj)
+{
+    CPLAssert(nullptr != poObj);
+
+    json_object *poObjCoords = OGRGeoJSONFindMemberByName(poObj, "coordinates");
+    if (nullptr == poObjCoords)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Invalid Point object. Missing \'coordinates\' member.");
+        return nullptr;
+    }
+
+    OGRPoint *poPoint = new OGRPoint();
+    if (!OGRGeoJSONReadRawPoint(poObjCoords, *poPoint))
+    {
+        CPLDebug("GeoJSON", "Point: raw point parsing failure.");
+        delete poPoint;
+        return nullptr;
+    }
+
+    return poPoint;
+}
+
+/************************************************************************/
+/*                           OGRGeoJSONReadMultiPoint                   */
+/************************************************************************/
+
+OGRMultiPoint *OGRGeoJSONReadMultiPoint(json_object *poObj)
+{
+    CPLAssert(nullptr != poObj);
+
+    json_object *poObjPoints = OGRGeoJSONFindMemberByName(poObj, "coordinates");
+    if (nullptr == poObjPoints)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Invalid MultiPoint object. "
+                 "Missing \'coordinates\' member.");
+        return nullptr;
+    }
+
+    OGRMultiPoint *poMultiPoint = nullptr;
+    if (json_type_array == json_object_get_type(poObjPoints))
+    {
+        const auto nPoints = json_object_array_length(poObjPoints);
+
+        poMultiPoint = new OGRMultiPoint();
+
+        for (auto i = decltype(nPoints){0}; i < nPoints; ++i)
+        {
+            json_object *poObjCoords =
+                json_object_array_get_idx(poObjPoints, i);
+
+            OGRPoint pt;
+            if (poObjCoords != nullptr &&
+                !OGRGeoJSONReadRawPoint(poObjCoords, pt))
+            {
+                delete poMultiPoint;
+                CPLDebug("GeoJSON", "LineString: raw point parsing failure.");
+                return nullptr;
+            }
+            poMultiPoint->addGeometry(&pt);
+        }
+    }
+
+    return poMultiPoint;
+}
+
+/************************************************************************/
+/*                           OGRGeoJSONReadLineString                   */
+/************************************************************************/
+
+OGRLineString *OGRGeoJSONReadLineString(json_object *poObj, bool bRaw)
+{
+    CPLAssert(nullptr != poObj);
+
+    json_object *poObjPoints = nullptr;
+
+    if (!bRaw)
+    {
+        poObjPoints = OGRGeoJSONFindMemberByName(poObj, "coordinates");
+        if (nullptr == poObjPoints)
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                     "Invalid LineString object. "
+                     "Missing \'coordinates\' member.");
+            return nullptr;
+        }
+    }
+    else
+    {
+        poObjPoints = poObj;
+    }
+
+    OGRLineString *poLine = nullptr;
+
+    if (json_type_array == json_object_get_type(poObjPoints))
+    {
+        const auto nPoints = json_object_array_length(poObjPoints);
+
+        poLine = new OGRLineString();
+        poLine->setNumPoints(static_cast<int>(nPoints));
+
+        for (auto i = decltype(nPoints){0}; i < nPoints; ++i)
+        {
+            json_object *poObjCoords =
+                json_object_array_get_idx(poObjPoints, i);
+            if (poObjCoords == nullptr)
+            {
+                delete poLine;
+                CPLDebug("GeoJSON", "LineString: got null object.");
+                return nullptr;
+            }
+
+            OGRPoint pt;
+            if (!OGRGeoJSONReadRawPoint(poObjCoords, pt))
+            {
+                delete poLine;
+                CPLDebug("GeoJSON", "LineString: raw point parsing failure.");
+                return nullptr;
+            }
+            if (pt.getCoordinateDimension() == 2)
+            {
+                poLine->setPoint(static_cast<int>(i), pt.getX(), pt.getY());
+            }
+            else
+            {
+                poLine->setPoint(static_cast<int>(i), pt.getX(), pt.getY(),
+                                 pt.getZ());
+            }
+        }
+    }
+
+    return poLine;
+}
+
+/************************************************************************/
+/*                           OGRGeoJSONReadMultiLineString              */
+/************************************************************************/
+
+OGRMultiLineString *OGRGeoJSONReadMultiLineString(json_object *poObj)
+{
+    CPLAssert(nullptr != poObj);
+
+    json_object *poObjLines = OGRGeoJSONFindMemberByName(poObj, "coordinates");
+    if (nullptr == poObjLines)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Invalid MultiLineString object. "
+                 "Missing \'coordinates\' member.");
+        return nullptr;
+    }
+
+    OGRMultiLineString *poMultiLine = nullptr;
+
+    if (json_type_array == json_object_get_type(poObjLines))
+    {
+        const auto nLines = json_object_array_length(poObjLines);
+
+        poMultiLine = new OGRMultiLineString();
+
+        for (auto i = decltype(nLines){0}; i < nLines; ++i)
+        {
+            json_object *poObjLine = json_object_array_get_idx(poObjLines, i);
+
+            OGRLineString *poLine;
+            if (poObjLine != nullptr)
+                poLine = OGRGeoJSONReadLineString(poObjLine, true);
+            else
+                poLine = new OGRLineString();
+
+            if (nullptr != poLine)
+            {
+                poMultiLine->addGeometryDirectly(poLine);
+            }
+        }
+    }
+
+    return poMultiLine;
+}
+
+/************************************************************************/
+/*                           OGRGeoJSONReadLinearRing                   */
+/************************************************************************/
+
+OGRLinearRing *OGRGeoJSONReadLinearRing(json_object *poObj)
+{
+    CPLAssert(nullptr != poObj);
+
+    OGRLinearRing *poRing = nullptr;
+
+    if (json_type_array == json_object_get_type(poObj))
+    {
+        const auto nPoints = json_object_array_length(poObj);
+
+        poRing = new OGRLinearRing();
+        poRing->setNumPoints(static_cast<int>(nPoints));
+
+        for (auto i = decltype(nPoints){0}; i < nPoints; ++i)
+        {
+            json_object *poObjCoords = json_object_array_get_idx(poObj, i);
+            if (poObjCoords == nullptr)
+            {
+                delete poRing;
+                CPLDebug("GeoJSON", "LinearRing: got null object.");
+                return nullptr;
+            }
+
+            OGRPoint pt;
+            if (!OGRGeoJSONReadRawPoint(poObjCoords, pt))
+            {
+                delete poRing;
+                CPLDebug("GeoJSON", "LinearRing: raw point parsing failure.");
+                return nullptr;
+            }
+
+            if (2 == pt.getCoordinateDimension())
+                poRing->setPoint(static_cast<int>(i), pt.getX(), pt.getY());
+            else
+                poRing->setPoint(static_cast<int>(i), pt.getX(), pt.getY(),
+                                 pt.getZ());
+        }
+    }
+
+    return poRing;
+}
+
+/************************************************************************/
+/*                           OGRGeoJSONReadPolygon                      */
+/************************************************************************/
+
+OGRPolygon *OGRGeoJSONReadPolygon(json_object *poObj, bool bRaw)
+{
+    CPLAssert(nullptr != poObj);
+
+    json_object *poObjRings = nullptr;
+
+    if (!bRaw)
+    {
+        poObjRings = OGRGeoJSONFindMemberByName(poObj, "coordinates");
+        if (nullptr == poObjRings)
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                     "Invalid Polygon object. "
+                     "Missing \'coordinates\' member.");
+            return nullptr;
+        }
+    }
+    else
+    {
+        poObjRings = poObj;
+    }
+
+    OGRPolygon *poPolygon = nullptr;
+
+    if (json_type_array == json_object_get_type(poObjRings))
+    {
+        const auto nRings = json_object_array_length(poObjRings);
+        if (nRings > 0)
+        {
+            json_object *poObjPoints = json_object_array_get_idx(poObjRings, 0);
+            if (poObjPoints == nullptr)
+            {
+                poPolygon = new OGRPolygon();
+            }
+            else
+            {
+                OGRLinearRing *poRing = OGRGeoJSONReadLinearRing(poObjPoints);
+                if (nullptr != poRing)
+                {
+                    poPolygon = new OGRPolygon();
+                    poPolygon->addRingDirectly(poRing);
+                }
+            }
+
+            for (auto i = decltype(nRings){1};
+                 i < nRings && nullptr != poPolygon; ++i)
+            {
+                poObjPoints = json_object_array_get_idx(poObjRings, i);
+                if (poObjPoints != nullptr)
+                {
+                    OGRLinearRing *poRing =
+                        OGRGeoJSONReadLinearRing(poObjPoints);
+                    if (nullptr != poRing)
+                    {
+                        poPolygon->addRingDirectly(poRing);
+                    }
+                }
+            }
+        }
+        else
+        {
+            poPolygon = new OGRPolygon();
+        }
+    }
+
+    return poPolygon;
+}
+
+/************************************************************************/
+/*                           OGRGeoJSONReadMultiPolygon                 */
+/************************************************************************/
+
+OGRMultiPolygon *OGRGeoJSONReadMultiPolygon(json_object *poObj)
+{
+    CPLAssert(nullptr != poObj);
+
+    json_object *poObjPolys = OGRGeoJSONFindMemberByName(poObj, "coordinates");
+    if (nullptr == poObjPolys)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Invalid MultiPolygon object. "
+                 "Missing \'coordinates\' member.");
+        return nullptr;
+    }
+
+    OGRMultiPolygon *poMultiPoly = nullptr;
+
+    if (json_type_array == json_object_get_type(poObjPolys))
+    {
+        const auto nPolys = json_object_array_length(poObjPolys);
+
+        poMultiPoly = new OGRMultiPolygon();
+
+        for (auto i = decltype(nPolys){0}; i < nPolys; ++i)
+        {
+            json_object *poObjPoly = json_object_array_get_idx(poObjPolys, i);
+            if (poObjPoly == nullptr)
+            {
+                poMultiPoly->addGeometryDirectly(new OGRPolygon());
+            }
+            else
+            {
+                OGRPolygon *poPoly = OGRGeoJSONReadPolygon(poObjPoly, true);
+                if (nullptr != poPoly)
+                {
+                    poMultiPoly->addGeometryDirectly(poPoly);
+                }
+            }
+        }
+    }
+
+    return poMultiPoly;
+}
+
+/************************************************************************/
+/*                           OGRGeoJSONReadGeometryCollection           */
+/************************************************************************/
+
+OGRGeometryCollection *
+OGRGeoJSONReadGeometryCollection(json_object *poObj, OGRSpatialReference *poSRS)
+{
+    CPLAssert(nullptr != poObj);
+
+    json_object *poObjGeoms = OGRGeoJSONFindMemberByName(poObj, "geometries");
+    if (nullptr == poObjGeoms)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Invalid GeometryCollection object. "
+                 "Missing \'geometries\' member.");
+        return nullptr;
+    }
+
+    OGRGeometryCollection *poCollection = nullptr;
+
+    if (json_type_array == json_object_get_type(poObjGeoms))
+    {
+        poCollection = new OGRGeometryCollection();
+        poCollection->assignSpatialReference(poSRS);
+
+        const auto nGeoms = json_object_array_length(poObjGeoms);
+        for (auto i = decltype(nGeoms){0}; i < nGeoms; ++i)
+        {
+            json_object *poObjGeom = json_object_array_get_idx(poObjGeoms, i);
+            if (poObjGeom == nullptr)
+            {
+                CPLDebug("GeoJSON", "Skipping null sub-geometry");
+                continue;
+            }
+
+            OGRGeometry *poGeometry = OGRGeoJSONReadGeometry(poObjGeom, poSRS);
+            if (nullptr != poGeometry)
+            {
+                poCollection->addGeometryDirectly(poGeometry);
+            }
+        }
+    }
+
+    return poCollection;
+}
+
+/************************************************************************/
+/*                           OGRGeoJSONGetGeometryName()                */
+/************************************************************************/
+
+const char *OGRGeoJSONGetGeometryName(OGRGeometry const *poGeometry)
+{
+    CPLAssert(nullptr != poGeometry);
+
+    const OGRwkbGeometryType eType = wkbFlatten(poGeometry->getGeometryType());
+
+    if (wkbPoint == eType)
+        return "Point";
+    else if (wkbLineString == eType)
+        return "LineString";
+    else if (wkbPolygon == eType)
+        return "Polygon";
+    else if (wkbMultiPoint == eType)
+        return "MultiPoint";
+    else if (wkbMultiLineString == eType)
+        return "MultiLineString";
+    else if (wkbMultiPolygon == eType)
+        return "MultiPolygon";
+    else if (wkbGeometryCollection == eType)
+        return "GeometryCollection";
+
+    return "Unknown";
+}
+
+/************************************************************************/
+/*                    OGRGeoJSONReadSpatialReference                    */
+/************************************************************************/
+
+OGRSpatialReference *OGRGeoJSONReadSpatialReference(json_object *poObj)
+{
+
+    /* -------------------------------------------------------------------- */
+    /*      Read spatial reference definition.                              */
+    /* -------------------------------------------------------------------- */
+    OGRSpatialReference *poSRS = nullptr;
+
+    json_object *poObjSrs = OGRGeoJSONFindMemberByName(poObj, "crs");
+    if (nullptr != poObjSrs)
+    {
+        json_object *poObjSrsType =
+            OGRGeoJSONFindMemberByName(poObjSrs, "type");
+        if (poObjSrsType == nullptr)
+            return nullptr;
+
+        const char *pszSrsType = json_object_get_string(poObjSrsType);
+
+        // TODO: Add URL and URN types support.
+        if (STARTS_WITH_CI(pszSrsType, "NAME"))
+        {
+            json_object *poObjSrsProps =
+                OGRGeoJSONFindMemberByName(poObjSrs, "properties");
+            if (poObjSrsProps == nullptr)
+                return nullptr;
+
+            json_object *poNameURL =
+                OGRGeoJSONFindMemberByName(poObjSrsProps, "name");
+            if (poNameURL == nullptr)
+                return nullptr;
+
+            const char *pszName = json_object_get_string(poNameURL);
+
+            // Mostly to emulate GDAL 2.x behavior
+            // See https://github.com/OSGeo/gdal/issues/2035
+            if (EQUAL(pszName, "urn:ogc:def:crs:OGC:1.3:CRS84"))
+                pszName = "EPSG:4326";
+
+            poSRS = new OGRSpatialReference();
+            poSRS->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+            if (OGRERR_NONE !=
+                poSRS->SetFromUserInput(
+                    pszName,
+                    OGRSpatialReference::SET_FROM_USER_INPUT_LIMITATIONS_get()))
+            {
+                delete poSRS;
+                poSRS = nullptr;
+            }
+        }
+
+        else if (STARTS_WITH_CI(pszSrsType, "EPSG"))
+        {
+            json_object *poObjSrsProps =
+                OGRGeoJSONFindMemberByName(poObjSrs, "properties");
+            if (poObjSrsProps == nullptr)
+                return nullptr;
+
+            json_object *poObjCode =
+                OGRGeoJSONFindMemberByName(poObjSrsProps, "code");
+            if (poObjCode == nullptr)
+                return nullptr;
+
+            int nEPSG = json_object_get_int(poObjCode);
+
+            poSRS = new OGRSpatialReference();
+            poSRS->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+            if (OGRERR_NONE != poSRS->importFromEPSG(nEPSG))
+            {
+                delete poSRS;
+                poSRS = nullptr;
+            }
+        }
+
+        else if (STARTS_WITH_CI(pszSrsType, "URL") ||
+                 STARTS_WITH_CI(pszSrsType, "LINK"))
+        {
+            json_object *poObjSrsProps =
+                OGRGeoJSONFindMemberByName(poObjSrs, "properties");
+            if (poObjSrsProps == nullptr)
+                return nullptr;
+
+            json_object *poObjURL =
+                OGRGeoJSONFindMemberByName(poObjSrsProps, "url");
+
+            if (nullptr == poObjURL)
+            {
+                poObjURL = OGRGeoJSONFindMemberByName(poObjSrsProps, "href");
+            }
+            if (poObjURL == nullptr)
+                return nullptr;
+
+            const char *pszURL = json_object_get_string(poObjURL);
+
+            poSRS = new OGRSpatialReference();
+            poSRS->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+            if (OGRERR_NONE != poSRS->importFromUrl(pszURL))
+            {
+                delete poSRS;
+                poSRS = nullptr;
+            }
+        }
+
+        else if (EQUAL(pszSrsType, "OGC"))
+        {
+            json_object *poObjSrsProps =
+                OGRGeoJSONFindMemberByName(poObjSrs, "properties");
+            if (poObjSrsProps == nullptr)
+                return nullptr;
+
+            json_object *poObjURN =
+                OGRGeoJSONFindMemberByName(poObjSrsProps, "urn");
+            if (poObjURN == nullptr)
+                return nullptr;
+
+            poSRS = new OGRSpatialReference();
+            poSRS->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+            if (OGRERR_NONE !=
+                poSRS->importFromURN(json_object_get_string(poObjURN)))
+            {
+                delete poSRS;
+                poSRS = nullptr;
+            }
+        }
+    }
+
+    // Strip AXIS, since geojson has (easting, northing) / (longitude, latitude)
+    // order.  According to http://www.geojson.org/geojson-spec.html#id2 :
+    // "Point coordinates are in x, y order (easting, northing for projected
+    // coordinates, longitude, latitude for geographic coordinates)".
+    if (poSRS != nullptr)
+    {
+        OGR_SRSNode *poGEOGCS = poSRS->GetAttrNode("GEOGCS");
+        if (poGEOGCS != nullptr)
+            poGEOGCS->StripNodes("AXIS");
+    }
+
+    return poSRS;
+}
+
+/************************************************************************/
+/*                       OGR_G_CreateGeometryFromJson                   */
+/************************************************************************/
+
+/** Create a OGR geometry from a GeoJSON geometry object */
+OGRGeometryH OGR_G_CreateGeometryFromJson(const char *pszJson)
+{
+    if (nullptr == pszJson)
+    {
+        // Translation failed.
+        return nullptr;
+    }
+
+    json_object *poObj = nullptr;
+    if (!OGRJSonParse(pszJson, &poObj))
+        return nullptr;
+
+    OGRGeometry *poGeometry = OGRGeoJSONReadGeometry(poObj);
+
+    // Release JSON tree.
+    json_object_put(poObj);
+
+    return OGRGeometry::ToHandle(poGeometry);
+}
+
+/*! @endcond */
diff --git a/ogr/ogrgeojsongeometry.h b/ogr/ogrgeojsongeometry.h
new file mode 100644
index 000000000000..07d6af036641
--- /dev/null
+++ b/ogr/ogrgeojsongeometry.h
@@ -0,0 +1,65 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2007, Mateusz Loskot
+// Copyright 2008-2024, Even Rouault <even.rouault at spatialys.com>
+
+#ifndef OGRGEOJSONGEOMETRY_H_INCLUDED
+#define OGRGEOJSONGEOMETRY_H_INCLUDED
+
+/*! @cond Doxygen_Suppress */
+
+#include "cpl_port.h"
+#include "cpl_json_header.h"
+
+#include "ogr_api.h"
+
+class OGRGeometry;
+class OGRPolygon;
+class OGRSpatialReference;
+
+/************************************************************************/
+/*                           GeoJSONObject                              */
+/************************************************************************/
+
+struct GeoJSONObject
+{
+    enum Type
+    {
+        eUnknown = wkbUnknown,  // non-GeoJSON properties
+        ePoint = wkbPoint,
+        eLineString = wkbLineString,
+        ePolygon = wkbPolygon,
+        eMultiPoint = wkbMultiPoint,
+        eMultiLineString = wkbMultiLineString,
+        eMultiPolygon = wkbMultiPolygon,
+        eGeometryCollection = wkbGeometryCollection,
+        eFeature,
+        eFeatureCollection
+    };
+
+    enum CoordinateDimension
+    {
+        eMinCoordinateDimension = 2,
+        eMaxCoordinateDimension = 3
+    };
+};
+
+/************************************************************************/
+/*                 GeoJSON Geometry Translators                         */
+/************************************************************************/
+
+GeoJSONObject::Type CPL_DLL OGRGeoJSONGetType(json_object *poObj);
+
+OGRwkbGeometryType CPL_DLL OGRGeoJSONGetOGRGeometryType(json_object *poObj);
+
+OGRGeometry CPL_DLL *
+OGRGeoJSONReadGeometry(json_object *poObj,
+                       OGRSpatialReference *poParentSRS = nullptr);
+OGRSpatialReference CPL_DLL *OGRGeoJSONReadSpatialReference(json_object *poObj);
+
+OGRPolygon *OGRGeoJSONReadPolygon(json_object *poObj, bool bRaw = false);
+
+const char *OGRGeoJSONGetGeometryName(OGRGeometry const *poGeometry);
+
+/*! @endcond */
+
+#endif
diff --git a/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp b/ogr/ogrgeojsonwriter.cpp
similarity index 89%
rename from ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp
rename to ogr/ogrgeojsonwriter.cpp
index b1d1fdedf13d..b234fbe7ca87 100644
--- a/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp
+++ b/ogr/ogrgeojsonwriter.cpp
@@ -8,31 +8,19 @@
  * Copyright (c) 2007, Mateusz Loskot
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
+/*! @cond Doxygen_Suppress */
+
 #define JSON_C_VER_013 (13 << 8)
 
 #include "ogrgeojsonwriter.h"
-#include "ogrgeojsonutils.h"
-#include "ogr_geojson.h"
-#include "ogrgeojsonreader.h"
+#include "ogr_geometry.h"
+#include "ogrgeojsongeometry.h"
+#include "ogrlibjsonutils.h"
+#include "ogr_feature.h"
+#include "ogr_p.h"
 #include <json.h>  // JSON-C
 
 #if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
@@ -41,9 +29,9 @@
 
 #include <printbuf.h>
 #include "ogr_api.h"
-#include "ogr_p.h"
 
 #include <algorithm>
+#include <cmath>
 #include <cstdint>
 #include <limits>
 
@@ -51,6 +39,46 @@ static json_object *
 json_object_new_float_with_significant_figures(float fVal,
                                                int nSignificantFigures);
 
+static json_object *
+OGRGeoJSONWritePoint(const OGRPoint *poPoint,
+                     const OGRGeoJSONWriteOptions &oOptions);
+
+static json_object *
+OGRGeoJSONWriteLineString(const OGRLineString *poLine,
+                          const OGRGeoJSONWriteOptions &oOptions);
+
+static json_object *
+OGRGeoJSONWriteMultiPoint(const OGRMultiPoint *poGeometry,
+                          const OGRGeoJSONWriteOptions &oOptions);
+
+static json_object *
+OGRGeoJSONWriteMultiLineString(const OGRMultiLineString *poGeometry,
+                               const OGRGeoJSONWriteOptions &oOptions);
+
+static json_object *
+OGRGeoJSONWriteMultiPolygon(const OGRMultiPolygon *poGeometry,
+                            const OGRGeoJSONWriteOptions &oOptions);
+
+static json_object *
+OGRGeoJSONWriteGeometryCollection(const OGRGeometryCollection *poGeometry,
+                                  const OGRGeoJSONWriteOptions &oOptions);
+
+static json_object *
+OGRGeoJSONWriteCoords(double const &fX, double const &fY,
+                      const OGRGeoJSONWriteOptions &oOptions);
+
+static json_object *
+OGRGeoJSONWriteCoords(double const &fX, double const &fY, double const &fZ,
+                      const OGRGeoJSONWriteOptions &oOptions);
+
+static json_object *
+OGRGeoJSONWriteLineCoords(const OGRLineString *poLine,
+                          const OGRGeoJSONWriteOptions &oOptions);
+
+static json_object *
+OGRGeoJSONWriteRingCoords(const OGRLinearRing *poLine, bool bIsExteriorRing,
+                          const OGRGeoJSONWriteOptions &oOptions);
+
 /************************************************************************/
 /*                         SetRFC7946Settings()                         */
 /************************************************************************/
@@ -927,8 +955,8 @@ json_object *OGRGeoJSONWriteAttributes(OGRFeature *poFeature,
         else if (OFTInteger64 == eType)
         {
             if (eSubType == OFSTBoolean)
-                poObjProp = json_object_new_boolean(
-                    (json_bool)poFeature->GetFieldAsInteger64(nField));
+                poObjProp = json_object_new_boolean(static_cast<json_bool>(
+                    poFeature->GetFieldAsInteger64(nField)));
             else
                 poObjProp = json_object_new_int64(
                     poFeature->GetFieldAsInteger64(nField));
@@ -936,7 +964,7 @@ json_object *OGRGeoJSONWriteAttributes(OGRFeature *poFeature,
         else if (OFTReal == eType)
         {
             const double val = poFeature->GetFieldAsDouble(nField);
-            if (!CPLIsFinite(val))
+            if (!std::isfinite(val))
             {
                 if (!oOptions.bAllowNonFiniteValues)
                 {
@@ -1399,7 +1427,7 @@ json_object *OGRGeoJSONWriteCoords(double const &fX, double const &fY,
                                    const OGRGeoJSONWriteOptions &oOptions)
 {
     json_object *poObjCoords = nullptr;
-    if (CPLIsInf(fX) || CPLIsInf(fY) || CPLIsNan(fX) || CPLIsNan(fY))
+    if (std::isinf(fX) || std::isinf(fY) || std::isnan(fX) || std::isnan(fY))
     {
         CPLError(CE_Warning, CPLE_AppDefined,
                  "Infinite or NaN coordinate encountered");
@@ -1416,8 +1444,8 @@ json_object *OGRGeoJSONWriteCoords(double const &fX, double const &fY,
                                    double const &fZ,
                                    const OGRGeoJSONWriteOptions &oOptions)
 {
-    if (CPLIsInf(fX) || CPLIsInf(fY) || CPLIsInf(fZ) || CPLIsNan(fX) ||
-        CPLIsNan(fY) || CPLIsNan(fZ))
+    if (std::isinf(fX) || std::isinf(fY) || std::isinf(fZ) || std::isnan(fX) ||
+        std::isnan(fY) || std::isnan(fZ))
     {
         CPLError(CE_Warning, CPLE_AppDefined,
                  "Infinite or NaN coordinate encountered");
@@ -1500,6 +1528,67 @@ json_object *OGRGeoJSONWriteRingCoords(const OGRLinearRing *poLine,
     return poObjCoords;
 }
 
+/************************************************************************/
+/*             OGR_json_float_with_significant_figures_to_string()      */
+/************************************************************************/
+
+static int OGR_json_float_with_significant_figures_to_string(
+    struct json_object *jso, struct printbuf *pb, int /* level */,
+    int /* flags */)
+{
+    char szBuffer[75] = {};
+    int nSize = 0;
+    const float fVal = static_cast<float>(json_object_get_double(jso));
+    if (std::isnan(fVal))
+        nSize = CPLsnprintf(szBuffer, sizeof(szBuffer), "NaN");
+    else if (std::isinf(fVal))
+    {
+        if (fVal > 0)
+            nSize = CPLsnprintf(szBuffer, sizeof(szBuffer), "Infinity");
+        else
+            nSize = CPLsnprintf(szBuffer, sizeof(szBuffer), "-Infinity");
+    }
+    else
+    {
+        const void *userData =
+#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
+            jso->_userdata;
+#else
+            json_object_get_userdata(jso);
+#endif
+        const uintptr_t nSignificantFigures =
+            reinterpret_cast<uintptr_t>(userData);
+        const bool bSignificantFiguresIsNegative =
+            (nSignificantFigures >> (8 * sizeof(nSignificantFigures) - 1)) != 0;
+        const int nInitialSignificantFigures =
+            bSignificantFiguresIsNegative
+                ? 8
+                : static_cast<int>(nSignificantFigures);
+        nSize = OGRFormatFloat(szBuffer, sizeof(szBuffer), fVal,
+                               nInitialSignificantFigures, 'g');
+    }
+
+    return printbuf_memappend(pb, szBuffer, nSize);
+}
+
+/************************************************************************/
+/*              json_object_new_float_with_significant_figures()        */
+/************************************************************************/
+
+json_object *
+json_object_new_float_with_significant_figures(float fVal,
+                                               int nSignificantFigures)
+{
+    json_object *jso = json_object_new_double(fVal);
+    json_object_set_serializer(
+        jso, OGR_json_float_with_significant_figures_to_string,
+        reinterpret_cast<void *>(static_cast<uintptr_t>(nSignificantFigures)),
+        nullptr);
+    return jso;
+}
+
+/*! @endcond */
+
 /************************************************************************/
 /*                           OGR_G_ExportToJson                         */
 /************************************************************************/
@@ -1608,209 +1697,3 @@ char *OGR_G_ExportToJsonEx(OGRGeometryH hGeometry, char **papszOptions)
     // Translation failed.
     return nullptr;
 }
-
-/************************************************************************/
-/*               OGR_json_double_with_precision_to_string()             */
-/************************************************************************/
-
-static int OGR_json_double_with_precision_to_string(struct json_object *jso,
-                                                    struct printbuf *pb,
-                                                    int /* level */,
-                                                    int /* flags */)
-{
-    const void *userData =
-#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
-        jso->_userdata;
-#else
-        json_object_get_userdata(jso);
-#endif
-    // Precision is stored as a uintptr_t content casted to void*
-    const uintptr_t nPrecision = reinterpret_cast<uintptr_t>(userData);
-    char szBuffer[75] = {};
-    const double dfVal = json_object_get_double(jso);
-    if (fabs(dfVal) > 1e50 && !CPLIsInf(dfVal))
-    {
-        CPLsnprintf(szBuffer, sizeof(szBuffer), "%.18g", dfVal);
-    }
-    else
-    {
-        const bool bPrecisionIsNegative =
-            (nPrecision >> (8 * sizeof(nPrecision) - 1)) != 0;
-        OGRFormatDouble(szBuffer, sizeof(szBuffer), dfVal, '.',
-                        bPrecisionIsNegative ? 15
-                                             : static_cast<int>(nPrecision));
-    }
-    return printbuf_memappend(pb, szBuffer, static_cast<int>(strlen(szBuffer)));
-}
-
-/************************************************************************/
-/*                   json_object_new_double_with_precision()            */
-/************************************************************************/
-
-json_object *json_object_new_double_with_precision(double dfVal,
-                                                   int nCoordPrecision)
-{
-    json_object *jso = json_object_new_double(dfVal);
-    json_object_set_serializer(jso, OGR_json_double_with_precision_to_string,
-                               (void *)(uintptr_t)nCoordPrecision, nullptr);
-    return jso;
-}
-
-/************************************************************************/
-/*             OGR_json_double_with_significant_figures_to_string()     */
-/************************************************************************/
-
-static int OGR_json_double_with_significant_figures_to_string(
-    struct json_object *jso, struct printbuf *pb, int /* level */,
-    int /* flags */)
-{
-    char szBuffer[75] = {};
-    int nSize = 0;
-    const double dfVal = json_object_get_double(jso);
-    if (CPLIsNan(dfVal))
-        nSize = CPLsnprintf(szBuffer, sizeof(szBuffer), "NaN");
-    else if (CPLIsInf(dfVal))
-    {
-        if (dfVal > 0)
-            nSize = CPLsnprintf(szBuffer, sizeof(szBuffer), "Infinity");
-        else
-            nSize = CPLsnprintf(szBuffer, sizeof(szBuffer), "-Infinity");
-    }
-    else
-    {
-        char szFormatting[32] = {};
-        const void *userData =
-#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
-            jso->_userdata;
-#else
-            json_object_get_userdata(jso);
-#endif
-        const uintptr_t nSignificantFigures =
-            reinterpret_cast<uintptr_t>(userData);
-        const bool bSignificantFiguresIsNegative =
-            (nSignificantFigures >> (8 * sizeof(nSignificantFigures) - 1)) != 0;
-        const int nInitialSignificantFigures =
-            bSignificantFiguresIsNegative
-                ? 17
-                : static_cast<int>(nSignificantFigures);
-        CPLsnprintf(szFormatting, sizeof(szFormatting), "%%.%dg",
-                    nInitialSignificantFigures);
-        nSize = CPLsnprintf(szBuffer, sizeof(szBuffer), szFormatting, dfVal);
-        const char *pszDot = strchr(szBuffer, '.');
-
-        // Try to avoid .xxxx999999y or .xxxx000000y rounding issues by
-        // decreasing a bit precision.
-        if (nInitialSignificantFigures > 10 && pszDot != nullptr &&
-            (strstr(pszDot, "999999") != nullptr ||
-             strstr(pszDot, "000000") != nullptr))
-        {
-            bool bOK = false;
-            for (int i = 1; i <= 3; i++)
-            {
-                CPLsnprintf(szFormatting, sizeof(szFormatting), "%%.%dg",
-                            nInitialSignificantFigures - i);
-                nSize = CPLsnprintf(szBuffer, sizeof(szBuffer), szFormatting,
-                                    dfVal);
-                pszDot = strchr(szBuffer, '.');
-                if (pszDot != nullptr && strstr(pszDot, "999999") == nullptr &&
-                    strstr(pszDot, "000000") == nullptr)
-                {
-                    bOK = true;
-                    break;
-                }
-            }
-            if (!bOK)
-            {
-                CPLsnprintf(szFormatting, sizeof(szFormatting), "%%.%dg",
-                            nInitialSignificantFigures);
-                nSize = CPLsnprintf(szBuffer, sizeof(szBuffer), szFormatting,
-                                    dfVal);
-            }
-        }
-
-        if (nSize + 2 < static_cast<int>(sizeof(szBuffer)) &&
-            strchr(szBuffer, '.') == nullptr &&
-            strchr(szBuffer, 'e') == nullptr)
-        {
-            nSize +=
-                CPLsnprintf(szBuffer + nSize, sizeof(szBuffer) - nSize, ".0");
-        }
-    }
-
-    return printbuf_memappend(pb, szBuffer, nSize);
-}
-
-/************************************************************************/
-/*              json_object_new_double_with_significant_figures()       */
-/************************************************************************/
-
-json_object *
-json_object_new_double_with_significant_figures(double dfVal,
-                                                int nSignificantFigures)
-{
-    json_object *jso = json_object_new_double(dfVal);
-    json_object_set_serializer(
-        jso, OGR_json_double_with_significant_figures_to_string,
-        reinterpret_cast<void *>(static_cast<uintptr_t>(nSignificantFigures)),
-        nullptr);
-    return jso;
-}
-
-/************************************************************************/
-/*             OGR_json_float_with_significant_figures_to_string()      */
-/************************************************************************/
-
-static int OGR_json_float_with_significant_figures_to_string(
-    struct json_object *jso, struct printbuf *pb, int /* level */,
-    int /* flags */)
-{
-    char szBuffer[75] = {};
-    int nSize = 0;
-    const float fVal = static_cast<float>(json_object_get_double(jso));
-    if (CPLIsNan(fVal))
-        nSize = CPLsnprintf(szBuffer, sizeof(szBuffer), "NaN");
-    else if (CPLIsInf(fVal))
-    {
-        if (fVal > 0)
-            nSize = CPLsnprintf(szBuffer, sizeof(szBuffer), "Infinity");
-        else
-            nSize = CPLsnprintf(szBuffer, sizeof(szBuffer), "-Infinity");
-    }
-    else
-    {
-        const void *userData =
-#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
-            jso->_userdata;
-#else
-            json_object_get_userdata(jso);
-#endif
-        const uintptr_t nSignificantFigures =
-            reinterpret_cast<uintptr_t>(userData);
-        const bool bSignificantFiguresIsNegative =
-            (nSignificantFigures >> (8 * sizeof(nSignificantFigures) - 1)) != 0;
-        const int nInitialSignificantFigures =
-            bSignificantFiguresIsNegative
-                ? 8
-                : static_cast<int>(nSignificantFigures);
-        nSize = OGRFormatFloat(szBuffer, sizeof(szBuffer), fVal,
-                               nInitialSignificantFigures, 'g');
-    }
-
-    return printbuf_memappend(pb, szBuffer, nSize);
-}
-
-/************************************************************************/
-/*              json_object_new_float_with_significant_figures()        */
-/************************************************************************/
-
-json_object *
-json_object_new_float_with_significant_figures(float fVal,
-                                               int nSignificantFigures)
-{
-    json_object *jso = json_object_new_double(fVal);
-    json_object_set_serializer(
-        jso, OGR_json_float_with_significant_figures_to_string,
-        reinterpret_cast<void *>(static_cast<uintptr_t>(nSignificantFigures)),
-        nullptr);
-    return jso;
-}
diff --git a/ogr/ogrgeojsonwriter.h b/ogr/ogrgeojsonwriter.h
new file mode 100644
index 000000000000..7ac1adee803a
--- /dev/null
+++ b/ogr/ogrgeojsonwriter.h
@@ -0,0 +1,79 @@
+/******************************************************************************
+ * $Id$
+ *
+ * Project:  OpenGIS Simple Features Reference Implementation
+ * Purpose:  Defines GeoJSON reader within OGR OGRGeoJSON Driver.
+ * Author:   Mateusz Loskot, mateusz@loskot.net
+ *
+ ******************************************************************************
+ * Copyright (c) 2007, Mateusz Loskot
+ * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.com>
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#ifndef OGR_GEOJSONWRITER_H_INCLUDED
+#define OGR_GEOJSONWRITER_H_INCLUDED
+
+/*! @cond Doxygen_Suppress */
+
+#include "ogr_core.h"
+
+#include "cpl_json_header.h"
+#include "cpl_string.h"
+
+class OGRFeature;
+class OGRGeometry;
+class OGRPolygon;
+
+/************************************************************************/
+/*                 GeoJSON Geometry Translators                         */
+/************************************************************************/
+
+class CPL_DLL OGRGeoJSONWriteOptions
+{
+  public:
+    bool bWriteBBOX = false;
+    bool bBBOXRFC7946 = false;
+    int nXYCoordPrecision = -1;
+    int nZCoordPrecision = -1;
+    int nSignificantFigures = -1;
+    bool bPolygonRightHandRule = false;
+    bool bCanPatchCoordinatesWithNativeData = true;
+    bool bHonourReservedRFC7946Members = false;
+    CPLString osIDField{};
+    bool bForceIDFieldType = false;
+    bool bGenerateID = false;
+    OGRFieldType eForcedIDFieldType = OFTString;
+    bool bAllowNonFiniteValues = false;
+    bool bAutodetectJsonStrings = true;
+
+    void SetRFC7946Settings();
+    void SetIDOptions(CSLConstList papszOptions);
+};
+
+OGREnvelope3D CPL_DLL OGRGeoJSONGetBBox(const OGRGeometry *poGeometry,
+                                        const OGRGeoJSONWriteOptions &oOptions);
+
+json_object CPL_DLL *
+OGRGeoJSONWriteFeature(OGRFeature *poFeature,
+                       const OGRGeoJSONWriteOptions &oOptions);
+
+void OGRGeoJSONWriteId(const OGRFeature *poFeature, json_object *poObj,
+                       bool bIdAlreadyWritten,
+                       const OGRGeoJSONWriteOptions &oOptions);
+
+json_object *OGRGeoJSONWriteAttributes(
+    OGRFeature *poFeature, bool bWriteIdIfFoundInAttributes = true,
+    const OGRGeoJSONWriteOptions &oOptions = OGRGeoJSONWriteOptions());
+
+json_object CPL_DLL *
+OGRGeoJSONWriteGeometry(const OGRGeometry *poGeometry,
+                        const OGRGeoJSONWriteOptions &oOptions);
+
+json_object *OGRGeoJSONWritePolygon(const OGRPolygon *poPolygon,
+                                    const OGRGeoJSONWriteOptions &oOptions);
+
+/*! @endcond */
+
+#endif /* OGR_GEOJSONWRITER_H_INCLUDED */
diff --git a/ogr/ogrgeomcoordinateprecision.cpp b/ogr/ogrgeomcoordinateprecision.cpp
index 352d9e8273e9..dae7ddf6df05 100644
--- a/ogr/ogrgeomcoordinateprecision.cpp
+++ b/ogr/ogrgeomcoordinateprecision.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2024, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_core.h"
diff --git a/ogr/ogrgeometry.cpp b/ogr/ogrgeometry.cpp
index 52d91d4d21b2..e18e1b467526 100644
--- a/ogr/ogrgeometry.cpp
+++ b/ogr/ogrgeometry.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -153,6 +137,7 @@ OGRGeometry &OGRGeometry::operator=(const OGRGeometry &other)
 {
     if (this != &other)
     {
+        empty();
         assignSpatialReference(other.getSpatialReference());
         flags = other.flags;
     }
@@ -862,11 +847,13 @@ OGRwkbGeometryType OGRGeometry::getIsoGeometryType() const
  * This function is the same as the C function OGR_G_Segmentize()
  *
  * @param dfMaxLength the maximum distance between 2 points after segmentization
+ * @return (since 3.10) true in case of success, false in case of error.
  */
 
-void OGRGeometry::segmentize(CPL_UNUSED double dfMaxLength)
+bool OGRGeometry::segmentize(CPL_UNUSED double dfMaxLength)
 {
     // Do nothing.
+    return true;
 }
 
 /************************************************************************/
@@ -1080,16 +1067,17 @@ int OGR_G_IsMeasured(OGRGeometryH hGeom)
  * @deprecated use set3D() or setMeasured().
  *
  * @param nNewDimension New coordinate dimension value, either 2 or 3.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRGeometry::setCoordinateDimension(int nNewDimension)
+bool OGRGeometry::setCoordinateDimension(int nNewDimension)
 
 {
     if (nNewDimension == 2)
         flags &= ~OGR_G_3D;
     else
         flags |= OGR_G_3D;
-    setMeasured(FALSE);
+    return setMeasured(FALSE);
 }
 
 /**
@@ -1102,16 +1090,18 @@ void OGRGeometry::setCoordinateDimension(int nNewDimension)
  * children geometries.
  *
  * @param bIs3D Should the geometry have a Z dimension, either TRUE or FALSE.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  * @since GDAL 2.1
  */
 
-void OGRGeometry::set3D(OGRBoolean bIs3D)
+bool OGRGeometry::set3D(OGRBoolean bIs3D)
 
 {
     if (bIs3D)
         flags |= OGR_G_3D;
     else
         flags &= ~OGR_G_3D;
+    return true;
 }
 
 /**
@@ -1125,16 +1115,18 @@ void OGRGeometry::set3D(OGRBoolean bIs3D)
  *
  * @param bIsMeasured Should the geometry have a M dimension, either
  * TRUE or FALSE.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  * @since GDAL 2.1
  */
 
-void OGRGeometry::setMeasured(OGRBoolean bIsMeasured)
+bool OGRGeometry::setMeasured(OGRBoolean bIsMeasured)
 
 {
     if (bIsMeasured)
         flags |= OGR_G_MEASURED;
     else
         flags &= ~OGR_G_MEASURED;
+    return true;
 }
 
 /************************************************************************/
@@ -1793,19 +1785,33 @@ OGRErr OGRGeometry::importPreambleFromWkt(const char **ppszInput, int *pbHasZ,
     /* -------------------------------------------------------------------- */
     bool bHasM = false;
     bool bHasZ = false;
-    bool bIsoWKT = true;
+    bool bAlreadyGotDimension = false;
 
     char szToken[OGR_WKT_TOKEN_MAX] = {};
     pszInput = OGRWktReadToken(pszInput, szToken);
     if (szToken[0] != '\0')
     {
         // Postgis EWKT: POINTM instead of POINT M.
+        // Current QGIS versions (at least <= 3.38) also export POINTZ.
         const size_t nTokenLen = strlen(szToken);
-        if (szToken[nTokenLen - 1] == 'M')
+        if (szToken[nTokenLen - 1] == 'M' || szToken[nTokenLen - 1] == 'm')
         {
             szToken[nTokenLen - 1] = '\0';
             bHasM = true;
-            bIsoWKT = false;
+            bAlreadyGotDimension = true;
+
+            if (nTokenLen > 2 && (szToken[nTokenLen - 2] == 'Z' ||
+                                  szToken[nTokenLen - 2] == 'z'))
+            {
+                bHasZ = true;
+                szToken[nTokenLen - 2] = '\0';
+            }
+        }
+        else if (szToken[nTokenLen - 1] == 'Z' || szToken[nTokenLen - 1] == 'z')
+        {
+            szToken[nTokenLen - 1] = '\0';
+            bHasZ = true;
+            bAlreadyGotDimension = true;
         }
     }
 
@@ -1813,55 +1819,44 @@ OGRErr OGRGeometry::importPreambleFromWkt(const char **ppszInput, int *pbHasZ,
         return OGRERR_CORRUPT_DATA;
 
     /* -------------------------------------------------------------------- */
-    /*      Check for EMPTY ...                                             */
-    /* -------------------------------------------------------------------- */
-    const char *pszPreScan = OGRWktReadToken(pszInput, szToken);
-    if (!bIsoWKT)
-    {
-        // Go on.
-    }
-    else if (EQUAL(szToken, "EMPTY"))
-    {
-        *ppszInput = const_cast<char *>(pszPreScan);
-        *pbIsEmpty = true;
-        *pbHasM = bHasM;
-        empty();
-        return OGRERR_NONE;
-    }
-    /* -------------------------------------------------------------------- */
-    /*      Check for Z, M or ZM. Will ignore the Measure                   */
+    /*      Check for Z, M or ZM                                            */
     /* -------------------------------------------------------------------- */
-    else if (EQUAL(szToken, "Z"))
-    {
-        bHasZ = true;
-    }
-    else if (EQUAL(szToken, "M"))
-    {
-        bHasM = true;
-    }
-    else if (EQUAL(szToken, "ZM"))
+    if (!bAlreadyGotDimension)
     {
-        bHasZ = true;
-        bHasM = true;
+        const char *pszNewInput = OGRWktReadToken(pszInput, szToken);
+        if (EQUAL(szToken, "Z"))
+        {
+            pszInput = pszNewInput;
+            bHasZ = true;
+        }
+        else if (EQUAL(szToken, "M"))
+        {
+            pszInput = pszNewInput;
+            bHasM = true;
+        }
+        else if (EQUAL(szToken, "ZM"))
+        {
+            pszInput = pszNewInput;
+            bHasZ = true;
+            bHasM = true;
+        }
     }
     *pbHasZ = bHasZ;
     *pbHasM = bHasM;
 
-    if (bIsoWKT && (bHasZ || bHasM))
+    /* -------------------------------------------------------------------- */
+    /*      Check for EMPTY ...                                             */
+    /* -------------------------------------------------------------------- */
+    const char *pszNewInput = OGRWktReadToken(pszInput, szToken);
+    if (EQUAL(szToken, "EMPTY"))
     {
-        pszInput = pszPreScan;
-        pszPreScan = OGRWktReadToken(pszInput, szToken);
-        if (EQUAL(szToken, "EMPTY"))
-        {
-            *ppszInput = pszPreScan;
-            empty();
-            if (bHasZ)
-                set3D(TRUE);
-            if (bHasM)
-                setMeasured(TRUE);
-            *pbIsEmpty = true;
-            return OGRERR_NONE;
-        }
+        *ppszInput = pszNewInput;
+        *pbIsEmpty = true;
+        if (bHasZ)
+            set3D(TRUE);
+        if (bHasM)
+            setMeasured(TRUE);
+        return OGRERR_NONE;
     }
 
     if (!EQUAL(szToken, "("))
@@ -1870,10 +1865,10 @@ OGRErr OGRGeometry::importPreambleFromWkt(const char **ppszInput, int *pbHasZ,
     if (!bHasZ && !bHasM)
     {
         // Test for old-style XXXXXXXXX(EMPTY).
-        pszPreScan = OGRWktReadToken(pszPreScan, szToken);
+        pszNewInput = OGRWktReadToken(pszNewInput, szToken);
         if (EQUAL(szToken, "EMPTY"))
         {
-            pszPreScan = OGRWktReadToken(pszPreScan, szToken);
+            pszNewInput = OGRWktReadToken(pszNewInput, szToken);
 
             if (EQUAL(szToken, ","))
             {
@@ -1885,7 +1880,7 @@ OGRErr OGRGeometry::importPreambleFromWkt(const char **ppszInput, int *pbHasZ,
             }
             else
             {
-                *ppszInput = pszPreScan;
+                *ppszInput = pszNewInput;
                 empty();
                 *pbIsEmpty = true;
                 return OGRERR_NONE;
@@ -3100,7 +3095,7 @@ void OGR_G_FlattenTo2D(OGRGeometryH hGeom)
  * This method is the same as the C function OGR_G_ExportToGMLEx().
  *
  * @param papszOptions NULL-terminated list of options.
- * @return A GML fragment or NULL in case of error.
+ * @return A GML fragment to be freed with CPLFree() or NULL in case of error.
  */
 
 char *OGRGeometry::exportToGML(const char *const *papszOptions) const
@@ -3123,7 +3118,7 @@ char *OGRGeometry::exportToGML(const char *const *papszOptions) const
  *
  * This method is the same as the C function OGR_G_ExportToKML().
  *
- * @return A KML fragment or NULL in case of error.
+ * @return A KML fragment to be freed with CPLFree() or NULL in case of error.
  */
 
 char *OGRGeometry::exportToKML() const
@@ -3154,7 +3149,7 @@ char *OGRGeometry::exportToKML() const
  * This method is the same as the C function OGR_G_ExportToJson().
  *
  * @param papszOptions Null terminated list of options, or null (added in 3.9)
- * @return A GeoJSON fragment or NULL in case of error.
+ * @return A GeoJSON fragment to be freed with CPLFree() or NULL in case of error.
  */
 
 char *OGRGeometry::exportToJson(CSLConstList papszOptions) const
@@ -3206,7 +3201,7 @@ int OGRGetGenerate_DB2_V72_BYTE_ORDER()
 /************************************************************************/
 
 /** Create a new GEOS context.
- * @return a new GEOS context.
+ * @return a new GEOS context (to be freed with freeGEOSContext())
  */
 GEOSContextHandle_t OGRGeometry::createGEOSContext()
 {
@@ -3269,10 +3264,14 @@ static GEOSGeom convertToGEOSGeom(GEOSContextHandle_t hGEOSCtxt,
 /** Returns a GEOSGeom object corresponding to the geometry.
  *
  * @param hGEOSCtxt GEOS context
- * @return a GEOSGeom object corresponding to the geometry.
+ * @param bRemoveEmptyParts Whether empty parts of the geometry should be
+ * removed before exporting to GEOS (GDAL >= 3.10)
+ * @return a GEOSGeom object corresponding to the geometry (to be freed with
+ * GEOSGeom_destroy_r()), or NULL in case of error
  */
 GEOSGeom
-OGRGeometry::exportToGEOS(UNUSED_IF_NO_GEOS GEOSContextHandle_t hGEOSCtxt) const
+OGRGeometry::exportToGEOS(UNUSED_IF_NO_GEOS GEOSContextHandle_t hGEOSCtxt,
+                          UNUSED_IF_NO_GEOS bool bRemoveEmptyParts) const
 
 {
 #ifndef HAVE_GEOS
@@ -3301,6 +3300,8 @@ OGRGeometry::exportToGEOS(UNUSED_IF_NO_GEOS GEOSContextHandle_t hGEOSCtxt) const
     if (hasCurveGeometry())
     {
         poLinearGeom = getLinearGeometry();
+        if (bRemoveEmptyParts)
+            poLinearGeom->removeEmptyParts();
 #if (GEOS_VERSION_MAJOR == 3 && GEOS_VERSION_MINOR < 12)
         // GEOS < 3.12 doesn't support M dimension
         if (poLinearGeom->IsMeasured())
@@ -3315,9 +3316,17 @@ OGRGeometry::exportToGEOS(UNUSED_IF_NO_GEOS GEOSContextHandle_t hGEOSCtxt) const
         if (IsMeasured())
         {
             poLinearGeom = clone();
+            if (bRemoveEmptyParts)
+                poLinearGeom->removeEmptyParts();
             poLinearGeom->setMeasured(FALSE);
         }
+        else
 #endif
+            if (bRemoveEmptyParts && hasEmptyParts())
+        {
+            poLinearGeom = clone();
+            poLinearGeom->removeEmptyParts();
+        }
     }
     if (eType == wkbTriangle)
     {
@@ -3445,7 +3454,7 @@ OGRBoolean OGRGeometry::hasCurveGeometry(CPL_UNUSED int bLookForNonLinear) const
  *                     See OGRGeometryFactory::curveToLineString() for
  *                     valid options.
  *
- * @return a new geometry.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  *
  * @since GDAL 2.0
  */
@@ -3480,7 +3489,7 @@ OGRGeometry::getLinearGeometry(CPL_UNUSED double dfMaxAngleStepSizeDegrees,
  * @param papszOptions options as a null-terminated list of strings.
  *                     Unused for now. Must be set to NULL.
  *
- * @return a new geometry.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  *
  * @since GDAL 2.0
  */
@@ -3838,7 +3847,12 @@ static OGRBoolean OGRGEOSBooleanPredicate(
 /**
  * \brief Attempts to make an invalid geometry valid without losing vertices.
  *
- * Already-valid geometries are cloned without further intervention.
+ * Already-valid geometries are cloned without further intervention
+ * for default MODE=LINEWORK. Already-valid geometries with MODE=STRUCTURE
+ * may be subject to non-significant transformations, such as duplicated point
+ * removal, change in ring winding order, etc. (before GDAL 3.10, single-part
+ * geometry collections could be returned a single geometry. GDAL 3.10
+ * returns the same type of geometry).
  *
  * Running OGRGeometryFactory::removeLowerDimensionSubGeoms() as a
  * post-processing step is often desired.
@@ -3864,8 +3878,7 @@ static OGRBoolean OGRGEOSBooleanPredicate(
  *     NO (default): collapses are converted to empty geometries
  *     YES: collapses are converted to a valid geometry of lower dimension.</li>
  * </ul>
- * @return a newly allocated geometry now owned by the caller, or NULL
- * on failure.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  *
  * @since GDAL 3.0
  */
@@ -3950,6 +3963,20 @@ OGRGeometry *OGRGeometry::MakeValid(CSLConstList papszOptions) const
             poOGRProduct =
                 OGRGeometryRebuildCurves(this, nullptr, poOGRProduct);
             GEOSGeom_destroy_r(hGEOSCtxt, hGEOSRet);
+
+#if GEOS_VERSION_MAJOR > 3 ||                                                  \
+    (GEOS_VERSION_MAJOR == 3 && GEOS_VERSION_MINOR >= 10)
+            // METHOD=STRUCTURE is not guaranteed to return a multiple geometry
+            // if the input is a multiple geometry
+            if (poOGRProduct && bStructureMethod &&
+                OGR_GT_IsSubClassOf(getGeometryType(), wkbGeometryCollection) &&
+                !OGR_GT_IsSubClassOf(poOGRProduct->getGeometryType(),
+                                     wkbGeometryCollection))
+            {
+                poOGRProduct = OGRGeometryFactory::forceTo(poOGRProduct,
+                                                           getGeometryType());
+            }
+#endif
         }
     }
     freeGEOSContext(hGEOSCtxt);
@@ -3976,8 +4003,8 @@ OGRGeometry *OGRGeometry::MakeValid(CSLConstList papszOptions) const
  *
  * @param hGeom The Geometry to make valid.
  *
- * @return a newly allocated geometry now owned by the caller, or NULL
- * on failure.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  *
  * @since GDAL 3.0
  */
@@ -4006,8 +4033,8 @@ OGRGeometryH OGR_G_MakeValid(OGRGeometryH hGeom)
  * @param hGeom The Geometry to make valid.
  * @param papszOptions Options.
  *
- * @return a newly allocated geometry now owned by the caller, or NULL
- * on failure.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  *
  * @since GDAL 3.4
  */
@@ -4035,8 +4062,7 @@ OGRGeometryH OGR_G_MakeValidEx(OGRGeometryH hGeom, CSLConstList papszOptions)
  * If OGR is built without the GEOS library, this function will always fail,
  * issuing a CPLE_NotSupported error.
  *
- * @return a newly allocated geometry now owned by the caller, or NULL
- * on failure.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  *
  * @since GDAL 3.3
  */
@@ -4086,8 +4112,8 @@ OGRGeometry *OGRGeometry::Normalize() const
  * issuing a CPLE_NotSupported error.
  * @param hGeom The Geometry to normalize.
  *
- * @return a newly allocated geometry now owned by the caller, or NULL
- * on failure.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  *
  * @since GDAL 3.3
  */
@@ -4117,8 +4143,7 @@ OGRGeometryH OGR_G_Normalize(OGRGeometryH hGeom)
  * If OGR is built without the GEOS library, this method will always fail,
  * issuing a CPLE_NotSupported error.
  *
- * @return a newly allocated geometry now owned by the caller, or NULL
- * on failure.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  */
 
 OGRGeometry *OGRGeometry::ConvexHull() const
@@ -4197,8 +4222,8 @@ OGRGeometry *OGRGeometry::ConvexHull() const
  *
  * @param hTarget The Geometry to calculate the convex hull of.
  *
- * @return a handle to a newly allocated geometry now owned by the caller,
- *         or NULL on failure.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  */
 
 OGRGeometryH OGR_G_ConvexHull(OGRGeometryH hTarget)
@@ -4235,8 +4260,8 @@ OGRGeometryH OGR_G_ConvexHull(OGRGeometryH hTarget)
  * @param dfRatio Ratio of the area of the convex hull and the concave hull.
  * @param bAllowHoles Whether holes are allowed.
  *
- * @return a newly allocated geometry now owned by the caller, or NULL
- * on failure.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
+ *
  * @since GDAL 3.6
  */
 
@@ -4298,8 +4323,9 @@ OGRGeometry *OGRGeometry::ConcaveHull(double dfRatio, bool bAllowHoles) const
  * @param dfRatio Ratio of the area of the convex hull and the concave hull.
  * @param bAllowHoles Whether holes are allowed.
  *
- * @return a handle to a newly allocated geometry now owned by the caller,
- *         or NULL on failure.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
+ *
  * @since GDAL 3.6
  */
 
@@ -4330,8 +4356,7 @@ OGRGeometryH OGR_G_ConcaveHull(OGRGeometryH hTarget, double dfRatio,
  * If OGR is built without the GEOS library, this method will always fail,
  * issuing a CPLE_NotSupported error.
  *
- * @return a newly allocated geometry now owned by the caller, or NULL
- * on failure.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  *
  * @since OGR 1.8.0
  */
@@ -4399,8 +4424,8 @@ OGRGeometry *OGRGeometry::getBoundary() const
  *
  * @param hTarget The Geometry to calculate the boundary of.
  *
- * @return a handle to a newly allocated geometry now owned by the caller,
- *         or NULL on failure.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  *
  * @since OGR 1.8.0
  */
@@ -4458,7 +4483,7 @@ OGRGeometryH OGR_G_GetBoundary(OGRGeometryH hTarget)
  * @param nQuadSegs the number of segments used to approximate a 90
  * degree (quadrant) of curvature.
  *
- * @return the newly created geometry, or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  */
 
 OGRGeometry *OGRGeometry::Buffer(UNUSED_IF_NO_GEOS double dfDist,
@@ -4524,7 +4549,8 @@ OGRGeometry *OGRGeometry::Buffer(UNUSED_IF_NO_GEOS double dfDist,
  * @param nQuadSegs the number of segments used to approximate a 90 degree
  * (quadrant) of curvature.
  *
- * @return the newly created geometry, or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  */
 
 OGRGeometryH OGR_G_Buffer(OGRGeometryH hTarget, double dfDist, int nQuadSegs)
@@ -4565,7 +4591,8 @@ OGRGeometryH OGR_G_Buffer(OGRGeometryH hTarget, double dfDist, int nQuadSegs)
  *               the same unit as the coordinates of the geometry.
  * @param papszOptions NULL terminated list of options (may be NULL)
  *
- * @return the newly created geometry, or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
+ *
  * @since GDAL 3.10
  */
 
@@ -4780,7 +4807,9 @@ OGRGeometry::BufferEx(UNUSED_IF_NO_GEOS double dfDist,
  *               the same unit as the coordinates of the geometry.
  * @param papszOptions NULL terminated list of options (may be NULL)
  *
- * @return the newly created geometry, or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
+ *
  * @since GDAL 3.10
  */
 
@@ -4818,8 +4847,9 @@ OGRGeometryH OGR_G_BufferEx(OGRGeometryH hTarget, double dfDist,
  *
  * @param poOtherGeom the other geometry intersected with "this" geometry.
  *
- * @return a new geometry representing the intersection or NULL if there is
- * no intersection or an error occurs.
+ * @return a new geometry to be freed by the caller, or NULL if there is no
+ * intersection or if an error occurs.
+ *
  */
 
 OGRGeometry *
@@ -4902,8 +4932,8 @@ OGRGeometry::Intersection(UNUSED_PARAMETER const OGRGeometry *poOtherGeom) const
  * @param hThis the geometry.
  * @param hOther the other geometry.
  *
- * @return a new geometry representing the intersection or NULL if there is
- * no intersection or an error occurs.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if there is not intersection of if an error occurs.
  */
 
 OGRGeometryH OGR_G_Intersection(OGRGeometryH hThis, OGRGeometryH hOther)
@@ -4938,7 +4968,7 @@ OGRGeometryH OGR_G_Intersection(OGRGeometryH hThis, OGRGeometryH hOther)
  *
  * @param poOtherGeom the other geometry unioned with "this" geometry.
  *
- * @return a new geometry representing the union or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  */
 
 OGRGeometry *
@@ -5019,7 +5049,8 @@ OGRGeometry::Union(UNUSED_PARAMETER const OGRGeometry *poOtherGeom) const
  * @param hThis the geometry.
  * @param hOther the other geometry.
  *
- * @return a new geometry representing the union or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  */
 
 OGRGeometryH OGR_G_Union(OGRGeometryH hThis, OGRGeometryH hOther)
@@ -5051,7 +5082,7 @@ OGRGeometryH OGR_G_Union(OGRGeometryH hThis, OGRGeometryH hOther)
  * If OGR is built without the GEOS library, this method will always fail,
  * issuing a CPLE_NotSupported error.
  *
- * @return a new geometry representing the union or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  *
  * @since OGR 1.8.0
  *
@@ -5117,7 +5148,8 @@ OGRGeometry *OGRGeometry::UnionCascaded() const
  *
  * @param hThis the geometry.
  *
- * @return a new geometry representing the union or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  *
  * @deprecated Use OGR_G_UnaryUnion() instead
  */
@@ -5150,7 +5182,7 @@ OGRGeometryH OGR_G_UnionCascaded(OGRGeometryH hThis)
  * If OGR is built without the GEOS library, this method will always fail,
  * issuing a CPLE_NotSupported error.
  *
- * @return a new geometry representing the union or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  *
  * @since GDAL 3.7
  */
@@ -5217,7 +5249,8 @@ OGRGeometry *OGRGeometry::UnaryUnion() const
  *
  * @param hThis the geometry.
  *
- * @return a new geometry representing the union or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  *
  * @since GDAL 3.7
  */
@@ -5253,8 +5286,8 @@ OGRGeometryH OGR_G_UnaryUnion(OGRGeometryH hThis)
  *
  * @param poOtherGeom the other geometry removed from "this" geometry.
  *
- * @return a new geometry representing the difference or NULL if the
- * difference is empty or an error occurs.
+ * @return a new geometry to be freed by the caller, or NULL if the difference
+ * is empty or if an error occurs.
  */
 
 OGRGeometry *
@@ -5336,8 +5369,8 @@ OGRGeometry::Difference(UNUSED_PARAMETER const OGRGeometry *poOtherGeom) const
  * @param hThis the geometry.
  * @param hOther the other geometry.
  *
- * @return a new geometry representing the difference or NULL if the
- * difference is empty or an error occurs.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if the difference is empty or if an error occurs.
  */
 
 OGRGeometryH OGR_G_Difference(OGRGeometryH hThis, OGRGeometryH hOther)
@@ -5372,8 +5405,8 @@ OGRGeometryH OGR_G_Difference(OGRGeometryH hThis, OGRGeometryH hOther)
  *
  * @param poOtherGeom the other geometry.
  *
- * @return a new geometry representing the symmetric difference or NULL if the
- * difference is empty or an error occurs.
+ * @return a new geometry to be freed by the caller, or NULL if the difference
+ * is empty or if an error occurs.
  *
  * @since OGR 1.8.0
  */
@@ -5458,8 +5491,8 @@ OGRGeometry::SymmetricDifference(const OGRGeometry *poOtherGeom) const
  * @param hThis the geometry.
  * @param hOther the other geometry.
  *
- * @return a new geometry representing the symmetric difference or NULL if the
- * difference is empty or an error occurs.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if the difference is empty or if an error occurs.
  *
  * @since OGR 1.8.0
  */
@@ -6046,7 +6079,8 @@ OGRErr OGRGeometry::Centroid(OGRPoint *poPoint) const
 #else
 
     GEOSContextHandle_t hGEOSCtxt = createGEOSContext();
-    GEOSGeom hThisGeosGeom = exportToGEOS(hGEOSCtxt);
+    GEOSGeom hThisGeosGeom =
+        exportToGEOS(hGEOSCtxt, /* bRemoveEmptyParts = */ true);
 
     if (hThisGeosGeom != nullptr)
     {
@@ -6169,8 +6203,8 @@ int OGR_G_Centroid(OGRGeometryH hGeom, OGRGeometryH hCentroidPoint)
  * issuing a CPLE_NotSupported error.
  *
  * @param hGeom the geometry to operate on.
- * @return a point guaranteed to lie on the surface or NULL if an error
- *         occurred.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  *
  * @since OGR 1.10
  */
@@ -6281,7 +6315,7 @@ OGRErr OGRGeometry::PointOnSurfaceInternal(OGRPoint *poPoint) const
  *
  * @param dTolerance the distance tolerance for the simplification.
  *
- * @return the simplified geometry or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  *
  * @since OGR 1.8.0
  */
@@ -6330,7 +6364,8 @@ OGRGeometry *OGRGeometry::Simplify(UNUSED_IF_NO_GEOS double dTolerance) const
  * @param hThis the geometry.
  * @param dTolerance the distance tolerance for the simplification.
  *
- * @return the simplified geometry or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  *
  * @since OGR 1.8.0
  */
@@ -6359,7 +6394,7 @@ OGRGeometryH OGR_G_Simplify(OGRGeometryH hThis, double dTolerance)
  *
  * @param dTolerance the distance tolerance for the simplification.
  *
- * @return the simplified geometry or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  *
  * @since OGR 1.9.0
  */
@@ -6410,7 +6445,8 @@ OGRGeometry::SimplifyPreserveTopology(UNUSED_IF_NO_GEOS double dTolerance) const
  * @param hThis the geometry.
  * @param dTolerance the distance tolerance for the simplification.
  *
- * @return the simplified geometry or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  *
  * @since OGR 1.9.0
  */
@@ -6527,7 +6563,7 @@ void OGRGeometry::roundCoordinates(const OGRGeomCoordinatePrecision &sPrecision)
  * @param nFlags The bitwise OR of zero, one or several of OGR_GEOS_PREC_NO_TOPO
  *               and OGR_GEOS_PREC_KEEP_COLLAPSED
  *
- * @return a new geometry or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  *
  * @since GDAL 3.9
  */
@@ -6585,7 +6621,8 @@ OGRGeometry *OGRGeometry::SetPrecision(UNUSED_IF_NO_GEOS double dfGridSize,
  * @param nFlags The bitwise OR of zero, one or several of OGR_GEOS_PREC_NO_TOPO
  *               and OGR_GEOS_PREC_KEEP_COLLAPSED
  *
- * @return a new geometry or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  *
  * @since GDAL 3.9
  */
@@ -6614,8 +6651,7 @@ OGRGeometryH OGR_G_SetPrecision(OGRGeometryH hThis, double dfGridSize,
  * @param bOnlyEdges if TRUE, will return a MULTILINESTRING, otherwise it will
  *                   return a GEOMETRYCOLLECTION containing triangular POLYGONs.
  *
- * @return the geometry resulting from the Delaunay triangulation or
- * NULL if an error occurs.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  *
  * @since OGR 2.1
  */
@@ -6667,8 +6703,8 @@ OGRGeometry *OGRGeometry::DelaunayTriangulation(double dfTolerance,
  * @param bOnlyEdges if TRUE, will return a MULTILINESTRING, otherwise it will
  *                   return a GEOMETRYCOLLECTION containing triangular POLYGONs.
  *
- * @return the geometry resulting from the Delaunay triangulation or
- * NULL if an error occurs.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  *
  * @since OGR 2.1
  */
@@ -6708,8 +6744,7 @@ OGRGeometryH OGR_G_DelaunayTriangulation(OGRGeometryH hThis, double dfTolerance,
  * If OGR is built without the GEOS library, this method will always fail,
  * issuing a CPLE_NotSupported error.
  *
- * @return a newly allocated geometry now owned by the caller, or NULL
- * on failure.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  *
  * @since OGR 1.9.0
  */
@@ -6798,8 +6833,8 @@ OGRGeometry *OGRGeometry::Polygonize() const
  *
  * @param hTarget The Geometry to be polygonized.
  *
- * @return a handle to a newly allocated geometry now owned by the caller,
- *         or NULL on failure.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  *
  * @since OGR 1.9.0
  */
@@ -6924,7 +6959,7 @@ OGRCreatePreparedGeometry(UNUSED_IF_NO_GEOS OGRGeometryH hGeom)
 /************************************************************************/
 
 /** Destroys a prepared geometry.
- * @param hPreparedGeom preprated geometry.
+ * @param hPreparedGeom prepared geometry.
  * @since GDAL 3.3
  */
 void OGRDestroyPreparedGeometry(
@@ -8542,3 +8577,34 @@ bool OGRGeometry::IsRectangle() const
 
     return false;
 }
+
+/************************************************************************/
+/*                           hasEmptyParts()                            */
+/************************************************************************/
+
+/**
+ * \brief Returns whether a geometry has empty parts/rings.
+ *
+ * Returns true if removeEmptyParts() will modify the geometry.
+ *
+ * This is different from IsEmpty().
+ *
+ * @since GDAL 3.10
+ */
+bool OGRGeometry::hasEmptyParts() const
+{
+    return false;
+}
+
+/************************************************************************/
+/*                          removeEmptyParts()                          */
+/************************************************************************/
+
+/**
+ * \brief Remove empty parts/rings from this geometry.
+ *
+ * @since GDAL 3.10
+ */
+void OGRGeometry::removeEmptyParts()
+{
+}
diff --git a/ogr/ogrgeometrycollection.cpp b/ogr/ogrgeometrycollection.cpp
index 09828abdb53c..915dc7f0ca86 100644
--- a/ogr/ogrgeometrycollection.cpp
+++ b/ogr/ogrgeometrycollection.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -32,6 +16,7 @@
 
 #include <cstddef>
 #include <cstring>
+#include <limits>
 #include <new>
 
 #include "cpl_conv.h"
@@ -43,16 +28,6 @@
 #include "ogr_p.h"
 #include "ogr_spatialref.h"
 
-/************************************************************************/
-/*                       OGRGeometryCollection()                        */
-/************************************************************************/
-
-/**
- * \brief Create an empty geometry collection.
- */
-
-OGRGeometryCollection::OGRGeometryCollection() = default;
-
 /************************************************************************/
 /*         OGRGeometryCollection( const OGRGeometryCollection& )        */
 /************************************************************************/
@@ -71,7 +46,7 @@ OGRGeometryCollection::OGRGeometryCollection(const OGRGeometryCollection &other)
 {
     // Do not use addGeometry() as it is virtual.
     papoGeoms = static_cast<OGRGeometry **>(
-        VSI_CALLOC_VERBOSE(sizeof(void *), other.nGeomCount));
+        VSI_CALLOC_VERBOSE(sizeof(OGRGeometry *), other.nGeomCount));
     if (papoGeoms)
     {
         nGeomCount = other.nGeomCount;
@@ -110,13 +85,28 @@ OGRGeometryCollection::operator=(const OGRGeometryCollection &other)
 {
     if (this != &other)
     {
-        empty();
-
         OGRGeometry::operator=(other);
 
-        for (int i = 0; i < other.nGeomCount; i++)
+        for (const auto *poOtherSubGeom : other)
+        {
+            if (!isCompatibleSubType(poOtherSubGeom->getGeometryType()))
+            {
+                CPLError(CE_Failure, CPLE_AppDefined,
+                         "Illegal use of OGRGeometryCollection::operator=(): "
+                         "trying to assign an incompatible sub-geometry");
+                return *this;
+            }
+        }
+
+        papoGeoms = static_cast<OGRGeometry **>(
+            VSI_CALLOC_VERBOSE(sizeof(OGRGeometry *), other.nGeomCount));
+        if (papoGeoms)
         {
-            addGeometry(other.papoGeoms[i]);
+            nGeomCount = other.nGeomCount;
+            for (int i = 0; i < other.nGeomCount; i++)
+            {
+                papoGeoms[i] = other.papoGeoms[i]->clone();
+            }
         }
     }
     return *this;
@@ -131,7 +121,7 @@ void OGRGeometryCollection::empty()
 {
     if (papoGeoms != nullptr)
     {
-        for (auto &&poSubGeom : *this)
+        for (auto &poSubGeom : *this)
         {
             delete poSubGeom;
         }
@@ -179,7 +169,7 @@ int OGRGeometryCollection::getDimension() const
     int nDimension = 0;
     // FIXME? Not sure if it is really appropriate to take the max in case
     // of geometries of different dimension.
-    for (auto &&poSubGeom : *this)
+    for (const auto &poSubGeom : *this)
     {
         int nSubGeomDimension = poSubGeom->getDimension();
         if (nSubGeomDimension > nDimension)
@@ -199,7 +189,7 @@ int OGRGeometryCollection::getDimension() const
 void OGRGeometryCollection::flattenTo2D()
 
 {
-    for (auto &&poSubGeom : *this)
+    for (auto &poSubGeom : *this)
     {
         poSubGeom->flattenTo2D();
     }
@@ -361,10 +351,26 @@ OGRErr OGRGeometryCollection::addGeometryDirectly(OGRGeometry *poNewGeom)
     if (!isCompatibleSubType(poNewGeom->getGeometryType()))
         return OGRERR_UNSUPPORTED_GEOMETRY_TYPE;
 
+#if SIZEOF_VOIDP < 8
+    if (nGeomCount == std::numeric_limits<int>::max() /
+                          static_cast<int>(sizeof(OGRGeometry *)))
+    {
+        CPLError(CE_Failure, CPLE_OutOfMemory, "Too many subgeometries");
+        return OGRERR_FAILURE;
+    }
+#else
+    if (nGeomCount == std::numeric_limits<int>::max())
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Too many subgeometries");
+        return OGRERR_FAILURE;
+    }
+#endif
+
     HomogenizeDimensionalityWith(poNewGeom);
 
-    OGRGeometry **papoNewGeoms = static_cast<OGRGeometry **>(
-        VSI_REALLOC_VERBOSE(papoGeoms, sizeof(void *) * (nGeomCount + 1)));
+    OGRGeometry **papoNewGeoms =
+        static_cast<OGRGeometry **>(VSI_REALLOC_VERBOSE(
+            papoGeoms, sizeof(OGRGeometry *) * (nGeomCount + 1)));
     if (papoNewGeoms == nullptr)
         return OGRERR_FAILURE;
 
@@ -422,7 +428,8 @@ OGRErr OGRGeometryCollection::addGeometry(std::unique_ptr<OGRGeometry> geom)
  *
  * @param bDelete if TRUE the geometry will be deallocated, otherwise it will
  * not.  The default is TRUE as the container is considered to own the
- * geometries in it.
+ * geometries in it. Note: using stealGeometry() might be a better alternative
+ * to using bDelete = false.
  *
  * @return OGRERR_NONE if successful, or OGRERR_FAILURE if the index is
  * out of range.
@@ -446,13 +453,70 @@ OGRErr OGRGeometryCollection::removeGeometry(int iGeom, int bDelete)
         delete papoGeoms[iGeom];
 
     memmove(papoGeoms + iGeom, papoGeoms + iGeom + 1,
-            sizeof(void *) * (nGeomCount - iGeom - 1));
+            sizeof(OGRGeometry *) * (nGeomCount - iGeom - 1));
 
     nGeomCount--;
 
     return OGRERR_NONE;
 }
 
+/************************************************************************/
+/*                           stealGeometry()                            */
+/************************************************************************/
+
+/**
+ * \brief Remove a geometry from the container and return it to the caller
+ *
+ * Removing a geometry will cause the geometry count to drop by one, and all
+ * "higher" geometries will shuffle down one in index.
+ *
+ * There is no SFCOM analog to this method.
+ *
+ * @param iGeom the index of the geometry to delete.
+ *
+ * @return the sub-geometry, or nullptr in case of error.
+ * @since 3.10
+ */
+
+std::unique_ptr<OGRGeometry> OGRGeometryCollection::stealGeometry(int iGeom)
+{
+    if (iGeom < 0 || iGeom >= nGeomCount)
+        return nullptr;
+
+    auto poSubGeom = std::unique_ptr<OGRGeometry>(papoGeoms[iGeom]);
+    papoGeoms[iGeom] = nullptr;
+    removeGeometry(iGeom);
+    return poSubGeom;
+}
+
+/************************************************************************/
+/*                           hasEmptyParts()                            */
+/************************************************************************/
+
+bool OGRGeometryCollection::hasEmptyParts() const
+{
+    for (const auto &poSubGeom : *this)
+    {
+        if (poSubGeom->IsEmpty() || poSubGeom->hasEmptyParts())
+            return true;
+    }
+    return false;
+}
+
+/************************************************************************/
+/*                          removeEmptyParts()                          */
+/************************************************************************/
+
+void OGRGeometryCollection::removeEmptyParts()
+{
+    for (int i = nGeomCount - 1; i >= 0; --i)
+    {
+        papoGeoms[i]->removeEmptyParts();
+        if (papoGeoms[i]->IsEmpty())
+            removeGeometry(i, true);
+    }
+}
+
 /************************************************************************/
 /*                              WkbSize()                               */
 /*                                                                      */
@@ -508,7 +572,7 @@ OGRErr OGRGeometryCollection::importFromWkbInternal(
 
     // coverity[tainted_data]
     papoGeoms = static_cast<OGRGeometry **>(
-        VSI_CALLOC_VERBOSE(sizeof(void *), nGeomCount));
+        VSI_CALLOC_VERBOSE(sizeof(OGRGeometry *), nGeomCount));
     if (nGeomCount != 0 && papoGeoms == nullptr)
     {
         nGeomCount = 0;
@@ -858,11 +922,10 @@ std::string OGRGeometryCollection::exportToWktInternal(
 
     try
     {
-        for (int i = 0; i < nGeomCount; ++i)
+        for (const auto &poSubGeom : *this)
         {
-            OGRGeometry *geom = papoGeoms[i];
             OGRErr subgeomErr = OGRERR_NONE;
-            std::string tempWkt = geom->exportToWkt(opts, &subgeomErr);
+            std::string tempWkt = poSubGeom->exportToWkt(opts, &subgeomErr);
             if (subgeomErr != OGRERR_NONE)
             {
                 if (err)
@@ -948,7 +1011,7 @@ void OGRGeometryCollection::getEnvelope(OGREnvelope3D *psEnvelope) const
     bool bExtentSet = false;
 
     *psEnvelope = OGREnvelope3D();
-    for (auto &&poSubGeom : *this)
+    for (const auto &poSubGeom : *this)
     {
         if (!poSubGeom->IsEmpty())
         {
@@ -1009,7 +1072,7 @@ OGRErr OGRGeometryCollection::transform(OGRCoordinateTransformation *poCT)
 
 {
     int iGeom = 0;
-    for (auto &&poSubGeom : *this)
+    for (auto &poSubGeom : *this)
     {
         const OGRErr eErr = poSubGeom->transform(poCT);
         if (eErr != OGRERR_NONE)
@@ -1041,7 +1104,7 @@ OGRErr OGRGeometryCollection::transform(OGRCoordinateTransformation *poCT)
 void OGRGeometryCollection::closeRings()
 
 {
-    for (auto &&poSubGeom : *this)
+    for (auto &poSubGeom : *this)
     {
         if (OGR_GT_IsSubClassOf(wkbFlatten(poSubGeom->getGeometryType()),
                                 wkbCurvePolygon))
@@ -1056,35 +1119,38 @@ void OGRGeometryCollection::closeRings()
 /*                       setCoordinateDimension()                       */
 /************************************************************************/
 
-void OGRGeometryCollection::setCoordinateDimension(int nNewDimension)
+bool OGRGeometryCollection::setCoordinateDimension(int nNewDimension)
 
 {
-    for (auto &&poSubGeom : *this)
+    for (auto &poSubGeom : *this)
     {
-        poSubGeom->setCoordinateDimension(nNewDimension);
+        if (!poSubGeom->setCoordinateDimension(nNewDimension))
+            return false;
     }
 
-    OGRGeometry::setCoordinateDimension(nNewDimension);
+    return OGRGeometry::setCoordinateDimension(nNewDimension);
 }
 
-void OGRGeometryCollection::set3D(OGRBoolean bIs3D)
+bool OGRGeometryCollection::set3D(OGRBoolean bIs3D)
 {
-    for (auto &&poSubGeom : *this)
+    for (auto &poSubGeom : *this)
     {
-        poSubGeom->set3D(bIs3D);
+        if (!poSubGeom->set3D(bIs3D))
+            return false;
     }
 
-    OGRGeometry::set3D(bIs3D);
+    return OGRGeometry::set3D(bIs3D);
 }
 
-void OGRGeometryCollection::setMeasured(OGRBoolean bIsMeasured)
+bool OGRGeometryCollection::setMeasured(OGRBoolean bIsMeasured)
 {
-    for (auto &&poSubGeom : *this)
+    for (auto &poSubGeom : *this)
     {
-        poSubGeom->setMeasured(bIsMeasured);
+        if (!poSubGeom->setMeasured(bIsMeasured))
+            return false;
     }
 
-    OGRGeometry::setMeasured(bIsMeasured);
+    return OGRGeometry::setMeasured(bIsMeasured);
 }
 
 /************************************************************************/
@@ -1106,7 +1172,7 @@ void OGRGeometryCollection::setMeasured(OGRBoolean bIsMeasured)
 double OGRGeometryCollection::get_Length() const
 {
     double dfLength = 0.0;
-    for (auto &&poSubGeom : *this)
+    for (const auto &poSubGeom : *this)
     {
         const OGRwkbGeometryType eType =
             wkbFlatten(poSubGeom->getGeometryType());
@@ -1115,8 +1181,12 @@ double OGRGeometryCollection::get_Length() const
             const OGRCurve *poCurve = poSubGeom->toCurve();
             dfLength += poCurve->get_Length();
         }
-        else if (OGR_GT_IsSubClassOf(eType, wkbMultiCurve) ||
-                 eType == wkbGeometryCollection)
+        else if (OGR_GT_IsSurface(eType))
+        {
+            const OGRSurface *poSurface = poSubGeom->toSurface();
+            dfLength += poSurface->get_Length();
+        }
+        else if (OGR_GT_IsSubClassOf(eType, wkbGeometryCollection))
         {
             const OGRGeometryCollection *poColl =
                 poSubGeom->toGeometryCollection();
@@ -1146,7 +1216,7 @@ double OGRGeometryCollection::get_Length() const
 double OGRGeometryCollection::get_Area() const
 {
     double dfArea = 0.0;
-    for (auto &&poSubGeom : *this)
+    for (const auto &poSubGeom : *this)
     {
         OGRwkbGeometryType eType = wkbFlatten(poSubGeom->getGeometryType());
         if (OGR_GT_IsSurface(eType))
@@ -1180,6 +1250,9 @@ double OGRGeometryCollection::get_Area() const
  * The returned area will always be in square meters, and assumes that
  * polygon edges describe geodesic lines on the ellipsoid.
  *
+ * <a href="https://geographiclib.sourceforge.io/html/python/geodesics.html">Geodesics</a>
+ * follow the shortest route on the surface of the ellipsoid.
+ *
  * If the geometry' SRS is not a geographic one, geometries are reprojected to
  * the underlying geographic SRS of the geometry' SRS.
  * OGRSpatialReference::GetDataAxisToSRSAxisMapping() is honored.
@@ -1202,11 +1275,8 @@ double OGRGeometryCollection::get_Area() const
 double OGRGeometryCollection::get_GeodesicArea(
     const OGRSpatialReference *poSRSOverride) const
 {
-    if (!poSRSOverride)
-        poSRSOverride = getSpatialReference();
-
     double dfArea = 0.0;
-    for (auto &&poSubGeom : *this)
+    for (const auto &poSubGeom : *this)
     {
         OGRwkbGeometryType eType = wkbFlatten(poSubGeom->getGeometryType());
         if (OGR_GT_IsSurface(eType))
@@ -1226,8 +1296,7 @@ double OGRGeometryCollection::get_GeodesicArea(
                 return dfLocalArea;
             dfArea += dfLocalArea;
         }
-        else if (OGR_GT_IsSubClassOf(eType, wkbMultiSurface) ||
-                 eType == wkbGeometryCollection)
+        else if (OGR_GT_IsSubClassOf(eType, wkbGeometryCollection))
         {
             const double dfLocalArea =
                 poSubGeom->toGeometryCollection()->get_GeodesicArea(
@@ -1241,13 +1310,89 @@ double OGRGeometryCollection::get_GeodesicArea(
     return dfArea;
 }
 
+/************************************************************************/
+/*                        get_GeodesicLength()                          */
+/************************************************************************/
+
+/**
+ * \brief Get the length of the collection,where curve edges are geodesic lines
+ * on the underlying ellipsoid of the SRS attached to the geometry.
+ *
+ * The returned length will always be in meters.
+ *
+ * <a href="https://geographiclib.sourceforge.io/html/python/geodesics.html">Geodesics</a>
+ * follow the shortest route on the surface of the ellipsoid.
+ *
+ * If the geometry' SRS is not a geographic one, geometries are reprojected to
+ * the underlying geographic SRS of the geometry' SRS.
+ * OGRSpatialReference::GetDataAxisToSRSAxisMapping() is honored.
+ *
+ * Note that geometries with circular arcs will be linearized in their original
+ * coordinate space first, so the resulting geodesic length will be an
+ * approximation.
+ *
+ * The length is computed as the sum of the lengths of all members
+ * in this collection.
+ *
+ * @note No warning will be issued if a member of the collection does not
+ *       support the get_GeodesicLength method.
+ *
+ * @param poSRSOverride If not null, overrides OGRGeometry::getSpatialReference()
+ * @return the length of the geometry in meters, or a negative value in case
+ * of error.
+ *
+ * @see get_Length() for an alternative method returning areas computed in
+ * 2D Cartesian space.
+ *
+ * @since GDAL 3.10
+ */
+double OGRGeometryCollection::get_GeodesicLength(
+    const OGRSpatialReference *poSRSOverride) const
+{
+    double dfLength = 0.0;
+    for (const auto &poSubGeom : *this)
+    {
+        const OGRwkbGeometryType eType =
+            wkbFlatten(poSubGeom->getGeometryType());
+        if (OGR_GT_IsSurface(eType))
+        {
+            const OGRSurface *poSurface = poSubGeom->toSurface();
+            const double dfLocalLength =
+                poSurface->get_GeodesicLength(poSRSOverride);
+            if (dfLocalLength < 0)
+                return dfLocalLength;
+            dfLength += dfLocalLength;
+        }
+        else if (OGR_GT_IsCurve(eType))
+        {
+            const OGRCurve *poCurve = poSubGeom->toCurve();
+            const double dfLocalLength =
+                poCurve->get_GeodesicLength(poSRSOverride);
+            if (dfLocalLength < 0)
+                return dfLocalLength;
+            dfLength += dfLocalLength;
+        }
+        else if (OGR_GT_IsSubClassOf(eType, wkbGeometryCollection))
+        {
+            const double dfLocalLength =
+                poSubGeom->toGeometryCollection()->get_GeodesicLength(
+                    poSRSOverride);
+            if (dfLocalLength < 0)
+                return dfLocalLength;
+            dfLength += dfLocalLength;
+        }
+    }
+
+    return dfLength;
+}
+
 /************************************************************************/
 /*                               IsEmpty()                              */
 /************************************************************************/
 
 OGRBoolean OGRGeometryCollection::IsEmpty() const
 {
-    for (auto &&poSubGeom : *this)
+    for (const auto &poSubGeom : *this)
     {
         if (poSubGeom->IsEmpty() == FALSE)
             return FALSE;
@@ -1263,7 +1408,7 @@ void OGRGeometryCollection::assignSpatialReference(
     const OGRSpatialReference *poSR)
 {
     OGRGeometry::assignSpatialReference(poSR);
-    for (auto &&poSubGeom : *this)
+    for (auto &poSubGeom : *this)
     {
         poSubGeom->assignSpatialReference(poSR);
     }
@@ -1273,12 +1418,14 @@ void OGRGeometryCollection::assignSpatialReference(
 /*              OGRGeometryCollection::segmentize()                     */
 /************************************************************************/
 
-void OGRGeometryCollection::segmentize(double dfMaxLength)
+bool OGRGeometryCollection::segmentize(double dfMaxLength)
 {
-    for (auto &&poSubGeom : *this)
+    for (auto &poSubGeom : *this)
     {
-        poSubGeom->segmentize(dfMaxLength);
+        if (!poSubGeom->segmentize(dfMaxLength))
+            return false;
     }
+    return true;
 }
 
 /************************************************************************/
@@ -1287,7 +1434,7 @@ void OGRGeometryCollection::segmentize(double dfMaxLength)
 
 void OGRGeometryCollection::swapXY()
 {
-    for (auto &&poSubGeom : *this)
+    for (auto &poSubGeom : *this)
     {
         poSubGeom->swapXY();
     }
@@ -1317,9 +1464,9 @@ OGRBoolean OGRGeometryCollection::isCompatibleSubType(
 
 OGRBoolean OGRGeometryCollection::hasCurveGeometry(int bLookForNonLinear) const
 {
-    for (int iGeom = 0; iGeom < nGeomCount; iGeom++)
+    for (const auto &poSubGeom : *this)
     {
-        if (papoGeoms[iGeom]->hasCurveGeometry(bLookForNonLinear))
+        if (poSubGeom->hasCurveGeometry(bLookForNonLinear))
             return TRUE;
     }
     return FALSE;
@@ -1333,19 +1480,20 @@ OGRGeometry *
 OGRGeometryCollection::getLinearGeometry(double dfMaxAngleStepSizeDegrees,
                                          const char *const *papszOptions) const
 {
-    OGRGeometryCollection *poGC =
+    auto poGC = std::unique_ptr<OGRGeometryCollection>(
         OGRGeometryFactory::createGeometry(OGR_GT_GetLinear(getGeometryType()))
-            ->toGeometryCollection();
-    if (poGC == nullptr)
+            ->toGeometryCollection());
+    if (!poGC)
         return nullptr;
     poGC->assignSpatialReference(getSpatialReference());
-    for (int iGeom = 0; iGeom < nGeomCount; iGeom++)
+    for (const auto &poSubGeom : *this)
     {
-        OGRGeometry *poSubGeom = papoGeoms[iGeom]->getLinearGeometry(
+        OGRGeometry *poSubGeomNew = poSubGeom->getLinearGeometry(
             dfMaxAngleStepSizeDegrees, papszOptions);
-        poGC->addGeometryDirectly(poSubGeom);
+        if (poGC->addGeometryDirectly(poSubGeomNew) != OGRERR_NONE)
+            return nullptr;
     }
-    return poGC;
+    return poGC.release();
 }
 
 /************************************************************************/
@@ -1355,27 +1503,26 @@ OGRGeometryCollection::getLinearGeometry(double dfMaxAngleStepSizeDegrees,
 OGRGeometry *
 OGRGeometryCollection::getCurveGeometry(const char *const *papszOptions) const
 {
-    OGRGeometryCollection *poGC =
+    auto poGC = std::unique_ptr<OGRGeometryCollection>(
         OGRGeometryFactory::createGeometry(OGR_GT_GetCurve(getGeometryType()))
-            ->toGeometryCollection();
-    if (poGC == nullptr)
+            ->toGeometryCollection());
+    if (!poGC)
         return nullptr;
     poGC->assignSpatialReference(getSpatialReference());
     bool bHasCurveGeometry = false;
-    for (int iGeom = 0; iGeom < nGeomCount; iGeom++)
+    for (const auto &poSubGeom : *this)
     {
-        OGRGeometry *poSubGeom =
-            papoGeoms[iGeom]->getCurveGeometry(papszOptions);
-        if (poSubGeom->hasCurveGeometry())
+        OGRGeometry *poSubGeomNew = poSubGeom->getCurveGeometry(papszOptions);
+        if (poSubGeomNew->hasCurveGeometry())
             bHasCurveGeometry = true;
-        poGC->addGeometryDirectly(poSubGeom);
+        if (poGC->addGeometryDirectly(poSubGeomNew) != OGRERR_NONE)
+            return nullptr;
     }
     if (!bHasCurveGeometry)
     {
-        delete poGC;
         return clone();
     }
-    return poGC;
+    return poGC.release();
 }
 
 /************************************************************************/
diff --git a/ogr/ogrgeometryfactory.cpp b/ogr/ogrgeometryfactory.cpp
index eb9bcc4e5f30..963e36276981 100644
--- a/ogr/ogrgeometryfactory.cpp
+++ b/ogr/ogrgeometryfactory.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -44,7 +28,8 @@
 #ifdef HAVE_GEOS
 #include "geos_c.h"
 #endif
-#include "ogrgeojsonreader.h"
+
+#include "ogrgeojsongeometry.h"
 
 #include <cassert>
 #include <climits>
@@ -3302,15 +3287,15 @@ static void AlterPole(OGRGeometry *poGeom, OGRPoint *poPole,
 }
 
 /************************************************************************/
-/*                          IsPolarToWGS84()                            */
+/*                        IsPolarToGeographic()                         */
 /*                                                                      */
 /* Returns true if poCT transforms from a projection that includes one  */
 /* of the pole in a continuous way.                                     */
 /************************************************************************/
 
-static bool IsPolarToWGS84(OGRCoordinateTransformation *poCT,
-                           OGRCoordinateTransformation *poRevCT,
-                           bool &bIsNorthPolarOut)
+static bool IsPolarToGeographic(OGRCoordinateTransformation *poCT,
+                                OGRCoordinateTransformation *poRevCT,
+                                bool &bIsNorthPolarOut)
 {
     bool bIsNorthPolar = false;
     bool bIsSouthPolar = false;
@@ -3366,17 +3351,16 @@ static bool IsPolarToWGS84(OGRCoordinateTransformation *poCT,
 }
 
 /************************************************************************/
-/*                     TransformBeforePolarToWGS84()                    */
+/*                 TransformBeforePolarToGeographic()                   */
 /*                                                                      */
 /* Transform the geometry (by intersection), so as to cut each geometry */
 /* that crosses the pole, in 2 parts. Do also tricks for geometries     */
 /* that just touch the pole.                                            */
 /************************************************************************/
 
-static OGRGeometry *
-TransformBeforePolarToWGS84(OGRCoordinateTransformation *poRevCT,
-                            bool bIsNorthPolar, OGRGeometry *poDstGeom,
-                            bool &bNeedPostCorrectionOut)
+static std::unique_ptr<OGRGeometry> TransformBeforePolarToGeographic(
+    OGRCoordinateTransformation *poRevCT, bool bIsNorthPolar,
+    std::unique_ptr<OGRGeometry> poDstGeom, bool &bNeedPostCorrectionOut)
 {
     const int nSign = (bIsNorthPolar) ? 1 : -1;
 
@@ -3429,19 +3413,19 @@ TransformBeforePolarToWGS84(OGRCoordinateTransformation *poRevCT,
     {
         if (bContainsPole || bContainsNearPoleAntimeridian)
         {
-            OGRGeometry *poNewGeom = poDstGeom->Difference(&oCutter);
+            auto poNewGeom =
+                std::unique_ptr<OGRGeometry>(poDstGeom->Difference(&oCutter));
             if (poNewGeom)
             {
                 if (bContainsNearPoleAntimeridian)
-                    RemovePoint(poNewGeom, &oPole);
-                delete poDstGeom;
-                poDstGeom = poNewGeom;
+                    RemovePoint(poNewGeom.get(), &oPole);
+                poDstGeom = std::move(poNewGeom);
             }
         }
 
         if (bRegularTouchesPole)
         {
-            AlterPole(poDstGeom, &oPole);
+            AlterPole(poDstGeom.get(), &oPole);
         }
 
         bNeedPostCorrectionOut = true;
@@ -3450,15 +3434,15 @@ TransformBeforePolarToWGS84(OGRCoordinateTransformation *poRevCT,
 }
 
 /************************************************************************/
-/*                        IsAntimeridianProjToWGS84()                   */
+/*                   IsAntimeridianProjToGeographic()                   */
 /*                                                                      */
 /* Returns true if poCT transforms from a projection that includes the  */
 /* antimeridian in a continuous way.                                    */
 /************************************************************************/
 
-static bool IsAntimeridianProjToWGS84(OGRCoordinateTransformation *poCT,
-                                      OGRCoordinateTransformation *poRevCT,
-                                      OGRGeometry *poDstGeometry)
+static bool IsAntimeridianProjToGeographic(OGRCoordinateTransformation *poCT,
+                                           OGRCoordinateTransformation *poRevCT,
+                                           OGRGeometry *poDstGeometry)
 {
     const bool bBackupEmitErrors = poCT->GetEmitErrors();
     poRevCT->SetEmitErrors(false);
@@ -3634,15 +3618,15 @@ struct SortPointsByAscendingY
 };
 
 /************************************************************************/
-/*                  TransformBeforeAntimeridianToWGS84()                */
+/*              TransformBeforeAntimeridianToGeographic()               */
 /*                                                                      */
 /* Transform the geometry (by intersection), so as to cut each geometry */
 /* that crosses the antimeridian, in 2 parts.                           */
 /************************************************************************/
 
-static OGRGeometry *TransformBeforeAntimeridianToWGS84(
+static std::unique_ptr<OGRGeometry> TransformBeforeAntimeridianToGeographic(
     OGRCoordinateTransformation *poCT, OGRCoordinateTransformation *poRevCT,
-    OGRGeometry *poDstGeom, bool &bNeedPostCorrectionOut)
+    std::unique_ptr<OGRGeometry> poDstGeom, bool &bNeedPostCorrectionOut)
 {
     OGREnvelope sEnvelope;
     poDstGeom->getEnvelope(&sEnvelope);
@@ -3662,7 +3646,7 @@ static OGRGeometry *TransformBeforeAntimeridianToWGS84(
     // Collect points that are the intersection of the lines of the geometry
     // with the antimeridian
     std::vector<OGRRawPoint> aoPoints;
-    CollectPointsOnAntimeridian(poDstGeom, poCT, poRevCT, aoPoints);
+    CollectPointsOnAntimeridian(poDstGeom.get(), poCT, poRevCT, aoPoints);
     if (aoPoints.empty())
         return poDstGeom;
 
@@ -3726,11 +3710,11 @@ static OGRGeometry *TransformBeforeAntimeridianToWGS84(
 #endif
 
     // Get the geometry without the antimeridian
-    OGRGeometry *poInter = poDstGeom->Difference(&oPolyToCut);
+    auto poInter =
+        std::unique_ptr<OGRGeometry>(poDstGeom->Difference(&oPolyToCut));
     if (poInter != nullptr)
     {
-        delete poDstGeom;
-        poDstGeom = poInter;
+        poDstGeom = std::move(poInter);
         bNeedPostCorrectionOut = true;
     }
 
@@ -3821,9 +3805,22 @@ static void SnapCoordsCloseToLatLongBounds(OGRGeometry *poGeom)
 
 struct OGRGeometryFactory::TransformWithOptionsCache::Private
 {
+    const OGRSpatialReference *poSourceCRS = nullptr;
+    const OGRSpatialReference *poTargetCRS = nullptr;
+    const OGRCoordinateTransformation *poCT = nullptr;
     std::unique_ptr<OGRCoordinateTransformation> poRevCT{};
     bool bIsPolar = false;
     bool bIsNorthPolar = false;
+
+    void clear()
+    {
+        poSourceCRS = nullptr;
+        poTargetCRS = nullptr;
+        poCT = nullptr;
+        poRevCT.reset();
+        bIsPolar = false;
+        bIsNorthPolar = false;
+    }
 };
 
 /************************************************************************/
@@ -3843,6 +3840,50 @@ OGRGeometryFactory::TransformWithOptionsCache::~TransformWithOptionsCache()
 {
 }
 
+/************************************************************************/
+/*              isTransformWithOptionsRegularTransform()                */
+/************************************************************************/
+
+//! @cond Doxygen_Suppress
+/*static */
+bool OGRGeometryFactory::isTransformWithOptionsRegularTransform(
+    [[maybe_unused]] const OGRSpatialReference *poSourceCRS,
+    [[maybe_unused]] const OGRSpatialReference *poTargetCRS,
+    CSLConstList papszOptions)
+{
+    if (papszOptions)
+        return false;
+
+#ifdef HAVE_GEOS
+    if (poSourceCRS->IsProjected() && poTargetCRS->IsGeographic() &&
+        poTargetCRS->GetAxisMappingStrategy() == OAMS_TRADITIONAL_GIS_ORDER &&
+        // check that angular units is degree
+        std::fabs(poTargetCRS->GetAngularUnits(nullptr) -
+                  CPLAtof(SRS_UA_DEGREE_CONV)) <=
+            1e-8 * CPLAtof(SRS_UA_DEGREE_CONV))
+    {
+        double dfWestLong = 0.0;
+        double dfSouthLat = 0.0;
+        double dfEastLong = 0.0;
+        double dfNorthLat = 0.0;
+        if (poSourceCRS->GetAreaOfUse(&dfWestLong, &dfSouthLat, &dfEastLong,
+                                      &dfNorthLat, nullptr) &&
+            !(dfSouthLat == -90.0 || dfNorthLat == 90.0 ||
+              dfWestLong == -180.0 || dfEastLong == 180.0 ||
+              dfWestLong > dfEastLong))
+        {
+            // Not a global geographic CRS
+            return true;
+        }
+        return false;
+    }
+#endif
+
+    return true;
+}
+
+//! @endcond
+
 /************************************************************************/
 /*                       transformWithOptions()                         */
 /************************************************************************/
@@ -3858,65 +3899,68 @@ OGRGeometry *OGRGeometryFactory::transformWithOptions(
     const OGRGeometry *poSrcGeom, OGRCoordinateTransformation *poCT,
     char **papszOptions, CPL_UNUSED const TransformWithOptionsCache &cache)
 {
-    OGRGeometry *poDstGeom = poSrcGeom->clone();
-    if (poCT != nullptr)
+    auto poDstGeom = std::unique_ptr<OGRGeometry>(poSrcGeom->clone());
+    if (poCT)
     {
 #ifdef HAVE_GEOS
         bool bNeedPostCorrection = false;
-
-        auto poSourceCRS = poCT->GetSourceCS();
-        auto poTargetCRS = poCT->GetTargetCS();
-        if (poSourceCRS != nullptr && poTargetCRS != nullptr &&
-            poSourceCRS->IsProjected() && poTargetCRS->IsGeographic())
+        const auto poSourceCRS = poCT->GetSourceCS();
+        const auto poTargetCRS = poCT->GetTargetCS();
+        const auto eSrcGeomType = wkbFlatten(poSrcGeom->getGeometryType());
+        // Check if we are transforming from projected coordinates to
+        // geographic coordinates, with a chance that there might be polar or
+        // anti-meridian discontinuities. If so, create the inverse transform.
+        if (eSrcGeomType != wkbPoint && eSrcGeomType != wkbMultiPoint &&
+            (poSourceCRS != cache.d->poSourceCRS ||
+             poTargetCRS != cache.d->poTargetCRS || poCT != cache.d->poCT))
         {
-            OGRSpatialReference oSRSWGS84;
-            oSRSWGS84.SetWellKnownGeogCS("WGS84");
-            oSRSWGS84.SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
-            if (poTargetCRS->IsSame(&oSRSWGS84))
+            cache.d->clear();
+            cache.d->poSourceCRS = poSourceCRS;
+            cache.d->poTargetCRS = poTargetCRS;
+            cache.d->poCT = poCT;
+            if (poSourceCRS && poTargetCRS &&
+                !isTransformWithOptionsRegularTransform(
+                    poSourceCRS, poTargetCRS, papszOptions))
             {
-                if (cache.d->poRevCT == nullptr ||
-                    !cache.d->poRevCT->GetTargetCS()->IsSame(poSourceCRS))
-                {
-                    cache.d->poRevCT.reset(OGRCreateCoordinateTransformation(
-                        &oSRSWGS84, poSourceCRS));
-                    cache.d->bIsNorthPolar = false;
-                    cache.d->bIsPolar = false;
-                    if (cache.d->poRevCT &&
-                        IsPolarToWGS84(poCT, cache.d->poRevCT.get(),
-                                       cache.d->bIsNorthPolar))
-                    {
-                        cache.d->bIsPolar = true;
-                    }
-                }
-                auto poRevCT = cache.d->poRevCT.get();
-                if (poRevCT != nullptr)
+                cache.d->poRevCT.reset(OGRCreateCoordinateTransformation(
+                    poTargetCRS, poSourceCRS));
+                cache.d->bIsNorthPolar = false;
+                cache.d->bIsPolar = false;
+                cache.d->poRevCT.reset(poCT->GetInverse());
+                if (cache.d->poRevCT &&
+                    IsPolarToGeographic(poCT, cache.d->poRevCT.get(),
+                                        cache.d->bIsNorthPolar))
                 {
-                    if (cache.d->bIsPolar)
-                    {
-                        poDstGeom = TransformBeforePolarToWGS84(
-                            poRevCT, cache.d->bIsNorthPolar, poDstGeom,
-                            bNeedPostCorrection);
-                    }
-                    else if (IsAntimeridianProjToWGS84(poCT, poRevCT,
-                                                       poDstGeom))
-                    {
-                        poDstGeom = TransformBeforeAntimeridianToWGS84(
-                            poCT, poRevCT, poDstGeom, bNeedPostCorrection);
-                    }
+                    cache.d->bIsPolar = true;
                 }
             }
         }
+
+        if (auto poRevCT = cache.d->poRevCT.get())
+        {
+            if (cache.d->bIsPolar)
+            {
+                poDstGeom = TransformBeforePolarToGeographic(
+                    poRevCT, cache.d->bIsNorthPolar, std::move(poDstGeom),
+                    bNeedPostCorrection);
+            }
+            else if (IsAntimeridianProjToGeographic(poCT, poRevCT,
+                                                    poDstGeom.get()))
+            {
+                poDstGeom = TransformBeforeAntimeridianToGeographic(
+                    poCT, poRevCT, std::move(poDstGeom), bNeedPostCorrection);
+            }
+        }
 #endif
         OGRErr eErr = poDstGeom->transform(poCT);
         if (eErr != OGRERR_NONE)
         {
-            delete poDstGeom;
             return nullptr;
         }
 #ifdef HAVE_GEOS
         if (bNeedPostCorrection)
         {
-            SnapCoordsCloseToLatLongBounds(poDstGeom);
+            SnapCoordsCloseToLatLongBounds(poDstGeom.get());
         }
 #endif
     }
@@ -3935,7 +3979,7 @@ OGRGeometry *OGRGeometryFactory::transformWithOptions(
                     "non-geographic CRS");
                 bHasWarned = true;
             }
-            return poDstGeom;
+            return poDstGeom.release();
         }
         // TODO and we should probably also test that the axis order + data axis
         // mapping is long-lat...
@@ -3958,9 +4002,9 @@ OGRGeometry *OGRGeometryFactory::transformWithOptions(
             OGREnvelope sEnvelope;
             poDstGeom->getEnvelope(&sEnvelope);
             if (sEnvelope.MinX >= -360.0 && sEnvelope.MaxX <= -180.0)
-                AddOffsetToLon(poDstGeom, 360.0);
+                AddOffsetToLon(poDstGeom.get(), 360.0);
             else if (sEnvelope.MinX >= 180.0 && sEnvelope.MaxX <= 360.0)
-                AddOffsetToLon(poDstGeom, -360.0);
+                AddOffsetToLon(poDstGeom.get(), -360.0);
             else
             {
                 OGRwkbGeometryType eNewType;
@@ -3971,38 +4015,35 @@ OGRGeometry *OGRGeometryFactory::transformWithOptions(
                 else
                     eNewType = wkbGeometryCollection;
 
-                OGRGeometry *poMultiGeom = createGeometry(eNewType);
-                OGRGeometryCollection *poMulti =
-                    poMultiGeom->toGeometryCollection();
+                auto poMulti = std::unique_ptr<OGRGeometryCollection>(
+                    createGeometry(eNewType)->toGeometryCollection());
 
                 double dfDateLineOffset = CPLAtofM(
                     CSLFetchNameValueDef(papszOptions, "DATELINEOFFSET", "10"));
                 if (dfDateLineOffset <= 0.0 || dfDateLineOffset >= 360.0)
                     dfDateLineOffset = 10.0;
 
-                CutGeometryOnDateLineAndAddToMulti(poMulti, poDstGeom,
-                                                   dfDateLineOffset);
+                CutGeometryOnDateLineAndAddToMulti(
+                    poMulti.get(), poDstGeom.get(), dfDateLineOffset);
 
                 if (poMulti->getNumGeometries() == 0)
                 {
-                    delete poMultiGeom;
+                    // do nothing
                 }
-                else if (poMulti->getNumGeometries() == 1)
+                else if (poMulti->getNumGeometries() == 1 &&
+                         (eType == wkbPolygon || eType == wkbLineString))
                 {
-                    delete poDstGeom;
-                    poDstGeom = poMulti->getGeometryRef(0)->clone();
-                    delete poMultiGeom;
+                    poDstGeom = poMulti->stealGeometry(0);
                 }
                 else
                 {
-                    delete poDstGeom;
-                    poDstGeom = poMultiGeom;
+                    poDstGeom = std::move(poMulti);
                 }
             }
         }
     }
 
-    return poDstGeom;
+    return poDstGeom.release();
 }
 
 /************************************************************************/
@@ -5063,8 +5104,8 @@ int OGRGeometryFactory::GetCurveParameters(double x0, double y0, double x1,
                                            double &alpha0, double &alpha1,
                                            double &alpha2)
 {
-    if (CPLIsNan(x0) || CPLIsNan(y0) || CPLIsNan(x1) || CPLIsNan(y1) ||
-        CPLIsNan(x2) || CPLIsNan(y2))
+    if (std::isnan(x0) || std::isnan(y0) || std::isnan(x1) || std::isnan(y1) ||
+        std::isnan(x2) || std::isnan(y2))
     {
         return FALSE;
     }
@@ -5110,7 +5151,7 @@ int OGRGeometryFactory::GetCurveParameters(double x0, double y0, double x1,
     dy12 *= dfInvScale;
 
     const double det = dx01 * dy12 - dx12 * dy01;
-    if (fabs(det) < 1.0e-8 || CPLIsNan(det))
+    if (fabs(det) < 1.0e-8 || std::isnan(det))
     {
         return FALSE;
     }
@@ -5165,7 +5206,7 @@ static void OGRGeometryFactoryStrokeArc(OGRLineString *poLine, double cx,
     // Constant angle between all points, so as to not depend on winding order.
     const double dfNumSteps = fabs((alpha1 - alpha0) / dfStep) + 0.5;
     if (dfNumSteps >= std::numeric_limits<int>::max() ||
-        dfNumSteps <= std::numeric_limits<int>::min() || CPLIsNan(dfNumSteps))
+        dfNumSteps <= std::numeric_limits<int>::min() || std::isnan(dfNumSteps))
     {
         CPLError(CE_Warning, CPLE_AppDefined,
                  "OGRGeometryFactoryStrokeArc: bogus steps: "
@@ -5448,7 +5489,7 @@ OGRLineString *OGRGeometryFactory::curveToLineString(
                 dfAlphaRatio *= -1;
             }
             else if (dfAlphaRatio >= std::numeric_limits<GUInt32>::max() ||
-                     CPLIsNan(dfAlphaRatio))
+                     std::isnan(dfAlphaRatio))
             {
                 CPLError(CE_Warning, CPLE_AppDefined,
                          "AlphaRatio too large: %lf", dfAlphaRatio);
diff --git a/ogr/ogrgeomfielddefn.cpp b/ogr/ogrgeomfielddefn.cpp
index 011428d79d8c..4760e0c1c777 100644
--- a/ogr/ogrgeomfielddefn.cpp
+++ b/ogr/ogrgeomfielddefn.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrlibjsonutils.cpp b/ogr/ogrlibjsonutils.cpp
new file mode 100644
index 000000000000..610d48cf04cb
--- /dev/null
+++ b/ogr/ogrlibjsonutils.cpp
@@ -0,0 +1,426 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2007, Mateusz Loskot
+// Copyright 2008-2024, Even Rouault <even.rouault at spatialys.com>
+
+/*! @cond Doxygen_Suppress */
+
+#include "ogrlibjsonutils.h"
+
+#include "cpl_string.h"
+#include "ogr_p.h"
+
+#include <cmath>
+
+/************************************************************************/
+/*                             OGRJSonParse()                           */
+/************************************************************************/
+
+bool OGRJSonParse(const char *pszText, json_object **ppoObj, bool bVerboseError)
+{
+    if (ppoObj == nullptr)
+        return false;
+    json_tokener *jstok = json_tokener_new();
+    const int nLen = pszText == nullptr ? 0 : static_cast<int>(strlen(pszText));
+    *ppoObj = json_tokener_parse_ex(jstok, pszText, nLen);
+    if (jstok->err != json_tokener_success)
+    {
+        if (bVerboseError)
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                     "JSON parsing error: %s (at offset %d)",
+                     json_tokener_error_desc(jstok->err), jstok->char_offset);
+        }
+
+        json_tokener_free(jstok);
+        *ppoObj = nullptr;
+        return false;
+    }
+    json_tokener_free(jstok);
+    return true;
+}
+
+/************************************************************************/
+/*                    CPL_json_object_object_get()                      */
+/************************************************************************/
+
+// This is the same as json_object_object_get() except it will not raise
+// deprecation warning.
+
+json_object *CPL_json_object_object_get(struct json_object *obj,
+                                        const char *key)
+{
+    json_object *poRet = nullptr;
+    json_object_object_get_ex(obj, key, &poRet);
+    return poRet;
+}
+
+/************************************************************************/
+/*                       json_ex_get_object_by_path()                   */
+/************************************************************************/
+
+json_object *json_ex_get_object_by_path(json_object *poObj, const char *pszPath)
+{
+    if (poObj == nullptr || json_object_get_type(poObj) != json_type_object ||
+        pszPath == nullptr || *pszPath == '\0')
+    {
+        return nullptr;
+    }
+    char **papszTokens = CSLTokenizeString2(pszPath, ".", 0);
+    for (int i = 0; papszTokens[i] != nullptr; i++)
+    {
+        poObj = CPL_json_object_object_get(poObj, papszTokens[i]);
+        if (poObj == nullptr)
+            break;
+        if (papszTokens[i + 1] != nullptr)
+        {
+            if (json_object_get_type(poObj) != json_type_object)
+            {
+                poObj = nullptr;
+                break;
+            }
+        }
+    }
+    CSLDestroy(papszTokens);
+    return poObj;
+}
+
+/************************************************************************/
+/*                           OGRGeoJSONFindMemberByName                 */
+/************************************************************************/
+
+lh_entry *OGRGeoJSONFindMemberEntryByName(json_object *poObj,
+                                          const char *pszName)
+{
+    if (nullptr == pszName || nullptr == poObj)
+        return nullptr;
+
+    if (nullptr != json_object_get_object(poObj))
+    {
+        lh_entry *entry = json_object_get_object(poObj)->head;
+        while (entry != nullptr)
+        {
+            if (EQUAL(static_cast<const char *>(entry->k), pszName))
+                return entry;
+            entry = entry->next;
+        }
+    }
+
+    return nullptr;
+}
+
+json_object *OGRGeoJSONFindMemberByName(json_object *poObj, const char *pszName)
+{
+    lh_entry *entry = OGRGeoJSONFindMemberEntryByName(poObj, pszName);
+    if (nullptr == entry)
+        return nullptr;
+    return static_cast<json_object *>(const_cast<void *>(entry->v));
+}
+
+/************************************************************************/
+/*               OGR_json_double_with_precision_to_string()             */
+/************************************************************************/
+
+static int OGR_json_double_with_precision_to_string(struct json_object *jso,
+                                                    struct printbuf *pb,
+                                                    int /* level */,
+                                                    int /* flags */)
+{
+    const void *userData =
+#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
+        jso->_userdata;
+#else
+        json_object_get_userdata(jso);
+#endif
+    // Precision is stored as a uintptr_t content casted to void*
+    const uintptr_t nPrecision = reinterpret_cast<uintptr_t>(userData);
+    char szBuffer[75] = {};
+    const double dfVal = json_object_get_double(jso);
+    if (fabs(dfVal) > 1e50 && !std::isinf(dfVal))
+    {
+        CPLsnprintf(szBuffer, sizeof(szBuffer), "%.17g", dfVal);
+    }
+    else
+    {
+        const bool bPrecisionIsNegative =
+            (nPrecision >> (8 * sizeof(nPrecision) - 1)) != 0;
+        OGRFormatDouble(szBuffer, sizeof(szBuffer), dfVal, '.',
+                        bPrecisionIsNegative ? 15
+                                             : static_cast<int>(nPrecision));
+    }
+    return printbuf_memappend(pb, szBuffer, static_cast<int>(strlen(szBuffer)));
+}
+
+/************************************************************************/
+/*                   json_object_new_double_with_precision()            */
+/************************************************************************/
+
+json_object *json_object_new_double_with_precision(double dfVal,
+                                                   int nCoordPrecision)
+{
+    json_object *jso = json_object_new_double(dfVal);
+    json_object_set_serializer(
+        jso, OGR_json_double_with_precision_to_string,
+        reinterpret_cast<void *>(static_cast<uintptr_t>(nCoordPrecision)),
+        nullptr);
+    return jso;
+}
+
+/************************************************************************/
+/*             OGR_json_double_with_significant_figures_to_string()     */
+/************************************************************************/
+
+static int OGR_json_double_with_significant_figures_to_string(
+    struct json_object *jso, struct printbuf *pb, int /* level */,
+    int /* flags */)
+{
+    char szBuffer[75] = {};
+    int nSize = 0;
+    const double dfVal = json_object_get_double(jso);
+    if (std::isnan(dfVal))
+        nSize = CPLsnprintf(szBuffer, sizeof(szBuffer), "NaN");
+    else if (std::isinf(dfVal))
+    {
+        if (dfVal > 0)
+            nSize = CPLsnprintf(szBuffer, sizeof(szBuffer), "Infinity");
+        else
+            nSize = CPLsnprintf(szBuffer, sizeof(szBuffer), "-Infinity");
+    }
+    else
+    {
+        char szFormatting[32] = {};
+        const void *userData =
+#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
+            jso->_userdata;
+#else
+            json_object_get_userdata(jso);
+#endif
+        const uintptr_t nSignificantFigures =
+            reinterpret_cast<uintptr_t>(userData);
+        const bool bSignificantFiguresIsNegative =
+            (nSignificantFigures >> (8 * sizeof(nSignificantFigures) - 1)) != 0;
+        const int nInitialSignificantFigures =
+            bSignificantFiguresIsNegative
+                ? 17
+                : static_cast<int>(nSignificantFigures);
+        CPLsnprintf(szFormatting, sizeof(szFormatting), "%%.%dg",
+                    nInitialSignificantFigures);
+        nSize = CPLsnprintf(szBuffer, sizeof(szBuffer), szFormatting, dfVal);
+        const char *pszDot = strchr(szBuffer, '.');
+
+        // Try to avoid .xxxx999999y or .xxxx000000y rounding issues by
+        // decreasing a bit precision.
+        if (nInitialSignificantFigures > 10 && pszDot != nullptr &&
+            (strstr(pszDot, "999999") != nullptr ||
+             strstr(pszDot, "000000") != nullptr))
+        {
+            bool bOK = false;
+            for (int i = 1; i <= 3; i++)
+            {
+                CPLsnprintf(szFormatting, sizeof(szFormatting), "%%.%dg",
+                            nInitialSignificantFigures - i);
+                nSize = CPLsnprintf(szBuffer, sizeof(szBuffer), szFormatting,
+                                    dfVal);
+                pszDot = strchr(szBuffer, '.');
+                if (pszDot != nullptr && strstr(pszDot, "999999") == nullptr &&
+                    strstr(pszDot, "000000") == nullptr)
+                {
+                    bOK = true;
+                    break;
+                }
+            }
+            if (!bOK)
+            {
+                CPLsnprintf(szFormatting, sizeof(szFormatting), "%%.%dg",
+                            nInitialSignificantFigures);
+                nSize = CPLsnprintf(szBuffer, sizeof(szBuffer), szFormatting,
+                                    dfVal);
+            }
+        }
+
+        if (nSize + 2 < static_cast<int>(sizeof(szBuffer)) &&
+            strchr(szBuffer, '.') == nullptr &&
+            strchr(szBuffer, 'e') == nullptr)
+        {
+            nSize +=
+                CPLsnprintf(szBuffer + nSize, sizeof(szBuffer) - nSize, ".0");
+        }
+    }
+
+    return printbuf_memappend(pb, szBuffer, nSize);
+}
+
+/************************************************************************/
+/*              json_object_new_double_with_significant_figures()       */
+/************************************************************************/
+
+json_object *
+json_object_new_double_with_significant_figures(double dfVal,
+                                                int nSignificantFigures)
+{
+    json_object *jso = json_object_new_double(dfVal);
+    json_object_set_serializer(
+        jso, OGR_json_double_with_significant_figures_to_string,
+        reinterpret_cast<void *>(static_cast<uintptr_t>(nSignificantFigures)),
+        nullptr);
+    return jso;
+}
+
+/************************************************************************/
+/*                           GeoJSONPropertyToFieldType()               */
+/************************************************************************/
+
+constexpr GIntBig MY_INT64_MAX =
+    (static_cast<GIntBig>(0x7FFFFFFF) << 32) | 0xFFFFFFFF;
+constexpr GIntBig MY_INT64_MIN = static_cast<GIntBig>(0x80000000) << 32;
+
+OGRFieldType GeoJSONPropertyToFieldType(json_object *poObject,
+                                        OGRFieldSubType &eSubType,
+                                        bool bArrayAsString)
+{
+    eSubType = OFSTNone;
+
+    if (poObject == nullptr)
+    {
+        return OFTString;
+    }
+
+    json_type type = json_object_get_type(poObject);
+
+    if (json_type_boolean == type)
+    {
+        eSubType = OFSTBoolean;
+        return OFTInteger;
+    }
+    else if (json_type_double == type)
+        return OFTReal;
+    else if (json_type_int == type)
+    {
+        GIntBig nVal = json_object_get_int64(poObject);
+        if (!CPL_INT64_FITS_ON_INT32(nVal))
+        {
+            if (nVal == MY_INT64_MIN || nVal == MY_INT64_MAX)
+            {
+                static bool bWarned = false;
+                if (!bWarned)
+                {
+                    bWarned = true;
+                    CPLError(
+                        CE_Warning, CPLE_AppDefined,
+                        "Integer values probably ranging out of 64bit integer "
+                        "range have been found. Will be clamped to "
+                        "INT64_MIN/INT64_MAX");
+                }
+            }
+            return OFTInteger64;
+        }
+        else
+        {
+            return OFTInteger;
+        }
+    }
+    else if (json_type_string == type)
+        return OFTString;
+    else if (json_type_array == type)
+    {
+        if (bArrayAsString)
+        {
+            eSubType = OFSTJSON;
+            return OFTString;
+        }
+        const auto nSize = json_object_array_length(poObject);
+        if (nSize == 0)
+        {
+            eSubType = OFSTJSON;
+            return OFTString;
+        }
+        OGRFieldType eType = OFTIntegerList;
+        for (auto i = decltype(nSize){0}; i < nSize; i++)
+        {
+            json_object *poRow = json_object_array_get_idx(poObject, i);
+            if (poRow != nullptr)
+            {
+                type = json_object_get_type(poRow);
+                if (type == json_type_string)
+                {
+                    if (i == 0 || eType == OFTStringList)
+                    {
+                        eType = OFTStringList;
+                    }
+                    else
+                    {
+                        eSubType = OFSTJSON;
+                        return OFTString;
+                    }
+                }
+                else if (type == json_type_double)
+                {
+                    if (eSubType == OFSTNone &&
+                        (i == 0 || eType == OFTRealList ||
+                         eType == OFTIntegerList || eType == OFTInteger64List))
+                    {
+                        eType = OFTRealList;
+                    }
+                    else
+                    {
+                        eSubType = OFSTJSON;
+                        return OFTString;
+                    }
+                }
+                else if (type == json_type_int)
+                {
+                    if (eSubType == OFSTNone && eType == OFTIntegerList)
+                    {
+                        GIntBig nVal = json_object_get_int64(poRow);
+                        if (!CPL_INT64_FITS_ON_INT32(nVal))
+                            eType = OFTInteger64List;
+                    }
+                    else if (eSubType == OFSTNone &&
+                             (eType == OFTInteger64List ||
+                              eType == OFTRealList))
+                    {
+                        // ok
+                    }
+                    else
+                    {
+                        eSubType = OFSTJSON;
+                        return OFTString;
+                    }
+                }
+                else if (type == json_type_boolean)
+                {
+                    if (i == 0 ||
+                        (eType == OFTIntegerList && eSubType == OFSTBoolean))
+                    {
+                        eSubType = OFSTBoolean;
+                    }
+                    else
+                    {
+                        eSubType = OFSTJSON;
+                        return OFTString;
+                    }
+                }
+                else
+                {
+                    eSubType = OFSTJSON;
+                    return OFTString;
+                }
+            }
+            else
+            {
+                eSubType = OFSTJSON;
+                return OFTString;
+            }
+        }
+
+        return eType;
+    }
+    else if (json_type_object == type)
+    {
+        eSubType = OFSTJSON;
+        return OFTString;
+    }
+
+    return OFTString;  // null
+}
+
+/*! @endcond */
diff --git a/ogr/ogrlibjsonutils.h b/ogr/ogrlibjsonutils.h
new file mode 100644
index 000000000000..732eaa59d751
--- /dev/null
+++ b/ogr/ogrlibjsonutils.h
@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2007, Mateusz Loskot
+// Copyright 2008-2024, Even Rouault <even.rouault at spatialys.com>
+
+#ifndef OGRLIBJSONUTILS_H_INCLUDED
+#define OGRLIBJSONUTILS_H_INCLUDED
+
+/*! @cond Doxygen_Suppress */
+
+#include "cpl_port.h"
+#include "cpl_json_header.h"
+
+#include "ogr_api.h"
+
+bool CPL_DLL OGRJSonParse(const char *pszText, json_object **ppoObj,
+                          bool bVerboseError = true);
+
+json_object CPL_DLL *CPL_json_object_object_get(struct json_object *obj,
+                                                const char *key);
+json_object CPL_DLL *json_ex_get_object_by_path(json_object *poObj,
+                                                const char *pszPath);
+
+/************************************************************************/
+/*                 GeoJSON Parsing Utilities                            */
+/************************************************************************/
+
+lh_entry CPL_DLL *OGRGeoJSONFindMemberEntryByName(json_object *poObj,
+                                                  const char *pszName);
+json_object CPL_DLL *OGRGeoJSONFindMemberByName(json_object *poObj,
+                                                const char *pszName);
+
+/************************************************************************/
+/*                           GeoJSONPropertyToFieldType                 */
+/************************************************************************/
+
+OGRFieldType CPL_DLL GeoJSONPropertyToFieldType(json_object *poObject,
+                                                OGRFieldSubType &eSubType,
+                                                bool bArrayAsString = false);
+
+CPL_C_START
+/* %.XXXf formatting */
+json_object CPL_DLL *json_object_new_double_with_precision(double dfVal,
+                                                           int nCoordPrecision);
+
+/* %.XXXg formatting */
+json_object CPL_DLL *
+json_object_new_double_with_significant_figures(double dfVal,
+                                                int nSignificantFigures);
+CPL_C_END
+
+/*! @endcond */
+
+#endif
diff --git a/ogr/ogrlinearring.cpp b/ogr/ogrlinearring.cpp
index e98f92a62a3a..0a0dffcd6e8e 100644
--- a/ogr/ogrlinearring.cpp
+++ b/ogr/ogrlinearring.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -40,13 +24,6 @@
 #include "ogr_geometry.h"
 #include "ogr_p.h"
 
-/************************************************************************/
-/*                           OGRLinearRing()                            */
-/************************************************************************/
-
-/** Constructor */
-OGRLinearRing::OGRLinearRing() = default;
-
 /************************************************************************/
 /*                  OGRLinearRing( const OGRLinearRing& )               */
 /************************************************************************/
@@ -62,12 +39,6 @@ OGRLinearRing::OGRLinearRing() = default;
 
 OGRLinearRing::OGRLinearRing(const OGRLinearRing &) = default;
 
-/************************************************************************/
-/*                          ~OGRLinearRing()                            */
-/************************************************************************/
-
-OGRLinearRing::~OGRLinearRing() = default;
-
 /************************************************************************/
 /*                           OGRLinearRing()                            */
 /************************************************************************/
@@ -75,7 +46,7 @@ OGRLinearRing::~OGRLinearRing() = default;
 /** Constructor
  * @param poSrcRing source ring.
  */
-OGRLinearRing::OGRLinearRing(OGRLinearRing *poSrcRing)
+OGRLinearRing::OGRLinearRing(const OGRLinearRing *poSrcRing)
 
 {
     if (poSrcRing == nullptr)
@@ -448,24 +419,17 @@ OGRLinearRing *OGRLinearRing::clone() const
 /*                             reverseWindingOrder()                    */
 /************************************************************************/
 
+//! @cond Doxygen_Suppress
 /** Reverse order of points.
  */
 void OGRLinearRing::reverseWindingOrder()
 
 {
-    OGRPoint pointA;
-    OGRPoint pointB;
-
-    for (int i = 0; i < nPointCount / 2; i++)
-    {
-        getPoint(i, &pointA);
-        const int pos = nPointCount - i - 1;
-        getPoint(pos, &pointB);
-        setPoint(i, &pointB);
-        setPoint(pos, &pointA);
-    }
+    reversePoints();
 }
 
+//! @endcond
+
 /************************************************************************/
 /*                             closeRing()                              */
 /************************************************************************/
diff --git a/ogr/ogrlinestring.cpp b/ogr/ogrlinestring.cpp
index 8d99615b4cec..80445fea3b6d 100644
--- a/ogr/ogrlinestring.cpp
+++ b/ogr/ogrlinestring.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_geometry.h"
@@ -44,7 +28,7 @@ namespace
 
 int DoubleToIntClamp(double dfValue)
 {
-    if (CPLIsNan(dfValue))
+    if (std::isnan(dfValue))
         return 0;
     if (dfValue >= std::numeric_limits<int>::max())
         return std::numeric_limits<int>::max();
@@ -55,16 +39,6 @@ int DoubleToIntClamp(double dfValue)
 
 }  // namespace
 
-/************************************************************************/
-/*                           OGRSimpleCurve()                           */
-/************************************************************************/
-
-/** Constructor */
-OGRSimpleCurve::OGRSimpleCurve()
-    : nPointCount(0), paoPoints(nullptr), padfZ(nullptr), padfM(nullptr)
-{
-}
-
 /************************************************************************/
 /*                OGRSimpleCurve( const OGRSimpleCurve& )               */
 /************************************************************************/
@@ -149,32 +123,35 @@ void OGRSimpleCurve::empty()
 /*                       setCoordinateDimension()                       */
 /************************************************************************/
 
-void OGRSimpleCurve::setCoordinateDimension(int nNewDimension)
+bool OGRSimpleCurve::setCoordinateDimension(int nNewDimension)
 
 {
+    setMeasured(FALSE);
     if (nNewDimension == 2)
         Make2D();
     else if (nNewDimension == 3)
-        Make3D();
-    setMeasured(FALSE);
+        return Make3D();
+    return true;
 }
 
-void OGRSimpleCurve::set3D(OGRBoolean bIs3D)
+bool OGRSimpleCurve::set3D(OGRBoolean bIs3D)
 
 {
     if (bIs3D)
-        Make3D();
+        return Make3D();
     else
         Make2D();
+    return true;
 }
 
-void OGRSimpleCurve::setMeasured(OGRBoolean bIsMeasured)
+bool OGRSimpleCurve::setMeasured(OGRBoolean bIsMeasured)
 
 {
     if (bIsMeasured)
-        AddM();
+        return AddM();
     else
         RemoveM();
+    return true;
 }
 
 /************************************************************************/
@@ -211,7 +188,7 @@ void OGRSimpleCurve::Make2D()
 /*                               Make3D()                               */
 /************************************************************************/
 
-void OGRSimpleCurve::Make3D()
+bool OGRSimpleCurve::Make3D()
 
 {
     if (padfZ == nullptr)
@@ -223,10 +200,11 @@ void OGRSimpleCurve::Make3D()
             flags &= ~OGR_G_3D;
             CPLError(CE_Failure, CPLE_AppDefined,
                      "OGRSimpleCurve::Make3D() failed");
-            return;
+            return false;
         }
     }
     flags |= OGR_G_3D;
+    return true;
 }
 
 /************************************************************************/
@@ -248,7 +226,7 @@ void OGRSimpleCurve::RemoveM()
 /*                               AddM()                                 */
 /************************************************************************/
 
-void OGRSimpleCurve::AddM()
+bool OGRSimpleCurve::AddM()
 
 {
     if (padfM == nullptr)
@@ -260,10 +238,11 @@ void OGRSimpleCurve::AddM()
             flags &= ~OGR_G_MEASURED;
             CPLError(CE_Failure, CPLE_AppDefined,
                      "OGRSimpleCurve::AddM() failed");
-            return;
+            return false;
         }
     }
     flags |= OGR_G_MEASURED;
+    return true;
 }
 
 //! @endcond
@@ -400,9 +379,10 @@ double OGRSimpleCurve::getM(int iVertex) const
  * @param nNewPointCount the new number of points for geometry.
  * @param bZeroizeNewContent whether to set to zero the new elements of arrays
  *                           that are extended.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::setNumPoints(int nNewPointCount, int bZeroizeNewContent)
+bool OGRSimpleCurve::setNumPoints(int nNewPointCount, int bZeroizeNewContent)
 
 {
     CPLAssert(nNewPointCount >= 0);
@@ -415,8 +395,13 @@ void OGRSimpleCurve::setNumPoints(int nNewPointCount, int bZeroizeNewContent)
         if (nNewPointCount > std::numeric_limits<int>::max() /
                                  static_cast<int>(sizeof(OGRRawPoint)))
         {
-            CPLError(CE_Failure, CPLE_IllegalArg, "Too big point count.");
-            return;
+            CPLError(CE_Failure, CPLE_IllegalArg,
+                     "Too many points on line/curve (%d points exceeds the "
+                     "limit of %d points)",
+                     nNewPointCount,
+                     std::numeric_limits<int>::max() /
+                         static_cast<int>(sizeof(OGRRawPoint)));
+            return false;
         }
 
         // If first allocation, just aim for nNewPointCount
@@ -448,7 +433,7 @@ void OGRSimpleCurve::setNumPoints(int nNewPointCount, int bZeroizeNewContent)
             VSI_REALLOC_VERBOSE(paoPoints, sizeof(OGRRawPoint) * nNewCapacity));
         if (paoNewPoints == nullptr)
         {
-            return;
+            return false;
         }
         paoPoints = paoNewPoints;
 
@@ -458,7 +443,7 @@ void OGRSimpleCurve::setNumPoints(int nNewPointCount, int bZeroizeNewContent)
                 VSI_REALLOC_VERBOSE(padfZ, sizeof(double) * nNewCapacity));
             if (padfNewZ == nullptr)
             {
-                return;
+                return false;
             }
             padfZ = padfNewZ;
         }
@@ -469,7 +454,7 @@ void OGRSimpleCurve::setNumPoints(int nNewPointCount, int bZeroizeNewContent)
                 VSI_REALLOC_VERBOSE(padfM, sizeof(double) * nNewCapacity));
             if (padfNewM == nullptr)
             {
-                return;
+                return false;
             }
             padfM = padfNewM;
         }
@@ -497,6 +482,7 @@ void OGRSimpleCurve::setNumPoints(int nNewPointCount, int bZeroizeNewContent)
     }
 
     nPointCount = nNewPointCount;
+    return true;
 }
 
 /************************************************************************/
@@ -514,20 +500,37 @@ void OGRSimpleCurve::setNumPoints(int nNewPointCount, int bZeroizeNewContent)
  *
  * @param iPoint the index of the vertex to assign (zero based).
  * @param poPoint the value to assign to the vertex.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::setPoint(int iPoint, OGRPoint *poPoint)
+bool OGRSimpleCurve::setPoint(int iPoint, OGRPoint *poPoint)
 
 {
     if ((flags & OGR_G_3D) && (flags & OGR_G_MEASURED))
-        setPoint(iPoint, poPoint->getX(), poPoint->getY(), poPoint->getZ(),
-                 poPoint->getM());
+        return setPoint(iPoint, poPoint->getX(), poPoint->getY(),
+                        poPoint->getZ(), poPoint->getM());
     else if (flags & OGR_G_3D)
-        setPoint(iPoint, poPoint->getX(), poPoint->getY(), poPoint->getZ());
+        return setPoint(iPoint, poPoint->getX(), poPoint->getY(),
+                        poPoint->getZ());
     else if (flags & OGR_G_MEASURED)
-        setPointM(iPoint, poPoint->getX(), poPoint->getY(), poPoint->getM());
+        return setPointM(iPoint, poPoint->getX(), poPoint->getY(),
+                         poPoint->getM());
     else
-        setPoint(iPoint, poPoint->getX(), poPoint->getY());
+        return setPoint(iPoint, poPoint->getX(), poPoint->getY());
+}
+
+/************************************************************************/
+/*                           CheckPointCount()                          */
+/************************************************************************/
+
+static inline bool CheckPointCount(int iPoint)
+{
+    if (iPoint == std::numeric_limits<int>::max())
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Too big point count.");
+        return false;
+    }
+    return true;
 }
 
 /************************************************************************/
@@ -547,23 +550,26 @@ void OGRSimpleCurve::setPoint(int iPoint, OGRPoint *poPoint)
  * @param xIn input X coordinate to assign.
  * @param yIn input Y coordinate to assign.
  * @param zIn input Z coordinate to assign (defaults to zero).
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::setPoint(int iPoint, double xIn, double yIn, double zIn)
+bool OGRSimpleCurve::setPoint(int iPoint, double xIn, double yIn, double zIn)
 
 {
     if (!(flags & OGR_G_3D))
-        Make3D();
+    {
+        if (!Make3D())
+            return false;
+    }
 
     if (iPoint >= nPointCount)
     {
-        setNumPoints(iPoint + 1);
-        if (nPointCount < iPoint + 1)
-            return;
+        if (!CheckPointCount(iPoint) || !setNumPoints(iPoint + 1))
+            return false;
     }
 #ifdef DEBUG
     if (paoPoints == nullptr)
-        return;
+        return false;
 #endif
 
     paoPoints[iPoint].x = xIn;
@@ -573,6 +579,7 @@ void OGRSimpleCurve::setPoint(int iPoint, double xIn, double yIn, double zIn)
     {
         padfZ[iPoint] = zIn;
     }
+    return true;
 }
 
 /**
@@ -588,23 +595,26 @@ void OGRSimpleCurve::setPoint(int iPoint, double xIn, double yIn, double zIn)
  * @param xIn input X coordinate to assign.
  * @param yIn input Y coordinate to assign.
  * @param mIn input M coordinate to assign (defaults to zero).
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::setPointM(int iPoint, double xIn, double yIn, double mIn)
+bool OGRSimpleCurve::setPointM(int iPoint, double xIn, double yIn, double mIn)
 
 {
     if (!(flags & OGR_G_MEASURED))
-        AddM();
+    {
+        if (!AddM())
+            return false;
+    }
 
     if (iPoint >= nPointCount)
     {
-        setNumPoints(iPoint + 1);
-        if (nPointCount < iPoint + 1)
-            return;
+        if (!CheckPointCount(iPoint) || !setNumPoints(iPoint + 1))
+            return false;
     }
 #ifdef DEBUG
     if (paoPoints == nullptr)
-        return;
+        return false;
 #endif
 
     paoPoints[iPoint].x = xIn;
@@ -614,6 +624,7 @@ void OGRSimpleCurve::setPointM(int iPoint, double xIn, double yIn, double mIn)
     {
         padfM[iPoint] = mIn;
     }
+    return true;
 }
 
 /**
@@ -630,26 +641,32 @@ void OGRSimpleCurve::setPointM(int iPoint, double xIn, double yIn, double mIn)
  * @param yIn input Y coordinate to assign.
  * @param zIn input Z coordinate to assign (defaults to zero).
  * @param mIn input M coordinate to assign (defaults to zero).
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::setPoint(int iPoint, double xIn, double yIn, double zIn,
+bool OGRSimpleCurve::setPoint(int iPoint, double xIn, double yIn, double zIn,
                               double mIn)
 
 {
     if (!(flags & OGR_G_3D))
-        Make3D();
+    {
+        if (!Make3D())
+            return false;
+    }
     if (!(flags & OGR_G_MEASURED))
-        AddM();
+    {
+        if (!AddM())
+            return false;
+    }
 
     if (iPoint >= nPointCount)
     {
-        setNumPoints(iPoint + 1);
-        if (nPointCount < iPoint + 1)
-            return;
+        if (!CheckPointCount(iPoint) || !setNumPoints(iPoint + 1))
+            return false;
     }
 #ifdef DEBUG
     if (paoPoints == nullptr)
-        return;
+        return false;
 #endif
 
     paoPoints[iPoint].x = xIn;
@@ -663,6 +680,7 @@ void OGRSimpleCurve::setPoint(int iPoint, double xIn, double yIn, double zIn,
     {
         padfM[iPoint] = mIn;
     }
+    return true;
 }
 
 /**
@@ -677,20 +695,21 @@ void OGRSimpleCurve::setPoint(int iPoint, double xIn, double yIn, double zIn,
  * @param iPoint the index of the vertex to assign (zero based).
  * @param xIn input X coordinate to assign.
  * @param yIn input Y coordinate to assign.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::setPoint(int iPoint, double xIn, double yIn)
+bool OGRSimpleCurve::setPoint(int iPoint, double xIn, double yIn)
 
 {
     if (iPoint >= nPointCount)
     {
-        setNumPoints(iPoint + 1);
-        if (nPointCount < iPoint + 1 || paoPoints == nullptr)
-            return;
+        if (!CheckPointCount(iPoint) || !setNumPoints(iPoint + 1) || !paoPoints)
+            return false;
     }
 
     paoPoints[iPoint].x = xIn;
     paoPoints[iPoint].y = yIn;
+    return true;
 }
 
 /************************************************************************/
@@ -708,22 +727,26 @@ void OGRSimpleCurve::setPoint(int iPoint, double xIn, double yIn)
  *
  * @param iPoint the index of the vertex to assign (zero based).
  * @param zIn input Z coordinate to assign.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::setZ(int iPoint, double zIn)
+bool OGRSimpleCurve::setZ(int iPoint, double zIn)
 {
     if (getCoordinateDimension() == 2)
-        Make3D();
+    {
+        if (!Make3D())
+            return false;
+    }
 
     if (iPoint >= nPointCount)
     {
-        setNumPoints(iPoint + 1);
-        if (nPointCount < iPoint + 1)
-            return;
+        if (!CheckPointCount(iPoint) || !setNumPoints(iPoint + 1))
+            return false;
     }
 
     if (padfZ != nullptr)
         padfZ[iPoint] = zIn;
+    return true;
 }
 
 /************************************************************************/
@@ -741,22 +764,26 @@ void OGRSimpleCurve::setZ(int iPoint, double zIn)
  *
  * @param iPoint the index of the vertex to assign (zero based).
  * @param mIn input M coordinate to assign.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::setM(int iPoint, double mIn)
+bool OGRSimpleCurve::setM(int iPoint, double mIn)
 {
     if (!(flags & OGR_G_MEASURED))
-        AddM();
+    {
+        if (!AddM())
+            return false;
+    }
 
     if (iPoint >= nPointCount)
     {
-        setNumPoints(iPoint + 1);
-        if (nPointCount < iPoint + 1)
-            return;
+        if (!CheckPointCount(iPoint) || !setNumPoints(iPoint + 1))
+            return false;
     }
 
     if (padfM != nullptr)
         padfM[iPoint] = mIn;
+    return true;
 }
 
 /************************************************************************/
@@ -772,22 +799,23 @@ void OGRSimpleCurve::setM(int iPoint, double mIn)
  * There is no SFCOM analog to this method.
  *
  * @param poPoint the point to assign to the new vertex.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::addPoint(const OGRPoint *poPoint)
+bool OGRSimpleCurve::addPoint(const OGRPoint *poPoint)
 
 {
     if (poPoint->Is3D() && poPoint->IsMeasured())
-        setPoint(nPointCount, poPoint->getX(), poPoint->getY(), poPoint->getZ(),
-                 poPoint->getM());
+        return setPoint(nPointCount, poPoint->getX(), poPoint->getY(),
+                        poPoint->getZ(), poPoint->getM());
     else if (poPoint->Is3D())
-        setPoint(nPointCount, poPoint->getX(), poPoint->getY(),
-                 poPoint->getZ());
+        return setPoint(nPointCount, poPoint->getX(), poPoint->getY(),
+                        poPoint->getZ());
     else if (poPoint->IsMeasured())
-        setPointM(nPointCount, poPoint->getX(), poPoint->getY(),
-                  poPoint->getM());
+        return setPointM(nPointCount, poPoint->getX(), poPoint->getY(),
+                         poPoint->getM());
     else
-        setPoint(nPointCount, poPoint->getX(), poPoint->getY());
+        return setPoint(nPointCount, poPoint->getX(), poPoint->getY());
 }
 
 /************************************************************************/
@@ -806,12 +834,13 @@ void OGRSimpleCurve::addPoint(const OGRPoint *poPoint)
  * @param y the Y coordinate to assign to the new point.
  * @param z the Z coordinate to assign to the new point (defaults to zero).
  * @param m the M coordinate to assign to the new point (defaults to zero).
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::addPoint(double x, double y, double z, double m)
+bool OGRSimpleCurve::addPoint(double x, double y, double z, double m)
 
 {
-    setPoint(nPointCount, x, y, z, m);
+    return setPoint(nPointCount, x, y, z, m);
 }
 
 /**
@@ -825,12 +854,13 @@ void OGRSimpleCurve::addPoint(double x, double y, double z, double m)
  * @param x the X coordinate to assign to the new point.
  * @param y the Y coordinate to assign to the new point.
  * @param z the Z coordinate to assign to the new point (defaults to zero).
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::addPoint(double x, double y, double z)
+bool OGRSimpleCurve::addPoint(double x, double y, double z)
 
 {
-    setPoint(nPointCount, x, y, z);
+    return setPoint(nPointCount, x, y, z);
 }
 
 /**
@@ -843,12 +873,13 @@ void OGRSimpleCurve::addPoint(double x, double y, double z)
  *
  * @param x the X coordinate to assign to the new point.
  * @param y the Y coordinate to assign to the new point.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::addPoint(double x, double y)
+bool OGRSimpleCurve::addPoint(double x, double y)
 
 {
-    setPoint(nPointCount, x, y);
+    return setPoint(nPointCount, x, y);
 }
 
 /**
@@ -862,12 +893,13 @@ void OGRSimpleCurve::addPoint(double x, double y)
  * @param x the X coordinate to assign to the new point.
  * @param y the Y coordinate to assign to the new point.
  * @param m the M coordinate to assign to the new point.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::addPointM(double x, double y, double m)
+bool OGRSimpleCurve::addPointM(double x, double y, double m)
 
 {
-    setPointM(nPointCount, x, y, m);
+    return setPointM(nPointCount, x, y, m);
 }
 
 /************************************************************************/
@@ -922,19 +954,19 @@ bool OGRSimpleCurve::removePoint(int nIndex)
  * @param nPointsIn number of points being passed in paoPointsIn
  * @param paoPointsIn list of points being assigned.
  * @param padfMIn the M values that go with the points.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::setPointsM(int nPointsIn, const OGRRawPoint *paoPointsIn,
+bool OGRSimpleCurve::setPointsM(int nPointsIn, const OGRRawPoint *paoPointsIn,
                                 const double *padfMIn)
 
 {
-    setNumPoints(nPointsIn, FALSE);
-    if (nPointCount < nPointsIn
+    if (!setNumPoints(nPointsIn, FALSE)
 #ifdef DEBUG
         || paoPoints == nullptr
 #endif
     )
-        return;
+        return false;
 
     if (nPointsIn)
         memcpy(paoPoints, paoPointsIn, sizeof(OGRRawPoint) * nPointsIn);
@@ -948,10 +980,12 @@ void OGRSimpleCurve::setPointsM(int nPointsIn, const OGRRawPoint *paoPointsIn,
     }
     else if (padfMIn)
     {
-        AddM();
+        if (!AddM())
+            return false;
         if (padfM && nPointsIn)
             memcpy(padfM, padfMIn, sizeof(double) * nPointsIn);
     }
+    return true;
 }
 
 /************************************************************************/
@@ -971,19 +1005,19 @@ void OGRSimpleCurve::setPointsM(int nPointsIn, const OGRRawPoint *paoPointsIn,
  * @param paoPointsIn list of points being assigned.
  * @param padfZIn the Z values that go with the points.
  * @param padfMIn the M values that go with the points.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::setPoints(int nPointsIn, const OGRRawPoint *paoPointsIn,
+bool OGRSimpleCurve::setPoints(int nPointsIn, const OGRRawPoint *paoPointsIn,
                                const double *padfZIn, const double *padfMIn)
 
 {
-    setNumPoints(nPointsIn, FALSE);
-    if (nPointCount < nPointsIn
+    if (!setNumPoints(nPointsIn, FALSE)
 #ifdef DEBUG
         || paoPoints == nullptr
 #endif
     )
-        return;
+        return false;
 
     if (nPointsIn)
         memcpy(paoPoints, paoPointsIn, sizeof(OGRRawPoint) * nPointsIn);
@@ -997,7 +1031,8 @@ void OGRSimpleCurve::setPoints(int nPointsIn, const OGRRawPoint *paoPointsIn,
     }
     else if (padfZIn)
     {
-        Make3D();
+        if (!Make3D())
+            return false;
         if (padfZ && nPointsIn)
             memcpy(padfZ, padfZIn, sizeof(double) * nPointsIn);
     }
@@ -1011,10 +1046,12 @@ void OGRSimpleCurve::setPoints(int nPointsIn, const OGRRawPoint *paoPointsIn,
     }
     else if (padfMIn)
     {
-        AddM();
+        if (!AddM())
+            return false;
         if (padfM && nPointsIn)
             memcpy(padfM, padfMIn, sizeof(double) * nPointsIn);
     }
+    return true;
 }
 
 /************************************************************************/
@@ -1033,19 +1070,19 @@ void OGRSimpleCurve::setPoints(int nPointsIn, const OGRRawPoint *paoPointsIn,
  * @param nPointsIn number of points being passed in paoPointsIn
  * @param paoPointsIn list of points being assigned.
  * @param padfZIn the Z values that go with the points (optional, may be NULL).
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::setPoints(int nPointsIn, const OGRRawPoint *paoPointsIn,
+bool OGRSimpleCurve::setPoints(int nPointsIn, const OGRRawPoint *paoPointsIn,
                                const double *padfZIn)
 
 {
-    setNumPoints(nPointsIn, FALSE);
-    if (nPointCount < nPointsIn
+    if (!setNumPoints(nPointsIn, FALSE)
 #ifdef DEBUG
         || paoPoints == nullptr
 #endif
     )
-        return;
+        return false;
 
     if (nPointsIn)
         memcpy(paoPoints, paoPointsIn, sizeof(OGRRawPoint) * nPointsIn);
@@ -1059,10 +1096,12 @@ void OGRSimpleCurve::setPoints(int nPointsIn, const OGRRawPoint *paoPointsIn,
     }
     else if (padfZIn)
     {
-        Make3D();
+        if (!Make3D())
+            return false;
         if (padfZ && nPointsIn)
             memcpy(padfZ, padfZIn, sizeof(double) * nPointsIn);
     }
+    return true;
 }
 
 /************************************************************************/
@@ -1082,9 +1121,10 @@ void OGRSimpleCurve::setPoints(int nPointsIn, const OGRRawPoint *paoPointsIn,
  * @param padfY list of Y coordinates of points being assigned.
  * @param padfZIn list of Z coordinates of points being assigned (defaults to
  * NULL for 2D objects).
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::setPoints(int nPointsIn, const double *padfX,
+bool OGRSimpleCurve::setPoints(int nPointsIn, const double *padfX,
                                const double *padfY, const double *padfZIn)
 
 {
@@ -1094,14 +1134,16 @@ void OGRSimpleCurve::setPoints(int nPointsIn, const double *padfX,
     if (padfZIn == nullptr)
         Make2D();
     else
-        Make3D();
+    {
+        if (!Make3D())
+            return false;
+    }
 
     /* -------------------------------------------------------------------- */
     /*      Assign values.                                                  */
     /* -------------------------------------------------------------------- */
-    setNumPoints(nPointsIn, FALSE);
-    if (nPointCount < nPointsIn)
-        return;
+    if (!setNumPoints(nPointsIn, FALSE))
+        return false;
 
     for (int i = 0; i < nPointsIn; i++)
     {
@@ -1109,12 +1151,11 @@ void OGRSimpleCurve::setPoints(int nPointsIn, const double *padfX,
         paoPoints[i].y = padfY[i];
     }
 
-    if (padfZ == nullptr || !padfZIn || !nPointsIn)
+    if (padfZ && padfZIn && nPointsIn)
     {
-        return;
+        memcpy(padfZ, padfZIn, sizeof(double) * nPointsIn);
     }
-
-    memcpy(padfZ, padfZIn, sizeof(double) * nPointsIn);
+    return true;
 }
 
 /************************************************************************/
@@ -1133,9 +1174,10 @@ void OGRSimpleCurve::setPoints(int nPointsIn, const double *padfX,
  * @param padfX list of X coordinates of points being assigned.
  * @param padfY list of Y coordinates of points being assigned.
  * @param padfMIn list of M coordinates of points being assigned.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::setPointsM(int nPointsIn, const double *padfX,
+bool OGRSimpleCurve::setPointsM(int nPointsIn, const double *padfX,
                                 const double *padfY, const double *padfMIn)
 
 {
@@ -1145,14 +1187,16 @@ void OGRSimpleCurve::setPointsM(int nPointsIn, const double *padfX,
     if (padfMIn == nullptr)
         RemoveM();
     else
-        AddM();
+    {
+        if (!AddM())
+            return false;
+    }
 
     /* -------------------------------------------------------------------- */
     /*      Assign values.                                                  */
     /* -------------------------------------------------------------------- */
-    setNumPoints(nPointsIn, FALSE);
-    if (nPointCount < nPointsIn)
-        return;
+    if (!setNumPoints(nPointsIn, FALSE))
+        return false;
 
     for (int i = 0; i < nPointsIn; i++)
     {
@@ -1160,12 +1204,11 @@ void OGRSimpleCurve::setPointsM(int nPointsIn, const double *padfX,
         paoPoints[i].y = padfY[i];
     }
 
-    if (padfMIn == nullptr || !padfM || !nPointsIn)
+    if (padfMIn && padfM && nPointsIn)
     {
-        return;
+        memcpy(padfM, padfMIn, sizeof(double) * nPointsIn);
     }
-
-    memcpy(padfM, padfMIn, sizeof(double) * nPointsIn);
+    return true;
 }
 
 /************************************************************************/
@@ -1185,9 +1228,10 @@ void OGRSimpleCurve::setPointsM(int nPointsIn, const double *padfX,
  * @param padfY list of Y coordinates of points being assigned.
  * @param padfZIn list of Z coordinates of points being assigned.
  * @param padfMIn list of M coordinates of points being assigned.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::setPoints(int nPointsIn, const double *padfX,
+bool OGRSimpleCurve::setPoints(int nPointsIn, const double *padfX,
                                const double *padfY, const double *padfZIn,
                                const double *padfMIn)
 
@@ -1198,7 +1242,10 @@ void OGRSimpleCurve::setPoints(int nPointsIn, const double *padfX,
     if (padfZIn == nullptr)
         Make2D();
     else
-        Make3D();
+    {
+        if (!Make3D())
+            return false;
+    }
 
     /* -------------------------------------------------------------------- */
     /*      Check measures.                                                 */
@@ -1206,14 +1253,16 @@ void OGRSimpleCurve::setPoints(int nPointsIn, const double *padfX,
     if (padfMIn == nullptr)
         RemoveM();
     else
-        AddM();
+    {
+        if (!AddM())
+            return false;
+    }
 
     /* -------------------------------------------------------------------- */
     /*      Assign values.                                                  */
     /* -------------------------------------------------------------------- */
-    setNumPoints(nPointsIn, FALSE);
-    if (nPointCount < nPointsIn)
-        return;
+    if (!setNumPoints(nPointsIn, FALSE))
+        return false;
 
     for (int i = 0; i < nPointsIn; i++)
     {
@@ -1225,6 +1274,7 @@ void OGRSimpleCurve::setPoints(int nPointsIn, const double *padfX,
         memcpy(padfZ, padfZIn, sizeof(double) * nPointsIn);
     if (padfM != nullptr && padfMIn && nPointsIn)
         memcpy(padfM, padfMIn, sizeof(double) * nPointsIn);
+    return true;
 }
 
 /************************************************************************/
@@ -1439,8 +1489,7 @@ void OGRSimpleCurve::addSubLineString(const OGRLineString *poOtherLine,
     int nOldPoints = nPointCount;
     int nPointsToAdd = std::abs(nEndVertex - nStartVertex) + 1;
 
-    setNumPoints(nPointsToAdd + nOldPoints, FALSE);
-    if (nPointCount < nPointsToAdd + nOldPoints
+    if (!setNumPoints(nPointsToAdd + nOldPoints, FALSE)
 #ifdef DEBUG
         || paoPoints == nullptr
 #endif
@@ -1556,9 +1605,8 @@ OGRErr OGRSimpleCurve::importFromWkb(const unsigned char *pabyData,
         return OGRERR_NOT_ENOUGH_DATA;
     }
 
-    setNumPoints(nNewNumPoints, FALSE);
-    if (nPointCount < nNewNumPoints)
-        return OGRERR_FAILURE;
+    if (!setNumPoints(nNewNumPoints, FALSE))
+        return OGRERR_NOT_ENOUGH_MEMORY;
 
     nBytesConsumedOut = 9 + 8 * static_cast<size_t>(nPointCount) *
                                 (2 + ((flags & OGR_G_3D) ? 1 : 0) +
@@ -1799,11 +1847,13 @@ OGRErr OGRSimpleCurve::importFromWkt(const char **ppszInput)
 
     if ((flagsFromInput & OGR_G_3D) && !(flags & OGR_G_3D))
     {
-        set3D(TRUE);
+        if (!set3D(TRUE))
+            return OGRERR_NOT_ENOUGH_MEMORY;
     }
     if ((flagsFromInput & OGR_G_MEASURED) && !(flags & OGR_G_MEASURED))
     {
-        setMeasured(TRUE);
+        if (!setMeasured(TRUE))
+            return OGRERR_NOT_ENOUGH_MEMORY;
     }
 
     *ppszInput = pszInput;
@@ -2107,7 +2157,7 @@ OGRLineString *OGRSimpleCurve::getSubLine(double dfDistanceFrom,
                                           int bAsRatio) const
 
 {
-    OGRLineString *poNewLineString = new OGRLineString();
+    auto poNewLineString = std::make_unique<OGRLineString>();
 
     poNewLineString->assignSpatialReference(getSpatialReference());
     poNewLineString->setCoordinateDimension(getCoordinateDimension());
@@ -2139,10 +2189,14 @@ OGRLineString *OGRSimpleCurve::getSubLine(double dfDistanceFrom,
     int i = 0;  // Used after if blocks.
     if (dfDistanceFrom == 0)
     {
+        bool bRet;
         if (getCoordinateDimension() == 3)
-            poNewLineString->addPoint(paoPoints[0].x, paoPoints[0].y, padfZ[0]);
+            bRet = poNewLineString->addPoint(paoPoints[0].x, paoPoints[0].y,
+                                             padfZ[0]);
         else
-            poNewLineString->addPoint(paoPoints[0].x, paoPoints[0].y);
+            bRet = poNewLineString->addPoint(paoPoints[0].x, paoPoints[0].y);
+        if (!bRet)
+            return nullptr;
     }
     else
     {
@@ -2165,16 +2219,19 @@ OGRLineString *OGRSimpleCurve::getSubLine(double dfDistanceFrom,
                     double dfY = paoPoints[i].y * (1 - dfRatio) +
                                  paoPoints[i + 1].y * dfRatio;
 
+                    bool bRet;
                     if (getCoordinateDimension() == 3)
                     {
-                        poNewLineString->addPoint(dfX, dfY,
-                                                  padfZ[i] * (1 - dfRatio) +
-                                                      padfZ[i + 1] * dfRatio);
+                        bRet = poNewLineString->addPoint(
+                            dfX, dfY,
+                            padfZ[i] * (1 - dfRatio) + padfZ[i + 1] * dfRatio);
                     }
                     else
                     {
-                        poNewLineString->addPoint(dfX, dfY);
+                        bRet = poNewLineString->addPoint(dfX, dfY);
                     }
+                    if (!bRet)
+                        return nullptr;
 
                     // Check if dfDistanceTo is in same segment.
                     if (dfLength <= dfDistanceTo &&
@@ -2189,23 +2246,22 @@ OGRLineString *OGRSimpleCurve::getSubLine(double dfDistanceFrom,
 
                         if (getCoordinateDimension() == 3)
                         {
-                            poNewLineString->addPoint(dfX, dfY,
-                                                      padfZ[i] * (1 - dfRatio) +
-                                                          padfZ[i + 1] *
-                                                              dfRatio);
+                            bRet = poNewLineString->addPoint(
+                                dfX, dfY,
+                                padfZ[i] * (1 - dfRatio) +
+                                    padfZ[i + 1] * dfRatio);
                         }
                         else
                         {
-                            poNewLineString->addPoint(dfX, dfY);
+                            bRet = poNewLineString->addPoint(dfX, dfY);
                         }
 
-                        if (poNewLineString->getNumPoints() < 2)
+                        if (!bRet || poNewLineString->getNumPoints() < 2)
                         {
-                            delete poNewLineString;
-                            poNewLineString = nullptr;
+                            return nullptr;
                         }
 
-                        return poNewLineString;
+                        return poNewLineString.release();
                     }
                     i++;
                     dfLength += dfSegLength;
@@ -2220,10 +2276,14 @@ OGRLineString *OGRSimpleCurve::getSubLine(double dfDistanceFrom,
     // Add points.
     for (; i < nPointCount - 1; i++)
     {
+        bool bRet;
         if (getCoordinateDimension() == 3)
-            poNewLineString->addPoint(paoPoints[i].x, paoPoints[i].y, padfZ[i]);
+            bRet = poNewLineString->addPoint(paoPoints[i].x, paoPoints[i].y,
+                                             padfZ[i]);
         else
-            poNewLineString->addPoint(paoPoints[i].x, paoPoints[i].y);
+            bRet = poNewLineString->addPoint(paoPoints[i].x, paoPoints[i].y);
+        if (!bRet)
+            return nullptr;
 
         const double dfDeltaX = paoPoints[i + 1].x - paoPoints[i].x;
         const double dfDeltaY = paoPoints[i + 1].y - paoPoints[i].y;
@@ -2243,34 +2303,36 @@ OGRLineString *OGRSimpleCurve::getSubLine(double dfDistanceFrom,
                                    paoPoints[i + 1].y * dfRatio;
 
                 if (getCoordinateDimension() == 3)
-                    poNewLineString->addPoint(dfX, dfY,
-                                              padfZ[i] * (1 - dfRatio) +
-                                                  padfZ[i + 1] * dfRatio);
+                    bRet = poNewLineString->addPoint(
+                        dfX, dfY,
+                        padfZ[i] * (1 - dfRatio) + padfZ[i + 1] * dfRatio);
                 else
-                    poNewLineString->addPoint(dfX, dfY);
+                    bRet = poNewLineString->addPoint(dfX, dfY);
+                if (!bRet)
+                    return nullptr;
 
-                return poNewLineString;
+                return poNewLineString.release();
             }
 
             dfLength += dfSegLength;
         }
     }
 
+    bool bRet;
     if (getCoordinateDimension() == 3)
-        poNewLineString->addPoint(paoPoints[nPointCount - 1].x,
-                                  paoPoints[nPointCount - 1].y,
-                                  padfZ[nPointCount - 1]);
+        bRet = poNewLineString->addPoint(paoPoints[nPointCount - 1].x,
+                                         paoPoints[nPointCount - 1].y,
+                                         padfZ[nPointCount - 1]);
     else
-        poNewLineString->addPoint(paoPoints[nPointCount - 1].x,
-                                  paoPoints[nPointCount - 1].y);
+        bRet = poNewLineString->addPoint(paoPoints[nPointCount - 1].x,
+                                         paoPoints[nPointCount - 1].y);
 
-    if (poNewLineString->getNumPoints() < 2)
+    if (!bRet || poNewLineString->getNumPoints() < 2)
     {
-        delete poNewLineString;
-        poNewLineString = nullptr;
+        return nullptr;
     }
 
-    return poNewLineString;
+    return poNewLineString.release();
 }
 
 /************************************************************************/
@@ -2501,16 +2563,16 @@ OGRBoolean OGRSimpleCurve::IsEmpty() const
 /*                     OGRSimpleCurve::segmentize()                     */
 /************************************************************************/
 
-void OGRSimpleCurve::segmentize(double dfMaxLength)
+bool OGRSimpleCurve::segmentize(double dfMaxLength)
 {
     if (dfMaxLength <= 0)
     {
         CPLError(CE_Failure, CPLE_AppDefined,
                  "dfMaxLength must be strictly positive");
-        return;
+        return false;
     }
     if (nPointCount < 2)
-        return;
+        return true;
 
     // So as to make sure that the same line followed in both directions
     // result in the same segmentized line.
@@ -2519,15 +2581,17 @@ void OGRSimpleCurve::segmentize(double dfMaxLength)
          paoPoints[0].y < paoPoints[nPointCount - 1].y))
     {
         reversePoints();
-        segmentize(dfMaxLength);
+        bool bRet = segmentize(dfMaxLength);
         reversePoints();
-        return;
+        return bRet;
     }
 
     int nNewPointCount = 0;
     const double dfSquareMaxLength = dfMaxLength * dfMaxLength;
 
     // First pass to compute new number of points
+    constexpr double REL_EPSILON_LENGTH_SQUARE = 1e-5;
+    constexpr double REL_EPSILON_ROUND = 1e-2;
     for (int i = 0; i < nPointCount; i++)
     {
         nNewPointCount++;
@@ -2539,10 +2603,11 @@ void OGRSimpleCurve::segmentize(double dfMaxLength)
         const double dfX = paoPoints[i + 1].x - paoPoints[i].x;
         const double dfY = paoPoints[i + 1].y - paoPoints[i].y;
         const double dfSquareDist = dfX * dfX + dfY * dfY;
-        if (dfSquareDist - dfSquareMaxLength > 1e-5 * dfSquareMaxLength)
+        if (dfSquareDist - dfSquareMaxLength >
+            REL_EPSILON_LENGTH_SQUARE * dfSquareMaxLength)
         {
-            const double dfIntermediatePoints =
-                floor(sqrt(dfSquareDist / dfSquareMaxLength) - 1e-2);
+            const double dfIntermediatePoints = floor(
+                sqrt(dfSquareDist / dfSquareMaxLength) - REL_EPSILON_ROUND);
             const int nIntermediatePoints =
                 DoubleToIntClamp(dfIntermediatePoints);
 
@@ -2556,7 +2621,7 @@ void OGRSimpleCurve::segmentize(double dfMaxLength)
                 CPLError(CE_Failure, CPLE_AppDefined,
                          "Too many points in a segment: %d or %d",
                          nNewPointCount, nIntermediatePoints);
-                return;
+                return false;
             }
 
             nNewPointCount += nIntermediatePoints;
@@ -2564,13 +2629,13 @@ void OGRSimpleCurve::segmentize(double dfMaxLength)
     }
 
     if (nPointCount == nNewPointCount)
-        return;
+        return true;
 
     // Allocate new arrays
     OGRRawPoint *paoNewPoints = static_cast<OGRRawPoint *>(
         VSI_MALLOC_VERBOSE(sizeof(OGRRawPoint) * nNewPointCount));
     if (paoNewPoints == nullptr)
-        return;
+        return false;
     double *padfNewZ = nullptr;
     double *padfNewM = nullptr;
     if (padfZ != nullptr)
@@ -2580,7 +2645,7 @@ void OGRSimpleCurve::segmentize(double dfMaxLength)
         if (padfNewZ == nullptr)
         {
             VSIFree(paoNewPoints);
-            return;
+            return false;
         }
     }
     if (padfM != nullptr)
@@ -2591,7 +2656,7 @@ void OGRSimpleCurve::segmentize(double dfMaxLength)
         {
             VSIFree(paoNewPoints);
             VSIFree(padfNewZ);
-            return;
+            return false;
         }
     }
 
@@ -2620,28 +2685,33 @@ void OGRSimpleCurve::segmentize(double dfMaxLength)
         const double dfX = paoPoints[i + 1].x - paoPoints[i].x;
         const double dfY = paoPoints[i + 1].y - paoPoints[i].y;
         const double dfSquareDist = dfX * dfX + dfY * dfY;
-        if (dfSquareDist - dfSquareMaxLength > 1e-5 * dfSquareMaxLength)
+
+        // Must be kept in sync with the initial pass loop
+        if (dfSquareDist - dfSquareMaxLength >
+            REL_EPSILON_LENGTH_SQUARE * dfSquareMaxLength)
         {
-            const double dfIntermediatePoints =
-                floor(sqrt(dfSquareDist / dfSquareMaxLength) - 1e-2);
+            const double dfIntermediatePoints = floor(
+                sqrt(dfSquareDist / dfSquareMaxLength) - REL_EPSILON_ROUND);
             const int nIntermediatePoints =
                 DoubleToIntClamp(dfIntermediatePoints);
 
             for (int j = 1; j <= nIntermediatePoints; j++)
             {
-                paoNewPoints[nNewPointCount + j - 1].x =
+                // coverity[overflow_const]
+                const int newI = nNewPointCount + j - 1;
+                paoNewPoints[newI].x =
                     paoPoints[i].x + j * dfX / (nIntermediatePoints + 1);
-                paoNewPoints[nNewPointCount + j - 1].y =
+                paoNewPoints[newI].y =
                     paoPoints[i].y + j * dfY / (nIntermediatePoints + 1);
                 if (padfZ != nullptr)
                 {
                     // No interpolation.
-                    padfNewZ[nNewPointCount + j - 1] = padfZ[i];
+                    padfNewZ[newI] = padfZ[i];
                 }
                 if (padfM != nullptr)
                 {
                     // No interpolation.
-                    padfNewM[nNewPointCount + j - 1] = padfM[i];
+                    padfNewM[newI] = padfM[i];
                 }
             }
 
@@ -2664,6 +2734,7 @@ void OGRSimpleCurve::segmentize(double dfMaxLength)
         CPLFree(padfM);
         padfM = padfNewM;
     }
+    return true;
 }
 
 /************************************************************************/
@@ -2720,16 +2791,6 @@ OGRPointIterator *OGRSimpleCurve::getPointIterator() const
     return new OGRSimpleCurvePointIterator(this);
 }
 
-/************************************************************************/
-/*                           OGRLineString()                            */
-/************************************************************************/
-
-/**
- * \brief Create an empty line string.
- */
-
-OGRLineString::OGRLineString() = default;
-
 /************************************************************************/
 /*                  OGRLineString( const OGRLineString& )               */
 /************************************************************************/
@@ -2745,12 +2806,6 @@ OGRLineString::OGRLineString() = default;
 
 OGRLineString::OGRLineString(const OGRLineString &) = default;
 
-/************************************************************************/
-/*                          ~OGRLineString()                            */
-/************************************************************************/
-
-OGRLineString::~OGRLineString() = default;
-
 /************************************************************************/
 /*                    operator=( const OGRLineString& )                 */
 /************************************************************************/
@@ -2965,36 +3020,39 @@ double OGRLineString::get_Area() const
 }
 
 /************************************************************************/
-/*                        get_GeodesicArea()                            */
+/*                        GetGeodesicAreaOrLength()                     */
 /************************************************************************/
 
-double
-OGRLineString::get_GeodesicArea(const OGRSpatialReference *poSRSOverride) const
+static bool GetGeodesicAreaOrLength(const OGRLineString *poLS,
+                                    const OGRSpatialReference *poSRSOverride,
+                                    double *pdfArea, double *pdfLength)
 {
     if (!poSRSOverride)
-        poSRSOverride = getSpatialReference();
+        poSRSOverride = poLS->getSpatialReference();
 
     if (!poSRSOverride)
     {
         CPLError(CE_Failure, CPLE_AppDefined,
-                 "Cannot compute area on ellipsoid due to missing SRS");
-        return -1;
+                 "Cannot compute %s on ellipsoid due to missing SRS",
+                 pdfArea ? "area" : "length");
+        return false;
     }
 
     OGRErr eErr = OGRERR_NONE;
     double dfSemiMajor = poSRSOverride->GetSemiMajor(&eErr);
     if (eErr != OGRERR_NONE)
-        return -1;
+        return false;
     const double dfInvFlattening = poSRSOverride->GetInvFlattening(&eErr);
     if (eErr != OGRERR_NONE)
-        return -1;
+        return false;
 
     geod_geodesic g;
     geod_init(&g, dfSemiMajor,
               dfInvFlattening != 0 ? 1.0 / dfInvFlattening : 0.0);
-    double dfArea = -1;
+
     std::vector<double> adfLat;
     std::vector<double> adfLon;
+    const int nPointCount = poLS->getNumPoints();
     adfLat.reserve(nPointCount);
     adfLon.reserve(nPointCount);
 
@@ -3003,7 +3061,7 @@ OGRLineString::get_GeodesicArea(const OGRSpatialReference *poSRSOverride) const
     {
         CPLError(CE_Failure, CPLE_AppDefined,
                  "Cannot reproject geometry to geographic CRS");
-        return -1;
+        return false;
     }
     oGeogCRS.SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
     auto poCT = std::unique_ptr<OGRCoordinateTransformation>(
@@ -3012,12 +3070,12 @@ OGRLineString::get_GeodesicArea(const OGRSpatialReference *poSRSOverride) const
     {
         CPLError(CE_Failure, CPLE_AppDefined,
                  "Cannot reproject geometry to geographic CRS");
-        return -1;
+        return false;
     }
     for (int i = 0; i < nPointCount; ++i)
     {
-        adfLon.push_back(paoPoints[i].x);
-        adfLat.push_back(paoPoints[i].y);
+        adfLon.push_back(poLS->getX(i));
+        adfLat.push_back(poLS->getY(i));
     }
 #ifdef __GNUC__
 #pragma GCC diagnostic push
@@ -3040,17 +3098,43 @@ OGRLineString::get_GeodesicArea(const OGRSpatialReference *poSRSOverride) const
         {
             CPLError(CE_Failure, CPLE_AppDefined,
                      "Cannot reproject geometry to geographic CRS");
-            return -1;
+            return false;
         }
         adfLon[i] *= dfToDegrees;
         adfLat[i] *= dfToDegrees;
     }
 
     geod_polygonarea(&g, adfLat.data(), adfLon.data(),
-                     static_cast<int>(adfLat.size()), &dfArea, nullptr);
+                     static_cast<int>(adfLat.size()), pdfArea, pdfLength);
+    return true;
+}
+
+/************************************************************************/
+/*                        get_GeodesicArea()                            */
+/************************************************************************/
+
+double
+OGRLineString::get_GeodesicArea(const OGRSpatialReference *poSRSOverride) const
+{
+    double dfArea = 0;
+    if (!GetGeodesicAreaOrLength(this, poSRSOverride, &dfArea, nullptr))
+        return -1.0;
     return std::fabs(dfArea);
 }
 
+/************************************************************************/
+/*                        get_GeodesicLength()                          */
+/************************************************************************/
+
+double OGRLineString::get_GeodesicLength(
+    const OGRSpatialReference *poSRSOverride) const
+{
+    double dfLength = 0;
+    if (!GetGeodesicAreaOrLength(this, poSRSOverride, nullptr, &dfLength))
+        return -1;
+    return dfLength;
+}
+
 /************************************************************************/
 /*                       get_AreaOfCurveSegments()                      */
 /************************************************************************/
diff --git a/ogr/ogrsf_frmts/mitab/mitab_spatialref.cpp b/ogr/ogrmitabspatialref.cpp
similarity index 85%
rename from ogr/ogrsf_frmts/mitab/mitab_spatialref.cpp
rename to ogr/ogrmitabspatialref.cpp
index 2109ebd73705..0274de8158fc 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_spatialref.cpp
+++ b/ogr/ogrmitabspatialref.cpp
@@ -1,37 +1,16 @@
-/**********************************************************************
- *
- * Name:     mitab_spatialref.cpp
- * Project:  MapInfo TAB Read/Write library
- * Language: C++
- * Purpose:  Implementation of the SpatialRef stuff in the TABFile class.
- * Author:   Frank Warmerdam, warmerdam@pobox.com
- *
- **********************************************************************
- * Copyright (c) 1999-2001, Frank Warmerdam
- * Copyright (c) 2014, Even Rouault <even.rouault at spatialys.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.
- **********************************************************************/
+// SPDX-License-Identifier: MIT
+// Copyright 1999-2003, Daniel Morissette
+// Copyright (c) 1999-2001, Frank Warmerdam
+// Implementation translation between MIF CoordSys format, and
+// and OGRSpatialRef format.
+
+/*! @cond Doxygen_Suppress */
+
+#include "ogrmitabspatialref.h"
 
 #include "cpl_port.h"
-#include "mitab.h"
 
+#include <algorithm>
 #include <cmath>
 #include <cstddef>
 #include <cstdio>
@@ -41,10 +20,95 @@
 #include "cpl_conv.h"
 #include "cpl_error.h"
 #include "cpl_string.h"
-#include "mitab_priv.h"
 #include "ogr_spatialref.h"
 #include "ogr_srs_api.h"
 
+typedef struct
+{
+    int nDatumEPSGCode;
+    int nMapInfoDatumID;
+    const char *pszOGCDatumName;
+    int nEllipsoid;
+    double dfShiftX;
+    double dfShiftY;
+    double dfShiftZ;
+    double dfDatumParm0; /* RotX */
+    double dfDatumParm1; /* RotY */
+    double dfDatumParm2; /* RotZ */
+    double dfDatumParm3; /* Scale Factor */
+    double dfDatumParm4; /* Prime Meridian */
+} MapInfoDatumInfo;
+
+typedef struct
+{
+    int nMapInfoId;
+    const char *pszMapinfoName;
+    double dfA;             /* semi major axis in meters */
+    double dfInvFlattening; /* Inverse flattening */
+} MapInfoSpheroidInfo;
+
+/**********************************************************************
+ * MapInfo Units string to numeric ID conversion
+ **********************************************************************/
+typedef struct
+{
+    int nUnitId;
+    const char *pszAbbrev;
+} MapInfoUnitsInfo;
+
+static const MapInfoUnitsInfo gasUnitsList[] = {
+    {0, "mi"},        {1, "km"},          {2, "in"},  {3, "ft"},
+    {4, "yd"},        {5, "mm"},          {6, "cm"},  {7, "m"},
+    {8, "survey ft"}, {8, "survey foot"},  // alternate
+    {13, nullptr},    {9, "nmi"},         {30, "li"}, {31, "ch"},
+    {32, "rd"},       {-1, nullptr}};
+
+/**********************************************************************
+ *                       TABUnitIdToString()
+ *
+ * Return the MIF units name for specified units id.
+ * Return "" if no match found.
+ *
+ * The returned string should not be freed by the caller.
+ **********************************************************************/
+static const char *TABUnitIdToString(int nId)
+{
+    const MapInfoUnitsInfo *psList = gasUnitsList;
+
+    while (psList->nUnitId != -1)
+    {
+        if (psList->nUnitId == nId)
+            return psList->pszAbbrev;
+        psList++;
+    }
+
+    return "";
+}
+
+/**********************************************************************
+ *                       TABUnitIdFromString()
+ *
+ * Return the units ID for specified MIF units name
+ *
+ * Returns -1 if no match found.
+ **********************************************************************/
+static int TABUnitIdFromString(const char *pszName)
+{
+    if (pszName == nullptr)
+        return 13;
+
+    const MapInfoUnitsInfo *psList = gasUnitsList;
+
+    while (psList->nUnitId != -1)
+    {
+        if (psList->pszAbbrev != nullptr && EQUAL(psList->pszAbbrev, pszName))
+            return psList->nUnitId;
+        psList++;
+    }
+
+    return -1;
+}
+
 /* -------------------------------------------------------------------- */
 /*      This table was automatically generated by doing translations    */
 /*      between mif and tab for each datum, and extracting the          */
@@ -188,6 +252,7 @@ const MapInfoDatumInfo asDatumInfoList[] = {
     {6258, 115, "European_Terrestrial_Reference_System_1989", 0, 0, 0, 0, 0, 0,
      0, 0, 0},
     {6258, 115, "Euref_89", 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    {6180, 115, "Estonia_1997", 0, 0, 0, 0, 0, 0, 0, 0, 0},
     {6283, 116, "GDA94", 0, 0, 0, 0, 0, 0, 0, 0, 0},
     {6283, 116, "Geocentric_Datum_of_Australia_1994", 0, 0, 0, 0, 0, 0, 0, 0,
      0},
@@ -691,66 +756,17 @@ static const MapInfoLCCSRS asMapInfoLCCSRSList[] = {
     {0, 0, 74, -98.5, 36.6666666667, 38.5666666667, 37.2666666667},
 };
 
-/**********************************************************************
- *                   TABFile::GetSpatialRef()
- *
- * Returns a reference to an OGRSpatialReference for this dataset.
- * If the projection parameters have not been parsed yet, then we will
- * parse them before returning.
- *
- * The returned object is owned and maintained by this TABFile and
- * should not be modified or freed by the caller.
- *
- * Returns NULL if the SpatialRef cannot be accessed.
- **********************************************************************/
-OGRSpatialReference *TABFile::GetSpatialRef()
-{
-    if (m_poMAPFile == nullptr)
-    {
-        CPLError(CE_Failure, CPLE_AssertionFailed,
-                 "GetSpatialRef() failed: file has not been opened yet.");
-        return nullptr;
-    }
-
-    if (GetGeomType() == wkbNone)
-        return nullptr;
-
-    /*-----------------------------------------------------------------
-     * If projection params have already been processed, just use them.
-     *----------------------------------------------------------------*/
-    if (m_poSpatialRef != nullptr)
-        return m_poSpatialRef;
-
-    /*-----------------------------------------------------------------
-     * Fetch the parameters from the header.
-     *----------------------------------------------------------------*/
-    TABProjInfo sTABProj;
-
-    TABMAPHeaderBlock *poHeader = nullptr;
-    if ((poHeader = m_poMAPFile->GetHeaderBlock()) == nullptr ||
-        poHeader->GetProjInfo(&sTABProj) != 0)
-    {
-        CPLError(CE_Failure, CPLE_FileIO,
-                 "GetSpatialRef() failed reading projection parameters.");
-        return nullptr;
-    }
-
-    m_poSpatialRef = GetSpatialRefFromTABProj(sTABProj);
-    return m_poSpatialRef;
-}
-
 /**********************************************************************
  *                   TABFile::GetSpatialRefFromTABProj()
  **********************************************************************/
 
 static bool TAB_EQUAL(double a, double b)
 {
-    // TODO(schwehr): Use std::abs.
-    return (a < b ? (b - a) : (a - b)) < 1.0e-10;
+    return std::fabs(a - b) < 1.0e-10;
 }
 
 OGRSpatialReference *
-TABFile::GetSpatialRefFromTABProj(const TABProjInfo &sTABProj)
+TABFileGetSpatialRefFromTABProj(const TABProjInfo &sTABProj)
 {
     /*-----------------------------------------------------------------
      * Get the units name, and translation factor.
@@ -1358,6 +1374,7 @@ TABFile::GetSpatialRefFromTABProj(const TABProjInfo &sTABProj)
     /* For LCC, standard parallel 1 and 2 can be switched indifferently */
     /* So the MapInfo order and the EPSG order are not generally identical */
     /* which may cause recognition problems when reading in MapInfo */
+    int nEPSGCandidateCode = 0;
     if (sTABProj.nProjId == 3)
     {
         double dfCenterLong = sTABProj.adProjParams[0];
@@ -1374,8 +1391,19 @@ TABFile::GetSpatialRefFromTABProj(const TABProjInfo &sTABProj)
                 TAB_EQUAL(dfCenterLat, asMapInfoLCCSRSList[i].dfCenterLat))
             {
                 if (TAB_EQUAL(dfStdP1, asMapInfoLCCSRSList[i].dfStdP1) &&
-                    TAB_EQUAL(dfStdP2, asMapInfoLCCSRSList[i].dfStdP2))
+                    (TAB_EQUAL(dfStdP2, asMapInfoLCCSRSList[i].dfStdP2) ||
+                     // EPSG:3301 "Estonian Coordinate System of 1997"
+                     // MapInfo uses a less accurate value of StdP2 than EPSG
+                     (TAB_EQUAL(asMapInfoLCCSRSList[i].dfStdP2, 59.33333333) &&
+                      TAB_EQUAL(dfStdP2, 59.3333333333333))))
                 {
+                    if (nEPSGCandidateCode)
+                    {
+                        poSpatialRef->SetAuthority("PROJCS", "EPSG",
+                                                   nEPSGCandidateCode);
+                        nEPSGCandidateCode = 0;
+                        break;
+                    }
                     if (asMapInfoLCCSRSList[i].bReverseStdP)
                     {
                         CPLDebug("MITAB",
@@ -1386,9 +1414,9 @@ TABFile::GetSpatialRefFromTABProj(const TABProjInfo &sTABProj)
                             sTABProj.adProjParams[4], sTABProj.adProjParams[5]);
                     }
                     if (asMapInfoLCCSRSList[i].nEPSGCode > 0)
-                        poSpatialRef->SetAuthority(
-                            "PROJCS", "EPSG", asMapInfoLCCSRSList[i].nEPSGCode);
-                    break;
+                        nEPSGCandidateCode = asMapInfoLCCSRSList[i].nEPSGCode;
+                    else
+                        break;
                 }
             }
         }
@@ -1405,6 +1433,16 @@ TABFile::GetSpatialRefFromTABProj(const TABProjInfo &sTABProj)
                                            CPLAtof(pszUnitsConv));
     }
 
+    if (nEPSGCandidateCode)
+    {
+        OGRSpatialReference oTmp;
+        oTmp.SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+        if (oTmp.importFromEPSG(nEPSGCandidateCode) == OGRERR_NONE)
+        {
+            *poSpatialRef = std::move(oTmp);
+        }
+    }
+
     /*-----------------------------------------------------------------
      * Special case for Philippine Reference System 1992, to override
      * the MapInfo ellipsoid=8 "Clarke 1866 (modified for Michigan)"
@@ -1432,65 +1470,6 @@ TABFile::GetSpatialRefFromTABProj(const TABProjInfo &sTABProj)
     return poSpatialRef;
 }
 
-/**********************************************************************
- *                   TABFile::SetSpatialRef()
- *
- * Set the OGRSpatialReference for this dataset.
- * A reference to the OGRSpatialReference will be kept, and it will also
- * be converted into a TABProjInfo to be stored in the .MAP header.
- *
- * Returns 0 on success, and -1 on error.
- **********************************************************************/
-int TABFile::SetSpatialRef(OGRSpatialReference *poSpatialRef)
-{
-    if (m_eAccessMode != TABWrite)
-    {
-        CPLError(CE_Failure, CPLE_NotSupported,
-                 "SetSpatialRef() can be used only with Write access.");
-        return -1;
-    }
-
-    if (m_poMAPFile == nullptr)
-    {
-        CPLError(CE_Failure, CPLE_AssertionFailed,
-                 "SetSpatialRef() failed: file has not been opened yet.");
-        return -1;
-    }
-
-    if (poSpatialRef == nullptr)
-    {
-        CPLError(CE_Failure, CPLE_AssertionFailed,
-                 "SetSpatialRef() failed: Called with NULL poSpatialRef.");
-        return -1;
-    }
-
-    /*-----------------------------------------------------------------
-     * Keep a copy of the OGRSpatialReference...
-     * Note: we have to take the reference count into account...
-     *----------------------------------------------------------------*/
-    if (m_poSpatialRef && m_poSpatialRef->Dereference() == 0)
-        delete m_poSpatialRef;
-
-    m_poSpatialRef = poSpatialRef->Clone();
-
-    TABProjInfo sTABProj;
-    int nParamCount = 0;
-    GetTABProjFromSpatialRef(poSpatialRef, sTABProj, nParamCount);
-
-    /*-----------------------------------------------------------------
-     * Set the new parameters in the .MAP header.
-     * This will also trigger lookup of default bounds for the projection.
-     *----------------------------------------------------------------*/
-    if (SetProjInfo(&sTABProj) != 0)
-    {
-        CPLError(CE_Failure, CPLE_FileIO,
-                 "SetSpatialRef() failed setting projection parameters.");
-        return -1;
-    }
-
-    return 0;
-}
-
 static int MITABGetCustomDatum(const OGRSpatialReference *poSpatialRef,
                                TABProjInfo &sTABProj)
 {
@@ -1549,8 +1528,8 @@ static int MITABGetCustomDatum(const OGRSpatialReference *poSpatialRef,
     return TRUE;
 }
 
-int TABFile::GetTABProjFromSpatialRef(const OGRSpatialReference *poSpatialRef,
-                                      TABProjInfo &sTABProj, int &nParamCount)
+int TABFileGetTABProjFromSpatialRef(const OGRSpatialReference *poSpatialRef,
+                                    TABProjInfo &sTABProj, int &nParamCount)
 {
     /*-----------------------------------------------------------------
      * Initialize TABProjInfo
@@ -2214,36 +2193,50 @@ int TABFile::GetTABProjFromSpatialRef(const OGRSpatialReference *poSpatialRef,
         /* which may cause recognition problems when reading in MapInfo */
         if (sTABProj.nProjId == 3)
         {
-            double dfCenterLong = params[0];
-            double dfCenterLat = params[1];
-            double dfStdP1 = params[2];
-            double dfStdP2 = params[3];
-
-            for (size_t i = 0; i < sizeof(asMapInfoLCCSRSList) /
-                                       sizeof(asMapInfoLCCSRSList[0]);
-                 i++)
+            const double dfCenterLong = params[0];
+            const double dfCenterLat = params[1];
+            const double dfStdP1 = params[2];
+            const double dfStdP2 = params[3];
+
+            // EPSG:3301 "Estonian Coordinate System of 1997"
+            if (std::fabs(dfCenterLong - 24) <= 1e-10 &&
+                std::fabs(dfCenterLat - 57.51755393056) <= 1e-10 &&
+                // MapInfo uses a less accurate value of StdP2 than EPSG
+                std::fabs(dfStdP1 - 59.33333333) <= 1e-8 &&
+                std::fabs(dfStdP2 - 58) <= 1e-8)
             {
-                if (sTABProj.nDatumId ==
-                        asMapInfoLCCSRSList[i].nMapInfoDatumID &&
-                    TAB_EQUAL(dfCenterLong,
-                              asMapInfoLCCSRSList[i].dfCenterLong) &&
-                    TAB_EQUAL(dfCenterLat, asMapInfoLCCSRSList[i].dfCenterLat))
+                CPLDebug("MITAB", "Switching standard parallel 1 and 2");
+                std::swap(params[2], params[3]);
+            }
+            else
+            {
+                for (size_t i = 0; i < sizeof(asMapInfoLCCSRSList) /
+                                           sizeof(asMapInfoLCCSRSList[0]);
+                     i++)
                 {
-                    if (TAB_EQUAL(dfStdP1, asMapInfoLCCSRSList[i].dfStdP1) &&
-                        TAB_EQUAL(dfStdP2, asMapInfoLCCSRSList[i].dfStdP2))
+                    if (sTABProj.nDatumId ==
+                            asMapInfoLCCSRSList[i].nMapInfoDatumID &&
+                        TAB_EQUAL(dfCenterLong,
+                                  asMapInfoLCCSRSList[i].dfCenterLong) &&
+                        TAB_EQUAL(dfCenterLat,
+                                  asMapInfoLCCSRSList[i].dfCenterLat))
                     {
-                        break;
-                    }
-                    else if (TAB_EQUAL(dfStdP1,
-                                       asMapInfoLCCSRSList[i].dfStdP2) &&
-                             TAB_EQUAL(dfStdP2, asMapInfoLCCSRSList[i].dfStdP1))
-                    {
-                        CPLDebug("MITAB",
-                                 "Switching standard parallel 1 and 2");
-                        double dfTmp = params[2];
-                        params[2] = params[3];
-                        params[3] = dfTmp;
-                        break;
+                        if (TAB_EQUAL(dfStdP1,
+                                      asMapInfoLCCSRSList[i].dfStdP1) &&
+                            TAB_EQUAL(dfStdP2, asMapInfoLCCSRSList[i].dfStdP2))
+                        {
+                            break;
+                        }
+                        else if (TAB_EQUAL(dfStdP1,
+                                           asMapInfoLCCSRSList[i].dfStdP2) &&
+                                 TAB_EQUAL(dfStdP2,
+                                           asMapInfoLCCSRSList[i].dfStdP1))
+                        {
+                            CPLDebug("MITAB",
+                                     "Switching standard parallel 1 and 2");
+                            std::swap(params[2], params[3]);
+                            break;
+                        }
                     }
                 }
             }
@@ -2318,3 +2311,349 @@ int TABFile::GetTABProjFromSpatialRef(const OGRSpatialReference *poSpatialRef,
 
     return 0;
 }
+
+extern const MapInfoDatumInfo asDatumInfoList[];
+extern const MapInfoSpheroidInfo asSpheroidInfoList[];
+
+/************************************************************************/
+/*                      MITABCoordSys2SpatialRef()                      */
+/*                                                                      */
+/*      Convert a MIF COORDSYS string into a new OGRSpatialReference    */
+/*      object.                                                         */
+/************************************************************************/
+
+OGRSpatialReference *MITABCoordSys2SpatialRef(const char *pszCoordSys)
+
+{
+    TABProjInfo sTABProj;
+    if (MITABCoordSys2TABProjInfo(pszCoordSys, &sTABProj) < 0)
+        return nullptr;
+    OGRSpatialReference *poSR = TABFileGetSpatialRefFromTABProj(sTABProj);
+
+    // Report on translation.
+    char *pszWKT = nullptr;
+
+    poSR->exportToWkt(&pszWKT);
+    if (pszWKT != nullptr)
+    {
+        CPLDebug("MITAB", "This CoordSys value:\n%s\nwas translated to:\n%s",
+                 pszCoordSys, pszWKT);
+        CPLFree(pszWKT);
+    }
+
+    return poSR;
+}
+
+/************************************************************************/
+/*                      MITABSpatialRef2CoordSys()                      */
+/*                                                                      */
+/*      Converts a OGRSpatialReference object into a MIF COORDSYS       */
+/*      string.                                                         */
+/*                                                                      */
+/*      The function returns a newly allocated string that should be    */
+/*      CPLFree()'d by the caller.                                      */
+/************************************************************************/
+
+char *MITABSpatialRef2CoordSys(const OGRSpatialReference *poSR)
+
+{
+    if (poSR == nullptr)
+        return nullptr;
+
+    TABProjInfo sTABProj;
+    int nParamCount = 0;
+    TABFileGetTABProjFromSpatialRef(poSR, sTABProj, nParamCount);
+
+    // Do coordsys lookup.
+    double dXMin = 0.0;
+    double dYMin = 0.0;
+    double dXMax = 0.0;
+    double dYMax = 0.0;
+    bool bHasBounds = false;
+    if (sTABProj.nProjId > 1 &&
+        MITABLookupCoordSysBounds(&sTABProj, dXMin, dYMin, dXMax, dYMax, true))
+    {
+        bHasBounds = true;
+    }
+
+    // Translate the units.
+    const char *pszMIFUnits = TABUnitIdToString(sTABProj.nUnitsId);
+
+    // Build coordinate system definition.
+    CPLString osCoordSys;
+
+    if (sTABProj.nProjId != 0)
+    {
+        osCoordSys.Printf("Earth Projection %d", sTABProj.nProjId);
+    }
+    else
+    {
+        osCoordSys.Printf("NonEarth Units");
+    }
+
+    // Append Datum.
+    if (sTABProj.nProjId != 0)
+    {
+        osCoordSys += CPLSPrintf(", %d", sTABProj.nDatumId);
+
+        if (sTABProj.nDatumId == 999 || sTABProj.nDatumId == 9999)
+        {
+            osCoordSys +=
+                CPLSPrintf(", %d, %.15g, %.15g, %.15g", sTABProj.nEllipsoidId,
+                           sTABProj.dDatumShiftX, sTABProj.dDatumShiftY,
+                           sTABProj.dDatumShiftZ);
+        }
+
+        if (sTABProj.nDatumId == 9999)
+        {
+            osCoordSys +=
+                CPLSPrintf(", %.15g, %.15g, %.15g, %.15g, %.15g",
+                           sTABProj.adDatumParams[0], sTABProj.adDatumParams[1],
+                           sTABProj.adDatumParams[2], sTABProj.adDatumParams[3],
+                           sTABProj.adDatumParams[4]);
+        }
+    }
+
+    // Append units.
+    if (sTABProj.nProjId != 1 && pszMIFUnits != nullptr)
+    {
+        if (sTABProj.nProjId != 0)
+            osCoordSys += ",";
+
+        osCoordSys += CPLSPrintf(" \"%s\"", pszMIFUnits);
+    }
+
+    // Append Projection Params.
+    for (int iParam = 0; iParam < nParamCount; iParam++)
+        osCoordSys += CPLSPrintf(", %.15g", sTABProj.adProjParams[iParam]);
+
+    // Append user bounds.
+    if (bHasBounds)
+    {
+        if (fabs(dXMin - floor(dXMin + 0.5)) < 1e-8 &&
+            fabs(dYMin - floor(dYMin + 0.5)) < 1e-8 &&
+            fabs(dXMax - floor(dXMax + 0.5)) < 1e-8 &&
+            fabs(dYMax - floor(dYMax + 0.5)) < 1e-8)
+        {
+            osCoordSys +=
+                CPLSPrintf(" Bounds (%d, %d) (%d, %d)", static_cast<int>(dXMin),
+                           static_cast<int>(dYMin), static_cast<int>(dXMax),
+                           static_cast<int>(dYMax));
+        }
+        else
+        {
+            osCoordSys += CPLSPrintf(" Bounds (%f, %f) (%f, %f)", dXMin, dYMin,
+                                     dXMax, dYMax);
+        }
+    }
+
+    // Report on translation.
+    char *pszWKT = nullptr;
+
+    poSR->exportToWkt(&pszWKT);
+    if (pszWKT != nullptr)
+    {
+        CPLDebug("MITAB", "This WKT Projection:\n%s\n\ntranslates to:\n%s",
+                 pszWKT, osCoordSys.c_str());
+        CPLFree(pszWKT);
+    }
+
+    return CPLStrdup(osCoordSys.c_str());
+}
+
+/************************************************************************/
+/*                      MITABExtractCoordSysBounds                      */
+/*                                                                      */
+/* Return true if MIF coordsys string contains a BOUNDS parameter and   */
+/* Set x/y min/max values.                                              */
+/************************************************************************/
+
+bool MITABExtractCoordSysBounds(const char *pszCoordSys, double &dXMin,
+                                double &dYMin, double &dXMax, double &dYMax)
+
+{
+    if (pszCoordSys == nullptr)
+        return false;
+
+    char **papszFields =
+        CSLTokenizeStringComplex(pszCoordSys, " ,()", TRUE, FALSE);
+
+    int iBounds = CSLFindString(papszFields, "Bounds");
+
+    if (iBounds >= 0 && iBounds + 4 < CSLCount(papszFields))
+    {
+        dXMin = CPLAtof(papszFields[++iBounds]);
+        dYMin = CPLAtof(papszFields[++iBounds]);
+        dXMax = CPLAtof(papszFields[++iBounds]);
+        dYMax = CPLAtof(papszFields[++iBounds]);
+        CSLDestroy(papszFields);
+        return true;
+    }
+
+    CSLDestroy(papszFields);
+    return false;
+}
+
+/**********************************************************************
+ *                     MITABCoordSys2TABProjInfo()
+ *
+ * Convert a MIF COORDSYS string into a TABProjInfo structure.
+ *
+ * Returns 0 on success, -1 on error.
+ **********************************************************************/
+int MITABCoordSys2TABProjInfo(const char *pszCoordSys, TABProjInfo *psProj)
+
+{
+    // Set all fields to zero, equivalent of NonEarth Units "mi"
+    memset(psProj, 0, sizeof(TABProjInfo));
+
+    if (pszCoordSys == nullptr)
+        return -1;
+
+    // Parse the passed string into words.
+    while (*pszCoordSys == ' ')
+        pszCoordSys++;  // Eat leading spaces.
+    if (STARTS_WITH_CI(pszCoordSys, "CoordSys") && pszCoordSys[8] != '\0')
+        pszCoordSys += 9;
+
+    char **papszFields =
+        CSLTokenizeStringComplex(pszCoordSys, " ,", TRUE, FALSE);
+
+    // Clip off Bounds information.
+    int iBounds = CSLFindString(papszFields, "Bounds");
+
+    while (iBounds != -1 && papszFields[iBounds] != nullptr)
+    {
+        CPLFree(papszFields[iBounds]);
+        papszFields[iBounds] = nullptr;
+        iBounds++;
+    }
+
+    // Fetch the projection.
+    char **papszNextField = nullptr;
+
+    if (CSLCount(papszFields) >= 3 && EQUAL(papszFields[0], "Earth") &&
+        EQUAL(papszFields[1], "Projection"))
+    {
+        int nProjId = atoi(papszFields[2]);
+        if (nProjId >= 3000)
+            nProjId -= 3000;
+        else if (nProjId >= 2000)
+            nProjId -= 2000;
+        else if (nProjId >= 1000)
+            nProjId -= 1000;
+
+        psProj->nProjId = static_cast<GByte>(nProjId);
+        papszNextField = papszFields + 3;
+    }
+    else if (CSLCount(papszFields) >= 2 && EQUAL(papszFields[0], "NonEarth"))
+    {
+        // NonEarth Units "..." Bounds (x, y) (x, y)
+        psProj->nProjId = 0;
+        papszNextField = papszFields + 2;
+
+        if (papszNextField[0] != nullptr && EQUAL(papszNextField[0], "Units"))
+            papszNextField++;
+    }
+    else
+    {
+        // Invalid projection string ???
+        if (CSLCount(papszFields) > 0)
+            CPLError(CE_Warning, CPLE_IllegalArg,
+                     "Failed parsing CoordSys: '%s'", pszCoordSys);
+        CSLDestroy(papszFields);
+        return -1;
+    }
+
+    // Fetch the datum information.
+    int nDatum = 0;
+
+    if (psProj->nProjId != 0 && CSLCount(papszNextField) > 0)
+    {
+        nDatum = atoi(papszNextField[0]);
+        papszNextField++;
+    }
+
+    if ((nDatum == 999 || nDatum == 9999) && CSLCount(papszNextField) >= 4)
+    {
+        psProj->nEllipsoidId = static_cast<GByte>(atoi(papszNextField[0]));
+        psProj->dDatumShiftX = CPLAtof(papszNextField[1]);
+        psProj->dDatumShiftY = CPLAtof(papszNextField[2]);
+        psProj->dDatumShiftZ = CPLAtof(papszNextField[3]);
+        papszNextField += 4;
+
+        if (nDatum == 9999 && CSLCount(papszNextField) >= 5)
+        {
+            psProj->adDatumParams[0] = CPLAtof(papszNextField[0]);
+            psProj->adDatumParams[1] = CPLAtof(papszNextField[1]);
+            psProj->adDatumParams[2] = CPLAtof(papszNextField[2]);
+            psProj->adDatumParams[3] = CPLAtof(papszNextField[3]);
+            psProj->adDatumParams[4] = CPLAtof(papszNextField[4]);
+            papszNextField += 5;
+        }
+    }
+    else if (nDatum != 999 && nDatum != 9999)
+    {
+        // Find the datum, and collect its parameters if possible.
+        const MapInfoDatumInfo *psDatumInfo = nullptr;
+
+        int iDatum = 0;  // Used after for.
+        for (; asDatumInfoList[iDatum].nMapInfoDatumID != -1; iDatum++)
+        {
+            if (asDatumInfoList[iDatum].nMapInfoDatumID == nDatum)
+            {
+                psDatumInfo = asDatumInfoList + iDatum;
+                break;
+            }
+        }
+
+        if (asDatumInfoList[iDatum].nMapInfoDatumID == -1)
+        {
+            // Use WGS84.
+            psDatumInfo = asDatumInfoList + 0;
+        }
+
+        if (psDatumInfo != nullptr)
+        {
+            psProj->nEllipsoidId = static_cast<GByte>(psDatumInfo->nEllipsoid);
+            psProj->nDatumId =
+                static_cast<GInt16>(psDatumInfo->nMapInfoDatumID);
+            psProj->dDatumShiftX = psDatumInfo->dfShiftX;
+            psProj->dDatumShiftY = psDatumInfo->dfShiftY;
+            psProj->dDatumShiftZ = psDatumInfo->dfShiftZ;
+            psProj->adDatumParams[0] = psDatumInfo->dfDatumParm0;
+            psProj->adDatumParams[1] = psDatumInfo->dfDatumParm1;
+            psProj->adDatumParams[2] = psDatumInfo->dfDatumParm2;
+            psProj->adDatumParams[3] = psDatumInfo->dfDatumParm3;
+            psProj->adDatumParams[4] = psDatumInfo->dfDatumParm4;
+        }
+    }
+
+    // Fetch the units string.
+    if (CSLCount(papszNextField) > 0)
+    {
+        if (isdigit(static_cast<unsigned char>(papszNextField[0][0])))
+        {
+            psProj->nUnitsId = static_cast<GByte>(atoi(papszNextField[0]));
+        }
+        else
+        {
+            psProj->nUnitsId =
+                static_cast<GByte>(TABUnitIdFromString(papszNextField[0]));
+        }
+        papszNextField++;
+    }
+
+    // Finally the projection parameters.
+    for (int iParam = 0; iParam < 7 && CSLCount(papszNextField) > 0; iParam++)
+    {
+        psProj->adProjParams[iParam] = CPLAtof(papszNextField[0]);
+        papszNextField++;
+    }
+
+    CSLDestroy(papszFields);
+
+    return 0;
+}
+
+/*! @endcond */
diff --git a/ogr/ogrmitabspatialref.h b/ogr/ogrmitabspatialref.h
new file mode 100644
index 000000000000..dff205d46174
--- /dev/null
+++ b/ogr/ogrmitabspatialref.h
@@ -0,0 +1,75 @@
+// SPDX-License-Identifier: MIT
+// Copyright 1999-2003, Daniel Morissette
+// Copyright (c) 1999-2001, Frank Warmerdam
+// Implementation translation between MIF CoordSys format, and
+// and OGRSpatialRef format.
+
+#ifndef OGRMITABSPATIALREF_H_INCLUDED
+#define OGRMITABSPATIALREF_H_INCLUDED
+
+/*! @cond Doxygen_Suppress */
+
+#include "cpl_port.h"
+
+class OGRSpatialReference;
+
+/*---------------------------------------------------------------------
+ * TABProjInfo
+ * struct used to store the projection parameters from the .MAP header
+ *--------------------------------------------------------------------*/
+typedef struct TABProjInfo_t
+{
+    GByte nProjId;  // See MapInfo Ref. Manual, App. F and G
+    GByte nEllipsoidId;
+    GByte nUnitsId;
+    double adProjParams[7];  // params in same order as in .MIF COORDSYS
+
+    GInt16 nDatumId;      // Datum Id added in MapInfo 7.8+ (.map V500)
+    double dDatumShiftX;  // Before that, we had to always lookup datum
+    double dDatumShiftY;  // parameters to establish datum id
+    double dDatumShiftZ;
+    double adDatumParams[5];
+
+    // Affine parameters only in .map version 500 and up
+    GByte nAffineFlag;  // 0=No affine param, 1=Affine params
+    GByte nAffineUnits;
+    double dAffineParamA;  // Affine params
+    double dAffineParamB;
+    double dAffineParamC;
+    double dAffineParamD;
+    double dAffineParamE;
+    double dAffineParamF;
+} TABProjInfo;
+
+OGRSpatialReference CPL_DLL *
+TABFileGetSpatialRefFromTABProj(const TABProjInfo &sTABProj);
+
+int CPL_DLL
+TABFileGetTABProjFromSpatialRef(const OGRSpatialReference *poSpatialRef,
+                                TABProjInfo &sTABProj, int &nParamCount);
+
+OGRSpatialReference CPL_DLL *MITABCoordSys2SpatialRef(const char *pszCoordSys);
+
+char CPL_DLL *MITABSpatialRef2CoordSys(const OGRSpatialReference *poSR);
+
+bool CPL_DLL MITABExtractCoordSysBounds(const char *pszCoordSys, double &dXMin,
+                                        double &dYMin, double &dXMax,
+                                        double &dYMax);
+
+int CPL_DLL MITABCoordSys2TABProjInfo(const char *pszCoordSys,
+                                      TABProjInfo *psProj);
+
+/*---------------------------------------------------------------------
+ * The following are used for coordsys bounds lookup
+ *--------------------------------------------------------------------*/
+
+bool CPL_DLL MITABLookupCoordSysBounds(TABProjInfo *psCS, double &dXMin,
+                                       double &dYMin, double &dXMax,
+                                       double &dYMax,
+                                       bool bOnlyUserTable = false);
+int CPL_DLL MITABLoadCoordSysTable(const char *pszFname);
+void CPL_DLL MITABFreeCoordSysTable();
+
+/*! @endcond */
+
+#endif
diff --git a/ogr/ogrmulticurve.cpp b/ogr/ogrmulticurve.cpp
index fd9427000e08..383a8d4f6686 100644
--- a/ogr/ogrmulticurve.cpp
+++ b/ogr/ogrmulticurve.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -36,16 +20,6 @@
 #include "ogr_core.h"
 #include "ogr_p.h"
 
-/************************************************************************/
-/*                            OGRMultiCurve()                           */
-/************************************************************************/
-
-/**
- * \brief Create an empty multi curve collection.
- */
-
-OGRMultiCurve::OGRMultiCurve() = default;
-
 /************************************************************************/
 /*                OGRMultiCurve( const OGRMultiCurve& )                 */
 /************************************************************************/
@@ -61,12 +35,6 @@ OGRMultiCurve::OGRMultiCurve() = default;
 
 OGRMultiCurve::OGRMultiCurve(const OGRMultiCurve &) = default;
 
-/************************************************************************/
-/*                           ~OGRMultiCurve()                           */
-/************************************************************************/
-
-OGRMultiCurve::~OGRMultiCurve() = default;
-
 /************************************************************************/
 /*                  operator=( const OGRMultiCurve&)                    */
 /************************************************************************/
diff --git a/ogr/ogrmultilinestring.cpp b/ogr/ogrmultilinestring.cpp
index ab310d07edbe..2961e4dc67c1 100644
--- a/ogr/ogrmultilinestring.cpp
+++ b/ogr/ogrmultilinestring.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -36,16 +20,6 @@
 #include "ogr_core.h"
 #include "ogr_p.h"
 
-/************************************************************************/
-/*                        OGRMultiLineString()                          */
-/************************************************************************/
-
-/**
- * \brief Create an empty multi line string collection.
- */
-
-OGRMultiLineString::OGRMultiLineString() = default;
-
 /************************************************************************/
 /*           OGRMultiLineString( const OGRMultiLineString& )            */
 /************************************************************************/
@@ -61,12 +35,6 @@ OGRMultiLineString::OGRMultiLineString() = default;
 
 OGRMultiLineString::OGRMultiLineString(const OGRMultiLineString &) = default;
 
-/************************************************************************/
-/*                       ~OGRMultiLineString()                          */
-/************************************************************************/
-
-OGRMultiLineString::~OGRMultiLineString() = default;
-
 /************************************************************************/
 /*                  operator=( const OGRMultiCurve&)                    */
 /************************************************************************/
diff --git a/ogr/ogrmultipoint.cpp b/ogr/ogrmultipoint.cpp
index 9cd5667e5af2..d1f9d6cb6639 100644
--- a/ogr/ogrmultipoint.cpp
+++ b/ogr/ogrmultipoint.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -41,16 +25,6 @@
 #include "ogr_core.h"
 #include "ogr_p.h"
 
-/************************************************************************/
-/*                           OGRMultiPoint()                            */
-/************************************************************************/
-
-/**
- * \brief Create an empty multi point collection.
- */
-
-OGRMultiPoint::OGRMultiPoint() = default;
-
 /************************************************************************/
 /*                OGRMultiPoint( const OGRMultiPoint& )                 */
 /************************************************************************/
@@ -66,12 +40,6 @@ OGRMultiPoint::OGRMultiPoint() = default;
 
 OGRMultiPoint::OGRMultiPoint(const OGRMultiPoint &) = default;
 
-/************************************************************************/
-/*                          ~OGRMultiPoint()                            */
-/************************************************************************/
-
-OGRMultiPoint::~OGRMultiPoint() = default;
-
 /************************************************************************/
 /*                  operator=( const OGRMultiPoint&)                    */
 /************************************************************************/
diff --git a/ogr/ogrmultipolygon.cpp b/ogr/ogrmultipolygon.cpp
index 08425e2b3c65..d22d27e277a0 100644
--- a/ogr/ogrmultipolygon.cpp
+++ b/ogr/ogrmultipolygon.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -34,16 +18,6 @@
 #include "ogr_core.h"
 #include "ogr_p.h"
 
-/************************************************************************/
-/*                          OGRMultiPolygon()                           */
-/************************************************************************/
-
-/**
- * \brief Create an empty multi polygon collection.
- */
-
-OGRMultiPolygon::OGRMultiPolygon() = default;
-
 /************************************************************************/
 /*              OGRMultiPolygon( const OGRMultiPolygon& )               */
 /************************************************************************/
@@ -59,12 +33,6 @@ OGRMultiPolygon::OGRMultiPolygon() = default;
 
 OGRMultiPolygon::OGRMultiPolygon(const OGRMultiPolygon &) = default;
 
-/************************************************************************/
-/*                         ~OGRMultiPolygon()                           */
-/************************************************************************/
-
-OGRMultiPolygon::~OGRMultiPolygon() = default;
-
 /************************************************************************/
 /*                  operator=( const OGRMultiPolygon&)                    */
 /************************************************************************/
diff --git a/ogr/ogrmultisurface.cpp b/ogr/ogrmultisurface.cpp
index 2eafd9c979d8..6502d41157b4 100644
--- a/ogr/ogrmultisurface.cpp
+++ b/ogr/ogrmultisurface.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -37,22 +21,6 @@
 #include "ogr_core.h"
 #include "ogr_p.h"
 
-/************************************************************************/
-/*                          OGRMultiSurface()                           */
-/************************************************************************/
-
-/**
- * \brief Create an empty multi surface collection.
- */
-
-OGRMultiSurface::OGRMultiSurface() = default;
-
-/************************************************************************/
-/*                         ~OGRMultiSurface()                           */
-/************************************************************************/
-
-OGRMultiSurface::~OGRMultiSurface() = default;
-
 /************************************************************************/
 /*              OGRMultiSurface( const OGRMultiSurface& )               */
 /************************************************************************/
diff --git a/ogr/ogrpgeogeometry.cpp b/ogr/ogrpgeogeometry.cpp
index ccb5387b7a7f..af0a1eff784c 100644
--- a/ogr/ogrpgeogeometry.cpp
+++ b/ogr/ogrpgeogeometry.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2011, Paul Ramsey <pramsey at cleverelephant.ca>
  * Copyright (c) 2011-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 // PGeo == ESRI Personal GeoDatabase.
@@ -385,12 +369,15 @@ OGRGeometry *OGRCreateFromMultiPatch(int nParts, const GInt32 *panPartStart,
             padfX[nPartStart] == padfX[nPartStart + 3] &&
             padfY[nPartStart] == padfY[nPartStart + 3] &&
             padfZ[nPartStart] == padfZ[nPartStart + 3] &&
-            !CPLIsNan(padfX[nPartStart]) && !CPLIsNan(padfX[nPartStart + 1]) &&
-            !CPLIsNan(padfX[nPartStart + 2]) && !CPLIsNan(padfY[nPartStart]) &&
-            !CPLIsNan(padfY[nPartStart + 1]) &&
-            !CPLIsNan(padfY[nPartStart + 2]) && !CPLIsNan(padfZ[nPartStart]) &&
-            !CPLIsNan(padfZ[nPartStart + 1]) &&
-            !CPLIsNan(padfZ[nPartStart + 2]))
+            !std::isnan(padfX[nPartStart]) &&
+            !std::isnan(padfX[nPartStart + 1]) &&
+            !std::isnan(padfX[nPartStart + 2]) &&
+            !std::isnan(padfY[nPartStart]) &&
+            !std::isnan(padfY[nPartStart + 1]) &&
+            !std::isnan(padfY[nPartStart + 2]) &&
+            !std::isnan(padfZ[nPartStart]) &&
+            !std::isnan(padfZ[nPartStart + 1]) &&
+            !std::isnan(padfZ[nPartStart + 2]))
         {
             bool bDuplicate = false;
             if (iPart > 0)
@@ -1004,7 +991,7 @@ id,WKT
                 assert(poRing);
                 // Outer ring must be clockwise.
                 if (!poRing->isClockwise())
-                    poRing->reverseWindingOrder();
+                    poRing->reversePoints();
             }
             else
             {
@@ -1012,7 +999,7 @@ id,WKT
                 assert(poRing);
                 // Inner rings should be anti-clockwise.
                 if (poRing->isClockwise())
-                    poRing->reverseWindingOrder();
+                    poRing->reversePoints();
             }
 
             int nRingNumPoints = poRing->getNumPoints();
@@ -1260,7 +1247,7 @@ id,WKT
                     assert(poRing != nullptr);
                     // Outer ring must be clockwise.
                     if (!poRing->isClockwise())
-                        poRing->reverseWindingOrder();
+                        poRing->reversePoints();
                 }
                 else
                 {
@@ -1268,7 +1255,7 @@ id,WKT
                     assert(poRing != nullptr);
                     // Inner rings should be anti-clockwise.
                     if (poRing->isClockwise())
-                        poRing->reverseWindingOrder();
+                        poRing->reversePoints();
                 }
 
                 int nRingNumPoints = poRing->getNumPoints();
@@ -2448,7 +2435,8 @@ OGRErr OGRCreateFromShapeBin(GByte *pabyShape, OGRGeometry **ppoGeom,
                     if (nBits & EXT_SHAPE_ARC_IP)
                         CPLDebug("OGR", "  DefinedIP");
 #endif
-                    if ((nBits & EXT_SHAPE_ARC_IP) != 0)
+                    if ((nBits & EXT_SHAPE_ARC_IP) != 0 &&
+                        (nBits & EXT_SHAPE_ARC_LINE) == 0)
                     {
                         pasCurves[iCurve].eType = CURVE_ARC_INTERIOR_POINT;
                         pasCurves[iCurve].u.ArcByIntermediatePoint.dfX = dfVal1;
diff --git a/ogr/ogrpgeogeometry.h b/ogr/ogrpgeogeometry.h
index bb047cd0193b..8bd64de8f661 100644
--- a/ogr/ogrpgeogeometry.h
+++ b/ogr/ogrpgeogeometry.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2011-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_PGEOGEOMETRY_H_INCLUDED
diff --git a/ogr/ogrpoint.cpp b/ogr/ogrpoint.cpp
index aa35407f0ea5..c3c503eb3246 100644
--- a/ogr/ogrpoint.cpp
+++ b/ogr/ogrpoint.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2008-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -151,12 +135,6 @@ OGRPoint *OGRPoint::createXYM(double x, double y, double m)
 
 OGRPoint::OGRPoint(const OGRPoint &) = default;
 
-/************************************************************************/
-/*                             ~OGRPoint()                              */
-/************************************************************************/
-
-OGRPoint::~OGRPoint() = default;
-
 /************************************************************************/
 /*                       operator=( const OGRPoint& )                   */
 /************************************************************************/
@@ -174,7 +152,10 @@ OGRPoint &OGRPoint::operator=(const OGRPoint &other)
 {
     if (this != &other)
     {
-        OGRGeometry::operator=(other);
+        // Slightly more efficient to avoid OGRGeometry::operator=(other);
+        // but do what it does to avoid a call to empty()
+        assignSpatialReference(other.getSpatialReference());
+        flags = other.flags;
 
         x = other.x;
         y = other.y;
@@ -263,7 +244,7 @@ void OGRPoint::flattenTo2D()
 /*                       setCoordinateDimension()                       */
 /************************************************************************/
 
-void OGRPoint::setCoordinateDimension(int nNewDimension)
+bool OGRPoint::setCoordinateDimension(int nNewDimension)
 
 {
     if (nNewDimension == 2)
@@ -272,6 +253,7 @@ void OGRPoint::setCoordinateDimension(int nNewDimension)
         flags |= OGR_G_3D;
 
     setMeasured(FALSE);
+    return true;
 }
 
 /************************************************************************/
@@ -368,7 +350,7 @@ OGRErr OGRPoint::importFromWkb(const unsigned char *pabyData, size_t nSize,
     }
 
     // Detect coordinates are not NaN --> NOT EMPTY.
-    if (!(CPLIsNan(x) && CPLIsNan(y)))
+    if (!(std::isnan(x) && std::isnan(y)))
         flags |= OGR_G_NOT_EMPTY_POINT;
 
     return OGRERR_NONE;
diff --git a/ogr/ogrpolygon.cpp b/ogr/ogrpolygon.cpp
index e9316d1f835c..b654a9584443 100644
--- a/ogr/ogrpolygon.cpp
+++ b/ogr/ogrpolygon.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -43,16 +27,6 @@
 #include "ogr_sfcgal.h"
 #include "ogr_p.h"
 
-/************************************************************************/
-/*                             OGRPolygon()                             */
-/************************************************************************/
-
-/**
- * \brief Create an empty polygon.
- */
-
-OGRPolygon::OGRPolygon() = default;
-
 /************************************************************************/
 /*                     OGRPolygon( const OGRPolygon& )                  */
 /************************************************************************/
@@ -68,12 +42,6 @@ OGRPolygon::OGRPolygon() = default;
 
 OGRPolygon::OGRPolygon(const OGRPolygon &) = default;
 
-/************************************************************************/
-/*                            ~OGRPolygon()                             */
-/************************************************************************/
-
-OGRPolygon::~OGRPolygon() = default;
-
 /************************************************************************/
 /*                     operator=( const OGRPolygon&)                    */
 /************************************************************************/
@@ -279,18 +247,26 @@ OGRLinearRing *OGRPolygon::stealInteriorRing(int iRing)
 }
 
 /*! @cond Doxygen_Suppress */
+
+/************************************************************************/
+/*                            isRingCorrectType()                               */
+/************************************************************************/
+bool OGRPolygon::isRingCorrectType(const OGRCurve *poRing) const
+{
+    return poRing != nullptr && EQUAL(poRing->getGeometryName(), "LINEARRING");
+}
+
 /************************************************************************/
 /*                            checkRing()                               */
 /************************************************************************/
 
-int OGRPolygon::checkRing(OGRCurve *poNewRing) const
+bool OGRPolygon::checkRing(const OGRCurve *poNewRing) const
 {
-    if (poNewRing == nullptr ||
-        !(EQUAL(poNewRing->getGeometryName(), "LINEARRING")))
+    if (!isRingCorrectType(poNewRing))
     {
         CPLError(CE_Failure, CPLE_AppDefined,
                  "Wrong curve type. Expected LINEARRING.");
-        return FALSE;
+        return false;
     }
 
     if (!poNewRing->IsEmpty() && !poNewRing->get_IsClosed())
@@ -302,7 +278,7 @@ int OGRPolygon::checkRing(OGRCurve *poNewRing) const
         if (pszEnvVar != nullptr && !CPLTestBool(pszEnvVar))
         {
             CPLError(CE_Failure, CPLE_AppDefined, "Non closed ring detected.");
-            return FALSE;
+            return false;
         }
         else
         {
@@ -315,7 +291,7 @@ int OGRPolygon::checkRing(OGRCurve *poNewRing) const
         }
     }
 
-    return TRUE;
+    return true;
 }
 
 /*! @endcond */
diff --git a/ogr/ogrpolyhedralsurface.cpp b/ogr/ogrpolyhedralsurface.cpp
index 20d2a81a5fa2..23db6e1718ab 100644
--- a/ogr/ogrpolyhedralsurface.cpp
+++ b/ogr/ogrpolyhedralsurface.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2016, Avyav Kumar Singh <avyavkumar at gmail dot com>
  * Copyright (c) 2016, Even Rouault <even.roauult at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_geometry.h"
@@ -36,16 +20,6 @@
 
 #include <new>
 
-/************************************************************************/
-/*                         OGRPolyhedralSurface()                       */
-/************************************************************************/
-
-/**
- * \brief Create an empty PolyhedralSurface
- */
-
-OGRPolyhedralSurface::OGRPolyhedralSurface() = default;
-
 /************************************************************************/
 /*         OGRPolyhedralSurface( const OGRPolyhedralSurface& )          */
 /************************************************************************/
@@ -58,17 +32,6 @@ OGRPolyhedralSurface::OGRPolyhedralSurface() = default;
 OGRPolyhedralSurface::OGRPolyhedralSurface(const OGRPolyhedralSurface &) =
     default;
 
-/************************************************************************/
-/*                        ~OGRPolyhedralSurface()                       */
-/************************************************************************/
-
-/**
- * \brief Destructor
- *
- */
-
-OGRPolyhedralSurface::~OGRPolyhedralSurface() = default;
-
 /************************************************************************/
 /*                 operator=( const OGRPolyhedralSurface&)              */
 /************************************************************************/
@@ -682,6 +645,35 @@ double OGRPolyhedralSurface::get_GeodesicArea(const OGRSpatialReference *) const
     return -1;
 }
 
+/************************************************************************/
+/*                            get_Length()                              */
+/************************************************************************/
+
+double OGRPolyhedralSurface::get_Length() const
+{
+    if (IsEmpty())
+        return 0;
+
+    CPLError(CE_Failure, CPLE_NotSupported,
+             "get_Length() not implemented for PolyhedralSurface");
+    return 0;
+}
+
+/************************************************************************/
+/*                        get_GeodesicLength()                          */
+/************************************************************************/
+
+double
+OGRPolyhedralSurface::get_GeodesicLength(const OGRSpatialReference *) const
+{
+    if (IsEmpty())
+        return 0;
+
+    CPLError(CE_Failure, CPLE_NotSupported,
+             "get_GeodesicLength() not implemented for PolyhedralSurface");
+    return -1;
+}
+
 /************************************************************************/
 /*                           PointOnSurface()                           */
 /************************************************************************/
@@ -918,11 +910,9 @@ OGRBoolean OGRPolyhedralSurface::IsEmpty() const
  * \brief Set the type as 3D geometry
  */
 
-void OGRPolyhedralSurface::set3D(OGRBoolean bIs3D)
+bool OGRPolyhedralSurface::set3D(OGRBoolean bIs3D)
 {
-    oMP.set3D(bIs3D);
-
-    OGRGeometry::set3D(bIs3D);
+    return oMP.set3D(bIs3D) && OGRGeometry::set3D(bIs3D);
 }
 
 /************************************************************************/
@@ -933,11 +923,10 @@ void OGRPolyhedralSurface::set3D(OGRBoolean bIs3D)
  * \brief Set the type as Measured
  */
 
-void OGRPolyhedralSurface::setMeasured(OGRBoolean bIsMeasured)
+bool OGRPolyhedralSurface::setMeasured(OGRBoolean bIsMeasured)
 {
-    oMP.setMeasured(bIsMeasured);
-
-    OGRGeometry::setMeasured(bIsMeasured);
+    return oMP.setMeasured(bIsMeasured) &&
+           OGRGeometry::setMeasured(bIsMeasured);
 }
 
 /************************************************************************/
@@ -952,13 +941,13 @@ void OGRPolyhedralSurface::setMeasured(OGRBoolean bIsMeasured)
  * This will also remove the M dimension if present before this call.
  *
  * @param nNewDimension New coordinate dimension value, either 2 or 3.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRPolyhedralSurface::setCoordinateDimension(int nNewDimension)
+bool OGRPolyhedralSurface::setCoordinateDimension(int nNewDimension)
 {
-    oMP.setCoordinateDimension(nNewDimension);
-
-    OGRGeometry::setCoordinateDimension(nNewDimension);
+    return oMP.setCoordinateDimension(nNewDimension) &&
+           OGRGeometry::setCoordinateDimension(nNewDimension);
 }
 
 /************************************************************************/
@@ -1009,6 +998,24 @@ OGRErr OGRPolyhedralSurface::removeGeometry(int iGeom, int bDelete)
     return oMP.removeGeometry(iGeom, bDelete);
 }
 
+/************************************************************************/
+/*                           hasEmptyParts()                            */
+/************************************************************************/
+
+bool OGRPolyhedralSurface::hasEmptyParts() const
+{
+    return oMP.hasEmptyParts();
+}
+
+/************************************************************************/
+/*                          removeEmptyParts()                          */
+/************************************************************************/
+
+void OGRPolyhedralSurface::removeEmptyParts()
+{
+    oMP.removeEmptyParts();
+}
+
 /************************************************************************/
 /*                       assignSpatialReference()                       */
 /************************************************************************/
diff --git a/ogr/ogrsf_frmts/CMakeLists.txt b/ogr/ogrsf_frmts/CMakeLists.txt
index f11285935dcb..e4cd0c4f044b 100644
--- a/ogr/ogrsf_frmts/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/CMakeLists.txt
@@ -12,18 +12,56 @@ add_dependencies(ogrsf_frmts generate_gdal_version_h)
 
 # Obligatory for building GDAL; always compile in.
 ogr_default_driver(mem "Read/write driver for MEMORY virtual files")
-ogr_default_driver(geojson "GeoJSON/ESRIJSON/TopoJSON driver")
-ogr_default_driver2(mitab TAB "MapInfo TAB and MIF/MID")
-ogr_default_driver(shape "ESRI shape-file")
+
+# Exception to the rule: enable the GeoJSON driver by default, even if
+# OGR_BUILD_OPTIONAL_DRIVERS=OFF.
+if (NOT DEFINED OGR_ENABLE_DRIVER_GEOJSON AND
+    DEFINED OGR_BUILD_OPTIONAL_DRIVERS AND
+    NOT OGR_BUILD_OPTIONAL_DRIVERS)
+    message(WARNING "Enabling OGR_ENABLE_DRIVER_GEOJSON=ON, despite OGR_BUILD_OPTIONAL_DRIVERS=OFF. You can of course override this choice by setting OGR_ENABLE_DRIVER_GEOJSON=OFF")
+    option(OGR_ENABLE_DRIVER_GEOJSON "Set ON to build GeoJSON/GeoJSONSeq/ESRIJSON/TopoJSON drivers" ON)
+endif()
+ogr_optional_driver(geojson "GeoJSON/GeoJSONSeq/ESRIJSON/TopoJSON drivers")
+
+add_feature_info(ogr_TAB OGR_ENABLE_DRIVER_TAB "MapInfo TAB and MIF/MID")
+if (OGR_ENABLE_DRIVER_TAB)
+    add_subdirectory(mitab)
+endif ()
+
+# Exception to the rule: enable the Shapefile driver by default, even if
+# OGR_BUILD_OPTIONAL_DRIVERS=OFF.
+if (NOT DEFINED OGR_ENABLE_DRIVER_SHAPE AND
+    DEFINED OGR_BUILD_OPTIONAL_DRIVERS AND
+    NOT OGR_BUILD_OPTIONAL_DRIVERS)
+    message(WARNING "Enabling OGR_ENABLE_DRIVER_SHAPE=ON, despite OGR_BUILD_OPTIONAL_DRIVERS=OFF. You can of course override this choice by setting OGR_ENABLE_DRIVER_SHAPE=OFF")
+    option(OGR_ENABLE_DRIVER_SHAPE "Set ON to build Shapefile driver" ON)
+endif()
+ogr_optional_driver(shape "ESRI shape-file")
 
 # ######################################################################################################################
-ogr_default_driver(kml KML) # when not found EXPAT, it use CPL_MINIXML (ex. android)
-ogr_default_driver(vrt "VRT - Virtual Format")
+ogr_optional_driver(kml KML) # when not found EXPAT, it use CPL_MINIXML (ex. android)
+ogr_optional_driver(vrt "VRT - Virtual Format")
 
 # Caution: if modifying AVC declaration here, also modify it in gdal.cmake
 ogr_optional_driver(avc AVC)
 
-ogr_optional_driver(gml GML) # when not found both EXPAT/XercesC, return error in driver, referenced by WCS
+if (NOT(DEFINED OGR_ENABLE_DRIVER_GML AND NOT OGR_ENABLE_DRIVER_GML AND
+        ((NOT GDAL_USE_CURL) OR
+         (DEFINED OGR_ENABLE_DRIVER_WFS AND NOT OGR_ENABLE_DRIVER_WFS AND
+          DEFINED OGR_ENABLE_DRIVER_OAPIF AND NOT OGR_ENABLE_DRIVER_OAPIF AND
+          DEFINED OGR_ENABLE_DRIVER_CSW AND NOT OGR_ENABLE_DRIVER_CSW))))
+    # Only build gmlutils if we have GML, WFS, OAPIF or CSW
+    add_subdirectory(gmlutils)
+endif()
+
+if (GDAL_ENABLE_PLUGINS_NO_DEPS AND NOT DEFINED OGR_ENABLE_DRIVER_GML_PLUGIN)
+    option(OGR_ENABLE_DRIVER_GML_PLUGIN "Set ON to build GML driver as a plugin" OFF)
+endif ()
+ogr_optional_driver(gml GML)
+if (OGR_ENABLE_DRIVER_GML_PLUGIN AND
+    ((NOT DEFINED OGR_ENABLE_DRIVER_NAS OR OGR_ENABLE_DRIVER_NAS)))
+    message(FATAL_ERROR "When building the GML driver as a plugin, the NAS driver must be explicitly disabled with OGR_ENABLE_DRIVER_NAS=OFF")
+endif()
 
 # ######################################################################################################################
 ogr_optional_driver(csv CSV)
@@ -46,13 +84,16 @@ ogr_optional_driver(jml JML)
 ogr_optional_driver(vdv "VDV-451/VDV-452/INTREST Data Format")
 ogr_optional_driver(flatgeobuf FlatGeobuf)
 ogr_optional_driver(mapml MapML)
-ogr_optional_driver(jsonfg JSONFG)
+
 if( NOT WORDS_BIGENDIAN )
     ogr_optional_driver(miramon "MiraMonVector")
 endif()
 
 # ######################################################################################################################
 #
+if (NOT OGR_ENABLE_DRIVER_GEOJSON_PLUGIN)
+    ogr_dependent_driver(jsonfg JSONFG "OGR_ENABLE_DRIVER_GEOJSON")
+endif()
 
 ogr_dependent_driver(sdts SDTS "GDAL_ENABLE_DRIVER_SDTS")
 
@@ -60,20 +101,22 @@ ogr_dependent_driver(sdts SDTS "GDAL_ENABLE_DRIVER_SDTS")
 ogr_dependent_driver(gpx "GPX - GPS Exchange Format" "GDAL_USE_EXPAT")
 ogr_dependent_driver(gmlas GMLAS "GDAL_USE_XERCESC;OGR_ENABLE_DRIVER_PGDUMP")
 ogr_dependent_driver(svg "Scalable Vector Graphics" "GDAL_USE_EXPAT")
-ogr_dependent_driver(csw CSW "GDAL_USE_CURL;OGR_ENABLE_DRIVER_GML")
+ogr_dependent_driver(csw CSW "GDAL_USE_CURL")
 ogr_dependent_driver(dwg DWG "GDAL_USE_TEIGHA")
 ogr_dependent_driver(filegdb FileGDB "GDAL_USE_FILEGDB")
 ogr_dependent_driver(libkml LibKML "GDAL_USE_LIBKML")
 ogr_dependent_driver(nas "NAS/ALKIS" "GDAL_USE_XERCESC;OGR_ENABLE_DRIVER_GML")
 ogr_dependent_driver(plscenes PLSCENES "GDAL_USE_CURL")
 ogr_dependent_driver(sosi "SOSI:Systematic Organization of Spatial Information" "GDAL_USE_FYBA")
-ogr_dependent_driver(wfs "OGC WFS service" "GDAL_USE_CURL;OGR_ENABLE_DRIVER_GML")
+ogr_dependent_driver(wfs "OGC WFS service" "GDAL_USE_CURL")
+ogr_dependent_driver(oapif "OGC API Features service" "GDAL_USE_CURL")
 ogr_dependent_driver(ngw "NextGIS Web" "GDAL_USE_CURL")
 ogr_dependent_driver(elastic "ElasticSearch" "GDAL_USE_CURL")
+ogr_dependent_driver(xodr OpenDRIVE "GDAL_USE_OPENDRIVE;GDAL_USE_GEOS")
 
 ogr_dependent_driver(idrisi IDRISI "GDAL_ENABLE_DRIVER_IDRISI")
 
-ogr_dependent_driver(pds "Planetary Data Systems TABLE" "GDAL_ENABLE_DRIVER_PDS;OGR_ENABLE_DRIVER_GML")
+ogr_dependent_driver(pds "Planetary Data Systems TABLE" "GDAL_ENABLE_DRIVER_PDS")
 
 # Caution: if modifying SQLite declaration here, also modify it in gdal.cmake
 ogr_dependent_driver(sqlite "SQLite3 / Spatialite RDBMS" "GDAL_USE_SQLITE3")
@@ -99,14 +142,14 @@ ogr_dependent_driver(xlsx "Microsoft Office Excel(xlsx)" "GDAL_USE_EXPAT")
 ogr_dependent_driver(xls "Microsoft Office Excel(xls)" "GDAL_USE_FREEXL")
 ogr_dependent_driver(mongodbv3 "MongoDB V3" "GDAL_USE_MONGOCXX")
 ogr_dependent_driver(cad "OpenCAD" "GDAL_USE_OPENCAD OR GDAL_USE_OPENCAD_INTERNAL")
-ogr_dependent_driver(parquet "Parquet" "GDAL_USE_PARQUET")
-ogr_dependent_driver(arrow "Arrow" "GDAL_USE_ARROW")
+include(parquet/driver_declaration.cmake)
+include(arrow/driver_declaration.cmake)
 
 ogr_dependent_driver(gtfs "GTFS" "OGR_ENABLE_DRIVER_CSV")
 
 # ######################################################################################################################
 # proprietary libraries
-ogr_dependent_driver(oci "Oracle OCI" "GDAL_USE_ORACLE")
+include(oci/driver_declaration.cmake)
 ogr_dependent_driver(idb "IDB" "GDAL_USE_IDB")
 ogr_dependent_driver(ods ODS "GDAL_USE_EXPAT")
 ogr_dependent_driver(ogdi "OGDI" "GDAL_USE_OGDI")
diff --git a/ogr/ogrsf_frmts/amigocloud/CMakeLists.txt b/ogr/ogrsf_frmts/amigocloud/CMakeLists.txt
index 31ea887cec98..70c866dbb589 100644
--- a/ogr/ogrsf_frmts/amigocloud/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/amigocloud/CMakeLists.txt
@@ -10,8 +10,7 @@ add_gdal_driver(
           "NOT GDAL_USE_JSONC_INTERNAL"
           NO_DEPS)
 gdal_standard_includes(ogr_AmigoCloud)
-target_include_directories(ogr_AmigoCloud PRIVATE ${GDAL_VECTOR_FORMAT_SOURCE_DIR}/pgdump
-                                                  ${GDAL_VECTOR_FORMAT_SOURCE_DIR}/geojson)
+target_include_directories(ogr_AmigoCloud PRIVATE ${GDAL_VECTOR_FORMAT_SOURCE_DIR}/pgdump)
 if (GDAL_USE_JSONC_INTERNAL)
   gdal_add_vendored_lib(ogr_AmigoCloud libjson)
 else ()
diff --git a/ogr/ogrsf_frmts/amigocloud/ogr_amigocloud.h b/ogr/ogrsf_frmts/amigocloud/ogr_amigocloud.h
index 10f20805acd8..47ce175a88c8 100644
--- a/ogr/ogrsf_frmts/amigocloud/ogr_amigocloud.h
+++ b/ogr/ogrsf_frmts/amigocloud/ogr_amigocloud.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Victor Chernetsky, <victor at amigocloud dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_AMIGOCLOUD_H_INCLUDED
@@ -257,12 +241,11 @@ class OGRAmigoCloudResultLayer final : public OGRAmigoCloudLayer
 };
 
 /************************************************************************/
-/*                           OGRAmigoCloudDataSource                       */
+/*                           OGRAmigoCloudDataSource                    */
 /************************************************************************/
 
-class OGRAmigoCloudDataSource final : public OGRDataSource
+class OGRAmigoCloudDataSource final : public GDALDataset
 {
-    char *pszName;
     char *pszProjectId;
 
     OGRAmigoCloudTableLayer **papoLayers;
@@ -285,11 +268,6 @@ class OGRAmigoCloudDataSource final : public OGRDataSource
 
     int Open(const char *pszFilename, char **papszOpenOptions, int bUpdate);
 
-    virtual const char *GetName() override
-    {
-        return pszName;
-    }
-
     virtual int GetLayerCount() override
     {
         return nLayers;
diff --git a/ogr/ogrsf_frmts/amigocloud/ogramigoclouddatasource.cpp b/ogr/ogrsf_frmts/amigocloud/ogramigoclouddatasource.cpp
index 3cd0ed5cfe01..a38541db42c9 100644
--- a/ogr/ogrsf_frmts/amigocloud/ogramigoclouddatasource.cpp
+++ b/ogr/ogrsf_frmts/amigocloud/ogramigoclouddatasource.cpp
@@ -7,28 +7,12 @@
  ******************************************************************************
  * Copyright (c) 2015, Victor Chernetsky, <victor at amigocloud dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_amigocloud.h"
 #include "ogr_pgdump.h"
-#include "ogrgeojsonreader.h"
+#include "ogrlibjsonutils.h"
 #include <sstream>
 
 CPLString OGRAMIGOCLOUDGetOptionValue(const char *pszFilename,
@@ -39,9 +23,8 @@ CPLString OGRAMIGOCLOUDGetOptionValue(const char *pszFilename,
 /************************************************************************/
 
 OGRAmigoCloudDataSource::OGRAmigoCloudDataSource()
-    : pszName(nullptr), pszProjectId(nullptr), papoLayers(nullptr), nLayers(0),
-      bReadWrite(false), bUseHTTPS(true), bMustCleanPersistent(false),
-      bHasOGRMetadataFunction(-1)
+    : pszProjectId(nullptr), papoLayers(nullptr), nLayers(0), bReadWrite(false),
+      bUseHTTPS(true), bMustCleanPersistent(false), bHasOGRMetadataFunction(-1)
 {
 }
 
@@ -66,7 +49,6 @@ OGRAmigoCloudDataSource::~OGRAmigoCloudDataSource()
         CSLDestroy(papszOptions);
     }
 
-    CPLFree(pszName);
     CPLFree(pszProjectId);
 }
 
@@ -117,7 +99,7 @@ OGRLayer *OGRAmigoCloudDataSource::GetLayerByName(const char *pszLayerName)
 {
     if (nLayers > 1)
     {
-        return OGRDataSource::GetLayerByName(pszLayerName);
+        return GDALDataset::GetLayerByName(pszLayerName);
     }
     else if (nLayers == 1)
     {
@@ -217,7 +199,6 @@ int OGRAmigoCloudDataSource::Open(const char *pszFilename,
 
     bReadWrite = CPL_TO_BOOL(bUpdateIn);
 
-    pszName = CPLStrdup(pszFilename);
     pszProjectId = CPLStrdup(pszFilename + strlen("AMIGOCLOUD:"));
     char *pchSpace = strchr(pszProjectId, ' ');
     if (pchSpace)
diff --git a/ogr/ogrsf_frmts/amigocloud/ogramigoclouddriver.cpp b/ogr/ogrsf_frmts/amigocloud/ogramigoclouddriver.cpp
index 6e1f095fc66b..84a69d6b7804 100644
--- a/ogr/ogrsf_frmts/amigocloud/ogramigoclouddriver.cpp
+++ b/ogr/ogrsf_frmts/amigocloud/ogramigoclouddriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Victor Chernetsky, <victor at amigocloud dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_amigocloud.h"
diff --git a/ogr/ogrsf_frmts/amigocloud/ogramigocloudlayer.cpp b/ogr/ogrsf_frmts/amigocloud/ogramigocloudlayer.cpp
index be5e991987b4..ab9437bc5445 100644
--- a/ogr/ogrsf_frmts/amigocloud/ogramigocloudlayer.cpp
+++ b/ogr/ogrsf_frmts/amigocloud/ogramigocloudlayer.cpp
@@ -7,28 +7,12 @@
  ******************************************************************************
  * Copyright (c) 2015, Victor Chernetsky, <victor at amigocloud dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_amigocloud.h"
 #include "ogr_p.h"
-#include "ogrgeojsonreader.h"
+#include "ogrlibjsonutils.h"
 
 /************************************************************************/
 /*                         OGRAmigoCloudLayer()                            */
diff --git a/ogr/ogrsf_frmts/amigocloud/ogramigocloudresultlayer.cpp b/ogr/ogrsf_frmts/amigocloud/ogramigocloudresultlayer.cpp
index 89df8b34e588..4bb1c88a82ca 100644
--- a/ogr/ogrsf_frmts/amigocloud/ogramigocloudresultlayer.cpp
+++ b/ogr/ogrsf_frmts/amigocloud/ogramigocloudresultlayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Victor Chernetsky, <victor at amigocloud dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_amigocloud.h"
diff --git a/ogr/ogrsf_frmts/amigocloud/ogramigocloudtablelayer.cpp b/ogr/ogrsf_frmts/amigocloud/ogramigocloudtablelayer.cpp
index 65bedfb725c7..27b2e066d04e 100644
--- a/ogr/ogrsf_frmts/amigocloud/ogramigocloudtablelayer.cpp
+++ b/ogr/ogrsf_frmts/amigocloud/ogramigocloudtablelayer.cpp
@@ -7,29 +7,13 @@
  ******************************************************************************
  * Copyright (c) 2015, Victor Chernetsky, <victor at amigocloud dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_amigocloud.h"
 #include "ogr_p.h"
 #include "ogr_pgdump.h"
-#include "ogrgeojsonreader.h"
+#include "ogrlibjsonutils.h"
 #include <sstream>
 #include <iomanip>
 
@@ -780,11 +764,11 @@ void OGRAmigoCloudTableLayer::BuildWhere()
         char szBox3D_2[128];
         char *pszComma = nullptr;
 
-        CPLsnprintf(szBox3D_1, sizeof(szBox3D_1), "%.18g %.18g", sEnvelope.MinX,
+        CPLsnprintf(szBox3D_1, sizeof(szBox3D_1), "%.17g %.17g", sEnvelope.MinX,
                     sEnvelope.MinY);
         while ((pszComma = strchr(szBox3D_1, ',')) != nullptr)
             *pszComma = '.';
-        CPLsnprintf(szBox3D_2, sizeof(szBox3D_2), "%.18g %.18g", sEnvelope.MaxX,
+        CPLsnprintf(szBox3D_2, sizeof(szBox3D_2), "%.17g %.17g", sEnvelope.MaxX,
                     sEnvelope.MaxY);
         while ((pszComma = strchr(szBox3D_2, ',')) != nullptr)
             *pszComma = '.';
diff --git a/ogr/ogrsf_frmts/arrow/CMakeLists.txt b/ogr/ogrsf_frmts/arrow/CMakeLists.txt
index de50c8ba161a..4f55a984c737 100644
--- a/ogr/ogrsf_frmts/arrow/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/arrow/CMakeLists.txt
@@ -1,3 +1,17 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/helpers/GdalCMakeMinimumRequired.cmake")
+cmake_minimum_required(VERSION ${GDAL_CMAKE_VERSION_MIN}...${GDAL_CMAKE_VERSION_MAX})
+
+if(NOT DEFINED PROJECT_SOURCE_DIR)
+    # Standalone plugin building
+    project(ogr_Arrow)
+    # The driver depends on some non expored headers. Make sure the version we
+    # build against against is the same as this source tree.
+    set(STRICT_VERSION_CHECK ON)
+    include("${PROJECT_SOURCE_DIR}/../../../cmake/helpers/SetupStandalonePlugin.cmake" )
+    include(CheckDependentLibrariesArrowParquet)
+    standalone_driver_finalize(OGR_ENABLE_DRIVER_ARROW)
+endif()
+
 add_gdal_driver(TARGET ogr_Arrow
                 SOURCES ogrfeatherdriver.cpp
                         ogrfeatherdataset.cpp
@@ -15,7 +29,19 @@ if(NOT TARGET ogr_Arrow)
 endif()
 
 gdal_standard_includes(ogr_Arrow)
+if (STANDALONE)
+target_include_directories(ogr_Arrow PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../../port
+                                             ${CMAKE_CURRENT_SOURCE_DIR}/../generic
+                                             ${CMAKE_CURRENT_SOURCE_DIR}/../..
+)
+else()
 target_include_directories(ogr_Arrow PRIVATE $<TARGET_PROPERTY:ogrsf_generic,SOURCE_DIR>)
+endif()
+
+if(${Arrow_VERSION} VERSION_GREATER_EQUAL 16.0)
+    target_sources(ogr_Arrow PRIVATE vsifilesystemregistrar.cpp)
+endif()
+
 if(${Arrow_VERSION} VERSION_GREATER_EQUAL 10.0)
     if(ARROW_USE_STATIC_LIBRARIES)
         gdal_target_link_libraries(ogr_Arrow PRIVATE Arrow::arrow_static)
diff --git a/ogr/ogrsf_frmts/arrow/driver_declaration.cmake b/ogr/ogrsf_frmts/arrow/driver_declaration.cmake
new file mode 100644
index 000000000000..3937c361da26
--- /dev/null
+++ b/ogr/ogrsf_frmts/arrow/driver_declaration.cmake
@@ -0,0 +1 @@
+ogr_dependent_driver(arrow "Arrow" "GDAL_USE_ARROW")
diff --git a/ogr/ogrsf_frmts/arrow/ogr_feather.h b/ogr/ogrsf_frmts/arrow/ogr_feather.h
index ca1bcaa246c6..87a666dcf82b 100644
--- a/ogr/ogrsf_frmts/arrow/ogr_feather.h
+++ b/ogr/ogrsf_frmts/arrow/ogr_feather.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_FEATHER_H
diff --git a/ogr/ogrsf_frmts/arrow/ogrfeatherdataset.cpp b/ogr/ogrsf_frmts/arrow/ogrfeatherdataset.cpp
index 753578d7155f..74e4a4818ddf 100644
--- a/ogr/ogrsf_frmts/arrow/ogrfeatherdataset.cpp
+++ b/ogr/ogrsf_frmts/arrow/ogrfeatherdataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_feather.h"
diff --git a/ogr/ogrsf_frmts/arrow/ogrfeatherdriver.cpp b/ogr/ogrsf_frmts/arrow/ogrfeatherdriver.cpp
index d37d31c340d7..468a05d42ddf 100644
--- a/ogr/ogrsf_frmts/arrow/ogrfeatherdriver.cpp
+++ b/ogr/ogrsf_frmts/arrow/ogrfeatherdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_pam.h"
@@ -68,6 +52,9 @@ static bool IsArrowIPCStream(GDALOpenInfo *poOpenInfo)
             CPL_LSBUINT32PTR(poOpenInfo->pabyHeader + CONTINUATION_SIZE);
         if (strcmp(poOpenInfo->pszFilename, "/vsistdin/") == 0)
         {
+            if (poOpenInfo->IsSingleAllowedDriver("ARROW"))
+                return true;
+
             // Padding after metadata and before body is not necessarily present
             // but the body must be at least 4 bytes
             constexpr int PADDING_MAX_SIZE = 4;
@@ -87,12 +74,12 @@ static bool IsArrowIPCStream(GDALOpenInfo *poOpenInfo)
             }
 
             const std::string osTmpFilename(
-                CPLSPrintf("/vsimem/_arrow/%p", poOpenInfo));
+                VSIMemGenerateHiddenFilename("arrow"));
             auto fp = VSIVirtualHandleUniquePtr(VSIFileFromMemBuffer(
                 osTmpFilename.c_str(), poOpenInfo->pabyHeader, nSizeToRead,
                 false));
-            auto infile =
-                std::make_shared<OGRArrowRandomAccessFile>(std::move(fp));
+            auto infile = std::make_shared<OGRArrowRandomAccessFile>(
+                osTmpFilename.c_str(), std::move(fp));
             auto options = arrow::ipc::IpcReadOptions::Defaults();
             auto result =
                 arrow::ipc::RecordBatchStreamReader::Open(infile, options);
@@ -110,8 +97,8 @@ static bool IsArrowIPCStream(GDALOpenInfo *poOpenInfo)
             return false;
 
         // Do not give ownership of poOpenInfo->fpL to infile
-        auto infile =
-            std::make_shared<OGRArrowRandomAccessFile>(poOpenInfo->fpL, false);
+        auto infile = std::make_shared<OGRArrowRandomAccessFile>(
+            poOpenInfo->pszFilename, poOpenInfo->fpL, false);
         auto options = arrow::ipc::IpcReadOptions::Defaults();
         auto result =
             arrow::ipc::RecordBatchStreamReader::Open(infile, options);
@@ -132,8 +119,19 @@ static GDALDataset *OGRFeatherDriverOpen(GDALOpenInfo *poOpenInfo)
         return nullptr;
     }
 
-    const bool bIsStreamingFormat = IsArrowIPCStream(poOpenInfo);
-    if (!bIsStreamingFormat && !OGRFeatherDriverIsArrowFileFormat(poOpenInfo))
+    GDALOpenInfo *poOpenInfoForIdentify = poOpenInfo;
+    std::unique_ptr<GDALOpenInfo> poOpenInfoTmp;
+    if (STARTS_WITH(poOpenInfo->pszFilename, "gdalvsi://"))
+    {
+        poOpenInfoTmp = std::make_unique<GDALOpenInfo>(poOpenInfo->pszFilename +
+                                                           strlen("gdalvsi://"),
+                                                       poOpenInfo->nOpenFlags);
+        poOpenInfoForIdentify = poOpenInfoTmp.get();
+    }
+
+    const bool bIsStreamingFormat = IsArrowIPCStream(poOpenInfoForIdentify);
+    if (!bIsStreamingFormat &&
+        !OGRFeatherDriverIsArrowFileFormat(poOpenInfoForIdentify))
     {
         return nullptr;
     }
@@ -151,22 +149,46 @@ static GDALDataset *OGRFeatherDriverOpen(GDALOpenInfo *poOpenInfo)
                      osFilename.c_str());
             return nullptr;
         }
-        infile = std::make_shared<OGRArrowRandomAccessFile>(std::move(fp));
+        infile = std::make_shared<OGRArrowRandomAccessFile>(osFilename.c_str(),
+                                                            std::move(fp));
     }
     else if (STARTS_WITH(poOpenInfo->pszFilename, "/vsi") ||
              CPLTestBool(CPLGetConfigOption("OGR_ARROW_USE_VSI", "NO")))
     {
         VSIVirtualHandleUniquePtr fp(poOpenInfo->fpL);
         poOpenInfo->fpL = nullptr;
-        infile = std::make_shared<OGRArrowRandomAccessFile>(std::move(fp));
+        infile = std::make_shared<OGRArrowRandomAccessFile>(
+            poOpenInfo->pszFilename, std::move(fp));
     }
     else
     {
-        auto result = arrow::io::ReadableFile::Open(poOpenInfo->pszFilename);
+        // FileSystemFromUriOrPath() doesn't like relative paths
+        // so transform them to absolute.
+        std::string osPath(poOpenInfo->pszFilename);
+        if (CPLIsFilenameRelative(osPath.c_str()))
+        {
+            char *pszCurDir = CPLGetCurrentDir();
+            if (pszCurDir == nullptr)
+                return nullptr;
+            osPath = CPLFormFilename(pszCurDir, osPath.c_str(), nullptr);
+            CPLFree(pszCurDir);
+        }
+
+        std::string osFSPath;
+        auto poFS =
+            arrow::fs::FileSystemFromUriOrPath(osPath.c_str(), &osFSPath);
+        if (!poFS.ok())
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                     "arrow::fs::FileSystemFromUriOrPath failed with %s",
+                     poFS.status().message().c_str());
+            return nullptr;
+        }
+        auto result = (*poFS)->OpenInputFile(osFSPath);
         if (!result.ok())
         {
             CPLError(CE_Failure, CPLE_AppDefined,
-                     "ReadableFile::Open() failed with %s",
+                     "OpenInputFile() failed with %s",
                      result.status().message().c_str());
             return nullptr;
         }
@@ -428,5 +450,23 @@ void RegisterOGRArrow()
     poDriver->pfnOpen = OGRFeatherDriverOpen;
     poDriver->pfnCreate = OGRFeatherDriverCreate;
 
+    poDriver->SetMetadataItem("ARROW_VERSION", ARROW_VERSION_STRING);
+
     GetGDALDriverManager()->RegisterDriver(poDriver.release());
+
+#if ARROW_VERSION_MAJOR >= 16
+    // Mostly for tests
+    const char *pszPath =
+        CPLGetConfigOption("OGR_ARROW_LOAD_FILE_SYSTEM_FACTORIES", nullptr);
+    if (pszPath)
+    {
+        auto result = arrow::fs::LoadFileSystemFactories(pszPath);
+        if (!result.ok())
+        {
+            CPLError(CE_Warning, CPLE_AppDefined,
+                     "arrow::fs::LoadFileSystemFactories() failed with %s",
+                     result.message().c_str());
+        }
+    }
+#endif
 }
diff --git a/ogr/ogrsf_frmts/arrow/ogrfeatherdrivercore.cpp b/ogr/ogrsf_frmts/arrow/ogrfeatherdrivercore.cpp
index 99ca4ac1ebc6..2c8f1064d2c8 100644
--- a/ogr/ogrsf_frmts/arrow/ogrfeatherdrivercore.cpp
+++ b/ogr/ogrsf_frmts/arrow/ogrfeatherdrivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
@@ -70,7 +54,9 @@ static int OGRFeatherDriverIsArrowIPCStreamBasic(GDALOpenInfo *poOpenInfo)
                 1024 * 1024 -
                     (CONTINUATION_SIZE + METADATA_SIZE_SIZE + PADDING_MAX_SIZE))
             {
-                return false;
+                if (poOpenInfo->IsSingleAllowedDriver("ARROW"))
+                    return true;
+                return GDAL_IDENTIFY_UNKNOWN;
             }
             const int nSizeToRead = CONTINUATION_SIZE + METADATA_SIZE_SIZE +
                                     nMetadataSize + PADDING_MAX_SIZE;
@@ -79,6 +65,8 @@ static int OGRFeatherDriverIsArrowIPCStreamBasic(GDALOpenInfo *poOpenInfo)
                 return false;
             }
 
+            if (poOpenInfo->IsSingleAllowedDriver("ARROW"))
+                return true;
             return GDAL_IDENTIFY_UNKNOWN;
         }
 
@@ -89,6 +77,8 @@ static int OGRFeatherDriverIsArrowIPCStreamBasic(GDALOpenInfo *poOpenInfo)
             nFileSize - (CONTINUATION_SIZE + METADATA_SIZE_SIZE))
             return false;
 
+        if (poOpenInfo->IsSingleAllowedDriver("ARROW"))
+            return true;
         return GDAL_IDENTIFY_UNKNOWN;
     }
     return false;
@@ -141,6 +131,13 @@ bool OGRFeatherDriverIsArrowFileFormat(GDALOpenInfo *poOpenInfo)
 
 int OGRFeatherDriverIdentify(GDALOpenInfo *poOpenInfo)
 {
+    if (STARTS_WITH(poOpenInfo->pszFilename, "gdalvsi://"))
+    {
+        GDALOpenInfo oOpenInfo(poOpenInfo->pszFilename + strlen("gdalvsi://"),
+                               poOpenInfo->nOpenFlags);
+        return OGRFeatherDriverIdentify(&oOpenInfo);
+    }
+
     int ret = OGRFeatherDriverIsArrowIPCStreamBasic(poOpenInfo);
     if (ret == GDAL_IDENTIFY_TRUE || ret == GDAL_IDENTIFY_UNKNOWN)
         return ret;
diff --git a/ogr/ogrsf_frmts/arrow/ogrfeatherdrivercore.h b/ogr/ogrsf_frmts/arrow/ogrfeatherdrivercore.h
index 94dfae499057..967705718355 100644
--- a/ogr/ogrsf_frmts/arrow/ogrfeatherdrivercore.h
+++ b/ogr/ogrsf_frmts/arrow/ogrfeatherdrivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRFEATHERDRIVERCORE_H
diff --git a/ogr/ogrsf_frmts/arrow/ogrfeatherlayer.cpp b/ogr/ogrsf_frmts/arrow/ogrfeatherlayer.cpp
index a82639d33332..f2b14274b04d 100644
--- a/ogr/ogrsf_frmts/arrow/ogrfeatherlayer.cpp
+++ b/ogr/ogrsf_frmts/arrow/ogrfeatherlayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_json.h"
@@ -175,7 +159,7 @@ void OGRFeatherLayer::EstablishFeatureDefn()
         if (field_kv_metadata)
         {
             auto extension_name =
-                field_kv_metadata->Get("ARROW:extension:name");
+                field_kv_metadata->Get(ARROW_EXTENSION_NAME_KEY);
             if (extension_name.ok())
             {
                 osExtensionName = *extension_name;
diff --git a/ogr/ogrsf_frmts/arrow/ogrfeatherwriterdataset.cpp b/ogr/ogrsf_frmts/arrow/ogrfeatherwriterdataset.cpp
index 315599ea17c3..746ae9fefd04 100644
--- a/ogr/ogrsf_frmts/arrow/ogrfeatherwriterdataset.cpp
+++ b/ogr/ogrsf_frmts/arrow/ogrfeatherwriterdataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_feather.h"
diff --git a/ogr/ogrsf_frmts/arrow/ogrfeatherwriterlayer.cpp b/ogr/ogrsf_frmts/arrow/ogrfeatherwriterlayer.cpp
index 13080c5c1123..b09d42cfe23b 100644
--- a/ogr/ogrsf_frmts/arrow/ogrfeatherwriterlayer.cpp
+++ b/ogr/ogrsf_frmts/arrow/ogrfeatherwriterlayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_feather.h"
diff --git a/ogr/ogrsf_frmts/arrow/vsifilesystemregistrar.cpp b/ogr/ogrsf_frmts/arrow/vsifilesystemregistrar.cpp
new file mode 100644
index 000000000000..c2d96336ea2a
--- /dev/null
+++ b/ogr/ogrsf_frmts/arrow/vsifilesystemregistrar.cpp
@@ -0,0 +1,45 @@
+/******************************************************************************
+ *
+ * Project:  GDAL
+ * Purpose:  Arrow virtual file system using VSI
+ * Author:   Even Rouault, <even.rouault at spatialys.com>
+ *
+ ******************************************************************************
+ * Copyright (c) 2024, Even Rouault, <even.rouault at spatialys.com>
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#include "cpl_error.h"
+
+#include "../arrow_common/ogr_include_arrow.h"
+#include "../arrow_common/vsiarrowfilesystem.hpp"
+
+// Only available since Arrow 17.0
+#ifndef ARROW_REGISTER_FILESYSTEM
+namespace arrow::fs
+{
+#define ARROW_REGISTER_FILESYSTEM(scheme, factory_function, finalizer)         \
+    ::arrow::fs::FileSystemRegistrar                                           \
+    {                                                                          \
+        scheme, ::arrow::fs::FileSystemFactory{factory_function}, finalizer    \
+    }
+}  // namespace arrow::fs
+#endif
+
+auto kVSIFileSystemModule = ARROW_REGISTER_FILESYSTEM(
+    []()
+    {
+        CPLDebugOnly("ARROW", "Register VSI Arrow file system");
+        return "gdalvsi";
+    }(),
+    [](const arrow::fs::Uri &uri, const arrow::io::IOContext & /* io_context */,
+       std::string *out_path)
+        -> arrow::Result<std::shared_ptr<arrow::fs::FileSystem>>
+    {
+        constexpr std::string_view kScheme = "gdalvsi://";
+        if (out_path)
+            *out_path = uri.ToString().substr(kScheme.size());
+        return std::make_shared<VSIArrowFileSystem>("ARROW", std::string());
+    },
+    {});
diff --git a/ogr/ogrsf_frmts/arrow_common/ogr_arrow.h b/ogr/ogrsf_frmts/arrow_common/ogr_arrow.h
index 6179fd009b07..522d3b273063 100644
--- a/ogr/ogrsf_frmts/arrow_common/ogr_arrow.h
+++ b/ogr/ogrsf_frmts/arrow_common/ogr_arrow.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_ARROW_H
@@ -352,6 +336,13 @@ class OGRArrowDataset CPL_NON_FINAL : public GDALPamDataset
     std::vector<std::string> m_aosDomainNames{};
     std::map<std::string, int> m_oMapDomainNameToCol{};
 
+  protected:
+    void close()
+    {
+        m_poLayer.reset();
+        m_poMemoryPool.reset();
+    }
+
   public:
     explicit OGRArrowDataset(
         const std::shared_ptr<arrow::MemoryPool> &poMemoryPool);
diff --git a/ogr/ogrsf_frmts/arrow_common/ogr_include_arrow.h b/ogr/ogrsf_frmts/arrow_common/ogr_include_arrow.h
index f274fa49ea02..587849a3daf7 100644
--- a/ogr/ogrsf_frmts/arrow_common/ogr_include_arrow.h
+++ b/ogr/ogrsf_frmts/arrow_common/ogr_include_arrow.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_INCLUDE_ARROW_H
@@ -46,6 +30,10 @@
 #include "arrow/builder.h"
 #include "arrow/array/array_dict.h"
 #include "arrow/c/bridge.h"
+#include "arrow/filesystem/filesystem.h"
+#if ARROW_VERSION_MAJOR >= 16
+#include "arrow/filesystem/filesystem_library.h"
+#endif
 #include "arrow/ipc/reader.h"
 #include "arrow/ipc/writer.h"
 #include "arrow/io/file.h"
@@ -53,6 +41,7 @@
 #include "arrow/record_batch.h"
 #include "arrow/util/decimal.h"
 #include "arrow/util/key_value_metadata.h"
+#include "arrow/util/uri.h"
 
 #ifdef _MSC_VER
 #pragma warning(pop)
diff --git a/ogr/ogrsf_frmts/arrow_common/ograrrowdataset.hpp b/ogr/ogrsf_frmts/arrow_common/ograrrowdataset.hpp
index 5b19c16e561d..00c5c2f2b745 100644
--- a/ogr/ogrsf_frmts/arrow_common/ograrrowdataset.hpp
+++ b/ogr/ogrsf_frmts/arrow_common/ograrrowdataset.hpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGARROWDATASET_HPP_INCLUDED
diff --git a/ogr/ogrsf_frmts/arrow_common/ograrrowlayer.hpp b/ogr/ogrsf_frmts/arrow_common/ograrrowlayer.hpp
index ac5d7d96b256..af0c8e2c9807 100644
--- a/ogr/ogrsf_frmts/arrow_common/ograrrowlayer.hpp
+++ b/ogr/ogrsf_frmts/arrow_common/ograrrowlayer.hpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGARROWLAYER_HPP_INCLUDED
@@ -248,6 +232,9 @@ inline bool OGRArrowLayer::IsHandledListOrMapType(
            itemTypeId == arrow::Type::DECIMAL256 ||
            itemTypeId == arrow::Type::STRING ||
            itemTypeId == arrow::Type::LARGE_STRING ||
+#if ARROW_VERSION_MAJOR >= 15
+           itemTypeId == arrow::Type::STRING_VIEW ||
+#endif
            itemTypeId == arrow::Type::STRUCT ||
            (itemTypeId == arrow::Type::MAP &&
             IsHandledMapType(
@@ -276,7 +263,12 @@ inline bool OGRArrowLayer::IsHandledListType(
 inline bool
 OGRArrowLayer::IsHandledMapType(const std::shared_ptr<arrow::MapType> &mapType)
 {
-    return mapType->key_type()->id() == arrow::Type::STRING &&
+    const auto typeId = mapType->key_type()->id();
+    return (typeId == arrow::Type::STRING
+#if ARROW_VERSION_MAJOR >= 15
+            || typeId == arrow::Type::STRING_VIEW
+#endif
+            ) &&
            IsHandledListOrMapType(mapType->item_type());
 }
 
@@ -304,16 +296,13 @@ inline bool OGRArrowLayer::MapArrowTypeToOGR(
     }
     else if (const auto &field_kv_metadata = field->metadata())
     {
-        auto extension_name = field_kv_metadata->Get("ARROW:extension:name");
+        auto extension_name = field_kv_metadata->Get(ARROW_EXTENSION_NAME_KEY);
         if (extension_name.ok())
         {
             osExtensionName = *extension_name;
         }
     }
 
-    // Preliminary/in-advance read support for future JSON Canonical Extension
-    // Cf https://github.com/apache/arrow/pull/41257 and
-    // https://github.com/apache/arrow/pull/13901
     if (!osExtensionName.empty() &&
         osExtensionName != EXTENSION_NAME_ARROW_JSON)
     {
@@ -372,6 +361,9 @@ inline bool OGRArrowLayer::MapArrowTypeToOGR(
             break;
         case arrow::Type::STRING:
         case arrow::Type::LARGE_STRING:
+#if ARROW_VERSION_MAJOR >= 15
+        case arrow::Type::STRING_VIEW:
+#endif
             bTypeOK = true;
             eType = OFTString;
             if (osExtensionName == EXTENSION_NAME_ARROW_JSON)
@@ -379,6 +371,9 @@ inline bool OGRArrowLayer::MapArrowTypeToOGR(
             break;
         case arrow::Type::BINARY:
         case arrow::Type::LARGE_BINARY:
+#if ARROW_VERSION_MAJOR >= 15
+        case arrow::Type::BINARY_VIEW:
+#endif
             bTypeOK = true;
             eType = OFTBinary;
             break;
@@ -479,6 +474,9 @@ inline bool OGRArrowLayer::MapArrowTypeToOGR(
                     break;
                 case arrow::Type::STRING:
                 case arrow::Type::LARGE_STRING:
+#if ARROW_VERSION_MAJOR >= 15
+                case arrow::Type::STRING_VIEW:
+#endif
                     eType = OFTStringList;
                     break;
                 default:
@@ -541,8 +539,6 @@ inline bool OGRArrowLayer::MapArrowTypeToOGR(
         case arrow::Type::RUN_END_ENCODED:
 #endif
 #if ARROW_VERSION_MAJOR >= 15
-        case arrow::Type::STRING_VIEW:
-        case arrow::Type::BINARY_VIEW:
         case arrow::Type::LIST_VIEW:
         case arrow::Type::LARGE_LIST_VIEW:
 #endif
@@ -1324,6 +1320,15 @@ static void AddToArray(CPLJSONArray &oArray, const arrow::Array *array,
                     nIdx));
             break;
         }
+#if ARROW_VERSION_MAJOR >= 15
+        case arrow::Type::STRING_VIEW:
+        {
+            oArray.Add(
+                static_cast<const arrow::StringViewArray *>(array)->GetString(
+                    nIdx));
+            break;
+        }
+#endif
         case arrow::Type::LIST:
         case arrow::Type::LARGE_LIST:
         case arrow::Type::FIXED_SIZE_LIST:
@@ -1494,6 +1499,14 @@ static void AddToDict(CPLJSONObject &oDict, const std::string &osKey,
                                  ->GetString(nIdx));
             break;
         }
+#if ARROW_VERSION_MAJOR >= 15
+        case arrow::Type::STRING_VIEW:
+        {
+            oDict.Add(osKey, static_cast<const arrow::StringViewArray *>(array)
+                                 ->GetString(nIdx));
+            break;
+        }
+#endif
         case arrow::Type::LIST:
         case arrow::Type::LARGE_LIST:
         case arrow::Type::FIXED_SIZE_LIST:
@@ -1517,12 +1530,12 @@ static void AddToDict(CPLJSONObject &oDict, const std::string &osKey,
 /*                         GetMapAsJSON()                               */
 /************************************************************************/
 
+template <class KeyArrayType>
 static CPLJSONObject GetMapAsJSON(const arrow::Array *array,
                                   const size_t nIdxInArray)
 {
     const auto mapArray = static_cast<const arrow::MapArray *>(array);
-    const auto keys =
-        std::static_pointer_cast<arrow::StringArray>(mapArray->keys());
+    const auto keys = std::static_pointer_cast<KeyArrayType>(mapArray->keys());
     const auto values = mapArray->items();
     const auto nIdxStart = mapArray->value_offset(nIdxInArray);
     const int nCount = mapArray->value_length(nIdxInArray);
@@ -1541,6 +1554,24 @@ static CPLJSONObject GetMapAsJSON(const arrow::Array *array,
     return oRoot;
 }
 
+static CPLJSONObject GetMapAsJSON(const arrow::Array *array,
+                                  const size_t nIdxInArray)
+{
+    const auto mapArray = static_cast<const arrow::MapArray *>(array);
+    const auto eKeyType = mapArray->keys()->type()->id();
+    if (eKeyType == arrow::Type::STRING)
+        return GetMapAsJSON<arrow::StringArray>(array, nIdxInArray);
+#if ARROW_VERSION_MAJOR >= 15
+    else if (eKeyType == arrow::Type::STRING_VIEW)
+        return GetMapAsJSON<arrow::StringViewArray>(array, nIdxInArray);
+#endif
+    else
+    {
+        CPLAssert(false);
+        return CPLJSONObject();
+    }
+}
+
 /************************************************************************/
 /*                        GetStructureAsJSON()                          */
 /************************************************************************/
@@ -1805,6 +1836,27 @@ static void ReadList(OGRFeature *poFeature, int i, int64_t nIdxInArray,
             poFeature->SetField(i, aosList.List());
             break;
         }
+#if ARROW_VERSION_MAJOR >= 15
+        case arrow::Type::STRING_VIEW:
+        {
+            const auto values =
+                std::static_pointer_cast<arrow::StringViewArray>(
+                    array->values());
+            const auto nIdxStart = array->value_offset(nIdxInArray);
+            const int nCount = array->value_length(nIdxInArray);
+            CPLStringList aosList;
+            for (int k = 0; k < nCount; k++)
+            {
+                if (values->IsNull(nIdxStart + k))
+                    aosList.AddString(
+                        "");  // we cannot have null strings in a list
+                else
+                    aosList.AddString(values->GetString(nIdxStart + k).c_str());
+            }
+            poFeature->SetField(i, aosList.List());
+            break;
+        }
+#endif
         case arrow::Type::LIST:
         case arrow::Type::LARGE_LIST:
         case arrow::Type::FIXED_SIZE_LIST:
@@ -2247,6 +2299,31 @@ inline OGRFeature *OGRArrowLayer::ReadFeature(
                 poFeature->SetField(i, out_length, data);
                 break;
             }
+#if ARROW_VERSION_MAJOR >= 15
+            case arrow::Type::BINARY_VIEW:
+            {
+                const auto castArray =
+                    static_cast<const arrow::BinaryViewArray *>(array);
+                const auto view = castArray->GetView(nIdxInBatch);
+                poFeature->SetField(i, static_cast<int>(view.size()),
+                                    view.data());
+                break;
+            }
+#endif
+#if ARROW_VERSION_MAJOR >= 15
+            case arrow::Type::STRING_VIEW:
+            {
+                const auto castArray =
+                    static_cast<const arrow::StringViewArray *>(array);
+                const auto strView = castArray->GetView(nIdxInBatch);
+                char *pszString =
+                    static_cast<char *>(CPLMalloc(strView.length() + 1));
+                memcpy(pszString, strView.data(), strView.length());
+                pszString[strView.length()] = 0;
+                poFeature->SetFieldSameTypeUnsafe(i, pszString);
+                break;
+            }
+#endif
             case arrow::Type::FIXED_SIZE_BINARY:
             {
                 const auto castArray =
@@ -2385,8 +2462,9 @@ inline OGRFeature *OGRArrowLayer::ReadFeature(
                 arrow::LargeBinaryArray::offset_type out_length = 0;
                 const uint8_t *data =
                     castArray->GetValue(nIdxInBatch, &out_length);
-                if (out_length <= INT_MAX)
+                if (out_length >= 0 && out_length <= INT_MAX - 1)
                 {
+                    // coverity[overflow_sink]
                     poFeature->SetField(i, static_cast<int>(out_length), data);
                 }
                 else
@@ -2426,8 +2504,6 @@ inline OGRFeature *OGRArrowLayer::ReadFeature(
             case arrow::Type::RUN_END_ENCODED:
 #endif
 #if ARROW_VERSION_MAJOR >= 15
-            case arrow::Type::STRING_VIEW:
-            case arrow::Type::BINARY_VIEW:
             case arrow::Type::LIST_VIEW:
             case arrow::Type::LARGE_LIST_VIEW:
 #endif
@@ -3921,62 +3997,65 @@ OGRArrowLayer::SetBatch(const std::shared_ptr<arrow::RecordBatch> &poBatch)
             {
                 const int idx = m_bIgnoredFields ? oIter->second.iArrayIdx
                                                  : oIter->second.iArrowCol;
-                CPLAssert(idx >= 0);
-                CPLAssert(static_cast<size_t>(idx) < m_poBatchColumns.size());
-                m_poArrayBBOX = m_poBatchColumns[idx].get();
-                CPLAssert(m_poArrayBBOX->type_id() == arrow::Type::STRUCT);
-                const auto castArray =
-                    static_cast<const arrow::StructArray *>(m_poArrayBBOX);
-                const auto &subArrays = castArray->fields();
-                CPLAssert(
-                    static_cast<size_t>(oIter->second.iArrowSubfieldXMin) <
-                    subArrays.size());
-                const auto xminArray =
-                    subArrays[oIter->second.iArrowSubfieldXMin].get();
-                CPLAssert(
-                    static_cast<size_t>(oIter->second.iArrowSubfieldYMin) <
-                    subArrays.size());
-                const auto yminArray =
-                    subArrays[oIter->second.iArrowSubfieldYMin].get();
-                CPLAssert(
-                    static_cast<size_t>(oIter->second.iArrowSubfieldXMax) <
-                    subArrays.size());
-                const auto xmaxArray =
-                    subArrays[oIter->second.iArrowSubfieldXMax].get();
-                CPLAssert(
-                    static_cast<size_t>(oIter->second.iArrowSubfieldYMax) <
-                    subArrays.size());
-                const auto ymaxArray =
-                    subArrays[oIter->second.iArrowSubfieldYMax].get();
-                if (oIter->second.bIsFloat)
-                {
-                    CPLAssert(xminArray->type_id() == arrow::Type::FLOAT);
-                    m_poArrayXMinFloat =
-                        static_cast<const arrow::FloatArray *>(xminArray);
-                    CPLAssert(yminArray->type_id() == arrow::Type::FLOAT);
-                    m_poArrayYMinFloat =
-                        static_cast<const arrow::FloatArray *>(yminArray);
-                    CPLAssert(xmaxArray->type_id() == arrow::Type::FLOAT);
-                    m_poArrayXMaxFloat =
-                        static_cast<const arrow::FloatArray *>(xmaxArray);
-                    CPLAssert(ymaxArray->type_id() == arrow::Type::FLOAT);
-                    m_poArrayYMaxFloat =
-                        static_cast<const arrow::FloatArray *>(ymaxArray);
-                }
-                else
+                if (idx >= 0)
                 {
-                    CPLAssert(xminArray->type_id() == arrow::Type::DOUBLE);
-                    m_poArrayXMinDouble =
-                        static_cast<const arrow::DoubleArray *>(xminArray);
-                    CPLAssert(yminArray->type_id() == arrow::Type::DOUBLE);
-                    m_poArrayYMinDouble =
-                        static_cast<const arrow::DoubleArray *>(yminArray);
-                    CPLAssert(xmaxArray->type_id() == arrow::Type::DOUBLE);
-                    m_poArrayXMaxDouble =
-                        static_cast<const arrow::DoubleArray *>(xmaxArray);
-                    CPLAssert(ymaxArray->type_id() == arrow::Type::DOUBLE);
-                    m_poArrayYMaxDouble =
-                        static_cast<const arrow::DoubleArray *>(ymaxArray);
+                    CPLAssert(static_cast<size_t>(idx) <
+                              m_poBatchColumns.size());
+                    m_poArrayBBOX = m_poBatchColumns[idx].get();
+                    CPLAssert(m_poArrayBBOX->type_id() == arrow::Type::STRUCT);
+                    const auto castArray =
+                        static_cast<const arrow::StructArray *>(m_poArrayBBOX);
+                    const auto &subArrays = castArray->fields();
+                    CPLAssert(
+                        static_cast<size_t>(oIter->second.iArrowSubfieldXMin) <
+                        subArrays.size());
+                    const auto xminArray =
+                        subArrays[oIter->second.iArrowSubfieldXMin].get();
+                    CPLAssert(
+                        static_cast<size_t>(oIter->second.iArrowSubfieldYMin) <
+                        subArrays.size());
+                    const auto yminArray =
+                        subArrays[oIter->second.iArrowSubfieldYMin].get();
+                    CPLAssert(
+                        static_cast<size_t>(oIter->second.iArrowSubfieldXMax) <
+                        subArrays.size());
+                    const auto xmaxArray =
+                        subArrays[oIter->second.iArrowSubfieldXMax].get();
+                    CPLAssert(
+                        static_cast<size_t>(oIter->second.iArrowSubfieldYMax) <
+                        subArrays.size());
+                    const auto ymaxArray =
+                        subArrays[oIter->second.iArrowSubfieldYMax].get();
+                    if (oIter->second.bIsFloat)
+                    {
+                        CPLAssert(xminArray->type_id() == arrow::Type::FLOAT);
+                        m_poArrayXMinFloat =
+                            static_cast<const arrow::FloatArray *>(xminArray);
+                        CPLAssert(yminArray->type_id() == arrow::Type::FLOAT);
+                        m_poArrayYMinFloat =
+                            static_cast<const arrow::FloatArray *>(yminArray);
+                        CPLAssert(xmaxArray->type_id() == arrow::Type::FLOAT);
+                        m_poArrayXMaxFloat =
+                            static_cast<const arrow::FloatArray *>(xmaxArray);
+                        CPLAssert(ymaxArray->type_id() == arrow::Type::FLOAT);
+                        m_poArrayYMaxFloat =
+                            static_cast<const arrow::FloatArray *>(ymaxArray);
+                    }
+                    else
+                    {
+                        CPLAssert(xminArray->type_id() == arrow::Type::DOUBLE);
+                        m_poArrayXMinDouble =
+                            static_cast<const arrow::DoubleArray *>(xminArray);
+                        CPLAssert(yminArray->type_id() == arrow::Type::DOUBLE);
+                        m_poArrayYMinDouble =
+                            static_cast<const arrow::DoubleArray *>(yminArray);
+                        CPLAssert(xmaxArray->type_id() == arrow::Type::DOUBLE);
+                        m_poArrayXMaxDouble =
+                            static_cast<const arrow::DoubleArray *>(xmaxArray);
+                        CPLAssert(ymaxArray->type_id() == arrow::Type::DOUBLE);
+                        m_poArrayYMaxDouble =
+                            static_cast<const arrow::DoubleArray *>(ymaxArray);
+                    }
                 }
             }
         }
@@ -5446,8 +5525,7 @@ OGRArrowLayer::GetArrowSchemaInternal(struct ArrowSchema *out_schema) const
                 out_schema->children[j] = out_schema->children[i];
                 ++j;
             }
-            else if (m_oSetBBoxArrowColumns.find(i) !=
-                     m_oSetBBoxArrowColumns.end())
+            else if (cpl::contains(m_oSetBBoxArrowColumns, i))
             {
                 // Remove bounding box columns from exported schema
                 out_schema->children[i]->release(out_schema->children[i]);
@@ -5623,7 +5701,7 @@ inline int OGRArrowLayer::GetNextArrowArray(struct ArrowArrayStream *stream,
             int j = 0;
             for (int i = 0; i < static_cast<int>(schema.n_children); ++i)
             {
-                if (oSetBBoxArrayIndex.find(i) != oSetBBoxArrayIndex.end() ||
+                if (cpl::contains(oSetBBoxArrayIndex, i) ||
                     IsSilentlyIgnoredFormatForGetArrowSchemaArray(
                         schema.children[i]->format))
                 {
diff --git a/ogr/ogrsf_frmts/arrow_common/ograrrowrandomaccessfile.h b/ogr/ogrsf_frmts/arrow_common/ograrrowrandomaccessfile.h
index cd16ddd14868..a2f4b6e813d5 100644
--- a/ogr/ogrsf_frmts/arrow_common/ograrrowrandomaccessfile.h
+++ b/ogr/ogrsf_frmts/arrow_common/ograrrowrandomaccessfile.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_ARROW_RANDOM_ACCESS_FILE_H
@@ -36,6 +20,9 @@
 #include "arrow/io/file.h"
 #include "arrow/io/interfaces.h"
 
+#include <atomic>
+#include <cinttypes>
+
 /************************************************************************/
 /*                        OGRArrowRandomAccessFile                      */
 /************************************************************************/
@@ -43,24 +30,60 @@
 class OGRArrowRandomAccessFile final : public arrow::io::RandomAccessFile
 {
     int64_t m_nSize = -1;
+    const std::string m_osFilename;
     VSILFILE *m_fp;
-    bool m_bOwnFP;
+    const bool m_bOwnFP;
+    std::atomic<bool> m_bAskedToClosed = false;
+
+#ifdef OGR_ARROW_USE_PREAD
+    const bool m_bDebugReadAt;
+    const bool m_bUsePRead;
+#endif
 
     OGRArrowRandomAccessFile(const OGRArrowRandomAccessFile &) = delete;
     OGRArrowRandomAccessFile &
     operator=(const OGRArrowRandomAccessFile &) = delete;
 
   public:
-    explicit OGRArrowRandomAccessFile(VSILFILE *fp, bool bOwnFP)
-        : m_fp(fp), m_bOwnFP(bOwnFP)
+    OGRArrowRandomAccessFile(const std::string &osFilename, VSILFILE *fp,
+                             bool bOwnFP)
+        : m_osFilename(osFilename), m_fp(fp), m_bOwnFP(bOwnFP)
+#ifdef OGR_ARROW_USE_PREAD
+          ,
+          m_bDebugReadAt(!VSIIsLocal(m_osFilename.c_str())),
+          // Due to the lack of caching for current /vsicurl PRead(), do not
+          // use the PRead() implementation on those files
+          m_bUsePRead(m_fp->HasPRead() &&
+                      CPLTestBool(CPLGetConfigOption(
+                          "OGR_ARROW_USE_PREAD",
+                          VSIIsLocal(m_osFilename.c_str()) ? "YES" : "NO")))
+#endif
     {
     }
 
-    explicit OGRArrowRandomAccessFile(VSIVirtualHandleUniquePtr &&fp)
-        : m_fp(fp.release()), m_bOwnFP(true)
+    OGRArrowRandomAccessFile(const std::string &osFilename,
+                             VSIVirtualHandleUniquePtr &&fp)
+        : m_osFilename(osFilename), m_fp(fp.release()), m_bOwnFP(true)
+#ifdef OGR_ARROW_USE_PREAD
+          ,
+          m_bDebugReadAt(!VSIIsLocal(m_osFilename.c_str())),
+          // Due to the lack of caching for current /vsicurl PRead(), do not
+          // use the PRead() implementation on those files
+          m_bUsePRead(m_fp->HasPRead() &&
+                      CPLTestBool(CPLGetConfigOption(
+                          "OGR_ARROW_USE_PREAD",
+                          VSIIsLocal(m_osFilename.c_str()) ? "YES" : "NO")))
+#endif
     {
     }
 
+    void AskToClose()
+    {
+        m_bAskedToClosed = true;
+        if (m_fp)
+            m_fp->Interrupt();
+    }
+
     ~OGRArrowRandomAccessFile() override
     {
         if (m_fp && m_bOwnFP)
@@ -85,11 +108,14 @@ class OGRArrowRandomAccessFile final : public arrow::io::RandomAccessFile
 
     bool closed() const override
     {
-        return m_fp == nullptr;
+        return m_bAskedToClosed || m_fp == nullptr;
     }
 
     arrow::Status Seek(int64_t position) override
     {
+        if (m_bAskedToClosed)
+            return arrow::Status::IOError("File requested to close");
+
         if (VSIFSeekL(m_fp, static_cast<vsi_l_offset>(position), SEEK_SET) == 0)
             return arrow::Status::OK();
         return arrow::Status::IOError("Error while seeking");
@@ -97,6 +123,9 @@ class OGRArrowRandomAccessFile final : public arrow::io::RandomAccessFile
 
     arrow::Result<int64_t> Read(int64_t nbytes, void *out) override
     {
+        if (m_bAskedToClosed)
+            return arrow::Status::IOError("File requested to close");
+
         CPLAssert(static_cast<int64_t>(static_cast<size_t>(nbytes)) == nbytes);
         return static_cast<int64_t>(
             VSIFReadL(out, 1, static_cast<size_t>(nbytes), m_fp));
@@ -104,12 +133,10 @@ class OGRArrowRandomAccessFile final : public arrow::io::RandomAccessFile
 
     arrow::Result<std::shared_ptr<arrow::Buffer>> Read(int64_t nbytes) override
     {
+        if (m_bAskedToClosed)
+            return arrow::Status::IOError("File requested to close");
+
         // CPLDebug("ARROW", "Reading %d bytes", int(nbytes));
-        // Ugly hack for https://github.com/OSGeo/gdal/issues/9497
-        if (CPLGetConfigOption("OGR_ARROW_STOP_IO", nullptr))
-        {
-            return arrow::Result<std::shared_ptr<arrow::Buffer>>();
-        }
         auto buffer = arrow::AllocateResizableBuffer(nbytes);
         if (!buffer.ok())
         {
@@ -122,8 +149,54 @@ class OGRArrowRandomAccessFile final : public arrow::io::RandomAccessFile
         return buffer;
     }
 
+#ifdef OGR_ARROW_USE_PREAD
+    using arrow::io::RandomAccessFile::ReadAt;
+
+    arrow::Result<std::shared_ptr<arrow::Buffer>>
+    ReadAt(int64_t position, int64_t nbytes) override
+    {
+        if (m_bAskedToClosed)
+            return arrow::Status::IOError("File requested to close");
+
+        if (m_bUsePRead)
+        {
+            auto buffer = arrow::AllocateResizableBuffer(nbytes);
+            if (!buffer.ok())
+            {
+                return buffer;
+            }
+            if (m_bDebugReadAt)
+            {
+                CPLDebug(
+                    "ARROW",
+                    "Start ReadAt() called on %s (this=%p) from "
+                    "thread=" CPL_FRMT_GIB ": pos=%" PRId64 ", nbytes=%" PRId64,
+                    m_osFilename.c_str(), this, CPLGetPID(), position, nbytes);
+            }
+            uint8_t *buffer_data = (*buffer)->mutable_data();
+            auto nread = m_fp->PRead(buffer_data, static_cast<size_t>(nbytes),
+                                     static_cast<vsi_l_offset>(position));
+            CPL_IGNORE_RET_VAL(
+                (*buffer)->Resize(nread));  // shrink --> cannot fail
+            if (m_bDebugReadAt)
+            {
+                CPLDebug(
+                    "ARROW",
+                    "End ReadAt() called on %s (this=%p) from "
+                    "thread=" CPL_FRMT_GIB ": pos=%" PRId64 ", nbytes=%" PRId64,
+                    m_osFilename.c_str(), this, CPLGetPID(), position, nbytes);
+            }
+            return buffer;
+        }
+        return arrow::io::RandomAccessFile::ReadAt(position, nbytes);
+    }
+#endif
+
     arrow::Result<int64_t> GetSize() override
     {
+        if (m_bAskedToClosed)
+            return arrow::Status::IOError("File requested to close");
+
         if (m_nSize < 0)
         {
             const auto nPos = VSIFTellL(m_fp);
diff --git a/ogr/ogrsf_frmts/arrow_common/ograrrowwritablefile.h b/ogr/ogrsf_frmts/arrow_common/ograrrowwritablefile.h
index 402b3c6556e9..8ca7a6ebfd53 100644
--- a/ogr/ogrsf_frmts/arrow_common/ograrrowwritablefile.h
+++ b/ogr/ogrsf_frmts/arrow_common/ograrrowwritablefile.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_ARROW_WRITABLE_FILE_H
diff --git a/ogr/ogrsf_frmts/arrow_common/ograrrowwriterlayer.hpp b/ogr/ogrsf_frmts/arrow_common/ograrrowwriterlayer.hpp
index bb0735fcb1db..8f23b3c34cf6 100644
--- a/ogr/ogrsf_frmts/arrow_common/ograrrowwriterlayer.hpp
+++ b/ogr/ogrsf_frmts/arrow_common/ograrrowwriterlayer.hpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGARROWWRITERLAYER_HPP_INCLUDED
@@ -153,6 +137,7 @@ inline void OGRArrowWriterLayer::CreateSchemaCommon()
     {
         const auto poFieldDefn = m_poFeatureDefn->GetFieldDefn(i);
         std::shared_ptr<arrow::DataType> dt;
+        const auto eDT = poFieldDefn->GetType();
         const auto eSubDT = poFieldDefn->GetSubType();
         const auto &osDomainName = poFieldDefn->GetDomainName();
         const OGRFieldDomain *poFieldDomain = nullptr;
@@ -172,7 +157,7 @@ inline void OGRArrowWriterLayer::CreateSchemaCommon()
                 poFieldDomain = oIter->second.get();
             }
         }
-        switch (poFieldDefn->GetType())
+        switch (eDT)
         {
             case OFTInteger:
                 if (eSubDT == OFSTBoolean)
@@ -209,7 +194,7 @@ inline void OGRArrowWriterLayer::CreateSchemaCommon()
 
             case OFTString:
             case OFTWideString:
-                if (eSubDT != OFSTNone || nWidth > 0)
+                if ((eSubDT != OFSTNone && eSubDT != OFSTJSON) || nWidth > 0)
                     bNeedGDALSchema = true;
                 dt = arrow::utf8();
                 break;
@@ -265,9 +250,18 @@ inline void OGRArrowWriterLayer::CreateSchemaCommon()
                 break;
             }
         }
-        fields.emplace_back(arrow::field(poFieldDefn->GetNameRef(),
-                                         std::move(dt),
-                                         poFieldDefn->IsNullable()));
+
+        auto field = arrow::field(poFieldDefn->GetNameRef(), std::move(dt),
+                                  poFieldDefn->IsNullable());
+        if (eDT == OFTString && eSubDT == OFSTJSON)
+        {
+            auto kvMetadata = std::make_shared<arrow::KeyValueMetadata>();
+            kvMetadata->Append(ARROW_EXTENSION_NAME_KEY,
+                               EXTENSION_NAME_ARROW_JSON);
+            field = field->WithMetadata(kvMetadata);
+        }
+
+        fields.emplace_back(std::move(field));
         if (poFieldDefn->GetAlternativeNameRef()[0])
             bNeedGDALSchema = true;
         if (!poFieldDefn->GetComment().empty())
@@ -284,19 +278,16 @@ inline void OGRArrowWriterLayer::CreateSchemaCommon()
         const bool pointFieldNullable = GetDriverUCName() == "PARQUET";
 
         // Fixed Size List GeoArrow encoding
-        std::shared_ptr<arrow::Field> pointField;
-        if (nDim == 2)
-            pointField =
-                arrow::field("xy", arrow::float64(), pointFieldNullable);
-        else if (nDim == 3 && OGR_GT_HasZ(eGType))
-            pointField =
-                arrow::field("xyz", arrow::float64(), pointFieldNullable);
-        else if (nDim == 3 && OGR_GT_HasM(eGType))
-            pointField =
-                arrow::field("xym", arrow::float64(), pointFieldNullable);
-        else
-            pointField =
-                arrow::field("xyzm", arrow::float64(), pointFieldNullable);
+        const auto getFixedSizeListOfPoint =
+            [nDim, eGType, pointFieldNullable]()
+        {
+            return arrow::fixed_size_list(
+                arrow::field(nDim == 2   ? "xy"
+                             : nDim == 3 ? (OGR_GT_HasZ(eGType) ? "xyz" : "xym")
+                                         : "xyzm",
+                             arrow::float64(), pointFieldNullable),
+                nDim);
+        };
 
         // Struct GeoArrow encoding
         auto xField(arrow::field("x", arrow::float64(), false));
@@ -312,6 +303,30 @@ inline void OGRArrowWriterLayer::CreateSchemaCommon()
                 arrow::field("m", arrow::float64(), false));
         auto pointStructType(arrow::struct_(std::move(pointFields)));
 
+        const auto getListOfVertices = [&getFixedSizeListOfPoint]()
+        {
+            return arrow::list(std::make_shared<arrow::Field>(
+                "vertices", getFixedSizeListOfPoint()));
+        };
+
+        const auto getListOfRings = [&getListOfVertices]()
+        {
+            return arrow::list(
+                std::make_shared<arrow::Field>("rings", getListOfVertices()));
+        };
+
+        const auto getListOfVerticesStruct = [&pointStructType]()
+        {
+            return arrow::list(
+                std::make_shared<arrow::Field>("vertices", pointStructType));
+        };
+
+        const auto getListOfRingsStruct = [&getListOfVerticesStruct]()
+        {
+            return arrow::list(std::make_shared<arrow::Field>(
+                "rings", getListOfVerticesStruct()));
+        };
+
         std::shared_ptr<arrow::DataType> dt;
         switch (m_aeGeomEncoding[i])
         {
@@ -329,30 +344,30 @@ inline void OGRArrowWriterLayer::CreateSchemaCommon()
                 break;
 
             case OGRArrowGeomEncoding::GEOARROW_FSL_POINT:
-                dt = arrow::fixed_size_list(pointField, nDim);
+                dt = getFixedSizeListOfPoint();
                 break;
 
             case OGRArrowGeomEncoding::GEOARROW_FSL_LINESTRING:
-                dt = arrow::list(arrow::fixed_size_list(pointField, nDim));
+                dt = getListOfVertices();
                 break;
 
             case OGRArrowGeomEncoding::GEOARROW_FSL_POLYGON:
-                dt = arrow::list(
-                    arrow::list(arrow::fixed_size_list(pointField, nDim)));
+                dt = getListOfRings();
                 break;
 
             case OGRArrowGeomEncoding::GEOARROW_FSL_MULTIPOINT:
-                dt = arrow::list(arrow::fixed_size_list(pointField, nDim));
+                dt = arrow::list(std::make_shared<arrow::Field>(
+                    "points", getFixedSizeListOfPoint()));
                 break;
 
             case OGRArrowGeomEncoding::GEOARROW_FSL_MULTILINESTRING:
-                dt = arrow::list(
-                    arrow::list(arrow::fixed_size_list(pointField, nDim)));
+                dt = arrow::list(std::make_shared<arrow::Field>(
+                    "linestrings", getListOfVertices()));
                 break;
 
             case OGRArrowGeomEncoding::GEOARROW_FSL_MULTIPOLYGON:
-                dt = arrow::list(arrow::list(
-                    arrow::list(arrow::fixed_size_list(pointField, nDim))));
+                dt = arrow::list(std::make_shared<arrow::Field>(
+                    "polygons", getListOfRings()));
                 break;
 
             case OGRArrowGeomEncoding::GEOARROW_STRUCT_POINT:
@@ -360,23 +375,26 @@ inline void OGRArrowWriterLayer::CreateSchemaCommon()
                 break;
 
             case OGRArrowGeomEncoding::GEOARROW_STRUCT_LINESTRING:
-                dt = arrow::list(pointStructType);
+                dt = getListOfVerticesStruct();
                 break;
 
             case OGRArrowGeomEncoding::GEOARROW_STRUCT_POLYGON:
-                dt = arrow::list(arrow::list(pointStructType));
+                dt = getListOfRingsStruct();
                 break;
 
             case OGRArrowGeomEncoding::GEOARROW_STRUCT_MULTIPOINT:
-                dt = arrow::list(pointStructType);
+                dt = arrow::list(
+                    std::make_shared<arrow::Field>("points", pointStructType));
                 break;
 
             case OGRArrowGeomEncoding::GEOARROW_STRUCT_MULTILINESTRING:
-                dt = arrow::list(arrow::list(pointStructType));
+                dt = arrow::list(std::make_shared<arrow::Field>(
+                    "linestrings", getListOfVerticesStruct()));
                 break;
 
             case OGRArrowGeomEncoding::GEOARROW_STRUCT_MULTIPOLYGON:
-                dt = arrow::list(arrow::list(arrow::list(pointStructType)));
+                dt = arrow::list(std::make_shared<arrow::Field>(
+                    "polygons", getListOfRingsStruct()));
                 break;
         }
 
@@ -389,7 +407,7 @@ inline void OGRArrowWriterLayer::CreateSchemaCommon()
                                   ? field->metadata()->Copy()
                                   : std::make_shared<arrow::KeyValueMetadata>();
             kvMetadata->Append(
-                "ARROW:extension:name",
+                ARROW_EXTENSION_NAME_KEY,
                 GetGeomEncodingAsString(m_aeGeomEncoding[i], false));
             field = field->WithMetadata(kvMetadata);
         }
@@ -2295,8 +2313,8 @@ inline bool OGRArrowWriterLayer::WriteArrowBatchInternal(
     std::map<std::string, int> oMapSchemaChildrenNameToIdx;
     for (int i = 0; i < static_cast<int>(schema->n_children); ++i)
     {
-        if (oMapSchemaChildrenNameToIdx.find(schema->children[i]->name) !=
-            oMapSchemaChildrenNameToIdx.end())
+        if (cpl::contains(oMapSchemaChildrenNameToIdx,
+                          schema->children[i]->name))
         {
             CPLError(CE_Failure, CPLE_AppDefined,
                      "Several fields with same name '%s' found",
@@ -2309,7 +2327,7 @@ inline bool OGRArrowWriterLayer::WriteArrowBatchInternal(
         {
             const auto oMetadata =
                 OGRParseArrowMetadata(schema->children[i]->metadata);
-            auto oIter = oMetadata.find(ARROW_EXTENSION_NAME_KEY);
+            const auto oIter = oMetadata.find(ARROW_EXTENSION_NAME_KEY);
             if (oIter != oMetadata.end() &&
                 (oIter->second == EXTENSION_NAME_OGC_WKB ||
                  oIter->second == EXTENSION_NAME_GEOARROW_WKB))
@@ -2565,8 +2583,7 @@ inline bool OGRArrowWriterLayer::WriteArrowBatchInternal(
 
     for (int i = 0; i < static_cast<int>(schema->n_children); ++i)
     {
-        if (oSetReferencedFieldsInArraySchema.find(i) ==
-            oSetReferencedFieldsInArraySchema.end())
+        if (!cpl::contains(oSetReferencedFieldsInArraySchema, i))
         {
             if (m_osFIDColumn.empty() &&
                 strcmp(schema->children[i]->name, pszFIDName) == 0)
@@ -2832,7 +2849,7 @@ inline bool OGRArrowWriterLayer::WriteArrowBatchInternal(
         std::vector<std::shared_ptr<arrow::Array>> apoArrays;
         for (int i = 0; i < m_poSchema->num_fields(); ++i)
         {
-            auto oIter =
+            const auto oIter =
                 oMapGeomFieldNameToArray.find(m_poSchema->field(i)->name());
             if (oIter != oMapGeomFieldNameToArray.end())
                 apoArrays.emplace_back(oIter->second);
diff --git a/ogr/ogrsf_frmts/arrow_common/vsiarrowfilesystem.hpp b/ogr/ogrsf_frmts/arrow_common/vsiarrowfilesystem.hpp
new file mode 100644
index 000000000000..e360f78f9ee4
--- /dev/null
+++ b/ogr/ogrsf_frmts/arrow_common/vsiarrowfilesystem.hpp
@@ -0,0 +1,275 @@
+/******************************************************************************
+ *
+ * Project:  Parquet Translator
+ * Purpose:  Implements OGRParquetDriver.
+ * Author:   Even Rouault, <even.rouault at spatialys.com>
+ *
+ ******************************************************************************
+ * Copyright (c) 2022, Planet Labs
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#ifndef VSIARROWFILESYSTEM_HPP_INCLUDED
+#define VSIARROWFILESYSTEM_HPP_INCLUDED
+
+#include "arrow/util/config.h"
+
+#include "ograrrowrandomaccessfile.h"
+
+#include <atomic>
+#include <memory>
+#include <mutex>
+#include <vector>
+#include <utility>
+
+/************************************************************************/
+/*                         VSIArrowFileSystem                           */
+/************************************************************************/
+
+class VSIArrowFileSystem final : public arrow::fs::FileSystem
+{
+    const std::string m_osEnvVarPrefix;
+    const std::string m_osQueryParameters;
+
+    std::atomic<bool> m_bAskedToClosed = false;
+    std::mutex m_oMutex{};
+    std::vector<std::pair<std::string, std::weak_ptr<OGRArrowRandomAccessFile>>>
+        m_oSetFiles{};
+
+  public:
+    VSIArrowFileSystem(const std::string &osEnvVarPrefix,
+                       const std::string &osQueryParameters)
+        : m_osEnvVarPrefix(osEnvVarPrefix),
+          m_osQueryParameters(osQueryParameters)
+    {
+    }
+
+    // Cf comment in OGRParquetDataset::~OGRParquetDataset() for rationale
+    // for this method
+    void AskToClose()
+    {
+        m_bAskedToClosed = true;
+        std::vector<
+            std::pair<std::string, std::weak_ptr<OGRArrowRandomAccessFile>>>
+            oSetFiles;
+        {
+            std::lock_guard oLock(m_oMutex);
+            oSetFiles = m_oSetFiles;
+        }
+        for (auto &[osName, poFile] : oSetFiles)
+        {
+            bool bWarned = false;
+            while (!poFile.expired())
+            {
+                if (!bWarned)
+                {
+                    bWarned = true;
+                    auto poFileLocked = poFile.lock();
+                    if (poFileLocked)
+                    {
+                        CPLDebug("PARQUET",
+                                 "Still on-going reads on %s. Waiting for it "
+                                 "to be closed.",
+                                 osName.c_str());
+                        poFileLocked->AskToClose();
+                    }
+                }
+                CPLSleep(0.01);
+            }
+        }
+    }
+
+    std::string type_name() const override
+    {
+        return "vsi" + m_osEnvVarPrefix;
+    }
+
+    using arrow::fs::FileSystem::Equals;
+
+    bool Equals(const arrow::fs::FileSystem &other) const override
+    {
+        const auto poOther = dynamic_cast<const VSIArrowFileSystem *>(&other);
+        return poOther != nullptr &&
+               poOther->m_osEnvVarPrefix == m_osEnvVarPrefix &&
+               poOther->m_osQueryParameters == m_osQueryParameters;
+    }
+
+    using arrow::fs::FileSystem::GetFileInfo;
+
+    arrow::Result<arrow::fs::FileInfo>
+    GetFileInfo(const std::string &path) override
+    {
+        auto fileType = arrow::fs::FileType::Unknown;
+        VSIStatBufL sStat;
+        if (VSIStatL(path.c_str(), &sStat) == 0)
+        {
+            if (VSI_ISREG(sStat.st_mode))
+                fileType = arrow::fs::FileType::File;
+            else if (VSI_ISDIR(sStat.st_mode))
+                fileType = arrow::fs::FileType::Directory;
+        }
+        else
+        {
+            fileType = arrow::fs::FileType::NotFound;
+        }
+        arrow::fs::FileInfo info(path, fileType);
+        if (fileType == arrow::fs::FileType::File)
+            info.set_size(sStat.st_size);
+        return info;
+    }
+
+    arrow::Result<arrow::fs::FileInfoVector>
+    GetFileInfo(const arrow::fs::FileSelector &select) override
+    {
+        arrow::fs::FileInfoVector res;
+        VSIDIR *psDir = VSIOpenDir(select.base_dir.c_str(),
+                                   select.recursive ? -1 : 0, nullptr);
+        if (psDir == nullptr)
+            return res;
+
+        bool bParquetFound = false;
+        const int nMaxNonParquetFiles = atoi(
+            CPLGetConfigOption("OGR_PARQUET_MAX_NON_PARQUET_FILES", "100"));
+        const int nMaxListedFiles =
+            atoi(CPLGetConfigOption("OGR_PARQUET_MAX_LISTED_FILES", "1000000"));
+        while (const auto psEntry = VSIGetNextDirEntry(psDir))
+        {
+            if (!bParquetFound)
+                bParquetFound =
+                    EQUAL(CPLGetExtension(psEntry->pszName), "parquet");
+
+            const std::string osFilename =
+                select.base_dir + '/' + psEntry->pszName;
+            int nMode = psEntry->nMode;
+            if (!psEntry->bModeKnown)
+            {
+                VSIStatBufL sStat;
+                if (VSIStatL(osFilename.c_str(), &sStat) == 0)
+                    nMode = sStat.st_mode;
+            }
+
+            auto fileType = arrow::fs::FileType::Unknown;
+            if (VSI_ISREG(nMode))
+                fileType = arrow::fs::FileType::File;
+            else if (VSI_ISDIR(nMode))
+                fileType = arrow::fs::FileType::Directory;
+
+            arrow::fs::FileInfo info(osFilename, fileType);
+            if (fileType == arrow::fs::FileType::File && psEntry->bSizeKnown)
+            {
+                info.set_size(psEntry->nSize);
+            }
+            res.push_back(info);
+
+            if (m_osEnvVarPrefix == "PARQUET")
+            {
+                // Avoid iterating over too many files if there's no likely parquet
+                // files.
+                if (static_cast<int>(res.size()) == nMaxNonParquetFiles &&
+                    !bParquetFound)
+                    break;
+                if (static_cast<int>(res.size()) == nMaxListedFiles)
+                    break;
+            }
+        }
+        VSICloseDir(psDir);
+        return res;
+    }
+
+    arrow::Status CreateDir(const std::string & /*path*/,
+                            bool /*recursive*/ = true) override
+    {
+        return arrow::Status::IOError("CreateDir() unimplemented");
+    }
+
+    arrow::Status DeleteDir(const std::string & /*path*/) override
+    {
+        return arrow::Status::IOError("DeleteDir() unimplemented");
+    }
+
+    arrow::Status DeleteDirContents(const std::string & /*path*/
+#if ARROW_VERSION_MAJOR >= 8
+                                    ,
+                                    bool /*missing_dir_ok*/ = false
+#endif
+                                    ) override
+    {
+        return arrow::Status::IOError("DeleteDirContents() unimplemented");
+    }
+
+    arrow::Status DeleteRootDirContents() override
+    {
+        return arrow::Status::IOError("DeleteRootDirContents() unimplemented");
+    }
+
+    arrow::Status DeleteFile(const std::string & /*path*/) override
+    {
+        return arrow::Status::IOError("DeleteFile() unimplemented");
+    }
+
+    arrow::Status Move(const std::string & /*src*/,
+                       const std::string & /*dest*/) override
+    {
+        return arrow::Status::IOError("Move() unimplemented");
+    }
+
+    arrow::Status CopyFile(const std::string & /*src*/,
+                           const std::string & /*dest*/) override
+    {
+        return arrow::Status::IOError("CopyFile() unimplemented");
+    }
+
+    using arrow::fs::FileSystem::OpenInputStream;
+
+    arrow::Result<std::shared_ptr<arrow::io::InputStream>>
+    OpenInputStream(const std::string &path) override
+    {
+        return OpenInputFile(path);
+    }
+
+    using arrow::fs::FileSystem::OpenInputFile;
+
+    arrow::Result<std::shared_ptr<arrow::io::RandomAccessFile>>
+    OpenInputFile(const std::string &path) override
+    {
+        if (m_bAskedToClosed)
+            return arrow::Status::IOError(
+                "OpenInputFile(): file system in shutdown");
+
+        std::string osPath(path);
+        osPath += m_osQueryParameters;
+        CPLDebugOnly(m_osEnvVarPrefix.c_str(), "Opening %s", osPath.c_str());
+        auto fp = VSIVirtualHandleUniquePtr(VSIFOpenL(osPath.c_str(), "rb"));
+        if (fp == nullptr)
+            return arrow::Status::IOError("OpenInputFile() failed for " +
+                                          osPath);
+        auto poFile =
+            std::make_shared<OGRArrowRandomAccessFile>(osPath, std::move(fp));
+        {
+            std::lock_guard oLock(m_oMutex);
+            m_oSetFiles.emplace_back(path, poFile);
+        }
+        return poFile;
+    }
+
+    using arrow::fs::FileSystem::OpenOutputStream;
+
+    arrow::Result<std::shared_ptr<arrow::io::OutputStream>>
+    OpenOutputStream(const std::string & /*path*/,
+                     const std::shared_ptr<const arrow::KeyValueMetadata>
+                         & /* metadata */) override
+    {
+        return arrow::Status::IOError("OpenOutputStream() unimplemented");
+    }
+
+    arrow::Result<std::shared_ptr<arrow::io::OutputStream>>
+    OpenAppendStream(const std::string & /*path*/,
+                     const std::shared_ptr<const arrow::KeyValueMetadata>
+                         & /* metadata */) override
+    {
+        return arrow::Status::IOError("OpenAppendStream() unimplemented");
+    }
+};
+
+#endif  // VSIARROWFILESYSTEM_HPP_INCLUDED
diff --git a/ogr/ogrsf_frmts/avc/CMakeLists.txt b/ogr/ogrsf_frmts/avc/CMakeLists.txt
index 555bfbee44dd..f49a478568f2 100644
--- a/ogr/ogrsf_frmts/avc/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/avc/CMakeLists.txt
@@ -21,8 +21,12 @@ add_gdal_driver(
   BUILTIN)
 gdal_standard_includes(ogr_AVC)
 
-if (GDAL_USE_SHAPELIB_INTERNAL)
-  gdal_add_vendored_lib(ogr_AVC shapelib)
-else ()
-  gdal_target_link_libraries(ogr_AVC PRIVATE SHAPELIB::shp)
-endif ()
+if (NOT OGR_ENABLE_DRIVER_SHAPE OR OGR_ENABLE_DRIVER_SHAPE_PLUGIN)
+target_compile_definitions(ogr_AVC PRIVATE -DWITHOUT_SHAPEFILE)
+else()
+    if (GDAL_USE_SHAPELIB_INTERNAL)
+      gdal_add_vendored_lib(ogr_AVC shapelib)
+    else ()
+      gdal_target_link_libraries(ogr_AVC PRIVATE SHAPELIB::shp)
+    endif ()
+endif()
diff --git a/ogr/ogrsf_frmts/avc/avc.h b/ogr/ogrsf_frmts/avc/avc.h
index 907920d7be1f..44e1808ca388 100644
--- a/ogr/ogrsf_frmts/avc/avc.h
+++ b/ogr/ogrsf_frmts/avc/avc.h
@@ -10,23 +10,7 @@
  **********************************************************************
  * Copyright (c) 1999-2001, Daniel Morissette
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************
  *
  * $Log: avc.h,v $
@@ -118,14 +102,7 @@
 #include "cpl_conv.h"
 #include "cpl_string.h"
 
-#ifdef GDAL_COMPILATION
-#ifdef RENAME_INTERNAL_SHAPELIB_SYMBOLS
-#include "gdal_shapelib_symbol_rename.h"
-#endif
-#include "shapefil.h"
-#else
-#include "dbfopen.h"
-#endif
+typedef struct DBFInfo *DBFHandle;
 
 #include "avc_mbyte.h"
 
diff --git a/ogr/ogrsf_frmts/avc/avc_bin.cpp b/ogr/ogrsf_frmts/avc/avc_bin.cpp
index 4da41c06a4e4..519aa3df4c49 100644
--- a/ogr/ogrsf_frmts/avc/avc_bin.cpp
+++ b/ogr/ogrsf_frmts/avc/avc_bin.cpp
@@ -10,23 +10,7 @@
  **********************************************************************
  * Copyright (c) 1999-2005, Daniel Morissette
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************
  *
  * $Log: avc_bin.c,v $
@@ -133,6 +117,75 @@
 
 #include <ctype.h> /* for isspace() */
 
+#ifdef WITHOUT_SHAPEFILE
+
+#define SHP_VSI_ONLY_SETUP_HOOKS
+#define SAOffset vsi_l_offset
+#define SHPAPI_CAL
+
+#define DBFAddField OGRAVC_DBFAddField
+#define DBFAddNativeFieldType OGRAVC_DBFAddNativeFieldType
+#define DBFAlterFieldDefn OGRAVC_DBFAlterFieldDefn
+#define DBFCloneEmpty OGRAVC_DBFCloneEmpty
+#define DBFClose OGRAVC_DBFClose
+#define DBFCreateEx OGRAVC_DBFCreateEx
+#define DBFCreate OGRAVC_DBFCreate
+#define DBFCreateLL OGRAVC_DBFCreateLL
+#define DBFDeleteField OGRAVC_DBFDeleteField
+#define DBFFlushRecord OGRAVC_DBFFlushRecord
+#define DBFGetCodePage OGRAVC_DBFGetCodePage
+#define DBFGetFieldCount OGRAVC_DBFGetFieldCount
+#define DBFGetFieldIndex OGRAVC_DBFGetFieldIndex
+#define DBFGetFieldInfo OGRAVC_DBFGetFieldInfo
+#define DBFGetLenWithoutExtension OGRAVC_DBFGetLenWithoutExtension
+#define DBFGetNativeFieldType OGRAVC_DBFGetNativeFieldType
+#define DBFGetNullCharacter OGRAVC_DBFGetNullCharacter
+#define DBFGetRecordCount OGRAVC_DBFGetRecordCount
+#define DBFIsAttributeNULL OGRAVC_DBFIsAttributeNULL
+#define DBFIsRecordDeleted OGRAVC_DBFIsRecordDeleted
+#define DBFIsValueNULL OGRAVC_DBFIsValueNULL
+#define DBFLoadRecord OGRAVC_DBFLoadRecord
+#define DBFMarkRecordDeleted OGRAVC_DBFMarkRecordDeleted
+#define DBFOpen OGRAVC_DBFOpen
+#define DBFOpenLL OGRAVC_DBFOpenLL
+#define DBFReadAttribute OGRAVC_DBFReadAttribute
+#define DBFReadDoubleAttribute OGRAVC_DBFReadDoubleAttribute
+#define DBFReadIntegerAttribute OGRAVC_DBFReadIntegerAttribute
+#define DBFReadLogicalAttribute OGRAVC_DBFReadLogicalAttribute
+#define DBFReadStringAttribute OGRAVC_DBFReadStringAttribute
+#define DBFReadDateAttribute OGRAVC_DBFReadDateAttribute
+#define DBFReadTuple OGRAVC_DBFReadTuple
+#define DBFReorderFields OGRAVC_DBFReorderFields
+#define DBFSetLastModifiedDate OGRAVC_DBFSetLastModifiedDate
+#define DBFSetWriteEndOfFileChar OGRAVC_DBFSetWriteEndOfFileChar
+#define DBFUpdateHeader OGRAVC_DBFUpdateHeader
+#define DBFWriteAttributeDirectly OGRAVC_DBFWriteAttributeDirectly
+#define DBFWriteAttribute OGRAVC_DBFWriteAttribute
+#define DBFWriteDoubleAttribute OGRAVC_DBFWriteDoubleAttribute
+#define DBFWriteHeader OGRAVC_DBFWriteHeader
+#define DBFWriteIntegerAttribute OGRAVC_DBFWriteIntegerAttribute
+#define DBFWriteLogicalAttribute OGRAVC_DBFWriteLogicalAttribute
+#define DBFWriteNULLAttribute OGRAVC_DBFWriteNULLAttribute
+#define DBFWriteStringAttribute OGRAVC_DBFWriteStringAttribute
+#define DBFWriteDateAttribute OGRAVC_DBFWriteDateAttribute
+#define DBFWriteTuple OGRAVC_DBFWriteTuple
+
+#define VSI_SHP_WriteMoreDataOK OGRAVC_VSI_SHP_WriteMoreDataOK
+#define SASetupDefaultHooks OGRAVC_SASetupDefaultHooks
+
+#include "../shape/shapefil.h"
+#include "../shape/dbfopen.c"
+#include "../shape/shp_vsi.c"
+
+#else
+
+#ifdef RENAME_INTERNAL_SHAPELIB_SYMBOLS
+#include "gdal_shapelib_symbol_rename.h"
+#endif
+#include "shapefil.h"
+
+#endif  // WITHOUT_SHAPEFILE
+
 /* Used by avc_binwr.c */
 extern int _AVCBinReadNextArcDir(AVCRawBinFile *psFile, AVCTableDef *psArcDir);
 
@@ -2454,9 +2507,8 @@ AVCBinFile *_AVCBinReadOpenDBFTable(const char *pszDBFFilename,
 
     for (iField = 0; iField < psTableDef->numFields; iField++)
     {
-        int nWidth, nDecimals;
+        int nWidth = 0, nDecimals = 0;
         /* DBFFieldType eDBFType; */
-        char cNativeType;
 
         /*-------------------------------------------------------------
          * Fetch DBF Field info and convert to Arc/Info type...
@@ -2466,7 +2518,7 @@ AVCBinFile *_AVCBinReadOpenDBFTable(const char *pszDBFFilename,
         /* eDBFType = */
         DBFGetFieldInfo(hDBFFile, iField, pasFieldDef[iField].szName, &nWidth,
                         &nDecimals);
-        cNativeType = DBFGetNativeFieldType(hDBFFile, iField);
+        const char cNativeType = DBFGetNativeFieldType(hDBFFile, iField);
 
         pasFieldDef[iField].nFmtWidth = (GInt16)nWidth;
         pasFieldDef[iField].nFmtPrec = (GInt16)nDecimals;
diff --git a/ogr/ogrsf_frmts/avc/avc_binwr.cpp b/ogr/ogrsf_frmts/avc/avc_binwr.cpp
index 6898eda2009d..b58c45e3947c 100644
--- a/ogr/ogrsf_frmts/avc/avc_binwr.cpp
+++ b/ogr/ogrsf_frmts/avc/avc_binwr.cpp
@@ -9,23 +9,7 @@
  **********************************************************************
  * Copyright (c) 1999-2001, Daniel Morissette
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************
  *
  * $Log: avc_binwr.c,v $
diff --git a/ogr/ogrsf_frmts/avc/avc_e00gen.cpp b/ogr/ogrsf_frmts/avc/avc_e00gen.cpp
index 2d1b49d92064..9edd4f120cc7 100644
--- a/ogr/ogrsf_frmts/avc/avc_e00gen.cpp
+++ b/ogr/ogrsf_frmts/avc/avc_e00gen.cpp
@@ -10,23 +10,7 @@
  **********************************************************************
  * Copyright (c) 1999-2005, Daniel Morissette
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************
  *
  * $Log: avc_e00gen.c,v $
diff --git a/ogr/ogrsf_frmts/avc/avc_e00parse.cpp b/ogr/ogrsf_frmts/avc/avc_e00parse.cpp
index 8ca38d3703d3..bf3a049c30c9 100644
--- a/ogr/ogrsf_frmts/avc/avc_e00parse.cpp
+++ b/ogr/ogrsf_frmts/avc/avc_e00parse.cpp
@@ -10,23 +10,7 @@
  **********************************************************************
  * Copyright (c) 1999-2005, Daniel Morissette
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************
  *
  * $Log: avc_e00parse.c,v $
diff --git a/ogr/ogrsf_frmts/avc/avc_e00read.cpp b/ogr/ogrsf_frmts/avc/avc_e00read.cpp
index 255ac4ba05c6..747ccbaeb157 100644
--- a/ogr/ogrsf_frmts/avc/avc_e00read.cpp
+++ b/ogr/ogrsf_frmts/avc/avc_e00read.cpp
@@ -12,23 +12,7 @@
  **********************************************************************
  * Copyright (c) 1999-2005, Daniel Morissette
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************
  *
  * $Log: avc_e00read.c,v $
@@ -1003,7 +987,7 @@ static int _AVCE00ReadBuildSqueleton(AVCE00ReadPtr psInfo, char **papszCoverDir)
     }
 
     CPLString osCoverPathTruncated(psInfo->pszCoverPath);
-    osCoverPathTruncated.resize(osCoverPathTruncated.size() - 1);
+    osCoverPathTruncated.pop_back();
     pszEXPPath = CPLStrdup(
         CPLSPrintf("EXP  0 %s%s.E00", szCWD, osCoverPathTruncated.c_str()));
     pcTmp = pszEXPPath;
diff --git a/ogr/ogrsf_frmts/avc/avc_e00write.cpp b/ogr/ogrsf_frmts/avc/avc_e00write.cpp
index 67f5578cc3a4..fa876c51dc6a 100644
--- a/ogr/ogrsf_frmts/avc/avc_e00write.cpp
+++ b/ogr/ogrsf_frmts/avc/avc_e00write.cpp
@@ -11,23 +11,7 @@
  **********************************************************************
  * Copyright (c) 1999-2001, Daniel Morissette
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************
  *
  * $Log: avc_e00write.c,v $
diff --git a/ogr/ogrsf_frmts/avc/avc_mbyte.cpp b/ogr/ogrsf_frmts/avc/avc_mbyte.cpp
index 144523d2ed90..dc101c885a1a 100644
--- a/ogr/ogrsf_frmts/avc/avc_mbyte.cpp
+++ b/ogr/ogrsf_frmts/avc/avc_mbyte.cpp
@@ -9,23 +9,7 @@
  **********************************************************************
  * Copyright (c) 1999-2005, Daniel Morissette
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "avc.h"
diff --git a/ogr/ogrsf_frmts/avc/avc_mbyte.h b/ogr/ogrsf_frmts/avc/avc_mbyte.h
index 92897a9ebe35..97343e1a2c16 100644
--- a/ogr/ogrsf_frmts/avc/avc_mbyte.h
+++ b/ogr/ogrsf_frmts/avc/avc_mbyte.h
@@ -10,23 +10,7 @@
  **********************************************************************
  * Copyright (c) 1999-2005, Daniel Morissette
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************
  *
  * $Log: avc_mbyte.h,v $
diff --git a/ogr/ogrsf_frmts/avc/avc_misc.cpp b/ogr/ogrsf_frmts/avc/avc_misc.cpp
index 0141bb867aaf..6248250c65d9 100644
--- a/ogr/ogrsf_frmts/avc/avc_misc.cpp
+++ b/ogr/ogrsf_frmts/avc/avc_misc.cpp
@@ -10,23 +10,7 @@
  **********************************************************************
  * Copyright (c) 1999-2005, Daniel Morissette
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************
  *
  * $Log: avc_misc.c,v $
diff --git a/ogr/ogrsf_frmts/avc/avc_rawbin.cpp b/ogr/ogrsf_frmts/avc/avc_rawbin.cpp
index 5dcd324f65cf..5e42b9afd841 100644
--- a/ogr/ogrsf_frmts/avc/avc_rawbin.cpp
+++ b/ogr/ogrsf_frmts/avc/avc_rawbin.cpp
@@ -10,23 +10,7 @@
  **********************************************************************
  * Copyright (c) 1999-2005, Daniel Morissette
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************
  *
  * $Log: avc_rawbin.c,v $
diff --git a/ogr/ogrsf_frmts/avc/ogr_avc.h b/ogr/ogrsf_frmts/avc/ogr_avc.h
index 05540e52cc7f..ad19dac67354 100644
--- a/ogr/ogrsf_frmts/avc/ogr_avc.h
+++ b/ogr/ogrsf_frmts/avc/ogr_avc.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_AVC_H_INCLUDED
@@ -77,7 +61,7 @@ class OGRAVCLayer CPL_NON_FINAL : public OGRLayer
 /*                         OGRAVCDataSource                             */
 /************************************************************************/
 
-class OGRAVCDataSource CPL_NON_FINAL : public OGRDataSource
+class OGRAVCDataSource CPL_NON_FINAL : public GDALDataset
 {
   protected:
     bool m_bSRSFetched = false;
@@ -144,8 +128,6 @@ class OGRAVCBinDataSource final : public OGRAVCDataSource
     OGRLayer **papoLayers;
     int nLayers;
 
-    char *pszName;
-
     AVCE00ReadPtr psAVC;
 
   public:
@@ -154,11 +136,6 @@ class OGRAVCBinDataSource final : public OGRAVCDataSource
 
     int Open(const char *, int bTestOpen);
 
-    const char *GetName() override
-    {
-        return pszName;
-    }
-
     int GetLayerCount() override
     {
         return nLayers;
@@ -220,7 +197,6 @@ class OGRAVCE00Layer final : public OGRAVCLayer
 class OGRAVCE00DataSource final : public OGRAVCDataSource
 {
     int nLayers;
-    char *pszName;
     AVCE00ReadE00Ptr psE00;
     OGRAVCE00Layer **papoLayers;
 
@@ -238,11 +214,6 @@ class OGRAVCE00DataSource final : public OGRAVCDataSource
         return psE00;
     }
 
-    const char *GetName() override
-    {
-        return pszName;
-    }
-
     int GetLayerCount() override
     {
         return nLayers;
diff --git a/ogr/ogrsf_frmts/avc/ogravcbindatasource.cpp b/ogr/ogrsf_frmts/avc/ogravcbindatasource.cpp
index 15b941bf39b0..3186e4f0d316 100644
--- a/ogr/ogrsf_frmts/avc/ogravcbindatasource.cpp
+++ b/ogr/ogrsf_frmts/avc/ogravcbindatasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_avc.h"
@@ -35,7 +19,7 @@
 /************************************************************************/
 
 OGRAVCBinDataSource::OGRAVCBinDataSource()
-    : papoLayers(nullptr), nLayers(0), pszName(nullptr), psAVC(nullptr)
+    : papoLayers(nullptr), nLayers(0), psAVC(nullptr)
 {
     poSRS = nullptr;
 }
@@ -53,8 +37,6 @@ OGRAVCBinDataSource::~OGRAVCBinDataSource()
         psAVC = nullptr;
     }
 
-    CPLFree(pszName);
-
     for (int i = 0; i < nLayers; i++)
         delete papoLayers[i];
 
@@ -86,7 +68,6 @@ int OGRAVCBinDataSource::Open(const char *pszNewName, int bTestOpen)
     if (psAVC == nullptr)
         return FALSE;
 
-    pszName = CPLStrdup(pszNewName);
     pszCoverageName = CPLStrdup(psAVC->pszCoverName);
 
     // Read SRS first
diff --git a/ogr/ogrsf_frmts/avc/ogravcbindriver.cpp b/ogr/ogrsf_frmts/avc/ogravcbindriver.cpp
index ccf31fb714fb..358c3725f838 100644
--- a/ogr/ogrsf_frmts/avc/ogravcbindriver.cpp
+++ b/ogr/ogrsf_frmts/avc/ogravcbindriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_avc.h"
diff --git a/ogr/ogrsf_frmts/avc/ogravcbinlayer.cpp b/ogr/ogrsf_frmts/avc/ogravcbinlayer.cpp
index f2e9bf93b96b..a6f77a438c84 100644
--- a/ogr/ogrsf_frmts/avc/ogravcbinlayer.cpp
+++ b/ogr/ogrsf_frmts/avc/ogravcbinlayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_avc.h"
diff --git a/ogr/ogrsf_frmts/avc/ogravcdatasource.cpp b/ogr/ogrsf_frmts/avc/ogravcdatasource.cpp
index bc905e2e6bcd..6bfb7262b6f5 100644
--- a/ogr/ogrsf_frmts/avc/ogravcdatasource.cpp
+++ b/ogr/ogrsf_frmts/avc/ogravcdatasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_avc.h"
diff --git a/ogr/ogrsf_frmts/avc/ogravce00datasource.cpp b/ogr/ogrsf_frmts/avc/ogravce00datasource.cpp
index e3fd6ae7f726..6e0b84fc31a2 100644
--- a/ogr/ogrsf_frmts/avc/ogravce00datasource.cpp
+++ b/ogr/ogrsf_frmts/avc/ogravce00datasource.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2006, James Flemer <jflemer@alum.rpi.edu>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_avc.h"
@@ -37,7 +21,7 @@
 /************************************************************************/
 
 OGRAVCE00DataSource::OGRAVCE00DataSource()
-    : nLayers(0), pszName(nullptr), psE00(nullptr), papoLayers(nullptr)
+    : nLayers(0), psE00(nullptr), papoLayers(nullptr)
 {
 }
 
@@ -54,8 +38,6 @@ OGRAVCE00DataSource::~OGRAVCE00DataSource()
         psE00 = nullptr;
     }
 
-    CPLFree(pszName);
-
     for (int i = 0; i < nLayers; i++)
         delete papoLayers[i];
 
@@ -105,7 +87,6 @@ int OGRAVCE00DataSource::Open(const char *pszNewName, int bTestOpen)
         return FALSE;
     }
 
-    pszName = CPLStrdup(pszNewName);
     /* pszCoverageName = CPLStrdup( psE00->pszCoverName ); */
     pszCoverageName = CPLStrdup(pszNewName);
 
diff --git a/ogr/ogrsf_frmts/avc/ogravce00driver.cpp b/ogr/ogrsf_frmts/avc/ogravce00driver.cpp
index 827db72b7ec9..6cc2f9890439 100644
--- a/ogr/ogrsf_frmts/avc/ogravce00driver.cpp
+++ b/ogr/ogrsf_frmts/avc/ogravce00driver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_avc.h"
diff --git a/ogr/ogrsf_frmts/avc/ogravce00layer.cpp b/ogr/ogrsf_frmts/avc/ogravce00layer.cpp
index e4f87f5a98d7..4c3c0c95cfb2 100644
--- a/ogr/ogrsf_frmts/avc/ogravce00layer.cpp
+++ b/ogr/ogrsf_frmts/avc/ogravce00layer.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2006, James Flemer <jflemer@alum.rpi.edu>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_avc.h"
@@ -314,8 +298,11 @@ bool OGRAVCE00Layer::FormPolygonGeometry(OGRFeature *poFeature, AVCPal *psPAL)
 
     for (int iArc = 0; iArc < psPAL->numArcs; iArc++)
     {
-        if (psPAL->pasArcs[iArc].nArcId == 0)
+        if (psPAL->pasArcs[iArc].nArcId == 0 ||
+            psPAL->pasArcs[iArc].nArcId == INT_MIN)
+        {
             continue;
+        }
 
         // If the other side of the line is the same polygon then this
         // arc is a "bridge" arc and can be discarded.  If we don't discard
@@ -325,8 +312,8 @@ bool OGRAVCE00Layer::FormPolygonGeometry(OGRFeature *poFeature, AVCPal *psPAL)
         if (psPAL->pasArcs[iArc].nAdjPoly == psPAL->nPolyId)
             continue;
 
-        OGRFeature *poArc =
-            poArcLayer->GetFeature(std::abs(psPAL->pasArcs[iArc].nArcId));
+        auto poArc = std::unique_ptr<OGRFeature>(
+            poArcLayer->GetFeature(std::abs(psPAL->pasArcs[iArc].nArcId)));
 
         if (poArc == nullptr)
             return false;
@@ -334,8 +321,7 @@ bool OGRAVCE00Layer::FormPolygonGeometry(OGRFeature *poFeature, AVCPal *psPAL)
         if (poArc->GetGeometryRef() == nullptr)
             return false;
 
-        oArcs.addGeometry(poArc->GetGeometryRef());
-        OGRFeature::DestroyFeature(poArc);
+        oArcs.addGeometryDirectly(poArc->StealGeometry());
     }
 
     OGRErr eErr;
diff --git a/ogr/ogrsf_frmts/avc/ogravclayer.cpp b/ogr/ogrsf_frmts/avc/ogravclayer.cpp
index c068a97f6c79..45eba100b347 100644
--- a/ogr/ogrsf_frmts/avc/ogravclayer.cpp
+++ b/ogr/ogrsf_frmts/avc/ogravclayer.cpp
@@ -10,23 +10,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_avc.h"
diff --git a/ogr/ogrsf_frmts/cad/gdalcaddataset.cpp b/ogr/ogrsf_frmts/cad/gdalcaddataset.cpp
index 8838d9b9d426..a1fe3036ad1d 100644
--- a/ogr/ogrsf_frmts/cad/gdalcaddataset.cpp
+++ b/ogr/ogrsf_frmts/cad/gdalcaddataset.cpp
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016, NextGIS <info@nextgis.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.
+ * SPDX-License-Identifier: MIT
  *******************************************************************************/
 #include "cpl_conv.h"
 #include "gdal_pam.h"
diff --git a/ogr/ogrsf_frmts/cad/libopencad/cadclasses.cpp b/ogr/ogrsf_frmts/cad/libopencad/cadclasses.cpp
index 2c5c038c58e5..85fef4d15256 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/cadclasses.cpp
+++ b/ogr/ogrsf_frmts/cad/libopencad/cadclasses.cpp
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016 NextGIS, <info@nextgis.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.
+  * SPDX-License-Identifier: MIT
  *******************************************************************************/
 #include "cadclasses.h"
 #include "opencad.h"
diff --git a/ogr/ogrsf_frmts/cad/libopencad/cadclasses.h b/ogr/ogrsf_frmts/cad/libopencad/cadclasses.h
index 680ee8745f58..bfce1527370f 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/cadclasses.h
+++ b/ogr/ogrsf_frmts/cad/libopencad/cadclasses.h
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016 NextGIS, <info@nextgis.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.
+  * SPDX-License-Identifier: MIT
  *******************************************************************************/
 #ifndef CADCLASSES_H
 #define CADCLASSES_H
diff --git a/ogr/ogrsf_frmts/cad/libopencad/cadcolors.cpp b/ogr/ogrsf_frmts/cad/libopencad/cadcolors.cpp
index c5185d16a860..a4ce4cb4ad74 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/cadcolors.cpp
+++ b/ogr/ogrsf_frmts/cad/libopencad/cadcolors.cpp
@@ -8,23 +8,7 @@
  *
  *  Copyright (c) 2016 NextGIS, <info@nextgis.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.
+  * SPDX-License-Identifier: MIT
  *******************************************************************************/
  #include "cadcolors.h"
 
diff --git a/ogr/ogrsf_frmts/cad/libopencad/cadcolors.h b/ogr/ogrsf_frmts/cad/libopencad/cadcolors.h
index 4182aafb9a48..0dc282516f29 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/cadcolors.h
+++ b/ogr/ogrsf_frmts/cad/libopencad/cadcolors.h
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016 NextGIS, <info@nextgis.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.
+  * SPDX-License-Identifier: MIT
  *******************************************************************************/
 #ifndef CADCOLORS_H
 #define CADCOLORS_H
diff --git a/ogr/ogrsf_frmts/cad/libopencad/caddictionary.cpp b/ogr/ogrsf_frmts/cad/libopencad/caddictionary.cpp
index 388239829d90..d26e6d2e9c1c 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/caddictionary.cpp
+++ b/ogr/ogrsf_frmts/cad/libopencad/caddictionary.cpp
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016 NextGIS, <info@nextgis.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.
+  * SPDX-License-Identifier: MIT
  *******************************************************************************/
 
 #include "caddictionary.h"
diff --git a/ogr/ogrsf_frmts/cad/libopencad/caddictionary.h b/ogr/ogrsf_frmts/cad/libopencad/caddictionary.h
index 5771d4e9028f..5239084d4fac 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/caddictionary.h
+++ b/ogr/ogrsf_frmts/cad/libopencad/caddictionary.h
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016 NextGIS, <info@nextgis.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.
+  * SPDX-License-Identifier: MIT
  *******************************************************************************/
 #ifndef CADDICTIONARY_H
 #define CADDICTIONARY_H
diff --git a/ogr/ogrsf_frmts/cad/libopencad/cadfile.cpp b/ogr/ogrsf_frmts/cad/libopencad/cadfile.cpp
index 1294303ba4cb..73a913725458 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/cadfile.cpp
+++ b/ogr/ogrsf_frmts/cad/libopencad/cadfile.cpp
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016-2019 NextGIS, <info@nextgis.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.
+  * SPDX-License-Identifier: MIT
  *******************************************************************************/
 #include "cadfile.h"
 #include "opencad_api.h"
diff --git a/ogr/ogrsf_frmts/cad/libopencad/cadfile.h b/ogr/ogrsf_frmts/cad/libopencad/cadfile.h
index 9ab62bb541cc..52f431738e75 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/cadfile.h
+++ b/ogr/ogrsf_frmts/cad/libopencad/cadfile.h
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016 NextGIS, <info@nextgis.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.
+  * SPDX-License-Identifier: MIT
  *******************************************************************************/
 #ifndef CADFILE_H
 #define CADFILE_H
diff --git a/ogr/ogrsf_frmts/cad/libopencad/cadfileio.cpp b/ogr/ogrsf_frmts/cad/libopencad/cadfileio.cpp
index 184e47cf768f..9258f35b2277 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/cadfileio.cpp
+++ b/ogr/ogrsf_frmts/cad/libopencad/cadfileio.cpp
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016 NextGIS, <info@nextgis.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.
+  * SPDX-License-Identifier: MIT
  ******************************************************************************/
 #include "cadfileio.h"
 
diff --git a/ogr/ogrsf_frmts/cad/libopencad/cadfileio.h b/ogr/ogrsf_frmts/cad/libopencad/cadfileio.h
index 2808f6a3a122..0841b905f115 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/cadfileio.h
+++ b/ogr/ogrsf_frmts/cad/libopencad/cadfileio.h
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016-2019 NextGIS, <info@nextgis.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.
+  * SPDX-License-Identifier: MIT
  ******************************************************************************/
 #ifndef CADFILEIO_H
 #define CADFILEIO_H
diff --git a/ogr/ogrsf_frmts/cad/libopencad/cadfilestreamio.cpp b/ogr/ogrsf_frmts/cad/libopencad/cadfilestreamio.cpp
index 1366d462a72c..ff18bc3261e9 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/cadfilestreamio.cpp
+++ b/ogr/ogrsf_frmts/cad/libopencad/cadfilestreamio.cpp
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016-2019 NextGIS, <info@nextgis.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.
+  * SPDX-License-Identifier: MIT
 *******************************************************************************/
 #include "cadfilestreamio.h"
 
diff --git a/ogr/ogrsf_frmts/cad/libopencad/cadfilestreamio.h b/ogr/ogrsf_frmts/cad/libopencad/cadfilestreamio.h
index 7acfb7cf4fd6..ca56b359d197 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/cadfilestreamio.h
+++ b/ogr/ogrsf_frmts/cad/libopencad/cadfilestreamio.h
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016 NextGIS, <info@nextgis.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.
+  * SPDX-License-Identifier: MIT
  ******************************************************************************/
 #ifndef CADFILESTREAMIO_H
 #define CADFILESTREAMIO_H
diff --git a/ogr/ogrsf_frmts/cad/libopencad/cadgeometry.cpp b/ogr/ogrsf_frmts/cad/libopencad/cadgeometry.cpp
index edc67620cef9..a431108c2eb9 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/cadgeometry.cpp
+++ b/ogr/ogrsf_frmts/cad/libopencad/cadgeometry.cpp
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016 NextGIS, <info@nextgis.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.
+  * SPDX-License-Identifier: MIT
  *******************************************************************************/
 #include "cadgeometry.h"
 
diff --git a/ogr/ogrsf_frmts/cad/libopencad/cadgeometry.h b/ogr/ogrsf_frmts/cad/libopencad/cadgeometry.h
index 7f8241c39f9f..5e771b70587c 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/cadgeometry.h
+++ b/ogr/ogrsf_frmts/cad/libopencad/cadgeometry.h
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016 NextGIS, <info@nextgis.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.
+  * SPDX-License-Identifier: MIT
  *******************************************************************************/
 #ifndef CADGEOMETRIES_H
 #define CADGEOMETRIES_H
diff --git a/ogr/ogrsf_frmts/cad/libopencad/cadheader.cpp b/ogr/ogrsf_frmts/cad/libopencad/cadheader.cpp
index c1349230de71..e4f25c04e099 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/cadheader.cpp
+++ b/ogr/ogrsf_frmts/cad/libopencad/cadheader.cpp
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016 NextGIS, <info@nextgis.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.
+  * SPDX-License-Identifier: MIT
  *******************************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/cad/libopencad/cadheader.h b/ogr/ogrsf_frmts/cad/libopencad/cadheader.h
index 428172f21ebb..7581674a9984 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/cadheader.h
+++ b/ogr/ogrsf_frmts/cad/libopencad/cadheader.h
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016 NextGIS, <info@nextgis.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.
+  * SPDX-License-Identifier: MIT
  *******************************************************************************/
 #ifndef CADHEADER_H
 #define CADHEADER_H
diff --git a/ogr/ogrsf_frmts/cad/libopencad/cadlayer.cpp b/ogr/ogrsf_frmts/cad/libopencad/cadlayer.cpp
index 95c9353a92c1..63bbd09933c4 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/cadlayer.cpp
+++ b/ogr/ogrsf_frmts/cad/libopencad/cadlayer.cpp
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016-2018 NextGIS, <info@nextgis.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.
+  * SPDX-License-Identifier: MIT
  *******************************************************************************/
 #include "cadlayer.h"
 #include "cadfile.h"
diff --git a/ogr/ogrsf_frmts/cad/libopencad/cadlayer.h b/ogr/ogrsf_frmts/cad/libopencad/cadlayer.h
index 8cdf713a1470..626f766935d8 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/cadlayer.h
+++ b/ogr/ogrsf_frmts/cad/libopencad/cadlayer.h
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016 NextGIS, <info@nextgis.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.
+  * SPDX-License-Identifier: MIT
  *******************************************************************************/
 #ifndef CADLAYER_H
 #define CADLAYER_H
diff --git a/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp b/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp
index 01057b1d51ef..a6852cdf5fda 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp
+++ b/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016-2018 NextGIS, <info@nextgis.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.
+  * SPDX-License-Identifier: MIT
  *******************************************************************************/
 
 #include "cadobjects.h"
diff --git a/ogr/ogrsf_frmts/cad/libopencad/cadobjects.h b/ogr/ogrsf_frmts/cad/libopencad/cadobjects.h
index ed46ae4007e0..6e2d6f73c17d 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/cadobjects.h
+++ b/ogr/ogrsf_frmts/cad/libopencad/cadobjects.h
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016-2018 NextGIS, <info@nextgis.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.
+  * SPDX-License-Identifier: MIT
  *******************************************************************************/
 
 #ifndef CADOBJECTS_H
diff --git a/ogr/ogrsf_frmts/cad/libopencad/cadtables.cpp b/ogr/ogrsf_frmts/cad/libopencad/cadtables.cpp
index a04dd37502c3..22ebdec6c416 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/cadtables.cpp
+++ b/ogr/ogrsf_frmts/cad/libopencad/cadtables.cpp
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016-2018 NextGIS, <info@nextgis.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.
+  * SPDX-License-Identifier: MIT
  *******************************************************************************/
 #include "cadtables.h"
 #include "opencad_api.h"
diff --git a/ogr/ogrsf_frmts/cad/libopencad/cadtables.h b/ogr/ogrsf_frmts/cad/libopencad/cadtables.h
index 2230ed76e100..033c7d0c4098 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/cadtables.h
+++ b/ogr/ogrsf_frmts/cad/libopencad/cadtables.h
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016 NextGIS, <info@nextgis.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.
+  * SPDX-License-Identifier: MIT
  *******************************************************************************/
 #ifndef CADTABLES_H
 #define CADTABLES_H
diff --git a/ogr/ogrsf_frmts/cad/libopencad/dwg/CMakeLists.txt b/ogr/ogrsf_frmts/cad/libopencad/dwg/CMakeLists.txt
deleted file mode 100644
index 8b137891791f..000000000000
--- a/ogr/ogrsf_frmts/cad/libopencad/dwg/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ogr/ogrsf_frmts/cad/libopencad/dwg/io.cpp b/ogr/ogrsf_frmts/cad/libopencad/dwg/io.cpp
index a574047a6fa5..ddf838c4f5e5 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/dwg/io.cpp
+++ b/ogr/ogrsf_frmts/cad/libopencad/dwg/io.cpp
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016 NextGIS, <info@nextgis.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.
+  * SPDX-License-Identifier: MIT
  *******************************************************************************/
 #include "io.h"
 
diff --git a/ogr/ogrsf_frmts/cad/libopencad/dwg/io.h b/ogr/ogrsf_frmts/cad/libopencad/dwg/io.h
index 0f3f42e72694..72f55527a847 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/dwg/io.h
+++ b/ogr/ogrsf_frmts/cad/libopencad/dwg/io.h
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016 NextGIS, <info@nextgis.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.
+  * SPDX-License-Identifier: MIT
  *******************************************************************************/
 #ifndef DWG_IO_H
 #define DWG_IO_H
diff --git a/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp b/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
index 417427d85353..e816802e0f8c 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
+++ b/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016-2018 NextGIS, <info@nextgis.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.
+  * SPDX-License-Identifier: MIT
  *******************************************************************************/
 #include "cadgeometry.h"
 #include "cadobjects.h"
diff --git a/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.h b/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.h
index e0f1da1ae7c7..f779cee77b77 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.h
+++ b/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.h
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016-2018 NextGIS, <info@nextgis.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.
+  * SPDX-License-Identifier: MIT
  *******************************************************************************/
 #ifndef DWG_R2000_H_H
 #define DWG_R2000_H_H
diff --git a/ogr/ogrsf_frmts/cad/libopencad/opencad.cpp b/ogr/ogrsf_frmts/cad/libopencad/opencad.cpp
index da2d83050cfe..6a9a44501a1c 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/opencad.cpp
+++ b/ogr/ogrsf_frmts/cad/libopencad/opencad.cpp
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016-2019 NextGIS, <info@nextgis.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.
+  * SPDX-License-Identifier: MIT
  *******************************************************************************/
 #include "opencad_api.h"
 #include "cadfilestreamio.h"
diff --git a/ogr/ogrsf_frmts/cad/libopencad/opencad.h b/ogr/ogrsf_frmts/cad/libopencad/opencad.h
index b2ba28dec6b6..a6e082412a21 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/opencad.h
+++ b/ogr/ogrsf_frmts/cad/libopencad/opencad.h
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016-2017 NextGIS, <info@nextgis.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.
+  * SPDX-License-Identifier: MIT
  *******************************************************************************/
 #ifndef OPENCAD_H
 #define OPENCAD_H
diff --git a/ogr/ogrsf_frmts/cad/libopencad/opencad_api.h b/ogr/ogrsf_frmts/cad/libopencad/opencad_api.h
index 416dcfcdbbd3..8adc6fa15d8c 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/opencad_api.h
+++ b/ogr/ogrsf_frmts/cad/libopencad/opencad_api.h
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016 NextGIS, <info@nextgis.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.
+  * SPDX-License-Identifier: MIT
  *******************************************************************************/
 #ifndef OPENCAD_API_H
 #define OPENCAD_API_H
diff --git a/ogr/ogrsf_frmts/cad/ogr_cad.h b/ogr/ogrsf_frmts/cad/ogr_cad.h
index d4da1af1e344..486d5cc2eb14 100644
--- a/ogr/ogrsf_frmts/cad/ogr_cad.h
+++ b/ogr/ogrsf_frmts/cad/ogr_cad.h
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016, NextGIS
  *
- *  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.
+ * SPDX-License-Identifier: MIT
  *******************************************************************************/
 #ifndef OGR_CAD_H_INCLUDED
 #define OGR_CAD_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/cad/ogrcaddriver.cpp b/ogr/ogrsf_frmts/cad/ogrcaddriver.cpp
index 9f20f9ffc0ba..dda528734b9c 100644
--- a/ogr/ogrsf_frmts/cad/ogrcaddriver.cpp
+++ b/ogr/ogrsf_frmts/cad/ogrcaddriver.cpp
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016, NextGIS
  *
- *  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.
+ * SPDX-License-Identifier: MIT
  *******************************************************************************/
 #include "ogr_cad.h"
 #include "vsilfileio.h"
diff --git a/ogr/ogrsf_frmts/cad/ogrcaddrivercore.cpp b/ogr/ogrsf_frmts/cad/ogrcaddrivercore.cpp
index 940f05fc9be6..a84dc39d6fda 100644
--- a/ogr/ogrsf_frmts/cad/ogrcaddrivercore.cpp
+++ b/ogr/ogrsf_frmts/cad/ogrcaddrivercore.cpp
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016, NextGIS
  *
- *  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.
+ * SPDX-License-Identifier: MIT
  *******************************************************************************/
 
 #include "ogrsf_frmts.h"
diff --git a/ogr/ogrsf_frmts/cad/ogrcaddrivercore.h b/ogr/ogrsf_frmts/cad/ogrcaddrivercore.h
index 73456b273074..6dfca6665239 100644
--- a/ogr/ogrsf_frmts/cad/ogrcaddrivercore.h
+++ b/ogr/ogrsf_frmts/cad/ogrcaddrivercore.h
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016, NextGIS
  *
- *  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.
+ * SPDX-License-Identifier: MIT
  *******************************************************************************/
 
 #ifndef OGRCADDRIVERCORE_H
diff --git a/ogr/ogrsf_frmts/cad/ogrcadlayer.cpp b/ogr/ogrsf_frmts/cad/ogrcadlayer.cpp
index 664386bf2caa..0e62c5adb175 100644
--- a/ogr/ogrsf_frmts/cad/ogrcadlayer.cpp
+++ b/ogr/ogrsf_frmts/cad/ogrcadlayer.cpp
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016-2019, NextGIS <info@nextgis.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.
+ * SPDX-License-Identifier: MIT
  *******************************************************************************/
 #include "cpl_conv.h"
 #include "ogr_cad.h"
diff --git a/ogr/ogrsf_frmts/cad/vsilfileio.cpp b/ogr/ogrsf_frmts/cad/vsilfileio.cpp
index 30915328f2d1..16976ce2b808 100644
--- a/ogr/ogrsf_frmts/cad/vsilfileio.cpp
+++ b/ogr/ogrsf_frmts/cad/vsilfileio.cpp
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016 NextGIS, <info@nextgis.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.
+ * SPDX-License-Identifier: MIT
  *******************************************************************************/
 #include "vsilfileio.h"
 
diff --git a/ogr/ogrsf_frmts/cad/vsilfileio.h b/ogr/ogrsf_frmts/cad/vsilfileio.h
index ede199e01203..4c44aa6680d6 100644
--- a/ogr/ogrsf_frmts/cad/vsilfileio.h
+++ b/ogr/ogrsf_frmts/cad/vsilfileio.h
@@ -10,23 +10,7 @@
  *  Copyright (c) 2016 Alexandr Borzykh
  *  Copyright (c) 2016 NextGIS, <info@nextgis.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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************/
 #ifndef VSILFILEIO_H
 #define VSILFILEIO_H
diff --git a/ogr/ogrsf_frmts/carto/CMakeLists.txt b/ogr/ogrsf_frmts/carto/CMakeLists.txt
index 01a5c295c076..0d3478c7b77b 100644
--- a/ogr/ogrsf_frmts/carto/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/carto/CMakeLists.txt
@@ -17,8 +17,7 @@ if(NOT TARGET ogr_Carto)
 endif()
 
 gdal_standard_includes(ogr_Carto)
-target_include_directories(ogr_Carto PRIVATE $<TARGET_PROPERTY:ogr_PGDump,SOURCE_DIR>
-                                             $<TARGET_PROPERTY:ogr_geojson,SOURCE_DIR>)
+target_include_directories(ogr_Carto PRIVATE $<TARGET_PROPERTY:ogr_PGDump,SOURCE_DIR>)
 if (GDAL_USE_JSONC_INTERNAL)
   gdal_add_vendored_lib(ogr_Carto libjson)
 else ()
diff --git a/ogr/ogrsf_frmts/carto/ogr_carto.h b/ogr/ogrsf_frmts/carto/ogr_carto.h
index 4919e1320f10..a5f00866a194 100644
--- a/ogr/ogrsf_frmts/carto/ogr_carto.h
+++ b/ogr/ogrsf_frmts/carto/ogr_carto.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_CARTO_H_INCLUDED
@@ -266,9 +250,8 @@ class OGRCARTOResultLayer final : public OGRCARTOLayer
 /*                           OGRCARTODataSource                         */
 /************************************************************************/
 
-class OGRCARTODataSource final : public OGRDataSource
+class OGRCARTODataSource final : public GDALDataset
 {
-    char *pszName;
     char *pszAccount;
 
     OGRCARTOTableLayer **papoLayers;
@@ -297,18 +280,12 @@ class OGRCARTODataSource final : public OGRDataSource
 
     int Open(const char *pszFilename, char **papszOpenOptions, int bUpdate);
 
-    virtual const char *GetName() override
-    {
-        return pszName;
-    }
-
     virtual int GetLayerCount() override
     {
         return nLayers;
     }
 
     virtual OGRLayer *GetLayer(int) override;
-    virtual OGRLayer *GetLayerByName(const char *) override;
 
     virtual int TestCapability(const char *) override;
 
diff --git a/ogr/ogrsf_frmts/carto/ogrcartodatasource.cpp b/ogr/ogrsf_frmts/carto/ogrcartodatasource.cpp
index a50ec0d778ac..44a5b1947220 100644
--- a/ogr/ogrsf_frmts/carto/ogrcartodatasource.cpp
+++ b/ogr/ogrsf_frmts/carto/ogrcartodatasource.cpp
@@ -7,36 +7,20 @@
  ******************************************************************************
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_carto.h"
 #include "ogr_pgdump.h"
-#include "ogrgeojsonreader.h"
+#include "ogrlibjsonutils.h"
 
 /************************************************************************/
 /*                        OGRCARTODataSource()                        */
 /************************************************************************/
 
 OGRCARTODataSource::OGRCARTODataSource()
-    : pszName(nullptr), pszAccount(nullptr), papoLayers(nullptr), nLayers(0),
-      bReadWrite(false), bBatchInsert(true), bCopyMode(true), bUseHTTPS(false),
+    : pszAccount(nullptr), papoLayers(nullptr), nLayers(0), bReadWrite(false),
+      bBatchInsert(true), bCopyMode(true), bUseHTTPS(false),
       bMustCleanPersistent(false), bHasOGRMetadataFunction(-1),
       nPostGISMajor(2), nPostGISMinor(0)
 {
@@ -62,7 +46,6 @@ OGRCARTODataSource::~OGRCARTODataSource()
         CSLDestroy(papszOptions);
     }
 
-    CPLFree(pszName);
     CPLFree(pszAccount);
 }
 
@@ -98,16 +81,6 @@ OGRLayer *OGRCARTODataSource::GetLayer(int iLayer)
         return papoLayers[iLayer];
 }
 
-/************************************************************************/
-/*                          GetLayerByName()                            */
-/************************************************************************/
-
-OGRLayer *OGRCARTODataSource::GetLayerByName(const char *pszLayerName)
-{
-    OGRLayer *poLayer = OGRDataSource::GetLayerByName(pszLayerName);
-    return poLayer;
-}
-
 /************************************************************************/
 /*                     OGRCARTOGetOptionValue()                       */
 /************************************************************************/
@@ -144,7 +117,6 @@ int OGRCARTODataSource::Open(const char *pszFilename, char **papszOpenOptionsIn,
     if (bCopyMode)
         bBatchInsert = TRUE;
 
-    pszName = CPLStrdup(pszFilename);
     if (CSLFetchNameValue(papszOpenOptionsIn, "ACCOUNT"))
         pszAccount =
             CPLStrdup(CSLFetchNameValue(papszOpenOptionsIn, "ACCOUNT"));
@@ -888,8 +860,8 @@ OGRLayer *OGRCARTODataSource::ExecuteSQLInternal(const char *pszSQLCommand,
     /*      Use generic implementation for recognized dialects              */
     /* -------------------------------------------------------------------- */
     if (IsGenericSQLDialect(pszDialect))
-        return OGRDataSource::ExecuteSQL(pszSQLCommand, poSpatialFilter,
-                                         pszDialect);
+        return GDALDataset::ExecuteSQL(pszSQLCommand, poSpatialFilter,
+                                       pszDialect);
 
     /* -------------------------------------------------------------------- */
     /*      Special case DELLAYER: command.                                 */
diff --git a/ogr/ogrsf_frmts/carto/ogrcartodriver.cpp b/ogr/ogrsf_frmts/carto/ogrcartodriver.cpp
index b148a4ee9bd5..8489a8dddcd4 100644
--- a/ogr/ogrsf_frmts/carto/ogrcartodriver.cpp
+++ b/ogr/ogrsf_frmts/carto/ogrcartodriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_carto.h"
diff --git a/ogr/ogrsf_frmts/carto/ogrcartodrivercore.cpp b/ogr/ogrsf_frmts/carto/ogrcartodrivercore.cpp
index f0e986f24804..2d82dc6a0383 100644
--- a/ogr/ogrsf_frmts/carto/ogrcartodrivercore.cpp
+++ b/ogr/ogrsf_frmts/carto/ogrcartodrivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
diff --git a/ogr/ogrsf_frmts/carto/ogrcartodrivercore.h b/ogr/ogrsf_frmts/carto/ogrcartodrivercore.h
index 2ea727896617..690ebc53a5cb 100644
--- a/ogr/ogrsf_frmts/carto/ogrcartodrivercore.h
+++ b/ogr/ogrsf_frmts/carto/ogrcartodrivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRCARTODRIVERCORE_H
diff --git a/ogr/ogrsf_frmts/carto/ogrcartolayer.cpp b/ogr/ogrsf_frmts/carto/ogrcartolayer.cpp
index 11661b08ae0b..991a399e0a48 100644
--- a/ogr/ogrsf_frmts/carto/ogrcartolayer.cpp
+++ b/ogr/ogrsf_frmts/carto/ogrcartolayer.cpp
@@ -7,28 +7,12 @@
  ******************************************************************************
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_carto.h"
 #include "ogr_p.h"
-#include "ogrgeojsonreader.h"
+#include "ogrlibjsonutils.h"
 
 /************************************************************************/
 /*                         OGRCARTOLayer()                            */
diff --git a/ogr/ogrsf_frmts/carto/ogrcartoresultlayer.cpp b/ogr/ogrsf_frmts/carto/ogrcartoresultlayer.cpp
index 7279575c3f6d..67c76347b373 100644
--- a/ogr/ogrsf_frmts/carto/ogrcartoresultlayer.cpp
+++ b/ogr/ogrsf_frmts/carto/ogrcartoresultlayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_carto.h"
diff --git a/ogr/ogrsf_frmts/carto/ogrcartotablelayer.cpp b/ogr/ogrsf_frmts/carto/ogrcartotablelayer.cpp
index 695632dcd17c..50e263a4d04d 100644
--- a/ogr/ogrsf_frmts/carto/ogrcartotablelayer.cpp
+++ b/ogr/ogrsf_frmts/carto/ogrcartotablelayer.cpp
@@ -7,29 +7,13 @@
  ******************************************************************************
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_carto.h"
 #include "ogr_p.h"
 #include "ogr_pgdump.h"
-#include "ogrgeojsonreader.h"
+#include "ogrlibjsonutils.h"
 
 /************************************************************************/
 /*                    OGRCARTOEscapeIdentifier( )                     */
@@ -1634,11 +1618,11 @@ void OGRCARTOTableLayer::BuildWhere()
         char szBox3D_2[128];
         char *pszComma;
 
-        CPLsnprintf(szBox3D_1, sizeof(szBox3D_1), "%.18g %.18g", sEnvelope.MinX,
+        CPLsnprintf(szBox3D_1, sizeof(szBox3D_1), "%.17g %.17g", sEnvelope.MinX,
                     sEnvelope.MinY);
         while ((pszComma = strchr(szBox3D_1, ',')) != nullptr)
             *pszComma = '.';
-        CPLsnprintf(szBox3D_2, sizeof(szBox3D_2), "%.18g %.18g", sEnvelope.MaxX,
+        CPLsnprintf(szBox3D_2, sizeof(szBox3D_2), "%.17g %.17g", sEnvelope.MaxX,
                     sEnvelope.MaxY);
         while ((pszComma = strchr(szBox3D_2, ',')) != nullptr)
             *pszComma = '.';
diff --git a/ogr/ogrsf_frmts/csv/ogr_csv.h b/ogr/ogrsf_frmts/csv/ogr_csv.h
index 7bac0102d471..a5054e92d9b6 100644
--- a/ogr/ogrsf_frmts/csv/ogr_csv.h
+++ b/ogr/ogrsf_frmts/csv/ogr_csv.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2004,  Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_CSV_H_INCLUDED
@@ -136,7 +120,7 @@ class OGRCSVLayer final : public IOGRCSVLayer, public OGRLayer
 
     GIntBig nTotalFeatures;
 
-    char **AutodetectFieldTypes(char **papszOpenOptions, int nFieldCount);
+    char **AutodetectFieldTypes(CSLConstList papszOpenOptions, int nFieldCount);
 
     bool bWarningBadTypeOrWidth;
     bool bKeepSourceColumns;
@@ -222,7 +206,7 @@ class OGRCSVLayer final : public IOGRCSVLayer, public OGRLayer
 
     void BuildFeatureDefn(const char *pszNfdcGeomField = nullptr,
                           const char *pszGeonamesGeomFieldPrefix = nullptr,
-                          char **papszOpenOptions = nullptr);
+                          CSLConstList papszOpenOptions = nullptr);
 
     void ResetReading() override;
     OGRFeature *GetNextFeature() override;
@@ -279,7 +263,7 @@ class OGRCSVLayer final : public IOGRCSVLayer, public OGRLayer
 /*                           OGRCSVDataSource                           */
 /************************************************************************/
 
-class OGRCSVDataSource final : public OGRDataSource
+class OGRCSVDataSource final : public GDALDataset
 {
     char *pszName = nullptr;
 
@@ -295,17 +279,12 @@ class OGRCSVDataSource final : public OGRDataSource
     OGRCSVDataSource();
     virtual ~OGRCSVDataSource() override;
 
-    int Open(const char *pszFilename, int bUpdate, int bForceAccept,
-             char **papszOpenOptions = nullptr);
-    bool OpenTable(const char *pszFilename, char **papszOpenOptions,
+    bool Open(const char *pszFilename, bool bUpdate, bool bForceOpen,
+              CSLConstList papszOpenOptions, bool bSingleDriver);
+    bool OpenTable(const char *pszFilename, CSLConstList papszOpenOptions,
                    const char *pszNfdcRunwaysGeomField = nullptr,
                    const char *pszGeonamesGeomFieldPrefix = nullptr);
 
-    const char *GetName() override
-    {
-        return pszName;
-    }
-
     int GetLayerCount() override
     {
         return static_cast<int>(m_apoLayers.size());
diff --git a/ogr/ogrsf_frmts/csv/ogrcsvdatasource.cpp b/ogr/ogrsf_frmts/csv/ogrcsvdatasource.cpp
index 53e3ef5c2296..1f4f49b03823 100644
--- a/ogr/ogrsf_frmts/csv/ogrcsvdatasource.cpp
+++ b/ogr/ogrsf_frmts/csv/ogrcsvdatasource.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -59,7 +43,7 @@ class OGRCSVEditableLayerSynchronizer final
 
   public:
     OGRCSVEditableLayerSynchronizer(OGRCSVLayer *poCSVLayer,
-                                    char **papszOpenOptions)
+                                    CSLConstList papszOpenOptions)
         : m_poCSVLayer(poCSVLayer),
           m_papszOpenOptions(CSLDuplicate(papszOpenOptions))
     {
@@ -317,7 +301,7 @@ class OGRCSVEditableLayer final : public IOGRCSVLayer, public OGREditableLayer
     std::set<CPLString> m_oSetFields;
 
   public:
-    OGRCSVEditableLayer(OGRCSVLayer *poCSVLayer, char **papszOpenOptions);
+    OGRCSVEditableLayer(OGRCSVLayer *poCSVLayer, CSLConstList papszOpenOptions);
 
     OGRLayer *GetLayer() override
     {
@@ -344,7 +328,7 @@ class OGRCSVEditableLayer final : public IOGRCSVLayer, public OGREditableLayer
 /************************************************************************/
 
 OGRCSVEditableLayer::OGRCSVEditableLayer(OGRCSVLayer *poCSVLayer,
-                                         char **papszOpenOptions)
+                                         CSLConstList papszOpenOptions)
     : OGREditableLayer(
           poCSVLayer, true,
           new OGRCSVEditableLayerSynchronizer(poCSVLayer, papszOpenOptions),
@@ -510,8 +494,9 @@ CPLString OGRCSVDataSource::GetRealExtension(CPLString osFilename)
 /*                                Open()                                */
 /************************************************************************/
 
-int OGRCSVDataSource::Open(const char *pszFilename, int bUpdateIn,
-                           int bForceOpen, char **papszOpenOptionsIn)
+bool OGRCSVDataSource::Open(const char *pszFilename, bool bUpdateIn,
+                            bool bForceOpen, CSLConstList papszOpenOptionsIn,
+                            bool bSingleDriver)
 
 {
     pszName = CPLStrdup(pszFilename);
@@ -528,11 +513,12 @@ int OGRCSVDataSource::Open(const char *pszFilename, int bUpdateIn,
     const CPLString osBaseFilename = CPLGetFilename(pszFilename);
     const CPLString osExt = GetRealExtension(osFilename);
 
-    bool bIgnoreExtension = STARTS_WITH_CI(osFilename, "CSV:");
+    bool bIgnoreExtension = bSingleDriver;
     bool bUSGeonamesFile = false;
-    if (bIgnoreExtension)
+    if (STARTS_WITH_CI(osFilename, "CSV:"))
     {
-        osFilename = osFilename + 4;
+        bIgnoreExtension = true;
+        osFilename = osFilename.substr(strlen("CSV:"));
     }
 
     // Those are *not* real .XLS files, but text file with tab as column
@@ -736,7 +722,7 @@ int OGRCSVDataSource::Open(const char *pszFilename, int bUpdateIn,
 /************************************************************************/
 
 bool OGRCSVDataSource::OpenTable(const char *pszFilename,
-                                 char **papszOpenOptionsIn,
+                                 CSLConstList papszOpenOptionsIn,
                                  const char *pszNfdcRunwaysGeomField,
                                  const char *pszGeonamesGeomFieldPrefix)
 
@@ -1085,17 +1071,19 @@ OGRCSVDataSource::ICreateLayer(const char *pszLayerName,
             }
             else
             {
-                CPLError(CE_Warning, CPLE_AppDefined,
+                CPLError(CE_Failure, CPLE_AppDefined,
                          "Geometry type %s is not compatible with "
-                         "GEOMETRY=AS_XYZ.",
-                         OGRGeometryTypeToName(eGType));
+                         "GEOMETRY=%s.",
+                         OGRGeometryTypeToName(eGType), pszGeometry);
+                return nullptr;
             }
         }
         else
         {
-            CPLError(CE_Warning, CPLE_AppDefined,
+            CPLError(CE_Failure, CPLE_AppDefined,
                      "Unsupported value %s for creation option GEOMETRY",
                      pszGeometry);
+            return nullptr;
         }
     }
 
diff --git a/ogr/ogrsf_frmts/csv/ogrcsvdriver.cpp b/ogr/ogrsf_frmts/csv/ogrcsvdriver.cpp
index 74fb83eca498..1611cfab692b 100644
--- a/ogr/ogrsf_frmts/csv/ogrcsvdriver.cpp
+++ b/ogr/ogrsf_frmts/csv/ogrcsvdriver.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -56,6 +40,9 @@ static int OGRCSVDriverIdentify(GDALOpenInfo *poOpenInfo)
 {
     if (poOpenInfo->fpL != nullptr)
     {
+        if (poOpenInfo->IsSingleAllowedDriver("CSV"))
+            return TRUE;
+
         const CPLString osBaseFilename =
             CPLGetFilename(poOpenInfo->pszFilename);
         const CPLString osExt =
@@ -114,6 +101,9 @@ static int OGRCSVDriverIdentify(GDALOpenInfo *poOpenInfo)
     }
     else if (poOpenInfo->bIsDirectory)
     {
+        if (poOpenInfo->IsSingleAllowedDriver("CSV"))
+            return TRUE;
+
         return -1;  // Unsure.
     }
 
@@ -160,15 +150,18 @@ static GDALDataset *OGRCSVDriverOpen(GDALOpenInfo *poOpenInfo)
         }
     }
 
-    OGRCSVDataSource *poDS = new OGRCSVDataSource();
+    auto poDSUniquePtr = std::make_unique<OGRCSVDataSource>();
 
-    if (!poDS->Open(poOpenInfo->pszFilename, poOpenInfo->eAccess == GA_Update,
-                    FALSE, poOpenInfo->papszOpenOptions))
+    if (!poDSUniquePtr->Open(poOpenInfo->pszFilename,
+                             poOpenInfo->eAccess == GA_Update, false,
+                             poOpenInfo->papszOpenOptions,
+                             poOpenInfo->IsSingleAllowedDriver("CSV")))
     {
-        delete poDS;
-        poDS = nullptr;
+        poDSUniquePtr.reset();
     }
 
+    auto poDS = poDSUniquePtr.release();
+
     if (poOpenInfo->eAccess == GA_Update && poDS != nullptr)
     {
         CPLMutexHolderD(&hMutex);
@@ -238,15 +231,16 @@ OGRCSVDriverCreate(const char *pszName, CPL_UNUSED int nBands,
     }
 
     // Force it to open as a datasource.
-    OGRCSVDataSource *poDS = new OGRCSVDataSource();
+    auto poDS = std::make_unique<OGRCSVDataSource>();
 
     if (EQUAL(CPLGetExtension(pszName), "csv"))
     {
         poDS->CreateForSingleFile(osDirName, pszName);
     }
-    else if (!poDS->Open(osDirName, TRUE, TRUE))
+    else if (!poDS->Open(osDirName, /* bUpdate = */ true,
+                         /* bForceAccept = */ true, nullptr,
+                         /* bSingleDriver = */ true))
     {
-        delete poDS;
         return nullptr;
     }
 
@@ -254,7 +248,7 @@ OGRCSVDriverCreate(const char *pszName, CPL_UNUSED int nBands,
     if (pszGeometry != nullptr && EQUAL(pszGeometry, "AS_WKT"))
         poDS->EnableGeometryFields();
 
-    return poDS;
+    return poDS.release();
 }
 
 /************************************************************************/
diff --git a/ogr/ogrsf_frmts/csv/ogrcsvlayer.cpp b/ogr/ogrsf_frmts/csv/ogrcsvlayer.cpp
index 8dac065f30d3..238c2cf7ab09 100644
--- a/ogr/ogrsf_frmts/csv/ogrcsvlayer.cpp
+++ b/ogr/ogrsf_frmts/csv/ogrcsvlayer.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -119,7 +103,7 @@ bool OGRCSVLayer::Matches(const char *pszFieldName, char **papszPossibleNames)
                 {
                     // *pattern*
                     CPLString oPattern(pszPattern + 1);
-                    oPattern.resize(oPattern.size() - 1);
+                    oPattern.pop_back();
                     if (CPLString(pszFieldName).ifind(oPattern) !=
                         std::string::npos)
                         return true;
@@ -153,7 +137,7 @@ bool OGRCSVLayer::Matches(const char *pszFieldName, char **papszPossibleNames)
 
 void OGRCSVLayer::BuildFeatureDefn(const char *pszNfdcGeomField,
                                    const char *pszGeonamesGeomFieldPrefix,
-                                   char **papszOpenOptions)
+                                   CSLConstList papszOpenOptions)
 {
     bMergeDelimiter = CPLFetchBool(papszOpenOptions, "MERGE_SEPARATOR", false);
     bEmptyStringNull =
@@ -903,7 +887,7 @@ static bool OGRCSVIsFalse(const char *pszStr)
 /*                        AutodetectFieldTypes()                        */
 /************************************************************************/
 
-char **OGRCSVLayer::AutodetectFieldTypes(char **papszOpenOptions,
+char **OGRCSVLayer::AutodetectFieldTypes(CSLConstList papszOpenOptions,
                                          int nFieldCount)
 {
     const bool bStreaming =
@@ -960,7 +944,7 @@ char **OGRCSVLayer::AutodetectFieldTypes(char **papszOpenOptions,
         nRead = VSIFReadL(pszData, 1, nRequested, fpCSV);
         pszData[nRead] = 0;
 
-        osTmpMemFile = CPLSPrintf("/vsimem/tmp%p", this);
+        osTmpMemFile = VSIMemGenerateHiddenFilename("temp.csv");
         fp = VSIFileFromMemBuffer(osTmpMemFile.c_str(),
                                   reinterpret_cast<GByte *>(pszData), nRead,
                                   FALSE);
@@ -1049,7 +1033,10 @@ char **OGRCSVLayer::AutodetectFieldTypes(char **papszOpenOptions,
                 else
                     eOGRFieldType = OFTInteger;
             }
-            else if (eType == CPL_VALUE_REAL)
+            else if (eType == CPL_VALUE_REAL ||
+                     EQUAL(papszTokens[iField], "inf") ||
+                     EQUAL(papszTokens[iField], "-inf") ||
+                     EQUAL(papszTokens[iField], "nan"))
             {
                 eOGRFieldType = OFTReal;
             }
@@ -1390,40 +1377,62 @@ OGRFeature *OGRCSVLayer::GetNextUnfilteredFeature()
         }
         if (iGeom >= 0)
         {
+            const OGRGeomFieldDefn *poGeomFieldDefn =
+                poFeatureDefn->GetGeomFieldDefn(iGeom);
             if (papszTokens[iAttr][0] != '\0' &&
-                !(poFeatureDefn->GetGeomFieldDefn(iGeom)->IsIgnored()))
+                !(poGeomFieldDefn->IsIgnored()))
             {
                 const char *pszStr = papszTokens[iAttr];
                 while (*pszStr == ' ')
                     pszStr++;
                 OGRGeometry *poGeom = nullptr;
 
-                CPLPushErrorHandler(CPLQuietErrorHandler);
-                if (OGRGeometryFactory::createFromWkt(pszStr, nullptr,
-                                                      &poGeom) == OGRERR_NONE)
+                if (EQUAL(poGeomFieldDefn->GetNameRef(), ""))
                 {
-                    poGeom->assignSpatialReference(
-                        poFeatureDefn->GetGeomFieldDefn(iGeom)
-                            ->GetSpatialRef());
-                    poFeature->SetGeomFieldDirectly(iGeom, poGeom);
+                    if (OGRGeometryFactory::createFromWkt(
+                            pszStr, nullptr, &poGeom) != OGRERR_NONE)
+                    {
+                        CPLError(CE_Warning, CPLE_AppDefined,
+                                 "Ignoring invalid WKT: %s", pszStr);
+                        delete poGeom;
+                        poGeom = nullptr;
+                    }
                 }
-                else if (*pszStr == '{' &&
-                         (poGeom = OGRGeometry::FromHandle(
-                              OGR_G_CreateGeometryFromJson(pszStr))) != nullptr)
+                else
                 {
-                    poFeature->SetGeomFieldDirectly(iGeom, poGeom);
+                    CPLErrorHandlerPusher oErrorHandler(CPLQuietErrorHandler);
+
+                    if (OGRGeometryFactory::createFromWkt(
+                            pszStr, nullptr, &poGeom) != OGRERR_NONE)
+                    {
+                        delete poGeom;
+                        poGeom = nullptr;
+                    }
+
+                    if (!poGeom && *pszStr == '{')
+                    {
+                        poGeom = OGRGeometry::FromHandle(
+                            OGR_G_CreateGeometryFromJson(pszStr));
+                    }
+                    else if (!poGeom && ((*pszStr >= '0' && *pszStr <= '9') ||
+                                         (*pszStr >= 'a' && *pszStr <= 'z') ||
+                                         (*pszStr >= 'A' && *pszStr <= 'Z')))
+                    {
+                        poGeom = OGRGeometryFromHexEWKB(pszStr, nullptr, FALSE);
+                    }
                 }
-                else if (((*pszStr >= '0' && *pszStr <= '9') ||
-                          (*pszStr >= 'a' && *pszStr <= 'z') ||
-                          (*pszStr >= 'A' && *pszStr <= 'Z')) &&
-                         (poGeom = OGRGeometryFromHexEWKB(pszStr, nullptr,
-                                                          FALSE)) != nullptr)
+
+                if (poGeom)
                 {
+                    poGeom->assignSpatialReference(
+                        poGeomFieldDefn->GetSpatialRef());
                     poFeature->SetGeomFieldDirectly(iGeom, poGeom);
                 }
-                CPLPopErrorHandler();
             }
-            if (!bKeepGeomColumns || (iAttr == 0 && bHiddenWKTColumn))
+
+            const bool bHasAttributeField =
+                bKeepGeomColumns && !(iAttr == 0 && bHiddenWKTColumn);
+            if (!bHasAttributeField)
                 continue;
         }
 
@@ -1466,14 +1475,16 @@ OGRFeature *OGRCSVLayer::GetNextUnfilteredFeature()
                     if (chComma)
                         *chComma = '.';
                 }
-                CPLValueType eType = CPLGetValueType(papszTokens[iAttr]);
-                if (eType == CPL_VALUE_INTEGER || eType == CPL_VALUE_REAL)
+                char *endptr = nullptr;
+                const double dfVal =
+                    CPLStrtodDelim(papszTokens[iAttr], &endptr, '.');
+                if (endptr == papszTokens[iAttr] + strlen(papszTokens[iAttr]))
                 {
-                    poFeature->SetField(iOGRField, papszTokens[iAttr]);
+                    poFeature->SetField(iOGRField, dfVal);
                     if (!bWarningBadTypeOrWidth &&
                         (eFieldType == OFTInteger ||
                          eFieldType == OFTInteger64) &&
-                        eType == CPL_VALUE_REAL)
+                        CPLGetValueType(papszTokens[iAttr]) == CPL_VALUE_REAL)
                     {
                         bWarningBadTypeOrWidth = true;
                         CPLError(CE_Warning, CPLE_AppDefined,
@@ -1495,8 +1506,9 @@ OGRFeature *OGRCSVLayer::GetNextUnfilteredFeature()
                                  nNextFID, poFieldDefn->GetNameRef());
                     }
                     else if (!bWarningBadTypeOrWidth &&
-                             eType == CPL_VALUE_REAL &&
-                             poFieldDefn->GetWidth() > 0)
+                             poFieldDefn->GetWidth() > 0 &&
+                             CPLGetValueType(papszTokens[iAttr]) ==
+                                 CPL_VALUE_REAL)
                     {
                         const char *pszDot = strchr(papszTokens[iAttr], '.');
                         const int nPrecision =
@@ -2406,7 +2418,9 @@ OGRErr OGRCSVLayer::ICreateFeature(OGRFeature *poNewFeature)
                     pszContent, -1,
                     (m_eStringQuoting == StringQuoting::ALWAYS ||
                      (m_eStringQuoting == StringQuoting::IF_AMBIGUOUS &&
-                      CPLGetValueType(pszContent) != CPL_VALUE_STRING))
+                      (CPLGetValueType(pszContent) != CPL_VALUE_STRING ||
+                       (pszContent[0] == DIGIT_ZERO && pszContent[1] != '\0' &&
+                        pszContent[1] != '.'))))
                         ? CPLES_CSV_FORCE_QUOTING
                         : CPLES_CSV);
             }
diff --git a/ogr/ogrsf_frmts/csw/CMakeLists.txt b/ogr/ogrsf_frmts/csw/CMakeLists.txt
index a1d8fc1eae6d..b3eb54f8eafa 100644
--- a/ogr/ogrsf_frmts/csw/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/csw/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_gdal_driver(
   TARGET ogr_CSW
   SOURCES ogrcswdataset.cpp
-  BUILTIN) # BUILTIN because of GML and WFS dependency
+  PLUGIN_CAPABLE
+  NO_DEPS)
 gdal_standard_includes(ogr_CSW)
-target_include_directories(ogr_CSW PRIVATE $<TARGET_PROPERTY:ogr_GML,SOURCE_DIR> $<TARGET_PROPERTY:ogr_WFS,SOURCE_DIR>)
+target_include_directories(ogr_CSW PRIVATE $<TARGET_PROPERTY:gmlutils,SOURCE_DIR>)
diff --git a/ogr/ogrsf_frmts/csw/ogrcswdataset.cpp b/ogr/ogrsf_frmts/csw/ogrcswdataset.cpp
index 82ae661544f0..168b6a7b5192 100644
--- a/ogr/ogrsf_frmts/csw/ogrcswdataset.cpp
+++ b/ogr/ogrsf_frmts/csw/ogrcswdataset.cpp
@@ -7,30 +7,15 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
 #include "cpl_conv.h"
 #include "cpl_http.h"
-#include "ogr_wfs.h"
 #include "ogr_p.h"
+#include "ogr_swq.h"
+#include "ogrwfsfilter.h"
 #include "gmlutils.h"
 
 extern "C" void RegisterOGRCSW();
@@ -56,6 +41,8 @@ class OGRCSWLayer final : public OGRLayer
     CPLString osQuery;
     CPLString osCSWWhere;
 
+    std::string m_osTmpDir{};
+
     GDALDataset *FetchGetRecords();
     GIntBig GetFeatureCountWithHits();
     void BuildQuery();
@@ -92,9 +79,8 @@ class OGRCSWLayer final : public OGRLayer
 /*                           OGRCSWDataSource                           */
 /************************************************************************/
 
-class OGRCSWDataSource final : public OGRDataSource
+class OGRCSWDataSource final : public GDALDataset
 {
-    char *pszName;
     CPLString osBaseURL;
     CPLString osVersion;
     CPLString osElementSetName;
@@ -112,11 +98,6 @@ class OGRCSWDataSource final : public OGRDataSource
 
     int Open(const char *pszFilename, char **papszOpenOptions);
 
-    virtual const char *GetName() override
-    {
-        return pszName;
-    }
-
     virtual int GetLayerCount() override
     {
         return poLayer != nullptr;
@@ -124,11 +105,6 @@ class OGRCSWDataSource final : public OGRDataSource
 
     virtual OGRLayer *GetLayer(int) override;
 
-    virtual int TestCapability(const char *) override
-    {
-        return FALSE;
-    }
-
     static CPLHTTPResult *HTTPFetch(const char *pszURL, const char *pszPost);
 
     const CPLString &GetBaseURL()
@@ -258,6 +234,8 @@ OGRCSWLayer::OGRCSWLayer(OGRCSWDataSource *poDSIn)
     }
 
     poSRS->Release();
+
+    m_osTmpDir = VSIMemGenerateHiddenFilename("csw");
 }
 
 /************************************************************************/
@@ -268,8 +246,7 @@ OGRCSWLayer::~OGRCSWLayer()
 {
     poFeatureDefn->Release();
     GDALClose(poBaseDS);
-    CPLString osTmpDirName = CPLSPrintf("/vsimem/tempcsw_%p", this);
-    OGRWFSRecursiveUnlink(osTmpDirName);
+    VSIRmdirRecursive(m_osTmpDir.c_str());
 }
 
 /************************************************************************/
@@ -531,8 +508,7 @@ GDALDataset *OGRCSWLayer::FetchGetRecords()
         return nullptr;
     }
 
-    CPLString osTmpDirName = CPLSPrintf("/vsimem/tempcsw_%p", this);
-    VSIMkdir(osTmpDirName, 0);
+    VSIMkdir(m_osTmpDir.c_str(), 0);
 
     GByte *pabyData = psResult->pabyData;
     int nDataLen = psResult->nDataLen;
@@ -549,10 +525,10 @@ GDALDataset *OGRCSWLayer::FetchGetRecords()
 
     CPLString osTmpFileName;
 
-    osTmpFileName = osTmpDirName + "/file.gfs";
+    osTmpFileName = m_osTmpDir + "/file.gfs";
     VSIUnlink(osTmpFileName);
 
-    osTmpFileName = osTmpDirName + "/file.gml";
+    osTmpFileName = m_osTmpDir + "/file.gml";
 
     VSILFILE *fp =
         VSIFileFromMemBuffer(osTmpFileName, pabyData, nDataLen, TRUE);
@@ -916,8 +892,7 @@ void OGRCSWLayer::BuildQuery()
 /************************************************************************/
 
 OGRCSWDataSource::OGRCSWDataSource()
-    : pszName(nullptr), nMaxRecords(500), poLayer(nullptr),
-      bFullExtentRecordsAsNonSpatial(false)
+    : nMaxRecords(500), poLayer(nullptr), bFullExtentRecordsAsNonSpatial(false)
 {
 }
 
@@ -928,7 +903,6 @@ OGRCSWDataSource::OGRCSWDataSource()
 OGRCSWDataSource::~OGRCSWDataSource()
 {
     delete poLayer;
-    CPLFree(pszName);
 }
 
 /************************************************************************/
diff --git a/ogr/ogrsf_frmts/dgn/dgndump.cpp b/ogr/ogrsf_frmts/dgn/dgndump.cpp
index 5e5bec980bd8..acca7d954124 100644
--- a/ogr/ogrsf_frmts/dgn/dgndump.cpp
+++ b/ogr/ogrsf_frmts/dgn/dgndump.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2000, Avenza Systems Inc, http://www.avenza.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "dgnlibp.h"
diff --git a/ogr/ogrsf_frmts/dgn/dgnhelp.cpp b/ogr/ogrsf_frmts/dgn/dgnhelp.cpp
index 56aeadcee6c5..563de1dad091 100644
--- a/ogr/ogrsf_frmts/dgn/dgnhelp.cpp
+++ b/ogr/ogrsf_frmts/dgn/dgnhelp.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Avenza Systems Inc, http://www.avenza.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "dgnlibp.h"
diff --git a/ogr/ogrsf_frmts/dgn/dgnlib.h b/ogr/ogrsf_frmts/dgn/dgnlib.h
index 791e2b59d094..ede8c12b881c 100644
--- a/ogr/ogrsf_frmts/dgn/dgnlib.h
+++ b/ogr/ogrsf_frmts/dgn/dgnlib.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2000, Avenza Systems Inc, http://www.avenza.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef DGNLIB_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/dgn/dgnlibp.h b/ogr/ogrsf_frmts/dgn/dgnlibp.h
index 7576bb39d3a9..b14a2c8877ea 100644
--- a/ogr/ogrsf_frmts/dgn/dgnlibp.h
+++ b/ogr/ogrsf_frmts/dgn/dgnlibp.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2000, Avenza Systems Inc, http://www.avenza.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef DGNLIBP_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/dgn/dgnopen.cpp b/ogr/ogrsf_frmts/dgn/dgnopen.cpp
index 6e021fbd1980..64cf2e8174df 100644
--- a/ogr/ogrsf_frmts/dgn/dgnopen.cpp
+++ b/ogr/ogrsf_frmts/dgn/dgnopen.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2000, Avenza Systems Inc, http://www.avenza.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "dgnlibp.h"
diff --git a/ogr/ogrsf_frmts/dgn/dgnread.cpp b/ogr/ogrsf_frmts/dgn/dgnread.cpp
index 0eb4fe8450ee..31d43abf65c0 100644
--- a/ogr/ogrsf_frmts/dgn/dgnread.cpp
+++ b/ogr/ogrsf_frmts/dgn/dgnread.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2000, Avenza Systems Inc, http://www.avenza.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "dgnlibp.h"
diff --git a/ogr/ogrsf_frmts/dgn/dgnstroke.cpp b/ogr/ogrsf_frmts/dgn/dgnstroke.cpp
index 9fe7a89b713c..bca787f3d753 100644
--- a/ogr/ogrsf_frmts/dgn/dgnstroke.cpp
+++ b/ogr/ogrsf_frmts/dgn/dgnstroke.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2001, Avenza Systems Inc, http://www.avenza.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "dgnlibp.h"
diff --git a/ogr/ogrsf_frmts/dgn/dgnwrite.cpp b/ogr/ogrsf_frmts/dgn/dgnwrite.cpp
index 95de7f146b72..ac08491816b5 100644
--- a/ogr/ogrsf_frmts/dgn/dgnwrite.cpp
+++ b/ogr/ogrsf_frmts/dgn/dgnwrite.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "dgnlibp.h"
diff --git a/ogr/ogrsf_frmts/dgn/dgnwritetest.cpp b/ogr/ogrsf_frmts/dgn/dgnwritetest.cpp
index 4ded28db2822..4e1820953175 100644
--- a/ogr/ogrsf_frmts/dgn/dgnwritetest.cpp
+++ b/ogr/ogrsf_frmts/dgn/dgnwritetest.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "dgnlib.h"
diff --git a/ogr/ogrsf_frmts/dgn/ogr_dgn.h b/ogr/ogrsf_frmts/dgn/ogr_dgn.h
index f9359e8cfdec..d16b8f9e8c9d 100644
--- a/ogr/ogrsf_frmts/dgn/ogr_dgn.h
+++ b/ogr/ogrsf_frmts/dgn/ogr_dgn.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2000, Frank Warmerdam (warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_DGN_H_INCLUDED
@@ -37,9 +21,11 @@
 /*                            OGRDGNLayer                               */
 /************************************************************************/
 
+class OGRDGNDataSource;
+
 class OGRDGNLayer final : public OGRLayer
 {
-    GDALDataset *m_poDS = nullptr;
+    OGRDGNDataSource *m_poDS = nullptr;
     OGRFeatureDefn *poFeatureDefn;
 
     int iNextShapeId;
@@ -64,7 +50,7 @@ class OGRDGNLayer final : public OGRLayer
     OGRErr CreateFeatureWithGeom(OGRFeature *, const OGRGeometry *);
 
   public:
-    OGRDGNLayer(GDALDataset *poDS, const char *pszName, DGNHandle hDGN,
+    OGRDGNLayer(OGRDGNDataSource *poDS, const char *pszName, DGNHandle hDGN,
                 int bUpdate);
     virtual ~OGRDGNLayer();
 
@@ -97,42 +83,35 @@ class OGRDGNLayer final : public OGRLayer
 
     OGRErr ICreateFeature(OGRFeature *poFeature) override;
 
-    GDALDataset *GetDataset() override
-    {
-        return m_poDS;
-    }
+    GDALDataset *GetDataset() override;
 };
 
 /************************************************************************/
 /*                          OGRDGNDataSource                            */
 /************************************************************************/
 
-class OGRDGNDataSource final : public OGRDataSource
+class OGRDGNDataSource final : public GDALDataset
 {
-    OGRDGNLayer **papoLayers;
-    int nLayers;
+    OGRDGNLayer **papoLayers = nullptr;
+    int nLayers = 0;
 
-    char *pszName;
-    DGNHandle hDGN;
+    DGNHandle hDGN = nullptr;
+
+    char **papszOptions = nullptr;
 
-    char **papszOptions;
+    std::string m_osEncoding{};
 
   public:
     OGRDGNDataSource();
     ~OGRDGNDataSource();
 
-    int Open(const char *, int bTestOpen, int bUpdate);
-    bool PreCreate(const char *, char **);
+    bool Open(GDALOpenInfo *poOpenInfo);
+    void PreCreate(CSLConstList);
 
     OGRLayer *ICreateLayer(const char *pszName,
                            const OGRGeomFieldDefn *poGeomFieldDefn,
                            CSLConstList) override;
 
-    const char *GetName() override
-    {
-        return pszName;
-    }
-
     int GetLayerCount() override
     {
         return nLayers;
@@ -141,6 +120,11 @@ class OGRDGNDataSource final : public OGRDataSource
     OGRLayer *GetLayer(int) override;
 
     int TestCapability(const char *) override;
+
+    const std::string &GetEncoding() const
+    {
+        return m_osEncoding;
+    }
 };
 
 #endif /* ndef OGR_DGN_H_INCLUDED */
diff --git a/ogr/ogrsf_frmts/dgn/ogrdgndatasource.cpp b/ogr/ogrsf_frmts/dgn/ogrdgndatasource.cpp
index 648471ceef5b..46ec850643f8 100644
--- a/ogr/ogrsf_frmts/dgn/ogrdgndatasource.cpp
+++ b/ogr/ogrsf_frmts/dgn/ogrdgndatasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2000, Frank Warmerdam (warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_dgn.h"
@@ -34,11 +18,7 @@
 /*                         OGRDGNDataSource()                           */
 /************************************************************************/
 
-OGRDGNDataSource::OGRDGNDataSource()
-    : papoLayers(nullptr), nLayers(0), pszName(nullptr), hDGN(nullptr),
-      papszOptions(nullptr)
-{
-}
+OGRDGNDataSource::OGRDGNDataSource() = default;
 
 /************************************************************************/
 /*                        ~OGRDGNDataSource()                           */
@@ -51,7 +31,6 @@ OGRDGNDataSource::~OGRDGNDataSource()
         delete papoLayers[i];
 
     CPLFree(papoLayers);
-    CPLFree(pszName);
     CSLDestroy(papszOptions);
 
     if (hDGN != nullptr)
@@ -62,54 +41,31 @@ OGRDGNDataSource::~OGRDGNDataSource()
 /*                                Open()                                */
 /************************************************************************/
 
-int OGRDGNDataSource::Open(const char *pszNewName, int bTestOpen, int bUpdate)
+bool OGRDGNDataSource::Open(GDALOpenInfo *poOpenInfo)
 
 {
-    CPLAssert(nLayers == 0);
-
-    /* -------------------------------------------------------------------- */
-    /*      For now we require files to have the .dgn or .DGN               */
-    /*      extension.  Eventually we will implement a more                 */
-    /*      sophisticated test to see if it is a dgn file.                  */
-    /* -------------------------------------------------------------------- */
-    if (bTestOpen)
-    {
-
-        VSILFILE *fp = VSIFOpenL(pszNewName, "rb");
-        if (fp == nullptr)
-            return FALSE;
+    m_osEncoding =
+        CSLFetchNameValueDef(poOpenInfo->papszOpenOptions, "ENCODING", "");
 
-        GByte abyHeader[512];
-        const int nHeaderBytes =
-            static_cast<int>(VSIFReadL(abyHeader, 1, sizeof(abyHeader), fp));
-
-        VSIFCloseL(fp);
-
-        if (nHeaderBytes < 512)
-            return FALSE;
-
-        if (!DGNTestOpen(abyHeader, nHeaderBytes))
-            return FALSE;
-    }
+    CPLAssert(nLayers == 0);
 
     /* -------------------------------------------------------------------- */
     /*      Try to open the file as a DGN file.                             */
     /* -------------------------------------------------------------------- */
-    hDGN = DGNOpen(pszNewName, bUpdate);
+    const bool bUpdate = (poOpenInfo->eAccess == GA_Update);
+    hDGN = DGNOpen(poOpenInfo->pszFilename, bUpdate);
     if (hDGN == nullptr)
     {
-        if (!bTestOpen)
-            CPLError(CE_Failure, CPLE_AppDefined,
-                     "Unable to open %s as a Microstation .dgn file.",
-                     pszNewName);
-        return FALSE;
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Unable to open %s as a Microstation .dgn file.",
+                 poOpenInfo->pszFilename);
+        return false;
     }
 
     /* -------------------------------------------------------------------- */
     /*      Create the layer object.                                        */
     /* -------------------------------------------------------------------- */
     OGRDGNLayer *poLayer = new OGRDGNLayer(this, "elements", hDGN, bUpdate);
-    pszName = CPLStrdup(pszNewName);
 
     /* -------------------------------------------------------------------- */
     /*      Add layer to data source layer list.                            */
@@ -118,7 +74,7 @@ int OGRDGNDataSource::Open(const char *pszNewName, int bTestOpen, int bUpdate)
         CPLRealloc(papoLayers, sizeof(OGRDGNLayer *) * (nLayers + 1)));
     papoLayers[nLayers++] = poLayer;
 
-    return TRUE;
+    return true;
 }
 
 /************************************************************************/
@@ -154,16 +110,15 @@ OGRLayer *OGRDGNDataSource::GetLayer(int iLayer)
 /*                                                                      */
 /*      Called by OGRDGNDriver::Create() method to setup a stub         */
 /*      OGRDataSource object without the associated file created        */
-/*      yet.  It will be created by theICreateLayer() call.             */
+/*      yet.  It will be created by the ICreateLayer() call.            */
 /************************************************************************/
 
-bool OGRDGNDataSource::PreCreate(const char *pszFilename, char **papszOptionsIn)
+void OGRDGNDataSource::PreCreate(CSLConstList papszOptionsIn)
 
 {
     papszOptions = CSLDuplicate(papszOptionsIn);
-    pszName = CPLStrdup(pszFilename);
 
-    return true;
+    m_osEncoding = CSLFetchNameValueDef(papszOptionsIn, "ENCODING", "");
 }
 
 /************************************************************************/
@@ -307,8 +262,9 @@ OGRDGNDataSource::ICreateLayer(const char *pszLayerName,
     /* -------------------------------------------------------------------- */
     /*      Try creating the base file.                                     */
     /* -------------------------------------------------------------------- */
-    hDGN = DGNCreate(pszName, pszSeed, nCreationFlags, dfOriginX, dfOriginY,
-                     dfOriginZ, nSUPerMU, nUORPerSU, pszMasterUnit, pszSubUnit);
+    hDGN = DGNCreate(GetDescription(), pszSeed, nCreationFlags, dfOriginX,
+                     dfOriginY, dfOriginZ, nSUPerMU, nUORPerSU, pszMasterUnit,
+                     pszSubUnit);
     if (hDGN == nullptr)
         return nullptr;
 
diff --git a/ogr/ogrsf_frmts/dgn/ogrdgndriver.cpp b/ogr/ogrsf_frmts/dgn/ogrdgndriver.cpp
index 875e07b833f9..9a283aa3fe37 100644
--- a/ogr/ogrsf_frmts/dgn/ogrdgndriver.cpp
+++ b/ogr/ogrsf_frmts/dgn/ogrdgndriver.cpp
@@ -7,30 +7,14 @@
  ******************************************************************************
  * Copyright (c) 2000, Frank Warmerdam (warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_dgn.h"
 #include "cpl_conv.h"
 
 /************************************************************************/
-/*                                Open()                                */
+/*                       OGRDGNDriverIdentify()                         */
 /************************************************************************/
 
 static int OGRDGNDriverIdentify(GDALOpenInfo *poOpenInfo)
@@ -76,9 +60,7 @@ static GDALDataset *OGRDGNDriverOpen(GDALOpenInfo *poOpenInfo)
 
     OGRDGNDataSource *poDS = new OGRDGNDataSource();
 
-    if (!poDS->Open(poOpenInfo->pszFilename, TRUE,
-                    (poOpenInfo->eAccess == GA_Update)) ||
-        poDS->GetLayerCount() == 0)
+    if (!poDS->Open(poOpenInfo) || poDS->GetLayerCount() == 0)
     {
         delete poDS;
         return nullptr;
@@ -91,22 +73,13 @@ static GDALDataset *OGRDGNDriverOpen(GDALOpenInfo *poOpenInfo)
 /*                              Create()                                */
 /************************************************************************/
 
-static GDALDataset *OGRDGNDriverCreate(const char *pszName, int /* nBands */,
+static GDALDataset *OGRDGNDriverCreate(const char *, int /* nBands */,
                                        int /* nXSize */, int /* nYSize */,
                                        GDALDataType /* eDT */,
                                        char **papszOptions)
 {
-    /* -------------------------------------------------------------------- */
-    /*      Return a new OGRDataSource()                                    */
-    /* -------------------------------------------------------------------- */
     OGRDGNDataSource *poDS = new OGRDGNDataSource();
-
-    if (!poDS->PreCreate(pszName, papszOptions))
-    {
-        delete poDS;
-        return nullptr;
-    }
-
+    poDS->PreCreate(papszOptions);
     return poDS;
 }
 
@@ -131,6 +104,13 @@ void RegisterOGRDGN()
     poDriver->SetMetadataItem(GDAL_DCAP_Z_GEOMETRIES, "YES");
     poDriver->SetMetadataItem(GDAL_DMD_SUPPORTED_SQL_DIALECTS, "OGRSQL SQLITE");
 
+    poDriver->SetMetadataItem(
+        GDAL_DMD_OPENOPTIONLIST,
+        "<OpenOptionList>"
+        "  <Option name='ENCODING' type='string' description="
+        "'Encoding name, as supported by iconv'/>"
+        "</OpenOptionList>");
+
     poDriver->SetMetadataItem(
         GDAL_DMD_CREATIONOPTIONLIST,
         "<CreationOptionList>"
@@ -167,6 +147,8 @@ void RegisterOGRDGN()
         "  <Option name='ORIGIN' type='string' description='Value as x,y,z. "
         "Override the origin of the design plane. By default the origin from "
         "the seed file is used.'/>"
+        "  <Option name='ENCODING' type='string' description="
+        "'Encoding name, as supported by iconv'/>"
         "</CreationOptionList>");
 
     poDriver->SetMetadataItem(GDAL_DS_LAYER_CREATIONOPTIONLIST,
diff --git a/ogr/ogrsf_frmts/dgn/ogrdgnlayer.cpp b/ogr/ogrsf_frmts/dgn/ogrdgnlayer.cpp
index 3898ced6d86d..007fc3eb743b 100644
--- a/ogr/ogrsf_frmts/dgn/ogrdgnlayer.cpp
+++ b/ogr/ogrsf_frmts/dgn/ogrdgnlayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2000, Frank Warmerdam (warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_dgn.h"
@@ -39,7 +23,7 @@
 /*                           OGRDGNLayer()                              */
 /************************************************************************/
 
-OGRDGNLayer::OGRDGNLayer(GDALDataset *poDS, const char *pszName,
+OGRDGNLayer::OGRDGNLayer(OGRDGNDataSource *poDS, const char *pszName,
                          DGNHandle hDGNIn, int bUpdateIn)
     : m_poDS(poDS), poFeatureDefn(new OGRFeatureDefn(pszName)), iNextShapeId(0),
       hDGN(hDGNIn), bUpdate(bUpdateIn)
@@ -628,11 +612,23 @@ OGRFeature *OGRDGNLayer::ElementToFeature(DGNElemCore *psElement, int nRecLevel)
 
             poFeature->SetGeometryDirectly(poPoint);
 
-            const size_t nOgrFSLen = strlen(psText->string) + 150;
+            const auto &osEncoding = m_poDS->GetEncoding();
+            std::string osText;
+            if (!osEncoding.empty() && osEncoding != CPL_ENC_UTF8)
+            {
+                osText = CPLString(psText->string)
+                             .Recode(osEncoding.c_str(), CPL_ENC_UTF8);
+            }
+            else
+            {
+                osText = psText->string;
+            }
+
+            const size_t nOgrFSLen = osText.size() + 150;
             char *pszOgrFS = static_cast<char *>(CPLMalloc(nOgrFSLen));
 
             // setup the basic label.
-            snprintf(pszOgrFS, nOgrFSLen, "LABEL(t:\"%s\"", psText->string);
+            snprintf(pszOgrFS, nOgrFSLen, "LABEL(t:\"%s\"", osText.c_str());
 
             // set the color if we have it.
             if (strlen(szFSColor) > 0)
@@ -793,7 +789,7 @@ OGRFeature *OGRDGNLayer::ElementToFeature(DGNElemCore *psElement, int nRecLevel)
             poFeature->SetStyleString(pszOgrFS);
             CPLFree(pszOgrFS);
 
-            poFeature->SetField("Text", psText->string);
+            poFeature->SetField("Text", osText.c_str());
         }
         break;
 
@@ -928,6 +924,9 @@ int OGRDGNLayer::TestCapability(const char *pszCap)
     else if (EQUAL(pszCap, OLCZGeometries))
         return TRUE;
 
+    else if (EQUAL(pszCap, OLCStringsAsUTF8))
+        return !m_poDS->GetEncoding().empty();
+
     return FALSE;
 }
 
@@ -1183,11 +1182,23 @@ DGNElemCore **OGRDGNLayer::TranslateLabel(OGRFeature *poFeature)
         }
     }
 
+    std::string osText;
+    const auto &osEncoding = m_poDS->GetEncoding();
+    if (!osEncoding.empty() && osEncoding != CPL_ENC_UTF8)
+    {
+        osText = CPLString(pszText).Recode(CPL_ENC_UTF8, osEncoding.c_str());
+    }
+    else
+    {
+        osText = pszText;
+    }
+
     DGNElemCore **papsGroup =
         static_cast<DGNElemCore **>(CPLCalloc(sizeof(void *), 2));
-    papsGroup[0] = DGNCreateTextElem(
-        hDGN, pszText, nFontID, DGNJ_LEFT_BOTTOM, dfCharHeight, dfCharHeight,
-        dfRotation, nullptr, poPoint->getX(), poPoint->getY(), poPoint->getZ());
+    papsGroup[0] =
+        DGNCreateTextElem(hDGN, osText.c_str(), nFontID, DGNJ_LEFT_BOTTOM,
+                          dfCharHeight, dfCharHeight, dfRotation, nullptr,
+                          poPoint->getX(), poPoint->getY(), poPoint->getZ());
 
     if (poLabel)
         delete poLabel;
@@ -1387,3 +1398,12 @@ OGRErr OGRDGNLayer::CreateFeatureWithGeom(OGRFeature *poFeature,
 
     return OGRERR_NONE;
 }
+
+/************************************************************************/
+/*                             GetDataset()                             */
+/************************************************************************/
+
+GDALDataset *OGRDGNLayer::GetDataset()
+{
+    return m_poDS;
+}
diff --git a/ogr/ogrsf_frmts/dwg/createdgnv8testfile.cpp b/ogr/ogrsf_frmts/dwg/createdgnv8testfile.cpp
index 2171d64569c2..e948206620b6 100644
--- a/ogr/ogrsf_frmts/dwg/createdgnv8testfile.cpp
+++ b/ogr/ogrsf_frmts/dwg/createdgnv8testfile.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2017, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "createdgnv8testfile_headers.h"
diff --git a/ogr/ogrsf_frmts/dwg/createdgnv8testfile_headers.h b/ogr/ogrsf_frmts/dwg/createdgnv8testfile_headers.h
index 87c048d14bda..baf58c84a678 100644
--- a/ogr/ogrsf_frmts/dwg/createdgnv8testfile_headers.h
+++ b/ogr/ogrsf_frmts/dwg/createdgnv8testfile_headers.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2017, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #if ((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) &&               \
diff --git a/ogr/ogrsf_frmts/dwg/dgnv8_headers.h b/ogr/ogrsf_frmts/dwg/dgnv8_headers.h
index df1d951e0b7d..64787b1b4bf8 100644
--- a/ogr/ogrsf_frmts/dwg/dgnv8_headers.h
+++ b/ogr/ogrsf_frmts/dwg/dgnv8_headers.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2017, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef DGNV8_HEADERS_H
diff --git a/ogr/ogrsf_frmts/dwg/dwg_headers.h b/ogr/ogrsf_frmts/dwg/dwg_headers.h
index 1a4fcfc47c85..a3747db0bf09 100644
--- a/ogr/ogrsf_frmts/dwg/dwg_headers.h
+++ b/ogr/ogrsf_frmts/dwg/dwg_headers.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011,  Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef TEIGHA_HEADERS_H
diff --git a/ogr/ogrsf_frmts/dwg/ogr_dgnv8.h b/ogr/ogrsf_frmts/dwg/ogr_dgnv8.h
index 47cb5757bc1e..5cc10a096628 100644
--- a/ogr/ogrsf_frmts/dwg/ogr_dgnv8.h
+++ b/ogr/ogrsf_frmts/dwg/ogr_dgnv8.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2017, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_DGNV8_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/dwg/ogr_dwg.h b/ogr/ogrsf_frmts/dwg/ogr_dwg.h
index a9e74b508b49..4a9b00c97ca0 100644
--- a/ogr/ogrsf_frmts/dwg/ogr_dwg.h
+++ b/ogr/ogrsf_frmts/dwg/ogr_dwg.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2011,  Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_DWG_H_INCLUDED
@@ -168,9 +152,8 @@ class OGRDWGLayer final : public OGRLayer
 /*                           OGRDWGDataSource                           */
 /************************************************************************/
 
-class OGRDWGDataSource final : public OGRDataSource
+class OGRDWGDataSource final : public GDALDataset
 {
-    CPLString m_osName;
     std::vector<OGRLayer *> apoLayers;
 
     std::set<CPLString> attributeFields;
@@ -189,6 +172,8 @@ class OGRDWGDataSource final : public OGRDataSource
     int bAttributes;
     int bAllAttributes;
 
+    bool m_bClosedLineAsPolygon = false;
+
     OGRDWGServices *poServices;
     OdDbDatabasePtr poDb;
 
@@ -204,11 +189,6 @@ class OGRDWGDataSource final : public OGRDataSource
     int Open(OGRDWGServices *poServices, const char *pszFilename,
              int bHeaderOnly = FALSE);
 
-    const char *GetName() override
-    {
-        return m_osName;
-    }
-
     int GetLayerCount() override
     {
         return static_cast<int>(apoLayers.size());
@@ -216,8 +196,6 @@ class OGRDWGDataSource final : public OGRDataSource
 
     OGRLayer *GetLayer(int) override;
 
-    int TestCapability(const char *) override;
-
     // The following is only used by OGRDWGLayer
 
     int InlineBlocks()
@@ -235,6 +213,11 @@ class OGRDWGDataSource final : public OGRDataSource
         return bAllAttributes;
     }
 
+    bool ClosedLineAsPolygon() const
+    {
+        return m_bClosedLineAsPolygon;
+    }
+
     void AddStandardFields(OGRFeatureDefn *poDef);
 
     // Implemented in ogrdxf_blockmap.cpp
diff --git a/ogr/ogrsf_frmts/dwg/ogrdgnv8datasource.cpp b/ogr/ogrsf_frmts/dwg/ogrdgnv8datasource.cpp
index d0afe907b17c..df9d06c18de1 100644
--- a/ogr/ogrsf_frmts/dwg/ogrdgnv8datasource.cpp
+++ b/ogr/ogrsf_frmts/dwg/ogrdgnv8datasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2017, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_dgnv8.h"
diff --git a/ogr/ogrsf_frmts/dwg/ogrdgnv8driver.cpp b/ogr/ogrsf_frmts/dwg/ogrdgnv8driver.cpp
index 986a14118317..ad787ed1cee6 100644
--- a/ogr/ogrsf_frmts/dwg/ogrdgnv8driver.cpp
+++ b/ogr/ogrsf_frmts/dwg/ogrdgnv8driver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2017, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_dgnv8.h"
diff --git a/ogr/ogrsf_frmts/dwg/ogrdgnv8drivercore.cpp b/ogr/ogrsf_frmts/dwg/ogrdgnv8drivercore.cpp
index 4b6b1b028849..c0b0ddc9cbd1 100644
--- a/ogr/ogrsf_frmts/dwg/ogrdgnv8drivercore.cpp
+++ b/ogr/ogrsf_frmts/dwg/ogrdgnv8drivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2017, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
diff --git a/ogr/ogrsf_frmts/dwg/ogrdgnv8drivercore.h b/ogr/ogrsf_frmts/dwg/ogrdgnv8drivercore.h
index 10e7162cf9d9..8d2c52006e77 100644
--- a/ogr/ogrsf_frmts/dwg/ogrdgnv8drivercore.h
+++ b/ogr/ogrsf_frmts/dwg/ogrdgnv8drivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2017, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRDGNV8DRIVERCORE_H
diff --git a/ogr/ogrsf_frmts/dwg/ogrdgnv8layer.cpp b/ogr/ogrsf_frmts/dwg/ogrdgnv8layer.cpp
index c9a92e5cfee5..00b8dd9835f4 100644
--- a/ogr/ogrsf_frmts/dwg/ogrdgnv8layer.cpp
+++ b/ogr/ogrsf_frmts/dwg/ogrdgnv8layer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2017, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_dgnv8.h"
diff --git a/ogr/ogrsf_frmts/dwg/ogrdwg_blockmap.cpp b/ogr/ogrsf_frmts/dwg/ogrdwg_blockmap.cpp
index 709d39609384..5aafd5889298 100644
--- a/ogr/ogrsf_frmts/dwg/ogrdwg_blockmap.cpp
+++ b/ogr/ogrsf_frmts/dwg/ogrdwg_blockmap.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2009, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_dwg.h"
diff --git a/ogr/ogrsf_frmts/dwg/ogrdwg_dimension.cpp b/ogr/ogrsf_frmts/dwg/ogrdwg_dimension.cpp
index 837ecb221e3c..9d703072e8cc 100644
--- a/ogr/ogrsf_frmts/dwg/ogrdwg_dimension.cpp
+++ b/ogr/ogrsf_frmts/dwg/ogrdwg_dimension.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_dwg.h"
diff --git a/ogr/ogrsf_frmts/dwg/ogrdwg_hatch.cpp b/ogr/ogrsf_frmts/dwg/ogrdwg_hatch.cpp
index 5e181de37ad2..ee1862c34e09 100644
--- a/ogr/ogrsf_frmts/dwg/ogrdwg_hatch.cpp
+++ b/ogr/ogrsf_frmts/dwg/ogrdwg_hatch.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_dwg.h"
@@ -144,7 +128,7 @@ static OGRErr DWGCollectBoundaryLoop(OdDbHatchPtr poHatch, int iLoop,
 
         oSmoothPolyline.Close();
 
-        OGRLineString *poLS = oSmoothPolyline.Tessellate()->toLineString();
+        OGRLineString *poLS = oSmoothPolyline.Tessellate(false)->toLineString();
         poGC->addGeometryDirectly(poLS);
 
         return OGRERR_NONE;
diff --git a/ogr/ogrsf_frmts/dwg/ogrdwgblockslayer.cpp b/ogr/ogrsf_frmts/dwg/ogrdwgblockslayer.cpp
index a1498f46b123..c0573d871187 100644
--- a/ogr/ogrsf_frmts/dwg/ogrdwgblockslayer.cpp
+++ b/ogr/ogrsf_frmts/dwg/ogrdwgblockslayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_dwg.h"
diff --git a/ogr/ogrsf_frmts/dwg/ogrdwgdatasource.cpp b/ogr/ogrsf_frmts/dwg/ogrdwgdatasource.cpp
index f91dcab83553..5fb2d2f611bf 100644
--- a/ogr/ogrsf_frmts/dwg/ogrdwgdatasource.cpp
+++ b/ogr/ogrsf_frmts/dwg/ogrdwgdatasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_dwg.h"
@@ -58,16 +42,6 @@ OGRDWGDataSource::~OGRDWGDataSource()
     }
 }
 
-/************************************************************************/
-/*                           TestCapability()                           */
-/************************************************************************/
-
-int OGRDWGDataSource::TestCapability(const char * /*pszCap*/)
-
-{
-    return FALSE;
-}
-
 /************************************************************************/
 /*                              GetLayer()                              */
 /************************************************************************/
@@ -93,13 +67,13 @@ int OGRDWGDataSource::Open(OGRDWGServices *poServicesIn,
 
     osEncoding = CPL_ENC_ISO8859_1;
 
-    m_osName = pszFilename;
-
     bInlineBlocks =
         CPLTestBool(CPLGetConfigOption("DWG_INLINE_BLOCKS", "TRUE"));
     bAttributes = CPLTestBool(CPLGetConfigOption("DWG_ATTRIBUTES", "FALSE"));
     bAllAttributes =
         CPLTestBool(CPLGetConfigOption("DWG_ALL_ATTRIBUTES", "TRUE"));
+    m_bClosedLineAsPolygon =
+        CPLTestBool(CPLGetConfigOption("DWG_CLOSED_LINE_AS_POLYGON", "FALSE"));
 
     /* -------------------------------------------------------------------- */
     /*      Open the file.                                                  */
diff --git a/ogr/ogrsf_frmts/dwg/ogrdwgdriver.cpp b/ogr/ogrsf_frmts/dwg/ogrdwgdriver.cpp
index 0a1e165d2739..9648271d4da5 100644
--- a/ogr/ogrsf_frmts/dwg/ogrdwgdriver.cpp
+++ b/ogr/ogrsf_frmts/dwg/ogrdwgdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_dwg.h"
diff --git a/ogr/ogrsf_frmts/dwg/ogrdwgdrivercore.cpp b/ogr/ogrsf_frmts/dwg/ogrdwgdrivercore.cpp
index 6c79ce164f47..c5feb81a3cf9 100644
--- a/ogr/ogrsf_frmts/dwg/ogrdwgdrivercore.cpp
+++ b/ogr/ogrsf_frmts/dwg/ogrdwgdrivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
diff --git a/ogr/ogrsf_frmts/dwg/ogrdwgdrivercore.h b/ogr/ogrsf_frmts/dwg/ogrdwgdrivercore.h
index 55bb96f0c561..b932f8dc224b 100644
--- a/ogr/ogrsf_frmts/dwg/ogrdwgdrivercore.h
+++ b/ogr/ogrsf_frmts/dwg/ogrdwgdrivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRDWGDRIVERCORE_H
diff --git a/ogr/ogrsf_frmts/dwg/ogrdwglayer.cpp b/ogr/ogrsf_frmts/dwg/ogrdwglayer.cpp
index e32050f5ca43..fb6cdd4a5473 100644
--- a/ogr/ogrsf_frmts/dwg/ogrdwglayer.cpp
+++ b/ogr/ogrsf_frmts/dwg/ogrdwglayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_dwg.h"
@@ -423,7 +407,7 @@ OGRFeature *OGRDWGLayer::TranslateMTEXT(OdDbEntityPtr poEntity)
     CPLString osText = TextUnescape(poMTE->contents(), true);
 
     if (!osText.empty() && osText.back() == '\n')
-        osText.resize(osText.size() - 1);
+        osText.pop_back();
 
     poFeature->SetField("Text", osText);
 
@@ -543,7 +527,7 @@ OGRFeature *OGRDWGLayer::TranslateTEXT(OdDbEntityPtr poEntity)
     CPLString osText = TextUnescape(poText->textString(), false);
 
     if (!osText.empty() && osText.back() == '\n')
-        osText.resize(osText.size() - 1);
+        osText.pop_back();
 
     poFeature->SetField("Text", osText);
 
@@ -692,7 +676,9 @@ OGRFeature *OGRDWGLayer::TranslateLWPOLYLINE(OdDbEntityPtr poEntity)
     if (poPL->isClosed())
         oSmoothPolyline.Close();
 
-    poFeature->SetGeometryDirectly(oSmoothPolyline.Tessellate());
+    const bool bAsPolygon = poPL->isClosed() && poDS->ClosedLineAsPolygon();
+
+    poFeature->SetGeometryDirectly(oSmoothPolyline.Tessellate(bAsPolygon));
 
     PrepareLineStyle(poFeature);
 
diff --git a/ogr/ogrsf_frmts/dwg/ogrteigha.cpp b/ogr/ogrsf_frmts/dwg/ogrteigha.cpp
index f32032369a0f..b016a64972f1 100644
--- a/ogr/ogrsf_frmts/dwg/ogrteigha.cpp
+++ b/ogr/ogrsf_frmts/dwg/ogrteigha.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2017, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_multiproc.h"
diff --git a/ogr/ogrsf_frmts/dwg/ogrteigha.h b/ogr/ogrsf_frmts/dwg/ogrteigha.h
index 4bf82badd061..3adc5743fe3b 100644
--- a/ogr/ogrsf_frmts/dwg/ogrteigha.h
+++ b/ogr/ogrsf_frmts/dwg/ogrteigha.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2017, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_TEIGHA_H
diff --git a/ogr/ogrsf_frmts/dxf/ogr_autocad_services.cpp b/ogr/ogrsf_frmts/dxf/ogr_autocad_services.cpp
index 7e37fbf2b9ec..ec9171017d1d 100644
--- a/ogr/ogrsf_frmts/dxf/ogr_autocad_services.cpp
+++ b/ogr/ogrsf_frmts/dxf/ogr_autocad_services.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_autocad_services.h"
diff --git a/ogr/ogrsf_frmts/dxf/ogr_autocad_services.h b/ogr/ogrsf_frmts/dxf/ogr_autocad_services.h
index 03222444d8bd..43b56a58d5cb 100644
--- a/ogr/ogrsf_frmts/dxf/ogr_autocad_services.h
+++ b/ogr/ogrsf_frmts/dxf/ogr_autocad_services.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2011,  Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_AUTOCAD_SERVICES_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/dxf/ogr_dxf.h b/ogr/ogrsf_frmts/dxf/ogr_dxf.h
index 7badbce4a891..5fd9cf5e7e9f 100644
--- a/ogr/ogrsf_frmts/dxf/ogr_dxf.h
+++ b/ogr/ogrsf_frmts/dxf/ogr_dxf.h
@@ -10,23 +10,7 @@
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.com>
  * Copyright (c) 2017, Alan Thomas <alant@outlook.com.au>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_DXF_H_INCLUDED
@@ -589,14 +573,14 @@ class OGRDXFLayer final : public OGRLayer
     {                                                                          \
         CPLError(CE_Failure, CPLE_AppDefined,                                  \
                  "%s, %d: error at line %d of %s", __FILE__, __LINE__,         \
-                 GetLineNumber(), GetName());                                  \
+                 GetLineNumber(), GetDescription());                           \
     } while (0)
 #define DXF_LAYER_READER_ERROR()                                               \
     do                                                                         \
     {                                                                          \
         CPLError(CE_Failure, CPLE_AppDefined,                                  \
                  "%s, %d: error at line %d of %s", __FILE__, __LINE__,         \
-                 poDS->GetLineNumber(), poDS->GetName());                      \
+                 poDS->GetLineNumber(), poDS->GetDescription());               \
     } while (0)
 
 class OGRDXFReader
@@ -643,11 +627,10 @@ enum OGRDXFFieldModes
 /*                           OGRDXFDataSource                           */
 /************************************************************************/
 
-class OGRDXFDataSource final : public OGRDataSource
+class OGRDXFDataSource final : public GDALDataset
 {
     VSILFILE *fp;
 
-    CPLString osName;
     std::vector<OGRLayer *> apoLayers;
 
     unsigned int iEntitiesOffset;
@@ -675,6 +658,8 @@ class OGRDXFDataSource final : public OGRDataSource
     bool bMergeBlockGeometries;
     bool bTranslateEscapeSequences;
     bool bIncludeRawCodeValues;
+    bool m_bClosedLineAsPolygon = false;
+    double m_dfHatchTolerance = -1.0;
 
     bool b3DExtensibleMode;
     bool bHaveReadSolidData;
@@ -688,12 +673,8 @@ class OGRDXFDataSource final : public OGRDataSource
     OGRDXFDataSource();
     ~OGRDXFDataSource();
 
-    int Open(const char *pszFilename, int bHeaderOnly = FALSE);
-
-    const char *GetName() override
-    {
-        return osName;
-    }
+    int Open(const char *pszFilename, bool bHeaderOnly,
+             CSLConstList papszOptionsIn);
 
     int GetLayerCount() override
     {
@@ -731,6 +712,16 @@ class OGRDXFDataSource final : public OGRDataSource
         return b3DExtensibleMode;
     }
 
+    bool ClosedLineAsPolygon() const
+    {
+        return m_bClosedLineAsPolygon;
+    }
+
+    double HatchTolerance() const
+    {
+        return m_dfHatchTolerance;
+    }
+
     static void AddStandardFields(OGRFeatureDefn *poDef, const int nFieldModes);
 
     // Implemented in ogrdxf_blockmap.cpp
@@ -926,13 +917,12 @@ class OGRDXFBlocksWriterLayer final : public OGRLayer
 /*                           OGRDXFWriterDS                             */
 /************************************************************************/
 
-class OGRDXFWriterDS final : public OGRDataSource
+class OGRDXFWriterDS final : public GDALDataset
 {
     friend class OGRDXFWriterLayer;
 
     int nNextFID;
 
-    CPLString osName;
     OGRDXFWriterLayer *poLayer;
     OGRDXFBlocksWriterLayer *poBlocksLayer;
     VSILFILE *fp;
@@ -970,11 +960,6 @@ class OGRDXFWriterDS final : public OGRDataSource
 
     int Open(const char *pszFilename, char **papszOptions);
 
-    const char *GetName() override
-    {
-        return osName;
-    }
-
     int GetLayerCount() override;
     OGRLayer *GetLayer(int) override;
 
diff --git a/ogr/ogrsf_frmts/dxf/ogrdxf_blockmap.cpp b/ogr/ogrsf_frmts/dxf/ogrdxf_blockmap.cpp
index 15a4fc9ba8aa..1cd2112b617f 100644
--- a/ogr/ogrsf_frmts/dxf/ogrdxf_blockmap.cpp
+++ b/ogr/ogrsf_frmts/dxf/ogrdxf_blockmap.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2009, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_dxf.h"
diff --git a/ogr/ogrsf_frmts/dxf/ogrdxf_dimension.cpp b/ogr/ogrsf_frmts/dxf/ogrdxf_dimension.cpp
index cbb22817b98d..c1976056b3be 100644
--- a/ogr/ogrsf_frmts/dxf/ogrdxf_dimension.cpp
+++ b/ogr/ogrsf_frmts/dxf/ogrdxf_dimension.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.com>
  * Copyright (c) 2017, Alan Thomas <alant@outlook.com.au>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_dxf.h"
diff --git a/ogr/ogrsf_frmts/dxf/ogrdxf_feature.cpp b/ogr/ogrsf_frmts/dxf/ogrdxf_feature.cpp
index 9576d98e4d29..8bb92b3aab50 100644
--- a/ogr/ogrsf_frmts/dxf/ogrdxf_feature.cpp
+++ b/ogr/ogrsf_frmts/dxf/ogrdxf_feature.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2017, Alan Thomas <alant@outlook.com.au>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_dxf.h"
diff --git a/ogr/ogrsf_frmts/dxf/ogrdxf_hatch.cpp b/ogr/ogrsf_frmts/dxf/ogrdxf_hatch.cpp
index 6affd2e8b8d3..55c929feba93 100644
--- a/ogr/ogrsf_frmts/dxf/ogrdxf_hatch.cpp
+++ b/ogr/ogrsf_frmts/dxf/ogrdxf_hatch.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.com>
  * Copyright (c) 2017, Alan Thomas <alant@outlook.com.au>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_dxf.h"
@@ -106,7 +90,7 @@ OGRDXFFeature *OGRDXFLayer::TranslateHATCH()
     /* -------------------------------------------------------------------- */
     /*      Obtain a tolerance value used when building the polygon.        */
     /* -------------------------------------------------------------------- */
-    double dfTolerance = atof(CPLGetConfigOption("DXF_HATCH_TOLERANCE", "-1"));
+    double dfTolerance = poDS->HatchTolerance();
     if (dfTolerance < 0)
     {
         // If the configuration variable isn't set, compute the bounding box
@@ -696,7 +680,7 @@ OGRErr OGRDXFLayer::CollectPolylinePath(OGRGeometryCollection *poGC,
     if (nVertexCount >= 2)
     {
         oSmoothPolyline.SetUseMaxGapWhenTessellatingArcs(poDS->InlineBlocks());
-        poGC->addGeometryDirectly(oSmoothPolyline.Tessellate());
+        poGC->addGeometryDirectly(oSmoothPolyline.Tessellate(false));
     }
 
     /* -------------------------------------------------------------------- */
diff --git a/ogr/ogrsf_frmts/dxf/ogrdxf_leader.cpp b/ogr/ogrsf_frmts/dxf/ogrdxf_leader.cpp
index 8cdb26f6e7dc..4f5ae6ba6f4d 100644
--- a/ogr/ogrsf_frmts/dxf/ogrdxf_leader.cpp
+++ b/ogr/ogrsf_frmts/dxf/ogrdxf_leader.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2017, Alan Thomas <alant@outlook.com.au>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_dxf.h"
@@ -1412,7 +1396,7 @@ static void InterpolateSpline(OGRLineString *const poLine,
         adfParameters.push_back(dfParameter);
     }
 
-    const double dfTotalChordLength = adfParameters[adfParameters.size() - 1];
+    const double dfTotalChordLength = adfParameters.back();
 
     // Start tangent can be worked out from the first chord
     DXFTriple oStartTangent(aoDataPoints[1].dfX - aoDataPoints[0].dfX,
diff --git a/ogr/ogrsf_frmts/dxf/ogrdxf_ocstransformer.cpp b/ogr/ogrsf_frmts/dxf/ogrdxf_ocstransformer.cpp
index e8fe22cdce17..7986dff433ee 100644
--- a/ogr/ogrsf_frmts/dxf/ogrdxf_ocstransformer.cpp
+++ b/ogr/ogrsf_frmts/dxf/ogrdxf_ocstransformer.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.com>
  * Copyright (c) 2018, Alan Thomas <alant@outlook.com.au>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_dxf.h"
diff --git a/ogr/ogrsf_frmts/dxf/ogrdxf_polyline_smooth.cpp b/ogr/ogrsf_frmts/dxf/ogrdxf_polyline_smooth.cpp
index be1ebad4281b..a1da86e9d91d 100644
--- a/ogr/ogrsf_frmts/dxf/ogrdxf_polyline_smooth.cpp
+++ b/ogr/ogrsf_frmts/dxf/ogrdxf_polyline_smooth.cpp
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2010 Daylon Graphics Ltd.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "stdlib.h"
@@ -63,7 +47,7 @@ static double GetOGRangle(double angle)
 /*                DXFSmoothPolyline::Tessellate()                        */
 /************************************************************************/
 
-OGRGeometry *DXFSmoothPolyline::Tessellate() const
+OGRGeometry *DXFSmoothPolyline::Tessellate(bool bAsPolygon) const
 {
     assert(!m_vertices.empty());
 
@@ -84,7 +68,8 @@ OGRGeometry *DXFSmoothPolyline::Tessellate() const
     /*      Otherwise, presume a line string                                */
     /* -------------------------------------------------------------------- */
 
-    OGRLineString *poLS = new OGRLineString;
+    OGRLinearRing *poLR = m_bClosed && bAsPolygon ? new OGRLinearRing : nullptr;
+    OGRLineString *poLS = poLR ? poLR : new OGRLineString;
 
     m_blinestringstarted = false;
 
@@ -126,28 +111,14 @@ OGRGeometry *DXFSmoothPolyline::Tessellate() const
     if (m_dim == 2)
         poLS->flattenTo2D();
 
-/* -------------------------------------------------------------------- */
-/*      If polyline is closed, convert linestring to a linear ring      */
-/*                                                                      */
-/*      Actually, on review I'm not convinced this is a good idea.      */
-/*      Note that most (all) "filled polygons" are expressed with       */
-/*      hatches which are now handled fairly well and they tend to      */
-/*      echo linear polylines.                                          */
-/* -------------------------------------------------------------------- */
-#ifdef notdef
-    if (m_bClosed)
+    if (poLR)
     {
-        OGRLinearRing *poLR = new OGRLinearRing();
-        poLR->addSubLineString(poLS, 0);
-        delete poLS;
-
         // Wrap as polygon.
         OGRPolygon *poPoly = new OGRPolygon();
         poPoly->addRingDirectly(poLR);
 
         return poPoly;
     }
-#endif
 
     return poLS;
 }
@@ -251,16 +222,22 @@ void DXFSmoothPolyline::EmitArc(const DXFSmoothPolylineVertex &start,
 
     if (fabs(ogrArcEndAngle - ogrArcStartAngle) <= 361.0)
     {
-        OGRLineString *poArcpoLS =
+        auto poArc = std::unique_ptr<OGRLineString>(
             OGRGeometryFactory::approximateArcAngles(
                 ogrArcCenter.x, ogrArcCenter.y, dfZ, ogrArcRadius, ogrArcRadius,
                 ogrArcRotation, ogrArcStartAngle, ogrArcEndAngle, 0.0,
                 m_bUseMaxGapWhenTessellatingArcs)
-                ->toLineString();
+                ->toLineString());
 
-        poLS->addSubLineString(poArcpoLS);
+        // Make sure extremities exactly match input start and end point.
+        // This is in particular important if the polyline is closed.
+        if (poArc->getNumPoints() >= 2)
+        {
+            poArc->setPoint(0, start.x, start.y);
+            poArc->setPoint(poArc->getNumPoints() - 1, end.x, end.y);
+        }
 
-        delete poArcpoLS;
+        poLS->addSubLineString(poArc.get());
     }
     else
     {
diff --git a/ogr/ogrsf_frmts/dxf/ogrdxf_polyline_smooth.h b/ogr/ogrsf_frmts/dxf/ogrdxf_polyline_smooth.h
index 2ee6a08ba090..d0e1d924f092 100644
--- a/ogr/ogrsf_frmts/dxf/ogrdxf_polyline_smooth.h
+++ b/ogr/ogrsf_frmts/dxf/ogrdxf_polyline_smooth.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2010 Daylon Graphics Ltd.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRDXF_SMOOTH_POLYLINE_H_INCLUDED
@@ -114,7 +98,7 @@ class DXFSmoothPolyline
     {
     }
 
-    OGRGeometry *Tessellate() const;
+    OGRGeometry *Tessellate(bool bAsPolygon) const;
 
     size_t size() const
     {
diff --git a/ogr/ogrsf_frmts/dxf/ogrdxfblockslayer.cpp b/ogr/ogrsf_frmts/dxf/ogrdxfblockslayer.cpp
index 2b288a1082ed..05368df41f40 100644
--- a/ogr/ogrsf_frmts/dxf/ogrdxfblockslayer.cpp
+++ b/ogr/ogrsf_frmts/dxf/ogrdxfblockslayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_dxf.h"
diff --git a/ogr/ogrsf_frmts/dxf/ogrdxfblockswriterlayer.cpp b/ogr/ogrsf_frmts/dxf/ogrdxfblockswriterlayer.cpp
index 2b64bf7e2844..0c4547380269 100644
--- a/ogr/ogrsf_frmts/dxf/ogrdxfblockswriterlayer.cpp
+++ b/ogr/ogrsf_frmts/dxf/ogrdxfblockswriterlayer.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_dxf.h"
diff --git a/ogr/ogrsf_frmts/dxf/ogrdxfdatasource.cpp b/ogr/ogrsf_frmts/dxf/ogrdxfdatasource.cpp
index 55f622fd3e67..52a3dc74323c 100644
--- a/ogr/ogrsf_frmts/dxf/ogrdxfdatasource.cpp
+++ b/ogr/ogrsf_frmts/dxf/ogrdxfdatasource.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2009, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_dxf.h"
@@ -100,26 +84,42 @@ OGRLayer *OGRDXFDataSource::GetLayer(int iLayer)
 /*                                Open()                                */
 /************************************************************************/
 
-int OGRDXFDataSource::Open(const char *pszFilename, int bHeaderOnly)
+int OGRDXFDataSource::Open(const char *pszFilename, bool bHeaderOnly,
+                           CSLConstList papszOptionsIn)
 
 {
     osEncoding = CPL_ENC_ISO8859_1;
 
-    osName = pszFilename;
+    bInlineBlocks = CPLTestBool(
+        CSLFetchNameValueDef(papszOptionsIn, "INLINE_BLOCKS",
+                             CPLGetConfigOption("DXF_INLINE_BLOCKS", "TRUE")));
+    bMergeBlockGeometries = CPLTestBool(CSLFetchNameValueDef(
+        papszOptionsIn, "MERGE_BLOCK_GEOMETRIES",
+        CPLGetConfigOption("DXF_MERGE_BLOCK_GEOMETRIES", "TRUE")));
+
+    bTranslateEscapeSequences = CPLTestBool(CSLFetchNameValueDef(
+        papszOptionsIn, "TRANSLATE_ESCAPE_SEQUENCES",
+        CPLGetConfigOption("DXF_TRANSLATE_ESCAPE_SEQUENCES", "TRUE")));
+
+    bIncludeRawCodeValues = CPLTestBool(CSLFetchNameValueDef(
+        papszOptionsIn, "INCLUDE_RAW_CODE_VALUES",
+        CPLGetConfigOption("DXF_INCLUDE_RAW_CODE_VALUES", "FALSE")));
+
+    b3DExtensibleMode = CPLTestBool(CSLFetchNameValueDef(
+        papszOptionsIn, "3D_EXTENSIBLE_MODE",
+        CPLGetConfigOption("DXF_3D_EXTENSIBLE_MODE", "FALSE")));
+
+    m_bClosedLineAsPolygon = CPLTestBool(CSLFetchNameValueDef(
+        papszOptionsIn, "CLOSED_LINE_AS_POLYGON",
+        CPLGetConfigOption("DXF_CLOSED_LINE_AS_POLYGON", "FALSE")));
 
-    bInlineBlocks =
-        CPLTestBool(CPLGetConfigOption("DXF_INLINE_BLOCKS", "TRUE"));
-    bMergeBlockGeometries =
-        CPLTestBool(CPLGetConfigOption("DXF_MERGE_BLOCK_GEOMETRIES", "TRUE"));
-    bTranslateEscapeSequences = CPLTestBool(
-        CPLGetConfigOption("DXF_TRANSLATE_ESCAPE_SEQUENCES", "TRUE"));
-    bIncludeRawCodeValues =
-        CPLTestBool(CPLGetConfigOption("DXF_INCLUDE_RAW_CODE_VALUES", "FALSE"));
-    b3DExtensibleMode =
-        CPLTestBool(CPLGetConfigOption("DXF_3D_EXTENSIBLE_MODE", "FALSE"));
+    m_dfHatchTolerance = CPLAtof(
+        CSLFetchNameValueDef(papszOptionsIn, "HATCH_TOLERANCE",
+                             CPLGetConfigOption("DXF_HATCH_TOLERANCE", "-1")));
 
+    // Only for debugging
     if (CPLTestBool(CPLGetConfigOption("DXF_HEADER_ONLY", "FALSE")))
-        bHeaderOnly = TRUE;
+        bHeaderOnly = true;
 
     /* -------------------------------------------------------------------- */
     /*      Open the file.                                                  */
@@ -151,7 +151,9 @@ int OGRDXFDataSource::Open(const char *pszFilename, int bHeaderOnly)
      */
     else if (EQUAL(szLineBuf, "TABLES"))
     {
-        osEncoding = CPLGetConfigOption("DXF_ENCODING", osEncoding);
+        osEncoding = CSLFetchNameValueDef(
+            papszOptionsIn, "ENCODING",
+            CPLGetConfigOption("DXF_ENCODING", osEncoding));
 
         if (!ReadTablesSection())
             return FALSE;
diff --git a/ogr/ogrsf_frmts/dxf/ogrdxfdriver.cpp b/ogr/ogrsf_frmts/dxf/ogrdxfdriver.cpp
index f109b890811d..707a9ee1389b 100644
--- a/ogr/ogrsf_frmts/dxf/ogrdxfdriver.cpp
+++ b/ogr/ogrsf_frmts/dxf/ogrdxfdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2009, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_dxf.h"
@@ -85,7 +69,8 @@ static GDALDataset *OGRDXFDriverOpen(GDALOpenInfo *poOpenInfo)
 
     OGRDXFDataSource *poDS = new OGRDXFDataSource();
 
-    if (!poDS->Open(poOpenInfo->pszFilename))
+    if (!poDS->Open(poOpenInfo->pszFilename, false,
+                    poOpenInfo->papszOpenOptions))
     {
         delete poDS;
         poDS = nullptr;
@@ -146,6 +131,35 @@ void RegisterOGRDXF()
         "first entity'/>"
         "</CreationOptionList>");
 
+    poDriver->SetMetadataItem(
+        GDAL_DMD_OPENOPTIONLIST,
+        "<OpenOptionList>"
+        "  <Option name='CLOSED_LINE_AS_POLYGON' type='boolean' description="
+        "'Whether to expose closed POLYLINE/LWPOLYLINE as polygons' "
+        "default='NO'/>"
+        "  <Option name='INLINE_BLOCKS' type='boolean' description="
+        "'Whether INSERT entities are exploded with the geometry of the BLOCK "
+        "they reference' default='YES'/>"
+        "  <Option name='MERGE_BLOCK_GEOMETRIES' type='boolean' description="
+        "'Whether blocks should be merged into a compound geometry' "
+        "default='YES'/>"
+        "  <Option name='TRANSLATE_ESCAPE_SEQUENCES' type='boolean' "
+        "description="
+        "'Whether character escapes are honored where applicable, and MTEXT "
+        "control sequences are stripped' default='YES'/>"
+        "  <Option name='INCLUDE_RAW_CODE_VALUES' type='boolean' description="
+        "'Whether a RawCodeValues field should be added to contain all group "
+        "codes and values' default='NO'/>"
+        "  <Option name='3D_EXTENSIBLE_MODE' type='boolean' description="
+        "'Whether to include ASM entities with the raw ASM data stored in a "
+        "field' default='NO'/>"
+        "  <Option name='HATCH_TOLEARNCE' type='float' description="
+        "'Tolerance used when looking for the next component to add to the "
+        "hatch boundary.'/>"
+        "  <Option name='ENCODING' type='string' description="
+        "'Encoding name, as supported by iconv, to override $DWGCODEPAGE'/>"
+        "</OpenOptionList>");
+
     poDriver->SetMetadataItem(GDAL_DS_LAYER_CREATIONOPTIONLIST,
                               "<LayerCreationOptionList/>");
 
diff --git a/ogr/ogrsf_frmts/dxf/ogrdxflayer.cpp b/ogr/ogrsf_frmts/dxf/ogrdxflayer.cpp
index 7bacee8e844c..812b95de981d 100644
--- a/ogr/ogrsf_frmts/dxf/ogrdxflayer.cpp
+++ b/ogr/ogrsf_frmts/dxf/ogrdxflayer.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.com>
  * Copyright (c) 2017-2020, Alan Thomas <alant@outlook.com.au>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_dxf.h"
@@ -554,7 +538,7 @@ OGRDXFFeature *OGRDXFLayer::TranslateMTEXT()
     /*      Apply text after stripping off any extra terminating newline.   */
     /* -------------------------------------------------------------------- */
     if (!osText.empty() && osText.back() == '\n')
-        osText.resize(osText.size() - 1);
+        osText.pop_back();
 
     poFeature->SetField("Text", osText);
 
@@ -1170,11 +1154,15 @@ OGRDXFFeature *OGRDXFLayer::TranslateLWPOLYLINE()
     /* -------------------------------------------------------------------- */
     /*      Close polyline if necessary.                                    */
     /* -------------------------------------------------------------------- */
-    if (nPolylineFlag & 0x01)
+    const bool bIsClosed = (nPolylineFlag & 0x01) != 0;
+    if (bIsClosed)
         smoothPolyline.Close();
 
+    const bool bAsPolygon = bIsClosed && poDS->ClosedLineAsPolygon();
+
     smoothPolyline.SetUseMaxGapWhenTessellatingArcs(poDS->InlineBlocks());
-    auto poGeom = std::unique_ptr<OGRGeometry>(smoothPolyline.Tessellate());
+    auto poGeom =
+        std::unique_ptr<OGRGeometry>(smoothPolyline.Tessellate(bAsPolygon));
     poFeature->ApplyOCSTransformer(poGeom.get());
     poFeature->SetGeometryDirectly(poGeom.release());
 
@@ -1419,11 +1407,14 @@ OGRDXFFeature *OGRDXFLayer::TranslatePOLYLINE()
     /* -------------------------------------------------------------------- */
     /*      Close polyline if necessary.                                    */
     /* -------------------------------------------------------------------- */
-    if (nPolylineFlag & 0x01)
+    const bool bIsClosed = (nPolylineFlag & 0x01) != 0;
+    if (bIsClosed)
         smoothPolyline.Close();
 
+    const bool bAsPolygon = bIsClosed && poDS->ClosedLineAsPolygon();
+
     smoothPolyline.SetUseMaxGapWhenTessellatingArcs(poDS->InlineBlocks());
-    OGRGeometry *poGeom = smoothPolyline.Tessellate();
+    OGRGeometry *poGeom = smoothPolyline.Tessellate(bAsPolygon);
 
     if ((nPolylineFlag & 8) == 0)
         poFeature->ApplyOCSTransformer(poGeom);
diff --git a/ogr/ogrsf_frmts/dxf/ogrdxfreader.cpp b/ogr/ogrsf_frmts/dxf/ogrdxfreader.cpp
index 885d411eafee..8155bb2454b2 100644
--- a/ogr/ogrsf_frmts/dxf/ogrdxfreader.cpp
+++ b/ogr/ogrsf_frmts/dxf/ogrdxfreader.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2009, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_dxf.h"
diff --git a/ogr/ogrsf_frmts/dxf/ogrdxfwriterds.cpp b/ogr/ogrsf_frmts/dxf/ogrdxfwriterds.cpp
index 77466d699746..7db9da389420 100644
--- a/ogr/ogrsf_frmts/dxf/ogrdxfwriterds.cpp
+++ b/ogr/ogrsf_frmts/dxf/ogrdxfwriterds.cpp
@@ -9,27 +9,12 @@
  * Copyright (c) 2009, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2010-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
 
+#include <cmath>
 #include <cstdlib>
 
 #include "ogr_dxf.h"
@@ -237,7 +222,7 @@ int OGRDXFWriterDS::Open(const char *pszFilename, char **papszOptions)
     /*      Attempt to read the template header file so we have a list      */
     /*      of layers, linestyles and blocks.                               */
     /* -------------------------------------------------------------------- */
-    if (!oHeaderDS.Open(osHeaderFile, TRUE))
+    if (!oHeaderDS.Open(osHeaderFile, true, nullptr))
         return FALSE;
 
     /* -------------------------------------------------------------------- */
@@ -352,10 +337,10 @@ bool OGRDXFWriterDS::TransferUpdateHeader(VSILFILE *fpOut)
 
     // We don't like non-finite extents. In this case, just write a generic
     // bounding box. Most CAD programs probably ignore this anyway.
-    if (!CPLIsFinite(oGlobalEnvelope.MinX) ||
-        !CPLIsFinite(oGlobalEnvelope.MinY) ||
-        !CPLIsFinite(oGlobalEnvelope.MaxX) ||
-        !CPLIsFinite(oGlobalEnvelope.MaxY))
+    if (!std::isfinite(oGlobalEnvelope.MinX) ||
+        !std::isfinite(oGlobalEnvelope.MinY) ||
+        !std::isfinite(oGlobalEnvelope.MaxX) ||
+        !std::isfinite(oGlobalEnvelope.MaxY))
     {
         oGlobalEnvelope.MinX = 0.0;
         oGlobalEnvelope.MinY = 0.0;
diff --git a/ogr/ogrsf_frmts/dxf/ogrdxfwriterlayer.cpp b/ogr/ogrsf_frmts/dxf/ogrdxfwriterlayer.cpp
index 58c82c48c553..499da0bbe640 100644
--- a/ogr/ogrsf_frmts/dxf/ogrdxfwriterlayer.cpp
+++ b/ogr/ogrsf_frmts/dxf/ogrdxfwriterlayer.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2009, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_dxf.h"
diff --git a/ogr/ogrsf_frmts/edigeo/ogr_edigeo.h b/ogr/ogrsf_frmts/edigeo/ogr_edigeo.h
index c062b41fbd5e..a1b67ff23609 100644
--- a/ogr/ogrsf_frmts/edigeo/ogr_edigeo.h
+++ b/ogr/ogrsf_frmts/edigeo/ogr_edigeo.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_EDIGEO_H_INCLUDED
@@ -153,11 +137,10 @@ class OGREDIGEOFEADesc
     CPLString osQUP_RID; /* e.g. Actualite_Objet_X */
 };
 
-class OGREDIGEODataSource final : public OGRDataSource
+class OGREDIGEODataSource final : public GDALDataset
 {
     friend class OGREDIGEOLayer;
 
-    char *pszName;
     VSILFILE *fpTHF;
 
     OGRLayer **papoLayers;
@@ -249,16 +232,9 @@ class OGREDIGEODataSource final : public OGRDataSource
 
     int Open(const char *pszFilename);
 
-    virtual const char *GetName() override
-    {
-        return pszName;
-    }
-
     virtual int GetLayerCount() override;
     virtual OGRLayer *GetLayer(int) override;
 
-    virtual int TestCapability(const char *) override;
-
     int HasUTF8ContentOnly()
     {
         return bHasUTF8ContentOnly;
diff --git a/ogr/ogrsf_frmts/edigeo/ogredigeodatasource.cpp b/ogr/ogrsf_frmts/edigeo/ogredigeodatasource.cpp
index d966bd15f764..91135d0f18b3 100644
--- a/ogr/ogrsf_frmts/edigeo/ogredigeodatasource.cpp
+++ b/ogr/ogrsf_frmts/edigeo/ogredigeodatasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_edigeo.h"
@@ -35,10 +19,10 @@
 /************************************************************************/
 
 OGREDIGEODataSource::OGREDIGEODataSource()
-    : pszName(nullptr), fpTHF(nullptr), papoLayers(nullptr), nLayers(0),
-      poSRS(nullptr), bExtentValid(FALSE), dfMinX(0), dfMinY(0), dfMaxX(0),
-      dfMaxY(0), bRecodeToUTF8(CPLTestBool(
-                     CPLGetConfigOption("OGR_EDIGEO_RECODE_TO_UTF8", "YES"))),
+    : fpTHF(nullptr), papoLayers(nullptr), nLayers(0), poSRS(nullptr),
+      bExtentValid(FALSE), dfMinX(0), dfMinY(0), dfMaxX(0), dfMaxY(0),
+      bRecodeToUTF8(
+          CPLTestBool(CPLGetConfigOption("OGR_EDIGEO_RECODE_TO_UTF8", "YES"))),
       bHasUTF8ContentOnly(TRUE), iATR(-1), iDI3(-1), iDI4(-1), iHEI(-1),
       iFON(-1), iATR_VAL(-1), iANGLE(-1), iSIZE(-1), iOBJ_LNK(-1),
       iOBJ_LNK_LAYER(-1),
@@ -64,8 +48,6 @@ OGREDIGEODataSource::~OGREDIGEODataSource()
         delete papoLayers[i];
     CPLFree(papoLayers);
 
-    CPLFree(pszName);
-
     if (fpTHF)
         VSIFCloseL(fpTHF);
 
@@ -73,15 +55,6 @@ OGREDIGEODataSource::~OGREDIGEODataSource()
         poSRS->Release();
 }
 
-/************************************************************************/
-/*                           TestCapability()                           */
-/************************************************************************/
-
-int OGREDIGEODataSource::TestCapability(CPL_UNUSED const char *pszCap)
-{
-    return FALSE;
-}
-
 /************************************************************************/
 /*                              GetLayer()                              */
 /************************************************************************/
@@ -183,14 +156,14 @@ VSILFILE *OGREDIGEODataSource::OpenFile(const char *pszType,
                                         const CPLString &osExt)
 {
     CPLString osTmp = osLON + pszType;
-    CPLString osFilename =
-        CPLFormCIFilename(CPLGetPath(pszName), osTmp.c_str(), osExt.c_str());
+    CPLString osFilename = CPLFormCIFilename(CPLGetPath(GetDescription()),
+                                             osTmp.c_str(), osExt.c_str());
     VSILFILE *fp = VSIFOpenL(osFilename, "rb");
     if (fp == nullptr)
     {
         const CPLString osExtLower = CPLString(osExt).tolower();
         const CPLString osFilename2 = CPLFormCIFilename(
-            CPLGetPath(pszName), osTmp.c_str(), osExtLower.c_str());
+            CPLGetPath(GetDescription()), osTmp.c_str(), osExtLower.c_str());
         fp = VSIFOpenL(osFilename2, "rb");
         if (fp == nullptr)
         {
@@ -1384,8 +1357,6 @@ static int OGREDIGEOSortForQGIS(const void *a, const void *b)
 int OGREDIGEODataSource::Open(const char *pszFilename)
 
 {
-    pszName = CPLStrdup(pszFilename);
-
     fpTHF = VSIFOpenL(pszFilename, "rb");
     if (fpTHF == nullptr)
         return FALSE;
diff --git a/ogr/ogrsf_frmts/edigeo/ogredigeodriver.cpp b/ogr/ogrsf_frmts/edigeo/ogredigeodriver.cpp
index b3c25f0fdbaf..ab8861c8ef86 100644
--- a/ogr/ogrsf_frmts/edigeo/ogredigeodriver.cpp
+++ b/ogr/ogrsf_frmts/edigeo/ogredigeodriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_edigeo.h"
diff --git a/ogr/ogrsf_frmts/edigeo/ogredigeolayer.cpp b/ogr/ogrsf_frmts/edigeo/ogredigeolayer.cpp
index 314e8221ffdd..3c74bea444ee 100644
--- a/ogr/ogrsf_frmts/edigeo/ogredigeolayer.cpp
+++ b/ogr/ogrsf_frmts/edigeo/ogredigeolayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_edigeo.h"
diff --git a/ogr/ogrsf_frmts/elastic/CMakeLists.txt b/ogr/ogrsf_frmts/elastic/CMakeLists.txt
index 0f8544eb801c..f34e98f5f7fa 100644
--- a/ogr/ogrsf_frmts/elastic/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/elastic/CMakeLists.txt
@@ -16,7 +16,6 @@ if(NOT TARGET ogr_Elastic)
 endif()
 
 gdal_standard_includes(ogr_Elastic)
-target_include_directories(ogr_Elastic PRIVATE ${GDAL_VECTOR_FORMAT_SOURCE_DIR}/geojson)
 if (GDAL_USE_JSONC_INTERNAL)
   gdal_add_vendored_lib(ogr_Elastic libjson)
 else ()
diff --git a/ogr/ogrsf_frmts/elastic/ogr_elastic.h b/ogr/ogrsf_frmts/elastic/ogr_elastic.h
index 42a3bbb9e071..a2e5f7cb5035 100644
--- a/ogr/ogrsf_frmts/elastic/ogr_elastic.h
+++ b/ogr/ogrsf_frmts/elastic/ogr_elastic.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Adam Estrada
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_ELASTIC_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/elastic/ogrelasticaggregationlayer.cpp b/ogr/ogrsf_frmts/elastic/ogrelasticaggregationlayer.cpp
index cbda028cd36d..57f433fa27bc 100644
--- a/ogr/ogrsf_frmts/elastic/ogrelasticaggregationlayer.cpp
+++ b/ogr/ogrsf_frmts/elastic/ogrelasticaggregationlayer.cpp
@@ -7,27 +7,11 @@
  ******************************************************************************
  * Copyright (c) 2021, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_elastic.h"
-#include "ogrgeojsonreader.h"
+#include "ogrlibjsonutils.h"
 #include "cpl_json.h"
 
 #include <algorithm>
diff --git a/ogr/ogrsf_frmts/elastic/ogrelasticdatasource.cpp b/ogr/ogrsf_frmts/elastic/ogrelasticdatasource.cpp
index 02a9b464c3e5..329e60ab7768 100644
--- a/ogr/ogrsf_frmts/elastic/ogrelasticdatasource.cpp
+++ b/ogr/ogrsf_frmts/elastic/ogrelasticdatasource.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2011, Adam Estrada
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_elastic.h"
@@ -32,7 +16,7 @@
 #include "cpl_string.h"
 #include "cpl_csv.h"
 #include "cpl_http.h"
-#include "ogrgeojsonreader.h"
+#include "ogrlibjsonutils.h"
 #include "ogr_swq.h"
 
 /************************************************************************/
diff --git a/ogr/ogrsf_frmts/elastic/ogrelasticdriver.cpp b/ogr/ogrsf_frmts/elastic/ogrelasticdriver.cpp
index d365f2606077..b8954a39e2a3 100644
--- a/ogr/ogrsf_frmts/elastic/ogrelasticdriver.cpp
+++ b/ogr/ogrsf_frmts/elastic/ogrelasticdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Adam Estrada
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_elastic.h"
diff --git a/ogr/ogrsf_frmts/elastic/ogrelasticdrivercore.cpp b/ogr/ogrsf_frmts/elastic/ogrelasticdrivercore.cpp
index 68e215d2866e..4312e6faaaa4 100644
--- a/ogr/ogrsf_frmts/elastic/ogrelasticdrivercore.cpp
+++ b/ogr/ogrsf_frmts/elastic/ogrelasticdrivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Adam Estrada
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
diff --git a/ogr/ogrsf_frmts/elastic/ogrelasticdrivercore.h b/ogr/ogrsf_frmts/elastic/ogrelasticdrivercore.h
index 766ec32c793c..b50056dea161 100644
--- a/ogr/ogrsf_frmts/elastic/ogrelasticdrivercore.h
+++ b/ogr/ogrsf_frmts/elastic/ogrelasticdrivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Adam Estrada
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRELASTICDRIVERCORE_H
diff --git a/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp b/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp
index 14340b072981..22dd2cddc426 100644
--- a/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp
+++ b/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2011, Adam Estrada
  * Copyright (c) 2012-2016, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_elastic.h"
@@ -34,9 +18,9 @@
 #include "ogr_api.h"
 #include "ogr_p.h"
 #include "ogr_swq.h"
-#include "../geojson/ogrgeojsonwriter.h"
-#include "../geojson/ogrgeojsonreader.h"
-#include "../geojson/ogrgeojsonutils.h"
+#include "ogrgeojsonwriter.h"
+#include "ogrlibjsonutils.h"
+#include "ogrgeojsongeometry.h"
 #include "ogr_geo_utils.h"
 
 #include <cstdlib>
@@ -1579,6 +1563,8 @@ void OGRElasticLayer::BuildFeature(OGRFeature *poFeature, json_object *poSource,
         else if ((oIter = m_aosMapToGeomFieldIndex.find(osCurPath)) !=
                  m_aosMapToGeomFieldIndex.end())
         {
+            const auto poSRS = m_poFeatureDefn->GetGeomFieldDefn(oIter->second)
+                                   ->GetSpatialRef();
             OGRGeometry *poGeom = nullptr;
             if (m_abIsGeoPoint[oIter->second])
             {
@@ -1677,12 +1663,16 @@ void OGRElasticLayer::BuildFeature(OGRFeature *poFeature, json_object *poSource,
                     {
                         dfRadius *= dfUnit;
                         OGRLinearRing *poRing = new OGRLinearRing();
+                        double dfSemiMajor = OGR_GREATCIRCLE_DEFAULT_RADIUS;
+                        if (poSRS && poSRS->IsGeographic())
+                            dfSemiMajor = poSRS->GetSemiMajor();
                         for (double dfStep = 0; dfStep <= 360; dfStep += 4)
                         {
                             double dfLat = 0.0;
                             double dfLon = 0.0;
-                            OGR_GreatCircle_ExtendPosition(
-                                dfY, dfX, dfRadius, dfStep, &dfLat, &dfLon);
+                            OGR_GreatCircle_ExtendPosition(dfY, dfX, dfRadius,
+                                                           dfSemiMajor, dfStep,
+                                                           &dfLat, &dfLon);
                             poRing->addPoint(dfLon, dfLat);
                         }
                         OGRPolygon *poPoly = new OGRPolygon();
@@ -1740,9 +1730,7 @@ void OGRElasticLayer::BuildFeature(OGRFeature *poFeature, json_object *poSource,
 
             if (poGeom != nullptr)
             {
-                poGeom->assignSpatialReference(
-                    m_poFeatureDefn->GetGeomFieldDefn(oIter->second)
-                        ->GetSpatialRef());
+                poGeom->assignSpatialReference(poSRS);
                 poFeature->SetGeomFieldDirectly(oIter->second, poGeom);
             }
         }
diff --git a/ogr/ogrsf_frmts/filegdb/FGdbDatasource.cpp b/ogr/ogrsf_frmts/filegdb/FGdbDatasource.cpp
index e1bd8bba186a..ea9f244827a6 100644
--- a/ogr/ogrsf_frmts/filegdb/FGdbDatasource.cpp
+++ b/ogr/ogrsf_frmts/filegdb/FGdbDatasource.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2011, Paul Ramsey <pramsey at cleverelephant.ca>
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_fgdb.h"
@@ -117,9 +101,9 @@ OGRLayer *OGRFileGDBGroup::OpenVectorLayer(const std::string &osName,
 FGdbDataSource::FGdbDataSource(bool bUseDriverMutex,
                                FGdbDatabaseConnection *pConnection,
                                bool bUseOpenFileGDB)
-    : OGRDataSource(), m_bUseDriverMutex(bUseDriverMutex),
-      m_pConnection(pConnection), m_pGeodatabase(nullptr), m_bUpdate(false),
-      m_poOpenFileGDBDrv(nullptr), m_bUseOpenFileGDB(bUseOpenFileGDB)
+    : m_bUseDriverMutex(bUseDriverMutex), m_pConnection(pConnection),
+      m_pGeodatabase(nullptr), m_bUpdate(false), m_poOpenFileGDBDrv(nullptr),
+      m_bUseOpenFileGDB(bUseOpenFileGDB)
 {
     bPerLayerCopyingForTransaction = -1;
     SetDescription(pConnection->m_osName.c_str());
@@ -822,8 +806,8 @@ OGRLayer *FGdbDataSource::ExecuteSQL(const char *pszSQLCommand,
     /*      Use generic implementation for recognized dialects              */
     /* -------------------------------------------------------------------- */
     if (IsGenericSQLDialect(pszDialect))
-        return OGRDataSource::ExecuteSQL(pszSQLCommand, poSpatialFilter,
-                                         pszDialect);
+        return GDALDataset::ExecuteSQL(pszSQLCommand, poSpatialFilter,
+                                       pszDialect);
 
     /* -------------------------------------------------------------------- */
     /*      Special case GetLayerDefinition                                 */
@@ -888,8 +872,8 @@ OGRLayer *FGdbDataSource::ExecuteSQL(const char *pszSQLCommand,
                          "So for now, we use default OGR SQL engine. "
                          "Explicitly specify -dialect FileGDB\n"
                          "to use the SQL engine from the FileGDB SDK API");
-        OGRLayer *poLayer = OGRDataSource::ExecuteSQL(
-            pszSQLCommand, poSpatialFilter, pszDialect);
+        OGRLayer *poLayer =
+            GDALDataset::ExecuteSQL(pszSQLCommand, poSpatialFilter, pszDialect);
         if (poLayer)
             m_oSetSelectLayers.insert(poLayer);
         return poLayer;
diff --git a/ogr/ogrsf_frmts/filegdb/FGdbDriver.cpp b/ogr/ogrsf_frmts/filegdb/FGdbDriver.cpp
index 3b2eafa548f9..4c073ddafbac 100644
--- a/ogr/ogrsf_frmts/filegdb/FGdbDriver.cpp
+++ b/ogr/ogrsf_frmts/filegdb/FGdbDriver.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2011, Paul Ramsey <pramsey at cleverelephant.ca>
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_fgdb.h"
@@ -172,7 +156,7 @@ static GDALDataset *OGRFileGDBDriverOpen(GDALOpenInfo *poOpenInfo)
     }
     else
     {
-        OGRMutexedDataSource *poMutexedDS =
+        auto poMutexedDS =
             new OGRMutexedDataSource(pDS, TRUE, FGdbDriver::hMutex, TRUE);
         if (bUpdate)
             return OGRCreateEmulatedTransactionDataSourceWrapper(
@@ -263,15 +247,16 @@ OGRFileGDBDriverCreate(const char *pszName, CPL_UNUSED int nBands,
 /*                           StartTransaction()                         */
 /************************************************************************/
 
-OGRErr FGdbTransactionManager::StartTransaction(OGRDataSource *&poDSInOut,
+OGRErr FGdbTransactionManager::StartTransaction(GDALDataset *&poDSInOut,
                                                 int &bOutHasReopenedDS)
 {
     CPLMutexHolderOptionalLockD(FGdbDriver::hMutex);
 
     bOutHasReopenedDS = FALSE;
 
-    OGRMutexedDataSource *poMutexedDS = (OGRMutexedDataSource *)poDSInOut;
-    FGdbDataSource *poDS = (FGdbDataSource *)poMutexedDS->GetBaseDataSource();
+    auto poMutexedDS = (OGRMutexedDataSource *)poDSInOut;
+    FGdbDataSource *poDS =
+        cpl::down_cast<FGdbDataSource *>(poMutexedDS->GetBaseDataSource());
     if (!poDS->GetUpdate())
         return OGRERR_FAILURE;
     FGdbDatabaseConnection *pConnection = poDS->GetConnection();
@@ -291,10 +276,10 @@ OGRErr FGdbTransactionManager::StartTransaction(OGRDataSource *&poDSInOut,
 
     bOutHasReopenedDS = TRUE;
 
-    CPLString osName(poMutexedDS->GetName());
+    CPLString osName(poMutexedDS->GetDescription());
     CPLString osNameOri(osName);
     if (osName.back() == '/' || osName.back() == '\\')
-        osName.resize(osName.size() - 1);
+        osName.pop_back();
 
 #ifndef _WIN32
     int bPerLayerCopyingForTransaction =
@@ -431,7 +416,7 @@ OGRErr FGdbTransactionManager::StartTransaction(OGRDataSource *&poDSInOut,
 /*                           CommitTransaction()                        */
 /************************************************************************/
 
-OGRErr FGdbTransactionManager::CommitTransaction(OGRDataSource *&poDSInOut,
+OGRErr FGdbTransactionManager::CommitTransaction(GDALDataset *&poDSInOut,
                                                  int &bOutHasReopenedDS)
 {
     CPLMutexHolderOptionalLockD(FGdbDriver::hMutex);
@@ -449,10 +434,10 @@ OGRErr FGdbTransactionManager::CommitTransaction(OGRDataSource *&poDSInOut,
 
     bOutHasReopenedDS = TRUE;
 
-    CPLString osName(poMutexedDS->GetName());
+    CPLString osName(poMutexedDS->GetDescription());
     CPLString osNameOri(osName);
     if (osName.back() == '/' || osName.back() == '\\')
-        osName.resize(osName.size() - 1);
+        osName.pop_back();
 
 #ifndef _WIN32
     int bPerLayerCopyingForTransaction =
@@ -675,7 +660,7 @@ OGRErr FGdbTransactionManager::CommitTransaction(OGRDataSource *&poDSInOut,
 /*                           RollbackTransaction()                      */
 /************************************************************************/
 
-OGRErr FGdbTransactionManager::RollbackTransaction(OGRDataSource *&poDSInOut,
+OGRErr FGdbTransactionManager::RollbackTransaction(GDALDataset *&poDSInOut,
                                                    int &bOutHasReopenedDS)
 {
     CPLMutexHolderOptionalLockD(FGdbDriver::hMutex);
@@ -693,10 +678,10 @@ OGRErr FGdbTransactionManager::RollbackTransaction(OGRDataSource *&poDSInOut,
 
     bOutHasReopenedDS = TRUE;
 
-    CPLString osName(poMutexedDS->GetName());
+    CPLString osName(poMutexedDS->GetDescription());
     CPLString osNameOri(osName);
     if (osName.back() == '/' || osName.back() == '\\')
-        osName.resize(osName.size() - 1);
+        osName.pop_back();
 
     // int bPerLayerCopyingForTransaction =
     // poDS->HasPerLayerCopyingForTransaction();
diff --git a/ogr/ogrsf_frmts/filegdb/FGdbDriverCore.cpp b/ogr/ogrsf_frmts/filegdb/FGdbDriverCore.cpp
index e72ab824689d..88c5e9365f8f 100644
--- a/ogr/ogrsf_frmts/filegdb/FGdbDriverCore.cpp
+++ b/ogr/ogrsf_frmts/filegdb/FGdbDriverCore.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2011, Paul Ramsey <pramsey at cleverelephant.ca>
  * Copyright (c) 2011-2023, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
diff --git a/ogr/ogrsf_frmts/filegdb/FGdbDriverCore.h b/ogr/ogrsf_frmts/filegdb/FGdbDriverCore.h
index 94102d742cf6..6cf93cb6dd7f 100644
--- a/ogr/ogrsf_frmts/filegdb/FGdbDriverCore.h
+++ b/ogr/ogrsf_frmts/filegdb/FGdbDriverCore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRFILEGDBDRIVERCORE_H
diff --git a/ogr/ogrsf_frmts/filegdb/FGdbLayer.cpp b/ogr/ogrsf_frmts/filegdb/FGdbLayer.cpp
index 4ed3c46cc4f3..79390d0b3f0f 100644
--- a/ogr/ogrsf_frmts/filegdb/FGdbLayer.cpp
+++ b/ogr/ogrsf_frmts/filegdb/FGdbLayer.cpp
@@ -10,26 +10,12 @@
  * Copyright (c) 2011, Paul Ramsey <pramsey at cleverelephant.ca>
  * Copyright (c) 2011-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <cassert>
+#include <cmath>
+
 #include "ogr_fgdb.h"
 #include "ogrpgeogeometry.h"
 #include "cpl_conv.h"
@@ -1835,7 +1821,7 @@ char *FGdbLayer::CreateFieldDefn(OGRFieldDefn &oField, int bApproxOK,
             if (osVal[0] == '\'' && osVal.back() == '\'')
             {
                 osVal = osVal.substr(1);
-                osVal.resize(osVal.size() - 1);
+                osVal.pop_back();
                 char *pszTmp = CPLUnescapeString(osVal, nullptr, CPLES_SQL);
                 osVal = pszTmp;
                 CPLFree(pszTmp);
@@ -2399,6 +2385,8 @@ bool FGdbLayer::Create(FGdbDataSource *pParentDataSource,
 
     const auto eType =
         poSrcGeomFieldDefn ? poSrcGeomFieldDefn->GetType() : wkbNone;
+    if (eType == wkbNone)
+        poSrcGeomFieldDefn = nullptr;
 
 #ifdef EXTENT_WORKAROUND
     m_bLayerJustCreated = true;
@@ -4007,8 +3995,8 @@ OGRErr FGdbLayer::GetExtent(OGREnvelope *psExtent, int bForce)
     psExtent->MaxX = envelope.xMax;
     psExtent->MaxY = envelope.yMax;
 
-    if (CPLIsNan(psExtent->MinX) || CPLIsNan(psExtent->MinY) ||
-        CPLIsNan(psExtent->MaxX) || CPLIsNan(psExtent->MaxY))
+    if (std::isnan(psExtent->MinX) || std::isnan(psExtent->MinY) ||
+        std::isnan(psExtent->MaxX) || std::isnan(psExtent->MaxY))
         return OGRERR_FAILURE;
 
     return OGRERR_NONE;
diff --git a/ogr/ogrsf_frmts/filegdb/FGdbResultLayer.cpp b/ogr/ogrsf_frmts/filegdb/FGdbResultLayer.cpp
index db01ff8367e2..53f9940fcd0c 100644
--- a/ogr/ogrsf_frmts/filegdb/FGdbResultLayer.cpp
+++ b/ogr/ogrsf_frmts/filegdb/FGdbResultLayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_fgdb.h"
diff --git a/ogr/ogrsf_frmts/filegdb/FGdbUtils.cpp b/ogr/ogrsf_frmts/filegdb/FGdbUtils.cpp
index 8ae7ea02af0e..3827e578a893 100644
--- a/ogr/ogrsf_frmts/filegdb/FGdbUtils.cpp
+++ b/ogr/ogrsf_frmts/filegdb/FGdbUtils.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2011, Paul Ramsey <pramsey at cleverelephant.ca>
  * Copyright (c) 2011-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "FGdbUtils.h"
diff --git a/ogr/ogrsf_frmts/filegdb/FGdbUtils.h b/ogr/ogrsf_frmts/filegdb/FGdbUtils.h
index b03820bac4c2..640a9aa26d08 100644
--- a/ogr/ogrsf_frmts/filegdb/FGdbUtils.h
+++ b/ogr/ogrsf_frmts/filegdb/FGdbUtils.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Ragi Yaser Burhum
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef FGDB_UTILS_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/filegdb/filegdbsdk_headers.h b/ogr/ogrsf_frmts/filegdb/filegdbsdk_headers.h
index e374c3cb9cf6..16045cabc5fb 100644
--- a/ogr/ogrsf_frmts/filegdb/filegdbsdk_headers.h
+++ b/ogr/ogrsf_frmts/filegdb/filegdbsdk_headers.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef FILEGDBSDK_HEADERS_H
diff --git a/ogr/ogrsf_frmts/filegdb/ogr_fgdb.h b/ogr/ogrsf_frmts/filegdb/ogr_fgdb.h
index 88deda9f4091..021268fa9785 100644
--- a/ogr/ogrsf_frmts/filegdb/ogr_fgdb.h
+++ b/ogr/ogrsf_frmts/filegdb/ogr_fgdb.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2009, Ragi Yaser Burhum
  * Copyright (c) 2011-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_FGDB_H_INCLUDED
@@ -317,7 +301,7 @@ class FGdbResultLayer final : public FGdbBaseLayer
 class FGdbDatabaseConnection;
 class OGRFileGDBGroup;
 
-class FGdbDataSource final : public OGRDataSource
+class FGdbDataSource final : public GDALDataset
 {
     CPLString m_osFSName;
     CPLString m_osPublicName;
@@ -336,11 +320,6 @@ class FGdbDataSource final : public OGRDataSource
 
     int Open(const char *pszFSName, int bUpdate, const char *pszPublicName);
 
-    const char *GetName() override
-    {
-        return m_osPublicName.c_str();
-    }
-
     const char *GetFSName()
     {
         return m_osFSName.c_str();
@@ -510,11 +489,11 @@ class FGdbDatabaseConnection
 class FGdbTransactionManager final : public IOGRTransactionBehaviour
 {
   public:
-    virtual OGRErr StartTransaction(OGRDataSource *&poDSInOut,
+    virtual OGRErr StartTransaction(GDALDataset *&poDSInOut,
                                     int &bOutHasReopenedDS) override;
-    virtual OGRErr CommitTransaction(OGRDataSource *&poDSInOut,
+    virtual OGRErr CommitTransaction(GDALDataset *&poDSInOut,
                                      int &bOutHasReopenedDS) override;
-    virtual OGRErr RollbackTransaction(OGRDataSource *&poDSInOut,
+    virtual OGRErr RollbackTransaction(GDALDataset *&poDSInOut,
                                        int &bOutHasReopenedDS) override;
 };
 
diff --git a/ogr/ogrsf_frmts/flatgeobuf/cplerrors.h b/ogr/ogrsf_frmts/flatgeobuf/cplerrors.h
index c9d6f824dc14..5d42f7e5a449 100644
--- a/ogr/ogrsf_frmts/flatgeobuf/cplerrors.h
+++ b/ogr/ogrsf_frmts/flatgeobuf/cplerrors.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018-2019, Björn Harrtell <bjorn at wololo dot org>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef FLATGEOBUF_CPLERRORS_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/flatgeobuf/geometryreader.cpp b/ogr/ogrsf_frmts/flatgeobuf/geometryreader.cpp
index 45d18518adab..d18cb0b3ab6a 100644
--- a/ogr/ogrsf_frmts/flatgeobuf/geometryreader.cpp
+++ b/ogr/ogrsf_frmts/flatgeobuf/geometryreader.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018-2019, Björn Harrtell <bjorn at wololo dot org>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
@@ -115,22 +99,31 @@ OGRMultiPoint *GeometryReader::readMultiPoint()
 
 OGRMultiLineString *GeometryReader::readMultiLineString()
 {
-    const auto pEnds = m_geometry->ends();
-    if (pEnds == nullptr)
-        return CPLErrorInvalidPointer("MultiLineString ends data");
+    const auto ends = m_geometry->ends();
     auto mls = std::make_unique<OGRMultiLineString>();
-    m_offset = 0;
-    for (uint32_t i = 0; i < pEnds->size(); i++)
+    if (ends == nullptr || ends->size() < 2)
     {
-        const auto e = pEnds->Get(i);
-        if (e < m_offset)
-            return CPLErrorInvalidLength("MultiLineString");
-        m_length = e - m_offset;
-        const auto ls = readSimpleCurve<OGRLineString>();
-        if (ls == nullptr)
+        m_length = m_length / 2;
+        const auto part = readSimpleCurve<OGRLineString>();
+        if (part == nullptr)
             return nullptr;
-        mls->addGeometryDirectly(ls);
-        m_offset = e;
+        mls->addGeometryDirectly(part);
+    }
+    else
+    {
+        m_offset = 0;
+        for (uint32_t i = 0; i < ends->size(); i++)
+        {
+            const auto e = ends->Get(i);
+            if (e < m_offset)
+                return CPLErrorInvalidLength("MultiLineString");
+            m_length = e - m_offset;
+            const auto ls = readSimpleCurve<OGRLineString>();
+            if (ls == nullptr)
+                return nullptr;
+            mls->addGeometryDirectly(ls);
+            m_offset = e;
+        }
     }
     return mls.release();
 }
diff --git a/ogr/ogrsf_frmts/flatgeobuf/geometryreader.h b/ogr/ogrsf_frmts/flatgeobuf/geometryreader.h
index ccd949afdfab..538f1697d520 100644
--- a/ogr/ogrsf_frmts/flatgeobuf/geometryreader.h
+++ b/ogr/ogrsf_frmts/flatgeobuf/geometryreader.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018-2019, Björn Harrtell <bjorn at wololo dot org>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef FLATGEOBUF_GEOMETRYREADER_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/flatgeobuf/geometrywriter.cpp b/ogr/ogrsf_frmts/flatgeobuf/geometrywriter.cpp
index 61814b53fdd1..238193f42c03 100644
--- a/ogr/ogrsf_frmts/flatgeobuf/geometrywriter.cpp
+++ b/ogr/ogrsf_frmts/flatgeobuf/geometrywriter.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018-2019, Björn Harrtell <bjorn at wololo dot org>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "geometrywriter.h"
diff --git a/ogr/ogrsf_frmts/flatgeobuf/geometrywriter.h b/ogr/ogrsf_frmts/flatgeobuf/geometrywriter.h
index 79ad1aebbd08..8d1821a6e203 100644
--- a/ogr/ogrsf_frmts/flatgeobuf/geometrywriter.h
+++ b/ogr/ogrsf_frmts/flatgeobuf/geometrywriter.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018-2019, Björn Harrtell <bjorn at wololo dot org>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef FLATGEOBUF_GEOMETRYWRITER_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/flatgeobuf/ogr_flatgeobuf.h b/ogr/ogrsf_frmts/flatgeobuf/ogr_flatgeobuf.h
index 53020affcc80..993ef7774964 100644
--- a/ogr/ogrsf_frmts/flatgeobuf/ogr_flatgeobuf.h
+++ b/ogr/ogrsf_frmts/flatgeobuf/ogr_flatgeobuf.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018-2020, Björn Harrtell <bjorn at wololo dot org>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_FLATGEOBUF_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/flatgeobuf/ogrflatgeobufdataset.cpp b/ogr/ogrsf_frmts/flatgeobuf/ogrflatgeobufdataset.cpp
index 0598294a1f5f..356506d0ddf4 100644
--- a/ogr/ogrsf_frmts/flatgeobuf/ogrflatgeobufdataset.cpp
+++ b/ogr/ogrsf_frmts/flatgeobuf/ogrflatgeobufdataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018-2020, Björn Harrtell <bjorn at wololo dot org>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_flatgeobuf.h"
diff --git a/ogr/ogrsf_frmts/flatgeobuf/ogrflatgeobufeditablelayer.cpp b/ogr/ogrsf_frmts/flatgeobuf/ogrflatgeobufeditablelayer.cpp
index e1784ba6acc9..ad99b86aca10 100644
--- a/ogr/ogrsf_frmts/flatgeobuf/ogrflatgeobufeditablelayer.cpp
+++ b/ogr/ogrsf_frmts/flatgeobuf/ogrflatgeobufeditablelayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2020, Björn Harrtell <bjorn at wololo dot org>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
diff --git a/ogr/ogrsf_frmts/flatgeobuf/ogrflatgeobuflayer.cpp b/ogr/ogrsf_frmts/flatgeobuf/ogrflatgeobuflayer.cpp
index f964afb0be57..fc02bb18a4db 100644
--- a/ogr/ogrsf_frmts/flatgeobuf/ogrflatgeobuflayer.cpp
+++ b/ogr/ogrsf_frmts/flatgeobuf/ogrflatgeobuflayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018-2020, Björn Harrtell <bjorn at wololo dot org>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
@@ -455,7 +439,7 @@ void OGRFlatGeobufLayer::writeHeader(VSILFILE *poFp, uint64_t featuresCount,
             if (osCoordinateEpoch.find('.') != std::string::npos)
             {
                 while (osCoordinateEpoch.back() == '0')
-                    osCoordinateEpoch.resize(osCoordinateEpoch.size() - 1);
+                    osCoordinateEpoch.pop_back();
             }
 
             std::string osWKT("COORDINATEMETADATA[");
diff --git a/ogr/ogrsf_frmts/flatgeobuf/packedrtree.cpp b/ogr/ogrsf_frmts/flatgeobuf/packedrtree.cpp
index 9be922abbdcb..d1d37ae19c6f 100644
--- a/ogr/ogrsf_frmts/flatgeobuf/packedrtree.cpp
+++ b/ogr/ogrsf_frmts/flatgeobuf/packedrtree.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018-2020, Björn Harrtell <bjorn at wololo dot org>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 // NOTE: The upstream of this file is in
diff --git a/ogr/ogrsf_frmts/flatgeobuf/packedrtree.h b/ogr/ogrsf_frmts/flatgeobuf/packedrtree.h
index 53a85f2f1756..58890f64feac 100644
--- a/ogr/ogrsf_frmts/flatgeobuf/packedrtree.h
+++ b/ogr/ogrsf_frmts/flatgeobuf/packedrtree.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018-2020, Björn Harrtell <bjorn at wololo dot org>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 // NOTE: The upstream of this file is in
diff --git a/ogr/ogrsf_frmts/generic/CMakeLists.txt b/ogr/ogrsf_frmts/generic/CMakeLists.txt
index 2b30b07f0f7e..d91cca719e6b 100644
--- a/ogr/ogrsf_frmts/generic/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/generic/CMakeLists.txt
@@ -47,3 +47,7 @@ add_dependencies(ogrsf_generic generate_gdal_version_h)
 target_compile_options(ogrsf_generic PRIVATE ${GDAL_CXX_WARNING_FLAGS} ${WFLAG_OLD_STYLE_CAST} ${WFLAG_EFFCXX})
 target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:ogrsf_generic>)
 set_property(TARGET ogrsf_generic PROPERTY POSITION_INDEPENDENT_CODE ${GDAL_OBJECT_LIBRARIES_POSITION_INDEPENDENT_CODE})
+
+if (OGR_ENABLE_DRIVER_TAB AND NOT OGR_ENABLE_DRIVER_TAB_PLUGIN)
+target_compile_definitions(ogrsf_generic PRIVATE -DHAVE_MITAB)
+endif()
diff --git a/ogr/ogrsf_frmts/generic/ogr_attrind.cpp b/ogr/ogrsf_frmts/generic/ogr_attrind.cpp
index 71a9de39b545..286e2baffe2d 100644
--- a/ogr/ogrsf_frmts/generic/ogr_attrind.cpp
+++ b/ogr/ogrsf_frmts/generic/ogr_attrind.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2003, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_attrind.h"
diff --git a/ogr/ogrsf_frmts/generic/ogr_gensql.cpp b/ogr/ogrsf_frmts/generic/ogr_gensql.cpp
index b67645c67f77..406487cfe71b 100644
--- a/ogr/ogrsf_frmts/generic/ogr_gensql.cpp
+++ b/ogr/ogrsf_frmts/generic/ogr_gensql.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2002, Frank Warmerdam
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_swq.h"
@@ -32,9 +16,13 @@
 #include "ogr_gensql.h"
 #include "cpl_string.h"
 #include "ogr_api.h"
+#include "ogr_recordbatch.h"
+#include "ogrlayerarrow.h"
 #include "cpl_time.h"
 #include <algorithm>
 #include <limits>
+#include <map>
+#include <set>
 #include <vector>
 
 //! @cond Doxygen_Suppress
@@ -176,6 +164,9 @@ OGRGenSQLResultsLayer::OGRGenSQLResultsLayer(
         OGRFeatureDefn *poLayerDefn = nullptr;
         int iSrcGeomField = -1;
 
+        if (psColDef->bHidden)
+            continue;
+
         if (psColDef->table_index != -1)
             poLayerDefn =
                 m_apoTableLayers[psColDef->table_index]->GetLayerDefn();
@@ -244,10 +235,15 @@ OGRGenSQLResultsLayer::OGRGenSQLResultsLayer(
             oFDefn.SetType(OFTInteger64);
         else if (poSrcFDefn != nullptr)
         {
-            if (psColDef->col_func != SWQCF_AVG ||
-                psColDef->field_type == SWQ_DATE ||
-                psColDef->field_type == SWQ_TIME ||
-                psColDef->field_type == SWQ_TIMESTAMP)
+            if (psColDef->col_func == SWQCF_STDDEV_POP ||
+                psColDef->col_func == SWQCF_STDDEV_SAMP)
+            {
+                oFDefn.SetType(OFTReal);
+            }
+            else if (psColDef->col_func != SWQCF_AVG ||
+                     psColDef->field_type == SWQ_DATE ||
+                     psColDef->field_type == SWQ_TIME ||
+                     psColDef->field_type == SWQ_TIMESTAMP)
             {
                 oFDefn.SetType(poSrcFDefn->GetType());
                 if (psColDef->col_func == SWQCF_NONE ||
@@ -258,8 +254,13 @@ OGRGenSQLResultsLayer::OGRGenSQLResultsLayer(
                 }
             }
             else
+            {
                 oFDefn.SetType(OFTReal);
+            }
+
             if (psColDef->col_func != SWQCF_AVG &&
+                psColDef->col_func != SWQCF_STDDEV_POP &&
+                psColDef->col_func != SWQCF_STDDEV_SAMP &&
                 psColDef->col_func != SWQCF_SUM)
             {
                 oFDefn.SetWidth(poSrcFDefn->GetWidth());
@@ -732,7 +733,7 @@ GIntBig OGRGenSQLResultsLayer::GetFeatureCount(int bForce)
 int OGRGenSQLResultsLayer::TestCapability(const char *pszCap)
 
 {
-    swq_select *psSelectInfo = m_pSelectInfo.get();
+    const swq_select *psSelectInfo = m_pSelectInfo.get();
 
     if (EQUAL(pszCap, OLCFastSetNextByIndex))
     {
@@ -761,6 +762,58 @@ int OGRGenSQLResultsLayer::TestCapability(const char *pszCap)
         return m_poSrcLayer->TestCapability(pszCap);
     }
 
+    else if (EQUAL(pszCap, OLCFastGetArrowStream))
+    {
+        // Make sure the SQL is something as simple as
+        // "SELECT field1 [AS renamed], ... FROM ... WHERE ....", without
+        // duplicated fields
+        if (m_bForwardWhereToSourceLayer &&
+            psSelectInfo->query_mode == SWQM_RECORDSET &&
+            psSelectInfo->offset == 0 && psSelectInfo->join_count == 0 &&
+            psSelectInfo->order_specs == 0)
+        {
+            std::set<int> oSetFieldIndex;
+            int nLastIdxRegularField = -1;
+            for (std::size_t iField = 0;
+                 iField < psSelectInfo->column_defs.size(); iField++)
+            {
+                const swq_col_def *psColDef =
+                    &psSelectInfo->column_defs[iField];
+                if (psColDef->bHidden || psColDef->table_index < 0 ||
+                    psColDef->col_func != SWQCF_NONE ||
+                    cpl::contains(oSetFieldIndex, psColDef->field_index))
+                {
+                    return false;
+                }
+
+                oSetFieldIndex.insert(psColDef->field_index);
+
+                const auto poLayerDefn =
+                    m_apoTableLayers[psColDef->table_index]->GetLayerDefn();
+
+                if (psColDef->field_index >= 0 && poLayerDefn != nullptr &&
+                    psColDef->field_index < poLayerDefn->GetFieldCount())
+                {
+                    // We do not support re-ordered fields
+                    if (psColDef->field_index <= nLastIdxRegularField)
+                        return false;
+                    nLastIdxRegularField = psColDef->field_index;
+                }
+                else if (poLayerDefn != nullptr &&
+                         IS_GEOM_FIELD_INDEX(poLayerDefn,
+                                             psColDef->field_index))
+                {
+                    // ok
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            return m_poSrcLayer->TestCapability(pszCap);
+        }
+    }
+
     return FALSE;
 }
 
@@ -824,44 +877,70 @@ bool OGRGenSQLResultsLayer::PrepareSummary()
     /*      the where clause and no column references OGR_GEOMETRY,         */
     /*      OGR_GEOM_WKT or OGR_GEOM_AREA special fields.                   */
     /* -------------------------------------------------------------------- */
-    int bSaveIsGeomIgnored = m_poSrcLayer->GetLayerDefn()->IsGeometryIgnored();
+
+    struct TempGeomIgnoredSetter
+    {
+        OGRFeatureDefn &m_oDefn;
+        const int m_bSaveIsGeomIgnored;
+
+        explicit TempGeomIgnoredSetter(OGRFeatureDefn *poDefn)
+            : m_oDefn(*poDefn),
+              m_bSaveIsGeomIgnored(poDefn->IsGeometryIgnored())
+        {
+            m_oDefn.SetGeometryIgnored(true);
+        }
+
+        ~TempGeomIgnoredSetter()
+        {
+            m_oDefn.SetGeometryIgnored(m_bSaveIsGeomIgnored);
+        }
+    };
+
+    auto poSrcLayerDefn = m_poSrcLayer->GetLayerDefn();
+    std::unique_ptr<TempGeomIgnoredSetter> oTempGeomIgnoredSetter;
+
     if (m_poFilterGeom == nullptr &&
         (psSelectInfo->where_expr == nullptr ||
          !ContainGeomSpecialField(psSelectInfo->where_expr)))
     {
-        int bFoundGeomExpr = FALSE;
+        bool bFoundGeomExpr = false;
         for (int iField = 0; iField < psSelectInfo->result_columns(); iField++)
         {
-            swq_col_def *psColDef = &psSelectInfo->column_defs[iField];
+            const swq_col_def *psColDef = &psSelectInfo->column_defs[iField];
             if (psColDef->table_index == 0 && psColDef->field_index != -1)
             {
                 OGRLayer *poLayer = m_apoTableLayers[psColDef->table_index];
-                int nSpecialFieldIdx = psColDef->field_index -
-                                       poLayer->GetLayerDefn()->GetFieldCount();
+                const int nSpecialFieldIdx =
+                    psColDef->field_index -
+                    poLayer->GetLayerDefn()->GetFieldCount();
                 if (nSpecialFieldIdx == SPF_OGR_GEOMETRY ||
                     nSpecialFieldIdx == SPF_OGR_GEOM_WKT ||
                     nSpecialFieldIdx == SPF_OGR_GEOM_AREA)
                 {
-                    bFoundGeomExpr = TRUE;
+                    bFoundGeomExpr = true;
                     break;
                 }
                 if (psColDef->field_index ==
                     GEOM_FIELD_INDEX_TO_ALL_FIELD_INDEX(poLayer->GetLayerDefn(),
                                                         0))
                 {
-                    bFoundGeomExpr = TRUE;
+                    bFoundGeomExpr = true;
                     break;
                 }
             }
             if (psColDef->expr != nullptr &&
                 ContainGeomSpecialField(psColDef->expr))
             {
-                bFoundGeomExpr = TRUE;
+                bFoundGeomExpr = true;
                 break;
             }
         }
         if (!bFoundGeomExpr)
-            m_poSrcLayer->GetLayerDefn()->SetGeometryIgnored(TRUE);
+        {
+            // cppcheck-suppress unreadVariable
+            oTempGeomIgnoredSetter =
+                std::make_unique<TempGeomIgnoredSetter>(poSrcLayerDefn);
+        }
     }
 
     /* -------------------------------------------------------------------- */
@@ -885,7 +964,6 @@ bool OGRGenSQLResultsLayer::PrepareSummary()
             m_poSummaryFeature->SetField(0, static_cast<int>(nRes));
         }
 
-        m_poSrcLayer->GetLayerDefn()->SetGeometryIgnored(bSaveIsGeomIgnored);
         return TRUE;
     }
 
@@ -893,64 +971,89 @@ bool OGRGenSQLResultsLayer::PrepareSummary()
     /*      Otherwise, process all source feature through the summary       */
     /*      building facilities of SWQ.                                     */
     /* -------------------------------------------------------------------- */
-    const char *pszError = nullptr;
 
     for (auto &&poSrcFeature : *m_poSrcLayer)
     {
         for (int iField = 0; iField < psSelectInfo->result_columns(); iField++)
         {
-            swq_col_def *psColDef = &psSelectInfo->column_defs[iField];
+            const swq_col_def *psColDef = &psSelectInfo->column_defs[iField];
+            const char *pszError = nullptr;
 
             if (psColDef->col_func == SWQCF_COUNT)
             {
                 /* psColDef->field_index can be -1 in the case of a COUNT(*) */
                 if (psColDef->field_index < 0)
-                    pszError = swq_select_summarize(psSelectInfo, iField, "");
-                else if (IS_GEOM_FIELD_INDEX(m_poSrcLayer->GetLayerDefn(),
+                    pszError =
+                        swq_select_summarize(psSelectInfo, iField, "", nullptr);
+                else if (IS_GEOM_FIELD_INDEX(poSrcLayerDefn,
                                              psColDef->field_index))
                 {
-                    int iSrcGeomField = ALL_FIELD_INDEX_TO_GEOM_FIELD_INDEX(
-                        m_poSrcLayer->GetLayerDefn(), psColDef->field_index);
-                    OGRGeometry *poGeom =
+                    const int iSrcGeomField =
+                        ALL_FIELD_INDEX_TO_GEOM_FIELD_INDEX(
+                            poSrcLayerDefn, psColDef->field_index);
+                    const OGRGeometry *poGeom =
                         poSrcFeature->GetGeomFieldRef(iSrcGeomField);
                     if (poGeom != nullptr)
-                        pszError =
-                            swq_select_summarize(psSelectInfo, iField, "");
-                    else
-                        pszError = nullptr;
+                        pszError = swq_select_summarize(psSelectInfo, iField,
+                                                        "", nullptr);
                 }
                 else if (poSrcFeature->IsFieldSetAndNotNull(
                              psColDef->field_index))
-                    pszError = swq_select_summarize(
-                        psSelectInfo, iField,
-                        poSrcFeature->GetFieldAsString(psColDef->field_index));
-                else
-                    pszError = nullptr;
+                {
+                    if (!psColDef->distinct_flag)
+                    {
+                        pszError = swq_select_summarize(psSelectInfo, iField,
+                                                        "", nullptr);
+                    }
+                    else
+                    {
+                        const char *pszVal = poSrcFeature->GetFieldAsString(
+                            psColDef->field_index);
+                        pszError = swq_select_summarize(psSelectInfo, iField,
+                                                        pszVal, nullptr);
+                    }
+                }
             }
             else
             {
-                const char *pszVal = nullptr;
                 if (poSrcFeature->IsFieldSetAndNotNull(psColDef->field_index))
-                    pszVal =
-                        poSrcFeature->GetFieldAsString(psColDef->field_index);
-                pszError = swq_select_summarize(psSelectInfo, iField, pszVal);
+                {
+                    if (!psColDef->distinct_flag &&
+                        (psColDef->field_type == SWQ_BOOLEAN ||
+                         psColDef->field_type == SWQ_INTEGER ||
+                         psColDef->field_type == SWQ_INTEGER64 ||
+                         psColDef->field_type == SWQ_FLOAT))
+                    {
+                        const double dfValue = poSrcFeature->GetFieldAsDouble(
+                            psColDef->field_index);
+                        pszError = swq_select_summarize(psSelectInfo, iField,
+                                                        nullptr, &dfValue);
+                    }
+                    else
+                    {
+                        const char *pszVal = poSrcFeature->GetFieldAsString(
+                            psColDef->field_index);
+                        pszError = swq_select_summarize(psSelectInfo, iField,
+                                                        pszVal, nullptr);
+                    }
+                }
+                else
+                {
+                    pszError = swq_select_summarize(psSelectInfo, iField,
+                                                    nullptr, nullptr);
+                }
             }
 
-            if (pszError != nullptr)
+            if (pszError)
             {
                 m_poSummaryFeature.reset();
 
-                m_poSrcLayer->GetLayerDefn()->SetGeometryIgnored(
-                    bSaveIsGeomIgnored);
-
                 CPLError(CE_Failure, CPLE_AppDefined, "%s", pszError);
                 return false;
             }
         }
     }
 
-    m_poSrcLayer->GetLayerDefn()->SetGeometryIgnored(bSaveIsGeomIgnored);
-
     /* -------------------------------------------------------------------- */
     /*      Clear away the filters we have installed till a next run through*/
     /*      the features.                                                   */
@@ -965,7 +1068,7 @@ bool OGRGenSQLResultsLayer::PrepareSummary()
     {
         for (int iField = 0; iField < psSelectInfo->result_columns(); iField++)
         {
-            swq_col_def *psColDef = &psSelectInfo->column_defs[iField];
+            const swq_col_def *psColDef = &psSelectInfo->column_defs[iField];
             if (!psSelectInfo->column_summary.empty())
             {
                 const swq_summary &oSummary =
@@ -989,60 +1092,122 @@ bool OGRGenSQLResultsLayer::PrepareSummary()
 
         for (int iField = 0; iField < psSelectInfo->result_columns(); iField++)
         {
-            swq_col_def *psColDef = &psSelectInfo->column_defs[iField];
+            const swq_col_def *psColDef = &psSelectInfo->column_defs[iField];
             if (!psSelectInfo->column_summary.empty())
             {
                 const swq_summary &oSummary =
                     psSelectInfo->column_summary[iField];
 
-                if (psColDef->col_func == SWQCF_AVG && oSummary.count > 0)
+                switch (psColDef->col_func)
                 {
-                    if (psColDef->field_type == SWQ_DATE ||
-                        psColDef->field_type == SWQ_TIME ||
-                        psColDef->field_type == SWQ_TIMESTAMP)
+                    case SWQCF_NONE:
+                    case SWQCF_CUSTOM:
+                        break;
+
+                    case SWQCF_AVG:
                     {
-                        struct tm brokendowntime;
-                        double dfAvg = oSummary.sum / oSummary.count;
-                        CPLUnixTimeToYMDHMS(static_cast<GIntBig>(dfAvg),
-                                            &brokendowntime);
-                        m_poSummaryFeature->SetField(
-                            iField, brokendowntime.tm_year + 1900,
-                            brokendowntime.tm_mon + 1, brokendowntime.tm_mday,
-                            brokendowntime.tm_hour, brokendowntime.tm_min,
-                            static_cast<float>(brokendowntime.tm_sec +
-                                               fmod(dfAvg, 1)),
-                            0);
+                        if (oSummary.count > 0)
+                        {
+                            const double dfAvg =
+                                oSummary.sum() / oSummary.count;
+                            if (psColDef->field_type == SWQ_DATE ||
+                                psColDef->field_type == SWQ_TIME ||
+                                psColDef->field_type == SWQ_TIMESTAMP)
+                            {
+                                struct tm brokendowntime;
+                                CPLUnixTimeToYMDHMS(static_cast<GIntBig>(dfAvg),
+                                                    &brokendowntime);
+                                m_poSummaryFeature->SetField(
+                                    iField, brokendowntime.tm_year + 1900,
+                                    brokendowntime.tm_mon + 1,
+                                    brokendowntime.tm_mday,
+                                    brokendowntime.tm_hour,
+                                    brokendowntime.tm_min,
+                                    static_cast<float>(brokendowntime.tm_sec +
+                                                       fmod(dfAvg, 1)),
+                                    0);
+                            }
+                            else
+                            {
+                                m_poSummaryFeature->SetField(iField, dfAvg);
+                            }
+                        }
+                        break;
+                    }
+
+                    case SWQCF_MIN:
+                    {
+                        if (oSummary.count > 0)
+                        {
+                            if (psColDef->field_type == SWQ_DATE ||
+                                psColDef->field_type == SWQ_TIME ||
+                                psColDef->field_type == SWQ_TIMESTAMP ||
+                                psColDef->field_type == SWQ_STRING)
+                                m_poSummaryFeature->SetField(
+                                    iField, oSummary.osMin.c_str());
+                            else
+                                m_poSummaryFeature->SetField(iField,
+                                                             oSummary.min);
+                        }
+                        break;
+                    }
+
+                    case SWQCF_MAX:
+                    {
+                        if (oSummary.count > 0)
+                        {
+                            if (psColDef->field_type == SWQ_DATE ||
+                                psColDef->field_type == SWQ_TIME ||
+                                psColDef->field_type == SWQ_TIMESTAMP ||
+                                psColDef->field_type == SWQ_STRING)
+                                m_poSummaryFeature->SetField(
+                                    iField, oSummary.osMax.c_str());
+                            else
+                                m_poSummaryFeature->SetField(iField,
+                                                             oSummary.max);
+                        }
+                        break;
+                    }
+
+                    case SWQCF_COUNT:
+                    {
+                        m_poSummaryFeature->SetField(iField, oSummary.count);
+                        break;
+                    }
+
+                    case SWQCF_SUM:
+                    {
+                        if (oSummary.count > 0)
+                            m_poSummaryFeature->SetField(iField,
+                                                         oSummary.sum());
+                        break;
+                    }
+
+                    case SWQCF_STDDEV_POP:
+                    {
+                        if (oSummary.count > 0)
+                        {
+                            const double dfVariance =
+                                oSummary.sq_dist_from_mean_acc / oSummary.count;
+                            m_poSummaryFeature->SetField(iField,
+                                                         sqrt(dfVariance));
+                        }
+                        break;
+                    }
+
+                    case SWQCF_STDDEV_SAMP:
+                    {
+                        if (oSummary.count > 1)
+                        {
+                            const double dfSampleVariance =
+                                oSummary.sq_dist_from_mean_acc /
+                                (oSummary.count - 1);
+                            m_poSummaryFeature->SetField(
+                                iField, sqrt(dfSampleVariance));
+                        }
+                        break;
                     }
-                    else
-                        m_poSummaryFeature->SetField(
-                            iField, oSummary.sum / oSummary.count);
-                }
-                else if (psColDef->col_func == SWQCF_MIN && oSummary.count > 0)
-                {
-                    if (psColDef->field_type == SWQ_DATE ||
-                        psColDef->field_type == SWQ_TIME ||
-                        psColDef->field_type == SWQ_TIMESTAMP ||
-                        psColDef->field_type == SWQ_STRING)
-                        m_poSummaryFeature->SetField(iField,
-                                                     oSummary.osMin.c_str());
-                    else
-                        m_poSummaryFeature->SetField(iField, oSummary.min);
-                }
-                else if (psColDef->col_func == SWQCF_MAX && oSummary.count > 0)
-                {
-                    if (psColDef->field_type == SWQ_DATE ||
-                        psColDef->field_type == SWQ_TIME ||
-                        psColDef->field_type == SWQ_TIMESTAMP ||
-                        psColDef->field_type == SWQ_STRING)
-                        m_poSummaryFeature->SetField(iField,
-                                                     oSummary.osMax.c_str());
-                    else
-                        m_poSummaryFeature->SetField(iField, oSummary.max);
                 }
-                else if (psColDef->col_func == SWQCF_COUNT)
-                    m_poSummaryFeature->SetField(iField, oSummary.count);
-                else if (psColDef->col_func == SWQCF_SUM && oSummary.count > 0)
-                    m_poSummaryFeature->SetField(iField, oSummary.sum);
             }
             else if (psColDef->col_func == SWQCF_COUNT)
                 m_poSummaryFeature->SetField(iField, 0);
@@ -1056,12 +1221,14 @@ bool OGRGenSQLResultsLayer::PrepareSummary()
 /*                       OGRMultiFeatureFetcher()                       */
 /************************************************************************/
 
+typedef std::vector<std::unique_ptr<OGRFeature>> VectorOfUniquePtrFeature;
+
 static swq_expr_node *OGRMultiFeatureFetcher(swq_expr_node *op,
                                              void *pFeatureList)
 
 {
-    std::vector<OGRFeature *> *papoFeatures =
-        static_cast<std::vector<OGRFeature *> *>(pFeatureList);
+    auto &apoFeatures =
+        *(static_cast<VectorOfUniquePtrFeature *>(pFeatureList));
     swq_expr_node *poRetNode = nullptr;
 
     CPLAssert(op->eNodeType == SNT_COLUMN);
@@ -1070,7 +1237,7 @@ static swq_expr_node *OGRMultiFeatureFetcher(swq_expr_node *op,
     /*      What feature are we using?  The primary or one of the joined ones?*/
     /* -------------------------------------------------------------------- */
     if (op->table_index < 0 ||
-        op->table_index >= static_cast<int>(papoFeatures->size()))
+        op->table_index >= static_cast<int>(apoFeatures.size()))
     {
         CPLError(CE_Failure, CPLE_AppDefined,
                  "Request for unexpected table_index (%d) in field fetcher.",
@@ -1078,7 +1245,7 @@ static swq_expr_node *OGRMultiFeatureFetcher(swq_expr_node *op,
         return nullptr;
     }
 
-    OGRFeature *poFeature = (*papoFeatures)[op->table_index];
+    OGRFeature *poFeature = apoFeatures[op->table_index].get();
 
     /* -------------------------------------------------------------------- */
     /*      Fetch the value.                                                */
@@ -1181,51 +1348,97 @@ static CPLString GetFilterForJoin(swq_expr_node *poExpr, OGRFeature *poSrcFeat,
             {
                 return "";
             }
-            OGRFieldType ePrimaryFieldType =
-                poSrcFeat->GetFieldDefnRef(poExpr->field_index)->GetType();
-            OGRField *psSrcField =
-                poSrcFeat->GetRawFieldRef(poExpr->field_index);
-
-            switch (ePrimaryFieldType)
+            const auto poSrcFDefn = poSrcFeat->GetDefnRef();
+            if (poExpr->field_index >= poSrcFDefn->GetFieldCount())
             {
-                case OFTInteger:
-                    return CPLString().Printf("%d", psSrcField->Integer);
-                    break;
+                CPLAssert(poExpr->field_index <
+                          poSrcFDefn->GetFieldCount() + SPECIAL_FIELD_COUNT);
+                switch (SpecialFieldTypes[poExpr->field_index -
+                                          poSrcFDefn->GetFieldCount()])
+                {
+                    case SWQ_INTEGER:
+                    case SWQ_INTEGER64:
+                        return CPLString().Printf(
+                            CPL_FRMT_GIB, poSrcFeat->GetFieldAsInteger64(
+                                              poExpr->field_index));
+                        break;
+                    case SWQ_FLOAT:
+                        return CPLString().Printf(
+                            "%.17g",
+                            poSrcFeat->GetFieldAsDouble(poExpr->field_index));
+                        break;
+                    default:
+                    {
+                        char *pszEscaped = CPLEscapeString(
+                            poSrcFeat->GetFieldAsString(poExpr->field_index),
+                            -1, CPLES_SQL);
+                        CPLString osRes = "'";
+                        osRes += pszEscaped;
+                        osRes += "'";
+                        CPLFree(pszEscaped);
+                        return osRes;
+                    }
+                }
+            }
+            else
+            {
+                const OGRFieldType ePrimaryFieldType =
+                    poSrcFeat->GetFieldDefnRef(poExpr->field_index)->GetType();
+                const OGRField *psSrcField =
+                    poSrcFeat->GetRawFieldRef(poExpr->field_index);
 
-                case OFTInteger64:
-                    return CPLString().Printf(CPL_FRMT_GIB,
-                                              psSrcField->Integer64);
-                    break;
+                switch (ePrimaryFieldType)
+                {
+                    case OFTInteger:
+                        return CPLString().Printf("%d", psSrcField->Integer);
+                        break;
+
+                    case OFTInteger64:
+                        return CPLString().Printf(CPL_FRMT_GIB,
+                                                  psSrcField->Integer64);
+                        break;
 
-                case OFTReal:
-                    return CPLString().Printf("%.16g", psSrcField->Real);
+                    case OFTReal:
+                        return CPLString().Printf("%.17g", psSrcField->Real);
+                        break;
+
+                    case OFTString:
+                    {
+                        char *pszEscaped = CPLEscapeString(
+                            psSrcField->String,
+                            static_cast<int>(strlen(psSrcField->String)),
+                            CPLES_SQL);
+                        CPLString osRes = "'";
+                        osRes += pszEscaped;
+                        osRes += "'";
+                        CPLFree(pszEscaped);
+                        return osRes;
+                    }
                     break;
 
-                case OFTString:
-                {
-                    char *pszEscaped = CPLEscapeString(
-                        psSrcField->String,
-                        static_cast<int>(strlen(psSrcField->String)),
-                        CPLES_SQL);
-                    CPLString osRes = "'";
-                    osRes += pszEscaped;
-                    osRes += "'";
-                    CPLFree(pszEscaped);
-                    return osRes;
+                    default:
+                        CPLAssert(false);
+                        return "";
                 }
-                break;
-
-                default:
-                    CPLAssert(false);
-                    return "";
             }
         }
 
         if (poExpr->table_index == secondary_table)
         {
-            OGRFieldDefn *poSecondaryFieldDefn =
-                poJoinLayer->GetLayerDefn()->GetFieldDefn(poExpr->field_index);
-            return CPLSPrintf("\"%s\"", poSecondaryFieldDefn->GetNameRef());
+            const auto poJoinFDefn = poJoinLayer->GetLayerDefn();
+            if (poExpr->field_index >= poJoinFDefn->GetFieldCount())
+            {
+                CPLAssert(poExpr->field_index <
+                          poJoinFDefn->GetFieldCount() + SPECIAL_FIELD_COUNT);
+                return SpecialFieldNames[poExpr->field_index -
+                                         poJoinFDefn->GetFieldCount()];
+            }
+            else
+            {
+                const OGRFieldDefn *poSecondaryFieldDefn =
+                    poJoinFDefn->GetFieldDefn(poExpr->field_index);
+                return CPLSPrintf("\"%s\"", poSecondaryFieldDefn->GetNameRef());
+            }
         }
 
         CPLAssert(false);
@@ -1271,27 +1484,27 @@ static CPLString GetFilterForJoin(swq_expr_node *poExpr, OGRFeature *poSrcFeat,
 /*                          TranslateFeature()                          */
 /************************************************************************/
 
-OGRFeature *OGRGenSQLResultsLayer::TranslateFeature(OGRFeature *poSrcFeat)
+std::unique_ptr<OGRFeature> OGRGenSQLResultsLayer::TranslateFeature(
+    std::unique_ptr<OGRFeature> poSrcFeatUniquePtr)
 
 {
     swq_select *psSelectInfo = m_pSelectInfo.get();
-    std::vector<OGRFeature *> apoFeatures;
+    VectorOfUniquePtrFeature apoFeatures;
 
-    if (poSrcFeat == nullptr)
+    if (poSrcFeatUniquePtr == nullptr)
         return nullptr;
 
     m_nFeaturesRead++;
 
-    apoFeatures.push_back(poSrcFeat);
+    apoFeatures.push_back(std::move(poSrcFeatUniquePtr));
+    auto poSrcFeat = apoFeatures.front().get();
 
     /* -------------------------------------------------------------------- */
     /*      Fetch the corresponding features from any jointed tables.       */
     /* -------------------------------------------------------------------- */
     for (int iJoin = 0; iJoin < psSelectInfo->join_count; iJoin++)
     {
-        CPLString osFilter;
-
-        swq_join_def *psJoinInfo = psSelectInfo->join_defs + iJoin;
+        const swq_join_def *psJoinInfo = psSelectInfo->join_defs + iJoin;
 
         /* OGRMultiFeatureFetcher assumes that the features are pushed in */
         /* apoFeatures with increasing secondary_table, so make sure */
@@ -1300,8 +1513,9 @@ OGRFeature *OGRGenSQLResultsLayer::TranslateFeature(OGRFeature *poSrcFeat)
 
         OGRLayer *poJoinLayer = m_apoTableLayers[psJoinInfo->secondary_table];
 
-        osFilter = GetFilterForJoin(psJoinInfo->poExpr, poSrcFeat, poJoinLayer,
-                                    psJoinInfo->secondary_table);
+        const std::string osFilter =
+            GetFilterForJoin(psJoinInfo->poExpr, poSrcFeat, poJoinLayer,
+                             psJoinInfo->secondary_table);
         // CPLDebug("OGR", "Filter = %s\n", osFilter.c_str());
 
         // if source key is null, we can't do join.
@@ -1311,19 +1525,19 @@ OGRFeature *OGRGenSQLResultsLayer::TranslateFeature(OGRFeature *poSrcFeat)
             continue;
         }
 
-        OGRFeature *poJoinFeature = nullptr;
+        std::unique_ptr<OGRFeature> poJoinFeature;
 
         poJoinLayer->ResetReading();
         if (poJoinLayer->SetAttributeFilter(osFilter.c_str()) == OGRERR_NONE)
-            poJoinFeature = poJoinLayer->GetNextFeature();
+            poJoinFeature.reset(poJoinLayer->GetNextFeature());
 
-        apoFeatures.push_back(poJoinFeature);
+        apoFeatures.push_back(std::move(poJoinFeature));
     }
 
     /* -------------------------------------------------------------------- */
     /*      Create destination feature.                                     */
     /* -------------------------------------------------------------------- */
-    OGRFeature *poDstFeat = new OGRFeature(m_poDefn);
+    auto poDstFeat = std::make_unique<OGRFeature>(m_poDefn);
 
     poDstFeat->SetFID(poSrcFeat->GetFID());
 
@@ -1339,8 +1553,74 @@ OGRFeature *OGRGenSQLResultsLayer::TranslateFeature(OGRFeature *poSrcFeat)
     swq_evaluation_context sContext;
     for (int iField = 0; iField < psSelectInfo->result_columns(); iField++)
     {
-        swq_col_def *psColDef = &psSelectInfo->column_defs[iField];
-        if (psColDef->field_index != -1)
+        const swq_col_def *psColDef = &psSelectInfo->column_defs[iField];
+
+        if (psColDef->bHidden)
+        {
+            const char *pszDstFieldName = psColDef->field_alias
+                                              ? psColDef->field_alias
+                                              : psColDef->field_name;
+            if (EQUAL(pszDstFieldName, "OGR_STYLE"))
+            {
+                if (psColDef->field_type == SWQ_STRING)
+                {
+                    // Does this column definition directly references a
+                    // source field ?
+                    if (psColDef->field_index >= 0)
+                    {
+                        if (!IS_GEOM_FIELD_INDEX(poSrcFeat->GetDefnRef(),
+                                                 psColDef->field_index))
+                        {
+                            if (poSrcFeat->IsFieldSetAndNotNull(
+                                    psColDef->field_index))
+                            {
+                                const char *pszVal =
+                                    poSrcFeat->GetFieldAsString(
+                                        psColDef->field_index);
+                                poDstFeat->SetStyleString(pszVal);
+                            }
+                            else
+                            {
+                                poDstFeat->SetStyleString(nullptr);
+                            }
+                        }
+                        else
+                        {
+                            CPLError(CE_Warning, CPLE_AppDefined,
+                                     "OGR_STYLE HIDDEN field should reference "
+                                     "a column of type String");
+                        }
+                    }
+                    else
+                    {
+                        auto poResult = std::unique_ptr<swq_expr_node>(
+                            psColDef->expr->Evaluate(OGRMultiFeatureFetcher,
+                                                     &apoFeatures, sContext));
+
+                        if (!poResult)
+                        {
+                            return nullptr;
+                        }
+
+                        poDstFeat->SetStyleString(poResult->is_null
+                                                      ? nullptr
+                                                      : poResult->string_value);
+                    }
+                }
+                else
+                {
+                    CPLError(CE_Warning, CPLE_AppDefined,
+                             "OGR_STYLE HIDDEN field should be of type String");
+                }
+            }
+            continue;
+        }
+
+        // Does this column definition directly references a
+        // source field ?
+        // If so, skip it for now, as it will be taken into account in the
+        // next loop.
+        if (psColDef->field_index >= 0)
         {
             if (psColDef->field_type == SWQ_GEOMETRY ||
                 psColDef->target_type == SWQ_GEOMETRY)
@@ -1350,12 +1630,11 @@ OGRFeature *OGRGenSQLResultsLayer::TranslateFeature(OGRFeature *poSrcFeat)
             continue;
         }
 
-        swq_expr_node *poResult = psColDef->expr->Evaluate(
-            OGRMultiFeatureFetcher, &apoFeatures, sContext);
+        auto poResult = std::unique_ptr<swq_expr_node>(psColDef->expr->Evaluate(
+            OGRMultiFeatureFetcher, &apoFeatures, sContext));
 
-        if (poResult == nullptr)
+        if (!poResult)
         {
-            delete poDstFeat;
             return nullptr;
         }
 
@@ -1365,7 +1644,6 @@ OGRFeature *OGRGenSQLResultsLayer::TranslateFeature(OGRFeature *poSrcFeat)
                 iGeomField++;
             else
                 iRegularField++;
-            delete poResult;
             continue;
         }
 
@@ -1431,8 +1709,6 @@ OGRFeature *OGRGenSQLResultsLayer::TranslateFeature(OGRFeature *poSrcFeat)
                 poDstFeat->SetField(iRegularField++, poResult->string_value);
                 break;
         }
-
-        delete poResult;
     }
 
     /* -------------------------------------------------------------------- */
@@ -1442,8 +1718,15 @@ OGRFeature *OGRGenSQLResultsLayer::TranslateFeature(OGRFeature *poSrcFeat)
     iGeomField = 0;
     for (int iField = 0; iField < psSelectInfo->result_columns(); iField++)
     {
-        swq_col_def *psColDef = &psSelectInfo->column_defs[iField];
+        const swq_col_def *psColDef = &psSelectInfo->column_defs[iField];
 
+        if (psColDef->bHidden)
+        {
+            continue;
+        }
+
+        // Skip this column definition if it doesn't reference a field from
+        // the main feature
         if (psColDef->table_index != 0)
         {
             if (psColDef->field_type == SWQ_GEOMETRY ||
@@ -1534,10 +1817,8 @@ OGRFeature *OGRGenSQLResultsLayer::TranslateFeature(OGRFeature *poSrcFeat)
     /* -------------------------------------------------------------------- */
     for (int iJoin = 0; iJoin < psSelectInfo->join_count; iJoin++)
     {
-        CPLString osFilter;
-
-        swq_join_def *psJoinInfo = psSelectInfo->join_defs + iJoin;
-        OGRFeature *poJoinFeature = apoFeatures[iJoin + 1];
+        const swq_join_def *psJoinInfo = psSelectInfo->join_defs + iJoin;
+        const OGRFeature *poJoinFeature = apoFeatures[iJoin + 1].get();
 
         if (poJoinFeature == nullptr)
             continue;
@@ -1546,12 +1827,17 @@ OGRFeature *OGRGenSQLResultsLayer::TranslateFeature(OGRFeature *poSrcFeat)
         iRegularField = 0;
         for (int iField = 0; iField < psSelectInfo->result_columns(); iField++)
         {
-            swq_col_def *psColDef = &psSelectInfo->column_defs[iField];
+            const swq_col_def *psColDef = &psSelectInfo->column_defs[iField];
 
             if (psColDef->field_type == SWQ_GEOMETRY ||
                 psColDef->target_type == SWQ_GEOMETRY)
                 continue;
 
+            if (psColDef->bHidden)
+            {
+                continue;
+            }
+
             if (psColDef->table_index == psJoinInfo->secondary_table)
                 poDstFeat->SetField(
                     iRegularField,
@@ -1559,8 +1845,6 @@ OGRFeature *OGRGenSQLResultsLayer::TranslateFeature(OGRFeature *poSrcFeat)
 
             iRegularField++;
         }
-
-        delete poJoinFeature;
     }
 
     return poDstFeat;
@@ -1634,8 +1918,7 @@ OGRFeature *OGRGenSQLResultsLayer::GetNextFeature()
         if (poSrcFeat == nullptr)
             return nullptr;
 
-        auto poFeature =
-            std::unique_ptr<OGRFeature>(TranslateFeature(poSrcFeat.get()));
+        auto poFeature = TranslateFeature(std::move(poSrcFeat));
         if (poFeature == nullptr)
             return nullptr;
 
@@ -1751,7 +2034,7 @@ OGRFeature *OGRGenSQLResultsLayer::GetFeature(GIntBig nFID)
     if (poSrcFeature == nullptr)
         return nullptr;
 
-    return TranslateFeature(poSrcFeature.get());
+    return TranslateFeature(std::move(poSrcFeature)).release();
 }
 
 /************************************************************************/
@@ -2300,14 +2583,47 @@ int OGRGenSQLResultsLayer::Compare(const OGRField *pasFirstTuple,
 void OGRGenSQLResultsLayer::AddFieldDefnToSet(int iTable, int iColumn,
                                               CPLHashSet *hSet)
 {
-    if (iTable != -1 && iColumn != -1)
+    if (iTable != -1)
     {
         OGRLayer *poLayer = m_apoTableLayers[iTable];
-        if (iColumn < poLayer->GetLayerDefn()->GetFieldCount())
+        const auto poLayerDefn = poLayer->GetLayerDefn();
+        const int nFieldCount = poLayerDefn->GetFieldCount();
+        if (iColumn == -1)
         {
-            OGRFieldDefn *poFDefn =
-                poLayer->GetLayerDefn()->GetFieldDefn(iColumn);
-            CPLHashSetInsert(hSet, poFDefn);
+            for (int i = 0; i < nFieldCount; ++i)
+            {
+                OGRFieldDefn *poFDefn = poLayerDefn->GetFieldDefn(i);
+                CPLHashSetInsert(hSet, poFDefn);
+            }
+
+            const int nGeomFieldCount = poLayerDefn->GetGeomFieldCount();
+            for (int i = 0; i < nGeomFieldCount; ++i)
+            {
+                OGRGeomFieldDefn *poFDefn = poLayerDefn->GetGeomFieldDefn(i);
+                CPLHashSetInsert(hSet, poFDefn);
+            }
+        }
+        else
+        {
+            if (iColumn < nFieldCount)
+            {
+                OGRFieldDefn *poFDefn = poLayerDefn->GetFieldDefn(iColumn);
+                CPLHashSetInsert(hSet, poFDefn);
+            }
+            else if (iColumn == nFieldCount + SPF_OGR_GEOMETRY ||
+                     iColumn == nFieldCount + SPF_OGR_GEOM_WKT ||
+                     iColumn == nFieldCount + SPF_OGR_GEOM_AREA)
+            {
+                auto poSrcGFDefn = poLayerDefn->GetGeomFieldDefn(0);
+                CPLHashSetInsert(hSet, poSrcGFDefn);
+            }
+            else if (IS_GEOM_FIELD_INDEX(poLayerDefn, iColumn))
+            {
+                const int iSrcGeomField =
+                    ALL_FIELD_INDEX_TO_GEOM_FIELD_INDEX(poLayerDefn, iColumn);
+                auto poSrcGFDefn = poLayerDefn->GetGeomFieldDefn(iSrcGeomField);
+                CPLHashSetInsert(hSet, poSrcGFDefn);
+            }
         }
     }
 }
@@ -2376,8 +2692,8 @@ void OGRGenSQLResultsLayer::FindAndSetIgnoredFields()
         OGRLayer *poLayer = m_apoTableLayers[iTable];
         OGRFeatureDefn *poSrcFDefn = poLayer->GetLayerDefn();
         char **papszIgnoredFields = nullptr;
-        for (int iSrcField = 0; iSrcField < poSrcFDefn->GetFieldCount();
-             iSrcField++)
+        const int nSrcFieldCount = poSrcFDefn->GetFieldCount();
+        for (int iSrcField = 0; iSrcField < nSrcFieldCount; iSrcField++)
         {
             OGRFieldDefn *poFDefn = poSrcFDefn->GetFieldDefn(iSrcField);
             if (CPLHashSetLookup(hSet, poFDefn) == nullptr)
@@ -2389,6 +2705,19 @@ void OGRGenSQLResultsLayer::FindAndSetIgnoredFields()
                 //          poFDefn->GetNameRef(), poLayer->GetName());
             }
         }
+        const int nSrcGeomFieldCount = poSrcFDefn->GetGeomFieldCount();
+        for (int iSrcField = 0; iSrcField < nSrcGeomFieldCount; iSrcField++)
+        {
+            OGRGeomFieldDefn *poFDefn = poSrcFDefn->GetGeomFieldDefn(iSrcField);
+            if (CPLHashSetLookup(hSet, poFDefn) == nullptr)
+            {
+                papszIgnoredFields =
+                    CSLAddString(papszIgnoredFields, poFDefn->GetNameRef());
+                // CPLDebug("OGR", "Adding %s to the list of ignored fields of
+                // layer %s",
+                //          poFDefn->GetNameRef(), poLayer->GetName());
+            }
+        }
         poLayer->SetIgnoredFields(
             const_cast<const char **>(papszIgnoredFields));
         CSLDestroy(papszIgnoredFields);
@@ -2449,4 +2778,302 @@ void OGRGenSQLResultsLayer::SetSpatialFilter(int iGeomField,
         OGRLayer::SetSpatialFilter(iGeomField, poGeom);
 }
 
+/************************************************************************/
+/*                  OGRGenSQLResultsLayerArrowStreamPrivateData         */
+/************************************************************************/
+
+// Structure whose instances are set on the ArrowArrayStream::private_data
+// member of the ArrowArrayStream returned by OGRGenSQLResultsLayer::GetArrowStream()
+struct OGRGenSQLResultsLayerArrowStreamPrivateData
+{
+    // Member shared with OGRLayer::m_poSharedArrowArrayStreamPrivateData
+    // If the layer pointed by poShared->poLayer is destroyed, before its
+    // destruction, it nullifies poShared->poLayer, which we can detect.
+    std::shared_ptr<OGRLayer::ArrowArrayStreamPrivateData> poShared{};
+
+    // ArrowArrayStream to be used with poShared->poLayer
+    struct ArrowArrayStream *psSrcLayerStream = nullptr;
+
+    // Original release() callback of the ArrowArrayStream passed to
+    // OGRGenSQLResultsLayer::GetArrowStream()
+    void (*release_backup)(struct ArrowArrayStream *) = nullptr;
+
+    // Original private_data member of the ArrowArrayStream passed to
+    // OGRGenSQLResultsLayer::GetArrowStream()
+    void *private_data_backup = nullptr;
+
+    // Set as the ArrowArrayStream::release callback member of the
+    // ArrowArrayStream returned by OGRGenSQLResultsLayer::GetArrowStream()
+    static void Release(struct ArrowArrayStream *self)
+    {
+        OGRGenSQLResultsLayerArrowStreamPrivateData *psPrivateData =
+            static_cast<OGRGenSQLResultsLayerArrowStreamPrivateData *>(
+                self->private_data);
+
+        // Release source layer stream
+        if (psPrivateData->psSrcLayerStream->release)
+            psPrivateData->psSrcLayerStream->release(
+                psPrivateData->psSrcLayerStream);
+        CPLFree(psPrivateData->psSrcLayerStream);
+
+        // Release ourselves using the base method
+        self->private_data = psPrivateData->private_data_backup;
+        self->release = psPrivateData->release_backup;
+        delete psPrivateData;
+        if (self->release)
+            self->release(self);
+    }
+
+    // Set as the ArrowArrayStream::get_schema callback member of the
+    // ArrowArrayStream returned by OGRGenSQLResultsLayer::GetArrowStream()
+    static int GetSchema(struct ArrowArrayStream *self, struct ArrowSchema *out)
+    {
+        OGRGenSQLResultsLayerArrowStreamPrivateData *psPrivateData =
+            static_cast<OGRGenSQLResultsLayerArrowStreamPrivateData *>(
+                self->private_data);
+        auto poLayer = dynamic_cast<OGRGenSQLResultsLayer *>(
+            psPrivateData->poShared->m_poLayer);
+        if (!poLayer)
+        {
+            CPLError(
+                CE_Failure, CPLE_NotSupported,
+                "Calling get_schema() on a freed OGRLayer is not supported");
+            return EINVAL;
+        }
+        return poLayer->GetArrowSchemaForwarded(self, out);
+    }
+
+    // Set as the ArrowArrayStream::get_next callback member of the
+    // ArrowArrayStream returned by OGRGenSQLResultsLayer::GetArrowStream()
+    static int GetNext(struct ArrowArrayStream *self, struct ArrowArray *out)
+    {
+        OGRGenSQLResultsLayerArrowStreamPrivateData *psPrivateData =
+            static_cast<OGRGenSQLResultsLayerArrowStreamPrivateData *>(
+                self->private_data);
+        auto poLayer = dynamic_cast<OGRGenSQLResultsLayer *>(
+            psPrivateData->poShared->m_poLayer);
+        if (!poLayer)
+        {
+            CPLError(CE_Failure, CPLE_NotSupported,
+                     "Calling get_next() on a freed OGRLayer is not supported");
+            return EINVAL;
+        }
+        return poLayer->GetNextArrowArrayForwarded(self, out);
+    }
+};
+
+/************************************************************************/
+/*                          GetArrowStream()                            */
+/************************************************************************/
+
+bool OGRGenSQLResultsLayer::GetArrowStream(struct ArrowArrayStream *out_stream,
+                                           CSLConstList papszOptions)
+{
+    if (!TestCapability(OLCFastGetArrowStream) ||
+        CPLTestBool(CPLGetConfigOption("OGR_GENSQL_STREAM_BASE_IMPL", "NO")))
+    {
+        CPLStringList aosOptions(papszOptions);
+        aosOptions.SetNameValue("OGR_GENSQL_STREAM_BASE_IMPL", "YES");
+        return OGRLayer::GetArrowStream(out_stream, aosOptions.List());
+    }
+
+    const swq_select *psSelectInfo = m_pSelectInfo.get();
+    if (m_nIteratedFeatures != -1)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "GetArrowStream() not supported on non-rewinded layer");
+        return false;
+    }
+    CPLStringList aosOptions(papszOptions);
+    if (psSelectInfo->limit > 0)
+    {
+        aosOptions.SetNameValue(
+            "MAX_FEATURES_IN_BATCH",
+            CPLSPrintf(CPL_FRMT_GIB,
+                       std::min(psSelectInfo->limit,
+                                CPLAtoGIntBig(aosOptions.FetchNameValueDef(
+                                    "MAX_FEATURES_IN_BATCH", "65536")))));
+    }
+    bool bRet = OGRLayer::GetArrowStream(out_stream, aosOptions.List());
+    if (bRet)
+    {
+        auto psSrcLayerStream = static_cast<struct ArrowArrayStream *>(
+            CPLMalloc(sizeof(ArrowArrayStream)));
+        if (m_poSrcLayer->GetArrowStream(psSrcLayerStream, aosOptions.List()))
+        {
+            auto psPrivateData =
+                new OGRGenSQLResultsLayerArrowStreamPrivateData;
+            CPLAssert(m_poSharedArrowArrayStreamPrivateData);
+            psPrivateData->poShared = m_poSharedArrowArrayStreamPrivateData;
+            psPrivateData->psSrcLayerStream = psSrcLayerStream;
+            psPrivateData->release_backup = out_stream->release;
+            psPrivateData->private_data_backup = out_stream->private_data;
+            out_stream->get_schema =
+                OGRGenSQLResultsLayerArrowStreamPrivateData::GetSchema;
+            out_stream->get_next =
+                OGRGenSQLResultsLayerArrowStreamPrivateData::GetNext;
+            out_stream->release =
+                OGRGenSQLResultsLayerArrowStreamPrivateData::Release;
+            out_stream->private_data = psPrivateData;
+        }
+        else
+        {
+            if (psSrcLayerStream->release)
+                psSrcLayerStream->release(psSrcLayerStream);
+            CPLFree(psSrcLayerStream);
+            if (out_stream->release)
+                out_stream->release(out_stream);
+            bRet = false;
+        }
+    }
+    return bRet;
+}
+
+/************************************************************************/
+/*                          GetArrowSchema()                            */
+/************************************************************************/
+
+int OGRGenSQLResultsLayer::GetArrowSchema(struct ArrowArrayStream *stream,
+                                          struct ArrowSchema *out_schema)
+{
+    if (m_aosArrowArrayStreamOptions.FetchNameValue(
+            "OGR_GENSQL_STREAM_BASE_IMPL") ||
+        !TestCapability(OLCFastGetArrowStream))
+    {
+        return OGRLayer::GetArrowSchema(stream, out_schema);
+    }
+
+    return GetArrowSchemaForwarded(stream, out_schema);
+}
+
+/************************************************************************/
+/*                      GetArrowSchemaForwarded()                       */
+/************************************************************************/
+
+int OGRGenSQLResultsLayer::GetArrowSchemaForwarded(
+    struct ArrowArrayStream *stream, struct ArrowSchema *out_schema) const
+{
+    const swq_select *psSelectInfo = m_pSelectInfo.get();
+    OGRGenSQLResultsLayerArrowStreamPrivateData *psPrivateData =
+        static_cast<OGRGenSQLResultsLayerArrowStreamPrivateData *>(
+            stream->private_data);
+    int ret = m_poSrcLayer->GetArrowSchema(psPrivateData->psSrcLayerStream,
+                                           out_schema);
+    if (ret == 0)
+    {
+        struct ArrowSchema newSchema;
+        ret = OGRCloneArrowSchema(out_schema, &newSchema) ? 0 : EIO;
+        if (out_schema->release)
+            out_schema->release(out_schema);
+        if (ret == 0)
+        {
+            std::map<std::string, std::string> oMapSrcNameToRenamed;
+            for (std::size_t iField = 0;
+                 iField < psSelectInfo->column_defs.size(); iField++)
+            {
+                const swq_col_def *psColDef =
+                    &psSelectInfo->column_defs[iField];
+                CPLAssert(!psColDef->bHidden);
+                CPLAssert(psColDef->table_index >= 0);
+                CPLAssert(psColDef->col_func == SWQCF_NONE);
+
+                const auto poLayerDefn =
+                    m_apoTableLayers[psColDef->table_index]->GetLayerDefn();
+                CPLAssert(poLayerDefn);
+
+                if (psColDef->field_index >= 0 &&
+                    psColDef->field_index < poLayerDefn->GetFieldCount())
+                {
+                    const auto poSrcFDefn =
+                        poLayerDefn->GetFieldDefn(psColDef->field_index);
+                    if (psColDef->field_alias)
+                        oMapSrcNameToRenamed[poSrcFDefn->GetNameRef()] =
+                            psColDef->field_alias;
+                }
+                else if (IS_GEOM_FIELD_INDEX(poLayerDefn,
+                                             psColDef->field_index))
+                {
+                    const int iSrcGeomField =
+                        ALL_FIELD_INDEX_TO_GEOM_FIELD_INDEX(
+                            poLayerDefn, psColDef->field_index);
+                    const auto poSrcGFDefn =
+                        poLayerDefn->GetGeomFieldDefn(iSrcGeomField);
+                    if (psColDef->field_alias)
+                        oMapSrcNameToRenamed[poSrcGFDefn->GetNameRef()] =
+                            psColDef->field_alias;
+                }
+            }
+
+            for (int i = 0; i < newSchema.n_children; ++i)
+            {
+                const auto oIter =
+                    oMapSrcNameToRenamed.find(newSchema.children[i]->name);
+                if (oIter != oMapSrcNameToRenamed.end())
+                {
+                    CPLFree(const_cast<char *>(newSchema.children[i]->name));
+                    newSchema.children[i]->name =
+                        CPLStrdup(oIter->second.c_str());
+                }
+            }
+
+            memcpy(out_schema, &newSchema, sizeof(newSchema));
+        }
+    }
+    return ret;
+}
+
+/************************************************************************/
+/*                      GetNextArrowArray()                             */
+/************************************************************************/
+
+int OGRGenSQLResultsLayer::GetNextArrowArray(struct ArrowArrayStream *stream,
+                                             struct ArrowArray *out_array)
+{
+    if (m_aosArrowArrayStreamOptions.FetchNameValue(
+            "OGR_GENSQL_STREAM_BASE_IMPL") ||
+        !TestCapability(OLCFastGetArrowStream))
+    {
+        return OGRLayer::GetNextArrowArray(stream, out_array);
+    }
+
+    return GetNextArrowArrayForwarded(stream, out_array);
+}
+
+/************************************************************************/
+/*                  GetNextArrowArrayForwarded()                        */
+/************************************************************************/
+
+int OGRGenSQLResultsLayer::GetNextArrowArrayForwarded(
+    struct ArrowArrayStream *stream, struct ArrowArray *out_array)
+{
+    const swq_select *psSelectInfo = m_pSelectInfo.get();
+    if (psSelectInfo->limit >= 0 && m_nIteratedFeatures >= psSelectInfo->limit)
+    {
+        memset(out_array, 0, sizeof(*out_array));
+        return 0;
+    }
+
+    OGRGenSQLResultsLayerArrowStreamPrivateData *psPrivateData =
+        static_cast<OGRGenSQLResultsLayerArrowStreamPrivateData *>(
+            stream->private_data);
+    const int ret = m_poSrcLayer->GetNextArrowArray(
+        psPrivateData->psSrcLayerStream, out_array);
+    if (ret == 0 && psSelectInfo->limit >= 0)
+    {
+        if (m_nIteratedFeatures < 0)
+            m_nIteratedFeatures = 0;
+        m_nIteratedFeatures += out_array->length;
+        if (m_nIteratedFeatures > psSelectInfo->limit)
+        {
+            out_array->length -= m_nIteratedFeatures - psSelectInfo->limit;
+            for (int i = 0; i < out_array->n_children; ++i)
+            {
+                out_array->children[i]->length -=
+                    m_nIteratedFeatures - psSelectInfo->limit;
+            }
+        }
+    }
+    return ret;
+}
+
 //! @endcond
diff --git a/ogr/ogrsf_frmts/generic/ogr_gensql.h b/ogr/ogrsf_frmts/generic/ogr_gensql.h
index dcbd87e7a101..ae8bed191e66 100644
--- a/ogr/ogrsf_frmts/generic/ogr_gensql.h
+++ b/ogr/ogrsf_frmts/generic/ogr_gensql.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2002, Frank Warmerdam
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_GENSQL_H_INCLUDED
@@ -92,7 +76,7 @@ class OGRGenSQLResultsLayer final : public OGRLayer
 
     bool PrepareSummary();
 
-    OGRFeature *TranslateFeature(OGRFeature *);
+    std::unique_ptr<OGRFeature> TranslateFeature(std::unique_ptr<OGRFeature>);
     void CreateOrderByIndex();
     void ReadIndexFields(OGRFeature *poSrcFeat, int nOrderItems,
                          OGRField *pasIndexFields);
@@ -151,6 +135,24 @@ class OGRGenSQLResultsLayer final : public OGRLayer
 
     virtual void SetSpatialFilter(int iGeomField, OGRGeometry *) override;
     virtual OGRErr SetAttributeFilter(const char *) override;
+
+    bool GetArrowStream(struct ArrowArrayStream *out_stream,
+                        CSLConstList papszOptions = nullptr) override;
+
+    int GetArrowSchema(struct ArrowArrayStream *stream,
+                       struct ArrowSchema *out_schema) override;
+
+  protected:
+    friend struct OGRGenSQLResultsLayerArrowStreamPrivateData;
+
+    int GetArrowSchemaForwarded(struct ArrowArrayStream *stream,
+                                struct ArrowSchema *out_schema) const;
+
+    int GetNextArrowArray(struct ArrowArrayStream *stream,
+                          struct ArrowArray *out_array) override;
+
+    int GetNextArrowArrayForwarded(struct ArrowArrayStream *stream,
+                                   struct ArrowArray *out_array);
 };
 
 /*! @endcond */
diff --git a/ogr/ogrsf_frmts/generic/ogr_miattrind.cpp b/ogr/ogrsf_frmts/generic/ogr_miattrind.cpp
index 50e38ac69af4..f16b994c3926 100644
--- a/ogr/ogrsf_frmts/generic/ogr_miattrind.cpp
+++ b/ogr/ogrsf_frmts/generic/ogr_miattrind.cpp
@@ -9,26 +9,13 @@
  * Copyright (c) 2003, Frank Warmerdam
  * Copyright (c) 2008-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_attrind.h"
+
+#ifdef HAVE_MITAB
+
 #include "mitab/mitab_priv.h"
 #include "cpl_minixml.h"
 
@@ -829,3 +816,17 @@ OGRErr OGRMIAttrIndex::Clear()
 {
     return OGRERR_UNSUPPORTED_OPERATION;
 }
+
+#else
+
+/************************************************************************/
+/*                     OGRCreateDefaultLayerIndex()                     */
+/************************************************************************/
+
+OGRLayerAttrIndex *OGRCreateDefaultLayerIndex()
+
+{
+    return nullptr;
+}
+
+#endif
diff --git a/ogr/ogrsf_frmts/generic/ograrrowarrayhelper.cpp b/ogr/ogrsf_frmts/generic/ograrrowarrayhelper.cpp
index 959620ad44ac..e1330890510a 100644
--- a/ogr/ogrsf_frmts/generic/ograrrowarrayhelper.cpp
+++ b/ogr/ogrsf_frmts/generic/ograrrowarrayhelper.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ograrrowarrayhelper.h"
diff --git a/ogr/ogrsf_frmts/generic/ograrrowarrayhelper.h b/ogr/ogrsf_frmts/generic/ograrrowarrayhelper.h
index c18221eac5c3..e7cb2355a5a8 100644
--- a/ogr/ogrsf_frmts/generic/ograrrowarrayhelper.h
+++ b/ogr/ogrsf_frmts/generic/ograrrowarrayhelper.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #pragma once
diff --git a/ogr/ogrsf_frmts/generic/ogrdatasource.cpp b/ogr/ogrsf_frmts/generic/ogrdatasource.cpp
index 900dadb6c7a1..4d00560c4019 100644
--- a/ogr/ogrsf_frmts/generic/ogrdatasource.cpp
+++ b/ogr/ogrsf_frmts/generic/ogrdatasource.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999,  Les Technologies SoftMap Inc.
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
diff --git a/ogr/ogrsf_frmts/generic/ogreditablelayer.cpp b/ogr/ogrsf_frmts/generic/ogreditablelayer.cpp
index b2a0bcd3b030..bab336a4d8be 100644
--- a/ogr/ogrsf_frmts/generic/ogreditablelayer.cpp
+++ b/ogr/ogrsf_frmts/generic/ogreditablelayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogreditablelayer.h"
diff --git a/ogr/ogrsf_frmts/generic/ogreditablelayer.h b/ogr/ogrsf_frmts/generic/ogreditablelayer.h
index 7c8da32033a8..4e517c4728f0 100644
--- a/ogr/ogrsf_frmts/generic/ogreditablelayer.h
+++ b/ogr/ogrsf_frmts/generic/ogreditablelayer.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGREDITABLELAYER_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/generic/ogremulatedtransaction.cpp b/ogr/ogrsf_frmts/generic/ogremulatedtransaction.cpp
index ad2bf358327b..5ae5dea2b746 100644
--- a/ogr/ogrsf_frmts/generic/ogremulatedtransaction.cpp
+++ b/ogr/ogrsf_frmts/generic/ogremulatedtransaction.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogremulatedtransaction.h"
@@ -77,12 +61,12 @@ class OGRLayerWithTransaction final : public OGRLayerDecorator
     virtual OGRErr Rename(const char *pszNewName) override;
 };
 
-class OGRDataSourceWithTransaction final : public OGRDataSource
+class OGRDataSourceWithTransaction final : public GDALDataset
 {
     CPL_DISALLOW_COPY_ASSIGN(OGRDataSourceWithTransaction)
 
   protected:
-    OGRDataSource *m_poBaseDataSource;
+    GDALDataset *m_poBaseDataSource;
     IOGRTransactionBehaviour *m_poTransactionBehavior;
     int m_bHasOwnershipDataSource;
     int m_bHasOwnershipTransactionBehavior;
@@ -97,7 +81,7 @@ class OGRDataSourceWithTransaction final : public OGRDataSource
 
   public:
     OGRDataSourceWithTransaction(
-        OGRDataSource *poBaseDataSource,
+        GDALDataset *poBaseDataSource,
         IOGRTransactionBehaviour *poTransactionBehaviour,
         int bTakeOwnershipDataSource, int bTakeOwnershipTransactionBehavior);
 
@@ -108,8 +92,6 @@ class OGRDataSourceWithTransaction final : public OGRDataSource
         return m_bInTransaction;
     }
 
-    virtual const char *GetName() override;
-
     virtual int GetLayerCount() override;
     virtual OGRLayer *GetLayer(int) override;
     virtual OGRLayer *GetLayerByName(const char *) override;
@@ -181,8 +163,8 @@ IOGRTransactionBehaviour::~IOGRTransactionBehaviour()
 /*              OGRCreateEmulatedTransactionDataSourceWrapper()         */
 /************************************************************************/
 
-OGRDataSource *OGRCreateEmulatedTransactionDataSourceWrapper(
-    OGRDataSource *poBaseDataSource,
+GDALDataset *OGRCreateEmulatedTransactionDataSourceWrapper(
+    GDALDataset *poBaseDataSource,
     IOGRTransactionBehaviour *poTransactionBehaviour,
     int bTakeOwnershipDataSource, int bTakeOwnershipTransactionBehavior)
 {
@@ -196,7 +178,7 @@ OGRDataSource *OGRCreateEmulatedTransactionDataSourceWrapper(
 /************************************************************************/
 
 OGRDataSourceWithTransaction::OGRDataSourceWithTransaction(
-    OGRDataSource *poBaseDataSource,
+    GDALDataset *poBaseDataSource,
     IOGRTransactionBehaviour *poTransactionBehaviour,
     int bTakeOwnershipDataSource, int bTakeOwnershipTransactionBehavior)
     : m_poBaseDataSource(poBaseDataSource),
@@ -255,13 +237,6 @@ void OGRDataSourceWithTransaction::RemapLayers()
     m_oMapLayers.clear();
 }
 
-const char *OGRDataSourceWithTransaction::GetName()
-{
-    if (!m_poBaseDataSource)
-        return "";
-    return m_poBaseDataSource->GetName();
-}
-
 int OGRDataSourceWithTransaction::GetLayerCount()
 {
     if (!m_poBaseDataSource)
diff --git a/ogr/ogrsf_frmts/generic/ogremulatedtransaction.h b/ogr/ogrsf_frmts/generic/ogremulatedtransaction.h
index 9155fb69d1a4..5a3c49c3f311 100644
--- a/ogr/ogrsf_frmts/generic/ogremulatedtransaction.h
+++ b/ogr/ogrsf_frmts/generic/ogremulatedtransaction.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGREMULATEDTRANSACTION_H_INCLUDED
@@ -56,7 +40,7 @@ class CPL_DLL IOGRTransactionBehaviour
      * been closed
      * @return OGRERR_NONE in case of success
      */
-    virtual OGRErr StartTransaction(OGRDataSource *&poDSInOut,
+    virtual OGRErr StartTransaction(GDALDataset *&poDSInOut,
                                     int &bOutHasReopenedDS) = 0;
 
     /** Commit a transaction.
@@ -73,7 +57,7 @@ class CPL_DLL IOGRTransactionBehaviour
      * been closed
      * @return OGRERR_NONE in case of success
      */
-    virtual OGRErr CommitTransaction(OGRDataSource *&poDSInOut,
+    virtual OGRErr CommitTransaction(GDALDataset *&poDSInOut,
                                      int &bOutHasReopenedDS) = 0;
 
     /** Rollback a transaction.
@@ -90,7 +74,7 @@ class CPL_DLL IOGRTransactionBehaviour
      * been closed
      * @return OGRERR_NONE in case of success
      */
-    virtual OGRErr RollbackTransaction(OGRDataSource *&poDSInOut,
+    virtual OGRErr RollbackTransaction(GDALDataset *&poDSInOut,
                                        int &bOutHasReopenedDS) = 0;
 };
 
@@ -124,8 +108,8 @@ class CPL_DLL IOGRTransactionBehaviour
  * @return a new datasource handle
  * @since GDAL 2.0
  */
-OGRDataSource CPL_DLL *OGRCreateEmulatedTransactionDataSourceWrapper(
-    OGRDataSource *poBaseDataSource,
+GDALDataset CPL_DLL *OGRCreateEmulatedTransactionDataSourceWrapper(
+    GDALDataset *poBaseDataSource,
     IOGRTransactionBehaviour *poTransactionBehaviour,
     int bTakeOwnershipDataSource, int bTakeOwnershipTransactionBehavior);
 
diff --git a/ogr/ogrsf_frmts/generic/ogrlayer.cpp b/ogr/ogrsf_frmts/generic/ogrlayer.cpp
index fdf592d0a931..1047d3c74ff3 100644
--- a/ogr/ogrsf_frmts/generic/ogrlayer.cpp
+++ b/ogr/ogrsf_frmts/generic/ogrlayer.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999,  Les Technologies SoftMap Inc.
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
@@ -38,6 +22,7 @@
 
 #include "cpl_time.h"
 #include <cassert>
+#include <cmath>
 #include <limits>
 #include <set>
 
@@ -348,8 +333,8 @@ OGRErr OGRLayer::GetExtentInternal(int iGeomField, OGREnvelope *psExtent,
         else if (!bExtentSet)
         {
             poGeom->getEnvelope(psExtent);
-            if (!(CPLIsNan(psExtent->MinX) || CPLIsNan(psExtent->MinY) ||
-                  CPLIsNan(psExtent->MaxX) || CPLIsNan(psExtent->MaxY)))
+            if (!(std::isnan(psExtent->MinX) || std::isnan(psExtent->MinY) ||
+                  std::isnan(psExtent->MaxX) || std::isnan(psExtent->MaxY)))
             {
                 bExtentSet = true;
             }
@@ -1942,9 +1927,11 @@ void OGR_L_ResetReading(OGRLayerH hLayer)
 /************************************************************************/
 
 //! @cond Doxygen_Suppress
-OGRErr OGRLayer::InitializeIndexSupport(const char *pszFilename)
+OGRErr
+OGRLayer::InitializeIndexSupport([[maybe_unused]] const char *pszFilename)
 
 {
+#ifdef HAVE_MITAB
     OGRErr eErr;
 
     if (m_poAttrIndex != nullptr)
@@ -1960,6 +1947,9 @@ OGRErr OGRLayer::InitializeIndexSupport(const char *pszFilename)
     }
 
     return eErr;
+#else
+    return OGRERR_FAILURE;
+#endif
 }
 
 //! @endcond
@@ -2551,7 +2541,9 @@ static OGRGeometry *set_filter_from(OGRLayer *pLayer,
 static OGRGeometry *promote_to_multi(OGRGeometry *poGeom)
 {
     OGRwkbGeometryType eType = wkbFlatten(poGeom->getGeometryType());
-    if (eType == wkbPolygon)
+    if (eType == wkbPoint)
+        return OGRGeometryFactory::forceToMultiPoint(poGeom);
+    else if (eType == wkbPolygon)
         return OGRGeometryFactory::forceToMultiPolygon(poGeom);
     else if (eType == wkbLineString)
         return OGRGeometryFactory::forceToMultiLineString(poGeom);
@@ -2587,23 +2579,32 @@ static OGRGeometry *promote_to_multi(OGRGeometry *poGeom)
  * <ul>
  * <li>SKIP_FAILURES=YES/NO. Set to YES to go on, even when a
  *     feature could not be inserted or a GEOS call failed.
+ * </li>
  * <li>PROMOTE_TO_MULTI=YES/NO. Set to YES to convert Polygons
- *     into MultiPolygons, or LineStrings to MultiLineStrings.
+ *     into MultiPolygons, LineStrings to MultiLineStrings or
+ *     Points to MultiPoints (only since GDAL 3.9.2 for the later)
+ * </li>
  * <li>INPUT_PREFIX=string. Set a prefix for the field names that
  *     will be created from the fields of the input layer.
+ * </li>
  * <li>METHOD_PREFIX=string. Set a prefix for the field names that
  *     will be created from the fields of the method layer.
+ * </li>
  * <li>USE_PREPARED_GEOMETRIES=YES/NO. Set to NO to not use prepared
  *     geometries to pretest intersection of features of method layer
  *     with features of this layer.
+ * </li>
  * <li>PRETEST_CONTAINMENT=YES/NO. Set to YES to pretest the
  *     containment of features of method layer within the features of
  *     this layer. This will speed up the method significantly in some
  *     cases. Requires that the prepared geometries are in effect.
+ * </li>
  * <li>KEEP_LOWER_DIMENSION_GEOMETRIES=YES/NO. Set to NO to skip
  *     result features with lower dimension geometry that would
- *     otherwise be added to the result layer. The default is to add
- *     but only if the result layer has an unknown geometry type.
+ *     otherwise be added to the result layer. The default is YES, to add
+ *     features with lower dimension geometry, but only if the result layer
+ *     has an unknown geometry type.
+ * </li>
  * </ul>
  *
  * This method is the same as the C function OGR_L_Intersection().
@@ -2645,22 +2646,22 @@ OGRErr OGRLayer::Intersection(OGRLayer *pLayerMethod, OGRLayer *pLayerResult,
     double progress_max = static_cast<double>(GetFeatureCount(FALSE));
     double progress_counter = 0;
     double progress_ticker = 0;
-    int bSkipFailures =
+    const bool bSkipFailures =
         CPLTestBool(CSLFetchNameValueDef(papszOptions, "SKIP_FAILURES", "NO"));
-    int bPromoteToMulti = CPLTestBool(
+    const bool bPromoteToMulti = CPLTestBool(
         CSLFetchNameValueDef(papszOptions, "PROMOTE_TO_MULTI", "NO"));
-    int bUsePreparedGeometries = CPLTestBool(
+    const bool bUsePreparedGeometries = CPLTestBool(
         CSLFetchNameValueDef(papszOptions, "USE_PREPARED_GEOMETRIES", "YES"));
-    if (bUsePreparedGeometries)
-        bUsePreparedGeometries = OGRHasPreparedGeometrySupport();
-    int bPretestContainment = CPLTestBool(
+    const bool bPretestContainment = CPLTestBool(
         CSLFetchNameValueDef(papszOptions, "PRETEST_CONTAINMENT", "NO"));
-    int bKeepLowerDimGeom = CPLTestBool(CSLFetchNameValueDef(
+    bool bKeepLowerDimGeom = CPLTestBool(CSLFetchNameValueDef(
         papszOptions, "KEEP_LOWER_DIMENSION_GEOMETRIES", "YES"));
 
     // check for GEOS
     if (!OGRGeometryFactory::haveGEOS())
     {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "OGRLayer::Intersection() requires GEOS support");
         return OGRERR_UNSUPPORTED_OPERATION;
     }
 
@@ -2687,7 +2688,7 @@ OGRErr OGRLayer::Intersection(OGRLayer *pLayerMethod, OGRLayer *pLayerResult,
         {
             CPLDebug("OGR", "Resetting KEEP_LOWER_DIMENSION_GEOMETRIES to NO "
                             "since the result layer does not allow it.");
-            bKeepLowerDimGeom = FALSE;
+            bKeepLowerDimGeom = false;
         }
     }
 
@@ -2900,23 +2901,32 @@ OGRErr OGRLayer::Intersection(OGRLayer *pLayerMethod, OGRLayer *pLayerResult,
  * <ul>
  * <li>SKIP_FAILURES=YES/NO. Set it to YES to go on, even when a
  *     feature could not be inserted or a GEOS call failed.
- * <li>PROMOTE_TO_MULTI=YES/NO. Set it to YES to convert Polygons
- *     into MultiPolygons, or LineStrings to MultiLineStrings.
+ * </li>
+ * <li>PROMOTE_TO_MULTI=YES/NO. Set to YES to convert Polygons
+ *     into MultiPolygons, LineStrings to MultiLineStrings or
+ *     Points to MultiPoints (only since GDAL 3.9.2 for the later)
+ * </li>
  * <li>INPUT_PREFIX=string. Set a prefix for the field names that
  *     will be created from the fields of the input layer.
+ * </li>
  * <li>METHOD_PREFIX=string. Set a prefix for the field names that
  *     will be created from the fields of the method layer.
+ * </li>
  * <li>USE_PREPARED_GEOMETRIES=YES/NO. Set to NO to not use prepared
  *     geometries to pretest intersection of features of method layer
  *     with features of this layer.
+ * </li>
  * <li>PRETEST_CONTAINMENT=YES/NO. Set to YES to pretest the
  *     containment of features of method layer within the features of
  *     this layer. This will speed up the method significantly in some
  *     cases. Requires that the prepared geometries are in effect.
+ * </li>
  * <li>KEEP_LOWER_DIMENSION_GEOMETRIES=YES/NO. Set to NO to skip
  *     result features with lower dimension geometry that would
- *     otherwise be added to the result layer. The default is to add
- *     but only if the result layer has an unknown geometry type.
+ *     otherwise be added to the result layer. The default is YES, to add
+ *     features with lower dimension geometry, but only if the result layer
+ *     has an unknown geometry type.
+ * </li>
  * </ul>
  *
  * This function is the same as the C++ method OGRLayer::Intersection().
@@ -2992,19 +3002,27 @@ OGRErr OGR_L_Intersection(OGRLayerH pLayerInput, OGRLayerH pLayerMethod,
  * <ul>
  * <li>SKIP_FAILURES=YES/NO. Set it to YES to go on, even when a
  *     feature could not be inserted or a GEOS call failed.
- * <li>PROMOTE_TO_MULTI=YES/NO. Set it to YES to convert Polygons
- *     into MultiPolygons, or LineStrings to MultiLineStrings.
+ * </li>
+ * <li>PROMOTE_TO_MULTI=YES/NO. Set to YES to convert Polygons
+ *     into MultiPolygons, LineStrings to MultiLineStrings or
+ *     Points to MultiPoints (only since GDAL 3.9.2 for the later)
+ * </li>
  * <li>INPUT_PREFIX=string. Set a prefix for the field names that
  *     will be created from the fields of the input layer.
+ * </li>
  * <li>METHOD_PREFIX=string. Set a prefix for the field names that
  *     will be created from the fields of the method layer.
+ * </li>
  * <li>USE_PREPARED_GEOMETRIES=YES/NO. Set to NO to not use prepared
  *     geometries to pretest intersection of features of method layer
  *     with features of this layer.
+ * </li>
  * <li>KEEP_LOWER_DIMENSION_GEOMETRIES=YES/NO. Set to NO to skip
  *     result features with lower dimension geometry that would
- *     otherwise be added to the result layer. The default is to add
- *     but only if the result layer has an unknown geometry type.
+ *     otherwise be added to the result layer. The default is YES, to add
+ *     features with lower dimension geometry, but only if the result layer
+ *     has an unknown geometry type.
+ * </li>
  * </ul>
  *
  * This method is the same as the C function OGR_L_Union().
@@ -3047,20 +3065,20 @@ OGRErr OGRLayer::Union(OGRLayer *pLayerMethod, OGRLayer *pLayerResult,
         static_cast<double>(pLayerMethod->GetFeatureCount(FALSE));
     double progress_counter = 0;
     double progress_ticker = 0;
-    int bSkipFailures =
+    const bool bSkipFailures =
         CPLTestBool(CSLFetchNameValueDef(papszOptions, "SKIP_FAILURES", "NO"));
-    int bPromoteToMulti = CPLTestBool(
+    const bool bPromoteToMulti = CPLTestBool(
         CSLFetchNameValueDef(papszOptions, "PROMOTE_TO_MULTI", "NO"));
-    int bUsePreparedGeometries = CPLTestBool(
+    const bool bUsePreparedGeometries = CPLTestBool(
         CSLFetchNameValueDef(papszOptions, "USE_PREPARED_GEOMETRIES", "YES"));
-    if (bUsePreparedGeometries)
-        bUsePreparedGeometries = OGRHasPreparedGeometrySupport();
-    int bKeepLowerDimGeom = CPLTestBool(CSLFetchNameValueDef(
+    bool bKeepLowerDimGeom = CPLTestBool(CSLFetchNameValueDef(
         papszOptions, "KEEP_LOWER_DIMENSION_GEOMETRIES", "YES"));
 
     // check for GEOS
     if (!OGRGeometryFactory::haveGEOS())
     {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "OGRLayer::Union() requires GEOS support");
         return OGRERR_UNSUPPORTED_OPERATION;
     }
 
@@ -3438,19 +3456,27 @@ OGRErr OGRLayer::Union(OGRLayer *pLayerMethod, OGRLayer *pLayerResult,
  * <ul>
  * <li>SKIP_FAILURES=YES/NO. Set it to YES to go on, even when a
  *     feature could not be inserted or a GEOS call failed.
- * <li>PROMOTE_TO_MULTI=YES/NO. Set it to YES to convert Polygons
- *     into MultiPolygons, or LineStrings to MultiLineStrings.
+ * </li>
+ * <li>PROMOTE_TO_MULTI=YES/NO. Set to YES to convert Polygons
+ *     into MultiPolygons, LineStrings to MultiLineStrings or
+ *     Points to MultiPoints (only since GDAL 3.9.2 for the later)
+ * </li>
  * <li>INPUT_PREFIX=string. Set a prefix for the field names that
  *     will be created from the fields of the input layer.
+ * </li>
  * <li>METHOD_PREFIX=string. Set a prefix for the field names that
  *     will be created from the fields of the method layer.
+ * </li>
  * <li>USE_PREPARED_GEOMETRIES=YES/NO. Set to NO to not use prepared
  *     geometries to pretest intersection of features of method layer
  *     with features of this layer.
+ * </li>
  * <li>KEEP_LOWER_DIMENSION_GEOMETRIES=YES/NO. Set to NO to skip
  *     result features with lower dimension geometry that would
- *     otherwise be added to the result layer. The default is to add
- *     but only if the result layer has an unknown geometry type.
+ *     otherwise be added to the result layer. The default is YES, to add
+ *     features with lower dimension geometry, but only if the result layer
+ *     has an unknown geometry type.
+ * </li>
  * </ul>
  *
  * This function is the same as the C++ method OGRLayer::Union().
@@ -3524,12 +3550,16 @@ OGRErr OGR_L_Union(OGRLayerH pLayerInput, OGRLayerH pLayerMethod,
  * <ul>
  * <li>SKIP_FAILURES=YES/NO. Set it to YES to go on, even when a
  *     feature could not be inserted or a GEOS call failed.
+ * </li>
  * <li>PROMOTE_TO_MULTI=YES/NO. Set it to YES to convert Polygons
  *     into MultiPolygons, or LineStrings to MultiLineStrings.
+ * </li>
  * <li>INPUT_PREFIX=string. Set a prefix for the field names that
  *     will be created from the fields of the input layer.
+ * </li>
  * <li>METHOD_PREFIX=string. Set a prefix for the field names that
  *     will be created from the fields of the method layer.
+ * </li>
  * </ul>
  *
  * This method is the same as the C function OGR_L_SymDifference().
@@ -3572,14 +3602,16 @@ OGRErr OGRLayer::SymDifference(OGRLayer *pLayerMethod, OGRLayer *pLayerResult,
         static_cast<double>(pLayerMethod->GetFeatureCount(FALSE));
     double progress_counter = 0;
     double progress_ticker = 0;
-    int bSkipFailures =
+    const bool bSkipFailures =
         CPLTestBool(CSLFetchNameValueDef(papszOptions, "SKIP_FAILURES", "NO"));
-    int bPromoteToMulti = CPLTestBool(
+    const bool bPromoteToMulti = CPLTestBool(
         CSLFetchNameValueDef(papszOptions, "PROMOTE_TO_MULTI", "NO"));
 
     // check for GEOS
     if (!OGRGeometryFactory::haveGEOS())
     {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "OGRLayer::SymDifference() requires GEOS support");
         return OGRERR_UNSUPPORTED_OPERATION;
     }
 
@@ -3852,12 +3884,17 @@ OGRErr OGRLayer::SymDifference(OGRLayer *pLayerMethod, OGRLayer *pLayerResult,
  * <ul>
  * <li>SKIP_FAILURES=YES/NO. Set it to YES to go on, even when a
  *     feature could not be inserted or a GEOS call failed.
- * <li>PROMOTE_TO_MULTI=YES/NO. Set it to YES to convert Polygons
- *     into MultiPolygons, or LineStrings to MultiLineStrings.
+ * </li>
+ * <li>PROMOTE_TO_MULTI=YES/NO. Set to YES to convert Polygons
+ *     into MultiPolygons, LineStrings to MultiLineStrings or
+ *     Points to MultiPoints (only since GDAL 3.9.2 for the later)
+ * </li>
  * <li>INPUT_PREFIX=string. Set a prefix for the field names that
  *     will be created from the fields of the input layer.
+ * </li>
  * <li>METHOD_PREFIX=string. Set a prefix for the field names that
  *     will be created from the fields of the method layer.
+ * </li>
  * </ul>
  *
  * This function is the same as the C++ method OGRLayer::SymDifference().
@@ -3932,19 +3969,27 @@ OGRErr OGR_L_SymDifference(OGRLayerH pLayerInput, OGRLayerH pLayerMethod,
  * <ul>
  * <li>SKIP_FAILURES=YES/NO. Set it to YES to go on, even when a
  *     feature could not be inserted or a GEOS call failed.
- * <li>PROMOTE_TO_MULTI=YES/NO. Set it to YES to convert Polygons
- *     into MultiPolygons, or LineStrings to MultiLineStrings.
+ * </li>
+ * <li>PROMOTE_TO_MULTI=YES/NO. Set to YES to convert Polygons
+ *     into MultiPolygons, LineStrings to MultiLineStrings or
+ *     Points to MultiPoints (only since GDAL 3.9.2 for the later)
+ * </li>
  * <li>INPUT_PREFIX=string. Set a prefix for the field names that
  *     will be created from the fields of the input layer.
+ * </li>
  * <li>METHOD_PREFIX=string. Set a prefix for the field names that
  *     will be created from the fields of the method layer.
+ * </li>
  * <li>USE_PREPARED_GEOMETRIES=YES/NO. Set to NO to not use prepared
  *     geometries to pretest intersection of features of method layer
  *     with features of this layer.
+ * </li>
  * <li>KEEP_LOWER_DIMENSION_GEOMETRIES=YES/NO. Set to NO to skip
  *     result features with lower dimension geometry that would
- *     otherwise be added to the result layer. The default is to add
- *     but only if the result layer has an unknown geometry type.
+ *     otherwise be added to the result layer. The default is YES, to add
+ *     features with lower dimension geometry, but only if the result layer
+ *     has an unknown geometry type.
+ * </li>
  * </ul>
  *
  * This method is the same as the C function OGR_L_Identity().
@@ -3984,20 +4029,20 @@ OGRErr OGRLayer::Identity(OGRLayer *pLayerMethod, OGRLayer *pLayerResult,
     double progress_max = static_cast<double>(GetFeatureCount(FALSE));
     double progress_counter = 0;
     double progress_ticker = 0;
-    int bSkipFailures =
+    const bool bSkipFailures =
         CPLTestBool(CSLFetchNameValueDef(papszOptions, "SKIP_FAILURES", "NO"));
-    int bPromoteToMulti = CPLTestBool(
+    const bool bPromoteToMulti = CPLTestBool(
         CSLFetchNameValueDef(papszOptions, "PROMOTE_TO_MULTI", "NO"));
-    int bUsePreparedGeometries = CPLTestBool(
+    const bool bUsePreparedGeometries = CPLTestBool(
         CSLFetchNameValueDef(papszOptions, "USE_PREPARED_GEOMETRIES", "YES"));
-    if (bUsePreparedGeometries)
-        bUsePreparedGeometries = OGRHasPreparedGeometrySupport();
-    int bKeepLowerDimGeom = CPLTestBool(CSLFetchNameValueDef(
+    bool bKeepLowerDimGeom = CPLTestBool(CSLFetchNameValueDef(
         papszOptions, "KEEP_LOWER_DIMENSION_GEOMETRIES", "YES"));
 
     // check for GEOS
     if (!OGRGeometryFactory::haveGEOS())
     {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "OGRLayer::Identity() requires GEOS support");
         return OGRERR_UNSUPPORTED_OPERATION;
     }
     if (bKeepLowerDimGeom)
@@ -4258,19 +4303,27 @@ OGRErr OGRLayer::Identity(OGRLayer *pLayerMethod, OGRLayer *pLayerResult,
  * <ul>
  * <li>SKIP_FAILURES=YES/NO. Set it to YES to go on, even when a
  *     feature could not be inserted or a GEOS call failed.
- * <li>PROMOTE_TO_MULTI=YES/NO. Set it to YES to convert Polygons
- *     into MultiPolygons, or LineStrings to MultiLineStrings.
+ * </li>
+ * <li>PROMOTE_TO_MULTI=YES/NO. Set to YES to convert Polygons
+ *     into MultiPolygons, LineStrings to MultiLineStrings or
+ *     Points to MultiPoints (only since GDAL 3.9.2 for the later)
+ * </li>
  * <li>INPUT_PREFIX=string. Set a prefix for the field names that
  *     will be created from the fields of the input layer.
+ * </li>
  * <li>METHOD_PREFIX=string. Set a prefix for the field names that
  *     will be created from the fields of the method layer.
+ * </li>
  * <li>USE_PREPARED_GEOMETRIES=YES/NO. Set to NO to not use prepared
  *     geometries to pretest intersection of features of method layer
  *     with features of this layer.
+ * </li>
  * <li>KEEP_LOWER_DIMENSION_GEOMETRIES=YES/NO. Set to NO to skip
  *     result features with lower dimension geometry that would
- *     otherwise be added to the result layer. The default is to add
- *     but only if the result layer has an unknown geometry type.
+ *     otherwise be added to the result layer. The default is YES, to add
+ *     features with lower dimension geometry, but only if the result layer
+ *     has an unknown geometry type.
+ * </li>
  * </ul>
  *
  * This function is the same as the C++ method OGRLayer::Identity().
@@ -4344,12 +4397,17 @@ OGRErr OGR_L_Identity(OGRLayerH pLayerInput, OGRLayerH pLayerMethod,
  * <ul>
  * <li>SKIP_FAILURES=YES/NO. Set it to YES to go on, even when a
  *     feature could not be inserted or a GEOS call failed.
- * <li>PROMOTE_TO_MULTI=YES/NO. Set it to YES to convert Polygons
- *     into MultiPolygons, or LineStrings to MultiLineStrings.
+ * </li>
+ * <li>PROMOTE_TO_MULTI=YES/NO. Set to YES to convert Polygons
+ *     into MultiPolygons, LineStrings to MultiLineStrings or
+ *     Points to MultiPoints (only since GDAL 3.9.2 for the later)
+ * </li>
  * <li>INPUT_PREFIX=string. Set a prefix for the field names that
  *     will be created from the fields of the input layer.
+ * </li>
  * <li>METHOD_PREFIX=string. Set a prefix for the field names that
  *     will be created from the fields of the method layer.
+ * </li>
  * </ul>
  *
  * This method is the same as the C function OGR_L_Update().
@@ -4391,14 +4449,16 @@ OGRErr OGRLayer::Update(OGRLayer *pLayerMethod, OGRLayer *pLayerResult,
         static_cast<double>(pLayerMethod->GetFeatureCount(FALSE));
     double progress_counter = 0;
     double progress_ticker = 0;
-    int bSkipFailures =
+    const bool bSkipFailures =
         CPLTestBool(CSLFetchNameValueDef(papszOptions, "SKIP_FAILURES", "NO"));
-    int bPromoteToMulti = CPLTestBool(
+    const bool bPromoteToMulti = CPLTestBool(
         CSLFetchNameValueDef(papszOptions, "PROMOTE_TO_MULTI", "NO"));
 
     // check for GEOS
     if (!OGRGeometryFactory::haveGEOS())
     {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "OGRLayer::Update() requires GEOS support");
         return OGRERR_UNSUPPORTED_OPERATION;
     }
 
@@ -4609,12 +4669,17 @@ OGRErr OGRLayer::Update(OGRLayer *pLayerMethod, OGRLayer *pLayerResult,
  * <ul>
  * <li>SKIP_FAILURES=YES/NO. Set it to YES to go on, even when a
  *     feature could not be inserted or a GEOS call failed.
- * <li>PROMOTE_TO_MULTI=YES/NO. Set it to YES to convert Polygons
- *     into MultiPolygons, or LineStrings to MultiLineStrings.
+ * </li>
+ * <li>PROMOTE_TO_MULTI=YES/NO. Set to YES to convert Polygons
+ *     into MultiPolygons, LineStrings to MultiLineStrings or
+ *     Points to MultiPoints (only since GDAL 3.9.2 for the later)
+ * </li>
  * <li>INPUT_PREFIX=string. Set a prefix for the field names that
  *     will be created from the fields of the input layer.
+ * </li>
  * <li>METHOD_PREFIX=string. Set a prefix for the field names that
  *     will be created from the fields of the method layer.
+ * </li>
  * </ul>
  *
  * This function is the same as the C++ method OGRLayer::Update().
@@ -4681,12 +4746,17 @@ OGRErr OGR_L_Update(OGRLayerH pLayerInput, OGRLayerH pLayerMethod,
  * <ul>
  * <li>SKIP_FAILURES=YES/NO. Set it to YES to go on, even when a
  *     feature could not be inserted or a GEOS call failed.
- * <li>PROMOTE_TO_MULTI=YES/NO. Set it to YES to convert Polygons
- *     into MultiPolygons, or LineStrings to MultiLineStrings.
+ * </li>
+ * <li>PROMOTE_TO_MULTI=YES/NO. Set to YES to convert Polygons
+ *     into MultiPolygons, LineStrings to MultiLineStrings or
+ *     Points to MultiPoints (only since GDAL 3.9.2 for the later)
+ * </li>
  * <li>INPUT_PREFIX=string. Set a prefix for the field names that
  *     will be created from the fields of the input layer.
+ * </li>
  * <li>METHOD_PREFIX=string. Set a prefix for the field names that
  *     will be created from the fields of the method layer.
+ * </li>
  * </ul>
  *
  * This method is the same as the C function OGR_L_Clip().
@@ -4724,14 +4794,16 @@ OGRErr OGRLayer::Clip(OGRLayer *pLayerMethod, OGRLayer *pLayerResult,
     double progress_max = static_cast<double>(GetFeatureCount(FALSE));
     double progress_counter = 0;
     double progress_ticker = 0;
-    int bSkipFailures =
+    const bool bSkipFailures =
         CPLTestBool(CSLFetchNameValueDef(papszOptions, "SKIP_FAILURES", "NO"));
-    int bPromoteToMulti = CPLTestBool(
+    const bool bPromoteToMulti = CPLTestBool(
         CSLFetchNameValueDef(papszOptions, "PROMOTE_TO_MULTI", "NO"));
 
     // check for GEOS
     if (!OGRGeometryFactory::haveGEOS())
     {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "OGRLayer::Clip() requires GEOS support");
         return OGRERR_UNSUPPORTED_OPERATION;
     }
 
@@ -4906,12 +4978,17 @@ OGRErr OGRLayer::Clip(OGRLayer *pLayerMethod, OGRLayer *pLayerResult,
  * <ul>
  * <li>SKIP_FAILURES=YES/NO. Set it to YES to go on, even when a
  *     feature could not be inserted or a GEOS call failed.
- * <li>PROMOTE_TO_MULTI=YES/NO. Set it to YES to convert Polygons
- *     into MultiPolygons, or LineStrings to MultiLineStrings.
+ * </li>
+ * <li>PROMOTE_TO_MULTI=YES/NO. Set to YES to convert Polygons
+ *     into MultiPolygons, LineStrings to MultiLineStrings or
+ *     Points to MultiPoints (only since GDAL 3.9.2 for the later)
+ * </li>
  * <li>INPUT_PREFIX=string. Set a prefix for the field names that
  *     will be created from the fields of the input layer.
+ * </li>
  * <li>METHOD_PREFIX=string. Set a prefix for the field names that
  *     will be created from the fields of the method layer.
+ * </li>
  * </ul>
  *
  * This function is the same as the C++ method OGRLayer::Clip().
@@ -4978,12 +5055,17 @@ OGRErr OGR_L_Clip(OGRLayerH pLayerInput, OGRLayerH pLayerMethod,
  * <ul>
  * <li>SKIP_FAILURES=YES/NO. Set it to YES to go on, even when a
  *     feature could not be inserted or a GEOS call failed.
- * <li>PROMOTE_TO_MULTI=YES/NO. Set it to YES to convert Polygons
- *     into MultiPolygons, or LineStrings to MultiLineStrings.
+ * </li>
+ * <li>PROMOTE_TO_MULTI=YES/NO. Set to YES to convert Polygons
+ *     into MultiPolygons, LineStrings to MultiLineStrings or
+ *     Points to MultiPoints (only since GDAL 3.9.2 for the later)
+ * </li>
  * <li>INPUT_PREFIX=string. Set a prefix for the field names that
  *     will be created from the fields of the input layer.
+ * </li>
  * <li>METHOD_PREFIX=string. Set a prefix for the field names that
  *     will be created from the fields of the method layer.
+ * </li>
  * </ul>
  *
  * This method is the same as the C function OGR_L_Erase().
@@ -5021,14 +5103,16 @@ OGRErr OGRLayer::Erase(OGRLayer *pLayerMethod, OGRLayer *pLayerResult,
     double progress_max = static_cast<double>(GetFeatureCount(FALSE));
     double progress_counter = 0;
     double progress_ticker = 0;
-    int bSkipFailures =
+    const bool bSkipFailures =
         CPLTestBool(CSLFetchNameValueDef(papszOptions, "SKIP_FAILURES", "NO"));
-    int bPromoteToMulti = CPLTestBool(
+    const bool bPromoteToMulti = CPLTestBool(
         CSLFetchNameValueDef(papszOptions, "PROMOTE_TO_MULTI", "NO"));
 
     // check for GEOS
     if (!OGRGeometryFactory::haveGEOS())
     {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "OGRLayer::Erase() requires GEOS support");
         return OGRERR_UNSUPPORTED_OPERATION;
     }
 
@@ -5182,12 +5266,17 @@ OGRErr OGRLayer::Erase(OGRLayer *pLayerMethod, OGRLayer *pLayerResult,
  * <ul>
  * <li>SKIP_FAILURES=YES/NO. Set it to YES to go on, even when a
  *     feature could not be inserted or a GEOS call failed.
- * <li>PROMOTE_TO_MULTI=YES/NO. Set it to YES to convert Polygons
- *     into MultiPolygons, or LineStrings to MultiLineStrings.
+ * </li>
+ * <li>PROMOTE_TO_MULTI=YES/NO. Set to YES to convert Polygons
+ *     into MultiPolygons, LineStrings to MultiLineStrings or
+ *     Points to MultiPoints (only since GDAL 3.9.2 for the later)
+ * </li>
  * <li>INPUT_PREFIX=string. Set a prefix for the field names that
  *     will be created from the fields of the input layer.
+ * </li>
  * <li>METHOD_PREFIX=string. Set a prefix for the field names that
  *     will be created from the fields of the method layer.
+ * </li>
  * </ul>
  *
  * This function is the same as the C++ method OGRLayer::Erase().
@@ -5563,7 +5652,7 @@ OGRLayer::GetSupportedSRSList(CPL_UNUSED int iGeomField)
  * @param hLayer Layer.
  * @param iGeomField Geometry field index.
  * @param[out] pnCount Number of values in returned array. Must not be null.
- * @return list of supported SRS, to be freeds with OSRFreeSRSArray(), or
+ * @return list of supported SRS, to be freed with OSRFreeSRSArray(), or
  * nullptr
  * @since GDAL 3.7
  */
@@ -5607,9 +5696,10 @@ OGRSpatialReferenceH *OGR_L_GetSupportedSRSList(OGRLayerH hLayer,
  * <ul>
  * <li>the SRS in which geometries of returned features are expressed,</li>
  * <li>the SRS in which geometries of passed features (CreateFeature(),
- * SetFeature()) are expressed,</li> <li>the SRS returned by GetSpatialRef() and
- * GetGeomFieldDefn()->GetSpatialRef(),</li> <li>the SRS used to interpret
- * SetSpatialFilter() values.</li>
+ * SetFeature()) are expressed,</li>
+ * <li>the SRS returned by GetSpatialRef() and
+ * GetGeomFieldDefn()->GetSpatialRef(),</li>
+ * <li>the SRS used to interpret SetSpatialFilter() values.</li>
  * </ul>
  * This also resets feature reading and the spatial filter.
  * Note however that this does not modify the storage SRS of the features of
@@ -5642,9 +5732,10 @@ OGRErr OGRLayer::SetActiveSRS(CPL_UNUSED int iGeomField,
  * <ul>
  * <li>the SRS in which geometries of returned features are expressed,</li>
  * <li>the SRS in which geometries of passed features (CreateFeature(),
- * SetFeature()) are expressed,</li> <li>the SRS returned by GetSpatialRef() and
- * GetGeomFieldDefn()->GetSpatialRef(),</li> <li>the SRS used to interpret
- * SetSpatialFilter() values.</li>
+ * SetFeature()) are expressed,</li>
+ * <li>the SRS returned by GetSpatialRef() and
+ * GetGeomFieldDefn()->GetSpatialRef(),</li>
+ * <li>the SRS used to interpret SetSpatialFilter() values.</li>
  * </ul>
  * This also resets feature reading and the spatial filter.
  * Note however that this does not modify the storage SRS of the features of
diff --git a/ogr/ogrsf_frmts/generic/ogrlayer_private.h b/ogr/ogrsf_frmts/generic/ogrlayer_private.h
index f0b01592a06c..5e03b776d30f 100644
--- a/ogr/ogrsf_frmts/generic/ogrlayer_private.h
+++ b/ogr/ogrsf_frmts/generic/ogrlayer_private.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2024, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRLAYER_PRIVATE_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/generic/ogrlayerarrow.cpp b/ogr/ogrsf_frmts/generic/ogrlayerarrow.cpp
index 4717db14cdd0..686e2aaeae36 100644
--- a/ogr/ogrsf_frmts/generic/ogrlayerarrow.cpp
+++ b/ogr/ogrsf_frmts/generic/ogrlayerarrow.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022-2023, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
@@ -270,25 +254,29 @@ inline void UnsetBit(uint8_t *pabyData, size_t nIdx)
 /*                          DefaultReleaseSchema()                      */
 /************************************************************************/
 
-static void OGRLayerDefaultReleaseSchema(struct ArrowSchema *schema)
+static void OGRLayerReleaseSchema(struct ArrowSchema *schema,
+                                  bool bFullFreeFormat)
 {
     CPLAssert(schema->release != nullptr);
-    if (STARTS_WITH(schema->format, "w:") ||
+    if (bFullFreeFormat || STARTS_WITH(schema->format, "w:") ||
         STARTS_WITH(schema->format, "tsm:"))
     {
         CPLFree(const_cast<char *>(schema->format));
     }
     CPLFree(const_cast<char *>(schema->name));
     CPLFree(const_cast<char *>(schema->metadata));
-    for (int i = 0; i < static_cast<int>(schema->n_children); ++i)
+    if (schema->children)
     {
-        if (schema->children[i]->release)
+        for (int i = 0; i < static_cast<int>(schema->n_children); ++i)
         {
-            schema->children[i]->release(schema->children[i]);
-            CPLFree(schema->children[i]);
+            if (schema->children[i] && schema->children[i]->release)
+            {
+                schema->children[i]->release(schema->children[i]);
+                CPLFree(schema->children[i]);
+            }
         }
+        CPLFree(schema->children);
     }
-    CPLFree(schema->children);
     if (schema->dictionary)
     {
         if (schema->dictionary->release)
@@ -300,6 +288,16 @@ static void OGRLayerDefaultReleaseSchema(struct ArrowSchema *schema)
     schema->release = nullptr;
 }
 
+static void OGRLayerPartialReleaseSchema(struct ArrowSchema *schema)
+{
+    OGRLayerReleaseSchema(schema, /* bFullFreeFormat = */ false);
+}
+
+static void OGRLayerFullReleaseSchema(struct ArrowSchema *schema)
+{
+    OGRLayerReleaseSchema(schema, /* bFullFreeFormat = */ true);
+}
+
 /** Release a ArrowSchema.
  *
  * To be used by driver implementations that have a custom GetArrowStream()
@@ -311,7 +309,7 @@ static void OGRLayerDefaultReleaseSchema(struct ArrowSchema *schema)
 
 void OGRLayer::ReleaseSchema(struct ArrowSchema *schema)
 {
-    OGRLayerDefaultReleaseSchema(schema);
+    OGRLayerPartialReleaseSchema(schema);
 }
 
 /************************************************************************/
@@ -355,7 +353,7 @@ static void AddDictToSchema(struct ArrowSchema *psChild,
     auto psChildDict = static_cast<struct ArrowSchema *>(
         CPLCalloc(1, sizeof(struct ArrowSchema)));
     psChild->dictionary = psChildDict;
-    psChildDict->release = OGRLayerDefaultReleaseSchema;
+    psChildDict->release = OGRLayerPartialReleaseSchema;
     psChildDict->name = CPLStrdup(poCodedDomain->GetName().c_str());
     psChildDict->format = "u";
     if (nCountNull)
@@ -419,9 +417,10 @@ int OGRLayer::GetArrowSchema(struct ArrowArrayStream *,
         psChild->name = CPLStrdup(poFieldDefn->GetNameRef());
         if (poFieldDefn->IsNullable())
             psChild->flags = ARROW_FLAG_NULLABLE;
+        const auto eType = poFieldDefn->GetType();
         const auto eSubType = poFieldDefn->GetSubType();
         const char *item_format = nullptr;
-        switch (poFieldDefn->GetType())
+        switch (eType)
         {
             case OFTInteger:
             {
@@ -585,15 +584,18 @@ int OGRLayer::GetArrowSchema(struct ArrowArrayStream *,
         if (!osComment.empty())
             oMetadata.emplace_back(std::pair(MD_GDAL_OGR_COMMENT, osComment));
 
-        if (poFieldDefn->GetSubType() != OFSTNone &&
-            poFieldDefn->GetSubType() != OFSTBoolean &&
-            poFieldDefn->GetSubType() != OFSTFloat32)
+        if (eType == OFTString && eSubType == OFSTJSON)
         {
             oMetadata.emplace_back(
-                std::pair(MD_GDAL_OGR_SUBTYPE,
-                          OGR_GetFieldSubTypeName(poFieldDefn->GetSubType())));
+                std::pair(ARROW_EXTENSION_NAME_KEY, EXTENSION_NAME_ARROW_JSON));
+        }
+        else if (eSubType != OFSTNone && eSubType != OFSTBoolean &&
+                 eSubType != OFSTFloat32)
+        {
+            oMetadata.emplace_back(std::pair(
+                MD_GDAL_OGR_SUBTYPE, OGR_GetFieldSubTypeName(eSubType)));
         }
-        if (poFieldDefn->GetType() == OFTString && poFieldDefn->GetWidth() > 0)
+        if (eType == OFTString && poFieldDefn->GetWidth() > 0)
         {
             oMetadata.emplace_back(std::pair(
                 MD_GDAL_OGR_WIDTH, CPLSPrintf("%d", poFieldDefn->GetWidth())));
@@ -5460,6 +5462,103 @@ bool OGRCloneArrowArray(const struct ArrowSchema *schema,
     return OGRCloneArrowArray(schema, src_array, out_array, 0);
 }
 
+/************************************************************************/
+/*                     OGRCloneArrowMetadata()                          */
+/************************************************************************/
+
+static void *OGRCloneArrowMetadata(const void *pMetadata)
+{
+    if (!pMetadata)
+        return nullptr;
+    std::vector<GByte> abyOut;
+    const GByte *pabyMetadata = static_cast<const GByte *>(pMetadata);
+    int32_t nKVP;
+    abyOut.insert(abyOut.end(), pabyMetadata, pabyMetadata + sizeof(int32_t));
+    memcpy(&nKVP, pabyMetadata, sizeof(int32_t));
+    pabyMetadata += sizeof(int32_t);
+    for (int i = 0; i < nKVP; ++i)
+    {
+        int32_t nSizeKey;
+        abyOut.insert(abyOut.end(), pabyMetadata,
+                      pabyMetadata + sizeof(int32_t));
+        memcpy(&nSizeKey, pabyMetadata, sizeof(int32_t));
+        pabyMetadata += sizeof(int32_t);
+        abyOut.insert(abyOut.end(), pabyMetadata, pabyMetadata + nSizeKey);
+        pabyMetadata += nSizeKey;
+
+        int32_t nSizeValue;
+        abyOut.insert(abyOut.end(), pabyMetadata,
+                      pabyMetadata + sizeof(int32_t));
+        memcpy(&nSizeValue, pabyMetadata, sizeof(int32_t));
+        pabyMetadata += sizeof(int32_t);
+        abyOut.insert(abyOut.end(), pabyMetadata, pabyMetadata + nSizeValue);
+        pabyMetadata += nSizeValue;
+    }
+
+    GByte *pabyOut = static_cast<GByte *>(VSI_MALLOC_VERBOSE(abyOut.size()));
+    if (pabyOut)
+        memcpy(pabyOut, abyOut.data(), abyOut.size());
+    return pabyOut;
+}
+
+/************************************************************************/
+/*                          OGRCloneArrowSchema()                       */
+/************************************************************************/
+
+/** Full/deep copy of a schema.
+ *
+ * In case of failure, out_schema will be let in a released state.
+ *
+ * @param schema Schema to clone. Must *NOT* be NULL.
+ * @param out_schema Output schema.  Must *NOT* be NULL (but its content may be random)
+ * @return true if success.
+ */
+bool OGRCloneArrowSchema(const struct ArrowSchema *schema,
+                         struct ArrowSchema *out_schema)
+{
+    memset(out_schema, 0, sizeof(*out_schema));
+    out_schema->release = OGRLayerFullReleaseSchema;
+    out_schema->format = CPLStrdup(schema->format);
+    out_schema->name = CPLStrdup(schema->name);
+    out_schema->metadata = static_cast<const char *>(
+        const_cast<const void *>(OGRCloneArrowMetadata(schema->metadata)));
+    out_schema->flags = schema->flags;
+    if (schema->n_children)
+    {
+        out_schema->children =
+            static_cast<struct ArrowSchema **>(VSI_CALLOC_VERBOSE(
+                static_cast<int>(schema->n_children), sizeof(ArrowSchema *)));
+        if (!out_schema->children)
+        {
+            out_schema->release(out_schema);
+            return false;
+        }
+        out_schema->n_children = schema->n_children;
+        for (int i = 0; i < static_cast<int>(schema->n_children); ++i)
+        {
+            out_schema->children[i] = static_cast<struct ArrowSchema *>(
+                CPLMalloc(sizeof(ArrowSchema)));
+            if (!OGRCloneArrowSchema(schema->children[i],
+                                     out_schema->children[i]))
+            {
+                out_schema->release(out_schema);
+                return false;
+            }
+        }
+    }
+    if (schema->dictionary)
+    {
+        out_schema->dictionary =
+            static_cast<struct ArrowSchema *>(CPLMalloc(sizeof(ArrowSchema)));
+        if (!OGRCloneArrowSchema(schema->dictionary, out_schema->dictionary))
+        {
+            out_schema->release(out_schema);
+            return false;
+        }
+    }
+    return true;
+}
+
 /************************************************************************/
 /*                  OGRLayer::IsArrowSchemaSupported()                  */
 /************************************************************************/
@@ -5862,10 +5961,13 @@ bool OGRLayer::CreateFieldFromArrowSchemaInternal(
     if (poDS)
     {
         auto poDriver = poDS->GetDriver();
-        const char *pszMetadataItem =
-            poDriver->GetMetadataItem(GDAL_DMD_CREATIONFIELDDATATYPES);
-        if (pszMetadataItem)
-            aosNativeTypes = CSLTokenizeString2(pszMetadataItem, " ", 0);
+        if (poDriver)
+        {
+            const char *pszMetadataItem =
+                poDriver->GetMetadataItem(GDAL_DMD_CREATIONFIELDDATATYPES);
+            if (pszMetadataItem)
+                aosNativeTypes = CSLTokenizeString2(pszMetadataItem, " ", 0);
+        }
     }
 
     if (schema->dictionary &&
@@ -7374,10 +7476,13 @@ bool OGRLayer::WriteArrowBatch(const struct ArrowSchema *schema,
     if (poDS)
     {
         auto poDriver = poDS->GetDriver();
-        const char *pszMetadataItem =
-            poDriver->GetMetadataItem(GDAL_DMD_CREATIONFIELDDATATYPES);
-        if (pszMetadataItem)
-            aosNativeTypes = CSLTokenizeString2(pszMetadataItem, " ", 0);
+        if (poDriver)
+        {
+            const char *pszMetadataItem =
+                poDriver->GetMetadataItem(GDAL_DMD_CREATIONFIELDDATATYPES);
+            if (pszMetadataItem)
+                aosNativeTypes = CSLTokenizeString2(pszMetadataItem, " ", 0);
+        }
     }
 
     std::vector<FieldInfo> asFieldInfo;
@@ -7579,6 +7684,22 @@ bool OGRLayer::WriteArrowBatch(const struct ArrowSchema *schema,
                         oLayerDefnTmp.GetFieldDefnUnsafe(i)->GetType();
                     const auto eDstType =
                         poLayerDefn->GetFieldDefnUnsafe(i)->GetType();
+
+                    const auto IsDoubleCastToInt64EqualTInt64 =
+                        [](double dfVal, int64_t nOtherVal)
+                    {
+                        // Values in the range [INT64_MAX - 1023, INT64_MAX - 1]
+                        // get converted to a double that once cast to int64_t
+                        // is INT64_MAX + 1, hence the strict < comparison
+                        return dfVal >=
+                                   static_cast<double>(
+                                       std::numeric_limits<int64_t>::min()) &&
+                               dfVal <
+                                   static_cast<double>(
+                                       std::numeric_limits<int64_t>::max()) &&
+                               static_cast<int64_t>(dfVal) == nOtherVal;
+                    };
+
                     if (eSrcType == OFTInteger64 && eDstType == OFTInteger &&
                         oFeatureTarget.GetFieldAsIntegerUnsafe(i) !=
                             oFeature.GetFieldAsInteger64Unsafe(i))
@@ -7599,9 +7720,9 @@ bool OGRLayer::WriteArrowBatch(const struct ArrowSchema *schema,
                         bLossyConversion = true;
                     }
                     else if (eSrcType == OFTInteger64 && eDstType == OFTReal &&
-                             static_cast<GIntBig>(
-                                 oFeatureTarget.GetFieldAsDoubleUnsafe(i)) !=
-                                 oFeature.GetFieldAsInteger64Unsafe(i))
+                             !IsDoubleCastToInt64EqualTInt64(
+                                 oFeatureTarget.GetFieldAsDoubleUnsafe(i),
+                                 oFeature.GetFieldAsInteger64Unsafe(i)))
                     {
                         bLossyConversion = true;
                     }
diff --git a/ogr/ogrsf_frmts/generic/ogrlayerarrow.h b/ogr/ogrsf_frmts/generic/ogrlayerarrow.h
index dc9ed4e726ef..9b6c9805dfaf 100644
--- a/ogr/ogrsf_frmts/generic/ogrlayerarrow.h
+++ b/ogr/ogrsf_frmts/generic/ogrlayerarrow.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRLAYERARROW_H_DEFINED
@@ -34,6 +18,8 @@
 #include <map>
 #include <string>
 
+#include "ogr_recordbatch.h"
+
 constexpr const char *ARROW_EXTENSION_NAME_KEY = "ARROW:extension:name";
 constexpr const char *ARROW_EXTENSION_METADATA_KEY = "ARROW:extension:metadata";
 constexpr const char *EXTENSION_NAME_OGC_WKB = "ogc.wkb";
@@ -47,4 +33,76 @@ bool CPL_DLL OGRCloneArrowArray(const struct ArrowSchema *schema,
                                 const struct ArrowArray *array,
                                 struct ArrowArray *out_array);
 
+bool CPL_DLL OGRCloneArrowSchema(const struct ArrowSchema *schema,
+                                 struct ArrowSchema *out_schema);
+
+/** C++ wrapper on top of ArrowArrayStream */
+class OGRArrowArrayStream
+{
+  public:
+    /** Constructor: instantiate an empty ArrowArrayStream  */
+    inline OGRArrowArrayStream()
+    {
+        memset(&m_stream, 0, sizeof(m_stream));
+    }
+
+    /** Destructor: call release() on the ArrowArrayStream if not already done */
+    inline ~OGRArrowArrayStream()
+    {
+        clear();
+    }
+
+    /** Call release() on the ArrowArrayStream if not already done */
+    // cppcheck-suppress functionStatic
+    inline void clear()
+    {
+        if (m_stream.release)
+        {
+            m_stream.release(&m_stream);
+            m_stream.release = nullptr;
+        }
+    }
+
+    /** Return the raw ArrowArrayStream* */
+    inline ArrowArrayStream *get()
+    {
+        return &m_stream;
+    }
+
+    /** Get the schema */
+    // cppcheck-suppress functionStatic
+    inline int get_schema(struct ArrowSchema *schema)
+    {
+        return m_stream.get_schema(&m_stream, schema);
+    }
+
+    /** Get the next ArrowArray batch */
+    // cppcheck-suppress functionStatic
+    inline int get_next(struct ArrowArray *array)
+    {
+        return m_stream.get_next(&m_stream, array);
+    }
+
+    /** Move assignment operator */
+    inline OGRArrowArrayStream &operator=(OGRArrowArrayStream &&other)
+    {
+        if (this != &other)
+        {
+            clear();
+            memcpy(&m_stream, &(other.m_stream), sizeof(m_stream));
+            memset(&(other.m_stream), 0, sizeof(m_stream));
+        }
+        return *this;
+    }
+
+  private:
+    struct ArrowArrayStream m_stream
+    {
+    };
+
+    OGRArrowArrayStream(const OGRArrowArrayStream &) = delete;
+    OGRArrowArrayStream(OGRArrowArrayStream &&) = delete;
+    OGRArrowArrayStream &operator=(const OGRArrowArrayStream &) = delete;
+};
+
 #endif  // OGRLAYERARROW_H_DEFINED
diff --git a/ogr/ogrsf_frmts/generic/ogrlayerdecorator.cpp b/ogr/ogrsf_frmts/generic/ogrlayerdecorator.cpp
index ce04097ccf43..75ab9612bdeb 100644
--- a/ogr/ogrsf_frmts/generic/ogrlayerdecorator.cpp
+++ b/ogr/ogrsf_frmts/generic/ogrlayerdecorator.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2012-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef DOXYGEN_SKIP
diff --git a/ogr/ogrsf_frmts/generic/ogrlayerdecorator.h b/ogr/ogrsf_frmts/generic/ogrlayerdecorator.h
index da70ce916c54..535f171fe274 100644
--- a/ogr/ogrsf_frmts/generic/ogrlayerdecorator.h
+++ b/ogr/ogrsf_frmts/generic/ogrlayerdecorator.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2012-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRLAYERDECORATOR_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/generic/ogrlayerpool.cpp b/ogr/ogrsf_frmts/generic/ogrlayerpool.cpp
index 9bceadb97b2c..d3166667e685 100644
--- a/ogr/ogrsf_frmts/generic/ogrlayerpool.cpp
+++ b/ogr/ogrsf_frmts/generic/ogrlayerpool.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2012-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef DOXYGEN_SKIP
diff --git a/ogr/ogrsf_frmts/generic/ogrlayerpool.h b/ogr/ogrsf_frmts/generic/ogrlayerpool.h
index 724180af2a28..4343b98746e6 100644
--- a/ogr/ogrsf_frmts/generic/ogrlayerpool.h
+++ b/ogr/ogrsf_frmts/generic/ogrlayerpool.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2012-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRLAYERPOOL_H_INCLUDED
@@ -101,7 +85,7 @@ class CPL_DLL OGRLayerPool
 /*                           OGRProxiedLayer                            */
 /************************************************************************/
 
-class OGRProxiedLayer : public OGRAbstractProxiedLayer
+class CPL_DLL OGRProxiedLayer : public OGRAbstractProxiedLayer
 {
     CPL_DISALLOW_COPY_ASSIGN(OGRProxiedLayer)
 
diff --git a/ogr/ogrsf_frmts/generic/ogrmutexeddatasource.cpp b/ogr/ogrsf_frmts/generic/ogrmutexeddatasource.cpp
index deb285882b22..1d1cf3484f87 100644
--- a/ogr/ogrsf_frmts/generic/ogrmutexeddatasource.cpp
+++ b/ogr/ogrsf_frmts/generic/ogrmutexeddatasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef DOXYGEN_SKIP
@@ -31,7 +15,7 @@
 #include "ogrmutexeddatasource.h"
 #include "cpl_multiproc.h"
 
-OGRMutexedDataSource::OGRMutexedDataSource(OGRDataSource *poBaseDataSource,
+OGRMutexedDataSource::OGRMutexedDataSource(GDALDataset *poBaseDataSource,
                                            int bTakeOwnership,
                                            CPLMutex *hMutexIn,
                                            int bWrapLayersInMutexedLayer)
@@ -54,12 +38,6 @@ OGRMutexedDataSource::~OGRMutexedDataSource()
         delete m_poBaseDataSource;
 }
 
-const char *OGRMutexedDataSource::GetName()
-{
-    CPLMutexHolderOptionalLockD(m_hGlobalMutex);
-    return m_poBaseDataSource->GetName();
-}
-
 int OGRMutexedDataSource::GetLayerCount()
 {
     CPLMutexHolderOptionalLockD(m_hGlobalMutex);
diff --git a/ogr/ogrsf_frmts/generic/ogrmutexeddatasource.h b/ogr/ogrsf_frmts/generic/ogrmutexeddatasource.h
index e3665dfa5ee5..452af8a38d21 100644
--- a/ogr/ogrsf_frmts/generic/ogrmutexeddatasource.h
+++ b/ogr/ogrsf_frmts/generic/ogrmutexeddatasource.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRMUTEXEDDATASOURCELAYER_H_INCLUDED
@@ -37,19 +21,19 @@
 #include "ogrmutexedlayer.h"
 #include <map>
 
-/** OGRMutexedDataSource class protects all virtual methods of OGRDataSource
- *  with a mutex.
+/** OGRMutexedDataSource class protects all virtual methods of GDALDataset,
+ *  related to vector layers, with a mutex.
  *  If the passed mutex is NULL, then no locking will be done.
  *
  *  Note that the constructors and destructors are not explicitly protected
  *  by the mutex.
  */
-class CPL_DLL OGRMutexedDataSource : public OGRDataSource
+class CPL_DLL OGRMutexedDataSource : public GDALDataset
 {
     CPL_DISALLOW_COPY_ASSIGN(OGRMutexedDataSource)
 
   protected:
-    OGRDataSource *m_poBaseDataSource;
+    GDALDataset *m_poBaseDataSource;
     int m_bHasOwnership;
     CPLMutex *m_hGlobalMutex;
     int m_bWrapLayersInMutexedLayer;
@@ -60,19 +44,17 @@ class CPL_DLL OGRMutexedDataSource : public OGRDataSource
 
   public:
     /* The construction of the object isn't protected by the mutex */
-    OGRMutexedDataSource(OGRDataSource *poBaseDataSource, int bTakeOwnership,
+    OGRMutexedDataSource(GDALDataset *poBaseDataSource, int bTakeOwnership,
                          CPLMutex *hMutexIn, int bWrapLayersInMutexedLayer);
 
     /* The destruction of the object isn't protected by the mutex */
     virtual ~OGRMutexedDataSource() override;
 
-    OGRDataSource *GetBaseDataSource()
+    GDALDataset *GetBaseDataSource()
     {
         return m_poBaseDataSource;
     }
 
-    virtual const char *GetName() override;
-
     virtual int GetLayerCount() override;
     virtual OGRLayer *GetLayer(int) override;
     virtual OGRLayer *GetLayerByName(const char *) override;
diff --git a/ogr/ogrsf_frmts/generic/ogrmutexedlayer.cpp b/ogr/ogrsf_frmts/generic/ogrmutexedlayer.cpp
index 81a96df50edd..b839dcdb4c21 100644
--- a/ogr/ogrsf_frmts/generic/ogrmutexedlayer.cpp
+++ b/ogr/ogrsf_frmts/generic/ogrmutexedlayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef DOXYGEN_SKIP
diff --git a/ogr/ogrsf_frmts/generic/ogrmutexedlayer.h b/ogr/ogrsf_frmts/generic/ogrmutexedlayer.h
index adbbba35f91d..84d692ba3128 100644
--- a/ogr/ogrsf_frmts/generic/ogrmutexedlayer.h
+++ b/ogr/ogrsf_frmts/generic/ogrmutexedlayer.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRMUTEXEDLAYER_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/generic/ogrregisterall.cpp b/ogr/ogrsf_frmts/generic/ogrregisterall.cpp
index 8b364b141964..5d69001f38e6 100644
--- a/ogr/ogrsf_frmts/generic/ogrregisterall.cpp
+++ b/ogr/ogrsf_frmts/generic/ogrregisterall.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999,  Les Technologies SoftMap Inc.
  * Copyright (c) 2007-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
@@ -180,6 +164,8 @@ void OGRRegisterAllInternal()
 #endif
 #ifdef WFS_ENABLED
     RegisterOGRWFS();
+#endif
+#ifdef OAPIF_ENABLED
     RegisterOGROAPIF();
 #endif
 #ifdef SOSI_ENABLED
@@ -266,6 +252,9 @@ void OGRRegisterAllInternal()
 #ifdef MIRAMON_ENABLED
     RegisterOGRMiraMon();
 #endif
+#ifdef XODR_ENABLED
+    RegisterOGRXODR();
+#endif
 
     // NOTE: you need to generally insert your own driver before that line.
 
diff --git a/ogr/ogrsf_frmts/generic/ogrsfdriver.cpp b/ogr/ogrsf_frmts/generic/ogrsfdriver.cpp
index 3315b5e58dbd..bf37786cf223 100644
--- a/ogr/ogrsf_frmts/generic/ogrsfdriver.cpp
+++ b/ogr/ogrsf_frmts/generic/ogrsfdriver.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999,  Les Technologies SoftMap Inc.
  * Copyright (c) 2009-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
@@ -173,7 +157,8 @@ int OGR_Dr_TestCapability(OGRSFDriverH hDriver, const char *pszCap)
     GDALDriver *poDriver = reinterpret_cast<GDALDriver *>(hDriver);
     if (EQUAL(pszCap, ODrCCreateDataSource))
     {
-        return poDriver->pfnCreate != nullptr ||
+        return poDriver->GetMetadataItem(GDAL_DCAP_CREATE) ||
+               poDriver->pfnCreate != nullptr ||
                poDriver->pfnCreateVectorOnly != nullptr;
     }
     else if (EQUAL(pszCap, ODrCDeleteDataSource))
diff --git a/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp b/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp
index 10b86e91da09..05207c81b418 100644
--- a/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp
+++ b/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999,  Les Technologies SoftMap Inc.
  * Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
diff --git a/ogr/ogrsf_frmts/generic/ogrunionlayer.cpp b/ogr/ogrsf_frmts/generic/ogrunionlayer.cpp
index eed6543d2be4..31df93f66335 100644
--- a/ogr/ogrsf_frmts/generic/ogrunionlayer.cpp
+++ b/ogr/ogrsf_frmts/generic/ogrunionlayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2012-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef DOXYGEN_SKIP
@@ -78,19 +62,14 @@ OGRUnionLayerGeomFieldDefn::~OGRUnionLayerGeomFieldDefn()
 /*                          OGRUnionLayer()                             */
 /************************************************************************/
 
+// cppcheck-suppress uninitMemberVar
 OGRUnionLayer::OGRUnionLayer(const char *pszName, int nSrcLayersIn,
                              OGRLayer **papoSrcLayersIn,
                              int bTakeLayerOwnership)
     : osName(pszName), nSrcLayers(nSrcLayersIn), papoSrcLayers(papoSrcLayersIn),
-      bHasLayerOwnership(bTakeLayerOwnership), poFeatureDefn(nullptr),
-      nFields(0), papoFields(nullptr), nGeomFields(0), papoGeomFields(nullptr),
-      eFieldStrategy(FIELD_UNION_ALL_LAYERS), bPreserveSrcFID(FALSE),
-      nFeatureCount(-1), iCurLayer(-1), pszAttributeFilter(nullptr),
-      nNextFID(0), panMap(nullptr), bAttrFilterPassThroughValue(-1),
+      bHasLayerOwnership(bTakeLayerOwnership),
       pabModifiedLayers(static_cast<int *>(CPLCalloc(sizeof(int), nSrcLayers))),
-      pabCheckIfAutoWrap(
-          static_cast<int *>(CPLCalloc(sizeof(int), nSrcLayers))),
-      poGlobalSRS(nullptr)
+      pabCheckIfAutoWrap(static_cast<int *>(CPLCalloc(sizeof(int), nSrcLayers)))
 {
     CPLAssert(nSrcLayersIn > 0);
 
@@ -200,7 +179,7 @@ void OGRUnionLayer::SetFeatureCount(int nFeatureCountIn)
 /************************************************************************/
 
 static void MergeFieldDefn(OGRFieldDefn *poFieldDefn,
-                           OGRFieldDefn *poSrcFieldDefn)
+                           const OGRFieldDefn *poSrcFieldDefn)
 {
     if (poFieldDefn->GetType() != poSrcFieldDefn->GetType())
     {
@@ -306,14 +285,17 @@ OGRFeatureDefn *OGRUnionLayer::GetLayerDefn()
     }
     else if (eFieldStrategy == FIELD_FROM_FIRST_LAYER)
     {
-        OGRFeatureDefn *poSrcFeatureDefn = papoSrcLayers[0]->GetLayerDefn();
-        for (int i = 0; i < poSrcFeatureDefn->GetFieldCount(); i++)
+        const OGRFeatureDefn *poSrcFeatureDefn =
+            papoSrcLayers[0]->GetLayerDefn();
+        const int nSrcFieldCount = poSrcFeatureDefn->GetFieldCount();
+        for (int i = 0; i < nSrcFieldCount; i++)
             poFeatureDefn->AddFieldDefn(poSrcFeatureDefn->GetFieldDefn(i));
         for (int i = 0;
              nGeomFields != -1 && i < poSrcFeatureDefn->GetGeomFieldCount();
              i++)
         {
-            OGRGeomFieldDefn *poFldDefn = poSrcFeatureDefn->GetGeomFieldDefn(i);
+            const OGRGeomFieldDefn *poFldDefn =
+                poSrcFeatureDefn->GetGeomFieldDefn(i);
             poFeatureDefn->AddGeomFieldDefn(
                 std::make_unique<OGRUnionLayerGeomFieldDefn>(poFldDefn));
         }
@@ -327,20 +309,31 @@ OGRFeatureDefn *OGRUnionLayer::GetLayerDefn()
                     papoGeomFields[0]));
         }
 
+        int nDstFieldCount = 0;
+        std::map<std::string, int> oMapDstFieldNameToIdx;
+
         for (int iLayer = 0; iLayer < nSrcLayers; iLayer++)
         {
-            OGRFeatureDefn *poSrcFeatureDefn =
+            const OGRFeatureDefn *poSrcFeatureDefn =
                 papoSrcLayers[iLayer]->GetLayerDefn();
 
             /* Add any field that is found in the source layers */
-            for (int i = 0; i < poSrcFeatureDefn->GetFieldCount(); i++)
+            const int nSrcFieldCount = poSrcFeatureDefn->GetFieldCount();
+            for (int i = 0; i < nSrcFieldCount; i++)
             {
-                OGRFieldDefn *poSrcFieldDefn =
+                const OGRFieldDefn *poSrcFieldDefn =
                     poSrcFeatureDefn->GetFieldDefn(i);
-                int nIndex =
-                    poFeatureDefn->GetFieldIndex(poSrcFieldDefn->GetNameRef());
+                const auto oIter =
+                    oMapDstFieldNameToIdx.find(poSrcFieldDefn->GetNameRef());
+                const int nIndex =
+                    oIter == oMapDstFieldNameToIdx.end() ? -1 : oIter->second;
                 if (nIndex < 0)
+                {
+                    oMapDstFieldNameToIdx[poSrcFieldDefn->GetNameRef()] =
+                        nDstFieldCount;
+                    nDstFieldCount++;
                     poFeatureDefn->AddFieldDefn(poSrcFieldDefn);
+                }
                 else
                 {
                     OGRFieldDefn *poFieldDefn =
@@ -353,7 +346,7 @@ OGRFeatureDefn *OGRUnionLayer::GetLayerDefn()
                  nGeomFields != -1 && i < poSrcFeatureDefn->GetGeomFieldCount();
                  i++)
             {
-                OGRGeomFieldDefn *poSrcFieldDefn =
+                const OGRGeomFieldDefn *poSrcFieldDefn =
                     poSrcFeatureDefn->GetGeomFieldDefn(i);
                 int nIndex = poFeatureDefn->GetGeomFieldIndex(
                     poSrcFieldDefn->GetNameRef());
@@ -513,17 +506,29 @@ void OGRUnionLayer::ConfigureActiveLayer()
 
     /* Establish map */
     GetLayerDefn();
-    OGRFeatureDefn *poSrcFeatureDefn = papoSrcLayers[iCurLayer]->GetLayerDefn();
+    const OGRFeatureDefn *poSrcFeatureDefn =
+        papoSrcLayers[iCurLayer]->GetLayerDefn();
+    const int nSrcFieldCount = poSrcFeatureDefn->GetFieldCount();
+    const int nDstFieldCount = poFeatureDefn->GetFieldCount();
+
+    std::map<std::string, int> oMapDstFieldNameToIdx;
+    for (int i = 0; i < nDstFieldCount; i++)
+    {
+        const OGRFieldDefn *poDstFieldDefn = poFeatureDefn->GetFieldDefn(i);
+        oMapDstFieldNameToIdx[poDstFieldDefn->GetNameRef()] = i;
+    }
+
     CPLFree(panMap);
-    panMap = static_cast<int *>(
-        CPLMalloc(poSrcFeatureDefn->GetFieldCount() * sizeof(int)));
-    for (int i = 0; i < poSrcFeatureDefn->GetFieldCount(); i++)
+    panMap = static_cast<int *>(CPLMalloc(nSrcFieldCount * sizeof(int)));
+    for (int i = 0; i < nSrcFieldCount; i++)
     {
-        OGRFieldDefn *poSrcFieldDefn = poSrcFeatureDefn->GetFieldDefn(i);
+        const OGRFieldDefn *poSrcFieldDefn = poSrcFeatureDefn->GetFieldDefn(i);
         if (m_aosIgnoredFields.FindString(poSrcFieldDefn->GetNameRef()) == -1)
         {
+            const auto oIter =
+                oMapDstFieldNameToIdx.find(poSrcFieldDefn->GetNameRef());
             panMap[i] =
-                poFeatureDefn->GetFieldIndex(poSrcFieldDefn->GetNameRef());
+                oIter == oMapDstFieldNameToIdx.end() ? -1 : oIter->second;
         }
         else
         {
@@ -545,19 +550,28 @@ void OGRUnionLayer::ConfigureActiveLayer()
             }
         }
 
+        std::map<std::string, int> oMapSrcFieldNameToIdx;
+        for (int i = 0; i < nSrcFieldCount; i++)
+        {
+            const OGRFieldDefn *poSrcFieldDefn =
+                poSrcFeatureDefn->GetFieldDefn(i);
+            oMapSrcFieldNameToIdx[poSrcFieldDefn->GetNameRef()] = i;
+        }
+
         /* Attribute fields */
-        std::vector<bool> abSrcFieldsUsed(poSrcFeatureDefn->GetFieldCount());
-        for (int iField = 0; iField < poFeatureDefn->GetFieldCount(); iField++)
+        std::vector<bool> abSrcFieldsUsed(nSrcFieldCount);
+        for (int iField = 0; iField < nDstFieldCount; iField++)
         {
             const OGRFieldDefn *poFieldDefn =
                 poFeatureDefn->GetFieldDefn(iField);
+            const auto oIter =
+                oMapSrcFieldNameToIdx.find(poFieldDefn->GetNameRef());
             const int iSrcField =
-                poSrcFeatureDefn->GetFieldIndex(poFieldDefn->GetNameRef());
+                oIter == oMapSrcFieldNameToIdx.end() ? -1 : oIter->second;
             if (iSrcField >= 0)
                 abSrcFieldsUsed[iSrcField] = true;
         }
-        for (int iSrcField = 0; iSrcField < poSrcFeatureDefn->GetFieldCount();
-             iSrcField++)
+        for (int iSrcField = 0; iSrcField < nSrcFieldCount; iSrcField++)
         {
             if (!abSrcFieldsUsed[iSrcField])
             {
diff --git a/ogr/ogrsf_frmts/generic/ogrunionlayer.h b/ogr/ogrsf_frmts/generic/ogrunionlayer.h
index f6bbfe48ace1..dc5e0244bd71 100644
--- a/ogr/ogrsf_frmts/generic/ogrunionlayer.h
+++ b/ogr/ogrsf_frmts/generic/ogrunionlayer.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2012-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRUNIONLAYER_H_INCLUDED
@@ -69,32 +53,32 @@ class CPL_DLL OGRUnionLayer final : public OGRLayer
     CPL_DISALLOW_COPY_ASSIGN(OGRUnionLayer)
 
   protected:
-    CPLString osName;
-    int nSrcLayers;
-    OGRLayer **papoSrcLayers;
-    int bHasLayerOwnership;
-
-    OGRFeatureDefn *poFeatureDefn;
-    int nFields;
-    OGRFieldDefn **papoFields;
-    int nGeomFields;
-    OGRUnionLayerGeomFieldDefn **papoGeomFields;
-    FieldUnionStrategy eFieldStrategy;
+    CPLString osName{};
+    int nSrcLayers = 0;
+    OGRLayer **papoSrcLayers = nullptr;
+    int bHasLayerOwnership = false;
+
+    OGRFeatureDefn *poFeatureDefn = nullptr;
+    int nFields = 0;
+    OGRFieldDefn **papoFields = nullptr;
+    int nGeomFields = 0;
+    OGRUnionLayerGeomFieldDefn **papoGeomFields = nullptr;
+    FieldUnionStrategy eFieldStrategy = FIELD_UNION_ALL_LAYERS;
     CPLString osSourceLayerFieldName{};
 
-    int bPreserveSrcFID;
+    int bPreserveSrcFID = false;
 
-    GIntBig nFeatureCount;
+    GIntBig nFeatureCount = -1;
 
-    int iCurLayer;
-    char *pszAttributeFilter;
-    int nNextFID;
-    int *panMap;
+    int iCurLayer = -1;
+    char *pszAttributeFilter = nullptr;
+    int nNextFID = 0;
+    int *panMap = nullptr;
     CPLStringList m_aosIgnoredFields{};
-    int bAttrFilterPassThroughValue;
-    int *pabModifiedLayers;
-    int *pabCheckIfAutoWrap;
-    const OGRSpatialReference *poGlobalSRS;
+    int bAttrFilterPassThroughValue = -1;
+    int *pabModifiedLayers = nullptr;
+    int *pabCheckIfAutoWrap = nullptr;
+    const OGRSpatialReference *poGlobalSRS = nullptr;
 
     void AutoWarpLayerIfNecessary(int iSubLayer);
     OGRFeature *TranslateFromSrcLayer(OGRFeature *poSrcFeature);
diff --git a/ogr/ogrsf_frmts/generic/ogrwarpedlayer.cpp b/ogr/ogrsf_frmts/generic/ogrwarpedlayer.cpp
index 861dbc1360ac..deec7d406399 100644
--- a/ogr/ogrsf_frmts/generic/ogrwarpedlayer.cpp
+++ b/ogr/ogrsf_frmts/generic/ogrwarpedlayer.cpp
@@ -7,27 +7,13 @@
  ******************************************************************************
  * Copyright (c) 2012-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef DOXYGEN_SKIP
 
+#include <cmath>
+
 #include "ogrwarpedlayer.h"
 
 /************************************************************************/
@@ -112,8 +98,8 @@ void OGRWarpedLayer::SetSpatialFilter(int iGeomField, OGRGeometry *poGeom)
         {
             OGREnvelope sEnvelope;
             poGeom->getEnvelope(&sEnvelope);
-            if (CPLIsInf(sEnvelope.MinX) && CPLIsInf(sEnvelope.MinY) &&
-                CPLIsInf(sEnvelope.MaxX) && CPLIsInf(sEnvelope.MaxY))
+            if (std::isinf(sEnvelope.MinX) && std::isinf(sEnvelope.MinY) &&
+                std::isinf(sEnvelope.MaxX) && std::isinf(sEnvelope.MaxY))
             {
                 m_poDecoratedLayer->SetSpatialFilterRect(
                     m_iGeomFieldFilter, sEnvelope.MinX, sEnvelope.MinY,
@@ -153,17 +139,15 @@ void OGRWarpedLayer::SetSpatialFilterRect(int iGeomField, double dfMinX,
 /*                     SrcFeatureToWarpedFeature()                      */
 /************************************************************************/
 
-OGRFeature *OGRWarpedLayer::SrcFeatureToWarpedFeature(OGRFeature *poSrcFeature)
+std::unique_ptr<OGRFeature>
+OGRWarpedLayer::SrcFeatureToWarpedFeature(std::unique_ptr<OGRFeature> poFeature)
 {
-    OGRFeature *poFeature = new OGRFeature(GetLayerDefn());
-    poFeature->SetFrom(poSrcFeature);
-    poFeature->SetFID(poSrcFeature->GetFID());
+    // This is safe to do here as they have matching attribute and geometry
+    // fields
+    poFeature->SetFDefnUnsafe(GetLayerDefn());
 
     OGRGeometry *poGeom = poFeature->GetGeomFieldRef(m_iGeomField);
-    if (poGeom == nullptr)
-        return poFeature;
-
-    if (poGeom->transform(m_poCT) != OGRERR_NONE)
+    if (poGeom && poGeom->transform(m_poCT) != OGRERR_NONE)
     {
         delete poFeature->StealGeometry(m_iGeomField);
     }
@@ -175,30 +159,21 @@ OGRFeature *OGRWarpedLayer::SrcFeatureToWarpedFeature(OGRFeature *poSrcFeature)
 /*                     WarpedFeatureToSrcFeature()                      */
 /************************************************************************/
 
-OGRFeature *OGRWarpedLayer::WarpedFeatureToSrcFeature(OGRFeature *poFeature)
+std::unique_ptr<OGRFeature>
+OGRWarpedLayer::WarpedFeatureToSrcFeature(std::unique_ptr<OGRFeature> poFeature)
 {
-    OGRFeature *poSrcFeature =
-        new OGRFeature(m_poDecoratedLayer->GetLayerDefn());
-    poSrcFeature->SetFrom(poFeature);
-    poSrcFeature->SetFID(poFeature->GetFID());
+    // This is safe to do here as they have matching attribute and geometry
+    // fields
+    poFeature->SetFDefnUnsafe(m_poDecoratedLayer->GetLayerDefn());
 
-    OGRGeometry *poGeom = poSrcFeature->GetGeomFieldRef(m_iGeomField);
-    if (poGeom != nullptr)
+    OGRGeometry *poGeom = poFeature->GetGeomFieldRef(m_iGeomField);
+    if (poGeom &&
+        (!m_poReversedCT || poGeom->transform(m_poReversedCT) != OGRERR_NONE))
     {
-        if (m_poReversedCT == nullptr)
-        {
-            delete poSrcFeature;
-            return nullptr;
-        }
-
-        if (poGeom->transform(m_poReversedCT) != OGRERR_NONE)
-        {
-            delete poSrcFeature;
-            return nullptr;
-        }
+        return nullptr;
     }
 
-    return poSrcFeature;
+    return poFeature;
 }
 
 /************************************************************************/
@@ -209,21 +184,19 @@ OGRFeature *OGRWarpedLayer::GetNextFeature()
 {
     while (true)
     {
-        OGRFeature *poFeature = m_poDecoratedLayer->GetNextFeature();
-        if (poFeature == nullptr)
+        auto poFeature =
+            std::unique_ptr<OGRFeature>(m_poDecoratedLayer->GetNextFeature());
+        if (!poFeature)
             return nullptr;
 
-        OGRFeature *poFeatureNew = SrcFeatureToWarpedFeature(poFeature);
-        delete poFeature;
-
-        OGRGeometry *poGeom = poFeatureNew->GetGeomFieldRef(m_iGeomField);
+        auto poFeatureNew = SrcFeatureToWarpedFeature(std::move(poFeature));
+        const OGRGeometry *poGeom = poFeatureNew->GetGeomFieldRef(m_iGeomField);
         if (m_poFilterGeom != nullptr && !FilterGeometry(poGeom))
         {
-            delete poFeatureNew;
             continue;
         }
 
-        return poFeatureNew;
+        return poFeatureNew.release();
     }
 }
 
@@ -233,14 +206,13 @@ OGRFeature *OGRWarpedLayer::GetNextFeature()
 
 OGRFeature *OGRWarpedLayer::GetFeature(GIntBig nFID)
 {
-    OGRFeature *poFeature = m_poDecoratedLayer->GetFeature(nFID);
-    if (poFeature != nullptr)
+    auto poFeature =
+        std::unique_ptr<OGRFeature>(m_poDecoratedLayer->GetFeature(nFID));
+    if (poFeature)
     {
-        OGRFeature *poFeatureNew = SrcFeatureToWarpedFeature(poFeature);
-        delete poFeature;
-        poFeature = poFeatureNew;
+        poFeature = SrcFeatureToWarpedFeature(std::move(poFeature));
     }
-    return poFeature;
+    return poFeature.release();
 }
 
 /************************************************************************/
@@ -249,17 +221,12 @@ OGRFeature *OGRWarpedLayer::GetFeature(GIntBig nFID)
 
 OGRErr OGRWarpedLayer::ISetFeature(OGRFeature *poFeature)
 {
-    OGRErr eErr;
-
-    OGRFeature *poFeatureNew = WarpedFeatureToSrcFeature(poFeature);
-    if (poFeatureNew == nullptr)
+    auto poFeatureNew = WarpedFeatureToSrcFeature(
+        std::unique_ptr<OGRFeature>(poFeature->Clone()));
+    if (!poFeatureNew)
         return OGRERR_FAILURE;
 
-    eErr = m_poDecoratedLayer->SetFeature(poFeatureNew);
-
-    delete poFeatureNew;
-
-    return eErr;
+    return m_poDecoratedLayer->SetFeature(poFeatureNew.get());
 }
 
 /************************************************************************/
@@ -268,17 +235,12 @@ OGRErr OGRWarpedLayer::ISetFeature(OGRFeature *poFeature)
 
 OGRErr OGRWarpedLayer::ICreateFeature(OGRFeature *poFeature)
 {
-    OGRErr eErr;
-
-    OGRFeature *poFeatureNew = WarpedFeatureToSrcFeature(poFeature);
-    if (poFeatureNew == nullptr)
+    auto poFeatureNew = WarpedFeatureToSrcFeature(
+        std::unique_ptr<OGRFeature>(poFeature->Clone()));
+    if (!poFeatureNew)
         return OGRERR_FAILURE;
 
-    eErr = m_poDecoratedLayer->CreateFeature(poFeatureNew);
-
-    delete poFeatureNew;
-
-    return eErr;
+    return m_poDecoratedLayer->CreateFeature(poFeatureNew.get());
 }
 
 /************************************************************************/
@@ -287,17 +249,12 @@ OGRErr OGRWarpedLayer::ICreateFeature(OGRFeature *poFeature)
 
 OGRErr OGRWarpedLayer::IUpsertFeature(OGRFeature *poFeature)
 {
-    OGRErr eErr;
-
-    OGRFeature *poFeatureNew = WarpedFeatureToSrcFeature(poFeature);
+    auto poFeatureNew = WarpedFeatureToSrcFeature(
+        std::unique_ptr<OGRFeature>(poFeature->Clone()));
     if (poFeatureNew == nullptr)
         return OGRERR_FAILURE;
 
-    eErr = m_poDecoratedLayer->UpsertFeature(poFeatureNew);
-
-    delete poFeatureNew;
-
-    return eErr;
+    return m_poDecoratedLayer->UpsertFeature(poFeatureNew.get());
 }
 
 /************************************************************************/
@@ -311,19 +268,14 @@ OGRErr OGRWarpedLayer::IUpdateFeature(OGRFeature *poFeature,
                                       const int *panUpdatedGeomFieldsIdx,
                                       bool bUpdateStyleString)
 {
-    OGRErr eErr;
-
-    OGRFeature *poFeatureNew = WarpedFeatureToSrcFeature(poFeature);
-    if (poFeatureNew == nullptr)
+    auto poFeatureNew = WarpedFeatureToSrcFeature(
+        std::unique_ptr<OGRFeature>(poFeature->Clone()));
+    if (!poFeatureNew)
         return OGRERR_FAILURE;
 
-    eErr = m_poDecoratedLayer->UpdateFeature(
-        poFeatureNew, nUpdatedFieldsCount, panUpdatedFieldsIdx,
+    return m_poDecoratedLayer->UpdateFeature(
+        poFeatureNew.get(), nUpdatedFieldsCount, panUpdatedFieldsIdx,
         nUpdatedGeomFieldsCount, panUpdatedGeomFieldsIdx, bUpdateStyleString);
-
-    delete poFeatureNew;
-
-    return eErr;
 }
 
 /************************************************************************/
diff --git a/ogr/ogrsf_frmts/generic/ogrwarpedlayer.h b/ogr/ogrsf_frmts/generic/ogrwarpedlayer.h
index f7f47454d40a..97cc6c037e0e 100644
--- a/ogr/ogrsf_frmts/generic/ogrwarpedlayer.h
+++ b/ogr/ogrsf_frmts/generic/ogrwarpedlayer.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2012-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRWARPEDLAYER_H_INCLUDED
@@ -33,12 +17,13 @@
 #ifndef DOXYGEN_SKIP
 
 #include "ogrlayerdecorator.h"
+#include <memory>
 
 /************************************************************************/
 /*                           OGRWarpedLayer                             */
 /************************************************************************/
 
-class OGRWarpedLayer : public OGRLayerDecorator
+class CPL_DLL OGRWarpedLayer : public OGRLayerDecorator
 {
     CPL_DISALLOW_COPY_ASSIGN(OGRWarpedLayer)
 
@@ -55,8 +40,10 @@ class OGRWarpedLayer : public OGRLayerDecorator
     static int ReprojectEnvelope(OGREnvelope *psEnvelope,
                                  OGRCoordinateTransformation *poCT);
 
-    OGRFeature *SrcFeatureToWarpedFeature(OGRFeature *poFeature);
-    OGRFeature *WarpedFeatureToSrcFeature(OGRFeature *poFeature);
+    std::unique_ptr<OGRFeature>
+    SrcFeatureToWarpedFeature(std::unique_ptr<OGRFeature> poFeature);
+    std::unique_ptr<OGRFeature>
+    WarpedFeatureToSrcFeature(std::unique_ptr<OGRFeature> poFeature);
 
   public:
     OGRWarpedLayer(
diff --git a/ogr/ogrsf_frmts/geoconcept/CMakeLists.txt b/ogr/ogrsf_frmts/geoconcept/CMakeLists.txt
index 187070ac5782..c0d014b04624 100644
--- a/ogr/ogrsf_frmts/geoconcept/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/geoconcept/CMakeLists.txt
@@ -6,7 +6,6 @@ add_gdal_driver(
           ogrgeoconceptlayer.cpp
           geoconcept_syscoord.h
           ogrgeoconceptdatasource.h
-          ogrgeoconceptdriver.h
           ogrgeoconceptlayer.h
           geoconcept.c
           geoconcept_syscoord.c
diff --git a/ogr/ogrsf_frmts/geoconcept/geoconcept.c b/ogr/ogrsf_frmts/geoconcept/geoconcept.c
index 5d58e1a47d61..b68d265d4908 100644
--- a/ogr/ogrsf_frmts/geoconcept/geoconcept.c
+++ b/ogr/ogrsf_frmts/geoconcept/geoconcept.c
@@ -10,23 +10,7 @@
  * Copyright (c) 2007,  Geoconcept and IGN
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/geoconcept/geoconcept.h b/ogr/ogrsf_frmts/geoconcept/geoconcept.h
index cca029ac69eb..42093b58d6aa 100644
--- a/ogr/ogrsf_frmts/geoconcept/geoconcept.h
+++ b/ogr/ogrsf_frmts/geoconcept/geoconcept.h
@@ -10,23 +10,7 @@
  * Copyright (c) 2007,  Geoconcept and IGN
  * Copyright (c) 2008, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 #ifndef GEOCONCEPT_H_INCLUDED
 #define GEOCONCEPT_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/geoconcept/geoconcept_syscoord.c b/ogr/ogrsf_frmts/geoconcept/geoconcept_syscoord.c
index 0f31da3854c4..0cafe069e37e 100644
--- a/ogr/ogrsf_frmts/geoconcept/geoconcept_syscoord.c
+++ b/ogr/ogrsf_frmts/geoconcept/geoconcept_syscoord.c
@@ -11,23 +11,7 @@
  * Copyright (c) 2007,  Geoconcept and IGN
  * Copyright (c) 2008-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "geoconcept_syscoord.h"
diff --git a/ogr/ogrsf_frmts/geoconcept/geoconcept_syscoord.h b/ogr/ogrsf_frmts/geoconcept/geoconcept_syscoord.h
index 22bb86bed01e..30288d008333 100644
--- a/ogr/ogrsf_frmts/geoconcept/geoconcept_syscoord.h
+++ b/ogr/ogrsf_frmts/geoconcept/geoconcept_syscoord.h
@@ -11,23 +11,7 @@
  * Copyright (c) 2007,  Geoconcept and IGN
  * Copyright (c) 2008, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 #ifndef GEOCONCEPT_SYSCOORD_H_INCLUDED
 #define GEOCONCEPT_SYSCOORD_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdatasource.cpp b/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdatasource.cpp
index 46ba3dc40e08..1f5a1ff54806 100644
--- a/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdatasource.cpp
+++ b/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdatasource.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2007, Geoconcept and IGN
  * Copyright (c) 2008, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
@@ -38,7 +22,7 @@
 /************************************************************************/
 
 OGRGeoconceptDataSource::OGRGeoconceptDataSource()
-    : _papoLayers(nullptr), _nLayers(0), _pszGCT(nullptr), _pszName(nullptr),
+    : _papoLayers(nullptr), _nLayers(0), _pszGCT(nullptr),
       _pszDirectory(nullptr), _pszExt(nullptr), _papszOptions(nullptr),
       _bSingleNewFile(false), _bUpdate(false), _hGXT(nullptr)
 {
@@ -57,7 +41,6 @@ OGRGeoconceptDataSource::~OGRGeoconceptDataSource()
     }
     CPLFree(_papoLayers);
     CPLFree(_pszGCT);
-    CPLFree(_pszName);
     CPLFree(_pszDirectory);
     CPLFree(_pszExt);
     CSLDestroy(_papszOptions);
@@ -106,11 +89,12 @@ int OGRGeoconceptDataSource::Open(const char *pszName, bool bTestOpen,
         return FALSE;
     }
 
+    SetDescription(pszName);
+
     if (VSI_ISREG(sStat.st_mode))
     {
         _bSingleNewFile = false;
         _bUpdate = bUpdate;
-        _pszName = CPLStrdup(pszName);
         if (!LoadFile(_bUpdate ? "a+t" : "rt"))
         {
             CPLDebug("GEOCONCEPT",
@@ -136,15 +120,16 @@ int OGRGeoconceptDataSource::LoadFile(const char *pszMode)
 {
     if (_pszExt == nullptr)
     {
-        const char *pszExtension = CPLGetExtension(_pszName);
+        const char *pszExtension = CPLGetExtension(GetDescription());
         _pszExt = CPLStrdup(pszExtension);
     }
     CPLStrlwr(_pszExt);
 
     if (!_pszDirectory)
-        _pszDirectory = CPLStrdup(CPLGetPath(_pszName));
+        _pszDirectory = CPLStrdup(CPLGetPath(GetDescription()));
 
-    if ((_hGXT = Open_GCIO(_pszName, _pszExt, pszMode, _pszGCT)) == nullptr)
+    if ((_hGXT = Open_GCIO(GetDescription(), _pszExt, pszMode, _pszGCT)) ==
+        nullptr)
     {
         return FALSE;
     }
@@ -215,7 +200,6 @@ int OGRGeoconceptDataSource::LoadFile(const char *pszMode)
 int OGRGeoconceptDataSource::Create(const char *pszName, char **papszOptions)
 
 {
-    CPLFree(_pszName);
     _papszOptions = CSLDuplicate(papszOptions);
 
     const char *pszConf = CSLFetchNameValue(papszOptions, "CONFIG");
@@ -259,14 +243,13 @@ int OGRGeoconceptDataSource::Create(const char *pszName, char **papszOptions)
             pszbName = CPLStrdup(CPLGetBasename(pszNameDup));
             CPLFree(pszNameDup);
         }
-        _pszName = CPLStrdup(
-            (char *)CPLFormFilename(_pszDirectory, pszbName, nullptr));
+        SetDescription(CPLFormFilename(_pszDirectory, pszbName, nullptr));
         CPLFree(pszbName);
     }
     else
     {
         _pszDirectory = CPLStrdup(CPLGetPath(pszName));
-        _pszName = CPLStrdup(pszName);
+        SetDescription(pszName);
     }
 
     /* -------------------------------------------------------------------- */
diff --git a/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdatasource.h b/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdatasource.h
index bba8dc651888..f166626ffffd 100644
--- a/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdatasource.h
+++ b/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdatasource.h
@@ -9,23 +9,7 @@
  **********************************************************************
  * Copyright (c) 2007,  Geoconcept and IGN
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "ogrsf_frmts.h"
@@ -37,14 +21,13 @@
 /**********************************************************************/
 /*            OGCGeoconceptDataSource Class                           */
 /**********************************************************************/
-class OGRGeoconceptDataSource : public OGRDataSource
+class OGRGeoconceptDataSource : public GDALDataset
 {
   private:
     OGRGeoconceptLayer **_papoLayers;
     int _nLayers;
 
     char *_pszGCT;
-    char *_pszName;
     char *_pszDirectory;
     char *_pszExt;
     char **_papszOptions;
@@ -59,11 +42,6 @@ class OGRGeoconceptDataSource : public OGRDataSource
     int Open(const char *pszName, bool bTestOpen, bool bUpdate);
     int Create(const char *pszName, char **papszOptions);
 
-    const char *GetName() override
-    {
-        return _pszName;
-    }
-
     int GetLayerCount() override
     {
         return _nLayers;
diff --git a/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdriver.cpp b/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdriver.cpp
index 4b376e3af332..7153cf580a30 100644
--- a/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdriver.cpp
+++ b/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdriver.cpp
@@ -8,55 +8,21 @@
  ******************************************************************************
  * Copyright (c) 2007,  Geoconcept and IGN
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
 #include "cpl_string.h"
 #include "ogrgeoconceptdatasource.h"
-#include "ogrgeoconceptdriver.h"
-
-/************************************************************************/
-/*                          ~OGRGeoconceptDriver()                      */
-/************************************************************************/
-
-OGRGeoconceptDriver::~OGRGeoconceptDriver()
-{
-}
-
-/************************************************************************/
-/*                              GetName()                               */
-/************************************************************************/
-
-const char *OGRGeoconceptDriver::GetName()
-
-{
-    return "Geoconcept";
-}
 
 /************************************************************************/
 /*                                Open()                                */
 /************************************************************************/
 
-OGRDataSource *OGRGeoconceptDriver::Open(const char *pszFilename, int bUpdate)
+static GDALDataset *OGRGeoconceptDriverOpen(GDALOpenInfo *poOpenInfo)
 
 {
+    const char *pszFilename = poOpenInfo->pszFilename;
 #ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
     /* -------------------------------------------------------------------- */
     /*      We will only consider .gxt and .txt files.                      */
@@ -68,9 +34,9 @@ OGRDataSource *OGRGeoconceptDriver::Open(const char *pszFilename, int bUpdate)
     }
 #endif
 
-    OGRGeoconceptDataSource *poDS = new OGRGeoconceptDataSource();
+    auto poDS = new OGRGeoconceptDataSource();
 
-    if (!poDS->Open(pszFilename, true, CPL_TO_BOOL(bUpdate)))
+    if (!poDS->Open(pszFilename, true, poOpenInfo->eAccess == GA_Update))
     {
         delete poDS;
         return nullptr;
@@ -85,8 +51,11 @@ OGRDataSource *OGRGeoconceptDriver::Open(const char *pszFilename, int bUpdate)
 /*   EXTENSION=GXT|TXT (default GXT)                                    */
 /************************************************************************/
 
-OGRDataSource *OGRGeoconceptDriver::CreateDataSource(const char *pszName,
-                                                     char **papszOptions)
+static GDALDataset *OGRGeoconceptDriverCreate(const char *pszName,
+                                              int /* nXSize */,
+                                              int /* nYSize */,
+                                              int /* nBandCount */,
+                                              GDALDataType, char **papszOptions)
 
 {
     VSIStatBufL sStat;
@@ -135,10 +104,10 @@ OGRDataSource *OGRGeoconceptDriver::CreateDataSource(const char *pszName,
 }
 
 /************************************************************************/
-/*                          DeleteDataSource()                          */
+/*                      OGRGeoconceptDriverDelete()                     */
 /************************************************************************/
 
-OGRErr OGRGeoconceptDriver::DeleteDataSource(const char *pszDataSource)
+static CPLErr OGRGeoconceptDriverDelete(const char *pszDataSource)
 
 {
     VSIStatBufL sStatBuf;
@@ -151,7 +120,7 @@ OGRErr OGRGeoconceptDriver::DeleteDataSource(const char *pszDataSource)
                  "%s does not appear to be a file or directory.",
                  pszDataSource);
 
-        return OGRERR_FAILURE;
+        return CE_Failure;
     }
 
     if (VSI_ISREG(sStatBuf.st_mode) &&
@@ -187,23 +156,7 @@ OGRErr OGRGeoconceptDriver::DeleteDataSource(const char *pszDataSource)
         VSIRmdir(pszDataSource);
     }
 
-    return OGRERR_NONE;
-}
-
-/************************************************************************/
-/*                           TestCapability()                           */
-/************************************************************************/
-
-int OGRGeoconceptDriver::TestCapability(const char *pszCap)
-
-{
-    if (EQUAL(pszCap, ODrCCreateDataSource))
-        return TRUE;
-
-    if (EQUAL(pszCap, ODrCDeleteDataSource))
-        return TRUE;
-
-    return FALSE;
+    return CE_None;
 }
 
 /************************************************************************/
@@ -213,7 +166,12 @@ int OGRGeoconceptDriver::TestCapability(const char *pszCap)
 void RegisterOGRGeoconcept()
 
 {
-    OGRSFDriver *poDriver = new OGRGeoconceptDriver;
+    if (GDALGetDriverByName("Geoconcept"))
+        return;
+
+    GDALDriver *poDriver = new GDALDriver();
+    poDriver->SetDescription("Geoconcept");
+    poDriver->SetMetadataItem(GDAL_DMD_LONGNAME, "Geoconcept");
     poDriver->SetMetadataItem(GDAL_DCAP_VECTOR, "YES");
     poDriver->SetMetadataItem(GDAL_DCAP_CREATE_LAYER, "YES");
     poDriver->SetMetadataItem(GDAL_DCAP_CREATE_FIELD, "YES");
@@ -250,5 +208,9 @@ void RegisterOGRGeoconcept()
     poDriver->SetMetadataItem(GDAL_DCAP_VIRTUALIO, "YES");
     poDriver->SetMetadataItem(GDAL_DMD_SUPPORTED_SQL_DIALECTS, "OGRSQL SQLITE");
 
-    OGRSFDriverRegistrar::GetRegistrar()->RegisterDriver(poDriver);
+    poDriver->pfnOpen = OGRGeoconceptDriverOpen;
+    poDriver->pfnCreate = OGRGeoconceptDriverCreate;
+    poDriver->pfnDelete = OGRGeoconceptDriverDelete;
+
+    GetGDALDriverManager()->RegisterDriver(poDriver);
 }
diff --git a/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdriver.h b/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdriver.h
deleted file mode 100644
index 16a1d3fc94fd..000000000000
--- a/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdriver.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/**********************************************************************
- * $Id: ogrgeoconceptdriver.h$
- *
- * Name:     ogrgeoconceptdriver.h
- * Project:  OpenGIS Simple Features Reference Implementation
- * Purpose:  Implements OGRGeoconceptDriver class.
- * Language: C++
- *
- **********************************************************************
- * Copyright (c) 2007,  Geoconcept and IGN
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- **********************************************************************/
-
-#include "ogrsf_frmts.h"
-
-#ifndef GEOCONCEPT_OGR_DRIVER_H_INCLUDED_
-#define GEOCONCEPT_OGR_DRIVER_H_INCLUDED_
-
-/************************************************************************/
-/*                             OGRGeoconceptDriver                      */
-/************************************************************************/
-
-class OGRGeoconceptDriver : public OGRSFDriver
-{
-  public:
-    ~OGRGeoconceptDriver();
-
-    const char *GetName() override;
-    OGRDataSource *Open(const char *pszName, int bUpdate = FALSE) override;
-    int TestCapability(const char *pszCap) override;
-    OGRDataSource *CreateDataSource(const char *pszName,
-                                    char **papszOptions = nullptr) override;
-    OGRErr DeleteDataSource(const char *pszName) override;
-};
-
-#endif /* GEOCONCEPT_OGR_DRIVER_H_INCLUDED_ */
diff --git a/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptlayer.cpp b/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptlayer.cpp
index 18c516efb826..5450c4de07a1 100644
--- a/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptlayer.cpp
+++ b/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptlayer.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2007,  Geoconcept and IGN
  * Copyright (c) 2008, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptlayer.h b/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptlayer.h
index 05a86c8ba702..0d53a1c84c0a 100644
--- a/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptlayer.h
+++ b/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptlayer.h
@@ -9,23 +9,7 @@
  **********************************************************************
  * Copyright (c) 2007,  Geoconcept and IGN
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "ogrsf_frmts.h"
diff --git a/ogr/ogrsf_frmts/geojson/CMakeLists.txt b/ogr/ogrsf_frmts/geojson/CMakeLists.txt
index 90760d556600..6d0a3d7628a5 100644
--- a/ogr/ogrsf_frmts/geojson/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/geojson/CMakeLists.txt
@@ -1,12 +1,10 @@
-# should not be a plugin - dependency from elastic
 add_gdal_driver(
-  TARGET ogr_geojson
+  TARGET ogr_GeoJSON
   SOURCES ogrgeojsondatasource.cpp
           ogrgeojsonlayer.cpp
           ogrgeojsonreader.cpp
           ogrgeojsonutils.cpp
           ogrgeojsonwritelayer.cpp
-          ogrgeojsonwriter.cpp
           ogrgeojsondriver.cpp
           ogrgeojsonseqdriver.cpp
           ogresrijsonreader.cpp
@@ -14,11 +12,15 @@ add_gdal_driver(
           ogrtopojsonreader.cpp
           ogrtopojsondriver.cpp
           ogrjsoncollectionstreamingparser.cpp
-  BUILTIN)
-gdal_standard_includes(ogr_geojson)
-target_include_directories(ogr_geojson PRIVATE $<TARGET_PROPERTY:appslib,SOURCE_DIR>)
+  PLUGIN_CAPABLE_IF "NOT GDAL_USE_JSONC_INTERNAL"
+  NO_DEPS)
+gdal_standard_includes(ogr_GeoJSON)
+target_include_directories(ogr_GeoJSON PRIVATE $<TARGET_PROPERTY:appslib,SOURCE_DIR>)
 if (GDAL_USE_JSONC_INTERNAL)
-  gdal_add_vendored_lib(ogr_geojson libjson)
+  gdal_add_vendored_lib(ogr_GeoJSON libjson)
 else ()
-  gdal_target_link_libraries(ogr_geojson PRIVATE ${JSONC_TARGET})
+  gdal_target_link_libraries(ogr_GeoJSON PRIVATE ${JSONC_TARGET})
 endif ()
+if (OGR_ENABLE_DRIVER_GEOJSON_PLUGIN)
+  target_compile_definitions(ogr_GeoJSON PRIVATE BUILT_AS_PLUGIN)
+endif()
diff --git a/ogr/ogrsf_frmts/geojson/directedacyclicgraph.hpp b/ogr/ogrsf_frmts/geojson/directedacyclicgraph.hpp
index eff9c15d6adf..9bd18f552478 100644
--- a/ogr/ogrsf_frmts/geojson/directedacyclicgraph.hpp
+++ b/ogr/ogrsf_frmts/geojson/directedacyclicgraph.hpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2021, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef DIRECTEDACYCLICGRAPH_INCLUDED_H
@@ -134,11 +118,11 @@ const char *DirectedAcyclicGraph<T, V>::addEdge(const T &i, const T &j)
         return "already inserted edge";
     }
 
-    if (nodes.find(i) == nodes.end())
+    if (!cpl::contains(nodes, i))
     {
         return "node i unknown";
     }
-    if (nodes.find(j) == nodes.end())
+    if (!cpl::contains(nodes, j))
     {
         return "node j unknown";
     }
@@ -195,7 +179,7 @@ bool DirectedAcyclicGraph<T, V>::isTherePathFromTo(const T &i, const T &j) const
         {
             for (const T &k : iter->second)
             {
-                if (plannedForVisit.find(k) == plannedForVisit.end())
+                if (!cpl::contains(plannedForVisit, k))
                 {
                     plannedForVisit.insert(k);
                     toVisit.push(k);
@@ -212,7 +196,7 @@ std::vector<T> DirectedAcyclicGraph<T, V>::findStartingNodes() const
     std::vector<T> ret;
     for (const auto &i : nodes)
     {
-        if (incomingNodes.find(i) == incomingNodes.end())
+        if (!cpl::contains(incomingNodes, i))
             ret.emplace_back(i);
     }
     return ret;
@@ -253,7 +237,7 @@ std::vector<T> DirectedAcyclicGraph<T, V>::getTopologicalOrdering()
                 const char *retRemoveEdge = removeEdge(n, m);
                 (void)retRemoveEdge;
                 assert(retRemoveEdge == nullptr);
-                if (incomingNodes.find(m) == incomingNodes.end())
+                if (!cpl::contains(incomingNodes, m))
                 {
                     S.insert(m);
                 }
diff --git a/ogr/ogrsf_frmts/geojson/libjson/CMakeLists.txt b/ogr/ogrsf_frmts/geojson/libjson/CMakeLists.txt
index 8cff23f5b51b..fbbe19539d78 100644
--- a/ogr/ogrsf_frmts/geojson/libjson/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/geojson/libjson/CMakeLists.txt
@@ -26,6 +26,14 @@ add_library(
   printbuf.c
   random_seed.c
   strerror_override.c)
+
+if ((MSVC AND NOT (MSVC_VERSION LESS 1800)) OR MINGW OR CYGWIN OR UNIX)
+    check_symbol_exists(INFINITY    "math.h" HAVE_DECL_INFINITY)
+    check_symbol_exists(isinf       "math.h" HAVE_DECL_ISINF)
+    check_symbol_exists(isnan       "math.h" HAVE_DECL_ISNAN)
+    check_symbol_exists(NAN         "math.h" HAVE_DECL_NAN)
+endif()
+
 # -D_XOPEN_SOURCE=700 to enable strdup() definition in C11 mode
 target_compile_definitions(libjson PRIVATE -D_XOPEN_SOURCE=700)
 target_include_directories(libjson PRIVATE $<TARGET_PROPERTY:cpl,SOURCE_DIR> $<TARGET_PROPERTY:cpl,BINARY_DIR>)
@@ -37,4 +45,17 @@ if (MSVC)
 endif ()
 target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:libjson>)
 
+if(HAVE_DECL_INFINITY)
+    target_compile_definitions(libjson PRIVATE HAVE_DECL_INFINITY)
+endif()
+if(HAVE_DECL_ISINF)
+    target_compile_definitions(libjson PRIVATE HAVE_DECL_ISINF)
+endif()
+if(HAVE_DECL_ISNAN)
+    target_compile_definitions(libjson PRIVATE HAVE_DECL_ISNAN)
+endif()
+if(HAVE_DECL_NAN)
+    target_compile_definitions(libjson PRIVATE HAVE_DECL_NAN)
+endif()
+
 set_property(TARGET libjson PROPERTY UNITY_BUILD OFF)
diff --git a/ogr/ogrsf_frmts/geojson/libjson/config.h b/ogr/ogrsf_frmts/geojson/libjson/config.h
index 4b94043dd722..81cb191e03c0 100644
--- a/ogr/ogrsf_frmts/geojson/libjson/config.h
+++ b/ogr/ogrsf_frmts/geojson/libjson/config.h
@@ -122,11 +122,6 @@
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
-#define HAVE_DECL_ISNAN
-#define HAVE_DECL_ISINF
-#define HAVE_DECL_INFINITY
-#define HAVE_DECL_NAN
-
 #include "cpl_config.h"
 
 #ifndef SIZE_T_MAX
diff --git a/ogr/ogrsf_frmts/geojson/libjson/json_object.c b/ogr/ogrsf_frmts/geojson/libjson/json_object.c
index 7a23c378cce3..4328538b0afd 100644
--- a/ogr/ogrsf_frmts/geojson/libjson/json_object.c
+++ b/ogr/ogrsf_frmts/geojson/libjson/json_object.c
@@ -1022,11 +1022,11 @@ static int json_object_double_to_json_string_format(struct json_object *jso, str
 	 * ECMA 262 section 9.8.1 defines
 	 * how to handle these cases as strings
 	 */
-	if (CPLIsNan(jsodbl->c_double))
+	if (isnan(jsodbl->c_double))
 	{
 		size = snprintf(buf, sizeof(buf), "NaN");
 	}
-	else if (CPLIsInf(jsodbl->c_double))
+	else if (isinf(jsodbl->c_double))
 	{
 		if (jsodbl->c_double > 0)
 			size = snprintf(buf, sizeof(buf), "Infinity");
diff --git a/ogr/ogrsf_frmts/geojson/libjson/json_util.c b/ogr/ogrsf_frmts/geojson/libjson/json_util.c
index 0fcb0d4298d3..505834d83ce6 100644
--- a/ogr/ogrsf_frmts/geojson/libjson/json_util.c
+++ b/ogr/ogrsf_frmts/geojson/libjson/json_util.c
@@ -188,7 +188,7 @@ int json_object_to_fd(int fd, struct json_object *obj, int flags)
 }
 static int _json_object_to_fd(int fd, struct json_object *obj, int flags, const char *filename)
 {
-	int ret;
+	ssize_t ret;
 	const char *json_str;
 	unsigned int wpos, wsize;
 
@@ -204,7 +204,7 @@ static int _json_object_to_fd(int fd, struct json_object *obj, int flags, const
 	wpos = 0;
 	while (wpos < wsize)
 	{
-		if ((ret = (int)write(fd, json_str + wpos, wsize - wpos)) < 0)
+		if ((ret = write(fd, json_str + wpos, wsize - wpos)) < 0)
 		{
 			_json_c_set_last_err("json_object_to_file: error writing file %s: %s\n",
 			                     filename, strerror(errno));
diff --git a/ogr/ogrsf_frmts/geojson/libjson/math_compat.h b/ogr/ogrsf_frmts/geojson/libjson/math_compat.h
index 2382fe15b30a..5d3b21ce79cb 100644
--- a/ogr/ogrsf_frmts/geojson/libjson/math_compat.h
+++ b/ogr/ogrsf_frmts/geojson/libjson/math_compat.h
@@ -18,6 +18,11 @@
 #endif
 #endif
 
+#ifdef __MINGW32__
+#undef isnan
+#define isnan(x) __builtin_isnan(x)
+#endif
+
 #ifndef HAVE_DECL_ISINF
 #ifdef HAVE_DECL__FINITE
 #include <float.h>
@@ -29,6 +34,11 @@
 #endif
 #endif
 
+#ifdef __MINGW32__
+#undef isinf
+#define isinf(x) __builtin_isinf(x)
+#endif
+
 #ifndef HAVE_DECL_INFINITY
 #include <float.h>
 #define INFINITY (DBL_MAX + DBL_MAX)
@@ -36,7 +46,9 @@
 #endif
 
 #ifndef HAVE_DECL_NAN
+#ifndef NAN
 #define NAN (INFINITY - INFINITY)
+#endif
 #define HAVE_DECL_NAN
 #endif
 
diff --git a/ogr/ogrsf_frmts/geojson/ogr_geojson.h b/ogr/ogrsf_frmts/geojson/ogr_geojson.h
index d531086ddf52..e308ff6ae89c 100644
--- a/ogr/ogrsf_frmts/geojson/ogr_geojson.h
+++ b/ogr/ogrsf_frmts/geojson/ogr_geojson.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2007, Mateusz Loskot
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_GEOJSON_H_INCLUDED
@@ -40,6 +24,9 @@
 #include "ogrgeojsonutils.h"
 #include "ogrgeojsonwriter.h"
 
+constexpr const char *INVALID_CONTENT_FOR_JSON_LIKE =
+    "__INVALID_CONTENT_FOR_JSON_LIKE__";
+
 class OGRGeoJSONDataSource;
 
 GDALDataset *OGRGeoJSONDriverOpenInternal(GDALOpenInfo *poOpenInfo,
@@ -82,6 +69,11 @@ class OGRGeoJSONLayer final : public OGRMemLayer
 
     OGRErr ISetFeature(OGRFeature *poFeature) override;
     OGRErr ICreateFeature(OGRFeature *poFeature) override;
+    OGRErr IUpdateFeature(OGRFeature *poFeature, int nUpdatedFieldsCount,
+                          const int *panUpdatedFieldsIdx,
+                          int nUpdatedGeomFieldsCount,
+                          const int *panUpdatedGeomFieldsIdx,
+                          bool bUpdateStyleString) override;
     virtual OGRErr DeleteFeature(GIntBig nFID) override;
     virtual OGRErr CreateField(const OGRFieldDefn *poField,
                                int bApproxOK = TRUE) override;
@@ -140,6 +132,7 @@ class OGRGeoJSONLayer final : public OGRMemLayer
 
     bool IngestAll();
     void TerminateAppendSession();
+    bool SetOrUpdateFeaturePreparation();
 
     CPL_DISALLOW_COPY_ASSIGN(OGRGeoJSONLayer)
 };
@@ -227,18 +220,14 @@ class OGRGeoJSONWriteLayer final : public OGRLayer
 /*                           OGRGeoJSONDataSource                       */
 /************************************************************************/
 
-class OGRGeoJSONDataSource final : public OGRDataSource
+class OGRGeoJSONDataSource final : public GDALDataset
 {
   public:
     OGRGeoJSONDataSource();
     virtual ~OGRGeoJSONDataSource();
 
-    //
-    // OGRDataSource Interface
-    //
     int Open(GDALOpenInfo *poOpenInfo, GeoJSONSourceType nSrcType,
              const char *pszJSonFlavor);
-    const char *GetName() override;
     int GetLayerCount() override;
     OGRLayer *GetLayer(int nLayer) override;
     OGRLayer *ICreateLayer(const char *pszName,
diff --git a/ogr/ogrsf_frmts/geojson/ogresrijsondriver.cpp b/ogr/ogrsf_frmts/geojson/ogresrijsondriver.cpp
index ce6d18211551..3941b036a8b1 100644
--- a/ogr/ogrsf_frmts/geojson/ogresrijsondriver.cpp
+++ b/ogr/ogrsf_frmts/geojson/ogresrijsondriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2017, Even Rouault, <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -48,10 +32,14 @@ static int OGRESRIJSONDriverIdentify(GDALOpenInfo *poOpenInfo)
     GeoJSONSourceType nSrcType = ESRIJSONDriverGetSourceType(poOpenInfo);
     if (nSrcType == eGeoJSONSourceUnknown)
         return FALSE;
-    if (nSrcType == eGeoJSONSourceService &&
-        !STARTS_WITH_CI(poOpenInfo->pszFilename, "ESRIJSON:"))
+    if (nSrcType == eGeoJSONSourceService)
     {
-        return -1;
+        if (poOpenInfo->IsSingleAllowedDriver("ESRIJSON"))
+            return TRUE;
+        if (!STARTS_WITH_CI(poOpenInfo->pszFilename, "ESRIJSON:"))
+        {
+            return -1;
+        }
     }
     return TRUE;
 }
diff --git a/ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp b/ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp
index 464213b3a801..7b1290589e1c 100644
--- a/ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp
+++ b/ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp
@@ -10,27 +10,11 @@
  * Copyright (c) 2007, Mateusz Loskot
  * Copyright (c) 2013, Kyle Shannon <kyle at pobox dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
-#include "ogrgeojsonreader.h"
+#include "ogrlibjsonutils.h"
 
 #include <limits.h>
 #include <stddef.h>
@@ -49,6 +33,7 @@
 #include "ogr_geojson.h"
 #include "ogrgeojsonreader.h"
 #include "ogrgeojsonutils.h"
+#include "ogresrijsongeometry.h"
 
 // #include "symbol_renames.h"
 
@@ -121,9 +106,39 @@ void OGRESRIJSONReader::ReadLayers(OGRGeoJSONDataSource *poDS,
     }
 
     auto eGeomType = OGRESRIJSONGetGeometryType(poGJObject_);
-    if (eGeomType == wkbNone && poSRS != nullptr)
+    if (eGeomType == wkbNone)
     {
-        eGeomType = wkbUnknown;
+        if (poSRS)
+        {
+            eGeomType = wkbUnknown;
+        }
+        else
+        {
+            json_object *poObjFeatures =
+                OGRGeoJSONFindMemberByName(poGJObject_, "features");
+            if (poObjFeatures &&
+                json_type_array == json_object_get_type(poObjFeatures))
+            {
+                const auto nFeatures = json_object_array_length(poObjFeatures);
+                for (auto i = decltype(nFeatures){0}; i < nFeatures; ++i)
+                {
+                    json_object *poObjFeature =
+                        json_object_array_get_idx(poObjFeatures, i);
+                    if (poObjFeature != nullptr &&
+                        json_object_get_type(poObjFeature) == json_type_object)
+                    {
+                        if (auto poObjGeometry = OGRGeoJSONFindMemberByName(
+                                poObjFeature, "geometry"))
+                        {
+                            eGeomType = wkbUnknown;
+                            poSRS =
+                                OGRESRIJSONReadSpatialReference(poObjGeometry);
+                            break;
+                        }
+                    }
+                }
+            }
+        }
     }
 
     poLayer_ = new OGRGeoJSONLayer(pszName, poSRS, eGeomType, poDS, nullptr);
@@ -185,28 +200,87 @@ bool OGRESRIJSONReader::GenerateLayerDefn()
             }
         }
     }
-    else
+    else if ((poFields = OGRGeoJSONFindMemberByName(
+                  poGJObject_, "fieldAliases")) != nullptr &&
+             json_object_get_type(poFields) == json_type_object)
     {
-        poFields = OGRGeoJSONFindMemberByName(poGJObject_, "fieldAliases");
-        if (nullptr != poFields &&
-            json_object_get_type(poFields) == json_type_object)
+        json_object_iter it;
+        it.key = nullptr;
+        it.val = nullptr;
+        it.entry = nullptr;
+        json_object_object_foreachC(poFields, it)
         {
-            json_object_iter it;
-            it.key = nullptr;
-            it.val = nullptr;
-            it.entry = nullptr;
-            json_object_object_foreachC(poFields, it)
+            OGRFieldDefn fldDefn(it.key, OFTString);
+            poDefn->AddFieldDefn(&fldDefn);
+        }
+    }
+    else
+    {
+        // Guess the fields' schema from the content of the features' "attributes"
+        // element
+        json_object *poObjFeatures =
+            OGRGeoJSONFindMemberByName(poGJObject_, "features");
+        if (poObjFeatures &&
+            json_type_array == json_object_get_type(poObjFeatures))
+        {
+            gdal::DirectedAcyclicGraph<int, std::string> dag;
+            std::vector<std::unique_ptr<OGRFieldDefn>> apoFieldDefn{};
+            std::map<std::string, int> oMapFieldNameToIdx{};
+            std::vector<int> anCurFieldIndices;
+            std::set<int> aoSetUndeterminedTypeFields;
+
+            const auto nFeatures = json_object_array_length(poObjFeatures);
+            for (auto i = decltype(nFeatures){0}; i < nFeatures; ++i)
             {
-                OGRFieldDefn fldDefn(it.key, OFTString);
-                poDefn->AddFieldDefn(&fldDefn);
+                json_object *poObjFeature =
+                    json_object_array_get_idx(poObjFeatures, i);
+                if (poObjFeature != nullptr &&
+                    json_object_get_type(poObjFeature) == json_type_object)
+                {
+                    int nPrevFieldIdx = -1;
+
+                    json_object *poObjProps =
+                        OGRGeoJSONFindMemberByName(poObjFeature, "attributes");
+                    if (nullptr != poObjProps &&
+                        json_object_get_type(poObjProps) == json_type_object)
+                    {
+                        json_object_iter it;
+                        it.key = nullptr;
+                        it.val = nullptr;
+                        it.entry = nullptr;
+                        json_object_object_foreachC(poObjProps, it)
+                        {
+                            anCurFieldIndices.clear();
+                            OGRGeoJSONReaderAddOrUpdateField(
+                                anCurFieldIndices, oMapFieldNameToIdx,
+                                apoFieldDefn, it.key, it.val,
+                                /*bFlattenNestedAttributes = */ true,
+                                /* chNestedAttributeSeparator = */ '.',
+                                /* bArrayAsString =*/false,
+                                /* bDateAsString = */ false,
+                                aoSetUndeterminedTypeFields);
+                            for (int idx : anCurFieldIndices)
+                            {
+                                dag.addNode(idx,
+                                            apoFieldDefn[idx]->GetNameRef());
+                                if (nPrevFieldIdx != -1)
+                                {
+                                    dag.addEdge(nPrevFieldIdx, idx);
+                                }
+                                nPrevFieldIdx = idx;
+                            }
+                        }
+                    }
+                }
+            }
+
+            const auto sortedFields = dag.getTopologicalOrdering();
+            CPLAssert(sortedFields.size() == apoFieldDefn.size());
+            for (int idx : sortedFields)
+            {
+                // cppcheck-suppress containerOutOfBounds
+                poDefn->AddFieldDefn(apoFieldDefn[idx].get());
             }
-        }
-        else
-        {
-            CPLError(CE_Failure, CPLE_AppDefined,
-                     "Invalid FeatureCollection object. "
-                     "Missing \'fields\' member.");
-            bSuccess = false;
         }
     }
 
@@ -235,7 +309,11 @@ bool OGRESRIJSONReader::ParseField(json_object *poObj)
         OGRFieldSubType eFieldSubType = OFSTNone;
         const char *pszObjName = json_object_get_string(poObjName);
         const char *pszObjType = json_object_get_string(poObjType);
-        if (EQUAL(pszObjType, "esriFieldTypeOID"))
+        if (EQUAL(pszObjType, "esriFieldTypeString"))
+        {
+            // do nothing
+        }
+        else if (EQUAL(pszObjType, "esriFieldTypeOID"))
         {
             eFieldType = OFTInteger;
             poLayer_->SetFIDColumn(pszObjName);
@@ -288,6 +366,14 @@ bool OGRESRIJSONReader::ParseField(json_object *poObj)
             }
         }
 
+        json_object *poObjAlias = OGRGeoJSONFindMemberByName(poObj, "alias");
+        if (poObjAlias && json_object_get_type(poObjAlias) == json_type_string)
+        {
+            const char *pszAlias = json_object_get_string(poObjAlias);
+            if (strcmp(pszObjName, pszAlias) != 0)
+                fldDefn.SetAlternativeName(pszAlias);
+        }
+
         poDefn->AddFieldDefn(&fldDefn);
 
         bSuccess = true;
@@ -310,51 +396,6 @@ bool OGRESRIJSONReader::AddFeature(OGRFeature *poFeature)
     return true;
 }
 
-/************************************************************************/
-/*                       OGRESRIJSONReadGeometry()                      */
-/************************************************************************/
-
-OGRGeometry *OGRESRIJSONReadGeometry(json_object *poObj)
-{
-    OGRGeometry *poGeometry = nullptr;
-
-    if (OGRGeoJSONFindMemberByName(poObj, "x"))
-        poGeometry = OGRESRIJSONReadPoint(poObj);
-    else if (OGRGeoJSONFindMemberByName(poObj, "paths"))
-        poGeometry = OGRESRIJSONReadLineString(poObj);
-    else if (OGRGeoJSONFindMemberByName(poObj, "rings"))
-        poGeometry = OGRESRIJSONReadPolygon(poObj);
-    else if (OGRGeoJSONFindMemberByName(poObj, "points"))
-        poGeometry = OGRESRIJSONReadMultiPoint(poObj);
-
-    return poGeometry;
-}
-
-/************************************************************************/
-/*                     OGR_G_CreateGeometryFromEsriJson()               */
-/************************************************************************/
-
-/** Create a OGR geometry from a ESRIJson geometry object */
-OGRGeometryH OGR_G_CreateGeometryFromEsriJson(const char *pszJson)
-{
-    if (nullptr == pszJson)
-    {
-        // Translation failed.
-        return nullptr;
-    }
-
-    json_object *poObj = nullptr;
-    if (!OGRJSonParse(pszJson, &poObj))
-        return nullptr;
-
-    OGRGeometry *poGeometry = OGRESRIJSONReadGeometry(poObj);
-
-    // Release JSON tree.
-    json_object_put(poObj);
-
-    return OGRGeometry::ToHandle(poGeometry);
-}
-
 /************************************************************************/
 /*                           EsriDateToOGRDate()                        */
 /************************************************************************/
@@ -524,589 +565,3 @@ OGRGeoJSONLayer *OGRESRIJSONReader::ReadFeatureCollection(json_object *poObj)
     CPLAssert(nullptr != poLayer_);
     return poLayer_;
 }
-
-/************************************************************************/
-/*                        OGRESRIJSONGetType()                          */
-/************************************************************************/
-
-OGRwkbGeometryType OGRESRIJSONGetGeometryType(json_object *poObj)
-{
-    if (nullptr == poObj)
-        return wkbUnknown;
-
-    json_object *poObjType = OGRGeoJSONFindMemberByName(poObj, "geometryType");
-    if (nullptr == poObjType)
-    {
-        return wkbNone;
-    }
-
-    const char *name = json_object_get_string(poObjType);
-    if (EQUAL(name, "esriGeometryPoint"))
-        return wkbPoint;
-    else if (EQUAL(name, "esriGeometryPolyline"))
-        return wkbLineString;
-    else if (EQUAL(name, "esriGeometryPolygon"))
-        return wkbPolygon;
-    else if (EQUAL(name, "esriGeometryMultiPoint"))
-        return wkbMultiPoint;
-    else
-        return wkbUnknown;
-}
-
-/************************************************************************/
-/*                     OGRESRIJSONGetCoordinateToDouble()               */
-/************************************************************************/
-
-static double OGRESRIJSONGetCoordinateToDouble(json_object *poObjCoord,
-                                               const char *pszCoordName,
-                                               bool &bValid)
-{
-    const int iType = json_object_get_type(poObjCoord);
-    if (json_type_double != iType && json_type_int != iType)
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "Invalid '%s' coordinate. "
-                 "Type is not double or integer for \'%s\'.",
-                 pszCoordName, json_object_to_json_string(poObjCoord));
-        bValid = false;
-        return 0.0;
-    }
-
-    return json_object_get_double(poObjCoord);
-}
-
-/************************************************************************/
-/*                       OGRESRIJSONGetCoordinate()                     */
-/************************************************************************/
-
-static double OGRESRIJSONGetCoordinate(json_object *poObj,
-                                       const char *pszCoordName, bool &bValid)
-{
-    json_object *poObjCoord = OGRGeoJSONFindMemberByName(poObj, pszCoordName);
-    if (nullptr == poObjCoord)
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "Invalid Point object. "
-                 "Missing '%s' member.",
-                 pszCoordName);
-        bValid = false;
-        return 0.0;
-    }
-
-    return OGRESRIJSONGetCoordinateToDouble(poObjCoord, pszCoordName, bValid);
-}
-
-/************************************************************************/
-/*                          OGRESRIJSONReadPoint()                      */
-/************************************************************************/
-
-OGRPoint *OGRESRIJSONReadPoint(json_object *poObj)
-{
-    CPLAssert(nullptr != poObj);
-
-    bool bValid = true;
-    const double dfX = OGRESRIJSONGetCoordinate(poObj, "x", bValid);
-    const double dfY = OGRESRIJSONGetCoordinate(poObj, "y", bValid);
-    if (!bValid)
-        return nullptr;
-
-    json_object *poObjZ = OGRGeoJSONFindMemberByName(poObj, "z");
-    if (nullptr == poObjZ)
-        return new OGRPoint(dfX, dfY);
-
-    const double dfZ = OGRESRIJSONGetCoordinateToDouble(poObjZ, "z", bValid);
-    if (!bValid)
-        return nullptr;
-    return new OGRPoint(dfX, dfY, dfZ);
-}
-
-/************************************************************************/
-/*                     OGRESRIJSONReaderParseZM()                      */
-/************************************************************************/
-
-static void OGRESRIJSONReaderParseZM(json_object *poObj, bool *bHasZ,
-                                     bool *bHasM)
-{
-    CPLAssert(nullptr != poObj);
-    // The ESRI geojson spec states that geometries other than point can
-    // have the attributes hasZ and hasM.  A geometry that has a z value
-    // implies the 3rd number in the tuple is z.  if hasM is true, but hasZ
-    // is not, it is the M value.
-    bool bZ = false;
-    json_object *poObjHasZ = OGRGeoJSONFindMemberByName(poObj, "hasZ");
-    if (poObjHasZ != nullptr)
-    {
-        if (json_object_get_type(poObjHasZ) == json_type_boolean)
-        {
-            bZ = CPL_TO_BOOL(json_object_get_boolean(poObjHasZ));
-        }
-    }
-
-    bool bM = false;
-    json_object *poObjHasM = OGRGeoJSONFindMemberByName(poObj, "hasM");
-    if (poObjHasM != nullptr)
-    {
-        if (json_object_get_type(poObjHasM) == json_type_boolean)
-        {
-            bM = CPL_TO_BOOL(json_object_get_boolean(poObjHasM));
-        }
-    }
-    if (bHasZ != nullptr)
-        *bHasZ = bZ;
-    if (bHasM != nullptr)
-        *bHasM = bM;
-}
-
-/************************************************************************/
-/*                     OGRESRIJSONReaderParseXYZMArray()                  */
-/************************************************************************/
-
-static bool OGRESRIJSONReaderParseXYZMArray(json_object *poObjCoords,
-                                            bool /*bHasZ*/, bool bHasM,
-                                            double *pdfX, double *pdfY,
-                                            double *pdfZ, double *pdfM,
-                                            int *pnNumCoords)
-{
-    if (poObjCoords == nullptr)
-    {
-        CPLDebug("ESRIJSON",
-                 "OGRESRIJSONReaderParseXYZMArray: got null object.");
-        return false;
-    }
-
-    if (json_type_array != json_object_get_type(poObjCoords))
-    {
-        CPLDebug("ESRIJSON",
-                 "OGRESRIJSONReaderParseXYZMArray: got non-array object.");
-        return false;
-    }
-
-    const auto coordDimension = json_object_array_length(poObjCoords);
-
-    // Allow 4 coordinates if M is present, but it is eventually ignored.
-    if (coordDimension < 2 || coordDimension > 4)
-    {
-        CPLDebug("ESRIJSON",
-                 "OGRESRIJSONReaderParseXYZMArray: got an unexpected "
-                 "array object.");
-        return false;
-    }
-
-    // Read X coordinate.
-    json_object *poObjCoord = json_object_array_get_idx(poObjCoords, 0);
-    if (poObjCoord == nullptr)
-    {
-        CPLDebug("ESRIJSON",
-                 "OGRESRIJSONReaderParseXYZMArray: got null object.");
-        return false;
-    }
-
-    bool bValid = true;
-    const double dfX =
-        OGRESRIJSONGetCoordinateToDouble(poObjCoord, "x", bValid);
-
-    // Read Y coordinate.
-    poObjCoord = json_object_array_get_idx(poObjCoords, 1);
-    if (poObjCoord == nullptr)
-    {
-        CPLDebug("ESRIJSON",
-                 "OGRESRIJSONReaderParseXYZMArray: got null object.");
-        return false;
-    }
-
-    const double dfY =
-        OGRESRIJSONGetCoordinateToDouble(poObjCoord, "y", bValid);
-    if (!bValid)
-        return false;
-
-    // Read Z or M or Z and M coordinates.
-    if (coordDimension > 2)
-    {
-        poObjCoord = json_object_array_get_idx(poObjCoords, 2);
-        if (poObjCoord == nullptr)
-        {
-            CPLDebug("ESRIJSON",
-                     "OGRESRIJSONReaderParseXYZMArray: got null object.");
-            return false;
-        }
-
-        const double dfZorM = OGRESRIJSONGetCoordinateToDouble(
-            poObjCoord, (coordDimension > 3 || !bHasM) ? "z" : "m", bValid);
-        if (!bValid)
-            return false;
-        if (pdfZ != nullptr)
-        {
-            if (coordDimension > 3 || !bHasM)
-                *pdfZ = dfZorM;
-            else
-                *pdfZ = 0.0;
-        }
-        if (pdfM != nullptr && coordDimension == 3)
-        {
-            if (bHasM)
-                *pdfM = dfZorM;
-            else
-                *pdfM = 0.0;
-        }
-        if (coordDimension == 4)
-        {
-            poObjCoord = json_object_array_get_idx(poObjCoords, 3);
-            if (poObjCoord == nullptr)
-            {
-                CPLDebug("ESRIJSON",
-                         "OGRESRIJSONReaderParseXYZMArray: got null object.");
-                return false;
-            }
-
-            const double dfM =
-                OGRESRIJSONGetCoordinateToDouble(poObjCoord, "m", bValid);
-            if (!bValid)
-                return false;
-            if (pdfM != nullptr)
-                *pdfM = dfM;
-        }
-    }
-    else
-    {
-        if (pdfZ != nullptr)
-            *pdfZ = 0.0;
-        if (pdfM != nullptr)
-            *pdfM = 0.0;
-    }
-
-    if (pnNumCoords != nullptr)
-        *pnNumCoords = static_cast<int>(coordDimension);
-    if (pdfX != nullptr)
-        *pdfX = dfX;
-    if (pdfY != nullptr)
-        *pdfY = dfY;
-
-    return true;
-}
-
-/************************************************************************/
-/*                        OGRESRIJSONReadLineString()                   */
-/************************************************************************/
-
-OGRGeometry *OGRESRIJSONReadLineString(json_object *poObj)
-{
-    CPLAssert(nullptr != poObj);
-
-    bool bHasZ = false;
-    bool bHasM = false;
-
-    OGRESRIJSONReaderParseZM(poObj, &bHasZ, &bHasM);
-
-    json_object *poObjPaths = OGRGeoJSONFindMemberByName(poObj, "paths");
-    if (nullptr == poObjPaths)
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "Invalid LineString object. "
-                 "Missing \'paths\' member.");
-        return nullptr;
-    }
-
-    if (json_type_array != json_object_get_type(poObjPaths))
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "Invalid LineString object. "
-                 "Invalid \'paths\' member.");
-        return nullptr;
-    }
-
-    OGRMultiLineString *poMLS = nullptr;
-    OGRGeometry *poRet = nullptr;
-    const auto nPaths = json_object_array_length(poObjPaths);
-    for (auto iPath = decltype(nPaths){0}; iPath < nPaths; iPath++)
-    {
-        json_object *poObjPath = json_object_array_get_idx(poObjPaths, iPath);
-        if (poObjPath == nullptr ||
-            json_type_array != json_object_get_type(poObjPath))
-        {
-            delete poRet;
-            CPLDebug("ESRIJSON", "LineString: got non-array object.");
-            return nullptr;
-        }
-
-        OGRLineString *poLine = new OGRLineString();
-        if (nPaths > 1)
-        {
-            if (iPath == 0)
-            {
-                poMLS = new OGRMultiLineString();
-                poRet = poMLS;
-            }
-            poMLS->addGeometryDirectly(poLine);
-        }
-        else
-        {
-            poRet = poLine;
-        }
-        const auto nPoints = json_object_array_length(poObjPath);
-        for (auto i = decltype(nPoints){0}; i < nPoints; i++)
-        {
-            int nNumCoords = 2;
-            json_object *poObjCoords = json_object_array_get_idx(poObjPath, i);
-            double dfX = 0.0;
-            double dfY = 0.0;
-            double dfZ = 0.0;
-            double dfM = 0.0;
-            if (!OGRESRIJSONReaderParseXYZMArray(poObjCoords, bHasZ, bHasM,
-                                                 &dfX, &dfY, &dfZ, &dfM,
-                                                 &nNumCoords))
-            {
-                delete poRet;
-                return nullptr;
-            }
-
-            if (nNumCoords == 3 && !bHasM)
-            {
-                poLine->addPoint(dfX, dfY, dfZ);
-            }
-            else if (nNumCoords == 3)
-            {
-                poLine->addPointM(dfX, dfY, dfM);
-            }
-            else if (nNumCoords == 4)
-            {
-                poLine->addPoint(dfX, dfY, dfZ, dfM);
-            }
-            else
-            {
-                poLine->addPoint(dfX, dfY);
-            }
-        }
-    }
-
-    if (poRet == nullptr)
-        poRet = new OGRLineString();
-
-    return poRet;
-}
-
-/************************************************************************/
-/*                          OGRESRIJSONReadPolygon()                    */
-/************************************************************************/
-
-OGRGeometry *OGRESRIJSONReadPolygon(json_object *poObj)
-{
-    CPLAssert(nullptr != poObj);
-
-    bool bHasZ = false;
-    bool bHasM = false;
-
-    OGRESRIJSONReaderParseZM(poObj, &bHasZ, &bHasM);
-
-    json_object *poObjRings = OGRGeoJSONFindMemberByName(poObj, "rings");
-    if (nullptr == poObjRings)
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "Invalid Polygon object. "
-                 "Missing \'rings\' member.");
-        return nullptr;
-    }
-
-    if (json_type_array != json_object_get_type(poObjRings))
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "Invalid Polygon object. "
-                 "Invalid \'rings\' member.");
-        return nullptr;
-    }
-
-    const auto nRings = json_object_array_length(poObjRings);
-    OGRGeometry **papoGeoms = new OGRGeometry *[nRings];
-    for (auto iRing = decltype(nRings){0}; iRing < nRings; iRing++)
-    {
-        json_object *poObjRing = json_object_array_get_idx(poObjRings, iRing);
-        if (poObjRing == nullptr ||
-            json_type_array != json_object_get_type(poObjRing))
-        {
-            for (auto j = decltype(iRing){0}; j < iRing; j++)
-                delete papoGeoms[j];
-            delete[] papoGeoms;
-            CPLDebug("ESRIJSON", "Polygon: got non-array object.");
-            return nullptr;
-        }
-
-        OGRPolygon *poPoly = new OGRPolygon();
-        auto poLine = std::make_unique<OGRLinearRing>();
-        papoGeoms[iRing] = poPoly;
-
-        const auto nPoints = json_object_array_length(poObjRing);
-        for (auto i = decltype(nPoints){0}; i < nPoints; i++)
-        {
-            int nNumCoords = 2;
-            json_object *poObjCoords = json_object_array_get_idx(poObjRing, i);
-            double dfX = 0.0;
-            double dfY = 0.0;
-            double dfZ = 0.0;
-            double dfM = 0.0;
-            if (!OGRESRIJSONReaderParseXYZMArray(poObjCoords, bHasZ, bHasM,
-                                                 &dfX, &dfY, &dfZ, &dfM,
-                                                 &nNumCoords))
-            {
-                for (auto j = decltype(iRing){0}; j <= iRing; j++)
-                    delete papoGeoms[j];
-                delete[] papoGeoms;
-                return nullptr;
-            }
-
-            if (nNumCoords == 3 && !bHasM)
-            {
-                poLine->addPoint(dfX, dfY, dfZ);
-            }
-            else if (nNumCoords == 3)
-            {
-                poLine->addPointM(dfX, dfY, dfM);
-            }
-            else if (nNumCoords == 4)
-            {
-                poLine->addPoint(dfX, dfY, dfZ, dfM);
-            }
-            else
-            {
-                poLine->addPoint(dfX, dfY);
-            }
-        }
-        poPoly->addRingDirectly(poLine.release());
-    }
-
-    OGRGeometry *poRet = OGRGeometryFactory::organizePolygons(
-        papoGeoms, static_cast<int>(nRings), nullptr, nullptr);
-    delete[] papoGeoms;
-
-    return poRet;
-}
-
-/************************************************************************/
-/*                        OGRESRIJSONReadMultiPoint()                   */
-/************************************************************************/
-
-OGRMultiPoint *OGRESRIJSONReadMultiPoint(json_object *poObj)
-{
-    CPLAssert(nullptr != poObj);
-
-    bool bHasZ = false;
-    bool bHasM = false;
-
-    OGRESRIJSONReaderParseZM(poObj, &bHasZ, &bHasM);
-
-    json_object *poObjPoints = OGRGeoJSONFindMemberByName(poObj, "points");
-    if (nullptr == poObjPoints)
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "Invalid MultiPoint object. "
-                 "Missing \'points\' member.");
-        return nullptr;
-    }
-
-    if (json_type_array != json_object_get_type(poObjPoints))
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "Invalid MultiPoint object. "
-                 "Invalid \'points\' member.");
-        return nullptr;
-    }
-
-    OGRMultiPoint *poMulti = new OGRMultiPoint();
-
-    const auto nPoints = json_object_array_length(poObjPoints);
-    for (auto i = decltype(nPoints){0}; i < nPoints; i++)
-    {
-        int nNumCoords = 2;
-        json_object *poObjCoords = json_object_array_get_idx(poObjPoints, i);
-        double dfX = 0.0;
-        double dfY = 0.0;
-        double dfZ = 0.0;
-        double dfM = 0.0;
-        if (!OGRESRIJSONReaderParseXYZMArray(poObjCoords, bHasZ, bHasM, &dfX,
-                                             &dfY, &dfZ, &dfM, &nNumCoords))
-        {
-            delete poMulti;
-            return nullptr;
-        }
-
-        if (nNumCoords == 3 && !bHasM)
-        {
-            poMulti->addGeometryDirectly(new OGRPoint(dfX, dfY, dfZ));
-        }
-        else if (nNumCoords == 3)
-        {
-            OGRPoint *poPoint = new OGRPoint(dfX, dfY);
-            poPoint->setM(dfM);
-            poMulti->addGeometryDirectly(poPoint);
-        }
-        else if (nNumCoords == 4)
-        {
-            poMulti->addGeometryDirectly(new OGRPoint(dfX, dfY, dfZ, dfM));
-        }
-        else
-        {
-            poMulti->addGeometryDirectly(new OGRPoint(dfX, dfY));
-        }
-    }
-
-    return poMulti;
-}
-
-/************************************************************************/
-/*                    OGRESRIJSONReadSpatialReference()                 */
-/************************************************************************/
-
-OGRSpatialReference *OGRESRIJSONReadSpatialReference(json_object *poObj)
-{
-    /* -------------------------------------------------------------------- */
-    /*      Read spatial reference definition.                              */
-    /* -------------------------------------------------------------------- */
-    OGRSpatialReference *poSRS = nullptr;
-
-    json_object *poObjSrs =
-        OGRGeoJSONFindMemberByName(poObj, "spatialReference");
-    if (nullptr != poObjSrs)
-    {
-        json_object *poObjWkid =
-            OGRGeoJSONFindMemberByName(poObjSrs, "latestWkid");
-        if (poObjWkid == nullptr)
-            poObjWkid = OGRGeoJSONFindMemberByName(poObjSrs, "wkid");
-        if (poObjWkid == nullptr)
-        {
-            json_object *poObjWkt = OGRGeoJSONFindMemberByName(poObjSrs, "wkt");
-            if (poObjWkt == nullptr)
-                return nullptr;
-
-            const char *pszWKT = json_object_get_string(poObjWkt);
-            poSRS = new OGRSpatialReference();
-            poSRS->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
-            if (OGRERR_NONE != poSRS->importFromWkt(pszWKT))
-            {
-                delete poSRS;
-                poSRS = nullptr;
-            }
-            else
-            {
-                auto poSRSMatch = poSRS->FindBestMatch(70);
-                if (poSRSMatch)
-                {
-                    poSRS->Release();
-                    poSRS = poSRSMatch;
-                    poSRS->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
-                }
-            }
-
-            return poSRS;
-        }
-
-        const int nEPSG = json_object_get_int(poObjWkid);
-
-        poSRS = new OGRSpatialReference();
-        poSRS->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
-        if (OGRERR_NONE != poSRS->importFromEPSG(nEPSG))
-        {
-            delete poSRS;
-            poSRS = nullptr;
-        }
-    }
-
-    return poSRS;
-}
diff --git a/ogr/ogrsf_frmts/geojson/ogrgeojsondatasource.cpp b/ogr/ogrsf_frmts/geojson/ogrgeojsondatasource.cpp
index ad83a8672983..7208b0d27c68 100644
--- a/ogr/ogrsf_frmts/geojson/ogrgeojsondatasource.cpp
+++ b/ogr/ogrsf_frmts/geojson/ogrgeojsondatasource.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2007, Mateusz Loskot
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -51,6 +35,7 @@
 #include "ogr_feature.h"
 #include "ogr_geometry.h"
 #include "ogr_spatialref.h"
+#include "ogrlibjsonutils.h"
 #include "ogrgeojsonreader.h"
 #include "ogrgeojsonutils.h"
 #include "ogrgeojsonwriter.h"
@@ -195,8 +180,9 @@ int OGRGeoJSONDataSource::Open(GDALOpenInfo *poOpenInfo,
         bool bEmitError = true;
         if (eGeoJSONSourceService == nSrcType)
         {
-            const CPLString osTmpFilename = CPLSPrintf(
-                "/vsimem/%p/%s", this, CPLGetFilename(poOpenInfo->pszFilename));
+            const CPLString osTmpFilename =
+                VSIMemGenerateHiddenFilename(CPLSPrintf(
+                    "geojson_%s", CPLGetFilename(poOpenInfo->pszFilename)));
             VSIFCloseL(VSIFileFromMemBuffer(osTmpFilename, (GByte *)pszGeoData_,
                                             nGeoDataLen_, TRUE));
             pszGeoData_ = nullptr;
@@ -217,15 +203,6 @@ int OGRGeoJSONDataSource::Open(GDALOpenInfo *poOpenInfo,
     return TRUE;
 }
 
-/************************************************************************/
-/*                           GetName()                                  */
-/************************************************************************/
-
-const char *OGRGeoJSONDataSource::GetName()
-{
-    return pszName_ ? pszName_ : "";
-}
-
 /************************************************************************/
 /*                           GetLayerCount()                            */
 /************************************************************************/
@@ -814,9 +791,11 @@ int OGRGeoJSONDataSource::ReadFromService(GDALOpenInfo *poOpenInfo,
     char *pszStoredContent = OGRGeoJSONDriverStealStoredContent(pszSource);
     if (pszStoredContent != nullptr)
     {
-        if ((osJSonFlavor_ == "ESRIJSON" &&
-             ESRIJSONIsObject(pszStoredContent)) ||
-            (osJSonFlavor_ == "TopoJSON" && TopoJSONIsObject(pszStoredContent)))
+        if (!EQUAL(pszStoredContent, INVALID_CONTENT_FOR_JSON_LIKE) &&
+            ((osJSonFlavor_ == "ESRIJSON" &&
+              ESRIJSONIsObject(pszStoredContent, poOpenInfo)) ||
+             (osJSonFlavor_ == "TopoJSON" &&
+              TopoJSONIsObject(pszStoredContent, poOpenInfo))))
         {
             pszGeoData_ = pszStoredContent;
             nGeoDataLen_ = strlen(pszGeoData_);
@@ -882,16 +861,22 @@ int OGRGeoJSONDataSource::ReadFromService(GDALOpenInfo *poOpenInfo,
     /* -------------------------------------------------------------------- */
     if (EQUAL(pszSource, poOpenInfo->pszFilename) && osJSonFlavor_ == "GeoJSON")
     {
-        if (!GeoJSONIsObject(pszGeoData_, poOpenInfo->papszAllowedDrivers))
+        if (!GeoJSONIsObject(pszGeoData_, poOpenInfo))
         {
-            if (ESRIJSONIsObject(pszGeoData_) ||
-                TopoJSONIsObject(pszGeoData_) ||
-                GeoJSONSeqIsObject(pszGeoData_) || JSONFGIsObject(pszGeoData_))
+            if (ESRIJSONIsObject(pszGeoData_, poOpenInfo) ||
+                TopoJSONIsObject(pszGeoData_, poOpenInfo) ||
+                GeoJSONSeqIsObject(pszGeoData_, poOpenInfo) ||
+                JSONFGIsObject(pszGeoData_, poOpenInfo))
             {
                 OGRGeoJSONDriverStoreContent(pszSource, pszGeoData_);
                 pszGeoData_ = nullptr;
                 nGeoDataLen_ = 0;
             }
+            else
+            {
+                OGRGeoJSONDriverStoreContent(
+                    pszSource, CPLStrdup(INVALID_CONTENT_FOR_JSON_LIKE));
+            }
             return false;
         }
     }
@@ -1003,7 +988,7 @@ void OGRGeoJSONDataSource::LoadLayers(GDALOpenInfo *poOpenInfo,
         oOpenInfo.fpL = nullptr;
     }
 
-    if (!GeoJSONIsObject(pszGeoData_, poOpenInfo->papszAllowedDrivers))
+    if (!GeoJSONIsObject(pszGeoData_, poOpenInfo))
     {
         CPLDebug(pszJSonFlavor, "No valid %s data found in source '%s'",
                  pszJSonFlavor, pszName_);
diff --git a/ogr/ogrsf_frmts/geojson/ogrgeojsondriver.cpp b/ogr/ogrsf_frmts/geojson/ogrgeojsondriver.cpp
index 5c303f0195f1..748cb66ebf3a 100644
--- a/ogr/ogrsf_frmts/geojson/ogrgeojsondriver.cpp
+++ b/ogr/ogrsf_frmts/geojson/ogrgeojsondriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Mateusz Loskot
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -31,6 +15,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <limits>
 
 #include "cpl_conv.h"
 #include "cpl_error.h"
@@ -95,18 +80,20 @@ class OGRESRIFeatureServiceLayer final : public OGRLayer
 
 class OGRESRIFeatureServiceDataset final : public GDALDataset
 {
-    CPLString osURL;
-    GIntBig nFirstOffset;
-    GIntBig nLastOffset;
-    OGRGeoJSONDataSource *poCurrent;
-    OGRESRIFeatureServiceLayer *poLayer;
+    CPLString m_osURL{};
+    GIntBig m_nFirstOffset = 0;
+    GIntBig m_nLastOffset = 0;
+    std::unique_ptr<OGRGeoJSONDataSource> m_poCurrent{};
+    std::unique_ptr<OGRESRIFeatureServiceLayer> m_poLayer{};
+    GeoJSONSourceType m_nSrcType = eGeoJSONSourceUnknown;
 
-    int LoadPage();
+    bool LoadPage();
 
   public:
-    OGRESRIFeatureServiceDataset(const CPLString &osURL,
-                                 OGRGeoJSONDataSource *poFirst);
-    ~OGRESRIFeatureServiceDataset();
+    OGRESRIFeatureServiceDataset(
+        const std::string &osURL,
+        std::unique_ptr<OGRGeoJSONDataSource> &&poFirst,
+        GeoJSONSourceType nSrcType);
 
     int GetLayerCount() override
     {
@@ -115,20 +102,20 @@ class OGRESRIFeatureServiceDataset final : public GDALDataset
 
     OGRLayer *GetLayer(int nLayer) override
     {
-        return (nLayer == 0) ? poLayer : nullptr;
+        return (nLayer == 0) ? m_poLayer.get() : nullptr;
     }
 
     OGRLayer *GetUnderlyingLayer()
     {
-        return poCurrent->GetLayer(0);
+        return m_poCurrent->GetLayer(0);
     }
 
-    int MyResetReading();
-    int LoadNextPage();
+    bool MyResetReading();
+    bool LoadNextPage();
 
-    const CPLString &GetURL()
+    const CPLString &GetURL() const
     {
-        return osURL;
+        return m_osURL;
     }
 };
 
@@ -350,58 +337,49 @@ OGRErr OGRESRIFeatureServiceLayer::GetExtent(OGREnvelope *psExtent, int bForce)
 /************************************************************************/
 
 OGRESRIFeatureServiceDataset::OGRESRIFeatureServiceDataset(
-    const CPLString &osURLIn, OGRGeoJSONDataSource *poFirst)
-    : poCurrent(poFirst)
+    const std::string &osURL, std::unique_ptr<OGRGeoJSONDataSource> &&poFirst,
+    GeoJSONSourceType nSrcType)
+    : m_osURL(osURL), m_poCurrent(std::move(poFirst)), m_nSrcType(nSrcType)
 {
-    poLayer = new OGRESRIFeatureServiceLayer(this);
-    osURL = osURLIn;
-    if (CPLURLGetValue(osURL, "resultRecordCount").empty())
+    m_poLayer = std::make_unique<OGRESRIFeatureServiceLayer>(this);
+    if (CPLURLGetValue(m_osURL, "resultRecordCount").empty())
     {
         // We assume that if the server sets the exceededTransferLimit, the
         // and resultRecordCount is not set, the number of features returned
         // in our first request is the maximum allowed by the server
         // So set it for following requests.
-        osURL = CPLURLAddKVP(
-            this->osURL, "resultRecordCount",
+        m_osURL = CPLURLAddKVP(
+            m_osURL, "resultRecordCount",
             CPLSPrintf("%d", static_cast<int>(
-                                 poFirst->GetLayer(0)->GetFeatureCount())));
+                                 m_poCurrent->GetLayer(0)->GetFeatureCount())));
     }
     else
     {
         const int nUserSetRecordCount =
-            atoi(CPLURLGetValue(osURL, "resultRecordCount"));
-        if (nUserSetRecordCount > poFirst->GetLayer(0)->GetFeatureCount())
+            atoi(CPLURLGetValue(m_osURL, "resultRecordCount"));
+        if (nUserSetRecordCount > m_poCurrent->GetLayer(0)->GetFeatureCount())
         {
-            CPLError(CE_Warning, CPLE_AppDefined,
-                     "Specified resultRecordCount=%d is greater than "
-                     "the maximum %d supported by the server",
-                     nUserSetRecordCount,
-                     static_cast<int>(poFirst->GetLayer(0)->GetFeatureCount()));
+            CPLError(
+                CE_Warning, CPLE_AppDefined,
+                "Specified resultRecordCount=%d is greater than "
+                "the maximum %d supported by the server",
+                nUserSetRecordCount,
+                static_cast<int>(m_poCurrent->GetLayer(0)->GetFeatureCount()));
         }
     }
-    nFirstOffset = CPLAtoGIntBig(CPLURLGetValue(osURL, "resultOffset"));
-    nLastOffset = nFirstOffset;
-}
-
-/************************************************************************/
-/*                      ~OGRESRIFeatureServiceDataset()                 */
-/************************************************************************/
-
-OGRESRIFeatureServiceDataset::~OGRESRIFeatureServiceDataset()
-{
-    delete poCurrent;
-    delete poLayer;
+    m_nFirstOffset = CPLAtoGIntBig(CPLURLGetValue(m_osURL, "resultOffset"));
+    m_nLastOffset = m_nFirstOffset;
 }
 
 /************************************************************************/
 /*                           MyResetReading()                           */
 /************************************************************************/
 
-int OGRESRIFeatureServiceDataset::MyResetReading()
+bool OGRESRIFeatureServiceDataset::MyResetReading()
 {
-    if (nLastOffset > nFirstOffset)
+    if (m_nLastOffset > m_nFirstOffset)
     {
-        nLastOffset = nFirstOffset;
+        m_nLastOffset = m_nFirstOffset;
         return LoadPage();
     }
 
@@ -409,29 +387,32 @@ int OGRESRIFeatureServiceDataset::MyResetReading()
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wnull-dereference"
 #endif
-    poCurrent->GetLayer(0)->ResetReading();
+    m_poCurrent->GetLayer(0)->ResetReading();
 #if defined(__GNUC__)
 #pragma GCC diagnostic pop
 #endif
-    return TRUE;
+    return true;
 }
 
 /************************************************************************/
 /*                             LoadNextPage()                           */
 /************************************************************************/
 
-int OGRESRIFeatureServiceDataset::LoadNextPage()
+bool OGRESRIFeatureServiceDataset::LoadNextPage()
 {
-    if (!poCurrent->HasOtherPages())
-        return FALSE;
+    if (!m_poCurrent->HasOtherPages())
+        return false;
 #if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wnull-dereference"
 #endif
-    nLastOffset += poCurrent->GetLayer(0)->GetFeatureCount();
+    const auto nCurPageFC = m_poCurrent->GetLayer(0)->GetFeatureCount();
 #if defined(__GNUC__)
 #pragma GCC diagnostic pop
 #endif
+    if (m_nLastOffset > std::numeric_limits<GIntBig>::max() - nCurPageFC)
+        return false;
+    m_nLastOffset += nCurPageFC;
     return LoadPage();
 }
 
@@ -439,27 +420,19 @@ int OGRESRIFeatureServiceDataset::LoadNextPage()
 /*                                 LoadPage()                           */
 /************************************************************************/
 
-int OGRESRIFeatureServiceDataset::LoadPage()
+bool OGRESRIFeatureServiceDataset::LoadPage()
 {
-    CPLString osNewURL = CPLURLAddKVP(osURL, "resultOffset",
-                                      CPLSPrintf(CPL_FRMT_GIB, nLastOffset));
-    OGRGeoJSONDataSource *poDS = new OGRGeoJSONDataSource();
+    CPLString osNewURL = CPLURLAddKVP(m_osURL, "resultOffset",
+                                      CPLSPrintf(CPL_FRMT_GIB, m_nLastOffset));
+    auto poDS = std::make_unique<OGRGeoJSONDataSource>();
     GDALOpenInfo oOpenInfo(osNewURL, GA_ReadOnly);
-    GeoJSONSourceType nSrcType;
-    if (EQUAL(poCurrent->GetJSonFlavor(), "GeoJSON"))
-        nSrcType = GeoJSONGetSourceType(&oOpenInfo);
-    else
-        nSrcType = ESRIJSONDriverGetSourceType(&oOpenInfo);
-    if (!poDS->Open(&oOpenInfo, nSrcType, poCurrent->GetJSonFlavor()) ||
+    if (!poDS->Open(&oOpenInfo, m_nSrcType, m_poCurrent->GetJSonFlavor()) ||
         poDS->GetLayerCount() == 0)
     {
-        delete poDS;
-        poDS = nullptr;
-        return FALSE;
+        return false;
     }
-    delete poCurrent;
-    poCurrent = poDS;
-    return TRUE;
+    m_poCurrent = std::move(poDS);
+    return true;
 }
 
 /************************************************************************/
@@ -484,10 +457,15 @@ static int OGRGeoJSONDriverIdentifyInternal(GDALOpenInfo *poOpenInfo,
 
         return FALSE;
     }
-    if (nSrcType == eGeoJSONSourceService &&
-        !STARTS_WITH_CI(poOpenInfo->pszFilename, "GeoJSON:"))
+
+    if (nSrcType == eGeoJSONSourceService)
     {
-        return -1;
+        if (poOpenInfo->IsSingleAllowedDriver("GeoJSON"))
+            return TRUE;
+        if (!STARTS_WITH_CI(poOpenInfo->pszFilename, "GeoJSON:"))
+        {
+            return -1;
+        }
     }
 
     // If this looks like a file that can be handled by the STACTA driver,
@@ -499,6 +477,8 @@ static int OGRGeoJSONDriverIdentifyInternal(GDALOpenInfo *poOpenInfo,
         strstr(pszHeader, "\"tiled-assets\"") != nullptr &&
         GDALGetDriverByName("STACTA") != nullptr)
     {
+        if (poOpenInfo->IsSingleAllowedDriver("GeoJSON"))
+            return TRUE;
         return FALSE;
     }
 
@@ -537,7 +517,7 @@ GDALDataset *OGRGeoJSONDriverOpenInternal(GDALOpenInfo *poOpenInfo,
                                           GeoJSONSourceType nSrcType,
                                           const char *pszJSonFlavor)
 {
-    OGRGeoJSONDataSource *poDS = new OGRGeoJSONDataSource();
+    auto poDS = std::make_unique<OGRGeoJSONDataSource>();
 
     /* -------------------------------------------------------------------- */
     /*      Processing configuration options.                               */
@@ -567,8 +547,7 @@ GDALDataset *OGRGeoJSONDriverOpenInternal(GDALOpenInfo *poOpenInfo,
     /* -------------------------------------------------------------------- */
     if (!poDS->Open(poOpenInfo, nSrcType, pszJSonFlavor))
     {
-        delete poDS;
-        poDS = nullptr;
+        poDS.reset();
     }
 
     if (poDS != nullptr && poDS->HasOtherPages())
@@ -587,12 +566,13 @@ GDALDataset *OGRGeoJSONDriverOpenInternal(GDALOpenInfo *poOpenInfo,
                  (pszFSP == nullptr || CPLTestBool(pszFSP))) ||
                 (bHasResultOffset && pszFSP != nullptr && CPLTestBool(pszFSP)))
             {
-                return new OGRESRIFeatureServiceDataset(pszFilename, poDS);
+                return new OGRESRIFeatureServiceDataset(
+                    pszFilename, std::move(poDS), nSrcType);
             }
         }
     }
 
-    return poDS;
+    return poDS.release();
 }
 
 /************************************************************************/
@@ -699,6 +679,9 @@ void RegisterOGRGeoJSON()
     poDriver->SetMetadataItem(GDAL_DCAP_VECTOR, "YES");
     poDriver->SetMetadataItem(GDAL_DCAP_CREATE_LAYER, "YES");
     poDriver->SetMetadataItem(GDAL_DCAP_CREATE_FIELD, "YES");
+    poDriver->SetMetadataItem(GDAL_DCAP_DELETE_FIELD, "YES");
+    poDriver->SetMetadataItem(GDAL_DCAP_REORDER_FIELDS, "YES");
+    poDriver->SetMetadataItem(GDAL_DMD_ALTER_FIELD_DEFN_FLAGS, "Name Type");
     poDriver->SetMetadataItem(GDAL_DCAP_Z_GEOMETRIES, "YES");
     poDriver->SetMetadataItem(GDAL_DMD_LONGNAME, "GeoJSON");
     poDriver->SetMetadataItem(GDAL_DMD_EXTENSIONS, "json geojson");
@@ -800,4 +783,10 @@ void RegisterOGRGeoJSON()
     poDriver->pfnUnloadDriver = OGRGeoJSONDriverUnload;
 
     GetGDALDriverManager()->RegisterDriver(poDriver);
+
+#ifdef BUILT_AS_PLUGIN
+    RegisterOGRTopoJSON();
+    RegisterOGRESRIJSON();
+    RegisterOGRGeoJSONSeq();
+#endif
 }
diff --git a/ogr/ogrsf_frmts/geojson/ogrgeojsonlayer.cpp b/ogr/ogrsf_frmts/geojson/ogrgeojsonlayer.cpp
index 856fbf021d92..cc5bde637436 100644
--- a/ogr/ogrsf_frmts/geojson/ogrgeojsonlayer.cpp
+++ b/ogr/ogrsf_frmts/geojson/ogrgeojsonlayer.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2007, Mateusz Loskot
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <algorithm>
@@ -245,23 +229,52 @@ bool OGRGeoJSONLayer::IngestAll()
 }
 
 /************************************************************************/
-/*                           ISetFeature()                              */
+/*                     SetOrUpdateFeaturePreparation()                  */
 /************************************************************************/
 
-OGRErr OGRGeoJSONLayer::ISetFeature(OGRFeature *poFeature)
+bool OGRGeoJSONLayer::SetOrUpdateFeaturePreparation()
 {
     if (!IsUpdatable())
-        return OGRERR_FAILURE;
+        return false;
     if (poReader_)
     {
         auto nNextIndex = nFeatureReadSinceReset_;
         if (!IngestAll())
-            return OGRERR_FAILURE;
+            return false;
         SetNextByIndex(nNextIndex);
     }
+    return true;
+}
+
+/************************************************************************/
+/*                           ISetFeature()                              */
+/************************************************************************/
+
+OGRErr OGRGeoJSONLayer::ISetFeature(OGRFeature *poFeature)
+{
+    if (!SetOrUpdateFeaturePreparation())
+        return OGRERR_FAILURE;
     return OGRMemLayer::ISetFeature(poFeature);
 }
 
+/************************************************************************/
+/*                         IUpdateFeature()                             */
+/************************************************************************/
+
+OGRErr OGRGeoJSONLayer::IUpdateFeature(OGRFeature *poFeature,
+                                       int nUpdatedFieldsCount,
+                                       const int *panUpdatedFieldsIdx,
+                                       int nUpdatedGeomFieldsCount,
+                                       const int *panUpdatedGeomFieldsIdx,
+                                       bool bUpdateStyleString)
+{
+    if (!SetOrUpdateFeaturePreparation())
+        return OGRERR_FAILURE;
+    return OGRMemLayer::IUpdateFeature(
+        poFeature, nUpdatedFieldsCount, panUpdatedFieldsIdx,
+        nUpdatedGeomFieldsCount, panUpdatedGeomFieldsIdx, bUpdateStyleString);
+}
+
 /************************************************************************/
 /*                         ICreateFeature()                             */
 /************************************************************************/
diff --git a/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp b/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp
index 0a067bf46abf..fd88e5f5a1c2 100644
--- a/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp
+++ b/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp
@@ -8,31 +8,18 @@
  * Copyright (c) 2007, Mateusz Loskot
  * Copyright (c) 2008-2017, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrgeojsonreader.h"
 #include "ogrgeojsonutils.h"
+#include "ogrgeojsongeometry.h"
 #include "ogr_geojson.h"
+#include "ogrlibjsonutils.h"
 #include "ogrjsoncollectionstreamingparser.h"
 #include "ogr_api.h"
 
+#include <cmath>
 #include <limits>
 #include <set>
 #include <functional>
@@ -306,12 +293,12 @@ void OGRGeoJSONReaderStreamingParser::GotFeature(json_object *poObj,
             if (nFID == OGRNullFID)
             {
                 nFID = static_cast<GIntBig>(m_oSetUsedFIDs.size());
-                while (m_oSetUsedFIDs.find(nFID) != m_oSetUsedFIDs.end())
+                while (cpl::contains(m_oSetUsedFIDs, nFID))
                 {
                     ++nFID;
                 }
             }
-            else if (m_oSetUsedFIDs.find(nFID) != m_oSetUsedFIDs.end())
+            else if (cpl::contains(m_oSetUsedFIDs, nFID))
             {
                 if (!m_bOriginalIdModifiedEmitted)
                 {
@@ -324,7 +311,7 @@ void OGRGeoJSONReaderStreamingParser::GotFeature(json_object *poObj,
                     m_bOriginalIdModifiedEmitted = true;
                 }
                 nFID = static_cast<GIntBig>(m_oSetUsedFIDs.size());
-                while (m_oSetUsedFIDs.find(nFID) != m_oSetUsedFIDs.end())
+                while (cpl::contains(m_oSetUsedFIDs, nFID))
                 {
                     ++nFID;
                 }
@@ -479,7 +466,7 @@ bool OGRGeoJSONReader::FirstPassReadLayer(OGRGeoJSONDataSource *poDS,
             bFirstSeg_ = false;
             nSkip = SkipPrologEpilogAndUpdateJSonPLikeWrapper(nRead);
         }
-        if (bFinished && bJSonPLikeWrapper_ && nRead - nSkip > 0)
+        if (bFinished && bJSonPLikeWrapper_ && nRead > nSkip)
             nRead--;
         if (!oParser.Parse(reinterpret_cast<const char *>(pabyBuffer_ + nSkip),
                            nRead - nSkip, bFinished) ||
@@ -704,7 +691,7 @@ OGRFeature *OGRGeoJSONReader::GetNextFeature(OGRGeoJSONLayer *poLayer)
             bFirstSeg_ = false;
             nSkip = SkipPrologEpilogAndUpdateJSonPLikeWrapper(nRead);
         }
-        if (bFinished && bJSonPLikeWrapper_ && nRead - nSkip > 0)
+        if (bFinished && bJSonPLikeWrapper_ && nRead > nSkip)
             nRead--;
         if (!poStreamingParser_->Parse(
                 reinterpret_cast<const char *>(pabyBuffer_ + nSkip),
@@ -762,7 +749,7 @@ OGRFeature *OGRGeoJSONReader::GetFeature(OGRGeoJSONLayer *poLayer, GIntBig nFID)
                 bFirstSeg_ = false;
                 nSkip = SkipPrologEpilogAndUpdateJSonPLikeWrapper(nRead);
             }
-            if (bFinished && bJSonPLikeWrapper_ && nRead - nSkip > 0)
+            if (bFinished && bJSonPLikeWrapper_ && nRead > nSkip)
                 nRead--;
             auto pszPtr = reinterpret_cast<const char *>(pabyBuffer_ + nSkip);
             for (size_t i = 0; i < nRead - nSkip; i++)
@@ -786,8 +773,7 @@ OGRFeature *OGRGeoJSONReader::GetFeature(OGRGeoJSONLayer *poLayer, GIntBig nFID)
                     if (poFeat)
                     {
                         const GIntBig nThisFID = poFeat->GetFID();
-                        if (oMapFIDToOffsetSize_.find(nThisFID) ==
-                            oMapFIDToOffsetSize_.end())
+                        if (!cpl::contains(oMapFIDToOffsetSize_, nThisFID))
                         {
                             oMapFIDToOffsetSize_[nThisFID] =
                                 std::pair<vsi_l_offset, vsi_l_offset>(
@@ -806,7 +792,7 @@ OGRFeature *OGRGeoJSONReader::GetFeature(OGRGeoJSONLayer *poLayer, GIntBig nFID)
         bOriginalIdModifiedEmitted_ = oParser.GetOriginalIdModifiedEmitted();
     }
 
-    auto oIter = oMapFIDToOffsetSize_.find(nFID);
+    const auto oIter = oMapFIDToOffsetSize_.find(nFID);
     if (oIter == oMapFIDToOffsetSize_.end())
     {
         return nullptr;
@@ -1043,149 +1029,6 @@ void OGRGeoJSONReader::ReadLayer(OGRGeoJSONDataSource *poDS,
     poDS->AddLayer(poLayer);
 }
 
-/************************************************************************/
-/*                    OGRGeoJSONReadSpatialReference                    */
-/************************************************************************/
-
-OGRSpatialReference *OGRGeoJSONReadSpatialReference(json_object *poObj)
-{
-
-    /* -------------------------------------------------------------------- */
-    /*      Read spatial reference definition.                              */
-    /* -------------------------------------------------------------------- */
-    OGRSpatialReference *poSRS = nullptr;
-
-    json_object *poObjSrs = OGRGeoJSONFindMemberByName(poObj, "crs");
-    if (nullptr != poObjSrs)
-    {
-        json_object *poObjSrsType =
-            OGRGeoJSONFindMemberByName(poObjSrs, "type");
-        if (poObjSrsType == nullptr)
-            return nullptr;
-
-        const char *pszSrsType = json_object_get_string(poObjSrsType);
-
-        // TODO: Add URL and URN types support.
-        if (STARTS_WITH_CI(pszSrsType, "NAME"))
-        {
-            json_object *poObjSrsProps =
-                OGRGeoJSONFindMemberByName(poObjSrs, "properties");
-            if (poObjSrsProps == nullptr)
-                return nullptr;
-
-            json_object *poNameURL =
-                OGRGeoJSONFindMemberByName(poObjSrsProps, "name");
-            if (poNameURL == nullptr)
-                return nullptr;
-
-            const char *pszName = json_object_get_string(poNameURL);
-
-            // Mostly to emulate GDAL 2.x behavior
-            // See https://github.com/OSGeo/gdal/issues/2035
-            if (EQUAL(pszName, "urn:ogc:def:crs:OGC:1.3:CRS84"))
-                pszName = "EPSG:4326";
-
-            poSRS = new OGRSpatialReference();
-            poSRS->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
-            if (OGRERR_NONE !=
-                poSRS->SetFromUserInput(
-                    pszName,
-                    OGRSpatialReference::SET_FROM_USER_INPUT_LIMITATIONS_get()))
-            {
-                delete poSRS;
-                poSRS = nullptr;
-            }
-        }
-
-        else if (STARTS_WITH_CI(pszSrsType, "EPSG"))
-        {
-            json_object *poObjSrsProps =
-                OGRGeoJSONFindMemberByName(poObjSrs, "properties");
-            if (poObjSrsProps == nullptr)
-                return nullptr;
-
-            json_object *poObjCode =
-                OGRGeoJSONFindMemberByName(poObjSrsProps, "code");
-            if (poObjCode == nullptr)
-                return nullptr;
-
-            int nEPSG = json_object_get_int(poObjCode);
-
-            poSRS = new OGRSpatialReference();
-            poSRS->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
-            if (OGRERR_NONE != poSRS->importFromEPSG(nEPSG))
-            {
-                delete poSRS;
-                poSRS = nullptr;
-            }
-        }
-
-        else if (STARTS_WITH_CI(pszSrsType, "URL") ||
-                 STARTS_WITH_CI(pszSrsType, "LINK"))
-        {
-            json_object *poObjSrsProps =
-                OGRGeoJSONFindMemberByName(poObjSrs, "properties");
-            if (poObjSrsProps == nullptr)
-                return nullptr;
-
-            json_object *poObjURL =
-                OGRGeoJSONFindMemberByName(poObjSrsProps, "url");
-
-            if (nullptr == poObjURL)
-            {
-                poObjURL = OGRGeoJSONFindMemberByName(poObjSrsProps, "href");
-            }
-            if (poObjURL == nullptr)
-                return nullptr;
-
-            const char *pszURL = json_object_get_string(poObjURL);
-
-            poSRS = new OGRSpatialReference();
-            poSRS->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
-            if (OGRERR_NONE != poSRS->importFromUrl(pszURL))
-            {
-                delete poSRS;
-                poSRS = nullptr;
-            }
-        }
-
-        else if (EQUAL(pszSrsType, "OGC"))
-        {
-            json_object *poObjSrsProps =
-                OGRGeoJSONFindMemberByName(poObjSrs, "properties");
-            if (poObjSrsProps == nullptr)
-                return nullptr;
-
-            json_object *poObjURN =
-                OGRGeoJSONFindMemberByName(poObjSrsProps, "urn");
-            if (poObjURN == nullptr)
-                return nullptr;
-
-            poSRS = new OGRSpatialReference();
-            poSRS->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
-            if (OGRERR_NONE !=
-                poSRS->importFromURN(json_object_get_string(poObjURN)))
-            {
-                delete poSRS;
-                poSRS = nullptr;
-            }
-        }
-    }
-
-    // Strip AXIS, since geojson has (easting, northing) / (longitude, latitude)
-    // order.  According to http://www.geojson.org/geojson-spec.html#id2 :
-    // "Point coordinates are in x, y order (easting, northing for projected
-    // coordinates, longitude, latitude for geographic coordinates)".
-    if (poSRS != nullptr)
-    {
-        OGR_SRSNode *poGEOGCS = poSRS->GetAttrNode("GEOGCS");
-        if (poGEOGCS != nullptr)
-            poGEOGCS->StripNodes("AXIS");
-    }
-
-    return poSRS;
-}
-
 /************************************************************************/
 /*                         GenerateLayerDefn()                          */
 /************************************************************************/
@@ -1348,7 +1191,7 @@ void OGRGeoJSONReaderAddOrUpdateField(
         return;
     }
 
-    auto oMapFieldNameToIdxIter = oMapFieldNameToIdx.find(pszKey);
+    const auto oMapFieldNameToIdxIter = oMapFieldNameToIdx.find(pszKey);
     if (oMapFieldNameToIdxIter == oMapFieldNameToIdx.end())
     {
         OGRFieldSubType eSubType;
@@ -1385,8 +1228,7 @@ void OGRGeoJSONReaderAddOrUpdateField(
             GeoJSONPropertyToFieldType(poVal, eNewSubType, bArrayAsString);
         const bool bNewIsEmptyArray =
             (jType == json_type_array && json_object_array_length(poVal) == 0);
-        if (aoSetUndeterminedTypeFields.find(nIndex) !=
-            aoSetUndeterminedTypeFields.end())
+        if (cpl::contains(aoSetUndeterminedTypeFields, nIndex))
         {
             poFDefn->SetSubType(OFSTNone);
             poFDefn->SetType(eNewType);
@@ -1656,7 +1498,7 @@ void OGRGeoJSONGenerateFeatureDefnDealWithID(
     json_object *poObjId = OGRGeoJSONFindMemberByName(poObj, "id");
     if (poObjId)
     {
-        auto iterIdxId = oMapFieldNameToIdx.find("id");
+        const auto iterIdxId = oMapFieldNameToIdx.find("id");
         if (iterIdxId == oMapFieldNameToIdx.end())
         {
             if (json_object_get_type(poObjId) == json_type_int)
@@ -1813,7 +1655,7 @@ bool OGRGeoJSONBaseReader::GenerateFeatureDefn(
         json_object_object_foreachC(poObjProps, it)
         {
             if (!bIsGeocouchSpatiallistFormat &&
-                oMapFieldNameToIdx.find(it.key) == oMapFieldNameToIdx.end())
+                !cpl::contains(oMapFieldNameToIdx, it.key))
             {
                 // Detect the special kind of GeoJSON output by a spatiallist of
                 // GeoCouch such as:
@@ -1844,7 +1686,7 @@ bool OGRGeoJSONBaseReader::GenerateFeatureDefn(
                                 "GEOJSON_FLATTEN_GEOCOUCH", "TRUE"));
                     if (bFlattenGeocouchSpatiallistFormat)
                     {
-                        auto typeIter = oMapFieldNameToIdx.find("type");
+                        const auto typeIter = oMapFieldNameToIdx.find("type");
                         if (typeIter != oMapFieldNameToIdx.end())
                         {
                             const int nIdx = typeIter->second;
@@ -1901,7 +1743,7 @@ bool OGRGeoJSONBaseReader::GenerateFeatureDefn(
                 strcmp(it.key, "centroid") != 0 &&
                 strcmp(it.key, "bbox") != 0 && strcmp(it.key, "center") != 0)
             {
-                if (oMapFieldNameToIdx.find(it.key) == oMapFieldNameToIdx.end())
+                if (!cpl::contains(oMapFieldNameToIdx, it.key))
                 {
                     anCurFieldIndices.clear();
                     OGRGeoJSONReaderAddOrUpdateField(
@@ -1954,7 +1796,7 @@ bool OGRGeoJSONUpdateLayerGeomType(bool &bFirstGeom,
     {
         // ok
     }
-    else if (eGeomType != eLayerGeomType)
+    else if (eGeomType != eLayerGeomType && eLayerGeomType != wkbUnknown)
     {
         CPLDebug("GeoJSON", "Detected layer of mixed-geometry type features.");
         eLayerGeomType = wkbUnknown;
@@ -2460,775 +2302,9 @@ void OGRGeoJSONReader::ReadFeatureCollection(OGRGeoJSONLayer *poLayer,
 }
 
 /************************************************************************/
-/*                           OGRGeoJSONFindMemberByName                 */
-/************************************************************************/
-
-lh_entry *OGRGeoJSONFindMemberEntryByName(json_object *poObj,
-                                          const char *pszName)
-{
-    if (nullptr == pszName || nullptr == poObj)
-        return nullptr;
-
-    if (nullptr != json_object_get_object(poObj))
-    {
-        lh_entry *entry = json_object_get_object(poObj)->head;
-        while (entry != nullptr)
-        {
-            if (EQUAL(static_cast<const char *>(entry->k), pszName))
-                return entry;
-            entry = entry->next;
-        }
-    }
-
-    return nullptr;
-}
-
-json_object *OGRGeoJSONFindMemberByName(json_object *poObj, const char *pszName)
-{
-    lh_entry *entry = OGRGeoJSONFindMemberEntryByName(poObj, pszName);
-    if (nullptr == entry)
-        return nullptr;
-    return (json_object *)entry->v;
-}
-
-/************************************************************************/
-/*                           OGRGeoJSONGetType                          */
-/************************************************************************/
-
-GeoJSONObject::Type OGRGeoJSONGetType(json_object *poObj)
-{
-    if (nullptr == poObj)
-        return GeoJSONObject::eUnknown;
-
-    json_object *poObjType = OGRGeoJSONFindMemberByName(poObj, "type");
-    if (nullptr == poObjType)
-        return GeoJSONObject::eUnknown;
-
-    const char *name = json_object_get_string(poObjType);
-    if (EQUAL(name, "Point"))
-        return GeoJSONObject::ePoint;
-    else if (EQUAL(name, "LineString"))
-        return GeoJSONObject::eLineString;
-    else if (EQUAL(name, "Polygon"))
-        return GeoJSONObject::ePolygon;
-    else if (EQUAL(name, "MultiPoint"))
-        return GeoJSONObject::eMultiPoint;
-    else if (EQUAL(name, "MultiLineString"))
-        return GeoJSONObject::eMultiLineString;
-    else if (EQUAL(name, "MultiPolygon"))
-        return GeoJSONObject::eMultiPolygon;
-    else if (EQUAL(name, "GeometryCollection"))
-        return GeoJSONObject::eGeometryCollection;
-    else if (EQUAL(name, "Feature"))
-        return GeoJSONObject::eFeature;
-    else if (EQUAL(name, "FeatureCollection"))
-        return GeoJSONObject::eFeatureCollection;
-    else
-        return GeoJSONObject::eUnknown;
-}
-
-/************************************************************************/
-/*                   OGRGeoJSONGetOGRGeometryType()                     */
-/************************************************************************/
-
-OGRwkbGeometryType OGRGeoJSONGetOGRGeometryType(json_object *poObj)
-{
-    if (nullptr == poObj)
-        return wkbUnknown;
-
-    json_object *poObjType = CPL_json_object_object_get(poObj, "type");
-    if (nullptr == poObjType)
-        return wkbUnknown;
-
-    OGRwkbGeometryType eType = wkbUnknown;
-    const char *name = json_object_get_string(poObjType);
-    if (EQUAL(name, "Point"))
-        eType = wkbPoint;
-    else if (EQUAL(name, "LineString"))
-        eType = wkbLineString;
-    else if (EQUAL(name, "Polygon"))
-        eType = wkbPolygon;
-    else if (EQUAL(name, "MultiPoint"))
-        eType = wkbMultiPoint;
-    else if (EQUAL(name, "MultiLineString"))
-        eType = wkbMultiLineString;
-    else if (EQUAL(name, "MultiPolygon"))
-        eType = wkbMultiPolygon;
-    else if (EQUAL(name, "GeometryCollection"))
-        eType = wkbGeometryCollection;
-    else
-        return wkbUnknown;
-
-    json_object *poCoordinates;
-    if (eType == wkbGeometryCollection)
-    {
-        json_object *poGeometries =
-            CPL_json_object_object_get(poObj, "geometries");
-        if (poGeometries &&
-            json_object_get_type(poGeometries) == json_type_array &&
-            json_object_array_length(poGeometries) > 0)
-        {
-            if (OGR_GT_HasZ(OGRGeoJSONGetOGRGeometryType(
-                    json_object_array_get_idx(poGeometries, 0))))
-                eType = OGR_GT_SetZ(eType);
-        }
-    }
-    else
-    {
-        poCoordinates = CPL_json_object_object_get(poObj, "coordinates");
-        if (poCoordinates &&
-            json_object_get_type(poCoordinates) == json_type_array &&
-            json_object_array_length(poCoordinates) > 0)
-        {
-            while (true)
-            {
-                auto poChild = json_object_array_get_idx(poCoordinates, 0);
-                if (!(poChild &&
-                      json_object_get_type(poChild) == json_type_array &&
-                      json_object_array_length(poChild) > 0))
-                {
-                    if (json_object_array_length(poCoordinates) == 3)
-                        eType = OGR_GT_SetZ(eType);
-                    break;
-                }
-                poCoordinates = poChild;
-            }
-        }
-    }
-
-    return eType;
-}
-
-/************************************************************************/
-/*                           OGRGeoJSONReadGeometry                     */
-/************************************************************************/
-
-OGRGeometry *OGRGeoJSONReadGeometry(json_object *poObj,
-                                    OGRSpatialReference *poParentSRS)
-{
-
-    OGRGeometry *poGeometry = nullptr;
-    OGRSpatialReference *poSRS = nullptr;
-    lh_entry *entry = OGRGeoJSONFindMemberEntryByName(poObj, "crs");
-    if (entry != nullptr)
-    {
-        json_object *poObjSrs = (json_object *)entry->v;
-        if (poObjSrs != nullptr)
-        {
-            poSRS = OGRGeoJSONReadSpatialReference(poObj);
-        }
-    }
-
-    OGRSpatialReference *poSRSToAssign = nullptr;
-    if (entry != nullptr)
-    {
-        poSRSToAssign = poSRS;
-    }
-    else if (poParentSRS)
-    {
-        poSRSToAssign = poParentSRS;
-    }
-    else
-    {
-        // Assign WGS84 if no CRS defined on geometry.
-        poSRSToAssign = OGRSpatialReference::GetWGS84SRS();
-    }
-
-    GeoJSONObject::Type objType = OGRGeoJSONGetType(poObj);
-    if (GeoJSONObject::ePoint == objType)
-        poGeometry = OGRGeoJSONReadPoint(poObj);
-    else if (GeoJSONObject::eMultiPoint == objType)
-        poGeometry = OGRGeoJSONReadMultiPoint(poObj);
-    else if (GeoJSONObject::eLineString == objType)
-        poGeometry = OGRGeoJSONReadLineString(poObj);
-    else if (GeoJSONObject::eMultiLineString == objType)
-        poGeometry = OGRGeoJSONReadMultiLineString(poObj);
-    else if (GeoJSONObject::ePolygon == objType)
-        poGeometry = OGRGeoJSONReadPolygon(poObj);
-    else if (GeoJSONObject::eMultiPolygon == objType)
-        poGeometry = OGRGeoJSONReadMultiPolygon(poObj);
-    else if (GeoJSONObject::eGeometryCollection == objType)
-        poGeometry = OGRGeoJSONReadGeometryCollection(poObj, poSRSToAssign);
-    else
-    {
-        CPLDebug("GeoJSON", "Unsupported geometry type detected. "
-                            "Feature gets NULL geometry assigned.");
-    }
-
-    if (poGeometry && GeoJSONObject::eGeometryCollection != objType)
-        poGeometry->assignSpatialReference(poSRSToAssign);
-
-    if (poSRS)
-        poSRS->Release();
-
-    return poGeometry;
-}
-
-/************************************************************************/
-/*                        OGRGeoJSONGetCoordinate()                     */
-/************************************************************************/
-
-static double OGRGeoJSONGetCoordinate(json_object *poObj,
-                                      const char *pszCoordName, int nIndex,
-                                      bool &bValid)
-{
-    json_object *poObjCoord = json_object_array_get_idx(poObj, nIndex);
-    if (nullptr == poObjCoord)
-    {
-        CPLDebug("GeoJSON", "Point: got null object for %s.", pszCoordName);
-        bValid = false;
-        return 0.0;
-    }
-
-    const int iType = json_object_get_type(poObjCoord);
-    if (json_type_double != iType && json_type_int != iType)
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "Invalid '%s' coordinate. "
-                 "Type is not double or integer for \'%s\'.",
-                 pszCoordName, json_object_to_json_string(poObjCoord));
-        bValid = false;
-        return 0.0;
-    }
-
-    return json_object_get_double(poObjCoord);
-}
-
-/************************************************************************/
-/*                           OGRGeoJSONReadRawPoint                     */
-/************************************************************************/
-
-bool OGRGeoJSONReadRawPoint(json_object *poObj, OGRPoint &point)
-{
-    CPLAssert(nullptr != poObj);
-
-    if (json_type_array == json_object_get_type(poObj))
-    {
-        const auto nSize = json_object_array_length(poObj);
-
-        if (nSize < GeoJSONObject::eMinCoordinateDimension)
-        {
-            CPLDebug("GeoJSON", "Invalid coord dimension. "
-                                "At least 2 dimensions must be present.");
-            return false;
-        }
-
-        bool bValid = true;
-        const double dfX = OGRGeoJSONGetCoordinate(poObj, "x", 0, bValid);
-        const double dfY = OGRGeoJSONGetCoordinate(poObj, "y", 1, bValid);
-        point.setX(dfX);
-        point.setY(dfY);
-
-        // Read Z coordinate.
-        if (nSize >= GeoJSONObject::eMaxCoordinateDimension)
-        {
-            // Don't *expect* mixed-dimension geometries, although the
-            // spec doesn't explicitly forbid this.
-            const double dfZ = OGRGeoJSONGetCoordinate(poObj, "z", 2, bValid);
-            point.setZ(dfZ);
-        }
-        else
-        {
-            point.flattenTo2D();
-        }
-        return bValid;
-    }
-
-    return false;
-}
-
-/************************************************************************/
-/*                           OGRGeoJSONReadPoint                        */
-/************************************************************************/
-
-OGRPoint *OGRGeoJSONReadPoint(json_object *poObj)
-{
-    CPLAssert(nullptr != poObj);
-
-    json_object *poObjCoords = OGRGeoJSONFindMemberByName(poObj, "coordinates");
-    if (nullptr == poObjCoords)
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "Invalid Point object. Missing \'coordinates\' member.");
-        return nullptr;
-    }
-
-    OGRPoint *poPoint = new OGRPoint();
-    if (!OGRGeoJSONReadRawPoint(poObjCoords, *poPoint))
-    {
-        CPLDebug("GeoJSON", "Point: raw point parsing failure.");
-        delete poPoint;
-        return nullptr;
-    }
-
-    return poPoint;
-}
-
-/************************************************************************/
-/*                           OGRGeoJSONReadMultiPoint                   */
-/************************************************************************/
-
-OGRMultiPoint *OGRGeoJSONReadMultiPoint(json_object *poObj)
-{
-    CPLAssert(nullptr != poObj);
-
-    json_object *poObjPoints = OGRGeoJSONFindMemberByName(poObj, "coordinates");
-    if (nullptr == poObjPoints)
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "Invalid MultiPoint object. "
-                 "Missing \'coordinates\' member.");
-        return nullptr;
-    }
-
-    OGRMultiPoint *poMultiPoint = nullptr;
-    if (json_type_array == json_object_get_type(poObjPoints))
-    {
-        const auto nPoints = json_object_array_length(poObjPoints);
-
-        poMultiPoint = new OGRMultiPoint();
-
-        for (auto i = decltype(nPoints){0}; i < nPoints; ++i)
-        {
-            json_object *poObjCoords =
-                json_object_array_get_idx(poObjPoints, i);
-
-            OGRPoint pt;
-            if (poObjCoords != nullptr &&
-                !OGRGeoJSONReadRawPoint(poObjCoords, pt))
-            {
-                delete poMultiPoint;
-                CPLDebug("GeoJSON", "LineString: raw point parsing failure.");
-                return nullptr;
-            }
-            poMultiPoint->addGeometry(&pt);
-        }
-    }
-
-    return poMultiPoint;
-}
-
-/************************************************************************/
-/*                           OGRGeoJSONReadLineString                   */
-/************************************************************************/
-
-OGRLineString *OGRGeoJSONReadLineString(json_object *poObj, bool bRaw)
-{
-    CPLAssert(nullptr != poObj);
-
-    json_object *poObjPoints = nullptr;
-
-    if (!bRaw)
-    {
-        poObjPoints = OGRGeoJSONFindMemberByName(poObj, "coordinates");
-        if (nullptr == poObjPoints)
-        {
-            CPLError(CE_Failure, CPLE_AppDefined,
-                     "Invalid LineString object. "
-                     "Missing \'coordinates\' member.");
-            return nullptr;
-        }
-    }
-    else
-    {
-        poObjPoints = poObj;
-    }
-
-    OGRLineString *poLine = nullptr;
-
-    if (json_type_array == json_object_get_type(poObjPoints))
-    {
-        const auto nPoints = json_object_array_length(poObjPoints);
-
-        poLine = new OGRLineString();
-        poLine->setNumPoints(static_cast<int>(nPoints));
-
-        for (auto i = decltype(nPoints){0}; i < nPoints; ++i)
-        {
-            json_object *poObjCoords =
-                json_object_array_get_idx(poObjPoints, i);
-            if (poObjCoords == nullptr)
-            {
-                delete poLine;
-                CPLDebug("GeoJSON", "LineString: got null object.");
-                return nullptr;
-            }
-
-            OGRPoint pt;
-            if (!OGRGeoJSONReadRawPoint(poObjCoords, pt))
-            {
-                delete poLine;
-                CPLDebug("GeoJSON", "LineString: raw point parsing failure.");
-                return nullptr;
-            }
-            if (pt.getCoordinateDimension() == 2)
-            {
-                poLine->setPoint(static_cast<int>(i), pt.getX(), pt.getY());
-            }
-            else
-            {
-                poLine->setPoint(static_cast<int>(i), pt.getX(), pt.getY(),
-                                 pt.getZ());
-            }
-        }
-    }
-
-    return poLine;
-}
-
-/************************************************************************/
-/*                           OGRGeoJSONReadMultiLineString              */
-/************************************************************************/
-
-OGRMultiLineString *OGRGeoJSONReadMultiLineString(json_object *poObj)
-{
-    CPLAssert(nullptr != poObj);
-
-    json_object *poObjLines = OGRGeoJSONFindMemberByName(poObj, "coordinates");
-    if (nullptr == poObjLines)
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "Invalid MultiLineString object. "
-                 "Missing \'coordinates\' member.");
-        return nullptr;
-    }
-
-    OGRMultiLineString *poMultiLine = nullptr;
-
-    if (json_type_array == json_object_get_type(poObjLines))
-    {
-        const auto nLines = json_object_array_length(poObjLines);
-
-        poMultiLine = new OGRMultiLineString();
-
-        for (auto i = decltype(nLines){0}; i < nLines; ++i)
-        {
-            json_object *poObjLine = json_object_array_get_idx(poObjLines, i);
-
-            OGRLineString *poLine;
-            if (poObjLine != nullptr)
-                poLine = OGRGeoJSONReadLineString(poObjLine, true);
-            else
-                poLine = new OGRLineString();
-
-            if (nullptr != poLine)
-            {
-                poMultiLine->addGeometryDirectly(poLine);
-            }
-        }
-    }
-
-    return poMultiLine;
-}
-
-/************************************************************************/
-/*                           OGRGeoJSONReadLinearRing                   */
-/************************************************************************/
-
-OGRLinearRing *OGRGeoJSONReadLinearRing(json_object *poObj)
-{
-    CPLAssert(nullptr != poObj);
-
-    OGRLinearRing *poRing = nullptr;
-
-    if (json_type_array == json_object_get_type(poObj))
-    {
-        const auto nPoints = json_object_array_length(poObj);
-
-        poRing = new OGRLinearRing();
-        poRing->setNumPoints(static_cast<int>(nPoints));
-
-        for (auto i = decltype(nPoints){0}; i < nPoints; ++i)
-        {
-            json_object *poObjCoords = json_object_array_get_idx(poObj, i);
-            if (poObjCoords == nullptr)
-            {
-                delete poRing;
-                CPLDebug("GeoJSON", "LinearRing: got null object.");
-                return nullptr;
-            }
-
-            OGRPoint pt;
-            if (!OGRGeoJSONReadRawPoint(poObjCoords, pt))
-            {
-                delete poRing;
-                CPLDebug("GeoJSON", "LinearRing: raw point parsing failure.");
-                return nullptr;
-            }
-
-            if (2 == pt.getCoordinateDimension())
-                poRing->setPoint(static_cast<int>(i), pt.getX(), pt.getY());
-            else
-                poRing->setPoint(static_cast<int>(i), pt.getX(), pt.getY(),
-                                 pt.getZ());
-        }
-    }
-
-    return poRing;
-}
-
-/************************************************************************/
-/*                           OGRGeoJSONReadPolygon                      */
+/*                          OGRGeoJSONGetExtent3D()                     */
 /************************************************************************/
 
-OGRPolygon *OGRGeoJSONReadPolygon(json_object *poObj, bool bRaw)
-{
-    CPLAssert(nullptr != poObj);
-
-    json_object *poObjRings = nullptr;
-
-    if (!bRaw)
-    {
-        poObjRings = OGRGeoJSONFindMemberByName(poObj, "coordinates");
-        if (nullptr == poObjRings)
-        {
-            CPLError(CE_Failure, CPLE_AppDefined,
-                     "Invalid Polygon object. "
-                     "Missing \'coordinates\' member.");
-            return nullptr;
-        }
-    }
-    else
-    {
-        poObjRings = poObj;
-    }
-
-    OGRPolygon *poPolygon = nullptr;
-
-    if (json_type_array == json_object_get_type(poObjRings))
-    {
-        const auto nRings = json_object_array_length(poObjRings);
-        if (nRings > 0)
-        {
-            json_object *poObjPoints = json_object_array_get_idx(poObjRings, 0);
-            if (poObjPoints == nullptr)
-            {
-                poPolygon = new OGRPolygon();
-            }
-            else
-            {
-                OGRLinearRing *poRing = OGRGeoJSONReadLinearRing(poObjPoints);
-                if (nullptr != poRing)
-                {
-                    poPolygon = new OGRPolygon();
-                    poPolygon->addRingDirectly(poRing);
-                }
-            }
-
-            for (auto i = decltype(nRings){1};
-                 i < nRings && nullptr != poPolygon; ++i)
-            {
-                poObjPoints = json_object_array_get_idx(poObjRings, i);
-                if (poObjPoints != nullptr)
-                {
-                    OGRLinearRing *poRing =
-                        OGRGeoJSONReadLinearRing(poObjPoints);
-                    if (nullptr != poRing)
-                    {
-                        poPolygon->addRingDirectly(poRing);
-                    }
-                }
-            }
-        }
-        else
-        {
-            poPolygon = new OGRPolygon();
-        }
-    }
-
-    return poPolygon;
-}
-
-/************************************************************************/
-/*                           OGRGeoJSONReadMultiPolygon                 */
-/************************************************************************/
-
-OGRMultiPolygon *OGRGeoJSONReadMultiPolygon(json_object *poObj)
-{
-    CPLAssert(nullptr != poObj);
-
-    json_object *poObjPolys = OGRGeoJSONFindMemberByName(poObj, "coordinates");
-    if (nullptr == poObjPolys)
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "Invalid MultiPolygon object. "
-                 "Missing \'coordinates\' member.");
-        return nullptr;
-    }
-
-    OGRMultiPolygon *poMultiPoly = nullptr;
-
-    if (json_type_array == json_object_get_type(poObjPolys))
-    {
-        const auto nPolys = json_object_array_length(poObjPolys);
-
-        poMultiPoly = new OGRMultiPolygon();
-
-        for (auto i = decltype(nPolys){0}; i < nPolys; ++i)
-        {
-            json_object *poObjPoly = json_object_array_get_idx(poObjPolys, i);
-            if (poObjPoly == nullptr)
-            {
-                poMultiPoly->addGeometryDirectly(new OGRPolygon());
-            }
-            else
-            {
-                OGRPolygon *poPoly = OGRGeoJSONReadPolygon(poObjPoly, true);
-                if (nullptr != poPoly)
-                {
-                    poMultiPoly->addGeometryDirectly(poPoly);
-                }
-            }
-        }
-    }
-
-    return poMultiPoly;
-}
-
-/************************************************************************/
-/*                           OGRGeoJSONReadGeometryCollection           */
-/************************************************************************/
-
-OGRGeometryCollection *
-OGRGeoJSONReadGeometryCollection(json_object *poObj, OGRSpatialReference *poSRS)
-{
-    CPLAssert(nullptr != poObj);
-
-    json_object *poObjGeoms = OGRGeoJSONFindMemberByName(poObj, "geometries");
-    if (nullptr == poObjGeoms)
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "Invalid GeometryCollection object. "
-                 "Missing \'geometries\' member.");
-        return nullptr;
-    }
-
-    OGRGeometryCollection *poCollection = nullptr;
-
-    if (json_type_array == json_object_get_type(poObjGeoms))
-    {
-        poCollection = new OGRGeometryCollection();
-        poCollection->assignSpatialReference(poSRS);
-
-        const auto nGeoms = json_object_array_length(poObjGeoms);
-        for (auto i = decltype(nGeoms){0}; i < nGeoms; ++i)
-        {
-            json_object *poObjGeom = json_object_array_get_idx(poObjGeoms, i);
-            if (poObjGeom == nullptr)
-            {
-                CPLDebug("GeoJSON", "Skipping null sub-geometry");
-                continue;
-            }
-
-            OGRGeometry *poGeometry = OGRGeoJSONReadGeometry(poObjGeom, poSRS);
-            if (nullptr != poGeometry)
-            {
-                poCollection->addGeometryDirectly(poGeometry);
-            }
-        }
-    }
-
-    return poCollection;
-}
-
-/************************************************************************/
-/*                       OGR_G_CreateGeometryFromJson                   */
-/************************************************************************/
-
-/** Create a OGR geometry from a GeoJSON geometry object */
-OGRGeometryH OGR_G_CreateGeometryFromJson(const char *pszJson)
-{
-    if (nullptr == pszJson)
-    {
-        // Translation failed.
-        return nullptr;
-    }
-
-    json_object *poObj = nullptr;
-    if (!OGRJSonParse(pszJson, &poObj))
-        return nullptr;
-
-    OGRGeometry *poGeometry = OGRGeoJSONReadGeometry(poObj);
-
-    // Release JSON tree.
-    json_object_put(poObj);
-
-    return (OGRGeometryH)poGeometry;
-}
-
-/************************************************************************/
-/*                       json_ex_get_object_by_path()                   */
-/************************************************************************/
-
-json_object *json_ex_get_object_by_path(json_object *poObj, const char *pszPath)
-{
-    if (poObj == nullptr || json_object_get_type(poObj) != json_type_object ||
-        pszPath == nullptr || *pszPath == '\0')
-    {
-        return nullptr;
-    }
-    char **papszTokens = CSLTokenizeString2(pszPath, ".", 0);
-    for (int i = 0; papszTokens[i] != nullptr; i++)
-    {
-        poObj = CPL_json_object_object_get(poObj, papszTokens[i]);
-        if (poObj == nullptr)
-            break;
-        if (papszTokens[i + 1] != nullptr)
-        {
-            if (json_object_get_type(poObj) != json_type_object)
-            {
-                poObj = nullptr;
-                break;
-            }
-        }
-    }
-    CSLDestroy(papszTokens);
-    return poObj;
-}
-
-/************************************************************************/
-/*                             OGRJSonParse()                           */
-/************************************************************************/
-
-bool OGRJSonParse(const char *pszText, json_object **ppoObj, bool bVerboseError)
-{
-    if (ppoObj == nullptr)
-        return false;
-    json_tokener *jstok = json_tokener_new();
-    const int nLen = pszText == nullptr ? 0 : static_cast<int>(strlen(pszText));
-    *ppoObj = json_tokener_parse_ex(jstok, pszText, nLen);
-    if (jstok->err != json_tokener_success)
-    {
-        if (bVerboseError)
-        {
-            CPLError(CE_Failure, CPLE_AppDefined,
-                     "JSON parsing error: %s (at offset %d)",
-                     json_tokener_error_desc(jstok->err), jstok->char_offset);
-        }
-
-        json_tokener_free(jstok);
-        *ppoObj = nullptr;
-        return false;
-    }
-    json_tokener_free(jstok);
-    return true;
-}
-
-/************************************************************************/
-/*                    CPL_json_object_object_get()                      */
-/************************************************************************/
-
-// This is the same as json_object_object_get() except it will not raise
-// deprecation warning.
-
-json_object *CPL_json_object_object_get(struct json_object *obj,
-                                        const char *key)
-{
-    json_object *poRet = nullptr;
-    json_object_object_get_ex(obj, key, &poRet);
-    return poRet;
-}
-
 bool OGRGeoJSONGetExtent3D(json_object *poObj, OGREnvelope3D *poEnvelope)
 {
     if (!poEnvelope || !poObj)
diff --git a/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.h b/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.h
index d06457ca3bcb..e3f666e66eb5 100644
--- a/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.h
+++ b/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2007, Mateusz Loskot
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef OGR_GEOJSONREADER_H_INCLUDED
 #define OGR_GEOJSONREADER_H_INCLUDED
@@ -61,33 +45,6 @@ class OGRFeature;
 class OGRGeoJSONLayer;
 class OGRSpatialReference;
 
-/************************************************************************/
-/*                           GeoJSONObject                              */
-/************************************************************************/
-
-struct GeoJSONObject
-{
-    enum Type
-    {
-        eUnknown = wkbUnknown,  // non-GeoJSON properties
-        ePoint = wkbPoint,
-        eLineString = wkbLineString,
-        ePolygon = wkbPolygon,
-        eMultiPoint = wkbMultiPoint,
-        eMultiLineString = wkbMultiLineString,
-        eMultiPolygon = wkbMultiPolygon,
-        eGeometryCollection = wkbGeometryCollection,
-        eFeature,
-        eFeatureCollection
-    };
-
-    enum CoordinateDimension
-    {
-        eMinCoordinateDimension = 2,
-        eMaxCoordinateDimension = 3
-    };
-};
-
 /************************************************************************/
 /*                        OGRGeoJSONBaseReader                          */
 /************************************************************************/
@@ -258,21 +215,6 @@ void OGRGeoJSONReaderAddOrUpdateField(
 /*                 GeoJSON Parsing Utilities                            */
 /************************************************************************/
 
-lh_entry *OGRGeoJSONFindMemberEntryByName(json_object *poObj,
-                                          const char *pszName);
-json_object *OGRGeoJSONFindMemberByName(json_object *poObj,
-                                        const char *pszName);
-GeoJSONObject::Type OGRGeoJSONGetType(json_object *poObj);
-
-json_object CPL_DLL *json_ex_get_object_by_path(json_object *poObj,
-                                                const char *pszPath);
-
-json_object CPL_DLL *CPL_json_object_object_get(struct json_object *obj,
-                                                const char *key);
-
-bool CPL_DLL OGRJSonParse(const char *pszText, json_object **ppoObj,
-                          bool bVerboseError = true);
-
 bool OGRGeoJSONUpdateLayerGeomType(bool &bFirstGeom,
                                    OGRwkbGeometryType eGeomType,
                                    OGRwkbGeometryType &eLayerGeomType);
@@ -280,28 +222,6 @@ bool OGRGeoJSONUpdateLayerGeomType(bool &bFirstGeom,
 // Get the 3D extent from the geometry coordinates of a feature
 bool OGRGeoJSONGetExtent3D(json_object *poObj, OGREnvelope3D *poEnvelope);
 
-/************************************************************************/
-/*                 GeoJSON Geometry Translators                         */
-/************************************************************************/
-
-OGRwkbGeometryType OGRGeoJSONGetOGRGeometryType(json_object *poObj);
-
-bool OGRGeoJSONReadRawPoint(json_object *poObj, OGRPoint &point);
-OGRGeometry CPL_DLL *
-OGRGeoJSONReadGeometry(json_object *poObj,
-                       OGRSpatialReference *poParentSRS = nullptr);
-OGRPoint *OGRGeoJSONReadPoint(json_object *poObj);
-OGRMultiPoint *OGRGeoJSONReadMultiPoint(json_object *poObj);
-OGRLineString *OGRGeoJSONReadLineString(json_object *poObj, bool bRaw = false);
-OGRMultiLineString *OGRGeoJSONReadMultiLineString(json_object *poObj);
-OGRLinearRing *OGRGeoJSONReadLinearRing(json_object *poObj);
-OGRPolygon *OGRGeoJSONReadPolygon(json_object *poObj, bool bRaw = false);
-OGRMultiPolygon *OGRGeoJSONReadMultiPolygon(json_object *poObj);
-OGRGeometryCollection *
-OGRGeoJSONReadGeometryCollection(json_object *poObj,
-                                 OGRSpatialReference *poSRS = nullptr);
-OGRSpatialReference *OGRGeoJSONReadSpatialReference(json_object *poObj);
-
 /************************************************************************/
 /*                          OGRESRIJSONReader                           */
 /************************************************************************/
@@ -341,14 +261,6 @@ class OGRESRIJSONReader
     OGRGeoJSONLayer *ReadFeatureCollection(json_object *poObj);
 };
 
-OGRGeometry *OGRESRIJSONReadGeometry(json_object *poObj);
-OGRSpatialReference *OGRESRIJSONReadSpatialReference(json_object *poObj);
-OGRwkbGeometryType OGRESRIJSONGetGeometryType(json_object *poObj);
-OGRPoint *OGRESRIJSONReadPoint(json_object *poObj);
-OGRGeometry *OGRESRIJSONReadLineString(json_object *poObj);
-OGRGeometry *OGRESRIJSONReadPolygon(json_object *poObj);
-OGRMultiPoint *OGRESRIJSONReadMultiPoint(json_object *poObj);
-
 /************************************************************************/
 /*                          OGRTopoJSONReader                           */
 /************************************************************************/
diff --git a/ogr/ogrsf_frmts/geojson/ogrgeojsonseqdriver.cpp b/ogr/ogrsf_frmts/geojson/ogrgeojsonseqdriver.cpp
index cb7b008e0ada..9667db12b3dc 100644
--- a/ogr/ogrsf_frmts/geojson/ogrgeojsonseqdriver.cpp
+++ b/ogr/ogrsf_frmts/geojson/ogrgeojsonseqdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -32,8 +16,10 @@
 #include "cpl_vsi_error.h"
 
 #include "ogr_geojson.h"
+#include "ogrlibjsonutils.h"
 #include "ogrgeojsonreader.h"
 #include "ogrgeojsonwriter.h"
+#include "ogrgeojsongeometry.h"
 
 #include <algorithm>
 #include <memory>
@@ -349,6 +335,8 @@ OGRGeoJSONSeqLayer::OGRGeoJSONSeqLayer(
         OGRSpatialReference::GetWGS84SRS());
     m_poCT = std::move(poCT);
 
+    m_oWriteOptions.bWriteBBOX =
+        CPLTestBool(CSLFetchNameValueDef(papszOptions, "WRITE_BBOX", "FALSE"));
     m_oWriteOptions.SetRFC7946Settings();
     m_oWriteOptions.SetIDOptions(papszOptions);
 
@@ -573,7 +561,7 @@ json_object *OGRGeoJSONSeqLayer::GetNextObject(bool bLooseIdentification)
                (m_osFeatureBuffer.back() == '\r' ||
                 m_osFeatureBuffer.back() == '\n'))
         {
-            m_osFeatureBuffer.resize(m_osFeatureBuffer.size() - 1);
+            m_osFeatureBuffer.pop_back();
         }
         if (!m_osFeatureBuffer.empty())
         {
@@ -816,7 +804,7 @@ bool OGRGeoJSONSeqDataSource::Open(GDALOpenInfo *poOpenInfo,
         if (poOpenInfo->eAccess == GA_Update)
             return false;
 
-        m_osTmpFile = CPLSPrintf("/vsimem/geojsonseq/%p", this);
+        m_osTmpFile = VSIMemGenerateHiddenFilename("geojsonseq");
         m_fp = VSIFileFromMemBuffer(
             m_osTmpFile.c_str(),
             reinterpret_cast<GByte *>(CPLStrdup(poOpenInfo->pszFilename)),
@@ -831,7 +819,8 @@ bool OGRGeoJSONSeqDataSource::Open(GDALOpenInfo *poOpenInfo,
             OGRGeoJSONDriverStealStoredContent(pszUnprefixedFilename);
         if (pszStoredContent)
         {
-            if (!GeoJSONSeqIsObject(pszStoredContent))
+            if (EQUAL(pszStoredContent, INVALID_CONTENT_FOR_JSON_LIKE) ||
+                !GeoJSONSeqIsObject(pszStoredContent, poOpenInfo))
             {
                 OGRGeoJSONDriverStoreContent(poOpenInfo->pszFilename,
                                              pszStoredContent);
@@ -839,7 +828,7 @@ bool OGRGeoJSONSeqDataSource::Open(GDALOpenInfo *poOpenInfo,
             }
             else
             {
-                m_osTmpFile = CPLSPrintf("/vsimem/geojsonseq/%p", this);
+                m_osTmpFile = VSIMemGenerateHiddenFilename("geojsonseq");
                 m_fp = VSIFileFromMemBuffer(
                     m_osTmpFile.c_str(),
                     reinterpret_cast<GByte *>(pszStoredContent),
@@ -870,7 +859,7 @@ bool OGRGeoJSONSeqDataSource::Open(GDALOpenInfo *poOpenInfo,
                 return false;
             }
 
-            m_osTmpFile = CPLSPrintf("/vsimem/geojsonseq/%p", this);
+            m_osTmpFile = VSIMemGenerateHiddenFilename("geojsonseq");
             m_fp = VSIFileFromMemBuffer(m_osTmpFile.c_str(), pResult->pabyData,
                                         pResult->nDataLen, true);
             pResult->pabyData = nullptr;
@@ -953,10 +942,14 @@ static int OGRGeoJSONSeqDriverIdentifyInternal(GDALOpenInfo *poOpenInfo,
     nSrcType = GeoJSONSeqGetSourceType(poOpenInfo);
     if (nSrcType == eGeoJSONSourceUnknown)
         return FALSE;
-    if (nSrcType == eGeoJSONSourceService &&
-        !STARTS_WITH_CI(poOpenInfo->pszFilename, "GeoJSONSeq:"))
+    if (nSrcType == eGeoJSONSourceService)
     {
-        return -1;
+        if (poOpenInfo->IsSingleAllowedDriver("GeoJSONSeq"))
+            return TRUE;
+        if (!STARTS_WITH_CI(poOpenInfo->pszFilename, "GeoJSONSeq:"))
+        {
+            return -1;
+        }
     }
     return TRUE;
 }
@@ -1052,6 +1045,9 @@ void RegisterOGRGeoJSONSeq()
         "    <Value>String</Value>"
         "    <Value>Integer</Value>"
         "  </Option>"
+        "  <Option name='WRITE_BBOX' type='boolean' description='whether to "
+        "write a bbox property with the bounding box of each geometry' "
+        "default='NO'/>"
         "</LayerCreationOptionList>");
 
     poDriver->SetMetadataItem(GDAL_DCAP_VIRTUALIO, "YES");
diff --git a/ogr/ogrsf_frmts/geojson/ogrgeojsonutils.cpp b/ogr/ogrsf_frmts/geojson/ogrgeojsonutils.cpp
index 4ec6ba2b3ae6..7a11bc180ecb 100644
--- a/ogr/ogrsf_frmts/geojson/ogrgeojsonutils.cpp
+++ b/ogr/ogrsf_frmts/geojson/ogrgeojsonutils.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2007, Mateusz Loskot
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrgeojsonutils.h"
@@ -38,9 +22,24 @@
 #include <algorithm>
 #include <memory>
 
-const char szESRIJSonPotentialStart1[] =
+const char szESRIJSonFeaturesGeometryRings[] =
     "{\"features\":[{\"geometry\":{\"rings\":[";
 
+// Cf https://github.com/OSGeo/gdal/issues/9996#issuecomment-2129845692
+const char szESRIJSonFeaturesAttributes[] = "{\"features\":[{\"attributes\":{";
+
+/************************************************************************/
+/*                           SkipUTF8BOM()                              */
+/************************************************************************/
+
+static void SkipUTF8BOM(const char *&pszText)
+{
+    /* Skip UTF-8 BOM (#5630) */
+    const GByte *pabyData = reinterpret_cast<const GByte *>(pszText);
+    if (pabyData[0] == 0xEF && pabyData[1] == 0xBB && pabyData[2] == 0xBF)
+        pszText += 3;
+}
+
 /************************************************************************/
 /*                           IsJSONObject()                             */
 /************************************************************************/
@@ -50,10 +49,7 @@ static bool IsJSONObject(const char *pszText)
     if (nullptr == pszText)
         return false;
 
-    /* Skip UTF-8 BOM (#5630) */
-    const GByte *pabyData = reinterpret_cast<const GByte *>(pszText);
-    if (pabyData[0] == 0xEF && pabyData[1] == 0xBB && pabyData[2] == 0xBF)
-        pszText += 3;
+    SkipUTF8BOM(pszText);
 
     /* -------------------------------------------------------------------- */
     /*      This is a primitive test, but we need to perform it fast.       */
@@ -78,30 +74,71 @@ static bool IsJSONObject(const char *pszText)
 }
 
 /************************************************************************/
-/*                           IsTypeSomething()                          */
+/*                           GetTopLevelType()                          */
 /************************************************************************/
 
-static bool IsTypeSomething(const char *pszText, const char *pszTypeValue)
+static std::string GetTopLevelType(const char *pszText)
 {
-    const char *pszIter = pszText;
-    while (true)
+    if (!strstr(pszText, "\"type\""))
+        return std::string();
+
+    SkipUTF8BOM(pszText);
+
+    struct MyParser : public CPLJSonStreamingParser
     {
-        pszIter = strstr(pszIter, "\"type\"");
-        if (pszIter == nullptr)
-            return false;
-        pszIter += strlen("\"type\"");
-        while (isspace(static_cast<unsigned char>(*pszIter)))
-            pszIter++;
-        if (*pszIter != ':')
-            return false;
-        pszIter++;
-        while (isspace(static_cast<unsigned char>(*pszIter)))
-            pszIter++;
-        CPLString osValue;
-        osValue.Printf("\"%s\"", pszTypeValue);
-        if (STARTS_WITH(pszIter, osValue.c_str()))
-            return true;
-    }
+        std::string m_osLevel{};
+        bool m_bInTopLevelType = false;
+        std::string m_osTopLevelTypeValue{};
+
+        void StartObjectMember(const char *pszKey, size_t nLength) override
+        {
+            m_bInTopLevelType = false;
+            if (nLength == strlen("type") && strcmp(pszKey, "type") == 0 &&
+                m_osLevel == "{")
+            {
+                m_bInTopLevelType = true;
+            }
+        }
+
+        void String(const char *pszValue, size_t nLength) override
+        {
+            if (m_bInTopLevelType)
+            {
+                m_osTopLevelTypeValue.assign(pszValue, nLength);
+                StopParsing();
+            }
+        }
+
+        void StartObject() override
+        {
+            m_osLevel += '{';
+            m_bInTopLevelType = false;
+        }
+
+        void EndObject() override
+        {
+            if (!m_osLevel.empty())
+                m_osLevel.pop_back();
+            m_bInTopLevelType = false;
+        }
+
+        void StartArray() override
+        {
+            m_osLevel += '[';
+            m_bInTopLevelType = false;
+        }
+
+        void EndArray() override
+        {
+            if (!m_osLevel.empty())
+                m_osLevel.pop_back();
+            m_bInTopLevelType = false;
+        }
+    };
+
+    MyParser oParser;
+    oParser.Parse(pszText, strlen(pszText), true);
+    return oParser.m_osTopLevelTypeValue;
 }
 
 /************************************************************************/
@@ -157,8 +194,8 @@ static CPLString GetCompactJSon(const char *pszText, size_t nMaxSize)
 /************************************************************************/
 
 static bool IsGeoJSONLikeObject(const char *pszText, bool &bMightBeSequence,
-                                bool &bReadMoreBytes,
-                                CSLConstList papszAllowedDrivers)
+                                bool &bReadMoreBytes, GDALOpenInfo *poOpenInfo,
+                                const char *pszExpectedDriverName)
 {
     bMightBeSequence = false;
     bReadMoreBytes = false;
@@ -166,24 +203,32 @@ static bool IsGeoJSONLikeObject(const char *pszText, bool &bMightBeSequence,
     if (!IsJSONObject(pszText))
         return false;
 
-    if (IsTypeSomething(pszText, "Topology"))
+    const std::string osTopLevelType = GetTopLevelType(pszText);
+    if (osTopLevelType == "Topology")
         return false;
 
-    if ((!papszAllowedDrivers ||
-         CSLFindString(papszAllowedDrivers, "JSONFG") >= 0) &&
-        GDALGetDriverByName("JSONFG") && JSONFGIsObject(pszText))
+    if (poOpenInfo->IsSingleAllowedDriver(pszExpectedDriverName) &&
+        GDALGetDriverByName(pszExpectedDriverName))
+    {
+        return true;
+    }
+
+    if ((!poOpenInfo->papszAllowedDrivers ||
+         CSLFindString(poOpenInfo->papszAllowedDrivers, "JSONFG") >= 0) &&
+        GDALGetDriverByName("JSONFG") && JSONFGIsObject(pszText, poOpenInfo))
     {
         return false;
     }
 
-    if (IsTypeSomething(pszText, "FeatureCollection"))
+    if (osTopLevelType == "FeatureCollection")
     {
         return true;
     }
 
-    CPLString osWithoutSpace = GetCompactJSon(pszText, strlen(pszText));
+    const std::string osWithoutSpace = GetCompactJSon(pszText, strlen(pszText));
     if (osWithoutSpace.find("{\"features\":[") == 0 &&
-        osWithoutSpace.find(szESRIJSonPotentialStart1) != 0)
+        osWithoutSpace.find(szESRIJSonFeaturesGeometryRings) != 0 &&
+        osWithoutSpace.find(szESRIJSonFeaturesAttributes) != 0)
     {
         return true;
     }
@@ -196,7 +241,7 @@ static bool IsGeoJSONLikeObject(const char *pszText, bool &bMightBeSequence,
     // "{"bbox":...,"features":[..."
     if (osWithoutSpace.find(",\"features\":[") != std::string::npos)
     {
-        return !ESRIJSONIsObject(pszText);
+        return !ESRIJSONIsObject(pszText, poOpenInfo);
     }
 
     // See https://github.com/OSGeo/gdal/issues/2720
@@ -207,14 +252,11 @@ static bool IsGeoJSONLikeObject(const char *pszText, bool &bMightBeSequence,
         return true;
     }
 
-    if (IsTypeSomething(pszText, "Feature") ||
-        IsTypeSomething(pszText, "Point") ||
-        IsTypeSomething(pszText, "LineString") ||
-        IsTypeSomething(pszText, "Polygon") ||
-        IsTypeSomething(pszText, "MultiPoint") ||
-        IsTypeSomething(pszText, "MultiLineString") ||
-        IsTypeSomething(pszText, "MultiPolygon") ||
-        IsTypeSomething(pszText, "GeometryCollection"))
+    if (osTopLevelType == "Feature" || osTopLevelType == "Point" ||
+        osTopLevelType == "LineString" || osTopLevelType == "Polygon" ||
+        osTopLevelType == "MultiPoint" || osTopLevelType == "MultiLineString" ||
+        osTopLevelType == "MultiPolygon" ||
+        osTopLevelType == "GeometryCollection")
     {
         bMightBeSequence = true;
         return true;
@@ -231,23 +273,30 @@ static bool IsGeoJSONLikeObject(const char *pszText, bool &bMightBeSequence,
     return false;
 }
 
-static bool IsGeoJSONLikeObject(const char *pszText)
+static bool IsGeoJSONLikeObject(const char *pszText, GDALOpenInfo *poOpenInfo,
+                                const char *pszExpectedDriverName)
 {
     bool bMightBeSequence;
     bool bReadMoreBytes;
     return IsGeoJSONLikeObject(pszText, bMightBeSequence, bReadMoreBytes,
-                               nullptr);
+                               poOpenInfo, pszExpectedDriverName);
 }
 
 /************************************************************************/
 /*                       ESRIJSONIsObject()                             */
 /************************************************************************/
 
-bool ESRIJSONIsObject(const char *pszText)
+bool ESRIJSONIsObject(const char *pszText, GDALOpenInfo *poOpenInfo)
 {
     if (!IsJSONObject(pszText))
         return false;
 
+    if (poOpenInfo->IsSingleAllowedDriver("ESRIJSON") &&
+        GDALGetDriverByName("ESRIJSON"))
+    {
+        return true;
+    }
+
     if (  // ESRI Json geometry
         (strstr(pszText, "\"geometryType\"") != nullptr &&
          strstr(pszText, "\"esriGeometry") != nullptr)
@@ -262,9 +311,11 @@ bool ESRIJSONIsObject(const char *pszText)
         return true;
     }
 
-    CPLString osWithoutSpace =
-        GetCompactJSon(pszText, strlen(szESRIJSonPotentialStart1));
-    if (osWithoutSpace.find(szESRIJSonPotentialStart1) == 0)
+    const std::string osWithoutSpace = GetCompactJSon(pszText, strlen(pszText));
+    if (osWithoutSpace.find(szESRIJSonFeaturesGeometryRings) == 0 ||
+        osWithoutSpace.find(szESRIJSonFeaturesAttributes) == 0 ||
+        osWithoutSpace.find("\"spatialReference\":{\"wkid\":") !=
+            std::string::npos)
     {
         return true;
     }
@@ -276,21 +327,27 @@ bool ESRIJSONIsObject(const char *pszText)
 /*                       TopoJSONIsObject()                             */
 /************************************************************************/
 
-bool TopoJSONIsObject(const char *pszText)
+bool TopoJSONIsObject(const char *pszText, GDALOpenInfo *poOpenInfo)
 {
     if (!IsJSONObject(pszText))
         return false;
 
-    return IsTypeSomething(pszText, "Topology");
+    if (poOpenInfo->IsSingleAllowedDriver("TopoJSON") &&
+        GDALGetDriverByName("TopoJSON"))
+    {
+        return true;
+    }
+
+    return GetTopLevelType(pszText) == "Topology";
 }
 
 /************************************************************************/
 /*                      IsLikelyNewlineSequenceGeoJSON()                */
 /************************************************************************/
 
-static bool IsLikelyNewlineSequenceGeoJSON(VSILFILE *fpL,
-                                           const GByte *pabyHeader,
-                                           const char *pszFileContent)
+static GDALIdentifyEnum
+IsLikelyNewlineSequenceGeoJSON(VSILFILE *fpL, const GByte *pabyHeader,
+                               const char *pszFileContent)
 {
     const size_t nBufferSize = 4096 * 10;
     std::vector<GByte> abyBuffer;
@@ -299,7 +356,6 @@ static bool IsLikelyNewlineSequenceGeoJSON(VSILFILE *fpL,
     int nCurlLevel = 0;
     bool bInString = false;
     bool bLastIsEscape = false;
-    bool bCompatibleOfSequence = true;
     bool bFirstIter = true;
     bool bEOLFound = false;
     int nCountObject = 0;
@@ -345,8 +401,7 @@ static bool IsLikelyNewlineSequenceGeoJSON(VSILFILE *fpL,
                 }
                 else if (!isspace(static_cast<unsigned char>(abyBuffer[i])))
                 {
-                    bCompatibleOfSequence = false;
-                    break;
+                    return GDAL_IDENTIFY_FALSE;
                 }
             }
             else if (bInString)
@@ -377,10 +432,12 @@ static bool IsLikelyNewlineSequenceGeoJSON(VSILFILE *fpL,
                 nCurlLevel--;
             }
         }
-        if (!fpL || bEnd || !bCompatibleOfSequence || nCountObject == 2)
+        if (!fpL || bEnd || nCountObject == 2)
             break;
     }
-    return bCompatibleOfSequence && bEOLFound && nCountObject == 2;
+    if (bEOLFound && nCountObject == 2)
+        return GDAL_IDENTIFY_TRUE;
+    return GDAL_IDENTIFY_UNKNOWN;
 }
 
 /************************************************************************/
@@ -402,40 +459,40 @@ static bool GeoJSONFileIsObject(GDALOpenInfo *poOpenInfo)
     bool bReadMoreBytes = false;
     if (!IsGeoJSONLikeObject(
             reinterpret_cast<const char *>(poOpenInfo->pabyHeader),
-            bMightBeSequence, bReadMoreBytes, poOpenInfo->papszAllowedDrivers))
+            bMightBeSequence, bReadMoreBytes, poOpenInfo, "GeoJSON"))
     {
         if (!(bReadMoreBytes && poOpenInfo->nHeaderBytes >= 6000 &&
               poOpenInfo->TryToIngest(1000 * 1000) &&
               !IsGeoJSONLikeObject(
                   reinterpret_cast<const char *>(poOpenInfo->pabyHeader),
-                  bMightBeSequence, bReadMoreBytes,
-                  poOpenInfo->papszAllowedDrivers)))
+                  bMightBeSequence, bReadMoreBytes, poOpenInfo, "GeoJSON")))
         {
             return false;
         }
     }
 
-    return !(bMightBeSequence &&
-             IsLikelyNewlineSequenceGeoJSON(poOpenInfo->fpL,
-                                            poOpenInfo->pabyHeader, nullptr));
+    return !(bMightBeSequence && IsLikelyNewlineSequenceGeoJSON(
+                                     poOpenInfo->fpL, poOpenInfo->pabyHeader,
+                                     nullptr) == GDAL_IDENTIFY_TRUE);
 }
 
 /************************************************************************/
 /*                           GeoJSONIsObject()                          */
 /************************************************************************/
 
-bool GeoJSONIsObject(const char *pszText, CSLConstList papszAllowedDrivers)
+bool GeoJSONIsObject(const char *pszText, GDALOpenInfo *poOpenInfo)
 {
     bool bMightBeSequence = false;
     bool bReadMoreBytes = false;
     if (!IsGeoJSONLikeObject(pszText, bMightBeSequence, bReadMoreBytes,
-                             papszAllowedDrivers))
+                             poOpenInfo, "GeoJSON"))
     {
         return false;
     }
 
     return !(bMightBeSequence &&
-             IsLikelyNewlineSequenceGeoJSON(nullptr, nullptr, pszText));
+             IsLikelyNewlineSequenceGeoJSON(nullptr, nullptr, pszText) ==
+                 GDAL_IDENTIFY_TRUE);
 }
 
 /************************************************************************/
@@ -456,44 +513,60 @@ static bool GeoJSONSeqFileIsObject(GDALOpenInfo *poOpenInfo)
     const char *pszText =
         reinterpret_cast<const char *>(poOpenInfo->pabyHeader);
     if (pszText[0] == '\x1e')
-        return IsGeoJSONLikeObject(pszText + 1);
+        return IsGeoJSONLikeObject(pszText + 1, poOpenInfo, "GeoJSONSeq");
 
     bool bMightBeSequence = false;
     bool bReadMoreBytes = false;
     if (!IsGeoJSONLikeObject(pszText, bMightBeSequence, bReadMoreBytes,
-                             poOpenInfo->papszAllowedDrivers))
+                             poOpenInfo, "GeoJSONSeq"))
     {
         if (!(bReadMoreBytes && poOpenInfo->nHeaderBytes >= 6000 &&
               poOpenInfo->TryToIngest(1000 * 1000) &&
               IsGeoJSONLikeObject(
                   reinterpret_cast<const char *>(poOpenInfo->pabyHeader),
-                  bMightBeSequence, bReadMoreBytes,
-                  poOpenInfo->papszAllowedDrivers)))
+                  bMightBeSequence, bReadMoreBytes, poOpenInfo, "GeoJSONSeq")))
         {
             return false;
         }
     }
 
-    return bMightBeSequence &&
-           IsLikelyNewlineSequenceGeoJSON(poOpenInfo->fpL,
-                                          poOpenInfo->pabyHeader, nullptr);
+    if (poOpenInfo->IsSingleAllowedDriver("GeoJSONSeq") &&
+        IsLikelyNewlineSequenceGeoJSON(poOpenInfo->fpL, poOpenInfo->pabyHeader,
+                                       nullptr) != GDAL_IDENTIFY_FALSE &&
+        GDALGetDriverByName("GeoJSONSeq"))
+    {
+        return true;
+    }
+
+    return bMightBeSequence && IsLikelyNewlineSequenceGeoJSON(
+                                   poOpenInfo->fpL, poOpenInfo->pabyHeader,
+                                   nullptr) == GDAL_IDENTIFY_TRUE;
 }
 
-bool GeoJSONSeqIsObject(const char *pszText)
+bool GeoJSONSeqIsObject(const char *pszText, GDALOpenInfo *poOpenInfo)
 {
     if (pszText[0] == '\x1e')
-        return IsGeoJSONLikeObject(pszText + 1);
+        return IsGeoJSONLikeObject(pszText + 1, poOpenInfo, "GeoJSONSeq");
 
     bool bMightBeSequence = false;
     bool bReadMoreBytes = false;
     if (!IsGeoJSONLikeObject(pszText, bMightBeSequence, bReadMoreBytes,
-                             nullptr))
+                             poOpenInfo, "GeoJSONSeq"))
     {
         return false;
     }
 
+    if (poOpenInfo->IsSingleAllowedDriver("GeoJSONSeq") &&
+        IsLikelyNewlineSequenceGeoJSON(nullptr, nullptr, pszText) !=
+            GDAL_IDENTIFY_FALSE &&
+        GDALGetDriverByName("GeoJSONSeq"))
+    {
+        return true;
+    }
+
     return bMightBeSequence &&
-           IsLikelyNewlineSequenceGeoJSON(nullptr, nullptr, pszText);
+           IsLikelyNewlineSequenceGeoJSON(nullptr, nullptr, pszText) ==
+               GDAL_IDENTIFY_TRUE;
 }
 
 /************************************************************************/
@@ -510,14 +583,20 @@ static bool JSONFGFileIsObject(GDALOpenInfo *poOpenInfo)
 
     const char *pszText =
         reinterpret_cast<const char *>(poOpenInfo->pabyHeader);
-    return JSONFGIsObject(pszText);
+    return JSONFGIsObject(pszText, poOpenInfo);
 }
 
-bool JSONFGIsObject(const char *pszText)
+bool JSONFGIsObject(const char *pszText, GDALOpenInfo *poOpenInfo)
 {
     if (!IsJSONObject(pszText))
         return false;
 
+    if (poOpenInfo->IsSingleAllowedDriver("JSONFG") &&
+        GDALGetDriverByName("JSONFG"))
+    {
+        return true;
+    }
+
     const std::string osWithoutSpace = GetCompactJSon(pszText, strlen(pszText));
 
     // In theory, conformsTo should be required, but let be lax...
@@ -628,7 +707,9 @@ static bool IsLikelyESRIJSONURL(const char *pszURL)
 {
     // URLs with f=json are strong candidates for ESRI JSON services
     // except if they have "/items?", in which case they are likely OAPIF
-    return strstr(pszURL, "f=json") != nullptr &&
+    return (strstr(pszURL, "f=json") != nullptr ||
+            strstr(pszURL, "f=pjson") != nullptr ||
+            strstr(pszURL, "resultRecordCount=") != nullptr) &&
            strstr(pszURL, "/items?") == nullptr;
 }
 
@@ -653,6 +734,10 @@ GeoJSONSourceType GeoJSONGetSourceType(GDALOpenInfo *poOpenInfo)
              STARTS_WITH_CI(poOpenInfo->pszFilename, "https://") ||
              STARTS_WITH_CI(poOpenInfo->pszFilename, "ftp://"))
     {
+        if (poOpenInfo->IsSingleAllowedDriver("GeoJSON"))
+        {
+            return eGeoJSONSourceService;
+        }
         if ((strstr(poOpenInfo->pszFilename, "SERVICE=WFS") ||
              strstr(poOpenInfo->pszFilename, "service=WFS") ||
              strstr(poOpenInfo->pszFilename, "service=wfs")) &&
@@ -674,12 +759,11 @@ GeoJSONSourceType GeoJSONGetSourceType(GDALOpenInfo *poOpenInfo)
             return eGeoJSONSourceFile;
         }
         const char *pszText = poOpenInfo->pszFilename + strlen("GeoJSON:");
-        if (GeoJSONIsObject(pszText, poOpenInfo->papszAllowedDrivers))
+        if (GeoJSONIsObject(pszText, poOpenInfo))
             return eGeoJSONSourceText;
         return eGeoJSONSourceUnknown;
     }
-    else if (GeoJSONIsObject(poOpenInfo->pszFilename,
-                             poOpenInfo->papszAllowedDrivers))
+    else if (GeoJSONIsObject(poOpenInfo->pszFilename, poOpenInfo))
     {
         srcType = eGeoJSONSourceText;
     }
@@ -707,6 +791,10 @@ GeoJSONSourceType ESRIJSONDriverGetSourceType(GDALOpenInfo *poOpenInfo)
              STARTS_WITH(poOpenInfo->pszFilename, "https://") ||
              STARTS_WITH(poOpenInfo->pszFilename, "ftp://"))
     {
+        if (poOpenInfo->IsSingleAllowedDriver("ESRIJSON"))
+        {
+            return eGeoJSONSourceService;
+        }
         if (IsLikelyESRIJSONURL(poOpenInfo->pszFilename))
         {
             return eGeoJSONSourceService;
@@ -723,7 +811,7 @@ GeoJSONSourceType ESRIJSONDriverGetSourceType(GDALOpenInfo *poOpenInfo)
             return eGeoJSONSourceFile;
         }
         const char *pszText = poOpenInfo->pszFilename + strlen("ESRIJSON:");
-        if (ESRIJSONIsObject(pszText))
+        if (ESRIJSONIsObject(pszText, poOpenInfo))
             return eGeoJSONSourceText;
         return eGeoJSONSourceUnknown;
     }
@@ -731,7 +819,7 @@ GeoJSONSourceType ESRIJSONDriverGetSourceType(GDALOpenInfo *poOpenInfo)
     if (poOpenInfo->fpL == nullptr)
     {
         const char *pszText = poOpenInfo->pszFilename;
-        if (ESRIJSONIsObject(pszText))
+        if (ESRIJSONIsObject(pszText, poOpenInfo))
             return eGeoJSONSourceText;
         return eGeoJSONSourceUnknown;
     }
@@ -745,8 +833,8 @@ GeoJSONSourceType ESRIJSONDriverGetSourceType(GDALOpenInfo *poOpenInfo)
     }
 
     if (poOpenInfo->pabyHeader != nullptr &&
-        ESRIJSONIsObject(
-            reinterpret_cast<const char *>(poOpenInfo->pabyHeader)))
+        ESRIJSONIsObject(reinterpret_cast<const char *>(poOpenInfo->pabyHeader),
+                         poOpenInfo))
     {
         return eGeoJSONSourceFile;
     }
@@ -769,6 +857,10 @@ GeoJSONSourceType TopoJSONDriverGetSourceType(GDALOpenInfo *poOpenInfo)
              STARTS_WITH(poOpenInfo->pszFilename, "https://") ||
              STARTS_WITH(poOpenInfo->pszFilename, "ftp://"))
     {
+        if (poOpenInfo->IsSingleAllowedDriver("TOPOJSON"))
+        {
+            return eGeoJSONSourceService;
+        }
         if (IsLikelyESRIJSONURL(poOpenInfo->pszFilename))
         {
             return eGeoJSONSourceUnknown;
@@ -785,7 +877,7 @@ GeoJSONSourceType TopoJSONDriverGetSourceType(GDALOpenInfo *poOpenInfo)
             return eGeoJSONSourceFile;
         }
         const char *pszText = poOpenInfo->pszFilename + strlen("TopoJSON:");
-        if (TopoJSONIsObject(pszText))
+        if (TopoJSONIsObject(pszText, poOpenInfo))
             return eGeoJSONSourceText;
         return eGeoJSONSourceUnknown;
     }
@@ -793,7 +885,7 @@ GeoJSONSourceType TopoJSONDriverGetSourceType(GDALOpenInfo *poOpenInfo)
     if (poOpenInfo->fpL == nullptr)
     {
         const char *pszText = poOpenInfo->pszFilename;
-        if (TopoJSONIsObject(pszText))
+        if (TopoJSONIsObject(pszText, poOpenInfo))
             return eGeoJSONSourceText;
         return eGeoJSONSourceUnknown;
     }
@@ -807,8 +899,8 @@ GeoJSONSourceType TopoJSONDriverGetSourceType(GDALOpenInfo *poOpenInfo)
     }
 
     if (poOpenInfo->pabyHeader != nullptr &&
-        TopoJSONIsObject(
-            reinterpret_cast<const char *>(poOpenInfo->pabyHeader)))
+        TopoJSONIsObject(reinterpret_cast<const char *>(poOpenInfo->pabyHeader),
+                         poOpenInfo))
     {
         return eGeoJSONSourceFile;
     }
@@ -833,6 +925,10 @@ GeoJSONSourceType GeoJSONSeqGetSourceType(GDALOpenInfo *poOpenInfo)
              STARTS_WITH_CI(poOpenInfo->pszFilename, "https://") ||
              STARTS_WITH_CI(poOpenInfo->pszFilename, "ftp://"))
     {
+        if (poOpenInfo->IsSingleAllowedDriver("GeoJSONSeq"))
+        {
+            return eGeoJSONSourceService;
+        }
         if (IsLikelyESRIJSONURL(poOpenInfo->pszFilename))
         {
             return eGeoJSONSourceUnknown;
@@ -848,11 +944,11 @@ GeoJSONSourceType GeoJSONSeqGetSourceType(GDALOpenInfo *poOpenInfo)
             return eGeoJSONSourceFile;
         }
         const char *pszText = poOpenInfo->pszFilename + strlen("GEOJSONSeq:");
-        if (GeoJSONSeqIsObject(pszText))
+        if (GeoJSONSeqIsObject(pszText, poOpenInfo))
             return eGeoJSONSourceText;
         return eGeoJSONSourceUnknown;
     }
-    else if (GeoJSONSeqIsObject(poOpenInfo->pszFilename))
+    else if (GeoJSONSeqIsObject(poOpenInfo->pszFilename, poOpenInfo))
     {
         srcType = eGeoJSONSourceText;
     }
@@ -882,6 +978,10 @@ GeoJSONSourceType JSONFGDriverGetSourceType(GDALOpenInfo *poOpenInfo)
              STARTS_WITH_CI(poOpenInfo->pszFilename, "https://") ||
              STARTS_WITH_CI(poOpenInfo->pszFilename, "ftp://"))
     {
+        if (poOpenInfo->IsSingleAllowedDriver("JSONFG"))
+        {
+            return eGeoJSONSourceService;
+        }
         if (IsLikelyESRIJSONURL(poOpenInfo->pszFilename))
         {
             return eGeoJSONSourceUnknown;
@@ -897,11 +997,11 @@ GeoJSONSourceType JSONFGDriverGetSourceType(GDALOpenInfo *poOpenInfo)
             return eGeoJSONSourceFile;
         }
         const char *pszText = poOpenInfo->pszFilename + nJSONFGPrefixLen;
-        if (JSONFGIsObject(pszText))
+        if (JSONFGIsObject(pszText, poOpenInfo))
             return eGeoJSONSourceText;
         return eGeoJSONSourceUnknown;
     }
-    else if (JSONFGIsObject(poOpenInfo->pszFilename))
+    else if (JSONFGIsObject(poOpenInfo->pszFilename, poOpenInfo))
     {
         srcType = eGeoJSONSourceText;
     }
@@ -913,163 +1013,6 @@ GeoJSONSourceType JSONFGDriverGetSourceType(GDALOpenInfo *poOpenInfo)
     return srcType;
 }
 
-/************************************************************************/
-/*                           GeoJSONPropertyToFieldType()               */
-/************************************************************************/
-
-constexpr GIntBig MY_INT64_MAX = (((GIntBig)0x7FFFFFFF) << 32) | 0xFFFFFFFF;
-constexpr GIntBig MY_INT64_MIN = ((GIntBig)0x80000000) << 32;
-
-OGRFieldType GeoJSONPropertyToFieldType(json_object *poObject,
-                                        OGRFieldSubType &eSubType,
-                                        bool bArrayAsString)
-{
-    eSubType = OFSTNone;
-
-    if (poObject == nullptr)
-    {
-        return OFTString;
-    }
-
-    json_type type = json_object_get_type(poObject);
-
-    if (json_type_boolean == type)
-    {
-        eSubType = OFSTBoolean;
-        return OFTInteger;
-    }
-    else if (json_type_double == type)
-        return OFTReal;
-    else if (json_type_int == type)
-    {
-        GIntBig nVal = json_object_get_int64(poObject);
-        if (!CPL_INT64_FITS_ON_INT32(nVal))
-        {
-            if (nVal == MY_INT64_MIN || nVal == MY_INT64_MAX)
-            {
-                static bool bWarned = false;
-                if (!bWarned)
-                {
-                    bWarned = true;
-                    CPLError(
-                        CE_Warning, CPLE_AppDefined,
-                        "Integer values probably ranging out of 64bit integer "
-                        "range have been found. Will be clamped to "
-                        "INT64_MIN/INT64_MAX");
-                }
-            }
-            return OFTInteger64;
-        }
-        else
-        {
-            return OFTInteger;
-        }
-    }
-    else if (json_type_string == type)
-        return OFTString;
-    else if (json_type_array == type)
-    {
-        if (bArrayAsString)
-        {
-            eSubType = OFSTJSON;
-            return OFTString;
-        }
-        const auto nSize = json_object_array_length(poObject);
-        if (nSize == 0)
-        {
-            eSubType = OFSTJSON;
-            return OFTString;
-        }
-        OGRFieldType eType = OFTIntegerList;
-        for (auto i = decltype(nSize){0}; i < nSize; i++)
-        {
-            json_object *poRow = json_object_array_get_idx(poObject, i);
-            if (poRow != nullptr)
-            {
-                type = json_object_get_type(poRow);
-                if (type == json_type_string)
-                {
-                    if (i == 0 || eType == OFTStringList)
-                    {
-                        eType = OFTStringList;
-                    }
-                    else
-                    {
-                        eSubType = OFSTJSON;
-                        return OFTString;
-                    }
-                }
-                else if (type == json_type_double)
-                {
-                    if (eSubType == OFSTNone &&
-                        (i == 0 || eType == OFTRealList ||
-                         eType == OFTIntegerList || eType == OFTInteger64List))
-                    {
-                        eType = OFTRealList;
-                    }
-                    else
-                    {
-                        eSubType = OFSTJSON;
-                        return OFTString;
-                    }
-                }
-                else if (type == json_type_int)
-                {
-                    if (eSubType == OFSTNone && eType == OFTIntegerList)
-                    {
-                        GIntBig nVal = json_object_get_int64(poRow);
-                        if (!CPL_INT64_FITS_ON_INT32(nVal))
-                            eType = OFTInteger64List;
-                    }
-                    else if (eSubType == OFSTNone &&
-                             (eType == OFTInteger64List ||
-                              eType == OFTRealList))
-                    {
-                        // ok
-                    }
-                    else
-                    {
-                        eSubType = OFSTJSON;
-                        return OFTString;
-                    }
-                }
-                else if (type == json_type_boolean)
-                {
-                    if (i == 0 ||
-                        (eType == OFTIntegerList && eSubType == OFSTBoolean))
-                    {
-                        eSubType = OFSTBoolean;
-                    }
-                    else
-                    {
-                        eSubType = OFSTJSON;
-                        return OFTString;
-                    }
-                }
-                else
-                {
-                    eSubType = OFSTJSON;
-                    return OFTString;
-                }
-            }
-            else
-            {
-                eSubType = OFSTJSON;
-                return OFTString;
-            }
-        }
-
-        return eType;
-    }
-    else if (json_type_object == type)
-    {
-        eSubType = OFSTJSON;
-        return OFTString;
-    }
-
-    return OFTString;  // null
-}
-
 /************************************************************************/
 /*                        GeoJSONStringPropertyToFieldType()            */
 /************************************************************************/
@@ -1105,31 +1048,3 @@ OGRFieldType GeoJSONStringPropertyToFieldType(json_object *poObject,
     }
     return OFTString;
 }
-
-/************************************************************************/
-/*                           OGRGeoJSONGetGeometryName()                */
-/************************************************************************/
-
-const char *OGRGeoJSONGetGeometryName(OGRGeometry const *poGeometry)
-{
-    CPLAssert(nullptr != poGeometry);
-
-    const OGRwkbGeometryType eType = wkbFlatten(poGeometry->getGeometryType());
-
-    if (wkbPoint == eType)
-        return "Point";
-    else if (wkbLineString == eType)
-        return "LineString";
-    else if (wkbPolygon == eType)
-        return "Polygon";
-    else if (wkbMultiPoint == eType)
-        return "MultiPoint";
-    else if (wkbMultiLineString == eType)
-        return "MultiLineString";
-    else if (wkbMultiPolygon == eType)
-        return "MultiPolygon";
-    else if (wkbGeometryCollection == eType)
-        return "GeometryCollection";
-
-    return "Unknown";
-}
diff --git a/ogr/ogrsf_frmts/geojson/ogrgeojsonutils.h b/ogr/ogrsf_frmts/geojson/ogrgeojsonutils.h
index 37940f161447..bbf3bfb82d92 100644
--- a/ogr/ogrsf_frmts/geojson/ogrgeojsonutils.h
+++ b/ogr/ogrsf_frmts/geojson/ogrgeojsonutils.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Mateusz Loskot
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef OGR_GEOJSONUTILS_H_INCLUDED
 #define OGR_GEOJSONUTILS_H_INCLUDED
@@ -59,19 +43,11 @@ GeoJSONSourceType JSONFGDriverGetSourceType(GDALOpenInfo *poOpenInfo);
 /*                           GeoJSONIsObject                            */
 /************************************************************************/
 
-bool GeoJSONIsObject(const char *pszText, CSLConstList papszAllowedDrivers);
-bool GeoJSONSeqIsObject(const char *pszText);
-bool ESRIJSONIsObject(const char *pszText);
-bool TopoJSONIsObject(const char *pszText);
-bool JSONFGIsObject(const char *pszText);
-
-/************************************************************************/
-/*                           GeoJSONPropertyToFieldType                 */
-/************************************************************************/
-
-OGRFieldType CPL_DLL GeoJSONPropertyToFieldType(json_object *poObject,
-                                                OGRFieldSubType &eSubType,
-                                                bool bArrayAsString = false);
+bool GeoJSONIsObject(const char *pszText, GDALOpenInfo *poOpenInfo);
+bool GeoJSONSeqIsObject(const char *pszText, GDALOpenInfo *poOpenInfo);
+bool ESRIJSONIsObject(const char *pszText, GDALOpenInfo *poOpenInfo);
+bool TopoJSONIsObject(const char *pszText, GDALOpenInfo *poOpenInfo);
+bool JSONFGIsObject(const char *pszText, GDALOpenInfo *poOpenInfo);
 
 /************************************************************************/
 /*                      GeoJSONStringPropertyToFieldType                */
@@ -80,10 +56,4 @@ OGRFieldType CPL_DLL GeoJSONPropertyToFieldType(json_object *poObject,
 OGRFieldType GeoJSONStringPropertyToFieldType(json_object *poObject,
                                               int &nTZFlag);
 
-/************************************************************************/
-/*                           OGRGeoJSONGetGeometryName                  */
-/************************************************************************/
-
-const char *OGRGeoJSONGetGeometryName(OGRGeometry const *poGeometry);
-
 #endif  // OGR_GEOJSONUTILS_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/geojson/ogrgeojsonwritelayer.cpp b/ogr/ogrsf_frmts/geojson/ogrgeojsonwritelayer.cpp
index 1ddb6922b0b6..24f76cada838 100644
--- a/ogr/ogrsf_frmts/geojson/ogrgeojsonwritelayer.cpp
+++ b/ogr/ogrsf_frmts/geojson/ogrgeojsonwritelayer.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.com>
  * Copyright (c) 2007, Mateusz Loskot
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_geojson.h"
@@ -256,19 +240,45 @@ OGRErr OGRGeoJSONWriteLayer::ICreateFeature(OGRFeature *poFeature)
     {
         const double dfXYResolution =
             std::pow(10.0, double(-oWriteOptions_.nXYCoordPrecision));
-        auto poNewGeom = poFeature == poFeatureToWrite
-                             ? poOrigGeom->clone()
-                             : poFeatureToWrite->GetGeometryRef();
-        bool bDeleteNewGeom = (poFeature == poFeatureToWrite);
+        auto poNewGeom = std::unique_ptr<OGRGeometry>(
+            poFeatureToWrite->GetGeometryRef()->clone());
         OGRGeomCoordinatePrecision sPrecision;
         sPrecision.dfXYResolution = dfXYResolution;
         poNewGeom->roundCoordinates(sPrecision);
-        if (!IsValid(poNewGeom))
+        if (!IsValid(poNewGeom.get()))
         {
-            CPLDebug("GeoJSON", "Running SetPrecision() to correct an invalid "
-                                "geometry due to reduced precision output");
-            auto poValidGeom =
-                poOrigGeom->SetPrecision(dfXYResolution, /* nFlags = */ 0);
+            std::unique_ptr<OGRGeometry> poValidGeom;
+            if (poFeature == poFeatureToWrite)
+            {
+                CPLDebug("GeoJSON",
+                         "Running SetPrecision() to correct an invalid "
+                         "geometry due to reduced precision output");
+                poValidGeom.reset(
+                    poOrigGeom->SetPrecision(dfXYResolution, /* nFlags = */ 0));
+            }
+            else
+            {
+                CPLDebug("GeoJSON", "Running MakeValid() to correct an invalid "
+                                    "geometry due to reduced precision output");
+                poValidGeom.reset(poNewGeom->MakeValid());
+                if (poValidGeom)
+                {
+                    auto poValidGeomRoundCoordinates =
+                        std::unique_ptr<OGRGeometry>(poValidGeom->clone());
+                    poValidGeomRoundCoordinates->roundCoordinates(sPrecision);
+                    if (!IsValid(poValidGeomRoundCoordinates.get()))
+                    {
+                        CPLDebug("GeoJSON",
+                                 "Running SetPrecision() to correct an invalid "
+                                 "geometry due to reduced precision output");
+                        auto poValidGeom2 = std::unique_ptr<OGRGeometry>(
+                            poValidGeom->SetPrecision(dfXYResolution,
+                                                      /* nFlags = */ 0));
+                        if (poValidGeom2)
+                            poValidGeom = std::move(poValidGeom2);
+                    }
+                }
+            }
             if (poValidGeom)
             {
                 if (poFeature == poFeatureToWrite)
@@ -277,12 +287,9 @@ OGRErr OGRGeoJSONWriteLayer::ICreateFeature(OGRFeature *poFeature)
                     poFeatureToWrite->SetFrom(poFeature);
                     poFeatureToWrite->SetFID(poFeature->GetFID());
                 }
-
-                poFeatureToWrite->SetGeometryDirectly(poValidGeom);
+                poFeatureToWrite->SetGeometryDirectly(poValidGeom.release());
             }
         }
-        if (bDeleteNewGeom)
-            delete poNewGeom;
     }
 
     if (oWriteOptions_.bGenerateID && poFeatureToWrite->GetFID() == OGRNullFID)
diff --git a/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.h b/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.h
deleted file mode 100644
index 9f28db52c30a..000000000000
--- a/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/******************************************************************************
- * $Id$
- *
- * Project:  OpenGIS Simple Features Reference Implementation
- * Purpose:  Defines GeoJSON reader within OGR OGRGeoJSON Driver.
- * Author:   Mateusz Loskot, mateusz@loskot.net
- *
- ******************************************************************************
- * Copyright (c) 2007, Mateusz Loskot
- * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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 OGR_GEOJSONWRITER_H_INCLUDED
-#define OGR_GEOJSONWRITER_H_INCLUDED
-
-#include "ogr_core.h"
-
-#include "cpl_json_header.h"
-#include "cpl_string.h"
-
-/************************************************************************/
-/*                         FORWARD DECLARATIONS                         */
-/************************************************************************/
-#ifdef __cplusplus
-class OGRFeature;
-class OGRGeometry;
-class OGRPoint;
-class OGRMultiPoint;
-class OGRLineString;
-class OGRMultiLineString;
-class OGRLinearRing;
-class OGRPolygon;
-class OGRMultiPolygon;
-class OGRGeometryCollection;
-#endif
-
-CPL_C_START
-/* %.XXXf formatting */
-json_object CPL_DLL *json_object_new_double_with_precision(double dfVal,
-                                                           int nCoordPrecision);
-
-/* %.XXXg formatting */
-json_object CPL_DLL *
-json_object_new_double_with_significant_figures(double dfVal,
-                                                int nSignificantFigures);
-CPL_C_END
-
-/************************************************************************/
-/*                 GeoJSON Geometry Translators                         */
-/************************************************************************/
-#ifdef __cplusplus
-class OGRCoordinateTransformation;
-
-/*! @cond Doxygen_Suppress */
-class OGRGeoJSONWriteOptions
-{
-  public:
-    bool bWriteBBOX = false;
-    bool bBBOXRFC7946 = false;
-    int nXYCoordPrecision = -1;
-    int nZCoordPrecision = -1;
-    int nSignificantFigures = -1;
-    bool bPolygonRightHandRule = false;
-    bool bCanPatchCoordinatesWithNativeData = true;
-    bool bHonourReservedRFC7946Members = false;
-    CPLString osIDField{};
-    bool bForceIDFieldType = false;
-    bool bGenerateID = false;
-    OGRFieldType eForcedIDFieldType = OFTString;
-    bool bAllowNonFiniteValues = false;
-    bool bAutodetectJsonStrings = true;
-
-    void SetRFC7946Settings();
-    void SetIDOptions(CSLConstList papszOptions);
-};
-
-/*! @endcond */
-
-OGREnvelope3D OGRGeoJSONGetBBox(const OGRGeometry *poGeometry,
-                                const OGRGeoJSONWriteOptions &oOptions);
-json_object *OGRGeoJSONWriteFeature(OGRFeature *poFeature,
-                                    const OGRGeoJSONWriteOptions &oOptions);
-void OGRGeoJSONWriteId(const OGRFeature *poFeature, json_object *poObj,
-                       bool bIdAlreadyWritten,
-                       const OGRGeoJSONWriteOptions &oOptions);
-json_object *OGRGeoJSONWriteAttributes(
-    OGRFeature *poFeature, bool bWriteIdIfFoundInAttributes = true,
-    const OGRGeoJSONWriteOptions &oOptions = OGRGeoJSONWriteOptions());
-json_object CPL_DLL *
-OGRGeoJSONWriteGeometry(const OGRGeometry *poGeometry,
-                        const OGRGeoJSONWriteOptions &oOptions);
-json_object *OGRGeoJSONWritePoint(const OGRPoint *poPoint,
-                                  const OGRGeoJSONWriteOptions &oOptions);
-json_object *OGRGeoJSONWriteLineString(const OGRLineString *poLine,
-                                       const OGRGeoJSONWriteOptions &oOptions);
-json_object *OGRGeoJSONWritePolygon(const OGRPolygon *poPolygon,
-                                    const OGRGeoJSONWriteOptions &oOptions);
-json_object *OGRGeoJSONWriteMultiPoint(const OGRMultiPoint *poGeometry,
-                                       const OGRGeoJSONWriteOptions &oOptions);
-json_object *
-OGRGeoJSONWriteMultiLineString(const OGRMultiLineString *poGeometry,
-                               const OGRGeoJSONWriteOptions &oOptions);
-json_object *
-OGRGeoJSONWriteMultiPolygon(const OGRMultiPolygon *poGeometry,
-                            const OGRGeoJSONWriteOptions &oOptions);
-json_object *
-OGRGeoJSONWriteGeometryCollection(const OGRGeometryCollection *poGeometry,
-                                  const OGRGeoJSONWriteOptions &oOptions);
-
-json_object *OGRGeoJSONWriteCoords(double const &fX, double const &fY,
-                                   const OGRGeoJSONWriteOptions &oOptions);
-json_object *OGRGeoJSONWriteCoords(double const &fX, double const &fY,
-                                   double const &fZ,
-                                   const OGRGeoJSONWriteOptions &oOptions);
-json_object *OGRGeoJSONWriteLineCoords(const OGRLineString *poLine,
-                                       const OGRGeoJSONWriteOptions &oOptions);
-json_object *OGRGeoJSONWriteRingCoords(const OGRLinearRing *poLine,
-                                       bool bIsExteriorRing,
-                                       const OGRGeoJSONWriteOptions &oOptions);
-#endif
-
-#endif /* OGR_GEOJSONWRITER_H_INCLUDED */
diff --git a/ogr/ogrsf_frmts/geojson/ogrjsoncollectionstreamingparser.cpp b/ogr/ogrsf_frmts/geojson/ogrjsoncollectionstreamingparser.cpp
index 5d4fcd9655ca..91371c8a5a70 100644
--- a/ogr/ogrsf_frmts/geojson/ogrjsoncollectionstreamingparser.cpp
+++ b/ogr/ogrsf_frmts/geojson/ogrjsoncollectionstreamingparser.cpp
@@ -7,29 +7,15 @@
  ******************************************************************************
  * Copyright (c) 2017, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrjsoncollectionstreamingparser.h"
 
 #include "cpl_string.h"
-#include "ogrgeojsonreader.h"  // CPL_json_object_object_get
+#include "ogrlibjsonutils.h"  // CPL_json_object_object_get
+
+#include "ogr_feature.h"
 
 #define JSON_C_VER_013 (13 << 8)
 
diff --git a/ogr/ogrsf_frmts/geojson/ogrjsoncollectionstreamingparser.h b/ogr/ogrsf_frmts/geojson/ogrjsoncollectionstreamingparser.h
index 0ffdc793d16f..7e0d6f84252c 100644
--- a/ogr/ogrsf_frmts/geojson/ogrjsoncollectionstreamingparser.h
+++ b/ogr/ogrsf_frmts/geojson/ogrjsoncollectionstreamingparser.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2017, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRJSONCOLLECTIONSTREAMING_PARSER_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/geojson/ogrtopojsondriver.cpp b/ogr/ogrsf_frmts/geojson/ogrtopojsondriver.cpp
index 8073dbc61a22..c35c9cbe0524 100644
--- a/ogr/ogrsf_frmts/geojson/ogrtopojsondriver.cpp
+++ b/ogr/ogrsf_frmts/geojson/ogrtopojsondriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2017, Even Rouault, <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -48,10 +32,14 @@ static int OGRTopoJSONDriverIdentify(GDALOpenInfo *poOpenInfo)
     GeoJSONSourceType nSrcType = TopoJSONDriverGetSourceType(poOpenInfo);
     if (nSrcType == eGeoJSONSourceUnknown)
         return FALSE;
-    if (nSrcType == eGeoJSONSourceService &&
-        !STARTS_WITH_CI(poOpenInfo->pszFilename, "TopoJSON:"))
+    if (nSrcType == eGeoJSONSourceService)
     {
-        return -1;
+        if (poOpenInfo->IsSingleAllowedDriver("TopoJSON"))
+            return TRUE;
+        if (!STARTS_WITH_CI(poOpenInfo->pszFilename, "TopoJSON:"))
+        {
+            return -1;
+        }
     }
     return TRUE;
 }
diff --git a/ogr/ogrsf_frmts/geojson/ogrtopojsonreader.cpp b/ogr/ogrsf_frmts/geojson/ogrtopojsonreader.cpp
index 71a44a3438d3..4e1cbd2f0e86 100644
--- a/ogr/ogrsf_frmts/geojson/ogrtopojsonreader.cpp
+++ b/ogr/ogrsf_frmts/geojson/ogrtopojsonreader.cpp
@@ -7,27 +7,12 @@
  ******************************************************************************
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrgeojsonreader.h"
 #include "ogrgeojsonutils.h"
+#include "ogrlibjsonutils.h"
 #include "ogr_geojson.h"
 #include <json.h>  // JSON-C
 #include "ogr_api.h"
diff --git a/ogr/ogrsf_frmts/georss/ogr_georss.h b/ogr/ogrsf_frmts/georss/ogr_georss.h
index 3336db90ab45..d5cfc98dc95a 100644
--- a/ogr/ogrsf_frmts/georss/ogr_georss.h
+++ b/ogr/ogrsf_frmts/georss/ogr_georss.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2008-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_GEORSS_H_INCLUDED
@@ -161,7 +145,7 @@ class OGRGeoRSSLayer final : public OGRLayer
 };
 
 /************************************************************************/
-/*                           OGRGeoRSSDataSource                           */
+/*                           OGRGeoRSSDataSource                        */
 /************************************************************************/
 
 typedef enum
@@ -171,10 +155,8 @@ typedef enum
     GEORSS_VALIDITY_VALID
 } OGRGeoRSSValidity;
 
-class OGRGeoRSSDataSource final : public OGRDataSource
+class OGRGeoRSSDataSource final : public GDALDataset
 {
-    char *pszName;
-
     OGRGeoRSSLayer **papoLayers;
     int nLayers;
 
@@ -201,11 +183,6 @@ class OGRGeoRSSDataSource final : public OGRDataSource
 
     int Create(const char *pszFilename, char **papszOptions);
 
-    const char *GetName() override
-    {
-        return pszName;
-    }
-
     int GetLayerCount() override
     {
         return nLayers;
diff --git a/ogr/ogrsf_frmts/georss/ogrgeorssdatasource.cpp b/ogr/ogrsf_frmts/georss/ogrgeorssdatasource.cpp
index 397b04aaf0c6..13ea6cd6bd9e 100644
--- a/ogr/ogrsf_frmts/georss/ogrgeorssdatasource.cpp
+++ b/ogr/ogrsf_frmts/georss/ogrgeorssdatasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2008-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -50,7 +34,7 @@
 /************************************************************************/
 
 OGRGeoRSSDataSource::OGRGeoRSSDataSource()
-    : pszName(nullptr), papoLayers(nullptr), nLayers(0), fpOutput(nullptr),
+    : papoLayers(nullptr), nLayers(0), fpOutput(nullptr),
 #ifdef HAVE_EXPAT
       validity(GEORSS_VALIDITY_UNKNOWN),
 #endif
@@ -90,7 +74,6 @@ OGRGeoRSSDataSource::~OGRGeoRSSDataSource()
     for (int i = 0; i < nLayers; i++)
         delete papoLayers[i];
     CPLFree(papoLayers);
-    CPLFree(pszName);
 }
 
 /************************************************************************/
@@ -161,8 +144,8 @@ OGRGeoRSSDataSource::ICreateLayer(const char *pszLayerName,
         poSRSClone = poSRS->Clone();
         poSRSClone->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
     }
-    papoLayers[nLayers - 1] =
-        new OGRGeoRSSLayer(pszName, pszLayerName, this, poSRSClone, TRUE);
+    papoLayers[nLayers - 1] = new OGRGeoRSSLayer(GetDescription(), pszLayerName,
+                                                 this, poSRSClone, TRUE);
     if (poSRSClone)
         poSRSClone->Release();
 
@@ -257,7 +240,6 @@ int OGRGeoRSSDataSource::Open(const char *pszFilename, int bUpdateIn)
         return FALSE;
     }
 #ifdef HAVE_EXPAT
-    pszName = CPLStrdup(pszFilename);
 
     // Try to open the file.
     VSILFILE *fp = VSIFOpenL(pszFilename, "r");
@@ -338,7 +320,7 @@ int OGRGeoRSSDataSource::Open(const char *pszFilename, int bUpdateIn)
         papoLayers = static_cast<OGRGeoRSSLayer **>(
             CPLRealloc(papoLayers, nLayers * sizeof(OGRGeoRSSLayer *)));
         papoLayers[0] =
-            new OGRGeoRSSLayer(pszName, "georss", this, nullptr, FALSE);
+            new OGRGeoRSSLayer(pszFilename, "georss", this, nullptr, FALSE);
     }
 
     return validity == GEORSS_VALIDITY_VALID;
@@ -396,8 +378,6 @@ int OGRGeoRSSDataSource::Create(const char *pszFilename, char **papszOptions)
     /* -------------------------------------------------------------------- */
     /*      Create the output file.                                         */
     /* -------------------------------------------------------------------- */
-    pszName = CPLStrdup(pszFilename);
-
     fpOutput = VSIFOpenL(pszFilename, "w");
     if (fpOutput == nullptr)
     {
diff --git a/ogr/ogrsf_frmts/georss/ogrgeorssdriver.cpp b/ogr/ogrsf_frmts/georss/ogrgeorssdriver.cpp
index 5362b2a6e077..effd49a49d81 100644
--- a/ogr/ogrsf_frmts/georss/ogrgeorssdriver.cpp
+++ b/ogr/ogrsf_frmts/georss/ogrgeorssdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2008, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_georss.h"
diff --git a/ogr/ogrsf_frmts/georss/ogrgeorsslayer.cpp b/ogr/ogrsf_frmts/georss/ogrgeorsslayer.cpp
index 9b968db2cbce..e35db44b81fb 100644
--- a/ogr/ogrsf_frmts/georss/ogrgeorsslayer.cpp
+++ b/ogr/ogrsf_frmts/georss/ogrgeorsslayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/gml/CMakeLists.txt b/ogr/ogrsf_frmts/gml/CMakeLists.txt
index 06690f8ecbdd..845a797dcaec 100644
--- a/ogr/ogrsf_frmts/gml/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/gml/CMakeLists.txt
@@ -1,30 +1,28 @@
 add_gdal_driver(
   TARGET ogr_GML
   SOURCES gfstemplate.cpp
-          gmlpropertydefn.cpp
           gmlreadstate.cpp
-          gmlutils.h
           ogrgmldriver.cpp
           resolvexlinks.cpp
-          gmlfeature.cpp
           gmlreader.cpp
           gmlregistry.cpp
           hugefileresolver.cpp
           ogrgmllayer.cpp
           xercesc_headers.h
-          gmlfeatureclass.cpp
           gmlreader.h
           gmlregistry.h
           ogr_gml.h
-          parsexsd.cpp
           gmlhandler.cpp
           gmlreaderp.h
-          gmlutils.cpp
           ogrgmldatasource.cpp
-          parsexsd.h
-  BUILTIN)
+  PLUGIN_CAPABLE
+  NO_DEPS
+  STRONG_CXX_WFLAGS
+)
 gdal_standard_includes(ogr_GML)
 
+target_include_directories(ogr_GML PRIVATE $<TARGET_PROPERTY:gmlutils,SOURCE_DIR>)
+
 set(GDAL_DATA_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/data/gfs.xsd
     ${CMAKE_CURRENT_SOURCE_DIR}/data/gml_registry.xml
diff --git a/ogr/ogrsf_frmts/gml/gfstemplate.cpp b/ogr/ogrsf_frmts/gml/gfstemplate.cpp
index 28210bb4b8ce..b8cb2eaf3559 100644
--- a/ogr/ogrsf_frmts/gml/gfstemplate.cpp
+++ b/ogr/ogrsf_frmts/gml/gfstemplate.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Alessandro Furieri
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *
  ******************************************************************************
  * Contributor: Alessandro Furieri, a.furieri@lqt.it
@@ -50,10 +34,12 @@
 class GFSTemplateItem
 {
   private:
-    char *m_pszName;
-    int n_nItemCount;
-    int n_nGeomCount;
-    GFSTemplateItem *pNext;
+    char *m_pszName = nullptr;
+    int n_nItemCount = 0;
+    int n_nGeomCount = 0;
+    GFSTemplateItem *pNext = nullptr;
+
+    CPL_DISALLOW_COPY_ASSIGN(GFSTemplateItem)
 
   public:
     explicit GFSTemplateItem(const char *pszName);
@@ -340,8 +326,7 @@ int GFSTemplateList::GetClassCount()
 /***************************************************/
 
 GFSTemplateItem::GFSTemplateItem(const char *pszName)
-    : m_pszName(CPLStrdup(pszName)), n_nItemCount(0), n_nGeomCount(0),
-      pNext(nullptr)
+    : m_pszName(CPLStrdup(pszName))
 {
 }
 
diff --git a/ogr/ogrsf_frmts/gml/gmlhandler.cpp b/ogr/ogrsf_frmts/gml/gmlhandler.cpp
index 6b35729868b3..e440d4afdad9 100644
--- a/ogr/ogrsf_frmts/gml/gmlhandler.cpp
+++ b/ogr/ogrsf_frmts/gml/gmlhandler.cpp
@@ -8,29 +8,14 @@
  * Copyright (c) 2002, Frank Warmerdam
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
 #include "gmlreader.h"
 #include "gmlreaderp.h"
 
+#include <algorithm>
 #include <climits>
 #include <cstddef>
 #include <cstdlib>
@@ -274,7 +259,7 @@ void GMLExpatHandler::DealWithError(OGRErr eErr)
     if (eErr != OGRERR_NONE)
     {
         m_bStopParsing = true;
-        XML_StopParser(m_oParser, XML_FALSE);
+        XML_StopParser(m_oParser, static_cast<XML_Bool>(false));
         if (eErr == OGRERR_NOT_ENOUGH_MEMORY)
             CPLError(CE_Failure, CPLE_OutOfMemory, "Out of memory");
     }
@@ -344,7 +329,7 @@ void XMLCALL GMLExpatHandler::dataHandlerCbk(void *pUserData, const char *data,
         CPLError(CE_Failure, CPLE_AppDefined,
                  "File probably corrupted (million laugh pattern)");
         pThis->m_bStopParsing = true;
-        XML_StopParser(pThis->m_oParser, XML_FALSE);
+        XML_StopParser(pThis->m_oParser, static_cast<XML_Bool>(false));
         return;
     }
 
@@ -357,7 +342,7 @@ void XMLCALL GMLExpatHandler::dataHandlerCbk(void *pUserData, const char *data,
 
 const char *GMLExpatHandler::GetFID(void *attr)
 {
-    const char **papszIter = (const char **)attr;
+    const char *const *papszIter = static_cast<const char *const *>(attr);
     while (*papszIter)
     {
         if (strcmp(*papszIter, "fid") == 0 || strcmp(*papszIter, "gml:id") == 0)
@@ -404,7 +389,7 @@ CPLXMLNode *GMLExpatHandler::AddAttributes(CPLXMLNode *psNode, void *attr)
 char *GMLExpatHandler::GetAttributeValue(void *attr,
                                          const char *pszAttributeName)
 {
-    const char **papszIter = (const char **)attr;
+    const char *const *papszIter = static_cast<const char *const *>(attr);
     while (*papszIter)
     {
         if (strcmp(*papszIter, pszAttributeName) == 0)
@@ -425,7 +410,7 @@ char *GMLExpatHandler::GetAttributeValue(void *attr,
 char *GMLExpatHandler::GetAttributeByIdx(void *attr, unsigned int idx,
                                          char **ppszKey)
 {
-    const char **papszIter = (const char **)attr;
+    const char *const *papszIter = static_cast<const char *const *>(attr);
     if (papszIter[2 * idx] == nullptr)
     {
         *ppszKey = nullptr;
@@ -486,35 +471,12 @@ struct _GeometryNamesStruct
     const char *pszName;
 };
 
-/************************************************************************/
-/*                    GMLHandlerSortGeometryElements()                  */
-/************************************************************************/
-
-static int GMLHandlerSortGeometryElements(const void *_pA, const void *_pB)
-{
-    GeometryNamesStruct *pA = (GeometryNamesStruct *)_pA;
-    GeometryNamesStruct *pB = (GeometryNamesStruct *)_pB;
-    CPLAssert(pA->nHash != pB->nHash);
-    if (pA->nHash < pB->nHash)
-        return -1;
-    else
-        return 1;
-}
-
 /************************************************************************/
 /*                            GMLHandler()                              */
 /************************************************************************/
 
 GMLHandler::GMLHandler(GMLReader *poReader)
-    : m_pszCurField(nullptr), m_nCurFieldAlloc(0), m_nCurFieldLen(0),
-      m_bInCurField(false), m_nAttributeIndex(-1), m_nAttributeDepth(0),
-      m_pszGeometry(nullptr), m_nGeomAlloc(0), m_nGeomLen(0),
-      m_nGeometryDepth(0), m_bAlreadyFoundGeometry(false),
-      m_nGeometryPropertyIndex(0), m_nDepth(0), m_nDepthFeature(0),
-      m_inBoundedByDepth(0), m_pszCityGMLGenericAttrName(nullptr),
-      m_inCityGMLGenericAttrDepth(0), m_bReportHref(false), m_pszHref(nullptr),
-      m_pszUom(nullptr), m_pszValue(nullptr), m_pszKieli(nullptr),
-      pasGeometryNames(static_cast<GeometryNamesStruct *>(
+    : pasGeometryNames(static_cast<GeometryNamesStruct *>(
           CPLMalloc(GML_GEOMETRY_TYPE_COUNT * sizeof(GeometryNamesStruct)))),
       m_nSRSDimensionIfMissing(
           atoi(CPLGetConfigOption("GML_SRS_DIMENSION_IF_MISSING", "0"))),
@@ -526,8 +488,9 @@ GMLHandler::GMLHandler(GMLReader *poReader)
         pasGeometryNames[i].nHash =
             CPLHashSetHashStr(pasGeometryNames[i].pszName);
     }
-    qsort(pasGeometryNames, GML_GEOMETRY_TYPE_COUNT,
-          sizeof(GeometryNamesStruct), GMLHandlerSortGeometryElements);
+    std::sort(pasGeometryNames, pasGeometryNames + GML_GEOMETRY_TYPE_COUNT,
+              [](const GeometryNamesStruct &a, const GeometryNamesStruct &b)
+              { return a.nHash < b.nHash; });
 
     stateStack[0] = STATE_TOP;
 }
@@ -757,9 +720,10 @@ OGRErr GMLHandler::startElementGeometry(const char *pszName, int nLenName,
     }
 
     /* Create new XML Element */
-    CPLXMLNode *psCurNode = (CPLXMLNode *)CPLCalloc(sizeof(CPLXMLNode), 1);
+    CPLXMLNode *psCurNode =
+        static_cast<CPLXMLNode *>(CPLCalloc(sizeof(CPLXMLNode), 1));
     psCurNode->eType = CXT_Element;
-    psCurNode->pszValue = (char *)CPLMalloc(nLenName + 1);
+    psCurNode->pszValue = static_cast<char *>(CPLMalloc(nLenName + 1));
     memcpy(psCurNode->pszValue, pszName, nLenName + 1);
 
     /* Attach element as the last child of its parent */
@@ -1482,7 +1446,7 @@ OGRErr GMLHandler::startElementDefault(const char *pszName, int nLenName,
     /* WFS 2.0 GetFeature documents have a wfs:FeatureCollection */
     /* as a wfs:member of the top wfs:FeatureCollection. We don't want this */
     /* wfs:FeatureCollection to be recognized as a feature */
-    else if ((!(nLenName == (int)strlen("FeatureCollection") &&
+    else if ((!(nLenName == static_cast<int>(strlen("FeatureCollection")) &&
                 strcmp(pszName, "FeatureCollection") == 0)) &&
              (nClassIndex = m_poReader->GetFeatureElementIndex(
                   pszName, nLenName, eAppSchemaType)) != -1)
@@ -1640,7 +1604,8 @@ OGRErr GMLHandler::endElementGeometry()
 {
     if (m_nGeomLen)
     {
-        CPLXMLNode *psNode = (CPLXMLNode *)CPLCalloc(sizeof(CPLXMLNode), 1);
+        CPLXMLNode *psNode =
+            static_cast<CPLXMLNode *>(CPLCalloc(sizeof(CPLXMLNode), 1));
         psNode->eType = CXT_Text;
         psNode->pszValue = m_pszGeometry;
 
diff --git a/ogr/ogrsf_frmts/gml/gmlreader.cpp b/ogr/ogrsf_frmts/gml/gmlreader.cpp
index cabd5b27e6d5..c8beac7ee919 100644
--- a/ogr/ogrsf_frmts/gml/gmlreader.cpp
+++ b/ogr/ogrsf_frmts/gml/gmlreader.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2002, Frank Warmerdam
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -115,25 +99,7 @@ GMLReader::GMLReader(
     bool bUseExpatParserPreferably,
     bool bInvertAxisOrderIfLatLong, bool bConsiderEPSGAsURN,
     GMLSwapCoordinatesEnum eSwapCoordinates, bool bGetSecondaryGeometryOption)
-    : m_bClassListLocked(false), m_nClassCount(0), m_papoClass(nullptr),
-      m_bLookForClassAtAnyLevel(false), m_pszFilename(nullptr),
-#ifndef HAVE_XERCES
-      bUseExpatReader(true),
-#else
-      bUseExpatReader(false),
-#endif
-      m_poGMLHandler(nullptr),
-#ifdef HAVE_XERCES
-      m_poSAXReader(nullptr), m_poCompleteFeature(nullptr),
-      m_GMLInputSource(nullptr), m_bEOF(false), m_bXercesInitialized(false),
-#endif
-#ifdef HAVE_EXPAT
-      oParser(nullptr), ppoFeatureTab(nullptr), nFeatureTabLength(0),
-      nFeatureTabIndex(0), nFeatureTabAlloc(0), pabyBuf(nullptr),
-#endif
-      fpGML(nullptr), m_bReadStarted(false), m_poState(nullptr),
-      m_poRecycledState(nullptr), m_bStopParsing(false),
-      // Experimental. Not publicly advertized. See commented doc in
+    :  // Experimental. Not publicly advertized. See commented doc in
       // drv_gml.html
       m_bFetchAllGeometries(
           CPLTestBool(CPLGetConfigOption("GML_FETCH_ALL_GEOMETRIES", "NO"))),
@@ -141,15 +107,10 @@ GMLReader::GMLReader(
       m_bConsiderEPSGAsURN(bConsiderEPSGAsURN),
       m_eSwapCoordinates(eSwapCoordinates),
       m_bGetSecondaryGeometryOption(bGetSecondaryGeometryOption),
-      m_pszGlobalSRSName(nullptr), m_bCanUseGlobalSRSName(false),
-      m_pszFilteredClassName(nullptr), m_nFilteredClassIndex(-1),
-      m_nHasSequentialLayers(-1),
       // Must be in synced in OGR_G_CreateFromGML(), OGRGMLLayer::OGRGMLLayer(),
       // and GMLReader::GMLReader().
       m_bFaceHoleNegative(
-          CPLTestBool(CPLGetConfigOption("GML_FACE_HOLE_NEGATIVE", "NO"))),
-      m_bSetWidthFlag(true), m_bReportAllAttributes(false),
-      m_bIsWFSJointLayer(false), m_bEmptyAsNull(true)
+          CPLTestBool(CPLGetConfigOption("GML_FACE_HOLE_NEGATIVE", "NO")))
 {
 #ifndef HAVE_XERCES
 #else
@@ -539,11 +500,12 @@ GMLFeature *GMLReader::NextFeatureExpat()
         {
             // Defer emission of the error message until we have to return
             // nullptr
-            m_osErrorMessage.Printf("XML parsing of GML file failed : %s "
-                                    "at line %d, column %d",
-                                    XML_ErrorString(XML_GetErrorCode(oParser)),
-                                    (int)XML_GetCurrentLineNumber(oParser),
-                                    (int)XML_GetCurrentColumnNumber(oParser));
+            m_osErrorMessage.Printf(
+                "XML parsing of GML file failed : %s "
+                "at line %d, column %d",
+                XML_ErrorString(XML_GetErrorCode(oParser)),
+                static_cast<int>(XML_GetCurrentLineNumber(oParser)),
+                static_cast<int>(XML_GetCurrentColumnNumber(oParser)));
             m_bStopParsing = true;
         }
         if (!m_bStopParsing)
@@ -717,19 +679,19 @@ int GMLReader::GetFeatureElementIndex(const char *pszElement,
         }
 
         // Begin of CSW SearchResults.
-        else if (nElementLength == (int)strlen("BriefRecord") &&
+        else if (nElementLength == static_cast<int>(strlen("BriefRecord")) &&
                  nLenLast == strlen("SearchResults") &&
                  strcmp(pszElement, "BriefRecord") == 0 &&
                  strcmp(pszLast, "SearchResults") == 0)
         {
         }
-        else if (nElementLength == (int)strlen("SummaryRecord") &&
+        else if (nElementLength == static_cast<int>(strlen("SummaryRecord")) &&
                  nLenLast == strlen("SearchResults") &&
                  strcmp(pszElement, "SummaryRecord") == 0 &&
                  strcmp(pszLast, "SearchResults") == 0)
         {
         }
-        else if (nElementLength == (int)strlen("Record") &&
+        else if (nElementLength == static_cast<int>(strlen("Record")) &&
                  nLenLast == strlen("SearchResults") &&
                  strcmp(pszElement, "Record") == 0 &&
                  strcmp(pszLast, "SearchResults") == 0)
@@ -779,7 +741,8 @@ int GMLReader::GetFeatureElementIndex(const char *pszElement,
     // otherwise, find a class with the desired element name.
     for (int i = 0; i < m_nClassCount; i++)
     {
-        if (nElementLength == (int)m_papoClass[i]->GetElementNameLen() &&
+        if (nElementLength ==
+                static_cast<int>(m_papoClass[i]->GetElementNameLen()) &&
             memcmp(pszElement, m_papoClass[i]->GetElementName(),
                    nElementLength) == 0)
             return i;
@@ -908,8 +871,8 @@ void GMLReader::PopState()
             if (nFeatureTabLength >= nFeatureTabAlloc)
             {
                 nFeatureTabAlloc = nFeatureTabLength * 4 / 3 + 16;
-                ppoFeatureTab = (GMLFeature **)CPLRealloc(
-                    ppoFeatureTab, sizeof(GMLFeature *) * (nFeatureTabAlloc));
+                ppoFeatureTab = static_cast<GMLFeature **>(CPLRealloc(
+                    ppoFeatureTab, sizeof(GMLFeature *) * (nFeatureTabAlloc)));
             }
             ppoFeatureTab[nFeatureTabLength] = m_poState->m_poFeature;
             nFeatureTabLength++;
diff --git a/ogr/ogrsf_frmts/gml/gmlreader.h b/ogr/ogrsf_frmts/gml/gmlreader.h
index 69cb11d35fcf..eb82ca3790ac 100644
--- a/ogr/ogrsf_frmts/gml/gmlreader.h
+++ b/ogr/ogrsf_frmts/gml/gmlreader.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2002, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GMLREADER_H_INCLUDED
@@ -36,6 +20,7 @@
 #include "cpl_minixml.h"
 #include "ogr_core.h"
 #include "gmlutils.h"
+#include "gmlfeature.h"
 
 #include <map>
 #include <vector>
@@ -43,431 +28,6 @@
 // Special value to map to a NULL field
 #define OGR_GML_NULL "___OGR_GML_NULL___"
 
-typedef enum
-{
-    GMLPT_Untyped = 0,
-    GMLPT_String = 1,
-    GMLPT_Integer = 2,
-    GMLPT_Real = 3,
-    GMLPT_Complex = 4,
-    GMLPT_StringList = 5,
-    GMLPT_IntegerList = 6,
-    GMLPT_RealList = 7,
-    GMLPT_FeatureProperty = 8,
-    GMLPT_FeaturePropertyList = 9,
-    GMLPT_Boolean = 10,
-    GMLPT_BooleanList = 11,
-    GMLPT_Short = 12,
-    GMLPT_Float = 13,
-    GMLPT_Integer64 = 14,
-    GMLPT_Integer64List = 15,
-    GMLPT_DateTime = 16,
-    GMLPT_Date = 17,
-    GMLPT_Time = 18,
-} GMLPropertyType;
-
-/************************************************************************/
-/*                           GMLPropertyDefn                            */
-/************************************************************************/
-
-typedef struct
-{
-    int nSubProperties;
-    char **papszSubProperties;
-    char *aszSubProperties[2]; /* Optimization in the case of nSubProperties ==
-                                  1 */
-} GMLProperty;
-
-class CPL_DLL GMLPropertyDefn
-{
-    char *m_pszName;
-    GMLPropertyType m_eType;
-    int m_nWidth;
-    int m_nPrecision;
-    char *m_pszSrcElement;
-    size_t m_nSrcElementLen;
-    char *m_pszCondition;
-    bool m_bNullable;
-    bool m_bUnique = false;
-    std::string m_osDocumentation{};
-
-  public:
-    explicit GMLPropertyDefn(const char *pszName,
-                             const char *pszSrcElement = nullptr);
-    ~GMLPropertyDefn();
-
-    const char *GetName() const
-    {
-        return m_pszName;
-    }
-
-    GMLPropertyType GetType() const
-    {
-        return m_eType;
-    }
-
-    void SetType(GMLPropertyType eType)
-    {
-        m_eType = eType;
-    }
-
-    void SetWidth(int nWidth)
-    {
-        m_nWidth = nWidth;
-    }
-
-    int GetWidth() const
-    {
-        return m_nWidth;
-    }
-
-    void SetPrecision(int nPrecision)
-    {
-        m_nPrecision = nPrecision;
-    }
-
-    int GetPrecision() const
-    {
-        return m_nPrecision;
-    }
-
-    void SetSrcElement(const char *pszSrcElement);
-
-    const char *GetSrcElement() const
-    {
-        return m_pszSrcElement;
-    }
-
-    size_t GetSrcElementLen() const
-    {
-        return m_nSrcElementLen;
-    }
-
-    void SetCondition(const char *pszCondition);
-
-    const char *GetCondition() const
-    {
-        return m_pszCondition;
-    }
-
-    void SetNullable(bool bNullable)
-    {
-        m_bNullable = bNullable;
-    }
-
-    bool IsNullable() const
-    {
-        return m_bNullable;
-    }
-
-    void SetUnique(bool bUnique)
-    {
-        m_bUnique = bUnique;
-    }
-
-    bool IsUnique() const
-    {
-        return m_bUnique;
-    }
-
-    void SetDocumentation(const std::string &osDocumentation)
-    {
-        m_osDocumentation = osDocumentation;
-    }
-
-    const std::string &GetDocumentation() const
-    {
-        return m_osDocumentation;
-    }
-
-    void AnalysePropertyValue(const GMLProperty *psGMLProperty,
-                              bool bSetWidth = true);
-
-    static bool IsSimpleType(GMLPropertyType eType)
-    {
-        return eType == GMLPT_String || eType == GMLPT_Integer ||
-               eType == GMLPT_Real;
-    }
-};
-
-/************************************************************************/
-/*                    GMLGeometryPropertyDefn                           */
-/************************************************************************/
-
-class CPL_DLL GMLGeometryPropertyDefn
-{
-    char *m_pszName;
-    char *m_pszSrcElement;
-    OGRwkbGeometryType m_nGeometryType = wkbUnknown;
-    int m_nAttributeIndex;
-    bool m_bNullable;
-    bool m_bSRSNameConsistent = true;
-    std::string m_osSRSName{};
-    OGRGeomCoordinatePrecision m_oCoordPrecision{};
-
-  public:
-    GMLGeometryPropertyDefn(const char *pszName, const char *pszSrcElement,
-                            OGRwkbGeometryType nType, int nAttributeIndex,
-                            bool bNullable,
-                            const OGRGeomCoordinatePrecision &oCoordPrec =
-                                OGRGeomCoordinatePrecision());
-    ~GMLGeometryPropertyDefn();
-
-    const char *GetName() const
-    {
-        return m_pszName;
-    }
-
-    OGRwkbGeometryType GetType() const
-    {
-        return m_nGeometryType;
-    }
-
-    void SetType(OGRwkbGeometryType nType)
-    {
-        m_nGeometryType = nType;
-    }
-
-    const char *GetSrcElement() const
-    {
-        return m_pszSrcElement;
-    }
-
-    int GetAttributeIndex() const
-    {
-        return m_nAttributeIndex;
-    }
-
-    bool IsNullable() const
-    {
-        return m_bNullable;
-    }
-
-    const OGRGeomCoordinatePrecision &GetCoordinatePrecision() const
-    {
-        return m_oCoordPrecision;
-    }
-
-    void SetSRSName(const std::string &srsName)
-    {
-        m_bSRSNameConsistent = true;
-        m_osSRSName = srsName;
-    }
-
-    void MergeSRSName(const std::string &osSRSName);
-
-    const std::string &GetSRSName() const
-    {
-        return m_osSRSName;
-    }
-};
-
-/************************************************************************/
-/*                           GMLFeatureClass                            */
-/************************************************************************/
-class CPL_DLL GMLFeatureClass
-{
-    char *m_pszName;
-    char *m_pszElementName;
-    int n_nNameLen;
-    int n_nElementNameLen;
-    int m_nPropertyCount;
-    GMLPropertyDefn **m_papoProperty;
-    std::map<CPLString, int> m_oMapPropertyNameToIndex;
-    std::map<CPLString, int> m_oMapPropertySrcElementToIndex;
-
-    int m_nGeometryPropertyCount;
-    GMLGeometryPropertyDefn **m_papoGeometryProperty;
-
-    bool m_bSchemaLocked;
-
-    GIntBig m_nFeatureCount;
-
-    char *m_pszExtraInfo;
-
-    bool m_bHaveExtents;
-    double m_dfXMin;
-    double m_dfXMax;
-    double m_dfYMin;
-    double m_dfYMax;
-
-    char *m_pszSRSName;
-    bool m_bSRSNameConsistent;
-
-    bool m_bIsConsistentSingleGeomElemPath = true;
-    std::string m_osSingleGeomElemPath{};
-
-  public:
-    explicit GMLFeatureClass(const char *pszName = "");
-    ~GMLFeatureClass();
-
-    const char *GetElementName() const;
-    size_t GetElementNameLen() const;
-    void SetElementName(const char *pszElementName);
-
-    const char *GetName() const
-    {
-        return m_pszName;
-    }
-
-    void SetName(const char *pszNewName);
-
-    int GetPropertyCount() const
-    {
-        return m_nPropertyCount;
-    }
-
-    GMLPropertyDefn *GetProperty(int iIndex) const;
-    int GetPropertyIndex(const char *pszName) const;
-
-    GMLPropertyDefn *GetProperty(const char *pszName) const
-    {
-        return GetProperty(GetPropertyIndex(pszName));
-    }
-
-    int GetPropertyIndexBySrcElement(const char *pszElement, int nLen) const;
-    void StealProperties();
-
-    int GetGeometryPropertyCount() const
-    {
-        return m_nGeometryPropertyCount;
-    }
-
-    GMLGeometryPropertyDefn *GetGeometryProperty(int iIndex) const;
-    int GetGeometryPropertyIndexBySrcElement(const char *pszElement) const;
-    void StealGeometryProperties();
-
-    bool HasFeatureProperties();
-
-    int AddProperty(GMLPropertyDefn *, int iPos = -1);
-    int AddGeometryProperty(GMLGeometryPropertyDefn *);
-    void ClearGeometryProperties();
-
-    void SetConsistentSingleGeomElemPath(bool b)
-    {
-        m_bIsConsistentSingleGeomElemPath = b;
-    }
-
-    bool IsConsistentSingleGeomElemPath() const
-    {
-        return m_bIsConsistentSingleGeomElemPath;
-    }
-
-    void SetSingleGeomElemPath(const std::string &s)
-    {
-        m_osSingleGeomElemPath = s;
-    }
-
-    const std::string &GetSingleGeomElemPath() const
-    {
-        return m_osSingleGeomElemPath;
-    }
-
-    bool IsSchemaLocked() const
-    {
-        return m_bSchemaLocked;
-    }
-
-    void SetSchemaLocked(bool bLock)
-    {
-        m_bSchemaLocked = bLock;
-    }
-
-    const char *GetExtraInfo();
-    void SetExtraInfo(const char *);
-
-    GIntBig GetFeatureCount();
-    void SetFeatureCount(GIntBig);
-
-    bool HasExtents() const
-    {
-        return m_bHaveExtents;
-    }
-
-    void SetExtents(double dfXMin, double dfXMax, double dFYMin, double dfYMax);
-    bool GetExtents(double *pdfXMin, double *pdfXMax, double *pdFYMin,
-                    double *pdfYMax);
-
-    void SetSRSName(const char *pszSRSName);
-    void MergeSRSName(const char *pszSRSName);
-
-    const char *GetSRSName()
-    {
-        return m_pszSRSName;
-    }
-
-    CPLXMLNode *SerializeToXML();
-    bool InitializeFromXML(CPLXMLNode *);
-};
-
-/************************************************************************/
-/*                              GMLFeature                              */
-/************************************************************************/
-
-class CPL_DLL GMLFeature
-{
-    GMLFeatureClass *m_poClass;
-    char *m_pszFID;
-
-    int m_nPropertyCount;
-    GMLProperty *m_pasProperties;
-
-    int m_nGeometryCount;
-    CPLXMLNode **m_papsGeometry;  /* NULL-terminated. Alias to m_apsGeometry if
-                                     m_nGeometryCount <= 1 */
-    CPLXMLNode *m_apsGeometry[2]; /* NULL-terminated */
-
-    CPLXMLNode *m_psBoundedByGeometry = nullptr;
-
-  public:
-    explicit GMLFeature(GMLFeatureClass *);
-    ~GMLFeature();
-
-    GMLFeatureClass *GetClass() const
-    {
-        return m_poClass;
-    }
-
-    void SetGeometryDirectly(CPLXMLNode *psGeom);
-    void SetGeometryDirectly(int nIdx, CPLXMLNode *psGeom);
-    void AddGeometry(CPLXMLNode *psGeom);
-
-    int GetGeometryCount() const
-    {
-        return m_nGeometryCount;
-    }
-
-    const CPLXMLNode *const *GetGeometryList() const
-    {
-        return m_papsGeometry;
-    }
-
-    const CPLXMLNode *GetGeometryRef(int nIdx) const;
-
-    void SetBoundedByGeometry(CPLXMLNode *psGeom);
-
-    const CPLXMLNode *GetBoundedByGeometry() const
-    {
-        return m_psBoundedByGeometry;
-    }
-
-    void SetPropertyDirectly(int i, char *pszValue);
-
-    const GMLProperty *GetProperty(int i) const
-    {
-        return (i >= 0 && i < m_nPropertyCount) ? &m_pasProperties[i] : nullptr;
-    }
-
-    const char *GetFID() const
-    {
-        return m_pszFID;
-    }
-
-    void SetFID(const char *pszFID);
-
-    void Dump(FILE *fp);
-};
-
 /************************************************************************/
 /*                              IGMLReader                              */
 /************************************************************************/
@@ -535,7 +95,4 @@ IGMLReader *CreateGMLReader(bool bUseExpatParserPreferably,
                             GMLSwapCoordinatesEnum eSwapCoordinates,
                             bool bGetSecondaryGeometryOption);
 
-OGRFieldType CPL_DLL GML_GetOGRFieldType(GMLPropertyType eType,
-                                         OGRFieldSubType &eSubType);
-
 #endif /* GMLREADER_H_INCLUDED */
diff --git a/ogr/ogrsf_frmts/gml/gmlreaderp.h b/ogr/ogrsf_frmts/gml/gmlreaderp.h
index 39e80b1a84c2..2a59e08538e5 100644
--- a/ogr/ogrsf_frmts/gml/gmlreaderp.h
+++ b/ogr/ogrsf_frmts/gml/gmlreaderp.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2002, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_GMLREADERP_H_INCLUDED
@@ -71,6 +55,8 @@ class GFSTemplateList
     GFSTemplateItem *pLast;
     GFSTemplateItem *Insert(const char *pszName);
 
+    CPL_DISALLOW_COPY_ASSIGN(GFSTemplateList)
+
   public:
     GFSTemplateList();
     ~GFSTemplateList();
@@ -128,41 +114,41 @@ typedef enum
 
 class GMLHandler
 {
-    char *m_pszCurField;
-    unsigned int m_nCurFieldAlloc;
-    unsigned int m_nCurFieldLen;
-    bool m_bInCurField;
-    int m_nAttributeIndex;
-    int m_nAttributeDepth;
-
-    char *m_pszGeometry;
-    unsigned int m_nGeomAlloc;
-    unsigned int m_nGeomLen;
-    int m_nGeometryDepth;
-    bool m_bAlreadyFoundGeometry;
-    int m_nGeometryPropertyIndex;
+    char *m_pszCurField = nullptr;
+    unsigned int m_nCurFieldAlloc = 0;
+    unsigned int m_nCurFieldLen = 0;
+    bool m_bInCurField = false;
+    int m_nAttributeIndex = -1;
+    int m_nAttributeDepth = 0;
+
+    char *m_pszGeometry = nullptr;
+    unsigned int m_nGeomAlloc = 0;
+    unsigned int m_nGeomLen = 0;
+    int m_nGeometryDepth = 0;
+    bool m_bAlreadyFoundGeometry = false;
+    int m_nGeometryPropertyIndex = 0;
     std::map<std::string, CPLXMLNode *> m_oMapElementToSubstitute{};
 
-    int m_nDepth;
-    int m_nDepthFeature;
+    int m_nDepth = 0;
+    int m_nDepthFeature = 0;
     int m_nUnlimitedDepth = -1;  // -1 unknown, 0=false, 1=true
 
-    int m_inBoundedByDepth;
+    int m_inBoundedByDepth = 0;
 
-    char *m_pszCityGMLGenericAttrName;
-    int m_inCityGMLGenericAttrDepth;
+    char *m_pszCityGMLGenericAttrName = nullptr;
+    int m_inCityGMLGenericAttrDepth = 0;
 
-    bool m_bReportHref;
-    char *m_pszHref;
-    char *m_pszUom;
-    char *m_pszValue;
-    char *m_pszKieli;
+    bool m_bReportHref = false;
+    char *m_pszHref = nullptr;
+    char *m_pszUom = nullptr;
+    char *m_pszValue = nullptr;
+    char *m_pszKieli = nullptr;
 
-    GeometryNamesStruct *pasGeometryNames;
+    GeometryNamesStruct *pasGeometryNames = nullptr;
 
-    std::vector<NodeLastChild> apsXMLNode;
+    std::vector<NodeLastChild> apsXMLNode{};
 
-    int m_nSRSDimensionIfMissing;
+    int m_nSRSDimensionIfMissing = 0;
 
     OGRErr startElementTop(const char *pszName, int nLenName, void *attr);
 
@@ -200,14 +186,16 @@ class GMLHandler
     bool IsConditionMatched(const char *pszCondition, void *attr);
     int FindRealPropertyByCheckingConditions(int nIdx, void *attr);
 
+    CPL_DISALLOW_COPY_ASSIGN(GMLHandler)
+
   protected:
-    GMLReader *m_poReader;
-    GMLAppSchemaType eAppSchemaType;
+    GMLReader *m_poReader = nullptr;
+    GMLAppSchemaType eAppSchemaType = APPSCHEMA_GENERIC;
 
-    int nStackDepth;
+    int nStackDepth = 0;
     HandlerState stateStack[STACK_SIZE];
 
-    CPLString m_osFID;
+    CPLString m_osFID{};
     virtual const char *GetFID(void *attr) = 0;
 
     virtual CPLXMLNode *AddAttributes(CPLXMLNode *psNode, void *attr) = 0;
@@ -226,6 +214,11 @@ class GMLHandler
                                     const char *pszAttributeName) = 0;
     virtual char *GetAttributeByIdx(void *attr, unsigned int idx,
                                     char **ppszKey) = 0;
+
+    GMLAppSchemaType GetAppSchemaType() const
+    {
+        return eAppSchemaType;
+    }
 };
 
 #if defined(HAVE_XERCES)
@@ -235,11 +228,11 @@ class GMLHandler
 /************************************************************************/
 class GMLXercesHandler final : public DefaultHandler, public GMLHandler
 {
-    int m_nEntityCounter;
-    CPLString m_osElement;
-    CPLString m_osCharacters;
-    CPLString m_osAttrName;
-    CPLString m_osAttrValue;
+    int m_nEntityCounter = 0;
+    CPLString m_osElement{};
+    CPLString m_osCharacters{};
+    CPLString m_osAttrName{};
+    CPLString m_osAttrValue{};
 
   public:
     explicit GMLXercesHandler(GMLReader *poReader);
@@ -274,12 +267,14 @@ class GMLXercesHandler final : public DefaultHandler, public GMLHandler
 /************************************************************************/
 class GMLExpatHandler final : public GMLHandler
 {
-    XML_Parser m_oParser;
-    bool m_bStopParsing;
-    int m_nDataHandlerCounter;
+    XML_Parser m_oParser = nullptr;
+    bool m_bStopParsing = false;
+    int m_nDataHandlerCounter = 0;
 
     void DealWithError(OGRErr eErr);
 
+    CPL_DISALLOW_COPY_ASSIGN(GMLExpatHandler)
+
   public:
     GMLExpatHandler(GMLReader *poReader, XML_Parser oParser);
 
@@ -317,11 +312,13 @@ class GMLExpatHandler final : public GMLHandler
 
 class GMLReadState
 {
-    std::vector<std::string> aosPathComponents;
+    std::vector<std::string> aosPathComponents{};
+
+    CPL_DISALLOW_COPY_ASSIGN(GMLReadState)
 
   public:
-    GMLReadState();
-    ~GMLReadState();
+    GMLReadState() = default;
+    ~GMLReadState() = default;
 
     void PushPath(const char *pszElement, int nLen = -1);
     void PopPath();
@@ -342,11 +339,11 @@ class GMLReadState
 
     void Reset();
 
-    GMLFeature *m_poFeature;
-    GMLReadState *m_poParentState;
+    GMLFeature *m_poFeature = nullptr;
+    GMLReadState *m_poParentState = nullptr;
 
-    std::string osPath;  // element path ... | as separator.
-    int m_nPathLength;
+    std::string osPath{};  // element path ... | as separator.
+    int m_nPathLength = 0;
 };
 
 /************************************************************************/
@@ -356,81 +353,85 @@ class GMLReadState
 class GMLReader final : public IGMLReader
 {
   private:
-    bool m_bClassListLocked;
+    bool m_bClassListLocked = false;
 
-    int m_nClassCount;
-    GMLFeatureClass **m_papoClass;
-    bool m_bLookForClassAtAnyLevel;
+    int m_nClassCount = 0;
+    GMLFeatureClass **m_papoClass = nullptr;
+    bool m_bLookForClassAtAnyLevel = false;
 
-    char *m_pszFilename;
+    char *m_pszFilename = nullptr;
 
-    bool bUseExpatReader;
+#ifndef HAVE_XERCES
+    bool bUseExpatReader = true;
+#else
+    bool bUseExpatReader = false;
+#endif
 
-    GMLHandler *m_poGMLHandler;
+    GMLHandler *m_poGMLHandler = nullptr;
 
 #if defined(HAVE_XERCES)
-    SAX2XMLReader *m_poSAXReader;
-    XMLPScanToken m_oToFill;
-    GMLFeature *m_poCompleteFeature;
-    InputSource *m_GMLInputSource;
-    bool m_bEOF;
-    bool m_bXercesInitialized;
+    SAX2XMLReader *m_poSAXReader = nullptr;
+    XMLPScanToken m_oToFill{};
+    GMLFeature *m_poCompleteFeature = nullptr;
+    InputSource *m_GMLInputSource = nullptr;
+    bool m_bEOF = false;
+    bool m_bXercesInitialized = false;
     bool SetupParserXerces();
     GMLFeature *NextFeatureXerces();
 #endif
 
 #if defined(HAVE_EXPAT)
-    XML_Parser oParser;
-    GMLFeature **ppoFeatureTab;
-    int nFeatureTabLength;
-    int nFeatureTabIndex;
-    int nFeatureTabAlloc;
+    XML_Parser oParser = nullptr;
+    GMLFeature **ppoFeatureTab = nullptr;
+    int nFeatureTabLength = 0;
+    int nFeatureTabIndex = 0;
+    int nFeatureTabAlloc = 0;
     bool SetupParserExpat();
     GMLFeature *NextFeatureExpat();
-    char *pabyBuf;
+    char *pabyBuf = nullptr;
     CPLString m_osErrorMessage{};
 #endif
 
-    VSILFILE *fpGML;
-    bool m_bReadStarted;
+    VSILFILE *fpGML = nullptr;
+    bool m_bReadStarted = false;
 
-    GMLReadState *m_poState;
-    GMLReadState *m_poRecycledState;
+    GMLReadState *m_poState = nullptr;
+    GMLReadState *m_poRecycledState = nullptr;
 
-    bool m_bStopParsing;
+    bool m_bStopParsing = false;
 
     bool SetupParser();
     void CleanupParser();
 
-    bool m_bFetchAllGeometries;
+    bool m_bFetchAllGeometries = false;
 
-    bool m_bInvertAxisOrderIfLatLong;
-    bool m_bConsiderEPSGAsURN;
-    GMLSwapCoordinatesEnum m_eSwapCoordinates;
-    bool m_bGetSecondaryGeometryOption;
+    bool m_bInvertAxisOrderIfLatLong = false;
+    bool m_bConsiderEPSGAsURN = false;
+    GMLSwapCoordinatesEnum m_eSwapCoordinates = GML_SWAP_AUTO;
+    bool m_bGetSecondaryGeometryOption = false;
 
     int ParseFeatureType(CPLXMLNode *psSchemaNode, const char *pszName,
                          const char *pszType);
 
-    char *m_pszGlobalSRSName;
-    bool m_bCanUseGlobalSRSName;
+    char *m_pszGlobalSRSName = nullptr;
+    bool m_bCanUseGlobalSRSName = false;
 
-    char *m_pszFilteredClassName;
-    int m_nFilteredClassIndex;
+    char *m_pszFilteredClassName = nullptr;
+    int m_nFilteredClassIndex = -1;
 
-    int m_nHasSequentialLayers;
+    int m_nHasSequentialLayers = -1;
 
-    std::string osElemPath;
+    std::string osElemPath{};
 
-    bool m_bFaceHoleNegative;
+    bool m_bFaceHoleNegative = false;
 
-    bool m_bSetWidthFlag;
+    bool m_bSetWidthFlag = true;
 
-    bool m_bReportAllAttributes;
+    bool m_bReportAllAttributes = false;
 
-    bool m_bIsWFSJointLayer;
+    bool m_bIsWFSJointLayer = false;
 
-    bool m_bEmptyAsNull;
+    bool m_bEmptyAsNull = true;
 
     bool m_bUseBBOX = false;
 
@@ -438,6 +439,8 @@ class GMLReader final : public IGMLReader
                           const bool bSqliteIsTempFile,
                           const int iSqliteCacheMB);
 
+    CPL_DISALLOW_COPY_ASSIGN(GMLReader)
+
   public:
     GMLReader(bool bExpatReader, bool bInvertAxisOrderIfLatLong,
               bool bConsiderEPSGAsURN, GMLSwapCoordinatesEnum eSwapCoordinates,
diff --git a/ogr/ogrsf_frmts/gml/gmlreadstate.cpp b/ogr/ogrsf_frmts/gml/gmlreadstate.cpp
index cd4a1b6ebb39..080144e07b1a 100644
--- a/ogr/ogrsf_frmts/gml/gmlreadstate.cpp
+++ b/ogr/ogrsf_frmts/gml/gmlreadstate.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2002, Frank Warmerdam
  * Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -39,23 +23,6 @@
 #include "cpl_error.h"
 #include "cpl_string.h"
 
-/************************************************************************/
-/*                            GMLReadState()                            */
-/************************************************************************/
-
-GMLReadState::GMLReadState()
-    : m_poFeature(nullptr), m_poParentState(nullptr), m_nPathLength(0)
-{
-}
-
-/************************************************************************/
-/*                           ~GMLReadState()                            */
-/************************************************************************/
-
-GMLReadState::~GMLReadState()
-{
-}
-
 /************************************************************************/
 /*                              Reset()                                 */
 /************************************************************************/
@@ -65,7 +32,7 @@ void GMLReadState::Reset()
     m_poFeature = nullptr;
     m_poParentState = nullptr;
 
-    osPath.resize(0);
+    osPath.clear();
     m_nPathLength = 0;
 }
 
diff --git a/ogr/ogrsf_frmts/gml/gmlregistry.cpp b/ogr/ogrsf_frmts/gml/gmlregistry.cpp
index 5a3b3e1b7ced..766d74dfe3b7 100644
--- a/ogr/ogrsf_frmts/gml/gmlregistry.cpp
+++ b/ogr/ogrsf_frmts/gml/gmlregistry.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/gml/gmlregistry.h b/ogr/ogrsf_frmts/gml/gmlregistry.h
index 59a1888c0de9..608077e20cff 100644
--- a/ogr/ogrsf_frmts/gml/gmlregistry.h
+++ b/ogr/ogrsf_frmts/gml/gmlregistry.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GMLREGISTRY_H_INCLUDED
@@ -38,10 +22,10 @@
 class GMLRegistryFeatureType
 {
   public:
-    CPLString osElementName;
-    CPLString osElementValue;
-    CPLString osSchemaLocation;
-    CPLString osGFSSchemaLocation;
+    CPLString osElementName{};
+    CPLString osElementValue{};
+    CPLString osSchemaLocation{};
+    CPLString osGFSSchemaLocation{};
 
     bool Parse(const char *pszRegistryFilename, CPLXMLNode *psNode);
 };
@@ -49,24 +33,22 @@ class GMLRegistryFeatureType
 class GMLRegistryNamespace
 {
   public:
-    GMLRegistryNamespace() : bUseGlobalSRSName(false)
-    {
-    }
+    GMLRegistryNamespace() = default;
 
-    CPLString osPrefix;
-    CPLString osURI;
-    bool bUseGlobalSRSName;
-    std::vector<GMLRegistryFeatureType> aoFeatureTypes;
+    CPLString osPrefix{};
+    CPLString osURI{};
+    bool bUseGlobalSRSName = false;
+    std::vector<GMLRegistryFeatureType> aoFeatureTypes{};
 
     bool Parse(const char *pszRegistryFilename, CPLXMLNode *psNode);
 };
 
 class GMLRegistry
 {
-    CPLString osRegistryPath;
+    CPLString osRegistryPath{};
 
   public:
-    std::vector<GMLRegistryNamespace> aoNamespaces;
+    std::vector<GMLRegistryNamespace> aoNamespaces{};
 
     explicit GMLRegistry(const CPLString &osRegistryPathIn)
         : osRegistryPath(osRegistryPathIn)
diff --git a/ogr/ogrsf_frmts/gml/gmlutils.h b/ogr/ogrsf_frmts/gml/gmlutils.h
deleted file mode 100644
index 04de1deef375..000000000000
--- a/ogr/ogrsf_frmts/gml/gmlutils.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/******************************************************************************
- * $Id$
- *
- * Project:  GML Utils
- * Purpose:  GML reader
- * Author:   Even Rouault, <even dot rouault at spatialys.com>
- *
- ******************************************************************************
- * Copyright (c) 2010-2011, Even Rouault <even dot rouault at spatialys.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 CPL_GMLUTILS_H_INCLUDED
-#define CPL_GMLUTILS_H_INCLUDED
-
-#include <vector>
-#include <string>
-#include "cpl_minixml.h"
-
-#include "ogr_geometry.h"
-
-typedef enum
-{
-    GML_SWAP_AUTO,
-    GML_SWAP_YES,
-    GML_SWAP_NO,
-} GMLSwapCoordinatesEnum;
-
-typedef enum
-{
-    SRSNAME_SHORT,
-    SRSNAME_OGC_URN,
-    SRSNAME_OGC_URL
-} OGRGMLSRSNameFormat;
-
-const char *
-GML_ExtractSrsNameFromGeometry(const CPLXMLNode *const *papsGeometry,
-                               std::string &osWork, bool bConsiderEPSGAsURN);
-
-bool GML_IsSRSLatLongOrder(const char *pszSRSName);
-bool GML_IsLegitSRSName(const char *pszSRSName);
-
-void *GML_BuildOGRGeometryFromList_CreateCache();
-void GML_BuildOGRGeometryFromList_DestroyCache(void *hCacheSRS);
-
-OGRGeometry *GML_BuildOGRGeometryFromList(
-    const CPLXMLNode *const *papsGeometry, bool bTryToMakeMultipolygons,
-    bool bInvertAxisOrderIfLatLong, const char *pszDefaultSRSName,
-    bool bConsiderEPSGAsURN, GMLSwapCoordinatesEnum eSwapCoordinates,
-    int nPseudoBoolGetSecondaryGeometryOption, void *hCacheSRS,
-    bool bFaceHoleNegative = false);
-
-char *GML_GetSRSName(const OGRSpatialReference *poSRS,
-                     OGRGMLSRSNameFormat eSRSNameFormat, bool *pbCoordSwap);
-
-#endif /* _CPL_GMLREADERP_H_INCLUDED */
diff --git a/ogr/ogrsf_frmts/gml/hugefileresolver.cpp b/ogr/ogrsf_frmts/gml/hugefileresolver.cpp
index 1dac15fbb498..b80e9073a479 100644
--- a/ogr/ogrsf_frmts/gml/hugefileresolver.cpp
+++ b/ogr/ogrsf_frmts/gml/hugefileresolver.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2011, Alessandro Furieri
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  *
  ******************************************************************************
  * Contributor: Alessandro Furieri, a.furieri@lqt.it
@@ -39,6 +23,7 @@
 #include "gmlreaderp.h"
 
 #include <algorithm>
+#include <cmath>
 #include <limits>
 
 #include "cpl_conv.h"
@@ -52,7 +37,7 @@
 #include <sqlite3.h>
 
 #undef SQLITE_STATIC
-#define SQLITE_STATIC ((sqlite3_destructor_type) nullptr)
+#define SQLITE_STATIC static_cast<sqlite3_destructor_type>(nullptr)
 
 #endif
 
@@ -1036,7 +1021,7 @@ static void gmlHugeFileNodeCoords(struct huge_tag *pItem,
         CPLCreateXMLNode(nullptr, CXT_Element, "TopoCurve");
     CPLXMLNode *psDirEdge =
         CPLCreateXMLNode(psTopoCurve, CXT_Element, "directedEdge");
-    CPLXMLNode *psEdge = CPLCloneXMLTree((CPLXMLNode *)psNode);
+    CPLXMLNode *psEdge = CPLCloneXMLTree(psNode);
     CPLAddXMLChild(psDirEdge, psEdge);
     OGRGeometry *poTopoCurve = GML2OGRGeometry_XMLNode(psTopoCurve, FALSE);
     CPLDestroyXMLNode(psTopoCurve);
@@ -1586,6 +1571,7 @@ static bool gmlHugeResolveEdges(CPL_UNUSED huge_helper *helper,
 static bool gmlHugeFileWriteResolved(huge_helper *helper,
                                      const char *pszOutputFilename,
                                      GMLReader *pReader,
+                                     GMLAppSchemaType eAppSchemaType,
                                      int *m_nHasSequentialLayers)
 {
     // Open the resolved GML file for writing.
@@ -1612,10 +1598,20 @@ static bool gmlHugeFileWriteResolved(huge_helper *helper,
         return false;
     }
 
+    const char *pszTopElement = "ResolvedTopoFeatureMembers";
+    // For some specific application schema, GMLHandler has specific behavior,
+    // so re-use the root XML element it recognizes.
+    if (eAppSchemaType == APPSCHEMA_AIXM)
+        pszTopElement = "AIXMBasicMessage";
+    else if (eAppSchemaType == APPSCHEMA_CITYGML)
+        pszTopElement = "CityModel";
+
     VSIFPrintfL(fp, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
-    VSIFPrintfL(fp, "<ResolvedTopoFeatureCollection  "
-                    "xmlns:xlink=\"http://www.w3.org/1999/xlink\" "
-                    "xmlns:gml=\"http://www.opengis.net/gml\">\n");
+    VSIFPrintfL(fp,
+                "<%s  "
+                "xmlns:xlink=\"http://www.w3.org/1999/xlink\" "
+                "xmlns:gml=\"http://www.opengis.net/gml\">\n",
+                pszTopElement);
     VSIFPrintfL(fp, "  <ResolvedTopoFeatureMembers>\n");
 
     int iOutCount = 0;
@@ -1701,7 +1697,15 @@ static bool gmlHugeFileWriteResolved(huge_helper *helper,
         const int iPropCount = poClass->GetPropertyCount();
 
         bool b_has_geom = false;
-        VSIFPrintfL(fp, "    <%s>\n", poClass->GetElementName());
+        VSIFPrintfL(fp, "    <%s", poClass->GetElementName());
+        const char *pszGmlId = poFeature->GetFID();
+        if (pszGmlId)
+        {
+            char *gmlText = CPLEscapeString(pszGmlId, -1, CPLES_XML);
+            VSIFPrintfL(fp, " gml:id=\"%s\"", gmlText);
+            CPLFree(gmlText);
+        }
+        VSIFPrintfL(fp, ">\n");
 
         for (int iProp = 0; iProp < iPropCount; iProp++)
         {
@@ -1715,8 +1719,27 @@ static bool gmlHugeFileWriteResolved(huge_helper *helper,
                 {
                     char *gmlText = CPLEscapeString(
                         poProp->papszSubProperties[iSub], -1, CPLES_XML);
-                    VSIFPrintfL(fp, "      <%s>%s</%s>\n", pszPropName, gmlText,
-                                pszPropName);
+                    if (strchr(pszPropName, '|'))
+                    {
+                        const CPLStringList aosPropNameComps(
+                            CSLTokenizeString2(pszPropName, "|", 0));
+                        VSIFPrintfL(fp, "      ");
+                        for (int i = 0; i < aosPropNameComps.size(); ++i)
+                        {
+                            VSIFPrintfL(fp, "<%s>", aosPropNameComps[i]);
+                        }
+                        VSIFPrintfL(fp, "%s", gmlText);
+                        for (int i = aosPropNameComps.size() - 1; i >= 0; --i)
+                        {
+                            VSIFPrintfL(fp, "</%s>", aosPropNameComps[i]);
+                        }
+                        VSIFPrintfL(fp, "\n");
+                    }
+                    else
+                    {
+                        VSIFPrintfL(fp, "      <%s>%s</%s>\n", pszPropName,
+                                    gmlText, pszPropName);
+                    }
                     CPLFree(gmlText);
                 }
             }
@@ -1743,7 +1766,7 @@ static bool gmlHugeFileWriteResolved(huge_helper *helper,
                 if (bNotToBeResolved)
                 {
                     VSIFPrintfL(fp, "      <ResolvedGeometry> \n");
-                    pszResolved = CPLSerializeXMLTree((CPLXMLNode *)psNode);
+                    pszResolved = CPLSerializeXMLTree(psNode);
                     VSIFPrintfL(fp, "        %s\n", pszResolved);
                     CPLFree(pszResolved);
                     VSIFPrintfL(fp, "      </ResolvedGeometry>\n");
@@ -1791,7 +1814,7 @@ static bool gmlHugeFileWriteResolved(huge_helper *helper,
     }
 
     VSIFPrintfL(fp, "  </ResolvedTopoFeatureMembers>\n");
-    VSIFPrintfL(fp, "</ResolvedTopoFeatureCollection>\n");
+    VSIFPrintfL(fp, "</%s>\n", pszTopElement);
 
     VSIFCloseL(fp);
 
@@ -1964,6 +1987,9 @@ bool GMLReader::ParseXMLHugeFile(const char *pszOutputFilename,
         return false;
     }
 
+    CPLAssert(m_poGMLHandler);
+    const GMLAppSchemaType eAppSchemaType = m_poGMLHandler->GetAppSchemaType();
+
     // Restarting the GML parser.
     if (!SetupParser())
     {
@@ -1973,6 +1999,7 @@ bool GMLReader::ParseXMLHugeFile(const char *pszOutputFilename,
 
     // Output: writing the revolved GML file.
     if (gmlHugeFileWriteResolved(&helper, pszOutputFilename, this,
+                                 eAppSchemaType,
                                  &m_nHasSequentialLayers) == false)
     {
         gmlHugeFileCleanUp(&helper);
diff --git a/ogr/ogrsf_frmts/gml/ogr_gml.h b/ogr/ogrsf_frmts/gml/ogr_gml.h
index b5e0cda9b9e3..f3cd7013e2d8 100644
--- a/ogr/ogrsf_frmts/gml/ogr_gml.h
+++ b/ogr/ogrsf_frmts/gml/ogr_gml.h
@@ -10,23 +10,7 @@
  * Copyright (c) 2002, Frank Warmerdam
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_GML_H_INCLUDED
@@ -61,7 +45,6 @@ class OGRGMLLayer final : public OGRLayer
     char *pszFIDPrefix;
 
     bool bWriter;
-    bool bSameSRS;
 
     OGRGMLDataSource *poDS;
 
@@ -73,6 +56,8 @@ class OGRGMLLayer final : public OGRLayer
 
     bool bFaceHoleNegative;
 
+    CPL_DISALLOW_COPY_ASSIGN(OGRGMLLayer)
+
   public:
     OGRGMLLayer(const char *pszName, bool bWriter, OGRGMLDataSource *poDS);
 
@@ -111,13 +96,11 @@ class OGRGMLLayer final : public OGRLayer
 /*                           OGRGMLDataSource                           */
 /************************************************************************/
 
-class OGRGMLDataSource final : public OGRDataSource
+class OGRGMLDataSource final : public GDALDataset
 {
     OGRLayer **papoLayers;
     int nLayers;
 
-    char *pszName;
-
     OGRGMLLayer *TranslateGMLSchema(GMLFeatureClass *);
 
     char **papszCreateOptions;
@@ -126,7 +109,7 @@ class OGRGMLDataSource final : public OGRDataSource
     VSILFILE *fpOutput;
     bool bFpOutputIsNonSeekable;
     bool bFpOutputSingleFile;
-    OGREnvelope3D sBoundingRect;
+    OGREnvelope3D sBoundingRect{};
     bool bBBOX3D;
     int nBoundedByLocation;
 
@@ -137,12 +120,19 @@ class OGRGMLDataSource final : public OGRDataSource
     OGRGMLSRSNameFormat eSRSNameFormat;
     bool bWriteSpaceIndentation;
 
-    OGRSpatialReference *poWriteGlobalSRS;
-    bool bWriteGlobalSRS;
+    //! Whether all geometry fields of all layers have the same SRS (or no SRS at all)
+    bool m_bWriteGlobalSRS = true;
+
+    //! The global SRS (may be null), that is valid only if m_bWriteGlobalSRS == true
+    std::unique_ptr<OGRSpatialReference> m_poWriteGlobalSRS{};
+
+    //! Whether at least one geometry field has been created
+    bool m_bWriteGlobalSRSInit = false;
 
     // input related parameters.
-    CPLString osFilename;
-    CPLString osXSDFilename;
+    CPLString osFilename{};
+    CPLString osXSDFilename{};
+    bool m_bUnlinkXSDFilename = false;
 
     IGMLReader *poReader;
     bool bOutIsTempFile;
@@ -179,6 +169,8 @@ class OGRGMLDataSource final : public OGRDataSource
 
     void WriteTopElements();
 
+    CPL_DISALLOW_COPY_ASSIGN(OGRGMLDataSource)
+
   public:
     OGRGMLDataSource();
     virtual ~OGRGMLDataSource();
@@ -186,11 +178,6 @@ class OGRGMLDataSource final : public OGRDataSource
     bool Open(GDALOpenInfo *poOpenInfo);
     bool Create(const char *pszFile, char **papszOptions);
 
-    const char *GetName() override
-    {
-        return pszName;
-    }
-
     int GetLayerCount() override
     {
         return nLayers;
@@ -300,6 +287,13 @@ class OGRGMLDataSource final : public OGRDataSource
     const char *GetSRSDimensionLoc() const;
     bool GMLFeatureCollection() const;
 
+    void DeclareNewWriteSRS(const OGRSpatialReference *poSRS);
+
+    bool HasWriteGlobalSRS() const
+    {
+        return m_bWriteGlobalSRS;
+    }
+
     virtual OGRLayer *ExecuteSQL(const char *pszSQLCommand,
                                  OGRGeometry *poSpatialFilter,
                                  const char *pszDialect) override;
diff --git a/ogr/ogrsf_frmts/gml/ogrgmldatasource.cpp b/ogr/ogrsf_frmts/gml/ogrgmldatasource.cpp
index cb33c90c291c..1dd598648f96 100644
--- a/ogr/ogrsf_frmts/gml/ogrgmldatasource.cpp
+++ b/ogr/ogrsf_frmts/gml/ogrgmldatasource.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  *
  ******************************************************************************
  * Contributor: Alessandro Furieri, a.furieri@lqt.it
@@ -80,15 +64,14 @@ static CPLString ReplaceSpaceByPct20IfNeeded(const char *pszURL)
 /************************************************************************/
 
 OGRGMLDataSource::OGRGMLDataSource()
-    : papoLayers(nullptr), nLayers(0), pszName(nullptr),
-      papszCreateOptions(nullptr), fpOutput(nullptr),
-      bFpOutputIsNonSeekable(false), bFpOutputSingleFile(false), bBBOX3D(false),
-      nBoundedByLocation(-1), nSchemaInsertLocation(-1), bIsOutputGML3(false),
+    : papoLayers(nullptr), nLayers(0), papszCreateOptions(nullptr),
+      fpOutput(nullptr), bFpOutputIsNonSeekable(false),
+      bFpOutputSingleFile(false), bBBOX3D(false), nBoundedByLocation(-1),
+      nSchemaInsertLocation(-1), bIsOutputGML3(false),
       bIsOutputGML3Deegree(false), bIsOutputGML32(false),
       eSRSNameFormat(SRSNAME_SHORT), bWriteSpaceIndentation(true),
-      poWriteGlobalSRS(nullptr), bWriteGlobalSRS(false), poReader(nullptr),
-      bOutIsTempFile(false), bExposeGMLId(false), bExposeFid(false),
-      bIsWFS(false), bUseGlobalSRSName(false),
+      poReader(nullptr), bOutIsTempFile(false), bExposeGMLId(false),
+      bExposeFid(false), bIsWFS(false), bUseGlobalSRSName(false),
       m_bInvertAxisOrderIfLatLong(false), m_bConsiderEPSGAsURN(false),
       m_eSwapCoordinates(GML_SWAP_AUTO), m_bGetSecondaryGeometryOption(false),
       eReadMode(STANDARD), poStoredGMLFeature(nullptr),
@@ -126,13 +109,13 @@ OGRGMLDataSource::~OGRGMLDataSource()
         if (!bFpOutputIsNonSeekable && nBoundedByLocation != -1 &&
             VSIFSeekL(fpOutput, nBoundedByLocation, SEEK_SET) == 0)
         {
-            if (bWriteGlobalSRS && sBoundingRect.IsInit() && IsGML3Output())
+            if (m_bWriteGlobalSRS && sBoundingRect.IsInit() && IsGML3Output())
             {
                 bool bCoordSwap = false;
                 char *pszSRSName =
-                    poWriteGlobalSRS
-                        ? GML_GetSRSName(poWriteGlobalSRS, eSRSNameFormat,
-                                         &bCoordSwap)
+                    m_poWriteGlobalSRS
+                        ? GML_GetSRSName(m_poWriteGlobalSRS.get(),
+                                         eSRSNameFormat, &bCoordSwap)
                         : CPLStrdup("");
                 char szLowerCorner[75] = {};
                 char szUpperCorner[75] = {};
@@ -201,7 +184,7 @@ OGRGMLDataSource::~OGRGMLDataSource()
                     szLowerCorner, szUpperCorner);
                 CPLFree(pszSRSName);
             }
-            else if (bWriteGlobalSRS && sBoundingRect.IsInit())
+            else if (m_bWriteGlobalSRS && sBoundingRect.IsInit())
             {
                 if (bWriteSpaceIndentation)
                     VSIFPrintfL(fpOutput, "  ");
@@ -254,7 +237,6 @@ OGRGMLDataSource::~OGRGMLDataSource()
     }
 
     CSLDestroy(papszCreateOptions);
-    CPLFree(pszName);
 
     for (int i = 0; i < nLayers; i++)
         delete papoLayers[i];
@@ -268,13 +250,12 @@ OGRGMLDataSource::~OGRGMLDataSource()
         delete poReader;
     }
 
-    delete poWriteGlobalSRS;
-
     delete poStoredGMLFeature;
 
-    if (osXSDFilename.compare(CPLSPrintf("/vsimem/tmp_gml_xsd_%p.xsd", this)) ==
-        0)
+    if (m_bUnlinkXSDFilename)
+    {
         VSIUnlink(osXSDFilename);
+    }
 }
 
 /************************************************************************/
@@ -384,8 +365,6 @@ bool OGRGMLDataSource::Open(GDALOpenInfo *poOpenInfo)
 
     const char *pszFilename = osFilename.c_str();
 
-    pszName = CPLStrdup(poOpenInfo->pszFilename);
-
     // Open the source file.
     VSILFILE *fpToClose = nullptr;
     VSILFILE *fp = nullptr;
@@ -417,7 +396,8 @@ bool OGRGMLDataSource::Open(GDALOpenInfo *poOpenInfo)
 
     // Might be a OS-Mastermap gzipped GML, so let be nice and try to open
     // it transparently with /vsigzip/.
-    if (((GByte *)szHeader)[0] == 0x1f && ((GByte *)szHeader)[1] == 0x8b &&
+    if (static_cast<GByte>(szHeader[0]) == 0x1f &&
+        static_cast<GByte>(szHeader[1]) == 0x8b &&
         EQUAL(CPLGetExtension(pszFilename), "gz") &&
         !STARTS_WITH(pszFilename, "/vsigzip/"))
     {
@@ -534,7 +514,8 @@ bool OGRGMLDataSource::Open(GDALOpenInfo *poOpenInfo)
             }
         }
     }
-    else if (STARTS_WITH(pszFilename, "/vsimem/tempwfs_"))
+    else if (STARTS_WITH(pszFilename, "/vsimem/") &&
+             strstr(pszFilename, "_ogr_wfs_"))
     {
         // http://regis.intergraph.com/wfs/dcmetro/request.asp? returns a
         // <G:FeatureCollection> Who knows what servers can return?  When
@@ -560,6 +541,7 @@ bool OGRGMLDataSource::Open(GDALOpenInfo *poOpenInfo)
     const char *pszExposeFid =
         CSLFetchNameValueDef(poOpenInfo->papszOpenOptions, "EXPOSE_FID",
                              CPLGetConfigOption("GML_EXPOSE_FID", nullptr));
+
     if (pszExposeFid)
         bExposeFid = CPLTestBool(pszExposeFid);
 
@@ -850,7 +832,8 @@ bool OGRGMLDataSource::Open(GDALOpenInfo *poOpenInfo)
     }
 
     // Can we find a GML Feature Schema (.gfs) for the input file?
-    if (!osGFSFilename.empty() && !bHaveSchema && osXSDFilename.empty())
+    if (!osGFSFilename.empty() && !bHaveSchema && !bSchemaDone &&
+        osXSDFilename.empty())
     {
         VSIStatBufL sGFSStatBuf;
         if (bCheckAuxFile && VSIStatL(osGFSFilename, &sGFSStatBuf) == 0)
@@ -1101,8 +1084,10 @@ bool OGRGMLDataSource::Open(GDALOpenInfo *poOpenInfo)
                                         psResult->pabyData != nullptr)
                                     {
                                         bHasFoundXSD = true;
-                                        osXSDFilename = CPLSPrintf(
-                                            "/vsimem/tmp_gml_xsd_%p.xsd", this);
+                                        m_bUnlinkXSDFilename = true;
+                                        osXSDFilename =
+                                            VSIMemGenerateHiddenFilename(
+                                                "tmp_ogr_gml.xsd");
                                         VSILFILE *fpMem = VSIFileFromMemBuffer(
                                             osXSDFilename, psResult->pabyData,
                                             psResult->nDataLen, TRUE);
@@ -1126,9 +1111,12 @@ bool OGRGMLDataSource::Open(GDALOpenInfo *poOpenInfo)
         if (bHasFoundXSD)
         {
             std::vector<GMLFeatureClass *> aosClasses;
+            bool bUseSchemaImports = CPLFetchBool(
+                poOpenInfo->papszOpenOptions, "USE_SCHEMA_IMPORT",
+                CPLTestBool(CPLGetConfigOption("GML_USE_SCHEMA_IMPORT", "NO")));
             bool bFullyUnderstood = false;
-            bHaveSchema =
-                GMLParseXSD(osXSDFilename, aosClasses, bFullyUnderstood);
+            bHaveSchema = GMLParseXSD(osXSDFilename, bUseSchemaImports,
+                                      aosClasses, bFullyUnderstood);
 
             if (bHaveSchema && !bFullyUnderstood && bIsWFSJointLayer)
             {
@@ -1180,9 +1168,9 @@ bool OGRGMLDataSource::Open(GDALOpenInfo *poOpenInfo)
                     // it is, we force to 25D.
                     if (bHas3D && poClass->GetGeometryPropertyCount() == 1)
                     {
-                        poClass->GetGeometryProperty(0)->SetType(wkbSetZ(
-                            (OGRwkbGeometryType)poClass->GetGeometryProperty(0)
-                                ->GetType()));
+                        poClass->GetGeometryProperty(0)->SetType(
+                            wkbSetZ(static_cast<OGRwkbGeometryType>(
+                                poClass->GetGeometryProperty(0)->GetType())));
                     }
 
                     bool bAddClass = true;
@@ -1849,8 +1837,8 @@ bool OGRGMLDataSource::Create(const char *pszFilename, char **papszOptions)
         CSLFetchNameValueDef(papszCreateOptions, "SPACE_INDENTATION", "YES"));
 
     // Create the output file.
-    pszName = CPLStrdup(pszFilename);
-    osFilename = pszName;
+    osFilename = pszFilename;
+    SetDescription(pszFilename);
 
     if (strcmp(pszFilename, "/vsistdout/") == 0 ||
         STARTS_WITH(pszFilename, "/vsigzip/"))
@@ -1863,12 +1851,10 @@ bool OGRGMLDataSource::Create(const char *pszFilename, char **papszOptions)
     {
         if (EQUAL(CPLGetExtension(pszFilename), "zip"))
         {
-            CPLFree(pszName);
-            pszName =
-                CPLStrdup(CPLFormFilename(pszFilename, "out.gml", nullptr));
+            SetDescription(CPLFormFilename(pszFilename, "out.gml", nullptr));
         }
 
-        fpOutput = VSIFOpenExL(pszName, "wb", true);
+        fpOutput = VSIFOpenExL(GetDescription(), "wb", true);
         bFpOutputIsNonSeekable = true;
     }
     else
@@ -1920,7 +1906,7 @@ bool OGRGMLDataSource::Create(const char *pszFilename, char **papszOptions)
     }
     else if (pszSchemaOpt == nullptr || EQUAL(pszSchemaOpt, "EXTERNAL"))
     {
-        char *pszBasename = CPLStrdup(CPLGetBasename(pszName));
+        char *pszBasename = CPLStrdup(CPLGetBasename(GetDescription()));
 
         PrintLine(
             fpOutput,
@@ -2000,6 +1986,48 @@ void OGRGMLDataSource::WriteTopElements()
     }
 }
 
+/************************************************************************/
+/*                         DeclareNewWriteSRS()                         */
+/************************************************************************/
+
+// Check that all SRS passed to ICreateLayer() and CreateGeomField()
+// are the same (or all null)
+
+void OGRGMLDataSource::DeclareNewWriteSRS(const OGRSpatialReference *poSRS)
+{
+    if (m_bWriteGlobalSRS)
+    {
+        if (!m_bWriteGlobalSRSInit)
+        {
+            m_bWriteGlobalSRSInit = true;
+            if (poSRS)
+            {
+                m_poWriteGlobalSRS.reset(poSRS->Clone());
+                m_poWriteGlobalSRS->SetAxisMappingStrategy(
+                    OAMS_TRADITIONAL_GIS_ORDER);
+            }
+        }
+        else
+        {
+            if (m_poWriteGlobalSRS)
+            {
+                const char *const apszOptions[] = {
+                    "IGNORE_DATA_AXIS_TO_SRS_AXIS_MAPPING=YES", nullptr};
+                if (!poSRS ||
+                    !poSRS->IsSame(m_poWriteGlobalSRS.get(), apszOptions))
+                {
+                    m_bWriteGlobalSRS = false;
+                }
+            }
+            else
+            {
+                if (poSRS)
+                    m_bWriteGlobalSRS = false;
+            }
+        }
+    }
+}
+
 /************************************************************************/
 /*                           ICreateLayer()                             */
 /************************************************************************/
@@ -2015,7 +2043,7 @@ OGRGMLDataSource::ICreateLayer(const char *pszLayerName,
         CPLError(CE_Failure, CPLE_NoWriteAccess,
                  "Data source %s opened for read access.\n"
                  "New layer %s cannot be created.\n",
-                 pszName, pszLayerName);
+                 GetDescription(), pszLayerName);
 
         return nullptr;
     }
@@ -2036,37 +2064,9 @@ OGRGMLDataSource::ICreateLayer(const char *pszLayerName,
                  pszLayerName, pszCleanLayerName);
     }
 
-    // Set or check validity of global SRS.
     if (nLayers == 0)
     {
         WriteTopElements();
-        if (poSRS)
-        {
-            poWriteGlobalSRS = poSRS->Clone();
-            poWriteGlobalSRS->SetAxisMappingStrategy(
-                OAMS_TRADITIONAL_GIS_ORDER);
-        }
-        bWriteGlobalSRS = true;
-    }
-    else if (bWriteGlobalSRS)
-    {
-        if (poWriteGlobalSRS != nullptr)
-        {
-            const char *const apszOptions[] = {
-                "IGNORE_DATA_AXIS_TO_SRS_AXIS_MAPPING=YES", nullptr};
-            if (poSRS == nullptr ||
-                !poSRS->IsSame(poWriteGlobalSRS, apszOptions))
-            {
-                delete poWriteGlobalSRS;
-                poWriteGlobalSRS = nullptr;
-                bWriteGlobalSRS = false;
-            }
-        }
-        else
-        {
-            if (poSRS != nullptr)
-                bWriteGlobalSRS = false;
-        }
     }
 
     // Create the layer object.
@@ -2080,6 +2080,7 @@ OGRGMLDataSource::ICreateLayer(const char *pszLayerName,
             pszGeomFieldName = "geometryProperty";
         poGeomFieldDefn->SetName(pszGeomFieldName);
         poGeomFieldDefn->SetNullable(poSrcGeomFieldDefn->IsNullable());
+        DeclareNewWriteSRS(poSRS);
         if (poSRS != nullptr)
         {
             auto poSRSClone = poSRS->Clone();
@@ -2180,7 +2181,7 @@ void OGRGMLDataSource::InsertHeader()
     VSILFILE *fpSchema = nullptr;
     if (pszSchemaOpt == nullptr || EQUAL(pszSchemaOpt, "EXTERNAL"))
     {
-        const char *pszXSDFilename = CPLResetExtension(pszName, "xsd");
+        const char *pszXSDFilename = CPLResetExtension(GetDescription(), "xsd");
 
         fpSchema = VSIFOpenL(pszXSDFilename, "wt");
         if (fpSchema == nullptr)
@@ -2963,9 +2964,11 @@ void OGRGMLDataSource::PrintLine(VSILFILE *fp, const char *fmt, ...)
 class OGRGMLSingleFeatureLayer final : public OGRLayer
 {
   private:
-    int nVal;
-    OGRFeatureDefn *poFeatureDefn;
-    int iNextShapeId;
+    const int nVal;
+    OGRFeatureDefn *poFeatureDefn = nullptr;
+    int iNextShapeId = 0;
+
+    CPL_DISALLOW_COPY_ASSIGN(OGRGMLSingleFeatureLayer)
 
   public:
     explicit OGRGMLSingleFeatureLayer(int nVal);
@@ -3040,8 +3043,7 @@ OGRLayer *OGRGMLDataSource::ExecuteSQL(const char *pszSQLCommand,
         return new OGRGMLSingleFeatureLayer(bIsValid);
     }
 
-    return OGRDataSource::ExecuteSQL(pszSQLCommand, poSpatialFilter,
-                                     pszDialect);
+    return GDALDataset::ExecuteSQL(pszSQLCommand, poSpatialFilter, pszDialect);
 }
 
 /************************************************************************/
diff --git a/ogr/ogrsf_frmts/gml/ogrgmldriver.cpp b/ogr/ogrsf_frmts/gml/ogrgmldriver.cpp
index 8a016dbe20cc..e4f69ff18567 100644
--- a/ogr/ogrsf_frmts/gml/ogrgmldriver.cpp
+++ b/ogr/ogrsf_frmts/gml/ogrgmldriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_gml.h"
@@ -55,11 +39,12 @@ static int OGRGMLDriverIdentify(GDALOpenInfo *poOpenInfo)
     }
     else
     {
-        const char *szPtr = (const char *)poOpenInfo->pabyHeader;
+        const char *szPtr =
+            reinterpret_cast<const char *>(poOpenInfo->pabyHeader);
 
-        if (((unsigned char)szPtr[0] == 0xEF) &&
-            ((unsigned char)szPtr[1] == 0xBB) &&
-            ((unsigned char)szPtr[2] == 0xBF))
+        if ((static_cast<unsigned char>(szPtr[0]) == 0xEF) &&
+            (static_cast<unsigned char>(szPtr[1]) == 0xBB) &&
+            (static_cast<unsigned char>(szPtr[2]) == 0xBF))
         {
             szPtr += 3;
         }
@@ -74,8 +59,11 @@ static int OGRGMLDriverIdentify(GDALOpenInfo *poOpenInfo)
         if (!poOpenInfo->TryToIngest(4096))
             return FALSE;
 
+        if (poOpenInfo->IsSingleAllowedDriver("GML"))
+            return TRUE;
+
         return OGRGMLDataSource::CheckHeader(
-            (const char *)poOpenInfo->pabyHeader);
+            reinterpret_cast<const char *>(poOpenInfo->pabyHeader));
     }
 }
 
@@ -216,6 +204,9 @@ void RegisterOGRGML()
         "  <Option name='USE_BBOX' type='boolean' description='Whether "
         "to use gml:boundedBy at feature level as feature geometry, "
         "if there are no other geometry' default='NO'/>"
+        "  <Option name='USE_SCHEMA_IMPORT' type='boolean' "
+        "description='Whether "
+        "to read schema for imports along with includes or not' default='NO'/>"
         "</OpenOptionList>");
 
     poDriver->SetMetadataItem(
diff --git a/ogr/ogrsf_frmts/gml/ogrgmllayer.cpp b/ogr/ogrsf_frmts/gml/ogrgmllayer.cpp
index d5a9a3009d33..be9d803eefb1 100644
--- a/ogr/ogrsf_frmts/gml/ogrgmllayer.cpp
+++ b/ogr/ogrsf_frmts/gml/ogrgmllayer.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_gml.h"
@@ -44,7 +28,7 @@ OGRGMLLayer::OGRGMLLayer(const char *pszName, bool bWriterIn,
     : poFeatureDefn(new OGRFeatureDefn(
           pszName + (STARTS_WITH_CI(pszName, "ogr:") ? 4 : 0))),
       iNextGMLId(0), bInvalidFIDFound(false), pszFIDPrefix(nullptr),
-      bWriter(bWriterIn), bSameSRS(false), poDS(poDSIn),
+      bWriter(bWriterIn), poDS(poDSIn),
       poFClass(!bWriter ? poDS->GetReader()->GetClass(pszName) : nullptr),
       // Reader's should get the corresponding GMLFeatureClass and cache it.
       hCacheSRS(GML_BuildOGRGeometryFromList_CreateCache()),
@@ -708,33 +692,6 @@ OGRErr OGRGMLLayer::ICreateFeature(OGRFeature *poFeature)
         poDS->PrintLine(fp, "<gml:featureMember>");
     }
 
-    if (iNextGMLId == 0)
-    {
-        bSameSRS = true;
-        for (int iGeomField = 1;
-             iGeomField < poFeatureDefn->GetGeomFieldCount(); iGeomField++)
-        {
-            OGRGeomFieldDefn *poFieldDefn0 = poFeatureDefn->GetGeomFieldDefn(0);
-            OGRGeomFieldDefn *poFieldDefn =
-                poFeatureDefn->GetGeomFieldDefn(iGeomField);
-            const OGRSpatialReference *poSRS0 = poFieldDefn0->GetSpatialRef();
-            const OGRSpatialReference *poSRS = poFieldDefn->GetSpatialRef();
-            if (poSRS0 != nullptr && poSRS == nullptr)
-            {
-                bSameSRS = false;
-            }
-            else if (poSRS0 == nullptr && poSRS != nullptr)
-            {
-                bSameSRS = false;
-            }
-            else if (poSRS0 != nullptr && poSRS != nullptr && poSRS0 != poSRS &&
-                     !poSRS0->IsSame(poSRS))
-            {
-                bSameSRS = false;
-            }
-        }
-    }
-
     if (poFeature->GetFID() == OGRNullFID)
         poFeature->SetFID(iNextGMLId++);
 
@@ -794,7 +751,7 @@ OGRErr OGRGMLLayer::ICreateFeature(OGRFeature *poFeature)
             const int nCoordDimension = poGeom->getCoordinateDimension();
 
             poGeom->getEnvelope(&sGeomBounds);
-            if (bSameSRS)
+            if (poDS->HasWriteGlobalSRS())
                 poDS->GrowExtents(&sGeomBounds, nCoordDimension);
 
             if (poGeom->getSpatialReference() == nullptr &&
@@ -1246,7 +1203,8 @@ OGRErr OGRGMLLayer::CreateGeomField(const OGRGeomFieldDefn *poField,
     /*      Enforce XML naming semantics on element name.                   */
     /* -------------------------------------------------------------------- */
     OGRGeomFieldDefn oCleanCopy(poField);
-    auto poSRSOri = poField->GetSpatialRef();
+    const auto poSRSOri = poField->GetSpatialRef();
+    poDS->DeclareNewWriteSRS(poSRSOri);
     if (poSRSOri)
     {
         auto poSRS = poSRSOri->Clone();
diff --git a/ogr/ogrsf_frmts/gml/parsexsd.h b/ogr/ogrsf_frmts/gml/parsexsd.h
deleted file mode 100644
index 39305f74fa6d..000000000000
--- a/ogr/ogrsf_frmts/gml/parsexsd.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************
- * $Id$
- *
- * Project:  GML Reader
- * Purpose:  Implementation of GMLParseXSD()
- * Author:   Frank Warmerdam, warmerdam@pobox.com
- *
- ******************************************************************************
- * Copyright (c) 2005, Frank Warmerdam
- * Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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 PARSEXSD_H_INCLUDED
-#define PARSEXSD_H_INCLUDED
-
-#include "cpl_port.h"
-
-#include <vector>
-#include "gmlreader.h"
-
-bool CPL_DLL GMLParseXSD(const char *pszFile,
-                         std::vector<GMLFeatureClass *> &aosClasses,
-                         bool &bFullyUnderstood);
-
-#endif  // PARSEXSD_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/gml/resolvexlinks.cpp b/ogr/ogrsf_frmts/gml/resolvexlinks.cpp
index 8e22df313384..9940a3b1d2ee 100644
--- a/ogr/ogrsf_frmts/gml/resolvexlinks.cpp
+++ b/ogr/ogrsf_frmts/gml/resolvexlinks.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2010, Chaitanya kumar CH
  * Copyright (c) 2010-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/gml/xercesc_headers.h b/ogr/ogrsf_frmts/gml/xercesc_headers.h
index 5f3d328823c7..83e44c4886f4 100644
--- a/ogr/ogrsf_frmts/gml/xercesc_headers.h
+++ b/ogr/ogrsf_frmts/gml/xercesc_headers.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef XERCESC_HEADERS_H
diff --git a/ogr/ogrsf_frmts/gmlas/CMakeLists.txt b/ogr/ogrsf_frmts/gmlas/CMakeLists.txt
index 5d9c1d76af4b..2c8d69fc7c43 100644
--- a/ogr/ogrsf_frmts/gmlas/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/gmlas/CMakeLists.txt
@@ -37,7 +37,7 @@ set_property(
   PROPERTY RESOURCE "${GDAL_DATA_FILES}")
 
 target_include_directories(
-  ogr_GMLAS PRIVATE ${GDAL_VECTOR_FORMAT_SOURCE_DIR}/geojson ${GDAL_VECTOR_FORMAT_SOURCE_DIR}/mem
+  ogr_GMLAS PRIVATE ${GDAL_VECTOR_FORMAT_SOURCE_DIR}/mem
                     ${GDAL_VECTOR_FORMAT_SOURCE_DIR}/pgdump)
 
 # Internal libs first
diff --git a/ogr/ogrsf_frmts/gmlas/data/gmlasconf.xsd b/ogr/ogrsf_frmts/gmlas/data/gmlasconf.xsd
index 35c180e45327..a1a0ea54b41b 100644
--- a/ogr/ogrsf_frmts/gmlas/data/gmlasconf.xsd
+++ b/ogr/ogrsf_frmts/gmlas/data/gmlasconf.xsd
@@ -10,23 +10,7 @@
  **********************************************************************
  * Copyright (c) 2016, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
@@ -456,7 +440,7 @@
               <xs:element name="MaxFileSize" minOccurs="0">
                 <xs:annotation>
                   <xs:documentation>
-                    Maximum file size allowed. 
+                    Maximum file size allowed.
                     Default: 1 MB.
                   </xs:documentation>
                 </xs:annotation>
@@ -890,7 +874,7 @@
                 <xs:annotation>
                   <xs:documentation>
                     Line format.
-                    Default is platform dependant (CR-LF on Windows, LF otherwise)
+                    Default is platform dependent (CR-LF on Windows, LF otherwise)
                   </xs:documentation>
                 </xs:annotation>
                 <xs:simpleType>
@@ -898,7 +882,7 @@
                         <xs:enumeration value="NATIVE">
                             <xs:annotation>
                                 <xs:documentation>
-                                    Platform dependant (CR-LF on Windows, LF otherwise)
+                                    Platform dependent (CR-LF on Windows, LF otherwise)
                                 </xs:documentation>
                             </xs:annotation>
                         </xs:enumeration>
diff --git a/ogr/ogrsf_frmts/gmlas/ogr_gmlas.h b/ogr/ogrsf_frmts/gmlas/ogr_gmlas.h
index 0ac98a66741f..a4f1d34bc769 100644
--- a/ogr/ogrsf_frmts/gmlas/ogr_gmlas.h
+++ b/ogr/ogrsf_frmts/gmlas/ogr_gmlas.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault, <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_GMLAS_INCLUDED
@@ -1161,7 +1145,7 @@ class GMLASSchemaAnalyzer
                        const XSModelGroup *poModelGroup2);
     XSModelGroupDefinition *
     GetGroupDefinition(const XSModelGroup *poModelGroup);
-    void SetFieldFromAttribute(GMLASField &oField, XSAttributeUse *poAttr,
+    bool SetFieldFromAttribute(GMLASField &oField, XSAttributeUse *poAttr,
                                const CPLString &osXPathPrefix,
                                const CPLString &osNamePrefix = CPLString());
     void GetConcreteImplementationTypes(
@@ -1792,6 +1776,9 @@ class GMLASReader final : public DefaultHandler
     /** Stack of contexts to build XML tree of GML Geometry */
     std::vector<NodeLastChild> m_apsXMLNodeStack{};
 
+    /** Counter used to prevent XML billion laugh attacks */
+    int m_nEntityCounter = 0;
+
     /** Maximum allowed number of XML nesting level */
     int m_nMaxLevel = 100;
 
@@ -2048,6 +2035,8 @@ class GMLASReader final : public DefaultHandler
     virtual void characters(const XMLCh *const chars,
                             const XMLSize_t length) override;
 
+    void startEntity(const XMLCh *const name) override;
+
     bool RunFirstPass(GDALProgressFunc pfnProgress, void *pProgressData,
                       bool bRemoveUnusedLayers, bool bRemoveUnusedFields,
                       bool bProcessSWEDataArray,
diff --git a/ogr/ogrsf_frmts/gmlas/ogr_gmlas_consts.h b/ogr/ogrsf_frmts/gmlas/ogr_gmlas_consts.h
index 5534518ba7f0..68b8e9f050ed 100644
--- a/ogr/ogrsf_frmts/gmlas/ogr_gmlas_consts.h
+++ b/ogr/ogrsf_frmts/gmlas/ogr_gmlas_consts.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault, <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_GMLAS_CONSTS_INCLUDED
diff --git a/ogr/ogrsf_frmts/gmlas/ogrgmlasconf.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlasconf.cpp
index 94381188ea8b..bf7f9a2b7d6f 100644
--- a/ogr/ogrsf_frmts/gmlas/ogrgmlasconf.cpp
+++ b/ogr/ogrsf_frmts/gmlas/ogrgmlasconf.cpp
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault, <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_gmlas.h"
diff --git a/ogr/ogrsf_frmts/gmlas/ogrgmlasdatasource.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlasdatasource.cpp
index 7468a588ba52..6ca63b627d09 100644
--- a/ogr/ogrsf_frmts/gmlas/ogrgmlasdatasource.cpp
+++ b/ogr/ogrsf_frmts/gmlas/ogrgmlasdatasource.cpp
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault, <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_gmlas.h"
diff --git a/ogr/ogrsf_frmts/gmlas/ogrgmlasdriver.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlasdriver.cpp
index 6e89489edb77..dc7e5483cf34 100644
--- a/ogr/ogrsf_frmts/gmlas/ogrgmlasdriver.cpp
+++ b/ogr/ogrsf_frmts/gmlas/ogrgmlasdriver.cpp
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault, <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_gmlas.h"
diff --git a/ogr/ogrsf_frmts/gmlas/ogrgmlasdrivercore.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlasdrivercore.cpp
index 3352ac090b8a..207cf2730b89 100644
--- a/ogr/ogrsf_frmts/gmlas/ogrgmlasdrivercore.cpp
+++ b/ogr/ogrsf_frmts/gmlas/ogrgmlasdrivercore.cpp
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault, <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
@@ -40,7 +24,30 @@
 int OGRGMLASDriverIdentify(GDALOpenInfo *poOpenInfo)
 
 {
-    return STARTS_WITH_CI(poOpenInfo->pszFilename, "GMLAS:");
+    if (STARTS_WITH_CI(poOpenInfo->pszFilename, "GMLAS:"))
+        return true;
+
+    if (poOpenInfo->IsSingleAllowedDriver("GMLAS"))
+    {
+        const char *pszPtr =
+            reinterpret_cast<const char *>(poOpenInfo->pabyHeader);
+
+        // Skip UTF-8 BOM
+        if (poOpenInfo->nHeaderBytes > 3 &&
+            memcmp(poOpenInfo->pabyHeader, "\xEF\xBB\xBF", 3) == 0)
+        {
+            pszPtr += 3;
+        }
+
+        // Skip spaces
+        while (*pszPtr && std::isspace(static_cast<unsigned char>(*pszPtr)))
+            ++pszPtr;
+
+        // Here, we expect the opening chevrons of GML tree root element */
+        return pszPtr[0] == '<';
+    }
+
+    return false;
 }
 
 /************************************************************************/
diff --git a/ogr/ogrsf_frmts/gmlas/ogrgmlasdrivercore.h b/ogr/ogrsf_frmts/gmlas/ogrgmlasdrivercore.h
index 31595460eb14..82b5fc70df36 100644
--- a/ogr/ogrsf_frmts/gmlas/ogrgmlasdrivercore.h
+++ b/ogr/ogrsf_frmts/gmlas/ogrgmlasdrivercore.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault, <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRGMLASDRIVERCORE_H
diff --git a/ogr/ogrsf_frmts/gmlas/ogrgmlasfeatureclass.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlasfeatureclass.cpp
index 5d05b9c5b67c..cf85a1ced6e3 100644
--- a/ogr/ogrsf_frmts/gmlas/ogrgmlasfeatureclass.cpp
+++ b/ogr/ogrsf_frmts/gmlas/ogrgmlasfeatureclass.cpp
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault, <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_gmlas.h"
diff --git a/ogr/ogrsf_frmts/gmlas/ogrgmlaslayer.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlaslayer.cpp
index 4635659c873c..63dc41e836fc 100644
--- a/ogr/ogrsf_frmts/gmlas/ogrgmlaslayer.cpp
+++ b/ogr/ogrsf_frmts/gmlas/ogrgmlaslayer.cpp
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault, <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_gmlas.h"
@@ -221,9 +205,8 @@ void OGRGMLASLayer::ProcessDataRecordOfDataArrayCreateFields(
         if (psIter->eType == CXT_Element &&
             strcmp(psIter->pszValue, "field") == 0)
         {
-            CPLString osName = CPLGetXMLValue(psIter, "name", "");
-            osName.tolower();
-            OGRFieldDefn oFieldDefn(osName, OFTString);
+            const char *pszName = CPLGetXMLValue(psIter, "name", "");
+            OGRFieldDefn oFieldDefn(CPLString(pszName).tolower(), OFTString);
             OGRFieldType eType;
             OGRFieldSubType eSubType;
             CPLXMLNode *psNode = GetSWEChildAndType(psIter, eType, eSubType);
@@ -273,8 +256,8 @@ void OGRGMLASLayer::ProcessDataRecordCreateFields(
         if (psIter->eType == CXT_Element &&
             strcmp(psIter->pszValue, "field") == 0)
         {
-            CPLString osName = CPLGetXMLValue(psIter, "name", "");
-            osName = osName.tolower();
+            const char *pszName = CPLGetXMLValue(psIter, "name", "");
+            CPLString osName = CPLString(pszName).tolower();
             OGRFieldDefn oFieldDefn(osName, OFTString);
             OGRFieldType eType;
             OGRFieldSubType eSubType;
@@ -332,8 +315,9 @@ void OGRGMLASLayer::ProcessDataRecordCreateFields(
                     if (psIter2->eType == CXT_Element &&
                         strcmp(psIter2->pszValue, "value") != 0)
                     {
-                        CPLString osName2(osName + "_" + psIter2->pszValue);
-                        osName2.tolower();
+                        const CPLString osName2 =
+                            CPLString(osName + "_" + psIter2->pszValue)
+                                .tolower();
                         for (CPLXMLNode *psIter3 = psIter2->psChild;
                              psIter3 != nullptr; psIter3 = psIter3->psNext)
                         {
@@ -343,9 +327,10 @@ void OGRGMLASLayer::ProcessDataRecordCreateFields(
                                 const char *pszColon = strchr(pszValue, ':');
                                 if (pszColon)
                                     pszValue = pszColon + 1;
-                                CPLString osName3(osName2 + "_" + pszValue);
-                                osName3.tolower();
-                                OGRFieldDefn oFieldDefn2(osName3, OFTString);
+                                OGRFieldDefn oFieldDefn2(
+                                    CPLString(osName2 + "_" + pszValue)
+                                        .tolower(),
+                                    OFTString);
                                 m_poFeatureDefn->AddFieldDefn(&oFieldDefn2);
                             }
                             else if (psIter3->eType == CXT_Text)
@@ -413,8 +398,8 @@ void OGRGMLASLayer::ProcessDataRecordFillFeature(CPLXMLNode *psDataRecord,
         if (psIter->eType == CXT_Element &&
             strcmp(psIter->pszValue, "field") == 0)
         {
-            CPLString osName = CPLGetXMLValue(psIter, "name", "");
-            osName = osName.tolower();
+            const char *pszName = CPLGetXMLValue(psIter, "name", "");
+            CPLString osName = CPLString(pszName).tolower();
             OGRFieldDefn oFieldDefn(osName, OFTString);
             OGRFieldType eType;
             OGRFieldSubType eSubType;
@@ -432,8 +417,8 @@ void OGRGMLASLayer::ProcessDataRecordFillFeature(CPLXMLNode *psDataRecord,
             {
                 if (psIter2->eType == CXT_Element)
                 {
-                    CPLString osName2(osName + "_" + psIter2->pszValue);
-                    osName2.tolower();
+                    const CPLString osName2 =
+                        CPLString(osName + "_" + psIter2->pszValue).tolower();
                     for (CPLXMLNode *psIter3 = psIter2->psChild;
                          psIter3 != nullptr; psIter3 = psIter3->psNext)
                     {
@@ -443,10 +428,10 @@ void OGRGMLASLayer::ProcessDataRecordFillFeature(CPLXMLNode *psDataRecord,
                             const char *pszColon = strchr(pszValue, ':');
                             if (pszColon)
                                 pszValue = pszColon + 1;
-                            CPLString osName3(osName2 + "_" + pszValue);
-                            osName3.tolower();
-                            SetSWEValue(poFeature, osName3,
-                                        psIter3->psChild->pszValue);
+                            SetSWEValue(
+                                poFeature,
+                                CPLString(osName2 + "_" + pszValue).tolower(),
+                                psIter3->psChild->pszValue);
                         }
                         else if (psIter3->eType == CXT_Text)
                         {
@@ -1128,7 +1113,7 @@ void OGRGMLASLayer::InsertNewField(int nInsertPos,
         if (strcmp(poFeature->GetFieldAsString(szLAYER_NAME), GetName()) == 0)
         {
             int nFieldIndex = poFeature->GetFieldAsInteger(szFIELD_INDEX);
-            if (nFieldIndex >= nInsertPos)
+            if (nFieldIndex >= nInsertPos && nFieldIndex < INT_MAX)
             {
                 poFeature->SetField(szFIELD_INDEX, nFieldIndex + 1);
                 CPL_IGNORE_RET_VAL(
diff --git a/ogr/ogrsf_frmts/gmlas/ogrgmlasreader.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlasreader.cpp
index 9b4a91f61cad..4fce5b644754 100644
--- a/ogr/ogrsf_frmts/gmlas/ogrgmlasreader.cpp
+++ b/ogr/ogrsf_frmts/gmlas/ogrgmlasreader.cpp
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault, <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_gmlas.h"
@@ -1131,6 +1115,8 @@ void GMLASReader::startElement(const XMLCh *const uri,
                                ,
                                const Attributes &attrs)
 {
+    m_nEntityCounter = 0;
+
     const CPLString &osLocalname(transcode(localname, m_osLocalname));
     const CPLString &osNSURI(transcode(uri, m_osNSUri));
     const CPLString &osNSPrefix(m_osNSPrefix = m_oMapURIToPrefix[osNSURI]);
@@ -2387,6 +2373,8 @@ void GMLASReader::endElement(const XMLCh *const uri,
 #endif
 )
 {
+    m_nEntityCounter = 0;
+
     m_nLevel--;
 
 #ifdef DEBUG_VERBOSE
@@ -2675,6 +2663,20 @@ void GMLASReader::endElement(const XMLCh *const uri,
     }
 }
 
+/************************************************************************/
+/*                             startEntity()                            */
+/************************************************************************/
+
+void GMLASReader::startEntity(const XMLCh *const /* name */)
+{
+    m_nEntityCounter++;
+    if (m_nEntityCounter > 1000 && !m_bParsingError)
+    {
+        throw SAXNotSupportedException(
+            "File probably corrupted (million laugh pattern)");
+    }
+}
+
 /************************************************************************/
 /*                             SetSWEValue()                            */
 /************************************************************************/
diff --git a/ogr/ogrsf_frmts/gmlas/ogrgmlasschemaanalyzer.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlasschemaanalyzer.cpp
index ad5f3b6d4864..3cc74ba3b0e2 100644
--- a/ogr/ogrsf_frmts/gmlas/ogrgmlasschemaanalyzer.cpp
+++ b/ogr/ogrsf_frmts/gmlas/ogrgmlasschemaanalyzer.cpp
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault, <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "xercesc_headers.h"
@@ -1572,24 +1556,31 @@ static bool IsAnyType(XSComplexTypeDefinition *poType)
 /*                       SetFieldFromAttribute()                        */
 /************************************************************************/
 
-void GMLASSchemaAnalyzer::SetFieldFromAttribute(GMLASField &oField,
+bool GMLASSchemaAnalyzer::SetFieldFromAttribute(GMLASField &oField,
                                                 XSAttributeUse *poAttr,
                                                 const CPLString &osXPathPrefix,
                                                 const CPLString &osNamePrefix)
 {
-    XSAttributeDeclaration *poAttrDecl = poAttr->getAttrDeclaration();
-    XSSimpleTypeDefinition *poAttrType = poAttrDecl->getTypeDefinition();
-
-    SetFieldTypeAndWidthFromDefinition(poAttrType, oField);
-
-    CPLString osNS(transcode(poAttrDecl->getNamespace()));
-    CPLString osName(transcode(poAttrDecl->getName()));
+    const XSAttributeDeclaration *poAttrDecl = poAttr->getAttrDeclaration();
+    const CPLString osNS(transcode(poAttrDecl->getNamespace()));
+    const CPLString osName(transcode(poAttrDecl->getName()));
 
     if (osNamePrefix.empty())
         oField.SetName(osName);
     else
         oField.SetName(osNamePrefix + "_" + osName);
 
+    XSSimpleTypeDefinition *poAttrType = poAttrDecl->getTypeDefinition();
+    if (!poAttrType)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Cannot get type definition for attribute %s",
+                 oField.GetName().c_str());
+        return false;
+    }
+
+    SetFieldTypeAndWidthFromDefinition(poAttrType, oField);
+
     oField.SetXPath(osXPathPrefix + "/@" + MakeXPath(osNS, osName));
     if (poAttr->getRequired())
     {
@@ -1626,6 +1617,8 @@ void GMLASSchemaAnalyzer::SetFieldFromAttribute(GMLASField &oField,
     }
 
     oField.SetDocumentation(GetAnnotationDoc(poAttrDecl->getAnnotation()));
+
+    return true;
 }
 
 /************************************************************************/
@@ -2276,8 +2269,11 @@ bool GMLASSchemaAnalyzer::FindElementsWithMustBeToLevel(
                                 XSAttributeUse *poAttr =
                                     poAttrList->elementAt(j);
                                 GMLASField oField;
-                                SetFieldFromAttribute(oField, poAttr,
-                                                      osFullXPath);
+                                if (!SetFieldFromAttribute(oField, poAttr,
+                                                           osFullXPath))
+                                {
+                                    return false;
+                                }
                                 if (!IsIgnoredXPath(oField.GetXPath()) &&
                                     oField.GetFixedValue().empty())
                                 {
@@ -2343,7 +2339,11 @@ bool GMLASSchemaAnalyzer::FindElementsWithMustBeToLevel(
                         {
                             XSAttributeUse *poAttr = poAttrList->elementAt(j);
                             GMLASField oField;
-                            SetFieldFromAttribute(oField, poAttr, osFullXPath);
+                            if (!SetFieldFromAttribute(oField, poAttr,
+                                                       osFullXPath))
+                            {
+                                return false;
+                            }
                             if (!IsIgnoredXPath(oField.GetXPath()) &&
                                 oField.GetFixedValue().empty())
                             {
@@ -2606,7 +2606,10 @@ bool GMLASSchemaAnalyzer::ExploreModelGroup(
         {
             GMLASField oField;
             XSAttributeUse *poAttr = poMainAttrList->elementAt(j);
-            SetFieldFromAttribute(oField, poAttr, oClass.GetXPath());
+            if (!SetFieldFromAttribute(oField, poAttr, oClass.GetXPath()))
+            {
+                return false;
+            }
 
             if (IsIgnoredXPath(oField.GetXPath()))
             {
@@ -2989,8 +2992,11 @@ bool GMLASSchemaAnalyzer::ExploreModelGroup(
                     CPLString osNamePrefix(bMoveNestedClassToTop
                                                ? osPrefixedEltName
                                                : CPLString());
-                    SetFieldFromAttribute(oField, poAttr, osElementXPath,
-                                          osNamePrefix);
+                    if (!SetFieldFromAttribute(oField, poAttr, osElementXPath,
+                                               osNamePrefix))
+                    {
+                        return false;
+                    }
                     if (nMinOccurs == 0 || bIsChoice)
                     {
                         oField.SetMinOccurs(0);
diff --git a/ogr/ogrsf_frmts/gmlas/ogrgmlasutils.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlasutils.cpp
index 67a106a624a2..df1907a8bb34 100644
--- a/ogr/ogrsf_frmts/gmlas/ogrgmlasutils.cpp
+++ b/ogr/ogrsf_frmts/gmlas/ogrgmlasutils.cpp
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault, <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_gmlas.h"
@@ -111,7 +95,7 @@ CPLString OGRGMLASTruncateIdentifier(const CPLString &osName,
     {
         if (nLastTokenSize > nExtra)
         {
-            aosTokens[aosTokens.size() - 1].resize(nLastTokenSize - nExtra);
+            aosTokens.back().resize(nLastTokenSize - nExtra);
             nExtra = 0;
         }
     }
@@ -127,7 +111,7 @@ CPLString OGRGMLASTruncateIdentifier(const CPLString &osName,
             // than previous ones.
             if (nLastTokenSize > 2 * iter->first)
             {
-                aosTokens[aosTokens.size() - 1].resize(nLastTokenSize - 1);
+                aosTokens.back().resize(nLastTokenSize - 1);
                 nLastTokenSize--;
                 bHasDoneSomething = true;
                 nExtra--;
diff --git a/ogr/ogrsf_frmts/gmlas/ogrgmlaswriter.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlaswriter.cpp
index 90e543f0847b..c5c503531e1f 100644
--- a/ogr/ogrsf_frmts/gmlas/ogrgmlaswriter.cpp
+++ b/ogr/ogrsf_frmts/gmlas/ogrgmlaswriter.cpp
@@ -9,31 +9,16 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault, <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_gmlas.h"
 #include "ogr_p.h"
-#include "ogrgeojsonreader.h"
+#include "ogrlibjsonutils.h"
 #include "cpl_time.h"
 
 #include <algorithm>
+#include <cmath>
 
 namespace GMLAS
 {
@@ -1641,14 +1626,14 @@ void GMLASWriter::PrintMultipleValuesSeparator(
 
 static void PrintXMLDouble(VSILFILE *fp, double dfVal)
 {
-    if (CPLIsInf(dfVal))
+    if (std::isinf(dfVal))
     {
         if (dfVal > 0)
             VSIFPrintfL(fp, "INF");
         else
             VSIFPrintfL(fp, "-INF");
     }
-    else if (CPLIsNan(dfVal))
+    else if (std::isnan(dfVal))
         VSIFPrintfL(fp, "NaN");
     else
         VSIFPrintfL(fp, "%.16g", dfVal);
@@ -1719,7 +1704,7 @@ bool GMLASWriter::WriteFieldRegular(
     // For extension/* case
     if (!aoFieldComponents.empty() && aoFieldComponents.back().second == "*")
     {
-        aoFieldComponents.resize(aoFieldComponents.size() - 1);
+        aoFieldComponents.pop_back();
     }
 
     const size_t nCommonLength =
@@ -2404,7 +2389,7 @@ bool GMLASWriter::WriteFieldNoLink(
             </xs:element>
             */
             aoNewInitialContext = std::move(aoFieldComponents);
-            aoNewInitialContext.resize(aoNewInitialContext.size() - 1);
+            aoNewInitialContext.pop_back();
         }
         else
         {
@@ -2584,7 +2569,7 @@ bool GMLASWriter::WriteFieldWithLink(
     oSetLayersInIterationSub.insert(oChildLayerDesc.osName);
 
     XPathComponents aoPrefixComponentsNew(aoFieldComponents);
-    aoPrefixComponentsNew.resize(aoPrefixComponentsNew.size() - 1);
+    aoPrefixComponentsNew.pop_back();
 
     if (aoLayerComponents.empty())
     {
@@ -2602,7 +2587,7 @@ bool GMLASWriter::WriteFieldWithLink(
     {
         aoInitialComponents = std::move(aoFieldComponents);
         if (!aoInitialComponents.empty())
-            aoInitialComponents.resize(aoInitialComponents.size() - 1);
+            aoInitialComponents.pop_back();
         WriteClosingAndStartingTags(aoCurComponents, aoInitialComponents,
                                     bCurIsRegularField);
     }
@@ -2753,7 +2738,7 @@ bool GMLASWriter::WriteFieldJunctionTable(
                                            aoPrefixComponents.end());
 
                 if (!aoInitialComponents.empty())
-                    aoInitialComponents.resize(aoInitialComponents.size() - 1);
+                    aoInitialComponents.pop_back();
                 WriteClosingAndStartingTags(
                     aoCurComponents, aoInitialComponents, bCurIsRegularField);
             }
diff --git a/ogr/ogrsf_frmts/gmlas/ogrgmlasxlinkresolver.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlasxlinkresolver.cpp
index e55f31f7754c..a626bff89edf 100644
--- a/ogr/ogrsf_frmts/gmlas/ogrgmlasxlinkresolver.cpp
+++ b/ogr/ogrsf_frmts/gmlas/ogrgmlasxlinkresolver.cpp
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault, <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_gmlas.h"
diff --git a/ogr/ogrsf_frmts/gmlas/ogrgmlasxpatchmatcher.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlasxpatchmatcher.cpp
index 0244f36ded31..1ef243c2e11c 100644
--- a/ogr/ogrsf_frmts/gmlas/ogrgmlasxpatchmatcher.cpp
+++ b/ogr/ogrsf_frmts/gmlas/ogrgmlasxpatchmatcher.cpp
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault, <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_gmlas.h"
diff --git a/ogr/ogrsf_frmts/gmlas/ogrgmlasxsdcache.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlasxsdcache.cpp
index b855d71020ee..bc4f3e0473dc 100644
--- a/ogr/ogrsf_frmts/gmlas/ogrgmlasxsdcache.cpp
+++ b/ogr/ogrsf_frmts/gmlas/ogrgmlasxsdcache.cpp
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault, <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_gmlas.h"
@@ -152,7 +136,8 @@ bool GMLASXSDCache::CacheAllGML321()
     CPLHTTPResult *psResult = CPLHTTPFetch(pszHTTPZIP, nullptr);
     if (psResult && psResult->nDataLen)
     {
-        const std::string osZIPFilename(CPLSPrintf("/vsimem/%p.zip", this));
+        const std::string osZIPFilename(
+            VSIMemGenerateHiddenFilename("temp.zip"));
         auto fpZIP =
             VSIFileFromMemBuffer(osZIPFilename.c_str(), psResult->pabyData,
                                  psResult->nDataLen, FALSE);
@@ -220,7 +205,8 @@ bool GMLASXSDCache::CacheAllISO20070417()
     CPLHTTPResult *psResult = CPLHTTPFetch(pszHTTPZIP, nullptr);
     if (psResult && psResult->nDataLen)
     {
-        const std::string osZIPFilename(CPLSPrintf("/vsimem/%p.zip", this));
+        const std::string osZIPFilename(
+            VSIMemGenerateHiddenFilename("temp.zip"));
         auto fpZIP =
             VSIFileFromMemBuffer(osZIPFilename.c_str(), psResult->pabyData,
                                  psResult->nDataLen, FALSE);
diff --git a/ogr/ogrsf_frmts/gmlas/xercesc_headers.h b/ogr/ogrsf_frmts/gmlas/xercesc_headers.h
index 9e8f8b36a858..621ed7cecbf7 100644
--- a/ogr/ogrsf_frmts/gmlas/xercesc_headers.h
+++ b/ogr/ogrsf_frmts/gmlas/xercesc_headers.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef XERCESC_HEADERS_H
diff --git a/ogr/ogrsf_frmts/gmlutils/CMakeLists.txt b/ogr/ogrsf_frmts/gmlutils/CMakeLists.txt
new file mode 100644
index 000000000000..5f87e38e6fa0
--- /dev/null
+++ b/ogr/ogrsf_frmts/gmlutils/CMakeLists.txt
@@ -0,0 +1,16 @@
+add_library(
+  gmlutils OBJECT
+  gmlfeature.cpp
+  gmlfeatureclass.cpp
+  gmlpropertydefn.cpp
+  gmlutils.cpp
+  parsexsd.h
+  parsexsd.cpp
+  ogrwfsfilter.cpp
+)
+gdal_standard_includes(gmlutils)
+add_dependencies(gmlutils generate_gdal_version_h)
+set_property(TARGET gmlutils PROPERTY POSITION_INDEPENDENT_CODE ${GDAL_OBJECT_LIBRARIES_POSITION_INDEPENDENT_CODE})
+target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:gmlutils>)
+target_compile_options(gmlutils PRIVATE ${GDAL_CXX_WARNING_FLAGS} ${WFLAG_OLD_STYLE_CAST} ${WFLAG_EFFCXX})
+
diff --git a/ogr/ogrsf_frmts/gml/gmlfeature.cpp b/ogr/ogrsf_frmts/gmlutils/gmlfeature.cpp
similarity index 89%
rename from ogr/ogrsf_frmts/gml/gmlfeature.cpp
rename to ogr/ogrsf_frmts/gmlutils/gmlfeature.cpp
index cc12248a6bdb..c3f4c4840c79 100644
--- a/ogr/ogrsf_frmts/gml/gmlfeature.cpp
+++ b/ogr/ogrsf_frmts/gmlutils/gmlfeature.cpp
@@ -8,27 +8,11 @@
  * Copyright (c) 2002, Frank Warmerdam
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
-#include "gmlreader.h"
+#include "gmlfeature.h"
 
 #include <cstdio>
 
diff --git a/ogr/ogrsf_frmts/gmlutils/gmlfeature.h b/ogr/ogrsf_frmts/gmlutils/gmlfeature.h
new file mode 100644
index 000000000000..ffa990be5576
--- /dev/null
+++ b/ogr/ogrsf_frmts/gmlutils/gmlfeature.h
@@ -0,0 +1,464 @@
+/******************************************************************************
+ * $Id$
+ *
+ * Project:  GML Reader
+ * Purpose:  Public Declarations for OGR free GML Reader code.
+ * Author:   Frank Warmerdam, warmerdam@pobox.com
+ *
+ ******************************************************************************
+ * Copyright (c) 2002, Frank Warmerdam
+ * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.com>
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#ifndef GMLFEATURE_H_INCLUDED
+#define GMLFEATURE_H_INCLUDED
+
+#include "cpl_port.h"
+#include "cpl_vsi.h"
+#include "cpl_minixml.h"
+#include "ogr_core.h"
+#include "ogr_geomcoordinateprecision.h"
+
+#include <map>
+#include <vector>
+
+typedef enum
+{
+    GMLPT_Untyped = 0,
+    GMLPT_String = 1,
+    GMLPT_Integer = 2,
+    GMLPT_Real = 3,
+    GMLPT_Complex = 4,
+    GMLPT_StringList = 5,
+    GMLPT_IntegerList = 6,
+    GMLPT_RealList = 7,
+    GMLPT_FeatureProperty = 8,
+    GMLPT_FeaturePropertyList = 9,
+    GMLPT_Boolean = 10,
+    GMLPT_BooleanList = 11,
+    GMLPT_Short = 12,
+    GMLPT_Float = 13,
+    GMLPT_Integer64 = 14,
+    GMLPT_Integer64List = 15,
+    GMLPT_DateTime = 16,
+    GMLPT_Date = 17,
+    GMLPT_Time = 18,
+} GMLPropertyType;
+
+/************************************************************************/
+/*                           GMLPropertyDefn                            */
+/************************************************************************/
+
+typedef struct
+{
+    int nSubProperties;
+    char **papszSubProperties;
+    char *aszSubProperties[2]; /* Optimization in the case of nSubProperties ==
+                                  1 */
+} GMLProperty;
+
+class CPL_DLL GMLPropertyDefn
+{
+    char *m_pszName = nullptr;
+    GMLPropertyType m_eType = GMLPT_Untyped;
+    int m_nWidth = 0;
+    int m_nPrecision = 0;
+    char *m_pszSrcElement = nullptr;
+    size_t m_nSrcElementLen = 0;
+    char *m_pszCondition = nullptr;
+    bool m_bNullable = true;
+    bool m_bUnique = false;
+    std::string m_osDocumentation{};
+
+    CPL_DISALLOW_COPY_ASSIGN(GMLPropertyDefn)
+
+  public:
+    explicit GMLPropertyDefn(const char *pszName,
+                             const char *pszSrcElement = nullptr);
+    ~GMLPropertyDefn();
+
+    const char *GetName() const
+    {
+        return m_pszName;
+    }
+
+    GMLPropertyType GetType() const
+    {
+        return m_eType;
+    }
+
+    void SetType(GMLPropertyType eType)
+    {
+        m_eType = eType;
+    }
+
+    void SetWidth(int nWidth)
+    {
+        m_nWidth = nWidth;
+    }
+
+    int GetWidth() const
+    {
+        return m_nWidth;
+    }
+
+    void SetPrecision(int nPrecision)
+    {
+        m_nPrecision = nPrecision;
+    }
+
+    int GetPrecision() const
+    {
+        return m_nPrecision;
+    }
+
+    void SetSrcElement(const char *pszSrcElement);
+
+    const char *GetSrcElement() const
+    {
+        return m_pszSrcElement;
+    }
+
+    size_t GetSrcElementLen() const
+    {
+        return m_nSrcElementLen;
+    }
+
+    void SetCondition(const char *pszCondition);
+
+    const char *GetCondition() const
+    {
+        return m_pszCondition;
+    }
+
+    void SetNullable(bool bNullable)
+    {
+        m_bNullable = bNullable;
+    }
+
+    bool IsNullable() const
+    {
+        return m_bNullable;
+    }
+
+    void SetUnique(bool bUnique)
+    {
+        m_bUnique = bUnique;
+    }
+
+    bool IsUnique() const
+    {
+        return m_bUnique;
+    }
+
+    void SetDocumentation(const std::string &osDocumentation)
+    {
+        m_osDocumentation = osDocumentation;
+    }
+
+    const std::string &GetDocumentation() const
+    {
+        return m_osDocumentation;
+    }
+
+    void AnalysePropertyValue(const GMLProperty *psGMLProperty,
+                              bool bSetWidth = true);
+
+    static bool IsSimpleType(GMLPropertyType eType)
+    {
+        return eType == GMLPT_String || eType == GMLPT_Integer ||
+               eType == GMLPT_Real;
+    }
+};
+
+/************************************************************************/
+/*                    GMLGeometryPropertyDefn                           */
+/************************************************************************/
+
+class CPL_DLL GMLGeometryPropertyDefn
+{
+    char *m_pszName = nullptr;
+    char *m_pszSrcElement = nullptr;
+    OGRwkbGeometryType m_nGeometryType = wkbUnknown;
+    const int m_nAttributeIndex = -1;
+    const bool m_bNullable = true;
+    bool m_bSRSNameConsistent = true;
+    std::string m_osSRSName{};
+    OGRGeomCoordinatePrecision m_oCoordPrecision{};
+
+    CPL_DISALLOW_COPY_ASSIGN(GMLGeometryPropertyDefn)
+
+  public:
+    GMLGeometryPropertyDefn(const char *pszName, const char *pszSrcElement,
+                            OGRwkbGeometryType nType, int nAttributeIndex,
+                            bool bNullable,
+                            const OGRGeomCoordinatePrecision &oCoordPrec =
+                                OGRGeomCoordinatePrecision());
+    ~GMLGeometryPropertyDefn();
+
+    const char *GetName() const
+    {
+        return m_pszName;
+    }
+
+    OGRwkbGeometryType GetType() const
+    {
+        return m_nGeometryType;
+    }
+
+    void SetType(OGRwkbGeometryType nType)
+    {
+        m_nGeometryType = nType;
+    }
+
+    const char *GetSrcElement() const
+    {
+        return m_pszSrcElement;
+    }
+
+    int GetAttributeIndex() const
+    {
+        return m_nAttributeIndex;
+    }
+
+    bool IsNullable() const
+    {
+        return m_bNullable;
+    }
+
+    const OGRGeomCoordinatePrecision &GetCoordinatePrecision() const
+    {
+        return m_oCoordPrecision;
+    }
+
+    void SetSRSName(const std::string &srsName)
+    {
+        m_bSRSNameConsistent = true;
+        m_osSRSName = srsName;
+    }
+
+    void MergeSRSName(const std::string &osSRSName);
+
+    const std::string &GetSRSName() const
+    {
+        return m_osSRSName;
+    }
+};
+
+/************************************************************************/
+/*                           GMLFeatureClass                            */
+/************************************************************************/
+
+class CPL_DLL GMLFeatureClass
+{
+    char *m_pszName;
+    char *m_pszElementName;
+    int n_nNameLen;
+    int n_nElementNameLen;
+    int m_nPropertyCount;
+    GMLPropertyDefn **m_papoProperty;
+    std::map<CPLString, int> m_oMapPropertyNameToIndex{};
+    std::map<CPLString, int> m_oMapPropertySrcElementToIndex{};
+
+    int m_nGeometryPropertyCount;
+    GMLGeometryPropertyDefn **m_papoGeometryProperty;
+
+    bool m_bSchemaLocked;
+
+    GIntBig m_nFeatureCount;
+
+    char *m_pszExtraInfo;
+
+    bool m_bHaveExtents;
+    double m_dfXMin;
+    double m_dfXMax;
+    double m_dfYMin;
+    double m_dfYMax;
+
+    char *m_pszSRSName;
+    bool m_bSRSNameConsistent;
+
+    bool m_bIsConsistentSingleGeomElemPath = true;
+    std::string m_osSingleGeomElemPath{};
+
+    CPL_DISALLOW_COPY_ASSIGN(GMLFeatureClass)
+
+  public:
+    explicit GMLFeatureClass(const char *pszName = "");
+    ~GMLFeatureClass();
+
+    const char *GetElementName() const;
+    size_t GetElementNameLen() const;
+    void SetElementName(const char *pszElementName);
+
+    const char *GetName() const
+    {
+        return m_pszName;
+    }
+
+    void SetName(const char *pszNewName);
+
+    int GetPropertyCount() const
+    {
+        return m_nPropertyCount;
+    }
+
+    GMLPropertyDefn *GetProperty(int iIndex) const;
+    int GetPropertyIndex(const char *pszName) const;
+
+    GMLPropertyDefn *GetProperty(const char *pszName) const
+    {
+        return GetProperty(GetPropertyIndex(pszName));
+    }
+
+    int GetPropertyIndexBySrcElement(const char *pszElement, int nLen) const;
+    void StealProperties();
+
+    int GetGeometryPropertyCount() const
+    {
+        return m_nGeometryPropertyCount;
+    }
+
+    GMLGeometryPropertyDefn *GetGeometryProperty(int iIndex) const;
+    int GetGeometryPropertyIndexBySrcElement(const char *pszElement) const;
+    void StealGeometryProperties();
+
+    bool HasFeatureProperties();
+
+    int AddProperty(GMLPropertyDefn *, int iPos = -1);
+    int AddGeometryProperty(GMLGeometryPropertyDefn *);
+    void ClearGeometryProperties();
+
+    void SetConsistentSingleGeomElemPath(bool b)
+    {
+        m_bIsConsistentSingleGeomElemPath = b;
+    }
+
+    bool IsConsistentSingleGeomElemPath() const
+    {
+        return m_bIsConsistentSingleGeomElemPath;
+    }
+
+    void SetSingleGeomElemPath(const std::string &s)
+    {
+        m_osSingleGeomElemPath = s;
+    }
+
+    const std::string &GetSingleGeomElemPath() const
+    {
+        return m_osSingleGeomElemPath;
+    }
+
+    bool IsSchemaLocked() const
+    {
+        return m_bSchemaLocked;
+    }
+
+    void SetSchemaLocked(bool bLock)
+    {
+        m_bSchemaLocked = bLock;
+    }
+
+    const char *GetExtraInfo();
+    void SetExtraInfo(const char *);
+
+    GIntBig GetFeatureCount();
+    void SetFeatureCount(GIntBig);
+
+    bool HasExtents() const
+    {
+        return m_bHaveExtents;
+    }
+
+    void SetExtents(double dfXMin, double dfXMax, double dFYMin, double dfYMax);
+    bool GetExtents(double *pdfXMin, double *pdfXMax, double *pdFYMin,
+                    double *pdfYMax);
+
+    void SetSRSName(const char *pszSRSName);
+    void MergeSRSName(const char *pszSRSName);
+
+    const char *GetSRSName()
+    {
+        return m_pszSRSName;
+    }
+
+    CPLXMLNode *SerializeToXML();
+    bool InitializeFromXML(CPLXMLNode *);
+};
+
+/************************************************************************/
+/*                              GMLFeature                              */
+/************************************************************************/
+
+class CPL_DLL GMLFeature
+{
+    GMLFeatureClass *m_poClass;
+    char *m_pszFID;
+
+    int m_nPropertyCount;
+    GMLProperty *m_pasProperties;
+
+    int m_nGeometryCount;
+    CPLXMLNode **m_papsGeometry;  /* NULL-terminated. Alias to m_apsGeometry if
+                                     m_nGeometryCount <= 1 */
+    CPLXMLNode *m_apsGeometry[2]; /* NULL-terminated */
+
+    CPLXMLNode *m_psBoundedByGeometry = nullptr;
+
+    CPL_DISALLOW_COPY_ASSIGN(GMLFeature)
+
+  public:
+    explicit GMLFeature(GMLFeatureClass *);
+    ~GMLFeature();
+
+    GMLFeatureClass *GetClass() const
+    {
+        return m_poClass;
+    }
+
+    void SetGeometryDirectly(CPLXMLNode *psGeom);
+    void SetGeometryDirectly(int nIdx, CPLXMLNode *psGeom);
+    void AddGeometry(CPLXMLNode *psGeom);
+
+    int GetGeometryCount() const
+    {
+        return m_nGeometryCount;
+    }
+
+    const CPLXMLNode *const *GetGeometryList() const
+    {
+        return m_papsGeometry;
+    }
+
+    const CPLXMLNode *GetGeometryRef(int nIdx) const;
+
+    void SetBoundedByGeometry(CPLXMLNode *psGeom);
+
+    const CPLXMLNode *GetBoundedByGeometry() const
+    {
+        return m_psBoundedByGeometry;
+    }
+
+    void SetPropertyDirectly(int i, char *pszValue);
+
+    const GMLProperty *GetProperty(int i) const
+    {
+        return (i >= 0 && i < m_nPropertyCount) ? &m_pasProperties[i] : nullptr;
+    }
+
+    const char *GetFID() const
+    {
+        return m_pszFID;
+    }
+
+    void SetFID(const char *pszFID);
+
+    void Dump(FILE *fp);
+};
+
+OGRFieldType CPL_DLL GML_GetOGRFieldType(GMLPropertyType eType,
+                                         OGRFieldSubType &eSubType);
+
+#endif
diff --git a/ogr/ogrsf_frmts/gml/gmlfeatureclass.cpp b/ogr/ogrsf_frmts/gmlutils/gmlfeatureclass.cpp
similarity index 97%
rename from ogr/ogrsf_frmts/gml/gmlfeatureclass.cpp
rename to ogr/ogrsf_frmts/gmlutils/gmlfeatureclass.cpp
index 86871ce29e30..8172706df9ea 100644
--- a/ogr/ogrsf_frmts/gml/gmlfeatureclass.cpp
+++ b/ogr/ogrsf_frmts/gmlutils/gmlfeatureclass.cpp
@@ -8,27 +8,11 @@
  * Copyright (c) 2002, Frank Warmerdam
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
-#include "gmlreader.h"
+#include "gmlfeature.h"
 
 #include <cmath>
 #include <cstddef>
diff --git a/ogr/ogrsf_frmts/gml/gmlpropertydefn.cpp b/ogr/ogrsf_frmts/gmlutils/gmlpropertydefn.cpp
similarity index 87%
rename from ogr/ogrsf_frmts/gml/gmlpropertydefn.cpp
rename to ogr/ogrsf_frmts/gmlutils/gmlpropertydefn.cpp
index 10b5cdb119bd..778901b0c870 100644
--- a/ogr/ogrsf_frmts/gml/gmlpropertydefn.cpp
+++ b/ogr/ogrsf_frmts/gmlutils/gmlpropertydefn.cpp
@@ -8,27 +8,11 @@
  * Copyright (c) 2002, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
-#include "gmlreader.h"
+#include "gmlfeature.h"
 
 #include <cstring>
 
@@ -40,11 +24,9 @@
 /************************************************************************/
 
 GMLPropertyDefn::GMLPropertyDefn(const char *pszName, const char *pszSrcElement)
-    : m_pszName(CPLStrdup(pszName)), m_eType(GMLPT_Untyped), m_nWidth(0),
-      m_nPrecision(0),
+    : m_pszName(CPLStrdup(pszName)),
       m_pszSrcElement(pszSrcElement ? CPLStrdup(pszSrcElement) : nullptr),
-      m_nSrcElementLen(pszSrcElement ? strlen(pszSrcElement) : 0),
-      m_pszCondition(nullptr), m_bNullable(true)
+      m_nSrcElementLen(pszSrcElement ? strlen(pszSrcElement) : 0)
 {
 }
 
diff --git a/ogr/ogrsf_frmts/gml/gmlutils.cpp b/ogr/ogrsf_frmts/gmlutils/gmlutils.cpp
similarity index 83%
rename from ogr/ogrsf_frmts/gml/gmlutils.cpp
rename to ogr/ogrsf_frmts/gmlutils/gmlutils.cpp
index a1c337fd300f..e1129a143d98 100644
--- a/ogr/ogrsf_frmts/gml/gmlutils.cpp
+++ b/ogr/ogrsf_frmts/gmlutils/gmlutils.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -124,67 +108,80 @@ bool GML_IsSRSLatLongOrder(const char *pszSRSName)
 /*                GML_BuildOGRGeometryFromList_CreateCache()            */
 /************************************************************************/
 
+namespace
+{
 class SRSDesc
 {
   public:
-    std::string osSRSName;
-    bool bAxisInvert;
-    OGRSpatialReference *poSRS;
+    std::string osSRSName{};
+    bool bAxisInvert = false;
+    OGRSpatialReference *poSRS = nullptr;
 
-    SRSDesc() : bAxisInvert(false), poSRS(nullptr)
+    SRSDesc() = default;
+
+    SRSDesc &operator=(SRSDesc &&other)
     {
+        osSRSName = std::move(other.osSRSName);
+        bAxisInvert = other.bAxisInvert;
+        if (poSRS)
+            poSRS->Release();
+        poSRS = other.poSRS;
+        other.poSRS = nullptr;
+        return *this;
     }
+
+    ~SRSDesc()
+    {
+        if (poSRS)
+            poSRS->Release();
+    }
+
+    CPL_DISALLOW_COPY_ASSIGN(SRSDesc)
 };
 
 class SRSCache
 {
-    std::map<std::string, SRSDesc> oMap;
-    SRSDesc oLastDesc;
+    std::map<std::string, SRSDesc> oMap{};
+    SRSDesc *poLastDesc = nullptr;
 
-  public:
-    SRSCache()
-    {
-    }
+    CPL_DISALLOW_COPY_ASSIGN(SRSCache)
 
-    ~SRSCache()
-    {
-        std::map<std::string, SRSDesc>::iterator oIter;
-        for (oIter = oMap.begin(); oIter != oMap.end(); ++oIter)
-        {
-            if (oIter->second.poSRS != nullptr)
-                oIter->second.poSRS->Release();
-        }
-    }
+  public:
+    SRSCache() = default;
 
-    SRSDesc &Get(const std::string &osSRSName)
+    const SRSDesc &Get(const std::string &osSRSName)
     {
-        if (osSRSName == oLastDesc.osSRSName)
-            return oLastDesc;
+        if (poLastDesc && osSRSName == poLastDesc->osSRSName)
+            return *poLastDesc;
 
         std::map<std::string, SRSDesc>::iterator oIter = oMap.find(osSRSName);
         if (oIter != oMap.end())
         {
-            oLastDesc = oIter->second;
-            return oLastDesc;
+            poLastDesc = &(oIter->second);
+            return *poLastDesc;
         }
 
-        oLastDesc.osSRSName = osSRSName;
-        oLastDesc.bAxisInvert = GML_IsSRSLatLongOrder(osSRSName.c_str());
-        oLastDesc.poSRS = new OGRSpatialReference();
-        oLastDesc.poSRS->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
-        if (oLastDesc.poSRS->SetFromUserInput(
+        SRSDesc oDesc;
+        oDesc.osSRSName = osSRSName;
+        oDesc.bAxisInvert = GML_IsSRSLatLongOrder(osSRSName.c_str());
+        oDesc.poSRS = new OGRSpatialReference();
+        oDesc.poSRS->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+        if (oDesc.poSRS->SetFromUserInput(
                 osSRSName.c_str(),
                 OGRSpatialReference::SET_FROM_USER_INPUT_LIMITATIONS_get()) !=
             OGRERR_NONE)
         {
-            delete oLastDesc.poSRS;
-            oLastDesc.poSRS = nullptr;
+            delete oDesc.poSRS;
+            oDesc.poSRS = nullptr;
         }
-        oMap[osSRSName] = oLastDesc;
-        return oLastDesc;
+        oMap[osSRSName] = std::move(oDesc);
+        poLastDesc = &(oMap[osSRSName]);
+        return *poLastDesc;
     }
 };
 
+}  // namespace
+
 void *GML_BuildOGRGeometryFromList_CreateCache()
 {
     return new SRSCache();
diff --git a/ogr/ogrsf_frmts/gmlutils/gmlutils.h b/ogr/ogrsf_frmts/gmlutils/gmlutils.h
new file mode 100644
index 000000000000..0ef789a7b7d0
--- /dev/null
+++ b/ogr/ogrsf_frmts/gmlutils/gmlutils.h
@@ -0,0 +1,58 @@
+/******************************************************************************
+ * $Id$
+ *
+ * Project:  GML Utils
+ * Purpose:  GML reader
+ * Author:   Even Rouault, <even dot rouault at spatialys.com>
+ *
+ ******************************************************************************
+ * Copyright (c) 2010-2011, Even Rouault <even dot rouault at spatialys.com>
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#ifndef CPL_GMLUTILS_H_INCLUDED
+#define CPL_GMLUTILS_H_INCLUDED
+
+#include <vector>
+#include <string>
+#include "cpl_minixml.h"
+
+#include "ogr_geometry.h"
+
+typedef enum
+{
+    GML_SWAP_AUTO,
+    GML_SWAP_YES,
+    GML_SWAP_NO,
+} GMLSwapCoordinatesEnum;
+
+typedef enum
+{
+    SRSNAME_SHORT,
+    SRSNAME_OGC_URN,
+    SRSNAME_OGC_URL
+} OGRGMLSRSNameFormat;
+
+const char CPL_DLL *
+GML_ExtractSrsNameFromGeometry(const CPLXMLNode *const *papsGeometry,
+                               std::string &osWork, bool bConsiderEPSGAsURN);
+
+bool CPL_DLL GML_IsSRSLatLongOrder(const char *pszSRSName);
+bool CPL_DLL GML_IsLegitSRSName(const char *pszSRSName);
+
+void CPL_DLL *GML_BuildOGRGeometryFromList_CreateCache();
+void CPL_DLL GML_BuildOGRGeometryFromList_DestroyCache(void *hCacheSRS);
+
+OGRGeometry CPL_DLL *GML_BuildOGRGeometryFromList(
+    const CPLXMLNode *const *papsGeometry, bool bTryToMakeMultipolygons,
+    bool bInvertAxisOrderIfLatLong, const char *pszDefaultSRSName,
+    bool bConsiderEPSGAsURN, GMLSwapCoordinatesEnum eSwapCoordinates,
+    int nPseudoBoolGetSecondaryGeometryOption, void *hCacheSRS,
+    bool bFaceHoleNegative = false);
+
+char CPL_DLL *GML_GetSRSName(const OGRSpatialReference *poSRS,
+                             OGRGMLSRSNameFormat eSRSNameFormat,
+                             bool *pbCoordSwap);
+
+#endif /* _CPL_GMLREADERP_H_INCLUDED */
diff --git a/ogr/ogrsf_frmts/wfs/ogrwfsfilter.cpp b/ogr/ogrsf_frmts/gmlutils/ogrwfsfilter.cpp
similarity index 94%
rename from ogr/ogrsf_frmts/wfs/ogrwfsfilter.cpp
rename to ogr/ogrsf_frmts/gmlutils/ogrwfsfilter.cpp
index f40b84bbfeb6..a162fcd2c02c 100644
--- a/ogr/ogrsf_frmts/wfs/ogrwfsfilter.cpp
+++ b/ogr/ogrsf_frmts/gmlutils/ogrwfsfilter.cpp
@@ -7,26 +7,10 @@
  ******************************************************************************
  * Copyright (c) 2010-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
-#include "ogr_wfs.h"
+#include "ogrwfsfilter.h"
 #include "ogr_p.h"
 
 typedef struct
@@ -34,7 +18,7 @@ typedef struct
     int nVersion;
     bool bPropertyIsNotEqualToSupported;
     int bOutNeedsNullCheck;
-    OGRDataSource *poDS;
+    GDALDataset *poDS;
     OGRFeatureDefn *poFDefn;
     int nUniqueGeomGMLId;
     const OGRSpatialReference *poSRS;
@@ -154,13 +138,12 @@ static const char *WFS_ExprGetSRSName(const swq_expr_node *poExpr,
     else if (poExpr->nSubExprCount == iSubArgIndex + 1 &&
              poExpr->papoSubExpr[iSubArgIndex]->field_type == SWQ_INTEGER)
     {
-        if (oSRS.importFromEPSGA(
-                (int)poExpr->papoSubExpr[iSubArgIndex]->int_value) ==
-            OGRERR_NONE)
+        if (oSRS.importFromEPSGA(static_cast<int>(
+                poExpr->papoSubExpr[iSubArgIndex]->int_value)) == OGRERR_NONE)
         {
             return CPLSPrintf(
                 "urn:ogc:def:crs:EPSG::%d",
-                (int)poExpr->papoSubExpr[iSubArgIndex]->int_value);
+                static_cast<int>(poExpr->papoSubExpr[iSubArgIndex]->int_value));
         }
     }
     else if (poExpr->nSubExprCount == iSubArgIndex &&
@@ -522,7 +505,8 @@ static bool WFS_ExprDumpAsOGCFilter(CPLString &osFilter,
         papszOptions =
             CSLSetNameValue(papszOptions, "GMLID",
                             CPLSPrintf("id%d", psOptions->nUniqueGeomGMLId++));
-        char *pszGML = OGR_G_ExportToGMLEx((OGRGeometryH)poGeom, papszOptions);
+        char *pszGML =
+            OGR_G_ExportToGMLEx(OGRGeometry::ToHandle(poGeom), papszOptions);
         osFilter += pszGML;
         CSLDestroy(papszOptions);
         delete poGeom;
@@ -622,7 +606,7 @@ static bool WFS_ExprDumpAsOGCFilter(CPLString &osFilter,
 /************************************************************************/
 
 CPLString
-WFS_TurnSQLFilterToOGCFilter(const swq_expr_node *poExpr, OGRDataSource *poDS,
+WFS_TurnSQLFilterToOGCFilter(const swq_expr_node *poExpr, GDALDataset *poDS,
                              OGRFeatureDefn *poFDefn, int nVersion,
                              int bPropertyIsNotEqualToSupported,
                              int bUseFeatureId, int bGmlObjectIdNeedsGMLPrefix,
@@ -690,8 +674,8 @@ static bool OGRWFSCheckSRIDArg(swq_expr_node *op, int iSubArgIndex)
     if (op->papoSubExpr[iSubArgIndex]->field_type == SWQ_INTEGER)
     {
         OGRSpatialReference oSRS;
-        if (oSRS.importFromEPSGA(
-                (int)op->papoSubExpr[iSubArgIndex]->int_value) != OGRERR_NONE)
+        if (oSRS.importFromEPSGA(static_cast<int>(
+                op->papoSubExpr[iSubArgIndex]->int_value)) != OGRERR_NONE)
         {
             CPLError(CE_Failure, CPLE_AppDefined,
                      "Wrong value for argument %d of %s", iSubArgIndex + 1,
@@ -885,11 +869,10 @@ static const swq_operation OGRWFSSpatialOps[] = {
 
 const swq_operation *OGRWFSCustomFuncRegistrar::GetOperator(const char *pszName)
 {
-    for (int i = 0;
-         i < (int)(sizeof(OGRWFSSpatialOps) / sizeof(OGRWFSSpatialOps[0])); i++)
+    for (const auto &op : OGRWFSSpatialOps)
     {
-        if (EQUAL(OGRWFSSpatialOps[i].pszName, pszName))
-            return &OGRWFSSpatialOps[i];
+        if (EQUAL(op.pszName, pszName))
+            return &op;
     }
     return nullptr;
 }
diff --git a/ogr/ogrsf_frmts/gmlutils/ogrwfsfilter.h b/ogr/ogrsf_frmts/gmlutils/ogrwfsfilter.h
new file mode 100644
index 000000000000..84120004bedb
--- /dev/null
+++ b/ogr/ogrsf_frmts/gmlutils/ogrwfsfilter.h
@@ -0,0 +1,29 @@
+/******************************************************************************
+ * Project:  WFS Reader
+ * Purpose:  WFS filtering
+ * Purpose:  Implements OGR SQL into OGC Filter translation.
+ * Author:   Even Rouault, <even dot rouault at spatialys.com>
+ *
+ ******************************************************************************
+ * Copyright (c) 2010-2012, Even Rouault <even dot rouault at spatialys.com>
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#ifndef OGRWFSFILTER_H_INCLUDED
+#define OGRWFSFILTER_H_INCLUDED
+
+#include "cpl_string.h"
+#include "gdal_priv.h"
+#include "ogr_feature.h"
+#include "ogrsf_frmts.h"
+#include "ogr_swq.h"
+
+CPLString CPL_DLL WFS_TurnSQLFilterToOGCFilter(
+    const swq_expr_node *poExpr, GDALDataset *poDS, OGRFeatureDefn *poFDefn,
+    int nVersion, int bPropertyIsNotEqualToSupported, int bUseFeatureId,
+    int bGmlObjectIdNeedsGMLPrefix, const char *pszNSPrefix,
+    int *pbOutNeedsNullCheck);
+swq_custom_func_registrar CPL_DLL *WFSGetCustomFuncRegistrar();
+
+#endif
diff --git a/ogr/ogrsf_frmts/gml/parsexsd.cpp b/ogr/ogrsf_frmts/gmlutils/parsexsd.cpp
similarity index 96%
rename from ogr/ogrsf_frmts/gml/parsexsd.cpp
rename to ogr/ogrsf_frmts/gmlutils/parsexsd.cpp
index 8ae243fe3886..bec8fae945a4 100644
--- a/ogr/ogrsf_frmts/gml/parsexsd.cpp
+++ b/ogr/ogrsf_frmts/gmlutils/parsexsd.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2005, Frank Warmerdam
  * Copyright (c) 2010-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -735,9 +719,8 @@ static GMLFeatureClass *GMLParseFeatureType(CPLXMLNode *psSchemaNode,
                         {
                             OGRwkbGeometryType eNewType = psIter->eType;
                             OGRwkbGeometryType eOldType =
-                                (OGRwkbGeometryType)poClass
-                                    ->GetGeometryProperty(0)
-                                    ->GetType();
+                                static_cast<OGRwkbGeometryType>(
+                                    poClass->GetGeometryProperty(0)->GetType());
 
                             if ((eNewType == wkbMultiPoint &&
                                  eOldType == wkbPoint) ||
@@ -881,6 +864,29 @@ static GMLFeatureClass *GMLParseFeatureType(CPLXMLNode *psSchemaNode,
     return poClass;
 }
 
+/************************************************************************/
+/*                         ExcludeBaseGMLSchemas()                            */
+/************************************************************************/
+
+static bool ExcludeBaseGMLSchemas(const char *pszFilename)
+{
+    // List of substrings to exclude
+    const std::vector<std::string> excludedBaseGMLReferencedSchemasList = {
+        "/gml/3.2.1/", "gml/3.1.1/", "/gml/2.1.2/", "/gmlsfProfile/"};
+    if (pszFilename != nullptr)
+    {
+        const std::string osFilename(pszFilename);
+        for (const auto &pattern : excludedBaseGMLReferencedSchemasList)
+        {
+            if (osFilename.find(pattern) != std::string::npos)
+            {
+                return false;  // Found one of the excluded base GML referenced schema
+            }
+        }
+    }
+    return true;  // None of the base GML referenced schemas were found
+}
+
 /************************************************************************/
 /*                         GMLParseXMLFile()                            */
 /************************************************************************/
@@ -896,7 +902,8 @@ static CPLXMLNode *GMLParseXMLFile(const char *pszFilename)
         {
             if (psResult->pabyData != nullptr)
             {
-                psRet = CPLParseXMLString((const char *)psResult->pabyData);
+                psRet = CPLParseXMLString(
+                    reinterpret_cast<const char *>(psResult->pabyData));
             }
             CPLHTTPDestroyResult(psResult);
         }
@@ -943,7 +950,8 @@ static CPLXMLNode *CPLGetLastNode(CPLXMLNode *psNode)
 /************************************************************************/
 
 static void CPLXMLSchemaResolveInclude(const char *pszMainSchemaLocation,
-                                       CPLXMLNode *psSchemaNode)
+                                       CPLXMLNode *psSchemaNode,
+                                       bool bUseSchemaImports)
 {
     std::set<CPLString> osAlreadyIncluded;
 
@@ -956,11 +964,16 @@ static void CPLXMLSchemaResolveInclude(const char *pszMainSchemaLocation,
         CPLXMLNode *psThis = psSchemaNode->psChild;
         for (; psThis != nullptr; psThis = psThis->psNext)
         {
+            const char *pszSchemaLocation =
+                CPLGetXMLValue(psThis, "schemaLocation", nullptr);
+
             if (psThis->eType == CXT_Element &&
-                EQUAL(psThis->pszValue, "include"))
+                (EQUAL(psThis->pszValue, "include") ||
+                 (bUseSchemaImports == TRUE &&
+                  EQUAL(psThis->pszValue, "import") &&
+                  ExcludeBaseGMLSchemas(pszSchemaLocation))))
             {
-                const char *pszSchemaLocation =
-                    CPLGetXMLValue(psThis, "schemaLocation", nullptr);
+
                 if (pszSchemaLocation != nullptr &&
                     osAlreadyIncluded.count(pszSchemaLocation) == 0)
                 {
@@ -1064,7 +1077,7 @@ GetUniqueConstraints(const CPLXMLNode *psNode)
 /*                          GMLParseXSD()                               */
 /************************************************************************/
 
-bool GMLParseXSD(const char *pszFile,
+bool GMLParseXSD(const char *pszFile, bool bUseSchemaImports,
                  std::vector<GMLFeatureClass *> &aosClasses,
                  bool &bFullyUnderstood)
 
@@ -1100,7 +1113,7 @@ bool GMLParseXSD(const char *pszFile,
     /* ==================================================================== */
     /*      Process each include directive.                                 */
     /* ==================================================================== */
-    CPLXMLSchemaResolveInclude(pszFile, psSchemaNode);
+    CPLXMLSchemaResolveInclude(pszFile, psSchemaNode, bUseSchemaImports);
 
     // CPLSerializeXMLTreeToFile(psSchemaNode, "/vsistdout/");
 
diff --git a/ogr/ogrsf_frmts/gmlutils/parsexsd.h b/ogr/ogrsf_frmts/gmlutils/parsexsd.h
new file mode 100644
index 000000000000..669c94a066aa
--- /dev/null
+++ b/ogr/ogrsf_frmts/gmlutils/parsexsd.h
@@ -0,0 +1,27 @@
+/******************************************************************************
+ * $Id$
+ *
+ * Project:  GML Reader
+ * Purpose:  Implementation of GMLParseXSD()
+ * Author:   Frank Warmerdam, warmerdam@pobox.com
+ *
+ ******************************************************************************
+ * Copyright (c) 2005, Frank Warmerdam
+ * Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.com>
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#ifndef PARSEXSD_H_INCLUDED
+#define PARSEXSD_H_INCLUDED
+
+#include "cpl_port.h"
+
+#include <vector>
+#include "gmlfeature.h"
+
+bool CPL_DLL GMLParseXSD(const char *pszFile, bool bUseSchemaImports,
+                         std::vector<GMLFeatureClass *> &aosClasses,
+                         bool &bFullyUnderstood);
+
+#endif  // PARSEXSD_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/gmt/ogr_gmt.h b/ogr/ogrsf_frmts/gmt/ogr_gmt.h
index 27b57a42d1ea..a85afdc5282a 100644
--- a/ogr/ogrsf_frmts/gmt/ogr_gmt.h
+++ b/ogr/ogrsf_frmts/gmt/ogr_gmt.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRGMT_H_INCLUDED
@@ -108,13 +92,11 @@ class OGRGmtLayer final : public OGRLayer,
 /*                           OGRGmtDataSource                           */
 /************************************************************************/
 
-class OGRGmtDataSource final : public OGRDataSource
+class OGRGmtDataSource final : public GDALDataset
 {
     OGRGmtLayer **papoLayers;
     int nLayers;
 
-    char *pszName;
-
     bool bUpdate;
 
   public:
@@ -123,12 +105,6 @@ class OGRGmtDataSource final : public OGRDataSource
 
     int Open(const char *pszFilename, VSILFILE *fp,
              const OGRSpatialReference *poSRS, int bUpdate);
-    int Create(const char *pszFilename, char **papszOptions);
-
-    const char *GetName() override
-    {
-        return pszName;
-    }
 
     int GetLayerCount() override
     {
diff --git a/ogr/ogrsf_frmts/gmt/ogrgmtdatasource.cpp b/ogr/ogrsf_frmts/gmt/ogrgmtdatasource.cpp
index fd6261b27a3e..c96cc625e9f7 100644
--- a/ogr/ogrsf_frmts/gmt/ogrgmtdatasource.cpp
+++ b/ogr/ogrsf_frmts/gmt/ogrgmtdatasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
@@ -35,7 +19,7 @@
 /************************************************************************/
 
 OGRGmtDataSource::OGRGmtDataSource()
-    : papoLayers(nullptr), nLayers(0), pszName(nullptr), bUpdate(false)
+    : papoLayers(nullptr), nLayers(0), bUpdate(false)
 {
 }
 
@@ -49,7 +33,6 @@ OGRGmtDataSource::~OGRGmtDataSource()
     for (int i = 0; i < nLayers; i++)
         delete papoLayers[i];
     CPLFree(papoLayers);
-    CPLFree(pszName);
 }
 
 /************************************************************************/
@@ -75,24 +58,6 @@ int OGRGmtDataSource::Open(const char *pszFilename, VSILFILE *fp,
     papoLayers[nLayers] = poLayer;
     nLayers++;
 
-    CPLFree(pszName);
-    pszName = CPLStrdup(pszFilename);
-
-    return TRUE;
-}
-
-/************************************************************************/
-/*                               Create()                               */
-/*                                                                      */
-/*      Create a new datasource.  This does not really do anything      */
-/*      currently but save the name.                                    */
-/************************************************************************/
-
-int OGRGmtDataSource::Create(const char *pszDSName, char ** /* papszOptions */)
-
-{
-    pszName = CPLStrdup(pszDSName);
-
     return TRUE;
 }
 
@@ -148,8 +113,8 @@ OGRGmtDataSource::ICreateLayer(const char *pszLayerName,
     /*      layer name with the name from the gmt.                          */
     /* -------------------------------------------------------------------- */
 
-    CPLString osPath = CPLGetPath(pszName);
-    CPLString osFilename(pszName);
+    CPLString osPath = CPLGetPath(GetDescription());
+    CPLString osFilename(GetDescription());
     const char *pszFlags = "wb+";
 
     if (osFilename == "/dev/stdout")
@@ -157,7 +122,7 @@ OGRGmtDataSource::ICreateLayer(const char *pszLayerName,
 
     if (STARTS_WITH(osFilename, "/vsistdout"))
         pszFlags = "wb";
-    else if (!EQUAL(CPLGetExtension(pszName), "gmt"))
+    else if (!EQUAL(CPLGetExtension(GetDescription()), "gmt"))
         osFilename = CPLFormFilename(osPath, pszLayerName, "gmt");
 
     /* -------------------------------------------------------------------- */
diff --git a/ogr/ogrsf_frmts/gmt/ogrgmtdriver.cpp b/ogr/ogrsf_frmts/gmt/ogrgmtdriver.cpp
index 65991dd4814f..97886cfb234e 100644
--- a/ogr/ogrsf_frmts/gmt/ogrgmtdriver.cpp
+++ b/ogr/ogrsf_frmts/gmt/ogrgmtdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_gmt.h"
@@ -74,18 +58,12 @@ static GDALDataset *OGRGMTDriverOpen(GDALOpenInfo *poOpenInfo)
 /*                         OGRGMTDriverCreate()                         */
 /************************************************************************/
 
-static GDALDataset *
-OGRGMTDriverCreate(const char *pszName, CPL_UNUSED int nBands,
-                   CPL_UNUSED int nXSize, CPL_UNUSED int nYSize,
-                   CPL_UNUSED GDALDataType eDT, char **papszOptions)
+static GDALDataset *OGRGMTDriverCreate(const char *, CPL_UNUSED int nBands,
+                                       CPL_UNUSED int nXSize,
+                                       CPL_UNUSED int nYSize,
+                                       CPL_UNUSED GDALDataType eDT, char **)
 {
-    OGRGmtDataSource *poDS = new OGRGmtDataSource();
-
-    if (poDS->Create(pszName, papszOptions))
-        return poDS;
-
-    delete poDS;
-    return nullptr;
+    return new OGRGmtDataSource();
 }
 
 /************************************************************************/
diff --git a/ogr/ogrsf_frmts/gmt/ogrgmtlayer.cpp b/ogr/ogrsf_frmts/gmt/ogrgmtlayer.cpp
index bb00af91ec6c..cfe60261fc78 100644
--- a/ogr/ogrsf_frmts/gmt/ogrgmtlayer.cpp
+++ b/ogr/ogrsf_frmts/gmt/ogrgmtlayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_gmt.h"
diff --git a/ogr/ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp b/ogr/ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp
index 352d75554677..c2948a55d6a9 100644
--- a/ogr/ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp
+++ b/ogr/ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_geopackage.h"
@@ -33,7 +17,10 @@
 #include "cpl_error.h"
 
 #include <algorithm>
+#include <cmath>
 #include <limits>
+#include <set>
+#include <utility>
 
 #if !defined(DEBUG_VERBOSE) && defined(DEBUG_VERBOSE_GPKG)
 #define DEBUG_VERBOSE
@@ -240,8 +227,8 @@ GDALColorTable *GDALGPKGMBTilesLikeRasterBand::GetColorTable()
                     const int nBytes = sqlite3_column_bytes(hStmt, 0);
                     GByte *pabyRawData = reinterpret_cast<GByte *>(
                         const_cast<void *>(sqlite3_column_blob(hStmt, 0)));
-                    CPLString osMemFileName;
-                    osMemFileName.Printf("/vsimem/gpkg_read_tile_%p", this);
+                    const CPLString osMemFileName(
+                        VSIMemGenerateHiddenFilename("gpkg_read_tile"));
                     VSILFILE *fp = VSIFileFromMemBuffer(
                         osMemFileName.c_str(), pabyRawData, nBytes, FALSE);
                     VSIFCloseL(fp);
@@ -912,8 +899,8 @@ GByte *GDALGPKGMBTilesLikePseudoDataset::ReadTile(int nRow, int nCol,
             (m_eDT == GDT_Byte) ? 0 : sqlite3_column_int64(hStmt, 1);
         GByte *pabyRawData = static_cast<GByte *>(
             const_cast<void *>(sqlite3_column_blob(hStmt, 0)));
-        CPLString osMemFileName;
-        osMemFileName.Printf("/vsimem/gpkg_read_tile_%p", this);
+        const CPLString osMemFileName(
+            VSIMemGenerateHiddenFilename("gpkg_read_tile"));
         VSILFILE *fp = VSIFileFromMemBuffer(osMemFileName.c_str(), pabyRawData,
                                             nBytes, FALSE);
         VSIFCloseL(fp);
@@ -1229,6 +1216,145 @@ CPLErr GDALGPKGMBTilesLikeRasterBand::IReadBlock(int nBlockXOff, int nBlockYOff,
     return CE_None;
 }
 
+/************************************************************************/
+/*                       IGetDataCoverageStatus()                       */
+/************************************************************************/
+
+int GDALGPKGMBTilesLikeRasterBand::IGetDataCoverageStatus(int nXOff, int nYOff,
+                                                          int nXSize,
+                                                          int nYSize,
+                                                          int nMaskFlagStop,
+                                                          double *pdfDataPct)
+{
+    if (eAccess == GA_Update)
+        FlushCache(false);
+
+    const int iColMin = nXOff / nBlockXSize + m_poTPD->m_nShiftXTiles;
+    const int iColMax = (nXOff + nXSize - 1) / nBlockXSize +
+                        m_poTPD->m_nShiftXTiles +
+                        (m_poTPD->m_nShiftXPixelsMod ? 1 : 0);
+    const int iRowMin = nYOff / nBlockYSize + m_poTPD->m_nShiftYTiles;
+    const int iRowMax = (nYOff + nYSize - 1) / nBlockYSize +
+                        m_poTPD->m_nShiftYTiles +
+                        (m_poTPD->m_nShiftYPixelsMod ? 1 : 0);
+
+    int iDBRowMin = m_poTPD->GetRowFromIntoTopConvention(iRowMin);
+    int iDBRowMax = m_poTPD->GetRowFromIntoTopConvention(iRowMax);
+    if (iDBRowMin > iDBRowMax)
+        std::swap(iDBRowMin, iDBRowMax);
+
+    char *pszSQL = sqlite3_mprintf(
+        "SELECT tile_row, tile_column FROM \"%w\" "
+        "WHERE zoom_level = %d AND "
+        "(tile_row BETWEEN %d AND %d) AND "
+        "(tile_column BETWEEN %d AND %d)"
+        "%s",
+        m_poTPD->m_osRasterTable.c_str(), m_poTPD->m_nZoomLevel, iDBRowMin,
+        iDBRowMax, iColMin, iColMax,
+        !m_poTPD->m_osWHERE.empty()
+            ? CPLSPrintf(" AND (%s)", m_poTPD->m_osWHERE.c_str())
+            : "");
+
+#ifdef DEBUG_VERBOSE
+    CPLDebug("GPKG", "%s", pszSQL);
+#endif
+
+    sqlite3_stmt *hStmt = nullptr;
+    int rc = sqlite3_prepare_v2(m_poTPD->IGetDB(), pszSQL, -1, &hStmt, nullptr);
+    if (rc != SQLITE_OK)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "failed to prepare SQL %s: %s",
+                 pszSQL, sqlite3_errmsg(m_poTPD->IGetDB()));
+        sqlite3_free(pszSQL);
+        return GDAL_DATA_COVERAGE_STATUS_UNIMPLEMENTED |
+               GDAL_DATA_COVERAGE_STATUS_DATA;
+    }
+    sqlite3_free(pszSQL);
+    rc = sqlite3_step(hStmt);
+    std::set<std::pair<int, int>> oSetTiles;  // (row, col)
+    while (rc == SQLITE_ROW)
+    {
+        oSetTiles.insert(std::pair(
+            m_poTPD->GetRowFromIntoTopConvention(sqlite3_column_int(hStmt, 0)),
+            sqlite3_column_int(hStmt, 1)));
+        rc = sqlite3_step(hStmt);
+    }
+    sqlite3_finalize(hStmt);
+    if (rc != SQLITE_DONE)
+    {
+        return GDAL_DATA_COVERAGE_STATUS_UNIMPLEMENTED |
+               GDAL_DATA_COVERAGE_STATUS_DATA;
+    }
+    if (oSetTiles.empty())
+    {
+        if (pdfDataPct)
+            *pdfDataPct = 0.0;
+        return GDAL_DATA_COVERAGE_STATUS_EMPTY;
+    }
+
+    if (m_poTPD->m_nShiftXPixelsMod == 0 && m_poTPD->m_nShiftYPixelsMod == 0 &&
+        oSetTiles.size() == static_cast<size_t>(iRowMax - iRowMin + 1) *
+                                (iColMax - iColMin + 1))
+    {
+        if (pdfDataPct)
+            *pdfDataPct = 100.0;
+        return GDAL_DATA_COVERAGE_STATUS_DATA;
+    }
+
+    if (m_poTPD->m_nShiftXPixelsMod == 0 && m_poTPD->m_nShiftYPixelsMod == 0)
+    {
+        int nStatus = 0;
+        GIntBig nPixelsData = 0;
+        for (int iY = iRowMin; iY <= iRowMax; ++iY)
+        {
+            for (int iX = iColMin; iX <= iColMax; ++iX)
+            {
+                // coverity[swapped_arguments]
+                if (oSetTiles.find(std::pair(iY, iX)) == oSetTiles.end())
+                {
+                    nStatus |= GDAL_DATA_COVERAGE_STATUS_EMPTY;
+                }
+                else
+                {
+                    const int iXGDAL = iX - m_poTPD->m_nShiftXTiles;
+                    const int iYGDAL = iY - m_poTPD->m_nShiftYTiles;
+                    const int nXBlockRight =
+                        (iXGDAL * nBlockXSize > INT_MAX - nBlockXSize)
+                            ? INT_MAX
+                            : (iXGDAL + 1) * nBlockXSize;
+                    const int nYBlockBottom =
+                        (iYGDAL * nBlockYSize > INT_MAX - nBlockYSize)
+                            ? INT_MAX
+                            : (iYGDAL + 1) * nBlockYSize;
+
+                    nPixelsData += (static_cast<GIntBig>(std::min(
+                                        nXBlockRight, nXOff + nXSize)) -
+                                    std::max(iXGDAL * nBlockXSize, nXOff)) *
+                                   (std::min(nYBlockBottom, nYOff + nYSize) -
+                                    std::max(iYGDAL * nBlockYSize, nYOff));
+                    nStatus |= GDAL_DATA_COVERAGE_STATUS_DATA;
+                }
+                if (nMaskFlagStop != 0 && (nMaskFlagStop & nStatus) != 0)
+                {
+                    if (pdfDataPct)
+                        *pdfDataPct = -1.0;
+                    return nStatus;
+                }
+            }
+        }
+
+        if (pdfDataPct)
+        {
+            *pdfDataPct =
+                100.0 * nPixelsData / (static_cast<GIntBig>(nXSize) * nYSize);
+        }
+        return nStatus;
+    }
+
+    return GDAL_DATA_COVERAGE_STATUS_UNIMPLEMENTED |
+           GDAL_DATA_COVERAGE_STATUS_DATA;
+}
+
 /************************************************************************/
 /*                       WEBPSupports4Bands()                           */
 /************************************************************************/
@@ -1611,7 +1737,7 @@ CPLErr GDALGPKGMBTilesLikePseudoDataset::WriteTileInternal()
 
     int bHasNoData = FALSE;
     double dfNoDataValue = IGetRasterBand(1)->GetNoDataValue(&bHasNoData);
-    const bool bHasNanNoData = bHasNoData && CPLIsNan(dfNoDataValue);
+    const bool bHasNanNoData = bHasNoData && std::isnan(dfNoDataValue);
 
     bool bAllOpaque = true;
     // Detect fully transparent tiles, but only if all bands are dirty (that is
@@ -1643,6 +1769,29 @@ CPLErr GDALGPKGMBTilesLikePseudoDataset::WriteTileInternal()
         else
             bAllOpaque = false;
     }
+    else if (bAllDirty && m_eDT == GDT_Byte && m_poCT == nullptr &&
+             (!bHasNoData || dfNoDataValue == 0.0))
+    {
+        bool bAllEmpty = true;
+        const auto nPixels =
+            static_cast<GPtrDiff_t>(nBlockXSize) * nBlockYSize * nBands;
+        for (GPtrDiff_t i = 0; i < nPixels; i++)
+        {
+            if (m_pabyCachedTiles[i] != 0)
+            {
+                bAllEmpty = false;
+                break;
+            }
+        }
+        if (bAllEmpty)
+        {
+            // If tile is fully transparent, don't serialize it and remove it if
+            // it exists
+            DeleteTile(nRow, nCol);
+
+            return CE_None;
+        }
+    }
     else if (bAllDirty && m_eDT == GDT_Float32)
     {
         const float *pSrc = reinterpret_cast<float *>(m_pabyCachedTiles);
@@ -1654,7 +1803,7 @@ CPLErr GDALGPKGMBTilesLikePseudoDataset::WriteTileInternal()
             const float fVal = pSrc[i];
             if (bHasNanNoData)
             {
-                if (CPLIsNan(fVal))
+                if (std::isnan(fVal))
                     continue;
             }
             else if (fVal == fNoDataValueOrZero)
@@ -1682,8 +1831,8 @@ CPLErr GDALGPKGMBTilesLikePseudoDataset::WriteTileInternal()
                  nRow, nCol, m_nZoomLevel);
     }
 
-    CPLString osMemFileName;
-    osMemFileName.Printf("/vsimem/gpkg_write_tile_%p", this);
+    const CPLString osMemFileName(
+        VSIMemGenerateHiddenFilename("gpkg_write_tile"));
     const char *pszDriverName = "PNG";
     bool bTileDriverSupports1Band = false;
     bool bTileDriverSupports2Bands = false;
@@ -1862,7 +2011,7 @@ CPLErr GDALGPKGMBTilesLikePseudoDataset::WriteTileInternal()
                     const float fVal = pSrc[i];
                     if (bHasNanNoData)
                     {
-                        if (CPLIsNan(fVal))
+                        if (std::isnan(fVal))
                             continue;
                     }
                     else if (bHasNoData &&
@@ -1870,7 +2019,7 @@ CPLErr GDALGPKGMBTilesLikePseudoDataset::WriteTileInternal()
                     {
                         continue;
                     }
-                    if (CPLIsInf(fVal))
+                    if (std::isinf(fVal))
                         continue;
 
                     if (nValidPixels == 0)
@@ -1928,7 +2077,7 @@ CPLErr GDALGPKGMBTilesLikePseudoDataset::WriteTileInternal()
                     const float fVal = pSrc[i];
                     if (bHasNanNoData)
                     {
-                        if (CPLIsNan(fVal))
+                        if (std::isnan(fVal))
                         {
                             pTempTileBuffer[i] = m_usGPKGNull;
                             continue;
@@ -1943,7 +2092,7 @@ CPLErr GDALGPKGMBTilesLikePseudoDataset::WriteTileInternal()
                         }
                     }
                     double dfVal =
-                        CPLIsFinite(fVal)
+                        std::isfinite(fVal)
                             ? ((fVal - m_dfOffset) / m_dfScale - dfTileOffset) /
                                   dfTileScale
                         : (fVal > 0) ? 65535
@@ -1977,7 +2126,7 @@ CPLErr GDALGPKGMBTilesLikePseudoDataset::WriteTileInternal()
                 const float fVal = pSrc[i];
                 if (bHasNanNoData)
                 {
-                    if (CPLIsNan(fVal))
+                    if (std::isnan(fVal))
                         continue;
                 }
                 else if (bHasNoData &&
@@ -2307,7 +2456,7 @@ CPLErr GDALGPKGMBTilesLikePseudoDataset::WriteTileInternal()
                         "INSERT INTO gpkg_2d_gridded_tile_ancillary "
                         "(tpudt_name, tpudt_id, scale, offset, min, max, "
                         "mean, std_dev) VALUES "
-                        "('%q', ?, %.18g, %.18g, ?, ?, ?, ?)",
+                        "('%q', ?, %.17g, %.17g, ?, ?, ?, ?)",
                         m_osRasterTable.c_str(), dfTileScale, dfTileOffset);
 #ifdef DEBUG_VERBOSE
                     CPLDebug("GPKG", "%s", pszSQL);
@@ -2562,8 +2711,8 @@ GDALGPKGMBTilesLikePseudoDataset::FlushRemainingShiftedTiles(bool bPartialFlush)
                         GByte *pabyRawData =
                             const_cast<GByte *>(static_cast<const GByte *>(
                                 sqlite3_column_blob(hNewStmt, 0)));
-                        CPLString osMemFileName;
-                        osMemFileName.Printf("/vsimem/gpkg_read_tile_%p", this);
+                        const CPLString osMemFileName(
+                            VSIMemGenerateHiddenFilename("gpkg_read_tile"));
                         VSILFILE *fp = VSIFileFromMemBuffer(
                             osMemFileName.c_str(), pabyRawData, nBytes, FALSE);
                         VSIFCloseL(fp);
@@ -3549,7 +3698,7 @@ CPLErr GDALGeoPackageRasterBand::SetNoDataValue(double dfNoDataValue)
               static_cast<int>(dfNoDataValue) == dfNoDataValue))
         {
             CPLError(CE_Failure, CPLE_NotSupported,
-                     "Invalid nodata value for a Byte band: %.18g",
+                     "Invalid nodata value for a Byte band: %.17g",
                      dfNoDataValue);
             return CE_Failure;
         }
@@ -3576,7 +3725,7 @@ CPLErr GDALGeoPackageRasterBand::SetNoDataValue(double dfNoDataValue)
         return CE_None;
     }
 
-    if (CPLIsNan(dfNoDataValue))
+    if (std::isnan(dfNoDataValue))
     {
         CPLError(CE_Warning, CPLE_NotSupported,
                  "A NaN nodata value cannot be recorded in "
diff --git a/ogr/ogrsf_frmts/gpkg/gpkgmbtilescommon.h b/ogr/ogrsf_frmts/gpkg/gpkgmbtilescommon.h
index 841ec4977679..2420c38e168d 100644
--- a/ogr/ogrsf_frmts/gpkg/gpkgmbtilescommon.h
+++ b/ogr/ogrsf_frmts/gpkg/gpkgmbtilescommon.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2014-2016, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GPKGMBTILESCOMMON_H_INCLUDED
@@ -182,6 +166,9 @@ class GDALGPKGMBTilesLikeRasterBand : public GDALPamRasterBand
                                void *pData) override;
     virtual CPLErr FlushCache(bool bAtClosing) override;
 
+    int IGetDataCoverageStatus(int nXOff, int nYOff, int nXSize, int nYSize,
+                               int nMaskFlagStop, double *pdfDataPct) override;
+
     virtual GDALColorTable *GetColorTable() override;
     virtual CPLErr SetColorTable(GDALColorTable *poCT) override;
 
diff --git a/ogr/ogrsf_frmts/gpkg/ogr_geopackage.h b/ogr/ogrsf_frmts/gpkg/ogr_geopackage.h
index f2509a11a3f6..8628cb18dee6 100644
--- a/ogr/ogrsf_frmts/gpkg/ogr_geopackage.h
+++ b/ogr/ogrsf_frmts/gpkg/ogr_geopackage.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Paul Ramsey <pramsey@boundlessgeo.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_GEOPACKAGE_H_INCLUDED
@@ -37,6 +21,7 @@
 #include "cpl_threadsafe_queue.hpp"
 #include "ograrrowarrayhelper.h"
 #include "ogr_p.h"
+#include "ogr_wkb.h"
 
 #include <condition_variable>
 #include <limits>
@@ -185,6 +170,8 @@ class GDALGeoPackageDataset final : public OGRSQLiteBaseDataSource,
     int m_nLastCachedCTSrcSRId = -1;
     int m_nLastCachedCTDstSRId = -1;
     std::unique_ptr<OGRCoordinateTransformation> m_poLastCachedCT{};
+    OGRWKBTransformCache m_oWKBTransformCache{};
+    std::vector<GByte> m_abyWKBTransformCache{};
 
     int m_nOverviewCount = 0;
     GDALGeoPackageDataset **m_papoOverviewDS = nullptr;
@@ -275,6 +262,10 @@ class GDALGeoPackageDataset final : public OGRSQLiteBaseDataSource,
     OGRErr DeleteLayerCommon(const char *pszLayerName);
     OGRErr DeleteRasterLayer(const char *pszLayerName);
     bool DeleteVectorOrRasterLayer(const char *pszLayerName);
+    bool RenameVectorOrRasterLayer(const char *pszLayerName,
+                                   const char *pszNewName);
+    bool RenameRasterLayer(const char *pszLayerName,
+                           const char *pszNewLayerName);
 
     bool ConvertGpkgSpatialRefSysToExtensionWkt2(bool bForceEpoch);
     void DetectSpatialRefSysColumns();
@@ -477,6 +468,7 @@ class GDALGeoPackageDataset final : public OGRSQLiteBaseDataSource,
     bool OpenOrCreateDB(int flags);
     void InstallSQLFunctions();
     bool HasGDALAspatialExtension();
+    std::string CreateRasterTriggersSQL(const std::string &osTableName);
 };
 
 /************************************************************************/
diff --git a/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp b/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
index c677d10fdf7c..0b0e5b5532b0 100644
--- a/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
+++ b/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2013, Paul Ramsey <pramsey@boundlessgeo.com>
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_geopackage.h"
@@ -255,8 +239,7 @@ OGRSpatialReference *
 GDALGeoPackageDataset::GetSpatialRef(int iSrsId, bool bFallbackToEPSG,
                                      bool bEmitErrorIfNotFound)
 {
-    std::map<int, OGRSpatialReference *>::const_iterator oIter =
-        m_oMapSrsIdToSrs.find(iSrsId);
+    const auto oIter = m_oMapSrsIdToSrs.find(iSrsId);
     if (oIter != m_oMapSrsIdToSrs.end())
     {
         if (oIter->second == nullptr)
@@ -730,7 +713,7 @@ int GDALGeoPackageDataset::GetSrsId(const OGRSpatialReference *poSRSIn)
     if (poSRSIn->GetCoordinateEpoch() > 0 && m_bHasEpochColumn)
     {
         osEpochTest =
-            CPLSPrintf(" AND epoch = %.18g", poSRSIn->GetCoordinateEpoch());
+            CPLSPrintf(" AND epoch = %.17g", poSRSIn->GetCoordinateEpoch());
     }
 
     if (!(poSRS->IsGeographic() && poSRS->GetAxesCount() == 3))
@@ -928,7 +911,7 @@ int GDALGeoPackageDataset::GetSrsId(const OGRSpatialReference *poSRSIn)
     if (poSRSIn->GetCoordinateEpoch() > 0)
     {
         osEpochColumn = ", epoch";
-        osEpochVal = CPLSPrintf(", %.18g", poSRSIn->GetCoordinateEpoch());
+        osEpochVal = CPLSPrintf(", %.17g", poSRSIn->GetCoordinateEpoch());
     }
 
     // Add new SRS row to gpkg_spatial_ref_sys.
@@ -1807,8 +1790,7 @@ int GDALGeoPackageDataset::Open(GDALOpenInfo *poOpenInfo,
                     pszGeomColName ? std::string(pszTableName) + " (" +
                                          pszGeomColName + ')'
                                    : std::string(pszTableName);
-                if (oExistingLayers.find(osLayerNameWithGeomColName) !=
-                    oExistingLayers.end())
+                if (cpl::contains(oExistingLayers, osLayerNameWithGeomColName))
                     continue;
                 oExistingLayers.insert(osLayerNameWithGeomColName);
                 const std::string osLayerName = bTableHasSeveralGeomColumns
@@ -2989,16 +2971,16 @@ bool GDALGeoPackageDataset::OpenRaster(
         const int nTileWidth = atoi(oResult->GetValue(3, 0));
         const int nTileHeight = atoi(oResult->GetValue(4, 0));
         osContentsMinX =
-            CPLSPrintf("%.18g", dfMinX + dfPixelXSize * nTileWidth *
+            CPLSPrintf("%.17g", dfMinX + dfPixelXSize * nTileWidth *
                                              atoi(oResult2->GetValue(0, 0)));
         osContentsMaxY =
-            CPLSPrintf("%.18g", dfMaxY - dfPixelYSize * nTileHeight *
+            CPLSPrintf("%.17g", dfMaxY - dfPixelYSize * nTileHeight *
                                              atoi(oResult2->GetValue(1, 0)));
         osContentsMaxX = CPLSPrintf(
-            "%.18g", dfMinX + dfPixelXSize * nTileWidth *
+            "%.17g", dfMinX + dfPixelXSize * nTileWidth *
                                   (1 + atoi(oResult2->GetValue(2, 0))));
         osContentsMinY = CPLSPrintf(
-            "%.18g", dfMaxY - dfPixelYSize * nTileHeight *
+            "%.17g", dfMaxY - dfPixelYSize * nTileHeight *
                                   (1 + atoi(oResult2->GetValue(3, 0))));
         pszContentsMinX = osContentsMinX.c_str();
         pszContentsMinY = osContentsMinY.c_str();
@@ -3024,7 +3006,7 @@ bool GDALGeoPackageDataset::OpenRaster(
                 static_cast<int>(dfGPKGNoDataValue) != dfGPKGNoDataValue)
             {
                 CPLError(CE_Warning, CPLE_AppDefined,
-                         "data_null = %.18g is invalid for integer data_type",
+                         "data_null = %.17g is invalid for integer data_type",
                          dfGPKGNoDataValue);
             }
             else
@@ -3370,7 +3352,7 @@ CPLErr GDALGeoPackageDataset::FinalizeRasterRegistration()
         "INSERT INTO gpkg_contents "
         "(table_name,data_type,identifier,description,min_x,min_y,max_x,max_y,"
         "last_change,srs_id) VALUES "
-        "('%q','%q','%q','%q',%.18g,%.18g,%.18g,%.18g,");
+        "('%q','%q','%q','%q',%.17g,%.17g,%.17g,%.17g,");
     osInsertGpkgContentsFormatting += (pszCurrentDate) ? "'%q'" : "%s";
     osInsertGpkgContentsFormatting += ",%d)";
     char *pszSQL = sqlite3_mprintf(
@@ -3398,7 +3380,7 @@ CPLErr GDALGeoPackageDataset::FinalizeRasterRegistration()
     pszSQL =
         sqlite3_mprintf("INSERT INTO gpkg_tile_matrix_set "
                         "(table_name,srs_id,min_x,min_y,max_x,max_y) VALUES "
-                        "('%q',%d,%.18g,%.18g,%.18g,%.18g)",
+                        "('%q',%d,%.17g,%.17g,%.17g,%.17g)",
                         m_osRasterTable.c_str(), m_nSRID, m_dfTMSMinX,
                         dfTMSMinY, dfTMSMaxX, m_dfTMSMaxY);
     eErr = SQLCommand(hDB, pszSQL);
@@ -3437,7 +3419,7 @@ CPLErr GDALGeoPackageDataset::FinalizeRasterRegistration()
             "INSERT INTO gpkg_tile_matrix "
             "(table_name,zoom_level,matrix_width,matrix_height,tile_width,tile_"
             "height,pixel_x_size,pixel_y_size) VALUES "
-            "('%q',%d,%d,%d,%d,%d,%.18g,%.18g)",
+            "('%q',%d,%d,%d,%d,%d,%.17g,%.17g)",
             m_osRasterTable.c_str(), i, nTileMatrixWidth, nTileMatrixHeight,
             nTileWidth, nTileHeight, dfPixelXSizeZoomLevel,
             dfPixelYSizeZoomLevel);
@@ -3830,7 +3812,7 @@ CPLErr GDALGeoPackageDataset::IBuildOverviews(
                     "INSERT INTO gpkg_tile_matrix "
                     "(table_name,zoom_level,matrix_width,matrix_height,tile_"
                     "width,tile_height,pixel_x_size,pixel_y_size) VALUES "
-                    "('%q',%d,%d,%d,%d,%d,%.18g,%.18g)",
+                    "('%q',%d,%d,%d,%d,%d,%.17g,%.17g)",
                     m_osRasterTable.c_str(), nNewZoomLevel, nTileMatrixWidth,
                     nTileMatrixHeight, nTileWidth, nTileHeight,
                     dfPixelXSizeZoomLevel, dfPixelYSizeZoomLevel);
@@ -4919,7 +4901,7 @@ void GDALGeoPackageDataset::FlushMetadata()
             if (bHasNoData)
             {
                 oLocalMDMD.SetMetadataItem("NODATA_VALUE",
-                                           CPLSPrintf("%.18g", dfNoDataValue),
+                                           CPLSPrintf("%.17g", dfNoDataValue),
                                            "IMAGE_STRUCTURE");
             }
         }
@@ -5613,97 +5595,8 @@ int GDALGeoPackageDataset::Create(const char *pszFilename, int nXSize,
 
         if (bCreateTriggers)
         {
-            /* From D.5. sample_tile_pyramid Table 43. tiles table Trigger
-             * Definition SQL  */
-            pszSQL = sqlite3_mprintf(
-                "CREATE TRIGGER \"%w_zoom_insert\" "
-                "BEFORE INSERT ON \"%w\" "
-                "FOR EACH ROW BEGIN "
-                "SELECT RAISE(ABORT, 'insert on table ''%q'' violates "
-                "constraint: zoom_level not specified for table in "
-                "gpkg_tile_matrix') "
-                "WHERE NOT (NEW.zoom_level IN (SELECT zoom_level FROM "
-                "gpkg_tile_matrix WHERE lower(table_name) = lower('%q'))) ; "
-                "END; "
-                "CREATE TRIGGER \"%w_zoom_update\" "
-                "BEFORE UPDATE OF zoom_level ON \"%w\" "
-                "FOR EACH ROW BEGIN "
-                "SELECT RAISE(ABORT, 'update on table ''%q'' violates "
-                "constraint: zoom_level not specified for table in "
-                "gpkg_tile_matrix') "
-                "WHERE NOT (NEW.zoom_level IN (SELECT zoom_level FROM "
-                "gpkg_tile_matrix WHERE lower(table_name) = lower('%q'))) ; "
-                "END; "
-                "CREATE TRIGGER \"%w_tile_column_insert\" "
-                "BEFORE INSERT ON \"%w\" "
-                "FOR EACH ROW BEGIN "
-                "SELECT RAISE(ABORT, 'insert on table ''%q'' violates "
-                "constraint: tile_column cannot be < 0') "
-                "WHERE (NEW.tile_column < 0) ; "
-                "SELECT RAISE(ABORT, 'insert on table ''%q'' violates "
-                "constraint: tile_column must by < matrix_width specified for "
-                "table and zoom level in gpkg_tile_matrix') "
-                "WHERE NOT (NEW.tile_column < (SELECT matrix_width FROM "
-                "gpkg_tile_matrix WHERE lower(table_name) = lower('%q') AND "
-                "zoom_level = NEW.zoom_level)); "
-                "END; "
-                "CREATE TRIGGER \"%w_tile_column_update\" "
-                "BEFORE UPDATE OF tile_column ON \"%w\" "
-                "FOR EACH ROW BEGIN "
-                "SELECT RAISE(ABORT, 'update on table ''%q'' violates "
-                "constraint: tile_column cannot be < 0') "
-                "WHERE (NEW.tile_column < 0) ; "
-                "SELECT RAISE(ABORT, 'update on table ''%q'' violates "
-                "constraint: tile_column must by < matrix_width specified for "
-                "table and zoom level in gpkg_tile_matrix') "
-                "WHERE NOT (NEW.tile_column < (SELECT matrix_width FROM "
-                "gpkg_tile_matrix WHERE lower(table_name) = lower('%q') AND "
-                "zoom_level = NEW.zoom_level)); "
-                "END; "
-                "CREATE TRIGGER \"%w_tile_row_insert\" "
-                "BEFORE INSERT ON \"%w\" "
-                "FOR EACH ROW BEGIN "
-                "SELECT RAISE(ABORT, 'insert on table ''%q'' violates "
-                "constraint: tile_row cannot be < 0') "
-                "WHERE (NEW.tile_row < 0) ; "
-                "SELECT RAISE(ABORT, 'insert on table ''%q'' violates "
-                "constraint: tile_row must by < matrix_height specified for "
-                "table and zoom level in gpkg_tile_matrix') "
-                "WHERE NOT (NEW.tile_row < (SELECT matrix_height FROM "
-                "gpkg_tile_matrix WHERE lower(table_name) = lower('%q') AND "
-                "zoom_level = NEW.zoom_level)); "
-                "END; "
-                "CREATE TRIGGER \"%w_tile_row_update\" "
-                "BEFORE UPDATE OF tile_row ON \"%w\" "
-                "FOR EACH ROW BEGIN "
-                "SELECT RAISE(ABORT, 'update on table ''%q'' violates "
-                "constraint: tile_row cannot be < 0') "
-                "WHERE (NEW.tile_row < 0) ; "
-                "SELECT RAISE(ABORT, 'update on table ''%q'' violates "
-                "constraint: tile_row must by < matrix_height specified for "
-                "table and zoom level in gpkg_tile_matrix') "
-                "WHERE NOT (NEW.tile_row < (SELECT matrix_height FROM "
-                "gpkg_tile_matrix WHERE lower(table_name) = lower('%q') AND "
-                "zoom_level = NEW.zoom_level)); "
-                "END; ",
-                m_osRasterTable.c_str(), m_osRasterTable.c_str(),
-                m_osRasterTable.c_str(), m_osRasterTable.c_str(),
-                m_osRasterTable.c_str(), m_osRasterTable.c_str(),
-                m_osRasterTable.c_str(), m_osRasterTable.c_str(),
-                m_osRasterTable.c_str(), m_osRasterTable.c_str(),
-                m_osRasterTable.c_str(), m_osRasterTable.c_str(),
-                m_osRasterTable.c_str(), m_osRasterTable.c_str(),
-                m_osRasterTable.c_str(), m_osRasterTable.c_str(),
-                m_osRasterTable.c_str(), m_osRasterTable.c_str(),
-                m_osRasterTable.c_str(), m_osRasterTable.c_str(),
-                m_osRasterTable.c_str(), m_osRasterTable.c_str(),
-                m_osRasterTable.c_str(), m_osRasterTable.c_str(),
-                m_osRasterTable.c_str(), m_osRasterTable.c_str(),
-                m_osRasterTable.c_str(), m_osRasterTable.c_str());
-
             osSQL += ";";
-            osSQL += pszSQL;
-            sqlite3_free(pszSQL);
+            osSQL += CreateRasterTriggersSQL(m_osRasterTable);
         }
 
         OGRErr eErr = SQLCommand(hDB, osSQL);
@@ -6006,7 +5899,7 @@ bool GDALGeoPackageDataset::CreateTileGriddedTable(char **papszOptions)
         "INSERT INTO gpkg_2d_gridded_coverage_ancillary "
         "(tile_matrix_set_name, datatype, scale, offset, precision, "
         "grid_cell_encoding, uom, field_name, quantity_definition) "
-        "VALUES (%Q, '%s', %.18g, %.18g, %.18g, %Q, %Q, %Q, %Q)",
+        "VALUES (%Q, '%s', %.17g, %.17g, %.17g, %Q, %Q, %Q, %Q)",
         m_osRasterTable.c_str(),
         (m_eTF == GPKG_TF_PNG_16BIT) ? "integer" : "float", m_dfScale,
         m_dfOffset, m_dfPrecision, osGridCellEncoding.c_str(),
@@ -6155,6 +6048,7 @@ GDALDataset *GDALGeoPackageDataset::CreateCopy(const char *pszFilename,
             reinterpret_cast<GDALDriver *>(GDALGetDriverByName("GPKG"));
         if (poThisDriver != nullptr)
         {
+            apszUpdatedOptions.SetNameValue("SKIP_HOLES", "YES");
             poDS = cpl::down_cast<GDALGeoPackageDataset *>(
                 poThisDriver->DefaultCreateCopy(pszFilename, poSrcDS, bStrict,
                                                 apszUpdatedOptions, pfnProgress,
@@ -6228,13 +6122,13 @@ GDALDataset *GDALGeoPackageDataset::CreateCopy(const char *pszFilename,
                 aosOptions.AddString("VRT");
                 aosOptions.AddString("-projwin");
                 aosOptions.AddString(
-                    CPLSPrintf("%.18g", adfSrcGeoTransform[0]));
-                aosOptions.AddString(CPLSPrintf("%.18g", maxLat));
+                    CPLSPrintf("%.17g", adfSrcGeoTransform[0]));
+                aosOptions.AddString(CPLSPrintf("%.17g", maxLat));
                 aosOptions.AddString(
-                    CPLSPrintf("%.18g", adfSrcGeoTransform[0] +
+                    CPLSPrintf("%.17g", adfSrcGeoTransform[0] +
                                             poSrcDS->GetRasterXSize() *
                                                 adfSrcGeoTransform[1]));
-                aosOptions.AddString(CPLSPrintf("%.18g", minLat));
+                aosOptions.AddString(CPLSPrintf("%.17g", minLat));
                 auto psOptions =
                     GDALTranslateOptionsNew(aosOptions.List(), nullptr);
                 poTmpDS.reset(GDALDataset::FromHandle(GDALTranslate(
@@ -7324,6 +7218,228 @@ bool GDALGeoPackageDataset::DeleteVectorOrRasterLayer(const char *pszLayerName)
     return false;
 }
 
+bool GDALGeoPackageDataset::RenameVectorOrRasterLayer(
+    const char *pszLayerName, const char *pszNewLayerName)
+{
+    int idx = FindLayerIndex(pszLayerName);
+    if (idx >= 0)
+    {
+        m_papoLayers[idx]->Rename(pszNewLayerName);
+        return true;
+    }
+
+    char *pszSQL =
+        sqlite3_mprintf("SELECT 1 FROM gpkg_contents WHERE "
+                        "lower(table_name) = lower('%q') "
+                        "AND data_type IN ('tiles', '2d-gridded-coverage')",
+                        pszLayerName);
+    const bool bIsRasterTable = SQLGetInteger(hDB, pszSQL, nullptr) == 1;
+    sqlite3_free(pszSQL);
+
+    if (bIsRasterTable)
+    {
+        return RenameRasterLayer(pszLayerName, pszNewLayerName);
+    }
+
+    return false;
+}
+
+bool GDALGeoPackageDataset::RenameRasterLayer(const char *pszLayerName,
+                                              const char *pszNewLayerName)
+{
+    std::string osSQL;
+
+    char *pszSQL = sqlite3_mprintf(
+        "SELECT 1 FROM sqlite_master WHERE lower(name) = lower('%q') "
+        "AND type IN ('table', 'view')",
+        pszNewLayerName);
+    const bool bAlreadyExists = SQLGetInteger(GetDB(), pszSQL, nullptr) == 1;
+    sqlite3_free(pszSQL);
+    if (bAlreadyExists)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Table %s already exists",
+                 pszNewLayerName);
+        return false;
+    }
+
+    // Temporary remove foreign key checks
+    const GPKGTemporaryForeignKeyCheckDisabler
+        oGPKGTemporaryForeignKeyCheckDisabler(this);
+
+    if (SoftStartTransaction() != OGRERR_NONE)
+    {
+        return false;
+    }
+
+    pszSQL = sqlite3_mprintf("UPDATE gpkg_contents SET table_name = '%q' WHERE "
+                             "lower(table_name) = lower('%q');",
+                             pszNewLayerName, pszLayerName);
+    osSQL = pszSQL;
+    sqlite3_free(pszSQL);
+
+    pszSQL = sqlite3_mprintf("UPDATE gpkg_contents SET identifier = '%q' WHERE "
+                             "lower(identifier) = lower('%q');",
+                             pszNewLayerName, pszLayerName);
+    osSQL += pszSQL;
+    sqlite3_free(pszSQL);
+
+    pszSQL =
+        sqlite3_mprintf("UPDATE gpkg_tile_matrix SET table_name = '%q' WHERE "
+                        "lower(table_name) = lower('%q');",
+                        pszNewLayerName, pszLayerName);
+    osSQL += pszSQL;
+    sqlite3_free(pszSQL);
+
+    pszSQL = sqlite3_mprintf(
+        "UPDATE gpkg_tile_matrix_set SET table_name = '%q' WHERE "
+        "lower(table_name) = lower('%q');",
+        pszNewLayerName, pszLayerName);
+    osSQL += pszSQL;
+    sqlite3_free(pszSQL);
+
+    if (HasGriddedCoverageAncillaryTable())
+    {
+        pszSQL = sqlite3_mprintf("UPDATE gpkg_2d_gridded_coverage_ancillary "
+                                 "SET tile_matrix_set_name = '%q' WHERE "
+                                 "lower(tile_matrix_set_name) = lower('%q');",
+                                 pszNewLayerName, pszLayerName);
+        osSQL += pszSQL;
+        sqlite3_free(pszSQL);
+
+        pszSQL = sqlite3_mprintf(
+            "UPDATE gpkg_2d_gridded_tile_ancillary SET tpudt_name = '%q' WHERE "
+            "lower(tpudt_name) = lower('%q');",
+            pszNewLayerName, pszLayerName);
+        osSQL += pszSQL;
+        sqlite3_free(pszSQL);
+    }
+
+    if (HasExtensionsTable())
+    {
+        pszSQL = sqlite3_mprintf(
+            "UPDATE gpkg_extensions SET table_name = '%q' WHERE "
+            "lower(table_name) = lower('%q');",
+            pszNewLayerName, pszLayerName);
+        osSQL += pszSQL;
+        sqlite3_free(pszSQL);
+    }
+
+    if (HasMetadataTables())
+    {
+        pszSQL = sqlite3_mprintf(
+            "UPDATE gpkg_metadata_reference SET table_name = '%q' WHERE "
+            "lower(table_name) = lower('%q');",
+            pszNewLayerName, pszLayerName);
+        osSQL += pszSQL;
+        sqlite3_free(pszSQL);
+    }
+
+    if (HasDataColumnsTable())
+    {
+        pszSQL = sqlite3_mprintf(
+            "UPDATE gpkg_data_columns SET table_name = '%q' WHERE "
+            "lower(table_name) = lower('%q');",
+            pszNewLayerName, pszLayerName);
+        osSQL += pszSQL;
+        sqlite3_free(pszSQL);
+    }
+
+    if (HasQGISLayerStyles())
+    {
+        // Update QGIS styles
+        pszSQL =
+            sqlite3_mprintf("UPDATE layer_styles SET f_table_name = '%q' WHERE "
+                            "lower(f_table_name) = lower('%q');",
+                            pszNewLayerName, pszLayerName);
+        osSQL += pszSQL;
+        sqlite3_free(pszSQL);
+    }
+
+#ifdef ENABLE_GPKG_OGR_CONTENTS
+    if (m_bHasGPKGOGRContents)
+    {
+        pszSQL = sqlite3_mprintf(
+            "UPDATE gpkg_ogr_contents SET table_name = '%q' WHERE "
+            "lower(table_name) = lower('%q');",
+            pszNewLayerName, pszLayerName);
+        osSQL += pszSQL;
+        sqlite3_free(pszSQL);
+    }
+#endif
+
+    if (HasGpkgextRelationsTable())
+    {
+        pszSQL = sqlite3_mprintf(
+            "UPDATE gpkgext_relations SET base_table_name = '%q' WHERE "
+            "lower(base_table_name) = lower('%q');",
+            pszNewLayerName, pszLayerName);
+        osSQL += pszSQL;
+        sqlite3_free(pszSQL);
+
+        pszSQL = sqlite3_mprintf(
+            "UPDATE gpkgext_relations SET related_table_name = '%q' WHERE "
+            "lower(related_table_name) = lower('%q');",
+            pszNewLayerName, pszLayerName);
+        osSQL += pszSQL;
+        sqlite3_free(pszSQL);
+
+        pszSQL = sqlite3_mprintf(
+            "UPDATE gpkgext_relations SET mapping_table_name = '%q' WHERE "
+            "lower(mapping_table_name) = lower('%q');",
+            pszNewLayerName, pszLayerName);
+        osSQL += pszSQL;
+        sqlite3_free(pszSQL);
+    }
+
+    // Drop all triggers for the layer
+    pszSQL = sqlite3_mprintf("SELECT name FROM sqlite_master WHERE type = "
+                             "'trigger' AND tbl_name = '%q'",
+                             pszLayerName);
+    auto oTriggerResult = SQLQuery(GetDB(), pszSQL);
+    sqlite3_free(pszSQL);
+    if (oTriggerResult)
+    {
+        for (int i = 0; i < oTriggerResult->RowCount(); i++)
+        {
+            const char *pszTriggerName = oTriggerResult->GetValue(0, i);
+            pszSQL = sqlite3_mprintf("DROP TRIGGER IF EXISTS \"%w\";",
+                                     pszTriggerName);
+            osSQL += pszSQL;
+            sqlite3_free(pszSQL);
+        }
+    }
+
+    pszSQL = sqlite3_mprintf("ALTER TABLE \"%w\" RENAME TO \"%w\";",
+                             pszLayerName, pszNewLayerName);
+    osSQL += pszSQL;
+    sqlite3_free(pszSQL);
+
+    // Recreate all zoom/tile triggers
+    if (oTriggerResult)
+    {
+        osSQL += CreateRasterTriggersSQL(pszNewLayerName);
+    }
+
+    OGRErr eErr = SQLCommand(GetDB(), osSQL.c_str());
+
+    // Check foreign key integrity
+    if (eErr == OGRERR_NONE)
+    {
+        eErr = PragmaCheck("foreign_key_check", "", 0);
+    }
+
+    if (eErr == OGRERR_NONE)
+    {
+        eErr = SoftCommitTransaction();
+    }
+    else
+    {
+        SoftRollbackTransaction();
+    }
+
+    return eErr == OGRERR_NONE;
+}
+
 /************************************************************************/
 /*                       TestCapability()                               */
 /************************************************************************/
@@ -7389,7 +7505,7 @@ OGRLayer *GDALGeoPackageDataset::ExecuteSQL(const char *pszSQLCommand,
 
     CPLString osSQLCommand(pszSQLCommand);
     if (!osSQLCommand.empty() && osSQLCommand.back() == ';')
-        osSQLCommand.resize(osSQLCommand.size() - 1);
+        osSQLCommand.pop_back();
 
     if (pszDialect == nullptr || !EQUAL(pszDialect, "DEBUG"))
     {
@@ -7516,12 +7632,9 @@ OGRLayer *GDALGeoPackageDataset::ExecuteSQL(const char *pszSQLCommand,
         {
             const char *pszSrcTableName = papszTokens[2];
             const char *pszDstTableName = papszTokens[5];
-            OGRGeoPackageTableLayer *poSrcLayer =
-                dynamic_cast<OGRGeoPackageTableLayer *>(
-                    GetLayerByName(SQLUnescape(pszSrcTableName)));
-            if (poSrcLayer)
+            if (RenameVectorOrRasterLayer(SQLUnescape(pszSrcTableName),
+                                          SQLUnescape(pszDstTableName)))
             {
-                poSrcLayer->Rename(SQLUnescape(pszDstTableName));
                 CSLDestroy(papszTokens);
                 return nullptr;
             }
@@ -7933,6 +8046,99 @@ bool GDALGeoPackageDataset::HasGDALAspatialExtension()
     return bHasExtension;
 }
 
+std::string
+GDALGeoPackageDataset::CreateRasterTriggersSQL(const std::string &osTableName)
+{
+    char *pszSQL;
+    std::string osSQL;
+    /* From D.5. sample_tile_pyramid Table 43. tiles table Trigger
+     * Definition SQL  */
+    pszSQL = sqlite3_mprintf(
+        "CREATE TRIGGER \"%w_zoom_insert\" "
+        "BEFORE INSERT ON \"%w\" "
+        "FOR EACH ROW BEGIN "
+        "SELECT RAISE(ABORT, 'insert on table ''%q'' violates "
+        "constraint: zoom_level not specified for table in "
+        "gpkg_tile_matrix') "
+        "WHERE NOT (NEW.zoom_level IN (SELECT zoom_level FROM "
+        "gpkg_tile_matrix WHERE lower(table_name) = lower('%q'))) ; "
+        "END; "
+        "CREATE TRIGGER \"%w_zoom_update\" "
+        "BEFORE UPDATE OF zoom_level ON \"%w\" "
+        "FOR EACH ROW BEGIN "
+        "SELECT RAISE(ABORT, 'update on table ''%q'' violates "
+        "constraint: zoom_level not specified for table in "
+        "gpkg_tile_matrix') "
+        "WHERE NOT (NEW.zoom_level IN (SELECT zoom_level FROM "
+        "gpkg_tile_matrix WHERE lower(table_name) = lower('%q'))) ; "
+        "END; "
+        "CREATE TRIGGER \"%w_tile_column_insert\" "
+        "BEFORE INSERT ON \"%w\" "
+        "FOR EACH ROW BEGIN "
+        "SELECT RAISE(ABORT, 'insert on table ''%q'' violates "
+        "constraint: tile_column cannot be < 0') "
+        "WHERE (NEW.tile_column < 0) ; "
+        "SELECT RAISE(ABORT, 'insert on table ''%q'' violates "
+        "constraint: tile_column must by < matrix_width specified for "
+        "table and zoom level in gpkg_tile_matrix') "
+        "WHERE NOT (NEW.tile_column < (SELECT matrix_width FROM "
+        "gpkg_tile_matrix WHERE lower(table_name) = lower('%q') AND "
+        "zoom_level = NEW.zoom_level)); "
+        "END; "
+        "CREATE TRIGGER \"%w_tile_column_update\" "
+        "BEFORE UPDATE OF tile_column ON \"%w\" "
+        "FOR EACH ROW BEGIN "
+        "SELECT RAISE(ABORT, 'update on table ''%q'' violates "
+        "constraint: tile_column cannot be < 0') "
+        "WHERE (NEW.tile_column < 0) ; "
+        "SELECT RAISE(ABORT, 'update on table ''%q'' violates "
+        "constraint: tile_column must by < matrix_width specified for "
+        "table and zoom level in gpkg_tile_matrix') "
+        "WHERE NOT (NEW.tile_column < (SELECT matrix_width FROM "
+        "gpkg_tile_matrix WHERE lower(table_name) = lower('%q') AND "
+        "zoom_level = NEW.zoom_level)); "
+        "END; "
+        "CREATE TRIGGER \"%w_tile_row_insert\" "
+        "BEFORE INSERT ON \"%w\" "
+        "FOR EACH ROW BEGIN "
+        "SELECT RAISE(ABORT, 'insert on table ''%q'' violates "
+        "constraint: tile_row cannot be < 0') "
+        "WHERE (NEW.tile_row < 0) ; "
+        "SELECT RAISE(ABORT, 'insert on table ''%q'' violates "
+        "constraint: tile_row must by < matrix_height specified for "
+        "table and zoom level in gpkg_tile_matrix') "
+        "WHERE NOT (NEW.tile_row < (SELECT matrix_height FROM "
+        "gpkg_tile_matrix WHERE lower(table_name) = lower('%q') AND "
+        "zoom_level = NEW.zoom_level)); "
+        "END; "
+        "CREATE TRIGGER \"%w_tile_row_update\" "
+        "BEFORE UPDATE OF tile_row ON \"%w\" "
+        "FOR EACH ROW BEGIN "
+        "SELECT RAISE(ABORT, 'update on table ''%q'' violates "
+        "constraint: tile_row cannot be < 0') "
+        "WHERE (NEW.tile_row < 0) ; "
+        "SELECT RAISE(ABORT, 'update on table ''%q'' violates "
+        "constraint: tile_row must by < matrix_height specified for "
+        "table and zoom level in gpkg_tile_matrix') "
+        "WHERE NOT (NEW.tile_row < (SELECT matrix_height FROM "
+        "gpkg_tile_matrix WHERE lower(table_name) = lower('%q') AND "
+        "zoom_level = NEW.zoom_level)); "
+        "END; ",
+        osTableName.c_str(), osTableName.c_str(), osTableName.c_str(),
+        osTableName.c_str(), osTableName.c_str(), osTableName.c_str(),
+        osTableName.c_str(), osTableName.c_str(), osTableName.c_str(),
+        osTableName.c_str(), osTableName.c_str(), osTableName.c_str(),
+        osTableName.c_str(), osTableName.c_str(), osTableName.c_str(),
+        osTableName.c_str(), osTableName.c_str(), osTableName.c_str(),
+        osTableName.c_str(), osTableName.c_str(), osTableName.c_str(),
+        osTableName.c_str(), osTableName.c_str(), osTableName.c_str(),
+        osTableName.c_str(), osTableName.c_str(), osTableName.c_str(),
+        osTableName.c_str());
+    osSQL = pszSQL;
+    sqlite3_free(pszSQL);
+    return osSQL;
+}
+
 /************************************************************************/
 /*                  CreateExtensionsTableIfNecessary()                  */
 /************************************************************************/
@@ -8528,6 +8734,77 @@ static void OGRGeoPackageGeodesicArea(sqlite3_context *pContext, int argc,
         pContext, OGR_G_GeodesicArea(OGRGeometry::ToHandle(poGeom.get())));
 }
 
+/************************************************************************/
+/*                   OGRGeoPackageLengthOrGeodesicLength()              */
+/************************************************************************/
+
+static void OGRGeoPackageLengthOrGeodesicLength(sqlite3_context *pContext,
+                                                int argc, sqlite3_value **argv)
+{
+    if (sqlite3_value_type(argv[0]) != SQLITE_BLOB)
+    {
+        sqlite3_result_null(pContext);
+        return;
+    }
+    if (argc == 2 && sqlite3_value_int(argv[1]) != 1)
+    {
+        CPLError(CE_Warning, CPLE_NotSupported,
+                 "ST_Length(geom, use_ellipsoid) is only supported for "
+                 "use_ellipsoid = 1");
+    }
+
+    const int nBLOBLen = sqlite3_value_bytes(argv[0]);
+    const GByte *pabyBLOB =
+        reinterpret_cast<const GByte *>(sqlite3_value_blob(argv[0]));
+    GPkgHeader sHeader;
+    if (!OGRGeoPackageGetHeader(pContext, argc, argv, &sHeader, false, false))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Invalid geometry");
+        sqlite3_result_blob(pContext, nullptr, 0, nullptr);
+        return;
+    }
+
+    GDALGeoPackageDataset *poDS =
+        static_cast<GDALGeoPackageDataset *>(sqlite3_user_data(pContext));
+
+    OGRSpatialReference *poSrcSRS = nullptr;
+    if (argc == 2)
+    {
+        poSrcSRS = poDS->GetSpatialRef(sHeader.iSrsId, true);
+        if (!poSrcSRS)
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                     "SRID set on geometry (%d) is invalid", sHeader.iSrsId);
+            sqlite3_result_blob(pContext, nullptr, 0, nullptr);
+            return;
+        }
+    }
+
+    auto poGeom = std::unique_ptr<OGRGeometry>(
+        GPkgGeometryToOGR(pabyBLOB, nBLOBLen, nullptr));
+    if (poGeom == nullptr)
+    {
+        // Try also spatialite geometry blobs
+        OGRGeometry *poGeomSpatialite = nullptr;
+        if (OGRSQLiteImportSpatiaLiteGeometry(pabyBLOB, nBLOBLen,
+                                              &poGeomSpatialite) != OGRERR_NONE)
+        {
+            CPLError(CE_Failure, CPLE_AppDefined, "Invalid geometry");
+            sqlite3_result_blob(pContext, nullptr, 0, nullptr);
+            return;
+        }
+        poGeom.reset(poGeomSpatialite);
+    }
+
+    if (argc == 2)
+        poGeom->assignSpatialReference(poSrcSRS);
+
+    sqlite3_result_double(
+        pContext,
+        argc == 1 ? OGR_G_Length(OGRGeometry::ToHandle(poGeom.get()))
+                  : OGR_G_GeodesicLength(OGRGeometry::ToHandle(poGeom.get())));
+}
+
 /************************************************************************/
 /*                      OGRGeoPackageTransform()                        */
 /************************************************************************/
@@ -8612,21 +8889,40 @@ void OGRGeoPackageTransform(sqlite3_context *pContext, int argc,
         poCT = poDS->m_poLastCachedCT.get();
     }
 
-    auto poGeom = std::unique_ptr<OGRGeometry>(
-        GPkgGeometryToOGR(pabyBLOB, nBLOBLen, nullptr));
-    if (poGeom == nullptr)
+    if (sHeader.nHeaderLen >= 8)
     {
-        // Try also spatialite geometry blobs
-        OGRGeometry *poGeomSpatialite = nullptr;
-        if (OGRSQLiteImportSpatiaLiteGeometry(pabyBLOB, nBLOBLen,
-                                              &poGeomSpatialite) != OGRERR_NONE)
+        std::vector<GByte> &abyNewBLOB = poDS->m_abyWKBTransformCache;
+        abyNewBLOB.resize(nBLOBLen);
+        memcpy(abyNewBLOB.data(), pabyBLOB, nBLOBLen);
+
+        OGREnvelope3D oEnv3d;
+        if (!OGRWKBTransform(abyNewBLOB.data() + sHeader.nHeaderLen,
+                             nBLOBLen - sHeader.nHeaderLen, poCT,
+                             poDS->m_oWKBTransformCache, oEnv3d) ||
+            !GPkgUpdateHeader(abyNewBLOB.data(), nBLOBLen, nDestSRID,
+                              oEnv3d.MinX, oEnv3d.MaxX, oEnv3d.MinY,
+                              oEnv3d.MaxY, oEnv3d.MinZ, oEnv3d.MaxZ))
         {
             CPLError(CE_Failure, CPLE_AppDefined, "Invalid geometry");
             sqlite3_result_blob(pContext, nullptr, 0, nullptr);
             return;
         }
-        poGeom.reset(poGeomSpatialite);
+
+        sqlite3_result_blob(pContext, abyNewBLOB.data(), nBLOBLen,
+                            SQLITE_TRANSIENT);
+        return;
+    }
+
+    // Try also spatialite geometry blobs
+    OGRGeometry *poGeomSpatialite = nullptr;
+    if (OGRSQLiteImportSpatiaLiteGeometry(pabyBLOB, nBLOBLen,
+                                          &poGeomSpatialite) != OGRERR_NONE)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Invalid geometry");
+        sqlite3_result_blob(pContext, nullptr, 0, nullptr);
+        return;
     }
+    auto poGeom = std::unique_ptr<OGRGeometry>(poGeomSpatialite);
 
     if (poGeom->transform(poCT) != OGRERR_NONE)
     {
@@ -8907,8 +9203,8 @@ static CPLString GPKG_GDAL_GetMemFileFromBlob(sqlite3_value **argv)
     int nBytes = sqlite3_value_bytes(argv[0]);
     const GByte *pabyBLOB =
         reinterpret_cast<const GByte *>(sqlite3_value_blob(argv[0]));
-    CPLString osMemFileName;
-    osMemFileName.Printf("/vsimem/GPKG_GDAL_GetMemFileFromBlob_%p", argv);
+    const CPLString osMemFileName(
+        VSIMemGenerateHiddenFilename("GPKG_GDAL_GetMemFileFromBlob"));
     VSILFILE *fp = VSIFileFromMemBuffer(
         osMemFileName.c_str(), const_cast<GByte *>(pabyBLOB), nBytes, FALSE);
     VSIFCloseL(fp);
@@ -9012,7 +9308,7 @@ static void GPKG_GDAL_HasColorTable(sqlite3_context *pContext, int /*argc*/,
 GDALDataset *
 GDALGeoPackageDataset::GetRasterLayerDataset(const char *pszLayerName)
 {
-    auto oIter = m_oCachedRasterDS.find(pszLayerName);
+    const auto oIter = m_oCachedRasterDS.find(pszLayerName);
     if (oIter != m_oCachedRasterDS.end())
         return oIter->second.get();
 
@@ -9031,17 +9327,12 @@ GDALGeoPackageDataset::GetRasterLayerDataset(const char *pszLayerName)
 /*                   GPKG_gdal_get_layer_pixel_value()                  */
 /************************************************************************/
 
-static void GPKG_gdal_get_layer_pixel_value(sqlite3_context *pContext,
-                                            CPL_UNUSED int argc,
+// NOTE: keep in sync implementations in ogrsqlitesqlfunctionscommon.cpp
+// and ogrgeopackagedatasource.cpp
+static void GPKG_gdal_get_layer_pixel_value(sqlite3_context *pContext, int argc,
                                             sqlite3_value **argv)
 {
-    if (sqlite3_value_type(argv[0]) != SQLITE_TEXT ||
-        sqlite3_value_type(argv[1]) != SQLITE_INTEGER ||
-        sqlite3_value_type(argv[2]) != SQLITE_TEXT ||
-        (sqlite3_value_type(argv[3]) != SQLITE_INTEGER &&
-         sqlite3_value_type(argv[3]) != SQLITE_FLOAT) ||
-        (sqlite3_value_type(argv[4]) != SQLITE_INTEGER &&
-         sqlite3_value_type(argv[4]) != SQLITE_FLOAT))
+    if (sqlite3_value_type(argv[0]) != SQLITE_TEXT)
     {
         CPLError(CE_Failure, CPLE_AppDefined,
                  "Invalid arguments to gdal_get_layer_pixel_value()");
@@ -9061,78 +9352,8 @@ static void GPKG_gdal_get_layer_pixel_value(sqlite3_context *pContext,
         return;
     }
 
-    const int nBand = sqlite3_value_int(argv[1]);
-    auto poBand = poDS->GetRasterBand(nBand);
-    if (!poBand)
-    {
-        sqlite3_result_null(pContext);
-        return;
-    }
-
-    const char *pszCoordType =
-        reinterpret_cast<const char *>(sqlite3_value_text(argv[2]));
-    int x, y;
-    if (EQUAL(pszCoordType, "georef"))
-    {
-        const double X = sqlite3_value_double(argv[3]);
-        const double Y = sqlite3_value_double(argv[4]);
-        double adfGeoTransform[6];
-        if (poDS->GetGeoTransform(adfGeoTransform) != CE_None)
-        {
-            sqlite3_result_null(pContext);
-            return;
-        }
-        double adfInvGT[6];
-        if (!GDALInvGeoTransform(adfGeoTransform, adfInvGT))
-        {
-            sqlite3_result_null(pContext);
-            return;
-        }
-        x = static_cast<int>(adfInvGT[0] + X * adfInvGT[1] + Y * adfInvGT[2]);
-        y = static_cast<int>(adfInvGT[3] + X * adfInvGT[4] + Y * adfInvGT[5]);
-    }
-    else if (EQUAL(pszCoordType, "pixel"))
-    {
-        x = sqlite3_value_int(argv[3]);
-        y = sqlite3_value_int(argv[4]);
-    }
-    else
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "Invalid value for 3rd argument of gdal_get_pixel_value(): "
-                 "only 'georef' or 'pixel' are supported");
-        sqlite3_result_null(pContext);
-        return;
-    }
-    if (x < 0 || x >= poDS->GetRasterXSize() || y < 0 ||
-        y >= poDS->GetRasterYSize())
-    {
-        sqlite3_result_null(pContext);
-        return;
-    }
-    const auto eDT = poBand->GetRasterDataType();
-    if (eDT != GDT_UInt64 && GDALDataTypeIsInteger(eDT))
-    {
-        int64_t nValue = 0;
-        if (poBand->RasterIO(GF_Read, x, y, 1, 1, &nValue, 1, 1, GDT_Int64, 0,
-                             0, nullptr) != CE_None)
-        {
-            sqlite3_result_null(pContext);
-            return;
-        }
-        return sqlite3_result_int64(pContext, nValue);
-    }
-    else
-    {
-        double dfValue = 0;
-        if (poBand->RasterIO(GF_Read, x, y, 1, 1, &dfValue, 1, 1, GDT_Float64,
-                             0, 0, nullptr) != CE_None)
-        {
-            sqlite3_result_null(pContext);
-            return;
-        }
-        return sqlite3_result_double(pContext, dfValue);
-    }
+    OGRSQLite_gdal_get_pixel_value_common("gdal_get_layer_pixel_value",
+                                          pContext, argc, argv, poDS);
 }
 
 /************************************************************************/
@@ -9305,6 +9526,13 @@ void GDALGeoPackageDataset::InstallSQLFunctions()
                                 OGRGeoPackageSTMakeValid, nullptr, nullptr);
     }
 
+    sqlite3_create_function(hDB, "ST_Length", 1, UTF8_INNOCUOUS, nullptr,
+                            OGRGeoPackageLengthOrGeodesicLength, nullptr,
+                            nullptr);
+    sqlite3_create_function(hDB, "ST_Length", 2, UTF8_INNOCUOUS, this,
+                            OGRGeoPackageLengthOrGeodesicLength, nullptr,
+                            nullptr);
+
     sqlite3_create_function(hDB, "ST_Area", 1, UTF8_INNOCUOUS, nullptr,
                             OGRGeoPackageSTArea, nullptr, nullptr);
     sqlite3_create_function(hDB, "ST_Area", 2, UTF8_INNOCUOUS, this,
@@ -9327,6 +9555,9 @@ void GDALGeoPackageDataset::InstallSQLFunctions()
     sqlite3_create_function(hDB, "gdal_get_layer_pixel_value", 5, SQLITE_UTF8,
                             this, GPKG_gdal_get_layer_pixel_value, nullptr,
                             nullptr);
+    sqlite3_create_function(hDB, "gdal_get_layer_pixel_value", 6, SQLITE_UTF8,
+                            this, GPKG_gdal_get_layer_pixel_value, nullptr,
+                            nullptr);
 
     // Function from VirtualOGR
     sqlite3_create_function(hDB, "ogr_layer_Extent", 1, SQLITE_UTF8, this,
diff --git a/ogr/ogrsf_frmts/gpkg/ogrgeopackagedriver.cpp b/ogr/ogrsf_frmts/gpkg/ogrgeopackagedriver.cpp
index a6111fd8dd6b..20e097fd9043 100644
--- a/ogr/ogrsf_frmts/gpkg/ogrgeopackagedriver.cpp
+++ b/ogr/ogrsf_frmts/gpkg/ogrgeopackagedriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Paul Ramsey <pramsey@boundlessgeo.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_geopackage.h"
diff --git a/ogr/ogrsf_frmts/gpkg/ogrgeopackagelayer.cpp b/ogr/ogrsf_frmts/gpkg/ogrgeopackagelayer.cpp
index fb16c4b49f9a..0e2ae1a5aa24 100644
--- a/ogr/ogrsf_frmts/gpkg/ogrgeopackagelayer.cpp
+++ b/ogr/ogrsf_frmts/gpkg/ogrgeopackagelayer.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2013, Paul Ramsey <pramsey@boundlessgeo.com>
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_geopackage.h"
diff --git a/ogr/ogrsf_frmts/gpkg/ogrgeopackageselectlayer.cpp b/ogr/ogrsf_frmts/gpkg/ogrgeopackageselectlayer.cpp
index 891313a3ec63..8d2389171988 100644
--- a/ogr/ogrsf_frmts/gpkg/ogrgeopackageselectlayer.cpp
+++ b/ogr/ogrsf_frmts/gpkg/ogrgeopackageselectlayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_geopackage.h"
diff --git a/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp b/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
index 22e8fc1fb658..ced8b3ba1eb5 100644
--- a/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
+++ b/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2013, Paul Ramsey <pramsey@boundlessgeo.com>
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_geopackage.h"
@@ -34,6 +18,7 @@
 #include "cpl_time.h"
 #include "ogr_p.h"
 #include "sqlite_rtree_bulk_load/wrapper.h"
+#include "gdal_priv_templates.hpp"
 
 #include <algorithm>
 #include <cassert>
@@ -66,8 +51,8 @@ OGRErr OGRGeoPackageTableLayer::SaveExtent()
 
     char *pszSQL =
         sqlite3_mprintf("UPDATE gpkg_contents SET "
-                        "min_x = %.18g, min_y = %.18g, "
-                        "max_x = %.18g, max_y = %.18g "
+                        "min_x = %.17g, min_y = %.17g, "
+                        "max_x = %.17g, max_y = %.17g "
                         "WHERE lower(table_name) = lower('%q') AND "
                         "Lower(data_type) = 'features'",
                         m_poExtent->MinX, m_poExtent->MinY, m_poExtent->MaxX,
@@ -878,8 +863,8 @@ OGRErr OGRGeoPackageTableLayer::ReadTableDefinition()
             CPLSPrintf("trigger_delete_feature_count_%s", m_pszTableName));
         const std::map<CPLString, CPLString> &oMap =
             m_poDS->GetNameTypeMapFromSQliteMaster();
-        if (oMap.find(osTrigger1Name.toupper()) != oMap.end() &&
-            oMap.find(osTrigger2Name.toupper()) != oMap.end())
+        if (cpl::contains(oMap, osTrigger1Name.toupper()) &&
+            cpl::contains(oMap, osTrigger2Name.toupper()))
         {
             m_bOGRFeatureCountTriggersEnabled = true;
         }
@@ -940,7 +925,7 @@ OGRErr OGRGeoPackageTableLayer::ReadTableDefinition()
         /* Check that the table name is registered in gpkg_contents */
         const std::map<CPLString, GPKGContentsDesc> &oMapContents =
             m_poDS->GetContents();
-        std::map<CPLString, GPKGContentsDesc>::const_iterator oIterContents =
+        const auto oIterContents =
             oMapContents.find(CPLString(m_pszTableName).toupper());
         if (oIterContents == oMapContents.end())
         {
@@ -1267,8 +1252,7 @@ OGRErr OGRGeoPackageTableLayer::ReadTableDefinition()
                 if (bNotNull)
                     oField.SetNullable(FALSE);
 
-                if (uniqueFieldsUC.find(CPLString(pszName).toupper()) !=
-                    uniqueFieldsUC.end())
+                if (cpl::contains(uniqueFieldsUC, CPLString(pszName).toupper()))
                 {
                     oField.SetUnique(TRUE);
                 }
@@ -2125,8 +2109,7 @@ void OGRGeoPackageTableLayer::CheckGeometryType(const OGRFeature *poFeature)
             OGRwkbGeometryType eGeomType =
                 wkbFlatten(poGeom->getGeometryType());
             if (!OGR_GT_IsSubClassOf(eGeomType, eFlattenLayerGeomType) &&
-                m_eSetBadGeomTypeWarned.find(eGeomType) ==
-                    m_eSetBadGeomTypeWarned.end())
+                !cpl::contains(m_eSetBadGeomTypeWarned, eGeomType))
             {
                 CPLError(CE_Warning, CPLE_AppDefined,
                          "A geometry of type %s is inserted into layer %s "
@@ -2215,8 +2198,7 @@ static bool CheckFIDAndFIDColumnConsistency(const OGRFeature *poFeature,
     {
         const double dfFID =
             poFeature->GetFieldAsDouble(iFIDAsRegularColumnIndex);
-        if (dfFID >= static_cast<double>(std::numeric_limits<int64_t>::min()) &&
-            dfFID <= static_cast<double>(std::numeric_limits<int64_t>::max()))
+        if (GDALIsValueInRange<int64_t>(dfFID))
         {
             const auto nFID = static_cast<GIntBig>(dfFID);
             if (nFID == poFeature->GetFID())
@@ -3525,9 +3507,9 @@ OGRErr OGRGeoPackageTableLayer::ResetStatementInternal(GIntBig nStartIndex)
                 bUseSpatialIndex = false;
             }
 
-            if (bUseSpatialIndex && !CPLIsInf(sEnvelope.MinX) &&
-                !CPLIsInf(sEnvelope.MinY) && !CPLIsInf(sEnvelope.MaxX) &&
-                !CPLIsInf(sEnvelope.MaxY))
+            if (bUseSpatialIndex && !std::isinf(sEnvelope.MinX) &&
+                !std::isinf(sEnvelope.MinY) && !std::isinf(sEnvelope.MaxX) &&
+                !std::isinf(sEnvelope.MaxY))
             {
                 soSQL.Printf("SELECT %s FROM \"%s\" m "
                              "JOIN \"%s\" r "
@@ -4044,8 +4026,8 @@ GIntBig OGRGeoPackageTableLayer::GetFeatureCount(int /*bForce*/)
 
         m_poFilterGeom->getEnvelope(&sEnvelope);
 
-        if (!CPLIsInf(sEnvelope.MinX) && !CPLIsInf(sEnvelope.MinY) &&
-            !CPLIsInf(sEnvelope.MaxX) && !CPLIsInf(sEnvelope.MaxY))
+        if (!std::isinf(sEnvelope.MinX) && !std::isinf(sEnvelope.MinY) &&
+            !std::isinf(sEnvelope.MaxX) && !std::isinf(sEnvelope.MaxY))
         {
             soSQL.Printf("SELECT COUNT(*) FROM \"%s\" WHERE "
                          "maxx >= %.12f AND minx <= %.12f AND "
@@ -4932,8 +4914,7 @@ void OGRGeoPackageTableLayer::CheckUnknownExtensions()
 {
     const std::map<CPLString, std::vector<GPKGExtensionDesc>> &oMap =
         m_poDS->GetUnknownExtensionsTableSpecific();
-    std::map<CPLString, std::vector<GPKGExtensionDesc>>::const_iterator oIter =
-        oMap.find(CPLString(m_pszTableName).toupper());
+    const auto oIter = oMap.find(CPLString(m_pszTableName).toupper());
     if (oIter != oMap.end())
     {
         for (size_t i = 0; i < oIter->second.size(); i++)
@@ -5091,7 +5072,7 @@ bool OGRGeoPackageTableLayer::HasSpatialIndex()
         CPLString("rtree_").append(pszT).append("_").append(pszC));
     const std::map<CPLString, CPLString> &oMap =
         m_poDS->GetNameTypeMapFromSQliteMaster();
-    if (oMap.find(CPLString(osRTreeName).toupper()) != oMap.end())
+    if (cpl::contains(oMap, CPLString(osRTreeName).toupper()))
     {
         m_bHasSpatialIndex = true;
         m_osRTreeName = osRTreeName;
@@ -5506,10 +5487,10 @@ CPLString OGRGeoPackageTableLayer::GetSpatialWhere(int m_iGeomColIn,
         const char *pszC =
             m_poFeatureDefn->GetGeomFieldDefn(m_iGeomColIn)->GetNameRef();
 
-        if (CPLIsInf(sEnvelope.MinX) && sEnvelope.MinX < 0 &&
-            CPLIsInf(sEnvelope.MinY) && sEnvelope.MinY < 0 &&
-            CPLIsInf(sEnvelope.MaxX) && sEnvelope.MaxX > 0 &&
-            CPLIsInf(sEnvelope.MaxY) && sEnvelope.MaxY > 0)
+        if (std::isinf(sEnvelope.MinX) && sEnvelope.MinX < 0 &&
+            std::isinf(sEnvelope.MinY) && sEnvelope.MinY < 0 &&
+            std::isinf(sEnvelope.MaxX) && sEnvelope.MaxX > 0 &&
+            std::isinf(sEnvelope.MaxY) && sEnvelope.MaxY > 0)
         {
             osSpatialWHERE.Printf(
                 "(\"%s\" IS NOT NULL AND NOT ST_IsEmpty(\"%s\"))",
@@ -7771,33 +7752,36 @@ void OGR_GPKG_FillArrowArray_Step(sqlite3_context *pContext, int /*argc*/,
     auto psFillArrowArray = static_cast<OGRGPKGTableLayerFillArrowArray *>(
         sqlite3_user_data(pContext));
 
-    if (psFillArrowArray->nCountRows >=
-        psFillArrowArray->psHelper->m_nMaxBatchSize)
     {
-        if (psFillArrowArray->bAsynchronousMode)
+        std::unique_lock<std::mutex> oLock(psFillArrowArray->oMutex);
+        if (psFillArrowArray->nCountRows >=
+            psFillArrowArray->psHelper->m_nMaxBatchSize)
         {
-            std::unique_lock<std::mutex> oLock(psFillArrowArray->oMutex);
-            psFillArrowArray->psHelper->Shrink(psFillArrowArray->nCountRows);
-            psFillArrowArray->oCV.notify_one();
-            while (psFillArrowArray->nCountRows > 0)
+            if (psFillArrowArray->bAsynchronousMode)
             {
-                psFillArrowArray->oCV.wait(oLock);
+                psFillArrowArray->psHelper->Shrink(
+                    psFillArrowArray->nCountRows);
+                psFillArrowArray->oCV.notify_one();
+                while (psFillArrowArray->nCountRows > 0)
+                {
+                    psFillArrowArray->oCV.wait(oLock);
+                }
+                // Note that psFillArrowArray->psHelper.get() will generally now be
+                // different from before the wait()
+            }
+            else
+            {
+                // should not happen !
+                psFillArrowArray->osErrorMsg = "OGR_GPKG_FillArrowArray_Step() "
+                                               "got more rows than expected!";
+                sqlite3_interrupt(psFillArrowArray->hDB);
+                psFillArrowArray->bErrorOccurred = true;
+                return;
             }
-            // Note that psFillArrowArray->psHelper.get() will generally now be
-            // different from before the wait()
         }
-        else
-        {
-            // should not happen !
-            psFillArrowArray->osErrorMsg =
-                "OGR_GPKG_FillArrowArray_Step() got more rows than expected!";
-            sqlite3_interrupt(psFillArrowArray->hDB);
-            psFillArrowArray->bErrorOccurred = true;
+        if (psFillArrowArray->nCountRows < 0)
             return;
-        }
     }
-    if (psFillArrowArray->nCountRows < 0)
-        return;
 
     if (psFillArrowArray->nMemLimit == 0)
         psFillArrowArray->nMemLimit = OGRArrowArrayHelper::GetMemLimit();
@@ -7805,8 +7789,13 @@ void OGR_GPKG_FillArrowArray_Step(sqlite3_context *pContext, int /*argc*/,
     const int SQLITE_MAX_FUNCTION_ARG =
         sqlite3_limit(psFillArrowArray->hDB, SQLITE_LIMIT_FUNCTION_ARG, -1);
 begin:
-    const int iFeat = psFillArrowArray->nCountRows;
-    auto psHelper = psFillArrowArray->psHelper.get();
+    int iFeat;
+    OGRArrowArrayHelper *psHelper;
+    {
+        std::unique_lock<std::mutex> oLock(psFillArrowArray->oMutex);
+        iFeat = psFillArrowArray->nCountRows;
+        psHelper = psFillArrowArray->psHelper.get();
+    }
     int iCol = 0;
     const int iFieldStart = sqlite3_value_int(argv[iCol]);
     ++iCol;
@@ -7943,7 +7932,7 @@ void OGR_GPKG_FillArrowArray_Step(sqlite3_context *pContext, int /*argc*/,
                     }
                 }
 
-                if (psFillArrowArray->nCountRows > 0)
+                if (iFeat > 0)
                 {
                     auto panOffsets = static_cast<int32_t *>(
                         const_cast<void *>(psArray->buffers[1]));
@@ -7956,7 +7945,7 @@ void OGR_GPKG_FillArrowArray_Step(sqlite3_context *pContext, int /*argc*/,
                                  "OGR_GPKG_FillArrowArray_Step(): premature "
                                  "notification of %d features to consumer due "
                                  "to too big array",
-                                 psFillArrowArray->nCountRows);
+                                 iFeat);
                         psFillArrowArray->bMemoryLimitReached = true;
                         if (psFillArrowArray->bAsynchronousMode)
                         {
@@ -8081,7 +8070,7 @@ void OGR_GPKG_FillArrowArray_Step(sqlite3_context *pContext, int /*argc*/,
                 const void *pabyData = sqlite3_value_blob(argv[iCol]);
                 if (pabyData != nullptr || nBytes == 0)
                 {
-                    if (psFillArrowArray->nCountRows > 0)
+                    if (iFeat > 0)
                     {
                         auto panOffsets = static_cast<int32_t *>(
                             const_cast<void *>(psArray->buffers[1]));
@@ -8094,7 +8083,7 @@ void OGR_GPKG_FillArrowArray_Step(sqlite3_context *pContext, int /*argc*/,
                                      "OGR_GPKG_FillArrowArray_Step(): "
                                      "premature notification of %d features to "
                                      "consumer due to too big array",
-                                     psFillArrowArray->nCountRows);
+                                     iFeat);
                             psFillArrowArray->bMemoryLimitReached = true;
                             if (psFillArrowArray->bAsynchronousMode)
                             {
@@ -8171,7 +8160,7 @@ void OGR_GPKG_FillArrowArray_Step(sqlite3_context *pContext, int /*argc*/,
                 if (pszTxt != nullptr)
                 {
                     const size_t nBytes = strlen(pszTxt);
-                    if (psFillArrowArray->nCountRows > 0)
+                    if (iFeat > 0)
                     {
                         auto panOffsets = static_cast<int32_t *>(
                             const_cast<void *>(psArray->buffers[1]));
@@ -8184,7 +8173,7 @@ void OGR_GPKG_FillArrowArray_Step(sqlite3_context *pContext, int /*argc*/,
                                      "OGR_GPKG_FillArrowArray_Step(): "
                                      "premature notification of %d features to "
                                      "consumer due to too big array",
-                                     psFillArrowArray->nCountRows);
+                                     iFeat);
                             psFillArrowArray->bMemoryLimitReached = true;
                             if (psFillArrowArray->bAsynchronousMode)
                             {
@@ -8231,7 +8220,10 @@ void OGR_GPKG_FillArrowArray_Step(sqlite3_context *pContext, int /*argc*/,
     }
 
     if (iField == psHelper->m_nFieldCount)
+    {
+        std::unique_lock<std::mutex> oLock(psFillArrowArray->oMutex);
         psFillArrowArray->nCountRows++;
+    }
     return;
 
 error:
@@ -8471,9 +8463,9 @@ void OGRGeoPackageTableLayer::GetNextArrowArrayAsynchronousWorker()
                 bUseSpatialIndex = false;
             }
 
-            if (bUseSpatialIndex && !CPLIsInf(sEnvelope.MinX) &&
-                !CPLIsInf(sEnvelope.MinY) && !CPLIsInf(sEnvelope.MaxX) &&
-                !CPLIsInf(sEnvelope.MaxY))
+            if (bUseSpatialIndex && !std::isinf(sEnvelope.MinX) &&
+                !std::isinf(sEnvelope.MinY) && !std::isinf(sEnvelope.MaxX) &&
+                !std::isinf(sEnvelope.MaxY))
             {
                 osSQL +=
                     CPLSPrintf(" JOIN \"%s\" r "
@@ -8655,7 +8647,13 @@ int OGRGeoPackageTableLayer::GetNextArrowArray(struct ArrowArrayStream *stream,
                    sizeof(struct ArrowArray));
             memset(task->m_psArrowArray.get(), 0, sizeof(struct ArrowArray));
 
-            if (task->m_bMemoryLimitReached)
+            const bool bMemoryLimitReached = [&task]()
+            {
+                std::unique_lock oLock(task->m_oMutex);
+                return task->m_bMemoryLimitReached;
+            }();
+
+            if (bMemoryLimitReached)
             {
                 m_nIsCompatOfOptimizedGetNextArrowArray = false;
                 stopThread();
diff --git a/ogr/ogrsf_frmts/gpkg/ogrgeopackageutility.cpp b/ogr/ogrsf_frmts/gpkg/ogrgeopackageutility.cpp
index 70210463a029..2ca49c31869b 100644
--- a/ogr/ogrsf_frmts/gpkg/ogrgeopackageutility.cpp
+++ b/ogr/ogrsf_frmts/gpkg/ogrgeopackageutility.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Paul Ramsey <pramsey@boundlessgeo.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrgeopackageutility.h"
@@ -487,6 +471,87 @@ OGRErr GPkgHeaderFromWKB(const GByte *pabyGpkg, size_t nGpkgLen,
     return OGRERR_NONE;
 }
 
+bool GPkgUpdateHeader(GByte *pabyGpkg, size_t nGpkgLen, int nSrsId, double MinX,
+                      double MaxX, double MinY, double MaxY, double MinZ,
+                      double MaxZ)
+{
+    CPLAssert(nGpkgLen >= 8);
+
+    /* Flags */
+    const GByte byFlags = pabyGpkg[3];
+    const auto eByteOrder = static_cast<OGRwkbByteOrder>(byFlags & 0x01);
+    const OGRBoolean bSwap = OGR_SWAP(eByteOrder);
+
+    /* SrsId */
+    if (bSwap)
+    {
+        nSrsId = CPL_SWAP32(nSrsId);
+    }
+    memcpy(pabyGpkg + 4, &nSrsId, 4);
+
+    /* Envelope */
+    const int iEnvelope = (byFlags & (0x07 << 1)) >> 1;
+    int nEnvelopeDim = 0;
+    if (iEnvelope)
+    {
+        if (iEnvelope == 1)
+        {
+            nEnvelopeDim = 2; /* 2D envelope */
+        }
+        else if (iEnvelope == 2)
+        {
+            nEnvelopeDim = 3; /* 2D+Z envelope */
+        }
+        else if (iEnvelope == 3)
+        {
+            nEnvelopeDim = 3; /* 2D+M envelope */
+        }
+        else if (iEnvelope == 4)
+        {
+            nEnvelopeDim = 4; /* 2D+ZM envelope */
+        }
+        else
+        {
+            return false;
+        }
+    }
+    else
+    {
+        return true;
+    }
+
+    if (nGpkgLen < static_cast<size_t>(8 + 8 * 2 * nEnvelopeDim))
+    {
+        // Not enough bytes
+        return false;
+    }
+
+    /* Envelope */
+    if (bSwap)
+    {
+        CPL_SWAPDOUBLE(&(MinX));
+        CPL_SWAPDOUBLE(&(MaxX));
+        CPL_SWAPDOUBLE(&(MinY));
+        CPL_SWAPDOUBLE(&(MaxY));
+        CPL_SWAPDOUBLE(&(MinZ));
+        CPL_SWAPDOUBLE(&(MaxZ));
+    }
+
+    double *padPtr = reinterpret_cast<double *>(pabyGpkg + 8);
+    memcpy(&padPtr[0], &MinX, sizeof(double));
+    memcpy(&padPtr[1], &MaxX, sizeof(double));
+    memcpy(&padPtr[2], &MinY, sizeof(double));
+    memcpy(&padPtr[3], &MaxY, sizeof(double));
+
+    if (iEnvelope == 2 || iEnvelope == 4)
+    {
+        memcpy(&padPtr[4], &MinZ, sizeof(double));
+        memcpy(&padPtr[5], &MaxZ, sizeof(double));
+    }
+
+    return true;
+}
+
 OGRGeometry *GPkgGeometryToOGR(const GByte *pabyGpkg, size_t nGpkgLen,
                                OGRSpatialReference *poSrs)
 {
diff --git a/ogr/ogrsf_frmts/gpkg/ogrgeopackageutility.h b/ogr/ogrsf_frmts/gpkg/ogrgeopackageutility.h
index 19b07248994e..702a3f88cf59 100644
--- a/ogr/ogrsf_frmts/gpkg/ogrgeopackageutility.h
+++ b/ogr/ogrsf_frmts/gpkg/ogrgeopackageutility.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Paul Ramsey <pramsey@boundlessgeo.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
@@ -72,4 +56,8 @@ bool OGRGeoPackageGetHeader(sqlite3_context *pContext, int /*argc*/,
                             bool bNeedExtent, bool bNeedExtent3D,
                             int iGeomIdx = 0);
 
+bool GPkgUpdateHeader(GByte *pabyGpkg, size_t nGpkgLen, int nSrsId, double MinX,
+                      double MaxX, double MinY, double MaxY, double MinZ,
+                      double MaxZ);
+
 #endif
diff --git a/ogr/ogrsf_frmts/gpsbabel/ogr_gpsbabel.h b/ogr/ogrsf_frmts/gpsbabel/ogr_gpsbabel.h
index e3add3178b79..6ea34b8700d8 100644
--- a/ogr/ogrsf_frmts/gpsbabel/ogr_gpsbabel.h
+++ b/ogr/ogrsf_frmts/gpsbabel/ogr_gpsbabel.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_GPSBABEL_H_INCLUDED
@@ -38,12 +22,11 @@
 /*                        OGRGPSBabelDataSource                         */
 /************************************************************************/
 
-class OGRGPSBabelDataSource final : public OGRDataSource
+class OGRGPSBabelDataSource final : public GDALDataset
 {
     int nLayers = 0;
     std::array<OGRLayer *, 5> apoLayers{
         {nullptr, nullptr, nullptr, nullptr, nullptr}};
-    char *pszName = nullptr;
     char *pszGPSBabelDriverName = nullptr;
     char *pszFilename = nullptr;
     CPLString osTmpFileName{};
@@ -55,11 +38,6 @@ class OGRGPSBabelDataSource final : public OGRDataSource
 
     virtual int CloseDependentDatasets() override;
 
-    virtual const char *GetName() override
-    {
-        return pszName;
-    }
-
     virtual int GetLayerCount() override
     {
         return nLayers;
@@ -67,8 +45,6 @@ class OGRGPSBabelDataSource final : public OGRDataSource
 
     virtual OGRLayer *GetLayer(int) override;
 
-    virtual int TestCapability(const char *) override;
-
     int Open(const char *pszFilename, const char *pszGPSBabelDriverNameIn,
              char **papszOpenOptions);
 
@@ -80,9 +56,8 @@ class OGRGPSBabelDataSource final : public OGRDataSource
 /*                   OGRGPSBabelWriteDataSource                         */
 /************************************************************************/
 
-class OGRGPSBabelWriteDataSource final : public OGRDataSource
+class OGRGPSBabelWriteDataSource final : public GDALDataset
 {
-    char *pszName;
     char *pszGPSBabelDriverName;
     char *pszFilename;
     CPLString osTmpFileName;
@@ -94,11 +69,6 @@ class OGRGPSBabelWriteDataSource final : public OGRDataSource
     OGRGPSBabelWriteDataSource();
     virtual ~OGRGPSBabelWriteDataSource();
 
-    virtual const char *GetName() override
-    {
-        return pszName;
-    }
-
     virtual int GetLayerCount() override;
     virtual OGRLayer *GetLayer(int) override;
 
diff --git a/ogr/ogrsf_frmts/gpsbabel/ogrgpsbabeldatasource.cpp b/ogr/ogrsf_frmts/gpsbabel/ogrgpsbabeldatasource.cpp
index f03210037ac3..00cd9eb51e28 100644
--- a/ogr/ogrsf_frmts/gpsbabel/ogrgpsbabeldatasource.cpp
+++ b/ogr/ogrsf_frmts/gpsbabel/ogrgpsbabeldatasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
@@ -50,7 +34,6 @@ OGRGPSBabelDataSource::OGRGPSBabelDataSource()
 OGRGPSBabelDataSource::~OGRGPSBabelDataSource()
 
 {
-    CPLFree(pszName);
     CPLFree(pszGPSBabelDriverName);
     CPLFree(pszFilename);
 
@@ -175,8 +158,6 @@ int OGRGPSBabelDataSource::Open(const char *pszDatasourceName,
         }
     }
 
-    pszName = CPLStrdup(pszDatasourceName);
-
     bool bExplicitFeatures = false;
     bool bWaypoints = true;
     bool bTracks = true;
@@ -261,7 +242,7 @@ int OGRGPSBabelDataSource::Open(const char *pszDatasourceName,
     if (pszOptionUseTempFile && CPLTestBool(pszOptionUseTempFile))
         osTmpFileName = CPLGenerateTempFilename(nullptr);
     else
-        osTmpFileName.Printf("/vsimem/ogrgpsbabeldatasource_%p", this);
+        osTmpFileName = VSIMemGenerateHiddenFilename("gpsbabel");
 
     bool bRet = false;
     if (IsSpecialFile(pszFilename))
@@ -381,15 +362,6 @@ int OGRGPSBabelDataSource::Open(const char *pszDatasourceName,
     return nLayers > 0;
 }
 
-/************************************************************************/
-/*                           TestCapability()                           */
-/************************************************************************/
-
-int OGRGPSBabelDataSource::TestCapability(const char * /* pszCap */)
-{
-    return FALSE;
-}
-
 /************************************************************************/
 /*                              GetLayer()                              */
 /************************************************************************/
diff --git a/ogr/ogrsf_frmts/gpsbabel/ogrgpsbabeldriver.cpp b/ogr/ogrsf_frmts/gpsbabel/ogrgpsbabeldriver.cpp
index eca3cc717701..023a241752cc 100644
--- a/ogr/ogrsf_frmts/gpsbabel/ogrgpsbabeldriver.cpp
+++ b/ogr/ogrsf_frmts/gpsbabel/ogrgpsbabeldriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
@@ -115,7 +99,8 @@ OGRGPSBabelDriverIdentifyInternal(GDALOpenInfo *poOpenInfo,
         {
             CPLErrorStateBackuper oErrorStateBackuper(CPLQuietErrorHandler);
             const char *const apszArgs[] = {"gpsbabel", "-V", nullptr};
-            CPLString osTmpFileName("/vsimem/gpsbabel_tmp.tmp");
+            const CPLString osTmpFileName =
+                VSIMemGenerateHiddenFilename("gpsbabel");
             VSILFILE *tmpfp = VSIFOpenL(osTmpFileName, "wb");
             bGPSBabelFound = CPLSpawn(apszArgs, nullptr, tmpfp, FALSE) == 0;
             VSIFCloseL(tmpfp);
diff --git a/ogr/ogrsf_frmts/gpsbabel/ogrgpsbabelwritedatasource.cpp b/ogr/ogrsf_frmts/gpsbabel/ogrgpsbabelwritedatasource.cpp
index f9bae27b9fc8..f4eacc2d9a27 100644
--- a/ogr/ogrsf_frmts/gpsbabel/ogrgpsbabelwritedatasource.cpp
+++ b/ogr/ogrsf_frmts/gpsbabel/ogrgpsbabelwritedatasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <cstring>
@@ -39,8 +23,7 @@
 /************************************************************************/
 
 OGRGPSBabelWriteDataSource::OGRGPSBabelWriteDataSource()
-    : pszName(nullptr), pszGPSBabelDriverName(nullptr), pszFilename(nullptr),
-      poGPXDS(nullptr)
+    : pszGPSBabelDriverName(nullptr), pszFilename(nullptr), poGPXDS(nullptr)
 {
 }
 
@@ -56,7 +39,6 @@ OGRGPSBabelWriteDataSource::~OGRGPSBabelWriteDataSource()
 
     Convert();
 
-    CPLFree(pszName);
     CPLFree(pszGPSBabelDriverName);
     CPLFree(pszFilename);
 }
@@ -193,15 +175,13 @@ int OGRGPSBabelWriteDataSource::Create(const char *pszNameIn,
     if (pszOptionUseTempFile && CPLTestBool(pszOptionUseTempFile))
         osTmpFileName = CPLGenerateTempFilename(nullptr);
     else
-        osTmpFileName.Printf("/vsimem/ogrgpsbabeldatasource_%p", this);
+        osTmpFileName = VSIMemGenerateHiddenFilename("gpsbabel");
 
     poGPXDS = poGPXDriver->Create(osTmpFileName.c_str(), 0, 0, 0, GDT_Unknown,
                                   papszOptions);
     if (poGPXDS == nullptr)
         return FALSE;
 
-    pszName = CPLStrdup(pszNameIn);
-
     return TRUE;
 }
 
diff --git a/ogr/ogrsf_frmts/gpx/ogr_gpx.h b/ogr/ogrsf_frmts/gpx/ogr_gpx.h
index c63394991aa0..e08153818857 100644
--- a/ogr/ogrsf_frmts/gpx/ogr_gpx.h
+++ b/ogr/ogrsf_frmts/gpx/ogr_gpx.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2007-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_GPX_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/gpx/ogrgpxdatasource.cpp b/ogr/ogrsf_frmts/gpx/ogrgpxdatasource.cpp
index 84928c5836f7..518c8b8ef716 100644
--- a/ogr/ogrsf_frmts/gpx/ogrgpxdatasource.cpp
+++ b/ogr/ogrsf_frmts/gpx/ogrgpxdatasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2007-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/gpx/ogrgpxdriver.cpp b/ogr/ogrsf_frmts/gpx/ogrgpxdriver.cpp
index 9ccb2f87ec66..ba8f40ead088 100644
--- a/ogr/ogrsf_frmts/gpx/ogrgpxdriver.cpp
+++ b/ogr/ogrsf_frmts/gpx/ogrgpxdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2007-2008, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/gpx/ogrgpxlayer.cpp b/ogr/ogrsf_frmts/gpx/ogrgpxlayer.cpp
index cd59f73c9507..44b0111d1130 100644
--- a/ogr/ogrsf_frmts/gpx/ogrgpxlayer.cpp
+++ b/ogr/ogrsf_frmts/gpx/ogrgpxlayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2007-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/gtfs/ogrgtfsdriver.cpp b/ogr/ogrsf_frmts/gtfs/ogrgtfsdriver.cpp
index 899d35cc112a..fadc35e722fc 100644
--- a/ogr/ogrsf_frmts/gtfs/ogrgtfsdriver.cpp
+++ b/ogr/ogrsf_frmts/gtfs/ogrgtfsdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -34,6 +18,8 @@
 #include <new>
 #include <utility>
 
+constexpr const char *const apszCSVDriver[] = {"CSV", nullptr};
+
 /***********************************************************************/
 /*                         OGRGTFSDataset                              */
 /***********************************************************************/
@@ -73,7 +59,7 @@ OGRLayer *OGRGTFSDataset::GetLayer(int nIdx)
 
 class OGRGTFSLayer final : public OGRLayer
 {
-    std::string m_osDirname{};
+    const std::string m_osDirname;
     std::unique_ptr<GDALDataset> m_poUnderlyingDS{};
     OGRLayer *m_poUnderlyingLayer = nullptr;  // owned by m_poUnderlyingDS
     OGRFeatureDefn *m_poFeatureDefn = nullptr;
@@ -96,7 +82,6 @@ class OGRGTFSLayer final : public OGRLayer
     OGRFeature *GetNextFeature() override;
     int TestCapability(const char *) override;
     GIntBig GetFeatureCount(int bForce) override;
-    OGRErr SetAttributeFilter(const char *) override;
 
     OGRFeatureDefn *GetLayerDefn() override
     {
@@ -212,7 +197,8 @@ void OGRGTFSLayer::PrepareTripsData()
     {
         {
             auto poStopsDS = std::unique_ptr<GDALDataset>(GDALDataset::Open(
-                (m_osDirname + "/stops.txt").c_str(), GDAL_OF_VECTOR));
+                std::string(m_osDirname).append("/stops.txt").c_str(),
+                GDAL_OF_VECTOR, apszCSVDriver));
             if (!poStopsDS)
                 return;
             auto poStopsLyr = poStopsDS->GetLayer(0);
@@ -237,7 +223,8 @@ void OGRGTFSLayer::PrepareTripsData()
         }
 
         auto poStopTimesDS = std::unique_ptr<GDALDataset>(GDALDataset::Open(
-            (m_osDirname + "/stop_times.txt").c_str(), GDAL_OF_VECTOR));
+            std::string(m_osDirname).append("/stop_times.txt").c_str(),
+            GDAL_OF_VECTOR, apszCSVDriver));
         if (!poStopTimesDS)
             return;
         auto poStopTimesLyr = poStopTimesDS->GetLayer(0);
@@ -349,30 +336,21 @@ OGRFeature *OGRGTFSLayer::GetNextFeature()
                 }
             }
         }
-        if (m_poFilterGeom == nullptr ||
-            FilterGeometry(poFeature->GetGeometryRef()))
+        if ((!m_poFilterGeom || FilterGeometry(poFeature->GetGeometryRef())) &&
+            (!m_poAttrQuery || m_poAttrQuery->Evaluate(poFeature.get())))
         {
             return poFeature.release();
         }
     }
 }
 
-/***********************************************************************/
-/*                       SetAttributeFilter()                          */
-/***********************************************************************/
-
-OGRErr OGRGTFSLayer::SetAttributeFilter(const char *pszFilter)
-{
-    return m_poUnderlyingLayer->SetAttributeFilter(pszFilter);
-}
-
 /***********************************************************************/
 /*                          GetFeatureCount()                          */
 /***********************************************************************/
 
 GIntBig OGRGTFSLayer::GetFeatureCount(int bForce)
 {
-    if (m_poFilterGeom != nullptr)
+    if (m_poFilterGeom || m_poAttrQuery)
         return OGRLayer::GetFeatureCount(bForce);
     return m_poUnderlyingLayer->GetFeatureCount(bForce);
 }
@@ -564,6 +542,11 @@ int OGRGTFSDataset::Identify(GDALOpenInfo *poOpenInfo)
     if (STARTS_WITH(poOpenInfo->pszFilename, "GTFS:"))
         return TRUE;
 
+    if (poOpenInfo->IsSingleAllowedDriver("GTFS") && poOpenInfo->bIsDirectory)
+    {
+        return TRUE;
+    }
+
     if (!EQUAL(CPLGetExtension(poOpenInfo->pszFilename), "zip"))
         return FALSE;
 
@@ -618,45 +601,39 @@ GDALDataset *OGRGTFSDataset::Open(GDALOpenInfo *poOpenInfo)
     if (!Identify(poOpenInfo))
         return nullptr;
 
-    const char *pszFilename = poOpenInfo->pszFilename;
-    if (STARTS_WITH(pszFilename, "GTFS:"))
-        pszFilename += strlen("GTFS:");
+    const char *pszGTFSFilename = poOpenInfo->pszFilename;
+    if (STARTS_WITH(pszGTFSFilename, "GTFS:"))
+        pszGTFSFilename += strlen("GTFS:");
 
-    std::string osBaseDir(pszFilename);
-    if (!STARTS_WITH(pszFilename, "/vsizip/") &&
-        EQUAL(CPLGetExtension(pszFilename), "zip"))
-    {
-        osBaseDir = "/vsizip/{";
-        osBaseDir += pszFilename;
-        osBaseDir += '}';
-    }
-
-    const std::string osCSVBaseDirPrefix(std::string("CSV:") + osBaseDir);
+    const std::string osBaseDir(
+        (!STARTS_WITH(pszGTFSFilename, "/vsizip/") &&
+         EQUAL(CPLGetExtension(pszGTFSFilename), "zip"))
+            ? std::string("/vsizip/{").append(pszGTFSFilename).append("}")
+            : std::string(pszGTFSFilename));
 
     auto poDS = std::make_unique<OGRGTFSDataset>();
 
-    char **papszFilenames = VSIReadDir(osBaseDir.c_str());
+    const CPLStringList aosFilenames(VSIReadDir(osBaseDir.c_str()));
     size_t nCountFound = 0;
     std::string osShapesFilename;
-    for (CSLConstList papszIter = papszFilenames; papszIter && *papszIter;
-         ++papszIter)
+    for (const char *pszFilename : cpl::Iterate(aosFilenames))
     {
-        if (!EQUAL(CPLGetExtension(*papszIter), "txt"))
+        if (!EQUAL(CPLGetExtension(pszFilename), "txt"))
             continue;
         for (const char *pszFilenameInDir : apszRequiredFiles)
         {
-            if (EQUAL(*papszIter, pszFilenameInDir))
+            if (EQUAL(pszFilename, pszFilenameInDir))
             {
                 nCountFound++;
                 break;
             }
         }
-        if (EQUAL(*papszIter, "shapes.txt"))
-            osShapesFilename = *papszIter;
+        if (EQUAL(pszFilename, "shapes.txt"))
+            osShapesFilename = pszFilename;
 
-        auto poCSVDataset = std::unique_ptr<GDALDataset>(
-            GDALDataset::Open((osCSVBaseDirPrefix + '/' + *papszIter).c_str(),
-                              GDAL_OF_VERBOSE_ERROR | GDAL_OF_VECTOR));
+        auto poCSVDataset = std::unique_ptr<GDALDataset>(GDALDataset::Open(
+            std::string(osBaseDir).append("/").append(pszFilename).c_str(),
+            GDAL_OF_VERBOSE_ERROR | GDAL_OF_VECTOR, apszCSVDriver));
         if (poCSVDataset)
         {
             auto poUnderlyingLayer = poCSVDataset->GetLayer(0);
@@ -667,13 +644,12 @@ GDALDataset *OGRGTFSDataset::Open(GDALOpenInfo *poOpenInfo)
                 {
                     poDS->m_apoLayers.emplace_back(
                         std::make_unique<OGRGTFSLayer>(
-                            osCSVBaseDirPrefix, CPLGetBasename(*papszIter),
+                            osBaseDir, CPLGetBasename(pszFilename),
                             std::move(poCSVDataset)));
                 }
             }
         }
     }
-    CSLDestroy(papszFilenames);
 
     if (nCountFound != sizeof(apszRequiredFiles) / sizeof(apszRequiredFiles[0]))
     {
@@ -685,8 +661,8 @@ GDALDataset *OGRGTFSDataset::Open(GDALOpenInfo *poOpenInfo)
     if (!osShapesFilename.empty())
     {
         auto poCSVDataset = std::unique_ptr<GDALDataset>(GDALDataset::Open(
-            (osCSVBaseDirPrefix + '/' + osShapesFilename).c_str(),
-            GDAL_OF_VERBOSE_ERROR | GDAL_OF_VECTOR));
+            std::string(osBaseDir).append("/").append(osShapesFilename).c_str(),
+            GDAL_OF_VERBOSE_ERROR | GDAL_OF_VECTOR, apszCSVDriver));
         if (poCSVDataset)
         {
             auto poUnderlyingLayer = poCSVDataset->GetLayer(0);
diff --git a/ogr/ogrsf_frmts/hana/ogr_hana.h b/ogr/ogrsf_frmts/hana/ogr_hana.h
index dc2c5e54cdc1..5d27da131bae 100644
--- a/ogr/ogrsf_frmts/hana/ogr_hana.h
+++ b/ogr/ogrsf_frmts/hana/ogr_hana.h
@@ -7,28 +7,13 @@
  ******************************************************************************
  * Copyright (c) 2020, SAP SE
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_HANA_H_INCLUDED
 #define OGR_HANA_H_INCLUDED
 
+#include "hana/ogrhanautils.h"
 #include "ogrsf_frmts.h"
 #include "cpl_string.h"
 
@@ -38,6 +23,7 @@
 #include <vector>
 
 #include "odbc/Forwards.h"
+#include "odbc/Types.h"
 
 class OGRHanaDataSource;
 
@@ -50,9 +36,76 @@ constexpr static int DEFAULT_STRING_SIZE = 256;
 constexpr static int UNDETERMINED_SRID = -1;
 
 /************************************************************************/
-/*                          Internal struct definitions                 */
+/*                 Internal enum and struct definitions                 */
 /************************************************************************/
 
+class QGRHanaDataTypes
+{
+    QGRHanaDataTypes() = delete;
+
+  public:
+    /// Unknown data type.
+    static constexpr int Unknown = odbc::SQLDataTypes::Unknown;
+    /// 64-bit integer value.
+    static constexpr int BigInt = odbc::SQLDataTypes::BigInt;
+    /// Binary data of fixed length.
+    static constexpr int Binary = odbc::SQLDataTypes::Binary;
+    /// Single bit binary data.
+    static constexpr int Bit = odbc::SQLDataTypes::Bit;
+    /// Boolean value.
+    static constexpr int Boolean = odbc::SQLDataTypes::Boolean;
+    /// Character string of fixed string length.
+    static constexpr int Char = odbc::SQLDataTypes::Char;
+    /// Year, month, and day fields.
+    static constexpr int Date = odbc::SQLDataTypes::Date;
+    /// Year, month, and day fields.
+    static constexpr int DateTime = odbc::SQLDataTypes::DateTime;
+    /// Signed, exact, numeric value.
+    static constexpr int Decimal = odbc::SQLDataTypes::Decimal;
+    /// Double-precision floating point number.
+    static constexpr int Double = odbc::SQLDataTypes::Double;
+    /// Floating point number with driver-specific precision.
+    static constexpr int Float = odbc::SQLDataTypes::Float;
+    /// 32-bit integer value.
+    static constexpr int Integer = odbc::SQLDataTypes::Integer;
+    /// Variable length binary data.
+    static constexpr int LongVarBinary = odbc::SQLDataTypes::LongVarBinary;
+    /// Variable length character data.
+    static constexpr int LongVarChar = odbc::SQLDataTypes::LongVarChar;
+    /// Signed, exact, numeric value.
+    static constexpr int Numeric = odbc::SQLDataTypes::Numeric;
+    /// Single-precision floating point number.
+    static constexpr int Real = odbc::SQLDataTypes::Real;
+    /// 16-bit integer value.
+    static constexpr int SmallInt = odbc::SQLDataTypes::SmallInt;
+    /// Hour, minute, and second fields.
+    static constexpr int Time = odbc::SQLDataTypes::Time;
+    /// Year, month, day, hour, minute, and second fields.
+    static constexpr int Timestamp = odbc::SQLDataTypes::Timestamp;
+    /// 8-bit integer value.
+    static constexpr int TinyInt = odbc::SQLDataTypes::TinyInt;
+    /// Year, month, and day fields.
+    static constexpr int TypeDate = odbc::SQLDataTypes::TypeDate;
+    /// Hour, minute, and second fields.
+    static constexpr int TypeTime = odbc::SQLDataTypes::TypeTime;
+    /// Year, month, day, hour, minute, and second fields.
+    static constexpr int TypeTimestamp = odbc::SQLDataTypes::TypeTimestamp;
+    /// Variable length binary data.
+    static constexpr int VarBinary = odbc::SQLDataTypes::VarBinary;
+    /// Variable-length character string.
+    static constexpr int VarChar = odbc::SQLDataTypes::VarChar;
+    /// Unicode character string of fixed string length.
+    static constexpr int WChar = odbc::SQLDataTypes::WChar;
+    /// Unicode variable-length character data.
+    static constexpr int WLongVarChar = odbc::SQLDataTypes::WLongVarChar;
+    /// Unicode variable-length character string.
+    static constexpr int WVarChar = odbc::SQLDataTypes::WVarChar;
+    /// ST_GEOMETRY/ST_POINT value.
+    static constexpr int Geometry = 29812;
+    /// REAL_VECTOR value.
+    static constexpr int RealVector = 29814;
+};
+
 struct ColumnDefinition
 {
     CPLString name;
@@ -162,7 +215,8 @@ class OGRHanaLayer : public OGRLayer
                                  const CPLString &tableName,
                                  const CPLString &query,
                                  const CPLString &featureDefName);
-    void ReadGeometryExtent(int geomField, OGREnvelope *extent);
+    void ReadGeometryExtent(int geomField, OGREnvelope *extent, int force);
+    bool IsFastExtentAvailable();
 
   public:
     explicit OGRHanaLayer(OGRHanaDataSource *datasource);
@@ -348,13 +402,15 @@ class OGRHanaDataSource final : public GDALDataset
     SrsCache srsCache_;
     odbc::EnvironmentRef connEnv_;
     odbc::ConnectionRef conn_;
-    int majorVersion_ = 0;
+    OGRHANA::HanaVersion hanaVersion_;
+    OGRHANA::HanaVersion cloudVersion_;
 
   private:
     void CreateTable(const CPLString &tableName, const CPLString &fidName,
                      const CPLString &fidType, const CPLString &geomColumnName,
                      OGRwkbGeometryType geomType, bool geomColumnNullable,
                      const CPLString &geomColumnIndexType, int geomSrid);
+    void DetermineVersions();
 
   protected:
     std::pair<CPLString, CPLString> FindSchemaAndTableNames(const char *query);
@@ -401,9 +457,14 @@ class OGRHanaDataSource final : public GDALDataset
 
     int Open(const char *newName, char **options, int update);
 
-    int GetMajorVersion() const
+    OGRHANA::HanaVersion GetHanaVersion() const
+    {
+        return hanaVersion_;
+    }
+
+    OGRHANA::HanaVersion GetHanaCloudVersion() const
     {
-        return majorVersion_;
+        return cloudVersion_;
     }
 
     OGRErr DeleteLayer(int index) override;
diff --git a/ogr/ogrsf_frmts/hana/ogrhanadatasource.cpp b/ogr/ogrsf_frmts/hana/ogrhanadatasource.cpp
index bb1c698eaefe..5a8effe12131 100644
--- a/ogr/ogrsf_frmts/hana/ogrhanadatasource.cpp
+++ b/ogr/ogrsf_frmts/hana/ogrhanadatasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2020, SAP SE
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_hana.h"
@@ -411,42 +395,43 @@ CPLString FormatDefaultValue(const char *value, short dataType)
 
     switch (dataType)
     {
-        case odbc::SQLDataTypes::Bit:
-        case odbc::SQLDataTypes::Boolean:
+        case QGRHanaDataTypes::Bit:
+        case QGRHanaDataTypes::Boolean:
             return value;
-        case odbc::SQLDataTypes::TinyInt:
-        case odbc::SQLDataTypes::SmallInt:
-        case odbc::SQLDataTypes::Integer:
-        case odbc::SQLDataTypes::BigInt:
-        case odbc::SQLDataTypes::Real:
-        case odbc::SQLDataTypes::Float:
-        case odbc::SQLDataTypes::Double:
-        case odbc::SQLDataTypes::Decimal:
-        case odbc::SQLDataTypes::Numeric:
+        case QGRHanaDataTypes::TinyInt:
+        case QGRHanaDataTypes::SmallInt:
+        case QGRHanaDataTypes::Integer:
+        case QGRHanaDataTypes::BigInt:
+        case QGRHanaDataTypes::Real:
+        case QGRHanaDataTypes::Float:
+        case QGRHanaDataTypes::Double:
+        case QGRHanaDataTypes::Decimal:
+        case QGRHanaDataTypes::Numeric:
             return value;
-        case odbc::SQLDataTypes::Char:
-        case odbc::SQLDataTypes::VarChar:
-        case odbc::SQLDataTypes::LongVarChar:
-        case odbc::SQLDataTypes::WChar:
-        case odbc::SQLDataTypes::WVarChar:
-        case odbc::SQLDataTypes::WLongVarChar:
+        case QGRHanaDataTypes::Char:
+        case QGRHanaDataTypes::VarChar:
+        case QGRHanaDataTypes::LongVarChar:
+        case QGRHanaDataTypes::WChar:
+        case QGRHanaDataTypes::WVarChar:
+        case QGRHanaDataTypes::WLongVarChar:
             return Literal(value);
-        case odbc::SQLDataTypes::Binary:
-        case odbc::SQLDataTypes::VarBinary:
-        case odbc::SQLDataTypes::LongVarBinary:
+        case QGRHanaDataTypes::Binary:
+        case QGRHanaDataTypes::VarBinary:
+        case QGRHanaDataTypes::LongVarBinary:
+        case QGRHanaDataTypes::RealVector:
             return value;
-        case odbc::SQLDataTypes::Date:
-        case odbc::SQLDataTypes::TypeDate:
+        case QGRHanaDataTypes::Date:
+        case QGRHanaDataTypes::TypeDate:
             if (EQUAL(value, "CURRENT_DATE"))
                 return value;
             return Literal(value);
-        case odbc::SQLDataTypes::Time:
-        case odbc::SQLDataTypes::TypeTime:
+        case QGRHanaDataTypes::Time:
+        case QGRHanaDataTypes::TypeTime:
             if (EQUAL(value, "CURRENT_TIME"))
                 return value;
             return Literal(value);
-        case odbc::SQLDataTypes::Timestamp:
-        case odbc::SQLDataTypes::TypeTimestamp:
+        case QGRHanaDataTypes::Timestamp:
+        case QGRHanaDataTypes::TypeTimestamp:
             if (EQUAL(value, "CURRENT_TIMESTAMP"))
                 return value;
             return Literal(value);
@@ -458,37 +443,37 @@ CPLString FormatDefaultValue(const char *value, short dataType)
 short GetArrayDataType(const CPLString &typeName)
 {
     if (typeName == "BOOLEAN ARRAY")
-        return odbc::SQLDataTypes::Boolean;
+        return QGRHanaDataTypes::Boolean;
     else if (typeName == "TINYINT ARRAY")
-        return odbc::SQLDataTypes::TinyInt;
+        return QGRHanaDataTypes::TinyInt;
     else if (typeName == "SMALLINT ARRAY")
-        return odbc::SQLDataTypes::SmallInt;
+        return QGRHanaDataTypes::SmallInt;
     else if (typeName == "INTEGER ARRAY")
-        return odbc::SQLDataTypes::Integer;
+        return QGRHanaDataTypes::Integer;
     else if (typeName == "BIGINT ARRAY")
-        return odbc::SQLDataTypes::BigInt;
+        return QGRHanaDataTypes::BigInt;
     else if (typeName == "DOUBLE ARRAY")
-        return odbc::SQLDataTypes::Double;
+        return QGRHanaDataTypes::Double;
     else if (typeName == "REAL ARRAY")
-        return odbc::SQLDataTypes::Float;
+        return QGRHanaDataTypes::Float;
     else if (typeName == "DECIMAL ARRAY" || typeName == "SMALLDECIMAL ARRAY")
-        return odbc::SQLDataTypes::Decimal;
+        return QGRHanaDataTypes::Decimal;
     else if (typeName == "CHAR ARRAY")
-        return odbc::SQLDataTypes::Char;
+        return QGRHanaDataTypes::Char;
     else if (typeName == "VARCHAR ARRAY")
-        return odbc::SQLDataTypes::VarChar;
+        return QGRHanaDataTypes::VarChar;
     else if (typeName == "NCHAR ARRAY")
-        return odbc::SQLDataTypes::WChar;
+        return QGRHanaDataTypes::WChar;
     else if (typeName == "NVARCHAR ARRAY")
-        return odbc::SQLDataTypes::WVarChar;
+        return QGRHanaDataTypes::WVarChar;
     else if (typeName == "DATE ARRAY")
-        return odbc::SQLDataTypes::Date;
+        return QGRHanaDataTypes::Date;
     else if (typeName == "TIME ARRAY")
-        return odbc::SQLDataTypes::Time;
+        return QGRHanaDataTypes::Time;
     else if (typeName == "TIMESTAMP ARRAY" || typeName == "SECONDDATE ARRAY")
-        return odbc::SQLDataTypes::Timestamp;
+        return QGRHanaDataTypes::Timestamp;
 
-    return odbc::SQLDataTypes::Unknown;
+    return QGRHanaDataTypes::Unknown;
 }
 
 std::vector<CPLString> GetSupportedArrayTypes()
@@ -498,32 +483,34 @@ std::vector<CPLString> GetSupportedArrayTypes()
 
 bool IsKnownDataType(short dataType)
 {
-    return dataType == odbc::SQLDataTypes::Bit ||
-           dataType == odbc::SQLDataTypes::Boolean ||
-           dataType == odbc::SQLDataTypes::TinyInt ||
-           dataType == odbc::SQLDataTypes::SmallInt ||
-           dataType == odbc::SQLDataTypes::Integer ||
-           dataType == odbc::SQLDataTypes::BigInt ||
-           dataType == odbc::SQLDataTypes::Double ||
-           dataType == odbc::SQLDataTypes::Real ||
-           dataType == odbc::SQLDataTypes::Float ||
-           dataType == odbc::SQLDataTypes::Decimal ||
-           dataType == odbc::SQLDataTypes::Numeric ||
-           dataType == odbc::SQLDataTypes::Char ||
-           dataType == odbc::SQLDataTypes::VarChar ||
-           dataType == odbc::SQLDataTypes::LongVarChar ||
-           dataType == odbc::SQLDataTypes::WChar ||
-           dataType == odbc::SQLDataTypes::WVarChar ||
-           dataType == odbc::SQLDataTypes::WLongVarChar ||
-           dataType == odbc::SQLDataTypes::Date ||
-           dataType == odbc::SQLDataTypes::TypeDate ||
-           dataType == odbc::SQLDataTypes::Time ||
-           dataType == odbc::SQLDataTypes::TypeTime ||
-           dataType == odbc::SQLDataTypes::Timestamp ||
-           dataType == odbc::SQLDataTypes::TypeTimestamp ||
-           dataType == odbc::SQLDataTypes::Binary ||
-           dataType == odbc::SQLDataTypes::VarBinary ||
-           dataType == odbc::SQLDataTypes::LongVarBinary;
+    return dataType == QGRHanaDataTypes::Bit ||
+           dataType == QGRHanaDataTypes::Boolean ||
+           dataType == QGRHanaDataTypes::TinyInt ||
+           dataType == QGRHanaDataTypes::SmallInt ||
+           dataType == QGRHanaDataTypes::Integer ||
+           dataType == QGRHanaDataTypes::BigInt ||
+           dataType == QGRHanaDataTypes::Double ||
+           dataType == QGRHanaDataTypes::Real ||
+           dataType == QGRHanaDataTypes::Float ||
+           dataType == QGRHanaDataTypes::Decimal ||
+           dataType == QGRHanaDataTypes::Numeric ||
+           dataType == QGRHanaDataTypes::Char ||
+           dataType == QGRHanaDataTypes::VarChar ||
+           dataType == QGRHanaDataTypes::LongVarChar ||
+           dataType == QGRHanaDataTypes::WChar ||
+           dataType == QGRHanaDataTypes::WVarChar ||
+           dataType == QGRHanaDataTypes::WLongVarChar ||
+           dataType == QGRHanaDataTypes::Date ||
+           dataType == QGRHanaDataTypes::TypeDate ||
+           dataType == QGRHanaDataTypes::Time ||
+           dataType == QGRHanaDataTypes::TypeTime ||
+           dataType == QGRHanaDataTypes::Timestamp ||
+           dataType == QGRHanaDataTypes::TypeTimestamp ||
+           dataType == QGRHanaDataTypes::Binary ||
+           dataType == QGRHanaDataTypes::VarBinary ||
+           dataType == QGRHanaDataTypes::LongVarBinary ||
+           dataType == QGRHanaDataTypes::Geometry ||
+           dataType == QGRHanaDataTypes::RealVector;
 }
 
 }  // anonymous namespace
@@ -621,10 +608,7 @@ int OGRHanaDataSource::Open(const char *newName, char **openOptions, int update)
 
         if (conn_->connected())
         {
-            odbc::DatabaseMetaDataRef dbmd = conn_->getDatabaseMetaData();
-            CPLString dbVersion(dbmd->getDBMSVersion());
-            majorVersion_ =
-                atoi(dbVersion.substr(0u, dbVersion.find('.')).c_str());
+            DetermineVersions();
 
             const char *paramTables = CSLFetchNameValueDef(
                 connOptions, OGRHanaOpenOptionsConstants::TABLES, "");
@@ -695,6 +679,29 @@ void OGRHanaDataSource::CreateTable(
     ExecuteSQL(sql);
 }
 
+void OGRHanaDataSource::DetermineVersions()
+{
+    odbc::DatabaseMetaDataRef dbmd = conn_->getDatabaseMetaData();
+    CPLString dbVersion(dbmd->getDBMSVersion());
+    hanaVersion_ = HanaVersion::fromString(dbVersion);
+
+    if (hanaVersion_.major() < 4)
+    {
+        cloudVersion_ = HanaVersion(0, 0, 0);
+        return;
+    }
+
+    odbc::StatementRef stmt = conn_->createStatement();
+    const char *sql = "SELECT CLOUD_VERSION FROM SYS.M_DATABASE;";
+
+    odbc::ResultSetRef rsVersion = stmt->executeQuery(sql);
+    if (rsVersion->next())
+        cloudVersion_ =
+            HanaVersion::fromString(rsVersion->getString(1)->c_str());
+
+    rsVersion->close();
+}
+
 /************************************************************************/
 /*                            FindSchemaAndTableNames()                 */
 /************************************************************************/
@@ -1048,7 +1055,6 @@ OGRErr OGRHanaDataSource::GetQueryColumns(
             continue;
 
         bool isArray = false;
-        bool isGeometry = false;
         CPLString tableName = rsmd->getTableName(clmIndex);
         CPLString columnName = rsmd->getColumnName(clmIndex);
         CPLString defaultValue;
@@ -1080,7 +1086,7 @@ OGRErr OGRHanaDataSource::GetQueryColumns(
                 typeName = *rsArrayTypes->getString(1);
                 dataType = GetArrayDataType(typeName);
 
-                if (dataType == odbc::SQLDataTypes::Unknown)
+                if (dataType == QGRHanaDataTypes::Unknown)
                 {
                     CPLError(
                         CE_Failure, CPLE_AppDefined,
@@ -1105,18 +1111,13 @@ OGRErr OGRHanaDataSource::GetQueryColumns(
                 if (name->compare("SHORTTEXT") == 0 ||
                     name->compare("ALPHANUM") == 0)
                 {
-                    dataType = odbc::SQLDataTypes::WVarChar;
-                }
-                else if (name->compare("ST_GEOMETRY") == 0 ||
-                         name->compare("ST_POINT") == 0)
-                {
-                    isGeometry = true;
+                    dataType = QGRHanaDataTypes::WVarChar;
                 }
             }
             rsTypeInfo->close();
         }
 
-        if (isGeometry)
+        if (dataType == QGRHanaDataTypes::Geometry)
         {
             GeometryColumnDescription geometryColumnDesc;
             if (schemaName.empty() || tableName.empty())
@@ -1697,7 +1698,7 @@ OGRHanaDataSource::ICreateLayer(const char *layerNameIn,
 
     layers_.push_back(std::move(layer));
 
-    return layers_[layers_.size() - 1].get();
+    return layers_.back().get();
 }
 
 /************************************************************************/
diff --git a/ogr/ogrsf_frmts/hana/ogrhanadriver.cpp b/ogr/ogrsf_frmts/hana/ogrhanadriver.cpp
index 8f0437e430a9..9ca82a103784 100644
--- a/ogr/ogrsf_frmts/hana/ogrhanadriver.cpp
+++ b/ogr/ogrsf_frmts/hana/ogrhanadriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2020, SAP SE
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/hana/ogrhanadrivercore.cpp b/ogr/ogrsf_frmts/hana/ogrhanadrivercore.cpp
index abd705b860f9..9b004ae1adc9 100644
--- a/ogr/ogrsf_frmts/hana/ogrhanadrivercore.cpp
+++ b/ogr/ogrsf_frmts/hana/ogrhanadrivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2020, SAP SE
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
diff --git a/ogr/ogrsf_frmts/hana/ogrhanadrivercore.h b/ogr/ogrsf_frmts/hana/ogrhanadrivercore.h
index 856a73db54db..8e1c85fa8285 100644
--- a/ogr/ogrsf_frmts/hana/ogrhanadrivercore.h
+++ b/ogr/ogrsf_frmts/hana/ogrhanadrivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2020, SAP SE
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRHANADRIVERCORE_H
diff --git a/ogr/ogrsf_frmts/hana/ogrhanafeaturereader.cpp b/ogr/ogrsf_frmts/hana/ogrhanafeaturereader.cpp
index 03f07e3b1b79..1c8b2d68868e 100644
--- a/ogr/ogrsf_frmts/hana/ogrhanafeaturereader.cpp
+++ b/ogr/ogrsf_frmts/hana/ogrhanafeaturereader.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2020, SAP SE
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrhanafeaturereader.h"
@@ -32,6 +16,7 @@
 #include "cpl_time.h"
 
 #include <algorithm>
+#include <cmath>
 #include <cstring>
 #include <ctime>
 #include <limits>
@@ -195,7 +180,7 @@ odbc::String OGRHanaFeatureReader::GetFieldAsString(int fieldIndex,
         defaultValue[strlen(defaultValue) - 1] == '\'')
     {
         CPLString str(defaultValue + 1);
-        str.resize(str.size() - 1);
+        str.pop_back();
         char *tmp = CPLUnescapeString(str, nullptr, CPLES_SQL);
         odbc::String ret = getString(tmp);
         CPLFree(tmp);
@@ -255,7 +240,7 @@ odbc::String OGRHanaFeatureReader::GetFieldAsNString(int fieldIndex,
         defaultValue[strlen(defaultValue) - 1] == '\'')
     {
         CPLString str(defaultValue + 1);
-        str.resize(str.size() - 1);
+        str.pop_back();
         char *tmp = CPLUnescapeString(str, nullptr, CPLES_SQL);
         odbc::String ret = getString(tmp);
         CPLFree(tmp);
diff --git a/ogr/ogrsf_frmts/hana/ogrhanafeaturereader.h b/ogr/ogrsf_frmts/hana/ogrhanafeaturereader.h
index 36234cd60906..edbd465fc00d 100644
--- a/ogr/ogrsf_frmts/hana/ogrhanafeaturereader.h
+++ b/ogr/ogrsf_frmts/hana/ogrhanafeaturereader.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2020, SAP SE
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRHANAFEATUREREADER_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/hana/ogrhanafeaturewriter.cpp b/ogr/ogrsf_frmts/hana/ogrhanafeaturewriter.cpp
index 72313999ca36..18e04a18de5d 100644
--- a/ogr/ogrsf_frmts/hana/ogrhanafeaturewriter.cpp
+++ b/ogr/ogrsf_frmts/hana/ogrhanafeaturewriter.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2020, SAP SE
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrhanafeaturewriter.h"
diff --git a/ogr/ogrsf_frmts/hana/ogrhanafeaturewriter.h b/ogr/ogrsf_frmts/hana/ogrhanafeaturewriter.h
index cec5bad553ce..08ccf2746663 100644
--- a/ogr/ogrsf_frmts/hana/ogrhanafeaturewriter.h
+++ b/ogr/ogrsf_frmts/hana/ogrhanafeaturewriter.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2020, SAP SE
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRHANAFEATUREWRITER_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/hana/ogrhanalayer.cpp b/ogr/ogrsf_frmts/hana/ogrhanalayer.cpp
index 04d2422f6356..0cf71b669d2e 100644
--- a/ogr/ogrsf_frmts/hana/ogrhanalayer.cpp
+++ b/ogr/ogrsf_frmts/hana/ogrhanalayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2020, SAP SE
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_hana.h"
@@ -31,11 +15,13 @@
 #include "ogrhanautils.h"
 
 #include <algorithm>
+#include <cmath>
 #include <limits>
 #include <sstream>
 #include <memory>
 
 #include "odbc/Exception.h"
+#include "odbc/PreparedStatement.h"
 #include "odbc/ResultSet.h"
 #include "odbc/Statement.h"
 #include "odbc/Types.h"
@@ -73,8 +59,8 @@ CPLString BuildSpatialFilter(int dbVersion, const OGRGeometry &geom,
     OGREnvelope env;
     geom.getEnvelope(&env);
 
-    if ((CPLIsInf(env.MinX) || CPLIsInf(env.MinY) || CPLIsInf(env.MaxX) ||
-         CPLIsInf(env.MaxY)))
+    if ((std::isinf(env.MinX) || std::isinf(env.MinY) || std::isinf(env.MaxX) ||
+         std::isinf(env.MaxY)))
         return "";
 
     auto clampValue = [](double v)
@@ -96,13 +82,13 @@ CPLString BuildSpatialFilter(int dbVersion, const OGRGeometry &geom,
     // flag.
     if (dbVersion == 1)
         return CPLString().Printf(
-            "\"%s\".ST_IntersectsRect(ST_GeomFromText('POINT(%.18g %.18g)', "
-            "%d), ST_GeomFromText('POINT(%.18g %.18g)', %d)) = 1",
+            "\"%s\".ST_IntersectsRect(ST_GeomFromText('POINT(%.17g %.17g)', "
+            "%d), ST_GeomFromText('POINT(%.17g %.17g)', %d)) = 1",
             clmName.c_str(), minX, minY, srid, maxX, maxY, srid);
     else
         return CPLString().Printf(
-            "\"%s\".ST_IntersectsRectPlanar(ST_GeomFromText('POINT(%.18g "
-            "%.18g)', %d), ST_GeomFromText('POINT(%.18g %.18g)', %d)) = 1",
+            "\"%s\".ST_IntersectsRectPlanar(ST_GeomFromText('POINT(%.17g "
+            "%.17g)', %d), ST_GeomFromText('POINT(%.17g %.17g)', %d)) = 1",
             clmName.c_str(), minX, minY, srid, maxX, maxY, srid);
 }
 
@@ -114,63 +100,73 @@ CreateFieldDefn(const AttributeColumnDescription &columnDesc)
 
     OGRFieldType ogrFieldType = OFTString;
     OGRFieldSubType ogrFieldSubType = OGRFieldSubType::OFSTNone;
+    int width = columnDesc.length;
 
     switch (columnDesc.type)
     {
-        case odbc::SQLDataTypes::Bit:
-        case odbc::SQLDataTypes::Boolean:
+        case QGRHanaDataTypes::Bit:
+        case QGRHanaDataTypes::Boolean:
             ogrFieldType = columnDesc.isArray ? OFTIntegerList : OFTInteger;
             ogrFieldSubType = OGRFieldSubType::OFSTBoolean;
             break;
-        case odbc::SQLDataTypes::TinyInt:
-        case odbc::SQLDataTypes::SmallInt:
+        case QGRHanaDataTypes::TinyInt:
+        case QGRHanaDataTypes::SmallInt:
             ogrFieldType = columnDesc.isArray ? OFTIntegerList : OFTInteger;
             ogrFieldSubType = OGRFieldSubType::OFSTInt16;
             break;
-        case odbc::SQLDataTypes::Integer:
+        case QGRHanaDataTypes::Integer:
             ogrFieldType = columnDesc.isArray ? OFTIntegerList : OFTInteger;
             break;
-        case odbc::SQLDataTypes::BigInt:
+        case QGRHanaDataTypes::BigInt:
             ogrFieldType = columnDesc.isArray ? OFTInteger64List : OFTInteger64;
             break;
-        case odbc::SQLDataTypes::Double:
-        case odbc::SQLDataTypes::Real:
-        case odbc::SQLDataTypes::Float:
+        case QGRHanaDataTypes::Double:
+        case QGRHanaDataTypes::Real:
+        case QGRHanaDataTypes::Float:
             ogrFieldType = columnDesc.isArray ? OFTRealList : OFTReal;
-            if (columnDesc.type != odbc::SQLDataTypes::Double)
+            if (columnDesc.type != QGRHanaDataTypes::Double)
                 ogrFieldSubType = OGRFieldSubType::OFSTFloat32;
             break;
-        case odbc::SQLDataTypes::Decimal:
-        case odbc::SQLDataTypes::Numeric:
+        case QGRHanaDataTypes::Decimal:
+        case QGRHanaDataTypes::Numeric:
             ogrFieldType = columnDesc.isArray ? OFTRealList : OFTReal;
             setFieldPrecision = true;
             break;
-        case odbc::SQLDataTypes::Char:
-        case odbc::SQLDataTypes::VarChar:
-        case odbc::SQLDataTypes::LongVarChar:
-        case odbc::SQLDataTypes::WChar:
-        case odbc::SQLDataTypes::WVarChar:
-        case odbc::SQLDataTypes::WLongVarChar:
+        case QGRHanaDataTypes::Char:
+        case QGRHanaDataTypes::VarChar:
+        case QGRHanaDataTypes::LongVarChar:
+        case QGRHanaDataTypes::WChar:
+        case QGRHanaDataTypes::WVarChar:
+        case QGRHanaDataTypes::WLongVarChar:
             // Note: OFTWideString is deprecated
             ogrFieldType = columnDesc.isArray ? OFTStringList : OFTString;
             setFieldSize = true;
             break;
-        case odbc::SQLDataTypes::Date:
-        case odbc::SQLDataTypes::TypeDate:
+        case QGRHanaDataTypes::Date:
+        case QGRHanaDataTypes::TypeDate:
             ogrFieldType = OFTDate;
             break;
-        case odbc::SQLDataTypes::Time:
-        case odbc::SQLDataTypes::TypeTime:
+        case QGRHanaDataTypes::Time:
+        case QGRHanaDataTypes::TypeTime:
             ogrFieldType = OFTTime;
             break;
-        case odbc::SQLDataTypes::Timestamp:
-        case odbc::SQLDataTypes::TypeTimestamp:
+        case QGRHanaDataTypes::Timestamp:
+        case QGRHanaDataTypes::TypeTimestamp:
             ogrFieldType = OFTDateTime;
             break;
-        case odbc::SQLDataTypes::Binary:
-        case odbc::SQLDataTypes::VarBinary:
-        case odbc::SQLDataTypes::LongVarBinary:
+        case QGRHanaDataTypes::Binary:
+        case QGRHanaDataTypes::VarBinary:
+        case QGRHanaDataTypes::LongVarBinary:
+            ogrFieldType = OFTBinary;
+            setFieldSize = true;
+            break;
+        case QGRHanaDataTypes::RealVector:
             ogrFieldType = OFTBinary;
+            // The .fvecs format is used for REAL_VECTOR with the dimension
+            // lying in the range [1,65000].
+            width = (columnDesc.precision == 0)
+                        ? 65000
+                        : 4 * (columnDesc.precision + 1);
             setFieldSize = true;
             break;
         default:
@@ -189,7 +185,7 @@ CreateFieldDefn(const AttributeColumnDescription &columnDesc)
     if (!columnDesc.isArray)
     {
         if (setFieldSize)
-            field->SetWidth(columnDesc.length);
+            field->SetWidth(width);
         if (setFieldPrecision)
         {
             field->SetWidth(columnDesc.precision);
@@ -344,7 +340,7 @@ void OGRHanaLayer::BuildWhereClause()
             const GeometryColumnDescription &geomClmDesc =
                 geomColumns_[static_cast<std::size_t>(m_iGeomFieldFilter)];
             spatialFilter = BuildSpatialFilter(
-                dataSource_->GetMajorVersion(), *m_poFilterGeom,
+                dataSource_->GetHanaVersion().major(), *m_poFilterGeom,
                 geomClmDesc.name, geomClmDesc.srid);
         }
     }
@@ -472,13 +468,13 @@ OGRFeature *OGRHanaLayer::ReadFeature()
 
         if (clmDesc.isFeatureID)
         {
-            if (clmDesc.type == odbc::SQLDataTypes::Integer)
+            if (clmDesc.type == QGRHanaDataTypes::Integer)
             {
                 odbc::Int val = resultSet_->getInt(paramIndex);
                 if (!val.isNull())
                     feature->SetFID(static_cast<GIntBig>(*val));
             }
-            else if (clmDesc.type == odbc::SQLDataTypes::BigInt)
+            else if (clmDesc.type == QGRHanaDataTypes::BigInt)
             {
                 odbc::Long val = resultSet_->getLong(paramIndex);
                 if (!val.isNull())
@@ -504,41 +500,41 @@ OGRFeature *OGRHanaLayer::ReadFeature()
 
             switch (clmDesc.type)
             {
-                case odbc::SQLDataTypes::Boolean:
+                case QGRHanaDataTypes::Boolean:
                     featWriter.SetFieldValueAsArray<uint8_t, int32_t>(
                         fieldIndex, val);
                     break;
-                case odbc::SQLDataTypes::TinyInt:
+                case QGRHanaDataTypes::TinyInt:
                     featWriter.SetFieldValueAsArray<uint8_t, int32_t>(
                         fieldIndex, val);
                     break;
-                case odbc::SQLDataTypes::SmallInt:
+                case QGRHanaDataTypes::SmallInt:
                     featWriter.SetFieldValueAsArray<int16_t, int32_t>(
                         fieldIndex, val);
                     break;
-                case odbc::SQLDataTypes::Integer:
+                case QGRHanaDataTypes::Integer:
                     featWriter.SetFieldValueAsArray<int32_t, int32_t>(
                         fieldIndex, val);
                     break;
-                case odbc::SQLDataTypes::BigInt:
+                case QGRHanaDataTypes::BigInt:
                     featWriter.SetFieldValueAsArray<GIntBig, GIntBig>(
                         fieldIndex, val);
                     break;
-                case odbc::SQLDataTypes::Float:
-                case odbc::SQLDataTypes::Real:
+                case QGRHanaDataTypes::Float:
+                case QGRHanaDataTypes::Real:
                     featWriter.SetFieldValueAsArray<float, double>(fieldIndex,
                                                                    val);
                     break;
-                case odbc::SQLDataTypes::Double:
+                case QGRHanaDataTypes::Double:
                     featWriter.SetFieldValueAsArray<double, double>(fieldIndex,
                                                                     val);
                     break;
-                case odbc::SQLDataTypes::Char:
-                case odbc::SQLDataTypes::VarChar:
-                case odbc::SQLDataTypes::LongVarChar:
-                case odbc::SQLDataTypes::WChar:
-                case odbc::SQLDataTypes::WVarChar:
-                case odbc::SQLDataTypes::WLongVarChar:
+                case QGRHanaDataTypes::Char:
+                case QGRHanaDataTypes::VarChar:
+                case QGRHanaDataTypes::LongVarChar:
+                case QGRHanaDataTypes::WChar:
+                case QGRHanaDataTypes::WVarChar:
+                case QGRHanaDataTypes::WLongVarChar:
                     featWriter.SetFieldValueAsStringArray(fieldIndex, val);
                     break;
             }
@@ -548,65 +544,65 @@ OGRFeature *OGRHanaLayer::ReadFeature()
 
         switch (clmDesc.type)
         {
-            case odbc::SQLDataTypes::Bit:
-            case odbc::SQLDataTypes::Boolean:
+            case QGRHanaDataTypes::Bit:
+            case QGRHanaDataTypes::Boolean:
             {
                 odbc::Boolean val = resultSet_->getBoolean(paramIndex);
                 featWriter.SetFieldValue(fieldIndex, val);
             }
             break;
-            case odbc::SQLDataTypes::TinyInt:
+            case QGRHanaDataTypes::TinyInt:
             {
                 odbc::Byte val = resultSet_->getByte(paramIndex);
                 featWriter.SetFieldValue(fieldIndex, val);
             }
             break;
-            case odbc::SQLDataTypes::SmallInt:
+            case QGRHanaDataTypes::SmallInt:
             {
                 odbc::Short val = resultSet_->getShort(paramIndex);
                 featWriter.SetFieldValue(fieldIndex, val);
             }
             break;
-            case odbc::SQLDataTypes::Integer:
+            case QGRHanaDataTypes::Integer:
             {
                 odbc::Int val = resultSet_->getInt(paramIndex);
                 featWriter.SetFieldValue(fieldIndex, val);
             }
             break;
-            case odbc::SQLDataTypes::BigInt:
+            case QGRHanaDataTypes::BigInt:
             {
                 odbc::Long val = resultSet_->getLong(paramIndex);
                 featWriter.SetFieldValue(fieldIndex, val);
             }
             break;
-            case odbc::SQLDataTypes::Real:
-            case odbc::SQLDataTypes::Float:
+            case QGRHanaDataTypes::Real:
+            case QGRHanaDataTypes::Float:
             {
                 odbc::Float val = resultSet_->getFloat(paramIndex);
                 featWriter.SetFieldValue(fieldIndex, val);
             }
             break;
-            case odbc::SQLDataTypes::Double:
+            case QGRHanaDataTypes::Double:
             {
                 odbc::Double val = resultSet_->getDouble(paramIndex);
                 featWriter.SetFieldValue(fieldIndex, val);
             }
             break;
-            case odbc::SQLDataTypes::Decimal:
-            case odbc::SQLDataTypes::Numeric:
+            case QGRHanaDataTypes::Decimal:
+            case QGRHanaDataTypes::Numeric:
             {
                 odbc::Decimal val = resultSet_->getDecimal(paramIndex);
                 featWriter.SetFieldValue(fieldIndex, val);
             }
             break;
-            case odbc::SQLDataTypes::Char:
-            case odbc::SQLDataTypes::VarChar:
-            case odbc::SQLDataTypes::LongVarChar:
+            case QGRHanaDataTypes::Char:
+            case QGRHanaDataTypes::VarChar:
+            case QGRHanaDataTypes::LongVarChar:
             // Note: NVARCHAR data type is converted to UTF-8 on the HANA side
             // when using a connection setting CHAR_AS_UTF8=1.
-            case odbc::SQLDataTypes::WChar:
-            case odbc::SQLDataTypes::WVarChar:
-            case odbc::SQLDataTypes::WLongVarChar:
+            case QGRHanaDataTypes::WChar:
+            case QGRHanaDataTypes::WVarChar:
+            case QGRHanaDataTypes::WLongVarChar:
             {
                 std::size_t len = resultSet_->getStringLength(paramIndex);
                 if (len == odbc::ResultSet::NULL_DATA)
@@ -627,9 +623,10 @@ OGRFeature *OGRHanaLayer::ReadFeature()
                 }
             }
             break;
-            case odbc::SQLDataTypes::Binary:
-            case odbc::SQLDataTypes::VarBinary:
-            case odbc::SQLDataTypes::LongVarBinary:
+            case QGRHanaDataTypes::Binary:
+            case QGRHanaDataTypes::VarBinary:
+            case QGRHanaDataTypes::LongVarBinary:
+            case QGRHanaDataTypes::RealVector:
             {
                 std::size_t len = resultSet_->getBinaryLength(paramIndex);
                 if (len == 0)
@@ -652,22 +649,22 @@ OGRFeature *OGRHanaLayer::ReadFeature()
                 }
             }
             break;
-            case odbc::SQLDataTypes::Date:
-            case odbc::SQLDataTypes::TypeDate:
+            case QGRHanaDataTypes::Date:
+            case QGRHanaDataTypes::TypeDate:
             {
                 odbc::Date date = resultSet_->getDate(paramIndex);
                 featWriter.SetFieldValue(fieldIndex, date);
             }
             break;
-            case odbc::SQLDataTypes::Time:
-            case odbc::SQLDataTypes::TypeTime:
+            case QGRHanaDataTypes::Time:
+            case QGRHanaDataTypes::TypeTime:
             {
                 odbc::Time time = resultSet_->getTime(paramIndex);
                 featWriter.SetFieldValue(fieldIndex, time);
             }
             break;
-            case odbc::SQLDataTypes::Timestamp:
-            case odbc::SQLDataTypes::TypeTimestamp:
+            case QGRHanaDataTypes::Timestamp:
+            case QGRHanaDataTypes::TypeTimestamp:
             {
                 odbc::Timestamp timestamp =
                     resultSet_->getTimestamp(paramIndex);
@@ -765,48 +762,70 @@ OGRErr OGRHanaLayer::InitFeatureDefinition(const CPLString &schemaName,
 /*                         ReadGeometryExtent()                         */
 /************************************************************************/
 
-void OGRHanaLayer::ReadGeometryExtent(int geomField, OGREnvelope *extent)
+void OGRHanaLayer::ReadGeometryExtent(int geomField, OGREnvelope *extent,
+                                      int force)
 {
     EnsureInitialized();
 
     OGRGeomFieldDefn *geomFieldDef = featureDefn_->GetGeomFieldDefn(geomField);
     const char *clmName = geomFieldDef->GetNameRef();
-    int srid = GetGeometryColumnSrid(geomField);
-    CPLString sql;
-    if (dataSource_->IsSrsRoundEarth(srid))
+    odbc::PreparedStatementRef stmt;
+    if (!force && IsTableLayer())
     {
-        CPLString quotedClmName = QuotedIdentifier(clmName);
-        bool hasSrsPlanarEquivalent = dataSource_->HasSrsPlanarEquivalent(srid);
-        CPLString geomColumn =
-            !hasSrsPlanarEquivalent
-                ? quotedClmName
-                : CPLString().Printf("%s.ST_SRID(%d)", quotedClmName.c_str(),
-                                     ToPlanarSRID(srid));
-        CPLString columns = CPLString().Printf(
-            "MIN(%s.ST_XMin()), MIN(%s.ST_YMin()), MAX(%s.ST_XMax()), "
-            "MAX(%s.ST_YMax())",
-            geomColumn.c_str(), geomColumn.c_str(), geomColumn.c_str(),
-            geomColumn.c_str());
-        sql = BuildQuery(rawQuery_.c_str(), columns.c_str());
+        auto names = dataSource_->FindSchemaAndTableNames(rawQuery_.c_str());
+        stmt = dataSource_->PrepareStatement(
+            "SELECT MIN_X, MIN_Y, MAX_X, MAX_Y FROM "
+            "SYS.M_ST_GEOMETRY_COLUMNS WHERE SCHEMA_NAME=? AND TABLE_NAME=? "
+            "AND COLUMN_NAME=?");
+        stmt->setString(1, names.first == ""
+                               ? odbc::String(dataSource_->schemaName_)
+                               : odbc::String(names.first));
+        stmt->setString(2, odbc::String(names.second));
+        stmt->setString(3, odbc::String(clmName));
     }
     else
     {
-        CPLString columns = CPLString().Printf(
-            "ST_EnvelopeAggr(%s) AS ext", QuotedIdentifier(clmName).c_str());
-        CPLString subQuery = BuildQuery(rawQuery_.c_str(), columns);
-        sql = CPLString().Printf(
-            "SELECT ext.ST_XMin(),ext.ST_YMin(),ext.ST_XMax(),ext.ST_YMax() "
-            "FROM (%s)",
-            subQuery.c_str());
+        int srid = GetGeometryColumnSrid(geomField);
+        if (dataSource_->IsSrsRoundEarth(srid))
+        {
+            CPLString quotedClmName = QuotedIdentifier(clmName);
+            bool hasSrsPlanarEquivalent =
+                dataSource_->HasSrsPlanarEquivalent(srid);
+            CPLString geomColumn =
+                !hasSrsPlanarEquivalent
+                    ? quotedClmName
+                    : CPLString().Printf("%s.ST_SRID(%d)",
+                                         quotedClmName.c_str(),
+                                         ToPlanarSRID(srid));
+            CPLString columns = CPLString().Printf(
+                "MIN(%s.ST_XMin()), MIN(%s.ST_YMin()), MAX(%s.ST_XMax()), "
+                "MAX(%s.ST_YMax())",
+                geomColumn.c_str(), geomColumn.c_str(), geomColumn.c_str(),
+                geomColumn.c_str());
+            stmt = dataSource_->PrepareStatement(
+                BuildQuery(rawQuery_.c_str(), columns.c_str()));
+        }
+        else
+        {
+            CPLString columns =
+                CPLString().Printf("ST_EnvelopeAggr(%s) AS ext",
+                                   QuotedIdentifier(clmName).c_str());
+            CPLString subQuery = BuildQuery(rawQuery_.c_str(), columns);
+            stmt = dataSource_->PrepareStatement(CPLString().Printf(
+                "SELECT "
+                "ext.ST_XMin(),ext.ST_YMin(),ext.ST_XMax(),ext.ST_YMax() "
+                "FROM (%s)",
+                subQuery.c_str()));
+        }
     }
 
+    bool set = false;
     extent->MinX = 0.0;
     extent->MaxX = 0.0;
     extent->MinY = 0.0;
     extent->MaxY = 0.0;
 
-    odbc::StatementRef stmt = dataSource_->CreateStatement();
-    odbc::ResultSetRef rsExtent = stmt->executeQuery(sql.c_str());
+    odbc::ResultSetRef rsExtent = stmt->executeQuery();
     if (rsExtent->next())
     {
         odbc::Double val = rsExtent->getDouble(1);
@@ -816,9 +835,30 @@ void OGRHanaLayer::ReadGeometryExtent(int geomField, OGREnvelope *extent)
             extent->MinY = *rsExtent->getDouble(2);
             extent->MaxX = *rsExtent->getDouble(3);
             extent->MaxY = *rsExtent->getDouble(4);
+            set = true;
         }
     }
+
     rsExtent->close();
+    if (!set && !force)
+        ReadGeometryExtent(geomField, extent, true);
+}
+
+bool OGRHanaLayer::IsFastExtentAvailable()
+{
+    if (geomColumns_.empty())
+        return false;
+
+    switch (dataSource_->GetHanaVersion().major())
+    {
+        case 2:
+            return dataSource_->GetHanaVersion() >= HanaVersion(2, 0, 80);
+        case 4:
+            return dataSource_->GetHanaCloudVersion() >=
+                   HanaVersion(2024, 2, 0);
+    }
+
+    return false;
 }
 
 /************************************************************************/
@@ -855,7 +895,10 @@ OGRErr OGRHanaLayer::GetExtent(int iGeomField, OGREnvelope *extent, int force)
 
     try
     {
-        ReadGeometryExtent(iGeomField, extent);
+        if (!force)
+            force = !IsFastExtentAvailable();
+        ReadGeometryExtent(iGeomField, extent, force);
+
         return OGRERR_NONE;
     }
     catch (const std::exception &ex)
diff --git a/ogr/ogrsf_frmts/hana/ogrhanaresultlayer.cpp b/ogr/ogrsf_frmts/hana/ogrhanaresultlayer.cpp
index bb5c27ff9f38..870b2b0f966f 100644
--- a/ogr/ogrsf_frmts/hana/ogrhanaresultlayer.cpp
+++ b/ogr/ogrsf_frmts/hana/ogrhanaresultlayer.cpp
@@ -7,25 +7,10 @@
  ******************************************************************************
  * Copyright (c) 2020, SAP SE
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
+#include "ogr_core.h"
 #include "ogr_hana.h"
 
 #include <memory>
@@ -69,9 +54,13 @@ OGRErr OGRHanaResultLayer::Initialize()
 
 int OGRHanaResultLayer::TestCapability(const char *capabilities)
 {
+    if (EQUAL(capabilities, OLCFastGetExtent))
+    {
+        EnsureInitialized();
+        return IsFastExtentAvailable();
+    }
     if (EQUAL(capabilities, OLCFastFeatureCount) ||
-        EQUAL(capabilities, OLCFastSpatialFilter) ||
-        EQUAL(capabilities, OLCFastGetExtent))
+        EQUAL(capabilities, OLCFastSpatialFilter))
     {
         EnsureInitialized();
         return (geomColumns_.size() > 0);
diff --git a/ogr/ogrsf_frmts/hana/ogrhanatablelayer.cpp b/ogr/ogrsf_frmts/hana/ogrhanatablelayer.cpp
index 6811e6fb0b26..24d040a539c5 100644
--- a/ogr/ogrsf_frmts/hana/ogrhanatablelayer.cpp
+++ b/ogr/ogrsf_frmts/hana/ogrhanatablelayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2020, SAP SE
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_hana.h"
@@ -84,26 +68,26 @@ CPLString GetParameterValue(short type, const CPLString &typeName, bool isArray)
         CPLString arrayType = "STRING";
         switch (type)
         {
-            case odbc::SQLDataTypes::TinyInt:
+            case QGRHanaDataTypes::TinyInt:
                 arrayType = "TINYINT";
                 break;
-            case odbc::SQLDataTypes::SmallInt:
+            case QGRHanaDataTypes::SmallInt:
                 arrayType = "SMALLINT";
                 break;
-            case odbc::SQLDataTypes::Integer:
+            case QGRHanaDataTypes::Integer:
                 arrayType = "INT";
                 break;
-            case odbc::SQLDataTypes::BigInt:
+            case QGRHanaDataTypes::BigInt:
                 arrayType = "BIGINT";
                 break;
-            case odbc::SQLDataTypes::Float:
-            case odbc::SQLDataTypes::Real:
+            case QGRHanaDataTypes::Float:
+            case QGRHanaDataTypes::Real:
                 arrayType = "REAL";
                 break;
-            case odbc::SQLDataTypes::Double:
+            case QGRHanaDataTypes::Double:
                 arrayType = "DOUBLE";
                 break;
-            case odbc::SQLDataTypes::WVarChar:
+            case QGRHanaDataTypes::WVarChar:
                 arrayType = "STRING";
                 break;
         }
@@ -174,30 +158,30 @@ ColumnTypeInfo ParseColumnTypeInfo(const CPLString &typeDef)
         if (typeSize.empty() || typeSize.size() > 2)
         {
             incorrectFormatErr();
-            return {"", odbc::SQLDataTypes::Unknown, 0, 0};
+            return {"", QGRHanaDataTypes::Unknown, 0, 0};
         }
     }
 
     typeName.Trim();
 
     if (EQUAL(typeName.c_str(), "BOOLEAN"))
-        return {typeName, odbc::SQLDataTypes::Boolean, 0, 0};
+        return {typeName, QGRHanaDataTypes::Boolean, 0, 0};
     else if (EQUAL(typeName.c_str(), "TINYINT"))
-        return {typeName, odbc::SQLDataTypes::TinyInt, 0, 0};
+        return {typeName, QGRHanaDataTypes::TinyInt, 0, 0};
     else if (EQUAL(typeName.c_str(), "SMALLINT"))
-        return {typeName, odbc::SQLDataTypes::SmallInt, 0, 0};
+        return {typeName, QGRHanaDataTypes::SmallInt, 0, 0};
     else if (EQUAL(typeName.c_str(), "INTEGER"))
-        return {typeName, odbc::SQLDataTypes::Integer, 0, 0};
+        return {typeName, QGRHanaDataTypes::Integer, 0, 0};
     else if (EQUAL(typeName.c_str(), "DECIMAL"))
     {
         switch (typeSize.size())
         {
             case 0:
-                return {typeName, odbc::SQLDataTypes::Decimal, 0, 0};
+                return {typeName, QGRHanaDataTypes::Decimal, 0, 0};
             case 1:
-                return {typeName, odbc::SQLDataTypes::Decimal, typeSize[0], 0};
+                return {typeName, QGRHanaDataTypes::Decimal, typeSize[0], 0};
             case 2:
-                return {typeName, odbc::SQLDataTypes::Decimal, typeSize[0],
+                return {typeName, QGRHanaDataTypes::Decimal, typeSize[0],
                         typeSize[1]};
         }
     }
@@ -206,29 +190,29 @@ ColumnTypeInfo ParseColumnTypeInfo(const CPLString &typeDef)
         switch (typeSize.size())
         {
             case 0:
-                return {typeName, odbc::SQLDataTypes::Float, 10, 0};
+                return {typeName, QGRHanaDataTypes::Float, 10, 0};
             case 1:
-                return {typeName, odbc::SQLDataTypes::Float, typeSize[0], 0};
+                return {typeName, QGRHanaDataTypes::Float, typeSize[0], 0};
             default:
                 incorrectFormatErr();
-                return {"", odbc::SQLDataTypes::Unknown, 0, 0};
+                return {"", QGRHanaDataTypes::Unknown, 0, 0};
         }
     }
     else if (EQUAL(typeName.c_str(), "REAL"))
-        return {typeName, odbc::SQLDataTypes::Real, 0, 0};
+        return {typeName, QGRHanaDataTypes::Real, 0, 0};
     else if (EQUAL(typeName.c_str(), "DOUBLE"))
-        return {typeName, odbc::SQLDataTypes::Double, 0, 0};
+        return {typeName, QGRHanaDataTypes::Double, 0, 0};
     else if (EQUAL(typeName.c_str(), "VARCHAR"))
     {
         switch (typeSize.size())
         {
             case 0:
-                return {typeName, odbc::SQLDataTypes::VarChar, 1, 0};
+                return {typeName, QGRHanaDataTypes::VarChar, 1, 0};
             case 1:
-                return {typeName, odbc::SQLDataTypes::VarChar, typeSize[0], 0};
+                return {typeName, QGRHanaDataTypes::VarChar, typeSize[0], 0};
             default:
                 incorrectFormatErr();
-                return {"", odbc::SQLDataTypes::Unknown, 0, 0};
+                return {"", QGRHanaDataTypes::Unknown, 0, 0};
         }
     }
     else if (EQUAL(typeName.c_str(), "NVARCHAR"))
@@ -236,42 +220,54 @@ ColumnTypeInfo ParseColumnTypeInfo(const CPLString &typeDef)
         switch (typeSize.size())
         {
             case 0:
-                return {typeName, odbc::SQLDataTypes::WVarChar, 1, 0};
+                return {typeName, QGRHanaDataTypes::WVarChar, 1, 0};
             case 1:
-                return {typeName, odbc::SQLDataTypes::WVarChar, typeSize[0], 0};
+                return {typeName, QGRHanaDataTypes::WVarChar, typeSize[0], 0};
             case 2:
                 incorrectFormatErr();
-                return {"", odbc::SQLDataTypes::Unknown, 0, 0};
+                return {"", QGRHanaDataTypes::Unknown, 0, 0};
         }
     }
     else if (EQUAL(typeName.c_str(), "NCLOB"))
-        return {typeName, odbc::SQLDataTypes::WLongVarChar, 0, 0};
+        return {typeName, QGRHanaDataTypes::WLongVarChar, 0, 0};
     else if (EQUAL(typeName.c_str(), "DATE"))
-        return {typeName, odbc::SQLDataTypes::Date, 0, 0};
+        return {typeName, QGRHanaDataTypes::Date, 0, 0};
     else if (EQUAL(typeName.c_str(), "TIME"))
-        return {typeName, odbc::SQLDataTypes::Time, 0, 0};
+        return {typeName, QGRHanaDataTypes::Time, 0, 0};
     else if (EQUAL(typeName.c_str(), "TIMESTAMP"))
-        return {typeName, odbc::SQLDataTypes::Timestamp, 0, 0};
+        return {typeName, QGRHanaDataTypes::Timestamp, 0, 0};
     else if (EQUAL(typeName.c_str(), "VARBINARY"))
     {
         switch (typeSize.size())
         {
             case 0:
-                return {typeName, odbc::SQLDataTypes::VarBinary, 1, 0};
+                return {typeName, QGRHanaDataTypes::VarBinary, 1, 0};
             case 1:
-                return {typeName, odbc::SQLDataTypes::VarBinary, typeSize[0],
-                        0};
+                return {typeName, QGRHanaDataTypes::VarBinary, typeSize[0], 0};
             case 2:
                 incorrectFormatErr();
-                return {"", odbc::SQLDataTypes::Unknown, 0, 0};
+                return {"", QGRHanaDataTypes::Unknown, 0, 0};
         }
     }
     else if (EQUAL(typeName.c_str(), "BLOB"))
-        return {typeName, odbc::SQLDataTypes::LongVarBinary, 0, 0};
+        return {typeName, QGRHanaDataTypes::LongVarBinary, 0, 0};
+    else if (EQUAL(typeName.c_str(), "REAL_VECTOR"))
+    {
+        switch (typeSize.size())
+        {
+            case 0:
+                return {typeName, QGRHanaDataTypes::RealVector, 1, 0};
+            case 1:
+                return {typeName, QGRHanaDataTypes::RealVector, typeSize[0], 0};
+            case 2:
+                incorrectFormatErr();
+                return {"", QGRHanaDataTypes::Unknown, 0, 0};
+        }
+    }
 
     CPLError(CE_Failure, CPLE_NotSupported, "Unknown column type '%s'.",
              typeName.c_str());
-    return {std::move(typeName), odbc::SQLDataTypes::Unknown, 0, 0};
+    return {std::move(typeName), QGRHanaDataTypes::Unknown, 0, 0};
 }
 
 CPLString GetColumnDefinition(const ColumnTypeInfo &typeInfo)
@@ -282,17 +278,17 @@ CPLString GetColumnDefinition(const ColumnTypeInfo &typeInfo)
     {
         switch (typeInfo.type)
         {
-            case odbc::SQLDataTypes::SmallInt:
+            case QGRHanaDataTypes::SmallInt:
                 return "SMALLINT ARRAY";
-            case odbc::SQLDataTypes::Integer:
+            case QGRHanaDataTypes::Integer:
                 return "INTEGER ARRAY";
-            case odbc::SQLDataTypes::BigInt:
+            case QGRHanaDataTypes::BigInt:
                 return "BIGINT ARRAY";
-            case odbc::SQLDataTypes::Real:
+            case QGRHanaDataTypes::Real:
                 return "REAL ARRAY";
-            case odbc::SQLDataTypes::Double:
+            case QGRHanaDataTypes::Double:
                 return "DOUBLE ARRAY";
-            case odbc::SQLDataTypes::WVarChar:
+            case QGRHanaDataTypes::WVarChar:
                 return "NVARCHAR(512) ARRAY";
             default:
                 return "UNKNOWN";
@@ -301,34 +297,35 @@ CPLString GetColumnDefinition(const ColumnTypeInfo &typeInfo)
 
     switch (typeInfo.type)
     {
-        case odbc::SQLDataTypes::Boolean:
-        case odbc::SQLDataTypes::TinyInt:
-        case odbc::SQLDataTypes::SmallInt:
-        case odbc::SQLDataTypes::Integer:
-        case odbc::SQLDataTypes::BigInt:
-        case odbc::SQLDataTypes::Float:
-        case odbc::SQLDataTypes::Real:
-        case odbc::SQLDataTypes::Double:
-        case odbc::SQLDataTypes::Date:
-        case odbc::SQLDataTypes::TypeDate:
-        case odbc::SQLDataTypes::Time:
-        case odbc::SQLDataTypes::TypeTime:
-        case odbc::SQLDataTypes::Timestamp:
-        case odbc::SQLDataTypes::TypeTimestamp:
-        case odbc::SQLDataTypes::Char:
-        case odbc::SQLDataTypes::WChar:
-        case odbc::SQLDataTypes::LongVarChar:
-        case odbc::SQLDataTypes::LongVarBinary:
+        case QGRHanaDataTypes::Boolean:
+        case QGRHanaDataTypes::TinyInt:
+        case QGRHanaDataTypes::SmallInt:
+        case QGRHanaDataTypes::Integer:
+        case QGRHanaDataTypes::BigInt:
+        case QGRHanaDataTypes::Float:
+        case QGRHanaDataTypes::Real:
+        case QGRHanaDataTypes::Double:
+        case QGRHanaDataTypes::Date:
+        case QGRHanaDataTypes::TypeDate:
+        case QGRHanaDataTypes::Time:
+        case QGRHanaDataTypes::TypeTime:
+        case QGRHanaDataTypes::Timestamp:
+        case QGRHanaDataTypes::TypeTimestamp:
+        case QGRHanaDataTypes::Char:
+        case QGRHanaDataTypes::WChar:
+        case QGRHanaDataTypes::LongVarChar:
+        case QGRHanaDataTypes::LongVarBinary:
             return typeInfo.name;
-        case odbc::SQLDataTypes::Decimal:
-        case odbc::SQLDataTypes::Numeric:
+        case QGRHanaDataTypes::Decimal:
+        case QGRHanaDataTypes::Numeric:
             return CPLString().Printf("DECIMAL(%d,%d)", typeInfo.width,
                                       typeInfo.precision);
-        case odbc::SQLDataTypes::VarChar:
-        case odbc::SQLDataTypes::WVarChar:
-        case odbc::SQLDataTypes::Binary:
-        case odbc::SQLDataTypes::VarBinary:
-        case odbc::SQLDataTypes::WLongVarChar:
+        case QGRHanaDataTypes::VarChar:
+        case QGRHanaDataTypes::WVarChar:
+        case QGRHanaDataTypes::Binary:
+        case QGRHanaDataTypes::VarBinary:
+        case QGRHanaDataTypes::WLongVarChar:
+        case QGRHanaDataTypes::RealVector:
             return (typeInfo.width == 0)
                        ? typeInfo.name
                        : CPLString().Printf("%s(%d)", typeInfo.name.c_str(),
@@ -345,58 +342,59 @@ void SetFieldDefn(OGRFieldDefn &field, const ColumnTypeInfo &typeInfo)
 
     switch (typeInfo.type)
     {
-        case odbc::SQLDataTypes::Bit:
-        case odbc::SQLDataTypes::Boolean:
+        case QGRHanaDataTypes::Bit:
+        case QGRHanaDataTypes::Boolean:
             field.SetType(OFTInteger);
             field.SetSubType(OFSTBoolean);
             break;
-        case odbc::SQLDataTypes::TinyInt:
-        case odbc::SQLDataTypes::SmallInt:
+        case QGRHanaDataTypes::TinyInt:
+        case QGRHanaDataTypes::SmallInt:
             field.SetType(isArray() ? OFTIntegerList : OFTInteger);
             field.SetSubType(OFSTInt16);
             break;
-        case odbc::SQLDataTypes::Integer:
+        case QGRHanaDataTypes::Integer:
             field.SetType(isArray() ? OFTIntegerList : OFTInteger);
             break;
-        case odbc::SQLDataTypes::BigInt:
+        case QGRHanaDataTypes::BigInt:
             field.SetType(isArray() ? OFTInteger64List : OFTInteger64);
             break;
-        case odbc::SQLDataTypes::Double:
-        case odbc::SQLDataTypes::Real:
-        case odbc::SQLDataTypes::Float:
+        case QGRHanaDataTypes::Double:
+        case QGRHanaDataTypes::Real:
+        case QGRHanaDataTypes::Float:
             field.SetType(isArray() ? OFTRealList : OFTReal);
-            if (typeInfo.type != odbc::SQLDataTypes::Double)
+            if (typeInfo.type != QGRHanaDataTypes::Double)
                 field.SetSubType(OFSTFloat32);
             break;
-        case odbc::SQLDataTypes::Decimal:
-        case odbc::SQLDataTypes::Numeric:
+        case QGRHanaDataTypes::Decimal:
+        case QGRHanaDataTypes::Numeric:
             field.SetType(isArray() ? OFTRealList : OFTReal);
             break;
-        case odbc::SQLDataTypes::Char:
-        case odbc::SQLDataTypes::VarChar:
-        case odbc::SQLDataTypes::LongVarChar:
+        case QGRHanaDataTypes::Char:
+        case QGRHanaDataTypes::VarChar:
+        case QGRHanaDataTypes::LongVarChar:
             field.SetType(isArray() ? OFTStringList : OFTString);
             break;
-        case odbc::SQLDataTypes::WChar:
-        case odbc::SQLDataTypes::WVarChar:
-        case odbc::SQLDataTypes::WLongVarChar:
+        case QGRHanaDataTypes::WChar:
+        case QGRHanaDataTypes::WVarChar:
+        case QGRHanaDataTypes::WLongVarChar:
             field.SetType(isArray() ? OFTStringList : OFTString);
             break;
-        case odbc::SQLDataTypes::Date:
-        case odbc::SQLDataTypes::TypeDate:
+        case QGRHanaDataTypes::Date:
+        case QGRHanaDataTypes::TypeDate:
             field.SetType(OFTDate);
             break;
-        case odbc::SQLDataTypes::Time:
-        case odbc::SQLDataTypes::TypeTime:
+        case QGRHanaDataTypes::Time:
+        case QGRHanaDataTypes::TypeTime:
             field.SetType(OFTTime);
             break;
-        case odbc::SQLDataTypes::Timestamp:
-        case odbc::SQLDataTypes::TypeTimestamp:
+        case QGRHanaDataTypes::Timestamp:
+        case QGRHanaDataTypes::TypeTimestamp:
             field.SetType(OFTDateTime);
             break;
-        case odbc::SQLDataTypes::Binary:
-        case odbc::SQLDataTypes::VarBinary:
-        case odbc::SQLDataTypes::LongVarBinary:
+        case QGRHanaDataTypes::Binary:
+        case QGRHanaDataTypes::VarBinary:
+        case QGRHanaDataTypes::LongVarBinary:
+        case QGRHanaDataTypes::RealVector:
             field.SetType(OFTBinary);
             break;
         default:
@@ -659,7 +657,7 @@ OGRErr OGRHanaTableLayer::SetStatementParameters(
 
             switch (clmDesc.type)
             {
-                case odbc::SQLDataTypes::Integer:
+                case QGRHanaDataTypes::Integer:
                     if (feature->GetFID() == OGRNullFID)
                         statement.setInt(paramIndex, odbc::Int());
                     else
@@ -682,7 +680,7 @@ OGRErr OGRHanaTableLayer::SetStatementParameters(
                                              feature->GetFID())));
                     }
                     break;
-                case odbc::SQLDataTypes::BigInt:
+                case QGRHanaDataTypes::BigInt:
                     if (feature->GetFID() == OGRNullFID)
                         statement.setLong(paramIndex, odbc::Long());
                     else
@@ -707,12 +705,12 @@ OGRErr OGRHanaTableLayer::SetStatementParameters(
 
         switch (clmDesc.type)
         {
-            case odbc::SQLDataTypes::Bit:
-            case odbc::SQLDataTypes::Boolean:
+            case QGRHanaDataTypes::Bit:
+            case QGRHanaDataTypes::Boolean:
                 statement.setBoolean(paramIndex,
                                      featReader.GetFieldAsBoolean(fieldIndex));
                 break;
-            case odbc::SQLDataTypes::TinyInt:
+            case QGRHanaDataTypes::TinyInt:
                 if (clmDesc.isArray)
                     statement.setString(
                         paramIndex, featReader.GetFieldAsIntArray(fieldIndex));
@@ -720,7 +718,7 @@ OGRErr OGRHanaTableLayer::SetStatementParameters(
                     statement.setByte(paramIndex,
                                       featReader.GetFieldAsByte(fieldIndex));
                 break;
-            case odbc::SQLDataTypes::SmallInt:
+            case QGRHanaDataTypes::SmallInt:
                 if (clmDesc.isArray)
                     statement.setString(
                         paramIndex, featReader.GetFieldAsIntArray(fieldIndex));
@@ -728,7 +726,7 @@ OGRErr OGRHanaTableLayer::SetStatementParameters(
                     statement.setShort(paramIndex,
                                        featReader.GetFieldAsShort(fieldIndex));
                 break;
-            case odbc::SQLDataTypes::Integer:
+            case QGRHanaDataTypes::Integer:
                 if (clmDesc.isArray)
                     statement.setString(
                         paramIndex, featReader.GetFieldAsIntArray(fieldIndex));
@@ -736,7 +734,7 @@ OGRErr OGRHanaTableLayer::SetStatementParameters(
                     statement.setInt(paramIndex,
                                      featReader.GetFieldAsInt(fieldIndex));
                 break;
-            case odbc::SQLDataTypes::BigInt:
+            case QGRHanaDataTypes::BigInt:
                 if (clmDesc.isArray)
                     statement.setString(
                         paramIndex,
@@ -745,8 +743,8 @@ OGRErr OGRHanaTableLayer::SetStatementParameters(
                     statement.setLong(paramIndex,
                                       featReader.GetFieldAsLong(fieldIndex));
                 break;
-            case odbc::SQLDataTypes::Float:
-            case odbc::SQLDataTypes::Real:
+            case QGRHanaDataTypes::Float:
+            case QGRHanaDataTypes::Real:
                 if (clmDesc.isArray)
                     statement.setString(
                         paramIndex, featReader.GetFieldAsRealArray(fieldIndex));
@@ -754,7 +752,7 @@ OGRErr OGRHanaTableLayer::SetStatementParameters(
                     statement.setFloat(paramIndex,
                                        featReader.GetFieldAsFloat(fieldIndex));
                 break;
-            case odbc::SQLDataTypes::Double:
+            case QGRHanaDataTypes::Double:
                 if (clmDesc.isArray)
                     statement.setString(
                         paramIndex,
@@ -763,8 +761,8 @@ OGRErr OGRHanaTableLayer::SetStatementParameters(
                     statement.setDouble(
                         paramIndex, featReader.GetFieldAsDouble(fieldIndex));
                 break;
-            case odbc::SQLDataTypes::Decimal:
-            case odbc::SQLDataTypes::Numeric:
+            case QGRHanaDataTypes::Decimal:
+            case QGRHanaDataTypes::Numeric:
                 if ((!feature->IsFieldSet(fieldIndex) ||
                      feature->IsFieldNull(fieldIndex)) &&
                     feature->GetFieldDefnRef(fieldIndex)->GetDefault() ==
@@ -774,9 +772,9 @@ OGRErr OGRHanaTableLayer::SetStatementParameters(
                     statement.setDouble(
                         paramIndex, featReader.GetFieldAsDouble(fieldIndex));
                 break;
-            case odbc::SQLDataTypes::Char:
-            case odbc::SQLDataTypes::VarChar:
-            case odbc::SQLDataTypes::LongVarChar:
+            case QGRHanaDataTypes::Char:
+            case QGRHanaDataTypes::VarChar:
+            case QGRHanaDataTypes::LongVarChar:
                 if (clmDesc.isArray)
                     statement.setString(
                         paramIndex,
@@ -786,9 +784,9 @@ OGRErr OGRHanaTableLayer::SetStatementParameters(
                                         featReader.GetFieldAsString(
                                             fieldIndex, clmDesc.length));
                 break;
-            case odbc::SQLDataTypes::WChar:
-            case odbc::SQLDataTypes::WVarChar:
-            case odbc::SQLDataTypes::WLongVarChar:
+            case QGRHanaDataTypes::WChar:
+            case QGRHanaDataTypes::WVarChar:
+            case QGRHanaDataTypes::WLongVarChar:
                 if (clmDesc.isArray)
                     statement.setString(
                         paramIndex,
@@ -798,26 +796,27 @@ OGRErr OGRHanaTableLayer::SetStatementParameters(
                                         featReader.GetFieldAsNString(
                                             fieldIndex, clmDesc.length));
                 break;
-            case odbc::SQLDataTypes::Binary:
-            case odbc::SQLDataTypes::VarBinary:
-            case odbc::SQLDataTypes::LongVarBinary:
+            case QGRHanaDataTypes::Binary:
+            case QGRHanaDataTypes::VarBinary:
+            case QGRHanaDataTypes::LongVarBinary:
+            case QGRHanaDataTypes::RealVector:
             {
                 Binary bin = featReader.GetFieldAsBinary(fieldIndex);
                 statement.setBytes(paramIndex, bin.data, bin.size);
             }
             break;
-            case odbc::SQLDataTypes::DateTime:
-            case odbc::SQLDataTypes::TypeDate:
+            case QGRHanaDataTypes::DateTime:
+            case QGRHanaDataTypes::TypeDate:
                 statement.setDate(paramIndex,
                                   featReader.GetFieldAsDate(fieldIndex));
                 break;
-            case odbc::SQLDataTypes::Time:
-            case odbc::SQLDataTypes::TypeTime:
+            case QGRHanaDataTypes::Time:
+            case QGRHanaDataTypes::TypeTime:
                 statement.setTime(paramIndex,
                                   featReader.GetFieldAsTime(fieldIndex));
                 break;
-            case odbc::SQLDataTypes::Timestamp:
-            case odbc::SQLDataTypes::TypeTimestamp:
+            case QGRHanaDataTypes::Timestamp:
+            case QGRHanaDataTypes::TypeTimestamp:
                 statement.setTimestamp(
                     paramIndex, featReader.GetFieldAsTimestamp(fieldIndex));
                 break;
@@ -955,98 +954,97 @@ OGRHanaTableLayer::GetColumnTypeInfo(const OGRFieldDefn &field) const
         case OFTInteger:
             if (preservePrecision_ && field.GetWidth() > 10)
             {
-                return {"DECIMAL", odbc::SQLDataTypes::Decimal,
-                        field.GetWidth(), 0};
+                return {"DECIMAL", QGRHanaDataTypes::Decimal, field.GetWidth(),
+                        0};
             }
             else
             {
                 if (field.GetSubType() == OFSTBoolean)
-                    return {"BOOLEAN", odbc::SQLDataTypes::Boolean,
+                    return {"BOOLEAN", QGRHanaDataTypes::Boolean,
                             field.GetWidth(), 0};
                 else if (field.GetSubType() == OFSTInt16)
-                    return {"SMALLINT", odbc::SQLDataTypes::SmallInt,
+                    return {"SMALLINT", QGRHanaDataTypes::SmallInt,
                             field.GetWidth(), 0};
                 else
-                    return {"INTEGER", odbc::SQLDataTypes::Integer,
+                    return {"INTEGER", QGRHanaDataTypes::Integer,
                             field.GetWidth(), 0};
             }
             break;
         case OFTInteger64:
             if (preservePrecision_ && field.GetWidth() > 20)
             {
-                return {"DECIMAL", odbc::SQLDataTypes::Decimal,
-                        field.GetWidth(), 0};
+                return {"DECIMAL", QGRHanaDataTypes::Decimal, field.GetWidth(),
+                        0};
             }
             else
-                return {"BIGINT", odbc::SQLDataTypes::BigInt, field.GetWidth(),
+                return {"BIGINT", QGRHanaDataTypes::BigInt, field.GetWidth(),
                         0};
             break;
         case OFTReal:
             if (preservePrecision_ && field.GetWidth() != 0)
             {
-                return {"DECIMAL", odbc::SQLDataTypes::Decimal,
-                        field.GetWidth(), field.GetPrecision()};
+                return {"DECIMAL", QGRHanaDataTypes::Decimal, field.GetWidth(),
+                        field.GetPrecision()};
             }
             else
             {
                 if (field.GetSubType() == OFSTFloat32)
-                    return {"REAL", odbc::SQLDataTypes::Real, field.GetWidth(),
+                    return {"REAL", QGRHanaDataTypes::Real, field.GetWidth(),
                             field.GetPrecision()};
                 else
-                    return {"DOUBLE", odbc::SQLDataTypes::Double,
+                    return {"DOUBLE", QGRHanaDataTypes::Double,
                             field.GetWidth(), field.GetPrecision()};
             }
         case OFTString:
             if (field.GetWidth() == 0 || !preservePrecision_)
             {
                 int width = static_cast<int>(defaultStringSize_);
-                return {"NVARCHAR", odbc::SQLDataTypes::WLongVarChar, width, 0};
+                return {"NVARCHAR", QGRHanaDataTypes::WLongVarChar, width, 0};
             }
             else
             {
-                if (field.GetWidth() <= 5000)
-                    return {"NVARCHAR", odbc::SQLDataTypes::WLongVarChar,
+                if (field.GetWidth() >= 1 && field.GetWidth() <= 5000)
+                    return {"NVARCHAR", QGRHanaDataTypes::WLongVarChar,
                             field.GetWidth(), 0};
                 else
-                    return {"NCLOB", odbc::SQLDataTypes::WLongVarChar, 0, 0};
+                    return {"NCLOB", QGRHanaDataTypes::WLongVarChar, 0, 0};
             }
         case OFTBinary:
-            if (field.GetWidth() <= 5000)
-                return {"VARBINARY", odbc::SQLDataTypes::VarBinary,
+            if (field.GetWidth() >= 1 && field.GetWidth() <= 5000)
+                return {"VARBINARY", QGRHanaDataTypes::VarBinary,
                         field.GetWidth(), 0};
             else
-                return {"BLOB", odbc::SQLDataTypes::LongVarBinary,
+                return {"BLOB", QGRHanaDataTypes::LongVarBinary,
                         field.GetWidth(), 0};
         case OFTDate:
-            return {"DATE", odbc::SQLDataTypes::TypeDate, field.GetWidth(), 0};
+            return {"DATE", QGRHanaDataTypes::TypeDate, field.GetWidth(), 0};
         case OFTTime:
-            return {"TIME", odbc::SQLDataTypes::TypeTime, field.GetWidth(), 0};
+            return {"TIME", QGRHanaDataTypes::TypeTime, field.GetWidth(), 0};
         case OFTDateTime:
-            return {"TIMESTAMP", odbc::SQLDataTypes::TypeTimestamp,
+            return {"TIMESTAMP", QGRHanaDataTypes::TypeTimestamp,
                     field.GetWidth(), 0};
         case OFTIntegerList:
             if (field.GetSubType() == OGRFieldSubType::OFSTInt16)
-                return {"ARRAY", odbc::SQLDataTypes::SmallInt, field.GetWidth(),
+                return {"ARRAY", QGRHanaDataTypes::SmallInt, field.GetWidth(),
                         0};
             else
-                return {"ARRAY", odbc::SQLDataTypes::Integer, field.GetWidth(),
+                return {"ARRAY", QGRHanaDataTypes::Integer, field.GetWidth(),
                         0};
         case OFTInteger64List:
-            return {"ARRAY", odbc::SQLDataTypes::BigInt, field.GetWidth(), 0};
+            return {"ARRAY", QGRHanaDataTypes::BigInt, field.GetWidth(), 0};
         case OFTRealList:
             if (field.GetSubType() == OGRFieldSubType::OFSTFloat32)
-                return {"ARRAY", odbc::SQLDataTypes::Real, field.GetWidth(), 0};
+                return {"ARRAY", QGRHanaDataTypes::Real, field.GetWidth(), 0};
             else
-                return {"ARRAY", odbc::SQLDataTypes::Double, field.GetWidth(),
-                        0};
+                return {"ARRAY", QGRHanaDataTypes::Double, field.GetWidth(), 0};
             break;
         case OFTStringList:
-            return {"ARRAY", odbc::SQLDataTypes::WVarChar, 512, 0};
+            return {"ARRAY", QGRHanaDataTypes::WVarChar, 512, 0};
         default:
             break;
     }
 
-    return {"", odbc::SQLDataTypes::Unknown, 0, 0};
+    return {"", QGRHanaDataTypes::Unknown, 0, 0};
 }
 
 /* -------------------------------------------------------------------- */
@@ -1135,7 +1133,7 @@ int OGRHanaTableLayer::TestCapability(const char *capabilities)
     if (EQUAL(capabilities, OLCFastGetExtent))
     {
         EnsureInitialized();
-        return !geomColumns_.empty();
+        return IsFastExtentAvailable();
     }
     if (EQUAL(capabilities, OLCCreateField))
         return updateMode_;
@@ -1446,7 +1444,7 @@ OGRErr OGRHanaTableLayer::CreateField(const OGRFieldDefn *srsField,
     ColumnTypeInfo columnTypeInfo = GetColumnTypeInfo(dstField);
     CPLString columnDef = GetColumnDefinition(columnTypeInfo);
 
-    if (columnTypeInfo.type == odbc::SQLDataTypes::Unknown)
+    if (columnTypeInfo.type == QGRHanaDataTypes::Unknown)
     {
         if (columnTypeInfo.name.empty())
             return OGRERR_FAILURE;
@@ -1481,7 +1479,8 @@ OGRErr OGRHanaTableLayer::CreateField(const OGRFieldDefn *srsField,
     if (dstField.GetDefault() != nullptr && !dstField.IsDefaultDriverSpecific())
     {
         if (IsArrayField(dstField.GetType()) ||
-            columnTypeInfo.type == odbc::SQLDataTypes::LongVarBinary)
+            columnTypeInfo.type == QGRHanaDataTypes::LongVarBinary ||
+            columnTypeInfo.type == QGRHanaDataTypes::RealVector)
         {
             CPLError(
                 CE_Failure, CPLE_NotSupported,
diff --git a/ogr/ogrsf_frmts/hana/ogrhanautils.cpp b/ogr/ogrsf_frmts/hana/ogrhanautils.cpp
index 9fbf6e402f45..0ba253e4a693 100644
--- a/ogr/ogrsf_frmts/hana/ogrhanautils.cpp
+++ b/ogr/ogrsf_frmts/hana/ogrhanautils.cpp
@@ -7,32 +7,29 @@
  ******************************************************************************
  * Copyright (c) 2020, SAP SE
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrhanautils.h"
+#include "cpl_string.h"
 
 #include <algorithm>
 
 namespace OGRHANA
 {
 
+HanaVersion HanaVersion::fromString(const char *version)
+{
+    CPLString splVersion(version);
+    splVersion.replaceAll('-', '.').replaceAll(' ', '.');
+
+    const CPLStringList parts(CSLTokenizeString2(splVersion, ".", 0));
+    if (parts.size() < 3)
+        return HanaVersion(0, 0, 0);
+
+    return HanaVersion(atoi(parts[0]), atoi(parts[1]), atoi(parts[2]));
+}
+
 const char *SkipLeadingSpaces(const char *value)
 {
     while (*value == ' ')
diff --git a/ogr/ogrsf_frmts/hana/ogrhanautils.h b/ogr/ogrsf_frmts/hana/ogrhanautils.h
index c064a7bbb7ac..757191403f32 100644
--- a/ogr/ogrsf_frmts/hana/ogrhanautils.h
+++ b/ogr/ogrsf_frmts/hana/ogrhanautils.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2020, SAP SE
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRHANAUTILS_H_INCLUDED
@@ -42,6 +26,63 @@ namespace OGRHANA
 
 constexpr const char *ARRAY_VALUES_DELIMITER = "^%^";
 
+class HanaVersion
+{
+
+  public:
+    explicit HanaVersion(unsigned int major, unsigned int minor,
+                         unsigned int patch)
+        : components_{major, minor, patch}
+    {
+    }
+
+    HanaVersion() : components_{0, 0, 0}
+    {
+    }
+
+    unsigned int major() const
+    {
+        return components_[0];
+    }
+
+    unsigned int minor() const
+    {
+        return components_[1];
+    }
+
+    unsigned int patch() const
+    {
+        return components_[2];
+    }
+
+    bool operator<=(const HanaVersion &other)
+    {
+        for (size_t i = 0; i < 3; ++i)
+            if (components_[i] != other.components_[i])
+                return components_[i] < other.components_[i];
+        return true;
+    }
+
+    bool operator>=(const HanaVersion &other)
+    {
+        return !(*this <= other) || (*this == other);
+    }
+
+    bool operator==(const HanaVersion &other)
+    {
+        for (size_t i = 0; i < 3; ++i)
+            if (components_[i] != other.components_[i])
+                return false;
+        return true;
+    }
+
+  public:
+    static HanaVersion fromString(const char *str);
+
+  private:
+    unsigned int components_[3];
+};
+
 const char *SkipLeadingSpaces(const char *value);
 CPLString JoinStrings(const std::vector<CPLString> &strs, const char *delimiter,
                       CPLString (*decorator)(const CPLString &str) = nullptr);
diff --git a/ogr/ogrsf_frmts/idb/idb_headers.h b/ogr/ogrsf_frmts/idb/idb_headers.h
index 58e8a9794cf6..01ee11fb67d0 100644
--- a/ogr/ogrsf_frmts/idb/idb_headers.h
+++ b/ogr/ogrsf_frmts/idb/idb_headers.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2020, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef IDB_HEADERS_H
diff --git a/ogr/ogrsf_frmts/idb/ogr_idb.h b/ogr/ogrsf_frmts/idb/ogr_idb.h
index dcad5dba3e41..db462cfbcbfd 100644
--- a/ogr/ogrsf_frmts/idb/ogr_idb.h
+++ b/ogr/ogrsf_frmts/idb/ogr_idb.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2006, Oleg Semykin
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_IDB_H_INCLUDED_
@@ -169,13 +153,11 @@ class OGRIDBSelectLayer final : public OGRIDBLayer
 /*                           OGRIDBDataSource                          */
 /************************************************************************/
 
-class OGRIDBDataSource final : public OGRDataSource
+class OGRIDBDataSource final : public GDALDataset
 {
     OGRIDBLayer **papoLayers;
     int nLayers;
 
-    char *pszName;
-
     int bDSUpdate;
     ITConnection *poConn;
 
@@ -187,11 +169,6 @@ class OGRIDBDataSource final : public OGRDataSource
     int OpenTable(const char *pszTableName, const char *pszGeomCol,
                   int bUpdate);
 
-    const char *GetName() override
-    {
-        return pszName;
-    }
-
     int GetLayerCount() override
     {
         return nLayers;
diff --git a/ogr/ogrsf_frmts/idb/ogridbdatasource.cpp b/ogr/ogrsf_frmts/idb/ogridbdatasource.cpp
index 4accf221278a..4a1d5322d180 100644
--- a/ogr/ogrsf_frmts/idb/ogridbdatasource.cpp
+++ b/ogr/ogrsf_frmts/idb/ogridbdatasource.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2006, Oleg Semykin
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_idb.h"
@@ -38,7 +22,6 @@
 OGRIDBDataSource::OGRIDBDataSource()
 
 {
-    pszName = nullptr;
     papoLayers = nullptr;
     nLayers = 0;
     poConn = nullptr;
@@ -54,8 +37,6 @@ OGRIDBDataSource::~OGRIDBDataSource()
 {
     int i;
 
-    CPLFree(pszName);
-
     for (i = 0; i < nLayers; i++)
         delete papoLayers[i];
 
@@ -137,8 +118,6 @@ int OGRIDBDataSource::Open(const char *pszNewName, int bUpdate,
         return FALSE;
     }
 
-    pszName = CPLStrdup(pszNewName);
-
     bDSUpdate = bUpdate;
 
     /* -------------------------------------------------------------------- */
@@ -283,8 +262,8 @@ OGRLayer *OGRIDBDataSource::ExecuteSQL(const char *pszSQLCommand,
     /*      Use generic implementation for recognized dialects              */
     /* -------------------------------------------------------------------- */
     if (IsGenericSQLDialect(pszDialect))
-        return OGRDataSource::ExecuteSQL(pszSQLCommand, poSpatialFilter,
-                                         pszDialect);
+        return GDALDataset::ExecuteSQL(pszSQLCommand, poSpatialFilter,
+                                       pszDialect);
 
     /* -------------------------------------------------------------------- */
     /*      Execute statement.                                              */
diff --git a/ogr/ogrsf_frmts/idb/ogridbdriver.cpp b/ogr/ogrsf_frmts/idb/ogridbdriver.cpp
index 5628cb22cbe4..50b93bafa7c9 100644
--- a/ogr/ogrsf_frmts/idb/ogridbdriver.cpp
+++ b/ogr/ogrsf_frmts/idb/ogridbdriver.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2006, Oleg Semykin
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_idb.h"
diff --git a/ogr/ogrsf_frmts/idb/ogridbdrivercore.cpp b/ogr/ogrsf_frmts/idb/ogridbdrivercore.cpp
index 476b900f311a..0178f0f6b8f7 100644
--- a/ogr/ogrsf_frmts/idb/ogridbdrivercore.cpp
+++ b/ogr/ogrsf_frmts/idb/ogridbdrivercore.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2006, Oleg Semykin
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
diff --git a/ogr/ogrsf_frmts/idb/ogridbdrivercore.h b/ogr/ogrsf_frmts/idb/ogridbdrivercore.h
index b7dea816d421..fcd395825c2e 100644
--- a/ogr/ogrsf_frmts/idb/ogridbdrivercore.h
+++ b/ogr/ogrsf_frmts/idb/ogridbdrivercore.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2006, Oleg Semykin
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRIDBDRIVERCORE_H
diff --git a/ogr/ogrsf_frmts/idb/ogridblayer.cpp b/ogr/ogrsf_frmts/idb/ogridblayer.cpp
index dd69f53342e7..141bea76f577 100644
--- a/ogr/ogrsf_frmts/idb/ogridblayer.cpp
+++ b/ogr/ogrsf_frmts/idb/ogridblayer.cpp
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2006, Oleg Semykin
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/idb/ogridbselectlayer.cpp b/ogr/ogrsf_frmts/idb/ogridbselectlayer.cpp
index 1421fa2d0062..d7faf8222d60 100644
--- a/ogr/ogrsf_frmts/idb/ogridbselectlayer.cpp
+++ b/ogr/ogrsf_frmts/idb/ogridbselectlayer.cpp
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2006, Oleg Semykin
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/idb/ogridbtablelayer.cpp b/ogr/ogrsf_frmts/idb/ogridbtablelayer.cpp
index bedc1aa4c97d..915d55a04334 100644
--- a/ogr/ogrsf_frmts/idb/ogridbtablelayer.cpp
+++ b/ogr/ogrsf_frmts/idb/ogridbtablelayer.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2006, Oleg Semykin
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/idrisi/generate_test_files.c b/ogr/ogrsf_frmts/idrisi/generate_test_files.c
index 4f54b0f46c4b..75aa7b48dfbe 100644
--- a/ogr/ogrsf_frmts/idrisi/generate_test_files.c
+++ b/ogr/ogrsf_frmts/idrisi/generate_test_files.c
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <stdio.h>
diff --git a/ogr/ogrsf_frmts/idrisi/ogr_idrisi.h b/ogr/ogrsf_frmts/idrisi/ogr_idrisi.h
index 5b4e25321e04..3ecceba11628 100644
--- a/ogr/ogrsf_frmts/idrisi/ogr_idrisi.h
+++ b/ogr/ogrsf_frmts/idrisi/ogr_idrisi.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2011-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_IDRISI_H_INCLUDED
@@ -95,12 +79,10 @@ class OGRIdrisiLayer final : public OGRLayer,
 /*                        OGRIdrisiDataSource                           */
 /************************************************************************/
 
-class OGRIdrisiDataSource final : public OGRDataSource
+class OGRIdrisiDataSource final : public GDALDataset
 {
-    char *pszName;
-
-    OGRLayer **papoLayers;
-    int nLayers;
+    OGRLayer **papoLayers = nullptr;
+    int nLayers = 0;
 
   public:
     OGRIdrisiDataSource();
@@ -108,33 +90,12 @@ class OGRIdrisiDataSource final : public OGRDataSource
 
     int Open(const char *pszFilename);
 
-    virtual const char *GetName() override
-    {
-        return pszName;
-    }
-
     virtual int GetLayerCount() override
     {
         return nLayers;
     }
 
     virtual OGRLayer *GetLayer(int) override;
-
-    virtual int TestCapability(const char *) override;
-};
-
-/************************************************************************/
-/*                         OGRIdrisiDriver                              */
-/************************************************************************/
-
-class OGRIdrisiDriver final : public OGRSFDriver
-{
-  public:
-    virtual ~OGRIdrisiDriver();
-
-    virtual const char *GetName() override;
-    virtual OGRDataSource *Open(const char *, int) override;
-    virtual int TestCapability(const char *) override;
 };
 
 #endif  // ndef OGR_IDRISI_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/idrisi/ogridrisidatasource.cpp b/ogr/ogrsf_frmts/idrisi/ogridrisidatasource.cpp
index 4659f1c87991..9e8c7e0b9747 100644
--- a/ogr/ogrsf_frmts/idrisi/ogridrisidatasource.cpp
+++ b/ogr/ogrsf_frmts/idrisi/ogridrisidatasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
@@ -35,10 +19,7 @@
 /*                        OGRIdrisiDataSource()                         */
 /************************************************************************/
 
-OGRIdrisiDataSource::OGRIdrisiDataSource()
-    : pszName(nullptr), papoLayers(nullptr), nLayers(0)
-{
-}
+OGRIdrisiDataSource::OGRIdrisiDataSource() = default;
 
 /************************************************************************/
 /*                       ~OGRIdrisiDataSource()                         */
@@ -47,21 +28,11 @@ OGRIdrisiDataSource::OGRIdrisiDataSource()
 OGRIdrisiDataSource::~OGRIdrisiDataSource()
 
 {
-    CPLFree(pszName);
     for (int i = 0; i < nLayers; i++)
         delete papoLayers[i];
     CPLFree(papoLayers);
 }
 
-/************************************************************************/
-/*                           TestCapability()                           */
-/************************************************************************/
-
-int OGRIdrisiDataSource::TestCapability(const char * /* pszCap */)
-{
-    return FALSE;
-}
-
 /************************************************************************/
 /*                              GetLayer()                              */
 /************************************************************************/
@@ -82,8 +53,6 @@ OGRLayer *OGRIdrisiDataSource::GetLayer(int iLayer)
 int OGRIdrisiDataSource::Open(const char *pszFilename)
 
 {
-    pszName = CPLStrdup(pszFilename);
-
     VSILFILE *fpVCT = VSIFOpenL(pszFilename, "rb");
     if (fpVCT == nullptr)
         return FALSE;
diff --git a/ogr/ogrsf_frmts/idrisi/ogridrisidriver.cpp b/ogr/ogrsf_frmts/idrisi/ogridrisidriver.cpp
index ff9cc5410031..f2ede08b4700 100644
--- a/ogr/ogrsf_frmts/idrisi/ogridrisidriver.cpp
+++ b/ogr/ogrsf_frmts/idrisi/ogridrisidriver.cpp
@@ -8,59 +8,21 @@
  ******************************************************************************
  * Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
 #include "ogr_idrisi.h"
 #include "ogrsf_frmts.h"
 
-// g++ ogr/ogrsf_frmts/idrisi/*.cpp -Wall -g -fPIC -shared -o ogr_Idrisi.so
-// -Iport -Igcore -Iogr -Iogr/ogrsf_frmts/idrisi -Iogr/ogrsf_frmts
-// -Ifrmts/idrisi
-
-/************************************************************************/
-/*                       ~OGRIdrisiDriver()                         */
-/************************************************************************/
-
-OGRIdrisiDriver::~OGRIdrisiDriver()
-{
-}
-
-/************************************************************************/
-/*                              GetName()                               */
-/************************************************************************/
-
-const char *OGRIdrisiDriver::GetName()
-
-{
-    return "Idrisi";
-}
-
 /************************************************************************/
 /*                                Open()                                */
 /************************************************************************/
 
-OGRDataSource *OGRIdrisiDriver::Open(const char *pszFilename, int bUpdate)
+static GDALDataset *OGRIdrisiOpen(GDALOpenInfo *poOpenInfo)
 
 {
-    if (bUpdate)
+    if (poOpenInfo->eAccess == GA_Update)
     {
         return nullptr;
     }
@@ -68,31 +30,21 @@ OGRDataSource *OGRIdrisiDriver::Open(const char *pszFilename, int bUpdate)
     // --------------------------------------------------------------------
     //      Does this appear to be a .vct file?
     // --------------------------------------------------------------------
-    if (!EQUAL(CPLGetExtension(pszFilename), "vct"))
+    if (!EQUAL(CPLGetExtension(poOpenInfo->pszFilename), "vct"))
         return nullptr;
 
-    OGRIdrisiDataSource *poDS = new OGRIdrisiDataSource();
+    auto poDS = std::make_unique<OGRIdrisiDataSource>();
 
-    if (!poDS->Open(pszFilename))
+    if (!poDS->Open(poOpenInfo->pszFilename))
     {
-        delete poDS;
-        poDS = nullptr;
+        return nullptr;
     }
 
-    return poDS;
-}
-
-/************************************************************************/
-/*                           TestCapability()                           */
-/************************************************************************/
-
-int OGRIdrisiDriver::TestCapability(const char * /* pszCap */)
-{
-    return FALSE;
+    return poDS.release();
 }
 
 /************************************************************************/
-/*                        RegisterOGRIdrisi()                       */
+/*                        RegisterOGRIdrisi()                           */
 /************************************************************************/
 
 void RegisterOGRIdrisi()
@@ -101,9 +53,12 @@ void RegisterOGRIdrisi()
     if (GDALGetDriverByName("Idrisi") != nullptr)
         return;
 
-    OGRSFDriver *poDriver = new OGRIdrisiDriver;
+    GDALDriver *poDriver = new GDALDriver();
+    poDriver->SetDescription("Idrisi");
     poDriver->SetMetadataItem(GDAL_DMD_LONGNAME, "Idrisi Vector (.vct)");
     poDriver->SetMetadataItem(GDAL_DMD_EXTENSION, "vct");
+    poDriver->SetMetadataItem(GDAL_DCAP_VECTOR, "YES");
     poDriver->SetMetadataItem(GDAL_DCAP_VIRTUALIO, "YES");
-    OGRSFDriverRegistrar::GetRegistrar()->RegisterDriver(poDriver);
+    poDriver->pfnOpen = OGRIdrisiOpen;
+    GetGDALDriverManager()->RegisterDriver(poDriver);
 }
diff --git a/ogr/ogrsf_frmts/idrisi/ogridrisilayer.cpp b/ogr/ogrsf_frmts/idrisi/ogridrisilayer.cpp
index ef061b4d36cc..e410293c63da 100644
--- a/ogr/ogrsf_frmts/idrisi/ogridrisilayer.cpp
+++ b/ogr/ogrsf_frmts/idrisi/ogridrisilayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/ili/ili1reader.cpp b/ogr/ogrsf_frmts/ili/ili1reader.cpp
index 6ab5ad404ad5..83f0b3d6c7ef 100644
--- a/ogr/ogrsf_frmts/ili/ili1reader.cpp
+++ b/ogr/ogrsf_frmts/ili/ili1reader.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2004, Pirmin Kalberer, Sourcepole AG
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/ili/ili1reader.h b/ogr/ogrsf_frmts/ili/ili1reader.h
index e65c26683a0f..46157ad7f5cd 100644
--- a/ogr/ogrsf_frmts/ili/ili1reader.h
+++ b/ogr/ogrsf_frmts/ili/ili1reader.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2004, Pirmin Kalberer, Sourcepole AG
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_ILI1READER_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/ili/ili1readerp.h b/ogr/ogrsf_frmts/ili/ili1readerp.h
index 9b74791ea1d9..491c6b85ac2b 100644
--- a/ogr/ogrsf_frmts/ili/ili1readerp.h
+++ b/ogr/ogrsf_frmts/ili/ili1readerp.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2004, Pirmin Kalberer, Sourcepole AG
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_ILI1READERP_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/ili/ili2handler.cpp b/ogr/ogrsf_frmts/ili/ili2handler.cpp
index 591f3d6a9fe4..d1ba362e535e 100644
--- a/ogr/ogrsf_frmts/ili/ili2handler.cpp
+++ b/ogr/ogrsf_frmts/ili/ili2handler.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2004, Pirmin Kalberer, Sourcepole AG
  * Copyright (c) 2008, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/ili/ili2reader.cpp b/ogr/ogrsf_frmts/ili/ili2reader.cpp
index 577c06217572..a55b85b6a4b2 100644
--- a/ogr/ogrsf_frmts/ili/ili2reader.cpp
+++ b/ogr/ogrsf_frmts/ili/ili2reader.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2004, Pirmin Kalberer, Sourcepole AG
  * Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ili2readerp.h"
diff --git a/ogr/ogrsf_frmts/ili/ili2reader.h b/ogr/ogrsf_frmts/ili/ili2reader.h
index b8775be85444..8e0027cb584d 100644
--- a/ogr/ogrsf_frmts/ili/ili2reader.h
+++ b/ogr/ogrsf_frmts/ili/ili2reader.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2004, Pirmin Kalberer, Sourcepole AG
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_ILI2READER_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/ili/ili2readerp.h b/ogr/ogrsf_frmts/ili/ili2readerp.h
index 11423737cad1..bd8c5fd81815 100644
--- a/ogr/ogrsf_frmts/ili/ili2readerp.h
+++ b/ogr/ogrsf_frmts/ili/ili2readerp.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2004, Pirmin Kalberer, Sourcepole AG
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_ILI2READERP_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/ili/imdreader.cpp b/ogr/ogrsf_frmts/ili/imdreader.cpp
index 02a3b387947a..4faaa902a7c4 100644
--- a/ogr/ogrsf_frmts/ili/imdreader.cpp
+++ b/ogr/ogrsf_frmts/ili/imdreader.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Pirmin Kalberer, Sourcepole AG
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 // IlisMeta model: http://www.interlis.ch/models/core/IlisMeta07-20111222.ili
diff --git a/ogr/ogrsf_frmts/ili/imdreader.h b/ogr/ogrsf_frmts/ili/imdreader.h
index a4c83df23106..49f5dc44e62f 100644
--- a/ogr/ogrsf_frmts/ili/imdreader.h
+++ b/ogr/ogrsf_frmts/ili/imdreader.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Pirmin Kalberer, Sourcepole AG
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef IMDREADER_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/ili/ogr_ili1.h b/ogr/ogrsf_frmts/ili/ogr_ili1.h
index d06eb6eb1367..404dc354c0c7 100644
--- a/ogr/ogrsf_frmts/ili/ogr_ili1.h
+++ b/ogr/ogrsf_frmts/ili/ogr_ili1.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2004, Pirmin Kalberer, Sourcepole AG
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_ILI1_H_INCLUDED
@@ -107,10 +91,9 @@ class OGRILI1Layer final : public OGRLayer
 /*                          OGRILI1DataSource                           */
 /************************************************************************/
 
-class OGRILI1DataSource final : public OGRDataSource
+class OGRILI1DataSource final : public GDALDataset
 {
   private:
-    char *pszName;
     ImdReader *poImdReader;
     IILI1Reader *poReader;
     VSILFILE *fpTransfer;
@@ -127,11 +110,6 @@ class OGRILI1DataSource final : public OGRDataSource
     int Open(const char *, char **papszOpenOptions, int bTestOpen);
     int Create(const char *pszFile, char **papszOptions);
 
-    const char *GetName() override
-    {
-        return pszName;
-    }
-
     int GetLayerCount() override
     {
         return poReader ? poReader->GetLayerCount() : 0;
diff --git a/ogr/ogrsf_frmts/ili/ogr_ili2.h b/ogr/ogrsf_frmts/ili/ogr_ili2.h
index eb92241742e8..52a2bff039b4 100644
--- a/ogr/ogrsf_frmts/ili/ogr_ili2.h
+++ b/ogr/ogrsf_frmts/ili/ogr_ili2.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2004, Pirmin Kalberer, Sourcepole AG
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_ILI2_H_INCLUDED
@@ -91,7 +75,7 @@ class OGRILI2Layer final : public OGRLayer
 /*                          OGRILI2DataSource                           */
 /************************************************************************/
 
-class OGRILI2DataSource final : public OGRDataSource
+class OGRILI2DataSource final : public GDALDataset
 {
   private:
     std::list<OGRLayer *> listLayer;
@@ -113,11 +97,6 @@ class OGRILI2DataSource final : public OGRDataSource
     int Open(const char *, char **papszOpenOptions, int bTestOpen);
     int Create(const char *pszFile, char **papszOptions);
 
-    const char *GetName() override
-    {
-        return pszName;
-    }
-
     int GetLayerCount() override
     {
         return static_cast<int>(listLayer.size());
diff --git a/ogr/ogrsf_frmts/ili/ogrili1datasource.cpp b/ogr/ogrsf_frmts/ili/ogrili1datasource.cpp
index fe7d1cfa75ea..bc9f8ba3dd47 100644
--- a/ogr/ogrsf_frmts/ili/ogrili1datasource.cpp
+++ b/ogr/ogrsf_frmts/ili/ogrili1datasource.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2004, Pirmin Kalberer, Sourcepole AG
  * Copyright (c) 2007-2008, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
@@ -40,8 +24,8 @@
 /************************************************************************/
 
 OGRILI1DataSource::OGRILI1DataSource()
-    : pszName(nullptr), poImdReader(new ImdReader(1)), poReader(nullptr),
-      fpTransfer(nullptr), pszTopic(nullptr), nLayers(0), papoLayers(nullptr)
+    : poImdReader(new ImdReader(1)), poReader(nullptr), fpTransfer(nullptr),
+      pszTopic(nullptr), nLayers(0), papoLayers(nullptr)
 {
 }
 
@@ -58,7 +42,6 @@ OGRILI1DataSource::~OGRILI1DataSource()
     }
     CPLFree(papoLayers);
 
-    CPLFree(pszName);
     CPLFree(pszTopic);
     DestroyILI1Reader(poReader);
     delete poImdReader;
@@ -162,8 +145,6 @@ int OGRILI1DataSource::Open(const char *pszNewName, char **papszOpenOptionsIn,
 
     poReader->OpenFile(osBasename.c_str());
 
-    pszName = CPLStrdup(osBasename.c_str());
-
     if (osModelFilename.length() > 0)
         poReader->ReadModel(poImdReader, osModelFilename.c_str(), this);
 
@@ -349,10 +330,10 @@ OGRILI1Layer *OGRILI1DataSource::GetLayerByName(const char *pszLayerName)
 {
     if (!poReader)
     {
-        return reinterpret_cast<OGRILI1Layer *>(
-            OGRDataSource::GetLayerByName(pszLayerName));
+        return cpl::down_cast<OGRILI1Layer *>(
+            GDALDataset::GetLayerByName(pszLayerName));
     }
 
-    return reinterpret_cast<OGRILI1Layer *>(
+    return cpl::down_cast<OGRILI1Layer *>(
         poReader->GetLayerByName(pszLayerName));
 }
diff --git a/ogr/ogrsf_frmts/ili/ogrili1driver.cpp b/ogr/ogrsf_frmts/ili/ogrili1driver.cpp
index 4fdc9c5b68c4..3b1aff37878f 100644
--- a/ogr/ogrsf_frmts/ili/ogrili1driver.cpp
+++ b/ogr/ogrsf_frmts/ili/ogrili1driver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2004, Pirmin Kalberer, Sourcepole AG
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/ili/ogrili1layer.cpp b/ogr/ogrsf_frmts/ili/ogrili1layer.cpp
index 41dd3f4fb614..2d4b615e035f 100644
--- a/ogr/ogrsf_frmts/ili/ogrili1layer.cpp
+++ b/ogr/ogrsf_frmts/ili/ogrili1layer.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2004, Pirmin Kalberer, Sourcepole AG
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/ili/ogrili2datasource.cpp b/ogr/ogrsf_frmts/ili/ogrili2datasource.cpp
index ea931964153e..42cfc9c9acda 100644
--- a/ogr/ogrsf_frmts/ili/ogrili2datasource.cpp
+++ b/ogr/ogrsf_frmts/ili/ogrili2datasource.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2004, Pirmin Kalberer, Sourcepole AG
  * Copyright (c) 2007-2008, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/ili/ogrili2driver.cpp b/ogr/ogrsf_frmts/ili/ogrili2driver.cpp
index 598099659fc6..26dd54664474 100644
--- a/ogr/ogrsf_frmts/ili/ogrili2driver.cpp
+++ b/ogr/ogrsf_frmts/ili/ogrili2driver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2004, Pirmin Kalberer, Sourcepole AG
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "xercesc_headers.h"
diff --git a/ogr/ogrsf_frmts/ili/ogrili2layer.cpp b/ogr/ogrsf_frmts/ili/ogrili2layer.cpp
index aa97415abb94..d5c1069ad1ba 100644
--- a/ogr/ogrsf_frmts/ili/ogrili2layer.cpp
+++ b/ogr/ogrsf_frmts/ili/ogrili2layer.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2004, Pirmin Kalberer, Sourcepole AG
  * Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/ili/xercesc_headers.h b/ogr/ogrsf_frmts/ili/xercesc_headers.h
index 8f5273247650..f58ab8f510e8 100644
--- a/ogr/ogrsf_frmts/ili/xercesc_headers.h
+++ b/ogr/ogrsf_frmts/ili/xercesc_headers.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef XERCESC_HEADERS_H
diff --git a/ogr/ogrsf_frmts/jml/ogr_jml.h b/ogr/ogrsf_frmts/jml/ogr_jml.h
index d9152547c138..77abdb7ab354 100644
--- a/ogr/ogrsf_frmts/jml/ogr_jml.h
+++ b/ogr/ogrsf_frmts/jml/ogr_jml.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_JML_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/jml/ogrjmldataset.cpp b/ogr/ogrsf_frmts/jml/ogrjmldataset.cpp
index 41bd89b9e32e..966c441e4bad 100644
--- a/ogr/ogrsf_frmts/jml/ogrjmldataset.cpp
+++ b/ogr/ogrsf_frmts/jml/ogrjmldataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/jml/ogrjmllayer.cpp b/ogr/ogrsf_frmts/jml/ogrjmllayer.cpp
index 8ff4e9462624..358fbf62c202 100644
--- a/ogr/ogrsf_frmts/jml/ogrjmllayer.cpp
+++ b/ogr/ogrsf_frmts/jml/ogrjmllayer.cpp
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/jml/ogrjmlwriterlayer.cpp b/ogr/ogrsf_frmts/jml/ogrjmlwriterlayer.cpp
index a81adad0827f..8d53a48b252e 100644
--- a/ogr/ogrsf_frmts/jml/ogrjmlwriterlayer.cpp
+++ b/ogr/ogrsf_frmts/jml/ogrjmlwriterlayer.cpp
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_jml.h"
diff --git a/ogr/ogrsf_frmts/jsonfg/CMakeLists.txt b/ogr/ogrsf_frmts/jsonfg/CMakeLists.txt
index 1c37903aece5..95c809176337 100644
--- a/ogr/ogrsf_frmts/jsonfg/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/jsonfg/CMakeLists.txt
@@ -13,7 +13,7 @@ add_gdal_driver(
   BUILTIN)
 gdal_standard_includes(ogr_JSONFG)
 target_include_directories(ogr_JSONFG PRIVATE $<TARGET_PROPERTY:ogr_MEM,SOURCE_DIR>
-                                              $<TARGET_PROPERTY:ogr_geojson,SOURCE_DIR>)
+                                              $<TARGET_PROPERTY:ogr_GeoJSON,SOURCE_DIR>)
 if (GDAL_USE_JSONC_INTERNAL)
   gdal_add_vendored_lib(ogr_JSONFG libjson)
 else ()
diff --git a/ogr/ogrsf_frmts/jsonfg/ogr_jsonfg.h b/ogr/ogrsf_frmts/jsonfg/ogr_jsonfg.h
index 4d70f7e38366..f19fb90877b4 100644
--- a/ogr/ogrsf_frmts/jsonfg/ogr_jsonfg.h
+++ b/ogr/ogrsf_frmts/jsonfg/ogr_jsonfg.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_JSONFG_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/jsonfg/ogrjsonfgdataset.cpp b/ogr/ogrsf_frmts/jsonfg/ogrjsonfgdataset.cpp
index d5017c07b081..b055f091048d 100644
--- a/ogr/ogrsf_frmts/jsonfg/ogrjsonfgdataset.cpp
+++ b/ogr/ogrsf_frmts/jsonfg/ogrjsonfgdataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_jsonfg.h"
@@ -324,13 +308,13 @@ bool OGRJSONFGDataset::Open(GDALOpenInfo *poOpenInfo,
             }
             if (!bCanTryWithNonStreamingParserOut)
                 return false;
-
-            // Fallback to in-memory ingestion
-            CPLAssert(poOpenInfo->fpL == nullptr);
-            poOpenInfo->fpL = fp.release();
-            if (!ReadFromFile(poOpenInfo, pszUnprefixed))
-                return false;
         }
+
+        // Fallback to in-memory ingestion
+        CPLAssert(poOpenInfo->fpL == nullptr);
+        poOpenInfo->fpL = fp.release();
+        if (!ReadFromFile(poOpenInfo, pszUnprefixed))
+            return false;
     }
 
     // In-memory ingestion of the file
@@ -435,7 +419,7 @@ bool OGRJSONFGDataset::ReadFromService(GDALOpenInfo *poOpenInfo,
     char *pszStoredContent = OGRGeoJSONDriverStealStoredContent(pszSource);
     if (pszStoredContent != nullptr)
     {
-        if (JSONFGIsObject(pszStoredContent))
+        if (JSONFGIsObject(pszStoredContent, poOpenInfo))
         {
             pszGeoData_ = pszStoredContent;
             nGeoDataLen_ = strlen(pszGeoData_);
@@ -501,7 +485,7 @@ bool OGRJSONFGDataset::ReadFromService(GDALOpenInfo *poOpenInfo,
     /* -------------------------------------------------------------------- */
     if (EQUAL(pszSource, poOpenInfo->pszFilename))
     {
-        if (!JSONFGIsObject(pszGeoData_))
+        if (!JSONFGIsObject(pszGeoData_, poOpenInfo))
         {
             OGRGeoJSONDriverStoreContent(pszSource, pszGeoData_);
             pszGeoData_ = nullptr;
diff --git a/ogr/ogrsf_frmts/jsonfg/ogrjsonfgdriver.cpp b/ogr/ogrsf_frmts/jsonfg/ogrjsonfgdriver.cpp
index a00e47e6cccc..1c015d7a0435 100644
--- a/ogr/ogrsf_frmts/jsonfg/ogrjsonfgdriver.cpp
+++ b/ogr/ogrsf_frmts/jsonfg/ogrjsonfgdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_priv.h"
@@ -41,10 +25,14 @@ static int OGRJSONFGDriverIdentify(GDALOpenInfo *poOpenInfo)
     GeoJSONSourceType nSrcType = JSONFGDriverGetSourceType(poOpenInfo);
     if (nSrcType == eGeoJSONSourceUnknown)
         return FALSE;
-    if (nSrcType == eGeoJSONSourceService &&
-        !STARTS_WITH_CI(poOpenInfo->pszFilename, "JSONFG:"))
+    if (nSrcType == eGeoJSONSourceService)
     {
-        return -1;
+        if (poOpenInfo->IsSingleAllowedDriver("JSONFG"))
+            return TRUE;
+        if (!STARTS_WITH_CI(poOpenInfo->pszFilename, "JSONFG:"))
+        {
+            return -1;
+        }
     }
     return TRUE;
 }
diff --git a/ogr/ogrsf_frmts/jsonfg/ogrjsonfgmemlayer.cpp b/ogr/ogrsf_frmts/jsonfg/ogrjsonfgmemlayer.cpp
index db2202fa5490..cb6b8ed1fbce 100644
--- a/ogr/ogrsf_frmts/jsonfg/ogrjsonfgmemlayer.cpp
+++ b/ogr/ogrsf_frmts/jsonfg/ogrjsonfgmemlayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_jsonfg.h"
diff --git a/ogr/ogrsf_frmts/jsonfg/ogrjsonfgreader.cpp b/ogr/ogrsf_frmts/jsonfg/ogrjsonfgreader.cpp
index 262126d26034..b859ecdf5d18 100644
--- a/ogr/ogrsf_frmts/jsonfg/ogrjsonfgreader.cpp
+++ b/ogr/ogrsf_frmts/jsonfg/ogrjsonfgreader.cpp
@@ -7,29 +7,15 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_jsonfg.h"
 
 #include "ogrgeojsonreader.h"
 #include "ogrgeojsonutils.h"
+#include "ogrlibjsonutils.h"
+#include "ogrgeojsongeometry.h"
 #include "ogr_geojson.h"
 
 #include "cpl_vsi_virtual.h"
@@ -136,7 +122,8 @@ OGRJSONFGReadCoordRefSys(json_object *poCoordRefSys, bool bCanRecurse = true)
             }
             return poSRS;
         }
-        else if (STARTS_WITH(pszStr, "http://www.opengis.net/def/crs/"))
+        else if (STARTS_WITH(pszStr, "http://www.opengis.net/def/crs/") ||
+                 STARTS_WITH(pszStr, "https://www.opengis.net/def/crs/"))
         {
             // OGC URI, e.g. "http://www.opengis.net/def/crs/EPSG/0/4326"
             auto poSRS = std::make_unique<OGRSpatialReference>();
@@ -662,6 +649,50 @@ const char *OGRJSONFGReader::GetLayerNameForFeature(json_object *poObj) const
     return pszName;
 }
 
+/************************************************************************/
+/*                     OGRJSONFGGetOGRGeometryType()                    */
+/************************************************************************/
+
+static OGRwkbGeometryType OGRJSONFGGetOGRGeometryType(json_object *poObj)
+{
+    const auto eType = OGRGeoJSONGetOGRGeometryType(poObj);
+    if (eType != wkbUnknown)
+        return eType;
+
+    json_object *poObjType = CPL_json_object_object_get(poObj, "type");
+    const char *pszType = json_object_get_string(poObjType);
+    if (!pszType)
+        return wkbNone;
+
+    if (strcmp(pszType, "Polyhedron") == 0)
+    {
+        return wkbPolyhedralSurfaceZ;
+    }
+    else if (strcmp(pszType, "Prism") == 0)
+    {
+        auto poBase = CPL_json_object_object_get(poObj, "base");
+        if (!poBase || json_object_get_type(poBase) != json_type_object)
+        {
+            return wkbNone;
+        }
+
+        const auto eBaseGeomType = OGRGeoJSONGetOGRGeometryType(poBase);
+        if (eBaseGeomType == wkbPoint)
+        {
+            return wkbLineString25D;
+        }
+        else if (eBaseGeomType == wkbLineString)
+        {
+            return wkbMultiPolygon25D;
+        }
+        else if (eBaseGeomType == wkbPolygon)
+        {
+            return wkbPolyhedralSurfaceZ;
+        }
+    }
+    return wkbNone;
+}
+
 /************************************************************************/
 /*                   OGRJSONFGCreateNonGeoJSONGeometry()                */
 /************************************************************************/
@@ -707,6 +738,8 @@ OGRJSONFGCreateNonGeoJSONGeometry(json_object *poObj, bool bWarn)
             if (poGeom->addGeometryDirectly(poPoly) != OGRERR_NONE)
                 return nullptr;
         }
+        if (nPolys == 0)
+            poGeom->set3D(true);
 
         return poGeom;
     }
@@ -903,22 +936,8 @@ bool OGRJSONFGReader::GenerateLayerDefnFromFeature(json_object *poObj)
             (eGeometryElement_ != GeometryElement::PLACE);
         if (poPlace && json_object_get_type(poPlace) == json_type_object)
         {
-            const auto eType = OGRGeoJSONGetOGRGeometryType(poPlace);
-            if (eType == wkbUnknown)
-            {
-                auto poGeom =
-                    OGRJSONFGCreateNonGeoJSONGeometry(poPlace, /*bWarn=*/true);
-                if (poGeom)
-                {
-                    bFallbackToGeometry = false;
-                    poContext->bDetectLayerGeomType =
-                        OGRGeoJSONUpdateLayerGeomType(
-                            poContext->bFirstGeometry,
-                            poGeom->getGeometryType(),
-                            poContext->eLayerGeomType);
-                }
-            }
-            else
+            const auto eType = OGRJSONFGGetOGRGeometryType(poPlace);
+            if (eType != wkbNone)
             {
                 bFallbackToGeometry = false;
                 poContext->bDetectLayerGeomType = OGRGeoJSONUpdateLayerGeomType(
diff --git a/ogr/ogrsf_frmts/jsonfg/ogrjsonfgstreamedlayer.cpp b/ogr/ogrsf_frmts/jsonfg/ogrjsonfgstreamedlayer.cpp
index aea52232a5f2..44715868f7da 100644
--- a/ogr/ogrsf_frmts/jsonfg/ogrjsonfgstreamedlayer.cpp
+++ b/ogr/ogrsf_frmts/jsonfg/ogrjsonfgstreamedlayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_jsonfg.h"
diff --git a/ogr/ogrsf_frmts/jsonfg/ogrjsonfgstreamingparser.cpp b/ogr/ogrsf_frmts/jsonfg/ogrjsonfgstreamingparser.cpp
index 86ffb996ac72..a1b9af9e837f 100644
--- a/ogr/ogrsf_frmts/jsonfg/ogrjsonfgstreamingparser.cpp
+++ b/ogr/ogrsf_frmts/jsonfg/ogrjsonfgstreamingparser.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_jsonfg.h"
diff --git a/ogr/ogrsf_frmts/jsonfg/ogrjsonfgwritelayer.cpp b/ogr/ogrsf_frmts/jsonfg/ogrjsonfgwritelayer.cpp
index 20e7d39ce9a8..484401c2fde9 100644
--- a/ogr/ogrsf_frmts/jsonfg/ogrjsonfgwritelayer.cpp
+++ b/ogr/ogrsf_frmts/jsonfg/ogrjsonfgwritelayer.cpp
@@ -7,28 +7,12 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_jsonfg.h"
 #include "cpl_time.h"
-#include "ogrgeojsonreader.h"  // OGRJSonParse()
+#include "ogrlibjsonutils.h"  // OGRJSonParse()
 
 #include <algorithm>
 
diff --git a/ogr/ogrsf_frmts/kml/CMakeLists.txt b/ogr/ogrsf_frmts/kml/CMakeLists.txt
index 76b98e13c705..d1effa36f2df 100644
--- a/ogr/ogrsf_frmts/kml/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/kml/CMakeLists.txt
@@ -1,8 +1,9 @@
-# gdal core depends on kml driver, so it should not be a plugin.
 add_gdal_driver(
   TARGET ogr_KML
-  SOURCES kmlutility.h ogr_kml.h ogrkmldriver.cpp ogr2kmlgeometry.cpp ogrkmldatasource.cpp ogrkmllayer.cpp
-  BUILTIN)
+  SOURCES kmlutility.h ogr_kml.h ogrkmldriver.cpp ogrkmldatasource.cpp ogrkmllayer.cpp
+  PLUGIN_CAPABLE
+  NO_DEPS
+)
 gdal_standard_includes(ogr_KML)
 
 if (GDAL_USE_EXPAT)
diff --git a/ogr/ogrsf_frmts/kml/kml.cpp b/ogr/ogrsf_frmts/kml/kml.cpp
index 1adc016d442c..4560e526b756 100644
--- a/ogr/ogrsf_frmts/kml/kml.cpp
+++ b/ogr/ogrsf_frmts/kml/kml.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2007, Jens Oberender
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #include "kmlnode.h"
 #include "kml.h"
diff --git a/ogr/ogrsf_frmts/kml/kml.h b/ogr/ogrsf_frmts/kml/kml.h
index 9d2d5b9fd88a..e82793425e42 100644
--- a/ogr/ogrsf_frmts/kml/kml.h
+++ b/ogr/ogrsf_frmts/kml/kml.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2007, Jens Oberender
  * Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef OGR_KML_KML_H_INCLUDED
 #define OGR_KML_KML_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/kml/kmlnode.cpp b/ogr/ogrsf_frmts/kml/kmlnode.cpp
index 31a487088a51..a4600d9a2fc5 100644
--- a/ogr/ogrsf_frmts/kml/kmlnode.cpp
+++ b/ogr/ogrsf_frmts/kml/kmlnode.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2007, Jens Oberender
  * Copyright (c) 2007-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/kml/kmlnode.h b/ogr/ogrsf_frmts/kml/kmlnode.h
index 08435d8159fb..5b702d0b527a 100644
--- a/ogr/ogrsf_frmts/kml/kmlnode.h
+++ b/ogr/ogrsf_frmts/kml/kmlnode.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2007, Jens Oberender
  * Copyright (c) 2009-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef OGR_KMLNODE_H_INCLUDED
 #define OGR_KMLNODE_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/kml/kmlutility.h b/ogr/ogrsf_frmts/kml/kmlutility.h
index bc6c13f04bad..fb96b93f795a 100644
--- a/ogr/ogrsf_frmts/kml/kmlutility.h
+++ b/ogr/ogrsf_frmts/kml/kmlutility.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2007, Jens Oberender
  * Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef OGR_KMLUTILITY_H_INCLUDED
 #define OGR_KMLUTILITY_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/kml/kmlvector.cpp b/ogr/ogrsf_frmts/kml/kmlvector.cpp
index a140527af35c..98066bd0b3f1 100644
--- a/ogr/ogrsf_frmts/kml/kmlvector.cpp
+++ b/ogr/ogrsf_frmts/kml/kmlvector.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2007, Jens Oberender
  * Copyright (c) 2009-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/kml/kmlvector.h b/ogr/ogrsf_frmts/kml/kmlvector.h
index 9113733ef965..e3b7af78eac4 100644
--- a/ogr/ogrsf_frmts/kml/kmlvector.h
+++ b/ogr/ogrsf_frmts/kml/kmlvector.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Jens Oberender
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef OGR_KMLVECTOR_H_INCLUDED
 #define OGR_KMLVECTOR_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/kml/ogr_kml.h b/ogr/ogrsf_frmts/kml/ogr_kml.h
index 54991376f7b5..6eb8cbff061f 100644
--- a/ogr/ogrsf_frmts/kml/ogr_kml.h
+++ b/ogr/ogrsf_frmts/kml/ogr_kml.h
@@ -12,23 +12,7 @@
  *               2007, Jens Oberender
  * Copyright (c) 2007-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #ifndef OGR_KML_H_INCLUDED
 #define OGR_KML_H_INCLUDED
@@ -90,7 +74,7 @@ class OGRKMLLayer final : public OGRLayer
     int iNextKMLId_;
     bool bWriter_;
     int nLayerNumber_;
-    int nWroteFeatureCount_;
+    GIntBig nWroteFeatureCount_;
     bool bSchemaWritten_;
     bool bClosedForWriting;
     char *pszName_;
@@ -103,22 +87,14 @@ class OGRKMLLayer final : public OGRLayer
 /*                           OGRKMLDataSource                           */
 /************************************************************************/
 
-class OGRKMLDataSource final : public OGRDataSource
+class OGRKMLDataSource final : public GDALDataset
 {
   public:
     OGRKMLDataSource();
     ~OGRKMLDataSource();
 
-    //
-    // OGRDataSource Interface
-    //
     int Open(const char *pszName, int bTestOpen);
 
-    const char *GetName() override
-    {
-        return pszName_;
-    }
-
     int GetLayerCount() override
     {
         return nLayers_;
@@ -178,8 +154,6 @@ class OGRKMLDataSource final : public OGRDataSource
     KML *poKMLFile_;
 #endif
 
-    char *pszName_;
-
     OGRKMLLayer **papoLayers_;
     int nLayers_;
 
diff --git a/ogr/ogrsf_frmts/kml/ogrkmldatasource.cpp b/ogr/ogrsf_frmts/kml/ogrkmldatasource.cpp
index fa81a760714f..d84e336971c1 100644
--- a/ogr/ogrsf_frmts/kml/ogrkmldatasource.cpp
+++ b/ogr/ogrsf_frmts/kml/ogrkmldatasource.cpp
@@ -10,23 +10,7 @@
  *               2007, Jens Oberender
  * Copyright (c) 2007-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #include "cpl_port.h"
 #include "ogr_kml.h"
@@ -56,10 +40,9 @@ OGRKMLDataSource::OGRKMLDataSource()
 #ifdef HAVE_EXPAT
       poKMLFile_(nullptr),
 #endif
-      pszName_(nullptr), papoLayers_(nullptr), nLayers_(0),
-      pszNameField_(nullptr), pszDescriptionField_(nullptr),
-      pszAltitudeMode_(nullptr), papszCreateOptions_(nullptr),
-      fpOutput_(nullptr), bIssuedCTError_(false)
+      papoLayers_(nullptr), nLayers_(0), pszNameField_(nullptr),
+      pszDescriptionField_(nullptr), pszAltitudeMode_(nullptr),
+      papszCreateOptions_(nullptr), fpOutput_(nullptr), bIssuedCTError_(false)
 {
 }
 
@@ -98,7 +81,6 @@ OGRKMLDataSource::~OGRKMLDataSource()
     }
 
     CSLDestroy(papszCreateOptions_);
-    CPLFree(pszName_);
     CPLFree(pszNameField_);
     CPLFree(pszDescriptionField_);
     CPLFree(pszAltitudeMode_);
@@ -136,8 +118,6 @@ int OGRKMLDataSource::Open(const char *pszNewName, int bTestOpen)
         return FALSE;
     }
 
-    pszName_ = CPLStrdup(pszNewName);
-
     /* -------------------------------------------------------------------- */
     /*      If we aren't sure it is KML, validate it by start parsing       */
     /* -------------------------------------------------------------------- */
@@ -335,8 +315,6 @@ int OGRKMLDataSource::Create(const char *pszName, char **papszOptions)
     if (strcmp(pszName, "/dev/stdout") == 0)
         pszName = "/vsistdout/";
 
-    pszName_ = CPLStrdup(pszName);
-
     fpOutput_ = VSIFOpenExL(pszName, "wb", true);
     if (fpOutput_ == nullptr)
     {
@@ -378,7 +356,7 @@ OGRKMLDataSource::ICreateLayer(const char *pszLayerName,
         CPLError(CE_Failure, CPLE_NoWriteAccess,
                  "Data source %s opened for read access.  "
                  "New layer %s cannot be created.",
-                 pszName_, pszLayerName);
+                 GetDescription(), pszLayerName);
 
         return nullptr;
     }
diff --git a/ogr/ogrsf_frmts/kml/ogrkmldriver.cpp b/ogr/ogrsf_frmts/kml/ogrkmldriver.cpp
index 28ce835831c9..654a748d8677 100644
--- a/ogr/ogrsf_frmts/kml/ogrkmldriver.cpp
+++ b/ogr/ogrsf_frmts/kml/ogrkmldriver.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2006, Christopher Condit
  *               2007, Jens Oberender
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/kml/ogrkmllayer.cpp b/ogr/ogrsf_frmts/kml/ogrkmllayer.cpp
index f251521c8a15..51f529c1a82f 100644
--- a/ogr/ogrsf_frmts/kml/ogrkmllayer.cpp
+++ b/ogr/ogrsf_frmts/kml/ogrkmllayer.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2006, Christopher Condit
  * Copyright (c) 2007-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -355,7 +339,11 @@ OGRErr OGRKMLLayer::ICreateFeature(OGRFeature *poFeature)
         VSIFPrintfL(fp, "<Folder><name>%s</name>\n", pszName_);
     }
 
-    VSIFPrintfL(fp, "  <Placemark>\n");
+    ++nWroteFeatureCount_;
+    char *pszEscapedLayerName = OGRGetXML_UTF8_EscapedString(GetDescription());
+    VSIFPrintfL(fp, "  <Placemark id=\"%s." CPL_FRMT_GIB "\">\n",
+                pszEscapedLayerName, nWroteFeatureCount_);
+    CPLFree(pszEscapedLayerName);
 
     if (poFeature->GetFID() == OGRNullFID)
         poFeature->SetFID(iNextKMLId_++);
@@ -577,7 +565,6 @@ OGRErr OGRKMLLayer::ICreateFeature(OGRFeature *poFeature)
     }
 
     VSIFPrintfL(fp, "  </Placemark>\n");
-    nWroteFeatureCount_++;
     return OGRERR_NONE;
 }
 
diff --git a/ogr/ogrsf_frmts/libkml/fieldconfig.h b/ogr/ogrsf_frmts/libkml/fieldconfig.h
new file mode 100644
index 000000000000..c479686a1ae7
--- /dev/null
+++ b/ogr/ogrsf_frmts/libkml/fieldconfig.h
@@ -0,0 +1,72 @@
+/******************************************************************************
+ *
+ * Project:  KML Translator
+ * Purpose:  Implements OGRLIBKMLDriver
+ * Author:   Brian Case, rush at winkey dot org
+ *
+ ******************************************************************************
+ * Copyright (c) 2010, Brian Case
+ * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.com>
+ *
+ * SPDX-License-Identifier: MIT
+ *****************************************************************************/
+
+#ifndef OGRLIBKMLFIELDCONFIG_H_INCLUDED
+#define OGRLIBKMLFIELDCONFIG_H_INCLUDED
+
+/*******************************************************************************
+ Function to fetch the field config options.
+*******************************************************************************/
+
+struct fieldconfig
+{
+    const char *idfield;
+    const char *namefield;
+    const char *descfield;
+    const char *tsfield;
+    const char *beginfield;
+    const char *endfield;
+    const char *altitudeModefield;
+    const char *tessellatefield;
+    const char *extrudefield;
+    const char *visibilityfield;
+    const char *drawOrderfield;
+    const char *iconfield;
+    const char *headingfield;
+    const char *tiltfield;
+    const char *rollfield;
+    const char *snippetfield;
+    const char *modelfield;
+    const char *scalexfield;
+    const char *scaleyfield;
+    const char *scalezfield;
+    const char *networklinkfield;
+    const char *networklink_refreshvisibility_field;
+    const char *networklink_flytoview_field;
+    const char *networklink_refreshMode_field;
+    const char *networklink_refreshInterval_field;
+    const char *networklink_viewRefreshMode_field;
+    const char *networklink_viewRefreshTime_field;
+    const char *networklink_viewBoundScale_field;
+    const char *networklink_viewFormat_field;
+    const char *networklink_httpQuery_field;
+    const char *camera_longitude_field;
+    const char *camera_latitude_field;
+    const char *camera_altitude_field;
+    const char *camera_altitudemode_field;
+    const char *photooverlayfield;
+    const char *leftfovfield;
+    const char *rightfovfield;
+    const char *bottomfovfield;
+    const char *topfovfield;
+    const char *nearfield;
+    const char *photooverlay_shape_field;
+    const char *imagepyramid_tilesize_field;
+    const char *imagepyramid_maxwidth_field;
+    const char *imagepyramid_maxheight_field;
+    const char *imagepyramid_gridorigin_field;
+};
+
+void get_fieldconfig(struct fieldconfig *oFC);
+
+#endif
diff --git a/ogr/ogrsf_frmts/libkml/libkml_headers.h b/ogr/ogrsf_frmts/libkml/libkml_headers.h
index fe8778ca923e..e659d5214ee6 100644
--- a/ogr/ogrsf_frmts/libkml/libkml_headers.h
+++ b/ogr/ogrsf_frmts/libkml/libkml_headers.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef LIBKML_HEADERS_H
diff --git a/ogr/ogrsf_frmts/libkml/ogr_libkml.h b/ogr/ogrsf_frmts/libkml/ogr_libkml.h
index c1c51a1b209f..8d6fa8c0a172 100644
--- a/ogr/ogrsf_frmts/libkml/ogr_libkml.h
+++ b/ogr/ogrsf_frmts/libkml/ogr_libkml.h
@@ -8,23 +8,7 @@
  * Copyright (c) 2010, Brian Case
  * Copyright (c) 2010-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef HAVE_OGR_LIBKML_H
@@ -33,6 +17,7 @@
 #include "ogrsf_frmts.h"
 
 #include "libkml_headers.h"
+#include "fieldconfig.h"
 
 #include <map>
 
@@ -47,18 +32,20 @@ CPLString OGRLIBKMLGetSanitizedNCName(const char *pszName);
 class OGRLIBKMLLayer final : public OGRLayer,
                              public OGRGetNextFeatureThroughRaw<OGRLIBKMLLayer>
 {
-    int bUpdate;
+    int bUpdate = false;
 
-    int nFeatures;
-    int iFeature;
-    long nFID;
+    int nFeatures = 0;
+    int iFeature = 0;
+    GIntBig nFID = 1;
     const char *m_pszName;
     const char *m_pszFileName;
+    std::string m_osSanitizedNCName;
 
     kmldom::ContainerPtr m_poKmlLayer;
     kmldom::ElementPtr m_poKmlLayerRoot;
     kmldom::UpdatePtr m_poKmlUpdate;
 
+    fieldconfig m_oFieldConfig;
     OGRLIBKMLDataSource *m_poOgrDS;
     OGRFeatureDefn *m_poOgrFeatureDefn;
     kmldom::SchemaPtr m_poKmlSchema;
@@ -84,6 +71,11 @@ class OGRLIBKMLLayer final : public OGRLayer,
 
     bool m_bUpdateIsFolder;
 
+    bool m_bAllReadAtLeastOnce = false;
+    std::map<GIntBig, std::string> m_oMapOGRIdToKmlId{};
+    std::map<std::string, GIntBig> m_oMapKmlIdToOGRId{};
+
+    void ScanAllFeatures();
     OGRFeature *GetNextRawFeature();
 
   public:
@@ -161,6 +153,11 @@ class OGRLIBKMLLayer final : public OGRLayer,
         return m_pszFileName;
     }
 
+    const fieldconfig &GetFieldConfig() const
+    {
+        return m_oFieldConfig;
+    }
+
     void SetLookAt(const char *pszLookatLongitude,
                    const char *pszLookatLatitude, const char *pszLookatAltitude,
                    const char *pszLookatHeading, const char *pszLookatTilt,
@@ -205,9 +202,8 @@ class OGRLIBKMLLayer final : public OGRLayer,
   datasource class
 ******************************************************************************/
 
-class OGRLIBKMLDataSource final : public OGRDataSource
+class OGRLIBKMLDataSource final : public GDALDataset
 {
-    char *m_pszName;
     bool m_bIssuedCTError = false;
 
     /***** layers *****/
@@ -252,11 +248,6 @@ class OGRLIBKMLDataSource final : public OGRDataSource
     explicit OGRLIBKMLDataSource(kmldom::KmlFactory *poKmlFactory);
     ~OGRLIBKMLDataSource();
 
-    const char *GetName() override
-    {
-        return m_pszName;
-    }
-
     int GetLayerCount() override
     {
         return nLayers;
diff --git a/ogr/ogrsf_frmts/libkml/ogrlibkmldatasource.cpp b/ogr/ogrsf_frmts/libkml/ogrlibkmldatasource.cpp
index e20653c857a9..f5d2e7d6fcdd 100644
--- a/ogr/ogrsf_frmts/libkml/ogrlibkmldatasource.cpp
+++ b/ogr/ogrsf_frmts/libkml/ogrlibkmldatasource.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2010, Brian Case
  * Copyright (c) 2010-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #include "libkml_headers.h"
@@ -87,8 +71,8 @@ static ElementPtr OGRLIBKMLParse(const std::string &oKml, std::string *posError)
 ******************************************************************************/
 
 OGRLIBKMLDataSource::OGRLIBKMLDataSource(KmlFactory *poKmlFactory)
-    : m_pszName(nullptr), papoLayers(nullptr), nLayers(0), nAllocated(0),
-      bUpdate(false), bUpdated(false), m_papszOptions(nullptr), m_isKml(false),
+    : papoLayers(nullptr), nLayers(0), nAllocated(0), bUpdate(false),
+      bUpdated(false), m_papszOptions(nullptr), m_isKml(false),
       m_poKmlDSKml(nullptr), m_poKmlDSContainer(nullptr),
       m_poKmlUpdate(nullptr), m_isKmz(false), m_poKmlDocKml(nullptr),
       m_poKmlDocKmlRoot(nullptr), m_poKmlStyleKml(nullptr), m_isDir(false),
@@ -206,37 +190,57 @@ static void OGRLIBKMLPreProcessInput(std::string &oKml)
 /*                       OGRLIBKMLRemoveSpaces()                        */
 /************************************************************************/
 
-static void OGRLIBKMLRemoveSpaces(std::string &oKml,
+static void OGRLIBKMLRemoveSpaces(std::string &osKml,
                                   const std::string &osNeedle)
 {
     size_t nPos = 0;
+    const std::string osLtNeedle(std::string("<").append(osNeedle));
+    std::string osTmp;
+    std::string osRet;
     while (true)
     {
-        nPos = oKml.find("<" + osNeedle, nPos);
-        if (nPos == std::string::npos)
+        auto nPosNew = osKml.find(osLtNeedle, nPos);
+        if (nPosNew == std::string::npos)
         {
+            osRet.append(osKml, nPos);
             break;
         }
-        const size_t nPosOri = nPos;
-        nPos = oKml.find(">", nPos);
-        if (nPos == std::string::npos || oKml[nPos + 1] != '\n')
+        const size_t nPosOri = nPosNew;
+        nPosNew = osKml.find(">\n", nPosNew);
+        if (nPosNew == std::string::npos || nPosNew + 2 == osKml.size())
         {
+            osRet.append(osKml, nPos);
             break;
         }
-        oKml = oKml.substr(0, nPos) + ">" + oKml.substr(nPos + strlen(">\n"));
-        CPLString osSpaces;
-        for (size_t nPosTmp = nPosOri - 1; oKml[nPosTmp] == ' '; nPosTmp--)
+        // Skip \n character
+        osRet.append(osKml, nPos, nPosNew - nPos + 1);
+        nPos = nPosNew + 2;
+
+        // Remove leading spaces of "    </{osNeedle}>"
+        osTmp.clear();
+        for (size_t nPosTmp = nPosOri - 1; osKml[nPosTmp] == ' '; nPosTmp--)
         {
-            osSpaces += ' ';
+            osTmp += ' ';
+        }
+        osTmp += "</";
+        osTmp += osNeedle;
+        osTmp += '>';
+        nPosNew = osKml.find(osTmp, nPos);
+        if (nPosNew != std::string::npos)
+        {
+            osRet.append(osKml, nPos, nPosNew - nPos);
+            osRet += "</";
+            osRet += osNeedle;
+            osRet += '>';
+            nPos = nPosNew + osTmp.size();
         }
-        nPos = oKml.find(osSpaces + "</" + osNeedle + ">", nPos);
-        if (nPos != std::string::npos)
-            oKml = oKml.substr(0, nPos) + "</" + osNeedle + ">" +
-                   oKml.substr(nPos + osSpaces.size() + strlen("</>") +
-                               osNeedle.size());
         else
+        {
+            osRet.append(osKml, nPos);
             break;
+        }
     }
+    osKml = std::move(osRet);
 }
 
 /************************************************************************/
@@ -286,7 +290,7 @@ static void OGRLIBKMLPostProcessOutput(std::string &oKml)
 
 bool OGRLIBKMLDataSource::WriteKml()
 {
-    std::string oKmlFilename = m_pszName;
+    std::string oKmlFilename = GetDescription();
 
     if (m_poKmlDSContainer && m_poKmlDSContainer->IsA(kmldom::Type_Document))
     {
@@ -392,12 +396,23 @@ static KmlPtr OGRLIBKMLCreateOGCKml22(KmlFactory *poFactory,
 
 bool OGRLIBKMLDataSource::WriteKmz()
 {
-    void *hZIP = CPLCreateZip(m_pszName, nullptr);
+    std::string osTmpFilename;
+    if (!VSISupportsRandomWrite(GetDescription(), false) ||
+        EQUAL(CPLGetConfigOption("CPL_VSIL_USE_TEMP_FILE_FOR_RANDOM_WRITE", ""),
+              "FORCED"))
+    {
+        osTmpFilename =
+            CPLGenerateTempFilename(CPLGetBasename(GetDescription()));
+    }
+
+    void *hZIP = CPLCreateZip(osTmpFilename.empty() ? GetDescription()
+                                                    : osTmpFilename.c_str(),
+                              nullptr);
 
     if (!hZIP)
     {
         CPLError(CE_Failure, CPLE_NoWriteAccess, "Error creating %s: %s",
-                 m_pszName, VSIGetLastErrorMsg());
+                 GetDescription(), VSIGetLastErrorMsg());
         return false;
     }
 
@@ -436,7 +451,7 @@ bool OGRLIBKMLDataSource::WriteKmz()
         {
             bRet = false;
             CPLError(CE_Failure, CPLE_FileIO, "ERROR adding %s to %s",
-                     "doc.kml", m_pszName);
+                     "doc.kml", GetDescription());
         }
         CPLCloseFileInZip(hZIP);
     }
@@ -490,7 +505,7 @@ bool OGRLIBKMLDataSource::WriteKmz()
             CPLWriteFileInZip(hZIP, oKmlOut.data(),
                               static_cast<int>(oKmlOut.size())) != CE_None)
             CPLError(CE_Failure, CPLE_FileIO, "ERROR adding %s to %s",
-                     papoLayers[iLayer]->GetFileName(), m_pszName);
+                     papoLayers[iLayer]->GetFileName(), GetDescription());
         CPLCloseFileInZip(hZIP);
     }
 
@@ -510,12 +525,25 @@ bool OGRLIBKMLDataSource::WriteKmz()
         {
             bRet = false;
             CPLError(CE_Failure, CPLE_FileIO, "ERROR adding %s to %s",
-                     "style/style.kml", m_pszName);
+                     "style/style.kml", GetDescription());
         }
         CPLCloseFileInZip(hZIP);
     }
 
     CPLCloseZip(hZIP);
+
+    if (!osTmpFilename.empty())
+    {
+        if (bRet)
+        {
+            bRet = CPLCopyFile(GetDescription(), osTmpFilename.c_str()) == 0;
+            if (!bRet)
+                CPLError(CE_Failure, CPLE_FileIO,
+                         "Cannot copy temporary file to %s", GetDescription());
+        }
+        VSIUnlink(osTmpFilename.c_str());
+    }
+
     return bRet;
 }
 
@@ -555,13 +583,14 @@ bool OGRLIBKMLDataSource::WriteDir()
         std::string oKmlOut = kmldom::SerializePretty(m_poKmlDocKmlRoot);
         OGRLIBKMLPostProcessOutput(oKmlOut);
 
-        const char *pszOutfile = CPLFormFilename(m_pszName, "doc.kml", nullptr);
+        const char *pszOutfile =
+            CPLFormFilename(GetDescription(), "doc.kml", nullptr);
 
         VSILFILE *fp = VSIFOpenExL(pszOutfile, "wb", true);
         if (fp == nullptr)
         {
             CPLError(CE_Failure, CPLE_FileIO, "Error writing %s to %s: %s",
-                     "doc.kml", m_pszName, VSIGetLastErrorMsg());
+                     "doc.kml", GetDescription(), VSIGetLastErrorMsg());
             return false;
         }
 
@@ -605,13 +634,13 @@ bool OGRLIBKMLDataSource::WriteDir()
         OGRLIBKMLPostProcessOutput(oKmlOut);
 
         const char *pszOutfile = CPLFormFilename(
-            m_pszName, papoLayers[iLayer]->GetFileName(), nullptr);
+            GetDescription(), papoLayers[iLayer]->GetFileName(), nullptr);
 
         VSILFILE *fp = VSIFOpenL(pszOutfile, "wb");
         if (fp == nullptr)
         {
             CPLError(CE_Failure, CPLE_FileIO, "ERROR Writing %s to %s",
-                     papoLayers[iLayer]->GetFileName(), m_pszName);
+                     papoLayers[iLayer]->GetFileName(), GetDescription());
             return false;
         }
 
@@ -631,13 +660,13 @@ bool OGRLIBKMLDataSource::WriteDir()
         OGRLIBKMLPostProcessOutput(oKmlOut);
 
         const char *pszOutfile =
-            CPLFormFilename(m_pszName, "style.kml", nullptr);
+            CPLFormFilename(GetDescription(), "style.kml", nullptr);
 
         VSILFILE *fp = VSIFOpenL(pszOutfile, "wb");
         if (fp == nullptr)
         {
             CPLError(CE_Failure, CPLE_FileIO, "ERROR Writing %s to %s",
-                     "style.kml", m_pszName);
+                     "style.kml", GetDescription());
             return false;
         }
 
@@ -698,8 +727,6 @@ OGRLIBKMLDataSource::~OGRLIBKMLDataSource()
     /***** sync the DS to disk *****/
     OGRLIBKMLDataSource::FlushCache(true);
 
-    CPLFree(m_pszName);
-
     for (int i = 0; i < nLayers; i++)
         delete papoLayers[i];
 
@@ -1258,10 +1285,16 @@ int OGRLIBKMLDataSource::OpenKmz(const char *pszFilename, int bUpdateIn)
                 }
 
                 /***** create the layer *****/
-                AddLayer(CPLGetBasename(oKmlHref.get_path().c_str()),
-                         wkbUnknown, nullptr, this, std::move(poKmlLyrRoot),
-                         poKmlLyrContainer, oKmlHref.get_path().c_str(), FALSE,
-                         bUpdateIn, static_cast<int>(nKmlFeatures));
+                const std::string osLayerName =
+                    poKmlNetworkLink->has_name()
+                        ? poKmlNetworkLink->get_name()
+                        : std::string(
+                              CPLGetBasename(oKmlHref.get_path().c_str()));
+
+                AddLayer(osLayerName.c_str(), wkbUnknown, nullptr, this,
+                         std::move(poKmlLyrRoot), poKmlLyrContainer,
+                         oKmlHref.get_path().c_str(), FALSE, bUpdateIn,
+                         static_cast<int>(nKmlFeatures));
 
                 /***** check if any features are another layer *****/
                 ParseLayers(std::move(poKmlLyrContainer), true);
@@ -1411,8 +1444,19 @@ int OGRLIBKMLDataSource::OpenDir(const char *pszFilename, int bUpdateIn)
             continue;
         }
 
+        // Root document generated by ourselves. Contains nothing of interest
+        if (poKmlContainer->has_id() && poKmlContainer->get_id() == "root_doc")
+        {
+            continue;
+        }
+
+        const std::string osLayerName =
+            poKmlContainer->has_name()
+                ? poKmlContainer->get_name()
+                : std::string(CPLGetBasename(osFilePath.c_str()));
+
         /***** create the layer *****/
-        AddLayer(CPLGetBasename(osFilePath.c_str()), wkbUnknown, nullptr, this,
+        AddLayer(osLayerName.c_str(), wkbUnknown, nullptr, this,
                  std::move(poKmlRoot), poKmlContainer, osFilePath.c_str(),
                  FALSE, bUpdateIn, nFiles);
 
@@ -1473,7 +1517,6 @@ static bool CheckIsKMZ(const char *pszFilename)
 int OGRLIBKMLDataSource::Open(const char *pszFilename, int bUpdateIn)
 {
     bUpdate = CPL_TO_BOOL(bUpdateIn);
-    m_pszName = CPLStrdup(pszFilename);
 
     /***** dir *****/
     VSIStatBufL sStatBuf;
@@ -1822,7 +1865,9 @@ int OGRLIBKMLDataSource::CreateKmz(const char * /* pszFilename */,
         }
     }
 
-    m_osStylePath = "style/style.kml";
+    // Layers are written in a layers/ subdirectory, hence ../style
+    // to access style/style.kml
+    m_osStylePath = "../style/style.kml";
 
     m_isKmz = true;
     bUpdated = true;
@@ -1887,7 +1932,7 @@ int OGRLIBKMLDataSource::Create(const char *pszFilename, char **papszOptions)
     if (strcmp(pszFilename, "/dev/stdout") == 0)
         pszFilename = "/vsistdout/";
 
-    m_pszName = CPLStrdup(pszFilename);
+    SetDescription(pszFilename);
     bUpdate = true;
 
     osUpdateTargetHref =
@@ -2070,7 +2115,7 @@ OGRErr OGRLIBKMLDataSource::DeleteLayer(int iLayer)
 
         /***** delete the file the layer corresponds to *****/
         const char *pszFilePath = CPLFormFilename(
-            m_pszName, papoLayers[iLayer]->GetFileName(), nullptr);
+            GetDescription(), papoLayers[iLayer]->GetFileName(), nullptr);
         VSIStatBufL oStatBufL;
         if (!VSIStatL(pszFilePath, &oStatBufL))
         {
@@ -2153,7 +2198,7 @@ OGRLIBKMLLayer *OGRLIBKMLDataSource::CreateLayerKml(
 
 OGRLIBKMLLayer *OGRLIBKMLDataSource::CreateLayerKmz(
     const char *pszLayerName, const OGRSpatialReference *poSRS,
-    OGRwkbGeometryType eGType, CSLConstList /* papszOptions */)
+    OGRwkbGeometryType eGType, CSLConstList papszOptions)
 {
     DocumentPtr poKmlDocument = nullptr;
 
@@ -2168,6 +2213,9 @@ OGRLIBKMLLayer *OGRLIBKMLDataSource::CreateLayerKmz(
             poKmlDocument = AsDocument(m_poKmlDocKml);
 
             NetworkLinkPtr poKmlNetLink = m_poKmlFactory->CreateNetworkLink();
+            poKmlNetLink->set_name(
+                CSLFetchNameValueDef(papszOptions, "NAME", pszLayerName));
+
             LinkPtr poKmlLink = m_poKmlFactory->CreateLink();
 
             std::string oHref;
diff --git a/ogr/ogrsf_frmts/libkml/ogrlibkmldriver.cpp b/ogr/ogrsf_frmts/libkml/ogrlibkmldriver.cpp
index 7864199b8bcc..0a517c879fe7 100644
--- a/ogr/ogrsf_frmts/libkml/ogrlibkmldriver.cpp
+++ b/ogr/ogrsf_frmts/libkml/ogrlibkmldriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Brian Case
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #include "libkml_headers.h"
diff --git a/ogr/ogrsf_frmts/libkml/ogrlibkmldrivercore.cpp b/ogr/ogrsf_frmts/libkml/ogrlibkmldrivercore.cpp
index 380c4e40e1d9..f477587ee883 100644
--- a/ogr/ogrsf_frmts/libkml/ogrlibkmldrivercore.cpp
+++ b/ogr/ogrsf_frmts/libkml/ogrlibkmldrivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Brian Case
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #include "ogrsf_frmts.h"
diff --git a/ogr/ogrsf_frmts/libkml/ogrlibkmldrivercore.h b/ogr/ogrsf_frmts/libkml/ogrlibkmldrivercore.h
index e82866ead089..76462686efd6 100644
--- a/ogr/ogrsf_frmts/libkml/ogrlibkmldrivercore.h
+++ b/ogr/ogrsf_frmts/libkml/ogrlibkmldrivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Brian Case
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef OGRLIBKMLDRIVERCORE_H
diff --git a/ogr/ogrsf_frmts/libkml/ogrlibkmlfeature.cpp b/ogr/ogrsf_frmts/libkml/ogrlibkmlfeature.cpp
index ac0071e62ee7..cda52e30a18c 100644
--- a/ogr/ogrsf_frmts/libkml/ogrlibkmlfeature.cpp
+++ b/ogr/ogrsf_frmts/libkml/ogrlibkmlfeature.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2010, Brian Case
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #include "libkml_headers.h"
@@ -225,9 +209,7 @@ FeaturePtr feat2kml(OGRLIBKMLDataSource *poOgrDS, OGRLIBKMLLayer *poOgrLayer,
                     int bUseSimpleField)
 {
     FeaturePtr poKmlFeature = nullptr;
-
-    struct fieldconfig oFC;
-    get_fieldconfig(&oFC);
+    const auto &oFC = poOgrLayer->GetFieldConfig();
 
     /***** geometry *****/
     OGRGeometry *poOgrGeom = poOgrFeat->GetGeometryRef();
@@ -456,6 +438,8 @@ FeaturePtr feat2kml(OGRLIBKMLDataSource *poOgrDS, OGRLIBKMLLayer *poOgrLayer,
             }
 
             ElementPtr poKmlElement = geom2kml(poOgrGeom, -1, poKmlFactory);
+            if (!poKmlElement)
+                return nullptr;
 
             poKmlPhotoOverlay->set_point(AsPoint(std::move(poKmlElement)));
         }
@@ -809,9 +793,19 @@ FeaturePtr feat2kml(OGRLIBKMLDataSource *poOgrDS, OGRLIBKMLLayer *poOgrLayer,
         const PlacemarkPtr poKmlPlacemark = poKmlFactory->CreatePlacemark();
         poKmlFeature = poKmlPlacemark;
 
-        ElementPtr poKmlElement = geom2kml(poOgrGeom, -1, poKmlFactory);
+        if (poOgrGeom)
+        {
+            ElementPtr poKmlElement = geom2kml(poOgrGeom, -1, poKmlFactory);
+            if (!poKmlElement)
+            {
+                CPLError(CE_Failure, CPLE_AppDefined,
+                         "Cannot translate feature: %s",
+                         poOgrFeat->DumpReadableAsString().c_str());
+                return nullptr;
+            }
 
-        poKmlPlacemark->set_geometry(AsGeometry(std::move(poKmlElement)));
+            poKmlPlacemark->set_geometry(AsGeometry(std::move(poKmlElement)));
+        }
     }
 
     if (!camera)
@@ -826,13 +820,13 @@ FeaturePtr feat2kml(OGRLIBKMLDataSource *poOgrDS, OGRLIBKMLLayer *poOgrLayer,
 
     /***** fields *****/
     field2kml(poOgrFeat, poOgrLayer, poKmlFactory, poKmlFeature,
-              bUseSimpleField);
+              bUseSimpleField, oFC);
 
     return poKmlFeature;
 }
 
 OGRFeature *kml2feat(PlacemarkPtr poKmlPlacemark, OGRLIBKMLDataSource *poOgrDS,
-                     OGRLayer *poOgrLayer, OGRFeatureDefn *poOgrFeatDefn,
+                     OGRLIBKMLLayer *poOgrLayer, OGRFeatureDefn *poOgrFeatDefn,
                      OGRSpatialReference *poOgrSRS)
 {
     OGRFeature *poOgrFeat = new OGRFeature(poOgrFeatDefn);
@@ -865,14 +859,15 @@ OGRFeature *kml2feat(PlacemarkPtr poKmlPlacemark, OGRLIBKMLDataSource *poOgrDS,
     }
 
     /***** fields *****/
-    kml2field(poOgrFeat, AsFeature(poKmlPlacemark));
+    kml2field(poOgrFeat, AsFeature(poKmlPlacemark),
+              poOgrLayer->GetFieldConfig());
 
     return poOgrFeat;
 }
 
 OGRFeature *kmlgroundoverlay2feat(GroundOverlayPtr poKmlOverlay,
                                   OGRLIBKMLDataSource * /* poOgrDS */,
-                                  OGRLayer * /* poOgrLayer */,
+                                  OGRLIBKMLLayer *poOgrLayer,
                                   OGRFeatureDefn *poOgrFeatDefn,
                                   OGRSpatialReference *poOgrSRS)
 {
@@ -893,7 +888,7 @@ OGRFeature *kmlgroundoverlay2feat(GroundOverlayPtr poKmlOverlay,
     }
 
     /***** fields *****/
-    kml2field(poOgrFeat, AsFeature(poKmlOverlay));
+    kml2field(poOgrFeat, AsFeature(poKmlOverlay), poOgrLayer->GetFieldConfig());
 
     return poOgrFeat;
 }
diff --git a/ogr/ogrsf_frmts/libkml/ogrlibkmlfeature.h b/ogr/ogrsf_frmts/libkml/ogrlibkmlfeature.h
index d470c00746fb..392d1ed9bd4b 100644
--- a/ogr/ogrsf_frmts/libkml/ogrlibkmlfeature.h
+++ b/ogr/ogrsf_frmts/libkml/ogrlibkmlfeature.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Brian Case
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef OGR_LIBKML_FEATURE_H
@@ -45,13 +29,13 @@ kmldom::FeaturePtr feat2kml(OGRLIBKMLDataSource *poOgrDS,
 ******************************************************************************/
 
 OGRFeature *kml2feat(kmldom::PlacemarkPtr poKmlPlacemark,
-                     OGRLIBKMLDataSource *poOgrDS, OGRLayer *poOgrLayer,
+                     OGRLIBKMLDataSource *poOgrDS, OGRLIBKMLLayer *poOgrLayer,
                      OGRFeatureDefn *poOgrFeatDefn,
                      OGRSpatialReference *poOgrSRS);
 
 OGRFeature *kmlgroundoverlay2feat(kmldom::GroundOverlayPtr poKmlOverlay,
                                   OGRLIBKMLDataSource *poOgrDS,
-                                  OGRLayer *poOgrLayer,
+                                  OGRLIBKMLLayer *poOgrLayer,
                                   OGRFeatureDefn *poOgrFeatDefn,
                                   OGRSpatialReference *poOgrSRS);
 
diff --git a/ogr/ogrsf_frmts/libkml/ogrlibkmlfeaturestyle.cpp b/ogr/ogrsf_frmts/libkml/ogrlibkmlfeaturestyle.cpp
index 81dd5374a74a..f730708815ee 100644
--- a/ogr/ogrsf_frmts/libkml/ogrlibkmlfeaturestyle.cpp
+++ b/ogr/ogrsf_frmts/libkml/ogrlibkmlfeaturestyle.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2010, Brian Case
  * Copyright (c) 2010-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #include "libkml_headers.h"
@@ -171,7 +155,17 @@ void kml2featurestyle(FeaturePtr poKmlFeature, OGRLIBKMLDataSource *poOgrDS,
     for (int i = 0; i < nStyleURLIterations; ++i)
     {
         /***** is the name in the layer style table *****/
-        const std::string osUrl(poKmlFeature->get_styleurl());
+        std::string osUrl(poKmlFeature->get_styleurl());
+
+        // Starting with GDAL 3.9.2, style URLs in KMZ files we generate start
+        // with ../style/style.kml# to reflect the file hierarchy
+        // Strip the leading ../ for correct resolution.
+        constexpr const char *DOTDOT_URL = "../style/style.kml#";
+        if (osUrl.size() > strlen(DOTDOT_URL) &&
+            memcmp(osUrl.data(), DOTDOT_URL, strlen(DOTDOT_URL)) == 0)
+        {
+            osUrl = osUrl.substr(strlen("../"));
+        }
 
         OGRStyleTable *poOgrSTBLLayer = nullptr;
         const char *pszTest = nullptr;
@@ -205,16 +199,10 @@ void kml2featurestyle(FeaturePtr poKmlFeature, OGRLIBKMLDataSource *poOgrDS,
         else
         {
             const size_t nPathLen = poOgrDS->GetStylePath().size();
-
-            if (nPathLen == 0)
-            {
-                if (!osUrl.empty() && osUrl[0] == '#')
-                    osStyleString = std::string("@").append(osUrl.c_str() + 1);
-            }
-            else if (osUrl.size() > nPathLen &&
-                     strncmp(osUrl.c_str(), poOgrDS->GetStylePath().c_str(),
-                             nPathLen) == 0 &&
-                     osUrl[nPathLen] == '#')
+            if (osUrl.size() > nPathLen && osUrl[nPathLen] == '#' &&
+                (nPathLen == 0 ||
+                 strncmp(osUrl.c_str(), poOgrDS->GetStylePath().c_str(),
+                         nPathLen) == 0))
             {
                 /***** should we resolve the style *****/
                 const char *pszResolve =
diff --git a/ogr/ogrsf_frmts/libkml/ogrlibkmlfeaturestyle.h b/ogr/ogrsf_frmts/libkml/ogrlibkmlfeaturestyle.h
index 26a5f2cdf24e..85b2ac94013b 100644
--- a/ogr/ogrsf_frmts/libkml/ogrlibkmlfeaturestyle.h
+++ b/ogr/ogrsf_frmts/libkml/ogrlibkmlfeaturestyle.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Brian Case
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #include "ogr_libkml.h"
diff --git a/ogr/ogrsf_frmts/libkml/ogrlibkmlfield.cpp b/ogr/ogrsf_frmts/libkml/ogrlibkmlfield.cpp
index 2fa024ac50ec..5014f9aa41a4 100644
--- a/ogr/ogrsf_frmts/libkml/ogrlibkmlfield.cpp
+++ b/ogr/ogrsf_frmts/libkml/ogrlibkmlfield.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2010, Brian Case
  * Copyright (c) 2010-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #include "libkml_headers.h"
@@ -273,7 +257,7 @@ static char *OGRLIBKMLSanitizeUTF8String(const char *pszString)
 
 void field2kml(OGRFeature *poOgrFeat, OGRLIBKMLLayer *poOgrLayer,
                KmlFactory *poKmlFactory, FeaturePtr poKmlFeature,
-               int bUseSimpleFieldIn)
+               int bUseSimpleFieldIn, const fieldconfig &oFC)
 {
     const bool bUseSimpleField = CPL_TO_BOOL(bUseSimpleFieldIn);
     SchemaDataPtr poKmlSchemaData = nullptr;
@@ -293,10 +277,6 @@ void field2kml(OGRFeature *poOgrFeat, OGRLIBKMLLayer *poOgrLayer,
         }
     }
 
-    /***** Get the field config *****/
-    struct fieldconfig oFC;
-    get_fieldconfig(&oFC);
-
     TimeSpanPtr poKmlTimeSpan = nullptr;
 
     const int nFields = poOgrFeat->GetFieldCount();
@@ -338,6 +318,13 @@ void field2kml(OGRFeature *poOgrFeat, OGRLIBKMLLayer *poOgrLayer,
                     continue;
                 }
 
+                /***** id *****/
+                if (EQUAL(name, oFC.idfield))
+                {
+                    poKmlFeature->set_id(pszUTF8String);
+                    CPLFree(pszUTF8String);
+                    continue;
+                }
                 /***** name *****/
                 if (EQUAL(name, oFC.namefield))
                 {
@@ -1123,7 +1110,7 @@ static const char *TrimSpaces(CPLString &oText)
 
     // Trim trailing spaces.
     while (!oText.empty() && oText.back() == ' ')
-        oText.resize(oText.size() - 1);
+        oText.pop_back();
 
     // Skip leading newline and spaces.
     const char *pszText = oText.c_str();
@@ -1157,13 +1144,19 @@ static void kmldatetime2ogr(OGRFeature *poOgrFeat, const char *pszOGRField,
  function to read kml into ogr fields
 ******************************************************************************/
 
-void kml2field(OGRFeature *poOgrFeat, FeaturePtr poKmlFeature)
+void kml2field(OGRFeature *poOgrFeat, FeaturePtr poKmlFeature,
+               const fieldconfig &oFC)
 {
-    /***** get the field config *****/
+    /***** id *****/
 
-    struct fieldconfig oFC;
-    get_fieldconfig(&oFC);
+    if (poKmlFeature->has_id())
+    {
+        const std::string oKmlId = poKmlFeature->get_id();
+        int iField = poOgrFeat->GetFieldIndex(oFC.idfield);
 
+        if (iField > -1)
+            poOgrFeat->SetField(iField, oKmlId.c_str());
+    }
     /***** name *****/
 
     if (poKmlFeature->has_name())
@@ -1552,15 +1545,13 @@ void kml2field(OGRFeature *poOgrFeat, FeaturePtr poKmlFeature)
 ******************************************************************************/
 
 SimpleFieldPtr FieldDef2kml(const OGRFieldDefn *poOgrFieldDef,
-                            KmlFactory *poKmlFactory, bool bApproxOK)
+                            KmlFactory *poKmlFactory, bool bApproxOK,
+                            const fieldconfig &oFC)
 {
-    /***** Get the field config. *****/
-    struct fieldconfig oFC;
-    get_fieldconfig(&oFC);
-
     const char *pszFieldName = poOgrFieldDef->GetNameRef();
 
-    if (EQUAL(pszFieldName, oFC.namefield) ||
+    if (EQUAL(pszFieldName, oFC.idfield) ||
+        EQUAL(pszFieldName, oFC.namefield) ||
         EQUAL(pszFieldName, oFC.descfield) ||
         EQUAL(pszFieldName, oFC.tsfield) ||
         EQUAL(pszFieldName, oFC.beginfield) ||
@@ -1724,6 +1715,7 @@ void kml2FeatureDef(SchemaPtr poKmlSchema, OGRFeatureDefn *poOgrFeatureDefn)
 
 void get_fieldconfig(struct fieldconfig *oFC)
 {
+    oFC->idfield = CPLGetConfigOption("LIBKML_ID_FIELD", "id");
     oFC->namefield = CPLGetConfigOption("LIBKML_NAME_FIELD", "Name");
     oFC->descfield =
         CPLGetConfigOption("LIBKML_DESCRIPTION_FIELD", "description");
diff --git a/ogr/ogrsf_frmts/libkml/ogrlibkmlfield.h b/ogr/ogrsf_frmts/libkml/ogrlibkmlfield.h
index 2fa81e36fa77..fd373ffa14c4 100644
--- a/ogr/ogrsf_frmts/libkml/ogrlibkmlfield.h
+++ b/ogr/ogrsf_frmts/libkml/ogrlibkmlfield.h
@@ -8,28 +8,14 @@
  * Copyright (c) 2010, Brian Case
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef OGRLIBKMLFIELD_H_INCLUDED
 #define OGRLIBKMLFIELD_H_INCLUDED
 
+#include "fieldconfig.h"
+
 /******************************************************************************
  Function to output ogr fields in kml.
 
@@ -55,13 +41,15 @@
 
 void field2kml(OGRFeature *poOgrFeat, OGRLIBKMLLayer *poOgrLayer,
                kmldom::KmlFactory *poKmlFactory,
-               kmldom::FeaturePtr poKmlPlacemark, int bUseSimpleField);
+               kmldom::FeaturePtr poKmlPlacemark, int bUseSimpleField,
+               const fieldconfig &oFC);
 
 /******************************************************************************
  Function to read kml into ogr fields.
 ******************************************************************************/
 
-void kml2field(OGRFeature *poOgrFeat, kmldom::FeaturePtr poKmlFeature);
+void kml2field(OGRFeature *poOgrFeat, kmldom::FeaturePtr poKmlFeature,
+               const fieldconfig &oFC);
 
 /******************************************************************************
  Function create a simplefield from a FieldDefn.
@@ -69,7 +57,7 @@ void kml2field(OGRFeature *poOgrFeat, kmldom::FeaturePtr poKmlFeature);
 
 kmldom::SimpleFieldPtr FieldDef2kml(const OGRFieldDefn *poOgrFieldDef,
                                     kmldom::KmlFactory *poKmlFactory,
-                                    bool bApproxOK);
+                                    bool bApproxOK, const fieldconfig &oFC);
 
 /******************************************************************************
  Function to add the simpleFields in a schema to a featuredefn.
@@ -78,60 +66,6 @@ kmldom::SimpleFieldPtr FieldDef2kml(const OGRFieldDefn *poOgrFieldDef,
 void kml2FeatureDef(kmldom::SchemaPtr poKmlSchema,
                     OGRFeatureDefn *poOgrFeatureDefn);
 
-/*******************************************************************************
- Function to fetch the field config options.
-*******************************************************************************/
-
-struct fieldconfig
-{
-    const char *namefield;
-    const char *descfield;
-    const char *tsfield;
-    const char *beginfield;
-    const char *endfield;
-    const char *altitudeModefield;
-    const char *tessellatefield;
-    const char *extrudefield;
-    const char *visibilityfield;
-    const char *drawOrderfield;
-    const char *iconfield;
-    const char *headingfield;
-    const char *tiltfield;
-    const char *rollfield;
-    const char *snippetfield;
-    const char *modelfield;
-    const char *scalexfield;
-    const char *scaleyfield;
-    const char *scalezfield;
-    const char *networklinkfield;
-    const char *networklink_refreshvisibility_field;
-    const char *networklink_flytoview_field;
-    const char *networklink_refreshMode_field;
-    const char *networklink_refreshInterval_field;
-    const char *networklink_viewRefreshMode_field;
-    const char *networklink_viewRefreshTime_field;
-    const char *networklink_viewBoundScale_field;
-    const char *networklink_viewFormat_field;
-    const char *networklink_httpQuery_field;
-    const char *camera_longitude_field;
-    const char *camera_latitude_field;
-    const char *camera_altitude_field;
-    const char *camera_altitudemode_field;
-    const char *photooverlayfield;
-    const char *leftfovfield;
-    const char *rightfovfield;
-    const char *bottomfovfield;
-    const char *topfovfield;
-    const char *nearfield;
-    const char *photooverlay_shape_field;
-    const char *imagepyramid_tilesize_field;
-    const char *imagepyramid_maxwidth_field;
-    const char *imagepyramid_maxheight_field;
-    const char *imagepyramid_gridorigin_field;
-};
-
-void get_fieldconfig(struct fieldconfig *oFC);
-
 int kmlAltitudeModeFromString(const char *pszAltitudeMode, int &isGX);
 
 #endif /* OGRLIBKMLFIELD_H_INCLUDED */
diff --git a/ogr/ogrsf_frmts/libkml/ogrlibkmlgeometry.cpp b/ogr/ogrsf_frmts/libkml/ogrlibkmlgeometry.cpp
index 3c8c94b9e640..80b45e76c7a8 100644
--- a/ogr/ogrsf_frmts/libkml/ogrlibkmlgeometry.cpp
+++ b/ogr/ogrsf_frmts/libkml/ogrlibkmlgeometry.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2010, Brian Case
  * Copyright (c) 2010-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #include "libkml_headers.h"
@@ -50,6 +34,51 @@ using kmldom::OuterBoundaryIsPtr;
 using kmldom::PointPtr;
 using kmldom::PolygonPtr;
 
+static bool NormalizeLongLat(double &x, double &y)
+{
+    if (x >= -180 && x <= 180)
+    {
+        // nominal
+    }
+    else if (x > 180 && x <= 180 + 360)
+        x -= 360;
+    else if (x < -180 && x >= -180 - 360)
+        x += 360;
+    else
+    {
+        const bool bStrictCompliance =
+            CPLTestBool(CPLGetConfigOption("LIBKML_STRICT_COMPLIANCE", "TRUE"));
+        CPLError(bStrictCompliance ? CE_Failure : CE_Warning, CPLE_AppDefined,
+                 "Invalid longitude %g", x);
+        if (bStrictCompliance)
+            return false;
+    }
+
+    constexpr double EPSILON = 1e-8;
+    if (y >= -90 && y <= 90)
+    {
+        // nominal
+    }
+    else if (y > 90 && y < 90 + EPSILON)
+    {
+        y = 90;
+    }
+    else if (y < -90 && y > -90 - EPSILON)
+    {
+        y = -90;
+    }
+    else
+    {
+        const bool bStrictCompliance =
+            CPLTestBool(CPLGetConfigOption("LIBKML_STRICT_COMPLIANCE", "TRUE"));
+        CPLError(bStrictCompliance ? CE_Failure : CE_Warning, CPLE_AppDefined,
+                 "Invalid latitude %g", y);
+        if (bStrictCompliance)
+            return false;
+    }
+    return true;
+}
+
 /******************************************************************************
  Function to write out a ogr geometry to kml.
 
@@ -70,10 +99,6 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
         return nullptr;
     }
 
-    /***** ogr geom vars *****/
-    OGRPoint *poOgrPoint = nullptr;
-    OGRLineString *poOgrLineString = nullptr;
-
     /***** libkml geom vars *****/
     CoordinatesPtr coordinates = nullptr;
 
@@ -88,7 +113,7 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
     {
         case wkbPoint:
         {
-            poOgrPoint = (OGRPoint *)poOgrGeom;
+            const OGRPoint *poOgrPoint = poOgrGeom->toPoint();
             PointPtr poKmlPoint = nullptr;
             if (poOgrPoint->getCoordinateDimension() == 0)
             {
@@ -98,10 +123,10 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
             else
             {
                 double x = poOgrPoint->getX();
-                const double y = poOgrPoint->getY();
+                double y = poOgrPoint->getY();
 
-                if (x > 180)
-                    x -= 360;
+                if (!NormalizeLongLat(x, y))
+                    return nullptr;
 
                 coordinates = poKmlFactory->CreateCoordinates();
                 coordinates->add_latlng(y, x);
@@ -114,14 +139,14 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
         }
         case wkbPoint25D:
         {
-            poOgrPoint = (OGRPoint *)poOgrGeom;
+            const OGRPoint *poOgrPoint = poOgrGeom->toPoint();
 
             double x = poOgrPoint->getX();
-            const double y = poOgrPoint->getY();
+            double y = poOgrPoint->getY();
             const double z = poOgrPoint->getZ();
 
-            if (x > 180)
-                x -= 360;
+            if (!NormalizeLongLat(x, y))
+                return nullptr;
 
             coordinates = poKmlFactory->CreateCoordinates();
             coordinates->add_latlngalt(y, x, z);
@@ -132,11 +157,12 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
             break;
         }
         case wkbLineString:
-            poOgrLineString = (OGRLineString *)poOgrGeom;
+        {
+            OGRLineString *poOgrLineString = poOgrGeom->toLineString();
 
             if (extra >= 0)
             {
-                ((OGRLinearRing *)poOgrGeom)->closeRings();
+                poOgrGeom->toLinearRing()->closeRings();
             }
 
             numpoints = poOgrLineString->getNumPoints();
@@ -163,21 +189,20 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
 
             coordinates = poKmlFactory->CreateCoordinates();
 
-            poOgrPoint = new OGRPoint();
+            OGRPoint point;
 
             for (int i = 0; i < numpoints; i++)
             {
-                poOgrLineString->getPoint(i, poOgrPoint);
+                poOgrLineString->getPoint(i, &point);
 
-                double x = poOgrPoint->getX();
-                const double y = poOgrPoint->getY();
+                double x = point.getX();
+                double y = point.getY();
 
-                if (x > 180)
-                    x -= 360;
+                if (!NormalizeLongLat(x, y))
+                    return nullptr;
 
                 coordinates->add_latlng(y, x);
             }
-            delete poOgrPoint;
 
             /***** Check if its a wkbLinearRing *****/
             if (extra < 0)
@@ -190,7 +215,7 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
                 break;
             }
             [[fallthrough]];
-
+        }
             /***** fallthrough *****/
 
         case wkbLinearRing:  // This case is for readability only.
@@ -217,11 +242,11 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
         }
         case wkbLineString25D:
         {
-            poOgrLineString = (OGRLineString *)poOgrGeom;
+            const OGRLineString *poOgrLineString = poOgrGeom->toLineString();
 
             if (extra >= 0)
             {
-                ((OGRLinearRing *)poOgrGeom)->closeRings();
+                poOgrGeom->toLinearRing()->closeRings();
             }
 
             numpoints = poOgrLineString->getNumPoints();
@@ -247,22 +272,21 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
             }
 
             coordinates = poKmlFactory->CreateCoordinates();
-            poOgrPoint = new OGRPoint();
+            OGRPoint point;
 
             for (int i = 0; i < numpoints; i++)
             {
-                poOgrLineString->getPoint(i, poOgrPoint);
+                poOgrLineString->getPoint(i, &point);
 
-                double x = poOgrPoint->getX();
-                const double y = poOgrPoint->getY();
-                const double z = poOgrPoint->getZ();
+                double x = point.getX();
+                double y = point.getY();
+                const double z = point.getZ();
 
-                if (x > 180)
-                    x -= 360;
+                if (!NormalizeLongLat(x, y))
+                    return nullptr;
 
                 coordinates->add_latlngalt(y, x, z);
             }
-            delete poOgrPoint;
 
             /***** Check if its a wkbLinearRing *****/
             if (extra < 0)
@@ -300,22 +324,30 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
         }
         case wkbPolygon:
         {
-            CPLErrorReset();
             if (CPLTestBool(
                     CPLGetConfigOption("LIBKML_STRICT_COMPLIANCE", "TRUE")) &&
-                OGRGeometryFactory::haveGEOS() &&
-                (!poOgrGeom->IsValid() || CPLGetLastErrorType() != CE_None))
+                OGRGeometryFactory::haveGEOS())
             {
-                CPLError(CE_Failure, CPLE_NotSupported, "Invalid polygon");
-                return nullptr;
+                bool bError;
+                {
+                    CPLErrorStateBackuper oErrorStateBackuper;
+                    bError = !poOgrGeom->IsValid();
+                }
+                if (bError)
+                {
+                    CPLError(CE_Failure, CPLE_NotSupported, "Invalid polygon");
+                    return nullptr;
+                }
             }
 
             PolygonPtr poKmlPolygon = poKmlFactory->CreatePolygon();
             poKmlGeometry = poKmlPolygon;
 
-            OGRPolygon *poOgrPolygon = (OGRPolygon *)poOgrGeom;
+            OGRPolygon *poOgrPolygon = poOgrGeom->toPolygon();
             ElementPtr poKmlTmpGeometry =
                 geom2kml(poOgrPolygon->getExteriorRing(), 0, poKmlFactory);
+            if (!poKmlTmpGeometry)
+                return nullptr;
             poKmlPolygon->set_outerboundaryis(
                 AsOuterBoundaryIs(poKmlTmpGeometry));
 
@@ -324,6 +356,8 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
             {
                 poKmlTmpGeometry = geom2kml(poOgrPolygon->getInteriorRing(i),
                                             i + 1, poKmlFactory);
+                if (!poKmlTmpGeometry)
+                    return nullptr;
                 poKmlPolygon->add_innerboundaryis(
                     AsInnerBoundaryIs(poKmlTmpGeometry));
             }
@@ -332,22 +366,30 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
         }
         case wkbPolygon25D:
         {
-            CPLErrorReset();
             if (CPLTestBool(
                     CPLGetConfigOption("LIBKML_STRICT_COMPLIANCE", "TRUE")) &&
-                OGRGeometryFactory::haveGEOS() &&
-                (!poOgrGeom->IsValid() || CPLGetLastErrorType() != CE_None))
+                OGRGeometryFactory::haveGEOS())
             {
-                CPLError(CE_Failure, CPLE_NotSupported, "Invalid polygon");
-                return nullptr;
+                bool bError;
+                {
+                    CPLErrorStateBackuper oErrorStateBackuper;
+                    bError = !poOgrGeom->IsValid();
+                }
+                if (bError)
+                {
+                    CPLError(CE_Failure, CPLE_NotSupported, "Invalid polygon");
+                    return nullptr;
+                }
             }
 
             PolygonPtr poKmlPolygon = poKmlFactory->CreatePolygon();
             poKmlGeometry = poKmlPolygon;
 
-            OGRPolygon *poOgrPolygon = (OGRPolygon *)poOgrGeom;
+            OGRPolygon *poOgrPolygon = poOgrGeom->toPolygon();
             ElementPtr poKmlTmpGeometry =
                 geom2kml(poOgrPolygon->getExteriorRing(), 0, poKmlFactory);
+            if (!poKmlTmpGeometry)
+                return nullptr;
             poKmlPolygon->set_outerboundaryis(
                 AsOuterBoundaryIs(poKmlTmpGeometry));
 
@@ -356,6 +398,8 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
             {
                 poKmlTmpGeometry = geom2kml(poOgrPolygon->getInteriorRing(i),
                                             i + 1, poKmlFactory);
+                if (!poKmlTmpGeometry)
+                    return nullptr;
                 poKmlPolygon->add_innerboundaryis(
                     AsInnerBoundaryIs(poKmlTmpGeometry));
             }
@@ -372,7 +416,7 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
         case wkbGeometryCollection25D:
         {
             OGRGeometryCollection *poOgrMultiGeom =
-                (OGRGeometryCollection *)poOgrGeom;
+                poOgrGeom->toGeometryCollection();
 
             const int nGeom = poOgrMultiGeom->getNumGeometries();
 
@@ -383,6 +427,8 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
                          "Turning multiple geometry into single geometry");
                 poKmlGeometry = geom2kml(poOgrMultiGeom->getGeometryRef(0), -1,
                                          poKmlFactory);
+                if (!poKmlGeometry)
+                    return nullptr;
             }
             else
             {
@@ -401,6 +447,8 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
                 {
                     ElementPtr poKmlTmpGeometry = geom2kml(
                         poOgrMultiGeom->getGeometryRef(i), -1, poKmlFactory);
+                    if (!poKmlTmpGeometry)
+                        return nullptr;
                     poKmlMultiGeometry->add_geometry(
                         AsGeometry(std::move(poKmlTmpGeometry)));
                 }
diff --git a/ogr/ogrsf_frmts/libkml/ogrlibkmlgeometry.h b/ogr/ogrsf_frmts/libkml/ogrlibkmlgeometry.h
index 8a0a8ace886d..ff595cf88358 100644
--- a/ogr/ogrsf_frmts/libkml/ogrlibkmlgeometry.h
+++ b/ogr/ogrsf_frmts/libkml/ogrlibkmlgeometry.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Brian Case
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef OGR_LIBKML_GEOMETRY_H
diff --git a/ogr/ogrsf_frmts/libkml/ogrlibkmllayer.cpp b/ogr/ogrsf_frmts/libkml/ogrlibkmllayer.cpp
index 4084cb0f497a..4590451e32c9 100644
--- a/ogr/ogrsf_frmts/libkml/ogrlibkmllayer.cpp
+++ b/ogr/ogrsf_frmts/libkml/ogrlibkmllayer.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2010, Brian Case
  * Copyright (c) 2010-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #include "libkml_headers.h"
@@ -122,8 +106,8 @@ OGRLIBKMLLayer::OGRLIBKMLLayer(
     const OGRSpatialReference *poSRSIn, OGRLIBKMLDataSource *poOgrDS,
     ElementPtr poKmlRoot, ContainerPtr poKmlContainer, UpdatePtr poKmlUpdate,
     const char *pszFileName, int bNew, int bUpdateIn)
-    : bUpdate(CPL_TO_BOOL(bUpdateIn)), nFeatures(0), iFeature(0), nFID(1),
-      m_pszName(CPLStrdup(pszLayerName)), m_pszFileName(CPLStrdup(pszFileName)),
+    : bUpdate(CPL_TO_BOOL(bUpdateIn)), m_pszName(CPLStrdup(pszLayerName)),
+      m_pszFileName(CPLStrdup(pszFileName)),
       m_poKmlLayer(std::move(poKmlContainer)),  // Store the layers container.
       m_poKmlLayerRoot(
           std::move(poKmlRoot)),  // Store the root element pointer.
@@ -140,6 +124,8 @@ OGRLIBKMLLayer::OGRLIBKMLLayer(
       m_dfRegionMinX(200), m_dfRegionMinY(200), m_dfRegionMaxX(-200),
       m_dfRegionMaxY(-200), m_bUpdateIsFolder(false)
 {
+    get_fieldconfig(&m_oFieldConfig);
+
     m_poStyleTable = nullptr;
 
     m_poOgrSRS->SetWellKnownGeogCS("WGS84");
@@ -176,6 +162,9 @@ OGRLIBKMLLayer::OGRLIBKMLLayer(
         }
     }
 
+    m_osSanitizedNCName =
+        OGRLIBKMLGetSanitizedNCName(m_poOgrFeatureDefn->GetName());
+
     SetDescription(m_poOgrFeatureDefn->GetName());
     m_poOgrFeatureDefn->Reference();
     m_poOgrFeatureDefn->SetGeomType(eGType);
@@ -188,52 +177,56 @@ OGRLIBKMLLayer::OGRLIBKMLLayer(
         /***** get the number of features on the layer *****/
         nFeatures = static_cast<int>(m_poKmlLayer->get_feature_array_size());
 
-        /***** get the field config *****/
-        struct fieldconfig oFC;
-        get_fieldconfig(&oFC);
+        /***** id field *****/
+        OGRFieldDefn oOgrFieldId(m_oFieldConfig.idfield, OFTString);
+        m_poOgrFeatureDefn->AddFieldDefn(&oOgrFieldId);
 
         /***** name field *****/
-        OGRFieldDefn oOgrFieldName(oFC.namefield, OFTString);
+        OGRFieldDefn oOgrFieldName(m_oFieldConfig.namefield, OFTString);
         m_poOgrFeatureDefn->AddFieldDefn(&oOgrFieldName);
 
         /***** description field *****/
-        OGRFieldDefn oOgrFieldDesc(oFC.descfield, OFTString);
+        OGRFieldDefn oOgrFieldDesc(m_oFieldConfig.descfield, OFTString);
         m_poOgrFeatureDefn->AddFieldDefn(&oOgrFieldDesc);
 
         /***** timestamp field *****/
-        OGRFieldDefn oOgrFieldTs(oFC.tsfield, OFTDateTime);
+        OGRFieldDefn oOgrFieldTs(m_oFieldConfig.tsfield, OFTDateTime);
         m_poOgrFeatureDefn->AddFieldDefn(&oOgrFieldTs);
 
         /*****  timespan begin field *****/
-        OGRFieldDefn oOgrFieldBegin(oFC.beginfield, OFTDateTime);
+        OGRFieldDefn oOgrFieldBegin(m_oFieldConfig.beginfield, OFTDateTime);
         m_poOgrFeatureDefn->AddFieldDefn(&oOgrFieldBegin);
 
         /*****  timespan end field *****/
-        OGRFieldDefn oOgrFieldEnd(oFC.endfield, OFTDateTime);
+        OGRFieldDefn oOgrFieldEnd(m_oFieldConfig.endfield, OFTDateTime);
         m_poOgrFeatureDefn->AddFieldDefn(&oOgrFieldEnd);
 
         /*****  altitudeMode field *****/
-        OGRFieldDefn oOgrFieldAltitudeMode(oFC.altitudeModefield, OFTString);
+        OGRFieldDefn oOgrFieldAltitudeMode(m_oFieldConfig.altitudeModefield,
+                                           OFTString);
         m_poOgrFeatureDefn->AddFieldDefn(&oOgrFieldAltitudeMode);
 
         /***** tessellate field *****/
-        OGRFieldDefn oOgrFieldTessellate(oFC.tessellatefield, OFTInteger);
+        OGRFieldDefn oOgrFieldTessellate(m_oFieldConfig.tessellatefield,
+                                         OFTInteger);
         m_poOgrFeatureDefn->AddFieldDefn(&oOgrFieldTessellate);
 
         /***** extrude field *****/
-        OGRFieldDefn oOgrFieldExtrude(oFC.extrudefield, OFTInteger);
+        OGRFieldDefn oOgrFieldExtrude(m_oFieldConfig.extrudefield, OFTInteger);
         m_poOgrFeatureDefn->AddFieldDefn(&oOgrFieldExtrude);
 
         /***** visibility field *****/
-        OGRFieldDefn oOgrFieldVisibility(oFC.visibilityfield, OFTInteger);
+        OGRFieldDefn oOgrFieldVisibility(m_oFieldConfig.visibilityfield,
+                                         OFTInteger);
         m_poOgrFeatureDefn->AddFieldDefn(&oOgrFieldVisibility);
 
         /***** draw order field *****/
-        OGRFieldDefn oOgrFieldDrawOrder(oFC.drawOrderfield, OFTInteger);
+        OGRFieldDefn oOgrFieldDrawOrder(m_oFieldConfig.drawOrderfield,
+                                        OFTInteger);
         m_poOgrFeatureDefn->AddFieldDefn(&oOgrFieldDrawOrder);
 
         /***** icon field *****/
-        OGRFieldDefn oOgrFieldIcon(oFC.iconfield, OFTString);
+        OGRFieldDefn oOgrFieldIcon(m_oFieldConfig.iconfield, OFTString);
         m_poOgrFeatureDefn->AddFieldDefn(&oOgrFieldIcon);
 
         /***** get the styles *****/
@@ -298,19 +291,22 @@ OGRLIBKMLLayer::OGRLIBKMLLayer(
                         if (camera->has_heading() && !bHasHeading)
                         {
                             bHasHeading = true;
-                            OGRFieldDefn oOgrField(oFC.headingfield, OFTReal);
+                            OGRFieldDefn oOgrField(m_oFieldConfig.headingfield,
+                                                   OFTReal);
                             m_poOgrFeatureDefn->AddFieldDefn(&oOgrField);
                         }
                         if (camera->has_tilt() && !bHasTilt)
                         {
                             bHasTilt = true;
-                            OGRFieldDefn oOgrField(oFC.tiltfield, OFTReal);
+                            OGRFieldDefn oOgrField(m_oFieldConfig.tiltfield,
+                                                   OFTReal);
                             m_poOgrFeatureDefn->AddFieldDefn(&oOgrField);
                         }
                         if (camera->has_roll() && !bHasRoll)
                         {
                             bHasRoll = true;
-                            OGRFieldDefn oOgrField(oFC.rollfield, OFTReal);
+                            OGRFieldDefn oOgrField(m_oFieldConfig.rollfield,
+                                                   OFTReal);
                             m_poOgrFeatureDefn->AddFieldDefn(&oOgrField);
                         }
                     }
@@ -384,7 +380,8 @@ OGRLIBKMLLayer::OGRLIBKMLLayer(
                 if (!bHasSnippet && poKmlFeature->has_snippet())
                 {
                     bHasSnippet = true;
-                    OGRFieldDefn oOgrField(oFC.snippetfield, OFTString);
+                    OGRFieldDefn oOgrField(m_oFieldConfig.snippetfield,
+                                           OFTString);
                     m_poOgrFeatureDefn->AddFieldDefn(&oOgrField);
                 }
             }
@@ -430,14 +427,20 @@ OGRFeature *OGRLIBKMLLayer::GetNextRawFeature()
 
     /***** loop over the kml features to find the next placemark *****/
 
+    std::string id;
     do
     {
         if (iFeature >= nFeatures)
+        {
+            m_bAllReadAtLeastOnce = true;
             break;
+        }
 
         /***** get the next kml feature in the container *****/
         const FeaturePtr poKmlFeature =
             m_poKmlLayer->get_feature_array_at(iFeature++);
+        if (poKmlFeature->has_id())
+            id = poKmlFeature->get_id();
 
         /***** what type of kml feature in the container? *****/
         switch (poKmlFeature->Type())
@@ -463,11 +466,61 @@ OGRFeature *OGRLIBKMLLayer::GetNextRawFeature()
 
     /***** set the FID on the ogr feature *****/
     if (poOgrFeature)
-        poOgrFeature->SetFID(nFID++);
+    {
+        // If KML id is of the form "layername.number", use number as the FID
+        if (!id.empty() && id.size() > m_osSanitizedNCName.size() &&
+            id[m_osSanitizedNCName.size()] == '.' &&
+            STARTS_WITH(id.c_str(), m_osSanitizedNCName.c_str()))
+        {
+            auto iFID =
+                CPLAtoGIntBig(id.c_str() + m_osSanitizedNCName.size() + 1);
+            if (iFID > 0)
+            {
+                poOgrFeature->SetFID(iFID);
+                nFID = std::max(iFID + 1, nFID);
+            }
+        }
+        if (poOgrFeature->GetFID() < 0)
+            poOgrFeature->SetFID(nFID++);
+
+        if (bUpdate && !id.empty())
+        {
+            auto oIter = m_oMapKmlIdToOGRId.find(id);
+            if (oIter != m_oMapKmlIdToOGRId.end())
+            {
+                poOgrFeature->SetFID(oIter->second);
+            }
+            else
+            {
+                m_oMapOGRIdToKmlId[poOgrFeature->GetFID()] = id;
+                m_oMapKmlIdToOGRId[id] = poOgrFeature->GetFID();
+            }
+        }
+    }
 
     return poOgrFeature;
 }
 
+/******************************************************************************/
+/*                              ScanAllFeatures()                             */
+/******************************************************************************/
+
+void OGRLIBKMLLayer::ScanAllFeatures()
+{
+    if (!m_bAllReadAtLeastOnce)
+    {
+        const auto iFeatureBackup = iFeature;
+        const auto nFIDBackup = nFID;
+        while (iFeature < nFeatures &&
+               std::unique_ptr<OGRFeature>(GetNextRawFeature()))
+        {
+            // do nothing
+        }
+        iFeature = iFeatureBackup;
+        nFID = nFIDBackup;
+    }
+}
+
 /******************************************************************************
  Method to add a feature to a layer.
 
@@ -483,6 +536,22 @@ OGRErr OGRLIBKMLLayer::ICreateFeature(OGRFeature *poOgrFeat)
     if (!bUpdate)
         return OGRERR_UNSUPPORTED_OPERATION;
 
+    const int idxIdField =
+        m_poOgrFeatureDefn->GetFieldIndex(m_oFieldConfig.idfield);
+    if (idxIdField >= 0 && poOgrFeat->IsFieldSet(idxIdField))
+    {
+        ScanAllFeatures();
+
+        if (cpl::contains(m_oMapKmlIdToOGRId,
+                          poOgrFeat->GetFieldAsString(idxIdField)))
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                     "A feature with id %s already exists",
+                     poOgrFeat->GetFieldAsString(idxIdField));
+            return OGRERR_FAILURE;
+        }
+    }
+
     OGRGeometry *poGeomBackup = nullptr;
     if (nullptr != m_poCT)
     {
@@ -509,6 +578,8 @@ OGRErr OGRLIBKMLLayer::ICreateFeature(OGRFeature *poOgrFeat)
     FeaturePtr poKmlFeature =
         feat2kml(m_poOgrDS, this, poOgrFeat, m_poOgrDS->GetKmlFactory(),
                  m_bUseSimpleField);
+    if (!poKmlFeature)
+        return OGRERR_FAILURE;
 
     if (poGeomBackup)
         poOgrFeat->SetGeometryDirectly(poGeomBackup);
@@ -527,7 +598,7 @@ OGRErr OGRLIBKMLLayer::ICreateFeature(OGRFeature *poOgrFeat)
             poContainer = poKmlFactory->CreateFolder();
         else
             poContainer = poKmlFactory->CreateDocument();
-        poContainer->set_targetid(OGRLIBKMLGetSanitizedNCName(GetName()));
+        poContainer->set_targetid(m_osSanitizedNCName);
         poContainer->add_feature(poKmlFeature);
         poCreate->add_container(poContainer);
         m_poKmlUpdate->add_updateoperation(poCreate);
@@ -538,10 +609,19 @@ OGRErr OGRLIBKMLLayer::ICreateFeature(OGRFeature *poOgrFeat)
     {
         nFeatures++;
 
-        const char *pszId = CPLSPrintf(
-            "%s.%d", OGRLIBKMLGetSanitizedNCName(GetName()).c_str(), nFeatures);
-        poOgrFeat->SetFID(nFeatures);
-        poKmlFeature->set_id(pszId);
+        if (poOgrFeat->GetFID() < 0)
+        {
+            poOgrFeat->SetFID(nFeatures);
+        }
+        if (!poKmlFeature->has_id())
+        {
+            const char *pszId =
+                CPLSPrintf("%s." CPL_FRMT_GIB, m_osSanitizedNCName.c_str(),
+                           poOgrFeat->GetFID());
+            poKmlFeature->set_id(pszId);
+        }
+        m_oMapOGRIdToKmlId[poOgrFeat->GetFID()] = poKmlFeature->get_id();
+        m_oMapKmlIdToOGRId[poKmlFeature->get_id()] = poOgrFeat->GetFID();
     }
     else
     {
@@ -558,12 +638,13 @@ OGRErr OGRLIBKMLLayer::ICreateFeature(OGRFeature *poOgrFeat)
         }
         else
         {
-            const char *pszId =
-                CPLSPrintf("%s." CPL_FRMT_GIB,
-                           OGRLIBKMLGetSanitizedNCName(GetName()).c_str(),
-                           poOgrFeat->GetFID());
-            poOgrFeat->SetFID(nFeatures);
-            poKmlFeature->set_id(pszId);
+            if (!poKmlFeature->has_id())
+            {
+                const char *pszId =
+                    CPLSPrintf("%s." CPL_FRMT_GIB, m_osSanitizedNCName.c_str(),
+                               poOgrFeat->GetFID());
+                poKmlFeature->set_id(pszId);
+            }
         }
     }
 
@@ -587,24 +668,33 @@ OGRErr OGRLIBKMLLayer::ICreateFeature(OGRFeature *poOgrFeat)
 
 OGRErr OGRLIBKMLLayer::ISetFeature(OGRFeature *poOgrFeat)
 {
-    if (!bUpdate || !m_poKmlUpdate)
+    if (!bUpdate)
         return OGRERR_UNSUPPORTED_OPERATION;
     if (poOgrFeat->GetFID() == OGRNullFID)
-        return OGRERR_FAILURE;
+        return OGRERR_NON_EXISTING_FEATURE;
 
-    FeaturePtr poKmlFeature =
-        feat2kml(m_poOgrDS, this, poOgrFeat, m_poOgrDS->GetKmlFactory(),
-                 m_bUseSimpleField);
-
-    const KmlFactory *poKmlFactory = m_poOgrDS->GetKmlFactory();
-    const ChangePtr poChange = poKmlFactory->CreateChange();
-    poChange->add_object(poKmlFeature);
-    m_poKmlUpdate->add_updateoperation(poChange);
-
-    const char *pszId = CPLSPrintf(
-        "%s." CPL_FRMT_GIB, OGRLIBKMLGetSanitizedNCName(GetName()).c_str(),
-        poOgrFeat->GetFID());
-    poKmlFeature->set_targetid(pszId);
+    if (m_poKmlUpdate)
+    {
+        FeaturePtr poKmlFeature =
+            feat2kml(m_poOgrDS, this, poOgrFeat, m_poOgrDS->GetKmlFactory(),
+                     m_bUseSimpleField);
+
+        const KmlFactory *poKmlFactory = m_poOgrDS->GetKmlFactory();
+        const ChangePtr poChange = poKmlFactory->CreateChange();
+        poChange->add_object(poKmlFeature);
+        m_poKmlUpdate->add_updateoperation(poChange);
+
+        const char *pszId =
+            CPLSPrintf("%s." CPL_FRMT_GIB, m_osSanitizedNCName.c_str(),
+                       poOgrFeat->GetFID());
+        poKmlFeature->set_targetid(pszId);
+    }
+    else if (m_poKmlLayer)
+    {
+        if (DeleteFeature(poOgrFeat->GetFID()) != OGRERR_NONE)
+            return OGRERR_NON_EXISTING_FEATURE;
+        return ICreateFeature(poOgrFeat);
+    }
 
     /***** mark as updated *****/
     m_poOgrDS->Updated();
@@ -626,19 +716,41 @@ OGRErr OGRLIBKMLLayer::ISetFeature(OGRFeature *poOgrFeat)
 
 OGRErr OGRLIBKMLLayer::DeleteFeature(GIntBig nFIDIn)
 {
-    if (!bUpdate || !m_poKmlUpdate)
+    if (!bUpdate)
         return OGRERR_UNSUPPORTED_OPERATION;
 
-    KmlFactory *poKmlFactory = m_poOgrDS->GetKmlFactory();
-    DeletePtr poDelete = poKmlFactory->CreateDelete();
-    m_poKmlUpdate->add_updateoperation(poDelete);
-    PlacemarkPtr poKmlPlacemark = poKmlFactory->CreatePlacemark();
-    poDelete->add_feature(poKmlPlacemark);
+    if (m_poKmlUpdate)
+    {
+        KmlFactory *poKmlFactory = m_poOgrDS->GetKmlFactory();
+        DeletePtr poDelete = poKmlFactory->CreateDelete();
+        m_poKmlUpdate->add_updateoperation(poDelete);
+        PlacemarkPtr poKmlPlacemark = poKmlFactory->CreatePlacemark();
+        poDelete->add_feature(poKmlPlacemark);
+
+        const char *pszId =
+            CPLSPrintf("%s." CPL_FRMT_GIB, m_osSanitizedNCName.c_str(), nFIDIn);
+        poKmlPlacemark->set_targetid(pszId);
+    }
+    else if (m_poKmlLayer)
+    {
+        auto oIter = m_oMapOGRIdToKmlId.find(nFIDIn);
+        if (oIter == m_oMapOGRIdToKmlId.end())
+        {
+            ScanAllFeatures();
 
-    const char *pszId =
-        CPLSPrintf("%s." CPL_FRMT_GIB,
-                   OGRLIBKMLGetSanitizedNCName(GetName()).c_str(), nFIDIn);
-    poKmlPlacemark->set_targetid(pszId);
+            oIter = m_oMapOGRIdToKmlId.find(nFIDIn);
+            if (oIter == m_oMapOGRIdToKmlId.end())
+                return OGRERR_NON_EXISTING_FEATURE;
+        }
+        const auto &osKmlId = oIter->second;
+        if (!m_poKmlLayer->DeleteFeatureById(osKmlId))
+        {
+            return OGRERR_NON_EXISTING_FEATURE;
+        }
+        nFeatures = static_cast<int>(m_poKmlLayer->get_feature_array_size());
+        m_oMapKmlIdToOGRId.erase(osKmlId);
+        m_oMapOGRIdToKmlId.erase(oIter);
+    }
 
     /***** mark as updated *****/
     m_poOgrDS->Updated();
@@ -746,8 +858,9 @@ OGRErr OGRLIBKMLLayer::CreateField(const OGRFieldDefn *poField, int bApproxOK)
     {
         SimpleFieldPtr poKmlSimpleField = nullptr;
 
-        if ((poKmlSimpleField = FieldDef2kml(
-                 poField, m_poOgrDS->GetKmlFactory(), CPL_TO_BOOL(bApproxOK))))
+        if ((poKmlSimpleField =
+                 FieldDef2kml(poField, m_poOgrDS->GetKmlFactory(),
+                              CPL_TO_BOOL(bApproxOK), m_oFieldConfig)))
         {
             if (!m_poKmlSchema)
             {
@@ -757,8 +870,7 @@ OGRErr OGRLIBKMLLayer::CreateField(const OGRFieldDefn *poField, int bApproxOK)
                 m_poKmlSchema = poKmlFactory->CreateSchema();
 
                 /***** Set the id on the new schema *****/
-                std::string oKmlSchemaID =
-                    OGRLIBKMLGetSanitizedNCName(m_pszName);
+                std::string oKmlSchemaID = m_osSanitizedNCName;
                 oKmlSchemaID.append(".schema");
                 m_poKmlSchema->set_id(oKmlSchemaID);
             }
@@ -884,11 +996,15 @@ int OGRLIBKMLLayer::TestCapability(const char *pszCap)
 
     // TODO(schwehr): The false statements are weird.
     if (EQUAL(pszCap, OLCRandomRead))
-        result = FALSE;
+        result = TRUE;
     else if (EQUAL(pszCap, OLCSequentialWrite))
         result = bUpdate;
     else if (EQUAL(pszCap, OLCRandomWrite))
-        result = bUpdate && m_poKmlUpdate;
+        result =
+            bUpdate && (m_poKmlUpdate ||
+                        (m_poKmlLayer &&
+                         (m_poKmlLayer->get_feature_array_size() == 0 ||
+                          m_poKmlLayer->get_feature_array_at(0)->has_id())));
     else if (EQUAL(pszCap, OLCFastFeatureCount))
         result = FALSE;
     else if (EQUAL(pszCap, OLCFastSetNextByIndex))
@@ -896,7 +1012,11 @@ int OGRLIBKMLLayer::TestCapability(const char *pszCap)
     else if (EQUAL(pszCap, OLCCreateField))
         result = bUpdate;
     else if (EQUAL(pszCap, OLCDeleteFeature))
-        result = bUpdate && m_poKmlUpdate;
+        result =
+            bUpdate && (m_poKmlUpdate ||
+                        (m_poKmlLayer &&
+                         (m_poKmlLayer->get_feature_array_size() == 0 ||
+                          m_poKmlLayer->get_feature_array_at(0)->has_id())));
     else if (EQUAL(pszCap, OLCStringsAsUTF8))
         result = TRUE;
     else if (EQUAL(pszCap, OLCZGeometries))
diff --git a/ogr/ogrsf_frmts/libkml/ogrlibkmlstyle.cpp b/ogr/ogrsf_frmts/libkml/ogrlibkmlstyle.cpp
index 13c63a85c345..d7cc67c28236 100644
--- a/ogr/ogrsf_frmts/libkml/ogrlibkmlstyle.cpp
+++ b/ogr/ogrsf_frmts/libkml/ogrlibkmlstyle.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2010, Brian Case
  * Copyright (c) 2011-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #include "libkml_headers.h"
diff --git a/ogr/ogrsf_frmts/libkml/ogrlibkmlstyle.h b/ogr/ogrsf_frmts/libkml/ogrlibkmlstyle.h
index 5f67c3dcd9f6..c31bfc3f9bd1 100644
--- a/ogr/ogrsf_frmts/libkml/ogrlibkmlstyle.h
+++ b/ogr/ogrsf_frmts/libkml/ogrlibkmlstyle.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Brian Case
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef OGR_LIBKML_STYLE_H
diff --git a/ogr/ogrsf_frmts/lvbag/ogr_lvbag.h b/ogr/ogrsf_frmts/lvbag/ogr_lvbag.h
index f54548cf22c3..a45a8544abcd 100644
--- a/ogr/ogrsf_frmts/lvbag/ogr_lvbag.h
+++ b/ogr/ogrsf_frmts/lvbag/ogr_lvbag.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2020, Laixer B.V. <info at laixer dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_LVBAG_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/lvbag/ogrlvbagdatasource.cpp b/ogr/ogrsf_frmts/lvbag/ogrlvbagdatasource.cpp
index 91f9aa3c8e48..e333410e324c 100644
--- a/ogr/ogrsf_frmts/lvbag/ogrlvbagdatasource.cpp
+++ b/ogr/ogrsf_frmts/lvbag/ogrlvbagdatasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2020, Laixer B.V. <info at laixer dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_lvbag.h"
diff --git a/ogr/ogrsf_frmts/lvbag/ogrlvbagdriver.cpp b/ogr/ogrsf_frmts/lvbag/ogrlvbagdriver.cpp
index b6e3b5a094de..c857b32f2943 100644
--- a/ogr/ogrsf_frmts/lvbag/ogrlvbagdriver.cpp
+++ b/ogr/ogrsf_frmts/lvbag/ogrlvbagdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2020, Laixer B.V. <info at laixer dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_lvbag.h"
@@ -39,13 +23,16 @@ static int OGRLVBAGDriverIdentify(GDALOpenInfo *poOpenInfo)
         return FALSE;
     if (poOpenInfo->bIsDirectory)
         return -1;  // Check later
-    if (poOpenInfo->fpL == nullptr)
+    if (poOpenInfo->fpL == nullptr || poOpenInfo->nHeaderBytes == 0)
         return FALSE;
 
     auto pszPtr = reinterpret_cast<const char *>(poOpenInfo->pabyHeader);
-    if (poOpenInfo->nHeaderBytes == 0 || pszPtr[0] != '<')
+    if (pszPtr[0] != '<')
         return FALSE;
 
+    if (poOpenInfo->IsSingleAllowedDriver("LVBAG"))
+        return TRUE;
+
     // Can't handle mutations just yet
     if (strstr(pszPtr,
                "http://www.kadaster.nl/schemas/mutatielevering-generiek/1.0") !=
diff --git a/ogr/ogrsf_frmts/lvbag/ogrlvbaglayer.cpp b/ogr/ogrsf_frmts/lvbag/ogrlvbaglayer.cpp
index cde88746997f..796174cce9d1 100644
--- a/ogr/ogrsf_frmts/lvbag/ogrlvbaglayer.cpp
+++ b/ogr/ogrsf_frmts/lvbag/ogrlvbaglayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2021, Laixer B.V. <info at laixer dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/mapml/ogrmapmldataset.cpp b/ogr/ogrsf_frmts/mapml/ogrmapmldataset.cpp
index e9d62c8a60cf..55a20dcde61a 100644
--- a/ogr/ogrsf_frmts/mapml/ogrmapmldataset.cpp
+++ b/ogr/ogrsf_frmts/mapml/ogrmapmldataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2020, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_minixml.h"
diff --git a/ogr/ogrsf_frmts/mem/ogr_mem.h b/ogr/ogrsf_frmts/mem/ogr_mem.h
index eb14dd08127b..52ad1e156101 100644
--- a/ogr/ogrsf_frmts/mem/ogr_mem.h
+++ b/ogr/ogrsf_frmts/mem/ogr_mem.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRMEM_H_INCLUDED
@@ -76,6 +60,7 @@ class CPL_DLL OGRMemLayer CPL_NON_FINAL : public OGRLayer
     // doesn't change.
     IOGRMemLayerFeatureIterator *GetIterator();
 
+  protected:
     OGRFeature *GetFeatureRef(GIntBig nFeatureId);
 
   public:
@@ -176,24 +161,17 @@ class CPL_DLL OGRMemLayer CPL_NON_FINAL : public OGRLayer
 /*                           OGRMemDataSource                           */
 /************************************************************************/
 
-class OGRMemDataSource CPL_NON_FINAL : public OGRDataSource
+class OGRMemDataSource CPL_NON_FINAL : public GDALDataset
 {
     CPL_DISALLOW_COPY_ASSIGN(OGRMemDataSource)
 
     OGRMemLayer **papoLayers;
     int nLayers;
 
-    char *pszName;
-
   public:
     OGRMemDataSource(const char *, char **);
     virtual ~OGRMemDataSource();
 
-    const char *GetName() override
-    {
-        return pszName;
-    }
-
     int GetLayerCount() override
     {
         return nLayers;
@@ -218,22 +196,4 @@ class OGRMemDataSource CPL_NON_FINAL : public OGRDataSource
                            std::string &failureReason) override;
 };
 
-/************************************************************************/
-/*                             OGRMemDriver                             */
-/************************************************************************/
-
-class OGRMemDriver final : public OGRSFDriver
-{
-  public:
-    virtual ~OGRMemDriver();
-
-    const char *GetName() override;
-    OGRDataSource *Open(const char *, int) override;
-
-    virtual OGRDataSource *CreateDataSource(const char *pszName,
-                                            char ** = nullptr) override;
-
-    int TestCapability(const char *) override;
-};
-
 #endif  // ndef OGRMEM_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/mem/ogrmemdatasource.cpp b/ogr/ogrsf_frmts/mem/ogrmemdatasource.cpp
index c4da9a8b0729..636ca4e3ea4a 100644
--- a/ogr/ogrsf_frmts/mem/ogrmemdatasource.cpp
+++ b/ogr/ogrsf_frmts/mem/ogrmemdatasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -41,8 +25,9 @@
 
 OGRMemDataSource::OGRMemDataSource(const char *pszFilename,
                                    char ** /* papszOptions */)
-    : papoLayers(nullptr), nLayers(0), pszName(CPLStrdup(pszFilename))
+    : papoLayers(nullptr), nLayers(0)
 {
+    SetDescription(pszFilename);
 }
 
 /************************************************************************/
@@ -52,8 +37,6 @@ OGRMemDataSource::OGRMemDataSource(const char *pszFilename,
 OGRMemDataSource::~OGRMemDataSource()
 
 {
-    CPLFree(pszName);
-
     for (int i = 0; i < nLayers; i++)
         delete papoLayers[i];
 
diff --git a/ogr/ogrsf_frmts/mem/ogrmemdriver.cpp b/ogr/ogrsf_frmts/mem/ogrmemdriver.cpp
index 99d03a78cdc9..8015b72752f7 100644
--- a/ogr/ogrsf_frmts/mem/ogrmemdriver.cpp
+++ b/ogr/ogrsf_frmts/mem/ogrmemdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -35,56 +19,27 @@
 #include "ogr_core.h"
 #include "ogrsf_frmts.h"
 
-/************************************************************************/
-/*                          ~OGRMemDriver()                             */
-/************************************************************************/
-
-OGRMemDriver::~OGRMemDriver()
-{
-}
-
-/************************************************************************/
-/*                              GetName()                               */
-/************************************************************************/
-
-const char *OGRMemDriver::GetName()
-{
-    return "Memory";
-}
-
 /************************************************************************/
 /*                                Open()                                */
 /************************************************************************/
 
-OGRDataSource *OGRMemDriver::Open(const char * /* pszFilename */, int)
+static GDALDataset *OGRMemDriverOpen(GDALOpenInfo *)
 {
     return nullptr;
 }
 
 /************************************************************************/
-/*                          CreateDataSource()                          */
+/*                       OGRMemDriverCreate()                           */
 /************************************************************************/
 
-OGRDataSource *OGRMemDriver::CreateDataSource(const char *pszName,
-                                              char **papszOptions)
+static GDALDataset *OGRMemDriverCreate(const char *pszName, int /* nXSize */,
+                                       int /* nYSize */, int /* nBandCount */,
+                                       GDALDataType, char **papszOptions)
 
 {
     return new OGRMemDataSource(pszName, papszOptions);
 }
 
-/************************************************************************/
-/*                           TestCapability()                           */
-/************************************************************************/
-
-int OGRMemDriver::TestCapability(const char *pszCap)
-
-{
-    if (EQUAL(pszCap, ODrCCreateDataSource))
-        return TRUE;
-
-    return FALSE;
-}
-
 /************************************************************************/
 /*                           RegisterOGRMem()                           */
 /************************************************************************/
@@ -95,7 +50,9 @@ void RegisterOGRMEM()
     if (GDALGetDriverByName("Memory") != nullptr)
         return;
 
-    OGRSFDriver *poDriver = new OGRMemDriver;
+    GDALDriver *poDriver = new GDALDriver();
+    poDriver->SetDescription("Memory");
+    poDriver->SetMetadataItem(GDAL_DMD_LONGNAME, "Memory");
     poDriver->SetMetadataItem(GDAL_DCAP_VECTOR, "YES");
     poDriver->SetMetadataItem(GDAL_DCAP_CREATE_LAYER, "YES");
     poDriver->SetMetadataItem(GDAL_DCAP_DELETE_LAYER, "YES");
@@ -137,5 +94,8 @@ void RegisterOGRMEM()
     poDriver->SetMetadataItem(GDAL_DMD_ALTER_GEOM_FIELD_DEFN_FLAGS,
                               "Name Type Nullable SRS CoordinateEpoch");
 
-    OGRSFDriverRegistrar::GetRegistrar()->RegisterDriver(poDriver);
+    poDriver->pfnOpen = OGRMemDriverOpen;
+    poDriver->pfnCreate = OGRMemDriverCreate;
+
+    GetGDALDriverManager()->RegisterDriver(poDriver);
 }
diff --git a/ogr/ogrsf_frmts/mem/ogrmemlayer.cpp b/ogr/ogrsf_frmts/mem/ogrmemlayer.cpp
index a24edae8a877..6a5faa2cbea1 100644
--- a/ogr/ogrsf_frmts/mem/ogrmemlayer.cpp
+++ b/ogr/ogrsf_frmts/mem/ogrmemlayer.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -439,7 +423,8 @@ OGRErr OGRMemLayer::ICreateFeature(OGRFeature *poFeature)
         }
     }
 
-    return ISetFeature(poFeature);
+    // Prevent calling ISetFeature() from derived classes
+    return OGRMemLayer::ISetFeature(poFeature);
 }
 
 /************************************************************************/
@@ -497,6 +482,9 @@ OGRErr OGRMemLayer::IUpdateFeature(OGRFeature *poFeature,
     {
         poFeatureRef->SetStyleString(poFeature->GetStyleString());
     }
+
+    m_bUpdated = true;
+
     return OGRERR_NONE;
 }
 
diff --git a/ogr/ogrsf_frmts/miramon/mm_gdal_driver_structs.h b/ogr/ogrsf_frmts/miramon/mm_gdal_driver_structs.h
index 2e9320df42d5..84548492f338 100644
--- a/ogr/ogrsf_frmts/miramon/mm_gdal_driver_structs.h
+++ b/ogr/ogrsf_frmts/miramon/mm_gdal_driver_structs.h
@@ -20,9 +20,11 @@ CPL_C_START  // Necessary for compiling in GDAL project
 #define KEY_Vers "Vers"
 #define KEY_SubVers "SubVers"
 #define MM_VERS 4
+#define MM_SUBVERS_ACCEPTED 0
 #define MM_SUBVERS 3
 #define KEY_VersMetaDades "VersMetaDades"
 #define KEY_SubVersMetaDades "SubVersMetaDades"
+#define MM_VERS_METADADES_ACCEPTED 4
 #define MM_VERS_METADADES 5
 #define MM_SUBVERS_METADADES 0
 #define SECTION_METADADES "METADADES"
diff --git a/ogr/ogrsf_frmts/miramon/mm_gdal_functions.c b/ogr/ogrsf_frmts/miramon/mm_gdal_functions.c
index 41c2f9fec2a6..5cb41ad26cc1 100644
--- a/ogr/ogrsf_frmts/miramon/mm_gdal_functions.c
+++ b/ogr/ogrsf_frmts/miramon/mm_gdal_functions.c
@@ -12,23 +12,7 @@
  ******************************************************************************
  * Copyright (c) 2024, Xavier Pons
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifdef GDAL_COMPILATION
@@ -743,19 +727,33 @@ MM_OpenIfNeededAndUpdateEntireHeader(struct MM_DATA_BASE_XP *data_base_XP)
     if (fwrite_function(&(data_base_XP->dbf_version), 1, 1,
                         data_base_XP->pfDataBase) != 1)
     {
+        fclose_function(data_base_XP->pfDataBase);
+        data_base_XP->pfDataBase = nullptr;
         return FALSE;
     }
 
     /* MM_BYTE from 1 to 3 */
     variable_byte = (MM_BYTE)(data_base_XP->year - 1900);
     if (fwrite_function(&variable_byte, 1, 1, data_base_XP->pfDataBase) != 1)
+    {
+        fclose_function(data_base_XP->pfDataBase);
+        data_base_XP->pfDataBase = nullptr;
         return FALSE;
+    }
     if (fwrite_function(&(data_base_XP->month), 1, 1,
                         data_base_XP->pfDataBase) != 1)
+    {
+        fclose_function(data_base_XP->pfDataBase);
+        data_base_XP->pfDataBase = nullptr;
         return FALSE;
+    }
     if (fwrite_function(&(data_base_XP->day), 1, 1, data_base_XP->pfDataBase) !=
         1)
+    {
+        fclose_function(data_base_XP->pfDataBase);
+        data_base_XP->pfDataBase = nullptr;
         return FALSE;
+    }
 
     /* from 4 a 7, position MM_FIRST_OFFSET_to_N_RECORDS */
     {
@@ -763,40 +761,68 @@ MM_OpenIfNeededAndUpdateEntireHeader(struct MM_DATA_BASE_XP *data_base_XP)
             (GUInt32)(data_base_XP->nRecords & UINT32_MAX);
         if (fwrite_function(&nRecords32LowBits, 4, 1,
                             data_base_XP->pfDataBase) != 1)
+        {
+            fclose_function(data_base_XP->pfDataBase);
+            data_base_XP->pfDataBase = nullptr;
             return FALSE;
+        }
     }
 
     /* from 8 a 9, position MM_PRIMER_OFFSET_a_OFFSET_1a_FITXA */
     if (fwrite_function(&(data_base_XP->FirstRecordOffset), 2, 1,
                         data_base_XP->pfDataBase) != 1)
+    {
+        fclose_function(data_base_XP->pfDataBase);
+        data_base_XP->pfDataBase = nullptr;
         return FALSE;
+    }
     /* from 10 to 11, & from 12 to 13 */
     if (MM_ES_DBF_ESTESA(data_base_XP->dbf_version))
     {
         if (fwrite_function(&(data_base_XP->BytesPerRecord),
                             sizeof(MM_ACCUMULATED_BYTES_TYPE_DBF), 1,
                             data_base_XP->pfDataBase) != 1)
+        {
+            fclose_function(data_base_XP->pfDataBase);
+            data_base_XP->pfDataBase = nullptr;
             return FALSE;
+        }
     }
     else
     {
         /* from 10 to 11 */
         if (fwrite_function(&(data_base_XP->BytesPerRecord), 2, 1,
                             data_base_XP->pfDataBase) != 1)
+        {
+            fclose_function(data_base_XP->pfDataBase);
+            data_base_XP->pfDataBase = nullptr;
             return FALSE;
+        }
         /* from 12 to 13 */
         if (fwrite_function(&(data_base_XP->reserved_1), 2, 1,
                             data_base_XP->pfDataBase) != 1)
+        {
+            fclose_function(data_base_XP->pfDataBase);
+            data_base_XP->pfDataBase = nullptr;
             return FALSE;
+        }
     }
     /* byte 14 */
     if (fwrite_function(&(data_base_XP->transaction_flag), 1, 1,
                         data_base_XP->pfDataBase) != 1)
+    {
+        fclose_function(data_base_XP->pfDataBase);
+        data_base_XP->pfDataBase = nullptr;
         return FALSE;
+    }
     /* byte 15 */
     if (fwrite_function(&(data_base_XP->encryption_flag), 1, 1,
                         data_base_XP->pfDataBase) != 1)
+    {
+        fclose_function(data_base_XP->pfDataBase);
+        data_base_XP->pfDataBase = nullptr;
         return FALSE;
+    }
 
     /* from 16 to 27 */
     if (data_base_XP->nRecords > UINT32_MAX)
@@ -805,42 +831,70 @@ MM_OpenIfNeededAndUpdateEntireHeader(struct MM_DATA_BASE_XP *data_base_XP)
         GUInt32 nRecords32HighBits = (GUInt32)(data_base_XP->nRecords >> 32);
         if (fwrite_function(&nRecords32HighBits, 4, 1,
                             data_base_XP->pfDataBase) != 1)
+        {
+            fclose_function(data_base_XP->pfDataBase);
+            data_base_XP->pfDataBase = nullptr;
             return FALSE;
+        }
 
         /* from 20 to 27 */
         if (fwrite_function(&(data_base_XP->dbf_on_a_LAN), 8, 1,
                             data_base_XP->pfDataBase) != 1)
+        {
+            fclose_function(data_base_XP->pfDataBase);
+            data_base_XP->pfDataBase = nullptr;
             return FALSE;
+        }
     }
     else
     {
         /* from 16 to 27 */
         if (fwrite_function(&(data_base_XP->dbf_on_a_LAN), 12, 1,
                             data_base_XP->pfDataBase) != 1)
+        {
+            fclose_function(data_base_XP->pfDataBase);
+            data_base_XP->pfDataBase = nullptr;
             return FALSE;
+        }
     }
     /* byte 28 */
     if (fwrite_function(&(data_base_XP->MDX_flag), 1, 1,
                         data_base_XP->pfDataBase) != 1)
+    {
+        fclose_function(data_base_XP->pfDataBase);
+        data_base_XP->pfDataBase = nullptr;
         return FALSE;
+    }
 
     /* Byte 29 */
     if (fwrite_function(&(data_base_XP->CharSet), 1, 1,
                         data_base_XP->pfDataBase) != 1)
+    {
+        fclose_function(data_base_XP->pfDataBase);
+        data_base_XP->pfDataBase = nullptr;
         return FALSE;
+    }
 
     /* Bytes from 30 to 31, in position MM_SEGON_OFFSET_a_OFFSET_1a_FITXA */
     if (MM_ES_DBF_ESTESA(data_base_XP->dbf_version))
     {
         if (fwrite_function(((char *)&(data_base_XP->FirstRecordOffset)) + 2, 2,
                             1, data_base_XP->pfDataBase) != 1)
+        {
+            fclose_function(data_base_XP->pfDataBase);
+            data_base_XP->pfDataBase = nullptr;
             return FALSE;
+        }
     }
     else
     {
         if (fwrite_function(&(data_base_XP->reserved_2), 2, 1,
                             data_base_XP->pfDataBase) != 1)
+        {
+            fclose_function(data_base_XP->pfDataBase);
+            data_base_XP->pfDataBase = nullptr;
             return FALSE;
+        }
     }
 
     /* At 32th byte fields description begins   */
@@ -860,6 +914,8 @@ MM_OpenIfNeededAndUpdateEntireHeader(struct MM_DATA_BASE_XP *data_base_XP)
                                             1, j, data_base_XP->pfDataBase);
             if (retorn_fwrite != (size_t)j)
             {
+                fclose_function(data_base_XP->pfDataBase);
+                data_base_XP->pfDataBase = nullptr;
                 return FALSE;
             }
             MM_InitializeOffsetExtendedFieldNameFields(data_base_XP, i);
@@ -921,6 +977,8 @@ MM_OpenIfNeededAndUpdateEntireHeader(struct MM_DATA_BASE_XP *data_base_XP)
                                 1, j, data_base_XP->pfDataBase);
             if (retorn_fwrite != (size_t)j)
             {
+                fclose_function(data_base_XP->pfDataBase);
+                data_base_XP->pfDataBase = nullptr;
                 return FALSE;
             }
 
@@ -931,24 +989,32 @@ MM_OpenIfNeededAndUpdateEntireHeader(struct MM_DATA_BASE_XP *data_base_XP)
         }
         else
         {
+            fclose_function(data_base_XP->pfDataBase);
+            data_base_XP->pfDataBase = nullptr;
             return FALSE;
         }
 
         if (fwrite_function(zero, 1, 11 - j, data_base_XP->pfDataBase) !=
             11 - (size_t)j)
         {
+            fclose_function(data_base_XP->pfDataBase);
+            data_base_XP->pfDataBase = nullptr;
             return FALSE;
         }
         /* Byte 11, Field type */
         if (fwrite_function(&data_base_XP->pField[i].FieldType, 1, 1,
                             data_base_XP->pfDataBase) != 1)
         {
+            fclose_function(data_base_XP->pfDataBase);
+            data_base_XP->pfDataBase = nullptr;
             return FALSE;
         }
         /* Bytes 12 to 15 --> Reserved */
         if (fwrite_function(&data_base_XP->pField[i].reserved_1, 4, 1,
                             data_base_XP->pfDataBase) != 1)
         {
+            fclose_function(data_base_XP->pfDataBase);
+            data_base_XP->pfDataBase = nullptr;
             return FALSE;
         }
         /* Byte 16, or OFFSET_BYTESxCAMP_CAMP_CLASSIC --> BytesPerField */
@@ -958,6 +1024,8 @@ MM_OpenIfNeededAndUpdateEntireHeader(struct MM_DATA_BASE_XP *data_base_XP)
             if (fwrite_function((void *)&byte_zero, 1, 1,
                                 data_base_XP->pfDataBase) != 1)
             {
+                fclose_function(data_base_XP->pfDataBase);
+                data_base_XP->pfDataBase = nullptr;
                 return FALSE;
             }
         }
@@ -966,6 +1034,8 @@ MM_OpenIfNeededAndUpdateEntireHeader(struct MM_DATA_BASE_XP *data_base_XP)
             if (fwrite_function(&data_base_XP->pField[i].BytesPerField, 1, 1,
                                 data_base_XP->pfDataBase) != 1)
             {
+                fclose_function(data_base_XP->pfDataBase);
+                data_base_XP->pfDataBase = nullptr;
                 return FALSE;
             }
         }
@@ -976,6 +1046,8 @@ MM_OpenIfNeededAndUpdateEntireHeader(struct MM_DATA_BASE_XP *data_base_XP)
             if (fwrite_function(&data_base_XP->pField[i].DecimalsIfFloat, 1, 1,
                                 data_base_XP->pfDataBase) != 1)
             {
+                fclose_function(data_base_XP->pfDataBase);
+                data_base_XP->pfDataBase = nullptr;
                 return FALSE;
             }
         }
@@ -983,6 +1055,8 @@ MM_OpenIfNeededAndUpdateEntireHeader(struct MM_DATA_BASE_XP *data_base_XP)
         {
             if (fwrite_function(zero, 1, 1, data_base_XP->pfDataBase) != 1)
             {
+                fclose_function(data_base_XP->pfDataBase);
+                data_base_XP->pfDataBase = nullptr;
                 return FALSE;
             }
         }
@@ -993,6 +1067,8 @@ MM_OpenIfNeededAndUpdateEntireHeader(struct MM_DATA_BASE_XP *data_base_XP)
             if (fwrite_function(&data_base_XP->pField[i].reserved_2,
                                 20 - 18 + 1, 1, data_base_XP->pfDataBase) != 1)
             {
+                fclose_function(data_base_XP->pfDataBase);
+                data_base_XP->pfDataBase = nullptr;
                 return FALSE;
             }
             /* Bytes from 21 to 24 --> OFFSET_BYTESxCAMP_CAMP_ESPECIAL, special fields, like C
@@ -1001,6 +1077,8 @@ MM_OpenIfNeededAndUpdateEntireHeader(struct MM_DATA_BASE_XP *data_base_XP)
                                 sizeof(MM_BYTES_PER_FIELD_TYPE_DBF), 1,
                                 data_base_XP->pfDataBase) != 1)
             {
+                fclose_function(data_base_XP->pfDataBase);
+                data_base_XP->pfDataBase = nullptr;
                 return FALSE;
             }
 
@@ -1008,6 +1086,8 @@ MM_OpenIfNeededAndUpdateEntireHeader(struct MM_DATA_BASE_XP *data_base_XP)
             if (fwrite_function(&data_base_XP->pField[i].reserved_2[25 - 18],
                                 30 - 25 + 1, 1, data_base_XP->pfDataBase) != 1)
             {
+                fclose_function(data_base_XP->pfDataBase);
+                data_base_XP->pfDataBase = nullptr;
                 return FALSE;
             }
         }
@@ -1021,6 +1101,8 @@ MM_OpenIfNeededAndUpdateEntireHeader(struct MM_DATA_BASE_XP *data_base_XP)
             if (fwrite_function(&data_base_XP->pField[i].reserved_2, 13, 1,
                                 data_base_XP->pfDataBase) != 1)
             {
+                fclose_function(data_base_XP->pfDataBase);
+                data_base_XP->pfDataBase = nullptr;
                 return FALSE;
             }
         }
@@ -1028,16 +1110,26 @@ MM_OpenIfNeededAndUpdateEntireHeader(struct MM_DATA_BASE_XP *data_base_XP)
         if (fwrite_function(&data_base_XP->pField[i].MDX_field_flag, 1, 1,
                             data_base_XP->pfDataBase) != 1)
         {
+            fclose_function(data_base_XP->pfDataBase);
+            data_base_XP->pfDataBase = nullptr;
             return FALSE;
         }
     }
 
     variable_byte = 13;
     if (fwrite_function(&variable_byte, 1, 1, data_base_XP->pfDataBase) != 1)
+    {
+        fclose_function(data_base_XP->pfDataBase);
+        data_base_XP->pfDataBase = nullptr;
         return FALSE;
+    }
 
     if (data_base_XP->FirstRecordOffset != bytes_acumulats)
+    {
+        fclose_function(data_base_XP->pfDataBase);
+        data_base_XP->pfDataBase = nullptr;
         return FALSE;
+    }
 
     // Extended fields
     for (i = 0; i < data_base_XP->nFields; i++)
@@ -1058,7 +1150,11 @@ MM_OpenIfNeededAndUpdateEntireHeader(struct MM_DATA_BASE_XP *data_base_XP)
                                             data_base_XP->pfDataBase);
 
             if (retorn_fwrite != (size_t)name_size)
+            {
+                fclose_function(data_base_XP->pfDataBase);
+                data_base_XP->pfDataBase = nullptr;
                 return FALSE;
+            }
         }
     }
 
diff --git a/ogr/ogrsf_frmts/miramon/mm_rdlayr.c b/ogr/ogrsf_frmts/miramon/mm_rdlayr.c
index ba15f5c1841d..30af4fc60882 100644
--- a/ogr/ogrsf_frmts/miramon/mm_rdlayr.c
+++ b/ogr/ogrsf_frmts/miramon/mm_rdlayr.c
@@ -12,23 +12,7 @@
  ******************************************************************************
  * Copyright (c) 2024, Xavier Pons
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifdef GDAL_COMPILATION
diff --git a/ogr/ogrsf_frmts/miramon/mm_wrlayr.c b/ogr/ogrsf_frmts/miramon/mm_wrlayr.c
index f945d9bc2cd2..976adb4d1589 100644
--- a/ogr/ogrsf_frmts/miramon/mm_wrlayr.c
+++ b/ogr/ogrsf_frmts/miramon/mm_wrlayr.c
@@ -12,23 +12,7 @@
  ******************************************************************************
  * Copyright (c) 2024, Xavier Pons
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifdef GDAL_COMPILATION
@@ -6104,16 +6088,16 @@ int MMCheck_REL_FILE(const char *szREL_file)
         return 1;
     }
 
-    // SubVers>=3?
+    // SubVers>=0?
     pszLine = MMReturnValueFromSectionINIFile(szREL_file, SECTION_VERSIO,
                                               KEY_SubVers);
     if (pszLine)
     {
-        if (*pszLine == '\0' || atoi(pszLine) < (int)MM_SUBVERS)
+        if (*pszLine == '\0' || atoi(pszLine) < (int)MM_SUBVERS_ACCEPTED)
         {
             MMCPLError(CE_Failure, CPLE_OpenFailed,
                        "The file \"%s\" must have %s>=%d.", szREL_file,
-                       KEY_SubVers, MM_SUBVERS);
+                       KEY_SubVers, MM_SUBVERS_ACCEPTED);
 
             free_function(pszLine);
             return 1;
@@ -6124,20 +6108,20 @@ int MMCheck_REL_FILE(const char *szREL_file)
     {
         MMCPLError(CE_Failure, CPLE_OpenFailed,
                    "The file \"%s\" must have %s>=%d.", szREL_file, KEY_SubVers,
-                   MM_SUBVERS);
+                   MM_SUBVERS_ACCEPTED);
         return 1;
     }
 
-    // VersMetaDades>=5?
+    // VersMetaDades>=4?
     pszLine = MMReturnValueFromSectionINIFile(szREL_file, SECTION_VERSIO,
                                               KEY_VersMetaDades);
     if (pszLine)
     {
-        if (*pszLine == '\0' || atoi(pszLine) < (int)MM_VERS_METADADES)
+        if (*pszLine == '\0' || atoi(pszLine) < (int)MM_VERS_METADADES_ACCEPTED)
         {
             MMCPLError(CE_Failure, CPLE_OpenFailed,
                        "The file \"%s\" must have %s>=%d.", szREL_file,
-                       KEY_VersMetaDades, MM_VERS_METADADES);
+                       KEY_VersMetaDades, MM_VERS_METADADES_ACCEPTED);
             free_function(pszLine);
             return 1;
         }
@@ -6147,7 +6131,7 @@ int MMCheck_REL_FILE(const char *szREL_file)
     {
         MMCPLError(CE_Failure, CPLE_OpenFailed,
                    "The file \"%s\" must have %s>=%d.", szREL_file,
-                   KEY_VersMetaDades, MM_VERS_METADADES);
+                   KEY_VersMetaDades, MM_VERS_METADADES_ACCEPTED);
         return 1;
     }
 
@@ -6262,6 +6246,12 @@ int MMCreateMMDB(struct MiraMonVectLayerInfo *hMiraMonLayer,
                 MM_PRIVATE_POINT_DB_FIELDS + hMiraMonLayer->pLayerDB->nNFields;
         else
             nNFields = MM_PRIVATE_POINT_DB_FIELDS;
+
+        // Before allocating new memory, there might be some previously allocated but unused memory.
+        // Let's free that memory first.
+        if (hMiraMonLayer->MMPoint.MMAdmDB.pMMBDXP)
+            MM_ReleaseDBFHeader(&hMiraMonLayer->MMPoint.MMAdmDB.pMMBDXP);
+
         pBD_XP = hMiraMonLayer->MMPoint.MMAdmDB.pMMBDXP =
             MM_CreateDBFHeader(nNFields, hMiraMonLayer->nCharSet);
 
@@ -6280,6 +6270,11 @@ int MMCreateMMDB(struct MiraMonVectLayerInfo *hMiraMonLayer,
         else
             nNFields = MM_PRIVATE_ARC_DB_FIELDS;
 
+        // Before allocating new memory, there might be some previously allocated but unused memory.
+        // Let's free that memory first.
+        if (hMiraMonLayer->MMArc.MMAdmDB.pMMBDXP)
+            MM_ReleaseDBFHeader(&hMiraMonLayer->MMArc.MMAdmDB.pMMBDXP);
+
         pBD_XP = hMiraMonLayer->MMArc.MMAdmDB.pMMBDXP =
             MM_CreateDBFHeader(nNFields, hMiraMonLayer->nCharSet);
 
@@ -6293,6 +6288,11 @@ int MMCreateMMDB(struct MiraMonVectLayerInfo *hMiraMonLayer,
                           : 9)))
             return 1;
 
+        // Before allocating new memory, there might be some previously allocated but unused memory.
+        // Let's free that memory first.
+        if (hMiraMonLayer->MMArc.MMNode.MMAdmDB.pMMBDXP)
+            MM_ReleaseDBFHeader(&hMiraMonLayer->MMArc.MMNode.MMAdmDB.pMMBDXP);
+
         pBD_XP_Aux = hMiraMonLayer->MMArc.MMNode.MMAdmDB.pMMBDXP =
             MM_CreateDBFHeader(3, hMiraMonLayer->nCharSet);
 
@@ -6310,6 +6310,11 @@ int MMCreateMMDB(struct MiraMonVectLayerInfo *hMiraMonLayer,
         else
             nNFields = MM_PRIVATE_POLYGON_DB_FIELDS;
 
+        // Before allocating new memory, there might be some previously allocated but unused memory.
+        // Let's free that memory first.
+        if (hMiraMonLayer->MMPolygon.MMAdmDB.pMMBDXP)
+            MM_ReleaseDBFHeader(&hMiraMonLayer->MMPolygon.MMAdmDB.pMMBDXP);
+
         pBD_XP = hMiraMonLayer->MMPolygon.MMAdmDB.pMMBDXP =
             MM_CreateDBFHeader(nNFields, hMiraMonLayer->nCharSet);
 
@@ -6326,6 +6331,11 @@ int MMCreateMMDB(struct MiraMonVectLayerInfo *hMiraMonLayer,
                      : 12)))
             return 1;
 
+        // Before allocating new memory, there might be some previously allocated but unused memory.
+        // Let's free that memory first.
+        if (hMiraMonLayer->MMArc.MMNode.MMAdmDB.pMMBDXP)
+            MM_ReleaseDBFHeader(&hMiraMonLayer->MMArc.MMNode.MMAdmDB.pMMBDXP);
+
         pBD_XP_Aux = hMiraMonLayer->MMPolygon.MMArc.MMAdmDB.pMMBDXP =
             MM_CreateDBFHeader(5, hMiraMonLayer->nCharSet);
 
diff --git a/ogr/ogrsf_frmts/miramon/mm_wrlayr.h b/ogr/ogrsf_frmts/miramon/mm_wrlayr.h
index 7520d30d6a82..24c1bb49ab5e 100644
--- a/ogr/ogrsf_frmts/miramon/mm_wrlayr.h
+++ b/ogr/ogrsf_frmts/miramon/mm_wrlayr.h
@@ -98,8 +98,9 @@ CPL_C_START  // Necessary for compiling in GDAL project
 #define CPLFree_function(a) CPLFree((a))
 #define form_filename_function(a, b) CPLFormFilename((a), (b), "")
 #define MM_CPLGetBasename(a) CPLGetBasename((a))
-#define MM_IsNANDouble(x) CPLIsNan((x))
-#define MM_IsDoubleInfinite(x) CPLIsInf((x))
+    bool
+    MM_IsNANDouble(double x);
+bool MM_IsDoubleInfinite(double x);
 #endif
 
 /* -------------------------------------------------------------------- */
@@ -111,8 +112,7 @@ CPL_C_START  // Necessary for compiling in GDAL project
 #define MMCPLWarning CPLError
 #define MMCPLDebug CPLDebugOnly
 #else
-    void
-    MMCPLError(int code, const char *fmt, ...);
+void MMCPLError(int code, const char *fmt, ...);
 void MMCPLWarning(int code, const char *fmt, ...);
 void MMCPLDebug(int code, const char *fmt, ...);
 #endif
diff --git a/ogr/ogrsf_frmts/miramon/ogrmiramon.h b/ogr/ogrsf_frmts/miramon/ogrmiramon.h
index 8e4f9485322a..bd38f675f455 100644
--- a/ogr/ogrsf_frmts/miramon/ogrmiramon.h
+++ b/ogr/ogrsf_frmts/miramon/ogrmiramon.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2024, Xavier Pons
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRMIRAMON_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/miramon/ogrmiramondatasource.cpp b/ogr/ogrsf_frmts/miramon/ogrmiramondatasource.cpp
index 777c767ffc18..a9e182ea78d7 100644
--- a/ogr/ogrsf_frmts/miramon/ogrmiramondatasource.cpp
+++ b/ogr/ogrsf_frmts/miramon/ogrmiramondatasource.cpp
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2024, Xavier Pons
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrmiramon.h"
diff --git a/ogr/ogrsf_frmts/miramon/ogrmiramondriver.cpp b/ogr/ogrsf_frmts/miramon/ogrmiramondriver.cpp
index 35e6c08ec0fd..2fd6ad739db9 100644
--- a/ogr/ogrsf_frmts/miramon/ogrmiramondriver.cpp
+++ b/ogr/ogrsf_frmts/miramon/ogrmiramondriver.cpp
@@ -6,27 +6,23 @@
  ******************************************************************************
  * Copyright (c) 2024, Xavier Pons
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrmiramon.h"
 
+#include <cmath>
+
+bool MM_IsNANDouble(double x)
+{
+    return std::isnan(x);
+}
+
+bool MM_IsDoubleInfinite(double x)
+{
+    return std::isinf(x);
+}
+
 /****************************************************************************/
 /*                    OGRMMDriverIdentify()                                 */
 /****************************************************************************/
diff --git a/ogr/ogrsf_frmts/miramon/ogrmiramonlayer.cpp b/ogr/ogrsf_frmts/miramon/ogrmiramonlayer.cpp
index 517008cd7d5f..681bc35d8630 100644
--- a/ogr/ogrsf_frmts/miramon/ogrmiramonlayer.cpp
+++ b/ogr/ogrsf_frmts/miramon/ogrmiramonlayer.cpp
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2024, Xavier Pons
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 #include "ogrmiramon.h"
 
@@ -527,6 +511,9 @@ OGRMiraMonLayer::~OGRMiraMonLayer()
         if (MMCloseLayer(&hMiraMonLayerPOL))
         {
             CPLDebugOnly("MiraMon", "Error closing polygons layer");
+
+            // In case of closing we need to destroy memory
+            MMDestroyLayer(&hMiraMonLayerPOL);
         }
         if (hMiraMonLayerPOL.TopHeader.nElemCount)
         {
@@ -548,6 +535,9 @@ OGRMiraMonLayer::~OGRMiraMonLayer()
         if (MMCloseLayer(&hMiraMonLayerARC))
         {
             CPLDebugOnly("MiraMon", "Error closing arcs layer");
+
+            // In case of closing we need to destroy memory
+            MMDestroyLayer(&hMiraMonLayerARC);
         }
         if (hMiraMonLayerARC.TopHeader.nElemCount)
         {
@@ -570,6 +560,9 @@ OGRMiraMonLayer::~OGRMiraMonLayer()
         if (MMCloseLayer(&hMiraMonLayerPNT))
         {
             CPLDebugOnly("MiraMon", "Error closing points layer");
+
+            // In case of closing we need to destroy memory
+            MMDestroyLayer(&hMiraMonLayerPNT);
         }
         if (hMiraMonLayerPNT.TopHeader.nElemCount)
         {
@@ -593,7 +586,11 @@ OGRMiraMonLayer::~OGRMiraMonLayer()
             {
                 CPLDebugOnly("MiraMon", "Closing MiraMon DBF table ...");
             }
-            MMCloseLayer(&hMiraMonLayerReadOrNonGeom);
+            if (MMCloseLayer(&hMiraMonLayerReadOrNonGeom))
+            {
+                // In case of closing we need to destroy memory
+                MMDestroyLayer(&hMiraMonLayerReadOrNonGeom);
+            }
             if (hMiraMonLayerReadOrNonGeom.ReadOrWrite == MM_WRITING_MODE)
             {
                 CPLDebugOnly("MiraMon", "MiraMon DBF table closed");
@@ -610,7 +607,11 @@ OGRMiraMonLayer::~OGRMiraMonLayer()
         {
             CPLDebugOnly("MiraMon", "Closing MiraMon layer ...");
         }
-        MMCloseLayer(&hMiraMonLayerReadOrNonGeom);
+        if (MMCloseLayer(&hMiraMonLayerReadOrNonGeom))
+        {
+            // In case of closing we need to destroy memory
+            MMDestroyLayer(&hMiraMonLayerReadOrNonGeom);
+        }
         if (hMiraMonLayerReadOrNonGeom.ReadOrWrite == MM_WRITING_MODE)
         {
             CPLDebugOnly("MiraMon", "MiraMon layer closed");
@@ -2216,6 +2217,7 @@ OGRErr OGRMiraMonLayer::TranslateFieldsValuesToMM(OGRFeature *poFeature)
     MM_EXT_DBF_N_FIELDS nNumFields = m_poFeatureDefn->GetFieldCount();
     MM_EXT_DBF_N_MULTIPLE_RECORDS nNumRecords, nRealNumRecords;
     hMMFeature.nNumMRecords = 0;
+#define MAX_SIZE_OF_FIELD_NUMBER_WITH_MINUS 22
 
     for (MM_EXT_DBF_N_FIELDS iField = 0; iField < nNumFields; iField++)
     {
@@ -2427,7 +2429,7 @@ OGRErr OGRMiraMonLayer::TranslateFieldsValuesToMM(OGRFeature *poFeature)
                         hMMFeature.pRecords[nIRecord].nNumField))
                     return OGRERR_NOT_ENOUGH_MEMORY;
 
-                char szChain[21];
+                char szChain[MAX_SIZE_OF_FIELD_NUMBER_WITH_MINUS];
                 MM_SprintfDoubleSignifFigures(
                     szChain, sizeof(szChain),
                     phMiraMonLayer->pLayerDB->pFields[iField].nNumberOfDecimals,
@@ -2643,7 +2645,7 @@ OGRErr OGRMiraMonLayer::TranslateFieldsValuesToMM(OGRFeature *poFeature)
                 hMMFeature.pRecords[0].pField[iField].bIsValid = 0;
             else
             {
-                char szChain[21];
+                char szChain[MAX_SIZE_OF_FIELD_NUMBER_WITH_MINUS];
                 MM_SprintfDoubleSignifFigures(
                     szChain, sizeof(szChain),
                     phMiraMonLayer->pLayerDB->pFields[iField].nNumberOfDecimals,
diff --git a/ogr/ogrsf_frmts/mitab/CMakeLists.txt b/ogr/ogrsf_frmts/mitab/CMakeLists.txt
index 6bec0cb2224c..330c0c823ef0 100644
--- a/ogr/ogrsf_frmts/mitab/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/mitab/CMakeLists.txt
@@ -2,7 +2,8 @@
 add_gdal_driver(
   TARGET ogr_TAB
   DEF MITAB_ENABLED
-  BUILTIN
+  PLUGIN_CAPABLE
+  NO_DEPS
   SOURCES mitab_rawbinblock.cpp
           mitab_mapheaderblock.cpp
           mitab_mapindexblock.cpp
@@ -18,11 +19,8 @@ add_gdal_driver(
           mitab_utils.cpp
           mitab_imapinfofile.cpp
           mitab_middatafile.cpp
-          mitab_bounds.cpp
           mitab_maptoolblock.cpp
           mitab_tooldef.cpp
-          mitab_coordsys.cpp
-          mitab_spatialref.cpp
           mitab_ogr_driver.cpp
           mitab_indfile.cpp
           mitab_tabview.cpp
diff --git a/ogr/ogrsf_frmts/mitab/mitab.h b/ogr/ogrsf_frmts/mitab/mitab.h
index 83699f7b85f8..c7790c056efd 100644
--- a/ogr/ogrsf_frmts/mitab/mitab.h
+++ b/ogr/ogrsf_frmts/mitab/mitab.h
@@ -11,23 +11,7 @@
  * Copyright (c) 1999-2005, Daniel Morissette
  * Copyright (c) 2014, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #ifndef MITAB_H_INCLUDED_
@@ -87,6 +71,7 @@ class IMapInfoFile CPL_NON_FINAL : public OGRLayer
     GBool m_bBoundsSet;
 
     char *m_pszCharset;
+    bool m_bStrictLaundering = true;
     std::set<CPLString> m_oSetFields{};
     TABFeature *CreateTABFeature(OGRFeature *poFeature);
 
@@ -200,6 +185,7 @@ class IMapInfoFile CPL_NON_FINAL : public OGRLayer
 
     void SetEncoding(const char *);
     const char *GetEncoding() const;
+    virtual void SetStrictLaundering(bool);
     int TestUtf8Capability() const;
     CPLString NormalizeFieldName(const char *pszName) const;
     ///////////////
@@ -343,12 +329,6 @@ class TABFile final : public IMapInfoFile
 
     virtual OGRSpatialReference *GetSpatialRef() override;
 
-    static OGRSpatialReference *
-    GetSpatialRefFromTABProj(const TABProjInfo &sTABProj);
-    static int GetTABProjFromSpatialRef(const OGRSpatialReference *poSpatialRef,
-                                        TABProjInfo &sTABProj,
-                                        int &nParamCount);
-
     virtual int GetFeatureCountByType(int &numPoints, int &numLines,
                                       int &numRegions, int &numTexts,
                                       GBool bForce = TRUE) override;
@@ -403,6 +383,7 @@ class TABFile final : public IMapInfoFile
 
     int WriteFeature(TABFeature *poFeature);
     virtual int SetCharset(const char *pszCharset) override;
+    virtual void SetStrictLaundering(bool bStrictLaundering) override;
 #ifdef DEBUG
     virtual void Dump(FILE *fpOut = nullptr) override;
 #endif
@@ -906,7 +887,7 @@ class MIFFile final : public IMapInfoFile
     /*  { return m_poMAPFile->GetHeaderBlock()->SetProjInfo( poPI ); }*/
     virtual int SetMIFCoordSys(const char *pszMIFCoordSys) override;
     virtual int SetCharset(const char *pszCharset) override;
-
+    virtual void SetStrictLaundering(bool bStrictLaundering) override;
 #ifdef DEBUG
     virtual void Dump(FILE * /*fpOut*/ = nullptr) override
     {
@@ -2243,54 +2224,4 @@ class TABDebugFeature final : public TABFeature
     virtual void DumpMIF(FILE *fpOut = nullptr) override;
 };
 
-/* -------------------------------------------------------------------- */
-/*      Some stuff related to spatial reference system handling.        */
-/*                                                                      */
-/*      In GDAL we make use of the coordsys transformation from         */
-/*      other places (sometimes even from plugins), so we               */
-/*      deliberately export these two functions from the DLL.           */
-/* -------------------------------------------------------------------- */
-
-char CPL_DLL *MITABSpatialRef2CoordSys(const OGRSpatialReference *);
-OGRSpatialReference CPL_DLL *MITABCoordSys2SpatialRef(const char *);
-
-bool MITABExtractCoordSysBounds(const char *pszCoordSys, double &dXMin,
-                                double &dYMin, double &dXMax, double &dYMax);
-int MITABCoordSys2TABProjInfo(const char *pszCoordSys, TABProjInfo *psProj);
-
-typedef struct
-{
-    int nDatumEPSGCode;
-    int nMapInfoDatumID;
-    const char *pszOGCDatumName;
-    int nEllipsoid;
-    double dfShiftX;
-    double dfShiftY;
-    double dfShiftZ;
-    double dfDatumParm0; /* RotX */
-    double dfDatumParm1; /* RotY */
-    double dfDatumParm2; /* RotZ */
-    double dfDatumParm3; /* Scale Factor */
-    double dfDatumParm4; /* Prime Meridian */
-} MapInfoDatumInfo;
-
-typedef struct
-{
-    int nMapInfoId;
-    const char *pszMapinfoName;
-    double dfA;             /* semi major axis in meters */
-    double dfInvFlattening; /* Inverse flattening */
-} MapInfoSpheroidInfo;
-
-/*---------------------------------------------------------------------
- * The following are used for coordsys bounds lookup
- *--------------------------------------------------------------------*/
-
-bool MITABLookupCoordSysBounds(TABProjInfo *psCS, double &dXMin, double &dYMin,
-                               double &dXMax, double &dYMax,
-                               bool bOnlyUserTable = false);
-int MITABLoadCoordSysTable(const char *pszFname);
-void MITABFreeCoordSysTable();
-bool MITABCoordSysTableLoaded();  // TODO(schwehr): Unused?
-
 #endif /* MITAB_H_INCLUDED_ */
diff --git a/ogr/ogrsf_frmts/mitab/mitab_coordsys.cpp b/ogr/ogrsf_frmts/mitab/mitab_coordsys.cpp
deleted file mode 100644
index 27d41b79a1ae..000000000000
--- a/ogr/ogrsf_frmts/mitab/mitab_coordsys.cpp
+++ /dev/null
@@ -1,389 +0,0 @@
-/**********************************************************************
- *
- * Name:     mitab_coordsys.cpp
- * Project:  MapInfo TAB Read/Write library
- * Language: C++
- * Purpose:  Implementation translation between MIF CoordSys format, and
- *           and OGRSpatialRef format.
- * Author:   Frank Warmerdam, warmerdam@pobox.com
- *
- **********************************************************************
- * Copyright (c) 1999-2001, Frank Warmerdam
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- **********************************************************************/
-
-#include "cpl_port.h"
-#include "mitab.h"
-#include "mitab_utils.h"
-
-#include <cmath>
-#include <cstdlib>
-#include <cstring>
-#include <string>
-
-#include "cpl_conv.h"
-#include "cpl_error.h"
-#include "cpl_string.h"
-#include "mitab_priv.h"
-#include "ogr_spatialref.h"
-
-extern const MapInfoDatumInfo asDatumInfoList[];
-extern const MapInfoSpheroidInfo asSpheroidInfoList[];
-
-/************************************************************************/
-/*                      MITABCoordSys2SpatialRef()                      */
-/*                                                                      */
-/*      Convert a MIF COORDSYS string into a new OGRSpatialReference    */
-/*      object.                                                         */
-/************************************************************************/
-
-OGRSpatialReference *MITABCoordSys2SpatialRef(const char *pszCoordSys)
-
-{
-    TABProjInfo sTABProj;
-    if (MITABCoordSys2TABProjInfo(pszCoordSys, &sTABProj) < 0)
-        return nullptr;
-    OGRSpatialReference *poSR = TABFile::GetSpatialRefFromTABProj(sTABProj);
-
-    // Report on translation.
-    char *pszWKT = nullptr;
-
-    poSR->exportToWkt(&pszWKT);
-    if (pszWKT != nullptr)
-    {
-        CPLDebug("MITAB", "This CoordSys value:\n%s\nwas translated to:\n%s",
-                 pszCoordSys, pszWKT);
-        CPLFree(pszWKT);
-    }
-
-    return poSR;
-}
-
-/************************************************************************/
-/*                      MITABSpatialRef2CoordSys()                      */
-/*                                                                      */
-/*      Converts a OGRSpatialReference object into a MIF COORDSYS       */
-/*      string.                                                         */
-/*                                                                      */
-/*      The function returns a newly allocated string that should be    */
-/*      CPLFree()'d by the caller.                                      */
-/************************************************************************/
-
-char *MITABSpatialRef2CoordSys(const OGRSpatialReference *poSR)
-
-{
-    if (poSR == nullptr)
-        return nullptr;
-
-    TABProjInfo sTABProj;
-    int nParamCount = 0;
-    TABFile::GetTABProjFromSpatialRef(poSR, sTABProj, nParamCount);
-
-    // Do coordsys lookup.
-    double dXMin = 0.0;
-    double dYMin = 0.0;
-    double dXMax = 0.0;
-    double dYMax = 0.0;
-    bool bHasBounds = false;
-    if (sTABProj.nProjId > 1 &&
-        MITABLookupCoordSysBounds(&sTABProj, dXMin, dYMin, dXMax, dYMax, true))
-    {
-        bHasBounds = true;
-    }
-
-    // Translate the units.
-    const char *pszMIFUnits = TABUnitIdToString(sTABProj.nUnitsId);
-
-    // Build coordinate system definition.
-    CPLString osCoordSys;
-
-    if (sTABProj.nProjId != 0)
-    {
-        osCoordSys.Printf("Earth Projection %d", sTABProj.nProjId);
-    }
-    else
-    {
-        osCoordSys.Printf("NonEarth Units");
-    }
-
-    // Append Datum.
-    if (sTABProj.nProjId != 0)
-    {
-        osCoordSys += CPLSPrintf(", %d", sTABProj.nDatumId);
-
-        if (sTABProj.nDatumId == 999 || sTABProj.nDatumId == 9999)
-        {
-            osCoordSys +=
-                CPLSPrintf(", %d, %.15g, %.15g, %.15g", sTABProj.nEllipsoidId,
-                           sTABProj.dDatumShiftX, sTABProj.dDatumShiftY,
-                           sTABProj.dDatumShiftZ);
-        }
-
-        if (sTABProj.nDatumId == 9999)
-        {
-            osCoordSys +=
-                CPLSPrintf(", %.15g, %.15g, %.15g, %.15g, %.15g",
-                           sTABProj.adDatumParams[0], sTABProj.adDatumParams[1],
-                           sTABProj.adDatumParams[2], sTABProj.adDatumParams[3],
-                           sTABProj.adDatumParams[4]);
-        }
-    }
-
-    // Append units.
-    if (sTABProj.nProjId != 1 && pszMIFUnits != nullptr)
-    {
-        if (sTABProj.nProjId != 0)
-            osCoordSys += ",";
-
-        osCoordSys += CPLSPrintf(" \"%s\"", pszMIFUnits);
-    }
-
-    // Append Projection Params.
-    for (int iParam = 0; iParam < nParamCount; iParam++)
-        osCoordSys += CPLSPrintf(", %.15g", sTABProj.adProjParams[iParam]);
-
-    // Append user bounds.
-    if (bHasBounds)
-    {
-        if (fabs(dXMin - floor(dXMin + 0.5)) < 1e-8 &&
-            fabs(dYMin - floor(dYMin + 0.5)) < 1e-8 &&
-            fabs(dXMax - floor(dXMax + 0.5)) < 1e-8 &&
-            fabs(dYMax - floor(dYMax + 0.5)) < 1e-8)
-        {
-            osCoordSys +=
-                CPLSPrintf(" Bounds (%d, %d) (%d, %d)", static_cast<int>(dXMin),
-                           static_cast<int>(dYMin), static_cast<int>(dXMax),
-                           static_cast<int>(dYMax));
-        }
-        else
-        {
-            osCoordSys += CPLSPrintf(" Bounds (%f, %f) (%f, %f)", dXMin, dYMin,
-                                     dXMax, dYMax);
-        }
-    }
-
-    // Report on translation.
-    char *pszWKT = nullptr;
-
-    poSR->exportToWkt(&pszWKT);
-    if (pszWKT != nullptr)
-    {
-        CPLDebug("MITAB", "This WKT Projection:\n%s\n\ntranslates to:\n%s",
-                 pszWKT, osCoordSys.c_str());
-        CPLFree(pszWKT);
-    }
-
-    return CPLStrdup(osCoordSys.c_str());
-}
-
-/************************************************************************/
-/*                      MITABExtractCoordSysBounds                      */
-/*                                                                      */
-/* Return true if MIF coordsys string contains a BOUNDS parameter and   */
-/* Set x/y min/max values.                                              */
-/************************************************************************/
-
-bool MITABExtractCoordSysBounds(const char *pszCoordSys, double &dXMin,
-                                double &dYMin, double &dXMax, double &dYMax)
-
-{
-    if (pszCoordSys == nullptr)
-        return false;
-
-    char **papszFields =
-        CSLTokenizeStringComplex(pszCoordSys, " ,()", TRUE, FALSE);
-
-    int iBounds = CSLFindString(papszFields, "Bounds");
-
-    if (iBounds >= 0 && iBounds + 4 < CSLCount(papszFields))
-    {
-        dXMin = CPLAtof(papszFields[++iBounds]);
-        dYMin = CPLAtof(papszFields[++iBounds]);
-        dXMax = CPLAtof(papszFields[++iBounds]);
-        dYMax = CPLAtof(papszFields[++iBounds]);
-        CSLDestroy(papszFields);
-        return true;
-    }
-
-    CSLDestroy(papszFields);
-    return false;
-}
-
-/**********************************************************************
- *                     MITABCoordSys2TABProjInfo()
- *
- * Convert a MIF COORDSYS string into a TABProjInfo structure.
- *
- * Returns 0 on success, -1 on error.
- **********************************************************************/
-int MITABCoordSys2TABProjInfo(const char *pszCoordSys, TABProjInfo *psProj)
-
-{
-    // Set all fields to zero, equivalent of NonEarth Units "mi"
-    memset(psProj, 0, sizeof(TABProjInfo));
-
-    if (pszCoordSys == nullptr)
-        return -1;
-
-    // Parse the passed string into words.
-    while (*pszCoordSys == ' ')
-        pszCoordSys++;  // Eat leading spaces.
-    if (STARTS_WITH_CI(pszCoordSys, "CoordSys") && pszCoordSys[8] != '\0')
-        pszCoordSys += 9;
-
-    char **papszFields =
-        CSLTokenizeStringComplex(pszCoordSys, " ,", TRUE, FALSE);
-
-    // Clip off Bounds information.
-    int iBounds = CSLFindString(papszFields, "Bounds");
-
-    while (iBounds != -1 && papszFields[iBounds] != nullptr)
-    {
-        CPLFree(papszFields[iBounds]);
-        papszFields[iBounds] = nullptr;
-        iBounds++;
-    }
-
-    // Fetch the projection.
-    char **papszNextField = nullptr;
-
-    if (CSLCount(papszFields) >= 3 && EQUAL(papszFields[0], "Earth") &&
-        EQUAL(papszFields[1], "Projection"))
-    {
-        int nProjId = atoi(papszFields[2]);
-        if (nProjId >= 3000)
-            nProjId -= 3000;
-        else if (nProjId >= 2000)
-            nProjId -= 2000;
-        else if (nProjId >= 1000)
-            nProjId -= 1000;
-
-        psProj->nProjId = static_cast<GByte>(nProjId);
-        papszNextField = papszFields + 3;
-    }
-    else if (CSLCount(papszFields) >= 2 && EQUAL(papszFields[0], "NonEarth"))
-    {
-        // NonEarth Units "..." Bounds (x, y) (x, y)
-        psProj->nProjId = 0;
-        papszNextField = papszFields + 2;
-
-        if (papszNextField[0] != nullptr && EQUAL(papszNextField[0], "Units"))
-            papszNextField++;
-    }
-    else
-    {
-        // Invalid projection string ???
-        if (CSLCount(papszFields) > 0)
-            CPLError(CE_Warning, CPLE_IllegalArg,
-                     "Failed parsing CoordSys: '%s'", pszCoordSys);
-        CSLDestroy(papszFields);
-        return -1;
-    }
-
-    // Fetch the datum information.
-    int nDatum = 0;
-
-    if (psProj->nProjId != 0 && CSLCount(papszNextField) > 0)
-    {
-        nDatum = atoi(papszNextField[0]);
-        papszNextField++;
-    }
-
-    if ((nDatum == 999 || nDatum == 9999) && CSLCount(papszNextField) >= 4)
-    {
-        psProj->nEllipsoidId = static_cast<GByte>(atoi(papszNextField[0]));
-        psProj->dDatumShiftX = CPLAtof(papszNextField[1]);
-        psProj->dDatumShiftY = CPLAtof(papszNextField[2]);
-        psProj->dDatumShiftZ = CPLAtof(papszNextField[3]);
-        papszNextField += 4;
-
-        if (nDatum == 9999 && CSLCount(papszNextField) >= 5)
-        {
-            psProj->adDatumParams[0] = CPLAtof(papszNextField[0]);
-            psProj->adDatumParams[1] = CPLAtof(papszNextField[1]);
-            psProj->adDatumParams[2] = CPLAtof(papszNextField[2]);
-            psProj->adDatumParams[3] = CPLAtof(papszNextField[3]);
-            psProj->adDatumParams[4] = CPLAtof(papszNextField[4]);
-            papszNextField += 5;
-        }
-    }
-    else if (nDatum != 999 && nDatum != 9999)
-    {
-        // Find the datum, and collect its parameters if possible.
-        const MapInfoDatumInfo *psDatumInfo = nullptr;
-
-        int iDatum = 0;  // Used after for.
-        for (; asDatumInfoList[iDatum].nMapInfoDatumID != -1; iDatum++)
-        {
-            if (asDatumInfoList[iDatum].nMapInfoDatumID == nDatum)
-            {
-                psDatumInfo = asDatumInfoList + iDatum;
-                break;
-            }
-        }
-
-        if (asDatumInfoList[iDatum].nMapInfoDatumID == -1)
-        {
-            // Use WGS84.
-            psDatumInfo = asDatumInfoList + 0;
-        }
-
-        if (psDatumInfo != nullptr)
-        {
-            psProj->nEllipsoidId = static_cast<GByte>(psDatumInfo->nEllipsoid);
-            psProj->nDatumId =
-                static_cast<GInt16>(psDatumInfo->nMapInfoDatumID);
-            psProj->dDatumShiftX = psDatumInfo->dfShiftX;
-            psProj->dDatumShiftY = psDatumInfo->dfShiftY;
-            psProj->dDatumShiftZ = psDatumInfo->dfShiftZ;
-            psProj->adDatumParams[0] = psDatumInfo->dfDatumParm0;
-            psProj->adDatumParams[1] = psDatumInfo->dfDatumParm1;
-            psProj->adDatumParams[2] = psDatumInfo->dfDatumParm2;
-            psProj->adDatumParams[3] = psDatumInfo->dfDatumParm3;
-            psProj->adDatumParams[4] = psDatumInfo->dfDatumParm4;
-        }
-    }
-
-    // Fetch the units string.
-    if (CSLCount(papszNextField) > 0)
-    {
-        if (isdigit(static_cast<unsigned char>(papszNextField[0][0])))
-        {
-            psProj->nUnitsId = static_cast<GByte>(atoi(papszNextField[0]));
-        }
-        else
-        {
-            psProj->nUnitsId =
-                static_cast<GByte>(TABUnitIdFromString(papszNextField[0]));
-        }
-        papszNextField++;
-    }
-
-    // Finally the projection parameters.
-    for (int iParam = 0; iParam < 7 && CSLCount(papszNextField) > 0; iParam++)
-    {
-        psProj->adProjParams[iParam] = CPLAtof(papszNextField[0]);
-        papszNextField++;
-    }
-
-    CSLDestroy(papszFields);
-
-    return 0;
-}
diff --git a/ogr/ogrsf_frmts/mitab/mitab_datfile.cpp b/ogr/ogrsf_frmts/mitab/mitab_datfile.cpp
index 45f571049e36..86b52656bce6 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_datfile.cpp
+++ b/ogr/ogrsf_frmts/mitab/mitab_datfile.cpp
@@ -11,23 +11,7 @@
  * Copyright (c) 1999-2001, Daniel Morissette
  * Copyright (c) 2014, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/mitab/mitab_feature.cpp b/ogr/ogrsf_frmts/mitab/mitab_feature.cpp
index 51c35d0a914f..83eac614d406 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_feature.cpp
+++ b/ogr/ogrsf_frmts/mitab/mitab_feature.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 1999-2002, Daniel Morissette
  * Copyright (c) 2014, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/mitab/mitab_feature_mif.cpp b/ogr/ogrsf_frmts/mitab/mitab_feature_mif.cpp
index 235849f6e522..082efe151781 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_feature_mif.cpp
+++ b/ogr/ogrsf_frmts/mitab/mitab_feature_mif.cpp
@@ -10,23 +10,7 @@
  **********************************************************************
  * Copyright (c) 1999-2002, Stephane Villeneuve
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/mitab/mitab_geometry.cpp b/ogr/ogrsf_frmts/mitab/mitab_geometry.cpp
index 7ade57b28427..2e7374ffb3fc 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_geometry.cpp
+++ b/ogr/ogrsf_frmts/mitab/mitab_geometry.cpp
@@ -10,23 +10,7 @@
  **********************************************************************
  * Copyright (c) 1999-2001, Daniel Morissette
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/mitab/mitab_geometry.h b/ogr/ogrsf_frmts/mitab/mitab_geometry.h
index 675902a4ec77..3e1dec66d0e7 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_geometry.h
+++ b/ogr/ogrsf_frmts/mitab/mitab_geometry.h
@@ -11,23 +11,7 @@
  **********************************************************************
  * Copyright (c) 1999, 2000, Daniel Morissette
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #ifndef MITAB_GEOMETRY_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/mitab/mitab_idfile.cpp b/ogr/ogrsf_frmts/mitab/mitab_idfile.cpp
index 02b18be1fc94..d820d018c67b 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_idfile.cpp
+++ b/ogr/ogrsf_frmts/mitab/mitab_idfile.cpp
@@ -11,23 +11,7 @@
  * Copyright (c) 1999, 2000, Daniel Morissette
  * Copyright (c) 2014, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/mitab/mitab_imapinfofile.cpp b/ogr/ogrsf_frmts/mitab/mitab_imapinfofile.cpp
index 6183d7c6e69e..f7b19d6b8a48 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_imapinfofile.cpp
+++ b/ogr/ogrsf_frmts/mitab/mitab_imapinfofile.cpp
@@ -11,23 +11,7 @@
  * Copyright (c) 1999-2008, Daniel Morissette
  * Copyright (c) 2014, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "cpl_port.h"
@@ -591,6 +575,7 @@ const char *IMapInfoFile::GetCharset() const
 
 // Table is adopted from
 // http://www.i-signum.com/Formation/download/MB_ReferenceGuide.pdf pp. 127-128
+// NOTE: if modifying this table, please keep doc/source/drivers/vector/mapinfo_encodings.csv in sync
 static const char *const apszCharsets[][2] = {
     {"Neutral", ""},                 // No character conversions performed.
     {"ISO8859_1", "ISO-8859-1"},     // ISO 8859-1 (UNIX)
@@ -628,6 +613,7 @@ static const char *const apszCharsets[][2] = {
     {"CodePage869", "CP869"},  // DOS Code Page 869 = Modern Greek
     {"LICS", ""},              // Lotus worksheet release 1,2 character set
     {"LMBCS", ""},             // Lotus worksheet release 3,4 character set
+    {"UTF-8", "UTF-8"},
     {nullptr, nullptr}};
 
 const char *IMapInfoFile::CharsetToEncoding(const char *pszCharset)
@@ -682,6 +668,11 @@ void IMapInfoFile::SetEncoding(const char *pszEncoding)
     SetCharset(EncodingToCharset(pszEncoding));
 }
 
+void IMapInfoFile::SetStrictLaundering(bool bStrictLaundering)
+{
+    m_bStrictLaundering = bStrictLaundering;
+}
+
 int IMapInfoFile::TestUtf8Capability() const
 {
     const char *pszEncoding(GetEncoding());
diff --git a/ogr/ogrsf_frmts/mitab/mitab_indfile.cpp b/ogr/ogrsf_frmts/mitab/mitab_indfile.cpp
index 7b1088b8446f..d61117edb980 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_indfile.cpp
+++ b/ogr/ogrsf_frmts/mitab/mitab_indfile.cpp
@@ -11,23 +11,7 @@
  * Copyright (c) 1999-2001, Daniel Morissette
  * Copyright (c) 2014, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/mitab/mitab_mapcoordblock.cpp b/ogr/ogrsf_frmts/mitab/mitab_mapcoordblock.cpp
index ff121ae2d6b6..cf5f90f647ea 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_mapcoordblock.cpp
+++ b/ogr/ogrsf_frmts/mitab/mitab_mapcoordblock.cpp
@@ -11,23 +11,7 @@
  * Copyright (c) 1999-2001, Daniel Morissette
  * Copyright (c) 2014, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/mitab/mitab_mapfile.cpp b/ogr/ogrsf_frmts/mitab/mitab_mapfile.cpp
index adb451f6aff7..808917598a9b 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_mapfile.cpp
+++ b/ogr/ogrsf_frmts/mitab/mitab_mapfile.cpp
@@ -11,23 +11,7 @@
  * Copyright (c) 1999-2002, Daniel Morissette
  * Copyright (c) 2014, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/mitab/mitab_mapheaderblock.cpp b/ogr/ogrsf_frmts/mitab/mitab_mapheaderblock.cpp
index 5124f3a99d94..fb725fca0fdc 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_mapheaderblock.cpp
+++ b/ogr/ogrsf_frmts/mitab/mitab_mapheaderblock.cpp
@@ -11,23 +11,7 @@
  * Copyright (c) 1999-2002, Daniel Morissette
  * Copyright (c) 2014, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/mitab/mitab_mapindexblock.cpp b/ogr/ogrsf_frmts/mitab/mitab_mapindexblock.cpp
index 67cbe7a10823..d2566b1d7905 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_mapindexblock.cpp
+++ b/ogr/ogrsf_frmts/mitab/mitab_mapindexblock.cpp
@@ -11,23 +11,7 @@
  * Copyright (c) 1999, 2000, Daniel Morissette
  * Copyright (c) 2014, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/mitab/mitab_mapobjectblock.cpp b/ogr/ogrsf_frmts/mitab/mitab_mapobjectblock.cpp
index 0f9a6ce5ae2e..db2e0f7b2cdb 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_mapobjectblock.cpp
+++ b/ogr/ogrsf_frmts/mitab/mitab_mapobjectblock.cpp
@@ -11,23 +11,7 @@
  * Copyright (c) 1999-2001, Daniel Morissette
  * Copyright (c) 2014, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/mitab/mitab_maptoolblock.cpp b/ogr/ogrsf_frmts/mitab/mitab_maptoolblock.cpp
index 8e42088f5f20..c1fd3a0c3850 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_maptoolblock.cpp
+++ b/ogr/ogrsf_frmts/mitab/mitab_maptoolblock.cpp
@@ -11,23 +11,7 @@
  * Copyright (c) 1999, 2000, Daniel Morissette
  * Copyright (c) 2014, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/mitab/mitab_middatafile.cpp b/ogr/ogrsf_frmts/mitab/mitab_middatafile.cpp
index ddf5ff9393ba..d155846458b0 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_middatafile.cpp
+++ b/ogr/ogrsf_frmts/mitab/mitab_middatafile.cpp
@@ -10,23 +10,7 @@
  **********************************************************************
  * Copyright (c) 1999, 2000, Stephane Villeneuve
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/mitab/mitab_miffile.cpp b/ogr/ogrsf_frmts/mitab/mitab_miffile.cpp
index f548e33cc64c..2b2e41f1f0de 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_miffile.cpp
+++ b/ogr/ogrsf_frmts/mitab/mitab_miffile.cpp
@@ -13,23 +13,7 @@
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.com>
  * Copyright (c) 2014, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "cpl_port.h"
@@ -998,7 +982,8 @@ int MIFFile::WriteMIFHeader()
         if (strlen(GetEncoding()) > 0)
             osFieldName.Recode(CPL_ENC_UTF8, GetEncoding());
 
-        char *pszCleanName = TABCleanFieldName(osFieldName);
+        char *pszCleanName =
+            TABCleanFieldName(osFieldName, GetEncoding(), m_bStrictLaundering);
         osFieldName = pszCleanName;
         CPLFree(pszCleanName);
 
@@ -1946,9 +1931,22 @@ int MIFFile::SetCharset(const char *pszCharset)
     {
         m_poMIFFile->SetEncoding(CharsetToEncoding(pszCharset));
     }
+    if (EQUAL(pszCharset, "UTF-8"))
+    {
+        m_nVersion = std::max(m_nVersion, 1520);
+    }
     return 0;
 }
 
+void MIFFile::SetStrictLaundering(bool bStrictLaundering)
+{
+    IMapInfoFile::SetStrictLaundering(bStrictLaundering);
+    if (!bStrictLaundering)
+    {
+        m_nVersion = std::max(m_nVersion, 1520);
+    }
+}
+
 /************************************************************************/
 /*                       MIFFile::GetSpatialRef()                       */
 /************************************************************************/
diff --git a/ogr/ogrsf_frmts/mitab/mitab_ogr_datasource.cpp b/ogr/ogrsf_frmts/mitab/mitab_ogr_datasource.cpp
index a3c5b254af00..4d08b80c6344 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_ogr_datasource.cpp
+++ b/ogr/ogrsf_frmts/mitab/mitab_ogr_datasource.cpp
@@ -11,23 +11,7 @@
  * Copyright (c) 1999, 2000, Stephane Villeneuve
  * Copyright (c) 2014, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "mitab_ogr_driver.h"
@@ -45,10 +29,10 @@
 /************************************************************************/
 
 OGRTABDataSource::OGRTABDataSource()
-    : m_pszName(nullptr), m_pszDirectory(nullptr), m_nLayerCount(0),
-      m_papoLayers(nullptr), m_papszOptions(nullptr), m_bCreateMIF(FALSE),
-      m_bSingleFile(FALSE), m_bSingleLayerAlreadyCreated(FALSE),
-      m_bQuickSpatialIndexMode(-1), m_nBlockSize(512)
+    : m_pszDirectory(nullptr), m_nLayerCount(0), m_papoLayers(nullptr),
+      m_papszOptions(nullptr), m_bCreateMIF(FALSE), m_bSingleFile(FALSE),
+      m_bSingleLayerAlreadyCreated(FALSE), m_bQuickSpatialIndexMode(-1),
+      m_nBlockSize(512)
 {
 }
 
@@ -59,7 +43,6 @@ OGRTABDataSource::OGRTABDataSource()
 OGRTABDataSource::~OGRTABDataSource()
 
 {
-    CPLFree(m_pszName);
     CPLFree(m_pszDirectory);
 
     for (int i = 0; i < m_nLayerCount; i++)
@@ -78,9 +61,7 @@ OGRTABDataSource::~OGRTABDataSource()
 int OGRTABDataSource::Create(const char *pszName, char **papszOptions)
 
 {
-    CPLAssert(m_pszName == nullptr);
-
-    m_pszName = CPLStrdup(pszName);
+    SetDescription(pszName);
     m_papszOptions = CSLDuplicate(papszOptions);
     eAccess = GA_Update;
 
@@ -137,11 +118,12 @@ int OGRTABDataSource::Create(const char *pszName, char **papszOptions)
         IMapInfoFile *poFile = nullptr;
         const char *pszEncoding(CSLFetchNameValue(papszOptions, "ENCODING"));
         const char *pszCharset(IMapInfoFile::EncodingToCharset(pszEncoding));
-
+        bool bStrictLaundering = CPLTestBool(CSLFetchNameValueDef(
+            papszOptions, "STRICT_FIELDS_NAME_LAUNDERING", "YES"));
         if (m_bCreateMIF)
         {
             poFile = new MIFFile(this);
-            if (poFile->Open(m_pszName, TABWrite, FALSE, pszCharset) != 0)
+            if (poFile->Open(pszName, TABWrite, FALSE, pszCharset) != 0)
             {
                 delete poFile;
                 return FALSE;
@@ -150,7 +132,7 @@ int OGRTABDataSource::Create(const char *pszName, char **papszOptions)
         else
         {
             TABFile *poTabFile = new TABFile(this);
-            if (poTabFile->Open(m_pszName, TABWrite, FALSE, m_nBlockSize,
+            if (poTabFile->Open(pszName, TABWrite, FALSE, m_nBlockSize,
                                 pszCharset) != 0)
             {
                 delete poTabFile;
@@ -158,7 +140,7 @@ int OGRTABDataSource::Create(const char *pszName, char **papszOptions)
             }
             poFile = poTabFile;
         }
-
+        poFile->SetStrictLaundering(bStrictLaundering);
         m_nLayerCount = 1;
         m_papoLayers = static_cast<IMapInfoFile **>(CPLMalloc(sizeof(void *)));
         m_papoLayers[0] = poFile;
@@ -179,16 +161,14 @@ int OGRTABDataSource::Create(const char *pszName, char **papszOptions)
 int OGRTABDataSource::Open(GDALOpenInfo *poOpenInfo, int bTestOpen)
 
 {
-    CPLAssert(m_pszName == nullptr);
-
-    m_pszName = CPLStrdup(poOpenInfo->pszFilename);
+    SetDescription(poOpenInfo->pszFilename);
     eAccess = poOpenInfo->eAccess;
 
     // If it is a file, try to open as a Mapinfo file.
     if (!poOpenInfo->bIsDirectory)
     {
-        IMapInfoFile *poFile =
-            IMapInfoFile::SmartOpen(this, m_pszName, GetUpdate(), bTestOpen);
+        IMapInfoFile *poFile = IMapInfoFile::SmartOpen(
+            this, poOpenInfo->pszFilename, GetUpdate(), bTestOpen);
         if (poFile == nullptr)
             return FALSE;
 
@@ -198,7 +178,7 @@ int OGRTABDataSource::Open(GDALOpenInfo *poOpenInfo, int bTestOpen)
         m_papoLayers = static_cast<IMapInfoFile **>(CPLMalloc(sizeof(void *)));
         m_papoLayers[0] = poFile;
 
-        m_pszDirectory = CPLStrdup(CPLGetPath(m_pszName));
+        m_pszDirectory = CPLStrdup(CPLGetPath(poOpenInfo->pszFilename));
 
         m_bSingleFile = TRUE;
         m_bSingleLayerAlreadyCreated = TRUE;
@@ -208,9 +188,9 @@ int OGRTABDataSource::Open(GDALOpenInfo *poOpenInfo, int bTestOpen)
     // ending in .tab or .mif.
     else
     {
-        char **papszFileList = VSIReadDir(m_pszName);
+        char **papszFileList = VSIReadDir(poOpenInfo->pszFilename);
 
-        m_pszDirectory = CPLStrdup(m_pszName);
+        m_pszDirectory = CPLStrdup(poOpenInfo->pszFilename);
 
         for (int iFile = 0;
              papszFileList != nullptr && papszFileList[iFile] != nullptr;
@@ -312,6 +292,14 @@ OGRTABDataSource::ICreateLayer(const char *pszLayerName,
     const char *pszEncoding = CSLFetchNameValue(papszOptions, "ENCODING");
     const char *pszCharset(IMapInfoFile::EncodingToCharset(pszEncoding));
     const char *pszDescription(CSLFetchNameValue(papszOptions, "DESCRIPTION"));
+    const char *pszStrictLaundering =
+        CSLFetchNameValue(papszOptions, "STRICT_FIELDS_NAME_LAUNDERING");
+    if (pszStrictLaundering == nullptr)
+    {
+        pszStrictLaundering = CSLFetchNameValueDef(
+            m_papszOptions, "STRICT_FIELDS_NAME_LAUNDERING", "YES");
+    }
+    bool bStrictLaundering = CPLTestBool(pszStrictLaundering);
 
     if (m_bSingleFile)
     {
@@ -376,6 +364,7 @@ OGRTABDataSource::ICreateLayer(const char *pszLayerName,
     }
 
     poFile->SetDescription(poFile->GetName());
+    poFile->SetStrictLaundering(bStrictLaundering);
 
     // Assign the coordinate system (if provided) and set
     // reasonable bounds.
@@ -465,11 +454,12 @@ char **OGRTABDataSource::GetFileList()
     VSIStatBufL sStatBuf;
     CPLStringList osList;
 
-    if (VSIStatL(m_pszName, &sStatBuf) == 0 && VSI_ISDIR(sStatBuf.st_mode))
+    if (VSIStatL(GetDescription(), &sStatBuf) == 0 &&
+        VSI_ISDIR(sStatBuf.st_mode))
     {
         static const char *const apszExtensions[] = {
             "mif", "mid", "tab", "map", "ind", "dat", "id", nullptr};
-        char **papszDirEntries = VSIReadDir(m_pszName);
+        char **papszDirEntries = VSIReadDir(GetDescription());
 
         for (int iFile = 0;
              papszDirEntries != nullptr && papszDirEntries[iFile] != nullptr;
@@ -479,7 +469,7 @@ char **OGRTABDataSource::GetFileList()
                               CPLGetExtension(papszDirEntries[iFile])) != -1)
             {
                 osList.AddString(CPLFormFilename(
-                    m_pszName, papszDirEntries[iFile], nullptr));
+                    GetDescription(), papszDirEntries[iFile], nullptr));
             }
         }
 
@@ -491,8 +481,8 @@ char **OGRTABDataSource::GetFileList()
         static const char *const apszTABExtensions[] = {"tab", "map", "ind",
                                                         "dat", "id",  nullptr};
         const char *const *papszExtensions = nullptr;
-        if (EQUAL(CPLGetExtension(m_pszName), "mif") ||
-            EQUAL(CPLGetExtension(m_pszName), "mid"))
+        if (EQUAL(CPLGetExtension(GetDescription()), "mif") ||
+            EQUAL(CPLGetExtension(GetDescription()), "mid"))
         {
             papszExtensions = apszMIFExtensions;
         }
@@ -503,10 +493,11 @@ char **OGRTABDataSource::GetFileList()
         const char *const *papszIter = papszExtensions;
         while (*papszIter)
         {
-            const char *pszFile = CPLResetExtension(m_pszName, *papszIter);
+            const char *pszFile =
+                CPLResetExtension(GetDescription(), *papszIter);
             if (VSIStatL(pszFile, &sStatBuf) != 0)
             {
-                pszFile = CPLResetExtension(m_pszName,
+                pszFile = CPLResetExtension(GetDescription(),
                                             CPLString(*papszIter).toupper());
                 if (VSIStatL(pszFile, &sStatBuf) != 0)
                 {
diff --git a/ogr/ogrsf_frmts/mitab/mitab_ogr_driver.cpp b/ogr/ogrsf_frmts/mitab/mitab_ogr_driver.cpp
index 5bdfa0ab687e..7dff86f9a47f 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_ogr_driver.cpp
+++ b/ogr/ogrsf_frmts/mitab/mitab_ogr_driver.cpp
@@ -11,23 +11,7 @@
  * Copyright (c) 1999, 2000, Stephane Villeneuve
  * Copyright (c) 2014, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "mitab_ogr_driver.h"
@@ -228,6 +212,9 @@ void RegisterOGRTAB()
         "description='Friendly name of table. Only for tab "
         "format.'/>"  // See
         // https://support.pitneybowes.com/SearchArticles/VFP05_KnowledgeWithSidebarHowTo?id=kA180000000CtuHCAS&popup=false&lang=en_US
+        "  <Option name='STRICT_FIELDS_NAME_LAUNDERING' type='boolean' "
+        "default='YES' description='Field name consisting of alphanumeric "
+        "only, maximum length 31'/>"
         "</LayerCreationOptionList>");
 
     poDriver->SetMetadataItem(
@@ -248,6 +235,9 @@ void RegisterOGRTAB()
         "  <Option name='ENCODING' type='string' description='to override the "
         "encoding interpretation of the DAT/MID with any encoding supported by "
         "CPLRecode or to \"\" to avoid any recoding (Neutral charset)'/>"
+        "  <Option name='STRICT_FIELDS_NAME_LAUNDERING' type='boolean' "
+        "default='YES' description='Field name consisting of alphanumeric "
+        "only, maximum length 31'/>"
         "</CreationOptionList>");
 
     poDriver->SetMetadataItem(
diff --git a/ogr/ogrsf_frmts/mitab/mitab_ogr_driver.h b/ogr/ogrsf_frmts/mitab/mitab_ogr_driver.h
index 7a7e21e1d7eb..a1b26afa29fd 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_ogr_driver.h
+++ b/ogr/ogrsf_frmts/mitab/mitab_ogr_driver.h
@@ -11,23 +11,7 @@
  * Copyright (c) 1999, 2000, Stephane Villeneuve
  * Copyright (c) 2014, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "mitab.h"
@@ -42,12 +26,11 @@
  * These classes handle all the file types supported by the MITAB lib.
  * through the IMapInfoFile interface.
  *====================================================================*/
-class OGRTABDataSource : public OGRDataSource
+class OGRTABDataSource : public GDALDataset
 {
     CPL_DISALLOW_COPY_ASSIGN(OGRTABDataSource)
 
   private:
-    char *m_pszName;
     char *m_pszDirectory;
 
     int m_nLayerCount;
@@ -73,11 +56,6 @@ class OGRTABDataSource : public OGRDataSource
     int Open(GDALOpenInfo *poOpenInfo, int bTestOpen);
     int Create(const char *pszName, char **papszOptions);
 
-    const char *GetName() override
-    {
-        return m_pszName;
-    }
-
     int GetLayerCount() override;
     OGRLayer *GetLayer(int) override;
     int TestCapability(const char *) override;
diff --git a/ogr/ogrsf_frmts/mitab/mitab_priv.h b/ogr/ogrsf_frmts/mitab/mitab_priv.h
index 48b9a566f5c7..0fcca25040a5 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_priv.h
+++ b/ogr/ogrsf_frmts/mitab/mitab_priv.h
@@ -11,23 +11,7 @@
  * Copyright (c) 1999-2003, Daniel Morissette
  * Copyright (c) 2014, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #ifndef MITAB_PRIV_H_INCLUDED_
@@ -36,6 +20,7 @@
 #include "cpl_conv.h"
 #include "cpl_string.h"
 #include "ogr_feature.h"
+#include "ogrmitabspatialref.h"
 
 #include <set>
 
@@ -256,34 +241,6 @@ typedef struct TABMAPCoordSecHdr_t
     int nVertexOffset;
 } TABMAPCoordSecHdr;
 
-/*---------------------------------------------------------------------
- * TABProjInfo
- * struct used to store the projection parameters from the .MAP header
- *--------------------------------------------------------------------*/
-typedef struct TABProjInfo_t
-{
-    GByte nProjId;  // See MapInfo Ref. Manual, App. F and G
-    GByte nEllipsoidId;
-    GByte nUnitsId;
-    double adProjParams[7];  // params in same order as in .MIF COORDSYS
-
-    GInt16 nDatumId;      // Datum Id added in MapInfo 7.8+ (.map V500)
-    double dDatumShiftX;  // Before that, we had to always lookup datum
-    double dDatumShiftY;  // parameters to establish datum id
-    double dDatumShiftZ;
-    double adDatumParams[5];
-
-    // Affine parameters only in .map version 500 and up
-    GByte nAffineFlag;  // 0=No affine param, 1=Affine params
-    GByte nAffineUnits;
-    double dAffineParamA;  // Affine params
-    double dAffineParamB;
-    double dAffineParamC;
-    double dAffineParamD;
-    double dAffineParamE;
-    double dAffineParamF;
-} TABProjInfo;
-
 /*---------------------------------------------------------------------
  * TABPenDef - Pen definition information
  *--------------------------------------------------------------------*/
diff --git a/ogr/ogrsf_frmts/mitab/mitab_rawbinblock.cpp b/ogr/ogrsf_frmts/mitab/mitab_rawbinblock.cpp
index 7603266600fa..8503f1eab167 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_rawbinblock.cpp
+++ b/ogr/ogrsf_frmts/mitab/mitab_rawbinblock.cpp
@@ -11,23 +11,7 @@
  * Copyright (c) 1999, 2000, Daniel Morissette
  * Copyright (c) 2014, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/mitab/mitab_tabfile.cpp b/ogr/ogrsf_frmts/mitab/mitab_tabfile.cpp
index 3131960cfb0c..a402d2874223 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_tabfile.cpp
+++ b/ogr/ogrsf_frmts/mitab/mitab_tabfile.cpp
@@ -12,23 +12,7 @@
  * Copyright (c) 1999-2003, Daniel Morissette
  * Copyright (c) 2014, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "cpl_port.h"
@@ -1189,7 +1173,8 @@ int TABFile::WriteTABFile()
                 if (strlen(GetEncoding()) > 0)
                     osFieldName.Recode(CPL_ENC_UTF8, GetEncoding());
 
-                char *pszCleanName = TABCleanFieldName(osFieldName);
+                char *pszCleanName = TABCleanFieldName(
+                    osFieldName, GetEncoding(), m_bStrictLaundering);
                 osFieldName = pszCleanName;
                 CPLFree(pszCleanName);
 
@@ -1769,9 +1754,22 @@ int TABFile::SetCharset(const char *pszCharset)
     {
         m_poMAPFile->SetEncoding(CharsetToEncoding(pszCharset));
     }
+    if (EQUAL(pszCharset, "UTF-8"))
+    {
+        m_nVersion = std::max(m_nVersion, 1520);
+    }
     return 0;
 }
 
+void TABFile::SetStrictLaundering(bool bStrictLaundering)
+{
+    IMapInfoFile::SetStrictLaundering(bStrictLaundering);
+    if (!bStrictLaundering)
+    {
+        m_nVersion = std::max(m_nVersion, 1520);
+    }
+}
+
 /**********************************************************************
  *                   TABFile::CreateFeature()
  *
@@ -3034,3 +3032,110 @@ CPLErr TABFile::SetMetadataItem(const char *pszName, const char *pszValue,
     }
     return IMapInfoFile::SetMetadataItem(pszName, pszValue, pszDomain);
 }
+
+/**********************************************************************
+ *                   TABFile::GetSpatialRef()
+ *
+ * Returns a reference to an OGRSpatialReference for this dataset.
+ * If the projection parameters have not been parsed yet, then we will
+ * parse them before returning.
+ *
+ * The returned object is owned and maintained by this TABFile and
+ * should not be modified or freed by the caller.
+ *
+ * Returns NULL if the SpatialRef cannot be accessed.
+ **********************************************************************/
+OGRSpatialReference *TABFile::GetSpatialRef()
+{
+    if (m_poMAPFile == nullptr)
+    {
+        CPLError(CE_Failure, CPLE_AssertionFailed,
+                 "GetSpatialRef() failed: file has not been opened yet.");
+        return nullptr;
+    }
+
+    if (GetGeomType() == wkbNone)
+        return nullptr;
+
+    /*-----------------------------------------------------------------
+     * If projection params have already been processed, just use them.
+     *----------------------------------------------------------------*/
+    if (m_poSpatialRef != nullptr)
+        return m_poSpatialRef;
+
+    /*-----------------------------------------------------------------
+     * Fetch the parameters from the header.
+     *----------------------------------------------------------------*/
+    TABProjInfo sTABProj;
+
+    TABMAPHeaderBlock *poHeader = nullptr;
+    if ((poHeader = m_poMAPFile->GetHeaderBlock()) == nullptr ||
+        poHeader->GetProjInfo(&sTABProj) != 0)
+    {
+        CPLError(CE_Failure, CPLE_FileIO,
+                 "GetSpatialRef() failed reading projection parameters.");
+        return nullptr;
+    }
+
+    m_poSpatialRef = TABFileGetSpatialRefFromTABProj(sTABProj);
+    return m_poSpatialRef;
+}
+
+/**********************************************************************
+ *                   TABFile::SetSpatialRef()
+ *
+ * Set the OGRSpatialReference for this dataset.
+ * A reference to the OGRSpatialReference will be kept, and it will also
+ * be converted into a TABProjInfo to be stored in the .MAP header.
+ *
+ * Returns 0 on success, and -1 on error.
+ **********************************************************************/
+int TABFile::SetSpatialRef(OGRSpatialReference *poSpatialRef)
+{
+    if (m_eAccessMode != TABWrite)
+    {
+        CPLError(CE_Failure, CPLE_NotSupported,
+                 "SetSpatialRef() can be used only with Write access.");
+        return -1;
+    }
+
+    if (m_poMAPFile == nullptr)
+    {
+        CPLError(CE_Failure, CPLE_AssertionFailed,
+                 "SetSpatialRef() failed: file has not been opened yet.");
+        return -1;
+    }
+
+    if (poSpatialRef == nullptr)
+    {
+        CPLError(CE_Failure, CPLE_AssertionFailed,
+                 "SetSpatialRef() failed: Called with NULL poSpatialRef.");
+        return -1;
+    }
+
+    /*-----------------------------------------------------------------
+     * Keep a copy of the OGRSpatialReference...
+     * Note: we have to take the reference count into account...
+     *----------------------------------------------------------------*/
+    if (m_poSpatialRef && m_poSpatialRef->Dereference() == 0)
+        delete m_poSpatialRef;
+
+    m_poSpatialRef = poSpatialRef->Clone();
+
+    TABProjInfo sTABProj;
+    int nParamCount = 0;
+    TABFileGetTABProjFromSpatialRef(poSpatialRef, sTABProj, nParamCount);
+
+    /*-----------------------------------------------------------------
+     * Set the new parameters in the .MAP header.
+     * This will also trigger lookup of default bounds for the projection.
+     *----------------------------------------------------------------*/
+    if (SetProjInfo(&sTABProj) != 0)
+    {
+        CPLError(CE_Failure, CPLE_FileIO,
+                 "SetSpatialRef() failed setting projection parameters.");
+        return -1;
+    }
+
+    return 0;
+}
diff --git a/ogr/ogrsf_frmts/mitab/mitab_tabseamless.cpp b/ogr/ogrsf_frmts/mitab/mitab_tabseamless.cpp
index 1f6e57c6d04a..60b22b2be81d 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_tabseamless.cpp
+++ b/ogr/ogrsf_frmts/mitab/mitab_tabseamless.cpp
@@ -11,23 +11,7 @@
  * Copyright (c) 1999-2004, Daniel Morissette
  * Copyright (c) 2014, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/mitab/mitab_tabview.cpp b/ogr/ogrsf_frmts/mitab/mitab_tabview.cpp
index ba194d8d054a..779b0ae8c989 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_tabview.cpp
+++ b/ogr/ogrsf_frmts/mitab/mitab_tabview.cpp
@@ -12,23 +12,7 @@
  * Copyright (c) 1999-2002, Daniel Morissette
  * Copyright (c) 2014, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "cpl_port.h"
@@ -190,6 +174,7 @@ int TABView::OpenForRead(const char *pszFname,
         }
 
         CPLFree(m_pszFname);
+        m_pszFname = nullptr;
         return -1;
     }
 
@@ -219,6 +204,7 @@ int TABView::OpenForRead(const char *pszFname,
             CPLErrorReset();
 
         CPLFree(m_pszFname);
+        m_pszFname = nullptr;
 
         return -1;
     }
diff --git a/ogr/ogrsf_frmts/mitab/mitab_tooldef.cpp b/ogr/ogrsf_frmts/mitab/mitab_tooldef.cpp
index 26cd488f1d73..90182f343a28 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_tooldef.cpp
+++ b/ogr/ogrsf_frmts/mitab/mitab_tooldef.cpp
@@ -10,23 +10,7 @@
  **********************************************************************
  * Copyright (c) 1999, 2000, Daniel Morissette
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/mitab/mitab_utils.cpp b/ogr/ogrsf_frmts/mitab/mitab_utils.cpp
index 9cd6b1f45bd1..2bcd163f7971 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_utils.cpp
+++ b/ogr/ogrsf_frmts/mitab/mitab_utils.cpp
@@ -9,23 +9,7 @@
  **********************************************************************
  * Copyright (c) 1999-2001, Daniel Morissette
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #include "cpl_port.h"
@@ -455,53 +439,75 @@ char *TABEscapeString(char *pszString)
  *
  * The returned string should be freed by the caller.
  **********************************************************************/
-char *TABCleanFieldName(const char *pszSrcName)
+char *TABCleanFieldName(const char *pszSrcName, const char *pszEncoding,
+                        bool bStrictLaundering)
 {
     char *pszNewName = CPLStrdup(pszSrcName);
-    if (strlen(pszNewName) > 31)
-    {
-        pszNewName[31] = '\0';
-        CPLError(CE_Warning,
-                 static_cast<CPLErrorNum>(TAB_WarningInvalidFieldName),
-                 "Field name '%s' is longer than the max of 31 characters. "
-                 "'%s' will be used instead.",
-                 pszSrcName, pszNewName);
-    }
-
-    // According to the MapInfo User's Guide (p. 240, v5.5).
-    // New Table Command:
-    //  Name:
-    // Displays the field name in the name box. You can also enter new field
-    // names here. Defaults are Field1, Field2, etc. A field name can contain
-    // up to 31 alphanumeric characters. Use letters, numbers, and the
-    // underscore. Do not use spaces; instead, use the underscore character
-    // (_) to separate words in a field name. Use upper and lower case for
-    // legibility, but MapInfo is not case-sensitive.
-    //
-    // It was also verified that extended chars with accents are also
-    // accepted.
     int numInvalidChars = 0;
-    for (int i = 0; pszSrcName && pszSrcName[i] != '\0'; i++)
+
+    if (bStrictLaundering)
     {
-        if (pszSrcName[i] == '#')
+        if (strlen(pszNewName) > 31)
+        {
+            pszNewName[31] = '\0';
+            CPLError(CE_Warning,
+                     static_cast<CPLErrorNum>(TAB_WarningInvalidFieldName),
+                     "Field name '%s' is longer than the max of 31 characters. "
+                     "'%s' will be used instead.",
+                     pszSrcName, pszNewName);
+        }
+
+        // According to the MapInfo User's Guide (p. 240, v5.5).
+        // New Table Command:
+        //  Name:
+        // Displays the field name in the name box. You can also enter new field
+        // names here. Defaults are Field1, Field2, etc. A field name can contain
+        // up to 31 alphanumeric characters. Use letters, numbers, and the
+        // underscore. Do not use spaces; instead, use the underscore character
+        // (_) to separate words in a field name. Use upper and lower case for
+        // legibility, but MapInfo is not case-sensitive.
+        //
+        // It was also verified that extended chars with accents are also
+        // accepted.
+        bool bNeutralCharset =
+            (pszEncoding == nullptr || strlen(pszEncoding) == 0);
+        for (int i = 0; pszSrcName && pszSrcName[i] != '\0'; i++)
         {
-            if (i == 0)
+            if (pszSrcName[i] == '#')
+            {
+                if (i == 0)
+                {
+                    pszNewName[i] = '_';
+                    numInvalidChars++;
+                }
+            }
+            else if (!(pszSrcName[i] == '_' ||
+                       (i != 0 && pszSrcName[i] >= '0' &&
+                        pszSrcName[i] <= '9') ||
+                       (!bNeutralCharset ||
+                        ((pszSrcName[i] >= 'a' && pszSrcName[i] <= 'z') ||
+                         (pszSrcName[i] >= 'A' && pszSrcName[i] <= 'Z') ||
+                         static_cast<GByte>(pszSrcName[i]) >= 192))))
             {
                 pszNewName[i] = '_';
                 numInvalidChars++;
             }
         }
-        else if (!(pszSrcName[i] == '_' ||
-                   (i != 0 && pszSrcName[i] >= '0' && pszSrcName[i] <= '9') ||
-                   (pszSrcName[i] >= 'a' && pszSrcName[i] <= 'z') ||
-                   (pszSrcName[i] >= 'A' && pszSrcName[i] <= 'Z') ||
-                   static_cast<GByte>(pszSrcName[i]) >= 192))
+    }
+    else
+    {
+        // There is a note at mapinfo-pro-v2021-user-guide.pdf
+        // (p. 1425, Columns section: "Field names cannot have spaces".
+        // There seem to be no other constraints.
+        for (int i = 0; pszSrcName && pszSrcName[i] != '\0'; i++)
         {
-            pszNewName[i] = '_';
-            numInvalidChars++;
+            if (pszSrcName[i] == ' ')
+            {
+                pszNewName[i] = '_';
+                numInvalidChars++;
+            }
         }
     }
-
     if (numInvalidChars > 0)
     {
         CPLError(CE_Warning,
@@ -514,68 +520,6 @@ char *TABCleanFieldName(const char *pszSrcName)
     return pszNewName;
 }
 
-/**********************************************************************
- * MapInfo Units string to numeric ID conversion
- **********************************************************************/
-typedef struct
-{
-    int nUnitId;
-    const char *pszAbbrev;
-} MapInfoUnitsInfo;
-
-static const MapInfoUnitsInfo gasUnitsList[] = {
-    {0, "mi"},        {1, "km"},          {2, "in"},  {3, "ft"},
-    {4, "yd"},        {5, "mm"},          {6, "cm"},  {7, "m"},
-    {8, "survey ft"}, {8, "survey foot"},  // alternate
-    {13, nullptr},    {9, "nmi"},         {30, "li"}, {31, "ch"},
-    {32, "rd"},       {-1, nullptr}};
-
-/**********************************************************************
- *                       TABUnitIdToString()
- *
- * Return the MIF units name for specified units id.
- * Return "" if no match found.
- *
- * The returned string should not be freed by the caller.
- **********************************************************************/
-const char *TABUnitIdToString(int nId)
-{
-    const MapInfoUnitsInfo *psList = gasUnitsList;
-
-    while (psList->nUnitId != -1)
-    {
-        if (psList->nUnitId == nId)
-            return psList->pszAbbrev;
-        psList++;
-    }
-
-    return "";
-}
-
-/**********************************************************************
- *                       TABUnitIdFromString()
- *
- * Return the units ID for specified MIF units name
- *
- * Returns -1 if no match found.
- **********************************************************************/
-int TABUnitIdFromString(const char *pszName)
-{
-    if (pszName == nullptr)
-        return 13;
-
-    const MapInfoUnitsInfo *psList = gasUnitsList;
-
-    while (psList->nUnitId != -1)
-    {
-        if (psList->pszAbbrev != nullptr && EQUAL(psList->pszAbbrev, pszName))
-            return psList->nUnitId;
-        psList++;
-    }
-
-    return -1;
-}
-
 /**********************************************************************
  *                       TABSaturatedAdd()
  ***********************************************************************/
diff --git a/ogr/ogrsf_frmts/mitab/mitab_utils.h b/ogr/ogrsf_frmts/mitab/mitab_utils.h
index 72ae7b4c879b..88b9ab9f787a 100644
--- a/ogr/ogrsf_frmts/mitab/mitab_utils.h
+++ b/ogr/ogrsf_frmts/mitab/mitab_utils.h
@@ -10,23 +10,7 @@
  **********************************************************************
  * Copyright (c) 1999-2001, Daniel Morissette
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************/
 
 #ifndef MITAB_UTILS_H_INCLUDED_
@@ -54,10 +38,8 @@ char **TAB_CSLLoad(const char *pszFname);
 char *TABEscapeString(char *pszString);
 char *TABUnEscapeString(char *pszString, GBool bSrcIsConst);
 
-char *TABCleanFieldName(const char *pszSrcName);
-
-const char *TABUnitIdToString(int nId);
-int TABUnitIdFromString(const char *pszName);
+char *TABCleanFieldName(const char *pszSrcName, const char *pszCharset,
+                        bool bStrictLaundering);
 
 void TABSaturatedAdd(GInt32 &nVal, GInt32 nAdd);
 GInt16 TABInt16Diff(int a, int b);
diff --git a/ogr/ogrsf_frmts/mongodbv3/mongocxxv3_headers.h b/ogr/ogrsf_frmts/mongodbv3/mongocxxv3_headers.h
index 4a3586bb6a22..339109d01f52 100644
--- a/ogr/ogrsf_frmts/mongodbv3/mongocxxv3_headers.h
+++ b/ogr/ogrsf_frmts/mongodbv3/mongocxxv3_headers.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2019, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef MONGOCXXV3_HEADERS_H
diff --git a/ogr/ogrsf_frmts/mongodbv3/ogrmongodbv3driver.cpp b/ogr/ogrsf_frmts/mongodbv3/ogrmongodbv3driver.cpp
index bacf5224b877..b130b0a1ff70 100644
--- a/ogr/ogrsf_frmts/mongodbv3/ogrmongodbv3driver.cpp
+++ b/ogr/ogrsf_frmts/mongodbv3/ogrmongodbv3driver.cpp
@@ -7,24 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2014-2019, Even Rouault <even dot rouault at spatialys dot 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
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "mongocxxv3_headers.h"
diff --git a/ogr/ogrsf_frmts/mongodbv3/ogrmongodbv3drivercore.cpp b/ogr/ogrsf_frmts/mongodbv3/ogrmongodbv3drivercore.cpp
index e23d480ec85d..2c4c142d882d 100644
--- a/ogr/ogrsf_frmts/mongodbv3/ogrmongodbv3drivercore.cpp
+++ b/ogr/ogrsf_frmts/mongodbv3/ogrmongodbv3drivercore.cpp
@@ -7,24 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2014-2019, Even Rouault <even dot rouault at spatialys dot 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
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
diff --git a/ogr/ogrsf_frmts/mongodbv3/ogrmongodbv3drivercore.h b/ogr/ogrsf_frmts/mongodbv3/ogrmongodbv3drivercore.h
index bf5df103483b..45eb27df5fd9 100644
--- a/ogr/ogrsf_frmts/mongodbv3/ogrmongodbv3drivercore.h
+++ b/ogr/ogrsf_frmts/mongodbv3/ogrmongodbv3drivercore.h
@@ -7,24 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2014-2019, Even Rouault <even dot rouault at spatialys dot 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
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRMongoDBv3DRIVERCORE_H
diff --git a/ogr/ogrsf_frmts/mssqlspatial/include_msodbcsql.h b/ogr/ogrsf_frmts/mssqlspatial/include_msodbcsql.h
index 371122ed400e..82d955fdb2bb 100644
--- a/ogr/ogrsf_frmts/mssqlspatial/include_msodbcsql.h
+++ b/ogr/ogrsf_frmts/mssqlspatial/include_msodbcsql.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef INCLUDE_MSODBCSQL_H_DEFINED
diff --git a/ogr/ogrsf_frmts/mssqlspatial/ogr_mssqlspatial.h b/ogr/ogrsf_frmts/mssqlspatial/ogr_mssqlspatial.h
index 45a002d06a4b..dc96317c8308 100644
--- a/ogr/ogrsf_frmts/mssqlspatial/ogr_mssqlspatial.h
+++ b/ogr/ogrsf_frmts/mssqlspatial/ogr_mssqlspatial.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_MSSQLSPATIAL_H_INCLUDED
@@ -584,7 +568,7 @@ class OGRMSSQLSpatialSelectLayer final : public OGRMSSQLSpatialLayer
 /*                           OGRODBCDataSource                          */
 /************************************************************************/
 
-class OGRMSSQLSpatialDataSource final : public OGRDataSource
+class OGRMSSQLSpatialDataSource final : public GDALDataset
 {
     typedef struct
     {
@@ -597,8 +581,6 @@ class OGRMSSQLSpatialDataSource final : public OGRDataSource
     OGRMSSQLSpatialTableLayer **papoLayers;
     int nLayers;
 
-    char *pszName;
-
     char *pszCatalog;
 
     bool bDSUpdate;
@@ -647,11 +629,6 @@ class OGRMSSQLSpatialDataSource final : public OGRDataSource
                   const char *pszSRText, OGRwkbGeometryType eType,
                   bool bUpdate);
 
-    const char *GetName() override
-    {
-        return pszName;
-    }
-
     int GetLayerCount() override;
     OGRLayer *GetLayer(int) override;
     OGRLayer *GetLayerByName(const char *pszLayerName) override;
diff --git a/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlgeometryparser.cpp b/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlgeometryparser.cpp
index 80dc6919cf19..d9ae7f35eb2d 100644
--- a/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlgeometryparser.cpp
+++ b/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlgeometryparser.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlgeometryvalidator.cpp b/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlgeometryvalidator.cpp
index a9ccf6405fe5..33b3e6c6487b 100644
--- a/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlgeometryvalidator.cpp
+++ b/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlgeometryvalidator.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlgeometrywriter.cpp b/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlgeometrywriter.cpp
index 97a0bd61d8b2..7adae82f31be 100644
--- a/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlgeometrywriter.cpp
+++ b/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlgeometrywriter.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdatasource.cpp b/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdatasource.cpp
index 215080cbc260..a22944103b75 100644
--- a/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdatasource.cpp
+++ b/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdatasource.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2010, Tamas Szekeres
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_mssqlspatial.h"
@@ -35,7 +19,6 @@
 
 OGRMSSQLSpatialDataSource::OGRMSSQLSpatialDataSource() : bDSUpdate(false)
 {
-    pszName = nullptr;
     pszCatalog = nullptr;
     papoLayers = nullptr;
     nLayers = 0;
@@ -83,7 +66,6 @@ OGRMSSQLSpatialDataSource::~OGRMSSQLSpatialDataSource()
 
     CPLFree(papoLayers);
 
-    CPLFree(pszName);
     CPLFree(pszCatalog);
 
     CPLFree(pszConnection);
@@ -810,8 +792,6 @@ int OGRMSSQLSpatialDataSource::Open(const char *pszNewName, bool bUpdate,
         return FALSE;
     }
 
-    pszName = CPLStrdup(pszNewName);
-
     char **papszTableNames = nullptr;
     char **papszSchemaNames = nullptr;
     char **papszGeomColumnNames = nullptr;
@@ -1232,8 +1212,8 @@ OGRLayer *OGRMSSQLSpatialDataSource::ExecuteSQL(const char *pszSQLCommand,
     /*      Use generic implementation for recognized dialects              */
     /* -------------------------------------------------------------------- */
     if (IsGenericSQLDialect(pszDialect))
-        return OGRDataSource::ExecuteSQL(pszSQLCommand, poSpatialFilter,
-                                         pszDialect);
+        return GDALDataset::ExecuteSQL(pszSQLCommand, poSpatialFilter,
+                                       pszDialect);
 
     /* -------------------------------------------------------------------- */
     /*      Special case DELLAYER: command.                                 */
diff --git a/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdriver.cpp b/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdriver.cpp
index a8f5b9d8bdb0..59808ca610c2 100644
--- a/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdriver.cpp
+++ b/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_mssqlspatial.h"
diff --git a/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdrivercore.cpp b/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdrivercore.cpp
index 9ce7849ac309..7a316cdf7d27 100644
--- a/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdrivercore.cpp
+++ b/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdrivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
diff --git a/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdrivercore.h b/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdrivercore.h
index bcd3c84f04ab..9df7caad5673 100644
--- a/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdrivercore.h
+++ b/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdrivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRMSSQLSPATIALDRIVERCORE_H
diff --git a/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatiallayer.cpp b/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatiallayer.cpp
index e5b1ac2c8d69..dbfbad8774b1 100644
--- a/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatiallayer.cpp
+++ b/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatiallayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_mssqlspatial.h"
diff --git a/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialselectlayer.cpp b/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialselectlayer.cpp
index 5fc752f85b08..30e95cc53efc 100644
--- a/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialselectlayer.cpp
+++ b/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialselectlayer.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialtablelayer.cpp b/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialtablelayer.cpp
index 41f51a9020e4..b6d5e381d8b0 100644
--- a/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialtablelayer.cpp
+++ b/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialtablelayer.cpp
@@ -8,29 +8,14 @@
  * Copyright (c) 2010, Tamas Szekeres
  * Copyright (c) 2010-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
 #include "ogr_mssqlspatial.h"
 #include "ogr_p.h"
 
+#include <cmath>
 #include <memory>
 #include <string_view>
 
@@ -608,10 +593,10 @@ OGRMSSQLSpatialTableLayer::BuildStatement(const char *pszColumns)
         if (nGeomColumnType == MSSQLCOLTYPE_GEOMETRY ||
             nGeomColumnType == MSSQLCOLTYPE_GEOGRAPHY)
         {
-            if (!CPLIsInf(m_sFilterEnvelope.MinX) &&
-                !CPLIsInf(m_sFilterEnvelope.MinY) &&
-                !CPLIsInf(m_sFilterEnvelope.MaxX) &&
-                !CPLIsInf(m_sFilterEnvelope.MaxY))
+            if (!std::isinf(m_sFilterEnvelope.MinX) &&
+                !std::isinf(m_sFilterEnvelope.MinY) &&
+                !std::isinf(m_sFilterEnvelope.MaxX) &&
+                !std::isinf(m_sFilterEnvelope.MaxY))
             {
                 if (pszQuery == nullptr)
                     poStatement->Append(" where ");
diff --git a/ogr/ogrsf_frmts/mvt/mvt_tile.cpp b/ogr/ogrsf_frmts/mvt/mvt_tile.cpp
index 27e12d0c2264..e44fabdbe836 100644
--- a/ogr/ogrsf_frmts/mvt/mvt_tile.cpp
+++ b/ogr/ogrsf_frmts/mvt/mvt_tile.cpp
@@ -7,27 +7,12 @@
  ******************************************************************************
  * Copyright (c) 2018, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gpb.h"
 
+#include <cmath>
 #include <limits>
 #include <memory>
 #include <vector>
@@ -183,7 +168,7 @@ void MVTTileLayerValue::setValue(double dfVal)
     {
         setSIntValue(static_cast<GInt64>(dfVal));
     }
-    else if (!CPLIsFinite(dfVal) ||
+    else if (!std::isfinite(dfVal) ||
              (dfVal >= -std::numeric_limits<float>::max() &&
               dfVal <= std::numeric_limits<float>::max() &&
               dfVal == static_cast<float>(dfVal)))
diff --git a/ogr/ogrsf_frmts/mvt/mvt_tile.h b/ogr/ogrsf_frmts/mvt/mvt_tile.h
index dd41f5dd4c21..530a6fda4006 100644
--- a/ogr/ogrsf_frmts/mvt/mvt_tile.h
+++ b/ogr/ogrsf_frmts/mvt/mvt_tile.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef MVT_TILE_H
diff --git a/ogr/ogrsf_frmts/mvt/mvt_tile_test.cpp b/ogr/ogrsf_frmts/mvt/mvt_tile_test.cpp
index f2d58fd552df..106299e1c713 100644
--- a/ogr/ogrsf_frmts/mvt/mvt_tile_test.cpp
+++ b/ogr/ogrsf_frmts/mvt/mvt_tile_test.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #define ADD_MVT_TILE_READ
diff --git a/ogr/ogrsf_frmts/mvt/mvtutils.cpp b/ogr/ogrsf_frmts/mvt/mvtutils.cpp
index 1bda7dba4bce..dd68962f51d8 100644
--- a/ogr/ogrsf_frmts/mvt/mvtutils.cpp
+++ b/ogr/ogrsf_frmts/mvt/mvtutils.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "mvtutils.h"
diff --git a/ogr/ogrsf_frmts/mvt/mvtutils.h b/ogr/ogrsf_frmts/mvt/mvtutils.h
index d40d9eb43f60..fa13b6549ae7 100644
--- a/ogr/ogrsf_frmts/mvt/mvtutils.h
+++ b/ogr/ogrsf_frmts/mvt/mvtutils.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef MVTUTILS_H
diff --git a/ogr/ogrsf_frmts/mvt/ogrmvtdataset.cpp b/ogr/ogrsf_frmts/mvt/ogrmvtdataset.cpp
index 1a9d14dcec01..5b2cfbfd5069 100644
--- a/ogr/ogrsf_frmts/mvt/ogrmvtdataset.cpp
+++ b/ogr/ogrsf_frmts/mvt/ogrmvtdataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #if defined(HAVE_SQLITE) && defined(HAVE_GEOS)
@@ -2804,7 +2788,7 @@ GDALDataset *OGRMVTDataset::OpenDirectory(GDALOpenInfo *poOpenInfo)
     OGRMVTDataset *poDS = new OGRMVTDataset(nullptr);
 
     const CPLString osMetadataMemFilename =
-        CPLSPrintf("/vsimem/%p_metadata.json", poDS);
+        VSIMemGenerateHiddenFilename("mvt_metadata.json");
     if (!LoadMetadata(osMetadataFile, osMetadataContent, oVectorLayers,
                       oTileStatLayers, oBounds, poDS->m_poSRS,
                       poDS->m_dfTopXOrigin, poDS->m_dfTopYOrigin,
@@ -4265,24 +4249,35 @@ OGRErr OGRMVTWriterDataset::PreGenerateForTileReal(
     oBuffer.assign(static_cast<char *>(pCompressed), nCompressedSize);
     CPLFree(pCompressed);
 
-    std::unique_ptr<std::lock_guard<std::mutex>> poLockGuard;
+    const auto InsertIntoDb = [&]()
+    {
+        m_nTempTiles++;
+        sqlite3_bind_int(m_hInsertStmt, 1, nZ);
+        sqlite3_bind_int(m_hInsertStmt, 2, nTileX);
+        sqlite3_bind_int(m_hInsertStmt, 3, nTileY);
+        sqlite3_bind_text(m_hInsertStmt, 4, osTargetName.c_str(), -1,
+                          SQLITE_STATIC);
+        sqlite3_bind_int64(m_hInsertStmt, 5, nSerial);
+        sqlite3_bind_blob(m_hInsertStmt, 6, oBuffer.data(),
+                          static_cast<int>(oBuffer.size()), SQLITE_STATIC);
+        sqlite3_bind_int(m_hInsertStmt, 7,
+                         static_cast<int>(poGPBFeature->getType()));
+        sqlite3_bind_double(m_hInsertStmt, 8, dfAreaOrLength);
+        int rc = sqlite3_step(m_hInsertStmt);
+        sqlite3_reset(m_hInsertStmt);
+        return rc;
+    };
+
+    int rc;
     if (m_bThreadPoolOK)
-        poLockGuard = std::make_unique<std::lock_guard<std::mutex>>(m_oDBMutex);
-
-    m_nTempTiles++;
-    sqlite3_bind_int(m_hInsertStmt, 1, nZ);
-    sqlite3_bind_int(m_hInsertStmt, 2, nTileX);
-    sqlite3_bind_int(m_hInsertStmt, 3, nTileY);
-    sqlite3_bind_text(m_hInsertStmt, 4, osTargetName.c_str(), -1,
-                      SQLITE_STATIC);
-    sqlite3_bind_int64(m_hInsertStmt, 5, nSerial);
-    sqlite3_bind_blob(m_hInsertStmt, 6, oBuffer.data(),
-                      static_cast<int>(oBuffer.size()), SQLITE_STATIC);
-    sqlite3_bind_int(m_hInsertStmt, 7,
-                     static_cast<int>(poGPBFeature->getType()));
-    sqlite3_bind_double(m_hInsertStmt, 8, dfAreaOrLength);
-    int rc = sqlite3_step(m_hInsertStmt);
-    sqlite3_reset(m_hInsertStmt);
+    {
+        std::lock_guard<std::mutex> oLock(m_oDBMutex);
+        rc = InsertIntoDb();
+    }
+    else
+    {
+        rc = InsertIntoDb();
+    }
 
     if (!(rc == SQLITE_OK || rc == SQLITE_DONE))
     {
@@ -4473,7 +4468,8 @@ static void GZIPCompress(std::string &oTileBuffer)
 {
     if (!oTileBuffer.empty())
     {
-        CPLString osTmpFilename(CPLSPrintf("/vsimem/%p.gz", &oTileBuffer));
+        const CPLString osTmpFilename(
+            VSIMemGenerateHiddenFilename("mvt_temp.gz"));
         CPLString osTmpGZipFilename("/vsigzip/" + osTmpFilename);
         VSILFILE *fpGZip = VSIFOpenL(osTmpGZipFilename, "wb");
         if (fpGZip)
@@ -5381,7 +5377,7 @@ static bool WriteMetadataItem(const char *pszKey, int nValue,
 static bool WriteMetadataItem(const char *pszKey, double dfValue,
                               sqlite3 *hDBMBTILES, CPLJSONObject &oRoot)
 {
-    return WriteMetadataItemT(pszKey, dfValue, "%.18g", hDBMBTILES, oRoot);
+    return WriteMetadataItemT(pszKey, dfValue, "%.17g", hDBMBTILES, oRoot);
 }
 
 /************************************************************************/
@@ -6185,6 +6181,8 @@ GDALDataset *OGRMVTWriterDataset::Create(const char *pszFilename, int nXSize,
     }
 
     poDS->SetDescription(pszFilename);
+    poDS->poDriver = GDALDriver::FromHandle(GDALGetDriverByName("MVT"));
+
     return poDS;
 }
 
diff --git a/ogr/ogrsf_frmts/mysql/ogr_mysql.h b/ogr/ogrsf_frmts/mysql/ogr_mysql.h
index f6fd22767889..85dc86b777be 100644
--- a/ogr/ogrsf_frmts/mysql/ogr_mysql.h
+++ b/ogr/ogrsf_frmts/mysql/ogr_mysql.h
@@ -10,23 +10,7 @@
  * Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_MYSQL_H_INCLUDED
@@ -251,13 +235,11 @@ class OGRMySQLResultLayer final : public OGRMySQLLayer
 /*                          OGRMySQLDataSource                          */
 /************************************************************************/
 
-class OGRMySQLDataSource final : public OGRDataSource
+class OGRMySQLDataSource final : public GDALDataset
 {
     OGRMySQLLayer **papoLayers;
     int nLayers;
 
-    char *pszName;
-
     int bDSUpdate;
 
     MYSQL *hConn;
@@ -298,11 +280,6 @@ class OGRMySQLDataSource final : public OGRDataSource
     int Open(const char *, char **papszOpenOptions, int bUpdate);
     int OpenTable(const char *, int bUpdate);
 
-    const char *GetName() override
-    {
-        return pszName;
-    }
-
     int GetLayerCount() override
     {
         return nLayers;
diff --git a/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp b/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp
index 041a777f739a..150e447796d1 100644
--- a/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp
+++ b/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <string>
@@ -52,8 +36,8 @@ inline void FreeResultAndNullify(MYSQL_RES *&hResult)
 /************************************************************************/
 
 OGRMySQLDataSource::OGRMySQLDataSource()
-    : papoLayers(nullptr), nLayers(0), pszName(nullptr), bDSUpdate(FALSE),
-      hConn(nullptr), poLongResultLayer(nullptr)
+    : papoLayers(nullptr), nLayers(0), bDSUpdate(FALSE), hConn(nullptr),
+      poLongResultLayer(nullptr)
 {
 }
 
@@ -66,8 +50,6 @@ OGRMySQLDataSource::~OGRMySQLDataSource()
 {
     InterruptLongResult();
 
-    CPLFree(pszName);
-
     for (int i = 0; i < nLayers; i++)
         delete papoLayers[i];
 
@@ -248,8 +230,6 @@ int OGRMySQLDataSource::Open(const char *pszNewName, char **papszOpenOptionsIn,
         mysql_options(hConn, MYSQL_OPT_RECONNECT, &reconnect);
     }
 
-    pszName = CPLStrdup(pszNewName);
-
     bDSUpdate = bUpdate;
 
     /* -------------------------------------------------------------------- */
@@ -984,8 +964,8 @@ OGRLayer *OGRMySQLDataSource::ExecuteSQL(const char *pszSQLCommand,
     /*      Use generic implementation for recognized dialects              */
     /* -------------------------------------------------------------------- */
     if (IsGenericSQLDialect(pszDialect))
-        return OGRDataSource::ExecuteSQL(pszSQLCommand, poSpatialFilter,
-                                         pszDialect);
+        return GDALDataset::ExecuteSQL(pszSQLCommand, poSpatialFilter,
+                                       pszDialect);
 
 /* -------------------------------------------------------------------- */
 /*      Special case DELLAYER: command.                                 */
diff --git a/ogr/ogrsf_frmts/mysql/ogrmysqldriver.cpp b/ogr/ogrsf_frmts/mysql/ogrmysqldriver.cpp
index 04247dded085..dbb2b2abc73a 100644
--- a/ogr/ogrsf_frmts/mysql/ogrmysqldriver.cpp
+++ b/ogr/ogrsf_frmts/mysql/ogrmysqldriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_mysql.h"
diff --git a/ogr/ogrsf_frmts/mysql/ogrmysqldrivercore.cpp b/ogr/ogrsf_frmts/mysql/ogrmysqldrivercore.cpp
index 27be1d6d60cd..a88f05991cce 100644
--- a/ogr/ogrsf_frmts/mysql/ogrmysqldrivercore.cpp
+++ b/ogr/ogrsf_frmts/mysql/ogrmysqldrivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
diff --git a/ogr/ogrsf_frmts/mysql/ogrmysqldrivercore.h b/ogr/ogrsf_frmts/mysql/ogrmysqldrivercore.h
index c9dcf9b234b9..6f4621c4dc0e 100644
--- a/ogr/ogrsf_frmts/mysql/ogrmysqldrivercore.h
+++ b/ogr/ogrsf_frmts/mysql/ogrmysqldrivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRMYSQLDRIVERCORE_H
diff --git a/ogr/ogrsf_frmts/mysql/ogrmysqllayer.cpp b/ogr/ogrsf_frmts/mysql/ogrmysqllayer.cpp
index 99932087b969..d91dcdbd12c6 100644
--- a/ogr/ogrsf_frmts/mysql/ogrmysqllayer.cpp
+++ b/ogr/ogrsf_frmts/mysql/ogrmysqllayer.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_mysql.h"
diff --git a/ogr/ogrsf_frmts/mysql/ogrmysqlresultlayer.cpp b/ogr/ogrsf_frmts/mysql/ogrmysqlresultlayer.cpp
index 78c9a74d898e..c9213197e13a 100644
--- a/ogr/ogrsf_frmts/mysql/ogrmysqlresultlayer.cpp
+++ b/ogr/ogrsf_frmts/mysql/ogrmysqlresultlayer.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/mysql/ogrmysqltablelayer.cpp b/ogr/ogrsf_frmts/mysql/ogrmysqltablelayer.cpp
index f07612d1e6e4..7c7975b49d91 100644
--- a/ogr/ogrsf_frmts/mysql/ogrmysqltablelayer.cpp
+++ b/ogr/ogrsf_frmts/mysql/ogrmysqltablelayer.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
@@ -477,8 +461,8 @@ void OGRMySQLTableLayer::BuildWhere()
         const double dfMaxY = sEnvelope.MaxY;
 
         CPLsnprintf(szEnvelope, sizeof(szEnvelope),
-                    "POLYGON((%.18g %.18g, %.18g %.18g, %.18g %.18g, %.18g "
-                    "%.18g, %.18g %.18g))",
+                    "POLYGON((%.17g %.17g, %.17g %.17g, %.17g %.17g, %.17g "
+                    "%.17g, %.17g %.17g))",
                     dfMinX, dfMinY, dfMaxX, dfMinY, dfMaxX, dfMaxY, dfMinX,
                     dfMaxY, dfMinX, dfMinY);
 
diff --git a/ogr/ogrsf_frmts/nas/CMakeLists.txt b/ogr/ogrsf_frmts/nas/CMakeLists.txt
index c47dd844ee71..7386ce5a0f37 100644
--- a/ogr/ogrsf_frmts/nas/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/nas/CMakeLists.txt
@@ -9,7 +9,7 @@ add_gdal_driver(
           ogrnaslayer.cpp
   BUILTIN) # BUILTIN because of GML dependency
 gdal_standard_includes(ogr_NAS)
-target_include_directories(ogr_NAS PRIVATE $<TARGET_PROPERTY:ogr_GML,SOURCE_DIR>)
+target_include_directories(ogr_NAS PRIVATE $<TARGET_PROPERTY:ogr_GML,SOURCE_DIR> $<TARGET_PROPERTY:gmlutils,SOURCE_DIR>)
 if (GDAL_USE_EXPAT)
   target_compile_definitions(ogr_NAS PRIVATE -DHAVE_EXPAT)
   gdal_target_link_libraries(ogr_NAS PRIVATE ${EXPAT_TARGET})
diff --git a/ogr/ogrsf_frmts/nas/nashandler.cpp b/ogr/ogrsf_frmts/nas/nashandler.cpp
index e542e7f979c9..eb3465bad896 100644
--- a/ogr/ogrsf_frmts/nas/nashandler.cpp
+++ b/ogr/ogrsf_frmts/nas/nashandler.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2002, Frank Warmerdam
  * Copyright (c) 2010-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <ctype.h>
@@ -181,6 +165,8 @@ void NASHandler::startElement(const XMLCh *const /* uri */,
                               const Attributes &attrs)
 
 {
+    m_nEntityCounter = 0;
+
     GMLReadState *poState = m_poReader->GetState();
 
     transcode(localname, m_osElementName);
@@ -438,6 +424,8 @@ void NASHandler::endElement(const XMLCh *const /* uri */,
                             const XMLCh *const /* qname */)
 
 {
+    m_nEntityCounter = 0;
+
     GMLReadState *poState = m_poReader->GetState();
 
     transcode(localname, m_osElementName);
@@ -662,6 +650,20 @@ void NASHandler::endElement(const XMLCh *const /* uri */,
     }
 }
 
+/************************************************************************/
+/*                             startEntity()                            */
+/************************************************************************/
+
+void NASHandler::startEntity(const XMLCh *const /* name */)
+{
+    m_nEntityCounter++;
+    if (m_nEntityCounter > 1000 && !m_poReader->HasStoppedParsing())
+    {
+        throw SAXNotSupportedException(
+            "File probably corrupted (million laugh pattern)");
+    }
+}
+
 /************************************************************************/
 /*                             characters()                             */
 /************************************************************************/
diff --git a/ogr/ogrsf_frmts/nas/nasreader.cpp b/ogr/ogrsf_frmts/nas/nasreader.cpp
index 40bc5bafac7a..df86ce75d247 100644
--- a/ogr/ogrsf_frmts/nas/nasreader.cpp
+++ b/ogr/ogrsf_frmts/nas/nasreader.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2002, Frank Warmerdam
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gmlreaderp.h"
@@ -266,6 +250,13 @@ GMLFeature *NASReader::NextFeature()
         CPLDebug("NAS", "Error during NextFeature()! Message:\n%s",
                  transcode(toCatch.getMessage()).c_str());
     }
+    catch (const SAXException &toCatch)
+    {
+        CPLString osErrMsg;
+        transcode(toCatch.getMessage(), osErrMsg);
+        CPLError(CE_Failure, CPLE_AppDefined, "%s", osErrMsg.c_str());
+        m_bStopParsing = true;
+    }
 
     return poReturn;
 }
diff --git a/ogr/ogrsf_frmts/nas/nasreaderp.h b/ogr/ogrsf_frmts/nas/nasreaderp.h
index 9e935a75402a..82b68bf47b5e 100644
--- a/ogr/ogrsf_frmts/nas/nasreaderp.h
+++ b/ogr/ogrsf_frmts/nas/nasreaderp.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2008, Frank Warmerdam
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_NASREADERP_H_INCLUDED
@@ -84,6 +68,8 @@ class NASHandler final : public DefaultHandler
 
     const Locator *m_Locator;
 
+    int m_nEntityCounter = 0;
+
   public:
     explicit NASHandler(NASReader *poReader);
     virtual ~NASHandler();
@@ -101,6 +87,8 @@ class NASHandler final : public DefaultHandler
 
     void fatalError(const SAXParseException &) override;
 
+    void startEntity(const XMLCh *const name) override;
+
     void setDocumentLocator(const Locator *locator) override;
 
     CPLString GetAttributes(const Attributes *attr);
diff --git a/ogr/ogrsf_frmts/nas/ogr_nas.h b/ogr/ogrsf_frmts/nas/ogr_nas.h
index 6035534eef82..f2e5ba12e469 100644
--- a/ogr/ogrsf_frmts/nas/ogr_nas.h
+++ b/ogr/ogrsf_frmts/nas/ogr_nas.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_NAS_H_INCLUDED
@@ -81,13 +65,11 @@ class OGRNASLayer final : public OGRLayer
 /*                           OGRNASDataSource                           */
 /************************************************************************/
 
-class OGRNASDataSource final : public OGRDataSource
+class OGRNASDataSource final : public GDALDataset
 {
     OGRLayer **papoLayers;
     int nLayers;
 
-    char *pszName;
-
     OGRNASLayer *TranslateNASSchema(GMLFeatureClass *);
 
     // input related parameters.
@@ -102,11 +84,6 @@ class OGRNASDataSource final : public OGRDataSource
     int Open(const char *);
     int Create(const char *pszFile, char **papszOptions);
 
-    const char *GetName() override
-    {
-        return pszName;
-    }
-
     int GetLayerCount() override
     {
         return nLayers;
@@ -114,8 +91,6 @@ class OGRNASDataSource final : public OGRDataSource
 
     OGRLayer *GetLayer(int) override;
 
-    int TestCapability(const char *) override;
-
     IGMLReader *GetReader()
     {
         return poReader;
diff --git a/ogr/ogrsf_frmts/nas/ogrnasdatasource.cpp b/ogr/ogrsf_frmts/nas/ogrnasdatasource.cpp
index 3f5d5cb9fea1..7142f7c955af 100644
--- a/ogr/ogrsf_frmts/nas/ogrnasdatasource.cpp
+++ b/ogr/ogrsf_frmts/nas/ogrnasdatasource.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
@@ -41,7 +25,7 @@ static const char *const apszURNNames[] = {
 /************************************************************************/
 
 OGRNASDataSource::OGRNASDataSource()
-    : papoLayers(nullptr), nLayers(0), pszName(nullptr), poReader(nullptr)
+    : papoLayers(nullptr), nLayers(0), poReader(nullptr)
 {
 }
 
@@ -52,8 +36,6 @@ OGRNASDataSource::OGRNASDataSource()
 OGRNASDataSource::~OGRNASDataSource()
 
 {
-    CPLFree(pszName);
-
     for (int i = 0; i < nLayers; i++)
         delete papoLayers[i];
 
@@ -83,8 +65,6 @@ int OGRNASDataSource::Open(const char *pszNewName)
 
     poReader->SetSourceFile(pszNewName);
 
-    pszName = CPLStrdup(pszNewName);
-
     bool bHaveSchema = false;
     bool bHaveTemplate = false;
     const char *pszGFSFilename;
@@ -321,12 +301,3 @@ OGRLayer *OGRNASDataSource::GetLayer(int iLayer)
 
     return papoLayers[iLayer];
 }
-
-/************************************************************************/
-/*                           TestCapability()                           */
-/************************************************************************/
-
-int OGRNASDataSource::TestCapability(const char * /* pszCap */)
-{
-    return FALSE;
-}
diff --git a/ogr/ogrsf_frmts/nas/ogrnasdriver.cpp b/ogr/ogrsf_frmts/nas/ogrnasdriver.cpp
index b21546afe9ea..eb4051ef8279 100644
--- a/ogr/ogrsf_frmts/nas/ogrnasdriver.cpp
+++ b/ogr/ogrsf_frmts/nas/ogrnasdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
@@ -49,26 +33,36 @@ static int OGRNASDriverIdentify(GDALOpenInfo *poOpenInfo)
     /* -------------------------------------------------------------------- */
 
     // Used to skip to actual beginning of XML data
-    // const char* szPtr = (const char*)poOpenInfo->pabyHeader;
-    const char *szPtr = reinterpret_cast<char *>(poOpenInfo->pabyHeader);
+    const char *pszPtr = reinterpret_cast<const char *>(poOpenInfo->pabyHeader);
 
-    if (((unsigned char)szPtr[0] == 0xEF) &&
-        ((unsigned char)szPtr[1] == 0xBB) && ((unsigned char)szPtr[2] == 0xBF))
+    // Skip UTF-8 BOM
+    if (poOpenInfo->nHeaderBytes > 3 &&
+        memcmp(poOpenInfo->pabyHeader, "\xEF\xBB\xBF", 3) == 0)
     {
-        szPtr += 3;
+        pszPtr += 3;
     }
 
+    // Skip spaces
+    while (*pszPtr && std::isspace(static_cast<unsigned char>(*pszPtr)))
+        ++pszPtr;
+
     /* -------------------------------------------------------------------- */
     /*      Here, we expect the opening chevrons of NAS tree root element   */
     /* -------------------------------------------------------------------- */
-    if (szPtr[0] != '<')
+    if (pszPtr[0] != '<')
         return FALSE;
 
+    if (poOpenInfo->IsSingleAllowedDriver("NAS"))
+        return TRUE;
+
+    // TryToIngest() invalidates above pszPtr
+    pszPtr = nullptr;
+    CPL_IGNORE_RET_VAL(pszPtr);
     if (!poOpenInfo->TryToIngest(8192))
         return FALSE;
-    szPtr = (const char *)poOpenInfo->pabyHeader;
+    pszPtr = reinterpret_cast<const char *>(poOpenInfo->pabyHeader);
 
-    if (strstr(szPtr, "opengis.net/gml") == nullptr)
+    if (strstr(pszPtr, "opengis.net/gml") == nullptr)
         return FALSE;
 
     char **papszIndicators = CSLTokenizeStringComplex(
@@ -79,7 +73,7 @@ static int OGRNASDriverIdentify(GDALOpenInfo *poOpenInfo)
     bool bFound = false;
     for (int i = 0; papszIndicators[i] && !bFound; i++)
     {
-        bFound = strstr(szPtr, papszIndicators[i]) != nullptr;
+        bFound = strstr(pszPtr, papszIndicators[i]) != nullptr;
     }
 
     CSLDestroy(papszIndicators);
diff --git a/ogr/ogrsf_frmts/nas/ogrnaslayer.cpp b/ogr/ogrsf_frmts/nas/ogrnaslayer.cpp
index 530dcc890d4f..f3aa931f10d5 100644
--- a/ogr/ogrsf_frmts/nas/ogrnaslayer.cpp
+++ b/ogr/ogrsf_frmts/nas/ogrnaslayer.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/ngw/gdalngwdataset.cpp b/ogr/ogrsf_frmts/ngw/gdalngwdataset.cpp
index 8ce8be2905bb..de6a6bbbbbdb 100644
--- a/ogr/ogrsf_frmts/ngw/gdalngwdataset.cpp
+++ b/ogr/ogrsf_frmts/ngw/gdalngwdataset.cpp
@@ -8,23 +8,7 @@
  *
  *  Copyright (c) 2018-2020, NextGIS <info@nextgis.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.
+ * SPDX-License-Identifier: MIT
  *******************************************************************************/
 
 #include "ogr_ngw.h"
diff --git a/ogr/ogrsf_frmts/ngw/ngw_api.cpp b/ogr/ogrsf_frmts/ngw/ngw_api.cpp
index c3da678f83e7..771947dab06f 100644
--- a/ogr/ogrsf_frmts/ngw/ngw_api.cpp
+++ b/ogr/ogrsf_frmts/ngw/ngw_api.cpp
@@ -8,23 +8,7 @@
  *
  *  Copyright (c) 2018-2020, NextGIS
  *
- *  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.
+ * SPDX-License-Identifier: MIT
  *******************************************************************************/
 
 #include "ogr_ngw.h"
diff --git a/ogr/ogrsf_frmts/ngw/ogr_ngw.h b/ogr/ogrsf_frmts/ngw/ogr_ngw.h
index beb4e413f28b..90a7c7c81607 100644
--- a/ogr/ogrsf_frmts/ngw/ogr_ngw.h
+++ b/ogr/ogrsf_frmts/ngw/ogr_ngw.h
@@ -8,23 +8,7 @@
  *
  *  Copyright (c) 2018-2020, NextGIS
  *
- *  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.
+ * SPDX-License-Identifier: MIT
  *******************************************************************************/
 #ifndef OGR_NGW_H_INCLUDED
 #define OGR_NGW_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/ngw/ogrngwdriver.cpp b/ogr/ogrsf_frmts/ngw/ogrngwdriver.cpp
index 2944aa10848e..29815da4a84a 100644
--- a/ogr/ogrsf_frmts/ngw/ogrngwdriver.cpp
+++ b/ogr/ogrsf_frmts/ngw/ogrngwdriver.cpp
@@ -8,23 +8,7 @@
  *
  *  Copyright (c) 2018-2020, NextGIS <info@nextgis.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.
+ * SPDX-License-Identifier: MIT
  *******************************************************************************/
 
 #include "ogr_ngw.h"
diff --git a/ogr/ogrsf_frmts/ngw/ogrngwlayer.cpp b/ogr/ogrsf_frmts/ngw/ogrngwlayer.cpp
index fe4b41291705..810a78082e6c 100644
--- a/ogr/ogrsf_frmts/ngw/ogrngwlayer.cpp
+++ b/ogr/ogrsf_frmts/ngw/ogrngwlayer.cpp
@@ -8,23 +8,7 @@
  *
  *  Copyright (c) 2018-2020, NextGIS <info@nextgis.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.
+ * SPDX-License-Identifier: MIT
  *******************************************************************************/
 
 #include "ogr_ngw.h"
diff --git a/ogr/ogrsf_frmts/ntf/ntf.h b/ogr/ogrsf_frmts/ntf/ntf.h
index 6bd50753f534..b5e836deeda0 100644
--- a/ogr/ogrsf_frmts/ntf/ntf.h
+++ b/ogr/ogrsf_frmts/ntf/ntf.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef NTF_H_INCLUDED
@@ -597,10 +581,8 @@ class OGRNTFRasterLayer final : public OGRLayer
 /*                           OGRNTFDataSource                           */
 /************************************************************************/
 
-class OGRNTFDataSource final : public OGRDataSource
+class OGRNTFDataSource final : public GDALDataset
 {
-    char *pszName;
-
     int nLayers;
     OGRLayer **papoLayers;
 
@@ -638,11 +620,6 @@ class OGRNTFDataSource final : public OGRDataSource
     int Open(const char *pszName, int bTestOpen = FALSE,
              char **papszFileList = nullptr);
 
-    const char *GetName() override
-    {
-        return pszName;
-    }
-
     int GetLayerCount() override;
     OGRLayer *GetLayer(int) override;
     int TestCapability(const char *) override;
diff --git a/ogr/ogrsf_frmts/ntf/ntf_codelist.cpp b/ogr/ogrsf_frmts/ntf/ntf_codelist.cpp
index c2c943216352..069ee36e9f95 100644
--- a/ogr/ogrsf_frmts/ntf/ntf_codelist.cpp
+++ b/ogr/ogrsf_frmts/ntf/ntf_codelist.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2001, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <algorithm>
diff --git a/ogr/ogrsf_frmts/ntf/ntf_estlayers.cpp b/ogr/ogrsf_frmts/ntf/ntf_estlayers.cpp
index 5284d7a2cd77..379f86f93cbf 100644
--- a/ogr/ogrsf_frmts/ntf/ntf_estlayers.cpp
+++ b/ogr/ogrsf_frmts/ntf/ntf_estlayers.cpp
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <stdarg.h>
@@ -485,7 +469,7 @@ static OGRFeature *TranslateBoundarylineCollection(NTFFileReader *poReader,
     poFeature->SetField(1, nNumLinks);
 
     // POLY_ID
-    int i, anList[MAX_LINK];
+    int i, anList[MAX_LINK] = {0};
 
     for (i = 0; i < nNumLinks; i++)
         anList[i] = atoi(papoGroup[0]->GetField(15 + i * 8, 20 + i * 8));
@@ -536,7 +520,7 @@ static OGRFeature *TranslateBoundarylinePoly(NTFFileReader *poReader,
         poFeature->SetField(4, nNumLinks);
 
         // DIR
-        int i, anList[MAX_LINK];
+        int i, anList[MAX_LINK] = {0};
 
         for (i = 0; i < nNumLinks; i++)
             anList[i] = atoi(papoGroup[2]->GetField(19 + i * 7, 19 + i * 7));
@@ -734,7 +718,7 @@ static OGRFeature *TranslateBL2000Poly(NTFFileReader *poReader,
         poFeature->SetField(3, nNumLinks);
 
         // DIR
-        int i, anList[MAX_LINK];
+        int i, anList[MAX_LINK] = {0};
 
         for (i = 0; i < nNumLinks; i++)
             anList[i] = atoi(papoGroup[2]->GetField(19 + i * 7, 19 + i * 7));
@@ -924,7 +908,7 @@ static OGRFeature *TranslateBL2000Collection(NTFFileReader *poReader,
     poFeature->SetField(1, nNumLinks);
 
     // POLY_ID / COLL_ID_REFS
-    int anList[MAX_LINK], anCollList[MAX_LINK];
+    int anList[MAX_LINK] = {0}, anCollList[MAX_LINK] = {0};
     int nPolys = 0, nCollections = 0;
 
     for (int i = 0; i < nNumLinks; i++)
@@ -1133,7 +1117,7 @@ static OGRFeature *TranslateStrategiNode(CPL_UNUSED NTFFileReader *poReader,
     poFeature->SetField(2, nNumLinks);
 
     // DIR
-    int i, anList[MAX_LINK];
+    int i, anList[MAX_LINK] = {0};
 
     for (i = 0; i < nNumLinks; i++)
         anList[i] = atoi(papoGroup[0]->GetField(19 + i * 12, 19 + i * 12));
@@ -1157,7 +1141,7 @@ static OGRFeature *TranslateStrategiNode(CPL_UNUSED NTFFileReader *poReader,
     // ORIENT (optional)
     if (EQUAL(poFeature->GetDefnRef()->GetFieldDefn(6)->GetNameRef(), "ORIENT"))
     {
-        double adfList[MAX_LINK];
+        double adfList[MAX_LINK] = {0};
 
         for (i = 0; i < nNumLinks; i++)
             adfList[i] = atoi(papoGroup[0]->GetField(19 + i * 12 + 7,
diff --git a/ogr/ogrsf_frmts/ntf/ntf_generic.cpp b/ogr/ogrsf_frmts/ntf/ntf_generic.cpp
index 21a12879a299..53a78e49bc2b 100644
--- a/ogr/ogrsf_frmts/ntf/ntf_generic.cpp
+++ b/ogr/ogrsf_frmts/ntf/ntf_generic.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <stdarg.h>
@@ -736,7 +720,7 @@ static OGRFeature *TranslateGenericPoly(NTFFileReader *poReader,
         poFeature->SetField("NUM_PARTS", nNumLinks);
 
         // DIR
-        int i, anList[MAX_LINK];
+        int i, anList[MAX_LINK] = {0};
 
         for (i = 0; i < nNumLinks; i++)
             anList[i] = atoi(papoGroup[1]->GetField(19 + i * 7, 19 + i * 7));
@@ -820,7 +804,7 @@ static OGRFeature *TranslateGenericCPoly(NTFFileReader *poReader,
     /*      in the RingStart field.                                         */
     /* -------------------------------------------------------------------- */
     int nNumLink = 0;
-    int anPolyId[MAX_LINK * 2];
+    int anPolyId[MAX_LINK * 2] = {0};
 
     nNumLink = atoi(papoGroup[0]->GetField(9, 12));
     if (nNumLink < 0 || nNumLink > MAX_LINK)
diff --git a/ogr/ogrsf_frmts/ntf/ntf_raster.cpp b/ogr/ogrsf_frmts/ntf/ntf_raster.cpp
index c7292f740529..77e498977d52 100644
--- a/ogr/ogrsf_frmts/ntf/ntf_raster.cpp
+++ b/ogr/ogrsf_frmts/ntf/ntf_raster.cpp
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ntf.h"
diff --git a/ogr/ogrsf_frmts/ntf/ntfdump.cpp b/ogr/ogrsf_frmts/ntf/ntfdump.cpp
index 503a800b5e9b..e833dfc58439 100644
--- a/ogr/ogrsf_frmts/ntf/ntfdump.cpp
+++ b/ogr/ogrsf_frmts/ntf/ntfdump.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ntf.h"
diff --git a/ogr/ogrsf_frmts/ntf/ntffilereader.cpp b/ogr/ogrsf_frmts/ntf/ntffilereader.cpp
index 382aaee789d2..f4fe811d76d4 100644
--- a/ogr/ogrsf_frmts/ntf/ntffilereader.cpp
+++ b/ogr/ogrsf_frmts/ntf/ntffilereader.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <stdarg.h>
diff --git a/ogr/ogrsf_frmts/ntf/ntfrecord.cpp b/ogr/ogrsf_frmts/ntf/ntfrecord.cpp
index 0bf6bebec369..e876f6d5d3f8 100644
--- a/ogr/ogrsf_frmts/ntf/ntfrecord.cpp
+++ b/ogr/ogrsf_frmts/ntf/ntfrecord.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ntf.h"
@@ -74,6 +58,7 @@ NTFRecord::NTFRecord(VSILFILE *fp) : nType(99), nLength(0), pszData(nullptr)
         if (pszData == nullptr)
         {
             nLength = nNewLength - 2;
+            // coverity[overflow_sink]
             pszData = static_cast<char *>(VSI_MALLOC_VERBOSE(nLength + 1));
             if (pszData == nullptr)
             {
diff --git a/ogr/ogrsf_frmts/ntf/ntfstroke.cpp b/ogr/ogrsf_frmts/ntf/ntfstroke.cpp
index d918d8aad323..1cdb9ecd9a24 100644
--- a/ogr/ogrsf_frmts/ntf/ntfstroke.cpp
+++ b/ogr/ogrsf_frmts/ntf/ntfstroke.cpp
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2001, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <stdarg.h>
diff --git a/ogr/ogrsf_frmts/ntf/ogrntfdatasource.cpp b/ogr/ogrsf_frmts/ntf/ogrntfdatasource.cpp
index a31beb1162e5..5c499f9585d9 100644
--- a/ogr/ogrsf_frmts/ntf/ogrntfdatasource.cpp
+++ b/ogr/ogrsf_frmts/ntf/ogrntfdatasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ntf.h"
@@ -35,10 +19,10 @@
 /************************************************************************/
 
 OGRNTFDataSource::OGRNTFDataSource()
-    : pszName(nullptr), nLayers(0), papoLayers(nullptr), poFCLayer(nullptr),
-      iCurrentFC(0), iCurrentReader(-1), nCurrentPos(0), nCurrentFID(0),
-      nNTFFileCount(0), papoNTFFileReader(nullptr), nFCCount(0),
-      papszFCNum(nullptr), papszFCName(nullptr),
+    : nLayers(0), papoLayers(nullptr), poFCLayer(nullptr), iCurrentFC(0),
+      iCurrentReader(-1), nCurrentPos(0), nCurrentFID(0), nNTFFileCount(0),
+      papoNTFFileReader(nullptr), nFCCount(0), papszFCNum(nullptr),
+      papszFCName(nullptr),
       poSpatialRef(new OGRSpatialReference(
           "PROJCS[\"OSGB 1936 / British National Grid\",GEOGCS[\"OSGB 1936\","
           "DATUM[\"OSGB_1936\",SPHEROID[\"Airy 1830\",6377563.396,299.3249646,"
@@ -87,8 +71,6 @@ OGRNTFDataSource::~OGRNTFDataSource()
 
     CPLFree(papoLayers);
 
-    CPLFree(pszName);
-
     CSLDestroy(papszOptions);
 
     CSLDestroy(papszFCNum);
@@ -179,8 +161,6 @@ int OGRNTFDataSource::Open(const char *pszFilename, int bTestOpen,
     VSIStatBufL stat;
     char **papszFileList = nullptr;
 
-    pszName = CPLStrdup(pszFilename);
-
     /* -------------------------------------------------------------------- */
     /*      Is the given path a directory or a regular file?                */
     /* -------------------------------------------------------------------- */
diff --git a/ogr/ogrsf_frmts/ntf/ogrntfdriver.cpp b/ogr/ogrsf_frmts/ntf/ogrntfdriver.cpp
index e6ac72597e5b..5d5e3a1178ab 100644
--- a/ogr/ogrsf_frmts/ntf/ogrntfdriver.cpp
+++ b/ogr/ogrsf_frmts/ntf/ogrntfdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ntf.h"
diff --git a/ogr/ogrsf_frmts/ntf/ogrntffeatureclasslayer.cpp b/ogr/ogrsf_frmts/ntf/ogrntffeatureclasslayer.cpp
index a5029ffeabcd..28cffb8a6912 100644
--- a/ogr/ogrsf_frmts/ntf/ogrntffeatureclasslayer.cpp
+++ b/ogr/ogrsf_frmts/ntf/ogrntffeatureclasslayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ntf.h"
diff --git a/ogr/ogrsf_frmts/ntf/ogrntflayer.cpp b/ogr/ogrsf_frmts/ntf/ogrntflayer.cpp
index be7f675d8ee9..48a3ad444cbc 100644
--- a/ogr/ogrsf_frmts/ntf/ogrntflayer.cpp
+++ b/ogr/ogrsf_frmts/ntf/ogrntflayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ntf.h"
diff --git a/ogr/ogrsf_frmts/oapif/CMakeLists.txt b/ogr/ogrsf_frmts/oapif/CMakeLists.txt
new file mode 100644
index 000000000000..0f38ff550939
--- /dev/null
+++ b/ogr/ogrsf_frmts/oapif/CMakeLists.txt
@@ -0,0 +1,8 @@
+add_gdal_driver(
+  TARGET ogr_OAPIF
+  SOURCES ogroapifdriver.cpp
+  PLUGIN_CAPABLE
+  NO_DEPS
+  STRONG_CXX_FLAGS)
+gdal_standard_includes(ogr_OAPIF)
+target_include_directories(ogr_OAPIF PRIVATE $<TARGET_PROPERTY:gmlutils,SOURCE_DIR>)
diff --git a/ogr/ogrsf_frmts/wfs/ogroapifdriver.cpp b/ogr/ogrsf_frmts/oapif/ogroapifdriver.cpp
similarity index 94%
rename from ogr/ogrsf_frmts/wfs/ogroapifdriver.cpp
rename to ogr/ogrsf_frmts/oapif/ogroapifdriver.cpp
index b46e324c1234..47886f0f79fb 100644
--- a/ogr/ogrsf_frmts/wfs/ogroapifdriver.cpp
+++ b/ogr/ogrsf_frmts/oapif/ogroapifdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018-2019, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
@@ -80,7 +64,14 @@ class OGROAPIFDataset final : public GDALDataset
     friend class OGROAPIFLayer;
 
     bool m_bMustCleanPersistent = false;
+
+    // Server base URL. Like "https://example.com"
+    // Relative links are relative to it
+    CPLString m_osServerBaseURL{};
+
+    // Service base URL. Like "https://example.com/ogcapi"
     CPLString m_osRootURL;
+
     CPLString m_osUserQueryParams;
     CPLString m_osUserPwd;
     int m_nPageSize = 1000;
@@ -100,6 +91,8 @@ class OGROAPIFDataset final : public GDALDataset
 
     bool m_bIgnoreSchema = false;
 
+    std::string m_osDateTime{};
+
     bool Download(const CPLString &osURL, const char *pszAccept,
                   CPLString &osResult, CPLString &osContentType,
                   CPLStringList *paosHeaders = nullptr);
@@ -111,7 +104,8 @@ class OGROAPIFDataset final : public GDALDataset
 
     bool LoadJSONCollection(const CPLJSONObject &oCollection,
                             const CPLJSONArray &oGlobalCRSList);
-    bool LoadJSONCollections(const CPLString &osResultIn);
+    bool LoadJSONCollections(const CPLString &osResultIn,
+                             const std::string &osCollectionsURL);
 
     /**
      * Determines the page size by making a call to the API endpoint to get the server's
@@ -131,10 +125,11 @@ class OGROAPIFDataset final : public GDALDataset
     OGRLayer *GetLayer(int idx) override;
 
     bool Open(GDALOpenInfo *);
-    const CPLJSONDocument &GetAPIDoc();
-    const CPLJSONDocument &GetLandingPageDoc();
+    const CPLJSONDocument &GetAPIDoc(std::string &osURLOut);
+    const CPLJSONDocument &GetLandingPageDoc(std::string &osURLOut);
 
-    CPLString ReinjectAuthInURL(const CPLString &osURL) const;
+    CPLString ResolveURL(const CPLString &osURL,
+                         const std::string &osRequestURL) const;
 };
 
 /************************************************************************/
@@ -282,36 +277,74 @@ OGROAPIFDataset::~OGROAPIFDataset()
 }
 
 /************************************************************************/
-/*                         ReinjectAuthInURL()                          */
+/*                               ResolveURL()                           */
 /************************************************************************/
 
+// Resolve relative links and re-inject authentication elements.
 // If source URL is https://user:pwd@server.com/bla
 // and link only contains https://server.com/bla, then insert
 // into it user:pwd
-CPLString OGROAPIFDataset::ReinjectAuthInURL(const CPLString &osURL) const
+CPLString OGROAPIFDataset::ResolveURL(const CPLString &osURL,
+                                      const std::string &osRequestURL) const
 {
-    CPLString osRet(osURL);
+    const auto CleanURL = [](const std::string &osStr)
+    {
+        std::string osRet(osStr);
+        const auto nPos = osRet.rfind('?');
+        if (nPos != std::string::npos)
+            osRet.resize(nPos);
+        if (!osRet.empty() && osRet.back() == '/')
+            osRet.pop_back();
+        return osRet;
+    };
 
-    if (!osRet.empty() && osRet[0] == '/')
-        osRet = m_osRootURL + osRet;
+    CPLString osRet(osURL);
+    // Cf https://datatracker.ietf.org/doc/html/rfc3986#section-5.4
+    // Partial implementation for usual cases...
+    const std::string osRequestURLBase =
+        CPLGetPath(CleanURL(osRequestURL).c_str());
+    if (!osURL.empty() && osURL[0] == '/')
+        osRet = m_osServerBaseURL + osURL;
+    else if (osURL.size() > 2 && osURL[0] == '.' && osURL[1] == '/')
+        osRet = osRequestURLBase + osURL.substr(1);
+    else if (osURL.size() > 3 && osURL[0] == '.' && osURL[1] == '.' &&
+             osURL[2] == '/')
+    {
+        std::string osModifiedRequestURL(osRequestURLBase);
+        while (osRet.size() > 3 && osRet[0] == '.' && osRet[1] == '.' &&
+               osRet[2] == '/')
+        {
+            osModifiedRequestURL = CPLGetPath(osModifiedRequestURL.c_str());
+            osRet = osRet.substr(3);
+        }
+        osRet = osModifiedRequestURL + "/" + osRet;
+    }
+    else if (!STARTS_WITH(osURL.c_str(), "http://") &&
+             !STARTS_WITH(osURL.c_str(), "https://") &&
+             !STARTS_WITH(osURL.c_str(), "file://"))
+    {
+        osRet = osRequestURLBase + "/" + osURL;
+    }
 
-    const auto nArobaseInURLPos = m_osRootURL.find('@');
-    if (!osRet.empty() && STARTS_WITH(m_osRootURL, "https://") &&
+    const auto nArobaseInURLPos = m_osServerBaseURL.find('@');
+    if (!osRet.empty() && STARTS_WITH(m_osServerBaseURL, "https://") &&
         STARTS_WITH(osRet, "https://") &&
         nArobaseInURLPos != std::string::npos &&
         osRet.find('@') == std::string::npos)
     {
-        const auto nFirstSlashPos = m_osRootURL.find('/', strlen("https://"));
+        const auto nFirstSlashPos =
+            m_osServerBaseURL.find('/', strlen("https://"));
         if (nFirstSlashPos == std::string::npos ||
             nFirstSlashPos > nArobaseInURLPos)
         {
-            auto osUserPwd = m_osRootURL.substr(
+            auto osUserPwd = m_osServerBaseURL.substr(
                 strlen("https://"), nArobaseInURLPos - strlen("https://"));
             std::string osServer(
                 nFirstSlashPos == std::string::npos
-                    ? m_osRootURL.substr(nArobaseInURLPos + 1)
-                    : m_osRootURL.substr(nArobaseInURLPos + 1,
-                                         nFirstSlashPos - nArobaseInURLPos));
+                    ? m_osServerBaseURL.substr(nArobaseInURLPos + 1)
+                    : m_osServerBaseURL.substr(nArobaseInURLPos + 1,
+                                               nFirstSlashPos -
+                                                   nArobaseInURLPos));
             if (STARTS_WITH(osRet, ("https://" + osServer).c_str()))
             {
                 osRet = "https://" + osUserPwd + "@" +
@@ -384,10 +417,15 @@ bool OGROAPIFDataset::Download(const CPLString &osURL, const char *pszAccept,
 
     if (psResult->pszErrBuf != nullptr)
     {
-        CPLError(CE_Failure, CPLE_AppDefined, "%s",
-                 psResult->pabyData
-                     ? reinterpret_cast<const char *>(psResult->pabyData)
-                     : psResult->pszErrBuf);
+        std::string osErrorMsg(psResult->pszErrBuf);
+        const char *pszData =
+            reinterpret_cast<const char *>(psResult->pabyData);
+        if (pszData)
+        {
+            osErrorMsg += ", ";
+            osErrorMsg.append(pszData, CPLStrnlen(pszData, 1000));
+        }
+        CPLError(CE_Failure, CPLE_AppDefined, "%s", osErrorMsg.c_str());
         CPLHTTPDestroyResult(psResult);
         return false;
     }
@@ -505,13 +543,14 @@ bool OGROAPIFDataset::DownloadJSon(const CPLString &osURL,
 /*                        GetLandingPageDoc()                           */
 /************************************************************************/
 
-const CPLJSONDocument &OGROAPIFDataset::GetLandingPageDoc()
+const CPLJSONDocument &OGROAPIFDataset::GetLandingPageDoc(std::string &osURLOut)
 {
     if (m_bLandingPageDocLoaded)
         return m_oLandingPageDoc;
     m_bLandingPageDocLoaded = true;
+    osURLOut = m_osRootURL;
     CPL_IGNORE_RET_VAL(
-        DownloadJSon(m_osRootURL, m_oLandingPageDoc, MEDIA_TYPE_JSON));
+        DownloadJSon(osURLOut, m_oLandingPageDoc, MEDIA_TYPE_JSON));
     return m_oLandingPageDoc;
 }
 
@@ -519,7 +558,7 @@ const CPLJSONDocument &OGROAPIFDataset::GetLandingPageDoc()
 /*                            GetAPIDoc()                               */
 /************************************************************************/
 
-const CPLJSONDocument &OGROAPIFDataset::GetAPIDoc()
+const CPLJSONDocument &OGROAPIFDataset::GetAPIDoc(std::string &osURLOut)
 {
     if (m_bAPIDocLoaded)
         return m_oAPIDoc;
@@ -527,7 +566,8 @@ const CPLJSONDocument &OGROAPIFDataset::GetAPIDoc()
 
     // Fetch the /api URL from the links of the landing page
     CPLString osAPIURL;
-    const auto &oLandingPage = GetLandingPageDoc();
+    std::string osLandingPageURL;
+    const auto &oLandingPage = GetLandingPageDoc(osLandingPageURL);
     if (oLandingPage.GetRoot().IsValid())
     {
         const auto oLinks = oLandingPage.GetRoot().GetArray("links");
@@ -552,7 +592,8 @@ const CPLJSONDocument &OGROAPIFDataset::GetAPIDoc()
                 )
                 {
                     nCountRelAPI++;
-                    osAPIURL = ReinjectAuthInURL(oLink.GetString("href"));
+                    osAPIURL =
+                        ResolveURL(oLink.GetString("href"), osLandingPageURL);
                     if (osType == MEDIA_TYPE_OAPI_3_0
 #ifndef REMOVE_SUPPORT_FOR_OLD_VERSIONS
                         // Needed for http://beta.fmi.fi/data/3/wfs/sofp
@@ -580,6 +621,7 @@ const CPLJSONDocument &OGROAPIFDataset::GetAPIDoc()
 
     if (!osAPIURL.empty())
     {
+        osURLOut = osAPIURL;
         CPL_IGNORE_RET_VAL(DownloadJSon(osAPIURL, m_oAPIDoc, pszAccept));
         return m_oAPIDoc;
     }
@@ -596,7 +638,8 @@ const CPLJSONDocument &OGROAPIFDataset::GetAPIDoc()
         return m_oAPIDoc;
     }
 
-    if (DownloadJSon(m_osRootURL + "/api/", m_oAPIDoc, pszAccept))
+    osURLOut = m_osRootURL + "/api/";
+    if (DownloadJSon(osURLOut, m_oAPIDoc, pszAccept))
     {
         return m_oAPIDoc;
     }
@@ -815,8 +858,10 @@ bool OGROAPIFDataset::LoadJSONCollection(const CPLJSONObject &oCollection,
 /*                         LoadJSONCollections()                        */
 /************************************************************************/
 
-bool OGROAPIFDataset::LoadJSONCollections(const CPLString &osResultIn)
+bool OGROAPIFDataset::LoadJSONCollections(const CPLString &osResultIn,
+                                          const std::string &osCollectionsURL)
 {
+    std::string osParentURL(osCollectionsURL);
     CPLString osResult(osResultIn);
     while (!osResult.empty())
     {
@@ -872,7 +917,8 @@ bool OGROAPIFDataset::LoadJSONCollections(const CPLString &osResultIn)
             if (nCountRelNext == 1 && !osNextURL.empty())
             {
                 CPLString osContentType;
-                osNextURL = ReinjectAuthInURL(osNextURL);
+                osNextURL = ResolveURL(osNextURL, osParentURL);
+                osParentURL = osNextURL;
                 if (!Download(osNextURL, MEDIA_TYPE_JSON, osResult,
                               osContentType))
                 {
@@ -891,7 +937,8 @@ void OGROAPIFDataset::DeterminePageSizeFromAPI(const std::string &itemsUrl)
     int nDefault{-1};
     // Not sure if min should be considered
     //int nMinimum { -1 };
-    const CPLJSONDocument &oDoc{GetAPIDoc()};
+    std::string osAPIURL;
+    const CPLJSONDocument &oDoc{GetAPIDoc(osAPIURL)};
     const auto &oRoot = oDoc.GetRoot();
 
     bool bFound{false};
@@ -928,7 +975,7 @@ void OGROAPIFDataset::DeterminePageSizeFromAPI(const std::string &itemsUrl)
                         {
                             // Only reinject auth if the URL matches
                             auto limitUrl{ref.find(m_osRootURL) == 0
-                                              ? ReinjectAuthInURL(ref)
+                                              ? ResolveURL(ref, osAPIURL)
                                               : ref};
                             std::string fragment;
                             const auto hashPos{limitUrl.find('#')};
@@ -1052,9 +1099,31 @@ bool OGROAPIFDataset::Open(GDALOpenInfo *poOpenInfo)
         m_osRootURL = m_osRootURL.substr(strlen("OAPIF:"));
     else if (STARTS_WITH_CI(m_osRootURL, "OAPIF_COLLECTION:"))
     {
+        // Used by the OGCAPI driver
         osCollectionDescURL = m_osRootURL.substr(strlen("OAPIF_COLLECTION:"));
         m_osRootURL = osCollectionDescURL;
-        const char *pszStr = m_osRootURL.c_str();
+    }
+
+    const auto nPosQuestionMark = m_osRootURL.find('?');
+    if (nPosQuestionMark != std::string::npos)
+    {
+        m_osUserQueryParams = m_osRootURL.substr(nPosQuestionMark + 1);
+        m_osRootURL.resize(nPosQuestionMark);
+    }
+
+    const auto nCollectionsPos = m_osRootURL.find("/collections/");
+    if (nCollectionsPos != std::string::npos)
+    {
+        if (osCollectionDescURL.empty())
+            osCollectionDescURL = m_osRootURL;
+        m_osRootURL.resize(nCollectionsPos);
+    }
+
+    // m_osServerBaseURL is just the "https://example.com" part from
+    // "https://example.com/foo/bar"
+    m_osServerBaseURL = m_osRootURL;
+    {
+        const char *pszStr = m_osServerBaseURL.c_str();
         const char *pszPtr = pszStr;
         if (STARTS_WITH(pszPtr, "http://"))
             pszPtr += strlen("http://");
@@ -1062,24 +1131,7 @@ bool OGROAPIFDataset::Open(GDALOpenInfo *poOpenInfo)
             pszPtr += strlen("https://");
         pszPtr = strchr(pszPtr, '/');
         if (pszPtr)
-            m_osRootURL.assign(pszStr, pszPtr - pszStr);
-    }
-
-    if (osCollectionDescURL.empty())
-    {
-        auto nPosQuotationMark = m_osRootURL.find('?');
-        if (nPosQuotationMark != std::string::npos)
-        {
-            m_osUserQueryParams = m_osRootURL.substr(nPosQuotationMark + 1);
-            m_osRootURL.resize(nPosQuotationMark);
-        }
-
-        auto nCollectionsPos = m_osRootURL.find("/collections/");
-        if (nCollectionsPos != std::string::npos)
-        {
-            osCollectionDescURL = m_osRootURL;
-            m_osRootURL.resize(nCollectionsPos);
-        }
+            m_osServerBaseURL.assign(pszStr, pszPtr - pszStr);
     }
 
     m_bIgnoreSchema = CPLTestBool(CSLFetchNameValueDef(
@@ -1094,6 +1146,9 @@ bool OGROAPIFDataset::Open(GDALOpenInfo *poOpenInfo)
         m_bPageSizeSetFromOpenOptions = true;
     }
 
+    m_osDateTime =
+        CSLFetchNameValueDef(poOpenInfo->papszOpenOptions, "DATETIME", "");
+
     const int initialRequestPageSize = atoi(CSLFetchNameValueDef(
         poOpenInfo->papszOpenOptions, "INITIAL_REQUEST_PAGE_SIZE", "-1"));
 
@@ -1167,15 +1222,16 @@ bool OGROAPIFDataset::Open(GDALOpenInfo *poOpenInfo)
         return LoadJSONCollection(oRoot, CPLJSONArray());
     }
 
-    if (!Download(ConcatenateURLParts(m_osRootURL, "/collections"),
-                  MEDIA_TYPE_JSON, osResult, osContentType))
+    const std::string osCollectionsURL(
+        ConcatenateURLParts(m_osRootURL, "/collections"));
+    if (!Download(osCollectionsURL, MEDIA_TYPE_JSON, osResult, osContentType))
     {
         return false;
     }
 
     if (osContentType.find("json") != std::string::npos)
     {
-        return LoadJSONCollections(osResult);
+        return LoadJSONCollections(osResult, osCollectionsURL);
     }
 
     return true;
@@ -1201,7 +1257,10 @@ static int OGROAPIFDriverIdentify(GDALOpenInfo *poOpenInfo)
 {
     return STARTS_WITH_CI(poOpenInfo->pszFilename, "WFS3:") ||
            STARTS_WITH_CI(poOpenInfo->pszFilename, "OAPIF:") ||
-           STARTS_WITH_CI(poOpenInfo->pszFilename, "OAPIF_COLLECTION:");
+           STARTS_WITH_CI(poOpenInfo->pszFilename, "OAPIF_COLLECTION:") ||
+           (poOpenInfo->IsSingleAllowedDriver("OAPIF") &&
+            (STARTS_WITH(poOpenInfo->pszFilename, "http://") ||
+             STARTS_WITH(poOpenInfo->pszFilename, "https://")));
 }
 
 /************************************************************************/
@@ -1309,6 +1368,7 @@ OGROAPIFLayer::OGROAPIFLayer(OGROAPIFDataset *poDS, const CPLString &osName,
     // later
     m_osURL = ConcatenateURLParts(m_poDS->m_osRootURL,
                                   "/collections/" + osName + "/items");
+    const std::string osParentURL(m_osURL);
     m_osPath = "/collections/" + osName + "/items";
 
     if (oLinks.IsValid())
@@ -1345,20 +1405,21 @@ OGROAPIFLayer::OGROAPIFLayer(OGROAPIFDataset *poDS, const CPLString &osName,
             {
                 if (type == MEDIA_TYPE_JSON || m_osQueryablesURL.empty())
                 {
-                    m_osQueryablesURL = m_poDS->ReinjectAuthInURL(osURL);
+                    m_osQueryablesURL = m_poDS->ResolveURL(osURL, osParentURL);
                 }
             }
             else if (EQUAL(osRel.c_str(), "items"))
             {
                 if (type == MEDIA_TYPE_GEOJSON)
                 {
-                    m_osURL = m_poDS->ReinjectAuthInURL(osURL);
+                    m_osURL = m_poDS->ResolveURL(osURL, osParentURL);
                 }
             }
         }
         if (!m_osDescribedByURL.empty())
         {
-            m_osDescribedByURL = m_poDS->ReinjectAuthInURL(m_osDescribedByURL);
+            m_osDescribedByURL =
+                m_poDS->ResolveURL(m_osDescribedByURL, osParentURL);
         }
     }
 
@@ -1642,8 +1703,9 @@ void OGROAPIFLayer::GetSchema()
     {
         std::vector<GMLFeatureClass *> apoClasses;
         bool bFullyUnderstood = false;
-        bool bHaveSchema =
-            GMLParseXSD(m_osDescribedByURL, apoClasses, bFullyUnderstood);
+        bool bUseSchemaImports = false;
+        bool bHaveSchema = GMLParseXSD(m_osDescribedByURL, bUseSchemaImports,
+                                       apoClasses, bFullyUnderstood);
         if (bHaveSchema && apoClasses.size() == 1)
         {
             CPLDebug("OAPIF", "Using XML schema");
@@ -1817,7 +1879,7 @@ void OGROAPIFLayer::EstablishFeatureDefn()
     if (!m_poDS->DownloadJSon(osURL, oDoc))
         return;
 
-    CPLString osTmpFilename(CPLSPrintf("/vsimem/oapif_%p.json", this));
+    const CPLString osTmpFilename(VSIMemGenerateHiddenFilename("oapif.json"));
     oDoc.Save(osTmpFilename);
     std::unique_ptr<GDALDataset> poDS(GDALDataset::FromHandle(
         GDALOpenEx(osTmpFilename, GDAL_OF_VECTOR | GDAL_OF_INTERNAL, nullptr,
@@ -1952,7 +2014,7 @@ CPLString OGROAPIFLayer::AddFilters(const CPLString &osURL)
                 std::swap(dfMaxX, dfMaxY);
             }
             osURLNew = CPLURLAddKVP(osURLNew, "bbox",
-                                    CPLSPrintf("%.18g,%.18g,%.18g,%.18g",
+                                    CPLSPrintf("%.17g,%.17g,%.17g,%.17g",
                                                dfMinX, dfMinY, dfMaxX, dfMaxY));
             if (!m_osActiveCRS.empty())
             {
@@ -1973,6 +2035,15 @@ CPLString OGROAPIFLayer::AddFilters(const CPLString &osURL)
             osURLNew += "&";
         osURLNew += m_osAttributeFilter;
     }
+    if (!m_poDS->m_osDateTime.empty())
+    {
+        if (osURLNew.find('?') == std::string::npos)
+            osURLNew += "?";
+        else
+            osURLNew += "&";
+        osURLNew += "datetime=";
+        osURLNew += m_poDS->m_osDateTime;
+    }
     return osURLNew;
 }
 
@@ -1995,7 +2066,7 @@ OGRFeature *OGROAPIFLayer::GetNextRawFeature()
 
             m_oCurDoc = CPLJSONDocument();
 
-            CPLString osURL(m_osGetURL);
+            const CPLString osURL(m_osGetURL);
             m_osGetURL.clear();
             CPLStringList aosHeaders;
             if (!m_poDS->DownloadJSon(osURL, m_oCurDoc,
@@ -2061,7 +2132,8 @@ OGRFeature *OGROAPIFLayer::GetNextRawFeature()
                 }
             }
 
-            CPLString osTmpFilename(CPLSPrintf("/vsimem/oapif_%p.json", this));
+            const CPLString osTmpFilename(
+                VSIMemGenerateHiddenFilename("oapif.json"));
             m_oCurDoc.Save(osTmpFilename);
             m_poUnderlyingDS =
                 std::unique_ptr<GDALDataset>(GDALDataset::FromHandle(
@@ -2151,11 +2223,12 @@ OGRFeature *OGROAPIFLayer::GetNextRawFeature()
 
                 if (!m_osGetURL.empty())
                 {
-                    m_osGetURL = m_poDS->ReinjectAuthInURL(m_osGetURL);
+                    m_osGetURL = m_poDS->ResolveURL(m_osGetURL, osURL);
                 }
             }
         }
 
+        // cppcheck-suppress nullPointerRedundantCheck
         poSrcFeature = m_poUnderlyingLayer->GetNextFeature();
         if (poSrcFeature)
         {
@@ -2262,7 +2335,8 @@ OGRFeature *OGROAPIFLayer::GetNextFeature()
 
 bool OGROAPIFLayer::SupportsResultTypeHits()
 {
-    CPLJSONDocument oDoc = m_poDS->GetAPIDoc();
+    std::string osAPIURL;
+    CPLJSONDocument oDoc = m_poDS->GetAPIDoc(osAPIURL);
     if (oDoc.GetRoot().GetString("openapi").empty())
         return false;
 
@@ -2309,7 +2383,8 @@ bool OGROAPIFLayer::SupportsResultTypeHits()
 GIntBig OGROAPIFLayer::GetFeatureCount(int bForce)
 {
 
-    if (m_poFilterGeom == nullptr && m_poAttrQuery == nullptr)
+    if (m_poFilterGeom == nullptr && m_poAttrQuery == nullptr &&
+        m_poDS->m_osDateTime.empty())
     {
         GetLayerDefn();
         if (m_nTotalFeatureCount >= 0)
@@ -2957,7 +3032,8 @@ void OGROAPIFLayer::GetQueryableAttributes()
     if (m_bGotQueryableAttributes)
         return;
     m_bGotQueryableAttributes = true;
-    CPLJSONDocument oAPIDoc = m_poDS->GetAPIDoc();
+    std::string osAPIURL;
+    CPLJSONDocument oAPIDoc = m_poDS->GetAPIDoc(osAPIURL);
     if (oAPIDoc.GetRoot().GetString("openapi").empty())
         return;
 
@@ -3189,6 +3265,9 @@ void RegisterOGROAPIF()
         "    <Value>AUTHORITY_COMPLIANT</Value>"
         "    <Value>GIS_FRIENDLY</Value>"
         "  </Option>"
+        "  <Option name='DATETIME' type='string' "
+        "description=\"Date-time filter to pass to items requests with the "
+        "'datetime' parameter\"/>"
         "</OpenOptionList>");
 
     poDriver->pfnIdentify = OGROAPIFDriverIdentify;
diff --git a/ogr/ogrsf_frmts/oci/CMakeLists.txt b/ogr/ogrsf_frmts/oci/CMakeLists.txt
index 577e1b1c2809..159c1f2c89a8 100644
--- a/ogr/ogrsf_frmts/oci/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/oci/CMakeLists.txt
@@ -1,3 +1,14 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/helpers/GdalCMakeMinimumRequired.cmake")
+cmake_minimum_required(VERSION ${GDAL_CMAKE_VERSION_MIN}...${GDAL_CMAKE_VERSION_MAX})
+
+if(NOT DEFINED PROJECT_SOURCE_DIR)
+    # Standalone plugin building
+    project(ogr_OCI)
+    include("${PROJECT_SOURCE_DIR}/../../../cmake/helpers/SetupStandalonePlugin.cmake" )
+    include(CheckDependentLibrariesOracle)
+    standalone_driver_finalize(OGR_ENABLE_DRIVER_OCI)
+endif()
+
 set(SOURCE
     oci_utils.cpp
     ocitest.cpp
diff --git a/ogr/ogrsf_frmts/oci/driver_declaration.cmake b/ogr/ogrsf_frmts/oci/driver_declaration.cmake
new file mode 100644
index 000000000000..cb0e78641e79
--- /dev/null
+++ b/ogr/ogrsf_frmts/oci/driver_declaration.cmake
@@ -0,0 +1 @@
+ogr_dependent_driver(oci "Oracle OCI" "GDAL_USE_ORACLE")
diff --git a/ogr/ogrsf_frmts/oci/fastload.cpp b/ogr/ogrsf_frmts/oci/fastload.cpp
index 4cac3376c9b7..fc4151139b7b 100644
--- a/ogr/ogrsf_frmts/oci/fastload.cpp
+++ b/ogr/ogrsf_frmts/oci/fastload.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <stdio.h>
diff --git a/ogr/ogrsf_frmts/oci/oci_utils.cpp b/ogr/ogrsf_frmts/oci/oci_utils.cpp
index 9e250a540aba..724c7d43776f 100644
--- a/ogr/ogrsf_frmts/oci/oci_utils.cpp
+++ b/ogr/ogrsf_frmts/oci/oci_utils.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_oci.h"
diff --git a/ogr/ogrsf_frmts/oci/ocitest.cpp b/ogr/ogrsf_frmts/oci/ocitest.cpp
index c9b198d7b84b..c637df62a0c5 100644
--- a/ogr/ogrsf_frmts/oci/ocitest.cpp
+++ b/ogr/ogrsf_frmts/oci/ocitest.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_oci.h"
diff --git a/ogr/ogrsf_frmts/oci/ogr_oci.h b/ogr/ogrsf_frmts/oci/ogr_oci.h
index 3e07876a5111..616822136fd7 100644
--- a/ogr/ogrsf_frmts/oci/ogr_oci.h
+++ b/ogr/ogrsf_frmts/oci/ogr_oci.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_OCI_H_INCLUDED
@@ -564,12 +548,11 @@ class OGROCISelectLayer final : public OGROCILayer
 /*                           OGROCIDataSource                           */
 /************************************************************************/
 
-class OGROCIDataSource final : public OGRDataSource
+class OGROCIDataSource final : public GDALDataset
 {
     OGROCILayer **papoLayers;
     int nLayers;
 
-    char *pszName;
     char *pszDBName;
 
     int bDSUpdate;
@@ -597,11 +580,6 @@ class OGROCIDataSource final : public OGRDataSource
     int OpenTable(const char *pszTableName, int nSRID, int bUpdate,
                   int bTestOpen, char **papszOpenOptionsIn);
 
-    const char *GetName() override
-    {
-        return pszName;
-    }
-
     int GetLayerCount() override
     {
         return nLayers;
diff --git a/ogr/ogrsf_frmts/oci/ogrocidatasource.cpp b/ogr/ogrsf_frmts/oci/ogrocidatasource.cpp
index 37221441fa95..2f8bd60daf8a 100644
--- a/ogr/ogrsf_frmts/oci/ogrocidatasource.cpp
+++ b/ogr/ogrsf_frmts/oci/ogrocidatasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_oci.h"
@@ -52,7 +36,6 @@ constexpr int anEPSGOracleMapping[] = {
 OGROCIDataSource::OGROCIDataSource()
 
 {
-    pszName = nullptr;
     pszDBName = nullptr;
     papoLayers = nullptr;
     nLayers = 0;
@@ -70,7 +53,6 @@ OGROCIDataSource::~OGROCIDataSource()
 {
     int i;
 
-    CPLFree(pszName);
     CPLFree(pszDBName);
 
     for (i = 0; i < nLayers; i++)
@@ -198,8 +180,6 @@ int OGROCIDataSource::Open(const char *pszNewName, char **papszOpenOptionsIn,
         oValidateStmt.Execute(oValidateCmd.GetString());
     }
 
-    pszName = CPLStrdup(pszNewName);
-
     bDSUpdate = bUpdate;
 
     /* -------------------------------------------------------------------- */
@@ -704,8 +684,8 @@ OGRLayer *OGROCIDataSource::ExecuteSQL(const char *pszSQLCommand,
     /*      Use generic implementation for recognized dialects              */
     /* -------------------------------------------------------------------- */
     if (IsGenericSQLDialect(pszDialect))
-        return OGRDataSource::ExecuteSQL(pszSQLCommand, poSpatialFilter,
-                                         pszDialect);
+        return GDALDataset::ExecuteSQL(pszSQLCommand, poSpatialFilter,
+                                       pszDialect);
 
     /* -------------------------------------------------------------------- */
     /*      Ensure any pending stuff is flushed to the database.            */
diff --git a/ogr/ogrsf_frmts/oci/ogrocidriver.cpp b/ogr/ogrsf_frmts/oci/ogrocidriver.cpp
index 081982dbe3d0..773eb11b04a1 100644
--- a/ogr/ogrsf_frmts/oci/ogrocidriver.cpp
+++ b/ogr/ogrsf_frmts/oci/ogrocidriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_oci.h"
diff --git a/ogr/ogrsf_frmts/oci/ogrocidrivercore.cpp b/ogr/ogrsf_frmts/oci/ogrocidrivercore.cpp
index b7138169c005..b1432a1150a9 100644
--- a/ogr/ogrsf_frmts/oci/ogrocidrivercore.cpp
+++ b/ogr/ogrsf_frmts/oci/ogrocidrivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
diff --git a/ogr/ogrsf_frmts/oci/ogrocidrivercore.h b/ogr/ogrsf_frmts/oci/ogrocidrivercore.h
index 67259c789482..89a5ef42da23 100644
--- a/ogr/ogrsf_frmts/oci/ogrocidrivercore.h
+++ b/ogr/ogrsf_frmts/oci/ogrocidrivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGROCIDRIVERCORE_H
diff --git a/ogr/ogrsf_frmts/oci/ogrocilayer.cpp b/ogr/ogrsf_frmts/oci/ogrocilayer.cpp
index 5062a613cc83..b386ab7cdb2c 100644
--- a/ogr/ogrsf_frmts/oci/ogrocilayer.cpp
+++ b/ogr/ogrsf_frmts/oci/ogrocilayer.cpp
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_oci.h"
diff --git a/ogr/ogrsf_frmts/oci/ogrociloaderlayer.cpp b/ogr/ogrsf_frmts/oci/ogrociloaderlayer.cpp
index c7847c56402f..6f501cefa8b3 100644
--- a/ogr/ogrsf_frmts/oci/ogrociloaderlayer.cpp
+++ b/ogr/ogrsf_frmts/oci/ogrociloaderlayer.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_oci.h"
diff --git a/ogr/ogrsf_frmts/oci/ogrociselectlayer.cpp b/ogr/ogrsf_frmts/oci/ogrociselectlayer.cpp
index 3aeb73d6261f..e39bd0d90e9d 100644
--- a/ogr/ogrsf_frmts/oci/ogrociselectlayer.cpp
+++ b/ogr/ogrsf_frmts/oci/ogrociselectlayer.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_oci.h"
diff --git a/ogr/ogrsf_frmts/oci/ogrocisession.cpp b/ogr/ogrsf_frmts/oci/ogrocisession.cpp
index 26ec7fb4b755..56776a3e748b 100644
--- a/ogr/ogrsf_frmts/oci/ogrocisession.cpp
+++ b/ogr/ogrsf_frmts/oci/ogrocisession.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_oci.h"
diff --git a/ogr/ogrsf_frmts/oci/ogrocistatement.cpp b/ogr/ogrsf_frmts/oci/ogrocistatement.cpp
index ffb81c8c276d..ba3eec055cec 100644
--- a/ogr/ogrsf_frmts/oci/ogrocistatement.cpp
+++ b/ogr/ogrsf_frmts/oci/ogrocistatement.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_oci.h"
diff --git a/ogr/ogrsf_frmts/oci/ogrocistringbuf.cpp b/ogr/ogrsf_frmts/oci/ogrocistringbuf.cpp
index 496eb44d2844..f3db42443f79 100644
--- a/ogr/ogrsf_frmts/oci/ogrocistringbuf.cpp
+++ b/ogr/ogrsf_frmts/oci/ogrocistringbuf.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_oci.h"
diff --git a/ogr/ogrsf_frmts/oci/ogrocistroke.cpp b/ogr/ogrsf_frmts/oci/ogrocistroke.cpp
index ba53760e11ab..fa680ad1e04c 100644
--- a/ogr/ogrsf_frmts/oci/ogrocistroke.cpp
+++ b/ogr/ogrsf_frmts/oci/ogrocistroke.cpp
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2008, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <stdarg.h>
diff --git a/ogr/ogrsf_frmts/oci/ogrocitablelayer.cpp b/ogr/ogrsf_frmts/oci/ogrocitablelayer.cpp
index 0479b1f7c9a0..46646fdefe87 100644
--- a/ogr/ogrsf_frmts/oci/ogrocitablelayer.cpp
+++ b/ogr/ogrsf_frmts/oci/ogrocitablelayer.cpp
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_oci.h"
diff --git a/ogr/ogrsf_frmts/oci/ogrociwritablelayer.cpp b/ogr/ogrsf_frmts/oci/ogrociwritablelayer.cpp
index 2fb25aa28799..5eb92a5e4582 100644
--- a/ogr/ogrsf_frmts/oci/ogrociwritablelayer.cpp
+++ b/ogr/ogrsf_frmts/oci/ogrociwritablelayer.cpp
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_oci.h"
diff --git a/ogr/ogrsf_frmts/odbc/ogr_odbc.h b/ogr/ogrsf_frmts/odbc/ogr_odbc.h
index bc4b79622a75..a2461ae55de2 100644
--- a/ogr/ogrsf_frmts/odbc/ogr_odbc.h
+++ b/ogr/ogrsf_frmts/odbc/ogr_odbc.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_ODBC_H_INCLUDED
@@ -185,13 +169,11 @@ class OGRODBCSelectLayer final : public OGRODBCLayer
 /*                           OGRODBCDataSource                          */
 /************************************************************************/
 
-class OGRODBCDataSource final : public OGRDataSource
+class OGRODBCDataSource final : public GDALDataset
 {
     OGRODBCLayer **papoLayers;
     int nLayers;
 
-    char *pszName;
-
     CPLODBCSession oSession;
 
 #if 0
@@ -220,11 +202,6 @@ class OGRODBCDataSource final : public OGRDataSource
     int Open(GDALOpenInfo *poOpenInfo);
     int OpenTable(const char *pszTableName, const char *pszGeomCol);
 
-    const char *GetName() override
-    {
-        return pszName;
-    }
-
     int GetLayerCount() override
     {
         return nLayers;
diff --git a/ogr/ogrsf_frmts/odbc/ogrodbcdatasource.cpp b/ogr/ogrsf_frmts/odbc/ogrodbcdatasource.cpp
index 1e56c07fd572..3b6ab44fcf7c 100644
--- a/ogr/ogrsf_frmts/odbc/ogrodbcdatasource.cpp
+++ b/ogr/ogrsf_frmts/odbc/ogrodbcdatasource.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_odbc.h"
@@ -36,8 +20,7 @@
 /*                         OGRODBCDataSource()                          */
 /************************************************************************/
 
-OGRODBCDataSource::OGRODBCDataSource()
-    : papoLayers(nullptr), nLayers(0), pszName(nullptr)
+OGRODBCDataSource::OGRODBCDataSource() : papoLayers(nullptr), nLayers(0)
 {
 }
 
@@ -48,8 +31,6 @@ OGRODBCDataSource::OGRODBCDataSource()
 OGRODBCDataSource::~OGRODBCDataSource()
 
 {
-    CPLFree(pszName);
-
     for (int i = 0; i < nLayers; i++)
         delete papoLayers[i];
 
@@ -127,8 +108,6 @@ int OGRODBCDataSource::OpenMDB(GDALOpenInfo *poOpenInfo)
     // https://github.com/OSGeo/gdal/issues/3885)
     m_nStatementFlags |= CPLODBCStatement::Flag::RetrieveNumericColumnsAsDouble;
 
-    pszName = CPLStrdup(pszNewName);
-
     // Collate a list of all tables in the data source
     CPLODBCStatement oTableList(&oSession);
     std::vector<CPLString> aosTableNames;
@@ -338,8 +317,6 @@ int OGRODBCDataSource::Open(GDALOpenInfo *poOpenInfo)
         return FALSE;
     }
 
-    pszName = CPLStrdup(pszNewName);
-
     /* -------------------------------------------------------------------- */
     /*      If no explicit list of tables was given, check for a list in    */
     /*      a geometry_columns table.                                       */
@@ -576,8 +553,8 @@ OGRLayer *OGRODBCDataSource::ExecuteSQL(const char *pszSQLCommand,
     /*      Use generic implementation for recognized dialects              */
     /* -------------------------------------------------------------------- */
     if (IsGenericSQLDialect(pszDialect))
-        return OGRDataSource::ExecuteSQL(pszSQLCommand, poSpatialFilter,
-                                         pszDialect);
+        return GDALDataset::ExecuteSQL(pszSQLCommand, poSpatialFilter,
+                                       pszDialect);
 
     /* -------------------------------------------------------------------- */
     /*      Execute statement.                                              */
diff --git a/ogr/ogrsf_frmts/odbc/ogrodbcdriver.cpp b/ogr/ogrsf_frmts/odbc/ogrodbcdriver.cpp
index a1aa0b5dc095..d230083ac7a4 100644
--- a/ogr/ogrsf_frmts/odbc/ogrodbcdriver.cpp
+++ b/ogr/ogrsf_frmts/odbc/ogrodbcdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_odbc.h"
diff --git a/ogr/ogrsf_frmts/odbc/ogrodbcdrivercore.cpp b/ogr/ogrsf_frmts/odbc/ogrodbcdrivercore.cpp
index 425063ae305d..22ec4aa32ae1 100644
--- a/ogr/ogrsf_frmts/odbc/ogrodbcdrivercore.cpp
+++ b/ogr/ogrsf_frmts/odbc/ogrodbcdrivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
@@ -76,6 +60,8 @@ void OGRODBCDriverSetCommonMetadata(GDALDriver *poDriver)
 {
     poDriver->SetDescription(DRIVER_NAME);
     poDriver->SetMetadataItem(GDAL_DCAP_VECTOR, "YES");
+    poDriver->SetMetadataItem(GDAL_DMD_LONGNAME,
+                              "Open Database Connectivity (ODBC)");
     poDriver->SetMetadataItem(GDAL_DMD_CONNECTION_PREFIX, "ODBC:");
     poDriver->SetMetadataItem(GDAL_DMD_EXTENSIONS, "mdb accdb");
     poDriver->SetMetadataItem(GDAL_DMD_HELPTOPIC, "drivers/vector/odbc.html");
diff --git a/ogr/ogrsf_frmts/odbc/ogrodbcdrivercore.h b/ogr/ogrsf_frmts/odbc/ogrodbcdrivercore.h
index 902a74b081a5..20e37034ab2f 100644
--- a/ogr/ogrsf_frmts/odbc/ogrodbcdrivercore.h
+++ b/ogr/ogrsf_frmts/odbc/ogrodbcdrivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRODBCDRIVERCORE_H
diff --git a/ogr/ogrsf_frmts/odbc/ogrodbclayer.cpp b/ogr/ogrsf_frmts/odbc/ogrodbclayer.cpp
index 9d12954148c9..69cf05ad7d80 100644
--- a/ogr/ogrsf_frmts/odbc/ogrodbclayer.cpp
+++ b/ogr/ogrsf_frmts/odbc/ogrodbclayer.cpp
@@ -8,29 +8,15 @@
  ******************************************************************************
  * Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
 #include "ogr_odbc.h"
 #include "cpl_string.h"
 
+#include <cmath>
+
 /************************************************************************/
 /*                            OGRODBCLayer()                            */
 /************************************************************************/
diff --git a/ogr/ogrsf_frmts/odbc/ogrodbcselectlayer.cpp b/ogr/ogrsf_frmts/odbc/ogrodbcselectlayer.cpp
index 155ce3f3d242..2ee55f3c845d 100644
--- a/ogr/ogrsf_frmts/odbc/ogrodbcselectlayer.cpp
+++ b/ogr/ogrsf_frmts/odbc/ogrodbcselectlayer.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2004, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/odbc/ogrodbctablelayer.cpp b/ogr/ogrsf_frmts/odbc/ogrodbctablelayer.cpp
index f2217de7c69a..6114bfe11e97 100644
--- a/ogr/ogrsf_frmts/odbc/ogrodbctablelayer.cpp
+++ b/ogr/ogrsf_frmts/odbc/ogrodbctablelayer.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2003, Frank Warmerdam
  * Copyright (c) 2009-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/ods/CMakeLists.txt b/ogr/ogrsf_frmts/ods/CMakeLists.txt
index a4d41b0c2e0a..f2090be63a6c 100644
--- a/ogr/ogrsf_frmts/ods/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/ods/CMakeLists.txt
@@ -35,7 +35,7 @@ add_custom_target(check_ods_formula_parser_md5 ALL
                   COMMAND ${CMAKE_COMMAND}
                       "-DIN_FILE=ods_formula_parser.y"
                       "-DTARGET=generate_ods_formula_parser"
-                      "-DEXPECTED_MD5SUM=acf825ac2d574098a64c74c864aee15e"
+                      "-DEXPECTED_MD5SUM=4471312c8be1baeef3509fb36ab668df"
                       "-DFILENAME_CMAKE=${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt"
                       -P "${PROJECT_SOURCE_DIR}/cmake/helpers/check_md5sum.cmake"
                   WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
diff --git a/ogr/ogrsf_frmts/ods/ods_formula.cpp b/ogr/ogrsf_frmts/ods/ods_formula.cpp
index 6fb1b29134c7..e49ff419c212 100644
--- a/ogr/ogrsf_frmts/ods/ods_formula.cpp
+++ b/ogr/ogrsf_frmts/ods/ods_formula.cpp
@@ -8,23 +8,7 @@
  * Copyright (C) 2010 Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <cctype>
diff --git a/ogr/ogrsf_frmts/ods/ods_formula.h b/ogr/ogrsf_frmts/ods/ods_formula.h
index 463a0e762a1e..496fc28bd1b3 100644
--- a/ogr/ogrsf_frmts/ods/ods_formula.h
+++ b/ogr/ogrsf_frmts/ods/ods_formula.h
@@ -10,23 +10,7 @@
  * Copyright (C) 2010 Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef ODS_FORMULA_H_INCLUDED_
diff --git a/ogr/ogrsf_frmts/ods/ods_formula_node.cpp b/ogr/ogrsf_frmts/ods/ods_formula_node.cpp
index 4a4aa0c1afa2..cf2e2cb40f99 100644
--- a/ogr/ogrsf_frmts/ods/ods_formula_node.cpp
+++ b/ogr/ogrsf_frmts/ods/ods_formula_node.cpp
@@ -9,23 +9,7 @@
  * Copyright (C) 2010 Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2012-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/ods/ods_formula_parser.cpp b/ogr/ogrsf_frmts/ods/ods_formula_parser.cpp
index 43223ce92840..b6847476874a 100644
--- a/ogr/ogrsf_frmts/ods/ods_formula_parser.cpp
+++ b/ogr/ogrsf_frmts/ods/ods_formula_parser.cpp
@@ -82,23 +82,7 @@
  * Copyright (C) 2010 Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
@@ -536,9 +520,9 @@ static const yytype_int8 yytranslate[] = {
 #if YYDEBUG
 /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_int16 yyrline[] = {
-    0,   89,  89,  94,  94,  98,  103, 108, 113, 119, 126, 134, 141, 148,
-    154, 161, 169, 176, 181, 188, 195, 202, 209, 216, 223, 230, 237, 244,
-    262, 269, 276, 283, 290, 297, 304, 311, 317, 324, 330, 335, 341, 348};
+    0,   73,  73,  78,  78,  82,  87,  92,  97,  103, 110, 118, 125, 132,
+    138, 145, 153, 160, 165, 172, 179, 186, 193, 200, 207, 214, 221, 228,
+    246, 253, 260, 267, 274, 281, 288, 295, 301, 308, 314, 319, 325, 332};
 #endif
 
 #if YYDEBUG || YYERROR_VERBOSE || 0
diff --git a/ogr/ogrsf_frmts/ods/ods_formula_parser.y b/ogr/ogrsf_frmts/ods/ods_formula_parser.y
index 9d176de80295..34e844a5ad71 100644
--- a/ogr/ogrsf_frmts/ods/ods_formula_parser.y
+++ b/ogr/ogrsf_frmts/ods/ods_formula_parser.y
@@ -10,23 +10,7 @@
  * Copyright (C) 2010 Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/ods/ogr_ods.h b/ogr/ogrsf_frmts/ods/ogr_ods.h
index 5cea741a0446..77beedc8d841 100644
--- a/ogr/ogrsf_frmts/ods/ogr_ods.h
+++ b/ogr/ogrsf_frmts/ods/ogr_ods.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_ODS_H_INCLUDED
@@ -55,6 +39,9 @@ class OGRODSLayer final : public OGRMemLayer
     bool bHasHeaderLine;
     OGRFeatureQuery *m_poAttrQueryODS;
 
+    GIntBig TranslateFIDFromMemLayer(GIntBig nFID) const;
+    GIntBig TranslateFIDToMemLayer(GIntBig nFID) const;
+
   public:
     OGRODSLayer(OGRODSDataSource *poDSIn, const char *pszName,
                 bool bUpdateIn = FALSE);
@@ -91,6 +78,11 @@ class OGRODSLayer final : public OGRMemLayer
     virtual OGRFeature *GetNextFeature() override;
     virtual OGRFeature *GetFeature(GIntBig nFeatureId) override;
     virtual OGRErr ISetFeature(OGRFeature *poFeature) override;
+    OGRErr IUpdateFeature(OGRFeature *poFeature, int nUpdatedFieldsCount,
+                          const int *panUpdatedFieldsIdx,
+                          int nUpdatedGeomFieldsCount,
+                          const int *panUpdatedGeomFieldsIdx,
+                          bool bUpdateStyleString) override;
     virtual OGRErr DeleteFeature(GIntBig nFID) override;
 
     virtual GIntBig GetFeatureCount(int) override;
@@ -111,11 +103,7 @@ class OGRODSLayer final : public OGRMemLayer
         return OGRMemLayer::ISetFeature(poFeature);
     }
 
-    OGRErr ICreateFeature(OGRFeature *poFeature) override
-    {
-        SetUpdated();
-        return OGRMemLayer::ICreateFeature(poFeature);
-    }
+    OGRErr ICreateFeature(OGRFeature *poFeature) override;
 
     virtual OGRErr CreateField(const OGRFieldDefn *poField,
                                int bApproxOK = TRUE) override
diff --git a/ogr/ogrsf_frmts/ods/ogrodsdatasource.cpp b/ogr/ogrsf_frmts/ods/ogrodsdatasource.cpp
index fe166a6d3975..e99a863121ae 100644
--- a/ogr/ogrsf_frmts/ods/ogrodsdatasource.cpp
+++ b/ogr/ogrsf_frmts/ods/ogrodsdatasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_ods.h"
@@ -111,6 +95,28 @@ OGRErr OGRODSLayer::SyncToDisk()
     return OGRERR_NONE;
 }
 
+/************************************************************************/
+/*                      TranslateFIDFromMemLayer()                      */
+/************************************************************************/
+
+// Translate a FID from MEM convention (0-based) to ODS convention
+GIntBig OGRODSLayer::TranslateFIDFromMemLayer(GIntBig nFID) const
+{
+    return nFID + (1 + (bHasHeaderLine ? 1 : 0));
+}
+
+/************************************************************************/
+/*                        TranslateFIDToMemLayer()                      */
+/************************************************************************/
+
+// Translate a FID from ODS convention to MEM convention (0-based)
+GIntBig OGRODSLayer::TranslateFIDToMemLayer(GIntBig nFID) const
+{
+    if (nFID > 0)
+        return nFID - (1 + (bHasHeaderLine ? 1 : 0));
+    return OGRNullFID;
+}
+
 /************************************************************************/
 /*                          GetNextFeature()                            */
 /************************************************************************/
@@ -122,7 +128,7 @@ OGRFeature *OGRODSLayer::GetNextFeature()
         OGRFeature *poFeature = OGRMemLayer::GetNextFeature();
         if (poFeature == nullptr)
             return nullptr;
-        poFeature->SetFID(poFeature->GetFID() + 1 + (bHasHeaderLine ? 1 : 0));
+        poFeature->SetFID(TranslateFIDFromMemLayer(poFeature->GetFID()));
         if (m_poAttrQueryODS == nullptr ||
             m_poAttrQueryODS->Evaluate(poFeature))
         {
@@ -139,7 +145,7 @@ OGRFeature *OGRODSLayer::GetNextFeature()
 OGRFeature *OGRODSLayer::GetFeature(GIntBig nFeatureId)
 {
     OGRFeature *poFeature =
-        OGRMemLayer::GetFeature(nFeatureId - (1 + (bHasHeaderLine ? 1 : 0)));
+        OGRMemLayer::GetFeature(TranslateFIDToMemLayer(nFeatureId));
     if (poFeature)
         poFeature->SetFID(nFeatureId);
     return poFeature;
@@ -157,20 +163,74 @@ GIntBig OGRODSLayer::GetFeatureCount(int bForce)
 }
 
 /************************************************************************/
-/*                           ISetFeature()                               */
+/*                           ISetFeature()                              */
 /************************************************************************/
 
 OGRErr OGRODSLayer::ISetFeature(OGRFeature *poFeature)
 {
-    if (poFeature == nullptr)
-        return OGRMemLayer::ISetFeature(poFeature);
-
-    GIntBig nFID = poFeature->GetFID();
-    if (nFID != OGRNullFID)
-        poFeature->SetFID(nFID - (1 + (bHasHeaderLine ? 1 : 0)));
+    const GIntBig nFIDOrigin = poFeature->GetFID();
+    if (nFIDOrigin > 0)
+    {
+        const GIntBig nFIDMemLayer = TranslateFIDToMemLayer(nFIDOrigin);
+        if (!GetFeatureRef(nFIDMemLayer))
+            return OGRERR_NON_EXISTING_FEATURE;
+        poFeature->SetFID(nFIDMemLayer);
+    }
+    else
+    {
+        return OGRERR_NON_EXISTING_FEATURE;
+    }
     SetUpdated();
     OGRErr eErr = OGRMemLayer::ISetFeature(poFeature);
-    poFeature->SetFID(nFID);
+    poFeature->SetFID(nFIDOrigin);
+    return eErr;
+}
+
+/************************************************************************/
+/*                         IUpdateFeature()                             */
+/************************************************************************/
+
+OGRErr OGRODSLayer::IUpdateFeature(OGRFeature *poFeature,
+                                   int nUpdatedFieldsCount,
+                                   const int *panUpdatedFieldsIdx,
+                                   int nUpdatedGeomFieldsCount,
+                                   const int *panUpdatedGeomFieldsIdx,
+                                   bool bUpdateStyleString)
+{
+    const GIntBig nFIDOrigin = poFeature->GetFID();
+    if (nFIDOrigin != OGRNullFID)
+        poFeature->SetFID(TranslateFIDToMemLayer(nFIDOrigin));
+    SetUpdated();
+    OGRErr eErr = OGRMemLayer::IUpdateFeature(
+        poFeature, nUpdatedFieldsCount, panUpdatedFieldsIdx,
+        nUpdatedGeomFieldsCount, panUpdatedGeomFieldsIdx, bUpdateStyleString);
+    poFeature->SetFID(nFIDOrigin);
+    return eErr;
+}
+
+/************************************************************************/
+/*                          ICreateFeature()                            */
+/************************************************************************/
+
+OGRErr OGRODSLayer::ICreateFeature(OGRFeature *poFeature)
+{
+    const GIntBig nFIDOrigin = poFeature->GetFID();
+    if (nFIDOrigin > 0)
+    {
+        const GIntBig nFIDModified = TranslateFIDToMemLayer(nFIDOrigin);
+        if (GetFeatureRef(nFIDModified))
+        {
+            SetUpdated();
+            poFeature->SetFID(nFIDModified);
+            OGRErr eErr = OGRMemLayer::ISetFeature(poFeature);
+            poFeature->SetFID(nFIDOrigin);
+            return eErr;
+        }
+    }
+    SetUpdated();
+    poFeature->SetFID(OGRNullFID);
+    OGRErr eErr = OGRMemLayer::ICreateFeature(poFeature);
+    poFeature->SetFID(TranslateFIDFromMemLayer(poFeature->GetFID()));
     return eErr;
 }
 
@@ -181,7 +241,7 @@ OGRErr OGRODSLayer::ISetFeature(OGRFeature *poFeature)
 OGRErr OGRODSLayer::DeleteFeature(GIntBig nFID)
 {
     SetUpdated();
-    return OGRMemLayer::DeleteFeature(nFID - (1 + (bHasHeaderLine ? 1 : 0)));
+    return OGRMemLayer::DeleteFeature(TranslateFIDToMemLayer(nFID));
 }
 
 /************************************************************************/
diff --git a/ogr/ogrsf_frmts/ods/ogrodsdriver.cpp b/ogr/ogrsf_frmts/ods/ogrodsdriver.cpp
index 9e04758d4955..215527e11eec 100644
--- a/ogr/ogrsf_frmts/ods/ogrodsdriver.cpp
+++ b/ogr/ogrsf_frmts/ods/ogrodsdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
@@ -251,6 +235,9 @@ void RegisterOGRODS()
     poDriver->SetMetadataItem(GDAL_DCAP_CURVE_GEOMETRIES, "YES");
     poDriver->SetMetadataItem(GDAL_DCAP_Z_GEOMETRIES, "YES");
     poDriver->SetMetadataItem(GDAL_DCAP_CREATE_FIELD, "YES");
+    poDriver->SetMetadataItem(GDAL_DCAP_DELETE_FIELD, "YES");
+    poDriver->SetMetadataItem(GDAL_DCAP_REORDER_FIELDS, "YES");
+    poDriver->SetMetadataItem(GDAL_DMD_ALTER_FIELD_DEFN_FLAGS, "Name Type");
     poDriver->SetMetadataItem(GDAL_DMD_SUPPORTED_SQL_DIALECTS, "OGRSQL SQLITE");
 
     poDriver->SetMetadataItem(
diff --git a/ogr/ogrsf_frmts/ods/testparser.cpp b/ogr/ogrsf_frmts/ods/testparser.cpp
index 800e84ee0a2c..faebf39988bb 100644
--- a/ogr/ogrsf_frmts/ods/testparser.cpp
+++ b/ogr/ogrsf_frmts/ods/testparser.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ods_formula.h"
diff --git a/ogr/ogrsf_frmts/ogdi/ogrogdi.h b/ogr/ogrsf_frmts/ogdi/ogrogdi.h
index be69d89183bd..e0c3133bf469 100644
--- a/ogr/ogrsf_frmts/ogdi/ogrogdi.h
+++ b/ogr/ogrsf_frmts/ogdi/ogrogdi.h
@@ -10,23 +10,7 @@
  ******************************************************************************
  * Copyright (c) 2000,  Daniel Morissette
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGDOGDI_H_INCLUDED
@@ -100,7 +84,7 @@ class OGROGDILayer final : public OGRLayer
 /*                          OGROGDIDataSource                           */
 /************************************************************************/
 
-class OGROGDIDataSource final : public OGRDataSource
+class OGROGDIDataSource final : public GDALDataset
 {
     OGROGDILayer **m_papoLayers;
     int m_nLayers;
@@ -112,8 +96,6 @@ class OGROGDIDataSource final : public OGRDataSource
 
     OGROGDILayer *m_poCurrentLayer;
 
-    char *m_pszFullName;
-
     int m_bLaunderLayerNames;
 
     void IAddLayer(const char *pszLayerName, ecs_Family eFamily);
@@ -124,11 +106,6 @@ class OGROGDIDataSource final : public OGRDataSource
 
     int Open(const char *);
 
-    const char *GetName() override
-    {
-        return m_pszFullName;
-    }
-
     int GetLayerCount() override
     {
         return m_nLayers;
@@ -136,8 +113,6 @@ class OGROGDIDataSource final : public OGRDataSource
 
     OGRLayer *GetLayer(int) override;
 
-    int TestCapability(const char *) override;
-
     ecs_Region *GetGlobalBounds()
     {
         return &m_sGlobalBounds;
diff --git a/ogr/ogrsf_frmts/ogdi/ogrogdidatasource.cpp b/ogr/ogrsf_frmts/ogdi/ogrogdidatasource.cpp
index 8d8dc411995d..274072c9b6e3 100644
--- a/ogr/ogrsf_frmts/ogdi/ogrogdidatasource.cpp
+++ b/ogr/ogrsf_frmts/ogdi/ogrogdidatasource.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2000, Daniel Morissette
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrogdi.h"
@@ -39,7 +23,6 @@
 OGROGDIDataSource::OGROGDIDataSource()
     : m_papoLayers(nullptr), m_nLayers(0), m_nClientID(-1),
       m_poSpatialRef(nullptr), m_poCurrentLayer(nullptr),
-      m_pszFullName(nullptr),
       m_bLaunderLayerNames(
           CPLTestBool(CPLGetConfigOption("OGR_OGDI_LAUNDER_LAYER_NAMES", "NO")))
 {
@@ -58,8 +41,6 @@ OGROGDIDataSource::OGROGDIDataSource()
 OGROGDIDataSource::~OGROGDIDataSource()
 
 {
-    CPLFree(m_pszFullName);
-
     for (int i = 0; i < m_nLayers; i++)
         delete m_papoLayers[i];
     CPLFree(m_papoLayers);
@@ -136,8 +117,6 @@ int OGROGDIDataSource::Open(const char *pszNewName)
         return FALSE;
     }
 
-    m_pszFullName = CPLStrdup(pszNewName);
-
     /* -------------------------------------------------------------------- */
     /*      Capture some information from the file.                         */
     /* -------------------------------------------------------------------- */
@@ -208,7 +187,7 @@ int OGROGDIDataSource::Open(const char *pszNewName)
         {
             CPLError(CE_Failure, CPLE_AppDefined,
                      "Invalid or unsupported family name (%s) in URL %s\n",
-                     pszFamily, m_pszFullName);
+                     pszFamily, pszNewName);
             CPLFree(pszWorkingName);
             return FALSE;
         }
@@ -273,16 +252,6 @@ void OGROGDIDataSource::IAddLayer(const char *pszLayerName, ecs_Family eFamily)
     m_papoLayers[m_nLayers++] = new OGROGDILayer(this, pszLayerName, eFamily);
 }
 
-/************************************************************************/
-/*                           TestCapability()                           */
-/************************************************************************/
-
-int OGROGDIDataSource::TestCapability(CPL_UNUSED const char *pszCap)
-
-{
-    return FALSE;
-}
-
 /************************************************************************/
 /*                              GetLayer()                              */
 /************************************************************************/
diff --git a/ogr/ogrsf_frmts/ogdi/ogrogdidriver.cpp b/ogr/ogrsf_frmts/ogdi/ogrogdidriver.cpp
index a2ce7d454ad9..c402ae6bdbf1 100644
--- a/ogr/ogrsf_frmts/ogdi/ogrogdidriver.cpp
+++ b/ogr/ogrsf_frmts/ogdi/ogrogdidriver.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2000, Daniel Morissette
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrogdi.h"
diff --git a/ogr/ogrsf_frmts/ogdi/ogrogdidrivercore.cpp b/ogr/ogrsf_frmts/ogdi/ogrogdidrivercore.cpp
index d07dbb6cfa8d..d0af538adc8d 100644
--- a/ogr/ogrsf_frmts/ogdi/ogrogdidrivercore.cpp
+++ b/ogr/ogrsf_frmts/ogdi/ogrogdidrivercore.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2000, Daniel Morissette
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
diff --git a/ogr/ogrsf_frmts/ogdi/ogrogdidrivercore.h b/ogr/ogrsf_frmts/ogdi/ogrogdidrivercore.h
index 1d4f0d3e7e7d..4bfedb183f65 100644
--- a/ogr/ogrsf_frmts/ogdi/ogrogdidrivercore.h
+++ b/ogr/ogrsf_frmts/ogdi/ogrogdidrivercore.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2000, Daniel Morissette
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGROGDIDRIVERCORE_H
diff --git a/ogr/ogrsf_frmts/ogdi/ogrogdilayer.cpp b/ogr/ogrsf_frmts/ogdi/ogrogdilayer.cpp
index 4284f4d2818f..67df11e4af2b 100644
--- a/ogr/ogrsf_frmts/ogdi/ogrogdilayer.cpp
+++ b/ogr/ogrsf_frmts/ogdi/ogrogdilayer.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2000, Daniel Morissette
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************
  */
 
diff --git a/ogr/ogrsf_frmts/ogr_attrind.h b/ogr/ogrsf_frmts/ogr_attrind.h
index 26c87f9a88be..ed9397821a5f 100644
--- a/ogr/ogrsf_frmts/ogr_attrind.h
+++ b/ogr/ogrsf_frmts/ogr_attrind.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_ATTRIND_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/ogrsf_frmts.dox b/ogr/ogrsf_frmts/ogrsf_frmts.dox
index 0d32a30a69b5..dcbeee61150b 100644
--- a/ogr/ogrsf_frmts/ogrsf_frmts.dox
+++ b/ogr/ogrsf_frmts/ogrsf_frmts.dox
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 1999,  Les Technologies SoftMap Inc.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************/
 
 /************************************************************************/
diff --git a/ogr/ogrsf_frmts/ogrsf_frmts.h b/ogr/ogrsf_frmts/ogrsf_frmts.h
index e3089568cf52..ef82caefa9d3 100644
--- a/ogr/ogrsf_frmts/ogrsf_frmts.h
+++ b/ogr/ogrsf_frmts/ogrsf_frmts.h
@@ -9,23 +9,7 @@
  * Copyright (c) 1999,  Les Technologies SoftMap Inc.
  * Copyright (c) 2007-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRSF_FRMTS_H_INCLUDED
@@ -133,6 +117,8 @@ class CPL_DLL OGRLayer : public GDALMajorObject
     //! @cond Doxygen_Suppress
     CPLStringList m_aosArrowArrayStreamOptions{};
 
+    friend struct OGRGenSQLResultsLayerArrowStreamPrivateData;
+
     struct ArrowArrayStreamPrivateData
     {
         bool m_bArrowArrayStreamInProgress = false;
@@ -153,6 +139,7 @@ class CPL_DLL OGRLayer : public GDALMajorObject
     //! @endcond
 
     friend class OGRArrowArrayHelper;
+    friend class OGRGenSQLResultsLayer;
     static void ReleaseArray(struct ArrowArray *array);
     static void ReleaseSchema(struct ArrowSchema *schema);
     static void ReleaseStream(struct ArrowArrayStream *stream);
@@ -750,6 +737,8 @@ void CPL_DLL RegisterOGRGTFS();
 void CPL_DLL RegisterOGRPMTiles();
 void CPL_DLL RegisterOGRJSONFG();
 void CPL_DLL RegisterOGRMiraMon();
+void CPL_DLL RegisterOGRXODR();
+void DeclareDeferredOGRXODRPlugin();
 // @endcond
 
 CPL_C_END
diff --git a/ogr/ogrsf_frmts/openfilegdb/filegdb_coordprec_read.h b/ogr/ogrsf_frmts/openfilegdb/filegdb_coordprec_read.h
index 2c7741fbecd4..190d3e1edb23 100644
--- a/ogr/ogrsf_frmts/openfilegdb/filegdb_coordprec_read.h
+++ b/ogr/ogrsf_frmts/openfilegdb/filegdb_coordprec_read.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2024, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef FILEGDB_COORDPREC_READ_H
diff --git a/ogr/ogrsf_frmts/openfilegdb/filegdb_coordprec_write.h b/ogr/ogrsf_frmts/openfilegdb/filegdb_coordprec_write.h
index 07caa589b519..9556f84066e2 100644
--- a/ogr/ogrsf_frmts/openfilegdb/filegdb_coordprec_write.h
+++ b/ogr/ogrsf_frmts/openfilegdb/filegdb_coordprec_write.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2024, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef FILEGDB_COORDPREC_WRITE_H
diff --git a/ogr/ogrsf_frmts/openfilegdb/filegdb_fielddomain.h b/ogr/ogrsf_frmts/openfilegdb/filegdb_fielddomain.h
index 80f59730c16d..2e230dfce534 100644
--- a/ogr/ogrsf_frmts/openfilegdb/filegdb_fielddomain.h
+++ b/ogr/ogrsf_frmts/openfilegdb/filegdb_fielddomain.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2021, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef FILEGDB_FIELDDOMAIN_H
diff --git a/ogr/ogrsf_frmts/openfilegdb/filegdb_gdbtoogrfieldtype.h b/ogr/ogrsf_frmts/openfilegdb/filegdb_gdbtoogrfieldtype.h
index d66d52755f59..3b7a0f6d1cee 100644
--- a/ogr/ogrsf_frmts/openfilegdb/filegdb_gdbtoogrfieldtype.h
+++ b/ogr/ogrsf_frmts/openfilegdb/filegdb_gdbtoogrfieldtype.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2021, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef FILEGDB_GDBTOOGRFIELDTYPE_H
diff --git a/ogr/ogrsf_frmts/openfilegdb/filegdb_relationship.h b/ogr/ogrsf_frmts/openfilegdb/filegdb_relationship.h
index 9381458e71c4..03548fd6c35a 100644
--- a/ogr/ogrsf_frmts/openfilegdb/filegdb_relationship.h
+++ b/ogr/ogrsf_frmts/openfilegdb/filegdb_relationship.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Nyall Dawson <nyall dot dawson at gmail dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef FILEGDB_RELATIONSHIP_H
diff --git a/ogr/ogrsf_frmts/openfilegdb/filegdbindex.cpp b/ogr/ogrsf_frmts/openfilegdb/filegdbindex.cpp
index 57ed2d7d0910..e96ca20007e7 100644
--- a/ogr/ogrsf_frmts/openfilegdb/filegdbindex.cpp
+++ b/ogr/ogrsf_frmts/openfilegdb/filegdbindex.cpp
@@ -7,28 +7,13 @@
  ******************************************************************************
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
 #include "filegdbtable_priv.h"
 
+#include <cmath>
 #include <cstddef>
 #include <cstdio>
 #include <cstring>
@@ -83,7 +68,7 @@ class FileGDBTrivialIterator final : public FileGDBIterator
 {
     FileGDBIterator *poParentIter = nullptr;
     FileGDBTable *poTable = nullptr;
-    int iRow = 0;
+    int64_t iRow = 0;
 
     FileGDBTrivialIterator(const FileGDBTrivialIterator &) = delete;
     FileGDBTrivialIterator &operator=(const FileGDBTrivialIterator &) = delete;
@@ -107,14 +92,14 @@ class FileGDBTrivialIterator final : public FileGDBIterator
         poParentIter->Reset();
     }
 
-    virtual int GetNextRowSortedByFID() override;
+    virtual int64_t GetNextRowSortedByFID() override;
 
-    virtual int GetRowCount() override
+    virtual int64_t GetRowCount() override
     {
         return poTable->GetTotalRecordCount();
     }
 
-    virtual int GetNextRowSortedByValue() override
+    virtual int64_t GetNextRowSortedByValue() override
     {
         return poParentIter->GetNextRowSortedByValue();
     }
@@ -129,8 +114,8 @@ class FileGDBTrivialIterator final : public FileGDBIterator
         return poParentIter->GetMaxValue(eOutType);
     }
 
-    virtual int GetMinMaxSumCount(double &dfMin, double &dfMax, double &dfSum,
-                                  int &nCount) override
+    virtual bool GetMinMaxSumCount(double &dfMin, double &dfMax, double &dfSum,
+                                   int &nCount) override
     {
         return poParentIter->GetMinMaxSumCount(dfMin, dfMax, dfSum, nCount);
     }
@@ -144,8 +129,8 @@ class FileGDBNotIterator final : public FileGDBIterator
 {
     FileGDBIterator *poIterBase = nullptr;
     FileGDBTable *poTable = nullptr;
-    int iRow = 0;
-    int iNextRowBase = -1;
+    int64_t iRow = 0;
+    int64_t iNextRowBase = -1;
     int bNoHoles = 0;
 
     FileGDBNotIterator(const FileGDBNotIterator &) = delete;
@@ -161,8 +146,8 @@ class FileGDBNotIterator final : public FileGDBIterator
     }
 
     virtual void Reset() override;
-    virtual int GetNextRowSortedByFID() override;
-    virtual int GetRowCount() override;
+    virtual int64_t GetNextRowSortedByFID() override;
+    virtual int64_t GetRowCount() override;
 };
 
 /************************************************************************/
@@ -173,8 +158,8 @@ class FileGDBAndIterator final : public FileGDBIterator
 {
     FileGDBIterator *poIter1 = nullptr;
     FileGDBIterator *poIter2 = nullptr;
-    int iNextRow1 = -1;
-    int iNextRow2 = -1;
+    int64_t iNextRow1 = -1;
+    int64_t iNextRow2 = -1;
     bool m_bTakeOwnershipOfIterators = false;
 
     FileGDBAndIterator(const FileGDBAndIterator &) = delete;
@@ -191,7 +176,7 @@ class FileGDBAndIterator final : public FileGDBIterator
     }
 
     virtual void Reset() override;
-    virtual int GetNextRowSortedByFID() override;
+    virtual int64_t GetNextRowSortedByFID() override;
 };
 
 /************************************************************************/
@@ -203,8 +188,8 @@ class FileGDBOrIterator final : public FileGDBIterator
     FileGDBIterator *poIter1 = nullptr;
     FileGDBIterator *poIter2 = nullptr;
     int bIteratorAreExclusive = false;
-    int iNextRow1 = -1;
-    int iNextRow2 = -1;
+    int64_t iNextRow1 = -1;
+    int64_t iNextRow2 = -1;
     bool bHasJustReset = true;
 
     FileGDBOrIterator(const FileGDBOrIterator &) = delete;
@@ -221,8 +206,8 @@ class FileGDBOrIterator final : public FileGDBIterator
     }
 
     virtual void Reset() override;
-    virtual int GetNextRowSortedByFID() override;
-    virtual int GetRowCount() override;
+    virtual int64_t GetNextRowSortedByFID() override;
+    virtual int64_t GetRowCount() override;
 };
 
 /************************************************************************/
@@ -230,7 +215,9 @@ class FileGDBOrIterator final : public FileGDBIterator
 /************************************************************************/
 
 constexpr int MAX_DEPTH = 3;
-constexpr int FGDB_PAGE_SIZE = 4096;
+constexpr int FGDB_PAGE_SIZE_V1 = 4096;
+constexpr int FGDB_PAGE_SIZE_V2 = 65536;
+constexpr int MAX_FGDB_PAGE_SIZE = FGDB_PAGE_SIZE_V2;
 
 class FileGDBIndexIteratorBase : virtual public FileGDBIterator
 {
@@ -238,40 +225,67 @@ class FileGDBIndexIteratorBase : virtual public FileGDBIterator
     FileGDBTable *poParent = nullptr;
     bool bAscending = false;
     VSILFILE *fpCurIdx = nullptr;
+
+    //! Version of .atx/.spx: 1 or 2
+    GUInt32 m_nVersion = 0;
+
+    // Number of pages of size m_nPageSize
     GUInt32 m_nPageCount = 0;
+
+    //! Page size in bytes: 4096 for v1 format, 65536 for v2
+    int m_nPageSize = 0;
+
+    //! Maximum number of features or sub-pages referenced by a page.
     GUInt32 nMaxPerPages = 0;
+
+    //! Size of ObjectID referenced in pages, in bytes.
+    // sizeof(uint32_t) for V1, sizeof(uint64_t) for V2
+    GUInt32 m_nObjectIDSize = 0;
+
+    //! Size of the indexed value, in bytes.
     GUInt32 m_nValueSize = 0;
-    GUInt32 nOffsetFirstValInPage = 0;
-    GUInt32 nValueCountInIdx = 0;
+
+    //! Non-leaf page header size in bytes. 8 for V1, 12 for V2
+    GUInt32 m_nNonLeafPageHeaderSize = 0;
+
+    //! Leaf page header size in bytes. 12 for V1, 20 for V2
+    GUInt32 m_nLeafPageHeaderSize = 0;
+
+    //! Offset within a page at which the first indexed value is found.
+    GUInt32 m_nOffsetFirstValInPage = 0;
+
+    //! Number of values referenced in the index.
+    GUInt64 m_nValueCountInIdx = 0;
+
     GUInt32 nIndexDepth = 0;
 #ifdef DEBUG
-    int iLoadedPage[MAX_DEPTH];
+    uint64_t iLoadedPage[MAX_DEPTH];
 #endif
     int iFirstPageIdx[MAX_DEPTH];
     int iLastPageIdx[MAX_DEPTH];
     int iCurPageIdx[MAX_DEPTH];
     GUInt32 nSubPagesCount[MAX_DEPTH];
-    GUInt32 nLastPageAccessed[MAX_DEPTH];
+    uint64_t nLastPageAccessed[MAX_DEPTH];
 
     int iCurFeatureInPage = -1;
     int nFeaturesInPage = 0;
 
     bool bEOF = false;
 
-    GByte abyPage[MAX_DEPTH][FGDB_PAGE_SIZE];
-    GByte abyPageFeature[FGDB_PAGE_SIZE];
+    GByte abyPage[MAX_DEPTH][MAX_FGDB_PAGE_SIZE];
+    GByte abyPageFeature[MAX_FGDB_PAGE_SIZE];
 
-    typedef lru11::Cache<int, cpl::NonCopyableVector<GByte>> CacheType;
+    typedef lru11::Cache<uint64_t, cpl::NonCopyableVector<GByte>> CacheType;
     std::array<CacheType, MAX_DEPTH> m_oCachePage{
         {CacheType{2, 0}, CacheType{2, 0}, CacheType{2, 0}}};
     CacheType m_oCacheFeaturePage{2, 0};
 
     bool ReadTrailer(const std::string &osFilename);
 
-    int ReadPageNumber(int iLevel);
-    int LoadNextPage(int iLevel);
-    virtual bool FindPages(int iLevel, int nPage) = 0;
-    int LoadNextFeaturePage();
+    uint64_t ReadPageNumber(int iLevel);
+    bool LoadNextPage(int iLevel);
+    virtual bool FindPages(int iLevel, uint64_t nPage) = 0;
+    bool LoadNextFeaturePage();
 
     FileGDBIndexIteratorBase(FileGDBTable *poParent, int bAscending);
 
@@ -307,7 +321,7 @@ class FileGDBIndexIterator final : public FileGDBIndexIteratorBase
 
     int iSorted = 0;
     int nSortedCount = -1;
-    int *panSortedRows = nullptr;
+    int64_t *panSortedRows = nullptr;
     int SortRows();
 
     GUInt16 asUTF16Str[MAX_CAR_COUNT_INDEXED_STR];
@@ -321,8 +335,8 @@ class FileGDBIndexIterator final : public FileGDBIndexIteratorBase
     const OGRField *GetMinMaxValue(OGRField *psField, int &eOutType,
                                    int bIsMin);
 
-    virtual bool FindPages(int iLevel, int nPage) override;
-    int GetNextRow();
+    virtual bool FindPages(int iLevel, uint64_t nPage) override;
+    int64_t GetNextRow();
 
     FileGDBIndexIterator(FileGDBTable *poParent, int bAscending);
     int SetConstraint(int nFieldIdx, FileGDBSQLOp op,
@@ -343,19 +357,19 @@ class FileGDBIndexIterator final : public FileGDBIndexIteratorBase
                                   OGRFieldType eOGRFieldType,
                                   const OGRField *psValue);
 
-    virtual int GetNextRowSortedByFID() override;
-    virtual int GetRowCount() override;
+    virtual int64_t GetNextRowSortedByFID() override;
+    virtual int64_t GetRowCount() override;
     virtual void Reset() override;
 
-    virtual int GetNextRowSortedByValue() override
+    virtual int64_t GetNextRowSortedByValue() override
     {
         return GetNextRow();
     }
 
     virtual const OGRField *GetMinValue(int &eOutType) override;
     virtual const OGRField *GetMaxValue(int &eOutType) override;
-    virtual int GetMinMaxSumCount(double &dfMin, double &dfMax, double &dfSum,
-                                  int &nCount) override;
+    virtual bool GetMinMaxSumCount(double &dfMin, double &dfMax, double &dfSum,
+                                   int &nCount) override;
 };
 
 /************************************************************************/
@@ -384,7 +398,7 @@ const OGRField *FileGDBIterator::GetMaxValue(int &eOutType)
 /*                       GetNextRowSortedByValue()                      */
 /************************************************************************/
 
-int FileGDBIterator::GetNextRowSortedByValue()
+int64_t FileGDBIterator::GetNextRowSortedByValue()
 {
     PrintError();
     return -1;
@@ -394,15 +408,15 @@ int FileGDBIterator::GetNextRowSortedByValue()
 /*                        GetMinMaxSumCount()                           */
 /************************************************************************/
 
-int FileGDBIterator::GetMinMaxSumCount(double &dfMin, double &dfMax,
-                                       double &dfSum, int &nCount)
+bool FileGDBIterator::GetMinMaxSumCount(double &dfMin, double &dfMax,
+                                        double &dfSum, int &nCount)
 {
     PrintError();
     dfMin = 0.0;
     dfMax = 0.0;
     dfSum = 0.0;
     nCount = 0;
-    return FALSE;
+    return false;
 }
 
 /************************************************************************/
@@ -475,10 +489,10 @@ FileGDBIterator *FileGDBIterator::BuildOr(FileGDBIterator *poIter1,
 /*                           GetRowCount()                              */
 /************************************************************************/
 
-int FileGDBIterator::GetRowCount()
+int64_t FileGDBIterator::GetRowCount()
 {
     Reset();
-    int nCount = 0;
+    int64_t nCount = 0;
     while (GetNextRowSortedByFID() >= 0)
         nCount++;
     Reset();
@@ -498,7 +512,7 @@ FileGDBTrivialIterator::FileGDBTrivialIterator(FileGDBIterator *poParentIterIn)
 /*                        GetNextRowSortedByFID()                       */
 /************************************************************************/
 
-int FileGDBTrivialIterator::GetNextRowSortedByFID()
+int64_t FileGDBTrivialIterator::GetNextRowSortedByFID()
 {
     if (iRow < poTable->GetTotalRecordCount())
         return iRow++;
@@ -541,7 +555,7 @@ void FileGDBNotIterator::Reset()
 /*                        GetNextRowSortedByFID()                       */
 /************************************************************************/
 
-int FileGDBNotIterator::GetNextRowSortedByFID()
+int64_t FileGDBNotIterator::GetNextRowSortedByFID()
 {
     if (iNextRowBase < 0)
     {
@@ -579,7 +593,7 @@ int FileGDBNotIterator::GetNextRowSortedByFID()
 /*                           GetRowCount()                              */
 /************************************************************************/
 
-int FileGDBNotIterator::GetRowCount()
+int64_t FileGDBNotIterator::GetRowCount()
 {
     return poTable->GetValidRecordCount() - poIterBase->GetRowCount();
 }
@@ -626,7 +640,7 @@ void FileGDBAndIterator::Reset()
 /*                        GetNextRowSortedByFID()                       */
 /************************************************************************/
 
-int FileGDBAndIterator::GetNextRowSortedByFID()
+int64_t FileGDBAndIterator::GetNextRowSortedByFID()
 {
     if (iNextRow1 == iNextRow2)
     {
@@ -697,7 +711,7 @@ void FileGDBOrIterator::Reset()
 /*                        GetNextRowSortedByFID()                       */
 /************************************************************************/
 
-int FileGDBOrIterator::GetNextRowSortedByFID()
+int64_t FileGDBOrIterator::GetNextRowSortedByFID()
 {
     if (bHasJustReset)
     {
@@ -708,19 +722,19 @@ int FileGDBOrIterator::GetNextRowSortedByFID()
 
     if (iNextRow1 < 0)
     {
-        int iVal = iNextRow2;
+        auto iVal = iNextRow2;
         iNextRow2 = poIter2->GetNextRowSortedByFID();
         return iVal;
     }
     if (iNextRow2 < 0 || iNextRow1 < iNextRow2)
     {
-        int iVal = iNextRow1;
+        auto iVal = iNextRow1;
         iNextRow1 = poIter1->GetNextRowSortedByFID();
         return iVal;
     }
     if (iNextRow2 < iNextRow1)
     {
-        int iVal = iNextRow2;
+        auto iVal = iNextRow2;
         iNextRow2 = poIter2->GetNextRowSortedByFID();
         return iVal;
     }
@@ -728,7 +742,7 @@ int FileGDBOrIterator::GetNextRowSortedByFID()
     if (bIteratorAreExclusive)
         PrintError();
 
-    int iVal = iNextRow1;
+    auto iVal = iNextRow1;
     iNextRow1 = poIter1->GetNextRowSortedByFID();
     iNextRow2 = poIter2->GetNextRowSortedByFID();
     return iVal;
@@ -738,7 +752,7 @@ int FileGDBOrIterator::GetNextRowSortedByFID()
 /*                           GetRowCount()                              */
 /************************************************************************/
 
-int FileGDBOrIterator::GetRowCount()
+int64_t FileGDBOrIterator::GetRowCount()
 {
     if (bIteratorAreExclusive)
         return poIter1->GetRowCount() + poIter2->GetRowCount();
@@ -790,61 +804,109 @@ bool FileGDBIndexIteratorBase::ReadTrailer(const std::string &osFilename)
 
     VSIFSeekL(fpCurIdx, 0, SEEK_END);
     vsi_l_offset nFileSize = VSIFTellL(fpCurIdx);
-    returnErrorIf(nFileSize < FGDB_PAGE_SIZE + 22);
+    constexpr int V1_TRAILER_SIZE = 22;
+    constexpr int V2_TRAILER_SIZE = 30;
+    returnErrorIf(nFileSize < V1_TRAILER_SIZE);
+
+    GByte abyTrailer[V2_TRAILER_SIZE];
+    VSIFSeekL(fpCurIdx, nFileSize - sizeof(uint32_t), SEEK_SET);
+    returnErrorIf(VSIFReadL(abyTrailer, sizeof(uint32_t), 1, fpCurIdx) != 1);
+    m_nVersion = GetUInt32(abyTrailer, 0);
+    returnErrorIf(m_nVersion != 1 && m_nVersion != 2);
+
+    if (m_nVersion == 1)
+    {
+        m_nPageSize = FGDB_PAGE_SIZE_V1;
+        VSIFSeekL(fpCurIdx, nFileSize - V1_TRAILER_SIZE, SEEK_SET);
+        returnErrorIf(VSIFReadL(abyTrailer, V1_TRAILER_SIZE, 1, fpCurIdx) != 1);
+
+        m_nPageCount =
+            static_cast<GUInt32>((nFileSize - V1_TRAILER_SIZE) / m_nPageSize);
+
+        m_nValueSize = abyTrailer[0];
+        m_nObjectIDSize = static_cast<uint32_t>(sizeof(uint32_t));
+        m_nNonLeafPageHeaderSize = 8;
+        m_nLeafPageHeaderSize = 12;
+
+        nMaxPerPages = (m_nPageSize - m_nLeafPageHeaderSize) /
+                       (m_nObjectIDSize + m_nValueSize);
+        m_nOffsetFirstValInPage =
+            m_nLeafPageHeaderSize + nMaxPerPages * m_nObjectIDSize;
+
+        GUInt32 nMagic1 = GetUInt32(abyTrailer + 2, 0);
+        returnErrorIf(nMagic1 != 1);
+
+        nIndexDepth = GetUInt32(abyTrailer + 6, 0);
+        /* CPLDebug("OpenFileGDB", "nIndexDepth = %u", nIndexDepth); */
+        returnErrorIf(!(nIndexDepth >= 1 && nIndexDepth <= MAX_DEPTH + 1));
+
+        m_nValueCountInIdx = GetUInt32(abyTrailer + 10, 0);
+        /* CPLDebug("OpenFileGDB", "m_nValueCountInIdx = %u", m_nValueCountInIdx); */
+        /* negative like in sample_clcV15_esri_v10.gdb/a00000005.FDO_UUID.atx */
+        if ((m_nValueCountInIdx >> (8 * sizeof(m_nValueCountInIdx) - 1)) != 0)
+        {
+            CPLDebugOnly("OpenFileGDB", "m_nValueCountInIdx=%u",
+                         static_cast<uint32_t>(m_nValueCountInIdx));
+            return false;
+        }
 
-    VSIFSeekL(fpCurIdx, nFileSize - 22, SEEK_SET);
-    GByte abyTrailer[22];
-    returnErrorIf(VSIFReadL(abyTrailer, 22, 1, fpCurIdx) != 1);
+        /* QGIS_TEST_101.gdb/a00000006.FDO_UUID.atx */
+        /* or .spx file from test dataset https://github.com/OSGeo/gdal/issues/5888
+         */
+        if (m_nValueCountInIdx == 0 && nIndexDepth == 1)
+        {
+            VSIFSeekL(fpCurIdx, 4, SEEK_SET);
+            GByte abyBuffer[4];
+            returnErrorIf(VSIFReadL(abyBuffer, 4, 1, fpCurIdx) != 1);
+            m_nValueCountInIdx = GetUInt32(abyBuffer, 0);
+        }
+        /* PreNIS.gdb/a00000006.FDO_UUID.atx has depth 2 and the value of */
+        /* m_nValueCountInIdx is 11 which is not the number of non-null values */
+        else if (m_nValueCountInIdx < nMaxPerPages && nIndexDepth > 1)
+        {
+            if (m_nValueCountInIdx > 0 && poParent->IsFileGDBV9() &&
+                strstr(osFilename.c_str(), "blk_key_index.atx"))
+            {
+                // m_nValueCountInIdx not reliable in FileGDB v9 .blk_key_index.atx
+                // but index seems to be OK
+                return true;
+            }
 
-    m_nPageCount = static_cast<GUInt32>((nFileSize - 22) / FGDB_PAGE_SIZE);
+            CPLDebugOnly(
+                "OpenFileGDB",
+                "m_nValueCountInIdx=%u < nMaxPerPages=%u, nIndexDepth=%u",
+                static_cast<uint32_t>(m_nValueCountInIdx), nMaxPerPages,
+                nIndexDepth);
+            return false;
+        }
+    }
+    else
+    {
+        m_nPageSize = FGDB_PAGE_SIZE_V2;
+        VSIFSeekL(fpCurIdx, nFileSize - V2_TRAILER_SIZE, SEEK_SET);
+        returnErrorIf(VSIFReadL(abyTrailer, V2_TRAILER_SIZE, 1, fpCurIdx) != 1);
 
-    m_nValueSize = abyTrailer[0];
+        m_nPageCount =
+            static_cast<GUInt32>((nFileSize - V2_TRAILER_SIZE) / m_nPageSize);
 
-    nMaxPerPages = (FGDB_PAGE_SIZE - 12) / (4 + m_nValueSize);
-    nOffsetFirstValInPage = 12 + nMaxPerPages * 4;
+        m_nValueSize = abyTrailer[0];
+        m_nObjectIDSize = static_cast<uint32_t>(sizeof(uint64_t));
+        m_nNonLeafPageHeaderSize = 12;
+        m_nLeafPageHeaderSize = 20;
 
-    GUInt32 nMagic1 = GetUInt32(abyTrailer + 2, 0);
-    returnErrorIf(nMagic1 != 1);
+        nMaxPerPages = (m_nPageSize - m_nLeafPageHeaderSize) /
+                       (m_nObjectIDSize + m_nValueSize);
+        m_nOffsetFirstValInPage =
+            m_nLeafPageHeaderSize + nMaxPerPages * m_nObjectIDSize;
 
-    nIndexDepth = GetUInt32(abyTrailer + 6, 0);
-    /* CPLDebug("OpenFileGDB", "nIndexDepth = %u", nIndexDepth); */
-    returnErrorIf(!(nIndexDepth >= 1 && nIndexDepth <= MAX_DEPTH + 1));
+        GUInt32 nMagic1 = GetUInt32(abyTrailer + 2, 0);
+        returnErrorIf(nMagic1 != 1);
 
-    nValueCountInIdx = GetUInt32(abyTrailer + 10, 0);
-    /* CPLDebug("OpenFileGDB", "nValueCountInIdx = %u", nValueCountInIdx); */
-    /* negative like in sample_clcV15_esri_v10.gdb/a00000005.FDO_UUID.atx */
-    if ((nValueCountInIdx >> (8 * sizeof(nValueCountInIdx) - 1)) != 0)
-    {
-        CPLDebugOnly("OpenFileGDB", "nValueCountInIdx=%u", nValueCountInIdx);
-        return false;
-    }
+        nIndexDepth = GetUInt32(abyTrailer + 6, 0);
+        /* CPLDebug("OpenFileGDB", "nIndexDepth = %u", nIndexDepth); */
+        returnErrorIf(!(nIndexDepth >= 1 && nIndexDepth <= MAX_DEPTH + 1));
 
-    /* QGIS_TEST_101.gdb/a00000006.FDO_UUID.atx */
-    /* or .spx file from test dataset https://github.com/OSGeo/gdal/issues/5888
-     */
-    if (nValueCountInIdx == 0 && nIndexDepth == 1)
-    {
-        VSIFSeekL(fpCurIdx, 4, SEEK_SET);
-        GByte abyBuffer[4];
-        returnErrorIf(VSIFReadL(abyBuffer, 4, 1, fpCurIdx) != 1);
-        nValueCountInIdx = GetUInt32(abyBuffer, 0);
-    }
-    /* PreNIS.gdb/a00000006.FDO_UUID.atx has depth 2 and the value of */
-    /* nValueCountInIdx is 11 which is not the number of non-null values */
-    else if (nValueCountInIdx < nMaxPerPages && nIndexDepth > 1)
-    {
-        if (nValueCountInIdx > 0 && poParent->IsFileGDBV9() &&
-            strstr(osFilename.c_str(), "blk_key_index.atx"))
-        {
-            // nValueCountInIdx not reliable in FileGDB v9 .blk_key_index.atx
-            // but index seems to be OK
-            return true;
-        }
-
-        CPLDebugOnly("OpenFileGDB",
-                     "nValueCountInIdx=%u < nMaxPerPages=%u, nIndexDepth=%u",
-                     nValueCountInIdx, nMaxPerPages, nIndexDepth);
-        return false;
+        m_nValueCountInIdx = GetUInt64(abyTrailer + 10, 0);
     }
 
     return true;
@@ -916,6 +978,8 @@ static const char *FileGDBSQLOpToStr(FileGDBSQLOp op)
             return ">=";
         case FGSO_GT:
             return ">";
+        case FGSO_ILIKE:
+            return "ILIKE";
     }
     return "unknown_op";
 }
@@ -935,7 +999,7 @@ static const char *FileGDBValueToStr(OGRFieldType eOGRFieldType,
         case OFTInteger:
             return CPLSPrintf("%d", psValue->Integer);
         case OFTReal:
-            return CPLSPrintf("%.18g", psValue->Real);
+            return CPLSPrintf("%.17g", psValue->Real);
         case OFTString:
             return psValue->String;
         case OFTDateTime:
@@ -970,15 +1034,40 @@ int FileGDBIndex::GetMaxWidthInBytes(const FileGDBTable *poTable) const
 
     VSIFSeekL(fpCurIdx, 0, SEEK_END);
     vsi_l_offset nFileSize = VSIFTellL(fpCurIdx);
-    if (nFileSize < FGDB_PAGE_SIZE + 22)
+
+    constexpr int V1_TRAILER_SIZE = 22;
+    constexpr int V2_TRAILER_SIZE = 30;
+
+    if (nFileSize < FGDB_PAGE_SIZE_V1 + V1_TRAILER_SIZE)
     {
         VSIFCloseL(fpCurIdx);
         return 0;
     }
 
-    VSIFSeekL(fpCurIdx, nFileSize - 22, SEEK_SET);
-    GByte abyTrailer[22];
-    if (VSIFReadL(abyTrailer, 22, 1, fpCurIdx) != 1)
+    GByte abyTrailer[V2_TRAILER_SIZE];
+    VSIFSeekL(fpCurIdx, nFileSize - sizeof(uint32_t), SEEK_SET);
+    if (VSIFReadL(abyTrailer, sizeof(uint32_t), 1, fpCurIdx) != 1)
+    {
+        VSIFCloseL(fpCurIdx);
+        return 0;
+    }
+    const auto nVersion = GetUInt32(abyTrailer, 0);
+    if (nVersion != 1 && nVersion != 2)
+    {
+        VSIFCloseL(fpCurIdx);
+        return 0;
+    }
+
+    const int nTrailerSize = nVersion == 1 ? V1_TRAILER_SIZE : V2_TRAILER_SIZE;
+
+    if (nVersion == 2 && nFileSize < FGDB_PAGE_SIZE_V2 + V2_TRAILER_SIZE)
+    {
+        VSIFCloseL(fpCurIdx);
+        return 0;
+    }
+
+    VSIFSeekL(fpCurIdx, nFileSize - nTrailerSize, SEEK_SET);
+    if (VSIFReadL(abyTrailer, nTrailerSize, 1, fpCurIdx) != 1)
     {
         VSIFCloseL(fpCurIdx);
         return 0;
@@ -1015,15 +1104,41 @@ int FileGDBIndexIterator::SetConstraint(int nFieldIdx, FileGDBSQLOp op,
                   eFieldType != FGFT_TIME &&
                   eFieldType != FGFT_DATETIME_WITH_OFFSET);
 
-    const char *pszAtxName = CPLFormFilename(
-        CPLGetPath(poParent->GetFilename().c_str()),
-        CPLGetBasename(poParent->GetFilename().c_str()),
-        CPLSPrintf("%s.atx", poField->GetIndex()->GetIndexName().c_str()));
+    const auto poIndex = poField->GetIndex();
+
+    // Only supports ILIKE on a field string if the index expression starts
+    // with LOWER() and the string to compare with is only ASCII without
+    // wildcards
+    if (eOGRFieldType == OFTString &&
+        STARTS_WITH_CI(poIndex->GetExpression().c_str(), "LOWER("))
+    {
+        if (eOp == FGSO_ILIKE)
+        {
+            if (!CPLIsASCII(psValue->String, strlen(psValue->String)) ||
+                strchr(psValue->String, '%') || strchr(psValue->String, '_'))
+            {
+                return FALSE;
+            }
+        }
+        else if (eOp != FGSO_ISNOTNULL)
+        {
+            return FALSE;
+        }
+    }
+    else if (eOp == FGSO_ILIKE)
+    {
+        return FALSE;
+    }
+
+    const char *pszAtxName =
+        CPLFormFilename(CPLGetPath(poParent->GetFilename().c_str()),
+                        CPLGetBasename(poParent->GetFilename().c_str()),
+                        CPLSPrintf("%s.atx", poIndex->GetIndexName().c_str()));
 
     if (!ReadTrailer(pszAtxName))
         return FALSE;
-    returnErrorIf(nValueCountInIdx >
-                  static_cast<GUInt32>(poParent->GetValidRecordCount()));
+    returnErrorIf(m_nValueCountInIdx >
+                  static_cast<GUInt64>(poParent->GetValidRecordCount()));
 
     switch (eFieldType)
     {
@@ -1156,7 +1271,7 @@ int FileGDBIndexIterator::SetConstraint(int nFieldIdx, FileGDBSQLOp op,
             break;
     }
 
-    if (nValueCountInIdx > 0)
+    if (m_nValueCountInIdx > 0)
     {
         if (nIndexDepth == 1)
         {
@@ -1186,13 +1301,23 @@ int FileGDBIndexIterator::SetConstraint(int nFieldIdx, FileGDBSQLOp op,
 /************************************************************************/
 
 static int FileGDBUTF16StrCompare(const GUInt16 *pasFirst,
-                                  const GUInt16 *pasSecond, int nStrLen)
+                                  const GUInt16 *pasSecond, int nStrLen,
+                                  bool bCaseInsensitive)
 {
     for (int i = 0; i < nStrLen; i++)
     {
-        if (pasFirst[i] < pasSecond[i])
+        GUInt16 chA = pasFirst[i];
+        GUInt16 chB = pasSecond[i];
+        if (bCaseInsensitive)
+        {
+            if (chA >= 'a' && chA <= 'z')
+                chA -= 'a' - 'A';
+            if (chB >= 'a' && chB <= 'z')
+                chB -= 'a' - 'A';
+        }
+        if (chA < chB)
             return -1;
-        if (pasFirst[i] > pasSecond[i])
+        if (chA > chB)
             return 1;
     }
     return 0;
@@ -1208,22 +1333,22 @@ static int FileGDBUTF16StrCompare(const GUInt16 *pasFirst,
 /*                             FindPages()                              */
 /************************************************************************/
 
-bool FileGDBIndexIterator::FindPages(int iLevel, int nPage)
+bool FileGDBIndexIterator::FindPages(int iLevel, uint64_t nPage)
 {
     const bool errorRetValue = false;
-    VSIFSeekL(fpCurIdx, static_cast<vsi_l_offset>(nPage - 1) * FGDB_PAGE_SIZE,
+    VSIFSeekL(fpCurIdx, static_cast<vsi_l_offset>(nPage - 1) * m_nPageSize,
               SEEK_SET);
 #ifdef DEBUG
     iLoadedPage[iLevel] = nPage;
 #endif
-    returnErrorIf(VSIFReadL(abyPage[iLevel], FGDB_PAGE_SIZE, 1, fpCurIdx) != 1);
+    returnErrorIf(VSIFReadL(abyPage[iLevel], m_nPageSize, 1, fpCurIdx) != 1);
 
-    nSubPagesCount[iLevel] = GetUInt32(abyPage[iLevel] + 4, 0);
+    nSubPagesCount[iLevel] = GetUInt32(abyPage[iLevel] + m_nObjectIDSize, 0);
     returnErrorIf(nSubPagesCount[iLevel] == 0 ||
                   nSubPagesCount[iLevel] > nMaxPerPages);
     if (nIndexDepth == 2)
-        returnErrorIf(nValueCountInIdx >
-                      nMaxPerPages * (nSubPagesCount[0] + 1));
+        returnErrorIf(m_nValueCountInIdx > static_cast<uint64_t>(nMaxPerPages) *
+                                               (nSubPagesCount[0] + 1));
 
     if (eOp == FGSO_ISNOTNULL)
     {
@@ -1250,7 +1375,7 @@ bool FileGDBIndexIterator::FindPages(int iLevel, int nPage)
             case FGFT_INT16:
             {
                 GInt16 nVal =
-                    GetInt16(abyPage[iLevel] + nOffsetFirstValInPage, i);
+                    GetInt16(abyPage[iLevel] + m_nOffsetFirstValInPage, i);
 #ifdef DEBUG_INDEX_CONSISTENCY
                 returnErrorIf(i > 0 && nVal < nLastMax);
                 nLastMax = nVal;
@@ -1262,7 +1387,7 @@ bool FileGDBIndexIterator::FindPages(int iLevel, int nPage)
             case FGFT_INT32:
             {
                 GInt32 nVal =
-                    GetInt32(abyPage[iLevel] + nOffsetFirstValInPage, i);
+                    GetInt32(abyPage[iLevel] + m_nOffsetFirstValInPage, i);
 #ifdef DEBUG_INDEX_CONSISTENCY
                 returnErrorIf(i > 0 && nVal < nLastMax);
                 nLastMax = nVal;
@@ -1274,7 +1399,7 @@ bool FileGDBIndexIterator::FindPages(int iLevel, int nPage)
             case FGFT_INT64:
             {
                 int64_t nVal =
-                    GetInt64(abyPage[iLevel] + nOffsetFirstValInPage, i);
+                    GetInt64(abyPage[iLevel] + m_nOffsetFirstValInPage, i);
 #ifdef DEBUG_INDEX_CONSISTENCY
                 returnErrorIf(i > 0 && nVal < nLastMax);
                 nLastMax = nVal;
@@ -1286,7 +1411,7 @@ bool FileGDBIndexIterator::FindPages(int iLevel, int nPage)
             case FGFT_FLOAT32:
             {
                 float fVal =
-                    GetFloat32(abyPage[iLevel] + nOffsetFirstValInPage, i);
+                    GetFloat32(abyPage[iLevel] + m_nOffsetFirstValInPage, i);
 #ifdef DEBUG_INDEX_CONSISTENCY
                 returnErrorIf(i > 0 && fVal < dfLastMax);
                 dfLastMax = fVal;
@@ -1298,7 +1423,7 @@ bool FileGDBIndexIterator::FindPages(int iLevel, int nPage)
             case FGFT_FLOAT64:
             {
                 const double dfVal =
-                    GetFloat64(abyPage[iLevel] + nOffsetFirstValInPage, i);
+                    GetFloat64(abyPage[iLevel] + m_nOffsetFirstValInPage, i);
 #ifdef DEBUG_INDEX_CONSISTENCY
                 returnErrorIf(i > 0 && dfVal < dfLastMax);
                 dfLastMax = dfVal;
@@ -1312,7 +1437,7 @@ bool FileGDBIndexIterator::FindPages(int iLevel, int nPage)
             case FGFT_TIME:
             {
                 const double dfVal =
-                    GetFloat64(abyPage[iLevel] + nOffsetFirstValInPage, i);
+                    GetFloat64(abyPage[iLevel] + m_nOffsetFirstValInPage, i);
 #ifdef DEBUG_INDEX_CONSISTENCY
                 returnErrorIf(i > 0 && dfVal < dfLastMax);
                 dfLastMax = dfVal;
@@ -1332,17 +1457,22 @@ bool FileGDBIndexIterator::FindPages(int iLevel, int nPage)
                 GUInt16 asMax[MAX_CAR_COUNT_INDEXED_STR];
                 pasMax = asMax;
                 memcpy(asMax,
-                       abyPage[iLevel] + nOffsetFirstValInPage +
+                       abyPage[iLevel] + m_nOffsetFirstValInPage +
                            nStrLen * sizeof(GUInt16) * i,
                        nStrLen * sizeof(GUInt16));
                 for (int j = 0; j < nStrLen; j++)
                     CPL_LSBPTR16(&asMax[j]);
+                    // Note: we have an inconsistency. OGR SQL equality operator
+                    // is advertized to be case insensitive, but we have always
+                    // implemented FGSO_EQ as case sensitive.
 #ifdef DEBUG_INDEX_CONSISTENCY
-                returnErrorIf(i > 0 && FileGDBUTF16StrCompare(pasMax, asLastMax,
-                                                              nStrLen) < 0);
+                returnErrorIf(i > 0 &&
+                              FileGDBUTF16StrCompare(pasMax, asLastMax, nStrLen,
+                                                     eOp == FGSO_ILIKE) < 0);
                 memcpy(asLastMax, pasMax, nStrLen * 2);
 #endif
-                nComp = FileGDBUTF16StrCompare(asUTF16Str, pasMax, nStrLen);
+                nComp = FileGDBUTF16StrCompare(asUTF16Str, pasMax, nStrLen,
+                                               eOp == FGSO_ILIKE);
                 break;
             }
 
@@ -1350,7 +1480,7 @@ bool FileGDBIndexIterator::FindPages(int iLevel, int nPage)
             case FGFT_GLOBALID:
             {
                 const char *psNonzMaxUUID = reinterpret_cast<char *>(
-                    abyPage[iLevel] + nOffsetFirstValInPage +
+                    abyPage[iLevel] + m_nOffsetFirstValInPage +
                     UUID_LEN_AS_STRING * i);
 #ifdef DEBUG_INDEX_CONSISTENCY
                 returnErrorIf(i > 0 && memcmp(psNonzMaxUUID, szLastMaxUUID,
@@ -1392,6 +1522,7 @@ bool FileGDBIndexIterator::FindPages(int iLevel, int nPage)
                 break;
 
             case FGSO_EQ:
+            case FGSO_ILIKE:
                 if (iFirstPageIdx[iLevel] < 0)
                 {
                     if (nComp <= 0)
@@ -1431,7 +1562,7 @@ bool FileGDBIndexIterator::FindPages(int iLevel, int nPage)
                 }
                 break;
 
-            default:
+            case FGSO_ISNOTNULL:
                 CPLAssert(false);
                 break;
         }
@@ -1458,14 +1589,14 @@ bool FileGDBIndexIterator::FindPages(int iLevel, int nPage)
 void FileGDBIndexIteratorBase::Reset()
 {
     iCurPageIdx[0] = (bAscending) ? iFirstPageIdx[0] - 1 : iLastPageIdx[0] + 1;
-    memset(iFirstPageIdx + 1, 0xFF, (MAX_DEPTH - 1) * sizeof(int));
-    memset(iLastPageIdx + 1, 0xFF, (MAX_DEPTH - 1) * sizeof(int));
-    memset(iCurPageIdx + 1, 0xFF, (MAX_DEPTH - 1) * sizeof(int));
-    memset(nLastPageAccessed, 0, MAX_DEPTH * sizeof(int));
+    memset(iFirstPageIdx + 1, 0xFF, (MAX_DEPTH - 1) * sizeof(iFirstPageIdx[0]));
+    memset(iLastPageIdx + 1, 0xFF, (MAX_DEPTH - 1) * sizeof(iLastPageIdx[0]));
+    memset(iCurPageIdx + 1, 0xFF, (MAX_DEPTH - 1) * sizeof(iCurPageIdx[0]));
+    memset(nLastPageAccessed, 0, MAX_DEPTH * sizeof(nLastPageAccessed[0]));
     iCurFeatureInPage = 0;
     nFeaturesInPage = 0;
 
-    bEOF = (nValueCountInIdx == 0);
+    bEOF = (m_nValueCountInIdx == 0);
 }
 
 /************************************************************************/
@@ -1483,15 +1614,33 @@ void FileGDBIndexIterator::Reset()
 /*                           ReadPageNumber()                           */
 /************************************************************************/
 
-int FileGDBIndexIteratorBase::ReadPageNumber(int iLevel)
+uint64_t FileGDBIndexIteratorBase::ReadPageNumber(int iLevel)
 {
     const int errorRetValue = 0;
-    GUInt32 nPage = GetUInt32(abyPage[iLevel] + 8, iCurPageIdx[iLevel]);
-    if (nPage == nLastPageAccessed[iLevel])
+    uint64_t nPage;
+    if (m_nVersion == 1)
     {
-        if (!LoadNextPage(iLevel))
-            return 0;
-        nPage = GetUInt32(abyPage[iLevel] + 8, iCurPageIdx[iLevel]);
+        nPage = GetUInt32(abyPage[iLevel] + m_nNonLeafPageHeaderSize,
+                          iCurPageIdx[iLevel]);
+        if (nPage == nLastPageAccessed[iLevel])
+        {
+            if (!LoadNextPage(iLevel))
+                return 0;
+            nPage = GetUInt32(abyPage[iLevel] + m_nNonLeafPageHeaderSize,
+                              iCurPageIdx[iLevel]);
+        }
+    }
+    else
+    {
+        nPage = GetUInt64(abyPage[iLevel] + m_nNonLeafPageHeaderSize,
+                          iCurPageIdx[iLevel]);
+        if (nPage == nLastPageAccessed[iLevel])
+        {
+            if (!LoadNextPage(iLevel))
+                return 0;
+            nPage = GetUInt64(abyPage[iLevel] + m_nNonLeafPageHeaderSize,
+                              iCurPageIdx[iLevel]);
+        }
     }
     nLastPageAccessed[iLevel] = nPage;
     returnErrorIf(nPage < 2);
@@ -1502,16 +1651,16 @@ int FileGDBIndexIteratorBase::ReadPageNumber(int iLevel)
 /*                           LoadNextPage()                             */
 /************************************************************************/
 
-int FileGDBIndexIteratorBase::LoadNextPage(int iLevel)
+bool FileGDBIndexIteratorBase::LoadNextPage(int iLevel)
 {
-    const int errorRetValue = FALSE;
+    const bool errorRetValue = false;
     if ((bAscending && iCurPageIdx[iLevel] == iLastPageIdx[iLevel]) ||
         (!bAscending && iCurPageIdx[iLevel] == iFirstPageIdx[iLevel]))
     {
         if (iLevel == 0 || !LoadNextPage(iLevel - 1))
-            return FALSE;
+            return false;
 
-        GUInt32 nPage = ReadPageNumber(iLevel - 1);
+        const auto nPage = ReadPageNumber(iLevel - 1);
         returnErrorIf(!FindPages(iLevel, nPage));
 
         iCurPageIdx[iLevel] =
@@ -1525,23 +1674,23 @@ int FileGDBIndexIteratorBase::LoadNextPage(int iLevel)
             iCurPageIdx[iLevel]--;
     }
 
-    return TRUE;
+    return true;
 }
 
 /************************************************************************/
 /*                        LoadNextFeaturePage()                         */
 /************************************************************************/
 
-int FileGDBIndexIteratorBase::LoadNextFeaturePage()
+bool FileGDBIndexIteratorBase::LoadNextFeaturePage()
 {
-    const int errorRetValue = FALSE;
-    GUInt32 nPage;
+    const bool errorRetValue = false;
+    GUInt64 nPage;
 
     if (nIndexDepth == 1)
     {
         if (iCurPageIdx[0] == iLastPageIdx[0])
         {
-            return FALSE;
+            return false;
         }
         if (bAscending)
             iCurPageIdx[0]++;
@@ -1553,7 +1702,7 @@ int FileGDBIndexIteratorBase::LoadNextFeaturePage()
     {
         if (!LoadNextPage(nIndexDepth - 2))
         {
-            return FALSE;
+            return false;
         }
         nPage = ReadPageNumber(nIndexDepth - 2);
         returnErrorIf(nPage < 2);
@@ -1563,7 +1712,7 @@ int FileGDBIndexIteratorBase::LoadNextFeaturePage()
         m_oCacheFeaturePage.getPtr(nPage);
     if (cachedPagePtr)
     {
-        memcpy(abyPageFeature, cachedPagePtr->data(), FGDB_PAGE_SIZE);
+        memcpy(abyPageFeature, cachedPagePtr->data(), m_nPageSize);
     }
     else
     {
@@ -1574,37 +1723,32 @@ int FileGDBIndexIteratorBase::LoadNextFeaturePage()
             cachedPage.clear();
         }
 
-        VSIFSeekL(fpCurIdx,
-                  static_cast<vsi_l_offset>(nPage - 1) * FGDB_PAGE_SIZE,
+        VSIFSeekL(fpCurIdx, static_cast<vsi_l_offset>(nPage - 1) * m_nPageSize,
                   SEEK_SET);
 #ifdef DEBUG
         iLoadedPage[nIndexDepth - 1] = nPage;
 #endif
-        returnErrorIf(VSIFReadL(abyPageFeature, FGDB_PAGE_SIZE, 1, fpCurIdx) !=
-                      1);
+        returnErrorIf(VSIFReadL(abyPageFeature, m_nPageSize, 1, fpCurIdx) != 1);
         cachedPage.insert(cachedPage.end(), abyPageFeature,
-                          abyPageFeature + FGDB_PAGE_SIZE);
+                          abyPageFeature + m_nPageSize);
         m_oCacheFeaturePage.insert(nPage, std::move(cachedPage));
     }
 
-    GUInt32 nFeatures = GetUInt32(abyPageFeature + 4, 0);
+    const GUInt32 nFeatures = GetUInt32(abyPageFeature + m_nObjectIDSize, 0);
     returnErrorIf(nFeatures > nMaxPerPages);
 
     nFeaturesInPage = static_cast<int>(nFeatures);
     iCurFeatureInPage = (bAscending) ? 0 : nFeaturesInPage - 1;
-    if (nFeatures == 0)
-        return FALSE;
-
-    return TRUE;
+    return nFeatures != 0;
 }
 
 /************************************************************************/
 /*                              GetNextRow()                            */
 /************************************************************************/
 
-int FileGDBIndexIterator::GetNextRow()
+int64_t FileGDBIndexIterator::GetNextRow()
 {
-    const int errorRetValue = -1;
+    const int64_t errorRetValue = -1;
     if (bEOF)
         return -1;
 
@@ -1632,7 +1776,7 @@ int FileGDBIndexIterator::GetNextRow()
                 case FGFT_INT16:
                 {
                     const GInt16 nVal =
-                        GetInt16(abyPageFeature + nOffsetFirstValInPage,
+                        GetInt16(abyPageFeature + m_nOffsetFirstValInPage,
                                  iCurFeatureInPage);
                     nComp = COMPARE(sValue.Integer, nVal);
                     break;
@@ -1641,7 +1785,7 @@ int FileGDBIndexIterator::GetNextRow()
                 case FGFT_INT32:
                 {
                     const GInt32 nVal =
-                        GetInt32(abyPageFeature + nOffsetFirstValInPage,
+                        GetInt32(abyPageFeature + m_nOffsetFirstValInPage,
                                  iCurFeatureInPage);
                     nComp = COMPARE(sValue.Integer, nVal);
                     break;
@@ -1650,7 +1794,7 @@ int FileGDBIndexIterator::GetNextRow()
                 case FGFT_FLOAT32:
                 {
                     const float fVal =
-                        GetFloat32(abyPageFeature + nOffsetFirstValInPage,
+                        GetFloat32(abyPageFeature + m_nOffsetFirstValInPage,
                                    iCurFeatureInPage);
                     nComp = COMPARE(sValue.Real, fVal);
                     break;
@@ -1659,7 +1803,7 @@ int FileGDBIndexIterator::GetNextRow()
                 case FGFT_FLOAT64:
                 {
                     const double dfVal =
-                        GetFloat64(abyPageFeature + nOffsetFirstValInPage,
+                        GetFloat64(abyPageFeature + m_nOffsetFirstValInPage,
                                    iCurFeatureInPage);
                     nComp = COMPARE(sValue.Real, dfVal);
                     break;
@@ -1671,7 +1815,7 @@ int FileGDBIndexIterator::GetNextRow()
                 case FGFT_DATETIME_WITH_OFFSET:
                 {
                     const double dfVal =
-                        GetFloat64(abyPageFeature + nOffsetFirstValInPage,
+                        GetFloat64(abyPageFeature + m_nOffsetFirstValInPage,
                                    iCurFeatureInPage);
                     if (sValue.Real + 1e-10 < dfVal)
                         nComp = -1;
@@ -1686,12 +1830,16 @@ int FileGDBIndexIterator::GetNextRow()
                 {
                     GUInt16 asVal[MAX_CAR_COUNT_INDEXED_STR];
                     memcpy(asVal,
-                           abyPageFeature + nOffsetFirstValInPage +
+                           abyPageFeature + m_nOffsetFirstValInPage +
                                nStrLen * 2 * iCurFeatureInPage,
                            nStrLen * 2);
                     for (int j = 0; j < nStrLen; j++)
                         CPL_LSBPTR16(&asVal[j]);
-                    nComp = FileGDBUTF16StrCompare(asUTF16Str, asVal, nStrLen);
+                    // Note: we have an inconsistency. OGR SQL equality operator
+                    // is advertized to be case insensitive, but we have always
+                    // implemented FGSO_EQ as case sensitive.
+                    nComp = FileGDBUTF16StrCompare(asUTF16Str, asVal, nStrLen,
+                                                   eOp == FGSO_ILIKE);
                     break;
                 }
 
@@ -1699,7 +1847,7 @@ int FileGDBIndexIterator::GetNextRow()
                 case FGFT_GLOBALID:
                 {
                     nComp = memcmp(szUUID,
-                                   abyPageFeature + nOffsetFirstValInPage +
+                                   abyPageFeature + m_nOffsetFirstValInPage +
                                        UUID_LEN_AS_STRING * iCurFeatureInPage,
                                    UUID_LEN_AS_STRING);
                     break;
@@ -1708,7 +1856,7 @@ int FileGDBIndexIterator::GetNextRow()
                 case FGFT_INT64:
                 {
                     const int64_t nVal =
-                        GetInt64(abyPageFeature + nOffsetFirstValInPage,
+                        GetInt64(abyPageFeature + m_nOffsetFirstValInPage,
                                  iCurFeatureInPage);
                     nComp = COMPARE(sValue.Integer64, nVal);
                     break;
@@ -1743,6 +1891,7 @@ int FileGDBIndexIterator::GetNextRow()
                     break;
 
                 case FGSO_EQ:
+                case FGSO_ILIKE:
                     if (nComp < 0 && bAscending)
                     {
                         bEOF = true;
@@ -1759,7 +1908,7 @@ int FileGDBIndexIterator::GetNextRow()
                     bMatch = nComp < 0;
                     break;
 
-                default:
+                case FGSO_ISNOTNULL:
                     CPLAssert(false);
                     break;
             }
@@ -1767,17 +1916,21 @@ int FileGDBIndexIterator::GetNextRow()
 
         if (bMatch)
         {
-            const GUInt32 nFID =
-                GetUInt32(abyPageFeature + 12, iCurFeatureInPage);
+            const GUInt64 nFID =
+                m_nVersion == 1
+                    ? GetUInt32(abyPageFeature + m_nLeafPageHeaderSize,
+                                iCurFeatureInPage)
+                    : GetUInt64(abyPageFeature + m_nLeafPageHeaderSize,
+                                iCurFeatureInPage);
             if (bAscending)
                 iCurFeatureInPage++;
             else
                 iCurFeatureInPage--;
             returnErrorAndCleanupIf(
-                nFID < 1 || nFID > static_cast<GUInt32>(
+                nFID < 1 || nFID > static_cast<GUInt64>(
                                        poParent->GetTotalRecordCount()),
                 bEOF = true);
-            return static_cast<int>(nFID - 1);
+            return static_cast<int64_t>(nFID - 1);
         }
         else
         {
@@ -1801,14 +1954,15 @@ int FileGDBIndexIterator::SortRows()
     Reset();
     while (true)
     {
-        int nRow = GetNextRow();
+        int64_t nRow = GetNextRow();
         if (nRow < 0)
             break;
         if (nSortedCount == nSortedAlloc)
         {
             int nNewSortedAlloc = 4 * nSortedAlloc / 3 + 16;
-            int *panNewSortedRows = static_cast<int *>(VSI_REALLOC_VERBOSE(
-                panSortedRows, sizeof(int) * nNewSortedAlloc));
+            int64_t *panNewSortedRows =
+                static_cast<int64_t *>(VSI_REALLOC_VERBOSE(
+                    panSortedRows, sizeof(int64_t) * nNewSortedAlloc));
             if (panNewSortedRows == nullptr)
             {
                 nSortedCount = 0;
@@ -1822,8 +1976,8 @@ int FileGDBIndexIterator::SortRows()
     if (nSortedCount == 0)
         return FALSE;
     std::sort(panSortedRows, panSortedRows + nSortedCount);
-#ifdef nValueCountInIdx_reliable
-    if (eOp == FGSO_ISNOTNULL && (int)nValueCountInIdx != nSortedCount)
+#ifdef m_nValueCountInIdx_reliable
+    if (eOp == FGSO_ISNOTNULL && (int64_t)m_nValueCountInIdx != nSortedCount)
         PrintError();
 #endif
     return TRUE;
@@ -1833,7 +1987,7 @@ int FileGDBIndexIterator::SortRows()
 /*                        GetNextRowSortedByFID()                       */
 /************************************************************************/
 
-int FileGDBIndexIterator::GetNextRowSortedByFID()
+int64_t FileGDBIndexIterator::GetNextRowSortedByFID()
 {
     if (eOp == FGSO_EQ)
         return GetNextRow();
@@ -1857,21 +2011,21 @@ int FileGDBIndexIterator::GetNextRowSortedByFID()
 /*                           GetRowCount()                              */
 /************************************************************************/
 
-int FileGDBIndexIterator::GetRowCount()
+int64_t FileGDBIndexIterator::GetRowCount()
 {
-    // The nValueCountInIdx value has been found to be unreliable when the index
+    // The m_nValueCountInIdx value has been found to be unreliable when the index
     // is built as features are inserted (and when they are not in increasing
     // order) (with FileGDB SDK 1.3) So disable this optimization as there's no
     // fast way to know if the value is reliable or not.
-#ifdef nValueCountInIdx_reliable
+#ifdef m_nValueCountInIdx_reliable
     if (eOp == FGSO_ISNOTNULL)
-        return (int)nValueCountInIdx;
+        return (int64_t)m_nValueCountInIdx;
 #endif
 
     if (nSortedCount >= 0)
         return nSortedCount;
 
-    int nRowCount = 0;
+    int64_t nRowCount = 0;
     bool bSaveAscending = bAscending;
     bAscending = true; /* for a tiny bit of more efficiency */
     Reset();
@@ -1891,38 +2045,52 @@ const OGRField *FileGDBIndexIterator::GetMinMaxValue(OGRField *psField,
 {
     const OGRField *errorRetValue = nullptr;
     eOutType = -1;
-    if (nValueCountInIdx == 0)
+    if (m_nValueCountInIdx == 0)
         return nullptr;
 
-    GByte l_abyPage[FGDB_PAGE_SIZE];
-    GUInt32 nPage = 1;
+    std::vector<GByte> l_abyPageV;
+    try
+    {
+        l_abyPageV.resize(m_nPageSize);
+    }
+    catch (const std::exception &)
+    {
+        return nullptr;
+    }
+    GByte *l_abyPage = l_abyPageV.data();
+    uint64_t nPage = 1;
     for (GUInt32 iLevel = 0; iLevel < nIndexDepth - 1; iLevel++)
     {
-        VSIFSeekL(fpCurIdx,
-                  static_cast<vsi_l_offset>(nPage - 1) * FGDB_PAGE_SIZE,
+        VSIFSeekL(fpCurIdx, static_cast<vsi_l_offset>(nPage - 1) * m_nPageSize,
                   SEEK_SET);
 #ifdef DEBUG
         iLoadedPage[iLevel] = nPage;
 #endif
-        returnErrorIf(VSIFReadL(l_abyPage, FGDB_PAGE_SIZE, 1, fpCurIdx) != 1);
-        GUInt32 l_nSubPagesCount = GetUInt32(l_abyPage + 4, 0);
+        returnErrorIf(VSIFReadL(l_abyPage, m_nPageSize, 1, fpCurIdx) != 1);
+        GUInt32 l_nSubPagesCount = GetUInt32(l_abyPage + m_nObjectIDSize, 0);
         returnErrorIf(l_nSubPagesCount == 0 || l_nSubPagesCount > nMaxPerPages);
 
-        if (bIsMin)
-            nPage = GetUInt32(l_abyPage + 8, 0);
+        if (m_nVersion == 1)
+        {
+            nPage = GetUInt32(l_abyPage + m_nNonLeafPageHeaderSize,
+                              bIsMin ? 0 : l_nSubPagesCount);
+        }
         else
-            nPage = GetUInt32(l_abyPage + 8, l_nSubPagesCount);
+        {
+            nPage = GetUInt64(l_abyPage + m_nNonLeafPageHeaderSize,
+                              bIsMin ? 0 : l_nSubPagesCount);
+        }
         returnErrorIf(nPage < 2);
     }
 
-    VSIFSeekL(fpCurIdx, static_cast<vsi_l_offset>(nPage - 1) * FGDB_PAGE_SIZE,
+    VSIFSeekL(fpCurIdx, static_cast<vsi_l_offset>(nPage - 1) * m_nPageSize,
               SEEK_SET);
 #ifdef DEBUG
     iLoadedPage[nIndexDepth - 1] = nPage;
 #endif
-    returnErrorIf(VSIFReadL(l_abyPage, FGDB_PAGE_SIZE, 1, fpCurIdx) != 1);
+    returnErrorIf(VSIFReadL(l_abyPage, m_nPageSize, 1, fpCurIdx) != 1);
 
-    GUInt32 nFeatures = GetUInt32(l_abyPage + 4, 0);
+    GUInt32 nFeatures = GetUInt32(l_abyPage + m_nObjectIDSize, 0);
     returnErrorIf(nFeatures < 1 || nFeatures > nMaxPerPages);
 
     int iFeature = (bIsMin) ? 0 : nFeatures - 1;
@@ -1932,7 +2100,7 @@ const OGRField *FileGDBIndexIterator::GetMinMaxValue(OGRField *psField,
         case FGFT_INT16:
         {
             const GInt16 nVal =
-                GetInt16(l_abyPage + nOffsetFirstValInPage, iFeature);
+                GetInt16(l_abyPage + m_nOffsetFirstValInPage, iFeature);
             psField->Integer = nVal;
             eOutType = OFTInteger;
             return psField;
@@ -1941,7 +2109,7 @@ const OGRField *FileGDBIndexIterator::GetMinMaxValue(OGRField *psField,
         case FGFT_INT32:
         {
             const GInt32 nVal =
-                GetInt32(l_abyPage + nOffsetFirstValInPage, iFeature);
+                GetInt32(l_abyPage + m_nOffsetFirstValInPage, iFeature);
             psField->Integer = nVal;
             eOutType = OFTInteger;
             return psField;
@@ -1950,7 +2118,7 @@ const OGRField *FileGDBIndexIterator::GetMinMaxValue(OGRField *psField,
         case FGFT_FLOAT32:
         {
             const float fVal =
-                GetFloat32(l_abyPage + nOffsetFirstValInPage, iFeature);
+                GetFloat32(l_abyPage + m_nOffsetFirstValInPage, iFeature);
             psField->Real = fVal;
             eOutType = OFTReal;
             return psField;
@@ -1959,7 +2127,7 @@ const OGRField *FileGDBIndexIterator::GetMinMaxValue(OGRField *psField,
         case FGFT_FLOAT64:
         {
             const double dfVal =
-                GetFloat64(l_abyPage + nOffsetFirstValInPage, iFeature);
+                GetFloat64(l_abyPage + m_nOffsetFirstValInPage, iFeature);
             psField->Real = dfVal;
             eOutType = OFTReal;
             return psField;
@@ -1969,7 +2137,7 @@ const OGRField *FileGDBIndexIterator::GetMinMaxValue(OGRField *psField,
         case FGFT_DATETIME_WITH_OFFSET:
         {
             const double dfVal =
-                GetFloat64(l_abyPage + nOffsetFirstValInPage, iFeature);
+                GetFloat64(l_abyPage + m_nOffsetFirstValInPage, iFeature);
             FileGDBDoubleDateToOGRDate(dfVal, false, psField);
             eOutType = OFTDateTime;
             return psField;
@@ -1978,7 +2146,7 @@ const OGRField *FileGDBIndexIterator::GetMinMaxValue(OGRField *psField,
         case FGFT_DATE:
         {
             const double dfVal =
-                GetFloat64(l_abyPage + nOffsetFirstValInPage, iFeature);
+                GetFloat64(l_abyPage + m_nOffsetFirstValInPage, iFeature);
             FileGDBDoubleDateToOGRDate(dfVal, false, psField);
             eOutType = OFTDate;
             return psField;
@@ -1987,7 +2155,7 @@ const OGRField *FileGDBIndexIterator::GetMinMaxValue(OGRField *psField,
         case FGFT_TIME:
         {
             const double dfVal =
-                GetFloat64(l_abyPage + nOffsetFirstValInPage, iFeature);
+                GetFloat64(l_abyPage + m_nOffsetFirstValInPage, iFeature);
             FileGDBDoubleTimeToOGRTime(dfVal, psField);
             eOutType = OFTTime;
             return psField;
@@ -1999,7 +2167,7 @@ const OGRField *FileGDBIndexIterator::GetMinMaxValue(OGRField *psField,
             for (int j = 0; j < nStrLen; j++)
             {
                 GUInt16 nCh =
-                    GetUInt16(l_abyPage + nOffsetFirstValInPage +
+                    GetUInt16(l_abyPage + m_nOffsetFirstValInPage +
                                   nStrLen * sizeof(GUInt16) * iFeature,
                               j);
                 awsVal[j] = nCh;
@@ -2021,7 +2189,7 @@ const OGRField *FileGDBIndexIterator::GetMinMaxValue(OGRField *psField,
         case FGFT_GLOBALID:
         {
             memcpy(psField->String,
-                   l_abyPage + nOffsetFirstValInPage +
+                   l_abyPage + m_nOffsetFirstValInPage +
                        UUID_LEN_AS_STRING * iFeature,
                    UUID_LEN_AS_STRING);
             psField->String[UUID_LEN_AS_STRING] = 0;
@@ -2032,7 +2200,7 @@ const OGRField *FileGDBIndexIterator::GetMinMaxValue(OGRField *psField,
         case FGFT_INT64:
         {
             const int64_t nVal =
-                GetInt64(l_abyPage + nOffsetFirstValInPage, iFeature);
+                GetInt64(l_abyPage + m_nOffsetFirstValInPage, iFeature);
             psField->Integer64 = nVal;
             eOutType = OFTInteger64;
             return psField;
@@ -2140,7 +2308,7 @@ void FileGDBIndexIterator::GetMinMaxSumCount(double &dfMin, double &dfMax,
             }
         }
 
-        dfVal = Getter::GetAsDouble(abyPageFeature + nOffsetFirstValInPage,
+        dfVal = Getter::GetAsDouble(abyPageFeature + m_nOffsetFirstValInPage,
                                     iCurFeatureInPage);
 
         dfLocalSum += dfVal;
@@ -2155,10 +2323,10 @@ void FileGDBIndexIterator::GetMinMaxSumCount(double &dfMin, double &dfMax,
     dfMax = dfVal;
 }
 
-int FileGDBIndexIterator::GetMinMaxSumCount(double &dfMin, double &dfMax,
-                                            double &dfSum, int &nCount)
+bool FileGDBIndexIterator::GetMinMaxSumCount(double &dfMin, double &dfMax,
+                                             double &dfSum, int &nCount)
 {
-    const int errorRetValue = FALSE;
+    const bool errorRetValue = false;
     dfMin = 0.0;
     dfMax = 0.0;
     dfSum = 0.0;
@@ -2213,7 +2381,7 @@ int FileGDBIndexIterator::GetMinMaxSumCount(double &dfMin, double &dfMax,
     bAscending = bSaveAscending;
     Reset();
 
-    return TRUE;
+    return true;
 }
 
 /************************************************************************/
@@ -2225,7 +2393,7 @@ class FileGDBSpatialIndexIteratorImpl final : public FileGDBIndexIteratorBase,
 {
     OGREnvelope m_sFilterEnvelope;
     bool m_bHasBuiltSetFID = false;
-    std::vector<int> m_oFIDVector{};
+    std::vector<int64_t> m_oFIDVector{};
     size_t m_nVectorIdx = 0;
     int m_nGridNo = 0;
     GInt64 m_nMinVal = 0;
@@ -2233,7 +2401,7 @@ class FileGDBSpatialIndexIteratorImpl final : public FileGDBIndexIteratorBase,
     GInt32 m_nCurX = 0;
     GInt32 m_nMaxX = 0;
 
-    virtual bool FindPages(int iLevel, int nPage) override;
+    virtual bool FindPages(int iLevel, uint64_t nPage) override;
     int GetNextRow();
     bool ReadNewXRange();
     bool ResetInternal();
@@ -2252,7 +2420,7 @@ class FileGDBSpatialIndexIteratorImpl final : public FileGDBIndexIteratorBase,
         return poParent;
     }  // avoid MSVC C4250 inherits via dominance warning
 
-    virtual int GetNextRowSortedByFID() override;
+    virtual int64_t GetNextRowSortedByFID() override;
     virtual void Reset() override;
 
     virtual bool SetEnvelope(const OGREnvelope &sFilterEnvelope) override;
@@ -2426,7 +2594,7 @@ bool FileGDBSpatialIndexIteratorImpl::ReadNewXRange()
     }
 
     const bool errorRetValue = false;
-    if (nValueCountInIdx > 0)
+    if (m_nValueCountInIdx > 0)
     {
         if (nIndexDepth == 1)
         {
@@ -2500,7 +2668,7 @@ static bool FindMinMaxIdx(const GByte *pBaseAddr, const int nVals,
 /*                             FindPages()                              */
 /************************************************************************/
 
-bool FileGDBSpatialIndexIteratorImpl::FindPages(int iLevel, int nPage)
+bool FileGDBSpatialIndexIteratorImpl::FindPages(int iLevel, uint64_t nPage)
 {
     const bool errorRetValue = false;
 
@@ -2510,7 +2678,7 @@ bool FileGDBSpatialIndexIteratorImpl::FindPages(int iLevel, int nPage)
         m_oCachePage[iLevel].getPtr(nPage);
     if (cachedPagePtr)
     {
-        memcpy(abyPage[iLevel], cachedPagePtr->data(), FGDB_PAGE_SIZE);
+        memcpy(abyPage[iLevel], cachedPagePtr->data(), m_nPageSize);
     }
     else
     {
@@ -2521,35 +2689,46 @@ bool FileGDBSpatialIndexIteratorImpl::FindPages(int iLevel, int nPage)
             cachedPage.clear();
         }
 
-        VSIFSeekL(fpCurIdx,
-                  static_cast<vsi_l_offset>(nPage - 1) * FGDB_PAGE_SIZE,
+        VSIFSeekL(fpCurIdx, static_cast<vsi_l_offset>(nPage - 1) * m_nPageSize,
                   SEEK_SET);
 #ifdef DEBUG
         iLoadedPage[iLevel] = nPage;
 #endif
-        returnErrorIf(VSIFReadL(abyPage[iLevel], FGDB_PAGE_SIZE, 1, fpCurIdx) !=
+        returnErrorIf(VSIFReadL(abyPage[iLevel], m_nPageSize, 1, fpCurIdx) !=
                       1);
         cachedPage.insert(cachedPage.end(), abyPage[iLevel],
-                          abyPage[iLevel] + FGDB_PAGE_SIZE);
+                          abyPage[iLevel] + m_nPageSize);
         m_oCachePage[iLevel].insert(nPage, std::move(cachedPage));
     }
 
-    nSubPagesCount[iLevel] = GetUInt32(abyPage[iLevel] + 4, 0);
+    nSubPagesCount[iLevel] = GetUInt32(abyPage[iLevel] + m_nObjectIDSize, 0);
     returnErrorIf(nSubPagesCount[iLevel] == 0 ||
                   nSubPagesCount[iLevel] > nMaxPerPages);
 
-    if (GetInt64(abyPage[iLevel] + nOffsetFirstValInPage, 0) > m_nMaxVal)
+    if (GetInt64(abyPage[iLevel] + m_nOffsetFirstValInPage, 0) > m_nMaxVal)
     {
         iFirstPageIdx[iLevel] = 0;
-        // nSubPagesCount[iLevel] == 1 && GetUInt32(abyPage[iLevel] + 12, 0) ==
+        // nSubPagesCount[iLevel] == 1 && GetUInt32(abyPage[iLevel] + m_nLeafPageHeaderSize, 0) ==
         // 0 should only happen on non-nominal cases where one forces the depth
         // of the index to be greater than needed.
-        iLastPageIdx[iLevel] = (nSubPagesCount[iLevel] == 1 &&
-                                GetUInt32(abyPage[iLevel] + 12, 0) == 0)
-                                   ? 0
-                                   : 1;
+        if (m_nVersion == 1)
+        {
+            iLastPageIdx[iLevel] =
+                (nSubPagesCount[iLevel] == 1 &&
+                 GetUInt32(abyPage[iLevel] + m_nLeafPageHeaderSize, 0) == 0)
+                    ? 0
+                    : 1;
+        }
+        else
+        {
+            iLastPageIdx[iLevel] =
+                (nSubPagesCount[iLevel] == 1 &&
+                 GetUInt64(abyPage[iLevel] + m_nLeafPageHeaderSize, 0) == 0)
+                    ? 0
+                    : 1;
+        }
     }
-    else if (!FindMinMaxIdx(abyPage[iLevel] + nOffsetFirstValInPage,
+    else if (!FindMinMaxIdx(abyPage[iLevel] + m_nOffsetFirstValInPage,
                             static_cast<int>(nSubPagesCount[iLevel]), m_nMinVal,
                             m_nMaxVal, iFirstPageIdx[iLevel],
                             iLastPageIdx[iLevel]))
@@ -2582,7 +2761,7 @@ int FileGDBSpatialIndexIteratorImpl::GetNextRow()
             int nMinIdx = 0;
             int nMaxIdx = 0;
             if (!LoadNextFeaturePage() ||
-                !FindMinMaxIdx(abyPageFeature + nOffsetFirstValInPage,
+                !FindMinMaxIdx(abyPageFeature + m_nOffsetFirstValInPage,
                                nFeaturesInPage, m_nMinVal, m_nMaxVal, nMinIdx,
                                nMaxIdx) ||
                 nMinIdx > nMaxIdx)
@@ -2623,17 +2802,21 @@ int FileGDBSpatialIndexIteratorImpl::GetNextRow()
         }
 
 #ifdef DEBUG
-        const GInt64 nVal =
-            GetInt64(abyPageFeature + nOffsetFirstValInPage, iCurFeatureInPage);
+        const GInt64 nVal = GetInt64(abyPageFeature + m_nOffsetFirstValInPage,
+                                     iCurFeatureInPage);
         CPL_IGNORE_RET_VAL(nVal);
         CPLAssert(nVal >= m_nMinVal && nVal <= m_nMaxVal);
 #endif
 
-        const GUInt32 nFID = GetUInt32(abyPageFeature + 12, iCurFeatureInPage);
+        const GUInt64 nFID =
+            m_nVersion == 1 ? GetUInt32(abyPageFeature + m_nLeafPageHeaderSize,
+                                        iCurFeatureInPage)
+                            : GetUInt64(abyPageFeature + m_nLeafPageHeaderSize,
+                                        iCurFeatureInPage);
         iCurFeatureInPage++;
         returnErrorAndCleanupIf(
             nFID < 1 ||
-                nFID > static_cast<GUInt32>(poParent->GetTotalRecordCount()),
+                nFID > static_cast<GUInt64>(poParent->GetTotalRecordCount()),
             bEOF = true);
         return static_cast<int>(nFID - 1);
     }
@@ -2673,7 +2856,7 @@ void FileGDBSpatialIndexIteratorImpl::Reset()
 /*                        GetNextRowSortedByFID()                       */
 /************************************************************************/
 
-int FileGDBSpatialIndexIteratorImpl::GetNextRowSortedByFID()
+int64_t FileGDBSpatialIndexIteratorImpl::GetNextRowSortedByFID()
 {
     if (m_nVectorIdx == 0)
     {
@@ -2684,7 +2867,7 @@ int FileGDBSpatialIndexIteratorImpl::GetNextRowSortedByFID()
             // than using a unordered_set (or set)
             while (true)
             {
-                const int nFID = GetNextRow();
+                const auto nFID = GetNextRow();
                 if (nFID < 0)
                     break;
                 m_oFIDVector.push_back(nFID);
@@ -2694,16 +2877,16 @@ int FileGDBSpatialIndexIteratorImpl::GetNextRowSortedByFID()
 
         if (m_oFIDVector.empty())
             return -1;
-        const int nFID = m_oFIDVector[m_nVectorIdx];
+        const auto nFID = m_oFIDVector[m_nVectorIdx];
         ++m_nVectorIdx;
         return nFID;
     }
 
-    const int nLastFID = m_oFIDVector[m_nVectorIdx - 1];
+    const auto nLastFID = m_oFIDVector[m_nVectorIdx - 1];
     while (m_nVectorIdx < m_oFIDVector.size())
     {
         // Do not return consecutive identical FID
-        const int nFID = m_oFIDVector[m_nVectorIdx];
+        const auto nFID = m_oFIDVector[m_nVectorIdx];
         ++m_nVectorIdx;
         if (nFID == nLastFID)
         {
diff --git a/ogr/ogrsf_frmts/openfilegdb/filegdbindex_write.cpp b/ogr/ogrsf_frmts/openfilegdb/filegdbindex_write.cpp
index fb477682c525..242d431fcb73 100644
--- a/ogr/ogrsf_frmts/openfilegdb/filegdbindex_write.cpp
+++ b/ogr/ogrsf_frmts/openfilegdb/filegdbindex_write.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -163,6 +147,7 @@ bool FileGDBTable::CreateIndex(const std::string &osIndexName,
         return false;
     }
 
+    GetIndexCount();
     for (const auto &poIndex : m_apoIndexes)
     {
         if (EQUAL(poIndex->GetIndexName().c_str(), osIndexName.c_str()))
@@ -305,7 +290,7 @@ void FileGDBTable::ComputeOptimalSpatialIndexGridResolution()
     {
         // For point, use the density as the grid resolution
         int nValid = 0;
-        for (int iCurFeat = 0; iCurFeat < m_nTotalRecordCount; ++iCurFeat)
+        for (int64_t iCurFeat = 0; iCurFeat < m_nTotalRecordCount; ++iCurFeat)
         {
             iCurFeat = GetAndSelectNextNonEmptyRow(iCurFeat);
             if (iCurFeat < 0)
@@ -349,7 +334,7 @@ void FileGDBTable::ComputeOptimalSpatialIndexGridResolution()
         int64_t nValid = 0;
         auto poGeomConverter = std::unique_ptr<FileGDBOGRGeometryConverter>(
             FileGDBOGRGeometryConverter::BuildConverter(poGeomField));
-        for (int iCurFeat = 0; iCurFeat < m_nTotalRecordCount; ++iCurFeat)
+        for (int64_t iCurFeat = 0; iCurFeat < m_nTotalRecordCount; ++iCurFeat)
         {
             iCurFeat = GetAndSelectNextNonEmptyRow(iCurFeat);
             if (iCurFeat < 0)
@@ -403,7 +388,7 @@ void FileGDBTable::ComputeOptimalSpatialIndexGridResolution()
         // of all geometries
         double dfMaxSize = 0;
         OGREnvelope sEnvelope;
-        for (int iCurFeat = 0; iCurFeat < m_nTotalRecordCount; ++iCurFeat)
+        for (int64_t iCurFeat = 0; iCurFeat < m_nTotalRecordCount; ++iCurFeat)
         {
             iCurFeat = GetAndSelectNextNonEmptyRow(iCurFeat);
             if (iCurFeat < 0)
@@ -847,7 +832,7 @@ bool FileGDBTable::CreateSpatialIndex()
     }
     auto poGeomConverter = std::unique_ptr<FileGDBOGRGeometryConverter>(
         FileGDBOGRGeometryConverter::BuildConverter(poGeomField));
-    typedef std::pair<int64_t, int> ValueOIDPair;
+    typedef std::pair<int64_t, int64_t> ValueOIDPair;
     std::vector<ValueOIDPair> asValues;
 
     const double dfGridStep = m_adfSpatialIndexGridResolution.back();
@@ -1159,11 +1144,11 @@ bool FileGDBTable::CreateSpatialIndex()
     };
 
     std::vector<int64_t> aSetValues;
-    int iLastReported = 0;
+    int64_t iLastReported = 0;
     const auto nReportIncrement = m_nTotalRecordCount / 20;
     try
     {
-        for (int iCurFeat = 0; iCurFeat < m_nTotalRecordCount; ++iCurFeat)
+        for (int64_t iCurFeat = 0; iCurFeat < m_nTotalRecordCount; ++iCurFeat)
         {
             if (m_nTotalRecordCount > 10000 &&
                 (iCurFeat + 1 == m_nTotalRecordCount ||
@@ -1343,9 +1328,10 @@ bool FileGDBTable::CreateAttributeIndex(const FileGDBIndex *poIndex)
         const auto eFieldType = m_apoFields[iField]->GetType();
         if (eFieldType == FGFT_INT16)
         {
-            typedef std::pair<int16_t, int> ValueOIDPair;
+            typedef std::pair<int16_t, int64_t> ValueOIDPair;
             std::vector<ValueOIDPair> asValues;
-            for (int iCurFeat = 0; iCurFeat < m_nTotalRecordCount; ++iCurFeat)
+            for (int64_t iCurFeat = 0; iCurFeat < m_nTotalRecordCount;
+                 ++iCurFeat)
             {
                 iCurFeat = GetAndSelectNextNonEmptyRow(iCurFeat);
                 if (iCurFeat < 0)
@@ -1368,9 +1354,10 @@ bool FileGDBTable::CreateAttributeIndex(const FileGDBIndex *poIndex)
         }
         else if (eFieldType == FGFT_INT32)
         {
-            typedef std::pair<int32_t, int> ValueOIDPair;
+            typedef std::pair<int32_t, int64_t> ValueOIDPair;
             std::vector<ValueOIDPair> asValues;
-            for (int iCurFeat = 0; iCurFeat < m_nTotalRecordCount; ++iCurFeat)
+            for (int64_t iCurFeat = 0; iCurFeat < m_nTotalRecordCount;
+                 ++iCurFeat)
             {
                 iCurFeat = GetAndSelectNextNonEmptyRow(iCurFeat);
                 if (iCurFeat < 0)
@@ -1393,9 +1380,10 @@ bool FileGDBTable::CreateAttributeIndex(const FileGDBIndex *poIndex)
         }
         else if (eFieldType == FGFT_INT64)
         {
-            typedef std::pair<int64_t, int> ValueOIDPair;
+            typedef std::pair<int64_t, int64_t> ValueOIDPair;
             std::vector<ValueOIDPair> asValues;
-            for (int iCurFeat = 0; iCurFeat < m_nTotalRecordCount; ++iCurFeat)
+            for (int64_t iCurFeat = 0; iCurFeat < m_nTotalRecordCount;
+                 ++iCurFeat)
             {
                 iCurFeat = GetAndSelectNextNonEmptyRow(iCurFeat);
                 if (iCurFeat < 0)
@@ -1418,9 +1406,10 @@ bool FileGDBTable::CreateAttributeIndex(const FileGDBIndex *poIndex)
         }
         else if (eFieldType == FGFT_FLOAT32)
         {
-            typedef std::pair<float, int> ValueOIDPair;
+            typedef std::pair<float, int64_t> ValueOIDPair;
             std::vector<ValueOIDPair> asValues;
-            for (int iCurFeat = 0; iCurFeat < m_nTotalRecordCount; ++iCurFeat)
+            for (int64_t iCurFeat = 0; iCurFeat < m_nTotalRecordCount;
+                 ++iCurFeat)
             {
                 iCurFeat = GetAndSelectNextNonEmptyRow(iCurFeat);
                 if (iCurFeat < 0)
@@ -1444,11 +1433,12 @@ bool FileGDBTable::CreateAttributeIndex(const FileGDBIndex *poIndex)
                  eFieldType == FGFT_DATE || eFieldType == FGFT_TIME ||
                  eFieldType == FGFT_DATETIME_WITH_OFFSET)
         {
-            typedef std::pair<double, int> ValueOIDPair;
+            typedef std::pair<double, int64_t> ValueOIDPair;
             std::vector<ValueOIDPair> asValues;
             // Hack to force reading DateTime as double
             m_apoFields[iField]->m_bReadAsDouble = true;
-            for (int iCurFeat = 0; iCurFeat < m_nTotalRecordCount; ++iCurFeat)
+            for (int64_t iCurFeat = 0; iCurFeat < m_nTotalRecordCount;
+                 ++iCurFeat)
             {
                 iCurFeat = GetAndSelectNextNonEmptyRow(iCurFeat);
                 if (iCurFeat < 0)
@@ -1471,13 +1461,14 @@ bool FileGDBTable::CreateAttributeIndex(const FileGDBIndex *poIndex)
         }
         else if (eFieldType == FGFT_STRING)
         {
-            typedef std::pair<std::vector<std::uint16_t>, int> ValueOIDPair;
+            typedef std::pair<std::vector<std::uint16_t>, int64_t> ValueOIDPair;
             std::vector<ValueOIDPair> asValues;
             bRet = true;
             const bool bIsLower =
                 STARTS_WITH_CI(poIndex->GetExpression().c_str(), "LOWER(");
             int maxStrSize = 0;
-            for (int iCurFeat = 0; iCurFeat < m_nTotalRecordCount; ++iCurFeat)
+            for (int64_t iCurFeat = 0; iCurFeat < m_nTotalRecordCount;
+                 ++iCurFeat)
             {
                 iCurFeat = GetAndSelectNextNonEmptyRow(iCurFeat);
                 if (iCurFeat < 0)
diff --git a/ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp b/ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp
index a4a7a235891c..ca13652339e5 100644
--- a/ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp
+++ b/ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp
@@ -7,29 +7,16 @@
  ******************************************************************************
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
 #include "filegdbtable.h"
 
 #include <algorithm>
+#include <cassert>
+#include <cinttypes>
+#include <cmath>
 #include <errno.h>
 #include <limits.h>
 #include <stddef.h>
@@ -569,45 +556,55 @@ bool FileGDBTable::GuessFeatureLocations()
         }
     }
 
-    int nInvalidRecords = 0;
-    while (nOffset < m_nFileSize)
+    int64_t nInvalidRecords = 0;
+    try
     {
-        GUInt32 nSize;
-        int bDeletedRecord;
-        if (!IsLikelyFeatureAtOffset(nOffset, &nSize, &bDeletedRecord))
-        {
-            nOffset++;
-        }
-        else
+        while (nOffset < m_nFileSize)
         {
-            /*CPLDebug("OpenFileGDB", "Feature found at offset %d (size = %d)",
-                     nOffset, nSize);*/
-            if (bDeletedRecord)
+            GUInt32 nSize;
+            int bDeletedRecord;
+            if (!IsLikelyFeatureAtOffset(nOffset, &nSize, &bDeletedRecord))
+            {
+                nOffset++;
+            }
+            else
             {
-                if (bReportDeletedFeatures)
+                /*CPLDebug("OpenFileGDB", "Feature found at offset %d (size = %d)",
+                         nOffset, nSize);*/
+                if (bDeletedRecord)
                 {
-                    m_bHasDeletedFeaturesListed = TRUE;
-                    m_anFeatureOffsets.push_back(MARK_DELETED(nOffset));
+                    if (bReportDeletedFeatures)
+                    {
+                        m_bHasDeletedFeaturesListed = TRUE;
+                        m_anFeatureOffsets.push_back(MARK_DELETED(nOffset));
+                    }
+                    else
+                    {
+                        nInvalidRecords++;
+                        m_anFeatureOffsets.push_back(0);
+                    }
                 }
                 else
-                {
-                    nInvalidRecords++;
-                    m_anFeatureOffsets.push_back(0);
-                }
+                    m_anFeatureOffsets.push_back(nOffset);
+                nOffset += nSize;
             }
-            else
-                m_anFeatureOffsets.push_back(nOffset);
-            nOffset += nSize;
         }
     }
-    m_nTotalRecordCount = static_cast<int>(m_anFeatureOffsets.size());
+    catch (const std::bad_alloc &)
+    {
+        CPLError(CE_Failure, CPLE_OutOfMemory,
+                 "Out of memory in FileGDBTable::GuessFeatureLocations()");
+        return false;
+    }
+    m_nTotalRecordCount = static_cast<int64_t>(m_anFeatureOffsets.size());
     if (m_nTotalRecordCount - nInvalidRecords > m_nValidRecordCount)
     {
         if (!m_bHasDeletedFeaturesListed)
         {
             CPLError(CE_Warning, CPLE_AppDefined,
-                     "More features found (%d) than declared number of valid "
-                     "features (%d). "
+                     "More features found (%" PRId64
+                     ") than declared number of valid "
+                     "features ((%" PRId64 "). "
                      "So deleted features will likely be reported.",
                      m_nTotalRecordCount - nInvalidRecords,
                      m_nValidRecordCount);
@@ -619,16 +616,26 @@ bool FileGDBTable::GuessFeatureLocations()
 }
 
 /************************************************************************/
-/*                            ReadTableXHeader()                        */
+/*                           ReadTableXHeaderV3()                       */
 /************************************************************************/
 
-int FileGDBTable::ReadTableXHeader()
+bool FileGDBTable::ReadTableXHeaderV3()
 {
-    const int errorRetValue = FALSE;
+    const bool errorRetValue = false;
     GByte abyHeader[16];
 
     // Read .gdbtablx file header
     returnErrorIf(VSIFReadL(abyHeader, 16, 1, m_fpTableX) != 1);
+
+    const int nGDBTablxVersion = GetUInt32(abyHeader, 0);
+    if (nGDBTablxVersion != static_cast<int>(m_eGDBTableVersion))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 ".gdbtablx version is %d whereas it should be %d",
+                 nGDBTablxVersion, static_cast<int>(m_eGDBTableVersion));
+        return false;
+    }
+
     m_n1024BlocksPresent = GetUInt32(abyHeader + 4, 0);
 
     m_nTotalRecordCount = GetInt32(abyHeader + 8, 0);
@@ -697,7 +704,104 @@ int FileGDBTable::ReadTableXHeader()
             returnErrorIf(nCountBlocks != m_n1024BlocksPresent);
         }
     }
-    return TRUE;
+    return true;
+}
+
+/************************************************************************/
+/*                           ReadTableXHeaderV4()                       */
+/************************************************************************/
+
+bool FileGDBTable::ReadTableXHeaderV4()
+{
+    const bool errorRetValue = false;
+    GByte abyHeader[16];
+
+    // Read .gdbtablx file header
+    returnErrorIf(VSIFReadL(abyHeader, 16, 1, m_fpTableX) != 1);
+
+    const int nGDBTablxVersion = GetUInt32(abyHeader, 0);
+    if (nGDBTablxVersion != static_cast<int>(m_eGDBTableVersion))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 ".gdbtablx version is %d whereas it should be %d",
+                 nGDBTablxVersion, static_cast<int>(m_eGDBTableVersion));
+        return false;
+    }
+
+    m_n1024BlocksPresent = GetUInt64(abyHeader + 4, 0);
+
+    m_nTablxOffsetSize = GetUInt32(abyHeader + 12, 0);
+    returnErrorIf(m_nTablxOffsetSize < 4 || m_nTablxOffsetSize > 6);
+
+    returnErrorIf(m_n1024BlocksPresent >
+                  (std::numeric_limits<vsi_l_offset>::max() - 16) /
+                      (m_nTablxOffsetSize * 1024));
+
+    m_nOffsetTableXTrailer =
+        16 + m_nTablxOffsetSize * 1024 *
+                 static_cast<vsi_l_offset>(m_n1024BlocksPresent);
+    if (m_n1024BlocksPresent != 0)
+    {
+        GByte abyTrailer[12];
+
+        VSIFSeekL(m_fpTableX, m_nOffsetTableXTrailer, SEEK_SET);
+        returnErrorIf(VSIFReadL(abyTrailer, 12, 1, m_fpTableX) != 1);
+
+        m_nTotalRecordCount = GetUInt64(abyTrailer, 0);
+
+        // Cf https://github.com/rouault/dump_gdbtable/wiki/FGDB-Spec#trailing-section-16-bytes--variable-number-
+        // for all below magic numbers and byte sequences
+        GUInt32 nSizeBitmapSection = GetUInt32(abyTrailer + 8, 0);
+        if (nSizeBitmapSection == 0)
+        {
+            // no bitmap. Fine
+        }
+        else if (nSizeBitmapSection == 22 + 32768 + 52 &&
+                 m_nTotalRecordCount <= 32768 * 1024 * 8)
+        {
+            try
+            {
+                std::vector<GByte> abyBitmapSection(nSizeBitmapSection);
+                returnErrorIf(VSIFReadL(abyBitmapSection.data(),
+                                        abyBitmapSection.size(), 1,
+                                        m_fpTableX) != 1);
+                if (memcmp(abyBitmapSection.data(), "\x01\x00\x01\x00\x00\x00",
+                           6) == 0 &&
+                    memcmp(abyBitmapSection.data() + 22 + 32768,
+                           "\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
+                           12) == 0)
+                {
+                    m_abyTablXBlockMap.insert(
+                        m_abyTablXBlockMap.end(), abyBitmapSection.data() + 22,
+                        abyBitmapSection.data() + 22 + 32768);
+                }
+                else
+                {
+                    m_bReliableObjectID = false;
+                }
+            }
+            catch (const std::exception &e)
+            {
+                CPLError(CE_Failure, CPLE_OutOfMemory,
+                         "Cannot allocate m_abyTablXBlockMap: %s", e.what());
+                return false;
+            }
+        }
+        else
+        {
+            m_bReliableObjectID = false;
+        }
+        if (!m_bReliableObjectID)
+        {
+            m_nTotalRecordCount = 1024 * m_n1024BlocksPresent;
+            CPLError(CE_Warning, CPLE_AppDefined,
+                     "Due to partial reverse engineering of the format, "
+                     "ObjectIDs will not be accurate and attribute and spatial "
+                     "indices cannot be used on %s",
+                     m_osFilenameWithLayerName.c_str());
+        }
+    }
+    return true;
 }
 
 /************************************************************************/
@@ -713,7 +817,7 @@ bool FileGDBTable::Open(const char *pszFilename, bool bUpdate,
     m_bUpdate = bUpdate;
 
     m_osFilename = pszFilename;
-    CPLString m_osFilenameWithLayerName(m_osFilename);
+    m_osFilenameWithLayerName = m_osFilename;
     if (pszLayerName)
         m_osFilenameWithLayerName += CPLSPrintf(" (layer %s)", pszLayerName);
 
@@ -725,11 +829,44 @@ bool FileGDBTable::Open(const char *pszFilename, bool bUpdate,
         return false;
     }
 
-    // Read .gdtable file header
+    // Read .gdbtable file header
     GByte abyHeader[40];
     returnErrorIf(VSIFReadL(abyHeader, 40, 1, m_fpTable) != 1);
-    m_nValidRecordCount = GetInt32(abyHeader + 4, 0);
-    returnErrorIf(m_nValidRecordCount < 0);
+
+    int nGDBTableVersion = GetInt32(abyHeader, 0);
+    if (nGDBTableVersion == 3)
+    {
+        m_eGDBTableVersion = GDBTableVersion::V3;
+    }
+    else if (nGDBTableVersion == 4)
+    {
+        m_eGDBTableVersion = GDBTableVersion::V4;
+        if (m_bUpdate)
+        {
+            CPLError(CE_Failure, CPLE_NotSupported,
+                     "Version 4 of the FileGeodatabase format is not supported "
+                     "for update.");
+            return false;
+        }
+    }
+    else
+    {
+        CPLError(CE_Failure, CPLE_NotSupported,
+                 "Version %u of the FileGeodatabase format is not supported.",
+                 nGDBTableVersion);
+        return false;
+    }
+
+    if (m_eGDBTableVersion == GDBTableVersion::V3)
+    {
+        m_nValidRecordCount = GetInt32(abyHeader + 4, 0);
+        returnErrorIf(m_nValidRecordCount < 0);
+    }
+    else
+    {
+        m_nValidRecordCount = GetInt64(abyHeader + 16, 0);
+        returnErrorIf(m_nValidRecordCount < 0);
+    }
 
     m_nHeaderBufferMaxSize = GetInt32(abyHeader + 8, 0);
 
@@ -765,7 +902,11 @@ bool FileGDBTable::Open(const char *pszFilename, bool bUpdate,
                 returnErrorIf(m_fpTableX == nullptr);
             }
         }
-        else if (!ReadTableXHeader())
+        else if (m_eGDBTableVersion == GDBTableVersion::V3 &&
+                 !ReadTableXHeaderV3())
+            return false;
+        else if (m_eGDBTableVersion == GDBTableVersion::V4 &&
+                 !ReadTableXHeaderV4())
             return false;
     }
 
@@ -778,8 +919,8 @@ bool FileGDBTable::Open(const char *pszFilename, bool bUpdate,
             {
                 /* Potentially unsafe. See #5842 */
                 CPLDebug("OpenFileGDB",
-                         "%s: nTotalRecordCount (was %d) forced to "
-                         "nValidRecordCount=%d",
+                         "%s: nTotalRecordCount (was %" PRId64 ") forced to "
+                         "nValidRecordCount=%" PRId64,
                          m_osFilenameWithLayerName.c_str(), m_nTotalRecordCount,
                          m_nValidRecordCount);
                 m_nTotalRecordCount = m_nValidRecordCount;
@@ -789,8 +930,10 @@ bool FileGDBTable::Open(const char *pszFilename, bool bUpdate,
                 /* By default err on the safe side */
                 CPLError(
                     CE_Warning, CPLE_AppDefined,
-                    "File %s declares %d valid records, but %s declares "
-                    "only %d total records. Using that later value for safety "
+                    "File %s declares %" PRId64
+                    " valid records, but %s declares "
+                    "only %" PRId64
+                    " total records. Using that later value for safety "
                     "(this possibly ignoring features). "
                     "You can also try setting OPENFILEGDB_IGNORE_GDBTABLX=YES "
                     "to "
@@ -809,7 +952,8 @@ bool FileGDBTable::Open(const char *pszFilename, bool bUpdate,
         else if (m_nTotalRecordCount != m_nValidRecordCount)
         {
             CPLDebug("OpenFileGDB",
-                     "%s: nTotalRecordCount=%d nValidRecordCount=%d",
+                     "%s: nTotalRecordCount=%" PRId64
+                     " nValidRecordCount=%" PRId64,
                      pszFilename, m_nTotalRecordCount, m_nValidRecordCount);
         }
 #endif
@@ -836,18 +980,19 @@ bool FileGDBTable::Open(const char *pszFilename, bool bUpdate,
     returnErrorIf(VSIFReadL(abyHeader, 14, 1, m_fpTable) != 1);
     m_nFieldDescLength = GetUInt32(abyHeader, 0);
 
-    const auto nVersion = GetUInt32(abyHeader + 4, 0);
-    // nVersion == 6 is used in table arcgis_pro_32_types.gdb/a0000000b.gdbtable (big_int)
+    const auto nSecondaryHeaderVersion = GetUInt32(abyHeader + 4, 0);
+    // nSecondaryHeaderVersion == 6 is used in table arcgis_pro_32_types.gdb/a0000000b.gdbtable (big_int)
     // Not sure why...
-    if (m_bUpdate && nVersion != 4 && nVersion != 6)  // FileGDB v10
+    if (m_bUpdate && nSecondaryHeaderVersion != 4 &&
+        nSecondaryHeaderVersion != 6)  // FileGDB v10
     {
         CPLError(CE_Failure, CPLE_NotSupported,
-                 "Version %u of the FileGeodatabase format is not supported "
-                 "for update.",
-                 nVersion);
+                 "Version %u of the secondary header of the FileGeodatabase "
+                 "format is not supported for update.",
+                 nSecondaryHeaderVersion);
         return false;
     }
-    m_bIsV9 = (nVersion == 3);
+    m_bIsV9 = (nSecondaryHeaderVersion == 3);
 
     returnErrorIf(m_nOffsetFieldDesc >
                   std::numeric_limits<GUIntBig>::max() - m_nFieldDescLength);
@@ -965,7 +1110,7 @@ bool FileGDBTable::Open(const char *pszFilename, bool bUpdate,
 
             OGRField sDefault;
             OGR_RawField_SetUnset(&sDefault);
-            if ((flags & 4) != 0)
+            if (flags & FileGDBField::MASK_EDITABLE)
             {
                 /* Default value */
                 /* Found on PreNIS.gdb/a0000000d.gdbtable */
@@ -1043,7 +1188,7 @@ bool FileGDBTable::Open(const char *pszFilename, bool bUpdate,
 
             if (eType == FGFT_OBJECTID)
             {
-                returnErrorIf(flags != 2);
+                returnErrorIf(flags != FileGDBField::MASK_REQUIRED);
                 returnErrorIf(m_iObjectIdField >= 0);
                 m_iObjectIdField = static_cast<int>(m_apoFields.size());
             }
@@ -1052,7 +1197,9 @@ bool FileGDBTable::Open(const char *pszFilename, bool bUpdate,
             poField->m_osName = osName;
             poField->m_osAlias = osAlias;
             poField->m_eType = eType;
-            poField->m_bNullable = (flags & 1) != 0;
+            poField->m_bNullable = (flags & FileGDBField::MASK_NULLABLE) != 0;
+            poField->m_bRequired = (flags & FileGDBField::MASK_REQUIRED) != 0;
+            poField->m_bEditable = (flags & FileGDBField::MASK_EDITABLE) != 0;
             poField->m_nMaxWidth = nMaxWidth;
             poField->m_sDefault = sDefault;
             m_apoFields.emplace_back(std::move(poField));
@@ -1364,25 +1511,27 @@ static void ReadVarIntAndAddNoCheck(GByte *&pabyIter, GIntBig &nOutVal)
 /************************************************************************/
 
 vsi_l_offset
-FileGDBTable::GetOffsetInTableForRow(int iRow, vsi_l_offset *pnOffsetInTableX)
+FileGDBTable::GetOffsetInTableForRow(int64_t iRow,
+                                     vsi_l_offset *pnOffsetInTableX)
 {
     const int errorRetValue = 0;
     if (pnOffsetInTableX)
         *pnOffsetInTableX = 0;
     returnErrorIf(iRow < 0 || iRow >= m_nTotalRecordCount);
 
-    m_bIsDeleted = FALSE;
+    m_bIsDeleted = false;
     if (m_fpTableX == nullptr)
     {
-        m_bIsDeleted = IS_DELETED(m_anFeatureOffsets[iRow]);
-        return GET_OFFSET(m_anFeatureOffsets[iRow]);
+        m_bIsDeleted =
+            IS_DELETED(m_anFeatureOffsets[static_cast<size_t>(iRow)]);
+        return GET_OFFSET(m_anFeatureOffsets[static_cast<size_t>(iRow)]);
     }
 
     vsi_l_offset nOffsetInTableX;
     if (!m_abyTablXBlockMap.empty())
     {
         GUInt32 nCountBlocksBefore = 0;
-        int iBlock = iRow / 1024;
+        const int iBlock = static_cast<int>(iRow / 1024);
 
         // Check if the block is not empty
         if (TEST_BIT(m_abyTablXBlockMap.data(), iBlock) == 0)
@@ -1406,7 +1555,8 @@ FileGDBTable::GetOffsetInTableForRow(int iRow, vsi_l_offset *pnOffsetInTableX)
         }
         m_nCountBlocksBeforeIBlockIdx = iBlock;
         m_nCountBlocksBeforeIBlockValue = nCountBlocksBefore;
-        const int iCorrectedRow = nCountBlocksBefore * 1024 + (iRow % 1024);
+        const int64_t iCorrectedRow =
+            static_cast<int64_t>(nCountBlocksBefore) * 1024 + (iRow % 1024);
         nOffsetInTableX =
             16 + static_cast<vsi_l_offset>(m_nTablxOffsetSize) * iCorrectedRow;
     }
@@ -1455,9 +1605,9 @@ uint64_t FileGDBTable::ReadFeatureOffset(const GByte *pabyBuffer)
 /*                      GetAndSelectNextNonEmptyRow()                   */
 /************************************************************************/
 
-int FileGDBTable::GetAndSelectNextNonEmptyRow(int iRow)
+int64_t FileGDBTable::GetAndSelectNextNonEmptyRow(int64_t iRow)
 {
-    const int errorRetValue = -1;
+    const int64_t errorRetValue = -1;
     returnErrorAndCleanupIf(iRow < 0 || iRow >= m_nTotalRecordCount,
                             m_nCurRow = -1);
 
@@ -1465,17 +1615,18 @@ int FileGDBTable::GetAndSelectNextNonEmptyRow(int iRow)
     {
         if (!m_abyTablXBlockMap.empty() && (iRow % 1024) == 0)
         {
-            int iBlock = iRow / 1024;
+            int iBlock = static_cast<int>(iRow / 1024);
             if (TEST_BIT(m_abyTablXBlockMap.data(), iBlock) == 0)
             {
-                int nBlocks = DIV_ROUND_UP(m_nTotalRecordCount, 1024);
+                int nBlocks =
+                    static_cast<int>(DIV_ROUND_UP(m_nTotalRecordCount, 1024));
                 do
                 {
                     iBlock++;
                 } while (iBlock < nBlocks &&
                          TEST_BIT(m_abyTablXBlockMap.data(), iBlock) == 0);
 
-                iRow = iBlock * 1024;
+                iRow = static_cast<int64_t>(iBlock) * 1024;
                 if (iRow >= m_nTotalRecordCount)
                     return -1;
             }
@@ -1495,7 +1646,7 @@ int FileGDBTable::GetAndSelectNextNonEmptyRow(int iRow)
 /*                            SelectRow()                               */
 /************************************************************************/
 
-int FileGDBTable::SelectRow(int iRow)
+bool FileGDBTable::SelectRow(int64_t iRow)
 {
     const int errorRetValue = FALSE;
     returnErrorAndCleanupIf(iRow < 0 || iRow >= m_nTotalRecordCount,
@@ -1539,7 +1690,8 @@ int FileGDBTable::SelectRow(int iRow)
                         "NO")))
                 {
                     CPLError(CE_Failure, CPLE_AppDefined,
-                             "Invalid row length (%u) on feature %u compared "
+                             "Invalid row length (%u) on feature %" PRId64
+                             " compared "
                              "to the maximum size in the header (%u)",
                              m_nRowBlobLength, iRow + 1,
                              m_nHeaderBufferMaxSize);
@@ -1548,11 +1700,65 @@ int FileGDBTable::SelectRow(int iRow)
                 }
                 else
                 {
+                    // Versions of the driver before commit
+                    // fdf39012788b1110b3bf0ae6b8422a528f0ae8b6 didn't
+                    // properly update the m_nHeaderBufferMaxSize field
+                    // when updating an existing feature when the new version
+                    // takes more space than the previous version.
+                    // OpenFileGDB doesn't care but Esri software (FileGDB SDK
+                    // or ArcMap/ArcGis) do, leading to issues such as
+                    // https://github.com/qgis/QGIS/issues/57536
+
                     CPLDebug("OpenFileGDB",
-                             "Invalid row length (%u) on feature %u compared "
+                             "Invalid row length (%u) on feature %" PRId64
+                             " compared "
                              "to the maximum size in the header (%u)",
                              m_nRowBlobLength, iRow + 1,
                              m_nHeaderBufferMaxSize);
+
+                    if (m_bUpdate)
+                    {
+                        if (!m_bHasWarnedAboutHeaderRepair)
+                        {
+                            m_bHasWarnedAboutHeaderRepair = true;
+                            CPLError(CE_Warning, CPLE_AppDefined,
+                                     "A corruption in the header of %s has "
+                                     "been detected. It is going to be "
+                                     "repaired to be properly read by other "
+                                     "software.",
+                                     m_osFilename.c_str());
+
+                            m_bDirtyHeader = true;
+
+                            // Invalidate existing indices, as the corrupted
+                            // m_nHeaderBufferMaxSize value may have cause
+                            // Esri software to generate corrupted indices.
+                            m_bDirtyIndices = true;
+
+                            // Compute file size
+                            VSIFSeekL(m_fpTable, 0, SEEK_END);
+                            m_nFileSize = VSIFTellL(m_fpTable);
+                            VSIFSeekL(m_fpTable, nOffsetTable + 4, SEEK_SET);
+                        }
+                    }
+                    else
+                    {
+                        if (!m_bHasWarnedAboutHeaderRepair)
+                        {
+                            m_bHasWarnedAboutHeaderRepair = true;
+                            CPLError(CE_Warning, CPLE_AppDefined,
+                                     "A corruption in the header of %s has "
+                                     "been detected. It would need to be "
+                                     "repaired to be properly read by other "
+                                     "software, either by using ogr2ogr to "
+                                     "generate a new dataset, or by opening "
+                                     "this dataset in update mode and reading "
+                                     "all its records.",
+                                     m_osFilename.c_str());
+                        }
+                    }
+
+                    m_nHeaderBufferMaxSize = m_nRowBlobLength;
                 }
             }
 
@@ -1571,7 +1777,7 @@ int FileGDBTable::SelectRow(int iRow)
                     if (nOffsetTable + 4 + m_nRowBlobLength > m_nFileSize)
                     {
                         CPLError(CE_Failure, CPLE_AppDefined,
-                                 "Invalid row length (%u) on feature %u",
+                                 "Invalid row length (%u) on feature %" PRId64,
                                  m_nRowBlobLength, iRow + 1);
                         m_nCurRow = -1;
                         return errorRetValue;
@@ -1627,7 +1833,7 @@ int FileGDBDoubleDateToOGRDate(double dfVal, bool bHighPrecision,
 {
     // 25569: Number of days between 1899/12/30 00:00:00 and 1970/01/01 00:00:00
     double dfSeconds = (dfVal - 25569.0) * 3600.0 * 24.0;
-    if (CPLIsNan(dfSeconds) ||
+    if (std::isnan(dfSeconds) ||
         dfSeconds <
             static_cast<double>(std::numeric_limits<GIntBig>::min()) + 1000 ||
         dfSeconds >
@@ -1669,7 +1875,7 @@ int FileGDBDoubleDateToOGRDate(double dfVal, bool bHighPrecision,
 int FileGDBDoubleTimeToOGRTime(double dfVal, OGRField *psField)
 {
     double dfSeconds = dfVal * 3600.0 * 24.0;
-    if (CPLIsNan(dfSeconds) || dfSeconds < 0 || dfSeconds > 86400)
+    if (std::isnan(dfSeconds) || dfSeconds < 0 || dfSeconds > 86400)
     {
         CPLError(CE_Failure, CPLE_NotSupported,
                  "FileGDBDoubleTimeToOGRTime: Invalid time: %lf", dfVal);
@@ -2253,7 +2459,7 @@ const OGRField *FileGDBTable::GetFieldValue(int iCol)
     if (iCol == static_cast<int>(m_apoFields.size()) - 1 &&
         m_pabyIterVals < pabyEnd)
     {
-        CPLDebug("OpenFileGDB", "%d bytes remaining at end of record %d",
+        CPLDebug("OpenFileGDB", "%d bytes remaining at end of record %" PRId64,
                  static_cast<int>(pabyEnd - m_pabyIterVals), m_nCurRow);
     }
 
@@ -2509,56 +2715,8 @@ void FileGDBTable::GetMinMaxProjYForSpatialIndex(double &dfYMin,
         return;
     double dfMinLat;
     double dfMaxLat;
-    // Determined through experimentation, e.g with the following script
-#if 0
-    from osgeo import gdal, ogr, osr
-    import struct
-    gdal.RmdirRecursive('test.gdb')
-    ds = ogr.GetDriverByName('FileGDB').CreateDataSource('test.gdb')
-    srs = osr.SpatialReference()
-#srs.SetFromUserInput(                                                         \
-    "+proj=tmerc +lon_0=-40 +lat_0=60 +k=0.9 +x_0=00000 +y_0=00000 +datum=WGS84")
-    srs.SetFromUserInput("+proj=merc +lon_0=-40 +lat_0=60 +k=0.9 +x_0=00000 +y_0=00000 +datum=WGS84")
-    srs_lonlat = srs.CloneGeogCS()
-    srs_lonlat.SetAxisMappingStrategy(osr.OAMS_TRADITIONAL_GIS_ORDER)
-    ct = osr.CoordinateTransformation(srs, srs_lonlat)
-    grid_step = 0.1
-    lyr = ds.CreateLayer('test', geom_type=ogr.wkbPoint, srs=srs)
-#Add 2 dummy features to set the grid_step to what we want
-    f = ogr.Feature(lyr.GetLayerDefn())
-    f.SetGeometry(ogr.CreateGeometryFromWkt('POINT(0 0)'))
-    lyr.CreateFeature(f)
-    f = ogr.Feature(lyr.GetLayerDefn())
-    y = (2**0.5) * grid_step
-    f.SetGeometry(ogr.CreateGeometryFromWkt('POINT(%f %f)' % (y, y)))
-    lyr.CreateFeature(f)
-    ds = None
-    ds = ogr.GetDriverByName('FileGDB').Open('test.gdb', update=1)
-    lyr = ds.GetLayer(0)
-    lyr.DeleteFeature(1)
-    lyr.DeleteFeature(2)
-    y = 1e9 # some big value
-    f = ogr.Feature(lyr.GetLayerDefn())
-    g = ogr.CreateGeometryFromWkt('POINT(0 %f)' % y)
-    f.SetGeometry(g)
-    lyr.CreateFeature(f)
-    f = ogr.Feature(lyr.GetLayerDefn())
-    g = ogr.CreateGeometryFromWkt('POINT(0 %f)' % -y)
-    f.SetGeometry(g)
-    lyr.CreateFeature(f)
-    ds = None
-    f = open('test.gdb/a00000009.spx', 'rb')
-    f.seek(4)
-    n = ord(f.read(1))
-    for x in range(n):
-        f.seek(1372 + x * 8, 0)
-        v = struct.unpack('Q', f.read(8))[0]
-        x = (v >> 31 & 0x7fffffff - (1 << 29))
-        y = (v & 0x7fffffff) - (1 << 29)
-        print(x, y)  # the y value will be clamped
-        print(ct.TransformPoint(srs.GetProjParm( osr.SRS_PP_FALSE_EASTING, 0.0 ), y * grid_step))
-#endif
 
+    // Determined through experimentation, e.g with the `find_srs_latitude_limits.py` script.
     if (EQUAL(pszProjection, SRS_PT_TRANSVERSE_MERCATOR))
     {
         dfMinLat = -90;
@@ -2834,11 +2992,19 @@ FileGDBField::FileGDBField(FileGDBTable *poParentIn) : m_poParent(poParentIn)
 
 FileGDBField::FileGDBField(const std::string &osName,
                            const std::string &osAlias, FileGDBFieldType eType,
-                           bool bNullable, int nMaxWidth,
-                           const OGRField &sDefault)
+                           bool bNullable, bool bRequired, bool bEditable,
+                           int nMaxWidth, const OGRField &sDefault)
     : m_osName(osName), m_osAlias(osAlias), m_eType(eType),
-      m_bNullable(bNullable), m_nMaxWidth(nMaxWidth)
+      m_bNullable(bNullable), m_bRequired(bRequired), m_bEditable(bEditable),
+      m_nMaxWidth(nMaxWidth)
 {
+    if (m_eType == FGFT_OBJECTID || m_eType == FGFT_GLOBALID)
+    {
+        CPLAssert(!m_bNullable);
+        CPLAssert(m_bRequired);
+        CPLAssert(!m_bEditable);
+    }
+
     if (m_eType == FGFT_STRING && !OGR_RawField_IsUnset(&sDefault) &&
         !OGR_RawField_IsNull(&sDefault))
     {
@@ -2918,7 +3084,8 @@ FileGDBGeomField::FileGDBGeomField(
     const std::string &osWKT, double dfXOrigin, double dfYOrigin,
     double dfXYScale, double dfXYTolerance,
     const std::vector<double> &adfSpatialIndexGridResolution)
-    : FileGDBField(osName, osAlias, FGFT_GEOMETRY, bNullable, 0,
+    : FileGDBField(osName, osAlias, FGFT_GEOMETRY, bNullable,
+                   /* bRequired = */ true, /* bEditable = */ true, 0,
                    FileGDBField::UNSET_FIELD),
       m_osWKT(osWKT), m_dfXOrigin(dfXOrigin), m_dfYOrigin(dfYOrigin),
       m_dfXYScale(dfXYScale), m_dfXYTolerance(dfXYTolerance),
@@ -3435,6 +3602,7 @@ OGRGeometry *FileGDBOGRGeometryConverterImpl::CreateCurveGeometry(
         returnError();
     }
     const int nMaxSize = static_cast<int>(nMaxSize64);
+    // coverity[overflow_sink]
     GByte *pabyExtShapeBuffer =
         static_cast<GByte *>(VSI_MALLOC_VERBOSE(nMaxSize));
     if (pabyExtShapeBuffer == nullptr)
@@ -3631,11 +3799,19 @@ FileGDBOGRGeometryConverterImpl::GetAsGeometry(const OGRField *psField)
                     ReadVarUInt64NoCheck(pabyCur, m);
                     const double dfMScale =
                         SanitizeScale(poGeomField->GetMScale());
-                    const double dfM =
-                        m == 0
-                            ? std::numeric_limits<double>::quiet_NaN()
-                            : (m - 1U) / dfMScale + poGeomField->GetMOrigin();
-                    return new OGRPoint(dfX, dfY, dfZ, dfM);
+                    if (m == 0)
+                    {
+                        return new OGRPoint(
+                            dfX, dfY, dfZ,
+                            std::numeric_limits<double>::quiet_NaN());
+                    }
+                    else
+                    {
+                        assert(m >= 1U);
+                        const double dfM =
+                            (m - 1U) / dfMScale + poGeomField->GetMOrigin();
+                        return new OGRPoint(dfX, dfY, dfZ, dfM);
+                    }
                 }
                 return new OGRPoint(dfX, dfY, dfZ);
             }
diff --git a/ogr/ogrsf_frmts/openfilegdb/filegdbtable.h b/ogr/ogrsf_frmts/openfilegdb/filegdbtable.h
index a5a4fc67f126..f24f4982abb3 100644
--- a/ogr/ogrsf_frmts/openfilegdb/filegdbtable.h
+++ b/ogr/ogrsf_frmts/openfilegdb/filegdbtable.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef FILEGDBTABLE_H_INCLUDED
@@ -102,8 +86,11 @@ class FileGDBField
     std::string m_osAlias{};
     FileGDBFieldType m_eType = FGFT_UNDEFINED;
 
-    bool m_bNullable = false;
-    bool m_bHighPrecsion = false;  // for FGFT_DATETIME
+    bool m_bNullable = false;  // Bit 1 of flag field
+    bool m_bRequired =
+        false;  // Bit 2 of flag field. Set for ObjectID, geometry field and Shape_Area/Shape_Length
+    bool m_bEditable = false;       // Bit 3 of flag field.
+    bool m_bHighPrecision = false;  // for FGFT_DATETIME
     bool m_bReadAsDouble =
         false;           // used by FileGDBTable::CreateAttributeIndex()
     int m_nMaxWidth = 0; /* for string */
@@ -117,11 +104,17 @@ class FileGDBField
 
   public:
     static const OGRField UNSET_FIELD;
+    static constexpr int BIT_NULLABLE = 0;
+    static constexpr int BIT_REQUIRED = 1;
+    static constexpr int BIT_EDITABLE = 2;
+    static constexpr int MASK_NULLABLE = 1 << BIT_NULLABLE;
+    static constexpr int MASK_REQUIRED = 1 << BIT_REQUIRED;
+    static constexpr int MASK_EDITABLE = 1 << BIT_EDITABLE;
 
     explicit FileGDBField(FileGDBTable *m_poParent);
     FileGDBField(const std::string &osName, const std::string &osAlias,
-                 FileGDBFieldType eType, bool bNullable, int nMaxWidth,
-                 const OGRField &sDefault);
+                 FileGDBFieldType eType, bool bNullable, bool bRequired,
+                 bool bEditable, int nMaxWidth, const OGRField &sDefault);
     virtual ~FileGDBField();
 
     void SetParent(FileGDBTable *poParent)
@@ -149,6 +142,16 @@ class FileGDBField
         return m_bNullable;
     }
 
+    bool IsRequired() const
+    {
+        return m_bRequired;
+    }
+
+    bool IsEditable() const
+    {
+        return m_bEditable;
+    }
+
     int GetMaxWidth() const
     {
         return m_nMaxWidth;
@@ -161,12 +164,12 @@ class FileGDBField
 
     void SetHighPrecision()
     {
-        m_bHighPrecsion = true;
+        m_bHighPrecision = true;
     }
 
     bool IsHighPrecision() const
     {
-        return m_bHighPrecsion;
+        return m_bHighPrecision;
     }
 
     int HasIndex();
@@ -428,10 +431,24 @@ class FileGDBTable
 {
     VSILFILE *m_fpTable = nullptr;
     VSILFILE *m_fpTableX = nullptr;
+
+    enum class GDBTableVersion
+    {
+        V3 = 3,  // 32-bit object id
+        V4 = 4,  // 64-bit object id (ince ArcGIS Pro 3.2)
+    };
+    GDBTableVersion m_eGDBTableVersion = GDBTableVersion::V3;
     vsi_l_offset m_nFileSize = 0; /* only read when needed */
     bool m_bUpdate = false;
+    bool m_bReliableObjectID = true;  // can be set to false on some V4 files
+
+    //! This flag is set when we detect that a corruption of m_nHeaderBufferMaxSize
+    // prior to fix needs to  fdf39012788b1110b3bf0ae6b8422a528f0ae8b6 to be
+    // repaired
+    bool m_bHasWarnedAboutHeaderRepair = false;
 
     std::string m_osFilename{};
+    std::string m_osFilenameWithLayerName{};
     bool m_bIsV9 = false;
     std::vector<std::unique_ptr<FileGDBField>> m_apoFields{};
     int m_iObjectIdField = -1;
@@ -465,7 +482,7 @@ class FileGDBTable
                                  no .gdbtablx file */
 
     uint64_t m_nOffsetTableXTrailer = 0;
-    uint32_t m_n1024BlocksPresent = 0;
+    uint64_t m_n1024BlocksPresent = 0;
     std::vector<GByte> m_abyTablXBlockMap{};
     int m_nCountBlocksBeforeIBlockIdx = 0;   /* optimization */
     int m_nCountBlocksBeforeIBlockValue = 0; /* optimization */
@@ -479,9 +496,9 @@ class FileGDBTable
     int m_nChSaved = -1;
 
     int m_bError = FALSE;
-    int m_nCurRow = -1;
+    int64_t m_nCurRow = -1;
     int m_bHasDeletedFeaturesListed = FALSE;
-    int m_bIsDeleted = FALSE;
+    bool m_bIsDeleted = false;
     int m_nLastCol = -1;
     GByte *m_pabyIterVals = nullptr;
     int m_iAccNullable = 0;
@@ -494,11 +511,11 @@ class FileGDBTable
     bool m_bStringsAreUTF8 = true;  // if false, UTF16
     std::string m_osTempString{};   // used as a temporary to store strings
                                     // recoded from UTF16 to UTF8
-    int m_nValidRecordCount = 0;
-    int m_nTotalRecordCount = 0;
+    int64_t m_nValidRecordCount = 0;
+    int64_t m_nTotalRecordCount = 0;
     int m_iGeomField = -1;
     int m_nCountNullableFields = 0;
-    int m_nNullableFieldsSizeInBytes = 0;
+    unsigned m_nNullableFieldsSizeInBytes = 0;
 
     std::vector<double> m_adfSpatialIndexGridResolution{};
 
@@ -556,7 +573,8 @@ class FileGDBTable
     bool WriteHeader(VSILFILE *fpTable);
     bool WriteHeaderX(VSILFILE *fpTableX);
 
-    int ReadTableXHeader();
+    bool ReadTableXHeaderV3();
+    bool ReadTableXHeaderV4();
     int IsLikelyFeatureAtOffset(vsi_l_offset nOffset, GUInt32 *pnSize,
                                 int *pbDeletedRecord);
     bool GuessFeatureLocations();
@@ -624,12 +642,12 @@ class FileGDBTable
         return m_bGeomTypeHasM;
     }
 
-    int GetValidRecordCount() const
+    int64_t GetValidRecordCount() const
     {
         return m_nValidRecordCount;
     }
 
-    int GetTotalRecordCount() const
+    int64_t GetTotalRecordCount() const
     {
         return m_nTotalRecordCount;
     }
@@ -670,6 +688,15 @@ class FileGDBTable
         return m_apoIndexes[i].get();
     }
 
+    /** Return if we can use attribute or spatial indices.
+     * This can be false for some sparse tables with 64-bit ObjectID since
+     * the format of the sparse bitmap isn't fully understood yet.
+     */
+    bool CanUseIndices() const
+    {
+        return m_bReliableObjectID;
+    }
+
     bool HasSpatialIndex();
     bool CreateIndex(const std::string &osIndexName,
                      const std::string &osExpression);
@@ -677,7 +704,8 @@ class FileGDBTable
     bool CreateSpatialIndex();
 
     vsi_l_offset
-    GetOffsetInTableForRow(int iRow, vsi_l_offset *pnOffsetInTableX = nullptr);
+    GetOffsetInTableForRow(int64_t iRow,
+                           vsi_l_offset *pnOffsetInTableX = nullptr);
 
     int HasDeletedFeaturesListed() const
     {
@@ -686,20 +714,20 @@ class FileGDBTable
 
     /* Next call to SelectRow() or GetFieldValue() invalidates previously
      * returned values */
-    int SelectRow(int iRow);
-    int GetAndSelectNextNonEmptyRow(int iRow);
+    bool SelectRow(int64_t iRow);
+    int64_t GetAndSelectNextNonEmptyRow(int64_t iRow);
 
     int HasGotError() const
     {
         return m_bError;
     }
 
-    int GetCurRow() const
+    int64_t GetCurRow() const
     {
         return m_nCurRow;
     }
 
-    int IsCurRowDeleted() const
+    bool IsCurRowDeleted() const
     {
         return m_bIsDeleted;
     }
@@ -731,9 +759,9 @@ class FileGDBTable
 
     bool CreateFeature(const std::vector<OGRField> &asRawFields,
                        const OGRGeometry *poGeom, int *pnFID = nullptr);
-    bool UpdateFeature(int nFID, const std::vector<OGRField> &asRawFields,
+    bool UpdateFeature(int64_t nFID, const std::vector<OGRField> &asRawFields,
                        const OGRGeometry *poGeom);
-    bool DeleteFeature(int nFID);
+    bool DeleteFeature(int64_t nFID);
 
     bool CheckFreeListConsistency();
     void DeleteFreeList();
@@ -750,7 +778,8 @@ typedef enum
     FGSO_LE,
     FGSO_EQ,
     FGSO_GE,
-    FGSO_GT
+    FGSO_GT,
+    FGSO_ILIKE
 } FileGDBSQLOp;
 
 /************************************************************************/
@@ -766,18 +795,18 @@ class FileGDBIterator
 
     virtual FileGDBTable *GetTable() = 0;
     virtual void Reset() = 0;
-    virtual int GetNextRowSortedByFID() = 0;
-    virtual int GetRowCount();
+    virtual int64_t GetNextRowSortedByFID() = 0;
+    virtual int64_t GetRowCount();
 
     /* Only available on a BuildIsNotNull() iterator */
     virtual const OGRField *GetMinValue(int &eOutOGRFieldType);
     virtual const OGRField *GetMaxValue(int &eOutOGRFieldType);
     /* will reset the iterator */
-    virtual int GetMinMaxSumCount(double &dfMin, double &dfMax, double &dfSum,
-                                  int &nCount);
+    virtual bool GetMinMaxSumCount(double &dfMin, double &dfMax, double &dfSum,
+                                   int &nCount);
 
     /* Only available on a BuildIsNotNull() or Build() iterator */
-    virtual int GetNextRowSortedByValue();
+    virtual int64_t GetNextRowSortedByValue();
 
     static FileGDBIterator *Build(FileGDBTable *poParent, int nFieldIdx,
                                   int bAscending, FileGDBSQLOp op,
diff --git a/ogr/ogrsf_frmts/openfilegdb/filegdbtable_freelist.cpp b/ogr/ogrsf_frmts/openfilegdb/filegdbtable_freelist.cpp
index c666c1bbce44..d9ed1343807c 100644
--- a/ogr/ogrsf_frmts/openfilegdb/filegdbtable_freelist.cpp
+++ b/ogr/ogrsf_frmts/openfilegdb/filegdbtable_freelist.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -32,6 +16,7 @@
 #include "filegdbtable_priv.h"
 
 #include <algorithm>
+#include <cassert>
 #include <limits>
 #include <set>
 
@@ -140,6 +125,7 @@ void FileGDBTable::AddEntryToFreelist(uint64_t nOffset, uint32_t nSize)
         VSIFCloseL(fp);
         return;
     }
+    assert(iSlot < 100);
 
     // Read the last page index of the identified slot
     uint32_t nPageIdx =
@@ -284,6 +270,7 @@ uint64_t FileGDBTable::GetOffsetOfFreeAreaFromFreeList(uint32_t nSize)
         VSIFCloseL(fp);
         return OFFSET_MINUS_ONE;
     }
+    assert(iSlot < 100);
 
     // Read the last page index of the identified slot
     uint32_t nPageIdx =
@@ -369,7 +356,7 @@ uint64_t FileGDBTable::GetOffsetOfFreeAreaFromFreeList(uint32_t nSize)
                 break;
             }
 
-            if (aSetReadPages.find(nPrevPage) != aSetReadPages.end())
+            if (cpl::contains(aSetReadPages, nPrevPage))
             {
                 CPLError(CE_Warning, CPLE_AppDefined,
                          "Cyclic page refererencing in %s", osFilename.c_str());
@@ -582,7 +569,7 @@ bool FileGDBTable::CheckFreeListConsistency()
     uint32_t nFreePage = GetUInt32(abyTrailer.data() + sizeof(uint32_t), 0);
     while (nFreePage != MINUS_ONE)
     {
-        if (setVisitedPages.find(nFreePage) != setVisitedPages.end())
+        if (cpl::contains(setVisitedPages, nFreePage))
         {
             CPLError(CE_Failure, CPLE_AppDefined,
                      "Cyclic page refererencing in free pages");
@@ -626,7 +613,7 @@ bool FileGDBTable::CheckFreeListConsistency()
         uint32_t nActualCount = 0;
         while (nPageIdx != MINUS_ONE)
         {
-            if (setVisitedPages.find(nPageIdx) != setVisitedPages.end())
+            if (cpl::contains(setVisitedPages, nPageIdx))
             {
                 CPLError(CE_Failure, CPLE_AppDefined,
                          "Cyclic page refererencing or page referenced more "
@@ -663,6 +650,9 @@ bool FileGDBTable::CheckFreeListConsistency()
             {
                 const uint32_t nFreeAreaSize = GetUInt32(
                     abyPage.data() + nPageHeaderSize + i * nEntrySize, 0);
+                assert(iSlot + 1 <
+                       static_cast<int>(CPL_ARRAYSIZE(anHoleSizes)));
+                // coverity[overrun-local]
                 if (nFreeAreaSize < anHoleSizes[iSlot] ||
                     nFreeAreaSize >= anHoleSizes[iSlot + 1])
                 {
@@ -703,7 +693,7 @@ bool FileGDBTable::CheckFreeListConsistency()
                     return false;
                 }
 
-                if (aSetOffsets.find(nOffset) != aSetOffsets.end())
+                if (cpl::contains(aSetOffsets, nOffset))
                 {
                     CPLError(CE_Failure, CPLE_AppDefined,
                              "Page %u contains free area that points to "
diff --git a/ogr/ogrsf_frmts/openfilegdb/filegdbtable_priv.h b/ogr/ogrsf_frmts/openfilegdb/filegdbtable_priv.h
index bfc68728942a..e7ff83217720 100644
--- a/ogr/ogrsf_frmts/openfilegdb/filegdbtable_priv.h
+++ b/ogr/ogrsf_frmts/openfilegdb/filegdbtable_priv.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef FILEGDBTABLE_PRIV_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/openfilegdb/filegdbtable_write.cpp b/ogr/ogrsf_frmts/openfilegdb/filegdbtable_write.cpp
index aed5fe2a9b3b..6addae4f5a96 100644
--- a/ogr/ogrsf_frmts/openfilegdb/filegdbtable_write.cpp
+++ b/ogr/ogrsf_frmts/openfilegdb/filegdbtable_write.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -33,6 +17,8 @@
 #include "filegdbtable.h"
 
 #include <algorithm>
+#include <cinttypes>
+#include <cmath>
 #include <cwchar>
 #include <errno.h>
 #include <limits.h>
@@ -51,6 +37,7 @@
 #include "cpl_time.h"
 #include "cpl_vsi.h"
 #include "filegdbtable_priv.h"
+#include "gdal_priv_templates.hpp"
 #include "ogr_api.h"
 #include "ogr_core.h"
 #include "ogr_geometry.h"
@@ -73,6 +60,7 @@ bool FileGDBTable::Create(const char *pszFilename, int nTablxOffsetSize,
 {
     CPLAssert(m_fpTable == nullptr);
 
+    m_eGDBTableVersion = GDBTableVersion::V3;
     m_bUpdate = true;
     m_eTableGeomType = eTableGeomType;
     m_nTablxOffsetSize = nTablxOffsetSize;
@@ -88,6 +76,7 @@ bool FileGDBTable::Create(const char *pszFilename, int nTablxOffsetSize,
     }
 
     m_osFilename = pszFilename;
+    m_osFilenameWithLayerName = m_osFilename;
     m_fpTable = VSIFOpenL(pszFilename, "wb+");
     if (m_fpTable == nullptr)
     {
@@ -152,8 +141,9 @@ bool FileGDBTable::WriteHeader(VSILFILE *fpTable)
     VSIFSeekL(fpTable, 0, SEEK_SET);
 
     bool bRet =
-        WriteUInt32(fpTable, 3) &&                    // version number
-        WriteUInt32(fpTable, m_nValidRecordCount) &&  // number of valid rows
+        WriteUInt32(fpTable, 3) &&  // version number
+        // number of valid rows
+        WriteUInt32(fpTable, static_cast<uint32_t>(m_nValidRecordCount)) &&
         WriteUInt32(fpTable,
                     m_nHeaderBufferMaxSize) &&  // largest size of a feature
                                                 // record / field description
@@ -190,8 +180,8 @@ bool FileGDBTable::WriteHeaderX(VSILFILE *fpTableX)
 {
     VSIFSeekL(fpTableX, 0, SEEK_SET);
     if (!WriteUInt32(fpTableX, 3) ||  // version number
-        !WriteUInt32(fpTableX, m_n1024BlocksPresent) ||
-        !WriteUInt32(fpTableX, m_nTotalRecordCount) ||
+        !WriteUInt32(fpTableX, static_cast<uint32_t>(m_n1024BlocksPresent)) ||
+        !WriteUInt32(fpTableX, static_cast<uint32_t>(m_nTotalRecordCount)) ||
         !WriteUInt32(fpTableX, m_nTablxOffsetSize))
     {
         CPLError(CE_Failure, CPLE_FileIO, "Cannot write .gdbtablx header");
@@ -267,7 +257,8 @@ bool FileGDBTable::Sync(VSILFILE *fpTable, VSILFILE *fpTableX)
     if (m_bDirtyHeader && fpTable)
     {
         VSIFSeekL(fpTable, 4, SEEK_SET);
-        bRet &= WriteUInt32(fpTable, m_nValidRecordCount);
+        bRet &=
+            WriteUInt32(fpTable, static_cast<uint32_t>(m_nValidRecordCount));
         m_nHeaderBufferMaxSize =
             std::max(m_nHeaderBufferMaxSize,
                      std::max(m_nRowBufferMaxSize, m_nFieldDescLength));
@@ -285,8 +276,10 @@ bool FileGDBTable::Sync(VSILFILE *fpTable, VSILFILE *fpTableX)
     if (m_bDirtyTableXHeader && fpTableX)
     {
         VSIFSeekL(fpTableX, 4, SEEK_SET);
-        bRet &= WriteUInt32(fpTableX, m_n1024BlocksPresent);
-        bRet &= WriteUInt32(fpTableX, m_nTotalRecordCount);
+        bRet &=
+            WriteUInt32(fpTableX, static_cast<uint32_t>(m_n1024BlocksPresent));
+        bRet &=
+            WriteUInt32(fpTableX, static_cast<uint32_t>(m_nTotalRecordCount));
         m_bDirtyTableXHeader = false;
     }
 
@@ -297,8 +290,8 @@ bool FileGDBTable::Sync(VSILFILE *fpTable, VSILFILE *fpTableX)
             m_nTablxOffsetSize * TABLX_FEATURES_PER_PAGE *
                 static_cast<vsi_l_offset>(m_n1024BlocksPresent);
         VSIFSeekL(fpTableX, m_nOffsetTableXTrailer, SEEK_SET);
-        const uint32_t n1024BlocksTotal =
-            DIV_ROUND_UP(m_nTotalRecordCount, TABLX_FEATURES_PER_PAGE);
+        const uint32_t n1024BlocksTotal = static_cast<uint32_t>(
+            DIV_ROUND_UP(m_nTotalRecordCount, TABLX_FEATURES_PER_PAGE));
         if (!m_abyTablXBlockMap.empty())
         {
             CPLAssert(m_abyTablXBlockMap.size() >= (n1024BlocksTotal + 7) / 8);
@@ -314,7 +307,8 @@ bool FileGDBTable::Sync(VSILFILE *fpTable, VSILFILE *fpTableX)
         m_abyTablXBlockMap.resize(nBitmapInt32Words * 4);
         bRet &= WriteUInt32(fpTableX, nBitmapInt32Words);
         bRet &= WriteUInt32(fpTableX, n1024BlocksTotal);
-        bRet &= WriteUInt32(fpTableX, m_n1024BlocksPresent);
+        bRet &=
+            WriteUInt32(fpTableX, static_cast<uint32_t>(m_n1024BlocksPresent));
         uint32_t nTrailingZero32BitWords = 0;
         for (int i = static_cast<int>(m_abyTablXBlockMap.size() / 4) - 1;
              i >= 0; --i)
@@ -339,10 +333,10 @@ bool FileGDBTable::Sync(VSILFILE *fpTable, VSILFILE *fpTableX)
                 nCountBlocks += TEST_BIT(m_abyTablXBlockMap.data(), i) != 0;
             if (nCountBlocks != m_n1024BlocksPresent)
             {
-                CPLError(
-                    CE_Failure, CPLE_AppDefined,
-                    "Sync(): nCountBlocks(=%u) != m_n1024BlocksPresent(=%u)",
-                    nCountBlocks, m_n1024BlocksPresent);
+                CPLError(CE_Failure, CPLE_AppDefined,
+                         "Sync(): nCountBlocks(=%u) != "
+                         "m_n1024BlocksPresent(=%" PRIu64 ")",
+                         nCountBlocks, m_n1024BlocksPresent);
             }
 #endif
             bRet &= VSIFWriteL(m_abyTablXBlockMap.data(), 1,
@@ -371,24 +365,15 @@ bool FileGDBTable::Sync(VSILFILE *fpTable, VSILFILE *fpTableX)
 /************************************************************************/
 
 #define CHECK_CAN_BE_ENCODED_ON_VARUINT(v, msg)                                \
-    if (!((v) >= 0 &&                                                          \
-          (v) <= static_cast<double>(std::numeric_limits<uint64_t>::max())))   \
+    if (!GDALIsValueInRange<uint64_t>(v))                                      \
     {                                                                          \
         CPLError(CE_Failure, CPLE_AppDefined, msg);                            \
         return false;                                                          \
     }
 
 #define CHECK_CAN_BE_ENCODED_ON_VARINT(v, oldV, msg)                           \
-    if (!((v) >= static_cast<double>(std::numeric_limits<int64_t>::min()) &&   \
-          (v) <= static_cast<double>(std::numeric_limits<int64_t>::max())))    \
-    {                                                                          \
-        CPLError(CE_Failure, CPLE_AppDefined, msg);                            \
-        return false;                                                          \
-    }                                                                          \
-    if (!(((v) - (oldV)) >=                                                    \
-              static_cast<double>(std::numeric_limits<int64_t>::min()) &&      \
-          ((v) - (oldV)) <=                                                    \
-              static_cast<double>(std::numeric_limits<int64_t>::max())))       \
+    if (!GDALIsValueInRange<int64_t>(v) ||                                     \
+        !GDALIsValueInRange<int64_t>((v) - (oldV)))                            \
     {                                                                          \
         CPLError(CE_Failure, CPLE_AppDefined, msg);                            \
         return false;                                                          \
@@ -1602,20 +1587,21 @@ bool FileGDBTable::SeekIntoTableXForNewFeature(int nObjectID)
     int iCorrectedRow;
     bool bWriteEmptyPageAtEnd = false;
     const uint32_t nPageSize = TABLX_FEATURES_PER_PAGE * m_nTablxOffsetSize;
+    const int nTotalRecordCount = static_cast<int>(m_nTotalRecordCount);
 
     if (m_abyTablXBlockMap.empty())
     {
         // Is the OID to write in the current allocated pages, or in the next
         // page ?
         if ((nObjectID - 1) / TABLX_FEATURES_PER_PAGE <=
-            ((m_nTotalRecordCount == 0)
+            ((nTotalRecordCount == 0)
                  ? 0
-                 : (1 + (m_nTotalRecordCount - 1) / TABLX_FEATURES_PER_PAGE)))
+                 : (1 + (nTotalRecordCount - 1) / TABLX_FEATURES_PER_PAGE)))
         {
             iCorrectedRow = nObjectID - 1;
             const auto n1024BlocksPresentBefore = m_n1024BlocksPresent;
             m_n1024BlocksPresent =
-                DIV_ROUND_UP(std::max(m_nTotalRecordCount, nObjectID),
+                DIV_ROUND_UP(std::max(nTotalRecordCount, nObjectID),
                              TABLX_FEATURES_PER_PAGE);
             bWriteEmptyPageAtEnd =
                 m_n1024BlocksPresent > n1024BlocksPresentBefore;
@@ -1626,13 +1612,13 @@ bool FileGDBTable::SeekIntoTableXForNewFeature(int nObjectID)
             m_abyTablXBlockMap.resize(
                 (DIV_ROUND_UP(nObjectID, TABLX_FEATURES_PER_PAGE) + 7) / 8);
             for (int i = 0;
-                 i < DIV_ROUND_UP(m_nTotalRecordCount, TABLX_FEATURES_PER_PAGE);
+                 i < DIV_ROUND_UP(nTotalRecordCount, TABLX_FEATURES_PER_PAGE);
                  ++i)
                 m_abyTablXBlockMap[i / 8] |= (1 << (i % 8));
             const int iBlock = (nObjectID - 1) / TABLX_FEATURES_PER_PAGE;
             m_abyTablXBlockMap[iBlock / 8] |= (1 << (iBlock % 8));
             iCorrectedRow =
-                DIV_ROUND_UP(m_nTotalRecordCount, TABLX_FEATURES_PER_PAGE) *
+                DIV_ROUND_UP(nTotalRecordCount, TABLX_FEATURES_PER_PAGE) *
                     TABLX_FEATURES_PER_PAGE +
                 ((nObjectID - 1) % TABLX_FEATURES_PER_PAGE);
             m_n1024BlocksPresent++;
@@ -1643,7 +1629,7 @@ bool FileGDBTable::SeekIntoTableXForNewFeature(int nObjectID)
     {
         const int iBlock = (nObjectID - 1) / TABLX_FEATURES_PER_PAGE;
 
-        if (nObjectID <= m_nTotalRecordCount)
+        if (nObjectID <= nTotalRecordCount)
         {
             CPLAssert(iBlock / 8 < static_cast<int>(m_abyTablXBlockMap.size()));
             if (TEST_BIT(m_abyTablXBlockMap.data(), iBlock) == 0)
@@ -1657,9 +1643,8 @@ bool FileGDBTable::SeekIntoTableXForNewFeature(int nObjectID)
 
                 std::vector<GByte> abyTmp(nPageSize);
                 uint64_t nOffset =
-                    TABLX_HEADER_SIZE +
-                    static_cast<uint64_t>(m_n1024BlocksPresent) * nPageSize;
-                for (int i = m_n1024BlocksPresent - 1;
+                    TABLX_HEADER_SIZE + m_n1024BlocksPresent * nPageSize;
+                for (int i = static_cast<int>(m_n1024BlocksPresent - 1);
                      i >= static_cast<int>(nCountBlocksBefore); --i)
                 {
                     nOffset -= nPageSize;
@@ -1702,7 +1687,7 @@ bool FileGDBTable::SeekIntoTableXForNewFeature(int nObjectID)
             }
         }
         else if (DIV_ROUND_UP(nObjectID, TABLX_FEATURES_PER_PAGE) >
-                 DIV_ROUND_UP(m_nTotalRecordCount, TABLX_FEATURES_PER_PAGE))
+                 DIV_ROUND_UP(nTotalRecordCount, TABLX_FEATURES_PER_PAGE))
         {
             m_abyTablXBlockMap.resize(
                 (DIV_ROUND_UP(nObjectID, TABLX_FEATURES_PER_PAGE) + 7) / 8);
@@ -1817,7 +1802,7 @@ bool FileGDBTable::CreateFeature(const std::vector<OGRField> &asRawFields,
                      "Maximum number of records per table reached");
             return false;
         }
-        nObjectID = m_nTotalRecordCount + 1;
+        nObjectID = static_cast<int>(m_nTotalRecordCount + 1);
     }
 
     try
@@ -1882,7 +1867,8 @@ bool FileGDBTable::CreateFeature(const std::vector<OGRField> &asRawFields,
         m_nFileSize += sizeof(uint32_t) + m_nRowBlobLength;
     }
 
-    m_nTotalRecordCount = std::max(m_nTotalRecordCount, nObjectID);
+    m_nTotalRecordCount =
+        std::max(m_nTotalRecordCount, static_cast<int64_t>(nObjectID));
     m_nValidRecordCount++;
 
     m_bDirtyHeader = true;
@@ -1897,7 +1883,7 @@ bool FileGDBTable::CreateFeature(const std::vector<OGRField> &asRawFields,
 /*                          UpdateFeature()                             */
 /************************************************************************/
 
-bool FileGDBTable::UpdateFeature(int nFID,
+bool FileGDBTable::UpdateFeature(int64_t nFID,
                                  const std::vector<OGRField> &asRawFields,
                                  const OGRGeometry *poGeom)
 {
@@ -2016,6 +2002,7 @@ bool FileGDBTable::UpdateFeature(int nFID,
         m_nRowBufferMaxSize = std::max(m_nRowBufferMaxSize, m_nRowBlobLength);
         if (nFreeOffset == OFFSET_MINUS_ONE)
         {
+            m_bDirtyHeader = true;
             m_nFileSize += sizeof(uint32_t) + m_nRowBlobLength;
         }
 
@@ -2050,7 +2037,7 @@ bool FileGDBTable::UpdateFeature(int nFID,
 /*                          DeleteFeature()                             */
 /************************************************************************/
 
-bool FileGDBTable::DeleteFeature(int nFID)
+bool FileGDBTable::DeleteFeature(int64_t nFID)
 {
     if (!m_bUpdate)
         return false;
@@ -2627,7 +2614,7 @@ void FileGDBTable::RecomputeExtent()
     // Scan all features
     OGREnvelope sLayerEnvelope;
     OGREnvelope sFeatureEnvelope;
-    for (int iCurFeat = 0; iCurFeat < m_nTotalRecordCount; ++iCurFeat)
+    for (int64_t iCurFeat = 0; iCurFeat < m_nTotalRecordCount; ++iCurFeat)
     {
         iCurFeat = GetAndSelectNextNonEmptyRow(iCurFeat);
         if (iCurFeat < 0)
diff --git a/ogr/ogrsf_frmts/openfilegdb/filegdbtable_write_fields.cpp b/ogr/ogrsf_frmts/openfilegdb/filegdbtable_write_fields.cpp
index c8e61c7e6f3c..af9e09ed4940 100644
--- a/ogr/ogrsf_frmts/openfilegdb/filegdbtable_write_fields.cpp
+++ b/ogr/ogrsf_frmts/openfilegdb/filegdbtable_write_fields.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -151,7 +135,7 @@ bool FileGDBTable::CreateField(std::unique_ptr<FileGDBField> &&psField)
             m_nNullableFieldsSizeInBytes =
                 BIT_ARRAY_SIZE_IN_BYTES(m_nCountNullableFields);
         }
-        m_apoFields.resize(m_apoFields.size() - 1);
+        m_apoFields.pop_back();
         m_bDirtyFieldDescriptors = true;
         return false;
     }
@@ -170,7 +154,7 @@ bool FileGDBTable::RewriteTableToAddLastAddedField()
     {
         nOldCountNullableFields--;
     }
-    const int nOldNullableFieldsSizeInBytes =
+    const unsigned nOldNullableFieldsSizeInBytes =
         BIT_ARRAY_SIZE_IN_BYTES(nOldCountNullableFields);
     int nExtraBytes = 0;
     if (nOldNullableFieldsSizeInBytes != m_nNullableFieldsSizeInBytes)
@@ -320,7 +304,7 @@ bool FileGDBTable::RewriteTableToAddLastAddedField()
                     return false;
 
                 // Write updated feature data
-                if (nOldNullableFieldsSizeInBytes > 0)
+                if (nOldNullableFieldsSizeInBytes != 0)
                 {
                     if (VSIFWriteL(m_abyBuffer.data(),
                                    nOldNullableFieldsSizeInBytes, 1,
@@ -336,7 +320,7 @@ bool FileGDBTable::RewriteTableToAddLastAddedField()
                                    oWholeFileRewriter.m_fpTable) != 1)
                         return false;
                 }
-                if (nFeatureSize - nOldNullableFieldsSizeInBytes > 0)
+                if (nFeatureSize > nOldNullableFieldsSizeInBytes)
                 {
                     if (VSIFWriteL(m_abyBuffer.data() +
                                        nOldNullableFieldsSizeInBytes,
@@ -383,8 +367,17 @@ WriteFieldDescriptor(std::vector<GByte> &abyBuffer, const FileGDBField *psField,
     WriteUTF16String(abyBuffer, psField->GetAlias().c_str(),
                      NUMBER_OF_CHARS_ON_UINT8);
     WriteUInt8(abyBuffer, static_cast<uint8_t>(psField->GetType()));
-    constexpr int UNKNOWN_FIELD_FLAG = 4;
+
     const auto &sDefault = *(psField->GetDefault());
+
+    uint8_t nFlag = 0;
+    if (psField->IsNullable())
+        nFlag = static_cast<uint8_t>(nFlag | FileGDBField::MASK_NULLABLE);
+    if (psField->IsRequired())
+        nFlag = static_cast<uint8_t>(nFlag | FileGDBField::MASK_REQUIRED);
+    if (psField->IsEditable())
+        nFlag = static_cast<uint8_t>(nFlag | FileGDBField::MASK_EDITABLE);
+
     switch (psField->GetType())
     {
         case FGFT_UNDEFINED:
@@ -396,9 +389,7 @@ WriteFieldDescriptor(std::vector<GByte> &abyBuffer, const FileGDBField *psField,
         case FGFT_INT16:
         {
             WriteUInt8(abyBuffer, 2);  // sizeof(int16)
-            WriteUInt8(abyBuffer, static_cast<uint8_t>(
-                                      UNKNOWN_FIELD_FLAG |
-                                      static_cast<int>(psField->IsNullable())));
+            WriteUInt8(abyBuffer, nFlag);
             if (!OGR_RawField_IsNull(&sDefault) &&
                 !OGR_RawField_IsUnset(&sDefault))
             {
@@ -415,9 +406,7 @@ WriteFieldDescriptor(std::vector<GByte> &abyBuffer, const FileGDBField *psField,
         case FGFT_INT32:
         {
             WriteUInt8(abyBuffer, 4);  // sizeof(int32)
-            WriteUInt8(abyBuffer, static_cast<uint8_t>(
-                                      UNKNOWN_FIELD_FLAG |
-                                      static_cast<int>(psField->IsNullable())));
+            WriteUInt8(abyBuffer, nFlag);
             if (!OGR_RawField_IsNull(&sDefault) &&
                 !OGR_RawField_IsUnset(&sDefault))
             {
@@ -434,9 +423,7 @@ WriteFieldDescriptor(std::vector<GByte> &abyBuffer, const FileGDBField *psField,
         case FGFT_FLOAT32:
         {
             WriteUInt8(abyBuffer, 4);  // sizeof(float32)
-            WriteUInt8(abyBuffer, static_cast<uint8_t>(
-                                      UNKNOWN_FIELD_FLAG |
-                                      static_cast<int>(psField->IsNullable())));
+            WriteUInt8(abyBuffer, nFlag);
             if (!OGR_RawField_IsNull(&sDefault) &&
                 !OGR_RawField_IsUnset(&sDefault))
             {
@@ -453,9 +440,7 @@ WriteFieldDescriptor(std::vector<GByte> &abyBuffer, const FileGDBField *psField,
         case FGFT_FLOAT64:
         {
             WriteUInt8(abyBuffer, 8);  // sizeof(float64)
-            WriteUInt8(abyBuffer, static_cast<uint8_t>(
-                                      UNKNOWN_FIELD_FLAG |
-                                      static_cast<int>(psField->IsNullable())));
+            WriteUInt8(abyBuffer, nFlag);
             if (!OGR_RawField_IsNull(&sDefault) &&
                 !OGR_RawField_IsUnset(&sDefault))
             {
@@ -472,9 +457,7 @@ WriteFieldDescriptor(std::vector<GByte> &abyBuffer, const FileGDBField *psField,
         case FGFT_STRING:
         {
             WriteUInt32(abyBuffer, psField->GetMaxWidth());
-            WriteUInt8(abyBuffer, static_cast<uint8_t>(
-                                      UNKNOWN_FIELD_FLAG |
-                                      static_cast<int>(psField->IsNullable())));
+            WriteUInt8(abyBuffer, nFlag);
             if (!OGR_RawField_IsNull(&sDefault) &&
                 !OGR_RawField_IsUnset(&sDefault))
             {
@@ -505,9 +488,7 @@ WriteFieldDescriptor(std::vector<GByte> &abyBuffer, const FileGDBField *psField,
         case FGFT_DATE:
         {
             WriteUInt8(abyBuffer, 8);  // sizeof(float64)
-            WriteUInt8(abyBuffer, static_cast<uint8_t>(
-                                      UNKNOWN_FIELD_FLAG |
-                                      static_cast<int>(psField->IsNullable())));
+            WriteUInt8(abyBuffer, nFlag);
             if (!OGR_RawField_IsNull(&sDefault) &&
                 !OGR_RawField_IsUnset(&sDefault))
             {
@@ -536,9 +517,7 @@ WriteFieldDescriptor(std::vector<GByte> &abyBuffer, const FileGDBField *psField,
             const auto *geomField =
                 cpl::down_cast<const FileGDBGeomField *>(psField);
             WriteUInt8(abyBuffer, 0);  // unknown role
-            WriteUInt8(abyBuffer, static_cast<uint8_t>(
-                                      2 | UNKNOWN_FIELD_FLAG |
-                                      static_cast<int>(psField->IsNullable())));
+            WriteUInt8(abyBuffer, nFlag);
             WriteUTF16String(abyBuffer, geomField->GetWKT().c_str(),
                              NUMBER_OF_BYTES_ON_UINT16);
             WriteUInt8(
@@ -600,9 +579,7 @@ WriteFieldDescriptor(std::vector<GByte> &abyBuffer, const FileGDBField *psField,
         case FGFT_BINARY:
         {
             WriteUInt8(abyBuffer, 0);  // unknown role
-            WriteUInt8(abyBuffer, static_cast<uint8_t>(
-                                      UNKNOWN_FIELD_FLAG |
-                                      static_cast<int>(psField->IsNullable())));
+            WriteUInt8(abyBuffer, nFlag);
             break;
         }
 
@@ -617,27 +594,21 @@ WriteFieldDescriptor(std::vector<GByte> &abyBuffer, const FileGDBField *psField,
         case FGFT_GLOBALID:
         {
             WriteUInt8(abyBuffer, 38);  // size
-            WriteUInt8(abyBuffer, static_cast<uint8_t>(
-                                      UNKNOWN_FIELD_FLAG |
-                                      static_cast<int>(psField->IsNullable())));
+            WriteUInt8(abyBuffer, nFlag);
             break;
         }
 
         case FGFT_XML:
         {
             WriteUInt8(abyBuffer, 0);  // unknown role
-            WriteUInt8(abyBuffer, static_cast<uint8_t>(
-                                      UNKNOWN_FIELD_FLAG |
-                                      static_cast<int>(psField->IsNullable())));
+            WriteUInt8(abyBuffer, nFlag);
             break;
         }
 
         case FGFT_INT64:
         {
             WriteUInt8(abyBuffer, 8);  // sizeof(int64)
-            WriteUInt8(abyBuffer, static_cast<uint8_t>(
-                                      UNKNOWN_FIELD_FLAG |
-                                      static_cast<int>(psField->IsNullable())));
+            WriteUInt8(abyBuffer, nFlag);
             if (!OGR_RawField_IsNull(&sDefault) &&
                 !OGR_RawField_IsUnset(&sDefault))
             {
@@ -654,9 +625,7 @@ WriteFieldDescriptor(std::vector<GByte> &abyBuffer, const FileGDBField *psField,
         case FGFT_TIME:
         {
             WriteUInt8(abyBuffer, 8);  // sizeof(float64)
-            WriteUInt8(abyBuffer, static_cast<uint8_t>(
-                                      UNKNOWN_FIELD_FLAG |
-                                      static_cast<int>(psField->IsNullable())));
+            WriteUInt8(abyBuffer, nFlag);
             if (!OGR_RawField_IsNull(&sDefault) &&
                 !OGR_RawField_IsUnset(&sDefault))
             {
@@ -673,9 +642,7 @@ WriteFieldDescriptor(std::vector<GByte> &abyBuffer, const FileGDBField *psField,
         case FGFT_DATETIME_WITH_OFFSET:
         {
             WriteUInt8(abyBuffer, 8 + 2);  // sizeof(float64) + sizeof(int16)
-            WriteUInt8(abyBuffer, static_cast<uint8_t>(
-                                      UNKNOWN_FIELD_FLAG |
-                                      static_cast<int>(psField->IsNullable())));
+            WriteUInt8(abyBuffer, nFlag);
             if (!OGR_RawField_IsNull(&sDefault) &&
                 !OGR_RawField_IsUnset(&sDefault))
             {
@@ -837,7 +804,7 @@ bool FileGDBTable::DeleteField(int iField)
             m_apoFields[m_iGeomField]->m_eType = FGFT_BINARY;
         m_iGeomField = -1;
 
-        for (int iCurFeat = 0; iCurFeat < m_nTotalRecordCount; ++iCurFeat)
+        for (int64_t iCurFeat = 0; iCurFeat < m_nTotalRecordCount; ++iCurFeat)
         {
             iCurFeat = GetAndSelectNextNonEmptyRow(iCurFeat);
             if (iCurFeat < 0)
@@ -978,7 +945,8 @@ bool FileGDBTable::AlterField(int iField, const std::string &osName,
     auto poIndex = m_apoFields[iField]->m_poIndex;
 
     m_apoFields[iField] = std::make_unique<FileGDBField>(
-        osName, osAlias, eType, bNullable, nMaxWidth, sDefault);
+        osName, osAlias, eType, bNullable, m_apoFields[iField]->IsRequired(),
+        m_apoFields[iField]->IsEditable(), nMaxWidth, sDefault);
     m_apoFields[iField]->SetParent(this);
     m_apoFields[iField]->m_poIndex = poIndex;
     if (poIndex && bRenameField)
diff --git a/ogr/ogrsf_frmts/openfilegdb/find_srs_latitude_limits.py b/ogr/ogrsf_frmts/openfilegdb/find_srs_latitude_limits.py
new file mode 100644
index 000000000000..7675069e06ca
--- /dev/null
+++ b/ogr/ogrsf_frmts/openfilegdb/find_srs_latitude_limits.py
@@ -0,0 +1,51 @@
+import struct
+
+from osgeo import gdal, ogr, osr
+
+gdal.RmdirRecursive("test.gdb")
+ds = ogr.GetDriverByName("FileGDB").CreateDataSource("test.gdb")
+srs = osr.SpatialReference()
+# srs.SetFromUserInput("+proj=tmerc +lon_0=-40 +lat_0=60 +k=0.9 +x_0=00000 +y_0=00000 +datum=WGS84")
+srs.SetFromUserInput(
+    "+proj=merc +lon_0=-40 +lat_0=60 +k=0.9 +x_0=00000 +y_0=00000 +datum=WGS84"
+)
+srs_lonlat = srs.CloneGeogCS()
+srs_lonlat.SetAxisMappingStrategy(osr.OAMS_TRADITIONAL_GIS_ORDER)
+ct = osr.CoordinateTransformation(srs, srs_lonlat)
+grid_step = 0.1
+lyr = ds.CreateLayer("test", geom_type=ogr.wkbPoint, srs=srs)
+# Add 2 dummy features to set the grid_step to what we want
+f = ogr.Feature(lyr.GetLayerDefn())
+f.SetGeometry(ogr.CreateGeometryFromWkt("POINT(0 0)"))
+lyr.CreateFeature(f)
+f = ogr.Feature(lyr.GetLayerDefn())
+y = (2**0.5) * grid_step
+f.SetGeometry(ogr.CreateGeometryFromWkt("POINT(%f %f)" % (y, y)))
+lyr.CreateFeature(f)
+ds = None
+ds = ogr.GetDriverByName("FileGDB").Open("test.gdb", update=1)
+lyr = ds.GetLayer(0)
+lyr.DeleteFeature(1)
+lyr.DeleteFeature(2)
+y = 1e9  # some big value
+f = ogr.Feature(lyr.GetLayerDefn())
+g = ogr.CreateGeometryFromWkt("POINT(0 %f)" % y)
+f.SetGeometry(g)
+lyr.CreateFeature(f)
+f = ogr.Feature(lyr.GetLayerDefn())
+g = ogr.CreateGeometryFromWkt("POINT(0 %f)" % -y)
+f.SetGeometry(g)
+lyr.CreateFeature(f)
+ds = None
+f = open("test.gdb/a00000009.spx", "rb")
+f.seek(4)
+n = ord(f.read(1))
+for x in range(n):
+    f.seek(1372 + x * 8, 0)
+    v = struct.unpack("Q", f.read(8))[0]
+    x = v >> 31 & 0x7FFFFFFF - (1 << 29)
+    y = (v & 0x7FFFFFFF) - (1 << 29)
+    print(x, y)  # the y value will be clamped
+    print(
+        ct.TransformPoint(srs.GetProjParm(osr.SRS_PP_FALSE_EASTING, 0.0), y * grid_step)
+    )
diff --git a/ogr/ogrsf_frmts/openfilegdb/gdalopenfilegdbrasterband.cpp b/ogr/ogrsf_frmts/openfilegdb/gdalopenfilegdbrasterband.cpp
index 6a0119005011..3d4c77c2be79 100644
--- a/ogr/ogrsf_frmts/openfilegdb/gdalopenfilegdbrasterband.cpp
+++ b/ogr/ogrsf_frmts/openfilegdb/gdalopenfilegdbrasterband.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -37,6 +21,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <cmath>
 #include <limits>
 #include <new>
 #include <utility>
@@ -117,10 +102,14 @@ bool OGROpenFileGDBDataSource::OpenRaster(const GDALOpenInfo *poOpenInfo,
         return false;
     }
 
-    int iRow = 0;
+    int64_t iRow = 0;
     while (iRow < oTable.GetTotalRecordCount() &&
            (iRow = oTable.GetAndSelectNextNonEmptyRow(iRow)) >= 0)
     {
+        if (iRow >= INT32_MAX)
+        {
+            return false;
+        }
         auto psField = oTable.GetFieldValue(i_raster_id);
         if (!psField)
         {
@@ -137,7 +126,7 @@ bool OGROpenFileGDBDataSource::OpenRaster(const GDALOpenInfo *poOpenInfo,
             continue;
         }
 
-        const int nGDBRasterBandId = iRow + 1;
+        const int nGDBRasterBandId = static_cast<int>(iRow) + 1;
 
         psField = oTable.GetFieldValue(i_sequence_nbr);
         if (!psField)
@@ -715,7 +704,7 @@ bool OGROpenFileGDBDataSource::OpenRaster(const GDALOpenInfo *poOpenInfo,
             if (std::fabs(dfNoData) > std::numeric_limits<float>::max())
             {
                 CPLError(CE_Failure, CPLE_AppDefined,
-                         "Invalid nodata value %.18g for Float32", dfNoData);
+                         "Invalid nodata value %.17g for Float32", dfNoData);
                 return false;
             }
             bHasNoData = true;
@@ -758,7 +747,7 @@ bool OGROpenFileGDBDataSource::OpenRaster(const GDALOpenInfo *poOpenInfo,
                 dfNoData != static_cast<double>(static_cast<int64_t>(dfNoData)))
             {
                 CPLError(CE_Failure, CPLE_AppDefined,
-                         "Invalid nodata value %.18g for %s", dfNoData,
+                         "Invalid nodata value %.17g for %s", dfNoData,
                          GDALGetDataTypeName(eDT));
                 return false;
             }
@@ -901,8 +890,8 @@ void OGROpenFileGDBDataSource::GuessJPEGQuality(int nOverviewCount)
                 }
                 if (nJPEGSize)
                 {
-                    CPLString osTmpFilename;
-                    osTmpFilename.Printf("/vsimem/_openfilegdb/%p.jpg", this);
+                    const CPLString osTmpFilename(
+                        VSIMemGenerateHiddenFilename("openfilegdb.jpg"));
                     VSIFCloseL(VSIFileFromMemBuffer(
                         osTmpFilename.c_str(),
                         const_cast<GByte *>(pabyData + nJPEGOffset), nJPEGSize,
@@ -1546,12 +1535,8 @@ CPLErr GDALOpenFileGDBRasterBand::IReadBlock(int nBlockXOff, int nBlockYOff,
                 return CE_Failure;
             }
 
-            VSILFILE *fp = VSIFOpenL("tmp.jpg", "wb");
-            VSIFWriteL(pabyData + nJPEGOffset, nJPEGSize, 1, fp);
-            VSIFCloseL(fp);
-
-            CPLString osTmpFilename;
-            osTmpFilename.Printf("/vsimem/_openfilegdb/%p.jpg", this);
+            const CPLString osTmpFilename(
+                VSIMemGenerateHiddenFilename("openfilegdb.jpg"));
             VSIFCloseL(VSIFileFromMemBuffer(
                 osTmpFilename.c_str(),
                 const_cast<GByte *>(pabyData + nJPEGOffset), nJPEGSize, false));
@@ -1673,8 +1658,8 @@ CPLErr GDALOpenFileGDBRasterBand::IReadBlock(int nBlockXOff, int nBlockYOff,
                 return CE_Failure;
             }
 
-            CPLString osTmpFilename;
-            osTmpFilename.Printf("/vsimem/_openfilegdb/%p.j2k", this);
+            const CPLString osTmpFilename(
+                VSIMemGenerateHiddenFilename("openfilegdb.j2k"));
             VSIFCloseL(VSIFileFromMemBuffer(
                 osTmpFilename.c_str(),
                 const_cast<GByte *>(pabyData + nJPEGOffset), nJPEGSize, false));
@@ -1900,7 +1885,7 @@ CPLErr GDALOpenFileGDBRasterBand::IReadBlock(int nBlockXOff, int nBlockYOff,
         {
             for (int x = 0; x < nBlockXSize; ++x)
             {
-                printf("%.18g ", // ok
+                printf("%.17g ", // ok
                        static_cast<double *>(pImage)[y * nBlockXSize + x]);
             }
             printf("\n"); // ok
diff --git a/ogr/ogrsf_frmts/openfilegdb/ogr_openfilegdb.h b/ogr/ogrsf_frmts/openfilegdb/ogr_openfilegdb.h
index 2dd3a8a2a654..ae2a5f3e3d0f 100644
--- a/ogr/ogrsf_frmts/openfilegdb/ogr_openfilegdb.h
+++ b/ogr/ogrsf_frmts/openfilegdb/ogr_openfilegdb.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_OPENFILEGDB_H_INCLUDED
@@ -138,7 +122,7 @@ class OGROpenFileGDBLayer final : public OGRLayer
     int m_iGeomFieldIdx = -1;
     int m_iAreaField = -1;    // index of Shape_Area field
     int m_iLengthField = -1;  // index of Shape_Length field
-    int m_iCurFeat = 0;
+    int64_t m_iCurFeat = 0;
     int m_iFIDAsRegularColumnIndex = -1;
     std::string m_osDefinition{};
     std::string m_osDocumentation{};
@@ -239,7 +223,7 @@ class OGROpenFileGDBLayer final : public OGRLayer
                                    int &eOutType);
     int GetMinMaxSumCount(OGRFieldDefn *poFieldDefn, double &dfMin,
                           double &dfMax, double &dfSum, int &nCount);
-    int HasIndexForField(const char *pszFieldName);
+    bool HasIndexForField(const char *pszFieldName);
     FileGDBIterator *BuildIndex(const char *pszFieldName, int bAscending,
                                 int op, swq_expr_node *poValue);
 
@@ -438,7 +422,7 @@ class OGROpenFileGDBFeatureDefn : public OGRFeatureDefn
 /*                       OGROpenFileGDBDataSource                       */
 /************************************************************************/
 
-class OGROpenFileGDBDataSource final : public OGRDataSource
+class OGROpenFileGDBDataSource final : public GDALDataset
 {
     friend class OGROpenFileGDBLayer;
     friend class GDALOpenFileGDBRasterBand;
@@ -545,11 +529,6 @@ class OGROpenFileGDBDataSource final : public OGRDataSource
 
     virtual CPLErr FlushCache(bool bAtClosing = false) override;
 
-    virtual const char *GetName() override
-    {
-        return m_osDirName.c_str();
-    }
-
     virtual int GetLayerCount() override
     {
         return static_cast<int>(m_apoLayers.size());
diff --git a/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdb_generate_uuid.cpp b/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdb_generate_uuid.cpp
index 0c6a23f0a0ad..4198263416ac 100644
--- a/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdb_generate_uuid.cpp
+++ b/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdb_generate_uuid.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdatasource.cpp b/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdatasource.cpp
index 77dae116b5b7..abeef39621f1 100644
--- a/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdatasource.cpp
+++ b/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdatasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -454,7 +438,7 @@ bool OGROpenFileGDBDataSource::Open(const GDALOpenInfo *poOpenInfo,
         for (const auto &oIter : m_osMapNameToIdx)
         {
             // test if layer is already added
-            if (OGRDataSource::GetLayerByName(oIter.first.c_str()))
+            if (GDALDataset::GetLayerByName(oIter.first.c_str()))
                 continue;
 
             if (bListAllTables || !IsPrivateLayerName(oIter.first))
@@ -462,8 +446,7 @@ bool OGROpenFileGDBDataSource::Open(const GDALOpenInfo *poOpenInfo,
                 const int idx = oIter.second;
                 CPLString osFilename(CPLFormFilename(
                     m_osDirName, CPLSPrintf("a%08x", idx), "gdbtable"));
-                if (oSetIgnoredRasterLayerTableNum.find(idx) ==
-                        oSetIgnoredRasterLayerTableNum.end() &&
+                if (!cpl::contains(oSetIgnoredRasterLayerTableNum, idx) &&
                     FileExists(osFilename))
                 {
                     m_apoLayers.emplace_back(
@@ -528,14 +511,13 @@ OGRLayer *OGROpenFileGDBDataSource::AddLayer(
     const CPLString &osDocumentation, OGRwkbGeometryType eGeomType,
     const std::string &osParentDefinition)
 {
-    std::map<std::string, int>::const_iterator oIter =
-        m_osMapNameToIdx.find(osName);
+    const auto oIter = m_osMapNameToIdx.find(osName);
     int idx = 0;
     if (oIter != m_osMapNameToIdx.end())
         idx = oIter->second;
     if (idx > 0 && (nInterestTable <= 0 || nInterestTable == idx))
     {
-        m_osMapNameToIdx.erase(osName);
+        m_osMapNameToIdx.erase(oIter);
 
         CPLString osFilename =
             CPLFormFilename(m_osDirName, CPLSPrintf("a%08x", idx), "gdbtable");
@@ -681,7 +663,13 @@ bool OGROpenFileGDBDataSource::OpenFileGDBv10(
 
     CPLString osFilename(CPLFormFilename(
         m_osDirName, CPLSPrintf("a%08x.gdbtable", iGDBItems + 1), nullptr));
-    if (!oTable.Open(osFilename, false))
+
+    // Normally we don't need to update in update mode the GDB_Items table,
+    // but this may help repairing it, if we have corrupted it with past
+    // GDAL versions.
+    const bool bOpenInUpdateMode =
+        (poOpenInfo->nOpenFlags & GDAL_OF_UPDATE) != 0;
+    if (!oTable.Open(osFilename, bOpenInUpdateMode))
         return false;
 
     const int iUUID = oTable.GetFieldIdx("UUID");
@@ -1220,11 +1208,10 @@ std::unique_ptr<OGROpenFileGDBLayer>
 OGROpenFileGDBDataSource::BuildLayerFromName(const char *pszName)
 {
 
-    std::map<std::string, int>::const_iterator oIter =
-        m_osMapNameToIdx.find(pszName);
+    const auto oIter = m_osMapNameToIdx.find(pszName);
     if (oIter != m_osMapNameToIdx.end())
     {
-        int idx = oIter->second;
+        const int idx = oIter->second;
         CPLString osFilename(
             CPLFormFilename(m_osDirName, CPLSPrintf("a%08x", idx), "gdbtable"));
         if (FileExists(osFilename))
@@ -1299,7 +1286,7 @@ char **OGROpenFileGDBDataSource::GetMetadata(const char *pszDomain)
 {
     if (pszDomain && EQUAL(pszDomain, "SUBDATASETS"))
         return m_aosSubdatasets.List();
-    return OGRDataSource::GetMetadata(pszDomain);
+    return GDALDataset::GetMetadata(pszDomain);
 }
 
 /************************************************************************/
@@ -1504,7 +1491,7 @@ OGRFeature *OGROpenFileGDBSimpleSQLLayer::GetNextFeature()
         if (m_nLimit >= 0 && m_nIterated == m_nLimit)
             return nullptr;
 
-        int nRow = poIter->GetNextRowSortedByValue();
+        const int64_t nRow = poIter->GetNextRowSortedByValue();
         if (nRow < 0)
             return nullptr;
         OGRFeature *poFeature = GetFeature(nRow + 1);
@@ -1713,6 +1700,13 @@ OGRLayer *OGROpenFileGDBDataSource::ExecuteSQL(const char *pszSQLCommand,
                 const std::string osLayerName = afterOn.substr(0, nOpenParPos);
                 const std::string osExpression = afterOn.substr(
                     nOpenParPos + 1, afterOn.size() - nOpenParPos - 2);
+                if (osExpression.find(',') != std::string::npos)
+                {
+                    CPLError(
+                        CE_Failure, CPLE_NotSupported,
+                        "Creation of multiple-column indices is not supported");
+                    return nullptr;
+                }
                 auto poLayer = GetLayerByName(osLayerName.c_str());
                 if (poLayer)
                 {
@@ -2079,8 +2073,7 @@ OGRLayer *OGROpenFileGDBDataSource::ExecuteSQL(const char *pszSQLCommand,
         }
     }
 
-    return OGRDataSource::ExecuteSQL(pszSQLCommand, poSpatialFilter,
-                                     pszDialect);
+    return GDALDataset::ExecuteSQL(pszSQLCommand, poSpatialFilter, pszDialect);
 }
 
 /***********************************************************************/
@@ -2151,7 +2144,8 @@ OGROpenFileGDBDataSource::BuildSRS(const CPLXMLNode *psInfo)
             [](OGRSpatialReference &oSRS, int nLatestCode, int nCode)
         {
             bool bSuccess = false;
-            CPLPushErrorHandler(CPLQuietErrorHandler);
+            CPLErrorStateBackuper oQuietError(CPLQuietErrorHandler);
+
             // Try first with nLatestWKID as there is a higher chance it is a
             // EPSG code and not an ESRI one.
             if (nLatestCode > 0)
@@ -2193,8 +2187,7 @@ OGROpenFileGDBDataSource::BuildSRS(const CPLXMLNode *psInfo)
                     CPLDebug("OpenFileGDB", "Cannot import SRID %d", nCode);
                 }
             }
-            CPLPopErrorHandler();
-            CPLErrorReset();
+
             return bSuccess;
         };
 
diff --git a/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdatasource_write.cpp b/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdatasource_write.cpp
index 6cf35031911b..f6e54d500998 100644
--- a/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdatasource_write.cpp
+++ b/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdatasource_write.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -77,7 +61,7 @@ bool OGROpenFileGDBDataSource::GetExistingSpatialRef(
     FETCH_FIELD_IDX(iZTolerance, "ZTolerance", FGFT_FLOAT64);
     FETCH_FIELD_IDX(iMTolerance, "MTolerance", FGFT_FLOAT64);
 
-    int iCurFeat = 0;
+    int64_t iCurFeat = 0;
     while (iCurFeat < oTable.GetTotalRecordCount())
     {
         iCurFeat = oTable.GetAndSelectNextNonEmptyRow(iCurFeat);
@@ -246,7 +230,8 @@ bool OGROpenFileGDBDataSource::RemoveRelationshipFromItemRelationships(
     FETCH_FIELD_IDX_WITH_RET(iOriginID, "OriginID", FGFT_GUID, false);
     FETCH_FIELD_IDX_WITH_RET(iDestID, "DestID", FGFT_GUID, false);
 
-    for (int iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount(); ++iCurFeat)
+    for (int64_t iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount();
+         ++iCurFeat)
     {
         iCurFeat = oTable.GetAndSelectNextNonEmptyRow(iCurFeat);
         if (iCurFeat < 0)
@@ -290,7 +275,7 @@ bool OGROpenFileGDBDataSource::LinkDomainToTable(
         FETCH_FIELD_IDX(iOriginID, "OriginID", FGFT_GUID);
         FETCH_FIELD_IDX(iDestID, "DestID", FGFT_GUID);
 
-        for (int iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount();
+        for (int64_t iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount();
              ++iCurFeat)
         {
             iCurFeat = oTable.GetAndSelectNextNonEmptyRow(iCurFeat);
@@ -331,7 +316,8 @@ bool OGROpenFileGDBDataSource::UnlinkDomainToTable(
     FETCH_FIELD_IDX(iOriginID, "OriginID", FGFT_GUID);
     FETCH_FIELD_IDX(iDestID, "DestID", FGFT_GUID);
 
-    for (int iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount(); ++iCurFeat)
+    for (int64_t iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount();
+         ++iCurFeat)
     {
         iCurFeat = oTable.GetAndSelectNextNonEmptyRow(iCurFeat);
         if (iCurFeat < 0)
@@ -365,7 +351,8 @@ bool OGROpenFileGDBDataSource::UpdateXMLDefinition(
     FETCH_FIELD_IDX(iName, "Name", FGFT_STRING);
     FETCH_FIELD_IDX(iDefinition, "Definition", FGFT_XML);
 
-    for (int iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount(); ++iCurFeat)
+    for (int64_t iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount();
+         ++iCurFeat)
     {
         iCurFeat = oTable.GetAndSelectNextNonEmptyRow(iCurFeat);
         if (iCurFeat < 0)
@@ -406,7 +393,8 @@ bool OGROpenFileGDBDataSource::FindUUIDFromName(const std::string &osName,
     FETCH_FIELD_IDX(iUUID, "UUID", FGFT_GLOBALID);
     FETCH_FIELD_IDX(iName, "Name", FGFT_STRING);
 
-    for (int iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount(); ++iCurFeat)
+    for (int64_t iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount();
+         ++iCurFeat)
     {
         iCurFeat = oTable.GetAndSelectNextNonEmptyRow(iCurFeat);
         if (iCurFeat < 0)
@@ -566,14 +554,20 @@ bool OGROpenFileGDBDataSource::CreateGDBSystemCatalog()
     if (!oTable.Create(m_osGDBSystemCatalogFilename.c_str(), 4, FGTGT_NONE,
                        false, false) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "ID", std::string(), FGFT_OBJECTID, false, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "ID", std::string(), FGFT_OBJECTID,
+            /* bNullable = */ false,
+            /* bRequired = */ true,
+            /* bEditable = */ false, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "Name", std::string(), FGFT_STRING, false, 160,
-            FileGDBField::UNSET_FIELD)) ||
+            "Name", std::string(), FGFT_STRING,
+            /* bNullable = */ false,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 160, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "FileFormat", std::string(), FGFT_INT32, false, 0,
-            FileGDBField::UNSET_FIELD)))
+            "FileFormat", std::string(), FGFT_INT32,
+            /* bNullable = */ false,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)))
     {
         return false;
     }
@@ -616,14 +610,20 @@ bool OGROpenFileGDBDataSource::CreateGDBDBTune()
     FileGDBTable oTable;
     if (!oTable.Create(osFilename.c_str(), 4, FGTGT_NONE, false, false) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "Keyword", std::string(), FGFT_STRING, false, 32,
-            FileGDBField::UNSET_FIELD)) ||
+            "Keyword", std::string(), FGFT_STRING,
+            /* bNullable = */ false,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 32, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "ParameterName", std::string(), FGFT_STRING, false, 32,
-            FileGDBField::UNSET_FIELD)) ||
+            "ParameterName", std::string(), FGFT_STRING,
+            /* bNullable = */ false,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 32, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "ConfigString", std::string(), FGFT_STRING, true, 2048,
-            FileGDBField::UNSET_FIELD)))
+            "ConfigString", std::string(), FGFT_STRING,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 2048, FileGDBField::UNSET_FIELD)))
     {
         return false;
     }
@@ -709,41 +709,65 @@ bool OGROpenFileGDBDataSource::CreateGDBSpatialRefs()
     if (!oTable.Create(m_osGDBSpatialRefsFilename.c_str(), 4, FGTGT_NONE, false,
                        false) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "ID", std::string(), FGFT_OBJECTID, false, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "ID", std::string(), FGFT_OBJECTID,
+            /* bNullable = */ false,
+            /* bRequired = */ true,
+            /* bEditable = */ false, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "SRTEXT", std::string(), FGFT_STRING, false, 2048,
-            FileGDBField::UNSET_FIELD)) ||
+            "SRTEXT", std::string(), FGFT_STRING,
+            /* bNullable = */ false,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 2048, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "FalseX", std::string(), FGFT_FLOAT64, true, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "FalseX", std::string(), FGFT_FLOAT64,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "FalseY", std::string(), FGFT_FLOAT64, true, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "FalseY", std::string(), FGFT_FLOAT64,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "XYUnits", std::string(), FGFT_FLOAT64, true, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "XYUnits", std::string(), FGFT_FLOAT64,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "FalseZ", std::string(), FGFT_FLOAT64, true, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "FalseZ", std::string(), FGFT_FLOAT64,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "ZUnits", std::string(), FGFT_FLOAT64, true, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "ZUnits", std::string(), FGFT_FLOAT64,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "FalseM", std::string(), FGFT_FLOAT64, true, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "FalseM", std::string(), FGFT_FLOAT64,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "MUnits", std::string(), FGFT_FLOAT64, true, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "MUnits", std::string(), FGFT_FLOAT64,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "XYTolerance", std::string(), FGFT_FLOAT64, true, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "XYTolerance", std::string(), FGFT_FLOAT64,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "ZTolerance", std::string(), FGFT_FLOAT64, true, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "ZTolerance", std::string(), FGFT_FLOAT64,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "MTolerance", std::string(), FGFT_FLOAT64, true, 0,
-            FileGDBField::UNSET_FIELD)))
+            "MTolerance", std::string(), FGFT_FLOAT64,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)))
     {
         return false;
     }
@@ -789,53 +813,85 @@ bool OGROpenFileGDBDataSource::CreateGDBItems()
     if (!oTable.Create(m_osGDBItemsFilename.c_str(), 4, FGTGT_POLYGON, false,
                        false) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "ObjectID", std::string(), FGFT_OBJECTID, false, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "ObjectID", std::string(), FGFT_OBJECTID,
+            /* bNullable = */ false,
+            /* bRequired = */ true,
+            /* bEditable = */ false, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "UUID", std::string(), FGFT_GLOBALID, false, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "UUID", std::string(), FGFT_GLOBALID,
+            /* bNullable = */ false,
+            /* bRequired = */ true,
+            /* bEditable = */ false, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "Type", std::string(), FGFT_GUID, false, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "Type", std::string(), FGFT_GUID,
+            /* bNullable = */ false,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "Name", std::string(), FGFT_STRING, true, 160,
-            FileGDBField::UNSET_FIELD)) ||
+            "Name", std::string(), FGFT_STRING,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 160, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "PhysicalName", std::string(), FGFT_STRING, true, 160,
-            FileGDBField::UNSET_FIELD)) ||
+            "PhysicalName", std::string(), FGFT_STRING,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 160, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "Path", std::string(), FGFT_STRING, true, 260,
-            FileGDBField::UNSET_FIELD)) ||
+            "Path", std::string(), FGFT_STRING,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 260, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "DatasetSubtype1", std::string(), FGFT_INT32, true, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "DatasetSubtype1", std::string(), FGFT_INT32,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "DatasetSubtype2", std::string(), FGFT_INT32, true, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "DatasetSubtype2", std::string(), FGFT_INT32,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "DatasetInfo1", std::string(), FGFT_STRING, true, 255,
-            FileGDBField::UNSET_FIELD)) ||
+            "DatasetInfo1", std::string(), FGFT_STRING,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 255, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "DatasetInfo2", std::string(), FGFT_STRING, true, 255,
-            FileGDBField::UNSET_FIELD)) ||
+            "DatasetInfo2", std::string(), FGFT_STRING,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 255, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "URL", std::string(), FGFT_STRING, true, 255,
-            FileGDBField::UNSET_FIELD)) ||
+            "URL", std::string(), FGFT_STRING,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 255, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "Definition", std::string(), FGFT_XML, true, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "Definition", std::string(), FGFT_XML,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "Documentation", std::string(), FGFT_XML, true, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "Documentation", std::string(), FGFT_XML,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "ItemInfo", std::string(), FGFT_XML, true, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "ItemInfo", std::string(), FGFT_XML,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "Properties", std::string(), FGFT_INT32, true, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "Properties", std::string(), FGFT_INT32,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "Defaults", std::string(), FGFT_BINARY, true, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "Defaults", std::string(), FGFT_BINARY,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::move(poGeomField)))
     {
         return false;
@@ -899,17 +955,25 @@ bool OGROpenFileGDBDataSource::CreateGDBItemTypes()
     FileGDBTable oTable;
     if (!oTable.Create(osFilename.c_str(), 4, FGTGT_NONE, false, false) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "ObjectID", std::string(), FGFT_OBJECTID, false, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "ObjectID", std::string(), FGFT_OBJECTID,
+            /* bNullable = */ false,
+            /* bRequired = */ true,
+            /* bEditable = */ false, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "UUID", std::string(), FGFT_GUID, false, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "UUID", std::string(), FGFT_GUID,
+            /* bNullable = */ false,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "ParentTypeID", std::string(), FGFT_GUID, false, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "ParentTypeID", std::string(), FGFT_GUID,
+            /* bNullable = */ false,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "Name", std::string(), FGFT_STRING, false, 160,
-            FileGDBField::UNSET_FIELD)))
+            "Name", std::string(), FGFT_STRING,
+            /* bNullable = */ false,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 160, FileGDBField::UNSET_FIELD)))
     {
         return false;
     }
@@ -1014,26 +1078,40 @@ bool OGROpenFileGDBDataSource::CreateGDBItemRelationships()
     if (!oTable.Create(m_osGDBItemRelationshipsFilename.c_str(), 4, FGTGT_NONE,
                        false, false) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "ObjectID", std::string(), FGFT_OBJECTID, false, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "ObjectID", std::string(), FGFT_OBJECTID,
+            /* bNullable = */ false,
+            /* bRequired = */ true,
+            /* bEditable = */ false, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "UUID", std::string(), FGFT_GLOBALID, false, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "UUID", std::string(), FGFT_GLOBALID,
+            /* bNullable = */ false,
+            /* bRequired = */ true,
+            /* bEditable = */ false, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "OriginID", std::string(), FGFT_GUID, false, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "OriginID", std::string(), FGFT_GUID,
+            /* bNullable = */ false,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "DestID", std::string(), FGFT_GUID, false, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "DestID", std::string(), FGFT_GUID,
+            /* bNullable = */ false,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "Type", std::string(), FGFT_GUID, false, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "Type", std::string(), FGFT_GUID,
+            /* bNullable = */ false,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "Attributes", std::string(), FGFT_XML, true, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "Attributes", std::string(), FGFT_XML,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "Properties", std::string(), FGFT_INT32, true, 0,
-            FileGDBField::UNSET_FIELD)))
+            "Properties", std::string(), FGFT_INT32,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)))
     {
         return false;
     }
@@ -1057,29 +1135,45 @@ bool OGROpenFileGDBDataSource::CreateGDBItemRelationshipTypes()
     FileGDBTable oTable;
     if (!oTable.Create(osFilename.c_str(), 4, FGTGT_NONE, false, false) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "ObjectID", std::string(), FGFT_OBJECTID, false, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "ObjectID", std::string(), FGFT_OBJECTID,
+            /* bNullable = */ false,
+            /* bRequired = */ true,
+            /* bEditable = */ false, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "UUID", std::string(), FGFT_GUID, false, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "UUID", std::string(), FGFT_GUID,
+            /* bNullable = */ false,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "OrigItemTypeID", std::string(), FGFT_GUID, false, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "OrigItemTypeID", std::string(), FGFT_GUID,
+            /* bNullable = */ false,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "DestItemTypeID", std::string(), FGFT_GUID, false, 0,
-            FileGDBField::UNSET_FIELD)) ||
+            "DestItemTypeID", std::string(), FGFT_GUID,
+            /* bNullable = */ false,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "Name", std::string(), FGFT_STRING, true, 160,
-            FileGDBField::UNSET_FIELD)) ||
+            "Name", std::string(), FGFT_STRING,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 160, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "ForwardLabel", std::string(), FGFT_STRING, true, 255,
-            FileGDBField::UNSET_FIELD)) ||
+            "ForwardLabel", std::string(), FGFT_STRING,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 255, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "BackwardLabel", std::string(), FGFT_STRING, true, 255,
-            FileGDBField::UNSET_FIELD)) ||
+            "BackwardLabel", std::string(), FGFT_STRING,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 255, FileGDBField::UNSET_FIELD)) ||
         !oTable.CreateField(std::make_unique<FileGDBField>(
-            "IsContainment", std::string(), FGFT_INT16, true, 0,
-            FileGDBField::UNSET_FIELD)))
+            "IsContainment", std::string(), FGFT_INT16,
+            /* bNullable = */ true,
+            /* bRequired = */ false,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD)))
     {
         return false;
     }
@@ -1262,9 +1356,10 @@ OGROpenFileGDBDataSource::ICreateLayer(const char *pszLayerName,
     auto eType = poGeomFieldDefn ? poGeomFieldDefn->GetType() : wkbNone;
 
     FileGDBTable oTable;
-    if (!oTable.Open(m_osGDBSystemCatalogFilename.c_str(), false))
+    if (!oTable.Open(m_osGDBSystemCatalogFilename.c_str(), false) ||
+        oTable.GetTotalRecordCount() >= INT32_MAX)
         return nullptr;
-    const int nTableNum = 1 + oTable.GetTotalRecordCount();
+    const int nTableNum = static_cast<int>(1 + oTable.GetTotalRecordCount());
     oTable.Close();
 
     const std::string osFilename(CPLFormFilename(
@@ -1317,7 +1412,7 @@ OGRErr OGROpenFileGDBDataSource::DeleteLayer(int iLayer)
 
         FETCH_FIELD_IDX_WITH_RET(iName, "Name", FGFT_STRING, OGRERR_FAILURE);
 
-        for (int iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount();
+        for (int64_t iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount();
              ++iCurFeat)
         {
             iCurFeat = oTable.GetAndSelectNextNonEmptyRow(iCurFeat);
@@ -1342,7 +1437,7 @@ OGRErr OGROpenFileGDBDataSource::DeleteLayer(int iLayer)
         FETCH_FIELD_IDX_WITH_RET(iUUID, "UUID", FGFT_GLOBALID, OGRERR_FAILURE);
         FETCH_FIELD_IDX_WITH_RET(iName, "Name", FGFT_STRING, OGRERR_FAILURE);
 
-        for (int iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount();
+        for (int64_t iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount();
              ++iCurFeat)
         {
             iCurFeat = oTable.GetAndSelectNextNonEmptyRow(iCurFeat);
@@ -1374,7 +1469,7 @@ OGRErr OGROpenFileGDBDataSource::DeleteLayer(int iLayer)
                                  OGRERR_FAILURE);
         FETCH_FIELD_IDX_WITH_RET(iDestID, "DestID", FGFT_GUID, OGRERR_FAILURE);
 
-        for (int iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount();
+        for (int64_t iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount();
              ++iCurFeat)
         {
             iCurFeat = oTable.GetAndSelectNextNonEmptyRow(iCurFeat);
@@ -1561,7 +1656,7 @@ bool OGROpenFileGDBDataSource::DeleteFieldDomain(
         FETCH_FIELD_IDX(iType, "Type", FGFT_GUID);
         FETCH_FIELD_IDX(iName, "Name", FGFT_STRING);
 
-        for (int iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount();
+        for (int64_t iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount();
              ++iCurFeat)
         {
             iCurFeat = oTable.GetAndSelectNextNonEmptyRow(iCurFeat);
@@ -1601,7 +1696,7 @@ bool OGROpenFileGDBDataSource::DeleteFieldDomain(
         FETCH_FIELD_IDX(iDestID, "DestID", FGFT_GUID);
         FETCH_FIELD_IDX(iType, "Type", FGFT_GUID);
 
-        for (int iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount();
+        for (int64_t iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount();
              ++iCurFeat)
         {
             iCurFeat = oTable.GetAndSelectNextNonEmptyRow(iCurFeat);
@@ -1673,7 +1768,8 @@ bool OGROpenFileGDBDataSource::UpdateFieldDomain(
     FETCH_FIELD_IDX(iDefinition, "Definition", FGFT_XML);
 
     bool bMatchFound = false;
-    for (int iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount(); ++iCurFeat)
+    for (int64_t iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount();
+         ++iCurFeat)
     {
         iCurFeat = oTable.GetAndSelectNextNonEmptyRow(iCurFeat);
         if (iCurFeat < 0)
@@ -1818,12 +1914,13 @@ bool OGROpenFileGDBDataSource::AddRelationship(
     const std::string osThisGUID = OFGDBGenerateUUID();
 
     FileGDBTable oTable;
-    if (!oTable.Open(m_osGDBItemsFilename.c_str(), true))
+    if (!oTable.Open(m_osGDBItemsFilename.c_str(), true) ||
+        oTable.GetTotalRecordCount() >= INT32_MAX)
         return false;
 
     // hopefully this just needs to be a unique value. Seems to autoincrement
     // when created from ArcMap at least!
-    const int iDsId = oTable.GetTotalRecordCount() + 1;
+    const int iDsId = static_cast<int>(oTable.GetTotalRecordCount() + 1);
 
     std::string osMappingTableOidName;
     if (relationship->GetCardinality() ==
@@ -2002,7 +2099,7 @@ bool OGROpenFileGDBDataSource::DeleteRelationship(const std::string &name,
         FETCH_FIELD_IDX_WITH_RET(iType, "Type", FGFT_GUID, false);
         FETCH_FIELD_IDX_WITH_RET(iName, "Name", FGFT_STRING, false);
 
-        for (int iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount();
+        for (int64_t iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount();
              ++iCurFeat)
         {
             iCurFeat = oTable.GetAndSelectNextNonEmptyRow(iCurFeat);
@@ -2102,12 +2199,15 @@ bool OGROpenFileGDBDataSource::UpdateRelationship(
     }
 
     FileGDBTable oTable;
-    if (!oTable.Open(m_osGDBItemsFilename.c_str(), true))
+    if (!oTable.Open(m_osGDBItemsFilename.c_str(), true) ||
+        oTable.GetTotalRecordCount() >= INT32_MAX)
+    {
         return false;
+    }
 
     // hopefully this just needs to be a unique value. Seems to autoincrement
     // when created from ArcMap at least!
-    const int iDsId = oTable.GetTotalRecordCount() + 1;
+    const int iDsId = static_cast<int>(oTable.GetTotalRecordCount()) + 1;
 
     std::string osMappingTableOidName;
     if (relationship->GetCardinality() ==
@@ -2145,7 +2245,8 @@ bool OGROpenFileGDBDataSource::UpdateRelationship(
 
     bool bMatchFound = false;
     std::string osUUID;
-    for (int iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount(); ++iCurFeat)
+    for (int64_t iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount();
+         ++iCurFeat)
     {
         iCurFeat = oTable.GetAndSelectNextNonEmptyRow(iCurFeat);
         if (iCurFeat < 0)
diff --git a/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdriver.cpp b/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdriver.cpp
index f74dfc7045d5..05c1c6c3b522 100644
--- a/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdriver.cpp
+++ b/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdrivercore.cpp b/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdrivercore.cpp
index 7f1a03512455..ba113d65890d 100644
--- a/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdrivercore.cpp
+++ b/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdrivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
diff --git a/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdrivercore.h b/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdrivercore.h
index 2aa6a81bc881..515c320ed68f 100644
--- a/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdrivercore.h
+++ b/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdrivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGROPENFILEGDBDRIVERCORE_H
diff --git a/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdblayer.cpp b/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdblayer.cpp
index c98a978a49fa..d6c56213b44e 100644
--- a/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdblayer.cpp
+++ b/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdblayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -330,7 +314,7 @@ void OGROpenFileGDBLayer::TryToDetectMultiPatchKind()
 
     if (m_poLyrTable->GetTotalRecordCount() == 0)
         return;
-    int nFirstIdx = m_poLyrTable->GetAndSelectNextNonEmptyRow(0);
+    const int64_t nFirstIdx = m_poLyrTable->GetAndSelectNextNonEmptyRow(0);
     if (nFirstIdx < 0)
         return;
 
@@ -343,7 +327,7 @@ void OGROpenFileGDBLayer::TryToDetectMultiPatchKind()
     const OGRwkbGeometryType eType = poGeom->getGeometryType();
     delete poGeom;
 
-    int nLastIdx = m_poLyrTable->GetTotalRecordCount() - 1;
+    int64_t nLastIdx = m_poLyrTable->GetTotalRecordCount() - 1;
     const GUInt32 nErrorCount = CPLGetErrorCounter();
     while (nLastIdx > nFirstIdx &&
            m_poLyrTable->GetOffsetInTableForRow(nLastIdx) == 0 &&
@@ -449,7 +433,8 @@ int OGROpenFileGDBLayer::BuildLayerDefinition()
         }
 #endif
 
-        if (!(m_poLyrTable->HasSpatialIndex() &&
+        if (!(m_poLyrTable->CanUseIndices() &&
+              m_poLyrTable->HasSpatialIndex() &&
               CPLTestBool(CPLGetConfigOption("OPENFILEGDB_USE_SPATIAL_INDEX",
                                              "YES"))) &&
             CPLTestBool(CPLGetConfigOption("OPENFILEGDB_IN_MEMORY_SPI", "YES")))
@@ -460,9 +445,11 @@ int OGROpenFileGDBLayer::BuildLayerDefinition()
             sGlobalBounds.maxx = poGDBGeomField->GetXMax();
             sGlobalBounds.maxy = poGDBGeomField->GetYMax();
             m_pQuadTree = CPLQuadTreeCreate(&sGlobalBounds, nullptr);
-            CPLQuadTreeSetMaxDepth(m_pQuadTree,
-                                   CPLQuadTreeGetAdvisedMaxDepth(
-                                       m_poLyrTable->GetValidRecordCount()));
+            CPLQuadTreeSetMaxDepth(
+                m_pQuadTree,
+                CPLQuadTreeGetAdvisedMaxDepth(
+                    static_cast<int>(std::min<int64_t>(
+                        INT_MAX, m_poLyrTable->GetValidRecordCount()))));
         }
         else
         {
@@ -775,7 +762,7 @@ int OGROpenFileGDBLayer::BuildLayerDefinition()
                                 "OpenFileGDB",
                                 "For field %s, XML definition "
                                 "mentions %s as default value whereas "
-                                ".gdbtable header mentions %.18g. Using %s",
+                                ".gdbtable header mentions %.17g. Using %s",
                                 poGDBField->GetName().c_str(), pszDefaultValue,
                                 psDefault->Real, pszDefaultValue);
                         }
@@ -957,7 +944,7 @@ void OGROpenFileGDBLayer::SetSpatialFilter(OGRGeometry *poGeom)
     if (poGeom != nullptr)
     {
         if (m_poSpatialIndexIterator == nullptr &&
-            m_poLyrTable->HasSpatialIndex() &&
+            m_poLyrTable->CanUseIndices() && m_poLyrTable->HasSpatialIndex() &&
             CPLTestBool(
                 CPLGetConfigOption("OPENFILEGDB_USE_SPATIAL_INDEX", "YES")))
         {
@@ -1329,7 +1316,8 @@ OGROpenFileGDBLayer::BuildIteratorFromExprNode(swq_expr_node *poNode)
     }
 
     else if (poNode->eNodeType == SNT_OPERATION &&
-             OGROpenFileGDBIsComparisonOp(poNode->nOperation) &&
+             (OGROpenFileGDBIsComparisonOp(poNode->nOperation) ||
+              poNode->nOperation == SWQ_ILIKE) &&
              poNode->nSubExprCount == 2)
     {
         swq_expr_node *poColumn = GetColumnSubNode(poNode);
@@ -1373,6 +1361,9 @@ OGROpenFileGDBLayer::BuildIteratorFromExprNode(swq_expr_node *poNode)
                             case SWQ_GT:
                                 eOp = FGSO_GT;
                                 break;
+                            case SWQ_ILIKE:
+                                eOp = FGSO_ILIKE;
+                                break;
                             default:
                                 CPLAssert(false);
                                 break;
@@ -1402,6 +1393,9 @@ OGROpenFileGDBLayer::BuildIteratorFromExprNode(swq_expr_node *poNode)
                             case SWQ_GT:
                                 eOp = FGSO_LT;
                                 break;
+                            case SWQ_ILIKE:
+                                eOp = FGSO_ILIKE;
+                                break;
                             default:
                                 CPLAssert(false);
                                 break;
@@ -1414,10 +1408,31 @@ OGROpenFileGDBLayer::BuildIteratorFromExprNode(swq_expr_node *poNode)
                     if (poField->GetType() == FGFT_STRING &&
                         poFieldDefn->GetType() == OFTString)
                     {
+                        // If we have an equality comparison, but the index
+                        // uses LOWER(), transform it to a ILIKE comparison
+                        if (eOp == FGSO_EQ && poField->HasIndex() &&
+                            STARTS_WITH_CI(
+                                poField->GetIndex()->GetExpression().c_str(),
+                                "LOWER("))
+                        {
+                            // Note: FileGDBIndexIterator::SetConstraint()
+                            // checks that the string to compare with has no
+                            // wildcard
+                            eOp = FGSO_ILIKE;
+
+                            // In theory, a ILIKE is not sufficient as it is
+                            // case insensitive, whereas one could expect
+                            // equality testing to be case sensitive... but
+                            // it is not in OGR SQL...
+                            // So we can comment the below line
+                            // bIteratorSufficient = false;
+                        }
+
                         // As the index use ' ' as padding value, we cannot
                         // fully trust the index.
-                        if ((eOp == FGSO_EQ && poNode->nOperation != SWQ_NE) ||
-                            eOp == FGSO_GE)
+                        else if ((eOp == FGSO_EQ &&
+                                  poNode->nOperation != SWQ_NE) ||
+                                 eOp == FGSO_GE)
                             bIteratorSufficient = false;
                         else
                             return nullptr;
@@ -1450,6 +1465,8 @@ OGROpenFileGDBLayer::BuildIteratorFromExprNode(swq_expr_node *poNode)
                             }
                         }
                     }
+                    else if (eOp == FGSO_ILIKE)
+                        return nullptr;
 
                     FileGDBIterator *poIter = FileGDBIterator::Build(
                         m_poLyrTable, nTableColIdx, TRUE, eOp,
@@ -1703,7 +1720,7 @@ OGRFeature *OGROpenFileGDBLayer::GetCurrentFeature()
 {
     OGRFeature *poFeature = nullptr;
     int iOGRIdx = 0;
-    int iRow = m_poLyrTable->GetCurRow();
+    int64_t iRow = m_poLyrTable->GetCurRow();
     for (int iGDBIdx = 0; iGDBIdx < m_poLyrTable->GetFieldCount(); iGDBIdx++)
     {
         if (iOGRIdx == m_iFIDAsRegularColumnIndex)
@@ -1727,16 +1744,27 @@ OGRFeature *OGROpenFileGDBLayer::GetCurrentFeature()
                     if (m_poLyrTable->GetFeatureExtent(psField,
                                                        &sFeatureEnvelope))
                     {
-                        CPLRectObj sBounds;
-                        sBounds.minx = sFeatureEnvelope.MinX;
-                        sBounds.miny = sFeatureEnvelope.MinY;
-                        sBounds.maxx = sFeatureEnvelope.MaxX;
-                        sBounds.maxy = sFeatureEnvelope.MaxY;
-                        CPLQuadTreeInsertWithBounds(
-                            m_pQuadTree,
-                            reinterpret_cast<void *>(
-                                static_cast<uintptr_t>(iRow)),
-                            &sBounds);
+#if SIZEOF_VOIDP < 8
+                        if (iRow > INT32_MAX)
+                        {
+                            // m_pQuadTree stores iRow values as void*
+                            // This would overflow here.
+                            m_eSpatialIndexState = SPI_INVALID;
+                        }
+                        else
+#endif
+                        {
+                            CPLRectObj sBounds;
+                            sBounds.minx = sFeatureEnvelope.MinX;
+                            sBounds.miny = sFeatureEnvelope.MinY;
+                            sBounds.maxx = sFeatureEnvelope.MaxX;
+                            sBounds.maxy = sFeatureEnvelope.MaxY;
+                            CPLQuadTreeInsertWithBounds(
+                                m_pQuadTree,
+                                reinterpret_cast<void *>(
+                                    static_cast<uintptr_t>(iRow)),
+                                &sBounds);
+                        }
                     }
                 }
 
@@ -1863,8 +1891,9 @@ OGRFeature *OGROpenFileGDBLayer::GetNextFeature()
                 {
                     return nullptr;
                 }
-                int iRow = static_cast<int>(reinterpret_cast<GUIntptr_t>(
-                    m_pahFilteredFeatures[m_iCurFeat++]));
+                const auto iRow =
+                    static_cast<int64_t>(reinterpret_cast<GUIntptr_t>(
+                        m_pahFilteredFeatures[m_iCurFeat++]));
                 if (m_poLyrTable->SelectRow(iRow))
                 {
                     poFeature = GetCurrentFeature();
@@ -1882,7 +1911,7 @@ OGRFeature *OGROpenFileGDBLayer::GetNextFeature()
         {
             while (true)
             {
-                int iRow = poIterator->GetNextRowSortedByFID();
+                const auto iRow = poIterator->GetNextRowSortedByFID();
                 if (iRow < 0)
                     return nullptr;
                 if (m_poLyrTable->SelectRow(iRow))
@@ -1954,7 +1983,7 @@ OGRFeature *OGROpenFileGDBLayer::GetFeature(GIntBig nFeatureId)
 
     if (nFeatureId < 1 || nFeatureId > m_poLyrTable->GetTotalRecordCount())
         return nullptr;
-    if (!m_poLyrTable->SelectRow(static_cast<int>(nFeatureId) - 1))
+    if (!m_poLyrTable->SelectRow(nFeatureId - 1))
         return nullptr;
 
     /* Temporarily disable spatial filter */
@@ -1993,7 +2022,7 @@ OGRErr OGROpenFileGDBLayer::SetNextByIndex(GIntBig nIndex)
     {
         if (nIndex < 0 || nIndex >= m_nFilteredFeatureCount)
             return OGRERR_FAILURE;
-        m_iCurFeat = static_cast<int>(nIndex);
+        m_iCurFeat = nIndex;
         return OGRERR_NONE;
     }
     else if (m_poLyrTable->GetValidRecordCount() ==
@@ -2001,7 +2030,7 @@ OGRErr OGROpenFileGDBLayer::SetNextByIndex(GIntBig nIndex)
     {
         if (nIndex < 0 || nIndex >= m_poLyrTable->GetValidRecordCount())
             return OGRERR_FAILURE;
-        m_iCurFeat = static_cast<int>(nIndex);
+        m_iCurFeat = nIndex;
         return OGRERR_NONE;
     }
     else
@@ -2105,7 +2134,7 @@ GIntBig OGROpenFileGDBLayer::GetFeatureCount(int bForce)
             int nCount = 0;
             while (true)
             {
-                const int nRowIdx =
+                const auto nRowIdx =
                     m_poSpatialIndexIterator->GetNextRowSortedByFID();
                 if (nRowIdx < 0)
                     break;
@@ -2149,7 +2178,7 @@ GIntBig OGROpenFileGDBLayer::GetFeatureCount(int bForce)
             m_nFilteredFeatureCount = 0;
         }
 
-        for (int i = 0; i < m_poLyrTable->GetTotalRecordCount(); i++)
+        for (int64_t i = 0; i < m_poLyrTable->GetTotalRecordCount(); i++)
         {
             if (!m_poLyrTable->SelectRow(i))
             {
@@ -2158,6 +2187,15 @@ GIntBig OGROpenFileGDBLayer::GetFeatureCount(int bForce)
                 else
                     continue;
             }
+#if SIZEOF_VOIDP < 8
+            if (i > INT32_MAX)
+            {
+                // CPLQuadTreeInsertWithBounds stores row index values as void*
+                // This would overflow here.
+                m_eSpatialIndexState = SPI_INVALID;
+                break;
+            }
+#endif
 
             const OGRField *psField =
                 m_poLyrTable->GetFieldValue(m_iGeomFieldIdx);
@@ -2307,7 +2345,8 @@ int OGROpenFileGDBLayer::TestCapability(const char *pszCap)
     else if (EQUAL(pszCap, OLCFastSpatialFilter))
     {
         return m_eSpatialIndexState == SPI_COMPLETED ||
-               m_poLyrTable->HasSpatialIndex();
+               (m_poLyrTable->CanUseIndices() &&
+                m_poLyrTable->HasSpatialIndex());
     }
 
     return FALSE;
@@ -2317,11 +2356,12 @@ int OGROpenFileGDBLayer::TestCapability(const char *pszCap)
 /*                         HasIndexForField()                          */
 /***********************************************************************/
 
-int OGROpenFileGDBLayer::HasIndexForField(const char *pszFieldName)
+bool OGROpenFileGDBLayer::HasIndexForField(const char *pszFieldName)
 {
     if (!BuildLayerDefinition())
-        return FALSE;
-
+        return false;
+    if (!m_poLyrTable->CanUseIndices())
+        return false;
     int nTableColIdx = m_poLyrTable->GetFieldIdx(pszFieldName);
     return (nTableColIdx >= 0 &&
             m_poLyrTable->GetField(nTableColIdx)->HasIndex());
@@ -2393,6 +2433,8 @@ const OGRField *OGROpenFileGDBLayer::GetMinMaxValue(OGRFieldDefn *poFieldDefn,
     eOutType = -1;
     if (!BuildLayerDefinition())
         return nullptr;
+    if (!m_poLyrTable->CanUseIndices())
+        return nullptr;
 
     const int nTableColIdx =
         m_poLyrTable->GetFieldIdx(poFieldDefn->GetNameRef());
@@ -2427,21 +2469,21 @@ int OGROpenFileGDBLayer::GetMinMaxSumCount(OGRFieldDefn *poFieldDefn,
     dfSum = 0.0;
     nCount = 0;
     if (!BuildLayerDefinition())
-        return FALSE;
+        return false;
+    if (!m_poLyrTable->CanUseIndices())
+        return false;
 
     int nTableColIdx = m_poLyrTable->GetFieldIdx(poFieldDefn->GetNameRef());
     if (nTableColIdx >= 0 && m_poLyrTable->GetField(nTableColIdx)->HasIndex())
     {
-        FileGDBIterator *poIter =
-            FileGDBIterator::BuildIsNotNull(m_poLyrTable, nTableColIdx, TRUE);
-        if (poIter != nullptr)
+        auto poIter = std::unique_ptr<FileGDBIterator>(
+            FileGDBIterator::BuildIsNotNull(m_poLyrTable, nTableColIdx, TRUE));
+        if (poIter)
         {
-            int nRet = poIter->GetMinMaxSumCount(dfMin, dfMax, dfSum, nCount);
-            delete poIter;
-            return nRet;
+            return poIter->GetMinMaxSumCount(dfMin, dfMax, dfSum, nCount);
         }
     }
-    return FALSE;
+    return false;
 }
 
 /************************************************************************/
diff --git a/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdblayer_write.cpp b/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdblayer_write.cpp
index 819b24554db3..8b487c83864b 100644
--- a/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdblayer_write.cpp
+++ b/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdblayer_write.cpp
@@ -7,29 +7,14 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
 #include "ogr_openfilegdb.h"
 #include "filegdb_gdbtoogrfieldtype.h"
 
+#include <cinttypes>
 #include <cmath>
 #include <cstddef>
 #include <cstdio>
@@ -44,6 +29,7 @@
 #include "cpl_error.h"
 #include "cpl_minixml.h"
 #include "cpl_string.h"
+#include "gdal_priv_templates.hpp"
 #include "ogr_api.h"
 #include "ogr_core.h"
 #include "ogr_feature.h"
@@ -206,34 +192,34 @@ static void XMLSerializeGeomFieldBase(CPLXMLNode *psRoot,
     }
     CPLCreateXMLElementAndValue(
         psSpatialReference, "XOrigin",
-        CPLSPrintf("%.18g", poGeomFieldDefn->GetXOrigin()));
+        CPLSPrintf("%.17g", poGeomFieldDefn->GetXOrigin()));
     CPLCreateXMLElementAndValue(
         psSpatialReference, "YOrigin",
-        CPLSPrintf("%.18g", poGeomFieldDefn->GetYOrigin()));
+        CPLSPrintf("%.17g", poGeomFieldDefn->GetYOrigin()));
     CPLCreateXMLElementAndValue(
         psSpatialReference, "XYScale",
-        CPLSPrintf("%.18g", poGeomFieldDefn->GetXYScale()));
+        CPLSPrintf("%.17g", poGeomFieldDefn->GetXYScale()));
     CPLCreateXMLElementAndValue(
         psSpatialReference, "ZOrigin",
-        CPLSPrintf("%.18g", poGeomFieldDefn->GetZOrigin()));
+        CPLSPrintf("%.17g", poGeomFieldDefn->GetZOrigin()));
     CPLCreateXMLElementAndValue(
         psSpatialReference, "ZScale",
-        CPLSPrintf("%.18g", poGeomFieldDefn->GetZScale()));
+        CPLSPrintf("%.17g", poGeomFieldDefn->GetZScale()));
     CPLCreateXMLElementAndValue(
         psSpatialReference, "MOrigin",
-        CPLSPrintf("%.18g", poGeomFieldDefn->GetMOrigin()));
+        CPLSPrintf("%.17g", poGeomFieldDefn->GetMOrigin()));
     CPLCreateXMLElementAndValue(
         psSpatialReference, "MScale",
-        CPLSPrintf("%.18g", poGeomFieldDefn->GetMScale()));
+        CPLSPrintf("%.17g", poGeomFieldDefn->GetMScale()));
     CPLCreateXMLElementAndValue(
         psSpatialReference, "XYTolerance",
-        CPLSPrintf("%.18g", poGeomFieldDefn->GetXYTolerance()));
+        CPLSPrintf("%.17g", poGeomFieldDefn->GetXYTolerance()));
     CPLCreateXMLElementAndValue(
         psSpatialReference, "ZTolerance",
-        CPLSPrintf("%.18g", poGeomFieldDefn->GetZTolerance()));
+        CPLSPrintf("%.17g", poGeomFieldDefn->GetZTolerance()));
     CPLCreateXMLElementAndValue(
         psSpatialReference, "MTolerance",
-        CPLSPrintf("%.18g", poGeomFieldDefn->GetMTolerance()));
+        CPLSPrintf("%.17g", poGeomFieldDefn->GetMTolerance()));
     CPLCreateXMLElementAndValue(psSpatialReference, "HighPrecision", "true");
     if (poSRS)
     {
@@ -314,7 +300,8 @@ bool OGROpenFileGDBLayer::CreateFeatureDataset(const char *pszFeatureDataset)
         if (!oTable.Open(m_poDS->m_osGDBItemsFilename.c_str(), false))
             return false;
         CPLCreateXMLElementAndValue(
-            psRoot, "DSID", CPLSPrintf("%d", 1 + oTable.GetTotalRecordCount()));
+            psRoot, "DSID",
+            CPLSPrintf("%" PRId64, 1 + oTable.GetTotalRecordCount()));
     }
 
     CPLCreateXMLElementAndValue(psRoot, "Versioned", "false");
@@ -458,7 +445,7 @@ bool OGROpenFileGDBLayer::Create(const OGRGeomFieldDefn *poSrcGeomFieldDefn)
             FETCH_FIELD_IDX(iName, "Name", FGFT_STRING);
             FETCH_FIELD_IDX(iDefinition, "Definition", FGFT_XML);
 
-            for (int iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount();
+            for (int64_t iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount();
                  ++iCurFeat)
             {
                 iCurFeat = oTable.GetAndSelectNextNonEmptyRow(iCurFeat);
@@ -584,8 +571,10 @@ bool OGROpenFileGDBLayer::Create(const OGRGeomFieldDefn *poSrcGeomFieldDefn)
     {
         OGRFieldDefn oField("field_before_geom", OFTString);
         m_poLyrTable->CreateField(std::make_unique<FileGDBField>(
-            oField.GetNameRef(), std::string(), FGFT_STRING, true, 0,
-            FileGDBField::UNSET_FIELD));
+            oField.GetNameRef(), std::string(), FGFT_STRING,
+            /* bNullable = */ true,
+            /* bRequired = */ true,
+            /* bEditable = */ true, 0, FileGDBField::UNSET_FIELD));
         m_poFeatureDefn->AddFieldDefn(&oField);
     }
 
@@ -699,9 +688,11 @@ bool OGROpenFileGDBLayer::Create(const OGRGeomFieldDefn *poSrcGeomFieldDefn)
 
     const std::string osFIDName =
         m_aosCreationOptions.FetchNameValueDef("FID", "OBJECTID");
-    if (!m_poLyrTable->CreateField(std::unique_ptr<FileGDBField>(
-            new FileGDBField(osFIDName, std::string(), FGFT_OBJECTID, false, 0,
-                             FileGDBField::UNSET_FIELD))))
+    if (!m_poLyrTable->CreateField(std::make_unique<FileGDBField>(
+            osFIDName, std::string(), FGFT_OBJECTID,
+            /* bNullable = */ false,
+            /* bRequired = */ true,
+            /* bEditable = */ false, 0, FileGDBField::UNSET_FIELD)))
     {
         Close();
         return false;
@@ -817,7 +808,7 @@ static CPLXMLNode *CreateXMLFieldDefinition(const OGRFieldDefn *poFieldDefn,
         {
             auto psDefaultValue = CPLCreateXMLElementAndValue(
                 GPFieldInfoEx, "DefaultValueNumeric",
-                CPLSPrintf("%.18g", psDefault->Real));
+                CPLSPrintf("%.17g", psDefault->Real));
             if (!bArcGISPro32OrLater)
             {
                 CPLAddXMLAttributeAndValue(
@@ -836,7 +827,7 @@ static CPLXMLNode *CreateXMLFieldDefinition(const OGRFieldDefn *poFieldDefn,
         {
             CPLCreateXMLElementAndValue(
                 GPFieldInfoEx, "DefaultValueNumeric",
-                CPLSPrintf("%.18g", FileGDBOGRDateToDoubleDate(
+                CPLSPrintf("%.17g", FileGDBOGRDateToDoubleDate(
                                         psDefault, /* bConvertToUTC = */ true,
                                         poGDBFieldDefn->IsHighPrecision())));
         }
@@ -954,9 +945,18 @@ static CPLXMLNode *CreateXMLFieldDefinition(const OGRFieldDefn *poFieldDefn,
         CPLAddXMLAttributeAndValue(psFieldType, "xmlns:typens",
                                    "http://www.esri.com/schemas/ArcGIS/10.3");
     }
-    CPLCreateXMLElementAndValue(GPFieldInfoEx, "IsNullable",
-                                poGDBFieldDefn->IsNullable() ? "true"
-                                                             : "false");
+    if (poGDBFieldDefn->IsNullable())
+    {
+        CPLCreateXMLElementAndValue(GPFieldInfoEx, "IsNullable", "true");
+    }
+    if (poGDBFieldDefn->IsRequired())
+    {
+        CPLCreateXMLElementAndValue(GPFieldInfoEx, "Required", "true");
+    }
+    if (!poGDBFieldDefn->IsEditable())
+    {
+        CPLCreateXMLElementAndValue(GPFieldInfoEx, "Editable", "false");
+    }
     if (poGDBFieldDefn->IsHighPrecision())
     {
         CPLCreateXMLElementAndValue(GPFieldInfoEx, "HighPrecision", "true");
@@ -991,7 +991,7 @@ static bool GetDefault(const OGRFieldDefn *poField, FileGDBFieldType eType,
             if (osDefaultVal[0] == '\'' && osDefaultVal.back() == '\'')
             {
                 osDefaultVal = osDefaultVal.substr(1);
-                osDefaultVal.resize(osDefaultVal.size() - 1);
+                osDefaultVal.pop_back();
                 char *pszTmp =
                     CPLUnescapeString(osDefaultVal.c_str(), nullptr, CPLES_SQL);
                 osDefaultVal = pszTmp;
@@ -1020,7 +1020,7 @@ static bool GetDefault(const OGRFieldDefn *poField, FileGDBFieldType eType,
             if (osDefaultVal[0] == '\'' && osDefaultVal.back() == '\'')
             {
                 osDefaultVal = osDefaultVal.substr(1);
-                osDefaultVal.resize(osDefaultVal.size() - 1);
+                osDefaultVal.pop_back();
                 char *pszTmp =
                     CPLUnescapeString(osDefaultVal.c_str(), nullptr, CPLES_SQL);
                 osDefaultVal = pszTmp;
@@ -1357,23 +1357,36 @@ OGRErr OGROpenFileGDBLayer::CreateField(const OGRFieldDefn *poFieldIn,
         }
     }
 
-    const char *pszAlias = poField->GetAlternativeNameRef();
-    if (!m_poLyrTable->CreateField(std::make_unique<FileGDBField>(
-            poField->GetNameRef(),
-            pszAlias ? std::string(pszAlias) : std::string(), eType,
-            CPL_TO_BOOL(poField->IsNullable()), nWidth, sDefault)))
-    {
-        return OGRERR_FAILURE;
-    }
+    const bool bNullable =
+        CPL_TO_BOOL(poField->IsNullable()) && eType != FGFT_GLOBALID;
+    bool bRequired = (eType == FGFT_GLOBALID);
+    bool bEditable = (eType != FGFT_GLOBALID);
 
     if (poField->GetType() == OFTReal)
     {
         const char *pszDefault = poField->GetDefault();
         if (pszDefault && EQUAL(pszDefault, "FILEGEODATABASE_SHAPE_AREA"))
+        {
             m_iAreaField = m_poFeatureDefn->GetFieldCount();
+            bRequired = true;
+            bEditable = false;
+        }
         else if (pszDefault &&
                  EQUAL(pszDefault, "FILEGEODATABASE_SHAPE_LENGTH"))
+        {
             m_iLengthField = m_poFeatureDefn->GetFieldCount();
+            bRequired = true;
+            bEditable = false;
+        }
+    }
+
+    const char *pszAlias = poField->GetAlternativeNameRef();
+    if (!m_poLyrTable->CreateField(std::make_unique<FileGDBField>(
+            poField->GetNameRef(),
+            pszAlias ? std::string(pszAlias) : std::string(), eType, bNullable,
+            bRequired, bEditable, nWidth, sDefault)))
+    {
+        return OGRERR_FAILURE;
     }
 
     whileUnsealing(m_poFeatureDefn)->AddFieldDefn(poField);
@@ -2236,6 +2249,7 @@ bool OGROpenFileGDBLayer::PrepareFileGDBFeature(OGRFeature *poFeature,
             }
             continue;
         }
+        memset(&fields[idxFileGDB], 0, sizeof(OGRField));
         switch (m_poLyrTable->GetField(idxFileGDB)->GetType())
         {
             case FGFT_UNDEFINED:
@@ -2395,8 +2409,7 @@ static bool CheckFIDAndFIDColumnConsistency(const OGRFeature *poFeature,
     {
         const double dfFID =
             poFeature->GetFieldAsDouble(iFIDAsRegularColumnIndex);
-        if (dfFID >= static_cast<double>(std::numeric_limits<int64_t>::min()) &&
-            dfFID <= static_cast<double>(std::numeric_limits<int64_t>::max()))
+        if (GDALIsValueInRange<int64_t>(dfFID))
         {
             const auto nFID = static_cast<GIntBig>(dfFID);
             if (nFID == poFeature->GetFID())
@@ -2635,7 +2648,8 @@ void OGROpenFileGDBLayer::RefreshXMLDefinitionInMemory()
         if (!oTable.Open(m_poDS->m_osGDBItemsFilename.c_str(), false))
             return;
         CPLCreateXMLElementAndValue(
-            psRoot, "DSID", CPLSPrintf("%d", 1 + oTable.GetTotalRecordCount()));
+            psRoot, "DSID",
+            CPLSPrintf("%" PRId64, 1 + oTable.GetTotalRecordCount()));
     }
 
     CPLCreateXMLElementAndValue(psRoot, "Versioned", "false");
@@ -3186,7 +3200,7 @@ OGRErr OGROpenFileGDBLayer::Rename(const char *pszDstTableName)
 
         FETCH_FIELD_IDX_WITH_RET(iName, "Name", FGFT_STRING, OGRERR_FAILURE);
 
-        for (int iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount();
+        for (int64_t iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount();
              ++iCurFeat)
         {
             iCurFeat = oTable.GetAndSelectNextNonEmptyRow(iCurFeat);
@@ -3224,7 +3238,7 @@ OGRErr OGROpenFileGDBLayer::Rename(const char *pszDstTableName)
         FETCH_FIELD_IDX_WITH_RET(iDefinition, "Definition", FGFT_XML,
                                  OGRERR_FAILURE);
 
-        for (int iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount();
+        for (int64_t iCurFeat = 0; iCurFeat < oTable.GetTotalRecordCount();
              ++iCurFeat)
         {
             iCurFeat = oTable.GetAndSelectNextNonEmptyRow(iCurFeat);
diff --git a/ogr/ogrsf_frmts/openfilegdb/test_ofgdb_write.cpp b/ogr/ogrsf_frmts/openfilegdb/test_ofgdb_write.cpp
index 268a0bb741d7..97150fc07af4 100644
--- a/ogr/ogrsf_frmts/openfilegdb/test_ofgdb_write.cpp
+++ b/ogr/ogrsf_frmts/openfilegdb/test_ofgdb_write.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "filegdbtable.h"
@@ -40,24 +24,33 @@ int main()
     const int nTablxOffsetSize = 4;
     oTable.Create("test_ofgdb.gdbtable", nTablxOffsetSize, eTableGeomType,
                   bGeomTypeHasZ, bGeomTypeHasM);
+    oTable.CreateField(std::unique_ptr<FileGDBField>(new FileGDBField(
+        "OBJECTID", "OBJECTID", FGFT_OBJECTID,
+        /* nullable = */ false,
+        /* required = */ true,
+        /* editable = */ false, 0, FileGDBField::UNSET_FIELD)));
+
     oTable.CreateField(std::unique_ptr<FileGDBField>(
-        new FileGDBField("OBJECTID", "OBJECTID", FGFT_OBJECTID, false, 0,
+        new FileGDBField("int16", "", FGFT_INT16, true, false, true, 0,
+                         FileGDBField::UNSET_FIELD)));
+    oTable.CreateField(std::unique_ptr<FileGDBField>(
+        new FileGDBField("int32", "", FGFT_INT32, true, false, true, 0,
+                         FileGDBField::UNSET_FIELD)));
+    oTable.CreateField(std::unique_ptr<FileGDBField>(
+        new FileGDBField("float32", "", FGFT_FLOAT32, true, false, true, 0,
+                         FileGDBField::UNSET_FIELD)));
+    oTable.CreateField(std::unique_ptr<FileGDBField>(
+        new FileGDBField("float64", "", FGFT_FLOAT64, true, false, true, 0,
+                         FileGDBField::UNSET_FIELD)));
+    oTable.CreateField(std::unique_ptr<FileGDBField>(
+        new FileGDBField("str", "", FGFT_STRING, true, false, true, 0,
+                         FileGDBField::UNSET_FIELD)));
+    oTable.CreateField(std::unique_ptr<FileGDBField>(
+        new FileGDBField("datetime", "", FGFT_DATETIME, true, false, true, 0,
+                         FileGDBField::UNSET_FIELD)));
+    oTable.CreateField(std::unique_ptr<FileGDBField>(
+        new FileGDBField("binary", "", FGFT_BINARY, true, false, true, 0,
                          FileGDBField::UNSET_FIELD)));
-
-    oTable.CreateField(std::unique_ptr<FileGDBField>(new FileGDBField(
-        "int16", "", FGFT_INT16, true, 0, FileGDBField::UNSET_FIELD)));
-    oTable.CreateField(std::unique_ptr<FileGDBField>(new FileGDBField(
-        "int32", "", FGFT_INT32, true, 0, FileGDBField::UNSET_FIELD)));
-    oTable.CreateField(std::unique_ptr<FileGDBField>(new FileGDBField(
-        "float32", "", FGFT_FLOAT32, true, 0, FileGDBField::UNSET_FIELD)));
-    oTable.CreateField(std::unique_ptr<FileGDBField>(new FileGDBField(
-        "float64", "", FGFT_FLOAT64, true, 0, FileGDBField::UNSET_FIELD)));
-    oTable.CreateField(std::unique_ptr<FileGDBField>(new FileGDBField(
-        "str", "", FGFT_STRING, true, 0, FileGDBField::UNSET_FIELD)));
-    oTable.CreateField(std::unique_ptr<FileGDBField>(new FileGDBField(
-        "datetime", "", FGFT_DATETIME, true, 0, FileGDBField::UNSET_FIELD)));
-    oTable.CreateField(std::unique_ptr<FileGDBField>(new FileGDBField(
-        "binary", "", FGFT_BINARY, true, 0, FileGDBField::UNSET_FIELD)));
 
     auto poGeomField = std::unique_ptr<FileGDBGeomField>(new FileGDBGeomField(
         "SHAPE", "", true, "{B286C06B-0879-11D2-AACA-00C04FA33C20}", -400, -400,
diff --git a/ogr/ogrsf_frmts/osm/CMakeLists.txt b/ogr/ogrsf_frmts/osm/CMakeLists.txt
index fe87d02d5444..7b78fbc2309c 100644
--- a/ogr/ogrsf_frmts/osm/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/osm/CMakeLists.txt
@@ -2,7 +2,8 @@
 add_gdal_driver(
   TARGET ogr_OSM
   SOURCES ogrosmdatasource.cpp ogrosmdriver.cpp ogrosmlayer.cpp osm_parser.cpp
-  BUILTIN)
+  BUILTIN
+  STRONG_CXX_WFLAGS)
 gdal_standard_includes(ogr_OSM)
 
 set(GDAL_DATA_FILES
diff --git a/ogr/ogrsf_frmts/osm/data/osmconf.ini b/ogr/ogrsf_frmts/osm/data/osmconf.ini
index b9b85fd80236..d44029f30def 100644
--- a/ogr/ogrsf_frmts/osm/data/osmconf.ini
+++ b/ogr/ogrsf_frmts/osm/data/osmconf.ini
@@ -1,6 +1,8 @@
 #
 # Configuration file for importing OSM data into OGR
 #
+# NOTE: remove the below "[general]" line for GDAL < 3.10
+[general]
 
 # put here the name of keys, or key=value, for ways that are assumed to be polygons if they are closed
 # see http://wiki.openstreetmap.org/wiki/Map_Features
diff --git a/ogr/ogrsf_frmts/osm/gpb.h b/ogr/ogrsf_frmts/osm/gpb.h
index 763d7e8fa0b3..375b3845b930 100644
--- a/ogr/ogrsf_frmts/osm/gpb.h
+++ b/ogr/ogrsf_frmts/osm/gpb.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GPB_H_INCLUDED
@@ -91,7 +75,7 @@ inline int ReadVarUInt32(const GByte **ppabyData)
         if (!(nByte & 0x80))
         {
             *ppabyData = pabyData + 1;
-            return nVal | ((unsigned)nByte << nShift);
+            return nVal | (static_cast<unsigned>(nByte) << nShift);
         }
         nVal |= (nByte & 0x7f) << nShift;
         pabyData++;
@@ -102,7 +86,7 @@ inline int ReadVarUInt32(const GByte **ppabyData)
             if (!(nByte & 0x80))
             {
                 *ppabyData = pabyData + 1;
-                return nVal | (((unsigned)nByte & 0xf) << nShift);
+                return nVal | ((static_cast<unsigned>(nByte) & 0xf) << nShift);
             }
             *ppabyData = pabyData;
             return nVal;
@@ -120,7 +104,8 @@ inline int ReadVarUInt32(const GByte **ppabyData)
 #define READ_SIZE(pabyData, pabyDataLimit, nSize)                              \
     {                                                                          \
         READ_VARUINT32(pabyData, pabyDataLimit, nSize);                        \
-        if (CHECK_OOB && nSize > (unsigned int)(pabyDataLimit - pabyData))     \
+        if (CHECK_OOB &&                                                       \
+            nSize > static_cast<unsigned int>(pabyDataLimit - pabyData))       \
             THROW_GPB_EXCEPTION;                                               \
     }
 
@@ -140,9 +125,9 @@ inline GUIntBig ReadVarUInt64(const GByte **ppabyData)
         if (!(nByte & 0x80))
         {
             *ppabyData = pabyData + 1;
-            return nVal | ((GUIntBig)nByte << nShift);
+            return nVal | (static_cast<GUIntBig>(nByte) << nShift);
         }
-        nVal |= ((GUIntBig)(nByte & 0x7f)) << nShift;
+        nVal |= (static_cast<GUIntBig>(nByte & 0x7f)) << nShift;
         pabyData++;
         nShift += 7;
         if (nShift == 63)
@@ -151,7 +136,7 @@ inline GUIntBig ReadVarUInt64(const GByte **ppabyData)
             if (!(nByte & 0x80))
             {
                 *ppabyData = pabyData + 1;
-                return nVal | (((GUIntBig)nByte & 1) << nShift);
+                return nVal | ((static_cast<GUIntBig>(nByte) & 1) << nShift);
             }
             *ppabyData = pabyData;
             return nVal;
@@ -169,7 +154,8 @@ inline GUIntBig ReadVarUInt64(const GByte **ppabyData)
 #define READ_SIZE64(pabyData, pabyDataLimit, nSize)                            \
     {                                                                          \
         READ_VARUINT64(pabyData, pabyDataLimit, nSize);                        \
-        if (CHECK_OOB && nSize > (unsigned int)(pabyDataLimit - pabyData))     \
+        if (CHECK_OOB &&                                                       \
+            nSize > static_cast<unsigned int>(pabyDataLimit - pabyData))       \
             THROW_GPB_EXCEPTION;                                               \
     }
 
@@ -314,7 +300,7 @@ inline void SkipVarInt(const GByte **ppabyData)
     do                                                                         \
     {                                                                          \
         READ_SIZE(pabyData, pabyDataLimit, l_nDataLength);                     \
-        pszTxt = (char *)VSI_MALLOC_VERBOSE(l_nDataLength + 1);                \
+        pszTxt = static_cast<char *>(VSI_MALLOC_VERBOSE(l_nDataLength + 1));   \
         if (pszTxt == nullptr)                                                 \
             THROW_GPB_EXCEPTION;                                               \
         memcpy(pszTxt, pabyData, l_nDataLength);                               \
diff --git a/ogr/ogrsf_frmts/osm/ogr_osm.h b/ogr/ogrsf_frmts/osm/ogr_osm.h
index 4ffe52d4b343..247b604c2c1a 100644
--- a/ogr/ogrsf_frmts/osm/ogr_osm.h
+++ b/ogr/ogrsf_frmts/osm/ogr_osm.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2012-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_OSM_H_INCLUDED
@@ -46,7 +30,7 @@
 
 #include "ogrsqlitevfs.h"
 
-class ConstCharComp
+class OGROSMConstCharComp
 {
   public:
     bool operator()(const char *a, const char *b) const
@@ -58,25 +42,28 @@ class ConstCharComp
 class OGROSMComputedAttribute
 {
   public:
-    CPLString osName;
-    int nIndex;
-    OGRFieldType eType;
-    CPLString osSQL;
-    sqlite3_stmt *hStmt;
-    std::vector<CPLString> aosAttrToBind;
-    std::vector<int> anIndexToBind;
-    bool bHardcodedZOrder;
-
-    OGROSMComputedAttribute()
-        : nIndex(-1), eType(OFTString), hStmt(nullptr), bHardcodedZOrder(false)
-    {
-    }
+    CPLString osName{};
+    int nIndex = -1;
+    OGRFieldType eType = OFTString;
+    CPLString osSQL{};
+    sqlite3_stmt *hStmt = nullptr;
+    std::vector<CPLString> aosAttrToBind{};
+    std::vector<int> anIndexToBind{};
+    bool bHardcodedZOrder = false;
+
+    OGROSMComputedAttribute() = default;
 
-    explicit OGROSMComputedAttribute(const char *pszName)
-        : osName(pszName), nIndex(-1), eType(OFTString), hStmt(nullptr),
-          bHardcodedZOrder(false)
+    explicit OGROSMComputedAttribute(const char *pszName) : osName(pszName)
     {
     }
+
+    OGROSMComputedAttribute(OGROSMComputedAttribute &&) = default;
+    OGROSMComputedAttribute &operator=(OGROSMComputedAttribute &&) = default;
+
+  private:
+    OGROSMComputedAttribute(const OGROSMComputedAttribute &) = delete;
+    OGROSMComputedAttribute &
+    operator=(const OGROSMComputedAttribute &) = delete;
 };
 
 /************************************************************************/
@@ -93,21 +80,18 @@ class OGROSMLayer final : public OGRLayer
     int m_nIdxLayer = 0;
     OGRFeatureDefn *m_poFeatureDefn = nullptr;
     OGRSpatialReference *m_poSRS = nullptr;
-    long m_nFeatureCount = 0;
 
     std::vector<char *>
         m_apszNames{}; /* Needed to keep a "reference" to the string inserted
                           into oMapFieldNameToIndex */
-    std::map<const char *, int, ConstCharComp> m_oMapFieldNameToIndex{};
+    std::map<const char *, int, OGROSMConstCharComp> m_oMapFieldNameToIndex{};
 
     std::vector<OGROSMComputedAttribute> m_oComputedAttributes{};
 
     bool m_bResetReadingAllowed = false;
 
-    int m_nFeatureArraySize = 0;
-    int m_nFeatureArrayMaxSize = 0;
-    int m_nFeatureArrayIndex = 0;
-    OGRFeature **m_papoFeatures = nullptr;
+    size_t m_nFeatureArrayIndex = 0;
+    std::vector<std::unique_ptr<OGRFeature>> m_apoFeatures{};
 
     bool m_bHasOSMId = false;
     int m_nIndexOSMId = -1;
@@ -128,20 +112,23 @@ class OGROSMLayer final : public OGRLayer
 
     bool m_bUserInterested = true;
 
-    bool AddToArray(OGRFeature *poFeature, int bCheckFeatureThreshold);
+    bool AddToArray(std::unique_ptr<OGRFeature>, bool bCheckFeatureThreshold);
 
     int AddInOtherOrAllTags(const char *pszK);
 
     char szLaunderedFieldName[256];
     const char *GetLaunderedFieldName(const char *pszName);
 
-    std::vector<char *> apszInsignificantKeys;
-    std::map<const char *, int, ConstCharComp> aoSetInsignificantKeys;
+    std::vector<char *> apszInsignificantKeys{};
+    std::map<const char *, int, OGROSMConstCharComp> aoSetInsignificantKeys{};
 
-    std::vector<char *> apszIgnoreKeys;
-    std::map<const char *, int, ConstCharComp> aoSetIgnoreKeys;
+    std::vector<char *> apszIgnoreKeys{};
+    std::map<const char *, int, OGROSMConstCharComp> aoSetIgnoreKeys{};
 
-    std::set<std::string> aoSetWarnKeys;
+    std::set<std::string> aoSetWarnKeys{};
+
+    OGROSMLayer(const OGROSMLayer &) = delete;
+    OGROSMLayer &operator=(const OGROSMLayer &) = delete;
 
   public:
     OGROSMLayer(OGROSMDataSource *m_poDS, int m_nIdxLayer, const char *pszName);
@@ -175,9 +162,10 @@ class OGROSMLayer final : public OGRLayer
 
     const OGREnvelope *GetSpatialFilterEnvelope();
 
-    int AddFeature(OGRFeature *poFeature, int bAttrFilterAlreadyEvaluated,
-                   int *pbFilteredOut = nullptr,
-                   int bCheckFeatureThreshold = TRUE);
+    bool AddFeature(std::unique_ptr<OGRFeature> poFeature,
+                    bool bAttrFilterAlreadyEvaluated,
+                    bool *pbFilteredOut = nullptr,
+                    bool bCheckFeatureThreshold = true);
     void ForceResetReading();
 
     void AddField(const char *pszName, OGRFieldType eFieldType,
@@ -265,8 +253,8 @@ class OGROSMLayer final : public OGRLayer
     }
 
     void SetFieldsFromTags(OGRFeature *poFeature, GIntBig nID, bool bIsWayID,
-                           unsigned int nTags, OSMTag *pasTags,
-                           OSMInfo *psInfo);
+                           unsigned int nTags, const OSMTag *pasTags,
+                           const OSMInfo *psInfo);
 
     void SetDeclareInterest(bool bIn)
     {
@@ -304,15 +292,15 @@ class OGROSMLayer final : public OGRLayer
 /*                        OGROSMDataSource                              */
 /************************************************************************/
 
-typedef struct
+struct KeyDesc
 {
-    char *pszK;
-    int nKeyIndex;
-    int nOccurrences;
-    std::vector<char *> asValues;
-    std::map<const char *, int, ConstCharComp>
-        anMapV; /* map that is the reverse of asValues */
-} KeyDesc;
+    char *pszK = nullptr;
+    int nKeyIndex = 0;
+    int nOccurrences = 0;
+    std::vector<char *> apszValues{};
+    //! map that is the reverse of apszValues
+    std::map<const char *, int, OGROSMConstCharComp> anMapV{};
+};
 
 typedef struct
 {
@@ -331,7 +319,7 @@ typedef struct
 
     union
     {
-        int nValueIndex;                     /* index of KeyDesc.asValues */
+        int nValueIndex;                     /* index of KeyDesc.apszValues */
         int nOffsetInpabyNonRedundantValues; /* offset in
                                                 OGROSMDataSource.pabyNonRedundantValues
                                               */
@@ -359,20 +347,20 @@ typedef struct
     int nLat;
 } LonLat;
 
-typedef struct
+struct WayFeaturePair
 {
-    GIntBig nWayID;
-    GIntBig
-        *panNodeRefs; /* point to a sub-array of OGROSMDataSource.anReqIds */
-    unsigned int nRefs;
-    unsigned int nTags;
-    IndexedKVP *pasTags; /*  point to a sub-array of
+    GIntBig nWayID = 0;
+    /* point to a sub-array of OGROSMDataSource.anReqIds */
+    GIntBig *panNodeRefs = nullptr;
+    unsigned int nRefs = 0;
+    unsigned int nTags = 0;
+    IndexedKVP *pasTags = nullptr; /*  point to a sub-array of
                             OGROSMDataSource.pasAccumulatedTags */
-    OSMInfo sInfo;
-    OGRFeature *poFeature;
-    bool bIsArea : 1;
-    bool bAttrFilterAlreadyEvaluated : 1;
-} WayFeaturePair;
+    OSMInfo sInfo{};
+    std::unique_ptr<OGRFeature> poFeature{};
+    bool bIsArea = false;
+    bool bAttrFilterAlreadyEvaluated = false;
+};
 
 #ifdef ENABLE_NODE_LOOKUP_BY_HASHING
 typedef struct
@@ -383,13 +371,13 @@ typedef struct
 } CollisionBucket;
 #endif
 
-class OGROSMDataSource final : public OGRDataSource
+class OGROSMDataSource final : public GDALDataset
 {
     friend class OGROSMLayer;
 
-    int m_nLayers = 0;
-    OGROSMLayer **m_papoLayers = nullptr;
-    char *m_pszName = nullptr;
+    std::vector<std::unique_ptr<OGROSMLayer>> m_apoLayers{};
+
+    std::string m_osConfigFile{};
 
     OGREnvelope m_sExtent{};
     bool m_bExtentValid = false;
@@ -492,11 +480,10 @@ class OGROSMDataSource final : public OGRDataSource
     unsigned int MAX_INDEXED_VALUES_PER_KEY = 0;
     GByte *pabyNonRedundantValues = nullptr;
     int nNonRedundantValuesLen = 0;
-    WayFeaturePair *m_pasWayFeaturePairs = nullptr;
-    int m_nWayFeaturePairs = 0;
+    std::vector<WayFeaturePair> m_asWayFeaturePairs{};
 
-    std::vector<KeyDesc *> m_asKeys{};
-    std::map<const char *, KeyDesc *, ConstCharComp>
+    std::vector<KeyDesc *> m_apsKeys{};
+    std::map<const char *, KeyDesc *, OGROSMConstCharComp>
         m_aoMapIndexedKeys{}; /* map that is the reverse of asKeys */
 
     CPLString m_osNodesFilename{};
@@ -518,30 +505,31 @@ class OGROSMDataSource final : public OGRDataSource
     static const GIntBig FILESIZE_INVALID = -1;
     GIntBig m_nFileSize = FILESIZE_NOT_INIT;
 
-    void CompressWay(bool bIsArea, unsigned int nTags, IndexedKVP *pasTags,
-                     int nPoints, LonLat *pasLonLatPairs, OSMInfo *psInfo,
+    void CompressWay(bool bIsArea, unsigned int nTags,
+                     const IndexedKVP *pasTags, int nPoints,
+                     const LonLat *pasLonLatPairs, const OSMInfo *psInfo,
                      std::vector<GByte> &abyCompressedWay);
     void UncompressWay(int nBytes, const GByte *pabyCompressedWay,
                        bool *pbIsArea, std::vector<LonLat> &asCoords,
                        unsigned int *pnTags, OSMTag *pasTags, OSMInfo *psInfo);
 
-    bool ParseConf(char **papszOpenOptions);
+    bool ParseConf(CSLConstList papszOpenOptions);
     bool CreateTempDB();
     bool SetDBOptions();
     void SetCacheSize();
     bool CreatePreparedStatements();
     void CloseDB();
 
-    bool IndexPoint(OSMNode *psNode);
-    bool IndexPointSQLite(OSMNode *psNode);
+    bool IndexPoint(const OSMNode *psNode);
+    bool IndexPointSQLite(const OSMNode *psNode);
     bool FlushCurrentSector();
     bool FlushCurrentSectorCompressedCase();
     bool FlushCurrentSectorNonCompressedCase();
-    bool IndexPointCustom(OSMNode *psNode);
+    bool IndexPointCustom(const OSMNode *psNode);
 
     void IndexWay(GIntBig nWayID, bool bIsArea, unsigned int nTags,
-                  IndexedKVP *pasTags, LonLat *pasLonLatPairs, int nPairs,
-                  OSMInfo *psInfo);
+                  const IndexedKVP *pasTags, const LonLat *pasLonLatPairs,
+                  int nPairs, const OSMInfo *psInfo);
 
     bool StartTransactionCacheDB();
     bool CommitTransactionCacheDB();
@@ -559,12 +547,12 @@ class OGROSMDataSource final : public OGRDataSource
 
     unsigned int
     LookupWays(std::map<GIntBig, std::pair<int, void *>> &aoMapWays,
-               OSMRelation *psRelation);
+               const OSMRelation *psRelation);
 
-    OGRGeometry *BuildMultiPolygon(OSMRelation *psRelation,
+    OGRGeometry *BuildMultiPolygon(const OSMRelation *psRelation,
                                    unsigned int *pnTags, OSMTag *pasTags);
-    OGRGeometry *BuildGeometryCollection(OSMRelation *psRelation,
-                                         int bMultiLineString);
+    OGRGeometry *BuildGeometryCollection(const OSMRelation *psRelation,
+                                         bool bMultiLineString);
 
     bool TransferToDiskIfNecesserary();
 
@@ -574,18 +562,16 @@ class OGROSMDataSource final : public OGRDataSource
         int iCurLayer, const std::vector<OGROSMComputedAttribute> &oAttributes);
     bool IsClosedWayTaggedAsPolygon(unsigned int nTags, const OSMTag *pasTags);
 
+    OGROSMDataSource(const OGROSMDataSource &) = delete;
+    OGROSMDataSource &operator=(const OGROSMDataSource &) = delete;
+
   public:
     OGROSMDataSource();
     virtual ~OGROSMDataSource();
 
-    virtual const char *GetName() override
-    {
-        return m_pszName;
-    }
-
     virtual int GetLayerCount() override
     {
-        return m_nLayers;
+        return static_cast<int>(m_apoLayers.size());
     }
 
     virtual OGRLayer *GetLayer(int) override;
@@ -603,7 +589,7 @@ class OGROSMDataSource final : public OGRDataSource
                                        GDALProgressFunc pfnProgress,
                                        void *pProgressData) override;
 
-    int Open(const char *pszFilename, char **papszOpenOptions);
+    int Open(const char *pszFilename, CSLConstList papszOpenOptions);
 
     int MyResetReading();
     bool ParseNextChunk(int nIdxLayer, GDALProgressFunc pfnProgress,
@@ -611,9 +597,9 @@ class OGROSMDataSource final : public OGRDataSource
     OGRErr GetExtent(OGREnvelope *psExtent);
     int IsInterleavedReading();
 
-    void NotifyNodes(unsigned int nNodes, OSMNode *pasNodes);
-    void NotifyWay(OSMWay *psWay);
-    void NotifyRelation(OSMRelation *psRelation);
+    void NotifyNodes(unsigned int nNodes, const OSMNode *pasNodes);
+    void NotifyWay(const OSMWay *psWay);
+    void NotifyRelation(const OSMRelation *psRelation);
     void NotifyBounds(double dfXMin, double dfYMin, double dfXMax,
                       double dfYMax);
 
diff --git a/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp b/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
index 53226246e321..82b2c0138824 100644
--- a/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
+++ b/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2012-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gpb.h"
@@ -69,7 +53,7 @@
 #include "sqlite3.h"
 
 #undef SQLITE_STATIC
-#define SQLITE_STATIC ((sqlite3_destructor_type) nullptr)
+#define SQLITE_STATIC (static_cast<sqlite3_destructor_type>(nullptr))
 
 constexpr int LIMIT_IDS_PER_REQUEST = 200;
 
@@ -159,7 +143,7 @@ constexpr int HASHED_INDEXES_ARRAY_SIZE = 3145739;
 constexpr int COLLISION_BUCKET_ARRAY_SIZE = (MAX_ACCUMULATED_NODES / 100) * 40;
 
 // hash function = identity
-#define HASH_ID_FUNC(x) ((GUIntBig)(x))
+#define HASH_ID_FUNC(x) (static_cast<std::uintptr_t>(x))
 #endif  // ENABLE_NODE_LOOKUP_BY_HASHING
 
 // #define FAKE_LOOKUP_NODES
@@ -174,9 +158,9 @@ static void WriteVarSInt64(GIntBig nSVal, GByte **ppabyData);
 class DSToBeOpened
 {
   public:
-    GIntBig nPID;
-    CPLString osDSName;
-    CPLString osInterestLayers;
+    GIntBig nPID{};
+    CPLString osDSName{};
+    CPLString osInterestLayers{};
 };
 
 static CPLMutex *hMutex = nullptr;
@@ -205,13 +189,14 @@ static CPLString GetInterestLayersForDSName(const CPLString &osDSName)
 {
     CPLMutexHolder oMutexHolder(&hMutex);
     GIntBig nPID = CPLGetPID();
-    for (int i = 0; i < (int)oListDSToBeOpened.size(); i++)
+    for (auto oIter = oListDSToBeOpened.begin();
+         oIter < oListDSToBeOpened.end(); ++oIter)
     {
-        if (oListDSToBeOpened[i].nPID == nPID &&
-            oListDSToBeOpened[i].osDSName == osDSName)
+        const auto &ds = *oIter;
+        if (ds.nPID == nPID && ds.osDSName == osDSName)
         {
-            CPLString osInterestLayers = oListDSToBeOpened[i].osInterestLayers;
-            oListDSToBeOpened.erase(oListDSToBeOpened.begin() + i);
+            CPLString osInterestLayers = ds.osInterestLayers;
+            oListDSToBeOpened.erase(oIter);
             return osInterestLayers;
         }
     }
@@ -224,7 +209,7 @@ static CPLString GetInterestLayersForDSName(const CPLString &osDSName)
 
 OGROSMDataSource::OGROSMDataSource()
 {
-    m_asKeys.push_back(nullptr);  // guard to avoid index 0 to be used
+    m_apsKeys.push_back(nullptr);  // guard to avoid index 0 to be used
 
     MAX_INDEXED_KEYS = static_cast<unsigned>(
         atoi(CPLGetConfigOption("OSM_MAX_INDEXED_KEYS", "32768")));
@@ -239,11 +224,7 @@ OGROSMDataSource::OGROSMDataSource()
 OGROSMDataSource::~OGROSMDataSource()
 
 {
-    for (int i = 0; i < m_nLayers; i++)
-        delete m_papoLayers[i];
-    CPLFree(m_papoLayers);
-
-    CPLFree(m_pszName);
+    m_apoLayers.clear();
 
     if (m_psParser != nullptr)
         CPLDebug("OSM", "Number of bytes read in file : " CPL_FRMT_GUIB,
@@ -278,11 +259,6 @@ OGROSMDataSource::~OGROSMDataSource()
     CPLFree(m_pasLonLatArray);
     CPLFree(m_panUnsortedReqIds);
 
-    for (int i = 0; i < m_nWayFeaturePairs; i++)
-    {
-        delete m_pasWayFeaturePairs[i].poFeature;
-    }
-    CPLFree(m_pasWayFeaturePairs);
     CPLFree(m_pasAccumulatedTags);
     CPLFree(pabyNonRedundantKeys);
     CPLFree(pabyNonRedundantValues);
@@ -301,14 +277,14 @@ OGROSMDataSource::~OGROSMDataSource()
     fclose(f);
 #endif
 
-    for (int i = 1; i < static_cast<int>(m_asKeys.size()); i++)
+    for (int i = 1; i < static_cast<int>(m_apsKeys.size()); i++)
     {
-        KeyDesc *psKD = m_asKeys[i];
+        KeyDesc *psKD = m_apsKeys[i];
         if (psKD)
         {
             CPLFree(psKD->pszK);
-            for (int j = 0; j < static_cast<int>(psKD->asValues.size()); j++)
-                CPLFree(psKD->asValues[j]);
+            for (int j = 0; j < static_cast<int>(psKD->apszValues.size()); j++)
+                CPLFree(psKD->apszValues[j]);
             delete psKD;
         }
     }
@@ -323,21 +299,20 @@ OGROSMDataSource::~OGROSMDataSource()
     }
 
     CPLFree(m_pabySector);
-    std::map<int, Bucket>::iterator oIter = m_oMapBuckets.begin();
-    for (; oIter != m_oMapBuckets.end(); ++oIter)
+    for (auto &oIter : m_oMapBuckets)
     {
         if (m_bCompressNodes)
         {
             int nRem =
-                oIter->first % (knPAGE_SIZE / BUCKET_SECTOR_SIZE_ARRAY_SIZE);
+                oIter.first % (knPAGE_SIZE / BUCKET_SECTOR_SIZE_ARRAY_SIZE);
             if (nRem == 0)
-                CPLFree(oIter->second.u.panSectorSize);
+                CPLFree(oIter.second.u.panSectorSize);
         }
         else
         {
-            int nRem = oIter->first % (knPAGE_SIZE / BUCKET_BITMAP_SIZE);
+            int nRem = oIter.first % (knPAGE_SIZE / BUCKET_BITMAP_SIZE);
             if (nRem == 0)
-                CPLFree(oIter->second.u.pabyBitmap);
+                CPLFree(oIter.second.u.pabyBitmap);
         }
     }
 }
@@ -414,7 +389,7 @@ constexpr GByte abyBitsCount[] = {
     4, 5, 5, 6, 5, 6, 6, 7, 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
     4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8};
 
-bool OGROSMDataSource::IndexPoint(OSMNode *psNode)
+bool OGROSMDataSource::IndexPoint(const OSMNode *psNode)
 {
     if (!m_bIndexPoints)
         return true;
@@ -429,7 +404,7 @@ bool OGROSMDataSource::IndexPoint(OSMNode *psNode)
 /*                          IndexPointSQLite()                          */
 /************************************************************************/
 
-bool OGROSMDataSource::IndexPointSQLite(OSMNode *psNode)
+bool OGROSMDataSource::IndexPointSQLite(const OSMNode *psNode)
 {
     sqlite3_bind_int64(m_hInsertNodeStmt, 1, psNode->nID);
 
@@ -523,7 +498,7 @@ Bucket *OGROSMDataSource::AllocBucket(int iBucket)
 
 Bucket *OGROSMDataSource::GetBucket(int nBucketId)
 {
-    std::map<int, Bucket>::iterator oIter = m_oMapBuckets.find(nBucketId);
+    auto oIter = m_oMapBuckets.find(nBucketId);
     if (oIter == m_oMapBuckets.end())
     {
         Bucket *psBucket = &m_oMapBuckets[nBucketId];
@@ -545,7 +520,7 @@ bool OGROSMDataSource::FlushCurrentSectorCompressedCase()
 {
     GByte abyOutBuffer[2 * SECTOR_SIZE];
     GByte *pabyOut = abyOutBuffer;
-    LonLat *pasLonLatIn = (LonLat *)m_pabySector;
+    LonLat *pasLonLatIn = reinterpret_cast<LonLat *>(m_pabySector);
     int nLastLon = 0;
     int nLastLat = 0;
     bool bLastValid = false;
@@ -644,7 +619,7 @@ bool OGROSMDataSource::FlushCurrentSectorNonCompressedCase()
 /*                          IndexPointCustom()                          */
 /************************************************************************/
 
-bool OGROSMDataSource::IndexPointCustom(OSMNode *psNode)
+bool OGROSMDataSource::IndexPointCustom(const OSMNode *psNode)
 {
     if (psNode->nID <= m_nPrevNodeId)
     {
@@ -726,10 +701,10 @@ bool OGROSMDataSource::IndexPointCustom(OSMNode *psNode)
 /*                             NotifyNodes()                            */
 /************************************************************************/
 
-void OGROSMDataSource::NotifyNodes(unsigned int nNodes, OSMNode *pasNodes)
+void OGROSMDataSource::NotifyNodes(unsigned int nNodes, const OSMNode *pasNodes)
 {
     const OGREnvelope *psEnvelope =
-        m_papoLayers[IDX_LYR_POINTS]->GetSpatialFilterEnvelope();
+        m_apoLayers[IDX_LYR_POINTS]->GetSpatialFilterEnvelope();
 
     for (unsigned int i = 0; i < nNodes; i++)
     {
@@ -744,18 +719,18 @@ void OGROSMDataSource::NotifyNodes(unsigned int nNodes, OSMNode *pasNodes)
         if (!IndexPoint(&pasNodes[i]))
             break;
 
-        if (!m_papoLayers[IDX_LYR_POINTS]->IsUserInterested())
+        if (!m_apoLayers[IDX_LYR_POINTS]->IsUserInterested())
             continue;
 
         bool bInterestingTag = m_bReportAllNodes;
-        OSMTag *pasTags = pasNodes[i].pasTags;
+        const OSMTag *pasTags = pasNodes[i].pasTags;
 
         if (!m_bReportAllNodes)
         {
             for (unsigned int j = 0; j < pasNodes[i].nTags; j++)
             {
                 const char *pszK = pasTags[j].pszK;
-                if (m_papoLayers[IDX_LYR_POINTS]->IsSignificantKey(pszK))
+                if (m_apoLayers[IDX_LYR_POINTS]->IsSignificantKey(pszK))
                 {
                     bInterestingTag = true;
                     break;
@@ -765,19 +740,20 @@ void OGROSMDataSource::NotifyNodes(unsigned int nNodes, OSMNode *pasNodes)
 
         if (bInterestingTag)
         {
-            OGRFeature *poFeature =
-                new OGRFeature(m_papoLayers[IDX_LYR_POINTS]->GetLayerDefn());
+            auto poFeature = std::make_unique<OGRFeature>(
+                m_apoLayers[IDX_LYR_POINTS]->GetLayerDefn());
 
             poFeature->SetGeometryDirectly(
                 new OGRPoint(pasNodes[i].dfLon, pasNodes[i].dfLat));
 
-            m_papoLayers[IDX_LYR_POINTS]->SetFieldsFromTags(
-                poFeature, pasNodes[i].nID, false, pasNodes[i].nTags, pasTags,
-                &pasNodes[i].sInfo);
+            m_apoLayers[IDX_LYR_POINTS]->SetFieldsFromTags(
+                poFeature.get(), pasNodes[i].nID, false, pasNodes[i].nTags,
+                pasTags, &pasNodes[i].sInfo);
 
-            int bFilteredOut = FALSE;
-            if (!m_papoLayers[IDX_LYR_POINTS]->AddFeature(
-                    poFeature, FALSE, &bFilteredOut, !m_bFeatureAdded))
+            bool bFilteredOut = false;
+            if (!m_apoLayers[IDX_LYR_POINTS]->AddFeature(std::move(poFeature),
+                                                         false, &bFilteredOut,
+                                                         !m_bFeatureAdded))
             {
                 m_bStopParsing = true;
                 break;
@@ -925,6 +901,7 @@ void OGROSMDataSource::LookupNodesSQLite()
         if (nToQuery > static_cast<unsigned int>(LIMIT_IDS_PER_REQUEST))
             nToQuery = static_cast<unsigned int>(LIMIT_IDS_PER_REQUEST);
 
+        assert(nToQuery > 0);
         sqlite3_stmt *hStmt = m_pahSelectNodeStmt[nToQuery - 1];
         for (unsigned int i = iCur; i < iCur + nToQuery; i++)
         {
@@ -935,7 +912,8 @@ void OGROSMDataSource::LookupNodesSQLite()
         while (sqlite3_step(hStmt) == SQLITE_ROW)
         {
             const GIntBig id = sqlite3_column_int64(hStmt, 0);
-            LonLat *psLonLat = (LonLat *)sqlite3_column_blob(hStmt, 1);
+            const LonLat *psLonLat =
+                reinterpret_cast<const LonLat *>(sqlite3_column_blob(hStmt, 1));
 
             m_panReqIds[j] = id;
             m_pasLonLatArray[j].nLon = psLonLat->nLon;
@@ -956,7 +934,7 @@ static bool DecompressSector(const GByte *pabyIn, int nSectorSize,
                              GByte *pabyOut)
 {
     const GByte *pabyPtr = pabyIn;
-    LonLat *pasLonLatOut = (LonLat *)pabyOut;
+    LonLat *pasLonLatOut = reinterpret_cast<LonLat *>(pabyOut);
     int nLastLon = 0;
     int nLastLat = 0;
     bool bLastValid = false;
@@ -969,9 +947,9 @@ static bool DecompressSector(const GByte *pabyIn, int nSectorSize,
             if (bLastValid)
             {
                 pasLonLatOut[i].nLon =
-                    (int)(nLastLon + ReadVarSInt64(&pabyPtr));
+                    static_cast<int>(nLastLon + ReadVarSInt64(&pabyPtr));
                 pasLonLatOut[i].nLat =
-                    (int)(nLastLat + ReadVarSInt64(&pabyPtr));
+                    static_cast<int>(nLastLat + ReadVarSInt64(&pabyPtr));
             }
             else
             {
@@ -990,7 +968,7 @@ static bool DecompressSector(const GByte *pabyIn, int nSectorSize,
         }
     }
 
-    int nRead = (int)(pabyPtr - pabyIn);
+    int nRead = static_cast<int>(pabyPtr - pabyIn);
     nRead = ROUND_COMPRESS_SIZE(nRead);
     return nRead == nSectorSize;
 }
@@ -1028,8 +1006,7 @@ void OGROSMDataSource::LookupNodesCustom()
         int nOffInBucket = static_cast<int>(id % NODE_PER_BUCKET);
         int nOffInBucketReduced = nOffInBucket >> NODE_PER_SECTOR_SHIFT;
 
-        std::map<int, Bucket>::const_iterator oIter =
-            m_oMapBuckets.find(nBucket);
+        const auto oIter = m_oMapBuckets.find(nBucket);
         if (oIter == m_oMapBuckets.end())
             continue;
         const Bucket *psBucket = &(oIter->second);
@@ -1112,8 +1089,7 @@ void OGROSMDataSource::LookupNodesCustomCompressedCase()
 
         if (nOffInBucketReduced != l_nOffInBucketReducedOld)
         {
-            std::map<int, Bucket>::const_iterator oIter =
-                m_oMapBuckets.find(nBucket);
+            const auto oIter = m_oMapBuckets.find(nBucket);
             if (oIter == m_oMapBuckets.end())
             {
                 CPLError(CE_Failure, CPLE_AppDefined,
@@ -1226,8 +1202,7 @@ void OGROSMDataSource::LookupNodesCustomNonCompressedCase()
 
         if (psBucket == nullptr || nBucket != l_nBucketOld)
         {
-            std::map<int, Bucket>::const_iterator oIter =
-                m_oMapBuckets.find(nBucket);
+            const auto oIter = m_oMapBuckets.find(nBucket);
             if (oIter == m_oMapBuckets.end())
             {
                 CPLError(CE_Failure, CPLE_AppDefined,
@@ -1308,11 +1283,11 @@ static void WriteVarInt(unsigned int nVal, std::vector<GByte> &abyData)
     {
         if ((nVal & (~0x7fU)) == 0)
         {
-            abyData.push_back((GByte)nVal);
+            abyData.push_back(static_cast<GByte>(nVal));
             return;
         }
 
-        abyData.push_back(0x80 | (GByte)(nVal & 0x7f));
+        abyData.push_back(0x80 | static_cast<GByte>(nVal & 0x7f));
         nVal >>= 7;
     }
 }
@@ -1325,13 +1300,13 @@ static void WriteVarInt64(GUIntBig nVal, std::vector<GByte> &abyData)
 {
     while (true)
     {
-        if ((((GUInt32)nVal) & (~0x7fU)) == 0)
+        if ((static_cast<uint32_t>(nVal) & (~0x7fU)) == 0)
         {
-            abyData.push_back((GByte)nVal);
+            abyData.push_back(static_cast<GByte>(nVal));
             return;
         }
 
-        abyData.push_back(0x80 | (GByte)(nVal & 0x7f));
+        abyData.push_back(0x80 | static_cast<GByte>(nVal & 0x7f));
         nVal >>= 7;
     }
 }
@@ -1348,11 +1323,11 @@ static void WriteVarSInt64(GIntBig nSVal, std::vector<GByte> &abyData)
     {
         if ((nVal & (~0x7f)) == 0)
         {
-            abyData.push_back((GByte)nVal);
+            abyData.push_back(static_cast<GByte>(nVal));
             return;
         }
 
-        abyData.push_back(0x80 | (GByte)(nVal & 0x7f));
+        abyData.push_back(0x80 | static_cast<GByte>(nVal & 0x7f));
         nVal >>= 7;
     }
 }
@@ -1370,12 +1345,12 @@ static void WriteVarSInt64(GIntBig nSVal, GByte **ppabyData)
     {
         if ((nVal & (~0x7f)) == 0)
         {
-            *pabyData = (GByte)nVal;
+            *pabyData = static_cast<GByte>(nVal);
             *ppabyData = pabyData + 1;
             return;
         }
 
-        *pabyData = 0x80 | (GByte)(nVal & 0x7f);
+        *pabyData = 0x80 | static_cast<GByte>(nVal & 0x7f);
         nVal >>= 7;
         pabyData++;
     }
@@ -1386,8 +1361,9 @@ static void WriteVarSInt64(GIntBig nSVal, GByte **ppabyData)
 /************************************************************************/
 
 void OGROSMDataSource::CompressWay(bool bIsArea, unsigned int nTags,
-                                   IndexedKVP *pasTags, int nPoints,
-                                   LonLat *pasLonLatPairs, OSMInfo *psInfo,
+                                   const IndexedKVP *pasTags, int nPoints,
+                                   const LonLat *pasLonLatPairs,
+                                   const OSMInfo *psInfo,
                                    std::vector<GByte> &abyCompressedWay)
 {
     abyCompressedWay.clear();
@@ -1403,8 +1379,9 @@ void OGROSMDataSource::CompressWay(bool bIsArea, unsigned int nTags,
         }
         else
         {
-            const char *pszK = (const char *)pabyNonRedundantKeys +
-                               pasTags[iTag].uKey.nOffsetInpabyNonRedundantKeys;
+            const char *pszK =
+                reinterpret_cast<const char *>(pabyNonRedundantKeys) +
+                pasTags[iTag].uKey.nOffsetInpabyNonRedundantKeys;
 
             abyCompressedWay.push_back(0);
 
@@ -1420,7 +1397,7 @@ void OGROSMDataSource::CompressWay(bool bIsArea, unsigned int nTags,
         else
         {
             const char *pszV =
-                (const char *)pabyNonRedundantValues +
+                reinterpret_cast<const char *>(pabyNonRedundantValues) +
                 pasTags[iTag].uVal.nOffsetInpabyNonRedundantValues;
 
             if (pasTags[iTag].bKIsIndex)
@@ -1455,8 +1432,8 @@ void OGROSMDataSource::CompressWay(bool bIsArea, unsigned int nTags,
         reinterpret_cast<const GByte *>(&(pasLonLatPairs[0])) + sizeof(LonLat));
     for (int i = 1; i < nPoints; i++)
     {
-        GIntBig nDiff64 = (GIntBig)pasLonLatPairs[i].nLon -
-                          (GIntBig)pasLonLatPairs[i - 1].nLon;
+        GIntBig nDiff64 = static_cast<GIntBig>(pasLonLatPairs[i].nLon) -
+                          static_cast<GIntBig>(pasLonLatPairs[i - 1].nLon);
         WriteVarSInt64(nDiff64, abyCompressedWay);
 
         nDiff64 = pasLonLatPairs[i].nLat - pasLonLatPairs[i - 1].nLat;
@@ -1510,14 +1487,15 @@ void OGROSMDataSource::UncompressWay(int nBytes, const GByte *pabyCompressedWay,
 
         if (pasTags)
         {
-            CPLAssert(nK >= 0 && nK < (int)m_asKeys.size());
+            CPLAssert(nK >= 0 && static_cast<unsigned>(nK) < m_apsKeys.size());
             pasTags[iTag].pszK =
-                nK ? m_asKeys[nK]->pszK : reinterpret_cast<const char *>(pszK);
+                nK ? m_apsKeys[nK]->pszK : reinterpret_cast<const char *>(pszK);
 
             CPLAssert(nK == 0 ||
-                      (nV >= 0 && nV < (int)m_asKeys[nK]->asValues.size()));
-            pasTags[iTag].pszV =
-                nV ? m_asKeys[nK]->asValues[nV] : (const char *)pszV;
+                      (nV >= 0 && static_cast<unsigned>(nV) <
+                                      m_apsKeys[nK]->apszValues.size()));
+            pasTags[iTag].pszV = nV ? m_apsKeys[nK]->apszValues[nV]
+                                    : reinterpret_cast<const char *>(pszV);
         }
     }
 
@@ -1550,8 +1528,8 @@ void OGROSMDataSource::UncompressWay(int nBytes, const GByte *pabyCompressedWay,
     pabyPtr += 2 * sizeof(int);
     do
     {
-        lonLat.nLon = (int)(lonLat.nLon + ReadVarSInt64(&pabyPtr));
-        lonLat.nLat = (int)(lonLat.nLat + ReadVarSInt64(&pabyPtr));
+        lonLat.nLon = static_cast<int>(lonLat.nLon + ReadVarSInt64(&pabyPtr));
+        lonLat.nLat = static_cast<int>(lonLat.nLat + ReadVarSInt64(&pabyPtr));
         asCoords.emplace_back(lonLat);
     } while (pabyPtr < pabyCompressedWay + nBytes);
 }
@@ -1561,9 +1539,9 @@ void OGROSMDataSource::UncompressWay(int nBytes, const GByte *pabyCompressedWay,
 /************************************************************************/
 
 void OGROSMDataSource::IndexWay(GIntBig nWayID, bool bIsArea,
-                                unsigned int nTags, IndexedKVP *pasTags,
-                                LonLat *pasLonLatPairs, int nPairs,
-                                OSMInfo *psInfo)
+                                unsigned int nTags, const IndexedKVP *pasTags,
+                                const LonLat *pasLonLatPairs, int nPairs,
+                                const OSMInfo *psInfo)
 {
     if (!m_bIndexWays)
         return;
@@ -1622,26 +1600,24 @@ int OGROSMDataSource::FindNode(GIntBig nID)
 
 void OGROSMDataSource::ProcessWaysBatch()
 {
-    if (m_nWayFeaturePairs == 0)
+    if (m_asWayFeaturePairs.empty())
         return;
 
-    // printf("nodes = %d, features = %d\n", nUnsortedReqIds, nWayFeaturePairs);
+    // printf("nodes = %d, features = %d\n", nUnsortedReqIds, int(m_asWayFeaturePairs.size()));
     LookupNodes();
 
-    for (int iPair = 0; iPair < m_nWayFeaturePairs; iPair++)
+    for (WayFeaturePair &sWayFeaturePairs : m_asWayFeaturePairs)
     {
-        WayFeaturePair *psWayFeaturePairs = &m_pasWayFeaturePairs[iPair];
-
-        const bool bIsArea = psWayFeaturePairs->bIsArea;
+        const bool bIsArea = sWayFeaturePairs.bIsArea;
         m_asLonLatCache.clear();
 
 #ifdef ENABLE_NODE_LOOKUP_BY_HASHING
         if (m_bHashedIndexValid)
         {
-            for (unsigned int i = 0; i < psWayFeaturePairs->nRefs; i++)
+            for (unsigned int i = 0; i < sWayFeaturePairs.nRefs; i++)
             {
                 int nIndInHashArray = static_cast<int>(
-                    HASH_ID_FUNC(psWayFeaturePairs->panNodeRefs[i]) %
+                    HASH_ID_FUNC(sWayFeaturePairs.panNodeRefs[i]) %
                     HASHED_INDEXES_ARRAY_SIZE);
                 int nIdx = m_panHashedIndexes[nIndInHashArray];
                 if (nIdx < -1)
@@ -1651,7 +1627,7 @@ void OGROSMDataSource::ProcessWaysBatch()
                     {
                         nIdx = m_psCollisionBuckets[iBucket].nInd;
                         if (m_panReqIds[nIdx] ==
-                            psWayFeaturePairs->panNodeRefs[i])
+                            sWayFeaturePairs.panNodeRefs[i])
                             break;
                         iBucket = m_psCollisionBuckets[iBucket].nNext;
                         if (iBucket < 0)
@@ -1662,7 +1638,7 @@ void OGROSMDataSource::ProcessWaysBatch()
                     }
                 }
                 else if (nIdx >= 0 &&
-                         m_panReqIds[nIdx] != psWayFeaturePairs->panNodeRefs[i])
+                         m_panReqIds[nIdx] != sWayFeaturePairs.panNodeRefs[i])
                     nIdx = -1;
 
                 if (nIdx >= 0)
@@ -1675,20 +1651,20 @@ void OGROSMDataSource::ProcessWaysBatch()
 #endif  // ENABLE_NODE_LOOKUP_BY_HASHING
         {
             int nIdx = -1;
-            for (unsigned int i = 0; i < psWayFeaturePairs->nRefs; i++)
+            for (unsigned int i = 0; i < sWayFeaturePairs.nRefs; i++)
             {
-                if (nIdx >= 0 && psWayFeaturePairs->panNodeRefs[i] ==
-                                     psWayFeaturePairs->panNodeRefs[i - 1] + 1)
+                if (nIdx >= 0 && sWayFeaturePairs.panNodeRefs[i] ==
+                                     sWayFeaturePairs.panNodeRefs[i - 1] + 1)
                 {
-                    if (nIdx + 1 < (int)m_nReqIds &&
+                    if (static_cast<unsigned>(nIdx + 1) < m_nReqIds &&
                         m_panReqIds[nIdx + 1] ==
-                            psWayFeaturePairs->panNodeRefs[i])
+                            sWayFeaturePairs.panNodeRefs[i])
                         nIdx++;
                     else
                         nIdx = -1;
                 }
                 else
-                    nIdx = FindNode(psWayFeaturePairs->panNodeRefs[i]);
+                    nIdx = FindNode(sWayFeaturePairs.panNodeRefs[i]);
                 if (nIdx >= 0)
                 {
                     m_asLonLatCache.push_back(m_pasLonLatArray[nIdx]);
@@ -1706,28 +1682,27 @@ void OGROSMDataSource::ProcessWaysBatch()
             CPLDebug("OSM",
                      "Way " CPL_FRMT_GIB
                      " with %d nodes that could be found. Discarding it",
-                     psWayFeaturePairs->nWayID,
+                     sWayFeaturePairs.nWayID,
                      static_cast<int>(m_asLonLatCache.size()));
-            delete psWayFeaturePairs->poFeature;
-            psWayFeaturePairs->poFeature = nullptr;
-            psWayFeaturePairs->bIsArea = false;
+            sWayFeaturePairs.poFeature.reset();
+            sWayFeaturePairs.bIsArea = false;
             continue;
         }
 
-        if (bIsArea && m_papoLayers[IDX_LYR_MULTIPOLYGONS]->IsUserInterested())
+        if (bIsArea && m_apoLayers[IDX_LYR_MULTIPOLYGONS]->IsUserInterested())
         {
-            IndexWay(psWayFeaturePairs->nWayID, /*bIsArea = */ true,
-                     psWayFeaturePairs->nTags, psWayFeaturePairs->pasTags,
+            IndexWay(sWayFeaturePairs.nWayID, /*bIsArea = */ true,
+                     sWayFeaturePairs.nTags, sWayFeaturePairs.pasTags,
                      m_asLonLatCache.data(),
                      static_cast<int>(m_asLonLatCache.size()),
-                     &psWayFeaturePairs->sInfo);
+                     &sWayFeaturePairs.sInfo);
         }
         else
-            IndexWay(psWayFeaturePairs->nWayID, bIsArea, 0, nullptr,
+            IndexWay(sWayFeaturePairs.nWayID, bIsArea, 0, nullptr,
                      m_asLonLatCache.data(),
                      static_cast<int>(m_asLonLatCache.size()), nullptr);
 
-        if (psWayFeaturePairs->poFeature == nullptr)
+        if (sWayFeaturePairs.poFeature == nullptr)
         {
             continue;
         }
@@ -1736,42 +1711,40 @@ void OGROSMDataSource::ProcessWaysBatch()
         OGRGeometry *poGeom = poLS;
 
         const int nPoints = static_cast<int>(m_asLonLatCache.size());
-        poLS->setNumPoints(nPoints);
+        poLS->setNumPoints(nPoints, /*bZeroizeNewContent=*/false);
         for (int i = 0; i < nPoints; i++)
         {
             poLS->setPoint(i, INT_TO_DBL(m_asLonLatCache[i].nLon),
                            INT_TO_DBL(m_asLonLatCache[i].nLat));
         }
 
-        psWayFeaturePairs->poFeature->SetGeometryDirectly(poGeom);
-
-        if (m_asLonLatCache.size() != psWayFeaturePairs->nRefs)
-            CPLDebug(
-                "OSM",
-                "For way " CPL_FRMT_GIB ", got only %d nodes instead of %d",
-                psWayFeaturePairs->nWayID, nPoints, psWayFeaturePairs->nRefs);
+        sWayFeaturePairs.poFeature->SetGeometryDirectly(poGeom);
 
-        int bFilteredOut = FALSE;
-        if (!m_papoLayers[IDX_LYR_LINES]->AddFeature(
-                psWayFeaturePairs->poFeature,
-                psWayFeaturePairs->bAttrFilterAlreadyEvaluated, &bFilteredOut,
+        if (m_asLonLatCache.size() != sWayFeaturePairs.nRefs)
+            CPLDebug("OSM",
+                     "For way " CPL_FRMT_GIB
+                     ", got only %d nodes instead of %d",
+                     sWayFeaturePairs.nWayID, nPoints, sWayFeaturePairs.nRefs);
+
+        bool bFilteredOut = false;
+        if (!m_apoLayers[IDX_LYR_LINES]->AddFeature(
+                std::move(sWayFeaturePairs.poFeature),
+                sWayFeaturePairs.bAttrFilterAlreadyEvaluated, &bFilteredOut,
                 !m_bFeatureAdded))
             m_bStopParsing = true;
         else if (!bFilteredOut)
             m_bFeatureAdded = true;
     }
 
-    if (m_papoLayers[IDX_LYR_MULTIPOLYGONS]->IsUserInterested())
+    if (m_apoLayers[IDX_LYR_MULTIPOLYGONS]->IsUserInterested())
     {
-        for (int iPair = 0; iPair < m_nWayFeaturePairs; iPair++)
+        for (WayFeaturePair &sWayFeaturePairs : m_asWayFeaturePairs)
         {
-            WayFeaturePair *psWayFeaturePairs = &m_pasWayFeaturePairs[iPair];
-
-            if (psWayFeaturePairs->bIsArea &&
-                (psWayFeaturePairs->nTags || m_bReportAllWays))
+            if (sWayFeaturePairs.bIsArea &&
+                (sWayFeaturePairs.nTags || m_bReportAllWays))
             {
                 sqlite3_bind_int64(m_hInsertPolygonsStandaloneStmt, 1,
-                                   psWayFeaturePairs->nWayID);
+                                   sWayFeaturePairs.nWayID);
 
                 int rc = sqlite3_step(m_hInsertPolygonsStandaloneStmt);
                 sqlite3_reset(m_hInsertPolygonsStandaloneStmt);
@@ -1780,13 +1753,13 @@ void OGROSMDataSource::ProcessWaysBatch()
                     CPLError(CE_Failure, CPLE_AppDefined,
                              "Failed inserting into "
                              "polygons_standalone " CPL_FRMT_GIB ": %s",
-                             psWayFeaturePairs->nWayID, sqlite3_errmsg(m_hDB));
+                             sWayFeaturePairs.nWayID, sqlite3_errmsg(m_hDB));
                 }
             }
         }
     }
 
-    m_nWayFeaturePairs = 0;
+    m_asWayFeaturePairs.clear();
     m_nUnsortedReqIds = 0;
 
     m_nAccumulatedTags = 0;
@@ -1866,7 +1839,7 @@ bool OGROSMDataSource::IsClosedWayTaggedAsPolygon(unsigned int nTags,
 /*                              NotifyWay()                             */
 /************************************************************************/
 
-void OGROSMDataSource::NotifyWay(OSMWay *psWay)
+void OGROSMDataSource::NotifyWay(const OSMWay *psWay)
 {
     m_nWaysProcessed++;
     if (m_nWaysProcessed % 10000 == 0)
@@ -1903,7 +1876,7 @@ void OGROSMDataSource::NotifyWay(OSMWay *psWay)
         for (unsigned int i = 0; i < psWay->nTags; i++)
         {
             const char *pszK = psWay->pasTags[i].pszK;
-            if (m_papoLayers[IDX_LYR_LINES]->IsSignificantKey(pszK))
+            if (m_apoLayers[IDX_LYR_LINES]->IsSignificantKey(pszK))
             {
                 bInterestingTag = true;
                 break;
@@ -1911,29 +1884,29 @@ void OGROSMDataSource::NotifyWay(OSMWay *psWay)
         }
     }
 
-    OGRFeature *poFeature = nullptr;
+    std::unique_ptr<OGRFeature> poFeature;
     bool bAttrFilterAlreadyEvaluated = false;
-    if (!bIsArea && m_papoLayers[IDX_LYR_LINES]->IsUserInterested() &&
+    if (!bIsArea && m_apoLayers[IDX_LYR_LINES]->IsUserInterested() &&
         bInterestingTag)
     {
-        poFeature = new OGRFeature(m_papoLayers[IDX_LYR_LINES]->GetLayerDefn());
+        poFeature = std::make_unique<OGRFeature>(
+            m_apoLayers[IDX_LYR_LINES]->GetLayerDefn());
 
-        m_papoLayers[IDX_LYR_LINES]->SetFieldsFromTags(
-            poFeature, psWay->nID, false, psWay->nTags, psWay->pasTags,
+        m_apoLayers[IDX_LYR_LINES]->SetFieldsFromTags(
+            poFeature.get(), psWay->nID, false, psWay->nTags, psWay->pasTags,
             &psWay->sInfo);
 
         // Optimization: if we have an attribute filter, that does not require
         // geometry, and if we don't need to index ways, then we can just
         // evaluate the attribute filter without the geometry.
-        if (m_papoLayers[IDX_LYR_LINES]->HasAttributeFilter() &&
-            !m_papoLayers[IDX_LYR_LINES]
+        if (m_apoLayers[IDX_LYR_LINES]->HasAttributeFilter() &&
+            !m_apoLayers[IDX_LYR_LINES]
                  ->AttributeFilterEvaluationNeedsGeometry() &&
             !m_bIndexWays)
         {
-            if (!m_papoLayers[IDX_LYR_LINES]->EvaluateAttributeFilter(
-                    poFeature))
+            if (!m_apoLayers[IDX_LYR_LINES]->EvaluateAttributeFilter(
+                    poFeature.get()))
             {
-                delete poFeature;
                 return;
             }
             bAttrFilterAlreadyEvaluated = true;
@@ -1946,7 +1919,8 @@ void OGROSMDataSource::NotifyWay(OSMWay *psWay)
 
     if (m_nUnsortedReqIds + psWay->nRefs >
             static_cast<unsigned int>(MAX_ACCUMULATED_NODES) ||
-        m_nWayFeaturePairs == MAX_DELAYED_FEATURES ||
+        m_asWayFeaturePairs.size() ==
+            static_cast<size_t>(MAX_DELAYED_FEATURES) ||
         m_nAccumulatedTags + psWay->nTags >
             static_cast<unsigned int>(MAX_ACCUMULATED_TAGS) ||
         nNonRedundantKeysLen + 1024 > MAX_NON_REDUNDANT_KEYS ||
@@ -1955,25 +1929,24 @@ void OGROSMDataSource::NotifyWay(OSMWay *psWay)
         ProcessWaysBatch();
     }
 
-    WayFeaturePair *psWayFeaturePairs =
-        &m_pasWayFeaturePairs[m_nWayFeaturePairs];
+    m_asWayFeaturePairs.push_back(WayFeaturePair());
+    WayFeaturePair &sWayFeaturePairs = m_asWayFeaturePairs.back();
 
-    psWayFeaturePairs->nWayID = psWay->nID;
-    psWayFeaturePairs->nRefs = psWay->nRefs - (bIsArea ? 1 : 0);
-    psWayFeaturePairs->panNodeRefs = m_panUnsortedReqIds + m_nUnsortedReqIds;
-    psWayFeaturePairs->poFeature = poFeature;
-    psWayFeaturePairs->bIsArea = bIsArea;
-    psWayFeaturePairs->bAttrFilterAlreadyEvaluated =
-        bAttrFilterAlreadyEvaluated;
+    sWayFeaturePairs.nWayID = psWay->nID;
+    sWayFeaturePairs.nRefs = psWay->nRefs - (bIsArea ? 1 : 0);
+    sWayFeaturePairs.panNodeRefs = m_panUnsortedReqIds + m_nUnsortedReqIds;
+    sWayFeaturePairs.poFeature = std::move(poFeature);
+    sWayFeaturePairs.bIsArea = bIsArea;
+    sWayFeaturePairs.bAttrFilterAlreadyEvaluated = bAttrFilterAlreadyEvaluated;
 
-    if (bIsArea && m_papoLayers[IDX_LYR_MULTIPOLYGONS]->IsUserInterested())
+    if (bIsArea && m_apoLayers[IDX_LYR_MULTIPOLYGONS]->IsUserInterested())
     {
         unsigned int nTagCount = 0;
 
         if (m_bNeedsToSaveWayInfo)
         {
             if (!psWay->sInfo.bTimeStampIsStr)
-                psWayFeaturePairs->sInfo.ts.nTimeStamp =
+                sWayFeaturePairs.sInfo.ts.nTimeStamp =
                     psWay->sInfo.ts.nTimeStamp;
             else
             {
@@ -1987,30 +1960,31 @@ void OGROSMDataSource::NotifyWay(OSMWay *psWay)
                     brokendown.tm_mday = sField.Date.Day;
                     brokendown.tm_hour = sField.Date.Hour;
                     brokendown.tm_min = sField.Date.Minute;
-                    brokendown.tm_sec = (int)(sField.Date.Second + .5);
-                    psWayFeaturePairs->sInfo.ts.nTimeStamp =
+                    brokendown.tm_sec =
+                        static_cast<int>(sField.Date.Second + .5);
+                    sWayFeaturePairs.sInfo.ts.nTimeStamp =
                         CPLYMDHMSToUnixTime(&brokendown);
                 }
                 else
-                    psWayFeaturePairs->sInfo.ts.nTimeStamp = 0;
+                    sWayFeaturePairs.sInfo.ts.nTimeStamp = 0;
             }
-            psWayFeaturePairs->sInfo.nChangeset = psWay->sInfo.nChangeset;
-            psWayFeaturePairs->sInfo.nVersion = psWay->sInfo.nVersion;
-            psWayFeaturePairs->sInfo.nUID = psWay->sInfo.nUID;
-            psWayFeaturePairs->sInfo.bTimeStampIsStr = false;
-            psWayFeaturePairs->sInfo.pszUserSID = "";  // FIXME
+            sWayFeaturePairs.sInfo.nChangeset = psWay->sInfo.nChangeset;
+            sWayFeaturePairs.sInfo.nVersion = psWay->sInfo.nVersion;
+            sWayFeaturePairs.sInfo.nUID = psWay->sInfo.nUID;
+            sWayFeaturePairs.sInfo.bTimeStampIsStr = false;
+            sWayFeaturePairs.sInfo.pszUserSID = "";  // FIXME
         }
         else
         {
-            psWayFeaturePairs->sInfo.ts.nTimeStamp = 0;
-            psWayFeaturePairs->sInfo.nChangeset = 0;
-            psWayFeaturePairs->sInfo.nVersion = 0;
-            psWayFeaturePairs->sInfo.nUID = 0;
-            psWayFeaturePairs->sInfo.bTimeStampIsStr = false;
-            psWayFeaturePairs->sInfo.pszUserSID = "";
+            sWayFeaturePairs.sInfo.ts.nTimeStamp = 0;
+            sWayFeaturePairs.sInfo.nChangeset = 0;
+            sWayFeaturePairs.sInfo.nVersion = 0;
+            sWayFeaturePairs.sInfo.nUID = 0;
+            sWayFeaturePairs.sInfo.bTimeStampIsStr = false;
+            sWayFeaturePairs.sInfo.pszUserSID = "";
         }
 
-        psWayFeaturePairs->pasTags = m_pasAccumulatedTags + m_nAccumulatedTags;
+        sWayFeaturePairs.pasTags = m_pasAccumulatedTags + m_nAccumulatedTags;
 
         for (unsigned int iTag = 0; iTag < psWay->nTags; iTag++)
         {
@@ -2028,14 +2002,14 @@ void OGROSMDataSource::NotifyWay(OSMWay *psWay)
             KeyDesc *psKD = nullptr;
             if (oIterK == m_aoMapIndexedKeys.end())
             {
-                if (m_asKeys.size() >= 1 + MAX_INDEXED_KEYS)
+                if (m_apsKeys.size() >= 1 + MAX_INDEXED_KEYS)
                 {
-                    if (m_asKeys.size() == 1 + MAX_INDEXED_KEYS)
+                    if (m_apsKeys.size() == 1 + MAX_INDEXED_KEYS)
                     {
                         CPLDebug("OSM", "More than %d different keys found",
                                  MAX_INDEXED_KEYS);
                         // To avoid next warnings.
-                        m_asKeys.push_back(nullptr);
+                        m_apsKeys.push_back(nullptr);
                     }
 
                     const int nLenK = static_cast<int>(strlen(pszK)) + 1;
@@ -2057,12 +2031,12 @@ void OGROSMDataSource::NotifyWay(OSMWay *psWay)
                 {
                     psKD = new KeyDesc();
                     psKD->pszK = CPLStrdup(pszK);
-                    psKD->nKeyIndex = static_cast<int>(m_asKeys.size());
+                    psKD->nKeyIndex = static_cast<int>(m_apsKeys.size());
                     psKD->nOccurrences = 0;
-                    psKD->asValues.push_back(CPLStrdup(
+                    psKD->apszValues.push_back(CPLStrdup(
                         ""));  // guard value to avoid index 0 to be used
                     m_aoMapIndexedKeys[psKD->pszK] = psKD;
-                    m_asKeys.push_back(psKD);
+                    m_apsKeys.push_back(psKD);
                 }
             }
             else
@@ -2079,16 +2053,16 @@ void OGROSMDataSource::NotifyWay(OSMWay *psWay)
             }
 
             if (psKD != nullptr &&
-                psKD->asValues.size() < 1 + MAX_INDEXED_VALUES_PER_KEY)
+                psKD->apszValues.size() < 1 + MAX_INDEXED_VALUES_PER_KEY)
             {
                 int nValueIndex = 0;
                 auto oIterV = psKD->anMapV.find(pszV);
                 if (oIterV == psKD->anMapV.end())
                 {
                     char *pszVDup = CPLStrdup(pszV);
-                    nValueIndex = static_cast<int>(psKD->asValues.size());
+                    nValueIndex = static_cast<int>(psKD->apszValues.size());
                     psKD->anMapV[pszVDup] = nValueIndex;
-                    psKD->asValues.push_back(pszVDup);
+                    psKD->apszValues.push_back(pszVDup);
                 }
                 else
                     nValueIndex = oIterV->second;
@@ -2102,12 +2076,12 @@ void OGROSMDataSource::NotifyWay(OSMWay *psWay)
                 const int nLenV = static_cast<int>(strlen(pszV)) + 1;
 
                 if (psKD != nullptr &&
-                    psKD->asValues.size() == 1 + MAX_INDEXED_VALUES_PER_KEY)
+                    psKD->apszValues.size() == 1 + MAX_INDEXED_VALUES_PER_KEY)
                 {
                     CPLDebug("OSM", "More than %d different values for tag %s",
                              MAX_INDEXED_VALUES_PER_KEY, pszK);
                     // To avoid next warnings.
-                    psKD->asValues.push_back(CPLStrdup(""));
+                    psKD->apszValues.push_back(CPLStrdup(""));
                 }
 
                 if (nNonRedundantValuesLen + nLenV > MAX_NON_REDUNDANT_VALUES)
@@ -2131,23 +2105,21 @@ void OGROSMDataSource::NotifyWay(OSMWay *psWay)
                 break;
         }
 
-        psWayFeaturePairs->nTags = nTagCount;
+        sWayFeaturePairs.nTags = nTagCount;
     }
     else
     {
-        psWayFeaturePairs->sInfo.ts.nTimeStamp = 0;
-        psWayFeaturePairs->sInfo.nChangeset = 0;
-        psWayFeaturePairs->sInfo.nVersion = 0;
-        psWayFeaturePairs->sInfo.nUID = 0;
-        psWayFeaturePairs->sInfo.bTimeStampIsStr = false;
-        psWayFeaturePairs->sInfo.pszUserSID = "";
+        sWayFeaturePairs.sInfo.ts.nTimeStamp = 0;
+        sWayFeaturePairs.sInfo.nChangeset = 0;
+        sWayFeaturePairs.sInfo.nVersion = 0;
+        sWayFeaturePairs.sInfo.nUID = 0;
+        sWayFeaturePairs.sInfo.bTimeStampIsStr = false;
+        sWayFeaturePairs.sInfo.pszUserSID = "";
 
-        psWayFeaturePairs->nTags = 0;
-        psWayFeaturePairs->pasTags = nullptr;
+        sWayFeaturePairs.nTags = 0;
+        sWayFeaturePairs.pasTags = nullptr;
     }
 
-    m_nWayFeaturePairs++;
-
     memcpy(m_panUnsortedReqIds + m_nUnsortedReqIds, psWay->panNodeRefs,
            sizeof(GIntBig) * (psWay->nRefs - (bIsArea ? 1 : 0)));
     m_nUnsortedReqIds += (psWay->nRefs - (bIsArea ? 1 : 0));
@@ -2165,7 +2137,7 @@ static void OGROSMNotifyWay(OSMWay *psWay, OSMContext * /* psOSMContext */,
 
 unsigned int OGROSMDataSource::LookupWays(
     std::map<GIntBig, std::pair<int, void *>> &aoMapWays,
-    OSMRelation *psRelation)
+    const OSMRelation *psRelation)
 {
     unsigned int nFound = 0;
     unsigned int iCur = 0;
@@ -2231,7 +2203,7 @@ unsigned int OGROSMDataSource::LookupWays(
 /*                          BuildMultiPolygon()                         */
 /************************************************************************/
 
-OGRGeometry *OGROSMDataSource::BuildMultiPolygon(OSMRelation *psRelation,
+OGRGeometry *OGROSMDataSource::BuildMultiPolygon(const OSMRelation *psRelation,
                                                  unsigned int *pnTags,
                                                  OSMTag *pasTags)
 {
@@ -2267,9 +2239,8 @@ OGRGeometry *OGROSMDataSource::BuildMultiPolygon(OSMRelation *psRelation,
         return nullptr;
     }
 
-    OGRMultiLineString *poMLS = new OGRMultiLineString();
-    OGRGeometry **papoPolygons = static_cast<OGRGeometry **>(
-        CPLMalloc(sizeof(OGRGeometry *) * psRelation->nMembers));
+    OGRMultiLineString oMLS;
+    std::vector<OGRGeometry *> apoPolygons(psRelation->nMembers);
     int nPolys = 0;
 
     if (pnTags != nullptr)
@@ -2312,7 +2283,7 @@ OGRGeometry *OGROSMDataSource::BuildMultiPolygon(OSMRelation *psRelation,
                 OGRPolygon *poPoly = new OGRPolygon();
                 OGRLinearRing *poRing = new OGRLinearRing();
                 poPoly->addRingDirectly(poRing);
-                papoPolygons[nPolys++] = poPoly;
+                apoPolygons[nPolys++] = poPoly;
                 poLS = poRing;
 
                 if (strcmp(psRelation->pasMembers[i].pszRole, "outer") == 0)
@@ -2327,11 +2298,11 @@ OGRGeometry *OGROSMDataSource::BuildMultiPolygon(OSMRelation *psRelation,
             else
             {
                 poLS = new OGRLineString();
-                poMLS->addGeometryDirectly(poLS);
+                oMLS.addGeometryDirectly(poLS);
             }
 
             const int nPoints = static_cast<int>(m_asLonLatCache.size());
-            poLS->setNumPoints(nPoints);
+            poLS->setNumPoints(nPoints, /*bZeroizeNewContent=*/false);
             for (int j = 0; j < nPoints; j++)
             {
                 poLS->setPoint(j, INT_TO_DBL(m_asLonLatCache[j].nLon),
@@ -2340,20 +2311,16 @@ OGRGeometry *OGROSMDataSource::BuildMultiPolygon(OSMRelation *psRelation,
         }
     }
 
-    if (poMLS->getNumGeometries() > 0)
+    if (oMLS.getNumGeometries() > 0)
     {
-        OGRGeometryH hPoly = OGRBuildPolygonFromEdges((OGRGeometryH)poMLS, TRUE,
-                                                      FALSE, 0, nullptr);
-        if (hPoly != nullptr && OGR_G_GetGeometryType(hPoly) == wkbPolygon)
+        auto poPolyFromEdges = std::unique_ptr<OGRGeometry>(
+            OGRGeometry::FromHandle(OGRBuildPolygonFromEdges(
+                OGRGeometry::ToHandle(&oMLS), TRUE, FALSE, 0, nullptr)));
+        if (poPolyFromEdges && poPolyFromEdges->getGeometryType() == wkbPolygon)
         {
-            OGRPolygon *poSuperPoly =
-                OGRGeometry::FromHandle(hPoly)->toPolygon();
-            for (unsigned int i = 0;
-                 i < 1 + (unsigned int)poSuperPoly->getNumInteriorRings(); i++)
+            const OGRPolygon *poSuperPoly = poPolyFromEdges->toPolygon();
+            for (const OGRLinearRing *poRing : *poSuperPoly)
             {
-                OGRLinearRing *poRing =
-                    (i == 0) ? poSuperPoly->getExteriorRing()
-                             : poSuperPoly->getInteriorRing(i - 1);
                 if (poRing != nullptr && poRing->getNumPoints() >= 4 &&
                     poRing->getX(0) ==
                         poRing->getX(poRing->getNumPoints() - 1) &&
@@ -2361,34 +2328,32 @@ OGRGeometry *OGROSMDataSource::BuildMultiPolygon(OSMRelation *psRelation,
                 {
                     OGRPolygon *poPoly = new OGRPolygon();
                     poPoly->addRing(poRing);
-                    papoPolygons[nPolys++] = poPoly;
+                    apoPolygons[nPolys++] = poPoly;
                 }
             }
         }
-
-        OGR_G_DestroyGeometry(hPoly);
     }
-    delete poMLS;
 
-    OGRGeometry *poRet = nullptr;
+    std::unique_ptr<OGRGeometry> poRet;
 
     if (nPolys > 0)
     {
         int bIsValidGeometry = FALSE;
         const char *apszOptions[2] = {"METHOD=DEFAULT", nullptr};
-        OGRGeometry *poGeom = OGRGeometryFactory::organizePolygons(
-            papoPolygons, nPolys, &bIsValidGeometry, apszOptions);
+        auto poGeom =
+            std::unique_ptr<OGRGeometry>(OGRGeometryFactory::organizePolygons(
+                apoPolygons.data(), nPolys, &bIsValidGeometry, apszOptions));
 
-        if (poGeom != nullptr && poGeom->getGeometryType() == wkbPolygon)
+        if (poGeom && poGeom->getGeometryType() == wkbPolygon)
         {
-            OGRMultiPolygon *poMulti = new OGRMultiPolygon();
-            poMulti->addGeometryDirectly(poGeom);
-            poGeom = poMulti;
+            auto poMulti = std::make_unique<OGRMultiPolygon>();
+            poMulti->addGeometryDirectly(poGeom.release());
+            poGeom = std::move(poMulti);
         }
 
-        if (poGeom != nullptr && poGeom->getGeometryType() == wkbMultiPolygon)
+        if (poGeom && poGeom->getGeometryType() == wkbMultiPolygon)
         {
-            poRet = poGeom;
+            poRet = std::move(poGeom);
         }
         else
         {
@@ -2396,35 +2361,33 @@ OGRGeometry *OGROSMDataSource::BuildMultiPolygon(OSMRelation *psRelation,
                      "Relation " CPL_FRMT_GIB
                      ": Geometry has incompatible type : %s",
                      psRelation->nID,
-                     poGeom != nullptr
-                         ? OGR_G_GetGeometryName(OGRGeometry::ToHandle(poGeom))
-                         : "null");
-            delete poGeom;
+                     poGeom ? OGR_G_GetGeometryName(
+                                  OGRGeometry::ToHandle(poGeom.get()))
+                            : "null");
         }
     }
 
-    CPLFree(papoPolygons);
-
     // cppcheck-suppress constVariableReference
     for (auto &oIter : aoMapWays)
         CPLFree(oIter.second.second);
 
-    return poRet;
+    return poRet.release();
 }
 
 /************************************************************************/
 /*                          BuildGeometryCollection()                   */
 /************************************************************************/
 
-OGRGeometry *OGROSMDataSource::BuildGeometryCollection(OSMRelation *psRelation,
-                                                       int bMultiLineString)
+OGRGeometry *
+OGROSMDataSource::BuildGeometryCollection(const OSMRelation *psRelation,
+                                          bool bMultiLineString)
 {
     std::map<GIntBig, std::pair<int, void *>> aoMapWays;
     LookupWays(aoMapWays, psRelation);
 
-    OGRGeometryCollection *poColl = (bMultiLineString)
-                                        ? new OGRMultiLineString()
-                                        : new OGRGeometryCollection();
+    std::unique_ptr<OGRGeometryCollection> poColl =
+        bMultiLineString ? std::make_unique<OGRMultiLineString>()
+                         : std::make_unique<OGRGeometryCollection>();
 
     for (unsigned int i = 0; i < psRelation->nMembers; i++)
     {
@@ -2466,7 +2429,7 @@ OGRGeometry *OGROSMDataSource::BuildGeometryCollection(OSMRelation *psRelation,
             }
 
             const int nPoints = static_cast<int>(m_asLonLatCache.size());
-            poLS->setNumPoints(nPoints);
+            poLS->setNumPoints(nPoints, /*bZeroizeNewContent=*/false);
             for (int j = 0; j < nPoints; j++)
             {
                 poLS->setPoint(j, INT_TO_DBL(m_asLonLatCache[j].nLon),
@@ -2477,24 +2440,23 @@ OGRGeometry *OGROSMDataSource::BuildGeometryCollection(OSMRelation *psRelation,
 
     if (poColl->getNumGeometries() == 0)
     {
-        delete poColl;
-        poColl = nullptr;
+        poColl.reset();
     }
 
     // cppcheck-suppress constVariableReference
     for (auto &oIter : aoMapWays)
         CPLFree(oIter.second.second);
 
-    return poColl;
+    return poColl.release();
 }
 
 /************************************************************************/
 /*                            NotifyRelation()                          */
 /************************************************************************/
 
-void OGROSMDataSource::NotifyRelation(OSMRelation *psRelation)
+void OGROSMDataSource::NotifyRelation(const OSMRelation *psRelation)
 {
-    if (m_nWayFeaturePairs != 0)
+    if (!m_asWayFeaturePairs.empty())
         ProcessWaysBatch();
 
     m_nRelationsProcessed++;
@@ -2542,26 +2504,26 @@ void OGROSMDataSource::NotifyRelation(OSMRelation *psRelation)
     const int iCurLayer = bMultiPolygon      ? IDX_LYR_MULTIPOLYGONS
                           : bMultiLineString ? IDX_LYR_MULTILINESTRINGS
                                              : IDX_LYR_OTHER_RELATIONS;
-    if (!m_papoLayers[iCurLayer]->IsUserInterested())
+    if (!m_apoLayers[iCurLayer]->IsUserInterested())
         return;
 
-    OGRFeature *poFeature = nullptr;
+    std::unique_ptr<OGRFeature> poFeature;
 
     if (!(bMultiPolygon && !bInterestingTagFound) &&
         // We cannot do early filtering for multipolygon that has no
         // interesting tag, since we may fetch attributes from ways.
-        m_papoLayers[iCurLayer]->HasAttributeFilter() &&
-        !m_papoLayers[iCurLayer]->AttributeFilterEvaluationNeedsGeometry())
+        m_apoLayers[iCurLayer]->HasAttributeFilter() &&
+        !m_apoLayers[iCurLayer]->AttributeFilterEvaluationNeedsGeometry())
     {
-        poFeature = new OGRFeature(m_papoLayers[iCurLayer]->GetLayerDefn());
+        poFeature = std::make_unique<OGRFeature>(
+            m_apoLayers[iCurLayer]->GetLayerDefn());
 
-        m_papoLayers[iCurLayer]->SetFieldsFromTags(
-            poFeature, psRelation->nID, false, psRelation->nTags,
+        m_apoLayers[iCurLayer]->SetFieldsFromTags(
+            poFeature.get(), psRelation->nID, false, psRelation->nTags,
             psRelation->pasTags, &psRelation->sInfo);
 
-        if (!m_papoLayers[iCurLayer]->EvaluateAttributeFilter(poFeature))
+        if (!m_apoLayers[iCurLayer]->EvaluateAttributeFilter(poFeature.get()))
         {
-            delete poFeature;
             return;
         }
     }
@@ -2592,10 +2554,11 @@ void OGROSMDataSource::NotifyRelation(OSMRelation *psRelation)
         bool bAttrFilterAlreadyEvaluated = true;
         if (poFeature == nullptr)
         {
-            poFeature = new OGRFeature(m_papoLayers[iCurLayer]->GetLayerDefn());
+            poFeature = std::make_unique<OGRFeature>(
+                m_apoLayers[iCurLayer]->GetLayerDefn());
 
-            m_papoLayers[iCurLayer]->SetFieldsFromTags(
-                poFeature, psRelation->nID, false,
+            m_apoLayers[iCurLayer]->SetFieldsFromTags(
+                poFeature.get(), psRelation->nID, false,
                 nExtraTags ? nExtraTags : psRelation->nTags,
                 nExtraTags ? pasExtraTags : psRelation->pasTags,
                 &psRelation->sInfo);
@@ -2605,18 +2568,14 @@ void OGROSMDataSource::NotifyRelation(OSMRelation *psRelation)
 
         poFeature->SetGeometryDirectly(poGeom);
 
-        int bFilteredOut = FALSE;
-        if (!m_papoLayers[iCurLayer]->AddFeature(
-                poFeature, bAttrFilterAlreadyEvaluated, &bFilteredOut,
-                !m_bFeatureAdded))
+        bool bFilteredOut = FALSE;
+        if (!m_apoLayers[iCurLayer]->AddFeature(
+                std::move(poFeature), bAttrFilterAlreadyEvaluated,
+                &bFilteredOut, !m_bFeatureAdded))
             m_bStopParsing = true;
         else if (!bFilteredOut)
             m_bFeatureAdded = true;
     }
-    else
-    {
-        delete poFeature;
-    }
 }
 
 static void OGROSMNotifyRelation(OSMRelation *psRelation,
@@ -2650,7 +2609,7 @@ void OGROSMDataSource::ProcessPolygonsStandalone()
     bool bFirst = true;
 
     while (m_bHasRowInPolygonsStandalone &&
-           m_papoLayers[IDX_LYR_MULTIPOLYGONS]->m_nFeatureArraySize < 10000)
+           m_apoLayers[IDX_LYR_MULTIPOLYGONS]->m_apoFeatures.size() < 10000)
     {
         if (bFirst)
         {
@@ -2678,24 +2637,26 @@ void OGROSMDataSource::ProcessPolygonsStandalone()
             poPoly->addRingDirectly(poRing);
             OGRLineString *poLS = poRing;
 
-            poLS->setNumPoints(static_cast<int>(m_asLonLatCache.size()));
+            poLS->setNumPoints(static_cast<int>(m_asLonLatCache.size()),
+                               /*bZeroizeNewContent=*/false);
             for (int j = 0; j < static_cast<int>(m_asLonLatCache.size()); j++)
             {
                 poLS->setPoint(j, INT_TO_DBL(m_asLonLatCache[j].nLon),
                                INT_TO_DBL(m_asLonLatCache[j].nLat));
             }
 
-            OGRFeature *poFeature = new OGRFeature(
-                m_papoLayers[IDX_LYR_MULTIPOLYGONS]->GetLayerDefn());
+            auto poFeature = std::make_unique<OGRFeature>(
+                m_apoLayers[IDX_LYR_MULTIPOLYGONS]->GetLayerDefn());
 
-            m_papoLayers[IDX_LYR_MULTIPOLYGONS]->SetFieldsFromTags(
-                poFeature, id, true, nTags, pasTags, &sInfo);
+            m_apoLayers[IDX_LYR_MULTIPOLYGONS]->SetFieldsFromTags(
+                poFeature.get(), id, true, nTags, pasTags, &sInfo);
 
             poFeature->SetGeometryDirectly(poMulti);
 
-            int bFilteredOut = FALSE;
-            if (!m_papoLayers[IDX_LYR_MULTIPOLYGONS]->AddFeature(
-                    poFeature, FALSE, &bFilteredOut, !m_bFeatureAdded))
+            bool bFilteredOut = false;
+            if (!m_apoLayers[IDX_LYR_MULTIPOLYGONS]->AddFeature(
+                    std::move(poFeature), FALSE, &bFilteredOut,
+                    !m_bFeatureAdded))
             {
                 m_bStopParsing = true;
                 break;
@@ -2746,12 +2707,11 @@ static void OGROSMNotifyBounds(double dfXMin, double dfYMin, double dfXMax,
 /*                                Open()                                */
 /************************************************************************/
 
-int OGROSMDataSource::Open(const char *pszFilename, char **papszOpenOptionsIn)
+int OGROSMDataSource::Open(const char *pszFilename,
+                           CSLConstList papszOpenOptionsIn)
 
 {
-    m_pszName = CPLStrdup(pszFilename);
-
-    m_psParser = OSM_Open(m_pszName, OGROSMNotifyNodes, OGROSMNotifyWay,
+    m_psParser = OSM_Open(pszFilename, OGROSMNotifyNodes, OGROSMNotifyWay,
                           OGROSMNotifyRelation, OGROSMNotifyBounds, this);
     if (m_psParser == nullptr)
         return FALSE;
@@ -2778,31 +2738,26 @@ int OGROSMDataSource::Open(const char *pszFilename, char **papszOpenOptionsIn)
     if (m_bCompressNodes)
         CPLDebug("OSM", "Using compression for nodes DB");
 
-    m_nLayers = 5;
-    m_papoLayers = static_cast<OGROSMLayer **>(
-        CPLMalloc(m_nLayers * sizeof(OGROSMLayer *)));
+    // Do not change the below order without updating the IDX_LYR_ constants!
+    m_apoLayers.emplace_back(
+        std::make_unique<OGROSMLayer>(this, IDX_LYR_POINTS, "points"));
+    m_apoLayers.back()->GetLayerDefn()->SetGeomType(wkbPoint);
 
-    m_papoLayers[IDX_LYR_POINTS] =
-        new OGROSMLayer(this, IDX_LYR_POINTS, "points");
-    m_papoLayers[IDX_LYR_POINTS]->GetLayerDefn()->SetGeomType(wkbPoint);
+    m_apoLayers.emplace_back(
+        std::make_unique<OGROSMLayer>(this, IDX_LYR_LINES, "lines"));
+    m_apoLayers.back()->GetLayerDefn()->SetGeomType(wkbLineString);
 
-    m_papoLayers[IDX_LYR_LINES] = new OGROSMLayer(this, IDX_LYR_LINES, "lines");
-    m_papoLayers[IDX_LYR_LINES]->GetLayerDefn()->SetGeomType(wkbLineString);
+    m_apoLayers.emplace_back(std::make_unique<OGROSMLayer>(
+        this, IDX_LYR_MULTILINESTRINGS, "multilinestrings"));
+    m_apoLayers.back()->GetLayerDefn()->SetGeomType(wkbMultiLineString);
 
-    m_papoLayers[IDX_LYR_MULTILINESTRINGS] =
-        new OGROSMLayer(this, IDX_LYR_MULTILINESTRINGS, "multilinestrings");
-    m_papoLayers[IDX_LYR_MULTILINESTRINGS]->GetLayerDefn()->SetGeomType(
-        wkbMultiLineString);
+    m_apoLayers.emplace_back(std::make_unique<OGROSMLayer>(
+        this, IDX_LYR_MULTIPOLYGONS, "multipolygons"));
+    m_apoLayers.back()->GetLayerDefn()->SetGeomType(wkbMultiPolygon);
 
-    m_papoLayers[IDX_LYR_MULTIPOLYGONS] =
-        new OGROSMLayer(this, IDX_LYR_MULTIPOLYGONS, "multipolygons");
-    m_papoLayers[IDX_LYR_MULTIPOLYGONS]->GetLayerDefn()->SetGeomType(
-        wkbMultiPolygon);
-
-    m_papoLayers[IDX_LYR_OTHER_RELATIONS] =
-        new OGROSMLayer(this, IDX_LYR_OTHER_RELATIONS, "other_relations");
-    m_papoLayers[IDX_LYR_OTHER_RELATIONS]->GetLayerDefn()->SetGeomType(
-        wkbGeometryCollection);
+    m_apoLayers.emplace_back(std::make_unique<OGROSMLayer>(
+        this, IDX_LYR_OTHER_RELATIONS, "other_relations"));
+    m_apoLayers.back()->GetLayerDefn()->SetGeomType(wkbGeometryCollection);
 
     if (!ParseConf(papszOpenOptionsIn))
     {
@@ -2828,26 +2783,26 @@ int OGROSMDataSource::Open(const char *pszFilename, char **papszOpenOptionsIn)
     }
 
     const auto eTagsSubType = m_bTagsAsHSTORE ? OFSTNone : OFSTJSON;
-    for (int i = 0; i < m_nLayers; i++)
+    for (auto &&poLayer : m_apoLayers)
     {
-        if (m_papoLayers[i]->HasAllTags())
+        if (poLayer->HasAllTags())
         {
-            m_papoLayers[i]->AddField("all_tags", OFTString, eTagsSubType);
-            if (m_papoLayers[i]->HasOtherTags())
+            poLayer->AddField("all_tags", OFTString, eTagsSubType);
+            if (poLayer->HasOtherTags())
             {
-                m_papoLayers[i]->SetHasOtherTags(false);
+                poLayer->SetHasOtherTags(false);
             }
         }
-        else if (m_papoLayers[i]->HasOtherTags())
-            m_papoLayers[i]->AddField("other_tags", OFTString, eTagsSubType);
+        else if (poLayer->HasOtherTags())
+            poLayer->AddField("other_tags", OFTString, eTagsSubType);
     }
 
     m_bNeedsToSaveWayInfo =
-        (m_papoLayers[IDX_LYR_MULTIPOLYGONS]->HasTimestamp() ||
-         m_papoLayers[IDX_LYR_MULTIPOLYGONS]->HasChangeset() ||
-         m_papoLayers[IDX_LYR_MULTIPOLYGONS]->HasVersion() ||
-         m_papoLayers[IDX_LYR_MULTIPOLYGONS]->HasUID() ||
-         m_papoLayers[IDX_LYR_MULTIPOLYGONS]->HasUser());
+        (m_apoLayers[IDX_LYR_MULTIPOLYGONS]->HasTimestamp() ||
+         m_apoLayers[IDX_LYR_MULTIPOLYGONS]->HasChangeset() ||
+         m_apoLayers[IDX_LYR_MULTIPOLYGONS]->HasVersion() ||
+         m_apoLayers[IDX_LYR_MULTIPOLYGONS]->HasUID() ||
+         m_apoLayers[IDX_LYR_MULTIPOLYGONS]->HasUser());
 
     m_panReqIds = static_cast<GIntBig *>(
         VSI_MALLOC_VERBOSE(MAX_ACCUMULATED_NODES * sizeof(GIntBig)));
@@ -2861,8 +2816,16 @@ int OGROSMDataSource::Open(const char *pszFilename, char **papszOpenOptionsIn)
         VSI_MALLOC_VERBOSE(MAX_ACCUMULATED_NODES * sizeof(LonLat)));
     m_panUnsortedReqIds = static_cast<GIntBig *>(
         VSI_MALLOC_VERBOSE(MAX_ACCUMULATED_NODES * sizeof(GIntBig)));
-    m_pasWayFeaturePairs = static_cast<WayFeaturePair *>(
-        VSI_MALLOC_VERBOSE(MAX_DELAYED_FEATURES * sizeof(WayFeaturePair)));
+    try
+    {
+        m_asWayFeaturePairs.reserve(MAX_DELAYED_FEATURES);
+    }
+    catch (const std::exception &)
+    {
+        CPLError(CE_Failure, CPLE_OutOfMemory,
+                 "OGROSMDataSource::Open(): out of memory");
+        return FALSE;
+    }
     m_pasAccumulatedTags = static_cast<IndexedKVP *>(
         VSI_MALLOC_VERBOSE(MAX_ACCUMULATED_TAGS * sizeof(IndexedKVP)));
     pabyNonRedundantValues =
@@ -2870,9 +2833,8 @@ int OGROSMDataSource::Open(const char *pszFilename, char **papszOpenOptionsIn)
     pabyNonRedundantKeys =
         static_cast<GByte *>(VSI_MALLOC_VERBOSE(MAX_NON_REDUNDANT_KEYS));
     if (m_panReqIds == nullptr || m_pasLonLatArray == nullptr ||
-        m_panUnsortedReqIds == nullptr || m_pasWayFeaturePairs == nullptr ||
-        m_pasAccumulatedTags == nullptr || pabyNonRedundantValues == nullptr ||
-        pabyNonRedundantKeys == nullptr)
+        m_panUnsortedReqIds == nullptr || m_pasAccumulatedTags == nullptr ||
+        pabyNonRedundantValues == nullptr || pabyNonRedundantKeys == nullptr)
     {
         return FALSE;
     }
@@ -2880,6 +2842,8 @@ int OGROSMDataSource::Open(const char *pszFilename, char **papszOpenOptionsIn)
     m_nMaxSizeForInMemoryDBInMB = atoi(CSLFetchNameValueDef(
         papszOpenOptionsIn, "MAX_TMPFILE_SIZE",
         CPLGetConfigOption("OSM_MAX_TMPFILE_SIZE", "100")));
+    if (m_nMaxSizeForInMemoryDBInMB == 0)
+        m_nMaxSizeForInMemoryDBInMB = 1;
     GIntBig nSize =
         static_cast<GIntBig>(m_nMaxSizeForInMemoryDBInMB) * 1024 * 1024;
     if (nSize < 0 ||
@@ -2901,8 +2865,7 @@ int OGROSMDataSource::Open(const char *pszFilename, char **papszOpenOptionsIn)
         }
 
         m_bInMemoryNodesFile = true;
-        m_osNodesFilename.Printf("/vsimem/osm_importer/osm_temp_nodes_%p",
-                                 this);
+        m_osNodesFilename = VSIMemGenerateHiddenFilename("osm_temp_nodes");
         m_fpNodes = VSIFOpenL(m_osNodesFilename, "wb+");
         if (m_fpNodes == nullptr)
         {
@@ -2910,13 +2873,13 @@ int OGROSMDataSource::Open(const char *pszFilename, char **papszOpenOptionsIn)
         }
 
         CPLPushErrorHandler(CPLQuietErrorHandler);
-        bool bSuccess =
-            VSIFSeekL(m_fpNodes, (vsi_l_offset)(nSize * 3 / 4), SEEK_SET) == 0;
+        const bool bSuccess =
+            VSIFTruncateL(m_fpNodes,
+                          static_cast<vsi_l_offset>(nSize * 3 / 4)) == 0;
         CPLPopErrorHandler();
 
         if (bSuccess)
         {
-            VSIFSeekL(m_fpNodes, 0, SEEK_SET);
             VSIFTruncateL(m_fpNodes, 0);
         }
         else
@@ -2955,10 +2918,11 @@ int OGROSMDataSource::Open(const char *pszFilename, char **papszOpenOptionsIn)
     const bool bRet = CreateTempDB();
     if (bRet)
     {
-        CPLString osInterestLayers = GetInterestLayersForDSName(GetName());
+        CPLString osInterestLayers =
+            GetInterestLayersForDSName(GetDescription());
         if (!osInterestLayers.empty())
         {
-            delete ExecuteSQL(osInterestLayers, nullptr, nullptr);
+            ReleaseResultSet(ExecuteSQL(osInterestLayers, nullptr, nullptr));
         }
     }
     return bRet;
@@ -2988,21 +2952,21 @@ bool OGROSMDataSource::CreateTempDB()
     }
     else
     {
-        m_osTmpDBName.Printf("/vsimem/osm_importer/osm_temp_%p.sqlite", this);
+        m_osTmpDBName = VSIMemGenerateHiddenFilename("osm_temp.sqlite");
 
         // On 32 bit, the virtual memory space is scarce, so we need to
         // reserve it right now. Will not hurt on 64 bit either.
         VSILFILE *fp = VSIFOpenL(m_osTmpDBName, "wb");
         if (fp)
         {
-            GIntBig nSize =
-                static_cast<GIntBig>(m_nMaxSizeForInMemoryDBInMB) * 1024 * 1024;
+            vsi_l_offset nSize =
+                static_cast<vsi_l_offset>(m_nMaxSizeForInMemoryDBInMB) * 1024 *
+                1024;
             if (m_bCustomIndexing && m_bInMemoryNodesFile)
                 nSize = nSize / 4;
 
             CPLPushErrorHandler(CPLQuietErrorHandler);
-            bSuccess =
-                VSIFSeekL(fp, static_cast<vsi_l_offset>(nSize), SEEK_SET) == 0;
+            bSuccess = VSIFTruncateL(fp, nSize) == 0;
             CPLPopErrorHandler();
 
             if (bSuccess)
@@ -3376,13 +3340,12 @@ bool OGROSMDataSource::CommitTransactionCacheDB()
 void OGROSMDataSource::AddComputedAttributes(
     int iCurLayer, const std::vector<OGROSMComputedAttribute> &oAttributes)
 {
-    for (size_t i = 0; i < oAttributes.size(); i++)
+    for (const auto &oAttribute : oAttributes)
     {
-        if (!oAttributes[i].osSQL.empty())
+        if (!oAttribute.osSQL.empty())
         {
-            m_papoLayers[iCurLayer]->AddComputedAttribute(oAttributes[i].osName,
-                                                          oAttributes[i].eType,
-                                                          oAttributes[i].osSQL);
+            m_apoLayers[iCurLayer]->AddComputedAttribute(
+                oAttribute.osName, oAttribute.eType, oAttribute.osSQL);
         }
     }
 }
@@ -3391,7 +3354,7 @@ void OGROSMDataSource::AddComputedAttributes(
 /*                           ParseConf()                                */
 /************************************************************************/
 
-bool OGROSMDataSource::ParseConf(char **papszOpenOptionsIn)
+bool OGROSMDataSource::ParseConf(CSLConstList papszOpenOptionsIn)
 {
     const char *pszFilename =
         CSLFetchNameValueDef(papszOpenOptionsIn, "CONFIG_FILE",
@@ -3405,6 +3368,8 @@ bool OGROSMDataSource::ParseConf(char **papszOpenOptionsIn)
         return false;
     }
 
+    m_osConfigFile = pszFilename;
+
     VSILFILE *fpConf = VSIFOpenL(pszFilename, "rb");
     if (fpConf == nullptr)
         return false;
@@ -3425,14 +3390,23 @@ bool OGROSMDataSource::ParseConf(char **papszOpenOptionsIn)
 
             iCurLayer = -1;
             pszLine++;
-            ((char *)pszLine)[strlen(pszLine) - 1] = '\0'; /* Evil but OK */
-            for (int i = 0; i < m_nLayers; i++)
+            const_cast<char *>(pszLine)[strlen(pszLine) - 1] =
+                '\0'; /* Evil but OK */
+
+            if (strcmp(pszLine, "general") == 0)
             {
-                if (strcmp(pszLine, m_papoLayers[i]->GetName()) == 0)
+                continue;
+            }
+
+            int i = 0;
+            for (auto &&poLayer : m_apoLayers)
+            {
+                if (strcmp(pszLine, poLayer->GetName()) == 0)
                 {
                     iCurLayer = i;
                     break;
                 }
+                ++i;
             }
             if (iCurLayer < 0)
             {
@@ -3533,89 +3507,88 @@ bool OGROSMDataSource::ParseConf(char **papszOpenOptionsIn)
                 strcmp(papszTokens[0], "other_tags") == 0)
             {
                 if (strcmp(papszTokens[1], "no") == 0)
-                    m_papoLayers[iCurLayer]->SetHasOtherTags(false);
+                    m_apoLayers[iCurLayer]->SetHasOtherTags(false);
                 else if (strcmp(papszTokens[1], "yes") == 0)
-                    m_papoLayers[iCurLayer]->SetHasOtherTags(true);
+                    m_apoLayers[iCurLayer]->SetHasOtherTags(true);
             }
             else if (CSLCount(papszTokens) == 2 &&
                      strcmp(papszTokens[0], "all_tags") == 0)
             {
                 if (strcmp(papszTokens[1], "no") == 0)
-                    m_papoLayers[iCurLayer]->SetHasAllTags(false);
+                    m_apoLayers[iCurLayer]->SetHasAllTags(false);
                 else if (strcmp(papszTokens[1], "yes") == 0)
-                    m_papoLayers[iCurLayer]->SetHasAllTags(true);
+                    m_apoLayers[iCurLayer]->SetHasAllTags(true);
             }
             else if (CSLCount(papszTokens) == 2 &&
                      strcmp(papszTokens[0], "osm_id") == 0)
             {
                 if (strcmp(papszTokens[1], "no") == 0)
-                    m_papoLayers[iCurLayer]->SetHasOSMId(false);
+                    m_apoLayers[iCurLayer]->SetHasOSMId(false);
                 else if (strcmp(papszTokens[1], "yes") == 0)
                 {
-                    m_papoLayers[iCurLayer]->SetHasOSMId(true);
-                    m_papoLayers[iCurLayer]->AddField("osm_id", OFTString);
+                    m_apoLayers[iCurLayer]->SetHasOSMId(true);
+                    m_apoLayers[iCurLayer]->AddField("osm_id", OFTString);
 
                     if (iCurLayer == IDX_LYR_MULTIPOLYGONS)
-                        m_papoLayers[iCurLayer]->AddField("osm_way_id",
-                                                          OFTString);
+                        m_apoLayers[iCurLayer]->AddField("osm_way_id",
+                                                         OFTString);
                 }
             }
             else if (CSLCount(papszTokens) == 2 &&
                      strcmp(papszTokens[0], "osm_version") == 0)
             {
                 if (strcmp(papszTokens[1], "no") == 0)
-                    m_papoLayers[iCurLayer]->SetHasVersion(false);
+                    m_apoLayers[iCurLayer]->SetHasVersion(false);
                 else if (strcmp(papszTokens[1], "yes") == 0)
                 {
-                    m_papoLayers[iCurLayer]->SetHasVersion(true);
-                    m_papoLayers[iCurLayer]->AddField("osm_version",
-                                                      OFTInteger);
+                    m_apoLayers[iCurLayer]->SetHasVersion(true);
+                    m_apoLayers[iCurLayer]->AddField("osm_version", OFTInteger);
                 }
             }
             else if (CSLCount(papszTokens) == 2 &&
                      strcmp(papszTokens[0], "osm_timestamp") == 0)
             {
                 if (strcmp(papszTokens[1], "no") == 0)
-                    m_papoLayers[iCurLayer]->SetHasTimestamp(false);
+                    m_apoLayers[iCurLayer]->SetHasTimestamp(false);
                 else if (strcmp(papszTokens[1], "yes") == 0)
                 {
-                    m_papoLayers[iCurLayer]->SetHasTimestamp(true);
-                    m_papoLayers[iCurLayer]->AddField("osm_timestamp",
-                                                      OFTDateTime);
+                    m_apoLayers[iCurLayer]->SetHasTimestamp(true);
+                    m_apoLayers[iCurLayer]->AddField("osm_timestamp",
+                                                     OFTDateTime);
                 }
             }
             else if (CSLCount(papszTokens) == 2 &&
                      strcmp(papszTokens[0], "osm_uid") == 0)
             {
                 if (strcmp(papszTokens[1], "no") == 0)
-                    m_papoLayers[iCurLayer]->SetHasUID(false);
+                    m_apoLayers[iCurLayer]->SetHasUID(false);
                 else if (strcmp(papszTokens[1], "yes") == 0)
                 {
-                    m_papoLayers[iCurLayer]->SetHasUID(true);
-                    m_papoLayers[iCurLayer]->AddField("osm_uid", OFTInteger);
+                    m_apoLayers[iCurLayer]->SetHasUID(true);
+                    m_apoLayers[iCurLayer]->AddField("osm_uid", OFTInteger);
                 }
             }
             else if (CSLCount(papszTokens) == 2 &&
                      strcmp(papszTokens[0], "osm_user") == 0)
             {
                 if (strcmp(papszTokens[1], "no") == 0)
-                    m_papoLayers[iCurLayer]->SetHasUser(false);
+                    m_apoLayers[iCurLayer]->SetHasUser(false);
                 else if (strcmp(papszTokens[1], "yes") == 0)
                 {
-                    m_papoLayers[iCurLayer]->SetHasUser(true);
-                    m_papoLayers[iCurLayer]->AddField("osm_user", OFTString);
+                    m_apoLayers[iCurLayer]->SetHasUser(true);
+                    m_apoLayers[iCurLayer]->AddField("osm_user", OFTString);
                 }
             }
             else if (CSLCount(papszTokens) == 2 &&
                      strcmp(papszTokens[0], "osm_changeset") == 0)
             {
                 if (strcmp(papszTokens[1], "no") == 0)
-                    m_papoLayers[iCurLayer]->SetHasChangeset(false);
+                    m_apoLayers[iCurLayer]->SetHasChangeset(false);
                 else if (strcmp(papszTokens[1], "yes") == 0)
                 {
-                    m_papoLayers[iCurLayer]->SetHasChangeset(true);
-                    m_papoLayers[iCurLayer]->AddField("osm_changeset",
-                                                      OFTInteger);
+                    m_apoLayers[iCurLayer]->SetHasChangeset(true);
+                    m_apoLayers[iCurLayer]->AddField("osm_changeset",
+                                                     OFTInteger);
                 }
             }
             else if (CSLCount(papszTokens) == 2 &&
@@ -3625,8 +3598,8 @@ bool OGROSMDataSource::ParseConf(char **papszOpenOptionsIn)
                     CSLTokenizeString2(papszTokens[1], ",", 0);
                 for (int i = 0; papszTokens2[i] != nullptr; i++)
                 {
-                    m_papoLayers[iCurLayer]->AddField(papszTokens2[i],
-                                                      OFTString);
+                    m_apoLayers[iCurLayer]->AddField(papszTokens2[i],
+                                                     OFTString);
                     for (const char *&pszIgnoredKey : m_ignoredKeys)
                     {
                         if (strcmp(papszTokens2[i], pszIgnoredKey) == 0)
@@ -3643,7 +3616,7 @@ bool OGROSMDataSource::ParseConf(char **papszOpenOptionsIn)
                     CSLTokenizeString2(papszTokens[1], ",", 0);
                 for (int i = 0; papszTokens2[i] != nullptr; i++)
                 {
-                    m_papoLayers[iCurLayer]->AddInsignificantKey(
+                    m_apoLayers[iCurLayer]->AddInsignificantKey(
                         papszTokens2[i]);
                 }
                 CSLDestroy(papszTokens2);
@@ -3655,8 +3628,8 @@ bool OGROSMDataSource::ParseConf(char **papszOpenOptionsIn)
                     CSLTokenizeString2(papszTokens[1], ",", 0);
                 for (int i = 0; papszTokens2[i] != nullptr; i++)
                 {
-                    m_papoLayers[iCurLayer]->AddIgnoreKey(papszTokens2[i]);
-                    m_papoLayers[iCurLayer]->AddWarnKey(papszTokens2[i]);
+                    m_apoLayers[iCurLayer]->AddIgnoreKey(papszTokens2[i]);
+                    m_apoLayers[iCurLayer]->AddWarnKey(papszTokens2[i]);
                 }
                 CSLDestroy(papszTokens2);
             }
@@ -3709,11 +3682,11 @@ bool OGROSMDataSource::ParseConf(char **papszOpenOptionsIn)
                 if (!bFound)
                 {
                     const int idx =
-                        m_papoLayers[iCurLayer]->GetLayerDefn()->GetFieldIndex(
+                        m_apoLayers[iCurLayer]->GetLayerDefn()->GetFieldIndex(
                             osName);
                     if (idx >= 0)
                     {
-                        m_papoLayers[iCurLayer]
+                        m_apoLayers[iCurLayer]
                             ->GetLayerDefn()
                             ->GetFieldDefn(idx)
                             ->SetType(eType);
@@ -3821,29 +3794,24 @@ int OGROSMDataSource::MyResetReading()
         sqlite3_reset(m_hSelectPolygonsStandaloneStmt);
 
     {
-        for (int i = 0; i < m_nWayFeaturePairs; i++)
-        {
-            delete m_pasWayFeaturePairs[i].poFeature;
-        }
-        m_nWayFeaturePairs = 0;
+        m_asWayFeaturePairs.clear();
         m_nUnsortedReqIds = 0;
         m_nReqIds = 0;
         m_nAccumulatedTags = 0;
         nNonRedundantKeysLen = 0;
         nNonRedundantValuesLen = 0;
 
-        for (int i = 1; i < static_cast<int>(m_asKeys.size()); i++)
+        for (KeyDesc *psKD : m_apsKeys)
         {
-            KeyDesc *psKD = m_asKeys[i];
             if (psKD)
             {
                 CPLFree(psKD->pszK);
-                for (int j = 0; j < (int)psKD->asValues.size(); j++)
-                    CPLFree(psKD->asValues[j]);
+                for (auto *pszValue : psKD->apszValues)
+                    CPLFree(pszValue);
                 delete psKD;
             }
         }
-        m_asKeys.resize(1);  // keep guard to avoid index 0 to be used
+        m_apsKeys.resize(1);  // keep guard to avoid index 0 to be used
         m_aoMapIndexedKeys.clear();
     }
 
@@ -3859,28 +3827,27 @@ int OGROSMDataSource::MyResetReading()
 
         memset(m_pabySector, 0, SECTOR_SIZE);
 
-        std::map<int, Bucket>::iterator oIter = m_oMapBuckets.begin();
-        for (; oIter != m_oMapBuckets.end(); ++oIter)
+        for (auto &oIter : m_oMapBuckets)
         {
-            Bucket *psBucket = &(oIter->second);
-            psBucket->nOff = -1;
+            Bucket &sBucket = oIter.second;
+            sBucket.nOff = -1;
             if (m_bCompressNodes)
             {
-                if (psBucket->u.panSectorSize)
-                    memset(psBucket->u.panSectorSize, 0,
+                if (sBucket.u.panSectorSize)
+                    memset(sBucket.u.panSectorSize, 0,
                            BUCKET_SECTOR_SIZE_ARRAY_SIZE);
             }
             else
             {
-                if (psBucket->u.pabyBitmap)
-                    memset(psBucket->u.pabyBitmap, 0, BUCKET_BITMAP_SIZE);
+                if (sBucket.u.pabyBitmap)
+                    memset(sBucket.u.pabyBitmap, 0, BUCKET_BITMAP_SIZE);
             }
         }
     }
 
-    for (int i = 0; i < m_nLayers; i++)
+    for (auto &&poLayer : m_apoLayers)
     {
-        m_papoLayers[i]->ForceResetReading();
+        poLayer->ForceResetReading();
     }
 
     m_bStopParsing = false;
@@ -3911,14 +3878,14 @@ OGRFeature *OGROSMDataSource::GetNextFeature(OGRLayer **ppoBelongingLayer,
 
     if (m_poCurrentLayer == nullptr)
     {
-        m_poCurrentLayer = m_papoLayers[0];
+        m_poCurrentLayer = m_apoLayers[0].get();
     }
     if (pdfProgressPct != nullptr || pfnProgress != nullptr)
     {
         if (m_nFileSize == FILESIZE_NOT_INIT)
         {
             VSIStatBufL sStat;
-            if (VSIStatL(m_pszName, &sStat) == 0)
+            if (VSIStatL(GetDescription(), &sStat) == 0)
             {
                 m_nFileSize = static_cast<GIntBig>(sStat.st_size);
             }
@@ -3999,9 +3966,9 @@ bool OGROSMDataSource::ParseNextChunk(int nIdxLayer,
             if (!pfnProgress(dfPct, "", pProgressData))
             {
                 m_bStopParsing = true;
-                for (int i = 0; i < m_nLayers; i++)
+                for (auto &&poLayer : m_apoLayers)
                 {
-                    m_papoLayers[i]->ForceResetReading();
+                    poLayer->ForceResetReading();
                 }
                 return false;
             }
@@ -4011,7 +3978,7 @@ bool OGROSMDataSource::ParseNextChunk(int nIdxLayer,
         {
             if (eRet == OSM_EOF)
             {
-                if (m_nWayFeaturePairs != 0)
+                if (!m_asWayFeaturePairs.empty())
                     ProcessWaysBatch();
 
                 ProcessPolygonsStandalone();
@@ -4098,12 +4065,12 @@ bool OGROSMDataSource::TransferToDiskIfNecesserary()
                 {
                     VSIFSeekL(fp, 0, SEEK_END);
                     vsi_l_offset nCurSize = VSIFTellL(fp);
-                    GIntBig nNewSize =
-                        static_cast<GIntBig>(m_nMaxSizeForInMemoryDBInMB) *
+                    vsi_l_offset nNewSize =
+                        static_cast<vsi_l_offset>(m_nMaxSizeForInMemoryDBInMB) *
                         1024 * 1024;
                     CPLPushErrorHandler(CPLQuietErrorHandler);
                     const bool bSuccess =
-                        VSIFSeekL(fp, (vsi_l_offset)nNewSize, SEEK_SET) == 0;
+                        VSIFSeekL(fp, nNewSize, SEEK_SET) == 0;
                     CPLPopErrorHandler();
 
                     if (bSuccess)
@@ -4224,10 +4191,10 @@ int OGROSMDataSource::TestCapability(const char *pszCap)
 OGRLayer *OGROSMDataSource::GetLayer(int iLayer)
 
 {
-    if (iLayer < 0 || iLayer >= m_nLayers)
+    if (iLayer < 0 || static_cast<size_t>(iLayer) >= m_apoLayers.size())
         return nullptr;
 
-    return m_papoLayers[iLayer];
+    return m_apoLayers[iLayer].get();
 }
 
 /************************************************************************/
@@ -4263,6 +4230,10 @@ class OGROSMSingleFeatureLayer final : public OGRLayer
     OGRFeatureDefn *poFeatureDefn;
     int iNextShapeId;
 
+    OGROSMSingleFeatureLayer(const OGROSMSingleFeatureLayer &) = delete;
+    OGROSMSingleFeatureLayer &
+    operator=(const OGROSMSingleFeatureLayer &) = delete;
+
   public:
     OGROSMSingleFeatureLayer(const char *pszLayerName, int nVal);
     OGROSMSingleFeatureLayer(const char *pszLayerName, const char *pszVal);
@@ -4389,6 +4360,15 @@ OGRLayer *OGROSMDataSource::ExecuteSQL(const char *pszSQLCommand,
         return new OGROSMSingleFeatureLayer("GetBytesRead", szVal);
     }
 
+    /* -------------------------------------------------------------------- */
+    /*      Special SHOW config_file_path command                           */
+    /* -------------------------------------------------------------------- */
+    if (strcmp(pszSQLCommand, "SHOW config_file_path") == 0)
+    {
+        return new OGROSMSingleFeatureLayer("config_file_path",
+                                            m_osConfigFile.c_str());
+    }
+
     if (m_poResultSetLayer != nullptr)
     {
         CPLError(CE_Failure, CPLE_NotSupported,
@@ -4404,26 +4384,26 @@ OGRLayer *OGROSMDataSource::ExecuteSQL(const char *pszSQLCommand,
         char **papszTokens =
             CSLTokenizeString2(pszSQLCommand + 21, ",",
                                CSLT_STRIPLEADSPACES | CSLT_STRIPENDSPACES);
-        for (int i = 0; i < m_nLayers; i++)
+        for (auto &&poLayer : m_apoLayers)
         {
-            m_papoLayers[i]->SetDeclareInterest(FALSE);
+            poLayer->SetDeclareInterest(FALSE);
         }
 
         for (int i = 0; papszTokens[i] != nullptr; i++)
         {
             OGROSMLayer *poLayer =
-                reinterpret_cast<OGROSMLayer *>(GetLayerByName(papszTokens[i]));
+                dynamic_cast<OGROSMLayer *>(GetLayerByName(papszTokens[i]));
             if (poLayer != nullptr)
             {
                 poLayer->SetDeclareInterest(TRUE);
             }
         }
 
-        if (m_papoLayers[IDX_LYR_POINTS]->IsUserInterested() &&
-            !m_papoLayers[IDX_LYR_LINES]->IsUserInterested() &&
-            !m_papoLayers[IDX_LYR_MULTILINESTRINGS]->IsUserInterested() &&
-            !m_papoLayers[IDX_LYR_MULTIPOLYGONS]->IsUserInterested() &&
-            !m_papoLayers[IDX_LYR_OTHER_RELATIONS]->IsUserInterested())
+        if (m_apoLayers[IDX_LYR_POINTS]->IsUserInterested() &&
+            !m_apoLayers[IDX_LYR_LINES]->IsUserInterested() &&
+            !m_apoLayers[IDX_LYR_MULTILINESTRINGS]->IsUserInterested() &&
+            !m_apoLayers[IDX_LYR_MULTIPOLYGONS]->IsUserInterested() &&
+            !m_apoLayers[IDX_LYR_OTHER_RELATIONS]->IsUserInterested())
         {
             if (CPLGetConfigOption("OSM_INDEX_POINTS", nullptr) == nullptr)
             {
@@ -4444,10 +4424,10 @@ OGRLayer *OGROSMDataSource::ExecuteSQL(const char *pszSQLCommand,
                 m_bUseWaysIndex = false;
             }
         }
-        else if (m_papoLayers[IDX_LYR_LINES]->IsUserInterested() &&
-                 !m_papoLayers[IDX_LYR_MULTILINESTRINGS]->IsUserInterested() &&
-                 !m_papoLayers[IDX_LYR_MULTIPOLYGONS]->IsUserInterested() &&
-                 !m_papoLayers[IDX_LYR_OTHER_RELATIONS]->IsUserInterested())
+        else if (m_apoLayers[IDX_LYR_LINES]->IsUserInterested() &&
+                 !m_apoLayers[IDX_LYR_MULTILINESTRINGS]->IsUserInterested() &&
+                 !m_apoLayers[IDX_LYR_MULTIPOLYGONS]->IsUserInterested() &&
+                 !m_apoLayers[IDX_LYR_OTHER_RELATIONS]->IsUserInterested())
         {
             if (CPLGetConfigOption("OSM_INDEX_WAYS", nullptr) == nullptr)
             {
@@ -4476,12 +4456,9 @@ OGRLayer *OGROSMDataSource::ExecuteSQL(const char *pszSQLCommand,
 
         if (pszDialect != nullptr && EQUAL(pszDialect, "SQLITE"))
         {
-            std::set<LayerDesc> oSetLayers =
-                OGRSQLiteGetReferencedLayers(pszSQLCommand);
-            std::set<LayerDesc>::iterator oIter = oSetLayers.begin();
-            for (; oIter != oSetLayers.end(); ++oIter)
+            const auto oSetLayers = OGRSQLiteGetReferencedLayers(pszSQLCommand);
+            for (const LayerDesc &oLayerDesc : oSetLayers)
             {
-                const LayerDesc &oLayerDesc = *oIter;
                 if (oLayerDesc.osDSName.empty())
                 {
                     if (bLayerAlreadyAdded)
@@ -4526,10 +4503,10 @@ OGRLayer *OGROSMDataSource::ExecuteSQL(const char *pszSQLCommand,
         {
             /* Backup current optimization parameters */
             m_abSavedDeclaredInterest.resize(0);
-            for (int i = 0; i < m_nLayers; i++)
+            for (auto &&poLayer : m_apoLayers)
             {
                 m_abSavedDeclaredInterest.push_back(
-                    m_papoLayers[i]->IsUserInterested());
+                    poLayer->IsUserInterested());
             }
             m_bIndexPointsBackup = m_bIndexPoints;
             m_bUsePointsIndexBackup = m_bUsePointsIndex;
@@ -4542,7 +4519,7 @@ OGRLayer *OGROSMDataSource::ExecuteSQL(const char *pszSQLCommand,
             MyResetReading();
 
             /* Run the request */
-            m_poResultSetLayer = OGRDataSource::ExecuteSQL(
+            m_poResultSetLayer = GDALDataset::ExecuteSQL(
                 pszSQLCommand, poSpatialFilter, pszDialect);
 
             /* If the user explicitly run a COUNT() request, then do it ! */
@@ -4551,7 +4528,7 @@ OGRLayer *OGROSMDataSource::ExecuteSQL(const char *pszSQLCommand,
                 if (pszDialect != nullptr && EQUAL(pszDialect, "SQLITE"))
                 {
                     m_poResultSetLayer = new OGROSMResultLayerDecorator(
-                        m_poResultSetLayer, GetName(), osInterestLayers);
+                        m_poResultSetLayer, GetDescription(), osInterestLayers);
                 }
                 m_bIsFeatureCountEnabled = true;
             }
@@ -4560,8 +4537,7 @@ OGRLayer *OGROSMDataSource::ExecuteSQL(const char *pszSQLCommand,
         }
     }
 
-    return OGRDataSource::ExecuteSQL(pszSQLCommand, poSpatialFilter,
-                                     pszDialect);
+    return GDALDataset::ExecuteSQL(pszSQLCommand, poSpatialFilter, pszDialect);
 }
 
 /************************************************************************/
@@ -4578,9 +4554,11 @@ void OGROSMDataSource::ReleaseResultSet(OGRLayer *poLayer)
         m_bIsFeatureCountEnabled = false;
 
         /* Restore backup'ed optimization parameters */
-        for (int i = 0; i < m_nLayers; i++)
+        int i = 0;
+        for (auto &&poIterLayer : m_apoLayers)
         {
-            m_papoLayers[i]->SetDeclareInterest(m_abSavedDeclaredInterest[i]);
+            poIterLayer->SetDeclareInterest(m_abSavedDeclaredInterest[i]);
+            ++i;
         }
         if (m_bIndexPointsBackup && !m_bIndexPoints)
             CPLDebug("OSM", "Re-enabling indexing of nodes");
@@ -4590,7 +4568,7 @@ void OGROSMDataSource::ReleaseResultSet(OGRLayer *poLayer)
             CPLDebug("OSM", "Re-enabling indexing of ways");
         m_bIndexWays = m_bIndexWaysBackup;
         m_bUseWaysIndex = m_bUseWaysIndexBackup;
-        m_abSavedDeclaredInterest.resize(0);
+        m_abSavedDeclaredInterest.clear();
     }
 
     delete poLayer;
diff --git a/ogr/ogrsf_frmts/osm/ogrosmdriver.cpp b/ogr/ogrsf_frmts/osm/ogrosmdriver.cpp
index 14903e128d69..9bd80ca266b3 100644
--- a/ogr/ogrsf_frmts/osm/ogrosmdriver.cpp
+++ b/ogr/ogrsf_frmts/osm/ogrosmdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_osm.h"
@@ -51,7 +35,8 @@ static int OGROSMDriverIdentify(GDALOpenInfo *poOpenInfo)
     if (poOpenInfo->fpL == nullptr || poOpenInfo->nHeaderBytes == 0)
         return GDAL_IDENTIFY_FALSE;
 
-    if (strstr((const char *)poOpenInfo->pabyHeader, "<osm") != nullptr)
+    if (strstr(reinterpret_cast<const char *>(poOpenInfo->pabyHeader),
+               "<osm") != nullptr)
     {
         return GDAL_IDENTIFY_TRUE;
     }
diff --git a/ogr/ogrsf_frmts/osm/ogrosmlayer.cpp b/ogr/ogrsf_frmts/osm/ogrosmlayer.cpp
index e43e09e30a48..c9d35582c275 100644
--- a/ogr/ogrsf_frmts/osm/ogrosmlayer.cpp
+++ b/ogr/ogrsf_frmts/osm/ogrosmlayer.cpp
@@ -7,27 +7,12 @@
  ******************************************************************************
  * Copyright (c) 2012-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
 
+#include <cinttypes>
 #include <cstddef>
 #include <cstdio>
 #include <cstdlib>
@@ -56,8 +41,11 @@
 #include "osm_parser.h"
 #include "sqlite3.h"
 
-constexpr int SWITCH_THRESHOLD = 10000;
-constexpr int MAX_THRESHOLD = 100000;
+#undef SQLITE_TRANSIENT
+#define SQLITE_TRANSIENT reinterpret_cast<sqlite3_destructor_type>(-1)
+
+constexpr size_t SWITCH_THRESHOLD = 10000;
+constexpr size_t MAX_THRESHOLD = 100000;
 
 /************************************************************************/
 /*                          OGROSMLayer()                               */
@@ -90,12 +78,6 @@ OGROSMLayer::~OGROSMLayer()
     if (m_poSRS)
         m_poSRS->Release();
 
-    for (int i = 0; i < m_nFeatureArraySize; i++)
-    {
-        if (m_papoFeatures[i])
-            delete m_papoFeatures[i];
-    }
-
     for (int i = 0; i < static_cast<int>(m_apszNames.size()); i++)
         CPLFree(m_apszNames[i]);
 
@@ -109,8 +91,6 @@ OGROSMLayer::~OGROSMLayer()
     {
         sqlite3_finalize(m_oComputedAttributes[i].hStmt);
     }
-
-    CPLFree(m_papoFeatures);
 }
 
 /************************************************************************/
@@ -131,14 +111,8 @@ void OGROSMLayer::ResetReading()
 
 void OGROSMLayer::ForceResetReading()
 {
-    for (int i = 0; i < m_nFeatureArraySize; i++)
-    {
-        if (m_papoFeatures[i])
-            delete m_papoFeatures[i];
-    }
+    m_apoFeatures.clear();
     m_nFeatureArrayIndex = 0;
-    m_nFeatureArraySize = 0;
-    m_nFeatureCount = 0;
     m_bResetReadingAllowed = false;
 }
 
@@ -208,7 +182,7 @@ OGRFeature *OGROSMLayer::MyGetNextFeature(OGROSMLayer **ppoNewCurLayer,
     *ppoNewCurLayer = m_poDS->GetCurrentLayer();
     m_bResetReadingAllowed = true;
 
-    if (m_nFeatureArraySize == 0)
+    if (m_apoFeatures.empty())
     {
         if (m_poDS->IsInterleavedReading())
         {
@@ -225,15 +199,15 @@ OGRFeature *OGROSMLayer::MyGetNextFeature(OGROSMLayer **ppoNewCurLayer,
             // force a switch to that layer, so that it gets emptied.
             for (int i = 0; i < m_poDS->GetLayerCount(); i++)
             {
-                if (m_poDS->m_papoLayers[i] != this &&
-                    m_poDS->m_papoLayers[i]->m_nFeatureArraySize >
+                if (m_poDS->m_apoLayers[i].get() != this &&
+                    m_poDS->m_apoLayers[i]->m_apoFeatures.size() >
                         SWITCH_THRESHOLD)
                 {
-                    *ppoNewCurLayer = m_poDS->m_papoLayers[i];
+                    *ppoNewCurLayer = m_poDS->m_apoLayers[i].get();
                     CPLDebug("OSM",
                              "Switching to '%s' as they are too many "
                              "features in '%s'",
-                             m_poDS->m_papoLayers[i]->GetName(), GetName());
+                             m_poDS->m_apoLayers[i]->GetName(), GetName());
                     return nullptr;
                 }
             }
@@ -241,21 +215,21 @@ OGRFeature *OGROSMLayer::MyGetNextFeature(OGROSMLayer **ppoNewCurLayer,
             // Read some more data and accumulate features.
             m_poDS->ParseNextChunk(m_nIdxLayer, pfnProgress, pProgressData);
 
-            if (m_nFeatureArraySize == 0)
+            if (m_apoFeatures.empty())
             {
                 // If there are really no more features to read in the
                 // current layer, force a switch to another non-empty layer.
 
                 for (int i = 0; i < m_poDS->GetLayerCount(); i++)
                 {
-                    if (m_poDS->m_papoLayers[i] != this &&
-                        m_poDS->m_papoLayers[i]->m_nFeatureArraySize > 0)
+                    if (m_poDS->m_apoLayers[i].get() != this &&
+                        !m_poDS->m_apoLayers[i]->m_apoFeatures.empty())
                     {
-                        *ppoNewCurLayer = m_poDS->m_papoLayers[i];
+                        *ppoNewCurLayer = m_poDS->m_apoLayers[i].get();
                         CPLDebug("OSM",
                                  "Switching to '%s' as they are "
                                  "no more feature in '%s'",
-                                 m_poDS->m_papoLayers[i]->GetName(), GetName());
+                                 m_poDS->m_apoLayers[i]->GetName(), GetName());
                         return nullptr;
                     }
                 }
@@ -272,7 +246,7 @@ OGRFeature *OGROSMLayer::MyGetNextFeature(OGROSMLayer **ppoNewCurLayer,
                 int bRet =
                     m_poDS->ParseNextChunk(m_nIdxLayer, nullptr, nullptr);
                 // cppcheck-suppress knownConditionTrueFalse
-                if (m_nFeatureArraySize != 0)
+                if (!m_apoFeatures.empty())
                     break;
                 if (bRet == FALSE)
                     return nullptr;
@@ -280,15 +254,16 @@ OGRFeature *OGROSMLayer::MyGetNextFeature(OGROSMLayer **ppoNewCurLayer,
         }
     }
 
-    OGRFeature *poFeature = m_papoFeatures[m_nFeatureArrayIndex];
-
-    m_papoFeatures[m_nFeatureArrayIndex] = nullptr;
+    auto poFeature = std::move(m_apoFeatures[m_nFeatureArrayIndex]);
     m_nFeatureArrayIndex++;
 
-    if (m_nFeatureArrayIndex == m_nFeatureArraySize)
-        m_nFeatureArrayIndex = m_nFeatureArraySize = 0;
+    if (m_nFeatureArrayIndex == m_apoFeatures.size())
+    {
+        m_nFeatureArrayIndex = 0;
+        m_apoFeatures.clear();
+    }
 
-    return poFeature;
+    return poFeature.release();
 }
 
 /************************************************************************/
@@ -311,9 +286,10 @@ int OGROSMLayer::TestCapability(const char *pszCap)
 /*                             AddToArray()                             */
 /************************************************************************/
 
-bool OGROSMLayer::AddToArray(OGRFeature *poFeature, int bCheckFeatureThreshold)
+bool OGROSMLayer::AddToArray(std::unique_ptr<OGRFeature> poFeature,
+                             bool bCheckFeatureThreshold)
 {
-    if (bCheckFeatureThreshold && m_nFeatureArraySize > MAX_THRESHOLD)
+    if (bCheckFeatureThreshold && m_apoFeatures.size() > MAX_THRESHOLD)
     {
         if (!m_bHasWarnedTooManyFeatures)
         {
@@ -330,25 +306,18 @@ bool OGROSMLayer::AddToArray(OGRFeature *poFeature, int bCheckFeatureThreshold)
         return false;
     }
 
-    if (m_nFeatureArraySize == m_nFeatureArrayMaxSize)
+    try
     {
-        m_nFeatureArrayMaxSize =
-            m_nFeatureArrayMaxSize + m_nFeatureArrayMaxSize / 2 + 128;
-        CPLDebug("OSM", "For layer %s, new max size is %d", GetName(),
-                 m_nFeatureArrayMaxSize);
-        OGRFeature **papoNewFeatures =
-            static_cast<OGRFeature **>(VSI_REALLOC_VERBOSE(
-                m_papoFeatures, m_nFeatureArrayMaxSize * sizeof(OGRFeature *)));
-        if (papoNewFeatures == nullptr)
-        {
-            CPLError(CE_Failure, CPLE_AppDefined,
-                     "For layer %s, cannot resize feature array to %d features",
-                     GetName(), m_nFeatureArrayMaxSize);
-            return false;
-        }
-        m_papoFeatures = papoNewFeatures;
+        m_apoFeatures.push_back(std::move(poFeature));
+    }
+    catch (const std::exception &)
+    {
+        CPLError(CE_Failure, CPLE_OutOfMemory,
+                 "For layer %s, cannot resize feature array to %" PRIu64
+                 " features",
+                 GetName(), static_cast<uint64_t>(m_apoFeatures.size()) + 1);
+        return false;
     }
-    m_papoFeatures[m_nFeatureArraySize++] = poFeature;
 
     return true;
 }
@@ -366,44 +335,40 @@ int OGROSMLayer::EvaluateAttributeFilter(OGRFeature *poFeature)
 /*                             AddFeature()                             */
 /************************************************************************/
 
-int OGROSMLayer::AddFeature(OGRFeature *poFeature,
-                            int bAttrFilterAlreadyEvaluated, int *pbFilteredOut,
-                            int bCheckFeatureThreshold)
+bool OGROSMLayer::AddFeature(std::unique_ptr<OGRFeature> poFeature,
+                             bool bAttrFilterAlreadyEvaluated,
+                             bool *pbFilteredOut, bool bCheckFeatureThreshold)
 {
     if (!m_bUserInterested)
     {
         if (pbFilteredOut)
-            *pbFilteredOut = TRUE;
-        delete poFeature;
-        return TRUE;
+            *pbFilteredOut = true;
+        return true;
     }
 
     OGRGeometry *poGeom = poFeature->GetGeometryRef();
     if (poGeom)
         poGeom->assignSpatialReference(m_poSRS);
 
-    if ((m_poFilterGeom == nullptr ||
-         FilterGeometry(poFeature->GetGeometryRef())) &&
+    if ((m_poFilterGeom == nullptr || FilterGeometry(poGeom)) &&
         (m_poAttrQuery == nullptr || bAttrFilterAlreadyEvaluated ||
-         m_poAttrQuery->Evaluate(poFeature)))
+         m_poAttrQuery->Evaluate(poFeature.get())))
     {
-        if (!AddToArray(poFeature, bCheckFeatureThreshold))
+        if (!AddToArray(std::move(poFeature), bCheckFeatureThreshold))
         {
-            delete poFeature;
-            return FALSE;
+            return false;
         }
     }
     else
     {
         if (pbFilteredOut)
-            *pbFilteredOut = TRUE;
-        delete poFeature;
-        return TRUE;
+            *pbFilteredOut = true;
+        return true;
     }
 
     if (pbFilteredOut)
-        *pbFilteredOut = FALSE;
-    return TRUE;
+        *pbFilteredOut = false;
+    return true;
 }
 
 /************************************************************************/
@@ -479,8 +444,7 @@ void OGROSMLayer::AddField(const char *pszName, OGRFieldType eFieldType,
 
 int OGROSMLayer::GetFieldIndex(const char *pszName)
 {
-    std::map<const char *, int, ConstCharComp>::iterator oIter =
-        m_oMapFieldNameToIndex.find(pszName);
+    const auto oIter = m_oMapFieldNameToIndex.find(pszName);
     if (oIter != m_oMapFieldNameToIndex.end())
         return oIter->second;
 
@@ -497,7 +461,7 @@ int OGROSMLayer::AddInOtherOrAllTags(const char *pszK)
 
     if (aoSetIgnoreKeys.find(pszK) == aoSetIgnoreKeys.end())
     {
-        char *pszColon = strchr((char *)pszK, ':');
+        char *pszColon = strchr(const_cast<char *>(pszK), ':');
         if (pszColon)
         {
             char chBackup = pszColon[1];
@@ -596,7 +560,8 @@ static const char *GetValueOfTag(const char *pszKeyToSearch, unsigned int nTags,
 
 void OGROSMLayer::SetFieldsFromTags(OGRFeature *poFeature, GIntBig nID,
                                     bool bIsWayID, unsigned int nTags,
-                                    OSMTag *pasTags, OSMInfo *psInfo)
+                                    const OSMTag *pasTags,
+                                    const OSMInfo *psInfo)
 {
     if (!bIsWayID)
     {
@@ -655,7 +620,7 @@ void OGROSMLayer::SetFieldsFromTags(OGRFeature *poFeature, GIntBig nID,
     }
     if (m_bHasChangeset)
     {
-        poFeature->SetField("osm_changeset", (int)psInfo->nChangeset);
+        poFeature->SetField("osm_changeset", psInfo->nChangeset);
     }
 
     m_osAllTagsBuffer.clear();
@@ -929,8 +894,8 @@ void OGROSMLayer::SetFieldsFromTags(OGRFeature *poFeature, GIntBig nID,
             {
                 case SQLITE_INTEGER:
                     poFeature->SetField(
-                        oAttr.nIndex,
-                        (GIntBig)sqlite3_column_int64(oAttr.hStmt, 0));
+                        oAttr.nIndex, static_cast<GIntBig>(sqlite3_column_int64(
+                                          oAttr.hStmt, 0)));
                     break;
                 case SQLITE_FLOAT:
                     poFeature->SetField(oAttr.nIndex,
@@ -938,8 +903,8 @@ void OGROSMLayer::SetFieldsFromTags(OGRFeature *poFeature, GIntBig nID,
                     break;
                 case SQLITE_TEXT:
                     poFeature->SetField(
-                        oAttr.nIndex,
-                        (const char *)sqlite3_column_text(oAttr.hStmt, 0));
+                        oAttr.nIndex, reinterpret_cast<const char *>(
+                                          sqlite3_column_text(oAttr.hStmt, 0)));
                     break;
                 default:
                     break;
diff --git a/ogr/ogrsf_frmts/osm/osm2osm.cpp b/ogr/ogrsf_frmts/osm/osm2osm.cpp
index ccddef8d1821..1a28d0522efe 100644
--- a/ogr/ogrsf_frmts/osm/osm2osm.cpp
+++ b/ogr/ogrsf_frmts/osm/osm2osm.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_vsi.h"
diff --git a/ogr/ogrsf_frmts/osm/osm_parser.cpp b/ogr/ogrsf_frmts/osm/osm_parser.cpp
index cb333d27fe8b..7f67004f2544 100644
--- a/ogr/ogrsf_frmts/osm/osm_parser.cpp
+++ b/ogr/ogrsf_frmts/osm/osm_parser.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2012-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "osm_parser.h"
@@ -461,22 +445,23 @@ constexpr int READSTRINGTABLE_IDX_STRING = 1;
 static bool ReadStringTable(const GByte *pabyData, const GByte *pabyDataLimit,
                             OSMContext *psCtxt)
 {
-    char *pszStrBuf = (char *)pabyData;
+    const GByte *const pabyDataStart = pabyData;
 
     unsigned int nStrCount = 0;
     int *panStrOff = psCtxt->panStrOff;
 
-    psCtxt->pszStrBuf = pszStrBuf;
+    psCtxt->pszStrBuf = reinterpret_cast<char *>(const_cast<GByte *>(pabyData));
 
     try
     {
-        if ((unsigned int)(pabyDataLimit - pabyData) > psCtxt->nStrAllocated)
+        if (static_cast<unsigned>(pabyDataLimit - pabyData) >
+            psCtxt->nStrAllocated)
         {
             psCtxt->nStrAllocated =
                 std::max(psCtxt->nStrAllocated * 2,
-                         (unsigned int)(pabyDataLimit - pabyData));
-            int *panStrOffNew = (int *)VSI_REALLOC_VERBOSE(
-                panStrOff, psCtxt->nStrAllocated * sizeof(int));
+                         static_cast<unsigned>(pabyDataLimit - pabyData));
+            int *panStrOffNew = static_cast<int *>(VSI_REALLOC_VERBOSE(
+                panStrOff, psCtxt->nStrAllocated * sizeof(int)));
             if (panStrOffNew == nullptr)
                 THROW_OSM_PARSING_EXCEPTION;
             panStrOff = panStrOffNew;
@@ -493,7 +478,7 @@ static bool ReadStringTable(const GByte *pabyData, const GByte *pabyDataLimit,
                 READ_SIZE(pabyData, pabyDataLimit, nDataLength);
 
                 panStrOff[nStrCount++] =
-                    static_cast<int>(pabyData - (GByte *)pszStrBuf);
+                    static_cast<int>(pabyData - pabyDataStart);
                 GByte *pbSaved = const_cast<GByte *>(&pabyData[nDataLength]);
 
                 pabyData += nDataLength;
@@ -614,9 +599,10 @@ static bool ReadDenseNodes(const GByte *pabyData, const GByte *pabyDataLimit,
                 {
                     psCtxt->nNodesAllocated =
                         std::max(psCtxt->nNodesAllocated * 2, nSize);
-                    OSMNode *pasNodesNew = (OSMNode *)VSI_REALLOC_VERBOSE(
-                        psCtxt->pasNodes,
-                        psCtxt->nNodesAllocated * sizeof(OSMNode));
+                    OSMNode *pasNodesNew =
+                        static_cast<OSMNode *>(VSI_REALLOC_VERBOSE(
+                            psCtxt->pasNodes,
+                            psCtxt->nNodesAllocated * sizeof(OSMNode)));
                     if (pasNodesNew == nullptr)
                         THROW_OSM_PARSING_EXCEPTION;
                     psCtxt->pasNodes = pasNodesNew;
@@ -693,9 +679,10 @@ static bool ReadDenseNodes(const GByte *pabyData, const GByte *pabyDataLimit,
 
                     psCtxt->nTagsAllocated =
                         std::max(psCtxt->nTagsAllocated * 2, nMaxTags);
-                    OSMTag *pasTagsNew = (OSMTag *)VSI_REALLOC_VERBOSE(
-                        psCtxt->pasTags,
-                        psCtxt->nTagsAllocated * sizeof(OSMTag));
+                    OSMTag *pasTagsNew =
+                        static_cast<OSMTag *>(VSI_REALLOC_VERBOSE(
+                            psCtxt->pasTags,
+                            psCtxt->nTagsAllocated * sizeof(OSMTag)));
                     if (pasTagsNew == nullptr)
                         THROW_OSM_PARSING_EXCEPTION;
                     psCtxt->pasTags = pasTagsNew;
@@ -820,11 +807,13 @@ static bool ReadDenseNodes(const GByte *pabyData, const GByte *pabyDataLimit,
 
                 pasNodes[nNodes].nID = nID;
                 pasNodes[nNodes].dfLat =
-                    .000000001 * (psCtxt->nLatOffset +
-                                  ((double)psCtxt->nGranularity * nLat));
+                    .000000001 *
+                    (psCtxt->nLatOffset +
+                     (static_cast<double>(psCtxt->nGranularity) * nLat));
                 pasNodes[nNodes].dfLon =
-                    .000000001 * (psCtxt->nLonOffset +
-                                  ((double)psCtxt->nGranularity * nLon));
+                    .000000001 *
+                    (psCtxt->nLonOffset +
+                     (static_cast<double>(psCtxt->nGranularity) * nLon));
                 if (pasNodes[nNodes].dfLon < -180 ||
                     pasNodes[nNodes].dfLon > 180 ||
                     pasNodes[nNodes].dfLat < -90 || pasNodes[nNodes].dfLat > 90)
@@ -974,16 +963,18 @@ static bool ReadNode(const GByte *pabyData, const GByte *pabyDataLimit,
                 GIntBig nLat = 0;
                 READ_VARSINT64_NOCHECK(pabyData, pabyDataLimit, nLat);
                 sNode.dfLat =
-                    0.000000001 * (psCtxt->nLatOffset +
-                                   ((double)psCtxt->nGranularity * nLat));
+                    0.000000001 *
+                    (psCtxt->nLatOffset +
+                     (static_cast<double>(psCtxt->nGranularity) * nLat));
             }
             else if (nKey == MAKE_KEY(NODE_IDX_LON, WT_VARINT))
             {
                 GIntBig nLon = 0;
                 READ_VARSINT64_NOCHECK(pabyData, pabyDataLimit, nLon);
                 sNode.dfLon =
-                    0.000000001 * (psCtxt->nLonOffset +
-                                   ((double)psCtxt->nGranularity * nLon));
+                    0.000000001 *
+                    (psCtxt->nLonOffset +
+                     (static_cast<double>(psCtxt->nGranularity) * nLon));
             }
             else if (nKey == MAKE_KEY(NODE_IDX_KEYS, WT_DATA))
             {
@@ -997,9 +988,10 @@ static bool ReadNode(const GByte *pabyData, const GByte *pabyDataLimit,
                 {
                     psCtxt->nTagsAllocated =
                         std::max(psCtxt->nTagsAllocated * 2, nSize);
-                    OSMTag *pasTagsNew = (OSMTag *)VSI_REALLOC_VERBOSE(
-                        psCtxt->pasTags,
-                        psCtxt->nTagsAllocated * sizeof(OSMTag));
+                    OSMTag *pasTagsNew =
+                        static_cast<OSMTag *>(VSI_REALLOC_VERBOSE(
+                            psCtxt->pasTags,
+                            psCtxt->nTagsAllocated * sizeof(OSMTag)));
                     if (pasTagsNew == nullptr)
                         THROW_OSM_PARSING_EXCEPTION;
                     psCtxt->pasTags = pasTagsNew;
@@ -1124,9 +1116,10 @@ static bool ReadWay(const GByte *pabyData, const GByte *pabyDataLimit,
                 {
                     psCtxt->nTagsAllocated =
                         std::max(psCtxt->nTagsAllocated * 2, nSize);
-                    OSMTag *pasTagsNew = (OSMTag *)VSI_REALLOC_VERBOSE(
-                        psCtxt->pasTags,
-                        psCtxt->nTagsAllocated * sizeof(OSMTag));
+                    OSMTag *pasTagsNew =
+                        static_cast<OSMTag *>(VSI_REALLOC_VERBOSE(
+                            psCtxt->pasTags,
+                            psCtxt->nTagsAllocated * sizeof(OSMTag)));
                     if (pasTagsNew == nullptr)
                         THROW_OSM_PARSING_EXCEPTION;
                     psCtxt->pasTags = pasTagsNew;
@@ -1194,9 +1187,10 @@ static bool ReadWay(const GByte *pabyData, const GByte *pabyDataLimit,
                 {
                     psCtxt->nNodeRefsAllocated =
                         std::max(psCtxt->nNodeRefsAllocated * 2, nSize);
-                    GIntBig *panNodeRefsNew = (GIntBig *)VSI_REALLOC_VERBOSE(
-                        psCtxt->panNodeRefs,
-                        psCtxt->nNodeRefsAllocated * sizeof(GIntBig));
+                    GIntBig *panNodeRefsNew =
+                        static_cast<GIntBig *>(VSI_REALLOC_VERBOSE(
+                            psCtxt->panNodeRefs,
+                            psCtxt->nNodeRefsAllocated * sizeof(GIntBig)));
                     if (panNodeRefsNew == nullptr)
                         THROW_OSM_PARSING_EXCEPTION;
                     psCtxt->panNodeRefs = panNodeRefsNew;
@@ -1286,9 +1280,10 @@ static bool ReadRelation(const GByte *pabyData, const GByte *pabyDataLimit,
                 {
                     psCtxt->nTagsAllocated =
                         std::max(psCtxt->nTagsAllocated * 2, nSize);
-                    OSMTag *pasTagsNew = (OSMTag *)VSI_REALLOC_VERBOSE(
-                        psCtxt->pasTags,
-                        psCtxt->nTagsAllocated * sizeof(OSMTag));
+                    OSMTag *pasTagsNew =
+                        static_cast<OSMTag *>(VSI_REALLOC_VERBOSE(
+                            psCtxt->pasTags,
+                            psCtxt->nTagsAllocated * sizeof(OSMTag)));
                     if (pasTagsNew == nullptr)
                         THROW_OSM_PARSING_EXCEPTION;
                     psCtxt->pasTags = pasTagsNew;
@@ -1355,9 +1350,10 @@ static bool ReadRelation(const GByte *pabyData, const GByte *pabyDataLimit,
                 {
                     psCtxt->nMembersAllocated =
                         std::max(psCtxt->nMembersAllocated * 2, nSize);
-                    OSMMember *pasMembersNew = (OSMMember *)VSI_REALLOC_VERBOSE(
-                        psCtxt->pasMembers,
-                        psCtxt->nMembersAllocated * sizeof(OSMMember));
+                    OSMMember *pasMembersNew =
+                        static_cast<OSMMember *>(VSI_REALLOC_VERBOSE(
+                            psCtxt->pasMembers,
+                            psCtxt->nMembersAllocated * sizeof(OSMMember)));
                     if (pasMembersNew == nullptr)
                         THROW_OSM_PARSING_EXCEPTION;
                     psCtxt->pasMembers = pasMembersNew;
@@ -1416,7 +1412,8 @@ static bool ReadRelation(const GByte *pabyData, const GByte *pabyDataLimit,
                     if (nType > MEMBER_RELATION)
                         THROW_OSM_PARSING_EXCEPTION;
 
-                    psCtxt->pasMembers[nIter].eType = (OSMMemberType)nType;
+                    psCtxt->pasMembers[nIter].eType =
+                        static_cast<OSMMemberType>(nType);
                 }
                 pabyData += nSize;
             }
@@ -1832,9 +1829,10 @@ static bool ReadBlob(OSMContext *psCtxt, BlobType eType)
                         if (psCtxt->nUncompressedAllocated >
                             UINT_MAX - EXTRA_BYTES)
                             THROW_OSM_PARSING_EXCEPTION;
-                        pabyUncompressedNew = (GByte *)VSI_REALLOC_VERBOSE(
-                            psCtxt->pabyUncompressed,
-                            psCtxt->nUncompressedAllocated + EXTRA_BYTES);
+                        pabyUncompressedNew =
+                            static_cast<GByte *>(VSI_REALLOC_VERBOSE(
+                                psCtxt->pabyUncompressed,
+                                psCtxt->nUncompressedAllocated + EXTRA_BYTES));
                         if (pabyUncompressedNew == nullptr)
                             THROW_OSM_PARSING_EXCEPTION;
                         psCtxt->pabyUncompressed = pabyUncompressedNew;
@@ -2101,7 +2099,7 @@ static void EmptyNotifyBoundsFunc(double /* dfXMin */, double /* dfYMin */,
 
 static const char *OSM_AddString(OSMContext *psCtxt, const char *pszStr)
 {
-    int nLen = (int)strlen(pszStr);
+    const auto nLen = strlen(pszStr);
     if (psCtxt->nStrLength + nLen + 1 > psCtxt->nStrAllocated)
     {
         CPLError(CE_Failure, CPLE_AppDefined, "String buffer too small");
@@ -2110,7 +2108,7 @@ static const char *OSM_AddString(OSMContext *psCtxt, const char *pszStr)
     char *pszRet = psCtxt->pszStrBuf + psCtxt->nStrLength;
     memcpy(pszRet, pszStr, nLen);
     pszRet[nLen] = '\0';
-    psCtxt->nStrLength += nLen + 1;
+    psCtxt->nStrLength += static_cast<unsigned>(nLen) + 1;
     return pszRet;
 }
 
@@ -2131,7 +2129,7 @@ static void XMLCALL OSM_XML_startElementCbk(void *pUserData,
                                             const char *pszName,
                                             const char **ppszAttr)
 {
-    OSMContext *psCtxt = (OSMContext *)pUserData;
+    OSMContext *psCtxt = static_cast<OSMContext *>(pUserData);
     const char **ppszIter = ppszAttr;
 
     if (psCtxt->bStopParsing)
@@ -2384,8 +2382,9 @@ static void XMLCALL OSM_XML_startElementCbk(void *pUserData,
         {
             int nMembersAllocated = std::max(psCtxt->nMembersAllocated * 2,
                                              psCtxt->sRelation.nMembers + 1);
-            OSMMember *pasMembersNew = (OSMMember *)VSI_REALLOC_VERBOSE(
-                psCtxt->pasMembers, nMembersAllocated * sizeof(OSMMember));
+            OSMMember *pasMembersNew =
+                static_cast<OSMMember *>(VSI_REALLOC_VERBOSE(
+                    psCtxt->pasMembers, nMembersAllocated * sizeof(OSMMember)));
             if (pasMembersNew == nullptr)
             {
                 CPLError(CE_Failure, CPLE_AppDefined,
@@ -2436,8 +2435,8 @@ static void XMLCALL OSM_XML_startElementCbk(void *pUserData,
         if (psCtxt->nTags == psCtxt->nTagsAllocated)
         {
             psCtxt->nTagsAllocated = psCtxt->nTagsAllocated * 2;
-            OSMTag *pasTagsNew = (OSMTag *)VSI_REALLOC_VERBOSE(
-                psCtxt->pasTags, psCtxt->nTagsAllocated * sizeof(OSMTag));
+            OSMTag *pasTagsNew = static_cast<OSMTag *>(VSI_REALLOC_VERBOSE(
+                psCtxt->pasTags, psCtxt->nTagsAllocated * sizeof(OSMTag)));
             if (pasTagsNew == nullptr)
             {
                 if (psCtxt->bInNode)
@@ -2487,7 +2486,7 @@ static void XMLCALL OSM_XML_startElementCbk(void *pUserData,
 
 static void XMLCALL OSM_XML_endElementCbk(void *pUserData, const char *pszName)
 {
-    OSMContext *psCtxt = (OSMContext *)pUserData;
+    OSMContext *psCtxt = static_cast<OSMContext *>(pUserData);
 
     if (psCtxt->bStopParsing)
         return;
@@ -2568,7 +2567,7 @@ static void XMLCALL OSM_XML_dataHandlerCbk(void *pUserData,
     {
         CPLError(CE_Failure, CPLE_AppDefined,
                  "File probably corrupted (million laugh pattern)");
-        XML_StopParser(psCtxt->hXMLParser, XML_FALSE);
+        XML_StopParser(psCtxt->hXMLParser, false);
         psCtxt->bStopParsing = true;
         return;
     }
@@ -2592,24 +2591,27 @@ static OSMRetCode XML_ProcessBlock(OSMContext *psCtxt)
     {
         psCtxt->nDataHandlerCounter = 0;
 
-        const unsigned int nLen = (unsigned int)VSIFReadL(
-            psCtxt->pabyBlob, 1, XML_BUFSIZE, psCtxt->fp);
+        const unsigned int nLen = static_cast<unsigned int>(
+            VSIFReadL(psCtxt->pabyBlob, 1, XML_BUFSIZE, psCtxt->fp));
 
         psCtxt->nBytesRead += nLen;
 
         psCtxt->bEOF = nLen < XML_BUFSIZE;
         const int eErr =
-            XML_Parse(psCtxt->hXMLParser, (const char *)psCtxt->pabyBlob, nLen,
+            XML_Parse(psCtxt->hXMLParser,
+                      reinterpret_cast<const char *>(psCtxt->pabyBlob), nLen,
                       psCtxt->bEOF);
 
         if (eErr == XML_STATUS_ERROR)
         {
-            CPLError(CE_Failure, CPLE_AppDefined,
-                     "XML parsing of OSM file failed : %s "
-                     "at line %d, column %d",
-                     XML_ErrorString(XML_GetErrorCode(psCtxt->hXMLParser)),
-                     (int)XML_GetCurrentLineNumber(psCtxt->hXMLParser),
-                     (int)XML_GetCurrentColumnNumber(psCtxt->hXMLParser));
+            CPLError(
+                CE_Failure, CPLE_AppDefined,
+                "XML parsing of OSM file failed : %s "
+                "at line %d, column %d",
+                XML_ErrorString(XML_GetErrorCode(psCtxt->hXMLParser)),
+                static_cast<int>(XML_GetCurrentLineNumber(psCtxt->hXMLParser)),
+                static_cast<int>(
+                    XML_GetCurrentColumnNumber(psCtxt->hXMLParser)));
             psCtxt->bStopParsing = true;
         }
         psCtxt->nWithoutEventCounter++;
@@ -2649,7 +2651,7 @@ OSMContext *OSM_Open(const char *pszFilename, NotifyNodesFunc pfnNotifyNodes,
 
     bool bPBF = false;
 
-    if (strstr((const char *)abyHeader, "<osm") != nullptr)
+    if (strstr(reinterpret_cast<const char *>(abyHeader), "<osm") != nullptr)
     {
         /* OSM XML */
 #ifndef HAVE_EXPAT
@@ -2713,7 +2715,8 @@ OSMContext *OSM_Open(const char *pszFilename, NotifyNodesFunc pfnNotifyNodes,
         psCtxt->nBlobSizeAllocated = XML_BUFSIZE;
 
         psCtxt->nStrAllocated = 1024 * 1024;
-        psCtxt->pszStrBuf = (char *)VSI_MALLOC_VERBOSE(psCtxt->nStrAllocated);
+        psCtxt->pszStrBuf =
+            static_cast<char *>(VSI_MALLOC_VERBOSE(psCtxt->nStrAllocated));
         if (psCtxt->pszStrBuf)
             psCtxt->pszStrBuf[0] = '\0';
 
@@ -2726,23 +2729,23 @@ OSMContext *OSM_Open(const char *pszFilename, NotifyNodesFunc pfnNotifyNodes,
         psCtxt->bTryToFetchBounds = true;
 
         psCtxt->nNodesAllocated = 1;
-        psCtxt->pasNodes = (OSMNode *)VSI_MALLOC_VERBOSE(
-            sizeof(OSMNode) * psCtxt->nNodesAllocated);
+        psCtxt->pasNodes = static_cast<OSMNode *>(
+            VSI_MALLOC_VERBOSE(sizeof(OSMNode) * psCtxt->nNodesAllocated));
 
         psCtxt->nTagsAllocated = 256;
-        psCtxt->pasTags = (OSMTag *)VSI_MALLOC_VERBOSE(sizeof(OSMTag) *
-                                                       psCtxt->nTagsAllocated);
+        psCtxt->pasTags = static_cast<OSMTag *>(
+            VSI_MALLOC_VERBOSE(sizeof(OSMTag) * psCtxt->nTagsAllocated));
 
         /* 300 is the recommended value, but there are files with more than 2000
          * so we should be able */
         /* to realloc over that value */
         psCtxt->nMembersAllocated = 2000;
-        psCtxt->pasMembers = (OSMMember *)VSI_MALLOC_VERBOSE(
-            sizeof(OSMMember) * psCtxt->nMembersAllocated);
+        psCtxt->pasMembers = static_cast<OSMMember *>(
+            VSI_MALLOC_VERBOSE(sizeof(OSMMember) * psCtxt->nMembersAllocated));
 
         psCtxt->nNodeRefsAllocated = 10000;
-        psCtxt->panNodeRefs = (GIntBig *)VSI_MALLOC_VERBOSE(
-            sizeof(GIntBig) * psCtxt->nNodeRefsAllocated);
+        psCtxt->panNodeRefs = static_cast<GIntBig *>(
+            VSI_MALLOC_VERBOSE(sizeof(GIntBig) * psCtxt->nNodeRefsAllocated));
 
         if (psCtxt->pszStrBuf == nullptr || psCtxt->pasNodes == nullptr ||
             psCtxt->pasTags == nullptr || psCtxt->pasMembers == nullptr ||
@@ -2754,14 +2757,15 @@ OSMContext *OSM_Open(const char *pszFilename, NotifyNodesFunc pfnNotifyNodes,
     }
 #endif
 
-    psCtxt->pabyBlob = (GByte *)VSI_MALLOC_VERBOSE(psCtxt->nBlobSizeAllocated);
+    psCtxt->pabyBlob =
+        static_cast<GByte *>(VSI_MALLOC_VERBOSE(psCtxt->nBlobSizeAllocated));
     if (psCtxt->pabyBlob == nullptr)
     {
         OSM_Close(psCtxt);
         return nullptr;
     }
-    psCtxt->pabyBlobHeader =
-        (GByte *)VSI_MALLOC_VERBOSE(MAX_BLOB_HEADER_SIZE + EXTRA_BYTES);
+    psCtxt->pabyBlobHeader = static_cast<GByte *>(
+        VSI_MALLOC_VERBOSE(MAX_BLOB_HEADER_SIZE + EXTRA_BYTES));
     if (psCtxt->pabyBlobHeader == nullptr)
     {
         OSM_Close(psCtxt);
diff --git a/ogr/ogrsf_frmts/osm/osm_parser.h b/ogr/ogrsf_frmts/osm/osm_parser.h
index e8c865733242..50aa07271026 100644
--- a/ogr/ogrsf_frmts/osm/osm_parser.h
+++ b/ogr/ogrsf_frmts/osm/osm_parser.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OSM_PARSER_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/parquet/CMakeLists.txt b/ogr/ogrsf_frmts/parquet/CMakeLists.txt
index 445934aec331..108e6f0b303b 100644
--- a/ogr/ogrsf_frmts/parquet/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/parquet/CMakeLists.txt
@@ -1,3 +1,17 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/helpers/GdalCMakeMinimumRequired.cmake")
+cmake_minimum_required(VERSION ${GDAL_CMAKE_VERSION_MIN}...${GDAL_CMAKE_VERSION_MAX})
+
+if(NOT DEFINED PROJECT_SOURCE_DIR)
+    # Standalone plugin building
+    project(ogr_Parquet)
+    # The driver depends on some non expored headers. Make sure the version we
+    # build against against is the same as this source tree.
+    set(STRICT_VERSION_CHECK ON)
+    include("${PROJECT_SOURCE_DIR}/../../../cmake/helpers/SetupStandalonePlugin.cmake" )
+    include(CheckDependentLibrariesArrowParquet)
+    standalone_driver_finalize(OGR_ENABLE_DRIVER_PARQUET)
+endif()
+
 add_gdal_driver(TARGET ogr_Parquet
                 SOURCES ogrparquetdriver.cpp
                         ogrparquetdataset.cpp
@@ -15,8 +29,17 @@ if(NOT TARGET ogr_Parquet)
 endif()
 
 gdal_standard_includes(ogr_Parquet)
+if (STANDALONE)
+target_compile_definitions(ogr_Parquet PRIVATE STANDALONE)
+target_include_directories(ogr_Parquet PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../../port
+                                               ${CMAKE_CURRENT_SOURCE_DIR}/../generic
+                                               ${CMAKE_CURRENT_SOURCE_DIR}/../mem
+                                               ${CMAKE_CURRENT_SOURCE_DIR}/../..
+)
+else()
 target_include_directories(ogr_Parquet PRIVATE $<TARGET_PROPERTY:ogrsf_generic,SOURCE_DIR>
                                                $<TARGET_PROPERTY:ogr_MEM,SOURCE_DIR>)
+endif()
 
 if(${Parquet_VERSION} VERSION_GREATER_EQUAL 10.0)
     if(ARROW_USE_STATIC_LIBRARIES)
diff --git a/ogr/ogrsf_frmts/parquet/driver_declaration.cmake b/ogr/ogrsf_frmts/parquet/driver_declaration.cmake
new file mode 100644
index 000000000000..3e4059e27348
--- /dev/null
+++ b/ogr/ogrsf_frmts/parquet/driver_declaration.cmake
@@ -0,0 +1 @@
+ogr_dependent_driver(parquet "Parquet" "GDAL_USE_PARQUET")
diff --git a/ogr/ogrsf_frmts/parquet/ogr_include_parquet.h b/ogr/ogrsf_frmts/parquet/ogr_include_parquet.h
index 0a56ea3f1447..503ce9bb1bf6 100644
--- a/ogr/ogrsf_frmts/parquet/ogr_include_parquet.h
+++ b/ogr/ogrsf_frmts/parquet/ogr_include_parquet.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_INCLUDE_PARQUET_H
diff --git a/ogr/ogrsf_frmts/parquet/ogr_parquet.h b/ogr/ogrsf_frmts/parquet/ogr_parquet.h
index 9323f54bac2b..1c1f86ea6eed 100644
--- a/ogr/ogrsf_frmts/parquet/ogr_parquet.h
+++ b/ogr/ogrsf_frmts/parquet/ogr_parquet.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_PARQUET_H
@@ -304,9 +288,12 @@ class OGRParquetDatasetLayer final : public OGRParquetLayerBase
 
 class OGRParquetDataset final : public OGRArrowDataset
 {
+    std::shared_ptr<arrow::fs::FileSystem> m_poFS{};
+
   public:
     explicit OGRParquetDataset(
         const std::shared_ptr<arrow::MemoryPool> &poMemoryPool);
+    ~OGRParquetDataset();
 
     OGRLayer *ExecuteSQL(const char *pszSQLCommand,
                          OGRGeometry *poSpatialFilter,
@@ -314,6 +301,11 @@ class OGRParquetDataset final : public OGRArrowDataset
     void ReleaseResultSet(OGRLayer *poResultsSet) override;
 
     int TestCapability(const char *) override;
+
+    void SetFileSystem(const std::shared_ptr<arrow::fs::FileSystem> &fs)
+    {
+        m_poFS = fs;
+    }
 };
 
 /************************************************************************/
diff --git a/ogr/ogrsf_frmts/parquet/ogrparquetdataset.cpp b/ogr/ogrsf_frmts/parquet/ogrparquetdataset.cpp
index a8d53bc139db..7dd90a1bcfd2 100644
--- a/ogr/ogrsf_frmts/parquet/ogrparquetdataset.cpp
+++ b/ogr/ogrsf_frmts/parquet/ogrparquetdataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_parquet.h"
@@ -32,6 +16,7 @@
 
 #include "../arrow_common/ograrrowdataset.hpp"
 #include "../arrow_common/ograrrowlayer.hpp"
+#include "../arrow_common/vsiarrowfilesystem.hpp"
 
 /************************************************************************/
 /*                         OGRParquetDataset()                          */
@@ -43,6 +28,25 @@ OGRParquetDataset::OGRParquetDataset(
 {
 }
 
+/************************************************************************/
+/*                        ~OGRParquetDataset()                          */
+/************************************************************************/
+
+OGRParquetDataset::~OGRParquetDataset()
+{
+    // libarrow might continue to do I/O in auxiliary threads on the underlying
+    // files when using the arrow::dataset API even after we closed the dataset.
+    // This is annoying as it can cause crashes when closing GDAL, in particular
+    // the virtual file manager, as this could result in VSI files being
+    // accessed after their VSIVirtualFileSystem has been destroyed, resulting
+    // in crashes. The workaround is to make sure that VSIArrowFileSystem
+    // waits for all file handles it is aware of to have been destroyed.
+    close();
+    auto poFS = std::dynamic_pointer_cast<VSIArrowFileSystem>(m_poFS);
+    if (poFS)
+        poFS->AskToClose();
+}
+
 /***********************************************************************/
 /*                            ExecuteSQL()                             */
 /***********************************************************************/
diff --git a/ogr/ogrsf_frmts/parquet/ogrparquetdatasetlayer.cpp b/ogr/ogrsf_frmts/parquet/ogrparquetdatasetlayer.cpp
index d6c55f63cced..75b7beae007c 100644
--- a/ogr/ogrsf_frmts/parquet/ogrparquetdatasetlayer.cpp
+++ b/ogr/ogrsf_frmts/parquet/ogrparquetdatasetlayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022-2024, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
@@ -163,6 +147,79 @@ void OGRParquetDatasetLayer::EstablishFeatureDefn()
     }
 
     const auto &fields = m_poSchema->fields();
+
+    // Overture Maps 2024-04-16-beta.0 almost follows GeoParquet 1.1, except
+    // they don't declare the "covering" element in the GeoParquet JSON metadata
+    if (m_oMapGeometryColumns.find("geometry") != m_oMapGeometryColumns.end() &&
+        bUseBBOX &&
+        !m_oMapGeometryColumns["geometry"].GetObj("covering").IsValid() &&
+        m_oMapGeometryColumns["geometry"].GetString("encoding") == "WKB")
+    {
+        for (int i = 0; i < m_poSchema->num_fields(); ++i)
+        {
+            const auto &field = fields[i];
+            if (field->name() == "bbox" &&
+                field->type()->id() == arrow::Type::STRUCT)
+            {
+                bool bXMin = false;
+                bool bXMax = false;
+                bool bYMin = false;
+                bool bYMax = false;
+                const auto subfields = field->Flatten();
+                if (subfields.size() == 4)
+                {
+                    for (int j = 0; j < static_cast<int>(subfields.size()); j++)
+                    {
+                        const auto &subfield = subfields[j];
+                        if (subfield->name() == "bbox.xmin")
+                            bXMin = true;
+                        else if (subfield->name() == "bbox.xmax")
+                            bXMax = true;
+                        else if (subfield->name() == "bbox.ymin")
+                            bYMin = true;
+                        else if (subfield->name() == "bbox.ymax")
+                            bYMax = true;
+                    }
+                }
+                if (bXMin && bXMax && bYMin && bYMax)
+                {
+                    CPLJSONObject oDef = m_oMapGeometryColumns["geometry"];
+                    CPLJSONObject oCovering;
+                    oDef.Add("covering", oCovering);
+                    CPLJSONObject oBBOX;
+                    oCovering.Add("bbox", oBBOX);
+                    {
+                        CPLJSONArray oArray;
+                        oArray.Add("bbox");
+                        oArray.Add("xmin");
+                        oBBOX.Add("xmin", oArray);
+                    }
+                    {
+                        CPLJSONArray oArray;
+                        oArray.Add("bbox");
+                        oArray.Add("ymin");
+                        oBBOX.Add("ymin", oArray);
+                    }
+                    {
+                        CPLJSONArray oArray;
+                        oArray.Add("bbox");
+                        oArray.Add("xmax");
+                        oBBOX.Add("xmax", oArray);
+                    }
+                    {
+                        CPLJSONArray oArray;
+                        oArray.Add("bbox");
+                        oArray.Add("ymax");
+                        oBBOX.Add("ymax", oArray);
+                    }
+                    oSetBBOXColumns.insert("bbox");
+                    m_oMapGeometryColumns["geometry"] = std::move(oDef);
+                }
+                break;
+            }
+        }
+    }
+
     for (int i = 0; i < m_poSchema->num_fields(); ++i)
     {
         const auto &field = fields[i];
@@ -469,7 +526,7 @@ void OGRParquetDatasetLayer::BuildScanner()
         {
             pszUseThreads = "YES";
         }
-        if (CPLTestBool(pszUseThreads))
+        if (pszUseThreads && CPLTestBool(pszUseThreads))
         {
             PARQUET_THROW_NOT_OK(scannerBuilder->UseThreads(true));
         }
@@ -566,7 +623,7 @@ void OGRParquetDatasetLayer::BuildScanner()
                     {
                         auto fieldRefX(fieldRefs);
                         fieldRefX.emplace_back("x");
-                        auto fieldRefY(fieldRefs);
+                        auto fieldRefY(std::move(fieldRefs));
                         fieldRefY.emplace_back("y");
                         expression = cp::and_(
                             {cp::less_equal(
@@ -605,9 +662,11 @@ void OGRParquetDatasetLayer::BuildScanner()
                     abyFilterGeomWkb.resize(m_poFilterGeom->WkbSize());
                     m_poFilterGeom->exportToWkb(wkbNDR, abyFilterGeomWkb.data(),
                                                 wkbVariantIso);
-                    expression =
-                        cp::call("OGRWKBIntersects", {cp::field_ref(oFieldRef)},
-                                 WKBGeometryOptions(abyFilterGeomWkb));
+                    // Silence 'Using uninitialized value oFieldRef. Field oFieldRef.impl_._M_u is uninitialized when calling FieldRef.'
+                    // coverity[uninit_use_in_call]
+                    expression = cp::call("OGRWKBIntersects",
+                                          {cp::field_ref(std::move(oFieldRef))},
+                                          WKBGeometryOptions(abyFilterGeomWkb));
 
                     if (expression.is_valid())
                     {
@@ -656,7 +715,8 @@ void OGRParquetDatasetLayer::BuildScanner()
                 }
 
                 if (expression.is_valid())
-                    expression = cp::and_(expression, expressionFilter);
+                    expression =
+                        cp::and_(expression, std::move(expressionFilter));
                 else
                     expression = std::move(expressionFilter);
             }
@@ -702,8 +762,9 @@ OGRParquetDatasetLayer::BuildArrowFilter(const swq_expr_node *poNode,
     if (poNode->eNodeType == SNT_OPERATION && poNode->nOperation == SWQ_AND &&
         poNode->nSubExprCount == 2)
     {
-        auto sLeft = BuildArrowFilter(poNode->papoSubExpr[0], bFullyTranslated);
-        auto sRight =
+        const auto sLeft =
+            BuildArrowFilter(poNode->papoSubExpr[0], bFullyTranslated);
+        const auto sRight =
             BuildArrowFilter(poNode->papoSubExpr[1], bFullyTranslated);
         if (sLeft.is_valid() && sRight.is_valid())
             return cp::and_(sLeft, sRight);
@@ -716,8 +777,9 @@ OGRParquetDatasetLayer::BuildArrowFilter(const swq_expr_node *poNode,
     else if (poNode->eNodeType == SNT_OPERATION &&
              poNode->nOperation == SWQ_OR && poNode->nSubExprCount == 2)
     {
-        auto sLeft = BuildArrowFilter(poNode->papoSubExpr[0], bFullyTranslated);
-        auto sRight =
+        const auto sLeft =
+            BuildArrowFilter(poNode->papoSubExpr[0], bFullyTranslated);
+        const auto sRight =
             BuildArrowFilter(poNode->papoSubExpr[1], bFullyTranslated);
         if (sLeft.is_valid() && sRight.is_valid())
             return cp::or_(sLeft, sRight);
@@ -726,7 +788,8 @@ OGRParquetDatasetLayer::BuildArrowFilter(const swq_expr_node *poNode,
     else if (poNode->eNodeType == SNT_OPERATION &&
              poNode->nOperation == SWQ_NOT && poNode->nSubExprCount == 1)
     {
-        auto expr = BuildArrowFilter(poNode->papoSubExpr[0], bFullyTranslated);
+        const auto expr =
+            BuildArrowFilter(poNode->papoSubExpr[0], bFullyTranslated);
         if (expr.is_valid())
             return cp::not_(expr);
     }
@@ -839,8 +902,9 @@ OGRParquetDatasetLayer::BuildArrowFilter(const swq_expr_node *poNode,
     else if (poNode->eNodeType == SNT_OPERATION && poNode->nSubExprCount == 2 &&
              IsComparisonOp(poNode->nOperation))
     {
-        auto sLeft = BuildArrowFilter(poNode->papoSubExpr[0], bFullyTranslated);
-        auto sRight =
+        const auto sLeft =
+            BuildArrowFilter(poNode->papoSubExpr[0], bFullyTranslated);
+        const auto sRight =
             BuildArrowFilter(poNode->papoSubExpr[1], bFullyTranslated);
         if (sLeft.is_valid() && sRight.is_valid())
         {
@@ -865,7 +929,8 @@ OGRParquetDatasetLayer::BuildArrowFilter(const swq_expr_node *poNode,
              poNode->papoSubExpr[1]->eNodeType == SNT_CONSTANT &&
              poNode->papoSubExpr[1]->field_type == SWQ_STRING)
     {
-        auto sLeft = BuildArrowFilter(poNode->papoSubExpr[0], bFullyTranslated);
+        const auto sLeft =
+            BuildArrowFilter(poNode->papoSubExpr[0], bFullyTranslated);
         if (sLeft.is_valid())
         {
             if (cp::GetFunctionRegistry()
@@ -885,7 +950,8 @@ OGRParquetDatasetLayer::BuildArrowFilter(const swq_expr_node *poNode,
     else if (poNode->eNodeType == SNT_OPERATION &&
              poNode->nOperation == SWQ_ISNULL && poNode->nSubExprCount == 1)
     {
-        auto expr = BuildArrowFilter(poNode->papoSubExpr[0], bFullyTranslated);
+        const auto expr =
+            BuildArrowFilter(poNode->papoSubExpr[0], bFullyTranslated);
         if (expr.is_valid())
             return cp::is_null(expr);
     }
diff --git a/ogr/ogrsf_frmts/parquet/ogrparquetdriver.cpp b/ogr/ogrsf_frmts/parquet/ogrparquetdriver.cpp
index f3c0236128b5..580951000202 100644
--- a/ogr/ogrsf_frmts/parquet/ogrparquetdriver.cpp
+++ b/ogr/ogrsf_frmts/parquet/ogrparquetdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_pam.h"
@@ -31,209 +15,19 @@
 
 #include <algorithm>
 #include <map>
+#include <tuple>
 
 #include "ogr_parquet.h"
 #include "ogrparquetdrivercore.h"
 
 #include "../arrow_common/ograrrowrandomaccessfile.h"
+#include "../arrow_common/vsiarrowfilesystem.hpp"
 #include "../arrow_common/ograrrowwritablefile.h"
 #include "../arrow_common/ograrrowdataset.hpp"
 #include "../arrow_common/ograrrowlayer.hpp"  // for the destructor
 
 #ifdef GDAL_USE_ARROWDATASET
 
-/************************************************************************/
-/*                         VSIArrowFileSystem                           */
-/************************************************************************/
-
-class VSIArrowFileSystem final : public arrow::fs::FileSystem
-{
-    const std::string m_osQueryParameters;
-
-  public:
-    explicit VSIArrowFileSystem(const std::string &osQueryParameters)
-        : m_osQueryParameters(osQueryParameters)
-    {
-    }
-
-    std::string type_name() const override
-    {
-        return "vsi";
-    }
-
-    using arrow::fs::FileSystem::Equals;
-
-    bool Equals(const arrow::fs::FileSystem &other) const override
-    {
-        const auto poOther = dynamic_cast<const VSIArrowFileSystem *>(&other);
-        return poOther != nullptr &&
-               poOther->m_osQueryParameters == m_osQueryParameters;
-    }
-
-    using arrow::fs::FileSystem::GetFileInfo;
-
-    arrow::Result<arrow::fs::FileInfo>
-    GetFileInfo(const std::string &path) override
-    {
-        auto fileType = arrow::fs::FileType::Unknown;
-        VSIStatBufL sStat;
-        if (VSIStatL(path.c_str(), &sStat) == 0)
-        {
-            if (VSI_ISREG(sStat.st_mode))
-                fileType = arrow::fs::FileType::File;
-            else if (VSI_ISDIR(sStat.st_mode))
-                fileType = arrow::fs::FileType::Directory;
-        }
-        else
-        {
-            fileType = arrow::fs::FileType::NotFound;
-        }
-        arrow::fs::FileInfo info(path, fileType);
-        if (fileType == arrow::fs::FileType::File)
-            info.set_size(sStat.st_size);
-        return info;
-    }
-
-    arrow::Result<arrow::fs::FileInfoVector>
-    GetFileInfo(const arrow::fs::FileSelector &select) override
-    {
-        arrow::fs::FileInfoVector res;
-        VSIDIR *psDir = VSIOpenDir(select.base_dir.c_str(),
-                                   select.recursive ? -1 : 0, nullptr);
-        if (psDir == nullptr)
-            return res;
-
-        bool bParquetFound = false;
-        const int nMaxNonParquetFiles = atoi(
-            CPLGetConfigOption("OGR_PARQUET_MAX_NON_PARQUET_FILES", "100"));
-        const int nMaxListedFiles =
-            atoi(CPLGetConfigOption("OGR_PARQUET_MAX_LISTED_FILES", "1000000"));
-        while (const auto psEntry = VSIGetNextDirEntry(psDir))
-        {
-            if (!bParquetFound)
-                bParquetFound =
-                    EQUAL(CPLGetExtension(psEntry->pszName), "parquet");
-
-            const std::string osFilename =
-                select.base_dir + '/' + psEntry->pszName;
-            int nMode = psEntry->nMode;
-            if (!psEntry->bModeKnown)
-            {
-                VSIStatBufL sStat;
-                if (VSIStatL(osFilename.c_str(), &sStat) == 0)
-                    nMode = sStat.st_mode;
-            }
-
-            auto fileType = arrow::fs::FileType::Unknown;
-            if (VSI_ISREG(nMode))
-                fileType = arrow::fs::FileType::File;
-            else if (VSI_ISDIR(nMode))
-                fileType = arrow::fs::FileType::Directory;
-
-            arrow::fs::FileInfo info(osFilename, fileType);
-            if (fileType == arrow::fs::FileType::File && psEntry->bSizeKnown)
-            {
-                info.set_size(psEntry->nSize);
-            }
-            res.push_back(info);
-
-            // Avoid iterating over too many files if there's no likely parquet
-            // files.
-            if (static_cast<int>(res.size()) == nMaxNonParquetFiles &&
-                !bParquetFound)
-                break;
-            if (static_cast<int>(res.size()) == nMaxListedFiles)
-                break;
-        }
-        VSICloseDir(psDir);
-        return res;
-    }
-
-    arrow::Status CreateDir(const std::string & /*path*/,
-                            bool /*recursive*/ = true) override
-    {
-        return arrow::Status::IOError("CreateDir() unimplemented");
-    }
-
-    arrow::Status DeleteDir(const std::string & /*path*/) override
-    {
-        return arrow::Status::IOError("DeleteDir() unimplemented");
-    }
-
-    arrow::Status DeleteDirContents(const std::string & /*path*/
-#if ARROW_VERSION_MAJOR >= 8
-                                    ,
-                                    bool /*missing_dir_ok*/ = false
-#endif
-                                    ) override
-    {
-        return arrow::Status::IOError("DeleteDirContents() unimplemented");
-    }
-
-    arrow::Status DeleteRootDirContents() override
-    {
-        return arrow::Status::IOError("DeleteRootDirContents() unimplemented");
-    }
-
-    arrow::Status DeleteFile(const std::string & /*path*/) override
-    {
-        return arrow::Status::IOError("DeleteFile() unimplemented");
-    }
-
-    arrow::Status Move(const std::string & /*src*/,
-                       const std::string & /*dest*/) override
-    {
-        return arrow::Status::IOError("Move() unimplemented");
-    }
-
-    arrow::Status CopyFile(const std::string & /*src*/,
-                           const std::string & /*dest*/) override
-    {
-        return arrow::Status::IOError("CopyFile() unimplemented");
-    }
-
-    using arrow::fs::FileSystem::OpenInputStream;
-
-    arrow::Result<std::shared_ptr<arrow::io::InputStream>>
-    OpenInputStream(const std::string &path) override
-    {
-        return OpenInputFile(path);
-    }
-
-    using arrow::fs::FileSystem::OpenInputFile;
-
-    arrow::Result<std::shared_ptr<arrow::io::RandomAccessFile>>
-    OpenInputFile(const std::string &path) override
-    {
-        std::string osPath(path);
-        osPath += m_osQueryParameters;
-        CPLDebugOnly("PARQUET", "Opening %s", osPath.c_str());
-        auto fp = VSIVirtualHandleUniquePtr(VSIFOpenL(osPath.c_str(), "rb"));
-        if (fp == nullptr)
-            return arrow::Status::IOError("OpenInputFile() failed for " +
-                                          osPath);
-        return std::make_shared<OGRArrowRandomAccessFile>(std::move(fp));
-    }
-
-    using arrow::fs::FileSystem::OpenOutputStream;
-
-    arrow::Result<std::shared_ptr<arrow::io::OutputStream>>
-    OpenOutputStream(const std::string & /*path*/,
-                     const std::shared_ptr<const arrow::KeyValueMetadata>
-                         & /* metadata */) override
-    {
-        return arrow::Status::IOError("OpenOutputStream() unimplemented");
-    }
-
-    arrow::Result<std::shared_ptr<arrow::io::OutputStream>>
-    OpenAppendStream(const std::string & /*path*/,
-                     const std::shared_ptr<const arrow::KeyValueMetadata>
-                         & /* metadata */) override
-    {
-        return arrow::Status::IOError("OpenAppendStream() unimplemented");
-    }
-};
-
 /************************************************************************/
 /*                      OpenFromDatasetFactory()                        */
 /************************************************************************/
@@ -241,7 +35,8 @@ class VSIArrowFileSystem final : public arrow::fs::FileSystem
 static GDALDataset *OpenFromDatasetFactory(
     const std::string &osBasePath,
     const std::shared_ptr<arrow::dataset::DatasetFactory> &factory,
-    CSLConstList papszOpenOptions)
+    CSLConstList papszOpenOptions,
+    const std::shared_ptr<arrow::fs::FileSystem> &fs)
 {
     std::shared_ptr<arrow::dataset::Dataset> dataset;
     PARQUET_ASSIGN_OR_THROW(dataset, factory->Finish());
@@ -255,6 +50,7 @@ static GDALDataset *OpenFromDatasetFactory(
         poDS.get(), CPLGetBasename(osBasePath.c_str()), bIsVSI, dataset,
         papszOpenOptions);
     poDS->SetLayer(std::move(poLayer));
+    poDS->SetFileSystem(fs);
     return poDS.release();
 }
 
@@ -262,7 +58,7 @@ static GDALDataset *OpenFromDatasetFactory(
 /*                         GetFileSystem()                              */
 /************************************************************************/
 
-static std::shared_ptr<arrow::fs::FileSystem>
+static std::tuple<std::shared_ptr<arrow::fs::FileSystem>, std::string>
 GetFileSystem(std::string &osBasePathInOut,
               const std::string &osQueryParameters)
 {
@@ -271,9 +67,14 @@ GetFileSystem(std::string &osBasePathInOut,
     // - base implementation for local files (if OGR_PARQUET_USE_VSI set to NO)
     std::shared_ptr<arrow::fs::FileSystem> fs;
     const bool bIsVSI = STARTS_WITH(osBasePathInOut.c_str(), "/vsi");
-    if (bIsVSI || CPLTestBool(CPLGetConfigOption("OGR_PARQUET_USE_VSI", "YES")))
+    VSIStatBufL sStat;
+    std::string osFSFilename;
+    if ((bIsVSI ||
+         CPLTestBool(CPLGetConfigOption("OGR_PARQUET_USE_VSI", "YES"))) &&
+        VSIStatL(osBasePathInOut.c_str(), &sStat) == 0)
     {
-        fs = std::make_shared<VSIArrowFileSystem>(osQueryParameters);
+        osFSFilename = osBasePathInOut;
+        fs = std::make_shared<VSIArrowFileSystem>("PARQUET", osQueryParameters);
     }
     else
     {
@@ -284,13 +85,14 @@ GetFileSystem(std::string &osBasePathInOut,
         {
             char *pszCurDir = CPLGetCurrentDir();
             if (pszCurDir == nullptr)
-                return nullptr;
+                return {nullptr, osFSFilename};
             osPath = CPLFormFilename(pszCurDir, osPath.c_str(), nullptr);
             CPLFree(pszCurDir);
         }
-        PARQUET_ASSIGN_OR_THROW(fs, arrow::fs::FileSystemFromUriOrPath(osPath));
+        PARQUET_ASSIGN_OR_THROW(
+            fs, arrow::fs::FileSystemFromUriOrPath(osPath, &osFSFilename));
     }
-    return fs;
+    return {fs, osFSFilename};
 }
 
 /************************************************************************/
@@ -302,7 +104,8 @@ static GDALDataset *OpenParquetDatasetWithMetadata(
     const std::string &osQueryParameters, CSLConstList papszOpenOptions)
 {
     std::string osBasePath(osBasePathIn);
-    auto fs = GetFileSystem(osBasePath, osQueryParameters);
+    const auto &[fs, osFSFilename] =
+        GetFileSystem(osBasePath, osQueryParameters);
 
     arrow::dataset::ParquetFactoryOptions options;
     auto partitioningFactory = arrow::dataset::HivePartitioning::MakeFactory();
@@ -310,13 +113,14 @@ static GDALDataset *OpenParquetDatasetWithMetadata(
         arrow::dataset::PartitioningOrFactory(std::move(partitioningFactory));
 
     std::shared_ptr<arrow::dataset::DatasetFactory> factory;
+    // coverity[copy_constructor_call]
     PARQUET_ASSIGN_OR_THROW(
         factory, arrow::dataset::ParquetDatasetFactory::Make(
-                     osBasePath + '/' + pszMetadataFile, std::move(fs),
+                     osFSFilename + '/' + pszMetadataFile, fs,
                      std::make_shared<arrow::dataset::ParquetFileFormat>(),
                      std::move(options)));
 
-    return OpenFromDatasetFactory(osBasePath, factory, papszOpenOptions);
+    return OpenFromDatasetFactory(osBasePath, factory, papszOpenOptions, fs);
 }
 
 /************************************************************************/
@@ -329,16 +133,19 @@ OpenParquetDatasetWithoutMetadata(const std::string &osBasePathIn,
                                   CSLConstList papszOpenOptions)
 {
     std::string osBasePath(osBasePathIn);
-    auto fs = GetFileSystem(osBasePath, osQueryParameters);
+    const auto &[fs, osFSFilename] =
+        GetFileSystem(osBasePath, osQueryParameters);
 
     arrow::dataset::FileSystemFactoryOptions options;
     std::shared_ptr<arrow::dataset::DatasetFactory> factory;
-    VSIStatBufL sStat;
-    if (VSIStatL(osBasePath.c_str(), &sStat) == 0 && VSI_ISREG(sStat.st_mode))
+
+    const auto fileInfo = fs->GetFileInfo(osFSFilename);
+    if (fileInfo->IsFile())
     {
+        // coverity[copy_constructor_call]
         PARQUET_ASSIGN_OR_THROW(
             factory, arrow::dataset::FileSystemDatasetFactory::Make(
-                         std::move(fs), {osBasePath},
+                         fs, {std::move(osFSFilename)},
                          std::make_shared<arrow::dataset::ParquetFileFormat>(),
                          std::move(options)));
     }
@@ -350,17 +157,18 @@ OpenParquetDatasetWithoutMetadata(const std::string &osBasePathIn,
             std::move(partitioningFactory));
 
         arrow::fs::FileSelector selector;
-        selector.base_dir = osBasePath;
+        selector.base_dir = std::move(osFSFilename);
         selector.recursive = true;
 
+        // coverity[copy_constructor_call]
         PARQUET_ASSIGN_OR_THROW(
             factory, arrow::dataset::FileSystemDatasetFactory::Make(
-                         std::move(fs), std::move(selector),
+                         fs, std::move(selector),
                          std::make_shared<arrow::dataset::ParquetFileFormat>(),
                          std::move(options)));
     }
 
-    return OpenFromDatasetFactory(osBasePath, factory, papszOpenOptions);
+    return OpenFromDatasetFactory(osBasePath, factory, papszOpenOptions, fs);
 }
 
 #endif
@@ -522,7 +330,7 @@ static GDALDataset *OGRParquetDriverOpen(GDALOpenInfo *poOpenInfo)
     {
         VSIStatBufL sStat;
         if (!osBasePath.empty() && osBasePath.back() == '/')
-            osBasePath.resize(osBasePath.size() - 1);
+            osBasePath.pop_back();
         std::string osMetadataPath =
             CPLFormFilename(osBasePath.c_str(), "_metadata", nullptr);
         if (CPLTestBool(
@@ -626,7 +434,8 @@ static GDALDataset *OGRParquetDriverOpen(GDALOpenInfo *poOpenInfo)
                 if (fp == nullptr)
                     return nullptr;
             }
-            infile = std::make_shared<OGRArrowRandomAccessFile>(std::move(fp));
+            infile = std::make_shared<OGRArrowRandomAccessFile>(osFilename,
+                                                                std::move(fp));
         }
         else
         {
@@ -909,9 +718,26 @@ void RegisterOGRParquet()
     poDriver->pfnOpen = OGRParquetDriverOpen;
     poDriver->pfnCreate = OGRParquetDriverCreate;
 
+    poDriver->SetMetadataItem("ARROW_VERSION", ARROW_VERSION_STRING);
 #ifdef GDAL_USE_ARROWDATASET
     poDriver->SetMetadataItem("ARROW_DATASET", "YES");
 #endif
 
     GetGDALDriverManager()->RegisterDriver(poDriver.release());
+
+#if ARROW_VERSION_MAJOR >= 16
+    // Mostly for tests
+    const char *pszPath =
+        CPLGetConfigOption("OGR_PARQUET_LOAD_FILE_SYSTEM_FACTORIES", nullptr);
+    if (pszPath)
+    {
+        auto result = arrow::fs::LoadFileSystemFactories(pszPath);
+        if (!result.ok())
+        {
+            CPLError(CE_Warning, CPLE_AppDefined,
+                     "arrow::fs::LoadFileSystemFactories() failed with %s",
+                     result.message().c_str());
+        }
+    }
+#endif
 }
diff --git a/ogr/ogrsf_frmts/parquet/ogrparquetdrivercore.cpp b/ogr/ogrsf_frmts/parquet/ogrparquetdrivercore.cpp
index 584a82107f57..cffc87832eed 100644
--- a/ogr/ogrsf_frmts/parquet/ogrparquetdrivercore.cpp
+++ b/ogr/ogrsf_frmts/parquet/ogrparquetdrivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
diff --git a/ogr/ogrsf_frmts/parquet/ogrparquetdrivercore.h b/ogr/ogrsf_frmts/parquet/ogrparquetdrivercore.h
index 607c72e71840..c889360f7173 100644
--- a/ogr/ogrsf_frmts/parquet/ogrparquetdrivercore.h
+++ b/ogr/ogrsf_frmts/parquet/ogrparquetdrivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRPARQUETDRIVERCORE_H
diff --git a/ogr/ogrsf_frmts/parquet/ogrparquetlayer.cpp b/ogr/ogrsf_frmts/parquet/ogrparquetlayer.cpp
index f09eb7989b61..fc8013301e33 100644
--- a/ogr/ogrsf_frmts/parquet/ogrparquetlayer.cpp
+++ b/ogr/ogrsf_frmts/parquet/ogrparquetlayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_json.h"
@@ -212,7 +196,7 @@ bool OGRParquetLayerBase::DealWithGeometryColumn(
     std::string osExtensionName;
     if (field_kv_metadata)
     {
-        auto extension_name = field_kv_metadata->Get("ARROW:extension:name");
+        auto extension_name = field_kv_metadata->Get(ARROW_EXTENSION_NAME_KEY);
         if (extension_name.ok())
         {
             osExtensionName = *extension_name;
@@ -536,7 +520,7 @@ OGRParquetLayer::OGRParquetLayer(
     {
         pszUseThreads = "YES";
     }
-    if (CPLTestBool(pszUseThreads))
+    if (pszUseThreads && CPLTestBool(pszUseThreads))
     {
         m_poArrowReader->set_use_threads(true);
     }
@@ -1980,8 +1964,7 @@ OGRErr OGRParquetLayer::SetIgnoredFields(CSLConstList papszFields)
                         m_oMapGeomFieldIndexToGeomColBBOXParquet.find(i);
                     if (oIter != m_oMapGeomFieldIndexToGeomColBBOX.end() &&
                         oIterParquet !=
-                            m_oMapGeomFieldIndexToGeomColBBOXParquet.end() &&
-                        !OGRArrowIsGeoArrowStruct(m_aeGeomEncoding[i]))
+                            m_oMapGeomFieldIndexToGeomColBBOXParquet.end())
                     {
                         oIter->second.iArrayIdx = nBatchColumns++;
                         m_anRequestedParquetColumns.insert(
diff --git a/ogr/ogrsf_frmts/parquet/ogrparquetwriterdataset.cpp b/ogr/ogrsf_frmts/parquet/ogrparquetwriterdataset.cpp
index f970c001a243..d27ee729f6f2 100644
--- a/ogr/ogrsf_frmts/parquet/ogrparquetwriterdataset.cpp
+++ b/ogr/ogrsf_frmts/parquet/ogrparquetwriterdataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_parquet.h"
diff --git a/ogr/ogrsf_frmts/parquet/ogrparquetwriterlayer.cpp b/ogr/ogrsf_frmts/parquet/ogrparquetwriterlayer.cpp
index a62bb4cb17aa..d6c6e34c4aeb 100644
--- a/ogr/ogrsf_frmts/parquet/ogrparquetwriterlayer.cpp
+++ b/ogr/ogrsf_frmts/parquet/ogrparquetwriterlayer.cpp
@@ -7,27 +7,15 @@
  ******************************************************************************
  * Copyright (c) 2022, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
+#ifdef STANDALONE
+#include "gdal_version.h"
+#else
 #undef DO_NOT_DEFINE_GDAL_DATE_NAME
 #include "gdal_version_full/gdal_version.h"
+#endif
 
 #include "ogr_parquet.h"
 
@@ -652,11 +640,7 @@ std::string OGRParquetWriterLayer::GetGeoMetadata() const
         CPLTestBool(CPLGetConfigOption("OGR_PARQUET_WRITE_GEO", "YES")))
     {
         CPLJSONObject oRoot;
-        oRoot.Add("version",
-                  m_eGeomEncoding ==
-                          OGRArrowGeomEncoding::GEOARROW_STRUCT_GENERIC
-                      ? "1.1.0"
-                      : "1.0.0");
+        oRoot.Add("version", "1.1.0");
         oRoot.Add("primary_column",
                   m_poFeatureDefn->GetGeomFieldDefn(0)->GetNameRef());
         CPLJSONObject oColumns;
@@ -1152,7 +1136,7 @@ void OGRParquetWriterLayer::FixupGeometryBeforeWriting(OGRGeometry *poGeom)
             if ((bFirstRing && poRing->isClockwise()) ||
                 (!bFirstRing && !poRing->isClockwise()))
             {
-                poRing->reverseWindingOrder();
+                poRing->reversePoints();
             }
             bFirstRing = false;
         }
@@ -1281,6 +1265,29 @@ bool OGRParquetWriterLayer::IsArrowSchemaSupported(
         osErrorMsg = "float16 not supported";
         return false;
     }
+    if (schema->format[0] == 'v' && schema->format[1] == 'u')
+    {
+        osErrorMsg = "StringView not supported";
+        return false;
+    }
+    if (schema->format[0] == 'v' && schema->format[1] == 'z')
+    {
+        osErrorMsg = "BinaryView not supported";
+        return false;
+    }
+    if (schema->format[0] == '+' && schema->format[1] == 'v')
+    {
+        if (schema->format[2] == 'l')
+        {
+            osErrorMsg = "ListView not supported";
+            return false;
+        }
+        else if (schema->format[2] == 'L')
+        {
+            osErrorMsg = "LargeListView not supported";
+            return false;
+        }
+    }
     for (int64_t i = 0; i < schema->n_children; ++i)
     {
         if (!IsArrowSchemaSupported(schema->children[i], papszOptions,
diff --git a/ogr/ogrsf_frmts/pds/CMakeLists.txt b/ogr/ogrsf_frmts/pds/CMakeLists.txt
index 43304464760b..e28ed30bc586 100644
--- a/ogr/ogrsf_frmts/pds/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/pds/CMakeLists.txt
@@ -3,7 +3,7 @@ add_gdal_driver(
   SOURCES ogrpdsdatasource.cpp ogr_pds.h ogrpdsdriver.cpp ogrpdslayer.cpp
   BUILTIN)
 gdal_standard_includes(ogr_PDS)
-target_include_directories(ogr_PDS PRIVATE $<TARGET_PROPERTY:gdal_PDS,SOURCE_DIR> $<TARGET_PROPERTY:ogr_GML,SOURCE_DIR>)
+target_include_directories(ogr_PDS PRIVATE $<TARGET_PROPERTY:gdal_PDS,SOURCE_DIR>)
 if (GDAL_USE_JSONC_INTERNAL)
   gdal_add_vendored_lib(ogr_PDS libjson)
 else ()
diff --git a/ogr/ogrsf_frmts/pds/ogr_pds.h b/ogr/ogrsf_frmts/pds/ogr_pds.h
index 95b8223f3aa4..1b1366b73ee0 100644
--- a/ogr/ogrsf_frmts/pds/ogr_pds.h
+++ b/ogr/ogrsf_frmts/pds/ogr_pds.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_PDS_H_INCLUDED
@@ -112,10 +96,8 @@ class OGRPDSLayer final : public OGRLayer,
 /*                           OGRPDSDataSource                           */
 /************************************************************************/
 
-class OGRPDSDataSource final : public OGRDataSource
+class OGRPDSDataSource final : public GDALDataset
 {
-    char *pszName;
-
     OGRLayer **papoLayers;
     int nLayers;
 
@@ -134,11 +116,6 @@ class OGRPDSDataSource final : public OGRDataSource
 
     int Open(const char *pszFilename);
 
-    virtual const char *GetName() override
-    {
-        return pszName;
-    }
-
     virtual int GetLayerCount() override
     {
         return nLayers;
@@ -146,8 +123,6 @@ class OGRPDSDataSource final : public OGRDataSource
 
     virtual OGRLayer *GetLayer(int) override;
 
-    virtual int TestCapability(const char *) override;
-
     static void CleanString(CPLString &osInput);
 };
 
diff --git a/ogr/ogrsf_frmts/pds/ogrpdsdatasource.cpp b/ogr/ogrsf_frmts/pds/ogrpdsdatasource.cpp
index 31bcbb57115c..3d7dbf2cd197 100644
--- a/ogr/ogrsf_frmts/pds/ogrpdsdatasource.cpp
+++ b/ogr/ogrsf_frmts/pds/ogrpdsdatasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
@@ -36,8 +20,7 @@ using namespace OGRPDS;
 /*                           OGRPDSDataSource()                         */
 /************************************************************************/
 
-OGRPDSDataSource::OGRPDSDataSource()
-    : pszName(nullptr), papoLayers(nullptr), nLayers(0)
+OGRPDSDataSource::OGRPDSDataSource() : papoLayers(nullptr), nLayers(0)
 {
 }
 
@@ -51,17 +34,6 @@ OGRPDSDataSource::~OGRPDSDataSource()
     for (int i = 0; i < nLayers; i++)
         delete papoLayers[i];
     CPLFree(papoLayers);
-
-    CPLFree(pszName);
-}
-
-/************************************************************************/
-/*                           TestCapability()                           */
-/************************************************************************/
-
-int OGRPDSDataSource::TestCapability(const char * /* pszCap */)
-{
-    return FALSE;
 }
 
 /************************************************************************/
@@ -289,8 +261,6 @@ bool OGRPDSDataSource::LoadTable(const char *pszFilename, int nRecordSize,
 int OGRPDSDataSource::Open(const char *pszFilename)
 
 {
-    pszName = CPLStrdup(pszFilename);
-
     // --------------------------------------------------------------------
     //      Does this appear to be a .PDS table file?
     // --------------------------------------------------------------------
diff --git a/ogr/ogrsf_frmts/pds/ogrpdsdriver.cpp b/ogr/ogrsf_frmts/pds/ogrpdsdriver.cpp
index 3b492a9d3e46..e11fda29872a 100644
--- a/ogr/ogrsf_frmts/pds/ogrpdsdriver.cpp
+++ b/ogr/ogrsf_frmts/pds/ogrpdsdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/pds/ogrpdslayer.cpp b/ogr/ogrsf_frmts/pds/ogrpdslayer.cpp
index dfd086078da9..11ddb8a167d6 100644
--- a/ogr/ogrsf_frmts/pds/ogrpdslayer.cpp
+++ b/ogr/ogrsf_frmts/pds/ogrpdslayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_pds.h"
diff --git a/ogr/ogrsf_frmts/pg/ogr_pg.h b/ogr/ogrsf_frmts/pg/ogr_pg.h
index 014f0826602c..396d34c58956 100644
--- a/ogr/ogrsf_frmts/pg/ogr_pg.h
+++ b/ogr/ogrsf_frmts/pg/ogr_pg.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2000, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_PG_H_INCLUDED
@@ -339,6 +323,7 @@ class OGRPGTableLayer final : public OGRPGLayer
     void CheckGeomTypeCompatibility(int iGeomField, OGRGeometry *poGeom);
 
     int bRetrieveFID = true;
+    int bSkipConflicts = false;
     int bHasWarnedAlreadySetFID = false;
 
     char **papszOverrideColumnTypes = nullptr;
@@ -581,7 +566,7 @@ class OGRPGResultLayer final : public OGRPGLayer
 /*                           OGRPGDataSource                            */
 /************************************************************************/
 
-class OGRPGDataSource final : public OGRDataSource
+class OGRPGDataSource final : public GDALDataset
 {
     OGRPGDataSource(const OGRPGDataSource &) = delete;
     OGRPGDataSource &operator=(const OGRPGDataSource &) = delete;
@@ -596,8 +581,6 @@ class OGRPGDataSource final : public OGRDataSource
     OGRPGTableLayer **papoLayers = nullptr;
     int nLayers = 0;
 
-    char *pszName = nullptr;
-
     bool m_bUTF8ClientEncoding = false;
 
     int bDSUpdate = false;
@@ -641,6 +624,12 @@ class OGRPGDataSource final : public OGRDataSource
     bool m_bOgrSystemTablesMetadataTableExistenceTested = false;
     bool m_bOgrSystemTablesMetadataTableFound = false;
 
+    bool m_bCreateMetadataTableIfNeededRun = false;
+    bool m_bCreateMetadataTableIfNeededSuccess = false;
+
+    bool m_bHasWritePermissionsOnMetadataTableRun = false;
+    bool m_bHasWritePermissionsOnMetadataTableSuccess = false;
+
     void LoadTables();
 
     CPLString osDebugLastTransactionCommand{};
@@ -652,6 +641,9 @@ class OGRPGDataSource final : public OGRDataSource
 
     std::optional<std::string> FindSchema(const char *pszSchemaNameIn);
 
+    bool IsSuperUser();
+    bool OGRSystemTablesEventTriggerExists();
+
   public:
     PGver sPostgreSQLVersion = {0, 0, 0};
     PGver sPostGISVersion = {0, 0, 0};
@@ -696,11 +688,6 @@ class OGRPGDataSource final : public OGRDataSource
               const char *pszSchemaName, const char *pszDescription,
               const char *pszGeomColForced, int bUpdate, int bTestOpen);
 
-    const char *GetName() override
-    {
-        return pszName;
-    }
-
     int GetLayerCount() override;
     OGRLayer *GetLayer(int) override;
     OGRLayer *GetLayerByName(const char *pszName) override;
@@ -749,8 +736,9 @@ class OGRPGDataSource final : public OGRDataSource
         return bUserTransactionActive;
     }
 
-    void CreateOgrSystemTablesMetadataTableIfNeeded();
+    bool CreateMetadataTableIfNeeded();
     bool HasOgrSystemTablesMetadataTable();
+    bool HasWritePermissionsOnMetadataTable();
 };
 
 #endif /* ndef OGR_PG_H_INCLUDED */
diff --git a/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp b/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp
index dbb0014bc71f..9be77144bbe7 100644
--- a/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp
+++ b/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2000, Frank Warmerdam
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <string.h>
@@ -54,7 +38,6 @@ OGRPGDataSource::~OGRPGDataSource()
 {
     OGRPGDataSource::FlushCache(true);
 
-    CPLFree(pszName);
     CPLFree(pszForcedTables);
     CSLDestroy(papszSchemaList);
 
@@ -305,8 +288,6 @@ int OGRPGDataSource::Open(const char *pszNewName, int bUpdate, int bTestOpen,
         return FALSE;
     }
 
-    pszName = CPLStrdup(pszNewName);
-
     const auto QuoteAndEscapeConnectionParam = [](const char *pszParam)
     {
         CPLString osRet("\'");
@@ -323,7 +304,7 @@ int OGRPGDataSource::Open(const char *pszNewName, int bUpdate, int bTestOpen,
         return osRet;
     };
 
-    CPLString osConnectionName(pszName);
+    CPLString osConnectionName(pszNewName);
     if (osConnectionName.find("PG:postgresql://") == 0)
         osConnectionName = osConnectionName.substr(3);
     const bool bIsURI = osConnectionName.find("postgresql://") == 0;
@@ -380,7 +361,7 @@ int OGRPGDataSource::Open(const char *pszNewName, int bUpdate, int bTestOpen,
     /*      Set application name if not found in connection string          */
     /* -------------------------------------------------------------------- */
 
-    if (strstr(pszName, "application_name") == nullptr &&
+    if (strstr(pszNewName, "application_name") == nullptr &&
         getenv("PGAPPNAME") == nullptr)
     {
         if (bIsURI)
@@ -672,13 +653,18 @@ int OGRPGDataSource::Open(const char *pszNewName, int bUpdate, int bTestOpen,
         {
             osNewSearchPath +=
                 OGRPGEscapeString(hPGConn, osActiveSchema.c_str());
-            osNewSearchPath += ',';
         }
-        osNewSearchPath += osSearchPath;
+        if (!osSearchPath.empty() && osSearchPath != "\"\"")
+        {
+            if (!osNewSearchPath.empty())
+                osNewSearchPath += ',';
+            osNewSearchPath += osSearchPath;
+        }
         if (!osPostgisSchema.empty() &&
             osSearchPath.find(osPostgisSchema) == std::string::npos)
         {
-            osNewSearchPath += ',';
+            if (!osNewSearchPath.empty())
+                osNewSearchPath += ',';
             osNewSearchPath +=
                 OGRPGEscapeString(hPGConn, osPostgisSchema.c_str());
         }
@@ -693,8 +679,9 @@ int OGRPGDataSource::Open(const char *pszNewName, int bUpdate, int bTestOpen,
             OGRPGClearResult(hResult);
             CPLDebug("PG", "Command \"%s\" failed. Trying without 'public'.",
                      osCommand.c_str());
-            osCommand =
-                CPLSPrintf("SET search_path='%s'", osActiveSchema.c_str());
+            osCommand = CPLSPrintf(
+                "SET search_path=%s",
+                OGRPGEscapeString(hPGConn, osActiveSchema.c_str()).c_str());
             PGresult *hResult2 = OGRPG_PQexec(hPGConn, osCommand.c_str());
 
             if (!hResult2 || PQresultStatus(hResult2) != PGRES_COMMAND_OK)
@@ -831,12 +818,12 @@ int OGRPGDataSource::Open(const char *pszNewName, int bUpdate, int bTestOpen,
             if (EQUAL(pszTypname, "geometry"))
             {
                 bHavePostGIS = TRUE;
-                nGeometryOID = atoi(pszOid);
+                nGeometryOID = static_cast<Oid>(strtoul(pszOid, nullptr, 10));
             }
             else if (CPLTestBool(CPLGetConfigOption("PG_USE_GEOGRAPHY", "YES")))
             {
                 bHaveGeography = TRUE;
-                nGeographyOID = atoi(pszOid);
+                nGeographyOID = static_cast<Oid>(strtoul(pszOid, nullptr, 10));
             }
         }
     }
@@ -1589,7 +1576,9 @@ OGRLayer *OGRPGDataSource::ICreateLayer(const char *pszLayerName,
             pszTableName = OGRPGCommonLaunderName(pszDotPos + 1, "PG",
                                                   bUTF8ToASCII);  // skip "."
         else
-            pszTableName = CPLStrdup(pszDotPos + 1);  // skip "."
+            pszTableName = CPLStrdup(
+                OGRPGCommonGenerateShortEnoughIdentifier(pszDotPos + 1)
+                    .c_str());  // skip "."
     }
     else
     {
@@ -1598,7 +1587,9 @@ OGRLayer *OGRPGDataSource::ICreateLayer(const char *pszLayerName,
             pszTableName = OGRPGCommonLaunderName(pszLayerName, "PG",
                                                   bUTF8ToASCII);  // skip "."
         else
-            pszTableName = CPLStrdup(pszLayerName);  // skip "."
+            pszTableName =
+                CPLStrdup(OGRPGCommonGenerateShortEnoughIdentifier(pszLayerName)
+                              .c_str());  // skip "."
     }
 
     /* -------------------------------------------------------------------- */
@@ -1936,32 +1927,11 @@ OGRLayer *OGRPGDataSource::ICreateLayer(const char *pszLayerName,
 
         if (eType != wkbNone && bHavePostGIS && bCreateSpatialIndex)
         {
-            /* --------------------------------------------------------------------
-             */
-            /*      Create the spatial index. */
-            /*                                                                      */
-            /*      We're doing this before we add geometry and record to the
-             * table */
-            /*      so this may not be exactly the best way to do it. */
-            /* --------------------------------------------------------------------
-             */
-            std::string osIndexName(pszTableName);
-            std::string osSuffix("_");
-            osSuffix += pszGFldName;
-            osSuffix += "_geom_idx";
-            if (bLaunder)
-            {
-                if (osSuffix.size() >=
-                    static_cast<size_t>(OGR_PG_NAMEDATALEN - 1))
-                {
-                    osSuffix = "_0_geom_idx";
-                }
-                if (osIndexName.size() + osSuffix.size() >
-                    static_cast<size_t>(OGR_PG_NAMEDATALEN - 1))
-                    osIndexName.resize(OGR_PG_NAMEDATALEN - 1 -
-                                       osSuffix.size());
-            }
-            osIndexName += osSuffix;
+            // Create the spatial index.
+            // We're doing this before we add geometry and record to the
+            // table, so this may not be exactly the best way to do it.
+            const std::string osIndexName(OGRPGCommonGenerateSpatialIndexName(
+                pszTableName, pszGFldName, 0));
 
             osCommand.Printf("CREATE INDEX %s ON %s.%s USING %s (%s)",
                              OGRPGEscapeColumnName(osIndexName.c_str()).c_str(),
@@ -2114,6 +2084,8 @@ OGRPGDataSource::FindSchema(const char *pszSchemaNameIn)
         return pszSchemaNameIn;
     }
 
+    EndCopy();
+
     std::string osSchemaName;
     std::string osCommand(
         "SELECT nspname FROM pg_catalog.pg_namespace WHERE nspname ILIKE ");
@@ -2240,9 +2212,8 @@ OGRLayer *OGRPGDataSource::GetLayerByName(const char *pszNameIn)
     {
         EndCopy();
 
-        CPLString osTableName(pszTableName);
-        CPLString osTableNameLower(pszTableName);
-        osTableNameLower.tolower();
+        const CPLString osTableName(pszTableName);
+        const CPLString osTableNameLower = CPLString(pszTableName).tolower();
         if (osTableName != osTableNameLower)
             CPLPushErrorHandler(CPLQuietErrorHandler);
         poLayer = OpenTable(osCurrentSchema, pszTableName, pszSchemaName,
@@ -2965,7 +2936,7 @@ const char *OGRPGDataSource::GetMetadataItem(const char *pszKey,
             return pszRet;
         }
     }
-    return OGRDataSource::GetMetadataItem(pszKey, pszDomain);
+    return GDALDataset::GetMetadataItem(pszKey, pszDomain);
 }
 
 /************************************************************************/
@@ -2987,8 +2958,8 @@ OGRLayer *OGRPGDataSource::ExecuteSQL(const char *pszSQLCommand,
     /*      Use generic implementation for recognized dialects              */
     /* -------------------------------------------------------------------- */
     if (IsGenericSQLDialect(pszDialect))
-        return OGRDataSource::ExecuteSQL(pszSQLCommand, poSpatialFilter,
-                                         pszDialect);
+        return GDALDataset::ExecuteSQL(pszSQLCommand, poSpatialFilter,
+                                       pszDialect);
 
     /* -------------------------------------------------------------------- */
     /*      Special case DELLAYER: command.                                 */
@@ -3033,7 +3004,7 @@ OGRLayer *OGRPGDataSource::ExecuteSQL(const char *pszSQLCommand,
             CPLDebug("PG", "Command Results Tuples = %d", PQntuples(hResult));
 
             GDALDriver *poMemDriver =
-                OGRSFDriverRegistrar::GetRegistrar()->GetDriverByName("Memory");
+                GetGDALDriverManager()->GetDriverByName("Memory");
             if (poMemDriver)
             {
                 OGRPGLayer *poResultLayer =
@@ -3161,13 +3132,79 @@ OGRErr OGRPGDataSource::EndCopy()
 }
 
 /************************************************************************/
-/*                CreateOgrSystemTablesMetadataTableIfNeeded()          */
+/*                     CreateMetadataTableIfNeeded()                    */
 /************************************************************************/
 
-void OGRPGDataSource::CreateOgrSystemTablesMetadataTableIfNeeded()
+bool OGRPGDataSource::CreateMetadataTableIfNeeded()
 {
-    PGresult *hResult =
+    if (m_bCreateMetadataTableIfNeededRun)
+        return m_bCreateMetadataTableIfNeededSuccess;
+
+    m_bCreateMetadataTableIfNeededRun = true;
+
+    const bool bIsSuperUser = IsSuperUser();
+    if (!bIsSuperUser && !OGRSystemTablesEventTriggerExists())
+    {
+        CPLError(CE_Warning, CPLE_AppDefined,
+                 "User lacks super user privilege to be able to create event "
+                 "trigger ogr_system_tables_event_trigger_for_metadata");
+        m_bCreateMetadataTableIfNeededSuccess = true;
+        return true;
+    }
+
+    PGresult *hResult;
+
+    hResult = OGRPG_PQexec(
+        hPGConn,
+        "SELECT c.oid FROM pg_class c "
+        "JOIN pg_namespace n ON c.relnamespace=n.oid "
+        "WHERE c.relname = 'metadata' AND n.nspname = 'ogr_system_tables'");
+    const bool bFound =
+        (hResult && PQntuples(hResult) == 1 && !PQgetisnull(hResult, 0, 0));
+    OGRPGClearResult(hResult);
+
+    hResult = OGRPG_PQexec(
+        hPGConn,
+        "SELECT has_database_privilege((select current_database()), 'CREATE')");
+    const bool bCanCreateSchema =
+        (hResult && PQntuples(hResult) == 1 && !PQgetisnull(hResult, 0, 0) &&
+         strcmp(PQgetvalue(hResult, 0, 0), "t") == 0);
+    OGRPGClearResult(hResult);
+
+    if (!bFound)
+    {
+        if (!bCanCreateSchema)
+        {
+            CPLError(CE_Warning, CPLE_AppDefined,
+                     "User lacks CREATE SCHEMA privilege to be able to create "
+                     "ogr_system_tables.metadata table");
+            return false;
+        }
+    }
+    else
+    {
+        if (!HasWritePermissionsOnMetadataTable())
+        {
+            return false;
+        }
+        if (!bCanCreateSchema)
+        {
+            CPLError(CE_Warning, CPLE_AppDefined,
+                     "User lacks CREATE SCHEMA privilege. Assuming "
+                     "ogr_system_tables.metadata table has correct structure");
+            m_bCreateMetadataTableIfNeededSuccess = true;
+            return true;
+        }
+    }
+
+    hResult =
         OGRPG_PQexec(hPGConn, "CREATE SCHEMA IF NOT EXISTS ogr_system_tables");
+    if (!hResult || (PQresultStatus(hResult) != PGRES_COMMAND_OK &&
+                     PQresultStatus(hResult) != PGRES_TUPLES_OK))
+    {
+        OGRPGClearResult(hResult);
+        return false;
+    }
     OGRPGClearResult(hResult);
 
     hResult = OGRPG_PQexec(
@@ -3177,12 +3214,24 @@ void OGRPGDataSource::CreateOgrSystemTablesMetadataTableIfNeeded()
                  "table_name TEXT NOT NULL, "
                  "metadata TEXT,"
                  "UNIQUE(schema_name, table_name))");
+    if (!hResult || (PQresultStatus(hResult) != PGRES_COMMAND_OK &&
+                     PQresultStatus(hResult) != PGRES_TUPLES_OK))
+    {
+        OGRPGClearResult(hResult);
+        return false;
+    }
     OGRPGClearResult(hResult);
 
     hResult = OGRPG_PQexec(
         hPGConn,
         "DROP FUNCTION IF EXISTS "
         "ogr_system_tables.event_trigger_function_for_metadata() CASCADE");
+    if (!hResult || (PQresultStatus(hResult) != PGRES_COMMAND_OK &&
+                     PQresultStatus(hResult) != PGRES_TUPLES_OK))
+    {
+        OGRPGClearResult(hResult);
+        return false;
+    }
     OGRPGClearResult(hResult);
 
     hResult = OGRPG_PQexec(
@@ -3193,6 +3242,9 @@ void OGRPGDataSource::CreateOgrSystemTablesMetadataTableIfNeeded()
         "DECLARE\n"
         "    obj record;\n"
         "BEGIN\n"
+        "  IF has_schema_privilege('ogr_system_tables', 'USAGE') THEN\n"
+        "   IF has_table_privilege('ogr_system_tables.metadata', 'DELETE') "
+        "THEN\n"
         "    FOR obj IN SELECT * FROM pg_event_trigger_dropped_objects()\n"
         "    LOOP\n"
         "        IF obj.object_type = 'table' THEN\n"
@@ -3201,22 +3253,79 @@ void OGRPGDataSource::CreateOgrSystemTablesMetadataTableIfNeeded()
         "obj.object_name;\n"
         "        END IF;\n"
         "    END LOOP;\n"
+        "   END IF;\n"
+        "  END IF;\n"
         "END;\n"
         "$$;");
+    if (!hResult || (PQresultStatus(hResult) != PGRES_COMMAND_OK &&
+                     PQresultStatus(hResult) != PGRES_TUPLES_OK))
+    {
+        OGRPGClearResult(hResult);
+        return false;
+    }
     OGRPGClearResult(hResult);
 
-    hResult =
-        OGRPG_PQexec(hPGConn, "DROP EVENT TRIGGER IF EXISTS "
-                              "ogr_system_tables_event_trigger_for_metadata");
+    if (bIsSuperUser)
+    {
+        hResult = OGRPG_PQexec(hPGConn,
+                               "DROP EVENT TRIGGER IF EXISTS "
+                               "ogr_system_tables_event_trigger_for_metadata");
+        if (!hResult || (PQresultStatus(hResult) != PGRES_COMMAND_OK &&
+                         PQresultStatus(hResult) != PGRES_TUPLES_OK))
+        {
+            OGRPGClearResult(hResult);
+            return false;
+        }
+        OGRPGClearResult(hResult);
+
+        hResult = OGRPG_PQexec(
+            hPGConn,
+            "CREATE EVENT TRIGGER ogr_system_tables_event_trigger_for_metadata "
+            "ON sql_drop "
+            "EXECUTE FUNCTION "
+            "ogr_system_tables.event_trigger_function_for_metadata()");
+        if (!hResult || (PQresultStatus(hResult) != PGRES_COMMAND_OK &&
+                         PQresultStatus(hResult) != PGRES_TUPLES_OK))
+        {
+            OGRPGClearResult(hResult);
+            return false;
+        }
+        OGRPGClearResult(hResult);
+    }
+
+    m_bCreateMetadataTableIfNeededSuccess = true;
+    m_bOgrSystemTablesMetadataTableExistenceTested = true;
+    m_bOgrSystemTablesMetadataTableFound = true;
+    return true;
+}
+
+/************************************************************************/
+/*                               IsSuperUser()                          */
+/************************************************************************/
+
+bool OGRPGDataSource::IsSuperUser()
+{
+    PGresult *hResult = OGRPG_PQexec(
+        hPGConn, "SELECT usesuper FROM pg_user WHERE usename = CURRENT_USER");
+    const bool bRet =
+        (hResult && PQntuples(hResult) == 1 && !PQgetisnull(hResult, 0, 0) &&
+         strcmp(PQgetvalue(hResult, 0, 0), "t") == 0);
     OGRPGClearResult(hResult);
+    return bRet;
+}
 
-    hResult = OGRPG_PQexec(
-        hPGConn,
-        "CREATE EVENT TRIGGER ogr_system_tables_event_trigger_for_metadata "
-        "ON sql_drop "
-        "EXECUTE FUNCTION "
-        "ogr_system_tables.event_trigger_function_for_metadata()");
+/************************************************************************/
+/*                  OGRSystemTablesEventTriggerExists()                 */
+/************************************************************************/
+
+bool OGRPGDataSource::OGRSystemTablesEventTriggerExists()
+{
+    PGresult *hResult =
+        OGRPG_PQexec(hPGConn, "SELECT 1 FROM pg_event_trigger WHERE evtname = "
+                              "'ogr_system_tables_event_trigger_for_metadata'");
+    const bool bRet = (hResult && PQntuples(hResult) == 1);
     OGRPGClearResult(hResult);
+    return bRet;
 }
 
 /************************************************************************/
@@ -3236,9 +3345,76 @@ bool OGRPGDataSource::HasOgrSystemTablesMetadataTable()
             "SELECT c.oid FROM pg_class c "
             "JOIN pg_namespace n ON c.relnamespace=n.oid "
             "WHERE c.relname = 'metadata' AND n.nspname = 'ogr_system_tables'");
-        m_bOgrSystemTablesMetadataTableFound =
+        const bool bFound =
             (hResult && PQntuples(hResult) == 1 && !PQgetisnull(hResult, 0, 0));
         OGRPGClearResult(hResult);
+        if (!bFound)
+            return false;
+
+        hResult = OGRPG_PQexec(
+            hPGConn,
+            "SELECT has_schema_privilege('ogr_system_tables', 'USAGE')");
+        const bool bHasSchemaPrivilege =
+            (hResult && PQntuples(hResult) == 1 &&
+             !PQgetisnull(hResult, 0, 0) &&
+             strcmp(PQgetvalue(hResult, 0, 0), "t") == 0);
+        OGRPGClearResult(hResult);
+        if (!bHasSchemaPrivilege)
+        {
+            CPLError(CE_Warning, CPLE_AppDefined,
+                     "Table ogr_system_tables.metadata exists but user lacks "
+                     "USAGE privilege on ogr_system_tables schema");
+            return false;
+        }
+
+        hResult = OGRPG_PQexec(
+            hPGConn, "SELECT has_table_privilege('ogr_system_tables.metadata', "
+                     "'SELECT')");
+        m_bOgrSystemTablesMetadataTableFound =
+            (hResult && PQntuples(hResult) == 1 &&
+             !PQgetisnull(hResult, 0, 0) &&
+             strcmp(PQgetvalue(hResult, 0, 0), "t") == 0);
+        OGRPGClearResult(hResult);
+        if (!m_bOgrSystemTablesMetadataTableFound)
+        {
+            CPLError(CE_Warning, CPLE_AppDefined,
+                     "Table ogr_system_tables.metadata exists but user lacks "
+                     "SELECT privilege on it");
+        }
     }
     return m_bOgrSystemTablesMetadataTableFound;
 }
+
+/************************************************************************/
+/*                   HasWritePermissionsOnMetadataTable()               */
+/************************************************************************/
+
+bool OGRPGDataSource::HasWritePermissionsOnMetadataTable()
+{
+    if (!m_bHasWritePermissionsOnMetadataTableRun)
+    {
+        m_bHasWritePermissionsOnMetadataTableRun = true;
+
+        if (HasOgrSystemTablesMetadataTable())
+        {
+            PGresult *hResult = OGRPG_PQexec(
+                hPGConn,
+                "SELECT has_table_privilege('ogr_system_tables.metadata', "
+                "'INSERT') "
+                "AND    has_table_privilege('ogr_system_tables.metadata', "
+                "'DELETE')");
+            m_bHasWritePermissionsOnMetadataTableSuccess =
+                (hResult && PQntuples(hResult) == 1 &&
+                 !PQgetisnull(hResult, 0, 0) &&
+                 strcmp(PQgetvalue(hResult, 0, 0), "t") == 0);
+            OGRPGClearResult(hResult);
+            if (!m_bHasWritePermissionsOnMetadataTableSuccess)
+            {
+                CPLError(CE_Warning, CPLE_AppDefined,
+                         "User lacks INSERT and/OR DELETE privilege on "
+                         "ogr_system_tables.metadata table");
+            }
+        }
+    }
+    return m_bHasWritePermissionsOnMetadataTableSuccess;
+}
diff --git a/ogr/ogrsf_frmts/pg/ogrpgdriver.cpp b/ogr/ogrsf_frmts/pg/ogrpgdriver.cpp
index a96ddac70d3e..b3b48b390159 100644
--- a/ogr/ogrsf_frmts/pg/ogrpgdriver.cpp
+++ b/ogr/ogrsf_frmts/pg/ogrpgdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2000, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_pg.h"
diff --git a/ogr/ogrsf_frmts/pg/ogrpgdrivercore.cpp b/ogr/ogrsf_frmts/pg/ogrpgdrivercore.cpp
index f8d2216bf125..552a80540881 100644
--- a/ogr/ogrsf_frmts/pg/ogrpgdrivercore.cpp
+++ b/ogr/ogrsf_frmts/pg/ogrpgdrivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2000, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
diff --git a/ogr/ogrsf_frmts/pg/ogrpgdrivercore.h b/ogr/ogrsf_frmts/pg/ogrpgdrivercore.h
index 4afdec6bdaad..a2d03888b588 100644
--- a/ogr/ogrsf_frmts/pg/ogrpgdrivercore.h
+++ b/ogr/ogrsf_frmts/pg/ogrpgdrivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2000, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRPGDRIVERCORE_H
diff --git a/ogr/ogrsf_frmts/pg/ogrpglayer.cpp b/ogr/ogrsf_frmts/pg/ogrpglayer.cpp
index a196317b7ce6..5e98b1113105 100644
--- a/ogr/ogrsf_frmts/pg/ogrpglayer.cpp
+++ b/ogr/ogrsf_frmts/pg/ogrpglayer.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 2000, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 /* Some functions have been extracted from PostgreSQL code base  */
@@ -564,7 +548,7 @@ OGRFeature *OGRPGLayer::RecordToFeature(PGresult *hResult,
     for (int iField = 0; iField < PQnfields(hResult); iField++)
     {
 #if defined(BINARY_CURSOR_ENABLED)
-        int nTypeOID = PQftype(hResult, iField);
+        const Oid nTypeOID = PQftype(hResult, iField);
 #endif
         const char *pszFieldName = PQfname(hResult, iField);
 
diff --git a/ogr/ogrsf_frmts/pg/ogrpgresultlayer.cpp b/ogr/ogrsf_frmts/pg/ogrpgresultlayer.cpp
index 4078e17fc4ad..2521c8daa62e 100644
--- a/ogr/ogrsf_frmts/pg/ogrpgresultlayer.cpp
+++ b/ogr/ogrsf_frmts/pg/ogrpgresultlayer.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2002, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
@@ -341,9 +325,9 @@ void OGRPGResultLayer::SetSpatialFilter(int iGeomField, OGRGeometry *poGeomIn)
                     if (sEnvelope.MaxY > 90.0)
                         sEnvelope.MaxY = 90.0;
                 }
-                CPLsnprintf(szBox3D_1, sizeof(szBox3D_1), "%.18g %.18g",
+                CPLsnprintf(szBox3D_1, sizeof(szBox3D_1), "%.17g %.17g",
                             sEnvelope.MinX, sEnvelope.MinY);
-                CPLsnprintf(szBox3D_2, sizeof(szBox3D_2), "%.18g %.18g",
+                CPLsnprintf(szBox3D_2, sizeof(szBox3D_2), "%.17g %.17g",
                             sEnvelope.MaxX, sEnvelope.MaxY);
                 osWHERE.Printf(
                     "WHERE %s && %s('BOX3D(%s, %s)'::box3d,%d) ",
diff --git a/ogr/ogrsf_frmts/pg/ogrpgtablelayer.cpp b/ogr/ogrsf_frmts/pg/ogrpgtablelayer.cpp
index 2ac569c03c3d..f92757e155fd 100644
--- a/ogr/ogrsf_frmts/pg/ogrpgtablelayer.cpp
+++ b/ogr/ogrsf_frmts/pg/ogrpgtablelayer.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2000, Frank Warmerdam
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_pg.h"
@@ -172,7 +156,9 @@ OGRPGTableLayer::OGRPGTableLayer(OGRPGDataSource *poDSIn,
       // Just in provision for people yelling about broken backward
       // compatibility.
       bRetrieveFID(
-          CPLTestBool(CPLGetConfigOption("OGR_PG_RETRIEVE_FID", "TRUE")))
+          CPLTestBool(CPLGetConfigOption("OGR_PG_RETRIEVE_FID", "TRUE"))),
+      bSkipConflicts(
+          CPLTestBool(CPLGetConfigOption("OGR_PG_SKIP_CONFLICTS", "FALSE")))
 {
     poDS = poDSIn;
     pszQueryStatement = nullptr;
@@ -289,8 +275,8 @@ void OGRPGTableLayer::LoadMetadata()
 
 void OGRPGTableLayer::SerializeMetadata()
 {
-    if (!m_bMetadataModified &&
-        CPLTestBool(CPLGetConfigOption("OGR_PG_ENABLE_METADATA", "YES")))
+    if (!m_bMetadataModified ||
+        !CPLTestBool(CPLGetConfigOption("OGR_PG_ENABLE_METADATA", "YES")))
     {
         return;
     }
@@ -355,34 +341,38 @@ void OGRPGTableLayer::SerializeMetadata()
 
     if (psMD)
     {
-        poDS->CreateOgrSystemTablesMetadataTableIfNeeded();
-
-        CPLString osCommand;
-        osCommand.Printf("DELETE FROM ogr_system_tables.metadata WHERE "
-                         "schema_name = %s AND table_name = %s",
-                         OGRPGEscapeString(hPGConn, pszSchemaName).c_str(),
-                         OGRPGEscapeString(hPGConn, pszTableName).c_str());
-        PGresult *hResult = OGRPG_PQexec(hPGConn, osCommand.c_str());
-        OGRPGClearResult(hResult);
+        if (poDS->CreateMetadataTableIfNeeded() &&
+            poDS->HasWritePermissionsOnMetadataTable())
+        {
+            CPLString osCommand;
+            osCommand.Printf("DELETE FROM ogr_system_tables.metadata WHERE "
+                             "schema_name = %s AND table_name = %s",
+                             OGRPGEscapeString(hPGConn, pszSchemaName).c_str(),
+                             OGRPGEscapeString(hPGConn, pszTableName).c_str());
+            PGresult *hResult = OGRPG_PQexec(hPGConn, osCommand.c_str());
+            OGRPGClearResult(hResult);
 
-        CPLXMLNode *psRoot =
-            CPLCreateXMLNode(nullptr, CXT_Element, "GDALMetadata");
-        CPLAddXMLChild(psRoot, psMD);
-        char *pszXML = CPLSerializeXMLTree(psRoot);
-        // CPLDebug("PG", "Serializing %s", pszXML);
+            CPLXMLNode *psRoot =
+                CPLCreateXMLNode(nullptr, CXT_Element, "GDALMetadata");
+            CPLAddXMLChild(psRoot, psMD);
+            char *pszXML = CPLSerializeXMLTree(psRoot);
+            // CPLDebug("PG", "Serializing %s", pszXML);
 
-        osCommand.Printf("INSERT INTO ogr_system_tables.metadata (schema_name, "
-                         "table_name, metadata) VALUES (%s, %s, %s)",
-                         OGRPGEscapeString(hPGConn, pszSchemaName).c_str(),
-                         OGRPGEscapeString(hPGConn, pszTableName).c_str(),
-                         OGRPGEscapeString(hPGConn, pszXML).c_str());
-        hResult = OGRPG_PQexec(hPGConn, osCommand.c_str());
-        OGRPGClearResult(hResult);
+            osCommand.Printf(
+                "INSERT INTO ogr_system_tables.metadata (schema_name, "
+                "table_name, metadata) VALUES (%s, %s, %s)",
+                OGRPGEscapeString(hPGConn, pszSchemaName).c_str(),
+                OGRPGEscapeString(hPGConn, pszTableName).c_str(),
+                OGRPGEscapeString(hPGConn, pszXML).c_str());
+            hResult = OGRPG_PQexec(hPGConn, osCommand.c_str());
+            OGRPGClearResult(hResult);
 
-        CPLDestroyXMLNode(psRoot);
-        CPLFree(pszXML);
+            CPLDestroyXMLNode(psRoot);
+            CPLFree(pszXML);
+        }
     }
-    else if (poDS->HasOgrSystemTablesMetadataTable())
+    else if (poDS->HasOgrSystemTablesMetadataTable() &&
+             poDS->HasWritePermissionsOnMetadataTable())
     {
         CPLString osCommand;
         osCommand.Printf("DELETE FROM ogr_system_tables.metadata WHERE "
@@ -1080,9 +1070,9 @@ void OGRPGTableLayer::BuildWhere()
             if (sEnvelope.MaxY > 90.0)
                 sEnvelope.MaxY = 90.0;
         }
-        CPLsnprintf(szBox3D_1, sizeof(szBox3D_1), "%.18g %.18g", sEnvelope.MinX,
+        CPLsnprintf(szBox3D_1, sizeof(szBox3D_1), "%.17g %.17g", sEnvelope.MinX,
                     sEnvelope.MinY);
-        CPLsnprintf(szBox3D_2, sizeof(szBox3D_2), "%.18g %.18g", sEnvelope.MaxX,
+        CPLsnprintf(szBox3D_2, sizeof(szBox3D_2), "%.17g %.17g", sEnvelope.MaxX,
                     sEnvelope.MaxY);
         osWHERE.Printf(
             "WHERE %s && ST_SetSRID('BOX3D(%s, %s)'::box3d,%d) ",
@@ -2065,10 +2055,19 @@ OGRErr OGRPGTableLayer::CreateFeatureViaInsert(OGRFeature *poFeature)
     if (bRetrieveFID && pszFIDColumn != nullptr &&
         poFeature->GetFID() == OGRNullFID)
     {
+        if (bSkipConflicts)
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                     "fid retrieval and skipping conflicts are not supported "
+                     "at the same time.");
+            return OGRERR_FAILURE;
+        }
         bReturnRequested = TRUE;
         osCommand += " RETURNING ";
         osCommand += OGRPGEscapeColumnName(pszFIDColumn);
     }
+    else if (bSkipConflicts)
+        osCommand += " ON CONFLICT DO NOTHING";
 
     /* -------------------------------------------------------------------- */
     /*      Execute the insert.                                             */
@@ -2521,23 +2520,8 @@ OGRPGTableLayer::RunCreateSpatialIndex(const OGRPGGeomFieldDefn *poGeomField,
     PGconn *hPGConn = poDS->GetPGConn();
     CPLString osCommand;
 
-    std::string osIndexName(pszTableName);
-    std::string osSuffix("_");
-    osSuffix += poGeomField->GetNameRef();
-    osSuffix += "_geom_idx";
-    if (bLaunderColumnNames)
-    {
-        if (osSuffix.size() >= static_cast<size_t>(OGR_PG_NAMEDATALEN - 1))
-        {
-            osSuffix = "_";
-            osSuffix += CPLSPrintf("%d", nIdx);
-            osSuffix += "_geom_idx";
-        }
-        if (osIndexName.size() + osSuffix.size() >
-            static_cast<size_t>(OGR_PG_NAMEDATALEN - 1))
-            osIndexName.resize(OGR_PG_NAMEDATALEN - 1 - osSuffix.size());
-    }
-    osIndexName += osSuffix;
+    const std::string osIndexName(OGRPGCommonGenerateSpatialIndexName(
+        pszTableName, poGeomField->GetNameRef(), nIdx));
 
     osCommand.Printf("CREATE INDEX %s ON %s USING %s (%s)",
                      OGRPGEscapeColumnName(osIndexName.c_str()).c_str(),
diff --git a/ogr/ogrsf_frmts/pg/ogrpgutility.cpp b/ogr/ogrsf_frmts/pg/ogrpgutility.cpp
index 53d3f6fed80c..b5aedccbcbac 100644
--- a/ogr/ogrsf_frmts/pg/ogrpgutility.cpp
+++ b/ogr/ogrsf_frmts/pg/ogrpgutility.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2009-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_pg.h"
diff --git a/ogr/ogrsf_frmts/pg/ogrpgutility.h b/ogr/ogrsf_frmts/pg/ogrpgutility.h
index 4675204baa4c..9337720801b3 100644
--- a/ogr/ogrsf_frmts/pg/ogrpgutility.h
+++ b/ogr/ogrsf_frmts/pg/ogrpgutility.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Mateusz Loskot
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRPGUTILITY_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/pgdump/ogr_pgdump.h b/ogr/ogrsf_frmts/pgdump/ogr_pgdump.h
index 910f99404486..d03a4e3e4d71 100644
--- a/ogr/ogrsf_frmts/pgdump/ogr_pgdump.h
+++ b/ogr/ogrsf_frmts/pgdump/ogr_pgdump.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_PGDUMP_H_INCLUDED
@@ -72,6 +56,12 @@ char CPL_DLL *OGRPGCommonLaunderName(const char *pszSrcName,
                                      const char *pszDebugPrefix,
                                      bool bUTF8ToASCII);
 
+std::string CPL_DLL
+OGRPGCommonGenerateShortEnoughIdentifier(const char *pszIdentifier);
+
+std::string CPL_DLL OGRPGCommonGenerateSpatialIndexName(
+    const char *pszTableName, const char *pszGeomFieldName, int nGeomFieldIdx);
+
 /************************************************************************/
 /*                        OGRPGDumpGeomFieldDefn                        */
 /************************************************************************/
diff --git a/ogr/ogrsf_frmts/pgdump/ogrpgdumpdatasource.cpp b/ogr/ogrsf_frmts/pgdump/ogrpgdumpdatasource.cpp
index b4edaafd5756..f436be135338 100644
--- a/ogr/ogrsf_frmts/pgdump/ogrpgdumpdatasource.cpp
+++ b/ogr/ogrsf_frmts/pgdump/ogrpgdumpdatasource.cpp
@@ -7,29 +7,14 @@
  ******************************************************************************
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <algorithm>
 #include <cstring>
 #include "ogr_pgdump.h"
 #include "cpl_conv.h"
+#include "cpl_md5.h"
 #include "cpl_string.h"
 
 /************************************************************************/
@@ -148,6 +133,15 @@ char *OGRPGCommonLaunderName(const char *pszSrcName, const char *pszDebugPrefix,
             }
         }
     }
+
+    if (i == OGR_PG_NAMEDATALEN - 1 && pszSafeName[i] != '\0')
+    {
+        constexpr int FIRST_8_CHARS_OF_MD5 = 8;
+        pszSafeName[i - FIRST_8_CHARS_OF_MD5 - 1] = '_';
+        memcpy(pszSafeName + i - FIRST_8_CHARS_OF_MD5, CPLMD5String(pszSrcName),
+               FIRST_8_CHARS_OF_MD5);
+    }
+
     pszSafeName[i] = '\0';
 
     if (strcmp(pszSrcName, pszSafeName) != 0)
@@ -274,7 +268,8 @@ OGRPGDumpDataSource::ICreateLayer(const char *pszLayerName,
             CPLFree(pszTmp);
         }
         else
-            osTable = pszDotPos + 1;  // skip "."
+            osTable = OGRPGCommonGenerateShortEnoughIdentifier(pszDotPos +
+                                                               1);  // skip "."
     }
     else
     {
@@ -286,7 +281,7 @@ OGRPGDumpDataSource::ICreateLayer(const char *pszLayerName,
             CPLFree(pszTmp);
         }
         else
-            osTable = pszLayerName;
+            osTable = OGRPGCommonGenerateShortEnoughIdentifier(pszLayerName);
     }
 
     const std::string osTableEscaped =
@@ -498,8 +493,8 @@ OGRPGDumpDataSource::ICreateLayer(const char *pszLayerName,
     if (bCreateTable && !osFIDColumnName.empty())
     {
         std::string osConstraintName(osTable);
-        if (bLaunder && osConstraintName.size() + strlen("_pk") >
-                            static_cast<size_t>(OGR_PG_NAMEDATALEN - 1))
+        if (osConstraintName.size() + strlen("_pk") >
+            static_cast<size_t>(OGR_PG_NAMEDATALEN - 1))
         {
             osConstraintName.resize(OGR_PG_NAMEDATALEN - 1 - strlen("_pk"));
         }
@@ -592,21 +587,8 @@ OGRPGDumpDataSource::ICreateLayer(const char *pszLayerName,
     std::vector<std::string> aosSpatialIndexCreationCommands;
     if (bCreateTable && bCreateSpatialIndex && pszGFldName && eType != wkbNone)
     {
-        std::string osIndexName(osTable);
-        std::string osSuffix("_");
-        osSuffix += pszGFldName;
-        osSuffix += "_geom_idx";
-        if (bLaunder)
-        {
-            if (osSuffix.size() >= static_cast<size_t>(OGR_PG_NAMEDATALEN - 1))
-            {
-                osSuffix = "_0_geom_idx";
-            }
-            if (osIndexName.size() + osSuffix.size() >
-                static_cast<size_t>(OGR_PG_NAMEDATALEN - 1))
-                osIndexName.resize(OGR_PG_NAMEDATALEN - 1 - osSuffix.size());
-        }
-        osIndexName += osSuffix;
+        const std::string osIndexName(OGRPGCommonGenerateSpatialIndexName(
+            osTable.c_str(), pszGFldName, 0));
 
         /* --------------------------------------------------------------- */
         /*      Create the spatial index.                                  */
diff --git a/ogr/ogrsf_frmts/pgdump/ogrpgdumpdriver.cpp b/ogr/ogrsf_frmts/pgdump/ogrpgdumpdriver.cpp
index d519ef9a60b7..3fb8f2122907 100644
--- a/ogr/ogrsf_frmts/pgdump/ogrpgdumpdriver.cpp
+++ b/ogr/ogrsf_frmts/pgdump/ogrpgdumpdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_pgdump.h"
diff --git a/ogr/ogrsf_frmts/pgdump/ogrpgdumplayer.cpp b/ogr/ogrsf_frmts/pgdump/ogrpgdumplayer.cpp
index e8d07f811445..bf103a7edebb 100644
--- a/ogr/ogrsf_frmts/pgdump/ogrpgdumplayer.cpp
+++ b/ogr/ogrsf_frmts/pgdump/ogrpgdumplayer.cpp
@@ -7,30 +7,16 @@
  ******************************************************************************
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_pgdump.h"
 #include "cpl_conv.h"
+#include "cpl_md5.h"
 #include "cpl_string.h"
 #include "ogr_p.h"
 
+#include <cmath>
 #include <limits>
 
 //
@@ -625,9 +611,9 @@ void OGRPGCommonAppendCopyRegularFields(
 
                 nOff += static_cast<int>(strlen(pszNeedToFree + nOff));
                 // Check for special values. They need to be quoted.
-                if (CPLIsNan(padfItems[j]))
+                if (std::isnan(padfItems[j]))
                     snprintf(pszNeedToFree + nOff, nLen - nOff, "NaN");
-                else if (CPLIsInf(padfItems[j]))
+                else if (std::isinf(padfItems[j]))
                     snprintf(pszNeedToFree + nOff, nLen - nOff,
                              (padfItems[j] > 0) ? "Infinity" : "-Infinity");
                 else
@@ -662,9 +648,9 @@ void OGRPGCommonAppendCopyRegularFields(
         {
             // Check for special values. They need to be quoted.
             double dfVal = poFeature->GetFieldAsDouble(i);
-            if (CPLIsNan(dfVal))
+            if (std::isnan(dfVal))
                 pszStrValue = "NaN";
-            else if (CPLIsInf(dfVal))
+            else if (std::isinf(dfVal))
                 pszStrValue = (dfVal > 0) ? "Infinity" : "-Infinity";
         }
 
@@ -1056,9 +1042,9 @@ void OGRPGCommonAppendFieldValue(CPLString &osCommand, OGRFeature *poFeature,
 
             nOff += static_cast<int>(strlen(pszNeedToFree + nOff));
             // Check for special values. They need to be quoted.
-            if (CPLIsNan(padfItems[j]))
+            if (std::isnan(padfItems[j]))
                 snprintf(pszNeedToFree + nOff, nLen - nOff, "NaN");
-            else if (CPLIsInf(padfItems[j]))
+            else if (std::isinf(padfItems[j]))
                 snprintf(pszNeedToFree + nOff, nLen - nOff,
                          (padfItems[j] > 0) ? "Infinity" : "-Infinity");
             else
@@ -1120,9 +1106,9 @@ void OGRPGCommonAppendFieldValue(CPLString &osCommand, OGRFeature *poFeature,
     {
         // Check for special values. They need to be quoted.
         double dfVal = poFeature->GetFieldAsDouble(i);
-        if (CPLIsNan(dfVal))
+        if (std::isnan(dfVal))
             pszStrValue = "'NaN'";
-        else if (CPLIsInf(dfVal))
+        else if (std::isinf(dfVal))
             pszStrValue = (dfVal > 0) ? "'Infinity'" : "'-Infinity'";
     }
     else if ((nOGRFieldType == OFTInteger || nOGRFieldType == OFTInteger64) &&
@@ -1548,12 +1534,83 @@ CPLString OGRPGCommonLayerGetPGDefault(OGRFieldDefn *poFieldDefn)
     if (sscanf(osRet, "'%d/%d/%d %d:%d:%f'", &nYear, &nMonth, &nDay, &nHour,
                &nMinute, &fSecond) == 6)
     {
-        osRet.resize(osRet.size() - 1);
+        osRet.pop_back();
         osRet += "+00'::timestamp with time zone";
     }
     return osRet;
 }
 
+/************************************************************************/
+/*                OGRPGCommonGenerateShortEnoughIdentifier()            */
+/************************************************************************/
+
+std::string OGRPGCommonGenerateShortEnoughIdentifier(const char *pszIdentifier)
+{
+    if (strlen(pszIdentifier) <= static_cast<size_t>(OGR_PG_NAMEDATALEN - 1))
+        return pszIdentifier;
+
+    constexpr int FIRST_8_CHARS_OF_MD5 = 8;
+    std::string osRet(pszIdentifier,
+                      OGR_PG_NAMEDATALEN - 1 - 1 - FIRST_8_CHARS_OF_MD5);
+    osRet += '_';
+    osRet += std::string(CPLMD5String(pszIdentifier), FIRST_8_CHARS_OF_MD5);
+    return osRet;
+}
+
+/************************************************************************/
+/*                 OGRPGCommonGenerateSpatialIndexName()                 */
+/************************************************************************/
+
+/** Generates the name of the spatial index on table pszTableName
+ * using pszGeomFieldName, such that it fits in OGR_PG_NAMEDATALEN - 1 bytes.
+ * The index of the geometry field may be used if the geometry field name
+ * is too long.
+ */
+std::string OGRPGCommonGenerateSpatialIndexName(const char *pszTableName,
+                                                const char *pszGeomFieldName,
+                                                int nGeomFieldIdx)
+{
+    // Nominal case: use full table and geometry field name
+    for (const char *pszSuffix : {"_geom_idx", "_idx"})
+    {
+        if (strlen(pszTableName) + 1 + strlen(pszGeomFieldName) +
+                strlen(pszSuffix) <=
+            static_cast<size_t>(OGR_PG_NAMEDATALEN - 1))
+        {
+            std::string osRet(pszTableName);
+            osRet += '_';
+            osRet += pszGeomFieldName;
+            osRet += pszSuffix;
+            return osRet;
+        }
+    }
+
+    // Slightly degraded case: use table name and geometry field index
+    const std::string osGeomFieldIdx(CPLSPrintf("%d", nGeomFieldIdx));
+    if (strlen(pszTableName) + 1 + osGeomFieldIdx.size() +
+            strlen("_geom_idx") <=
+        static_cast<size_t>(OGR_PG_NAMEDATALEN - 1))
+    {
+        std::string osRet(pszTableName);
+        osRet += '_';
+        osRet += osGeomFieldIdx;
+        osRet += "_geom_idx";
+        return osRet;
+    }
+
+    // Fallback case: use first characters of table name,
+    // first 8 chars of its MD5 and then the geometry field index.
+    constexpr int FIRST_8_CHARS_OF_MD5 = 8;
+    std::string osSuffix("_");
+    osSuffix += std::string(CPLMD5String(pszTableName), FIRST_8_CHARS_OF_MD5);
+    osSuffix += '_';
+    osSuffix += osGeomFieldIdx;
+    osSuffix += "_geom_idx";
+    std::string osRet(pszTableName, OGR_PG_NAMEDATALEN - 1 - osSuffix.size());
+    osRet += osSuffix;
+    return osRet;
+}
+
 /************************************************************************/
 /*                           GetNextFeature()                           */
 /************************************************************************/
@@ -1812,26 +1869,9 @@ OGRErr OGRPGDumpLayer::CreateGeomField(const OGRGeomFieldDefn *poGeomFieldIn,
 
         if (m_bCreateSpatialIndexFlag)
         {
-            std::string osIndexName(GetName());
-            std::string osSuffix("_");
-            osSuffix += poGeomField->GetNameRef();
-            osSuffix += "_geom_idx";
-            if (m_bLaunderColumnNames)
-            {
-                if (osSuffix.size() >=
-                    static_cast<size_t>(OGR_PG_NAMEDATALEN - 1))
-                {
-                    osSuffix = "_";
-                    osSuffix +=
-                        CPLSPrintf("%d", m_poFeatureDefn->GetGeomFieldCount());
-                    osSuffix += "_geom_idx";
-                }
-                if (osIndexName.size() + osSuffix.size() >
-                    static_cast<size_t>(OGR_PG_NAMEDATALEN - 1))
-                    osIndexName.resize(OGR_PG_NAMEDATALEN - 1 -
-                                       osSuffix.size());
-            }
-            osIndexName += osSuffix;
+            const std::string osIndexName(OGRPGCommonGenerateSpatialIndexName(
+                GetName(), poGeomField->GetNameRef(),
+                m_poFeatureDefn->GetGeomFieldCount()));
 
             osCommand.Printf(
                 "CREATE INDEX %s ON %s USING %s (%s)",
diff --git a/ogr/ogrsf_frmts/pgeo/ogr_pgeo.h b/ogr/ogrsf_frmts/pgeo/ogr_pgeo.h
index a1ca8c3a59ea..fe4f0827a6ae 100644
--- a/ogr/ogrsf_frmts/pgeo/ogr_pgeo.h
+++ b/ogr/ogrsf_frmts/pgeo/ogr_pgeo.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_ODBC_H_INCLUDED
@@ -179,16 +163,14 @@ class OGRPGeoSelectLayer final : public OGRPGeoLayer
 };
 
 /************************************************************************/
-/*                           OGRPGeoDataSource                            */
+/*                           OGRPGeoDataSource                          */
 /************************************************************************/
 
-class OGRPGeoDataSource final : public OGRDataSource
+class OGRPGeoDataSource final : public GDALDataset
 {
     OGRPGeoLayer **papoLayers;
     int nLayers;
 
-    char *pszName;
-
     mutable CPLODBCSession oSession;
 
     std::unordered_set<std::string> m_aosAllLCTableNames;
@@ -216,11 +198,6 @@ class OGRPGeoDataSource final : public OGRDataSource
     int OpenTable(const char *pszTableName, const char *pszGeomCol,
                   int bUpdate);
 
-    const char *GetName() override
-    {
-        return pszName;
-    }
-
     int GetLayerCount() override
     {
         return nLayers;
diff --git a/ogr/ogrsf_frmts/pgeo/ogrpgeodatasource.cpp b/ogr/ogrsf_frmts/pgeo/ogrpgeodatasource.cpp
index 8f8b44f37660..f6e9f71027b7 100644
--- a/ogr/ogrsf_frmts/pgeo/ogrpgeodatasource.cpp
+++ b/ogr/ogrsf_frmts/pgeo/ogrpgeodatasource.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_pgeo.h"
@@ -45,8 +29,7 @@
 /*                         OGRPGeoDataSource()                          */
 /************************************************************************/
 
-OGRPGeoDataSource::OGRPGeoDataSource()
-    : papoLayers(nullptr), nLayers(0), pszName(nullptr)
+OGRPGeoDataSource::OGRPGeoDataSource() : papoLayers(nullptr), nLayers(0)
 {
     // Retrieve numeric values from MS Access files using ODBC numeric types, to
     // avoid loss of precision and missing values on Windows (see
@@ -61,8 +44,6 @@ OGRPGeoDataSource::OGRPGeoDataSource()
 OGRPGeoDataSource::~OGRPGeoDataSource()
 
 {
-    CPLFree(pszName);
-
     for (int i = 0; i < nLayers; i++)
         delete papoLayers[i];
 
@@ -145,8 +126,6 @@ int OGRPGeoDataSource::Open(GDALOpenInfo *poOpenInfo)
         }
     }
 
-    pszName = CPLStrdup(pszNewName);
-
     /* -------------------------------------------------------------------- */
     /*      Collect list of tables and their supporting info from           */
     /*      GDB_GeomColumns.                                                */
@@ -545,8 +524,8 @@ OGRLayer *OGRPGeoDataSource::ExecuteSQL(const char *pszSQLCommand,
     /*      Use generic implementation for recognized dialects              */
     /* -------------------------------------------------------------------- */
     if (IsGenericSQLDialect(pszDialect))
-        return OGRDataSource::ExecuteSQL(pszSQLCommand, poSpatialFilter,
-                                         pszDialect);
+        return GDALDataset::ExecuteSQL(pszSQLCommand, poSpatialFilter,
+                                       pszDialect);
 
     /* -------------------------------------------------------------------- */
     /*      Execute statement.                                              */
diff --git a/ogr/ogrsf_frmts/pgeo/ogrpgeodriver.cpp b/ogr/ogrsf_frmts/pgeo/ogrpgeodriver.cpp
index d01d2674f369..6fd8f9b0bf13 100644
--- a/ogr/ogrsf_frmts/pgeo/ogrpgeodriver.cpp
+++ b/ogr/ogrsf_frmts/pgeo/ogrpgeodriver.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_pgeo.h"
diff --git a/ogr/ogrsf_frmts/pgeo/ogrpgeolayer.cpp b/ogr/ogrsf_frmts/pgeo/ogrpgeolayer.cpp
index d30b8616fd1a..d373ac8c765e 100644
--- a/ogr/ogrsf_frmts/pgeo/ogrpgeolayer.cpp
+++ b/ogr/ogrsf_frmts/pgeo/ogrpgeolayer.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
@@ -34,6 +18,7 @@
 #include "ogrpgeogeometry.h"
 
 #include <algorithm>
+#include <cmath>
 
 /************************************************************************/
 /*                            OGRPGeoLayer()                            */
diff --git a/ogr/ogrsf_frmts/pgeo/ogrpgeoselectlayer.cpp b/ogr/ogrsf_frmts/pgeo/ogrpgeoselectlayer.cpp
index ed0e5f522c58..b06991b0f490 100644
--- a/ogr/ogrsf_frmts/pgeo/ogrpgeoselectlayer.cpp
+++ b/ogr/ogrsf_frmts/pgeo/ogrpgeoselectlayer.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2005, Frank Warmerdam
  * Copyright (c) 2010-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/pgeo/ogrpgeotablelayer.cpp b/ogr/ogrsf_frmts/pgeo/ogrpgeotablelayer.cpp
index 1e028a0b8402..6feea0de33fd 100644
--- a/ogr/ogrsf_frmts/pgeo/ogrpgeotablelayer.cpp
+++ b/ogr/ogrsf_frmts/pgeo/ogrpgeotablelayer.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2005, Frank Warmerdam
  * Copyright (c) 2008-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/plscenes/CMakeLists.txt b/ogr/ogrsf_frmts/plscenes/CMakeLists.txt
index bce3876d78cb..7f378eae5747 100644
--- a/ogr/ogrsf_frmts/plscenes/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/plscenes/CMakeLists.txt
@@ -22,7 +22,6 @@ set_property(
   PROPERTY RESOURCE "${GDAL_DATA_FILES}")
 
 gdal_standard_includes(ogr_PLSCENES)
-target_include_directories(ogr_PLSCENES PRIVATE $<TARGET_PROPERTY:ogr_geojson,SOURCE_DIR>)
 
 if (GDAL_USE_JSONC_INTERNAL)
   gdal_add_vendored_lib(ogr_PLSCENES libjson)
diff --git a/ogr/ogrsf_frmts/plscenes/ogr_plscenes.h b/ogr/ogrsf_frmts/plscenes/ogr_plscenes.h
index 3cc0c0b176ae..17921fee84e8 100644
--- a/ogr/ogrsf_frmts/plscenes/ogr_plscenes.h
+++ b/ogr/ogrsf_frmts/plscenes/ogr_plscenes.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_PLSCENES_H_INCLUDED
@@ -34,8 +18,7 @@
 #include "ogrsf_frmts.h"
 #include "ogr_srs_api.h"
 #include "cpl_http.h"
-#include "ogr_geojson.h"
-#include "ogrgeojsonreader.h"
+#include "ogrlibjsonutils.h"
 #include "ogr_swq.h"
 #include <map>
 #include <set>
diff --git a/ogr/ogrsf_frmts/plscenes/ogrplscenesdatav1dataset.cpp b/ogr/ogrsf_frmts/plscenes/ogrplscenesdatav1dataset.cpp
index 431177e7970c..4848a65b6faf 100644
--- a/ogr/ogrsf_frmts/plscenes/ogrplscenesdatav1dataset.cpp
+++ b/ogr/ogrsf_frmts/plscenes/ogrplscenesdatav1dataset.cpp
@@ -7,27 +7,11 @@
  ******************************************************************************
  * Copyright (c) 2016, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_plscenes.h"
-#include "ogrgeojsonreader.h"
+#include "ogrlibjsonutils.h"
 #include <time.h>
 
 /************************************************************************/
@@ -266,8 +250,8 @@ json_object *OGRPLScenesDataV1Dataset::RunRequest(const char *pszURL,
         psResult = (CPLHTTPResult *)CPLCalloc(1, sizeof(CPLHTTPResult));
         vsi_l_offset nDataLengthLarge = 0;
         CPLString osURL(pszURL);
-        if (osURL[osURL.size() - 1] == '/')
-            osURL.resize(osURL.size() - 1);
+        if (osURL.back() == '/')
+            osURL.pop_back();
         if (pszPostContent != nullptr)
         {
             osURL += "&POSTFIELDS=";
@@ -626,7 +610,11 @@ GDALDataset *OGRPLScenesDataV1Dataset::OpenRasterScene(GDALOpenInfo *poOpenInfo,
             {
                 // Set a dummy name so that PAM goes here
                 CPLPushErrorHandler(CPLQuietErrorHandler);
-                poOutDS->SetDescription("/vsimem/tmp/ogrplscenesDataV1");
+
+                const std::string osTmpFilename =
+                    VSIMemGenerateHiddenFilename("ogrplscenesDataV1");
+
+                poOutDS->SetDescription(osTmpFilename.c_str());
 
                 /* Attach scene metadata. */
                 poLayer->SetAttributeFilter(
@@ -663,8 +651,9 @@ GDALDataset *OGRPLScenesDataV1Dataset::OpenRasterScene(GDALOpenInfo *poOpenInfo,
                 delete poFeat;
 
                 poOutDS->FlushCache(false);
-                VSIUnlink("/vsimem/tmp/ogrplscenesDataV1");
-                VSIUnlink("/vsimem/tmp/ogrplscenesDataV1.aux.xml");
+                VSIUnlink(osTmpFilename.c_str());
+                VSIUnlink(
+                    std::string(osTmpFilename).append(".aux.xml").c_str());
                 CPLPopErrorHandler();
             }
         }
diff --git a/ogr/ogrsf_frmts/plscenes/ogrplscenesdatav1layer.cpp b/ogr/ogrsf_frmts/plscenes/ogrplscenesdatav1layer.cpp
index e2a5e2b9951c..88cf5fc84921 100644
--- a/ogr/ogrsf_frmts/plscenes/ogrplscenesdatav1layer.cpp
+++ b/ogr/ogrsf_frmts/plscenes/ogrplscenesdatav1layer.cpp
@@ -7,27 +7,13 @@
  ******************************************************************************
  * Copyright (c) 2017, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_plscenes.h"
-#include "ogrgeojsonreader.h"
+#include "ogrlibjsonutils.h"
+#include "ogrgeojsongeometry.h"
+#include "ogrgeojsonwriter.h"
 #include <algorithm>
 
 /************************************************************************/
diff --git a/ogr/ogrsf_frmts/plscenes/ogrplscenesdriver.cpp b/ogr/ogrsf_frmts/plscenes/ogrplscenesdriver.cpp
index 26040854367c..dc2576aa7c5f 100644
--- a/ogr/ogrsf_frmts/plscenes/ogrplscenesdriver.cpp
+++ b/ogr/ogrsf_frmts/plscenes/ogrplscenesdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015-2016, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_plscenes.h"
diff --git a/ogr/ogrsf_frmts/plscenes/ogrplscenesdrivercore.cpp b/ogr/ogrsf_frmts/plscenes/ogrplscenesdrivercore.cpp
index 2ffec75f373e..73e7dcd5875e 100644
--- a/ogr/ogrsf_frmts/plscenes/ogrplscenesdrivercore.cpp
+++ b/ogr/ogrsf_frmts/plscenes/ogrplscenesdrivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015-2016, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
diff --git a/ogr/ogrsf_frmts/plscenes/ogrplscenesdrivercore.h b/ogr/ogrsf_frmts/plscenes/ogrplscenesdrivercore.h
index d66fd05d94d3..acb1a3a8c1e1 100644
--- a/ogr/ogrsf_frmts/plscenes/ogrplscenesdrivercore.h
+++ b/ogr/ogrsf_frmts/plscenes/ogrplscenesdrivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015-2016, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRPLSCENESDRIVERCORE_H
diff --git a/ogr/ogrsf_frmts/pmtiles/include_pmtiles.h b/ogr/ogrsf_frmts/pmtiles/include_pmtiles.h
index 081f5bc5f11e..910972d083fc 100644
--- a/ogr/ogrsf_frmts/pmtiles/include_pmtiles.h
+++ b/ogr/ogrsf_frmts/pmtiles/include_pmtiles.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef INCLUDE_PMTILES_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/pmtiles/ogr_pmtiles.h b/ogr/ogrsf_frmts/pmtiles/ogr_pmtiles.h
index 93d6157d2b6b..9b08d4276c02 100644
--- a/ogr/ogrsf_frmts/pmtiles/ogr_pmtiles.h
+++ b/ogr/ogrsf_frmts/pmtiles/ogr_pmtiles.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_PMTILES_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/pmtiles/ogrpmtilesdataset.cpp b/ogr/ogrsf_frmts/pmtiles/ogrpmtilesdataset.cpp
index ab82a4d9bfe5..3f40934100cd 100644
--- a/ogr/ogrsf_frmts/pmtiles/ogrpmtilesdataset.cpp
+++ b/ogr/ogrsf_frmts/pmtiles/ogrpmtilesdataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_pmtiles.h"
@@ -239,7 +223,8 @@ bool OGRPMTilesDataset::Open(GDALOpenInfo *poOpenInfo)
     CPLDebugOnly("PMTiles", "Metadata = %s", posMetadata->c_str());
     m_osMetadata = *posMetadata;
 
-    m_osMetadataFilename = CPLSPrintf("/vsimem/pmtiles/metadata_%p.json", this);
+    m_osMetadataFilename =
+        VSIMemGenerateHiddenFilename("pmtiles_metadata.json");
     VSIFCloseL(VSIFileFromMemBuffer(m_osMetadataFilename.c_str(),
                                     reinterpret_cast<GByte *>(&m_osMetadata[0]),
                                     m_osMetadata.size(), false));
diff --git a/ogr/ogrsf_frmts/pmtiles/ogrpmtilesdriver.cpp b/ogr/ogrsf_frmts/pmtiles/ogrpmtilesdriver.cpp
index e1253bd87b8f..391b320f22f5 100644
--- a/ogr/ogrsf_frmts/pmtiles/ogrpmtilesdriver.cpp
+++ b/ogr/ogrsf_frmts/pmtiles/ogrpmtilesdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_pmtiles.h"
diff --git a/ogr/ogrsf_frmts/pmtiles/ogrpmtilesfrommbtiles.cpp b/ogr/ogrsf_frmts/pmtiles/ogrpmtilesfrommbtiles.cpp
index e17cb193101a..48eb19e9d846 100644
--- a/ogr/ogrsf_frmts/pmtiles/ogrpmtilesfrommbtiles.cpp
+++ b/ogr/ogrsf_frmts/pmtiles/ogrpmtilesfrommbtiles.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_json.h"
diff --git a/ogr/ogrsf_frmts/pmtiles/ogrpmtilesfrommbtiles.h b/ogr/ogrsf_frmts/pmtiles/ogrpmtilesfrommbtiles.h
index 034c03b469ad..dbf2861db22d 100644
--- a/ogr/ogrsf_frmts/pmtiles/ogrpmtilesfrommbtiles.h
+++ b/ogr/ogrsf_frmts/pmtiles/ogrpmtilesfrommbtiles.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRPMTILESFROMMBTILES_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/pmtiles/ogrpmtilestileiterator.cpp b/ogr/ogrsf_frmts/pmtiles/ogrpmtilestileiterator.cpp
index b66d72845929..3044219a00ac 100644
--- a/ogr/ogrsf_frmts/pmtiles/ogrpmtilestileiterator.cpp
+++ b/ogr/ogrsf_frmts/pmtiles/ogrpmtilestileiterator.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_pmtiles.h"
diff --git a/ogr/ogrsf_frmts/pmtiles/ogrpmtilesvectorlayer.cpp b/ogr/ogrsf_frmts/pmtiles/ogrpmtilesvectorlayer.cpp
index c6eea3ae3bc3..438fe86bb1da 100644
--- a/ogr/ogrsf_frmts/pmtiles/ogrpmtilesvectorlayer.cpp
+++ b/ogr/ogrsf_frmts/pmtiles/ogrpmtilesvectorlayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_pmtiles.h"
@@ -155,8 +139,8 @@ OGRwkbGeometryType OGRPMTilesVectorLayer::GuessGeometryType(
         }
         osTileData = *posStr;
 
-        std::string osTmpFilename =
-            CPLSPrintf("/vsimem/mvt_%p_%u_%u.pbf", poDS, sTile.x, sTile.y);
+        const std::string osTmpFilename = VSIMemGenerateHiddenFilename(
+            CPLSPrintf("pmtiles_%u_%u.pbf", sTile.x, sTile.y));
         VSIFCloseL(VSIFileFromMemBuffer(
             osTmpFilename.c_str(), reinterpret_cast<GByte *>(&osTileData[0]),
             osTileData.size(), false));
@@ -226,8 +210,8 @@ GIntBig OGRPMTilesVectorLayer::GetTotalFeatureCount() const
         }
         osTileData = *posStr;
 
-        std::string osTmpFilename = CPLSPrintf(
-            "/vsimem/mvt_%p_%u_%u_getfeaturecount.pbf", this, sTile.x, sTile.y);
+        const std::string osTmpFilename = VSIMemGenerateHiddenFilename(
+            CPLSPrintf("pmtiles_%u_%u_getfeaturecount.pbf", sTile.x, sTile.y));
         VSIFCloseL(VSIFileFromMemBuffer(
             osTmpFilename.c_str(), reinterpret_cast<GByte *>(&osTileData[0]),
             osTileData.size(), false));
@@ -300,8 +284,8 @@ OGRFeature *OGRPMTilesVectorLayer::GetFeature(GIntBig nFID)
     }
     std::string osTileData = *posStr;
 
-    std::string osTmpFilename = CPLSPrintf(
-        "/vsimem/mvt_%p_%u_%u_getfeature.pbf", this, sTile.x, sTile.y);
+    const std::string osTmpFilename = VSIMemGenerateHiddenFilename(
+        CPLSPrintf("pmtiles_getfeature_%u_%u.pbf", sTile.x, sTile.y));
     VSIFCloseL(VSIFileFromMemBuffer(osTmpFilename.c_str(),
                                     reinterpret_cast<GByte *>(&osTileData[0]),
                                     osTileData.size(), false));
@@ -408,8 +392,8 @@ std::unique_ptr<OGRFeature> OGRPMTilesVectorLayer::GetNextSrcFeature()
             }
 
             m_poTileDS.reset();
-            const std::string osTmpFilename =
-                CPLSPrintf("/vsimem/mvt_%p_%u_%u.pbf", this, sTile.x, sTile.y);
+            const std::string osTmpFilename = VSIMemGenerateHiddenFilename(
+                CPLSPrintf("pmtiles_%u_%u.pbf", sTile.x, sTile.y));
             VSIFCloseL(VSIFileFromMemBuffer(
                 osTmpFilename.c_str(),
                 reinterpret_cast<GByte *>(&m_osTileData[0]),
diff --git a/ogr/ogrsf_frmts/pmtiles/ogrpmtileswriterdataset.cpp b/ogr/ogrsf_frmts/pmtiles/ogrpmtileswriterdataset.cpp
index 44ea4aa67e74..9267ccb39fef 100644
--- a/ogr/ogrsf_frmts/pmtiles/ogrpmtileswriterdataset.cpp
+++ b/ogr/ogrsf_frmts/pmtiles/ogrpmtileswriterdataset.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_pmtiles.h"
diff --git a/ogr/ogrsf_frmts/pmtiles/pmtiles/pmtiles.hpp b/ogr/ogrsf_frmts/pmtiles/pmtiles/pmtiles.hpp
index 82ed8c56f5d0..c09f44d02020 100644
--- a/ogr/ogrsf_frmts/pmtiles/pmtiles/pmtiles.hpp
+++ b/ogr/ogrsf_frmts/pmtiles/pmtiles/pmtiles.hpp
@@ -576,6 +576,9 @@ inline std::tuple<std::string, std::string, int> make_root_leaves(const std::fun
 		if (root_bytes.length() < 16384 - 127) {
 			return std::make_tuple(root_bytes, leaves_bytes, num_leaves);
 		}
+		if (leaf_size > std::numeric_limits<int>::max() / 2) {
+			return std::make_tuple(compressed, "", 0);
+		}
 		leaf_size *= 2;
 	}
 }
diff --git a/ogr/ogrsf_frmts/pmtiles/vsipmtiles.cpp b/ogr/ogrsf_frmts/pmtiles/vsipmtiles.cpp
index 9e78e56e065b..cc90942fedf6 100644
--- a/ogr/ogrsf_frmts/pmtiles/vsipmtiles.cpp
+++ b/ogr/ogrsf_frmts/pmtiles/vsipmtiles.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_vsi_virtual.h"
@@ -141,7 +125,7 @@ VSIPMTilesOpen(const char *pszFilename, std::string &osSubfilename,
 
     std::string osFilename(pszFilename);
     if (!osFilename.empty() && osFilename.back() == '/')
-        osFilename.resize(osFilename.size() - 1);
+        osFilename.pop_back();
     pszFilename = osFilename.c_str();
 
     nZ = nX = nY = -1;
diff --git a/ogr/ogrsf_frmts/pmtiles/vsipmtiles.h b/ogr/ogrsf_frmts/pmtiles/vsipmtiles.h
index 5922f2d3b953..029ba90ac8e0 100644
--- a/ogr/ogrsf_frmts/pmtiles/vsipmtiles.h
+++ b/ogr/ogrsf_frmts/pmtiles/vsipmtiles.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef VSIPMTILES_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/s57/ddfrecordindex.cpp b/ogr/ogrsf_frmts/s57/ddfrecordindex.cpp
index 009310a22ed8..12c8bedab8a3 100644
--- a/ogr/ogrsf_frmts/s57/ddfrecordindex.cpp
+++ b/ogr/ogrsf_frmts/s57/ddfrecordindex.cpp
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 1999, 2001, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/s57/ogr_s57.h b/ogr/ogrsf_frmts/s57/ogr_s57.h
index de01b3af0c8d..f0a43bae0fe1 100644
--- a/ogr/ogrsf_frmts/s57/ogr_s57.h
+++ b/ogr/ogrsf_frmts/s57/ogr_s57.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_S57_H_INCLUDED
@@ -86,10 +70,8 @@ class OGRS57Layer final : public OGRLayer
 /*                          OGRS57DataSource                            */
 /************************************************************************/
 
-class OGRS57DataSource final : public OGRDataSource
+class OGRS57DataSource final : public GDALDataset
 {
-    char *pszName;
-
     int nLayers;
     OGRS57Layer **papoLayers;
 
@@ -119,11 +101,6 @@ class OGRS57DataSource final : public OGRDataSource
     int Open(const char *pszName);
     int Create(const char *pszName, char **papszOptions);
 
-    const char *GetName() override
-    {
-        return pszName;
-    }
-
     int GetLayerCount() override
     {
         return nLayers;
diff --git a/ogr/ogrsf_frmts/s57/ogrs57datasource.cpp b/ogr/ogrsf_frmts/s57/ogrs57datasource.cpp
index d83da64d5aac..fbb36abf80b5 100644
--- a/ogr/ogrsf_frmts/s57/ogrs57datasource.cpp
+++ b/ogr/ogrsf_frmts/s57/ogrs57datasource.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
@@ -39,10 +23,9 @@
 /************************************************************************/
 
 OGRS57DataSource::OGRS57DataSource(char **papszOpenOptionsIn)
-    : pszName(nullptr), nLayers(0), papoLayers(nullptr),
-      poSpatialRef(new OGRSpatialReference()), papszOptions(nullptr),
-      nModules(0), papoModules(nullptr), poWriter(nullptr),
-      poClassContentExplorer(nullptr), bExtentsSet(false)
+    : nLayers(0), papoLayers(nullptr), poSpatialRef(new OGRSpatialReference()),
+      papszOptions(nullptr), nModules(0), papoModules(nullptr),
+      poWriter(nullptr), poClassContentExplorer(nullptr), bExtentsSet(false)
 {
     poSpatialRef->SetWellKnownGeogCS("WGS84");
     poSpatialRef->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
@@ -98,8 +81,6 @@ OGRS57DataSource::~OGRS57DataSource()
         delete papoModules[i];
     CPLFree(papoModules);
 
-    CPLFree(pszName);
-
     CSLDestroy(papszOptions);
 
     poSpatialRef->Release();
@@ -153,8 +134,6 @@ int OGRS57DataSource::TestCapability(const char *pszCap)
 int OGRS57DataSource::Open(const char *pszFilename)
 
 {
-    pszName = CPLStrdup(pszFilename);
-
     /* -------------------------------------------------------------------- */
     /*      Setup reader options.                                           */
     /* -------------------------------------------------------------------- */
@@ -477,7 +456,6 @@ int OGRS57DataSource::Create(const char *pszFilename, char **papszOptionsIn)
 
     poWriter->SetClassBased(OGRS57Driver::GetS57Registrar(),
                             poClassContentExplorer);
-    pszName = CPLStrdup(pszFilename);
 
     /* -------------------------------------------------------------------- */
     /*      Add the primitive layers if they are called for.                */
diff --git a/ogr/ogrsf_frmts/s57/ogrs57driver.cpp b/ogr/ogrsf_frmts/s57/ogrs57driver.cpp
index b2c9a8f5b58a..e340bec6250a 100644
--- a/ogr/ogrsf_frmts/s57/ogrs57driver.cpp
+++ b/ogr/ogrsf_frmts/s57/ogrs57driver.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_s57.h"
diff --git a/ogr/ogrsf_frmts/s57/ogrs57layer.cpp b/ogr/ogrsf_frmts/s57/ogrs57layer.cpp
index f738faf4ba4d..ddff94c7ab05 100644
--- a/ogr/ogrsf_frmts/s57/ogrs57layer.cpp
+++ b/ogr/ogrsf_frmts/s57/ogrs57layer.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2009-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/s57/s57.h b/ogr/ogrsf_frmts/s57/s57.h
index f22fea3fb937..853b8cf4b114 100644
--- a/ogr/ogrsf_frmts/s57/s57.h
+++ b/ogr/ogrsf_frmts/s57/s57.h
@@ -11,23 +11,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef S57_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/s57/s57classregistrar.cpp b/ogr/ogrsf_frmts/s57/s57classregistrar.cpp
index 6d53d0b6bb9f..c5ff24ddda5d 100644
--- a/ogr/ogrsf_frmts/s57/s57classregistrar.cpp
+++ b/ogr/ogrsf_frmts/s57/s57classregistrar.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/s57/s57dump.cpp b/ogr/ogrsf_frmts/s57/s57dump.cpp
index a6bce389034b..24e31d454e00 100644
--- a/ogr/ogrsf_frmts/s57/s57dump.cpp
+++ b/ogr/ogrsf_frmts/s57/s57dump.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/s57/s57featuredefns.cpp b/ogr/ogrsf_frmts/s57/s57featuredefns.cpp
index c54daf2afd6b..b40b534debf6 100644
--- a/ogr/ogrsf_frmts/s57/s57featuredefns.cpp
+++ b/ogr/ogrsf_frmts/s57/s57featuredefns.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 1999, 2001, 2003 Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/s57/s57filecollector.cpp b/ogr/ogrsf_frmts/s57/s57filecollector.cpp
index cd2ca2fc252b..ab56a7b1b5c9 100644
--- a/ogr/ogrsf_frmts/s57/s57filecollector.cpp
+++ b/ogr/ogrsf_frmts/s57/s57filecollector.cpp
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/s57/s57reader.cpp b/ogr/ogrsf_frmts/s57/s57reader.cpp
index 2590d60c8177..e1be6cbdf48d 100644
--- a/ogr/ogrsf_frmts/s57/s57reader.cpp
+++ b/ogr/ogrsf_frmts/s57/s57reader.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, 2001, Frank Warmerdam
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/s57/s57tables.h b/ogr/ogrsf_frmts/s57/s57tables.h
index 355da4477431..8fc53c5060a3 100644
--- a/ogr/ogrsf_frmts/s57/s57tables.h
+++ b/ogr/ogrsf_frmts/s57/s57tables.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 1999, 2001, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 // Only included in s57classregistrar.cpp.
diff --git a/ogr/ogrsf_frmts/s57/s57tables.py b/ogr/ogrsf_frmts/s57/s57tables.py
index 67ac5a295879..cc6807437488 100755
--- a/ogr/ogrsf_frmts/s57/s57tables.py
+++ b/ogr/ogrsf_frmts/s57/s57tables.py
@@ -9,23 +9,7 @@
 # ******************************************************************************
 #  Copyright (c) 2001, Frank Warmerdam
 #
-#  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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import os
diff --git a/ogr/ogrsf_frmts/s57/s57writer.cpp b/ogr/ogrsf_frmts/s57/s57writer.cpp
index 9eb9390751fd..f7bc0f7fb39b 100644
--- a/ogr/ogrsf_frmts/s57/s57writer.cpp
+++ b/ogr/ogrsf_frmts/s57/s57writer.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2003, Frank Warmerdam
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
diff --git a/ogr/ogrsf_frmts/sdts/ogr_sdts.h b/ogr/ogrsf_frmts/sdts/ogr_sdts.h
index 113ba854745a..78b01779f91e 100644
--- a/ogr/ogrsf_frmts/sdts/ogr_sdts.h
+++ b/ogr/ogrsf_frmts/sdts/ogr_sdts.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 1999,  Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_SDTS_H_INCLUDED
@@ -71,10 +55,9 @@ class OGRSDTSLayer final : public OGRLayer
 /*                          OGRSDTSDataSource                           */
 /************************************************************************/
 
-class OGRSDTSDataSource final : public OGRDataSource
+class OGRSDTSDataSource final : public GDALDataset
 {
     SDTSTransfer *poTransfer;
-    char *pszName;
 
     int nLayers;
     OGRSDTSLayer **papoLayers;
@@ -87,23 +70,12 @@ class OGRSDTSDataSource final : public OGRDataSource
 
     int Open(const char *pszFilename, int bTestOpen);
 
-    const char *GetName() override
-    {
-        return pszName;
-    }
-
     int GetLayerCount() override
     {
         return nLayers;
     }
 
     OGRLayer *GetLayer(int) override;
-    int TestCapability(const char *) override;
-
-    OGRSpatialReference *DSGetSpatialRef()
-    {
-        return poSRS;
-    }
 };
 
 #endif /* ndef OGR_SDTS_H_INCLUDED */
diff --git a/ogr/ogrsf_frmts/sdts/ogrsdtsdatasource.cpp b/ogr/ogrsf_frmts/sdts/ogrsdtsdatasource.cpp
index 66950a7bd90b..f4b8877422a4 100644
--- a/ogr/ogrsf_frmts/sdts/ogrsdtsdatasource.cpp
+++ b/ogr/ogrsf_frmts/sdts/ogrsdtsdatasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_sdts.h"
@@ -35,8 +19,7 @@
 /************************************************************************/
 
 OGRSDTSDataSource::OGRSDTSDataSource()
-    : poTransfer(nullptr), pszName(nullptr), nLayers(0), papoLayers(nullptr),
-      poSRS(nullptr)
+    : poTransfer(nullptr), nLayers(0), papoLayers(nullptr), poSRS(nullptr)
 {
 }
 
@@ -52,8 +35,6 @@ OGRSDTSDataSource::~OGRSDTSDataSource()
 
     CPLFree(papoLayers);
 
-    CPLFree(pszName);
-
     if (poSRS)
         poSRS->Release();
 
@@ -61,16 +42,6 @@ OGRSDTSDataSource::~OGRSDTSDataSource()
         delete poTransfer;
 }
 
-/************************************************************************/
-/*                           TestCapability()                           */
-/************************************************************************/
-
-int OGRSDTSDataSource::TestCapability(const char *)
-
-{
-    return FALSE;
-}
-
 /************************************************************************/
 /*                              GetLayer()                              */
 /************************************************************************/
@@ -91,8 +62,6 @@ OGRLayer *OGRSDTSDataSource::GetLayer(int iLayer)
 int OGRSDTSDataSource::Open(const char *pszFilename, int bTestOpen)
 
 {
-    pszName = CPLStrdup(pszFilename);
-
     /* -------------------------------------------------------------------- */
     /*      Verify that the extension is DDF if we are testopening.         */
     /* -------------------------------------------------------------------- */
diff --git a/ogr/ogrsf_frmts/sdts/ogrsdtsdriver.cpp b/ogr/ogrsf_frmts/sdts/ogrsdtsdriver.cpp
index 5752e580f28d..37a186f4c435 100644
--- a/ogr/ogrsf_frmts/sdts/ogrsdtsdriver.cpp
+++ b/ogr/ogrsf_frmts/sdts/ogrsdtsdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_sdts.h"
diff --git a/ogr/ogrsf_frmts/sdts/ogrsdtslayer.cpp b/ogr/ogrsf_frmts/sdts/ogrsdtslayer.cpp
index 6658fd6e7480..aeaf42dc554a 100644
--- a/ogr/ogrsf_frmts/sdts/ogrsdtslayer.cpp
+++ b/ogr/ogrsf_frmts/sdts/ogrsdtslayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_sdts.h"
@@ -51,7 +35,7 @@ OGRSDTSLayer::OGRSDTSLayer(SDTSTransfer *poTransferIn, int iLayerIn,
         new OGRFeatureDefn(poTransfer->GetCATD()->GetEntryModule(iCATDEntry));
     SetDescription(poFeatureDefn->GetName());
     poFeatureDefn->Reference();
-    poFeatureDefn->GetGeomFieldDefn(0)->SetSpatialRef(poDS->DSGetSpatialRef());
+    poFeatureDefn->GetGeomFieldDefn(0)->SetSpatialRef(poDS->GetSpatialRef());
 
     OGRFieldDefn oRecId("RCID", OFTInteger);
     poFeatureDefn->AddFieldDefn(&oRecId);
@@ -405,7 +389,7 @@ OGRFeature *OGRSDTSLayer::GetNextUnfilteredFeature()
     poFeature->SetField(0, (int)poSDTSFeature->oModId.nRecord);
     if (poFeature->GetGeometryRef() != nullptr)
         poFeature->GetGeometryRef()->assignSpatialReference(
-            poDS->DSGetSpatialRef());
+            poDS->GetSpatialRef());
 
     if (!bIsIndexed)
         delete poSDTSFeature;
diff --git a/ogr/ogrsf_frmts/selafin/io_selafin.cpp b/ogr/ogrsf_frmts/selafin/io_selafin.cpp
index 5cefa78b9670..e3ee8726b502 100644
--- a/ogr/ogrsf_frmts/selafin/io_selafin.cpp
+++ b/ogr/ogrsf_frmts/selafin/io_selafin.cpp
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2014,  François Hissel <francois.hissel@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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "io_selafin.h"
diff --git a/ogr/ogrsf_frmts/selafin/io_selafin.h b/ogr/ogrsf_frmts/selafin/io_selafin.h
index 0085ab4e16c3..ee5bdf05bf29 100644
--- a/ogr/ogrsf_frmts/selafin/io_selafin.h
+++ b/ogr/ogrsf_frmts/selafin/io_selafin.h
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2014,  François Hissel <francois.hissel@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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef IO_SELAFIN_H_INC
diff --git a/ogr/ogrsf_frmts/selafin/ogr_selafin.h b/ogr/ogrsf_frmts/selafin/ogr_selafin.h
index 3ca112038e19..da4a6482dbf1 100644
--- a/ogr/ogrsf_frmts/selafin/ogr_selafin.h
+++ b/ogr/ogrsf_frmts/selafin/ogr_selafin.h
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2014,  François Hissel <francois.hissel@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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_SELAFIN_H_INCLUDED
@@ -152,7 +136,7 @@ class OGRSelafinLayer final : public OGRLayer
 /*                           OGRSelafinDataSource                       */
 /************************************************************************/
 
-class OGRSelafinDataSource final : public OGRDataSource
+class OGRSelafinDataSource final : public GDALDataset
 {
   private:
     char *pszName;
@@ -170,11 +154,6 @@ class OGRSelafinDataSource final : public OGRDataSource
     int Open(const char *pszFilename, int bUpdate, int bCreate);
     int OpenTable(const char *pszFilename);
 
-    const char *GetName() override
-    {
-        return pszName;
-    }
-
     int GetLayerCount() override
     {
         return nLayers;
diff --git a/ogr/ogrsf_frmts/selafin/ogrselafindatasource.cpp b/ogr/ogrsf_frmts/selafin/ogrselafindatasource.cpp
index cbf2f3a5613e..510cffbc5d29 100644
--- a/ogr/ogrsf_frmts/selafin/ogrselafindatasource.cpp
+++ b/ogr/ogrsf_frmts/selafin/ogrselafindatasource.cpp
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2014,  François Hissel <francois.hissel@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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_selafin.h"
diff --git a/ogr/ogrsf_frmts/selafin/ogrselafindriver.cpp b/ogr/ogrsf_frmts/selafin/ogrselafindriver.cpp
index 821cf15b7a0d..6b5c68d35770 100644
--- a/ogr/ogrsf_frmts/selafin/ogrselafindriver.cpp
+++ b/ogr/ogrsf_frmts/selafin/ogrselafindriver.cpp
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2014,  François Hissel <francois.hissel@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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_selafin.h"
diff --git a/ogr/ogrsf_frmts/selafin/ogrselafinlayer.cpp b/ogr/ogrsf_frmts/selafin/ogrselafinlayer.cpp
index 8a6713521dc4..9405099772fc 100644
--- a/ogr/ogrsf_frmts/selafin/ogrselafinlayer.cpp
+++ b/ogr/ogrsf_frmts/selafin/ogrselafinlayer.cpp
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2014,  François Hissel <francois.hissel@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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <cstdlib>
diff --git a/ogr/ogrsf_frmts/shape/CMakeLists.txt b/ogr/ogrsf_frmts/shape/CMakeLists.txt
index 973c6ecf7e1f..706f8834ad97 100644
--- a/ogr/ogrsf_frmts/shape/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/shape/CMakeLists.txt
@@ -1,8 +1,10 @@
-# depends from frmts/aigrid, avc
 add_gdal_driver(
   TARGET ogr_Shape
   SOURCES shape2ogr.cpp shp_vsi.c ogrshapedatasource.cpp ogrshapedriver.cpp ogrshapelayer.cpp
-  BUILTIN)
+  PLUGIN_CAPABLE
+  NO_DEPS
+  STRONG_CXX_WFLAGS
+)
 gdal_standard_includes(ogr_Shape)
 target_include_directories(ogr_Shape PRIVATE $<TARGET_PROPERTY:ogrsf_generic,SOURCE_DIR>)
 
@@ -18,7 +20,11 @@ if (GDAL_USE_SHAPELIB_INTERNAL)
   endif ()
   target_compile_definitions(shapelib PUBLIC -DUSE_CPL)
   set_property(TARGET shapelib PROPERTY POSITION_INDEPENDENT_CODE ${GDAL_OBJECT_LIBRARIES_POSITION_INDEPENDENT_CODE})
-  target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:shapelib>)
+  if (OGR_ENABLE_DRIVER_SHAPE_PLUGIN)
+      target_sources(ogr_Shape PRIVATE $<TARGET_OBJECTS:shapelib>)
+  else()
+      target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:shapelib>)
+  endif()
   gdal_add_vendored_lib(ogr_Shape shapelib)
 elseif (HAVE_SHAPELIB)
   gdal_target_link_libraries(ogr_Shape PRIVATE SHAPELIB::shp)
diff --git a/ogr/ogrsf_frmts/shape/dbfopen.c b/ogr/ogrsf_frmts/shape/dbfopen.c
index 4fc70b91d9c6..8bac07247992 100644
--- a/ogr/ogrsf_frmts/shape/dbfopen.c
+++ b/ogr/ogrsf_frmts/shape/dbfopen.c
@@ -6,7 +6,7 @@
  *
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
- * Copyright (c) 2012-2019, Even Rouault <even dot rouault at spatialys.com>
+ * Copyright (c) 2012-2024, Even Rouault <even dot rouault at spatialys.com>
  *
  * SPDX-License-Identifier: MIT OR LGPL-2.0-or-later
  ******************************************************************************/
@@ -24,6 +24,7 @@
 #include "cpl_string.h"
 #else
 
+#ifndef STRCASECMP
 #if defined(_MSC_VER)
 #define STRCASECMP(a, b) (_stricmp(a, b))
 #elif defined(_WIN32)
@@ -32,6 +33,7 @@
 #include <strings.h>
 #define STRCASECMP(a, b) (strcasecmp(a, b))
 #endif
+#endif
 
 #if defined(_MSC_VER)
 #if _MSC_VER < 1900
@@ -481,7 +483,7 @@ DBFHandle SHPAPI_CALL DBFOpenLL(const char *pszFilename, const char *pszAccess,
 
     for (int iField = 0; iField < nFields; iField++)
     {
-        unsigned char *pabyFInfo = pabyBuf + iField * XBASE_FLDHDR_SZ;
+        const unsigned char *pabyFInfo = pabyBuf + iField * XBASE_FLDHDR_SZ;
         if (pabyFInfo[0] == HEADER_RECORD_TERMINATOR)
         {
             psDBF->nFields = iField;
@@ -1119,7 +1121,7 @@ SHPDate SHPAPI_CALL DBFReadDateAttribute(DBFHandle psDBF, int iRecord,
 /*      Return TRUE if the passed string is NULL.                       */
 /************************************************************************/
 
-static bool DBFIsValueNULL(char chType, const char *pszValue)
+static bool DBFIsValueNULL(char chType, const char *pszValue, int size)
 {
     if (pszValue == SHPLIB_NULLPTR)
         return true;
@@ -1144,13 +1146,22 @@ static bool DBFIsValueNULL(char chType, const char *pszValue)
             return true;
 
         case 'D':
-            /* NULL date fields have value "00000000" */
+        {
+            const char DIGIT_ZERO = '0';
+            /* NULL date fields have value "00000000" or "0"*size */
             /* Some DBF files have fields filled with spaces */
             /* (trimmed by DBFReadStringAttribute) to indicate null */
             /* values for dates (#4265). */
             /* And others have '       0': https://lists.osgeo.org/pipermail/gdal-dev/2023-November/058010.html */
-            return strncmp(pszValue, "00000000", 8) == 0 ||
-                   strcmp(pszValue, " ") == 0 || strcmp(pszValue, "0") == 0;
+            /* And others just empty string: https://github.com/OSGeo/gdal/issues/10405 */
+            if (pszValue[0] == 0 || strncmp(pszValue, "00000000", 8) == 0 ||
+                strcmp(pszValue, " ") == 0 || strcmp(pszValue, "0") == 0)
+                return true;
+            for (int i = 0; i < size; i++)
+                if (pszValue[i] != DIGIT_ZERO)
+                    return false;
+            return true;
+        }
 
         case 'L':
             /* NULL boolean fields have value "?" */
@@ -1178,7 +1189,8 @@ int SHPAPI_CALL DBFIsAttributeNULL(const DBFHandle psDBF, int iRecord,
     if (pszValue == SHPLIB_NULLPTR)
         return TRUE;
 
-    return DBFIsValueNULL(psDBF->pachFieldType[iField], pszValue);
+    return DBFIsValueNULL(psDBF->pachFieldType[iField], pszValue,
+                          psDBF->panFieldSize[iField]);
 }
 
 /************************************************************************/
@@ -2165,7 +2177,8 @@ int SHPAPI_CALL DBFAlterFieldDefn(DBFHandle psDBF, int iField,
             }
 
             memcpy(pszOldField, pszRecord + nOffset, nOldWidth);
-            const bool bIsNULL = DBFIsValueNULL(chOldType, pszOldField);
+            const bool bIsNULL =
+                DBFIsValueNULL(chOldType, pszOldField, nOldWidth);
 
             if (nWidth != nOldWidth)
             {
@@ -2242,7 +2255,8 @@ int SHPAPI_CALL DBFAlterFieldDefn(DBFHandle psDBF, int iField,
             }
 
             memcpy(pszOldField, pszRecord + nOffset, nOldWidth);
-            const bool bIsNULL = DBFIsValueNULL(chOldType, pszOldField);
+            const bool bIsNULL =
+                DBFIsValueNULL(chOldType, pszOldField, nOldWidth);
 
             if (nOffset + nOldWidth < nOldRecordLength)
             {
diff --git a/ogr/ogrsf_frmts/shape/gdal_shapelib_symbol_rename.h b/ogr/ogrsf_frmts/shape/gdal_shapelib_symbol_rename.h
index 33997dfbc211..3fa98676d887 100644
--- a/ogr/ogrsf_frmts/shape/gdal_shapelib_symbol_rename.h
+++ b/ogr/ogrsf_frmts/shape/gdal_shapelib_symbol_rename.h
@@ -32,6 +32,7 @@
 #define DBFReadIntegerAttribute gdal_DBFReadIntegerAttribute
 #define DBFReadLogicalAttribute gdal_DBFReadLogicalAttribute
 #define DBFReadStringAttribute gdal_DBFReadStringAttribute
+#define DBFReadDateAttribute gdal_DBFReadDateAttribute
 #define DBFReadTuple gdal_DBFReadTuple
 #define DBFReorderFields gdal_DBFReorderFields
 #define DBFSetLastModifiedDate gdal_DBFSetLastModifiedDate
@@ -45,6 +46,7 @@
 #define DBFWriteLogicalAttribute gdal_DBFWriteLogicalAttribute
 #define DBFWriteNULLAttribute gdal_DBFWriteNULLAttribute
 #define DBFWriteStringAttribute gdal_DBFWriteStringAttribute
+#define DBFWriteDateAttribute gdal_DBFWriteDateAttribute
 #define DBFWriteTuple gdal_DBFWriteTuple
 #define frame_dummy gdal_frame_dummy
 #define SASetupDefaultHooks gdal_SASetupDefaultHooks
diff --git a/ogr/ogrsf_frmts/shape/ogrshape.h b/ogr/ogrsf_frmts/shape/ogrshape.h
index 471471f5f1a7..2fd2af48b0b9 100644
--- a/ogr/ogrsf_frmts/shape/ogrshape.h
+++ b/ogr/ogrsf_frmts/shape/ogrshape.h
@@ -10,23 +10,7 @@
  * Copyright (c) 1999,  Les Technologies SoftMap Inc.
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRSHAPE_H_INCLUDED
@@ -320,11 +304,10 @@ class OGRShapeLayer final : public OGRAbstractProxiedLayer
 /*                          OGRShapeDataSource                          */
 /************************************************************************/
 
-class OGRShapeDataSource final : public OGRDataSource
+class OGRShapeDataSource final : public GDALDataset
 {
     OGRShapeLayer **papoLayers;
     int nLayers;
-    char *pszName;
     bool bSingleFileDataSource;
     OGRLayerPool *poPool;
 
@@ -339,6 +322,7 @@ class OGRShapeDataSource final : public OGRDataSource
     VSILFILE *m_psLockFile = nullptr;
     CPLJoinableThread *m_hRefreshLockFileThread = nullptr;
     bool m_bExitRefreshLockFileThread = false;
+    bool m_bRefreshLockFileThreadStarted = false;
     double m_dfRefreshLockDelay = 0;
 
     std::vector<CPLString> GetLayerNames() const;
@@ -364,11 +348,6 @@ class OGRShapeDataSource final : public OGRDataSource
     bool OpenZip(GDALOpenInfo *poOpenInfo, const char *pszOriFilename);
     bool CreateZip(const char *pszOriFilename);
 
-    const char *GetName() override
-    {
-        return pszName;
-    }
-
     int GetLayerCount() override;
     OGRLayer *GetLayer(int) override;
     OGRLayer *GetLayerByName(const char *) override;
@@ -407,7 +386,7 @@ class OGRShapeDataSource final : public OGRDataSource
 
     CPLString GetVSIZipPrefixeDir() const
     {
-        return CPLString("/vsizip/{") + pszName + '}';
+        return CPLString("/vsizip/{").append(GetDescription()).append("}");
     }
 
     const CPLString &GetTemporaryUnzipDir() const
diff --git a/ogr/ogrsf_frmts/shape/ogrshapedatasource.cpp b/ogr/ogrsf_frmts/shape/ogrshapedatasource.cpp
index 8b8d432e1373..1fc8b36710d4 100644
--- a/ogr/ogrsf_frmts/shape/ogrshapedatasource.cpp
+++ b/ogr/ogrsf_frmts/shape/ogrshapedatasource.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999,  Les Technologies SoftMap Inc.
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -97,8 +81,8 @@ DBFHandle OGRShapeDataSource::DS_DBFOpen(const char *pszDBFFile,
 /************************************************************************/
 
 OGRShapeDataSource::OGRShapeDataSource()
-    : papoLayers(nullptr), nLayers(0), pszName(nullptr),
-      bSingleFileDataSource(false), poPool(new OGRLayerPool()),
+    : papoLayers(nullptr), nLayers(0), bSingleFileDataSource(false),
+      poPool(new OGRLayerPool()),
       b2GBLimit(CPLTestBool(CPLGetConfigOption("SHAPE_2GB_LIMIT", "FALSE")))
 {
 }
@@ -156,8 +140,6 @@ OGRShapeDataSource::~OGRShapeDataSource()
         CPLDestroyCond(m_poRefreshLockFileCond);
         m_poRefreshLockFileCond = nullptr;
     }
-
-    CPLFree(pszName);
 }
 
 /************************************************************************/
@@ -169,14 +151,15 @@ bool OGRShapeDataSource::OpenZip(GDALOpenInfo *poOpenInfo,
 {
     if (!Open(poOpenInfo, true))
         return false;
-    CPLFree(pszName);
-    pszName = CPLStrdup(pszOriFilename);
+
+    SetDescription(pszOriFilename);
+
     m_bIsZip = true;
     m_bSingleLayerZip = EQUAL(CPLGetExtension(pszOriFilename), "shz");
 
     if (!m_bSingleLayerZip)
     {
-        CPLString osLockFile(pszName);
+        CPLString osLockFile(GetDescription());
         osLockFile += ".gdal.lock";
         VSIStatBufL sStat;
         if (VSIStatL(osLockFile, &sStat) == 0 &&
@@ -197,9 +180,8 @@ bool OGRShapeDataSource::OpenZip(GDALOpenInfo *poOpenInfo,
 bool OGRShapeDataSource::CreateZip(const char *pszOriFilename)
 {
     CPLAssert(nLayers == 0);
-    pszName = CPLStrdup(pszOriFilename);
 
-    void *hZIP = CPLCreateZip(pszName, nullptr);
+    void *hZIP = CPLCreateZip(pszOriFilename, nullptr);
     if (!hZIP)
         return false;
     if (CPLCloseZip(hZIP) != CE_None)
@@ -225,8 +207,6 @@ bool OGRShapeDataSource::Open(GDALOpenInfo *poOpenInfo, bool bTestOpen,
     CPLAssert(papszOpenOptions == nullptr);
     papszOpenOptions = CSLDuplicate(poOpenInfo->papszOpenOptions);
 
-    pszName = CPLStrdup(pszNewName);
-
     eAccess = poOpenInfo->eAccess;
 
     bSingleFileDataSource = CPL_TO_BOOL(bForceSingleFileDataSource);
@@ -601,7 +581,7 @@ OGRShapeDataSource::ICreateLayer(const char *pszLayerName,
         CPLError(CE_Failure, CPLE_NoWriteAccess,
                  "Data source %s opened read-only.  "
                  "New layer %s cannot be created.",
-                 pszName, pszLayerName);
+                 GetDescription(), pszLayerName);
 
         return nullptr;
     }
@@ -803,8 +783,8 @@ OGRShapeDataSource::ICreateLayer(const char *pszLayerName,
 
     if (bSingleFileDataSource && nLayers == 0)
     {
-        char *pszPath = CPLStrdup(CPLGetPath(pszName));
-        char *pszFBasename = CPLStrdup(CPLGetBasename(pszName));
+        char *pszPath = CPLStrdup(CPLGetPath(GetDescription()));
+        char *pszFBasename = CPLStrdup(CPLGetBasename(GetDescription()));
 
         pszFilenameWithoutExt =
             CPLStrdup(CPLFormFilename(pszPath, pszFBasename, nullptr));
@@ -820,17 +800,18 @@ OGRShapeDataSource::ICreateLayer(const char *pszLayerName,
         // directory as 'foo.shp'
         // So technically, we will not be any longer a single file
         // datasource ... Ahem ahem.
-        char *pszPath = CPLStrdup(CPLGetPath(pszName));
+        char *pszPath = CPLStrdup(CPLGetPath(GetDescription()));
         pszFilenameWithoutExt = CPLStrdup(CPLFormFilename(
             pszPath, LaunderLayerName(pszLayerName).c_str(), nullptr));
         CPLFree(pszPath);
     }
     else
     {
-        CPLString osDir(m_osTemporaryUnzipDir.empty() ? pszName
-                                                      : m_osTemporaryUnzipDir);
+        const std::string osDir(m_osTemporaryUnzipDir.empty()
+                                    ? std::string(GetDescription())
+                                    : m_osTemporaryUnzipDir);
         pszFilenameWithoutExt = CPLStrdup(CPLFormFilename(
-            osDir, LaunderLayerName(pszLayerName).c_str(), nullptr));
+            osDir.c_str(), LaunderLayerName(pszLayerName).c_str(), nullptr));
     }
 
     /* -------------------------------------------------------------------- */
@@ -1080,7 +1061,7 @@ OGRLayer *OGRShapeDataSource::GetLayerByName(const char *pszLayerNameIn)
     }
 #endif
 
-    return OGRDataSource::GetLayerByName(pszLayerNameIn);
+    return GDALDataset::GetLayerByName(pszLayerNameIn);
 }
 
 /************************************************************************/
@@ -1215,8 +1196,8 @@ OGRLayer *OGRShapeDataSource::ExecuteSQL(const char *pszStatement,
         }
         CSLDestroy(papszTokens);
 
-        return OGRDataSource::ExecuteSQL(pszStatement, poSpatialFilter,
-                                         pszDialect);
+        return GDALDataset::ExecuteSQL(pszStatement, poSpatialFilter,
+                                       pszDialect);
     }
 
     /* -------------------------------------------------------------------- */
@@ -1292,7 +1273,7 @@ OGRErr OGRShapeDataSource::DeleteLayer(int iLayer)
         CPLError(CE_Failure, CPLE_NoWriteAccess,
                  "Data source %s opened read-only.  "
                  "Layer %d cannot be deleted.",
-                 pszName, iLayer);
+                 GetDescription(), iLayer);
 
         return OGRERR_FAILURE;
     }
@@ -1382,7 +1363,7 @@ char **OGRShapeDataSource::GetFileList()
 {
     if (m_bIsZip)
     {
-        return CSLAddString(nullptr, pszName);
+        return CSLAddString(nullptr, GetDescription());
     }
     CPLStringList oFileList;
     GetLayerCount();
@@ -1403,6 +1384,7 @@ void OGRShapeDataSource::RefreshLockFile(void *_self)
     OGRShapeDataSource *self = static_cast<OGRShapeDataSource *>(_self);
     CPLAssert(self->m_psLockFile);
     CPLAcquireMutex(self->m_poRefreshLockFileMutex, 1000);
+    self->m_bRefreshLockFileThreadStarted = true;
     CPLCondSignal(self->m_poRefreshLockFileCond);
     unsigned int nInc = 0;
     while (!(self->m_bExitRefreshLockFileThread))
@@ -1445,7 +1427,7 @@ void OGRShapeDataSource::RemoveLockFile()
     // Close and remove lock file
     VSIFCloseL(m_psLockFile);
     m_psLockFile = nullptr;
-    CPLString osLockFile(pszName);
+    CPLString osLockFile(GetDescription());
     osLockFile += ".gdal.lock";
     VSIUnlink(osLockFile);
 }
@@ -1463,20 +1445,22 @@ bool OGRShapeDataSource::UncompressIfNeeded()
 
     auto returnError = [this]()
     {
-        CPLError(CE_Failure, CPLE_AppDefined, "Cannot uncompress %s", pszName);
+        CPLError(CE_Failure, CPLE_AppDefined, "Cannot uncompress %s",
+                 GetDescription());
         return false;
     };
 
     if (nLayers > 1)
     {
-        CPLString osLockFile(pszName);
+        CPLString osLockFile(GetDescription());
         osLockFile += ".gdal.lock";
         VSIStatBufL sStat;
         if (VSIStatL(osLockFile, &sStat) == 0 &&
             sStat.st_mtime > time(nullptr) - 2 * knREFRESH_LOCK_FILE_DELAY_SEC)
         {
             CPLError(CE_Failure, CPLE_AppDefined,
-                     "Cannot edit %s. Another task is editing it", pszName);
+                     "Cannot edit %s. Another task is editing it",
+                     GetDescription());
             return false;
         }
         if (!m_poRefreshLockFileMutex)
@@ -1499,7 +1483,10 @@ bool OGRShapeDataSource::UncompressIfNeeded()
             return false;
         }
         m_psLockFile = f;
+        CPLAcquireMutex(m_poRefreshLockFileMutex, 1000);
         m_bExitRefreshLockFileThread = false;
+        m_bRefreshLockFileThreadStarted = false;
+        CPLReleaseMutex(m_poRefreshLockFileMutex);
         // Config option mostly for testing purposes
         // coverity[tainted_data]
         m_dfRefreshLockDelay = CPLAtof(CPLGetConfigOption(
@@ -1516,7 +1503,10 @@ bool OGRShapeDataSource::UncompressIfNeeded()
         else
         {
             CPLAcquireMutex(m_poRefreshLockFileMutex, 1000);
-            CPLCondWait(m_poRefreshLockFileCond, m_poRefreshLockFileMutex);
+            while (!m_bRefreshLockFileThreadStarted)
+            {
+                CPLCondWait(m_poRefreshLockFileCond, m_poRefreshLockFileMutex);
+            }
             CPLReleaseMutex(m_poRefreshLockFileMutex);
         }
     }
@@ -1539,7 +1529,7 @@ bool OGRShapeDataSource::UncompressIfNeeded()
         }
     }
 
-    CPLString osTemporaryDir(pszName);
+    CPLString osTemporaryDir(GetDescription());
     osTemporaryDir += "_tmp_uncompressed";
 
     const char *pszUseVsimem =
@@ -1549,7 +1539,7 @@ bool OGRShapeDataSource::UncompressIfNeeded()
          nTotalUncompressedSize <
              static_cast<GUIntBig>(CPLGetUsablePhysicalRAM() / 10)))
     {
-        osTemporaryDir = CPLSPrintf("/vsimem/_shapedriver/%p", this);
+        osTemporaryDir = VSIMemGenerateHiddenFilename("shapedriver");
     }
     CPLDebug("Shape", "Uncompressing to %s", osTemporaryDir.c_str());
 
@@ -1596,7 +1586,8 @@ bool OGRShapeDataSource::RecompressIfNeeded(
 
     auto returnError = [this]()
     {
-        CPLError(CE_Failure, CPLE_AppDefined, "Cannot recompress %s", pszName);
+        CPLError(CE_Failure, CPLE_AppDefined, "Cannot recompress %s",
+                 GetDescription());
         RemoveLockFile();
         return false;
     };
@@ -1698,7 +1689,7 @@ bool OGRShapeDataSource::RecompressIfNeeded(
         VSILFILE *fpTarget = nullptr;
         for (int i = 0; i < 10; i++)
         {
-            fpTarget = VSIFOpenL(pszName, "rb+");
+            fpTarget = VSIFOpenL(GetDescription(), "rb+");
             if (fpTarget)
                 break;
             CPLSleep(0.1);
@@ -1715,7 +1706,8 @@ bool OGRShapeDataSource::RecompressIfNeeded(
     }
     else
     {
-        if (VSIUnlink(pszName) != 0 || CPLMoveFile(pszName, osTmpZip) != 0)
+        if (VSIUnlink(GetDescription()) != 0 ||
+            CPLMoveFile(GetDescription(), osTmpZip) != 0)
         {
             return returnError();
         }
diff --git a/ogr/ogrsf_frmts/shape/ogrshapedriver.cpp b/ogr/ogrsf_frmts/shape/ogrshapedriver.cpp
index 1bd877924412..ef8a1b08ea61 100644
--- a/ogr/ogrsf_frmts/shape/ogrshapedriver.cpp
+++ b/ogr/ogrsf_frmts/shape/ogrshapedriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999,  Les Technologies SoftMap Inc.
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrshape.h"
diff --git a/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp b/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp
index 49a4c3177601..6681dd599618 100644
--- a/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp
+++ b/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp
@@ -8,29 +8,14 @@
  * Copyright (c) 1999,  Les Technologies SoftMap Inc.
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrshape.h"
 
 #include <cerrno>
 #include <limits>
+#include <cmath>
 #include <cstddef>
 #include <cstdio>
 #include <cstdlib>
@@ -1699,8 +1684,8 @@ OGRErr OGRShapeLayer::GetExtent(OGREnvelope *psExtent, int bForce)
     psExtent->MaxX = adMax[0];
     psExtent->MaxY = adMax[1];
 
-    if (CPLIsNan(adMin[0]) || CPLIsNan(adMin[1]) || CPLIsNan(adMax[0]) ||
-        CPLIsNan(adMax[1]))
+    if (std::isnan(adMin[0]) || std::isnan(adMin[1]) || std::isnan(adMax[0]) ||
+        std::isnan(adMax[1]))
     {
         CPLDebug("SHAPE", "Invalid extent in shape header");
 
@@ -1753,8 +1738,8 @@ OGRErr OGRShapeLayer::GetExtent3D(int, OGREnvelope3D *psExtent3D, int bForce)
         psExtent3D->MaxZ = -std::numeric_limits<double>::infinity();
     }
 
-    if (CPLIsNan(adMin[0]) || CPLIsNan(adMin[1]) || CPLIsNan(adMax[0]) ||
-        CPLIsNan(adMax[1]))
+    if (std::isnan(adMin[0]) || std::isnan(adMin[1]) || std::isnan(adMax[0]) ||
+        std::isnan(adMax[1]))
     {
         CPLDebug("SHAPE", "Invalid extent in shape header");
 
@@ -2808,66 +2793,44 @@ OGRErr OGRShapeLayer::Repack()
     /* -------------------------------------------------------------------- */
     /*      Build a list of records to be dropped.                          */
     /* -------------------------------------------------------------------- */
-    int *panRecordsToDelete = static_cast<int *>(CPLMalloc(sizeof(int) * 128));
-    int nDeleteCount = 0;
-    int nDeleteCountAlloc = 128;
+    std::vector<int> anRecordsToDelete;
     OGRErr eErr = OGRERR_NONE;
 
     CPLDebug("Shape", "REPACK: Checking if features have been deleted");
 
     if (hDBF != nullptr)
     {
-        for (int iShape = 0; iShape < nTotalShapeCount; iShape++)
+        try
         {
-            if (DBFIsRecordDeleted(hDBF, iShape))
+            for (int iShape = 0; iShape < nTotalShapeCount; iShape++)
             {
-                if (nDeleteCount == nDeleteCountAlloc)
+                if (DBFIsRecordDeleted(hDBF, iShape))
                 {
-                    const int nDeleteCountAllocNew =
-                        nDeleteCountAlloc + nDeleteCountAlloc / 3 + 32;
-                    if (nDeleteCountAlloc >= (INT_MAX - 32) / 4 * 3 ||
-                        nDeleteCountAllocNew >
-                            INT_MAX / static_cast<int>(sizeof(int)))
-                    {
-                        CPLError(CE_Failure, CPLE_AppDefined,
-                                 "Too many features to delete : %d",
-                                 nDeleteCount);
-                        CPLFree(panRecordsToDelete);
-                        return OGRERR_FAILURE;
-                    }
-                    nDeleteCountAlloc = nDeleteCountAllocNew;
-                    int *panRecordsToDeleteNew = static_cast<int *>(
-                        VSI_REALLOC_VERBOSE(panRecordsToDelete,
-                                            nDeleteCountAlloc * sizeof(int)));
-                    if (panRecordsToDeleteNew == nullptr)
-                    {
-                        CPLFree(panRecordsToDelete);
-                        return OGRERR_FAILURE;
-                    }
-                    panRecordsToDelete = panRecordsToDeleteNew;
+                    anRecordsToDelete.push_back(iShape);
+                }
+                if (VSIFEofL(VSI_SHP_GetVSIL(hDBF->fp)) ||
+                    VSIFErrorL(VSI_SHP_GetVSIL(hDBF->fp)))
+                {
+                    return OGRERR_FAILURE;  // I/O error.
                 }
-                panRecordsToDelete[nDeleteCount++] = iShape;
-            }
-            if (VSIFEofL(VSI_SHP_GetVSIL(hDBF->fp)) ||
-                VSIFErrorL(VSI_SHP_GetVSIL(hDBF->fp)))
-            {
-                CPLFree(panRecordsToDelete);
-                return OGRERR_FAILURE;  // I/O error.
             }
         }
+        catch (const std::bad_alloc &)
+        {
+            CPLError(CE_Failure, CPLE_OutOfMemory, "Out of memory in Repack()");
+            return OGRERR_FAILURE;
+        }
     }
 
     /* -------------------------------------------------------------------- */
     /*      If there are no records marked for deletion, we take no         */
     /*      action.                                                         */
     /* -------------------------------------------------------------------- */
-    if (nDeleteCount == 0 && !bSHPNeedsRepack)
+    if (anRecordsToDelete.empty() && !bSHPNeedsRepack)
     {
         CPLDebug("Shape", "REPACK: nothing to do");
-        CPLFree(panRecordsToDelete);
         return OGRERR_NONE;
     }
-    panRecordsToDelete[nDeleteCount] = -1;
 
     /* -------------------------------------------------------------------- */
     /*      Find existing filenames with exact case (see #3293).            */
@@ -2920,7 +2883,6 @@ OGRErr OGRShapeLayer::Repack()
                  "Cannot find the filename of the DBF file, but we managed to "
                  "open it before !");
         // Should not happen, really.
-        CPLFree(panRecordsToDelete);
         return OGRERR_FAILURE;
     }
 
@@ -2930,7 +2892,6 @@ OGRErr OGRShapeLayer::Repack()
                  "Cannot find the filename of the SHP file, but we managed to "
                  "open it before !");
         // Should not happen, really.
-        CPLFree(panRecordsToDelete);
         return OGRERR_FAILURE;
     }
 
@@ -2940,7 +2901,6 @@ OGRErr OGRShapeLayer::Repack()
                  "Cannot find the filename of the SHX file, but we managed to "
                  "open it before !");
         // Should not happen, really.
-        CPLFree(panRecordsToDelete);
         return OGRERR_FAILURE;
     }
 
@@ -2956,9 +2916,10 @@ OGRErr OGRShapeLayer::Repack()
     /* -------------------------------------------------------------------- */
     bool bMustReopenDBF = false;
     CPLString oTempFileDBF;
-    const int nNewRecords = nTotalShapeCount - nDeleteCount;
+    const int nNewRecords =
+        nTotalShapeCount - static_cast<int>(anRecordsToDelete.size());
 
-    if (hDBF != nullptr && nDeleteCount > 0)
+    if (hDBF != nullptr && !anRecordsToDelete.empty())
     {
         CPLDebug("Shape", "REPACK: repacking .dbf");
         bMustReopenDBF = true;
@@ -2969,8 +2930,6 @@ OGRErr OGRShapeLayer::Repack()
         DBFHandle hNewDBF = DBFCloneEmpty(hDBF, oTempFileDBF);
         if (hNewDBF == nullptr)
         {
-            CPLFree(panRecordsToDelete);
-
             CPLError(CE_Failure, CPLE_OpenFailed,
                      "Failed to create temp file %s.", oTempFileDBF.c_str());
             return OGRERR_FAILURE;
@@ -2991,12 +2950,13 @@ OGRErr OGRShapeLayer::Repack()
         /* --------------------------------------------------------------------
          */
         int iDestShape = 0;
-        int iNextDeletedShape = 0;
+        size_t iNextDeletedShape = 0;
 
         for (int iShape = 0; iShape < nTotalShapeCount && eErr == OGRERR_NONE;
              iShape++)
         {
-            if (panRecordsToDelete[iNextDeletedShape] == iShape)
+            if (iNextDeletedShape < anRecordsToDelete.size() &&
+                anRecordsToDelete[iNextDeletedShape] == iShape)
             {
                 iNextDeletedShape++;
             }
@@ -3017,7 +2977,6 @@ OGRErr OGRShapeLayer::Repack()
 
         if (eErr != OGRERR_NONE)
         {
-            CPLFree(panRecordsToDelete);
             VSIUnlink(oTempFileDBF);
             return eErr;
         }
@@ -3059,7 +3018,6 @@ OGRErr OGRShapeLayer::Repack()
         SHPHandle hNewSHP = SHPCreate(oTempFileSHP, hSHP->nShapeType);
         if (hNewSHP == nullptr)
         {
-            CPLFree(panRecordsToDelete);
             if (!oTempFileDBF.empty())
                 VSIUnlink(oTempFileDBF);
             return OGRERR_FAILURE;
@@ -3070,12 +3028,13 @@ OGRErr OGRShapeLayer::Repack()
         /*      Copy over all records that are not deleted. */
         /* --------------------------------------------------------------------
          */
-        int iNextDeletedShape = 0;
+        size_t iNextDeletedShape = 0;
 
         for (int iShape = 0; iShape < nTotalShapeCount && eErr == OGRERR_NONE;
              iShape++)
         {
-            if (panRecordsToDelete[iNextDeletedShape] == iShape)
+            if (iNextDeletedShape < anRecordsToDelete.size() &&
+                anRecordsToDelete[iNextDeletedShape] == iShape)
             {
                 iNextDeletedShape++;
             }
@@ -3125,7 +3084,6 @@ OGRErr OGRShapeLayer::Repack()
 
         if (eErr != OGRERR_NONE)
         {
-            CPLFree(panRecordsToDelete);
             VSIUnlink(oTempFileSHP);
             VSIUnlink(oTempFileSHX);
             if (!oTempFileDBF.empty())
@@ -3136,9 +3094,6 @@ OGRErr OGRShapeLayer::Repack()
         }
     }
 
-    CPLFree(panRecordsToDelete);
-    panRecordsToDelete = nullptr;
-
     // We could also use pack in place for Unix but this involves extra I/O
     // w.r.t to the delete and rename approach
 
diff --git a/ogr/ogrsf_frmts/shape/sbnsearch.c b/ogr/ogrsf_frmts/shape/sbnsearch.c
index d036b1bbfb18..e5766a4d3492 100644
--- a/ogr/ogrsf_frmts/shape/sbnsearch.c
+++ b/ogr/ogrsf_frmts/shape/sbnsearch.c
@@ -5,7 +5,7 @@
  * Author:   Even Rouault, even dot rouault at spatialys.com
  *
  ******************************************************************************
- * Copyright (c) 2012-2014, Even Rouault <even dot rouault at spatialys.com>
+ * Copyright (c) 2012-2024, Even Rouault <even dot rouault at spatialys.com>
  *
  * SPDX-License-Identifier: MIT OR LGPL-2.0-or-later
  ******************************************************************************/
diff --git a/ogr/ogrsf_frmts/shape/shape2ogr.cpp b/ogr/ogrsf_frmts/shape/shape2ogr.cpp
index 457ce1711fc9..05316df99cc9 100644
--- a/ogr/ogrsf_frmts/shape/shape2ogr.cpp
+++ b/ogr/ogrsf_frmts/shape/shape2ogr.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 1999,  Les Technologies SoftMap Inc.
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -1734,7 +1718,7 @@ OGRErr SHPWriteOGRFeature(SHPHandle hSHP, DBFHandle hDBF,
                     if (nCounter <= 10)
                     {
                         CPLError(CE_Warning, CPLE_AppDefined,
-                                 "Value %.18g of field %s with 0 decimal of "
+                                 "Value %.17g of field %s with 0 decimal of "
                                  "feature " CPL_FRMT_GIB
                                  " is bigger than 2^53. "
                                  "Precision loss likely occurred or going to "
@@ -1752,7 +1736,7 @@ OGRErr SHPWriteOGRFeature(SHPHandle hSHP, DBFHandle hDBF,
                 if (!ret)
                 {
                     CPLError(CE_Warning, CPLE_AppDefined,
-                             "Value %.18g of field %s of feature " CPL_FRMT_GIB
+                             "Value %.17g of field %s of feature " CPL_FRMT_GIB
                              " not "
                              "successfully written. Possibly due to too larger "
                              "number "
diff --git a/ogr/ogrsf_frmts/shape/shapefil.h b/ogr/ogrsf_frmts/shape/shapefil.h
index e1832fae1b45..061980e8391c 100644
--- a/ogr/ogrsf_frmts/shape/shapefil.h
+++ b/ogr/ogrsf_frmts/shape/shapefil.h
@@ -9,7 +9,7 @@
  *
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
- * Copyright (c) 2012-2016, Even Rouault <even dot rouault at spatialys.com>
+ * Copyright (c) 2012-2024, Even Rouault <even dot rouault at spatialys.com>
  *
  * SPDX-License-Identifier: MIT OR LGPL-2.0-or-later
  ******************************************************************************
@@ -231,7 +231,7 @@ extern "C"
 #define SHPP_RING 5
 
     /* -------------------------------------------------------------------- */
-    /*      SHPObject - represents on shape (without attributes) read       */
+    /*      SHPObject - represents one shape (without attributes) read      */
     /*      from the .shp file.                                             */
     /* -------------------------------------------------------------------- */
     struct tagSHPObject
@@ -419,7 +419,7 @@ extern "C"
     /************************************************************************/
     /*                             DBF Support.                             */
     /************************************************************************/
-    typedef struct
+    typedef struct DBFInfo
     {
         SAHooks sHooks;
 
@@ -467,7 +467,7 @@ extern "C"
         int bRequireNextWriteSeek;
     } DBFInfo;
 
-    typedef DBFInfo *DBFHandle;
+    typedef struct DBFInfo *DBFHandle;
 
     typedef enum
     {
diff --git a/ogr/ogrsf_frmts/shape/shp_vsi.c b/ogr/ogrsf_frmts/shape/shp_vsi.c
index 1185145417e6..d36254d5ee3d 100644
--- a/ogr/ogrsf_frmts/shape/shp_vsi.c
+++ b/ogr/ogrsf_frmts/shape/shp_vsi.c
@@ -9,23 +9,7 @@
  * Copyright (c) 2007,  Frank Warmerdam
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "shp_vsi.h"
@@ -34,6 +18,8 @@
 #include "cpl_vsi_error.h"
 #include <limits.h>
 
+#include "shapefil_private.h"
+
 typedef struct
 {
     VSILFILE *fp;
@@ -43,26 +29,6 @@ typedef struct
     SAOffset nCurOffset;
 } OGRSHPDBFFile;
 
-/************************************************************************/
-/*                         VSI_SHP_GetVSIL()                            */
-/************************************************************************/
-
-VSILFILE *VSI_SHP_GetVSIL(SAFile file)
-{
-    OGRSHPDBFFile *pFile = (OGRSHPDBFFile *)file;
-    return pFile->fp;
-}
-
-/************************************************************************/
-/*                        VSI_SHP_GetFilename()                         */
-/************************************************************************/
-
-const char *VSI_SHP_GetFilename(SAFile file)
-{
-    OGRSHPDBFFile *pFile = (OGRSHPDBFFile *)file;
-    return pFile->pszFilename;
-}
-
 /************************************************************************/
 /*                         VSI_SHP_OpenInternal()                       */
 /************************************************************************/
@@ -73,8 +39,8 @@ static SAFile VSI_SHP_OpenInternal(const char *pszFilename,
 {
     OGRSHPDBFFile *pFile;
     VSILFILE *fp = VSIFOpenExL(pszFilename, pszAccess, TRUE);
-    if (fp == NULL)
-        return NULL;
+    if (fp == SHPLIB_NULLPTR)
+        return SHPLIB_NULLPTR;
     pFile = (OGRSHPDBFFile *)CPLCalloc(1, sizeof(OGRSHPDBFFile));
     pFile->fp = fp;
     pFile->pszFilename = CPLStrdup(pszFilename);
@@ -95,18 +61,6 @@ static SAFile VSI_SHP_Open(const char *pszFilename, const char *pszAccess,
     return VSI_SHP_OpenInternal(pszFilename, pszAccess, FALSE);
 }
 
-/************************************************************************/
-/*                        VSI_SHP_Open2GBLimit()                        */
-/************************************************************************/
-
-static SAFile VSI_SHP_Open2GBLimit(const char *pszFilename,
-                                   const char *pszAccess, void *userData)
-
-{
-    (void)userData;
-    return VSI_SHP_OpenInternal(pszFilename, pszAccess, TRUE);
-}
-
 /************************************************************************/
 /*                            VSI_SHP_Read()                            */
 /************************************************************************/
@@ -259,7 +213,41 @@ void SASetupDefaultHooks(SAHooks *psHooks)
 
     psHooks->Error = VSI_SHP_Error;
     psHooks->Atof = CPLAtof;
-    psHooks->pvUserData = NULL;
+    psHooks->pvUserData = SHPLIB_NULLPTR;
+}
+
+#ifndef SHP_VSI_ONLY_SETUP_HOOKS
+
+/************************************************************************/
+/*                         VSI_SHP_GetVSIL()                            */
+/************************************************************************/
+
+VSILFILE *VSI_SHP_GetVSIL(SAFile file)
+{
+    OGRSHPDBFFile *pFile = (OGRSHPDBFFile *)file;
+    return pFile->fp;
+}
+
+/************************************************************************/
+/*                        VSI_SHP_GetFilename()                         */
+/************************************************************************/
+
+const char *VSI_SHP_GetFilename(SAFile file)
+{
+    OGRSHPDBFFile *pFile = (OGRSHPDBFFile *)file;
+    return pFile->pszFilename;
+}
+
+/************************************************************************/
+/*                        VSI_SHP_Open2GBLimit()                        */
+/************************************************************************/
+
+static SAFile VSI_SHP_Open2GBLimit(const char *pszFilename,
+                                   const char *pszAccess, void *userData)
+
+{
+    (void)userData;
+    return VSI_SHP_OpenInternal(pszFilename, pszAccess, TRUE);
 }
 
 /************************************************************************/
@@ -280,3 +268,5 @@ const SAHooks *VSI_SHP_GetHook(int b2GBLimit)
 {
     return (b2GBLimit) ? &sOGRHook2GBLimit : &sOGRHook;
 }
+
+#endif
diff --git a/ogr/ogrsf_frmts/shape/shp_vsi.h b/ogr/ogrsf_frmts/shape/shp_vsi.h
index 2b3bea5a8ef3..9758cf88d4d5 100644
--- a/ogr/ogrsf_frmts/shape/shp_vsi.h
+++ b/ogr/ogrsf_frmts/shape/shp_vsi.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2007,  Frank Warmerdam
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef SHP_VSI_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/shape/shpopen.c b/ogr/ogrsf_frmts/shape/shpopen.c
index a32e7cb224c2..014e15770c67 100644
--- a/ogr/ogrsf_frmts/shape/shpopen.c
+++ b/ogr/ogrsf_frmts/shape/shpopen.c
@@ -6,7 +6,7 @@
  *
  ******************************************************************************
  * Copyright (c) 1999, 2001, Frank Warmerdam
- * Copyright (c) 2011-2019, Even Rouault <even dot rouault at spatialys.com>
+ * Copyright (c) 2011-2024, Even Rouault <even dot rouault at spatialys.com>
  *
  * SPDX-License-Identifier: MIT OR LGPL-2.0-or-later
  ******************************************************************************/
diff --git a/ogr/ogrsf_frmts/shape/shptree.c b/ogr/ogrsf_frmts/shape/shptree.c
index dfbc5ec93591..ef89e00a8a79 100644
--- a/ogr/ogrsf_frmts/shape/shptree.c
+++ b/ogr/ogrsf_frmts/shape/shptree.c
@@ -6,7 +6,7 @@
  *
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
- * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.com>
+ * Copyright (c) 2012-2024, Even Rouault <even dot rouault at spatialys.com>
  *
  * SPDX-License-Identifier: MIT OR LGPL-2.0-or-later
  ******************************************************************************
diff --git a/ogr/ogrsf_frmts/sosi/fyba_melding.cpp b/ogr/ogrsf_frmts/sosi/fyba_melding.cpp
index 4a904a87aeaf..1f69329f961b 100644
--- a/ogr/ogrsf_frmts/sosi/fyba_melding.cpp
+++ b/ogr/ogrsf_frmts/sosi/fyba_melding.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2010, Thomas Hirsch
  * Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <windows.h>
diff --git a/ogr/ogrsf_frmts/sosi/ogr_sosi.h b/ogr/ogrsf_frmts/sosi/ogr_sosi.h
index 4193cda3a2a0..dac91a77bc5a 100644
--- a/ogr/ogrsf_frmts/sosi/ogr_sosi.h
+++ b/ogr/ogrsf_frmts/sosi/ogr_sosi.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2010, Thomas Hirsch
  * Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_SOSI_H_INCLUDED
@@ -88,9 +72,8 @@ class OGRSOSILayer final : public OGRLayer
  * OGRSOSIDataSource reads a SOSI file, prebuilds the features, and     *
  * creates one OGRSOSILayer per geometry type                           *
  ************************************************************************/
-class OGRSOSIDataSource final : public OGRDataSource
+class OGRSOSIDataSource final : public GDALDataset
 {
-    char *pszName;
     OGRSOSILayer **papoLayers;
     int nLayers;
 
@@ -127,11 +110,6 @@ class OGRSOSIDataSource final : public OGRDataSource
 #ifdef WRITE_SUPPORT
     int Create(const char *pszFilename);
 #endif
-    const char *GetName() override
-    {
-        return pszName;
-    }
-
     int GetLayerCount() override
     {
         return nLayers;
@@ -144,7 +122,6 @@ class OGRSOSIDataSource final : public OGRDataSource
                            OGRwkbGeometryType eGType = wkbUnknown,
                            char **papszOptions = NULL) override;
 #endif
-    int TestCapability(const char *) override;
 };
 
 /************************************************************************
diff --git a/ogr/ogrsf_frmts/sosi/ogrsosidatasource.cpp b/ogr/ogrsf_frmts/sosi/ogrsosidatasource.cpp
index 36b395f3ec5c..cc05088e22c5 100644
--- a/ogr/ogrsf_frmts/sosi/ogrsosidatasource.cpp
+++ b/ogr/ogrsf_frmts/sosi/ogrsosidatasource.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2010, Thomas Hirsch
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_sosi.h"
@@ -161,7 +145,6 @@ OGRSOSIDataSource::OGRSOSIDataSource()
     poBaseadm = nullptr;
     papoBuiltGeometries = nullptr;
     papoLayers = nullptr;
-    pszName = nullptr;
     poSRS = nullptr;
 
     poPolyHeaders = nullptr;
@@ -232,8 +215,6 @@ OGRSOSIDataSource::~OGRSOSIDataSource()
 
     if (poSRS != nullptr)
         poSRS->Release();
-    if (pszName != nullptr)
-        CPLFree(pszName);
 }
 
 static OGRFeatureDefn *defineLayer(const char *szName,
@@ -271,7 +252,6 @@ int OGRSOSIDataSource::Open(const char *pszFilename, int bUpdate)
     papoBuiltGeometries = nullptr;
     poFileadm = nullptr;
     poBaseadm = nullptr;
-    char *pszPos;
 
     if (bUpdate)
     {
@@ -285,18 +265,16 @@ int OGRSOSIDataSource::Open(const char *pszFilename, int bUpdate)
     if (VSIStat(pszFilename, &sStat) != 0)
         return FALSE;
 
-    pszName = CPLStrdup(pszFilename);
+    std::string osName(pszFilename);
     /* We ignore any layer parameters for now. */
-    pszPos = strchr(pszName, ',');
-    if (pszPos != nullptr)
-    {
-        pszPos[0] = '\0';
-    }
+    const auto nPos = osName.find(',');
+    if (nPos != std::string::npos)
+        osName.resize(nPos);
 
     /* Confirm that we are dealing with a SOSI file. Used also by data
      * format auto-detection in some ogr utilities. */
     UT_INT64 nEnd = 0;
-    int bIsSosi = HO_TestSOSI(pszName, &nEnd);
+    int bIsSosi = HO_TestSOSI(osName.c_str(), &nEnd);
     if (bIsSosi == UT_FALSE)
     {
         return FALSE; /* No error message: This is used by file format
@@ -307,15 +285,15 @@ int OGRSOSIDataSource::Open(const char *pszFilename, int bUpdate)
 
     /* open index base and sosi file */
     poBaseadm = LC_OpenBase(LC_BASE);
-    nStatus = LC_OpenSos(pszName, LC_BASE_FRAMGR, LC_GML_IDX, LC_INGEN_STATUS,
-                         &poFileadm, &nDetStatus);
+    nStatus = LC_OpenSos(osName.c_str(), LC_BASE_FRAMGR, LC_GML_IDX,
+                         LC_INGEN_STATUS, &poFileadm, &nDetStatus);
     if (nStatus == UT_FALSE)
     {
         char *pszErrorMessage;
         LC_StrError(nDetStatus, &pszErrorMessage);
         CPLError(CE_Failure, CPLE_OpenFailed,
-                 "File %s could not be opened by SOSI Driver: %s", pszName,
-                 pszErrorMessage);
+                 "File %s could not be opened by SOSI Driver: %s",
+                 osName.c_str(), pszErrorMessage);
         return FALSE;
     }
 
@@ -864,18 +842,3 @@ void OGRSOSIDataSource::buildOGRPoint(long iSerial)
     LC_GetTK(1, &dfEast, &dfNorth);
     papoBuiltGeometries[iSerial] = new OGRPoint(dfEast, dfNorth);
 }
-
-/************************************************************************/
-/*                              TestCapability()                        */
-/************************************************************************/
-
-int OGRSOSIDataSource::TestCapability(CPL_UNUSED const char *pszCap)
-{
-#ifdef WRITE_SUPPORT
-    if (strcmp("CreateLayer", pszCap) == 0)
-    {
-        return TRUE;
-    }
-#endif
-    return FALSE;
-}
diff --git a/ogr/ogrsf_frmts/sosi/ogrsosidriver.cpp b/ogr/ogrsf_frmts/sosi/ogrsosidriver.cpp
index 045ced8f7c78..517e10e9e7a7 100644
--- a/ogr/ogrsf_frmts/sosi/ogrsosidriver.cpp
+++ b/ogr/ogrsf_frmts/sosi/ogrsosidriver.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2010, Thomas Hirsch
  * Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 // Must be included before FYBA headers that mess with min() / max()
diff --git a/ogr/ogrsf_frmts/sosi/ogrsosidrivercore.cpp b/ogr/ogrsf_frmts/sosi/ogrsosidrivercore.cpp
index f0f1f3287ec0..89d45a043108 100644
--- a/ogr/ogrsf_frmts/sosi/ogrsosidrivercore.cpp
+++ b/ogr/ogrsf_frmts/sosi/ogrsosidrivercore.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2010, Thomas Hirsch
  * Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
diff --git a/ogr/ogrsf_frmts/sosi/ogrsosidrivercore.h b/ogr/ogrsf_frmts/sosi/ogrsosidrivercore.h
index 37c84fde873a..c6c8969960f4 100644
--- a/ogr/ogrsf_frmts/sosi/ogrsosidrivercore.h
+++ b/ogr/ogrsf_frmts/sosi/ogrsosidrivercore.h
@@ -8,23 +8,7 @@
  * Copyright (c) 2010, Thomas Hirsch
  * Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRSOSIDRIVERCORE_H
diff --git a/ogr/ogrsf_frmts/sosi/ogrsosilayer.cpp b/ogr/ogrsf_frmts/sosi/ogrsosilayer.cpp
index 5a3f58b7c2e0..5f1c578ce7c6 100644
--- a/ogr/ogrsf_frmts/sosi/ogrsosilayer.cpp
+++ b/ogr/ogrsf_frmts/sosi/ogrsosilayer.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2010, Thomas Hirsch
  * Copyright (c) 2010-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_sosi.h"
diff --git a/ogr/ogrsf_frmts/sqlite/CMakeLists.txt b/ogr/ogrsf_frmts/sqlite/CMakeLists.txt
index 14f9f6af311e..1e46967b3267 100644
--- a/ogr/ogrsf_frmts/sqlite/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/sqlite/CMakeLists.txt
@@ -22,6 +22,7 @@ add_gdal_driver(
           rasterlite2_header.h
           rasterlite2.cpp
           sqlite_rtree_bulk_load/wrapper.cpp
+   STRONG_CXX_WFLAGS
 )
 gdal_standard_includes(ogr_SQLite)
 
diff --git a/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h b/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h
index 3e869119a66e..a13bfd39aee3 100644
--- a/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h
+++ b/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_SQLITE_H_INCLUDED
@@ -172,6 +156,8 @@ class OGRSQLiteLayer CPL_NON_FINAL : public OGRLayer,
                                                 bool bUseComprGeom,
                                                 GByte *pabyData);
 
+    CPL_DISALLOW_COPY_ASSIGN(OGRSQLiteLayer)
+
   protected:
     OGRSQLiteFeatureDefn *m_poFeatureDefn = nullptr;
 
@@ -355,6 +341,8 @@ class OGRSQLiteTableLayer final : public OGRSQLiteLayer
     OGRErr RunAddGeometryColumn(const OGRSQLiteGeomFieldDefn *poGeomField,
                                 bool bAddColumnsForNonSpatialite);
 
+    CPL_DISALLOW_COPY_ASSIGN(OGRSQLiteTableLayer)
+
   public:
     explicit OGRSQLiteTableLayer(OGRSQLiteDataSource *);
     virtual ~OGRSQLiteTableLayer();
@@ -489,6 +477,8 @@ class OGRSQLiteViewLayer final : public OGRSQLiteLayer
 
     CPLErr EstablishFeatureDefn();
 
+    CPL_DISALLOW_COPY_ASSIGN(OGRSQLiteViewLayer)
+
   public:
     explicit OGRSQLiteViewLayer(OGRSQLiteDataSource *);
     virtual ~OGRSQLiteViewLayer();
@@ -675,8 +665,7 @@ class OGR2SQLITEModule;
 
 class OGRSQLiteDataSource final : public OGRSQLiteBaseDataSource
 {
-    OGRSQLiteLayer **m_papoLayers = nullptr;
-    int m_nLayers = 0;
+    std::vector<std::unique_ptr<OGRSQLiteLayer>> m_apoLayers{};
 
     // We maintain a list of known SRID to reduce the number of trips to
     // the database to get SRSes.
@@ -710,7 +699,7 @@ class OGRSQLiteDataSource final : public OGRSQLiteBaseDataSource
 
     void SaveStatistics();
 
-    std::vector<OGRLayer *> m_apoInvisibleLayers{};
+    std::vector<std::unique_ptr<OGRLayer>> m_apoInvisibleLayers{};
 
 #ifdef HAVE_RASTERLITE2
     void *m_hRL2Ctxt = nullptr;
@@ -745,6 +734,8 @@ class OGRSQLiteDataSource final : public OGRSQLiteBaseDataSource
 
     void PostInitSpatialite();
 
+    CPL_DISALLOW_COPY_ASSIGN(OGRSQLiteDataSource)
+
   public:
     OGRSQLiteDataSource();
     virtual ~OGRSQLiteDataSource();
@@ -760,7 +751,7 @@ class OGRSQLiteDataSource final : public OGRSQLiteBaseDataSource
 
     virtual int GetLayerCount() override
     {
-        return m_nLayers;
+        return static_cast<int>(m_apoLayers.size());
     }
 
     virtual OGRLayer *GetLayer(int) override;
@@ -784,6 +775,7 @@ class OGRSQLiteDataSource final : public OGRSQLiteBaseDataSource
 
     virtual CPLErr FlushCache(bool bAtClosing) override;
 
+    virtual OGRErr StartTransaction(int bForce = FALSE) override;
     virtual OGRErr CommitTransaction() override;
     virtual OGRErr RollbackTransaction() override;
 
@@ -894,10 +886,12 @@ class OGRSQLiteDataSource final : public OGRSQLiteBaseDataSource
 
 class RL2RasterBand final : public GDALPamRasterBand
 {
-    bool m_bHasNoData;
-    double m_dfNoDataValue;
-    GDALColorInterp m_eColorInterp;
-    GDALColorTable *m_poCT;
+    bool m_bHasNoData = false;
+    double m_dfNoDataValue = 0;
+    GDALColorInterp m_eColorInterp = GCI_Undefined;
+    GDALColorTable *m_poCT = nullptr;
+
+    CPL_DISALLOW_COPY_ASSIGN(RL2RasterBand)
 
   public:
     RL2RasterBand(int nBandIn, int nPixelType, GDALDataType eDT, int nBits,
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqliteapiroutines.c b/ogr/ogrsf_frmts/sqlite/ogrsqliteapiroutines.c
index 89af07539edd..92a047750c1c 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqliteapiroutines.c
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqliteapiroutines.c
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqlitebase.h b/ogr/ogrsf_frmts/sqlite/ogrsqlitebase.h
index eb5eec07aa24..0f2defef6295 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitebase.h
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitebase.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2021, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_SQLITE_BASE_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
index f936fa05ebfb..5a0d6a295dd7 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
@@ -15,23 +15,7 @@
  * Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -47,6 +31,7 @@
 #include <cstring>
 #include <sys/stat.h>
 #include <map>
+#include <mutex>
 #include <set>
 #include <sstream>
 #include <string>
@@ -87,7 +72,7 @@
 #endif
 
 #undef SQLITE_STATIC
-#define SQLITE_STATIC ((sqlite3_destructor_type) nullptr)
+#define SQLITE_STATIC (static_cast<sqlite3_destructor_type>(nullptr))
 
 // Keep in sync prototype of those 2 functions between gdalopeninfo.cpp,
 // ogrsqlitedatasource.cpp and ogrgeopackagedatasource.cpp
@@ -201,7 +186,16 @@ void OGRSQLiteBaseDataSource::FinishSpatialite()
 {
     if (hSpatialiteCtxt != nullptr)
     {
-        pfn_spatialite_cleanup_ex(hSpatialiteCtxt);
+        auto ctxt = hSpatialiteCtxt;
+        {
+            // Current implementation of spatialite_cleanup_ex() (as of libspatialite 5.1)
+            // is not re-entrant due to the use of xmlCleanupParser()
+            // Cf https://groups.google.com/g/spatialite-users/c/tsfZ_GDrRKs/m/aj-Dt4xoBQAJ?utm_medium=email&utm_source=footer
+            static std::mutex oCleanupMutex;
+            std::lock_guard oLock(oCleanupMutex);
+            pfn_spatialite_cleanup_ex(ctxt);
+        }
+        // coverity[thread1_overwrites_value_in_field]
         hSpatialiteCtxt = nullptr;
     }
 }
@@ -304,9 +298,8 @@ bool OGRSQLiteDataSource::AddRelationship(
     {
         const std::set<std::string> uniqueBaseFieldsUC =
             SQLGetUniqueFieldUCConstraints(GetDB(), osLeftTableName.c_str());
-        if (uniqueBaseFieldsUC.find(
-                CPLString(aosLeftTableFields[0]).toupper()) !=
-            uniqueBaseFieldsUC.end())
+        if (cpl::contains(uniqueBaseFieldsUC,
+                          CPLString(aosLeftTableFields[0]).toupper()))
         {
             bBaseKeyIsUnique = true;
         }
@@ -470,13 +463,12 @@ bool OGRSQLiteDataSource::ValidateRelationship(
     }
 
     // ensure relationship is different from existing relationships
-    for (auto it = m_osMapRelationships.begin();
-         it != m_osMapRelationships.end(); ++it)
+    for (const auto &kv : m_osMapRelationships)
     {
-        if (osLeftTableName == it->second->GetLeftTableName() &&
-            osRightTableName == it->second->GetRightTableName() &&
-            aosLeftTableFields == it->second->GetLeftTableFields() &&
-            aosRightTableFields == it->second->GetRightTableFields())
+        if (osLeftTableName == kv.second->GetLeftTableName() &&
+            osRightTableName == kv.second->GetRightTableName() &&
+            aosLeftTableFields == kv.second->GetLeftTableFields() &&
+            aosRightTableFields == kv.second->GetRightTableFields())
         {
             failureReason =
                 "A relationship between these tables and fields already exists";
@@ -760,7 +752,7 @@ void OGRSQLiteBaseDataSource::LoadRelationshipsFromForeignKeys(
             }
             const std::string osRelationName = stream.str();
 
-            auto it = m_osMapRelationships.find(osRelationName);
+            const auto it = m_osMapRelationships.find(osRelationName);
             if (it != m_osMapRelationships.end())
             {
                 // already have a relationship with this name -- that means that
@@ -814,10 +806,9 @@ std::vector<std::string> OGRSQLiteBaseDataSource::GetRelationshipNames(
 
     std::vector<std::string> oasNames;
     oasNames.reserve(m_osMapRelationships.size());
-    for (auto it = m_osMapRelationships.begin();
-         it != m_osMapRelationships.end(); ++it)
+    for (const auto &kv : m_osMapRelationships)
     {
-        oasNames.emplace_back(it->first);
+        oasNames.emplace_back(kv.first);
     }
     return oasNames;
 }
@@ -835,7 +826,7 @@ OGRSQLiteBaseDataSource::GetRelationship(const std::string &name) const
         LoadRelationships();
     }
 
-    auto it = m_osMapRelationships.find(name);
+    const auto it = m_osMapRelationships.find(name);
     if (it == m_osMapRelationships.end())
         return nullptr;
 
@@ -907,25 +898,25 @@ CPLErr OGRSQLiteDataSource::Close()
             delete m_apoOverviewDS[i];
         }
 
-        if (m_nLayers > 0 || !m_apoInvisibleLayers.empty())
+        if (!m_apoLayers.empty() || !m_apoInvisibleLayers.empty())
         {
             // Close any remaining iterator
-            for (int i = 0; i < m_nLayers; i++)
-                m_papoLayers[i]->ResetReading();
-            for (size_t i = 0; i < m_apoInvisibleLayers.size(); i++)
-                m_apoInvisibleLayers[i]->ResetReading();
+            for (auto &poLayer : m_apoLayers)
+                poLayer->ResetReading();
+            for (auto &poLayer : m_apoInvisibleLayers)
+                poLayer->ResetReading();
 
             // Create spatial indices in a transaction for faster execution
             if (hDB)
                 SoftStartTransaction();
-            for (int iLayer = 0; iLayer < m_nLayers; iLayer++)
+            for (auto &poLayer : m_apoLayers)
             {
-                if (m_papoLayers[iLayer]->IsTableLayer())
+                if (poLayer->IsTableLayer())
                 {
-                    OGRSQLiteTableLayer *poLayer =
-                        (OGRSQLiteTableLayer *)m_papoLayers[iLayer];
-                    poLayer->RunDeferredCreationIfNecessary();
-                    poLayer->CreateSpatialIndexIfNecessary();
+                    OGRSQLiteTableLayer *poTableLayer =
+                        cpl::down_cast<OGRSQLiteTableLayer *>(poLayer.get());
+                    poTableLayer->RunDeferredCreationIfNecessary();
+                    poTableLayer->CreateSpatialIndexIfNecessary();
                 }
             }
             if (hDB)
@@ -934,12 +925,8 @@ CPLErr OGRSQLiteDataSource::Close()
 
         SaveStatistics();
 
-        for (int i = 0; i < m_nLayers; i++)
-            delete m_papoLayers[i];
-        for (size_t i = 0; i < m_apoInvisibleLayers.size(); i++)
-            delete m_apoInvisibleLayers[i];
-
-        CPLFree(m_papoLayers);
+        m_apoLayers.clear();
+        m_apoInvisibleLayers.clear();
 
         m_oSRSCache.clear();
 
@@ -999,13 +986,13 @@ void OGRSQLiteDataSource::SaveStatistics()
 
     int nSavedAllLayersCacheData = -1;
 
-    for (int i = 0; i < m_nLayers; i++)
+    for (auto &poLayer : m_apoLayers)
     {
-        if (m_papoLayers[i]->IsTableLayer())
+        if (poLayer->IsTableLayer())
         {
-            OGRSQLiteTableLayer *poLayer =
-                (OGRSQLiteTableLayer *)m_papoLayers[i];
-            int nSaveRet = poLayer->SaveStatistics();
+            OGRSQLiteTableLayer *poTableLayer =
+                cpl::down_cast<OGRSQLiteTableLayer *>(poLayer.get());
+            int nSaveRet = poTableLayer->SaveStatistics();
             if (nSaveRet >= 0)
             {
                 if (nSavedAllLayersCacheData < 0)
@@ -1218,7 +1205,8 @@ static void OGRSQLiteBaseDataSourceNotifyFileOpened(void *pfnUserData,
                                                     const char *pszFilename,
                                                     VSILFILE *fp)
 {
-    ((OGRSQLiteBaseDataSource *)pfnUserData)->NotifyFileOpened(pszFilename, fp);
+    static_cast<OGRSQLiteBaseDataSource *>(pfnUserData)
+        ->NotifyFileOpened(pszFilename, fp);
 }
 
 /************************************************************************/
@@ -2144,11 +2132,7 @@ bool OGRSQLiteDataSource::InitWithEPSG()
 
 void OGRSQLiteDataSource::ReloadLayers()
 {
-    for (int i = 0; i < m_nLayers; i++)
-        delete m_papoLayers[i];
-    CPLFree(m_papoLayers);
-    m_papoLayers = nullptr;
-    m_nLayers = 0;
+    m_apoLayers.clear();
 
     GDALOpenInfo oOpenInfo(m_pszFilename,
                            GDAL_OF_VECTOR | (GetUpdate() ? GDAL_OF_UPDATE : 0));
@@ -2163,9 +2147,9 @@ bool OGRSQLiteDataSource::Open(GDALOpenInfo *poOpenInfo)
 
 {
     const char *pszNewName = poOpenInfo->pszFilename;
-    CPLAssert(m_nLayers == 0);
+    CPLAssert(m_apoLayers.empty());
     eAccess = poOpenInfo->eAccess;
-    nOpenFlags = poOpenInfo->nOpenFlags;
+    nOpenFlags = poOpenInfo->nOpenFlags & ~GDAL_OF_THREAD_SAFE;
     SetDescription(pszNewName);
 
     if (m_pszFilename == nullptr)
@@ -2194,8 +2178,9 @@ bool OGRSQLiteDataSource::Open(GDALOpenInfo *poOpenInfo)
         {
             m_pszFilename = CPLStrdup(pszNewName);
             if (poOpenInfo->pabyHeader &&
-                STARTS_WITH((const char *)poOpenInfo->pabyHeader,
-                            "SQLite format 3"))
+                STARTS_WITH(
+                    reinterpret_cast<const char *>(poOpenInfo->pabyHeader),
+                    "SQLite format 3"))
             {
                 m_bCallUndeclareFileNotToOpen = true;
                 GDALOpenInfoDeclareFileNotToOpen(m_pszFilename,
@@ -2250,12 +2235,15 @@ bool OGRSQLiteDataSource::Open(GDALOpenInfo *poOpenInfo)
         {
             GDALOpenInfo oOpenInfo(m_pszFilename, GA_ReadOnly);
             if (oOpenInfo.pabyHeader &&
-                (STARTS_WITH((const char *)oOpenInfo.pabyHeader,
-                             "-- SQL SQLITE") ||
-                 STARTS_WITH((const char *)oOpenInfo.pabyHeader,
-                             "-- SQL RASTERLITE") ||
-                 STARTS_WITH((const char *)oOpenInfo.pabyHeader,
-                             "-- SQL MBTILES")) &&
+                (STARTS_WITH(
+                     reinterpret_cast<const char *>(oOpenInfo.pabyHeader),
+                     "-- SQL SQLITE") ||
+                 STARTS_WITH(
+                     reinterpret_cast<const char *>(oOpenInfo.pabyHeader),
+                     "-- SQL RASTERLITE") ||
+                 STARTS_WITH(
+                     reinterpret_cast<const char *>(oOpenInfo.pabyHeader),
+                     "-- SQL MBTILES")) &&
                 oOpenInfo.fpL != nullptr)
             {
                 if (sqlite3_open_v2(":memory:", &hDB, SQLITE_OPEN_READWRITE,
@@ -2649,8 +2637,8 @@ bool OGRSQLiteDataSource::Open(GDALOpenInfo *poOpenInfo)
 
             if (pszTableName == nullptr || pszGeomCol == nullptr)
                 continue;
-            if (!bListAllTables && aoSetTablesToIgnore.find(pszTableName) !=
-                                       aoSetTablesToIgnore.end())
+            if (!bListAllTables &&
+                cpl::contains(aoSetTablesToIgnore, pszTableName))
             {
                 continue;
             }
@@ -2666,8 +2654,8 @@ bool OGRSQLiteDataSource::Open(GDALOpenInfo *poOpenInfo)
 
             if (pszTableName == nullptr)
                 continue;
-            if (!bListAllTables && aoSetTablesToIgnore.find(pszTableName) !=
-                                       aoSetTablesToIgnore.end())
+            if (!bListAllTables &&
+                cpl::contains(aoSetTablesToIgnore, pszTableName))
             {
                 continue;
             }
@@ -2860,7 +2848,7 @@ bool OGRSQLiteDataSource::OpenVirtualTable(const char *pszName,
     if (OpenTable(pszName, true, pszVirtualShape != nullptr,
                   /* bMayEmitError = */ true))
     {
-        OGRSQLiteLayer *poLayer = m_papoLayers[m_nLayers - 1];
+        OGRSQLiteLayer *poLayer = m_apoLayers.back().get();
         if (poLayer->GetLayerDefn()->GetGeomFieldCount() == 1)
         {
             OGRSQLiteGeomFieldDefn *poGeomFieldDefn =
@@ -2899,20 +2887,17 @@ bool OGRSQLiteDataSource::OpenTable(const char *pszTableName, bool bIsTable,
     /* -------------------------------------------------------------------- */
     /*      Create the layer object.                                        */
     /* -------------------------------------------------------------------- */
-    OGRSQLiteTableLayer *poLayer = new OGRSQLiteTableLayer(this);
+    auto poLayer = std::make_unique<OGRSQLiteTableLayer>(this);
     if (poLayer->Initialize(pszTableName, bIsTable, bIsVirtualShape, false,
                             bMayEmitError) != CE_None)
     {
-        delete poLayer;
         return false;
     }
 
     /* -------------------------------------------------------------------- */
     /*      Add layer to data source layer list.                            */
     /* -------------------------------------------------------------------- */
-    m_papoLayers = (OGRSQLiteLayer **)CPLRealloc(
-        m_papoLayers, sizeof(OGRSQLiteLayer *) * (m_nLayers + 1));
-    m_papoLayers[m_nLayers++] = poLayer;
+    m_apoLayers.push_back(std::move(poLayer));
 
     return true;
 }
@@ -2931,21 +2916,18 @@ bool OGRSQLiteDataSource::OpenView(const char *pszViewName,
     /* -------------------------------------------------------------------- */
     /*      Create the layer object.                                        */
     /* -------------------------------------------------------------------- */
-    OGRSQLiteViewLayer *poLayer = new OGRSQLiteViewLayer(this);
+    auto poLayer = std::make_unique<OGRSQLiteViewLayer>(this);
 
     if (poLayer->Initialize(pszViewName, pszViewGeometry, pszViewRowid,
                             pszTableName, pszGeometryColumn) != CE_None)
     {
-        delete poLayer;
         return false;
     }
 
     /* -------------------------------------------------------------------- */
     /*      Add layer to data source layer list.                            */
     /* -------------------------------------------------------------------- */
-    m_papoLayers = (OGRSQLiteLayer **)CPLRealloc(
-        m_papoLayers, sizeof(OGRSQLiteLayer *) * (m_nLayers + 1));
-    m_papoLayers[m_nLayers++] = poLayer;
+    m_apoLayers.push_back(std::move(poLayer));
 
     return true;
 }
@@ -2991,10 +2973,10 @@ int OGRSQLiteBaseDataSource::TestCapability(const char *pszCap)
 OGRLayer *OGRSQLiteDataSource::GetLayer(int iLayer)
 
 {
-    if (iLayer < 0 || iLayer >= m_nLayers)
+    if (iLayer < 0 || iLayer >= static_cast<int>(m_apoLayers.size()))
         return nullptr;
     else
-        return m_papoLayers[iLayer];
+        return m_apoLayers[iLayer].get();
 }
 
 /************************************************************************/
@@ -3008,10 +2990,10 @@ OGRLayer *OGRSQLiteDataSource::GetLayerByName(const char *pszLayerName)
     if (poLayer != nullptr)
         return poLayer;
 
-    for (size_t i = 0; i < m_apoInvisibleLayers.size(); ++i)
+    for (auto &poLayerIter : m_apoInvisibleLayers)
     {
-        if (EQUAL(m_apoInvisibleLayers[i]->GetName(), pszLayerName))
-            return m_apoInvisibleLayers[i];
+        if (EQUAL(poLayerIter->GetName(), pszLayerName))
+            return poLayerIter.get();
     }
 
     std::string osName(pszLayerName);
@@ -3046,7 +3028,7 @@ OGRLayer *OGRSQLiteDataSource::GetLayerByName(const char *pszLayerName)
                    /* bMayEmitError = */ false))
         return nullptr;
 
-    poLayer = m_papoLayers[m_nLayers - 1];
+    poLayer = m_apoLayers.back().get();
     CPLErrorReset();
     CPLPushErrorHandler(CPLQuietErrorHandler);
     poLayer->GetLayerDefn();
@@ -3054,8 +3036,7 @@ OGRLayer *OGRSQLiteDataSource::GetLayerByName(const char *pszLayerName)
     if (CPLGetLastErrorType() != 0)
     {
         CPLErrorReset();
-        delete poLayer;
-        m_nLayers--;
+        m_apoLayers.pop_back();
         return nullptr;
     }
 
@@ -3068,10 +3049,10 @@ OGRLayer *OGRSQLiteDataSource::GetLayerByName(const char *pszLayerName)
 
 bool OGRSQLiteDataSource::IsLayerPrivate(int iLayer) const
 {
-    if (iLayer < 0 || iLayer >= m_nLayers)
+    if (iLayer < 0 || iLayer >= static_cast<int>(m_apoLayers.size()))
         return false;
 
-    const std::string osName(m_papoLayers[iLayer]->GetName());
+    const std::string osName(m_apoLayers[iLayer]->GetName());
     const CPLString osLCName(CPLString(osName).tolower());
     for (const char *systemTableName : {"spatialindex",
                                         "geom_cols_ref_sys",
@@ -3135,20 +3116,19 @@ OGRSQLiteDataSource::GetLayerByNameNotVisible(const char *pszLayerName)
             return poLayer;
     }
 
-    for (size_t i = 0; i < m_apoInvisibleLayers.size(); ++i)
+    for (auto &poLayerIter : m_apoInvisibleLayers)
     {
-        if (EQUAL(m_apoInvisibleLayers[i]->GetName(), pszLayerName))
-            return m_apoInvisibleLayers[i];
+        if (EQUAL(poLayerIter->GetName(), pszLayerName))
+            return poLayerIter.get();
     }
 
     /* -------------------------------------------------------------------- */
     /*      Create the layer object.                                        */
     /* -------------------------------------------------------------------- */
-    OGRSQLiteTableLayer *poLayer = new OGRSQLiteTableLayer(this);
+    auto poLayer = std::make_unique<OGRSQLiteTableLayer>(this);
     if (poLayer->Initialize(pszLayerName, true, false, false,
                             /* bMayEmitError = */ true) != CE_None)
     {
-        delete poLayer;
         return nullptr;
     }
     CPLErrorReset();
@@ -3158,12 +3138,11 @@ OGRSQLiteDataSource::GetLayerByNameNotVisible(const char *pszLayerName)
     if (CPLGetLastErrorType() != 0)
     {
         CPLErrorReset();
-        delete poLayer;
         return nullptr;
     }
-    m_apoInvisibleLayers.push_back(poLayer);
+    m_apoInvisibleLayers.push_back(std::move(poLayer));
 
-    return poLayer;
+    return m_apoInvisibleLayers.back().get();
 }
 
 /************************************************************************/
@@ -3173,7 +3152,8 @@ OGRSQLiteDataSource::GetLayerByNameNotVisible(const char *pszLayerName)
 std::pair<OGRLayer *, IOGRSQLiteGetSpatialWhere *>
 OGRSQLiteDataSource::GetLayerWithGetSpatialWhereByName(const char *pszName)
 {
-    OGRSQLiteLayer *poRet = (OGRSQLiteLayer *)GetLayerByName(pszName);
+    OGRSQLiteLayer *poRet =
+        cpl::down_cast<OGRSQLiteLayer *>(GetLayerByName(pszName));
     return std::pair<OGRLayer *, IOGRSQLiteGetSpatialWhere *>(poRet, poRet);
 }
 
@@ -3184,15 +3164,15 @@ OGRSQLiteDataSource::GetLayerWithGetSpatialWhereByName(const char *pszName)
 CPLErr OGRSQLiteDataSource::FlushCache(bool bAtClosing)
 {
     CPLErr eErr = CE_None;
-    for (int iLayer = 0; iLayer < m_nLayers; iLayer++)
+    for (auto &poLayer : m_apoLayers)
     {
-        if (m_papoLayers[iLayer]->IsTableLayer())
+        if (poLayer->IsTableLayer())
         {
-            OGRSQLiteTableLayer *poLayer =
-                (OGRSQLiteTableLayer *)m_papoLayers[iLayer];
-            if (poLayer->RunDeferredCreationIfNecessary() != OGRERR_NONE)
+            OGRSQLiteTableLayer *poTableLayer =
+                cpl::down_cast<OGRSQLiteTableLayer *>(poLayer.get());
+            if (poTableLayer->RunDeferredCreationIfNecessary() != OGRERR_NONE)
                 eErr = CE_Failure;
-            poLayer->CreateSpatialIndexIfNecessary();
+            poTableLayer->CreateSpatialIndexIfNecessary();
         }
     }
     if (GDALDataset::FlushCache(bAtClosing) != CE_None)
@@ -3217,14 +3197,14 @@ OGRLayer *OGRSQLiteDataSource::ExecuteSQL(const char *pszSQLCommand,
                                           const char *pszDialect)
 
 {
-    for (int iLayer = 0; iLayer < m_nLayers; iLayer++)
+    for (auto &poLayer : m_apoLayers)
     {
-        if (m_papoLayers[iLayer]->IsTableLayer())
+        if (poLayer->IsTableLayer())
         {
-            OGRSQLiteTableLayer *poLayer =
-                (OGRSQLiteTableLayer *)m_papoLayers[iLayer];
-            poLayer->RunDeferredCreationIfNecessary();
-            poLayer->CreateSpatialIndexIfNecessary();
+            OGRSQLiteTableLayer *poTableLayer =
+                cpl::down_cast<OGRSQLiteTableLayer *>(poLayer.get());
+            poTableLayer->RunDeferredCreationIfNecessary();
+            poTableLayer->CreateSpatialIndexIfNecessary();
         }
     }
 
@@ -3289,14 +3269,14 @@ OGRLayer *OGRSQLiteDataSource::ExecuteSQL(const char *pszSQLCommand,
     if (EQUAL(pszSQLCommand, "VACUUM"))
     {
         int nNeedRefresh = -1;
-        for (int i = 0; i < m_nLayers; i++)
+        for (auto &poLayer : m_apoLayers)
         {
-            if (m_papoLayers[i]->IsTableLayer())
+            if (poLayer->IsTableLayer())
             {
-                OGRSQLiteTableLayer *poLayer =
-                    (OGRSQLiteTableLayer *)m_papoLayers[i];
-                if (!(poLayer->AreStatisticsValid()) ||
-                    poLayer->DoStatisticsNeedToBeFlushed())
+                OGRSQLiteTableLayer *poTableLayer =
+                    cpl::down_cast<OGRSQLiteTableLayer *>(poLayer.get());
+                if (!(poTableLayer->AreStatisticsValid()) ||
+                    poTableLayer->DoStatisticsNeedToBeFlushed())
                 {
                     nNeedRefresh = FALSE;
                     break;
@@ -3307,13 +3287,13 @@ OGRLayer *OGRSQLiteDataSource::ExecuteSQL(const char *pszSQLCommand,
         }
         if (nNeedRefresh == TRUE)
         {
-            for (int i = 0; i < m_nLayers; i++)
+            for (auto &poLayer : m_apoLayers)
             {
-                if (m_papoLayers[i]->IsTableLayer())
+                if (poLayer->IsTableLayer())
                 {
-                    OGRSQLiteTableLayer *poLayer =
-                        (OGRSQLiteTableLayer *)m_papoLayers[i];
-                    poLayer->ForceStatisticsToBeFlushed();
+                    OGRSQLiteTableLayer *poTableLayer =
+                        cpl::down_cast<OGRSQLiteTableLayer *>(poLayer.get());
+                    poTableLayer->ForceStatisticsToBeFlushed();
                 }
             }
         }
@@ -3324,8 +3304,8 @@ OGRLayer *OGRSQLiteDataSource::ExecuteSQL(const char *pszSQLCommand,
              !STARTS_WITH_CI(pszSQLCommand, "CREATE TABLE ") &&
              !STARTS_WITH_CI(pszSQLCommand, "PRAGMA "))
     {
-        for (int i = 0; i < m_nLayers; i++)
-            m_papoLayers[i]->InvalidateCachedFeatureCountAndExtent();
+        for (auto &poLayer : m_apoLayers)
+            poLayer->InvalidateCachedFeatureCountAndExtent();
     }
 
     m_bLastSQLCommandIsUpdateLayerStatistics =
@@ -3513,13 +3493,13 @@ OGRSQLiteDataSource::ICreateLayer(const char *pszLayerNameIn,
         }
     }
 
-    for (int iLayer = 0; iLayer < m_nLayers; iLayer++)
+    for (auto &poLayer : m_apoLayers)
     {
-        if (m_papoLayers[iLayer]->IsTableLayer())
+        if (poLayer->IsTableLayer())
         {
-            OGRSQLiteTableLayer *poLayer =
-                (OGRSQLiteTableLayer *)m_papoLayers[iLayer];
-            poLayer->RunDeferredCreationIfNecessary();
+            OGRSQLiteTableLayer *poTableLayer =
+                cpl::down_cast<OGRSQLiteTableLayer *>(poLayer.get());
+            poTableLayer->RunDeferredCreationIfNecessary();
         }
     }
 
@@ -3602,15 +3582,15 @@ OGRSQLiteDataSource::ICreateLayer(const char *pszLayerNameIn,
     /*      Do we already have this layer?  If so, should we blow it        */
     /*      away?                                                           */
     /* -------------------------------------------------------------------- */
-    for (int iLayer = 0; iLayer < m_nLayers; iLayer++)
+    for (auto &poLayer : m_apoLayers)
     {
-        if (EQUAL(pszLayerName,
-                  m_papoLayers[iLayer]->GetLayerDefn()->GetName()))
+        if (EQUAL(pszLayerName, poLayer->GetLayerDefn()->GetName()))
         {
             if (CSLFetchNameValue(papszOptions, "OVERWRITE") != nullptr &&
                 !EQUAL(CSLFetchNameValue(papszOptions, "OVERWRITE"), "NO"))
             {
                 DeleteLayer(pszLayerName);
+                break;
             }
             else
             {
@@ -3695,7 +3675,7 @@ OGRSQLiteDataSource::ICreateLayer(const char *pszLayerNameIn,
     /* -------------------------------------------------------------------- */
     /*      Create the layer object.                                        */
     /* -------------------------------------------------------------------- */
-    OGRSQLiteTableLayer *poLayer = new OGRSQLiteTableLayer(this);
+    auto poLayer = std::make_unique<OGRSQLiteTableLayer>(this);
 
     poLayer->Initialize(pszLayerName, true, false, true,
                         /* bMayEmitError = */ false);
@@ -3710,14 +3690,6 @@ OGRSQLiteDataSource::ICreateLayer(const char *pszLayerNameIn,
     if (poSRSClone)
         poSRSClone->Release();
 
-    /* -------------------------------------------------------------------- */
-    /*      Add layer to data source layer list.                            */
-    /* -------------------------------------------------------------------- */
-    m_papoLayers = (OGRSQLiteLayer **)CPLRealloc(
-        m_papoLayers, sizeof(OGRSQLiteLayer *) * (m_nLayers + 1));
-
-    m_papoLayers[m_nLayers++] = poLayer;
-
     poLayer->InitFeatureCount();
     poLayer->SetLaunderFlag(CPLFetchBool(papszOptions, "LAUNDER", true));
     if (CPLFetchBool(papszOptions, "COMPRESS_GEOM", false))
@@ -3732,7 +3704,12 @@ OGRSQLiteDataSource::ICreateLayer(const char *pszLayerNameIn,
 
     CPLFree(pszLayerName);
 
-    return poLayer;
+    /* -------------------------------------------------------------------- */
+    /*      Add layer to data source layer list.                            */
+    /* -------------------------------------------------------------------- */
+    m_apoLayers.push_back(std::move(poLayer));
+
+    return m_apoLayers.back().get();
 }
 
 /************************************************************************/
@@ -3745,8 +3722,8 @@ char *OGRSQLiteDataSource::LaunderName(const char *pszSrcName)
     char *pszSafeName = CPLStrdup(pszSrcName);
     for (int i = 0; pszSafeName[i] != '\0'; i++)
     {
-        pszSafeName[i] =
-            (char)CPLTolower(static_cast<unsigned char>(pszSafeName[i]));
+        pszSafeName[i] = static_cast<char>(
+            CPLTolower(static_cast<unsigned char>(pszSafeName[i])));
         if (pszSafeName[i] == '\'' || pszSafeName[i] == '-' ||
             pszSafeName[i] == '#')
             pszSafeName[i] = '_';
@@ -3780,14 +3757,13 @@ void OGRSQLiteDataSource::DeleteLayer(const char *pszLayerName)
     /* -------------------------------------------------------------------- */
     int iLayer = 0;  // Used after for.
 
-    for (; iLayer < m_nLayers; iLayer++)
+    for (; iLayer < static_cast<int>(m_apoLayers.size()); iLayer++)
     {
-        if (EQUAL(pszLayerName,
-                  m_papoLayers[iLayer]->GetLayerDefn()->GetName()))
+        if (EQUAL(pszLayerName, m_apoLayers[iLayer]->GetLayerDefn()->GetName()))
             break;
     }
 
-    if (iLayer == m_nLayers)
+    if (iLayer == static_cast<int>(m_apoLayers.size()))
     {
         CPLError(
             CE_Failure, CPLE_AppDefined,
@@ -3805,11 +3781,11 @@ void OGRSQLiteDataSource::DeleteLayer(const char *pszLayerName)
 
 OGRErr OGRSQLiteDataSource::DeleteLayer(int iLayer)
 {
-    if (iLayer < 0 || iLayer >= m_nLayers)
+    if (iLayer < 0 || iLayer >= static_cast<int>(m_apoLayers.size()))
     {
         CPLError(CE_Failure, CPLE_AppDefined,
                  "Layer %d not in legal range of 0 to %d.", iLayer,
-                 m_nLayers - 1);
+                 static_cast<int>(m_apoLayers.size()) - 1);
         return OGRERR_FAILURE;
     }
 
@@ -3822,10 +3798,7 @@ OGRErr OGRSQLiteDataSource::DeleteLayer(int iLayer)
     /* -------------------------------------------------------------------- */
     CPLDebug("OGR_SQLITE", "DeleteLayer(%s)", osLayerName.c_str());
 
-    delete m_papoLayers[iLayer];
-    memmove(m_papoLayers + iLayer, m_papoLayers + iLayer + 1,
-            sizeof(void *) * (m_nLayers - iLayer - 1));
-    m_nLayers--;
+    m_apoLayers.erase(m_apoLayers.begin() + iLayer);
 
     /* -------------------------------------------------------------------- */
     /*      Remove from the database.                                       */
@@ -3913,6 +3886,21 @@ OGRErr OGRSQLiteBaseDataSource::StartTransaction(CPL_UNUSED int bForce)
     return OGRERR_NONE;
 }
 
+OGRErr OGRSQLiteDataSource::StartTransaction(int bForce)
+{
+    for (auto &poLayer : m_apoLayers)
+    {
+        if (poLayer->IsTableLayer())
+        {
+            OGRSQLiteTableLayer *poTableLayer =
+                cpl::down_cast<OGRSQLiteTableLayer *>(poLayer.get());
+            poTableLayer->RunDeferredCreationIfNecessary();
+        }
+    }
+
+    return OGRSQLiteBaseDataSource::StartTransaction(bForce);
+}
+
 /************************************************************************/
 /*                         CommitTransaction()                          */
 /*                                                                      */
@@ -3937,13 +3925,13 @@ OGRErr OGRSQLiteDataSource::CommitTransaction()
 {
     if (nSoftTransactionLevel == 1)
     {
-        for (int iLayer = 0; iLayer < m_nLayers; iLayer++)
+        for (auto &poLayer : m_apoLayers)
         {
-            if (m_papoLayers[iLayer]->IsTableLayer())
+            if (poLayer->IsTableLayer())
             {
-                OGRSQLiteTableLayer *poLayer =
-                    (OGRSQLiteTableLayer *)m_papoLayers[iLayer];
-                poLayer->RunDeferredCreationIfNecessary();
+                OGRSQLiteTableLayer *poTableLayer =
+                    cpl::down_cast<OGRSQLiteTableLayer *>(poLayer.get());
+                poTableLayer->RunDeferredCreationIfNecessary();
             }
         }
     }
@@ -3975,20 +3963,20 @@ OGRErr OGRSQLiteDataSource::RollbackTransaction()
 {
     if (nSoftTransactionLevel == 1)
     {
-        for (int iLayer = 0; iLayer < m_nLayers; iLayer++)
+        for (auto &poLayer : m_apoLayers)
         {
-            if (m_papoLayers[iLayer]->IsTableLayer())
+            if (poLayer->IsTableLayer())
             {
-                OGRSQLiteTableLayer *poLayer =
-                    (OGRSQLiteTableLayer *)m_papoLayers[iLayer];
-                poLayer->RunDeferredCreationIfNecessary();
+                OGRSQLiteTableLayer *poTableLayer =
+                    cpl::down_cast<OGRSQLiteTableLayer *>(poLayer.get());
+                poTableLayer->RunDeferredCreationIfNecessary();
             }
         }
 
-        for (int i = 0; i < m_nLayers; i++)
+        for (auto &poLayer : m_apoLayers)
         {
-            m_papoLayers[i]->InvalidateCachedFeatureCountAndExtent();
-            m_papoLayers[i]->ResetReading();
+            poLayer->InvalidateCachedFeatureCountAndExtent();
+            poLayer->ResetReading();
         }
     }
 
@@ -4648,7 +4636,7 @@ OGRSpatialReference *OGRSQLiteDataSource::FetchSRS(int nId)
     /* -------------------------------------------------------------------- */
     /*      First, we look through our SRID cache, is it there?             */
     /* -------------------------------------------------------------------- */
-    auto oIter = m_oSRSCache.find(nId);
+    const auto oIter = m_oSRSCache.find(nId);
     if (oIter != m_oSRSCache.end())
     {
         return oIter->second.get();
@@ -4813,8 +4801,7 @@ void OGRSQLiteDataSource::SetName(const char *pszNameIn)
 const OGREnvelope *
 OGRSQLiteBaseDataSource::GetEnvelopeFromSQL(const CPLString &osSQL)
 {
-    std::map<CPLString, OGREnvelope>::iterator oIter =
-        oMapSQLEnvelope.find(osSQL);
+    const auto oIter = oMapSQLEnvelope.find(osSQL);
     if (oIter != oMapSQLEnvelope.end())
         return &oIter->second;
     else
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqlitedriver.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqlitedriver.cpp
index 864d23e2ecd3..24ae73489ea7 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitedriver.cpp
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitedriver.cpp
@@ -15,23 +15,7 @@
  * Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -116,15 +100,18 @@ static int OGRSQLiteDriverIdentify(GDALOpenInfo *poOpenInfo)
         return FALSE;
 
 #ifdef ENABLE_SQL_SQLITE_FORMAT
-    if (STARTS_WITH((const char *)poOpenInfo->pabyHeader, "-- SQL SQLITE"))
+    if (STARTS_WITH(reinterpret_cast<const char *>(poOpenInfo->pabyHeader),
+                    "-- SQL SQLITE"))
     {
         return TRUE;
     }
-    if (STARTS_WITH((const char *)poOpenInfo->pabyHeader, "-- SQL RASTERLITE"))
+    if (STARTS_WITH(reinterpret_cast<const char *>(poOpenInfo->pabyHeader),
+                    "-- SQL RASTERLITE"))
     {
         return -1;
     }
-    if (STARTS_WITH((const char *)poOpenInfo->pabyHeader, "-- SQL MBTILES"))
+    if (STARTS_WITH(reinterpret_cast<const char *>(poOpenInfo->pabyHeader),
+                    "-- SQL MBTILES"))
     {
         if (GDALGetDriverByName("MBTILES") != nullptr)
             return FALSE;
@@ -134,7 +121,8 @@ static int OGRSQLiteDriverIdentify(GDALOpenInfo *poOpenInfo)
     }
 #endif
 
-    if (!STARTS_WITH((const char *)poOpenInfo->pabyHeader, "SQLite format 3"))
+    if (!STARTS_WITH(reinterpret_cast<const char *>(poOpenInfo->pabyHeader),
+                     "SQLite format 3"))
         return FALSE;
 
     // In case we are opening /vsizip/foo.zip with a .gpkg inside
@@ -163,11 +151,11 @@ static GDALDataset *OGRSQLiteDriverOpen(GDALOpenInfo *poOpenInfo)
     /* -------------------------------------------------------------------- */
     /*      Check VirtualShape:xxx.shp syntax                               */
     /* -------------------------------------------------------------------- */
-    int nLen = (int)strlen(poOpenInfo->pszFilename);
+    const auto nLen = strlen(poOpenInfo->pszFilename);
     if (STARTS_WITH_CI(poOpenInfo->pszFilename, "VirtualShape:") && nLen > 4 &&
         EQUAL(poOpenInfo->pszFilename + nLen - 4, ".SHP"))
     {
-        OGRSQLiteDataSource *poDS = new OGRSQLiteDataSource();
+        auto poDS = std::make_unique<OGRSQLiteDataSource>();
 
         char **papszOptions = CSLAddString(nullptr, "SPATIALITE=YES");
         int nRet = poDS->Create(":memory:", papszOptions);
@@ -175,21 +163,17 @@ static GDALDataset *OGRSQLiteDriverOpen(GDALOpenInfo *poOpenInfo)
         CSLDestroy(papszOptions);
         if (!nRet)
         {
-            delete poDS;
             return nullptr;
         }
 
         char *pszSQLiteFilename =
             CPLStrdup(poOpenInfo->pszFilename + strlen("VirtualShape:"));
-        GDALDataset *poSQLiteDS = (GDALDataset *)GDALOpenEx(
-            pszSQLiteFilename, GDAL_OF_VECTOR, nullptr, nullptr, nullptr);
-        if (poSQLiteDS == nullptr)
+        if (!std::unique_ptr<GDALDataset>(GDALDataset::Open(
+                pszSQLiteFilename, GDAL_OF_VECTOR, nullptr, nullptr, nullptr)))
         {
             CPLFree(pszSQLiteFilename);
-            delete poDS;
             return nullptr;
         }
-        delete poSQLiteDS;
 
         char *pszLastDot = strrchr(pszSQLiteFilename, '.');
         if (pszLastDot)
@@ -204,7 +188,7 @@ static GDALDataset *OGRSQLiteDriverOpen(GDALOpenInfo *poOpenInfo)
         CPLFree(pszSQL);
         CPLFree(pszSQLiteFilename);
         poDS->DisableUpdate();
-        return poDS;
+        return poDS.release();
     }
 
     /* -------------------------------------------------------------------- */
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.cpp
index 4a900766408d..63f40ffcc9fc 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.cpp
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2012-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_sqlite.h"
@@ -221,14 +205,12 @@ static void OGR2SQLITEAddLayer(const char *&pszStart, int &nNum,
 /*                         StartsAsSQLITEKeyWord()                      */
 /************************************************************************/
 
-static const char *const apszKeywords[] = {
-    "WHERE", "GROUP", "ORDER", "JOIN", "UNION", "INTERSECT", "EXCEPT", "LIMIT"};
-
 static int StartsAsSQLITEKeyWord(const char *pszStr)
 {
-    for (int i = 0; i < (int)(sizeof(apszKeywords) / sizeof(char *)); i++)
+    for (const char *pszKeyword : {"WHERE", "GROUP", "ORDER", "JOIN", "UNION",
+                                   "INTERSECT", "EXCEPT", "LIMIT"})
     {
-        if (EQUALN(pszStr, apszKeywords[i], strlen(apszKeywords[i])))
+        if (STARTS_WITH_CI(pszStr, pszKeyword))
             return TRUE;
     }
     return FALSE;
@@ -496,6 +478,8 @@ class OGRSQLiteExecuteSQLLayer final : public OGRSQLiteSelectLayer
     char *m_pszTmpDBName = nullptr;
     bool m_bStringsAsUTF8 = false;
 
+    CPL_DISALLOW_COPY_ASSIGN(OGRSQLiteExecuteSQLLayer)
+
   public:
     OGRSQLiteExecuteSQLLayer(char *pszTmpDBName, OGRSQLiteDataSource *poDS,
                              const CPLString &osSQL, sqlite3_stmt *hStmt,
@@ -565,7 +549,7 @@ static void OGR2SQLITE_IgnoreAllFieldsExceptGeometry(OGRLayer *poLayer)
         papszIgnored = CSLAddString(
             papszIgnored, poFeatureDefn->GetFieldDefn(i)->GetNameRef());
     }
-    poLayer->SetIgnoredFields((const char **)papszIgnored);
+    poLayer->SetIgnoredFields(const_cast<const char **>(papszIgnored));
     CSLDestroy(papszIgnored);
 }
 #endif
@@ -623,7 +607,7 @@ static int OGR2SQLITEDealWithSpatialColumn(
                      "coord_dimension, srid) "
                      "VALUES ('%s','%s','SpatiaLite',%d,%d,%d)",
                      pszLayerNameEscaped, pszGeomColEscaped,
-                     (int)wkbFlatten(poLayer->GetGeomType()),
+                     static_cast<int>(wkbFlatten(poLayer->GetGeomType())),
                      wkbHasZ(poLayer->GetGeomType()) ? 3 : 2, nSRSId);
     }
 #ifdef HAVE_SPATIALITE
@@ -667,9 +651,10 @@ static int OGR2SQLITEDealWithSpatialColumn(
 
         if (poSQLiteDS->HasSpatialite4Layout())
         {
-            int nGeomType = poLayer->GetGeomType();
+            const auto eGeomType = poLayer->GetGeomType();
+            int nGeomType = eGeomType;
             int nCoordDimension = 2;
-            if (wkbHasZ((OGRwkbGeometryType)nGeomType))
+            if (wkbHasZ(eGeomType))
             {
                 nGeomType += 1000;
                 nCoordDimension = 3;
@@ -764,7 +749,8 @@ static int OGR2SQLITEDealWithSpatialColumn(
         if (poGeom != nullptr && !poGeom->IsEmpty())
         {
             poGeom->getEnvelope(&sEnvelope);
-            sqlite3_bind_int64(hStmt, 1, (sqlite3_int64)poFeature->GetFID());
+            sqlite3_bind_int64(hStmt, 1,
+                               static_cast<sqlite3_int64>(poFeature->GetFID()));
             sqlite3_bind_double(hStmt, 2, sEnvelope.MinX);
             sqlite3_bind_double(hStmt, 3, sEnvelope.MaxX);
             sqlite3_bind_double(hStmt, 4, sEnvelope.MinY);
@@ -848,10 +834,8 @@ OGRLayer *OGRSQLiteExecuteSQL(GDALDataset *poDS, const char *pszStatement,
         }
     }
 
-    char *pszTmpDBName = (char *)CPLMalloc(256);
-    char szPtr[32];
-    snprintf(szPtr, sizeof(szPtr), "%p", pszTmpDBName);
-    snprintf(pszTmpDBName, 256, "/vsimem/ogr2sqlite/temp_%s.db", szPtr);
+    char *pszTmpDBName = static_cast<char *>(CPLMalloc(256));
+    snprintf(pszTmpDBName, 256, "%s", VSIMemGenerateHiddenFilename("temp.db"));
 
     OGRSQLiteDataSource *poSQLiteDS = nullptr;
     bool bSpatialiteDB = false;
@@ -878,10 +862,9 @@ OGRLayer *OGRSQLiteExecuteSQL(GDALDataset *poDS, const char *pszStatement,
                            "OGR_SQLITE_DIALECT_USE_SPATIALITE", "YES")))
         {
             bTried = true;
-            char *pszCachedFilename = (char *)CPLMalloc(256);
-            snprintf(szPtr, sizeof(szPtr), "%p", pszCachedFilename);
-            snprintf(pszCachedFilename, 256,
-                     "/vsimem/ogr2sqlite/reference_%s.db", szPtr);
+            char *pszCachedFilename = static_cast<char *>(CPLMalloc(256));
+            snprintf(pszCachedFilename, 256, "%s",
+                     VSIMemGenerateHiddenFilename("reference.db"));
             char **papszOptions = CSLAddString(nullptr, "SPATIALITE=YES");
             OGRSQLiteDataSource *poCachedDS = new OGRSQLiteDataSource();
             const int nRet =
@@ -909,7 +892,8 @@ OGRLayer *OGRSQLiteExecuteSQL(GDALDataset *poDS, const char *pszStatement,
         CPLTestBool(
             CPLGetConfigOption("OGR_SQLITE_DIALECT_USE_SPATIALITE", "YES")))
     {
-        GByte *pabyEmptyDBClone = (GByte *)VSI_MALLOC_VERBOSE(nEmptyDBSize);
+        GByte *pabyEmptyDBClone =
+            static_cast<GByte *>(VSI_MALLOC_VERBOSE(nEmptyDBSize));
         if (pabyEmptyDBClone == nullptr)
         {
             CPLFree(pszTmpDBName);
@@ -1033,8 +1017,9 @@ OGRLayer *OGRSQLiteExecuteSQL(GDALDataset *poDS, const char *pszStatement,
         }
         else
         {
-            OGRDataSource *poOtherDS =
-                (OGRDataSource *)OGROpen(oLayerDesc.osDSName, FALSE, nullptr);
+            auto poOtherDS = std::unique_ptr<GDALDataset>(
+                GDALDataset::Open(oLayerDesc.osDSName, GDAL_OF_VECTOR, nullptr,
+                                  nullptr, nullptr));
             if (poOtherDS == nullptr)
             {
                 CPLError(CE_Failure, CPLE_AppDefined,
@@ -1053,7 +1038,6 @@ OGRLayer *OGRSQLiteExecuteSQL(GDALDataset *poDS, const char *pszStatement,
                          "Cannot find layer '%s' in '%s'",
                          oLayerDesc.osLayerName.c_str(),
                          oLayerDesc.osDSName.c_str());
-                delete poOtherDS;
                 delete poSQLiteDS;
                 VSIUnlink(pszTmpDBName);
                 CPLFree(pszTmpDBName);
@@ -1062,7 +1046,7 @@ OGRLayer *OGRSQLiteExecuteSQL(GDALDataset *poDS, const char *pszStatement,
 
             osTableName = oLayerDesc.osSubstitutedName;
 
-            nExtraDS = OGR2SQLITE_AddExtraDS(poModule, poOtherDS);
+            nExtraDS = OGR2SQLITE_AddExtraDS(poModule, poOtherDS.release());
         }
 
         if (!poLayer->TestCapability(OLCStringsAsUTF8))
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.h b/ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.h
index 77405e6c0931..19b3a4e12a35 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.h
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_SQLITE_EXECUTE_SQL_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqlitelayer.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqlitelayer.cpp
index 631c9bb3a8da..15979f6bb9a5 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitelayer.cpp
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitelayer.cpp
@@ -17,23 +17,7 @@
  * Copyright (c) 2004, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2021, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -43,6 +27,7 @@
 #include <algorithm>
 #include <cassert>
 #include <climits>
+#include <cmath>
 #include <cstddef>
 #include <cstdio>
 #include <cstdlib>
@@ -92,8 +77,8 @@ void OGRSQLiteLayer::Finalize()
 
     if (m_nFeaturesRead > 0 && m_poFeatureDefn != nullptr)
     {
-        CPLDebug("SQLite", "%d features read on layer '%s'.",
-                 (int)m_nFeaturesRead, m_poFeatureDefn->GetName());
+        CPLDebug("SQLite", CPL_FRMT_GIB " features read on layer '%s'.",
+                 m_nFeaturesRead, m_poFeatureDefn->GetName());
     }
 
     if (m_hStmt != nullptr)
@@ -174,7 +159,8 @@ static int OGRIsBinaryGeomCol(sqlite3_stmt *hStmt, int iCol,
     OGRGeometry *poGeometry = nullptr;
     const int nBytes = sqlite3_column_bytes(hStmt, iCol);
     // coverity[tainted_data_return]
-    GByte *pabyBlob = (GByte *)sqlite3_column_blob(hStmt, iCol);
+    const GByte *pabyBlob =
+        reinterpret_cast<const GByte *>(sqlite3_column_blob(hStmt, iCol));
     int nBytesConsumed = 0;
     CPLPushErrorHandler(CPLQuietErrorHandler);
     /* Try as spatialite first since createFromWkb() can sometimes */
@@ -244,7 +230,10 @@ void OGRSQLiteLayer::BuildFeatureDefn(const char *pszLayerName, bool bIsSelect,
 
     const int nRawColumns = sqlite3_column_count(hStmtIn);
 
-    m_panFieldOrdinals = (int *)CPLMalloc(sizeof(int) * nRawColumns);
+    m_panFieldOrdinals =
+        static_cast<int *>(CPLMalloc(sizeof(int) * nRawColumns));
+
+    std::set<std::string> oSetFields;
 
     for (int iCol = 0; iCol < nRawColumns; iCol++)
     {
@@ -255,7 +244,7 @@ void OGRSQLiteLayer::BuildFeatureDefn(const char *pszLayerName, bool bIsSelect,
         // In some cases, particularly when there is a real name for
         // the primary key/_rowid_ column we will end up getting the
         // primary key column appearing twice.  Ignore any repeated names.
-        if (m_poFeatureDefn->GetFieldIndex(pszFieldName) != -1)
+        if (cpl::contains(oSetFields, pszFieldName))
             continue;
 
         if (EQUAL(pszFieldName, "OGR_NATIVE_DATA"))
@@ -667,6 +656,7 @@ void OGRSQLiteLayer::BuildFeatureDefn(const char *pszLayerName, bool bIsSelect,
             oField.SetType(eFieldType);
         }
 
+        oSetFields.insert(oField.GetNameRef());
         m_poFeatureDefn->AddFieldDefn(&oField);
         m_panFieldOrdinals[m_poFeatureDefn->GetFieldCount() - 1] = iCol;
     }
@@ -827,8 +817,8 @@ OGRFeature *OGRSQLiteLayer::GetNextRawFeature()
                      * sure if it is */
                     /* WKB or SpatialLite format */
                     // coverity[tainted_data_return]
-                    GByte *pabyBlob = (GByte *)sqlite3_column_blob(
-                        m_hStmt, poGeomFieldDefn->m_iCol);
+                    const GByte *pabyBlob = reinterpret_cast<const GByte *>(
+                        sqlite3_column_blob(m_hStmt, poGeomFieldDefn->m_iCol));
                     if (ImportSpatiaLiteGeometry(pabyBlob, nBytes,
                                                  &poGeometry) == OGRERR_NONE)
                     {
@@ -861,8 +851,8 @@ OGRFeature *OGRSQLiteLayer::GetNextRawFeature()
                 const int nBytes =
                     sqlite3_column_bytes(m_hStmt, poGeomFieldDefn->m_iCol);
                 // coverity[tainted_data_return]
-                GByte *pabyBlob = (GByte *)sqlite3_column_blob(
-                    m_hStmt, poGeomFieldDefn->m_iCol);
+                const GByte *pabyBlob = reinterpret_cast<const GByte *>(
+                    sqlite3_column_blob(m_hStmt, poGeomFieldDefn->m_iCol));
                 CPL_IGNORE_RET_VAL(
                     ImportSpatiaLiteGeometry(pabyBlob, nBytes, &poGeometry));
             }
@@ -880,9 +870,11 @@ OGRFeature *OGRSQLiteLayer::GetNextRawFeature()
     /* -------------------------------------------------------------------- */
     /*      set the fields.                                                 */
     /* -------------------------------------------------------------------- */
-    for (int iField = 0; iField < m_poFeatureDefn->GetFieldCount(); iField++)
+    const int nFieldCount = m_poFeatureDefn->GetFieldCount();
+    for (int iField = 0; iField < nFieldCount; iField++)
     {
-        OGRFieldDefn *poFieldDefn = m_poFeatureDefn->GetFieldDefn(iField);
+        const OGRFieldDefn *poFieldDefn =
+            m_poFeatureDefn->GetFieldDefnUnsafe(iField);
         if (poFieldDefn->IsIgnored())
             continue;
 
@@ -898,15 +890,34 @@ OGRFeature *OGRSQLiteLayer::GetNextRawFeature()
         switch (poFieldDefn->GetType())
         {
             case OFTInteger:
-            case OFTInteger64:
             {
                 /* Possible since SQLite3 has no strong typing */
                 if (nSQLite3Type == SQLITE_TEXT)
                     poFeature->SetField(
-                        iField,
-                        (const char *)sqlite3_column_text(m_hStmt, iRawField));
+                        iField, reinterpret_cast<const char *>(
+                                    sqlite3_column_text(m_hStmt, iRawField)));
                 else
+                {
+                    const GIntBig nVal =
+                        sqlite3_column_int64(m_hStmt, iRawField);
+                    if (nVal >= INT_MIN && nVal <= INT_MAX)
+                        poFeature->SetFieldSameTypeUnsafe(
+                            iField, static_cast<int>(nVal));
+                    else
+                        poFeature->SetField(iField, nVal);
+                }
+                break;
+            }
+
+            case OFTInteger64:
+            {
+                /* Possible since SQLite3 has no strong typing */
+                if (nSQLite3Type == SQLITE_TEXT)
                     poFeature->SetField(
+                        iField, reinterpret_cast<const char *>(
+                                    sqlite3_column_text(m_hStmt, iRawField)));
+                else
+                    poFeature->SetFieldSameTypeUnsafe(
                         iField, sqlite3_column_int64(m_hStmt, iRawField));
                 break;
             }
@@ -916,8 +927,8 @@ OGRFeature *OGRSQLiteLayer::GetNextRawFeature()
                 /* Possible since SQLite3 has no strong typing */
                 if (nSQLite3Type == SQLITE_TEXT)
                     poFeature->SetField(
-                        iField,
-                        (const char *)sqlite3_column_text(m_hStmt, iRawField));
+                        iField, reinterpret_cast<const char *>(
+                                    sqlite3_column_text(m_hStmt, iRawField)));
                 else
                     poFeature->SetField(
                         iField, sqlite3_column_double(m_hStmt, iRawField));
@@ -948,28 +959,30 @@ OGRFeature *OGRSQLiteLayer::GetNextRawFeature()
                 {
                     const int nBytes = sqlite3_column_bytes(m_hStmt, iRawField);
                     // coverity[tainted_data_return]
-                    GByte *pabyBlob =
-                        (GByte *)sqlite3_column_blob(m_hStmt, iRawField);
+                    const GByte *pabyBlob = reinterpret_cast<const GByte *>(
+                        sqlite3_column_blob(m_hStmt, iRawField));
 
                     void *pOut =
                         CPLZLibInflate(pabyBlob, nBytes, nullptr, 0, nullptr);
                     if (pOut != nullptr)
                     {
-                        poFeature->SetField(iField, (const char *)pOut);
+                        poFeature->SetField(iField,
+                                            static_cast<const char *>(pOut));
                         CPLFree(pOut);
                     }
                     else
                     {
-                        poFeature->SetField(iField,
-                                            (const char *)sqlite3_column_text(
-                                                m_hStmt, iRawField));
+                        poFeature->SetField(
+                            iField,
+                            reinterpret_cast<const char *>(
+                                sqlite3_column_text(m_hStmt, iRawField)));
                     }
                 }
                 else
                 {
                     poFeature->SetField(
-                        iField,
-                        (const char *)sqlite3_column_text(m_hStmt, iRawField));
+                        iField, reinterpret_cast<const char *>(
+                                    sqlite3_column_text(m_hStmt, iRawField)));
                 }
                 break;
             }
@@ -980,8 +993,8 @@ OGRFeature *OGRSQLiteLayer::GetNextRawFeature()
             {
                 if (sqlite3_column_type(m_hStmt, iRawField) == SQLITE_TEXT)
                 {
-                    const char *pszValue =
-                        (const char *)sqlite3_column_text(m_hStmt, iRawField);
+                    const char *pszValue = reinterpret_cast<const char *>(
+                        sqlite3_column_text(m_hStmt, iRawField));
                     if (!OGRParseDate(pszValue,
                                       poFeature->GetRawFieldRef(iField), 0))
                         poFeature->UnsetField(iField);
@@ -1019,14 +1032,14 @@ OGRFeature *OGRSQLiteLayer::GetNextRawFeature()
     if (m_iOGRNativeDataCol >= 0 &&
         sqlite3_column_type(m_hStmt, m_iOGRNativeDataCol) == SQLITE_TEXT)
     {
-        poFeature->SetNativeData(
-            (const char *)sqlite3_column_text(m_hStmt, m_iOGRNativeDataCol));
+        poFeature->SetNativeData(reinterpret_cast<const char *>(
+            sqlite3_column_text(m_hStmt, m_iOGRNativeDataCol)));
     }
     if (m_iOGRNativeMediaTypeCol >= 0 &&
         sqlite3_column_type(m_hStmt, m_iOGRNativeMediaTypeCol) == SQLITE_TEXT)
     {
-        poFeature->SetNativeMediaType((const char *)sqlite3_column_text(
-            m_hStmt, m_iOGRNativeMediaTypeCol));
+        poFeature->SetNativeMediaType(reinterpret_cast<const char *>(
+            sqlite3_column_text(m_hStmt, m_iOGRNativeMediaTypeCol)));
     }
 
     return poFeature;
@@ -1226,7 +1239,8 @@ OGRErr OGRSQLiteLayer::createFromSpatialiteInternal(
         poGeom = poLS;
         if (!NEED_SWAP_SPATIALITE())
         {
-            poLS->setPoints(nPointCount, (OGRRawPoint *)(pabyData + 8),
+            poLS->setPoints(nPointCount,
+                            reinterpret_cast<const OGRRawPoint *>(pabyData + 8),
                             nullptr);
         }
         else
@@ -1726,8 +1740,10 @@ OGRErr OGRSQLiteLayer::createFromSpatialiteInternal(
             OGRLinearRing *poLR = new OGRLinearRing();
             if (!NEED_SWAP_SPATIALITE())
             {
-                poLR->setPoints(nPointCount,
-                                (OGRRawPoint *)(pabyData + nNextByte), nullptr);
+                poLR->setPoints(
+                    nPointCount,
+                    reinterpret_cast<const OGRRawPoint *>(pabyData + nNextByte),
+                    nullptr);
                 nNextByte += 2 * 8 * nPointCount;
             }
             else
@@ -3222,7 +3238,8 @@ int OGRSQLiteLayer::ExportSpatiaLiteGeometryInternal(
             if (!bUseComprGeom && !NEED_SWAP_SPATIALITE() &&
                 poGeometry->CoordinateDimension() == 2)
             {
-                poLineString->getPoints((OGRRawPoint *)(pabyData + 4), nullptr);
+                poLineString->getPoints(
+                    reinterpret_cast<OGRRawPoint *>(pabyData + 4), nullptr);
                 nTotalSize += nPointCount * 16;
                 return nTotalSize;
             }
@@ -3274,8 +3291,10 @@ int OGRSQLiteLayer::ExportSpatiaLiteGeometryInternal(
                 }
                 else /* Compressed intermediate points */
                 {
-                    float deltax = (float)(x - poLineString->getX(i - 1));
-                    float deltay = (float)(y - poLineString->getY(i - 1));
+                    float deltax =
+                        static_cast<float>(x - poLineString->getX(i - 1));
+                    float deltay =
+                        static_cast<float>(y - poLineString->getY(i - 1));
                     memcpy(pabyData + nTotalSize, &deltax, 4);
                     memcpy(pabyData + nTotalSize + 4, &deltay, 4);
                     if (NEED_SWAP_SPATIALITE())
@@ -3286,7 +3305,8 @@ int OGRSQLiteLayer::ExportSpatiaLiteGeometryInternal(
                     if (poGeometry->Is3D())
                     {
                         double z = poLineString->getZ(i);
-                        float deltaz = (float)(z - poLineString->getZ(i - 1));
+                        float deltaz =
+                            static_cast<float>(z - poLineString->getZ(i - 1));
                         memcpy(pabyData + nTotalSize + 8, &deltaz, 4);
                         if (NEED_SWAP_SPATIALITE())
                             CPL_SWAP32PTR(pabyData + nTotalSize + 8);
@@ -3417,10 +3437,10 @@ OGRErr OGRSQLiteLayer::ExportSpatiaLiteGeometry(
     const int nDataLen = 44 + nGeomSize;
     OGREnvelope sEnvelope;
 
-    *ppabyData = (GByte *)CPLMalloc(nDataLen);
+    *ppabyData = static_cast<GByte *>(CPLMalloc(nDataLen));
 
     (*ppabyData)[0] = 0x00;
-    (*ppabyData)[1] = (GByte)eByteOrder;
+    (*ppabyData)[1] = static_cast<GByte>(eByteOrder);
 
     // Write out SRID
     memcpy(*ppabyData + 2, &nSRID, 4);
@@ -3563,10 +3583,10 @@ CPLString OGRSQLiteLayer::FormatSpatialFilterFromRTree(
 
     poFilterGeom->getEnvelope(&sEnvelope);
 
-    if (CPLIsInf(sEnvelope.MinX) && sEnvelope.MinX < 0 &&
-        CPLIsInf(sEnvelope.MinY) && sEnvelope.MinY < 0 &&
-        CPLIsInf(sEnvelope.MaxX) && sEnvelope.MaxX > 0 &&
-        CPLIsInf(sEnvelope.MaxY) && sEnvelope.MaxY > 0)
+    if (std::isinf(sEnvelope.MinX) && sEnvelope.MinX < 0 &&
+        std::isinf(sEnvelope.MinY) && sEnvelope.MinY < 0 &&
+        std::isinf(sEnvelope.MaxX) && sEnvelope.MaxX > 0 &&
+        std::isinf(sEnvelope.MaxY) && sEnvelope.MaxY > 0)
         return "";
 
     osSpatialWHERE.Printf(
@@ -3592,10 +3612,10 @@ OGRSQLiteLayer::FormatSpatialFilterFromMBR(OGRGeometry *poFilterGeom,
 
     poFilterGeom->getEnvelope(&sEnvelope);
 
-    if (CPLIsInf(sEnvelope.MinX) && sEnvelope.MinX < 0 &&
-        CPLIsInf(sEnvelope.MinY) && sEnvelope.MinY < 0 &&
-        CPLIsInf(sEnvelope.MaxX) && sEnvelope.MaxX > 0 &&
-        CPLIsInf(sEnvelope.MaxY) && sEnvelope.MaxY > 0)
+    if (std::isinf(sEnvelope.MinX) && sEnvelope.MinX < 0 &&
+        std::isinf(sEnvelope.MinY) && sEnvelope.MinY < 0 &&
+        std::isinf(sEnvelope.MaxX) && sEnvelope.MaxX > 0 &&
+        std::isinf(sEnvelope.MaxY) && sEnvelope.MaxY > 0)
         return "";
 
     /* A bit inefficient but still faster than OGR filtering */
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqliteregexp.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqliteregexp.cpp
index b3b43e1edc82..f921b9a4eb12 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqliteregexp.cpp
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqliteregexp.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 /* WARNING: VERY IMPORTANT NOTE: This file MUST not be directly compiled as */
@@ -100,9 +84,16 @@ static pcre2_code *re_compile_with_cache(sqlite3_context *ctx, const char *re)
         uint32_t has_jit = 0;
         PCRE2_UCHAR8 err_buff[256];
 
+#ifdef HAVE_GCC_DIAGNOSTIC_PUSH
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#endif
         pcre2_code *pat =
             pcre2_compile(reinterpret_cast<const PCRE2_UCHAR8 *>(re),
                           PCRE2_ZERO_TERMINATED, 0, &errorcode, &pos, nullptr);
+#ifdef HAVE_GCC_DIAGNOSTIC_PUSH
+#pragma GCC diagnostic pop
+#endif
         if (!pat)
         {
             pcre2_get_error_message(errorcode, err_buff, sizeof(err_buff));
@@ -151,7 +142,8 @@ static void OGRSQLiteREGEXPFunction(sqlite3_context *ctx, CPL_UNUSED int argc,
 {
     CPLAssert(argc == 2);
 
-    const char *re = (const char *)sqlite3_value_text(argv[0]);
+    const char *re =
+        reinterpret_cast<const char *>(sqlite3_value_text(argv[0]));
     if (!re)
     {
         sqlite3_result_error(ctx, "no regexp", -1);
@@ -164,7 +156,8 @@ static void OGRSQLiteREGEXPFunction(sqlite3_context *ctx, CPL_UNUSED int argc,
         return;
     }
 
-    const char *str = (const char *)sqlite3_value_text(argv[1]);
+    const char *str =
+        reinterpret_cast<const char *>(sqlite3_value_text(argv[1]));
     if (!str)
     {
         sqlite3_result_error(ctx, "no string", -1);
@@ -181,8 +174,16 @@ static void OGRSQLiteREGEXPFunction(sqlite3_context *ctx, CPL_UNUSED int argc,
         sqlite3_result_error(ctx, "could not create match data block", -1);
         return;
     }
+
+#ifdef HAVE_GCC_DIAGNOSTIC_PUSH
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#endif
     int rc = pcre2_match(p, reinterpret_cast<const PCRE2_UCHAR8 *>(str),
                          PCRE2_ZERO_TERMINATED, 0, 0, md, nullptr);
+#ifdef HAVE_GCC_DIAGNOSTIC_PUSH
+#pragma GCC diagnostic pop
+#endif
     sqlite3_result_int(ctx, rc >= 0);
 }
 
@@ -322,7 +323,7 @@ static void *OGRSQLiteRegisterRegExpFunction(sqlite3 *
     }
 
     cache_entry *cache =
-        (cache_entry *)CPLCalloc(CACHE_SIZE, sizeof(cache_entry));
+        static_cast<cache_entry *>(CPLCalloc(CACHE_SIZE, sizeof(cache_entry)));
     sqlite3_create_function(hDB, "REGEXP", 2, SQLITE_UTF8, cache,
                             OGRSQLiteREGEXPFunction, nullptr, nullptr);
 
@@ -349,7 +350,7 @@ static void OGRSQLiteFreeRegExpCache(void *
     if (hRegExpCache == nullptr)
         return;
 
-    cache_entry *cache = (cache_entry *)hRegExpCache;
+    cache_entry *cache = static_cast<cache_entry *>(hRegExpCache);
     for (int i = 0; i < CACHE_SIZE && cache[i].s; i++)
     {
         CPLFree(cache[i].s);
@@ -361,7 +362,7 @@ static void OGRSQLiteFreeRegExpCache(void *
     if (hRegExpCache == nullptr)
         return;
 
-    cache_entry *cache = (cache_entry *)hRegExpCache;
+    cache_entry *cache = static_cast<cache_entry *>(hRegExpCache);
     for (int i = 0; i < CACHE_SIZE && cache[i].s; i++)
     {
         CPLFree(cache[i].s);
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqliteregexp.h b/ogr/ogrsf_frmts/sqlite/ogrsqliteregexp.h
index 054a324e28eb..e1339ff15a43 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqliteregexp.h
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqliteregexp.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_SQLITE_REGEXP_INCLUDED
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqliteselectlayer.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqliteselectlayer.cpp
index b9112181199a..6aff267f4e17 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqliteselectlayer.cpp
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqliteselectlayer.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2004, Frank Warmerdam
  * Copyright (c) 2010-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -100,8 +84,8 @@ OGRSQLiteSelectLayer::OGRSQLiteSelectLayer(
             if (nColType == SQLITE_BLOB)
             {
                 // Is it a Spatialite geometry ?
-                const GByte *pabyBlob = (const GByte *)sqlite3_column_blob(
-                    m_hStmt, poGeomFieldDefn->m_iCol);
+                const GByte *pabyBlob = reinterpret_cast<const GByte *>(
+                    sqlite3_column_blob(m_hStmt, poGeomFieldDefn->m_iCol));
                 if (sqlite3_column_bytes(m_hStmt, poGeomFieldDefn->m_iCol) >
                         39 &&
                     pabyBlob[0] == 0x00 &&
@@ -263,7 +247,7 @@ OGRSQLiteSelectLayerCommonBehaviour::SetAttributeFilter(const char *pszQuery)
     const bool bHasSpecialFields =
         (pszQuery != nullptr && pszQuery[0] != '\0' &&
          oQuery.Compile(m_poLayer->GetLayerDefn(), pszQuery) == OGRERR_NONE &&
-         HasSpecialFields((swq_expr_node *)oQuery.GetSWQExpr(),
+         HasSpecialFields(static_cast<swq_expr_node *>(oQuery.GetSWQExpr()),
                           m_poLayer->GetLayerDefn()->GetFieldCount()));
     CPLPopErrorHandler();
 
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqlitesinglefeaturelayer.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqlitesinglefeaturelayer.cpp
index 3674f5ce1386..13a89718cf8f 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitesinglefeaturelayer.cpp
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitesinglefeaturelayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqlitesqlfunctions.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqlitesqlfunctions.cpp
index 638c592050b8..626b086e50f2 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitesqlfunctions.cpp
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitesqlfunctions.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2012-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 /* WARNING: VERY IMPORTANT NOTE: This file MUST not be directly compiled as */
@@ -63,10 +47,10 @@ static void OGR2SQLITE_ogr_version(sqlite3_context *pContext, int argc,
     }
     else
     {
-        sqlite3_result_text(
-            pContext,
-            GDALVersionInfo((const char *)sqlite3_value_text(argv[0])), -1,
-            SQLITE_TRANSIENT);
+        sqlite3_result_text(pContext,
+                            GDALVersionInfo(reinterpret_cast<const char *>(
+                                sqlite3_value_text(argv[0]))),
+                            -1, SQLITE_TRANSIENT);
     }
 }
 
@@ -105,7 +89,7 @@ static void OGR2SQLITE_Transform(sqlite3_context *pContext, int argc,
     int nDstSRSId = sqlite3_value_int(argv[2]);
 
     OGRSQLiteExtensionData *poModule =
-        (OGRSQLiteExtensionData *)sqlite3_user_data(pContext);
+        static_cast<OGRSQLiteExtensionData *>(sqlite3_user_data(pContext));
     OGRCoordinateTransformation *poCT =
         poModule->GetTransform(nSrcSRSId, nDstSRSId);
     if (poCT == nullptr)
@@ -114,17 +98,20 @@ static void OGR2SQLITE_Transform(sqlite3_context *pContext, int argc,
         return;
     }
 
-    GByte *pabySLBLOB = (GByte *)sqlite3_value_blob(argv[0]);
+    const GByte *pabySLBLOB =
+        reinterpret_cast<const GByte *>(sqlite3_value_blob(argv[0]));
     int nBLOBLen = sqlite3_value_bytes(argv[0]);
     OGRGeometry *poGeom = nullptr;
+    GByte *pabyOutBlob = nullptr;
+    int nOutBlobLen = 0;
     if (OGRSQLiteLayer::ImportSpatiaLiteGeometry(pabySLBLOB, nBLOBLen,
                                                  &poGeom) == OGRERR_NONE &&
         poGeom->transform(poCT) == OGRERR_NONE &&
         OGRSQLiteLayer::ExportSpatiaLiteGeometry(poGeom, nDstSRSId, wkbNDR,
-                                                 FALSE, FALSE, &pabySLBLOB,
-                                                 &nBLOBLen) == OGRERR_NONE)
+                                                 FALSE, FALSE, &pabyOutBlob,
+                                                 &nOutBlobLen) == OGRERR_NONE)
     {
-        sqlite3_result_blob(pContext, pabySLBLOB, nBLOBLen, CPLFree);
+        sqlite3_result_blob(pContext, pabyOutBlob, nOutBlobLen, CPLFree);
     }
     else
     {
@@ -162,7 +149,8 @@ static void OGR2SQLITE_ogr_deflate(sqlite3_context *pContext, int argc,
     void *pOut = nullptr;
     if (sqlite3_value_type(argv[0]) == SQLITE_TEXT)
     {
-        const char *pszVal = (const char *)sqlite3_value_text(argv[0]);
+        const char *pszVal =
+            reinterpret_cast<const char *>(sqlite3_value_text(argv[0]));
         pOut = CPLZLibDeflate(pszVal, strlen(pszVal) + 1, nLevel, nullptr, 0,
                               &nOutBytes);
     }
@@ -229,7 +217,7 @@ static void OGR2SQLITE_ogr_geocode_set_result(sqlite3_context *pContext,
         sqlite3_result_null(pContext);
     else
     {
-        OGRLayer *poLayer = (OGRLayer *)hLayer;
+        OGRLayer *poLayer = OGRLayer::FromHandle(hLayer);
         OGRFeatureDefn *poFDefn = poLayer->GetLayerDefn();
         OGRFeature *poFeature = poLayer->GetNextFeature();
         int nIdx;
@@ -284,19 +272,20 @@ static void OGR2SQLITE_ogr_geocode(sqlite3_context *pContext, int argc,
                                    sqlite3_value **argv)
 {
     OGRSQLiteExtensionData *poModule =
-        (OGRSQLiteExtensionData *)sqlite3_user_data(pContext);
+        static_cast<OGRSQLiteExtensionData *>(sqlite3_user_data(pContext));
 
     if (argc < 1 || sqlite3_value_type(argv[0]) != SQLITE_TEXT)
     {
         sqlite3_result_null(pContext);
         return;
     }
-    const char *pszQuery = (const char *)sqlite3_value_text(argv[0]);
+    const char *pszQuery =
+        reinterpret_cast<const char *>(sqlite3_value_text(argv[0]));
 
     CPLString osField = "geometry";
     if (argc >= 2 && sqlite3_value_type(argv[1]) == SQLITE_TEXT)
     {
-        osField = (const char *)sqlite3_value_text(argv[1]);
+        osField = reinterpret_cast<const char *>(sqlite3_value_text(argv[1]));
     }
 
     char **papszOptions = nullptr;
@@ -305,7 +294,8 @@ static void OGR2SQLITE_ogr_geocode(sqlite3_context *pContext, int argc,
         if (sqlite3_value_type(argv[i]) == SQLITE_TEXT)
         {
             papszOptions = CSLAddString(
-                papszOptions, (const char *)sqlite3_value_text(argv[i]));
+                papszOptions,
+                reinterpret_cast<const char *>(sqlite3_value_text(argv[i])));
         }
     }
 
@@ -353,7 +343,7 @@ static double OGR2SQLITE_GetValAsDouble(sqlite3_value *val, int *pbGotVal)
         case SQLITE_INTEGER:
             if (pbGotVal)
                 *pbGotVal = TRUE;
-            return (double)sqlite3_value_int64(val);
+            return static_cast<double>(sqlite3_value_int64(val));
 
         default:
             if (pbGotVal)
@@ -375,7 +365,8 @@ OGR2SQLITE_GetGeom(sqlite3_context * /*pContext*/, int /* argc */,
         return nullptr;
     }
 
-    GByte *pabySLBLOB = (GByte *)sqlite3_value_blob(argv[0]);
+    const GByte *pabySLBLOB =
+        reinterpret_cast<const GByte *>(sqlite3_value_blob(argv[0]));
     int nBLOBLen = sqlite3_value_bytes(argv[0]);
     OGRGeometry *poGeom = nullptr;
     if (OGRSQLiteLayer::ImportSpatiaLiteGeometry(pabySLBLOB, nBLOBLen, &poGeom,
@@ -396,7 +387,7 @@ static void OGR2SQLITE_ogr_geocode_reverse(sqlite3_context *pContext, int argc,
                                            sqlite3_value **argv)
 {
     OGRSQLiteExtensionData *poModule =
-        (OGRSQLiteExtensionData *)sqlite3_user_data(pContext);
+        static_cast<OGRSQLiteExtensionData *>(sqlite3_user_data(pContext));
 
     double dfLon = 0.0;
     double dfLat = 0.0;
@@ -440,7 +431,7 @@ static void OGR2SQLITE_ogr_geocode_reverse(sqlite3_context *pContext, int argc,
     }
 
     const char *pszField =
-        (const char *)sqlite3_value_text(argv[iAfterGeomIdx]);
+        reinterpret_cast<const char *>(sqlite3_value_text(argv[iAfterGeomIdx]));
 
     char **papszOptions = nullptr;
     for (int i = iAfterGeomIdx + 1; i < argc; i++)
@@ -448,7 +439,8 @@ static void OGR2SQLITE_ogr_geocode_reverse(sqlite3_context *pContext, int argc,
         if (sqlite3_value_type(argv[i]) == SQLITE_TEXT)
         {
             papszOptions = CSLAddString(
-                papszOptions, (const char *)sqlite3_value_text(argv[i]));
+                papszOptions,
+                reinterpret_cast<const char *>(sqlite3_value_text(argv[i])));
         }
     }
 
@@ -485,14 +477,15 @@ static void OGR2SQLITE_ogr_datasource_load_layers(sqlite3_context *pContext,
                                                   int argc,
                                                   sqlite3_value **argv)
 {
-    sqlite3 *hDB = (sqlite3 *)sqlite3_user_data(pContext);
+    sqlite3 *hDB = static_cast<sqlite3 *>(sqlite3_user_data(pContext));
 
     if ((argc < 1 || argc > 3) || sqlite3_value_type(argv[0]) != SQLITE_TEXT)
     {
         sqlite3_result_int(pContext, 0);
         return;
     }
-    const char *pszDataSource = (const char *)sqlite3_value_text(argv[0]);
+    const char *pszDataSource =
+        reinterpret_cast<const char *>(sqlite3_value_text(argv[0]));
 
     int bUpdate = FALSE;
     if (argc >= 2)
@@ -513,11 +506,13 @@ static void OGR2SQLITE_ogr_datasource_load_layers(sqlite3_context *pContext,
             sqlite3_result_int(pContext, 0);
             return;
         }
-        pszPrefix = (const char *)sqlite3_value_text(argv[2]);
+        pszPrefix = reinterpret_cast<const char *>(sqlite3_value_text(argv[2]));
     }
 
-    OGRDataSource *poDS =
-        (OGRDataSource *)OGROpenShared(pszDataSource, bUpdate, nullptr);
+    auto poDS = std::unique_ptr<GDALDataset>(GDALDataset::Open(
+        pszDataSource,
+        GDAL_OF_VECTOR | (bUpdate ? GDAL_OF_UPDATE : GDAL_OF_READONLY), nullptr,
+        nullptr, nullptr));
     if (poDS == nullptr)
     {
         CPLError(CE_Failure, CPLE_AppDefined, "Cannot open %s", pszDataSource);
@@ -550,7 +545,6 @@ static void OGR2SQLITE_ogr_datasource_load_layers(sqlite3_context *pContext,
                 osEscapedLayerName.c_str()));
     }
 
-    poDS->Release();
     sqlite3_result_int(pContext, 1);
 }
 
@@ -568,7 +562,8 @@ static void OGR2SQLITE_ogr_GetConfigOption(sqlite3_context *pContext, int argc,
         return;
     }
 
-    const char *pszKey = (const char *)sqlite3_value_text(argv[0]);
+    const char *pszKey =
+        reinterpret_cast<const char *>(sqlite3_value_text(argv[0]));
     const char *pszVal = CPLGetConfigOption(pszKey, nullptr);
     if (pszVal == nullptr)
         sqlite3_result_null(pContext);
@@ -595,10 +590,12 @@ static void OGR2SQLITE_ogr_SetConfigOption(sqlite3_context *pContext, int argc,
         return;
     }
 
-    const char *pszKey = (const char *)sqlite3_value_text(argv[0]);
-    const char *pszVal = (sqlite3_value_type(argv[1]) == SQLITE_TEXT)
-                             ? (const char *)sqlite3_value_text(argv[1])
-                             : nullptr;
+    const char *pszKey =
+        reinterpret_cast<const char *>(sqlite3_value_text(argv[0]));
+    const char *pszVal =
+        (sqlite3_value_type(argv[1]) == SQLITE_TEXT)
+            ? reinterpret_cast<const char *>(sqlite3_value_text(argv[1]))
+            : nullptr;
     CPLSetConfigOption(pszKey, pszVal);
     sqlite3_result_null(pContext);
 }
@@ -671,6 +668,52 @@ static void OGR2SQLITE_ST_GeodesicArea(sqlite3_context *pContext, int argc,
     }
 }
 
+/************************************************************************/
+/*                     OGR2SQLITE_ST_GeodesicLength()                   */
+/************************************************************************/
+
+static void OGR2SQLITE_ST_GeodesicLength(sqlite3_context *pContext, int argc,
+                                         sqlite3_value **argv)
+{
+    if (sqlite3_value_int(argv[1]) != 1)
+    {
+        CPLError(CE_Warning, CPLE_NotSupported,
+                 "ST_Length(geom, use_ellipsoid) is only supported for "
+                 "use_ellipsoid = 1");
+    }
+
+    int nSRSId = -1;
+    auto poGeom = OGR2SQLITE_GetGeom(pContext, argc, argv, &nSRSId);
+    if (poGeom != nullptr)
+    {
+        OGRSpatialReference oSRS;
+        oSRS.SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+        if (nSRSId > 0)
+        {
+            if (oSRS.importFromEPSG(nSRSId) != OGRERR_NONE)
+            {
+                sqlite3_result_null(pContext);
+                return;
+            }
+        }
+        else
+        {
+            CPLDebug("OGR_SQLITE",
+                     "Assuming EPSG:4326 for GeodesicLength() computation");
+            oSRS.importFromEPSG(4326);
+        }
+        poGeom->assignSpatialReference(&oSRS);
+        sqlite3_result_double(
+            pContext,
+            OGR_G_GeodesicLength(OGRGeometry::ToHandle(poGeom.get())));
+        poGeom->assignSpatialReference(nullptr);
+    }
+    else
+    {
+        sqlite3_result_null(pContext);
+    }
+}
+
 #ifdef MINIMAL_SPATIAL_FUNCTIONS
 
 /************************************************************************/
@@ -709,7 +752,8 @@ static void OGR2SQLITE_ST_AsBinary(sqlite3_context *pContext, int argc,
             sqlite3_result_null(pContext);
             return;
         }
-        GByte *pabyGeomBLOB = (GByte *)VSI_MALLOC_VERBOSE(nBLOBLen);
+        GByte *pabyGeomBLOB =
+            static_cast<GByte *>(VSI_MALLOC_VERBOSE(nBLOBLen));
         if (pabyGeomBLOB != nullptr)
         {
             if (poGeom->exportToWkb(wkbNDR, pabyGeomBLOB) == OGRERR_NONE)
@@ -774,7 +818,8 @@ static void OGR2SQLITE_ST_GeomFromWKB(sqlite3_context *pContext, int argc,
     if (argc == 2 && sqlite3_value_type(argv[1]) == SQLITE_INTEGER)
         nSRID = sqlite3_value_int(argv[1]);
 
-    GByte *pabySLBLOB = (GByte *)sqlite3_value_blob(argv[0]);
+    const GByte *pabySLBLOB =
+        reinterpret_cast<const GByte *>(sqlite3_value_blob(argv[0]));
     int nBLOBLen = sqlite3_value_bytes(argv[0]);
     OGRGeometry *poGeom = nullptr;
 
@@ -926,6 +971,25 @@ static void OGR2SQLITE_ST_Area(sqlite3_context *pContext, int argc,
         sqlite3_result_null(pContext);
 }
 
+/************************************************************************/
+/*                      OGR2SQLITE_ST_Length()                          */
+/************************************************************************/
+
+static void OGR2SQLITE_ST_Length(sqlite3_context *pContext, int argc,
+                                 sqlite3_value **argv)
+{
+    auto poGeom = OGR2SQLITE_GetGeom(pContext, argc, argv, nullptr);
+    if (poGeom != nullptr)
+    {
+        CPLPushErrorHandler(CPLQuietErrorHandler);
+        sqlite3_result_double(
+            pContext, OGR_G_Length(OGRGeometry::ToHandle(poGeom.get())));
+        CPLPopErrorHandler();
+    }
+    else
+        sqlite3_result_null(pContext);
+}
+
 /************************************************************************/
 /*                     OGR2SQLITE_ST_Buffer()                           */
 /************************************************************************/
@@ -1013,8 +1077,10 @@ static void OGRSQLITE_hstore_get_value(sqlite3_context *pContext,
         return;
     }
 
-    const char *pszHStore = (const char *)sqlite3_value_text(argv[0]);
-    const char *pszSearchedKey = (const char *)sqlite3_value_text(argv[1]);
+    const char *pszHStore =
+        reinterpret_cast<const char *>(sqlite3_value_text(argv[0]));
+    const char *pszSearchedKey =
+        reinterpret_cast<const char *>(sqlite3_value_text(argv[1]));
     char *pszValue = OGRHStoreGetValue(pszHStore, pszSearchedKey);
     if (pszValue != nullptr)
         sqlite3_result_text(pContext, pszValue, -1, CPLFree);
@@ -1148,6 +1214,9 @@ static void *OGRSQLiteRegisterSQLFunctions(sqlite3 *hDB)
 
         REGISTER_ST_op(1, SRID);
         REGISTER_ST_op(1, Area);
+        // length() is a reserved SQLite function
+        sqlite3_create_function(hDB, "ST_Length", 1, UTF8_INNOCUOUS, nullptr,
+                                OGR2SQLITE_ST_Length, nullptr, nullptr);
         REGISTER_ST_op(2, Buffer);
         REGISTER_ST_op(2, MakePoint);
         REGISTER_ST_op(3, MakePoint);
@@ -1163,6 +1232,11 @@ static void *OGRSQLiteRegisterSQLFunctions(sqlite3 *hDB)
         sqlite3_create_function(hDB, "ST_Area", 2, UTF8_INNOCUOUS, nullptr,
                                 OGR2SQLITE_ST_GeodesicArea, nullptr, nullptr);
 
+        // We add a ST_Length() method with 2 arguments even when Spatialite
+        // is there to indicate we want to use the ellipsoid version
+        sqlite3_create_function(hDB, "ST_Length", 2, UTF8_INNOCUOUS, nullptr,
+                                OGR2SQLITE_ST_GeodesicLength, nullptr, nullptr);
+
         static bool gbRegisterMakeValid = [bSpatialiteAvailable, hDB]()
         {
             bool bRegisterMakeValid = false;
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqlitesqlfunctions.h b/ogr/ogrsf_frmts/sqlite/ogrsqlitesqlfunctions.h
index 5e7f057150a6..3bc88030e76d 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitesqlfunctions.h
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitesqlfunctions.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_SQLITE_SQL_FUNCTIONS_INCLUDED
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqlitesqlfunctionscommon.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqlitesqlfunctionscommon.cpp
index fe5f0d515669..0d8598d72dce 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitesqlfunctionscommon.cpp
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitesqlfunctionscommon.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2012-2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 /* WARNING: VERY IMPORTANT NOTE: This file MUST not be directly compiled as */
@@ -37,6 +21,9 @@
 
 #include "ogrsqliteregexp.cpp" /* yes the .cpp file, to make it work on Windows with load_extension('gdalXX.dll') */
 
+#include <algorithm>
+#include <cassert>
+#include <cmath>
 #include <map>
 
 #include "ogr_swq.h"
@@ -181,8 +168,7 @@ GDALDataset *OGRSQLiteExtensionData::GetDataset(const char *pszDSName)
 /*                    OGRSQLITE_gdal_get_pixel_value()                  */
 /************************************************************************/
 
-static void OGRSQLITE_gdal_get_pixel_value(sqlite3_context *pContext,
-                                           CPL_UNUSED int argc,
+static void OGRSQLITE_gdal_get_pixel_value(sqlite3_context *pContext, int argc,
                                            sqlite3_value **argv)
 {
     if (!CPLTestBool(
@@ -196,20 +182,13 @@ static void OGRSQLITE_gdal_get_pixel_value(sqlite3_context *pContext,
         return;
     }
 
-    if (sqlite3_value_type(argv[0]) != SQLITE_TEXT ||
-        sqlite3_value_type(argv[1]) != SQLITE_INTEGER ||
-        sqlite3_value_type(argv[2]) != SQLITE_TEXT ||
-        (sqlite3_value_type(argv[3]) != SQLITE_INTEGER &&
-         sqlite3_value_type(argv[3]) != SQLITE_FLOAT) ||
-        (sqlite3_value_type(argv[4]) != SQLITE_INTEGER &&
-         sqlite3_value_type(argv[4]) != SQLITE_FLOAT))
+    if (sqlite3_value_type(argv[0]) != SQLITE_TEXT)
     {
         CPLError(CE_Failure, CPLE_AppDefined,
-                 "Invalid arguments to gdal_get_pixel_value()");
+                 "Invalid arguments to gdal_get_layer_pixel_value()");
         sqlite3_result_null(pContext);
         return;
     }
-
     const char *pszDSName =
         reinterpret_cast<const char *>(sqlite3_value_text(argv[0]));
 
@@ -222,118 +201,382 @@ static void OGRSQLITE_gdal_get_pixel_value(sqlite3_context *pContext,
         return;
     }
 
-    const int nBand = sqlite3_value_int(argv[1]);
-    auto poBand = poDS->GetRasterBand(nBand);
-    if (!poBand)
+    OGRSQLite_gdal_get_pixel_value_common("gdal_get_layer_pixel_value",
+                                          pContext, argc, argv, poDS);
+}
+
+/************************************************************************/
+/*                             OGRSQLITE_LIKE()                         */
+/************************************************************************/
+
+static void OGRSQLITE_LIKE(sqlite3_context *pContext, int argc,
+                           sqlite3_value **argv)
+{
+    OGRSQLiteExtensionData *poModule =
+        static_cast<OGRSQLiteExtensionData *>(sqlite3_user_data(pContext));
+
+    // A LIKE B is implemented as like(B, A)
+    // A LIKE B ESCAPE C is implemented as like(B, A, C)
+    const char *pattern =
+        reinterpret_cast<const char *>(sqlite3_value_text(argv[0]));
+    const char *input =
+        reinterpret_cast<const char *>(sqlite3_value_text(argv[1]));
+    if (!input || !pattern)
     {
         sqlite3_result_null(pContext);
         return;
     }
-
-    const char *pszCoordType =
-        reinterpret_cast<const char *>(sqlite3_value_text(argv[2]));
-    int x, y;
-    if (EQUAL(pszCoordType, "georef"))
+    char chEscape = '\\';
+    if (argc == 3)
     {
-        const double X = sqlite3_value_double(argv[3]);
-        const double Y = sqlite3_value_double(argv[4]);
-        double adfGeoTransform[6];
-        if (poDS->GetGeoTransform(adfGeoTransform) != CE_None)
-        {
-            sqlite3_result_null(pContext);
-            return;
-        }
-        double adfInvGT[6];
-        if (!GDALInvGeoTransform(adfGeoTransform, adfInvGT))
+        const char *escape =
+            reinterpret_cast<const char *>(sqlite3_value_text(argv[2]));
+        if (!escape || escape[1] != 0)
         {
             sqlite3_result_null(pContext);
             return;
         }
-        x = static_cast<int>(adfInvGT[0] + X * adfInvGT[1] + Y * adfInvGT[2]);
-        y = static_cast<int>(adfInvGT[3] + X * adfInvGT[4] + Y * adfInvGT[5]);
+        chEscape = escape[0];
     }
-    else if (EQUAL(pszCoordType, "pixel"))
+
+    const bool insensitive = !poModule->GetCaseSensitiveLike();
+    constexpr bool bUTF8Strings = true;
+    sqlite3_result_int(pContext, swq_test_like(input, pattern, chEscape,
+                                               insensitive, bUTF8Strings));
+}
+
+/************************************************************************/
+/*                       OGRSQLITE_STDDEV_Step()                        */
+/************************************************************************/
+
+// Welford's online algorithm for variance:
+// https://en.wikipedia.org/wiki/Algorithms_for_calculating_variance#Welford's_online_algorithm
+struct OGRSQLITE_STDDEV_Context
+{
+    int64_t nValues;
+    double dfMean;
+    double dfM2;  // Accumulator for squared distance from the mean
+};
+
+static void OGRSQLITE_STDDEV_Step(sqlite3_context *pContext, int /* argc*/,
+                                  sqlite3_value **argv)
+{
+    auto pAggCtxt =
+        static_cast<OGRSQLITE_STDDEV_Context *>(sqlite3_aggregate_context(
+            pContext, static_cast<int>(sizeof(OGRSQLITE_STDDEV_Context))));
+    const auto eType = sqlite3_value_type(argv[0]);
+    if (eType != SQLITE_INTEGER && eType != SQLITE_FLOAT)
+        return;
+
+    const double dfValue = sqlite3_value_double(argv[0]);
+    pAggCtxt->nValues++;
+    const double dfDelta = dfValue - pAggCtxt->dfMean;
+    pAggCtxt->dfMean += dfDelta / pAggCtxt->nValues;
+    const double dfDelta2 = dfValue - pAggCtxt->dfMean;
+    pAggCtxt->dfM2 += dfDelta * dfDelta2;
+}
+
+/************************************************************************/
+/*                    OGRSQLITE_STDDEV_POP_Finalize()                   */
+/************************************************************************/
+
+static void OGRSQLITE_STDDEV_POP_Finalize(sqlite3_context *pContext)
+{
+    auto pAggCtxt =
+        static_cast<OGRSQLITE_STDDEV_Context *>(sqlite3_aggregate_context(
+            pContext, static_cast<int>(sizeof(OGRSQLITE_STDDEV_Context))));
+    if (pAggCtxt->nValues > 0)
     {
-        x = sqlite3_value_int(argv[3]);
-        y = sqlite3_value_int(argv[4]);
+        sqlite3_result_double(pContext,
+                              sqrt(pAggCtxt->dfM2 / pAggCtxt->nValues));
     }
-    else
+}
+
+/************************************************************************/
+/*                    OGRSQLITE_STDDEV_SAMP_Finalize()                  */
+/************************************************************************/
+
+static void OGRSQLITE_STDDEV_SAMP_Finalize(sqlite3_context *pContext)
+{
+    auto pAggCtxt =
+        static_cast<OGRSQLITE_STDDEV_Context *>(sqlite3_aggregate_context(
+            pContext, static_cast<int>(sizeof(OGRSQLITE_STDDEV_Context))));
+    if (pAggCtxt->nValues > 1)
     {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "Invalid value for 3rd argument of gdal_get_pixel_value(): "
-                 "only 'georef' or 'pixel' are supported");
-        sqlite3_result_null(pContext);
-        return;
+        sqlite3_result_double(pContext,
+                              sqrt(pAggCtxt->dfM2 / (pAggCtxt->nValues - 1)));
     }
-    if (x < 0 || x >= poDS->GetRasterXSize() || y < 0 ||
-        y >= poDS->GetRasterYSize())
+}
+
+/************************************************************************/
+/*                     OGRSQLITE_Percentile_Step()                      */
+/************************************************************************/
+
+// Percentile related code inspired from https://sqlite.org/src/file/ext/misc/percentile.c
+// of https://www.sqlite.org/draft/percentile.html
+
+// Constant added to Percentile::rPct, since rPct is initialized to 0 when unset.
+constexpr double PERCENT_ADD_CONSTANT = 1;
+
+namespace
+{
+struct Percentile
+{
+    double rPct; /* PERCENT_ADD_CONSTANT more than the value for P */
+    std::vector<double> *values; /* Array of Y values */
+};
+}  // namespace
+
+/*
+** The "step" function for percentile(Y,P) is called once for each
+** input row.
+*/
+static void OGRSQLITE_Percentile_Step(sqlite3_context *pCtx, int argc,
+                                      sqlite3_value **argv)
+{
+    assert(argc == 2 || argc == 1);
+
+    double rPct;
+
+    if (argc == 1)
     {
-        sqlite3_result_null(pContext);
-        return;
+        /* Requirement 13:  median(Y) is the same as percentile(Y,50). */
+        rPct = 50.0;
     }
-    const auto eDT = poBand->GetRasterDataType();
-    if (eDT != GDT_UInt64 && GDALDataTypeIsInteger(eDT))
+    else if (sqlite3_user_data(pCtx) == nullptr)
     {
-        int64_t nValue = 0;
-        if (poBand->RasterIO(GF_Read, x, y, 1, 1, &nValue, 1, 1, GDT_Int64, 0,
-                             0, nullptr) != CE_None)
+        /* Requirement 3:  P must be a number between 0 and 100 */
+        const int eType = sqlite3_value_numeric_type(argv[1]);
+        rPct = sqlite3_value_double(argv[1]);
+        if ((eType != SQLITE_INTEGER && eType != SQLITE_FLOAT) || rPct < 0.0 ||
+            rPct > 100.0)
         {
-            sqlite3_result_null(pContext);
+            sqlite3_result_error(pCtx,
+                                 "2nd argument to percentile() is not "
+                                 "a number between 0.0 and 100.0",
+                                 -1);
             return;
         }
-        return sqlite3_result_int64(pContext, nValue);
     }
     else
     {
-        double dfValue = 0;
-        if (poBand->RasterIO(GF_Read, x, y, 1, 1, &dfValue, 1, 1, GDT_Float64,
-                             0, 0, nullptr) != CE_None)
+        /* Requirement 3:  P must be a number between 0 and 1 */
+        const int eType = sqlite3_value_numeric_type(argv[1]);
+        rPct = sqlite3_value_double(argv[1]);
+        if ((eType != SQLITE_INTEGER && eType != SQLITE_FLOAT) || rPct < 0.0 ||
+            rPct > 1.0)
         {
-            sqlite3_result_null(pContext);
+            sqlite3_result_error(pCtx,
+                                 "2nd argument to percentile_cont() is not "
+                                 "a number between 0.0 and 1.0",
+                                 -1);
             return;
         }
-        return sqlite3_result_double(pContext, dfValue);
+        rPct *= 100.0;
+    }
+
+    /* Allocate the session context. */
+    auto p = static_cast<Percentile *>(
+        sqlite3_aggregate_context(pCtx, sizeof(Percentile)));
+    if (!p)
+        return;
+
+    /* Remember the P value.  Throw an error if the P value is different
+  ** from any prior row, per Requirement (2). */
+    if (p->rPct == 0.0)
+    {
+        p->rPct = rPct + PERCENT_ADD_CONSTANT;
+    }
+    else if (p->rPct != rPct + PERCENT_ADD_CONSTANT)
+    {
+        sqlite3_result_error(pCtx,
+                             "2nd argument to percentile() is not the "
+                             "same for all input rows",
+                             -1);
+        return;
+    }
+
+    /* Ignore rows for which the value is NULL */
+    const int eType = sqlite3_value_type(argv[0]);
+    if (eType == SQLITE_NULL)
+        return;
+
+    /* If not NULL, then Y must be numeric.  Otherwise throw an error.
+  ** Requirement 4 */
+    if (eType != SQLITE_INTEGER && eType != SQLITE_FLOAT)
+    {
+        sqlite3_result_error(pCtx,
+                             "1st argument to percentile() is not "
+                             "numeric",
+                             -1);
+        return;
+    }
+
+    /* Ignore rows for which the value is  NaN */
+    const double v = sqlite3_value_double(argv[0]);
+    if (std::isnan(v))
+    {
+        return;
+    }
+
+    if (!p->values)
+        p->values = new std::vector<double>();
+    try
+    {
+        p->values->push_back(v);
+    }
+    catch (const std::exception &)
+    {
+        delete p->values;
+        memset(p, 0, sizeof(*p));
+        sqlite3_result_error_nomem(pCtx);
+        return;
     }
 }
 
 /************************************************************************/
-/*                             OGRSQLITE_LIKE()                         */
+/*                   OGRSQLITE_Percentile_Finalize()                    */
 /************************************************************************/
 
-static void OGRSQLITE_LIKE(sqlite3_context *pContext, int argc,
-                           sqlite3_value **argv)
+/*
+** Called to compute the final output of percentile() and to clean
+** up all allocated memory.
+*/
+static void OGRSQLITE_Percentile_Finalize(sqlite3_context *pCtx)
 {
-    OGRSQLiteExtensionData *poModule =
-        static_cast<OGRSQLiteExtensionData *>(sqlite3_user_data(pContext));
+    auto p = static_cast<Percentile *>(sqlite3_aggregate_context(pCtx, 0));
+    if (!p)
+        return;
+    if (!p->values)
+        return;
+    if (!p->values->empty())
+    {
+        std::sort(p->values->begin(), p->values->end());
+        const double ix = (p->rPct - PERCENT_ADD_CONSTANT) *
+                          static_cast<double>(p->values->size() - 1) * 0.01;
+        const size_t i1 = static_cast<size_t>(ix);
+        const size_t i2 =
+            ix == static_cast<double>(i1) || i1 == p->values->size() - 1
+                ? i1
+                : i1 + 1;
+        const double v1 = (*p->values)[i1];
+        const double v2 = (*p->values)[i2];
+        const double vx = v1 + (v2 - v1) * static_cast<double>(ix - i1);
+        sqlite3_result_double(pCtx, vx);
+    }
+    delete p->values;
+    memset(p, 0, sizeof(*p));
+}
 
-    // A LIKE B is implemented as like(B, A)
-    // A LIKE B ESCAPE C is implemented as like(B, A, C)
-    const char *pattern =
-        reinterpret_cast<const char *>(sqlite3_value_text(argv[0]));
-    const char *input =
-        reinterpret_cast<const char *>(sqlite3_value_text(argv[1]));
-    if (!input || !pattern)
+/************************************************************************/
+/*                         OGRSQLITE_Mode_Step()                        */
+/************************************************************************/
+
+namespace
+{
+struct Mode
+{
+    std::map<double, uint64_t> *numericValues;
+    std::map<std::string, uint64_t> *stringValues;
+    double mostFrequentNumValue;
+    std::string *mostFrequentStr;
+    uint64_t mostFrequentValueCount;
+    bool mostFrequentValueIsStr;
+};
+}  // namespace
+
+static void OGRSQLITE_Mode_Step(sqlite3_context *pCtx, int /*argc*/,
+                                sqlite3_value **argv)
+{
+    const int eType = sqlite3_value_type(argv[0]);
+    if (eType == SQLITE_NULL)
+        return;
+
+    if (eType == SQLITE_BLOB)
     {
-        sqlite3_result_null(pContext);
+        sqlite3_result_error(pCtx, "BLOB argument not supported for mode()",
+                             -1);
         return;
     }
-    char chEscape = '\\';
-    if (argc == 3)
+
+    /* Allocate the session context. */
+    auto p = static_cast<Mode *>(sqlite3_aggregate_context(pCtx, sizeof(Mode)));
+    if (!p)
+        return;
+
+    try
     {
-        const char *escape =
-            reinterpret_cast<const char *>(sqlite3_value_text(argv[2]));
-        if (!escape || escape[1] != 0)
+        if (eType == SQLITE_TEXT)
         {
-            sqlite3_result_null(pContext);
-            return;
+            const char *pszStr =
+                reinterpret_cast<const char *>(sqlite3_value_text(argv[0]));
+            if (!p->stringValues)
+            {
+                p->stringValues = new std::map<std::string, uint64_t>();
+                p->mostFrequentStr = new std::string();
+            }
+            const uint64_t count = ++(*p->stringValues)[pszStr];
+            if (count > p->mostFrequentValueCount)
+            {
+                p->mostFrequentValueCount = count;
+                p->mostFrequentValueIsStr = true;
+                *(p->mostFrequentStr) = pszStr;
+            }
+        }
+        else
+        {
+            const double v = sqlite3_value_double(argv[0]);
+            if (std::isnan(v))
+                return;
+            if (!p->numericValues)
+                p->numericValues = new std::map<double, uint64_t>();
+            const uint64_t count = ++(*p->numericValues)[v];
+            if (count > p->mostFrequentValueCount)
+            {
+                p->mostFrequentValueCount = count;
+                p->mostFrequentValueIsStr = false;
+                p->mostFrequentNumValue = v;
+            }
         }
-        chEscape = escape[0];
     }
+    catch (const std::exception &)
+    {
+        delete p->stringValues;
+        delete p->numericValues;
+        delete p->mostFrequentStr;
+        memset(p, 0, sizeof(*p));
+        sqlite3_result_error_nomem(pCtx);
+        return;
+    }
+}
 
-    const bool insensitive = !poModule->GetCaseSensitiveLike();
-    constexpr bool bUTF8Strings = true;
-    sqlite3_result_int(pContext, swq_test_like(input, pattern, chEscape,
-                                               insensitive, bUTF8Strings));
+/************************************************************************/
+/*                       OGRSQLITE_Mode_Finalize()                      */
+/************************************************************************/
+
+static void OGRSQLITE_Mode_Finalize(sqlite3_context *pCtx)
+{
+    auto p = static_cast<Mode *>(sqlite3_aggregate_context(pCtx, 0));
+    if (!p)
+        return;
+
+    if (p->mostFrequentValueCount)
+    {
+        if (p->mostFrequentValueIsStr)
+        {
+            sqlite3_result_text(pCtx, p->mostFrequentStr->c_str(), -1,
+                                SQLITE_TRANSIENT);
+        }
+        else
+        {
+            sqlite3_result_double(pCtx, p->mostFrequentNumValue);
+        }
+    }
+
+    delete p->stringValues;
+    delete p->numericValues;
+    delete p->mostFrequentStr;
+    memset(p, 0, sizeof(*p));
 }
 
 /************************************************************************/
@@ -356,6 +599,8 @@ static OGRSQLiteExtensionData *OGRSQLiteRegisterSQLFunctionsCommon(sqlite3 *hDB)
 
     sqlite3_create_function(hDB, "gdal_get_pixel_value", 5, SQLITE_UTF8, pData,
                             OGRSQLITE_gdal_get_pixel_value, nullptr, nullptr);
+    sqlite3_create_function(hDB, "gdal_get_pixel_value", 6, SQLITE_UTF8, pData,
+                            OGRSQLITE_gdal_get_pixel_value, nullptr, nullptr);
 
     if (CPLTestBool(CPLGetConfigOption("OGR_SQLITE_USE_CUSTOM_LIKE", "YES")))
     {
@@ -365,6 +610,30 @@ static OGRSQLiteExtensionData *OGRSQLiteRegisterSQLFunctionsCommon(sqlite3 *hDB)
                                 OGRSQLITE_LIKE, nullptr, nullptr);
     }
 
+    sqlite3_create_function(hDB, "STDDEV_POP", 1, UTF8_INNOCUOUS, nullptr,
+                            nullptr, OGRSQLITE_STDDEV_Step,
+                            OGRSQLITE_STDDEV_POP_Finalize);
+
+    sqlite3_create_function(hDB, "STDDEV_SAMP", 1, UTF8_INNOCUOUS, nullptr,
+                            nullptr, OGRSQLITE_STDDEV_Step,
+                            OGRSQLITE_STDDEV_SAMP_Finalize);
+
+    sqlite3_create_function(hDB, "median", 1, UTF8_INNOCUOUS, nullptr, nullptr,
+                            OGRSQLITE_Percentile_Step,
+                            OGRSQLITE_Percentile_Finalize);
+
+    sqlite3_create_function(hDB, "percentile", 2, UTF8_INNOCUOUS, nullptr,
+                            nullptr, OGRSQLITE_Percentile_Step,
+                            OGRSQLITE_Percentile_Finalize);
+
+    sqlite3_create_function(
+        hDB, "percentile_cont", 2, UTF8_INNOCUOUS,
+        const_cast<char *>("percentile_cont"),  // any non-null ptr
+        nullptr, OGRSQLITE_Percentile_Step, OGRSQLITE_Percentile_Finalize);
+
+    sqlite3_create_function(hDB, "mode", 1, UTF8_INNOCUOUS, nullptr, nullptr,
+                            OGRSQLITE_Mode_Step, OGRSQLITE_Mode_Finalize);
+
     pData->SetRegExpCache(OGRSQLiteRegisterRegExpFunction(hDB));
 
     return pData;
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqlitetablelayer.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqlitetablelayer.cpp
index 3a446468dbb5..0878bedc3653 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitetablelayer.cpp
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitetablelayer.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2004, Frank Warmerdam
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -480,8 +464,10 @@ CPLErr OGRSQLiteTableLayer::EstablishFeatureDefn(const char *pszGeomCol,
                 {
                     int nGeomType = atoi(papszRow[1]);
 
-                    if (nGeomType >= 0 && nGeomType <= 7) /* XY */
-                        eGeomType = (OGRwkbGeometryType)nGeomType;
+                    if (nGeomType >= static_cast<int>(wkbPoint) &&
+                        nGeomType <=
+                            static_cast<int>(wkbGeometryCollection)) /* XY */
+                        eGeomType = static_cast<OGRwkbGeometryType>(nGeomType);
                     else if (nGeomType >= 1000 && nGeomType <= 1007) /* XYZ */
                         eGeomType = wkbSetZ(wkbFlatten(nGeomType));
                     else if (nGeomType >= 2000 && nGeomType <= 2007) /* XYM */
@@ -507,7 +493,7 @@ CPLErr OGRSQLiteTableLayer::EstablishFeatureDefn(const char *pszGeomCol,
             }
             else
             {
-                eGeomType = (OGRwkbGeometryType)atoi(papszRow[1]);
+                eGeomType = static_cast<OGRwkbGeometryType>(atoi(papszRow[1]));
                 if (atoi(papszRow[2]) > 2)
                     eGeomType = wkbSetZ(eGeomType);
                 eGeomFormat = GetGeomFormat(papszRow[3]);
@@ -578,20 +564,30 @@ CPLErr OGRSQLiteTableLayer::EstablishFeatureDefn(const char *pszGeomCol,
         {
             const std::set<std::string> uniqueFieldsUC(
                 SQLGetUniqueFieldUCConstraints(hDB, m_pszTableName));
+
+            const int nFieldCount = m_poFeatureDefn->GetFieldCount();
+            std::map<std::string, int> oMapNametoIdx;
+            for (int i = 0; i < nFieldCount; ++i)
+                oMapNametoIdx[m_poFeatureDefn->GetFieldDefnUnsafe(i)
+                                  ->GetNameRef()] = i;
+
             for (int i = 0; i < nRowCount; i++)
             {
                 const char *pszName = papszResult[(i + 1) * 6 + 1];
+                if (!pszName)
+                    continue;  // should normally never happen
                 const char *pszNotNull = papszResult[(i + 1) * 6 + 3];
                 const char *pszDefault = papszResult[(i + 1) * 6 + 4];
-                const int idx = pszName != nullptr
-                                    ? m_poFeatureDefn->GetFieldIndex(pszName)
-                                    : -1;
+                int idx = -1;
+                const auto oIter = oMapNametoIdx.find(pszName);
+                if (oIter != oMapNametoIdx.end())
+                    idx = oIter->second;
                 if (pszDefault != nullptr)
                 {
                     if (idx >= 0)
                     {
                         OGRFieldDefn *poFieldDefn =
-                            m_poFeatureDefn->GetFieldDefn(idx);
+                            m_poFeatureDefn->GetFieldDefnUnsafe(idx);
                         if (poFieldDefn->GetType() == OFTString &&
                             !EQUAL(pszDefault, "NULL") &&
                             !STARTS_WITH_CI(pszDefault, "CURRENT_") &&
@@ -626,11 +622,11 @@ CPLErr OGRSQLiteTableLayer::EstablishFeatureDefn(const char *pszGeomCol,
                             poFieldDefn->SetDefault(pszDefault);
                     }
                 }
-                if (pszName != nullptr && pszNotNull != nullptr &&
-                    EQUAL(pszNotNull, "1"))
+                if (pszNotNull != nullptr && EQUAL(pszNotNull, "1"))
                 {
                     if (idx >= 0)
-                        m_poFeatureDefn->GetFieldDefn(idx)->SetNullable(0);
+                        m_poFeatureDefn->GetFieldDefnUnsafe(idx)->SetNullable(
+                            0);
                     else
                     {
                         const int geomFieldIdx =
@@ -644,7 +640,7 @@ CPLErr OGRSQLiteTableLayer::EstablishFeatureDefn(const char *pszGeomCol,
                     uniqueFieldsUC.find(CPLString(pszName).toupper()) !=
                         uniqueFieldsUC.end())
                 {
-                    m_poFeatureDefn->GetFieldDefn(idx)->SetUnique(TRUE);
+                    m_poFeatureDefn->GetFieldDefnUnsafe(idx)->SetUnique(TRUE);
                 }
             }
         }
@@ -786,8 +782,8 @@ OGRErr OGRSQLiteTableLayer::RecomputeOrdinals()
     int nRawColumns = sqlite3_column_count(hColStmt);
 
     CPLFree(m_panFieldOrdinals);
-    m_panFieldOrdinals =
-        (int *)CPLMalloc(sizeof(int) * m_poFeatureDefn->GetFieldCount());
+    m_panFieldOrdinals = static_cast<int *>(
+        CPLMalloc(sizeof(int) * m_poFeatureDefn->GetFieldCount()));
     int nCountFieldOrdinals = 0;
     int nCountGeomFieldOrdinals = 0;
     m_iFIDCol = -1;
@@ -1827,7 +1823,8 @@ OGRErr OGRSQLiteTableLayer::RunAddGeometryColumn(
                 "geometry_type, coord_dimension, srid) VALUES "
                 "('%s','%s','%s', %d, %d, %d)",
                 m_pszEscapedTableName, SQLEscapeLiteral(pszGeomCol).c_str(),
-                pszGeomFormat, (int)wkbFlatten(eType), nCoordDim, nSRSId);
+                pszGeomFormat, static_cast<int>(wkbFlatten(eType)), nCoordDim,
+                nSRSId);
         }
         else
         {
@@ -1837,7 +1834,7 @@ OGRErr OGRSQLiteTableLayer::RunAddGeometryColumn(
                 "geometry_type, coord_dimension) VALUES "
                 "('%s','%s','%s', %d, %d)",
                 m_pszEscapedTableName, SQLEscapeLiteral(pszGeomCol).c_str(),
-                pszGeomFormat, (int)wkbFlatten(eType), nCoordDim);
+                pszGeomFormat, static_cast<int>(wkbFlatten(eType)), nCoordDim);
         }
     }
 
@@ -1878,8 +1875,8 @@ void OGRSQLiteTableLayer::InitFieldListForRecrerate(
     }
 
     nBufLenOut = nFieldListLen;
-    pszFieldListForSelect = (char *)CPLCalloc(1, nFieldListLen);
-    pszNewFieldList = (char *)CPLCalloc(1, nFieldListLen);
+    pszFieldListForSelect = static_cast<char *>(CPLCalloc(1, nFieldListLen));
+    pszNewFieldList = static_cast<char *>(CPLCalloc(1, nFieldListLen));
 
     /* -------------------------------------------------------------------- */
     /*      Build list of old fields, and the list of new fields.           */
@@ -2597,7 +2594,8 @@ OGRErr OGRSQLiteTableLayer::BindValues(OGRFeature *poFeature,
                              "Too large geometry");
                     return OGRERR_FAILURE;
                 }
-                GByte *pabyWKB = (GByte *)VSI_MALLOC_VERBOSE(nWKBLen);
+                GByte *pabyWKB =
+                    static_cast<GByte *>(VSI_MALLOC_VERBOSE(nWKBLen));
                 if (pabyWKB)
                 {
                     poGeom->exportToWkb(wkbNDR, pabyWKB);
@@ -2662,26 +2660,29 @@ OGRErr OGRSQLiteTableLayer::BindValues(OGRFeature *poFeature,
         }
         else
         {
-            OGRFieldDefn *poFieldDefn = m_poFeatureDefn->GetFieldDefn(iField);
+            const OGRFieldDefn *poFieldDefn =
+                m_poFeatureDefn->GetFieldDefnUnsafe(iField);
             switch (poFieldDefn->GetType())
             {
                 case OFTInteger:
                 {
-                    int nFieldVal = poFeature->GetFieldAsInteger(iField);
+                    int nFieldVal = poFeature->GetFieldAsIntegerUnsafe(iField);
                     rc = sqlite3_bind_int(m_hStmtIn, nBindField++, nFieldVal);
                     break;
                 }
 
                 case OFTInteger64:
                 {
-                    GIntBig nFieldVal = poFeature->GetFieldAsInteger64(iField);
+                    GIntBig nFieldVal =
+                        poFeature->GetFieldAsInteger64Unsafe(iField);
                     rc = sqlite3_bind_int64(m_hStmtIn, nBindField++, nFieldVal);
                     break;
                 }
 
                 case OFTReal:
                 {
-                    double dfFieldVal = poFeature->GetFieldAsDouble(iField);
+                    double dfFieldVal =
+                        poFeature->GetFieldAsDoubleUnsafe(iField);
                     rc = sqlite3_bind_double(m_hStmtIn, nBindField++,
                                              dfFieldVal);
                     break;
@@ -2745,7 +2746,7 @@ OGRErr OGRSQLiteTableLayer::BindValues(OGRFeature *poFeature,
                                  nHour, nMinute, fSecond);
                     else
                         snprintf(szBuffer, sizeof(szBuffer), "%02d:%02d:%02d",
-                                 nHour, nMinute, (int)fSecond);
+                                 nHour, nMinute, static_cast<int>(fSecond));
                     rc = sqlite3_bind_text(m_hStmtIn, nBindField++, szBuffer,
                                            -1, SQLITE_TRANSIENT);
                     break;
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqliteutility.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqliteutility.cpp
index 43301e140682..38b871e5c19e 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqliteutility.cpp
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqliteutility.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2013, Paul Ramsey <pramsey@boundlessgeo.com>
  * Copyright (c) 2020, Alessandro Pasotti <elpaso@itopen.it>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -37,6 +21,7 @@
 
 #include "cpl_error.h"
 #include "ogr_p.h"
+#include "gdal_priv.h"
 
 SQLResult::SQLResult(char **result, int nRow, int nCol)
     : papszResult(result), nRowCount(nRow), nColCount(nCol)
@@ -424,14 +409,14 @@ std::set<std::string> SQLGetUniqueFieldUCConstraints(
                 }
             }
         }
-        else if (osStr[pos] == ',')
+        else if (osStr[pos] == ',' || osStr[pos] == '(' || osStr[pos] == ')')
         {
-            osToken = ',';
+            osToken = osStr[pos];
             pos++;
         }
         else
         {
-            size_t pos2 = osStr.find_first_of(" \t\n\r,", pos);
+            size_t pos2 = osStr.find_first_of(") \t\n\r,", pos);
             if (pos2 == std::string::npos)
                 osToken = osStr.substr(pos);
             else
@@ -453,8 +438,18 @@ std::set<std::string> SQLGetUniqueFieldUCConstraints(
             tableDefinition =
                 tableDefinition.substr(nPosStart + 1, nPosEnd - nPosStart - 1);
             size_t pos = 0;
+            bool bHasConstraint = false;
             while (true)
             {
+                size_t posBackup = pos;
+                if (EQUAL(
+                        GetNextToken(tableDefinition, posBackup, true).c_str(),
+                        "CONSTRAINT"))
+                {
+                    bHasConstraint = true;
+                    break;
+                }
+
                 const std::string osColName =
                     GetNextToken(tableDefinition, pos, false);
                 if (osColName.empty())
@@ -473,6 +468,95 @@ std::set<std::string> SQLGetUniqueFieldUCConstraints(
                     }
                 }
             }
+
+            // Process https://www.sqlite.org/syntax/table-constraint.html
+            if (bHasConstraint)
+            {
+                while (true)
+                {
+                    if (!EQUAL(GetNextToken(tableDefinition, pos, true).c_str(),
+                               "CONSTRAINT"))
+                    {
+                        break;
+                    }
+
+                    const std::string osConstraintName =
+                        GetNextToken(tableDefinition, pos, false);
+                    if (osConstraintName.empty())
+                    {
+                        break;
+                    }
+
+                    const std::string osConstraintType =
+                        GetNextToken(tableDefinition, pos, true);
+                    if (osConstraintType.empty())
+                    {
+                        break;
+                    }
+
+                    if (EQUAL(osConstraintType.c_str(), "UNIQUE"))
+                    {
+                        std::string osToken =
+                            GetNextToken(tableDefinition, pos, true);
+                        if (osToken != "(")
+                            break;
+
+                        const std::string osColName =
+                            GetNextToken(tableDefinition, pos, false);
+                        osToken = GetNextToken(tableDefinition, pos, true);
+                        if (osToken == ")")
+                        {
+                            // Only takes into account single column unique constraint
+                            uniqueFieldsUC.insert(
+                                CPLString(osColName).toupper());
+                        }
+                        else
+                        {
+                            // Skip tokens until ')'
+                            if (!osToken.empty())
+                            {
+                                do
+                                {
+                                    osToken = GetNextToken(tableDefinition, pos,
+                                                           true);
+                                } while (!osToken.empty() && osToken != ")");
+                            }
+                            if (osToken.empty())
+                                break;
+                        }
+                        osToken = GetNextToken(tableDefinition, pos, true);
+                        if (osToken != ",")
+                            break;
+                    }
+                    else
+                    {
+                        // Skip ignored constraint types by looking for the
+                        // next "," token, that is not inside parenthesis.
+                        int nCountParenthesis = 0;
+                        std::string osToken;
+                        while (true)
+                        {
+                            osToken = GetNextToken(tableDefinition, pos, true);
+                            if (osToken.empty())
+                                break;
+                            if (nCountParenthesis == 0 && osToken == ",")
+                                break;
+                            else if (osToken == "(")
+                                nCountParenthesis++;
+                            else if (osToken == ")")
+                            {
+                                nCountParenthesis--;
+                                if (nCountParenthesis < 0)
+                                {
+                                    break;
+                                }
+                            }
+                        }
+                        if (!(nCountParenthesis == 0 && osToken == ","))
+                            break;
+                    }
+                }
+            }
         }
     }
 
@@ -749,3 +833,127 @@ double SQLResult::GetValueAsDouble(int iColNum, int iRowNum) const
 
     return CPLStrtod(pszValue, nullptr);
 }
+
+/************************************************************************/
+/*                  OGRSQLite_gdal_get_pixel_value_common()             */
+/************************************************************************/
+
+void OGRSQLite_gdal_get_pixel_value_common(const char *pszFunctionName,
+                                           sqlite3_context *pContext, int argc,
+                                           sqlite3_value **argv,
+                                           GDALDataset *poDS)
+{
+    if (sqlite3_value_type(argv[1]) != SQLITE_INTEGER ||
+        sqlite3_value_type(argv[2]) != SQLITE_TEXT ||
+        (sqlite3_value_type(argv[3]) != SQLITE_INTEGER &&
+         sqlite3_value_type(argv[3]) != SQLITE_FLOAT) ||
+        (sqlite3_value_type(argv[4]) != SQLITE_INTEGER &&
+         sqlite3_value_type(argv[4]) != SQLITE_FLOAT) ||
+        (argc == 6 && sqlite3_value_type(argv[5]) != SQLITE_TEXT))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Invalid arguments to %s()",
+                 pszFunctionName);
+        sqlite3_result_null(pContext);
+        return;
+    }
+
+    const int nBand = sqlite3_value_int(argv[1]);
+    auto poBand = poDS->GetRasterBand(nBand);
+    if (!poBand)
+    {
+        sqlite3_result_null(pContext);
+        return;
+    }
+
+    const char *pszCoordType =
+        reinterpret_cast<const char *>(sqlite3_value_text(argv[2]));
+    double x, y;
+    if (EQUAL(pszCoordType, "georef"))
+    {
+        const double X = sqlite3_value_double(argv[3]);
+        const double Y = sqlite3_value_double(argv[4]);
+        double adfGeoTransform[6];
+        if (poDS->GetGeoTransform(adfGeoTransform) != CE_None)
+        {
+            sqlite3_result_null(pContext);
+            return;
+        }
+        double adfInvGT[6];
+        if (!GDALInvGeoTransform(adfGeoTransform, adfInvGT))
+        {
+            sqlite3_result_null(pContext);
+            return;
+        }
+        x = adfInvGT[0] + X * adfInvGT[1] + Y * adfInvGT[2];
+        y = adfInvGT[3] + X * adfInvGT[4] + Y * adfInvGT[5];
+    }
+    else if (EQUAL(pszCoordType, "pixel"))
+    {
+        x = sqlite3_value_int(argv[3]);
+        y = sqlite3_value_int(argv[4]);
+    }
+    else
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Invalid value for 3rd argument of gdal_get_pixel_value(): "
+                 "only 'georef' or 'pixel' are supported");
+        sqlite3_result_null(pContext);
+        return;
+    }
+    if (x < 0 || x >= poDS->GetRasterXSize() || y < 0 ||
+        y >= poDS->GetRasterYSize())
+    {
+        sqlite3_result_null(pContext);
+        return;
+    }
+
+    const auto eInterpolation =
+        argc == 6 ? GDALRasterIOGetResampleAlg(reinterpret_cast<const char *>(
+                        sqlite3_value_text(argv[5])))
+                  : GRIORA_NearestNeighbour;
+
+    const auto eDT = poBand->GetRasterDataType();
+    if (eDT == GDT_Int64 && eInterpolation == GRIORA_NearestNeighbour)
+    {
+        int64_t nValue = 0;
+        if (poBand->RasterIO(GF_Read, static_cast<int>(x), static_cast<int>(y),
+                             1, 1, &nValue, 1, 1, GDT_Int64, 0, 0,
+                             nullptr) != CE_None)
+        {
+            sqlite3_result_null(pContext);
+            return;
+        }
+        return sqlite3_result_int64(pContext, nValue);
+    }
+    else if (eDT == GDT_UInt64 && eInterpolation == GRIORA_NearestNeighbour)
+    {
+        uint64_t nValue = 0;
+        if (poBand->RasterIO(GF_Read, static_cast<int>(x), static_cast<int>(y),
+                             1, 1, &nValue, 1, 1, GDT_UInt64, 0, 0,
+                             nullptr) != CE_None)
+        {
+            sqlite3_result_null(pContext);
+            return;
+        }
+        if (nValue > static_cast<uint64_t>(INT64_MAX))
+        {
+            // Not ideal
+            return sqlite3_result_double(pContext, static_cast<double>(nValue));
+        }
+        else
+        {
+            return sqlite3_result_int64(pContext, static_cast<int64_t>(nValue));
+        }
+    }
+    else
+    {
+        double dfValue = 0;
+        if (poBand->InterpolateAtPoint(x, y, eInterpolation, &dfValue,
+                                       nullptr) != CE_None)
+        {
+            sqlite3_result_null(pContext);
+            return;
+        }
+        return sqlite3_result_double(pContext, dfValue);
+    }
+}
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqliteutility.h b/ogr/ogrsf_frmts/sqlite/ogrsqliteutility.h
index bf753bf22a27..2e32f947a05f 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqliteutility.h
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqliteutility.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Paul Ramsey <pramsey@boundlessgeo.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_SQLITEUTILITY_H_INCLUDED
@@ -105,4 +89,11 @@ bool OGRSQLiteRTreeRequiresTrustedSchemaOn();
 
 bool OGRSQLiteIsSpatialFunctionReturningGeometry(const char *pszName);
 
+class GDALDataset;
+
+void OGRSQLite_gdal_get_pixel_value_common(const char *pszFunctionName,
+                                           sqlite3_context *pContext, int argc,
+                                           sqlite3_value **argv,
+                                           GDALDataset *poDS);
+
 #endif  // OGR_SQLITEUTILITY_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqlitevfs.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqlitevfs.cpp
index 1e884ad77d5e..515095eec6a2 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitevfs.cpp
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitevfs.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -33,7 +17,6 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "cpl_atomic_ops.h"
 #include "cpl_conv.h"
 #include "cpl_error.h"
 #include "cpl_string.h"
@@ -54,11 +37,10 @@ typedef struct
     sqlite3_vfs *pDefaultVFS;
     pfnNotifyFileOpenedType pfn;
     void *pfnUserData;
-    int nCounter;
 } OGRSQLiteVFSAppDataStruct;
 
 #define GET_UNDERLYING_VFS(pVFS)                                               \
-    ((OGRSQLiteVFSAppDataStruct *)pVFS->pAppData)->pDefaultVFS
+    static_cast<OGRSQLiteVFSAppDataStruct *>(pVFS->pAppData)->pDefaultVFS
 
 typedef struct
 {
@@ -70,7 +52,8 @@ typedef struct
 
 static int OGRSQLiteIOClose(sqlite3_file *pFile)
 {
-    OGRSQLiteFileStruct *pMyFile = (OGRSQLiteFileStruct *)pFile;
+    OGRSQLiteFileStruct *pMyFile =
+        reinterpret_cast<OGRSQLiteFileStruct *>(pFile);
 #ifdef DEBUG_IO
     CPLDebug("SQLITE", "OGRSQLiteIOClose(%p (%s))", pMyFile->fp,
              pMyFile->pszFilename);
@@ -85,16 +68,17 @@ static int OGRSQLiteIOClose(sqlite3_file *pFile)
 static int OGRSQLiteIORead(sqlite3_file *pFile, void *pBuffer, int iAmt,
                            sqlite3_int64 iOfst)
 {
-    OGRSQLiteFileStruct *pMyFile = (OGRSQLiteFileStruct *)pFile;
-    VSIFSeekL(pMyFile->fp, (vsi_l_offset)iOfst, SEEK_SET);
-    int nRead = (int)VSIFReadL(pBuffer, 1, iAmt, pMyFile->fp);
+    OGRSQLiteFileStruct *pMyFile =
+        reinterpret_cast<OGRSQLiteFileStruct *>(pFile);
+    VSIFSeekL(pMyFile->fp, static_cast<vsi_l_offset>(iOfst), SEEK_SET);
+    int nRead = static_cast<int>(VSIFReadL(pBuffer, 1, iAmt, pMyFile->fp));
 #ifdef DEBUG_IO
     CPLDebug("SQLITE", "OGRSQLiteIORead(%p, %d, %d) = %d", pMyFile->fp, iAmt,
-             (int)iOfst, nRead);
+             static_cast<int>(iOfst), nRead);
 #endif
     if (nRead < iAmt)
     {
-        memset(((char *)pBuffer) + nRead, 0, iAmt - nRead);
+        memset(static_cast<char *>(pBuffer) + nRead, 0, iAmt - nRead);
         return SQLITE_IOERR_SHORT_READ;
     }
     return SQLITE_OK;
@@ -103,12 +87,13 @@ static int OGRSQLiteIORead(sqlite3_file *pFile, void *pBuffer, int iAmt,
 static int OGRSQLiteIOWrite(sqlite3_file *pFile, const void *pBuffer, int iAmt,
                             sqlite3_int64 iOfst)
 {
-    OGRSQLiteFileStruct *pMyFile = (OGRSQLiteFileStruct *)pFile;
-    VSIFSeekL(pMyFile->fp, (vsi_l_offset)iOfst, SEEK_SET);
-    int nWritten = (int)VSIFWriteL(pBuffer, 1, iAmt, pMyFile->fp);
+    OGRSQLiteFileStruct *pMyFile =
+        reinterpret_cast<OGRSQLiteFileStruct *>(pFile);
+    VSIFSeekL(pMyFile->fp, static_cast<vsi_l_offset>(iOfst), SEEK_SET);
+    int nWritten = static_cast<int>(VSIFWriteL(pBuffer, 1, iAmt, pMyFile->fp));
 #ifdef DEBUG_IO
     CPLDebug("SQLITE", "OGRSQLiteIOWrite(%p, %d, %d) = %d", pMyFile->fp, iAmt,
-             (int)iOfst, nWritten);
+             static_cast<int>(iOfst), nWritten);
 #endif
     if (nWritten < iAmt)
     {
@@ -119,7 +104,8 @@ static int OGRSQLiteIOWrite(sqlite3_file *pFile, const void *pBuffer, int iAmt,
 
 static int OGRSQLiteIOTruncate(sqlite3_file *pFile, sqlite3_int64 size)
 {
-    OGRSQLiteFileStruct *pMyFile = (OGRSQLiteFileStruct *)pFile;
+    OGRSQLiteFileStruct *pMyFile =
+        reinterpret_cast<OGRSQLiteFileStruct *>(pFile);
 #ifdef DEBUG_IO
     CPLDebug("SQLITE", "OGRSQLiteIOTruncate(%p, " CPL_FRMT_GIB ")", pMyFile->fp,
              size);
@@ -131,7 +117,8 @@ static int OGRSQLiteIOTruncate(sqlite3_file *pFile, sqlite3_int64 size)
 static int OGRSQLiteIOSync(DEBUG_ONLY sqlite3_file *pFile, DEBUG_ONLY int flags)
 {
 #ifdef DEBUG_IO
-    OGRSQLiteFileStruct *pMyFile = (OGRSQLiteFileStruct *)pFile;
+    OGRSQLiteFileStruct *pMyFile =
+        reinterpret_cast<OGRSQLiteFileStruct *>(pFile);
     CPLDebug("SQLITE", "OGRSQLiteIOSync(%p, %d)", pMyFile->fp, flags);
 #endif
     return SQLITE_OK;
@@ -139,7 +126,8 @@ static int OGRSQLiteIOSync(DEBUG_ONLY sqlite3_file *pFile, DEBUG_ONLY int flags)
 
 static int OGRSQLiteIOFileSize(sqlite3_file *pFile, sqlite3_int64 *pSize)
 {
-    OGRSQLiteFileStruct *pMyFile = (OGRSQLiteFileStruct *)pFile;
+    OGRSQLiteFileStruct *pMyFile =
+        reinterpret_cast<OGRSQLiteFileStruct *>(pFile);
     vsi_l_offset nCurOffset = VSIFTellL(pMyFile->fp);
     VSIFSeekL(pMyFile->fp, 0, SEEK_END);
     *pSize = VSIFTellL(pMyFile->fp);
@@ -154,7 +142,8 @@ static int OGRSQLiteIOFileSize(sqlite3_file *pFile, sqlite3_int64 *pSize)
 static int OGRSQLiteIOLock(DEBUG_ONLY sqlite3_file *pFile, DEBUG_ONLY int flags)
 {
 #ifdef DEBUG_IO
-    OGRSQLiteFileStruct *pMyFile = (OGRSQLiteFileStruct *)pFile;
+    OGRSQLiteFileStruct *pMyFile =
+        reinterpret_cast<OGRSQLiteFileStruct *>(pFile);
     CPLDebug("SQLITE", "OGRSQLiteIOLock(%p)", pMyFile->fp);
 #endif
     return SQLITE_OK;
@@ -164,7 +153,8 @@ static int OGRSQLiteIOUnlock(DEBUG_ONLY sqlite3_file *pFile,
                              DEBUG_ONLY int flags)
 {
 #ifdef DEBUG_IO
-    OGRSQLiteFileStruct *pMyFile = (OGRSQLiteFileStruct *)pFile;
+    OGRSQLiteFileStruct *pMyFile =
+        reinterpret_cast<OGRSQLiteFileStruct *>(pFile);
     CPLDebug("SQLITE", "OGRSQLiteIOUnlock(%p)", pMyFile->fp);
 #endif
     return SQLITE_OK;
@@ -174,7 +164,8 @@ static int OGRSQLiteIOCheckReservedLock(DEBUG_ONLY sqlite3_file *pFile,
                                         DEBUG_ONLY int *pResOut)
 {
 #ifdef DEBUG_IO
-    OGRSQLiteFileStruct *pMyFile = (OGRSQLiteFileStruct *)pFile;
+    OGRSQLiteFileStruct *pMyFile =
+        reinterpret_cast<OGRSQLiteFileStruct *>(pFile);
     CPLDebug("SQLITE", "OGRSQLiteIOCheckReservedLock(%p)", pMyFile->fp);
 #endif
     *pResOut = 0;
@@ -185,7 +176,8 @@ static int OGRSQLiteIOFileControl(DEBUG_ONLY sqlite3_file *pFile,
                                   DEBUG_ONLY int op, DEBUG_ONLY void *pArg)
 {
 #ifdef DEBUG_IO
-    OGRSQLiteFileStruct *pMyFile = (OGRSQLiteFileStruct *)pFile;
+    OGRSQLiteFileStruct *pMyFile =
+        reinterpret_cast<OGRSQLiteFileStruct *>(pFile);
     CPLDebug("SQLITE", "OGRSQLiteIOFileControl(%p, %d)", pMyFile->fp, op);
 #endif
     return SQLITE_NOTFOUND;
@@ -194,7 +186,8 @@ static int OGRSQLiteIOFileControl(DEBUG_ONLY sqlite3_file *pFile,
 static int OGRSQLiteIOSectorSize(DEBUG_ONLY sqlite3_file *pFile)
 {
 #ifdef DEBUG_IO
-    OGRSQLiteFileStruct *pMyFile = (OGRSQLiteFileStruct *)pFile;
+    OGRSQLiteFileStruct *pMyFile =
+        reinterpret_cast<OGRSQLiteFileStruct *>(pFile);
     CPLDebug("SQLITE", "OGRSQLiteIOSectorSize(%p)", pMyFile->fp);
 #endif
     return 0;
@@ -203,7 +196,8 @@ static int OGRSQLiteIOSectorSize(DEBUG_ONLY sqlite3_file *pFile)
 static int OGRSQLiteIODeviceCharacteristics(DEBUG_ONLY sqlite3_file *pFile)
 {
 #ifdef DEBUG_IO
-    OGRSQLiteFileStruct *pMyFile = (OGRSQLiteFileStruct *)pFile;
+    OGRSQLiteFileStruct *pMyFile =
+        reinterpret_cast<OGRSQLiteFileStruct *>(pFile);
     CPLDebug("SQLITE", "OGRSQLiteIODeviceCharacteristics(%p)", pMyFile->fp);
 #endif
     return 0;
@@ -231,39 +225,37 @@ static const sqlite3_io_methods OGRSQLiteIOMethods = {
     nullptr,  // xUnfetch
 };
 
-static int OGRSQLiteVFSOpen(sqlite3_vfs *pVFS, const char *zName,
+static int OGRSQLiteVFSOpen(sqlite3_vfs *pVFS, const char *zNameIn,
                             sqlite3_file *pFile, int flags, int *pOutFlags)
 {
 #ifdef DEBUG_IO
-    CPLDebug("SQLITE", "OGRSQLiteVFSOpen(%s, %d)", zName ? zName : "(null)",
+    CPLDebug("SQLITE", "OGRSQLiteVFSOpen(%s, %d)", zNameIn ? zNameIn : "(null)",
              flags);
 #endif
 
     OGRSQLiteVFSAppDataStruct *pAppData =
-        (OGRSQLiteVFSAppDataStruct *)pVFS->pAppData;
+        static_cast<OGRSQLiteVFSAppDataStruct *>(pVFS->pAppData);
 
-    if (zName == nullptr)
-    {
-        zName = CPLSPrintf("/vsimem/sqlite/%p_%d", pVFS,
-                           CPLAtomicInc(&(pAppData->nCounter)));
-    }
+    const std::string osName(
+        zNameIn ? zNameIn : VSIMemGenerateHiddenFilename("sqlitevfs"));
 
-    OGRSQLiteFileStruct *pMyFile = (OGRSQLiteFileStruct *)pFile;
+    OGRSQLiteFileStruct *pMyFile =
+        reinterpret_cast<OGRSQLiteFileStruct *>(pFile);
     pMyFile->pMethods = nullptr;
     pMyFile->bDeleteOnClose = FALSE;
     pMyFile->pszFilename = nullptr;
     if (flags & SQLITE_OPEN_READONLY)
-        pMyFile->fp = VSIFOpenL(zName, "rb");
+        pMyFile->fp = VSIFOpenL(osName.c_str(), "rb");
     else if (flags & SQLITE_OPEN_CREATE)
     {
         VSIStatBufL sStatBufL;
-        if (VSIStatExL(zName, &sStatBufL, VSI_STAT_EXISTS_FLAG) == 0)
-            pMyFile->fp = VSIFOpenL(zName, "rb+");
+        if (VSIStatExL(osName.c_str(), &sStatBufL, VSI_STAT_EXISTS_FLAG) == 0)
+            pMyFile->fp = VSIFOpenL(osName.c_str(), "rb+");
         else
-            pMyFile->fp = VSIFOpenL(zName, "wb+");
+            pMyFile->fp = VSIFOpenL(osName.c_str(), "wb+");
     }
     else if (flags & SQLITE_OPEN_READWRITE)
-        pMyFile->fp = VSIFOpenL(zName, "rb+");
+        pMyFile->fp = VSIFOpenL(osName.c_str(), "rb+");
     else
         pMyFile->fp = nullptr;
 
@@ -277,12 +269,12 @@ static int OGRSQLiteVFSOpen(sqlite3_vfs *pVFS, const char *zName,
     pfnNotifyFileOpenedType pfn = pAppData->pfn;
     if (pfn)
     {
-        pfn(pAppData->pfnUserData, zName, pMyFile->fp);
+        pfn(pAppData->pfnUserData, osName.c_str(), pMyFile->fp);
     }
 
     pMyFile->pMethods = &OGRSQLiteIOMethods;
     pMyFile->bDeleteOnClose = (flags & SQLITE_OPEN_DELETEONCLOSE);
-    pMyFile->pszFilename = CPLStrdup(zName);
+    pMyFile->pszFilename = CPLStrdup(osName.c_str());
 
     if (pOutFlags != nullptr)
         *pOutFlags = flags;
@@ -430,10 +422,11 @@ static int OGRSQLiteVFSCurrentTimeInt64(sqlite3_vfs * /*pVFS*/,
 {
     FILETIME ft;
     constexpr sqlite3_int64 winFiletimeEpoch =
-        23058135 * (sqlite3_int64)8640000;
-    constexpr sqlite3_int64 max32BitValue = (sqlite3_int64)2000000000 +
-                                            (sqlite3_int64)2000000000 +
-                                            (sqlite3_int64)294967296;
+        23058135 * static_cast<sqlite3_int64>(8640000);
+    constexpr sqlite3_int64 max32BitValue =
+        static_cast<sqlite3_int64>(2000000000) +
+        static_cast<sqlite3_int64>(2000000000) +
+        static_cast<sqlite3_int64>(294967296);
 
 #if defined(_WIN32_WCE)
     SYSTEMTIME time;
@@ -447,9 +440,9 @@ static int OGRSQLiteVFSCurrentTimeInt64(sqlite3_vfs * /*pVFS*/,
     GetSystemTimeAsFileTime(&ft);
 #endif
     *piNow = winFiletimeEpoch +
-             ((((sqlite3_int64)ft.dwHighDateTime) * max32BitValue) +
-              (sqlite3_int64)ft.dwLowDateTime) /
-                 (sqlite3_int64)10000;
+             ((static_cast<sqlite3_int64>(ft.dwHighDateTime) * max32BitValue) +
+              static_cast<sqlite3_int64>(ft.dwLowDateTime)) /
+                 static_cast<sqlite3_int64>(10000);
     return SQLITE_OK;
 }
 #else
@@ -459,10 +452,11 @@ static int OGRSQLiteVFSCurrentTimeInt64(sqlite3_vfs * /*pVFS*/,
                                         sqlite3_int64 *piNow)
 {
     struct timeval sNow;
-    constexpr sqlite3_int64 unixEpoch = 24405875 * (sqlite3_int64)8640000;
+    constexpr sqlite3_int64 unixEpoch =
+        24405875 * static_cast<sqlite3_int64>(8640000);
     (void)gettimeofday(&sNow, nullptr); /* Cannot fail given valid arguments */
-    *piNow =
-        unixEpoch + 1000 * (sqlite3_int64)sNow.tv_sec + sNow.tv_usec / 1000;
+    *piNow = unixEpoch + 1000 * static_cast<sqlite3_int64>(sNow.tv_sec) +
+             sNow.tv_usec / 1000;
 
     return SQLITE_OK;
 }
@@ -486,11 +480,12 @@ static int OGRSQLiteVFSGetLastError(sqlite3_vfs *pVFS, int p1, char *p2)
 sqlite3_vfs *OGRSQLiteCreateVFS(pfnNotifyFileOpenedType pfn, void *pfnUserData)
 {
     sqlite3_vfs *pDefaultVFS = sqlite3_vfs_find(nullptr);
-    sqlite3_vfs *pMyVFS = (sqlite3_vfs *)CPLCalloc(1, sizeof(sqlite3_vfs));
+    sqlite3_vfs *pMyVFS =
+        static_cast<sqlite3_vfs *>(CPLCalloc(1, sizeof(sqlite3_vfs)));
 
     OGRSQLiteVFSAppDataStruct *pVFSAppData =
-        (OGRSQLiteVFSAppDataStruct *)CPLCalloc(
-            1, sizeof(OGRSQLiteVFSAppDataStruct));
+        static_cast<OGRSQLiteVFSAppDataStruct *>(
+            CPLCalloc(1, sizeof(OGRSQLiteVFSAppDataStruct)));
     char szPtr[32];
     snprintf(szPtr, sizeof(szPtr), "%p", pVFSAppData);
     snprintf(pVFSAppData->szVFSName, sizeof(pVFSAppData->szVFSName),
@@ -498,7 +493,6 @@ sqlite3_vfs *OGRSQLiteCreateVFS(pfnNotifyFileOpenedType pfn, void *pfnUserData)
     pVFSAppData->pDefaultVFS = pDefaultVFS;
     pVFSAppData->pfn = pfn;
     pVFSAppData->pfnUserData = pfnUserData;
-    pVFSAppData->nCounter = 0;
 
     pMyVFS->iVersion = 2;
     pMyVFS->szOsFile = sizeof(OGRSQLiteFileStruct);
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqlitevfs.h b/ogr/ogrsf_frmts/sqlite/ogrsqlitevfs.h
index b331da210f06..c5d6fac650a0 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitevfs.h
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitevfs.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2021, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_SQLITE_VFS_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqliteviewlayer.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqliteviewlayer.cpp
index 3bc50f1ccb52..6395cdfcf8b2 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqliteviewlayer.cpp
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqliteviewlayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -132,14 +116,12 @@ OGRSQLiteLayer *OGRSQLiteViewLayer::GetUnderlyingLayer()
             osNewUnderlyingTableName.Printf(
                 "%s(%s)", m_osUnderlyingTableName.c_str(),
                 m_osUnderlyingGeometryColumn.c_str());
-            m_poUnderlyingLayer =
-                (OGRSQLiteLayer *)m_poDS->GetLayerByNameNotVisible(
-                    osNewUnderlyingTableName);
+            m_poUnderlyingLayer = cpl::down_cast<OGRSQLiteLayer *>(
+                m_poDS->GetLayerByNameNotVisible(osNewUnderlyingTableName));
         }
         if (m_poUnderlyingLayer == nullptr)
-            m_poUnderlyingLayer =
-                (OGRSQLiteLayer *)m_poDS->GetLayerByNameNotVisible(
-                    m_osUnderlyingTableName);
+            m_poUnderlyingLayer = cpl::down_cast<OGRSQLiteLayer *>(
+                m_poDS->GetLayerByNameNotVisible(m_osUnderlyingTableName));
     }
     return m_poUnderlyingLayer;
 }
@@ -331,9 +313,9 @@ OGRFeature *OGRSQLiteViewLayer::GetFeature(GIntBig nFeatureId)
 
     m_iNextShapeId = nFeatureId;
 
-    osSQL.Printf("SELECT \"%s\", * FROM '%s' WHERE \"%s\" = %d",
+    osSQL.Printf("SELECT \"%s\", * FROM '%s' WHERE \"%s\" = " CPL_FRMT_GIB,
                  SQLEscapeName(m_pszFIDColumn).c_str(), m_pszEscapedTableName,
-                 SQLEscapeName(m_pszFIDColumn).c_str(), (int)nFeatureId);
+                 SQLEscapeName(m_pszFIDColumn).c_str(), nFeatureId);
 
     CPLDebug("OGR_SQLITE", "exec(%s)", osSQL.c_str());
 
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp
index 21203fe0ccaf..97622d76f1d3 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2012-2013, Even Rouault <even dot rouault at spatialys.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, MAGES 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #define DEFINE_OGRSQLiteSQLFunctionsSetCaseSensitiveLike
@@ -85,7 +69,7 @@ void OGR2SQLITE_SetCaseSensitiveLike(OGR2SQLITEModule *, bool)
 {
 }
 
-int OGR2SQLITE_AddExtraDS(OGR2SQLITEModule *, OGRDataSource *)
+int OGR2SQLITE_AddExtraDS(OGR2SQLITEModule *, GDALDataset *)
 {
     return 0;
 }
@@ -113,7 +97,8 @@ void OGR2SQLITE_Register()
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
 #endif
-    sqlite3_auto_extension((void (*)(void))OGR2SQLITE_static_register);
+    sqlite3_auto_extension(
+        reinterpret_cast<void (*)(void)>(OGR2SQLITE_static_register));
 #if !defined(SQLITE_HAS_NON_DEPRECATED_AUTO_EXTENSION) && defined(__GNUC__)
 #pragma GCC diagnostic pop
 #endif
@@ -162,18 +147,22 @@ static SQLITE_EXTENSION_INIT1
     class OGR2SQLITEModule
 {
 #ifdef DEBUG
-    void *pDummy; /* to track memory leaks */
+    void *pDummy = nullptr; /* to track memory leaks */
 #endif
-    sqlite3 *hDB; /* *NOT* to be freed */
+    sqlite3 *hDB = nullptr; /* *NOT* to be freed */
+
+    GDALDataset *poDS = nullptr; /* *NOT* to be freed */
+    std::vector<std::unique_ptr<GDALDataset>>
+        apoExtraDS{}; /* each datasource to be freed */
 
-    GDALDataset *poDS;                       /* *NOT* to be freed */
-    std::vector<OGRDataSource *> apoExtraDS; /* each datasource to be freed */
+    OGRSQLiteDataSource *poSQLiteDS =
+        nullptr; /* *NOT* to be freed, might be NULL */
 
-    OGRSQLiteDataSource *poSQLiteDS; /* *NOT* to be freed, might be NULL */
+    std::map<CPLString, OGRLayer *> oMapVTableToOGRLayer{};
 
-    std::map<CPLString, OGRLayer *> oMapVTableToOGRLayer;
+    void *hHandleSQLFunctions = nullptr;
 
-    void *hHandleSQLFunctions;
+    CPL_DISALLOW_COPY_ASSIGN(OGR2SQLITEModule)
 
   public:
     OGR2SQLITEModule();
@@ -187,8 +176,8 @@ static SQLITE_EXTENSION_INIT1
         return poDS;
     }
 
-    int AddExtraDS(OGRDataSource *poDS);
-    OGRDataSource *GetExtraDS(int nIndex);
+    int AddExtraDS(GDALDataset *poDS);
+    GDALDataset *GetExtraDS(int nIndex);
 
     int FetchSRSId(const OGRSpatialReference *poSRS);
 
@@ -209,12 +198,9 @@ static SQLITE_EXTENSION_INIT1
 /************************************************************************/
 
 OGR2SQLITEModule::OGR2SQLITEModule()
-    :
 #ifdef DEBUG
-      pDummy(CPLMalloc(1)),
+    : pDummy(CPLMalloc(1))
 #endif
-      hDB(nullptr), poDS(nullptr), poSQLiteDS(nullptr),
-      hHandleSQLFunctions(nullptr)
 {
 }
 
@@ -228,8 +214,7 @@ OGR2SQLITEModule::~OGR2SQLITEModule()
     CPLFree(pDummy);
 #endif
 
-    for (int i = 0; i < static_cast<int>(apoExtraDS.size()); i++)
-        delete apoExtraDS[i];
+    apoExtraDS.clear();
 
     OGRSQLiteUnregisterSQLFunctions(hHandleSQLFunctions);
 }
@@ -248,10 +233,10 @@ void OGR2SQLITEModule::SetHandleSQLFunctions(void *hHandleSQLFunctionsIn)
 /*                            AddExtraDS()                              */
 /************************************************************************/
 
-int OGR2SQLITEModule::AddExtraDS(OGRDataSource *poDSIn)
+int OGR2SQLITEModule::AddExtraDS(GDALDataset *poDSIn)
 {
-    int nRet = (int)apoExtraDS.size();
-    apoExtraDS.push_back(poDSIn);
+    const int nRet = static_cast<int>(apoExtraDS.size());
+    apoExtraDS.push_back(std::unique_ptr<GDALDataset>(poDSIn));
     return nRet;
 }
 
@@ -259,11 +244,11 @@ int OGR2SQLITEModule::AddExtraDS(OGRDataSource *poDSIn)
 /*                            GetExtraDS()                              */
 /************************************************************************/
 
-OGRDataSource *OGR2SQLITEModule::GetExtraDS(int nIndex)
+GDALDataset *OGR2SQLITEModule::GetExtraDS(int nIndex)
 {
-    if (nIndex < 0 || nIndex >= (int)apoExtraDS.size())
+    if (nIndex < 0 || nIndex >= static_cast<int>(apoExtraDS.size()))
         return nullptr;
-    return apoExtraDS[nIndex];
+    return apoExtraDS[nIndex].get();
 }
 
 /************************************************************************/
@@ -399,7 +384,7 @@ typedef struct
     OGR2SQLITE_vtab *pVTab;
 
     /* Extension fields */
-    OGRDataSource *poDupDataSource;
+    GDALDataset *poDupDataSource;
     OGRLayer *poLayer;
     OGRFeature *poFeature;
 
@@ -448,7 +433,7 @@ static int OGR2SQLITEDetectSuspiciousUsage(sqlite3 *hDB,
     papszResult = nullptr;
 
     /* Check the triggers of each database */
-    for (int i = 0; i < (int)aosDatabaseNames.size(); i++)
+    for (const auto &osDBName : aosDatabaseNames)
     {
         nRowCount = 0;
         nColCount = 0;
@@ -459,7 +444,7 @@ static int OGR2SQLITEDetectSuspiciousUsage(sqlite3 *hDB,
                        "sql LIKE '%%%s%%' OR "
                        "sql LIKE '%%\"%s\"%%' OR "
                        "sql LIKE '%%ogr_layer_%%' )",
-                       aosDatabaseNames[i].c_str(), pszVirtualTableName,
+                       osDBName.c_str(), pszVirtualTableName,
                        SQLEscapeName(pszVirtualTableName).c_str());
 
         sqlite3_get_table(hDB, pszSQL, &papszResult, &nRowCount, &nColCount,
@@ -506,7 +491,7 @@ static int OGR2SQLITE_ConnectCreate(sqlite3 *hDB, void *pAux, int argc,
     CPLDebug("OGR2SQLITE", "ConnectCreate(%s)", argv[2]);
 #endif
 
-    OGR2SQLITEModule *poModule = (OGR2SQLITEModule *)pAux;
+    OGR2SQLITEModule *poModule = static_cast<OGR2SQLITEModule *>(pAux);
     OGRLayer *poLayer = nullptr;
     bool bExposeOGR_STYLE = false;
     bool bCloseDS = false;
@@ -579,7 +564,10 @@ static int OGR2SQLITE_ConnectCreate(sqlite3 *hDB, void *pAux, int argc,
 
         const bool bUpdate = atoi(osUpdate) != 0;
 
-        poDS = (OGRDataSource *)OGROpenShared(osDSName, bUpdate, nullptr);
+        poDS = GDALDataset::Open(
+            osDSName.c_str(),
+            GDAL_OF_VECTOR | (bUpdate ? GDAL_OF_UPDATE : GDAL_OF_READONLY),
+            nullptr, nullptr, nullptr);
         if (poDS == nullptr)
         {
             *pzErr = sqlite3_mprintf("Cannot open datasource '%s'",
@@ -637,7 +625,7 @@ static int OGR2SQLITE_ConnectCreate(sqlite3 *hDB, void *pAux, int argc,
     }
 #endif  // VIRTUAL_OGR_DYNAMIC_EXTENSION_ENABLED
     OGR2SQLITE_vtab *vtab =
-        (OGR2SQLITE_vtab *)CPLCalloc(1, sizeof(OGR2SQLITE_vtab));
+        static_cast<OGR2SQLITE_vtab *>(CPLCalloc(1, sizeof(OGR2SQLITE_vtab)));
     /* We do not need to fill the non-extended fields */
     vtab->pszVTableName = CPLStrdup(SQLEscapeName(argv[2]));
     vtab->poModule = poModule;
@@ -648,7 +636,7 @@ static int OGR2SQLITE_ConnectCreate(sqlite3 *hDB, void *pAux, int argc,
 
     poModule->RegisterVTable(vtab->pszVTableName, poLayer);
 
-    *ppVTab = (sqlite3_vtab *)vtab;
+    *ppVTab = reinterpret_cast<sqlite3_vtab *>(vtab);
 
     CPLString osSQL;
     osSQL = "CREATE TABLE ";
@@ -790,7 +778,7 @@ static int OGR2SQLITE_ConnectCreate(sqlite3 *hDB, void *pAux, int argc,
     {
         *pzErr = sqlite3_mprintf("CREATE VIRTUAL: invalid SQL statement : %s",
                                  osSQL.c_str());
-        OGR2SQLITE_DisconnectDestroy((sqlite3_vtab *)vtab);
+        OGR2SQLITE_DisconnectDestroy(reinterpret_cast<sqlite3_vtab *>(vtab));
         return SQLITE_ERROR;
     }
 
@@ -852,7 +840,7 @@ static bool OGR2SQLITE_IsHandledOp(int op)
 
 static int OGR2SQLITE_BestIndex(sqlite3_vtab *pVTab, sqlite3_index_info *pIndex)
 {
-    OGR2SQLITE_vtab *pMyVTab = (OGR2SQLITE_vtab *)pVTab;
+    OGR2SQLITE_vtab *pMyVTab = reinterpret_cast<OGR2SQLITE_vtab *>(pVTab);
     OGRFeatureDefn *poFDefn = pMyVTab->poLayer->GetLayerDefn();
 
 #ifdef DEBUG_OGR2SQLITE
@@ -978,8 +966,8 @@ static int OGR2SQLITE_BestIndex(sqlite3_vtab *pVTab, sqlite3_index_info *pIndex)
 
     if (nConstraints)
     {
-        panConstraints =
-            (int *)sqlite3_malloc((int)sizeof(int) * (1 + 2 * nConstraints));
+        panConstraints = static_cast<int *>(sqlite3_malloc(
+            static_cast<int>(sizeof(int)) * (1 + 2 * nConstraints)));
         panConstraints[0] = nConstraints;
 
         nConstraints = 0;
@@ -1003,7 +991,7 @@ static int OGR2SQLITE_BestIndex(sqlite3_vtab *pVTab, sqlite3_index_info *pIndex)
 
     if (nConstraints != 0)
     {
-        pIndex->idxStr = (char *)panConstraints;
+        pIndex->idxStr = reinterpret_cast<char *>(panConstraints);
         pIndex->needToFreeIdxStr = true;
     }
     else
@@ -1021,7 +1009,7 @@ static int OGR2SQLITE_BestIndex(sqlite3_vtab *pVTab, sqlite3_index_info *pIndex)
 
 static int OGR2SQLITE_DisconnectDestroy(sqlite3_vtab *pVTab)
 {
-    OGR2SQLITE_vtab *pMyVTab = (OGR2SQLITE_vtab *)pVTab;
+    OGR2SQLITE_vtab *pMyVTab = reinterpret_cast<OGR2SQLITE_vtab *>(pVTab);
 
 #ifdef DEBUG_OGR2SQLITE
     CPLDebug("OGR2SQLITE", "DisconnectDestroy(%s)", pMyVTab->pszVTableName);
@@ -1043,13 +1031,13 @@ static int OGR2SQLITE_DisconnectDestroy(sqlite3_vtab *pVTab)
 
 static int OGR2SQLITE_Open(sqlite3_vtab *pVTab, sqlite3_vtab_cursor **ppCursor)
 {
-    OGR2SQLITE_vtab *pMyVTab = (OGR2SQLITE_vtab *)pVTab;
+    OGR2SQLITE_vtab *pMyVTab = reinterpret_cast<OGR2SQLITE_vtab *>(pVTab);
 #ifdef DEBUG_OGR2SQLITE
     CPLDebug("OGR2SQLITE", "Open(%s, %s)", pMyVTab->poDS->GetDescription(),
              pMyVTab->poLayer->GetDescription());
 #endif
 
-    OGRDataSource *poDupDataSource = nullptr;
+    GDALDataset *poDupDataSource = nullptr;
     OGRLayer *poLayer = nullptr;
 
     if (pMyVTab->nMyRef == 0)
@@ -1058,8 +1046,8 @@ static int OGR2SQLITE_Open(sqlite3_vtab *pVTab, sqlite3_vtab_cursor **ppCursor)
     }
     else
     {
-        poDupDataSource = (OGRDataSource *)OGROpen(
-            pMyVTab->poDS->GetDescription(), FALSE, nullptr);
+        poDupDataSource = GDALDataset::FromHandle(
+            OGROpen(pMyVTab->poDS->GetDescription(), FALSE, nullptr));
         if (poDupDataSource == nullptr)
             return SQLITE_ERROR;
         poLayer = poDupDataSource->GetLayerByName(pMyVTab->poLayer->GetName());
@@ -1076,10 +1064,10 @@ static int OGR2SQLITE_Open(sqlite3_vtab *pVTab, sqlite3_vtab_cursor **ppCursor)
     }
     pMyVTab->nMyRef++;
 
-    OGR2SQLITE_vtab_cursor *pCursor =
-        (OGR2SQLITE_vtab_cursor *)CPLCalloc(1, sizeof(OGR2SQLITE_vtab_cursor));
+    OGR2SQLITE_vtab_cursor *pCursor = static_cast<OGR2SQLITE_vtab_cursor *>(
+        CPLCalloc(1, sizeof(OGR2SQLITE_vtab_cursor)));
     // We do not need to fill the non-extended fields.
-    *ppCursor = (sqlite3_vtab_cursor *)pCursor;
+    *ppCursor = reinterpret_cast<sqlite3_vtab_cursor *>(pCursor);
 
     pCursor->poDupDataSource = poDupDataSource;
     pCursor->poLayer = poLayer;
@@ -1101,7 +1089,8 @@ static int OGR2SQLITE_Open(sqlite3_vtab *pVTab, sqlite3_vtab_cursor **ppCursor)
 
 static int OGR2SQLITE_Close(sqlite3_vtab_cursor *pCursor)
 {
-    OGR2SQLITE_vtab_cursor *pMyCursor = (OGR2SQLITE_vtab_cursor *)pCursor;
+    OGR2SQLITE_vtab_cursor *pMyCursor =
+        reinterpret_cast<OGR2SQLITE_vtab_cursor *>(pCursor);
     OGR2SQLITE_vtab *pMyVTab = pMyCursor->pVTab;
 #ifdef DEBUG_OGR2SQLITE
     CPLDebug("OGR2SQLITE", "Close(%s, %s)", pMyVTab->poDS->GetDescription(),
@@ -1127,12 +1116,13 @@ static int OGR2SQLITE_Filter(sqlite3_vtab_cursor *pCursor,
                              CPL_UNUSED int idxNum, const char *idxStr,
                              int argc, sqlite3_value **argv)
 {
-    OGR2SQLITE_vtab_cursor *pMyCursor = (OGR2SQLITE_vtab_cursor *)pCursor;
+    OGR2SQLITE_vtab_cursor *pMyCursor =
+        reinterpret_cast<OGR2SQLITE_vtab_cursor *>(pCursor);
 #ifdef DEBUG_OGR2SQLITE
     CPLDebug("OGR2SQLITE", "Filter");
 #endif
 
-    int *panConstraints = (int *)idxStr;
+    const int *panConstraints = reinterpret_cast<const int *>(idxStr);
     int nConstraints = panConstraints ? panConstraints[0] : 0;
 
     if (nConstraints != argc)
@@ -1271,14 +1261,15 @@ static int OGR2SQLITE_Filter(sqlite3_vtab_cursor *pCursor,
                 // such as Decimal.Comma.
                 osAttributeFilter += osOp;
                 osAttributeFilter +=
-                    CPLSPrintf("%.18g", sqlite3_value_double(argv[i]));
+                    CPLSPrintf("%.17g", sqlite3_value_double(argv[i]));
             }
             else if (eSQLiteType == SQLITE_TEXT)
             {
                 osAttributeFilter += osOp;
                 osAttributeFilter += "'";
                 osAttributeFilter +=
-                    SQLEscapeLiteral((const char *)sqlite3_value_text(argv[i]));
+                    SQLEscapeLiteral(reinterpret_cast<const char *>(
+                        sqlite3_value_text(argv[i])));
                 osAttributeFilter += "'";
             }
             else if (eSQLiteConstraintOp == SQLITE_INDEX_CONSTRAINT_EQ &&
@@ -1337,7 +1328,8 @@ static int OGR2SQLITE_Filter(sqlite3_vtab_cursor *pCursor,
 
 static int OGR2SQLITE_Next(sqlite3_vtab_cursor *pCursor)
 {
-    OGR2SQLITE_vtab_cursor *pMyCursor = (OGR2SQLITE_vtab_cursor *)pCursor;
+    OGR2SQLITE_vtab_cursor *pMyCursor =
+        reinterpret_cast<OGR2SQLITE_vtab_cursor *>(pCursor);
 #ifdef DEBUG_OGR2SQLITE
     CPLDebug("OGR2SQLITE", "Next");
 #endif
@@ -1366,7 +1358,8 @@ static int OGR2SQLITE_Next(sqlite3_vtab_cursor *pCursor)
 
 static int OGR2SQLITE_Eof(sqlite3_vtab_cursor *pCursor)
 {
-    OGR2SQLITE_vtab_cursor *pMyCursor = (OGR2SQLITE_vtab_cursor *)pCursor;
+    OGR2SQLITE_vtab_cursor *pMyCursor =
+        reinterpret_cast<OGR2SQLITE_vtab_cursor *>(pCursor);
 #ifdef DEBUG_OGR2SQLITE
     CPLDebug("OGR2SQLITE", "Eof");
 #endif
@@ -1437,8 +1430,8 @@ static void OGR2SQLITE_ExportGeometry(OGRGeometry *poGeom, int nSRSId,
             return;
         }
 
-        pabyGeomBLOB =
-            (GByte *)CPLRealloc(pabyGeomBLOB, nGeomBLOBLen + nWkbSize + 1);
+        pabyGeomBLOB = static_cast<GByte *>(
+            CPLRealloc(pabyGeomBLOB, nGeomBLOBLen + nWkbSize + 1));
         poGeom->exportToWkb(wkbNDR, pabyGeomBLOB + nGeomBLOBLen, wkbVariantIso);
         /* Cheat a bit and add a end-of-blob spatialite marker */
         pabyGeomBLOB[nGeomBLOBLen + nWkbSize] = 0xFE;
@@ -1457,7 +1450,8 @@ static int OGR2SQLITE_Column(sqlite3_vtab_cursor *pCursor,
     CPLDebug("OGR2SQLITE", "Column %d", nCol);
 #endif
 
-    OGR2SQLITE_vtab_cursor *pMyCursor = (OGR2SQLITE_vtab_cursor *)pCursor;
+    OGR2SQLITE_vtab_cursor *pMyCursor =
+        reinterpret_cast<OGR2SQLITE_vtab_cursor *>(pCursor);
 
     OGR2SQLITE_GoToWishedIndex(pMyCursor);
 
@@ -1514,7 +1508,7 @@ static int OGR2SQLITE_Column(sqlite3_vtab_cursor *pCursor,
         else
         {
             GByte *pabyGeomBLOBDup =
-                (GByte *)CPLMalloc(pMyCursor->nGeomBLOBLen);
+                static_cast<GByte *>(CPLMalloc(pMyCursor->nGeomBLOBLen));
             memcpy(pabyGeomBLOBDup, pMyCursor->pabyGeomBLOB,
                    pMyCursor->nGeomBLOBLen);
             sqlite3_result_blob(pContext, pabyGeomBLOBDup,
@@ -1637,7 +1631,7 @@ static int OGR2SQLITE_Column(sqlite3_vtab_cursor *pCursor,
                          nMinute, fSecond);
             else
                 snprintf(szBuffer, sizeof(szBuffer), "%02d:%02d:%02d", nHour,
-                         nMinute, (int)fSecond);
+                         nMinute, static_cast<int>(fSecond));
             sqlite3_result_text(pContext, szBuffer, -1, SQLITE_TRANSIENT);
             break;
         }
@@ -1657,7 +1651,8 @@ static int OGR2SQLITE_Column(sqlite3_vtab_cursor *pCursor,
 
 static int OGR2SQLITE_Rowid(sqlite3_vtab_cursor *pCursor, sqlite3_int64 *pRowid)
 {
-    OGR2SQLITE_vtab_cursor *pMyCursor = (OGR2SQLITE_vtab_cursor *)pCursor;
+    OGR2SQLITE_vtab_cursor *pMyCursor =
+        reinterpret_cast<OGR2SQLITE_vtab_cursor *>(pCursor);
 #ifdef DEBUG_OGR2SQLITE
     CPLDebug("OGR2SQLITE", "Rowid");
 #endif
@@ -1762,8 +1757,8 @@ static OGRFeature *OGR2SQLITE_FeatureFromArgs(OGR2SQLITE_vtab *pMyVTab,
                 break;
             case SQLITE_TEXT:
             {
-                const char *pszValue =
-                    (const char *)sqlite3_value_text(argv[iArgc]);
+                const char *pszValue = reinterpret_cast<const char *>(
+                    sqlite3_value_text(argv[iArgc]));
                 switch (poLayerDefn->GetFieldDefn(i)->GetType())
                 {
                     case OFTDate:
@@ -1782,7 +1777,8 @@ static OGRFeature *OGR2SQLITE_FeatureFromArgs(OGR2SQLITE_vtab *pMyVTab,
             }
             case SQLITE_BLOB:
             {
-                GByte *paby = (GByte *)sqlite3_value_blob(argv[iArgc]);
+                GByte *paby = reinterpret_cast<GByte *>(
+                    const_cast<void *>(sqlite3_value_blob(argv[iArgc])));
                 int nLen = sqlite3_value_bytes(argv[iArgc]);
                 poFeature->SetField(i, nLen, paby);
                 break;
@@ -1795,7 +1791,7 @@ static OGRFeature *OGR2SQLITE_FeatureFromArgs(OGR2SQLITE_vtab *pMyVTab,
     if (sqlite3_value_type(argv[iArgc]) == SQLITE_TEXT)
     {
         poFeature->SetStyleString(
-            (const char *)sqlite3_value_text(argv[iArgc]));
+            reinterpret_cast<const char *>(sqlite3_value_text(argv[iArgc])));
     }
     ++iArgc;
 
@@ -1803,7 +1799,8 @@ static OGRFeature *OGR2SQLITE_FeatureFromArgs(OGR2SQLITE_vtab *pMyVTab,
     {
         if (sqlite3_value_type(argv[iArgc]) == SQLITE_BLOB)
         {
-            GByte *pabyBlob = (GByte *)sqlite3_value_blob(argv[iArgc]);
+            const GByte *pabyBlob = reinterpret_cast<const GByte *>(
+                sqlite3_value_blob(argv[iArgc]));
             int nLen = sqlite3_value_bytes(argv[iArgc]);
             OGRGeometry *poGeom = nullptr;
             if (OGRSQLiteLayer::ImportSpatiaLiteGeometry(
@@ -1827,14 +1824,15 @@ static OGRFeature *OGR2SQLITE_FeatureFromArgs(OGR2SQLITE_vtab *pMyVTab,
 
     if (sqlite3_value_type(argv[iArgc]) == SQLITE_TEXT)
     {
-        poFeature->SetNativeData((const char *)sqlite3_value_text(argv[iArgc]));
+        poFeature->SetNativeData(
+            reinterpret_cast<const char *>(sqlite3_value_text(argv[iArgc])));
     }
     ++iArgc;
 
     if (sqlite3_value_type(argv[iArgc]) == SQLITE_TEXT)
     {
         poFeature->SetNativeMediaType(
-            (const char *)sqlite3_value_text(argv[iArgc]));
+            reinterpret_cast<const char *>(sqlite3_value_text(argv[iArgc])));
     }
 
     return poFeature.release();
@@ -1849,7 +1847,7 @@ static int OGR2SQLITE_Update(sqlite3_vtab *pVTab, int argc,
 {
     CPLDebug("OGR2SQLITE", "OGR2SQLITE_Update");
 
-    OGR2SQLITE_vtab *pMyVTab = (OGR2SQLITE_vtab *)pVTab;
+    OGR2SQLITE_vtab *pMyVTab = reinterpret_cast<OGR2SQLITE_vtab *>(pVTab);
     OGRLayer *poLayer = pMyVTab->poLayer;
 
     if (argc == 1)
@@ -1958,10 +1956,11 @@ static OGRLayer *OGR2SQLITE_GetLayer(const char *pszFuncName,
         return nullptr;
     }
 
-    const char *pszVTableName = (const char *)sqlite3_value_text(argv[0]);
+    const char *pszVTableName =
+        reinterpret_cast<const char *>(sqlite3_value_text(argv[0]));
 
     OGR2SQLITEModule *poModule =
-        (OGR2SQLITEModule *)sqlite3_user_data(pContext);
+        static_cast<OGR2SQLITEModule *>(sqlite3_user_data(pContext));
 
     OGRLayer *poLayer = poModule->GetLayerForVTable(SQLUnescape(pszVTableName));
     if (poLayer == nullptr)
@@ -1988,7 +1987,7 @@ static void OGR2SQLITE_ogr_layer_Extent(sqlite3_context *pContext, int argc,
         return;
 
     OGR2SQLITEModule *poModule =
-        (OGR2SQLITEModule *)sqlite3_user_data(pContext);
+        static_cast<OGR2SQLITEModule *>(sqlite3_user_data(pContext));
 
     if (poLayer->GetGeomType() == wkbNone)
     {
@@ -2042,7 +2041,7 @@ static void OGR2SQLITE_ogr_layer_SRID(sqlite3_context *pContext, int argc,
         return;
 
     OGR2SQLITEModule *poModule =
-        (OGR2SQLITEModule *)sqlite3_user_data(pContext);
+        static_cast<OGR2SQLITEModule *>(sqlite3_user_data(pContext));
 
     if (poLayer->GetGeomType() == wkbNone)
     {
@@ -2107,7 +2106,7 @@ static void OGR2SQLITEDestroyModule(void *pData)
     // connection of proj.db that is since PROJ 8.1 a cache that is destroyed at
     // PROJ unloading, after GDAL itself has cleaned up itself. CPLDebug("OGR",
     // "Unloading VirtualOGR module");
-    delete (OGR2SQLITEModule *)pData;
+    delete static_cast<OGR2SQLITEModule *>(pData);
 }
 
 /* ENABLE_VIRTUAL_OGR_SPATIAL_INDEX is not defined */
@@ -2127,7 +2126,7 @@ typedef struct
     /* Extension fields */
     char *pszVTableName;
     OGR2SQLITEModule *poModule;
-    OGRDataSource *poDS;
+    GDALDataset *poDS;
     int bCloseDS;
     OGRLayer *poLayer;
     int nMyRef;
@@ -2143,7 +2142,7 @@ typedef struct
     OGR2SQLITESpatialIndex_vtab *pVTab;
 
     /* Extension fields */
-    OGRDataSource *poDupDataSource;
+    GDALDataset *poDupDataSource;
     OGRLayer *poLayer;
     OGRFeature *poFeature;
     int bHasSetBounds;
@@ -2172,7 +2171,7 @@ static int OGR2SQLITESpatialIndex_ConnectCreate(sqlite3 *hDB, void *pAux,
     /* -------------------------------------------------------------------- */
     /*      If called from ogrexecutesql.cpp                                */
     /* -------------------------------------------------------------------- */
-    OGRDataSource *poDS = poModule->GetDS();
+    GDALDataset *poDS = poModule->GetDS();
     if (poDS == NULL)
         return SQLITE_ERROR;
 
@@ -2196,7 +2195,7 @@ static int OGR2SQLITESpatialIndex_ConnectCreate(sqlite3 *hDB, void *pAux,
         }
     }
 
-    poDS = (OGRDataSource *)OGROpen(poDS->GetName(), FALSE, NULL);
+    poDS = (GDALDataset *)OGROpen(poDS->GetName(), FALSE, NULL);
     if (poDS == NULL)
     {
         return SQLITE_ERROR;
@@ -2395,7 +2394,7 @@ static int OGR2SQLITESpatialIndex_Open(sqlite3_vtab *pVTab,
              pMyVTab->poLayer->GetName());
 #endif
 
-    OGRDataSource *poDupDataSource = NULL;
+    GDALDataset *poDupDataSource = NULL;
     OGRLayer *poLayer = NULL;
 
     if (pMyVTab->nMyRef == 0)
@@ -2405,7 +2404,7 @@ static int OGR2SQLITESpatialIndex_Open(sqlite3_vtab *pVTab,
     else
     {
         poDupDataSource =
-            (OGRDataSource *)OGROpen(pMyVTab->poDS->GetName(), FALSE, NULL);
+            (GDALDataset *)OGROpen(pMyVTab->poDS->GetName(), FALSE, NULL);
         if (poDupDataSource == NULL)
             return SQLITE_ERROR;
         poLayer = poDupDataSource->GetLayerByName(pMyVTab->poLayer->GetName());
@@ -2510,7 +2509,7 @@ static int OGR2SQLITESpatialIndex_Filter(sqlite3_vtab_cursor *pCursor,
     }
 
 #ifdef DEBUG_OGR2SQLITE
-    CPLDebug("OGR2SQLITE", "Spatial filter : %.18g, %.18g, %.18g, %.18g",
+    CPLDebug("OGR2SQLITE", "Spatial filter : %.17g, %.17g, %.17g, %.17g",
              dfMinX, dfMinY, dfMaxX, dfMaxY);
 #endif
 
@@ -2760,7 +2759,7 @@ void OGR2SQLITE_SetCaseSensitiveLike(OGR2SQLITEModule *poModule, bool b)
 /*                       OGR2SQLITE_AddExtraDS()                        */
 /************************************************************************/
 
-int OGR2SQLITE_AddExtraDS(OGR2SQLITEModule *poModule, OGRDataSource *poDS)
+int OGR2SQLITE_AddExtraDS(OGR2SQLITEModule *poModule, GDALDataset *poDS)
 {
     return poModule->AddExtraDS(poDS);
 }
@@ -2847,7 +2846,8 @@ extern const struct sqlite3_api_routines OGRSQLITE_static_routines;
 
 int OGR2SQLITE_static_register(sqlite3 *hDB, char **pzErrMsg, void *_pApi)
 {
-    const sqlite3_api_routines *pApi = (const sqlite3_api_routines *)_pApi;
+    const sqlite3_api_routines *pApi =
+        static_cast<const sqlite3_api_routines *>(_pApi);
 #ifndef _WIN32
     if ((pApi == nullptr) || (pApi->create_module == nullptr))
     {
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.h b/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.h
index d92f7c5c9b74..67da33b285c5 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.h
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_SQLITE_VIRTUAL_OGR_H_INCLUDED
@@ -39,7 +23,7 @@ OGR2SQLITEModule *OGR2SQLITE_Setup(GDALDataset *poDS,
 
 void OGR2SQLITE_SetCaseSensitiveLike(OGR2SQLITEModule *poModule, bool b);
 
-int OGR2SQLITE_AddExtraDS(OGR2SQLITEModule *poModule, OGRDataSource *poDS);
+int OGR2SQLITE_AddExtraDS(OGR2SQLITEModule *poModule, GDALDataset *poDS);
 
 void OGR2SQLITE_Register();
 
diff --git a/ogr/ogrsf_frmts/sqlite/rasterlite2.cpp b/ogr/ogrsf_frmts/sqlite/rasterlite2.cpp
index b4c170dbf23b..019c5a15af24 100644
--- a/ogr/ogrsf_frmts/sqlite/rasterlite2.cpp
+++ b/ogr/ogrsf_frmts/sqlite/rasterlite2.cpp
@@ -14,23 +14,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/ogrsf_frmts/sqlite/rasterlite2_header.h b/ogr/ogrsf_frmts/sqlite/rasterlite2_header.h
index 614a6b310055..43744df7d3c2 100644
--- a/ogr/ogrsf_frmts/sqlite/rasterlite2_header.h
+++ b/ogr/ogrsf_frmts/sqlite/rasterlite2_header.h
@@ -14,23 +14,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef RASTERLITE_HEADER_H
diff --git a/ogr/ogrsf_frmts/sqlite/sqlite_rtree_bulk_load/sqlite_rtree_bulk_load.c b/ogr/ogrsf_frmts/sqlite/sqlite_rtree_bulk_load/sqlite_rtree_bulk_load.c
index 910399a304d1..d0af81344d1d 100644
--- a/ogr/ogrsf_frmts/sqlite/sqlite_rtree_bulk_load/sqlite_rtree_bulk_load.c
+++ b/ogr/ogrsf_frmts/sqlite/sqlite_rtree_bulk_load/sqlite_rtree_bulk_load.c
@@ -7,23 +7,7 @@
  * Copyright (c) 2020- 2023 Joshua J Baker
  * Copyright (c) 2023, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef __STDC_FORMAT_MACROS
diff --git a/ogr/ogrsf_frmts/sqlite/sqlite_rtree_bulk_load/sqlite_rtree_bulk_load.h b/ogr/ogrsf_frmts/sqlite/sqlite_rtree_bulk_load/sqlite_rtree_bulk_load.h
index 825d3c92bd42..64203af54c59 100644
--- a/ogr/ogrsf_frmts/sqlite/sqlite_rtree_bulk_load/sqlite_rtree_bulk_load.h
+++ b/ogr/ogrsf_frmts/sqlite/sqlite_rtree_bulk_load/sqlite_rtree_bulk_load.h
@@ -7,23 +7,7 @@
  * Copyright (c) 2020- 2023 Joshua J Baker
  * Copyright (c) 2023, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef SQLITE_RTREE_BULK_LOAD_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/sqlite/test_load_virtual_ogr.c b/ogr/ogrsf_frmts/sqlite/test_load_virtual_ogr.c
index 1ce77d0516db..6060444da15a 100644
--- a/ogr/ogrsf_frmts/sqlite/test_load_virtual_ogr.c
+++ b/ogr/ogrsf_frmts/sqlite/test_load_virtual_ogr.c
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifdef HAVE_SPATIALITE
diff --git a/ogr/ogrsf_frmts/svg/ogr_svg.h b/ogr/ogrsf_frmts/svg/ogr_svg.h
index e0fff08d63b7..2fa3712cab9d 100644
--- a/ogr/ogrsf_frmts/svg/ogr_svg.h
+++ b/ogr/ogrsf_frmts/svg/ogr_svg.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_SVG_H_INCLUDED
@@ -137,10 +121,8 @@ typedef enum
     SVG_VALIDITY_VALID
 } OGRSVGValidity;
 
-class OGRSVGDataSource final : public OGRDataSource
+class OGRSVGDataSource final : public GDALDataset
 {
-    char *pszName;
-
     OGRSVGLayer **papoLayers;
     int nLayers;
 
@@ -157,11 +139,6 @@ class OGRSVGDataSource final : public OGRDataSource
 
     int Open(const char *pszFilename);
 
-    virtual const char *GetName() override
-    {
-        return pszName;
-    }
-
     virtual int GetLayerCount() override
     {
         return nLayers;
@@ -169,8 +146,6 @@ class OGRSVGDataSource final : public OGRDataSource
 
     virtual OGRLayer *GetLayer(int) override;
 
-    virtual int TestCapability(const char *) override;
-
 #ifdef HAVE_EXPAT
     void startElementValidateCbk(const char *pszName, const char **ppszAttr);
     void dataHandlerValidateCbk(const char *data, int nLen);
diff --git a/ogr/ogrsf_frmts/svg/ogrsvgdatasource.cpp b/ogr/ogrsf_frmts/svg/ogrsvgdatasource.cpp
index 0731fcc8d7a1..2ee4681b7bda 100644
--- a/ogr/ogrsf_frmts/svg/ogrsvgdatasource.cpp
+++ b/ogr/ogrsf_frmts/svg/ogrsvgdatasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_svg.h"
@@ -34,7 +18,7 @@
 /************************************************************************/
 
 OGRSVGDataSource::OGRSVGDataSource()
-    : pszName(nullptr), papoLayers(nullptr), nLayers(0)
+    : papoLayers(nullptr), nLayers(0)
 #ifdef HAVE_EXPAT
       ,
       eValidity(SVG_VALIDITY_UNKNOWN), bIsCloudmade(false),
@@ -53,7 +37,6 @@ OGRSVGDataSource::~OGRSVGDataSource()
     for (int i = 0; i < nLayers; i++)
         delete papoLayers[i];
     CPLFree(papoLayers);
-    CPLFree(pszName);
 }
 
 /************************************************************************/
@@ -140,8 +123,6 @@ int OGRSVGDataSource::Open(const char *pszFilename)
 
 {
 #ifdef HAVE_EXPAT
-    pszName = CPLStrdup(pszFilename);
-
     /* -------------------------------------------------------------------- */
     /*      Try to open the file.                                           */
     /* -------------------------------------------------------------------- */
@@ -263,12 +244,3 @@ int OGRSVGDataSource::Open(const char *pszFilename)
     return FALSE;
 #endif
 }
-
-/************************************************************************/
-/*                            TestCapability()                          */
-/************************************************************************/
-
-int OGRSVGDataSource::TestCapability(CPL_UNUSED const char *pszCap)
-{
-    return FALSE;
-}
diff --git a/ogr/ogrsf_frmts/svg/ogrsvgdriver.cpp b/ogr/ogrsf_frmts/svg/ogrsvgdriver.cpp
index a8a20a2cde0d..b58947e09ab2 100644
--- a/ogr/ogrsf_frmts/svg/ogrsvgdriver.cpp
+++ b/ogr/ogrsf_frmts/svg/ogrsvgdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_svg.h"
diff --git a/ogr/ogrsf_frmts/svg/ogrsvglayer.cpp b/ogr/ogrsf_frmts/svg/ogrsvglayer.cpp
index d29baa4bec1d..af82ae2645cc 100644
--- a/ogr/ogrsf_frmts/svg/ogrsvglayer.cpp
+++ b/ogr/ogrsf_frmts/svg/ogrsvglayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_svg.h"
diff --git a/ogr/ogrsf_frmts/sxf/ogr_sxf.h b/ogr/ogrsf_frmts/sxf/ogr_sxf.h
index eb8e83d164f1..6dc2946ee8f8 100644
--- a/ogr/ogrsf_frmts/sxf/ogr_sxf.h
+++ b/ogr/ogrsf_frmts/sxf/ogr_sxf.h
@@ -10,23 +10,7 @@
  * Copyright (c) 2011, Ben Ahmed Daho Ali
  * Copyright (c) 2013, NextGIS
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_SXF_H_INCLUDED
@@ -123,15 +107,13 @@ class OGRSXFLayer final : public OGRLayer
 };
 
 /************************************************************************/
-/*                        OGRSXFDataSource                       */
+/*                           OGRSXFDataSource                           */
 /************************************************************************/
 
-class OGRSXFDataSource final : public OGRDataSource
+class OGRSXFDataSource final : public GDALDataset
 {
     SXFPassport oSXFPassport;
 
-    CPLString pszName{};
-
     std::vector<std::unique_ptr<OGRSXFLayer>> m_apoLayers{};
 
     VSILFILE *fpSXF = nullptr;
@@ -155,11 +137,6 @@ class OGRSXFDataSource final : public OGRDataSource
     int Open(const char *pszFilename, bool bUpdate,
              const char *const *papszOpenOpts = nullptr);
 
-    virtual const char *GetName() override
-    {
-        return pszName;
-    }
-
     virtual int GetLayerCount() override
     {
         return static_cast<int>(m_apoLayers.size());
@@ -171,18 +148,4 @@ class OGRSXFDataSource final : public OGRDataSource
     void CloseFile();
 };
 
-/************************************************************************/
-/*                         OGRSXFDriver                          */
-/************************************************************************/
-
-class OGRSXFDriver final : public GDALDriver
-{
-  public:
-    ~OGRSXFDriver();
-
-    static GDALDataset *Open(GDALOpenInfo *);
-    static int Identify(GDALOpenInfo *);
-    static CPLErr DeleteDataSource(const char *pszName);
-};
-
 #endif
diff --git a/ogr/ogrsf_frmts/sxf/ogrsxfdatasource.cpp b/ogr/ogrsf_frmts/sxf/ogrsxfdatasource.cpp
index 96273c29c11b..7c6adcde8045 100644
--- a/ogr/ogrsf_frmts/sxf/ogrsxfdatasource.cpp
+++ b/ogr/ogrsf_frmts/sxf/ogrsxfdatasource.cpp
@@ -12,23 +12,7 @@
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.com>
  * Copyright (c) 2019, NextGIS, <info@nextgis.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
@@ -126,9 +110,7 @@ int OGRSXFDataSource::Open(const char *pszFilename, bool bUpdateIn,
         return FALSE;
     }
 
-    pszName = pszFilename;
-
-    fpSXF = VSIFOpenL(pszName, "rb");
+    fpSXF = VSIFOpenL(pszFilename, "rb");
     if (fpSXF == nullptr)
     {
         CPLError(CE_Warning, CPLE_OpenFailed, "SXF open file %s failed",
diff --git a/ogr/ogrsf_frmts/sxf/ogrsxfdriver.cpp b/ogr/ogrsf_frmts/sxf/ogrsxfdriver.cpp
index 1cf8f118eb89..91bfd6b02df2 100644
--- a/ogr/ogrsf_frmts/sxf/ogrsxfdriver.cpp
+++ b/ogr/ogrsf_frmts/sxf/ogrsxfdriver.cpp
@@ -10,43 +10,17 @@
  * Copyright (c) 2013, NextGIS
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
 #include "ogr_sxf.h"
 
-extern "C" void RegisterOGRSXF();
-
-/************************************************************************/
-/*                       ~OGRSXFDriver()                         */
-/************************************************************************/
-
-OGRSXFDriver::~OGRSXFDriver()
-{
-}
-
 /************************************************************************/
 /*                                Open()                                */
 /************************************************************************/
 
-GDALDataset *OGRSXFDriver::Open(GDALOpenInfo *poOpenInfo)
+static GDALDataset *OGRSXFDriverOpen(GDALOpenInfo *poOpenInfo)
 
 {
     /* -------------------------------------------------------------------- */
@@ -75,7 +49,7 @@ GDALDataset *OGRSXFDriver::Open(GDALOpenInfo *poOpenInfo)
 /*                              Identify()                              */
 /************************************************************************/
 
-int OGRSXFDriver::Identify(GDALOpenInfo *poOpenInfo)
+static int OGRSXFDriverIdentify(GDALOpenInfo *poOpenInfo)
 {
     if (!EQUAL(CPLGetExtension(poOpenInfo->pszFilename), "sxf") ||
         !poOpenInfo->bStatOK || poOpenInfo->bIsDirectory)
@@ -97,10 +71,10 @@ int OGRSXFDriver::Identify(GDALOpenInfo *poOpenInfo)
 }
 
 /************************************************************************/
-/*                           DeleteDataSource()                         */
+/*                          GRSXFDriverDelete()                         */
 /************************************************************************/
 
-CPLErr OGRSXFDriver::DeleteDataSource(const char *pszName)
+static CPLErr OGRSXFDriverDelete(const char *pszName)
 {
     // TODO: add more extensions if aplicable
     static const char *const apszExtensions[] = {"szf", "rsc", "SZF", "RSC",
@@ -133,7 +107,7 @@ void RegisterOGRSXF()
     if (GDALGetDriverByName("SXF") != nullptr)
         return;
 
-    OGRSXFDriver *poDriver = new OGRSXFDriver;
+    GDALDriver *poDriver = new GDALDriver();
 
     poDriver->SetDescription("SXF");
     poDriver->SetMetadataItem(GDAL_DCAP_VECTOR, "YES");
@@ -155,9 +129,9 @@ void RegisterOGRSXF()
         "if exist' default='NO'/>"
         "</OpenOptionList>");
 
-    poDriver->pfnOpen = OGRSXFDriver::Open;
-    poDriver->pfnDelete = OGRSXFDriver::DeleteDataSource;
-    poDriver->pfnIdentify = OGRSXFDriver::Identify;
+    poDriver->pfnOpen = OGRSXFDriverOpen;
+    poDriver->pfnDelete = OGRSXFDriverDelete;
+    poDriver->pfnIdentify = OGRSXFDriverIdentify;
 
     GetGDALDriverManager()->RegisterDriver(poDriver);
 }
diff --git a/ogr/ogrsf_frmts/sxf/ogrsxflayer.cpp b/ogr/ogrsf_frmts/sxf/ogrsxflayer.cpp
index 68277834855a..a76c38a1cf33 100644
--- a/ogr/ogrsf_frmts/sxf/ogrsxflayer.cpp
+++ b/ogr/ogrsf_frmts/sxf/ogrsxflayer.cpp
@@ -11,23 +11,7 @@
  * Copyright (c) 2013, NextGIS
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_sxf.h"
diff --git a/ogr/ogrsf_frmts/sxf/org_sxf_defs.h b/ogr/ogrsf_frmts/sxf/org_sxf_defs.h
index b565b14f94c6..a75f63c0b910 100644
--- a/ogr/ogrsf_frmts/sxf/org_sxf_defs.h
+++ b/ogr/ogrsf_frmts/sxf/org_sxf_defs.h
@@ -12,23 +12,7 @@
  * Copyright (c) 2011, Ben Ahmed Daho Ali
  * Copyright (c) 2013, NextGIS
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *
  ******************************************************************************
  * Structure of the SXF file :
diff --git a/ogr/ogrsf_frmts/tiger/ogr_tiger.h b/ogr/ogrsf_frmts/tiger/ogr_tiger.h
index d033acc2a17b..8e6f2a139698 100644
--- a/ogr/ogrsf_frmts/tiger/ogr_tiger.h
+++ b/ogr/ogrsf_frmts/tiger/ogr_tiger.h
@@ -10,23 +10,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2008-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_TIGER_H_INCLUDED
@@ -501,10 +485,8 @@ class OGRTigerLayer final : public OGRLayer
 /*                          OGRTigerDataSource                          */
 /************************************************************************/
 
-class OGRTigerDataSource final : public OGRDataSource
+class OGRTigerDataSource final : public GDALDataset
 {
-    char *pszName;
-
     int nLayers;
     OGRTigerLayer **papoLayers;
 
@@ -543,17 +525,11 @@ class OGRTigerDataSource final : public OGRDataSource
     int Open(const char *pszName, int bTestOpen = FALSE,
              char **papszFileList = nullptr);
 
-    const char *GetName() override
-    {
-        return pszName;
-    }
-
     int GetLayerCount() override;
     OGRLayer *GetLayer(int) override;
     OGRLayer *GetLayer(const char *pszLayerName);
 
     void AddLayer(OGRTigerLayer *);
-    int TestCapability(const char *) override;
 
     OGRSpatialReference *DSGetSpatialRef()
     {
diff --git a/ogr/ogrsf_frmts/tiger/ogrtigerdatasource.cpp b/ogr/ogrsf_frmts/tiger/ogrtigerdatasource.cpp
index c2547f3f0d38..f68546c8c948 100644
--- a/ogr/ogrsf_frmts/tiger/ogrtigerdatasource.cpp
+++ b/ogr/ogrsf_frmts/tiger/ogrtigerdatasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_conv.h"
@@ -234,10 +218,9 @@ TigerVersion OGRTigerDataSource::TigerCheckVersion(TigerVersion nOldVersion,
 /************************************************************************/
 
 OGRTigerDataSource::OGRTigerDataSource()
-    : pszName(nullptr), nLayers(0), papoLayers(nullptr),
-      poSpatialRef(new OGRSpatialReference()), papszOptions(nullptr),
-      pszPath(nullptr), nModules(0), papszModules(nullptr), nVersionCode(0),
-      nVersion(TIGER_Unknown)
+    : nLayers(0), papoLayers(nullptr), poSpatialRef(new OGRSpatialReference()),
+      papszOptions(nullptr), pszPath(nullptr), nModules(0),
+      papszModules(nullptr), nVersionCode(0), nVersion(TIGER_Unknown)
 {
     poSpatialRef->SetWellKnownGeogCS("NAD83");
     poSpatialRef->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
@@ -255,7 +238,6 @@ OGRTigerDataSource::~OGRTigerDataSource()
 
     CPLFree(papoLayers);
 
-    CPLFree(pszName);
     CPLFree(pszPath);
 
     CSLDestroy(papszOptions);
@@ -326,8 +308,6 @@ int OGRTigerDataSource::Open(const char *pszFilename, int bTestOpen,
                              char **papszLimitedFileList)
 
 {
-    pszName = CPLStrdup(pszFilename);
-
     /* -------------------------------------------------------------------- */
     /*      Is the given path a directory or a regular file?                */
     /* -------------------------------------------------------------------- */
@@ -744,13 +724,3 @@ char *OGRTigerDataSource::BuildFilename(const char *pszModuleName,
 
     return pszFilename;
 }
-
-/************************************************************************/
-/*                           TestCapability()                           */
-/************************************************************************/
-
-int OGRTigerDataSource::TestCapability(const char *)
-
-{
-    return FALSE;
-}
diff --git a/ogr/ogrsf_frmts/tiger/ogrtigerdriver.cpp b/ogr/ogrsf_frmts/tiger/ogrtigerdriver.cpp
index 7ae10470c304..29f41a4a6536 100644
--- a/ogr/ogrsf_frmts/tiger/ogrtigerdriver.cpp
+++ b/ogr/ogrsf_frmts/tiger/ogrtigerdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_tiger.h"
diff --git a/ogr/ogrsf_frmts/tiger/ogrtigerlayer.cpp b/ogr/ogrsf_frmts/tiger/ogrtigerlayer.cpp
index e43f4b70f758..38481b2ed501 100644
--- a/ogr/ogrsf_frmts/tiger/ogrtigerlayer.cpp
+++ b/ogr/ogrsf_frmts/tiger/ogrtigerlayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_tiger.h"
diff --git a/ogr/ogrsf_frmts/tiger/tigeraltname.cpp b/ogr/ogrsf_frmts/tiger/tigeraltname.cpp
index a775ecce9927..f270d794460c 100644
--- a/ogr/ogrsf_frmts/tiger/tigeraltname.cpp
+++ b/ogr/ogrsf_frmts/tiger/tigeraltname.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_tiger.h"
@@ -115,7 +99,7 @@ OGRFeature *TigerAltName::GetFeature(int nRecordId)
     /* -------------------------------------------------------------------- */
 
     OGRFeature *poFeature = new OGRFeature(poFeatureDefn);
-    int anFeatList[5];
+    int anFeatList[5] = {0};
     int nFeatCount = 0;
 
     SetFields(psRTInfo, poFeature, achRecord);
diff --git a/ogr/ogrsf_frmts/tiger/tigerarealandmarks.cpp b/ogr/ogrsf_frmts/tiger/tigerarealandmarks.cpp
index 66560143ac34..8ec1ec7fa7ef 100644
--- a/ogr/ogrsf_frmts/tiger/tigerarealandmarks.cpp
+++ b/ogr/ogrsf_frmts/tiger/tigerarealandmarks.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_tiger.h"
diff --git a/ogr/ogrsf_frmts/tiger/tigercompletechain.cpp b/ogr/ogrsf_frmts/tiger/tigercompletechain.cpp
index 2226452309d0..a281e5a42d89 100644
--- a/ogr/ogrsf_frmts/tiger/tigercompletechain.cpp
+++ b/ogr/ogrsf_frmts/tiger/tigercompletechain.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_tiger.h"
diff --git a/ogr/ogrsf_frmts/tiger/tigerentitynames.cpp b/ogr/ogrsf_frmts/tiger/tigerentitynames.cpp
index 849ac386fe37..c822eb78afac 100644
--- a/ogr/ogrsf_frmts/tiger/tigerentitynames.cpp
+++ b/ogr/ogrsf_frmts/tiger/tigerentitynames.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_tiger.h"
diff --git a/ogr/ogrsf_frmts/tiger/tigerfeatureids.cpp b/ogr/ogrsf_frmts/tiger/tigerfeatureids.cpp
index f44ee87b1a53..644320b199cc 100644
--- a/ogr/ogrsf_frmts/tiger/tigerfeatureids.cpp
+++ b/ogr/ogrsf_frmts/tiger/tigerfeatureids.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_tiger.h"
diff --git a/ogr/ogrsf_frmts/tiger/tigerfilebase.cpp b/ogr/ogrsf_frmts/tiger/tigerfilebase.cpp
index 20be01142389..0917aa025b9b 100644
--- a/ogr/ogrsf_frmts/tiger/tigerfilebase.cpp
+++ b/ogr/ogrsf_frmts/tiger/tigerfilebase.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_tiger.h"
diff --git a/ogr/ogrsf_frmts/tiger/tigeridhistory.cpp b/ogr/ogrsf_frmts/tiger/tigeridhistory.cpp
index ef32a3fe064c..48307081ca49 100644
--- a/ogr/ogrsf_frmts/tiger/tigeridhistory.cpp
+++ b/ogr/ogrsf_frmts/tiger/tigeridhistory.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_tiger.h"
diff --git a/ogr/ogrsf_frmts/tiger/tigerkeyfeatures.cpp b/ogr/ogrsf_frmts/tiger/tigerkeyfeatures.cpp
index 77f13645f82a..9e4fed7fbd54 100644
--- a/ogr/ogrsf_frmts/tiger/tigerkeyfeatures.cpp
+++ b/ogr/ogrsf_frmts/tiger/tigerkeyfeatures.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_tiger.h"
diff --git a/ogr/ogrsf_frmts/tiger/tigerlandmarks.cpp b/ogr/ogrsf_frmts/tiger/tigerlandmarks.cpp
index d4cdd871de9f..c86dcfa74633 100644
--- a/ogr/ogrsf_frmts/tiger/tigerlandmarks.cpp
+++ b/ogr/ogrsf_frmts/tiger/tigerlandmarks.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_tiger.h"
diff --git a/ogr/ogrsf_frmts/tiger/tigeroverunder.cpp b/ogr/ogrsf_frmts/tiger/tigeroverunder.cpp
index 79dc7c3fa79c..db41e092b620 100644
--- a/ogr/ogrsf_frmts/tiger/tigeroverunder.cpp
+++ b/ogr/ogrsf_frmts/tiger/tigeroverunder.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam, Mark Phillips
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_tiger.h"
diff --git a/ogr/ogrsf_frmts/tiger/tigerpip.cpp b/ogr/ogrsf_frmts/tiger/tigerpip.cpp
index 1b977535489f..bf8610b0c6e2 100644
--- a/ogr/ogrsf_frmts/tiger/tigerpip.cpp
+++ b/ogr/ogrsf_frmts/tiger/tigerpip.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_tiger.h"
diff --git a/ogr/ogrsf_frmts/tiger/tigerpoint.cpp b/ogr/ogrsf_frmts/tiger/tigerpoint.cpp
index 6066e1106b7f..a8f0abca8292 100644
--- a/ogr/ogrsf_frmts/tiger/tigerpoint.cpp
+++ b/ogr/ogrsf_frmts/tiger/tigerpoint.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Mark Phillips
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_tiger.h"
diff --git a/ogr/ogrsf_frmts/tiger/tigerpolychainlink.cpp b/ogr/ogrsf_frmts/tiger/tigerpolychainlink.cpp
index 729d811530d0..7efbeac44fca 100644
--- a/ogr/ogrsf_frmts/tiger/tigerpolychainlink.cpp
+++ b/ogr/ogrsf_frmts/tiger/tigerpolychainlink.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_tiger.h"
diff --git a/ogr/ogrsf_frmts/tiger/tigerpolygon.cpp b/ogr/ogrsf_frmts/tiger/tigerpolygon.cpp
index dbf9d327a57d..36b395a7a46b 100644
--- a/ogr/ogrsf_frmts/tiger/tigerpolygon.cpp
+++ b/ogr/ogrsf_frmts/tiger/tigerpolygon.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_tiger.h"
diff --git a/ogr/ogrsf_frmts/tiger/tigerpolygoncorrections.cpp b/ogr/ogrsf_frmts/tiger/tigerpolygoncorrections.cpp
index 1432a943b514..b19aa77076e9 100644
--- a/ogr/ogrsf_frmts/tiger/tigerpolygoncorrections.cpp
+++ b/ogr/ogrsf_frmts/tiger/tigerpolygoncorrections.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam, Mark Phillips
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_tiger.h"
diff --git a/ogr/ogrsf_frmts/tiger/tigerpolygoneconomic.cpp b/ogr/ogrsf_frmts/tiger/tigerpolygoneconomic.cpp
index 88e5da8fe3f8..fcd417c00d3e 100644
--- a/ogr/ogrsf_frmts/tiger/tigerpolygoneconomic.cpp
+++ b/ogr/ogrsf_frmts/tiger/tigerpolygoneconomic.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam, Mark Phillips
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_tiger.h"
diff --git a/ogr/ogrsf_frmts/tiger/tigerspatialmetadata.cpp b/ogr/ogrsf_frmts/tiger/tigerspatialmetadata.cpp
index d8008a0d2db5..9990767c7ace 100644
--- a/ogr/ogrsf_frmts/tiger/tigerspatialmetadata.cpp
+++ b/ogr/ogrsf_frmts/tiger/tigerspatialmetadata.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_tiger.h"
diff --git a/ogr/ogrsf_frmts/tiger/tigertlidrange.cpp b/ogr/ogrsf_frmts/tiger/tigertlidrange.cpp
index a6c9b0f9ae4c..8cc04a5ff360 100644
--- a/ogr/ogrsf_frmts/tiger/tigertlidrange.cpp
+++ b/ogr/ogrsf_frmts/tiger/tigertlidrange.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_tiger.h"
diff --git a/ogr/ogrsf_frmts/tiger/tigerzerocellid.cpp b/ogr/ogrsf_frmts/tiger/tigerzerocellid.cpp
index 738e4cf8e009..7c4cb9cc67a6 100644
--- a/ogr/ogrsf_frmts/tiger/tigerzerocellid.cpp
+++ b/ogr/ogrsf_frmts/tiger/tigerzerocellid.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam, Mark Phillips
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_tiger.h"
diff --git a/ogr/ogrsf_frmts/tiger/tigerzipcodes.cpp b/ogr/ogrsf_frmts/tiger/tigerzipcodes.cpp
index 033ca5fa852a..c64ed7a561ca 100644
--- a/ogr/ogrsf_frmts/tiger/tigerzipcodes.cpp
+++ b/ogr/ogrsf_frmts/tiger/tigerzipcodes.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_tiger.h"
diff --git a/ogr/ogrsf_frmts/tiger/tigerzipplus4.cpp b/ogr/ogrsf_frmts/tiger/tigerzipplus4.cpp
index 869d49f83e38..8a7aea3a9374 100644
--- a/ogr/ogrsf_frmts/tiger/tigerzipplus4.cpp
+++ b/ogr/ogrsf_frmts/tiger/tigerzipplus4.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_tiger.h"
diff --git a/ogr/ogrsf_frmts/vdv/data/vdv452.xml b/ogr/ogrsf_frmts/vdv/data/vdv452.xml
index d010fa0d8edc..bc505d03b240 100644
--- a/ogr/ogrsf_frmts/vdv/data/vdv452.xml
+++ b/ogr/ogrsf_frmts/vdv/data/vdv452.xml
@@ -10,23 +10,7 @@
  **********************************************************************
  * Copyright (c) 2015, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 -->
 <Layers>
diff --git a/ogr/ogrsf_frmts/vdv/data/vdv452.xsd b/ogr/ogrsf_frmts/vdv/data/vdv452.xsd
index a42774bf8e56..5b6d4bd51212 100644
--- a/ogr/ogrsf_frmts/vdv/data/vdv452.xsd
+++ b/ogr/ogrsf_frmts/vdv/data/vdv452.xsd
@@ -10,23 +10,7 @@
  **********************************************************************
  * Copyright (c) 2015, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
diff --git a/ogr/ogrsf_frmts/vdv/ogr_vdv.h b/ogr/ogrsf_frmts/vdv/ogr_vdv.h
index 2802b7462ce5..17932f5dafcb 100644
--- a/ogr/ogrsf_frmts/vdv/ogr_vdv.h
+++ b/ogr/ogrsf_frmts/vdv/ogr_vdv.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_VDV_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/vdv/ogrvdvdatasource.cpp b/ogr/ogrsf_frmts/vdv/ogrvdvdatasource.cpp
index 15823bd38e61..3dcb74f59f29 100644
--- a/ogr/ogrsf_frmts/vdv/ogrvdvdatasource.cpp
+++ b/ogr/ogrsf_frmts/vdv/ogrvdvdatasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_vdv.h"
@@ -1048,7 +1032,7 @@ OGRFeature *OGRVDVLayer::GetNextFeature()
                     osToken = papszTokens[i];
                 // Strip trailing spaces
                 while (!osToken.empty() && osToken.back() == ' ')
-                    osToken.resize(osToken.size() - 1);
+                    osToken.pop_back();
                 OGRFieldType eFieldType =
                     m_poFeatureDefn->GetFieldDefn(i)->GetType();
                 if (m_bRecodeFromLatin1 && eFieldType == OFTString)
diff --git a/ogr/ogrsf_frmts/vfk/ogr_vfk.h b/ogr/ogrsf_frmts/vfk/ogr_vfk.h
index 78af67ac74f8..cf010e237322 100644
--- a/ogr/ogrsf_frmts/vfk/ogr_vfk.h
+++ b/ogr/ogrsf_frmts/vfk/ogr_vfk.h
@@ -8,25 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2009-2010, Martin Landa <landa.martin 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_OGR_VFK_H_INCLUDED
@@ -86,15 +68,13 @@ class OGRVFKLayer : public OGRLayer
 /************************************************************************/
 /*                           OGRVFKDataSource                           */
 /************************************************************************/
-class OGRVFKDataSource : public OGRDataSource
+class OGRVFKDataSource : public GDALDataset
 {
   private:
     /* list of available layers */
     OGRVFKLayer **papoLayers;
     int nLayers;
 
-    char *pszName;
-
     /* input related parameters */
     IVFKReader *poReader;
 
@@ -107,11 +87,6 @@ class OGRVFKDataSource : public OGRDataSource
 
     int Open(GDALOpenInfo *poOpenInfo);
 
-    const char *GetName() override
-    {
-        return pszName;
-    }
-
     int GetLayerCount() override
     {
         return nLayers;
diff --git a/ogr/ogrsf_frmts/vfk/ogrvfkdatasource.cpp b/ogr/ogrsf_frmts/vfk/ogrvfkdatasource.cpp
index c8f9c6e532d3..a0d9ebab459e 100644
--- a/ogr/ogrsf_frmts/vfk/ogrvfkdatasource.cpp
+++ b/ogr/ogrsf_frmts/vfk/ogrvfkdatasource.cpp
@@ -7,25 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2009-2010, 2013-2018 Martin Landa <landa.martin 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_vfk.h"
@@ -36,7 +18,7 @@
   \brief OGRVFKDataSource constructor
 */
 OGRVFKDataSource::OGRVFKDataSource()
-    : papoLayers(nullptr), nLayers(0), pszName(nullptr), poReader(nullptr)
+    : papoLayers(nullptr), nLayers(0), poReader(nullptr)
 {
 }
 
@@ -45,8 +27,6 @@ OGRVFKDataSource::OGRVFKDataSource()
 */
 OGRVFKDataSource::~OGRVFKDataSource()
 {
-    CPLFree(pszName);
-
     if (poReader)
         delete poReader;
 
@@ -65,8 +45,6 @@ OGRVFKDataSource::~OGRVFKDataSource()
 */
 int OGRVFKDataSource::Open(GDALOpenInfo *poOpenInfo)
 {
-    pszName = CPLStrdup(poOpenInfo->pszFilename);
-
     /* create VFK reader */
     poReader = CreateVFKReader(poOpenInfo);
     if (poReader == nullptr || !poReader->IsValid())
diff --git a/ogr/ogrsf_frmts/vfk/ogrvfkdriver.cpp b/ogr/ogrsf_frmts/vfk/ogrvfkdriver.cpp
index 5545e434cff5..b689a6ccbafd 100644
--- a/ogr/ogrsf_frmts/vfk/ogrvfkdriver.cpp
+++ b/ogr/ogrsf_frmts/vfk/ogrvfkdriver.cpp
@@ -7,25 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2009-2018, Martin Landa <landa.martin 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_vfk.h"
diff --git a/ogr/ogrsf_frmts/vfk/ogrvfkdrivercore.cpp b/ogr/ogrsf_frmts/vfk/ogrvfkdrivercore.cpp
index e9f0a0eba3fb..435238cb882d 100644
--- a/ogr/ogrsf_frmts/vfk/ogrvfkdrivercore.cpp
+++ b/ogr/ogrsf_frmts/vfk/ogrvfkdrivercore.cpp
@@ -7,25 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2009-2018, Martin Landa <landa.martin 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
diff --git a/ogr/ogrsf_frmts/vfk/ogrvfkdrivercore.h b/ogr/ogrsf_frmts/vfk/ogrvfkdrivercore.h
index 5e96b4f7a8f5..e73161b4ef34 100644
--- a/ogr/ogrsf_frmts/vfk/ogrvfkdrivercore.h
+++ b/ogr/ogrsf_frmts/vfk/ogrvfkdrivercore.h
@@ -7,25 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2009-2018, Martin Landa <landa.martin 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRVFKDRIVERCORE_H
diff --git a/ogr/ogrsf_frmts/vfk/ogrvfklayer.cpp b/ogr/ogrsf_frmts/vfk/ogrvfklayer.cpp
index 5139ccbe9601..ceb7d6d8d225 100644
--- a/ogr/ogrsf_frmts/vfk/ogrvfklayer.cpp
+++ b/ogr/ogrsf_frmts/vfk/ogrvfklayer.cpp
@@ -7,25 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2009-2010, Martin Landa <landa.martin 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_vfk.h"
diff --git a/ogr/ogrsf_frmts/vfk/vfkdatablock.cpp b/ogr/ogrsf_frmts/vfk/vfkdatablock.cpp
index de494a653048..2c6c3118467b 100644
--- a/ogr/ogrsf_frmts/vfk/vfkdatablock.cpp
+++ b/ogr/ogrsf_frmts/vfk/vfkdatablock.cpp
@@ -8,25 +8,7 @@
  * Copyright (c) 2009-2013, Martin Landa <landa.martin gmail.com>
  * Copyright (c) 2012-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <ctime>
diff --git a/ogr/ogrsf_frmts/vfk/vfkdatablocksqlite.cpp b/ogr/ogrsf_frmts/vfk/vfkdatablocksqlite.cpp
index e168dc019b9b..479a24a197d7 100644
--- a/ogr/ogrsf_frmts/vfk/vfkdatablocksqlite.cpp
+++ b/ogr/ogrsf_frmts/vfk/vfkdatablocksqlite.cpp
@@ -8,25 +8,7 @@
  * Copyright (c) 2012-2014, Martin Landa <landa.martin gmail.com>
  * Copyright (c) 2012-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <algorithm>
diff --git a/ogr/ogrsf_frmts/vfk/vfkfeature.cpp b/ogr/ogrsf_frmts/vfk/vfkfeature.cpp
index 369d3d25b871..41448e799ae4 100644
--- a/ogr/ogrsf_frmts/vfk/vfkfeature.cpp
+++ b/ogr/ogrsf_frmts/vfk/vfkfeature.cpp
@@ -8,25 +8,7 @@
  * Copyright (c) 2009-2010, 2012-2015, Martin Landa <landa.martin gmail.com>
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "vfkreader.h"
diff --git a/ogr/ogrsf_frmts/vfk/vfkfeaturesqlite.cpp b/ogr/ogrsf_frmts/vfk/vfkfeaturesqlite.cpp
index c97a7cb1e12b..027723238224 100644
--- a/ogr/ogrsf_frmts/vfk/vfkfeaturesqlite.cpp
+++ b/ogr/ogrsf_frmts/vfk/vfkfeaturesqlite.cpp
@@ -7,25 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2012-2018, Martin Landa <landa.martin 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "vfkreader.h"
diff --git a/ogr/ogrsf_frmts/vfk/vfkproperty.cpp b/ogr/ogrsf_frmts/vfk/vfkproperty.cpp
index 331ac6e771a5..bf3a95342194 100644
--- a/ogr/ogrsf_frmts/vfk/vfkproperty.cpp
+++ b/ogr/ogrsf_frmts/vfk/vfkproperty.cpp
@@ -7,25 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2009-2010, Martin Landa <landa.martin 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "vfkreader.h"
diff --git a/ogr/ogrsf_frmts/vfk/vfkpropertydefn.cpp b/ogr/ogrsf_frmts/vfk/vfkpropertydefn.cpp
index 1a2ea640629a..dadd048b5d0b 100644
--- a/ogr/ogrsf_frmts/vfk/vfkpropertydefn.cpp
+++ b/ogr/ogrsf_frmts/vfk/vfkpropertydefn.cpp
@@ -7,25 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2009-2010, 2012, Martin Landa <landa.martin 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "vfkreader.h"
diff --git a/ogr/ogrsf_frmts/vfk/vfkreader.cpp b/ogr/ogrsf_frmts/vfk/vfkreader.cpp
index 16fbdc85e0ff..4c3405a9fead 100644
--- a/ogr/ogrsf_frmts/vfk/vfkreader.cpp
+++ b/ogr/ogrsf_frmts/vfk/vfkreader.cpp
@@ -8,25 +8,7 @@
  * Copyright (c) 2009-2018, Martin Landa <landa.martin gmail.com>
  * Copyright (c) 2012-2018, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <sys/stat.h>
@@ -314,7 +296,7 @@ int VFKReader::ReadDataBlocks(bool bSuppressGeometry)
 
   \return number of data records or -1 on error
 */
-int VFKReader::ReadDataRecords(IVFKDataBlock *poDataBlock)
+int64_t VFKReader::ReadDataRecords(IVFKDataBlock *poDataBlock)
 {
     const char *pszName = nullptr;
     IVFKDataBlock *poDataBlockCurrent = nullptr;
@@ -342,7 +324,7 @@ int VFKReader::ReadDataRecords(IVFKDataBlock *poDataBlock)
     int iLine = 0;
     int nSkipped = 0;
     int nDupl = 0;
-    int nRecords = 0;
+    int64_t nRecords = 0;
     bool bInHeader = true;
     CPLString osBlockNameLast;
     char *pszLine = nullptr;
diff --git a/ogr/ogrsf_frmts/vfk/vfkreader.h b/ogr/ogrsf_frmts/vfk/vfkreader.h
index 6d3898350017..928783127f1a 100644
--- a/ogr/ogrsf_frmts/vfk/vfkreader.h
+++ b/ogr/ogrsf_frmts/vfk/vfkreader.h
@@ -8,25 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2009-2014, Martin Landa <landa.martin 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_OGR_VFK_VFKREADER_H_INCLUDED
@@ -470,7 +452,7 @@ class IVFKReader
     virtual bool IsValid() const = 0;
     virtual bool HasFileField() const = 0;
     virtual int ReadDataBlocks(bool = false) = 0;
-    virtual int ReadDataRecords(IVFKDataBlock * = nullptr) = 0;
+    virtual int64_t ReadDataRecords(IVFKDataBlock * = nullptr) = 0;
     virtual int LoadGeometry() = 0;
 
     virtual int GetDataBlockCount() const = 0;
diff --git a/ogr/ogrsf_frmts/vfk/vfkreaderp.h b/ogr/ogrsf_frmts/vfk/vfkreaderp.h
index 735ecece239c..ab8f04dc54d7 100644
--- a/ogr/ogrsf_frmts/vfk/vfkreaderp.h
+++ b/ogr/ogrsf_frmts/vfk/vfkreaderp.h
@@ -8,25 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2012-2018, Martin Landa <landa.martin 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_OGR_VFK_VFKREADERP_H_INCLUDED
@@ -108,7 +90,7 @@ class VFKReader : public IVFKReader
     }
 
     int ReadDataBlocks(bool = false) override;
-    int ReadDataRecords(IVFKDataBlock * = nullptr) override;
+    int64_t ReadDataRecords(IVFKDataBlock * = nullptr) override;
     int LoadGeometry() override;
 
     int GetDataBlockCount() const override
@@ -166,7 +148,7 @@ class VFKReaderSQLite : public VFKReader
     }
 
     int ReadDataBlocks(bool = false) override;
-    int ReadDataRecords(IVFKDataBlock * = nullptr) override;
+    int64_t ReadDataRecords(IVFKDataBlock * = nullptr) override;
 
     sqlite3_stmt *PrepareStatement(const char *);
     OGRErr ExecuteSQL(const char *, CPLErr = CE_Failure);
diff --git a/ogr/ogrsf_frmts/vfk/vfkreadersqlite.cpp b/ogr/ogrsf_frmts/vfk/vfkreadersqlite.cpp
index 84c71e5326a5..687637754783 100644
--- a/ogr/ogrsf_frmts/vfk/vfkreadersqlite.cpp
+++ b/ogr/ogrsf_frmts/vfk/vfkreadersqlite.cpp
@@ -8,25 +8,7 @@
  * Copyright (c) 2012-2018, Martin Landa <landa.martin gmail.com>
  * Copyright (c) 2012-2018, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_vsi.h"
@@ -338,13 +320,13 @@ int VFKReaderSQLite::ReadDataBlocks(bool bSuppressGeometry)
 
   \return number of data records or -1 on error
 */
-int VFKReaderSQLite::ReadDataRecords(IVFKDataBlock *poDataBlock)
+int64_t VFKReaderSQLite::ReadDataRecords(IVFKDataBlock *poDataBlock)
 {
     CPLString osSQL;
     IVFKDataBlock *poDataBlockCurrent = nullptr;
     sqlite3_stmt *hStmt = nullptr;
     const char *pszName = nullptr;
-    int nDataRecords = 0;
+    int64_t nDataRecords = 0;
     bool bReadVfk = !m_bDbSource;
     bool bReadDb = false;
 
@@ -360,7 +342,7 @@ int VFKReaderSQLite::ReadDataRecords(IVFKDataBlock *poDataBlock)
         hStmt = PrepareStatement(osSQL.c_str());
         if (ExecuteSQL(hStmt) == OGRERR_NONE)
         {
-            nDataRecords = sqlite3_column_int(hStmt, 0);
+            nDataRecords = sqlite3_column_int64(hStmt, 0);
             if (nDataRecords > 0)
                 bReadDb = true; /* -> read from DB */
             else
diff --git a/ogr/ogrsf_frmts/vrt/CMakeLists.txt b/ogr/ogrsf_frmts/vrt/CMakeLists.txt
index 81021790e27e..868139a2c4d3 100644
--- a/ogr/ogrsf_frmts/vrt/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/vrt/CMakeLists.txt
@@ -1,8 +1,8 @@
-# Depend from ogr_gpkg
 add_gdal_driver(
   TARGET ogr_VRT
   SOURCES ogr_vrt.h ogrvrtdatasource.cpp ogrvrtdriver.cpp ogrvrtlayer.cpp
-  BUILTIN)
+  PLUGIN_CAPABLE
+  NO_DEPS)
 gdal_standard_includes(ogr_VRT)
 target_include_directories(ogr_VRT PRIVATE $<TARGET_PROPERTY:ogrsf_generic,SOURCE_DIR>)
 
diff --git a/ogr/ogrsf_frmts/vrt/data/ogrvrt.xsd b/ogr/ogrsf_frmts/vrt/data/ogrvrt.xsd
index d7458319a691..74dc747db2f9 100644
--- a/ogr/ogrsf_frmts/vrt/data/ogrvrt.xsd
+++ b/ogr/ogrsf_frmts/vrt/data/ogrvrt.xsd
@@ -10,23 +10,7 @@
  **********************************************************************
  * Copyright (c) 2012, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="1.0">
diff --git a/ogr/ogrsf_frmts/vrt/ogr_vrt.h b/ogr/ogrsf_frmts/vrt/ogr_vrt.h
index 0884f421df44..3cafee6afe22 100644
--- a/ogr/ogrsf_frmts/vrt/ogr_vrt.h
+++ b/ogr/ogrsf_frmts/vrt/ogr_vrt.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_VRT_H_INCLUDED
@@ -217,14 +201,12 @@ typedef enum
     OGR_VRT_OTHER_LAYER,
 } OGRLayerType;
 
-class OGRVRTDataSource final : public OGRDataSource
+class OGRVRTDataSource final : public GDALDataset
 {
     OGRLayer **papoLayers;
     OGRLayerType *paeLayerType;
     int nLayers;
 
-    char *pszName;
-
     CPLXMLNode *psTree;
 
     int nCallLevel;
@@ -258,11 +240,6 @@ class OGRVRTDataSource final : public OGRDataSource
 
     bool Initialize(CPLXMLNode *psXML, const char *pszName, int bUpdate);
 
-    const char *GetName() override
-    {
-        return pszName;
-    }
-
     int GetLayerCount() override
     {
         return nLayers;
@@ -310,7 +287,4 @@ class OGRVRTDataSource final : public OGRDataSource
     bool IsInForbiddenNames(const char *pszOtherDSName) const;
 };
 
-OGRwkbGeometryType OGRVRTGetGeometryType(const char *pszGType, int *pbError);
-CPLString CPL_DLL OGRVRTGetSerializedGeometryType(OGRwkbGeometryType eGeomType);
-
 #endif  // ndef OGR_VRT_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/vrt/ogrvrtdatasource.cpp b/ogr/ogrsf_frmts/vrt/ogrvrtdatasource.cpp
index c52d7e6ca204..e96c85ff0115 100644
--- a/ogr/ogrsf_frmts/vrt/ogrvrtdatasource.cpp
+++ b/ogr/ogrsf_frmts/vrt/ogrvrtdatasource.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -48,109 +32,15 @@
 #include "ogrunionlayer.h"
 #include "ogrwarpedlayer.h"
 #include "ogrsf_frmts.h"
-
-/************************************************************************/
-/*                       OGRVRTGetGeometryType()                        */
-/************************************************************************/
-
-#define STRINGIFY(x) x, #x
-
-static const struct
-{
-    OGRwkbGeometryType eType;
-    const char *pszName;
-    bool bIsoFlags;
-} asGeomTypeNames[] = {
-    {STRINGIFY(wkbUnknown), false},
-
-    {STRINGIFY(wkbPoint), false},
-    {STRINGIFY(wkbLineString), false},
-    {STRINGIFY(wkbPolygon), false},
-    {STRINGIFY(wkbMultiPoint), false},
-    {STRINGIFY(wkbMultiLineString), false},
-    {STRINGIFY(wkbMultiPolygon), false},
-    {STRINGIFY(wkbGeometryCollection), false},
-
-    {STRINGIFY(wkbCircularString), true},
-    {STRINGIFY(wkbCompoundCurve), true},
-    {STRINGIFY(wkbCurvePolygon), true},
-    {STRINGIFY(wkbMultiCurve), true},
-    {STRINGIFY(wkbMultiSurface), true},
-    {STRINGIFY(wkbCurve), true},
-    {STRINGIFY(wkbSurface), true},
-    {STRINGIFY(wkbPolyhedralSurface), true},
-    {STRINGIFY(wkbTIN), true},
-    {STRINGIFY(wkbTriangle), true},
-
-    {STRINGIFY(wkbNone), false},
-    {STRINGIFY(wkbLinearRing), false},
-};
-
-OGRwkbGeometryType OGRVRTGetGeometryType(const char *pszGType, int *pbError)
-{
-    if (pbError)
-        *pbError = FALSE;
-
-    for (const auto &entry : asGeomTypeNames)
-    {
-        if (EQUALN(pszGType, entry.pszName, strlen(entry.pszName)))
-        {
-            OGRwkbGeometryType eGeomType = entry.eType;
-
-            if (strstr(pszGType, "25D") != nullptr ||
-                strstr(pszGType, "Z") != nullptr)
-                eGeomType = wkbSetZ(eGeomType);
-            if (pszGType[strlen(pszGType) - 1] == 'M' ||
-                pszGType[strlen(pszGType) - 2] == 'M')
-                eGeomType = wkbSetM(eGeomType);
-            return eGeomType;
-        }
-    }
-
-    if (pbError)
-        *pbError = TRUE;
-    return wkbUnknown;
-}
-
-/************************************************************************/
-/*                     OGRVRTGetSerializedGeometryType()                */
-/************************************************************************/
-
-CPLString OGRVRTGetSerializedGeometryType(OGRwkbGeometryType eGeomType)
-{
-    for (const auto &entry : asGeomTypeNames)
-    {
-        if (entry.eType == wkbFlatten(eGeomType))
-        {
-            CPLString osRet(entry.pszName);
-            if (entry.bIsoFlags || OGR_GT_HasM(eGeomType))
-            {
-                if (OGR_GT_HasZ(eGeomType))
-                {
-                    osRet += "Z";
-                }
-                if (OGR_GT_HasM(eGeomType))
-                {
-                    osRet += "M";
-                }
-            }
-            else if (OGR_GT_HasZ(eGeomType))
-            {
-                osRet += "25D";
-            }
-            return osRet;
-        }
-    }
-    return CPLString();
-}
+#include "ogrvrtgeometrytypes.h"
 
 /************************************************************************/
 /*                          OGRVRTDataSource()                          */
 /************************************************************************/
 
 OGRVRTDataSource::OGRVRTDataSource(GDALDriver *poDriverIn)
-    : papoLayers(nullptr), paeLayerType(nullptr), nLayers(0), pszName(nullptr),
-      psTree(nullptr), nCallLevel(0), poLayerPool(nullptr), poParentDS(nullptr),
+    : papoLayers(nullptr), paeLayerType(nullptr), nLayers(0), psTree(nullptr),
+      nCallLevel(0), poLayerPool(nullptr), poParentDS(nullptr),
       bRecursionDetected(false)
 {
     poDriver = poDriverIn;
@@ -163,8 +53,6 @@ OGRVRTDataSource::OGRVRTDataSource(GDALDriver *poDriverIn)
 OGRVRTDataSource::~OGRVRTDataSource()
 
 {
-    CPLFree(pszName);
-
     OGRVRTDataSource::CloseDependentDatasets();
 
     CPLFree(paeLayerType);
@@ -852,8 +740,6 @@ bool OGRVRTDataSource::Initialize(CPLXMLNode *psTreeIn, const char *pszNewName,
     // for relative datasources.
     CPLString osVRTDirectory = CPLGetPath(pszNewName);
 
-    pszName = CPLStrdup(pszNewName);
-
     // Look for the OGRVRTDataSource node, it might be after an <xml> node.
     CPLXMLNode *psVRTDSXML = CPLGetXMLNode(psTree, "=OGRVRTDataSource");
     if (psVRTDSXML == nullptr)
@@ -966,7 +852,7 @@ bool OGRVRTDataSource::IsInForbiddenNames(const char *pszOtherDSName) const
 char **OGRVRTDataSource::GetFileList()
 {
     CPLStringList oList;
-    oList.AddString(GetName());
+    oList.AddString(GetDescription());
     for (int i = 0; i < nLayers; i++)
     {
         OGRLayer *poLayer = papoLayers[i];
diff --git a/ogr/ogrsf_frmts/vrt/ogrvrtdriver.cpp b/ogr/ogrsf_frmts/vrt/ogrvrtdriver.cpp
index 65bfa072e3a1..817991b8f2d2 100644
--- a/ogr/ogrsf_frmts/vrt/ogrvrtdriver.cpp
+++ b/ogr/ogrsf_frmts/vrt/ogrvrtdriver.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -34,6 +18,7 @@
 #include <cstddef>
 #include <cstdio>
 #include <cstring>
+#include <limits>
 #include <memory>
 #include <vector>
 
@@ -130,9 +115,14 @@ static GDALDataset *OGRVRTDriverOpen(GDALOpenInfo *poOpenInfo)
                      "configuration option");
             return nullptr;
         }
+        if (static_cast<uint64_t>(sStatBuf.st_size) >
+            std::numeric_limits<size_t>::max() - 1)
+        {
+            return nullptr;
+        }
 
         // It is the right file, now load the full XML definition.
-        const int nLen = static_cast<int>(sStatBuf.st_size);
+        const size_t nLen = static_cast<size_t>(sStatBuf.st_size);
 
         pszXML = static_cast<char *>(VSI_MALLOC_VERBOSE(nLen + 1));
         if (pszXML == nullptr)
@@ -140,8 +130,7 @@ static GDALDataset *OGRVRTDriverOpen(GDALOpenInfo *poOpenInfo)
 
         pszXML[nLen] = '\0';
         VSIFSeekL(poOpenInfo->fpL, 0, SEEK_SET);
-        if (static_cast<int>(VSIFReadL(pszXML, 1, nLen, poOpenInfo->fpL)) !=
-            nLen)
+        if (VSIFReadL(pszXML, 1, nLen, poOpenInfo->fpL) != nLen)
         {
             CPLFree(pszXML);
             return nullptr;
diff --git a/ogr/ogrsf_frmts/vrt/ogrvrtlayer.cpp b/ogr/ogrsf_frmts/vrt/ogrvrtlayer.cpp
index 2b4cedd558e6..98dcfca75fec 100644
--- a/ogr/ogrsf_frmts/vrt/ogrvrtlayer.cpp
+++ b/ogr/ogrsf_frmts/vrt/ogrvrtlayer.cpp
@@ -8,29 +8,14 @@
  * Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
 #include "ogr_vrt.h"
 
 #include <cassert>
+#include <cmath>
 #include <cstddef>
 #include <cstdio>
 #include <cstdlib>
@@ -51,8 +36,8 @@
 #include "ogr_geometry.h"
 #include "ogr_spatialref.h"
 #include "ogrpgeogeometry.h"
-#include "ogrsf_frmts/ogrsf_frmts.h"
-#include "ogrsf_frmts/vrt/ogr_vrt.h"
+#include "ogrsf_frmts.h"
+#include "ogrvrtgeometrytypes.h"
 
 #define UNSUPPORTED_OP_READ_ONLY                                               \
     "%s : unsupported operation on a read-only datasource."
@@ -667,8 +652,9 @@ bool OGRVRTLayer::FullInitialize()
             // Is it a VRT datasource?
             if (poSrcDS != nullptr && poSrcDS->GetDriver() == poDS->GetDriver())
             {
-                OGRVRTDataSource *poVRTSrcDS = (OGRVRTDataSource *)poSrcDS;
-                poVRTSrcDS->AddForbiddenNames(poDS->GetName());
+                OGRVRTDataSource *poVRTSrcDS =
+                    cpl::down_cast<OGRVRTDataSource *>(poSrcDS);
+                poVRTSrcDS->AddForbiddenNames(poDS->GetDescription());
             }
         }
     }
@@ -1247,13 +1233,13 @@ bool OGRVRTLayer::ResetSourceReading()
                     m_poFilterGeom->getEnvelope(&sEnvelope);
                 }
 
-                if (!CPLIsInf(sEnvelope.MinX))
+                if (!std::isinf(sEnvelope.MinX))
                     osFilter +=
                         CPLSPrintf("\"%s\" > %.15g", pszXField, sEnvelope.MinX);
                 else if (sEnvelope.MinX > 0)
                     osFilter += "0 = 1";
 
-                if (!CPLIsInf(sEnvelope.MaxX))
+                if (!std::isinf(sEnvelope.MaxX))
                 {
                     if (!osFilter.empty())
                         osFilter += " AND ";
@@ -1267,7 +1253,7 @@ bool OGRVRTLayer::ResetSourceReading()
                     osFilter += "0 = 1";
                 }
 
-                if (!CPLIsInf(sEnvelope.MinY))
+                if (!std::isinf(sEnvelope.MinY))
                 {
                     if (!osFilter.empty())
                         osFilter += " AND ";
@@ -1281,7 +1267,7 @@ bool OGRVRTLayer::ResetSourceReading()
                     osFilter += "0 = 1";
                 }
 
-                if (!CPLIsInf(sEnvelope.MaxY))
+                if (!std::isinf(sEnvelope.MaxY))
                 {
                     if (!osFilter.empty())
                         osFilter += " AND ";
@@ -1367,10 +1353,12 @@ bool OGRVRTLayer::ResetSourceReading()
                 {
                     OGREnvelope sEnvelope;
                     m_poFilterGeom->getEnvelope(&sEnvelope);
-                    if (CPLIsInf(sEnvelope.MinX) && CPLIsInf(sEnvelope.MinY) &&
-                        CPLIsInf(sEnvelope.MaxX) && CPLIsInf(sEnvelope.MaxY) &&
-                        sEnvelope.MinX < 0 && sEnvelope.MinY < 0 &&
-                        sEnvelope.MaxX > 0 && sEnvelope.MaxY > 0)
+                    if (std::isinf(sEnvelope.MinX) &&
+                        std::isinf(sEnvelope.MinY) &&
+                        std::isinf(sEnvelope.MaxX) &&
+                        std::isinf(sEnvelope.MaxY) && sEnvelope.MinX < 0 &&
+                        sEnvelope.MinY < 0 && sEnvelope.MaxX > 0 &&
+                        sEnvelope.MaxY > 0)
                     {
                         poSpatialGeom = poSrcRegion;
                         bDoIntersection = false;
diff --git a/ogr/ogrsf_frmts/wasp/ogrwasp.h b/ogr/ogrsf_frmts/wasp/ogrwasp.h
index 662fc35ab0d1..e511e09b8402 100644
--- a/ogr/ogrsf_frmts/wasp/ogrwasp.h
+++ b/ogr/ogrsf_frmts/wasp/ogrwasp.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Oslandia <info at oslandia dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_WASP_H_INCLUDED
@@ -183,7 +167,7 @@ class OGRWAsPLayer final : public OGRLayer,
 /*                           OGRWAsPDataSource                          */
 /************************************************************************/
 
-class OGRWAsPDataSource final : public OGRDataSource
+class OGRWAsPDataSource final : public GDALDataset
 {
     CPLString sFilename;
     VSILFILE *hFile;
@@ -197,11 +181,6 @@ class OGRWAsPDataSource final : public OGRDataSource
     OGRWAsPDataSource(const char *pszName, VSILFILE *hFile);
     virtual ~OGRWAsPDataSource();
 
-    virtual const char *GetName() override
-    {
-        return sFilename.c_str();
-    }
-
     virtual int GetLayerCount() override
     {
         return oLayer.get() ? 1 : 0;
@@ -218,31 +197,4 @@ class OGRWAsPDataSource final : public OGRDataSource
     OGRErr Load(bool bSilent = false);
 };
 
-/************************************************************************/
-/*                             OGRWAsPDriver                            */
-/************************************************************************/
-
-class OGRWAsPDriver final : public OGRSFDriver
-{
-
-  public:
-    ~OGRWAsPDriver()
-    {
-    }
-
-    virtual const char *GetName() override
-    {
-        return "WAsP";
-    }
-
-    virtual OGRDataSource *Open(const char *, int) override;
-
-    virtual OGRDataSource *CreateDataSource(const char *pszName,
-                                            char ** = nullptr) override;
-
-    virtual OGRErr DeleteDataSource(const char *pszName) override;
-
-    virtual int TestCapability(const char *) override;
-};
-
 #endif /* ndef OGR_WASP_H_INCLUDED */
diff --git a/ogr/ogrsf_frmts/wasp/ogrwaspdatasource.cpp b/ogr/ogrsf_frmts/wasp/ogrwaspdatasource.cpp
index b54eef391865..d9bce9c9111f 100644
--- a/ogr/ogrsf_frmts/wasp/ogrwaspdatasource.cpp
+++ b/ogr/ogrsf_frmts/wasp/ogrwaspdatasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Oslandia <info at oslandia dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrwasp.h"
diff --git a/ogr/ogrsf_frmts/wasp/ogrwaspdriver.cpp b/ogr/ogrsf_frmts/wasp/ogrwaspdriver.cpp
index 7d0e60149bb0..390e12c48679 100644
--- a/ogr/ogrsf_frmts/wasp/ogrwaspdriver.cpp
+++ b/ogr/ogrsf_frmts/wasp/ogrwaspdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Oslandia <info at oslandia dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrwasp.h"
@@ -34,27 +18,28 @@
 /*                                Open()                                */
 /************************************************************************/
 
-OGRDataSource *OGRWAsPDriver::Open(const char *pszFilename, int bUpdate)
+static GDALDataset *OGRWAsPDriverOpen(GDALOpenInfo *poOpenInfo)
 
 {
-    if (bUpdate)
+    if (poOpenInfo->eAccess == GA_Update)
     {
         return nullptr;
     }
 
-    if (!EQUAL(CPLGetExtension(pszFilename), "map"))
+    if (!EQUAL(CPLGetExtension(poOpenInfo->pszFilename), "map"))
     {
         return nullptr;
     }
 
-    VSILFILE *fh = VSIFOpenL(pszFilename, "r");
+    VSILFILE *fh = VSIFOpenL(poOpenInfo->pszFilename, "r");
     if (!fh)
     {
         /*CPLError( CE_Failure, CPLE_FileIO, "cannot open file %s", pszFilename
          * );*/
         return nullptr;
     }
-    auto pDataSource = std::make_unique<OGRWAsPDataSource>(pszFilename, fh);
+    auto pDataSource =
+        std::make_unique<OGRWAsPDataSource>(poOpenInfo->pszFilename, fh);
 
     if (pDataSource->Load(true) != OGRERR_NONE)
     {
@@ -64,21 +49,11 @@ OGRDataSource *OGRWAsPDriver::Open(const char *pszFilename, int bUpdate)
 }
 
 /************************************************************************/
-/*                           TestCapability()                           */
+/*                         OGRWAsPDriverCreate()                        */
 /************************************************************************/
 
-int OGRWAsPDriver::TestCapability(const char *pszCap)
-
-{
-    return EQUAL(pszCap, ODrCCreateDataSource) ||
-           EQUAL(pszCap, ODrCDeleteDataSource);
-}
-
-/************************************************************************/
-/*                           CreateDataSource()                           */
-/************************************************************************/
-
-OGRDataSource *OGRWAsPDriver::CreateDataSource(const char *pszName, char **)
+static GDALDataset *OGRWAsPDriverCreate(const char *pszName, int, int, int,
+                                        GDALDataType, char **)
 
 {
     VSILFILE *fh = VSIFOpenL(pszName, "w");
@@ -91,23 +66,27 @@ OGRDataSource *OGRWAsPDriver::CreateDataSource(const char *pszName, char **)
 }
 
 /************************************************************************/
-/*                           DeleteDataSource()                         */
+/*                         OGRWAsPDriverDelete()                        */
 /************************************************************************/
 
-OGRErr OGRWAsPDriver::DeleteDataSource(const char *pszName)
+static CPLErr OGRWAsPDriverDelete(const char *pszName)
 
 {
-    return VSIUnlink(pszName) == 0 ? OGRERR_NONE : OGRERR_FAILURE;
+    return VSIUnlink(pszName) == 0 ? CE_None : CE_Failure;
 }
 
 /************************************************************************/
-/*                           RegisterOGRWAsP()                           */
+/*                           RegisterOGRWAsP()                          */
 /************************************************************************/
 
 void RegisterOGRWAsP()
 
 {
-    OGRSFDriver *poDriver = new OGRWAsPDriver;
+    if (GDALGetDriverByName("WAsP"))
+        return;
+
+    auto poDriver = new GDALDriver();
+    poDriver->SetDescription("WAsP");
 
     poDriver->SetMetadataItem(GDAL_DCAP_VECTOR, "YES");
     poDriver->SetMetadataItem(GDAL_DCAP_CREATE_LAYER, "YES");
@@ -120,5 +99,9 @@ void RegisterOGRWAsP()
     poDriver->SetMetadataItem(GDAL_DMD_HELPTOPIC, "drivers/vector/wasp.html");
     poDriver->SetMetadataItem(GDAL_DCAP_VIRTUALIO, "YES");
 
-    OGRSFDriverRegistrar::GetRegistrar()->RegisterDriver(poDriver);
+    poDriver->pfnOpen = OGRWAsPDriverOpen;
+    poDriver->pfnCreate = OGRWAsPDriverCreate;
+    poDriver->pfnDelete = OGRWAsPDriverDelete;
+
+    GetGDALDriverManager()->RegisterDriver(poDriver);
 }
diff --git a/ogr/ogrsf_frmts/wasp/ogrwasplayer.cpp b/ogr/ogrsf_frmts/wasp/ogrwasplayer.cpp
index e17ab7c1cebb..444106aa74a8 100644
--- a/ogr/ogrsf_frmts/wasp/ogrwasplayer.cpp
+++ b/ogr/ogrsf_frmts/wasp/ogrwasplayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2014, Oslandia <info at oslandia dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrwasp.h"
diff --git a/ogr/ogrsf_frmts/wfs/CMakeLists.txt b/ogr/ogrsf_frmts/wfs/CMakeLists.txt
index b0d0e59426df..bb972020df0b 100644
--- a/ogr/ogrsf_frmts/wfs/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/wfs/CMakeLists.txt
@@ -3,10 +3,9 @@ add_gdal_driver(
   SOURCES ogr_wfs.h
           ogrwfsdatasource.cpp
           ogrwfsdriver.cpp
-          ogrwfsfilter.cpp
           ogrwfsjoinlayer.cpp
           ogrwfslayer.cpp
-          ogroapifdriver.cpp
-  BUILTIN)
+  PLUGIN_CAPABLE
+  NO_DEPS)
 gdal_standard_includes(ogr_WFS)
-target_include_directories(ogr_WFS PRIVATE $<TARGET_PROPERTY:ogr_GML,SOURCE_DIR>)
+target_include_directories(ogr_WFS PRIVATE $<TARGET_PROPERTY:gmlutils,SOURCE_DIR>)
diff --git a/ogr/ogrsf_frmts/wfs/ogr_wfs.h b/ogr/ogrsf_frmts/wfs/ogr_wfs.h
index 566b81c7f5bb..a84c57e0b0da 100644
--- a/ogr/ogrsf_frmts/wfs/ogr_wfs.h
+++ b/ogr/ogrsf_frmts/wfs/ogr_wfs.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_WFS_H_INCLUDED
@@ -36,19 +20,11 @@
 
 #include "cpl_minixml.h"
 #include "ogrsf_frmts.h"
-#include "gmlreader.h"
+#include "gmlfeature.h"
 #include "cpl_http.h"
 #include "ogr_swq.h"
 
 const CPLXMLNode *WFSFindNode(const CPLXMLNode *psXML, const char *pszRootName);
-void OGRWFSRecursiveUnlink(const char *pszName);
-CPLString
-WFS_TurnSQLFilterToOGCFilter(const swq_expr_node *poExpr, OGRDataSource *poDS,
-                             OGRFeatureDefn *poFDefn, int nVersion,
-                             int bPropertyIsNotEqualToSupported,
-                             int bUseFeatureId, int bGmlObjectIdNeedsGMLPrefix,
-                             const char *pszNSPrefix, int *pbOutNeedsNullCheck);
-swq_custom_func_registrar *WFSGetCustomFuncRegistrar();
 
 const char *FindSubStringInsensitive(const char *pszStr, const char *pszSubStr);
 
@@ -145,6 +121,8 @@ class OGRWFSLayer final : public OGRLayer
     std::vector<std::string> m_aosSupportedCRSList{};
     OGRLayer::GetSupportedSRSListRetType m_apoSupportedCRSList{};
 
+    std::string m_osTmpDir{};
+
   public:
     OGRWFSLayer(OGRWFSDataSource *poDS, OGRSpatialReference *poSRS,
                 int bAxisOrderAlreadyInverted, const char *pszBaseURL,
@@ -257,6 +235,11 @@ class OGRWFSLayer final : public OGRLayer
 
     OGRErr SetActiveSRS(int iGeomField,
                         const OGRSpatialReference *poSRS) override;
+
+    const std::string &GetTmpDir() const
+    {
+        return m_osTmpDir;
+    }
 };
 
 /************************************************************************/
@@ -290,6 +273,8 @@ class OGRWFSJoinLayer final : public OGRLayer
 
     CPLString osFeatureTypes;
 
+    std::string m_osTmpDir{};
+
     OGRWFSJoinLayer(OGRWFSDataSource *poDS, const swq_select *psSelectInfo,
                     const CPLString &osGlobalFilter);
     CPLString MakeGetFeatureURL(int bRequestHits = FALSE);
@@ -324,9 +309,8 @@ class OGRWFSJoinLayer final : public OGRLayer
 /*                           OGRWFSDataSource                           */
 /************************************************************************/
 
-class OGRWFSDataSource final : public OGRDataSource
+class OGRWFSDataSource final : public GDALDataset
 {
-    char *pszName;
     bool bRewriteFile;
     CPLXMLNode *psFileXML;
 
@@ -374,7 +358,7 @@ class OGRWFSDataSource final : public OGRDataSource
 
     CPLString osLayerMetadataCSV;
     CPLString osLayerMetadataTmpFileName;
-    OGRDataSource *poLayerMetadataDS;
+    GDALDataset *poLayerMetadataDS;
     OGRLayer *poLayerMetadataLayer;
 
     CPLString osGetCapabilities;
@@ -399,12 +383,8 @@ class OGRWFSDataSource final : public OGRDataSource
     OGRWFSDataSource();
     virtual ~OGRWFSDataSource();
 
-    int Open(const char *pszFilename, int bUpdate, char **papszOpenOptions);
-
-    virtual const char *GetName() override
-    {
-        return pszName;
-    }
+    int Open(const char *pszFilename, int bUpdate,
+             CSLConstList papszOpenOptions);
 
     virtual int GetLayerCount() override
     {
@@ -414,8 +394,6 @@ class OGRWFSDataSource final : public OGRDataSource
     virtual OGRLayer *GetLayer(int) override;
     virtual OGRLayer *GetLayerByName(const char *pszLayerName) override;
 
-    virtual int TestCapability(const char *) override;
-
     virtual OGRLayer *ExecuteSQL(const char *pszSQLCommand,
                                  OGRGeometry *poSpatialFilter,
                                  const char *pszDialect) override;
diff --git a/ogr/ogrsf_frmts/wfs/ogrwfsdatasource.cpp b/ogr/ogrsf_frmts/wfs/ogrwfsdatasource.cpp
index 8e523309ae7f..428ce9f816de 100644
--- a/ogr/ogrsf_frmts/wfs/ogrwfsdatasource.cpp
+++ b/ogr/ogrsf_frmts/wfs/ogrwfsdatasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -35,6 +19,7 @@
 #include "parsexsd.h"
 #include "ogr_swq.h"
 #include "ogr_p.h"
+#include "ogrwfsfilter.h"
 
 #include <algorithm>
 
@@ -158,9 +143,8 @@ class OGRWFSWrappedResultLayer final : public OGRLayer
 /************************************************************************/
 
 OGRWFSDataSource::OGRWFSDataSource()
-    : pszName(nullptr), bRewriteFile(false), psFileXML(nullptr),
-      papoLayers(nullptr), nLayers(0), bUpdate(false),
-      bGetFeatureSupportHits(false), bNeedNAMESPACE(false),
+    : bRewriteFile(false), psFileXML(nullptr), papoLayers(nullptr), nLayers(0),
+      bUpdate(false), bGetFeatureSupportHits(false), bNeedNAMESPACE(false),
       bHasMinOperators(false), bHasNullCheck(false),
       // Advertized by deegree but not implemented.
       bPropertyIsNotEqualToSupported(true),
@@ -210,7 +194,7 @@ OGRWFSDataSource::~OGRWFSDataSource()
     {
         if (bRewriteFile)
         {
-            CPLSerializeXMLTreeToFile(psFileXML, pszName);
+            CPLSerializeXMLTreeToFile(psFileXML, GetDescription());
         }
 
         CPLDestroyXMLNode(psFileXML);
@@ -225,20 +209,10 @@ OGRWFSDataSource::~OGRWFSDataSource()
     delete poLayerMetadataDS;
     delete poLayerGetCapabilitiesDS;
 
-    CPLFree(pszName);
     CSLDestroy(papszIdGenMethods);
     CSLDestroy(papszHttpOptions);
 }
 
-/************************************************************************/
-/*                           TestCapability()                           */
-/************************************************************************/
-
-int OGRWFSDataSource::TestCapability(CPL_UNUSED const char *pszCap)
-{
-    return FALSE;
-}
-
 /************************************************************************/
 /*                              GetLayer()                              */
 /************************************************************************/
@@ -267,14 +241,15 @@ OGRLayer *OGRWFSDataSource::GetLayerByName(const char *pszNameIn)
             return poLayerMetadataLayer;
 
         osLayerMetadataTmpFileName =
-            CPLSPrintf("/vsimem/tempwfs_%p/WFSLayerMetadata.csv", this);
+            VSIMemGenerateHiddenFilename("WFSLayerMetadata.csv");
         osLayerMetadataCSV = "layer_name,title,abstract\n" + osLayerMetadataCSV;
 
         VSIFCloseL(VSIFileFromMemBuffer(osLayerMetadataTmpFileName,
                                         (GByte *)osLayerMetadataCSV.c_str(),
                                         osLayerMetadataCSV.size(), FALSE));
-        poLayerMetadataDS = (OGRDataSource *)OGROpen(osLayerMetadataTmpFileName,
-                                                     FALSE, nullptr);
+        poLayerMetadataDS =
+            GDALDataset::Open(osLayerMetadataTmpFileName, GDAL_OF_VECTOR,
+                              nullptr, nullptr, nullptr);
         if (poLayerMetadataDS)
             poLayerMetadataLayer = poLayerMetadataDS->GetLayer(0);
         return poLayerMetadataLayer;
@@ -285,7 +260,7 @@ OGRLayer *OGRWFSDataSource::GetLayerByName(const char *pszNameIn)
             return poLayerGetCapabilitiesLayer;
 
         GDALDriver *poMEMDrv =
-            OGRSFDriverRegistrar::GetRegistrar()->GetDriverByName("Memory");
+            GetGDALDriverManager()->GetDriverByName("Memory");
         if (poMEMDrv == nullptr)
         {
             CPLError(CE_Failure, CPLE_AppDefined,
@@ -801,30 +776,18 @@ CPLXMLNode *OGRWFSDataSource::LoadFromFile(const char *pszFilename)
     if (fp == nullptr)
         return nullptr;
 
-    char achHeader[1024] = {};
-    const int nRead =
-        static_cast<int>(VSIFReadL(achHeader, 1, sizeof(achHeader) - 1, fp));
-    if (nRead == 0)
-    {
-        VSIFCloseL(fp);
-        return nullptr;
-    }
-    achHeader[nRead] = 0;
-
-    if (!STARTS_WITH_CI(achHeader, "<OGRWFSDataSource>") &&
-        strstr(achHeader, "<WFS_Capabilities") == nullptr &&
-        strstr(achHeader, "<wfs:WFS_Capabilities") == nullptr)
-    {
-        VSIFCloseL(fp);
-        return nullptr;
-    }
-
     /* -------------------------------------------------------------------- */
     /*      It is the right file, now load the full XML definition.         */
     /* -------------------------------------------------------------------- */
     VSIFSeekL(fp, 0, SEEK_END);
-    const int nLen = (int)VSIFTellL(fp);
+    const auto nLenLarge = VSIFTellL(fp);
     VSIFSeekL(fp, 0, SEEK_SET);
+    if (nLenLarge > 100 * 1024 * 1024)
+    {
+        VSIFCloseL(fp);
+        return nullptr;
+    }
+    const int nLen = static_cast<int>(nLenLarge);
 
     char *pszXML = (char *)VSI_MALLOC_VERBOSE(nLen + 1);
     if (pszXML == nullptr)
@@ -842,6 +805,13 @@ CPLXMLNode *OGRWFSDataSource::LoadFromFile(const char *pszFilename)
     }
     VSIFCloseL(fp);
 
+    if (!STARTS_WITH_CI(pszXML, "<OGRWFSDataSource>") &&
+        strstr(pszXML, "<WFS_Capabilities") == nullptr &&
+        strstr(pszXML, "<wfs:WFS_Capabilities") == nullptr)
+    {
+        return nullptr;
+    }
+
     if (strstr(pszXML, "CubeWerx"))
     {
         /* At least true for CubeWerx Suite 4.15.1 */
@@ -907,15 +877,18 @@ CPLHTTPResult *OGRWFSDataSource::SendGetCapabilities(const char *pszBaseURL,
 /************************************************************************/
 
 int OGRWFSDataSource::Open(const char *pszFilename, int bUpdateIn,
-                           char **papszOpenOptionsIn)
+                           CSLConstList papszOpenOptionsIn)
 
 {
     bUpdate = CPL_TO_BOOL(bUpdateIn);
-    CPLFree(pszName);
-    pszName = CPLStrdup(pszFilename);
 
     const CPLXMLNode *psWFSCapabilities = nullptr;
-    CPLXMLNode *psXML = LoadFromFile(pszFilename);
+    CPLXMLNode *psXML = nullptr;
+    if (!STARTS_WITH(pszFilename, "http://") &&
+        !STARTS_WITH(pszFilename, "https://"))
+    {
+        psXML = LoadFromFile(pszFilename);
+    }
     CPLString osTypeName;
     const char *pszBaseURL = nullptr;
 
@@ -926,6 +899,8 @@ int OGRWFSDataSource::Open(const char *pszFilename, int bUpdateIn,
     if (psXML == nullptr)
     {
         if (!STARTS_WITH_CI(pszFilename, "WFS:") &&
+            !STARTS_WITH(pszFilename, "http://") &&
+            !STARTS_WITH(pszFilename, "https://") &&
             FindSubStringInsensitive(pszFilename, "SERVICE=WFS") == nullptr)
         {
             return FALSE;
@@ -936,7 +911,7 @@ int OGRWFSDataSource::Open(const char *pszFilename, int bUpdateIn,
         {
             pszBaseURL = pszFilename;
             if (STARTS_WITH_CI(pszFilename, "WFS:"))
-                pszBaseURL += 4;
+                pszBaseURL += strlen("WFS:");
         }
 
         osBaseURL = pszBaseURL;
@@ -1374,6 +1349,7 @@ int OGRWFSDataSource::Open(const char *pszFilename, int bUpdateIn,
                 OGRLayer::GetSupportedSRSListRetType apoSupportedCRSList;
                 if (psOtherSRS)
                 {
+                    if (pszDefaultSRS)
                     {
                         auto poSRS =
                             std::unique_ptr<OGRSpatialReference,
@@ -1908,14 +1884,13 @@ void OGRWFSDataSource::LoadMultipleLayerDefn(const char *pszLayerName,
         return;
     }
 
-    CPLString osTmpFileName;
-
-    osTmpFileName = CPLSPrintf("/vsimem/tempwfs_%p/file.xsd", this);
+    const CPLString osTmpFileName = VSIMemGenerateHiddenFilename("file.xsd");
     CPLSerializeXMLTreeToFile(psSchema, osTmpFileName);
 
     std::vector<GMLFeatureClass *> aosClasses;
     bool bFullyUnderstood = false;
-    GMLParseXSD(osTmpFileName, aosClasses, bFullyUnderstood);
+    bool bUseSchemaImports = false;
+    GMLParseXSD(osTmpFileName, bUseSchemaImports, aosClasses, bFullyUnderstood);
 
     int nLayersFound = 0;
     if (!(int)aosClasses.empty())
@@ -2272,7 +2247,7 @@ OGRLayer *OGRWFSDataSource::ExecuteSQL(const char *pszSQLCommand,
         }
 
         GDALDriver *poMEMDrv =
-            OGRSFDriverRegistrar::GetRegistrar()->GetDriverByName("Memory");
+            GetGDALDriverManager()->GetDriverByName("Memory");
         if (poMEMDrv == nullptr)
         {
             CPLError(CE_Failure, CPLE_AppDefined,
@@ -2483,7 +2458,7 @@ OGRLayer *OGRWFSDataSource::ExecuteSQL(const char *pszSQLCommand,
         delete psSelectInfo;
     }
 
-    OGRLayer *poResLayer = OGRDataSource::ExecuteSQL(
+    OGRLayer *poResLayer = GDALDataset::ExecuteSQL(
         pszSQLCommand, poSpatialFilter, pszDialect, &oParseOptions);
     oMap[poResLayer] = nullptr;
     return poResLayer;
diff --git a/ogr/ogrsf_frmts/wfs/ogrwfsdriver.cpp b/ogr/ogrsf_frmts/wfs/ogrwfsdriver.cpp
index 8b28f598a567..be1f22a88922 100644
--- a/ogr/ogrsf_frmts/wfs/ogrwfsdriver.cpp
+++ b/ogr/ogrsf_frmts/wfs/ogrwfsdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_wfs.h"
@@ -44,15 +28,31 @@ static int OGRWFSDriverIdentify(GDALOpenInfo *poOpenInfo)
 {
     if (!STARTS_WITH_CI(poOpenInfo->pszFilename, "WFS:"))
     {
+        const bool bIsSingleDriver = poOpenInfo->IsSingleAllowedDriver("WFS");
+        if (bIsSingleDriver &&
+            (STARTS_WITH(poOpenInfo->pszFilename, "http://") ||
+             STARTS_WITH(poOpenInfo->pszFilename, "https://")))
+        {
+            return true;
+        }
+
         if (poOpenInfo->fpL == nullptr)
             return FALSE;
-        if (!STARTS_WITH_CI((const char *)poOpenInfo->pabyHeader,
-                            "<OGRWFSDataSource>") &&
-            strstr((const char *)poOpenInfo->pabyHeader, "<WFS_Capabilities") ==
-                nullptr &&
-            strstr((const char *)poOpenInfo->pabyHeader,
-                   "<wfs:WFS_Capabilities") == nullptr)
+
+        const char *pszHeader =
+            reinterpret_cast<const char *>(poOpenInfo->pabyHeader);
+        if (!STARTS_WITH_CI(pszHeader, "<OGRWFSDataSource>") &&
+            strstr(pszHeader, "<WFS_Capabilities") == nullptr &&
+            strstr(pszHeader, "<wfs:WFS_Capabilities") == nullptr)
         {
+            if (bIsSingleDriver)
+            {
+                while (*pszHeader != 0 &&
+                       std::isspace(static_cast<unsigned char>(*pszHeader)))
+                    ++pszHeader;
+                return *pszHeader == '<';
+            }
+
             return FALSE;
         }
     }
diff --git a/ogr/ogrsf_frmts/wfs/ogrwfsjoinlayer.cpp b/ogr/ogrsf_frmts/wfs/ogrwfsjoinlayer.cpp
index f024b1d02b76..aef643114b56 100644
--- a/ogr/ogrsf_frmts/wfs/ogrwfsjoinlayer.cpp
+++ b/ogr/ogrsf_frmts/wfs/ogrwfsjoinlayer.cpp
@@ -7,26 +7,11 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_wfs.h"
+#include "ogrwfsfilter.h"
 #include "cpl_md5.h"
 
 /************************************************************************/
@@ -40,7 +25,9 @@ OGRWFSJoinLayer::OGRWFSJoinLayer(OGRWFSDataSource *poDSIn,
       bDistinct(psSelectInfo->query_mode == SWQM_DISTINCT_LIST),
       poBaseDS(nullptr), poBaseLayer(nullptr), bReloadNeeded(false),
       bHasFetched(false), bPagingActive(false), nPagingStartIndex(0),
-      nFeatureRead(0), nFeatureCountRequested(0)
+      nFeatureRead(0), nFeatureCountRequested(0),
+      // If changing that, change in the GML driver too
+      m_osTmpDir(VSIMemGenerateHiddenFilename("_ogr_wfs_"))
 {
     CPLString osName("join_");
     CPLString osLayerName = psSelectInfo->table_defs[0].table_name;
@@ -178,7 +165,7 @@ OGRWFSJoinLayer::OGRWFSJoinLayer(OGRWFSDataSource *poDSIn,
     for (int i = 0; i < (int)apoLayers.size(); i++)
     {
         CPLString osTmpFileName =
-            CPLSPrintf("/vsimem/tempwfs_%p/file.xsd", apoLayers[i]);
+            CPLSPrintf("%s/file.xsd", apoLayers[i]->GetTmpDir().c_str());
         CPLPushErrorHandler(CPLQuietErrorHandler);
         CPLXMLNode *psSchema = CPLParseXMLFile(osTmpFileName);
         CPLPopErrorHandler();
@@ -199,8 +186,7 @@ OGRWFSJoinLayer::OGRWFSJoinLayer(OGRWFSDataSource *poDSIn,
     }
     if (psGlobalSchema)
     {
-        CPLString osTmpFileName =
-            CPLSPrintf("/vsimem/tempwfs_%p/file.xsd", this);
+        CPLString osTmpFileName = CPLSPrintf("%s/file.xsd", m_osTmpDir.c_str());
         CPLSerializeXMLTreeToFile(psGlobalSchema, osTmpFileName);
         CPLDestroyXMLNode(psGlobalSchema);
     }
@@ -217,8 +203,7 @@ OGRWFSJoinLayer::~OGRWFSJoinLayer()
     if (poBaseDS != nullptr)
         GDALClose(poBaseDS);
 
-    CPLString osTmpDirName = CPLSPrintf("/vsimem/tempwfs_%p", this);
-    OGRWFSRecursiveUnlink(osTmpDirName);
+    VSIRmdirRecursive(m_osTmpDir.c_str());
 }
 
 /************************************************************************/
@@ -430,7 +415,7 @@ GDALDataset *OGRWFSJoinLayer::FetchGetFeature()
 
     /* Try streaming when the output format is GML and that we have a .xsd */
     /* that we are able to understand */
-    CPLString osXSDFileName = CPLSPrintf("/vsimem/tempwfs_%p/file.xsd", this);
+    CPLString osXSDFileName = CPLSPrintf("%s/file.xsd", m_osTmpDir.c_str());
     VSIStatBufL sBuf;
     if (CPLTestBool(CPLGetConfigOption("OGR_WFS_USE_STREAMING", "YES")) &&
         VSIStatL(osXSDFileName, &sBuf) == 0 &&
@@ -487,8 +472,7 @@ GDALDataset *OGRWFSJoinLayer::FetchGetFeature()
         return nullptr;
     }
 
-    CPLString osTmpDirName = CPLSPrintf("/vsimem/tempwfs_%p", this);
-    VSIMkdir(osTmpDirName, 0);
+    VSIMkdir(m_osTmpDir.c_str(), 0);
 
     GByte *pabyData = psResult->pabyData;
     int nDataLen = psResult->nDataLen;
@@ -504,10 +488,10 @@ GDALDataset *OGRWFSJoinLayer::FetchGetFeature()
 
     CPLString osTmpFileName;
 
-    osTmpFileName = osTmpDirName + "/file.gfs";
+    osTmpFileName = m_osTmpDir + "/file.gfs";
     VSIUnlink(osTmpFileName);
 
-    osTmpFileName = osTmpDirName + "/file.gml";
+    osTmpFileName = m_osTmpDir + "/file.gml";
 
     VSILFILE *fp =
         VSIFileFromMemBuffer(osTmpFileName, pabyData, nDataLen, TRUE);
@@ -516,8 +500,8 @@ GDALDataset *OGRWFSJoinLayer::FetchGetFeature()
 
     CPLHTTPDestroyResult(psResult);
 
-    OGRDataSource *l_poDS =
-        (OGRDataSource *)OGROpen(osTmpFileName, FALSE, nullptr);
+    auto l_poDS = std::unique_ptr<GDALDataset>(GDALDataset::Open(
+        osTmpFileName, GDAL_OF_VECTOR, nullptr, nullptr, nullptr));
     if (l_poDS == nullptr)
     {
         if (strstr((const char *)pabyData, "<wfs:FeatureCollection") ==
@@ -535,11 +519,10 @@ GDALDataset *OGRWFSJoinLayer::FetchGetFeature()
     OGRLayer *poLayer = l_poDS->GetLayer(0);
     if (poLayer == nullptr)
     {
-        OGRDataSource::DestroyDataSource(l_poDS);
         return nullptr;
     }
 
-    return l_poDS;
+    return l_poDS.release();
 }
 
 /************************************************************************/
diff --git a/ogr/ogrsf_frmts/wfs/ogrwfslayer.cpp b/ogr/ogrsf_frmts/wfs/ogrwfslayer.cpp
index 55f18291f71d..0a8dcc8e004c 100644
--- a/ogr/ogrsf_frmts/wfs/ogrwfslayer.cpp
+++ b/ogr/ogrsf_frmts/wfs/ogrwfslayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -32,44 +16,7 @@
 #include "cpl_minixml.h"
 #include "cpl_http.h"
 #include "parsexsd.h"
-
-/************************************************************************/
-/*                      OGRWFSRecursiveUnlink()                         */
-/************************************************************************/
-
-void OGRWFSRecursiveUnlink(const char *pszName)
-
-{
-    char **papszFileList = VSIReadDir(pszName);
-
-    for (int i = 0; papszFileList != nullptr && papszFileList[i] != nullptr;
-         i++)
-    {
-        VSIStatBufL sStatBuf;
-
-        if (EQUAL(papszFileList[i], ".") || EQUAL(papszFileList[i], ".."))
-            continue;
-
-        CPLString osFullFilename =
-            CPLFormFilename(pszName, papszFileList[i], nullptr);
-
-        if (VSIStatL(osFullFilename, &sStatBuf) == 0)
-        {
-            if (VSI_ISREG(sStatBuf.st_mode))
-            {
-                VSIUnlink(osFullFilename);
-            }
-            else if (VSI_ISDIR(sStatBuf.st_mode))
-            {
-                OGRWFSRecursiveUnlink(osFullFilename);
-            }
-        }
-    }
-
-    CSLDestroy(papszFileList);
-
-    VSIRmdir(pszName);
-}
+#include "ogrwfsfilter.h"
 
 /************************************************************************/
 /*                            OGRWFSLayer()                             */
@@ -93,6 +40,9 @@ OGRWFSLayer::OGRWFSLayer(OGRWFSDataSource *poDSIn, OGRSpatialReference *poSRSIn,
       nPagingStartIndex(0), nFeatureRead(0), pszRequiredOutputFormat(nullptr)
 {
     SetDescription(pszName);
+
+    // If changing that, change in the GML driver too
+    m_osTmpDir = VSIMemGenerateHiddenFilename("_ogr_wfs_");
 }
 
 /************************************************************************/
@@ -114,9 +64,9 @@ OGRWFSLayer *OGRWFSLayer::Clone()
         pszRequiredOutputFormat ? CPLStrdup(pszRequiredOutputFormat) : nullptr;
 
     /* Copy existing schema file if already found */
-    CPLString osSrcFileName = CPLSPrintf("/vsimem/tempwfs_%p/file.xsd", this);
+    CPLString osSrcFileName = CPLSPrintf("%s/file.xsd", m_osTmpDir.c_str());
     CPLString osTargetFileName =
-        CPLSPrintf("/vsimem/tempwfs_%p/file.xsd", poDupLayer);
+        CPLSPrintf("%s/file.xsd", poDupLayer->m_osTmpDir.c_str());
     CPL_IGNORE_RET_VAL(CPLCopyFile(osTargetFileName, osSrcFileName));
 
     return poDupLayer;
@@ -148,8 +98,7 @@ OGRWFSLayer::~OGRWFSLayer()
 
     delete poFetchedFilterGeom;
 
-    CPLString osTmpDirName = CPLSPrintf("/vsimem/tempwfs_%p", this);
-    OGRWFSRecursiveUnlink(osTmpDirName);
+    VSIRmdirRecursive(m_osTmpDir.c_str());
 
     CPLFree(pszRequiredOutputFormat);
 }
@@ -312,12 +261,14 @@ OGRFeatureDefn *OGRWFSLayer::ParseSchema(const CPLXMLNode *psSchema)
 
     CPLString osTmpFileName;
 
-    osTmpFileName = CPLSPrintf("/vsimem/tempwfs_%p/file.xsd", this);
+    osTmpFileName = CPLSPrintf("%s/file.xsd", m_osTmpDir.c_str());
     CPLSerializeXMLTreeToFile(psSchema, osTmpFileName);
 
     std::vector<GMLFeatureClass *> aosClasses;
     bool bFullyUnderstood = false;
-    bool bHaveSchema = GMLParseXSD(osTmpFileName, aosClasses, bFullyUnderstood);
+    bool bUseSchemaImports = false;
+    bool bHaveSchema = GMLParseXSD(osTmpFileName, bUseSchemaImports, aosClasses,
+                                   bFullyUnderstood);
 
     if (bHaveSchema && aosClasses.size() == 1)
     {
@@ -801,8 +752,7 @@ GDALDataset *OGRWFSLayer::FetchGetFeature(int nRequestMaxFeatures)
         /* Try streaming when the output format is GML and that we have a .xsd
          */
         /* that we are able to understand */
-        CPLString osXSDFileName =
-            CPLSPrintf("/vsimem/tempwfs_%p/file.xsd", this);
+        CPLString osXSDFileName = CPLSPrintf("%s/file.xsd", m_osTmpDir.c_str());
         VSIStatBufL sBuf;
         GDALDriver *poDriver = nullptr;
         if ((osOutputFormat.empty() ||
@@ -920,8 +870,7 @@ GDALDataset *OGRWFSLayer::FetchGetFeature(int nRequestMaxFeatures)
     if (psResult->pszContentType)
         pszContentType = psResult->pszContentType;
 
-    const std::string osTmpDirName = CPLSPrintf("/vsimem/tempwfs_%p", this);
-    VSIMkdir(osTmpDirName.c_str(), 0);
+    VSIMkdir(m_osTmpDir.c_str(), 0);
 
     GByte *pabyData = psResult->pabyData;
     int nDataLen = psResult->nDataLen;
@@ -932,11 +881,11 @@ GDALDataset *OGRWFSLayer::FetchGetFeature(int nRequestMaxFeatures)
         CPLHTTPParseMultipartMime(psResult))
     {
         bIsMultiPart = true;
-        OGRWFSRecursiveUnlink(osTmpDirName.c_str());
-        VSIMkdir(osTmpDirName.c_str(), 0);
+        VSIRmdirRecursive(m_osTmpDir.c_str());
+        VSIMkdir(m_osTmpDir.c_str(), 0);
         for (int i = 0; i < psResult->nMimePartCount; i++)
         {
-            CPLString osTmpFileName = osTmpDirName + "/";
+            CPLString osTmpFileName = m_osTmpDir + "/";
             pszAttachmentFilename = OGRWFSFetchContentDispositionFilename(
                 psResult->pasMimePart[i].papszHeaders);
 
@@ -1036,31 +985,31 @@ GDALDataset *OGRWFSLayer::FetchGetFeature(int nRequestMaxFeatures)
     if (!bIsMultiPart)
     {
         if (bJSON)
-            osTmpFileName = osTmpDirName + "/file.geojson";
+            osTmpFileName = m_osTmpDir + "/file.geojson";
         else if (bZIP)
-            osTmpFileName = osTmpDirName + "/file.zip";
+            osTmpFileName = m_osTmpDir + "/file.zip";
         else if (bCSV)
-            osTmpFileName = osTmpDirName + "/file.csv";
+            osTmpFileName = m_osTmpDir + "/file.csv";
         else if (bKML)
-            osTmpFileName = osTmpDirName + "/file.kml";
+            osTmpFileName = m_osTmpDir + "/file.kml";
         else if (bKMZ)
-            osTmpFileName = osTmpDirName + "/file.kmz";
+            osTmpFileName = m_osTmpDir + "/file.kmz";
         else if (bFlatGeobuf)
-            osTmpFileName = osTmpDirName + "/file.fgb";
+            osTmpFileName = m_osTmpDir + "/file.fgb";
         /* GML is a special case. It needs the .xsd file that has been saved */
         /* as file.xsd, so we cannot used the attachment filename */
         else if (pszAttachmentFilename &&
                  !EQUAL(CPLGetExtension(pszAttachmentFilename), "GML"))
         {
-            osTmpFileName = osTmpDirName + "/";
+            osTmpFileName = m_osTmpDir + "/";
             osTmpFileName += pszAttachmentFilename;
         }
         else
         {
-            osTmpFileName = osTmpDirName + "/file.gfs";
+            osTmpFileName = m_osTmpDir + "/file.gfs";
             VSIUnlink(osTmpFileName);
 
-            osTmpFileName = osTmpDirName + "/file.gml";
+            osTmpFileName = m_osTmpDir + "/file.gml";
         }
 
         VSILFILE *fp =
@@ -1081,7 +1030,7 @@ GDALDataset *OGRWFSLayer::FetchGetFeature(int nRequestMaxFeatures)
     {
         pabyData = nullptr;
         nDataLen = 0;
-        osTmpFileName = osTmpDirName;
+        osTmpFileName = m_osTmpDir;
     }
 
     CPLHTTPDestroyResult(psResult);
@@ -1618,8 +1567,8 @@ GIntBig OGRWFSLayer::ExecuteGetFeatureResultTypeHits()
     if (psResult->pszContentType != nullptr &&
         strstr(psResult->pszContentType, "application/zip") != nullptr)
     {
-        CPLString osTmpFileName;
-        osTmpFileName.Printf("/vsimem/wfstemphits_%p.zip", this);
+        const CPLString osTmpFileName(
+            VSIMemGenerateHiddenFilename("wfstemphits.zip"));
         VSILFILE *fp = VSIFileFromMemBuffer(osTmpFileName, psResult->pabyData,
                                             psResult->nDataLen, FALSE);
         VSIFCloseL(fp);
diff --git a/ogr/ogrsf_frmts/xls/include_freexl.h b/ogr/ogrsf_frmts/xls/include_freexl.h
index c593e2bddb4d..6150d357f3c7 100644
--- a/ogr/ogrsf_frmts/xls/include_freexl.h
+++ b/ogr/ogrsf_frmts/xls/include_freexl.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2011-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef INCLUDE_FREEXL_H_INCLUDED
diff --git a/ogr/ogrsf_frmts/xls/ogr_xls.h b/ogr/ogrsf_frmts/xls/ogr_xls.h
index c5d4e151f0c5..48103a2f1df7 100644
--- a/ogr/ogrsf_frmts/xls/ogr_xls.h
+++ b/ogr/ogrsf_frmts/xls/ogr_xls.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2011-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_XLS_H_INCLUDED
@@ -92,10 +76,8 @@ class OGRXLSLayer final : public OGRLayer,
 /*                           OGRXLSDataSource                           */
 /************************************************************************/
 
-class OGRXLSDataSource final : public OGRDataSource
+class OGRXLSDataSource final : public GDALDataset
 {
-    char *pszName;
-
     OGRLayer **papoLayers;
     int nLayers;
 
@@ -111,11 +93,6 @@ class OGRXLSDataSource final : public OGRDataSource
 
     int Open(const char *pszFilename, int bUpdate);
 
-    virtual const char *GetName() override
-    {
-        return pszName;
-    }
-
     virtual int GetLayerCount() override
     {
         return nLayers;
@@ -123,8 +100,6 @@ class OGRXLSDataSource final : public OGRDataSource
 
     virtual OGRLayer *GetLayer(int) override;
 
-    virtual int TestCapability(const char *) override;
-
     const void *GetXLSHandle();
 };
 
diff --git a/ogr/ogrsf_frmts/xls/ogrxlsdatasource.cpp b/ogr/ogrsf_frmts/xls/ogrxlsdatasource.cpp
index 52676d5b4612..c37579a904d8 100644
--- a/ogr/ogrsf_frmts/xls/ogrxlsdatasource.cpp
+++ b/ogr/ogrsf_frmts/xls/ogrxlsdatasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "include_freexl.h"
@@ -41,7 +25,7 @@
 /************************************************************************/
 
 OGRXLSDataSource::OGRXLSDataSource()
-    : pszName(nullptr), papoLayers(nullptr), nLayers(0), xlshandle(nullptr)
+    : papoLayers(nullptr), nLayers(0), xlshandle(nullptr)
 {
 }
 
@@ -56,8 +40,6 @@ OGRXLSDataSource::~OGRXLSDataSource()
         delete papoLayers[i];
     CPLFree(papoLayers);
 
-    CPLFree(pszName);
-
     if (xlshandle)
         freexl_close(xlshandle);
 #ifdef _WIN32
@@ -68,16 +50,6 @@ OGRXLSDataSource::~OGRXLSDataSource()
 #endif
 }
 
-/************************************************************************/
-/*                           TestCapability()                           */
-/************************************************************************/
-
-int OGRXLSDataSource::TestCapability(CPL_UNUSED const char *pszCap)
-
-{
-    return FALSE;
-}
-
 /************************************************************************/
 /*                              GetLayer()                              */
 /************************************************************************/
@@ -103,7 +75,6 @@ int OGRXLSDataSource::Open(const char *pszFilename, int bUpdateIn)
         return FALSE;
     }
 
-    pszName = CPLStrdup(pszFilename);
     m_osANSIFilename = pszFilename;
 #ifdef _WIN32
     if (CPLTestBool(CPLGetConfigOption("GDAL_FILENAME_IS_UTF8", "YES")))
diff --git a/ogr/ogrsf_frmts/xls/ogrxlsdriver.cpp b/ogr/ogrsf_frmts/xls/ogrxlsdriver.cpp
index 4c1ca2a3bea2..156939149398 100644
--- a/ogr/ogrsf_frmts/xls/ogrxlsdriver.cpp
+++ b/ogr/ogrsf_frmts/xls/ogrxlsdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_xls.h"
diff --git a/ogr/ogrsf_frmts/xls/ogrxlsdrivercore.cpp b/ogr/ogrsf_frmts/xls/ogrxlsdrivercore.cpp
index 03be51cf719e..97121f7c0a12 100644
--- a/ogr/ogrsf_frmts/xls/ogrxlsdrivercore.cpp
+++ b/ogr/ogrsf_frmts/xls/ogrxlsdrivercore.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogrsf_frmts.h"
diff --git a/ogr/ogrsf_frmts/xls/ogrxlsdrivercore.h b/ogr/ogrsf_frmts/xls/ogrxlsdrivercore.h
index e8bd889ff19d..0d6d8de39691 100644
--- a/ogr/ogrsf_frmts/xls/ogrxlsdrivercore.h
+++ b/ogr/ogrsf_frmts/xls/ogrxlsdrivercore.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGRXLSDRIVERCORE_H
diff --git a/ogr/ogrsf_frmts/xls/ogrxlslayer.cpp b/ogr/ogrsf_frmts/xls/ogrxlslayer.cpp
index 75ac35d0194c..eb48fb081a87 100644
--- a/ogr/ogrsf_frmts/xls/ogrxlslayer.cpp
+++ b/ogr/ogrsf_frmts/xls/ogrxlslayer.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2011-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "include_freexl.h"
diff --git a/ogr/ogrsf_frmts/xlsx/CMakeLists.txt b/ogr/ogrsf_frmts/xlsx/CMakeLists.txt
index e902499c1f0b..4870ac9030e7 100644
--- a/ogr/ogrsf_frmts/xlsx/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/xlsx/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_gdal_driver(TARGET ogr_XLSX SOURCES ogr_xlsx.h ogrxlsxdatasource.cpp ogrxlsxdriver.cpp PLUGIN_CAPABLE NO_DEPS)
 gdal_standard_includes(ogr_XLSX)
 target_include_directories(
-  ogr_XLSX PRIVATE $<TARGET_PROPERTY:ogr_geojson,SOURCE_DIR> $<TARGET_PROPERTY:ogr_MEM,SOURCE_DIR>
+  ogr_XLSX PRIVATE $<TARGET_PROPERTY:ogr_MEM,SOURCE_DIR>
                    $<TARGET_PROPERTY:gdal_MEM,SOURCE_DIR>)
 if (GDAL_USE_EXPAT)
   target_compile_definitions(ogr_XLSX PRIVATE -DHAVE_EXPAT)
diff --git a/ogr/ogrsf_frmts/xlsx/ogr_xlsx.h b/ogr/ogrsf_frmts/xlsx/ogr_xlsx.h
index 6782b69675f6..c0192db27e97 100644
--- a/ogr/ogrsf_frmts/xlsx/ogr_xlsx.h
+++ b/ogr/ogrsf_frmts/xlsx/ogr_xlsx.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef OGR_XLSX_H_INCLUDED
@@ -62,6 +46,9 @@ class OGRXLSXLayer final : public OGRMemLayer
     std::string m_osCols{};
     std::set<int> oSetFieldsOfUnknownType{};
 
+    GIntBig TranslateFIDFromMemLayer(GIntBig nFID) const;
+    GIntBig TranslateFIDToMemLayer(GIntBig nFID) const;
+
   public:
     OGRXLSXLayer(OGRXLSXDataSource *poDSIn, const char *pszFilename,
                  const char *pszName, int bUpdateIn = FALSE);
@@ -113,6 +100,11 @@ class OGRXLSXLayer final : public OGRMemLayer
     virtual OGRFeature *GetNextFeature() override;
     virtual OGRFeature *GetFeature(GIntBig nFeatureId) override;
     virtual OGRErr ISetFeature(OGRFeature *poFeature) override;
+    OGRErr IUpdateFeature(OGRFeature *poFeature, int nUpdatedFieldsCount,
+                          const int *panUpdatedFieldsIdx,
+                          int nUpdatedGeomFieldsCount,
+                          const int *panUpdatedGeomFieldsIdx,
+                          bool bUpdateStyleString) override;
     virtual OGRErr DeleteFeature(GIntBig nFID) override;
 
     virtual OGRErr SetNextByIndex(GIntBig nIndex) override
diff --git a/ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp b/ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp
index 6f2fa9857f0f..f7d32b508e4a 100644
--- a/ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp
+++ b/ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2012-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_xlsx.h"
@@ -96,6 +80,28 @@ OGRErr OGRXLSXLayer::SyncToDisk()
     return OGRERR_NONE;
 }
 
+/************************************************************************/
+/*                      TranslateFIDFromMemLayer()                      */
+/************************************************************************/
+
+// Translate a FID from MEM convention (0-based) to XLSX convention
+GIntBig OGRXLSXLayer::TranslateFIDFromMemLayer(GIntBig nFID) const
+{
+    return nFID + (1 + (bHasHeaderLine ? 1 : 0));
+}
+
+/************************************************************************/
+/*                        TranslateFIDToMemLayer()                      */
+/************************************************************************/
+
+// Translate a FID from XLSX convention to MEM convention (0-based)
+GIntBig OGRXLSXLayer::TranslateFIDToMemLayer(GIntBig nFID) const
+{
+    if (nFID > 0)
+        return nFID - (1 + (bHasHeaderLine ? 1 : 0));
+    return OGRNullFID;
+}
+
 /************************************************************************/
 /*                          GetNextFeature()                            */
 /************************************************************************/
@@ -103,16 +109,21 @@ OGRErr OGRXLSXLayer::SyncToDisk()
 OGRFeature *OGRXLSXLayer::GetNextFeature()
 {
     Init();
+
     OGRFeature *poFeature = OGRMemLayer::GetNextFeature();
     if (poFeature)
-        poFeature->SetFID(poFeature->GetFID() + 1 +
-                          static_cast<int>(bHasHeaderLine));
+        poFeature->SetFID(TranslateFIDFromMemLayer(poFeature->GetFID()));
     return poFeature;
 }
 
+/************************************************************************/
+/*                           CreateField()                              */
+/************************************************************************/
+
 OGRErr OGRXLSXLayer::CreateField(const OGRFieldDefn *poField, int bApproxOK)
 {
     Init();
+
     if (GetLayerDefn()->GetFieldCount() >= 2000)
     {
         CPLError(CE_Failure, CPLE_AppDefined,
@@ -130,29 +141,61 @@ OGRErr OGRXLSXLayer::CreateField(const OGRFieldDefn *poField, int bApproxOK)
 OGRFeature *OGRXLSXLayer::GetFeature(GIntBig nFeatureId)
 {
     Init();
-    OGRFeature *poFeature = OGRMemLayer::GetFeature(
-        nFeatureId - (1 + static_cast<int>(bHasHeaderLine)));
+
+    OGRFeature *poFeature =
+        OGRMemLayer::GetFeature(TranslateFIDToMemLayer(nFeatureId));
     if (poFeature)
         poFeature->SetFID(nFeatureId);
     return poFeature;
 }
 
 /************************************************************************/
-/*                           ISetFeature()                               */
+/*                           ISetFeature()                              */
 /************************************************************************/
 
 OGRErr OGRXLSXLayer::ISetFeature(OGRFeature *poFeature)
 {
     Init();
-    if (poFeature == nullptr)
-        return OGRMemLayer::ISetFeature(poFeature);
 
-    GIntBig nFID = poFeature->GetFID();
-    if (nFID != OGRNullFID)
-        poFeature->SetFID(nFID - (1 + static_cast<int>(bHasHeaderLine)));
+    const GIntBig nFIDOrigin = poFeature->GetFID();
+    if (nFIDOrigin > 0)
+    {
+        const GIntBig nFIDMemLayer = TranslateFIDToMemLayer(nFIDOrigin);
+        if (!GetFeatureRef(nFIDMemLayer))
+            return OGRERR_NON_EXISTING_FEATURE;
+        poFeature->SetFID(nFIDMemLayer);
+    }
+    else
+    {
+        return OGRERR_NON_EXISTING_FEATURE;
+    }
     SetUpdated();
     OGRErr eErr = OGRMemLayer::ISetFeature(poFeature);
-    poFeature->SetFID(nFID);
+    poFeature->SetFID(nFIDOrigin);
+    return eErr;
+}
+
+/************************************************************************/
+/*                         IUpdateFeature()                             */
+/************************************************************************/
+
+OGRErr OGRXLSXLayer::IUpdateFeature(OGRFeature *poFeature,
+                                    int nUpdatedFieldsCount,
+                                    const int *panUpdatedFieldsIdx,
+                                    int nUpdatedGeomFieldsCount,
+                                    const int *panUpdatedGeomFieldsIdx,
+                                    bool bUpdateStyleString)
+{
+    Init();
+
+    const GIntBig nFIDOrigin = poFeature->GetFID();
+    if (nFIDOrigin != OGRNullFID)
+        poFeature->SetFID(TranslateFIDToMemLayer(nFIDOrigin));
+    SetUpdated();
+    OGRErr eErr = OGRMemLayer::IUpdateFeature(
+        poFeature, nUpdatedFieldsCount, panUpdatedFieldsIdx,
+        nUpdatedGeomFieldsCount, panUpdatedGeomFieldsIdx, bUpdateStyleString);
+    poFeature->SetFID(nFIDOrigin);
     return eErr;
 }
 
@@ -164,16 +207,23 @@ OGRErr OGRXLSXLayer::ICreateFeature(OGRFeature *poFeature)
 {
     Init();
 
-    GIntBig nFID = poFeature->GetFID();
-    if (nFID != OGRNullFID)
+    const GIntBig nFIDOrigin = poFeature->GetFID();
+    if (nFIDOrigin > 0)
     {
-        // Compensate what ISetFeature() will do since
-        // OGRMemLayer::ICreateFeature() will eventually call it
-        poFeature->SetFID(nFID + (1 + static_cast<int>(bHasHeaderLine)));
+        const GIntBig nFIDModified = TranslateFIDToMemLayer(nFIDOrigin);
+        if (GetFeatureRef(nFIDModified))
+        {
+            SetUpdated();
+            poFeature->SetFID(nFIDModified);
+            OGRErr eErr = OGRMemLayer::ISetFeature(poFeature);
+            poFeature->SetFID(nFIDOrigin);
+            return eErr;
+        }
     }
     SetUpdated();
+    poFeature->SetFID(OGRNullFID);
     OGRErr eErr = OGRMemLayer::ICreateFeature(poFeature);
-    poFeature->SetFID(nFID);
+    poFeature->SetFID(TranslateFIDFromMemLayer(poFeature->GetFID()));
     return eErr;
 }
 
@@ -185,8 +235,7 @@ OGRErr OGRXLSXLayer::DeleteFeature(GIntBig nFID)
 {
     Init();
     SetUpdated();
-    return OGRMemLayer::DeleteFeature(nFID -
-                                      (1 + static_cast<int>(bHasHeaderLine)));
+    return OGRMemLayer::DeleteFeature(TranslateFIDToMemLayer(nFID));
 }
 
 /************************************************************************/
@@ -353,6 +402,18 @@ int OGRXLSXDataSource::Create(const char *pszFilename,
     return TRUE;
 }
 
+/************************************************************************/
+/*                           GetUnprefixed()                            */
+/************************************************************************/
+
+static const char *GetUnprefixed(const char *pszStr)
+{
+    const char *pszColumn = strchr(pszStr, ':');
+    if (pszColumn)
+        return pszColumn + 1;
+    return pszStr;
+}
+
 /************************************************************************/
 /*                           startElementCbk()                          */
 /************************************************************************/
@@ -369,6 +430,8 @@ void OGRXLSXDataSource::startElementCbk(const char *pszNameIn,
     if (bStopParsing)
         return;
 
+    pszNameIn = GetUnprefixed(pszNameIn);
+
     nWithoutEventCounter = 0;
     switch (stateStack[nStackDepth].eVal)
     {
@@ -409,6 +472,8 @@ void OGRXLSXDataSource::endElementCbk(const char *pszNameIn)
     if (bStopParsing)
         return;
 
+    pszNameIn = GetUnprefixed(pszNameIn);
+
     nWithoutEventCounter = 0;
 
     nDepth--;
@@ -751,14 +816,22 @@ void OGRXLSXDataSource::startElementTable(const char *pszNameIn,
         apoCurLineValues.clear();
         apoCurLineTypes.clear();
 
-        int nNewCurLine = atoi(GetAttributeValue(ppszAttr, "r", "0"));
-        if (nNewCurLine <= 0)
+        int nNewCurLine;
+        if (const char *pszR = GetAttributeValue(ppszAttr, "r", nullptr))
         {
-            CPLError(CE_Failure, CPLE_AppDefined, "Invalid row: %d",
-                     nNewCurLine);
-            return;
+            nNewCurLine = atoi(pszR);
+            if (nNewCurLine <= 0)
+            {
+                CPLError(CE_Failure, CPLE_AppDefined, "Invalid row: %d",
+                         nNewCurLine);
+                return;
+            }
+            nNewCurLine--;
+        }
+        else
+        {
+            nNewCurLine = nCurLine;
         }
-        nNewCurLine--;
         const int nFields = std::max(
             static_cast<int>(apoFirstLineValues.size()),
             poCurLayer != nullptr ? poCurLayer->GetLayerDefn()->GetFieldCount()
@@ -1281,6 +1354,8 @@ void OGRXLSXDataSource::startElementSSCbk(const char *pszNameIn,
     if (bStopParsing)
         return;
 
+    pszNameIn = GetUnprefixed(pszNameIn);
+
     nWithoutEventCounter = 0;
     switch (stateStack[nStackDepth].eVal)
     {
@@ -1316,11 +1391,14 @@ static void XMLCALL endElementSSCbk(void *pUserData, const char *pszNameIn)
     ((OGRXLSXDataSource *)pUserData)->endElementSSCbk(pszNameIn);
 }
 
-void OGRXLSXDataSource::endElementSSCbk(CPL_UNUSED const char *pszNameIn)
+void OGRXLSXDataSource::endElementSSCbk(const char * /*pszNameIn*/)
 {
     if (bStopParsing)
         return;
 
+    // If we were to use pszNameIn, then we need:
+    // pszNameIn = GetUnprefixed(pszNameIn);
+
     nWithoutEventCounter = 0;
 
     nDepth--;
@@ -1464,6 +1542,8 @@ void OGRXLSXDataSource::startElementWBRelsCbk(const char *pszNameIn,
     if (bStopParsing)
         return;
 
+    pszNameIn = GetUnprefixed(pszNameIn);
+
     nWithoutEventCounter = 0;
     if (strcmp(pszNameIn, "Relationship") == 0)
     {
@@ -1528,18 +1608,6 @@ void OGRXLSXDataSource::AnalyseWorkbookRels(VSILFILE *fpWorkbookRels)
     VSIFCloseL(fpWorkbookRels);
 }
 
-/************************************************************************/
-/*                           GetUnprefixed()                            */
-/************************************************************************/
-
-static const char *GetUnprefixed(const char *pszStr)
-{
-    const char *pszColumn = strchr(pszStr, ':');
-    if (pszColumn)
-        return pszColumn + 1;
-    return pszStr;
-}
-
 /************************************************************************/
 /*                          startElementWBCbk()                         */
 /************************************************************************/
@@ -1556,8 +1624,10 @@ void OGRXLSXDataSource::startElementWBCbk(const char *pszNameIn,
     if (bStopParsing)
         return;
 
+    pszNameIn = GetUnprefixed(pszNameIn);
+
     nWithoutEventCounter = 0;
-    if (strcmp(GetUnprefixed(pszNameIn), "sheet") == 0)
+    if (strcmp(pszNameIn, "sheet") == 0)
     {
         const char *pszSheetName = GetAttributeValue(ppszAttr, "name", nullptr);
         const char *pszId = GetAttributeValue(ppszAttr, "r:id", nullptr);
@@ -1660,6 +1730,8 @@ void OGRXLSXDataSource::startElementStylesCbk(const char *pszNameIn,
     if (bStopParsing)
         return;
 
+    pszNameIn = GetUnprefixed(pszNameIn);
+
     nWithoutEventCounter = 0;
     if (strcmp(pszNameIn, "numFmt") == 0)
     {
@@ -1745,6 +1817,8 @@ void OGRXLSXDataSource::endElementStylesCbk(const char *pszNameIn)
     if (bStopParsing)
         return;
 
+    pszNameIn = GetUnprefixed(pszNameIn);
+
     nWithoutEventCounter = 0;
     if (strcmp(pszNameIn, "cellXfs") == 0)
     {
diff --git a/ogr/ogrsf_frmts/xlsx/ogrxlsxdriver.cpp b/ogr/ogrsf_frmts/xlsx/ogrxlsxdriver.cpp
index f89c5125fad0..1f71941d3e78 100644
--- a/ogr/ogrsf_frmts/xlsx/ogrxlsxdriver.cpp
+++ b/ogr/ogrsf_frmts/xlsx/ogrxlsxdriver.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_xlsx.h"
@@ -243,6 +227,9 @@ void RegisterOGRXLSX()
     poDriver->SetMetadataItem(GDAL_DCAP_CREATE_LAYER, "YES");
     poDriver->SetMetadataItem(GDAL_DCAP_DELETE_LAYER, "YES");
     poDriver->SetMetadataItem(GDAL_DCAP_CREATE_FIELD, "YES");
+    poDriver->SetMetadataItem(GDAL_DCAP_DELETE_FIELD, "YES");
+    poDriver->SetMetadataItem(GDAL_DCAP_REORDER_FIELDS, "YES");
+    poDriver->SetMetadataItem(GDAL_DMD_ALTER_FIELD_DEFN_FLAGS, "Name Type");
 
     poDriver->SetMetadataItem(GDAL_DMD_LONGNAME,
                               "MS Office Open XML spreadsheet");
diff --git a/ogr/ogrsf_frmts/xodr/CMakeLists.txt b/ogr/ogrsf_frmts/xodr/CMakeLists.txt
new file mode 100644
index 000000000000..c4fce7c7ae5f
--- /dev/null
+++ b/ogr/ogrsf_frmts/xodr/CMakeLists.txt
@@ -0,0 +1,23 @@
+add_gdal_driver(
+  TARGET ogr_XODR
+  SOURCES ogr_xodr.h
+          ogrxodrdriver.cpp
+          ogrxodrdatasource.cpp
+          ogrxodrlayer.cpp
+          ogrxodrlayerlane.cpp
+          ogrxodrlayerlaneborder.cpp
+          ogrxodrlayerreferenceline.cpp
+          ogrxodrlayerroadmark.cpp
+          ogrxodrlayerroadobject.cpp
+          ogrxodrlayerroadsignal.cpp
+  CORE_SOURCES ogrxodrdrivercore.cpp
+  PLUGIN_CAPABLE
+  NO_SHARED_SYMBOL_WITH_CORE
+  STRONG_CXX_WFLAGS)
+
+if(NOT TARGET ogr_XODR)
+    return()
+endif()
+
+gdal_standard_includes(ogr_XODR)
+gdal_target_link_libraries(ogr_XODR PRIVATE OpenDrive::OpenDrive)
diff --git a/ogr/ogrsf_frmts/xodr/ogr_xodr.h b/ogr/ogrsf_frmts/xodr/ogr_xodr.h
new file mode 100644
index 000000000000..380f717487c3
--- /dev/null
+++ b/ogr/ogrsf_frmts/xodr/ogr_xodr.h
@@ -0,0 +1,243 @@
+/******************************************************************************
+ * Project:  OpenGIS Simple Features for OpenDRIVE
+ * Purpose:  Definition of OGR driver components for OpenDRIVE.
+ * Author:   Michael Scholz, German Aerospace Center (DLR)
+ *           Gülsen Bardak, German Aerospace Center (DLR)
+ *
+ ******************************************************************************
+ * Copyright 2024 German Aerospace Center (DLR), Institute of Transportation Systems
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#pragma once
+#include "ogrsf_frmts.h"
+#include "ogr_api.h"
+#include <iostream>
+#include <OpenDriveMap.h>
+#include <pugixml/pugixml.hpp>
+#include <vector>
+
+struct RoadElements
+{
+    /* Map of road to its original OpenDRIVE ID for fast lookup. */
+    std::map<std::string, odr::Road> roads{};
+    std::vector<odr::Line3D> referenceLines{};
+
+    std::vector<odr::Lane> lanes{};
+    std::vector<odr::LaneSection> laneSections{};
+    std::vector<std::string> laneRoadIDs{};
+    std::vector<odr::Mesh3D> laneMeshes{};
+
+    std::vector<odr::Line3D> laneLinesInner{};
+    std::vector<odr::Line3D> laneLinesOuter{};
+
+    std::vector<odr::RoadMark> roadMarks{};
+    std::vector<odr::Mesh3D> roadMarkMeshes{};
+
+    std::vector<odr::RoadObject> roadObjects{};
+    std::vector<odr::Mesh3D> roadObjectMeshes{};
+
+    std::vector<odr::RoadSignal> roadSignals{};
+    std::vector<odr::Mesh3D> roadSignalMeshes{};
+};
+
+/*--------------------------------------------------------------------*/
+/*---------------------  Layer declarations  -------------------------*/
+/*--------------------------------------------------------------------*/
+
+class OGRXODRLayer : public OGRLayer
+{
+  private:
+    virtual OGRFeatureDefn *GetLayerDefn() override
+    {
+        return m_poFeatureDefn.get();
+    }
+
+    /**
+     * Initializes XODR road elements and iterators.
+    */
+    void resetRoadElementIterators();
+
+  protected:
+    RoadElements m_roadElements{};
+    bool m_bDissolveTIN{false};
+    OGRSpatialReference m_poSRS{};
+    /* Unique feature ID which is automatically incremented for any new road feature creation. */
+    int m_nNextFID{0};
+
+    std::map<std::string, odr::Road>::iterator m_roadIter{};
+    std::vector<odr::Line3D>::iterator m_referenceLineIter{};
+
+    std::vector<odr::Lane>::iterator m_laneIter{};
+    std::vector<odr::LaneSection>::iterator m_laneSectionIter{};
+    std::vector<std::string>::iterator m_laneRoadIDIter{};
+    std::vector<odr::Mesh3D>::iterator m_laneMeshIter{};
+
+    std::vector<odr::Line3D>::iterator m_laneLinesInnerIter{};
+    std::vector<odr::Line3D>::iterator m_laneLinesOuterIter{};
+
+    std::vector<odr::RoadMark>::iterator m_roadMarkIter{};
+    std::vector<odr::Mesh3D>::iterator m_roadMarkMeshIter{};
+
+    std::vector<odr::RoadObject>::iterator m_roadObjectIter{};
+    std::vector<odr::Mesh3D>::iterator m_roadObjectMeshesIter{};
+
+    std::vector<odr::RoadSignal>::iterator m_roadSignalIter{};
+    std::vector<odr::Mesh3D>::iterator m_roadSignalMeshesIter{};
+
+    std::unique_ptr<OGRFeatureDefn> m_poFeatureDefn{};
+
+    /**
+     * Builds an ordinary TIN from libOpenDRIVE's mesh.
+    */
+    std::unique_ptr<OGRTriangulatedSurface>
+    triangulateSurface(const odr::Mesh3D &mesh);
+
+  public:
+    OGRXODRLayer(const RoadElements &xodrRoadElements,
+                 const std::string &proj4Defn);
+    /**
+     * \param dissolveTriangulatedSurface True if original triangulated surface meshes from
+     * libOpenDRIVE are to be dissolved into simpler geometries.
+     * Only applicable for layer types derived from meshes.
+    */
+    OGRXODRLayer(const RoadElements &xodrRoadElements,
+                 const std::string &proj4Defn,
+                 const bool dissolveTriangulatedSurface);
+    void ResetReading() override;
+};
+
+class OGRXODRLayerReferenceLine
+    : public OGRXODRLayer,
+      public OGRGetNextFeatureThroughRaw<OGRXODRLayerReferenceLine>
+{
+  protected:
+    OGRFeature *GetNextRawFeature();
+
+  public:
+    const std::string FEATURE_CLASS_NAME = "ReferenceLine";
+
+    OGRXODRLayerReferenceLine(const RoadElements &xodrRoadElements,
+                              const std::string &proj4Defn);
+    virtual int TestCapability(const char *pszCap) override;
+    DEFINE_GET_NEXT_FEATURE_THROUGH_RAW(OGRXODRLayerReferenceLine)
+};
+
+class OGRXODRLayerLaneBorder
+    : public OGRXODRLayer,
+      public OGRGetNextFeatureThroughRaw<OGRXODRLayerLaneBorder>
+{
+  protected:
+    OGRFeature *GetNextRawFeature();
+
+  public:
+    const std::string FEATURE_CLASS_NAME = "LaneBorder";
+
+    OGRXODRLayerLaneBorder(const RoadElements &xodrRoadElements,
+                           const std::string &proj4Defn);
+    virtual int TestCapability(const char *pszCap) override;
+    DEFINE_GET_NEXT_FEATURE_THROUGH_RAW(OGRXODRLayerLaneBorder)
+};
+
+class OGRXODRLayerRoadMark
+    : public OGRXODRLayer,
+      public OGRGetNextFeatureThroughRaw<OGRXODRLayerRoadMark>
+
+{
+  protected:
+    OGRFeature *GetNextRawFeature();
+
+  public:
+    const std::string FEATURE_CLASS_NAME = "RoadMark";
+
+    OGRXODRLayerRoadMark(const RoadElements &xodrRoadElements,
+                         const std::string &proj4Defn,
+                         const bool dissolveTriangulatedSurface);
+    virtual int TestCapability(const char *pszCap) override;
+    DEFINE_GET_NEXT_FEATURE_THROUGH_RAW(OGRXODRLayerRoadMark)
+};
+
+class OGRXODRLayerRoadObject
+    : public OGRXODRLayer,
+      public OGRGetNextFeatureThroughRaw<OGRXODRLayerRoadObject>
+{
+  protected:
+    OGRFeature *GetNextRawFeature();
+
+  public:
+    const std::string FEATURE_CLASS_NAME = "RoadObject";
+
+    OGRXODRLayerRoadObject(const RoadElements &xodrRoadElements,
+                           const std::string &proj4Defn);
+    virtual int TestCapability(const char *pszCap) override;
+    DEFINE_GET_NEXT_FEATURE_THROUGH_RAW(OGRXODRLayerRoadObject)
+};
+
+class OGRXODRLayerRoadSignal
+    : public OGRXODRLayer,
+      public OGRGetNextFeatureThroughRaw<OGRXODRLayerRoadSignal>
+{
+  protected:
+    OGRFeature *GetNextRawFeature();
+
+  public:
+    const std::string FEATURE_CLASS_NAME = "RoadSignal";
+
+    OGRXODRLayerRoadSignal(const RoadElements &xodrRoadElements,
+                           const std::string &proj4Defn,
+                           const bool dissolveTriangulatedSurface);
+    virtual int TestCapability(const char *pszCap) override;
+    DEFINE_GET_NEXT_FEATURE_THROUGH_RAW(OGRXODRLayerRoadSignal)
+};
+
+class OGRXODRLayerLane : public OGRXODRLayer,
+                         public OGRGetNextFeatureThroughRaw<OGRXODRLayerLane>
+{
+  protected:
+    OGRFeature *GetNextRawFeature();
+
+  public:
+    const std::string FEATURE_CLASS_NAME = "Lane";
+
+    OGRXODRLayerLane(const RoadElements &xodrRoadElements,
+                     const std::string &proj4Defn,
+                     const bool dissolveTriangulatedSurface);
+    virtual int TestCapability(const char *pszCap) override;
+    DEFINE_GET_NEXT_FEATURE_THROUGH_RAW(OGRXODRLayerLane)
+};
+
+/*--------------------------------------------------------------------*/
+/*--------------------  Data source declarations ----------------------*/
+/*--------------------------------------------------------------------*/
+
+class OGRXODRDataSource : public GDALDataset
+{
+  private:
+    std::vector<std::unique_ptr<OGRXODRLayer>> m_apoLayers{};
+
+    /**
+     * Approximation factor for sampling of continuous geometry functions into discrete
+     * OGC Simple Feature geometries.
+    */
+    double m_dfEpsilon{1.0};
+
+    /**
+     * Retrieves all necessary road elements from the underlying OpenDRIVE structure.
+     *
+     * \param roads Roads of the dataset.
+    */
+    RoadElements createRoadElements(const std::vector<odr::Road> &roads);
+
+  public:
+    bool Open(const char *pszFilename, CSLConstList openOptions);
+
+    int GetLayerCount() override
+    {
+        return static_cast<int>(m_apoLayers.size());
+    }
+
+    OGRLayer *GetLayer(int) override;
+
+    virtual int TestCapability(const char *pszCap) override;
+};
diff --git a/ogr/ogrsf_frmts/xodr/ogrxodrdatasource.cpp b/ogr/ogrsf_frmts/xodr/ogrxodrdatasource.cpp
new file mode 100644
index 000000000000..f54fa0867716
--- /dev/null
+++ b/ogr/ogrsf_frmts/xodr/ogrxodrdatasource.cpp
@@ -0,0 +1,176 @@
+/******************************************************************************
+ *
+ * Project:  OpenGIS Simple Features for OpenDRIVE
+ * Purpose:  Implementation of OGRXODRDataSource.
+ * Author:   Michael Scholz, German Aerospace Center (DLR)
+ *           Gülsen Bardak, German Aerospace Center (DLR)
+ *
+ ******************************************************************************
+ * Copyright 2024 German Aerospace Center (DLR), Institute of Transportation Systems
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#include "ogr_xodr.h"
+using namespace odr;
+using namespace pugi;
+using namespace std;
+
+bool OGRXODRDataSource::Open(const char *pszFilename, CSLConstList openOptions)
+{
+    odr::OpenDriveMap xodr(pszFilename, false);
+    pugi::xml_parse_result parse_result = xodr.xml_parse_result;
+    if (!parse_result ||
+        parse_result.status != pugi::xml_parse_status::status_ok)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "OpenDRIVE dataset %s could not be parsed: %s.", pszFilename,
+                 parse_result.description());
+        return FALSE;
+    }
+    bool parsingFailed = xodr.xml_doc.child("OpenDRIVE").empty();
+    if (parsingFailed)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "The provided file does not contain any OpenDRIVE data. Is it "
+                 "empty?");
+        return false;
+    }
+
+    std::vector<odr::Road> roads = xodr.get_roads();
+    if (roads.empty())
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "OpenDRIVE dataset does not contain any roads.");
+        return false;
+    }
+
+    const char *openOptionValue = CSLFetchNameValue(openOptions, "EPSILON");
+    if (openOptionValue != nullptr)
+    {
+        double dfEpsilon = CPLAtof(openOptionValue);
+        if (dfEpsilon > 0.0)
+        {
+            m_dfEpsilon = dfEpsilon;
+        }
+        else
+        {
+            CPLError(CE_Warning, CPLE_AppDefined,
+                     "Invalid value for EPSILON specified. Falling back to "
+                     "default of 1.0.");
+        }
+    }
+    openOptionValue = CSLFetchNameValueDef(openOptions, "DISSOLVE_TIN", "NO");
+    bool bDissolveTIN = CPLTestBool(openOptionValue);
+
+    RoadElements roadElements = createRoadElements(roads);
+    std::string &proj4Defn = xodr.proj4;
+
+    auto refLine =
+        std::make_unique<OGRXODRLayerReferenceLine>(roadElements, proj4Defn);
+    auto laneBorder =
+        std::make_unique<OGRXODRLayerLaneBorder>(roadElements, proj4Defn);
+    auto roadMark = std::make_unique<OGRXODRLayerRoadMark>(
+        roadElements, proj4Defn, bDissolveTIN);
+    auto roadObject =
+        std::make_unique<OGRXODRLayerRoadObject>(roadElements, proj4Defn);
+    auto lane = std::make_unique<OGRXODRLayerLane>(roadElements, proj4Defn,
+                                                   bDissolveTIN);
+    auto roadSignal = std::make_unique<OGRXODRLayerRoadSignal>(
+        roadElements, proj4Defn, bDissolveTIN);
+
+    m_apoLayers.push_back(std::move(refLine));
+    m_apoLayers.push_back(std::move(laneBorder));
+    m_apoLayers.push_back(std::move(roadMark));
+    m_apoLayers.push_back(std::move(roadObject));
+    m_apoLayers.push_back(std::move(lane));
+    m_apoLayers.push_back(std::move(roadSignal));
+
+    return true;
+}
+
+OGRLayer *OGRXODRDataSource::GetLayer(int iLayer)
+{
+    if (iLayer < 0 || static_cast<size_t>(iLayer) >= m_apoLayers.size())
+        return nullptr;
+
+    return m_apoLayers[iLayer].get();
+}
+
+int OGRXODRDataSource::TestCapability(const char *pszCap)
+{
+    int result = FALSE;
+
+    if (EQUAL(pszCap, ODsCZGeometries))
+        result = TRUE;
+
+    return result;
+}
+
+RoadElements
+OGRXODRDataSource::createRoadElements(const std::vector<odr::Road> &roads)
+{
+    RoadElements elements;
+
+    for (const odr::Road &road : roads)
+    {
+        elements.roads.insert({road.id, road});
+
+        odr::Line3D referenceLine =
+            road.ref_line.get_line(0.0, road.length, m_dfEpsilon);
+        elements.referenceLines.push_back(referenceLine);
+
+        for (const odr::LaneSection &laneSection : road.get_lanesections())
+        {
+            elements.laneSections.push_back(laneSection);
+
+            for (const odr::Lane &lane : laneSection.get_lanes())
+            {
+                elements.laneRoadIDs.push_back(road.id);
+
+                elements.lanes.push_back(lane);
+
+                odr::Mesh3D laneMesh = road.get_lane_mesh(lane, m_dfEpsilon);
+                elements.laneMeshes.push_back(laneMesh);
+
+                odr::Line3D laneLineOuter =
+                    road.get_lane_border_line(lane, m_dfEpsilon, true);
+                elements.laneLinesOuter.push_back(laneLineOuter);
+
+                odr::Line3D laneLineInner =
+                    road.get_lane_border_line(lane, m_dfEpsilon, false);
+                elements.laneLinesInner.push_back(laneLineInner);
+
+                const double sectionStart = laneSection.s0;
+                const double sectionEnd = road.get_lanesection_end(laneSection);
+                for (const odr::RoadMark &roadMark :
+                     lane.get_roadmarks(sectionStart, sectionEnd))
+                {
+                    elements.roadMarks.push_back(roadMark);
+
+                    odr::Mesh3D roadMarkMesh =
+                        road.get_roadmark_mesh(lane, roadMark, m_dfEpsilon);
+                    elements.roadMarkMeshes.push_back(roadMarkMesh);
+                }
+            }
+        }
+
+        for (const odr::RoadObject &roadObject : road.get_road_objects())
+        {
+            elements.roadObjects.push_back(roadObject);
+
+            odr::Mesh3D roadObjectMesh =
+                road.get_road_object_mesh(roadObject, m_dfEpsilon);
+            elements.roadObjectMeshes.push_back(roadObjectMesh);
+        }
+
+        for (const odr::RoadSignal &roadSignal : road.get_road_signals())
+        {
+            elements.roadSignals.push_back(roadSignal);
+
+            odr::Mesh3D roadSignalMesh = road.get_road_signal_mesh(roadSignal);
+            elements.roadSignalMeshes.push_back(roadSignalMesh);
+        }
+    }
+    return elements;
+}
diff --git a/ogr/ogrsf_frmts/xodr/ogrxodrdriver.cpp b/ogr/ogrsf_frmts/xodr/ogrxodrdriver.cpp
new file mode 100644
index 000000000000..c19d65042a1e
--- /dev/null
+++ b/ogr/ogrsf_frmts/xodr/ogrxodrdriver.cpp
@@ -0,0 +1,47 @@
+/******************************************************************************
+ *
+ * Project:  OpenGIS Simple Features for OpenDRIVE
+ * Purpose:  Implementation of OGRXODRDriver.
+ * Author:   Michael Scholz, German Aerospace Center (DLR)
+ *           Gülsen Bardak, German Aerospace Center (DLR)        
+ *
+ ******************************************************************************
+ * Copyright 2024 German Aerospace Center (DLR), Institute of Transportation Systems
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#include "ogr_xodr.h"
+#include "ogrxodrdrivercore.h"
+#include "cpl_conv.h"
+#include "cpl_error.h"
+
+static GDALDataset *OGRXODRDriverOpen(GDALOpenInfo *poOpenInfo)
+{
+    if (poOpenInfo->eAccess == GA_Update || poOpenInfo->fpL == nullptr)
+        return nullptr;
+
+    auto dataSource = std::make_unique<OGRXODRDataSource>();
+
+    if (!dataSource->Open(poOpenInfo->pszFilename,
+                          poOpenInfo->papszOpenOptions))
+    {
+        return nullptr;
+    }
+
+    return dataSource.release();
+}
+
+void RegisterOGRXODR()
+{
+    if (!GDAL_CHECK_VERSION(DRIVER_NAME))
+        return;
+
+    if (GDALGetDriverByName(DRIVER_NAME) != nullptr)
+        return;
+
+    GDALDriver *poDriver = new GDALDriver();
+    OGRXODRDriverSetCommonMetadata(poDriver);
+    poDriver->pfnOpen = OGRXODRDriverOpen;
+    GetGDALDriverManager()->RegisterDriver(poDriver);
+}
diff --git a/ogr/ogrsf_frmts/xodr/ogrxodrdrivercore.cpp b/ogr/ogrsf_frmts/xodr/ogrxodrdrivercore.cpp
new file mode 100644
index 000000000000..38f758b4e7f7
--- /dev/null
+++ b/ogr/ogrsf_frmts/xodr/ogrxodrdrivercore.cpp
@@ -0,0 +1,71 @@
+/******************************************************************************
+ *
+ * Project:  OpenGIS Simple Features for OpenDRIVE
+ * Purpose:  Implementation of OGRXODRDriverCore.
+ * Author:   Michael Scholz, German Aerospace Center (DLR)
+ *           Gülsen Bardak, German Aerospace Center (DLR)
+ *
+ ******************************************************************************
+ * Copyright 2024 German Aerospace Center (DLR), Institute of Transportation Systems
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#include "ogrsf_frmts.h"
+#include "ogrxodrdrivercore.h"
+
+/************************************************************************/
+/*                    OGRXODRDriverIdentify()                           */
+/************************************************************************/
+
+int OGRXODRDriverIdentify(GDALOpenInfo *poOpenInfo)
+{
+    return EQUAL(CPLGetExtension(poOpenInfo->pszFilename), "xodr");
+}
+
+/************************************************************************/
+/*                  OGRXODRDriverSetCommonMetadata()                    */
+/************************************************************************/
+
+void OGRXODRDriverSetCommonMetadata(GDALDriver *poDriver)
+{
+    poDriver->SetDescription(DRIVER_NAME);
+    poDriver->SetMetadataItem(
+        GDAL_DMD_LONGNAME,
+        "OpenDRIVE - Open Dynamic Road Information for Vehicle Environment");
+    poDriver->SetMetadataItem(GDAL_DMD_EXTENSION, "xodr");
+    poDriver->SetMetadataItem(
+        GDAL_DMD_OPENOPTIONLIST,
+        "<OpenOptionList>"
+        "  <Option name='EPSILON' type='float' description='Epsilon value for "
+        "linear approximation of continuous OpenDRIVE geometries.' "
+        "default='1.0'/>"
+        "  <Option name='DISSOLVE_TIN' type='boolean' description='Whether to "
+        "dissolve triangulated surfaces.' default= 'NO'/>"
+        "</OpenOptionList>");
+    poDriver->SetMetadataItem(GDAL_DCAP_VECTOR, "YES");
+    poDriver->SetMetadataItem(GDAL_DCAP_OPEN, "YES");
+    poDriver->SetMetadataItem(GDAL_DCAP_Z_GEOMETRIES, "YES");
+    poDriver->pfnIdentify = OGRXODRDriverIdentify;
+}
+
+/************************************************************************/
+/*                   DeclareDeferredOGRXODRPlugin()                     */
+/************************************************************************/
+
+#ifdef PLUGIN_FILENAME
+void DeclareDeferredOGRXODRPlugin()
+{
+    if (GDALGetDriverByName(DRIVER_NAME) != nullptr)
+    {
+        return;
+    }
+    auto poDriver = new GDALPluginDriverProxy(PLUGIN_FILENAME);
+#ifdef PLUGIN_INSTALLATION_MESSAGE
+    poDriver->SetMetadataItem(GDAL_DMD_PLUGIN_INSTALLATION_MESSAGE,
+                              PLUGIN_INSTALLATION_MESSAGE);
+#endif
+    OGRXODRDriverSetCommonMetadata(poDriver);
+    GetGDALDriverManager()->DeclareDeferredPluginDriver(poDriver);
+}
+#endif
diff --git a/ogr/ogrsf_frmts/xodr/ogrxodrdrivercore.h b/ogr/ogrsf_frmts/xodr/ogrxodrdrivercore.h
new file mode 100644
index 000000000000..62e62256d38f
--- /dev/null
+++ b/ogr/ogrsf_frmts/xodr/ogrxodrdrivercore.h
@@ -0,0 +1,26 @@
+/******************************************************************************
+ *
+ * Project:  OpenGIS Simple Features for OpenDRIVE
+ * Purpose:  Definition of OGRXODRDriverCore.
+ * Author:   Michael Scholz, German Aerospace Center (DLR)
+ *           Gülsen Bardak, German Aerospace Center (DLR)        
+ *
+ ******************************************************************************
+ * Copyright 2024 German Aerospace Center (DLR), Institute of Transportation Systems
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#pragma once
+
+#include "gdal_priv.h"
+
+constexpr const char *DRIVER_NAME = "XODR";
+
+#define OGRXODRDriverIdentify PLUGIN_SYMBOL_NAME(OGRXODRDriverIdentify)
+#define OGRXODRDriverSetCommonMetadata                                         \
+    PLUGIN_SYMBOL_NAME(OGRXODRDriverSetCommonMetadata)
+
+int OGRXODRDriverIdentify(GDALOpenInfo *poOpenInfo);
+
+void OGRXODRDriverSetCommonMetadata(GDALDriver *poDriver);
\ No newline at end of file
diff --git a/ogr/ogrsf_frmts/xodr/ogrxodrlayer.cpp b/ogr/ogrsf_frmts/xodr/ogrxodrlayer.cpp
new file mode 100644
index 000000000000..88183652e956
--- /dev/null
+++ b/ogr/ogrsf_frmts/xodr/ogrxodrlayer.cpp
@@ -0,0 +1,99 @@
+/******************************************************************************
+ *
+ * Project:  OpenGIS Simple Features for OpenDRIVE
+ * Purpose:  Implementation of OGRXODRLayer.
+ * Author:   Michael Scholz, German Aerospace Center (DLR)
+ *           Gülsen Bardak, German Aerospace Center (DLR)        
+ *
+ ******************************************************************************
+ * Copyright 2024 German Aerospace Center (DLR), Institute of Transportation Systems
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#include "ogr_api.h"
+#include "ogr_geometry.h"
+#include "ogr_xodr.h"
+
+#include "cpl_error.h"
+#include <cmath>
+#include <iostream>
+#include <memory>
+#include <string>
+#include <typeinfo>
+
+OGRXODRLayer::OGRXODRLayer(const RoadElements &xodrRoadElements,
+                           const std::string &proj4Defn)
+    : OGRXODRLayer(xodrRoadElements, proj4Defn, false)
+{
+}
+
+OGRXODRLayer::OGRXODRLayer(const RoadElements &xodrRoadElements,
+                           const std::string &proj4Defn,
+                           const bool dissolveTriangulatedSurface)
+    : m_roadElements(xodrRoadElements),
+      m_bDissolveTIN(dissolveTriangulatedSurface)
+{
+    m_poSRS.importFromProj4(proj4Defn.c_str());
+    resetRoadElementIterators();
+}
+
+void OGRXODRLayer::ResetReading()
+{
+    m_nNextFID = 0;
+    resetRoadElementIterators();
+}
+
+void OGRXODRLayer::resetRoadElementIterators()
+{
+    m_roadIter = m_roadElements.roads.begin();
+    m_referenceLineIter = m_roadElements.referenceLines.begin();
+
+    m_laneIter = m_roadElements.lanes.begin();
+    m_laneSectionIter = m_roadElements.laneSections.begin();
+    m_laneRoadIDIter = m_roadElements.laneRoadIDs.begin();
+    m_laneMeshIter = m_roadElements.laneMeshes.begin();
+
+    m_laneLinesInnerIter = m_roadElements.laneLinesInner.begin();
+    m_laneLinesOuterIter = m_roadElements.laneLinesOuter.begin();
+
+    m_roadMarkIter = m_roadElements.roadMarks.begin();
+    m_roadMarkMeshIter = m_roadElements.roadMarkMeshes.begin();
+
+    m_roadObjectIter = m_roadElements.roadObjects.begin();
+    m_roadObjectMeshesIter = m_roadElements.roadObjectMeshes.begin();
+
+    m_roadSignalIter = m_roadElements.roadSignals.begin();
+    m_roadSignalMeshesIter = m_roadElements.roadSignalMeshes.begin();
+}
+
+std::unique_ptr<OGRTriangulatedSurface>
+OGRXODRLayer::triangulateSurface(const odr::Mesh3D &mesh)
+{
+    std::vector<odr::Vec3D> meshVertices = mesh.vertices;
+    std::vector<uint32_t> meshIndices = mesh.indices;
+
+    auto tin = std::make_unique<OGRTriangulatedSurface>();
+    const size_t numIndices = meshIndices.size();
+    // Build triangles from mesh vertices.
+    // Each triple of mesh indices defines which vertices form a triangle.
+    for (std::size_t idx = 0; idx < numIndices; idx += 3)
+    {
+        uint32_t vertexIdx = meshIndices[idx];
+        odr::Vec3D vertexP = meshVertices[vertexIdx];
+        OGRPoint p(vertexP[0], vertexP[1], vertexP[2]);
+
+        vertexIdx = meshIndices[idx + 1];
+        odr::Vec3D vertexQ = meshVertices[vertexIdx];
+        OGRPoint q(vertexQ[0], vertexQ[1], vertexQ[2]);
+
+        vertexIdx = meshIndices[idx + 2];
+        odr::Vec3D vertexR = meshVertices[vertexIdx];
+        OGRPoint r(vertexR[0], vertexR[1], vertexR[2]);
+
+        OGRTriangle triangle(p, q, r);
+        tin->addGeometry(&triangle);
+    }
+
+    return tin;
+}
\ No newline at end of file
diff --git a/ogr/ogrsf_frmts/xodr/ogrxodrlayerlane.cpp b/ogr/ogrsf_frmts/xodr/ogrxodrlayerlane.cpp
new file mode 100644
index 000000000000..5f76eb5b0a03
--- /dev/null
+++ b/ogr/ogrsf_frmts/xodr/ogrxodrlayerlane.cpp
@@ -0,0 +1,137 @@
+/******************************************************************************
+ *
+ * Project:  OpenGIS Simple Features for OpenDRIVE
+ * Purpose:  Implementation of Lane layer.
+ * Author:   Michael Scholz, German Aerospace Center (DLR)
+ *           Gülsen Bardak, German Aerospace Center (DLR)        
+ *
+ ******************************************************************************
+ * Copyright 2024 German Aerospace Center (DLR), Institute of Transportation Systems
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#include "ogr_api.h"
+#include "ogr_geometry.h"
+#include "ogr_xodr.h"
+
+OGRXODRLayerLane::OGRXODRLayerLane(const RoadElements &xodrRoadElements,
+                                   const std::string &proj4Defn,
+                                   const bool dissolveTriangulatedSurface)
+    : OGRXODRLayer(xodrRoadElements, proj4Defn, dissolveTriangulatedSurface)
+{
+    m_poFeatureDefn =
+        std::make_unique<OGRFeatureDefn>(FEATURE_CLASS_NAME.c_str());
+    m_poFeatureDefn->Reference();
+    SetDescription(FEATURE_CLASS_NAME.c_str());
+
+    if (m_bDissolveTIN)
+    {
+        OGRwkbGeometryType wkbPolygonWithZ = OGR_GT_SetZ(wkbPolygon);
+        m_poFeatureDefn->SetGeomType(wkbPolygonWithZ);
+    }
+    else
+    {
+        m_poFeatureDefn->SetGeomType(wkbTINZ);
+    }
+    m_poFeatureDefn->GetGeomFieldDefn(0)->SetSpatialRef(&m_poSRS);
+
+    OGRFieldDefn oFieldLaneID("LaneID", OFTInteger);
+    m_poFeatureDefn->AddFieldDefn(&oFieldLaneID);
+
+    OGRFieldDefn oFieldRoadID("RoadID", OFTString);
+    m_poFeatureDefn->AddFieldDefn(&oFieldRoadID);
+
+    OGRFieldDefn oFieldType("Type", OFTString);
+    m_poFeatureDefn->AddFieldDefn(&oFieldType);
+
+    OGRFieldDefn oFieldPred("Predecessor", OFTInteger);
+    m_poFeatureDefn->AddFieldDefn(&oFieldPred);
+
+    OGRFieldDefn oFieldSuc("Successor", OFTInteger);
+    m_poFeatureDefn->AddFieldDefn(&oFieldSuc);
+}
+
+int OGRXODRLayerLane::TestCapability(const char *pszCap)
+{
+    int result = FALSE;
+
+    if (EQUAL(pszCap, OLCZGeometries))
+        result = TRUE;
+
+    return result;
+}
+
+OGRFeature *OGRXODRLayerLane::GetNextRawFeature()
+{
+    std::unique_ptr<OGRFeature> feature;
+
+    while (m_laneIter != m_roadElements.lanes.end() && (*m_laneIter).id == 0)
+    {
+        // Skip lane(s) with id 0 because these "center lanes" don't have any width
+        ++m_laneIter;
+        ++m_laneMeshIter;
+        ++m_laneRoadIDIter;
+    }
+
+    if (m_laneIter != m_roadElements.lanes.end())
+    {
+
+        feature = std::make_unique<OGRFeature>(m_poFeatureDefn.get());
+
+        odr::Lane lane = *m_laneIter;
+        odr::Mesh3D laneMesh = *m_laneMeshIter;
+        std::string laneRoadID = *m_laneRoadIDIter;
+
+        // Populate geometry field
+        std::unique_ptr<OGRTriangulatedSurface> tin =
+            triangulateSurface(laneMesh);
+        if (m_bDissolveTIN)
+        {
+            OGRGeometry *dissolvedPolygon = tin->UnaryUnion();
+            if (dissolvedPolygon != nullptr)
+            {
+                dissolvedPolygon->assignSpatialReference(&m_poSRS);
+                feature->SetGeometryDirectly(dissolvedPolygon);
+            }
+            else
+            {
+                CPLError(CE_Warning, CPLE_AppDefined,
+                         "Lane feature with FID %d has no geometry because its "
+                         "triangulated surface could not be dissolved.",
+                         m_nNextFID);
+            }
+        }
+        else
+        {
+            tin->assignSpatialReference(&m_poSRS);
+            feature->SetGeometryDirectly(tin.release());
+        }
+
+        // Populate other fields
+        feature->SetFID(m_nNextFID++);
+        feature->SetField(m_poFeatureDefn->GetFieldIndex("RoadID"),
+                          laneRoadID.c_str());
+        feature->SetField(m_poFeatureDefn->GetFieldIndex("LaneID"), lane.id);
+        feature->SetField(m_poFeatureDefn->GetFieldIndex("Type"),
+                          lane.type.c_str());
+        feature->SetField(m_poFeatureDefn->GetFieldIndex("Predecessor"),
+                          lane.predecessor);
+        feature->SetField(m_poFeatureDefn->GetFieldIndex("Successor"),
+                          lane.successor);
+
+        ++m_laneIter;
+        ++m_laneMeshIter;
+        ++m_laneRoadIDIter;
+    }
+
+    if (feature)
+    {
+        return feature.release();
+    }
+    else
+    {
+        // End of features for the given layer reached.
+        return nullptr;
+    }
+}
\ No newline at end of file
diff --git a/ogr/ogrsf_frmts/xodr/ogrxodrlayerlaneborder.cpp b/ogr/ogrsf_frmts/xodr/ogrxodrlayerlaneborder.cpp
new file mode 100644
index 000000000000..5a60e3093911
--- /dev/null
+++ b/ogr/ogrsf_frmts/xodr/ogrxodrlayerlaneborder.cpp
@@ -0,0 +1,106 @@
+/******************************************************************************
+ *
+ * Project:  OpenGIS Simple Features for OpenDRIVE
+ * Purpose:  Implementation of LaneBorder layer.
+ * Author:   Michael Scholz, German Aerospace Center (DLR)
+ *           Gülsen Bardak, German Aerospace Center (DLR)        
+ *
+ ******************************************************************************
+ * Copyright 2024 German Aerospace Center (DLR), Institute of Transportation Systems
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#include "ogr_api.h"
+#include "ogr_geometry.h"
+#include "ogr_xodr.h"
+
+OGRXODRLayerLaneBorder::OGRXODRLayerLaneBorder(
+    const RoadElements &xodrRoadElements, const std::string &proj4Defn)
+    : OGRXODRLayer(xodrRoadElements, proj4Defn)
+{
+    m_poFeatureDefn =
+        std::make_unique<OGRFeatureDefn>(FEATURE_CLASS_NAME.c_str());
+    m_poFeatureDefn->Reference();
+    SetDescription(FEATURE_CLASS_NAME.c_str());
+
+    OGRwkbGeometryType wkbLineStringWithZ = OGR_GT_SetZ(wkbLineString);
+    m_poFeatureDefn->SetGeomType(wkbLineStringWithZ);
+    m_poFeatureDefn->GetGeomFieldDefn(0)->SetSpatialRef(&m_poSRS);
+
+    OGRFieldDefn oFieldID("ID", OFTInteger);
+    m_poFeatureDefn->AddFieldDefn(&oFieldID);
+
+    OGRFieldDefn oFieldRoadID("RoadID", OFTString);
+    m_poFeatureDefn->AddFieldDefn(&oFieldRoadID);
+
+    OGRFieldDefn oFieldType("Type", OFTString);
+    m_poFeatureDefn->AddFieldDefn(&oFieldType);
+
+    OGRFieldDefn oFieldPred("Predecessor", OFTInteger);
+    m_poFeatureDefn->AddFieldDefn(&oFieldPred);
+
+    OGRFieldDefn oFieldSuc("Successor", OFTInteger);
+    m_poFeatureDefn->AddFieldDefn(&oFieldSuc);
+}
+
+int OGRXODRLayerLaneBorder::TestCapability(const char *pszCap)
+{
+    int result = FALSE;
+
+    if (EQUAL(pszCap, OLCZGeometries))
+        result = TRUE;
+
+    return result;
+}
+
+OGRFeature *OGRXODRLayerLaneBorder::GetNextRawFeature()
+{
+    std::unique_ptr<OGRFeature> feature;
+
+    if (m_laneIter != m_roadElements.lanes.end())
+    {
+        feature = std::make_unique<OGRFeature>(m_poFeatureDefn.get());
+
+        odr::Lane lane = *m_laneIter;
+        odr::Line3D laneOuterBorder = *m_laneLinesOuterIter;
+        std::string laneRoadID = *m_laneRoadIDIter;
+
+        // Populate geometry field
+        auto lineString = std::make_unique<OGRLineString>();
+        for (const auto &borderVertex : laneOuterBorder)
+        {
+            lineString->addPoint(borderVertex[0], borderVertex[1],
+                                 borderVertex[2]);
+        }
+        lineString->assignSpatialReference(&m_poSRS);
+        feature->SetGeometryDirectly(lineString.release());
+
+        // Populate other fields
+        feature->SetField(m_poFeatureDefn->GetFieldIndex("RoadID"),
+                          laneRoadID.c_str());
+        feature->SetField(m_poFeatureDefn->GetFieldIndex("ID"), lane.id);
+        feature->SetField(m_poFeatureDefn->GetFieldIndex("Type"),
+                          lane.type.c_str());
+        feature->SetField(m_poFeatureDefn->GetFieldIndex("Predecessor"),
+                          lane.predecessor);
+        feature->SetField(m_poFeatureDefn->GetFieldIndex("Successor"),
+                          lane.successor);
+        feature->SetFID(m_nNextFID++);
+
+        ++m_laneIter;
+        ++m_laneLinesOuterIter;
+        ++m_laneLinesInnerIter;  // For consistency, even though not used here
+        ++m_laneRoadIDIter;
+    }
+
+    if (feature)
+    {
+        return feature.release();
+    }
+    else
+    {
+        // End of features for the given layer reached.
+        return nullptr;
+    }
+}
\ No newline at end of file
diff --git a/ogr/ogrsf_frmts/xodr/ogrxodrlayerreferenceline.cpp b/ogr/ogrsf_frmts/xodr/ogrxodrlayerreferenceline.cpp
new file mode 100644
index 000000000000..7e16f96b8c0e
--- /dev/null
+++ b/ogr/ogrsf_frmts/xodr/ogrxodrlayerreferenceline.cpp
@@ -0,0 +1,90 @@
+/******************************************************************************
+ *
+ * Project:  OpenGIS Simple Features for OpenDRIVE
+ * Purpose:  Implementation of ReferenceLine layer.
+ * Author:   Michael Scholz, German Aerospace Center (DLR)
+ *           Gülsen Bardak, German Aerospace Center (DLR)        
+ *
+ ******************************************************************************
+ * Copyright 2024 German Aerospace Center (DLR), Institute of Transportation Systems
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#include "ogr_api.h"
+#include "ogr_geometry.h"
+#include "ogr_xodr.h"
+
+OGRXODRLayerReferenceLine::OGRXODRLayerReferenceLine(
+    const RoadElements &xodrRoadElements, const std::string &proj4Defn)
+    : OGRXODRLayer(xodrRoadElements, proj4Defn)
+{
+    m_poFeatureDefn =
+        std::make_unique<OGRFeatureDefn>(FEATURE_CLASS_NAME.c_str());
+    m_poFeatureDefn->Reference();
+    SetDescription(FEATURE_CLASS_NAME.c_str());
+
+    OGRwkbGeometryType wkbLineStringWithZ = OGR_GT_SetZ(wkbLineString);
+    m_poFeatureDefn->SetGeomType(wkbLineStringWithZ);
+    m_poFeatureDefn->GetGeomFieldDefn(0)->SetSpatialRef(&m_poSRS);
+
+    OGRFieldDefn oFieldID("ID", OFTString);
+    m_poFeatureDefn->AddFieldDefn(&oFieldID);
+
+    OGRFieldDefn oFieldLen("Length", OFTReal);
+    m_poFeatureDefn->AddFieldDefn(&oFieldLen);
+
+    OGRFieldDefn oFieldJunction("Junction", OFTString);
+    m_poFeatureDefn->AddFieldDefn(&oFieldJunction);
+}
+
+int OGRXODRLayerReferenceLine::TestCapability(const char *pszCap)
+{
+    int result = FALSE;
+
+    if (EQUAL(pszCap, OLCZGeometries))
+        result = TRUE;
+
+    return result;
+}
+
+OGRFeature *OGRXODRLayerReferenceLine::GetNextRawFeature()
+{
+    std::unique_ptr<OGRFeature> feature;
+
+    if (m_roadIter != m_roadElements.roads.end())
+    {
+        feature = std::make_unique<OGRFeature>(m_poFeatureDefn.get());
+
+        odr::Road road = (*m_roadIter).second;
+        odr::Line3D refLine = *m_referenceLineIter;
+
+        // Populate geometry field
+        auto lineString = std::make_unique<OGRLineString>();
+        for (const auto &lineVertex : refLine)
+        {
+            lineString->addPoint(lineVertex[0], lineVertex[1], lineVertex[2]);
+        }
+        lineString->assignSpatialReference(&m_poSRS);
+        feature->SetGeometryDirectly(lineString.release());
+
+        // Populate other fields
+        feature->SetField("ID", road.id.c_str());
+        feature->SetField("Length", road.length);
+        feature->SetField("Junction", road.junction.c_str());
+        feature->SetFID(m_nNextFID++);
+
+        ++m_roadIter;
+        ++m_referenceLineIter;
+    }
+
+    if (feature)
+    {
+        return feature.release();
+    }
+    else
+    {
+        // End of features for the given layer reached.
+        return nullptr;
+    }
+}
\ No newline at end of file
diff --git a/ogr/ogrsf_frmts/xodr/ogrxodrlayerroadmark.cpp b/ogr/ogrsf_frmts/xodr/ogrxodrlayerroadmark.cpp
new file mode 100644
index 000000000000..f10d2f81e2d8
--- /dev/null
+++ b/ogr/ogrsf_frmts/xodr/ogrxodrlayerroadmark.cpp
@@ -0,0 +1,117 @@
+/******************************************************************************
+ *
+ * Project:  OpenGIS Simple Features for OpenDRIVE
+ * Purpose:  Implementation of RoadMark layer.
+ * Author:   Michael Scholz, German Aerospace Center (DLR)
+ *           Gülsen Bardak, German Aerospace Center (DLR)        
+ *
+ ******************************************************************************
+ * Copyright 2024 German Aerospace Center (DLR), Institute of Transportation Systems
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#include "ogr_api.h"
+#include "ogr_geometry.h"
+#include "ogr_xodr.h"
+
+OGRXODRLayerRoadMark::OGRXODRLayerRoadMark(
+    const RoadElements &xodrRoadElements, const std::string &proj4Defn,
+    const bool dissolveTriangulatedSurface)
+    : OGRXODRLayer(xodrRoadElements, proj4Defn, dissolveTriangulatedSurface)
+{
+    m_poFeatureDefn =
+        std::make_unique<OGRFeatureDefn>(FEATURE_CLASS_NAME.c_str());
+    m_poFeatureDefn->Reference();
+    SetDescription(FEATURE_CLASS_NAME.c_str());
+
+    if (m_bDissolveTIN)
+    {
+        OGRwkbGeometryType wkbPolygonWithZ = OGR_GT_SetZ(wkbPolygon);
+        m_poFeatureDefn->SetGeomType(wkbPolygonWithZ);
+    }
+    else
+    {
+        m_poFeatureDefn->SetGeomType(wkbTINZ);
+    }
+    m_poFeatureDefn->GetGeomFieldDefn(0)->SetSpatialRef(&m_poSRS);
+
+    OGRFieldDefn oFieldRoadID("RoadID", OFTString);
+    m_poFeatureDefn->AddFieldDefn(&oFieldRoadID);
+
+    OGRFieldDefn oFieldLaneID("LaneID", OFTInteger);
+    m_poFeatureDefn->AddFieldDefn(&oFieldLaneID);
+
+    OGRFieldDefn oFieldType("Type", OFTString);
+    m_poFeatureDefn->AddFieldDefn(&oFieldType);
+}
+
+int OGRXODRLayerRoadMark::TestCapability(const char *pszCap)
+{
+    int result = FALSE;
+
+    if (EQUAL(pszCap, OLCZGeometries))
+        result = TRUE;
+
+    return result;
+}
+
+OGRFeature *OGRXODRLayerRoadMark::GetNextRawFeature()
+{
+    std::unique_ptr<OGRFeature> feature;
+
+    if (m_roadMarkIter != m_roadElements.roadMarks.end())
+    {
+        feature = std::make_unique<OGRFeature>(m_poFeatureDefn.get());
+
+        odr::RoadMark roadMark = *m_roadMarkIter;
+        odr::Mesh3D roadMarkMesh = *m_roadMarkMeshIter;
+
+        // Populate geometry field
+        std::unique_ptr<OGRTriangulatedSurface> tin =
+            triangulateSurface(roadMarkMesh);
+        if (m_bDissolveTIN)
+        {
+            OGRGeometry *dissolvedPolygon = tin->UnaryUnion();
+            if (dissolvedPolygon != nullptr)
+            {
+                dissolvedPolygon->assignSpatialReference(&m_poSRS);
+                feature->SetGeometryDirectly(dissolvedPolygon);
+            }
+            else
+            {
+                CPLError(CE_Warning, CPLE_AppDefined,
+                         "RoadMark feature with FID %d has no geometry because "
+                         "its triangulated surface could not be dissolved.",
+                         m_nNextFID);
+            }
+        }
+        else
+        {
+            tin->assignSpatialReference(&m_poSRS);
+            feature->SetGeometryDirectly(tin.release());
+        }
+
+        // Populate other fields
+        feature->SetField(m_poFeatureDefn->GetFieldIndex("RoadID"),
+                          roadMark.road_id.c_str());
+        feature->SetField(m_poFeatureDefn->GetFieldIndex("LaneID"),
+                          roadMark.lane_id);
+        feature->SetField(m_poFeatureDefn->GetFieldIndex("Type"),
+                          roadMark.type.c_str());
+        feature->SetFID(m_nNextFID++);
+
+        ++m_roadMarkIter;
+        ++m_roadMarkMeshIter;
+    }
+
+    if (feature)
+    {
+        return feature.release();
+    }
+    else
+    {
+        // End of features for the given layer reached.
+        return nullptr;
+    }
+}
\ No newline at end of file
diff --git a/ogr/ogrsf_frmts/xodr/ogrxodrlayerroadobject.cpp b/ogr/ogrsf_frmts/xodr/ogrxodrlayerroadobject.cpp
new file mode 100644
index 000000000000..199c69accf82
--- /dev/null
+++ b/ogr/ogrsf_frmts/xodr/ogrxodrlayerroadobject.cpp
@@ -0,0 +1,95 @@
+/******************************************************************************
+ *
+ * Project:  OpenGIS Simple Features for OpenDRIVE
+ * Purpose:  Implementation of RoadObject layer.
+ * Author:   Michael Scholz, German Aerospace Center (DLR)
+ *           Gülsen Bardak, German Aerospace Center (DLR)        
+ *
+ ******************************************************************************
+ * Copyright 2024 German Aerospace Center (DLR), Institute of Transportation Systems
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#include "ogr_api.h"
+#include "ogr_geometry.h"
+#include "ogr_xodr.h"
+
+OGRXODRLayerRoadObject::OGRXODRLayerRoadObject(
+    const RoadElements &xodrRoadElements, const std::string &proj4Defn)
+    : OGRXODRLayer(xodrRoadElements, proj4Defn)
+{
+    m_poFeatureDefn =
+        std::make_unique<OGRFeatureDefn>(FEATURE_CLASS_NAME.c_str());
+    m_poFeatureDefn->Reference();
+    SetDescription(FEATURE_CLASS_NAME.c_str());
+
+    m_poFeatureDefn->SetGeomType(wkbTINZ);
+    m_poFeatureDefn->GetGeomFieldDefn(0)->SetSpatialRef(&m_poSRS);
+
+    OGRFieldDefn oFieldObjectID("ObjectID", OFTString);
+    m_poFeatureDefn->AddFieldDefn(&oFieldObjectID);
+
+    OGRFieldDefn oFieldRoadID("RoadID", OFTString);
+    m_poFeatureDefn->AddFieldDefn(&oFieldRoadID);
+
+    OGRFieldDefn oFieldType("Type", OFTString);
+    m_poFeatureDefn->AddFieldDefn(&oFieldType);
+
+    OGRFieldDefn oFieldObjectName("Name", OFTString);
+    m_poFeatureDefn->AddFieldDefn(&oFieldObjectName);
+}
+
+int OGRXODRLayerRoadObject::TestCapability(const char *pszCap)
+{
+    int result = FALSE;
+
+    if (EQUAL(pszCap, OLCZGeometries))
+        result = TRUE;
+
+    return result;
+}
+
+OGRFeature *OGRXODRLayerRoadObject::GetNextRawFeature()
+{
+    std::unique_ptr<OGRFeature> feature;
+
+    if (m_roadObjectIter != m_roadElements.roadObjects.end())
+    {
+        feature = std::make_unique<OGRFeature>(m_poFeatureDefn.get());
+
+        odr::RoadObject roadObject = *m_roadObjectIter;
+        odr::Mesh3D roadObjectMesh = *m_roadObjectMeshesIter;
+
+        // Populate geometry field
+        // In contrast to other XODR layers, dissolving of RoadObject TINs is not an option, because faces of "true" 3D objects might collapse.
+        std::unique_ptr<OGRTriangulatedSurface> tin =
+            triangulateSurface(roadObjectMesh);
+        tin->assignSpatialReference(&m_poSRS);
+        feature->SetGeometryDirectly(tin.release());
+
+        // Populate other fields
+        feature->SetField(m_poFeatureDefn->GetFieldIndex("ObjectID"),
+                          roadObject.id.c_str());
+        feature->SetField(m_poFeatureDefn->GetFieldIndex("RoadID"),
+                          roadObject.road_id.c_str());
+        feature->SetField(m_poFeatureDefn->GetFieldIndex("Type"),
+                          roadObject.type.c_str());
+        feature->SetField(m_poFeatureDefn->GetFieldIndex("Name"),
+                          roadObject.name.c_str());
+        feature->SetFID(m_nNextFID++);
+
+        ++m_roadObjectIter;
+        ++m_roadObjectMeshesIter;
+    }
+
+    if (feature)
+    {
+        return feature.release();
+    }
+    else
+    {
+        // End of features for the given layer reached.
+        return nullptr;
+    }
+}
\ No newline at end of file
diff --git a/ogr/ogrsf_frmts/xodr/ogrxodrlayerroadsignal.cpp b/ogr/ogrsf_frmts/xodr/ogrxodrlayerroadsignal.cpp
new file mode 100644
index 000000000000..3171ae2b60c8
--- /dev/null
+++ b/ogr/ogrsf_frmts/xodr/ogrxodrlayerroadsignal.cpp
@@ -0,0 +1,152 @@
+/******************************************************************************
+ *
+ * Project:  OpenGIS Simple Features for OpenDRIVE
+ * Purpose:  Implementation of RoadSignal layer.
+ * Author:   Michael Scholz, German Aerospace Center (DLR)
+ *           Gülsen Bardak, German Aerospace Center (DLR)        
+ *
+ ******************************************************************************
+ * Copyright 2024 German Aerospace Center (DLR), Institute of Transportation Systems
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#include "ogr_api.h"
+#include "ogr_geometry.h"
+#include "ogr_xodr.h"
+
+OGRXODRLayerRoadSignal::OGRXODRLayerRoadSignal(
+    const RoadElements &xodrRoadElements, const std::string &proj4Defn,
+    const bool dissolveTriangulatedSurface)
+    : OGRXODRLayer(xodrRoadElements, proj4Defn, dissolveTriangulatedSurface)
+{
+    m_poFeatureDefn =
+        std::make_unique<OGRFeatureDefn>(FEATURE_CLASS_NAME.c_str());
+    m_poFeatureDefn->Reference();
+    SetDescription(FEATURE_CLASS_NAME.c_str());
+
+    if (m_bDissolveTIN)
+    {
+        OGRwkbGeometryType wkbPointWithZ = OGR_GT_SetZ(wkbPoint);
+        m_poFeatureDefn->SetGeomType(wkbPointWithZ);
+    }
+    else
+    {
+        m_poFeatureDefn->SetGeomType(wkbTINZ);
+    }
+    m_poFeatureDefn->GetGeomFieldDefn(0)->SetSpatialRef(&m_poSRS);
+
+    OGRFieldDefn oFieldSignalID("SignalID", OFTString);
+    m_poFeatureDefn->AddFieldDefn(&oFieldSignalID);
+
+    OGRFieldDefn oFieldRoadID("RoadID", OFTString);
+    m_poFeatureDefn->AddFieldDefn(&oFieldRoadID);
+
+    OGRFieldDefn oFieldType("Type", OFTString);
+    m_poFeatureDefn->AddFieldDefn(&oFieldType);
+
+    OGRFieldDefn oFieldSubType("SubType", OFTString);
+    m_poFeatureDefn->AddFieldDefn(&oFieldSubType);
+
+    OGRFieldDefn oFieldHOffset("HOffset", OFTReal);
+    m_poFeatureDefn->AddFieldDefn(&oFieldHOffset);
+
+    OGRFieldDefn oFieldPitch("Pitch", OFTReal);
+    m_poFeatureDefn->AddFieldDefn(&oFieldPitch);
+
+    OGRFieldDefn oFieldRoll("Roll", OFTReal);
+    m_poFeatureDefn->AddFieldDefn(&oFieldRoll);
+
+    OGRFieldDefn oFieldOrientation("Orientation", OFTString);
+    m_poFeatureDefn->AddFieldDefn(&oFieldOrientation);
+
+    OGRFieldDefn oFieldName("Name", OFTString);
+    m_poFeatureDefn->AddFieldDefn(&oFieldName);
+
+    OGRFieldDefn oFieldObjectDynamic("Dynamic", OFTInteger);
+    oFieldObjectDynamic.SetSubType(OFSTBoolean);
+    m_poFeatureDefn->AddFieldDefn(&oFieldObjectDynamic);
+}
+
+int OGRXODRLayerRoadSignal::TestCapability(const char *pszCap)
+{
+    int result = FALSE;
+
+    if (EQUAL(pszCap, OLCZGeometries))
+        result = TRUE;
+
+    return result;
+}
+
+OGRFeature *OGRXODRLayerRoadSignal::GetNextRawFeature()
+{
+    std::unique_ptr<OGRFeature> feature;
+
+    if (m_roadSignalIter != m_roadElements.roadSignals.end())
+    {
+        feature = std::make_unique<OGRFeature>(m_poFeatureDefn.get());
+
+        odr::RoadSignal roadSignal = *m_roadSignalIter;
+        odr::Mesh3D roadSignalMesh = *m_roadSignalMeshesIter;
+
+        // Populate geometry field
+        if (m_bDissolveTIN)
+        {
+            // Use simplified centroid, directly provided by libOpenDRIVE
+            std::string roadId = roadSignal.road_id;
+            odr::Road road = m_roadElements.roads.at(roadId);
+
+            double s = roadSignal.s0;
+            double t = roadSignal.t0;
+            double h = roadSignal.zOffset;
+            odr::Vec3D xyz = road.get_xyz(s, t, h);
+
+            auto point = std::make_unique<OGRPoint>(xyz[0], xyz[1], xyz[2]);
+            point->assignSpatialReference(&m_poSRS);
+            feature->SetGeometryDirectly(point.release());
+        }
+        else
+        {
+            std::unique_ptr<OGRTriangulatedSurface> tin =
+                triangulateSurface(roadSignalMesh);
+            tin->assignSpatialReference(&m_poSRS);
+            feature->SetGeometryDirectly(tin.release());
+        }
+
+        // Populate other fields
+        feature->SetField(m_poFeatureDefn->GetFieldIndex("SignalID"),
+                          roadSignal.id.c_str());
+        feature->SetField(m_poFeatureDefn->GetFieldIndex("RoadID"),
+                          roadSignal.road_id.c_str());
+        feature->SetField(m_poFeatureDefn->GetFieldIndex("Type"),
+                          roadSignal.type.c_str());
+        feature->SetField(m_poFeatureDefn->GetFieldIndex("SubType"),
+                          roadSignal.subtype.c_str());
+        feature->SetField(m_poFeatureDefn->GetFieldIndex("HOffset"),
+                          roadSignal.hOffset);
+        feature->SetField(m_poFeatureDefn->GetFieldIndex("Pitch"),
+                          roadSignal.pitch);
+        feature->SetField(m_poFeatureDefn->GetFieldIndex("Roll"),
+                          roadSignal.roll);
+        feature->SetField(m_poFeatureDefn->GetFieldIndex("Orientation"),
+                          roadSignal.orientation.c_str());
+        feature->SetField(m_poFeatureDefn->GetFieldIndex("Name"),
+                          roadSignal.name.c_str());
+        feature->SetField(m_poFeatureDefn->GetFieldIndex("Dynamic"),
+                          roadSignal.is_dynamic);
+        feature->SetFID(m_nNextFID++);
+
+        ++m_roadSignalIter;
+        ++m_roadSignalMeshesIter;
+    }
+
+    if (feature)
+    {
+        return feature.release();
+    }
+    else
+    {
+        // End of features for the given layer reached.
+        return nullptr;
+    }
+}
\ No newline at end of file
diff --git a/ogr/ogrspatialreference.cpp b/ogr/ogrspatialreference.cpp
index fad5d53c090c..a404b34b658e 100644
--- a/ogr/ogrspatialreference.cpp
+++ b/ogr/ogrspatialreference.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999,  Les Technologies SoftMap Inc.
  * Copyright (c) 2008-2018, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -55,6 +39,7 @@
 #include "ogr_p.h"
 #include "ogr_proj_p.h"
 #include "ogr_srs_api.h"
+#include "ogrmitabspatialref.h"
 
 #include "proj.h"
 #include "proj_experimental.h"
@@ -107,6 +92,7 @@ struct OGRSpatialReference::Private
     std::vector<std::string> m_wktImportErrors{};
     CPLString m_osAreaName{};
 
+    bool m_bIsThreadSafe = false;
     bool m_bNodesChanged = false;
     bool m_bNodesWKT2 = false;
     OGR_SRSNode *m_poRoot = nullptr;
@@ -133,7 +119,7 @@ struct OGRSpatialReference::Private
 
     std::shared_ptr<Listener> m_poListener{};
 
-    std::mutex m_mutex{};
+    std::recursive_mutex m_mutex{};
 
     OSRAxisMappingStrategy m_axisMappingStrategy = OAMS_AUTHORITY_COMPLIANT;
     std::vector<int> m_axisMapping{1, 2, 3};
@@ -145,6 +131,11 @@ struct OGRSpatialReference::Private
     Private(const Private &) = delete;
     Private &operator=(const Private &) = delete;
 
+    void SetThreadSafe()
+    {
+        m_bIsThreadSafe = true;
+    }
+
     void clear();
     void setPjCRS(PJ *pj_crsIn, bool doRefreshAxisMapping = true);
     void setRoot(OGR_SRSNode *poRoot);
@@ -172,8 +163,42 @@ struct OGRSpatialReference::Private
     const char *nullifyTargetKeyIfPossible(const char *pszTargetKey);
 
     void refreshAxisMapping();
+
+    // This structures enables locking during calls to OGRSpatialReference
+    // public methods. Locking is only needed for instances of
+    // OGRSpatialReference that have been asked to be thread-safe at
+    // construction.
+    // The lock is not just for a single call to OGRSpatialReference::Private,
+    // but for the series of calls done by a OGRSpatialReference method.
+    // We need a recursive mutex, because some OGRSpatialReference methods
+    // may call other ones.
+    struct OptionalLockGuard
+    {
+        Private &m_private;
+
+        explicit OptionalLockGuard(Private *p) : m_private(*p)
+        {
+            if (m_private.m_bIsThreadSafe)
+                m_private.m_mutex.lock();
+        }
+
+        ~OptionalLockGuard()
+        {
+            if (m_private.m_bIsThreadSafe)
+                m_private.m_mutex.unlock();
+        }
+    };
+
+    inline OptionalLockGuard GetOptionalLockGuard()
+    {
+        return OptionalLockGuard(this);
+    }
 };
 
+#define TAKE_OPTIONAL_LOCK()                                                   \
+    auto lock = d->GetOptionalLockGuard();                                     \
+    CPL_IGNORE_RET_VAL(lock)
+
 static OSRAxisMappingStrategy GetDefaultAxisMappingStrategy()
 {
     const char *pszDefaultAMS =
@@ -989,6 +1014,28 @@ OGRSpatialReference::operator=(OGRSpatialReference &&oSource)
     return *this;
 }
 
+/************************************************************************/
+/*                      AssignAndSetThreadSafe()                        */
+/************************************************************************/
+
+/** Assignment method, with thread-safety.
+ *
+ * Same as an assignment operator, but asking also that the *this instance
+ * becomes thread-safe.
+ *
+ * @param oSource SRS to assign to *this
+ * @return *this
+ * @since 3.10
+ */
+
+OGRSpatialReference &
+OGRSpatialReference::AssignAndSetThreadSafe(const OGRSpatialReference &oSource)
+{
+    *this = oSource;
+    d->SetThreadSafe();
+    return *this;
+}
+
 /************************************************************************/
 /*                             Reference()                              */
 /************************************************************************/
@@ -1117,6 +1164,8 @@ void OSRRelease(OGRSpatialReferenceH hSRS)
 
 OGR_SRSNode *OGRSpatialReference::GetRoot()
 {
+    TAKE_OPTIONAL_LOCK();
+
     if (!d->m_poRoot)
     {
         d->refreshRootFromProjObj();
@@ -1126,6 +1175,8 @@ OGR_SRSNode *OGRSpatialReference::GetRoot()
 
 const OGR_SRSNode *OGRSpatialReference::GetRoot() const
 {
+    TAKE_OPTIONAL_LOCK();
+
     if (!d->m_poRoot)
     {
         d->refreshRootFromProjObj();
@@ -1320,6 +1371,8 @@ const char *CPL_STDCALL OSRGetAttrValue(OGRSpatialReferenceH hSRS,
 
 const char *OGRSpatialReference::GetName() const
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
     if (!d->m_pj_crs)
         return nullptr;
@@ -1378,6 +1431,8 @@ OGRSpatialReference *OGRSpatialReference::Clone() const
 {
     OGRSpatialReference *poNewRef = new OGRSpatialReference();
 
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
     if (d->m_pj_crs != nullptr)
         poNewRef->d->setPjCRS(proj_clone(d->getPROJContext(), d->m_pj_crs));
@@ -1613,7 +1668,7 @@ OGRErr OGRSpatialReference::exportToWkt(char **ppszResult,
     // In the past calling this method was thread-safe, even if we never
     // guaranteed it. Now proj_as_wkt() will cache the result internally,
     // so this is no longer thread-safe.
-    std::lock_guard<std::mutex> oLock(d->m_mutex);
+    std::lock_guard oLock(d->m_mutex);
 
     d->refreshProjObj();
     if (!d->m_pj_crs)
@@ -1751,6 +1806,71 @@ OGRErr OGRSpatialReference::exportToWkt(char **ppszResult,
     }
 
     *ppszResult = CPLStrdup(pszWKT);
+
+#if !(PROJ_AT_LEAST_VERSION(9, 5, 0))
+    if (wktFormat == PJ_WKT2_2018)
+    {
+        // Works around bug fixed per https://github.com/OSGeo/PROJ/pull/4166
+        // related to a wrong EPSG code assigned to UTM South conversions
+        char *pszPtr = strstr(*ppszResult, "CONVERSION[\"UTM zone ");
+        if (pszPtr)
+        {
+            pszPtr += strlen("CONVERSION[\"UTM zone ");
+            const int nZone = atoi(pszPtr);
+            while (*pszPtr >= '0' && *pszPtr <= '9')
+                ++pszPtr;
+            if (nZone >= 1 && nZone <= 60 && *pszPtr == 'S' &&
+                pszPtr[1] == '"' && pszPtr[2] == ',')
+            {
+                pszPtr += 3;
+                int nLevel = 0;
+                bool bInString = false;
+                // Find the ID node corresponding to this CONVERSION node
+                while (*pszPtr)
+                {
+                    if (bInString)
+                    {
+                        if (*pszPtr == '"' && pszPtr[1] == '"')
+                        {
+                            ++pszPtr;
+                        }
+                        else if (*pszPtr == '"')
+                        {
+                            bInString = false;
+                        }
+                    }
+                    else if (nLevel == 0 && STARTS_WITH_CI(pszPtr, "ID["))
+                    {
+                        if (STARTS_WITH_CI(pszPtr, CPLSPrintf("ID[\"EPSG\",%d]",
+                                                              17000 + nZone)))
+                        {
+                            CPLAssert(pszPtr[11] == '7');
+                            CPLAssert(pszPtr[12] == '0');
+                            pszPtr[11] = '6';
+                            pszPtr[12] = '1';
+                        }
+                        break;
+                    }
+                    else if (*pszPtr == '"')
+                    {
+                        bInString = true;
+                    }
+                    else if (*pszPtr == '[')
+                    {
+                        ++nLevel;
+                    }
+                    else if (*pszPtr == ']')
+                    {
+                        --nLevel;
+                    }
+
+                    ++pszPtr;
+                }
+            }
+        }
+    }
+#endif
+
     proj_destroy(boundCRS);
     return OGRERR_NONE;
 }
@@ -1884,6 +2004,8 @@ OGRErr OSRExportToWktEx(OGRSpatialReferenceH hSRS, char **ppszReturn,
 OGRErr OGRSpatialReference::exportToPROJJSON(
     char **ppszResult, CPL_UNUSED const char *const *papszOptions) const
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
     if (!d->m_pj_crs)
     {
@@ -1901,6 +2023,75 @@ OGRErr OGRSpatialReference::exportToPROJJSON(
     }
 
     *ppszResult = CPLStrdup(pszPROJJSON);
+
+#if !(PROJ_AT_LEAST_VERSION(9, 5, 0))
+    {
+        // Works around bug fixed per https://github.com/OSGeo/PROJ/pull/4166
+        // related to a wrong EPSG code assigned to UTM South conversions
+        char *pszPtr = strstr(*ppszResult, "\"name\": \"UTM zone ");
+        if (pszPtr)
+        {
+            pszPtr += strlen("\"name\": \"UTM zone ");
+            const int nZone = atoi(pszPtr);
+            while (*pszPtr >= '0' && *pszPtr <= '9')
+                ++pszPtr;
+            if (nZone >= 1 && nZone <= 60 && *pszPtr == 'S' && pszPtr[1] == '"')
+            {
+                pszPtr += 2;
+                int nLevel = 0;
+                bool bInString = false;
+                // Find the id node corresponding to this conversion node
+                while (*pszPtr)
+                {
+                    if (bInString)
+                    {
+                        if (*pszPtr == '\\')
+                        {
+                            ++pszPtr;
+                        }
+                        else if (*pszPtr == '"')
+                        {
+                            bInString = false;
+                        }
+                    }
+                    else if (nLevel == 0 && STARTS_WITH(pszPtr, "\"id\": {"))
+                    {
+                        const char *pszNextEndCurl = strchr(pszPtr, '}');
+                        const char *pszAuthEPSG =
+                            strstr(pszPtr, "\"authority\": \"EPSG\"");
+                        char *pszCode = strstr(
+                            pszPtr, CPLSPrintf("\"code\": %d", 17000 + nZone));
+                        if (pszAuthEPSG && pszCode && pszNextEndCurl &&
+                            pszNextEndCurl - pszAuthEPSG > 0 &&
+                            pszNextEndCurl - pszCode > 0)
+                        {
+                            CPLAssert(pszCode[9] == '7');
+                            CPLAssert(pszCode[10] == '0');
+                            pszCode[9] = '6';
+                            pszCode[10] = '1';
+                        }
+                        break;
+                    }
+                    else if (*pszPtr == '"')
+                    {
+                        bInString = true;
+                    }
+                    else if (*pszPtr == '{' || *pszPtr == '[')
+                    {
+                        ++nLevel;
+                    }
+                    else if (*pszPtr == '}' || *pszPtr == ']')
+                    {
+                        --nLevel;
+                    }
+
+                    ++pszPtr;
+                }
+            }
+        }
+    }
+#endif
+
     return OGRERR_NONE;
 }
 
@@ -1980,6 +2171,8 @@ OGRErr OGRSpatialReference::importFromWkt(const char **ppszInput,
                                           CSLConstList papszOptions)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     if (!ppszInput || !*ppszInput)
         return OGRERR_FAILURE;
 
@@ -2163,6 +2356,8 @@ OGRErr OGRSpatialReference::importFromWkt(const char *pszInput)
 OGRErr OGRSpatialReference::Validate() const
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     for (const auto &str : d->m_wktImportErrors)
     {
         CPLDebug("OGRSpatialReference::Validate", "%s", str.c_str());
@@ -2246,6 +2441,8 @@ OGRErr OGRSpatialReference::SetNode(const char *pszNodePath,
                                     const char *pszNewNodeValue)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     char **papszPathTokens =
         CSLTokenizeStringComplex(pszNodePath, "|", TRUE, FALSE);
 
@@ -2383,6 +2580,8 @@ OGRErr OGRSpatialReference::SetAngularUnits(const char *pszUnitsName,
                                             double dfInRadians)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->bNormInfoSet = FALSE;
 
     d->refreshProjObj();
@@ -2448,6 +2647,8 @@ OGRErr OSRSetAngularUnits(OGRSpatialReferenceH hSRS, const char *pszUnits,
 double OGRSpatialReference::GetAngularUnits(const char **ppszName) const
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
 
     if (!d->m_osAngularUnits.empty())
@@ -2586,6 +2787,8 @@ OGRErr OGRSpatialReference::SetLinearUnitsAndUpdateParameters(
     const char *pszUnitCode)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     if (dfInMeters <= 0.0)
         return OGRERR_FAILURE;
 
@@ -2721,6 +2924,8 @@ OGRErr OGRSpatialReference::SetTargetLinearUnits(const char *pszTargetKey,
                                                  const char *pszUnitCode)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     if (dfInMeters <= 0.0)
         return OGRERR_FAILURE;
 
@@ -2910,6 +3115,8 @@ double OGRSpatialReference::GetTargetLinearUnits(const char *pszTargetKey,
                                                  const char **ppszName) const
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
 
     pszTargetKey = d->nullifyTargetKeyIfPossible(pszTargetKey);
@@ -3137,6 +3344,8 @@ double OSRGetTargetLinearUnits(OGRSpatialReferenceH hSRS,
 double OGRSpatialReference::GetPrimeMeridian(const char **ppszName) const
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
 
     if (!d->m_osPrimeMeridianName.empty())
@@ -3274,6 +3483,8 @@ OGRErr OGRSpatialReference::SetGeogCS(
     double dfConvertToRadians)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->bNormInfoSet = FALSE;
     d->m_osAngularUnits.clear();
     d->m_dfAngularUnitToRadian = 0.0;
@@ -3382,6 +3593,8 @@ OGRErr OSRSetGeogCS(OGRSpatialReferenceH hSRS, const char *pszGeogName,
 OGRErr OGRSpatialReference::SetWellKnownGeogCS(const char *pszName)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     /* -------------------------------------------------------------------- */
     /*      Check for EPSG authority numbers.                               */
     /* -------------------------------------------------------------------- */
@@ -3524,6 +3737,8 @@ OGRErr OSRSetWellKnownGeogCS(OGRSpatialReferenceH hSRS, const char *pszName)
 OGRErr OGRSpatialReference::CopyGeogCSFrom(const OGRSpatialReference *poSrcSRS)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->bNormInfoSet = FALSE;
     d->m_osAngularUnits.clear();
     d->m_dfAngularUnitToRadian = 0.0;
@@ -3773,6 +3988,8 @@ OGRErr OGRSpatialReference::SetFromUserInput(const char *pszDefinition)
 OGRErr OGRSpatialReference::SetFromUserInput(const char *pszDefinition,
                                              CSLConstList papszOptions)
 {
+    TAKE_OPTIONAL_LOCK();
+
     // Skip leading white space
     while (isspace(static_cast<unsigned char>(*pszDefinition)))
         pszDefinition++;
@@ -4140,6 +4357,8 @@ OGRErr OSRSetFromUserInputEx(OGRSpatialReferenceH hSRS, const char *pszDef,
 OGRErr OGRSpatialReference::importFromUrl(const char *pszUrl)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     if (!STARTS_WITH_CI(pszUrl, "http://") &&
         !STARTS_WITH_CI(pszUrl, "https://"))
     {
@@ -4350,6 +4569,8 @@ OGRErr OGRSpatialReference::importFromURNPart(const char *pszAuthority,
 OGRErr OGRSpatialReference::importFromURN(const char *pszURN)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
 #if PROJ_AT_LEAST_VERSION(8, 1, 0)
 
     // PROJ 8.2.0 has support for IAU codes now.
@@ -4538,6 +4759,8 @@ OGRErr OGRSpatialReference::importFromURN(const char *pszURN)
 OGRErr OGRSpatialReference::importFromCRSURL(const char *pszURL)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
 #if PROJ_AT_LEAST_VERSION(8, 1, 0)
     if (strlen(pszURL) >= 10000)
     {
@@ -4719,6 +4942,8 @@ OGRErr OGRSpatialReference::importFromCRSURL(const char *pszURL)
 OGRErr OGRSpatialReference::importFromWMSAUTO(const char *pszDefinition)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
 #if PROJ_AT_LEAST_VERSION(8, 1, 0)
     if (strlen(pszDefinition) >= 10000)
     {
@@ -4876,6 +5101,8 @@ OGRErr OGRSpatialReference::importFromWMSAUTO(const char *pszDefinition)
 double OGRSpatialReference::GetSemiMajor(OGRErr *pnErr) const
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     if (pnErr != nullptr)
         *pnErr = OGRERR_FAILURE;
 
@@ -4937,6 +5164,8 @@ double OSRGetSemiMajor(OGRSpatialReferenceH hSRS, OGRErr *pnErr)
 double OGRSpatialReference::GetInvFlattening(OGRErr *pnErr) const
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     if (pnErr != nullptr)
         *pnErr = OGRERR_FAILURE;
 
@@ -5096,6 +5325,8 @@ double OSRGetSemiMinor(OGRSpatialReferenceH hSRS, OGRErr *pnErr)
 OGRErr OGRSpatialReference::SetLocalCS(const char *pszName)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     if (d->m_pjType == PJ_TYPE_UNKNOWN ||
         d->m_pjType == PJ_TYPE_ENGINEERING_CRS)
     {
@@ -5154,6 +5385,8 @@ OGRErr OSRSetLocalCS(OGRSpatialReferenceH hSRS, const char *pszName)
 OGRErr OGRSpatialReference::SetGeocCS(const char *pszName)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     OGRErr eErr = OGRERR_NONE;
     d->refreshProjObj();
     d->demoteFromBoundCRS();
@@ -5257,6 +5490,8 @@ OGRErr OGRSpatialReference::SetVertCS(const char *pszVertCSName,
                                       int nVertDatumType)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     CPL_IGNORE_RET_VAL(nVertDatumType);
 
     d->refreshProjObj();
@@ -5329,6 +5564,8 @@ OGRErr OGRSpatialReference::SetCompoundCS(const char *pszName,
                                           const OGRSpatialReference *poVertSRS)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     /* -------------------------------------------------------------------- */
     /*      Verify these are legal horizontal and vertical coordinate       */
     /*      systems.                                                        */
@@ -5403,6 +5640,8 @@ OGRErr OSRSetCompoundCS(OGRSpatialReferenceH hSRS, const char *pszName,
 OGRErr OGRSpatialReference::SetProjCS(const char *pszName)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
     d->demoteFromBoundCRS();
     if (d->m_pjType == PJ_TYPE_PROJECTED_CRS)
@@ -5463,6 +5702,8 @@ OGRErr OSRSetProjCS(OGRSpatialReferenceH hSRS, const char *pszName)
 OGRErr OGRSpatialReference::SetProjection(const char *pszProjection)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     OGR_SRSNode *poGeogCS = nullptr;
 
     if (GetRoot() != nullptr && EQUAL(d->m_poRoot->GetValue(), "GEOGCS"))
@@ -5532,6 +5773,8 @@ OGRSpatialReference::GetWKT2ProjectionMethod(const char **ppszMethodName,
                                              const char **ppszMethodAuthName,
                                              const char **ppszMethodCode) const
 {
+    TAKE_OPTIONAL_LOCK();
+
     auto conv = proj_crs_get_coordoperation(d->getPROJContext(), d->m_pj_crs);
     if (!conv)
         return OGRERR_FAILURE;
@@ -5583,6 +5826,8 @@ OGRErr OGRSpatialReference::SetProjParm(const char *pszParamName,
                                         double dfValue)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     OGR_SRSNode *poPROJCS = GetAttrNode("PROJCS");
 
     if (poPROJCS == nullptr)
@@ -5655,6 +5900,8 @@ int OGRSpatialReference::FindProjParm(const char *pszParameter,
                                       const OGR_SRSNode *poPROJCS) const
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     if (poPROJCS == nullptr)
         poPROJCS = GetAttrNode("PROJCS");
 
@@ -5749,6 +5996,8 @@ double OGRSpatialReference::GetProjParm(const char *pszName,
                                         OGRErr *pnErr) const
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
     GetRoot();  // force update of d->m_bNodesWKT2
 
@@ -5835,6 +6084,8 @@ double OGRSpatialReference::GetNormProjParm(const char *pszName,
                                             OGRErr *pnErr) const
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     GetNormInfo();
 
     OGRErr nError = OGRERR_NONE;
@@ -5898,6 +6149,8 @@ double OSRGetNormProjParm(OGRSpatialReferenceH hSRS, const char *pszName,
 OGRErr OGRSpatialReference::SetNormProjParm(const char *pszName, double dfValue)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     GetNormInfo();
 
     if (d->dfToDegrees != 0.0 &&
@@ -5940,6 +6193,8 @@ OGRErr OGRSpatialReference::SetTM(double dfCenterLat, double dfCenterLong,
                                   double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(
         proj_create_conversion_transverse_mercator(
             d->getPROJContext(), dfCenterLat, dfCenterLong, dfScale,
@@ -5972,6 +6227,8 @@ OGRErr OGRSpatialReference::SetTMVariant(const char *pszVariantName,
                                          double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     SetProjection(pszVariantName);
     SetNormProjParm(SRS_PP_LATITUDE_OF_ORIGIN, dfCenterLat);
     SetNormProjParm(SRS_PP_CENTRAL_MERIDIAN, dfCenterLong);
@@ -6007,6 +6264,8 @@ OGRErr OGRSpatialReference::SetTMSO(double dfCenterLat, double dfCenterLong,
                                     double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     auto conv = proj_create_conversion_transverse_mercator_south_oriented(
         d->getPROJContext(), dfCenterLat, dfCenterLong, dfScale, dfFalseEasting,
         dfFalseNorthing, nullptr, 0.0, nullptr, 0.0);
@@ -6060,6 +6319,8 @@ OGRErr OGRSpatialReference::SetTPED(double dfLat1, double dfLong1,
                                     double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(
         proj_create_conversion_two_point_equidistant(
             d->getPROJContext(), dfLat1, dfLong1, dfLat2, dfLong2,
@@ -6090,6 +6351,8 @@ OGRErr OGRSpatialReference::SetTMG(double dfCenterLat, double dfCenterLong,
                                    double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(
         proj_create_conversion_tunisia_mapping_grid(
             d->getPROJContext(), dfCenterLat, dfCenterLong, dfFalseEasting,
@@ -6121,6 +6384,8 @@ OGRErr OGRSpatialReference::SetACEA(double dfStdP1, double dfStdP2,
                                     double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     // Note different order of parameters. The one in PROJ is conformant with
     // EPSG
     return d->replaceConversionAndUnref(
@@ -6152,6 +6417,8 @@ OGRErr OGRSpatialReference::SetAE(double dfCenterLat, double dfCenterLong,
                                   double dfFalseEasting, double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(
         proj_create_conversion_azimuthal_equidistant(
             d->getPROJContext(), dfCenterLat, dfCenterLong, dfFalseEasting,
@@ -6182,6 +6449,8 @@ OGRErr OGRSpatialReference::SetBonne(double dfStdP1, double dfCentralMeridian,
                                      double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(proj_create_conversion_bonne(
         d->getPROJContext(), dfStdP1, dfCentralMeridian, dfFalseEasting,
         dfFalseNorthing, nullptr, 0.0, nullptr, 0.0));
@@ -6211,6 +6480,8 @@ OGRErr OGRSpatialReference::SetCEA(double dfStdP1, double dfCentralMeridian,
                                    double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(
         proj_create_conversion_lambert_cylindrical_equal_area(
             d->getPROJContext(), dfStdP1, dfCentralMeridian, dfFalseEasting,
@@ -6240,6 +6511,8 @@ OGRErr OGRSpatialReference::SetCS(double dfCenterLat, double dfCenterLong,
                                   double dfFalseEasting, double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(proj_create_conversion_cassini_soldner(
         d->getPROJContext(), dfCenterLat, dfCenterLong, dfFalseEasting,
         dfFalseNorthing, nullptr, 0.0, nullptr, 0.0));
@@ -6269,6 +6542,8 @@ OGRErr OGRSpatialReference::SetEC(double dfStdP1, double dfStdP2,
                                   double dfFalseEasting, double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     // Note: different order of arguments
     return d->replaceConversionAndUnref(
         proj_create_conversion_equidistant_conic(
@@ -6301,6 +6576,8 @@ OGRErr OGRSpatialReference::SetEckert(int nVariation,  // 1-6.
                                       double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     PJ *conv;
     if (nVariation == 1)
     {
@@ -6429,6 +6706,8 @@ OGRErr OGRSpatialReference::SetEquirectangular(double dfCenterLat,
                                                double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     if (dfCenterLat == 0.0)
     {
         return d->replaceConversionAndUnref(
@@ -6474,6 +6753,8 @@ OGRErr OGRSpatialReference::SetEquirectangular2(double dfCenterLat,
                                                 double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     if (dfCenterLat == 0.0)
     {
         return d->replaceConversionAndUnref(
@@ -6544,6 +6825,8 @@ OGRErr OGRSpatialReference::SetGH(double dfCentralMeridian,
                                   double dfFalseEasting, double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(proj_create_conversion_goode_homolosine(
         d->getPROJContext(), dfCentralMeridian, dfFalseEasting, dfFalseNorthing,
         nullptr, 0.0, nullptr, 0.0));
@@ -6570,6 +6853,8 @@ OGRErr OSRSetGH(OGRSpatialReferenceH hSRS, double dfCentralMeridian,
 OGRErr OGRSpatialReference::SetIGH()
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(
         proj_create_conversion_interrupted_goode_homolosine(
             d->getPROJContext(), 0.0, 0.0, 0.0, nullptr, 0.0, nullptr, 0.0));
@@ -6597,6 +6882,8 @@ OGRErr OGRSpatialReference::SetGEOS(double dfCentralMeridian,
                                     double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(
         proj_create_conversion_geostationary_satellite_sweep_y(
             d->getPROJContext(), dfCentralMeridian, dfSatelliteHeight,
@@ -6629,6 +6916,8 @@ OGRErr OGRSpatialReference::SetGaussSchreiberTMercator(double dfCenterLat,
                                                        double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(
         proj_create_conversion_gauss_schreiber_transverse_mercator(
             d->getPROJContext(), dfCenterLat, dfCenterLong, dfScale,
@@ -6660,6 +6949,8 @@ OGRErr OGRSpatialReference::SetGnomonic(double dfCenterLat, double dfCenterLong,
                                         double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(proj_create_conversion_gnomonic(
         d->getPROJContext(), dfCenterLat, dfCenterLong, dfFalseEasting,
         dfFalseNorthing, nullptr, 0.0, nullptr, 0.0));
@@ -6711,6 +7002,8 @@ OGRErr OGRSpatialReference::SetHOMAC(double dfCenterLat, double dfCenterLong,
                                      double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(
         proj_create_conversion_hotine_oblique_mercator_variant_b(
             d->getPROJContext(), dfCenterLat, dfCenterLong, dfAzimuth,
@@ -6770,6 +7063,8 @@ OGRErr OGRSpatialReference::SetHOM(double dfCenterLat, double dfCenterLong,
                                    double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(
         proj_create_conversion_hotine_oblique_mercator_variant_a(
             d->getPROJContext(), dfCenterLat, dfCenterLong, dfAzimuth,
@@ -6826,6 +7121,8 @@ OGRErr OGRSpatialReference::SetHOM2PNO(double dfCenterLat, double dfLat1,
                                        double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(
         proj_create_conversion_hotine_oblique_mercator_two_point_natural_origin(
             d->getPROJContext(), dfCenterLat, dfLat1, dfLong1, dfLat2, dfLong2,
@@ -6879,6 +7176,8 @@ OGRErr OGRSpatialReference::SetLOM(double dfCenterLat, double dfCenterLong,
                                    double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(
         proj_create_conversion_laborde_oblique_mercator(
             d->getPROJContext(), dfCenterLat, dfCenterLong, dfAzimuth, dfScale,
@@ -6895,6 +7194,8 @@ OGRErr OGRSpatialReference::SetIWMPolyconic(double dfLat1, double dfLat2,
                                             double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(
         proj_create_conversion_international_map_world_polyconic(
             d->getPROJContext(), dfCenterLong, dfLat1, dfLat2, dfFalseEasting,
@@ -6932,6 +7233,8 @@ OGRErr OGRSpatialReference::SetKrovak(double dfCenterLat, double dfCenterLong,
                                       double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(
         proj_create_conversion_krovak_north_oriented(
             d->getPROJContext(), dfCenterLat, dfCenterLong, dfAzimuth,
@@ -6965,6 +7268,8 @@ OGRErr OGRSpatialReference::SetLAEA(double dfCenterLat, double dfCenterLong,
                                     double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     auto conv = proj_create_conversion_lambert_azimuthal_equal_area(
         d->getPROJContext(), dfCenterLat, dfCenterLong, dfFalseEasting,
         dfFalseNorthing, nullptr, 0.0, nullptr, 0.0);
@@ -7023,6 +7328,8 @@ OGRErr OGRSpatialReference::SetLCC(double dfStdP1, double dfStdP2,
                                    double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(
         proj_create_conversion_lambert_conic_conformal_2sp(
             d->getPROJContext(), dfCenterLat, dfCenterLong, dfStdP1, dfStdP2,
@@ -7053,6 +7360,8 @@ OGRErr OGRSpatialReference::SetLCC1SP(double dfCenterLat, double dfCenterLong,
                                       double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(
         proj_create_conversion_lambert_conic_conformal_1sp(
             d->getPROJContext(), dfCenterLat, dfCenterLong, dfScale,
@@ -7084,6 +7393,8 @@ OGRErr OGRSpatialReference::SetLCCB(double dfStdP1, double dfStdP2,
                                     double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(
         proj_create_conversion_lambert_conic_conformal_2sp_belgium(
             d->getPROJContext(), dfCenterLat, dfCenterLong, dfStdP1, dfStdP2,
@@ -7113,6 +7424,8 @@ OGRErr OGRSpatialReference::SetMC(double dfCenterLat, double dfCenterLong,
                                   double dfFalseEasting, double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     (void)dfCenterLat;  // ignored
 
     return d->replaceConversionAndUnref(
@@ -7145,6 +7458,8 @@ OGRErr OGRSpatialReference::SetMercator(double dfCenterLat, double dfCenterLong,
                                         double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     if (dfCenterLat != 0.0 && dfScale == 1.0)
     {
         // Not sure this is correct, but this is how it has been used
@@ -7193,6 +7508,8 @@ OGRErr OGRSpatialReference::SetMercator2SP(double dfStdP1, double dfCenterLat,
                 dfFalseNorthing, nullptr, 0, nullptr, 0));
     }
 
+    TAKE_OPTIONAL_LOCK();
+
     SetProjection(SRS_PT_MERCATOR_2SP);
 
     SetNormProjParm(SRS_PP_STANDARD_PARALLEL_1, dfStdP1);
@@ -7228,6 +7545,8 @@ OGRErr OGRSpatialReference::SetMollweide(double dfCentralMeridian,
                                          double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(proj_create_conversion_mollweide(
         d->getPROJContext(), dfCentralMeridian, dfFalseEasting, dfFalseNorthing,
         nullptr, 0, nullptr, 0));
@@ -7256,6 +7575,8 @@ OGRErr OGRSpatialReference::SetNZMG(double dfCenterLat, double dfCenterLong,
                                     double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(
         proj_create_conversion_new_zealand_mapping_grid(
             d->getPROJContext(), dfCenterLat, dfCenterLong, dfFalseEasting,
@@ -7286,6 +7607,8 @@ OGRErr OGRSpatialReference::SetOS(double dfOriginLat, double dfCMeridian,
                                   double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(
         proj_create_conversion_oblique_stereographic(
             d->getPROJContext(), dfOriginLat, dfCMeridian, dfScale,
@@ -7317,6 +7640,8 @@ OGRErr OGRSpatialReference::SetOrthographic(double dfCenterLat,
                                             double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(proj_create_conversion_orthographic(
         d->getPROJContext(), dfCenterLat, dfCenterLong, dfFalseEasting,
         dfFalseNorthing, nullptr, 0, nullptr, 0));
@@ -7347,6 +7672,8 @@ OGRErr OGRSpatialReference::SetPolyconic(double dfCenterLat,
                                          double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     // note: it seems that by some definitions this should include a
     //       scale_factor parameter.
     return d->replaceConversionAndUnref(
@@ -7388,6 +7715,8 @@ OGRErr OGRSpatialReference::SetPS(double dfCenterLat, double dfCenterLong,
                                   double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     PJ *conv;
     if (dfScale == 1.0 && std::abs(std::abs(dfCenterLat) - 90) > 1e-8)
     {
@@ -7452,6 +7781,8 @@ OGRErr OGRSpatialReference::SetRobinson(double dfCenterLong,
                                         double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(proj_create_conversion_robinson(
         d->getPROJContext(), dfCenterLong, dfFalseEasting, dfFalseNorthing,
         nullptr, 0, nullptr, 0));
@@ -7480,6 +7811,8 @@ OGRErr OGRSpatialReference::SetSinusoidal(double dfCenterLong,
                                           double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(proj_create_conversion_sinusoidal(
         d->getPROJContext(), dfCenterLong, dfFalseEasting, dfFalseNorthing,
         nullptr, 0, nullptr, 0));
@@ -7509,6 +7842,8 @@ OGRErr OGRSpatialReference::SetStereographic(double dfOriginLat,
                                              double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(proj_create_conversion_stereographic(
         d->getPROJContext(), dfOriginLat, dfCMeridian, dfScale, dfFalseEasting,
         dfFalseNorthing, nullptr, 0, nullptr, 0));
@@ -7545,6 +7880,8 @@ OGRErr OGRSpatialReference::SetSOC(double dfLatitudeOfOrigin,
                                    double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(
         proj_create_conversion_hotine_oblique_mercator_variant_b(
             d->getPROJContext(), dfLatitudeOfOrigin, dfCentralMeridian, 90.0,
@@ -7584,6 +7921,8 @@ OGRErr OGRSpatialReference::SetVDG(double dfCMeridian, double dfFalseEasting,
                                    double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(proj_create_conversion_van_der_grinten(
         d->getPROJContext(), dfCMeridian, dfFalseEasting, dfFalseNorthing,
         nullptr, 0, nullptr, 0));
@@ -7628,6 +7967,8 @@ OGRErr OSRSetVDG(OGRSpatialReferenceH hSRS, double dfCentralMeridian,
 OGRErr OGRSpatialReference::SetUTM(int nZone, int bNorth)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     if (nZone < 0 || nZone > 60)
     {
         CPLError(CE_Failure, CPLE_AppDefined, "Invalid zone: %d", nZone);
@@ -7679,6 +8020,8 @@ OGRErr OSRSetUTM(OGRSpatialReferenceH hSRS, int nZone, int bNorth)
 int OGRSpatialReference::GetUTMZone(int *pbNorth) const
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     if (IsProjected() && GetAxesCount() == 3)
     {
         OGRSpatialReference *poSRSTmp = Clone();
@@ -7716,7 +8059,7 @@ int OGRSpatialReference::GetUTMZone(int *pbNorth) const
     const double dfZone = (dfCentralMeridian + 186.0) / 6.0;
 
     if (dfCentralMeridian < -177.00001 || dfCentralMeridian > 177.000001 ||
-        CPLIsNan(dfZone) ||
+        std::isnan(dfZone) ||
         std::abs(dfZone - static_cast<int>(dfZone) - 0.5) > 0.00001)
         return 0;
 
@@ -7749,6 +8092,8 @@ OGRErr OGRSpatialReference::SetWagner(int nVariation,  // 1--7.
                                       double dfFalseNorthing)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     PJ *conv;
     if (nVariation == 1)
     {
@@ -7823,6 +8168,8 @@ OGRErr OSRSetWagner(OGRSpatialReferenceH hSRS, int nVariation,
 
 OGRErr OGRSpatialReference::SetQSC(double dfCenterLat, double dfCenterLong)
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(
         proj_create_conversion_quadrilateralized_spherical_cube(
             d->getPROJContext(), dfCenterLat, dfCenterLong, 0.0, 0.0, nullptr,
@@ -7850,6 +8197,8 @@ OGRErr OGRSpatialReference::SetSCH(double dfPegLat, double dfPegLong,
                                    double dfPegHeading, double dfPegHgt)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(
         proj_create_conversion_spherical_cross_track_height(
             d->getPROJContext(), dfPegLat, dfPegLong, dfPegHeading, dfPegHgt,
@@ -7877,6 +8226,8 @@ OGRErr OGRSpatialReference::SetVerticalPerspective(
     double dfTopoOriginLat, double dfTopoOriginLon, double dfTopoOriginHeight,
     double dfViewPointHeight, double dfFalseEasting, double dfFalseNorthing)
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->replaceConversionAndUnref(
         proj_create_conversion_vertical_perspective(
             d->getPROJContext(), dfTopoOriginLat, dfTopoOriginLon,
@@ -7910,6 +8261,8 @@ OGRErr OGRSpatialReference::SetDerivedGeogCRSWithPoleRotationGRIBConvention(
     const char *pszCRSName, double dfSouthPoleLat, double dfSouthPoleLon,
     double dfAxisRotation)
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
     if (!d->m_pj_crs)
         return OGRERR_FAILURE;
@@ -7934,6 +8287,8 @@ OGRErr OGRSpatialReference::SetDerivedGeogCRSWithPoleRotationNetCDFCFConvention(
     const char *pszCRSName, double dfGridNorthPoleLat,
     double dfGridNorthPoleLon, double dfNorthPoleGridLon)
 {
+    TAKE_OPTIONAL_LOCK();
+
 #if PROJ_VERSION_MAJOR > 8 ||                                                  \
     (PROJ_VERSION_MAJOR == 8 && PROJ_VERSION_MINOR >= 2)
     d->refreshProjObj();
@@ -7956,8 +8311,8 @@ OGRErr OGRSpatialReference::SetDerivedGeogCRSWithPoleRotationNetCDFCFConvention(
     SetProjection("Rotated_pole");
     SetExtension(
         "PROJCS", "PROJ4",
-        CPLSPrintf("+proj=ob_tran +o_proj=longlat +lon_0=%.18g +o_lon_p=%.18g "
-                   "+o_lat_p=%.18g +a=%.18g +b=%.18g "
+        CPLSPrintf("+proj=ob_tran +o_proj=longlat +lon_0=%.17g +o_lon_p=%.17g "
+                   "+o_lat_p=%.17g +a=%.17g +b=%.17g "
                    "+to_meter=0.0174532925199433 "
                    "+wktext",
                    180.0 + dfGridNorthPoleLon, dfNorthPoleGridLon,
@@ -7990,6 +8345,8 @@ OGRErr OGRSpatialReference::SetAuthority(const char *pszTargetKey,
                                          const char *pszAuthority, int nCode)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
     pszTargetKey = d->nullifyTargetKeyIfPossible(pszTargetKey);
 
@@ -8120,6 +8477,8 @@ const char *
 OGRSpatialReference::GetAuthorityCode(const char *pszTargetKey) const
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
     const char *pszInputTargetKey = pszTargetKey;
     pszTargetKey = d->nullifyTargetKeyIfPossible(pszTargetKey);
@@ -8254,6 +8613,8 @@ const char *
 OGRSpatialReference::GetAuthorityName(const char *pszTargetKey) const
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
     const char *pszInputTargetKey = pszTargetKey;
     pszTargetKey = d->nullifyTargetKeyIfPossible(pszTargetKey);
@@ -8373,7 +8734,7 @@ const char *OSRGetAuthorityName(OGRSpatialReferenceH hSRS,
  * a compound CRS whose horizontal and vertical parts have a top-level
  * identifier.
  *
- * @return a string to free with CPLFree(), or nulptr when no result can be
+ * @return a string to free with CPLFree(), or nullptr when no result can be
  * generated
  *
  * @since GDAL 3.5
@@ -8382,6 +8743,8 @@ const char *OSRGetAuthorityName(OGRSpatialReferenceH hSRS,
 char *OGRSpatialReference::GetOGCURN() const
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     const char *pszAuthName = GetAuthorityName(nullptr);
     const char *pszAuthCode = GetAuthorityCode(nullptr);
     if (pszAuthName && pszAuthCode)
@@ -8431,6 +8794,8 @@ char *OGRSpatialReference::GetOGCURN() const
 OGRErr OGRSpatialReference::StripVertical()
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
     d->demoteFromBoundCRS();
     if (!d->m_pj_crs || d->m_pjType != PJ_TYPE_COMPOUND_CRS)
@@ -8534,6 +8899,8 @@ bool OGRSpatialReference::StripTOWGS84IfKnownDatumAndAllowed()
 bool OGRSpatialReference::StripTOWGS84IfKnownDatum()
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
     if (!d->m_pj_crs || d->m_pjType != PJ_TYPE_BOUND_CRS)
     {
@@ -8624,6 +8991,8 @@ bool OGRSpatialReference::StripTOWGS84IfKnownDatum()
 int OGRSpatialReference::IsCompound() const
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
     d->demoteFromBoundCRS();
     bool isCompound = d->m_pjType == PJ_TYPE_COMPOUND_CRS;
@@ -8665,6 +9034,8 @@ int OSRIsCompound(OGRSpatialReferenceH hSRS)
 int OGRSpatialReference::IsProjected() const
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
     d->demoteFromBoundCRS();
     bool isProjected = d->m_pjType == PJ_TYPE_PROJECTED_CRS;
@@ -8726,6 +9097,8 @@ int OSRIsProjected(OGRSpatialReferenceH hSRS)
 int OGRSpatialReference::IsGeocentric() const
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
     d->demoteFromBoundCRS();
     bool isGeocentric = d->m_pjType == PJ_TYPE_GEOCENTRIC_CRS;
@@ -8761,6 +9134,8 @@ int OSRIsGeocentric(OGRSpatialReferenceH hSRS)
 
 bool OGRSpatialReference::IsEmpty() const
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
     return d->m_pj_crs == nullptr;
 }
@@ -8782,6 +9157,8 @@ bool OGRSpatialReference::IsEmpty() const
 int OGRSpatialReference::IsGeographic() const
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
     d->demoteFromBoundCRS();
     bool isGeog = d->m_pjType == PJ_TYPE_GEOGRAPHIC_2D_CRS ||
@@ -8845,6 +9222,8 @@ int OSRIsGeographic(OGRSpatialReferenceH hSRS)
 int OGRSpatialReference::IsDerivedGeographic() const
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
     d->demoteFromBoundCRS();
     const bool isGeog = d->m_pjType == PJ_TYPE_GEOGRAPHIC_2D_CRS ||
@@ -8888,6 +9267,7 @@ int OGRSpatialReference::IsDerivedProjected() const
 
 {
 #if PROJ_AT_LEAST_VERSION(9, 2, 0)
+    TAKE_OPTIONAL_LOCK();
     d->refreshProjObj();
     d->demoteFromBoundCRS();
     const bool isDerivedProjected =
@@ -8933,6 +9313,7 @@ int OSRIsDerivedProjected(OGRSpatialReferenceH hSRS)
 int OGRSpatialReference::IsLocal() const
 
 {
+    TAKE_OPTIONAL_LOCK();
     d->refreshProjObj();
     return d->m_pjType == PJ_TYPE_ENGINEERING_CRS;
 }
@@ -8972,6 +9353,7 @@ int OSRIsLocal(OGRSpatialReferenceH hSRS)
 int OGRSpatialReference::IsVertical() const
 
 {
+    TAKE_OPTIONAL_LOCK();
     d->refreshProjObj();
     d->demoteFromBoundCRS();
     bool isVertical = d->m_pjType == PJ_TYPE_VERTICAL_CRS;
@@ -9039,6 +9421,7 @@ int OSRIsVertical(OGRSpatialReferenceH hSRS)
 bool OGRSpatialReference::IsDynamic() const
 
 {
+    TAKE_OPTIONAL_LOCK();
     bool isDynamic = false;
     d->refreshProjObj();
     d->demoteFromBoundCRS();
@@ -9148,6 +9531,7 @@ bool OGRSpatialReference::HasPointMotionOperation() const
 {
 #if PROJ_VERSION_MAJOR > 9 ||                                                  \
     (PROJ_VERSION_MAJOR == 9 && PROJ_VERSION_MINOR >= 4)
+    TAKE_OPTIONAL_LOCK();
     d->refreshProjObj();
     d->demoteFromBoundCRS();
     auto ctxt = d->getPROJContext();
@@ -9196,6 +9580,7 @@ int OSRHasPointMotionOperation(OGRSpatialReferenceH hSRS)
 OGRSpatialReference *OGRSpatialReference::CloneGeogCS() const
 
 {
+    TAKE_OPTIONAL_LOCK();
     d->refreshProjObj();
     if (d->m_pj_crs)
     {
@@ -9313,6 +9698,8 @@ int OGRSpatialReference::IsSameGeogCS(const OGRSpatialReference *poOther,
                                       const char *const *papszOptions) const
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     CPL_IGNORE_RET_VAL(papszOptions);
 
     d->refreshProjObj();
@@ -9380,6 +9767,8 @@ int OSRIsSameGeogCS(OGRSpatialReferenceH hSRS1, OGRSpatialReferenceH hSRS2)
 int OGRSpatialReference::IsSameVertCS(const OGRSpatialReference *poOther) const
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     /* -------------------------------------------------------------------- */
     /*      Does the datum name match?                                      */
     /* -------------------------------------------------------------------- */
@@ -9465,6 +9854,8 @@ int OGRSpatialReference::IsSame(const OGRSpatialReference *poOtherSRS,
                                 const char *const *papszOptions) const
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
     poOtherSRS->d->refreshProjObj();
     if (!d->m_pj_crs || !poOtherSRS->d->m_pj_crs)
@@ -9584,6 +9975,8 @@ OGRSpatialReference *OGRSpatialReference::convertToOtherProjection(
     const char *pszTargetProjection,
     CPL_UNUSED const char *const *papszOptions) const
 {
+    TAKE_OPTIONAL_LOCK();
+
     if (pszTargetProjection == nullptr)
         return nullptr;
     int new_code;
@@ -9789,6 +10182,8 @@ OGRSpatialReference::FindBestMatch(int nMinimumMatchConfidence,
                                    const char *pszPreferredAuthority,
                                    CSLConstList papszOptions) const
 {
+    TAKE_OPTIONAL_LOCK();
+
     CPL_IGNORE_RET_VAL(papszOptions);  // ignored for now.
 
     if (nMinimumMatchConfidence == 0)
@@ -9915,6 +10310,8 @@ OGRErr OGRSpatialReference::SetTOWGS84(double dfDX, double dfDY, double dfDZ,
                                        double dfPPM)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
     if (d->m_pj_crs == nullptr)
     {
@@ -10086,6 +10483,8 @@ OGRErr OSRSetTOWGS84(OGRSpatialReferenceH hSRS, double dfDX, double dfDY,
 OGRErr OGRSpatialReference::GetTOWGS84(double *padfCoeff, int nCoeffCount) const
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
     if (d->m_pjType != PJ_TYPE_BOUND_CRS)
         return OGRERR_FAILURE;
@@ -10127,6 +10526,7 @@ OGRErr OSRGetTOWGS84(OGRSpatialReferenceH hSRS, double *padfCoeff,
  * @return TRUE or FALSE
  */
 
+/* static */
 int OGRSpatialReference::IsAngularParameter(const char *pszParameterName)
 
 {
@@ -10151,6 +10551,7 @@ int OGRSpatialReference::IsAngularParameter(const char *pszParameterName)
  * @return TRUE or FALSE
  */
 
+/* static */
 int OGRSpatialReference::IsLongitudeParameter(const char *pszParameterName)
 
 {
@@ -10170,6 +10571,8 @@ int OGRSpatialReference::IsLongitudeParameter(const char *pszParameterName)
  *
  * @return TRUE or FALSE
  */
+
+/* static */
 int OGRSpatialReference::IsLinearParameter(const char *pszParameterName)
 
 {
@@ -10191,6 +10594,8 @@ int OGRSpatialReference::IsLinearParameter(const char *pszParameterName)
 void OGRSpatialReference::GetNormInfo() const
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     if (d->bNormInfoSet)
         return;
 
@@ -10228,6 +10633,8 @@ const char *OGRSpatialReference::GetExtension(const char *pszTargetKey,
                                               const char *pszDefault) const
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     /* -------------------------------------------------------------------- */
     /*      Find the target node.                                           */
     /* -------------------------------------------------------------------- */
@@ -10276,6 +10683,8 @@ OGRErr OGRSpatialReference::SetExtension(const char *pszTargetKey,
                                          const char *pszValue)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     /* -------------------------------------------------------------------- */
     /*      Find the target node.                                           */
     /* -------------------------------------------------------------------- */
@@ -10357,6 +10766,8 @@ void OSRCleanup(void)
  */
 int OGRSpatialReference::GetAxesCount() const
 {
+    TAKE_OPTIONAL_LOCK();
+
     int axisCount = 0;
     d->refreshProjObj();
     if (d->m_pj_crs == nullptr)
@@ -10454,6 +10865,8 @@ const char *OGRSpatialReference::GetAxis(const char *pszTargetKey, int iAxis,
                                          double *pdfConvUnit) const
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     if (peOrientation != nullptr)
         *peOrientation = OAO_Other;
     if (pdfConvUnit != nullptr)
@@ -10718,6 +11131,8 @@ OGRErr OGRSpatialReference::SetAxes(const char *pszTargetKey,
                                     OGRAxisOrientation eYAxisOrientation)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     /* -------------------------------------------------------------------- */
     /*      Find the target node.                                           */
     /* -------------------------------------------------------------------- */
@@ -10778,11 +11193,6 @@ OGRErr OSRSetAxes(OGRSpatialReferenceH hSRS, const char *pszTargetKey,
                                     eYAxisOrientation);
 }
 
-#ifdef HAVE_MITAB
-char CPL_DLL *MITABSpatialRef2CoordSys(const OGRSpatialReference *);
-OGRSpatialReference CPL_DLL *MITABCoordSys2SpatialRef(const char *);
-#endif
-
 /************************************************************************/
 /*                       OSRExportToMICoordSys()                        */
 /************************************************************************/
@@ -10824,18 +11234,11 @@ OGRErr OSRExportToMICoordSys(OGRSpatialReferenceH hSRS, char **ppszReturn)
 OGRErr OGRSpatialReference::exportToMICoordSys(char **ppszResult) const
 
 {
-#ifdef HAVE_MITAB
     *ppszResult = MITABSpatialRef2CoordSys(this);
     if (*ppszResult != nullptr && strlen(*ppszResult) > 0)
         return OGRERR_NONE;
 
     return OGRERR_FAILURE;
-#else
-    CPLError(CE_Failure, CPLE_NotSupported,
-             "MITAB not available, CoordSys support disabled.");
-
-    return OGRERR_UNSUPPORTED_OPERATION;
-#endif
 }
 
 /************************************************************************/
@@ -10878,7 +11281,6 @@ OGRErr OSRImportFromMICoordSys(OGRSpatialReferenceH hSRS,
 OGRErr OGRSpatialReference::importFromMICoordSys(const char *pszCoordSys)
 
 {
-#ifdef HAVE_MITAB
     OGRSpatialReference *poResult = MITABCoordSys2SpatialRef(pszCoordSys);
 
     if (poResult == nullptr)
@@ -10888,12 +11290,6 @@ OGRErr OGRSpatialReference::importFromMICoordSys(const char *pszCoordSys)
     delete poResult;
 
     return OGRERR_NONE;
-#else
-    CPLError(CE_Failure, CPLE_NotSupported,
-             "MITAB not available, CoordSys support disabled.");
-
-    return OGRERR_UNSUPPORTED_OPERATION;
-#endif
 }
 
 /************************************************************************/
@@ -11043,6 +11439,8 @@ OGRErr OSRImportFromProj4(OGRSpatialReferenceH hSRS, const char *pszProj4)
 OGRErr OGRSpatialReference::importFromProj4(const char *pszProj4)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     if (strlen(pszProj4) >= 10000)
     {
         CPLError(CE_Failure, CPLE_AppDefined, "Too long PROJ string");
@@ -11151,7 +11549,7 @@ OGRErr OGRSpatialReference::exportToProj4(char **ppszProj4) const
     // In the past calling this method was thread-safe, even if we never
     // guaranteed it. Now proj_as_proj_string() will cache the result
     // internally, so this is no longer thread-safe.
-    std::lock_guard<std::mutex> oLock(d->m_mutex);
+    std::lock_guard oLock(d->m_mutex);
 
     d->refreshProjObj();
     if (d->m_pj_crs == nullptr || d->m_pjType == PJ_TYPE_ENGINEERING_CRS)
@@ -11246,6 +11644,8 @@ OGRErr OGRSpatialReference::exportToProj4(char **ppszProj4) const
 OGRErr OGRSpatialReference::morphToESRI()
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
     d->setMorphToESRI(true);
 
@@ -11296,6 +11696,8 @@ OGRErr OSRMorphToESRI(OGRSpatialReferenceH hSRS)
 OGRErr OGRSpatialReference::morphFromESRI()
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
     d->setMorphToESRI(false);
 
@@ -11355,6 +11757,8 @@ OGRSpatialReferenceH *
 OGRSpatialReference::FindMatches(char **papszOptions, int *pnEntries,
                                  int **ppanMatchConfidence) const
 {
+    TAKE_OPTIONAL_LOCK();
+
     CPL_IGNORE_RET_VAL(papszOptions);
 
     if (pnEntries)
@@ -11367,8 +11771,9 @@ OGRSpatialReference::FindMatches(char **papszOptions, int *pnEntries,
         return nullptr;
 
     int *panConfidence = nullptr;
-    auto list = proj_identify(d->getPROJContext(), d->m_pj_crs, nullptr,
-                              nullptr, &panConfidence);
+    auto ctxt = d->getPROJContext();
+    auto list =
+        proj_identify(ctxt, d->m_pj_crs, nullptr, nullptr, &panConfidence);
     if (!list)
         return nullptr;
 
@@ -11383,16 +11788,76 @@ OGRSpatialReference::FindMatches(char **papszOptions, int *pnEntries,
         *ppanMatchConfidence =
             static_cast<int *>(CPLMalloc(sizeof(int) * (nMatches + 1)));
     }
+
+    bool bSortAgain = false;
+
     for (int i = 0; i < nMatches; i++)
     {
-        PJ *obj = proj_list_get(d->getPROJContext(), list, i);
+        PJ *obj = proj_list_get(ctxt, list, i);
         CPLAssert(obj);
         OGRSpatialReference *poSRS = new OGRSpatialReference();
         poSRS->d->setPjCRS(obj);
         pahRet[i] = ToHandle(poSRS);
+
+        // Identify matches that only differ by axis order
+        if (panConfidence[i] == 50 && GetAxesCount() == 2 &&
+            poSRS->GetAxesCount() == 2 &&
+            GetDataAxisToSRSAxisMapping() == std::vector<int>{1, 2})
+        {
+            OGRAxisOrientation eThisAxis0 = OAO_Other;
+            OGRAxisOrientation eThisAxis1 = OAO_Other;
+            OGRAxisOrientation eSRSAxis0 = OAO_Other;
+            OGRAxisOrientation eSRSAxis1 = OAO_Other;
+            GetAxis(nullptr, 0, &eThisAxis0);
+            GetAxis(nullptr, 1, &eThisAxis1);
+            poSRS->GetAxis(nullptr, 0, &eSRSAxis0);
+            poSRS->GetAxis(nullptr, 1, &eSRSAxis1);
+            if (eThisAxis0 == OAO_East && eThisAxis1 == OAO_North &&
+                eSRSAxis0 == OAO_North && eSRSAxis1 == OAO_East)
+            {
+                auto pj_crs_normalized =
+                    proj_normalize_for_visualization(ctxt, poSRS->d->m_pj_crs);
+                if (pj_crs_normalized)
+                {
+                    if (proj_is_equivalent_to(d->m_pj_crs, pj_crs_normalized,
+                                              PJ_COMP_EQUIVALENT))
+                    {
+                        bSortAgain = true;
+                        panConfidence[i] = 90;
+                        poSRS->SetDataAxisToSRSAxisMapping({2, 1});
+                    }
+                    proj_destroy(pj_crs_normalized);
+                }
+            }
+        }
+
         if (ppanMatchConfidence)
             (*ppanMatchConfidence)[i] = panConfidence[i];
     }
+
+    if (bSortAgain)
+    {
+        std::vector<int> anIndices;
+        for (int i = 0; i < nMatches; ++i)
+            anIndices.push_back(i);
+
+        std::stable_sort(anIndices.begin(), anIndices.end(),
+                         [&panConfidence](int i, int j)
+                         { return panConfidence[i] > panConfidence[j]; });
+
+        OGRSpatialReferenceH *pahRetSorted =
+            static_cast<OGRSpatialReferenceH *>(
+                CPLCalloc(sizeof(OGRSpatialReferenceH), nMatches + 1));
+        for (int i = 0; i < nMatches; ++i)
+        {
+            pahRetSorted[i] = pahRet[anIndices[i]];
+            if (ppanMatchConfidence)
+                (*ppanMatchConfidence)[i] = panConfidence[anIndices[i]];
+        }
+        CPLFree(pahRet);
+        pahRet = pahRetSorted;
+    }
+
     pahRet[nMatches] = nullptr;
     proj_list_destroy(list);
     proj_int_list_destroy(panConfidence);
@@ -11434,6 +11899,8 @@ OGRSpatialReference::FindMatches(char **papszOptions, int *pnEntries,
 OGRErr OGRSpatialReference::importFromEPSGA(int nCode)
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     Clear();
 
     const char *pszUseNonDeprecated =
@@ -11543,6 +12010,8 @@ OGRErr OGRSpatialReference::importFromEPSGA(int nCode)
  */
 OGRErr OGRSpatialReference::AddGuessedTOWGS84()
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
     if (!d->m_pj_crs)
         return OGRERR_FAILURE;
@@ -11650,11 +12119,13 @@ OGRErr CPL_STDCALL OSRImportFromEPSG(OGRSpatialReferenceH hSRS, int nCode)
 /************************************************************************/
 
 /**
- * \brief This method returns TRUE if EPSG feels this geographic coordinate
+ * \brief This method returns TRUE if this geographic coordinate
  * system should be treated as having lat/long coordinate ordering.
  *
  * Currently this returns TRUE for all geographic coordinate systems
- * with an EPSG code set, and axes set defining it as lat, long.
+ * with axes set defining it as lat, long (prior to GDAL 3.10, it
+ * also checked that the CRS had belonged to EPSG authority, but this check
+ * has now been removed).
  *
  * \note Important change of behavior since GDAL 3.0. In previous versions,
  * geographic CRS imported with importFromEPSG() would cause this method to
@@ -11662,7 +12133,7 @@ OGRErr CPL_STDCALL OSRImportFromEPSG(OGRSpatialReferenceH hSRS, int nCode)
  * is now equivalent to importFromEPSGA().
  *
  * FALSE will be returned for all coordinate systems that are not geographic,
- * or that do not have an EPSG code set.
+ * or whose axes ordering is not latitude, longitude.
  *
  * This method is the same as the C function OSREPSGTreatsAsLatLong().
  *
@@ -11672,16 +12143,12 @@ OGRErr CPL_STDCALL OSRImportFromEPSG(OGRSpatialReferenceH hSRS, int nCode)
 int OGRSpatialReference::EPSGTreatsAsLatLong() const
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     if (!IsGeographic())
         return FALSE;
 
     d->demoteFromBoundCRS();
-    const char *pszAuth = proj_get_id_auth_name(d->m_pj_crs, 0);
-    if (pszAuth == nullptr || !EQUAL(pszAuth, "EPSG"))
-    {
-        d->undoDemoteFromBoundCRS();
-        return FALSE;
-    }
 
     bool ret = false;
     if (d->m_pjType == PJ_TYPE_COMPOUND_CRS)
@@ -11741,7 +12208,7 @@ int OGRSpatialReference::EPSGTreatsAsLatLong() const
 /************************************************************************/
 
 /**
- * \brief This function returns TRUE if EPSG feels this geographic coordinate
+ * \brief This function returns TRUE if this geographic coordinate
  * system should be treated as having lat/long coordinate ordering.
  *
  * This function is the same as OGRSpatialReference::OSREPSGTreatsAsLatLong().
@@ -11760,11 +12227,13 @@ int OSREPSGTreatsAsLatLong(OGRSpatialReferenceH hSRS)
 /************************************************************************/
 
 /**
- * \brief This method returns TRUE if EPSG feels this projected coordinate
+ * \brief This method returns TRUE if this projected coordinate
  * system should be treated as having northing/easting coordinate ordering.
  *
  * Currently this returns TRUE for all projected coordinate systems
- * with an EPSG code set, and axes set defining it as northing, easting.
+ * with axes set defining it as northing, easting (prior to GDAL 3.10, it
+ * also checked that the CRS had belonged to EPSG authority, but this check
+ * has now been removed).
  *
  * \note Important change of behavior since GDAL 3.0. In previous versions,
  * projected CRS with northing, easting axis order imported with
@@ -11773,7 +12242,7 @@ int OSREPSGTreatsAsLatLong(OGRSpatialReferenceH hSRS)
  * is now equivalent to importFromEPSGA().
  *
  * FALSE will be returned for all coordinate systems that are not projected,
- * or that do not have an EPSG code set.
+ * or whose axes ordering is not northing, easting.
  *
  * This method is the same as the C function EPSGTreatsAsNorthingEasting().
  *
@@ -11785,6 +12254,8 @@ int OSREPSGTreatsAsLatLong(OGRSpatialReferenceH hSRS)
 int OGRSpatialReference::EPSGTreatsAsNorthingEasting() const
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     if (!IsProjected())
         return FALSE;
 
@@ -11793,7 +12264,7 @@ int OGRSpatialReference::EPSGTreatsAsNorthingEasting() const
     const auto ctxt = d->getPROJContext();
     if (d->m_pjType == PJ_TYPE_COMPOUND_CRS)
     {
-        projCRS = proj_crs_get_sub_crs(ctxt, d->m_pj_crs, 1);
+        projCRS = proj_crs_get_sub_crs(ctxt, d->m_pj_crs, 0);
         if (!projCRS || proj_get_type(projCRS) != PJ_TYPE_PROJECTED_CRS)
         {
             d->undoDemoteFromBoundCRS();
@@ -11805,13 +12276,6 @@ int OGRSpatialReference::EPSGTreatsAsNorthingEasting() const
     {
         projCRS = proj_clone(ctxt, d->m_pj_crs);
     }
-    const char *pszAuth = proj_get_id_auth_name(projCRS, 0);
-    if (pszAuth == nullptr || !EQUAL(pszAuth, "EPSG"))
-    {
-        d->undoDemoteFromBoundCRS();
-        proj_destroy(projCRS);
-        return FALSE;
-    }
 
     bool ret = false;
     auto cs = proj_crs_get_coordinate_system(ctxt, projCRS);
@@ -11832,7 +12296,7 @@ int OGRSpatialReference::EPSGTreatsAsNorthingEasting() const
 /************************************************************************/
 
 /**
- * \brief This function returns TRUE if EPSG feels this projected coordinate
+ * \brief This function returns TRUE if this projected coordinate
  * system should be treated as having northing/easting coordinate ordering.
  *
  * This function is the same as
@@ -11864,6 +12328,8 @@ OGRErr OGRSpatialReference::ImportFromESRIWisconsinWKT(const char *prjName,
                                                        const char *unitsName,
                                                        const char *crsName)
 {
+    TAKE_OPTIONAL_LOCK();
+
     if (centralMeridian < -93 || centralMeridian > -87)
         return OGRERR_FAILURE;
     if (latOfOrigin < 40 || latOfOrigin > 47)
@@ -12015,6 +12481,8 @@ OGRErr OGRSpatialReference::ImportFromESRIWisconsinWKT(const char *prjName,
  */
 OSRAxisMappingStrategy OGRSpatialReference::GetAxisMappingStrategy() const
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->m_axisMappingStrategy;
 }
 
@@ -12053,6 +12521,8 @@ OSRAxisMappingStrategy OSRGetAxisMappingStrategy(OGRSpatialReferenceH hSRS)
 void OGRSpatialReference::SetAxisMappingStrategy(
     OSRAxisMappingStrategy strategy)
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->m_axisMappingStrategy = strategy;
     d->refreshAxisMapping();
 }
@@ -12090,6 +12560,8 @@ void OSRSetAxisMappingStrategy(OGRSpatialReferenceH hSRS,
  */
 const std::vector<int> &OGRSpatialReference::GetDataAxisToSRSAxisMapping() const
 {
+    TAKE_OPTIONAL_LOCK();
+
     return d->m_axisMapping;
 }
 
@@ -12157,6 +12629,8 @@ const int *OSRGetDataAxisToSRSAxisMapping(OGRSpatialReferenceH hSRS,
 OGRErr OGRSpatialReference::SetDataAxisToSRSAxisMapping(
     const std::vector<int> &mapping)
 {
+    TAKE_OPTIONAL_LOCK();
+
     if (mapping.size() < 2)
         return OGRERR_FAILURE;
     d->m_axisMappingStrategy = OAMS_CUSTOM;
@@ -12226,6 +12700,8 @@ bool OGRSpatialReference::GetAreaOfUse(double *pdfWestLongitudeDeg,
                                        double *pdfNorthLatitudeDeg,
                                        const char **ppszAreaName) const
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
     if (!d->m_pj_crs)
     {
@@ -12389,6 +12865,8 @@ void OSRDestroyCRSInfoList(OSRCRSInfo **list)
  */
 void OGRSpatialReference::UpdateCoordinateSystemFromGeogCRS()
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
     if (!d->m_pj_crs)
         return;
@@ -12481,6 +12959,8 @@ void OGRSpatialReference::UpdateCoordinateSystemFromGeogCRS()
  */
 OGRErr OGRSpatialReference::PromoteTo3D(const char *pszName)
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
     if (!d->m_pj_crs)
         return OGRERR_FAILURE;
@@ -12522,6 +13002,8 @@ OGRErr OSRPromoteTo3D(OGRSpatialReferenceH hSRS, const char *pszName)
  */
 OGRErr OGRSpatialReference::DemoteTo2D(const char *pszName)
 {
+    TAKE_OPTIONAL_LOCK();
+
     d->refreshProjObj();
     if (!d->m_pj_crs)
         return OGRERR_FAILURE;
@@ -12563,6 +13045,8 @@ OGRErr OSRDemoteTo2D(OGRSpatialReferenceH hSRS, const char *pszName)
 int OGRSpatialReference::GetEPSGGeogCS() const
 
 {
+    TAKE_OPTIONAL_LOCK();
+
     /* -------------------------------------------------------------------- */
     /*      Check axis order.                                               */
     /* -------------------------------------------------------------------- */
diff --git a/ogr/ogrsurface.cpp b/ogr/ogrsurface.cpp
index 5bdb40ac0088..91091a485c80 100644
--- a/ogr/ogrsurface.cpp
+++ b/ogr/ogrsurface.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -60,6 +44,9 @@
  * The returned area will always be in square meters, and assumes that
  * polygon edges describe geodesic lines on the ellipsoid.
  *
+ * <a href="https://geographiclib.sourceforge.io/html/python/geodesics.html">Geodesics</a>
+ * follow the shortest route on the surface of the ellipsoid.
+ *
  * If the geometry' SRS is not a geographic one, geometries are reprojected to
  * the underlying geographic SRS of the geometry' SRS.
  * OGRSpatialReference::GetDataAxisToSRSAxisMapping() is honored.
@@ -94,6 +81,58 @@
  * @return OGRERR_NONE if it succeeds or OGRERR_FAILURE otherwise.
  */
 
+/************************************************************************/
+/*                           get_Length()                               */
+/************************************************************************/
+
+/**
+ * \fn double OGRSurface::get_Length() const;
+ *
+ * \brief Get the length of the surface.
+ *
+ * The length is computed as the sum of the lengths of all members
+ * in this collection (including inner rings).
+ *
+ * @return the length of the geometry in meters.
+ *
+ * @see get_GeodesicLength() for an alternative method returning lengths
+ * computed on the ellipsoid, and in meters.
+ *
+ * @since GDAL 3.10
+ */
+
+/************************************************************************/
+/*                        get_GeodesicLength()                          */
+/************************************************************************/
+
+/**
+ * \fn double OGRSurface::get_GeodesicLength(const OGRSpatialReference *poSRSOverride) const;
+ *
+ * \brief Get the length of the surface, where curve edges are geodesic lines
+ * on the underlying ellipsoid of the SRS attached to the geometry.
+ *
+ * The returned length will always be in meters.
+ *
+ * Note that geometries with circular arcs will be linearized in their original
+ * coordinate space first, so the resulting geodesic length will be an
+ * approximation.
+ *
+ * The length is computed as the sum of the lengths of all members
+ * in this collection (including inner rings).
+ *
+ * @note No warning will be issued if a member of the collection does not
+ *       support the get_GeodesicLength method.
+ *
+ * @param poSRSOverride If not null, overrides OGRGeometry::getSpatialReference()
+ * @return the length of the geometry in meters, or a negative value in case
+ * of error.
+ *
+ * @see get_Length() for an alternative method returning lengths computed in
+ * 2D Cartesian space.
+ *
+ * @since GDAL 3.10
+ */
+
 /************************************************************************/
 /*                          CastToPolygon()                             */
 /************************************************************************/
diff --git a/ogr/ogrtriangle.cpp b/ogr/ogrtriangle.cpp
index df93069a529e..4e54600d99e5 100644
--- a/ogr/ogrtriangle.cpp
+++ b/ogr/ogrtriangle.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2016, Avyav Kumar Singh <avyavkumar at gmail dot com>
  * Copyright (c) 2016, Even Rouault <even.roauult at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_geometry.h"
@@ -36,17 +20,6 @@
 /*                             OGRTriangle()                            */
 /************************************************************************/
 
-/**
- * \brief Constructor.
- *
- */
-
-OGRTriangle::OGRTriangle() = default;
-
-/************************************************************************/
-/*                             OGRTriangle()                            */
-/************************************************************************/
-
 /**
  * \brief Copy constructor.
  *
@@ -108,17 +81,6 @@ OGRTriangle::OGRTriangle(const OGRPoint &p, const OGRPoint &q,
     oCC.addCurveDirectly(this, poCurve, TRUE);
 }
 
-/************************************************************************/
-/*                             ~OGRTriangle()                            */
-/************************************************************************/
-
-/**
- * \brief Destructor
- *
- */
-
-OGRTriangle::~OGRTriangle() = default;
-
 /************************************************************************/
 /*                    operator=( const OGRGeometry&)                    */
 /************************************************************************/
diff --git a/ogr/ogrtriangulatedsurface.cpp b/ogr/ogrtriangulatedsurface.cpp
index 74be2533e68e..9470370e628e 100644
--- a/ogr/ogrtriangulatedsurface.cpp
+++ b/ogr/ogrtriangulatedsurface.cpp
@@ -9,40 +9,13 @@
  * Copyright (c) 2016, Avyav Kumar Singh <avyavkumar at gmail dot com>
  * Copyright (c) 2016, Even Rouault <even.roauult at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "ogr_geometry.h"
 #include "ogr_p.h"
 #include "ogr_api.h"
 
-/************************************************************************/
-/*                        OGRTriangulatedSurface()                      */
-/************************************************************************/
-
-/**
- * \brief Constructor.
- *
- */
-
-OGRTriangulatedSurface::OGRTriangulatedSurface() = default;
-
 /************************************************************************/
 /*        OGRTriangulatedSurface( const OGRTriangulatedSurface& )       */
 /************************************************************************/
@@ -59,17 +32,6 @@ OGRTriangulatedSurface::OGRTriangulatedSurface(
     *this = other;
 }
 
-/************************************************************************/
-/*                        ~OGRTriangulatedSurface()                     */
-/************************************************************************/
-
-/**
- * \brief Destructor
- *
- */
-
-OGRTriangulatedSurface::~OGRTriangulatedSurface() = default;
-
 /************************************************************************/
 /*                 operator=( const OGRTriangulatedSurface&)            */
 /************************************************************************/
@@ -88,13 +50,9 @@ OGRTriangulatedSurface::operator=(const OGRTriangulatedSurface &other)
         // of OGRPolyhedralSurface since it will be confused by a multipolygon
         // of triangles.
         OGRSurface::operator=(other);
-        empty();
-        set3D(other.Is3D());
-        setMeasured(other.IsMeasured());
-        assignSpatialReference(other.getSpatialReference());
-        for (int i = 0; i < other.oMP.nGeomCount; i++)
+        for (const auto *poPoly : other.oMP)
         {
-            OGRTriangulatedSurface::addGeometry(other.oMP.getGeometryRef(i));
+            OGRTriangulatedSurface::addGeometry(poPoly);
         }
     }
     return *this;
diff --git a/ogr/ogrutils.cpp b/ogr/ogrutils.cpp
index 0b1383550a5b..78eb4e859c92 100644
--- a/ogr/ogrutils.cpp
+++ b/ogr/ogrutils.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -151,7 +135,7 @@ std::string intelliround(std::string &s)
     if (s[i - 2] == '0' && s[i - 3] == '0' && s[i - 4] == '0' &&
         s[i - 5] == '0' && s[i - 6] == '0')
     {
-        s.resize(s.size() - 1);
+        s.pop_back();
     }
     // I don't understand this case exactly.  It's like saying if the
     // value is large enough and there are sufficient sig digits before
@@ -2330,3 +2314,15 @@ int OGRFormatFloat(char *pszBuffer, int nBufferLen, float fVal, int nPrecision,
 
     return nSize;
 }
+
+int OGR_GET_MS(float fSec)
+{
+    if (std::isnan(fSec))
+        return 0;
+    if (fSec >= 999)
+        return 999;
+    if (fSec <= 0)
+        return 0;
+    const float fValue = (fSec - static_cast<int>(fSec)) * 1000 + 0.5f;
+    return static_cast<int>(fValue);
+}
diff --git a/ogr/ogrvrtgeometrytypes.cpp b/ogr/ogrvrtgeometrytypes.cpp
new file mode 100644
index 000000000000..86c15c91e09d
--- /dev/null
+++ b/ogr/ogrvrtgeometrytypes.cpp
@@ -0,0 +1,99 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "ogrvrtgeometrytypes.h"
+
+/************************************************************************/
+/*                       OGRVRTGetGeometryType()                        */
+/************************************************************************/
+
+#define STRINGIFY(x) x, #x
+
+static const struct
+{
+    OGRwkbGeometryType eType;
+    const char *pszName;
+    bool bIsoFlags;
+} asGeomTypeNames[] = {
+    {STRINGIFY(wkbUnknown), false},
+
+    {STRINGIFY(wkbPoint), false},
+    {STRINGIFY(wkbLineString), false},
+    {STRINGIFY(wkbPolygon), false},
+    {STRINGIFY(wkbMultiPoint), false},
+    {STRINGIFY(wkbMultiLineString), false},
+    {STRINGIFY(wkbMultiPolygon), false},
+    {STRINGIFY(wkbGeometryCollection), false},
+
+    {STRINGIFY(wkbCircularString), true},
+    {STRINGIFY(wkbCompoundCurve), true},
+    {STRINGIFY(wkbCurvePolygon), true},
+    {STRINGIFY(wkbMultiCurve), true},
+    {STRINGIFY(wkbMultiSurface), true},
+    {STRINGIFY(wkbCurve), true},
+    {STRINGIFY(wkbSurface), true},
+    {STRINGIFY(wkbPolyhedralSurface), true},
+    {STRINGIFY(wkbTIN), true},
+    {STRINGIFY(wkbTriangle), true},
+
+    {STRINGIFY(wkbNone), false},
+    {STRINGIFY(wkbLinearRing), false},
+};
+
+OGRwkbGeometryType OGRVRTGetGeometryType(const char *pszGType, int *pbError)
+{
+    if (pbError)
+        *pbError = FALSE;
+
+    for (const auto &entry : asGeomTypeNames)
+    {
+        if (EQUALN(pszGType, entry.pszName, strlen(entry.pszName)))
+        {
+            OGRwkbGeometryType eGeomType = entry.eType;
+
+            if (strstr(pszGType, "25D") != nullptr ||
+                strstr(pszGType, "Z") != nullptr)
+                eGeomType = wkbSetZ(eGeomType);
+            if (pszGType[strlen(pszGType) - 1] == 'M' ||
+                pszGType[strlen(pszGType) - 2] == 'M')
+                eGeomType = wkbSetM(eGeomType);
+            return eGeomType;
+        }
+    }
+
+    if (pbError)
+        *pbError = TRUE;
+    return wkbUnknown;
+}
+
+/************************************************************************/
+/*                     OGRVRTGetSerializedGeometryType()                */
+/************************************************************************/
+
+std::string OGRVRTGetSerializedGeometryType(OGRwkbGeometryType eGeomType)
+{
+    for (const auto &entry : asGeomTypeNames)
+    {
+        if (entry.eType == wkbFlatten(eGeomType))
+        {
+            std::string osRet(entry.pszName);
+            if (entry.bIsoFlags || OGR_GT_HasM(eGeomType))
+            {
+                if (OGR_GT_HasZ(eGeomType))
+                {
+                    osRet += "Z";
+                }
+                if (OGR_GT_HasM(eGeomType))
+                {
+                    osRet += "M";
+                }
+            }
+            else if (OGR_GT_HasZ(eGeomType))
+            {
+                osRet += "25D";
+            }
+            return osRet;
+        }
+    }
+    return std::string();
+}
diff --git a/ogr/ogrvrtgeometrytypes.h b/ogr/ogrvrtgeometrytypes.h
new file mode 100644
index 000000000000..a5f055b580a5
--- /dev/null
+++ b/ogr/ogrvrtgeometrytypes.h
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#ifndef OGR_VRT_GEOMETRY_TYPES_H
+#define OGR_VRT_GEOMETRY_TYPES_H
+
+#include "ogr_api.h"
+
+#include <string>
+
+OGRwkbGeometryType CPL_DLL OGRVRTGetGeometryType(const char *pszGType,
+                                                 int *pbError);
+std::string CPL_DLL
+OGRVRTGetSerializedGeometryType(OGRwkbGeometryType eGeomType);
+
+#endif
diff --git a/ogr/style_ogr_brush.png b/ogr/style_ogr_brush.png
deleted file mode 100644
index 9dc619ac5654..000000000000
Binary files a/ogr/style_ogr_brush.png and /dev/null differ
diff --git a/ogr/style_ogr_sym.png b/ogr/style_ogr_sym.png
deleted file mode 100644
index 66b904b94657..000000000000
Binary files a/ogr/style_ogr_sym.png and /dev/null differ
diff --git a/ogr/style_pen1.gif b/ogr/style_pen1.gif
deleted file mode 100644
index 35b66ac796c0..000000000000
Binary files a/ogr/style_pen1.gif and /dev/null differ
diff --git a/ogr/style_pen2.gif b/ogr/style_pen2.gif
deleted file mode 100644
index 0640e22dc270..000000000000
Binary files a/ogr/style_pen2.gif and /dev/null differ
diff --git a/ogr/style_pen3.gif b/ogr/style_pen3.gif
deleted file mode 100644
index cb62da2a0427..000000000000
Binary files a/ogr/style_pen3.gif and /dev/null differ
diff --git a/ogr/style_textanchor.gif b/ogr/style_textanchor.gif
deleted file mode 100644
index dd9352bf197b..000000000000
Binary files a/ogr/style_textanchor.gif and /dev/null differ
diff --git a/ogr/swq.cpp b/ogr/swq.cpp
index 3379ef531db2..9cf8d5bc1f26 100644
--- a/ogr/swq.cpp
+++ b/ogr/swq.cpp
@@ -118,11 +118,14 @@ int swqlex(YYSTYPE *ppNode, swq_parse_context *context)
 
         while (*pszInput != '\0')
         {
-            if (chQuote == '"' && *pszInput == '\\' && pszInput[1] == '"')
-                pszInput++;
-            else if (chQuote == '\'' && *pszInput == '\\' &&
-                     pszInput[1] == '\'')
+            // Not totally sure we need to preserve this way of escaping for
+            // strings between double-quotes
+            if (chQuote == '"' && *pszInput == '\\')
+            {
                 pszInput++;
+                if (*pszInput == '\0')
+                    break;
+            }
             else if (chQuote == '\'' && *pszInput == '\'' &&
                      pszInput[1] == '\'')
                 pszInput++;
@@ -142,7 +145,7 @@ int swqlex(YYSTYPE *ppNode, swq_parse_context *context)
             CPLError(CE_Failure, CPLE_AppDefined,
                      "Did not find end-of-string character");
             CPLFree(token);
-            return 0;
+            return YYerror;
         }
 
         *ppNode = new swq_expr_node(token);
@@ -289,6 +292,11 @@ int swqlex(YYSTYPE *ppNode, swq_parse_context *context)
             nReturn = SWQT_LIMIT;
         else if (EQUAL(osToken, "OFFSET"))
             nReturn = SWQT_OFFSET;
+        else if (EQUAL(osToken, "HIDDEN"))
+        {
+            *ppNode = new swq_expr_node(osToken);
+            nReturn = SWQT_HIDDEN;
+        }
 
         // Unhandled by OGR SQL.
         else if (EQUAL(osToken, "OUTER") || EQUAL(osToken, "INNER"))
@@ -318,7 +326,7 @@ int swqlex(YYSTYPE *ppNode, swq_parse_context *context)
 /************************************************************************/
 
 const char *swq_select_summarize(swq_select *select_info, int dest_column,
-                                 const char *value)
+                                 const char *pszValue, const double *pdfValue)
 
 {
     /* -------------------------------------------------------------------- */
@@ -331,7 +339,7 @@ const char *swq_select_summarize(swq_select *select_info, int dest_column,
         dest_column >= static_cast<int>(select_info->column_defs.size()))
         return "dest_column out of range in swq_select_summarize().";
 
-    swq_col_def *def = &select_info->column_defs[dest_column];
+    const swq_col_def *def = &select_info->column_defs[dest_column];
     if (def->col_func == SWQCF_NONE && !def->distinct_flag)
         return nullptr;
 
@@ -398,18 +406,17 @@ const char *swq_select_summarize(swq_select *select_info, int dest_column,
 
     if (def->distinct_flag)
     {
-        if (value == nullptr)
-            value = SZ_OGR_NULL;
+        if (pszValue == nullptr)
+            pszValue = SZ_OGR_NULL;
         try
         {
-            if (summary.oSetDistinctValues.find(value) ==
-                summary.oSetDistinctValues.end())
+            if (!cpl::contains(summary.oSetDistinctValues, pszValue))
             {
-                summary.oSetDistinctValues.insert(value);
+                summary.oSetDistinctValues.insert(pszValue);
                 if (select_info->order_specs == 0)
                 {
                     // If not sorted, keep values in their original order
-                    summary.oVectorDistinctValues.emplace_back(value);
+                    summary.oVectorDistinctValues.emplace_back(pszValue);
                 }
                 summary.count++;
             }
@@ -429,59 +436,78 @@ const char *swq_select_summarize(swq_select *select_info, int dest_column,
     switch (def->col_func)
     {
         case SWQCF_MIN:
-            if (value != nullptr && value[0] != '\0')
+            if (pdfValue)
             {
-                if (def->field_type == SWQ_DATE ||
-                    def->field_type == SWQ_TIME ||
-                    def->field_type == SWQ_TIMESTAMP ||
-                    def->field_type == SWQ_STRING)
+                if (*pdfValue < summary.min)
+                    summary.min = *pdfValue;
+                summary.count++;
+            }
+            else if (pszValue && pszValue[0] != '\0')
+            {
+                if (summary.count == 0 || strcmp(pszValue, summary.osMin) < 0)
                 {
-                    if (summary.count == 0 || strcmp(value, summary.osMin) < 0)
-                    {
-                        summary.osMin = value;
-                    }
+                    summary.osMin = pszValue;
                 }
-                else
+                summary.count++;
+            }
+            break;
+        case SWQCF_MAX:
+            if (pdfValue)
+            {
+                if (*pdfValue > summary.max)
+                    summary.max = *pdfValue;
+                summary.count++;
+            }
+            else if (pszValue && pszValue[0] != '\0')
+            {
+                if (summary.count == 0 || strcmp(pszValue, summary.osMax) > 0)
                 {
-                    double df_val = CPLAtof(value);
-                    if (df_val < summary.min)
-                        summary.min = df_val;
+                    summary.osMax = pszValue;
                 }
                 summary.count++;
             }
             break;
-        case SWQCF_MAX:
-            if (value != nullptr && value[0] != '\0')
+        case SWQCF_AVG:
+        case SWQCF_SUM:
+            if (pdfValue)
             {
-                if (def->field_type == SWQ_DATE ||
-                    def->field_type == SWQ_TIME ||
-                    def->field_type == SWQ_TIMESTAMP ||
-                    def->field_type == SWQ_STRING)
+                summary.count++;
+
+                // Cf KahanBabushkaNeumaierSum of
+                // https://en.wikipedia.org/wiki/Kahan_summation_algorithm#Further_enhancements
+                // We set a number of temporary variables as volatile, to
+                // prevent potential undesired compiler optimizations.
+
+                const double dfNewVal = *pdfValue;
+                const volatile double new_sum_acc = summary.sum_acc + dfNewVal;
+                if (summary.sum_only_finite_terms && std::isfinite(dfNewVal))
                 {
-                    if (summary.count == 0 || strcmp(value, summary.osMax) > 0)
+                    if (std::fabs(summary.sum_acc) >= std::fabs(dfNewVal))
                     {
-                        summary.osMax = value;
+                        const volatile double diff =
+                            (summary.sum_acc - new_sum_acc);
+                        summary.sum_correction += (diff + dfNewVal);
+                    }
+                    else
+                    {
+                        const volatile double diff = (dfNewVal - new_sum_acc);
+                        summary.sum_correction += (diff + summary.sum_acc);
                     }
                 }
                 else
                 {
-                    double df_val = CPLAtof(value);
-                    if (df_val > summary.max)
-                        summary.max = df_val;
+                    summary.sum_only_finite_terms = false;
                 }
-                summary.count++;
+                summary.sum_acc = new_sum_acc;
             }
-            break;
-        case SWQCF_AVG:
-        case SWQCF_SUM:
-            if (value != nullptr && value[0] != '\0')
+            else if (pszValue && pszValue[0] != '\0')
             {
                 if (def->field_type == SWQ_DATE ||
                     def->field_type == SWQ_TIME ||
                     def->field_type == SWQ_TIMESTAMP)
                 {
                     OGRField sField;
-                    if (OGRParseDate(value, &sField, 0))
+                    if (OGRParseDate(pszValue, &sField, 0))
                     {
                         struct tm brokendowntime;
                         brokendowntime.tm_year = sField.Date.Year - 1900;
@@ -492,32 +518,79 @@ const char *swq_select_summarize(swq_select *select_info, int dest_column,
                         brokendowntime.tm_sec =
                             static_cast<int>(sField.Date.Second);
                         summary.count++;
-                        summary.sum += CPLYMDHMSToUnixTime(&brokendowntime);
-                        summary.sum +=
+                        summary.sum_acc += CPLYMDHMSToUnixTime(&brokendowntime);
+                        summary.sum_acc +=
                             fmod(static_cast<double>(sField.Date.Second), 1.0);
                     }
                 }
                 else
                 {
-                    summary.count++;
-                    summary.sum += CPLAtof(value);
+                    return "swq_select_summarize() - AVG()/SUM() called on "
+                           "unexpected field type";
                 }
             }
             break;
 
         case SWQCF_COUNT:
-            if (value != nullptr)
+            if (pdfValue || pszValue)
                 summary.count++;
             break;
 
+        case SWQCF_STDDEV_POP:
+        case SWQCF_STDDEV_SAMP:
+        {
+            const auto UpdateVariance = [&summary](double dfValue)
+            {
+                // Welford's online algorithm for variance:
+                // https://en.wikipedia.org/wiki/Algorithms_for_calculating_variance#Welford's_online_algorithm
+                summary.count++;
+                const double dfDelta = dfValue - summary.mean_for_variance;
+                summary.mean_for_variance += dfDelta / summary.count;
+                const double dfDelta2 = dfValue - summary.mean_for_variance;
+                summary.sq_dist_from_mean_acc += dfDelta * dfDelta2;
+            };
+
+            if (pdfValue)
+            {
+                UpdateVariance(*pdfValue);
+            }
+            else if (pszValue && pszValue[0] != '\0')
+            {
+                if (def->field_type == SWQ_DATE ||
+                    def->field_type == SWQ_TIME ||
+                    def->field_type == SWQ_TIMESTAMP)
+                {
+                    OGRField sField;
+                    if (OGRParseDate(pszValue, &sField, 0))
+                    {
+                        struct tm brokendowntime;
+                        brokendowntime.tm_year = sField.Date.Year - 1900;
+                        brokendowntime.tm_mon = sField.Date.Month - 1;
+                        brokendowntime.tm_mday = sField.Date.Day;
+                        brokendowntime.tm_hour = sField.Date.Hour;
+                        brokendowntime.tm_min = sField.Date.Minute;
+                        brokendowntime.tm_sec =
+                            static_cast<int>(sField.Date.Second);
+
+                        UpdateVariance(static_cast<double>(
+                            CPLYMDHMSToUnixTime(&brokendowntime)));
+                    }
+                }
+                else
+                {
+                    return "swq_select_summarize() - STDDEV() called on "
+                           "unexpected field type";
+                }
+            }
+
+            break;
+        }
+
         case SWQCF_NONE:
             break;
 
         case SWQCF_CUSTOM:
             return "swq_select_summarize() called on custom field function.";
-
-        default:
-            return "swq_select_summarize() - unexpected col_func";
     }
 
     return nullptr;
diff --git a/ogr/swq_expr_node.cpp b/ogr/swq_expr_node.cpp
index 0adfa01fb9dd..feb0124ecdc1 100644
--- a/ogr/swq_expr_node.cpp
+++ b/ogr/swq_expr_node.cpp
@@ -9,23 +9,7 @@
  * Copyright (C) 2010 Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef DOXYGEN_SKIP
@@ -147,7 +131,8 @@ bool swq_expr_node::operator==(const swq_expr_node &other) const
         nOperation != other.nOperation || field_index != other.field_index ||
         table_index != other.table_index ||
         nSubExprCount != other.nSubExprCount || is_null != other.is_null ||
-        int_value != other.int_value || float_value != other.float_value)
+        int_value != other.int_value || float_value != other.float_value ||
+        bHidden != other.bHidden)
     {
         return false;
     }
@@ -234,6 +219,7 @@ swq_expr_node &swq_expr_node::operator=(const swq_expr_node &other)
             geometry_value = other.geometry_value->clone();
         if (other.string_value)
             string_value = CPLStrdup(other.string_value);
+        bHidden = other.bHidden;
     }
     return *this;
 }
@@ -269,6 +255,7 @@ swq_expr_node &swq_expr_node::operator=(swq_expr_node &&other)
         float_value = other.float_value;
         std::swap(geometry_value, other.geometry_value);
         std::swap(string_value, other.string_value);
+        bHidden = other.bHidden;
     }
     return *this;
 }
diff --git a/ogr/swq_op_general.cpp b/ogr/swq_op_general.cpp
index 4f263318aaa0..6d85f39df5cc 100644
--- a/ogr/swq_op_general.cpp
+++ b/ogr/swq_op_general.cpp
@@ -10,23 +10,7 @@
  * Copyright (C) 2010 Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/ogr/swq_op_registrar.cpp b/ogr/swq_op_registrar.cpp
index 8b82a11da0f9..ef9b6a3defdc 100644
--- a/ogr/swq_op_registrar.cpp
+++ b/ogr/swq_op_registrar.cpp
@@ -9,23 +9,7 @@
  * Copyright (C) 2010 Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -71,6 +55,8 @@ static const swq_operation swq_apsOperations[] = {
     {"MAX", SWQ_MAX, SWQGeneralEvaluator, SWQColumnFuncChecker},
     {"COUNT", SWQ_COUNT, SWQGeneralEvaluator, SWQColumnFuncChecker},
     {"SUM", SWQ_SUM, SWQGeneralEvaluator, SWQColumnFuncChecker},
+    {"STDDEV_POP", SWQ_STDDEV_POP, SWQGeneralEvaluator, SWQColumnFuncChecker},
+    {"STDDEV_SAMP", SWQ_STDDEV_SAMP, SWQGeneralEvaluator, SWQColumnFuncChecker},
 
     {"CAST", SWQ_CAST, SWQCastEvaluator, SWQCastChecker}};
 
diff --git a/ogr/swq_parser.cpp b/ogr/swq_parser.cpp
index 8b938405cc09..8191470c0bbc 100644
--- a/ogr/swq_parser.cpp
+++ b/ogr/swq_parser.cpp
@@ -63,12 +63,13 @@
 /* Pull parsers.  */
 #define YYPULL 1
 
+
 /* Substitute the variable and function names.  */
-#define yyparse swqparse
-#define yylex swqlex
-#define yyerror swqerror
-#define yydebug swqdebug
-#define yynerrs swqnerrs
+#define yyparse         swqparse
+#define yylex           swqlex
+#define yyerror         swqerror
+#define yydebug         swqdebug
+#define yynerrs         swqnerrs
 
 /* First part of user prologue.  */
 
@@ -82,23 +83,7 @@
  ******************************************************************************
  * Copyright (C) 2010 Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -114,6 +99,7 @@
 #include "ogr_core.h"
 #include "ogr_geometry.h"
 
+
 #define YYSTYPE swq_expr_node *
 
 /* Defining YYSTYPE_IS_TRIVIAL is needed because the parser is generated as a C++ file. */
@@ -123,116 +109,122 @@
 /* it appears to be a non documented feature of Bison */
 #define YYSTYPE_IS_TRIVIAL 1
 
-#ifndef YY_CAST
-#ifdef __cplusplus
-#define YY_CAST(Type, Val) static_cast<Type>(Val)
-#define YY_REINTERPRET_CAST(Type, Val) reinterpret_cast<Type>(Val)
-#else
-#define YY_CAST(Type, Val) ((Type)(Val))
-#define YY_REINTERPRET_CAST(Type, Val) ((Type)(Val))
-#endif
-#endif
-#ifndef YY_NULLPTR
-#if defined __cplusplus
-#if 201103L <= __cplusplus
-#define YY_NULLPTR nullptr
-#else
-#define YY_NULLPTR 0
-#endif
-#else
-#define YY_NULLPTR ((void *)0)
-#endif
-#endif
 
-#include "swq_parser.hpp"
+# ifndef YY_CAST
+#  ifdef __cplusplus
+#   define YY_CAST(Type, Val) static_cast<Type> (Val)
+#   define YY_REINTERPRET_CAST(Type, Val) reinterpret_cast<Type> (Val)
+#  else
+#   define YY_CAST(Type, Val) ((Type) (Val))
+#   define YY_REINTERPRET_CAST(Type, Val) ((Type) (Val))
+#  endif
+# endif
+# ifndef YY_NULLPTR
+#  if defined __cplusplus
+#   if 201103L <= __cplusplus
+#    define YY_NULLPTR nullptr
+#   else
+#    define YY_NULLPTR 0
+#   endif
+#  else
+#   define YY_NULLPTR ((void*)0)
+#  endif
+# endif
 
+#include "swq_parser.hpp"
 /* Symbol kind.  */
 enum yysymbol_kind_t
 {
-    YYSYMBOL_YYEMPTY = -2,
-    YYSYMBOL_YYEOF = 0,                   /* "end of string"  */
-    YYSYMBOL_YYerror = 1,                 /* error  */
-    YYSYMBOL_YYUNDEF = 2,                 /* "invalid token"  */
-    YYSYMBOL_SWQT_INTEGER_NUMBER = 3,     /* "integer number"  */
-    YYSYMBOL_SWQT_FLOAT_NUMBER = 4,       /* "floating point number"  */
-    YYSYMBOL_SWQT_STRING = 5,             /* "string"  */
-    YYSYMBOL_SWQT_IDENTIFIER = 6,         /* "identifier"  */
-    YYSYMBOL_SWQT_IN = 7,                 /* "IN"  */
-    YYSYMBOL_SWQT_LIKE = 8,               /* "LIKE"  */
-    YYSYMBOL_SWQT_ILIKE = 9,              /* "ILIKE"  */
-    YYSYMBOL_SWQT_ESCAPE = 10,            /* "ESCAPE"  */
-    YYSYMBOL_SWQT_BETWEEN = 11,           /* "BETWEEN"  */
-    YYSYMBOL_SWQT_NULL = 12,              /* "NULL"  */
-    YYSYMBOL_SWQT_IS = 13,                /* "IS"  */
-    YYSYMBOL_SWQT_SELECT = 14,            /* "SELECT"  */
-    YYSYMBOL_SWQT_LEFT = 15,              /* "LEFT"  */
-    YYSYMBOL_SWQT_JOIN = 16,              /* "JOIN"  */
-    YYSYMBOL_SWQT_WHERE = 17,             /* "WHERE"  */
-    YYSYMBOL_SWQT_ON = 18,                /* "ON"  */
-    YYSYMBOL_SWQT_ORDER = 19,             /* "ORDER"  */
-    YYSYMBOL_SWQT_BY = 20,                /* "BY"  */
-    YYSYMBOL_SWQT_FROM = 21,              /* "FROM"  */
-    YYSYMBOL_SWQT_AS = 22,                /* "AS"  */
-    YYSYMBOL_SWQT_ASC = 23,               /* "ASC"  */
-    YYSYMBOL_SWQT_DESC = 24,              /* "DESC"  */
-    YYSYMBOL_SWQT_DISTINCT = 25,          /* "DISTINCT"  */
-    YYSYMBOL_SWQT_CAST = 26,              /* "CAST"  */
-    YYSYMBOL_SWQT_UNION = 27,             /* "UNION"  */
-    YYSYMBOL_SWQT_ALL = 28,               /* "ALL"  */
-    YYSYMBOL_SWQT_LIMIT = 29,             /* "LIMIT"  */
-    YYSYMBOL_SWQT_OFFSET = 30,            /* "OFFSET"  */
-    YYSYMBOL_SWQT_EXCEPT = 31,            /* "EXCEPT"  */
-    YYSYMBOL_SWQT_EXCLUDE = 32,           /* "EXCLUDE"  */
-    YYSYMBOL_SWQT_VALUE_START = 33,       /* SWQT_VALUE_START  */
-    YYSYMBOL_SWQT_SELECT_START = 34,      /* SWQT_SELECT_START  */
-    YYSYMBOL_SWQT_NOT = 35,               /* "NOT"  */
-    YYSYMBOL_SWQT_OR = 36,                /* "OR"  */
-    YYSYMBOL_SWQT_AND = 37,               /* "AND"  */
-    YYSYMBOL_38_ = 38,                    /* '='  */
-    YYSYMBOL_39_ = 39,                    /* '<'  */
-    YYSYMBOL_40_ = 40,                    /* '>'  */
-    YYSYMBOL_41_ = 41,                    /* '!'  */
-    YYSYMBOL_42_ = 42,                    /* '+'  */
-    YYSYMBOL_43_ = 43,                    /* '-'  */
-    YYSYMBOL_44_ = 44,                    /* '*'  */
-    YYSYMBOL_45_ = 45,                    /* '/'  */
-    YYSYMBOL_46_ = 46,                    /* '%'  */
-    YYSYMBOL_SWQT_UMINUS = 47,            /* SWQT_UMINUS  */
-    YYSYMBOL_SWQT_RESERVED_KEYWORD = 48,  /* "reserved keyword"  */
-    YYSYMBOL_49_ = 49,                    /* '('  */
-    YYSYMBOL_50_ = 50,                    /* ')'  */
-    YYSYMBOL_51_ = 51,                    /* ','  */
-    YYSYMBOL_52_ = 52,                    /* '.'  */
-    YYSYMBOL_YYACCEPT = 53,               /* $accept  */
-    YYSYMBOL_input = 54,                  /* input  */
-    YYSYMBOL_value_expr = 55,             /* value_expr  */
-    YYSYMBOL_value_expr_list = 56,        /* value_expr_list  */
-    YYSYMBOL_field_value = 57,            /* field_value  */
-    YYSYMBOL_value_expr_non_logical = 58, /* value_expr_non_logical  */
-    YYSYMBOL_type_def = 59,               /* type_def  */
-    YYSYMBOL_select_statement = 60,       /* select_statement  */
-    YYSYMBOL_select_core = 61,            /* select_core  */
-    YYSYMBOL_opt_union_all = 62,          /* opt_union_all  */
-    YYSYMBOL_union_all = 63,              /* union_all  */
-    YYSYMBOL_select_field_list = 64,      /* select_field_list  */
-    YYSYMBOL_exclude_field = 65,          /* exclude_field  */
-    YYSYMBOL_exclude_field_list = 66,     /* exclude_field_list  */
-    YYSYMBOL_except_or_exclude = 67,      /* except_or_exclude  */
-    YYSYMBOL_column_spec = 68,            /* column_spec  */
-    YYSYMBOL_as_clause = 69,              /* as_clause  */
-    YYSYMBOL_opt_where = 70,              /* opt_where  */
-    YYSYMBOL_opt_joins = 71,              /* opt_joins  */
-    YYSYMBOL_opt_order_by = 72,           /* opt_order_by  */
-    YYSYMBOL_sort_spec_list = 73,         /* sort_spec_list  */
-    YYSYMBOL_sort_spec = 74,              /* sort_spec  */
-    YYSYMBOL_opt_limit = 75,              /* opt_limit  */
-    YYSYMBOL_opt_offset = 76,             /* opt_offset  */
-    YYSYMBOL_table_def = 77               /* table_def  */
+  YYSYMBOL_YYEMPTY = -2,
+  YYSYMBOL_YYEOF = 0,                      /* "end of string"  */
+  YYSYMBOL_YYerror = 1,                    /* error  */
+  YYSYMBOL_YYUNDEF = 2,                    /* "invalid token"  */
+  YYSYMBOL_SWQT_INTEGER_NUMBER = 3,        /* "integer number"  */
+  YYSYMBOL_SWQT_FLOAT_NUMBER = 4,          /* "floating point number"  */
+  YYSYMBOL_SWQT_STRING = 5,                /* "string"  */
+  YYSYMBOL_SWQT_IDENTIFIER = 6,            /* "identifier"  */
+  YYSYMBOL_SWQT_IN = 7,                    /* "IN"  */
+  YYSYMBOL_SWQT_LIKE = 8,                  /* "LIKE"  */
+  YYSYMBOL_SWQT_ILIKE = 9,                 /* "ILIKE"  */
+  YYSYMBOL_SWQT_ESCAPE = 10,               /* "ESCAPE"  */
+  YYSYMBOL_SWQT_BETWEEN = 11,              /* "BETWEEN"  */
+  YYSYMBOL_SWQT_NULL = 12,                 /* "NULL"  */
+  YYSYMBOL_SWQT_IS = 13,                   /* "IS"  */
+  YYSYMBOL_SWQT_SELECT = 14,               /* "SELECT"  */
+  YYSYMBOL_SWQT_LEFT = 15,                 /* "LEFT"  */
+  YYSYMBOL_SWQT_JOIN = 16,                 /* "JOIN"  */
+  YYSYMBOL_SWQT_WHERE = 17,                /* "WHERE"  */
+  YYSYMBOL_SWQT_ON = 18,                   /* "ON"  */
+  YYSYMBOL_SWQT_ORDER = 19,                /* "ORDER"  */
+  YYSYMBOL_SWQT_BY = 20,                   /* "BY"  */
+  YYSYMBOL_SWQT_FROM = 21,                 /* "FROM"  */
+  YYSYMBOL_SWQT_AS = 22,                   /* "AS"  */
+  YYSYMBOL_SWQT_ASC = 23,                  /* "ASC"  */
+  YYSYMBOL_SWQT_DESC = 24,                 /* "DESC"  */
+  YYSYMBOL_SWQT_DISTINCT = 25,             /* "DISTINCT"  */
+  YYSYMBOL_SWQT_CAST = 26,                 /* "CAST"  */
+  YYSYMBOL_SWQT_UNION = 27,                /* "UNION"  */
+  YYSYMBOL_SWQT_ALL = 28,                  /* "ALL"  */
+  YYSYMBOL_SWQT_LIMIT = 29,                /* "LIMIT"  */
+  YYSYMBOL_SWQT_OFFSET = 30,               /* "OFFSET"  */
+  YYSYMBOL_SWQT_EXCEPT = 31,               /* "EXCEPT"  */
+  YYSYMBOL_SWQT_EXCLUDE = 32,              /* "EXCLUDE"  */
+  YYSYMBOL_SWQT_HIDDEN = 33,               /* "HIDDEN"  */
+  YYSYMBOL_SWQT_VALUE_START = 34,          /* SWQT_VALUE_START  */
+  YYSYMBOL_SWQT_SELECT_START = 35,         /* SWQT_SELECT_START  */
+  YYSYMBOL_SWQT_NOT = 36,                  /* "NOT"  */
+  YYSYMBOL_SWQT_OR = 37,                   /* "OR"  */
+  YYSYMBOL_SWQT_AND = 38,                  /* "AND"  */
+  YYSYMBOL_39_ = 39,                       /* '='  */
+  YYSYMBOL_40_ = 40,                       /* '<'  */
+  YYSYMBOL_41_ = 41,                       /* '>'  */
+  YYSYMBOL_42_ = 42,                       /* '!'  */
+  YYSYMBOL_43_ = 43,                       /* '+'  */
+  YYSYMBOL_44_ = 44,                       /* '-'  */
+  YYSYMBOL_45_ = 45,                       /* '*'  */
+  YYSYMBOL_46_ = 46,                       /* '/'  */
+  YYSYMBOL_47_ = 47,                       /* '%'  */
+  YYSYMBOL_SWQT_UMINUS = 48,               /* SWQT_UMINUS  */
+  YYSYMBOL_SWQT_RESERVED_KEYWORD = 49,     /* "reserved keyword"  */
+  YYSYMBOL_50_ = 50,                       /* '('  */
+  YYSYMBOL_51_ = 51,                       /* ')'  */
+  YYSYMBOL_52_ = 52,                       /* ','  */
+  YYSYMBOL_53_ = 53,                       /* '.'  */
+  YYSYMBOL_YYACCEPT = 54,                  /* $accept  */
+  YYSYMBOL_input = 55,                     /* input  */
+  YYSYMBOL_value_expr = 56,                /* value_expr  */
+  YYSYMBOL_value_expr_list = 57,           /* value_expr_list  */
+  YYSYMBOL_identifier = 58,                /* identifier  */
+  YYSYMBOL_field_value = 59,               /* field_value  */
+  YYSYMBOL_value_expr_non_logical = 60,    /* value_expr_non_logical  */
+  YYSYMBOL_type_def = 61,                  /* type_def  */
+  YYSYMBOL_select_statement = 62,          /* select_statement  */
+  YYSYMBOL_select_core = 63,               /* select_core  */
+  YYSYMBOL_opt_union_all = 64,             /* opt_union_all  */
+  YYSYMBOL_union_all = 65,                 /* union_all  */
+  YYSYMBOL_select_field_list = 66,         /* select_field_list  */
+  YYSYMBOL_exclude_field = 67,             /* exclude_field  */
+  YYSYMBOL_exclude_field_list = 68,        /* exclude_field_list  */
+  YYSYMBOL_except_or_exclude = 69,         /* except_or_exclude  */
+  YYSYMBOL_column_spec = 70,               /* column_spec  */
+  YYSYMBOL_as_clause = 71,                 /* as_clause  */
+  YYSYMBOL_as_clause_with_hidden = 72,     /* as_clause_with_hidden  */
+  YYSYMBOL_opt_where = 73,                 /* opt_where  */
+  YYSYMBOL_opt_joins = 74,                 /* opt_joins  */
+  YYSYMBOL_opt_order_by = 75,              /* opt_order_by  */
+  YYSYMBOL_sort_spec_list = 76,            /* sort_spec_list  */
+  YYSYMBOL_sort_spec = 77,                 /* sort_spec  */
+  YYSYMBOL_opt_limit = 78,                 /* opt_limit  */
+  YYSYMBOL_opt_offset = 79,                /* opt_offset  */
+  YYSYMBOL_table_def = 80                  /* table_def  */
 };
 typedef enum yysymbol_kind_t yysymbol_kind_t;
 
+
+
+
 #ifdef short
-#undef short
+# undef short
 #endif
 
 /* On compilers that do not define __PTRDIFF_MAX__ etc., make sure
@@ -240,11 +232,11 @@ typedef enum yysymbol_kind_t yysymbol_kind_t;
    so that the code can choose integer types of a good width.  */
 
 #ifndef __PTRDIFF_MAX__
-#include <limits.h> /* INFRINGES ON USER NAME SPACE */
-#if defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__
-#include <stdint.h> /* INFRINGES ON USER NAME SPACE */
-#define YY_STDINT_H
-#endif
+# include <limits.h> /* INFRINGES ON USER NAME SPACE */
+# if defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__
+#  include <stdint.h> /* INFRINGES ON USER NAME SPACE */
+#  define YY_STDINT_H
+# endif
 #endif
 
 /* Narrow types that promote to a signed type and that can represent a
@@ -274,16 +266,16 @@ typedef short yytype_int16;
    (aka HP-UX 11i v2) only through the end of 2022; see Table 2 of
    <https://h20195.www2.hpe.com/V2/getpdf.aspx/4AA4-7673ENW.pdf>.  */
 #ifdef __hpux
-#undef UINT_LEAST8_MAX
-#undef UINT_LEAST16_MAX
-#define UINT_LEAST8_MAX 255
-#define UINT_LEAST16_MAX 65535
+# undef UINT_LEAST8_MAX
+# undef UINT_LEAST16_MAX
+# define UINT_LEAST8_MAX 255
+# define UINT_LEAST16_MAX 65535
 #endif
 
 #if defined __UINT_LEAST8_MAX__ && __UINT_LEAST8_MAX__ <= __INT_MAX__
 typedef __UINT_LEAST8_TYPE__ yytype_uint8;
-#elif (!defined __UINT_LEAST8_MAX__ && defined YY_STDINT_H &&                  \
-       UINT_LEAST8_MAX <= INT_MAX)
+#elif (!defined __UINT_LEAST8_MAX__ && defined YY_STDINT_H \
+       && UINT_LEAST8_MAX <= INT_MAX)
 typedef uint_least8_t yytype_uint8;
 #elif !defined __UINT_LEAST8_MAX__ && UCHAR_MAX <= INT_MAX
 typedef unsigned char yytype_uint8;
@@ -293,8 +285,8 @@ typedef short yytype_uint8;
 
 #if defined __UINT_LEAST16_MAX__ && __UINT_LEAST16_MAX__ <= __INT_MAX__
 typedef __UINT_LEAST16_TYPE__ yytype_uint16;
-#elif (!defined __UINT_LEAST16_MAX__ && defined YY_STDINT_H &&                 \
-       UINT_LEAST16_MAX <= INT_MAX)
+#elif (!defined __UINT_LEAST16_MAX__ && defined YY_STDINT_H \
+       && UINT_LEAST16_MAX <= INT_MAX)
 typedef uint_least16_t yytype_uint16;
 #elif !defined __UINT_LEAST16_MAX__ && USHRT_MAX <= INT_MAX
 typedef unsigned short yytype_uint16;
@@ -303,40 +295,42 @@ typedef int yytype_uint16;
 #endif
 
 #ifndef YYPTRDIFF_T
-#if defined __PTRDIFF_TYPE__ && defined __PTRDIFF_MAX__
-#define YYPTRDIFF_T __PTRDIFF_TYPE__
-#define YYPTRDIFF_MAXIMUM __PTRDIFF_MAX__
-#elif defined PTRDIFF_MAX
-#ifndef ptrdiff_t
-#include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#endif
-#define YYPTRDIFF_T ptrdiff_t
-#define YYPTRDIFF_MAXIMUM PTRDIFF_MAX
-#else
-#define YYPTRDIFF_T long
-#define YYPTRDIFF_MAXIMUM LONG_MAX
-#endif
+# if defined __PTRDIFF_TYPE__ && defined __PTRDIFF_MAX__
+#  define YYPTRDIFF_T __PTRDIFF_TYPE__
+#  define YYPTRDIFF_MAXIMUM __PTRDIFF_MAX__
+# elif defined PTRDIFF_MAX
+#  ifndef ptrdiff_t
+#   include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  endif
+#  define YYPTRDIFF_T ptrdiff_t
+#  define YYPTRDIFF_MAXIMUM PTRDIFF_MAX
+# else
+#  define YYPTRDIFF_T long
+#  define YYPTRDIFF_MAXIMUM LONG_MAX
+# endif
 #endif
 
 #ifndef YYSIZE_T
-#ifdef __SIZE_TYPE__
-#define YYSIZE_T __SIZE_TYPE__
-#elif defined size_t
-#define YYSIZE_T size_t
-#elif defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__
-#include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#define YYSIZE_T size_t
-#else
-#define YYSIZE_T unsigned
-#endif
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned
+# endif
 #endif
 
-#define YYSIZE_MAXIMUM                                                         \
-    YY_CAST(YYPTRDIFF_T, (YYPTRDIFF_MAXIMUM < YY_CAST(YYSIZE_T, -1)            \
-                              ? YYPTRDIFF_MAXIMUM                              \
-                              : YY_CAST(YYSIZE_T, -1)))
+#define YYSIZE_MAXIMUM                                  \
+  YY_CAST (YYPTRDIFF_T,                                 \
+           (YYPTRDIFF_MAXIMUM < YY_CAST (YYSIZE_T, -1)  \
+            ? YYPTRDIFF_MAXIMUM                         \
+            : YY_CAST (YYSIZE_T, -1)))
+
+#define YYSIZEOF(X) YY_CAST (YYPTRDIFF_T, sizeof (X))
 
-#define YYSIZEOF(X) YY_CAST(YYPTRDIFF_T, sizeof(X))
 
 /* Stored state numbers (used for stacks). */
 typedef yytype_uint8 yy_state_t;
@@ -345,592 +339,672 @@ typedef yytype_uint8 yy_state_t;
 typedef int yy_state_fast_t;
 
 #ifndef YY_
-#if defined YYENABLE_NLS && YYENABLE_NLS
-#if ENABLE_NLS
-#include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#define YY_(Msgid) dgettext("bison-runtime", Msgid)
-#endif
-#endif
-#ifndef YY_
-#define YY_(Msgid) Msgid
-#endif
+# if defined YYENABLE_NLS && YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(Msgid) Msgid
+# endif
 #endif
 
+
 #ifndef YY_ATTRIBUTE_PURE
-#if defined __GNUC__ && 2 < __GNUC__ + (96 <= __GNUC_MINOR__)
-#define YY_ATTRIBUTE_PURE __attribute__((__pure__))
-#else
-#define YY_ATTRIBUTE_PURE
-#endif
+# if defined __GNUC__ && 2 < __GNUC__ + (96 <= __GNUC_MINOR__)
+#  define YY_ATTRIBUTE_PURE __attribute__ ((__pure__))
+# else
+#  define YY_ATTRIBUTE_PURE
+# endif
 #endif
 
 #ifndef YY_ATTRIBUTE_UNUSED
-#if defined __GNUC__ && 2 < __GNUC__ + (7 <= __GNUC_MINOR__)
-#define YY_ATTRIBUTE_UNUSED __attribute__((__unused__))
-#else
-#define YY_ATTRIBUTE_UNUSED
-#endif
+# if defined __GNUC__ && 2 < __GNUC__ + (7 <= __GNUC_MINOR__)
+#  define YY_ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+# else
+#  define YY_ATTRIBUTE_UNUSED
+# endif
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */
-#if !defined lint || defined __GNUC__
-#define YY_USE(E) ((void)(E))
+#if ! defined lint || defined __GNUC__
+# define YY_USE(E) ((void) (E))
 #else
-#define YY_USE(E) /* empty */
+# define YY_USE(E) /* empty */
 #endif
 
 /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
-#if defined __GNUC__ && !defined __ICC && 406 <= __GNUC__ * 100 + __GNUC_MINOR__
-#if __GNUC__ * 100 + __GNUC_MINOR__ < 407
-#define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                                    \
-    _Pragma("GCC diagnostic push")                                             \
-        _Pragma("GCC diagnostic ignored \"-Wuninitialized\"")
+#if defined __GNUC__ && ! defined __ICC && 406 <= __GNUC__ * 100 + __GNUC_MINOR__
+# if __GNUC__ * 100 + __GNUC_MINOR__ < 407
+#  define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                           \
+    _Pragma ("GCC diagnostic push")                                     \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")
+# else
+#  define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                           \
+    _Pragma ("GCC diagnostic push")                                     \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")              \
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# endif
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END      \
+    _Pragma ("GCC diagnostic pop")
 #else
-#define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                                    \
-    _Pragma("GCC diagnostic push")                                             \
-        _Pragma("GCC diagnostic ignored \"-Wuninitialized\"")                  \
-            _Pragma("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
-#endif
-#define YY_IGNORE_MAYBE_UNINITIALIZED_END _Pragma("GCC diagnostic pop")
-#else
-#define YY_INITIAL_VALUE(Value) Value
+# define YY_INITIAL_VALUE(Value) Value
 #endif
 #ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-#define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-#define YY_IGNORE_MAYBE_UNINITIALIZED_END
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
 #endif
 #ifndef YY_INITIAL_VALUE
-#define YY_INITIAL_VALUE(Value) /* Nothing. */
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
 #endif
 
-#if defined __cplusplus && defined __GNUC__ && !defined __ICC && 6 <= __GNUC__
-#define YY_IGNORE_USELESS_CAST_BEGIN                                           \
-    _Pragma("GCC diagnostic push")                                             \
-        _Pragma("GCC diagnostic ignored \"-Wuseless-cast\"")
-#define YY_IGNORE_USELESS_CAST_END _Pragma("GCC diagnostic pop")
+#if defined __cplusplus && defined __GNUC__ && ! defined __ICC && 6 <= __GNUC__
+# define YY_IGNORE_USELESS_CAST_BEGIN                          \
+    _Pragma ("GCC diagnostic push")                            \
+    _Pragma ("GCC diagnostic ignored \"-Wuseless-cast\"")
+# define YY_IGNORE_USELESS_CAST_END            \
+    _Pragma ("GCC diagnostic pop")
 #endif
 #ifndef YY_IGNORE_USELESS_CAST_BEGIN
-#define YY_IGNORE_USELESS_CAST_BEGIN
-#define YY_IGNORE_USELESS_CAST_END
+# define YY_IGNORE_USELESS_CAST_BEGIN
+# define YY_IGNORE_USELESS_CAST_END
 #endif
 
-#define YY_ASSERT(E) ((void)(0 && (E)))
+
+#define YY_ASSERT(E) ((void) (0 && (E)))
 
 #if 1
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
-#ifdef YYSTACK_USE_ALLOCA
-#if YYSTACK_USE_ALLOCA
-#ifdef __GNUC__
-#define YYSTACK_ALLOC __builtin_alloca
-#elif defined __BUILTIN_VA_ARG_INCR
-#include <alloca.h> /* INFRINGES ON USER NAME SPACE */
-#elif defined _AIX
-#define YYSTACK_ALLOC __alloca
-#elif defined _MSC_VER
-#include <malloc.h> /* INFRINGES ON USER NAME SPACE */
-#define alloca _alloca
-#else
-#define YYSTACK_ALLOC alloca
-#if !defined _ALLOCA_H && !defined EXIT_SUCCESS
-#include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-/* Use EXIT_SUCCESS as a witness for stdlib.h.  */
-#ifndef EXIT_SUCCESS
-#define EXIT_SUCCESS 0
-#endif
-#endif
-#endif
-#endif
-#endif
-
-#ifdef YYSTACK_ALLOC
-/* Pacify GCC's 'empty if-body' warning.  */
-#define YYSTACK_FREE(Ptr)                                                      \
-    do                                                                         \
-    { /* empty */                                                              \
-        ;                                                                      \
-    } while (0)
-#ifndef YYSTACK_ALLOC_MAXIMUM
-/* The OS might guarantee only one guard page at the bottom of the stack,
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
+#     ifndef EXIT_SUCCESS
+#      define EXIT_SUCCESS 0
+#     endif
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's 'empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
        and a page size can be as small as 4096 bytes.  So we cannot safely
        invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
        to allow for a few compiler-allocated temporary stack slots.  */
-#define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
-#endif
-#else
-#define YYSTACK_ALLOC YYMALLOC
-#define YYSTACK_FREE YYFREE
-#ifndef YYSTACK_ALLOC_MAXIMUM
-#define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
-#endif
-#if (defined __cplusplus && !defined EXIT_SUCCESS &&                           \
-     !((defined YYMALLOC || defined malloc) &&                                 \
-       (defined YYFREE || defined free)))
-#include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#ifndef EXIT_SUCCESS
-#define EXIT_SUCCESS 0
-#endif
-#endif
-#ifndef YYMALLOC
-#define YYMALLOC malloc
-#if !defined malloc && !defined EXIT_SUCCESS
-void *malloc(YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
-#endif
-#endif
-#ifndef YYFREE
-#define YYFREE free
-#if !defined free && !defined EXIT_SUCCESS
-void free(void *);      /* INFRINGES ON USER NAME SPACE */
-#endif
-#endif
-#endif
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
+# else
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
+       && ! ((defined YYMALLOC || defined malloc) \
+             && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef EXIT_SUCCESS
+#    define EXIT_SUCCESS 0
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined EXIT_SUCCESS
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined EXIT_SUCCESS
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+# endif
 #endif /* 1 */
 
-#if (!defined yyoverflow &&                                                    \
-     (!defined __cplusplus ||                                                  \
-      (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-    yy_state_t yyss_alloc;
-    YYSTYPE yyvs_alloc;
+  yy_state_t yyss_alloc;
+  YYSTYPE yyvs_alloc;
 };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
-#define YYSTACK_GAP_MAXIMUM (YYSIZEOF(union yyalloc) - 1)
+# define YYSTACK_GAP_MAXIMUM (YYSIZEOF (union yyalloc) - 1)
 
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
-#define YYSTACK_BYTES(N)                                                       \
-    ((N) * (YYSIZEOF(yy_state_t) + YYSIZEOF(YYSTYPE)) + YYSTACK_GAP_MAXIMUM)
+# define YYSTACK_BYTES(N) \
+     ((N) * (YYSIZEOF (yy_state_t) + YYSIZEOF (YYSTYPE)) \
+      + YYSTACK_GAP_MAXIMUM)
 
-#define YYCOPY_NEEDED 1
+# define YYCOPY_NEEDED 1
 
 /* Relocate STACK from its old location to the new one.  The
    local variables YYSIZE and YYSTACKSIZE give the old and new number of
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-#define YYSTACK_RELOCATE(Stack_alloc, Stack)                                   \
-    do                                                                         \
-    {                                                                          \
-        YYPTRDIFF_T yynewbytes;                                                \
-        YYCOPY(&yyptr->Stack_alloc, Stack, yysize);                            \
-        Stack = &yyptr->Stack_alloc;                                           \
-        yynewbytes = yystacksize * YYSIZEOF(*Stack) + YYSTACK_GAP_MAXIMUM;     \
-        yyptr += yynewbytes / YYSIZEOF(*yyptr);                                \
-    } while (0)
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
+    do                                                                  \
+      {                                                                 \
+        YYPTRDIFF_T yynewbytes;                                         \
+        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
+        Stack = &yyptr->Stack_alloc;                                    \
+        yynewbytes = yystacksize * YYSIZEOF (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / YYSIZEOF (*yyptr);                        \
+      }                                                                 \
+    while (0)
 
 #endif
 
 #if defined YYCOPY_NEEDED && YYCOPY_NEEDED
 /* Copy COUNT objects from SRC to DST.  The source and destination do
    not overlap.  */
-#ifndef YYCOPY
-#if defined __GNUC__ && 1 < __GNUC__
-#define YYCOPY(Dst, Src, Count)                                                \
-    __builtin_memcpy(Dst, Src, YY_CAST(YYSIZE_T, (Count)) * sizeof(*(Src)))
-#else
-#define YYCOPY(Dst, Src, Count)                                                \
-    do                                                                         \
-    {                                                                          \
-        YYPTRDIFF_T yyi;                                                       \
-        for (yyi = 0; yyi < (Count); yyi++)                                    \
-            (Dst)[yyi] = (Src)[yyi];                                           \
-    } while (0)
-#endif
-#endif
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(Dst, Src, Count) \
+      __builtin_memcpy (Dst, Src, YY_CAST (YYSIZE_T, (Count)) * sizeof (*(Src)))
+#  else
+#   define YYCOPY(Dst, Src, Count)              \
+      do                                        \
+        {                                       \
+          YYPTRDIFF_T yyi;                      \
+          for (yyi = 0; yyi < (Count); yyi++)   \
+            (Dst)[yyi] = (Src)[yyi];            \
+        }                                       \
+      while (0)
+#  endif
+# endif
 #endif /* !YYCOPY_NEEDED */
 
 /* YYFINAL -- State number of the termination state.  */
-#define YYFINAL 20
+#define YYFINAL  22
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST 409
+#define YYLAST   469
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS 53
+#define YYNTOKENS  54
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS 25
+#define YYNNTS  27
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES 101
+#define YYNRULES  105
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES 211
+#define YYNSTATES  215
 
 /* YYMAXUTOK -- Last valid token kind.  */
-#define YYMAXUTOK 294
+#define YYMAXUTOK   295
+
 
 /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
    as returned by yylex, with out-of-bounds checking.  */
-#define YYTRANSLATE(YYX)                                                       \
-    (0 <= (YYX) && (YYX) <= YYMAXUTOK                                          \
-         ? YY_CAST(yysymbol_kind_t, yytranslate[YYX])                          \
-         : YYSYMBOL_YYUNDEF)
+#define YYTRANSLATE(YYX)                                \
+  (0 <= (YYX) && (YYX) <= YYMAXUTOK                     \
+   ? YY_CAST (yysymbol_kind_t, yytranslate[YYX])        \
+   : YYSYMBOL_YYUNDEF)
 
 /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
    as returned by yylex.  */
-static const yytype_int8 yytranslate[] = {
-    0,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  41, 2,  2,  2,  46,
-    2,  2,  49, 50, 44, 42, 51, 43, 52, 45, 2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  39, 38, 40, 2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10,
-    11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
-    30, 31, 32, 33, 34, 35, 36, 37, 47, 48};
+static const yytype_int8 yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,    42,     2,     2,     2,    47,     2,     2,
+      50,    51,    45,    43,    52,    44,    53,    46,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+      40,    39,    41,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    48,    49
+};
 
 #if YYDEBUG
 /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
-static const yytype_int16 yyrline[] = {
-    0,   124, 124, 125, 131, 138, 143, 148, 153, 160, 168, 176, 184, 192, 200,
-    208, 216, 224, 232, 240, 252, 261, 274, 282, 294, 303, 316, 325, 338, 347,
-    360, 367, 379, 385, 392, 400, 413, 418, 423, 427, 432, 437, 442, 477, 484,
-    491, 498, 505, 512, 548, 556, 562, 569, 578, 596, 616, 617, 620, 625, 631,
-    632, 634, 642, 643, 646, 656, 657, 660, 661, 664, 673, 684, 699, 714, 735,
-    766, 801, 826, 855, 861, 863, 864, 869, 870, 876, 883, 884, 887, 888, 891,
-    897, 903, 910, 911, 918, 919, 927, 937, 948, 959, 972, 983};
+static const yytype_int16 yyrline[] =
+{
+       0,   109,   109,   110,   116,   123,   128,   133,   138,   145,
+     153,   161,   169,   177,   185,   193,   201,   209,   217,   225,
+     237,   246,   259,   267,   279,   288,   301,   310,   323,   332,
+     345,   352,   364,   370,   377,   379,   382,   390,   403,   408,
+     413,   417,   422,   427,   432,   467,   474,   481,   488,   495,
+     502,   538,   546,   552,   559,   568,   586,   606,   607,   610,
+     615,   621,   622,   624,   632,   633,   636,   646,   647,   650,
+     651,   654,   663,   674,   689,   704,   725,   756,   791,   816,
+     845,   851,   854,   856,   865,   866,   871,   872,   878,   885,
+     886,   889,   890,   893,   899,   905,   912,   913,   920,   921,
+     929,   939,   950,   961,   974,   985
+};
 #endif
 
 /** Accessing symbol of state STATE.  */
-#define YY_ACCESSING_SYMBOL(State) YY_CAST(yysymbol_kind_t, yystos[State])
+#define YY_ACCESSING_SYMBOL(State) YY_CAST (yysymbol_kind_t, yystos[State])
+
+#if 0
+/* The user-facing name of the symbol whose (internal) number is
+   YYSYMBOL.  No bounds checking.  */
+static const char *yysymbol_name (yysymbol_kind_t yysymbol) YY_ATTRIBUTE_UNUSED;
+#endif
 
-#if 1
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
-static const char *const yytname[] = {"\"end of string\"",
-                                      "error",
-                                      "\"invalid token\"",
-                                      "\"integer number\"",
-                                      "\"floating point number\"",
-                                      "\"string\"",
-                                      "\"identifier\"",
-                                      "\"IN\"",
-                                      "\"LIKE\"",
-                                      "\"ILIKE\"",
-                                      "\"ESCAPE\"",
-                                      "\"BETWEEN\"",
-                                      "\"NULL\"",
-                                      "\"IS\"",
-                                      "\"SELECT\"",
-                                      "\"LEFT\"",
-                                      "\"JOIN\"",
-                                      "\"WHERE\"",
-                                      "\"ON\"",
-                                      "\"ORDER\"",
-                                      "\"BY\"",
-                                      "\"FROM\"",
-                                      "\"AS\"",
-                                      "\"ASC\"",
-                                      "\"DESC\"",
-                                      "\"DISTINCT\"",
-                                      "\"CAST\"",
-                                      "\"UNION\"",
-                                      "\"ALL\"",
-                                      "\"LIMIT\"",
-                                      "\"OFFSET\"",
-                                      "\"EXCEPT\"",
-                                      "\"EXCLUDE\"",
-                                      "SWQT_VALUE_START",
-                                      "SWQT_SELECT_START",
-                                      "\"NOT\"",
-                                      "\"OR\"",
-                                      "\"AND\"",
-                                      "'='",
-                                      "'<'",
-                                      "'>'",
-                                      "'!'",
-                                      "'+'",
-                                      "'-'",
-                                      "'*'",
-                                      "'/'",
-                                      "'%'",
-                                      "SWQT_UMINUS",
-                                      "\"reserved keyword\"",
-                                      "'('",
-                                      "')'",
-                                      "','",
-                                      "'.'",
-                                      "$accept",
-                                      "input",
-                                      "value_expr",
-                                      "value_expr_list",
-                                      "field_value",
-                                      "value_expr_non_logical",
-                                      "type_def",
-                                      "select_statement",
-                                      "select_core",
-                                      "opt_union_all",
-                                      "union_all",
-                                      "select_field_list",
-                                      "exclude_field",
-                                      "exclude_field_list",
-                                      "except_or_exclude",
-                                      "column_spec",
-                                      "as_clause",
-                                      "opt_where",
-                                      "opt_joins",
-                                      "opt_order_by",
-                                      "sort_spec_list",
-                                      "sort_spec",
-                                      "opt_limit",
-                                      "opt_offset",
-                                      "table_def",
-                                      YY_NULLPTR};
+static const char *const yytname[] =
+{
+  "\"end of string\"", "error", "\"invalid token\"", "\"integer number\"",
+  "\"floating point number\"", "\"string\"", "\"identifier\"", "\"IN\"",
+  "\"LIKE\"", "\"ILIKE\"", "\"ESCAPE\"", "\"BETWEEN\"", "\"NULL\"",
+  "\"IS\"", "\"SELECT\"", "\"LEFT\"", "\"JOIN\"", "\"WHERE\"", "\"ON\"",
+  "\"ORDER\"", "\"BY\"", "\"FROM\"", "\"AS\"", "\"ASC\"", "\"DESC\"",
+  "\"DISTINCT\"", "\"CAST\"", "\"UNION\"", "\"ALL\"", "\"LIMIT\"",
+  "\"OFFSET\"", "\"EXCEPT\"", "\"EXCLUDE\"", "\"HIDDEN\"",
+  "SWQT_VALUE_START", "SWQT_SELECT_START", "\"NOT\"", "\"OR\"", "\"AND\"",
+  "'='", "'<'", "'>'", "'!'", "'+'", "'-'", "'*'", "'/'", "'%'",
+  "SWQT_UMINUS", "\"reserved keyword\"", "'('", "')'", "','", "'.'",
+  "$accept", "input", "value_expr", "value_expr_list", "identifier",
+  "field_value", "value_expr_non_logical", "type_def", "select_statement",
+  "select_core", "opt_union_all", "union_all", "select_field_list",
+  "exclude_field", "exclude_field_list", "except_or_exclude",
+  "column_spec", "as_clause", "as_clause_with_hidden", "opt_where",
+  "opt_joins", "opt_order_by", "sort_spec_list", "sort_spec", "opt_limit",
+  "opt_offset", "table_def", YY_NULLPTR
+};
+
+#if 0
+static const char *
+yysymbol_name (yysymbol_kind_t yysymbol)
+{
+  return yytname[yysymbol];
+}
 #endif
 
-#define YYPACT_NINF (-137)
+#define YYPACT_NINF (-136)
 
-#define yypact_value_is_default(Yyn) ((Yyn) == YYPACT_NINF)
+#define yypact_value_is_default(Yyn) \
+  ((Yyn) == YYPACT_NINF)
 
 #define YYTABLE_NINF (-1)
 
-#define yytable_value_is_error(Yyn) 0
+#define yytable_value_is_error(Yyn) \
+  0
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-static const yytype_int16 yypact[] = {
-    34,   206,  -10,  16,   -137, -137, -137, -35,  -137, -37,  206,  211,
-    206,  326,  -137, 298,  79,   11,   -137, 4,    -137, 206,  23,   206,
-    368,  -137, 254,  -11,  206,  206,  211,  -5,   12,   206,  206,  94,
-    104,  155,  5,    211,  211,  211,  211,  211,  8,    196,  93,   274,
-    48,   26,   30,   65,   -137, -10,  235,  45,   -137, 310,  -137, 206,
-    91,   101,  44,   -137, 103,  68,   206,  206,  211,  345,  361,  206,
-    206,  -137, 206,  206,  -137, 206,  -137, 206,  18,   18,   -137, -137,
-    -137, 145,  -3,   100,  -137, -137, 89,   -137, 140,  -137, 121,  196,
-    4,    -137, -137, 206,  -137, 146,  114,  206,  206,  211,  -137, 206,
-    144,  158,  182,  -137, -137, -137, -137, -137, -137, 159,  119,  -137,
-    121,  159,  -137, 120,  2,    116,  -137, -137, -137, 124,  125,  -137,
-    -137, -137, 298,  127,  206,  206,  211,  122,  128,  20,   116,  -137,
-    131,  129,  177,  178,  -137, 170,  121,  174,  53,   -137, -137, -137,
-    -137, 298,  20,   -137, 174,  159,  -137, 20,   20,   121,  169,  206,
-    173,  90,   105,  -137, 173,  -137, -137, -137, 179,  206,  326,  175,
-    167,  -137, 200,  -137, 202,  167,  206,  290,  159,  203,  183,  157,
-    171,  183,  290,  -137, 139,  -137, 184,  -137, 217,  -137, -137, -137,
-    -137, -137, -137, -137, 159,  -137, -137};
+static const yytype_int16 yypact[] =
+{
+      66,    93,   -13,    11,  -136,  -136,  -136,  -136,  -136,   -24,
+    -136,    93,   292,    93,   413,   -34,  -136,   174,   136,    21,
+    -136,    30,  -136,    93,   427,  -136,   315,    -9,    93,    93,
+     292,     2,   116,    93,    93,   172,   197,   239,    25,    93,
+       0,   292,   292,   292,   292,   292,   258,    84,   356,   -32,
+      27,    19,    23,    48,  -136,   -13,   377,  -136,    93,    73,
+      75,   145,  -136,    92,    57,    93,    93,   292,   420,   298,
+      93,    93,  -136,    93,    93,  -136,    93,  -136,    93,   308,
+      62,  -136,   -22,   -22,  -136,  -136,  -136,   107,  -136,  -136,
+      72,     0,  -136,   111,  -136,   223,    14,     7,   258,    30,
+    -136,  -136,     0,    95,    93,    93,   292,  -136,    93,   144,
+     149,   399,  -136,  -136,  -136,  -136,  -136,  -136,    93,  -136,
+       7,     0,  -136,  -136,     0,   109,  -136,   110,    55,   102,
+    -136,  -136,   114,   115,  -136,  -136,  -136,   174,   117,    93,
+      93,   292,  -136,   102,   118,  -136,   121,   119,   128,     9,
+       0,     0,  -136,   151,     7,   165,    -1,  -136,  -136,  -136,
+    -136,   174,   165,     0,  -136,     9,  -136,     9,     9,     7,
+     167,    93,   176,    83,   101,   176,  -136,  -136,  -136,  -136,
+     175,    93,   413,   179,   178,  -136,   193,  -136,   201,   178,
+      93,   364,     0,   207,   181,   163,   164,   181,   364,  -136,
+     134,  -136,   173,  -136,   221,  -136,  -136,  -136,  -136,  -136,
+    -136,  -136,     0,  -136,  -136
+};
 
 /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
    Performed when YYTABLE does not specify something else to do.  Zero
    means the default is an error.  */
-static const yytype_int8 yydefact[] = {
-    2,  0,  0,   0,  36, 37, 38, 34, 41, 0,  0,  0,  0,  3,   39, 5,  0,  0,
-    4,  59, 1,   0,  0,  0,  8,  42, 0,  0,  0,  0,  0,  0,   0,  0,  0,  0,
-    0,  0,  0,   0,  0,  0,  0,  0,  34, 0,  72, 69, 0,  62,  0,  0,  55, 0,
-    33, 0,  35,  0,  40, 0,  18, 22, 0,  30, 0,  0,  0,  0,   0,  7,  6,  0,
-    0,  9,  0,   0,  12, 0,  13, 0,  43, 44, 45, 46, 47, 0,   0,  0,  67, 68,
-    0,  79, 0,   70, 0,  0,  59, 61, 60, 0,  48, 0,  0,  0,   0,  0,  31, 0,
-    19, 23, 0,   15, 16, 14, 10, 17, 11, 0,  0,  73, 0,  0,   78, 0,  96, 82,
-    63, 56, 32,  50, 0,  26, 20, 24, 28, 0,  0,  0,  0,  34,  0,  74, 82, 64,
-    65, 0,  0,   0,  97, 0,  0,  80, 0,  49, 27, 21, 25, 29,  76, 75, 80, 0,
-    71, 98, 100, 0,  0,  0,  85, 0,  0,  77, 85, 66, 99, 101, 0,  0,  81, 0,
-    92, 51, 0,   53, 0,  92, 0,  82, 0,  0,  94, 0,  0,  94,  82, 83, 89, 86,
-    88, 93, 0,   57, 52, 54, 58, 84, 90, 91, 0,  95, 87};
+static const yytype_int8 yydefact[] =
+{
+       2,     0,     0,     0,    38,    39,    40,    34,    43,     0,
+      35,     0,     0,     0,     3,    36,    41,     5,     0,     0,
+       4,    61,     1,     0,     8,    44,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    74,    71,    36,
+       0,    64,     0,     0,    57,     0,     0,    42,     0,    18,
+      22,     0,    30,     0,     0,     0,     0,     0,     7,     6,
+       0,     0,     9,     0,     0,    12,     0,    13,     0,    33,
+       0,    37,    45,    46,    47,    48,    49,     0,    69,    70,
+       0,     0,    81,    82,    72,     0,     0,     0,     0,    61,
+      63,    62,     0,     0,     0,     0,     0,    31,     0,    19,
+      23,     0,    15,    16,    14,    10,    17,    11,     0,    50,
+       0,     0,    80,    83,     0,     0,    75,     0,   100,    86,
+      65,    58,    52,     0,    26,    20,    24,    28,     0,     0,
+       0,     0,    32,    86,    36,    66,    67,     0,     0,    76,
+       0,     0,   101,     0,     0,    84,     0,    51,    27,    21,
+      25,    29,    84,     0,    73,    78,    77,   102,   104,     0,
+       0,     0,    89,     0,     0,    89,    68,    79,   103,   105,
+       0,     0,    85,     0,    96,    53,     0,    55,     0,    96,
+       0,    86,     0,     0,    98,     0,     0,    98,    86,    87,
+      93,    90,    92,    97,     0,    59,    54,    56,    60,    88,
+      94,    95,     0,    99,    91
+};
 
 /* YYPGOTO[NTERM-NUM].  */
-static const yytype_int16 yypgoto[] = {
-    -137, -137, -1,   -46, -116, 7,    -137, 176, 213,  137, -137, -43, -137,
-    73,   -137, -137, -45, 76,   -136, 66,   39,  -137, 67,  57,   -110};
+static const yytype_int16 yypgoto[] =
+{
+    -136,  -136,    16,   -48,   -18,  -117,    24,  -136,   177,   212,
+     135,  -136,   -43,  -136,    74,  -136,  -136,   -56,  -136,    77,
+    -135,    65,    34,  -136,    61,    56,  -111
+};
 
 /* YYDEFGOTO[NTERM-NUM].  */
-static const yytype_uint8 yydefgoto[] = {
-    0,   3,  54, 55, 14,  15,  130, 18,  19,  52,  53,  48, 144,
-    145, 90, 49, 93, 168, 151, 180, 197, 198, 190, 201, 125};
+static const yytype_uint8 yydefgoto[] =
+{
+       0,     3,    79,    80,    15,    16,    17,   133,    20,    21,
+      54,    55,    50,   146,   147,    90,    51,    93,    94,   172,
+     155,   184,   201,   202,   194,   205,   129
+};
 
 /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule whose
    number is the opposite.  If YYTABLE_NINF, syntax error.  */
-static const yytype_uint8 yytable[] = {
-    13,  140, 87,  56,  16,  143, 160, 63,  91,  24,  142, 26,  23,  102, 21,
-    47,  20,  22,  25,  65,  66,  67,  57,  68,  92,  16,  91,  60,  61,  56,
-    64,  51,  69,  70,  73,  76,  78,  62,  59,  17,  166, 119, 92,  79,  47,
-    143, 80,  81,  82,  83,  84,  195, 126, 128, 147, 176, 169, 85,  205, 170,
-    86,  135, 41,  42,  43,  108, 109, 1,   2,   94,  111, 112, 196, 113, 114,
-    110, 115, 95,  116, 148, 96,  105, 4,   5,   6,   44,  39,  40,  41,  42,
-    43,  8,   196, 97,  47,  100, 159, 4,   5,   6,   7,   103, 132, 133, 45,
-    9,   8,   4,   5,   6,   7,   104, 134, 171, 10,  106, 8,   107, 174, 175,
-    9,   120, 11,  46,  88,  89,  123, 124, 12,  10,  9,   149, 150, 71,  72,
-    155, 156, 11,  121, 10,  181, 182, 74,  12,  75,  157, 122, 11,  4,   5,
-    6,   7,   129, 12,  136, 183, 184, 8,   4,   5,   6,   7,   206, 207, 131,
-    139, 178, 8,   137, 141, 117, 9,   146, 152, 22,  153, 187, 154, 158, 162,
-    10,  9,   161, 163, 164, 194, 165, 177, 11,  118, 10,  167, 179, 77,  12,
-    188, 189, 186, 11,  4,   5,   6,   44,  191, 12,  192, 199, 202, 8,   4,
-    5,   6,   7,   200, 4,   5,   6,   7,   8,   138, 209, 203, 9,   8,   39,
-    40,  41,  42,  43,  98,  50,  10,  9,   127, 173, 208, 172, 9,   185, 11,
-    46,  10,  27,  28,  29,  12,  30,  210, 31,  11,  204, 0,   193, 0,   11,
-    12,  0,   0,   0,   0,   12,  27,  28,  29,  0,   30,  0,   31,  0,   0,
-    32,  33,  34,  35,  36,  37,  38,  0,   0,   0,   91,  27,  28,  29,  0,
-    30,  99,  31,  0,   32,  33,  34,  35,  36,  37,  38,  92,  27,  28,  29,
-    0,   30,  0,   31,  58,  149, 150, 0,   0,   32,  33,  34,  35,  36,  37,
-    38,  0,   27,  28,  29,  0,   30,  0,   31,  0,   32,  33,  34,  35,  36,
-    37,  38,  101, 27,  28,  29,  0,   30,  0,   31,  39,  40,  41,  42,  43,
-    32,  33,  34,  35,  36,  37,  38,  27,  28,  29,  0,   30,  0,   31,  0,
-    0,   32,  33,  34,  35,  36,  37,  38,  27,  28,  29,  0,   30,  0,   31,
-    27,  28,  29,  0,   30,  32,  31,  34,  35,  36,  37,  38,  0,   0,   0,
-    0,   0,   0,   0,   0,   0,   32,  0,   0,   35,  36,  37,  38,  0,   0,
-    0,   35,  36,  37,  38};
-
-static const yytype_int16 yycheck[] = {
-    1,   117, 45, 6,   14, 121, 142, 12,  6,   10,  120, 12, 49,  59,  49,  16,
-    0,   52,  11, 7,   8,  9,   23,  11,  22,  14,  6,   28, 29,  6,   35,  27,
-    33,  34,  35, 36,  37, 30,  49,  49,  150, 44,  22,  38, 45,  161, 39,  40,
-    41,  42,  43, 187, 95, 99,  52,  165, 3,   49,  194, 6,  52,  107, 44,  45,
-    46,  66,  67, 33,  34, 21,  71,  72,  188, 74,  75,  68, 77,  51,  79,  124,
-    50,  37,  3,  4,   5,  6,   42,  43,  44,  45,  46,  12, 208, 28,  95,  50,
-    141, 3,   4,  5,   6,  10,  103, 104, 25,  26,  12,  3,  4,   5,   6,   10,
-    105, 158, 35, 12,  12, 49,  163, 164, 26,  21,  43,  44, 31,  32,  5,   6,
-    49,  35,  26, 15,  16, 39,  40,  136, 137, 43,  49,  35, 50,  51,  38,  49,
-    40,  138, 6,  43,  3,  4,   5,   6,   6,   49,  10,  50, 51,  12,  3,   4,
-    5,   6,   23, 24,  50, 6,   167, 12,  10,  50,  25,  26, 52,  49,  52,  50,
-    177, 50,  50, 50,  35, 26,  51,  6,   6,   186, 16,  18, 43,  44,  35,  17,
-    19,  38,  49, 20,  29, 18,  43,  3,   4,   5,   6,   3,  49,  3,   3,   50,
-    12,  3,   4,  5,   6,  30,  3,   4,   5,   6,   12,  37, 3,   50,  26,  12,
-    42,  43,  44, 45,  46, 53,  17,  35,  26,  96,  161, 51, 160, 26,  172, 43,
-    44,  35,  7,  8,   9,  49,  11,  208, 13,  43,  193, -1, 185, -1,  43,  49,
-    -1,  -1,  -1, -1,  49, 7,   8,   9,   -1,  11,  -1,  13, -1,  -1,  35,  36,
-    37,  38,  39, 40,  41, -1,  -1,  -1,  6,   7,   8,   9,  -1,  11,  51,  13,
-    -1,  35,  36, 37,  38, 39,  40,  41,  22,  7,   8,   9,  -1,  11,  -1,  13,
-    50,  15,  16, -1,  -1, 35,  36,  37,  38,  39,  40,  41, -1,  7,   8,   9,
-    -1,  11,  -1, 13,  -1, 35,  36,  37,  38,  39,  40,  41, 22,  7,   8,   9,
-    -1,  11,  -1, 13,  42, 43,  44,  45,  46,  35,  36,  37, 38,  39,  40,  41,
-    7,   8,   9,  -1,  11, -1,  13,  -1,  -1,  35,  36,  37, 38,  39,  40,  41,
-    7,   8,   9,  -1,  11, -1,  13,  7,   8,   9,   -1,  11, 35,  13,  37,  38,
-    39,  40,  41, -1,  -1, -1,  -1,  -1,  -1,  -1,  -1,  -1, 35,  -1,  -1,  38,
-    39,  40,  41, -1,  -1, -1,  38,  39,  40,  41};
+static const yytype_uint8 yytable[] =
+{
+      49,    18,   173,    87,   145,     7,     7,   148,   162,   143,
+     103,    22,   127,     7,    62,     7,    39,    14,    95,    40,
+       7,    96,    81,    43,    44,    45,    23,    24,    49,    26,
+      92,    91,    10,    10,    48,    18,    25,    19,    63,    56,
+      10,    58,    10,   170,    59,    60,   145,    10,    97,    68,
+      69,    72,    75,    77,    61,   130,   199,    53,   180,   126,
+     138,     7,    48,   209,    78,    82,    83,    84,    85,    86,
+     142,    98,   152,   122,    99,   200,   100,    91,    81,   128,
+      49,   109,   110,   104,   132,   105,   112,   113,    10,   114,
+     115,   111,   116,   166,   117,   200,     4,     5,     6,     7,
+       1,     2,   128,   144,   107,     8,   144,   108,   151,   177,
+      92,   178,   179,   119,    48,    88,    89,   153,   154,     9,
+     135,   136,   121,    64,    65,    66,    10,    67,   120,    11,
+     137,    92,   167,   168,   185,   186,   128,    12,   174,     4,
+       5,     6,     7,    13,   123,   144,   134,    92,     8,    92,
+      92,   128,   187,   188,   139,   159,   160,   210,   211,   140,
+     149,    46,     9,   150,   156,   161,   157,   169,   158,    10,
+     164,    40,    11,   163,   144,     4,     5,     6,     7,   165,
+      12,    47,   171,   106,     8,   181,    13,   182,    41,    42,
+      43,    44,    45,   190,   144,   183,   195,   191,     9,   192,
+       4,     5,     6,     7,   196,    10,   198,   193,    11,     8,
+     203,   204,    70,    71,   206,   207,    12,    41,    42,    43,
+      44,    45,    13,     9,   213,   212,     4,     5,     6,     7,
+      10,    52,   101,    11,   131,     8,    73,   176,    74,   175,
+     189,    12,     4,     5,     6,     7,   214,    13,   124,     9,
+     197,     8,     0,   208,     0,     0,    10,     0,     0,    11,
+       0,     4,     5,     6,     7,     9,     0,    12,   125,     0,
+       8,     0,    10,    13,     0,    11,     0,     0,    76,     0,
+       0,     0,     0,    12,     9,     0,     0,     0,     0,    13,
+       0,    10,     0,     0,    11,     4,     5,     6,     7,     0,
+       0,     0,    12,    47,     8,    27,    28,    29,    13,    30,
+       0,    31,     0,     0,     0,    27,    28,    29,     9,    30,
+       0,    31,    27,    28,    29,    10,    30,     0,    31,     0,
+       0,     0,     0,     0,    32,     0,    12,    35,    36,    37,
+      38,     0,    13,     0,    32,    33,    34,    35,    36,    37,
+      38,    32,    33,    34,    35,    36,    37,    38,     0,     0,
+     118,     0,     7,    27,    28,    29,    57,    30,     0,    31,
+       0,    27,    28,    29,     0,    30,     0,    31,    91,   153,
+     154,     0,     0,     0,    27,    28,    29,     0,    30,    10,
+      31,     0,    32,    33,    34,    35,    36,    37,    38,   102,
+      32,    33,    34,    35,    36,    37,    38,     0,     0,     0,
+       0,     0,     0,    32,    33,    34,    35,    36,    37,    38,
+      27,    28,    29,     0,    30,     0,    31,    27,    28,    29,
+       0,    30,     0,    31,    27,    28,    29,   141,    30,     0,
+      31,     0,    41,    42,    43,    44,    45,     0,     0,    32,
+      33,    34,    35,    36,    37,    38,    32,     0,    34,    35,
+      36,    37,    38,     0,     0,     0,    35,    36,    37,    38
+};
+
+static const yytype_int16 yycheck[] =
+{
+      18,    14,     3,    46,   121,     6,     6,   124,   143,   120,
+      58,     0,     5,     6,    12,     6,    50,     1,    50,    53,
+       6,    53,    40,    45,    46,    47,    50,    11,    46,    13,
+      48,    22,    33,    33,    18,    14,    12,    50,    36,    23,
+      33,    50,    33,   154,    28,    29,   163,    33,    21,    33,
+      34,    35,    36,    37,    30,    98,   191,    27,   169,    45,
+     108,     6,    46,   198,    39,    41,    42,    43,    44,    45,
+     118,    52,   128,    91,    51,   192,    28,    22,    96,    97,
+      98,    65,    66,    10,   102,    10,    70,    71,    33,    73,
+      74,    67,    76,   149,    78,   212,     3,     4,     5,     6,
+      34,    35,   120,   121,    12,    12,   124,    50,    53,   165,
+     128,   167,   168,    51,    98,    31,    32,    15,    16,    26,
+     104,   105,    50,     7,     8,     9,    33,    11,    21,    36,
+     106,   149,   150,   151,    51,    52,   154,    44,   156,     3,
+       4,     5,     6,    50,    33,   163,    51,   165,    12,   167,
+     168,   169,    51,    52,    10,   139,   140,    23,    24,    10,
+      51,    25,    26,    53,    50,   141,    51,    16,    51,    33,
+      51,    53,    36,    52,   192,     3,     4,     5,     6,    51,
+      44,    45,    17,    38,    12,    18,    50,   171,    43,    44,
+      45,    46,    47,    18,   212,    19,     3,   181,    26,    20,
+       3,     4,     5,     6,     3,    33,   190,    29,    36,    12,
+       3,    30,    40,    41,    51,    51,    44,    43,    44,    45,
+      46,    47,    50,    26,     3,    52,     3,     4,     5,     6,
+      33,    19,    55,    36,    99,    12,    39,   163,    41,   162,
+     175,    44,     3,     4,     5,     6,   212,    50,    25,    26,
+     189,    12,    -1,   197,    -1,    -1,    33,    -1,    -1,    36,
+      -1,     3,     4,     5,     6,    26,    -1,    44,    45,    -1,
+      12,    -1,    33,    50,    -1,    36,    -1,    -1,    39,    -1,
+      -1,    -1,    -1,    44,    26,    -1,    -1,    -1,    -1,    50,
+      -1,    33,    -1,    -1,    36,     3,     4,     5,     6,    -1,
+      -1,    -1,    44,    45,    12,     7,     8,     9,    50,    11,
+      -1,    13,    -1,    -1,    -1,     7,     8,     9,    26,    11,
+      -1,    13,     7,     8,     9,    33,    11,    -1,    13,    -1,
+      -1,    -1,    -1,    -1,    36,    -1,    44,    39,    40,    41,
+      42,    -1,    50,    -1,    36,    37,    38,    39,    40,    41,
+      42,    36,    37,    38,    39,    40,    41,    42,    -1,    -1,
+      52,    -1,     6,     7,     8,     9,    51,    11,    -1,    13,
+      -1,     7,     8,     9,    -1,    11,    -1,    13,    22,    15,
+      16,    -1,    -1,    -1,     7,     8,     9,    -1,    11,    33,
+      13,    -1,    36,    37,    38,    39,    40,    41,    42,    22,
+      36,    37,    38,    39,    40,    41,    42,    -1,    -1,    -1,
+      -1,    -1,    -1,    36,    37,    38,    39,    40,    41,    42,
+       7,     8,     9,    -1,    11,    -1,    13,     7,     8,     9,
+      -1,    11,    -1,    13,     7,     8,     9,    38,    11,    -1,
+      13,    -1,    43,    44,    45,    46,    47,    -1,    -1,    36,
+      37,    38,    39,    40,    41,    42,    36,    -1,    38,    39,
+      40,    41,    42,    -1,    -1,    -1,    39,    40,    41,    42
+};
 
 /* YYSTOS[STATE-NUM] -- The symbol kind of the accessing symbol of
    state STATE-NUM.  */
-static const yytype_int8 yystos[] = {
-    0,  33, 34, 54, 3,  4,  5,  6,  12, 26, 35, 43, 49, 55, 57, 58, 14, 49,
-    60, 61, 0,  49, 52, 49, 55, 58, 55, 7,  8,  9,  11, 13, 35, 36, 37, 38,
-    39, 40, 41, 42, 43, 44, 45, 46, 6,  25, 44, 55, 64, 68, 61, 27, 62, 63,
-    55, 56, 6,  55, 50, 49, 55, 55, 58, 12, 35, 7,  8,  9,  11, 55, 55, 39,
-    40, 55, 38, 40, 55, 38, 55, 38, 58, 58, 58, 58, 58, 49, 52, 64, 31, 32,
-    67, 6,  22, 69, 21, 51, 50, 28, 60, 51, 50, 22, 56, 10, 10, 37, 12, 49,
-    55, 55, 58, 55, 55, 55, 55, 55, 55, 25, 44, 44, 21, 49, 6,  5,  6,  77,
-    64, 62, 56, 6,  59, 50, 55, 55, 58, 56, 10, 10, 37, 6,  57, 50, 77, 57,
-    65, 66, 52, 52, 69, 15, 16, 71, 49, 50, 50, 55, 55, 58, 50, 69, 71, 51,
-    50, 6,  6,  16, 77, 17, 70, 3,  6,  69, 70, 66, 69, 69, 77, 18, 55, 19,
-    72, 50, 51, 50, 51, 72, 18, 55, 20, 29, 75, 3,  3,  75, 55, 71, 57, 73,
-    74, 3,  30, 76, 50, 50, 76, 71, 23, 24, 51, 3,  73};
+static const yytype_int8 yystos[] =
+{
+       0,    34,    35,    55,     3,     4,     5,     6,    12,    26,
+      33,    36,    44,    50,    56,    58,    59,    60,    14,    50,
+      62,    63,     0,    50,    56,    60,    56,     7,     8,     9,
+      11,    13,    36,    37,    38,    39,    40,    41,    42,    50,
+      53,    43,    44,    45,    46,    47,    25,    45,    56,    58,
+      66,    70,    63,    27,    64,    65,    56,    51,    50,    56,
+      56,    60,    12,    36,     7,     8,     9,    11,    56,    56,
+      40,    41,    56,    39,    41,    56,    39,    56,    39,    56,
+      57,    58,    60,    60,    60,    60,    60,    66,    31,    32,
+      69,    22,    58,    71,    72,    50,    53,    21,    52,    51,
+      28,    62,    22,    57,    10,    10,    38,    12,    50,    56,
+      56,    60,    56,    56,    56,    56,    56,    56,    52,    51,
+      21,    50,    58,    33,    25,    45,    45,     5,    58,    80,
+      66,    64,    58,    61,    51,    56,    56,    60,    57,    10,
+      10,    38,    57,    80,    58,    59,    67,    68,    59,    51,
+      53,    53,    71,    15,    16,    74,    50,    51,    51,    56,
+      56,    60,    74,    52,    51,    51,    71,    58,    58,    16,
+      80,    17,    73,     3,    58,    73,    68,    71,    71,    71,
+      80,    18,    56,    19,    75,    51,    52,    51,    52,    75,
+      18,    56,    20,    29,    78,     3,     3,    78,    56,    74,
+      59,    76,    77,     3,    30,    79,    51,    51,    79,    74,
+      23,    24,    52,     3,    76
+};
 
 /* YYR1[RULE-NUM] -- Symbol kind of the left-hand side of rule RULE-NUM.  */
-static const yytype_int8 yyr1[] = {
-    0,  53, 54, 54, 54, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
-    55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 56, 56,
-    57, 57, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 59,
-    59, 59, 59, 59, 60, 60, 61, 61, 62, 62, 63, 64, 64, 65, 66, 66, 67,
-    67, 68, 68, 68, 68, 68, 68, 68, 68, 68, 69, 69, 70, 70, 71, 71, 71,
-    72, 72, 73, 73, 74, 74, 74, 75, 75, 76, 76, 77, 77, 77, 77, 77, 77};
+static const yytype_int8 yyr1[] =
+{
+       0,    54,    55,    55,    55,    56,    56,    56,    56,    56,
+      56,    56,    56,    56,    56,    56,    56,    56,    56,    56,
+      56,    56,    56,    56,    56,    56,    56,    56,    56,    56,
+      56,    56,    57,    57,    58,    58,    59,    59,    60,    60,
+      60,    60,    60,    60,    60,    60,    60,    60,    60,    60,
+      60,    60,    61,    61,    61,    61,    61,    62,    62,    63,
+      63,    64,    64,    65,    66,    66,    67,    68,    68,    69,
+      69,    70,    70,    70,    70,    70,    70,    70,    70,    70,
+      71,    71,    72,    72,    73,    73,    74,    74,    74,    75,
+      75,    76,    76,    77,    77,    77,    78,    78,    79,    79,
+      80,    80,    80,    80,    80,    80
+};
 
 /* YYR2[RULE-NUM] -- Number of symbols on the right-hand side of rule RULE-NUM.  */
-static const yytype_int8 yyr2[] = {
-    0, 2, 0, 2, 2, 1, 3, 3, 2, 3, 4, 4, 3, 3, 4, 4, 4,  4, 3, 4, 5,
-    6, 3, 4, 5, 6, 5, 6, 5, 6, 3, 4, 3, 1, 1, 3, 1, 1,  1, 1, 3, 1,
-    2, 3, 3, 3, 3, 3, 4, 6, 1, 4, 6, 4, 6, 2, 4, 9, 10, 0, 2, 2, 1,
-    3, 1, 1, 3, 1, 1, 1, 2, 5, 1, 3, 4, 5, 5, 6, 2, 1,  0, 2, 0, 5,
-    6, 0, 3, 3, 1, 1, 2, 2, 0, 2, 0, 2, 1, 2, 3, 4, 3,  4};
-
-enum
+static const yytype_int8 yyr2[] =
 {
-    YYENOMEM = -2
+       0,     2,     0,     2,     2,     1,     3,     3,     2,     3,
+       4,     4,     3,     3,     4,     4,     4,     4,     3,     4,
+       5,     6,     3,     4,     5,     6,     5,     6,     5,     6,
+       3,     4,     3,     1,     1,     1,     1,     3,     1,     1,
+       1,     1,     3,     1,     2,     3,     3,     3,     3,     3,
+       4,     6,     1,     4,     6,     4,     6,     2,     4,     9,
+      10,     0,     2,     2,     1,     3,     1,     1,     3,     1,
+       1,     1,     2,     5,     1,     3,     4,     5,     5,     6,
+       2,     1,     1,     2,     0,     2,     0,     5,     6,     0,
+       3,     3,     1,     1,     2,     2,     0,     2,     0,     2,
+       1,     2,     3,     4,     3,     4
 };
 
-#define yyerrok (yyerrstatus = 0)
-#define yyclearin (yychar = YYEMPTY)
-
-#define YYACCEPT goto yyacceptlab
-#define YYABORT goto yyabortlab
-#define YYERROR goto yyerrorlab
-#define YYNOMEM goto yyexhaustedlab
-
-#define YYRECOVERING() (!!yyerrstatus)
-
-#define YYBACKUP(Token, Value)                                                 \
-    do                                                                         \
-        if (yychar == YYEMPTY)                                                 \
-        {                                                                      \
-            yychar = (Token);                                                  \
-            yylval = (Value);                                                  \
-            YYPOPSTACK(yylen);                                                 \
-            yystate = *yyssp;                                                  \
-            goto yybackup;                                                     \
-        }                                                                      \
-        else                                                                   \
-        {                                                                      \
-            yyerror(context, YY_("syntax error: cannot back up"));             \
-            YYERROR;                                                           \
-        }                                                                      \
-    while (0)
+
+enum { YYENOMEM = -2 };
+
+#define yyerrok         (yyerrstatus = 0)
+#define yyclearin       (yychar = YYEMPTY)
+
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab
+#define YYNOMEM         goto yyexhaustedlab
+
+
+#define YYRECOVERING()  (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)                                    \
+  do                                                              \
+    if (yychar == YYEMPTY)                                        \
+      {                                                           \
+        yychar = (Token);                                         \
+        yylval = (Value);                                         \
+        YYPOPSTACK (yylen);                                       \
+        yystate = *yyssp;                                         \
+        goto yybackup;                                            \
+      }                                                           \
+    else                                                          \
+      {                                                           \
+        yyerror (context, YY_("syntax error: cannot back up")); \
+        YYERROR;                                                  \
+      }                                                           \
+  while (0)
 
 /* Backward compatibility with an undocumented macro.
    Use YYerror or YYUNDEF. */
 #define YYERRCODE YYUNDEF
 
+
 /* Enable debugging if requested.  */
 #if YYDEBUG
 
-#ifndef YYFPRINTF
-#include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-#define YYFPRINTF fprintf
-#endif
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    YYFPRINTF Args;                             \
+} while (0)
+
+
+
+
+# define YY_SYMBOL_PRINT(Title, Kind, Value, Location)                    \
+do {                                                                      \
+  if (yydebug)                                                            \
+    {                                                                     \
+      YYFPRINTF (stderr, "%s ", Title);                                   \
+      yy_symbol_print (stderr,                                            \
+                  Kind, Value, context); \
+      YYFPRINTF (stderr, "\n");                                           \
+    }                                                                     \
+} while (0)
 
-#define YYDPRINTF(Args)                                                        \
-    do                                                                         \
-    {                                                                          \
-        if (yydebug)                                                           \
-            YYFPRINTF Args;                                                    \
-    } while (0)
-
-#define YY_SYMBOL_PRINT(Title, Kind, Value, Location)                          \
-    do                                                                         \
-    {                                                                          \
-        if (yydebug)                                                           \
-        {                                                                      \
-            YYFPRINTF(stderr, "%s ", Title);                                   \
-            yy_symbol_print(stderr, Kind, Value, context);                     \
-            YYFPRINTF(stderr, "\n");                                           \
-        }                                                                      \
-    } while (0)
 
 /*-----------------------------------.
 | Print this symbol's value on YYO.  |
 `-----------------------------------*/
 
-static void yy_symbol_value_print(FILE *yyo, yysymbol_kind_t yykind,
-                                  YYSTYPE const *const yyvaluep,
-                                  swq_parse_context *context)
+static void
+yy_symbol_value_print (FILE *yyo,
+                       yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep, swq_parse_context *context)
 {
-    FILE *yyoutput = yyo;
-    YY_USE(yyoutput);
-    YY_USE(context);
-    if (!yyvaluep)
-        return;
-    YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-    YY_USE(yykind);
-    YY_IGNORE_MAYBE_UNINITIALIZED_END
+  FILE *yyoutput = yyo;
+  YY_USE (yyoutput);
+  YY_USE (context);
+  if (!yyvaluep)
+    return;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  YY_USE (yykind);
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
 
+
 /*---------------------------.
 | Print this symbol on YYO.  |
 `---------------------------*/
 
-static void yy_symbol_print(FILE *yyo, yysymbol_kind_t yykind,
-                            YYSTYPE const *const yyvaluep,
-                            swq_parse_context *context)
+static void
+yy_symbol_print (FILE *yyo,
+                 yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep, swq_parse_context *context)
 {
-    YYFPRINTF(yyo, "%s %s (", yykind < YYNTOKENS ? "token" : "nterm",
-              yysymbol_name(yykind));
+  YYFPRINTF (yyo, "%s %s (",
+             yykind < YYNTOKENS ? "token" : "nterm", yysymbol_name (yykind));
 
-    yy_symbol_value_print(yyo, yykind, yyvaluep, context);
-    YYFPRINTF(yyo, ")");
+  yy_symbol_value_print (yyo, yykind, yyvaluep, context);
+  YYFPRINTF (yyo, ")");
 }
 
 /*------------------------------------------------------------------.
@@ -938,66 +1012,69 @@ static void yy_symbol_print(FILE *yyo, yysymbol_kind_t yykind,
 | TOP (included).                                                   |
 `------------------------------------------------------------------*/
 
-static void yy_stack_print(yy_state_t *yybottom, yy_state_t *yytop)
+static void
+yy_stack_print (yy_state_t *yybottom, yy_state_t *yytop)
 {
-    YYFPRINTF(stderr, "Stack now");
-    for (; yybottom <= yytop; yybottom++)
+  YYFPRINTF (stderr, "Stack now");
+  for (; yybottom <= yytop; yybottom++)
     {
-        int yybot = *yybottom;
-        YYFPRINTF(stderr, " %d", yybot);
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
     }
-    YYFPRINTF(stderr, "\n");
+  YYFPRINTF (stderr, "\n");
 }
 
-#define YY_STACK_PRINT(Bottom, Top)                                            \
-    do                                                                         \
-    {                                                                          \
-        if (yydebug)                                                           \
-            yy_stack_print((Bottom), (Top));                                   \
-    } while (0)
+# define YY_STACK_PRINT(Bottom, Top)                            \
+do {                                                            \
+  if (yydebug)                                                  \
+    yy_stack_print ((Bottom), (Top));                           \
+} while (0)
+
 
 /*------------------------------------------------.
 | Report that the YYRULE is going to be reduced.  |
 `------------------------------------------------*/
 
-static void yy_reduce_print(yy_state_t *yyssp, YYSTYPE *yyvsp, int yyrule,
-                            swq_parse_context *context)
+static void
+yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp,
+                 int yyrule, swq_parse_context *context)
 {
-    int yylno = yyrline[yyrule];
-    int yynrhs = yyr2[yyrule];
-    int yyi;
-    YYFPRINTF(stderr, "Reducing stack by rule %d (line %d):\n", yyrule - 1,
-              yylno);
-    /* The symbols being reduced.  */
-    for (yyi = 0; yyi < yynrhs; yyi++)
+  int yylno = yyrline[yyrule];
+  int yynrhs = yyr2[yyrule];
+  int yyi;
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %d):\n",
+             yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
     {
-        YYFPRINTF(stderr, "   $%d = ", yyi + 1);
-        yy_symbol_print(stderr, YY_ACCESSING_SYMBOL(+yyssp[yyi + 1 - yynrhs]),
-                        &yyvsp[(yyi + 1) - (yynrhs)], context);
-        YYFPRINTF(stderr, "\n");
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr,
+                       YY_ACCESSING_SYMBOL (+yyssp[yyi + 1 - yynrhs]),
+                       &yyvsp[(yyi + 1) - (yynrhs)], context);
+      YYFPRINTF (stderr, "\n");
     }
 }
 
-#define YY_REDUCE_PRINT(Rule)                                                  \
-    do                                                                         \
-    {                                                                          \
-        if (yydebug)                                                           \
-            yy_reduce_print(yyssp, yyvsp, Rule, context);                      \
-    } while (0)
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \
+    yy_reduce_print (yyssp, yyvsp, Rule, context); \
+} while (0)
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
 int yydebug;
 #else /* !YYDEBUG */
-#define YYDPRINTF(Args) ((void)0)
-#define YY_SYMBOL_PRINT(Title, Kind, Value, Location)
-#define YY_STACK_PRINT(Bottom, Top)
-#define YY_REDUCE_PRINT(Rule)
+# define YYDPRINTF(Args) ((void) 0)
+# define YY_SYMBOL_PRINT(Title, Kind, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
 #endif /* !YYDEBUG */
 
+
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
 #ifndef YYINITDEPTH
-#define YYINITDEPTH 200
+# define YYINITDEPTH 200
 #endif
 
 /* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
@@ -1008,14 +1085,15 @@ int yydebug;
    evaluated with infinite-precision integer arithmetic.  */
 
 #ifndef YYMAXDEPTH
-#define YYMAXDEPTH 10000
+# define YYMAXDEPTH 10000
 #endif
 
+
 /* Context of a parse error.  */
 typedef struct
 {
-    yy_state_t *yyssp;
-    yysymbol_kind_t yytoken;
+  yy_state_t *yyssp;
+  yysymbol_kind_t yytoken;
 } yypcontext_t;
 
 /* Put in YYARG at most YYARGN of the expected tokens given the
@@ -1024,71 +1102,77 @@ typedef struct
    be less than YYNTOKENS).  Return YYENOMEM on memory exhaustion.
    Return 0 if there are more than YYARGN expected tokens, yet fill
    YYARG up to YYARGN. */
-static int yypcontext_expected_tokens(const yypcontext_t *yyctx,
-                                      yysymbol_kind_t yyarg[], int yyargn)
+static int
+yypcontext_expected_tokens (const yypcontext_t *yyctx,
+                            yysymbol_kind_t yyarg[], int yyargn)
 {
-    /* Actual size of YYARG. */
-    int yycount = 0;
-    int yyn = yypact[+*yyctx->yyssp];
-    if (!yypact_value_is_default(yyn))
+  /* Actual size of YYARG. */
+  int yycount = 0;
+  int yyn = yypact[+*yyctx->yyssp];
+  if (!yypact_value_is_default (yyn))
     {
-        /* Start YYX at -YYN if negative to avoid negative indexes in
+      /* Start YYX at -YYN if negative to avoid negative indexes in
          YYCHECK.  In other words, skip the first -YYN actions for
          this state because they are default actions.  */
-        int yyxbegin = yyn < 0 ? -yyn : 0;
-        /* Stay within bounds of both yycheck and yytname.  */
-        int yychecklim = YYLAST - yyn + 1;
-        int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-        int yyx;
-        for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-            if (yycheck[yyx + yyn] == yyx && yyx != YYSYMBOL_YYerror &&
-                !yytable_value_is_error(yytable[yyx + yyn]))
-            {
-                if (!yyarg)
-                    ++yycount;
-                else if (yycount == yyargn)
-                    return 0;
-                else
-                    yyarg[yycount++] = YY_CAST(yysymbol_kind_t, yyx);
-            }
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yyx;
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+        if (yycheck[yyx + yyn] == yyx && yyx != YYSYMBOL_YYerror
+            && !yytable_value_is_error (yytable[yyx + yyn]))
+          {
+            if (!yyarg)
+              ++yycount;
+            else if (yycount == yyargn)
+              return 0;
+            else
+              yyarg[yycount++] = YY_CAST (yysymbol_kind_t, yyx);
+          }
     }
-    if (yyarg && yycount == 0 && 0 < yyargn)
-        yyarg[0] = YYSYMBOL_YYEMPTY;
-    return yycount;
+  if (yyarg && yycount == 0 && 0 < yyargn)
+    yyarg[0] = YYSYMBOL_YYEMPTY;
+  return yycount;
 }
 
+
+
+
 #ifndef yystrlen
-#if defined __GLIBC__ && defined _STRING_H
-#define yystrlen(S) (YY_CAST(YYPTRDIFF_T, strlen(S)))
-#else
+# if defined __GLIBC__ && defined _STRING_H
+#  define yystrlen(S) (YY_CAST (YYPTRDIFF_T, strlen (S)))
+# else
 /* Return the length of YYSTR.  */
-static YYPTRDIFF_T yystrlen(const char *yystr)
+static YYPTRDIFF_T
+yystrlen (const char *yystr)
 {
-    YYPTRDIFF_T yylen;
-    for (yylen = 0; yystr[yylen]; yylen++)
-        continue;
-    return yylen;
+  YYPTRDIFF_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
+    continue;
+  return yylen;
 }
-#endif
+# endif
 #endif
 
 #ifndef yystpcpy
-#if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-#define yystpcpy stpcpy
-#else
+# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#  define yystpcpy stpcpy
+# else
 /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
    YYDEST.  */
-static char *yystpcpy(char *yydest, const char *yysrc)
+static char *
+yystpcpy (char *yydest, const char *yysrc)
 {
-    char *yyd = yydest;
-    const char *yys = yysrc;
+  char *yyd = yydest;
+  const char *yys = yysrc;
 
-    while ((*yyd++ = *yys++) != '\0')
-        continue;
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
 
-    return yyd - 1;
+  return yyd - 1;
 }
-#endif
+# endif
 #endif
 
 #ifndef yytnamerr
@@ -1099,53 +1183,56 @@ static char *yystpcpy(char *yydest, const char *yysrc)
    backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
    null, do not copy; instead, return the length of what the result
    would have been.  */
-static YYPTRDIFF_T yytnamerr(char *yyres, const char *yystr)
+static YYPTRDIFF_T
+yytnamerr (char *yyres, const char *yystr)
 {
-    if (*yystr == '"')
+  if (*yystr == '"')
     {
-        YYPTRDIFF_T yyn = 0;
-        char const *yyp = yystr;
-        for (;;)
-            switch (*++yyp)
-            {
-                case '\'':
-                case ',':
-                    goto do_not_strip_quotes;
-
-                case '\\':
-                    if (*++yyp != '\\')
-                        goto do_not_strip_quotes;
-                    else
-                        goto append;
-
-                append:
-                default:
-                    if (yyres)
-                        yyres[yyn] = *yyp;
-                    yyn++;
-                    break;
-
-                case '"':
-                    if (yyres)
-                        yyres[yyn] = '\0';
-                    return yyn;
-            }
-    do_not_strip_quotes:;
+      YYPTRDIFF_T yyn = 0;
+      char const *yyp = yystr;
+      for (;;)
+        switch (*++yyp)
+          {
+          case '\'':
+          case ',':
+            goto do_not_strip_quotes;
+
+          case '\\':
+            if (*++yyp != '\\')
+              goto do_not_strip_quotes;
+            else
+              goto append;
+
+          append:
+          default:
+            if (yyres)
+              yyres[yyn] = *yyp;
+            yyn++;
+            break;
+
+          case '"':
+            if (yyres)
+              yyres[yyn] = '\0';
+            return yyn;
+          }
+    do_not_strip_quotes: ;
     }
 
-    if (yyres)
-        return yystpcpy(yyres, yystr) - yyres;
-    else
-        return yystrlen(yystr);
+  if (yyres)
+    return yystpcpy (yyres, yystr) - yyres;
+  else
+    return yystrlen (yystr);
 }
 #endif
 
-static int yy_syntax_error_arguments(const yypcontext_t *yyctx,
-                                     yysymbol_kind_t yyarg[], int yyargn)
+
+static int
+yy_syntax_error_arguments (const yypcontext_t *yyctx,
+                           yysymbol_kind_t yyarg[], int yyargn)
 {
-    /* Actual size of YYARG. */
-    int yycount = 0;
-    /* There are many possibilities here to consider:
+  /* Actual size of YYARG. */
+  int yycount = 0;
+  /* There are many possibilities here to consider:
      - If this state is a consistent state with a default action, then
        the only way this function was invoked is if the default action
        is an error action.  In that case, don't check for expected
@@ -1168,20 +1255,20 @@ static int yy_syntax_error_arguments(const yypcontext_t *yyctx,
        one exception: it will still contain any token that will not be
        accepted due to an error action in a later state.
   */
-    if (yyctx->yytoken != YYSYMBOL_YYEMPTY)
+  if (yyctx->yytoken != YYSYMBOL_YYEMPTY)
     {
-        int yyn;
-        if (yyarg)
-            yyarg[yycount] = yyctx->yytoken;
-        ++yycount;
-        yyn = yypcontext_expected_tokens(yyctx, yyarg ? yyarg + 1 : yyarg,
-                                         yyargn - 1);
-        if (yyn == YYENOMEM)
-            return YYENOMEM;
-        else
-            yycount += yyn;
+      int yyn;
+      if (yyarg)
+        yyarg[yycount] = yyctx->yytoken;
+      ++yycount;
+      yyn = yypcontext_expected_tokens (yyctx,
+                                        yyarg ? yyarg + 1 : yyarg, yyargn - 1);
+      if (yyn == YYENOMEM)
+        return YYENOMEM;
+      else
+        yycount += yyn;
     }
-    return yycount;
+  return yycount;
 }
 
 /* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
@@ -1192,187 +1279,187 @@ static int yy_syntax_error_arguments(const yypcontext_t *yyctx,
    not large enough to hold the message.  In that case, also set
    *YYMSG_ALLOC to the required number of bytes.  Return YYENOMEM if the
    required number of bytes is too large to store.  */
-static int yysyntax_error(YYPTRDIFF_T *yymsg_alloc, char **yymsg,
-                          const yypcontext_t *yyctx)
+static int
+yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg,
+                const yypcontext_t *yyctx)
 {
-    enum
-    {
-        YYARGS_MAX = 5
-    };
-
-    /* Internationalized format string. */
-    const char *yyformat = YY_NULLPTR;
-    /* Arguments of yyformat: reported tokens (one for the "unexpected",
+  enum { YYARGS_MAX = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = YY_NULLPTR;
+  /* Arguments of yyformat: reported tokens (one for the "unexpected",
      one per "expected"). */
-    yysymbol_kind_t yyarg[YYARGS_MAX];
-    /* Cumulated lengths of YYARG.  */
-    YYPTRDIFF_T yysize = 0;
+  yysymbol_kind_t yyarg[YYARGS_MAX];
+  /* Cumulated lengths of YYARG.  */
+  YYPTRDIFF_T yysize = 0;
 
-    /* Actual size of YYARG. */
-    int yycount = yy_syntax_error_arguments(yyctx, yyarg, YYARGS_MAX);
-    if (yycount == YYENOMEM)
-        return YYENOMEM;
+  /* Actual size of YYARG. */
+  int yycount = yy_syntax_error_arguments (yyctx, yyarg, YYARGS_MAX);
+  if (yycount == YYENOMEM)
+    return YYENOMEM;
 
-    switch (yycount)
+  switch (yycount)
     {
-#define YYCASE_(N, S)                                                          \
-    case N:                                                                    \
-        yyformat = S;                                                          \
+#define YYCASE_(N, S)                       \
+      case N:                               \
+        yyformat = S;                       \
         break
-        default: /* Avoid compiler warnings. */
-            YYCASE_(0, YY_("syntax error"));
-            YYCASE_(1, YY_("syntax error, unexpected %s"));
-            YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-            YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-            YYCASE_(
-                4,
-                YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-            YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or "
-                           "%s or %s"));
+    default: /* Avoid compiler warnings. */
+      YYCASE_(0, YY_("syntax error"));
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
 #undef YYCASE_
     }
 
-    /* Compute error message size.  Don't count the "%s"s, but reserve
+  /* Compute error message size.  Don't count the "%s"s, but reserve
      room for the terminator.  */
-    yysize = yystrlen(yyformat) - 2 * yycount + 1;
-    {
-        int yyi;
-        for (yyi = 0; yyi < yycount; ++yyi)
-        {
-            YYPTRDIFF_T yysize1 =
-                yysize + yytnamerr(YY_NULLPTR, yytname[yyarg[yyi]]);
-            if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
-                yysize = yysize1;
-            else
-                return YYENOMEM;
-        }
-    }
+  yysize = yystrlen (yyformat) - 2 * yycount + 1;
+  {
+    int yyi;
+    for (yyi = 0; yyi < yycount; ++yyi)
+      {
+        YYPTRDIFF_T yysize1
+          = yysize + yytnamerr (YY_NULLPTR, yytname[yyarg[yyi]]);
+        if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
+          yysize = yysize1;
+        else
+          return YYENOMEM;
+      }
+  }
 
-    if (*yymsg_alloc < yysize)
+  if (*yymsg_alloc < yysize)
     {
-        *yymsg_alloc = 2 * yysize;
-        if (!(yysize <= *yymsg_alloc && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-            *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-        return -1;
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return -1;
     }
 
-    /* Avoid sprintf, as that infringes on the user's name space.
+  /* Avoid sprintf, as that infringes on the user's name space.
      Don't have undefined behavior even if the translation
      produced a string with the wrong number of "%s"s.  */
-    {
-        char *yyp = *yymsg;
-        int yyi = 0;
-        while ((*yyp = *yyformat) != '\0')
-            if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
-            {
-                yyp += yytnamerr(yyp, yytname[yyarg[yyi++]]);
-                yyformat += 2;
-            }
-            else
-            {
-                ++yyp;
-                ++yyformat;
-            }
-    }
-    return 0;
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yytname[yyarg[yyi++]]);
+          yyformat += 2;
+        }
+      else
+        {
+          ++yyp;
+          ++yyformat;
+        }
+  }
+  return 0;
 }
 
+
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
-static void yydestruct(const char *yymsg, yysymbol_kind_t yykind,
-                       YYSTYPE *yyvaluep, swq_parse_context *context)
+static void
+yydestruct (const char *yymsg,
+            yysymbol_kind_t yykind, YYSTYPE *yyvaluep, swq_parse_context *context)
 {
-    YY_USE(yyvaluep);
-    YY_USE(context);
-    if (!yymsg)
-        yymsg = "Deleting";
-    YY_SYMBOL_PRINT(yymsg, yykind, yyvaluep, yylocationp);
-
-    YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-    switch (yykind)
+  YY_USE (yyvaluep);
+  YY_USE (context);
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yykind, yyvaluep, yylocationp);
+
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  switch (yykind)
     {
-        case YYSYMBOL_SWQT_INTEGER_NUMBER: /* "integer number"  */
-        {
-            delete (*yyvaluep);
-        }
+    case YYSYMBOL_SWQT_INTEGER_NUMBER: /* "integer number"  */
+            { delete (*yyvaluep); }
         break;
 
-        case YYSYMBOL_SWQT_FLOAT_NUMBER: /* "floating point number"  */
-        {
-            delete (*yyvaluep);
-        }
+    case YYSYMBOL_SWQT_FLOAT_NUMBER: /* "floating point number"  */
+            { delete (*yyvaluep); }
         break;
 
-        case YYSYMBOL_SWQT_STRING: /* "string"  */
-        {
-            delete (*yyvaluep);
-        }
+    case YYSYMBOL_SWQT_STRING: /* "string"  */
+            { delete (*yyvaluep); }
         break;
 
-        case YYSYMBOL_SWQT_IDENTIFIER: /* "identifier"  */
-        {
-            delete (*yyvaluep);
-        }
+    case YYSYMBOL_SWQT_IDENTIFIER: /* "identifier"  */
+            { delete (*yyvaluep); }
         break;
 
-        case YYSYMBOL_value_expr: /* value_expr  */
-        {
-            delete (*yyvaluep);
-        }
+    case YYSYMBOL_SWQT_HIDDEN: /* "HIDDEN"  */
+            { delete (*yyvaluep); }
         break;
 
-        case YYSYMBOL_value_expr_list: /* value_expr_list  */
-        {
-            delete (*yyvaluep);
-        }
+    case YYSYMBOL_value_expr: /* value_expr  */
+            { delete (*yyvaluep); }
         break;
 
-        case YYSYMBOL_field_value: /* field_value  */
-        {
-            delete (*yyvaluep);
-        }
+    case YYSYMBOL_value_expr_list: /* value_expr_list  */
+            { delete (*yyvaluep); }
         break;
 
-        case YYSYMBOL_value_expr_non_logical: /* value_expr_non_logical  */
-        {
-            delete (*yyvaluep);
-        }
+    case YYSYMBOL_identifier: /* identifier  */
+            { delete (*yyvaluep); }
         break;
 
-        case YYSYMBOL_type_def: /* type_def  */
-        {
-            delete (*yyvaluep);
-        }
+    case YYSYMBOL_field_value: /* field_value  */
+            { delete (*yyvaluep); }
         break;
 
-        case YYSYMBOL_table_def: /* table_def  */
-        {
-            delete (*yyvaluep);
-        }
+    case YYSYMBOL_value_expr_non_logical: /* value_expr_non_logical  */
+            { delete (*yyvaluep); }
         break;
 
-        default:
-            break;
+    case YYSYMBOL_type_def: /* type_def  */
+            { delete (*yyvaluep); }
+        break;
+
+    case YYSYMBOL_as_clause: /* as_clause  */
+            { delete (*yyvaluep); }
+        break;
+
+    case YYSYMBOL_as_clause_with_hidden: /* as_clause_with_hidden  */
+            { delete (*yyvaluep); }
+        break;
+
+    case YYSYMBOL_table_def: /* table_def  */
+            { delete (*yyvaluep); }
+        break;
+
+      default:
+        break;
     }
-    YY_IGNORE_MAYBE_UNINITIALIZED_END
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
 
+
+
+
+
+
 /*----------.
 | yyparse.  |
 `----------*/
 
-int yyparse(swq_parse_context *context)
+int
+yyparse (swq_parse_context *context)
 {
-    /* Lookahead token kind.  */
-    int yychar;
+/* Lookahead token kind.  */
+int yychar;
+
 
-    /* The semantic value of the lookahead symbol.  */
-    /* Default value used for initialization, for pacifying older GCCs
+/* The semantic value of the lookahead symbol.  */
+/* Default value used for initialization, for pacifying older GCCs
    or non-GCC compilers.  */
-    YY_INITIAL_VALUE(static YYSTYPE yyval_default;)
-    YYSTYPE yylval YY_INITIAL_VALUE(= yyval_default);
+YY_INITIAL_VALUE (static YYSTYPE yyval_default;)
+YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
 
     /* Number of syntax errors so far.  */
     int yynerrs = 0;
@@ -1397,207 +1484,215 @@ int yyparse(swq_parse_context *context)
     YYSTYPE *yyvs = yyvsa;
     YYSTYPE *yyvsp = yyvs;
 
-    int yyn;
-    /* The return value of yyparse.  */
-    int yyresult;
-    /* Lookahead symbol kind.  */
-    yysymbol_kind_t yytoken = YYSYMBOL_YYEMPTY;
-    /* The variables used to return semantic value and location from the
+  int yyn;
+  /* The return value of yyparse.  */
+  int yyresult;
+  /* Lookahead symbol kind.  */
+  yysymbol_kind_t yytoken = YYSYMBOL_YYEMPTY;
+  /* The variables used to return semantic value and location from the
      action routines.  */
-    YYSTYPE yyval;
+  YYSTYPE yyval;
 
-    /* Buffer for error messages, and its allocated size.  */
-    char yymsgbuf[128];
-    char *yymsg = yymsgbuf;
-    YYPTRDIFF_T yymsg_alloc = sizeof yymsgbuf;
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYPTRDIFF_T yymsg_alloc = sizeof yymsgbuf;
 
-#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
-    /* The number of symbols on the RHS of the reduced rule.
+  /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
-    int yylen = 0;
+  int yylen = 0;
 
-    YYDPRINTF((stderr, "Starting parse\n"));
+  YYDPRINTF ((stderr, "Starting parse\n"));
 
-    yychar = YYEMPTY; /* Cause a token to be read.  */
+  yychar = YYEMPTY; /* Cause a token to be read.  */
+
+  goto yysetstate;
 
-    goto yysetstate;
 
 /*------------------------------------------------------------.
 | yynewstate -- push a new state, which is found in yystate.  |
 `------------------------------------------------------------*/
 yynewstate:
-    /* In all cases, when you get here, the value and location stacks
+  /* In all cases, when you get here, the value and location stacks
      have just been pushed.  So pushing a state here evens the stacks.  */
-    yyssp++;
+  yyssp++;
+
 
 /*--------------------------------------------------------------------.
 | yysetstate -- set current state (the top of the stack) to yystate.  |
 `--------------------------------------------------------------------*/
 yysetstate:
-    YYDPRINTF((stderr, "Entering state %d\n", yystate));
-    YY_IGNORE_USELESS_CAST_BEGIN
-    *yyssp = YY_CAST(yy_state_t, yystate);
-    YY_IGNORE_USELESS_CAST_END
-    YY_STACK_PRINT(yyss, yyssp);
-
-    if (yyss + yystacksize - 1 <= yyssp)
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+  YY_ASSERT (0 <= yystate && yystate < YYNSTATES);
+  YY_IGNORE_USELESS_CAST_BEGIN
+  *yyssp = YY_CAST (yy_state_t, yystate);
+  YY_IGNORE_USELESS_CAST_END
+  YY_STACK_PRINT (yyss, yyssp);
+
+  if (yyss + yystacksize - 1 <= yyssp)
 #if !defined yyoverflow && !defined YYSTACK_RELOCATE
-        YYNOMEM;
+    YYNOMEM;
 #else
     {
-        /* Get the current used size of the three stacks, in elements.  */
-        YYPTRDIFF_T yysize = yyssp - yyss + 1;
+      /* Get the current used size of the three stacks, in elements.  */
+      YYPTRDIFF_T yysize = yyssp - yyss + 1;
 
-#if defined yyoverflow
-        {
-            /* Give user a chance to reallocate the stack.  Use copies of
+# if defined yyoverflow
+      {
+        /* Give user a chance to reallocate the stack.  Use copies of
            these so that the &'s don't force the real ones into
            memory.  */
-            yy_state_t *yyss1 = yyss;
-            YYSTYPE *yyvs1 = yyvs;
+        yy_state_t *yyss1 = yyss;
+        YYSTYPE *yyvs1 = yyvs;
 
-            /* Each stack pointer address is followed by the size of the
+        /* Each stack pointer address is followed by the size of the
            data in use in that stack, in bytes.  This used to be a
            conditional around just the two extra args, but that might
            be undefined if yyoverflow is a macro.  */
-            yyoverflow(YY_("memory exhausted"), &yyss1,
-                       yysize * YYSIZEOF(*yyssp), &yyvs1,
-                       yysize * YYSIZEOF(*yyvsp), &yystacksize);
-            yyss = yyss1;
-            yyvs = yyvs1;
-        }
-#else /* defined YYSTACK_RELOCATE */
-        /* Extend the stack our own way.  */
-        if (YYMAXDEPTH <= yystacksize)
-            YYNOMEM;
-        yystacksize *= 2;
-        if (YYMAXDEPTH < yystacksize)
-            yystacksize = YYMAXDEPTH;
-
-        {
-            yy_state_t *yyss1 = yyss;
-            union yyalloc *yyptr = YY_CAST(
-                union yyalloc *,
-                YYSTACK_ALLOC(YY_CAST(YYSIZE_T, YYSTACK_BYTES(yystacksize))));
-            if (!yyptr)
-                YYNOMEM;
-            YYSTACK_RELOCATE(yyss_alloc, yyss);
-            YYSTACK_RELOCATE(yyvs_alloc, yyvs);
-#undef YYSTACK_RELOCATE
-            if (yyss1 != yyssa)
-                YYSTACK_FREE(yyss1);
-        }
-#endif
-
-        yyssp = yyss + yysize - 1;
-        yyvsp = yyvs + yysize - 1;
-
-        YY_IGNORE_USELESS_CAST_BEGIN
-        YYDPRINTF((stderr, "Stack size increased to %ld\n",
-                   YY_CAST(long, yystacksize)));
-        YY_IGNORE_USELESS_CAST_END
-
-        if (yyss + yystacksize - 1 <= yyssp)
-            YYABORT;
+        yyoverflow (YY_("memory exhausted"),
+                    &yyss1, yysize * YYSIZEOF (*yyssp),
+                    &yyvs1, yysize * YYSIZEOF (*yyvsp),
+                    &yystacksize);
+        yyss = yyss1;
+        yyvs = yyvs1;
+      }
+# else /* defined YYSTACK_RELOCATE */
+      /* Extend the stack our own way.  */
+      if (YYMAXDEPTH <= yystacksize)
+        YYNOMEM;
+      yystacksize *= 2;
+      if (YYMAXDEPTH < yystacksize)
+        yystacksize = YYMAXDEPTH;
+
+      {
+        yy_state_t *yyss1 = yyss;
+        union yyalloc *yyptr =
+          YY_CAST (union yyalloc *,
+                   YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize))));
+        if (! yyptr)
+          YYNOMEM;
+        YYSTACK_RELOCATE (yyss_alloc, yyss);
+        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+#  undef YYSTACK_RELOCATE
+        if (yyss1 != yyssa)
+          YYSTACK_FREE (yyss1);
+      }
+# endif
+
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+
+      YY_IGNORE_USELESS_CAST_BEGIN
+      YYDPRINTF ((stderr, "Stack size increased to %ld\n",
+                  YY_CAST (long, yystacksize)));
+      YY_IGNORE_USELESS_CAST_END
+
+      if (yyss + yystacksize - 1 <= yyssp)
+        YYABORT;
     }
 #endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
 
-    if (yystate == YYFINAL)
-        YYACCEPT;
 
-    goto yybackup;
+  if (yystate == YYFINAL)
+    YYACCEPT;
+
+  goto yybackup;
+
 
 /*-----------.
 | yybackup.  |
 `-----------*/
 yybackup:
-    /* Do appropriate processing given the current state.  Read a
+  /* Do appropriate processing given the current state.  Read a
      lookahead token if we need one and don't already have one.  */
 
-    /* First try to decide what to do without reference to lookahead token.  */
-    yyn = yypact[yystate];
-    if (yypact_value_is_default(yyn))
-        goto yydefault;
+  /* First try to decide what to do without reference to lookahead token.  */
+  yyn = yypact[yystate];
+  if (yypact_value_is_default (yyn))
+    goto yydefault;
 
-    /* Not known => get a lookahead token if don't already have one.  */
+  /* Not known => get a lookahead token if don't already have one.  */
 
-    /* YYCHAR is either empty, or end-of-input, or a valid lookahead.  */
-    if (yychar == YYEMPTY)
+  /* YYCHAR is either empty, or end-of-input, or a valid lookahead.  */
+  if (yychar == YYEMPTY)
     {
-        YYDPRINTF((stderr, "Reading a token\n"));
-        yychar = yylex(&yylval, context);
+      YYDPRINTF ((stderr, "Reading a token\n"));
+      yychar = yylex (&yylval, context);
     }
 
-    if (yychar <= END)
+  if (yychar <= END)
     {
-        yychar = END;
-        yytoken = YYSYMBOL_YYEOF;
-        YYDPRINTF((stderr, "Now at end of input.\n"));
+      yychar = END;
+      yytoken = YYSYMBOL_YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
     }
-    else if (yychar == YYerror)
+  else if (yychar == YYerror)
     {
-        /* The scanner already issued an error message, process directly
+      /* The scanner already issued an error message, process directly
          to error recovery.  But do not keep the error token as
          lookahead, it is too special and may lead us to an endless
          loop in error recovery. */
-        yychar = YYUNDEF;
-        yytoken = YYSYMBOL_YYerror;
-        goto yyerrlab1;
+      yychar = YYUNDEF;
+      yytoken = YYSYMBOL_YYerror;
+      goto yyerrlab1;
     }
-    else
+  else
     {
-        yytoken = YYTRANSLATE(yychar);
-        YY_SYMBOL_PRINT("Next token is", yytoken, &yylval, &yylloc);
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
     }
 
-    /* If the proper action on seeing token YYTOKEN is to reduce or to
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
      detect an error, take that action.  */
-    yyn += yytoken;
-    if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
-        goto yydefault;
-    yyn = yytable[yyn];
-    if (yyn <= 0)
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+    goto yydefault;
+  yyn = yytable[yyn];
+  if (yyn <= 0)
     {
-        if (yytable_value_is_error(yyn))
-            goto yyerrlab;
-        yyn = -yyn;
-        goto yyreduce;
+      if (yytable_value_is_error (yyn))
+        goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
     }
 
-    /* Count tokens shifted since error; after three, turn off error
+  /* Count tokens shifted since error; after three, turn off error
      status.  */
-    if (yyerrstatus)
-        yyerrstatus--;
+  if (yyerrstatus)
+    yyerrstatus--;
 
-    /* Shift the lookahead token.  */
-    YY_SYMBOL_PRINT("Shifting", yytoken, &yylval, &yylloc);
-    yystate = yyn;
-    YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-    *++yyvsp = yylval;
-    YY_IGNORE_MAYBE_UNINITIALIZED_END
+  /* Shift the lookahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+  yystate = yyn;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
+  goto yynewstate;
 
-    /* Discard the shifted token.  */
-    yychar = YYEMPTY;
-    goto yynewstate;
 
 /*-----------------------------------------------------------.
 | yydefault -- do the default action for the current state.  |
 `-----------------------------------------------------------*/
 yydefault:
-    yyn = yydefact[yystate];
-    if (yyn == 0)
-        goto yyerrlab;
-    goto yyreduce;
+  yyn = yydefact[yystate];
+  if (yyn == 0)
+    goto yyerrlab;
+  goto yyreduce;
+
 
 /*-----------------------------.
 | yyreduce -- do a reduction.  |
 `-----------------------------*/
 yyreduce:
-    /* yyn is the number of a rule to reduce with.  */
-    yylen = yyr2[yyn];
+  /* yyn is the number of a rule to reduce with.  */
+  yylen = yyr2[yyn];
 
-    /* If YYLEN is nonzero, implement the default value of the action:
+  /* If YYLEN is nonzero, implement the default value of the action:
      '$$ = $1'.
 
      Otherwise, the following line sets YYVAL to garbage.
@@ -1605,316 +1700,317 @@ int yyparse(swq_parse_context *context)
      users should not rely upon it.  Assigning to YYVAL
      unconditionally makes the parser a bit smaller, and it avoids a
      GCC warning that YYVAL may be used uninitialized.  */
-    yyval = yyvsp[1 - yylen];
+  yyval = yyvsp[1-yylen];
+
 
-    YY_REDUCE_PRINT(yyn);
-    switch (yyn)
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
     {
-        case 3: /* input: SWQT_VALUE_START value_expr  */
+  case 3: /* input: SWQT_VALUE_START value_expr  */
         {
             context->poRoot = yyvsp[0];
             swq_fixup(context);
         }
-        break;
+    break;
 
-        case 4: /* input: SWQT_SELECT_START select_statement  */
+  case 4: /* input: SWQT_SELECT_START select_statement  */
         {
             context->poRoot = yyvsp[0];
             // swq_fixup() must be done by caller
         }
-        break;
+    break;
 
-        case 5: /* value_expr: value_expr_non_logical  */
+  case 5: /* value_expr: value_expr_non_logical  */
         {
             yyval = yyvsp[0];
         }
-        break;
+    break;
 
-        case 6: /* value_expr: value_expr "AND" value_expr  */
+  case 6: /* value_expr: value_expr "AND" value_expr  */
         {
-            yyval = swq_create_and_or_or(SWQ_AND, yyvsp[-2], yyvsp[0]);
+            yyval = swq_create_and_or_or( SWQ_AND, yyvsp[-2], yyvsp[0] );
         }
-        break;
+    break;
 
-        case 7: /* value_expr: value_expr "OR" value_expr  */
+  case 7: /* value_expr: value_expr "OR" value_expr  */
         {
-            yyval = swq_create_and_or_or(SWQ_OR, yyvsp[-2], yyvsp[0]);
+            yyval = swq_create_and_or_or( SWQ_OR, yyvsp[-2], yyvsp[0] );
         }
-        break;
+    break;
 
-        case 8: /* value_expr: "NOT" value_expr  */
+  case 8: /* value_expr: "NOT" value_expr  */
         {
-            yyval = new swq_expr_node(SWQ_NOT);
+            yyval = new swq_expr_node( SWQ_NOT );
             yyval->field_type = SWQ_BOOLEAN;
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 9: /* value_expr: value_expr '=' value_expr  */
+  case 9: /* value_expr: value_expr '=' value_expr  */
         {
-            yyval = new swq_expr_node(SWQ_EQ);
+            yyval = new swq_expr_node( SWQ_EQ );
             yyval->field_type = SWQ_BOOLEAN;
-            yyval->PushSubExpression(yyvsp[-2]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval->PushSubExpression( yyvsp[-2] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 10: /* value_expr: value_expr '<' '>' value_expr  */
+  case 10: /* value_expr: value_expr '<' '>' value_expr  */
         {
-            yyval = new swq_expr_node(SWQ_NE);
+            yyval = new swq_expr_node( SWQ_NE );
             yyval->field_type = SWQ_BOOLEAN;
-            yyval->PushSubExpression(yyvsp[-3]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval->PushSubExpression( yyvsp[-3] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 11: /* value_expr: value_expr '!' '=' value_expr  */
+  case 11: /* value_expr: value_expr '!' '=' value_expr  */
         {
-            yyval = new swq_expr_node(SWQ_NE);
+            yyval = new swq_expr_node( SWQ_NE );
             yyval->field_type = SWQ_BOOLEAN;
-            yyval->PushSubExpression(yyvsp[-3]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval->PushSubExpression( yyvsp[-3] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 12: /* value_expr: value_expr '<' value_expr  */
+  case 12: /* value_expr: value_expr '<' value_expr  */
         {
-            yyval = new swq_expr_node(SWQ_LT);
+            yyval = new swq_expr_node( SWQ_LT );
             yyval->field_type = SWQ_BOOLEAN;
-            yyval->PushSubExpression(yyvsp[-2]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval->PushSubExpression( yyvsp[-2] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 13: /* value_expr: value_expr '>' value_expr  */
+  case 13: /* value_expr: value_expr '>' value_expr  */
         {
-            yyval = new swq_expr_node(SWQ_GT);
+            yyval = new swq_expr_node( SWQ_GT );
             yyval->field_type = SWQ_BOOLEAN;
-            yyval->PushSubExpression(yyvsp[-2]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval->PushSubExpression( yyvsp[-2] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 14: /* value_expr: value_expr '<' '=' value_expr  */
+  case 14: /* value_expr: value_expr '<' '=' value_expr  */
         {
-            yyval = new swq_expr_node(SWQ_LE);
+            yyval = new swq_expr_node( SWQ_LE );
             yyval->field_type = SWQ_BOOLEAN;
-            yyval->PushSubExpression(yyvsp[-3]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval->PushSubExpression( yyvsp[-3] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 15: /* value_expr: value_expr '=' '<' value_expr  */
+  case 15: /* value_expr: value_expr '=' '<' value_expr  */
         {
-            yyval = new swq_expr_node(SWQ_LE);
+            yyval = new swq_expr_node( SWQ_LE );
             yyval->field_type = SWQ_BOOLEAN;
-            yyval->PushSubExpression(yyvsp[-3]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval->PushSubExpression( yyvsp[-3] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 16: /* value_expr: value_expr '=' '>' value_expr  */
+  case 16: /* value_expr: value_expr '=' '>' value_expr  */
         {
-            yyval = new swq_expr_node(SWQ_LE);
+            yyval = new swq_expr_node( SWQ_LE );
             yyval->field_type = SWQ_BOOLEAN;
-            yyval->PushSubExpression(yyvsp[-3]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval->PushSubExpression( yyvsp[-3] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 17: /* value_expr: value_expr '>' '=' value_expr  */
+  case 17: /* value_expr: value_expr '>' '=' value_expr  */
         {
-            yyval = new swq_expr_node(SWQ_GE);
+            yyval = new swq_expr_node( SWQ_GE );
             yyval->field_type = SWQ_BOOLEAN;
-            yyval->PushSubExpression(yyvsp[-3]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval->PushSubExpression( yyvsp[-3] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 18: /* value_expr: value_expr "LIKE" value_expr  */
+  case 18: /* value_expr: value_expr "LIKE" value_expr  */
         {
-            yyval = new swq_expr_node(SWQ_LIKE);
+            yyval = new swq_expr_node( SWQ_LIKE );
             yyval->field_type = SWQ_BOOLEAN;
-            yyval->PushSubExpression(yyvsp[-2]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval->PushSubExpression( yyvsp[-2] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 19: /* value_expr: value_expr "NOT" "LIKE" value_expr  */
+  case 19: /* value_expr: value_expr "NOT" "LIKE" value_expr  */
         {
-            swq_expr_node *like = new swq_expr_node(SWQ_LIKE);
+            swq_expr_node *like = new swq_expr_node( SWQ_LIKE );
             like->field_type = SWQ_BOOLEAN;
-            like->PushSubExpression(yyvsp[-3]);
-            like->PushSubExpression(yyvsp[0]);
+            like->PushSubExpression( yyvsp[-3] );
+            like->PushSubExpression( yyvsp[0] );
 
-            yyval = new swq_expr_node(SWQ_NOT);
+            yyval = new swq_expr_node( SWQ_NOT );
             yyval->field_type = SWQ_BOOLEAN;
-            yyval->PushSubExpression(like);
+            yyval->PushSubExpression( like );
         }
-        break;
+    break;
 
-        case 20: /* value_expr: value_expr "LIKE" value_expr "ESCAPE" value_expr  */
+  case 20: /* value_expr: value_expr "LIKE" value_expr "ESCAPE" value_expr  */
         {
-            yyval = new swq_expr_node(SWQ_LIKE);
+            yyval = new swq_expr_node( SWQ_LIKE );
             yyval->field_type = SWQ_BOOLEAN;
-            yyval->PushSubExpression(yyvsp[-4]);
-            yyval->PushSubExpression(yyvsp[-2]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval->PushSubExpression( yyvsp[-4] );
+            yyval->PushSubExpression( yyvsp[-2] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 21: /* value_expr: value_expr "NOT" "LIKE" value_expr "ESCAPE" value_expr  */
+  case 21: /* value_expr: value_expr "NOT" "LIKE" value_expr "ESCAPE" value_expr  */
         {
-            swq_expr_node *like = new swq_expr_node(SWQ_LIKE);
+            swq_expr_node *like = new swq_expr_node( SWQ_LIKE );
             like->field_type = SWQ_BOOLEAN;
-            like->PushSubExpression(yyvsp[-5]);
-            like->PushSubExpression(yyvsp[-2]);
-            like->PushSubExpression(yyvsp[0]);
+            like->PushSubExpression( yyvsp[-5] );
+            like->PushSubExpression( yyvsp[-2] );
+            like->PushSubExpression( yyvsp[0] );
 
-            yyval = new swq_expr_node(SWQ_NOT);
+            yyval = new swq_expr_node( SWQ_NOT );
             yyval->field_type = SWQ_BOOLEAN;
-            yyval->PushSubExpression(like);
+            yyval->PushSubExpression( like );
         }
-        break;
+    break;
 
-        case 22: /* value_expr: value_expr "ILIKE" value_expr  */
+  case 22: /* value_expr: value_expr "ILIKE" value_expr  */
         {
-            yyval = new swq_expr_node(SWQ_ILIKE);
+            yyval = new swq_expr_node( SWQ_ILIKE );
             yyval->field_type = SWQ_BOOLEAN;
-            yyval->PushSubExpression(yyvsp[-2]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval->PushSubExpression( yyvsp[-2] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 23: /* value_expr: value_expr "NOT" "ILIKE" value_expr  */
+  case 23: /* value_expr: value_expr "NOT" "ILIKE" value_expr  */
         {
-            swq_expr_node *like = new swq_expr_node(SWQ_ILIKE);
+            swq_expr_node *like = new swq_expr_node( SWQ_ILIKE );
             like->field_type = SWQ_BOOLEAN;
-            like->PushSubExpression(yyvsp[-3]);
-            like->PushSubExpression(yyvsp[0]);
+            like->PushSubExpression( yyvsp[-3] );
+            like->PushSubExpression( yyvsp[0] );
 
-            yyval = new swq_expr_node(SWQ_NOT);
+            yyval = new swq_expr_node( SWQ_NOT );
             yyval->field_type = SWQ_BOOLEAN;
-            yyval->PushSubExpression(like);
+            yyval->PushSubExpression( like );
         }
-        break;
+    break;
 
-        case 24: /* value_expr: value_expr "ILIKE" value_expr "ESCAPE" value_expr  */
+  case 24: /* value_expr: value_expr "ILIKE" value_expr "ESCAPE" value_expr  */
         {
-            yyval = new swq_expr_node(SWQ_ILIKE);
+            yyval = new swq_expr_node( SWQ_ILIKE );
             yyval->field_type = SWQ_BOOLEAN;
-            yyval->PushSubExpression(yyvsp[-4]);
-            yyval->PushSubExpression(yyvsp[-2]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval->PushSubExpression( yyvsp[-4] );
+            yyval->PushSubExpression( yyvsp[-2] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 25: /* value_expr: value_expr "NOT" "ILIKE" value_expr "ESCAPE" value_expr  */
+  case 25: /* value_expr: value_expr "NOT" "ILIKE" value_expr "ESCAPE" value_expr  */
         {
-            swq_expr_node *like = new swq_expr_node(SWQ_ILIKE);
+            swq_expr_node *like = new swq_expr_node( SWQ_ILIKE );
             like->field_type = SWQ_BOOLEAN;
-            like->PushSubExpression(yyvsp[-5]);
-            like->PushSubExpression(yyvsp[-2]);
-            like->PushSubExpression(yyvsp[0]);
+            like->PushSubExpression( yyvsp[-5] );
+            like->PushSubExpression( yyvsp[-2] );
+            like->PushSubExpression( yyvsp[0] );
 
-            yyval = new swq_expr_node(SWQ_NOT);
+            yyval = new swq_expr_node( SWQ_NOT );
             yyval->field_type = SWQ_BOOLEAN;
-            yyval->PushSubExpression(like);
+            yyval->PushSubExpression( like );
         }
-        break;
+    break;
 
-        case 26: /* value_expr: value_expr "IN" '(' value_expr_list ')'  */
+  case 26: /* value_expr: value_expr "IN" '(' value_expr_list ')'  */
         {
             yyval = yyvsp[-1];
             yyval->field_type = SWQ_BOOLEAN;
             yyval->nOperation = SWQ_IN;
-            yyval->PushSubExpression(yyvsp[-4]);
+            yyval->PushSubExpression( yyvsp[-4] );
             yyval->ReverseSubExpressions();
         }
-        break;
+    break;
 
-        case 27: /* value_expr: value_expr "NOT" "IN" '(' value_expr_list ')'  */
+  case 27: /* value_expr: value_expr "NOT" "IN" '(' value_expr_list ')'  */
         {
             swq_expr_node *in = yyvsp[-1];
             in->field_type = SWQ_BOOLEAN;
             in->nOperation = SWQ_IN;
-            in->PushSubExpression(yyvsp[-5]);
+            in->PushSubExpression( yyvsp[-5] );
             in->ReverseSubExpressions();
 
-            yyval = new swq_expr_node(SWQ_NOT);
+            yyval = new swq_expr_node( SWQ_NOT );
             yyval->field_type = SWQ_BOOLEAN;
-            yyval->PushSubExpression(in);
+            yyval->PushSubExpression( in );
         }
-        break;
+    break;
 
-        case 28: /* value_expr: value_expr "BETWEEN" value_expr_non_logical "AND" value_expr_non_logical  */
+  case 28: /* value_expr: value_expr "BETWEEN" value_expr_non_logical "AND" value_expr_non_logical  */
         {
-            yyval = new swq_expr_node(SWQ_BETWEEN);
+            yyval = new swq_expr_node( SWQ_BETWEEN );
             yyval->field_type = SWQ_BOOLEAN;
-            yyval->PushSubExpression(yyvsp[-4]);
-            yyval->PushSubExpression(yyvsp[-2]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval->PushSubExpression( yyvsp[-4] );
+            yyval->PushSubExpression( yyvsp[-2] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 29: /* value_expr: value_expr "NOT" "BETWEEN" value_expr_non_logical "AND" value_expr_non_logical  */
+  case 29: /* value_expr: value_expr "NOT" "BETWEEN" value_expr_non_logical "AND" value_expr_non_logical  */
         {
-            swq_expr_node *between = new swq_expr_node(SWQ_BETWEEN);
+            swq_expr_node *between = new swq_expr_node( SWQ_BETWEEN );
             between->field_type = SWQ_BOOLEAN;
-            between->PushSubExpression(yyvsp[-5]);
-            between->PushSubExpression(yyvsp[-2]);
-            between->PushSubExpression(yyvsp[0]);
+            between->PushSubExpression( yyvsp[-5] );
+            between->PushSubExpression( yyvsp[-2] );
+            between->PushSubExpression( yyvsp[0] );
 
-            yyval = new swq_expr_node(SWQ_NOT);
+            yyval = new swq_expr_node( SWQ_NOT );
             yyval->field_type = SWQ_BOOLEAN;
-            yyval->PushSubExpression(between);
+            yyval->PushSubExpression( between );
         }
-        break;
+    break;
 
-        case 30: /* value_expr: value_expr "IS" "NULL"  */
+  case 30: /* value_expr: value_expr "IS" "NULL"  */
         {
-            yyval = new swq_expr_node(SWQ_ISNULL);
+            yyval = new swq_expr_node( SWQ_ISNULL );
             yyval->field_type = SWQ_BOOLEAN;
-            yyval->PushSubExpression(yyvsp[-2]);
+            yyval->PushSubExpression( yyvsp[-2] );
         }
-        break;
+    break;
 
-        case 31: /* value_expr: value_expr "IS" "NOT" "NULL"  */
+  case 31: /* value_expr: value_expr "IS" "NOT" "NULL"  */
         {
-            swq_expr_node *isnull = new swq_expr_node(SWQ_ISNULL);
+            swq_expr_node *isnull = new swq_expr_node( SWQ_ISNULL );
             isnull->field_type = SWQ_BOOLEAN;
-            isnull->PushSubExpression(yyvsp[-3]);
+            isnull->PushSubExpression( yyvsp[-3] );
 
-            yyval = new swq_expr_node(SWQ_NOT);
+            yyval = new swq_expr_node( SWQ_NOT );
             yyval->field_type = SWQ_BOOLEAN;
-            yyval->PushSubExpression(isnull);
+            yyval->PushSubExpression( isnull );
         }
-        break;
+    break;
 
-        case 32: /* value_expr_list: value_expr ',' value_expr_list  */
+  case 32: /* value_expr_list: value_expr ',' value_expr_list  */
         {
             yyval = yyvsp[0];
-            yyvsp[0]->PushSubExpression(yyvsp[-2]);
+            yyvsp[0]->PushSubExpression( yyvsp[-2] );
         }
-        break;
+    break;
 
-        case 33: /* value_expr_list: value_expr  */
-        {
-            yyval = new swq_expr_node(SWQ_ARGUMENT_LIST); /* temporary value */
-            yyval->PushSubExpression(yyvsp[0]);
+  case 33: /* value_expr_list: value_expr  */
+            {
+            yyval = new swq_expr_node( SWQ_ARGUMENT_LIST ); /* temporary value */
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 34: /* field_value: "identifier"  */
+  case 36: /* field_value: identifier  */
         {
             yyval = yyvsp[0];  // validation deferred.
             yyval->eNodeType = SNT_COLUMN;
             yyval->field_index = -1;
             yyval->table_index = -1;
         }
-        break;
+    break;
 
-        case 35: /* field_value: "identifier" '.' "identifier"  */
+  case 37: /* field_value: identifier '.' identifier  */
         {
             yyval = yyvsp[-2];  // validation deferred.
             yyval->eNodeType = SNT_COLUMN;
@@ -1925,63 +2021,61 @@ int yyparse(swq_parse_context *context)
             delete yyvsp[0];
             yyvsp[0] = nullptr;
         }
-        break;
+    break;
 
-        case 36: /* value_expr_non_logical: "integer number"  */
+  case 38: /* value_expr_non_logical: "integer number"  */
         {
             yyval = yyvsp[0];
         }
-        break;
+    break;
 
-        case 37: /* value_expr_non_logical: "floating point number"  */
+  case 39: /* value_expr_non_logical: "floating point number"  */
         {
             yyval = yyvsp[0];
         }
-        break;
+    break;
 
-        case 38: /* value_expr_non_logical: "string"  */
+  case 40: /* value_expr_non_logical: "string"  */
         {
             yyval = yyvsp[0];
         }
-        break;
+    break;
 
-        case 39: /* value_expr_non_logical: field_value  */
+  case 41: /* value_expr_non_logical: field_value  */
         {
             yyval = yyvsp[0];
         }
-        break;
+    break;
 
-        case 40: /* value_expr_non_logical: '(' value_expr ')'  */
+  case 42: /* value_expr_non_logical: '(' value_expr ')'  */
         {
             yyval = yyvsp[-1];
         }
-        break;
+    break;
 
-        case 41: /* value_expr_non_logical: "NULL"  */
+  case 43: /* value_expr_non_logical: "NULL"  */
         {
-            yyval = new swq_expr_node(static_cast<const char *>(nullptr));
+            yyval = new swq_expr_node(static_cast<const char*>(nullptr));
         }
-        break;
+    break;
 
-        case 42: /* value_expr_non_logical: '-' value_expr_non_logical  */
+  case 44: /* value_expr_non_logical: '-' value_expr_non_logical  */
         {
             if (yyvsp[0]->eNodeType == SNT_CONSTANT)
             {
-                if (yyvsp[0]->field_type == SWQ_FLOAT &&
+                if( yyvsp[0]->field_type == SWQ_FLOAT &&
                     yyvsp[0]->string_value &&
-                    strcmp(yyvsp[0]->string_value, "9223372036854775808") == 0)
+                    strcmp(yyvsp[0]->string_value, "9223372036854775808") == 0 )
                 {
                     yyval = yyvsp[0];
                     yyval->field_type = SWQ_INTEGER64;
                     yyval->int_value = std::numeric_limits<GIntBig>::min();
-                    yyval->float_value = static_cast<double>(
-                        std::numeric_limits<GIntBig>::min());
+                    yyval->float_value = static_cast<double>(std::numeric_limits<GIntBig>::min());
                 }
                 // - (-9223372036854775808) cannot be represented on int64
                 // the classic overflow is that its negation is itself.
-                else if (yyvsp[0]->field_type == SWQ_INTEGER64 &&
-                         yyvsp[0]->int_value ==
-                             std::numeric_limits<GIntBig>::min())
+                else if( yyvsp[0]->field_type == SWQ_INTEGER64 &&
+                         yyvsp[0]->int_value == std::numeric_limits<GIntBig>::min() )
                 {
                     yyval = yyvsp[0];
                 }
@@ -1994,61 +2088,61 @@ int yyparse(swq_parse_context *context)
             }
             else
             {
-                yyval = new swq_expr_node(SWQ_MULTIPLY);
-                yyval->PushSubExpression(new swq_expr_node(-1));
-                yyval->PushSubExpression(yyvsp[0]);
+                yyval = new swq_expr_node( SWQ_MULTIPLY );
+                yyval->PushSubExpression( new swq_expr_node(-1) );
+                yyval->PushSubExpression( yyvsp[0] );
             }
         }
-        break;
+    break;
 
-        case 43: /* value_expr_non_logical: value_expr_non_logical '+' value_expr_non_logical  */
+  case 45: /* value_expr_non_logical: value_expr_non_logical '+' value_expr_non_logical  */
         {
-            yyval = new swq_expr_node(SWQ_ADD);
-            yyval->PushSubExpression(yyvsp[-2]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval = new swq_expr_node( SWQ_ADD );
+            yyval->PushSubExpression( yyvsp[-2] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 44: /* value_expr_non_logical: value_expr_non_logical '-' value_expr_non_logical  */
+  case 46: /* value_expr_non_logical: value_expr_non_logical '-' value_expr_non_logical  */
         {
-            yyval = new swq_expr_node(SWQ_SUBTRACT);
-            yyval->PushSubExpression(yyvsp[-2]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval = new swq_expr_node( SWQ_SUBTRACT );
+            yyval->PushSubExpression( yyvsp[-2] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 45: /* value_expr_non_logical: value_expr_non_logical '*' value_expr_non_logical  */
+  case 47: /* value_expr_non_logical: value_expr_non_logical '*' value_expr_non_logical  */
         {
-            yyval = new swq_expr_node(SWQ_MULTIPLY);
-            yyval->PushSubExpression(yyvsp[-2]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval = new swq_expr_node( SWQ_MULTIPLY );
+            yyval->PushSubExpression( yyvsp[-2] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 46: /* value_expr_non_logical: value_expr_non_logical '/' value_expr_non_logical  */
+  case 48: /* value_expr_non_logical: value_expr_non_logical '/' value_expr_non_logical  */
         {
-            yyval = new swq_expr_node(SWQ_DIVIDE);
-            yyval->PushSubExpression(yyvsp[-2]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval = new swq_expr_node( SWQ_DIVIDE );
+            yyval->PushSubExpression( yyvsp[-2] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 47: /* value_expr_non_logical: value_expr_non_logical '%' value_expr_non_logical  */
+  case 49: /* value_expr_non_logical: value_expr_non_logical '%' value_expr_non_logical  */
         {
-            yyval = new swq_expr_node(SWQ_MODULUS);
-            yyval->PushSubExpression(yyvsp[-2]);
-            yyval->PushSubExpression(yyvsp[0]);
+            yyval = new swq_expr_node( SWQ_MODULUS );
+            yyval->PushSubExpression( yyvsp[-2] );
+            yyval->PushSubExpression( yyvsp[0] );
         }
-        break;
+    break;
 
-        case 48: /* value_expr_non_logical: "identifier" '(' value_expr_list ')'  */
+  case 50: /* value_expr_non_logical: identifier '(' value_expr_list ')'  */
         {
             const swq_operation *poOp =
-                swq_op_registrar::GetOperator(yyvsp[-3]->string_value);
+                    swq_op_registrar::GetOperator( yyvsp[-3]->string_value );
 
-            if (poOp == nullptr)
+            if( poOp == nullptr )
             {
-                if (context->bAcceptCustomFuncs)
+                if( context->bAcceptCustomFuncs )
                 {
                     yyval = yyvsp[-1];
                     yyval->eNodeType = SNT_OPERATION;
@@ -2059,9 +2153,9 @@ int yyparse(swq_parse_context *context)
                 }
                 else
                 {
-                    CPLError(CE_Failure, CPLE_AppDefined,
-                             "Undefined function '%s' used.",
-                             yyvsp[-3]->string_value);
+                    CPLError( CE_Failure, CPLE_AppDefined,
+                                    "Undefined function '%s' used.",
+                                    yyvsp[-3]->string_value );
                     delete yyvsp[-3];
                     delete yyvsp[-1];
                     YYERROR;
@@ -2076,125 +2170,122 @@ int yyparse(swq_parse_context *context)
                 delete yyvsp[-3];
             }
         }
-        break;
+    break;
 
-        case 49: /* value_expr_non_logical: "CAST" '(' value_expr "AS" type_def ')'  */
+  case 51: /* value_expr_non_logical: "CAST" '(' value_expr "AS" type_def ')'  */
         {
             yyval = yyvsp[-1];
-            yyval->PushSubExpression(yyvsp[-3]);
+            yyval->PushSubExpression( yyvsp[-3] );
             yyval->ReverseSubExpressions();
         }
-        break;
+    break;
 
-        case 50: /* type_def: "identifier"  */
-        {
-            yyval = new swq_expr_node(SWQ_CAST);
-            yyval->PushSubExpression(yyvsp[0]);
-        }
-        break;
-
-        case 51: /* type_def: "identifier" '(' "integer number" ')'  */
-        {
-            yyval = new swq_expr_node(SWQ_CAST);
-            yyval->PushSubExpression(yyvsp[-1]);
-            yyval->PushSubExpression(yyvsp[-3]);
-        }
-        break;
+  case 52: /* type_def: identifier  */
+    {
+        yyval = new swq_expr_node( SWQ_CAST );
+        yyval->PushSubExpression( yyvsp[0] );
+    }
+    break;
 
-        case 52: /* type_def: "identifier" '(' "integer number" ',' "integer number" ')'  */
-        {
-            yyval = new swq_expr_node(SWQ_CAST);
-            yyval->PushSubExpression(yyvsp[-1]);
-            yyval->PushSubExpression(yyvsp[-3]);
-            yyval->PushSubExpression(yyvsp[-5]);
-        }
-        break;
+  case 53: /* type_def: identifier '(' "integer number" ')'  */
+    {
+        yyval = new swq_expr_node( SWQ_CAST );
+        yyval->PushSubExpression( yyvsp[-1] );
+        yyval->PushSubExpression( yyvsp[-3] );
+    }
+    break;
 
-        case 53: /* type_def: "identifier" '(' "identifier" ')'  */
-        {
-            OGRwkbGeometryType eType =
-                OGRFromOGCGeomType(yyvsp[-1]->string_value);
-            if (!EQUAL(yyvsp[-3]->string_value, "GEOMETRY") ||
-                (wkbFlatten(eType) == wkbUnknown &&
-                 !STARTS_WITH_CI(yyvsp[-1]->string_value, "GEOMETRY")))
-            {
-                yyerror(context, "syntax error");
-                delete yyvsp[-3];
-                delete yyvsp[-1];
-                YYERROR;
-            }
-            yyval = new swq_expr_node(SWQ_CAST);
-            yyval->PushSubExpression(yyvsp[-1]);
-            yyval->PushSubExpression(yyvsp[-3]);
-        }
-        break;
+  case 54: /* type_def: identifier '(' "integer number" ',' "integer number" ')'  */
+    {
+        yyval = new swq_expr_node( SWQ_CAST );
+        yyval->PushSubExpression( yyvsp[-1] );
+        yyval->PushSubExpression( yyvsp[-3] );
+        yyval->PushSubExpression( yyvsp[-5] );
+    }
+    break;
 
-        case 54: /* type_def: "identifier" '(' "identifier" ',' "integer number" ')'  */
+  case 55: /* type_def: identifier '(' identifier ')'  */
+    {
+        OGRwkbGeometryType eType = OGRFromOGCGeomType(yyvsp[-1]->string_value);
+        if( !EQUAL(yyvsp[-3]->string_value, "GEOMETRY") ||
+            (wkbFlatten(eType) == wkbUnknown &&
+            !STARTS_WITH_CI(yyvsp[-1]->string_value, "GEOMETRY")) )
         {
-            OGRwkbGeometryType eType =
-                OGRFromOGCGeomType(yyvsp[-3]->string_value);
-            if (!EQUAL(yyvsp[-5]->string_value, "GEOMETRY") ||
-                (wkbFlatten(eType) == wkbUnknown &&
-                 !STARTS_WITH_CI(yyvsp[-3]->string_value, "GEOMETRY")))
-            {
-                yyerror(context, "syntax error");
-                delete yyvsp[-5];
-                delete yyvsp[-3];
-                delete yyvsp[-1];
-                YYERROR;
-            }
-            yyval = new swq_expr_node(SWQ_CAST);
-            yyval->PushSubExpression(yyvsp[-1]);
-            yyval->PushSubExpression(yyvsp[-3]);
-            yyval->PushSubExpression(yyvsp[-5]);
+            yyerror (context, "syntax error");
+            delete yyvsp[-3];
+            delete yyvsp[-1];
+            YYERROR;
         }
-        break;
+        yyval = new swq_expr_node( SWQ_CAST );
+        yyval->PushSubExpression( yyvsp[-1] );
+        yyval->PushSubExpression( yyvsp[-3] );
+    }
+    break;
 
-        case 57: /* select_core: "SELECT" select_field_list "FROM" table_def opt_joins opt_where opt_order_by opt_limit opt_offset  */
+  case 56: /* type_def: identifier '(' identifier ',' "integer number" ')'  */
+    {
+        OGRwkbGeometryType eType = OGRFromOGCGeomType(yyvsp[-3]->string_value);
+        if( !EQUAL(yyvsp[-5]->string_value, "GEOMETRY") ||
+            (wkbFlatten(eType) == wkbUnknown &&
+            !STARTS_WITH_CI(yyvsp[-3]->string_value, "GEOMETRY")) )
         {
+            yyerror (context, "syntax error");
             delete yyvsp[-5];
+            delete yyvsp[-3];
+            delete yyvsp[-1];
+            YYERROR;
         }
-        break;
+        yyval = new swq_expr_node( SWQ_CAST );
+        yyval->PushSubExpression( yyvsp[-1] );
+        yyval->PushSubExpression( yyvsp[-3] );
+        yyval->PushSubExpression( yyvsp[-5] );
+    }
+    break;
 
-        case 58: /* select_core: "SELECT" "DISTINCT" select_field_list "FROM" table_def opt_joins opt_where opt_order_by opt_limit opt_offset  */
-        {
-            context->poCurSelect->query_mode = SWQM_DISTINCT_LIST;
-            delete yyvsp[-5];
-        }
-        break;
+  case 59: /* select_core: "SELECT" select_field_list "FROM" table_def opt_joins opt_where opt_order_by opt_limit opt_offset  */
+    {
+        delete yyvsp[-5];
+    }
+    break;
 
-        case 61: /* union_all: "UNION" "ALL"  */
-        {
-            swq_select *poNewSelect = new swq_select();
-            context->poCurSelect->PushUnionAll(poNewSelect);
-            context->poCurSelect = poNewSelect;
-        }
-        break;
+  case 60: /* select_core: "SELECT" "DISTINCT" select_field_list "FROM" table_def opt_joins opt_where opt_order_by opt_limit opt_offset  */
+    {
+        context->poCurSelect->query_mode = SWQM_DISTINCT_LIST;
+        delete yyvsp[-5];
+    }
+    break;
+
+  case 63: /* union_all: "UNION" "ALL"  */
+    {
+        swq_select* poNewSelect = new swq_select();
+        context->poCurSelect->PushUnionAll(poNewSelect);
+        context->poCurSelect = poNewSelect;
+    }
+    break;
 
-        case 64: /* exclude_field: field_value  */
+  case 66: /* exclude_field: field_value  */
         {
-            if (!context->poCurSelect->PushExcludeField(yyvsp[0]))
+            if ( !context->poCurSelect->PushExcludeField( yyvsp[0] ) )
             {
                 delete yyvsp[0];
                 YYERROR;
             }
         }
-        break;
+    break;
 
-        case 69: /* column_spec: value_expr  */
+  case 71: /* column_spec: value_expr  */
         {
-            if (!context->poCurSelect->PushField(yyvsp[0]))
+            if( !context->poCurSelect->PushField( yyvsp[0], nullptr, false, false ) )
             {
                 delete yyvsp[0];
                 YYERROR;
             }
         }
-        break;
+    break;
 
-        case 70: /* column_spec: value_expr as_clause  */
+  case 72: /* column_spec: value_expr as_clause_with_hidden  */
         {
-            if (!context->poCurSelect->PushField(yyvsp[-1],
-                                                 yyvsp[0]->string_value))
+            if( !context->poCurSelect->PushField( yyvsp[-1], yyvsp[0]->string_value, false, yyvsp[0]->bHidden ) )
             {
                 delete yyvsp[-1];
                 delete yyvsp[0];
@@ -2202,41 +2293,41 @@ int yyparse(swq_parse_context *context)
             }
             delete yyvsp[0];
         }
-        break;
+    break;
 
-        case 71: /* column_spec: '*' except_or_exclude '(' exclude_field_list ')'  */
+  case 73: /* column_spec: '*' except_or_exclude '(' exclude_field_list ')'  */
         {
             swq_expr_node *poNode = new swq_expr_node();
             poNode->eNodeType = SNT_COLUMN;
-            poNode->string_value = CPLStrdup("*");
+            poNode->string_value = CPLStrdup( "*" );
             poNode->table_index = -1;
             poNode->field_index = -1;
 
-            if (!context->poCurSelect->PushField(poNode))
+            if( !context->poCurSelect->PushField( poNode, nullptr, false, false ) )
             {
                 delete poNode;
                 YYERROR;
             }
         }
-        break;
+    break;
 
-        case 72: /* column_spec: '*'  */
+  case 74: /* column_spec: '*'  */
         {
             swq_expr_node *poNode = new swq_expr_node();
             poNode->eNodeType = SNT_COLUMN;
-            poNode->string_value = CPLStrdup("*");
+            poNode->string_value = CPLStrdup( "*" );
             poNode->table_index = -1;
             poNode->field_index = -1;
 
-            if (!context->poCurSelect->PushField(poNode))
+            if( !context->poCurSelect->PushField( poNode, nullptr, false, false ) )
             {
                 delete poNode;
                 YYERROR;
             }
         }
-        break;
+    break;
 
-        case 73: /* column_spec: "identifier" '.' '*'  */
+  case 75: /* column_spec: identifier '.' '*'  */
         {
             CPLString osTableName = yyvsp[-2]->string_value;
 
@@ -2245,26 +2336,27 @@ int yyparse(swq_parse_context *context)
 
             swq_expr_node *poNode = new swq_expr_node();
             poNode->eNodeType = SNT_COLUMN;
-            poNode->table_name = CPLStrdup(osTableName);
-            poNode->string_value = CPLStrdup("*");
+            poNode->table_name = CPLStrdup(osTableName );
+            poNode->string_value = CPLStrdup( "*" );
             poNode->table_index = -1;
             poNode->field_index = -1;
 
-            if (!context->poCurSelect->PushField(poNode))
+            if( !context->poCurSelect->PushField( poNode, nullptr, false, false ) )
             {
                 delete poNode;
                 YYERROR;
             }
         }
-        break;
+    break;
 
-        case 74: /* column_spec: "identifier" '(' '*' ')'  */
+  case 76: /* column_spec: identifier '(' '*' ')'  */
         {
-            // special case for COUNT(*), confirm it.
-            if (!EQUAL(yyvsp[-3]->string_value, "COUNT"))
+                // special case for COUNT(*), confirm it.
+            if( !EQUAL(yyvsp[-3]->string_value, "COUNT") )
             {
-                CPLError(CE_Failure, CPLE_AppDefined,
-                         "Syntax Error with %s(*).", yyvsp[-3]->string_value);
+                CPLError( CE_Failure, CPLE_AppDefined,
+                        "Syntax Error with %s(*).",
+                        yyvsp[-3]->string_value );
                 delete yyvsp[-3];
                 YYERROR;
             }
@@ -2274,28 +2366,29 @@ int yyparse(swq_parse_context *context)
 
             swq_expr_node *poNode = new swq_expr_node();
             poNode->eNodeType = SNT_COLUMN;
-            poNode->string_value = CPLStrdup("*");
+            poNode->string_value = CPLStrdup( "*" );
             poNode->table_index = -1;
             poNode->field_index = -1;
 
-            swq_expr_node *count = new swq_expr_node(SWQ_COUNT);
-            count->PushSubExpression(poNode);
+            swq_expr_node *count = new swq_expr_node( SWQ_COUNT );
+            count->PushSubExpression( poNode );
 
-            if (!context->poCurSelect->PushField(count))
+            if( !context->poCurSelect->PushField( count, nullptr, false, false ) )
             {
                 delete count;
                 YYERROR;
             }
         }
-        break;
+    break;
 
-        case 75: /* column_spec: "identifier" '(' '*' ')' as_clause  */
+  case 77: /* column_spec: identifier '(' '*' ')' as_clause  */
         {
-            // special case for COUNT(*), confirm it.
-            if (!EQUAL(yyvsp[-4]->string_value, "COUNT"))
+                // special case for COUNT(*), confirm it.
+            if( !EQUAL(yyvsp[-4]->string_value, "COUNT") )
             {
-                CPLError(CE_Failure, CPLE_AppDefined,
-                         "Syntax Error with %s(*).", yyvsp[-4]->string_value);
+                CPLError( CE_Failure, CPLE_AppDefined,
+                        "Syntax Error with %s(*).",
+                        yyvsp[-4]->string_value );
                 delete yyvsp[-4];
                 delete yyvsp[0];
                 YYERROR;
@@ -2306,14 +2399,14 @@ int yyparse(swq_parse_context *context)
 
             swq_expr_node *poNode = new swq_expr_node();
             poNode->eNodeType = SNT_COLUMN;
-            poNode->string_value = CPLStrdup("*");
+            poNode->string_value = CPLStrdup( "*" );
             poNode->table_index = -1;
             poNode->field_index = -1;
 
-            swq_expr_node *count = new swq_expr_node(SWQ_COUNT);
-            count->PushSubExpression(poNode);
+            swq_expr_node *count = new swq_expr_node( SWQ_COUNT );
+            count->PushSubExpression( poNode );
 
-            if (!context->poCurSelect->PushField(count, yyvsp[0]->string_value))
+            if( !context->poCurSelect->PushField( count, yyvsp[0]->string_value, false, yyvsp[0]->bHidden ) )
             {
                 delete count;
                 delete yyvsp[0];
@@ -2322,53 +2415,51 @@ int yyparse(swq_parse_context *context)
 
             delete yyvsp[0];
         }
-        break;
+    break;
 
-        case 76: /* column_spec: "identifier" '(' "DISTINCT" field_value ')'  */
+  case 78: /* column_spec: identifier '(' "DISTINCT" field_value ')'  */
         {
-            // special case for COUNT(DISTINCT x), confirm it.
-            if (!EQUAL(yyvsp[-4]->string_value, "COUNT"))
+                // special case for COUNT(DISTINCT x), confirm it.
+            if( !EQUAL(yyvsp[-4]->string_value, "COUNT") )
             {
                 CPLError(
                     CE_Failure, CPLE_AppDefined,
-                    "DISTINCT keyword can only be used in COUNT() operator.");
+                    "DISTINCT keyword can only be used in COUNT() operator." );
                 delete yyvsp[-4];
                 delete yyvsp[-1];
-                YYERROR;
+                    YYERROR;
             }
 
             delete yyvsp[-4];
 
-            swq_expr_node *count = new swq_expr_node(SWQ_COUNT);
-            count->PushSubExpression(yyvsp[-1]);
+            swq_expr_node *count = new swq_expr_node( SWQ_COUNT );
+            count->PushSubExpression( yyvsp[-1] );
 
-            if (!context->poCurSelect->PushField(count, nullptr, TRUE))
+            if( !context->poCurSelect->PushField( count, nullptr, true, false ) )
             {
                 delete count;
                 YYERROR;
             }
         }
-        break;
+    break;
 
-        case 77: /* column_spec: "identifier" '(' "DISTINCT" field_value ')' as_clause  */
+  case 79: /* column_spec: identifier '(' "DISTINCT" field_value ')' as_clause  */
         {
             // special case for COUNT(DISTINCT x), confirm it.
-            if (!EQUAL(yyvsp[-5]->string_value, "COUNT"))
+            if( !EQUAL(yyvsp[-5]->string_value, "COUNT") )
             {
-                CPLError(
-                    CE_Failure, CPLE_AppDefined,
-                    "DISTINCT keyword can only be used in COUNT() operator.");
+                CPLError( CE_Failure, CPLE_AppDefined,
+                        "DISTINCT keyword can only be used in COUNT() operator." );
                 delete yyvsp[-5];
                 delete yyvsp[-2];
                 delete yyvsp[0];
                 YYERROR;
             }
 
-            swq_expr_node *count = new swq_expr_node(SWQ_COUNT);
-            count->PushSubExpression(yyvsp[-2]);
+            swq_expr_node *count = new swq_expr_node( SWQ_COUNT );
+            count->PushSubExpression( yyvsp[-2] );
 
-            if (!context->poCurSelect->PushField(count, yyvsp[0]->string_value,
-                                                 TRUE))
+            if( !context->poCurSelect->PushField( count, yyvsp[0]->string_value, true, yyvsp[0]->bHidden ) )
             {
                 delete yyvsp[-5];
                 delete count;
@@ -2379,153 +2470,167 @@ int yyparse(swq_parse_context *context)
             delete yyvsp[-5];
             delete yyvsp[0];
         }
-        break;
+    break;
 
-        case 78: /* as_clause: "AS" "identifier"  */
+  case 80: /* as_clause: "AS" identifier  */
         {
-            delete yyvsp[-1];
             yyval = yyvsp[0];
+            yyvsp[0] = nullptr;
         }
-        break;
+    break;
+
+  case 83: /* as_clause_with_hidden: as_clause "HIDDEN"  */
+        {
+            yyval = yyvsp[-1];
+            yyvsp[-1] = nullptr;
+            delete yyvsp[0];
+            yyvsp[0] = nullptr;
+            yyval->bHidden = true;
+        }
+    break;
 
-        case 81: /* opt_where: "WHERE" value_expr  */
+  case 85: /* opt_where: "WHERE" value_expr  */
         {
             context->poCurSelect->where_expr = yyvsp[0];
         }
-        break;
+    break;
 
-        case 83: /* opt_joins: "JOIN" table_def "ON" value_expr opt_joins  */
+  case 87: /* opt_joins: "JOIN" table_def "ON" value_expr opt_joins  */
         {
-            context->poCurSelect->PushJoin(
-                static_cast<int>(yyvsp[-3]->int_value), yyvsp[-1]);
+            context->poCurSelect->PushJoin( static_cast<int>(yyvsp[-3]->int_value),
+                                            yyvsp[-1] );
             delete yyvsp[-3];
         }
-        break;
+    break;
 
-        case 84: /* opt_joins: "LEFT" "JOIN" table_def "ON" value_expr opt_joins  */
+  case 88: /* opt_joins: "LEFT" "JOIN" table_def "ON" value_expr opt_joins  */
         {
-            context->poCurSelect->PushJoin(
-                static_cast<int>(yyvsp[-3]->int_value), yyvsp[-1]);
+            context->poCurSelect->PushJoin( static_cast<int>(yyvsp[-3]->int_value),
+                                            yyvsp[-1] );
             delete yyvsp[-3];
         }
-        break;
+    break;
 
-        case 89: /* sort_spec: field_value  */
+  case 93: /* sort_spec: field_value  */
         {
-            context->poCurSelect->PushOrderBy(yyvsp[0]->table_name,
-                                              yyvsp[0]->string_value, TRUE);
+            context->poCurSelect->PushOrderBy( yyvsp[0]->table_name, yyvsp[0]->string_value, TRUE );
             delete yyvsp[0];
             yyvsp[0] = nullptr;
         }
-        break;
+    break;
 
-        case 90: /* sort_spec: field_value "ASC"  */
+  case 94: /* sort_spec: field_value "ASC"  */
         {
-            context->poCurSelect->PushOrderBy(yyvsp[-1]->table_name,
-                                              yyvsp[-1]->string_value, TRUE);
+            context->poCurSelect->PushOrderBy( yyvsp[-1]->table_name, yyvsp[-1]->string_value, TRUE );
             delete yyvsp[-1];
             yyvsp[-1] = nullptr;
         }
-        break;
+    break;
 
-        case 91: /* sort_spec: field_value "DESC"  */
+  case 95: /* sort_spec: field_value "DESC"  */
         {
-            context->poCurSelect->PushOrderBy(yyvsp[-1]->table_name,
-                                              yyvsp[-1]->string_value, FALSE);
+            context->poCurSelect->PushOrderBy( yyvsp[-1]->table_name, yyvsp[-1]->string_value, FALSE );
             delete yyvsp[-1];
             yyvsp[-1] = nullptr;
         }
-        break;
+    break;
 
-        case 93: /* opt_limit: "LIMIT" "integer number"  */
-        {
-            context->poCurSelect->SetLimit(yyvsp[0]->int_value);
-            delete yyvsp[0];
-            yyvsp[0] = nullptr;
-        }
-        break;
+  case 97: /* opt_limit: "LIMIT" "integer number"  */
+    {
+        context->poCurSelect->SetLimit( yyvsp[0]->int_value );
+        delete yyvsp[0];
+        yyvsp[0] = nullptr;
+    }
+    break;
 
-        case 95: /* opt_offset: "OFFSET" "integer number"  */
-        {
-            context->poCurSelect->SetOffset(yyvsp[0]->int_value);
-            delete yyvsp[0];
-            yyvsp[0] = nullptr;
-        }
-        break;
+  case 99: /* opt_offset: "OFFSET" "integer number"  */
+    {
+        context->poCurSelect->SetOffset( yyvsp[0]->int_value );
+        delete yyvsp[0];
+        yyvsp[0] = nullptr;
+    }
+    break;
 
-        case 96: /* table_def: "identifier"  */
-        {
-            const int iTable = context->poCurSelect->PushTableDef(
-                nullptr, yyvsp[0]->string_value, nullptr);
-            delete yyvsp[0];
+  case 100: /* table_def: identifier  */
+    {
+        const int iTable =
+            context->poCurSelect->PushTableDef( nullptr, yyvsp[0]->string_value,
+                                                nullptr );
+        delete yyvsp[0];
 
-            yyval = new swq_expr_node(iTable);
-        }
-        break;
+        yyval = new swq_expr_node( iTable );
+    }
+    break;
 
-        case 97: /* table_def: "identifier" as_clause  */
-        {
-            const int iTable = context->poCurSelect->PushTableDef(
-                nullptr, yyvsp[-1]->string_value, yyvsp[0]->string_value);
-            delete yyvsp[-1];
-            delete yyvsp[0];
+  case 101: /* table_def: identifier as_clause  */
+    {
+        const int iTable =
+            context->poCurSelect->PushTableDef( nullptr, yyvsp[-1]->string_value,
+                                                yyvsp[0]->string_value );
+        delete yyvsp[-1];
+        delete yyvsp[0];
 
-            yyval = new swq_expr_node(iTable);
-        }
-        break;
+        yyval = new swq_expr_node( iTable );
+    }
+    break;
 
-        case 98: /* table_def: "string" '.' "identifier"  */
-        {
-            const int iTable = context->poCurSelect->PushTableDef(
-                yyvsp[-2]->string_value, yyvsp[0]->string_value, nullptr);
-            delete yyvsp[-2];
-            delete yyvsp[0];
+  case 102: /* table_def: "string" '.' identifier  */
+    {
+        const int iTable =
+            context->poCurSelect->PushTableDef( yyvsp[-2]->string_value,
+                                                yyvsp[0]->string_value, nullptr );
+        delete yyvsp[-2];
+        delete yyvsp[0];
 
-            yyval = new swq_expr_node(iTable);
-        }
-        break;
+        yyval = new swq_expr_node( iTable );
+    }
+    break;
 
-        case 99: /* table_def: "string" '.' "identifier" as_clause  */
-        {
-            const int iTable = context->poCurSelect->PushTableDef(
-                yyvsp[-3]->string_value, yyvsp[-1]->string_value,
-                yyvsp[0]->string_value);
-            delete yyvsp[-3];
-            delete yyvsp[-1];
-            delete yyvsp[0];
+  case 103: /* table_def: "string" '.' identifier as_clause  */
+    {
+        const int iTable =
+            context->poCurSelect->PushTableDef( yyvsp[-3]->string_value,
+                                                yyvsp[-1]->string_value,
+                                                yyvsp[0]->string_value );
+        delete yyvsp[-3];
+        delete yyvsp[-1];
+        delete yyvsp[0];
+
+        yyval = new swq_expr_node( iTable );
+    }
+    break;
 
-            yyval = new swq_expr_node(iTable);
-        }
-        break;
+  case 104: /* table_def: identifier '.' identifier  */
+    {
+        const int iTable =
+            context->poCurSelect->PushTableDef( yyvsp[-2]->string_value,
+                                                yyvsp[0]->string_value, nullptr );
+        delete yyvsp[-2];
+        delete yyvsp[0];
 
-        case 100: /* table_def: "identifier" '.' "identifier"  */
-        {
-            const int iTable = context->poCurSelect->PushTableDef(
-                yyvsp[-2]->string_value, yyvsp[0]->string_value, nullptr);
-            delete yyvsp[-2];
-            delete yyvsp[0];
+        yyval = new swq_expr_node( iTable );
+    }
+    break;
 
-            yyval = new swq_expr_node(iTable);
-        }
-        break;
+  case 105: /* table_def: identifier '.' identifier as_clause  */
+    {
+        const int iTable =
+            context->poCurSelect->PushTableDef( yyvsp[-3]->string_value,
+                                                yyvsp[-1]->string_value,
+                                                yyvsp[0]->string_value );
+        delete yyvsp[-3];
+        delete yyvsp[-1];
+        delete yyvsp[0];
+
+        yyval = new swq_expr_node( iTable );
+    }
+    break;
 
-        case 101: /* table_def: "identifier" '.' "identifier" as_clause  */
-        {
-            const int iTable = context->poCurSelect->PushTableDef(
-                yyvsp[-3]->string_value, yyvsp[-1]->string_value,
-                yyvsp[0]->string_value);
-            delete yyvsp[-3];
-            delete yyvsp[-1];
-            delete yyvsp[0];
 
-            yyval = new swq_expr_node(iTable);
-        }
-        break;
 
-        default:
-            break;
+      default: break;
     }
-    /* User semantic actions sometimes alter yychar, and that requires
+  /* User semantic actions sometimes alter yychar, and that requires
      that yytoken be updated with the new translation.  We take the
      approach of translating immediately before every use of yytoken.
      One alternative is translating here after every semantic action,
@@ -2536,203 +2641,212 @@ int yyparse(swq_parse_context *context)
      case of YYERROR or YYBACKUP, subsequent parser actions might lead
      to an incorrect destructor call or verbose syntax error message
      before the lookahead is translated.  */
-    YY_SYMBOL_PRINT("-> $$ =", YY_CAST(yysymbol_kind_t, yyr1[yyn]), &yyval,
-                    &yyloc);
+  YY_SYMBOL_PRINT ("-> $$ =", YY_CAST (yysymbol_kind_t, yyr1[yyn]), &yyval, &yyloc);
 
-    YYPOPSTACK(yylen);
-    yylen = 0;
+  YYPOPSTACK (yylen);
+  yylen = 0;
 
-    *++yyvsp = yyval;
+  *++yyvsp = yyval;
 
-    /* Now 'shift' the result of the reduction.  Determine what state
+  /* Now 'shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
-    {
-        const int yylhs = yyr1[yyn] - YYNTOKENS;
-        const int yyi = yypgoto[yylhs] + *yyssp;
-        yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyssp
-                       ? yytable[yyi]
-                       : yydefgoto[yylhs]);
-    }
+  {
+    const int yylhs = yyr1[yyn] - YYNTOKENS;
+    const int yyi = yypgoto[yylhs] + *yyssp;
+    yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyssp
+               ? yytable[yyi]
+               : yydefgoto[yylhs]);
+  }
+
+  goto yynewstate;
 
-    goto yynewstate;
 
 /*--------------------------------------.
 | yyerrlab -- here on detecting error.  |
 `--------------------------------------*/
 yyerrlab:
-    /* Make sure we have latest lookahead translation.  See comments at
+  /* Make sure we have latest lookahead translation.  See comments at
      user semantic actions for why this is necessary.  */
-    yytoken = yychar == YYEMPTY ? YYSYMBOL_YYEMPTY : YYTRANSLATE(yychar);
-    /* If not already recovering from an error, report this error.  */
-    if (!yyerrstatus)
+  yytoken = yychar == YYEMPTY ? YYSYMBOL_YYEMPTY : YYTRANSLATE (yychar);
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
     {
-        ++yynerrs;
-        (void)yynerrs;
-        {
-            yypcontext_t yyctx = {yyssp, yytoken};
-            char const *yymsgp = YY_("syntax error");
-            int yysyntax_error_status;
-            yysyntax_error_status =
-                yysyntax_error(&yymsg_alloc, &yymsg, &yyctx);
-            if (yysyntax_error_status == 0)
+      ++yynerrs; (void)yynerrs;
+      {
+        yypcontext_t yyctx
+          = {yyssp, yytoken};
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status;
+        yysyntax_error_status = yysyntax_error (&yymsg_alloc, &yymsg, &yyctx);
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == -1)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = YY_CAST (char *,
+                             YYSTACK_ALLOC (YY_CAST (YYSIZE_T, yymsg_alloc)));
+            if (yymsg)
+              {
+                yysyntax_error_status
+                  = yysyntax_error (&yymsg_alloc, &yymsg, &yyctx);
                 yymsgp = yymsg;
-            else if (yysyntax_error_status == -1)
-            {
-                if (yymsg != yymsgbuf)
-                    YYSTACK_FREE(yymsg);
-                yymsg = YY_CAST(char *,
-                                YYSTACK_ALLOC(YY_CAST(YYSIZE_T, yymsg_alloc)));
-                if (yymsg)
-                {
-                    yysyntax_error_status =
-                        yysyntax_error(&yymsg_alloc, &yymsg, &yyctx);
-                    yymsgp = yymsg;
-                }
-                else
-                {
-                    yymsg = yymsgbuf;
-                    yymsg_alloc = sizeof yymsgbuf;
-                    yysyntax_error_status = YYENOMEM;
-                }
-            }
-            yyerror(context, yymsgp);
-            if (yysyntax_error_status == YYENOMEM)
-                YYNOMEM;
-        }
+              }
+            else
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = YYENOMEM;
+              }
+          }
+        yyerror (context, yymsgp);
+        if (yysyntax_error_status == YYENOMEM)
+          YYNOMEM;
+      }
     }
 
-    if (yyerrstatus == 3)
+  if (yyerrstatus == 3)
     {
-        /* If just tried and failed to reuse lookahead token after an
+      /* If just tried and failed to reuse lookahead token after an
          error, discard it.  */
 
-        if (yychar <= END)
+      if (yychar <= END)
         {
-            /* Return failure if at end of input.  */
-            if (yychar == END)
-                YYABORT;
+          /* Return failure if at end of input.  */
+          if (yychar == END)
+            YYABORT;
         }
-        else
+      else
         {
-            yydestruct("Error: discarding", yytoken, &yylval, context);
-            yychar = YYEMPTY;
+          yydestruct ("Error: discarding",
+                      yytoken, &yylval, context);
+          yychar = YYEMPTY;
         }
     }
 
-    /* Else will try to reuse lookahead token after shifting the error
+  /* Else will try to reuse lookahead token after shifting the error
      token.  */
-    goto yyerrlab1;
+  goto yyerrlab1;
+
 
 /*---------------------------------------------------.
 | yyerrorlab -- error raised explicitly by YYERROR.  |
 `---------------------------------------------------*/
 yyerrorlab:
-    /* Pacify compilers when the user code never invokes YYERROR and the
+  /* Pacify compilers when the user code never invokes YYERROR and the
      label yyerrorlab therefore never appears in user code.  */
-    if (0)
-        YYERROR;
-    ++yynerrs;
-    (void)yynerrs;
+  if (0)
+    YYERROR;
+  ++yynerrs; (void)yynerrs;
 
-    /* Do not reclaim the symbols of the rule whose action triggered
+  /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
-    YYPOPSTACK(yylen);
-    yylen = 0;
-    YY_STACK_PRINT(yyss, yyssp);
-    yystate = *yyssp;
-    goto yyerrlab1;
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
+
 
 /*-------------------------------------------------------------.
 | yyerrlab1 -- common code for both syntax error and YYERROR.  |
 `-------------------------------------------------------------*/
 yyerrlab1:
-    yyerrstatus = 3; /* Each real token shifted decrements this.  */
+  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
 
-    /* Pop stack until we find a state that shifts the error token.  */
-    for (;;)
+  /* Pop stack until we find a state that shifts the error token.  */
+  for (;;)
     {
-        yyn = yypact[yystate];
-        if (!yypact_value_is_default(yyn))
+      yyn = yypact[yystate];
+      if (!yypact_value_is_default (yyn))
         {
-            yyn += YYSYMBOL_YYerror;
-            if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYSYMBOL_YYerror)
+          yyn += YYSYMBOL_YYerror;
+          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYSYMBOL_YYerror)
             {
-                yyn = yytable[yyn];
-                if (0 < yyn)
-                    break;
+              yyn = yytable[yyn];
+              if (0 < yyn)
+                break;
             }
         }
 
-        /* Pop the current state because it cannot handle the error token.  */
-        if (yyssp == yyss)
-            YYABORT;
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+        YYABORT;
+
 
-        yydestruct("Error: popping", YY_ACCESSING_SYMBOL(yystate), yyvsp,
-                   context);
-        YYPOPSTACK(1);
-        yystate = *yyssp;
-        YY_STACK_PRINT(yyss, yyssp);
+      yydestruct ("Error: popping",
+                  YY_ACCESSING_SYMBOL (yystate), yyvsp, context);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
     }
 
-    YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-    *++yyvsp = yylval;
-    YY_IGNORE_MAYBE_UNINITIALIZED_END
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
-    /* Shift the error token.  */
-    YY_SYMBOL_PRINT("Shifting", YY_ACCESSING_SYMBOL(yyn), yyvsp, yylsp);
 
-    yystate = yyn;
-    goto yynewstate;
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", YY_ACCESSING_SYMBOL (yyn), yyvsp, yylsp);
+
+  yystate = yyn;
+  goto yynewstate;
+
 
 /*-------------------------------------.
 | yyacceptlab -- YYACCEPT comes here.  |
 `-------------------------------------*/
 yyacceptlab:
-    yyresult = 0;
-    goto yyreturnlab;
+  yyresult = 0;
+  goto yyreturnlab;
+
 
 /*-----------------------------------.
 | yyabortlab -- YYABORT comes here.  |
 `-----------------------------------*/
 yyabortlab:
-    yyresult = 1;
-    goto yyreturnlab;
+  yyresult = 1;
+  goto yyreturnlab;
+
 
 /*-----------------------------------------------------------.
 | yyexhaustedlab -- YYNOMEM (memory exhaustion) comes here.  |
 `-----------------------------------------------------------*/
 yyexhaustedlab:
-    yyerror(context, YY_("memory exhausted"));
-    yyresult = 2;
-    goto yyreturnlab;
+  yyerror (context, YY_("memory exhausted"));
+  yyresult = 2;
+  goto yyreturnlab;
+
 
 /*----------------------------------------------------------.
 | yyreturnlab -- parsing is finished, clean up and return.  |
 `----------------------------------------------------------*/
 yyreturnlab:
-    if (yychar != YYEMPTY)
+  if (yychar != YYEMPTY)
     {
-        /* Make sure we have latest lookahead translation.  See comments at
+      /* Make sure we have latest lookahead translation.  See comments at
          user semantic actions for why this is necessary.  */
-        yytoken = YYTRANSLATE(yychar);
-        yydestruct("Cleanup: discarding lookahead", yytoken, &yylval, context);
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval, context);
     }
-    /* Do not reclaim the symbols of the rule whose action triggered
+  /* Do not reclaim the symbols of the rule whose action triggered
      this YYABORT or YYACCEPT.  */
-    YYPOPSTACK(yylen);
-    YY_STACK_PRINT(yyss, yyssp);
-    while (yyssp != yyss)
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
     {
-        yydestruct("Cleanup: popping", YY_ACCESSING_SYMBOL(+*yyssp), yyvsp,
-                   context);
-        YYPOPSTACK(1);
+      yydestruct ("Cleanup: popping",
+                  YY_ACCESSING_SYMBOL (+*yyssp), yyvsp, context);
+      YYPOPSTACK (1);
     }
 #ifndef yyoverflow
-    if (yyss != yyssa)
-        YYSTACK_FREE(yyss);
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
 #endif
-    if (yymsg != yymsgbuf)
-        YYSTACK_FREE(yymsg);
-    return yyresult;
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+  return yyresult;
 }
+
diff --git a/ogr/swq_parser.hpp b/ogr/swq_parser.hpp
index ebb35ea1dfa1..7de2f1a4d6c9 100644
--- a/ogr/swq_parser.hpp
+++ b/ogr/swq_parser.hpp
@@ -36,10 +36,10 @@
    private implementation details that can be changed or removed.  */
 
 #ifndef YY_SWQ_SWQ_PARSER_HPP_INCLUDED
-#define YY_SWQ_SWQ_PARSER_HPP_INCLUDED
+# define YY_SWQ_SWQ_PARSER_HPP_INCLUDED
 /* Debug traces.  */
 #ifndef YYDEBUG
-#define YYDEBUG 0
+# define YYDEBUG 0
 #endif
 #if YYDEBUG
 extern int swqdebug;
@@ -47,62 +47,66 @@ extern int swqdebug;
 
 /* Token kinds.  */
 #ifndef YYTOKENTYPE
-#define YYTOKENTYPE
-
-enum yytokentype
-{
+# define YYTOKENTYPE
+  enum yytokentype
+  {
     YYEMPTY = -2,
-    END = 0,                    /* "end of string"  */
-    YYerror = 256,              /* error  */
-    YYUNDEF = 257,              /* "invalid token"  */
-    SWQT_INTEGER_NUMBER = 258,  /* "integer number"  */
-    SWQT_FLOAT_NUMBER = 259,    /* "floating point number"  */
-    SWQT_STRING = 260,          /* "string"  */
-    SWQT_IDENTIFIER = 261,      /* "identifier"  */
-    SWQT_IN = 262,              /* "IN"  */
-    SWQT_LIKE = 263,            /* "LIKE"  */
-    SWQT_ILIKE = 264,           /* "ILIKE"  */
-    SWQT_ESCAPE = 265,          /* "ESCAPE"  */
-    SWQT_BETWEEN = 266,         /* "BETWEEN"  */
-    SWQT_NULL = 267,            /* "NULL"  */
-    SWQT_IS = 268,              /* "IS"  */
-    SWQT_SELECT = 269,          /* "SELECT"  */
-    SWQT_LEFT = 270,            /* "LEFT"  */
-    SWQT_JOIN = 271,            /* "JOIN"  */
-    SWQT_WHERE = 272,           /* "WHERE"  */
-    SWQT_ON = 273,              /* "ON"  */
-    SWQT_ORDER = 274,           /* "ORDER"  */
-    SWQT_BY = 275,              /* "BY"  */
-    SWQT_FROM = 276,            /* "FROM"  */
-    SWQT_AS = 277,              /* "AS"  */
-    SWQT_ASC = 278,             /* "ASC"  */
-    SWQT_DESC = 279,            /* "DESC"  */
-    SWQT_DISTINCT = 280,        /* "DISTINCT"  */
-    SWQT_CAST = 281,            /* "CAST"  */
-    SWQT_UNION = 282,           /* "UNION"  */
-    SWQT_ALL = 283,             /* "ALL"  */
-    SWQT_LIMIT = 284,           /* "LIMIT"  */
-    SWQT_OFFSET = 285,          /* "OFFSET"  */
-    SWQT_EXCEPT = 286,          /* "EXCEPT"  */
-    SWQT_EXCLUDE = 287,         /* "EXCLUDE"  */
-    SWQT_VALUE_START = 288,     /* SWQT_VALUE_START  */
-    SWQT_SELECT_START = 289,    /* SWQT_SELECT_START  */
-    SWQT_NOT = 290,             /* "NOT"  */
-    SWQT_OR = 291,              /* "OR"  */
-    SWQT_AND = 292,             /* "AND"  */
-    SWQT_UMINUS = 293,          /* SWQT_UMINUS  */
-    SWQT_RESERVED_KEYWORD = 294 /* "reserved keyword"  */
-};
-typedef enum yytokentype yytoken_kind_t;
+    END = 0,                       /* "end of string"  */
+    YYerror = 256,                 /* error  */
+    YYUNDEF = 257,                 /* "invalid token"  */
+    SWQT_INTEGER_NUMBER = 258,     /* "integer number"  */
+    SWQT_FLOAT_NUMBER = 259,       /* "floating point number"  */
+    SWQT_STRING = 260,             /* "string"  */
+    SWQT_IDENTIFIER = 261,         /* "identifier"  */
+    SWQT_IN = 262,                 /* "IN"  */
+    SWQT_LIKE = 263,               /* "LIKE"  */
+    SWQT_ILIKE = 264,              /* "ILIKE"  */
+    SWQT_ESCAPE = 265,             /* "ESCAPE"  */
+    SWQT_BETWEEN = 266,            /* "BETWEEN"  */
+    SWQT_NULL = 267,               /* "NULL"  */
+    SWQT_IS = 268,                 /* "IS"  */
+    SWQT_SELECT = 269,             /* "SELECT"  */
+    SWQT_LEFT = 270,               /* "LEFT"  */
+    SWQT_JOIN = 271,               /* "JOIN"  */
+    SWQT_WHERE = 272,              /* "WHERE"  */
+    SWQT_ON = 273,                 /* "ON"  */
+    SWQT_ORDER = 274,              /* "ORDER"  */
+    SWQT_BY = 275,                 /* "BY"  */
+    SWQT_FROM = 276,               /* "FROM"  */
+    SWQT_AS = 277,                 /* "AS"  */
+    SWQT_ASC = 278,                /* "ASC"  */
+    SWQT_DESC = 279,               /* "DESC"  */
+    SWQT_DISTINCT = 280,           /* "DISTINCT"  */
+    SWQT_CAST = 281,               /* "CAST"  */
+    SWQT_UNION = 282,              /* "UNION"  */
+    SWQT_ALL = 283,                /* "ALL"  */
+    SWQT_LIMIT = 284,              /* "LIMIT"  */
+    SWQT_OFFSET = 285,             /* "OFFSET"  */
+    SWQT_EXCEPT = 286,             /* "EXCEPT"  */
+    SWQT_EXCLUDE = 287,            /* "EXCLUDE"  */
+    SWQT_HIDDEN = 288,             /* "HIDDEN"  */
+    SWQT_VALUE_START = 289,        /* SWQT_VALUE_START  */
+    SWQT_SELECT_START = 290,       /* SWQT_SELECT_START  */
+    SWQT_NOT = 291,                /* "NOT"  */
+    SWQT_OR = 292,                 /* "OR"  */
+    SWQT_AND = 293,                /* "AND"  */
+    SWQT_UMINUS = 294,             /* SWQT_UMINUS  */
+    SWQT_RESERVED_KEYWORD = 295    /* "reserved keyword"  */
+  };
+  typedef enum yytokentype yytoken_kind_t;
 #endif
 
 /* Value type.  */
-#if !defined YYSTYPE && !defined YYSTYPE_IS_DECLARED
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
-#define YYSTYPE_IS_TRIVIAL 1
-#define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
 #endif
 
-int swqparse(swq_parse_context *context);
+
+
+
+int swqparse (swq_parse_context *context);
+
 
 #endif /* !YY_SWQ_SWQ_PARSER_HPP_INCLUDED  */
diff --git a/ogr/swq_parser.y b/ogr/swq_parser.y
index 48cbcabe651e..d7d51e7b469b 100644
--- a/ogr/swq_parser.y
+++ b/ogr/swq_parser.y
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (C) 2010 Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -91,6 +75,7 @@
 %token SWQT_OFFSET              "OFFSET"
 %token SWQT_EXCEPT              "EXCEPT"
 %token SWQT_EXCLUDE             "EXCLUDE"
+%token SWQT_HIDDEN              "HIDDEN"
 
 %token SWQT_VALUE_START
 %token SWQT_SELECT_START
@@ -115,9 +100,9 @@
 %token SWQT_RESERVED_KEYWORD    "reserved keyword"
 
 /* Any grammar rule that does $$ = must be listed afterwards */
-/* as well as SWQT_INTEGER_NUMBER SWQT_FLOAT_NUMBER SWQT_STRING SWQT_IDENTIFIER that are allocated by swqlex() */
-%destructor { delete $$; } SWQT_INTEGER_NUMBER SWQT_FLOAT_NUMBER SWQT_STRING SWQT_IDENTIFIER
-%destructor { delete $$; } value_expr_list field_value value_expr value_expr_non_logical type_def table_def
+/* as well as SWQT_INTEGER_NUMBER SWQT_FLOAT_NUMBER SWQT_STRING SWQT_IDENTIFIER SWQT_HIDDEN that are allocated by swqlex(), and identifier */
+%destructor { delete $$; } SWQT_INTEGER_NUMBER SWQT_FLOAT_NUMBER SWQT_STRING SWQT_IDENTIFIER SWQT_HIDDEN identifier
+%destructor { delete $$; } value_expr_list field_value value_expr value_expr_non_logical type_def table_def as_clause as_clause_with_hidden
 
 %%
 
@@ -388,8 +373,13 @@ value_expr_list:
             $$->PushSubExpression( $1 );
         }
 
-field_value:
+identifier:
     SWQT_IDENTIFIER
+
+    | SWQT_HIDDEN
+
+field_value:
+    identifier
         {
             $$ = $1;  // validation deferred.
             $$->eNodeType = SNT_COLUMN;
@@ -397,7 +387,7 @@ field_value:
             $$->table_index = -1;
         }
 
-    | SWQT_IDENTIFIER '.' SWQT_IDENTIFIER
+    | identifier '.' identifier
         {
             $$ = $1;  // validation deferred.
             $$->eNodeType = SNT_COLUMN;
@@ -509,7 +499,7 @@ value_expr_non_logical:
             $$->PushSubExpression( $3 );
         }
 
-    | SWQT_IDENTIFIER '(' value_expr_list ')'
+    | identifier '(' value_expr_list ')'
         {
             const swq_operation *poOp =
                     swq_op_registrar::GetOperator( $1->string_value );
@@ -553,20 +543,20 @@ value_expr_non_logical:
         }
 
 type_def:
-    SWQT_IDENTIFIER
+    identifier
     {
         $$ = new swq_expr_node( SWQ_CAST );
         $$->PushSubExpression( $1 );
     }
 
-    | SWQT_IDENTIFIER '(' SWQT_INTEGER_NUMBER ')'
+    | identifier '(' SWQT_INTEGER_NUMBER ')'
     {
         $$ = new swq_expr_node( SWQ_CAST );
         $$->PushSubExpression( $3 );
         $$->PushSubExpression( $1 );
     }
 
-    | SWQT_IDENTIFIER '(' SWQT_INTEGER_NUMBER ',' SWQT_INTEGER_NUMBER ')'
+    | identifier '(' SWQT_INTEGER_NUMBER ',' SWQT_INTEGER_NUMBER ')'
     {
         $$ = new swq_expr_node( SWQ_CAST );
         $$->PushSubExpression( $5 );
@@ -575,7 +565,7 @@ type_def:
     }
 
     /* e.g. GEOMETRY(POINT) */
-    | SWQT_IDENTIFIER '(' SWQT_IDENTIFIER ')'
+    | identifier '(' identifier ')'
     {
         OGRwkbGeometryType eType = OGRFromOGCGeomType($3->string_value);
         if( !EQUAL($1->string_value, "GEOMETRY") ||
@@ -593,7 +583,7 @@ type_def:
     }
 
     /* e.g. GEOMETRY(POINT,4326) */
-    | SWQT_IDENTIFIER '(' SWQT_IDENTIFIER ',' SWQT_INTEGER_NUMBER ')'
+    | identifier '(' identifier ',' SWQT_INTEGER_NUMBER ')'
     {
         OGRwkbGeometryType eType = OGRFromOGCGeomType($3->string_value);
         if( !EQUAL($1->string_value, "GEOMETRY") ||
@@ -663,16 +653,16 @@ except_or_exclude:
 column_spec:
     value_expr
         {
-            if( !context->poCurSelect->PushField( $1 ) )
+            if( !context->poCurSelect->PushField( $1, nullptr, false, false ) )
             {
                 delete $1;
                 YYERROR;
             }
         }
 
-    | value_expr as_clause
+    | value_expr as_clause_with_hidden
         {
-            if( !context->poCurSelect->PushField( $1, $2->string_value ) )
+            if( !context->poCurSelect->PushField( $1, $2->string_value, false, $2->bHidden ) )
             {
                 delete $1;
                 delete $2;
@@ -689,7 +679,7 @@ column_spec:
             poNode->table_index = -1;
             poNode->field_index = -1;
 
-            if( !context->poCurSelect->PushField( poNode ) )
+            if( !context->poCurSelect->PushField( poNode, nullptr, false, false ) )
             {
                 delete poNode;
                 YYERROR;
@@ -704,14 +694,14 @@ column_spec:
             poNode->table_index = -1;
             poNode->field_index = -1;
 
-            if( !context->poCurSelect->PushField( poNode ) )
+            if( !context->poCurSelect->PushField( poNode, nullptr, false, false ) )
             {
                 delete poNode;
                 YYERROR;
             }
         }
 
-    | SWQT_IDENTIFIER '.' '*'
+    | identifier '.' '*'
         {
             CPLString osTableName = $1->string_value;
 
@@ -725,14 +715,14 @@ column_spec:
             poNode->table_index = -1;
             poNode->field_index = -1;
 
-            if( !context->poCurSelect->PushField( poNode ) )
+            if( !context->poCurSelect->PushField( poNode, nullptr, false, false ) )
             {
                 delete poNode;
                 YYERROR;
             }
         }
 
-    | SWQT_IDENTIFIER '(' '*' ')'
+    | identifier '(' '*' ')'
         {
                 // special case for COUNT(*), confirm it.
             if( !EQUAL($1->string_value, "COUNT") )
@@ -756,14 +746,14 @@ column_spec:
             swq_expr_node *count = new swq_expr_node( SWQ_COUNT );
             count->PushSubExpression( poNode );
 
-            if( !context->poCurSelect->PushField( count ) )
+            if( !context->poCurSelect->PushField( count, nullptr, false, false ) )
             {
                 delete count;
                 YYERROR;
             }
         }
 
-    | SWQT_IDENTIFIER '(' '*' ')' as_clause
+    | identifier '(' '*' ')' as_clause
         {
                 // special case for COUNT(*), confirm it.
             if( !EQUAL($1->string_value, "COUNT") )
@@ -788,7 +778,7 @@ column_spec:
             swq_expr_node *count = new swq_expr_node( SWQ_COUNT );
             count->PushSubExpression( poNode );
 
-            if( !context->poCurSelect->PushField( count, $5->string_value ) )
+            if( !context->poCurSelect->PushField( count, $5->string_value, false, $5->bHidden ) )
             {
                 delete count;
                 delete $5;
@@ -798,7 +788,7 @@ column_spec:
             delete $5;
         }
 
-    | SWQT_IDENTIFIER '(' SWQT_DISTINCT field_value ')'
+    | identifier '(' SWQT_DISTINCT field_value ')'
         {
                 // special case for COUNT(DISTINCT x), confirm it.
             if( !EQUAL($1->string_value, "COUNT") )
@@ -816,14 +806,14 @@ column_spec:
             swq_expr_node *count = new swq_expr_node( SWQ_COUNT );
             count->PushSubExpression( $4 );
 
-            if( !context->poCurSelect->PushField( count, nullptr, TRUE ) )
+            if( !context->poCurSelect->PushField( count, nullptr, true, false ) )
             {
                 delete count;
                 YYERROR;
             }
         }
 
-    | SWQT_IDENTIFIER '(' SWQT_DISTINCT field_value ')' as_clause
+    | identifier '(' SWQT_DISTINCT field_value ')' as_clause
         {
             // special case for COUNT(DISTINCT x), confirm it.
             if( !EQUAL($1->string_value, "COUNT") )
@@ -839,7 +829,7 @@ column_spec:
             swq_expr_node *count = new swq_expr_node( SWQ_COUNT );
             count->PushSubExpression( $4 );
 
-            if( !context->poCurSelect->PushField( count, $6->string_value, TRUE ) )
+            if( !context->poCurSelect->PushField( count, $6->string_value, true, $6->bHidden ) )
             {
                 delete $1;
                 delete count;
@@ -852,13 +842,25 @@ column_spec:
         }
 
 as_clause:
-    SWQT_AS SWQT_IDENTIFIER
+    SWQT_AS identifier
         {
-            delete $1;
             $$ = $2;
+            $2 = nullptr;
         }
 
-    | SWQT_IDENTIFIER
+    | identifier
+
+as_clause_with_hidden:
+    as_clause
+
+    | as_clause SWQT_HIDDEN
+        {
+            $$ = $1;
+            $1 = nullptr;
+            delete $2;
+            $2 = nullptr;
+            $$->bHidden = true;
+        }
 
 opt_where:
     | SWQT_WHERE value_expr
@@ -924,7 +926,7 @@ opt_offset:
     }
 
 table_def:
-    SWQT_IDENTIFIER
+    identifier
     {
         const int iTable =
             context->poCurSelect->PushTableDef( nullptr, $1->string_value,
@@ -934,7 +936,7 @@ table_def:
         $$ = new swq_expr_node( iTable );
     }
 
-    | SWQT_IDENTIFIER as_clause
+    | identifier as_clause
     {
         const int iTable =
             context->poCurSelect->PushTableDef( nullptr, $1->string_value,
@@ -945,7 +947,7 @@ table_def:
         $$ = new swq_expr_node( iTable );
     }
 
-    | SWQT_STRING '.' SWQT_IDENTIFIER
+    | SWQT_STRING '.' identifier
     {
         const int iTable =
             context->poCurSelect->PushTableDef( $1->string_value,
@@ -956,7 +958,7 @@ table_def:
         $$ = new swq_expr_node( iTable );
     }
 
-    | SWQT_STRING '.' SWQT_IDENTIFIER as_clause
+    | SWQT_STRING '.' identifier as_clause
     {
         const int iTable =
             context->poCurSelect->PushTableDef( $1->string_value,
@@ -969,7 +971,7 @@ table_def:
         $$ = new swq_expr_node( iTable );
     }
 
-    | SWQT_IDENTIFIER '.' SWQT_IDENTIFIER
+    | identifier '.' identifier
     {
         const int iTable =
             context->poCurSelect->PushTableDef( $1->string_value,
@@ -980,7 +982,7 @@ table_def:
         $$ = new swq_expr_node( iTable );
     }
 
-    | SWQT_IDENTIFIER '.' SWQT_IDENTIFIER as_clause
+    | identifier '.' identifier as_clause
     {
         const int iTable =
             context->poCurSelect->PushTableDef( $1->string_value,
diff --git a/ogr/swq_select.cpp b/ogr/swq_select.cpp
index becd1221d1a9..02889b84c571 100644
--- a/ogr/swq_select.cpp
+++ b/ogr/swq_select.cpp
@@ -8,23 +8,7 @@
  * Copyright (C) 2010 Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2010-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -203,16 +187,34 @@ char *swq_select::Unparse()
         }
         else
         {
-            if (def->col_func == SWQCF_AVG)
-                osSelect += "AVG(";
-            else if (def->col_func == SWQCF_MIN)
-                osSelect += "MIN(";
-            else if (def->col_func == SWQCF_MAX)
-                osSelect += "MAX(";
-            else if (def->col_func == SWQCF_COUNT)
-                osSelect += "COUNT(";
-            else if (def->col_func == SWQCF_SUM)
-                osSelect += "SUM(";
+            switch (def->col_func)
+            {
+                case SWQCF_NONE:
+                    break;
+                case SWQCF_AVG:
+                    osSelect += "AVG(";
+                    break;
+                case SWQCF_MIN:
+                    osSelect += "MIN(";
+                    break;
+                case SWQCF_MAX:
+                    osSelect += "MAX(";
+                    break;
+                case SWQCF_COUNT:
+                    osSelect += "COUNT(";
+                    break;
+                case SWQCF_SUM:
+                    osSelect += "SUM(";
+                    break;
+                case SWQCF_STDDEV_POP:
+                    osSelect += "STDDEV_POP(";
+                    break;
+                case SWQCF_STDDEV_SAMP:
+                    osSelect += "STDDEV_SAMP(";
+                    break;
+                case SWQCF_CUSTOM:
+                    break;
+            }
 
             if (def->distinct_flag && def->col_func == SWQCF_COUNT)
                 osSelect += "DISTINCT ";
@@ -322,7 +324,7 @@ char *swq_select::Unparse()
 /************************************************************************/
 
 int swq_select::PushField(swq_expr_node *poExpr, const char *pszAlias,
-                          int distinct_flag)
+                          bool distinct_flag, bool bHidden)
 
 {
     if (query_mode == SWQM_DISTINCT_LIST && distinct_flag)
@@ -368,8 +370,8 @@ int swq_select::PushField(swq_expr_node *poExpr, const char *pszAlias,
     }
     else if (poExpr->eNodeType == SNT_OPERATION &&
              (poExpr->nOperation == SWQ_CAST ||
-              (poExpr->nOperation >= SWQ_AVG &&
-               poExpr->nOperation <= SWQ_SUM)) &&
+              (poExpr->nOperation >= SWQ_AGGREGATE_BEGIN &&
+               poExpr->nOperation <= SWQ_AGGREGATE_END)) &&
              poExpr->nSubExprCount >= 1 &&
              poExpr->papoSubExpr[0]->eNodeType == SNT_COLUMN)
     {
@@ -401,6 +403,26 @@ int swq_select::PushField(swq_expr_node *poExpr, const char *pszAlias,
             "%s_%s", op->pszName, poExpr->papoSubExpr[0]->string_value));
     }
 
+    if (bHidden)
+    {
+        const char *pszDstFieldName =
+            col_def->field_alias ? col_def->field_alias : col_def->field_name;
+        if (!EQUAL(pszDstFieldName, "OGR_STYLE"))
+        {
+            CPLError(
+                CE_Failure, CPLE_AppDefined,
+                "HIDDEN keyword only supported on a column named OGR_STYLE");
+            CPLFree(col_def->table_name);
+            col_def->table_name = nullptr;
+            CPLFree(col_def->field_name);
+            col_def->field_name = nullptr;
+            CPLFree(col_def->field_alias);
+            col_def->field_alias = nullptr;
+            column_defs.pop_back();
+            return FALSE;
+        }
+    }
+
     col_def->table_index = -1;
     col_def->field_index = -1;
     col_def->field_type = SWQ_OTHER;
@@ -409,6 +431,7 @@ int swq_select::PushField(swq_expr_node *poExpr, const char *pszAlias,
     col_def->target_subtype = OFSTNone;
     col_def->col_func = SWQCF_NONE;
     col_def->distinct_flag = distinct_flag;
+    col_def->bHidden = bHidden;
 
     /* -------------------------------------------------------------------- */
     /*      Do we have a CAST operator in play?                             */
@@ -552,8 +575,8 @@ int swq_select::PushField(swq_expr_node *poExpr, const char *pszAlias,
     /*      Do we have a special column function in play?                   */
     /* -------------------------------------------------------------------- */
     if (poExpr->eNodeType == SNT_OPERATION &&
-        static_cast<swq_op>(poExpr->nOperation) >= SWQ_AVG &&
-        static_cast<swq_op>(poExpr->nOperation) <= SWQ_SUM)
+        static_cast<swq_op>(poExpr->nOperation) >= SWQ_AGGREGATE_BEGIN &&
+        static_cast<swq_op>(poExpr->nOperation) <= SWQ_AGGREGATE_END)
     {
         if (poExpr->nSubExprCount != 1)
         {
@@ -994,11 +1017,11 @@ CPLErr swq_select::parse(swq_field_list *field_list,
         }
 
         // Identify column function if present.
-        if (((def->col_func == SWQCF_MIN || def->col_func == SWQCF_MAX ||
-              def->col_func == SWQCF_AVG || def->col_func == SWQCF_SUM) &&
-             def->field_type == SWQ_GEOMETRY) ||
-            ((def->col_func == SWQCF_AVG || def->col_func == SWQCF_SUM) &&
-             def->field_type == SWQ_STRING))
+        if (def->col_func != SWQCF_NONE && def->col_func != SWQCF_CUSTOM &&
+            def->col_func != SWQCF_COUNT &&
+            (def->field_type == SWQ_GEOMETRY ||
+             (def->field_type == SWQ_STRING && def->col_func != SWQCF_MIN &&
+              def->col_func != SWQCF_MAX)))
         {
             // Possibly this is already enforced by the checker?
             const swq_operation *op = swq_op_registrar::GetOperator(
@@ -1044,9 +1067,17 @@ CPLErr swq_select::parse(swq_field_list *field_list,
             }
         }
 
-        if (def->col_func == SWQCF_MIN || def->col_func == SWQCF_MAX ||
-            def->col_func == SWQCF_AVG || def->col_func == SWQCF_SUM ||
-            def->col_func == SWQCF_COUNT)
+        if (def->col_func == SWQCF_NONE)
+        {
+            if (query_mode == SWQM_DISTINCT_LIST)
+            {
+                def->distinct_flag = TRUE;
+                this_indicator = SWQM_DISTINCT_LIST;
+            }
+            else
+                this_indicator = SWQM_RECORDSET;
+        }
+        else if (def->col_func != SWQCF_CUSTOM)
         {
             this_indicator = SWQM_SUMMARY_RECORD;
             if (def->col_func == SWQCF_COUNT && def->distinct_flag &&
@@ -1057,16 +1088,6 @@ CPLErr swq_select::parse(swq_field_list *field_list,
                 return CE_Failure;
             }
         }
-        else if (def->col_func == SWQCF_NONE)
-        {
-            if (query_mode == SWQM_DISTINCT_LIST)
-            {
-                def->distinct_flag = TRUE;
-                this_indicator = SWQM_DISTINCT_LIST;
-            }
-            else
-                this_indicator = SWQM_RECORDSET;
-        }
 
         if (this_indicator != query_mode && this_indicator != -1 &&
             query_mode != 0)
@@ -1161,7 +1182,7 @@ CPLErr swq_select::parse(swq_field_list *field_list,
 bool swq_select::IsFieldExcluded(int src_index, const char *pszTableName,
                                  const char *pszFieldName)
 {
-    auto list_it = m_exclude_fields.find(src_index);
+    const auto list_it = m_exclude_fields.find(src_index);
 
     if (list_it == m_exclude_fields.end())
     {
diff --git a/ogr/test_geo_utils.cpp b/ogr/test_geo_utils.cpp
index a4d3468292d0..85f1f5a212f1 100644
--- a/ogr/test_geo_utils.cpp
+++ b/ogr/test_geo_utils.cpp
@@ -9,41 +9,55 @@ int main(int /* argc */, char * /* argv */[])
     const double lonB = 2.00001;
 
     double heading = OGR_GreatCircle_InitialHeading(latA, lonA, latB, lonB);
-    double distance = OGR_GreatCircle_Distance(latA, lonA, latB, lonB);
+    double distance = OGR_GreatCircle_Distance(latA, lonA, latB, lonB,
+                                               OGR_GREATCIRCLE_DEFAULT_RADIUS);
     double latC = 0.0;
     double lonC = 0.0;
-    OGR_GreatCircle_ExtendPosition(latA, lonA, distance, heading, &latC, &lonC);
+    OGR_GreatCircle_ExtendPosition(latA, lonA, distance, heading,
+                                   OGR_GREATCIRCLE_DEFAULT_RADIUS, &latC,
+                                   &lonC);
     printf("heading=%f, distance=%f\n", heading, distance);
     printf("%.15f=%.15f, %.15f=%.15f\n", latB, latC, lonB, lonC);
 
     heading = OGR_GreatCircle_InitialHeading(latB, lonB, latA, lonA);
-    distance = OGR_GreatCircle_Distance(latB, lonB, latA, lonA);
-    OGR_GreatCircle_ExtendPosition(latB, lonB, distance, heading, &latC, &lonC);
+    distance = OGR_GreatCircle_Distance(latB, lonB, latA, lonA,
+                                        OGR_GREATCIRCLE_DEFAULT_RADIUS);
+    OGR_GreatCircle_ExtendPosition(latB, lonB, distance, heading,
+                                   OGR_GREATCIRCLE_DEFAULT_RADIUS, &latC,
+                                   &lonC);
     printf("heading=%f, distance=%f\n", heading, distance);
     printf("%.15f=%.15f, %.15f=%.15f\n", latA, latC, lonA, lonC);
 
-    OGR_GreatCircle_ExtendPosition(0, 100, 100000, 0, &latC, &lonC);
+    OGR_GreatCircle_ExtendPosition(
+        0, 100, 100000, 0, OGR_GREATCIRCLE_DEFAULT_RADIUS, &latC, &lonC);
     printf("lat=%.15f, lon=%.15f\n", latC, lonC);
 
-    OGR_GreatCircle_ExtendPosition(0, 100, 100000, 90, &latC, &lonC);
+    OGR_GreatCircle_ExtendPosition(
+        0, 100, 100000, 90, OGR_GREATCIRCLE_DEFAULT_RADIUS, &latC, &lonC);
     printf("lat=%.15f, lon=%.15f\n", latC, lonC);
 
-    OGR_GreatCircle_ExtendPosition(0, 100, 100000, 180, &latC, &lonC);
+    OGR_GreatCircle_ExtendPosition(
+        0, 100, 100000, 180, OGR_GREATCIRCLE_DEFAULT_RADIUS, &latC, &lonC);
     printf("lat=%.15f, lon=%.15f\n", latC, lonC);
 
-    OGR_GreatCircle_ExtendPosition(0, 100, 100000, 270, &latC, &lonC);
+    OGR_GreatCircle_ExtendPosition(
+        0, 100, 100000, 270, OGR_GREATCIRCLE_DEFAULT_RADIUS, &latC, &lonC);
     printf("lat=%.15f, lon=%.15f\n", latC, lonC);
 
-    OGR_GreatCircle_ExtendPosition(0, 0, 100000, 0, &latC, &lonC);
+    OGR_GreatCircle_ExtendPosition(
+        0, 0, 100000, 0, OGR_GREATCIRCLE_DEFAULT_RADIUS, &latC, &lonC);
     printf("lat=%.15f, lon=%.15f\n", latC, lonC);
 
-    OGR_GreatCircle_ExtendPosition(0, 0, 100000, 90, &latC, &lonC);
+    OGR_GreatCircle_ExtendPosition(
+        0, 0, 100000, 90, OGR_GREATCIRCLE_DEFAULT_RADIUS, &latC, &lonC);
     printf("lat=%.15f, lon=%.15f\n", latC, lonC);
 
-    OGR_GreatCircle_ExtendPosition(0, 0, 100000, 180, &latC, &lonC);
+    OGR_GreatCircle_ExtendPosition(
+        0, 0, 100000, 180, OGR_GREATCIRCLE_DEFAULT_RADIUS, &latC, &lonC);
     printf("lat=%.15f, lon=%.15f\n", latC, lonC);
 
-    OGR_GreatCircle_ExtendPosition(0, 0, 100000, 270, &latC, &lonC);
+    OGR_GreatCircle_ExtendPosition(
+        0, 0, 100000, 270, OGR_GREATCIRCLE_DEFAULT_RADIUS, &latC, &lonC);
     printf("lat=%.15f, lon=%.15f\n", latC, lonC);
 
     return 0;
diff --git a/perftests/bench_ogr_batch.cpp b/perftests/bench_ogr_batch.cpp
index b53d5c2b504c..4fc9bb07cfcd 100644
--- a/perftests/bench_ogr_batch.cpp
+++ b/perftests/bench_ogr_batch.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_priv.h"
@@ -39,7 +23,8 @@ static void Usage()
 {
     printf(
         "Usage: bench_ogr_batch [-where filter] [-spat xmin ymin xmax ymax]\n");
-    printf("                      [--stream-opt NAME=VALUE] [-v]*\n");
+    printf("                      [--stream-opt NAME=VALUE] [-v] [-sql "
+           "<statement]*\n");
     printf("                      filename [layer_name]\n");
     exit(1);
 }
@@ -63,6 +48,7 @@ int main(int argc, char *argv[])
     const char *pszLayerName = nullptr;
     CPLStringList aosSteamOptions;
     bool bVerbose = false;
+    const char *pszSQL = nullptr;
     for (int iArg = 1; iArg < argc; ++iArg)
     {
         if (iArg + 1 < argc && strcmp(argv[iArg], "-where") == 0)
@@ -70,6 +56,11 @@ int main(int argc, char *argv[])
             pszWhere = argv[iArg + 1];
             ++iArg;
         }
+        else if (iArg + 1 < argc && strcmp(argv[iArg], "-sql") == 0)
+        {
+            pszSQL = argv[iArg + 1];
+            ++iArg;
+        }
         else if (iArg + 4 < argc && strcmp(argv[iArg], "-spat") == 0)
         {
             OGRLinearRing oRing;
@@ -125,15 +116,25 @@ int main(int argc, char *argv[])
         exit(1);
     }
 
-    if (pszLayerName == nullptr && poDS->GetLayerCount() > 1)
+    if (pszSQL)
+    {
+        if (pszLayerName)
+        {
+            fprintf(stderr, "-sql is mutually exclusive with layer name.\n");
+            CSLDestroy(argv);
+            exit(1);
+        }
+    }
+    else if (pszLayerName == nullptr && poDS->GetLayerCount() > 1)
     {
         fprintf(stderr, "A layer name must be specified because the dataset "
                         "has several layers.\n");
         CSLDestroy(argv);
         exit(1);
     }
-    OGRLayer *poLayer =
-        pszLayerName ? poDS->GetLayerByName(pszLayerName) : poDS->GetLayer(0);
+    OGRLayer *poLayer = pszSQL ? poDS->ExecuteSQL(pszSQL, nullptr, nullptr)
+                        : pszLayerName ? poDS->GetLayerByName(pszLayerName)
+                                       : poDS->GetLayer(0);
     if (poLayer == nullptr)
     {
         fprintf(stderr, "Cannot find layer\n");
@@ -201,6 +202,9 @@ int main(int argc, char *argv[])
         printf(CPL_FRMT_GUIB " features/rows selected\n", nFeatureCount);
     }
 
+    if (pszSQL)
+        poDS->ReleaseResultSet(poLayer);
+
     poDS.reset();
 
     CSLDestroy(argv);
diff --git a/perftests/bench_ogr_c_api.cpp b/perftests/bench_ogr_c_api.cpp
index ddd02ec12122..1416e56cd60d 100644
--- a/perftests/bench_ogr_c_api.cpp
+++ b/perftests/bench_ogr_c_api.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal_priv.h"
diff --git a/perftests/testperfcopywords.cpp b/perftests/testperfcopywords.cpp
index ac4816775ec3..fa0308a9a1ae 100644
--- a/perftests/testperfcopywords.cpp
+++ b/perftests/testperfcopywords.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2009-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal.h"
diff --git a/perftests/testperfdeinterleave.cpp b/perftests/testperfdeinterleave.cpp
index 4bb21531af3c..ddcb39eaa66c 100644
--- a/perftests/testperfdeinterleave.cpp
+++ b/perftests/testperfdeinterleave.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "gdal.h"
diff --git a/port/CMakeLists.txt b/port/CMakeLists.txt
index 52fe942f48c7..08a3bfda6730 100644
--- a/port/CMakeLists.txt
+++ b/port/CMakeLists.txt
@@ -52,6 +52,7 @@ set(CPL_SOURCES
     cplstring.cpp
     cpl_vsisimple.cpp
     cpl_vsil.cpp
+    cpl_vsi_mem.cpp
     cpl_http.cpp
     cpl_hash_set.cpp
     cplkeywordparser.cpp
@@ -94,6 +95,7 @@ set(CPL_SOURCES
     cpl_swift.cpp
     cpl_vsil_adls.cpp
     cpl_vsil_az.cpp
+    cpl_vsil_chunked_write_handle.cpp
     cpl_vsil_uploadonclose.cpp
     cpl_vsil_gs.cpp
     cpl_vsil_webhdfs.cpp
@@ -129,19 +131,6 @@ if(CMAKE_INSTALL_FULL_SYSCONFDIR)
     target_compile_definitions(cpl PRIVATE SYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}")
 endif()
 
-# To enable conditional use of std::shared_mutex in cpl_vsi_mem.cpp
-add_library(cpl_vsi_mem OBJECT cpl_vsi_mem.cpp)
-target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:cpl_vsi_mem>)
-target_compile_options(cpl_vsi_mem PRIVATE ${GDAL_CXX_WARNING_FLAGS} ${WFLAG_OLD_STYLE_CAST} ${WFLAG_EFFCXX})
-set_property(TARGET cpl_vsi_mem PROPERTY POSITION_INDEPENDENT_CODE ${GDAL_OBJECT_LIBRARIES_POSITION_INDEPENDENT_CODE})
-target_include_directories(cpl_vsi_mem PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
-
-include(CheckCXXCompilerFlag)
-check_cxx_compiler_flag("-std=c++17" COMPILER_SUPPORTS_CXX17)
-if(COMPILER_SUPPORTS_CXX17)
-    target_compile_features(cpl_vsi_mem PRIVATE cxx_std_17)
-endif()
-
 if (WIN32)
   target_sources(cpl PRIVATE cpl_vsil_win32.cpp)
 else ()
@@ -385,3 +374,25 @@ if (NOT CMAKE_CROSSCOMPILING AND BUILD_VSIPRELOAD AND "${CMAKE_SYSTEM}" MATCHES
     endforeach()
   endif ()
 endif ()
+
+if (GDAL_USE_ICONV)
+    # Utility to generate cpl_character_sets.h and .c
+    add_executable(character_set_conv_table_generator EXCLUDE_FROM_ALL character_set_conv_table_generator.c)
+
+      if (NOT Iconv_IS_BUILT_IN)
+        if (APPLE)
+          # linkage against OSX's system iconv is going to require LIBICONV_PLUG to be defined, but other self-built
+          # situations like CondaForge or Homebrew might not need this
+          if (HAVE_ICONV_CLOSE)
+            target_compile_definitions(character_set_conv_table_generator PRIVATE -DLIBICONV_PLUG)
+          endif (HAVE_ICONV_CLOSE)
+        endif (APPLE)
+        target_link_libraries(character_set_conv_table_generator PRIVATE Iconv::Iconv)
+      endif ()
+
+    # Custom target that must be manually invoked if character_set_conv_table_generator.c is modified
+    add_custom_target(generate_cpl_character_sets
+                      COMMAND $<TARGET_FILE:character_set_conv_table_generator>
+                      WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+                      DEPENDS character_set_conv_table_generator)
+endif()
diff --git a/port/character_set_conv_table_generator.c b/port/character_set_conv_table_generator.c
new file mode 100644
index 000000000000..9b8928f6bac6
--- /dev/null
+++ b/port/character_set_conv_table_generator.c
@@ -0,0 +1,124 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024 Even Rouault
+
+#include <assert.h>
+#include <iconv.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#define ENCODING_MAX_LEN 256
+
+static void launder_name(const char *srcEncoding,
+                         char srcEncodingLaundered[ENCODING_MAX_LEN])
+{
+    snprintf(srcEncodingLaundered, ENCODING_MAX_LEN, "%s", srcEncoding);
+    for (int i = 0; srcEncodingLaundered[i]; ++i)
+    {
+        if (srcEncodingLaundered[i] == '-')
+            srcEncodingLaundered[i] = '_';
+    }
+}
+
+static void generate(FILE *c_file, FILE *h_file, const char *srcEncoding,
+                     const char *comment)
+{
+    iconv_t sConv = iconv_open("UTF-8", srcEncoding);
+    if (sConv == (iconv_t)(-1))
+    {
+        fprintf(stderr, "iconv_open(%s) failed\n", srcEncoding);
+        exit(1);
+    }
+    char srcEncodingLaundered[ENCODING_MAX_LEN];
+    launder_name(srcEncoding, srcEncodingLaundered);
+    fprintf(c_file, "/* %s */\n", comment);
+    fprintf(c_file, "static const CPLCodePageConvTable CPL_%s_to_UTF8 = {\n",
+            srcEncodingLaundered);
+    for (int i = 0; i <= 255; ++i)
+    {
+        unsigned char c = (unsigned char)i;
+        size_t size_in = 1;
+        unsigned char out[4] = {0, 0, 0, 0};
+        size_t size_out = sizeof(out);
+        char *p_in = (char *)&c;
+        char *p_out = (char *)out;
+        size_t nConverted = iconv(sConv, &p_in, &size_in, &p_out, &size_out);
+        if (i <= 127)
+        {
+            assert(out[0] == i);
+            continue;
+        }
+        if (nConverted != (size_t)-1)
+        {
+            const size_t needed = sizeof(out) - size_out;
+            assert(needed <= 3);
+            fprintf(c_file, "  {0x%02X, 0x%02X, 0x%02X},\n", out[0], out[1],
+                    out[2]);
+        }
+        else
+        {
+            fprintf(c_file, "  {0, 0, 0}, /* invalid */\n");
+        }
+    }
+    fprintf(c_file, "};\n\n");
+    iconv_close(sConv);
+}
+
+int main()
+{
+    FILE *c_file = fopen("cpl_character_sets.c", "wb");
+    FILE *h_file = fopen("cpl_character_sets.h", "wb");
+    fprintf(c_file, "/* This file has been generated by "
+                    "generate_character_set_conv_tables.c */\n");
+    fprintf(c_file, "/* DO NOT EDIT !*/\n\n");
+    fprintf(c_file, "/* clang-format off */\n");
+    fprintf(c_file, "#include \"cpl_port.h\"\n");
+    fprintf(c_file, "#include \"cpl_character_sets.h\"\n\n");
+
+    fprintf(h_file, "/* This file has been generated by "
+                    "generate_character_set_conv_tables.c */\n");
+    fprintf(h_file, "/* DO NOT EDIT !*/\n\n");
+    fprintf(h_file, "/* clang-format off */\n");
+    fprintf(h_file, "typedef unsigned char CPLCodePageConvTable[128][3];\n");
+
+    const struct
+    {
+        const char *name;
+        const char *comment;
+    } encodings[] = {
+        {"CP437", "Character set of original IBM PC"},
+        {"CP1250", "Central and eastern Europe languages"},
+        {"CP1251", "Cyrillic script"},
+        {"CP1252",
+         "Legacy Windows single-byte character set used in a lot of countries"},
+        {"ISO-8859-2", "Central Europe languages"},
+        {"ISO-8859-15", "New Western Europe"},
+        {NULL, NULL}};
+
+    for (int i = 0; encodings[i].name; ++i)
+    {
+        generate(c_file, h_file, encodings[i].name, encodings[i].comment);
+    }
+    fprintf(h_file, "\n");
+    fprintf(h_file, "const CPLCodePageConvTable* "
+                    "CPLGetConversionTableToUTF8(const char* pszEncoding);\n");
+
+    fprintf(c_file, "\nconst CPLCodePageConvTable* "
+                    "CPLGetConversionTableToUTF8(const char* pszEncoding)\n");
+    fprintf(c_file, "{\n");
+    for (int i = 0; encodings[i].name; ++i)
+    {
+        char srcEncodingLaundered[ENCODING_MAX_LEN];
+        launder_name(encodings[i].name, srcEncodingLaundered);
+        fprintf(c_file, "    if (EQUAL(pszEncoding, \"%s\"))\n",
+                encodings[i].name);
+        fprintf(c_file, "        return &CPL_%s_to_UTF8;\n",
+                srcEncodingLaundered);
+    }
+    fprintf(c_file, "    return CPL_NULLPTR;\n");
+    fprintf(c_file, "}\n");
+    fprintf(c_file, "/* clang-format on */\n");
+    fprintf(h_file, "/* clang-format on */\n");
+    fclose(c_file);
+    fclose(h_file);
+    return 0;
+}
diff --git a/port/cpl_alibaba_oss.cpp b/port/cpl_alibaba_oss.cpp
index 5bd3e519bc9b..894e93191fe6 100644
--- a/port/cpl_alibaba_oss.cpp
+++ b/port/cpl_alibaba_oss.cpp
@@ -8,23 +8,7 @@
  **********************************************************************
  * Copyright (c) 2017, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 //! @cond Doxygen_Suppress
diff --git a/port/cpl_alibaba_oss.h b/port/cpl_alibaba_oss.h
index 89e6a0bfe678..890e0b54536b 100644
--- a/port/cpl_alibaba_oss.h
+++ b/port/cpl_alibaba_oss.h
@@ -9,23 +9,7 @@
  **********************************************************************
  * Copyright (c) 2017, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_ALIBABA_OSS_INCLUDED_H
diff --git a/port/cpl_atomic_ops.cpp b/port/cpl_atomic_ops.cpp
index e67bb170975d..3b446ddb0809 100644
--- a/port/cpl_atomic_ops.cpp
+++ b/port/cpl_atomic_ops.cpp
@@ -8,23 +8,7 @@
  **********************************************************************
  * Copyright (c) 2009-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_atomic_ops.h"
diff --git a/port/cpl_atomic_ops.h b/port/cpl_atomic_ops.h
index 44c8be1b0bf5..613384cb55d9 100644
--- a/port/cpl_atomic_ops.h
+++ b/port/cpl_atomic_ops.h
@@ -9,23 +9,7 @@
  **********************************************************************
  * Copyright (c) 2009-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_ATOMIC_OPS_INCLUDED
diff --git a/port/cpl_auto_close.h b/port/cpl_auto_close.h
index 2a4d44f259af..5678893da9ac 100644
--- a/port/cpl_auto_close.h
+++ b/port/cpl_auto_close.h
@@ -9,23 +9,7 @@
  **********************************************************************
  * Copyright (c) 2018, Liu Yimin
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_AUTO_CLOSE_H_INCLUDED
diff --git a/port/cpl_aws.cpp b/port/cpl_aws.cpp
index de5c7478ed10..9a30d0e05ebd 100644
--- a/port/cpl_aws.cpp
+++ b/port/cpl_aws.cpp
@@ -8,23 +8,7 @@
  **********************************************************************
  * Copyright (c) 2015, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 //! @cond Doxygen_Suppress
@@ -678,7 +662,7 @@ static bool ReadAWSTokenFile(const std::string &osAWSTokenFile,
     VSIFree(pabyOut);
     // Remove trailing end-of-line character
     if (!awsToken.empty() && awsToken.back() == '\n')
-        awsToken.resize(awsToken.size() - 1);
+        awsToken.pop_back();
     return !awsToken.empty();
 }
 
diff --git a/port/cpl_aws.h b/port/cpl_aws.h
index dce8f26a45e3..2761ec7a0e35 100644
--- a/port/cpl_aws.h
+++ b/port/cpl_aws.h
@@ -9,23 +9,7 @@
  **********************************************************************
  * Copyright (c) 2015, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_AWS_INCLUDED_H
diff --git a/port/cpl_aws_win32.cpp b/port/cpl_aws_win32.cpp
index ce57dd02d432..021ad12f84ce 100644
--- a/port/cpl_aws_win32.cpp
+++ b/port/cpl_aws_win32.cpp
@@ -7,23 +7,7 @@
  **********************************************************************
  * Copyright (c) 2020, Robin Princeley <rprinceley@esri.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/port/cpl_azure.h b/port/cpl_azure.h
index 45d8416d900e..843ab0d215ec 100644
--- a/port/cpl_azure.h
+++ b/port/cpl_azure.h
@@ -6,23 +6,7 @@
  **********************************************************************
  * Copyright (c) 2017, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_AZURE_INCLUDED_H
diff --git a/port/cpl_character_sets.c b/port/cpl_character_sets.c
new file mode 100644
index 000000000000..65a326059785
--- /dev/null
+++ b/port/cpl_character_sets.c
@@ -0,0 +1,818 @@
+/* This file has been generated by generate_character_set_conv_tables.c */
+/* DO NOT EDIT !*/
+
+/* clang-format off */
+#include "cpl_port.h"
+#include "cpl_character_sets.h"
+
+/* Character set of original IBM PC */
+static const CPLCodePageConvTable CPL_CP437_to_UTF8 = {
+  {0xC3, 0x87, 0x00},
+  {0xC3, 0xBC, 0x00},
+  {0xC3, 0xA9, 0x00},
+  {0xC3, 0xA2, 0x00},
+  {0xC3, 0xA4, 0x00},
+  {0xC3, 0xA0, 0x00},
+  {0xC3, 0xA5, 0x00},
+  {0xC3, 0xA7, 0x00},
+  {0xC3, 0xAA, 0x00},
+  {0xC3, 0xAB, 0x00},
+  {0xC3, 0xA8, 0x00},
+  {0xC3, 0xAF, 0x00},
+  {0xC3, 0xAE, 0x00},
+  {0xC3, 0xAC, 0x00},
+  {0xC3, 0x84, 0x00},
+  {0xC3, 0x85, 0x00},
+  {0xC3, 0x89, 0x00},
+  {0xC3, 0xA6, 0x00},
+  {0xC3, 0x86, 0x00},
+  {0xC3, 0xB4, 0x00},
+  {0xC3, 0xB6, 0x00},
+  {0xC3, 0xB2, 0x00},
+  {0xC3, 0xBB, 0x00},
+  {0xC3, 0xB9, 0x00},
+  {0xC3, 0xBF, 0x00},
+  {0xC3, 0x96, 0x00},
+  {0xC3, 0x9C, 0x00},
+  {0xC2, 0xA2, 0x00},
+  {0xC2, 0xA3, 0x00},
+  {0xC2, 0xA5, 0x00},
+  {0xE2, 0x82, 0xA7},
+  {0xC6, 0x92, 0x00},
+  {0xC3, 0xA1, 0x00},
+  {0xC3, 0xAD, 0x00},
+  {0xC3, 0xB3, 0x00},
+  {0xC3, 0xBA, 0x00},
+  {0xC3, 0xB1, 0x00},
+  {0xC3, 0x91, 0x00},
+  {0xC2, 0xAA, 0x00},
+  {0xC2, 0xBA, 0x00},
+  {0xC2, 0xBF, 0x00},
+  {0xE2, 0x8C, 0x90},
+  {0xC2, 0xAC, 0x00},
+  {0xC2, 0xBD, 0x00},
+  {0xC2, 0xBC, 0x00},
+  {0xC2, 0xA1, 0x00},
+  {0xC2, 0xAB, 0x00},
+  {0xC2, 0xBB, 0x00},
+  {0xE2, 0x96, 0x91},
+  {0xE2, 0x96, 0x92},
+  {0xE2, 0x96, 0x93},
+  {0xE2, 0x94, 0x82},
+  {0xE2, 0x94, 0xA4},
+  {0xE2, 0x95, 0xA1},
+  {0xE2, 0x95, 0xA2},
+  {0xE2, 0x95, 0x96},
+  {0xE2, 0x95, 0x95},
+  {0xE2, 0x95, 0xA3},
+  {0xE2, 0x95, 0x91},
+  {0xE2, 0x95, 0x97},
+  {0xE2, 0x95, 0x9D},
+  {0xE2, 0x95, 0x9C},
+  {0xE2, 0x95, 0x9B},
+  {0xE2, 0x94, 0x90},
+  {0xE2, 0x94, 0x94},
+  {0xE2, 0x94, 0xB4},
+  {0xE2, 0x94, 0xAC},
+  {0xE2, 0x94, 0x9C},
+  {0xE2, 0x94, 0x80},
+  {0xE2, 0x94, 0xBC},
+  {0xE2, 0x95, 0x9E},
+  {0xE2, 0x95, 0x9F},
+  {0xE2, 0x95, 0x9A},
+  {0xE2, 0x95, 0x94},
+  {0xE2, 0x95, 0xA9},
+  {0xE2, 0x95, 0xA6},
+  {0xE2, 0x95, 0xA0},
+  {0xE2, 0x95, 0x90},
+  {0xE2, 0x95, 0xAC},
+  {0xE2, 0x95, 0xA7},
+  {0xE2, 0x95, 0xA8},
+  {0xE2, 0x95, 0xA4},
+  {0xE2, 0x95, 0xA5},
+  {0xE2, 0x95, 0x99},
+  {0xE2, 0x95, 0x98},
+  {0xE2, 0x95, 0x92},
+  {0xE2, 0x95, 0x93},
+  {0xE2, 0x95, 0xAB},
+  {0xE2, 0x95, 0xAA},
+  {0xE2, 0x94, 0x98},
+  {0xE2, 0x94, 0x8C},
+  {0xE2, 0x96, 0x88},
+  {0xE2, 0x96, 0x84},
+  {0xE2, 0x96, 0x8C},
+  {0xE2, 0x96, 0x90},
+  {0xE2, 0x96, 0x80},
+  {0xCE, 0xB1, 0x00},
+  {0xC3, 0x9F, 0x00},
+  {0xCE, 0x93, 0x00},
+  {0xCF, 0x80, 0x00},
+  {0xCE, 0xA3, 0x00},
+  {0xCF, 0x83, 0x00},
+  {0xC2, 0xB5, 0x00},
+  {0xCF, 0x84, 0x00},
+  {0xCE, 0xA6, 0x00},
+  {0xCE, 0x98, 0x00},
+  {0xCE, 0xA9, 0x00},
+  {0xCE, 0xB4, 0x00},
+  {0xE2, 0x88, 0x9E},
+  {0xCF, 0x86, 0x00},
+  {0xCE, 0xB5, 0x00},
+  {0xE2, 0x88, 0xA9},
+  {0xE2, 0x89, 0xA1},
+  {0xC2, 0xB1, 0x00},
+  {0xE2, 0x89, 0xA5},
+  {0xE2, 0x89, 0xA4},
+  {0xE2, 0x8C, 0xA0},
+  {0xE2, 0x8C, 0xA1},
+  {0xC3, 0xB7, 0x00},
+  {0xE2, 0x89, 0x88},
+  {0xC2, 0xB0, 0x00},
+  {0xE2, 0x88, 0x99},
+  {0xC2, 0xB7, 0x00},
+  {0xE2, 0x88, 0x9A},
+  {0xE2, 0x81, 0xBF},
+  {0xC2, 0xB2, 0x00},
+  {0xE2, 0x96, 0xA0},
+  {0xC2, 0xA0, 0x00},
+};
+
+/* Central and eastern Europe languages */
+static const CPLCodePageConvTable CPL_CP1250_to_UTF8 = {
+  {0xE2, 0x82, 0xAC},
+  {0, 0, 0}, /* invalid */
+  {0xE2, 0x80, 0x9A},
+  {0, 0, 0}, /* invalid */
+  {0xE2, 0x80, 0x9E},
+  {0xE2, 0x80, 0xA6},
+  {0xE2, 0x80, 0xA0},
+  {0xE2, 0x80, 0xA1},
+  {0, 0, 0}, /* invalid */
+  {0xE2, 0x80, 0xB0},
+  {0xC5, 0xA0, 0x00},
+  {0xE2, 0x80, 0xB9},
+  {0xC5, 0x9A, 0x00},
+  {0xC5, 0xA4, 0x00},
+  {0xC5, 0xBD, 0x00},
+  {0xC5, 0xB9, 0x00},
+  {0, 0, 0}, /* invalid */
+  {0xE2, 0x80, 0x98},
+  {0xE2, 0x80, 0x99},
+  {0xE2, 0x80, 0x9C},
+  {0xE2, 0x80, 0x9D},
+  {0xE2, 0x80, 0xA2},
+  {0xE2, 0x80, 0x93},
+  {0xE2, 0x80, 0x94},
+  {0, 0, 0}, /* invalid */
+  {0xE2, 0x84, 0xA2},
+  {0xC5, 0xA1, 0x00},
+  {0xE2, 0x80, 0xBA},
+  {0xC5, 0x9B, 0x00},
+  {0xC5, 0xA5, 0x00},
+  {0xC5, 0xBE, 0x00},
+  {0xC5, 0xBA, 0x00},
+  {0xC2, 0xA0, 0x00},
+  {0xCB, 0x87, 0x00},
+  {0xCB, 0x98, 0x00},
+  {0xC5, 0x81, 0x00},
+  {0xC2, 0xA4, 0x00},
+  {0xC4, 0x84, 0x00},
+  {0xC2, 0xA6, 0x00},
+  {0xC2, 0xA7, 0x00},
+  {0xC2, 0xA8, 0x00},
+  {0xC2, 0xA9, 0x00},
+  {0xC5, 0x9E, 0x00},
+  {0xC2, 0xAB, 0x00},
+  {0xC2, 0xAC, 0x00},
+  {0xC2, 0xAD, 0x00},
+  {0xC2, 0xAE, 0x00},
+  {0xC5, 0xBB, 0x00},
+  {0xC2, 0xB0, 0x00},
+  {0xC2, 0xB1, 0x00},
+  {0xCB, 0x9B, 0x00},
+  {0xC5, 0x82, 0x00},
+  {0xC2, 0xB4, 0x00},
+  {0xC2, 0xB5, 0x00},
+  {0xC2, 0xB6, 0x00},
+  {0xC2, 0xB7, 0x00},
+  {0xC2, 0xB8, 0x00},
+  {0xC4, 0x85, 0x00},
+  {0xC5, 0x9F, 0x00},
+  {0xC2, 0xBB, 0x00},
+  {0xC4, 0xBD, 0x00},
+  {0xCB, 0x9D, 0x00},
+  {0xC4, 0xBE, 0x00},
+  {0xC5, 0xBC, 0x00},
+  {0xC5, 0x94, 0x00},
+  {0xC3, 0x81, 0x00},
+  {0xC3, 0x82, 0x00},
+  {0xC4, 0x82, 0x00},
+  {0xC3, 0x84, 0x00},
+  {0xC4, 0xB9, 0x00},
+  {0xC4, 0x86, 0x00},
+  {0xC3, 0x87, 0x00},
+  {0xC4, 0x8C, 0x00},
+  {0xC3, 0x89, 0x00},
+  {0xC4, 0x98, 0x00},
+  {0xC3, 0x8B, 0x00},
+  {0xC4, 0x9A, 0x00},
+  {0xC3, 0x8D, 0x00},
+  {0xC3, 0x8E, 0x00},
+  {0xC4, 0x8E, 0x00},
+  {0xC4, 0x90, 0x00},
+  {0xC5, 0x83, 0x00},
+  {0xC5, 0x87, 0x00},
+  {0xC3, 0x93, 0x00},
+  {0xC3, 0x94, 0x00},
+  {0xC5, 0x90, 0x00},
+  {0xC3, 0x96, 0x00},
+  {0xC3, 0x97, 0x00},
+  {0xC5, 0x98, 0x00},
+  {0xC5, 0xAE, 0x00},
+  {0xC3, 0x9A, 0x00},
+  {0xC5, 0xB0, 0x00},
+  {0xC3, 0x9C, 0x00},
+  {0xC3, 0x9D, 0x00},
+  {0xC5, 0xA2, 0x00},
+  {0xC3, 0x9F, 0x00},
+  {0xC5, 0x95, 0x00},
+  {0xC3, 0xA1, 0x00},
+  {0xC3, 0xA2, 0x00},
+  {0xC4, 0x83, 0x00},
+  {0xC3, 0xA4, 0x00},
+  {0xC4, 0xBA, 0x00},
+  {0xC4, 0x87, 0x00},
+  {0xC3, 0xA7, 0x00},
+  {0xC4, 0x8D, 0x00},
+  {0xC3, 0xA9, 0x00},
+  {0xC4, 0x99, 0x00},
+  {0xC3, 0xAB, 0x00},
+  {0xC4, 0x9B, 0x00},
+  {0xC3, 0xAD, 0x00},
+  {0xC3, 0xAE, 0x00},
+  {0xC4, 0x8F, 0x00},
+  {0xC4, 0x91, 0x00},
+  {0xC5, 0x84, 0x00},
+  {0xC5, 0x88, 0x00},
+  {0xC3, 0xB3, 0x00},
+  {0xC3, 0xB4, 0x00},
+  {0xC5, 0x91, 0x00},
+  {0xC3, 0xB6, 0x00},
+  {0xC3, 0xB7, 0x00},
+  {0xC5, 0x99, 0x00},
+  {0xC5, 0xAF, 0x00},
+  {0xC3, 0xBA, 0x00},
+  {0xC5, 0xB1, 0x00},
+  {0xC3, 0xBC, 0x00},
+  {0xC3, 0xBD, 0x00},
+  {0xC5, 0xA3, 0x00},
+  {0xCB, 0x99, 0x00},
+};
+
+/* Cyrillic script */
+static const CPLCodePageConvTable CPL_CP1251_to_UTF8 = {
+  {0xD0, 0x82, 0x00},
+  {0xD0, 0x83, 0x00},
+  {0xE2, 0x80, 0x9A},
+  {0xD1, 0x93, 0x00},
+  {0xE2, 0x80, 0x9E},
+  {0xE2, 0x80, 0xA6},
+  {0xE2, 0x80, 0xA0},
+  {0xE2, 0x80, 0xA1},
+  {0xE2, 0x82, 0xAC},
+  {0xE2, 0x80, 0xB0},
+  {0xD0, 0x89, 0x00},
+  {0xE2, 0x80, 0xB9},
+  {0xD0, 0x8A, 0x00},
+  {0xD0, 0x8C, 0x00},
+  {0xD0, 0x8B, 0x00},
+  {0xD0, 0x8F, 0x00},
+  {0xD1, 0x92, 0x00},
+  {0xE2, 0x80, 0x98},
+  {0xE2, 0x80, 0x99},
+  {0xE2, 0x80, 0x9C},
+  {0xE2, 0x80, 0x9D},
+  {0xE2, 0x80, 0xA2},
+  {0xE2, 0x80, 0x93},
+  {0xE2, 0x80, 0x94},
+  {0, 0, 0}, /* invalid */
+  {0xE2, 0x84, 0xA2},
+  {0xD1, 0x99, 0x00},
+  {0xE2, 0x80, 0xBA},
+  {0xD1, 0x9A, 0x00},
+  {0xD1, 0x9C, 0x00},
+  {0xD1, 0x9B, 0x00},
+  {0xD1, 0x9F, 0x00},
+  {0xC2, 0xA0, 0x00},
+  {0xD0, 0x8E, 0x00},
+  {0xD1, 0x9E, 0x00},
+  {0xD0, 0x88, 0x00},
+  {0xC2, 0xA4, 0x00},
+  {0xD2, 0x90, 0x00},
+  {0xC2, 0xA6, 0x00},
+  {0xC2, 0xA7, 0x00},
+  {0xD0, 0x81, 0x00},
+  {0xC2, 0xA9, 0x00},
+  {0xD0, 0x84, 0x00},
+  {0xC2, 0xAB, 0x00},
+  {0xC2, 0xAC, 0x00},
+  {0xC2, 0xAD, 0x00},
+  {0xC2, 0xAE, 0x00},
+  {0xD0, 0x87, 0x00},
+  {0xC2, 0xB0, 0x00},
+  {0xC2, 0xB1, 0x00},
+  {0xD0, 0x86, 0x00},
+  {0xD1, 0x96, 0x00},
+  {0xD2, 0x91, 0x00},
+  {0xC2, 0xB5, 0x00},
+  {0xC2, 0xB6, 0x00},
+  {0xC2, 0xB7, 0x00},
+  {0xD1, 0x91, 0x00},
+  {0xE2, 0x84, 0x96},
+  {0xD1, 0x94, 0x00},
+  {0xC2, 0xBB, 0x00},
+  {0xD1, 0x98, 0x00},
+  {0xD0, 0x85, 0x00},
+  {0xD1, 0x95, 0x00},
+  {0xD1, 0x97, 0x00},
+  {0xD0, 0x90, 0x00},
+  {0xD0, 0x91, 0x00},
+  {0xD0, 0x92, 0x00},
+  {0xD0, 0x93, 0x00},
+  {0xD0, 0x94, 0x00},
+  {0xD0, 0x95, 0x00},
+  {0xD0, 0x96, 0x00},
+  {0xD0, 0x97, 0x00},
+  {0xD0, 0x98, 0x00},
+  {0xD0, 0x99, 0x00},
+  {0xD0, 0x9A, 0x00},
+  {0xD0, 0x9B, 0x00},
+  {0xD0, 0x9C, 0x00},
+  {0xD0, 0x9D, 0x00},
+  {0xD0, 0x9E, 0x00},
+  {0xD0, 0x9F, 0x00},
+  {0xD0, 0xA0, 0x00},
+  {0xD0, 0xA1, 0x00},
+  {0xD0, 0xA2, 0x00},
+  {0xD0, 0xA3, 0x00},
+  {0xD0, 0xA4, 0x00},
+  {0xD0, 0xA5, 0x00},
+  {0xD0, 0xA6, 0x00},
+  {0xD0, 0xA7, 0x00},
+  {0xD0, 0xA8, 0x00},
+  {0xD0, 0xA9, 0x00},
+  {0xD0, 0xAA, 0x00},
+  {0xD0, 0xAB, 0x00},
+  {0xD0, 0xAC, 0x00},
+  {0xD0, 0xAD, 0x00},
+  {0xD0, 0xAE, 0x00},
+  {0xD0, 0xAF, 0x00},
+  {0xD0, 0xB0, 0x00},
+  {0xD0, 0xB1, 0x00},
+  {0xD0, 0xB2, 0x00},
+  {0xD0, 0xB3, 0x00},
+  {0xD0, 0xB4, 0x00},
+  {0xD0, 0xB5, 0x00},
+  {0xD0, 0xB6, 0x00},
+  {0xD0, 0xB7, 0x00},
+  {0xD0, 0xB8, 0x00},
+  {0xD0, 0xB9, 0x00},
+  {0xD0, 0xBA, 0x00},
+  {0xD0, 0xBB, 0x00},
+  {0xD0, 0xBC, 0x00},
+  {0xD0, 0xBD, 0x00},
+  {0xD0, 0xBE, 0x00},
+  {0xD0, 0xBF, 0x00},
+  {0xD1, 0x80, 0x00},
+  {0xD1, 0x81, 0x00},
+  {0xD1, 0x82, 0x00},
+  {0xD1, 0x83, 0x00},
+  {0xD1, 0x84, 0x00},
+  {0xD1, 0x85, 0x00},
+  {0xD1, 0x86, 0x00},
+  {0xD1, 0x87, 0x00},
+  {0xD1, 0x88, 0x00},
+  {0xD1, 0x89, 0x00},
+  {0xD1, 0x8A, 0x00},
+  {0xD1, 0x8B, 0x00},
+  {0xD1, 0x8C, 0x00},
+  {0xD1, 0x8D, 0x00},
+  {0xD1, 0x8E, 0x00},
+  {0xD1, 0x8F, 0x00},
+};
+
+/* Legacy Windows single-byte character set used in a lot of countries */
+static const CPLCodePageConvTable CPL_CP1252_to_UTF8 = {
+  {0xE2, 0x82, 0xAC},
+  {0, 0, 0}, /* invalid */
+  {0xE2, 0x80, 0x9A},
+  {0xC6, 0x92, 0x00},
+  {0xE2, 0x80, 0x9E},
+  {0xE2, 0x80, 0xA6},
+  {0xE2, 0x80, 0xA0},
+  {0xE2, 0x80, 0xA1},
+  {0xCB, 0x86, 0x00},
+  {0xE2, 0x80, 0xB0},
+  {0xC5, 0xA0, 0x00},
+  {0xE2, 0x80, 0xB9},
+  {0xC5, 0x92, 0x00},
+  {0, 0, 0}, /* invalid */
+  {0xC5, 0xBD, 0x00},
+  {0, 0, 0}, /* invalid */
+  {0, 0, 0}, /* invalid */
+  {0xE2, 0x80, 0x98},
+  {0xE2, 0x80, 0x99},
+  {0xE2, 0x80, 0x9C},
+  {0xE2, 0x80, 0x9D},
+  {0xE2, 0x80, 0xA2},
+  {0xE2, 0x80, 0x93},
+  {0xE2, 0x80, 0x94},
+  {0xCB, 0x9C, 0x00},
+  {0xE2, 0x84, 0xA2},
+  {0xC5, 0xA1, 0x00},
+  {0xE2, 0x80, 0xBA},
+  {0xC5, 0x93, 0x00},
+  {0, 0, 0}, /* invalid */
+  {0xC5, 0xBE, 0x00},
+  {0xC5, 0xB8, 0x00},
+  {0xC2, 0xA0, 0x00},
+  {0xC2, 0xA1, 0x00},
+  {0xC2, 0xA2, 0x00},
+  {0xC2, 0xA3, 0x00},
+  {0xC2, 0xA4, 0x00},
+  {0xC2, 0xA5, 0x00},
+  {0xC2, 0xA6, 0x00},
+  {0xC2, 0xA7, 0x00},
+  {0xC2, 0xA8, 0x00},
+  {0xC2, 0xA9, 0x00},
+  {0xC2, 0xAA, 0x00},
+  {0xC2, 0xAB, 0x00},
+  {0xC2, 0xAC, 0x00},
+  {0xC2, 0xAD, 0x00},
+  {0xC2, 0xAE, 0x00},
+  {0xC2, 0xAF, 0x00},
+  {0xC2, 0xB0, 0x00},
+  {0xC2, 0xB1, 0x00},
+  {0xC2, 0xB2, 0x00},
+  {0xC2, 0xB3, 0x00},
+  {0xC2, 0xB4, 0x00},
+  {0xC2, 0xB5, 0x00},
+  {0xC2, 0xB6, 0x00},
+  {0xC2, 0xB7, 0x00},
+  {0xC2, 0xB8, 0x00},
+  {0xC2, 0xB9, 0x00},
+  {0xC2, 0xBA, 0x00},
+  {0xC2, 0xBB, 0x00},
+  {0xC2, 0xBC, 0x00},
+  {0xC2, 0xBD, 0x00},
+  {0xC2, 0xBE, 0x00},
+  {0xC2, 0xBF, 0x00},
+  {0xC3, 0x80, 0x00},
+  {0xC3, 0x81, 0x00},
+  {0xC3, 0x82, 0x00},
+  {0xC3, 0x83, 0x00},
+  {0xC3, 0x84, 0x00},
+  {0xC3, 0x85, 0x00},
+  {0xC3, 0x86, 0x00},
+  {0xC3, 0x87, 0x00},
+  {0xC3, 0x88, 0x00},
+  {0xC3, 0x89, 0x00},
+  {0xC3, 0x8A, 0x00},
+  {0xC3, 0x8B, 0x00},
+  {0xC3, 0x8C, 0x00},
+  {0xC3, 0x8D, 0x00},
+  {0xC3, 0x8E, 0x00},
+  {0xC3, 0x8F, 0x00},
+  {0xC3, 0x90, 0x00},
+  {0xC3, 0x91, 0x00},
+  {0xC3, 0x92, 0x00},
+  {0xC3, 0x93, 0x00},
+  {0xC3, 0x94, 0x00},
+  {0xC3, 0x95, 0x00},
+  {0xC3, 0x96, 0x00},
+  {0xC3, 0x97, 0x00},
+  {0xC3, 0x98, 0x00},
+  {0xC3, 0x99, 0x00},
+  {0xC3, 0x9A, 0x00},
+  {0xC3, 0x9B, 0x00},
+  {0xC3, 0x9C, 0x00},
+  {0xC3, 0x9D, 0x00},
+  {0xC3, 0x9E, 0x00},
+  {0xC3, 0x9F, 0x00},
+  {0xC3, 0xA0, 0x00},
+  {0xC3, 0xA1, 0x00},
+  {0xC3, 0xA2, 0x00},
+  {0xC3, 0xA3, 0x00},
+  {0xC3, 0xA4, 0x00},
+  {0xC3, 0xA5, 0x00},
+  {0xC3, 0xA6, 0x00},
+  {0xC3, 0xA7, 0x00},
+  {0xC3, 0xA8, 0x00},
+  {0xC3, 0xA9, 0x00},
+  {0xC3, 0xAA, 0x00},
+  {0xC3, 0xAB, 0x00},
+  {0xC3, 0xAC, 0x00},
+  {0xC3, 0xAD, 0x00},
+  {0xC3, 0xAE, 0x00},
+  {0xC3, 0xAF, 0x00},
+  {0xC3, 0xB0, 0x00},
+  {0xC3, 0xB1, 0x00},
+  {0xC3, 0xB2, 0x00},
+  {0xC3, 0xB3, 0x00},
+  {0xC3, 0xB4, 0x00},
+  {0xC3, 0xB5, 0x00},
+  {0xC3, 0xB6, 0x00},
+  {0xC3, 0xB7, 0x00},
+  {0xC3, 0xB8, 0x00},
+  {0xC3, 0xB9, 0x00},
+  {0xC3, 0xBA, 0x00},
+  {0xC3, 0xBB, 0x00},
+  {0xC3, 0xBC, 0x00},
+  {0xC3, 0xBD, 0x00},
+  {0xC3, 0xBE, 0x00},
+  {0xC3, 0xBF, 0x00},
+};
+
+/* Central Europe languages */
+static const CPLCodePageConvTable CPL_ISO_8859_2_to_UTF8 = {
+  {0xC2, 0x80, 0x00},
+  {0xC2, 0x81, 0x00},
+  {0xC2, 0x82, 0x00},
+  {0xC2, 0x83, 0x00},
+  {0xC2, 0x84, 0x00},
+  {0xC2, 0x85, 0x00},
+  {0xC2, 0x86, 0x00},
+  {0xC2, 0x87, 0x00},
+  {0xC2, 0x88, 0x00},
+  {0xC2, 0x89, 0x00},
+  {0xC2, 0x8A, 0x00},
+  {0xC2, 0x8B, 0x00},
+  {0xC2, 0x8C, 0x00},
+  {0xC2, 0x8D, 0x00},
+  {0xC2, 0x8E, 0x00},
+  {0xC2, 0x8F, 0x00},
+  {0xC2, 0x90, 0x00},
+  {0xC2, 0x91, 0x00},
+  {0xC2, 0x92, 0x00},
+  {0xC2, 0x93, 0x00},
+  {0xC2, 0x94, 0x00},
+  {0xC2, 0x95, 0x00},
+  {0xC2, 0x96, 0x00},
+  {0xC2, 0x97, 0x00},
+  {0xC2, 0x98, 0x00},
+  {0xC2, 0x99, 0x00},
+  {0xC2, 0x9A, 0x00},
+  {0xC2, 0x9B, 0x00},
+  {0xC2, 0x9C, 0x00},
+  {0xC2, 0x9D, 0x00},
+  {0xC2, 0x9E, 0x00},
+  {0xC2, 0x9F, 0x00},
+  {0xC2, 0xA0, 0x00},
+  {0xC4, 0x84, 0x00},
+  {0xCB, 0x98, 0x00},
+  {0xC5, 0x81, 0x00},
+  {0xC2, 0xA4, 0x00},
+  {0xC4, 0xBD, 0x00},
+  {0xC5, 0x9A, 0x00},
+  {0xC2, 0xA7, 0x00},
+  {0xC2, 0xA8, 0x00},
+  {0xC5, 0xA0, 0x00},
+  {0xC5, 0x9E, 0x00},
+  {0xC5, 0xA4, 0x00},
+  {0xC5, 0xB9, 0x00},
+  {0xC2, 0xAD, 0x00},
+  {0xC5, 0xBD, 0x00},
+  {0xC5, 0xBB, 0x00},
+  {0xC2, 0xB0, 0x00},
+  {0xC4, 0x85, 0x00},
+  {0xCB, 0x9B, 0x00},
+  {0xC5, 0x82, 0x00},
+  {0xC2, 0xB4, 0x00},
+  {0xC4, 0xBE, 0x00},
+  {0xC5, 0x9B, 0x00},
+  {0xCB, 0x87, 0x00},
+  {0xC2, 0xB8, 0x00},
+  {0xC5, 0xA1, 0x00},
+  {0xC5, 0x9F, 0x00},
+  {0xC5, 0xA5, 0x00},
+  {0xC5, 0xBA, 0x00},
+  {0xCB, 0x9D, 0x00},
+  {0xC5, 0xBE, 0x00},
+  {0xC5, 0xBC, 0x00},
+  {0xC5, 0x94, 0x00},
+  {0xC3, 0x81, 0x00},
+  {0xC3, 0x82, 0x00},
+  {0xC4, 0x82, 0x00},
+  {0xC3, 0x84, 0x00},
+  {0xC4, 0xB9, 0x00},
+  {0xC4, 0x86, 0x00},
+  {0xC3, 0x87, 0x00},
+  {0xC4, 0x8C, 0x00},
+  {0xC3, 0x89, 0x00},
+  {0xC4, 0x98, 0x00},
+  {0xC3, 0x8B, 0x00},
+  {0xC4, 0x9A, 0x00},
+  {0xC3, 0x8D, 0x00},
+  {0xC3, 0x8E, 0x00},
+  {0xC4, 0x8E, 0x00},
+  {0xC4, 0x90, 0x00},
+  {0xC5, 0x83, 0x00},
+  {0xC5, 0x87, 0x00},
+  {0xC3, 0x93, 0x00},
+  {0xC3, 0x94, 0x00},
+  {0xC5, 0x90, 0x00},
+  {0xC3, 0x96, 0x00},
+  {0xC3, 0x97, 0x00},
+  {0xC5, 0x98, 0x00},
+  {0xC5, 0xAE, 0x00},
+  {0xC3, 0x9A, 0x00},
+  {0xC5, 0xB0, 0x00},
+  {0xC3, 0x9C, 0x00},
+  {0xC3, 0x9D, 0x00},
+  {0xC5, 0xA2, 0x00},
+  {0xC3, 0x9F, 0x00},
+  {0xC5, 0x95, 0x00},
+  {0xC3, 0xA1, 0x00},
+  {0xC3, 0xA2, 0x00},
+  {0xC4, 0x83, 0x00},
+  {0xC3, 0xA4, 0x00},
+  {0xC4, 0xBA, 0x00},
+  {0xC4, 0x87, 0x00},
+  {0xC3, 0xA7, 0x00},
+  {0xC4, 0x8D, 0x00},
+  {0xC3, 0xA9, 0x00},
+  {0xC4, 0x99, 0x00},
+  {0xC3, 0xAB, 0x00},
+  {0xC4, 0x9B, 0x00},
+  {0xC3, 0xAD, 0x00},
+  {0xC3, 0xAE, 0x00},
+  {0xC4, 0x8F, 0x00},
+  {0xC4, 0x91, 0x00},
+  {0xC5, 0x84, 0x00},
+  {0xC5, 0x88, 0x00},
+  {0xC3, 0xB3, 0x00},
+  {0xC3, 0xB4, 0x00},
+  {0xC5, 0x91, 0x00},
+  {0xC3, 0xB6, 0x00},
+  {0xC3, 0xB7, 0x00},
+  {0xC5, 0x99, 0x00},
+  {0xC5, 0xAF, 0x00},
+  {0xC3, 0xBA, 0x00},
+  {0xC5, 0xB1, 0x00},
+  {0xC3, 0xBC, 0x00},
+  {0xC3, 0xBD, 0x00},
+  {0xC5, 0xA3, 0x00},
+  {0xCB, 0x99, 0x00},
+};
+
+/* New Western Europe */
+static const CPLCodePageConvTable CPL_ISO_8859_15_to_UTF8 = {
+  {0xC2, 0x80, 0x00},
+  {0xC2, 0x81, 0x00},
+  {0xC2, 0x82, 0x00},
+  {0xC2, 0x83, 0x00},
+  {0xC2, 0x84, 0x00},
+  {0xC2, 0x85, 0x00},
+  {0xC2, 0x86, 0x00},
+  {0xC2, 0x87, 0x00},
+  {0xC2, 0x88, 0x00},
+  {0xC2, 0x89, 0x00},
+  {0xC2, 0x8A, 0x00},
+  {0xC2, 0x8B, 0x00},
+  {0xC2, 0x8C, 0x00},
+  {0xC2, 0x8D, 0x00},
+  {0xC2, 0x8E, 0x00},
+  {0xC2, 0x8F, 0x00},
+  {0xC2, 0x90, 0x00},
+  {0xC2, 0x91, 0x00},
+  {0xC2, 0x92, 0x00},
+  {0xC2, 0x93, 0x00},
+  {0xC2, 0x94, 0x00},
+  {0xC2, 0x95, 0x00},
+  {0xC2, 0x96, 0x00},
+  {0xC2, 0x97, 0x00},
+  {0xC2, 0x98, 0x00},
+  {0xC2, 0x99, 0x00},
+  {0xC2, 0x9A, 0x00},
+  {0xC2, 0x9B, 0x00},
+  {0xC2, 0x9C, 0x00},
+  {0xC2, 0x9D, 0x00},
+  {0xC2, 0x9E, 0x00},
+  {0xC2, 0x9F, 0x00},
+  {0xC2, 0xA0, 0x00},
+  {0xC2, 0xA1, 0x00},
+  {0xC2, 0xA2, 0x00},
+  {0xC2, 0xA3, 0x00},
+  {0xE2, 0x82, 0xAC},
+  {0xC2, 0xA5, 0x00},
+  {0xC5, 0xA0, 0x00},
+  {0xC2, 0xA7, 0x00},
+  {0xC5, 0xA1, 0x00},
+  {0xC2, 0xA9, 0x00},
+  {0xC2, 0xAA, 0x00},
+  {0xC2, 0xAB, 0x00},
+  {0xC2, 0xAC, 0x00},
+  {0xC2, 0xAD, 0x00},
+  {0xC2, 0xAE, 0x00},
+  {0xC2, 0xAF, 0x00},
+  {0xC2, 0xB0, 0x00},
+  {0xC2, 0xB1, 0x00},
+  {0xC2, 0xB2, 0x00},
+  {0xC2, 0xB3, 0x00},
+  {0xC5, 0xBD, 0x00},
+  {0xC2, 0xB5, 0x00},
+  {0xC2, 0xB6, 0x00},
+  {0xC2, 0xB7, 0x00},
+  {0xC5, 0xBE, 0x00},
+  {0xC2, 0xB9, 0x00},
+  {0xC2, 0xBA, 0x00},
+  {0xC2, 0xBB, 0x00},
+  {0xC5, 0x92, 0x00},
+  {0xC5, 0x93, 0x00},
+  {0xC5, 0xB8, 0x00},
+  {0xC2, 0xBF, 0x00},
+  {0xC3, 0x80, 0x00},
+  {0xC3, 0x81, 0x00},
+  {0xC3, 0x82, 0x00},
+  {0xC3, 0x83, 0x00},
+  {0xC3, 0x84, 0x00},
+  {0xC3, 0x85, 0x00},
+  {0xC3, 0x86, 0x00},
+  {0xC3, 0x87, 0x00},
+  {0xC3, 0x88, 0x00},
+  {0xC3, 0x89, 0x00},
+  {0xC3, 0x8A, 0x00},
+  {0xC3, 0x8B, 0x00},
+  {0xC3, 0x8C, 0x00},
+  {0xC3, 0x8D, 0x00},
+  {0xC3, 0x8E, 0x00},
+  {0xC3, 0x8F, 0x00},
+  {0xC3, 0x90, 0x00},
+  {0xC3, 0x91, 0x00},
+  {0xC3, 0x92, 0x00},
+  {0xC3, 0x93, 0x00},
+  {0xC3, 0x94, 0x00},
+  {0xC3, 0x95, 0x00},
+  {0xC3, 0x96, 0x00},
+  {0xC3, 0x97, 0x00},
+  {0xC3, 0x98, 0x00},
+  {0xC3, 0x99, 0x00},
+  {0xC3, 0x9A, 0x00},
+  {0xC3, 0x9B, 0x00},
+  {0xC3, 0x9C, 0x00},
+  {0xC3, 0x9D, 0x00},
+  {0xC3, 0x9E, 0x00},
+  {0xC3, 0x9F, 0x00},
+  {0xC3, 0xA0, 0x00},
+  {0xC3, 0xA1, 0x00},
+  {0xC3, 0xA2, 0x00},
+  {0xC3, 0xA3, 0x00},
+  {0xC3, 0xA4, 0x00},
+  {0xC3, 0xA5, 0x00},
+  {0xC3, 0xA6, 0x00},
+  {0xC3, 0xA7, 0x00},
+  {0xC3, 0xA8, 0x00},
+  {0xC3, 0xA9, 0x00},
+  {0xC3, 0xAA, 0x00},
+  {0xC3, 0xAB, 0x00},
+  {0xC3, 0xAC, 0x00},
+  {0xC3, 0xAD, 0x00},
+  {0xC3, 0xAE, 0x00},
+  {0xC3, 0xAF, 0x00},
+  {0xC3, 0xB0, 0x00},
+  {0xC3, 0xB1, 0x00},
+  {0xC3, 0xB2, 0x00},
+  {0xC3, 0xB3, 0x00},
+  {0xC3, 0xB4, 0x00},
+  {0xC3, 0xB5, 0x00},
+  {0xC3, 0xB6, 0x00},
+  {0xC3, 0xB7, 0x00},
+  {0xC3, 0xB8, 0x00},
+  {0xC3, 0xB9, 0x00},
+  {0xC3, 0xBA, 0x00},
+  {0xC3, 0xBB, 0x00},
+  {0xC3, 0xBC, 0x00},
+  {0xC3, 0xBD, 0x00},
+  {0xC3, 0xBE, 0x00},
+  {0xC3, 0xBF, 0x00},
+};
+
+
+const CPLCodePageConvTable* CPLGetConversionTableToUTF8(const char* pszEncoding)
+{
+    if (EQUAL(pszEncoding, "CP437"))
+        return &CPL_CP437_to_UTF8;
+    if (EQUAL(pszEncoding, "CP1250"))
+        return &CPL_CP1250_to_UTF8;
+    if (EQUAL(pszEncoding, "CP1251"))
+        return &CPL_CP1251_to_UTF8;
+    if (EQUAL(pszEncoding, "CP1252"))
+        return &CPL_CP1252_to_UTF8;
+    if (EQUAL(pszEncoding, "ISO-8859-2"))
+        return &CPL_ISO_8859_2_to_UTF8;
+    if (EQUAL(pszEncoding, "ISO-8859-15"))
+        return &CPL_ISO_8859_15_to_UTF8;
+    return CPL_NULLPTR;
+}
+
+/* clang-format on */
diff --git a/port/cpl_character_sets.h b/port/cpl_character_sets.h
new file mode 100644
index 000000000000..358887e8166e
--- /dev/null
+++ b/port/cpl_character_sets.h
@@ -0,0 +1,8 @@
+/* This file has been generated by generate_character_set_conv_tables.c */
+/* DO NOT EDIT !*/
+
+/* clang-format off */
+typedef unsigned char CPLCodePageConvTable[128][3];
+
+const CPLCodePageConvTable* CPLGetConversionTableToUTF8(const char* pszEncoding);
+/* clang-format on */
diff --git a/port/cpl_compressor.cpp b/port/cpl_compressor.cpp
index 9874d919afbf..5f7a8b2b38b2 100644
--- a/port/cpl_compressor.cpp
+++ b/port/cpl_compressor.cpp
@@ -6,23 +6,7 @@
  **********************************************************************
  * Copyright (c) 2021, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_compressor.h"
diff --git a/port/cpl_compressor.h b/port/cpl_compressor.h
index 740fe1c04d6a..a5c9f471676c 100644
--- a/port/cpl_compressor.h
+++ b/port/cpl_compressor.h
@@ -6,23 +6,7 @@
  **********************************************************************
  * Copyright (c) 2021, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_COMPRESSOR_H_INCLUDED
diff --git a/port/cpl_conv.cpp b/port/cpl_conv.cpp
index afcfd3eac95e..3325fbb7bb99 100644
--- a/port/cpl_conv.cpp
+++ b/port/cpl_conv.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, Frank Warmerdam
  * Copyright (c) 2007-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_config.h"
@@ -84,7 +68,7 @@
 #include <string>
 
 #if __cplusplus >= 202002L
-#include <type_traits>  // For std::endian
+#include <bit>  // For std::endian
 #endif
 
 #include "cpl_config.h"
@@ -2529,7 +2513,7 @@ const char *CPLDecToDMS(double dfAngle, const char *pszAxis, int nPrecision)
 {
     VALIDATE_POINTER1(pszAxis, "CPLDecToDMS", "");
 
-    if (CPLIsNan(dfAngle))
+    if (std::isnan(dfAngle))
         return "Invalid angle";
 
     const double dfEpsilon = (0.5 / 3600.0) * pow(0.1, nPrecision);
diff --git a/port/cpl_conv.h b/port/cpl_conv.h
index 2169d9da57e4..724ffc8aef33 100644
--- a/port/cpl_conv.h
+++ b/port/cpl_conv.h
@@ -10,23 +10,7 @@
  * Copyright (c) 1998, Frank Warmerdam
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_CONV_H_INCLUDED
diff --git a/port/cpl_cpu_features.cpp b/port/cpl_cpu_features.cpp
index 2c5fcbc7a908..5fdacb99c9b9 100644
--- a/port/cpl_cpu_features.cpp
+++ b/port/cpl_cpu_features.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/port/cpl_cpu_features.h b/port/cpl_cpu_features.h
index dc8317583758..9106ed5c39e5 100644
--- a/port/cpl_cpu_features.h
+++ b/port/cpl_cpu_features.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_CPU_FEATURES_H
diff --git a/port/cpl_csv.cpp b/port/cpl_csv.cpp
index 1cf82e08ed66..511238d21f47 100644
--- a/port/cpl_csv.cpp
+++ b/port/cpl_csv.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2009-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/port/cpl_csv.h b/port/cpl_csv.h
index fc00ddeffe69..36b0346f6497 100644
--- a/port/cpl_csv.h
+++ b/port/cpl_csv.h
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_CSV_H_INCLUDED
diff --git a/port/cpl_curl_priv.h b/port/cpl_curl_priv.h
index c60006ec22f3..73ff354f8742 100644
--- a/port/cpl_curl_priv.h
+++ b/port/cpl_curl_priv.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2021, Andrew Sudorgin (drons [a] list dot ru)
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_CURL_PRIV_H_INCLUDED
diff --git a/port/cpl_error.cpp b/port/cpl_error.cpp
index 48b18ee49b56..62ef19fccf06 100644
--- a/port/cpl_error.cpp
+++ b/port/cpl_error.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 1998, Daniel Morissette
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_error.h"
diff --git a/port/cpl_error.h b/port/cpl_error.h
index a45d941b6130..d15d875e619c 100644
--- a/port/cpl_error.h
+++ b/port/cpl_error.h
@@ -9,23 +9,7 @@
  **********************************************************************
  * Copyright (c) 1998, Daniel Morissette
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_ERROR_H_INCLUDED
@@ -167,7 +151,7 @@ void CPL_DLL CPL_STDCALL CPLDefaultErrorHandler(CPLErr, CPLErrorNum,
                                                 const char *);
 void CPL_DLL CPL_STDCALL CPLQuietErrorHandler(CPLErr, CPLErrorNum,
                                               const char *);
-void CPLTurnFailureIntoWarning(int bOn);
+void CPL_DLL CPLTurnFailureIntoWarning(int bOn);
 
 CPLErrorHandler CPL_DLL CPLGetErrorHandler(void **ppUserData);
 
diff --git a/port/cpl_error_internal.h b/port/cpl_error_internal.h
index 6f8ecbfa3c6b..dc1ffa8312ba 100644
--- a/port/cpl_error_internal.h
+++ b/port/cpl_error_internal.h
@@ -9,23 +9,7 @@
  **********************************************************************
  * Copyright (c) 2019, Even Rouault, <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_ERROR_INTERNAL_H_INCLUDED
diff --git a/port/cpl_findfile.cpp b/port/cpl_findfile.cpp
index add825780b7d..35c7eb9dab20 100644
--- a/port/cpl_findfile.cpp
+++ b/port/cpl_findfile.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2000, Frank Warmerdam
  * Copyright (c) 2009-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/port/cpl_getexecpath.cpp b/port/cpl_getexecpath.cpp
index 6b0dc821bc21..7bdcedc4e521 100644
--- a/port/cpl_getexecpath.cpp
+++ b/port/cpl_getexecpath.cpp
@@ -7,23 +7,7 @@
  **********************************************************************
  * Copyright (c) 2005, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/port/cpl_google_cloud.cpp b/port/cpl_google_cloud.cpp
index fe430c08c73c..6855352c5ba6 100644
--- a/port/cpl_google_cloud.cpp
+++ b/port/cpl_google_cloud.cpp
@@ -6,23 +6,7 @@
  **********************************************************************
  * Copyright (c) 2017, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_google_cloud.h"
@@ -31,15 +15,65 @@
 #include "cpl_sha256.h"
 #include "cpl_time.h"
 #include "cpl_http.h"
-#include "cpl_multiproc.h"
+#include "cpl_mem_cache.h"
 #include "cpl_aws.h"
 #include "cpl_json.h"
 
+#include <mutex>
+#include <utility>
+
 #ifdef HAVE_CURL
 
-static CPLMutex *hMutex = nullptr;
 static bool bFirstTimeForDebugMessage = true;
-static GOA2Manager oStaticManager;
+
+struct GOA2ManagerCache
+{
+    struct ManagerWithMutex
+    {
+        std::mutex oMutex{};
+        GOA2Manager oManager{};
+
+        explicit ManagerWithMutex(const GOA2Manager &oManagerIn)
+            : oManager(oManagerIn)
+        {
+        }
+    };
+
+    std::mutex oMutexGOA2ManagerCache{};
+    lru11::Cache<std::string, std::shared_ptr<ManagerWithMutex>>
+        oGOA2ManagerCache{};
+
+    std::string GetBearer(const GOA2Manager &oManager)
+    {
+        const std::string osKey(oManager.GetKey());
+        std::shared_ptr<ManagerWithMutex> poSharedManager;
+        {
+            std::lock_guard oLock(oMutexGOA2ManagerCache);
+            if (!oGOA2ManagerCache.tryGet(osKey, poSharedManager))
+            {
+                poSharedManager = std::make_shared<ManagerWithMutex>(oManager);
+                oGOA2ManagerCache.insert(osKey, poSharedManager);
+            }
+        }
+        {
+            std::lock_guard oLock(poSharedManager->oMutex);
+            const char *pszBearer = poSharedManager->oManager.GetBearer();
+            return std::string(pszBearer ? pszBearer : "");
+        }
+    }
+
+    void clear()
+    {
+        std::lock_guard oLock(oMutexGOA2ManagerCache);
+        oGOA2ManagerCache.clear();
+    }
+
+    static GOA2ManagerCache &GetSingleton()
+    {
+        static GOA2ManagerCache goGOA2ManagerCache;
+        return goGOA2ManagerCache;
+    }
+};
 
 /************************************************************************/
 /*                    CPLIsMachineForSureGCEInstance()                  */
@@ -66,26 +100,19 @@ bool CPLIsMachineForSureGCEInstance()
     bool bIsGCEInstance = false;
     if (CPLTestBool(CPLGetConfigOption("CPL_GCE_CHECK_LOCAL_FILES", "YES")))
     {
-        static bool bIsGCEInstanceStatic = false;
-        static bool bDone = false;
+        static bool bIsGCEInstanceStatic = []()
         {
-            CPLMutexHolder oHolder(&hMutex);
-            if (!bDone)
+            bool bIsGCE = false;
+            VSILFILE *fp = VSIFOpenL("/sys/class/dmi/id/product_name", "rb");
+            if (fp)
             {
-                bDone = true;
-
-                VSILFILE *fp =
-                    VSIFOpenL("/sys/class/dmi/id/product_name", "rb");
-                if (fp)
-                {
-                    const char *pszLine = CPLReadLineL(fp);
-                    bIsGCEInstanceStatic =
-                        pszLine &&
-                        STARTS_WITH_CI(pszLine, "Google Compute Engine");
-                    VSIFCloseL(fp);
-                }
+                const char *pszLine = CPLReadLineL(fp);
+                bIsGCE =
+                    pszLine && STARTS_WITH_CI(pszLine, "Google Compute Engine");
+                VSIFCloseL(fp);
             }
-        }
+            return bIsGCE;
+        }();
         bIsGCEInstance = bIsGCEInstanceStatic;
     }
     return bIsGCEInstance;
@@ -423,14 +450,6 @@ bool VSIGSHandleHelper::GetConfiguration(const std::string &osPathForOption,
         osPathForOption.c_str(), "GS_OAUTH2_REFRESH_TOKEN", ""));
     if (!osRefreshToken.empty())
     {
-        if (oStaticManager.GetAuthMethod() ==
-            GOA2Manager::ACCESS_TOKEN_FROM_REFRESH)
-        {
-            CPLMutexHolder oHolder(&hMutex);
-            oManager = oStaticManager;
-            return true;
-        }
-
         std::string osClientId = VSIGetPathSpecificOption(
             osPathForOption.c_str(), "GS_OAUTH2_CLIENT_ID", "");
         std::string osClientSecret = VSIGetPathSpecificOption(
@@ -587,14 +606,6 @@ bool VSIGSHandleHelper::GetConfiguration(const std::string &osPathForOption,
     {
         if (!osOAuth2RefreshToken.empty())
         {
-            if (oStaticManager.GetAuthMethod() ==
-                GOA2Manager::ACCESS_TOKEN_FROM_REFRESH)
-            {
-                CPLMutexHolder oHolder(&hMutex);
-                oManager = oStaticManager;
-                return true;
-            }
-
             std::string osClientId =
                 CPLGetConfigOption("GS_OAUTH2_CLIENT_ID", "");
             std::string osClientSecret =
@@ -652,6 +663,7 @@ bool VSIGSHandleHelper::GetConfiguration(const std::string &osPathForOption,
                 CPLDebug("GS", "%s", osMsg.c_str());
             }
             bFirstTimeForDebugMessage = false;
+
             return oManager.SetAuthFromRefreshToken(
                 osOAuth2RefreshToken.c_str(), osClientId.c_str(),
                 osClientSecret.c_str(), nullptr);
@@ -670,28 +682,18 @@ bool VSIGSHandleHelper::GetConfiguration(const std::string &osPathForOption,
         }
     }
 
-    if (oStaticManager.GetAuthMethod() == GOA2Manager::GCE)
-    {
-        CPLMutexHolder oHolder(&hMutex);
-        oManager = oStaticManager;
-        return true;
-    }
     // Some Travis-CI workers are GCE machines, and for some tests, we don't
     // want this code path to be taken. And on AppVeyor/Window, we would also
     // attempt a network access
-    else if (!CPLTestBool(CPLGetConfigOption("CPL_GCE_SKIP", "NO")) &&
-             CPLIsMachinePotentiallyGCEInstance())
+    if (!CPLTestBool(CPLGetConfigOption("CPL_GCE_SKIP", "NO")) &&
+        CPLIsMachinePotentiallyGCEInstance())
     {
         oManager.SetAuthFromGCE(nullptr);
-        if (oManager.GetBearer() != nullptr)
+
+        if (!GOA2ManagerCache::GetSingleton().GetBearer(oManager).empty())
         {
             CPLDebug("GS", "Using GCE inherited permissions");
 
-            {
-                CPLMutexHolder oHolder(&hMutex);
-                oStaticManager = oManager;
-            }
-
             bFirstTimeForDebugMessage = false;
             return true;
         }
@@ -793,18 +795,14 @@ VSIGSHandleHelper::GetCurlHeaders(const std::string &osVerb,
 
     if (m_oManager.GetAuthMethod() != GOA2Manager::NONE)
     {
-        const char *pszBearer = m_oManager.GetBearer();
-        if (pszBearer == nullptr)
+        const std::string osBearer =
+            GOA2ManagerCache::GetSingleton().GetBearer(m_oManager);
+        if (osBearer.empty())
             return nullptr;
 
-        {
-            CPLMutexHolder oHolder(&hMutex);
-            oStaticManager = m_oManager;
-        }
-
         struct curl_slist *headers = nullptr;
         headers = curl_slist_append(
-            headers, CPLSPrintf("Authorization: Bearer %s", pszBearer));
+            headers, CPLSPrintf("Authorization: Bearer %s", osBearer.c_str()));
 
         if (!m_osUserProject.empty())
         {
@@ -832,26 +830,13 @@ VSIGSHandleHelper::GetCurlHeaders(const std::string &osVerb,
                         m_osSecretAccessKey, m_osAccessKeyId, m_osUserProject);
 }
 
-/************************************************************************/
-/*                          CleanMutex()                                */
-/************************************************************************/
-
-void VSIGSHandleHelper::CleanMutex()
-{
-    if (hMutex != nullptr)
-        CPLDestroyMutex(hMutex);
-    hMutex = nullptr;
-}
-
 /************************************************************************/
 /*                          ClearCache()                                */
 /************************************************************************/
 
 void VSIGSHandleHelper::ClearCache()
 {
-    CPLMutexHolder oHolder(&hMutex);
-
-    oStaticManager = GOA2Manager();
+    GOA2ManagerCache::GetSingleton().clear();
     bFirstTimeForDebugMessage = true;
 }
 
diff --git a/port/cpl_google_cloud.h b/port/cpl_google_cloud.h
index fbff6395c69e..07a282d3e31c 100644
--- a/port/cpl_google_cloud.h
+++ b/port/cpl_google_cloud.h
@@ -6,23 +6,7 @@
  **********************************************************************
  * Copyright (c) 2017, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_GOOGLE_CLOUD_INCLUDED_H
@@ -107,7 +91,6 @@ class VSIGSHandleHelper final : public IVSIS3LikeHandleHelper
 
     std::string GetSignedURL(CSLConstList papszOptions);
 
-    static void CleanMutex();
     static void ClearCache();
 };
 
diff --git a/port/cpl_google_oauth2.cpp b/port/cpl_google_oauth2.cpp
index 6277b2b6d766..802ab81836a5 100644
--- a/port/cpl_google_oauth2.cpp
+++ b/port/cpl_google_oauth2.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2017, Even Rouault
  * Copyright (c) 2017, Planet Labs
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_http.h"
diff --git a/port/cpl_hash_set.cpp b/port/cpl_hash_set.cpp
index b3e40a7d05f7..033b6baac547 100644
--- a/port/cpl_hash_set.cpp
+++ b/port/cpl_hash_set.cpp
@@ -8,23 +8,7 @@
  **********************************************************************
  * Copyright (c) 2008-2009, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_hash_set.h"
diff --git a/port/cpl_hash_set.h b/port/cpl_hash_set.h
index 4c53d7e90574..d5bcd16bb164 100644
--- a/port/cpl_hash_set.h
+++ b/port/cpl_hash_set.h
@@ -9,23 +9,7 @@
  **********************************************************************
  * Copyright (c) 2008-2009, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_HASH_SET_H_INCLUDED
diff --git a/port/cpl_http.cpp b/port/cpl_http.cpp
index ac35c47f3fe3..bc1068a4ae2e 100644
--- a/port/cpl_http.cpp
+++ b/port/cpl_http.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2006, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -43,6 +27,7 @@
 #include "cpl_http.h"
 #include "cpl_error.h"
 #include "cpl_multiproc.h"
+#include "cpl_vsi_virtual.h"
 #include "cpl_vsil_curl_class.h"
 
 // gcc or clang complains about C-style cast in #define like
@@ -59,7 +44,6 @@
 #ifdef HAVE_OPENSSL_CRYPTO
 #include <openssl/err.h>
 #include <openssl/ssl.h>
-#include <openssl/engine.h>
 #include <openssl/x509v3.h>
 
 #if defined(_WIN32)
@@ -555,13 +539,40 @@ constexpr TupleEnvVarOptionName asAssocEnvVarOptionName[] = {
 char **CPLHTTPGetOptionsFromEnv(const char *pszFilename)
 {
     CPLStringList aosOptions;
+    std::string osNonStreamingFilename;
+    if (pszFilename && STARTS_WITH(pszFilename, "/vsi"))
+    {
+        VSIFilesystemHandler *poFSHandler =
+            VSIFileManager::GetHandler(pszFilename);
+        osNonStreamingFilename =
+            poFSHandler->GetNonStreamingFilename(pszFilename);
+        if (osNonStreamingFilename == pszFilename)
+        {
+            osNonStreamingFilename.clear();
+        }
+        else
+        {
+            // CPLDebug("HTTP", "Non-streaming filename for %s: %s", pszFilename, osNonStreamingFilename.c_str());
+        }
+    }
     for (const auto &sTuple : asAssocEnvVarOptionName)
     {
-        const char *pszVal =
-            pszFilename ? VSIGetPathSpecificOption(pszFilename,
-                                                   sTuple.pszEnvVar, nullptr)
-                        : CPLGetConfigOption(sTuple.pszEnvVar, nullptr);
-        if (pszVal != nullptr)
+        const char *pszVal = nullptr;
+        if (pszFilename)
+        {
+            pszVal = VSIGetPathSpecificOption(pszFilename, sTuple.pszEnvVar,
+                                              nullptr);
+            if (!pszVal && !osNonStreamingFilename.empty())
+            {
+                pszVal = VSIGetPathSpecificOption(
+                    osNonStreamingFilename.c_str(), sTuple.pszEnvVar, nullptr);
+            }
+        }
+        if (!pszVal)
+        {
+            pszVal = CPLGetConfigOption(sTuple.pszEnvVar, nullptr);
+        }
+        if (pszVal)
         {
             aosOptions.AddNameValue(sTuple.pszOptionName, pszVal);
         }
@@ -1151,12 +1162,15 @@ int CPLHTTPPopFetchCallback(void)
  *     and use the first one found as the CAINFO value (GDAL >= 2.1.3). The
  *     GDAL_CURL_CA_BUNDLE environment variable may also be used to set the
  *     CAINFO value in GDAL >= 3.2.</li>
- * <li>HTTP_VERSION=1.0/1.1/2/2TLS (GDAL >= 2.3). Specify HTTP version to use.
+ * <li>HTTP_VERSION=1.0/1.1/2/2TLS (GDAL >= 2.3)/2PRIOR_KNOWLEDGE (GDAL >= 3.10).
+ *     Specify HTTP version to use.
  *     Will default to 1.1 generally (except on some controlled environments,
  *     like Google Compute Engine VMs, where 2TLS will be the default).
  *     Support for HTTP/2 requires curl 7.33 or later, built against nghttp2.
  *     "2TLS" means that HTTP/2 will be attempted for HTTPS connections only.
  *     Whereas "2" means that HTTP/2 will be attempted for HTTP or HTTPS.
+ *     "2PRIOR_KNOWLEDGE" means that the server will be assumed to support
+ *     HTTP/2.
  *     Corresponding configuration option: GDAL_HTTP_VERSION.
  * </li>
  * <li>SSL_VERIFYSTATUS=YES/NO (GDAL >= 2.3, and curl >= 7.41): determines
@@ -2080,7 +2094,7 @@ static int CPLHTTPCurlDebugFunction(CURL *handle, curl_infotype type,
     {
         std::string osMsg(data, size);
         if (!osMsg.empty() && osMsg.back() == '\n')
-            osMsg.resize(osMsg.size() - 1);
+            osMsg.pop_back();
         CPLDebug(pszDebugKey, "%s", osMsg.c_str());
     }
     return 0;
@@ -2137,6 +2151,17 @@ void *CPLHTTPSetOptions(void *pcurl, const char *pszURL,
                                        CURL_HTTP_VERSION_2_0);
         }
     }
+    else if (pszHttpVersion && strcmp(pszHttpVersion, "2PRIOR_KNOWLEDGE") == 0)
+    {
+        if (bSupportHTTP2)
+        {
+            // Assume HTTP/2 is supported by the server. The cURL docs indicate
+            // that it makes no difference for HTTPS, but it does seem to work
+            // in practice.
+            unchecked_curl_easy_setopt(http_handle, CURLOPT_HTTP_VERSION,
+                                       CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE);
+        }
+    }
     else if (pszHttpVersion == nullptr || strcmp(pszHttpVersion, "2TLS") == 0)
     {
         if (bSupportHTTP2)
@@ -2196,14 +2221,22 @@ void *CPLHTTPSetOptions(void *pcurl, const char *pszURL,
                                    CURLAUTH_ANYSAFE);
     else if (EQUAL(pszHttpAuth, "BEARER"))
     {
-        const char *pszBearer = CSLFetchNameValue(papszOptions, "HTTP_BEARER");
-        if (pszBearer == nullptr)
-            pszBearer = CPLGetConfigOption("GDAL_HTTP_BEARER", nullptr);
-        if (pszBearer != nullptr)
-            unchecked_curl_easy_setopt(http_handle, CURLOPT_XOAUTH2_BEARER,
-                                       pszBearer);
-        unchecked_curl_easy_setopt(http_handle, CURLOPT_HTTPAUTH,
-                                   CURLAUTH_BEARER);
+        const char *pszAuthorizationHeaderAllowed = CSLFetchNameValueDef(
+            papszOptions, "AUTHORIZATION_HEADER_ALLOWED", "YES");
+        const bool bAuthorizationHeaderAllowed =
+            CPLTestBool(pszAuthorizationHeaderAllowed);
+        if (bAuthorizationHeaderAllowed)
+        {
+            const char *pszBearer =
+                CSLFetchNameValue(papszOptions, "HTTP_BEARER");
+            if (pszBearer == nullptr)
+                pszBearer = CPLGetConfigOption("GDAL_HTTP_BEARER", nullptr);
+            if (pszBearer != nullptr)
+                unchecked_curl_easy_setopt(http_handle, CURLOPT_XOAUTH2_BEARER,
+                                           pszBearer);
+            unchecked_curl_easy_setopt(http_handle, CURLOPT_HTTPAUTH,
+                                       CURLAUTH_BEARER);
+        }
     }
     else if (EQUAL(pszHttpAuth, "NEGOTIATE"))
         unchecked_curl_easy_setopt(http_handle, CURLOPT_HTTPAUTH,
@@ -2324,6 +2357,15 @@ void *CPLHTTPSetOptions(void *pcurl, const char *pszURL,
                                1L);
 
     unchecked_curl_easy_setopt(http_handle, CURLOPT_FOLLOWLOCATION, 1);
+    const char *pszUnrestrictedAuth = CPLGetConfigOption(
+        "CPL_VSIL_CURL_AUTHORIZATION_HEADER_ALLOWED_IF_REDIRECT",
+        "IF_SAME_HOST");
+    if (!EQUAL(pszUnrestrictedAuth, "IF_SAME_HOST") &&
+        CPLTestBool(pszUnrestrictedAuth))
+    {
+        unchecked_curl_easy_setopt(http_handle, CURLOPT_UNRESTRICTED_AUTH, 1);
+    }
+
     unchecked_curl_easy_setopt(http_handle, CURLOPT_MAXREDIRS, 10);
     unchecked_curl_easy_setopt(http_handle, CURLOPT_POSTREDIR,
                                CURL_REDIR_POST_ALL);
@@ -2623,6 +2665,11 @@ void *CPLHTTPSetOptions(void *pcurl, const char *pszURL,
         }
         if (!bHeadersDone)
         {
+            const char *pszAuthorizationHeaderAllowed = CSLFetchNameValueDef(
+                papszOptions, "AUTHORIZATION_HEADER_ALLOWED", "YES");
+            const bool bAuthorizationHeaderAllowed =
+                CPLTestBool(pszAuthorizationHeaderAllowed);
+
             // We accept both raw headers with \r\n as a separator, or as
             // a comma separated list of foo: bar values.
             const CPLStringList aosTokens(
@@ -2631,7 +2678,11 @@ void *CPLHTTPSetOptions(void *pcurl, const char *pszURL,
                     : CSLTokenizeString2(pszHeaders, ",", CSLT_HONOURSTRINGS));
             for (int i = 0; i < aosTokens.size(); ++i)
             {
-                headers = curl_slist_append(headers, aosTokens[i]);
+                if (bAuthorizationHeaderAllowed ||
+                    !STARTS_WITH_CI(aosTokens[i], "Authorization:"))
+                {
+                    headers = curl_slist_append(headers, aosTokens[i]);
+                }
             }
         }
     }
diff --git a/port/cpl_http.h b/port/cpl_http.h
index cf78311007eb..0bc11b146a76 100644
--- a/port/cpl_http.h
+++ b/port/cpl_http.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2006, Frank Warmerdam
  * Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_HTTP_H_INCLUDED
@@ -277,9 +261,43 @@ class GOA2Manager
         return m_osClientEmail;
     }
 
+    /** Returns a key that can be used to uniquely identify the instance
+     * parameters (excluding bearer)
+     */
+    std::string GetKey() const
+    {
+        std::string osKey(std::to_string(static_cast<int>(m_eMethod))
+                              .append(",client-id=")
+                              .append(m_osClientId)
+                              .append(",client-secret=")
+                              .append(m_osClientSecret)
+                              .append(",refresh-token=")
+                              .append(m_osRefreshToken)
+                              .append(",private-key=")
+                              .append(m_osPrivateKey)
+                              .append(",client-email=")
+                              .append(m_osClientEmail)
+                              .append(",scope=")
+                              .append(m_osScope));
+        osKey.append(",additional-claims=");
+        for (const auto *pszOption : m_aosAdditionalClaims)
+        {
+            osKey.append(pszOption);
+            osKey.append("+");
+        }
+        osKey.append(",options=");
+        for (const auto *pszOption : m_aosOptions)
+        {
+            osKey.append(pszOption);
+            osKey.append("+");
+        }
+        return osKey;
+    }
+
   private:
     mutable CPLString m_osCurrentBearer{};
     mutable time_t m_nExpirationTime = 0;
+
     AuthMethod m_eMethod = NONE;
 
     // for ACCESS_TOKEN_FROM_REFRESH
diff --git a/port/cpl_json.cpp b/port/cpl_json.cpp
index 50144b079514..193dad1b0efd 100644
--- a/port/cpl_json.cpp
+++ b/port/cpl_json.cpp
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2017-2018 NextGIS, <info@nextgis.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_json.h"
diff --git a/port/cpl_json.h b/port/cpl_json.h
index 974b1d0e117a..ec6ecd02bcbe 100644
--- a/port/cpl_json.h
+++ b/port/cpl_json.h
@@ -6,23 +6,7 @@
  ******************************************************************************
  * Copyright (c) 2017-2018 NextGIS, <info@nextgis.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_JSON_H_INCLUDED
diff --git a/port/cpl_json_header.h b/port/cpl_json_header.h
index ad9cda67f74a..7d05f276cb42 100644
--- a/port/cpl_json_header.h
+++ b/port/cpl_json_header.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef OGR_JSON_HEADER_H
diff --git a/port/cpl_json_streaming_parser.cpp b/port/cpl_json_streaming_parser.cpp
index e5e23481e3ae..a1462dcef5cb 100644
--- a/port/cpl_json_streaming_parser.cpp
+++ b/port/cpl_json_streaming_parser.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2017, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 /*! @cond Doxygen_Suppress */
diff --git a/port/cpl_json_streaming_parser.h b/port/cpl_json_streaming_parser.h
index 62c569e8b679..9e84817bb5ee 100644
--- a/port/cpl_json_streaming_parser.h
+++ b/port/cpl_json_streaming_parser.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2017, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_JSON_STREAMIN_PARSER_H
diff --git a/port/cpl_json_streaming_writer.cpp b/port/cpl_json_streaming_writer.cpp
index ff9c3deef7f7..9888ccd0540c 100644
--- a/port/cpl_json_streaming_writer.cpp
+++ b/port/cpl_json_streaming_writer.cpp
@@ -7,27 +7,12 @@
  ******************************************************************************
  * Copyright (c) 2019, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 /*! @cond Doxygen_Suppress */
 
+#include <cmath>
 #include <vector>
 #include <string>
 
@@ -240,11 +225,11 @@ void CPLJSonStreamingWriter::Add(std::uint64_t nVal)
 void CPLJSonStreamingWriter::Add(float fVal, int nPrecision)
 {
     EmitCommaIfNeeded();
-    if (CPLIsNan(fVal))
+    if (std::isnan(fVal))
     {
         Print("\"NaN\"");
     }
-    else if (CPLIsInf(fVal))
+    else if (std::isinf(fVal))
     {
         Print(fVal > 0 ? "\"Infinity\"" : "\"-Infinity\"");
     }
@@ -259,11 +244,11 @@ void CPLJSonStreamingWriter::Add(float fVal, int nPrecision)
 void CPLJSonStreamingWriter::Add(double dfVal, int nPrecision)
 {
     EmitCommaIfNeeded();
-    if (CPLIsNan(dfVal))
+    if (std::isnan(dfVal))
     {
         Print("\"NaN\"");
     }
-    else if (CPLIsInf(dfVal))
+    else if (std::isinf(dfVal))
     {
         Print(dfVal > 0 ? "\"Infinity\"" : "\"-Infinity\"");
     }
diff --git a/port/cpl_json_streaming_writer.h b/port/cpl_json_streaming_writer.h
index bc4eb4e15353..03e9307eb4c0 100644
--- a/port/cpl_json_streaming_writer.h
+++ b/port/cpl_json_streaming_writer.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2019, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_JSON_STREAMING_WRITER_H
diff --git a/port/cpl_list.cpp b/port/cpl_list.cpp
index 1e0596f298b7..c123b51bc889 100644
--- a/port/cpl_list.cpp
+++ b/port/cpl_list.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2003, Andrey Kiselev <dron@remotesensing.org>
  * Copyright (c) 2008, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_list.h"
diff --git a/port/cpl_list.h b/port/cpl_list.h
index 185c80d4d8d8..f8a2273b7856 100644
--- a/port/cpl_list.h
+++ b/port/cpl_list.h
@@ -9,23 +9,7 @@
  **********************************************************************
  * Copyright (c) 2003, Andrey Kiselev <dron@remotesensing.org>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_LIST_H_INCLUDED
diff --git a/port/cpl_mask.h b/port/cpl_mask.h
index a672b0e8b3ac..2858f8ea0202 100644
--- a/port/cpl_mask.h
+++ b/port/cpl_mask.h
@@ -9,23 +9,7 @@
  **********************************************************************
  * Copyright (c) 2022, ISciences LLC
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_MASK_H_INCLUDED
diff --git a/port/cpl_md5.cpp b/port/cpl_md5.cpp
index 5a501bc578c3..4fc85cafb8cf 100644
--- a/port/cpl_md5.cpp
+++ b/port/cpl_md5.cpp
@@ -84,6 +84,7 @@ void CPLMD5Update(struct CPLMD5Context *context, const void *buf, size_t len)
 
     // Update bitcount
     GUInt32 t = context->bits[0];
+    // coverity[overflow_const]
     if ((context->bits[0] =
              (t + (static_cast<GUInt32>(len) << 3)) & 0xffffffff) < t)
         context->bits[1]++; /* Carry from low to high */
diff --git a/port/cpl_mem_cache.h b/port/cpl_mem_cache.h
index 6fecca4b239f..0e021b762748 100644
--- a/port/cpl_mem_cache.h
+++ b/port/cpl_mem_cache.h
@@ -86,6 +86,10 @@ template <typename K, typename V> struct KeyValuePair
     KeyValuePair(const K &k, V &&v) : key(k), value(std::move(v))
     {
     }
+
+  private:
+    KeyValuePair(const KeyValuePair &) = delete;
+    KeyValuePair &operator=(const KeyValuePair &) = delete;
 };
 
 /**
diff --git a/port/cpl_minixml.cpp b/port/cpl_minixml.cpp
index d4690a4e0fbf..e750a95d3196 100644
--- a/port/cpl_minixml.cpp
+++ b/port/cpl_minixml.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2001, Frank Warmerdam
  * Copyright (c) 2007-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************
  *
  * Independent Security Audit 2003/04/05 Andrey Kiselev:
diff --git a/port/cpl_minixml.h b/port/cpl_minixml.h
index fa4111fbd035..9c93655aceba 100644
--- a/port/cpl_minixml.h
+++ b/port/cpl_minixml.h
@@ -8,23 +8,7 @@
  **********************************************************************
  * Copyright (c) 2001, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_MINIXML_H_INCLUDED
diff --git a/port/cpl_minizip_unzip.cpp b/port/cpl_minizip_unzip.cpp
index 0302584bac2b..4a5311945016 100644
--- a/port/cpl_minizip_unzip.cpp
+++ b/port/cpl_minizip_unzip.cpp
@@ -1217,6 +1217,7 @@ extern int ZEXPORT cpl_unzLocateFile(unzFile file, const char *szFileName,
     /* We failed, so restore the state of the 'current file' to where we
      * were.
      */
+    // cppcheck-suppress redundantAssignment
     s->num_file = num_fileSaved;
     s->pos_in_central_dir = pos_in_central_dirSaved;
     s->cur_file_info = cur_file_infoSaved;
@@ -1311,7 +1312,7 @@ unzlocal_CheckCurrentFileCoherencyHeader(unz_s *s, uInt *piSizeVar,
               ZLIB_FILEFUNC_SEEK_SET) != 0)
         return UNZ_ERRNO;
 
-    if (err == UNZ_OK)
+    // if (err == UNZ_OK)
     {
         if (unzlocal_getLong(&s->z_filefunc, s->filestream, &uMagic) != UNZ_OK)
             err = UNZ_ERRNO;
@@ -1614,7 +1615,7 @@ extern int cpl_unzCurrentFileInfoFromLocalHeader(
               ZLIB_FILEFUNC_SEEK_SET) != 0)
         return UNZ_ERRNO;
 
-    if (err == UNZ_OK)
+    // if (err == UNZ_OK)
     {
         if (unzlocal_getLong(&s->z_filefunc, s->filestream, &uMagic) != UNZ_OK)
             err = UNZ_ERRNO;
diff --git a/port/cpl_minizip_zip.cpp b/port/cpl_minizip_zip.cpp
index 6fa4e324f0d7..6d063b2875b4 100644
--- a/port/cpl_minizip_zip.cpp
+++ b/port/cpl_minizip_zip.cpp
@@ -33,7 +33,7 @@
    archives Oct-2009 - Mathias Svensson - Did some code cleanup and refactoring
    to get better overview of some functions. Oct-2009 - Mathias Svensson - Added
    zipRemoveExtraInfoBlock to strip extra field data from its ZIP64 data It is
-   used when recreting zip archive with RAW when deleting items from a zip.
+   used when recreating zip archive with RAW when deleting items from a zip.
                                  ZIP64 data is automatically added to items that
    needs it, and existing ZIP64 data need to be removed. Oct-2009 - Mathias
    Svensson - Added support for BZIP2 as compression mode (bzip2 lib is
@@ -2289,7 +2289,7 @@ CPLErr CPLCloseFileInZip(void *hZip)
 
 /** Add a file inside a ZIP file opened/created with CPLCreateZip().
  *
- * This combines calls sto CPLCreateFileInZip(), CPLWriteFileInZip(),
+ * This combines calls to CPLCreateFileInZip(), CPLWriteFileInZip(),
  * and CPLCloseFileInZip() in a more convenient and powerful way.
  *
  * In particular, this enables to add a compressed file using the seek
diff --git a/port/cpl_multiproc.cpp b/port/cpl_multiproc.cpp
index 192c87d82d8f..e26126b6411f 100644
--- a/port/cpl_multiproc.cpp
+++ b/port/cpl_multiproc.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2002, Frank Warmerdam
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef _GNU_SOURCE
diff --git a/port/cpl_multiproc.h b/port/cpl_multiproc.h
index 5229fe5d0a5b..323284271a05 100644
--- a/port/cpl_multiproc.h
+++ b/port/cpl_multiproc.h
@@ -9,23 +9,7 @@
  * Copyright (c) 2002, Frank Warmerdam
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_MULTIPROC_H_INCLUDED_
diff --git a/port/cpl_noncopyablevector.h b/port/cpl_noncopyablevector.h
index ccb6f5e02727..1c553278b433 100644
--- a/port/cpl_noncopyablevector.h
+++ b/port/cpl_noncopyablevector.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_NONCOPYABLEVECOTR_H_INCLUDED
diff --git a/port/cpl_odbc.cpp b/port/cpl_odbc.cpp
index 7996994807ed..377e80a7f28c 100644
--- a/port/cpl_odbc.cpp
+++ b/port/cpl_odbc.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2003, Frank Warmerdam
  * Copyright (c) 2008, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <wchar.h>
@@ -717,6 +701,16 @@ int CPLODBCSession::EstablishSession(const char *pszDSN, const char *pszUserid,
     if (pszPassword == nullptr)
         pszPassword = "";
 
+    std::string osDSN(pszDSN);
+#if defined(_WIN32)
+    if (CPLTestBool(CPLGetConfigOption("GDAL_FILENAME_IS_UTF8", "YES")))
+    {
+        char *pszTemp = CPLRecode(pszDSN, CPL_ENC_UTF8, "CP_ACP");
+        osDSN = pszTemp;
+        CPLFree(pszTemp);
+    }
+#endif
+
     bool bFailed = false;
     if (strstr(pszDSN, "=") != nullptr)
     {
@@ -726,7 +720,7 @@ int CPLODBCSession::EstablishSession(const char *pszDSN, const char *pszUserid,
 
         bFailed = CPL_TO_BOOL(Failed(SQLDriverConnect(
             m_hDBC, nullptr,
-            reinterpret_cast<SQLCHAR *>(const_cast<char *>(pszDSN)),
+            reinterpret_cast<SQLCHAR *>(const_cast<char *>(osDSN.c_str())),
             static_cast<SQLSMALLINT>(strlen(pszDSN)), szOutConnString,
             sizeof(szOutConnString), &nOutConnStringLen, SQL_DRIVER_NOPROMPT)));
     }
@@ -734,7 +728,8 @@ int CPLODBCSession::EstablishSession(const char *pszDSN, const char *pszUserid,
     {
         CPLDebug("ODBC", "SQLConnect(%s)", pszDSN);
         bFailed = CPL_TO_BOOL(Failed(SQLConnect(
-            m_hDBC, reinterpret_cast<SQLCHAR *>(const_cast<char *>(pszDSN)),
+            m_hDBC,
+            reinterpret_cast<SQLCHAR *>(const_cast<char *>(osDSN.c_str())),
             SQL_NTS, reinterpret_cast<SQLCHAR *>(const_cast<char *>(pszUserid)),
             SQL_NTS,
             reinterpret_cast<SQLCHAR *>(const_cast<char *>(pszPassword)),
diff --git a/port/cpl_odbc.h b/port/cpl_odbc.h
index 935ef1009874..66b22e1f8070 100644
--- a/port/cpl_odbc.h
+++ b/port/cpl_odbc.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2003, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_ODBC_H_INCLUDED
@@ -74,7 +58,7 @@ class CPL_DLL CPLODBCDriverInstaller
 
     /**
      * Installs ODBC driver or updates definition of already installed driver.
-     * Interanally, it calls ODBC's SQLInstallDriverEx function.
+     * Internally, it calls ODBC's SQLInstallDriverEx function.
      *
      * @param pszDriver - The driver definition as a list of keyword-value
      * pairs describing the driver (See ODBC API Reference).
diff --git a/port/cpl_path.cpp b/port/cpl_path.cpp
index f78c77453bef..0ad0d286a24f 100644
--- a/port/cpl_path.cpp
+++ b/port/cpl_path.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -101,10 +85,10 @@ static char *CPLGetStaticResult()
 /*                        CPLFindFilenameStart()                        */
 /************************************************************************/
 
-static int CPLFindFilenameStart(const char *pszFilename)
+static int CPLFindFilenameStart(const char *pszFilename, size_t nStart = 0)
 
 {
-    size_t iFileStart = strlen(pszFilename);
+    size_t iFileStart = nStart ? nStart : strlen(pszFilename);
 
     for (; iFileStart > 0 && pszFilename[iFileStart - 1] != '/' &&
            pszFilename[iFileStart - 1] != '\\';
@@ -144,7 +128,15 @@ static int CPLFindFilenameStart(const char *pszFilename)
 const char *CPLGetPath(const char *pszFilename)
 
 {
-    const int iFileStart = CPLFindFilenameStart(pszFilename);
+    size_t nSuffixPos = 0;
+    if (STARTS_WITH(pszFilename, "/vsicurl/http"))
+    {
+        const char *pszQuestionMark = strchr(pszFilename, '?');
+        if (pszQuestionMark)
+            nSuffixPos = static_cast<size_t>(pszQuestionMark - pszFilename);
+    }
+
+    const int iFileStart = CPLFindFilenameStart(pszFilename, nSuffixPos);
     char *pszStaticResult = CPLGetStaticResult();
 
     if (pszStaticResult == nullptr || iFileStart >= CPL_PATH_BUF_SIZE)
@@ -166,6 +158,13 @@ const char *CPLGetPath(const char *pszFilename)
                            pszStaticResult[iFileStart - 1] == '\\'))
         pszStaticResult[iFileStart - 1] = '\0';
 
+    if (nSuffixPos)
+    {
+        if (CPLStrlcat(pszStaticResult, pszFilename + nSuffixPos,
+                       CPL_PATH_BUF_SIZE) >= CPL_PATH_BUF_SIZE)
+            return CPLStaticBufferTooSmall(pszStaticResult);
+    }
+
     return pszStaticResult;
 }
 
@@ -198,7 +197,15 @@ const char *CPLGetPath(const char *pszFilename)
 const char *CPLGetDirname(const char *pszFilename)
 
 {
-    const int iFileStart = CPLFindFilenameStart(pszFilename);
+    size_t nSuffixPos = 0;
+    if (STARTS_WITH(pszFilename, "/vsicurl/http"))
+    {
+        const char *pszQuestionMark = strchr(pszFilename, '?');
+        if (pszQuestionMark)
+            nSuffixPos = static_cast<size_t>(pszQuestionMark - pszFilename);
+    }
+
+    const int iFileStart = CPLFindFilenameStart(pszFilename, nSuffixPos);
     char *pszStaticResult = CPLGetStaticResult();
 
     if (pszStaticResult == nullptr || iFileStart >= CPL_PATH_BUF_SIZE)
@@ -220,6 +227,13 @@ const char *CPLGetDirname(const char *pszFilename)
                            pszStaticResult[iFileStart - 1] == '\\'))
         pszStaticResult[iFileStart - 1] = '\0';
 
+    if (nSuffixPos)
+    {
+        if (CPLStrlcat(pszStaticResult, pszFilename + nSuffixPos,
+                       CPL_PATH_BUF_SIZE) >= CPL_PATH_BUF_SIZE)
+            return CPLStaticBufferTooSmall(pszStaticResult);
+    }
+
     return pszStaticResult;
 }
 
@@ -535,6 +549,19 @@ const char *CPLFormFilename(const char *pszPath, const char *pszBasename,
     if (pszPath == nullptr)
         pszPath = "";
     size_t nLenPath = strlen(pszPath);
+
+    size_t nSuffixPos = 0;
+    if (STARTS_WITH_CI(pszPath, "/vsicurl/http"))
+    {
+        const char *pszQuestionMark = strchr(pszPath, '?');
+        if (pszQuestionMark)
+        {
+            nSuffixPos = static_cast<size_t>(pszQuestionMark - pszPath);
+            nLenPath = nSuffixPos;
+        }
+        pszAddedPathSep = "/";
+    }
+
     if (!CPLIsFilenameRelative(pszPath) && strcmp(pszBasename, "..") == 0)
     {
         // /a/b + .. --> /a
@@ -560,13 +587,15 @@ const char *CPLFormFilename(const char *pszPath, const char *pszBasename,
         else
         {
             nLenPath = nLenPathOri;
-            pszAddedPathSep = VSIGetDirectorySeparator(pszPath);
+            if (pszAddedPathSep[0] == 0)
+                pszAddedPathSep = VSIGetDirectorySeparator(pszPath);
         }
     }
     else if (nLenPath > 0 && pszPath[nLenPath - 1] != '/' &&
              pszPath[nLenPath - 1] != '\\')
     {
-        pszAddedPathSep = VSIGetDirectorySeparator(pszPath);
+        if (pszAddedPathSep[0] == 0)
+            pszAddedPathSep = VSIGetDirectorySeparator(pszPath);
     }
 
     if (pszExtension == nullptr)
@@ -574,11 +603,13 @@ const char *CPLFormFilename(const char *pszPath, const char *pszBasename,
     else if (pszExtension[0] != '.' && strlen(pszExtension) > 0)
         pszAddedExtSep = ".";
 
-    if (CPLStrlcpy(
-            pszStaticResult, pszPath,
-            std::min(nLenPath + 1, static_cast<size_t>(CPL_PATH_BUF_SIZE))) >=
-            static_cast<size_t>(CPL_PATH_BUF_SIZE) ||
-        CPLStrlcat(pszStaticResult, pszAddedPathSep, CPL_PATH_BUF_SIZE) >=
+    if (nLenPath >= static_cast<size_t>(CPL_PATH_BUF_SIZE))
+        return CPLStaticBufferTooSmall(pszStaticResult);
+
+    memcpy(pszStaticResult, pszPath, nLenPath);
+    pszStaticResult[nLenPath] = 0;
+
+    if (CPLStrlcat(pszStaticResult, pszAddedPathSep, CPL_PATH_BUF_SIZE) >=
             static_cast<size_t>(CPL_PATH_BUF_SIZE) ||
         CPLStrlcat(pszStaticResult, pszBasename, CPL_PATH_BUF_SIZE) >=
             static_cast<size_t>(CPL_PATH_BUF_SIZE) ||
@@ -590,6 +621,13 @@ const char *CPLFormFilename(const char *pszPath, const char *pszBasename,
         return CPLStaticBufferTooSmall(pszStaticResult);
     }
 
+    if (nSuffixPos &&
+        CPLStrlcat(pszStaticResult, pszPath + nSuffixPos, CPL_PATH_BUF_SIZE) >=
+            static_cast<size_t>(CPL_PATH_BUF_SIZE))
+    {
+        return CPLStaticBufferTooSmall(pszStaticResult);
+    }
+
     return pszStaticResult;
 }
 
diff --git a/port/cpl_port.h b/port/cpl_port.h
index 6558e3dc1f84..1622d5f14751 100644
--- a/port/cpl_port.h
+++ b/port/cpl_port.h
@@ -10,23 +10,7 @@
  * Copyright (c) 1998, 2005, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_BASE_H_INCLUDED
@@ -568,6 +552,8 @@ static inline char *CPL_afl_friendly_strstr(const char *haystack,
 #endif
 /*! @endcond */
 
+#ifndef GDAL_COMPILATION
+/*! @cond Doxygen_Suppress */
 /* -------------------------------------------------------------------- */
 /*      Handle isnan() and isinf().  Note that isinf() and isnan()      */
 /*      are supposed to be macros according to C99, defined in math.h   */
@@ -680,6 +666,8 @@ extern "C++"
 #endif
 #endif
 #endif
+/*! @endcond */
+#endif  // GDAL_COMPILATION
 
 /*! @cond Doxygen_Suppress */
 /*---------------------------------------------------------------------
@@ -1161,6 +1149,14 @@ extern "C++"
     {
         return t;
     }
+
+    /** Emulates the C++20 .contains() method */
+    template <typename C, typename V>
+    inline bool contains(const C &container, const V &value)
+    {
+        return container.find(value) != container.end();
+    }
+
     }  // namespace cpl
 }
 #endif
diff --git a/port/cpl_progress.cpp b/port/cpl_progress.cpp
index b76dd731cdfe..4edf83b187ad 100644
--- a/port/cpl_progress.cpp
+++ b/port/cpl_progress.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_progress.h"
diff --git a/port/cpl_progress.h b/port/cpl_progress.h
index 6bbe6f32bb6d..e9f691898f25 100644
--- a/port/cpl_progress.h
+++ b/port/cpl_progress.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_PROGRESS_H_INCLUDED
diff --git a/port/cpl_quad_tree.cpp b/port/cpl_quad_tree.cpp
index 0c41ed190a62..060e17919bc1 100644
--- a/port/cpl_quad_tree.cpp
+++ b/port/cpl_quad_tree.cpp
@@ -10,23 +10,7 @@
  * Copyright (c) 1999-2008, Frank Warmerdam
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ******************************************************************************
  */
 
@@ -924,6 +908,78 @@ void **CPLQuadTreeSearch(const CPLQuadTree *hQuadTree, const CPLRectObj *pAoi,
     return ppFeatureList;
 }
 
+/************************************************************************/
+/*                         CPLQuadTreeHasMatch()                        */
+/************************************************************************/
+
+static bool CPLQuadTreeHasMatch(const CPLQuadTree *hQuadTree,
+                                const QuadTreeNode *psNode,
+                                const CPLRectObj *pAoi)
+{
+    /* -------------------------------------------------------------------- */
+    /*      Does this psNode overlap the area of interest at all?           */
+    /* -------------------------------------------------------------------- */
+    if (!CPL_RectOverlap(&psNode->rect, pAoi))
+        return false;
+
+    /* -------------------------------------------------------------------- */
+    /*      Check the local features.                                       */
+    /* -------------------------------------------------------------------- */
+    for (int i = 0; i < psNode->nFeatures; i++)
+    {
+        if (hQuadTree->pfnGetBounds == nullptr &&
+            hQuadTree->pfnGetBoundsEx == nullptr)
+        {
+            if (CPL_RectOverlap(&psNode->pasBounds[i], pAoi))
+                return true;
+        }
+        else
+        {
+            CPLRectObj bounds;
+            if (hQuadTree->pfnGetBoundsEx)
+                hQuadTree->pfnGetBoundsEx(psNode->pahFeatures[i],
+                                          hQuadTree->pUserData, &bounds);
+            else
+                hQuadTree->pfnGetBounds(psNode->pahFeatures[i], &bounds);
+
+            if (CPL_RectOverlap(&bounds, pAoi))
+                return true;
+        }
+    }
+
+    /* -------------------------------------------------------------------- */
+    /*      Recurse to subnodes if they exist.                              */
+    /* -------------------------------------------------------------------- */
+    for (int i = 0; i < psNode->nNumSubNodes; i++)
+    {
+        if (psNode->apSubNode[i])
+        {
+            if (CPLQuadTreeHasMatch(hQuadTree, psNode->apSubNode[i], pAoi))
+            {
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+/**
+ * Returns whether the quadtree has at least one element whose bounding box
+ * intersects the provided area of interest
+ *
+ * @param hQuadTree the quad tree
+ * @param pAoi the pointer to the area of interest
+ */
+
+bool CPLQuadTreeHasMatch(const CPLQuadTree *hQuadTree, const CPLRectObj *pAoi)
+{
+    CPLAssert(hQuadTree);
+    CPLAssert(pAoi);
+
+    return CPLQuadTreeHasMatch(hQuadTree, hQuadTree->psRoot, pAoi);
+}
+
 /************************************************************************/
 /*                    CPLQuadTreeNodeForeach()                          */
 /************************************************************************/
diff --git a/port/cpl_quad_tree.h b/port/cpl_quad_tree.h
index f853d7048cec..3976937e7043 100644
--- a/port/cpl_quad_tree.h
+++ b/port/cpl_quad_tree.h
@@ -11,23 +11,7 @@
  * Copyright (c) 1999-2008, Frank Warmerdam
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_QUAD_TREE_H_INCLUDED
@@ -102,6 +86,9 @@ void CPL_DLL CPLQuadTreeRemove(CPLQuadTree *hQuadtree, void *hFeature,
 void CPL_DLL **CPLQuadTreeSearch(const CPLQuadTree *hQuadtree,
                                  const CPLRectObj *pAoi, int *pnFeatureCount);
 
+bool CPL_DLL CPLQuadTreeHasMatch(const CPLQuadTree *hQuadtree,
+                                 const CPLRectObj *pAoi);
+
 void CPL_DLL CPLQuadTreeForeach(const CPLQuadTree *hQuadtree,
                                 CPLQuadTreeForeachFunc pfnForeach,
                                 void *pUserData);
diff --git a/port/cpl_recode.cpp b/port/cpl_recode.cpp
index e22f5d6e095e..f4bb24f63a79 100644
--- a/port/cpl_recode.cpp
+++ b/port/cpl_recode.cpp
@@ -29,6 +29,7 @@
 #include <cstring>
 
 #include "cpl_conv.h"
+#include "cpl_character_sets.h"
 
 #include "utf8.h"
 
@@ -91,27 +92,11 @@ char CPL_DLL *CPLRecode(const char *pszSource, const char *pszSrcEncoding,
          EQUAL(pszDstEncoding, CPL_ENC_ISO8859_1)))
         return CPLStrdup(pszSource);
 
-    /* -------------------------------------------------------------------- */
-    /*      For ZIP file handling                                           */
-    /*      (CP437 might be missing even on some iconv, like on Mac)        */
-    /* -------------------------------------------------------------------- */
-    if (EQUAL(pszSrcEncoding, "CP437") &&
-        EQUAL(pszDstEncoding, CPL_ENC_UTF8))  //
+    // A few hard coded CPxxx/ISO-8859-x to UTF-8 tables
+    if (EQUAL(pszDstEncoding, CPL_ENC_UTF8) &&
+        CPLGetConversionTableToUTF8(pszSrcEncoding))
     {
-        bool bIsAllPrintableASCII = true;
-        const size_t nCharCount = strlen(pszSource);
-        for (size_t i = 0; i < nCharCount; i++)
-        {
-            if (pszSource[i] < 32 || pszSource[i] > 126)
-            {
-                bIsAllPrintableASCII = false;
-                break;
-            }
-        }
-        if (bIsAllPrintableASCII)
-        {
-            return CPLStrdup(pszSource);
-        }
+        return CPLRecodeStub(pszSource, pszSrcEncoding, pszDstEncoding);
     }
 
 #ifdef CPL_RECODE_ICONV
diff --git a/port/cpl_recode_stub.cpp b/port/cpl_recode_stub.cpp
index 62e7d5cbf037..e44da896c0cb 100644
--- a/port/cpl_recode_stub.cpp
+++ b/port/cpl_recode_stub.cpp
@@ -36,6 +36,7 @@
 
 #include "cpl_conv.h"
 #include "cpl_error.h"
+#include "cpl_character_sets.c"
 
 static unsigned utf8decode(const char *p, const char *end, int *len);
 static unsigned utf8towc(const char *src, unsigned srclen, wchar_t *dst,
@@ -161,39 +162,118 @@ char *CPLRecodeStub(const char *pszSource, const char *pszSrcEncoding,
         return pszResult;
     }
 
+    // A few hard coded CPxxx/ISO-8859-x to UTF-8 tables
+    if (EQUAL(pszDstEncoding, CPL_ENC_UTF8))
+    {
+        const auto pConvTable = CPLGetConversionTableToUTF8(pszSrcEncoding);
+        if (pConvTable)
+        {
+            const auto convTable = *pConvTable;
+            const size_t nCharCount = strlen(pszSource);
+            char *pszResult =
+                static_cast<char *>(CPLCalloc(1, nCharCount * 3 + 1));
+            size_t iDst = 0;
+            unsigned char *pabyResult =
+                reinterpret_cast<unsigned char *>(pszResult);
+            for (size_t i = 0; i < nCharCount; ++i)
+            {
+                const unsigned char nChar =
+                    static_cast<unsigned char>(pszSource[i]);
+                if (nChar <= 127)
+                {
+                    pszResult[iDst] = pszSource[i];
+                    ++iDst;
+                }
+                else
+                {
+                    const unsigned char nShiftedChar = nChar - 128;
+                    if (convTable[nShiftedChar][0])
+                    {
+                        pabyResult[iDst] = convTable[nShiftedChar][0];
+                        ++iDst;
+                        CPLAssert(convTable[nShiftedChar][1]);
+                        pabyResult[iDst] = convTable[nShiftedChar][1];
+                        ++iDst;
+                        if (convTable[nShiftedChar][2])
+                        {
+                            pabyResult[iDst] = convTable[nShiftedChar][2];
+                            ++iDst;
+                        }
+                    }
+                    else
+                    {
+                        // Skip the invalid sequence in the input string.
+                        if (!bHaveWarned2)
+                        {
+                            bHaveWarned2 = true;
+                            CPLError(CE_Warning, CPLE_AppDefined,
+                                     "One or several characters couldn't be "
+                                     "converted correctly from %s to %s. "
+                                     "This warning will not be emitted anymore",
+                                     pszSrcEncoding, pszDstEncoding);
+                        }
+                    }
+                }
+            }
+
+            pszResult[iDst] = 0;
+            return pszResult;
+        }
+    }
+
 #ifdef _WIN32
+    const auto MapEncodingToWindowsCodePage = [](const char *pszEncoding)
+    {
+        // Cf https://learn.microsoft.com/fr-fr/windows/win32/intl/code-page-identifiers
+        if (STARTS_WITH(pszEncoding, "CP"))
+        {
+            const int nCode = atoi(pszEncoding + strlen("CP"));
+            if (nCode > 0)
+                return nCode;
+            else if (EQUAL(pszEncoding, "CP_OEMCP"))
+                return CP_OEMCP;
+            else if (EQUAL(pszEncoding, "CP_ACP"))
+                return CP_ACP;
+        }
+        else if (STARTS_WITH(pszEncoding, "WINDOWS-"))
+        {
+            const int nCode = atoi(pszEncoding + strlen("WINDOWS-"));
+            if (nCode > 0)
+                return nCode;
+        }
+        else if (STARTS_WITH(pszEncoding, "ISO-8859-"))
+        {
+            const int nCode = atoi(pszEncoding + strlen("ISO-8859-"));
+            if ((nCode >= 1 && nCode <= 9) || nCode == 13 || nCode == 15)
+                return 28590 + nCode;
+        }
+
+        // Return a negative value, since CP_ACP = 0
+        return -1;
+    };
+
     /* ---------------------------------------------------------------------*/
-    /*      CPXXX to UTF8                                                   */
+    /*     XXX to UTF8                                                      */
     /* ---------------------------------------------------------------------*/
-    if (STARTS_WITH(pszSrcEncoding, "CP") &&
-        strcmp(pszDstEncoding, CPL_ENC_UTF8) == 0)
+    if (strcmp(pszDstEncoding, CPL_ENC_UTF8) == 0)
     {
-        int nCode = atoi(pszSrcEncoding + 2);
-        if (nCode > 0)
+        const int nCode = MapEncodingToWindowsCodePage(pszSrcEncoding);
+        if (nCode >= 0)
         {
             return CPLWin32Recode(pszSource, nCode, CP_UTF8);
         }
-        else if (EQUAL(pszSrcEncoding, "CP_OEMCP"))
-            return CPLWin32Recode(pszSource, CP_OEMCP, CP_UTF8);
-        else if (EQUAL(pszSrcEncoding, "CP_ACP"))
-            return CPLWin32Recode(pszSource, CP_ACP, CP_UTF8);
     }
 
     /* ---------------------------------------------------------------------*/
-    /*      UTF8 to CPXXX                                                   */
+    /*      UTF8 to XXX                                                     */
     /* ---------------------------------------------------------------------*/
-    if (strcmp(pszSrcEncoding, CPL_ENC_UTF8) == 0 &&
-        STARTS_WITH(pszDstEncoding, "CP"))
+    if (strcmp(pszSrcEncoding, CPL_ENC_UTF8) == 0)
     {
-        int nCode = atoi(pszDstEncoding + 2);
-        if (nCode > 0)
+        const int nCode = MapEncodingToWindowsCodePage(pszDstEncoding);
+        if (nCode >= 0)
         {
             return CPLWin32Recode(pszSource, CP_UTF8, nCode);
         }
-        else if (EQUAL(pszDstEncoding, "CP_OEMCP"))
-            return CPLWin32Recode(pszSource, CP_UTF8, CP_OEMCP);
-        else if (EQUAL(pszDstEncoding, "CP_ACP"))
-            return CPLWin32Recode(pszSource, CP_UTF8, CP_ACP);
     }
 #endif
 
@@ -220,30 +300,6 @@ char *CPLRecodeStub(const char *pszSource, const char *pszSrcEncoding,
         return pszResult;
     }
 
-    /* -------------------------------------------------------------------- */
-    /*      UTF-8 to anything else is treated as UTF-8 to ISO-8859-1        */
-    /*      with a warning.                                                 */
-    /* -------------------------------------------------------------------- */
-    if (strcmp(pszSrcEncoding, CPL_ENC_UTF8) == 0 &&
-        strcmp(pszDstEncoding, CPL_ENC_ISO8859_1) == 0)
-    {
-        int nCharCount = static_cast<int>(strlen(pszSource));
-        char *pszResult = static_cast<char *>(CPLCalloc(1, nCharCount + 1));
-
-        if (!bHaveWarned2)
-        {
-            bHaveWarned2 = true;
-            CPLError(CE_Warning, CPLE_AppDefined,
-                     "Recode from UTF-8 to %s not supported, "
-                     "treated as UTF-8 to ISO-8859-1.",
-                     pszDstEncoding);
-        }
-
-        utf8toa(pszSource, nCharCount, pszResult, nCharCount + 1);
-
-        return pszResult;
-    }
-
     /* -------------------------------------------------------------------- */
     /*      Everything else is treated as a no-op with a warning.           */
     /* -------------------------------------------------------------------- */
diff --git a/port/cpl_safemaths.hpp b/port/cpl_safemaths.hpp
index 4c93ec9b0b14..b88ae16b6bc8 100644
--- a/port/cpl_safemaths.hpp
+++ b/port/cpl_safemaths.hpp
@@ -8,23 +8,7 @@
  **********************************************************************
  * Copyright (c) 2017, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_SAFEMATHS_INCLUDED
diff --git a/port/cpl_sha1.cpp b/port/cpl_sha1.cpp
index b5f7f3e31acd..ebbe4fa18cc9 100644
--- a/port/cpl_sha1.cpp
+++ b/port/cpl_sha1.cpp
@@ -11,23 +11,7 @@
  ******************************************************************************
  * Copyright (c) 2017, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include <string.h>
diff --git a/port/cpl_sha1.h b/port/cpl_sha1.h
index 286e1189fd67..4c0421e99986 100644
--- a/port/cpl_sha1.h
+++ b/port/cpl_sha1.h
@@ -11,23 +11,7 @@
  ******************************************************************************
  * Copyright (c) 2017, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_SHA1_INCLUDED_H
diff --git a/port/cpl_spawn.cpp b/port/cpl_spawn.cpp
index 3fb75d7274ea..31dc0341fd73 100644
--- a/port/cpl_spawn.cpp
+++ b/port/cpl_spawn.cpp
@@ -7,23 +7,7 @@
  **********************************************************************
  * Copyright (c) 2012-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -474,7 +458,7 @@ int CPLPipeRead(CPL_FILE_HANDLE fin, void *data, int length)
     {
         while (true)
         {
-            const int n = static_cast<int>(read(fin, pabyData, nRemain));
+            const auto n = read(fin, pabyData, nRemain);
             if (n < 0)
             {
                 if (errno == EINTR)
@@ -485,7 +469,7 @@ int CPLPipeRead(CPL_FILE_HANDLE fin, void *data, int length)
             else if (n == 0)
                 return FALSE;
             pabyData += n;
-            nRemain -= n;
+            nRemain -= static_cast<int>(n);
             break;
         }
     }
@@ -515,7 +499,7 @@ int CPLPipeWrite(CPL_FILE_HANDLE fout, const void *data, int length)
     {
         while (true)
         {
-            const int n = static_cast<int>(write(fout, pabyData, nRemain));
+            const auto n = write(fout, pabyData, nRemain);
             if (n < 0)
             {
                 if (errno == EINTR)
@@ -524,7 +508,7 @@ int CPLPipeWrite(CPL_FILE_HANDLE fout, const void *data, int length)
                     return FALSE;
             }
             pabyData += n;
-            nRemain -= n;
+            nRemain -= static_cast<int>(n);
             break;
         }
     }
@@ -887,6 +871,14 @@ int CPLSpawnAsyncFinish(CPLSpawnedProcess *p, int bWait, CPL_UNUSED int bKill)
             }
             else
             {
+                if (WIFEXITED(status))
+                {
+                    status = WEXITSTATUS(status);
+                }
+                else
+                {
+                    status = -1;
+                }
                 break;
             }
         }
diff --git a/port/cpl_spawn.h b/port/cpl_spawn.h
index dbd2457df60d..e637234f1842 100644
--- a/port/cpl_spawn.h
+++ b/port/cpl_spawn.h
@@ -8,23 +8,7 @@
  **********************************************************************
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_SPAWN_H_INCLUDED
diff --git a/port/cpl_string.cpp b/port/cpl_string.cpp
index f7372c29f7cd..1462f5157d88 100644
--- a/port/cpl_string.cpp
+++ b/port/cpl_string.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 1998, Daniel Morissette
  * Copyright (c) 2008-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  **********************************************************************
  *
  * Independent Security Audit 2003/04/04 Andrey Kiselev:
@@ -52,6 +36,7 @@
 
 #include <cctype>
 #include <climits>
+#include <cmath>
 #include <cstdlib>
 #include <cstring>
 
@@ -1749,6 +1734,118 @@ int CSLFindName(CSLConstList papszStrList, const char *pszName)
     return -1;
 }
 
+/************************************************************************/
+/*                     CPLParseMemorySize()                             */
+/************************************************************************/
+
+/** Parse a memory size from a string.
+ *
+ * The string may indicate the units of the memory (e.g., "230k", "500 MB"),
+ * using the prefixes "k", "m", or "g" in either lower or upper-case,
+ * optionally followed by a "b" or "B". The string may alternatively specify
+ * memory as a fraction of the usable RAM (e.g., "25%"). Spaces before the
+ * number, between the number and the units, or after the units are ignored,
+ * but other characters will cause a parsing failure. If the string cannot
+ * be understood, the function will return CE_Failure.
+ *
+ * @param pszValue the string to parse
+ * @param[out] pnValue the parsed size, converted to bytes (if unit was specified)
+ * @param[out] pbUnitSpecified whether the string indicated the units
+ *
+ * @return CE_None on success, CE_Failure otherwise
+ * @since 3.10
+ */
+CPLErr CPLParseMemorySize(const char *pszValue, GIntBig *pnValue,
+                          bool *pbUnitSpecified)
+{
+    const char *start = pszValue;
+    char *end = nullptr;
+
+    // trim leading whitespace
+    while (*start == ' ')
+    {
+        start++;
+    }
+
+    auto len = CPLStrnlen(start, 100);
+    double value = CPLStrtodM(start, &end);
+    const char *unit = nullptr;
+    bool unitIsNotPercent = false;
+
+    if (end == start)
+    {
+        CPLError(CE_Failure, CPLE_IllegalArg, "Received non-numeric value: %s",
+                 pszValue);
+        return CE_Failure;
+    }
+
+    if (value <= 0 || !std::isfinite(value))
+    {
+        CPLError(CE_Failure, CPLE_IllegalArg,
+                 "Memory size must be a positive number.");
+        return CE_Failure;
+    }
+
+    for (const char *c = end; c < start + len; c++)
+    {
+        if (unit == nullptr)
+        {
+            // check various suffixes and convert number into bytes
+            if (*c == '%')
+            {
+                if (value < 0 || value > 100)
+                {
+                    CPLError(CE_Failure, CPLE_IllegalArg,
+                             "Memory percentage must be between 0 and 100.");
+                    return CE_Failure;
+                }
+                auto bytes = CPLGetUsablePhysicalRAM();
+                value *= static_cast<double>(bytes / 100);
+                unit = c;
+            }
+            else
+            {
+                switch (*c)
+                {
+                    case 'G':
+                    case 'g':
+                        value *= 1024;  // fall-through
+                    case 'M':
+                    case 'm':
+                        value *= 1024;  // fall-through
+                    case 'K':
+                    case 'k':
+                        value *= 1024;
+                        unit = c;
+                        unitIsNotPercent = true;
+                        break;
+                    case ' ':
+                        break;
+                    default:
+                        CPLError(CE_Failure, CPLE_IllegalArg,
+                                 "Unexpected value: %s", pszValue);
+                        return CE_Failure;
+                }
+            }
+        }
+        else if (unitIsNotPercent && c == unit + 1 && (*c == 'b' || *c == 'B'))
+        {
+            // ignore 'B' or 'b' as part of unit
+            continue;
+        }
+        else if (*c != ' ')
+        {
+            CPLError(CE_Failure, CPLE_IllegalArg, "Unexpected value: %s",
+                     pszValue);
+            return CE_Failure;
+        }
+    }
+
+    *pnValue = static_cast<GIntBig>(value);
+    *pbUnitSpecified = (unit != nullptr);
+    return CE_None;
+}
+
 /**********************************************************************
  *                       CPLParseNameValue()
  **********************************************************************/
@@ -2791,6 +2888,10 @@ CPLValueType CPLGetValueType(const char *pszValue)
     if (*pszValue == '+' || *pszValue == '-')
         ++pszValue;
 
+    constexpr char DIGIT_ZERO = '0';
+    if (pszValue[0] == DIGIT_ZERO && pszValue[1] != '\0' && pszValue[1] != '.')
+        return CPL_VALUE_STRING;
+
     bool bFoundDot = false;
     bool bFoundExponent = false;
     bool bIsLastCharExponent = false;
@@ -2863,7 +2964,7 @@ CPLValueType CPLGetValueType(const char *pszValue)
     {
         // cppcheck-suppress unreadVariable
         const double dfVal = CPLAtof(pszValueInit);
-        if (CPLIsInf(dfVal))
+        if (std::isinf(dfVal))
             return CPL_VALUE_STRING;
     }
 
diff --git a/port/cpl_string.h b/port/cpl_string.h
index 4f06433ad0d6..095fcf821ef3 100644
--- a/port/cpl_string.h
+++ b/port/cpl_string.h
@@ -10,23 +10,7 @@
  * Copyright (c) 1998, Daniel Morissette
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_STRING_H_INCLUDED
@@ -128,6 +112,9 @@ bool CPL_DLL CPLTestBool(const char *pszValue);
 bool CPL_DLL CPLFetchBool(CSLConstList papszStrList, const char *pszKey,
                           bool bDefault);
 
+CPLErr CPL_DLL CPLParseMemorySize(const char *pszValue, GIntBig *pnValue,
+                                  bool *pbUnitSpecified);
+
 const char CPL_DLL *CPLParseNameValue(const char *pszNameValue, char **ppszKey);
 const char CPL_DLL *CPLParseNameValueSep(const char *pszNameValue,
                                          char **ppszKey, char chSep);
diff --git a/port/cpl_strtod.cpp b/port/cpl_strtod.cpp
index 99a67707b94b..9c44f757871d 100644
--- a/port/cpl_strtod.cpp
+++ b/port/cpl_strtod.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2006, Andrey Kiselev
  * Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/port/cpl_swift.h b/port/cpl_swift.h
index 46742cc5a08a..fb733bc402e0 100644
--- a/port/cpl_swift.h
+++ b/port/cpl_swift.h
@@ -6,23 +6,7 @@
  **********************************************************************
  * Copyright (c) 2018, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_SWIFT_INCLUDED_H
diff --git a/port/cpl_threadsafe_queue.hpp b/port/cpl_threadsafe_queue.hpp
index ece9d0e53934..351f87ba9906 100644
--- a/port/cpl_threadsafe_queue.hpp
+++ b/port/cpl_threadsafe_queue.hpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_THREADSAFE_QUEUE_INCLUDED
diff --git a/port/cpl_time.h b/port/cpl_time.h
index 115748d9bd37..b39a883f5478 100644
--- a/port/cpl_time.h
+++ b/port/cpl_time.h
@@ -9,23 +9,7 @@
  **********************************************************************
  * Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_TIME_H_INCLUDED
diff --git a/port/cpl_userfaultfd.cpp b/port/cpl_userfaultfd.cpp
index 6f304476d427..6bf5fe809ede 100644
--- a/port/cpl_userfaultfd.cpp
+++ b/port/cpl_userfaultfd.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2018, Dr. James McClain <james.mcclain@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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifdef ENABLE_UFFD
diff --git a/port/cpl_userfaultfd.h b/port/cpl_userfaultfd.h
index e40fe5cea0d7..77785fba4f70 100644
--- a/port/cpl_userfaultfd.h
+++ b/port/cpl_userfaultfd.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2018, Dr. James McClain <james.mcclain@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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_USERFAULTFD
diff --git a/port/cpl_vax.cpp b/port/cpl_vax.cpp
index 76a2438728d8..01420072cd83 100644
--- a/port/cpl_vax.cpp
+++ b/port/cpl_vax.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2000, Avenza Systems Inc, http://www.avenza.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/port/cpl_vax.h b/port/cpl_vax.h
index 74aac24eab80..122dd65baa17 100644
--- a/port/cpl_vax.h
+++ b/port/cpl_vax.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2000, Avenza Systems Inc, http://www.avenza.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_VAX_H
diff --git a/port/cpl_virtualmem.cpp b/port/cpl_virtualmem.cpp
index f17940e17b84..62e67d4904f5 100644
--- a/port/cpl_virtualmem.cpp
+++ b/port/cpl_virtualmem.cpp
@@ -8,23 +8,7 @@
  **********************************************************************
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef _GNU_SOURCE
diff --git a/port/cpl_virtualmem.h b/port/cpl_virtualmem.h
index ee692b45bcbc..6ba8c5d81f02 100644
--- a/port/cpl_virtualmem.h
+++ b/port/cpl_virtualmem.h
@@ -9,23 +9,7 @@
  **********************************************************************
  * Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_VIRTUAL_MEM_INCLUDED
diff --git a/port/cpl_vsi.h b/port/cpl_vsi.h
index 0561eef65e8e..432e92018e17 100644
--- a/port/cpl_vsi.h
+++ b/port/cpl_vsi.h
@@ -10,23 +10,7 @@
  * Copyright (c) 1998, Frank Warmerdam
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_VSI_H_INCLUDED
@@ -465,6 +449,29 @@ int CPL_DLL VSISync(const char *pszSource, const char *pszTarget,
                     const char *const *papszOptions,
                     GDALProgressFunc pProgressFunc, void *pProgressData,
                     char ***ppapszOutputs);
+
+int CPL_DLL VSIMultipartUploadGetCapabilities(
+    const char *pszFilename, int *pbNonSequentialUploadSupported,
+    int *pbParallelUploadSupported, int *pbAbortSupported,
+    size_t *pnMinPartSize, size_t *pnMaxPartSize, int *pnMaxPartCount);
+
+char CPL_DLL *VSIMultipartUploadStart(const char *pszFilename,
+                                      CSLConstList papszOptions);
+char CPL_DLL *VSIMultipartUploadAddPart(const char *pszFilename,
+                                        const char *pszUploadId,
+                                        int nPartNumber,
+                                        vsi_l_offset nFileOffset,
+                                        const void *pData, size_t nDataLength,
+                                        CSLConstList papszOptions);
+int CPL_DLL VSIMultipartUploadEnd(const char *pszFilename,
+                                  const char *pszUploadId, size_t nPartIdsCount,
+                                  const char *const *apszPartIds,
+                                  vsi_l_offset nTotalSize,
+                                  CSLConstList papszOptions);
+int CPL_DLL VSIMultipartUploadAbort(const char *pszFilename,
+                                    const char *pszUploadId,
+                                    CSLConstList papszOptions);
+
 int CPL_DLL VSIAbortPendingUploads(const char *pszFilename);
 
 char CPL_DLL *VSIStrerror(int);
@@ -524,6 +531,8 @@ GByte CPL_DLL *VSIGetMemFileBuffer(const char *pszFilename,
                                    vsi_l_offset *pnDataLength,
                                    int bUnlinkAndSeize);
 
+const char CPL_DLL *VSIMemGenerateHiddenFilename(const char *pszFilename);
+
 /** Callback used by VSIStdoutSetRedirection() */
 typedef size_t (*VSIWriteFunction)(const void *ptr, size_t size, size_t nmemb,
                                    FILE *stream);
diff --git a/port/cpl_vsi_error.cpp b/port/cpl_vsi_error.cpp
index 374541ba24c1..196a38f3ecbb 100644
--- a/port/cpl_vsi_error.cpp
+++ b/port/cpl_vsi_error.cpp
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Rob Emanuele <rdemanuele at 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_vsi_error.h"
diff --git a/port/cpl_vsi_error.h b/port/cpl_vsi_error.h
index d8470a16b034..c00d4510047e 100644
--- a/port/cpl_vsi_error.h
+++ b/port/cpl_vsi_error.h
@@ -10,23 +10,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Rob Emanuele <rdemanuele at 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_VSI_ERROR_H_INCLUDED
diff --git a/port/cpl_vsi_mem.cpp b/port/cpl_vsi_mem.cpp
index caf3a5436c22..0092de0b05bd 100644
--- a/port/cpl_vsi_mem.cpp
+++ b/port/cpl_vsi_mem.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2007-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -43,10 +27,12 @@
 #endif
 
 #include <algorithm>
+#include <atomic>
 #include <map>
 #include <string>
 #include <utility>
 #include <memory>
+#include <set>
 
 #include <mutex>
 // c++17 or VS2017
@@ -70,6 +56,39 @@
 
 //! @cond Doxygen_Suppress
 
+// szHIDDEN_DIRNAME is for files created by VSIMemGenerateHiddenFilename(pszFilename).
+// Such files are of the form "/vsimem/.#!HIDDEN!#./{counter}/{pszFilename}"
+//
+// The high-level design constraint is that "/vsimem/.#!HIDDEN!#." acts as a
+// "side" hierarchy, but still under the "/vsimem/" namespace, so that code
+// having special processing of filenames starting with /vsimem/ can still work.
+// The structure of the returned filename is also such that those files form
+// independent hierarchies, i.e. the tree generated by a
+// VSIMemGenerateHiddenFilename() is "invisible" from the one returned by
+// another call to it.
+//
+// As a consequence:
+// - we don't want ".#!HIDDEN!#." to be listed in VSIReadDir("/vsimem/")
+// - we don't want content under ""/vsimem/.#!HIDDEN!#" to be deleted by
+//   VSIRmdirRecursive("/vsimem/")
+// - we don't want the creation of a file (or directory) called
+//   "/vsimem/.#!HIDDEN!#./{counter}/{pszFilename}"
+//   to cause the implicit creation of "/vsimem/.#!HIDDEN!#./{counter}" and
+//   "/vsimem/.#!HIDDEN!#". This is done so that users don't have to care about
+//   cleaning such implicit directories that are upper in the hierarchy w.r.t.
+//   to what we return to them.
+// - But we want the creation of file or directory
+//   "/vsimem/.#!HIDDEN!#./{counter}/{pszFilename}/something_added_by_user"
+//   to cause "/vsimem/.#!HIDDEN!#./{counter}/{pszFilename}" to be implicitly
+//   created as a directory, so they can list it, or recursively delete it.
+// - we want VSIReadDirRecursive("/vsimem/.#!HIDDEN!#.") to list everything
+//   under it (for debugging purposes)
+// - we want VSIRmdirRecursive("/vsimem/.#!HIDDEN!#.") to remove everything
+//   under it (for debugging purposes)
+//
+
+constexpr const char *szHIDDEN_DIRNAME = "/vsimem/.#!HIDDEN!#.";
+
 /*
 ** Notes on Multithreading:
 **
@@ -139,7 +158,6 @@ class VSIMemHandle final : public VSIVirtualHandle
     bool bUpdate = false;
     bool bEOF = false;
     bool m_bError = false;
-    bool bExtendFileAtNextWrite = false;
 
     VSIMemHandle() = default;
     ~VSIMemHandle() override;
@@ -196,6 +214,7 @@ class VSIMemFilesystemHandler final : public VSIFilesystemHandler
     int Unlink(const char *pszFilename) override;
     int Mkdir(const char *pszDirname, long nMode) override;
     int Rmdir(const char *pszDirname) override;
+    int RmdirRecursive(const char *pszDirname) override;
     char **ReadDirEx(const char *pszDirname, int nMaxFiles) override;
     int Rename(const char *oldpath, const char *newpath) override;
     GIntBig GetDiskFreeSpace(const char *pszDirname) override;
@@ -266,13 +285,21 @@ bool VSIMemFile::SetLength(vsi_l_offset nNewLength)
             return false;
         }
 
-        const vsi_l_offset nNewAlloc = (nNewLength + nNewLength / 10) + 5000;
+        // If the first allocation is 1 MB or above, just take that value
+        // as the one to allocate
+        // Otherwise slightly reserve more to avoid too frequent reallocations.
+        const vsi_l_offset nNewAlloc =
+            (nAllocLength == 0 && nNewLength >= 1024 * 1024)
+                ? nNewLength
+                : nNewLength + nNewLength / 10 + 5000;
         GByte *pabyNewData = nullptr;
         if (static_cast<vsi_l_offset>(static_cast<size_t>(nNewAlloc)) ==
             nNewAlloc)
         {
             pabyNewData = static_cast<GByte *>(
-                VSIRealloc(pabyData, static_cast<size_t>(nNewAlloc)));
+                nAllocLength == 0
+                    ? VSICalloc(1, static_cast<size_t>(nNewAlloc))
+                    : VSIRealloc(pabyData, static_cast<size_t>(nNewAlloc)));
         }
         if (pabyNewData == nullptr)
         {
@@ -283,9 +310,14 @@ bool VSIMemFile::SetLength(vsi_l_offset nNewLength)
             return false;
         }
 
-        // Clear the new allocated part of the buffer.
-        memset(pabyNewData + nAllocLength, 0,
-               static_cast<size_t>(nNewAlloc - nAllocLength));
+        if (nAllocLength > 0)
+        {
+            // Clear the new allocated part of the buffer (only needed if
+            // there was already reserved memory, otherwise VSICalloc() has
+            // zeroized it already)
+            memset(pabyNewData + nAllocLength, 0,
+                   static_cast<size_t>(nNewAlloc - nAllocLength));
+        }
 
         pabyData = pabyNewData;
         nAllocLength = nNewAlloc;
@@ -344,9 +376,12 @@ int VSIMemHandle::Close()
 int VSIMemHandle::Seek(vsi_l_offset nOffset, int nWhence)
 
 {
-    CPL_SHARED_LOCK oLock(poFile->m_oMutex);
+    vsi_l_offset nLength;
+    {
+        CPL_SHARED_LOCK oLock(poFile->m_oMutex);
+        nLength = poFile->nLength;
+    }
 
-    bExtendFileAtNextWrite = false;
     if (nWhence == SEEK_CUR)
     {
         if (nOffset > INT_MAX)
@@ -361,7 +396,7 @@ int VSIMemHandle::Seek(vsi_l_offset nOffset, int nWhence)
     }
     else if (nWhence == SEEK_END)
     {
-        m_nOffset = poFile->nLength + nOffset;
+        m_nOffset = nLength + nOffset;
     }
     else
     {
@@ -371,14 +406,6 @@ int VSIMemHandle::Seek(vsi_l_offset nOffset, int nWhence)
 
     bEOF = false;
 
-    if (m_nOffset > poFile->nLength)
-    {
-        if (bUpdate)  // Writable files are zero-extended by seek past end.
-        {
-            bExtendFileAtNextWrite = true;
-        }
-    }
-
     return 0;
 }
 
@@ -399,13 +426,7 @@ vsi_l_offset VSIMemHandle::Tell()
 size_t VSIMemHandle::Read(void *pBuffer, size_t nSize, size_t nCount)
 
 {
-    CPL_SHARED_LOCK oLock(poFile->m_oMutex);
-
-    if (!m_bReadAllowed)
-    {
-        m_bError = true;
-        return 0;
-    }
+    const vsi_l_offset nOffset = m_nOffset;
 
     size_t nBytesToRead = nSize * nCount;
     if (nBytesToRead == 0)
@@ -417,21 +438,43 @@ size_t VSIMemHandle::Read(void *pBuffer, size_t nSize, size_t nCount)
         return 0;
     }
 
-    if (poFile->nLength <= m_nOffset || nBytesToRead + m_nOffset < nBytesToRead)
+    if (!m_bReadAllowed)
     {
-        bEOF = true;
+        m_bError = true;
         return 0;
     }
-    if (nBytesToRead + m_nOffset > poFile->nLength)
+
+    bool bEOFTmp = bEOF;
+    // Do not access/modify bEOF under the lock to avoid confusing Coverity
+    // Scan since we access it in other methods outside of the lock.
+    const auto DoUnderLock =
+        [this, nOffset, pBuffer, nSize, &nBytesToRead, &nCount, &bEOFTmp]
     {
-        nBytesToRead = static_cast<size_t>(poFile->nLength - m_nOffset);
-        nCount = nBytesToRead / nSize;
-        bEOF = true;
-    }
+        CPL_SHARED_LOCK oLock(poFile->m_oMutex);
+
+        if (poFile->nLength <= nOffset || nBytesToRead + nOffset < nBytesToRead)
+        {
+            bEOFTmp = true;
+            return false;
+        }
+        if (nBytesToRead + nOffset > poFile->nLength)
+        {
+            nBytesToRead = static_cast<size_t>(poFile->nLength - nOffset);
+            nCount = nBytesToRead / nSize;
+            bEOFTmp = true;
+        }
+
+        if (nBytesToRead)
+            memcpy(pBuffer, poFile->pabyData + nOffset,
+                   static_cast<size_t>(nBytesToRead));
+        return true;
+    };
+
+    bool bRet = DoUnderLock();
+    bEOF = bEOFTmp;
+    if (!bRet)
+        return 0;
 
-    if (nBytesToRead)
-        memcpy(pBuffer, poFile->pabyData + m_nOffset,
-               static_cast<size_t>(nBytesToRead));
     m_nOffset += nBytesToRead;
 
     return nCount;
@@ -465,46 +508,42 @@ size_t VSIMemHandle::PRead(void *pBuffer, size_t nSize,
 size_t VSIMemHandle::Write(const void *pBuffer, size_t nSize, size_t nCount)
 
 {
-    CPL_EXCLUSIVE_LOCK oLock(poFile->m_oMutex);
+    const vsi_l_offset nOffset = m_nOffset;
 
     if (!bUpdate)
     {
         errno = EACCES;
         return 0;
     }
-    if (bExtendFileAtNextWrite)
-    {
-        bExtendFileAtNextWrite = false;
-        if (!poFile->SetLength(m_nOffset))
-            return 0;
-    }
 
     const size_t nBytesToWrite = nSize * nCount;
-    if (nCount > 0 && nBytesToWrite / nCount != nSize)
-    {
-        return 0;
-    }
-    if (nBytesToWrite + m_nOffset < nBytesToWrite)
-    {
-        return 0;
-    }
 
-    if (nBytesToWrite + m_nOffset > poFile->nLength)
     {
-        if (!poFile->SetLength(nBytesToWrite + m_nOffset))
+        CPL_EXCLUSIVE_LOCK oLock(poFile->m_oMutex);
+
+        if (nCount > 0 && nBytesToWrite / nCount != nSize)
+        {
+            return 0;
+        }
+        if (nBytesToWrite + nOffset < nBytesToWrite)
+        {
             return 0;
+        }
+
+        if (nBytesToWrite + nOffset > poFile->nLength)
+        {
+            if (!poFile->SetLength(nBytesToWrite + nOffset))
+                return 0;
+        }
+
+        if (nBytesToWrite)
+            memcpy(poFile->pabyData + nOffset, pBuffer, nBytesToWrite);
+
+        time(&poFile->mTime);
     }
 
-    if (nBytesToWrite)
-        memcpy(poFile->pabyData + m_nOffset, pBuffer, nBytesToWrite);
-    // Coverity seems to be confused by the fact that we access m_nOffset
-    // under a shared lock in most places, except here under an exclusive lock
-    // which is fine
-    // coverity[missing_lock]
     m_nOffset += nBytesToWrite;
 
-    time(&poFile->mTime);
-
     return nCount;
 }
 
@@ -554,8 +593,6 @@ int VSIMemHandle::Truncate(vsi_l_offset nNewSize)
         return -1;
     }
 
-    bExtendFileAtNextWrite = false;
-
     CPL_EXCLUSIVE_LOCK oLock(poFile->m_oMutex);
     if (poFile->SetLength(nNewSize))
         return 0;
@@ -684,8 +721,12 @@ VSIVirtualHandle *VSIMemFilesystemHandler::Open(const char *pszFilename,
 #endif
     if (strchr(pszAccess, 'a'))
     {
-        CPL_SHARED_LOCK oLock(poFile->m_oMutex);
-        poHandle->m_nOffset = poFile->nLength;
+        vsi_l_offset nOffset;
+        {
+            CPL_SHARED_LOCK oLock(poFile->m_oMutex);
+            nOffset = poFile->nLength;
+        }
+        poHandle->m_nOffset = nOffset;
     }
 
     return poHandle;
@@ -786,6 +827,18 @@ int VSIMemFilesystemHandler::Mkdir(const char *pszPathname, long /* nMode */)
     CPLMutexHolder oHolder(&hMutex);
 
     const CPLString osPathname = NormalizePath(pszPathname);
+    if (STARTS_WITH(osPathname.c_str(), szHIDDEN_DIRNAME))
+    {
+        if (osPathname.size() == strlen(szHIDDEN_DIRNAME))
+            return 0;
+        // "/vsimem/.#!HIDDEN!#./{unique_counter}"
+        else if (osPathname.find('/', strlen(szHIDDEN_DIRNAME) + 1) ==
+                 std::string::npos)
+            return 0;
+
+        // If "/vsimem/.#!HIDDEN!#./{unique_counter}/user_directory", then
+        // accept creating an explicit directory
+    }
 
     if (oFileList.find(osPathname) != oFileList.end())
     {
@@ -815,6 +868,69 @@ int VSIMemFilesystemHandler::Rmdir(const char *pszPathname)
     return Unlink(pszPathname);
 }
 
+/************************************************************************/
+/*                          RmdirRecursive()                            */
+/************************************************************************/
+
+int VSIMemFilesystemHandler::RmdirRecursive(const char *pszDirname)
+{
+    CPLMutexHolder oHolder(&hMutex);
+
+    const CPLString osPath = NormalizePath(pszDirname);
+    const size_t nPathLen = osPath.size();
+    int ret = 0;
+    if (osPath == "/vsimem")
+    {
+        // Clean-up all files under pszDirname, except hidden directories
+        // if called from "/vsimem"
+        for (auto iter = oFileList.begin(); iter != oFileList.end();
+             /* no automatic increment */)
+        {
+            const char *pszFilePath = iter->second->osFilename.c_str();
+            const size_t nFileLen = iter->second->osFilename.size();
+            if (nFileLen > nPathLen &&
+                memcmp(pszFilePath, osPath.c_str(), nPathLen) == 0 &&
+                pszFilePath[nPathLen] == '/' &&
+                !STARTS_WITH(pszFilePath, szHIDDEN_DIRNAME))
+            {
+                iter = oFileList.erase(iter);
+            }
+            else
+            {
+                ++iter;
+            }
+        }
+    }
+    else
+    {
+        ret = -1;
+        for (auto iter = oFileList.begin(); iter != oFileList.end();
+             /* no automatic increment */)
+        {
+            const char *pszFilePath = iter->second->osFilename.c_str();
+            const size_t nFileLen = iter->second->osFilename.size();
+            if (nFileLen >= nPathLen &&
+                memcmp(pszFilePath, osPath.c_str(), nPathLen) == 0 &&
+                (nFileLen == nPathLen || pszFilePath[nPathLen] == '/'))
+            {
+                // If VSIRmdirRecursive() is used correctly, it should at
+                // least delete the directory on which it has been called
+                ret = 0;
+                iter = oFileList.erase(iter);
+            }
+            else
+            {
+                ++iter;
+            }
+        }
+
+        // Make sure that it always succeed on the root hidden directory
+        if (osPath == szHIDDEN_DIRNAME)
+            ret = 0;
+    }
+    return ret;
+}
+
 /************************************************************************/
 /*                             ReadDirEx()                              */
 /************************************************************************/
@@ -827,41 +943,89 @@ char **VSIMemFilesystemHandler::ReadDirEx(const char *pszPath, int nMaxFiles)
     const CPLString osPath = NormalizePath(pszPath);
 
     char **papszDir = nullptr;
-    size_t nPathLen = osPath.size();
-
-    if (nPathLen > 0 && osPath.back() == '/')
-        nPathLen--;
+    const size_t nPathLen = osPath.size();
 
     // In case of really big number of files in the directory, CSLAddString
     // can be slow (see #2158). We then directly build the list.
     int nItems = 0;
     int nAllocatedItems = 0;
 
-    for (const auto &iter : oFileList)
+    if (osPath == szHIDDEN_DIRNAME)
     {
-        const char *pszFilePath = iter.second->osFilename.c_str();
-        if (EQUALN(osPath, pszFilePath, nPathLen) &&
-            pszFilePath[nPathLen] == '/' &&
-            strstr(pszFilePath + nPathLen + 1, "/") == nullptr)
+        // Special mode for hidden filenames.
+        // "/vsimem/.#!HIDDEN!#./{counter}" subdirectories are not explicitly
+        // created so they do not appear in oFileList, but their subcontent
+        // (e.g "/vsimem/.#!HIDDEN!#./{counter}/foo") does
+        std::set<std::string> oSetSubDirs;
+        for (const auto &iter : oFileList)
         {
-            if (nItems == 0)
+            const char *pszFilePath = iter.second->osFilename.c_str();
+            if (iter.second->osFilename.size() > nPathLen &&
+                memcmp(pszFilePath, osPath.c_str(), nPathLen) == 0)
             {
-                papszDir = static_cast<char **>(CPLCalloc(2, sizeof(char *)));
-                nAllocatedItems = 1;
+                char *pszItem = CPLStrdup(pszFilePath + nPathLen + 1);
+                char *pszSlash = strchr(pszItem, '/');
+                if (pszSlash)
+                    *pszSlash = 0;
+                if (cpl::contains(oSetSubDirs, pszItem))
+                {
+                    CPLFree(pszItem);
+                    continue;
+                }
+                oSetSubDirs.insert(pszItem);
+
+                if (nItems == 0)
+                {
+                    papszDir =
+                        static_cast<char **>(CPLCalloc(2, sizeof(char *)));
+                    nAllocatedItems = 1;
+                }
+                else if (nItems >= nAllocatedItems)
+                {
+                    nAllocatedItems = nAllocatedItems * 2;
+                    papszDir = static_cast<char **>(CPLRealloc(
+                        papszDir, (nAllocatedItems + 2) * sizeof(char *)));
+                }
+
+                papszDir[nItems] = pszItem;
+                papszDir[nItems + 1] = nullptr;
+
+                nItems++;
+                if (nMaxFiles > 0 && nItems > nMaxFiles)
+                    break;
             }
-            else if (nItems >= nAllocatedItems)
+        }
+    }
+    else
+    {
+        for (const auto &iter : oFileList)
+        {
+            const char *pszFilePath = iter.second->osFilename.c_str();
+            if (iter.second->osFilename.size() > nPathLen &&
+                memcmp(pszFilePath, osPath.c_str(), nPathLen) == 0 &&
+                pszFilePath[nPathLen] == '/' &&
+                strstr(pszFilePath + nPathLen + 1, "/") == nullptr)
             {
-                nAllocatedItems = nAllocatedItems * 2;
-                papszDir = static_cast<char **>(CPLRealloc(
-                    papszDir, (nAllocatedItems + 2) * sizeof(char *)));
+                if (nItems == 0)
+                {
+                    papszDir =
+                        static_cast<char **>(CPLCalloc(2, sizeof(char *)));
+                    nAllocatedItems = 1;
+                }
+                else if (nItems >= nAllocatedItems)
+                {
+                    nAllocatedItems = nAllocatedItems * 2;
+                    papszDir = static_cast<char **>(CPLRealloc(
+                        papszDir, (nAllocatedItems + 2) * sizeof(char *)));
+                }
+
+                papszDir[nItems] = CPLStrdup(pszFilePath + nPathLen + 1);
+                papszDir[nItems + 1] = nullptr;
+
+                nItems++;
+                if (nMaxFiles > 0 && nItems > nMaxFiles)
+                    break;
             }
-
-            papszDir[nItems] = CPLStrdup(pszFilePath + nPathLen + 1);
-            papszDir[nItems + 1] = nullptr;
-
-            nItems++;
-            if (nMaxFiles > 0 && nItems > nMaxFiles)
-                break;
         }
     }
 
@@ -924,7 +1088,7 @@ std::string VSIMemFilesystemHandler::NormalizePath(const std::string &in)
     std::replace(s.begin(), s.end(), '\\', '/');
     s.replaceAll("//", '/');
     if (!s.empty() && s.back() == '/')
-        s.resize(s.size() - 1);
+        s.pop_back();
 #if __GNUC__ >= 13
     // gcc 13 complains about below explicit std::move()
     return s;
@@ -1163,3 +1327,43 @@ GByte *VSIGetMemFileBuffer(const char *pszFilename, vsi_l_offset *pnDataLength,
 
     return pabyData;
 }
+
+/************************************************************************/
+/*                    VSIMemGenerateHiddenFilename()                    */
+/************************************************************************/
+
+/**
+ * \brief Generates a unique filename that can be used with the /vsimem/
+ * virtual file system.
+ *
+ * This function returns a (short-lived) string containing a unique filename,
+ * (using an atomic counter), designed for temporary files that must remain
+ * invisible for other users working at the "/vsimem/" top-level, i.e.
+ * such files are not returned by VSIReadDir("/vsimem/") or
+ * VSIReadDirRecursive("/vsimem/)".
+ *
+ * The function does not create the file per se. Such filename can be used to
+ * create a regular file with VSIFOpenL() or VSIFileFromMemBuffer(), or create
+ * a directory with VSIMkdir()
+ *
+ * Once created, deletion of those files using VSIUnlink(), VSIRmdirRecursive(),
+ * etc. is of the responsibility of the user. The user should not attempt to
+ * work with the "parent" directory returned by CPLGetPath() / CPLGetDirname()
+ * on the returned filename, and work only with files at the same level or
+ * in subdirectories of what is returned by this function.
+ *
+ * @param pszFilename the filename to be appended at the end of the returned
+ *                    filename. If not specified, defaults to "unnamed".
+ *
+ * @return pointer to a short-lived string (rotating buffer of strings in
+ * thread-local storage). It is recommended to use CPLStrdup() or std::string()
+ * immediately on it.
+ *
+ * @since GDAL 3.10
+ */
+const char *VSIMemGenerateHiddenFilename(const char *pszFilename)
+{
+    static std::atomic<uint32_t> nCounter{0};
+    return CPLSPrintf("%s/%u/%s", szHIDDEN_DIRNAME, ++nCounter,
+                      pszFilename ? pszFilename : "unnamed");
+}
diff --git a/port/cpl_vsi_virtual.h b/port/cpl_vsi_virtual.h
index 915ff79a9a87..ec8cf2d60554 100644
--- a/port/cpl_vsi_virtual.h
+++ b/port/cpl_vsi_virtual.h
@@ -12,23 +12,7 @@
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2010-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_VSI_VIRTUAL_H_INCLUDED
@@ -139,6 +123,14 @@ struct CPL_DLL VSIVirtualHandle
     virtual size_t PRead(void *pBuffer, size_t nSize,
                          vsi_l_offset nOffset) const;
 
+    /** Ask current operations to be interrupted.
+     * Implementations must be thread-safe, as this will typically be called
+     * from another thread than the active one for this file.
+     */
+    virtual void Interrupt()
+    {
+    }
+
     // NOTE: when adding new methods, besides the "actual" implementations,
     // also consider the VSICachedFile one.
 
@@ -305,6 +297,31 @@ class CPL_DLL VSIFilesystemHandler
                                  const char *pszDomain,
                                  CSLConstList papszOptions);
 
+    virtual bool
+    MultipartUploadGetCapabilities(int *pbNonSequentialUploadSupported,
+                                   int *pbParallelUploadSupported,
+                                   int *pbAbortSupported, size_t *pnMinPartSize,
+                                   size_t *pnMaxPartSize, int *pnMaxPartCount);
+
+    virtual char *MultipartUploadStart(const char *pszFilename,
+                                       CSLConstList papszOptions);
+
+    virtual char *MultipartUploadAddPart(const char *pszFilename,
+                                         const char *pszUploadId,
+                                         int nPartNumber,
+                                         vsi_l_offset nFileOffset,
+                                         const void *pData, size_t nDataLength,
+                                         CSLConstList papszOptions);
+
+    virtual bool
+    MultipartUploadEnd(const char *pszFilename, const char *pszUploadId,
+                       size_t nPartIdsCount, const char *const *apszPartIds,
+                       vsi_l_offset nTotalSize, CSLConstList papszOptions);
+
+    virtual bool MultipartUploadAbort(const char *pszFilename,
+                                      const char *pszUploadId,
+                                      CSLConstList papszOptions);
+
     virtual bool AbortPendingUploads(const char * /*pszFilename*/)
     {
         return true;
@@ -316,6 +333,12 @@ class CPL_DLL VSIFilesystemHandler
         return osFilename;
     }
 
+    virtual std::string
+    GetNonStreamingFilename(const std::string &osFilename) const
+    {
+        return osFilename;
+    }
+
     /** Return the canonical filename.
      *
      * May be implemented by case-insensitive filesystems
diff --git a/port/cpl_vsil.cpp b/port/cpl_vsil.cpp
index 9d781e3b12bd..171fac28eb13 100644
--- a/port/cpl_vsil.cpp
+++ b/port/cpl_vsil.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -794,18 +778,286 @@ int VSISync(const char *pszSource, const char *pszTarget,
                : FALSE;
 }
 
+/************************************************************************/
+/*                    VSIMultipartUploadGetCapabilities()               */
+/************************************************************************/
+
+/**
+ * \brief Return capabilities for multiple part file upload.
+ *
+ * @param pszFilename Filename, or virtual file system prefix, onto which
+ * capabilities should apply.
+ * @param[out] pbNonSequentialUploadSupported If not null,
+ * the pointed value is set if parts can be uploaded in a non-sequential way.
+ * @param[out] pbParallelUploadSupported If not null,
+ * the pointed value is set if parts can be uploaded in a parallel way.
+ * (implies *pbNonSequentialUploadSupported = true)
+ * @param[out] pbAbortSupported If not null,
+ * the pointed value is set if VSIMultipartUploadAbort() is implemented.
+ * @param[out] pnMinPartSize If not null, the pointed value is set to the minimum
+ * size of parts (but the last one), in MiB.
+ * @param[out] pnMaxPartSize If not null, the pointed value is set to the maximum
+ * size of parts, in MiB.
+ * @param[out] pnMaxPartCount  If not null, the pointed value is set to the
+ * maximum number of parts that can be uploaded.
+ *
+ * @return TRUE in case of success, FALSE otherwise.
+ *
+ * @since 3.10
+ */
+int VSIMultipartUploadGetCapabilities(
+    const char *pszFilename, int *pbNonSequentialUploadSupported,
+    int *pbParallelUploadSupported, int *pbAbortSupported,
+    size_t *pnMinPartSize, size_t *pnMaxPartSize, int *pnMaxPartCount)
+{
+    VSIFilesystemHandler *poFSHandler = VSIFileManager::GetHandler(pszFilename);
+
+    return poFSHandler->MultipartUploadGetCapabilities(
+        pbNonSequentialUploadSupported, pbParallelUploadSupported,
+        pbAbortSupported, pnMinPartSize, pnMaxPartSize, pnMaxPartCount);
+}
+
+/************************************************************************/
+/*                     VSIMultipartUploadStart()                        */
+/************************************************************************/
+
+/**
+ * \brief Initiates the upload a (big) file in a piece-wise way.
+ *
+ * Using this API directly is generally not needed, but in very advanced cases,
+ * as VSIFOpenL(..., "wb") + VSIFWriteL(), VSISync(), VSICopyFile() or
+ * VSICopyFileRestartable() may be able to leverage it when needed.
+ *
+ * This is only implemented for the /vsis3/, /vsigs/, /vsiaz/, /vsiadls/ and
+ * /vsioss/ virtual file systems.
+ *
+ * The typical workflow is to do :
+ * - VSIMultipartUploadStart()
+ * - VSIMultipartUploadAddPart(): several times
+ * - VSIMultipartUploadEnd()
+ *
+ * If VSIMultipartUploadAbort() is supported by the filesystem (VSIMultipartUploadGetCapabilities()
+ * can be used to determine it), this function should be called to cancel an
+ * upload. This can be needed to avoid extra billing for some cloud storage
+ * providers.
+ *
+ * The following options are supported:
+ * <ul>
+ * <li>MIME headers such as Content-Type and Content-Encoding
+ * are supported for the /vsis3/, /vsigs/, /vsiaz/, /vsiadls/ file systems.</li>
+ * </ul>
+ *
+ * @param pszFilename Filename to create
+ * @param papszOptions NULL or null-terminated list of options.
+ * @return an upload ID to pass to other VSIMultipartUploadXXXXX() functions,
+ * and to free with CPLFree() once done, or nullptr in case of error.
+ *
+ * @since 3.10
+ */
+char *VSIMultipartUploadStart(const char *pszFilename,
+                              CSLConstList papszOptions)
+{
+    VSIFilesystemHandler *poFSHandler = VSIFileManager::GetHandler(pszFilename);
+
+    return poFSHandler->MultipartUploadStart(pszFilename, papszOptions);
+}
+
+/************************************************************************/
+/*                     VSIMultipartUploadAddPart()                      */
+/************************************************************************/
+
+/**
+ * \brief Uploads a new part to a multi-part uploaded file.
+ *
+ * Cf VSIMultipartUploadStart().
+ *
+ * VSIMultipartUploadGetCapabilities() returns hints on the constraints that
+ * apply to the upload, in terms of minimum/maximum size of each part, maximum
+ * number of parts, and whether non-sequential or parallel uploads are
+ * supported.
+ *
+ * @param pszFilename Filename to which to append the new part. Should be the
+ *                    same as the one used for VSIMultipartUploadStart()
+ * @param pszUploadId Value returned by VSIMultipartUploadStart()
+ * @param nPartNumber Part number, starting at 1.
+ * @param nFileOffset Offset within the file at which (starts at 0) the passed
+ *                    data starts.
+ * @param pData       Pointer to an array of nDataLength bytes.
+ * @param nDataLength Size in bytes of pData.
+ * @param papszOptions Unused. Should be nullptr.
+ *
+ * @return a part identifier that must be passed into the apszPartIds[] array of
+ * VSIMultipartUploadEnd(), and to free with CPLFree() once done, or nullptr in
+ * case of error.
+ *
+ * @since 3.10
+ */
+char *VSIMultipartUploadAddPart(const char *pszFilename,
+                                const char *pszUploadId, int nPartNumber,
+                                vsi_l_offset nFileOffset, const void *pData,
+                                size_t nDataLength, CSLConstList papszOptions)
+{
+    VSIFilesystemHandler *poFSHandler = VSIFileManager::GetHandler(pszFilename);
+
+    return poFSHandler->MultipartUploadAddPart(pszFilename, pszUploadId,
+                                               nPartNumber, nFileOffset, pData,
+                                               nDataLength, papszOptions);
+}
+
+/************************************************************************/
+/*                       VSIMultipartUploadEnd()                        */
+/************************************************************************/
+
+/**
+ * \brief Completes a multi-part file upload.
+ *
+ * Cf VSIMultipartUploadStart().
+ *
+ * @param pszFilename Filename for which multipart upload should be completed.
+ *                    Should be the same as the one used for
+ *                    VSIMultipartUploadStart()
+ * @param pszUploadId Value returned by VSIMultipartUploadStart()
+ * @param nPartIdsCount Number of parts,  andsize of apszPartIds
+ * @param apszPartIds Array of part identifiers (as returned by
+ *                    VSIMultipartUploadAddPart()), that must be ordered in
+ *                    the sequential order of parts, and of size nPartIdsCount.
+ * @param nTotalSize  Total size of the file in bytes (must be equal to the sum
+ *                    of nDataLength passed to VSIMultipartUploadAddPart())
+ * @param papszOptions Unused. Should be nullptr.
+ *
+ * @return TRUE in case of success, FALSE in case of failure.
+ *
+ * @since 3.10
+ */
+int VSIMultipartUploadEnd(const char *pszFilename, const char *pszUploadId,
+                          size_t nPartIdsCount, const char *const *apszPartIds,
+                          vsi_l_offset nTotalSize, CSLConstList papszOptions)
+{
+    VSIFilesystemHandler *poFSHandler = VSIFileManager::GetHandler(pszFilename);
+
+    return poFSHandler->MultipartUploadEnd(pszFilename, pszUploadId,
+                                           nPartIdsCount, apszPartIds,
+                                           nTotalSize, papszOptions);
+}
+
+/************************************************************************/
+/*                       VSIMultipartUploadAbort()                      */
+/************************************************************************/
+
+/**
+ * \brief Aborts a multi-part file upload.
+ *
+ * Cf VSIMultipartUploadStart().
+ *
+ * This function is not implemented for all virtual file systems.
+ * Use VSIMultipartUploadGetCapabilities() to determine if it is supported.
+ *
+ * This can be needed to avoid extra billing for some cloud storage providers.
+ *
+ * @param pszFilename Filename for which multipart upload should be completed.
+ *                    Should be the same as the one used for
+ *                    VSIMultipartUploadStart()
+ * @param pszUploadId Value returned by VSIMultipartUploadStart()
+ * @param papszOptions Unused. Should be nullptr.
+ *
+ * @return TRUE in case of success, FALSE in case of failure.
+ *
+ * @since 3.10
+ */
+int VSIMultipartUploadAbort(const char *pszFilename, const char *pszUploadId,
+                            CSLConstList papszOptions)
+{
+    VSIFilesystemHandler *poFSHandler = VSIFileManager::GetHandler(pszFilename);
+
+    return poFSHandler->MultipartUploadAbort(pszFilename, pszUploadId,
+                                             papszOptions);
+}
+
+#ifndef DOXYGEN_SKIP
+
+/************************************************************************/
+/*                     MultipartUploadGetCapabilities()                 */
+/************************************************************************/
+
+bool VSIFilesystemHandler::MultipartUploadGetCapabilities(int *, int *, int *,
+                                                          size_t *, size_t *,
+                                                          int *)
+{
+    CPLError(
+        CE_Failure, CPLE_NotSupported,
+        "MultipartUploadGetCapabilities() not supported by this file system");
+    return false;
+}
+
+/************************************************************************/
+/*                         MultipartUploadStart()                       */
+/************************************************************************/
+
+char *VSIFilesystemHandler::MultipartUploadStart(const char *, CSLConstList)
+{
+    CPLError(CE_Failure, CPLE_NotSupported,
+             "MultipartUploadStart() not supported by this file system");
+    return nullptr;
+}
+
+/************************************************************************/
+/*                       MultipartUploadAddPart()                       */
+/************************************************************************/
+
+char *VSIFilesystemHandler::MultipartUploadAddPart(const char *, const char *,
+                                                   int, vsi_l_offset,
+                                                   const void *, size_t,
+                                                   CSLConstList)
+{
+    CPLError(CE_Failure, CPLE_NotSupported,
+             "MultipartUploadAddPart() not supported by this file system");
+    return nullptr;
+}
+
+/************************************************************************/
+/*                         MultipartUploadEnd()                         */
+/************************************************************************/
+
+bool VSIFilesystemHandler::MultipartUploadEnd(const char *, const char *,
+                                              size_t, const char *const *,
+                                              vsi_l_offset, CSLConstList)
+{
+    CPLError(CE_Failure, CPLE_NotSupported,
+             "MultipartUploadEnd() not supported by this file system");
+    return FALSE;
+}
+
+/************************************************************************/
+/*                         MultipartUploadAbort()                       */
+/************************************************************************/
+
+bool VSIFilesystemHandler::MultipartUploadAbort(const char *, const char *,
+                                                CSLConstList)
+{
+    CPLError(CE_Failure, CPLE_NotSupported,
+             "MultipartUploadAbort() not supported by this file system");
+    return FALSE;
+}
+
+#endif
+
 /************************************************************************/
 /*                         VSIAbortPendingUploads()                     */
 /************************************************************************/
 
 /**
- * \brief Abort ongoing multi-part uploads.
+ * \brief Abort all ongoing multi-part uploads.
  *
  * Abort ongoing multi-part uploads on AWS S3 and Google Cloud Storage. This
  * can be used in case a process doing such uploads was killed in a unclean way.
  *
+ * This can be needed to avoid extra billing for some cloud storage providers.
+ *
  * Without effect on other virtual file systems.
  *
+ * VSIMultipartUploadAbort() can also be used to cancel a given upload, if the
+ * upload ID is known.
+ *
  * @param pszFilename filename or prefix of a directory into which multipart
  * uploads must be aborted. This can be the root directory of a bucket.  UTF-8
  * encoded.
@@ -1549,7 +1801,7 @@ bool VSIFilesystemHandler::Sync(const char *pszSource, const char *pszTarget,
     if (osSourceWithoutSlash.back() == '/' ||
         osSourceWithoutSlash.back() == '\\')
     {
-        osSourceWithoutSlash.resize(osSourceWithoutSlash.size() - 1);
+        osSourceWithoutSlash.pop_back();
     }
     if (VSIStatL(osSourceWithoutSlash, &sSource) < 0)
     {
@@ -1967,7 +2219,7 @@ int VSIFilesystemHandler::RmdirRecursive(const char *pszDirname)
         (osDirnameWithoutEndSlash.back() == '/' ||
          osDirnameWithoutEndSlash.back() == '\\'))
     {
-        osDirnameWithoutEndSlash.resize(osDirnameWithoutEndSlash.size() - 1);
+        osDirnameWithoutEndSlash.pop_back();
     }
 
     const char SEP = VSIGetDirectorySeparator(pszDirname)[0];
@@ -3235,7 +3487,7 @@ void VSISetCredential(const char *pszPathPrefix, const char *pszKey,
  *
  * @param pszPathPrefix a path prefix of a virtual file system handler.
  *                      Typically of the form "/vsiXXX/bucket". Must NOT be
- * NULL.
+ * NULL. Should not include trailing slashes.
  * @param pszKey        Option name. Must NOT be NULL.
  * @param pszValue      Option value. May be NULL to erase it.
  *
diff --git a/port/cpl_vsil_abstract_archive.cpp b/port/cpl_vsil_abstract_archive.cpp
index b90f4137e32a..92a41510d48a 100644
--- a/port/cpl_vsil_abstract_archive.cpp
+++ b/port/cpl_vsil_abstract_archive.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -432,7 +416,7 @@ char *VSIArchiveFilesystemHandler::SplitFilename(const char *pszFilename,
             {
                 const char lastC = osFileInArchive.back();
                 if (IsEitherSlash(lastC))
-                    osFileInArchive.resize(osFileInArchive.size() - 1);
+                    osFileInArchive.pop_back();
             }
 
             return archiveFilename;
@@ -563,7 +547,7 @@ char *VSIArchiveFilesystemHandler::SplitFilename(const char *pszFilename,
                 {
                     const char lastC = osFileInArchive.back();
                     if (IsEitherSlash(lastC))
-                        osFileInArchive.resize(osFileInArchive.size() - 1);
+                        osFileInArchive.pop_back();
                 }
 
                 return archiveFilename;
diff --git a/port/cpl_vsil_adls.cpp b/port/cpl_vsil_adls.cpp
index 06b1988e8919..5039e295810b 100644
--- a/port/cpl_vsil_adls.cpp
+++ b/port/cpl_vsil_adls.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2020, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -94,7 +78,7 @@ static std::string RemoveTrailingSlash(const std::string &osFilename)
 {
     std::string osWithoutSlash(osFilename);
     if (!osWithoutSlash.empty() && osWithoutSlash.back() == '/')
-        osWithoutSlash.resize(osWithoutSlash.size() - 1);
+        osWithoutSlash.pop_back();
     return osWithoutSlash;
 }
 
@@ -159,13 +143,14 @@ struct VSIDIRADLS : public VSIDIR
 /*                       VSIADLSFSHandler                              */
 /************************************************************************/
 
-class VSIADLSFSHandler final : public IVSIS3LikeFSHandler
+class VSIADLSFSHandler final : public IVSIS3LikeFSHandlerWithMultipartUpload
 {
     CPL_DISALLOW_COPY_ASSIGN(VSIADLSFSHandler)
 
   protected:
     VSICurlHandle *CreateFileHandle(const char *pszFilename) override;
-    std::string GetURLFromFilename(const std::string &osFilename) override;
+    std::string
+    GetURLFromFilename(const std::string &osFilename) const override;
 
     char **GetFileList(const char *pszFilename, int nMaxFiles,
                        bool *pbGotFileList) override;
@@ -243,10 +228,6 @@ class VSIADLSFSHandler final : public IVSIS3LikeFSHandler
                     CSLConstList papszOptions);
 
     // Multipart upload (mapping of S3 interface)
-    bool SupportsParallelMultipartUpload() const override
-    {
-        return true;
-    }
 
     std::string
     InitiateMultipartUpload(const std::string &osFilename,
@@ -294,6 +275,44 @@ class VSIADLSFSHandler final : public IVSIS3LikeFSHandler
         return true;
     }
 
+    bool MultipartUploadAbort(const char *, const char *, CSLConstList) override
+    {
+        CPLError(CE_Failure, CPLE_NotSupported,
+                 "MultipartUploadAbort() not supported by this file system");
+        return false;
+    }
+
+    bool SupportsMultipartAbort() const override
+    {
+        return false;
+    }
+
+    //! Maximum number of parts for multipart upload
+    // No limit imposed by the API. Arbitrary one here
+    int GetMaximumPartCount() override
+    {
+        return INT_MAX;
+    }
+
+    //! Minimum size of a part for multipart upload (except last one), in MiB.
+    int GetMinimumPartSizeInMiB() override
+    {
+        return 0;
+    }
+
+    //! Maximum size of a part for multipart upload, in MiB.
+    // No limit imposed by the API. Arbitrary one here
+    int GetMaximumPartSizeInMiB() override
+    {
+#if SIZEOF_VOIDP == 8
+        return 4000;
+#else
+        // Cannot be larger than 4GiB, otherwise integer overflow would occur
+        // 1 GiB is the maximum reasonable value on a 32-bit machine
+        return 1024;
+#endif
+    }
+
     IVSIS3LikeHandleHelper *CreateHandleHelper(const char *pszURI,
                                                bool bAllowNoObject) override;
 
@@ -1234,18 +1253,17 @@ void VSIADLSFSHandler::ClearCache()
 /*                          GetURLFromFilename()                        */
 /************************************************************************/
 
-std::string VSIADLSFSHandler::GetURLFromFilename(const std::string &osFilename)
+std::string
+VSIADLSFSHandler::GetURLFromFilename(const std::string &osFilename) const
 {
-    std::string osFilenameWithoutPrefix =
+    const std::string osFilenameWithoutPrefix =
         osFilename.substr(GetFSPrefix().size());
-    VSIAzureBlobHandleHelper *poHandleHelper =
+    auto poHandleHelper = std::unique_ptr<VSIAzureBlobHandleHelper>(
         VSIAzureBlobHandleHelper::BuildFromURI(osFilenameWithoutPrefix.c_str(),
-                                               GetFSPrefix().c_str());
-    if (poHandleHelper == nullptr)
+                                               GetFSPrefix().c_str()));
+    if (!poHandleHelper)
         return std::string();
-    std::string osURL(poHandleHelper->GetURLNoKVP());
-    delete poHandleHelper;
-    return osURL;
+    return poHandleHelper->GetURLNoKVP();
 }
 
 /************************************************************************/
@@ -1857,10 +1875,12 @@ bool VSIADLSFSHandler::UploadFile(
         poHandleHelper->ResetQueryParameters();
         if (event == Event::CREATE_FILE)
         {
+            // Cf https://learn.microsoft.com/en-us/rest/api/storageservices/datalakestoragegen2/path/create?view=rest-storageservices-datalakestoragegen2-2019-12-12
             poHandleHelper->AddQueryParameter("resource", "file");
         }
         else if (event == Event::APPEND_DATA)
         {
+            // Cf https://learn.microsoft.com/en-us/rest/api/storageservices/datalakestoragegen2/path/update?view=rest-storageservices-datalakestoragegen2-2019-12-12
             poHandleHelper->AddQueryParameter("action", "append");
             poHandleHelper->AddQueryParameter(
                 "position",
@@ -1868,6 +1888,7 @@ bool VSIADLSFSHandler::UploadFile(
         }
         else
         {
+            // Cf https://learn.microsoft.com/en-us/rest/api/storageservices/datalakestoragegen2/path/update?view=rest-storageservices-datalakestoragegen2-2019-12-12
             poHandleHelper->AddQueryParameter("action", "flush");
             poHandleHelper->AddQueryParameter("close", "true");
             poHandleHelper->AddQueryParameter(
diff --git a/port/cpl_vsil_az.cpp b/port/cpl_vsil_az.cpp
index 6df71b50cc33..a4cc28b39e07 100644
--- a/port/cpl_vsil_az.cpp
+++ b/port/cpl_vsil_az.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2017-2018, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -199,7 +183,7 @@ bool VSIDIRAz::AnalyseAzureFileList(const std::string &osBaseURL,
                 {
                     std::string osKey = pszKey;
                     if (!osKey.empty() && osKey.back() == '/')
-                        osKey.resize(osKey.size() - 1);
+                        osKey.pop_back();
                     if (osKey.size() > osPrefix.size())
                     {
                         aoNameCount[osKey.c_str() + osPrefix.size()]++;
@@ -322,7 +306,7 @@ bool VSIDIRAz::AnalyseAzureFileList(const std::string &osBaseURL,
                 {
                     std::string osKey = pszKey;
                     if (!osKey.empty() && osKey.back() == '/')
-                        osKey.resize(osKey.size() - 1);
+                        osKey.pop_back();
                     if (osKey.size() > osPrefix.size())
                     {
                         aoEntries.push_back(
@@ -499,7 +483,7 @@ const VSIDIREntry *VSIDIRAz::NextDirEntry()
 /*                       VSIAzureFSHandler                              */
 /************************************************************************/
 
-class VSIAzureFSHandler final : public IVSIS3LikeFSHandler
+class VSIAzureFSHandler final : public IVSIS3LikeFSHandlerWithMultipartUpload
 {
     CPL_DISALLOW_COPY_ASSIGN(VSIAzureFSHandler)
     const std::string m_osPrefix;
@@ -509,7 +493,8 @@ class VSIAzureFSHandler final : public IVSIS3LikeFSHandler
 
   protected:
     VSICurlHandle *CreateFileHandle(const char *pszFilename) override;
-    std::string GetURLFromFilename(const std::string &osFilename) override;
+    std::string
+    GetURLFromFilename(const std::string &osFilename) const override;
 
     VSIAzureBlobHandleHelper *CreateAzHandleHelper(const char *pszURI,
                                                    bool bAllowNoObject);
@@ -607,11 +592,6 @@ class VSIAzureFSHandler final : public IVSIS3LikeFSHandler
 
     // Multipart upload (mapping of S3 interface to PutBlock/PutBlockList)
 
-    bool SupportsParallelMultipartUpload() const override
-    {
-        return true;
-    }
-
     std::string InitiateMultipartUpload(
         const std::string & /* osFilename */, IVSIS3LikeHandleHelper *,
         const CPLHTTPRetryParameters & /* oRetryParameters */,
@@ -651,6 +631,18 @@ class VSIAzureFSHandler final : public IVSIS3LikeFSHandler
         return true;
     }
 
+    bool MultipartUploadAbort(const char *, const char *, CSLConstList) override
+    {
+        CPLError(CE_Failure, CPLE_NotSupported,
+                 "MultipartUploadAbort() not supported by this file system");
+        return false;
+    }
+
+    bool SupportsMultipartAbort() const override
+    {
+        return false;
+    }
+
     std::string
     GetStreamingFilename(const std::string &osFilename) const override;
 
@@ -762,8 +754,8 @@ VSIAzureFSHandler::CreateWriteHandle(const char *pszFilename,
     const char *pszBlobType = CSLFetchNameValue(papszOptions, "BLOB_TYPE");
     if (pszBlobType && EQUAL(pszBlobType, "BLOCK"))
     {
-        auto poHandle = std::make_unique<VSIS3LikeWriteHandle>(
-            this, pszFilename, poHandleHelper, false, papszOptions);
+        auto poHandle = std::make_unique<VSIMultipartWriteHandle>(
+            this, pszFilename, poHandleHelper, papszOptions);
         if (!poHandle->IsOK())
         {
             return nullptr;
@@ -1237,7 +1229,7 @@ void VSIAzureWriteHandle::InvalidateParentDirectory()
 
     std::string osFilenameWithoutSlash(m_osFilename);
     if (!osFilenameWithoutSlash.empty() && osFilenameWithoutSlash.back() == '/')
-        osFilenameWithoutSlash.resize(osFilenameWithoutSlash.size() - 1);
+        osFilenameWithoutSlash.pop_back();
     m_poFS->InvalidateDirContent(CPLGetDirname(osFilenameWithoutSlash.c_str()));
 }
 
@@ -1416,18 +1408,17 @@ void VSIAzureFSHandler::ClearCache()
 /*                          GetURLFromFilename()                        */
 /************************************************************************/
 
-std::string VSIAzureFSHandler::GetURLFromFilename(const std::string &osFilename)
+std::string
+VSIAzureFSHandler::GetURLFromFilename(const std::string &osFilename) const
 {
     std::string osFilenameWithoutPrefix =
         osFilename.substr(GetFSPrefix().size());
-    VSIAzureBlobHandleHelper *poHandleHelper =
+    auto poHandleHelper = std::unique_ptr<VSIAzureBlobHandleHelper>(
         VSIAzureBlobHandleHelper::BuildFromURI(osFilenameWithoutPrefix.c_str(),
-                                               GetFSPrefix().c_str());
-    if (poHandleHelper == nullptr)
+                                               GetFSPrefix().c_str()));
+    if (!poHandleHelper)
         return std::string();
-    std::string osURL(poHandleHelper->GetURLNoKVP());
-    delete poHandleHelper;
-    return osURL;
+    return poHandleHelper->GetURLNoKVP();
 }
 
 /************************************************************************/
@@ -1723,7 +1714,7 @@ int VSIAzureFSHandler::MkdirInternal(const char *pszDirname, long /* nMode */,
     }
 
     std::string osDirnameWithoutEndSlash(osDirname);
-    osDirnameWithoutEndSlash.resize(osDirnameWithoutEndSlash.size() - 1);
+    osDirnameWithoutEndSlash.pop_back();
     if (osDirnameWithoutEndSlash.size() > GetFSPrefix().size() &&
         osDirnameWithoutEndSlash.find('/', GetFSPrefix().size()) ==
             std::string::npos)
@@ -1885,7 +1876,7 @@ int VSIAzureFSHandler::Rmdir(const char *pszDirname)
     }
 
     std::string osDirnameWithoutEndSlash(osDirname);
-    osDirnameWithoutEndSlash.resize(osDirnameWithoutEndSlash.size() - 1);
+    osDirnameWithoutEndSlash.pop_back();
     if (osDirnameWithoutEndSlash.size() > GetFSPrefix().size() &&
         osDirnameWithoutEndSlash.find('/', GetFSPrefix().size()) ==
             std::string::npos)
@@ -2504,7 +2495,7 @@ VSIDIR *VSIAzureFSHandler::OpenDir(const char *pszPath, int nRecurseDepth,
     std::string osDirnameWithoutPrefix = pszPath + GetFSPrefix().size();
     if (!osDirnameWithoutPrefix.empty() && osDirnameWithoutPrefix.back() == '/')
     {
-        osDirnameWithoutPrefix.resize(osDirnameWithoutPrefix.size() - 1);
+        osDirnameWithoutPrefix.pop_back();
     }
 
     std::string osBucket(osDirnameWithoutPrefix);
@@ -2581,7 +2572,7 @@ bool VSIAzureHandle::IsDirectoryFromExists(const char * /*pszVerb*/,
     std::string osDirname(m_osFilename);
     if (osDirname.size() > poFS->GetFSPrefix().size() &&
         osDirname.back() == '/')
-        osDirname.resize(osDirname.size() - 1);
+        osDirname.pop_back();
     bool bIsDir;
     if (poFS->ExistsInCacheDirList(osDirname, &bIsDir))
         return bIsDir;
diff --git a/port/cpl_vsil_buffered_reader.cpp b/port/cpl_vsil_buffered_reader.cpp
index 2e8c954b031f..ea1c6037d7fc 100644
--- a/port/cpl_vsil_buffered_reader.cpp
+++ b/port/cpl_vsil_buffered_reader.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010-2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 //! @cond Doxygen_Suppress
diff --git a/port/cpl_vsil_cache.cpp b/port/cpl_vsil_cache.cpp
index edbde4ae2511..64b061285c6f 100644
--- a/port/cpl_vsil_cache.cpp
+++ b/port/cpl_vsil_cache.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2011, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2011-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/port/cpl_vsil_chunked_write_handle.cpp b/port/cpl_vsil_chunked_write_handle.cpp
new file mode 100644
index 000000000000..2d21f91013eb
--- /dev/null
+++ b/port/cpl_vsil_chunked_write_handle.cpp
@@ -0,0 +1,544 @@
+/******************************************************************************
+ *
+ * Project:  CPL - Common Portability Library
+ * Purpose:  Implement a write-only file handle using PUT chunked writing
+ * Author:   Even Rouault, even.rouault at spatialys.com
+ *
+ ******************************************************************************
+ * Copyright (c) 2024, Even Rouault <even.rouault at spatialys.com>
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#include "cpl_vsil_curl_class.h"
+
+#ifdef HAVE_CURL
+
+//! @cond Doxygen_Suppress
+
+#define unchecked_curl_easy_setopt(handle, opt, param)                         \
+    CPL_IGNORE_RET_VAL(curl_easy_setopt(handle, opt, param))
+
+namespace cpl
+{
+
+/************************************************************************/
+/*                        VSIChunkedWriteHandle()                       */
+/************************************************************************/
+
+VSIChunkedWriteHandle::VSIChunkedWriteHandle(
+    IVSIS3LikeFSHandler *poFS, const char *pszFilename,
+    IVSIS3LikeHandleHelper *poS3HandleHelper, CSLConstList papszOptions)
+    : m_poFS(poFS), m_osFilename(pszFilename),
+      m_poS3HandleHelper(poS3HandleHelper), m_aosOptions(papszOptions),
+      m_aosHTTPOptions(CPLHTTPGetOptionsFromEnv(pszFilename)),
+      m_oRetryParameters(m_aosHTTPOptions)
+{
+}
+
+/************************************************************************/
+/*                      ~VSIChunkedWriteHandle()                        */
+/************************************************************************/
+
+VSIChunkedWriteHandle::~VSIChunkedWriteHandle()
+{
+    VSIChunkedWriteHandle::Close();
+    delete m_poS3HandleHelper;
+
+    if (m_hCurlMulti)
+    {
+        if (m_hCurl)
+        {
+            curl_multi_remove_handle(m_hCurlMulti, m_hCurl);
+            curl_easy_cleanup(m_hCurl);
+        }
+        VSICURLMultiCleanup(m_hCurlMulti);
+    }
+    CPLFree(m_sWriteFuncHeaderData.pBuffer);
+}
+
+/************************************************************************/
+/*                                 Close()                              */
+/************************************************************************/
+
+int VSIChunkedWriteHandle::Close()
+{
+    int nRet = 0;
+    if (!m_bClosed)
+    {
+        m_bClosed = true;
+        if (m_hCurlMulti != nullptr)
+        {
+            nRet = FinishChunkedTransfer();
+        }
+        else
+        {
+            if (!m_bError && !DoEmptyPUT())
+                nRet = -1;
+        }
+    }
+    return nRet;
+}
+
+/************************************************************************/
+/*                    InvalidateParentDirectory()                       */
+/************************************************************************/
+
+void VSIChunkedWriteHandle::InvalidateParentDirectory()
+{
+    m_poFS->InvalidateCachedData(m_poS3HandleHelper->GetURL().c_str());
+
+    std::string osFilenameWithoutSlash(m_osFilename);
+    if (!osFilenameWithoutSlash.empty() && osFilenameWithoutSlash.back() == '/')
+        osFilenameWithoutSlash.pop_back();
+    m_poFS->InvalidateDirContent(CPLGetDirname(osFilenameWithoutSlash.c_str()));
+}
+
+/************************************************************************/
+/*                               Seek()                                 */
+/************************************************************************/
+
+int VSIChunkedWriteHandle::Seek(vsi_l_offset nOffset, int nWhence)
+{
+    if (!((nWhence == SEEK_SET && nOffset == m_nCurOffset) ||
+          (nWhence == SEEK_CUR && nOffset == 0) ||
+          (nWhence == SEEK_END && nOffset == 0)))
+    {
+        CPLError(CE_Failure, CPLE_NotSupported,
+                 "Seek not supported on writable %s files",
+                 m_poFS->GetFSPrefix().c_str());
+        m_bError = true;
+        return -1;
+    }
+    return 0;
+}
+
+/************************************************************************/
+/*                               Tell()                                 */
+/************************************************************************/
+
+vsi_l_offset VSIChunkedWriteHandle::Tell()
+{
+    return m_nCurOffset;
+}
+
+/************************************************************************/
+/*                               Read()                                 */
+/************************************************************************/
+
+size_t VSIChunkedWriteHandle::Read(void * /* pBuffer */, size_t /* nSize */,
+                                   size_t /* nMemb */)
+{
+    CPLError(CE_Failure, CPLE_NotSupported,
+             "Read not supported on writable %s files",
+             m_poFS->GetFSPrefix().c_str());
+    m_bError = true;
+    return 0;
+}
+
+/************************************************************************/
+/*                      ReadCallBackBufferChunked()                     */
+/************************************************************************/
+
+size_t VSIChunkedWriteHandle::ReadCallBackBufferChunked(char *buffer,
+                                                        size_t size,
+                                                        size_t nitems,
+                                                        void *instream)
+{
+    VSIChunkedWriteHandle *poThis =
+        static_cast<VSIChunkedWriteHandle *>(instream);
+    if (poThis->m_nChunkedBufferSize == 0)
+    {
+        // CPLDebug("VSIChunkedWriteHandle", "Writing 0 byte (finish)");
+        return 0;
+    }
+    const size_t nSizeMax = size * nitems;
+    size_t nSizeToWrite = nSizeMax;
+    size_t nChunkedBufferRemainingSize =
+        poThis->m_nChunkedBufferSize - poThis->m_nChunkedBufferOff;
+    if (nChunkedBufferRemainingSize < nSizeToWrite)
+        nSizeToWrite = nChunkedBufferRemainingSize;
+    memcpy(buffer,
+           static_cast<const GByte *>(poThis->m_pBuffer) +
+               poThis->m_nChunkedBufferOff,
+           nSizeToWrite);
+    poThis->m_nChunkedBufferOff += nSizeToWrite;
+    // CPLDebug("VSIChunkedWriteHandle", "Writing %d bytes", nSizeToWrite);
+    return nSizeToWrite;
+}
+
+/************************************************************************/
+/*                               Write()                                */
+/************************************************************************/
+
+size_t VSIChunkedWriteHandle::Write(const void *pBuffer, size_t nSize,
+                                    size_t nMemb)
+{
+    if (m_bError)
+        return 0;
+
+    const size_t nBytesToWrite = nSize * nMemb;
+    if (nBytesToWrite == 0)
+        return 0;
+
+    if (m_hCurlMulti == nullptr)
+    {
+        m_hCurlMulti = curl_multi_init();
+    }
+
+    WriteFuncStruct sWriteFuncData;
+    CPLHTTPRetryContext oRetryContext(m_oRetryParameters);
+    // We can only easily retry at the first chunk of a transfer
+    bool bCanRetry = (m_hCurl == nullptr);
+    bool bRetry;
+    do
+    {
+        bRetry = false;
+        struct curl_slist *headers = nullptr;
+        if (m_hCurl == nullptr)
+        {
+            CURL *hCurlHandle = curl_easy_init();
+            unchecked_curl_easy_setopt(hCurlHandle, CURLOPT_UPLOAD, 1L);
+            unchecked_curl_easy_setopt(hCurlHandle, CURLOPT_READFUNCTION,
+                                       ReadCallBackBufferChunked);
+            unchecked_curl_easy_setopt(hCurlHandle, CURLOPT_READDATA, this);
+
+            VSICURLInitWriteFuncStruct(&sWriteFuncData, nullptr, nullptr,
+                                       nullptr);
+            unchecked_curl_easy_setopt(hCurlHandle, CURLOPT_WRITEDATA,
+                                       &sWriteFuncData);
+            unchecked_curl_easy_setopt(hCurlHandle, CURLOPT_WRITEFUNCTION,
+                                       VSICurlHandleWriteFunc);
+
+            VSICURLInitWriteFuncStruct(&m_sWriteFuncHeaderData, nullptr,
+                                       nullptr, nullptr);
+            unchecked_curl_easy_setopt(hCurlHandle, CURLOPT_HEADERDATA,
+                                       &m_sWriteFuncHeaderData);
+            unchecked_curl_easy_setopt(hCurlHandle, CURLOPT_HEADERFUNCTION,
+                                       VSICurlHandleWriteFunc);
+
+            headers = static_cast<struct curl_slist *>(CPLHTTPSetOptions(
+                hCurlHandle, m_poS3HandleHelper->GetURL().c_str(),
+                m_aosHTTPOptions.List()));
+            headers = VSICurlSetCreationHeadersFromOptions(
+                headers, m_aosOptions.List(), m_osFilename.c_str());
+            headers = VSICurlMergeHeaders(
+                headers, m_poS3HandleHelper->GetCurlHeaders("PUT", headers));
+            unchecked_curl_easy_setopt(hCurlHandle, CURLOPT_HTTPHEADER,
+                                       headers);
+
+            m_osCurlErrBuf.resize(CURL_ERROR_SIZE + 1);
+            unchecked_curl_easy_setopt(hCurlHandle, CURLOPT_ERRORBUFFER,
+                                       &m_osCurlErrBuf[0]);
+
+            curl_multi_add_handle(m_hCurlMulti, hCurlHandle);
+            m_hCurl = hCurlHandle;
+        }
+
+        m_pBuffer = pBuffer;
+        m_nChunkedBufferOff = 0;
+        m_nChunkedBufferSize = nBytesToWrite;
+
+        int repeats = 0;
+        // cppcheck-suppress knownConditionTrueFalse
+        while (m_nChunkedBufferOff < m_nChunkedBufferSize && !bRetry)
+        {
+            int still_running;
+
+            memset(&m_osCurlErrBuf[0], 0, m_osCurlErrBuf.size());
+
+            while (curl_multi_perform(m_hCurlMulti, &still_running) ==
+                       CURLM_CALL_MULTI_PERFORM &&
+                   // cppcheck-suppress knownConditionTrueFalse
+                   m_nChunkedBufferOff < m_nChunkedBufferSize)
+            {
+                // loop
+            }
+            // cppcheck-suppress knownConditionTrueFalse
+            if (!still_running || m_nChunkedBufferOff == m_nChunkedBufferSize)
+                break;
+
+            CURLMsg *msg;
+            do
+            {
+                int msgq = 0;
+                msg = curl_multi_info_read(m_hCurlMulti, &msgq);
+                if (msg && (msg->msg == CURLMSG_DONE))
+                {
+                    CURL *e = msg->easy_handle;
+                    if (e == m_hCurl)
+                    {
+                        long response_code;
+                        curl_easy_getinfo(m_hCurl, CURLINFO_RESPONSE_CODE,
+                                          &response_code);
+                        if (response_code != 200 && response_code != 201)
+                        {
+                            // Look if we should attempt a retry
+                            if (bCanRetry &&
+                                oRetryContext.CanRetry(
+                                    static_cast<int>(response_code),
+                                    m_sWriteFuncHeaderData.pBuffer,
+                                    m_osCurlErrBuf.c_str()))
+                            {
+                                CPLError(CE_Warning, CPLE_AppDefined,
+                                         "HTTP error code: %d - %s. "
+                                         "Retrying again in %.1f secs",
+                                         static_cast<int>(response_code),
+                                         m_poS3HandleHelper->GetURL().c_str(),
+                                         oRetryContext.GetCurrentDelay());
+                                CPLSleep(oRetryContext.GetCurrentDelay());
+                                bRetry = true;
+                            }
+                            else if (sWriteFuncData.pBuffer != nullptr &&
+                                     m_poS3HandleHelper->CanRestartOnError(
+                                         sWriteFuncData.pBuffer,
+                                         m_sWriteFuncHeaderData.pBuffer, false))
+                            {
+                                bRetry = true;
+                            }
+                            else
+                            {
+                                CPLError(CE_Failure, CPLE_AppDefined,
+                                         "Error %d: %s",
+                                         static_cast<int>(response_code),
+                                         m_osCurlErrBuf.c_str());
+
+                                curl_slist_free_all(headers);
+                                bRetry = false;
+                            }
+
+                            curl_multi_remove_handle(m_hCurlMulti, m_hCurl);
+                            curl_easy_cleanup(m_hCurl);
+
+                            CPLFree(sWriteFuncData.pBuffer);
+                            CPLFree(m_sWriteFuncHeaderData.pBuffer);
+
+                            m_hCurl = nullptr;
+                            sWriteFuncData.pBuffer = nullptr;
+                            m_sWriteFuncHeaderData.pBuffer = nullptr;
+                            if (!bRetry)
+                                return 0;
+                        }
+                    }
+                }
+            } while (msg);
+
+            CPLMultiPerformWait(m_hCurlMulti, repeats);
+        }
+
+        m_nWrittenInPUT += nBytesToWrite;
+
+        curl_slist_free_all(headers);
+
+        m_pBuffer = nullptr;
+
+        if (!bRetry)
+        {
+            long response_code;
+            curl_easy_getinfo(m_hCurl, CURLINFO_RESPONSE_CODE, &response_code);
+            if (response_code != 100)
+            {
+                // Look if we should attempt a retry
+                if (bCanRetry &&
+                    oRetryContext.CanRetry(static_cast<int>(response_code),
+                                           m_sWriteFuncHeaderData.pBuffer,
+                                           m_osCurlErrBuf.c_str()))
+                {
+                    CPLError(CE_Warning, CPLE_AppDefined,
+                             "HTTP error code: %d - %s. "
+                             "Retrying again in %.1f secs",
+                             static_cast<int>(response_code),
+                             m_poS3HandleHelper->GetURL().c_str(),
+                             oRetryContext.GetCurrentDelay());
+                    CPLSleep(oRetryContext.GetCurrentDelay());
+                    bRetry = true;
+                }
+                else if (sWriteFuncData.pBuffer != nullptr &&
+                         m_poS3HandleHelper->CanRestartOnError(
+                             sWriteFuncData.pBuffer,
+                             m_sWriteFuncHeaderData.pBuffer, false))
+                {
+                    bRetry = true;
+                }
+                else
+                {
+                    CPLError(CE_Failure, CPLE_AppDefined, "Error %d: %s",
+                             static_cast<int>(response_code),
+                             m_osCurlErrBuf.c_str());
+                    bRetry = false;
+                    nMemb = 0;
+                }
+
+                curl_multi_remove_handle(m_hCurlMulti, m_hCurl);
+                curl_easy_cleanup(m_hCurl);
+
+                CPLFree(sWriteFuncData.pBuffer);
+                CPLFree(m_sWriteFuncHeaderData.pBuffer);
+
+                m_hCurl = nullptr;
+                sWriteFuncData.pBuffer = nullptr;
+                m_sWriteFuncHeaderData.pBuffer = nullptr;
+            }
+        }
+    } while (bRetry);
+
+    m_nCurOffset += nBytesToWrite;
+
+    return nMemb;
+}
+
+/************************************************************************/
+/*                        FinishChunkedTransfer()                       */
+/************************************************************************/
+
+int VSIChunkedWriteHandle::FinishChunkedTransfer()
+{
+    if (m_hCurl == nullptr)
+        return -1;
+
+    NetworkStatisticsFileSystem oContextFS(m_poFS->GetFSPrefix().c_str());
+    NetworkStatisticsFile oContextFile(m_osFilename.c_str());
+    NetworkStatisticsAction oContextAction("Write");
+
+    NetworkStatisticsLogger::LogPUT(m_nWrittenInPUT);
+    m_nWrittenInPUT = 0;
+
+    m_pBuffer = nullptr;
+    m_nChunkedBufferOff = 0;
+    m_nChunkedBufferSize = 0;
+
+    VSICURLMultiPerform(m_hCurlMulti);
+
+    long response_code;
+    curl_easy_getinfo(m_hCurl, CURLINFO_RESPONSE_CODE, &response_code);
+    if (response_code == 200 || response_code == 201)
+    {
+        InvalidateParentDirectory();
+    }
+    else
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Error %d: %s",
+                 static_cast<int>(response_code), m_osCurlErrBuf.c_str());
+        return -1;
+    }
+    return 0;
+}
+
+/************************************************************************/
+/*                            DoEmptyPUT()                              */
+/************************************************************************/
+
+bool VSIChunkedWriteHandle::DoEmptyPUT()
+{
+    bool bSuccess = true;
+    bool bRetry;
+    CPLHTTPRetryContext oRetryContext(m_oRetryParameters);
+
+    NetworkStatisticsFileSystem oContextFS(m_poFS->GetFSPrefix().c_str());
+    NetworkStatisticsFile oContextFile(m_osFilename.c_str());
+    NetworkStatisticsAction oContextAction("Write");
+
+    do
+    {
+        bRetry = false;
+
+        PutData putData;
+        putData.pabyData = nullptr;
+        putData.nOff = 0;
+        putData.nTotalSize = 0;
+
+        CURL *hCurlHandle = curl_easy_init();
+        unchecked_curl_easy_setopt(hCurlHandle, CURLOPT_UPLOAD, 1L);
+        unchecked_curl_easy_setopt(hCurlHandle, CURLOPT_READFUNCTION,
+                                   PutData::ReadCallBackBuffer);
+        unchecked_curl_easy_setopt(hCurlHandle, CURLOPT_READDATA, &putData);
+        unchecked_curl_easy_setopt(hCurlHandle, CURLOPT_INFILESIZE, 0);
+
+        struct curl_slist *headers = static_cast<struct curl_slist *>(
+            CPLHTTPSetOptions(hCurlHandle, m_poS3HandleHelper->GetURL().c_str(),
+                              m_aosHTTPOptions.List()));
+        headers = VSICurlSetCreationHeadersFromOptions(
+            headers, m_aosOptions.List(), m_osFilename.c_str());
+        headers = VSICurlMergeHeaders(
+            headers, m_poS3HandleHelper->GetCurlHeaders("PUT", headers, "", 0));
+        headers = curl_slist_append(headers, "Expect: 100-continue");
+
+        CurlRequestHelper requestHelper;
+        const long response_code = requestHelper.perform(
+            hCurlHandle, headers, m_poFS, m_poS3HandleHelper);
+
+        NetworkStatisticsLogger::LogPUT(0);
+
+        if (response_code != 200 && response_code != 201)
+        {
+            // Look if we should attempt a retry
+            if (oRetryContext.CanRetry(
+                    static_cast<int>(response_code),
+                    requestHelper.sWriteFuncHeaderData.pBuffer,
+                    requestHelper.szCurlErrBuf))
+            {
+                CPLError(CE_Warning, CPLE_AppDefined,
+                         "HTTP error code: %d - %s. "
+                         "Retrying again in %.1f secs",
+                         static_cast<int>(response_code),
+                         m_poS3HandleHelper->GetURL().c_str(),
+                         oRetryContext.GetCurrentDelay());
+                CPLSleep(oRetryContext.GetCurrentDelay());
+                bRetry = true;
+            }
+            else if (requestHelper.sWriteFuncData.pBuffer != nullptr &&
+                     m_poS3HandleHelper->CanRestartOnError(
+                         requestHelper.sWriteFuncData.pBuffer,
+                         requestHelper.sWriteFuncHeaderData.pBuffer, false))
+            {
+                bRetry = true;
+            }
+            else
+            {
+                CPLDebug("S3", "%s",
+                         requestHelper.sWriteFuncData.pBuffer
+                             ? requestHelper.sWriteFuncData.pBuffer
+                             : "(null)");
+                CPLError(CE_Failure, CPLE_AppDefined,
+                         "DoSinglePartPUT of %s failed", m_osFilename.c_str());
+                bSuccess = false;
+            }
+        }
+        else
+        {
+            InvalidateParentDirectory();
+        }
+
+        if (requestHelper.sWriteFuncHeaderData.pBuffer != nullptr)
+        {
+            const char *pzETag =
+                strstr(requestHelper.sWriteFuncHeaderData.pBuffer, "ETag: \"");
+            if (pzETag)
+            {
+                pzETag += strlen("ETag: \"");
+                const char *pszEndOfETag = strchr(pzETag, '"');
+                if (pszEndOfETag)
+                {
+                    FileProp oFileProp;
+                    oFileProp.eExists = EXIST_YES;
+                    oFileProp.fileSize = m_nBufferOff;
+                    oFileProp.bHasComputedFileSize = true;
+                    oFileProp.ETag.assign(pzETag, pszEndOfETag - pzETag);
+                    m_poFS->SetCachedFileProp(
+                        m_poFS->GetURLFromFilename(m_osFilename.c_str())
+                            .c_str(),
+                        oFileProp);
+                }
+            }
+        }
+
+        curl_easy_cleanup(hCurlHandle);
+    } while (bRetry);
+    return bSuccess;
+}
+
+}  // namespace cpl
+
+//! @endcond
+
+#endif  // HAVE_CURL
diff --git a/port/cpl_vsil_crypt.cpp b/port/cpl_vsil_crypt.cpp
index d5d78f51b34e..95ad1c22e6d6 100644
--- a/port/cpl_vsil_crypt.cpp
+++ b/port/cpl_vsil_crypt.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/port/cpl_vsil_curl.cpp b/port/cpl_vsil_curl.cpp
index 2308a26876c2..633b1636c707 100644
--- a/port/cpl_vsil_curl.cpp
+++ b/port/cpl_vsil_curl.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010-2018, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -634,6 +618,7 @@ void VSICURLInitWriteFuncStruct(cpl::WriteFuncStruct *psStruct, VSILFILE *fp,
     psStruct->nStartOffset = 0;
     psStruct->nEndOffset = 0;
     psStruct->nHTTPCode = 0;
+    psStruct->nFirstHTTPCode = 0;
     psStruct->nContentLength = 0;
     psStruct->bFoundContentRange = false;
     psStruct->bError = false;
@@ -676,7 +661,10 @@ size_t VSICurlHandleWriteFunc(void *buffer, size_t count, size_t nmemb,
                 char *pszSpace = strchr(pszLine, ' ');
                 if (pszSpace)
                 {
-                    psStruct->nHTTPCode = atoi(pszSpace + 1);
+                    const int nHTTPCode = atoi(pszSpace + 1);
+                    if (psStruct->nFirstHTTPCode == 0)
+                        psStruct->nFirstHTTPCode = nHTTPCode;
+                    psStruct->nHTTPCode = nHTTPCode;
                 }
             }
             else if (STARTS_WITH_CI(pszLine, "Content-Length: "))
@@ -831,7 +819,8 @@ static GIntBig VSICurlGetExpiresFromS3LikeSignedURL(const char *pszURL)
 /*                       VSICURLMultiPerform()                          */
 /************************************************************************/
 
-void VSICURLMultiPerform(CURLM *hCurlMultiHandle, CURL *hEasyHandle)
+void VSICURLMultiPerform(CURLM *hCurlMultiHandle, CURL *hEasyHandle,
+                         std::atomic<bool> *pbInterrupt)
 {
     int repeats = 0;
 
@@ -866,6 +855,9 @@ void VSICURLMultiPerform(CURLM *hCurlMultiHandle, CURL *hEasyHandle)
 #endif
 
         CPLMultiPerformWait(hCurlMultiHandle, repeats);
+
+        if (pbInterrupt && *pbInterrupt)
+            break;
     }
     CPLHTTPRestoreSigPipeHandler(old_handler);
 
@@ -1150,7 +1142,7 @@ vsi_l_offset VSICurlHandle::GetFileSizeOrHeaders(bool bSetError,
 
     unchecked_curl_easy_setopt(hCurlHandle, CURLOPT_FILETIME, 1);
 
-    VSICURLMultiPerform(hCurlMultiHandle, hCurlHandle);
+    VSICURLMultiPerform(hCurlMultiHandle, hCurlHandle, &m_bInterrupt);
 
     VSICURLResetHeaderAndWriterFunctions(hCurlHandle);
 
@@ -1232,15 +1224,23 @@ vsi_l_offset VSICurlHandle::GetFileSizeOrHeaders(bool bSetError,
         if (!osEffectiveURL.empty() &&
             strstr(osEffectiveURL.c_str(), osURL.c_str()) == nullptr)
         {
-            CPLDebug(poFS->GetDebugKey(), "Effective URL: %s",
-                     osEffectiveURL.c_str());
-
-            if (m_bUseRedirectURLIfNoQueryStringParams &&
-                osEffectiveURL.find('?') == std::string::npos)
+            // Moved permanently ?
+            if (sWriteFuncHeaderData.nFirstHTTPCode == 301 ||
+                (m_bUseRedirectURLIfNoQueryStringParams &&
+                 osEffectiveURL.find('?') == std::string::npos))
             {
+                CPLDebug(poFS->GetDebugKey(),
+                         "Using effective URL %s permanently",
+                         osEffectiveURL.c_str());
                 oFileProp.osRedirectURL = osEffectiveURL;
                 poFS->SetCachedFileProp(m_pszURL, oFileProp);
             }
+            else
+            {
+                CPLDebug(poFS->GetDebugKey(),
+                         "Using effective URL %s temporarily",
+                         osEffectiveURL.c_str());
+            }
 
             // Is this is a redirect to a S3 URL?
             if (VSICurlIsS3LikeSignedURL(osEffectiveURL.c_str()) &&
@@ -1363,7 +1363,6 @@ vsi_l_offset VSICurlHandle::GetFileSizeOrHeaders(bool bSetError,
                 }
             }
 
-            if (bGetHeaders)
             {
                 char **papszHeaders =
                     CSLTokenizeString2(sWriteFuncHeaderData.pBuffer, "\r\n", 0);
@@ -1374,7 +1373,17 @@ vsi_l_offset VSICurlHandle::GetFileSizeOrHeaders(bool bSetError,
                         CPLParseNameValue(papszHeaders[i], &pszKey);
                     if (pszKey && pszValue)
                     {
-                        m_aosHeaders.SetNameValue(pszKey, pszValue);
+                        if (bGetHeaders)
+                        {
+                            m_aosHeaders.SetNameValue(pszKey, pszValue);
+                        }
+                        if (EQUAL(pszKey, "Cache-Control") &&
+                            EQUAL(pszValue, "no-cache") &&
+                            CPLTestBool(CPLGetConfigOption(
+                                "CPL_VSIL_CURL_HONOR_CACHE_CONTROL", "YES")))
+                        {
+                            m_bCached = false;
+                        }
                     }
                     CPLFree(pszKey);
                 }
@@ -1590,7 +1599,9 @@ vsi_l_offset VSICurlHandle::Tell()
 /*                       GetRedirectURLIfValid()                        */
 /************************************************************************/
 
-std::string VSICurlHandle::GetRedirectURLIfValid(bool &bHasExpired) const
+std::string
+VSICurlHandle::GetRedirectURLIfValid(bool &bHasExpired,
+                                     CPLStringList &aosHTTPOptions) const
 {
     bHasExpired = false;
     poFS->GetCachedFileProp(m_pszURL, oFileProp);
@@ -1622,6 +1633,39 @@ std::string VSICurlHandle::GetRedirectURLIfValid(bool &bHasExpired) const
         bHasExpired = false;
     }
 
+    if (m_pszURL != osURL)
+    {
+        const char *pszAuthorizationHeaderAllowed = CPLGetConfigOption(
+            "CPL_VSIL_CURL_AUTHORIZATION_HEADER_ALLOWED_IF_REDIRECT",
+            "IF_SAME_HOST");
+        if (EQUAL(pszAuthorizationHeaderAllowed, "IF_SAME_HOST"))
+        {
+            const auto ExtractServer = [](const std::string &s)
+            {
+                size_t afterHTTPPos = 0;
+                if (STARTS_WITH(s.c_str(), "http://"))
+                    afterHTTPPos = strlen("http://");
+                else if (STARTS_WITH(s.c_str(), "https://"))
+                    afterHTTPPos = strlen("https://");
+                const auto posSlash = s.find('/', afterHTTPPos);
+                if (posSlash != std::string::npos)
+                    return s.substr(afterHTTPPos, posSlash - afterHTTPPos);
+                else
+                    return s.substr(afterHTTPPos);
+            };
+
+            if (ExtractServer(osURL) != ExtractServer(m_pszURL))
+            {
+                aosHTTPOptions.SetNameValue("AUTHORIZATION_HEADER_ALLOWED",
+                                            "NO");
+            }
+        }
+        else if (!CPLTestBool(pszAuthorizationHeaderAllowed))
+        {
+            aosHTTPOptions.SetNameValue("AUTHORIZATION_HEADER_ALLOWED", "NO");
+        }
+    }
+
     return osURL;
 }
 
@@ -1796,7 +1840,9 @@ std::string VSICurlHandle::DownloadRegion(const vsi_l_offset startOffset,
     ManagePlanetaryComputerSigning();
 
     bool bHasExpired = false;
-    std::string osURL(GetRedirectURLIfValid(bHasExpired));
+
+    CPLStringList aosHTTPOptions(m_aosHTTPOptions);
+    std::string osURL(GetRedirectURLIfValid(bHasExpired, aosHTTPOptions));
     bool bUsedRedirect = osURL != m_pszURL;
 
     WriteFuncStruct sWriteFuncData;
@@ -1806,7 +1852,7 @@ std::string VSICurlHandle::DownloadRegion(const vsi_l_offset startOffset,
 retry:
     CURL *hCurlHandle = curl_easy_init();
     struct curl_slist *headers =
-        VSICurlSetOptions(hCurlHandle, osURL.c_str(), m_aosHTTPOptions.List());
+        VSICurlSetOptions(hCurlHandle, osURL.c_str(), aosHTTPOptions.List());
 
     if (!AllowAutomaticRedirection())
         unchecked_curl_easy_setopt(hCurlHandle, CURLOPT_FOLLOWLOCATION, 0);
@@ -1863,7 +1909,7 @@ std::string VSICurlHandle::DownloadRegion(const vsi_l_offset startOffset,
 
     unchecked_curl_easy_setopt(hCurlHandle, CURLOPT_FILETIME, 1);
 
-    VSICURLMultiPerform(hCurlMultiHandle, hCurlHandle);
+    VSICURLMultiPerform(hCurlMultiHandle, hCurlHandle, &m_bInterrupt);
 
     VSICURLResetHeaderAndWriterFunctions(hCurlHandle);
 
@@ -1871,10 +1917,13 @@ std::string VSICurlHandle::DownloadRegion(const vsi_l_offset startOffset,
 
     NetworkStatisticsLogger::LogGET(sWriteFuncData.nSize);
 
-    if (sWriteFuncData.bInterrupted)
+    if (sWriteFuncData.bInterrupted || m_bInterrupt)
     {
         bInterrupted = true;
 
+        // Notify that the download of the current region is finished
+        currentDownload.SetData(std::string());
+
         CPLFree(sWriteFuncData.pBuffer);
         CPLFree(sWriteFuncHeaderData.pBuffer);
         curl_easy_cleanup(hCurlHandle);
@@ -2366,7 +2415,9 @@ int VSICurlHandle::ReadMultiRange(int const nRanges, void **const ppData,
     ManagePlanetaryComputerSigning();
 
     bool bHasExpired = false;
-    std::string osURL(GetRedirectURLIfValid(bHasExpired));
+
+    CPLStringList aosHTTPOptions(m_aosHTTPOptions);
+    std::string osURL(GetRedirectURLIfValid(bHasExpired, aosHTTPOptions));
     if (bHasExpired)
     {
         return VSIVirtualHandle::ReadMultiRange(nRanges, ppData, panOffsets,
@@ -2431,7 +2482,7 @@ int VSICurlHandle::ReadMultiRange(int const nRanges, void **const ppData,
         // unchecked_curl_easy_setopt(hCurlHandle, CURLOPT_PIPEWAIT, 1);
 
         struct curl_slist *headers = VSICurlSetOptions(
-            hCurlHandle, osURL.c_str(), m_aosHTTPOptions.List());
+            hCurlHandle, osURL.c_str(), aosHTTPOptions.List());
 
         VSICURLInitWriteFuncStruct(&asWriteFuncData[iRequest], this, pfnReadCbk,
                                    pReadCbkUserData);
@@ -3023,18 +3074,19 @@ size_t VSICurlHandle::PRead(void *pBuffer, size_t nSize,
     NetworkStatisticsFile oContextFile(m_osFilename.c_str());
     NetworkStatisticsAction oContextAction("PRead");
 
+    CPLStringList aosHTTPOptions(m_aosHTTPOptions);
     std::string osURL;
     {
         std::lock_guard<std::mutex> oLock(m_oMutex);
         ManagePlanetaryComputerSigning();
         bool bHasExpired;
-        osURL = GetRedirectURLIfValid(bHasExpired);
+        osURL = GetRedirectURLIfValid(bHasExpired, aosHTTPOptions);
     }
 
     CURL *hCurlHandle = curl_easy_init();
 
     struct curl_slist *headers =
-        VSICurlSetOptions(hCurlHandle, osURL.c_str(), m_aosHTTPOptions.List());
+        VSICurlSetOptions(hCurlHandle, osURL.c_str(), aosHTTPOptions.List());
 
     WriteFuncStruct sWriteFuncData;
     VSICURLInitWriteFuncStruct(&sWriteFuncData, nullptr, nullptr, nullptr);
@@ -3092,8 +3144,7 @@ size_t VSICurlHandle::PRead(void *pBuffer, size_t nSize,
     unchecked_curl_easy_setopt(hCurlHandle, CURLOPT_HTTPHEADER, headers);
 
     CURLM *hMultiHandle = poFS->GetCurlMultiHandleFor(osURL);
-    curl_multi_add_handle(hMultiHandle, hCurlHandle);
-    VSICURLMultiPerform(hMultiHandle);
+    VSICURLMultiPerform(hMultiHandle, hCurlHandle, &m_bInterrupt);
 
     {
         std::lock_guard<std::mutex> oLock(m_oMutex);
@@ -3116,9 +3167,12 @@ size_t VSICurlHandle::PRead(void *pBuffer, size_t nSize,
     if ((response_code != 206 && response_code != 225) ||
         sWriteFuncData.nSize == 0)
     {
-        CPLDebug(poFS->GetDebugKey(),
-                 "Request for %s failed with response_code=%ld", rangeStr,
-                 response_code);
+        if (!m_bInterrupt)
+        {
+            CPLDebug(poFS->GetDebugKey(),
+                     "Request for %s failed with response_code=%ld", rangeStr,
+                     response_code);
+        }
         nRet = static_cast<size_t>(-1);
     }
     else
@@ -3128,7 +3182,6 @@ size_t VSICurlHandle::PRead(void *pBuffer, size_t nSize,
             memcpy(pBuffer, sWriteFuncData.pBuffer, nRet);
     }
 
-    curl_multi_remove_handle(hMultiHandle, hCurlHandle);
     VSICURLResetHeaderAndWriterFunctions(hCurlHandle);
     curl_easy_cleanup(hCurlHandle);
     CPLFree(sWriteFuncData.pBuffer);
@@ -3193,7 +3246,9 @@ void VSICurlHandle::AdviseRead(int nRanges, const vsi_l_offset *panOffsets,
     ManagePlanetaryComputerSigning();
 
     bool bHasExpired = false;
-    const std::string l_osURL(GetRedirectURLIfValid(bHasExpired));
+    CPLStringList aosHTTPOptions(m_aosHTTPOptions);
+    const std::string l_osURL(
+        GetRedirectURLIfValid(bHasExpired, aosHTTPOptions));
     if (bHasExpired)
     {
         return;
@@ -3260,7 +3315,7 @@ void VSICurlHandle::AdviseRead(int nRanges, const vsi_l_offset *panOffsets,
              static_cast<unsigned>(m_aoAdviseReadRanges.size()));
 #endif
 
-    const auto task = [this](const std::string &osURL)
+    const auto task = [this, aosHTTPOptions](const std::string &osURL)
     {
         CURLM *hMultiHandle = curl_multi_init();
 
@@ -3308,7 +3363,7 @@ void VSICurlHandle::AdviseRead(int nRanges, const vsi_l_offset *panOffsets,
             // unchecked_curl_easy_setopt(hCurlHandle, CURLOPT_PIPEWAIT, 1);
 
             struct curl_slist *headers = VSICurlSetOptions(
-                hCurlHandle, osURL.c_str(), m_aosHTTPOptions.List());
+                hCurlHandle, osURL.c_str(), aosHTTPOptions.List());
 
             VSICURLInitWriteFuncStruct(&asWriteFuncData[i], this, pfnReadCbk,
                                        pReadCbkUserData);
@@ -4762,8 +4817,8 @@ static bool VSICurlParseFullFTPLine(char *pszLine, char *&pszFilename,
 /*                          GetURLFromFilename()                         */
 /************************************************************************/
 
-std::string
-VSICurlFilesystemHandlerBase::GetURLFromFilename(const std::string &osFilename)
+std::string VSICurlFilesystemHandlerBase::GetURLFromFilename(
+    const std::string &osFilename) const
 {
     return VSICurlGetURLFromFilename(osFilename.c_str(), nullptr, nullptr,
                                      nullptr, nullptr, nullptr, nullptr,
@@ -5815,7 +5870,7 @@ void NetworkStatisticsLogger::Stats::AsJSON(CPLJSONObject &oJSON) const
             if (!osName.empty() && osName[0] == '/')
                 osName = osName.substr(1);
             if (!osName.empty() && osName.back() == '/')
-                osName.resize(osName.size() - 1);
+                osName.pop_back();
             oJSON.Add(("handlers/" + osName).c_str(), childJSON);
         }
         else if (kv.first.eType == ContextPathType::FILE)
diff --git a/port/cpl_vsil_curl_class.h b/port/cpl_vsil_curl_class.h
index 6505dff5bc0d..4fb1e4ff9bce 100644
--- a/port/cpl_vsil_curl_class.h
+++ b/port/cpl_vsil_curl_class.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010-2018, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_VSIL_CURL_CLASS_H_INCLUDED
@@ -42,6 +26,7 @@
 #include "cpl_curl_priv.h"
 
 #include <algorithm>
+#include <atomic>
 #include <condition_variable>
 #include <set>
 #include <map>
@@ -115,7 +100,8 @@ struct WriteFuncStruct
     bool bMultiRange = false;
     vsi_l_offset nStartOffset = 0;
     vsi_l_offset nEndOffset = 0;
-    int nHTTPCode = 0;
+    int nHTTPCode = 0;       // potentially after redirect
+    int nFirstHTTPCode = 0;  // the one of the redirect
     vsi_l_offset nContentLength = 0;
     bool bFoundContentRange = false;
     bool bError = false;
@@ -333,7 +319,7 @@ class VSICurlFilesystemHandlerBase : public VSIFilesystemHandler
     void SetCachedDirList(const char *pszURL, CachedDirList &oCachedDirList);
     bool ExistsInCacheDirList(const std::string &osDirname, bool *pbIsDir);
 
-    virtual std::string GetURLFromFilename(const std::string &osFilename);
+    virtual std::string GetURLFromFilename(const std::string &osFilename) const;
 
     std::string
     GetStreamingFilename(const std::string &osFilename) const override = 0;
@@ -411,6 +397,8 @@ class VSICurlHandle : public VSIVirtualHandle
     bool m_bUseHead = false;
     bool m_bUseRedirectURLIfNoQueryStringParams = false;
 
+    mutable std::atomic<bool> m_bInterrupt = false;
+
     // Specific to Planetary Computer signing:
     // https://planetarycomputer.microsoft.com/docs/concepts/sas/
     mutable bool m_bPlanetaryComputerURLSigning = false;
@@ -420,7 +408,8 @@ class VSICurlHandle : public VSIVirtualHandle
     int ReadMultiRangeSingleGet(int nRanges, void **ppData,
                                 const vsi_l_offset *panOffsets,
                                 const size_t *panSizes);
-    std::string GetRedirectURLIfValid(bool &bHasExpired) const;
+    std::string GetRedirectURLIfValid(bool &bHasExpired,
+                                      CPLStringList &aosHTTPOptions) const;
 
     void UpdateRedirectInfo(CURL *hCurlHandle,
                             const WriteFuncStruct &sWriteFuncHeaderData);
@@ -497,6 +486,11 @@ class VSICurlHandle : public VSIVirtualHandle
     int Flush() override;
     int Close() override;
 
+    void Interrupt() override
+    {
+        m_bInterrupt = true;
+    }
+
     bool HasPRead() const override
     {
         return true;
@@ -627,14 +621,6 @@ class IVSIS3LikeFSHandler : public VSICurlFilesystemHandlerBaseWritable
                          GDALProgressFunc pProgressFunc,
                          void *pProgressData) override;
 
-    virtual int CopyFileRestartable(const char *pszSource,
-                                    const char *pszTarget,
-                                    const char *pszInputPayload,
-                                    char **ppszOutputPayload,
-                                    CSLConstList papszOptions,
-                                    GDALProgressFunc pProgressFunc,
-                                    void *pProgressData) override;
-
     virtual int DeleteObject(const char *pszFilename);
 
     virtual int *DeleteObjectBatch(CSLConstList papszFilesOrDirs);
@@ -645,40 +631,43 @@ class IVSIS3LikeFSHandler : public VSICurlFilesystemHandlerBaseWritable
 
     VSIDIR *OpenDir(const char *pszPath, int nRecurseDepth,
                     const char *const *papszOptions) override;
+};
 
-    // Multipart upload
-    virtual bool SupportsParallelMultipartUpload() const
+/************************************************************************/
+/*                 IVSIS3LikeFSHandlerWithMultipartUpload               */
+/************************************************************************/
+
+class IVSIS3LikeFSHandlerWithMultipartUpload : public IVSIS3LikeFSHandler
+{
+    CPL_DISALLOW_COPY_ASSIGN(IVSIS3LikeFSHandlerWithMultipartUpload)
+
+  protected:
+    IVSIS3LikeFSHandlerWithMultipartUpload() = default;
+
+  public:
+    virtual bool SupportsNonSequentialMultipartUpload() const
     {
-        return false;
+        return true;
     }
 
-    virtual std::string
-    InitiateMultipartUpload(const std::string &osFilename,
-                            IVSIS3LikeHandleHelper *poS3HandleHelper,
-                            const CPLHTTPRetryParameters &oRetryParameters,
-                            CSLConstList papszOptions);
-    virtual std::string
-    UploadPart(const std::string &osFilename, int nPartNumber,
-               const std::string &osUploadID, vsi_l_offset nPosition,
-               const void *pabyBuffer, size_t nBufferSize,
-               IVSIS3LikeHandleHelper *poS3HandleHelper,
-               const CPLHTTPRetryParameters &oRetryParameters,
-               CSLConstList papszOptions);
-    virtual bool CompleteMultipart(
-        const std::string &osFilename, const std::string &osUploadID,
-        const std::vector<std::string> &aosEtags, vsi_l_offset nTotalSize,
-        IVSIS3LikeHandleHelper *poS3HandleHelper,
-        const CPLHTTPRetryParameters &oRetryParameters);
-    virtual bool AbortMultipart(const std::string &osFilename,
-                                const std::string &osUploadID,
-                                IVSIS3LikeHandleHelper *poS3HandleHelper,
-                                const CPLHTTPRetryParameters &oRetryParameters);
+    virtual bool SupportsParallelMultipartUpload() const
+    {
+        return true;
+    }
 
-    bool AbortPendingUploads(const char *pszFilename) override;
+    virtual bool SupportsMultipartAbort() const = 0;
 
     size_t GetUploadChunkSizeInBytes(const char *pszFilename,
                                      const char *pszSpecifiedValInBytes);
 
+    virtual int CopyFileRestartable(const char *pszSource,
+                                    const char *pszTarget,
+                                    const char *pszInputPayload,
+                                    char **ppszOutputPayload,
+                                    CSLConstList papszOptions,
+                                    GDALProgressFunc pProgressFunc,
+                                    void *pProgressData) override;
+
     //! Maximum number of parts for multipart upload
     // Limit currently used by S3 and GS.
     // Cf https://docs.aws.amazon.com/AmazonS3/latest/userguide/qfacts.html
@@ -717,6 +706,58 @@ class IVSIS3LikeFSHandler : public VSICurlFilesystemHandlerBaseWritable
     {
         return 50;
     }
+
+    virtual std::string
+    InitiateMultipartUpload(const std::string &osFilename,
+                            IVSIS3LikeHandleHelper *poS3HandleHelper,
+                            const CPLHTTPRetryParameters &oRetryParameters,
+                            CSLConstList papszOptions);
+
+    virtual std::string
+    UploadPart(const std::string &osFilename, int nPartNumber,
+               const std::string &osUploadID, vsi_l_offset nPosition,
+               const void *pabyBuffer, size_t nBufferSize,
+               IVSIS3LikeHandleHelper *poS3HandleHelper,
+               const CPLHTTPRetryParameters &oRetryParameters,
+               CSLConstList papszOptions);
+
+    virtual bool CompleteMultipart(
+        const std::string &osFilename, const std::string &osUploadID,
+        const std::vector<std::string> &aosEtags, vsi_l_offset nTotalSize,
+        IVSIS3LikeHandleHelper *poS3HandleHelper,
+        const CPLHTTPRetryParameters &oRetryParameters);
+
+    virtual bool AbortMultipart(const std::string &osFilename,
+                                const std::string &osUploadID,
+                                IVSIS3LikeHandleHelper *poS3HandleHelper,
+                                const CPLHTTPRetryParameters &oRetryParameters);
+
+    bool AbortPendingUploads(const char *pszFilename) override;
+
+    bool MultipartUploadGetCapabilities(int *pbNonSequentialUploadSupported,
+                                        int *pbParallelUploadSupported,
+                                        int *pbAbortSupported,
+                                        size_t *pnMinPartSize,
+                                        size_t *pnMaxPartSize,
+                                        int *pnMaxPartCount) override;
+
+    char *MultipartUploadStart(const char *pszFilename,
+                               CSLConstList papszOptions) override;
+
+    char *MultipartUploadAddPart(const char *pszFilename,
+                                 const char *pszUploadId, int nPartNumber,
+                                 vsi_l_offset nFileOffset, const void *pData,
+                                 size_t nDataLength,
+                                 CSLConstList papszOptions) override;
+
+    bool MultipartUploadEnd(const char *pszFilename, const char *pszUploadId,
+                            size_t nPartIdsCount,
+                            const char *const *apszPartIds,
+                            vsi_l_offset nTotalSize,
+                            CSLConstList papszOptions) override;
+
+    bool MultipartUploadAbort(const char *pszFilename, const char *pszUploadId,
+                              CSLConstList papszOptions) override;
 };
 
 /************************************************************************/
@@ -759,17 +800,16 @@ class IVSIS3LikeHandle : public VSICurlHandle
 };
 
 /************************************************************************/
-/*                           VSIS3LikeWriteHandle                       */
+/*                       VSIMultipartWriteHandle                        */
 /************************************************************************/
 
-class VSIS3LikeWriteHandle final : public VSIVirtualHandle
+class VSIMultipartWriteHandle final : public VSIVirtualHandle
 {
-    CPL_DISALLOW_COPY_ASSIGN(VSIS3LikeWriteHandle)
+    CPL_DISALLOW_COPY_ASSIGN(VSIMultipartWriteHandle)
 
-    IVSIS3LikeFSHandler *m_poFS = nullptr;
+    IVSIS3LikeFSHandlerWithMultipartUpload *m_poFS = nullptr;
     std::string m_osFilename{};
     IVSIS3LikeHandleHelper *m_poS3HandleHelper = nullptr;
-    bool m_bUseChunkedTransfer = false;
     CPLStringList m_aosOptions{};
     CPLStringList m_aosHTTPOptions{};
     CPLHTTPRetryParameters m_oRetryParameters;
@@ -784,6 +824,70 @@ class VSIS3LikeWriteHandle final : public VSIVirtualHandle
     std::vector<std::string> m_aosEtags{};
     bool m_bError = false;
 
+    WriteFuncStruct m_sWriteFuncHeaderData{};
+
+    bool UploadPart();
+    bool DoSinglePartPUT();
+
+    void InvalidateParentDirectory();
+
+  public:
+    VSIMultipartWriteHandle(IVSIS3LikeFSHandlerWithMultipartUpload *poFS,
+                            const char *pszFilename,
+                            IVSIS3LikeHandleHelper *poS3HandleHelper,
+                            CSLConstList papszOptions);
+    ~VSIMultipartWriteHandle() override;
+
+    int Seek(vsi_l_offset nOffset, int nWhence) override;
+    vsi_l_offset Tell() override;
+    size_t Read(void *pBuffer, size_t nSize, size_t nMemb) override;
+    size_t Write(const void *pBuffer, size_t nSize, size_t nMemb) override;
+
+    void ClearErr() override
+    {
+    }
+
+    int Error() override
+    {
+        return FALSE;
+    }
+
+    int Eof() override
+    {
+        return FALSE;
+    }
+
+    int Close() override;
+
+    bool IsOK()
+    {
+        return m_pabyBuffer != nullptr;
+    }
+};
+
+/************************************************************************/
+/*                         VSIChunkedWriteHandle()                      */
+/************************************************************************/
+
+/** Class with Write() append-only implementation using
+ * "Transfer-Encoding: chunked" writing
+ */
+class VSIChunkedWriteHandle final : public VSIVirtualHandle
+{
+    CPL_DISALLOW_COPY_ASSIGN(VSIChunkedWriteHandle)
+
+    IVSIS3LikeFSHandler *m_poFS = nullptr;
+    std::string m_osFilename{};
+    IVSIS3LikeHandleHelper *m_poS3HandleHelper = nullptr;
+    CPLStringList m_aosOptions{};
+    CPLStringList m_aosHTTPOptions{};
+    CPLHTTPRetryParameters m_oRetryParameters;
+
+    vsi_l_offset m_nCurOffset = 0;
+    size_t m_nBufferOff = 0;
+    bool m_bError = false;
+    bool m_bClosed = false;
+
     CURLM *m_hCurlMulti = nullptr;
     CURL *m_hCurl = nullptr;
     const void *m_pBuffer = nullptr;
@@ -794,21 +898,19 @@ class VSIS3LikeWriteHandle final : public VSIVirtualHandle
 
     WriteFuncStruct m_sWriteFuncHeaderData{};
 
-    bool UploadPart();
-    bool DoSinglePartPUT();
-
     static size_t ReadCallBackBufferChunked(char *buffer, size_t size,
                                             size_t nitems, void *instream);
-    size_t WriteChunked(const void *pBuffer, size_t nSize, size_t nMemb);
     int FinishChunkedTransfer();
 
+    bool DoEmptyPUT();
+
     void InvalidateParentDirectory();
 
   public:
-    VSIS3LikeWriteHandle(IVSIS3LikeFSHandler *poFS, const char *pszFilename,
-                         IVSIS3LikeHandleHelper *poS3HandleHelper,
-                         bool bUseChunkedTransfer, CSLConstList papszOptions);
-    ~VSIS3LikeWriteHandle() override;
+    VSIChunkedWriteHandle(IVSIS3LikeFSHandler *poFS, const char *pszFilename,
+                          IVSIS3LikeHandleHelper *poS3HandleHelper,
+                          CSLConstList papszOptions);
+    virtual ~VSIChunkedWriteHandle();
 
     int Seek(vsi_l_offset nOffset, int nWhence) override;
     vsi_l_offset Tell() override;
@@ -830,18 +932,13 @@ class VSIS3LikeWriteHandle final : public VSIVirtualHandle
     }
 
     int Close() override;
-
-    bool IsOK()
-    {
-        return m_bUseChunkedTransfer || m_pabyBuffer != nullptr;
-    }
 };
 
 /************************************************************************/
 /*                        VSIAppendWriteHandle                          */
 /************************************************************************/
 
-class VSIAppendWriteHandle : public VSIVirtualHandle
+class VSIAppendWriteHandle CPL_NON_FINAL : public VSIVirtualHandle
 {
     CPL_DISALLOW_COPY_ASSIGN(VSIAppendWriteHandle)
 
@@ -1085,7 +1182,8 @@ void VSICURLInitWriteFuncStruct(cpl::WriteFuncStruct *psStruct, VSILFILE *fp,
                                 void *pReadCbkUserData);
 size_t VSICurlHandleWriteFunc(void *buffer, size_t count, size_t nmemb,
                               void *req);
-void VSICURLMultiPerform(CURLM *hCurlMultiHandle, CURL *hEasyHandle = nullptr);
+void VSICURLMultiPerform(CURLM *hCurlMultiHandle, CURL *hEasyHandle = nullptr,
+                         std::atomic<bool> *pbInterrupt = nullptr);
 void VSICURLResetHeaderAndWriterFunctions(CURL *hCurlHandle);
 
 int VSICurlParseUnixPermissions(const char *pszPermissions);
diff --git a/port/cpl_vsil_curl_priv.h b/port/cpl_vsil_curl_priv.h
index 46b145686c26..2c52b4c8b048 100644
--- a/port/cpl_vsil_curl_priv.h
+++ b/port/cpl_vsil_curl_priv.h
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_VSIL_CURL_PRIV_H_INCLUDED
diff --git a/port/cpl_vsil_curl_streaming.cpp b/port/cpl_vsil_curl_streaming.cpp
index 10a3824455d9..43dca9652323 100644
--- a/port/cpl_vsil_curl_streaming.cpp
+++ b/port/cpl_vsil_curl_streaming.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2012-2015, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -218,7 +202,13 @@ class VSICurlStreamingFSHandler : public VSIFilesystemHandler
   protected:
     CPLMutex *hMutex = nullptr;
 
-    virtual VSICurlStreamingHandle *CreateFileHandle(const char *pszURL);
+    virtual VSICurlStreamingHandle *CreateFileHandle(const char *pszFilename,
+                                                     const char *pszURL);
+
+    virtual std::string GetNonStreamingPrefix() const
+    {
+        return "/vsicurl/";
+    }
 
   public:
     VSICurlStreamingFSHandler();
@@ -230,11 +220,14 @@ class VSICurlStreamingFSHandler : public VSIFilesystemHandler
     virtual int Stat(const char *pszFilename, VSIStatBufL *pStatBuf,
                      int nFlags) override;
 
-    virtual CPLString GetFSPrefix()
+    virtual CPLString GetFSPrefix() const
     {
         return "/vsicurl_streaming/";
     }
 
+    std::string
+    GetNonStreamingFilename(const std::string &osFilename) const override;
+
     const char *GetActualURL(const char *pszFilename) override;
 
     const char *GetOptions() override
@@ -339,7 +332,8 @@ class VSICurlStreamingHandle : public VSIVirtualHandle
     void SetURL(const char *pszURL);
 
   public:
-    VSICurlStreamingHandle(VSICurlStreamingFSHandler *poFS, const char *pszURL);
+    VSICurlStreamingHandle(VSICurlStreamingFSHandler *poFS,
+                           const char *pszFilename, const char *pszURL);
     ~VSICurlStreamingHandle() override;
 
     int Seek(vsi_l_offset nOffset, int nWhence) override;
@@ -380,9 +374,9 @@ class VSICurlStreamingHandle : public VSIVirtualHandle
 /************************************************************************/
 
 VSICurlStreamingHandle::VSICurlStreamingHandle(VSICurlStreamingFSHandler *poFS,
+                                               const char *pszFilename,
                                                const char *pszURL)
-    : m_poFS(poFS), m_aosHTTPOptions(CPLHTTPGetOptionsFromEnv(
-                        (poFS->GetFSPrefix() + pszURL).c_str())),
+    : m_poFS(poFS), m_aosHTTPOptions(CPLHTTPGetOptionsFromEnv(pszFilename)),
       m_oRetryParameters(m_aosHTTPOptions), m_pszURL(CPLStrdup(pszURL))
 {
     FileProp cachedFileProp;
@@ -1595,9 +1589,10 @@ void VSICurlStreamingFSHandler::ReleaseMutex()
 /************************************************************************/
 
 VSICurlStreamingHandle *
-VSICurlStreamingFSHandler::CreateFileHandle(const char *pszURL)
+VSICurlStreamingFSHandler::CreateFileHandle(const char *pszFilename,
+                                            const char *pszURL)
 {
-    return new VSICurlStreamingHandle(this, pszURL);
+    return new VSICurlStreamingHandle(this, pszFilename, pszURL);
 }
 
 /************************************************************************/
@@ -1621,7 +1616,7 @@ VSIVirtualHandle *VSICurlStreamingFSHandler::Open(const char *pszFilename,
     }
 
     VSICurlStreamingHandle *poHandle =
-        CreateFileHandle(pszFilename + GetFSPrefix().size());
+        CreateFileHandle(pszFilename, pszFilename + GetFSPrefix().size());
     // If we didn't get a filelist, check that the file really exists.
     if (poHandle == nullptr || !poHandle->Exists(pszFilename, papszOptions))
     {
@@ -1687,7 +1682,7 @@ int VSICurlStreamingFSHandler::Stat(const char *pszFilename,
     memset(pStatBuf, 0, sizeof(VSIStatBufL));
 
     VSICurlStreamingHandle *poHandle =
-        CreateFileHandle(pszFilename + GetFSPrefix().size());
+        CreateFileHandle(pszFilename, pszFilename + GetFSPrefix().size());
     if (poHandle == nullptr)
     {
         return -1;
@@ -1715,12 +1710,25 @@ const char *VSICurlStreamingFSHandler::GetActualURL(const char *pszFilename)
     if (!STARTS_WITH_CI(pszFilename, GetFSPrefix()))
         return pszFilename;
     auto poHandle = std::unique_ptr<VSICurlStreamingHandle>(
-        CreateFileHandle(pszFilename + GetFSPrefix().size()));
+        CreateFileHandle(pszFilename, pszFilename + GetFSPrefix().size()));
     if (poHandle == nullptr)
         return pszFilename;
     return CPLSPrintf("%s", poHandle->GetURL());
 }
 
+/************************************************************************/
+/*                       GetNonStreamingFilename()                      */
+/************************************************************************/
+
+std::string VSICurlStreamingFSHandler::GetNonStreamingFilename(
+    const std::string &osFilename) const
+{
+    if (STARTS_WITH(osFilename.c_str(), GetFSPrefix().c_str()))
+        return GetNonStreamingPrefix() +
+               osFilename.substr(GetFSPrefix().size());
+    return osFilename;
+}
+
 /************************************************************************/
 /*                      IVSIS3LikeStreamingFSHandler                    */
 /************************************************************************/
@@ -1729,9 +1737,6 @@ class IVSIS3LikeStreamingFSHandler : public VSICurlStreamingFSHandler
 {
     CPL_DISALLOW_COPY_ASSIGN(IVSIS3LikeStreamingFSHandler)
 
-  protected:
-    virtual std::string GetNonStreamingPrefix() const = 0;
-
   public:
     IVSIS3LikeStreamingFSHandler() = default;
 
@@ -1762,7 +1767,7 @@ class VSIS3StreamingFSHandler final : public IVSIS3LikeStreamingFSHandler
     CPL_DISALLOW_COPY_ASSIGN(VSIS3StreamingFSHandler)
 
   protected:
-    CPLString GetFSPrefix() override
+    CPLString GetFSPrefix() const override
     {
         return "/vsis3_streaming/";
     }
@@ -1772,7 +1777,8 @@ class VSIS3StreamingFSHandler final : public IVSIS3LikeStreamingFSHandler
         return "/vsis3/";
     }
 
-    VSICurlStreamingHandle *CreateFileHandle(const char *pszURL) override;
+    VSICurlStreamingHandle *CreateFileHandle(const char *pszFilename,
+                                             const char *pszURL) override;
 
   public:
     VSIS3StreamingFSHandler() = default;
@@ -1815,6 +1821,7 @@ class VSIS3LikeStreamingHandle final : public VSICurlStreamingHandle
 
   public:
     VSIS3LikeStreamingHandle(IVSIS3LikeStreamingFSHandler *poFS,
+                             const char *pszFilename,
                              IVSIS3LikeHandleHelper *poS3HandleHelper);
     ~VSIS3LikeStreamingHandle() override;
 };
@@ -1824,13 +1831,15 @@ class VSIS3LikeStreamingHandle final : public VSICurlStreamingHandle
 /************************************************************************/
 
 VSICurlStreamingHandle *
-VSIS3StreamingFSHandler::CreateFileHandle(const char *pszURL)
+VSIS3StreamingFSHandler::CreateFileHandle(const char *pszFilename,
+                                          const char *pszURL)
 {
     VSIS3HandleHelper *poS3HandleHelper =
         VSIS3HandleHelper::BuildFromURI(pszURL, GetFSPrefix().c_str(), false);
     if (poS3HandleHelper)
     {
-        return new VSIS3LikeStreamingHandle(this, poS3HandleHelper);
+        return new VSIS3LikeStreamingHandle(this, pszFilename,
+                                            poS3HandleHelper);
     }
     return nullptr;
 }
@@ -1840,9 +1849,10 @@ VSIS3StreamingFSHandler::CreateFileHandle(const char *pszURL)
 /************************************************************************/
 
 VSIS3LikeStreamingHandle::VSIS3LikeStreamingHandle(
-    IVSIS3LikeStreamingFSHandler *poFS,
+    IVSIS3LikeStreamingFSHandler *poFS, const char *pszFilename,
     IVSIS3LikeHandleHelper *poS3HandleHelper)
-    : VSICurlStreamingHandle(poFS, poS3HandleHelper->GetURL().c_str()),
+    : VSICurlStreamingHandle(poFS, pszFilename,
+                             poS3HandleHelper->GetURL().c_str()),
       m_poS3HandleHelper(poS3HandleHelper)
 {
 }
@@ -1890,7 +1900,7 @@ bool VSIS3LikeStreamingHandle::CanRestartOnError(const char *pszErrorMsg,
 class VSIGSStreamingFSHandler final : public IVSIS3LikeStreamingFSHandler
 {
   protected:
-    CPLString GetFSPrefix() override
+    CPLString GetFSPrefix() const override
     {
         return "/vsigs_streaming/";
     }
@@ -1900,7 +1910,8 @@ class VSIGSStreamingFSHandler final : public IVSIS3LikeStreamingFSHandler
         return "/vsigs/";
     }
 
-    VSICurlStreamingHandle *CreateFileHandle(const char *pszURL) override;
+    VSICurlStreamingHandle *CreateFileHandle(const char *pszFilename,
+                                             const char *pszURL) override;
 
   public:
     VSIGSStreamingFSHandler()
@@ -1917,13 +1928,15 @@ class VSIGSStreamingFSHandler final : public IVSIS3LikeStreamingFSHandler
 /************************************************************************/
 
 VSICurlStreamingHandle *
-VSIGSStreamingFSHandler::CreateFileHandle(const char *pszURL)
+VSIGSStreamingFSHandler::CreateFileHandle(const char *pszFilename,
+                                          const char *pszURL)
 {
     VSIGSHandleHelper *poGCHandleHelper =
         VSIGSHandleHelper::BuildFromURI(pszURL, GetFSPrefix().c_str());
     if (poGCHandleHelper)
     {
-        return new VSIS3LikeStreamingHandle(this, poGCHandleHelper);
+        return new VSIS3LikeStreamingHandle(this, pszFilename,
+                                            poGCHandleHelper);
     }
     return nullptr;
 }
@@ -1935,7 +1948,7 @@ VSIGSStreamingFSHandler::CreateFileHandle(const char *pszURL)
 class VSIAzureStreamingFSHandler final : public IVSIS3LikeStreamingFSHandler
 {
   protected:
-    CPLString GetFSPrefix() override
+    CPLString GetFSPrefix() const override
     {
         return "/vsiaz_streaming/";
     }
@@ -1945,7 +1958,8 @@ class VSIAzureStreamingFSHandler final : public IVSIS3LikeStreamingFSHandler
         return "/vsiaz/";
     }
 
-    VSICurlStreamingHandle *CreateFileHandle(const char *pszURL) override;
+    VSICurlStreamingHandle *CreateFileHandle(const char *pszFilename,
+                                             const char *pszURL) override;
 
   public:
     VSIAzureStreamingFSHandler()
@@ -1962,13 +1976,14 @@ class VSIAzureStreamingFSHandler final : public IVSIS3LikeStreamingFSHandler
 /************************************************************************/
 
 VSICurlStreamingHandle *
-VSIAzureStreamingFSHandler::CreateFileHandle(const char *pszURL)
+VSIAzureStreamingFSHandler::CreateFileHandle(const char *pszFilename,
+                                             const char *pszURL)
 {
     VSIAzureBlobHandleHelper *poHandleHelper =
         VSIAzureBlobHandleHelper::BuildFromURI(pszURL, GetFSPrefix().c_str());
     if (poHandleHelper)
     {
-        return new VSIS3LikeStreamingHandle(this, poHandleHelper);
+        return new VSIS3LikeStreamingHandle(this, pszFilename, poHandleHelper);
     }
     return nullptr;
 }
@@ -1982,7 +1997,7 @@ class VSIOSSStreamingFSHandler final : public IVSIS3LikeStreamingFSHandler
     CPL_DISALLOW_COPY_ASSIGN(VSIOSSStreamingFSHandler)
 
   protected:
-    CPLString GetFSPrefix() override
+    CPLString GetFSPrefix() const override
     {
         return "/vsioss_streaming/";
     }
@@ -1992,7 +2007,8 @@ class VSIOSSStreamingFSHandler final : public IVSIS3LikeStreamingFSHandler
         return "/vsioss/";
     }
 
-    VSICurlStreamingHandle *CreateFileHandle(const char *pszURL) override;
+    VSICurlStreamingHandle *CreateFileHandle(const char *pszFilename,
+                                             const char *pszURL) override;
 
   public:
     VSIOSSStreamingFSHandler() = default;
@@ -2010,13 +2026,15 @@ class VSIOSSStreamingFSHandler final : public IVSIS3LikeStreamingFSHandler
 /************************************************************************/
 
 VSICurlStreamingHandle *
-VSIOSSStreamingFSHandler::CreateFileHandle(const char *pszURL)
+VSIOSSStreamingFSHandler::CreateFileHandle(const char *pszFilename,
+                                           const char *pszURL)
 {
     VSIOSSHandleHelper *poOSSHandleHelper =
         VSIOSSHandleHelper::BuildFromURI(pszURL, GetFSPrefix().c_str(), false);
     if (poOSSHandleHelper)
     {
-        return new VSIS3LikeStreamingHandle(this, poOSSHandleHelper);
+        return new VSIS3LikeStreamingHandle(this, pszFilename,
+                                            poOSSHandleHelper);
     }
     return nullptr;
 }
@@ -2028,7 +2046,7 @@ VSIOSSStreamingFSHandler::CreateFileHandle(const char *pszURL)
 class VSISwiftStreamingFSHandler final : public IVSIS3LikeStreamingFSHandler
 {
   protected:
-    CPLString GetFSPrefix() override
+    CPLString GetFSPrefix() const override
     {
         return "/vsiswift_streaming/";
     }
@@ -2038,7 +2056,8 @@ class VSISwiftStreamingFSHandler final : public IVSIS3LikeStreamingFSHandler
         return "/vsiswift/";
     }
 
-    VSICurlStreamingHandle *CreateFileHandle(const char *pszURL) override;
+    VSICurlStreamingHandle *CreateFileHandle(const char *pszFilename,
+                                             const char *pszURL) override;
 
   public:
     VSISwiftStreamingFSHandler()
@@ -2055,13 +2074,14 @@ class VSISwiftStreamingFSHandler final : public IVSIS3LikeStreamingFSHandler
 /************************************************************************/
 
 VSICurlStreamingHandle *
-VSISwiftStreamingFSHandler::CreateFileHandle(const char *pszURL)
+VSISwiftStreamingFSHandler::CreateFileHandle(const char *pszFilename,
+                                             const char *pszURL)
 {
     VSISwiftHandleHelper *poHandleHelper =
         VSISwiftHandleHelper::BuildFromURI(pszURL, GetFSPrefix().c_str());
     if (poHandleHelper)
     {
-        return new VSIS3LikeStreamingHandle(this, poHandleHelper);
+        return new VSIS3LikeStreamingHandle(this, pszFilename, poHandleHelper);
     }
     return nullptr;
 }
diff --git a/port/cpl_vsil_gs.cpp b/port/cpl_vsil_gs.cpp
index 7abd254d695d..712b6374c9c2 100644
--- a/port/cpl_vsil_gs.cpp
+++ b/port/cpl_vsil_gs.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010-2018, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -65,7 +49,7 @@ namespace cpl
 /*                         VSIGSFSHandler                               */
 /************************************************************************/
 
-class VSIGSFSHandler final : public IVSIS3LikeFSHandler
+class VSIGSFSHandler final : public IVSIS3LikeFSHandlerWithMultipartUpload
 {
     CPL_DISALLOW_COPY_ASSIGN(VSIGSFSHandler)
     const std::string m_osPrefix;
@@ -83,7 +67,8 @@ class VSIGSFSHandler final : public IVSIS3LikeFSHandler
         return m_osPrefix;
     }
 
-    std::string GetURLFromFilename(const std::string &osFilename) override;
+    std::string
+    GetURLFromFilename(const std::string &osFilename) const override;
 
     IVSIS3LikeHandleHelper *CreateHandleHelper(const char *pszURI,
                                                bool bAllowNoObject) override;
@@ -111,12 +96,6 @@ class VSIGSFSHandler final : public IVSIS3LikeFSHandler
     char *GetSignedURL(const char *pszFilename,
                        CSLConstList papszOptions) override;
 
-    // Multipart upload
-    bool SupportsParallelMultipartUpload() const override
-    {
-        return true;
-    }
-
     char **GetFileMetadata(const char *pszFilename, const char *pszDomain,
                            CSLConstList papszOptions) override;
 
@@ -134,6 +113,11 @@ class VSIGSFSHandler final : public IVSIS3LikeFSHandler
     {
         return new VSIGSFSHandler(pszPrefix);
     }
+
+    bool SupportsMultipartAbort() const override
+    {
+        return true;
+    }
 };
 
 /************************************************************************/
@@ -164,7 +148,6 @@ class VSIGSHandle final : public IVSIS3LikeHandle
 VSIGSFSHandler::~VSIGSFSHandler()
 {
     VSICurlFilesystemHandlerBase::ClearCache();
-    VSIGSHandleHelper::CleanMutex();
 }
 
 /************************************************************************/
@@ -293,17 +276,17 @@ char *VSIGSFSHandler::GetSignedURL(const char *pszFilename,
 /*                          GetURLFromFilename()                         */
 /************************************************************************/
 
-std::string VSIGSFSHandler::GetURLFromFilename(const std::string &osFilename)
+std::string
+VSIGSFSHandler::GetURLFromFilename(const std::string &osFilename) const
 {
-    std::string osFilenameWithoutPrefix =
+    const std::string osFilenameWithoutPrefix =
         osFilename.substr(GetFSPrefix().size());
-    VSIGSHandleHelper *poHandleHelper = VSIGSHandleHelper::BuildFromURI(
-        osFilenameWithoutPrefix.c_str(), GetFSPrefix().c_str());
+    auto poHandleHelper =
+        std::unique_ptr<VSIGSHandleHelper>(VSIGSHandleHelper::BuildFromURI(
+            osFilenameWithoutPrefix.c_str(), GetFSPrefix().c_str()));
     if (poHandleHelper == nullptr)
         return std::string();
-    std::string osURL(poHandleHelper->GetURL());
-    delete poHandleHelper;
-    return osURL;
+    return poHandleHelper->GetURL();
 }
 
 /************************************************************************/
@@ -328,8 +311,8 @@ VSIGSFSHandler::CreateWriteHandle(const char *pszFilename,
         CreateHandleHelper(pszFilename + GetFSPrefix().size(), false);
     if (poHandleHelper == nullptr)
         return nullptr;
-    auto poHandle = std::make_unique<VSIS3LikeWriteHandle>(
-        this, pszFilename, poHandleHelper, false, papszOptions);
+    auto poHandle = std::make_unique<VSIMultipartWriteHandle>(
+        this, pszFilename, poHandleHelper, papszOptions);
     if (!poHandle->IsOK())
     {
         return nullptr;
diff --git a/port/cpl_vsil_gzip.cpp b/port/cpl_vsil_gzip.cpp
index 0c1ad3570ae5..fbcedd09bf05 100644
--- a/port/cpl_vsil_gzip.cpp
+++ b/port/cpl_vsil_gzip.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 //! @cond Doxygen_Suppress
@@ -139,6 +123,11 @@ constexpr int gz_magic[2] = {0x1f, 0x8b};  // gzip magic header
     CPLError(CE_Failure, CPLE_AppDefined, "In file %s, at line %d, return %d", \
              __FILE__, __LINE__, ret)
 
+// To avoid aliasing to CopyFile to CopyFileA on Windows
+#ifdef CopyFile
+#undef CopyFile
+#endif
+
 // #define ENABLE_DEBUG 1
 
 /************************************************************************/
@@ -955,10 +944,12 @@ bool VSIGZipHandle::gzseek(vsi_l_offset offset, int whence)
     {
         m_uncompressed_size = out;
 
-        if (m_pszBaseFileName &&
-            !STARTS_WITH_CI(m_pszBaseFileName, "/vsicurl/") &&
-            m_bWriteProperties)
+        if (m_pszBaseFileName && !STARTS_WITH(m_pszBaseFileName, "/vsicurl/") &&
+            !STARTS_WITH(m_pszBaseFileName, "/vsitar/") &&
+            !STARTS_WITH(m_pszBaseFileName, "/vsizip/") && m_bWriteProperties)
         {
+            CPLErrorStateBackuper oErrorStateBackuper(CPLQuietErrorHandler);
+
             CPLString osCacheFilename(m_pszBaseFileName);
             osCacheFilename += ".properties";
 
diff --git a/port/cpl_vsil_hdfs.cpp b/port/cpl_vsil_hdfs.cpp
index 65c694c32a22..7aa67bd56088 100644
--- a/port/cpl_vsil_hdfs.cpp
+++ b/port/cpl_vsil_hdfs.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2010-2015, Even Rouault <even dot rouault at spatialys.com>
  * Copyright (c) 2018, Azavea
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 //! @cond Doxygen_Suppress
@@ -104,7 +88,9 @@ class VSIHdfsHandle final : public VSIVirtualHandle
     size_t Read(void *pBuffer, size_t nSize, size_t nMemb) override;
     size_t Write(const void *pBuffer, size_t nSize, size_t nMemb) override;
     vsi_l_offset Length();
+    void ClearErr() override;
     int Eof() override;
+    int Error() override;
     int Flush() override;
     int Close() override;
 };
@@ -208,6 +194,15 @@ int VSIHdfsHandle::Eof()
     return bEOF;
 }
 
+int VSIHdfsHandle::Error()
+{
+    return 0;
+}
+
+void VSIHdfsHandle::ClearErr()
+{
+}
+
 int VSIHdfsHandle::Flush()
 {
     return hdfsFlush(poFilesystem, poFile);
diff --git a/port/cpl_vsil_libarchive.cpp b/port/cpl_vsil_libarchive.cpp
index dadf5268a0ea..a67e59d5bdca 100644
--- a/port/cpl_vsil_libarchive.cpp
+++ b/port/cpl_vsil_libarchive.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -188,7 +172,9 @@ static struct archive *VSICreateArchiveHandle(const std::string &osFSPrefix)
     else
     {
         archive_read_support_format_rar(pArchive);
+#ifdef ARCHIVE_FORMAT_RAR_V5
         archive_read_support_format_rar5(pArchive);
+#endif
     }
 
     return pArchive;
diff --git a/port/cpl_vsil_oss.cpp b/port/cpl_vsil_oss.cpp
index a9797d384fb4..84dcb78da941 100644
--- a/port/cpl_vsil_oss.cpp
+++ b/port/cpl_vsil_oss.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2017-2018, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -62,13 +46,14 @@ namespace cpl
 /*                         VSIOSSFSHandler                              */
 /************************************************************************/
 
-class VSIOSSFSHandler final : public IVSIS3LikeFSHandler
+class VSIOSSFSHandler final : public IVSIS3LikeFSHandlerWithMultipartUpload
 {
     CPL_DISALLOW_COPY_ASSIGN(VSIOSSFSHandler)
 
   protected:
     VSICurlHandle *CreateFileHandle(const char *pszFilename) override;
-    std::string GetURLFromFilename(const std::string &osFilename) override;
+    std::string
+    GetURLFromFilename(const std::string &osFilename) const override;
 
     const char *GetDebugKey() const override
     {
@@ -103,6 +88,11 @@ class VSIOSSFSHandler final : public IVSIS3LikeFSHandler
     {
         return osFilename;
     }
+
+    bool SupportsMultipartAbort() const override
+    {
+        return true;
+    }
 };
 
 /************************************************************************/
@@ -148,8 +138,8 @@ VSIOSSFSHandler::CreateWriteHandle(const char *pszFilename,
         CreateHandleHelper(pszFilename + GetFSPrefix().size(), false);
     if (poHandleHelper == nullptr)
         return nullptr;
-    auto poHandle = std::make_unique<VSIS3LikeWriteHandle>(
-        this, pszFilename, poHandleHelper, false, papszOptions);
+    auto poHandle = std::make_unique<VSIMultipartWriteHandle>(
+        this, pszFilename, poHandleHelper, papszOptions);
     if (!poHandle->IsOK())
     {
         return nullptr;
@@ -230,26 +220,26 @@ VSICurlHandle *VSIOSSFSHandler::CreateFileHandle(const char *pszFilename)
 }
 
 /************************************************************************/
-/*                          GetURLFromFilename()                         */
+/*                          GetURLFromFilename()                        */
 /************************************************************************/
 
-std::string VSIOSSFSHandler::GetURLFromFilename(const std::string &osFilename)
+std::string
+VSIOSSFSHandler::GetURLFromFilename(const std::string &osFilename) const
 {
-    std::string osFilenameWithoutPrefix =
+    const std::string osFilenameWithoutPrefix =
         osFilename.substr(GetFSPrefix().size());
 
-    VSIOSSHandleHelper *poHandleHelper = VSIOSSHandleHelper::BuildFromURI(
-        osFilenameWithoutPrefix.c_str(), GetFSPrefix().c_str(), true);
-    if (poHandleHelper == nullptr)
+    auto poHandleHelper =
+        std::unique_ptr<VSIOSSHandleHelper>(VSIOSSHandleHelper::BuildFromURI(
+            osFilenameWithoutPrefix.c_str(), GetFSPrefix().c_str(), true));
+    if (!poHandleHelper)
     {
-        return "";
+        return std::string();
     }
 
     std::string osBaseURL(poHandleHelper->GetURL());
     if (!osBaseURL.empty() && osBaseURL.back() == '/')
-        osBaseURL.resize(osBaseURL.size() - 1);
-    delete poHandleHelper;
-
+        osBaseURL.pop_back();
     return osBaseURL;
 }
 
diff --git a/port/cpl_vsil_plugin.cpp b/port/cpl_vsil_plugin.cpp
index 774e87a611d9..410393e263b1 100644
--- a/port/cpl_vsil_plugin.cpp
+++ b/port/cpl_vsil_plugin.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2019, Thomas Bonfort <thomas.bonfort@airbus.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/port/cpl_vsil_plugin.h b/port/cpl_vsil_plugin.h
index dd9c0ca7dd25..b71c25bbc84f 100644
--- a/port/cpl_vsil_plugin.h
+++ b/port/cpl_vsil_plugin.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2019, Thomas Bonfort <thomas.bonfort@airbus.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_VSIL_PLUGIN_H_INCLUDED
diff --git a/port/cpl_vsil_s3.cpp b/port/cpl_vsil_s3.cpp
index 1062b0318cf2..ef3b9b2d3529 100644
--- a/port/cpl_vsil_s3.cpp
+++ b/port/cpl_vsil_s3.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010-2018, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_atomic_ops.h"
@@ -167,7 +151,7 @@ void VSIDIRWithMissingDirSynthesis::SynthetizeMissingDirectories(
         }
 
         while (depth <= m_aosSubpathsStack.size())
-            m_aosSubpathsStack.resize(m_aosSubpathsStack.size() - 1);
+            m_aosSubpathsStack.pop_back();
 
         if (!m_aosSubpathsStack.empty() &&
             osCurSubdir.compare(0, nLastSlashPos, m_aosSubpathsStack.back()) !=
@@ -258,7 +242,7 @@ bool VSIDIRS3::AnalyseS3FileList(
                 {
                     std::string osKey = pszKey;
                     if (!osKey.empty() && osKey.back() == '/')
-                        osKey.resize(osKey.size() - 1);
+                        osKey.pop_back();
                     if (osKey.size() > osPrefix.size())
                     {
                         ret = true;
@@ -391,7 +375,7 @@ bool VSIDIRS3::AnalyseS3FileList(
                 {
                     std::string osKey = pszKey;
                     if (!osKey.empty() && osKey.back() == '/')
-                        osKey.resize(osKey.size() - 1);
+                        osKey.pop_back();
                     if (osKey.size() > osPrefix.size())
                     {
                         aoEntries.push_back(
@@ -635,7 +619,7 @@ bool VSICurlFilesystemHandlerBase::AnalyseS3FileList(
 /*                         VSIS3FSHandler                               */
 /************************************************************************/
 
-class VSIS3FSHandler final : public IVSIS3LikeFSHandler
+class VSIS3FSHandler final : public IVSIS3LikeFSHandlerWithMultipartUpload
 {
     CPL_DISALLOW_COPY_ASSIGN(VSIS3FSHandler)
 
@@ -645,7 +629,8 @@ class VSIS3FSHandler final : public IVSIS3LikeFSHandler
 
   protected:
     VSICurlHandle *CreateFileHandle(const char *pszFilename) override;
-    std::string GetURLFromFilename(const std::string &osFilename) override;
+    std::string
+    GetURLFromFilename(const std::string &osFilename) const override;
 
     const char *GetDebugKey() const override
     {
@@ -699,11 +684,6 @@ class VSIS3FSHandler final : public IVSIS3LikeFSHandler
                          const char *pszDomain,
                          CSLConstList papszOptions) override;
 
-    bool SupportsParallelMultipartUpload() const override
-    {
-        return true;
-    }
-
     std::string
     GetStreamingFilename(const std::string &osFilename) const override;
 
@@ -711,6 +691,11 @@ class VSIS3FSHandler final : public IVSIS3LikeFSHandler
     {
         return new VSIS3FSHandler(pszPrefix);
     }
+
+    bool SupportsMultipartAbort() const override
+    {
+        return true;
+    }
 };
 
 /************************************************************************/
@@ -741,43 +726,36 @@ class VSIS3Handle final : public IVSIS3LikeHandle
 };
 
 /************************************************************************/
-/*                         VSIS3LikeWriteHandle()                       */
+/*                      VSIMultipartWriteHandle()                       */
 /************************************************************************/
 
-VSIS3LikeWriteHandle::VSIS3LikeWriteHandle(
-    IVSIS3LikeFSHandler *poFS, const char *pszFilename,
-    IVSIS3LikeHandleHelper *poS3HandleHelper, bool bUseChunked,
-    CSLConstList papszOptions)
+VSIMultipartWriteHandle::VSIMultipartWriteHandle(
+    IVSIS3LikeFSHandlerWithMultipartUpload *poFS, const char *pszFilename,
+    IVSIS3LikeHandleHelper *poS3HandleHelper, CSLConstList papszOptions)
     : m_poFS(poFS), m_osFilename(pszFilename),
-      m_poS3HandleHelper(poS3HandleHelper), m_bUseChunkedTransfer(bUseChunked),
-      m_aosOptions(papszOptions),
+      m_poS3HandleHelper(poS3HandleHelper), m_aosOptions(papszOptions),
       m_aosHTTPOptions(CPLHTTPGetOptionsFromEnv(pszFilename)),
       m_oRetryParameters(m_aosHTTPOptions)
 {
-    // AWS S3, OSS and GCS can use the mulipart upload mechanism, which has
+    // AWS S3, OSS and GCS can use the multipart upload mechanism, which has
     // the advantage of being retryable in case of errors.
     // Swift only supports the "Transfer-Encoding: chunked" PUT mechanism.
     // So two different implementations.
 
-    if (!m_bUseChunkedTransfer)
-    {
-        const char *pszChunkSize = m_aosOptions.FetchNameValue("CHUNK_SIZE");
-        if (pszChunkSize)
-            m_nBufferSize = poFS->GetUploadChunkSizeInBytes(
-                pszFilename,
-                CPLSPrintf(CPL_FRMT_GIB,
-                           CPLAtoGIntBig(pszChunkSize) * MIB_CONSTANT));
-        else
-            m_nBufferSize =
-                poFS->GetUploadChunkSizeInBytes(pszFilename, nullptr);
+    const char *pszChunkSize = m_aosOptions.FetchNameValue("CHUNK_SIZE");
+    if (pszChunkSize)
+        m_nBufferSize = poFS->GetUploadChunkSizeInBytes(
+            pszFilename, CPLSPrintf(CPL_FRMT_GIB, CPLAtoGIntBig(pszChunkSize) *
+                                                      MIB_CONSTANT));
+    else
+        m_nBufferSize = poFS->GetUploadChunkSizeInBytes(pszFilename, nullptr);
 
-        m_pabyBuffer = static_cast<GByte *>(VSIMalloc(m_nBufferSize));
-        if (m_pabyBuffer == nullptr)
-        {
-            CPLError(CE_Failure, CPLE_AppDefined,
-                     "Cannot allocate working buffer for %s",
-                     m_poFS->GetFSPrefix().c_str());
-        }
+    m_pabyBuffer = static_cast<GByte *>(VSIMalloc(m_nBufferSize));
+    if (m_pabyBuffer == nullptr)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Cannot allocate working buffer for %s",
+                 m_poFS->GetFSPrefix().c_str());
     }
 }
 
@@ -785,7 +763,7 @@ VSIS3LikeWriteHandle::VSIS3LikeWriteHandle(
 /*                      GetUploadChunkSizeInBytes()                     */
 /************************************************************************/
 
-size_t IVSIS3LikeFSHandler::GetUploadChunkSizeInBytes(
+size_t IVSIS3LikeFSHandlerWithMultipartUpload::GetUploadChunkSizeInBytes(
     const char *pszFilename, const char *pszSpecifiedValInBytes)
 {
     size_t nChunkSize = 0;
@@ -846,23 +824,14 @@ size_t IVSIS3LikeFSHandler::GetUploadChunkSizeInBytes(
 }
 
 /************************************************************************/
-/*                        ~VSIS3LikeWriteHandle()                           */
+/*                     ~VSIMultipartWriteHandle()                       */
 /************************************************************************/
 
-VSIS3LikeWriteHandle::~VSIS3LikeWriteHandle()
+VSIMultipartWriteHandle::~VSIMultipartWriteHandle()
 {
-    VSIS3LikeWriteHandle::Close();
+    VSIMultipartWriteHandle::Close();
     delete m_poS3HandleHelper;
     CPLFree(m_pabyBuffer);
-    if (m_hCurlMulti)
-    {
-        if (m_hCurl)
-        {
-            curl_multi_remove_handle(m_hCurlMulti, m_hCurl);
-            curl_easy_cleanup(m_hCurl);
-        }
-        VSICURLMultiCleanup(m_hCurlMulti);
-    }
     CPLFree(m_sWriteFuncHeaderData.pBuffer);
 }
 
@@ -870,7 +839,7 @@ VSIS3LikeWriteHandle::~VSIS3LikeWriteHandle()
 /*                               Seek()                                 */
 /************************************************************************/
 
-int VSIS3LikeWriteHandle::Seek(vsi_l_offset nOffset, int nWhence)
+int VSIMultipartWriteHandle::Seek(vsi_l_offset nOffset, int nWhence)
 {
     if (!((nWhence == SEEK_SET && nOffset == m_nCurOffset) ||
           (nWhence == SEEK_CUR && nOffset == 0) ||
@@ -889,7 +858,7 @@ int VSIS3LikeWriteHandle::Seek(vsi_l_offset nOffset, int nWhence)
 /*                               Tell()                                 */
 /************************************************************************/
 
-vsi_l_offset VSIS3LikeWriteHandle::Tell()
+vsi_l_offset VSIMultipartWriteHandle::Tell()
 {
     return m_nCurOffset;
 }
@@ -898,8 +867,8 @@ vsi_l_offset VSIS3LikeWriteHandle::Tell()
 /*                               Read()                                 */
 /************************************************************************/
 
-size_t VSIS3LikeWriteHandle::Read(void * /* pBuffer */, size_t /* nSize */,
-                                  size_t /* nMemb */)
+size_t VSIMultipartWriteHandle::Read(void * /* pBuffer */, size_t /* nSize */,
+                                     size_t /* nMemb */)
 {
     CPLError(CE_Failure, CPLE_NotSupported,
              "Read not supported on writable %s files",
@@ -912,7 +881,7 @@ size_t VSIS3LikeWriteHandle::Read(void * /* pBuffer */, size_t /* nSize */,
 /*                        InitiateMultipartUpload()                     */
 /************************************************************************/
 
-std::string IVSIS3LikeFSHandler::InitiateMultipartUpload(
+std::string IVSIS3LikeFSHandlerWithMultipartUpload::InitiateMultipartUpload(
     const std::string &osFilename, IVSIS3LikeHandleHelper *poS3HandleHelper,
     const CPLHTTPRetryParameters &oRetryParameters, CSLConstList papszOptions)
 {
@@ -1017,7 +986,7 @@ std::string IVSIS3LikeFSHandler::InitiateMultipartUpload(
 /*                           UploadPart()                               */
 /************************************************************************/
 
-bool VSIS3LikeWriteHandle::UploadPart()
+bool VSIMultipartWriteHandle::UploadPart()
 {
     ++m_nPartNumber;
     if (m_nPartNumber > m_poFS->GetMaximumPartCount())
@@ -1045,14 +1014,13 @@ bool VSIS3LikeWriteHandle::UploadPart()
     return !osEtag.empty();
 }
 
-std::string
-IVSIS3LikeFSHandler::UploadPart(const std::string &osFilename, int nPartNumber,
-                                const std::string &osUploadID,
-                                vsi_l_offset /* nPosition */,
-                                const void *pabyBuffer, size_t nBufferSize,
-                                IVSIS3LikeHandleHelper *poS3HandleHelper,
-                                const CPLHTTPRetryParameters &oRetryParameters,
-                                CSLConstList /* papszOptions */)
+std::string IVSIS3LikeFSHandlerWithMultipartUpload::UploadPart(
+    const std::string &osFilename, int nPartNumber,
+    const std::string &osUploadID, vsi_l_offset /* nPosition */,
+    const void *pabyBuffer, size_t nBufferSize,
+    IVSIS3LikeHandleHelper *poS3HandleHelper,
+    const CPLHTTPRetryParameters &oRetryParameters,
+    CSLConstList /* papszOptions */)
 {
     NetworkStatisticsFileSystem oContextFS(GetFSPrefix().c_str());
     NetworkStatisticsFile oContextFile(osFilename.c_str());
@@ -1161,292 +1129,12 @@ IVSIS3LikeFSHandler::UploadPart(const std::string &osFilename, int nPartNumber,
     return osEtag;
 }
 
-/************************************************************************/
-/*                      ReadCallBackBufferChunked()                     */
-/************************************************************************/
-
-size_t VSIS3LikeWriteHandle::ReadCallBackBufferChunked(char *buffer,
-                                                       size_t size,
-                                                       size_t nitems,
-                                                       void *instream)
-{
-    VSIS3LikeWriteHandle *poThis =
-        static_cast<VSIS3LikeWriteHandle *>(instream);
-    if (poThis->m_nChunkedBufferSize == 0)
-    {
-        // CPLDebug("VSIS3LikeWriteHandle", "Writing 0 byte (finish)");
-        return 0;
-    }
-    const size_t nSizeMax = size * nitems;
-    size_t nSizeToWrite = nSizeMax;
-    size_t nChunkedBufferRemainingSize =
-        poThis->m_nChunkedBufferSize - poThis->m_nChunkedBufferOff;
-    if (nChunkedBufferRemainingSize < nSizeToWrite)
-        nSizeToWrite = nChunkedBufferRemainingSize;
-    memcpy(buffer,
-           static_cast<const GByte *>(poThis->m_pBuffer) +
-               poThis->m_nChunkedBufferOff,
-           nSizeToWrite);
-    poThis->m_nChunkedBufferOff += nSizeToWrite;
-    // CPLDebug("VSIS3LikeWriteHandle", "Writing %d bytes", nSizeToWrite);
-    return nSizeToWrite;
-}
-
-/************************************************************************/
-/*                          WriteChunked()                              */
-/************************************************************************/
-
-size_t VSIS3LikeWriteHandle::WriteChunked(const void *pBuffer, size_t nSize,
-                                          size_t nMemb)
-{
-    const size_t nBytesToWrite = nSize * nMemb;
-
-    if (m_hCurlMulti == nullptr)
-    {
-        m_hCurlMulti = curl_multi_init();
-    }
-
-    WriteFuncStruct sWriteFuncData;
-    CPLHTTPRetryContext oRetryContext(m_oRetryParameters);
-    // We can only easily retry at the first chunk of a transfer
-    bool bCanRetry = (m_hCurl == nullptr);
-    bool bRetry;
-    do
-    {
-        bRetry = false;
-        struct curl_slist *headers = nullptr;
-        if (m_hCurl == nullptr)
-        {
-            CURL *hCurlHandle = curl_easy_init();
-            unchecked_curl_easy_setopt(hCurlHandle, CURLOPT_UPLOAD, 1L);
-            unchecked_curl_easy_setopt(hCurlHandle, CURLOPT_READFUNCTION,
-                                       ReadCallBackBufferChunked);
-            unchecked_curl_easy_setopt(hCurlHandle, CURLOPT_READDATA, this);
-
-            VSICURLInitWriteFuncStruct(&sWriteFuncData, nullptr, nullptr,
-                                       nullptr);
-            unchecked_curl_easy_setopt(hCurlHandle, CURLOPT_WRITEDATA,
-                                       &sWriteFuncData);
-            unchecked_curl_easy_setopt(hCurlHandle, CURLOPT_WRITEFUNCTION,
-                                       VSICurlHandleWriteFunc);
-
-            VSICURLInitWriteFuncStruct(&m_sWriteFuncHeaderData, nullptr,
-                                       nullptr, nullptr);
-            unchecked_curl_easy_setopt(hCurlHandle, CURLOPT_HEADERDATA,
-                                       &m_sWriteFuncHeaderData);
-            unchecked_curl_easy_setopt(hCurlHandle, CURLOPT_HEADERFUNCTION,
-                                       VSICurlHandleWriteFunc);
-
-            headers = static_cast<struct curl_slist *>(CPLHTTPSetOptions(
-                hCurlHandle, m_poS3HandleHelper->GetURL().c_str(),
-                m_aosHTTPOptions.List()));
-            headers = VSICurlSetCreationHeadersFromOptions(
-                headers, m_aosOptions.List(), m_osFilename.c_str());
-            headers = VSICurlMergeHeaders(
-                headers, m_poS3HandleHelper->GetCurlHeaders("PUT", headers));
-            unchecked_curl_easy_setopt(hCurlHandle, CURLOPT_HTTPHEADER,
-                                       headers);
-
-            m_osCurlErrBuf.resize(CURL_ERROR_SIZE + 1);
-            unchecked_curl_easy_setopt(hCurlHandle, CURLOPT_ERRORBUFFER,
-                                       &m_osCurlErrBuf[0]);
-
-            curl_multi_add_handle(m_hCurlMulti, hCurlHandle);
-            m_hCurl = hCurlHandle;
-        }
-
-        m_pBuffer = pBuffer;
-        m_nChunkedBufferOff = 0;
-        m_nChunkedBufferSize = nBytesToWrite;
-
-        int repeats = 0;
-        while (m_nChunkedBufferOff < m_nChunkedBufferSize && !bRetry)
-        {
-            int still_running;
-
-            memset(&m_osCurlErrBuf[0], 0, m_osCurlErrBuf.size());
-
-            while (curl_multi_perform(m_hCurlMulti, &still_running) ==
-                       CURLM_CALL_MULTI_PERFORM &&
-                   // cppcheck-suppress knownConditionTrueFalse
-                   m_nChunkedBufferOff < m_nChunkedBufferSize)
-            {
-                // loop
-            }
-            // cppcheck-suppress knownConditionTrueFalse
-            if (!still_running || m_nChunkedBufferOff == m_nChunkedBufferSize)
-                break;
-
-            CURLMsg *msg;
-            do
-            {
-                int msgq = 0;
-                msg = curl_multi_info_read(m_hCurlMulti, &msgq);
-                if (msg && (msg->msg == CURLMSG_DONE))
-                {
-                    CURL *e = msg->easy_handle;
-                    if (e == m_hCurl)
-                    {
-                        long response_code;
-                        curl_easy_getinfo(m_hCurl, CURLINFO_RESPONSE_CODE,
-                                          &response_code);
-                        if (response_code != 200 && response_code != 201)
-                        {
-                            // Look if we should attempt a retry
-                            if (bCanRetry &&
-                                oRetryContext.CanRetry(
-                                    static_cast<int>(response_code),
-                                    m_sWriteFuncHeaderData.pBuffer,
-                                    m_osCurlErrBuf.c_str()))
-                            {
-                                CPLError(CE_Warning, CPLE_AppDefined,
-                                         "HTTP error code: %d - %s. "
-                                         "Retrying again in %.1f secs",
-                                         static_cast<int>(response_code),
-                                         m_poS3HandleHelper->GetURL().c_str(),
-                                         oRetryContext.GetCurrentDelay());
-                                CPLSleep(oRetryContext.GetCurrentDelay());
-                                bRetry = true;
-                            }
-                            else if (sWriteFuncData.pBuffer != nullptr &&
-                                     m_poS3HandleHelper->CanRestartOnError(
-                                         sWriteFuncData.pBuffer,
-                                         m_sWriteFuncHeaderData.pBuffer, false))
-                            {
-                                bRetry = true;
-                            }
-                            else
-                            {
-                                CPLError(CE_Failure, CPLE_AppDefined,
-                                         "Error %d: %s",
-                                         static_cast<int>(response_code),
-                                         m_osCurlErrBuf.c_str());
-
-                                curl_slist_free_all(headers);
-                                bRetry = false;
-                            }
-
-                            curl_multi_remove_handle(m_hCurlMulti, m_hCurl);
-                            curl_easy_cleanup(m_hCurl);
-
-                            CPLFree(sWriteFuncData.pBuffer);
-                            CPLFree(m_sWriteFuncHeaderData.pBuffer);
-
-                            m_hCurl = nullptr;
-                            sWriteFuncData.pBuffer = nullptr;
-                            m_sWriteFuncHeaderData.pBuffer = nullptr;
-                            if (!bRetry)
-                                return 0;
-                        }
-                    }
-                }
-            } while (msg);
-
-            CPLMultiPerformWait(m_hCurlMulti, repeats);
-        }
-
-        m_nWrittenInPUT += nBytesToWrite;
-
-        curl_slist_free_all(headers);
-
-        m_pBuffer = nullptr;
-
-        if (!bRetry)
-        {
-            long response_code;
-            curl_easy_getinfo(m_hCurl, CURLINFO_RESPONSE_CODE, &response_code);
-            if (response_code != 100)
-            {
-                // Look if we should attempt a retry
-                if (bCanRetry &&
-                    oRetryContext.CanRetry(static_cast<int>(response_code),
-                                           m_sWriteFuncHeaderData.pBuffer,
-                                           m_osCurlErrBuf.c_str()))
-                {
-                    CPLError(CE_Warning, CPLE_AppDefined,
-                             "HTTP error code: %d - %s. "
-                             "Retrying again in %.1f secs",
-                             static_cast<int>(response_code),
-                             m_poS3HandleHelper->GetURL().c_str(),
-                             oRetryContext.GetCurrentDelay());
-                    CPLSleep(oRetryContext.GetCurrentDelay());
-                    bRetry = true;
-                }
-                else if (sWriteFuncData.pBuffer != nullptr &&
-                         m_poS3HandleHelper->CanRestartOnError(
-                             sWriteFuncData.pBuffer,
-                             m_sWriteFuncHeaderData.pBuffer, false))
-                {
-                    bRetry = true;
-                }
-                else
-                {
-                    CPLError(CE_Failure, CPLE_AppDefined, "Error %d: %s",
-                             static_cast<int>(response_code),
-                             m_osCurlErrBuf.c_str());
-                    bRetry = false;
-                    nMemb = 0;
-                }
-
-                curl_multi_remove_handle(m_hCurlMulti, m_hCurl);
-                curl_easy_cleanup(m_hCurl);
-
-                CPLFree(sWriteFuncData.pBuffer);
-                CPLFree(m_sWriteFuncHeaderData.pBuffer);
-
-                m_hCurl = nullptr;
-                sWriteFuncData.pBuffer = nullptr;
-                m_sWriteFuncHeaderData.pBuffer = nullptr;
-            }
-        }
-    } while (bRetry);
-
-    return nMemb;
-}
-
-/************************************************************************/
-/*                        FinishChunkedTransfer()                       */
-/************************************************************************/
-
-int VSIS3LikeWriteHandle::FinishChunkedTransfer()
-{
-    if (m_hCurl == nullptr)
-        return -1;
-
-    NetworkStatisticsFileSystem oContextFS(m_poFS->GetFSPrefix().c_str());
-    NetworkStatisticsFile oContextFile(m_osFilename.c_str());
-    NetworkStatisticsAction oContextAction("Write");
-
-    NetworkStatisticsLogger::LogPUT(m_nWrittenInPUT);
-    m_nWrittenInPUT = 0;
-
-    m_pBuffer = nullptr;
-    m_nChunkedBufferOff = 0;
-    m_nChunkedBufferSize = 0;
-
-    VSICURLMultiPerform(m_hCurlMulti);
-
-    long response_code;
-    curl_easy_getinfo(m_hCurl, CURLINFO_RESPONSE_CODE, &response_code);
-    if (response_code == 200 || response_code == 201)
-    {
-        InvalidateParentDirectory();
-    }
-    else
-    {
-        CPLError(CE_Failure, CPLE_AppDefined, "Error %d: %s",
-                 static_cast<int>(response_code), m_osCurlErrBuf.c_str());
-        return -1;
-    }
-    return 0;
-}
-
 /************************************************************************/
 /*                               Write()                                */
 /************************************************************************/
 
-size_t VSIS3LikeWriteHandle::Write(const void *pBuffer, size_t nSize,
-                                   size_t nMemb)
+size_t VSIMultipartWriteHandle::Write(const void *pBuffer, size_t nSize,
+                                      size_t nMemb)
 {
     if (m_bError)
         return 0;
@@ -1455,11 +1143,6 @@ size_t VSIS3LikeWriteHandle::Write(const void *pBuffer, size_t nSize,
     if (nBytesToWrite == 0)
         return 0;
 
-    if (m_bUseChunkedTransfer)
-    {
-        return WriteChunked(pBuffer, nSize, nMemb);
-    }
-
     const GByte *pabySrcBuffer = reinterpret_cast<const GByte *>(pBuffer);
     while (nBytesToWrite > 0)
     {
@@ -1498,13 +1181,13 @@ size_t VSIS3LikeWriteHandle::Write(const void *pBuffer, size_t nSize,
 /*                    InvalidateParentDirectory()                       */
 /************************************************************************/
 
-void VSIS3LikeWriteHandle::InvalidateParentDirectory()
+void VSIMultipartWriteHandle::InvalidateParentDirectory()
 {
     m_poFS->InvalidateCachedData(m_poS3HandleHelper->GetURL().c_str());
 
     std::string osFilenameWithoutSlash(m_osFilename);
     if (!osFilenameWithoutSlash.empty() && osFilenameWithoutSlash.back() == '/')
-        osFilenameWithoutSlash.resize(osFilenameWithoutSlash.size() - 1);
+        osFilenameWithoutSlash.pop_back();
     m_poFS->InvalidateDirContent(CPLGetDirname(osFilenameWithoutSlash.c_str()));
 }
 
@@ -1512,7 +1195,7 @@ void VSIS3LikeWriteHandle::InvalidateParentDirectory()
 /*                           DoSinglePartPUT()                          */
 /************************************************************************/
 
-bool VSIS3LikeWriteHandle::DoSinglePartPUT()
+bool VSIMultipartWriteHandle::DoSinglePartPUT()
 {
     bool bSuccess = true;
     bool bRetry;
@@ -1627,7 +1310,7 @@ bool VSIS3LikeWriteHandle::DoSinglePartPUT()
 /*                        CompleteMultipart()                           */
 /************************************************************************/
 
-bool IVSIS3LikeFSHandler::CompleteMultipart(
+bool IVSIS3LikeFSHandlerWithMultipartUpload::CompleteMultipart(
     const std::string &osFilename, const std::string &osUploadID,
     const std::vector<std::string> &aosEtags, vsi_l_offset /* nTotalSize */,
     IVSIS3LikeHandleHelper *poS3HandleHelper,
@@ -1739,7 +1422,7 @@ bool IVSIS3LikeFSHandler::CompleteMultipart(
 /*                          AbortMultipart()                            */
 /************************************************************************/
 
-bool IVSIS3LikeFSHandler::AbortMultipart(
+bool IVSIS3LikeFSHandlerWithMultipartUpload::AbortMultipart(
     const std::string &osFilename, const std::string &osUploadID,
     IVSIS3LikeHandleHelper *poS3HandleHelper,
     const CPLHTTPRetryParameters &oRetryParameters)
@@ -1822,7 +1505,8 @@ bool IVSIS3LikeFSHandler::AbortMultipart(
 /*                       AbortPendingUploads()                          */
 /************************************************************************/
 
-bool IVSIS3LikeFSHandler::AbortPendingUploads(const char *pszFilename)
+bool IVSIS3LikeFSHandlerWithMultipartUpload::AbortPendingUploads(
+    const char *pszFilename)
 {
     NetworkStatisticsFileSystem oContextFS(GetFSPrefix().c_str());
     NetworkStatisticsFile oContextFile(pszFilename);
@@ -1831,7 +1515,7 @@ bool IVSIS3LikeFSHandler::AbortPendingUploads(const char *pszFilename)
     std::string osDirnameWithoutPrefix = pszFilename + GetFSPrefix().size();
     if (!osDirnameWithoutPrefix.empty() && osDirnameWithoutPrefix.back() == '/')
     {
-        osDirnameWithoutPrefix.resize(osDirnameWithoutPrefix.size() - 1);
+        osDirnameWithoutPrefix.pop_back();
     }
 
     std::string osBucket(osDirnameWithoutPrefix);
@@ -2019,17 +1703,13 @@ bool IVSIS3LikeFSHandler::AbortPendingUploads(const char *pszFilename)
 /*                                 Close()                              */
 /************************************************************************/
 
-int VSIS3LikeWriteHandle::Close()
+int VSIMultipartWriteHandle::Close()
 {
     int nRet = 0;
     if (!m_bClosed)
     {
         m_bClosed = true;
-        if (m_bUseChunkedTransfer && m_hCurlMulti != nullptr)
-        {
-            nRet = FinishChunkedTransfer();
-        }
-        else if (m_osUploadID.empty())
+        if (m_osUploadID.empty())
         {
             if (!m_bError && !DoSinglePartPUT())
                 nRet = -1;
@@ -2070,8 +1750,8 @@ VSIS3FSHandler::CreateWriteHandle(const char *pszFilename,
         CreateHandleHelper(pszFilename + GetFSPrefix().size(), false);
     if (poHandleHelper == nullptr)
         return nullptr;
-    auto poHandle = std::make_unique<VSIS3LikeWriteHandle>(
-        this, pszFilename, poHandleHelper, false, papszOptions);
+    auto poHandle = std::make_unique<VSIMultipartWriteHandle>(
+        this, pszFilename, poHandleHelper, papszOptions);
     if (!poHandle->IsOK())
     {
         return nullptr;
@@ -2425,7 +2105,7 @@ int IVSIS3LikeFSHandler::RmdirRecursiveInternal(const char *pszDirname,
     std::string osDirnameWithoutEndSlash(pszDirname);
     if (!osDirnameWithoutEndSlash.empty() &&
         osDirnameWithoutEndSlash.back() == '/')
-        osDirnameWithoutEndSlash.resize(osDirnameWithoutEndSlash.size() - 1);
+        osDirnameWithoutEndSlash.pop_back();
 
     CPLStringList aosOptions;
     aosOptions.SetNameValue("CACHE_ENTRIES", "FALSE");
@@ -2946,7 +2626,7 @@ int IVSIS3LikeFSHandler::MkdirInternal(const char *pszDirname, long /*nMode*/,
     if (ret == 0)
     {
         std::string osDirnameWithoutEndSlash(osDirname);
-        osDirnameWithoutEndSlash.resize(osDirnameWithoutEndSlash.size() - 1);
+        osDirnameWithoutEndSlash.pop_back();
 
         InvalidateDirContent(CPLGetDirname(osDirnameWithoutEndSlash.c_str()));
 
@@ -3013,7 +2693,7 @@ int IVSIS3LikeFSHandler::Rmdir(const char *pszDirname)
     }
 
     std::string osDirnameWithoutEndSlash(osDirname);
-    osDirnameWithoutEndSlash.resize(osDirnameWithoutEndSlash.size() - 1);
+    osDirnameWithoutEndSlash.pop_back();
     if (osDirnameWithoutEndSlash.find('/', GetFSPrefix().size()) ==
         std::string::npos)
     {
@@ -3057,7 +2737,7 @@ int IVSIS3LikeFSHandler::Stat(const char *pszFilename, VSIStatBufL *pStatBuf,
 
     std::string osFilenameWithoutSlash(osFilename);
     if (osFilenameWithoutSlash.back() == '/')
-        osFilenameWithoutSlash.resize(osFilenameWithoutSlash.size() - 1);
+        osFilenameWithoutSlash.pop_back();
 
     // If there's directory content for the directory where this file belongs
     // to, use it to detect if the object does not exist
@@ -3130,22 +2810,22 @@ VSICurlHandle *VSIS3FSHandler::CreateFileHandle(const char *pszFilename)
 /*                          GetURLFromFilename()                         */
 /************************************************************************/
 
-std::string VSIS3FSHandler::GetURLFromFilename(const std::string &osFilename)
+std::string
+VSIS3FSHandler::GetURLFromFilename(const std::string &osFilename) const
 {
-    std::string osFilenameWithoutPrefix =
+    const std::string osFilenameWithoutPrefix =
         osFilename.substr(GetFSPrefix().size());
 
-    VSIS3HandleHelper *poS3HandleHelper = VSIS3HandleHelper::BuildFromURI(
-        osFilenameWithoutPrefix.c_str(), GetFSPrefix().c_str(), true);
-    if (poS3HandleHelper == nullptr)
+    auto poS3HandleHelper =
+        std::unique_ptr<VSIS3HandleHelper>(VSIS3HandleHelper::BuildFromURI(
+            osFilenameWithoutPrefix.c_str(), GetFSPrefix().c_str(), true));
+    if (!poS3HandleHelper)
     {
-        return "";
+        return std::string();
     }
     std::string osBaseURL(poS3HandleHelper->GetURL());
     if (!osBaseURL.empty() && osBaseURL.back() == '/')
-        osBaseURL.resize(osBaseURL.size() - 1);
-    delete poS3HandleHelper;
-
+        osBaseURL.pop_back();
     return osBaseURL;
 }
 
@@ -3571,7 +3251,7 @@ VSIDIR *IVSIS3LikeFSHandler::OpenDir(const char *pszPath, int nRecurseDepth,
     std::string osDirnameWithoutPrefix = pszPath + GetFSPrefix().size();
     if (!osDirnameWithoutPrefix.empty() && osDirnameWithoutPrefix.back() == '/')
     {
-        osDirnameWithoutPrefix.resize(osDirnameWithoutPrefix.size() - 1);
+        osDirnameWithoutPrefix.pop_back();
     }
 
     std::string osBucket(osDirnameWithoutPrefix);
@@ -3689,7 +3369,9 @@ int IVSIS3LikeFSHandler::CopyFile(const char *pszSource, const char *pszTarget,
     bool bUsingStreaming = false;
     if (!fpSource)
     {
-        if (STARTS_WITH(pszSource, osPrefix.c_str()))
+        if (STARTS_WITH(pszSource, osPrefix.c_str()) &&
+            CPLTestBool(CPLGetConfigOption(
+                "VSIS3_COPYFILE_USE_STREAMING_SOURCE", "YES")))
         {
             // Try to get a streaming path from the source path
             auto poSourceFSHandler = dynamic_cast<IVSIS3LikeFSHandler *>(
@@ -3764,7 +3446,7 @@ static int GetRequestedNumThreadsForCopy(CSLConstList papszOptions)
 /*                       CopyFileRestartable()                          */
 /************************************************************************/
 
-int IVSIS3LikeFSHandler::CopyFileRestartable(
+int IVSIS3LikeFSHandlerWithMultipartUpload::CopyFileRestartable(
     const char *pszSource, const char *pszTarget, const char *pszInputPayload,
     char **ppszOutputPayload, CSLConstList papszOptions,
     GDALProgressFunc pProgressFunc, void *pProgressData)
@@ -4117,6 +3799,7 @@ int IVSIS3LikeFSHandler::CopyFileRestartable(
             while (!bStop)
             {
                 oCV.wait(oLock);
+                // coverity[ uninit_use_in_call]
                 oLock.unlock();
                 const bool bInterrupt =
                     !pProgressFunc(double(iCurChunk) / nChunkCount,
@@ -4263,7 +3946,7 @@ bool IVSIS3LikeFSHandler::Sync(const char *pszSource, const char *pszTarget,
     if (osSourceWithoutSlash.back() == '/' ||
         osSourceWithoutSlash.back() == '\\')
     {
-        osSourceWithoutSlash.resize(osSourceWithoutSlash.size() - 1);
+        osSourceWithoutSlash.pop_back();
     }
 
     const CPLHTTPRetryParameters oRetryParameters(
@@ -4435,11 +4118,12 @@ bool IVSIS3LikeFSHandler::Sync(const char *pszSource, const char *pszTarget,
     std::set<std::string> aoSetDirsToCreate;
     const char *pszChunkSize = CSLFetchNameValue(papszOptions, "CHUNK_SIZE");
     const int nRequestedThreads = GetRequestedNumThreadsForCopy(papszOptions);
-    auto poTargetFSHandler = dynamic_cast<IVSIS3LikeFSHandler *>(
-        VSIFileManager::GetHandler(pszTarget));
+    auto poTargetFSMultipartHandler =
+        dynamic_cast<IVSIS3LikeFSHandlerWithMultipartUpload *>(
+            VSIFileManager::GetHandler(pszTarget));
     const bool bSupportsParallelMultipartUpload =
-        bUploadFromLocalToNetwork && poTargetFSHandler != nullptr &&
-        poTargetFSHandler->SupportsParallelMultipartUpload();
+        bUploadFromLocalToNetwork && poTargetFSMultipartHandler != nullptr &&
+        poTargetFSMultipartHandler->SupportsParallelMultipartUpload();
     const bool bSimulateThreading =
         CPLTestBool(CPLGetConfigOption("VSIS3_SIMULATE_THREADING", "NO"));
     const int nMinSizeChunk =
@@ -4459,14 +4143,15 @@ bool IVSIS3LikeFSHandler::Sync(const char *pszSource, const char *pszTarget,
 
     // Filter x-amz- options when outputting to /vsis3/
     CPLStringList aosObjectCreationOptions;
-    if (poTargetFSHandler != nullptr && papszOptions != nullptr)
+    if (poTargetFSMultipartHandler != nullptr && papszOptions != nullptr)
     {
         for (auto papszIter = papszOptions; *papszIter != nullptr; ++papszIter)
         {
             char *pszKey = nullptr;
             const char *pszValue = CPLParseNameValue(*papszIter, &pszKey);
             if (pszKey && pszValue &&
-                poTargetFSHandler->IsAllowedHeaderForObjectCreation(pszKey))
+                poTargetFSMultipartHandler->IsAllowedHeaderForObjectCreation(
+                    pszKey))
             {
                 aosObjectCreationOptions.SetNameValue(pszKey, pszValue);
             }
@@ -4492,12 +4177,12 @@ bool IVSIS3LikeFSHandler::Sync(const char *pszSource, const char *pszTarget,
     // Cleanup pending uploads in case of early exit
     struct CleanupPendingUploads
     {
-        IVSIS3LikeFSHandler *m_poFS;
+        IVSIS3LikeFSHandlerWithMultipartUpload *m_poFS;
         std::map<std::string, MultiPartDef> &m_oMapMultiPartDefs;
         const CPLHTTPRetryParameters &m_oRetryParameters;
 
         CleanupPendingUploads(
-            IVSIS3LikeFSHandler *poFSIn,
+            IVSIS3LikeFSHandlerWithMultipartUpload *poFSIn,
             std::map<std::string, MultiPartDef> &oMapMultiPartDefsIn,
             const CPLHTTPRetryParameters &oRetryParametersIn)
             : m_poFS(poFSIn), m_oMapMultiPartDefs(oMapMultiPartDefsIn),
@@ -4507,17 +4192,21 @@ bool IVSIS3LikeFSHandler::Sync(const char *pszSource, const char *pszTarget,
 
         ~CleanupPendingUploads()
         {
-            for (const auto &kv : m_oMapMultiPartDefs)
+            if (m_poFS)
             {
-                auto poS3HandleHelper = std::unique_ptr<IVSIS3LikeHandleHelper>(
-                    m_poFS->CreateHandleHelper(kv.first.c_str() +
-                                                   m_poFS->GetFSPrefix().size(),
-                                               false));
-                if (poS3HandleHelper)
+                for (const auto &kv : m_oMapMultiPartDefs)
                 {
-                    m_poFS->AbortMultipart(kv.first, kv.second.osUploadID,
-                                           poS3HandleHelper.get(),
-                                           m_oRetryParameters);
+                    auto poS3HandleHelper =
+                        std::unique_ptr<IVSIS3LikeHandleHelper>(
+                            m_poFS->CreateHandleHelper(
+                                kv.first.c_str() + m_poFS->GetFSPrefix().size(),
+                                false));
+                    if (poS3HandleHelper)
+                    {
+                        m_poFS->AbortMultipart(kv.first, kv.second.osUploadID,
+                                               poS3HandleHelper.get(),
+                                               m_oRetryParameters);
+                    }
                 }
             }
         }
@@ -4527,8 +4216,8 @@ bool IVSIS3LikeFSHandler::Sync(const char *pszSource, const char *pszTarget,
         operator=(const CleanupPendingUploads &) = delete;
     };
 
-    const CleanupPendingUploads cleanupPendingUploads(this, oMapMultiPartDefs,
-                                                      oRetryParameters);
+    const CleanupPendingUploads cleanupPendingUploads(
+        poTargetFSMultipartHandler, oMapMultiPartDefs, oRetryParameters);
 
     std::string osTargetDir;  // set in the VSI_ISDIR(sSource.st_mode) case
     std::string osTarget;     // set in the !(VSI_ISDIR(sSource.st_mode)) case
@@ -4759,9 +4448,11 @@ bool IVSIS3LikeFSHandler::Sync(const char *pszSource, const char *pszTarget,
                         if (poS3HandleHelper == nullptr)
                             return false;
 
-                        const auto osUploadID = InitiateMultipartUpload(
-                            osSubTarget, poS3HandleHelper.get(),
-                            oRetryParameters, aosObjectCreationOptions.List());
+                        const auto osUploadID =
+                            poTargetFSMultipartHandler->InitiateMultipartUpload(
+                                osSubTarget, poS3HandleHelper.get(),
+                                oRetryParameters,
+                                aosObjectCreationOptions.List());
                         if (osUploadID.empty())
                         {
                             return false;
@@ -4968,9 +4659,11 @@ bool IVSIS3LikeFSHandler::Sync(const char *pszSource, const char *pszTarget,
                         if (poS3HandleHelper == nullptr)
                             return false;
 
-                        const auto osUploadID = InitiateMultipartUpload(
-                            osTarget, poS3HandleHelper.get(), oRetryParameters,
-                            aosObjectCreationOptions.List());
+                        const auto osUploadID =
+                            poTargetFSMultipartHandler->InitiateMultipartUpload(
+                                osTarget, poS3HandleHelper.get(),
+                                oRetryParameters,
+                                aosObjectCreationOptions.List());
                         if (osUploadID.empty())
                         {
                             return false;
@@ -5016,6 +4709,7 @@ bool IVSIS3LikeFSHandler::Sync(const char *pszSource, const char *pszTarget,
     struct JobQueue
     {
         IVSIS3LikeFSHandler *poFS;
+        IVSIS3LikeFSHandlerWithMultipartUpload *poTargetFSMultipartHandler;
         const std::vector<ChunkToCopy> &aoChunksToCopy;
         const std::vector<size_t> &anIndexToCopy;
         std::map<std::string, MultiPartDef> &oMapMultiPartDefs;
@@ -5034,6 +4728,8 @@ bool IVSIS3LikeFSHandler::Sync(const char *pszSource, const char *pszTarget,
         const CPLStringList &aosObjectCreationOptions;
 
         JobQueue(IVSIS3LikeFSHandler *poFSIn,
+                 IVSIS3LikeFSHandlerWithMultipartUpload
+                     *poTargetFSMultipartHandlerIn,
                  const std::vector<ChunkToCopy> &aoChunksToCopyIn,
                  const std::vector<size_t> &anIndexToCopyIn,
                  std::map<std::string, MultiPartDef> &oMapMultiPartDefsIn,
@@ -5044,8 +4740,9 @@ bool IVSIS3LikeFSHandler::Sync(const char *pszSource, const char *pszTarget,
                  size_t nMaxChunkSizeIn,
                  const CPLHTTPRetryParameters &oRetryParametersIn,
                  const CPLStringList &aosObjectCreationOptionsIn)
-            : poFS(poFSIn), aoChunksToCopy(aoChunksToCopyIn),
-              anIndexToCopy(anIndexToCopyIn),
+            : poFS(poFSIn),
+              poTargetFSMultipartHandler(poTargetFSMultipartHandlerIn),
+              aoChunksToCopy(aoChunksToCopyIn), anIndexToCopy(anIndexToCopyIn),
               oMapMultiPartDefs(oMapMultiPartDefsIn),
               osSourceDir(osSourceDirIn), osTargetDir(osTargetDirIn),
               osSource(osSourceIn), osTarget(osTargetIn),
@@ -5137,11 +4834,13 @@ bool IVSIS3LikeFSHandler::Sync(const char *pszSource, const char *pszTarget,
                                      ? 0 /* shouldn't happen */
                                      : static_cast<int>(chunk.nStartOffset /
                                                         queue->nMaxChunkSize));
-                        const std::string osEtag = queue->poFS->UploadPart(
-                            osSubTarget, nPartNumber, iter->second.osUploadID,
-                            chunk.nStartOffset, pBuffer, nSizeToRead,
-                            poS3HandleHelper.get(), queue->oRetryParameters,
-                            queue->aosObjectCreationOptions.List());
+                        const std::string osEtag =
+                            queue->poTargetFSMultipartHandler->UploadPart(
+                                osSubTarget, nPartNumber,
+                                iter->second.osUploadID, chunk.nStartOffset,
+                                pBuffer, nSizeToRead, poS3HandleHelper.get(),
+                                queue->oRetryParameters,
+                                queue->aosObjectCreationOptions.List());
                         if (!osEtag.empty())
                         {
                             std::lock_guard<std::mutex> lock(queue->sMutex);
@@ -5190,11 +4889,11 @@ bool IVSIS3LikeFSHandler::Sync(const char *pszSource, const char *pszTarget,
         }
     };
 
-    JobQueue sJobQueue(this, aoChunksToCopy, anIndexToCopy, oMapMultiPartDefs,
-                       osSourceWithoutSlash, osTargetDir, osSourceWithoutSlash,
-                       osTarget, bSupportsParallelMultipartUpload,
-                       nMaxChunkSize, oRetryParameters,
-                       aosObjectCreationOptions);
+    JobQueue sJobQueue(this, poTargetFSMultipartHandler, aoChunksToCopy,
+                       anIndexToCopy, oMapMultiPartDefs, osSourceWithoutSlash,
+                       osTargetDir, osSourceWithoutSlash, osTarget,
+                       bSupportsParallelMultipartUpload, nMaxChunkSize,
+                       oRetryParameters, aosObjectCreationOptions);
 
     if (CPLTestBool(CPLGetConfigOption("VSIS3_SYNC_MULTITHREADING", "YES")))
     {
@@ -5256,9 +4955,10 @@ bool IVSIS3LikeFSHandler::Sync(const char *pszSource, const char *pszTarget,
             {
                 CPLAssert(kv.second.nCountValidETags ==
                           kv.second.nExpectedCount);
-                if (CompleteMultipart(kv.first, kv.second.osUploadID,
-                                      kv.second.aosEtags, kv.second.nTotalSize,
-                                      poS3HandleHelper.get(), oRetryParameters))
+                if (poTargetFSMultipartHandler->CompleteMultipart(
+                        kv.first, kv.second.osUploadID, kv.second.aosEtags,
+                        kv.second.nTotalSize, poS3HandleHelper.get(),
+                        oRetryParameters))
                 {
                     sJobQueue.ret = true;
                     oSetKeysToRemove.insert(kv.first);
@@ -5277,6 +4977,123 @@ bool IVSIS3LikeFSHandler::Sync(const char *pszSource, const char *pszTarget,
     return sJobQueue.ret;
 }
 
+/************************************************************************/
+/*                    MultipartUploadGetCapabilities()                  */
+/************************************************************************/
+
+bool IVSIS3LikeFSHandlerWithMultipartUpload::MultipartUploadGetCapabilities(
+    int *pbNonSequentialUploadSupported, int *pbParallelUploadSupported,
+    int *pbAbortSupported, size_t *pnMinPartSize, size_t *pnMaxPartSize,
+    int *pnMaxPartCount)
+{
+    if (pbNonSequentialUploadSupported)
+        *pbNonSequentialUploadSupported =
+            SupportsNonSequentialMultipartUpload();
+    if (pbParallelUploadSupported)
+        *pbParallelUploadSupported = SupportsParallelMultipartUpload();
+    if (pbAbortSupported)
+        *pbAbortSupported = SupportsMultipartAbort();
+    if (pnMinPartSize)
+        *pnMinPartSize = GetMinimumPartSizeInMiB();
+    if (pnMaxPartSize)
+        *pnMaxPartSize = GetMaximumPartSizeInMiB();
+    if (pnMaxPartCount)
+        *pnMaxPartCount = GetMaximumPartCount();
+    return true;
+}
+
+/************************************************************************/
+/*                         MultipartUploadStart()                       */
+/************************************************************************/
+
+char *IVSIS3LikeFSHandlerWithMultipartUpload::MultipartUploadStart(
+    const char *pszFilename, CSLConstList papszOptions)
+{
+    if (!STARTS_WITH_CI(pszFilename, GetFSPrefix().c_str()))
+        return nullptr;
+    auto poHandleHelper = std::unique_ptr<IVSIS3LikeHandleHelper>(
+        CreateHandleHelper(pszFilename + GetFSPrefix().size(), false));
+    if (poHandleHelper == nullptr)
+        return nullptr;
+    const CPLStringList aosHTTPOptions(CPLHTTPGetOptionsFromEnv(pszFilename));
+    const CPLHTTPRetryParameters oRetryParameters(aosHTTPOptions);
+
+    const std::string osRet = InitiateMultipartUpload(
+        pszFilename, poHandleHelper.get(), oRetryParameters, papszOptions);
+    if (osRet.empty())
+        return nullptr;
+    return CPLStrdup(osRet.c_str());
+}
+
+/************************************************************************/
+/*                       MultipartUploadAddPart()                       */
+/************************************************************************/
+
+char *IVSIS3LikeFSHandlerWithMultipartUpload::MultipartUploadAddPart(
+    const char *pszFilename, const char *pszUploadId, int nPartNumber,
+    vsi_l_offset nFileOffset, const void *pData, size_t nDataLength,
+    CSLConstList papszOptions)
+{
+    if (!STARTS_WITH_CI(pszFilename, GetFSPrefix().c_str()))
+        return nullptr;
+    auto poHandleHelper = std::unique_ptr<IVSIS3LikeHandleHelper>(
+        CreateHandleHelper(pszFilename + GetFSPrefix().size(), false));
+    if (poHandleHelper == nullptr)
+        return nullptr;
+    const CPLStringList aosHTTPOptions(CPLHTTPGetOptionsFromEnv(pszFilename));
+    const CPLHTTPRetryParameters oRetryParameters(aosHTTPOptions);
+
+    const std::string osRet = UploadPart(
+        pszFilename, nPartNumber, pszUploadId, nFileOffset, pData, nDataLength,
+        poHandleHelper.get(), oRetryParameters, papszOptions);
+    if (osRet.empty())
+        return nullptr;
+    return CPLStrdup(osRet.c_str());
+}
+
+/************************************************************************/
+/*                         MultipartUploadEnd()                         */
+/************************************************************************/
+
+bool IVSIS3LikeFSHandlerWithMultipartUpload::MultipartUploadEnd(
+    const char *pszFilename, const char *pszUploadId, size_t nPartIdsCount,
+    const char *const *apszPartIds, vsi_l_offset nTotalSize, CSLConstList)
+{
+    if (!STARTS_WITH_CI(pszFilename, GetFSPrefix().c_str()))
+        return false;
+    auto poHandleHelper = std::unique_ptr<IVSIS3LikeHandleHelper>(
+        CreateHandleHelper(pszFilename + GetFSPrefix().size(), false));
+    if (poHandleHelper == nullptr)
+        return false;
+    const CPLStringList aosHTTPOptions(CPLHTTPGetOptionsFromEnv(pszFilename));
+    const CPLHTTPRetryParameters oRetryParameters(aosHTTPOptions);
+
+    std::vector<std::string> aosTags;
+    for (size_t i = 0; i < nPartIdsCount; ++i)
+        aosTags.emplace_back(apszPartIds[i]);
+    return CompleteMultipart(pszFilename, pszUploadId, aosTags, nTotalSize,
+                             poHandleHelper.get(), oRetryParameters);
+}
+
+/************************************************************************/
+/*                         MultipartUploadAbort()                       */
+/************************************************************************/
+
+bool IVSIS3LikeFSHandlerWithMultipartUpload::MultipartUploadAbort(
+    const char *pszFilename, const char *pszUploadId, CSLConstList)
+{
+    if (!STARTS_WITH_CI(pszFilename, GetFSPrefix().c_str()))
+        return false;
+    auto poHandleHelper = std::unique_ptr<IVSIS3LikeHandleHelper>(
+        CreateHandleHelper(pszFilename + GetFSPrefix().size(), false));
+    if (poHandleHelper == nullptr)
+        return false;
+    const CPLStringList aosHTTPOptions(CPLHTTPGetOptionsFromEnv(pszFilename));
+    const CPLHTTPRetryParameters oRetryParameters(aosHTTPOptions);
+    return AbortMultipart(pszFilename, pszUploadId, poHandleHelper.get(),
+                          oRetryParameters);
+}
+
 /************************************************************************/
 /*                             VSIS3Handle()                            */
 /************************************************************************/
diff --git a/port/cpl_vsil_sparsefile.cpp b/port/cpl_vsil_sparsefile.cpp
index 2dfe2f4349ce..62eb5b9bd65b 100644
--- a/port/cpl_vsil_sparsefile.cpp
+++ b/port/cpl_vsil_sparsefile.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2010, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/port/cpl_vsil_stdin.cpp b/port/cpl_vsil_stdin.cpp
index cb64c1f98667..0974c69f8c03 100644
--- a/port/cpl_vsil_stdin.cpp
+++ b/port/cpl_vsil_stdin.cpp
@@ -7,23 +7,7 @@
  **********************************************************************
  * Copyright (c) 2010-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 //! @cond Doxygen_Suppress
diff --git a/port/cpl_vsil_stdout.cpp b/port/cpl_vsil_stdout.cpp
index b17e7b4410e5..3d7bc279b5c6 100644
--- a/port/cpl_vsil_stdout.cpp
+++ b/port/cpl_vsil_stdout.cpp
@@ -7,23 +7,7 @@
  **********************************************************************
  * Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/port/cpl_vsil_subfile.cpp b/port/cpl_vsil_subfile.cpp
index 2e76b1da6272..e9201d1f49e6 100644
--- a/port/cpl_vsil_subfile.cpp
+++ b/port/cpl_vsil_subfile.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/port/cpl_vsil_swift.cpp b/port/cpl_vsil_swift.cpp
index 2cb35817170f..bcaea3585c2f 100644
--- a/port/cpl_vsil_swift.cpp
+++ b/port/cpl_vsil_swift.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2017-2018, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_json.h"
@@ -149,7 +133,7 @@ void VSICurlFilesystemHandlerBase::AnalyseSwiftFileList(
         {
             osNextMarker = osSubdir;
             if (osSubdir.back() == '/')
-                osSubdir.resize(osSubdir.size() - 1);
+                osSubdir.pop_back();
             if (STARTS_WITH(osSubdir.c_str(), osPrefix.c_str()))
             {
 
@@ -212,7 +196,8 @@ class VSISwiftFSHandler final : public IVSIS3LikeFSHandler
 
   protected:
     VSICurlHandle *CreateFileHandle(const char *pszFilename) override;
-    std::string GetURLFromFilename(const std::string &osFilename) override;
+    std::string
+    GetURLFromFilename(const std::string &osFilename) const override;
 
     const char *GetDebugKey() const override
     {
@@ -301,12 +286,8 @@ VSISwiftFSHandler::CreateWriteHandle(const char *pszFilename,
         CreateHandleHelper(pszFilename + GetFSPrefix().size(), false);
     if (poHandleHelper == nullptr)
         return nullptr;
-    auto poHandle = std::make_unique<VSIS3LikeWriteHandle>(
-        this, pszFilename, poHandleHelper, true, papszOptions);
-    if (!poHandle->IsOK())
-    {
-        return nullptr;
-    }
+    auto poHandle = std::make_unique<VSIChunkedWriteHandle>(
+        this, pszFilename, poHandleHelper, papszOptions);
     return VSIVirtualHandleUniquePtr(poHandle.release());
 }
 
@@ -389,22 +370,22 @@ VSICurlHandle *VSISwiftFSHandler::CreateFileHandle(const char *pszFilename)
 /*                         GetURLFromFilename()                         */
 /************************************************************************/
 
-std::string VSISwiftFSHandler::GetURLFromFilename(const std::string &osFilename)
+std::string
+VSISwiftFSHandler::GetURLFromFilename(const std::string &osFilename) const
 {
-    std::string osFilenameWithoutPrefix =
+    const std::string osFilenameWithoutPrefix =
         osFilename.substr(GetFSPrefix().size());
 
-    VSISwiftHandleHelper *poHandleHelper = VSISwiftHandleHelper::BuildFromURI(
-        osFilenameWithoutPrefix.c_str(), GetFSPrefix().c_str());
-    if (poHandleHelper == nullptr)
+    auto poHandleHelper = std::unique_ptr<VSISwiftHandleHelper>(
+        VSISwiftHandleHelper::BuildFromURI(osFilenameWithoutPrefix.c_str(),
+                                           GetFSPrefix().c_str()));
+    if (!poHandleHelper)
     {
-        return "";
+        return std::string();
     }
     std::string osBaseURL(poHandleHelper->GetURL());
     if (!osBaseURL.empty() && osBaseURL.back() == '/')
-        osBaseURL.resize(osBaseURL.size() - 1);
-    delete poHandleHelper;
-
+        osBaseURL.pop_back();
     return osBaseURL;
 }
 
@@ -434,7 +415,7 @@ int VSISwiftFSHandler::Stat(const char *pszFilename, VSIStatBufL *pStatBuf,
 
     std::string osFilename(pszFilename);
     if (osFilename.back() == '/')
-        osFilename.resize(osFilename.size() - 1);
+        osFilename.pop_back();
 
     memset(pStatBuf, 0, sizeof(VSIStatBufL));
 
@@ -520,7 +501,7 @@ char **VSISwiftFSHandler::GetFileList(const char *pszDirname, int nMaxFiles,
     std::string osDirnameWithoutPrefix = pszDirname + GetFSPrefix().size();
     if (!osDirnameWithoutPrefix.empty() && osDirnameWithoutPrefix.back() == '/')
     {
-        osDirnameWithoutPrefix.resize(osDirnameWithoutPrefix.size() - 1);
+        osDirnameWithoutPrefix.pop_back();
     }
 
     std::string osBucket(osDirnameWithoutPrefix);
diff --git a/port/cpl_vsil_tar.cpp b/port/cpl_vsil_tar.cpp
index 202289c842d5..0d83a3269faa 100644
--- a/port/cpl_vsil_tar.cpp
+++ b/port/cpl_vsil_tar.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2010-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 //! @cond Doxygen_Suppress
@@ -438,7 +422,7 @@ int VSITarReader::GotoNextFile()
                 return FALSE;
             osNextFileName.resize(static_cast<size_t>(nNextFileSize));
             if (osNextFileName.back() == '\0')
-                osNextFileName.resize(osNextFileName.size() - 1);
+                osNextFileName.pop_back();
         }
         else
         {
diff --git a/port/cpl_vsil_unix_stdio_64.cpp b/port/cpl_vsil_unix_stdio_64.cpp
index d370fe87239f..f6a7f9252e8f 100644
--- a/port/cpl_vsil_unix_stdio_64.cpp
+++ b/port/cpl_vsil_unix_stdio_64.cpp
@@ -9,23 +9,7 @@
  * Copyright (c) 2001, Frank Warmerdam
  * Copyright (c) 2010-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************
  *
  * NB: Note that in wrappers we are always saving the error state (errno
diff --git a/port/cpl_vsil_uploadonclose.cpp b/port/cpl_vsil_uploadonclose.cpp
index 6700aa600458..0ffe77f87847 100644
--- a/port/cpl_vsil_uploadonclose.cpp
+++ b/port/cpl_vsil_uploadonclose.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2020, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_vsi_virtual.h"
diff --git a/port/cpl_vsil_webhdfs.cpp b/port/cpl_vsil_webhdfs.cpp
index be4fa10eb500..419bbca5ea1b 100644
--- a/port/cpl_vsil_webhdfs.cpp
+++ b/port/cpl_vsil_webhdfs.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2018, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -81,7 +65,8 @@ class VSIWebHDFSFSHandler final : public VSICurlFilesystemHandlerBaseWritable
     char **GetFileList(const char *pszFilename, int nMaxFiles,
                        bool *pbGotFileList) override;
 
-    std::string GetURLFromFilename(const std::string &osFilename) override;
+    std::string
+    GetURLFromFilename(const std::string &osFilename) const override;
 
     VSIVirtualHandleUniquePtr
     CreateWriteHandle(const char *pszFilename,
@@ -283,7 +268,7 @@ void VSIWebHDFSWriteHandle::InvalidateParentDirectory()
 
     std::string osFilenameWithoutSlash(m_osFilename);
     if (!osFilenameWithoutSlash.empty() && osFilenameWithoutSlash.back() == '/')
-        osFilenameWithoutSlash.resize(osFilenameWithoutSlash.size() - 1);
+        osFilenameWithoutSlash.pop_back();
     m_poFS->InvalidateDirContent(CPLGetDirname(osFilenameWithoutSlash.c_str()));
 }
 
@@ -564,11 +549,11 @@ VSICurlHandle *VSIWebHDFSFSHandler::CreateFileHandle(const char *pszFilename)
 }
 
 /************************************************************************/
-/*                          GetURLFromFilename()                         */
+/*                          GetURLFromFilename()                        */
 /************************************************************************/
 
 std::string
-VSIWebHDFSFSHandler::GetURLFromFilename(const std::string &osFilename)
+VSIWebHDFSFSHandler::GetURLFromFilename(const std::string &osFilename) const
 {
     return osFilename.substr(GetFSPrefix().size());
 }
@@ -753,7 +738,7 @@ int VSIWebHDFSFSHandler::Unlink(const char *pszFilename)
         std::string osFilenameWithoutSlash(pszFilename);
         if (!osFilenameWithoutSlash.empty() &&
             osFilenameWithoutSlash.back() == '/')
-            osFilenameWithoutSlash.resize(osFilenameWithoutSlash.size() - 1);
+            osFilenameWithoutSlash.pop_back();
 
         InvalidateDirContent(CPLGetDirname(osFilenameWithoutSlash.c_str()));
     }
@@ -794,7 +779,7 @@ int VSIWebHDFSFSHandler::Mkdir(const char *pszDirname, long nMode)
     if (!osDirnameWithoutEndSlash.empty() &&
         osDirnameWithoutEndSlash.back() == '/')
     {
-        osDirnameWithoutEndSlash.resize(osDirnameWithoutEndSlash.size() - 1);
+        osDirnameWithoutEndSlash.pop_back();
     }
 
     if (osDirnameWithoutEndSlash.find("/webhdfs/v1") ==
diff --git a/port/cpl_vsil_win32.cpp b/port/cpl_vsil_win32.cpp
index 81a5bc3678a0..acbfe6a9cdea 100644
--- a/port/cpl_vsil_win32.cpp
+++ b/port/cpl_vsil_win32.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2000, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2008-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_vsi_virtual.h"
@@ -904,6 +888,15 @@ int VSIWin32FilesystemHandler::Stat(const char *pszFilename,
             return nResult;
         }
 
+#if defined(__MINGW32__)
+        // MinGW runtime for _wstat64() apparently doesn't like trailing slashes
+        // for directories.
+        const size_t nLen = wcslen(pwszFilename);
+        if (nLen > 0 &&
+            (pwszFilename[nLen - 1] == '/' || pwszFilename[nLen - 1] == '\\'))
+            pwszFilename[nLen - 1] = 0;
+#endif
+
         int nResult = _wstat64(pwszFilename, pStatBuf);
 
         // If _wstat64() fails and the original name is not an extended one,
diff --git a/port/cpl_vsisimple.cpp b/port/cpl_vsisimple.cpp
index 744b540a08cd..eb97303a70c7 100644
--- a/port/cpl_vsisimple.cpp
+++ b/port/cpl_vsisimple.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1998, Frank Warmerdam
  * Copyright (c) 2008-2012, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************
  *
  * NB: Note that in wrappers we are always saving the error state (errno
@@ -56,6 +40,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
+#include <limits>
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
@@ -1401,8 +1386,11 @@ GIntBig CPLGetPhysicalRAM(void)
 {
     const long nPhysPages = sysconf(_SC_PHYS_PAGES);
     const long nPageSize = sysconf(_SC_PAGESIZE);
-    if (nPhysPages < 0 || nPageSize < 0)
+    if (nPhysPages <= 0 || nPageSize <= 0 ||
+        nPhysPages > std::numeric_limits<GIntBig>::max() / nPageSize)
+    {
         return 0;
+    }
     GIntBig nVal = static_cast<GIntBig>(nPhysPages) * nPageSize;
 
 #ifdef __linux
diff --git a/port/cpl_worker_thread_pool.cpp b/port/cpl_worker_thread_pool.cpp
index 9087cf0270f7..c2134f0b7a30 100644
--- a/port/cpl_worker_thread_pool.cpp
+++ b/port/cpl_worker_thread_pool.cpp
@@ -7,23 +7,7 @@
  **********************************************************************
  * Copyright (c) 2015, Even Rouault, <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -36,12 +20,6 @@
 #include "cpl_error.h"
 #include "cpl_vsi.h"
 
-struct CPLWorkerThreadJob
-{
-    CPLThreadFunc pfnFunc;
-    void *pData;
-};
-
 static thread_local CPLWorkerThreadPool *threadLocalCurrentThreadPool = nullptr;
 
 /************************************************************************/
@@ -53,10 +31,19 @@ static thread_local CPLWorkerThreadPool *threadLocalCurrentThreadPool = nullptr;
  * The pool is in an uninitialized state after this call. The Setup() method
  * must be called.
  */
-CPLWorkerThreadPool::CPLWorkerThreadPool()
+CPLWorkerThreadPool::CPLWorkerThreadPool() : jobQueue{}
 {
 }
 
+/** Instantiate a new pool of worker threads.
+ *
+ * \param nThreads  Number of threads in the pool.
+ */
+CPLWorkerThreadPool::CPLWorkerThreadPool(int nThreads) : jobQueue{}
+{
+    Setup(nThreads, nullptr, nullptr);
+}
+
 /************************************************************************/
 /*                          ~CPLWorkerThreadPool()                      */
 /************************************************************************/
@@ -86,6 +73,16 @@ CPLWorkerThreadPool::~CPLWorkerThreadPool()
     CPLListDestroy(psWaitingWorkerThreadsList);
 }
 
+/************************************************************************/
+/*                        GetThreadCount()                              */
+/************************************************************************/
+
+int CPLWorkerThreadPool::GetThreadCount() const
+{
+    std::unique_lock<std::mutex> oGuard(m_mutex);
+    return m_nMaxThreads;
+}
+
 /************************************************************************/
 /*                       WorkerThreadFunction()                         */
 /************************************************************************/
@@ -102,15 +99,11 @@ void CPLWorkerThreadPool::WorkerThreadFunction(void *user_data)
 
     while (true)
     {
-        CPLWorkerThreadJob *psJob = poTP->GetNextJob(psWT);
-        if (psJob == nullptr)
+        std::function<void()> task = poTP->GetNextJob(psWT);
+        if (!task)
             break;
 
-        if (psJob->pfnFunc)
-        {
-            psJob->pfnFunc(psJob->pData);
-        }
-        CPLFree(psJob);
+        task();
 #if DEBUG_VERBOSE
         CPLDebug("JOB", "%p finished a job", psWT);
 #endif
@@ -130,7 +123,22 @@ void CPLWorkerThreadPool::WorkerThreadFunction(void *user_data)
  */
 bool CPLWorkerThreadPool::SubmitJob(CPLThreadFunc pfnFunc, void *pData)
 {
-    CPLAssert(m_nMaxThreads > 0);
+    return SubmitJob([=] { pfnFunc(pData); });
+}
+
+/** Queue a new job.
+ *
+ * @param task  Void function to execute.
+ * @return true in case of success.
+ */
+bool CPLWorkerThreadPool::SubmitJob(std::function<void()> task)
+{
+#ifdef DEBUG
+    {
+        std::unique_lock<std::mutex> oGuard(m_mutex);
+        CPLAssert(m_nMaxThreads > 0);
+    }
+#endif
 
     bool bMustIncrementWaitingWorkerThreadsAfterSubmission = false;
     if (threadLocalCurrentThreadPool == this)
@@ -149,39 +157,11 @@ bool CPLWorkerThreadPool::SubmitJob(CPLThreadFunc pfnFunc, void *pData)
         if (!bMustIncrementWaitingWorkerThreadsAfterSubmission)
         {
             // otherwise there is a risk of deadlock, so execute synchronously.
-            pfnFunc(pData);
+            task();
             return true;
         }
     }
 
-    CPLWorkerThreadJob *psJob = static_cast<CPLWorkerThreadJob *>(
-        VSI_MALLOC_VERBOSE(sizeof(CPLWorkerThreadJob)));
-    if (psJob == nullptr)
-    {
-        if (bMustIncrementWaitingWorkerThreadsAfterSubmission)
-        {
-            std::unique_lock<std::mutex> oGuard(m_mutex);
-            nWaitingWorkerThreads++;
-        }
-        return false;
-    }
-    psJob->pfnFunc = pfnFunc;
-    psJob->pData = pData;
-
-    CPLList *psItem =
-        static_cast<CPLList *>(VSI_MALLOC_VERBOSE(sizeof(CPLList)));
-    if (psItem == nullptr)
-    {
-        VSIFree(psJob);
-        if (bMustIncrementWaitingWorkerThreadsAfterSubmission)
-        {
-            std::unique_lock<std::mutex> oGuard(m_mutex);
-            nWaitingWorkerThreads++;
-        }
-        return false;
-    }
-    psItem->pData = psJob;
-
     std::unique_lock<std::mutex> oGuard(m_mutex);
 
     if (bMustIncrementWaitingWorkerThreadsAfterSubmission)
@@ -190,26 +170,25 @@ bool CPLWorkerThreadPool::SubmitJob(CPLThreadFunc pfnFunc, void *pData)
     if (static_cast<int>(aWT.size()) < m_nMaxThreads)
     {
         // CPLDebug("CPL", "Starting new thread...");
-        std::unique_ptr<CPLWorkerThread> wt(new CPLWorkerThread);
-        wt->pfnInitFunc = nullptr;
-        wt->pInitData = nullptr;
+        auto wt = std::make_unique<CPLWorkerThread>();
         wt->poTP = this;
-        wt->bMarkedAsWaiting = false;
+        //ABELL - Why should this fail? And this is a *pool* thread, not necessarily
+        //  tied to the submitted job. The submitted job still needs to run, even if
+        //  this fails. If we can't create a thread, should the entire pool become invalid?
         wt->hThread = CPLCreateJoinableThread(WorkerThreadFunction, wt.get());
-        if (wt->hThread == nullptr)
+        /**
+        if (!wt->hThread)
         {
             VSIFree(psJob);
             VSIFree(psItem);
             return false;
         }
-        else
-        {
+        **/
+        if (wt->hThread)
             aWT.emplace_back(std::move(wt));
-        }
     }
 
-    psItem->psNext = psJobQueue;
-    psJobQueue = psItem;
+    jobQueue.emplace(task);
     nPendingJobs++;
 
     if (psWaitingWorkerThreadsList)
@@ -225,15 +204,13 @@ bool CPLWorkerThreadPool::SubmitJob(CPLThreadFunc pfnFunc, void *pData)
         psWaitingWorkerThreadsList = psNext;
         nWaitingWorkerThreads--;
 
-        // CPLAssert(
-        //   CPLListCount(psWaitingWorkerThreadsList) == nWaitingWorkerThreads);
-
 #if DEBUG_VERBOSE
         CPLDebug("JOB", "Waking up %p", psWorkerThread);
 #endif
 
         {
             std::lock_guard<std::mutex> oGuardWT(psWorkerThread->m_mutex);
+            // coverity[ uninit_use_in_call]
             oGuard.unlock();
             psWorkerThread->m_cv.notify_one();
         }
@@ -257,33 +234,33 @@ bool CPLWorkerThreadPool::SubmitJob(CPLThreadFunc pfnFunc, void *pData)
 bool CPLWorkerThreadPool::SubmitJobs(CPLThreadFunc pfnFunc,
                                      const std::vector<void *> &apData)
 {
-    CPLAssert(m_nMaxThreads > 0);
+    if (apData.empty())
+        return false;
+
+#ifdef DEBUG
+    {
+        std::unique_lock<std::mutex> oGuard(m_mutex);
+        CPLAssert(m_nMaxThreads > 0);
+    }
+#endif
 
     if (threadLocalCurrentThreadPool == this)
     {
         // If SubmitJob() is called from a worker thread of this queue,
         // then synchronously run the task to avoid deadlock.
-        for (size_t i = 0; i < apData.size(); i++)
-        {
-            pfnFunc(apData[i]);
-        }
+        for (void *pData : apData)
+            pfnFunc(pData);
         return true;
     }
 
     std::unique_lock<std::mutex> oGuard(m_mutex);
 
-    CPLList *psJobQueueInit = psJobQueue;
-    bool bRet = true;
-
-    for (size_t i = 0; i < apData.size(); i++)
+    for (void *pData : apData)
     {
         if (static_cast<int>(aWT.size()) < m_nMaxThreads)
         {
             std::unique_ptr<CPLWorkerThread> wt(new CPLWorkerThread);
-            wt->pfnInitFunc = nullptr;
-            wt->pInitData = nullptr;
             wt->poTP = this;
-            wt->bMarkedAsWaiting = false;
             wt->hThread =
                 CPLCreateJoinableThread(WorkerThreadFunction, wt.get());
             if (wt->hThread == nullptr)
@@ -297,47 +274,13 @@ bool CPLWorkerThreadPool::SubmitJobs(CPLThreadFunc pfnFunc,
             }
         }
 
-        CPLWorkerThreadJob *psJob = static_cast<CPLWorkerThreadJob *>(
-            VSI_MALLOC_VERBOSE(sizeof(CPLWorkerThreadJob)));
-        if (psJob == nullptr)
-        {
-            bRet = false;
-            break;
-        }
-        psJob->pfnFunc = pfnFunc;
-        psJob->pData = apData[i];
-
-        CPLList *psItem =
-            static_cast<CPLList *>(VSI_MALLOC_VERBOSE(sizeof(CPLList)));
-        if (psItem == nullptr)
-        {
-            VSIFree(psJob);
-            bRet = false;
-            break;
-        }
-        psItem->pData = psJob;
-
-        psItem->psNext = psJobQueue;
-        psJobQueue = psItem;
+        jobQueue.emplace([=] { pfnFunc(pData); });
         nPendingJobs++;
     }
 
-    if (!bRet)
-    {
-        for (CPLList *psIter = psJobQueue; psIter != psJobQueueInit;)
-        {
-            CPLList *psNext = psIter->psNext;
-            VSIFree(psIter->pData);
-            VSIFree(psIter);
-            nPendingJobs--;
-            psIter = psNext;
-        }
-        return false;
-    }
-
     for (size_t i = 0; i < apData.size(); i++)
     {
-        if (psWaitingWorkerThreadsList && psJobQueue)
+        if (psWaitingWorkerThreadsList)
         {
             CPLWorkerThread *psWorkerThread;
 
@@ -352,15 +295,12 @@ bool CPLWorkerThreadPool::SubmitJobs(CPLThreadFunc pfnFunc,
             psWaitingWorkerThreadsList = psNext;
             nWaitingWorkerThreads--;
 
-            // CPLAssert(
-            //    CPLListCount(psWaitingWorkerThreadsList) ==
-            //    nWaitingWorkerThreads);
-
 #if DEBUG_VERBOSE
             CPLDebug("JOB", "Waking up %p", psWorkerThread);
 #endif
             {
                 std::lock_guard<std::mutex> oGuardWT(psWorkerThread->m_mutex);
+                // coverity[ uninit_use_in_call]
                 oGuard.unlock();
                 psWorkerThread->m_cv.notify_one();
             }
@@ -392,10 +332,8 @@ void CPLWorkerThreadPool::WaitCompletion(int nMaxRemainingJobs)
     if (nMaxRemainingJobs < 0)
         nMaxRemainingJobs = 0;
     std::unique_lock<std::mutex> oGuard(m_mutex);
-    while (nPendingJobs > nMaxRemainingJobs)
-    {
-        m_cv.wait(oGuard);
-    }
+    m_cv.wait(oGuard, [this, nMaxRemainingJobs]
+              { return nPendingJobs <= nMaxRemainingJobs; });
 }
 
 /************************************************************************/
@@ -406,21 +344,15 @@ void CPLWorkerThreadPool::WaitCompletion(int nMaxRemainingJobs)
  */
 void CPLWorkerThreadPool::WaitEvent()
 {
+    // NOTE - This isn't quite right. After nPendingJobsBefore is set but before
+    // a notification occurs, jobs could be submitted which would increase
+    // nPendingJobs, so a job completion may looks like a spurious wakeup.
     std::unique_lock<std::mutex> oGuard(m_mutex);
-    while (true)
-    {
-        const int nPendingJobsBefore = nPendingJobs;
-        if (nPendingJobsBefore == 0)
-        {
-            break;
-        }
-        m_cv.wait(oGuard);
-        // cppcheck-suppress knownConditionTrueFalse
-        if (nPendingJobs < nPendingJobsBefore)
-        {
-            break;
-        }
-    }
+    if (nPendingJobs == 0)
+        return;
+    const int nPendingJobsBefore = nPendingJobs;
+    m_cv.wait(oGuard, [this, nPendingJobsBefore]
+              { return nPendingJobs < nPendingJobsBefore; });
 }
 
 /************************************************************************/
@@ -467,11 +399,10 @@ bool CPLWorkerThreadPool::Setup(int nThreads, CPLThreadFunc pfnInitFunc,
     bool bRet = true;
     for (int i = static_cast<int>(aWT.size()); i < nThreads; i++)
     {
-        std::unique_ptr<CPLWorkerThread> wt(new CPLWorkerThread);
+        auto wt = std::make_unique<CPLWorkerThread>();
         wt->pfnInitFunc = pfnInitFunc;
         wt->pInitData = pasInitData ? pasInitData[i] : nullptr;
         wt->poTP = this;
-        wt->bMarkedAsWaiting = false;
         wt->hThread = CPLCreateJoinableThread(WorkerThreadFunction, wt.get());
         if (wt->hThread == nullptr)
         {
@@ -519,28 +450,23 @@ void CPLWorkerThreadPool::DeclareJobFinished()
 /*                             GetNextJob()                             */
 /************************************************************************/
 
-CPLWorkerThreadJob *
+std::function<void()>
 CPLWorkerThreadPool::GetNextJob(CPLWorkerThread *psWorkerThread)
 {
     while (true)
     {
         std::unique_lock<std::mutex> oGuard(m_mutex);
         if (eState == CPLWTS_STOP)
-        {
-            return nullptr;
-        }
-        CPLList *psTopJobIter = psJobQueue;
-        if (psTopJobIter)
-        {
-            psJobQueue = psTopJobIter->psNext;
+            return std::function<void()>();
 
+        if (jobQueue.size())
+        {
 #if DEBUG_VERBOSE
             CPLDebug("JOB", "%p got a job", psWorkerThread);
 #endif
-            CPLWorkerThreadJob *psJob =
-                static_cast<CPLWorkerThreadJob *>(psTopJobIter->pData);
-            CPLFree(psTopJobIter);
-            return psJob;
+            auto task = std::move(jobQueue.front());
+            jobQueue.pop();
+            return task;
         }
 
         if (!psWorkerThread->bMarkedAsWaiting)
@@ -575,6 +501,7 @@ CPLWorkerThreadPool::GetNextJob(CPLWorkerThread *psWorkerThread)
 #endif
 
         std::unique_lock<std::mutex> oGuardThisThread(psWorkerThread->m_mutex);
+        // coverity[uninit_use_in_call]
         oGuard.unlock();
         psWorkerThread->m_cv.wait(oGuardThisThread);
     }
@@ -616,29 +543,6 @@ CPLJobQueue::~CPLJobQueue()
     WaitCompletion();
 }
 
-/************************************************************************/
-/*                           JobQueueJob                                */
-/************************************************************************/
-
-struct JobQueueJob
-{
-    CPLJobQueue *poQueue = nullptr;
-    CPLThreadFunc pfnFunc = nullptr;
-    void *pData = nullptr;
-};
-
-/************************************************************************/
-/*                          JobQueueFunction()                          */
-/************************************************************************/
-
-void CPLJobQueue::JobQueueFunction(void *pData)
-{
-    JobQueueJob *poJob = static_cast<JobQueueJob *>(pData);
-    poJob->pfnFunc(poJob->pData);
-    poJob->poQueue->DeclareJobFinished();
-    delete poJob;
-}
-
 /************************************************************************/
 /*                          DeclareJobFinished()                        */
 /************************************************************************/
@@ -662,20 +566,29 @@ void CPLJobQueue::DeclareJobFinished()
  */
 bool CPLJobQueue::SubmitJob(CPLThreadFunc pfnFunc, void *pData)
 {
-    JobQueueJob *poJob = new JobQueueJob;
-    poJob->poQueue = this;
-    poJob->pfnFunc = pfnFunc;
-    poJob->pData = pData;
+    return SubmitJob([=] { pfnFunc(pData); });
+}
+
+/** Queue a new job.
+ *
+ * @param task  Task to execute.
+ * @return true in case of success.
+ */
+bool CPLJobQueue::SubmitJob(std::function<void()> task)
+{
     {
         std::lock_guard<std::mutex> oGuard(m_mutex);
         m_nPendingJobs++;
     }
-    bool bRet = m_poPool->SubmitJob(JobQueueFunction, poJob);
-    if (!bRet)
-    {
-        delete poJob;
-    }
-    return bRet;
+
+    // cppcheck-suppress knownConditionTrueFalse
+    // coverity[uninit_member,copy_constructor_call]
+    return m_poPool->SubmitJob(
+        [this, task]
+        {
+            task();
+            DeclareJobFinished();
+        });
 }
 
 /************************************************************************/
@@ -691,9 +604,29 @@ bool CPLJobQueue::SubmitJob(CPLThreadFunc pfnFunc, void *pData)
 void CPLJobQueue::WaitCompletion(int nMaxRemainingJobs)
 {
     std::unique_lock<std::mutex> oGuard(m_mutex);
-    // coverity[missing_lock:FALSE]
-    while (m_nPendingJobs > nMaxRemainingJobs)
-    {
-        m_cv.wait(oGuard);
-    }
+    m_cv.wait(oGuard, [this, nMaxRemainingJobs]
+              { return m_nPendingJobs <= nMaxRemainingJobs; });
+}
+
+/************************************************************************/
+/*                             WaitEvent()                              */
+/************************************************************************/
+
+/** Wait for completion for at least one job.
+ *
+ * @return true if there are remaining jobs.
+ */
+bool CPLJobQueue::WaitEvent()
+{
+    // NOTE - This isn't quite right. After nPendingJobsBefore is set but before
+    // a notification occurs, jobs could be submitted which would increase
+    // nPendingJobs, so a job completion may looks like a spurious wakeup.
+    std::unique_lock<std::mutex> oGuard(m_mutex);
+    if (m_nPendingJobs == 0)
+        return false;
+
+    const int nPendingJobsBefore = m_nPendingJobs;
+    m_cv.wait(oGuard, [this, nPendingJobsBefore]
+              { return m_nPendingJobs < nPendingJobsBefore; });
+    return m_nPendingJobs > 0;
 }
diff --git a/port/cpl_worker_thread_pool.h b/port/cpl_worker_thread_pool.h
index a6a0519220f2..3f0be7acf742 100644
--- a/port/cpl_worker_thread_pool.h
+++ b/port/cpl_worker_thread_pool.h
@@ -8,23 +8,7 @@
  **********************************************************************
  * Copyright (c) 2015, Even Rouault, <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_WORKER_THREAD_POOL_H_INCLUDED_
@@ -34,8 +18,10 @@
 #include "cpl_list.h"
 
 #include <condition_variable>
+#include <functional>
 #include <memory>
 #include <mutex>
+#include <queue>
 #include <vector>
 
 /**
@@ -46,7 +32,6 @@
  */
 
 #ifndef DOXYGEN_SKIP
-struct CPLWorkerThreadJob;
 class CPLWorkerThreadPool;
 
 struct CPLWorkerThread
@@ -73,6 +58,8 @@ typedef enum
 #endif  // ndef DOXYGEN_SKIP
 
 class CPLJobQueue;
+/// Unique pointer to a job queue.
+using CPLJobQueuePtr = std::unique_ptr<CPLJobQueue>;
 
 /** Pool of worker threads */
 class CPL_DLL CPLWorkerThreadPool
@@ -80,10 +67,10 @@ class CPL_DLL CPLWorkerThreadPool
     CPL_DISALLOW_COPY_ASSIGN(CPLWorkerThreadPool)
 
     std::vector<std::unique_ptr<CPLWorkerThread>> aWT{};
-    std::mutex m_mutex{};
+    mutable std::mutex m_mutex{};
     std::condition_variable m_cv{};
     volatile CPLWorkerThreadState eState = CPLWTS_OK;
-    CPLList *psJobQueue = nullptr;
+    std::queue<std::function<void()>> jobQueue;
     int nPendingJobs = 0;
 
     CPLList *psWaitingWorkerThreadsList = nullptr;
@@ -94,28 +81,27 @@ class CPL_DLL CPLWorkerThreadPool
     static void WorkerThreadFunction(void *user_data);
 
     void DeclareJobFinished();
-    CPLWorkerThreadJob *GetNextJob(CPLWorkerThread *psWorkerThread);
+    std::function<void()> GetNextJob(CPLWorkerThread *psWorkerThread);
 
   public:
     CPLWorkerThreadPool();
+    explicit CPLWorkerThreadPool(int nThreads);
     ~CPLWorkerThreadPool();
 
     bool Setup(int nThreads, CPLThreadFunc pfnInitFunc, void **pasInitData);
     bool Setup(int nThreads, CPLThreadFunc pfnInitFunc, void **pasInitData,
                bool bWaitallStarted);
 
-    std::unique_ptr<CPLJobQueue> CreateJobQueue();
+    CPLJobQueuePtr CreateJobQueue();
 
+    bool SubmitJob(std::function<void()> task);
     bool SubmitJob(CPLThreadFunc pfnFunc, void *pData);
     bool SubmitJobs(CPLThreadFunc pfnFunc, const std::vector<void *> &apData);
     void WaitCompletion(int nMaxRemainingJobs = 0);
     void WaitEvent();
 
     /** Return the number of threads setup */
-    int GetThreadCount() const
-    {
-        return m_nMaxThreads;
-    }
+    int GetThreadCount() const;
 };
 
 /** Job queue */
@@ -127,7 +113,6 @@ class CPL_DLL CPLJobQueue
     std::condition_variable m_cv{};
     int m_nPendingJobs = 0;
 
-    static void JobQueueFunction(void *);
     void DeclareJobFinished();
 
     //! @cond Doxygen_Suppress
@@ -146,7 +131,9 @@ class CPL_DLL CPLJobQueue
     }
 
     bool SubmitJob(CPLThreadFunc pfnFunc, void *pData);
+    bool SubmitJob(std::function<void()> task);
     void WaitCompletion(int nMaxRemainingJobs = 0);
+    bool WaitEvent();
 };
 
 #endif  // CPL_WORKER_THREAD_POOL_H_INCLUDED_
diff --git a/port/cpl_xml_validate.cpp b/port/cpl_xml_validate.cpp
index fbdca7b3658b..56024e8e656c 100644
--- a/port/cpl_xml_validate.cpp
+++ b/port/cpl_xml_validate.cpp
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 2012-2014, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/port/cpl_zlib_header.h b/port/cpl_zlib_header.h
index a2d9eca96a5b..3062fe910403 100644
--- a/port/cpl_zlib_header.h
+++ b/port/cpl_zlib_header.h
@@ -7,23 +7,7 @@
  ******************************************************************************
  * Copyright (c) 201, Even Rouault <even dot rouault at spatialys dot 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef CPL_ZLIB_HEADER_H
diff --git a/port/cplgetsymbol.cpp b/port/cplgetsymbol.cpp
index 50652484d230..ad37a72bb556 100644
--- a/port/cplgetsymbol.cpp
+++ b/port/cplgetsymbol.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/port/cplkeywordparser.cpp b/port/cplkeywordparser.cpp
index fed39a0dc404..e9602897543e 100644
--- a/port/cplkeywordparser.cpp
+++ b/port/cplkeywordparser.cpp
@@ -11,23 +11,7 @@
  * Copyright (c) 2008, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2009-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 //! @cond Doxygen_Suppress
@@ -247,7 +231,7 @@ bool CPLKeywordParser::ReadPair(CPLString &osName, CPLString &osValue)
                 osTxt.resize(nSemiColonPos);
                 osValue = osTxt;
                 while (!osValue.empty() && osValue.back() == ' ')
-                    osValue.resize(osValue.size() - 1);
+                    osValue.pop_back();
                 return true;
             }
         }
diff --git a/port/cplkeywordparser.h b/port/cplkeywordparser.h
index da9a0fcb2eb6..82ee553c6a37 100644
--- a/port/cplkeywordparser.h
+++ b/port/cplkeywordparser.h
@@ -11,23 +11,7 @@
  ******************************************************************************
  * Copyright (c) 2008, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef CPL_KEYWORD_PARSER
diff --git a/port/cplstring.cpp b/port/cplstring.cpp
index 17bfe4174759..5dabb7b9059b 100644
--- a/port/cplstring.cpp
+++ b/port/cplstring.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
diff --git a/port/cplstringlist.cpp b/port/cplstringlist.cpp
index 8e92d3af7f75..cf8789be9ce6 100644
--- a/port/cplstringlist.cpp
+++ b/port/cplstringlist.cpp
@@ -8,23 +8,7 @@
  * Copyright (c) 2011, Frank Warmerdam <warmerdam@pobox.com>
  * Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #include "cpl_port.h"
@@ -653,6 +637,7 @@ char **CPLStringList::StealList()
     return papszRetList;
 }
 
+/* Case insensitive comparison function */
 static int CPLCompareKeyValueString(const char *pszKVa, const char *pszKVb)
 {
     const char *pszItera = pszKVa;
@@ -685,19 +670,6 @@ static int CPLCompareKeyValueString(const char *pszKVa, const char *pszKVb)
     }
 }
 
-/************************************************************************/
-/*                            llCompareStr()                            */
-/*                                                                      */
-/*      Note this is case insensitive!  This is because we normally     */
-/*      treat key value keywords as case insensitive.                   */
-/************************************************************************/
-static int llCompareStr(const void *a, const void *b)
-{
-    return CPLCompareKeyValueString(
-        *static_cast<const char **>(const_cast<void *>(a)),
-        *static_cast<const char **>(const_cast<void *>(b)));
-}
-
 /************************************************************************/
 /*                                Sort()                                */
 /************************************************************************/
@@ -721,8 +693,12 @@ CPLStringList &CPLStringList::Sort()
     if (!MakeOurOwnCopy())
         return *this;
 
-    if (nCount)
-        qsort(papszList, nCount, sizeof(char *), llCompareStr);
+    if (nCount > 1)
+    {
+        std::sort(papszList, papszList + nCount,
+                  [](const char *a, const char *b)
+                  { return CPLCompareKeyValueString(a, b) < 0; });
+    }
     bIsSorted = true;
 
     return *this;
diff --git a/port/gdal_csv.h b/port/gdal_csv.h
index d3cc5fb4b23f..32f302e38d59 100644
--- a/port/gdal_csv.h
+++ b/port/gdal_csv.h
@@ -10,23 +10,7 @@
  * Copyright (c) 1999, Frank Warmerdam
  * Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 #ifndef GDAL_CSV_H_INCLUDED
diff --git a/port/vsipreload.cpp b/port/vsipreload.cpp
index 52b668dbad79..1e8294678a32 100644
--- a/port/vsipreload.cpp
+++ b/port/vsipreload.cpp
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 // WARNING: Linux glibc ONLY
@@ -1082,13 +1066,12 @@ static int myopen(const char *path, int flags, ...)
             CPLFormFilename(osCurDir.c_str(), path, nullptr));
         if (strchr(osCurDir.c_str(), '/') != nullptr && strcmp(path, "..") == 0)
         {
-            char *lastslash = strrchr(newname, '/');
-            if (lastslash != nullptr)
+            for (int i = 0; i < 2; ++i)
             {
+                char *lastslash = strrchr(newname, '/');
+                if (!lastslash)
+                    break;
                 *lastslash = 0;
-                lastslash = strrchr(newname, '/');
-                if (lastslash != nullptr)
-                    *lastslash = 0;
             }
         }
         if (VSIStatL(newname, &sStatBufL) == 0 && S_ISDIR(sStatBufL.st_mode))
@@ -1152,13 +1135,12 @@ int CPL_DLL open64(const char *path, int flags, ...)
             CPLFormFilename(osCurDir.c_str(), path, nullptr));
         if (strchr(osCurDir.c_str(), '/') != nullptr && strcmp(path, "..") == 0)
         {
-            char *lastslash = strrchr(newname, '/');
-            if (lastslash != nullptr)
+            for (int i = 0; i < 2; ++i)
             {
+                char *lastslash = strrchr(newname, '/');
+                if (!lastslash)
+                    break;
                 *lastslash = 0;
-                lastslash = strrchr(newname, '/');
-                if (lastslash != nullptr)
-                    *lastslash = 0;
             }
         }
         if (VSIStatL(newname, &sStatBufL) == 0 && S_ISDIR(sStatBufL.st_mode))
diff --git a/scripts/binaries_allow_list.csv b/scripts/binaries_allow_list.csv
new file mode 100644
index 000000000000..8bc1e138e5ea
--- /dev/null
+++ b/scripts/binaries_allow_list.csv
@@ -0,0 +1,20 @@
+filename,sha256sum
+"swig/java/test_data/poly.shp",0785601f2dfa49ab2c50c6c13806fb95ce9c4c58c0182273850e066799b1c344
+"swig/java/test_data/byte.tif",59ed6e9dd19291bbdc230092ab7f6bc46fb0537ee4c9eec15dd58021cd9c12be
+"swig/java/test_data/poly.shx",ac735bd4487f979081d723ec6611861dc90aab3560d170963ac3c5a886594ea2
+"swig/java/test_data/poly.dbf",19a2f2d8ff31e21df0cb5eb7afb0512760f1a01070f67b0f78dfc748ab264dfb
+"swig/csharp/gdal.snk",93bc052177485a64850ebe7d126ba741a8b5d0b57e6c6ea08f8ae86d4827e5a7
+"ogr/ogrsf_frmts/miramon/data/MM_m_idofic.csv",69c57dbb95e172744e3c236bbe732e97105a029678e7011df67ce31a85b29604
+"ogr/ogrsf_frmts/sxf/data/default.rsc",9e1c9d7081d52775e750d4155d49255252b04ca81fef27cb2997675d3cd9626b
+"ogr/ogrsf_frmts/dgn/data/seed_3d.dgn",97c2f00ee6ea96873b7d16e5e898b4850e3d35448299d7d9d37e7d1792b56896
+"ogr/ogrsf_frmts/dgn/data/seed_2d.dgn",dd8465f18569d9289809e9e0962115d365d0a56de021393952a5e7a0a20b527c
+"resources/gdal2tiles/opacity-slider.png",f747e7f6a0e0ccb5d5209deb67511035a3fab98aa7394fa703e19243ee97d679
+"resources/gdal2tiles/none.png",f1bc566c46d73b7cc6f25957c308abbad7af113c69c40af7001115f1a40d96b5
+"frmts/jpipkak/components.PNG",41da97dfa2b78e8e3e2b8cf4379e5794a6a4a8ec1c4bab884a3981a94c7ffc7c
+"frmts/jpipkak/jpipsequence.PNG",bd3e07fc7d450b01fa5af23905d74cfc427c0faf86f109d2a2cbbc145eebc9ed
+"frmts/jpipkak/gdalsequence.PNG",b811e2529f8d4076e6e854d4a900b9b65e6b744e9dc9d95e02107932a47e646a
+"data/GDALLogoGS.svg",1ae6e2d92e6b0439f3baee0cb55dad8b97abfb4fcc58c9189b23b63c818aeeca
+"data/GDALLogoBW.svg",aac9dab33d479e0b832b8bd7c9e5510dcbef34a7c6cc9aea96bbe2aab5161c53
+"data/gdalicon.png",d90f50a8f74c325086c867bf006a92266c259a270d9166b2f41f586b67755729
+"data/GDALLogoColor.svg",2c102a31c6e9116aa9b98787d8bf5cf648dbcc2b930aee653cd35df65ed118d0
+"docker/ubuntu-full/tiledb-cmake-ccache.patch",c1ad2776c1599060613fad9ca784ce140ea7ef795b612d55b7472f0e4e053ad2
diff --git a/scripts/check_binaries.py b/scripts/check_binaries.py
new file mode 100755
index 000000000000..c04fe1cd1096
--- /dev/null
+++ b/scripts/check_binaries.py
@@ -0,0 +1,71 @@
+#!/usr/bin/env python3
+
+"""This file checks that the root directory does not contain an unexpected binary file"""
+
+import csv
+import os
+import subprocess
+import sys
+
+this_dir = os.path.dirname(__file__)
+if not os.path.isabs(this_dir):
+    this_dir = os.path.join(os.getcwd(), this_dir)
+this_dir = os.path.abspath(this_dir)
+root_dir = os.path.dirname(this_dir)
+
+binaries_allow_list = {}
+with open(
+    os.path.join(this_dir, "binaries_allow_list.csv"), newline="", encoding="utf-8"
+) as f:
+    reader = csv.DictReader(f)
+    assert reader.fieldnames == ["filename", "sha256sum"]
+    for row in reader:
+        binaries_allow_list[row["filename"]] = row["sha256sum"]
+
+error_code = 0
+
+for dirname in os.listdir(root_dir):
+    # We skip doc and autotest as they are not included in the GDAL source tarball
+    if dirname not in ("doc", "autotest", ".git"):
+        p = subprocess.Popen(
+            [
+                "find",
+                os.path.join(root_dir, dirname),
+                "-type",
+                "f",
+                "-exec",
+                "file",
+                "{}",
+                ";",
+            ],
+            stdout=subprocess.PIPE,
+        )
+        out, _ = p.communicate()
+        for line in out.decode("utf-8").split("\n"):
+            if not line:
+                continue
+            tokens = line.split(":")
+            filename = tokens[0]
+            kind = ":".join(tokens[1:]).strip()
+            if (
+                "text" not in kind
+                and "AutoCAD" not in kind
+                and kind not in ("empty", "JSON data")
+            ):
+                p = subprocess.Popen(["sha256sum", filename], stdout=subprocess.PIPE)
+                sha256sum, _ = p.communicate()
+                sha256sum = sha256sum.decode("utf-8").split("  ")[0]
+
+                rel_filename = filename[len(root_dir) + 1 :]
+                if rel_filename not in binaries_allow_list:
+                    error_code = 1
+                    print(
+                        f'Found unknown binary file {rel_filename} of kind "{kind}". If it is legit, add the following line in scripts/binaries_allow_list.csv:\n"{rel_filename}",{sha256sum}'
+                    )
+                elif binaries_allow_list[rel_filename] != sha256sum:
+                    error_code = 1
+                    print(
+                        f'Binary file {rel_filename} has a different sha256sum than expected. If it is legit, update the following line in scripts/binaries_allow_list.csv:\n"{rel_filename}",{sha256sum}'
+                    )
+
+sys.exit(error_code)
diff --git a/scripts/cppcheck.sh b/scripts/cppcheck.sh
index 43cc9518cd05..ef7eb728a714 100755
--- a/scripts/cppcheck.sh
+++ b/scripts/cppcheck.sh
@@ -60,6 +60,7 @@ for dirname in alg port gcore ogr frmts gnm apps fuzzers; do
         -DGBool=int -DCPL_HAS_GINT64=1 -DHAVE_GEOS -DHAVE_EXPAT -DHAVE_XERCES -DCOMPILATION_ALLOWED \
         -DHAVE_SFCGAL -DHAVE_SPATIALITE -DSPATIALITE_412_OR_LATER \
         -D_SC_NPROCESSORS_ONLN -DHAVE_SCHED_GETAFFINITY \
+        -DHAVE_TIFF -DHAVE_GEOTIFF \
         -DHAVE_SQLITE -DSQLITE_VERSION_NUMBER=3031001 -DHAVE_SQLITE_VFS \
         -DHAVE_RASTERLITE2 \
         -DHAVE_CURL -DLIBCURL_VERSION_NUM=0x073800 \
@@ -111,6 +112,9 @@ for dirname in alg port gcore ogr frmts gnm apps fuzzers; do
         -DGNMGFIDFormat="\"%lld\"" \
         -DGDAL_RELEASE_NAME="\"dummy\"" \
         "-DBANDMAP_TYPE=int*" \
+        -DSQLITE_UTF8=1 \
+        -DSQLITE_DETERMINISTIC=0x000000800 \
+        -DSQLITE_INNOCUOUS=0x000200000 \
         --include="${CPL_CONFIG_H}" \
         --include=port/cpl_port.h \
         -I "${CPL_CONFIG_H_DIR}" \
@@ -120,6 +124,8 @@ for dirname in alg port gcore ogr frmts gnm apps fuzzers; do
         -i ogrdissolve.cpp \
         -i gdalasyncread.cpp \
         -i gdaltorture.cpp \
+        -i vsifilesystemregistrar.cpp \
+        -i external_deferred_plugins.cpp \
         $dirname \
         -j "$(nproc)" >>${LOG_FILE} 2>&1 &
     # Display some progress to avoid Travis-CI killing the job after 10 minutes
@@ -168,6 +174,16 @@ mv ${LOG_FILE}.tmp ${LOG_FILE}
 grep -v -e "duplInheritedMember" ${LOG_FILE} > ${LOG_FILE}.tmp
 mv ${LOG_FILE}.tmp ${LOG_FILE}
 
+# Ignore stlIfStrFind warning "Inefficient usage of string::find() in condition; string::starts_with() could be faster" (requires C++20)
+grep -v -e "stlIfStrFind" ${LOG_FILE} > ${LOG_FILE}.tmp
+mv ${LOG_FILE}.tmp ${LOG_FILE}
+
+# False positive in swq_parser.cpp
+grep -v -e "The expression '0 <= yystate' is always true" ${LOG_FILE} > ${LOG_FILE}.tmp
+mv ${LOG_FILE}.tmp ${LOG_FILE}
+grep -v -e "The comparison '0 <= yystate' is always true" ${LOG_FILE} > ${LOG_FILE}.tmp
+mv ${LOG_FILE}.tmp ${LOG_FILE}
+
 if grep "null pointer" ${LOG_FILE} ; then
     echo "Null pointer check failed"
     ret_code=1
diff --git a/scripts/detect_missing_include.sh b/scripts/detect_missing_include.sh
index 74d9e03e2796..e9d3b2da0f0a 100755
--- a/scripts/detect_missing_include.sh
+++ b/scripts/detect_missing_include.sh
@@ -63,6 +63,20 @@ else
     echo "OK."
 fi
 
+echo "Checking for missing #include <cmath> statements..."
+rm -f /tmp/missing_include.txt
+while read -r i; do
+   grep -e std::isnan -e std::isinf -e std::isfinite $i >/dev/null && (grep "#include <cmath>" $i >/dev/null || echo $i) | tee -a /tmp/missing_include.txt;
+done < /tmp/gdal_list_files.txt
+
+
+if test -s /tmp/missing_include.txt; then
+    echo "FAIL: missing #include <cmath> in above listed files"
+    ret_code=1
+else
+    echo "OK."
+fi
+
 rm -f /tmp/missing_include.txt
 rm -f /tmp/gdal_list_files.txt
 
diff --git a/scripts/fix_typos.sh b/scripts/fix_typos.sh
index f52f92c9c00e..a5d4de88d846 100755
--- a/scripts/fix_typos.sh
+++ b/scripts/fix_typos.sh
@@ -76,6 +76,7 @@ EXCLUDED_FILES="$EXCLUDED_FILES,*/internal_libqhull/*,*/zlib/*,*/libjpeg/*,*/lib
 EXCLUDED_FILES="$EXCLUDED_FILES,./cmake/modules/CMakeCheckCompilerFlagCommonPatterns.cmake"
 EXCLUDED_FILES="$EXCLUDED_FILES,./cmake/modules/Copyright.txt"
 EXCLUDED_FILES="$EXCLUDED_FILES,*/sqlite_rtree_bulk_load/*"
+EXCLUDED_FILES="$EXCLUDED_FILES,*/spelling_wordlist.txt"
 AUTHORIZED_LIST="poSession,FIDN,TRAFIC,HTINK,repID,oCurr,INTREST,oPosition"
 AUTHORIZED_LIST="$AUTHORIZED_LIST,CPL_SUPRESS_CPLUSPLUS,SRP_NAM,ADRG_NAM,'SRP_NAM,AuxilaryTarget"
 # IRIS driver metadata item names: FIXME ?
@@ -127,6 +128,8 @@ AUTHORIZED_LIST="$AUTHORIZED_LIST,CURLE_FILE_COULDNT_READ_FILE"
 AUTHORIZED_LIST="$AUTHORIZED_LIST,nParms,ProjParm,ProjParmId,GTIFFetchProjParms,gdal_GTIFFetchProjParms" # API of libgeotiff
 AUTHORIZED_LIST="$AUTHORIZED_LIST,lon,Lon,LON"
 AUTHORIZED_LIST="$AUTHORIZED_LIST,MM_MARCA_VERSIO_1_DBF_ESTESA,MM_PERIMETRE_INIT_SIZE,MM_PERIMETRE_DECIMALS_SIZE,szMMNomCampPerimetreDefecte,MM_CAMP_ES_PERIMETRE,szMMNomCampNPoligonsDefecte,MM_CAMP_MOSTRABLE_QUAN_TE_CONTINGUT,MM_CAMP_ES_PERIMETRE_3D,SECTION_VERSIO"
+AUTHORIZED_LIST="$AUTHORIZED_LIST,oTe"
+AUTHORIZED_LIST="$AUTHORIZED_LIST,ADJ_PARM,NUM_ADJ_PARM,ADJ_PARM_ID,UE_FLAG"
 
 python3 fix_typos/codespell/codespell.py -w -i 3 -q 2 -S "$EXCLUDED_FILES,./autotest/*,./build*/*" \
     -x scripts/typos_allowlist.txt --words-white-list=$AUTHORIZED_LIST \
diff --git a/scripts/gdal-bash-completion.sh b/scripts/gdal-bash-completion.sh
index 5756a8fe2c39..6bc208bcbd02 100644
--- a/scripts/gdal-bash-completion.sh
+++ b/scripts/gdal-bash-completion.sh
@@ -160,7 +160,7 @@ _gdal_contour()
   _get_comp_words_by_ref cur prev
   case "$cur" in
     -*)
-      key_list="--help --long-usage --help-general -b -a -amin -amax -3d -inodata -snodata -of -dsco -lco -i -fl -e -off -nln -p --quiet --version --build --license --formats --format --optfile --config --debug --pause --locale "
+      key_list="--help --long-usage --help-general -b -a -amin -amax -3d -inodata -snodata -of -dsco -lco -i -e -fl -off -nln -p -gt --quiet --version --build --license --formats --format --optfile --config --debug --pause --locale "
       mapfile -t COMPREPLY < <(compgen -W "$key_list" -- "$cur")
       return 0
       ;;
@@ -186,17 +186,13 @@ _gdaldem()
   _get_comp_words_by_ref cur prev
   case "$cur" in
     -*)
-      key_list="--help --help-general -z -s -az -alt -alg -combined -compute_edges -b -of -co -q -p -trigonometric -zero_for_flat -alpha -exact_color_entry --version --build --license --formats --format --optfile --config --debug --pause --locale "
+      key_list="--help --long-usage --help-general --version --build --license --formats --format --optfile --config --debug --pause --locale "
       mapfile -t COMPREPLY < <(compgen -W "$key_list" -- "$cur")
       return 0
       ;;
   esac
   tool=${COMP_WORDS[0]}
   case "$prev" in
-    -of)
-      key_list="$( $tool --formats | tail -n +2 | cut -f 3 -d ' ')"
-      mapfile -t COMPREPLY < <(compgen -W "$key_list" -- "$cur")
-      ;;
     --format)
       key_list="$( $tool --formats | tail -n +2 | cut -f 3 -d ' ')"
       mapfile -t COMPREPLY < <(compgen -W "$key_list" -- "$cur")
@@ -320,7 +316,7 @@ _gdalinfo()
   _get_comp_words_by_ref cur prev
   case "$cur" in
     -*)
-      key_list="--help --long-usage --help-general -json -mm -stats -approx_stats -hist -nogcp -nomd -norat -noct -nofl -checksum -listmdd -proj4 -wkt_format -sd -oo -if -mdd --version --build --license --formats --format --optfile --config --debug --pause --locale "
+      key_list="--help --long-usage --help-general -json -mm -stats -approx_stats -hist -nogcp -nomd -norat -noct -nofl -nonodata -nomask -checksum -listmdd -proj4 -wkt_format -sd -oo -if -mdd --version --build --license --formats --format --optfile --config --debug --pause --locale "
       mapfile -t COMPREPLY < <(compgen -W "$key_list" -- "$cur")
       return 0
       ;;
@@ -342,7 +338,7 @@ _gdallocationinfo()
   _get_comp_words_by_ref cur prev
   case "$cur" in
     -*)
-      key_list="--help --long-usage --help-general -xml -lifonly -valonly -E -field_sep -ignore_extra_input -b -overview -l_srs -geoloc -wgs84 -oo --version --build --license --formats --format --optfile --config --debug --pause --locale "
+      key_list="--help --long-usage --help-general -xml -lifonly -valonly -E -field_sep -ignore_extra_input -b -overview -r -l_srs -geoloc -wgs84 -oo --version --build --license --formats --format --optfile --config --debug --pause --locale "
       mapfile -t COMPREPLY < <(compgen -W "$key_list" -- "$cur")
       return 0
       ;;
@@ -364,17 +360,13 @@ _gdalmanage()
   _get_comp_words_by_ref cur prev
   case "$cur" in
     -*)
-      key_list="--help --help-general -r -fr -u -f --version --build --license --formats --format --optfile --config --debug --pause --locale "
+      key_list="--help --long-usage --help-general --version --build --license --formats --format --optfile --config --debug --pause --locale "
       mapfile -t COMPREPLY < <(compgen -W "$key_list" -- "$cur")
       return 0
       ;;
   esac
   tool=${COMP_WORDS[0]}
   case "$prev" in
-    -f)
-      key_list="$( $tool --formats | tail -n +2 | cut -f 3 -d ' ')"
-      mapfile -t COMPREPLY < <(compgen -W "$key_list" -- "$cur")
-      ;;
     --format)
       key_list="$( $tool --formats | tail -n +2 | cut -f 3 -d ' ')"
       mapfile -t COMPREPLY < <(compgen -W "$key_list" -- "$cur")
@@ -498,7 +490,7 @@ _gdal_rasterize()
   _get_comp_words_by_ref cur prev
   case "$cur" in
     -*)
-      key_list="--help --help-general -b -i -at -oo -burn -a -3d -add -l -where -sql -dialect -of -a_srs -to -co -a_nodata -init -te -tr -tap -ts -ot -optim -q --version --build --license --formats --format --optfile --config --debug --pause --locale "
+      key_list="--help --long-usage --help-general -b -i -at -burn -a -3d -add -l -sql -where -dialect -a_nodata -init -a_srs -to -te -tr -ts -tap -optim -co -ot -of -oo --quiet --version --build --license --formats --format --optfile --config --debug --pause --locale "
       mapfile -t COMPREPLY < <(compgen -W "$key_list" -- "$cur")
       return 0
       ;;
@@ -714,7 +706,7 @@ _gdal_viewshed()
   _get_comp_words_by_ref cur prev
   case "$cur" in
     -*)
-      key_list="--help --long-usage --help-general -of -oz -vv -iv -ov -co -a_nodata -tz -md -cc -b -om --quiet --version --build --license --formats --format --optfile --config --debug --pause --locale "
+      key_list="--help --long-usage --help-general -of -ox -oy -oz -vv -iv -ov -co -a_nodata -tz -md -j -cc -b -om -os --quiet --version --build --license --formats --format --optfile --config --debug --pause --locale "
       mapfile -t COMPREPLY < <(compgen -W "$key_list" -- "$cur")
       return 0
       ;;
@@ -740,7 +732,7 @@ _gdal_create()
   _get_comp_words_by_ref cur prev
   case "$cur" in
     -*)
-      key_list="--help --help-general -of -outsize -bands -burn -ot -strict -a_srs -a_ullr -a_nodata -mo -q -co -if --version --build --license --formats --format --optfile --config --debug --pause --locale "
+      key_list="--help --long-usage --help-general -ot -of -outsize -bands -burn -a_srs -a_ullr -a_nodata -mo -co --quiet -if --version --build --license --formats --format --optfile --config --debug --pause --locale "
       mapfile -t COMPREPLY < <(compgen -W "$key_list" -- "$cur")
       return 0
       ;;
@@ -818,7 +810,7 @@ _ogr2ogr()
   _get_comp_words_by_ref cur prev
   case "$cur" in
     -*)
-      key_list="--help --long-usage --help-general -of -dsco -lco -append -upsert -overwrite -update -sql -dialect -spat -where -select -nln -nlt -s_srs -a_srs -t_srs -addfields -relaxedFieldNameMatch -fieldTypeToString -mapFieldType -fieldmap -splitlistfields -maxsubfields -emptyStrAsNull -forceNullable -unsetFieldWidth -unsetDefault -resolveDomains -dateTimeTo -)<HH> -)<HH>:<MM> -noNativeData -dim -s_coord_epoch -a_coord_epoch -t_coord_epoch -ct -spat_srs -geomfield -segmentize -simplify -makevalid -wrapdateline -datelineoffset -clipsrc -clipsrcsql -clipsrclayer -clipsrcwhere -clipdst -clipdstsql -clipdstlayer -clipdstwhere -explodecollections -zfield -gcp -tps -order -xyRes -zRes -mRes -unsetCoordPrecision --quiet -progress -if -oo -doo -fid -preserve_fid -unsetFid -skipfailures -gt -limit -ds_transaction -mo -nomd --version --build --license --formats --format --optfile --config --debug --pause --locale "
+      key_list="--help --long-usage --help-general -of -dsco -lco -append -upsert -overwrite -update -sql -dialect -spat -where -select -nln -nlt -s_srs -a_srs -t_srs -addfields -relaxedFieldNameMatch -fieldTypeToString -mapFieldType -fieldmap -splitlistfields -maxsubfields -emptyStrAsNull -forceNullable -unsetFieldWidth -unsetDefault -resolveDomains -dateTimeTo -)<HH> -)<HH>:<MM> -noNativeData -dim -s_coord_epoch -a_coord_epoch -t_coord_epoch -ct -spat_srs -geomfield -segmentize -simplify -makevalid -skipinvalid -wrapdateline -datelineoffset -clipsrc -clipsrcsql -clipsrclayer -clipsrcwhere -clipdst -clipdstsql -clipdstlayer -clipdstwhere -explodecollections -zfield -gcp -tps -order -xyRes -zRes -mRes -unsetCoordPrecision --quiet -progress -if -oo -doo -fid -preserve_fid -unsetFid -skipfailures -gt -limit -ds_transaction -mo -nomd --version --build --license --formats --format --optfile --config --debug --pause --locale "
       mapfile -t COMPREPLY < <(compgen -W "$key_list" -- "$cur")
       return 0
       ;;
@@ -848,30 +840,11 @@ _ogrlineref()
   _get_comp_words_by_ref cur prev
   case "$cur" in
     -*)
-      key_list="--help --help-general -progress -quiet -f -dsco -lco -create -l -ln -lf -p -pn -pm -pf -r -rn -o -on -of -s -get_pos -x -y -get_coord -m -get_subline -mb -me --version --build --license --formats --format --optfile --config --debug --pause --locale "
+      key_list="--help --long-usage --help-general --quiet -progress -of -dsco -lco -create -l -ln -lf -p -pn -pm -pf -r -rn -o -on -s -get_pos -x -y -get_coord -m -get_subline -mb -me --version --build --license --formats --format --optfile --config --debug --pause --locale "
       mapfile -t COMPREPLY < <(compgen -W "$key_list" -- "$cur")
       return 0
       ;;
   esac
-  tool=${COMP_WORDS[0]/ogrtindex/ogr2ogr}
-  case "$prev" in
-    -f)
-      key_list="$( $tool --formats | tail -n +2 | grep -o -E '"[^"]+"' | sed 's/\ /__/')"
-      for iter in $key_list; do
-        if [[ $iter =~ ^$cur ]]; then
-          COMPREPLY+=( "${iter//__/ }" )
-        fi
-      done
-      ;;
-    -of)
-      key_list="$( $tool --formats | tail -n +2 | grep -o -E '"[^"]+"' | sed 's/\ /__/')"
-      for iter in $key_list; do
-        if [[ $iter =~ ^$cur ]]; then
-          COMPREPLY+=( "${iter//__/ }" )
-        fi
-      done
-      ;;
-  esac
   return 0
 }
 complete -o default -F _ogrlineref ogrlineref
diff --git a/scripts/setdevenv.bat b/scripts/setdevenv.bat
new file mode 100644
index 000000000000..748ff6b91dc7
--- /dev/null
+++ b/scripts/setdevenv.bat
@@ -0,0 +1,10 @@
+@echo off
+
+REM This is a very primitive script which must be called from a build
+REM directory and set the environment for a Release build
+
+set PATH=%CD%\swig\python\bin;%CD%\apps\Release;%CD%\Release;%PATH%
+set GDAL_DATA=%CD%\data
+set PYTHONPATH=%CD%\swig\python
+set GDAL_DRIVER_PATH=%CD%\gdalplugins\Release
+set USE_PATH_FOR_GDAL_PYTHON=yes
diff --git a/scripts/setdevenv.sh b/scripts/setdevenv.sh
index ab28488cafca..eeecd1fdc757 100755
--- a/scripts/setdevenv.sh
+++ b/scripts/setdevenv.sh
@@ -30,9 +30,12 @@ CUR_DIR=$PWD
 
 echo "Setting environment for a CMake build from ${CUR_DIR}..."
 
+GDAL_PYTHONPATH="$CUR_DIR/swig/python"
+
 if [[ ! ${PATH} =~ $CUR_DIR/apps ]]; then
     export PATH="$CUR_DIR/apps:$PATH"
     export PATH="$CUR_DIR/perftests:$PATH"
+    export PATH="$GDAL_PYTHONPATH/bin:$PATH"
     export PATH="$GDAL_ROOT/swig/python/gdal-utils/scripts:$PATH"
     echo "Setting PATH=$PATH"
 fi
@@ -59,7 +62,6 @@ if [[ ! "${GDAL_DATA:-}" =~ $CUR_DIR/data ]]; then
     echo "Setting GDAL_DATA=$GDAL_DATA"
 fi
 
-GDAL_PYTHONPATH="$CUR_DIR/swig/python"
 if [[ ! "${PYTHONPATH:-}" =~ $GDAL_PYTHONPATH ]]; then
     export PYTHONPATH="$GDAL_PYTHONPATH:${PYTHONPATH:-}"
     echo "Setting PYTHONPATH=$PYTHONPATH"
diff --git a/scripts/typos_allowlist.txt b/scripts/typos_allowlist.txt
index 212047039ab2..ac8c184e0aa7 100644
--- a/scripts/typos_allowlist.txt
+++ b/scripts/typos_allowlist.txt
@@ -342,3 +342,6 @@ either 2 or 4 comma separated values. The same rules apply for the source and de
                          "Invalid value for MITRE_LIMIT: %s", pszValue);
 * <li>JOIN_STYLE=ROUND/MITRE/BEVEL</li>
 * <li>MITRE_LIMIT=double</li>
+        DESCRIPTION=Staatliche Verwaltungs- und Sozialdienste wie öffentliche Verwaltung, Katastrophenschutz, Schulen und Krankenhäuser, die von öffentlichen oder privaten Einrichtungen erbracht werden, soweit sie in den Anwendungsbereich der Richtlinie 2007/2/EG fallen. Dieser Datensatz enthält Informationen zu Feuerwehrleitstellen.
+    # Disable cfchecker validation as it fails with a '(5): co-ordinate variable not monotonic'
+* do not emit warnings about not having used [Dont]UseExceptions() if run under
diff --git a/swig/csharp/AssemblyInfo.cs b/swig/csharp/AssemblyInfo.cs
index 30630c4e62ef..7f077a0ade7c 100644
--- a/swig/csharp/AssemblyInfo.cs
+++ b/swig/csharp/AssemblyInfo.cs
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2008, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 using System.Reflection;
diff --git a/swig/csharp/apps/GDALAdjustContrast.cs b/swig/csharp/apps/GDALAdjustContrast.cs
index 6a40996b4ff1..29f6d59fb844 100644
--- a/swig/csharp/apps/GDALAdjustContrast.cs
+++ b/swig/csharp/apps/GDALAdjustContrast.cs
@@ -11,23 +11,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 using System;
diff --git a/swig/csharp/apps/GDALColorTable.cs b/swig/csharp/apps/GDALColorTable.cs
index 5586c59e2c66..6cc4adbca454 100644
--- a/swig/csharp/apps/GDALColorTable.cs
+++ b/swig/csharp/apps/GDALColorTable.cs
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 using System;
diff --git a/swig/csharp/apps/GDALCreateCopy.cs b/swig/csharp/apps/GDALCreateCopy.cs
index 9c25761b8f4d..da459286f942 100644
--- a/swig/csharp/apps/GDALCreateCopy.cs
+++ b/swig/csharp/apps/GDALCreateCopy.cs
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 using System;
diff --git a/swig/csharp/apps/GDALDatasetRasterIO.cs b/swig/csharp/apps/GDALDatasetRasterIO.cs
index ca8429dbc37d..150989bdba6c 100644
--- a/swig/csharp/apps/GDALDatasetRasterIO.cs
+++ b/swig/csharp/apps/GDALDatasetRasterIO.cs
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 using System;
diff --git a/swig/csharp/apps/GDALDatasetRasterIOEx.cs b/swig/csharp/apps/GDALDatasetRasterIOEx.cs
index 80c8afe4a971..ba74b1950235 100644
--- a/swig/csharp/apps/GDALDatasetRasterIOEx.cs
+++ b/swig/csharp/apps/GDALDatasetRasterIOEx.cs
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 using System;
diff --git a/swig/csharp/apps/GDALDatasetWrite.cs b/swig/csharp/apps/GDALDatasetWrite.cs
index 5bb8e530ef48..b31ffb9c490c 100644
--- a/swig/csharp/apps/GDALDatasetWrite.cs
+++ b/swig/csharp/apps/GDALDatasetWrite.cs
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 using System;
diff --git a/swig/csharp/apps/GDALGetHistogram.cs b/swig/csharp/apps/GDALGetHistogram.cs
index 5a0239435869..fdca0e50256b 100644
--- a/swig/csharp/apps/GDALGetHistogram.cs
+++ b/swig/csharp/apps/GDALGetHistogram.cs
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 using System;
diff --git a/swig/csharp/apps/GDALInfo.cs b/swig/csharp/apps/GDALInfo.cs
index 07da950980e3..1c91def78cc7 100644
--- a/swig/csharp/apps/GDALInfo.cs
+++ b/swig/csharp/apps/GDALInfo.cs
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 using System;
diff --git a/swig/csharp/apps/GDALMemDataset.cs b/swig/csharp/apps/GDALMemDataset.cs
index e4c3f7da9000..d27513e08f3e 100644
--- a/swig/csharp/apps/GDALMemDataset.cs
+++ b/swig/csharp/apps/GDALMemDataset.cs
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 using System;
diff --git a/swig/csharp/apps/GDALOverviews.cs b/swig/csharp/apps/GDALOverviews.cs
index cd028784efe8..7b358c030a10 100644
--- a/swig/csharp/apps/GDALOverviews.cs
+++ b/swig/csharp/apps/GDALOverviews.cs
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 using System;
diff --git a/swig/csharp/apps/GDALRead.cs b/swig/csharp/apps/GDALRead.cs
index 477ddf714e08..1345726b47b2 100644
--- a/swig/csharp/apps/GDALRead.cs
+++ b/swig/csharp/apps/GDALRead.cs
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 using System;
diff --git a/swig/csharp/apps/GDALReadDirect.cs b/swig/csharp/apps/GDALReadDirect.cs
index cf04bbaaec83..726a4fce729d 100644
--- a/swig/csharp/apps/GDALReadDirect.cs
+++ b/swig/csharp/apps/GDALReadDirect.cs
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 using System;
diff --git a/swig/csharp/apps/GDALWarp.cs b/swig/csharp/apps/GDALWarp.cs
index d647fa992599..9a5b47d24443 100644
--- a/swig/csharp/apps/GDALWarp.cs
+++ b/swig/csharp/apps/GDALWarp.cs
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2020, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 using System;
diff --git a/swig/csharp/apps/GDALWrite.cs b/swig/csharp/apps/GDALWrite.cs
index 2194810c7787..c5f1a7a97cf9 100644
--- a/swig/csharp/apps/GDALWrite.cs
+++ b/swig/csharp/apps/GDALWrite.cs
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 using System;
diff --git a/swig/csharp/apps/GetCRSInfo.cs b/swig/csharp/apps/GetCRSInfo.cs
index 72abe6d471e9..1a66d0f39553 100644
--- a/swig/csharp/apps/GetCRSInfo.cs
+++ b/swig/csharp/apps/GetCRSInfo.cs
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2020, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 using System;
diff --git a/swig/csharp/apps/OGRFeatureEdit.cs b/swig/csharp/apps/OGRFeatureEdit.cs
index 33926249429e..765dc0c6587d 100644
--- a/swig/csharp/apps/OGRFeatureEdit.cs
+++ b/swig/csharp/apps/OGRFeatureEdit.cs
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 using System;
diff --git a/swig/csharp/apps/OGRGEOS.cs b/swig/csharp/apps/OGRGEOS.cs
index 1a18a43f2455..63107694c938 100644
--- a/swig/csharp/apps/OGRGEOS.cs
+++ b/swig/csharp/apps/OGRGEOS.cs
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 using System;
diff --git a/swig/csharp/apps/OGRLayerAlg.cs b/swig/csharp/apps/OGRLayerAlg.cs
index 937e7ce37f99..34c2c6036e8e 100644
--- a/swig/csharp/apps/OGRLayerAlg.cs
+++ b/swig/csharp/apps/OGRLayerAlg.cs
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 using System;
diff --git a/swig/csharp/apps/OSRTransform.cs b/swig/csharp/apps/OSRTransform.cs
index 6d32970c039a..29a06225417b 100644
--- a/swig/csharp/apps/OSRTransform.cs
+++ b/swig/csharp/apps/OSRTransform.cs
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 using System;
diff --git a/swig/csharp/apps/ReadXML.cs b/swig/csharp/apps/ReadXML.cs
index 7f0f1b8d847b..eb8720a8ad16 100644
--- a/swig/csharp/apps/ReadXML.cs
+++ b/swig/csharp/apps/ReadXML.cs
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 using System;
diff --git a/swig/csharp/apps/VSIMem.cs b/swig/csharp/apps/VSIMem.cs
index fed0f800ef76..2d316944732d 100644
--- a/swig/csharp/apps/VSIMem.cs
+++ b/swig/csharp/apps/VSIMem.cs
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 using System;
diff --git a/swig/csharp/apps/WKT2WKB.cs b/swig/csharp/apps/WKT2WKB.cs
index 025cfe6ed5bf..f331b6f6eb88 100644
--- a/swig/csharp/apps/WKT2WKB.cs
+++ b/swig/csharp/apps/WKT2WKB.cs
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 using System;
diff --git a/swig/csharp/apps/createdata.cs b/swig/csharp/apps/createdata.cs
index 18813da179bb..d24aaf32059f 100644
--- a/swig/csharp/apps/createdata.cs
+++ b/swig/csharp/apps/createdata.cs
@@ -10,23 +10,7 @@
  * Copyright (c) 2007, Tamas Szekeres
  * Copyright (c) 2009-2010, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 
diff --git a/swig/csharp/apps/ogrinfo.cs b/swig/csharp/apps/ogrinfo.cs
index 82273ff58713..400649e8f279 100644
--- a/swig/csharp/apps/ogrinfo.cs
+++ b/swig/csharp/apps/ogrinfo.cs
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 using System;
diff --git a/swig/include/Band.i b/swig/include/Band.i
index 48ed10e737c3..ea4fd47f6e22 100644
--- a/swig/include/Band.i
+++ b/swig/include/Band.i
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2005, Kevin Ruland
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 /************************************************************************
@@ -295,6 +279,10 @@ public:
     return (GDALRasterBandShadow*) GDALGetOverview( self, i );
   }
 
+  GDALRasterBandShadow *GetSampleOverview(GUIntBig nDesiredSamples) {
+    return (GDALRasterBandShadow*) GDALGetRasterSampleOverview( self, nDesiredSamples );
+  }
+
 #if defined (SWIGJAVA)
   int Checksum( int xoff, int yoff, int xsize, int ysize) {
     return GDALChecksumImage( self, xoff, yoff, xsize, ysize );
@@ -665,6 +653,22 @@ CPLErr AdviseRead(  int xoff, int yoff, int xsize, int ysize,
 %clear (GDALDataType *buf_type);
 %clear (int band_list, int *pband_list );
 
+%apply (double *OUTPUT){double *pdfRealValue, double *pdfImagValue};
+#if !defined(SWIGPYTHON)
+%apply (IF_ERROR_RETURN_NONE) { (CPLErr) };
+#endif
+  CPLErr InterpolateAtPoint( double pixel, double line,
+                             GDALRIOResampleAlg interpolation,
+                             double *pdfRealValue,
+                             double *pdfImagValue ) {
+    if (pdfRealValue) *pdfRealValue = 0;
+    if (pdfImagValue) *pdfImagValue = 0;
+    return GDALRasterInterpolateAtPoint( self, pixel, line, interpolation, pdfRealValue, pdfImagValue );
+  }
+#if !defined(SWIGPYTHON)
+%clear (CPLErr);
+#endif
+
 %newobject AsMDArray;
   GDALMDArrayHS *AsMDArray()
   {
diff --git a/swig/include/ColorTable.i b/swig/include/ColorTable.i
index fbe3159ae3e8..2ecf1b80d245 100644
--- a/swig/include/ColorTable.i
+++ b/swig/include/ColorTable.i
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2005, Kevin Ruland
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 //************************************************************************
diff --git a/swig/include/Dataset.i b/swig/include/Dataset.i
index 2f3b2e9b6ab7..098d6350e02c 100644
--- a/swig/include/Dataset.i
+++ b/swig/include/Dataset.i
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2005, Kevin Ruland
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 %{
@@ -300,6 +284,17 @@ public:
     return (GDALRasterBandShadow*) GDALGetRasterBand( self, nBand );
   }
 
+  bool IsThreadSafe(int nScopeFlags)
+  {
+      return GDALDatasetIsThreadSafe(self, nScopeFlags, nullptr);
+  }
+
+%newobject GetThreadSafeDataset;
+  GDALDatasetShadow* GetThreadSafeDataset(int nScopeFlags)
+  {
+      return GDALGetThreadSafeDataset(self, nScopeFlags, nullptr);
+  }
+
 %newobject GetRootGroup;
   GDALGroupHS* GetRootGroup() {
     return GDALDatasetGetRootGroup(self);
diff --git a/swig/include/Driver.i b/swig/include/Driver.i
index d5b9e1aac5ff..28833a194683 100644
--- a/swig/include/Driver.i
+++ b/swig/include/Driver.i
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2005, Kevin Ruland
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 /*************************************************************************
diff --git a/swig/include/MajorObject.i b/swig/include/MajorObject.i
index 7b3c121e267c..1b44689adb46 100644
--- a/swig/include/MajorObject.i
+++ b/swig/include/MajorObject.i
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2005, Kevin Ruland
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 /* For Python we don't import, but include MajorObject.i to avoid */
diff --git a/swig/include/MultiDimensional.i b/swig/include/MultiDimensional.i
index 39a38a6f4093..4cdf65ab0471 100644
--- a/swig/include/MultiDimensional.i
+++ b/swig/include/MultiDimensional.i
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2019, Even Rouault <even.rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 %include RasterAttributeTable.i
@@ -691,8 +675,8 @@ public:
   {
 
     const int nExpectedDims = (int)GDALMDArrayGetDimensionCount(self);
-    std::vector<size_t> count_internal(nExpectedDims);
-    if( nExpectedDims != 1 )
+    std::vector<size_t> count_internal(nExpectedDims + 1);
+    if( nExpectedDims > 1 )
     {
         CPLError(CE_Failure, CPLE_AppDefined,
             "Unsupported number of dimensions");
@@ -707,23 +691,26 @@ public:
             return CE_Failure;
         }
     }
-    if( nDims1 != 1 )
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-            "Wrong number of values in array_start_idx");
-        return CE_Failure;
-    }
-    if( nDims2 != 1 )
+    if( nExpectedDims == 1 )
     {
-        CPLError(CE_Failure, CPLE_AppDefined,
-            "Wrong number of values in count");
-        return CE_Failure;
-    }
-    if( nDims3 != 1 )
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-            "Wrong number of values in array_step");
-        return CE_Failure;
+        if( nDims1 != 1 )
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                "Wrong number of values in array_start_idx");
+            return CE_Failure;
+        }
+        if( nDims2 != 1 )
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                "Wrong number of values in count");
+            return CE_Failure;
+        }
+        if( nDims3 != 1 )
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                "Wrong number of values in array_step");
+            return CE_Failure;
+        }
     }
 
     CPLErr eErr = GDALMDArrayWrite(self,
@@ -1160,6 +1147,18 @@ public:
 %clear OSRSpatialReferenceShadow**;
 #endif
 
+
+#if defined(SWIGPYTHON)
+%newobject GetMeshGrid;
+%apply (int object_list_count, GDALMDArrayHS **poObjects) {(int nInputArrays, GDALMDArrayHS **ahInputArrays)};
+%apply (GDALMDArrayHS*** parrays, size_t* pnCount) {(GDALMDArrayHS*** outputArrays, size_t* pnCountOutputArrays)};
+  static void GetMeshGrid(int nInputArrays, GDALMDArrayHS **ahInputArrays,
+                          GDALMDArrayHS*** outputArrays, size_t* pnCountOutputArrays, char **options = 0)
+  {
+    *outputArrays = GDALMDArrayGetMeshGrid(ahInputArrays, nInputArrays, pnCountOutputArrays, options);
+  }
+#endif
+
   bool Cache( char** options = NULL )
   {
       return GDALMDArrayCache(self, options);
@@ -1272,6 +1271,10 @@ public:
     return GDALAttributeReadAsInt(self);
   }
 
+  long long ReadAsInt64() {
+    return GDALAttributeReadAsInt64(self);
+  }
+
   double ReadAsDouble() {
     return GDALAttributeReadAsDouble(self);
   }
@@ -1288,6 +1291,12 @@ public:
   }
 #endif
 
+#if defined(SWIGPYTHON)
+  void ReadAsInt64Array( long long** pvals, size_t* pnCount ) {
+    *pvals = (long long*)GDALAttributeReadAsInt64Array(self, pnCount);
+  }
+#endif
+
 #if defined(SWIGPYTHON)
   void ReadAsDoubleArray( double** pvals, size_t* pnCount ) {
     *pvals = GDALAttributeReadAsDoubleArray(self, pnCount);
@@ -1327,11 +1336,30 @@ public:
     return GDALAttributeWriteInt(self, val) ? CE_None : CE_Failure;
   }
 
+  CPLErr WriteInt64(long long val)
+  {
+    return GDALAttributeWriteInt64(self, val) ? CE_None : CE_Failure;
+  }
+
   CPLErr WriteDouble(double val)
   {
     return GDALAttributeWriteDouble(self, val) ? CE_None : CE_Failure;
   }
 
+#if defined(SWIGPYTHON)
+  CPLErr WriteIntArray(int nList, int* pList)
+  {
+    return GDALAttributeWriteIntArray(self, pList, nList) ? CE_None : CE_Failure;
+  }
+#endif
+
+#if defined(SWIGPYTHON)
+  CPLErr WriteInt64Array(int nList, long long* pList)
+  {
+    return GDALAttributeWriteInt64Array(self, (int64_t*)pList, nList) ? CE_None : CE_Failure;
+  }
+#endif
+
 #if defined(SWIGPYTHON)
   CPLErr WriteDoubleArray(int nList, double* pList)
   {
diff --git a/swig/include/Operations.i b/swig/include/Operations.i
index 7cf87b4aa446..d036dc037be8 100644
--- a/swig/include/Operations.i
+++ b/swig/include/Operations.i
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Howard Butler
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 %{
diff --git a/swig/include/RasterAttributeTable.i b/swig/include/RasterAttributeTable.i
index d026dce98244..7896e860a6a0 100644
--- a/swig/include/RasterAttributeTable.i
+++ b/swig/include/RasterAttributeTable.i
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 //************************************************************************
diff --git a/swig/include/Relationship.i b/swig/include/Relationship.i
index 8c0e852a761e..6b8ba07b991c 100644
--- a/swig/include/Relationship.i
+++ b/swig/include/Relationship.i
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2022, Nyall Dawson <nyall dot dawson at gmail dot 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 //************************************************************************
diff --git a/swig/include/SubdatasetInfo.i b/swig/include/SubdatasetInfo.i
index bc14ce04f1ec..2813c044825f 100644
--- a/swig/include/SubdatasetInfo.i
+++ b/swig/include/SubdatasetInfo.i
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Alessandro Pasotti <elpaso@itopen.it>
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 //************************************************************************
diff --git a/swig/include/Transform.i b/swig/include/Transform.i
index 2e92bfd26c6c..a647e08de115 100644
--- a/swig/include/Transform.i
+++ b/swig/include/Transform.i
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2005, Kevin Ruland
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 void *GDALCreateGCPTransformer( int nGCPs, GDAL_GCP const * pGCPs,
diff --git a/swig/include/XMLNode.i b/swig/include/XMLNode.i
index 4c38af65ee97..ea9b4e5cda6d 100644
--- a/swig/include/XMLNode.i
+++ b/swig/include/XMLNode.i
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2005, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 %rename (XMLNodeType) CPLXMLNodeType;
diff --git a/swig/include/cpl.i b/swig/include/cpl.i
index 50ba9a6470ff..0e8efca98794 100644
--- a/swig/include/cpl.i
+++ b/swig/include/cpl.i
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2005, Kevin Ruland
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 %include constraints.i
@@ -989,3 +973,83 @@ int CPLGetNumCPUs();
 
 %rename (GetUsablePhysicalRAM) CPLGetUsablePhysicalRAM;
 GIntBig CPLGetUsablePhysicalRAM();
+
+#if defined(SWIGPYTHON)
+
+%apply Pointer NONNULL {const char *pszFilename};
+%apply Pointer NONNULL {const char *pszUploadId};
+
+%inline {
+void MultipartUploadGetCapabilities(
+    const char *pszFilename, int* pnRetCode, int *pbNonSequentialUploadSupported,
+    int *pbParallelUploadSupported, int *pbSupportsAbort, size_t *pnMinPartSize,
+    size_t *pnMaxPartSize, int *pnMaxPartCount)
+{
+    *pnRetCode = VSIMultipartUploadGetCapabilities(pszFilename,
+                        pbNonSequentialUploadSupported,
+                        pbParallelUploadSupported,
+                        pbSupportsAbort,
+                        pnMinPartSize,
+                        pnMaxPartSize,
+                        pnMaxPartCount);
+}
+}
+
+%inline {
+char* MultipartUploadStart(const char *pszFilename, char** options = NULL)
+{
+    return VSIMultipartUploadStart(pszFilename, options);
+}
+}
+
+%apply (size_t nLen, char *pBuf ) { (size_t nDataLength, const char *pData)};
+
+%inline {
+char* MultipartUploadAddPart(const char *pszFilename,
+                             const char *pszUploadId,
+                             int nPartNumber,
+                             GUIntBig nFileOffset,
+                             size_t nDataLength, const char *pData,
+                             char** options = NULL)
+{
+    return VSIMultipartUploadAddPart(pszFilename, pszUploadId,
+                                     nPartNumber, nFileOffset,
+                                     pData, nDataLength,
+                                     options);
+}
+}
+
+%apply (char **dict) { char ** partIds };
+
+%inline {
+bool MultipartUploadEnd(const char *pszFilename,
+                        const char *pszUploadId,
+                        char** partIds,
+                        GUIntBig nTotalSize,
+                        char** options = NULL)
+
+{
+    return VSIMultipartUploadEnd(pszFilename, pszUploadId,
+                                 CSLCount(partIds), partIds,
+                                 nTotalSize,
+                                 options);
+}
+}
+
+%clear (char ** partIds);
+
+%inline {
+bool MultipartUploadAbort(const char *pszFilename,
+                          const char *pszUploadId,
+                          char** options = NULL)
+{
+    return VSIMultipartUploadAbort(pszFilename, pszUploadId, options);
+}
+}
+
+%clear const char *pszFilename;
+%clear const char *pszUploadId;
+%clear (size_t nDataLength, const void *pData);
+
+#endif
+
diff --git a/swig/include/cpl_exceptions.i b/swig/include/cpl_exceptions.i
index 288a4c8ab5b0..ec68e3af09f6 100644
--- a/swig/include/cpl_exceptions.i
+++ b/swig/include/cpl_exceptions.i
@@ -12,23 +12,7 @@
  ******************************************************************************
  * Copyright (c) 2005, Kevin Ruland
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 %{
diff --git a/swig/include/cplvirtualmem.i b/swig/include/cplvirtualmem.i
index 74dc0ea8b70d..632a4ca93165 100644
--- a/swig/include/cplvirtualmem.i
+++ b/swig/include/cplvirtualmem.i
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 //************************************************************************/
diff --git a/swig/include/csharp/gdal_csharp.i b/swig/include/csharp/gdal_csharp.i
index 39a4e0587662..3b0fd5212843 100644
--- a/swig/include/csharp/gdal_csharp.i
+++ b/swig/include/csharp/gdal_csharp.i
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 %include cpl_exceptions.i
diff --git a/swig/include/csharp/gdal_csharp_extend.i b/swig/include/csharp/gdal_csharp_extend.i
index 381b49113a59..51053dfe3d57 100644
--- a/swig/include/csharp/gdal_csharp_extend.i
+++ b/swig/include/csharp/gdal_csharp_extend.i
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 
diff --git a/swig/include/csharp/ogr_csharp.i b/swig/include/csharp/ogr_csharp.i
index 4d3a1e9dbff5..98c72e4d5bff 100644
--- a/swig/include/csharp/ogr_csharp.i
+++ b/swig/include/csharp/ogr_csharp.i
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 %include cpl_exceptions.i
diff --git a/swig/include/csharp/ogr_csharp_extend.i b/swig/include/csharp/ogr_csharp_extend.i
index f3a9411ac805..e8f15841762e 100644
--- a/swig/include/csharp/ogr_csharp_extend.i
+++ b/swig/include/csharp/ogr_csharp_extend.i
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 
diff --git a/swig/include/csharp/osr_csharp.i b/swig/include/csharp/osr_csharp.i
index bcb9ea51925e..d02a8b2530e4 100644
--- a/swig/include/csharp/osr_csharp.i
+++ b/swig/include/csharp/osr_csharp.i
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 %include cpl_exceptions.i
diff --git a/swig/include/csharp/typemaps_csharp.i b/swig/include/csharp/typemaps_csharp.i
index 509db618aee4..d8d61f09fef8 100644
--- a/swig/include/csharp/typemaps_csharp.i
+++ b/swig/include/csharp/typemaps_csharp.i
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2007, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 
diff --git a/swig/include/gdal.i b/swig/include/gdal.i
index 3799c74ed0f8..98d047eee5d4 100644
--- a/swig/include/gdal.i
+++ b/swig/include/gdal.i
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2005, Kevin Ruland
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 %include constraints.i
@@ -369,6 +353,7 @@ $1;
 %rename (GetDataTypeByName) GDALGetDataTypeByName;
 %rename (DataTypeUnion) GDALDataTypeUnion;
 %rename (GetColorInterpretationName) GDALGetColorInterpretationName;
+%rename (GetColorInterpretationByName) GDALGetColorInterpretationByName;
 %rename (GetPaletteInterpretationName) GDALGetPaletteInterpretationName;
 %rename (DecToDMS) GDALDecToDMS;
 %rename (PackedDMSToDec) GDALPackedDMSToDec;
@@ -725,6 +710,8 @@ GDALDataType GDALDataTypeUnion( GDALDataType a, GDALDataType b );
 
 const char *GDALGetColorInterpretationName( GDALColorInterp eColorInterp );
 
+GDALColorInterp GDALGetColorInterpretationByName( const char* pszColorInterpName );
+
 const char *GDALGetPaletteInterpretationName( GDALPaletteInterp ePaletteInterp );
 
 #ifdef SWIGJAVA
diff --git a/swig/include/gdal_array.i b/swig/include/gdal_array.i
index 458ae9f15d98..bac638072efb 100644
--- a/swig/include/gdal_array.i
+++ b/swig/include/gdal_array.i
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2000, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 %feature("autodoc");
@@ -2225,16 +2209,22 @@ PyObject* _RecordBatchAsNumpy(VoidPtrAsLong recordBatchPtr,
     }
     else if( nType == NPY_STRING )
     {
-        // have to convert array of strings to a char **
-        char **papszStringData = (char**)CPLCalloc(sizeof(char*), nLength);
-
         // max size of string
-        int nMaxLen = PyArray_ITEMSIZE(psArray);
-        char *pszBuffer = (char*)CPLMalloc((nMaxLen+1) * sizeof(char));
+        const size_t nMaxLen = PyArray_ITEMSIZE(psArray);
+        char *pszBuffer = (char*)VSIMalloc(nMaxLen+1);
+        if (!pszBuffer)
+        {
+            CPLError( CE_Failure, CPLE_OutOfMemory,
+                      "Out of memory in RATValuesIONumPyWrite()" );
+            return CE_Failure;
+        }
         // make sure there is a null char on the end
         // as there won't be if this string is the maximum size
         pszBuffer[nMaxLen] = '\0';
 
+        // have to convert array of strings to a char **
+        char **papszStringData = (char**)CPLCalloc(sizeof(char*), nLength);
+
         // we can't just use the memory location in the array
         // since long strings won't be null terminated
         for( int i = 0; i < nLength; i++ )
@@ -2383,6 +2373,11 @@ codes = {gdalconst.GDT_Byte: numpy.uint8,
          gdalconst.GDT_CFloat32:  numpy.complex64,
          gdalconst.GDT_CFloat64: numpy.complex128}
 
+np_class_to_gdal_code = { v : k for k, v in codes.items() }
+# since several things map to complex64 we must carefully select
+# the opposite that is an exact match (ticket 1518)
+np_class_to_gdal_code[numpy.complex64] = gdalconst.GDT_CFloat32
+np_dtype_to_gdal_code = { numpy.dtype(k) : v for k, v in np_class_to_gdal_code.items() }
 
 def OpenArray(array, prototype_ds=None, interleave='band'):
 
@@ -2404,31 +2399,21 @@ def OpenArray(array, prototype_ds=None, interleave='band'):
 
     return ds
 
-
 def flip_code(code):
-    if isinstance(code, (numpy.dtype, type)):
-        # since several things map to complex64 we must carefully select
-        # the opposite that is an exact match (ticket 1518)
-        if code == numpy.complex64:
-            return gdalconst.GDT_CFloat32
-
-        for key, value in codes.items():
-            if value == code:
-                return key
-        return None
-    else:
-        try:
-            return codes[code]
-        except KeyError:
-            return None
+    try:
+        return NumericTypeCodeToGDALTypeCode(code)
+    except TypeError:
+        return GDALTypeCodeToNumericTypeCode(code)
 
 def NumericTypeCodeToGDALTypeCode(numeric_type):
-    if not isinstance(numeric_type, (numpy.dtype, type)):
-        raise TypeError("Input must be a type")
-    return flip_code(numeric_type)
+    if isinstance(numeric_type, type):
+        return np_class_to_gdal_code.get(numeric_type, None)
+    elif isinstance(numeric_type, numpy.dtype):
+        return np_dtype_to_gdal_code.get(numeric_type, None)
+    raise TypeError("Input must be a type")
 
 def GDALTypeCodeToNumericTypeCode(gdal_code):
-    return flip_code(gdal_code)
+    return codes.get(gdal_code, None)
 
 def _RaiseException():
     if gdal.GetUseExceptions():
diff --git a/swig/include/gdal_typemaps.i b/swig/include/gdal_typemaps.i
index 3ac7d42263d7..9b3f36c8db18 100644
--- a/swig/include/gdal_typemaps.i
+++ b/swig/include/gdal_typemaps.i
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2005, Kevin Ruland
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifdef SWIGCSHARP
diff --git a/swig/include/gdalconst.i b/swig/include/gdalconst.i
index 426b2b7b76e9..f8ef99517ae9 100644
--- a/swig/include/gdalconst.i
+++ b/swig/include/gdalconst.i
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2005, Kevin Ruland
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifdef SWIGPYTHON
@@ -101,9 +85,34 @@
 %constant GCI_MagentaBand   = GCI_MagentaBand;
 %constant GCI_YellowBand    = GCI_YellowBand;
 %constant GCI_BlackBand     = GCI_BlackBand;
-%constant GCI_YCbCr_YBand     = GCI_YCbCr_YBand;
-%constant GCI_YCbCr_CrBand     = GCI_YCbCr_CrBand;
-%constant GCI_YCbCr_CbBand     = GCI_YCbCr_CbBand;
+%constant GCI_YCbCr_YBand   = GCI_YCbCr_YBand;
+%constant GCI_YCbCr_CrBand  = GCI_YCbCr_CrBand;
+%constant GCI_YCbCr_CbBand  = GCI_YCbCr_CbBand;
+%constant GCI_PanBand       = GCI_PanBand;
+%constant GCI_CoastalBand   = GCI_CoastalBand;
+%constant GCI_RedEdgeBand   = GCI_RedEdgeBand;
+
+%constant GCI_IR_Start      = GCI_IR_Start;  // just a marker, not an enumeration value
+%constant GCI_NIRBand       = GCI_NIRBand;
+%constant GCI_SWIRBand      = GCI_SWIRBand;
+%constant GCI_MWIRBand      = GCI_MWIRBand;
+%constant GCI_LWIRBand      = GCI_LWIRBand;
+%constant GCI_TIRBand       = GCI_TIRBand;
+%constant GCI_OtherIRBand   = GCI_OtherIRBand;
+%constant GCI_IR_End        = GCI_IR_End;  // just a marker, not an enumeration value
+
+%constant GCI_SAR_Start     = GCI_SAR_Start;  // just a marker, not an enumeration value
+%constant GCI_SAR_Ka_Band   = GCI_SAR_Ka_Band;
+%constant GCI_SAR_K_Band    = GCI_SAR_K_Band;
+%constant GCI_SAR_Ku_Band   = GCI_SAR_Ku_Band;
+%constant GCI_SAR_X_Band    = GCI_SAR_X_Band;
+%constant GCI_SAR_C_Band    = GCI_SAR_C_Band;
+%constant GCI_SAR_S_Band    = GCI_SAR_S_Band;
+%constant GCI_SAR_L_Band    = GCI_SAR_L_Band;
+%constant GCI_SAR_P_Band    = GCI_SAR_P_Band;
+%constant GCI_SAR_End       = GCI_SAR_End;  // just a marker, not an enumeration value
+
+%constant GCI_Max           = GCI_Max;
 
 // GDALResampleAlg
 
@@ -172,6 +181,7 @@
 %constant OF_UPDATE = GDAL_OF_UPDATE;
 %constant OF_SHARED = GDAL_OF_SHARED;
 %constant OF_VERBOSE_ERROR = GDAL_OF_VERBOSE_ERROR;
+%constant OF_THREAD_SAFE = GDAL_OF_THREAD_SAFE;
 
 #if !defined(SWIGCSHARP) && !defined(SWIGJAVA)
 
diff --git a/swig/include/gnm.i b/swig/include/gnm.i
index 89a18abb327c..ff031e726f71 100644
--- a/swig/include/gnm.i
+++ b/swig/include/gnm.i
@@ -10,23 +10,7 @@
  * Copyright (c) 2014, Mikhail Gusev
  * Copyright (c) 2014-2015, NextGIS <info@nextgis.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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef FROM_GDAL_I
diff --git a/swig/include/java/gdal_java.i b/swig/include/java/gdal_java.i
index a357385f37e0..c3ed14adfcbd 100644
--- a/swig/include/java/gdal_java.i
+++ b/swig/include/java/gdal_java.i
@@ -1312,7 +1312,8 @@ import org.gdal.gdalconst.gdalconstConstants;
 // Add a Java reference to prevent premature garbage collection and resulting use
 // of dangling C++ pointer. Intended for methods that return pointers or
 // references to a member variable.
-%typemap(javaout) GDALRasterBandShadow* GetRasterBand,
+%typemap(javaout) GDALDatasetShadow* GetThreadSafeDataset,
+                  GDALRasterBandShadow* GetRasterBand,
                   GDALRasterBandShadow* GetOverview,
                   GDALRasterBandShadow* GetMaskBand,
                   GDALColorTableShadow* GetColorTable,
diff --git a/swig/include/java/gnm_java.i b/swig/include/java/gnm_java.i
index b3113f6ddd1f..c9be12c323f5 100644
--- a/swig/include/java/gnm_java.i
+++ b/swig/include/java/gnm_java.i
@@ -10,23 +10,7 @@
  * Copyright (c) 2016, Dmitry Baryshnikov
  * Copyright (c) 2016, NextGIS <info@nextgis.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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifndef FROM_GDAL_I
diff --git a/swig/include/java/typemaps_java.i b/swig/include/java/typemaps_java.i
index 4f41baf5631f..551cc42b1f4e 100644
--- a/swig/include/java/typemaps_java.i
+++ b/swig/include/java/typemaps_java.i
@@ -19,6 +19,45 @@
 %include "arrays_java.i";
 %include "typemaps.i"
 
+
+%fragment("SafeNewStringUTF8","header")
+%{
+static jstring
+SafeNewStringUTF8(JNIEnv *jenv, const char* pszInput)
+{
+  jstring ret = 0;
+  if (pszInput)
+  {
+      if( !CPLIsUTF8(pszInput, -1) )
+      {
+          CPLError(CE_Warning, CPLE_AppDefined,
+                   "A non-UTF8 string has been detected. Forcing it to ASCII");
+          char* pszTmp = CPLUTF8ForceToASCII(pszInput, '_');
+#ifdef __cplusplus
+          ret = jenv->NewStringUTF(pszTmp);
+#else
+          ret = (*jenv)->NewStringUTF(jenv, pszTmp);
+#endif
+          CPLFree(pszTmp);
+      }
+      else
+      {
+#ifdef __cplusplus
+          ret = jenv->NewStringUTF(pszInput);
+#else
+          ret = (*jenv)->NewStringUTF(jenv, pszInput);
+#endif
+      }
+  }
+  return ret;
+}
+%}
+
+// Overrides typemap defined in /usr/share/swig4.0/java.swg
+%typemap(out, fragment="SafeNewStringUTF8", noblock=1) char * {
+  $result = SafeNewStringUTF8(jenv, (const char *)$1);
+}
+
 %apply (int) {VSI_RETVAL};
 
 %typemap(javabody) SWIGTYPE %{
@@ -250,7 +289,7 @@
   $2 = &pGCPs;
 }
 
-%typemap(argout) (int *nGCPs, GDAL_GCP const **pGCPs )
+%typemap(argout, fragment="SafeNewStringUTF8") (int *nGCPs, GDAL_GCP const **pGCPs )
 {
   /* %typemap(argout) (int *nGCPs, GDAL_GCP const **pGCPs ) */
   const jclass GCPClass = jenv->FindClass("org/gdal/gdal/GCP");
@@ -261,8 +300,8 @@
 
   int i;
   for (i=0; i<*$1; i++ ) {
-    jstring stringInfo = jenv->NewStringUTF((*$2)[i].pszInfo);
-    jstring stringId = jenv->NewStringUTF((*$2)[i].pszId);
+    jstring stringInfo = SafeNewStringUTF8(jenv, (*$2)[i].pszInfo);
+    jstring stringId = SafeNewStringUTF8(jenv, (*$2)[i].pszId);
     jobject GCPobj = jenv->NewObject(GCPClass, GCPcon,
                                 (*$2)[i].dfGCPX,
                                 (*$2)[i].dfGCPY,
@@ -441,12 +480,12 @@
  * Typemaps for  (retStringAndCPLFree*)
  ***************************************************/
 
-%typemap(out) (retStringAndCPLFree*)
+%typemap(out, fragment="SafeNewStringUTF8") (retStringAndCPLFree*)
 {
     /* %typemap(out) (retStringAndCPLFree*) */
     if(result)
     {
-        $result = jenv->NewStringUTF((const char *)result);
+        $result = SafeNewStringUTF8(jenv, (const char *)result);
         CPLFree(result);
     }
 }
@@ -459,6 +498,29 @@
     return $jnicall;
   }
 
+/***************************************************
+ * Typemaps for (StringAsByteArray*)
+ ***************************************************/
+
+%typemap(out) (StringAsByteArray*)
+{
+    /* %typemap(out) (StringAsByteArray*) */
+    if(result)
+    {
+        const size_t nLen = strlen((const char*)result);
+        jbyteArray byteArray = jenv->NewByteArray(nLen);
+        jenv->SetByteArrayRegion(byteArray, (jsize)0, (jsize)nLen, (jbyte*)result);
+        $result = byteArray;
+    }
+}
+
+%typemap(jni) (StringAsByteArray*) "jbyteArray"
+%typemap(jtype) (StringAsByteArray*) "byte[]"
+%typemap(jstype) (StringAsByteArray*) "byte[]"
+%typemap(javain) (StringAsByteArray*) "$javainput"
+%typemap(javaout) (StringAsByteArray*) {
+    return $jnicall;
+  }
 
 /***************************************************
  * Typemaps for  (char **ignorechange)
@@ -1035,7 +1097,7 @@
   }
 }
 
-%fragment("GetCSLStringAsHashTable","header")
+%fragment("GetCSLStringAsHashTable","header", fragment="SafeNewStringUTF8")
 %{
 /* Convert a char array to a Hashtable */
 static jobject
@@ -1054,8 +1116,8 @@ GetCSLStringAsHashTable(JNIEnv *jenv, char **stringarray, bool bFreeCSL ) {
         keyptr = CPLStrdup(*stringarray);
         keyptr[pszSep - *stringarray] = '\0';
         valptr = pszSep + 1;
-        jstring name = jenv->NewStringUTF(keyptr);
-        jstring value = jenv->NewStringUTF(valptr);
+        jstring name = SafeNewStringUTF8(jenv, keyptr);
+        jstring value = SafeNewStringUTF8(jenv, valptr);
         jenv->CallObjectMethod(jHashtable, put, name, value);
         jenv->DeleteLocalRef(name);
         jenv->DeleteLocalRef(value);
@@ -1151,7 +1213,7 @@ GetCSLStringAsHashTable(JNIEnv *jenv, char **stringarray, bool bFreeCSL ) {
   CSLDestroy( $1 );
 }
 
-%typemap(out) char **options
+%typemap(out, fragment="SafeNewStringUTF8") char **options
 {
   /* %typemap(out) char **options */
   char **stringarray = $1;
@@ -1162,8 +1224,7 @@ GetCSLStringAsHashTable(JNIEnv *jenv, char **stringarray, bool bFreeCSL ) {
   $result = jenv->NewObject(vector, constructor);
   if ( stringarray != NULL ) {
     while(*stringarray != NULL) {
-      /*printf("working on string %s\n", *stringarray);*/
-      jstring value = (jstring)jenv->NewStringUTF(*stringarray);
+      jstring value = SafeNewStringUTF8(jenv, *stringarray);
       jenv->CallBooleanMethod($result, add, value);
       jenv->DeleteLocalRef(value);
       stringarray++;
@@ -1183,7 +1244,7 @@ GetCSLStringAsHashTable(JNIEnv *jenv, char **stringarray, bool bFreeCSL ) {
  * Typemaps for retAsStringArrayNoFree
  ***************************************************/
 
-%typemap(out) char **retAsStringArrayNoFree
+%typemap(out,fragment="SafeNewStringUTF8") char **retAsStringArrayNoFree
 {
   /* %typemap(out) char **retAsStringArrayNoFree */
   char **stringarray = result;
@@ -1196,7 +1257,7 @@ GetCSLStringAsHashTable(JNIEnv *jenv, char **stringarray, bool bFreeCSL ) {
   /* exception checking omitted */
 
   for (i=0; i<len; i++) {
-      temp_string = jenv->NewStringUTF(*stringarray++);
+      temp_string = SafeNewStringUTF8(jenv, *stringarray++);
       jenv->SetObjectArrayElement(jresult, i, temp_string);
       jenv->DeleteLocalRef(temp_string);
   }
@@ -1214,7 +1275,7 @@ GetCSLStringAsHashTable(JNIEnv *jenv, char **stringarray, bool bFreeCSL ) {
  * Typemaps for retAsStringArrayNoFree
  ***************************************************/
 
-%typemap(out) char **retAsStringArrayAndFree
+%typemap(out, fragment="SafeNewStringUTF8") char **retAsStringArrayAndFree
 {
   /* %typemap(out) char **retAsStringArrayAndFree */
   char **stringarray = result;
@@ -1227,7 +1288,7 @@ GetCSLStringAsHashTable(JNIEnv *jenv, char **stringarray, bool bFreeCSL ) {
   /* exception checking omitted */
 
   for (i=0; i<len; i++) {
-      temp_string = jenv->NewStringUTF(*stringarray++);
+      temp_string = SafeNewStringUTF8(jenv, *stringarray++);
       jenv->SetObjectArrayElement(jresult, i, temp_string);
       jenv->DeleteLocalRef(temp_string);
   }
@@ -1261,10 +1322,10 @@ GetCSLStringAsHashTable(JNIEnv *jenv, char **stringarray, bool bFreeCSL ) {
     $1 = &ret;
 }
 
-%typemap(argout) char **OUTPUT
+%typemap(argout, fragment="SafeNewStringUTF8") char **OUTPUT
 {
   /* %typemap(argout) char **OUTPUT */
-  jstring temp_string = jenv->NewStringUTF(ret$argnum);
+  jstring temp_string = SafeNewStringUTF8(jenv, ret$argnum);
   jenv->SetObjectArrayElement($input, 0, temp_string);
   jenv->DeleteLocalRef(temp_string);
 }
@@ -1285,7 +1346,7 @@ GetCSLStringAsHashTable(JNIEnv *jenv, char **stringarray, bool bFreeCSL ) {
 /* Almost same as %typemap(out) char **options */
 /* but we CSLDestroy the char** pointer at the end */
 
-%typemap(out) char **CSL
+%typemap(out, fragment="SafeNewStringUTF8") char **CSL
 {
   /* %typemap(out) char **CSL */
   char **stringarray = $1;
@@ -1296,8 +1357,7 @@ GetCSLStringAsHashTable(JNIEnv *jenv, char **stringarray, bool bFreeCSL ) {
   $result = jenv->NewObject(vector, constructor);
   if ( stringarray != NULL ) {
     while(*stringarray != NULL) {
-      /*printf("working on string %s\n", *stringarray);*/
-      jstring value = (jstring)jenv->NewStringUTF(*stringarray);
+      jstring value = SafeNewStringUTF8(jenv, *stringarray);
       jenv->CallBooleanMethod($result, add, value);
       jenv->DeleteLocalRef(value);
       stringarray++;
@@ -1324,13 +1384,13 @@ GetCSLStringAsHashTable(JNIEnv *jenv, char **stringarray, bool bFreeCSL ) {
   $1 = &argout;
 }
 
-%typemap(argout) (char **argout)
+%typemap(argout, fragment="SafeNewStringUTF8") (char **argout)
 {
   /* %typemap(argout) (char **argout) */
   jstring temp_string;
 
   if($input != NULL && (int)jenv->GetArrayLength($input) >= 1) {
-    temp_string = jenv->NewStringUTF(argout$argnum);
+    temp_string = SafeNewStringUTF8(jenv, argout$argnum);
     jenv->SetObjectArrayElement($input, 0, temp_string);
     jenv->DeleteLocalRef(temp_string);
   }
@@ -1497,7 +1557,7 @@ GetCSLStringAsHashTable(JNIEnv *jenv, char **stringarray, bool bFreeCSL ) {
 
 /* This allows a C function to return a char ** as a Java String array */
 
-%typemap(out) char ** {
+%typemap(out, fragment="SafeNewStringUTF8") char ** {
     /* %typemap(out) char ** */
     int i;
     int len=0;
@@ -1509,7 +1569,7 @@ GetCSLStringAsHashTable(JNIEnv *jenv, char **stringarray, bool bFreeCSL ) {
     /* exception checking omitted */
 
     for (i=0; i<len; i++) {
-      temp_string = jenv->NewStringUTF(*result++);
+      temp_string = SafeNewStringUTF8(jenv, *result++);
       jenv->SetObjectArrayElement(jresult, i, temp_string);
       jenv->DeleteLocalRef(temp_string);
     }
@@ -2509,7 +2569,7 @@ DEFINE_BOOLEAN_FUNC_ARRAY_IN(double, jdouble, GetDoubleArrayElements, ReleaseDou
   CPLFree( $1 );
 }
 
-%typemap(out) OGRCodedValue*
+%typemap(out, fragment="SafeNewStringUTF8") OGRCodedValue*
 {
   /* %typemap(out) OGRCodedValue* */
   /* Convert a OGRCodedValue* to a HashMap */
@@ -2525,10 +2585,10 @@ DEFINE_BOOLEAN_FUNC_ARRAY_IN(double, jdouble, GetDoubleArrayElements, ReleaseDou
   $result = jenv->NewObject(hashMapClass, constructor);
   for( int i = 0; ($1)[i].pszCode != NULL; i++ )
   {
-    jstring name = jenv->NewStringUTF(($1)[i].pszCode);
+    jstring name = SafeNewStringUTF8(jenv, ($1)[i].pszCode);
     if( ($1)[i].pszValue )
     {
-        jstring value = jenv->NewStringUTF(($1)[i].pszValue);
+        jstring value = SafeNewStringUTF8(jenv, ($1)[i].pszValue);
         jenv->CallObjectMethod($result, put, name, value);
         jenv->DeleteLocalRef(value);
     }
diff --git a/swig/include/ogr.i b/swig/include/ogr.i
index a176f12feed7..0290aca1fa81 100644
--- a/swig/include/ogr.i
+++ b/swig/include/ogr.i
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2005, Howard Butler
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifdef SWIGPYTHON
@@ -52,6 +36,12 @@ typedef char retStringAndCPLFree;
 %}
 #endif
 
+#ifdef SWIGJAVA
+%inline %{
+typedef const char StringAsByteArray;
+%}
+#endif
+
 #ifdef SWIGCSHARP
 %include swig_csharp_extensions.i
 #endif
@@ -930,6 +920,12 @@ public:
     return OGR_DS_GetName(self);
   }
 
+#ifdef SWIGJAVA
+  StringAsByteArray* GetNameAsByteArray() {
+    return OGR_DS_GetName(self);
+  }
+#endif
+
   OGRErr DeleteLayer(int index){
     return OGR_DS_DeleteLayer(self, index);
   }
@@ -1324,6 +1320,12 @@ public:
     return OGR_L_GetName(self);
   }
 
+#ifdef SWIGJAVA
+  StringAsByteArray* GetNameAsByteArray() {
+    return OGR_L_GetName(self);
+  }
+#endif
+
   /* Added in OGR 1.8.0 */
   OGRwkbGeometryType GetGeomType() {
     return (OGRwkbGeometryType) OGR_L_GetGeomType(self);
@@ -1333,10 +1335,22 @@ public:
     return OGR_L_GetGeometryColumn(self);
   }
 
+#ifdef SWIGJAVA
+  StringAsByteArray* GetGeometryColumnAsByteArray() {
+    return OGR_L_GetGeometryColumn(self);
+  }
+#endif
+
   const char * GetFIDColumn() {
     return OGR_L_GetFIDColumn(self);
   }
 
+#ifdef SWIGJAVA
+  StringAsByteArray* GetFIDColumnAsByteArray() {
+    return OGR_L_GetFIDColumn(self);
+  }
+#endif
+
 %newobject GetFeature;
   OGRFeatureShadow *GetFeature(GIntBig fid) {
     return (OGRFeatureShadow*) OGR_L_GetFeature(self, fid);
@@ -1985,18 +1999,41 @@ public:
   /* ---- GetFieldAsString --------------------- */
 
   const char* GetFieldAsString(int id) {
-    return (const char *) OGR_F_GetFieldAsString(self, id);
+    return OGR_F_GetFieldAsString(self, id);
   }
 
   const char* GetFieldAsString(const char* field_name) {
       int i = OGR_F_GetFieldIndex(self, field_name);
       if (i == -1)
-	  CPLError(CE_Failure, 1, FIELD_NAME_ERROR_TMPL, field_name);
+      {
+          CPLError(CE_Failure, 1, FIELD_NAME_ERROR_TMPL, field_name);
+          return NULL;
+      }
       else
-	  return (const char *) OGR_F_GetFieldAsString(self, i);
-      return NULL;
+      {
+          return OGR_F_GetFieldAsString(self, i);
+      }
+  }
+
+#ifdef SWIGJAVA
+  StringAsByteArray* GetFieldAsStringAsByteArray(int id) {
+    return OGR_F_GetFieldAsString(self, id);
   }
 
+  StringAsByteArray* GetFieldAsStringAsByteArray(const char* field_name) {
+      int i = OGR_F_GetFieldIndex(self, field_name);
+      if (i == -1)
+      {
+          CPLError(CE_Failure, 1, FIELD_NAME_ERROR_TMPL, field_name);
+          return NULL;
+      }
+      else
+      {
+          return OGR_F_GetFieldAsString(self, i);
+      }
+  }
+#endif
+
   /* ------------------------------------------- */
 
   /* ---- GetFieldAsISO8601DateTime ------------ */
@@ -2474,6 +2511,12 @@ public:
     return (const char*) OGR_F_GetStyleString(self);
   }
 
+#ifdef SWIGJAVA
+  StringAsByteArray *GetStyleStringAsByteArray() {
+    return OGR_F_GetStyleString(self);
+  }
+#endif
+
   void SetStyleString(const char* the_string) {
     OGR_F_SetStyleString(self, the_string);
   }
@@ -2510,6 +2553,12 @@ public:
     return OGR_F_GetNativeData(self);
   }
 
+#ifdef SWIGJAVA
+  StringAsByteArray *GetNativeDataAsByteArray() {
+    return OGR_F_GetNativeData(self);
+  }
+#endif
+
   const char* GetNativeMediaType () {
     return OGR_F_GetNativeMediaType(self);
   }
@@ -2640,6 +2689,12 @@ public:
     return OGR_FD_GetName(self);
   }
 
+#ifdef SWIGJAVA
+  StringAsByteArray* GetNameAsByteArray() {
+    return OGR_FD_GetName(self);
+  }
+#endif
+
   int GetFieldCount(){
     return OGR_FD_GetFieldCount(self);
   }
@@ -2796,11 +2851,17 @@ public:
   }
 
   const char * GetName() {
-    return (const char *) OGR_Fld_GetNameRef(self);
+    return OGR_Fld_GetNameRef(self);
   }
 
+#ifdef SWIGJAVA
+  StringAsByteArray* GetNameAsByteArray() {
+    return OGR_Fld_GetNameRef(self);
+  }
+#endif
+
   const char * GetNameRef() {
-    return (const char *) OGR_Fld_GetNameRef(self);
+    return OGR_Fld_GetNameRef(self);
   }
 
   void SetName( const char* name) {
@@ -2811,6 +2872,12 @@ public:
     return OGR_Fld_GetAlternativeNameRef(self);
   }
 
+#ifdef SWIGJAVA
+  StringAsByteArray* GetAlternativeNameAsByteArray() {
+    return OGR_Fld_GetAlternativeNameRef(self);
+  }
+#endif
+
   const char * GetAlternativeNameRef() {
     return OGR_Fld_GetAlternativeNameRef(self);
   }
@@ -2915,6 +2982,12 @@ public:
     return OGR_Fld_GetDefault( self );
   }
 
+#ifdef SWIGJAVA
+  StringAsByteArray* GetDefaultAsByteArray() {
+    return OGR_Fld_GetDefault(self);
+  }
+#endif
+
   void SetDefault(const char* pszValue ) {
     OGR_Fld_SetDefault( self, pszValue );
   }
@@ -2927,6 +3000,12 @@ public:
     return OGR_Fld_GetDomainName(self);
   }
 
+#ifdef SWIGJAVA
+  StringAsByteArray* GetDomainNameAsByteArray() {
+    return OGR_Fld_GetDomainName(self);
+  }
+#endif
+
   void SetDomainName(const char* name ) {
     OGR_Fld_SetDomainName( self, name );
   }
@@ -2935,6 +3014,12 @@ public:
     return OGR_Fld_GetComment(self);
   }
 
+#ifdef SWIGJAVA
+  StringAsByteArray* GetCommentAsByteArray() {
+    return OGR_Fld_GetComment(self);
+  }
+#endif
+
   void SetComment(const char* comment ) {
     OGR_Fld_SetComment( self, comment );
   }
@@ -2970,11 +3055,17 @@ public:
   }
 
   const char * GetName() {
-    return (const char *) OGR_GFld_GetNameRef(self);
+    return OGR_GFld_GetNameRef(self);
   }
 
+#ifdef SWIGJAVA
+  StringAsByteArray* GetNameAsByteArray() {
+    return OGR_GFld_GetNameRef(self);
+  }
+#endif
+
   const char * GetNameRef() {
-    return (const char *) OGR_GFld_GetNameRef(self);
+    return OGR_GFld_GetNameRef(self);
   }
 
   void SetName( const char* name) {
@@ -3471,6 +3562,10 @@ public:
     return OGR_G_Area(self);
   }
 
+  double GeodesicLength() {
+    return OGR_G_GeodesicLength(self);
+  }
+
   double GeodesicArea() {
     return OGR_G_GeodesicArea(self);
   }
@@ -4054,10 +4149,22 @@ public:
     return OGR_FldDomain_GetName(self);
   }
 
+#ifdef SWIGJAVA
+  StringAsByteArray* GetNameAsByteArray() {
+    return OGR_FldDomain_GetName(self);
+  }
+#endif
+
   const char * GetDescription() {
     return OGR_FldDomain_GetDescription(self);
   }
 
+#ifdef SWIGJAVA
+  StringAsByteArray* GetDescriptionAsByteArray() {
+    return OGR_FldDomain_GetDescription(self);
+  }
+#endif
+
   OGRFieldType GetFieldType() {
     return OGR_FldDomain_GetFieldType(self);
   }
@@ -4180,6 +4287,12 @@ public:
       return OGR_GlobFldDomain_GetGlob(self);
   }
 
+#ifdef SWIGJAVA
+  StringAsByteArray* GetGlobAsByteArray() {
+    return OGR_GlobFldDomain_GetGlob(self);
+  }
+#endif
+
 } /* %extend */
 
 }; /* class OGRFieldDomainShadow */
diff --git a/swig/include/ogr_error_map.i b/swig/include/ogr_error_map.i
index 8db2d539ce8d..97ed768dc430 100644
--- a/swig/include/ogr_error_map.i
+++ b/swig/include/ogr_error_map.i
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2005, Kevin Ruland
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 %fragment("OGRErrMessages","header")
diff --git a/swig/include/osr.i b/swig/include/osr.i
index ebd9424e608c..bd52335f0f01 100644
--- a/swig/include/osr.i
+++ b/swig/include/osr.i
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2005, Kevin Ruland
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 #ifdef SWIGPYTHON
diff --git a/swig/include/python/docs/ogr_feature_docs.i b/swig/include/python/docs/ogr_feature_docs.i
index 6e73d15d1619..9be69f82625a 100644
--- a/swig/include/python/docs/ogr_feature_docs.i
+++ b/swig/include/python/docs/ogr_feature_docs.i
@@ -581,7 +581,7 @@ Returns the native media type for the feature.
 
 The native media type is the identifier for the format of the native
 data. It follows the IANA RFC 2045
-(seehttps://en.wikipedia.org/wiki/Media_type), e.g.
+(see https://en.wikipedia.org/wiki/Media_type), e.g.
 \"application/vnd.geo+json\" for JSon.
 
 See :cpp:func:`OGRFeature::GetNativeMediaType` and :ref:`rfc-60`.
diff --git a/swig/include/python/docs/ogr_geometry_docs.i b/swig/include/python/docs/ogr_geometry_docs.i
index 64acdd12f3b9..00a9dff17493 100644
--- a/swig/include/python/docs/ogr_geometry_docs.i
+++ b/swig/include/python/docs/ogr_geometry_docs.i
@@ -31,6 +31,36 @@ float:
 
 ";
 
+%feature("docstring")  Length "
+Compute geometry length.
+
+The returned length is a 2D Cartesian (planar) area in units of the
+spatial reference system in use, so potentially 'degrees' for a
+geometry expressed in a geographic SRS.
+
+For more details: :cpp:func:`OGR_G_Length`
+
+Returns
+--------
+float:
+    the length of the geometry in units of the spatial reference
+    system in use, or 0.0 for unsupported geometry types.
+
+";
+
+%feature("docstring")  GeodesicLength "
+Compute geometry length, considered as a curve on the underlying
+ellipsoid of the SRS attached to the geometry.
+
+For more details: :cpp:func:`OGR_G_GeodesicLength`
+
+Returns
+--------
+float:
+    the area in meters, or a negative value for unsupported geometry types.
+
+";
+
 %feature("docstring")  DumpReadable "
 Dump geometry in well known text format to indicated output file.
 
diff --git a/swig/include/python/docs/ogr_layer_docs.i b/swig/include/python/docs/ogr_layer_docs.i
index 59d1b86ed06d..180845de7738 100644
--- a/swig/include/python/docs/ogr_layer_docs.i
+++ b/swig/include/python/docs/ogr_layer_docs.i
@@ -47,7 +47,7 @@ force: int, default=False
 can_return_null: int, default=False
     Whether None can be returned in the response.
 geom_field: int, default=0
-    Ithe index of the geometry field on which to compute the extent.
+    The index of the geometry field on which to compute the extent.
     Can be iterated over using :py:func:`range` and :py:func:`GetGeomFieldCount`.
 
 Returns
diff --git a/swig/include/python/docs/osr_docs.i b/swig/include/python/docs/osr_docs.i
index 7f05b90e2e16..eb139579918d 100644
--- a/swig/include/python/docs/osr_docs.i
+++ b/swig/include/python/docs/osr_docs.i
@@ -9,7 +9,7 @@ Parameters
 src : SpatialReference
     source spatial reference system
 dst : SpatialReference
-    target spatial reference ystem
+    target spatial reference system
 options : CoordinateTransformationOptions
 
 Returns
diff --git a/swig/include/python/docs/osr_spatialreference_docs.i b/swig/include/python/docs/osr_spatialreference_docs.i
index 876e2e2d11c6..e990a81abe81 100644
--- a/swig/include/python/docs/osr_spatialreference_docs.i
+++ b/swig/include/python/docs/osr_spatialreference_docs.i
@@ -848,5 +848,19 @@ int
 
 ";
 
+%feature("docstring") StripVertical "
+
+Convert a compound CRS into a horizontal CRS.
+
+See :cpp:func:`OGRSpatialReference::StripVertical`.
+
+.. versionadded:: 3.6
+
+Returns
+-------
+OGRErr:
+    :py:const:`OGRERR_NONE` if the operation succeeds
+";
+
 }
 
diff --git a/swig/include/python/gdal_python.i b/swig/include/python/gdal_python.i
index 086d8089bf5a..902aa5d6bf50 100644
--- a/swig/include/python/gdal_python.i
+++ b/swig/include/python/gdal_python.i
@@ -1614,10 +1614,23 @@ CPLErr ReadRaster1( double xoff, double yoff, double xsize, double ysize,
         return get(value)
 %}
 
+%feature("pythonappend") GetThreadSafeDataset %{
+    if val:
+        val._parent_ds = self
+
+        import weakref
+        if not hasattr(self, '_child_references'):
+            self._child_references = weakref.WeakSet()
+        self._child_references.add(val)
+%}
+
+%feature("pythonprepend") Close %{
+    self._invalidate_children()
+%}
+
 %feature("pythonappend") Close %{
     self.thisown = 0
     self.this = None
-    self._invalidate_children()
 %}
 
 %feature("shadow") ExecuteSQL %{
@@ -1921,13 +1934,13 @@ def GetMDArrayNames(self, options = []) -> "list[str]":
       if not buffer_datatype:
         buffer_datatype = self.GetDataType()
 
-      is_1d_string = self.GetDataType().GetClass() == GEDTC_STRING and buffer_datatype.GetClass() == GEDTC_STRING and dimCount == 1
+      is_0d_or_1d_string = self.GetDataType().GetClass() == GEDTC_STRING and buffer_datatype.GetClass() == GEDTC_STRING and dimCount <= 1
 
       if not array_start_idx:
         array_start_idx = [0] * dimCount
 
       if not count:
-        if is_1d_string:
+        if is_0d_or_1d_string:
             assert type(buffer) == type([])
             count = [ len(buffer) ]
         else:
@@ -1946,7 +1959,7 @@ def GetMDArrayNames(self, options = []) -> "list[str]":
             stride *= cnt
         buffer_stride.reverse()
 
-      if is_1d_string:
+      if is_0d_or_1d_string:
           return _gdal.MDArray_WriteStringArray(self, array_start_idx, count, array_step, buffer_datatype, buffer)
 
       return _gdal.MDArray_Write(self, array_start_idx, count, array_step, buffer_stride, buffer_datatype, buffer)
@@ -2032,39 +2045,49 @@ def GetMDArrayNames(self, options = []) -> "list[str]":
             return s
         return self.ReadAsStringArray()
     if dt_class == GEDTC_NUMERIC:
-        if dt.GetNumericDataType() in (GDT_Byte, GDT_Int8, GDT_Int16, GDT_UInt16, GDT_Int32):
+        if dt.GetNumericDataType() in (GDT_Byte, GDT_UInt16,
+                                       GDT_Int8, GDT_Int16, GDT_Int32):
             if self.GetTotalElementsCount() == 1:
                 return self.ReadAsInt()
-            else:
-                return self.ReadAsIntArray()
-        else:
+            return self.ReadAsIntArray()
+        if dt.GetNumericDataType() in (GDT_UInt32, GDT_Int64):
             if self.GetTotalElementsCount() == 1:
-                return self.ReadAsDouble()
-            else:
-                return self.ReadAsDoubleArray()
+                return self.ReadAsInt64()
+            return self.ReadAsInt64Array()
+        if self.GetTotalElementsCount() == 1:
+            return self.ReadAsDouble()
+        return self.ReadAsDoubleArray()
     return self.ReadAsRaw()
 
   def Write(self, val):
     if isinstance(val, (int, type(12345678901234))):
         if val >= -0x80000000 and val <= 0x7FFFFFFF:
             return self.WriteInt(val)
-        else:
-            return self.WriteDouble(val)
+        if val >= -0x8000000000000000 and val <= 0x7FFFFFFFFFFFFFFF:
+            return self.WriteInt64(val)
+        return self.WriteDouble(val)
     if isinstance(val, float):
-      return self.WriteDouble(val)
+        return self.WriteDouble(val)
     if isinstance(val, str) and self.GetDataType().GetClass() != GEDTC_COMPOUND:
-      return self.WriteString(val)
+        return self.WriteString(val)
     if isinstance(val, list):
-      if len(val) == 0:
-        if self.GetDataType().GetClass() == GEDTC_STRING:
-            return self.WriteStringArray(val)
-        else:
+        if len(val) == 0:
+            if self.GetDataType().GetClass() == GEDTC_STRING:
+                return self.WriteStringArray(val)
+            return self.WriteDoubleArray(val)
+        if isinstance(val[0], (int, type(12345678901234))):
+            if all(v >= -0x80000000 and v <= 0x7FFFFFFF for v in val):
+                return self.WriteIntArray(val)
+            if all(v >= -0x8000000000000000 and v <= 0x7FFFFFFFFFFFFFFF
+                   for v in val):
+                return self.WriteInt64Array(val)
+            return self.WriteDoubleArray(val)
+        if isinstance(val[0], float):
             return self.WriteDoubleArray(val)
-      if isinstance(val[0], (int, type(12345678901234), float)):
-        return self.WriteDoubleArray(val)
-      if isinstance(val[0], str):
-        return self.WriteStringArray(val)
-    if isinstance(val, dict) and self.GetDataType().GetSubType() == GEDTST_JSON:
+        if isinstance(val[0], str):
+            return self.WriteStringArray(val)
+    if (isinstance(val, dict) and
+        self.GetDataType().GetSubType() == GEDTST_JSON):
         import json
         return self.WriteString(json.dumps(val))
     return self.WriteRaw(val)
@@ -2180,6 +2203,7 @@ def InfoOptions(options=None, format='text', deserialize=True,
          computeMinMax=False, reportHistograms=False, reportProj4=False,
          stats=False, approxStats=False, computeChecksum=False,
          showGCPs=True, showMetadata=True, showRAT=True, showColorTable=True,
+         showNodata=True, showMask=True,
          listMDD=False, showFileList=True, allMetadata=False,
          extraMDDomains=None, wktFormat=None):
     """ Create a InfoOptions() object that can be passed to gdal.Info()
@@ -2221,6 +2245,10 @@ def InfoOptions(options=None, format='text', deserialize=True,
             new_options += ['-norat']
         if not showColorTable:
             new_options += ['-noct']
+        if not showNodata:
+            new_options += ['-nonodata']
+        if not showMask:
+            new_options += ['-nomask']
         if listMDD:
             new_options += ['-listmdd']
         if not showFileList:
@@ -2924,7 +2952,7 @@ def WarpOptions(options=None, format=None,
         if transformerOptions is not None:
             if isinstance(transformerOptions, dict):
                 for k, v in transformerOptions.items():
-                    new_options += ['-to', opt]
+                    new_options += ['-to', f'{k}={v}']
             else:
                 for opt in transformerOptions:
                     new_options += ['-to', opt]
@@ -2977,7 +3005,12 @@ def Warp(destNameOrDestDS, srcDSOrSrcDSTab, **kwargs):
     Parameters
     ----------
     destNameOrDestDS:
-        Output dataset name or object
+        Output dataset name or object.
+
+        If passed as a dataset name, a potentially existing output dataset of
+        the same name will be overwritten. To update an existing output dataset,
+        it must be passed as a dataset object.
+
     srcDSOrSrcDSTab:
         an array of Dataset objects or filenames, or a Dataset object or a filename
     kwargs:
@@ -3041,6 +3074,7 @@ def VectorTranslateOptions(options=None, format=None,
          simplifyTolerance=None,
          segmentizeMaxDist=None,
          makeValid=False,
+         skipInvalid=False,
          mapFieldType=None,
          explodeCollections=False,
          zField=None,
@@ -3141,6 +3175,9 @@ def VectorTranslateOptions(options=None, format=None,
         maximum distance between consecutive nodes of a line geometry
     makeValid:
         run MakeValid() on geometries
+    skipInvalid:
+        whether to skip features with invalid geometries regarding the rules of
+        the Simple Features specification.
     mapFieldType:
         converts any field of the specified type to another type. Valid types are:
         Integer, Integer64, Real, String, Date, Time, DateTime, Binary, IntegerList,
@@ -3324,6 +3361,8 @@ def VectorTranslateOptions(options=None, format=None,
             new_options += ['-segmentize', str(segmentizeMaxDist)]
         if makeValid:
             new_options += ['-makevalid']
+        if skipInvalid:
+            new_options += ['-skipinvalid']
         if mapFieldType is not None:
             new_options += ['-mapFieldType']
             if isinstance(mapFieldType, str):
@@ -3387,6 +3426,13 @@ def VectorTranslate(destNameOrDestDS, srcDS, **kwargs):
     ----------
     destNameOrDestDS:
         Output dataset name or object
+
+        If passed as a dataset name, a potentially existing output dataset of
+        the same name will be overwritten. To update an existing output dataset,
+        it must be passed as a dataset object. Note that the accessMode parameter
+        also controls, at the layer level, if existing layers must be overwritten
+        or updated.
+
     srcDS:
         a Dataset object or a filename
     kwargs:
@@ -3654,6 +3700,11 @@ def Nearblack(destNameOrDestDS, srcDS, **kwargs):
     ----------
     destNameOrDestDS:
         Output dataset name or object
+
+        If passed as a dataset name, a potentially existing output dataset of
+        the same name will be overwritten. To update an existing output dataset,
+        it must be passed as a dataset object.
+
     srcDS:
         a Dataset object or a filename
     kwargs:
@@ -3887,10 +3938,10 @@ def RasterizeOptions(options=None, format=None,
         render path, or whose center point is within the polygon.
     burnValues:
         list of fixed values to burn into each band for all objects.
-        Excusive with attribute.
+        Exclusive with attribute.
     attribute:
         identifies an attribute field on the features to be used for a burn-in value.
-        The value will be burned into all output bands. Excusive with burnValues.
+        The value will be burned into all output bands. Exclusive with burnValues.
     useZ:
         whether to indicate that a burn value should be extracted from the "Z" values
         of the feature. These values are added to the burn value given by burnValues
@@ -4009,7 +4060,12 @@ def Rasterize(destNameOrDestDS, srcDS, **kwargs):
     Parameters
     ----------
     destNameOrDestDS:
-        Output dataset name or object
+        Output dataset name or object.
+
+        If passed as a dataset name, a potentially existing output dataset of
+        the same name will be overwritten. To update an existing output dataset,
+        it must be passed as a dataset object.
+
     srcDS:
         a Dataset object or a filename
     kwargs:
@@ -4178,6 +4234,11 @@ def Footprint(destNameOrDestDS, srcDS, **kwargs):
     ----------
     destNameOrDestDS:
         Output dataset name or object
+
+        If passed as a dataset name, a potentially existing output dataset of
+        the same name will be overwritten. To update an existing output dataset,
+        it must be passed as a dataset object.
+
     srcDS:
         a Dataset object or a filename
     kwargs:
@@ -4190,15 +4251,15 @@ def Footprint(destNameOrDestDS, srcDS, **kwargs):
 
     1. Special mode to get deserialized GeoJSON (in EPSG:4326 if dstSRS not specified):
 
-    >>> deserialized_geojson = gdal.FootPrint(None, src_ds, format="GeoJSON")
+    >>> deserialized_geojson = gdal.Footprint(None, src_ds, format="GeoJSON")
 
     2. Special mode to get WKT:
 
-    >>> wkt = gdal.FootPrint(None, src_ds, format="WKT")
+    >>> wkt = gdal.Footprint(None, src_ds, format="WKT")
 
     3. Get result in a GeoPackage
 
-    >>> gdal.FootPrintf("out.gpkg", src_ds, format="GPKG")
+    >>> gdal.Footprint("out.gpkg", src_ds, format="GPKG")
 
     """
 
@@ -4901,3 +4962,53 @@ def quiet_errors():
     tuple.row_intersection = row_intersection
     val = tuple
 %}
+
+
+%feature("pythonappend") MultipartUploadGetCapabilities %{
+    if val:
+        non_sequential_upload_supported, parallel_upload_supported, abort_supported, min_part_size, max_part_size, max_part_count = val
+        import collections
+        tuple = collections.namedtuple('MultipartUploadGetCapabilitiesResult',
+            ['non_sequential_upload_supported',
+             'parallel_upload_supported',
+             'abort_supported',
+             'min_part_size',
+             'max_part_size',
+             'max_part_count',
+             ])
+        tuple.non_sequential_upload_supported = non_sequential_upload_supported
+        tuple.parallel_upload_supported = parallel_upload_supported
+        tuple.abort_supported = abort_supported
+        tuple.min_part_size = min_part_size
+        tuple.max_part_size = max_part_size
+        tuple.max_part_count = max_part_count
+        val = tuple
+%}
+
+%feature("shadow") InterpolateAtPoint %{
+def InterpolateAtPoint(self, *args, **kwargs):
+    """Return the interpolated value at pixel and line raster coordinates.
+       See :cpp:func:`GDALRasterBand::InterpolateAtPoint`.
+
+       Parameters
+       ----------
+       pixel : float
+       line : float
+       interpolation : GRIOResampleAlg (nearest, bilinear, cubic, cubicspline)
+
+       Returns
+       -------
+       float:
+           Interpolated value, or ``None`` if it has any error.
+    """
+
+    ret = $action(self, *args, **kwargs)
+    if ret[0] != CE_None:
+        return None
+
+    from . import gdal
+    if gdal.DataTypeIsComplex(self.DataType):
+        return complex(ret[1], ret[2])
+    else:
+        return ret[1]
+%}
diff --git a/swig/include/python/ogr_python.i b/swig/include/python/ogr_python.i
index f8a9af40580b..7c99653c8f4d 100644
--- a/swig/include/python/ogr_python.i
+++ b/swig/include/python/ogr_python.i
@@ -451,7 +451,12 @@ def _WarnIfUserHasNotSpecifiedIfUsingExceptions():
             requested_schema = requested_schema.__arrow_c_schema__()
 
         if hasattr(obj, "__arrow_c_stream__"):
-            stream_capsule = obj.__arrow_c_stream__(requested_schema=requested_schema)
+            if requested_schema:
+                stream_capsule = obj.__arrow_c_stream__(requested_schema=requested_schema)
+            else:
+                # DuckDB 1.1 doesn't support the requested_schema argument at all
+                stream_capsule = obj.__arrow_c_stream__()
+
             return self.WriteArrowStreamCapsule(stream_capsule, createFieldsFromSchema, options)
 
         if hasattr(obj, "__arrow_c_array__"):
@@ -990,8 +995,13 @@ def _WarnIfUserHasNotSpecifiedIfUsingExceptions():
   def __iter__(self):
       for i in range(self.GetGeometryCount()):
           yield self.GetGeometryRef(i)
+%}
 
+%feature("pythonappend") GetGeometryRef %{
+    if val is not None:
+        val._parent_geom = self
 %}
+
 }
 
 
diff --git a/swig/include/python/python_exceptions.i b/swig/include/python/python_exceptions.i
index e52dcd9af4f1..c17c0be12dd1 100644
--- a/swig/include/python/python_exceptions.i
+++ b/swig/include/python/python_exceptions.i
@@ -16,6 +16,7 @@ struct PythonBindingErrorHandlerContext
     std::string     osInitialMsg{};
     std::string     osFailureMsg{};
     CPLErrorNum     nLastCode = CPLE_None;
+    bool            bMemoryError = false;
 };
 
 static void CPL_STDCALL
@@ -46,16 +47,31 @@ PythonBindingErrorHandler(CPLErr eclass, CPLErrorNum err_no, const char *msg )
   }
   else {
     ctxt->nLastCode = err_no;
-    if( ctxt->osFailureMsg.empty() ) {
-      ctxt->osFailureMsg = msg;
-      ctxt->osInitialMsg = ctxt->osFailureMsg;
-    } else {
-      if( ctxt->osFailureMsg.size() < 10000 ) {
-        ctxt->osFailureMsg = std::string(msg) + "\nMay be caused by: " + ctxt->osFailureMsg;
-        ctxt->osInitialMsg = ctxt->osFailureMsg;
-      }
-      else
-        ctxt->osFailureMsg = std::string(msg) + "\n[...]\nMay be caused by: " + ctxt->osInitialMsg;
+    try
+    {
+        if( ctxt->osFailureMsg.empty() ) {
+          ctxt->osFailureMsg = msg;
+          ctxt->osInitialMsg = ctxt->osFailureMsg;
+        } else {
+          if( ctxt->osFailureMsg.size() < 10000 ) {
+            std::string osTmp(msg);
+            osTmp += "\nMay be caused by: ";
+            osTmp += ctxt->osFailureMsg;
+            ctxt->osFailureMsg = std::move(osTmp);
+            ctxt->osInitialMsg = ctxt->osFailureMsg;
+          }
+          else
+          {
+            std::string osTmp(msg);
+            osTmp += "\n[...]\nMay be caused by: ";
+            osTmp += ctxt->osInitialMsg;
+            ctxt->osFailureMsg = std::move(osTmp);
+          }
+        }
+    }
+    catch( const std::exception& )
+    {
+        ctxt->bMemoryError = true;
     }
   }
 }
@@ -167,7 +183,12 @@ static void popErrorHandler()
     PythonBindingErrorHandlerContext* ctxt = static_cast<
       PythonBindingErrorHandlerContext*>(CPLGetErrorHandlerUserData());
     CPLPopErrorHandler();
-    if( !ctxt->osFailureMsg.empty() )
+    if( ctxt->bMemoryError )
+    {
+        CPLErrorSetState(
+          CE_Failure, CPLE_OutOfMemory, "Out of memory");
+    }
+    else if( !ctxt->osFailureMsg.empty() )
     {
       CPLErrorSetState(
           CPLGetLastErrorType() == CE_Failure ? CE_Failure: CE_Warning,
diff --git a/swig/include/python/python_strings.i b/swig/include/python/python_strings.i
index 6668e02b88c7..38ac34b10b0a 100644
--- a/swig/include/python/python_strings.i
+++ b/swig/include/python/python_strings.i
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2009, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 %{
diff --git a/swig/include/python/typemaps_python.i b/swig/include/python/typemaps_python.i
index 2531c60f39d8..1a20779192c1 100644
--- a/swig/include/python/typemaps_python.i
+++ b/swig/include/python/typemaps_python.i
@@ -92,12 +92,15 @@
   if ( !*$2 ) {
     Py_INCREF(Py_None);
     r = Py_None;
-    $result = t_output_helper($result,r);
   }
   else {
     r = PyFloat_FromDouble( *$1 );
-    $result = t_output_helper($result,r);
   }
+%#if SWIG_VERSION >= 0x040300
+  $result = SWIG_Python_AppendOutput($result,r,$isvoid);
+%#else
+  $result = SWIG_Python_AppendOutput($result,r);
+%#endif
 }
 
 
@@ -112,12 +115,15 @@
   if ( !*$2 ) {
     Py_INCREF(Py_None);
     r = Py_None;
-    $result = t_output_helper($result,r);
   }
   else {
     r = PyLong_FromLongLong( *$1 );
-    $result = t_output_helper($result,r);
   }
+%#if SWIG_VERSION >= 0x040300
+  $result = SWIG_Python_AppendOutput($result,r,$isvoid);
+%#else
+  $result = SWIG_Python_AppendOutput($result,r);
+%#endif
 }
 
 
@@ -132,12 +138,15 @@
   if ( !*$2 ) {
     Py_INCREF(Py_None);
     r = Py_None;
-    $result = t_output_helper($result,r);
   }
   else {
     r = PyLong_FromUnsignedLongLong( *$1 );
-    $result = t_output_helper($result,r);
   }
+%#if SWIG_VERSION >= 0x040300
+  $result = SWIG_Python_AppendOutput($result,r,$isvoid);
+%#else
+  $result = SWIG_Python_AppendOutput($result,r);
+%#endif
 }
 
 
@@ -151,7 +160,7 @@
 %enddef
 
 %define TYPEMAP_ARGOUT_ARGOUT_ARRAY_IS_VALID(num_values)
-%typemap(argout) (double argout[num_values], int* isvalid)
+%typemap(argout, fragment="CreateTupleFromDoubleArray") (double argout[num_values], int* isvalid)
 {
    /* %typemap(argout) (double argout[num_values], int* isvalid)  */
   PyObject *r;
@@ -162,7 +171,11 @@
   else {
     r = CreateTupleFromDoubleArray($1, num_values);
   }
-  $result = t_output_helper($result,r);
+%#if SWIG_VERSION >= 0x040300
+  $result = SWIG_Python_AppendOutput($result,r,$isvoid);
+%#else
+  $result = SWIG_Python_AppendOutput($result,r);
+%#endif
 }
 %enddef
 
@@ -212,6 +225,15 @@ TYPEMAP_ARGOUT_ARGOUT_ARRAY_IS_VALID(6)
   /* %typemap(out) IF_ERROR_RETURN_NONE */
 }
 
+%typemap(ret) IF_ERROR_RETURN_NONE
+{
+  /* %typemap(ret) IF_ERROR_RETURN_NONE */
+  if ($1 != CE_None ) {
+    Py_XDECREF( $result );
+    $result = Py_None;
+    Py_INCREF($result);
+  }
+}
 
 %import "ogr_error_map.i"
 
@@ -236,6 +258,32 @@ TYPEMAP_ARGOUT_ARGOUT_ARRAY_IS_VALID(6)
   }
 }
 
+%fragment("CreateTupleFromIntArray","header") %{
+static PyObject *
+CreateTupleFromIntArray( const int *first, size_t size ) {
+  PyObject *out = PyTuple_New( size );
+  for( unsigned int i=0; i<size; i++ ) {
+    PyObject *val = PyInt_FromLong( *first );
+    ++first;
+    PyTuple_SetItem( out, i, val );
+  }
+  return out;
+}
+%}
+
+%fragment("CreateTupleFromInt64Array","header") %{
+static PyObject *
+CreateTupleFromInt64Array( const long long *first, size_t size ) {
+  PyObject *out = PyTuple_New( size );
+  for( unsigned int i=0; i<size; i++ ) {
+    PyObject *val = PyLong_FromLongLong( *first );
+    ++first;
+    PyTuple_SetItem( out, i, val );
+  }
+  return out;
+}
+%}
+
 %fragment("CreateTupleFromDoubleArray","header") %{
 static PyObject *
 CreateTupleFromDoubleArray( const double *first, size_t size ) {
@@ -255,11 +303,15 @@ CreateTupleFromDoubleArray( const double *first, size_t size ) {
   memset(argout, 0, sizeof(argout));
   $1 = argout;
 }
-%typemap(argout,fragment="t_output_helper,CreateTupleFromDoubleArray") ( double argout[ANY])
+%typemap(argout,fragment="CreateTupleFromDoubleArray") ( double argout[ANY])
 {
   /* %typemap(argout) (double argout[ANY]) */
   PyObject *out = CreateTupleFromDoubleArray( $1, $dim0 );
-  $result = t_output_helper($result,out);
+%#if SWIG_VERSION >= 0x040300
+  $result = SWIG_Python_AppendOutput($result,out,$isvoid);
+%#else
+  $result = SWIG_Python_AppendOutput($result,out);
+%#endif
 }
 
 %typemap(in,numinputs=0) ( double *argout[ANY]) (double *argout)
@@ -268,11 +320,15 @@ CreateTupleFromDoubleArray( const double *first, size_t size ) {
   argout = NULL;
   $1 = &argout;
 }
-%typemap(argout,fragment="t_output_helper,CreateTupleFromDoubleArray") ( double *argout[ANY])
+%typemap(argout,fragment="CreateTupleFromDoubleArray") ( double *argout[ANY])
 {
   /* %typemap(argout) (double *argout[ANY]) */
   PyObject *out = CreateTupleFromDoubleArray( *$1, $dim0 );
-  $result = t_output_helper($result,out);
+%#if SWIG_VERSION >= 0x040300
+  $result = SWIG_Python_AppendOutput($result,out,$isvoid);
+%#else
+  $result = SWIG_Python_AppendOutput($result,out);
+%#endif
 }
 %typemap(freearg) (double *argout[ANY])
 {
@@ -365,6 +421,66 @@ CreateCIntListFromSequence( PyObject* pySeq, int* pnSize ) {
   free($2);
 }
 
+%fragment("CreateCInt64ListFromSequence","header") %{
+static long long*
+CreateCInt64ListFromSequence( PyObject* pySeq, int* pnSize ) {
+  /* check if is List */
+  if ( !PySequence_Check(pySeq) ) {
+    PyErr_SetString(PyExc_TypeError, "not a sequence");
+    *pnSize = -1;
+    return NULL;
+  }
+  Py_ssize_t size = PySequence_Size(pySeq);
+  if( size > (Py_ssize_t)INT_MAX ) {
+    PyErr_SetString(PyExc_RuntimeError, "too big sequence");
+    *pnSize = -1;
+    return NULL;
+  }
+  if( (size_t)size > SIZE_MAX / sizeof(long long) ) {
+    PyErr_SetString(PyExc_RuntimeError, "too big sequence");
+    *pnSize = -1;
+    return NULL;
+  }
+  *pnSize = (int)size;
+  long long* ret = (long long*) malloc((*pnSize)*sizeof(long long));
+  if( !ret ) {
+    PyErr_SetString(PyExc_MemoryError, "cannot allocate temporary buffer");
+    *pnSize = -1;
+    return NULL;
+  }
+  for( int i = 0; i<*pnSize; i++ ) {
+    PyObject *o = PySequence_GetItem(pySeq,i);
+    if ( !PyArg_Parse(o,"L",&ret[i]) ) {
+        PyErr_SetString(PyExc_TypeError, "not an integer");
+        Py_DECREF(o);
+        free(ret);
+        *pnSize = -1;
+        return NULL;
+    }
+    Py_DECREF(o);
+  }
+  return ret;
+}
+%}
+
+/*
+ *  Typemap for counted arrays of int64s <- PySequence
+ */
+%typemap(in,numinputs=1,fragment="CreateCInt64ListFromSequence") (int nList, long long* pList)
+{
+  /* %typemap(in,numinputs=1) (int nList, long long* pList)*/
+  $2 = CreateCInt64ListFromSequence($input, &$1);
+  if( $1 < 0 ) {
+    SWIG_fail;
+  }
+}
+
+%typemap(freearg) (int nList, long long* pList)
+{
+  /* %typemap(freearg) (int nList, long long* pList) */
+  free($2);
+}
+
 %fragment("CreateCGIntBigListFromSequence","header") %{
 static GIntBig*
 CreateCGIntBigListFromSequence( PyObject* pySeq, int* pnSize ) {
@@ -545,19 +661,6 @@ CreateCDoubleListFromSequence( PyObject* pySeq, int* pnSize ) {
   free($2);
 }
 
-%fragment("CreateTupleFromIntegerArray","header") %{
-static PyObject *
-CreateTupleFromDoubleArray( int *first, unsigned int size ) {
-  PyObject *out = PyTuple_New( size );
-  for( unsigned int i=0; i<size; i++ ) {
-    PyObject *val = PyInt_FromInt( *first );
-    ++first;
-    PyTuple_SetItem( out, i, val );
-  }
-  return out;
-}
-%}
-
 /*
  * Typemap Band::ReadRaster()
  */
@@ -1387,7 +1490,7 @@ static PyObject* CSLToList( char** stringarray, bool *pbErr )
   /* %typemap(in,numinputs=0) (char **argout) */
   $1 = &argout;
 }
-%typemap(argout,fragment="t_output_helper") (char **argout)
+%typemap(argout) (char **argout)
 {
   /* %typemap(argout) (char **argout) */
   PyObject *o;
@@ -1398,7 +1501,11 @@ static PyObject* CSLToList( char** stringarray, bool *pbErr )
     o = Py_None;
     Py_INCREF( o );
   }
-  $result = t_output_helper($result, o);
+%#if SWIG_VERSION >= 0x040300
+  $result = SWIG_Python_AppendOutput($result,o,$isvoid);
+%#else
+  $result = SWIG_Python_AppendOutput($result,o);
+%#endif
 }
 %typemap(freearg) (char **argout)
 {
@@ -2515,7 +2622,11 @@ DecomposeSequenceOf4DCoordinates( PyObject *seq, int nCount, double *x, double *
     PyTuple_SetItem( r, 0, PyLong_FromLong(*$1) );
     PyTuple_SetItem( r, 1, PyLong_FromLong(*$2) );
   }
-  $result = t_output_helper($result,r);
+%#if SWIG_VERSION >= 0x040300
+  $result = SWIG_Python_AppendOutput($result,r,$isvoid);
+%#else
+  $result = SWIG_Python_AppendOutput($result,r);
+%#endif
 }
 
 %typemap(in,numinputs=0) (OGRLayerShadow** ppoBelongingLayer, double* pdfProgressPct) ( OGRLayerShadow* poBelongingLayer = NULL, double dfProgressPct = 0 )
@@ -2544,14 +2655,19 @@ DecomposeSequenceOf4DCoordinates( PyObject *seq, int nCount, double *x, double *
         PyList_SetItem($result, 0, Py_None);
     }
 
+    PyObject* r;
     if ( !*$1 ) {
+        r = Py_None;
         Py_INCREF(Py_None);
-        $result = SWIG_Python_AppendOutput($result, Py_None);
     }
     else {
-        $result = SWIG_Python_AppendOutput($result,
-            SWIG_NewPointerObj(SWIG_as_voidptr( *$1), SWIGTYPE_p_OGRLayerShadow, 0 ));
+        r = SWIG_NewPointerObj(SWIG_as_voidptr( *$1), SWIGTYPE_p_OGRLayerShadow, 0 );
     }
+%#if SWIG_VERSION >= 0x040300
+    $result = SWIG_Python_AppendOutput($result,r,$isvoid);
+%#else
+    $result = SWIG_Python_AppendOutput($result,r);
+%#endif
   }
 
   if( arg3 )
@@ -2561,7 +2677,12 @@ DecomposeSequenceOf4DCoordinates( PyObject *seq, int nCount, double *x, double *
         $result = PyList_New(1);
         PyList_SetItem($result, 0, Py_None);
     }
-    $result = SWIG_Python_AppendOutput($result, PyFloat_FromDouble( *$2));
+    PyObject* r = PyFloat_FromDouble( *$2);
+%#if SWIG_VERSION >= 0x040300
+    $result = SWIG_Python_AppendOutput($result,r,$isvoid);
+%#else
+    $result = SWIG_Python_AppendOutput($result,r);
+%#endif
   }
 
 }
@@ -2834,18 +2955,12 @@ OBJECT_LIST_INPUT_ITEM_MAY_BE_NULL(GDALDimensionHS);
   $1 = &vals;
   $2 = &nCount;
 }
-%typemap(argout) (int** pvals, size_t* pnCount)
+%typemap(argout, fragment="CreateTupleFromIntArray") (int** pvals, size_t* pnCount)
 {
   /* %typemap(argout) (int** pvals, size_t* pnCount) */
+  PyObject *list = CreateTupleFromIntArray(*$1, *$2);
   Py_DECREF($result);
-  $result = PyTuple_New( *$2 );
-  if( !$result ) {
-    SWIG_fail;
-  }
-  for( unsigned int i=0; i<*$2; i++ ) {
-    PyObject *val = PyInt_FromLong( (*$1)[i] );
-    PyTuple_SetItem( $result, i, val );
-  }
+  $result = list;
 }
 
 %typemap(freearg) (int** pvals, size_t* pnCount)
@@ -2854,6 +2969,29 @@ OBJECT_LIST_INPUT_ITEM_MAY_BE_NULL(GDALDimensionHS);
   CPLFree(*$1);
 }
 
+/*
+ * Typemap argout for GDALAttributeReadAsInt64Array()
+ */
+%typemap(in,numinputs=0) (long long** pvals, size_t* pnCount) ( long long* vals=0, size_t nCount = 0 )
+{
+  /* %typemap(in,numinputs=0) (long long** pvals, size_t* pnCount) */
+  $1 = &vals;
+  $2 = &nCount;
+}
+%typemap(argout, fragment="CreateTupleFromInt64Array") (long long** pvals, size_t* pnCount)
+{
+  /* %typemap(argout) (int** pvals, size_t* pnCount) */
+  PyObject *list = CreateTupleFromInt64Array(*$1, *$2);
+  Py_DECREF($result);
+  $result = list;
+}
+
+%typemap(freearg) (long long** pvals, size_t* pnCount)
+{
+  /* %typemap(freearg) (long long** pvals, size_t* pnCount) */
+  CPLFree(*$1);
+}
+
 /*
  * Typemap argout for GDALAttributeReadAsDoubleArray()
  */
@@ -2863,7 +3001,7 @@ OBJECT_LIST_INPUT_ITEM_MAY_BE_NULL(GDALDimensionHS);
   $1 = &vals;
   $2 = &nCount;
 }
-%typemap(argout) (double** pvals, size_t* pnCount)
+%typemap(argout, fragment="CreateTupleFromDoubleArray") (double** pvals, size_t* pnCount)
 {
   /* %typemap(argout) (double** pvals, size_t* pnCount) */
   PyObject *list = CreateTupleFromDoubleArray(*$1, *$2);
@@ -2929,9 +3067,27 @@ OBJECT_LIST_INPUT(GDALEDTComponentHS)
   PyTuple_SetItem( r, 2, PyFloat_FromDouble($1[2]));
   PyTuple_SetItem( r, 3, PyFloat_FromDouble($1[3]));
   PyTuple_SetItem( r, 4, PyLong_FromLong($2[0]));
-  $result = t_output_helper($result,r);
+%#if SWIG_VERSION >= 0x040300
+  $result = SWIG_Python_AppendOutput($result,r,$isvoid);
+%#else
+  $result = SWIG_Python_AppendOutput($result,r);
+%#endif
 }
 
+%typemap(in) GDALAccess
+{
+    // %typemap(in) GDALAccess
+    int val = 0;
+    int ecode = SWIG_AsVal_int($input, &val);
+    if (!SWIG_IsOK(ecode)) {
+        SWIG_exception_fail(SWIG_ArgError(ecode), "invalid value for GDALAccess");
+    }
+    if( val != GA_ReadOnly && val != GA_Update )
+    {
+        SWIG_exception_fail(SWIG_ValueError, "invalid value for GDALAccess");
+    }
+    $1 = static_cast<GDALAccess>(val);
+}
 
 %typemap(in) GDALRIOResampleAlg
 {
@@ -3466,7 +3622,11 @@ OBJECT_LIST_INPUT(GDALMDArrayHS);
   PyTuple_SetItem( r, 0, PyBool_FromLong(*$1) );
   PyTuple_SetItem( r, 1, PyLong_FromLong(*$2) );
   PyTuple_SetItem( r, 2, PyLong_FromLong(*$3) );
-  $result = t_output_helper($result,r);
+%#if SWIG_VERSION >= 0x040300
+  $result = SWIG_Python_AppendOutput($result,r,$isvoid);
+%#else
+  $result = SWIG_Python_AppendOutput($result,r);
+%#endif
 }
 
 
@@ -3493,5 +3653,65 @@ OBJECT_LIST_INPUT(GDALMDArrayHS);
       Py_INCREF(Py_None);
       PyTuple_SetItem( r, 1, Py_None );
   }
-  $result = t_output_helper($result,r);
+%#if SWIG_VERSION >= 0x040300
+  $result = SWIG_Python_AppendOutput($result,r,$isvoid);
+%#else
+  $result = SWIG_Python_AppendOutput($result,r);
+%#endif
+}
+
+
+%typemap(in,numinputs=0) (int* pnRetCode,
+                          int *pbNonSequentialUploadSupported,
+                          int *pbParallelUploadSupported,
+                          int *pbSupportsAbort,
+                          size_t *pnMinPartSize,
+                          size_t *pnMaxPartSize,
+                          int *pnMaxPartCount) (
+                              int nRetCode = 0,
+                              int bNonSequentialUploadSupported = 0,
+                              int bParallelUploadSupported = 0,
+                              int bSupportsAbort = 0,
+                              size_t nMinPartSize = 0,
+                              size_t nMaxPartSize = 0,
+                              int nMaxPartCount = 0 )
+{
+  $1 = &nRetCode;
+  $2 = &bNonSequentialUploadSupported;
+  $3 = &bParallelUploadSupported;
+  $4 = &bSupportsAbort;
+  $5 = &nMinPartSize;
+  $6 = &nMaxPartSize;
+  $7 = &nMaxPartCount;
+}
+
+%typemap(argout) (int* pnRetCode,
+                  int *pbNonSequentialUploadSupported,
+                  int *pbParallelUploadSupported,
+                  int *pbSupportsAbort,
+                  size_t *pnMinPartSize,
+                  size_t *pnMaxPartSize,
+                  int *pnMaxPartCount)
+{
+  if( *$1 == 0 )
+  {
+      Py_DECREF($result);
+      $result = Py_None;
+      Py_INCREF(Py_None);
+  }
+  else
+  {
+      PyObject *r = PyTuple_New( 6 );
+      PyTuple_SetItem( r, 0, PyBool_FromLong(*$2) );
+      PyTuple_SetItem( r, 1, PyBool_FromLong(*$3) );
+      PyTuple_SetItem( r, 2, PyBool_FromLong(*$4) );
+      PyTuple_SetItem( r, 3, PyLong_FromUnsignedLongLong(*$5) );
+      PyTuple_SetItem( r, 4, PyLong_FromUnsignedLongLong(*$6) );
+      PyTuple_SetItem( r, 5, PyLong_FromUnsignedLongLong(*$7) );
+%#if SWIG_VERSION >= 0x040300
+      $result = SWIG_Python_AppendOutput($result,r,$isvoid);
+%#else
+      $result = SWIG_Python_AppendOutput($result,r);
+%#endif
+  }
 }
diff --git a/swig/java/CMakeLists.txt b/swig/java/CMakeLists.txt
index 6198ab9b12f3..5a3530206773 100644
--- a/swig/java/CMakeLists.txt
+++ b/swig/java/CMakeLists.txt
@@ -191,6 +191,7 @@ if (Java_Runtime_FOUND AND BUILD_TESTING)
   file(REMOVE_RECURSE ${CMAKE_CURRENT_BINARY_DIR}/tmp_test)
   file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tmp_test)
   file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/test_data/byte.tif DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tmp_test)
+  file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/test_data/iso_8859_1.csv DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tmp_test)
 
   if (WIN32)
     set(CLASSPATH_SEPARATOR "\\;")
@@ -229,9 +230,8 @@ if (Java_Runtime_FOUND AND BUILD_TESTING)
   add_test(NAME java_OSRTest COMMAND ${JAVA_RUN} OSRTest)
   add_test(NAME java_test_ogrfielddomains COMMAND ${JAVA_RUN} test_ogrfielddomains)
 
-  foreach (
-    test_name IN
-    ITEMS java_GDALOverviews
+  set(JAVA_TEST_LIST
+          java_GDALOverviews
           java_gdalinfo
           java_ogr2ogr_1
           java_ogrinfo_1
@@ -247,7 +247,14 @@ if (Java_Runtime_FOUND AND BUILD_TESTING)
           java_testgetpoints
           java_ogrtindex
           java_OSRTest
-          java_test_ogrfielddomains)
+          java_test_ogrfielddomains
+  )
+  if (OGR_ENABLE_DRIVER_CSV)
+      add_test(NAME java_OGRTest COMMAND ${JAVA_RUN} OGRTest)
+      list(APPEND JAVA_TEST_LIST java_OGRTest)
+  endif()
+
+  foreach (test_name IN LISTS JAVA_TEST_LIST)
     set_property(TEST ${test_name} PROPERTY ENVIRONMENT "${TEST_ENV}")
   endforeach ()
 
diff --git a/swig/java/add_javadoc.c b/swig/java/add_javadoc.c
index d16fe6f556ad..353c33b5d322 100644
--- a/swig/java/add_javadoc.c
+++ b/swig/java/add_javadoc.c
@@ -9,23 +9,7 @@
 *******************************************************************************
  * Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+ * SPDX-License-Identifier: MIT
 *******************************************************************************/
 
 /* NOTE : this is really a quick and very dirty hack to put the javadoc contained */
diff --git a/swig/java/apps/GDALContour.java b/swig/java/apps/GDALContour.java
index 9a27e10b3d3c..bc7b4c457bae 100644
--- a/swig/java/apps/GDALContour.java
+++ b/swig/java/apps/GDALContour.java
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Ivan Lucena
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 import org.gdal.gdal.Band;
diff --git a/swig/java/apps/GDALGrid.java b/swig/java/apps/GDALGrid.java
index d56db50c1a15..ae252081a81a 100644
--- a/swig/java/apps/GDALGrid.java
+++ b/swig/java/apps/GDALGrid.java
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2010, Ivan Lucena
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 import java.util.ArrayList;
diff --git a/swig/java/apps/GDALOverviews.java b/swig/java/apps/GDALOverviews.java
index ed029934abec..da57cb9cee02 100644
--- a/swig/java/apps/GDALOverviews.java
+++ b/swig/java/apps/GDALOverviews.java
@@ -12,23 +12,7 @@
  * Copyright (c) 2009, Even Rouault
  * Copyright (c) 2007, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 import org.gdal.gdalconst.gdalconst;
diff --git a/swig/java/apps/GDALProximity.java b/swig/java/apps/GDALProximity.java
index acc5a6beb95b..f824aaddb5db 100644
--- a/swig/java/apps/GDALProximity.java
+++ b/swig/java/apps/GDALProximity.java
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2008, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 import org.gdal.gdal.Band;
diff --git a/swig/java/apps/GDALTestIO.java b/swig/java/apps/GDALTestIO.java
index 8cbf51ff9501..4af18b71f7f6 100644
--- a/swig/java/apps/GDALTestIO.java
+++ b/swig/java/apps/GDALTestIO.java
@@ -11,23 +11,7 @@
  ******************************************************************************
  * Copyright (c) 2009, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 import java.nio.ByteBuffer;
diff --git a/swig/java/apps/GDALTestMultiDim.java b/swig/java/apps/GDALTestMultiDim.java
index de0633f20c83..f6bba5c97f86 100644
--- a/swig/java/apps/GDALTestMultiDim.java
+++ b/swig/java/apps/GDALTestMultiDim.java
@@ -11,23 +11,7 @@
  ******************************************************************************
  * Copyright (c) 2009, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 import java.util.Arrays;
diff --git a/swig/java/apps/OGRFeature.java b/swig/java/apps/OGRFeature.java
index 79bca9451bc0..0d2d7f47abee 100644
--- a/swig/java/apps/OGRFeature.java
+++ b/swig/java/apps/OGRFeature.java
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2009, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 import org.gdal.ogr.Feature;
diff --git a/swig/java/apps/OGRTest.java b/swig/java/apps/OGRTest.java
new file mode 100644
index 000000000000..025fcdd4ba80
--- /dev/null
+++ b/swig/java/apps/OGRTest.java
@@ -0,0 +1,31 @@
+/******************************************************************************
+ * Name:     OGRTest.java
+ * Project:  OGR Java Interface
+ * Purpose:  Test OGR module
+ * Author:   Even Rouault, <even dot rouault at spatialys.com>
+ *
+ ******************************************************************************
+ * Copyright (c) 2024, Even Rouault
+ *
+ * SPDX-License-Identifier: MIT
+ *****************************************************************************/
+
+import java.util.Arrays;
+import org.gdal.ogr.*;
+
+public class OGRTest
+{
+    public static void main(String[] args) throws Exception
+    {
+        ogr.RegisterAll();
+        DataSource poDS = ogr.Open("tmp_test/iso_8859_1.csv", false);
+        Layer lyr = poDS.GetLayer(0);
+        FieldDefn fld_defn = lyr.GetLayerDefn().GetFieldDefn(1);
+        String got = fld_defn.GetName();
+        if (!got.equals("field_"))
+            throw new Exception("Got '" + got + "'");
+        byte[] byteArray = fld_defn.GetNameAsByteArray();
+        if(!Arrays.equals(byteArray, new byte[]{'f', 'i', 'e', 'l', 'd', '_', 0xE9 - 256, 'x'}))
+            throw new Exception("GetNameAsByteArray() returned unexpected content of size " + byteArray.length);
+    }
+}
diff --git a/swig/java/apps/OGRTestGC.java b/swig/java/apps/OGRTestGC.java
index fae4bbfc57f8..10e971f5e040 100644
--- a/swig/java/apps/OGRTestGC.java
+++ b/swig/java/apps/OGRTestGC.java
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2009, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 import org.gdal.ogr.ogr;
diff --git a/swig/java/apps/OSRTest.java b/swig/java/apps/OSRTest.java
index cb97ba2c559c..24228dad2709 100644
--- a/swig/java/apps/OSRTest.java
+++ b/swig/java/apps/OSRTest.java
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2016, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 import org.gdal.osr.SpatialReference;
@@ -38,5 +22,9 @@ public static void main(String[] args) throws Exception {
               throw new Exception("srs.GetAxisName(null, 0) = " + srs.GetAxisName(null, 0));
           if( srs.GetAxisOrientation(null, 0) != org.gdal.osr.osr.OAO_North)
               throw new Exception("srs.GetAxisName(null, 0) = " + srs.GetAxisName(null, 0));
+          if( srs.EPSGTreatsAsLatLong() != 1 )
+              throw new Exception("srs.EPSGTreatsAsLatLong() should return 1");
+          if( srs.EPSGTreatsAsNorthingEasting() != 0 )
+              throw new Exception("srs.EPSGTreatsAsNorthingEasting() should return 0");
       }
 }
diff --git a/swig/java/apps/OSRTransform.java b/swig/java/apps/OSRTransform.java
index e152b0fd4d02..f122e77c7eb0 100644
--- a/swig/java/apps/OSRTransform.java
+++ b/swig/java/apps/OSRTransform.java
@@ -12,23 +12,7 @@
  * Copyright (c) 2009, Even Rouault
  * Copyright (c) 2007, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 import java.lang.Math;
diff --git a/swig/java/apps/ReadXML.java b/swig/java/apps/ReadXML.java
index da346f1e25c2..69bdeea6526d 100644
--- a/swig/java/apps/ReadXML.java
+++ b/swig/java/apps/ReadXML.java
@@ -13,23 +13,7 @@
  * Copyright (c) 2007, Tamas Szekeres
  *
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 import org.gdal.gdal.XMLNode;
diff --git a/swig/java/apps/WKT2WKB.java b/swig/java/apps/WKT2WKB.java
index db43046a9970..27f0f19114e8 100644
--- a/swig/java/apps/WKT2WKB.java
+++ b/swig/java/apps/WKT2WKB.java
@@ -12,23 +12,7 @@
  * Copyright (c) 2009, Even Rouault
  * Copyright (c) 2007, Tamas Szekeres
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 import org.gdal.ogr.Geometry;
diff --git a/swig/java/apps/gdalinfo.java b/swig/java/apps/gdalinfo.java
index c710fbf7319d..5e80ce676fd9 100644
--- a/swig/java/apps/gdalinfo.java
+++ b/swig/java/apps/gdalinfo.java
@@ -11,23 +11,7 @@
  * Copyright (c) 1998, Frank Warmerdam
  * Copyright (c) 2006, The MITRE Corporation
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 
diff --git a/swig/java/apps/gdalmajorobject.java b/swig/java/apps/gdalmajorobject.java
index 9adbfb32dae0..a7d6228dc231 100644
--- a/swig/java/apps/gdalmajorobject.java
+++ b/swig/java/apps/gdalmajorobject.java
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2009, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 import org.gdal.gdal.gdal;
diff --git a/swig/java/apps/gdaltransformer.java b/swig/java/apps/gdaltransformer.java
index 7807731b408b..03a731b793d4 100644
--- a/swig/java/apps/gdaltransformer.java
+++ b/swig/java/apps/gdaltransformer.java
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2009, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 import org.gdal.gdal.gdal;
diff --git a/swig/java/apps/multireadtest.java b/swig/java/apps/multireadtest.java
index 156f172d2aaa..cba4fd27558e 100644
--- a/swig/java/apps/multireadtest.java
+++ b/swig/java/apps/multireadtest.java
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2013, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 import org.gdal.gdal.gdal;
diff --git a/swig/java/apps/ogr2ogr.java b/swig/java/apps/ogr2ogr.java
index 84f03e965c69..be69d26190ca 100644
--- a/swig/java/apps/ogr2ogr.java
+++ b/swig/java/apps/ogr2ogr.java
@@ -11,23 +11,7 @@
  * Copyright (c) 2009, Even Rouault
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 import java.io.File;
diff --git a/swig/java/apps/ogr2ogr_new.java b/swig/java/apps/ogr2ogr_new.java
index db552b27cdbb..7ffa9ff16ac1 100644
--- a/swig/java/apps/ogr2ogr_new.java
+++ b/swig/java/apps/ogr2ogr_new.java
@@ -8,23 +8,7 @@
  ******************************************************************************
  * Copyright (c) 2015, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 import org.gdal.gdal.gdal;
diff --git a/swig/java/apps/ogrinfo.java b/swig/java/apps/ogrinfo.java
index 676906f5a00a..9b2e0633ebcc 100644
--- a/swig/java/apps/ogrinfo.java
+++ b/swig/java/apps/ogrinfo.java
@@ -12,23 +12,7 @@
  * Copyright (c) 2009, Even Rouault
  * Copyright (c) 1999, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 import org.gdal.gdal.gdal;
diff --git a/swig/java/apps/ogrtindex.java b/swig/java/apps/ogrtindex.java
index a393f55a8b07..d872423f4d36 100644
--- a/swig/java/apps/ogrtindex.java
+++ b/swig/java/apps/ogrtindex.java
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2002, Frank Warmerdam
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 import org.gdal.gdal.gdal;
diff --git a/swig/java/apps/test_ogrfielddomains.java b/swig/java/apps/test_ogrfielddomains.java
index c4988818ae04..ffcb345ad4b6 100644
--- a/swig/java/apps/test_ogrfielddomains.java
+++ b/swig/java/apps/test_ogrfielddomains.java
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2023, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  ****************************************************************************/
 
 import org.gdal.ogr.*;
diff --git a/swig/java/apps/testgetpoints.java b/swig/java/apps/testgetpoints.java
index cfa81a1374ba..ec62ad7e8a28 100644
--- a/swig/java/apps/testgetpoints.java
+++ b/swig/java/apps/testgetpoints.java
@@ -9,23 +9,7 @@
  ******************************************************************************
  * Copyright (c) 2011, Even Rouault
  *
- * 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.
+ * SPDX-License-Identifier: MIT
  *****************************************************************************/
 
 import org.gdal.ogr.Geometry;
diff --git a/swig/java/javadoc.java b/swig/java/javadoc.java
index 2d8f13764163..37e57f6bd572 100644
--- a/swig/java/javadoc.java
+++ b/swig/java/javadoc.java
@@ -9,23 +9,7 @@
 * Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.com>
 * Copyright (c) 1999-2009, Frank Warmerdam
 *
-* 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.
+ * SPDX-License-Identifier: MIT
 *************************************************************************** */
 
 /* Class gdal */
@@ -6336,7 +6320,7 @@ public class DataSource:public void ReleaseResultSet(Layer layer)
 to flush to disk.
 <p>
 The default implementation of this method just calls the SyncToDisk() method
-on each of the layers.  Conceptionally, calling SyncToDisk() on a datasource
+on each of the layers.  Conceptually, calling SyncToDisk() on a datasource
 should include any work that might be accomplished by calling SyncToDisk()
 on layers in that data source.
 <p>
@@ -6859,9 +6843,22 @@ public class Layer:public FeatureDefn GetLayerDefn()
  * definition initialization.
  *
  * @return the layer name
+ * @see #GetNameAsByteArray()
 */
 public class Layer:public String GetName()
 
+/**
+ * Return the layer name (when it is not UTF-8 encoded).
+ * <p>
+ * This returns the same content as GetLayerDefn().GetName(), but for a
+ * few drivers, calling GetName() directly can avoid lengthy layer
+ * definition initialization.
+ *
+ * @return the layer name
+ * @since 3.10
+*/
+public class Layer:public byte GetNameAsByteArray()
+
 /**
  * Return the layer geometry type.
  * <p>
@@ -7756,6 +7753,7 @@ public class Feature:public int[] GetFieldAsIntegerList(int ifield)
  * @param ifield the field to fetch, from 0 to GetFieldCount()-1.
  *
  * @return the field value.
+ * @see #GetFieldAsStringAsByteArray(int)
  */
 public class Feature:public String GetFieldAsString(int ifield)
 
@@ -7769,9 +7767,38 @@ public class Feature:public String GetFieldAsString(int ifield)
  * @param name the name of the field to fetch.
  *
  * @return the field value.
+ * @see #GetFieldAsStringAsByteArray(String)
  */
 public class Feature:public String GetFieldAsString(String name)
 
+/**
+ * Fetch field value as a string (when it is not UTF-8 encoded).
+ * <p>
+ * OFTReal and OFTInteger fields will be translated to string using
+ * sprintf(), but not necessarily using the established formatting rules.
+ * Other field types, or errors will result in a return value of zero.
+ *
+ * @param ifield the field to fetch, from 0 to GetFieldCount()-1.
+ *
+ * @return the field value.
+ * @since 3.10
+ */
+public class Feature:public byte[] GetFieldAsStringAsByteArray(int ifield)
+
+/**
+ * Fetch field value as a string (when it is not UTF-8 encoded).
+ * <p>
+ * OFTReal and OFTInteger fields will be translated to string using
+ * sprintf(), but not necessarily using the established formatting rules.
+ * Other field types, or errors will result in a return value of zero.
+ *
+ * @param name the name of the field to fetch.
+ *
+ * @return the field value.
+ * @since 3.10
+ */
+public class Feature:public byte[] GetFieldAsStringAsByteArray(String name)
+
 /**
  * Fetch field value as a list of strings.
  * <p>
@@ -7861,9 +7888,23 @@ public class Feature:public Geometry GetGeometryRef()
  *
  * @return a reference to a representation in string format, or null if
  * there isn't one.
+ *
+ * @see #GetStyleStringAsByteArray()
  */
 public class Feature:public String GetStyleString()
 
+/**
+ * Fetch style string for this feature (when it is not UTF-8 encoded).
+ * <p>
+ * Set the OGR Feature Style Specification for details on the format of
+ * this string, and ogr_featurestyle.h for services available to parse it.
+ *
+ * @return a reference to a representation in string format, or null if
+ * there isn't one.
+ * @since 3.10
+ */
+public class Feature:public byte[] GetStyleStringAsByteArray()
+
 /**
  * Test if a field has ever been assigned a value or not.
  *
@@ -9416,6 +9457,15 @@ public class FeatureDefn:public int GetFieldCount()
  */
 public class FeatureDefn:public String GetName()
 
+/**
+ * Get name of this FeatureDefn (when it is not UTF-8 encoded).
+ *
+ * @return the name
+ * @since 3.10
+*/
+public class FeatureDefn:public byte GetNameAsByteArray()
+
+/**
 /**
  * Fetch field definition.
  *
@@ -9569,12 +9619,20 @@ public class FieldDefn:public String GetFieldTypeName(int type)
 public class FieldDefn:public int GetJustify()
 
 /**
- * Fetch name of this field.
+ * Get the name of this field.
  *
  * @return the name of the field
  */
 public class FieldDefn:public String GetName()
 
+/**
+ * Get the name of this field (when it is not UTF-8 encoded).
+ *
+ * @return the name of the field
+ * @since 3.10
+*/
+public class FieldDefn:public byte GetNameAsByteArray()
+
 /**
  * Fetch name of this field.
  *
@@ -11852,21 +11910,35 @@ public class SpatialReference:public String toString()
 public class SpatialReference:public int Validate()
 
 /**
- * This method returns TRUE if EPSG feels this geographic coordinate
+ * This method returns 1 if this geographic coordinate
  * system should be treated as having lat/long coordinate ordering.
  * <p>
  * Currently this returns TRUE for all geographic coordinate systems
- * with an EPSG code set, and AXIS values set defining it as lat, long.
- * Note that coordinate systems with an EPSG code and no axis settings
- * will be assumed to not be lat/long.
+ * with axes set defining it as lat, long (prior to GDAL 3.10, it
+ * also checked that the CRS had belonged to EPSG authority, but this check
+ * has now been removed).
  * <p>
  * FALSE will be returned for all coordinate systems that are not geographic,
- * or that do not have an EPSG code set.
+ * or whose axes ordering is not latitude, longitude.
  *
- * @return TRUE or FALSE.
+ * @return 1 or 0.
  */
 public class SpatialReference:public int EPSGTreatsAsLatLong()
 
+/**
+ * This method returns 1 if this projected coordinate
+ * system should be treated as having northing/easting coordinate ordering.
+ * <p>
+ * Currently this returns TRUE for all projected coordinate systems
+ * with an EPSG code set, and axes set defining it as northing, easting.
+ * <p>
+ * FALSE will be returned for all coordinate systems that are not projected,
+ * or whose axes ordering is not northing, easting.
+ *
+ * @return 1 or 0.
+ */
+public class SpatialReference:public int EPSGTreatsAsNorthingEasting()
+
 
 /* Class CoordinateTransformation */
 
diff --git a/swig/java/test_data/iso_8859_1.csv b/swig/java/test_data/iso_8859_1.csv
new file mode 100644
index 000000000000..f4ef83814f21
--- /dev/null
+++ b/swig/java/test_data/iso_8859_1.csv
@@ -0,0 +1,2 @@
+id,field_éx
+1,xéx
diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt
index 866cf0214578..d694c71c208b 100644
--- a/swig/python/CMakeLists.txt
+++ b/swig/python/CMakeLists.txt
@@ -339,6 +339,37 @@ if (Python_Interpreter_FOUND)
     endif()
   endif()
 
+  # Install launcher scripts in bin/ (for development)
+  file(GLOB SCRIPTS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/gdal-utils/scripts" "${CMAKE_CURRENT_SOURCE_DIR}/gdal-utils/scripts/*.py")
+  file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/tmp_bin")
+  foreach(filename IN LISTS SCRIPTS)
+      get_filename_component(filename_without_ext "${filename}" NAME_WLE)
+      if (UNIX)
+          set(lancher_filename "${filename_without_ext}")
+      else()
+          set(lancher_filename "${filename_without_ext}.bat")
+      endif()
+      set(tmp_launcher_filename "${CMAKE_CURRENT_BINARY_DIR}/tmp_bin/${lancher_filename}")
+      if (UNIX)
+          file(WRITE "${tmp_launcher_filename}"
+                     "#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+import re
+import sys
+from osgeo_utils.${filename_without_ext} import main
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\\.pyw|\\.exe)?\$', '', sys.argv[0])
+    sys.exit(main())
+")
+      else()
+          file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/gdal-utils/scripts/${filename}" NATIVE_FILENAME)
+          file(WRITE "${tmp_launcher_filename}" "@python \"${NATIVE_FILENAME}\" %*")
+      endif()
+      file(COPY "${tmp_launcher_filename}"
+           DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/bin"
+           FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+  endforeach()
+
   add_custom_target(python_binding ALL DEPENDS ${PY_SO_LIST} ${PY_SO_LIST_WITH_RPATH} ${GDAL_PYTHON_PYSOURCES} ${GDAL_LIB_TARGET_NAME})
 
   # Generate wheel
@@ -370,8 +401,15 @@ if (Python_Interpreter_FOUND)
 
   # Install extension
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/trimmedsysconfig.py ${CMAKE_CURRENT_BINARY_DIR}/trimmedsysconfig.py @ONLY)
+  if (DEFINED GDAL_PYTHON_INSTALL_PREFIX)
+      set(PREFIX_FOR_TRIMMEDSYSCONFIG "${GDAL_PYTHON_INSTALL_PREFIX}")
+  elseif (DEFINED CMAKE_INSTALL_PREFIX)
+      set(PREFIX_FOR_TRIMMEDSYSCONFIG "${CMAKE_INSTALL_PREFIX}")
+  else()
+      set(PREFIX_FOR_TRIMMEDSYSCONFIG "")
+  endif()
   file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/get_python_lib.py
-       "from trimmedsysconfig import get_python_lib;print(get_python_lib(prefix=\"${GDAL_PYTHON_INSTALL_PREFIX}\"))\n")
+       "from trimmedsysconfig import get_python_lib;print(get_python_lib(prefix=\"${PREFIX_FOR_TRIMMEDSYSCONFIG}\"))\n")
   execute_process(
     COMMAND ${Python_EXECUTABLE_CMAKE} ${CMAKE_CURRENT_BINARY_DIR}/get_python_lib.py
     OUTPUT_VARIABLE SITE_PACKAGE_DIR
@@ -417,6 +455,13 @@ if (Python_Interpreter_FOUND)
     set(SETUPTOOLS_USE_DISTUTILS stdlib)
   elseif ("${SITE_PACKAGE_DIR}" MATCHES "dist-packages")
     set(INSTALL_ARGS "${INSTALL_ARGS} --install-layout=deb")
+    if (NOT DEFINED GDAL_PYTHON_INSTALL_LIB AND "${PREFIX_FOR_TRIMMEDSYSCONFIG}" STREQUAL "/usr/local")
+        # Scenario of https://github.com/OSGeo/gdal/issues/10242
+        # For some reason patched setuptools of Debian fails to install by default
+        # in /usr/local/lib/python{version}/dist-packages even when passing
+        # --prefix=/usr/local and --install-layout=deb
+        set(INSTALL_ARGS "${INSTALL_ARGS} \"--install-lib=${SITE_PACKAGE_DIR}\"")
+    endif()
     if(Python_VERSION VERSION_LESS 3.12)
         # It no longer seems needed to mess with SETUPTOOLS_USE_DISTUTILS
         # with Debian Python 3.12 (or maybe its setuptools 68.1.2 version...),
@@ -426,26 +471,20 @@ if (Python_Interpreter_FOUND)
   endif ()
 
   if (ONLY_GENERATE_FOR_NON_DEBUG)
-    if (POLICY CMP0087)
-      # install(SCRIPT) can use generator expressions, since CMake 3.14
-      cmake_policy(SET CMP0087 NEW)
-      configure_file(${CMAKE_CURRENT_SOURCE_DIR}/install_python.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/install_python.cmake.tmp
-                     @ONLY)
-      file(
-        GENERATE
-        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/install_python_$<CONFIG>.cmake
-        INPUT ${CMAKE_CURRENT_BINARY_DIR}/install_python.cmake.tmp
-      )
-      file(
-        GENERATE
-        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/install_binding_$<CONFIG>.cmake
-        CONTENT
-          "execute_process(COMMAND $<IF:$<NOT:$<CONFIG:Debug>>,${CMAKE_COMMAND} ${WERROR_DEV_FLAG} -P \"${CMAKE_CURRENT_BINARY_DIR}/install_python_$<CONFIG>.cmake\",${CMAKE_COMMAND} -E echo \"setup.py install only run in configuration != Debug\">
-                                          WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\")")
-      install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/install_binding_$<CONFIG>.cmake)
-    else ()
-      message(WARNING "Installing Python bindings with a multi generator requires CMake >= 3.14")
-    endif ()
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/install_python.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/install_python.cmake.tmp
+                   @ONLY)
+    file(
+      GENERATE
+      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/install_python_$<CONFIG>.cmake
+      INPUT ${CMAKE_CURRENT_BINARY_DIR}/install_python.cmake.tmp
+    )
+    file(
+      GENERATE
+      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/install_binding_$<CONFIG>.cmake
+      CONTENT
+        "execute_process(COMMAND $<IF:$<NOT:$<CONFIG:Debug>>,${CMAKE_COMMAND} ${WERROR_DEV_FLAG} -P \"${CMAKE_CURRENT_BINARY_DIR}/install_python_$<CONFIG>.cmake\",${CMAKE_COMMAND} -E echo \"setup.py install only run in configuration != Debug\">
+                                        WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\")")
+    install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/install_binding_$<CONFIG>.cmake)
   else ()
     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/install_python.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/install_python.cmake"
                    @ONLY)
diff --git a/swig/python/README.rst b/swig/python/README.rst
index e3e7863bbea8..838bd1f70718 100644
--- a/swig/python/README.rst
+++ b/swig/python/README.rst
@@ -118,6 +118,7 @@ This is most often due to pip reusing a cached GDAL installation.
 Verify that the necessary dependencies have been installed and then run the following to force a clean build:
 
 ::
+
     pip install --no-cache --force-reinstall gdal[numpy]=="$(gdal-config --version).*"
 
 
diff --git a/swig/python/gdal-utils/README.rst b/swig/python/gdal-utils/README.rst
index 6027c71ecf43..a277662fb4bc 100644
--- a/swig/python/gdal-utils/README.rst
+++ b/swig/python/gdal-utils/README.rst
@@ -77,8 +77,8 @@ binaries::
 Coding best practices
 ---------------------
 
-Use existing scripts for style guidelines, generally newer ones are
-will be more pythonic than old.
+Use existing scripts for style guidelines, newer ones are generally
+more pythonic than old ones.
 
 Passes _flake8_ lint test.
 
diff --git a/swig/python/gdal-utils/osgeo_utils/__init__.py b/swig/python/gdal-utils/osgeo_utils/__init__.py
index 817dc2c6599a..021dc4546be7 100644
--- a/swig/python/gdal-utils/osgeo_utils/__init__.py
+++ b/swig/python/gdal-utils/osgeo_utils/__init__.py
@@ -1,5 +1,5 @@
 __package_name__ = "gdal-utils"
-gdal_utils_version = (3, 9, 99, 0)
+gdal_utils_version = (3, 10, 99, 0)
 __version__ = ".".join(str(i) for i in gdal_utils_version)
 __author__ = "Frank Warmerdam"
 __author_email__ = "warmerdam@pobox.com"
diff --git a/swig/python/gdal-utils/osgeo_utils/auxiliary/array_util.py b/swig/python/gdal-utils/osgeo_utils/auxiliary/array_util.py
index d298aee0b04e..2d7131ad95d8 100644
--- a/swig/python/gdal-utils/osgeo_utils/auxiliary/array_util.py
+++ b/swig/python/gdal-utils/osgeo_utils/auxiliary/array_util.py
@@ -9,23 +9,7 @@
 # ******************************************************************************
 #  Copyright (c) 2021, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 import array
 from typing import TYPE_CHECKING, Sequence, Union
diff --git a/swig/python/gdal-utils/osgeo_utils/auxiliary/base.py b/swig/python/gdal-utils/osgeo_utils/auxiliary/base.py
index 072386b952ff..60cef29858e4 100644
--- a/swig/python/gdal-utils/osgeo_utils/auxiliary/base.py
+++ b/swig/python/gdal-utils/osgeo_utils/auxiliary/base.py
@@ -11,23 +11,7 @@
 #  Copyright (c) 2015, Even Rouault <even.rouault at spatialys.com>
 #  Copyright (c) 2020, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import os.path
diff --git a/swig/python/gdal-utils/osgeo_utils/auxiliary/batch_creator.py b/swig/python/gdal-utils/osgeo_utils/auxiliary/batch_creator.py
index d88c0be1abae..05bb4efd04e7 100644
--- a/swig/python/gdal-utils/osgeo_utils/auxiliary/batch_creator.py
+++ b/swig/python/gdal-utils/osgeo_utils/auxiliary/batch_creator.py
@@ -9,23 +9,7 @@
 # ******************************************************************************
 #  Copyright (c) 2020, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import os
diff --git a/swig/python/gdal-utils/osgeo_utils/auxiliary/color_palette.py b/swig/python/gdal-utils/osgeo_utils/auxiliary/color_palette.py
index 6fb11c0e9d57..cfdd51289675 100644
--- a/swig/python/gdal-utils/osgeo_utils/auxiliary/color_palette.py
+++ b/swig/python/gdal-utils/osgeo_utils/auxiliary/color_palette.py
@@ -9,23 +9,7 @@
 # ******************************************************************************
 #  Copyright (c) 2020, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import os
diff --git a/swig/python/gdal-utils/osgeo_utils/auxiliary/color_table.py b/swig/python/gdal-utils/osgeo_utils/auxiliary/color_table.py
index 1148be8b34f3..857dd2c46c4b 100644
--- a/swig/python/gdal-utils/osgeo_utils/auxiliary/color_table.py
+++ b/swig/python/gdal-utils/osgeo_utils/auxiliary/color_table.py
@@ -9,23 +9,7 @@
 # ******************************************************************************
 #  Copyright (c) 2020, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import os
diff --git a/swig/python/gdal-utils/osgeo_utils/auxiliary/extent_util.py b/swig/python/gdal-utils/osgeo_utils/auxiliary/extent_util.py
index 53be3bbee4c0..64c05f1bd19e 100644
--- a/swig/python/gdal-utils/osgeo_utils/auxiliary/extent_util.py
+++ b/swig/python/gdal-utils/osgeo_utils/auxiliary/extent_util.py
@@ -9,23 +9,7 @@
 # ******************************************************************************
 #  Copyright (c) 2020, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 import math
 import os
diff --git a/swig/python/gdal-utils/osgeo_utils/auxiliary/gdal_argparse.py b/swig/python/gdal-utils/osgeo_utils/auxiliary/gdal_argparse.py
index 2a62011b796c..dbc4d23521a5 100644
--- a/swig/python/gdal-utils/osgeo_utils/auxiliary/gdal_argparse.py
+++ b/swig/python/gdal-utils/osgeo_utils/auxiliary/gdal_argparse.py
@@ -9,23 +9,7 @@
 # ******************************************************************************
 #  Copyright (c) 2021, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 import argparse
 import os
diff --git a/swig/python/gdal-utils/osgeo_utils/auxiliary/numpy_util.py b/swig/python/gdal-utils/osgeo_utils/auxiliary/numpy_util.py
index 9aa72b176203..dfa67f1b9e35 100644
--- a/swig/python/gdal-utils/osgeo_utils/auxiliary/numpy_util.py
+++ b/swig/python/gdal-utils/osgeo_utils/auxiliary/numpy_util.py
@@ -9,23 +9,7 @@
 # ******************************************************************************
 #  Copyright (c) 2020, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import numpy as np
diff --git a/swig/python/gdal-utils/osgeo_utils/auxiliary/osr_util.py b/swig/python/gdal-utils/osgeo_utils/auxiliary/osr_util.py
index 0ee9bb0f1bf5..901cf50b6150 100644
--- a/swig/python/gdal-utils/osgeo_utils/auxiliary/osr_util.py
+++ b/swig/python/gdal-utils/osgeo_utils/auxiliary/osr_util.py
@@ -9,23 +9,7 @@
 # ******************************************************************************
 #  Copyright (c) 2021, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 from typing import Optional, Union
 
diff --git a/swig/python/gdal-utils/osgeo_utils/auxiliary/progress.py b/swig/python/gdal-utils/osgeo_utils/auxiliary/progress.py
index 7802ff7c87ac..c3d95ec88ae5 100644
--- a/swig/python/gdal-utils/osgeo_utils/auxiliary/progress.py
+++ b/swig/python/gdal-utils/osgeo_utils/auxiliary/progress.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2020, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 from enum import Enum, auto
 from numbers import Real
diff --git a/swig/python/gdal-utils/osgeo_utils/auxiliary/raster_creation.py b/swig/python/gdal-utils/osgeo_utils/auxiliary/raster_creation.py
index ceb50fa02020..8748b9e49ba4 100644
--- a/swig/python/gdal-utils/osgeo_utils/auxiliary/raster_creation.py
+++ b/swig/python/gdal-utils/osgeo_utils/auxiliary/raster_creation.py
@@ -9,23 +9,7 @@
 # ******************************************************************************
 #  Copyright (c) 2021, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 import os
 import shutil
diff --git a/swig/python/gdal-utils/osgeo_utils/auxiliary/rectangle.py b/swig/python/gdal-utils/osgeo_utils/auxiliary/rectangle.py
index f4c8abfba041..0ac16b154068 100644
--- a/swig/python/gdal-utils/osgeo_utils/auxiliary/rectangle.py
+++ b/swig/python/gdal-utils/osgeo_utils/auxiliary/rectangle.py
@@ -9,23 +9,7 @@
 # ******************************************************************************
 #  Copyright (c) 2020, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 
diff --git a/swig/python/gdal-utils/osgeo_utils/auxiliary/util.py b/swig/python/gdal-utils/osgeo_utils/auxiliary/util.py
index d9f3d802c9e6..d2f6943cfd41 100644
--- a/swig/python/gdal-utils/osgeo_utils/auxiliary/util.py
+++ b/swig/python/gdal-utils/osgeo_utils/auxiliary/util.py
@@ -11,23 +11,7 @@
 #  Copyright (c) 2015, Even Rouault <even.rouault at spatialys.com>
 #  Copyright (c) 2020, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 import os
 from numbers import Real
diff --git a/swig/python/gdal-utils/osgeo_utils/gdal2tiles.py b/swig/python/gdal-utils/osgeo_utils/gdal2tiles.py
index 69639d3823ec..c3e2ddd14dc3 100644
--- a/swig/python/gdal-utils/osgeo_utils/gdal2tiles.py
+++ b/swig/python/gdal-utils/osgeo_utils/gdal2tiles.py
@@ -17,23 +17,7 @@
 # Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.com>
 # Copyright (c) 2021, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 from __future__ import division
@@ -895,13 +879,22 @@ def scale_query_to_tile(dsquery, dstile, options, tilefilename=""):
         options.excluded_values or options.nodata_values_pct_threshold < 100
     ):
 
+        warp_options = "-r average"
+
+        assert options.nodata_values_pct_threshold is not None
+        warp_options += (
+            f" -wo NODATA_VALUES_PCT_THRESHOLD={options.nodata_values_pct_threshold}"
+        )
+
+        if options.excluded_values:
+            assert options.excluded_values_pct_threshold is not None
+            warp_options += f" -wo EXCLUDED_VALUES={options.excluded_values}"
+            warp_options += f" -wo EXCLUDED_VALUES_PCT_THRESHOLD={options.excluded_values_pct_threshold}"
+
         gdal.Warp(
             dstile,
             dsquery,
-            options="-r average "
-            + f"-wo EXCLUDED_VALUES={options.excluded_values} "
-            + f"-wo EXCLUDED_VALUES_PCT_THRESHOLD={options.excluded_values_pct_threshold} "
-            + f"-wo NODATA_VALUES_PCT_THRESHOLD={options.nodata_values_pct_threshold}",
+            options=warp_options,
         )
 
     elif options.resampling == "average":
@@ -3979,13 +3972,10 @@ def generate_leaflet(self) -> str:
 
         // Base layers
         //  .. OpenStreetMap
-        var osm = L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors', minZoom: %(minzoom)s, maxZoom: %(maxzoom)s});
+        var osm = L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors', minZoom: %(minzoom)s, maxZoom: %(maxzoom)s});
 
         //  .. CartoDB Positron
-        var cartodb = L.tileLayer('http://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png', {attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://cartodb.com/attributions">CartoDB</a>', minZoom: %(minzoom)s, maxZoom: %(maxzoom)s});
-
-        //  .. OSM Toner
-        var toner = L.tileLayer('http://{s}.tile.stamen.com/toner/{z}/{x}/{y}.png', {attribution: 'Map tiles by <a href="http://stamen.com">Stamen Design</a>, under <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>. Data by <a href="http://openstreetmap.org">OpenStreetMap</a>, under <a href="http://www.openstreetmap.org/copyright">ODbL</a>.', minZoom: %(minzoom)s, maxZoom: %(maxzoom)s});
+        var cartodb = L.tileLayer('https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png', {attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="https://carto.com/attribution">CartoDB</a>', minZoom: %(minzoom)s, maxZoom: %(maxzoom)s});
 
         //  .. White background
         var white = L.tileLayer("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQAAAAEAAQMAAABmvDolAAAAA1BMVEX///+nxBvIAAAAH0lEQVQYGe3BAQ0AAADCIPunfg43YAAAAAAAAAAA5wIhAAAB9aK9BAAAAABJRU5ErkJggg==", {minZoom: %(minzoom)s, maxZoom: %(maxzoom)s});
@@ -4002,7 +3992,7 @@ def generate_leaflet(self) -> str:
             layers: [osm]
         });
 
-        var basemaps = {"OpenStreetMap": osm, "CartoDB Positron": cartodb, "Stamen Toner": toner, "Without background": white}
+        var basemaps = {"OpenStreetMap": osm, "CartoDB Positron": cartodb, "Without background": white}
         var overlaymaps = {"Layer": lyr}
 
         // Title
@@ -4018,7 +4008,7 @@ def generate_leaflet(self) -> str:
         title.addTo(map);
 
         // Note
-        var src = 'Generated by <a href="https://gdal.org/programs/gdal2tiles.html">GDAL2Tiles</a>, Copyright &copy; 2008 <a href="http://www.klokan.cz/">Klokan Petr Pridal</a>,  <a href="https://gdal.org">GDAL</a> &amp; <a href="http://www.osgeo.org/">OSGeo</a> <a href="http://code.google.com/soc/">GSoC</a>';
+        var src = 'Generated by <a href="https://gdal.org/programs/gdal2tiles.html">GDAL2Tiles</a>, Copyright &copy; 2008 <a href="http://www.klokan.cz/">Klokan Petr Pridal</a>,  <a href="https://gdal.org">GDAL</a> &amp; <a href="https://www.osgeo.org/">OSGeo</a> <a href="https://summerofcode.withgoogle.com/">GSoC</a>';
         var title = L.control({position: 'bottomleft'});
         title.onAdd = function(map) {
             this._div = L.DomUtil.create('div', 'ctl src');
diff --git a/swig/python/gdal-utils/osgeo_utils/gdal2xyz.py b/swig/python/gdal-utils/osgeo_utils/gdal2xyz.py
index e21268124996..3847ef2e9dbe 100644
--- a/swig/python/gdal-utils/osgeo_utils/gdal2xyz.py
+++ b/swig/python/gdal-utils/osgeo_utils/gdal2xyz.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2002, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2020-2021, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 import sys
 import textwrap
diff --git a/swig/python/gdal-utils/osgeo_utils/gdal_calc.py b/swig/python/gdal-utils/osgeo_utils/gdal_calc.py
index 69f134871a3b..51bfd2cd7e4f 100644
--- a/swig/python/gdal-utils/osgeo_utils/gdal_calc.py
+++ b/swig/python/gdal-utils/osgeo_utils/gdal_calc.py
@@ -12,23 +12,7 @@
 #  Copyright (c) 2016, Piers Titus van der Torren <pierstitus@gmail.com>
 #  Copyright (c) 2020, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import argparse
diff --git a/swig/python/gdal-utils/osgeo_utils/gdal_edit.py b/swig/python/gdal-utils/osgeo_utils/gdal_edit.py
index 50a401b58a7f..c35ba30344c6 100755
--- a/swig/python/gdal-utils/osgeo_utils/gdal_edit.py
+++ b/swig/python/gdal-utils/osgeo_utils/gdal_edit.py
@@ -10,23 +10,7 @@
 ###############################################################################
 #  Copyright (c) 2011-2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
@@ -50,7 +34,7 @@ def Usage(isError):
         "                 [-offset <value>] [-scale <value>] [-units <value>]", file=f
     )
     print(
-        "                 [-colorinterp_<X> {red|green|blue|alpha|gray|undefined]]...",
+        "                 [-colorinterp_<X> {red|green|blue|alpha|gray|undefined|pan|coastal|rededge|nir|swir|mwir|lwir|...]]...",
         file=f,
     )
     print("                 [-a_coord_epoch <epoch>] [-unsetepoch]", file=f)
@@ -251,26 +235,17 @@ def gdal_edit(argv):
             i = i + 1
         elif argv[i].startswith("-colorinterp_") and i < len(argv) - 1:
             band = int(argv[i][len("-colorinterp_") :])
-            val = argv[i + 1]
-            if val.lower() == "red":
-                val = gdal.GCI_RedBand
-            elif val.lower() == "green":
-                val = gdal.GCI_GreenBand
-            elif val.lower() == "blue":
-                val = gdal.GCI_BlueBand
-            elif val.lower() == "alpha":
-                val = gdal.GCI_AlphaBand
-            elif val.lower() == "gray" or val.lower() == "grey":
-                val = gdal.GCI_GrayIndex
-            elif val.lower() == "undefined":
+            val_str = argv[i + 1]
+            if val_str.lower() == "undefined":
                 val = gdal.GCI_Undefined
             else:
-                print(
-                    "Unsupported color interpretation %s.\n" % val
-                    + "Only red, green, blue, alpha, gray, undefined are supported.\n",
-                    file=sys.stderr,
-                )
-                return Usage(isError=True)
+                val = gdal.GetColorInterpretationByName(val_str)
+                if val == gdal.GCI_Undefined:
+                    print(
+                        "Unsupported color interpretation %s.\n" % val_str,
+                        file=sys.stderr,
+                    )
+                    return Usage(isError=True)
             colorinterp[band] = val
             i = i + 1
         elif argv[i][0] == "-":
diff --git a/swig/python/gdal-utils/osgeo_utils/gdal_fillnodata.py b/swig/python/gdal-utils/osgeo_utils/gdal_fillnodata.py
index e036b2c4ea3c..ff829cb04172 100644
--- a/swig/python/gdal-utils/osgeo_utils/gdal_fillnodata.py
+++ b/swig/python/gdal-utils/osgeo_utils/gdal_fillnodata.py
@@ -11,23 +11,7 @@
 #  Copyright (c) 2009-2011, Even Rouault <even dot rouault at spatialys.com>
 #  Copyright (c) 2021, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/gdal_pansharpen.py b/swig/python/gdal-utils/osgeo_utils/gdal_pansharpen.py
index b811dd2dd0c4..c3848a81ddd4 100644
--- a/swig/python/gdal-utils/osgeo_utils/gdal_pansharpen.py
+++ b/swig/python/gdal-utils/osgeo_utils/gdal_pansharpen.py
@@ -11,23 +11,7 @@
 #  Copyright (c) 2015, Even Rouault <even.rouault at spatialys.com>
 #  Copyright (c) 2021, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/swig/python/gdal-utils/osgeo_utils/gdal_polygonize.py b/swig/python/gdal-utils/osgeo_utils/gdal_polygonize.py
index ab6702e85a7e..cfee4a3e4912 100644
--- a/swig/python/gdal-utils/osgeo_utils/gdal_polygonize.py
+++ b/swig/python/gdal-utils/osgeo_utils/gdal_polygonize.py
@@ -12,23 +12,7 @@
 #  Copyright (c) 2009-2013, Even Rouault <even dot rouault at spatialys.com>
 #  Copyright (c) 2021, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/gdal_proximity.py b/swig/python/gdal-utils/osgeo_utils/gdal_proximity.py
index 93a39c294107..58d885976e8f 100644
--- a/swig/python/gdal-utils/osgeo_utils/gdal_proximity.py
+++ b/swig/python/gdal-utils/osgeo_utils/gdal_proximity.py
@@ -12,23 +12,7 @@
 #  Copyright (c) 2009-2011, Even Rouault <even dot rouault at spatialys.com>
 #  Copyright (c) 2021, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/gdal_retile.py b/swig/python/gdal-utils/osgeo_utils/gdal_retile.py
index 2452c7e98f89..728104d5fe16 100644
--- a/swig/python/gdal-utils/osgeo_utils/gdal_retile.py
+++ b/swig/python/gdal-utils/osgeo_utils/gdal_retile.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2007, Christian Mueller
 # Copyright (c) 2009-2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 from __future__ import print_function
 
@@ -337,13 +321,52 @@ def getTileIndexFromFiles(g):
     ogrTileIndexDS = createTileIndex(
         g.Verbose, "TileIndex", g.TileIndexFieldName, None, g.TileIndexDriverTyp
     )
+    firstTile = True
+    globalSRS = None
     for inputTile in g.Names:
 
         fhInputTile = gdal.Open(inputTile)
         if fhInputTile is None:
             return None
 
-        dec = AffineTransformDecorator(fhInputTile.GetGeoTransform())
+        # Check the geotransform has no rotational terms.
+        gt = fhInputTile.GetGeoTransform()
+        if gt[2] != 0 or gt[4] != 0:
+            print(
+                "File %s has a geotransform matrix with rotational terms, which is not supported. You may need to use gdalwarp before."
+                % inputTile,
+                file=sys.stderr,
+            )
+            return None
+
+        # Check SRS consistency among tiles
+        srs = fhInputTile.GetSpatialRef()
+        if firstTile:
+            globalSRS = srs
+        else:
+            if globalSRS is not None and srs is None:
+                print(
+                    "File %s has no SRS whether other tiles have one." % inputTile,
+                    file=sys.stderr,
+                )
+                return None
+            elif globalSRS is None and srs is not None:
+                print(
+                    "File %s has a SRS whether other tiles do not." % inputTile,
+                    file=sys.stderr,
+                )
+                return None
+            elif (
+                globalSRS is not None and srs is not None and not globalSRS.IsSame(srs)
+            ):
+                print(
+                    "File %s has a SRS different from other tiles." % inputTile,
+                    file=sys.stderr,
+                )
+                return None
+
+        firstTile = False
+        dec = AffineTransformDecorator(gt)
         points = dec.pointsFor(fhInputTile.RasterXSize, fhInputTile.RasterYSize)
 
         addFeature(
@@ -735,7 +758,7 @@ def createTileIndex(Verbose, dsName, fieldName, srs, driverName):
 
         OGRDataSource = OGRDriver.Open(dsName)
         if OGRDataSource is not None:
-            OGRDataSource.Destroy()
+            OGRDataSource.Close()
             OGRDriver.DeleteDataSource(dsName)
             if Verbose:
                 print("truncating index " + dsName)
@@ -791,11 +814,10 @@ def addFeature(TileIndexFieldName, OGRDataSource, location, xlist, ylist):
     OGRFeature.SetGeometryDirectly(OGRGeometry)
 
     OGRLayer.CreateFeature(OGRFeature)
-    OGRFeature.Destroy()
 
 
 def closeTileIndex(OGRDataSource):
-    OGRDataSource.Destroy()
+    OGRDataSource.Close()
 
 
 def buildPyramid(g, minfo, createdTileIndexDS, tileWidth, tileHeight, overlap):
@@ -1130,7 +1152,7 @@ def main(args=None, g=None):
 
     if not g.PyramidOnly:
         dsCreatedTileIndex = tileImage(g, minfo, ti)
-        tileIndexDS.Destroy()
+        tileIndexDS.Close()
     else:
         dsCreatedTileIndex = tileIndexDS
 
diff --git a/swig/python/gdal-utils/osgeo_utils/gdal_sieve.py b/swig/python/gdal-utils/osgeo_utils/gdal_sieve.py
index 4699d62fbd00..b5e024632b93 100644
--- a/swig/python/gdal-utils/osgeo_utils/gdal_sieve.py
+++ b/swig/python/gdal-utils/osgeo_utils/gdal_sieve.py
@@ -11,23 +11,7 @@
 #  Copyright (c) 2009-2010, Even Rouault <even dot rouault at spatialys.com>
 #  Copyright (c) 2021, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/gdalattachpct.py b/swig/python/gdal-utils/osgeo_utils/gdalattachpct.py
index e13a9608a3de..264c8b5ae29c 100644
--- a/swig/python/gdal-utils/osgeo_utils/gdalattachpct.py
+++ b/swig/python/gdal-utils/osgeo_utils/gdalattachpct.py
@@ -12,23 +12,7 @@
 #  Copyright (c) 2000, Frank Warmerdam
 #  Copyright (c) 2020-2021, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/gdalcompare.py b/swig/python/gdal-utils/osgeo_utils/gdalcompare.py
index f27434170228..52ddc4bb854a 100644
--- a/swig/python/gdal-utils/osgeo_utils/gdalcompare.py
+++ b/swig/python/gdal-utils/osgeo_utils/gdalcompare.py
@@ -10,23 +10,7 @@
 #  Copyright (c) 2012, Frank Warmerdam <warmerdam@pobox.com>
 #  Copyright (c) 2021, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import array
diff --git a/swig/python/gdal-utils/osgeo_utils/gdalmove.py b/swig/python/gdal-utils/osgeo_utils/gdalmove.py
index 8d40b4542c15..64c109174633 100644
--- a/swig/python/gdal-utils/osgeo_utils/gdalmove.py
+++ b/swig/python/gdal-utils/osgeo_utils/gdalmove.py
@@ -10,23 +10,7 @@
 #  Copyright (c) 2012, Frank Warmerdam
 #  Copyright (c) 2021, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import math
diff --git a/swig/python/gdal-utils/osgeo_utils/ogr_layer_algebra.py b/swig/python/gdal-utils/osgeo_utils/ogr_layer_algebra.py
index 587d501ffe11..aecb2960dec1 100644
--- a/swig/python/gdal-utils/osgeo_utils/ogr_layer_algebra.py
+++ b/swig/python/gdal-utils/osgeo_utils/ogr_layer_algebra.py
@@ -10,23 +10,7 @@
 # ******************************************************************************
 #  Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import os
@@ -372,7 +356,7 @@ def main(argv=sys.argv):
         cnt = input_ds.GetLayerCount()
         if cnt != 1:
             print(
-                "Input datasource has not a single layer, so you should specify its name with -input_lyr",
+                "Input datasource has more than just a single layer, so you should specify which layer with -input_lyr",
                 file=sys.stderr,
             )
             return 1
diff --git a/swig/python/gdal-utils/osgeo_utils/ogrmerge.py b/swig/python/gdal-utils/osgeo_utils/ogrmerge.py
index 0cc32e1ed1ac..1bb04f45c183 100644
--- a/swig/python/gdal-utils/osgeo_utils/ogrmerge.py
+++ b/swig/python/gdal-utils/osgeo_utils/ogrmerge.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2017, Even Rouault <even dot rouault at spatialys dot com>
 # Copyright (c) 2021, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import glob
diff --git a/swig/python/gdal-utils/osgeo_utils/pct2rgb.py b/swig/python/gdal-utils/osgeo_utils/pct2rgb.py
index 66d81d04b1bd..39128fd913b8 100644
--- a/swig/python/gdal-utils/osgeo_utils/pct2rgb.py
+++ b/swig/python/gdal-utils/osgeo_utils/pct2rgb.py
@@ -12,23 +12,7 @@
 #  Copyright (c) 2009-2010, Even Rouault <even dot rouault at spatialys.com>
 #  Copyright (c) 2020-2021, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/rgb2pct.py b/swig/python/gdal-utils/osgeo_utils/rgb2pct.py
index b689a08a6e95..5eaf4dab037b 100644
--- a/swig/python/gdal-utils/osgeo_utils/rgb2pct.py
+++ b/swig/python/gdal-utils/osgeo_utils/rgb2pct.py
@@ -11,23 +11,7 @@
 #  Copyright (c) 2001, Frank Warmerdam
 #  Copyright (c) 2020-2021, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import os.path
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/assemblepoly.py b/swig/python/gdal-utils/osgeo_utils/samples/assemblepoly.py
index 6d1b3cfc2d94..e1533cfc17b3 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/assemblepoly.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/assemblepoly.py
@@ -11,23 +11,7 @@
 ###############################################################################
 # Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/build_jp2_from_xml.py b/swig/python/gdal-utils/osgeo_utils/samples/build_jp2_from_xml.py
index b3b1c73706bc..1a31713e90d7 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/build_jp2_from_xml.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/build_jp2_from_xml.py
@@ -11,23 +11,7 @@
 # ******************************************************************************
 #  Copyright (c) 2015, European Union (European Environment Agency)
 #
-#  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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import os
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/classify.py b/swig/python/gdal-utils/osgeo_utils/samples/classify.py
index c4ac17cd4dd3..46e750859982 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/classify.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/classify.py
@@ -8,23 +8,7 @@
 # ******************************************************************************
 #  Copyright (c) 2008, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/crs2crs2grid.py b/swig/python/gdal-utils/osgeo_utils/samples/crs2crs2grid.py
index d42c51c8c822..a596bd0504b4 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/crs2crs2grid.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/crs2crs2grid.py
@@ -11,23 +11,7 @@
 # ******************************************************************************
 #  Copyright (c) 2012, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import os
@@ -38,71 +22,56 @@
 from osgeo import gdal, gdal_array
 
 # Input looks like this:
-"""
-  PNT_0_0
-  LATITUDE     40 00  0.00000 N     40 00  0.02344 N        2.06 mm/yr  north
-  LONGITUDE   117 00  0.00000 W    117 00  0.03765 W       -1.22 mm/yr  east
-  ELLIP. HT.               0.000              -0.607 m     -1.34 mm/yr  up
-  X                 -2221242.768        -2221243.142 m     -0.02 mm/yr
-  Y                 -4359434.393        -4359433.159 m      2.64 mm/yr
-  Z                  4077985.572         4077985.735 m      0.72 mm/yr
-"""
-
-
-def next_point(fd):
-
-    line = fd.readline().strip()
-    while line != "" and line.find("PNT_") == -1:
-        line = fd.readline()
-
-    if line == "":
-        return None
-
-    name_tokens = line.split("_")
-
-    # Read LATITUDE line
-    line = fd.readline().strip()
-    tokens = line.split()
-
-    lat_src = float(tokens[1]) + float(tokens[2]) / 60.0 + float(tokens[3]) / 3600.0
-    lat_dst = float(tokens[5]) + float(tokens[6]) / 60.0 + float(tokens[7]) / 3600.0
 
-    line = fd.readline().strip()
-    tokens = line.split()
 
-    lon_src = float(tokens[1]) + float(tokens[2]) / 60.0 + float(tokens[3]) / 3600.0
-    lon_dst = float(tokens[5]) + float(tokens[6]) / 60.0 + float(tokens[7]) / 3600.0
-
-    return (
-        int(name_tokens[1]),
-        int(name_tokens[2]),
-        lat_src,
-        lon_src,
-        lat_dst,
-        lon_dst,
-    )
+def points_in_file(fd):
+    """Iterate through file grid.
+
+    After the header, lines look like (using HTDP v. 3.5.0):
+    50.0000015988  127.0000219914    -0.160    "PNT_0_0"
+    """
+    for line in fd:
+        if line.strip() == "":
+            continue
+        elif line.find("PNT_") == -1:
+            # Report the file header defining the transformation
+            print(line)
+            continue
+
+        tokens = line.split()
+        if len(tokens) != 4:
+            print(
+                "Found unexpected grid line format with %d tokens (expected 4)"
+                % len(tokens)
+            )
+            print("Expected Format: dec_lat    dec_lon    elip_hgt    pt_id")
+            print("Actual Line: " + line)
+            break
 
+        lat, lon, _, pt_id = tokens
+        name_tokens = pt_id.replace('"', "").split("_")
 
-def read_grid_crs_to_crs(filename, shape):
-    fd = open(filename)
-    grid = numpy.zeros(shape)
+        yield int(name_tokens[1]), int(name_tokens[2]), float(lat), float(lon)
 
-    # report the file header defining the transformation
-    for _ in range(5):
-        print(fd.readline().rstrip())
 
+def read_grid_crs_to_crs(input_grid, output_filename):
+    grid = numpy.zeros(input_grid.shape)
     points_found = 0
 
-    ptuple = next_point(fd)
-    while ptuple is not None:
-        grid[0, ptuple[1], ptuple[0]] = ptuple[4] - ptuple[2]
-        grid[1, ptuple[1], ptuple[0]] = ptuple[5] - ptuple[3]
-        points_found = points_found + 1
-        ptuple = next_point(fd)
+    with open(output_filename, "r") as fd:
+        for output in points_in_file(fd):
+            i, j, lat_out, lon_out = output
+            lon_in = input_grid[0, j, i]
+            lat_in = input_grid[1, j, i]
+            points_found += 1
+
+            grid[0, j, i] = lon_out - lon_in
+            grid[1, j, i] = lat_out - lat_in
 
-    if points_found < shape[0] * shape[1]:
+    if points_found < grid.shape[0] * grid.shape[1]:
+        print("Error - did not find results for every point in the input grid.")
         print("points found:   ", points_found)
-        print("points expected:", shape[1] * shape[2])
+        print("points expected:", grid.shape[1] * grid.shape[2])
         return None
 
     return grid
@@ -336,7 +305,7 @@ def main(argv=sys.argv):
             return Usage(brief=0)
 
         elif argv[i][0] == "-":
-            print("Urecognised argument: " + argv[i])
+            print("Unrecognized argument: " + argv[i])
             return Usage()
 
         elif src_crs_id is None:
@@ -352,7 +321,7 @@ def main(argv=sys.argv):
             dst_crs_date = argv[i]
 
         else:
-            print("Urecognised argument: " + argv[i])
+            print("Unrecognized argument: " + argv[i])
             return Usage()
 
         i = i + 1
@@ -421,7 +390,7 @@ def main(argv=sys.argv):
 
     print("htdp run complete.")
 
-    adjustment = read_grid_crs_to_crs(out_grid_fn, grid.shape)
+    adjustment = read_grid_crs_to_crs(grid, out_grid_fn)
     if adjustment is None:
         return 1
 
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/densify.py b/swig/python/gdal-utils/osgeo_utils/samples/densify.py
index 126dcdb54d9c..4da1e47b2661 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/densify.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/densify.py
@@ -10,23 +10,7 @@
 #  Copyright (c) 2008, Howard Butler <hobu.inc@gmail.com>
 #  Copyright (c) 2021, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import math
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/dump_jp2.py b/swig/python/gdal-utils/osgeo_utils/samples/dump_jp2.py
index f9654bc65a8c..743447ea1e90 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/dump_jp2.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/dump_jp2.py
@@ -11,23 +11,7 @@
 #  Copyright (c) 2015, European Union (European Environment Agency)
 #  Copyright (c) 2015, European Union Satellite Centre
 #
-#  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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/epsg_tr.py b/swig/python/gdal-utils/osgeo_utils/samples/epsg_tr.py
index 4c0575920efb..025832e3c44f 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/epsg_tr.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/epsg_tr.py
@@ -13,23 +13,7 @@
 #  Copyright (c) 2009-2010, 2019, Even Rouault <even dot rouault at spatialys.com>
 #  Copyright (c) 2021, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/esri2wkt.py b/swig/python/gdal-utils/osgeo_utils/samples/esri2wkt.py
index b0a3c00fe759..42e5fe9bf980 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/esri2wkt.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/esri2wkt.py
@@ -10,23 +10,7 @@
 #  Copyright (c) 2000, Frank Warmerdam
 #  Copyright (c) 2021, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/fft.py b/swig/python/gdal-utils/osgeo_utils/samples/fft.py
index 158962ec5f73..543eba855616 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/fft.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/fft.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2003, Andrey Kiselev <dron@remotesensing.org>
 # Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/fix_gpkg.py b/swig/python/gdal-utils/osgeo_utils/samples/fix_gpkg.py
index fb8129f44afc..83209b51808f 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/fix_gpkg.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/fix_gpkg.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2018, Even Rouault <even.rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import glob
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gcps2ogr.py b/swig/python/gdal-utils/osgeo_utils/samples/gcps2ogr.py
index 85cb531f6bf0..246da128de85 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gcps2ogr.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gcps2ogr.py
@@ -10,23 +10,7 @@
 # ******************************************************************************
 #  Copyright (c) 2015, Even Rouault, <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gcps2vec.py b/swig/python/gdal-utils/osgeo_utils/samples/gcps2vec.py
index d1bb1ee3d9d8..b4c594bd24e0 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gcps2vec.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gcps2vec.py
@@ -10,23 +10,7 @@
 #  Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
 #  Copyright (c) 2021, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gcps2wld.py b/swig/python/gdal-utils/osgeo_utils/samples/gcps2wld.py
index cfc73bffca83..f7afcbd25983 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gcps2wld.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gcps2wld.py
@@ -12,23 +12,7 @@
 #  Copyright (c) 2002, Frank Warmerdam
 #  Copyright (c) 2009-2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdal2grd.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal2grd.py
index 763b5fb033be..83792d3e6e7f 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdal2grd.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdal2grd.py
@@ -12,23 +12,7 @@
 # Copyright (c) 2003, Andrey Kiselev <dron@remotesensing.org>
 # Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdal_auth.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal_auth.py
index 088ff86c3352..245a0b6c6290 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdal_auth.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdal_auth.py
@@ -10,23 +10,7 @@
 # ******************************************************************************
 #  Copyright (c) 2013, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdal_cp.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal_cp.py
index fa693b72725c..fecddfa889de 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdal_cp.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdal_cp.py
@@ -9,23 +9,7 @@
 ###############################################################################
 #  Copyright (c) 2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import fnmatch
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdal_create_pdf.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal_create_pdf.py
index 765db0b16425..3a0143dca805 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdal_create_pdf.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdal_create_pdf.py
@@ -9,23 +9,7 @@
 ###############################################################################
 #  Copyright (c) 2019, Even Rouault<even.rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdal_ls.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal_ls.py
index bf8a894b6ebf..fbcc631ea186 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdal_ls.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdal_ls.py
@@ -10,23 +10,7 @@
 ###############################################################################
 #  Copyright (c) 2011-2014, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdal_lut.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal_lut.py
index 6c9c0df4f561..333bec45dafb 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdal_lut.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdal_lut.py
@@ -10,23 +10,7 @@
 # ******************************************************************************
 #  Copyright (c) 2008, Frank Warmerdam
 #
-#  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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdal_mkdir.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal_mkdir.py
index d34cddae68d8..f1bab71d4511 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdal_mkdir.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdal_mkdir.py
@@ -9,23 +9,7 @@
 ###############################################################################
 #  Copyright (c) 2017, Even Rouault <even.rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdal_remove_towgs84.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal_remove_towgs84.py
index d7b858f738d8..51289f40669c 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdal_remove_towgs84.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdal_remove_towgs84.py
@@ -10,23 +10,7 @@
 ###############################################################################
 #  Copyright (c) 2020, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdal_rm.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal_rm.py
index e191a75ff4fd..d79abfde1580 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdal_rm.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdal_rm.py
@@ -9,23 +9,7 @@
 ###############################################################################
 #  Copyright (c) 2017, Even Rouault <even.rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdal_rmdir.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal_rmdir.py
index 13e37d6efb28..10d06ddc1193 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdal_rmdir.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdal_rmdir.py
@@ -9,23 +9,7 @@
 ###############################################################################
 #  Copyright (c) 2017, Even Rouault <even.rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdalbuildvrtofvrt.py b/swig/python/gdal-utils/osgeo_utils/samples/gdalbuildvrtofvrt.py
index e04d8bb9dac2..788ef167580e 100755
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdalbuildvrtofvrt.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdalbuildvrtofvrt.py
@@ -9,23 +9,7 @@
 # ******************************************************************************
 #  Copyright (c) 2024, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import glob
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdalchksum.py b/swig/python/gdal-utils/osgeo_utils/samples/gdalchksum.py
index df4335089852..8fd6b8511ee5 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdalchksum.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdalchksum.py
@@ -9,23 +9,7 @@
 # ******************************************************************************
 #  Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdalcopyproj.py b/swig/python/gdal-utils/osgeo_utils/samples/gdalcopyproj.py
index 1b2bb11eb259..6ad6eaa15394 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdalcopyproj.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdalcopyproj.py
@@ -14,23 +14,7 @@
 #  Copyright (c) 2005, Frank Warmerdam
 #  Copyright (c) 2009-2011, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdalfilter.py b/swig/python/gdal-utils/osgeo_utils/samples/gdalfilter.py
index 7b5fc64124f6..3cea498d73f4 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdalfilter.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdalfilter.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdalident.py b/swig/python/gdal-utils/osgeo_utils/samples/gdalident.py
index 6556443d3cac..fa1c635072c9 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdalident.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdalident.py
@@ -9,23 +9,7 @@
 # ******************************************************************************
 #  Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 #
 
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdalimport.py b/swig/python/gdal-utils/osgeo_utils/samples/gdalimport.py
index 032adf43bf1d..1fd388548d94 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdalimport.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdalimport.py
@@ -10,23 +10,7 @@
 # ******************************************************************************
 #  Copyright (c) 2000, Frank Warmerdam
 #
-#  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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import os.path
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdalinfo.py b/swig/python/gdal-utils/osgeo_utils/samples/gdalinfo.py
index ed65ac82fb08..5d8484b5e1e4 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdalinfo.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdalinfo.py
@@ -12,23 +12,7 @@
 # Copyright (c) 2010-2011, Even Rouault <even dot rouault at spatialys.com>
 # Copyright (c) 1998, Frank Warmerdam
 #
-# 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.
+# SPDX-License-Identifier: MIT
 # ***************************************************************************/
 
 import math
@@ -402,9 +386,8 @@ def main(argv=None):
             print(line)
 
         stats = hBand.GetStatistics(bApproxStats, bStats)
-        # Dirty hack to recognize if stats are valid. If invalid, the returned
-        # stddev is negative
-        if stats[3] >= 0.0:
+        # Before GDAL 3.10, a negative value for stddev indicated an error
+        if stats is not None and stats[3] >= 0.0:
             print(
                 "  Minimum=%.3f, Maximum=%.3f, Mean=%.3f, StdDev=%.3f"
                 % (stats[0], stats[1], stats[2], stats[3])
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/gdallocationinfo.py b/swig/python/gdal-utils/osgeo_utils/samples/gdallocationinfo.py
index 302a10aee438..5260752b8a8c 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/gdallocationinfo.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/gdallocationinfo.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2010, Even Rouault <even@spatialys.com>
 # Copyright (c) 2021, Idan Miara <idan@miara.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 import sys
 import textwrap
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/get_soundg.py b/swig/python/gdal-utils/osgeo_utils/samples/get_soundg.py
index 8acf477ce3ba..b144a3722ae0 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/get_soundg.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/get_soundg.py
@@ -11,23 +11,7 @@
 ###############################################################################
 # Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/histrep.py b/swig/python/gdal-utils/osgeo_utils/samples/histrep.py
index e214de0a2553..fc0084d29f93 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/histrep.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/histrep.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2005, Frank Warmerdam, warmerdam@pobox.com
 # Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/hsv_merge.py b/swig/python/gdal-utils/osgeo_utils/samples/hsv_merge.py
index 2a9d97717fc2..aa34a453f696 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/hsv_merge.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/hsv_merge.py
@@ -12,23 +12,7 @@
 #  Copyright (c) 2009, Frank Warmerdam
 #  Copyright (c) 2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/jpeg_in_tiff_extract.py b/swig/python/gdal-utils/osgeo_utils/samples/jpeg_in_tiff_extract.py
index 90b94c429766..f5113442c5eb 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/jpeg_in_tiff_extract.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/jpeg_in_tiff_extract.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2014, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/load2odbc.py b/swig/python/gdal-utils/osgeo_utils/samples/load2odbc.py
index fc002923be02..3b5d77492736 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/load2odbc.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/load2odbc.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2005, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/loslas2ntv2.py b/swig/python/gdal-utils/osgeo_utils/samples/loslas2ntv2.py
index 82a6b6510fad..cf5fc7a531a3 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/loslas2ntv2.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/loslas2ntv2.py
@@ -11,23 +11,7 @@
 # ******************************************************************************
 #  Copyright (c) 2010, Frank Warmerdam
 #
-#  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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/magphase.py b/swig/python/gdal-utils/osgeo_utils/samples/magphase.py
index 779973de736c..ae1c00cd4bf4 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/magphase.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/magphase.py
@@ -8,23 +8,7 @@
 # ******************************************************************************
 #  Copyright (c) 2008, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/make_fuzzer_friendly_archive.py b/swig/python/gdal-utils/osgeo_utils/samples/make_fuzzer_friendly_archive.py
index 10f35c9e7200..e8f404819f78 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/make_fuzzer_friendly_archive.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/make_fuzzer_friendly_archive.py
@@ -10,23 +10,7 @@
 # ******************************************************************************
 #  Copyright (c) 2016 Even Rouault, <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import os
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/mkgraticule.py b/swig/python/gdal-utils/osgeo_utils/samples/mkgraticule.py
index b5566ce6613f..ac139c3a7aaf 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/mkgraticule.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/mkgraticule.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/ogr2vrt.py b/swig/python/gdal-utils/osgeo_utils/samples/ogr2vrt.py
index 2a20f2374578..2a3c46a574c6 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/ogr2vrt.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/ogr2vrt.py
@@ -11,23 +11,7 @@
 # Copyright (c) 2009, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2009-2014, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import os.path
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/ogr_build_junction_table.py b/swig/python/gdal-utils/osgeo_utils/samples/ogr_build_junction_table.py
index f45f3767f620..f044b87aa7e8 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/ogr_build_junction_table.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/ogr_build_junction_table.py
@@ -12,23 +12,7 @@
 # ******************************************************************************
 #  Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/ogr_dispatch.py b/swig/python/gdal-utils/osgeo_utils/samples/ogr_dispatch.py
index 481eddf6b991..0f2733913bde 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/ogr_dispatch.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/ogr_dispatch.py
@@ -11,23 +11,7 @@
 ###############################################################################
 # Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/ogrinfo.py b/swig/python/gdal-utils/osgeo_utils/samples/ogrinfo.py
index ccef0f10069d..44621b769feb 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/ogrinfo.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/ogrinfo.py
@@ -12,23 +12,7 @@
 # Copyright (c) 2010-2013, Even Rouault <even dot rouault at spatialys.com>
 # Copyright (c) 1999, Frank Warmerdam
 #
-# 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.
+# SPDX-License-Identifier: MIT
 # ***************************************************************************/
 
 # Note : this is the most direct port of ogrinfo.cpp possible
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/ogrupdate.py b/swig/python/gdal-utils/osgeo_utils/samples/ogrupdate.py
index c3e81cea224a..90e88d1c51b2 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/ogrupdate.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/ogrupdate.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/rel.py b/swig/python/gdal-utils/osgeo_utils/samples/rel.py
index b09b2fe07c2d..3397e197f2b3 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/rel.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/rel.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2003, Andrey Kiselev <dron@remotesensing.org>
 # Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import math
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/tigerpoly.py b/swig/python/gdal-utils/osgeo_utils/samples/tigerpoly.py
index e709ea2849fa..3b30fbb6a344 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/tigerpoly.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/tigerpoly.py
@@ -10,23 +10,7 @@
 # Copyright (c) 2003, Frank Warmerdam <warmerdam@pobox.com>
 # Copyright (c) 2009, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/tile_extent_from_raster.py b/swig/python/gdal-utils/osgeo_utils/samples/tile_extent_from_raster.py
index 349c84a46486..84a085f45029 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/tile_extent_from_raster.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/tile_extent_from_raster.py
@@ -10,23 +10,7 @@
 # ******************************************************************************
 #  Copyright (c) 2019, Even Rouault, <even dot rouault at spatialys dot 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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/tolatlong.py b/swig/python/gdal-utils/osgeo_utils/samples/tolatlong.py
index f9414074e13f..88304ae34b98 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/tolatlong.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/tolatlong.py
@@ -12,23 +12,7 @@
 # Copyright (c) 2003, Andrey Kiselev <dron@remotesensing.org>
 # Copyright (c) 2009-2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/val_repl.py b/swig/python/gdal-utils/osgeo_utils/samples/val_repl.py
index 85e072aaf687..04e4033edab5 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/val_repl.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/val_repl.py
@@ -13,23 +13,7 @@
 # Copyright (c) 2003, Andrey Kiselev <dron@remotesensing.org>
 # Copyright (c) 2009-2010, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/validate_cloud_optimized_geotiff.py b/swig/python/gdal-utils/osgeo_utils/samples/validate_cloud_optimized_geotiff.py
index b4e042577e21..935ddddc30db 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/validate_cloud_optimized_geotiff.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/validate_cloud_optimized_geotiff.py
@@ -10,23 +10,7 @@
 # *****************************************************************************
 #  Copyright (c) 2017, Even Rouault
 #
-#  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.
+# SPDX-License-Identifier: MIT
 # *****************************************************************************
 
 import os.path
@@ -441,6 +425,8 @@ def main(argv=sys.argv):
     if filename is None:
         return Usage()
 
+    gdal.UseExceptions()
+
     if full_check is None:
         full_check = filename.startswith("/vsimem/") or os.path.exists(filename)
 
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/validate_geoparquet.py b/swig/python/gdal-utils/osgeo_utils/samples/validate_geoparquet.py
index f03e6df16df5..4ad09424f639 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/validate_geoparquet.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/validate_geoparquet.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2023, Even Rouault <even.rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import json
@@ -192,11 +176,7 @@ def _check(self):
         if self.local_schema:
             schema_j = json.loads(open(self.local_schema, "rb").read())
         else:
-            # FIXME: Remove that temporary hack once GeoParquet 1.1 schema is released
-            if version == "1.1.0":
-                schema_url = "https://github.com/opengeospatial/geoparquet/releases/download/v1.0.0/schema.json"
-            else:
-                schema_url = f"https://github.com/opengeospatial/geoparquet/releases/download/v{version}/schema.json"
+            schema_url = f"https://github.com/opengeospatial/geoparquet/releases/download/v{version}/schema.json"
 
             if schema_url not in geoparquet_schemas:
                 import urllib
@@ -217,16 +197,6 @@ def _check(self):
 
             schema_j = geoparquet_schemas[schema_url]
 
-        # FIXME: Remove that temporary hack once GeoParquet 1.1 schema is released
-        if version == "1.1.0":
-            schema_j["properties"]["version"] = {"const": "1.1.0", "type": "string"}
-            schema_j["properties"]["columns"]["patternProperties"][".+"]["properties"][
-                "encoding"
-            ] = {
-                "type": "string",
-                "pattern": "^(WKB|point|linestring|polygon|multipoint|multilinestring|multipolygon)$",
-            }
-
         try:
             self._validate(schema_j, geo_j)
         except Exception as e:
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/validate_gpkg.py b/swig/python/gdal-utils/osgeo_utils/samples/validate_gpkg.py
index 118075bcc5b3..dd3f40330c96 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/validate_gpkg.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/validate_gpkg.py
@@ -10,23 +10,7 @@
 ###############################################################################
 # Copyright (c) 2017, Even Rouault <even.rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import datetime
@@ -186,12 +170,26 @@ def _check_structure(self, columns, expected_columns, req, table_name):
                     ("Wrong notnull for %s of %s. " + "Expected %s, got %s")
                     % (name, table_name, expected_notnull, notnull),
                 )
-                self._assert(
-                    default == expected_default,
-                    req,
-                    ("Wrong default for %s of %s. " + "Expected %s, got %s")
-                    % (name, table_name, expected_default, default),
-                )
+                # GeoPackage ETS suite accepts CURRENT_TIMESTAMP instead of 'now'
+                # Spatialite at time of writing uses CURRENT_TIMESTAMP.
+                # https://github.com/opengeospatial/ets-gpkg12/blob/04b4a0b8c7d90755b016182e2992684f198da1ba/src/main/java/org/opengis/cite/gpkg12/TableVerifier.java#L173
+                if (
+                    default != expected_default
+                    and expected_default == "strftime('%Y-%m-%dT%H:%M:%fZ','now')"
+                    and default.lower().replace(" ", "")
+                    in (
+                        "strftime('%Y-%m-%dT%H:%M:%fZ','now')".lower(),
+                        "strftime('%Y-%m-%dT%H:%M:%fZ',CURRENT_TIMESTAMP)".lower(),
+                    )
+                ):
+                    pass
+                else:
+                    self._assert(
+                        default == expected_default,
+                        req,
+                        ("Wrong default for %s of %s. " + "Expected %s, got %s")
+                        % (name, table_name, expected_default, default),
+                    )
                 self._assert(
                     pk == expected_pk,
                     req,
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/validate_jp2.py b/swig/python/gdal-utils/osgeo_utils/samples/validate_jp2.py
index 44af8e0d6a87..e5fb9be66abc 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/validate_jp2.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/validate_jp2.py
@@ -10,23 +10,7 @@
 # ******************************************************************************
 #  Copyright (c) 2015, European Union (European Environment Agency)
 #
-#  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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import os
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/vec_tr.py b/swig/python/gdal-utils/osgeo_utils/samples/vec_tr.py
index 617bc1ff0402..006e2bbcfdb1 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/vec_tr.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/vec_tr.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2006, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/vec_tr_spat.py b/swig/python/gdal-utils/osgeo_utils/samples/vec_tr_spat.py
index c79dfd12b274..79c4ecfbd199 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/vec_tr_spat.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/vec_tr_spat.py
@@ -9,23 +9,7 @@
 ###############################################################################
 # Copyright (c) 2006, Frank Warmerdam <warmerdam@pobox.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.
+# SPDX-License-Identifier: MIT
 ###############################################################################
 
 import sys
diff --git a/swig/python/gdal-utils/osgeo_utils/samples/wcs_virtds_params.py b/swig/python/gdal-utils/osgeo_utils/samples/wcs_virtds_params.py
index 369e6fa83804..3308b3623585 100644
--- a/swig/python/gdal-utils/osgeo_utils/samples/wcs_virtds_params.py
+++ b/swig/python/gdal-utils/osgeo_utils/samples/wcs_virtds_params.py
@@ -12,23 +12,7 @@
 # ******************************************************************************
 #  Copyright (c) 2013, Even Rouault <even dot rouault at spatialys.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.
+# SPDX-License-Identifier: MIT
 # ******************************************************************************
 
 import os
diff --git a/swig/python/modify_cpp_files.cmake b/swig/python/modify_cpp_files.cmake
index d5850c04abc9..af6668b0189e 100644
--- a/swig/python/modify_cpp_files.cmake
+++ b/swig/python/modify_cpp_files.cmake
@@ -33,12 +33,6 @@ string(REPLACE "obj = PyUnicode_AsUTF8String(obj);"
                "obj = PyUnicode_AsUTF8String(obj); if (!obj) return SWIG_TypeError;"
        _CONTENTS "${_CONTENTS}")
 
-if("${FILE}" MATCHES "gdal_wrap.cpp")
-    string(REGEX REPLACE "result = \\(CPLErr\\)([^;]+)(\\;)"
-                         [[CPL_IGNORE_RET_VAL(result = (CPLErr)\1)\2]]
-           _CONTENTS "${_CONTENTS}")
-endif()
-
 string(REPLACE "PyObject *resultobj = 0;"
                "PyObject *resultobj = 0; int bLocalUseExceptionsCode = GetUseExceptions();"
        _CONTENTS "${_CONTENTS}")
diff --git a/swig/python/setup.py.in b/swig/python/setup.py.in
index cb37ed5db7ba..b63bbcff9394 100644
--- a/swig/python/setup.py.in
+++ b/swig/python/setup.py.in
@@ -321,6 +321,14 @@ class gdal_ext(build_ext):
         # the Extension() instantiations below because we want to use the same
         # logic to resolve the location of gdal-config throughout.
         ext.extra_compile_args.extend(self.extra_cflags)
+
+        # Work around "swig/python detected a memory leak" bug
+        # Cf https://github.com/swig/swig/issues/2638#issuecomment-2345002698
+        if self.get_compiler() == 'msvc':
+            ext.extra_compile_args.append("/DSWIG_PYTHON_SILENT_MEMLEAK")
+        else:
+            ext.extra_compile_args.append("-DSWIG_PYTHON_SILENT_MEMLEAK")
+
         return build_ext.build_extension(self, ext)
 
 
diff --git a/swig/python/trimmedsysconfig.py b/swig/python/trimmedsysconfig.py
index a6037f7417bf..efb7c26357d8 100644
--- a/swig/python/trimmedsysconfig.py
+++ b/swig/python/trimmedsysconfig.py
@@ -63,6 +63,14 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
             and "real_prefix" not in sys.__dict__
             and sys.prefix == sys.base_prefix
         ):
+            if (
+                prefix
+                and os.path.normpath(prefix) == "/usr/local"
+                and os.path.join(libpython, "dist-packages") in sys.path
+            ):
+                # GDAL specific to address https://github.com/OSGeo/gdal/issues/10242
+                # Not sure why Debian's patched distutils didn't do this
+                return os.path.join(libpython, "dist-packages")
             return os.path.join(prefix, "lib", "python3", "dist-packages")
         else:
             return os.path.join(libpython, "site-packages")
diff --git a/third_party/libertiff/libertiff.hpp b/third_party/libertiff/libertiff.hpp
new file mode 100644
index 000000000000..7ea0191ffbd6
--- /dev/null
+++ b/third_party/libertiff/libertiff.hpp
@@ -0,0 +1,1599 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+// Canonical URL: https://github.com/libertiff/libertiff/blob/master/libertiff.hpp
+
+#ifndef LIBERTIFF_HPP_INCLUDED
+#define LIBERTIFF_HPP_INCLUDED
+
+//////////////////////////////////////////////////////////////
+// libertiff = libre TIFF or LIB E(ven) R(ouault) TIFF... ? //
+//////////////////////////////////////////////////////////////
+
+#if __cplusplus >= 202002L
+#include <bit>  // std::endian
+#endif
+
+#include <array>
+#include <cassert>
+#include <cstring>
+#include <limits>
+#include <memory>
+#include <set>
+#include <string>
+#include <type_traits>
+#include <vector>
+
+#ifndef LIBERTIFF_NS
+#define LIBERTIFF_NS libertiff
+#endif
+
+/** Libertiff is a C++11 simple, header-only, TIFF reader. It is MIT licensed.
+ *
+ * Handles both ClassicTIFF and BigTIFF, little-endian or big-endian ordered.
+ *
+ * The library does not (yet?) offer codec facilities. It is mostly aimed at
+ * browsing through the linked chain of Image File Directory (IFD) and their tags.
+ *
+ * "Offline" tag values are not loaded at IFD opening time, but only upon
+ * request, which helps handling files with tags with an arbitrarily large
+ * number of values.
+ *
+ * The library is thread-safe (that is the instances that it returns can
+ * be used from multiple threads), if passed FileReader instances are themselves
+ * thread-safe.
+ *
+ * The library does not throw exceptions (but underlying std library might
+ * throw exceptions in case of out-of-memory situations)
+ *
+ * Optional features:
+ * - define LIBERTIFF_C_FILE_READER before including libertiff.hpp, so that
+ *   the libertiff::CFileReader class is available
+ */
+namespace LIBERTIFF_NS
+{
+
+#if __cplusplus >= 201703L
+#define LIBERTIFF_STATIC_ASSERT(x) static_assert(x)
+#define LIBERTIFF_CONSTEXPR constexpr
+#else
+#define LIBERTIFF_STATIC_ASSERT(x) static_assert((x), #x)
+#define LIBERTIFF_CONSTEXPR
+#endif
+
+template <typename T, typename... Args>
+std::unique_ptr<T> make_unique(Args &&...args)
+{
+    return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
+}
+
+/** Returns whether the host is little-endian ordered */
+inline bool isHostLittleEndian()
+{
+#if __cplusplus >= 202002L
+    return std::endian::native == std::endian::little;
+#elif (defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) &&          \
+       (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)) ||                         \
+    defined(_MSC_VER)
+    return true;
+#elif defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) &&              \
+    (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
+    return false;
+#else
+    uint32_t one = 1;
+    char one_as_char_array[sizeof(uint32_t)];
+    std::memcpy(one_as_char_array, &one, sizeof(uint32_t));
+    return one_as_char_array[0] == 1;
+#endif
+}
+
+/** Byte-swap */
+template <class T> inline T byteSwap(T v);
+
+/** Byte-swap a uint8_t */
+template <> uint8_t byteSwap(uint8_t v)
+{
+    return v;
+}
+
+/** Byte-swap a int8_t */
+template <> int8_t byteSwap(int8_t v)
+{
+    return v;
+}
+
+/** Byte-swap a uint16_t */
+template <> uint16_t byteSwap(uint16_t v)
+{
+    return uint16_t((v >> 8) | ((v & 0xff) << 8));
+}
+
+/** Byte-swap a int16_t */
+template <> int16_t byteSwap(int16_t v)
+{
+    uint16_t u;
+    LIBERTIFF_STATIC_ASSERT(sizeof(v) == sizeof(u));
+    std::memcpy(&u, &v, sizeof(u));
+    u = byteSwap(u);
+    std::memcpy(&v, &u, sizeof(u));
+    return v;
+}
+
+/** Byte-swap a uint32_t */
+template <> uint32_t byteSwap(uint32_t v)
+{
+    return (v >> 24) | (((v >> 16) & 0xff) << 8) | (((v >> 8) & 0xff) << 16) |
+           ((v & 0xff) << 24);
+}
+
+/** Byte-swap a int32_t */
+template <> int32_t byteSwap(int32_t v)
+{
+    uint32_t u;
+    LIBERTIFF_STATIC_ASSERT(sizeof(v) == sizeof(u));
+    std::memcpy(&u, &v, sizeof(u));
+    u = byteSwap(u);
+    std::memcpy(&v, &u, sizeof(u));
+    return v;
+}
+
+/** Byte-swap a uint64_t */
+template <> uint64_t byteSwap(uint64_t v)
+{
+    return (uint64_t(byteSwap(uint32_t(v & ~(0U)))) << 32) |
+           byteSwap(uint32_t(v >> 32));
+}
+
+/** Byte-swap a int64_t */
+template <> int64_t byteSwap(int64_t v)
+{
+    uint64_t u;
+    std::memcpy(&u, &v, sizeof(u));
+    u = byteSwap(u);
+    std::memcpy(&v, &u, sizeof(u));
+    return v;
+}
+
+/** Byte-swap a float */
+template <> float byteSwap(float v)
+{
+    uint32_t u;
+    LIBERTIFF_STATIC_ASSERT(sizeof(v) == sizeof(u));
+    std::memcpy(&u, &v, sizeof(u));
+    u = byteSwap(u);
+    std::memcpy(&v, &u, sizeof(u));
+    return v;
+}
+
+/** Byte-swap a double */
+template <> double byteSwap(double v)
+{
+    uint64_t u;
+    LIBERTIFF_STATIC_ASSERT(sizeof(v) == sizeof(u));
+    std::memcpy(&u, &v, sizeof(u));
+    u = byteSwap(u);
+    std::memcpy(&v, &u, sizeof(u));
+    return v;
+}
+}  // namespace LIBERTIFF_NS
+
+namespace LIBERTIFF_NS
+{
+/** Interface to read from a file. */
+class FileReader
+{
+  public:
+    virtual ~FileReader() = default;
+
+    /** Return file size in bytes */
+    virtual uint64_t size() const = 0;
+
+    /** Read 'count' bytes from offset 'offset' into 'buffer' and
+     * return the number of bytes actually read.
+     */
+    virtual size_t read(uint64_t offset, size_t count, void *buffer) const = 0;
+};
+}  // namespace LIBERTIFF_NS
+
+namespace LIBERTIFF_NS
+{
+/** Read context: associates a file, and the byte ordering of the TIFF file */
+class ReadContext
+{
+  public:
+    /** Constructor */
+    ReadContext(const std::shared_ptr<const FileReader> &file,
+                bool mustByteSwap)
+        : m_file(file), m_mustByteSwap(mustByteSwap)
+    {
+    }
+
+    /** Return if values of more than 1-byte must be byte swapped.
+     * To be only taken into account when reading pixels. Tag values are
+     * automatically byte-swapped */
+    inline bool mustByteSwap() const
+    {
+        return m_mustByteSwap;
+    }
+
+    /** Return file size */
+    inline uint64_t size() const
+    {
+        return m_file->size();
+    }
+
+    /** Read count raw bytes at offset into buffer */
+    void read(uint64_t offset, size_t count, void *buffer, bool &ok) const
+    {
+        if (m_file->read(offset, count, buffer) != count)
+            ok = false;
+    }
+
+    /** Read single value at offset */
+    template <class T> T read(uint64_t offset, bool &ok) const
+    {
+#if __cplusplus >= 201703L
+        static_assert(
+            std::is_same_v<T, uint8_t> || std::is_same_v<T, int8_t> ||
+            std::is_same_v<T, uint16_t> || std::is_same_v<T, int16_t> ||
+            std::is_same_v<T, uint32_t> || std::is_same_v<T, int32_t> ||
+            std::is_same_v<T, uint64_t> || std::is_same_v<T, int64_t> ||
+            std::is_same_v<T, float> || std::is_same_v<T, double>);
+#endif
+
+        T res = 0;
+        if (m_file->read(offset, sizeof(res), &res) != sizeof(res))
+        {
+            ok = false;
+            return 0;
+        }
+        if LIBERTIFF_CONSTEXPR (sizeof(T) > 1)
+        {
+            if (m_mustByteSwap)
+                res = byteSwap(res);
+        }
+        return res;
+    }
+
+    /** Read a unsigned rational (type == Type::Rational) */
+    template <class T = uint32_t>
+    double readRational(uint64_t offset, bool &ok) const
+    {
+        const auto numerator = read<T>(offset, ok);
+        const auto denominator = read<T>(offset + sizeof(T), ok);
+        if (denominator == 0)
+        {
+            ok = false;
+            return std::numeric_limits<double>::quiet_NaN();
+        }
+        return double(numerator) / denominator;
+    }
+
+    /** Read a signed rational (type == Type::SRational) */
+    double readSignedRational(uint64_t offset, bool &ok) const
+    {
+        return readRational<int32_t>(offset, ok);
+    }
+
+    /** Read length bytes at offset (typically for ASCII tag) as a string */
+    std::string readString(std::string &res, uint64_t offset, size_t length,
+                           bool &ok) const
+    {
+        res.resize(length);
+        if (length > 0 && m_file->read(offset, length, &res[0]) != length)
+        {
+            ok = false;
+            res.clear();
+            return res;
+        }
+        // Strip trailing nul byte if found
+        if (length > 0 && res.back() == 0)
+            res.pop_back();
+        return res;
+    }
+
+    /** Read length bytes at offset (typically for ASCII tag) as a string */
+    std::string readString(uint64_t offset, size_t length, bool &ok) const
+    {
+        std::string res;
+        readString(res, offset, length, ok);
+        return res;
+    }
+
+    /** Read an array of count values starting at offset */
+    template <class T>
+    void readArray(std::vector<T> &array, uint64_t offset, size_t count,
+                   bool &ok) const
+    {
+#if __cplusplus >= 201703L
+        static_assert(
+            std::is_same_v<T, uint8_t> || std::is_same_v<T, int8_t> ||
+            std::is_same_v<T, uint16_t> || std::is_same_v<T, int16_t> ||
+            std::is_same_v<T, uint32_t> || std::is_same_v<T, int32_t> ||
+            std::is_same_v<T, uint64_t> || std::is_same_v<T, int64_t> ||
+            std::is_same_v<T, float> || std::is_same_v<T, double>);
+#endif
+
+        array.resize(count);
+        const size_t countBytes = count * sizeof(T);
+        if (count > 0 &&
+            m_file->read(offset, countBytes, &array[0]) != countBytes)
+        {
+            ok = false;
+            array.clear();
+        }
+        else if LIBERTIFF_CONSTEXPR (sizeof(T) > 1)
+        {
+            if (m_mustByteSwap)
+            {
+                if LIBERTIFF_CONSTEXPR (std::is_same<T, float>::value)
+                {
+                    uint32_t *uint32Array =
+                        reinterpret_cast<uint32_t *>(array.data());
+                    for (size_t i = 0; i < count; ++i)
+                    {
+                        uint32Array[i] = byteSwap(uint32Array[i]);
+                    }
+                }
+                else if LIBERTIFF_CONSTEXPR (std::is_same<T, double>::value)
+                {
+                    uint64_t *uint64Array =
+                        reinterpret_cast<uint64_t *>(array.data());
+                    for (size_t i = 0; i < count; ++i)
+                    {
+                        uint64Array[i] = byteSwap(uint64Array[i]);
+                    }
+                }
+                else
+                {
+                    for (size_t i = 0; i < count; ++i)
+                    {
+                        array[i] = byteSwap(array[i]);
+                    }
+                }
+            }
+        }
+    }
+
+    /** Read an array of count values starting at offset */
+    template <class T>
+    std::vector<T> readArray(uint64_t offset, size_t count, bool &ok) const
+    {
+        std::vector<T> array;
+        readArray(array, offset, count, ok);
+        return array;
+    }
+
+  private:
+    const std::shared_ptr<const FileReader> m_file;
+    const bool m_mustByteSwap;
+};
+}  // namespace LIBERTIFF_NS
+
+namespace LIBERTIFF_NS
+{
+/** Type of a TIFF tag code */
+typedef uint16_t TagCodeType;
+
+/** TIFF tag codes */
+namespace TagCode
+{
+constexpr TagCodeType NewSubfileType = 254;
+constexpr TagCodeType SubfileType = 255;
+
+// Base line and extended TIFF tags
+constexpr TagCodeType ImageWidth = 256;
+constexpr TagCodeType ImageLength = 257;
+constexpr TagCodeType BitsPerSample = 258;
+constexpr TagCodeType Compression = 259;
+constexpr TagCodeType PhotometricInterpretation = 262;
+constexpr TagCodeType ImageDescription = 270;
+constexpr TagCodeType StripOffsets = 273;
+constexpr TagCodeType SamplesPerPixel = 277;
+constexpr TagCodeType RowsPerStrip = 278;
+constexpr TagCodeType StripByteCounts = 279;
+constexpr TagCodeType PlanarConfiguration = 284;
+constexpr TagCodeType Predictor = 317;
+constexpr TagCodeType TileWidth = 322;
+constexpr TagCodeType TileLength = 323;
+constexpr TagCodeType TileOffsets = 324;
+constexpr TagCodeType TileByteCounts = 325;
+constexpr TagCodeType SampleFormat = 339;
+
+// GeoTIFF tags
+constexpr TagCodeType GeoTIFFPixelScale = 33550;
+constexpr TagCodeType GeoTIFFTiePoints = 33922;
+constexpr TagCodeType GeoTIFFGeoKeyDirectory = 34735;
+constexpr TagCodeType GeoTIFFAsciiParams = 34737;
+}  // namespace TagCode
+
+#define LIBERTIFF_CASE_TAGCODE_STR(x)                                          \
+    case TagCode::x:                                                           \
+        return #x
+
+inline const char *tagCodeName(TagCodeType tagCode)
+{
+    switch (tagCode)
+    {
+        LIBERTIFF_CASE_TAGCODE_STR(NewSubfileType);
+        LIBERTIFF_CASE_TAGCODE_STR(SubfileType);
+        LIBERTIFF_CASE_TAGCODE_STR(ImageWidth);
+        LIBERTIFF_CASE_TAGCODE_STR(ImageLength);
+        LIBERTIFF_CASE_TAGCODE_STR(BitsPerSample);
+        LIBERTIFF_CASE_TAGCODE_STR(Compression);
+        LIBERTIFF_CASE_TAGCODE_STR(PhotometricInterpretation);
+        LIBERTIFF_CASE_TAGCODE_STR(ImageDescription);
+        LIBERTIFF_CASE_TAGCODE_STR(StripOffsets);
+        LIBERTIFF_CASE_TAGCODE_STR(SamplesPerPixel);
+        LIBERTIFF_CASE_TAGCODE_STR(RowsPerStrip);
+        LIBERTIFF_CASE_TAGCODE_STR(StripByteCounts);
+        LIBERTIFF_CASE_TAGCODE_STR(PlanarConfiguration);
+        LIBERTIFF_CASE_TAGCODE_STR(Predictor);
+        LIBERTIFF_CASE_TAGCODE_STR(TileWidth);
+        LIBERTIFF_CASE_TAGCODE_STR(TileLength);
+        LIBERTIFF_CASE_TAGCODE_STR(TileOffsets);
+        LIBERTIFF_CASE_TAGCODE_STR(TileByteCounts);
+        LIBERTIFF_CASE_TAGCODE_STR(SampleFormat);
+        LIBERTIFF_CASE_TAGCODE_STR(GeoTIFFPixelScale);
+        LIBERTIFF_CASE_TAGCODE_STR(GeoTIFFTiePoints);
+        LIBERTIFF_CASE_TAGCODE_STR(GeoTIFFGeoKeyDirectory);
+        LIBERTIFF_CASE_TAGCODE_STR(GeoTIFFAsciiParams);
+        default:
+            break;
+    }
+    return "(unknown)";
+}
+
+#undef LIBERTIFF_CASE_TAGCODE_STR
+
+/** Type of a TIFF tag type */
+typedef uint16_t TagTypeType;
+
+/** TIFF tag data types */
+namespace TagType
+{
+constexpr TagTypeType Byte = 1;  /*! Unsigned 8-bit integer */
+constexpr TagTypeType ASCII = 2; /*! Character */
+constexpr TagTypeType Short = 3; /*! Unsigned 16-bit integer */
+constexpr TagTypeType Long = 4;  /*! Unsigned 32-bit integer */
+constexpr TagTypeType Rational =
+    5; /*! Positive number as a ratio of two unsigned 32-bit integers */
+constexpr TagTypeType SByte = 6;     /*! Signed 8-bit integer */
+constexpr TagTypeType Undefined = 7; /*! Untyped 8-bit data */
+constexpr TagTypeType SShort = 8;    /*! Signed 16-bit integer */
+constexpr TagTypeType SLong = 9;     /*! Signed 32-bit integer */
+constexpr TagTypeType SRational =
+    10; /*! Signed number as a ratio of two signed 32-bit integers */
+constexpr TagTypeType Float = 11;  /*! 32-bit IEEE-754 floating point number */
+constexpr TagTypeType Double = 12; /*! 64-bit IEEE-754 floating point number */
+
+// BigTIFF additions
+constexpr TagTypeType Long8 = 16;  /*! Unsigned 64-bit integer */
+constexpr TagTypeType SLong8 = 17; /*! Signed 64-bit integer */
+constexpr TagTypeType IFD8 = 18;   /*! Unsigned 64-bit IFD offset */
+}  // namespace TagType
+
+#define LIBERTIFF_CASE_TAGTYPE_STR(x)                                          \
+    case TagType::x:                                                           \
+        return #x
+
+inline const char *tagTypeName(TagTypeType tagType)
+{
+    switch (tagType)
+    {
+        LIBERTIFF_CASE_TAGTYPE_STR(Byte);
+        LIBERTIFF_CASE_TAGTYPE_STR(ASCII);
+        LIBERTIFF_CASE_TAGTYPE_STR(Short);
+        LIBERTIFF_CASE_TAGTYPE_STR(Long);
+        LIBERTIFF_CASE_TAGTYPE_STR(Rational);
+        LIBERTIFF_CASE_TAGTYPE_STR(SByte);
+        LIBERTIFF_CASE_TAGTYPE_STR(Undefined);
+        LIBERTIFF_CASE_TAGTYPE_STR(SShort);
+        LIBERTIFF_CASE_TAGTYPE_STR(SLong);
+        LIBERTIFF_CASE_TAGTYPE_STR(SRational);
+        LIBERTIFF_CASE_TAGTYPE_STR(Float);
+        LIBERTIFF_CASE_TAGTYPE_STR(Double);
+        LIBERTIFF_CASE_TAGTYPE_STR(Long8);
+        LIBERTIFF_CASE_TAGTYPE_STR(SLong8);
+        LIBERTIFF_CASE_TAGTYPE_STR(IFD8);
+        default:
+            break;
+    }
+    return "(unknown)";
+}
+
+#undef LIBERTIFF_CASE_TAGTYPE_STR
+
+/** Type of a PlanarConfiguration value */
+typedef uint32_t PlanarConfigurationType;
+
+/** Values of the PlanarConfiguration tag */
+namespace PlanarConfiguration
+{
+constexpr PlanarConfigurationType Contiguous = 1; /*! Single image plane */
+constexpr PlanarConfigurationType Separate =
+    2; /*! Separate planes per sample */
+}  // namespace PlanarConfiguration
+
+#define LIBERTIFF_CASE_PLANAR_CONFIG_STR(x)                                    \
+    case PlanarConfiguration::x:                                               \
+        return #x
+
+inline const char *
+planarConfigurationName(PlanarConfigurationType planarConfiguration)
+{
+    switch (planarConfiguration)
+    {
+        LIBERTIFF_CASE_PLANAR_CONFIG_STR(Contiguous);
+        LIBERTIFF_CASE_PLANAR_CONFIG_STR(Separate);
+        default:
+            break;
+    }
+    return "(unknown)";
+}
+
+#undef LIBERTIFF_CASE_PLANAR_CONFIG_STR
+
+/** Type of a PlanarConfiguration value */
+typedef uint32_t PhotometricInterpretationType;
+
+/** Values of the PhotometricInterpretation tag */
+namespace PhotometricInterpretation
+{
+constexpr PhotometricInterpretationType MinIsWhite = 0;
+constexpr PhotometricInterpretationType MinIsBlack = 1;
+constexpr PhotometricInterpretationType RGB = 2;
+constexpr PhotometricInterpretationType Palette = 3;
+constexpr PhotometricInterpretationType Mask = 4;
+constexpr PhotometricInterpretationType Separated = 5;
+constexpr PhotometricInterpretationType YCbCr = 6;
+constexpr PhotometricInterpretationType CIELab = 8;
+constexpr PhotometricInterpretationType ICCLab = 9;
+constexpr PhotometricInterpretationType ITULab = 10;
+}  // namespace PhotometricInterpretation
+
+#define LIBERTIFF_CASE_PHOTOMETRIC_STR(x)                                      \
+    case PhotometricInterpretation::x:                                         \
+        return #x
+
+const char *photometricInterpretationName(
+    PhotometricInterpretationType photometricInterpretation);
+
+const char *photometricInterpretationName(
+    PhotometricInterpretationType photometricInterpretation)
+{
+    switch (photometricInterpretation)
+    {
+        LIBERTIFF_CASE_PHOTOMETRIC_STR(MinIsWhite);
+        LIBERTIFF_CASE_PHOTOMETRIC_STR(MinIsBlack);
+        LIBERTIFF_CASE_PHOTOMETRIC_STR(RGB);
+        LIBERTIFF_CASE_PHOTOMETRIC_STR(Palette);
+        LIBERTIFF_CASE_PHOTOMETRIC_STR(Mask);
+        LIBERTIFF_CASE_PHOTOMETRIC_STR(Separated);
+        LIBERTIFF_CASE_PHOTOMETRIC_STR(YCbCr);
+        LIBERTIFF_CASE_PHOTOMETRIC_STR(CIELab);
+        LIBERTIFF_CASE_PHOTOMETRIC_STR(ICCLab);
+        LIBERTIFF_CASE_PHOTOMETRIC_STR(ITULab);
+        default:
+            break;
+    }
+    return "(unknown)";
+}
+
+#undef LIBERTIFF_CASE_PHOTOMETRIC_STR
+
+/** Type of a Compression value */
+typedef uint32_t CompressionType;
+
+/** Compression methods */
+namespace Compression
+{
+constexpr CompressionType None = 1;
+constexpr CompressionType CCITT_RLE = 2;
+constexpr CompressionType CCITT_FAX3 = 3;
+constexpr CompressionType CCITT_FAX4 = 4;
+constexpr CompressionType LZW = 5;
+constexpr CompressionType OldJPEG = 6;
+constexpr CompressionType JPEG = 7;
+constexpr CompressionType Deflate = 8;
+}  // namespace Compression
+
+#define LIBERTIFF_CASE_COMPRESSION_STR(x)                                      \
+    case Compression::x:                                                       \
+        return #x
+
+inline const char *compressionName(CompressionType compression)
+{
+    switch (compression)
+    {
+        LIBERTIFF_CASE_COMPRESSION_STR(None);
+        LIBERTIFF_CASE_COMPRESSION_STR(CCITT_RLE);
+        LIBERTIFF_CASE_COMPRESSION_STR(CCITT_FAX3);
+        LIBERTIFF_CASE_COMPRESSION_STR(CCITT_FAX4);
+        LIBERTIFF_CASE_COMPRESSION_STR(LZW);
+        LIBERTIFF_CASE_COMPRESSION_STR(OldJPEG);
+        LIBERTIFF_CASE_COMPRESSION_STR(JPEG);
+        LIBERTIFF_CASE_COMPRESSION_STR(Deflate);
+        default:
+            break;
+    }
+    return "(unknown)";
+}
+
+#undef LIBERTIFF_CASE_COMPRESSION_STR
+
+/** Type of a SampleFormat value */
+typedef uint32_t SampleFormatType;
+
+/** Sample format */
+namespace SampleFormat
+{
+constexpr SampleFormatType UnsignedInt = 1;
+constexpr SampleFormatType SignedInt = 2;
+constexpr SampleFormatType IEEEFP = 3;
+constexpr SampleFormatType Void = 4;
+constexpr SampleFormatType ComplexInt = 5;
+constexpr SampleFormatType ComplexIEEEFP = 6;
+}  // namespace SampleFormat
+
+#define LIBERTIFF_CASE_SAMPLE_FORMAT_STR(x)                                    \
+    case SampleFormat::x:                                                      \
+        return #x
+
+inline const char *sampleFormatName(SampleFormatType sampleFormat)
+{
+    switch (sampleFormat)
+    {
+        LIBERTIFF_CASE_SAMPLE_FORMAT_STR(UnsignedInt);
+        LIBERTIFF_CASE_SAMPLE_FORMAT_STR(SignedInt);
+        LIBERTIFF_CASE_SAMPLE_FORMAT_STR(IEEEFP);
+        LIBERTIFF_CASE_SAMPLE_FORMAT_STR(Void);
+        LIBERTIFF_CASE_SAMPLE_FORMAT_STR(ComplexInt);
+        LIBERTIFF_CASE_SAMPLE_FORMAT_STR(ComplexIEEEFP);
+        default:
+            break;
+    }
+    return "(unknown)";
+}
+
+#undef LIBERTIFF_CASE_SAMPLE_FORMAT_STR
+
+/** Content of a tag entry in a Image File Directory (IFD) */
+struct TagEntry
+{
+    TagCodeType tag = 0;
+    TagTypeType type = 0;
+    uint64_t count = 0;  // number of values in the tag
+
+    // Inline values. Only valid if value_offset == 0.
+    // The actual number in the arrays is count
+    union
+    {
+        std::array<char, 8> charValues;
+        std::array<uint8_t, 8> uint8Values;
+        std::array<int8_t, 8> int8Values;
+        std::array<uint16_t, 4> uint16Values;
+        std::array<int16_t, 4> int16Values;
+        std::array<uint32_t, 2> uint32Values;
+        std::array<int32_t, 2> int32Values;
+        std::array<float, 2> float32Values;
+        std::array<double, 1>
+            float64Values;  // Valid for Double, Rational, SRational
+        std::array<uint64_t, 1> uint64Values = {0};
+        std::array<int64_t, 1> int64Values;
+    };
+
+    uint64_t value_offset = 0;         // 0 for inline values
+    bool invalid_value_offset = true;  // whether value_offset is invalid
+};
+
+// clang-format off
+
+/** Return the size in bytes of a tag data type, or 0 if unknown */
+inline uint32_t tagTypeSize(TagTypeType type)
+{
+    switch (type)
+    {
+        case TagType::Byte:      return 1;
+        case TagType::ASCII:     return 1;
+        case TagType::Short:     return 2;
+        case TagType::Long:      return 4;
+        case TagType::Rational:  return 8;  // 2 Long
+        case TagType::SByte:     return 1;
+        case TagType::Undefined: return 1;
+        case TagType::SShort:    return 2;
+        case TagType::SLong:     return 4;
+        case TagType::SRational: return 8;  // 2 SLong
+        case TagType::Float:     return 4;
+        case TagType::Double:    return 8;
+        case TagType::Long8:     return 8;
+        case TagType::SLong8:    return 8;
+        case TagType::IFD8:      return 8;
+        default: break;
+    }
+    return 0;
+}
+
+// clang-format on
+
+namespace detail
+{
+template <class T>
+inline std::vector<T> readTagAsVectorInternal(const ReadContext &rc,
+                                              const TagEntry &tag,
+                                              TagTypeType expectedType,
+                                              const T *inlineValues, bool &ok)
+{
+    if (tag.type == expectedType)
+    {
+        if (tag.value_offset)
+        {
+            if (!tag.invalid_value_offset)
+            {
+                if LIBERTIFF_CONSTEXPR (sizeof(tag.count) > sizeof(size_t))
+                {
+                    if (tag.count > std::numeric_limits<size_t>::max())
+                    {
+                        ok = false;
+                        return {};
+                    }
+                }
+                return rc.readArray<T>(tag.value_offset,
+                                       static_cast<size_t>(tag.count), ok);
+            }
+        }
+        else
+        {
+            return std::vector<T>(
+                inlineValues, inlineValues + static_cast<size_t>(tag.count));
+        }
+    }
+    ok = false;
+    return {};
+}
+
+template <class T>
+std::vector<T> readTagAsVector(const ReadContext &rc, const TagEntry &tag,
+                               bool &ok);
+
+template <>
+std::vector<int8_t> readTagAsVector(const ReadContext &rc, const TagEntry &tag,
+                                    bool &ok)
+{
+    return readTagAsVectorInternal(rc, tag, TagType::SByte,
+                                   tag.int8Values.data(), ok);
+}
+
+template <>
+std::vector<uint8_t> readTagAsVector(const ReadContext &rc, const TagEntry &tag,
+                                     bool &ok)
+{
+    return readTagAsVectorInternal(
+        rc, tag, tag.type == TagType::Undefined ? tag.type : TagType::Byte,
+        tag.uint8Values.data(), ok);
+}
+
+template <>
+std::vector<int16_t> readTagAsVector(const ReadContext &rc, const TagEntry &tag,
+                                     bool &ok)
+{
+    return readTagAsVectorInternal(rc, tag, TagType::SShort,
+                                   tag.int16Values.data(), ok);
+}
+
+template <>
+std::vector<uint16_t> readTagAsVector(const ReadContext &rc,
+                                      const TagEntry &tag, bool &ok)
+{
+    return readTagAsVectorInternal(rc, tag, TagType::Short,
+                                   tag.uint16Values.data(), ok);
+}
+
+template <>
+std::vector<int32_t> readTagAsVector(const ReadContext &rc, const TagEntry &tag,
+                                     bool &ok)
+{
+    return readTagAsVectorInternal(rc, tag, TagType::SLong,
+                                   tag.int32Values.data(), ok);
+}
+
+template <>
+std::vector<uint32_t> readTagAsVector(const ReadContext &rc,
+                                      const TagEntry &tag, bool &ok)
+{
+    return readTagAsVectorInternal(rc, tag, TagType::Long,
+                                   tag.uint32Values.data(), ok);
+}
+
+template <>
+std::vector<int64_t> readTagAsVector(const ReadContext &rc, const TagEntry &tag,
+                                     bool &ok)
+{
+    return readTagAsVectorInternal(rc, tag, TagType::SLong8,
+                                   tag.int64Values.data(), ok);
+}
+
+template <>
+std::vector<uint64_t> readTagAsVector(const ReadContext &rc,
+                                      const TagEntry &tag, bool &ok)
+{
+    return readTagAsVectorInternal(rc, tag, TagType::Long8,
+                                   tag.uint64Values.data(), ok);
+}
+
+template <>
+std::vector<float> readTagAsVector(const ReadContext &rc, const TagEntry &tag,
+                                   bool &ok)
+{
+    return readTagAsVectorInternal(rc, tag, TagType::Float,
+                                   tag.float32Values.data(), ok);
+}
+
+template <>
+std::vector<double> readTagAsVector(const ReadContext &rc, const TagEntry &tag,
+                                    bool &ok)
+{
+    return readTagAsVectorInternal(rc, tag, TagType::Double,
+                                   tag.float64Values.data(), ok);
+}
+
+}  // namespace detail
+
+/** Represents a TIFF Image File Directory (IFD). */
+class Image
+{
+  public:
+    /** Constructor. Should not be called directly. Use the open() method */
+    Image(const std::shared_ptr<const ReadContext> &rc, bool isBigTIFF)
+        : m_rc(rc), m_isBigTIFF(isBigTIFF)
+    {
+    }
+
+    /** Return read context */
+    const std::shared_ptr<const ReadContext> &readContext() const
+    {
+        return m_rc;
+    }
+
+    /** Return whether the file is BigTIFF (if false, classic TIFF) */
+    inline bool isBigTIFF() const
+    {
+        return m_isBigTIFF;
+    }
+
+    /** Return if values of more than 1-byte must be byte swapped.
+     * To be only taken into account when reading pixels. Tag values are
+     * automatically byte-swapped */
+    inline bool mustByteSwap() const
+    {
+        return m_rc->mustByteSwap();
+    }
+
+    /** Return the offset of the this IFD */
+    inline uint64_t offset() const
+    {
+        return m_offset;
+    }
+
+    /** Return the offset of the next IFD (to pass to Image::open()),
+         * or 0 if there is no more */
+    inline uint64_t nextImageOffset() const
+    {
+        return m_nextImageOffset;
+    }
+
+    /** Return width of the image in pixels */
+    inline uint32_t width() const
+    {
+        return m_width;
+    }
+
+    /** Return height of the image in pixels */
+    inline uint32_t height() const
+    {
+        return m_height;
+    }
+
+    /** Return number of bits per sample */
+    inline uint32_t bitsPerSample() const
+    {
+        return m_bitsPerSample;
+    }
+
+    /** Return number of samples (a.k.a. channels, bands) per pixel */
+    inline uint32_t samplesPerPixel() const
+    {
+        return m_samplesPerPixel;
+    }
+
+    /** Return planar configuration */
+    inline PlanarConfigurationType planarConfiguration() const
+    {
+        return m_planarConfiguration;
+    }
+
+    /** Return planar configuration */
+    inline PhotometricInterpretationType photometricInterpretation() const
+    {
+        return m_photometricInterpretation;
+    }
+
+    /** Return compression method used */
+    inline CompressionType compression() const
+    {
+        return m_compression;
+    }
+
+    /** Return predictor value (used for Deflate, LZW, ZStd, etc. compression) */
+    inline uint32_t predictor() const
+    {
+        return m_predictor;
+    }
+
+    /** Return sample format */
+    inline SampleFormatType sampleFormat() const
+    {
+        return m_sampleFormat;
+    }
+
+    /** Return the number of rows per strip */
+    inline uint32_t rowsPerStrip() const
+    {
+        return m_rowsPerStrip;
+    }
+
+    /** Return the number of strips/tiles.
+     * Return 0 if inconsistent values between ByteCounts and Offsets arrays. */
+    inline uint64_t strileCount() const
+    {
+        return m_strileCount;
+    }
+
+    /** Return whether image is tiled */
+    inline bool isTiled() const
+    {
+        return m_isTiled;
+    }
+
+    /** Return tile width */
+    inline uint32_t tileWidth() const
+    {
+        return m_tileWidth;
+    }
+
+    /** Return tile width */
+    inline uint32_t tileHeight() const
+    {
+        return m_tileHeight;
+    }
+
+    /** Return number of tiles per row */
+    uint32_t tilesPerRow() const
+    {
+        if (m_tileWidth > 0)
+        {
+            return uint32_t((uint64_t(m_width) + m_tileWidth - 1) /
+                            m_tileWidth);
+        }
+        return 0;
+    }
+
+    /** Return number of tiles per column */
+    uint32_t tilesPerCol() const
+    {
+        if (m_tileHeight > 0)
+        {
+            return uint32_t((uint64_t(m_height) + m_tileHeight - 1) /
+                            m_tileHeight);
+        }
+        return 0;
+    }
+
+    /** Convert a tile coordinate (xtile, ytile, bandIdx) to a flat index */
+    uint64_t tileCoordinateToIdx(uint32_t xtile, uint32_t ytile,
+                                 uint32_t bandIdx, bool &ok) const
+    {
+        if (m_isTiled && m_tileWidth > 0 && m_tileHeight > 0)
+        {
+            const auto lTilesPerRow = tilesPerRow();
+            const auto lTilesPerCol = tilesPerCol();
+            if (xtile >= lTilesPerRow || ytile >= lTilesPerCol)
+            {
+                ok = false;
+                return 0;
+            }
+            auto idx = uint64_t(ytile) * lTilesPerRow + xtile;
+            if (bandIdx &&
+                m_planarConfiguration == PlanarConfiguration::Separate)
+            {
+                idx += uint64_t(bandIdx) * lTilesPerCol * lTilesPerRow;
+            }
+            return idx;
+        }
+        ok = false;
+        return 0;
+    }
+
+    /** Return the offset of strip/tile of index idx */
+    uint64_t strileOffset(uint64_t idx, bool &ok) const
+    {
+        return readUIntTag(m_strileOffsetsTag, idx, ok);
+    }
+
+    /** Return the offset of a tile from its coordinates */
+    uint64_t tileOffset(uint32_t xtile, uint32_t ytile, uint32_t bandIdx,
+                        bool &ok) const
+    {
+        const auto idx = tileCoordinateToIdx(xtile, ytile, bandIdx, ok);
+        return ok ? strileOffset(idx, ok) : 0;
+    }
+
+    /** Return the byte count of strip/tile of index idx */
+    uint64_t strileByteCount(uint64_t idx, bool &ok) const
+    {
+        return readUIntTag(m_strileByteCountsTag, idx, ok);
+    }
+
+    /** Return the offset of a tile from its coordinates */
+    uint64_t tileByteCount(uint32_t xtile, uint32_t ytile, uint32_t bandIdx,
+                           bool &ok) const
+    {
+        const auto idx = tileCoordinateToIdx(xtile, ytile, bandIdx, ok);
+        return ok ? strileByteCount(idx, ok) : 0;
+    }
+
+    /** Return the list of tags */
+    inline const std::vector<TagEntry> &tags() const
+    {
+        return m_tags;
+    }
+
+    /** Return the (first) tag corresponding to a code, or nullptr if not found */
+    const TagEntry *tag(TagCodeType tagCode) const
+    {
+        for (const auto &tag : m_tags)
+        {
+            if (tag.tag == tagCode)
+                return &tag;
+        }
+        return nullptr;
+    }
+
+    /** Read an ASCII tag as a string */
+    std::string readTagAsString(const TagEntry &tag, bool &ok) const
+    {
+        if (tag.type == TagType::ASCII)
+        {
+            if (tag.value_offset)
+            {
+                if LIBERTIFF_CONSTEXPR (sizeof(tag.count) > sizeof(size_t))
+                {
+                    if (tag.count > std::numeric_limits<size_t>::max())
+                    {
+                        ok = false;
+                        return std::string();
+                    }
+                }
+                return readContext()->readString(
+                    tag.value_offset, static_cast<size_t>(tag.count), ok);
+            }
+            if (tag.count)
+            {
+                std::string res(tag.charValues.data(),
+                                static_cast<size_t>(tag.count));
+                if (res.back() == 0)
+                    res.pop_back();
+                return res;
+            }
+        }
+        ok = false;
+        return std::string();
+    }
+
+    /** Read a numeric tag as a vector. You must use a type T which is
+     * consistent with the tag.type value. For example, if
+     * tag.type == libertiff::TagType::Short, T must be uint16_t.
+     * libertiff::TagType::Undefined must be read with T=uint8_t.
+     */
+    template <class T>
+    std::vector<T> readTagAsVector(const TagEntry &tag, bool &ok) const
+    {
+        return detail::readTagAsVector<T>(*(m_rc.get()), tag, ok);
+    }
+
+    /** Returns a new Image instance for the IFD starting at offset imageOffset */
+    template <bool isBigTIFF>
+    static std::unique_ptr<const Image>
+    open(const std::shared_ptr<const ReadContext> &rc,
+         const uint64_t imageOffset,
+         const std::set<uint64_t> &alreadyVisitedImageOffsets =
+             std::set<uint64_t>())
+    {
+        // To prevent infinite looping on corrupted files
+        if (imageOffset == 0 || alreadyVisitedImageOffsets.find(imageOffset) !=
+                                    alreadyVisitedImageOffsets.end())
+        {
+            return nullptr;
+        }
+
+        auto image = LIBERTIFF_NS::make_unique<Image>(rc, isBigTIFF);
+
+        image->m_offset = imageOffset;
+        image->m_alreadyVisitedImageOffsets = alreadyVisitedImageOffsets;
+        image->m_alreadyVisitedImageOffsets.insert(imageOffset);
+
+        bool ok = true;
+        int tagCount = 0;
+        uint64_t offset = imageOffset;
+        if LIBERTIFF_CONSTEXPR (isBigTIFF)
+        {
+            const auto tagCount64Bit = rc->read<uint64_t>(offset, ok);
+            // Artificially limit to the same number of entries as ClassicTIFF
+            if (tagCount64Bit > std::numeric_limits<uint16_t>::max())
+                return nullptr;
+            tagCount = static_cast<int>(tagCount64Bit);
+            offset += sizeof(uint64_t);
+        }
+        else
+        {
+            tagCount = rc->read<uint16_t>(offset, ok);
+            offset += sizeof(uint16_t);
+        }
+        if (!ok)
+            return nullptr;
+        image->m_tags.reserve(tagCount);
+        for (int i = 0; i < tagCount; ++i)
+        {
+            TagEntry entry;
+
+            // Read tag code
+            entry.tag = rc->read<uint16_t>(offset, ok);
+            offset += sizeof(uint16_t);
+
+            // Read tag data type
+            entry.type = rc->read<uint16_t>(offset, ok);
+            offset += sizeof(uint16_t);
+
+            // Read number of values
+            if LIBERTIFF_CONSTEXPR (isBigTIFF)
+            {
+                auto count = rc->read<uint64_t>(offset, ok);
+                entry.count = count;
+                offset += sizeof(count);
+            }
+            else
+            {
+                auto count = rc->read<uint32_t>(offset, ok);
+                entry.count = count;
+                offset += sizeof(count);
+            }
+
+            uint32_t singleValue = 0;
+            bool singleValueFitsInUInt32 = false;
+            if (entry.count)
+            {
+                if LIBERTIFF_CONSTEXPR (isBigTIFF)
+                {
+                    image->ParseTagEntryDataOrOffset<uint64_t>(
+                        entry, offset, singleValueFitsInUInt32, singleValue,
+                        ok);
+                }
+                else
+                {
+                    image->ParseTagEntryDataOrOffset<uint32_t>(
+                        entry, offset, singleValueFitsInUInt32, singleValue,
+                        ok);
+                }
+            }
+            if (!ok)
+                return nullptr;
+
+            image->processTag(entry, singleValueFitsInUInt32, singleValue);
+
+            image->m_tags.push_back(entry);
+        }
+
+        image->finalTagProcessing();
+
+        if LIBERTIFF_CONSTEXPR (isBigTIFF)
+            image->m_nextImageOffset = rc->read<uint64_t>(offset, ok);
+        else
+            image->m_nextImageOffset = rc->read<uint32_t>(offset, ok);
+
+        image->m_openFunc = open<isBigTIFF>;
+
+        return std::unique_ptr<const Image>(image.release());
+    }
+
+    /** Returns a new Image instance at the next IFD, or nullptr if there is none */
+    std::unique_ptr<const Image> next() const
+    {
+        return m_openFunc(m_rc, m_nextImageOffset,
+                          m_alreadyVisitedImageOffsets);
+    }
+
+  private:
+    const std::shared_ptr<const ReadContext> m_rc;
+    std::unique_ptr<const Image> (*m_openFunc)(
+        const std::shared_ptr<const ReadContext> &, const uint64_t,
+        const std::set<uint64_t> &) = nullptr;
+
+    std::set<uint64_t> m_alreadyVisitedImageOffsets{};
+    uint64_t m_offset = 0;
+    uint64_t m_nextImageOffset = 0;
+    uint32_t m_width = 0;
+    uint32_t m_height = 0;
+    uint32_t m_bitsPerSample = 0;
+    uint32_t m_samplesPerPixel = 0;
+    uint32_t m_rowsPerStrip = 0;
+    CompressionType m_compression = Compression::None;
+    SampleFormatType m_sampleFormat = SampleFormat::UnsignedInt;
+    PlanarConfigurationType m_planarConfiguration =
+        PlanarConfiguration::Contiguous;
+    PhotometricInterpretationType m_photometricInterpretation =
+        PhotometricInterpretation::MinIsBlack;
+    uint32_t m_predictor = 0;
+
+    const bool m_isBigTIFF;
+    bool m_isTiled = false;
+    uint32_t m_tileWidth = 0;
+    uint32_t m_tileHeight = 0;
+    uint64_t m_strileCount = 0;
+
+    std::vector<TagEntry> m_tags{};
+    const TagEntry *m_strileOffsetsTag = nullptr;
+    const TagEntry *m_strileByteCountsTag = nullptr;
+
+    Image(const Image &) = delete;
+    Image &operator=(const Image &) = delete;
+
+    /** Process tag */
+    void processTag(const TagEntry &entry, bool singleValueFitsInUInt32,
+                    uint32_t singleValue)
+    {
+        if (singleValueFitsInUInt32)
+        {
+            switch (entry.tag)
+            {
+                case TagCode::ImageWidth:
+                    m_width = singleValue;
+                    break;
+
+                case TagCode::ImageLength:
+                    m_height = singleValue;
+                    break;
+
+                case TagCode::Compression:
+                    m_compression = singleValue;
+                    break;
+
+                case TagCode::SamplesPerPixel:
+                    m_samplesPerPixel = singleValue;
+                    break;
+
+                case TagCode::RowsPerStrip:
+                    m_rowsPerStrip = singleValue;
+                    break;
+
+                case TagCode::PlanarConfiguration:
+                    m_planarConfiguration = singleValue;
+                    break;
+
+                case TagCode::PhotometricInterpretation:
+                    m_photometricInterpretation = singleValue;
+                    break;
+
+                case TagCode::Predictor:
+                    m_predictor = singleValue;
+                    break;
+
+                case TagCode::TileWidth:
+                    m_tileWidth = singleValue;
+                    break;
+
+                case TagCode::TileLength:
+                    m_tileHeight = singleValue;
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+        if (entry.count &&
+            (entry.type == TagType::Byte || entry.type == TagType::Short ||
+             entry.type == TagType::Long))
+        {
+            // Values of those 2 tags are repeated per sample, but should be
+            // at the same value.
+            if (entry.tag == TagCode::SampleFormat)
+            {
+                bool localOk = true;
+                const auto sampleFormat =
+                    static_cast<uint32_t>(readUIntTag(&entry, 0, localOk));
+                if (localOk)
+                {
+                    m_sampleFormat = sampleFormat;
+                }
+            }
+            else if (entry.tag == TagCode::BitsPerSample)
+            {
+                bool localOk = true;
+                const auto bitsPerSample =
+                    static_cast<uint32_t>(readUIntTag(&entry, 0, localOk));
+                if (localOk)
+                {
+                    m_bitsPerSample = bitsPerSample;
+                }
+            }
+        }
+    }
+
+    /** Final tag processing */
+    void finalTagProcessing()
+    {
+        if ((m_strileOffsetsTag = tag(TagCode::TileOffsets)) &&
+            (m_strileByteCountsTag = tag(TagCode::TileByteCounts)) &&
+            m_strileOffsetsTag->count == m_strileByteCountsTag->count)
+        {
+            m_isTiled = true;
+            m_strileCount = m_strileOffsetsTag->count;
+        }
+        else if ((m_strileOffsetsTag = tag(TagCode::StripOffsets)) &&
+                 (m_strileByteCountsTag = tag(TagCode::StripByteCounts)) &&
+                 m_strileOffsetsTag->count == m_strileByteCountsTag->count)
+        {
+            m_strileCount = m_strileOffsetsTag->count;
+        }
+    }
+
+    /** Read a value from a byte/short/long/long8 array tag */
+    uint64_t readUIntTag(const TagEntry *tag, uint64_t idx, bool &ok) const
+    {
+        if (tag && idx < tag->count)
+        {
+            if (tag->type == TagType::Byte)
+            {
+                if (tag->count <= (m_isBigTIFF ? 8 : 4))
+                {
+                    return tag->uint8Values[size_t(idx)];
+                }
+                return m_rc->read<uint8_t>(
+                    tag->value_offset + sizeof(uint8_t) * idx, ok);
+            }
+            else if (tag->type == TagType::Short)
+            {
+                if (tag->count <= (m_isBigTIFF ? 4 : 2))
+                {
+                    return tag->uint16Values[size_t(idx)];
+                }
+                return m_rc->read<uint16_t>(
+                    tag->value_offset + sizeof(uint16_t) * idx, ok);
+            }
+            else if (tag->type == TagType::Long)
+            {
+                if (tag->count <= (m_isBigTIFF ? 2 : 1))
+                {
+                    return tag->uint32Values[size_t(idx)];
+                }
+                return m_rc->read<uint32_t>(
+                    tag->value_offset + sizeof(uint32_t) * idx, ok);
+            }
+            else if (m_isBigTIFF && tag->type == TagType::Long8)
+            {
+                if (tag->count <= 1)
+                {
+                    return tag->uint64Values[size_t(idx)];
+                }
+                return m_rc->read<uint64_t>(
+                    tag->value_offset + sizeof(uint64_t) * idx, ok);
+            }
+        }
+        ok = false;
+        return 0;
+    }
+
+    template <class DataOrOffsetType>
+    void ParseTagEntryDataOrOffset(TagEntry &entry, uint64_t &offset,
+                                   bool &singleValueFitsInUInt32,
+                                   uint32_t &singleValue, bool &ok)
+    {
+        LIBERTIFF_STATIC_ASSERT(
+            (std::is_same<DataOrOffsetType, uint32_t>::value ||
+             std::is_same<DataOrOffsetType, uint64_t>::value));
+        assert(entry.count > 0);
+
+        const uint32_t dataTypeSize = tagTypeSize(entry.type);
+        if (dataTypeSize == 0)
+        {
+            return;
+        }
+
+        // There are 2 cases:
+        // - either the number of values for the data type can fit
+        //   in the next DataOrOffsetType bytes
+        // - or it cannot, and then the next DataOrOffsetType bytes are an offset
+        //   to the values
+        if (dataTypeSize > sizeof(DataOrOffsetType) / entry.count)
+        {
+            // Out-of-line values. We read a file offset
+            entry.value_offset = m_rc->read<DataOrOffsetType>(offset, ok);
+            if (dataTypeSize >
+                std::numeric_limits<uint64_t>::max() / entry.count)
+            {
+                entry.invalid_value_offset = true;
+            }
+            else
+            {
+                const uint64_t byteCount = uint64_t(dataTypeSize) * entry.count;
+
+                // Size of tag data beyond which we check the tag position and size
+                // w.r.t the file size.
+                constexpr uint32_t THRESHOLD_CHECK_FILE_SIZE = 10 * 1000 * 1000;
+
+                entry.invalid_value_offset =
+                    (byteCount > THRESHOLD_CHECK_FILE_SIZE &&
+                     (entry.value_offset >= m_rc->size() ||
+                      entry.value_offset > m_rc->size() - byteCount));
+            }
+        }
+        else if (dataTypeSize == sizeof(uint8_t))
+        {
+            // Read up to 4 (classic) or 8 (BigTIFF) inline bytes
+            m_rc->read(offset, size_t(entry.count), &entry.uint8Values[0], ok);
+            if (entry.count == 1 && entry.type == TagType::Byte)
+            {
+                singleValueFitsInUInt32 = true;
+                singleValue = entry.uint8Values[0];
+            }
+        }
+        else if (dataTypeSize == sizeof(uint16_t))
+        {
+            // Read up to 2 (classic) or 4 (BigTIFF) inline bytes
+            for (uint32_t idx = 0; idx < entry.count; ++idx)
+            {
+                entry.uint16Values[idx] =
+                    m_rc->read<uint16_t>(offset + idx * sizeof(uint16_t), ok);
+            }
+            if (entry.count == 1 && entry.type == TagType::Short)
+            {
+                singleValueFitsInUInt32 = true;
+                singleValue = entry.uint16Values[0];
+            }
+        }
+        else if (dataTypeSize == sizeof(uint32_t))
+        {
+            // Read up to 1 (classic) or 2 (BigTIFF) inline bytes
+            entry.uint32Values[0] = m_rc->read<uint32_t>(offset, ok);
+            if (entry.count == 1 && entry.type == TagType::Long)
+            {
+                singleValueFitsInUInt32 = true;
+                singleValue = entry.uint32Values[0];
+            }
+            if LIBERTIFF_CONSTEXPR (std::is_same<DataOrOffsetType,
+                                                 uint64_t>::value)
+            {
+                if (entry.count == 2)
+                {
+                    entry.uint32Values[1] =
+                        m_rc->read<uint32_t>(offset + sizeof(uint32_t), ok);
+                }
+            }
+        }
+        else if LIBERTIFF_CONSTEXPR (std::is_same<DataOrOffsetType,
+                                                  uint64_t>::value)
+        {
+            if (dataTypeSize == sizeof(uint64_t))
+            {
+                // Read one inline 64-bit value
+                if (entry.type == TagType::Rational)
+                    entry.float64Values[0] = m_rc->readRational(offset, ok);
+                else if (entry.type == TagType::SRational)
+                    entry.float64Values[0] =
+                        m_rc->readSignedRational(offset, ok);
+                else
+                    entry.uint64Values[0] = m_rc->read<uint64_t>(offset, ok);
+            }
+            else
+            {
+                assert(false);
+            }
+        }
+        else
+        {
+            // fprintf(stderr, "Unexpected case: tag=%u, dataType=%u, count=%u\n", entry.tag, entry.type, entry.count);
+            assert(false);
+        }
+
+        offset += sizeof(DataOrOffsetType);
+    }
+};
+
+/** Open a TIFF file and return its first Image File Directory
+ */
+template <bool acceptBigTIFF = true>
+std::unique_ptr<const Image> open(const std::shared_ptr<const FileReader> &file)
+{
+    unsigned char signature[2] = {0, 0};
+    (void)file->read(0, 2, signature);
+    const bool littleEndian = signature[0] == 'I' && signature[1] == 'I';
+    const bool bigEndian = signature[0] == 'M' && signature[1] == 'M';
+    if (!littleEndian && !bigEndian)
+        return nullptr;
+
+    const bool mustByteSwap = littleEndian ^ isHostLittleEndian();
+
+    auto rc = std::make_shared<ReadContext>(file, mustByteSwap);
+    bool ok = true;
+    const int version = rc->read<uint16_t>(2, ok);
+    constexpr int CLASSIC_TIFF_VERSION = 42;
+    if (version == CLASSIC_TIFF_VERSION)
+    {
+        const auto firstImageOffset = rc->read<uint32_t>(4, ok);
+        return Image::open<false>(rc, firstImageOffset, {});
+    }
+    else if LIBERTIFF_CONSTEXPR (acceptBigTIFF)
+    {
+        constexpr int BIGTIFF_VERSION = 43;
+        if (version == BIGTIFF_VERSION)
+        {
+            const auto byteSizeOfOffsets = rc->read<uint16_t>(4, ok);
+            if (byteSizeOfOffsets != 8)
+                return nullptr;
+            const auto zeroWord = rc->read<uint16_t>(6, ok);
+            if (zeroWord != 0 || !ok)
+                return nullptr;
+            const auto firstImageOffset = rc->read<uint64_t>(8, ok);
+            return Image::open<true>(rc, firstImageOffset, {});
+        }
+    }
+
+    return nullptr;
+}
+}  // namespace LIBERTIFF_NS
+
+#ifdef LIBERTIFF_C_FILE_READER
+#include <cstdio>
+#include <mutex>
+
+namespace LIBERTIFF_NS
+{
+/** Interface to read from a FILE* handle */
+class CFileReader final : public FileReader
+{
+  public:
+    explicit CFileReader(FILE *f) : m_f(f)
+    {
+    }
+
+    ~CFileReader() override
+    {
+        fclose(m_f);
+    }
+
+    uint64_t size() const override
+    {
+        std::lock_guard<std::mutex> oLock(m_oMutex);
+        fseek(m_f, 0, SEEK_END);
+        return ftell(m_f);
+    }
+
+    size_t read(uint64_t offset, size_t count, void *buffer) const override
+    {
+        std::lock_guard<std::mutex> oLock(m_oMutex);
+        if (fseek(m_f, static_cast<long>(offset), SEEK_SET) != 0)
+            return 0;
+        return fread(buffer, 1, count, m_f);
+    }
+
+  private:
+    FILE *const m_f;
+    mutable std::mutex m_oMutex{};
+
+    CFileReader(const CFileReader &) = delete;
+    CFileReader &operator=(const CFileReader &) = delete;
+};
+}  // namespace LIBERTIFF_NS
+#endif
+
+#endif  // LIBERTIFF_HPP_INCLUDED